diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 10386 |
1 files changed, 6855 insertions, 3531 deletions
diff --git a/po/git.pot b/po/git.pot index d4e46e5e74..e76b02aee4 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-10-17 09:44+0800\n" +"POT-Creation-Date: 2018-09-04 08:50+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:58 +#: advice.c:97 #, c-format -msgid "hint: %.*s\n" +msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:86 +#: advice.c:150 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:88 +#: advice.c:152 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:90 +#: advice.c:154 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:92 +#: advice.c:156 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:94 +#: advice.c:158 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:96 +#: advice.c:160 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:104 +#: advice.c:168 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:112 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:119 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:120 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:126 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -86,12 +86,12 @@ msgid "" "\n" msgstr "" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" @@ -116,62 +116,62 @@ msgstr "" msgid "--cached outside a repository" msgstr "" -#: apply.c:845 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:854 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:928 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:966 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:972 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:973 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:978 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:1007 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1325 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1497 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1566 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1586 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -182,637 +182,692 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1599 +#: apply.c:1580 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1787 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "" -#: apply.c:1789 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "" -#: apply.c:1823 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1860 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1862 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1865 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:2012 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2049 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2209 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2295 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2299 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2958 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3077 +#: apply.c:3060 #, 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:3089 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3095 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3117 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3125 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3171 +#: apply.c:3154 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3181 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3189 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3207 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3220 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3226 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3247 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3369 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3426 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3455 apply.c:3695 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3538 apply.c:3709 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3547 apply.c:3717 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3582 +#: apply.c:3568 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3585 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3601 apply.c:3605 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3617 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3631 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3636 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3662 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3734 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3736 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3886 apply.c:3888 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3944 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3947 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3967 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3972 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3992 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3996 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4011 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4102 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4109 +#: apply.c:4098 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4112 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4121 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4131 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4269 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4304 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4310 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4318 +#: apply.c:4306 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4324 apply.c:4468 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4365 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4369 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4439 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4537 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4545 +#: apply.c:4535 msgid "internal error" msgstr "" -#: apply.c:4548 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4559 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4581 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4585 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4695 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4703 +#: apply.c:4693 msgid "unrecognized input" msgstr "" -#: apply.c:4722 +#: apply.c:4712 msgid "unable to read index file" msgstr "" -#: apply.c:4859 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4886 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4892 apply.c:4907 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4900 +#: apply.c:4890 #, 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:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "" -#: 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 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4948 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4951 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "" -#: apply.c:4954 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4957 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4959 +#: apply.c:4945 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4963 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4965 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4967 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4969 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4971 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4973 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4975 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4977 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4979 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4984 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3202 msgid "action" msgstr "" -#: apply.c:4986 +#: apply.c:4975 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4989 apply.c:4992 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4995 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4997 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4999 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5001 +#: apply.c:4990 msgid "allow overlapping hunks" msgstr "" -#: 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 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "" -#: apply.c:5004 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5007 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "" -#: apply.c:5010 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:436 +#: archive.c:446 msgid "fmt" msgstr "" -#: archive.c:436 +#: archive.c:446 msgid "archive format" msgstr "" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "" -#: archive.c:438 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: 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 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 +#: parse-options.h:165 msgid "file" msgstr "" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:442 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:443 +#: archive.c:453 msgid "report archived files on stderr" msgstr "" -#: archive.c:444 +#: archive.c:454 msgid "store only" msgstr "" -#: archive.c:445 +#: archive.c:455 msgid "compress faster" msgstr "" -#: archive.c:453 +#: archive.c:463 msgid "compress better" msgstr "" -#: archive.c:456 +#: archive.c:466 msgid "list supported archive formats" msgstr "" -#: 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 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:468 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "" -#: archive.c:470 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:472 +#: archive.c:482 msgid "Unexpected option --output" msgstr "" -#: archive.c:494 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:501 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" +#: archive-tar.c:125 archive-zip.c:344 +#, c-format +msgid "cannot stream blob %s" +msgstr "" + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "" + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "" + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "" + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -824,43 +879,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:447 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:655 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:708 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:732 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:737 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:742 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:750 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -868,7 +923,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:763 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -876,43 +931,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:798 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:850 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:918 +#: bisect.c:927 builtin/merge.c:137 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:948 +#: bisect.c:957 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:968 +#: bisect.c:976 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:976 +#: bisect.c:984 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:995 +#: bisect.c:1003 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -922,48 +977,49 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1009 #, 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 +#: blame.c:1784 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:1768 +#: blame.c:1798 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:1788 +#: blame.c:1819 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 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:1815 +#: blame.c:1846 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:1826 +#: blame.c:1857 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:1837 +#: blame.c:1868 #, c-format msgid "cannot read blob %s for path %s" msgstr "" -#: branch.c:53 +#: branch.c:52 #, c-format msgid "" "\n" @@ -972,85 +1028,85 @@ msgid "" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" -#: branch.c:67 +#: branch.c:66 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" -#: branch.c:93 +#: branch.c:92 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -#: branch.c:94 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" -#: branch.c:98 +#: branch.c:97 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" -#: branch.c:99 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "" -#: branch.c:104 +#: branch.c:103 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" -#: branch.c:105 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" -#: branch.c:109 +#: branch.c:108 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -#: branch.c:110 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "" -#: branch.c:119 +#: branch.c:118 msgid "Unable to write upstream branch configuration" msgstr "" -#: branch.c:156 +#: branch.c:155 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:185 +#: branch.c:188 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:190 +#: branch.c:207 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:197 +#: branch.c:212 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:217 +#: branch.c:232 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:219 +#: branch.c:234 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:221 +#: branch.c:236 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1062,88 +1118,86 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:264 +#: branch.c:279 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:284 +#: branch.c:299 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:289 +#: branch.c:304 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:343 +#: branch.c:358 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:366 +#: branch.c:381 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: 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 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:193 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:200 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:202 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:261 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:272 +#: bundle.c:271 msgid "pack-objects died" msgstr "" -#: bundle.c:314 +#: bundle.c:313 msgid "rev-list died" msgstr "" -#: bundle.c:363 +#: bundle.c:362 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1161,188 +1215,421 @@ msgstr "" msgid "index-pack died" msgstr "" -#: color.c:301 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:43 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1517 +#: commit.c:191 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" + +#: commit.c:1629 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: compat/obstack.c:406 compat/obstack.c:408 +#: commit-graph.c:83 +#, c-format +msgid "graph file %s is too small" +msgstr "" + +#: commit-graph.c:90 +#, c-format +msgid "graph signature %X does not match signature %X" +msgstr "" + +#: commit-graph.c:97 +#, c-format +msgid "graph version %X does not match version %X" +msgstr "" + +#: commit-graph.c:104 +#, c-format +msgid "hash version %X does not match version %X" +msgstr "" + +#: commit-graph.c:128 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "" + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "" + +#: commit-graph.c:565 builtin/pack-objects.c:2568 +#, c-format +msgid "unable to get type of object %s" +msgstr "" + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "" + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "" + +#: commit-graph.c:773 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "" + +#: commit-graph.c:800 +msgid "too many commits to write graph" +msgstr "" + +#: commit-graph.c:806 +#, c-format +msgid "unable to create leading directories of %s" +msgstr "" + +#: commit-graph.c:904 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" + +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "" -#: config.c:187 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "" + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:721 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "" + +#: config.c:378 sequencer.c:2206 +#, c-format +msgid "invalid key: %s" +msgstr "" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:725 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:729 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:733 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:737 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:741 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:869 +#: config.c:952 msgid "out of range" msgstr "" -#: config.c:869 +#: config.c:952 msgid "invalid unit" msgstr "" -#: config.c:875 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:880 +#: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:883 +#: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:886 +#: config.c:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:889 +#: config.c:972 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:892 +#: config.c:975 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:895 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:990 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1085 config.c:1096 +#: config.c:1082 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "" + +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1213 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1372 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "" + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "" + +#: config.c:1430 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" + +#: config.c:1489 builtin/pack-objects.c:3279 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1568 +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "" + +#: config.c:1613 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "" + +#: config.c:1630 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "" + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "" + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "" -#: config.c:1900 +#: config.c:2032 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2087 +#: config.c:2202 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2130 +#: config.c:2245 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2156 +#: config.c:2271 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2167 +#: config.c:2296 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2169 +#: config.c:2298 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2228 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2571 config.c:2789 +#: config.c:2440 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "" + +#: config.c:2691 config.c:3015 +#, c-format +msgid "could not lock config file %s" +msgstr "" + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "" + +#: config.c:2775 config.c:3028 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2678 +#: config.c:2786 +#, c-format +msgid "unable to mmap '%s'" +msgstr "" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "" + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "" -#: connect.c:50 -msgid "The remote end hung up upon initial contact" +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "" + +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "" + +#: connect.c:61 +msgid "the remote end hung up upon initial contact" msgstr "" -#: connect.c:52 +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1350,44 +1637,281 @@ msgid "" "and the repository exists." msgstr "" -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "" + +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "" + +#: connect.c:316 +msgid "invalid packet" +msgstr "" + +#: connect.c:336 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "" + +#: connect.c:444 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "" + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "" + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "" + +#: connect.c:638 connect.c:701 +#, c-format +msgid "Looking up %s ... " +msgstr "" + +#: connect.c:642 +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "" + +#: connect.c:705 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "" + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "" + +#: connect.c:860 +#, c-format +msgid "cannot start proxy %s" +msgstr "" + +#: connect.c:927 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "" + +#: connect.c:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "" + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "" + +#: connect.c:1151 +msgid "ssh variant 'simple' does not support setting port" +msgstr "" + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "" + +#: connect.c:1307 +msgid "unable to fork" +msgstr "" + +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 msgid "Checking connectivity" msgstr "" -#: connected.c:76 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:96 +#: connected.c:100 msgid "failed write to rev-list" msgstr "" -#: connected.c:103 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:205 +#: convert.c:194 +#, c-format +msgid "illegal crlf_action %d" +msgstr "" + +#: convert.c:207 +#, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "" + +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" -#: convert.c:209 +#: convert.c:217 #, c-format -msgid "CRLF would be replaced by LF in %s." +msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:215 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" -#: convert.c:219 +#: convert.c:280 #, c-format -msgid "LF would be replaced by CRLF in %s" +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "" + +#: convert.c:287 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "" + +#: convert.c:305 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "" + +#: convert.c:307 +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" + +#: convert.c:425 convert.c:496 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "" + +#: convert.c:468 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" + +#: convert.c:674 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "" + +#: convert.c:694 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "" + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "" + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "" + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" + +#: convert.c:1228 +msgid "true/false are no valid working-tree-encodings" +msgstr "" + +#: convert.c:1402 convert.c:1436 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "" + +#: convert.c:1480 +#, c-format +msgid "%s: smudge filter %s failed" msgstr "" #: date.c:116 @@ -1467,296 +1991,402 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "" -#: diff.c:152 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:281 +#: diff.c:291 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " -"'plain'" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:341 +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "" + +#: diff.c:323 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other white " +"space modes" +msgstr "" + +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:398 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3861 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4189 +#: diff.c:4427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4279 +#: diff.c:4430 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "" + +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4445 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4459 +#: diff.c:4688 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5505 +#: diff.c:5766 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:5508 +#: diff.c:5769 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:5511 +#: diff.c:5772 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1983 +#: dir.c:569 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "" + +#: dir.c:958 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "" + +#: dir.c:1873 +#, c-format +msgid "could not open directory '%s'" +msgstr "" + +#: dir.c:2115 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2102 -msgid "Untracked cache is disabled on this system or location." +#: dir.c:2239 +msgid "untracked cache is disabled on this system or location" +msgstr "" + +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:2885 dir.c:2890 +#: dir.c:3082 dir.c:3087 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:2915 +#: dir.c:3116 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" + +#: entry.c:178 msgid "Filtering content" msgstr "" -#: entry.c:433 +#: entry.c:437 #, c-format msgid "could not stat file '%s'" msgstr "" -#: fetch-pack.c:252 -msgid "git fetch-pack: expected shallow list" +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" msgstr "" -#: fetch-pack.c:264 -msgid "git fetch-pack: expected ACK/NAK, got EOF" +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" msgstr "" -#: fetch-pack.c:283 builtin/archive.c:63 +#: exec-cmd.c:361 #, c-format -msgid "remote error: %s" +msgid "too many args to run %s" +msgstr "" + +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "" + +#: fetch-pack.c:152 +msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:284 +#: fetch-pack.c:164 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "" + +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:336 +#: fetch-pack.c:254 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:422 +#: fetch-pack.c:342 fetch-pack.c:1257 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:428 +#: fetch-pack.c:348 fetch-pack.c:1263 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:430 +#: fetch-pack.c:350 fetch-pack.c:1265 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:433 +#: fetch-pack.c:353 fetch-pack.c:1268 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:435 +#: fetch-pack.c:355 fetch-pack.c:1270 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:438 +#: fetch-pack.c:358 fetch-pack.c:1273 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:477 +#: fetch-pack.c:399 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:491 +#: fetch-pack.c:416 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:524 +#: fetch-pack.c:447 msgid "giving up" msgstr "" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:459 progress.c:229 msgid "done" msgstr "" -#: fetch-pack.c:546 +#: fetch-pack.c:471 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:592 +#: fetch-pack.c:517 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:776 +#: fetch-pack.c:764 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:814 +#: fetch-pack.c:803 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:822 +#: fetch-pack.c:811 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:923 +#: fetch-pack.c:926 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:927 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:930 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:936 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:940 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:948 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:952 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:962 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:971 fetch-pack.c:1150 +msgid "Server supports filter" +msgstr "" + +#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:975 +#: fetch-pack.c:985 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:989 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:981 +#: fetch-pack.c:991 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:992 +#: fetch-pack.c:1004 msgid "no common commits" msgstr "" -#: fetch-pack.c:1004 +#: fetch-pack.c:1016 fetch-pack.c:1393 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1166 +#: fetch-pack.c:1145 +msgid "Server does not support shallow requests" +msgstr "" + +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "" + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#: fetch-pack.c:1241 +#, c-format +msgid "error processing acks: %d" +msgstr "" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#: fetch-pack.c:1294 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "" + +#: fetch-pack.c:1304 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +#: fetch-pack.c:1603 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1188 +#: fetch-pack.c:1621 builtin/clone.c:664 +msgid "remote did not send all necessary objects" +msgstr "" + +#: fetch-pack.c:1647 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1191 +#: fetch-pack.c:1650 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:181 +#: gpg-interface.c:253 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:211 +#: gpg-interface.c:279 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:214 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" @@ -1766,66 +2396,128 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:1970 +#: grep.c:2115 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 +#: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1998 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "" -#: help.c:179 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:186 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:217 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:281 +#: help.c:358 git.c:90 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "" + +#: help.c:405 +msgid "The common Git guides are:" +msgstr "" + +#: help.c:552 #, 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:336 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:358 +#: help.c:633 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:363 +#: help.c:638 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:368 +#: help.c:643 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:376 +#: help.c:651 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:380 +#: help.c:655 msgid "" "\n" "The most similar command is" @@ -1835,16 +2527,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:395 +#: help.c:670 msgid "git version [<options>]" msgstr "" -#: help.c:456 +#: help.c:738 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:460 +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -1897,11 +2589,19 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:416 builtin/commit.c:616 +#: ident.c:416 builtin/commit.c:600 #, c-format msgid "invalid date format: %s" msgstr "" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "" + +#: list-objects-filter-options.c:126 +msgid "cannot change partial clone promisor remote" +msgstr "" + #: lockfile.c:151 #, c-format msgid "" @@ -1919,260 +2619,384 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:41 +#: merge.c:40 msgid "failed to read the cache" msgstr "" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:235 +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:325 #, c-format -msgid "addinfo_cache failed for path '%s'" +msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:329 +#: merge-recursive.c:333 +#, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "" + +#: merge-recursive.c:415 msgid "error building trees" msgstr "" -#: merge-recursive.c:752 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:763 +#: merge-recursive.c:897 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:777 merge-recursive.c:796 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:786 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:828 builtin/cat-file.c:37 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:830 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:854 +#: merge-recursive.c:988 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:865 +#: merge-recursive.c:999 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:870 +#: merge-recursive.c:1004 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1010 +#: merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "" + +#: merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "" + +#: merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#: merge-recursive.c:1213 merge-recursive.c:1225 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "" + +#: merge-recursive.c:1216 merge-recursive.c:1228 +#, c-format +msgid "Fast-forwarding submodule %s" +msgstr "" + +#: merge-recursive.c:1250 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "" + +#: merge-recursive.c:1254 +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "" + +#: merge-recursive.c:1255 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "" + +#: merge-recursive.c:1258 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" + +#: merge-recursive.c:1267 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" + +#: merge-recursive.c:1326 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1014 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1117 +#: merge-recursive.c:1363 +#, c-format +msgid "Auto-merging %s" +msgstr "" + +#: merge-recursive.c:1434 +#, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "" + +#: merge-recursive.c:1501 #, 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:1122 +#: merge-recursive.c:1506 #, 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 +#: merge-recursive.c:1513 #, 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:1134 +#: merge-recursive.c:1518 #, 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 +#: merge-recursive.c:1552 msgid "rename" msgstr "" -#: merge-recursive.c:1168 +#: merge-recursive.c:1552 msgid "renamed" msgstr "" -#: merge-recursive.c:1225 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "" + +#: merge-recursive.c:1620 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1250 +#: merge-recursive.c:1625 +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "" + +#: merge-recursive.c:1651 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1317 +#: merge-recursive.c:1720 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1350 +#: merge-recursive.c:1759 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1553 +#: merge-recursive.c:1771 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "" + +#: merge-recursive.c:1977 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" + +#: merge-recursive.c:2009 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#: merge-recursive.c:2019 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#: merge-recursive.c:2111 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" + +#: merge-recursive.c:2356 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-recursive.c:2762 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1568 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1575 merge-recursive.c:1805 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1632 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1635 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1704 +#: merge-recursive.c:3013 msgid "modify" msgstr "" -#: merge-recursive.c:1704 +#: merge-recursive.c:3013 msgid "modified" msgstr "" -#: merge-recursive.c:1714 +#: merge-recursive.c:3024 msgid "content" msgstr "" -#: merge-recursive.c:1721 +#: merge-recursive.c:3031 msgid "add/add" msgstr "" -#: merge-recursive.c:1757 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1771 -#, c-format -msgid "Auto-merging %s" -msgstr "" - -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "" -#: merge-recursive.c:1776 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1870 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1896 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "" -#: merge-recursive.c:1902 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "" -#: merge-recursive.c:1908 +#: merge-recursive.c:3260 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1917 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1954 +#: merge-recursive.c:3303 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#: merge-recursive.c:3314 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:1963 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2060 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "" -#: merge-recursive.c:2073 +#: merge-recursive.c:3435 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2112 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2175 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "" -#: notes-merge.c:272 +#: notes-merge.c:274 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2180,21 +3004,21 @@ msgid "" "commit/abort the previous merge before you start a new notes merge." msgstr "" -#: notes-merge.c:279 +#: notes-merge.c:281 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" -#: notes-utils.c:42 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:101 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:111 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -2203,35 +3027,55 @@ msgstr "" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:141 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object.c:239 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "" + +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "" + +#: object.c:233 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "" -#: packfile.c:556 +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "" + +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1683 +#: packfile.c:1745 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1687 +#: packfile.c:1749 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:573 +#: parse-options.c:672 msgid "..." msgstr "" -#: parse-options.c:592 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "" @@ -2239,26 +3083,31 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:598 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:601 +#: parse-options.c:700 #, c-format msgid " %s" msgstr "" -#: parse-options.c:640 +#: parse-options.c:739 msgid "-NUM" msgstr "" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -2329,250 +3178,412 @@ msgstr "" msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: 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" +#: pathspec.c:592 +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "" + +#: pkt-line.c:104 +msgid "flush packet write failed" +msgstr "" + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "" + +#: pkt-line.c:158 pkt-line.c:160 +msgid "packet write with format failed" +msgstr "" + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" +msgstr "" + +#: pkt-line.c:199 pkt-line.c:206 +msgid "packet write failed" +msgstr "" + +#: pkt-line.c:291 +msgid "read error" msgstr "" -#: pathspec.c:595 +#: pkt-line.c:299 +msgid "the remote end hung up unexpectedly" +msgstr "" + +#: pkt-line.c:327 #, c-format -msgid "pathspec '%s' is beyond a symbolic link" +msgid "protocol error: bad line length character: %.4s" +msgstr "" + +#: pkt-line.c:337 pkt-line.c:342 +#, c-format +msgid "protocol error: bad line length %d" msgstr "" #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1443 +#: range-diff.c:48 +msgid "could not start `log`" +msgstr "" + +#: range-diff.c:51 +msgid "could not read `log` output" +msgstr "" + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "" + +#: range-diff.c:196 +msgid "failed to generate diff" +msgstr "" + +#: range-diff.c:421 range-diff.c:423 +#, c-format +msgid "could not parse log for '%s'" +msgstr "" + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1453 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2407 +#: read-cache.c:2666 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2419 +#: read-cache.c:2678 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:638 +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "" + +#: refs.c:579 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "" + +#: refs.c:685 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "" + +#: refs.c:695 refs.c:746 #, c-format -msgid "Could not open '%s' for writing" +msgid "could not read ref '%s'" msgstr "" -#: refs.c:1792 +#: refs.c:701 +#, c-format +msgid "ref '%s' already exists" +msgstr "" + +#: refs.c:706 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "" + +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "" + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 +#, c-format +msgid "could not open '%s' for writing" +msgstr "" + +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "" + +#: refs.c:879 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:885 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:943 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1035 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "" + +#: refs.c:1111 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "" + +#: refs.c:1853 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "" + +#: refs.c:1885 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1136 +#: refs.c:1981 refs.c:2011 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "" + +#: refs.c:1987 refs.c:2022 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" + +#: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:35 wt-status.c:1811 +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "" + +#: ref-filter.c:38 wt-status.c:1850 msgid "gone" msgstr "" -#: ref-filter.c:36 +#: ref-filter.c:39 #, c-format msgid "ahead %d" msgstr "" -#: ref-filter.c:37 +#: ref-filter.c:40 #, c-format msgid "behind %d" msgstr "" -#: ref-filter.c:38 +#: ref-filter.c:41 #, c-format msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:105 +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:107 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:127 +#: ref-filter.c:161 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:131 +#: ref-filter.c:165 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:133 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:173 +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:180 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:198 +#: ref-filter.c:275 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:221 +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:223 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:236 +#: ref-filter.c:321 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:240 +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:267 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:279 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:283 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:289 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:293 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:308 +#: ref-filter.c:409 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:398 +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:424 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:536 +#: ref-filter.c:656 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:596 +#: ref-filter.c:719 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:598 +#: ref-filter.c:721 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:600 +#: ref-filter.c:723 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:626 +#: ref-filter.c:751 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:628 +#: ref-filter.c:753 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:630 +#: ref-filter.c:755 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:643 +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:698 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1283 +#: ref-filter.c:1416 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1286 +#: ref-filter.c:1419 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "" + +#: ref-filter.c:1422 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2580,7 +3591,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1430 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2588,137 +3599,142 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1437 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1305 +#: ref-filter.c:1441 msgid "(no branch)" msgstr "" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1788 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1855 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1860 -#, c-format -msgid "ignoring broken ref %s" -msgstr "" - -#: ref-filter.c:2122 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2216 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:750 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:754 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:758 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:766 +#: remote.c:622 msgid "Internal error" msgstr "" -#: remote.c:1681 remote.c:1783 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1690 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1693 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1699 +#: remote.c:1554 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1714 +#: remote.c:1569 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1726 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1737 +#: remote.c:1591 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1750 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1772 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2076 +#: remote.c:1951 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2080 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2083 +#: remote.c:1958 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2087 +#: remote.c:1962 +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "" + +#: remote.c:1965 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr "" + +#: remote.c:1969 #, 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:2093 +#: remote.c:1975 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2096 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2726,11 +3742,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2104 +#: remote.c:1986 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2107 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2741,126 +3757,158 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2117 +#: remote.c:1999 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2256 +#: replace-object.c:20 +#, c-format +msgid "bad replace ref name: %s" +msgstr "" + +#: replace-object.c:29 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "" + +#: replace-object.c:72 +#, c-format +msgid "replace depth too high for object %s" +msgstr "" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2259 +#: revision.c:2308 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2453 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:644 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "" -#: send-pack.c:151 +#: run-command.c:1271 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" + +#: send-pack.c:142 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "" + +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:153 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:316 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:429 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:431 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:443 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:448 +#: send-pack.c:441 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:218 +#: sequencer.c:177 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "" + +#: sequencer.c:278 +#, c-format +msgid "could not delete '%s'" +msgstr "" + +#: sequencer.c:304 msgid "revert" msgstr "" -#: sequencer.c:220 +#: sequencer.c:306 msgid "cherry-pick" msgstr "" -#: sequencer.c:222 +#: sequencer.c:308 msgid "rebase -i" msgstr "" -#: sequencer.c:224 +#: sequencer.c:310 #, c-format -msgid "Unknown action: %d" +msgid "unknown action: %d" msgstr "" -#: sequencer.c:281 +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:284 +#: sequencer.c:370 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:297 sequencer.c:1704 +#: sequencer.c:383 sequencer.c:2488 #, c-format msgid "could not lock '%s'" msgstr "" -#: 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:304 +#: sequencer.c:390 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 #, c-format -msgid "failed to finalize '%s'." +msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:358 +#: sequencer.c:444 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:362 +#: sequencer.c:448 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:391 +#: sequencer.c:477 #, c-format msgid "%s: fast-forward" msgstr "" @@ -2868,20 +3916,35 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:493 -msgid "could not resolve HEAD commit\n" +#: sequencer.c:582 +msgid "unable to update cache tree" +msgstr "" + +#: sequencer.c:595 +msgid "could not resolve HEAD commit" +msgstr "" + +#: sequencer.c:723 sequencer.c:740 +#, c-format +msgid "could not parse '%s' (looking for '%s')" +msgstr "" + +#: sequencer.c:731 +#, c-format +msgid "bad quoting on %s value in '%s'" msgstr "" -#: sequencer.c:513 -msgid "unable to update cache tree\n" +#: sequencer.c:747 +#, c-format +msgid "invalid date format '%s' in '%s'" msgstr "" -#: sequencer.c:597 +#: sequencer.c:761 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2898,256 +3961,372 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:699 -#, c-format -msgid "could not parse commit %s\n" +#: sequencer.c:830 +msgid "writing root commit" msgstr "" -#: sequencer.c:704 -#, c-format -msgid "could not parse parent commit %s\n" +#: sequencer.c:1055 +msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:826 -#, c-format +#: sequencer.c:1062 msgid "" -"unexpected 1st line of squash message:\n" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -"\t%.*s" +" git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:832 -#, c-format +#: sequencer.c:1075 msgid "" -"invalid 1st line of squash message:\n" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" "\n" -"\t%.*s" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" + +#: sequencer.c:1115 +msgid "couldn't look up newly created commit" +msgstr "" + +#: sequencer.c:1117 +msgid "could not parse newly created commit" +msgstr "" + +#: sequencer.c:1163 +msgid "unable to resolve HEAD after creating commit" +msgstr "" + +#: sequencer.c:1165 +msgid "detached HEAD" +msgstr "" + +#: sequencer.c:1169 +msgid " (root-commit)" +msgstr "" + +#: sequencer.c:1190 +msgid "could not parse HEAD" +msgstr "" + +#: sequencer.c:1192 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "" + +#: sequencer.c:1196 builtin/commit.c:1528 +msgid "could not parse HEAD commit" +msgstr "" + +#: sequencer.c:1247 sequencer.c:1845 +msgid "unable to parse commit author" +msgstr "" + +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: sequencer.c:1274 sequencer.c:1329 +#, c-format +msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 +#: builtin/merge.c:880 +msgid "failed to write commit object" +msgstr "" + +#: sequencer.c:1356 +#, c-format +msgid "could not parse commit %s" +msgstr "" + +#: sequencer.c:1361 +#, c-format +msgid "could not parse parent commit %s" +msgstr "" + +#: sequencer.c:1457 sequencer.c:1565 +#, c-format +msgid "unknown command: %d" +msgstr "" + +#: sequencer.c:1512 sequencer.c:1537 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:1522 sequencer.c:4520 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:849 +#: sequencer.c:1524 sequencer.c:2768 msgid "could not read HEAD" msgstr "" -#: sequencer.c:851 +#: sequencer.c:1526 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:857 +#: sequencer.c:1532 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:874 +#: sequencer.c:1547 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:881 +#: sequencer.c:1554 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:886 +#: sequencer.c:1560 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:891 -#, c-format -msgid "unknown command: %d" +#: sequencer.c:1643 +msgid "your index file is unmerged." msgstr "" -#: sequencer.c:957 -msgid "your index file is unmerged." +#: sequencer.c:1650 +msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:975 +#: sequencer.c:1669 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:983 +#: sequencer.c:1677 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:987 +#: sequencer.c:1681 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:993 +#: sequencer.c:1687 #, 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:1014 +#: sequencer.c:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1771 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1128 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1129 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1171 -msgid "empty commit set passed" -msgstr "" - -#: sequencer.c:1181 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1188 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1308 +#: sequencer.c:1972 +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "" + +#: sequencer.c:1981 +#, c-format +msgid "missing arguments for %s" +msgstr "" + +#: sequencer.c:2040 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:1316 +#: sequencer.c:2048 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:1361 +#: sequencer.c:2119 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:1363 +#: sequencer.c:2121 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:1368 +#: sequencer.c:2126 msgid "no commits parsed." msgstr "" -#: sequencer.c:1379 +#: sequencer.c:2137 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:1381 +#: sequencer.c:2139 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1448 +#: sequencer.c:2209 #, c-format -msgid "invalid key: %s" +msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:1451 -#, c-format -msgid "invalid value for %s: %s" +#: sequencer.c:2285 +msgid "unusable squash-onto" msgstr "" -#: sequencer.c:1517 +#: sequencer.c:2301 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:1555 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:1556 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:1559 +#: sequencer.c:2347 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:1574 +#: sequencer.c:2361 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:2420 sequencer.c:2455 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:1659 +#: sequencer.c:2443 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:1660 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "" -#: sequencer.c:1666 +#: sequencer.c:2450 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:1677 +#: sequencer.c:2461 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:2565 sequencer.c:3461 +#, c-format +msgid "could not update %s" +msgstr "" + +#: sequencer.c:2603 sequencer.c:3441 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:2618 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "" + +#: sequencer.c:2626 +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "" + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:1874 +#: sequencer.c:2680 sequencer.c:3095 msgid "could not read index" msgstr "" -#: sequencer.c:1879 +#: sequencer.c:2685 #, c-format msgid "" "execution failed: %s\n" @@ -3157,11 +4336,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1885 +#: sequencer.c:2691 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:1891 +#: sequencer.c:2697 #, c-format msgid "" "execution succeeded: %s\n" @@ -3172,17 +4351,81 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1948 +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "" + +#: sequencer.c:2810 +msgid "writing fake root commit" +msgstr "" + +#: sequencer.c:2815 +msgid "writing squash-onto" +msgstr "" + +#: sequencer.c:2850 +#, c-format +msgid "failed to find tree of %s" +msgstr "" + +#: sequencer.c:2868 +msgid "could not write index" +msgstr "" + +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "" + +#: sequencer.c:2921 +msgid "cannot merge without a current revision" +msgstr "" + +#: sequencer.c:2943 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "" + +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "" + +#: sequencer.c:2964 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "" + +#: sequencer.c:2979 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "" + +#: sequencer.c:2989 sequencer.c:3015 +#, c-format +msgid "could not write '%s'" +msgstr "" + +#: sequencer.c:3127 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "" + +#: sequencer.c:3143 +msgid "merge: Unable to write new index file" +msgstr "" + +#: sequencer.c:3211 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:1960 +#: sequencer.c:3223 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:3226 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3190,113 +4433,121 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:2045 +#: sequencer.c:3257 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:3325 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:2087 +#: sequencer.c:3404 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:2117 +#: sequencer.c:3449 msgid "could not read orig-head" msgstr "" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:3454 sequencer.c:4517 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:2129 -#, c-format -msgid "could not update %s" -msgstr "" - -#: sequencer.c:2136 +#: sequencer.c:3468 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:2220 +#: sequencer.c:3554 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:2225 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "" - -#: sequencer.c:2234 +#: sequencer.c:3563 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:2236 +#: sequencer.c:3565 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:2238 +#: sequencer.c:3567 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:2241 +#: sequencer.c:3570 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:2251 +#: sequencer.c:3595 sequencer.c:3633 +#, c-format +msgid "could not write file: '%s'" +msgstr "" + +#: sequencer.c:3648 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "" + +#: sequencer.c:3655 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:2331 +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2335 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:2368 +#: sequencer.c:3791 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:2471 +#: sequencer.c:4238 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:2474 +#: sequencer.c:4241 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:2510 +#: sequencer.c:4281 sequencer.c:4337 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "" - -#: sequencer.c:2561 +#: sequencer.c:4396 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: sequencer.c:2641 +#: sequencer.c:4466 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: sequencer.c:2648 +#: sequencer.c:4473 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3307,7 +4558,7 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2660 +#: sequencer.c:4486 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3315,39 +4566,23 @@ msgid "" "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 +#: sequencer.c:4660 msgid "the script was already rearranged." msgstr "" -#: sequencer.c:2953 +#: setup.c:123 #, c-format -msgid "could not finish '%s'" +msgid "'%s' is outside repository" msgstr "" -#: setup.c:171 +#: setup.c:172 #, 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:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3355,7 +4590,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:252 +#: setup.c:234 +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "" + +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3363,82 +4603,376 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:499 +#: setup.c:389 +msgid "unable to set up work tree using invalid config" +msgstr "" + +#: setup.c:393 +msgid "this operation must be run in a work tree" +msgstr "" + +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:507 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:806 +#: setup.c:530 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" +msgid "error opening '%s'" msgstr "" -#: setup.c:808 builtin/index-pack.c:1653 -msgid "Cannot come back to cwd" +#: setup.c:532 +#, c-format +msgid "too large to be a .git file: '%s'" +msgstr "" + +#: setup.c:534 +#, c-format +msgid "error reading %s" +msgstr "" + +#: setup.c:536 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "" + +#: setup.c:538 +#, c-format +msgid "no path in gitfile: %s" msgstr "" -#: setup.c:1046 +#: setup.c:540 +#, c-format +msgid "not a git repository: %s" +msgstr "" + +#: setup.c:639 +#, c-format +msgid "'$%s' too big" +msgstr "" + +#: setup.c:653 +#, c-format +msgid "not a git repository: '%s'" +msgstr "" + +#: setup.c:682 setup.c:684 setup.c:715 +#, c-format +msgid "cannot chdir to '%s'" +msgstr "" + +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 +msgid "cannot come back to cwd" +msgstr "" + +#: setup.c:813 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "" + +#: setup.c:824 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "" + +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1058 setup.c:1064 +#: setup.c:1066 setup.c:1072 #, c-format -msgid "Cannot change to '%s'" +msgid "cannot change to '%s'" msgstr "" -#: setup.c:1077 +#: setup.c:1085 #, c-format msgid "" -"Not a git repository (or any parent up to mount point %s)\n" +"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:1159 +#: setup.c:1168 #, c-format msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" +"problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: sha1_file.c:528 +#: setup.c:1211 +msgid "open /dev/null or dup failed" +msgstr "" + +#: setup.c:1226 +msgid "fork failed" +msgstr "" + +#: setup.c:1231 +msgid "setsid failed" +msgstr "" + +#: sha1-file.c:381 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: sha1-file.c:432 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "" + +#: sha1-file.c:503 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: sha1-file.c:510 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "" + +#: sha1-file.c:565 +msgid "unable to fdopen alternates lockfile" +msgstr "" + +#: sha1-file.c:583 +msgid "unable to read alternates file" +msgstr "" + +#: sha1-file.c:590 +msgid "unable to move new alternates file into place" +msgstr "" + +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:554 +#: sha1-file.c:651 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:560 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:566 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:574 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_name.c:420 +#: sha1-file.c:781 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: sha1-file.c:806 +msgid "mmap failed" +msgstr "" + +#: sha1-file.c:973 +#, c-format +msgid "object file %s is empty" +msgstr "" + +#: sha1-file.c:1093 sha1-file.c:2206 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "" + +#: sha1-file.c:1095 sha1-file.c:2210 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "" + +#: sha1-file.c:1137 +msgid "invalid object type" +msgstr "" + +#: sha1-file.c:1219 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1222 +#, c-format +msgid "unable to unpack %s header" +msgstr "" + +#: sha1-file.c:1228 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1231 +#, c-format +msgid "unable to parse %s header" +msgstr "" + +#: sha1-file.c:1422 +#, c-format +msgid "failed to read object %s" +msgstr "" + +#: sha1-file.c:1426 +#, c-format +msgid "replacement %s not found for %s" +msgstr "" + +#: sha1-file.c:1430 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "" + +#: sha1-file.c:1434 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "" + +#: sha1-file.c:1536 +#, c-format +msgid "unable to write sha1 filename %s" +msgstr "" + +#: sha1-file.c:1543 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "" + +#: sha1-file.c:1550 +msgid "file write error" +msgstr "" + +#: sha1-file.c:1569 +msgid "error when closing sha1 file" +msgstr "" + +#: sha1-file.c:1635 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: sha1-file.c:1637 +msgid "unable to create temporary file" +msgstr "" + +#: sha1-file.c:1661 +msgid "unable to write sha1 file" +msgstr "" + +#: sha1-file.c:1667 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "" + +#: sha1-file.c:1671 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, c-format +msgid "failed utime() on %s" +msgstr "" + +#: sha1-file.c:1760 +#, c-format +msgid "cannot read sha1_file for %s" +msgstr "" + +#: sha1-file.c:1805 +msgid "corrupt commit" +msgstr "" + +#: sha1-file.c:1813 +msgid "corrupt tag" +msgstr "" + +#: sha1-file.c:1906 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: sha1-file.c:1909 +#, c-format +msgid "short read while indexing %s" +msgstr "" + +#: sha1-file.c:1980 sha1-file.c:1989 +#, c-format +msgid "%s: failed to insert into database" +msgstr "" + +#: sha1-file.c:1995 +#, c-format +msgid "%s: unsupported file type" +msgstr "" + +#: sha1-file.c:2019 +#, c-format +msgid "%s is not a valid object" +msgstr "" + +#: sha1-file.c:2021 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "" + +#: sha1-file.c:2241 +#, c-format +msgid "unable to mmap %s" +msgstr "" + +#: sha1-file.c:2246 +#, c-format +msgid "unable to unpack header of %s" +msgstr "" + +#: sha1-file.c:2252 +#, c-format +msgid "unable to parse header of %s" +msgstr "" + +#: sha1-file.c:2263 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "" + +#: sha1-name.c:444 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1_name.c:431 +#: sha1-name.c:455 msgid "The candidates are:" msgstr "" -#: sha1_name.c:590 +#: sha1-name.c:699 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" @@ -3451,86 +4985,96 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:93 submodule.c:127 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:97 submodule.c:131 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:105 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:138 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:149 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:309 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:340 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:799 +#: submodule.c:839 #, 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 +#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1304 +#: submodule.c:1377 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1442 +#: submodule.c:1515 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1455 +#: submodule.c:1528 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1548 +#: submodule.c:1543 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "" + +#: submodule.c:1633 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1809 +#: submodule.c:1685 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "" + +#: submodule.c:1734 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1746 submodule.c:1802 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1828 +#: submodule.c:1753 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3538,29 +5082,30 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1912 +#: submodule.c:1837 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1956 +#: submodule.c:1881 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:1976 -msgid "BUG: returned path string doesn't match cwd?" +#: submodule.c:1920 +#, c-format +msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule.c:1995 +#: submodule-config.c:231 #, c-format -msgid "ls-tree returned unexpected return code %d" +msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule-config.c:263 +#: submodule-config.c:295 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:436 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "" @@ -3576,7 +5121,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "" @@ -3595,7 +5140,7 @@ msgstr "" msgid "could not read from stdin" msgstr "" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "" @@ -3619,24 +5164,51 @@ msgstr "" msgid "could not rename temporary file to %s" msgstr "" -#: transport.c:62 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:151 +#: transport.c:142 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:888 +#: transport.c:586 +msgid "could not parse transport.color.* config" +msgstr "" + +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:785 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:851 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:998 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:892 +#: transport.c:1002 #, c-format msgid "" "\n" @@ -3652,123 +5224,294 @@ msgid "" "\n" msgstr "" -#: transport.c:900 +#: transport.c:1010 msgid "Aborting." msgstr "" -#: transport-helper.c:1071 +#: transport.c:1148 +msgid "failed to push all needed submodules" +msgstr "" + +#: transport.c:1270 transport-helper.c:643 +msgid "operation not supported by protocol" +msgstr "" + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "" + +#: transport-helper.c:132 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "" + +#: transport-helper.c:148 transport-helper.c:557 +msgid "can't dup helper output fd" +msgstr "" + +#: transport-helper.c:199 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" + +#: transport-helper.c:205 +msgid "this remote helper should implement refspec capability" +msgstr "" + +#: transport-helper.c:272 transport-helper.c:412 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "" + +#: transport-helper.c:401 +#, c-format +msgid "%s also locked %s" +msgstr "" + +#: transport-helper.c:479 +msgid "couldn't run fast-import" +msgstr "" + +#: transport-helper.c:502 +msgid "error while running fast-import" +msgstr "" + +#: transport-helper.c:531 transport-helper.c:1091 +#, c-format +msgid "could not read ref %s" +msgstr "" + +#: transport-helper.c:576 +#, c-format +msgid "unknown response to connect: %s" +msgstr "" + +#: transport-helper.c:598 +msgid "setting remote service path not supported by protocol" +msgstr "" + +#: transport-helper.c:600 +msgid "invalid remote service path" +msgstr "" + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "" + +#: transport-helper.c:713 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "" + +#: transport-helper.c:766 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "" + +#: transport-helper.c:827 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "" + +#: transport-helper.c:830 +#, c-format +msgid "helper %s does not support --signed" +msgstr "" + +#: transport-helper.c:833 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "" + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "" + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "" + +#: transport-helper.c:937 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "" + +#: transport-helper.c:984 +msgid "couldn't run fast-export" +msgstr "" + +#: transport-helper.c:989 +msgid "error while running fast-export" +msgstr "" + +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" + +#: transport-helper.c:1077 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "" + +#: transport-helper.c:1230 +#, c-format +msgid "read(%s) failed" +msgstr "" + +#: transport-helper.c:1257 +#, c-format +msgid "write(%s) failed" +msgstr "" + +#: transport-helper.c:1306 +#, c-format +msgid "%s thread failed" +msgstr "" + +#: transport-helper.c:1310 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "" + +#: transport-helper.c:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "" + +#: transport-helper.c:1374 #, c-format -msgid "Could not read ref %s" +msgid "%s process failed" +msgstr "" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:31 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:114 +#: tree-walk.c:115 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:106 +#: unpack-trees.c:112 #, 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:108 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:117 #, 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:113 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:122 #, 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:118 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:129 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:133 #, 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:129 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:138 #, 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:134 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:143 #, 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:139 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3776,7 +5519,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3784,47 +5527,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:156 #, 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:151 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:161 #, 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:156 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:163 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:166 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:168 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3832,7 +5575,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:178 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3840,19 +5583,19 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:180 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:249 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:331 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "" @@ -3885,18 +5628,43 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: worktree.c:245 +#: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "" +#: worktree.c:291 +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "" + +#: worktree.c:302 +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "" + +#: worktree.c:314 +#, c-format +msgid "'%s' does not exist" +msgstr "" + +#: worktree.c:320 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "" + +#: worktree.c:328 +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "" + #: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -3910,384 +5678,374 @@ msgstr "" msgid "unable to get current working directory" msgstr "" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "" - -#: wt-status.c:150 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:187 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:220 +#: wt-status.c:224 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:222 +#: wt-status.c:226 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:223 +#: wt-status.c:227 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:225 +#: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:237 +#: wt-status.c:241 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:252 +#: wt-status.c:256 msgid "both deleted:" msgstr "" -#: wt-status.c:254 +#: wt-status.c:258 msgid "added by us:" msgstr "" -#: wt-status.c:256 +#: wt-status.c:260 msgid "deleted by them:" msgstr "" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "" -#: wt-status.c:260 +#: wt-status.c:264 msgid "deleted by us:" msgstr "" -#: wt-status.c:262 +#: wt-status.c:266 msgid "both added:" msgstr "" -#: wt-status.c:264 +#: wt-status.c:268 msgid "both modified:" msgstr "" -#: wt-status.c:274 +#: wt-status.c:278 msgid "new file:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:280 msgid "copied:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:282 msgid "deleted:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:284 msgid "modified:" msgstr "" -#: wt-status.c:282 +#: wt-status.c:286 msgid "renamed:" msgstr "" -#: wt-status.c:284 +#: wt-status.c:288 msgid "typechange:" msgstr "" -#: wt-status.c:286 +#: wt-status.c:290 msgid "unknown:" msgstr "" -#: wt-status.c:288 +#: wt-status.c:292 msgid "unmerged:" msgstr "" -#: wt-status.c:370 +#: wt-status.c:372 msgid "new commits, " msgstr "" -#: wt-status.c:372 +#: wt-status.c:374 msgid "modified content, " msgstr "" -#: wt-status.c:374 +#: wt-status.c:376 msgid "untracked content, " msgstr "" -#: wt-status.c:819 +#: wt-status.c:853 #, 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 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:853 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:935 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1048 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1051 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1053 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1058 +#: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1074 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1078 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1080 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1082 +#: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1214 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1216 +#: wt-status.c:1252 msgid "No commands done." msgstr "" -#: wt-status.c:1219 +#: wt-status.c:1255 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1230 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1235 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "" -#: wt-status.c:1238 +#: wt-status.c:1274 #, 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:1246 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1259 +#: wt-status.c:1295 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1264 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1278 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1280 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1282 +#: wt-status.c:1318 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1288 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1292 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1297 +#: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1300 +#: wt-status.c:1336 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1304 +#: wt-status.c:1340 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1312 +#: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1350 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1329 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1332 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1334 +#: wt-status.c:1370 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1343 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1348 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1351 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1364 +#: wt-status.c:1400 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1368 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1407 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1568 +#: wt-status.c:1604 msgid "On branch " msgstr "" -#: wt-status.c:1574 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1576 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1581 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1583 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1586 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1606 +#: wt-status.c:1642 msgid "Initial commit" msgstr "" -#: wt-status.c:1607 +#: wt-status.c:1643 msgid "No commits yet" msgstr "" -#: wt-status.c:1621 +#: wt-status.c:1657 msgid "Untracked files" msgstr "" -#: wt-status.c:1623 +#: wt-status.c:1659 msgid "Ignored files" msgstr "" -#: wt-status.c:1627 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4295,93 +6053,97 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1633 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1635 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1641 +#: wt-status.c:1677 msgid "No changes" msgstr "" -#: wt-status.c:1646 +#: wt-status.c:1682 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1649 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1652 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1655 +#: wt-status.c:1691 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1658 +#: wt-status.c:1694 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1664 +#: wt-status.c:1700 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1668 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1780 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1852 +msgid "different" +msgstr "" + +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "" -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2376 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2317 +#: wt-status.c:2382 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2319 +#: wt-status.c:2384 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:437 +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -4390,122 +6152,122 @@ msgstr "" msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:251 +#: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: 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 +#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: builtin/add.c:274 +#: builtin/add.c:292 msgid "interactive picking" msgstr "" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:276 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:277 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:278 +#: builtin/add.c:296 msgid "update tracked files" msgstr "" -#: builtin/add.c:279 +#: builtin/add.c:297 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "" + +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:280 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:285 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:287 +#: builtin/add.c:306 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:288 builtin/update-index.c:954 -msgid "(+/-)x" -msgstr "" - -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:308 builtin/update-index.c:973 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:310 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:325 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4523,185 +6285,176 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:333 +#: builtin/add.c:353 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:379 msgid "adding files failed" msgstr "" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: 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 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "" -#: builtin/am.c:414 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "" -#: builtin/am.c:498 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:539 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:576 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:602 +#: builtin/am.c:603 msgid "fseek failed" msgstr "" -#: builtin/am.c:786 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:851 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:899 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "" -#: builtin/am.c:911 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:1004 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1013 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1193 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1194 +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1195 +#: builtin/am.c:1165 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1302 +#: builtin/am.c:1272 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1368 +#: builtin/am.c:1338 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1390 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1584 +#: builtin/am.c:1556 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1586 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1605 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1611 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1636 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1660 builtin/merge.c:641 -msgid "git write-tree failed to write a tree" -msgstr "" - -#: builtin/am.c:1667 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "" -#: 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:1713 builtin/am.c:1717 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1733 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1738 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "" @@ -4709,42 +6462,41 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1798 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1854 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1862 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1868 -#, c-format -msgid "The copy of the patch that failed is found in: %s" +#: builtin/am.c:1838 +msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1913 +#: builtin/am.c:1882 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:1920 +#: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4752,171 +6504,180 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 -#: builtin/reset.c:340 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 +#: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2081 +#: builtin/am.c:2048 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2116 +#: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2179 +#: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2212 +#: builtin/am.c:2210 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2211 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2219 +#: builtin/am.c:2217 msgid "run interactively" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2223 +#: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:180 +#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2231 +#: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2243 +#: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "" -#: 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 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 +#: builtin/am.c:2270 msgid "pass it through git-apply" msgstr "" -#: 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 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "" -#: 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 +#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/am.c:2269 +#: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2277 +#: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2280 +#: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2283 +#: builtin/am.c:2281 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2286 +#: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "" +#: builtin/am.c:2287 +msgid "abort the patching operation but keep HEAD where it is." +msgstr "" + #: builtin/am.c:2290 +msgid "show the patch being applied." +msgstr "" + +#: builtin/am.c:2294 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2298 +#: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2316 +#: builtin/am.c:2320 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:2323 +#: builtin/am.c:2327 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2338 +#: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2362 +#: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2368 +#: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -4938,7 +6699,7 @@ msgid "git archive: Remote with no URL" msgstr "" #: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" +msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "" #: builtin/archive.c:61 @@ -4954,127 +6715,204 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/blame.c:27 +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "" + +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:32 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:668 +#: builtin/blame.c:406 +#, c-format +msgid "expecting a color: %s" +msgstr "" + +#: builtin/blame.c:413 +msgid "must end with a color" +msgstr "" + +#: builtin/blame.c:700 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "" + +#: builtin/blame.c:718 +msgid "invalid value for blame.coloring" +msgstr "" + +#: builtin/blame.c:789 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:669 +#: builtin/blame.c:790 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:670 +#: builtin/blame.c:791 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:671 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:672 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:673 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:674 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:675 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:676 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:677 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:678 +#: builtin/blame.c:799 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:679 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:680 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:681 +#: builtin/blame.c:802 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:682 +#: builtin/blame.c:803 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:683 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:690 +#: builtin/blame.c:805 +msgid "color redundant metadata from previous line differently" +msgstr "" + +#: builtin/blame.c:806 +msgid "color lines by age" +msgstr "" + +#: builtin/blame.c:813 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:692 +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:693 +#: builtin/blame.c:816 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:694 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:695 builtin/blame.c:696 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "" -#: builtin/blame.c:695 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:696 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:697 +#: builtin/blame.c:820 msgid "n,m" msgstr "" -#: builtin/blame.c:697 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:744 +#: builtin/blame.c:869 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -5086,181 +6924,181 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:795 +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:882 +#: builtin/blame.c:1007 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:928 +#: builtin/blame.c:1053 msgid "Blaming lines" msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "" -#: builtin/branch.c:146 +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:150 +#: builtin/branch.c:155 #, 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:164 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:168 +#: builtin/branch.c:173 #, 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:181 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:218 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:232 +#: builtin/branch.c:237 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:247 +#: builtin/branch.c:252 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:248 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:271 +#: builtin/branch.c:276 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:272 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:417 builtin/tag.c:58 +#: builtin/branch.c:421 builtin/tag.c:59 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:450 +#: builtin/branch.c:458 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:454 +#: builtin/branch.c:462 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:470 +#: builtin/branch.c:479 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:472 +#: builtin/branch.c:481 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:483 +#: builtin/branch.c:492 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:504 +#: builtin/branch.c:519 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:506 +#: builtin/branch.c:521 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:510 +#: builtin/branch.c:525 #, c-format -msgid "Copied a misnamed branch '%s' away" +msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:513 +#: builtin/branch.c:528 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:519 +#: builtin/branch.c:534 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:528 +#: builtin/branch.c:543 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:530 +#: builtin/branch.c:545 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:546 +#: builtin/branch.c:561 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5268,221 +7106,223 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:602 msgid "Generic options" msgstr "" -#: builtin/branch.c:581 +#: builtin/branch.c:604 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:582 +#: builtin/branch.c:605 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:583 +#: builtin/branch.c:606 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:585 +#: builtin/branch.c:608 msgid "do not use" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:610 msgid "upstream" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:610 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:611 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:612 msgid "use colored output" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:613 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:615 builtin/branch.c:617 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:616 builtin/branch.c:618 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:598 +#: builtin/branch.c:621 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:622 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:601 +#: builtin/branch.c:624 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:602 +#: builtin/branch.c:625 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:603 +#: builtin/branch.c:626 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:604 +#: builtin/branch.c:627 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:605 +#: builtin/branch.c:628 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:606 +#: builtin/branch.c:629 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:607 +#: builtin/branch.c:630 msgid "list branch names" msgstr "" -#: builtin/branch.c:608 +#: builtin/branch.c:631 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:634 +msgid "deprecated synonym for --create-reflog" +msgstr "" + +#: builtin/branch.c:639 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:640 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:612 +#: builtin/branch.c:641 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:642 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:614 +#: builtin/branch.c:643 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 msgid "field name to sort on" msgstr "" -#: 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 +#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:648 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:674 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:697 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:713 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:720 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:723 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:738 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:747 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:812 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:816 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:785 +#: builtin/branch.c:822 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "" - -#: builtin/branch.c:803 +#: builtin/branch.c:837 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:806 +#: builtin/branch.c:840 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5501,78 +7341,82 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:521 +#: builtin/cat-file.c:577 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:522 +#: builtin/cat-file.c:578 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:624 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:625 git-submodule.sh:864 msgid "blob" msgstr "" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:626 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:631 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:578 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:637 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "" +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "" + #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "" @@ -5589,7 +7433,7 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "" @@ -5597,7 +7441,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 +#: builtin/worktree.c:447 msgid "suppress progress reporting" msgstr "" @@ -5609,27 +7454,27 @@ msgstr "" msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:158 +#: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:161 +#: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:164 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:167 +#: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -5654,103 +7499,103 @@ msgstr "" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "" -#: 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 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 +#: builtin/worktree.c:620 msgid "string" msgstr "" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:26 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:27 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:153 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:197 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:214 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:231 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:271 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" @@ -5760,54 +7605,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:501 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:632 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:673 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:681 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:684 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:688 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:692 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:743 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:749 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5822,7 +7667,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:768 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5839,196 +7684,213 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:809 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:813 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:845 builtin/checkout.c:1047 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1088 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: 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 +#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440 +#: builtin/worktree.c:442 msgid "branch" msgstr "" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1126 builtin/worktree.c:444 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1138 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1169 builtin/merge.c:238 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1146 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1150 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: 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 +#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1234 -msgid "Missing branch name; try -b" +#: builtin/checkout.c:1206 +msgid "missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1250 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1254 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:26 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:297 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6037,7 +7899,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:301 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6050,38 +7912,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:547 -#: git-add--interactive.perl:552 +#: builtin/clean.c:517 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:783 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6092,386 +7954,386 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:907 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:910 msgid "remove whole directories" msgstr "" -#: 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 +#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:39 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:83 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:90 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "pathspec" msgstr "" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:104 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "" -#: builtin/clone.c:105 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "" -#: builtin/clone.c:111 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3191 builtin/repack.c:320 msgid "name" msgstr "" -#: builtin/clone.c:113 +#: builtin/clone.c:118 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:115 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:117 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 +#: builtin/pull.c:216 msgid "depth" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 -#: parse-options.h:142 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182 +#: parse-options.h:154 msgid "time" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:126 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 msgid "revision" msgstr "" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:128 builtin/fetch.c:144 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:132 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:129 +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:130 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr "" -#: builtin/clone.c:131 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:132 +#: builtin/clone.c:137 msgid "key=value" msgstr "" -#: builtin/clone.c:133 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:273 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:326 +#: builtin/clone.c:332 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:398 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:406 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:420 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:442 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:446 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:471 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:483 +#: builtin/clone.c:492 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:560 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:655 -msgid "remote did not send all necessary objects" -msgstr "" - -#: builtin/clone.c:671 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:720 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:751 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:796 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:859 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:861 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:898 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:911 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:914 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:927 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:943 +#: builtin/clone.c:959 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:953 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 +#: builtin/worktree.c:247 builtin/worktree.c:277 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:971 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:983 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:985 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1071 +#: builtin/clone.c:1096 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1073 +#: builtin/clone.c:1098 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1075 +#: builtin/clone.c:1100 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1078 -msgid "source repository is shallow, ignoring --local" +#: builtin/clone.c:1102 +msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1083 -msgid "--local is ignored" +#: builtin/clone.c:1105 +msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" +#: builtin/clone.c:1110 +msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1153 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "" @@ -6503,55 +8365,26 @@ msgstr "" msgid "Padding space between columns" msgstr "" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:39 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:44 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "" -#: 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" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" - -#: builtin/commit.c:62 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" - -#: builtin/commit.c:74 +#: builtin/commit.c:48 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:79 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6560,11 +8393,11 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:86 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:89 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6574,98 +8407,98 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:318 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:359 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:365 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:378 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:380 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:461 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:463 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:471 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:490 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:587 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:589 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:608 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:660 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:709 builtin/shortlog.c:309 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:711 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:715 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:742 builtin/commit.c:750 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:747 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:801 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:819 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -6675,7 +8508,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:824 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -6685,14 +8518,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:837 +#: builtin/commit.c:823 #, 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:844 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6700,485 +8533,599 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:861 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:869 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:876 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:893 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:958 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:960 builtin/tag.c:258 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1075 +#: builtin/commit.c:1004 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1018 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "" + +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1128 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1103 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1167 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1115 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1117 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1130 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1187 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +#: builtin/commit.c:1132 +msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1140 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1212 +#: builtin/commit.c:1157 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1159 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "" -#: builtin/commit.c:1353 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "" -#: builtin/commit.c:1355 +#: builtin/commit.c:1309 builtin/commit.c:1484 +msgid "compute full ahead/behind values" +msgstr "" + +#: builtin/commit.c:1311 msgid "version" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:591 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1320 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1367 -msgid "show ignored files" +#: builtin/commit.c:1324 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" msgstr "" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1449 -msgid "couldn't look up newly created commit" -msgstr "" - -#: builtin/commit.c:1451 -msgid "could not parse newly created commit" +#: builtin/commit.c:1330 +msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1496 -msgid "detached HEAD" +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1499 -msgid " (root-commit)" +#: builtin/commit.c:1352 +msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1455 msgid "author" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:386 +#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1457 msgid "commit message" msgstr "" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1608 +#: builtin/commit.c:1462 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1610 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1612 +#: builtin/commit.c:1466 msgid "default" msgstr "" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 -#: builtin/revert.c:113 +#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1625 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1636 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1637 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1644 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1674 -msgid "could not parse HEAD commit" -msgstr "" - -#: builtin/commit.c:1719 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1726 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1745 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1756 +#: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1761 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1809 +#: builtin/commit.c:1650 msgid "" -"Repository has been updated, but unable to write\n" +"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/commit-graph.c:10 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" +msgstr "" + +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 +msgid "dir" +msgstr "" + +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:136 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:138 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:140 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + #: builtin/config.c:10 msgid "git config [<options>]" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "" + +#: builtin/config.c:113 +msgid "only one type at a time" +msgstr "" + +#: builtin/config.c:122 msgid "Config file location" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:123 msgid "use global config file" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:124 msgid "use system config file" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:125 msgid "use repository config file" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:126 msgid "use given config file" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:127 msgid "blob-id" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "Action" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:139 msgid "list all" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:140 msgid "open an editor" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:143 msgid "Type" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:144 +msgid "value is given this type" +msgstr "" + +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:83 +#: builtin/config.c:149 +msgid "value is an expiry date" +msgstr "" + +#: builtin/config.c:150 msgid "Other" msgstr "" -#: builtin/config.c:84 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:85 +#: builtin/config.c:152 msgid "show variable names only" msgstr "" -#: builtin/config.c:86 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:87 +#: builtin/config.c:154 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:327 +#: builtin/config.c:155 +msgid "value" +msgstr "" + +#: builtin/config.c:155 +msgid "with --get, use default value when missing entry" +msgstr "" + +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "" + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "" + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "" + +#: builtin/config.c:340 +#, c-format +msgid "failed to format default config value: %s" +msgstr "" + +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "" + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:471 +#: builtin/config.c:492 builtin/config.c:724 +msgid "not in a git directory" +msgstr "" + +#: builtin/config.c:495 +msgid "writing to stdin is not supported" +msgstr "" + +#: builtin/config.c:498 +msgid "writing config blobs is not supported" +msgstr "" + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7188,185 +9135,246 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "" + +#: builtin/config.c:611 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:624 +#: builtin/config.c:614 +msgid "--blob can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:633 +msgid "$HOME not set" +msgstr "" + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "" + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "" + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "" + +#: builtin/config.c:713 +#, c-format +msgid "unable to read config file '%s'" +msgstr "" + +#: builtin/config.c:716 +msgid "error processing config file(s)" +msgstr "" + +#: builtin/config.c:726 +msgid "editing stdin is not supported" +msgstr "" + +#: builtin/config.c:728 +msgid "editing blobs is not supported" +msgstr "" + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:637 +#: builtin/config.c:755 #, 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:88 +#: builtin/config.c:829 builtin/config.c:840 +#, c-format +msgid "no such section: %s" +msgstr "" + +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:19 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:20 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:62 msgid "head" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:62 msgid "lightweight" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:62 msgid "annotated" msgstr "" -#: builtin/describe.c:264 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:268 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: builtin/describe.c:317 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:324 #, c-format -msgid "searching to describe %s\n" +msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:366 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:393 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:427 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:452 +#: builtin/describe.c:509 +#, c-format +msgid "describe %s\n" +msgstr "" + +#: builtin/describe.c:512 builtin/log.c:508 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:520 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "" + +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:453 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:454 +#: builtin/describe.c:536 msgid "use any ref" msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:456 +#: builtin/describe.c:538 msgid "always use long format" msgstr "" -#: builtin/describe.c:457 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:460 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:464 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:466 +#: builtin/describe.c:548 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "" -#: builtin/describe.c:470 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:473 +#: builtin/describe.c:555 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:491 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:520 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:563 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:565 +#: builtin/describe.c:654 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -7375,55 +9383,55 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:357 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:400 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:409 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:414 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/difftool.c:29 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:259 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:301 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:303 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:311 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7459,125 +9467,121 @@ msgstr "" msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:707 -msgid "<tool>" +#: builtin/difftool.c:706 +msgid "tool" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" #: builtin/difftool.c:715 -msgid "<command>" -msgstr "" - -#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1025 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:24 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:25 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:26 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:114 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "" @@ -7585,7 +9589,7 @@ msgstr "" msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "" @@ -7597,254 +9601,268 @@ msgstr "" msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" + +#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "" -#: builtin/fetch.c:129 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:135 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:140 +#: builtin/fetch.c:142 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:148 builtin/log.c:1456 -msgid "dir" -msgstr "" - -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:416 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "" + +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "" + +#: builtin/fetch.c:167 +msgid "report that we have only objects reachable from this object" +msgstr "" + +#: builtin/fetch.c:418 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:534 +#: builtin/fetch.c:552 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:627 +#: builtin/fetch.c:645 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:631 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:645 +#: builtin/fetch.c:663 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:654 +#: builtin/fetch.c:672 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:674 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:677 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:680 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:719 +#: builtin/fetch.c:739 msgid "forced update" msgstr "" -#: builtin/fetch.c:724 +#: builtin/fetch.c:744 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:769 +#: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:811 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:877 builtin/fetch.c:973 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:911 #, 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:943 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:944 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1038 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1019 +#: builtin/fetch.c:1057 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1022 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 +msgid "" +"--filter can only be used with the remote configured in core.partialClone" +msgstr "" + +#: builtin/fetch.c:1410 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:1301 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1496 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1498 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1505 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1523 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1539 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:15 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "" @@ -7884,7 +9902,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:414 +#: builtin/for-each-ref.c:39 builtin/tag.c:422 msgid "respect format colors" msgstr "" @@ -7908,81 +9926,81 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:543 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:635 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:641 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:642 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:643 +#: builtin/fsck.c:674 msgid "report tags" msgstr "" -#: builtin/fsck.c:644 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:645 +#: builtin/fsck.c:676 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:646 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:647 +#: builtin/fsck.c:678 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:648 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:649 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:651 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:652 builtin/prune.c:107 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "" -#: builtin/fsck.c:653 +#: builtin/fsck.c:684 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:714 +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "" -#: builtin/gc.c:27 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:80 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:312 +#: builtin/gc.c:455 #, c-format msgid "Can't stat %s" msgstr "" -#: builtin/gc.c:321 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7992,54 +10010,63 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:360 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:362 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:363 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:364 +#: builtin/gc.c:511 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:381 +#: builtin/gc.c:514 +msgid "repack all other packs except the largest pack" +msgstr "" + +#: builtin/gc.c:531 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "" + +#: builtin/gc.c:542 #, c-format -msgid "Failed to parse gc.logexpiry value %s" +msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:409 +#: builtin/gc.c:562 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:411 +#: builtin/gc.c:564 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:412 +#: builtin/gc.c:565 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:437 +#: builtin/gc.c:601 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:481 +#: builtin/gc.c:652 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:27 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" @@ -8057,696 +10084,684 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2636 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:628 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:781 +#: builtin/grep.c:791 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:783 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:785 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:787 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:789 +#: builtin/grep.c:799 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:792 +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:796 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:798 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:800 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:832 +msgid "show column number of first match" +msgstr "" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:834 msgid "show filenames" msgstr "" -#: builtin/grep.c:825 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:848 +msgid "show only matching parts of a line" +msgstr "" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:855 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:844 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:869 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:892 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:898 msgid "pager" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:950 -msgid "no pattern given." +#: builtin/grep.c:966 +msgid "no pattern given" msgstr "" -#: builtin/grep.c:982 +#: builtin/grep.c:1002 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:989 +#: builtin/grep.c:1009 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1028 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1052 +#: builtin/grep.c:1073 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1075 -msgid "option not supported with --recurse-submodules." +#: builtin/grep.c:1096 +msgid "option not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1081 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/grep.c:1102 +msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1087 -msgid "--[no-]exclude-standard cannot be used for tracked contents." +#: builtin/grep.c:1108 +msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1095 -msgid "both --cached and trees are given." +#: builtin/grep.c:1116 +msgid "both --cached and trees are given" msgstr "" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:97 msgid "type" msgstr "" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:97 msgid "object type" msgstr "" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:46 msgid "print all available commands" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:47 msgid "exclude guides" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "" + +#: builtin/help.c:51 msgid "show man page" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:54 msgid "show info page" msgstr "" -#: builtin/help.c:55 +#: builtin/help.c:56 +msgid "print command description" +msgstr "" + +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:67 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:94 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:107 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:115 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:340 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:357 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:365 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:407 -msgid "Defining attributes per path" -msgstr "" - -#: builtin/help.c:408 -msgid "Everyday Git With 20 Commands Or So" -msgstr "" - -#: builtin/help.c:409 -msgid "A Git glossary" -msgstr "" - -#: builtin/help.c:410 -msgid "Specifies intentionally untracked files to ignore" -msgstr "" - -#: builtin/help.c:411 -msgid "Defining submodule properties" -msgstr "" - -#: builtin/help.c:412 -msgid "Specifying revisions and ranges for Git" -msgstr "" - -#: builtin/help.c:413 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "" - -#: builtin/help.c:414 -msgid "An overview of recommended workflows with Git" -msgstr "" - -#: builtin/help.c:426 -msgid "The common Git guides are:\n" -msgstr "" - -#: builtin/help.c:444 +#: builtin/help.c:418 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:466 builtin/help.c:483 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:156 -#, c-format -msgid "unable to open %s" +#: builtin/help.c:459 +msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:206 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:229 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:271 +#: builtin/index-pack.c:273 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:301 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:359 +#: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:480 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:529 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:580 #, 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:604 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "" -#: 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 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:815 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:837 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:852 -#, c-format -msgid "invalid %s" +#: builtin/index-pack.c:842 builtin/index-pack.c:861 +msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:855 -msgid "Error in object" +#: builtin/index-pack.c:858 +#, c-format +msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:857 +#: builtin/index-pack.c:863 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:929 builtin/index-pack.c:960 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1272 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1288 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1409 -msgid "error while closing pack file" +#: builtin/index-pack.c:1403 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1421 +#: builtin/index-pack.c:1428 #, c-format -msgid "cannot write keep file '%s'" +msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1436 #, c-format -msgid "cannot close written keep file '%s'" +msgid "cannot close written %s file '%s'" +msgstr "" + +#: builtin/index-pack.c:1460 +msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1555 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1645 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1610 +#: builtin/index-pack.c:1652 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1623 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" +#: builtin/index-pack.c:1689 +msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1781 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "" +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 +msgid "fsck error in pack objects" +msgstr "" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -8762,103 +10777,103 @@ msgstr "" msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format -msgid "templates not found %s" +msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:405 +#: builtin/init-db.c:406 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:410 +#: builtin/init-db.c:411 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:458 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "permissions" msgstr "" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:516 builtin/init-db.c:521 +#: builtin/init-db.c:517 builtin/init-db.c:522 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:525 +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:546 +#: builtin/init-db.c:547 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:574 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -8921,519 +10936,531 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:46 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:47 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:91 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:148 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "" -#: builtin/log.c:149 +#: builtin/log.c:158 msgid "show source" msgstr "" -#: builtin/log.c:150 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "" -#: builtin/log.c:151 +#: builtin/log.c:161 +msgid "only decorate refs that match <pattern>" +msgstr "" + +#: builtin/log.c:163 +msgid "do not decorate refs that match <pattern>" +msgstr "" + +#: builtin/log.c:164 msgid "decorate options" msgstr "" -#: builtin/log.c:154 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:250 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:501 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:634 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:755 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "" -#: builtin/log.c:856 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:872 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:889 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:899 +#: builtin/log.c:914 msgid "Not a range." msgstr "" -#: builtin/log.c:1005 +#: builtin/log.c:1020 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1085 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1162 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1284 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1288 +#: builtin/log.c:1304 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:1308 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1319 +#: builtin/log.c:1335 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1323 +#: builtin/log.c:1339 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1372 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1431 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1434 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1438 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1440 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1442 +#: builtin/log.c:1463 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1464 msgid "sfx" msgstr "" -#: builtin/log.c:1444 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1446 +#: builtin/log.c:1467 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1471 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1459 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1464 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1466 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1468 +#: builtin/log.c:1489 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1470 +#: builtin/log.c:1491 msgid "Messaging" msgstr "" -#: builtin/log.c:1471 +#: builtin/log.c:1492 msgid "header" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1493 msgid "add email header" msgstr "" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" msgstr "" -#: builtin/log.c:1473 +#: builtin/log.c:1494 msgid "add To: header" msgstr "" -#: builtin/log.c:1475 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1477 +#: builtin/log.c:1498 msgid "ident" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1499 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1480 +#: builtin/log.c:1501 msgid "message-id" msgstr "" -#: builtin/log.c:1481 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "" -#: builtin/log.c:1483 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "" -#: builtin/log.c:1486 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "" -#: builtin/log.c:1490 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1492 +#: builtin/log.c:1513 msgid "signature" msgstr "" -#: builtin/log.c:1493 +#: builtin/log.c:1514 msgid "add a signature" msgstr "" -#: builtin/log.c:1494 +#: builtin/log.c:1515 msgid "base-commit" msgstr "" -#: builtin/log.c:1495 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1497 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1498 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1500 +#: builtin/log.c:1521 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1596 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1590 -msgid "-n and -k are mutually exclusive." +#: builtin/log.c:1611 +msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1592 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." +#: builtin/log.c:1613 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1634 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1636 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1729 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1761 +#: builtin/log.c:1785 msgid "Generating patches" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1855 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1909 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:522 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "" + +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:537 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:556 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:561 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:564 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:566 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:568 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -9442,180 +11469,180 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:48 +#: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "" -#: builtin/merge.c:49 +#: builtin/merge.c:52 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:50 +#: builtin/merge.c:53 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:107 +#: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:144 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:145 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:150 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:232 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:203 builtin/pull.c:137 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:238 builtin/pull.c:151 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:146 +#: builtin/merge.c:241 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:214 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:252 builtin/pull.c:172 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 -#: builtin/revert.c:109 +#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:226 +#: builtin/merge.c:258 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:230 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:232 +#: builtin/merge.c:267 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:240 +#: builtin/merge.c:275 msgid "verify commit-msg hook" msgstr "" -#: builtin/merge.c:265 +#: builtin/merge.c:300 msgid "could not run stash." msgstr "" -#: builtin/merge.c:270 +#: builtin/merge.c:305 msgid "stash failed" msgstr "" -#: builtin/merge.c:275 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:297 builtin/merge.c:314 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:344 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:355 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:405 +#: builtin/merge.c:440 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:456 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:546 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:699 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:680 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:695 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:747 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:756 +#: builtin/merge.c:788 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:762 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9625,226 +11652,226 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:818 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:871 +#: builtin/merge.c:902 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:910 +#: builtin/merge.c:941 msgid "No current branch." msgstr "" -#: builtin/merge.c:912 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:914 +#: builtin/merge.c:945 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:919 +#: builtin/merge.c:950 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:1007 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1073 +#: builtin/merge.c:1110 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1107 +#: builtin/merge.c:1144 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1172 +#: builtin/merge.c:1247 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1176 +#: builtin/merge.c:1251 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1188 +#: builtin/merge.c:1263 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1192 +#: builtin/merge.c:1267 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1215 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1218 +#: builtin/merge.c:1293 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1227 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1235 +#: builtin/merge.c:1310 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1252 +#: builtin/merge.c:1327 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1329 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1259 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1336 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1370 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1298 +#: builtin/merge.c:1373 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1301 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1304 +#: builtin/merge.c:1379 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1366 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1375 +#: builtin/merge.c:1447 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1385 +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1426 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1433 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1458 +#: builtin/merge.c:1530 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1464 +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1491 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1557 +#: builtin/merge.c:1629 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1559 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1568 +#: builtin/merge.c:1640 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1580 +#: builtin/merge.c:1652 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "" -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "" @@ -9917,19 +11944,19 @@ msgstr "" msgid "Merging %s with %s\n" msgstr "" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "" @@ -9937,21 +11964,21 @@ msgstr "" msgid "git mv [<options>] <source>... <destination>" msgstr "" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "" @@ -9959,285 +11986,285 @@ msgstr "" msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:418 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:27 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +#: builtin/notes.c:38 +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:195 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:500 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:236 builtin/tag.c:503 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format msgid "could not open or read '%s'" msgstr "" -#: 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 +#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:258 +#: builtin/notes.c:260 #, c-format msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:262 +#: builtin/notes.c:264 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:302 +#: builtin/notes.c:304 #, c-format msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:317 +#: builtin/notes.c:319 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "" @@ -10245,185 +12272,185 @@ msgstr "" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:349 +#: builtin/notes.c:351 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: 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 +#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:441 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:488 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:490 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:508 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "" -#: builtin/notes.c:529 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:541 +#: builtin/notes.c:543 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:593 +#: builtin/notes.c:595 #, 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:688 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:690 +#: builtin/notes.c:692 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:692 +#: builtin/notes.c:694 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:712 +#: builtin/notes.c:714 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:714 +#: builtin/notes.c:716 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:716 +#: builtin/notes.c:718 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:732 +#: builtin/notes.c:734 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:758 +#: builtin/notes.c:760 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:774 +#: builtin/notes.c:776 msgid "General options" msgstr "" -#: builtin/notes.c:776 +#: builtin/notes.c:778 msgid "Merge options" msgstr "" -#: builtin/notes.c:778 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:780 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:782 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:784 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:786 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:797 +#: builtin/notes.c:799 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:802 +#: builtin/notes.c:804 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:826 +#: builtin/notes.c:828 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:866 +#: builtin/notes.c:868 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:868 +#: builtin/notes.c:870 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10431,317 +12458,509 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:890 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:905 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:944 +#: builtin/notes.c:946 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:986 +#: builtin/notes.c:988 msgid "notes-ref" msgstr "" -#: builtin/notes.c:987 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1022 +#: builtin/notes.c:1024 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:414 #, c-format -msgid "deflate error (%d)" +msgid "bad packed object CRC for %s" +msgstr "" + +#: builtin/pack-objects.c:425 +#, c-format +msgid "corrupt packed object for %s" +msgstr "" + +#: builtin/pack-objects.c:556 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "" + +#: builtin/pack-objects.c:756 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:769 +#, c-format +msgid "packfile is invalid: %s" +msgstr "" + +#: builtin/pack-objects.c:773 +#, c-format +msgid "unable to open packfile for reuse: %s" msgstr "" #: builtin/pack-objects.c:777 +msgid "unable to seek in reused packfile" +msgstr "" + +#: builtin/pack-objects.c:788 +msgid "unable to read from reused packfile" +msgstr "" + +#: builtin/pack-objects.c:816 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:1112 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:1489 +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "" + +#: builtin/pack-objects.c:1498 +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "" + +#: builtin/pack-objects.c:1771 +msgid "Counting objects" +msgstr "" + +#: builtin/pack-objects.c:1913 +#, c-format +msgid "unable to get size of %s" +msgstr "" + +#: builtin/pack-objects.c:1928 +#, c-format +msgid "unable to parse object header of %s" +msgstr "" + +#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, c-format +msgid "object %s cannot be read" +msgstr "" + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "" + +#: builtin/pack-objects.c:2366 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "" + +#: builtin/pack-objects.c:2502 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "" + +#: builtin/pack-objects.c:2586 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2592 +msgid "inconsistency with delta count" +msgstr "" + +#: builtin/pack-objects.c:2671 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2677 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2757 +msgid "invalid value for --missing" +msgstr "" + +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924 +msgid "cannot open pack index" +msgstr "" + +#: builtin/pack-objects.c:2847 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "" + +#: builtin/pack-objects.c:2932 +msgid "unable to force loose object" +msgstr "" + +#: builtin/pack-objects.c:3019 +#, c-format +msgid "not a rev '%s'" +msgstr "" + +#: builtin/pack-objects.c:3022 +#, c-format +msgid "bad revision '%s'" +msgstr "" + +#: builtin/pack-objects.c:3042 +msgid "unable to add recent objects" +msgstr "" + +#: builtin/pack-objects.c:3092 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:3096 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:3127 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:3129 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:3131 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:3134 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2891 -msgid "version[,offset]" +#: builtin/pack-objects.c:3135 +msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:3136 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:3139 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:3141 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:3143 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:3145 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:3147 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:3149 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:3151 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:3153 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:3155 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:3157 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:3159 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:3161 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:3163 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3166 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:3169 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:3172 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:3175 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:3177 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:3179 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:3181 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:3183 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:3186 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:3188 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:3190 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3192 +msgid "ignore this pack" +msgstr "" + +#: builtin/pack-objects.c:3194 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3196 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3198 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:3200 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3081 -msgid "Counting objects" +#: builtin/pack-objects.c:3203 +msgid "handling for missing objects" +msgstr "" + +#: builtin/pack-objects.c:3206 +msgid "do not pack objects in promisor packfiles" +msgstr "" + +#: builtin/pack-objects.c:3230 +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3235 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "" + +#: builtin/pack-objects.c:3291 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" + +#: builtin/pack-objects.c:3293 +msgid "minimum pack size limit is 1 MiB" +msgstr "" + +#: builtin/pack-objects.c:3298 +msgid "--thin cannot be used to build an indexable pack" +msgstr "" + +#: builtin/pack-objects.c:3301 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "" + +#: builtin/pack-objects.c:3307 +msgid "cannot use --filter without --stdout" +msgstr "" + +#: builtin/pack-objects.c:3363 +msgid "Enumerating objects" +msgstr "" + +#: builtin/pack-objects.c:3382 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "" + +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "" -#: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:106 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:109 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "" -#: builtin/prune.c:123 +#: builtin/prune.c:114 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "" + +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: builtin/pull.c:76 +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:124 +#: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:128 +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:131 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:164 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:180 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:198 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:287 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:403 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:405 +#: builtin/pull.c:422 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:406 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:409 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10749,69 +12968,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:446 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:455 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:443 +#: builtin/pull.c:460 #, 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:796 +#: builtin/pull.c:829 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:844 +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:852 +#: builtin/pull.c:885 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:855 +#: builtin/pull.c:888 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:856 +#: builtin/pull.c:889 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:881 +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10819,7 +13038,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:886 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10830,37 +13049,37 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:901 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:905 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:912 +#: builtin/pull.c:945 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" -#: builtin/push.c:17 +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:90 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:100 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:144 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:147 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -10875,7 +13094,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:162 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -10885,7 +13104,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:176 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -10894,12 +13113,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:184 +#: builtin/push.c:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:187 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -10907,12 +13126,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:246 +#: builtin/push.c:267 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:253 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10920,7 +13139,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:259 +#: builtin/push.c:280 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" @@ -10928,7 +13147,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:265 +#: builtin/push.c:286 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" @@ -10937,33 +13156,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:272 +#: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:275 +#: builtin/push.c:296 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:335 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:339 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:370 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:371 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10976,115 +13195,140 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:389 -msgid "--all and --tags are incompatible" -msgstr "" - -#: builtin/push.c:390 -msgid "--all can't be combined with refspecs" -msgstr "" - -#: builtin/push.c:395 -msgid "--mirror and --tags are incompatible" -msgstr "" - -#: builtin/push.c:396 -msgid "--mirror can't be combined with refspecs" -msgstr "" - -#: builtin/push.c:401 -msgid "--all and --mirror are incompatible" -msgstr "" - -#: builtin/push.c:523 +#: builtin/push.c:551 msgid "repository" msgstr "" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "" -#: builtin/push.c:527 +#: builtin/push.c:555 msgid "delete refs" msgstr "" -#: builtin/push.c:528 +#: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "" -#: builtin/push.c:533 builtin/send-pack.c:180 -msgid "refname>:<expect" +#: builtin/push.c:561 builtin/send-pack.c:181 +msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 -#: builtin/send-pack.c:161 +#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "" -#: builtin/push.c:542 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:545 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:547 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:548 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:554 builtin/send-pack.c:171 -msgid "server-specific" +#: builtin/push.c:599 +msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:554 builtin/send-pack.c:172 -msgid "option to transmit" +#: builtin/push.c:601 +msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:568 -msgid "--delete is incompatible with --all, --mirror and --tags" +#: builtin/push.c:604 +msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:570 -msgid "--delete doesn't make sense without any refs" +#: builtin/push.c:606 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:610 +msgid "--mirror and --tags are incompatible" +msgstr "" + +#: builtin/push.c:612 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:615 +msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:589 +#: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "" +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" + +#: builtin/range-diff.c:9 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "" + +#: builtin/range-diff.c:28 +msgid "use simple diff colors" +msgstr "" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, c-format +msgid "no .. in range: '%s'" +msgstr "" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "" + +#: builtin/range-diff.c:104 +msgid "need two commit ranges" +msgstr "" + #: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -11092,67 +13336,67 @@ msgid "" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "" -#: builtin/read-tree.c:146 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "" @@ -11160,47 +13404,67 @@ msgstr "" msgid "git rebase--helper [<options>]" msgstr "" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:26 builtin/revert.c:124 +msgid "allow commits with empty messages" +msgstr "" + +#: builtin/rebase--helper.c:27 +msgid "rebase merge commits" +msgstr "" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "" + +#: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "" -#: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" +#: builtin/rebase--helper.c:37 +msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" +#: builtin/rebase--helper.c:39 +msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:47 +msgid "insert exec commands in todo list" +msgstr "" + +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "" + +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:830 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" @@ -11217,7 +13481,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:850 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" @@ -11229,194 +13493,185 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "" -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/remote.c:13 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:14 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:15 builtin/remote.c:35 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:16 builtin/remote.c:40 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:17 builtin/remote.c:45 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:18 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:19 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:20 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:21 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:22 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:30 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:50 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:51 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:56 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:61 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:66 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:95 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:127 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:144 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:160 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:162 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:165 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:167 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:170 msgid "master branch" msgstr "" -#: builtin/remote.c:169 -msgid "push|fetch" -msgstr "" - -#: builtin/remote.c:170 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:182 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:184 +#: builtin/remote.c:186 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:191 builtin/remote.c:631 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:195 builtin/remote.c:635 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:235 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:337 +#: builtin/remote.c:343 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:438 builtin/remote.c:446 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "" -#: builtin/remote.c:450 +#: builtin/remote.c:454 msgid "(delete)" msgstr "" -#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:641 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:661 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11424,17 +13679,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:697 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:731 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:796 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11444,113 +13699,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:810 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:911 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:914 +#: builtin/remote.c:919 msgid " tracked" msgstr "" -#: builtin/remote.c:916 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:918 +#: builtin/remote.c:923 msgid " ???" msgstr "" -#: builtin/remote.c:959 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:967 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:968 +#: builtin/remote.c:975 +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "" + +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:971 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:974 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:977 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1020 +#: builtin/remote.c:1031 msgid "create" msgstr "" -#: builtin/remote.c:1023 +#: builtin/remote.c:1034 msgid "delete" msgstr "" -#: builtin/remote.c:1027 +#: builtin/remote.c:1038 msgid "up to date" msgstr "" -#: builtin/remote.c:1030 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1033 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "" -#: builtin/remote.c:1040 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1043 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1047 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1050 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1118 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1145 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1146 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "" @@ -11558,367 +13818,526 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1161 builtin/remote.c:1163 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1165 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1167 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1171 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1183 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1186 builtin/remote.c:1212 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1195 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1203 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1209 +#: builtin/remote.c:1220 #, 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:1230 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1232 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1247 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1249 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1267 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1269 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1287 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1288 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1299 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1315 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1318 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1363 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1442 +#: builtin/remote.c:1453 msgid "add branch" msgstr "" -#: builtin/remote.c:1449 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1466 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1468 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1496 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1522 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1524 +#: builtin/remote.c:1535 msgid "add URL" msgstr "" -#: builtin/remote.c:1526 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1533 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1572 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1580 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1582 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1598 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/remote.c:1629 +#: builtin/remote.c:1640 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/repack.c:18 +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:168 +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:170 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:173 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:175 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:177 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:179 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:182 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:184 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:185 +#: builtin/repack.c:304 msgid "approxidate" msgstr "" -#: builtin/repack.c:186 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:188 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:190 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:191 builtin/repack.c:197 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "" -#: builtin/repack.c:192 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:194 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:196 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:198 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:200 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:210 +#: builtin/repack.c:321 +msgid "do not repack this pack" +msgstr "" + +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:214 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:510 builtin/worktree.c:140 #, c-format msgid "failed to remove '%s'" msgstr "" -#: builtin/replace.c:20 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "" -#: builtin/replace.c:21 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "" -#: builtin/replace.c:22 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "" -#: builtin/replace.c:23 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "" -#: builtin/replace.c:24 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 +#, c-format +msgid "failed to resolve '%s' as a valid ref" +msgstr "" + +#: builtin/replace.c:86 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" + +#: builtin/replace.c:121 +#, c-format +msgid "replace ref '%s' not found" +msgstr "" + +#: builtin/replace.c:137 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "" + +#: builtin/replace.c:149 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "" + +#: builtin/replace.c:154 +#, c-format +msgid "replace ref '%s' already exists" +msgstr "" + +#: builtin/replace.c:174 +#, c-format +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" + +#: builtin/replace.c:225 +#, c-format +msgid "unable to open %s for writing" +msgstr "" + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "" + +#: builtin/replace.c:254 +#, c-format +msgid "unable to open %s for reading" +msgstr "" + +#: builtin/replace.c:268 +msgid "unable to spawn mktree" +msgstr "" + +#: builtin/replace.c:272 +msgid "unable to read from mktree" +msgstr "" + +#: builtin/replace.c:281 +msgid "mktree reported failure" +msgstr "" + +#: builtin/replace.c:285 +msgid "mktree did not return an object name" +msgstr "" + +#: builtin/replace.c:294 +#, c-format +msgid "unable to fstat %s" +msgstr "" + +#: builtin/replace.c:299 +msgid "unable to write object to database" +msgstr "" + +#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 +#: builtin/replace.c:445 #, c-format -msgid "Not a valid object name: '%s'" +msgid "not a valid object name: '%s'" msgstr "" -#: builtin/replace.c:361 +#: builtin/replace.c:322 +#, c-format +msgid "unable to get object type for %s" +msgstr "" + +#: builtin/replace.c:338 +msgid "editing object file failed" +msgstr "" + +#: builtin/replace.c:347 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:363 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:374 +#: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:407 +#: builtin/replace.c:460 #, c-format -msgid "the original commit '%s' has a gpg signature." +msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:408 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:414 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:438 +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "" + +#: builtin/replace.c:482 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:514 +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "" -#: builtin/replace.c:439 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:440 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "" -#: builtin/replace.c:441 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:442 +#: builtin/replace.c:539 +msgid "convert existing graft file" +msgstr "" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:443 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:444 +#: builtin/replace.c:543 msgid "use this format" msgstr "" +#: builtin/replace.c:556 +msgid "--format cannot be used when not listing" +msgstr "" + +#: builtin/replace.c:564 +msgid "-f only makes sense when writing a replacement" +msgstr "" + +#: builtin/replace.c:568 +msgid "--raw only makes sense with --edit" +msgstr "" + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "" + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "" + +#: builtin/replace.c:586 +msgid "-e needs exactly one argument" +msgstr "" + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "" + +#: builtin/replace.c:598 +msgid "--convert-graft-file takes no argument" +msgstr "" + +#: builtin/replace.c:604 +msgid "only one pattern can be given with -l" +msgstr "" + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" @@ -11973,106 +14392,123 @@ msgstr "" msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:113 +#: builtin/reset.c:111 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:197 +#: builtin/reset.c:189 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:289 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:299 +#: builtin/reset.c:291 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:300 +#: builtin/reset.c:292 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:302 builtin/reset.c:304 +#: builtin/reset.c:294 builtin/reset.c:296 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:306 +#: builtin/reset.c:298 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:312 +#: builtin/reset.c:304 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:329 +#: builtin/reset.c:321 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:337 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:346 +#: builtin/reset.c:338 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:355 +#: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:357 +#: builtin/reset.c:349 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:367 +#: builtin/reset.c:359 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:371 +#: builtin/reset.c:363 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:388 +#: builtin/reset.c:380 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:394 +#: builtin/reset.c:386 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:398 +#: builtin/reset.c:390 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "cannot combine --exclude-promisor-objects and --missing" +msgstr "" + +#: builtin/rev-list.c:457 +msgid "object filtering requires --objects" +msgstr "" + +#: builtin/rev-list.c:460 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "" + +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-parse.c:402 +#: builtin/rev-list.c:504 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "" + +#: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:409 +#: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:545 +#: builtin/rev-parse.c:549 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12081,88 +14517,84 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "" -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "" -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "" -#: builtin/revert.c:90 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "parent-number" msgstr "" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "select mainline parent" msgstr "" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "merge strategy" msgstr "" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option" msgstr "" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:120 +#: builtin/revert.c:121 msgid "append commit name" msgstr "" -#: builtin/revert.c:122 -msgid "preserve initially empty commits" -msgstr "" - #: builtin/revert.c:123 -msgid "allow commits with empty messages" +msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:214 +#: builtin/revert.c:219 msgid "revert failed" msgstr "" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "" @@ -12204,42 +14636,46 @@ msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:243 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:244 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:245 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:246 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:248 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:307 +#: builtin/rm.c:288 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:346 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "" -#: builtin/rm.c:369 +#: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "" -#: builtin/send-pack.c:19 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -12247,51 +14683,71 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -#: builtin/send-pack.c:162 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:179 msgid "print status from remote helper" msgstr "" +#: builtin/serve.c:7 +msgid "git serve [<options>]" +msgstr "" + +#: builtin/serve.c:17 builtin/upload-pack.c:23 +msgid "quit after a single request/response exchange" +msgstr "" + +#: builtin/serve.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "" + #: builtin/shortlog.c:14 -msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/shortlog.c:263 +#: builtin/shortlog.c:15 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "" + +#: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:265 +#: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:267 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:269 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:270 -msgid "w[,i1[,i2]]" +#: builtin/shortlog.c:271 +msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "" -#: builtin/show-branch.c:12 +#: builtin/shortlog.c:299 +msgid "too many arguments given outside repository" +msgstr "" + +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -12299,167 +14755,167 @@ msgid "" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:376 +#: builtin/show-branch.c:395 #, 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:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" -#: builtin/show-branch.c:714 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:741 #, 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:724 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:829 #, 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:812 +#: builtin/show-branch.c:833 #, c-format msgid "'%s' is not a valid ref." msgstr "" -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" msgstr "" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -12479,215 +14935,359 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:61 +msgid "submodule--helper print-default-remote takes no arguments" +msgstr "" + +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:521 +#, c-format +msgid "Entering '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:561 +msgid "Suppress output of entering each submodule command" +msgstr "" + +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "" + +#: builtin/submodule--helper.c:568 +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "" + +#: builtin/submodule--helper.c:644 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:669 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:676 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:470 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:814 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 +msgid "Suppress submodule status output" +msgstr "" + +#: builtin/submodule--helper.c:866 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" + +#: builtin/submodule--helper.c:867 +msgid "recurse into nested submodules" +msgstr "" + +#: builtin/submodule--helper.c:872 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:896 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:960 #, c-format -msgid "no submodule mapping found in .gitmodules for path '%s'" +msgid "Synchronizing submodule url for '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:966 +#, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:980 +#, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:991 +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1038 +msgid "Suppress output of synchronizing submodule url" +msgstr "" + +#: builtin/submodule--helper.c:1045 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:1099 +#, c-format +msgid "" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" +msgstr "" + +#: builtin/submodule--helper.c:1111 +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" + +#: builtin/submodule--helper.c:1119 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:1121 +#, c-format +msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:1132 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "" + +#: builtin/submodule--helper.c:1148 +#, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:1177 +msgid "Remove submodule working trees even if they contain local changes" +msgstr "" + +#: builtin/submodule--helper.c:1178 +msgid "Unregister all submodules" +msgstr "" + +#: builtin/submodule--helper.c:1183 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" + +#: builtin/submodule--helper.c:1197 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "" + +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:1329 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:1336 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1689 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1700 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1733 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1743 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1748 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1756 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1837 #, 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:1214 +#: builtin/submodule--helper.c:1954 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1960 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:2071 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -12712,46 +15312,46 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "" "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:28 +#: builtin/tag.c:29 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:102 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:131 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -12760,7 +15360,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:135 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -12770,361 +15370,393 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:189 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:191 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:215 +#: builtin/tag.c:218 msgid "bad object type." msgstr "" -#: builtin/tag.c:261 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "" -#: builtin/tag.c:268 +#: builtin/tag.c:274 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:376 +#: builtin/tag.c:383 msgid "list tag names" msgstr "" -#: builtin/tag.c:378 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:380 +#: builtin/tag.c:387 msgid "delete tags" msgstr "" -#: builtin/tag.c:381 +#: builtin/tag.c:388 msgid "verify tags" msgstr "" -#: builtin/tag.c:383 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:385 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:387 +#: builtin/tag.c:394 msgid "tag message" msgstr "" -#: builtin/tag.c:389 +#: builtin/tag.c:396 +msgid "force edit of tag message" +msgstr "" + +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:393 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:394 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:395 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "" -#: builtin/tag.c:397 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:398 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:399 builtin/tag.c:401 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:400 builtin/tag.c:402 +#: builtin/tag.c:408 builtin/tag.c:410 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:403 +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:404 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:409 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:453 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:475 +#: builtin/tag.c:483 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:477 +#: builtin/tag.c:485 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:479 +#: builtin/tag.c:487 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:481 +#: builtin/tag.c:489 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:483 +#: builtin/tag.c:491 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:494 +#: builtin/tag.c:502 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:513 +#: builtin/tag.c:521 msgid "too many params" msgstr "" -#: builtin/tag.c:519 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:524 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:554 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:494 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:86 -#, c-format -msgid "failed to stat %s" -msgstr "" - -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr "" -#: builtin/update-index.c:571 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:926 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:929 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:932 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:934 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:936 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:938 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:941 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:945 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:949 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:950 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:959 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:962 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:965 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:968 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:971 +#: builtin/update-index.c:989 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:973 +#: builtin/update-index.c:991 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:975 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:995 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:985 +#: builtin/update-index.c:1003 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:989 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1030 +msgid "write out the index even if is not flagged as changed" +msgstr "" + +#: builtin/update-index.c:1032 +msgid "enable or disable file system monitor" +msgstr "" + +#: builtin/update-index.c:1034 +msgid "mark files as fsmonitor valid" +msgstr "" + +#: builtin/update-index.c:1037 +msgid "clear fsmonitor valid bit" +msgstr "" + +#: builtin/update-index.c:1136 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 +#: builtin/update-index.c:1145 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 +#: builtin/update-index.c:1156 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:1131 +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1168 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:1143 +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" +#: builtin/update-index.c:1180 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" + +#: builtin/update-index.c:1184 +msgid "fsmonitor enabled" +msgstr "" + +#: builtin/update-index.c:1187 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" + +#: builtin/update-index.c:1191 +msgid "fsmonitor disabled" +msgstr "" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" @@ -13137,19 +15769,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "" @@ -13161,15 +15793,31 @@ msgstr "" msgid "update the info files from scratch" msgstr "" -#: builtin/verify-commit.c:18 +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "" + +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "" @@ -13193,167 +15841,259 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:16 -msgid "git worktree add [<options>] <path> [<branch>]" +#: builtin/worktree.c:17 +msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 +msgid "git worktree move <worktree> <new-path>" +msgstr "" + +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:22 +msgid "git worktree remove [<options>] <worktree>" +msgstr "" + +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:46 +#: builtin/worktree.c:59 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:52 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:70 builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:76 +#: builtin/worktree.c:89 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:84 +#: builtin/worktree.c:97 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:100 +#: builtin/worktree.c:106 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:147 +#: builtin/worktree.c:153 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:149 +#: builtin/worktree.c:155 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:223 +#: builtin/worktree.c:230 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:254 +#: builtin/worktree.c:261 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:293 +#: builtin/worktree.c:380 builtin/worktree.c:386 +#, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "" + +#: builtin/worktree.c:382 +#, c-format +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "" + +#: builtin/worktree.c:391 #, c-format -msgid "Preparing %s (identifier %s)" +msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:345 +#: builtin/worktree.c:397 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "" + +#: builtin/worktree.c:438 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:347 +#: builtin/worktree.c:441 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:349 +#: builtin/worktree.c:443 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:351 +#: builtin/worktree.c:445 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:352 +#: builtin/worktree.c:446 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:360 +#: builtin/worktree.c:449 +msgid "set up tracking mode (see git-branch(1))" +msgstr "" + +#: builtin/worktree.c:452 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "" + +#: builtin/worktree.c:460 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:499 +#: builtin/worktree.c:521 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "" + +#: builtin/worktree.c:621 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720 +#: builtin/worktree.c:860 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:635 builtin/worktree.c:668 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:518 +#: builtin/worktree.c:640 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:520 +#: builtin/worktree.c:642 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:548 +#: builtin/worktree.c:670 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/write-tree.c:14 -msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +#: builtin/worktree.c:695 +msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/write-tree.c:27 -msgid "<prefix>/" +#: builtin/worktree.c:722 builtin/worktree.c:862 +#, c-format +msgid "'%s' is a main working tree" msgstr "" -#: builtin/write-tree.c:28 -msgid "write tree object for a subdirectory <prefix>" +#: builtin/worktree.c:727 +#, c-format +msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/write-tree.c:31 -msgid "only useful for debugging" +#: builtin/worktree.c:733 +#, c-format +msgid "target '%s' already exists" msgstr "" -#: upload-pack.c:23 -msgid "git upload-pack [<options>] <dir>" +#: builtin/worktree.c:740 +#, c-format +msgid "cannot move a locked working tree, lock reason: %s" msgstr "" -#: upload-pack.c:1040 -msgid "quit after a single request/response exchange" +#: builtin/worktree.c:742 +msgid "cannot move a locked working tree" msgstr "" -#: upload-pack.c:1042 -msgid "exit immediately after initial ref advertisement" +#: builtin/worktree.c:745 +#, c-format +msgid "validation failed, cannot move working tree: %s" msgstr "" -#: upload-pack.c:1044 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" +#: builtin/worktree.c:750 +#, c-format +msgid "failed to move '%s' to '%s'" msgstr "" -#: upload-pack.c:1046 -msgid "interrupt transfer after <n> seconds of inactivity" +#: builtin/worktree.c:798 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "" + +#: builtin/worktree.c:802 +#, c-format +msgid "'%s' is dirty, use --force to delete it" +msgstr "" + +#: builtin/worktree.c:807 +#, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "" + +#: builtin/worktree.c:818 builtin/worktree.c:832 +#, c-format +msgid "failed to delete '%s'" +msgstr "" + +#: builtin/worktree.c:844 +msgid "force removing even if the worktree is dirty" +msgstr "" + +#: builtin/worktree.c:866 +#, c-format +msgid "cannot remove a locked working tree, lock reason: %s" +msgstr "" + +#: builtin/worktree.c:868 +msgid "cannot remove a locked working tree" +msgstr "" + +#: builtin/worktree.c:871 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "" + +#: builtin/write-tree.c:14 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "" + +#: builtin/write-tree.c:27 +msgid "<prefix>/" +msgstr "" + +#: builtin/write-tree.c:28 +msgid "write tree object for a subdirectory <prefix>" +msgstr "" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" msgstr "" #: credential-cache--daemon.c:222 @@ -13369,27 +16109,82 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "" -#: git.c:15 +#: git.c:27 +msgid "" +"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" <command> [<args>]" +msgstr "" + +#: git.c:34 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:338 +#: git.c:173 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "" + +#: git.c:187 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "" + +#: git.c:201 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "" + +#: git.c:215 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "" + +#: git.c:237 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "" + +#: git.c:275 +#, c-format +msgid "no directory given for -C\n" +msgstr "" + +#: git.c:300 +#, c-format +msgid "unknown option: %s\n" +msgstr "" + +#: git.c:770 +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "" + +#: git.c:782 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "" + +#: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:359 +#: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:368 +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:1768 +#: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13397,133 +16192,669 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:324 +#: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "" -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" +#: list-objects-filter-options.h:59 +msgid "args" msgstr "" -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" +#: list-objects-filter-options.h:60 +msgid "object filtering" msgstr "" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" +#: parse-options.h:157 +msgid "expiry-date" msgstr "" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" +#: parse-options.h:172 +msgid "no-op (backward compatibility)" msgstr "" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" +#: parse-options.h:251 +msgid "be more verbose" +msgstr "" + +#: parse-options.h:253 +msgid "be more quiet" +msgstr "" + +#: parse-options.h:259 +msgid "use <n> digits to display SHA-1s" msgstr "" -#: common-cmds.h:17 +#: command-list.h:50 msgid "Add file contents to the index" msgstr "" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "" + +#: command-list.h:52 +msgid "Annotate file lines with commit information" +msgstr "" + +#: command-list.h:53 +msgid "Apply a patch to files and/or to the index" +msgstr "" + +#: command-list.h:54 +msgid "Import an Arch repository into Git" +msgstr "" + +#: command-list.h:55 +msgid "Create an archive of files from a named tree" +msgstr "" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "" -#: common-cmds.h:19 +#: command-list.h:57 +msgid "Show what revision and author last modified each line of a file" +msgstr "" + +#: command-list.h:58 msgid "List, create, or delete branches" msgstr "" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Move objects and refs by archive" +msgstr "" + +#: command-list.h:60 +msgid "Provide content or type and size information for repository objects" +msgstr "" + +#: command-list.h:61 +msgid "Display gitattributes information" +msgstr "" + +#: command-list.h:62 +msgid "Debug gitignore / exclude files" +msgstr "" + +#: command-list.h:63 +msgid "Show canonical names and email addresses of contacts" +msgstr "" + +#: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "" -#: common-cmds.h:21 +#: command-list.h:65 +msgid "Copy files from the index to the working tree" +msgstr "" + +#: command-list.h:66 +msgid "Ensures that a reference name is well formed" +msgstr "" + +#: command-list.h:67 +msgid "Find commits yet to be applied to upstream" +msgstr "" + +#: command-list.h:68 +msgid "Apply the changes introduced by some existing commits" +msgstr "" + +#: command-list.h:69 +msgid "Graphical alternative to git-commit" +msgstr "" + +#: command-list.h:70 +msgid "Remove untracked files from the working tree" +msgstr "" + +#: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "" -#: common-cmds.h:22 +#: command-list.h:72 +msgid "Display data in columns" +msgstr "" + +#: command-list.h:73 msgid "Record changes to the repository" msgstr "" -#: common-cmds.h:23 +#: command-list.h:74 +msgid "Write and verify Git commit graph files" +msgstr "" + +#: command-list.h:75 +msgid "Create a new commit object" +msgstr "" + +#: command-list.h:76 +msgid "Get and set repository or global options" +msgstr "" + +#: command-list.h:77 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "" + +#: command-list.h:78 +msgid "Retrieve and store user credentials" +msgstr "" + +#: command-list.h:79 +msgid "Helper to temporarily store passwords in memory" +msgstr "" + +#: command-list.h:80 +msgid "Helper to store credentials on disk" +msgstr "" + +#: command-list.h:81 +msgid "Export a single commit to a CVS checkout" +msgstr "" + +#: command-list.h:82 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "" + +#: command-list.h:83 +msgid "A CVS server emulator for Git" +msgstr "" + +#: command-list.h:84 +msgid "A really simple server for Git repositories" +msgstr "" + +#: command-list.h:85 +msgid "Give an object a human readable name based on an available ref" +msgstr "" + +#: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -#: common-cmds.h:24 +#: command-list.h:87 +msgid "Compares files in the working tree and the index" +msgstr "" + +#: command-list.h:88 +msgid "Compare a tree to the working tree or index" +msgstr "" + +#: command-list.h:89 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "" + +#: command-list.h:90 +msgid "Show changes using common diff tools" +msgstr "" + +#: command-list.h:91 +msgid "Git data exporter" +msgstr "" + +#: command-list.h:92 +msgid "Backend for fast Git data importers" +msgstr "" + +#: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "" -#: common-cmds.h:25 +#: command-list.h:94 +msgid "Receive missing objects from another repository" +msgstr "" + +#: command-list.h:95 +msgid "Rewrite branches" +msgstr "" + +#: command-list.h:96 +msgid "Produce a merge commit message" +msgstr "" + +#: command-list.h:97 +msgid "Output information on each ref" +msgstr "" + +#: command-list.h:98 +msgid "Prepare patches for e-mail submission" +msgstr "" + +#: command-list.h:99 +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "" + +#: command-list.h:100 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "" + +#: command-list.h:101 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "" + +#: command-list.h:102 msgid "Print lines matching a pattern" msgstr "" -#: common-cmds.h:26 +#: command-list.h:103 +msgid "A portable graphical interface to Git" +msgstr "" + +#: command-list.h:104 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "" + +#: command-list.h:105 +msgid "Display help information about Git" +msgstr "" + +#: command-list.h:106 +msgid "Server side implementation of Git over HTTP" +msgstr "" + +#: command-list.h:107 +msgid "Download from a remote Git repository via HTTP" +msgstr "" + +#: command-list.h:108 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "" + +#: command-list.h:109 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "" + +#: command-list.h:110 +msgid "Build pack index file for an existing packed archive" +msgstr "" + +#: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" -#: common-cmds.h:27 +#: command-list.h:112 +msgid "Instantly browse your working repository in gitweb" +msgstr "" + +#: command-list.h:113 +msgid "add or parse structured information in commit messages" +msgstr "" + +#: command-list.h:114 +msgid "The Git repository browser" +msgstr "" + +#: command-list.h:115 msgid "Show commit logs" msgstr "" -#: common-cmds.h:28 +#: command-list.h:116 +msgid "Show information about files in the index and the working tree" +msgstr "" + +#: command-list.h:117 +msgid "List references in a remote repository" +msgstr "" + +#: command-list.h:118 +msgid "List the contents of a tree object" +msgstr "" + +#: command-list.h:119 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "" + +#: command-list.h:120 +msgid "Simple UNIX mbox splitter program" +msgstr "" + +#: command-list.h:121 msgid "Join two or more development histories together" msgstr "" -#: common-cmds.h:29 +#: command-list.h:122 +msgid "Find as good common ancestors as possible for a merge" +msgstr "" + +#: command-list.h:123 +msgid "Run a three-way file merge" +msgstr "" + +#: command-list.h:124 +msgid "Run a merge for files needing merging" +msgstr "" + +#: command-list.h:125 +msgid "The standard helper program to use with git-merge-index" +msgstr "" + +#: command-list.h:126 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "" + +#: command-list.h:127 +msgid "Show three-way merge without touching index" +msgstr "" + +#: command-list.h:128 +msgid "Creates a tag object" +msgstr "" + +#: command-list.h:129 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "" + +#: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "" -#: common-cmds.h:30 +#: command-list.h:131 +msgid "Find symbolic names for given revs" +msgstr "" + +#: command-list.h:132 +msgid "Add or inspect object notes" +msgstr "" + +#: command-list.h:133 +msgid "Import from and submit to Perforce repositories" +msgstr "" + +#: command-list.h:134 +msgid "Create a packed archive of objects" +msgstr "" + +#: command-list.h:135 +msgid "Find redundant pack files" +msgstr "" + +#: command-list.h:136 +msgid "Pack heads and tags for efficient repository access" +msgstr "" + +#: command-list.h:137 +msgid "Routines to help parsing remote repository access parameters" +msgstr "" + +#: command-list.h:138 +msgid "Compute unique ID for a patch" +msgstr "" + +#: command-list.h:139 +msgid "Prune all unreachable objects from the object database" +msgstr "" + +#: command-list.h:140 +msgid "Remove extra objects that are already in pack files" +msgstr "" + +#: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" -#: common-cmds.h:31 +#: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "" -#: common-cmds.h:32 +#: command-list.h:143 +msgid "Applies a quilt patchset onto the current branch" +msgstr "" + +#: command-list.h:144 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#: command-list.h:145 +msgid "Reads tree information into the index" +msgstr "" + +#: command-list.h:146 msgid "Reapply commits on top of another base tip" msgstr "" -#: common-cmds.h:33 +#: command-list.h:147 +msgid "Receive what is pushed into the repository" +msgstr "" + +#: command-list.h:148 +msgid "Manage reflog information" +msgstr "" + +#: command-list.h:149 +msgid "Manage set of tracked repositories" +msgstr "" + +#: command-list.h:150 +msgid "Pack unpacked objects in a repository" +msgstr "" + +#: command-list.h:151 +msgid "Create, list, delete refs to replace objects" +msgstr "" + +#: command-list.h:152 +msgid "Generates a summary of pending changes" +msgstr "" + +#: command-list.h:153 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "" + +#: command-list.h:154 msgid "Reset current HEAD to the specified state" msgstr "" -#: common-cmds.h:34 +#: command-list.h:155 +msgid "Revert some existing commits" +msgstr "" + +#: command-list.h:156 +msgid "Lists commit objects in reverse chronological order" +msgstr "" + +#: command-list.h:157 +msgid "Pick out and massage parameters" +msgstr "" + +#: command-list.h:158 msgid "Remove files from the working tree and from the index" msgstr "" -#: common-cmds.h:35 +#: command-list.h:159 +msgid "Send a collection of patches as emails" +msgstr "" + +#: command-list.h:160 +msgid "Push objects over Git protocol to another repository" +msgstr "" + +#: command-list.h:161 +msgid "Restricted login shell for Git-only SSH access" +msgstr "" + +#: command-list.h:162 +msgid "Summarize 'git log' output" +msgstr "" + +#: command-list.h:163 msgid "Show various types of objects" msgstr "" -#: common-cmds.h:36 +#: command-list.h:164 +msgid "Show branches and their commits" +msgstr "" + +#: command-list.h:165 +msgid "Show packed archive index" +msgstr "" + +#: command-list.h:166 +msgid "List references in a local repository" +msgstr "" + +#: command-list.h:167 +msgid "Git's i18n setup code for shell scripts" +msgstr "" + +#: command-list.h:168 +msgid "Common Git shell script setup code" +msgstr "" + +#: command-list.h:169 +msgid "Stash the changes in a dirty working directory away" +msgstr "" + +#: command-list.h:170 +msgid "Add file contents to the staging area" +msgstr "" + +#: command-list.h:171 msgid "Show the working tree status" msgstr "" -#: common-cmds.h:37 +#: command-list.h:172 +msgid "Remove unnecessary whitespace" +msgstr "" + +#: command-list.h:173 +msgid "Initialize, update or inspect submodules" +msgstr "" + +#: command-list.h:174 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "" + +#: command-list.h:175 +msgid "Read, modify and delete symbolic refs" +msgstr "" + +#: command-list.h:176 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -#: parse-options.h:145 -msgid "expiry-date" +#: command-list.h:177 +msgid "Creates a temporary file with a blob's contents" msgstr "" -#: parse-options.h:160 -msgid "no-op (backward compatibility)" +#: command-list.h:178 +msgid "Unpack objects from a packed archive" msgstr "" -#: parse-options.h:238 -msgid "be more verbose" +#: command-list.h:179 +msgid "Register file contents in the working tree to the index" msgstr "" -#: parse-options.h:240 -msgid "be more quiet" +#: command-list.h:180 +msgid "Update the object name stored in a ref safely" msgstr "" -#: parse-options.h:246 -msgid "use <n> digits to display SHA-1s" +#: command-list.h:181 +msgid "Update auxiliary info file to help dumb servers" +msgstr "" + +#: command-list.h:182 +msgid "Send archive back to git-archive" +msgstr "" + +#: command-list.h:183 +msgid "Send objects packed back to git-fetch-pack" +msgstr "" + +#: command-list.h:184 +msgid "Show a Git logical variable" +msgstr "" + +#: command-list.h:185 +msgid "Check the GPG signature of commits" +msgstr "" + +#: command-list.h:186 +msgid "Validate packed Git archive files" +msgstr "" + +#: command-list.h:187 +msgid "Check the GPG signature of tags" +msgstr "" + +#: command-list.h:188 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "" + +#: command-list.h:189 +msgid "Show logs with difference each commit introduces" +msgstr "" + +#: command-list.h:190 +msgid "Manage multiple working trees" +msgstr "" + +#: command-list.h:191 +msgid "Create a tree object from the current index" +msgstr "" + +#: command-list.h:192 +msgid "Defining attributes per path" +msgstr "" + +#: command-list.h:193 +msgid "Git command-line interface and conventions" +msgstr "" + +#: command-list.h:194 +msgid "A Git core tutorial for developers" +msgstr "" + +#: command-list.h:195 +msgid "Git for CVS users" +msgstr "" + +#: command-list.h:196 +msgid "Tweaking diff output" +msgstr "" + +#: command-list.h:197 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "" + +#: command-list.h:198 +msgid "A Git Glossary" +msgstr "" + +#: command-list.h:199 +msgid "Hooks used by Git" +msgstr "" + +#: command-list.h:200 +msgid "Specifies intentionally untracked files to ignore" +msgstr "" + +#: command-list.h:201 +msgid "Defining submodule properties" +msgstr "" + +#: command-list.h:202 +msgid "Git namespaces" +msgstr "" + +#: command-list.h:203 +msgid "Git Repository Layout" +msgstr "" + +#: command-list.h:204 +msgid "Specifying revisions and ranges for Git" +msgstr "" + +#: command-list.h:205 +msgid "A tutorial introduction to Git: part two" +msgstr "" + +#: command-list.h:206 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:207 +msgid "An overview of recommended workflows with Git" msgstr "" #: rerere.h:40 @@ -13574,27 +16905,27 @@ msgstr "" msgid "Bad bisect_write argument: $state" msgstr "" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "" -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "" @@ -13602,18 +16933,18 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "" -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -13621,91 +16952,76 @@ msgid "" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "" + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -13750,7 +17066,7 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-rebase.sh:58 +#: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -13759,47 +17075,47 @@ msgid "" "abort\"." msgstr "" -#: git-rebase.sh:160 git-rebase.sh:402 +#: git-rebase.sh:173 git-rebase.sh:454 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:171 +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:174 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:214 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." +#: git-rebase.sh:241 +msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:363 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:374 +#: git-rebase.sh:426 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:381 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:384 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:424 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13812,64 +17128,90 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:480 +#: git-rebase.sh:545 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "" + +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "" + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "" + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "" + +#: git-rebase.sh:590 #, sh-format -msgid "invalid upstream $upstream_name" +msgid "invalid upstream '$upstream_name'" msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:507 git-rebase.sh:511 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:516 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:539 +#: git-rebase.sh:652 #, sh-format -msgid "fatal: no such branch: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" msgstr "" -#: git-rebase.sh:572 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:577 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:581 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:601 +#: git-rebase.sh:717 +#, sh-format +msgid "HEAD is up to date." +msgstr "" + +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:605 +#: git-rebase.sh:727 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "" + +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:616 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:625 +#: git-rebase.sh:750 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:635 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -13878,180 +17220,168 @@ msgstr "" msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ 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:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-stash.sh:334 +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:482 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:495 +#: git-stash.sh:503 msgid "No stash entries found." msgstr "" -#: git-stash.sh:502 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:517 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:545 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:556 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:564 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:568 +#: git-stash.sh:576 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:576 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:578 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:587 +#: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-stash.sh:612 +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:627 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:641 +#: git-stash.sh:649 msgid "The stash entry is kept in case you need it again." msgstr "" -#: git-stash.sh:650 +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:651 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:659 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "" -#: git-stash.sh:738 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:181 +#: git-submodule.sh:188 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:191 +#: git-submodule.sh:198 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:210 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:213 +#: git-submodule.sh:220 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:219 +#: git-submodule.sh:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14059,22 +17389,22 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:237 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:239 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:247 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:249 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14085,226 +17415,248 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:255 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:267 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:272 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:281 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:342 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "" - -#: git-submodule.sh:362 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "" - -#: git-submodule.sh:433 -#, sh-format -msgid "pathspec and --all are incompatible" -msgstr "" - -#: git-submodule.sh:438 -#, sh-format -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "" - -#: 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:466 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to " -"discard them" -msgstr "" - -#: git-submodule.sh:469 -#, sh-format -msgid "Cleared directory '$displaypath'" -msgstr "" - -#: git-submodule.sh:470 -#, sh-format -msgid "Could not remove submodule work tree '$displaypath'" -msgstr "" - -#: git-submodule.sh:473 -#, sh-format -msgid "Could not create empty submodule directory '$displaypath'" -msgstr "" - -#: git-submodule.sh:482 -#, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -msgstr "" - -#: git-submodule.sh:637 +#: git-submodule.sh:565 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:647 +#: git-submodule.sh:575 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:652 +#: git-submodule.sh:580 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:670 +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:676 +#: git-submodule.sh:609 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:683 +#: git-submodule.sh:616 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:684 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:688 +#: git-submodule.sh:621 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:689 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:694 +#: git-submodule.sh:627 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:695 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:700 +#: git-submodule.sh:633 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:701 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:732 +#: git-submodule.sh:665 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:840 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:892 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:912 +#: git-submodule.sh:833 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:915 +#: git-submodule.sh:836 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:918 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "" - -#: git-submodule.sh:1136 -#, sh-format -msgid "Synchronizing submodule url for '$displaypath'" -msgstr "" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." msgstr "" -#: git-rebase--interactive.sh:140 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "" - -#: git-rebase--interactive.sh:156 +#: git-rebase--interactive.sh:43 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 <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: git-rebase--interactive.sh:171 +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: git-rebase--interactive.sh:175 +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: git-rebase--interactive.sh:211 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "" + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "" + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "" + +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "" + +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "" + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 +#, 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:224 +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "" + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "" + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "" + +#: git-rebase--preserve-merges.sh:152 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" + +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14316,83 +17668,83 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:236 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "" -#: git-rebase--interactive.sh:275 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "" -#: git-rebase--interactive.sh:317 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "" -#: git-rebase--interactive.sh:369 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "" -#: git-rebase--interactive.sh:371 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "" -#: git-rebase--interactive.sh:380 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "" -#: git-rebase--interactive.sh:385 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--interactive.sh:400 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--interactive.sh:408 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--interactive.sh:417 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--interactive.sh:422 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--interactive.sh:433 +#: git-rebase--preserve-merges.sh:428 #, 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:442 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--interactive.sh:445 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 -#: git-rebase--interactive.sh:532 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--interactive.sh:560 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14402,31 +17754,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--interactive.sh:575 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--interactive.sh:590 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--interactive.sh:632 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--interactive.sh:640 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--interactive.sh:642 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--interactive.sh:644 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14434,7 +17786,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:657 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14444,29 +17796,25 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:668 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--interactive.sh:669 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--interactive.sh:704 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:749 -msgid "could not detach HEAD" -msgstr "" - -#: git-rebase--interactive.sh:784 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:789 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14484,71 +17832,29 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:806 +#: git-rebase--preserve-merges.sh:779 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:811 +#: git-rebase--preserve-merges.sh:784 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:816 git-rebase--interactive.sh:820 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:848 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" - -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 -msgid "Could not execute editor" -msgstr "" - -#: git-rebase--interactive.sh:869 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "" - -#: git-rebase--interactive.sh:874 -msgid "No HEAD?" -msgstr "" - -#: git-rebase--interactive.sh:875 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "" - -#: git-rebase--interactive.sh:877 -msgid "Could not mark as interactive" -msgstr "" - -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 -msgid "Could not init rewritten commits" -msgstr "" - -#: 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:998 +#: git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: git-rebase--interactive.sh:1005 -msgid "Note that empty commits are commented out" +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +msgid "Could not init rewritten commits" msgstr "" #: git-sh-setup.sh:89 git-sh-setup.sh:94 @@ -14622,107 +17928,107 @@ msgstr "" msgid "unstaged" msgstr "" -#: git-add--interactive.perl:246 git-add--interactive.perl:271 +#: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "" -#: git-add--interactive.perl:255 git-add--interactive.perl:309 +#: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "" -#: git-add--interactive.perl:291 git-add--interactive.perl:306 +#: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "" -#: git-add--interactive.perl:602 +#: git-add--interactive.perl:609 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:605 +#: git-add--interactive.perl:612 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:608 +#: git-add--interactive.perl:615 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:611 +#: git-add--interactive.perl:618 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:620 +#: git-add--interactive.perl:627 msgid "Update" msgstr "" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:639 msgid "Revert" msgstr "" -#: git-add--interactive.perl:655 +#: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "" -#: git-add--interactive.perl:666 +#: git-add--interactive.perl:673 msgid "Add untracked" msgstr "" -#: git-add--interactive.perl:672 +#: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "" -#: git-add--interactive.perl:985 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -#: git-add--interactive.perl:988 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -#: git-add--interactive.perl:991 +#: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -#: git-add--interactive.perl:994 git-add--interactive.perl:1003 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -#: git-add--interactive.perl:997 git-add--interactive.perl:1000 +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1013 +#: git-add--interactive.perl:1085 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1014 +#: git-add--interactive.perl:1086 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: git-add--interactive.perl:1020 +#: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" @@ -14732,14 +18038,14 @@ msgid "" msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1028 +#: git-add--interactive.perl:1100 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:1042 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" @@ -14750,12 +18056,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:1134 +#: git-add--interactive.perl:1213 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -#: git-add--interactive.perl:1143 +#: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -14764,7 +18070,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1149 +#: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -14773,7 +18079,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1155 +#: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -14782,7 +18088,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1161 +#: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -14791,7 +18097,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1167 +#: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -14800,7 +18106,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1173 +#: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -14809,7 +18115,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1179 +#: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -14818,7 +18124,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1188 +#: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -14831,195 +18137,211 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1219 +#: git-add--interactive.perl:1304 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1243 +#: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1338 msgid "Patch update" msgstr "" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1390 #, perl-format -msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1391 #, perl-format -msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1307 +#: git-add--interactive.perl:1392 #, perl-format -msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1310 +#: git-add--interactive.perl:1395 #, perl-format -msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1396 #, perl-format -msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1397 #, perl-format -msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1315 +#: git-add--interactive.perl:1400 #, perl-format -msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1401 #, perl-format -msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1317 +#: git-add--interactive.perl:1402 #, perl-format -msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1320 +#: git-add--interactive.perl:1405 #, perl-format -msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1406 #, perl-format -msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1322 +#: git-add--interactive.perl:1407 #, perl-format -msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1325 +#: git-add--interactive.perl:1410 #, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1326 +#: git-add--interactive.perl:1411 #, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1327 +#: git-add--interactive.perl:1412 #, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1330 +#: git-add--interactive.perl:1415 #, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1416 #, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1332 +#: git-add--interactive.perl:1417 #, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1335 +#: git-add--interactive.perl:1420 #, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1336 +#: git-add--interactive.perl:1421 #, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1337 +#: git-add--interactive.perl:1422 #, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1522 +msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1440 +#: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "" -#: git-add--interactive.perl:1442 +#: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "" -#: git-add--interactive.perl:1451 +#: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1456 +#: git-add--interactive.perl:1545 #, 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:1482 +#: git-add--interactive.perl:1571 +msgid "No other hunks to search\n" +msgstr "" + +#: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "" -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1505 +#: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1553 +#: git-add--interactive.perl:1644 +msgid "Sorry, cannot split this hunk\n" +msgstr "" + +#: git-add--interactive.perl:1650 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1660 +msgid "Sorry, cannot edit this hunk\n" +msgstr "" + +#: git-add--interactive.perl:1706 msgid "Review diff" msgstr "" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -15030,84 +18352,90 @@ msgid "" "changes\n" msgstr "" -#: 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 +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1662 +#: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" -#: git-send-email.perl:126 +#: git-send-email.perl:130 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" -#: git-send-email.perl:133 git-send-email.perl:139 +#: git-send-email.perl:137 git-send-email.perl:143 msgid "local time offset greater than or equal to 24 hours\n" msgstr "" -#: git-send-email.perl:207 git-send-email.perl:213 +#: git-send-email.perl:211 git-send-email.perl:217 msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:290 +#: git-send-email.perl:294 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:295 +#: git-send-email.perl:299 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:313 +#: git-send-email.perl:317 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:378 git-send-email.perl:629 +#: git-send-email.perl:383 git-send-email.perl:638 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:447 +#: git-send-email.perl:386 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" + +#: git-send-email.perl:456 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:476 +#: git-send-email.perl:485 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:504 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:506 +#: git-send-email.perl:515 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:508 +#: git-send-email.perl:517 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:513 +#: git-send-email.perl:522 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:595 +#: git-send-email.perl:604 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15117,36 +18445,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:616 +#: git-send-email.perl:625 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:640 +#: git-send-email.perl:649 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:651 +#: git-send-email.perl:660 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:664 +#: git-send-email.perl:673 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:674 +#: git-send-email.perl:683 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:684 +#: git-send-email.perl:694 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15155,41 +18483,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:707 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "" - -#: git-send-email.perl:710 +#: git-send-email.perl:718 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:745 -msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +#: git-send-email.perl:735 +#, perl-format +msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:754 +#: git-send-email.perl:778 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:786 +#: git-send-email.perl:813 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:815 +#: git-send-email.perl:868 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:820 +#: git-send-email.perl:873 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:828 +#: git-send-email.perl:881 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15198,20 +18522,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:847 +#: git-send-email.perl:900 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:865 +#: git-send-email.perl:918 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:877 +#: git-send-email.perl:930 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:988 git-send-email.perl:996 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -15219,16 +18543,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:939 +#: git-send-email.perl:1000 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1260 +#: git-send-email.perl:1317 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1335 +#: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15242,131 +18566,131 @@ msgid "" "\n" msgstr "" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +#: git-send-email.perl:1415 +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1353 +#: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1379 +#: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1426 +#: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1445 +#: git-send-email.perl:1511 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1463 +#: git-send-email.perl:1529 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1466 +#: git-send-email.perl:1532 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1466 +#: git-send-email.perl:1532 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1534 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1534 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1480 +#: git-send-email.perl:1546 msgid "Result: " msgstr "" -#: git-send-email.perl:1483 +#: git-send-email.perl:1549 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1496 +#: git-send-email.perl:1567 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1614 git-send-email.perl:1634 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1549 +#: git-send-email.perl:1620 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1597 +#: git-send-email.perl:1673 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1622 +#: git-send-email.perl:1698 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1728 +#: git-send-email.perl:1809 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1735 +#: git-send-email.perl:1816 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1739 +#: git-send-email.perl:1820 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1766 +#: git-send-email.perl:1850 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1774 +#: git-send-email.perl:1858 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1815 +#: git-send-email.perl:1902 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1831 +#: git-send-email.perl:1919 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1923 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" |