From fda7b0924ea251ac7ba28684edc351e197d42cf1 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Tue, 1 Nov 2016 21:36:26 +0800 Subject: l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) Generate po/git.pot from v2.11.0-rc0 for git v2.11.0 l10n round 1. Signed-off-by: Jiang Xin --- po/git.pot | 6654 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 3722 insertions(+), 2932 deletions(-) (limited to 'po') diff --git a/po/git.pot b/po/git.pot index fed61cfb0..7f1762521 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 \n" -"POT-Creation-Date: 2016-08-27 23:21+0800\n" +"POT-Creation-Date: 2016-11-01 21:35+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,351 +86,953 @@ msgid "" "\n" msgstr "" -#: archive.c:12 -msgid "git archive [] [...]" +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" msgstr "" -#: archive.c:13 -msgid "git archive --list" +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: archive.c:14 -msgid "" -"git archive --remote [--exec ] [] [...]" +#: apply.c:125 +msgid "--reject and --3way cannot be used together." msgstr "" -#: archive.c:15 -msgid "git archive --remote [--exec ] --list" +#: apply.c:127 +msgid "--cached and --3way cannot be used together." msgstr "" -#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 -#, c-format -msgid "pathspec '%s' did not match any files" +#: apply.c:130 +msgid "--3way outside a repository" msgstr "" -#: archive.c:429 -msgid "fmt" +#: apply.c:141 +msgid "--index outside a repository" msgstr "" -#: archive.c:429 -msgid "archive format" +#: apply.c:144 +msgid "--cached outside a repository" msgstr "" -#: archive.c:430 builtin/log.c:1422 -msgid "prefix" +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: archive.c:431 -msgid "prepend prefix to each pathname in the archive" +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" msgstr "" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 -#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 -#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399 -#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153 -msgid "file" +#: apply.c:938 +#, c-format +msgid "unable to find filename in patch at line %d" msgstr "" -#: archive.c:433 builtin/archive.c:89 -msgid "write the archive to this file" +#: apply.c:977 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: archive.c:435 -msgid "read .gitattributes in working directory" +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: archive.c:436 -msgid "report archived files on stderr" +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: archive.c:437 -msgid "store only" +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: archive.c:438 -msgid "compress faster" +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" msgstr "" -#: archive.c:446 -msgid "compress better" +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: archive.c:449 -msgid "list supported archive formats" -msgstr "" +#: apply.c:1577 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +msgstr[1] "" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:832 -msgid "repo" +#: apply.c:1589 +#, c-format +msgid "git diff header lacks filename information (line %d)" msgstr "" -#: archive.c:452 builtin/archive.c:91 -msgid "retrieve the archive from remote repository " +#: apply.c:1759 +msgid "new file depends on old contents" msgstr "" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 -msgid "command" +#: apply.c:1761 +msgid "deleted file still has contents" msgstr "" -#: archive.c:454 builtin/archive.c:93 -msgid "path to the remote git-upload-archive command" +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" msgstr "" -#: archive.c:461 -msgid "Unexpected option --remote" +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" msgstr "" -#: archive.c:463 -msgid "Option --exec can only be used together with --remote" +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" msgstr "" -#: archive.c:465 -msgid "Unexpected option --output" +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: archive.c:487 +#: apply.c:1984 #, c-format -msgid "Unknown archive format '%s'" +msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: archive.c:494 +#: apply.c:2021 #, c-format -msgid "Argument not supported for format '%s': -%d" +msgid "unrecognized binary patch at line %d" msgstr "" -#: attr.c:263 -msgid "" -"Negative patterns are ignored in git attributes\n" -"Use '\\!' for literal leading exclamation." +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" msgstr "" -#: bisect.c:441 +#: apply.c:2274 #, c-format -msgid "Could not open file '%s'" +msgid "unable to read symlink %s" msgstr "" -#: bisect.c:446 +#: apply.c:2278 #, c-format -msgid "Badly quoted content in file '%s': %s" +msgid "unable to open or read %s" msgstr "" -#: bisect.c:655 +#: apply.c:2931 #, c-format -msgid "We cannot bisect more!\n" +msgid "invalid start of line: '%c'" msgstr "" -#: bisect.c:708 +#: apply.c:3050 #, c-format -msgid "Not a valid commit name %s" +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:3062 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: bisect.c:732 +#: apply.c:3068 #, c-format msgid "" -"The merge base %s is bad.\n" -"This means the bug has been fixed between %s and [%s].\n" +"while searching for:\n" +"%.*s" msgstr "" -#: bisect.c:737 +#: apply.c:3090 #, c-format -msgid "" -"The merge base %s is new.\n" -"The property has changed between %s and [%s].\n" +msgid "missing binary patch data for '%s'" msgstr "" -#: bisect.c:742 +#: apply.c:3098 #, c-format -msgid "" -"The merge base %s is %s.\n" -"This means the first '%s' commit is between %s and [%s].\n" +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: bisect.c:750 +#: apply.c:3144 #, c-format -msgid "" -"Some %s revs are not ancestor of the %s rev.\n" -"git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: bisect.c:763 +#: apply.c:3154 #, c-format msgid "" -"the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" -"We continue anyway." +"the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: bisect.c:798 +#: apply.c:3162 #, c-format -msgid "Bisecting: a merge base must be tested\n" +msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: bisect.c:849 +#: apply.c:3180 #, c-format -msgid "a %s revision is needed" +msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: apply.c:3193 #, c-format -msgid "could not create file '%s'" +msgid "binary patch does not apply to '%s'" msgstr "" -#: bisect.c:917 +#: apply.c:3199 #, c-format -msgid "could not read file '%s'" +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: bisect.c:947 -msgid "reading bisect refs failed" +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" msgstr "" -#: bisect.c:967 +#: apply.c:3342 #, c-format -msgid "%s was both %s and %s\n" +msgid "cannot checkout %s" msgstr "" -#: bisect.c:975 +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 #, c-format -msgid "" -"No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +msgid "failed to read %s" msgstr "" -#: bisect.c:994 +#: apply.c:3398 #, c-format -msgid "(roughly %d step)" -msgid_plural "(roughly %d steps)" -msgstr[0] "" -msgstr[1] "" +msgid "reading from '%s' beyond a symbolic link" +msgstr "" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation -#: bisect.c:998 +#: apply.c:3427 apply.c:3667 #, 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] "" +msgid "path %s has been renamed/deleted" +msgstr "" -#: branch.c:53 +#: apply.c:3510 apply.c:3681 #, c-format -msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." +msgid "%s: does not exist in index" msgstr "" -#: branch.c:67 +#: apply.c:3519 apply.c:3689 #, c-format -msgid "Not setting branch %s as its own upstream." +msgid "%s: does not match index" msgstr "" -#: branch.c:93 -#, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: branch.c:94 +#: apply.c:3557 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." +msgid "Falling back to three-way merge...\n" msgstr "" -#: branch.c:98 +#: apply.c:3573 apply.c:3577 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." +msgid "cannot read the current contents of '%s'" msgstr "" -#: branch.c:99 +#: apply.c:3589 #, c-format -msgid "Branch %s set up to track local branch %s." +msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: branch.c:104 +#: apply.c:3603 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." +msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: branch.c:105 +#: apply.c:3608 #, c-format -msgid "Branch %s set up to track remote ref %s." +msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: branch.c:109 -#, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +#: apply.c:3634 +msgid "removal patch leaves file contents" msgstr "" -#: branch.c:110 +#: apply.c:3706 #, c-format -msgid "Branch %s set up to track local ref %s." +msgid "%s: wrong type" msgstr "" -#: branch.c:119 -msgid "Unable to write upstream branch configuration" +#: apply.c:3708 +#, c-format +msgid "%s has type %o, expected %o" msgstr "" -#: branch.c:156 +#: apply.c:3859 apply.c:3861 #, c-format -msgid "Not tracking: ambiguous information for ref %s" +msgid "invalid path '%s'" msgstr "" -#: branch.c:185 +#: apply.c:3917 #, c-format -msgid "'%s' is not a valid branch name." +msgid "%s: already exists in index" msgstr "" -#: branch.c:190 +#: apply.c:3920 #, c-format -msgid "A branch named '%s' already exists." +msgid "%s: already exists in working directory" msgstr "" -#: branch.c:198 -msgid "Cannot force update the current branch." +#: apply.c:3940 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: branch.c:218 +#: apply.c:3945 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: branch.c:220 +#: apply.c:3965 #, c-format -msgid "the requested upstream branch '%s' does not exist" +msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: branch.c:222 -msgid "" -"\n" -"If you are planning on basing your work on an upstream\n" -"branch that already exists at the remote, you may need to\n" -"run \"git fetch\" to retrieve it.\n" -"\n" -"If you are planning to push out a new local branch that\n" -"will track its remote counterpart, you may want to use\n" -"\"git push -u\" to set the upstream config as you push." +#: apply.c:3969 +#, c-format +msgid "%s: patch does not apply" msgstr "" -#: branch.c:266 +#: apply.c:3984 #, c-format -msgid "Not a valid object name: '%s'." +msgid "Checking patch %s..." msgstr "" -#: branch.c:286 +#: apply.c:4075 #, c-format -msgid "Ambiguous object name: '%s'." +msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: branch.c:291 +#: apply.c:4082 #, c-format -msgid "Not a valid branch point: '%s'." +msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: branch.c:345 +#: apply.c:4085 #, c-format -msgid "'%s' is already checked out at '%s'" +msgid "sha1 information is lacking or useless (%s)." +msgstr "" + +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "" + +#: apply.c:4104 +#, c-format +msgid "could not write temporary index to %s" +msgstr "" + +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "" + +#: apply.c:4277 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "" + +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "" + +#: apply.c:4291 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "" + +#: apply.c:4338 +#, c-format +msgid "failed to write to '%s'" +msgstr "" + +#: apply.c:4342 +#, c-format +msgid "closing file '%s'" +msgstr "" + +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "" + +#: apply.c:4510 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "" + +#: apply.c:4518 +msgid "internal error" +msgstr "" + +#: apply.c:4521 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4532 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#, c-format +msgid "cannot open %s" +msgstr "" + +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "" + +#: apply.c:4558 +#, c-format +msgid "Rejected hunk #%d." +msgstr "" + +#: apply.c:4668 +#, c-format +msgid "Skipped patch '%s'." +msgstr "" + +#: apply.c:4676 +msgid "unrecognized input" +msgstr "" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "" + +#: apply.c:4833 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "" + +#: apply.c:4858 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4864 apply.c:4879 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "" +msgstr[1] "" + +#: apply.c:4872 +#, 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "" + +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +msgid "path" +msgstr "" + +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "" + +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "" + +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "" + +#: apply.c:4926 +msgid "remove leading slashes from traditional diff paths" +msgstr "" + +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "" + +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" + +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "" + +#: apply.c:4937 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" + +#: apply.c:4939 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" + +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "" + +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "" + +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" + +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "" + +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "" + +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "" + +#: apply.c:4956 +msgid "ensure at least lines of context match" +msgstr "" + +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "" + +#: apply.c:4958 +msgid "detect new or modified lines that have whitespace errors" +msgstr "" + +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "" + +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "" + +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" + +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "" + +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +msgid "be verbose" +msgstr "" + +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: apply.c:4979 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "" + +#: apply.c:4982 +msgid "prepend to all filenames" +msgstr "" + +#: archive.c:12 +msgid "git archive [] [...]" +msgstr "" + +#: archive.c:13 +msgid "git archive --list" +msgstr "" + +#: archive.c:14 +msgid "" +"git archive --remote [--exec ] [] [...]" +msgstr "" + +#: archive.c:15 +msgid "git archive --remote [--exec ] --list" +msgstr "" + +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: archive.c:429 +msgid "fmt" +msgstr "" + +#: archive.c:429 +msgid "archive format" +msgstr "" + +#: archive.c:430 builtin/log.c:1429 +msgid "prefix" +msgstr "" + +#: archive.c:431 +msgid "prepend prefix to each pathname in the archive" +msgstr "" + +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 +#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 +#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 +#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +msgid "file" +msgstr "" + +#: archive.c:433 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "" + +#: archive.c:435 +msgid "read .gitattributes in working directory" +msgstr "" + +#: archive.c:436 +msgid "report archived files on stderr" +msgstr "" + +#: archive.c:437 +msgid "store only" +msgstr "" + +#: archive.c:438 +msgid "compress faster" +msgstr "" + +#: archive.c:446 +msgid "compress better" +msgstr "" + +#: archive.c:449 +msgid "list supported archive formats" +msgstr "" + +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +msgid "repo" +msgstr "" + +#: archive.c:452 builtin/archive.c:91 +msgid "retrieve the archive from remote repository " +msgstr "" + +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +msgid "command" +msgstr "" + +#: archive.c:454 builtin/archive.c:93 +msgid "path to the remote git-upload-archive command" +msgstr "" + +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "" + +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "" + +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "" + +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "" + +#: archive.c:494 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "" + +#: attr.c:263 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" + +#: bisect.c:441 +#, c-format +msgid "Could not open file '%s'" +msgstr "" + +#: bisect.c:446 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "" + +#: bisect.c:732 +#, 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 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" + +#: bisect.c:742 +#, 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 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" + +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "" + +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "" + +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#, c-format +msgid "could not create file '%s'" +msgstr "" + +#: bisect.c:917 +#, c-format +msgid "could not read file '%s'" +msgstr "" + +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "" + +#: bisect.c:967 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "" + +#: bisect.c:975 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" + +#: bisect.c:994 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "" +msgstr[1] "" + +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 +#, 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] "" + +#: branch.c:53 +#, c-format +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" + +#: branch.c:67 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "" + +#: branch.c:93 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" + +#: branch.c:94 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "" + +#: branch.c:98 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "" + +#: branch.c:99 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "" + +#: branch.c:104 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "" + +#: branch.c:105 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "" + +#: branch.c:109 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "" + +#: branch.c:110 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "" + +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "" + +#: branch.c:156 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "" + +#: branch.c:185 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "" + +#: branch.c:190 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: branch.c:198 +msgid "Cannot force update the current branch." +msgstr "" + +#: branch.c:218 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "" + +#: branch.c:220 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "" + +#: branch.c:222 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" + +#: branch.c:266 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "" + +#: branch.c:286 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "" + +#: branch.c:291 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "" + +#: branch.c:345 +#, c-format +msgid "'%s' is already checked out at '%s'" msgstr "" #: branch.c:364 @@ -448,7 +1050,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:778 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "" @@ -457,9 +1059,9 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085 -#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 #: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "" @@ -499,7 +1101,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -522,8 +1124,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 -#: builtin/am.c:2119 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 +#: builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "" @@ -533,6 +1135,13 @@ msgstr "" msgid "%s %s is not a commit!" msgstr "" +#: commit.c:1514 +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 msgid "memory exhausted" msgstr "" @@ -615,7 +1224,7 @@ msgstr "" msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:849 config.c:860 +#: config.c:852 config.c:863 #, c-format msgid "bad zlib compression level %d" msgstr "" @@ -658,22 +1267,58 @@ msgstr "" msgid "could not unset '%s'" msgstr "" +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "" + +#: connect.c:51 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" + #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 msgid "Checking connectivity" msgstr "" -#: connected.c:74 +#: connected.c:75 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:94 +#: connected.c:95 msgid "failed write to rev-list" msgstr "" -#: connected.c:101 +#: connected.c:102 msgid "failed to close rev-list's stdin" msgstr "" +#: convert.c:201 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" + +#: convert.c:205 +#, c-format +msgid "CRLF would be replaced by LF in %s." +msgstr "" + +#: convert.c:211 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" + +#: convert.c:215 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "" + #: date.c:97 msgid "in the future" msgstr "" @@ -720,3035 +1365,2835 @@ msgid_plural "%lu months ago" msgstr[0] "" msgstr[1] "" -#: date.c:148 -#, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "" -msgstr[1] "" - -#. TRANSLATORS: "%s" is " years" -#: date.c:151 -#, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "" -msgstr[1] "" - -#: date.c:156 date.c:161 -#, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "" -msgstr[1] "" - -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "" - -#: diffcore-rename.c:540 -msgid "Performing inexact rename detection" -msgstr "" - -#: diff.c:116 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr "" - -#: diff.c:121 -#, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr "" - -#: diff.c:225 -#, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "" - -#: diff.c:277 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" - -#: diff.c:3017 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "" - -#: diff.c:3415 -msgid "--follow requires exactly one pathspec" -msgstr "" - -#: diff.c:3578 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" - -#: diff.c:3592 -#, c-format -msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "" - -#: dir.c:1823 -msgid "failed to get kernel name and information" -msgstr "" - -#: dir.c:1942 -msgid "Untracked cache is disabled on this system or location." -msgstr "" - -#: gpg-interface.c:178 -msgid "gpg failed to sign the data" -msgstr "" - -#: gpg-interface.c:208 -msgid "could not create temporary file" -msgstr "" - -#: gpg-interface.c:210 -#, c-format -msgid "failed writing detached signature to '%s'" -msgstr "" - -#: grep.c:1792 -#, c-format -msgid "'%s': unable to read %s" -msgstr "" - -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: grep.c:1820 -#, c-format -msgid "'%s': short read" -msgstr "" - -#: help.c:205 -#, c-format -msgid "available git commands in '%s'" -msgstr "" - -#: help.c:212 -msgid "git commands available from elsewhere on your $PATH" -msgstr "" - -#: help.c:244 -msgid "These are common Git commands used in various situations:" -msgstr "" - -#: help.c:309 -#, 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:366 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "" - -#: help.c:388 -#, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" -msgstr "" - -#: help.c:393 -#, c-format -msgid "in %0.1f seconds automatically..." -msgstr "" - -#: help.c:400 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "" - -#: help.c:404 help.c:470 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -msgstr[1] "" - -#: help.c:466 -#, c-format -msgid "%s: %s - %s" -msgstr "" - -#: lockfile.c:152 -#, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" - -#: lockfile.c:160 -#, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "" - -#: merge.c:41 -msgid "failed to read the cache" -msgstr "" - -#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 -#: builtin/checkout.c:589 builtin/clone.c:732 -msgid "unable to write new index file" -msgstr "" - -#: merge-recursive.c:209 -msgid "(bad commit)\n" -msgstr "" - -#: merge-recursive.c:231 +#: date.c:148 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "" +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "" +msgstr[1] "" -#: merge-recursive.c:301 -msgid "error building trees" -msgstr "" +#. TRANSLATORS: "%s" is " years" +#: date.c:151 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "" +msgstr[1] "" -#: merge-recursive.c:720 +#: date.c:156 date.c:161 #, c-format -msgid "failed to create path '%s'%s" -msgstr "" +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "" +msgstr[1] "" -#: merge-recursive.c:731 +#: diffcore-order.c:24 #, c-format -msgid "Removing %s to make room for subdirectory\n" +msgid "failed to read orderfile '%s'" msgstr "" -#: merge-recursive.c:745 merge-recursive.c:764 -msgid ": perhaps a D/F conflict?" +#: diffcore-rename.c:540 +msgid "Performing inexact rename detection" msgstr "" -#: merge-recursive.c:754 +#: diff.c:62 #, c-format -msgid "refusing to lose untracked file at '%s'" +msgid "option '%s' requires a value" msgstr "" -#: merge-recursive.c:796 +#: diff.c:124 #, c-format -msgid "cannot read object %s '%s'" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: merge-recursive.c:798 +#: diff.c:129 #, c-format -msgid "blob expected for %s '%s'" +msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: merge-recursive.c:822 +#: diff.c:283 #, c-format -msgid "failed to open '%s': %s" +msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: merge-recursive.c:833 +#: diff.c:346 #, c-format -msgid "failed to symlink '%s': %s" +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" msgstr "" -#: merge-recursive.c:838 +#: diff.c:3087 #, c-format -msgid "do not know what to do with %06o %s '%s'" +msgid "external diff died, stopping at %s" msgstr "" -#: merge-recursive.c:978 -msgid "Failed to execute internal merge" +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: merge-recursive.c:982 -#, c-format -msgid "Unable to add %s to database" +#: diff.c:3502 +msgid "--follow requires exactly one pathspec" msgstr "" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: diff.c:3665 #, c-format msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." +"Failed to parse --dirstat/-X option parameter:\n" +"%s" msgstr "" -#: merge-recursive.c:1087 merge-recursive.c:1100 +#: diff.c:3679 #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." +msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: merge-recursive.c:1143 -msgid "rename" +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: merge-recursive.c:1143 -msgid "renamed" +#: diff.c:4703 +msgid "only found copies from modified paths due to too many files." msgstr "" -#: merge-recursive.c:1200 +#: diff.c:4706 #, c-format -msgid "%s is a directory in %s adding as %s instead" +msgid "" +"you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: merge-recursive.c:1225 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +#: dir.c:1866 +msgid "failed to get kernel name and information" msgstr "" -#: merge-recursive.c:1230 -msgid " (left unresolved)" +#: dir.c:1985 +msgid "Untracked cache is disabled on this system or location." msgstr "" -#: merge-recursive.c:1292 -#, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" msgstr "" -#: merge-recursive.c:1325 -#, c-format -msgid "Renaming %s to %s and %s to %s instead" +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "" -#: merge-recursive.c:1531 +#: fetch-pack.c:243 #, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" +msgid "git fetch_pack: expected ACK/NAK, got '%s'" msgstr "" -#: merge-recursive.c:1546 -#, c-format -msgid "Adding merged %s" +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: fetch-pack.c:381 #, c-format -msgid "Adding as %s instead" +msgid "invalid shallow line: %s" msgstr "" -#: merge-recursive.c:1610 +#: fetch-pack.c:387 #, c-format -msgid "cannot read object %s" +msgid "invalid unshallow line: %s" msgstr "" -#: merge-recursive.c:1613 +#: fetch-pack.c:389 #, c-format -msgid "object %s is not a blob" +msgid "object not found: %s" msgstr "" -#: merge-recursive.c:1666 -msgid "modify" +#: fetch-pack.c:392 +#, c-format +msgid "error in object: %s" msgstr "" -#: merge-recursive.c:1666 -msgid "modified" +#: fetch-pack.c:394 +#, c-format +msgid "no shallow found: %s" msgstr "" -#: merge-recursive.c:1676 -msgid "content" +#: fetch-pack.c:397 +#, c-format +msgid "expected shallow/unshallow, got %s" msgstr "" -#: merge-recursive.c:1683 -msgid "add/add" +#: fetch-pack.c:436 +#, c-format +msgid "got %s %d %s" msgstr "" -#: merge-recursive.c:1718 +#: fetch-pack.c:450 #, c-format -msgid "Skipped %s (merged same as existing)" +msgid "invalid commit %s" msgstr "" -#: merge-recursive.c:1732 -#, c-format -msgid "Auto-merging %s" +#: fetch-pack.c:483 +msgid "giving up" msgstr "" -#: merge-recursive.c:1736 git-submodule.sh:919 -msgid "submodule" +#: fetch-pack.c:493 progress.c:235 +msgid "done" msgstr "" -#: merge-recursive.c:1737 +#: fetch-pack.c:505 #, c-format -msgid "CONFLICT (%s): Merge conflict in %s" +msgid "got %s (%d) %s" msgstr "" -#: merge-recursive.c:1831 +#: fetch-pack.c:551 #, c-format -msgid "Removing %s" +msgid "Marking %s as complete" msgstr "" -#: merge-recursive.c:1857 -msgid "file/directory" +#: fetch-pack.c:697 +#, c-format +msgid "already have %s (%s)" msgstr "" -#: merge-recursive.c:1863 -msgid "directory/file" +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: merge-recursive.c:1868 -#, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" msgstr "" -#: merge-recursive.c:1877 +#: fetch-pack.c:799 #, c-format -msgid "Adding %s" -msgstr "" - -#: merge-recursive.c:1914 -msgid "Already up-to-date!" +msgid "fetch-pack: unable to fork off %s" msgstr "" -#: merge-recursive.c:1923 +#: fetch-pack.c:815 #, c-format -msgid "merging of trees %s and %s failed" +msgid "%s failed" msgstr "" -#: merge-recursive.c:2006 -msgid "Merging:" +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" msgstr "" -#: merge-recursive.c:2019 -#, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "" -msgstr[1] "" - -#: merge-recursive.c:2058 -msgid "merge returned no commit" +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" msgstr "" -#: merge-recursive.c:2121 -#, c-format -msgid "Could not parse object '%s'" +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" msgstr "" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 -msgid "Unable to write index." +#: fetch-pack.c:851 +msgid "Server supports no-done" msgstr "" -#: notes-utils.c:41 -msgid "Cannot commit uninitialized/unreferenced notes tree" +#: fetch-pack.c:857 +msgid "Server supports multi_ack" msgstr "" -#: notes-utils.c:100 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" msgstr "" -#: notes-utils.c:110 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +#: fetch-pack.c:865 +msgid "Server supports side-band" msgstr "" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 -#, c-format -msgid "Bad %s value: '%s'" +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: object.c:242 -#, c-format -msgid "unable to parse object: %s" +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: parse-options.c:572 -msgid "..." +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" msgstr "" -#: parse-options.c:590 +#: fetch-pack.c:890 #, c-format -msgid "usage: %s" +msgid "Server version is %.*s" msgstr "" -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 -#, c-format -msgid " or: %s" +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" msgstr "" -#: parse-options.c:597 -#, c-format -msgid " %s" +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" msgstr "" -#: parse-options.c:631 -msgid "-NUM" +#: fetch-pack.c:902 +msgid "Server does not support --deepen" msgstr "" -#: parse-options-cb.c:108 -#, c-format -msgid "malformed object name '%s'" +#: fetch-pack.c:913 +msgid "no common commits" msgstr "" -#: path.c:798 -#, c-format -msgid "Could not make %s writable by group" +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." msgstr "" -#: pathspec.c:133 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +#: fetch-pack.c:1087 +msgid "no matching remote head" msgstr "" -#: pathspec.c:143 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" +#: gpg-interface.c:185 +msgid "gpg failed to sign the data" msgstr "" -#: pathspec.c:177 -msgid "invalid parameter for pathspec magic 'prefix'" +#: gpg-interface.c:215 +msgid "could not create temporary file" msgstr "" -#: pathspec.c:183 +#: gpg-interface.c:217 #, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" +msgid "failed writing detached signature to '%s'" msgstr "" -#: pathspec.c:187 +#: grep.c:1782 #, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" +msgid "'%s': unable to read %s" msgstr "" -#: pathspec.c:205 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" +msgid "failed to stat '%s'" msgstr "" -#: pathspec.c:230 +#: grep.c:1810 #, c-format -msgid "%s: 'literal' and 'glob' are incompatible" +msgid "'%s': short read" msgstr "" -#: pathspec.c:241 +#: help.c:203 #, c-format -msgid "%s: '%s' is outside repository" +msgid "available git commands in '%s'" msgstr "" -#: pathspec.c:291 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" +#: help.c:210 +msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: pathspec.c:353 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" +#: help.c:241 +msgid "These are common Git commands used in various situations:" msgstr "" -#: pathspec.c:433 +#: help.c:306 #, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "" - -#: pathspec.c:442 msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" msgstr "" -#: pretty.c:973 -msgid "unable to parse --pretty format" +#: help.c:361 +msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: progress.c:235 -msgid "done" +#: help.c:383 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" msgstr "" -#: read-cache.c:1281 +#: help.c:388 #, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" +msgid "in %0.1f seconds automatically..." msgstr "" -#: read-cache.c:1291 +#: help.c:395 #, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" +msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: refs.c:551 builtin/merge.c:840 +#: help.c:399 help.c:465 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +msgstr[1] "" + +#: help.c:461 #, c-format -msgid "Could not open '%s' for writing" +msgid "%s: %s - %s" msgstr "" -#: refs/files-backend.c:2534 -#, c-format -msgid "could not delete reference %s: %s" +#: ident.c:334 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" msgstr "" -#: refs/files-backend.c:2537 +#: lockfile.c:152 #, c-format -msgid "could not delete references: %s" +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." msgstr "" -#: refs/files-backend.c:2546 +#: lockfile.c:160 #, c-format -msgid "could not remove reference %s" +msgid "Unable to create '%s.lock': %s" msgstr "" -#: ref-filter.c:55 -#, c-format -msgid "expected format: %%(color:)" +#: merge.c:41 +msgid "failed to read the cache" msgstr "" -#: ref-filter.c:57 -#, c-format -msgid "unrecognized color: %%(color:%s)" +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 +#: builtin/checkout.c:588 builtin/clone.c:731 +msgid "unable to write new index file" msgstr "" -#: ref-filter.c:71 -#, c-format -msgid "unrecognized format: %%(%s)" +#: merge-recursive.c:209 +msgid "(bad commit)\n" msgstr "" -#: ref-filter.c:77 +#: merge-recursive.c:231 #, c-format -msgid "%%(body) does not take arguments" +msgid "addinfo_cache failed for path '%s'" msgstr "" -#: ref-filter.c:84 -#, c-format -msgid "%%(subject) does not take arguments" +#: merge-recursive.c:301 +msgid "error building trees" msgstr "" -#: ref-filter.c:101 +#: merge-recursive.c:720 #, c-format -msgid "positive value expected contents:lines=%s" +msgid "failed to create path '%s'%s" msgstr "" -#: ref-filter.c:103 +#: merge-recursive.c:731 #, c-format -msgid "unrecognized %%(contents) argument: %s" +msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: ref-filter.c:113 -#, c-format -msgid "unrecognized %%(objectname) argument: %s" +#: merge-recursive.c:745 merge-recursive.c:764 +msgid ": perhaps a D/F conflict?" msgstr "" -#: ref-filter.c:135 +#: merge-recursive.c:754 #, c-format -msgid "expected format: %%(align:,)" +msgid "refusing to lose untracked file at '%s'" msgstr "" -#: ref-filter.c:147 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format -msgid "unrecognized position:%s" +msgid "cannot read object %s '%s'" msgstr "" -#: ref-filter.c:151 +#: merge-recursive.c:798 #, c-format -msgid "unrecognized width:%s" +msgid "blob expected for %s '%s'" msgstr "" -#: ref-filter.c:157 +#: merge-recursive.c:822 #, c-format -msgid "unrecognized %%(align) argument: %s" +msgid "failed to open '%s': %s" msgstr "" -#: ref-filter.c:161 +#: merge-recursive.c:833 #, c-format -msgid "positive width expected with the %%(align) atom" +msgid "failed to symlink '%s': %s" msgstr "" -#: ref-filter.c:244 +#: merge-recursive.c:838 #, c-format -msgid "malformed field name: %.*s" +msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: ref-filter.c:270 -#, c-format -msgid "unknown field name: %.*s" +#: merge-recursive.c:978 +msgid "Failed to execute internal merge" msgstr "" -#: ref-filter.c:372 +#: merge-recursive.c:982 #, c-format -msgid "format: %%(end) atom used without corresponding atom" +msgid "Unable to add %s to database" msgstr "" -#: ref-filter.c:424 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format -msgid "malformed format string %s" +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." msgstr "" -#: ref-filter.c:878 -msgid ":strip= requires a positive integer argument" +#: merge-recursive.c:1087 merge-recursive.c:1100 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." msgstr "" -#: ref-filter.c:883 -#, c-format -msgid "ref '%s' does not have %ld components to :strip" +#: merge-recursive.c:1143 +msgid "rename" msgstr "" -#: ref-filter.c:1046 -#, c-format -msgid "unknown %.*s format %s" +#: merge-recursive.c:1143 +msgid "renamed" msgstr "" -#: ref-filter.c:1066 ref-filter.c:1097 +#: merge-recursive.c:1200 #, c-format -msgid "missing object %s for %s" +msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: ref-filter.c:1069 ref-filter.c:1100 +#: merge-recursive.c:1225 #, c-format -msgid "parse_object_buffer failed on %s for %s" +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" msgstr "" -#: ref-filter.c:1311 -#, c-format -msgid "malformed object at '%s'" +#: merge-recursive.c:1230 +msgid " (left unresolved)" msgstr "" -#: ref-filter.c:1373 +#: merge-recursive.c:1292 #, c-format -msgid "ignoring ref with broken name %s" +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: ref-filter.c:1378 +#: merge-recursive.c:1325 #, c-format -msgid "ignoring broken ref %s" +msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: ref-filter.c:1651 +#: merge-recursive.c:1531 #, c-format -msgid "format: %%(end) atom missing" +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: ref-filter.c:1705 +#: merge-recursive.c:1546 #, c-format -msgid "malformed object name %s" +msgid "Adding merged %s" msgstr "" -#: remote.c:746 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format -msgid "Cannot fetch both %s and %s to %s" +msgid "Adding as %s instead" msgstr "" -#: remote.c:750 +#: merge-recursive.c:1610 #, c-format -msgid "%s usually tracks %s, not %s" +msgid "cannot read object %s" msgstr "" -#: remote.c:754 +#: merge-recursive.c:1613 #, c-format -msgid "%s tracks both %s and %s" +msgid "object %s is not a blob" msgstr "" -#: remote.c:762 -msgid "Internal error" +#: merge-recursive.c:1666 +msgid "modify" msgstr "" -#: remote.c:1677 remote.c:1720 -msgid "HEAD does not point to a branch" +#: merge-recursive.c:1666 +msgid "modified" msgstr "" -#: remote.c:1686 -#, c-format -msgid "no such branch: '%s'" +#: merge-recursive.c:1676 +msgid "content" msgstr "" -#: remote.c:1689 -#, c-format -msgid "no upstream configured for branch '%s'" +#: merge-recursive.c:1683 +msgid "add/add" msgstr "" -#: remote.c:1695 +#: merge-recursive.c:1718 #, c-format -msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgid "Skipped %s (merged same as existing)" msgstr "" -#: remote.c:1710 +#: merge-recursive.c:1732 #, c-format -msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgid "Auto-merging %s" msgstr "" -#: remote.c:1725 -#, c-format -msgid "branch '%s' has no remote for pushing" +#: merge-recursive.c:1736 git-submodule.sh:924 +msgid "submodule" msgstr "" -#: remote.c:1736 +#: merge-recursive.c:1737 #, c-format -msgid "push refspecs for '%s' do not include '%s'" -msgstr "" - -#: remote.c:1749 -msgid "push has no destination (push.default is 'nothing')" -msgstr "" - -#: remote.c:1771 -msgid "cannot resolve 'simple' push to a single destination" +msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: remote.c:2073 +#: merge-recursive.c:1831 #, c-format -msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "" - -#: remote.c:2077 -msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgid "Removing %s" msgstr "" -#: remote.c:2080 -#, c-format -msgid "Your branch is up-to-date with '%s'.\n" +#: merge-recursive.c:1857 +msgid "file/directory" msgstr "" -#: remote.c:2084 -#, c-format -msgid "Your branch is ahead of '%s' by %d commit.\n" -msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:2090 -msgid " (use \"git push\" to publish your local commits)\n" +#: merge-recursive.c:1863 +msgid "directory/file" msgstr "" -#: remote.c:2093 +#: merge-recursive.c:1868 #, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:2101 -msgid " (use \"git pull\" to update your local branch)\n" +msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: remote.c:2104 +#: merge-recursive.c:1877 #, c-format -msgid "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commit each, respectively.\n" -msgid_plural "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commits each, respectively.\n" -msgstr[0] "" -msgstr[1] "" - -#: remote.c:2114 -msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgid "Adding %s" msgstr "" -#: revision.c:2132 -msgid "your current branch appears to be broken" +#: merge-recursive.c:1914 +msgid "Already up-to-date!" msgstr "" -#: revision.c:2135 +#: merge-recursive.c:1923 #, c-format -msgid "your current branch '%s' does not have any commits yet" -msgstr "" - -#: revision.c:2329 -msgid "--first-parent is incompatible with --bisect" +msgid "merging of trees %s and %s failed" msgstr "" -#: run-command.c:92 -msgid "open /dev/null failed" +#: merge-recursive.c:2006 +msgid "Merging:" msgstr "" -#: run-command.c:94 +#: merge-recursive.c:2019 #, c-format -msgid "dup2(%d,%d) failed" -msgstr "" +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "" +msgstr[1] "" -#: send-pack.c:298 -msgid "failed to sign the push certificate" +#: merge-recursive.c:2058 +msgid "merge returned no commit" msgstr "" -#: send-pack.c:411 -msgid "the receiving end does not support --signed push" +#: merge-recursive.c:2121 +#, c-format +msgid "Could not parse object '%s'" msgstr "" -#: send-pack.c:413 -msgid "" -"not sending a push certificate since the receiving end does not support --" -"signed push" +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +msgid "Unable to write index." msgstr "" -#: send-pack.c:425 -msgid "the receiving end does not support --atomic push" +#: notes-merge.c:273 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." msgstr "" -#: send-pack.c:430 -msgid "the receiving end does not support push options" +#: notes-merge.c:280 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." msgstr "" -#: sequencer.c:174 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add ' or 'git rm '" +#: notes-utils.c:41 +msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: sequencer.c:177 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add ' or 'git rm '\n" -"and commit the result with 'git commit'" +#: notes-utils.c:100 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: sequencer.c:190 sequencer.c:841 sequencer.c:924 +#: notes-utils.c:110 #, c-format -msgid "Could not write to %s" +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:137 #, c-format -msgid "Error wrapping up %s." +msgid "Bad %s value: '%s'" msgstr "" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." +#: object.c:242 +#, c-format +msgid "unable to parse object: %s" msgstr "" -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." +#: parse-options.c:572 +msgid "..." msgstr "" -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." +#: parse-options.c:590 +#, c-format +msgid "usage: %s" msgstr "" -#: sequencer.c:228 +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:594 #, c-format -msgid "%s: fast-forward" +msgid " or: %s" msgstr "" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:303 +#: parse-options.c:597 #, c-format -msgid "%s: Unable to write new index file" +msgid " %s" msgstr "" -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" +#: parse-options.c:631 +msgid "-NUM" msgstr "" -#: sequencer.c:341 -msgid "Unable to update cache tree\n" +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" msgstr "" -#: sequencer.c:393 +#: path.c:826 #, c-format -msgid "Could not parse commit %s\n" +msgid "Could not make %s writable by group" msgstr "" -#: sequencer.c:398 -#, c-format -msgid "Could not parse parent commit %s\n" +#: pathspec.c:133 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: sequencer.c:463 -msgid "Your index file is unmerged." +#: pathspec.c:143 +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" msgstr "" -#: sequencer.c:482 -#, c-format -msgid "Commit %s is a merge but no -m option was given." +#: pathspec.c:177 +msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: sequencer.c:490 +#: pathspec.c:183 #, c-format -msgid "Commit %s does not have parent %d" +msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: sequencer.c:494 +#: pathspec.c:187 #, c-format -msgid "Mainline was specified but commit %s is not a merge." +msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:507 +#: pathspec.c:205 #, c-format -msgid "%s: cannot parse parent commit %s" +msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: sequencer.c:511 +#: pathspec.c:230 #, c-format -msgid "Cannot get commit message for %s" +msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: sequencer.c:597 +#: pathspec.c:241 #, c-format -msgid "could not revert %s... %s" +msgid "%s: '%s' is outside repository" msgstr "" -#: sequencer.c:598 +#: pathspec.c:291 #, c-format -msgid "could not apply %s... %s" +msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: sequencer.c:633 -msgid "empty commit set passed" +#: pathspec.c:353 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: sequencer.c:641 -#, c-format -msgid "git %s: failed to read the index" +#: pathspec.c:408 +msgid "" +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" msgstr "" -#: sequencer.c:645 +#: pathspec.c:440 #, c-format -msgid "git %s: failed to refresh the index" +msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: sequencer.c:705 -msgid "Cannot revert during another revert." +#: pathspec.c:449 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." +#: pretty.c:971 +msgid "unable to parse --pretty format" msgstr "" -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." +#: read-cache.c:1315 +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" msgstr "" -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." +#: read-cache.c:1325 +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" msgstr "" -#: sequencer.c:732 +#: refs.c:576 builtin/merge.c:840 #, c-format -msgid "Could not parse line %d." +msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:737 -msgid "No commits parsed." +#: refs/files-backend.c:2481 +#, c-format +msgid "could not delete reference %s: %s" msgstr "" -#: sequencer.c:749 +#: refs/files-backend.c:2484 #, c-format -msgid "Could not open %s" +msgid "could not delete references: %s" msgstr "" -#: sequencer.c:753 +#: refs/files-backend.c:2493 #, c-format -msgid "Could not read %s." +msgid "could not remove reference %s" msgstr "" -#: sequencer.c:760 +#: ref-filter.c:55 #, c-format -msgid "Unusable instruction sheet: %s" +msgid "expected format: %%(color:)" msgstr "" -#: sequencer.c:790 +#: ref-filter.c:57 #, c-format -msgid "Invalid key: %s" +msgid "unrecognized color: %%(color:%s)" msgstr "" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: ref-filter.c:71 #, c-format -msgid "Invalid value for %s: %s" +msgid "unrecognized format: %%(%s)" msgstr "" -#: sequencer.c:803 +#: ref-filter.c:77 #, c-format -msgid "Malformed options sheet: %s" +msgid "%%(body) does not take arguments" msgstr "" -#: sequencer.c:822 -msgid "a cherry-pick or revert is already in progress" +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" msgstr "" -#: sequencer.c:823 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +#: ref-filter.c:101 +#, c-format +msgid "positive value expected contents:lines=%s" msgstr "" -#: sequencer.c:827 +#: ref-filter.c:103 #, c-format -msgid "Could not create sequencer directory %s" +msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: sequencer.c:862 sequencer.c:998 -msgid "no cherry-pick or revert in progress" +#: ref-filter.c:113 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: sequencer.c:864 -msgid "cannot resolve HEAD" +#: ref-filter.c:135 +#, c-format +msgid "expected format: %%(align:,)" msgstr "" -#: sequencer.c:866 sequencer.c:900 -msgid "cannot abort from a branch yet to be born" +#: ref-filter.c:147 +#, c-format +msgid "unrecognized position:%s" msgstr "" -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 +#: ref-filter.c:151 #, c-format -msgid "cannot open %s" +msgid "unrecognized width:%s" msgstr "" -#: sequencer.c:888 +#: ref-filter.c:157 #, c-format -msgid "cannot read %s: %s" +msgid "unrecognized %%(align) argument: %s" msgstr "" -#: sequencer.c:889 -msgid "unexpected end of file" +#: ref-filter.c:161 +#, c-format +msgid "positive width expected with the %%(align) atom" msgstr "" -#: sequencer.c:895 +#: ref-filter.c:244 #, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgid "malformed field name: %.*s" msgstr "" -#: sequencer.c:921 +#: ref-filter.c:270 #, c-format -msgid "Could not format %s." +msgid "unknown field name: %.*s" msgstr "" -#: sequencer.c:1066 +#: ref-filter.c:372 #, c-format -msgid "%s: can't cherry-pick a %s" +msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: sequencer.c:1069 +#: ref-filter.c:424 #, c-format -msgid "%s: bad revision" +msgid "malformed format string %s" msgstr "" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" msgstr "" -#: setup.c:160 +#: ref-filter.c:883 #, c-format -msgid "" -"%s: no such path in the working tree.\n" -"Use 'git -- ...' to specify paths that do not exist locally." +msgid "ref '%s' does not have %ld components to :strip" msgstr "" -#: setup.c:173 +#: ref-filter.c:1046 #, c-format -msgid "" -"ambiguous argument '%s': unknown revision or path not in the working tree.\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git [...] -- [...]'" +msgid "unknown %.*s format %s" msgstr "" -#: setup.c:223 +#: ref-filter.c:1066 ref-filter.c:1097 #, c-format -msgid "" -"ambiguous argument '%s': both revision and filename\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git [...] -- [...]'" +msgid "missing object %s for %s" msgstr "" -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 +#: ref-filter.c:1069 ref-filter.c:1100 #, c-format -msgid "failed to read %s" +msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: setup.c:468 +#: ref-filter.c:1311 #, c-format -msgid "Expected git repo version <= %d, found %d" +msgid "malformed object at '%s'" msgstr "" -#: setup.c:476 -msgid "unknown repository extensions found:" +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" msgstr "" -#: setup.c:762 +#: ref-filter.c:1378 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" +msgid "ignoring broken ref %s" msgstr "" -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 -msgid "Cannot come back to cwd" +#: ref-filter.c:1633 +#, c-format +msgid "format: %%(end) atom missing" msgstr "" -#: setup.c:845 -msgid "Unable to read current working directory" +#: ref-filter.c:1687 +#, c-format +msgid "malformed object name %s" msgstr "" -#: setup.c:920 +#: remote.c:746 #, c-format -msgid "" -"Not a git repository (or any parent up to mount point %s)\n" -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: setup.c:927 +#: remote.c:750 #, c-format -msgid "Cannot change to '%s/..'" +msgid "%s usually tracks %s, not %s" msgstr "" -#: setup.c:989 +#: remote.c:754 #, c-format -msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" -"The owner of files must always have read and write permissions." +msgid "%s tracks both %s and %s" msgstr "" -#: sha1_file.c:1046 -msgid "offset before end of packfile (broken .idx?)" +#: remote.c:762 +msgid "Internal error" msgstr "" -#: sha1_file.c:2434 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" +#: remote.c:1677 remote.c:1720 +msgid "HEAD does not point to a branch" msgstr "" -#: sha1_file.c:2438 +#: remote.c:1686 #, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" +msgid "no such branch: '%s'" msgstr "" -#: sha1_name.c:462 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git checkout -b $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" +#: remote.c:1689 +#, c-format +msgid "no upstream configured for branch '%s'" msgstr "" -#: submodule.c:64 submodule.c:98 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +#: remote.c:1695 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: submodule.c:68 submodule.c:102 +#: remote.c:1710 #, c-format -msgid "Could not find section in .gitmodules where path=%s" +msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: submodule.c:76 +#: remote.c:1725 #, c-format -msgid "Could not update .gitmodules entry %s" +msgid "branch '%s' has no remote for pushing" msgstr "" -#: submodule.c:109 +#: remote.c:1736 #, c-format -msgid "Could not remove .gitmodules entry for %s" +msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: submodule.c:120 -msgid "staging updated .gitmodules failed" +#: remote.c:1749 +msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: submodule.c:177 -msgid "negative values not allowed for submodule.fetchJobs" +#: remote.c:1771 +msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: submodule-config.c:358 +#: remote.c:2073 #, c-format -msgid "invalid value for %s" +msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: trailer.c:237 -#, c-format -msgid "running trailer command '%s' failed" +#: remote.c:2077 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: remote.c:2080 #, c-format -msgid "unknown value '%s' for key '%s'" +msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: remote.c:2084 #, c-format -msgid "more than one %s" +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "" +msgstr[1] "" + +#: remote.c:2090 +msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: trailer.c:582 +#: remote.c:2093 #, c-format -msgid "empty trailer token in trailer '%.*s'" +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +msgstr[1] "" + +#: remote.c:2101 +msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: trailer.c:702 +#: remote.c:2104 #, c-format -msgid "could not read input file '%s'" -msgstr "" +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +msgstr[1] "" -#: trailer.c:705 -msgid "could not read from stdin" +#: remote.c:2114 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: trailer.c:857 builtin/am.c:42 -#, c-format -msgid "could not stat %s" +#: revision.c:2158 +msgid "your current branch appears to be broken" msgstr "" -#: trailer.c:859 +#: revision.c:2161 #, c-format -msgid "file %s is not a regular file" +msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: trailer.c:861 -#, c-format -msgid "file %s is not writable by user" +#: revision.c:2355 +msgid "--first-parent is incompatible with --bisect" msgstr "" -#: trailer.c:873 -msgid "could not open temporary file" +#: run-command.c:106 +msgid "open /dev/null failed" msgstr "" -#: trailer.c:912 +#: run-command.c:108 #, c-format -msgid "could not rename temporary file to %s" +msgid "dup2(%d,%d) failed" msgstr "" -#: transport.c:62 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" +#: send-pack.c:297 +msgid "failed to sign the push certificate" msgstr "" -#: transport.c:151 -#, c-format -msgid "transport: invalid depth option '%s'" +#: send-pack.c:410 +msgid "the receiving end does not support --signed push" msgstr "" -#: transport.c:771 -#, c-format +#: send-pack.c:412 msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" +"not sending a push certificate since the receiving end does not support --" +"signed push" msgstr "" -#: transport.c:775 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" +#: send-pack.c:424 +msgid "the receiving end does not support --atomic push" msgstr "" -#: transport.c:783 -msgid "Aborting." +#: send-pack.c:429 +msgid "the receiving end does not support push options" msgstr "" -#: transport-helper.c:1041 -#, c-format -msgid "Could not read ref %s" +#: sequencer.c:171 +msgid "revert" msgstr "" -#: unpack-trees.c:64 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you switch branches." +#: sequencer.c:171 +msgid "cherry-pick" msgstr "" -#: unpack-trees.c:66 -#, c-format +#: sequencer.c:228 msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%s" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '" msgstr "" -#: unpack-trees.c:69 -#, c-format +#: sequencer.c:231 msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you merge." +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '\n" +"and commit the result with 'git commit'" msgstr "" -#: unpack-trees.c:71 +#: sequencer.c:244 sequencer.c:1209 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%s" +msgid "could not lock '%s'" msgstr "" -#: unpack-trees.c:74 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 #, 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." +msgid "could not write to '%s'" msgstr "" -#: unpack-trees.c:76 +#: sequencer.c:251 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%s" +msgid "could not write eol to '%s" msgstr "" -#: unpack-trees.c:81 +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 #, c-format -msgid "" -"Updating the following directories would lose untracked files in it:\n" -"%s" +msgid "failed to finalize '%s'." msgstr "" -#: unpack-trees.c:85 +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 #, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you switch branches." +msgid "could not read '%s'" msgstr "" -#: unpack-trees.c:87 +#: sequencer.c:305 #, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%s" +msgid "your local changes would be overwritten by %s." msgstr "" -#: unpack-trees.c:90 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you merge." +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." msgstr "" -#: unpack-trees.c:92 +#: sequencer.c:324 #, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%s" +msgid "%s: fast-forward" msgstr "" -#: unpack-trees.c:95 +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:399 #, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you %s." +msgid "%s: Unable to write new index file" msgstr "" -#: unpack-trees.c:97 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%s" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" msgstr "" -#: unpack-trees.c:102 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%sPlease move or remove them before you switch branches." +#: sequencer.c:438 +msgid "unable to update cache tree\n" msgstr "" -#: unpack-trees.c:104 +#: sequencer.c:483 #, c-format msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%s" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" msgstr "" -#: unpack-trees.c:107 +#: sequencer.c:567 #, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you merge." +msgid "could not parse commit %s\n" msgstr "" -#: unpack-trees.c:109 +#: sequencer.c:572 #, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%s" +msgid "could not parse parent commit %s\n" msgstr "" -#: unpack-trees.c:112 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you %s." +#: sequencer.c:656 +msgid "your index file is unmerged." msgstr "" -#: unpack-trees.c:114 +#: sequencer.c:675 #, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%s" +msgid "commit %s is a merge but no -m option was given." msgstr "" -#: unpack-trees.c:121 +#: sequencer.c:683 #, c-format -msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgid "commit %s does not have parent %d" msgstr "" -#: unpack-trees.c:124 +#: sequencer.c:687 #, c-format -msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" -"%s" +msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: unpack-trees.c:126 +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:700 #, c-format -msgid "" -"The following Working tree files would be overwritten by sparse checkout " -"update:\n" -"%s" +msgid "%s: cannot parse parent commit %s" msgstr "" -#: unpack-trees.c:128 +#: sequencer.c:705 #, c-format -msgid "" -"The following Working tree files would be removed by sparse checkout " -"update:\n" -"%s" +msgid "cannot get commit message for %s" msgstr "" -#: unpack-trees.c:205 +#: sequencer.c:797 #, c-format -msgid "Aborting\n" +msgid "could not revert %s... %s" msgstr "" -#: unpack-trees.c:237 -msgid "Checking out files" +#: sequencer.c:798 +#, c-format +msgid "could not apply %s... %s" msgstr "" -#: urlmatch.c:120 -msgid "invalid URL scheme name or missing '://' suffix" +#: sequencer.c:833 +msgid "empty commit set passed" msgstr "" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: sequencer.c:843 #, c-format -msgid "invalid %XX escape sequence" +msgid "git %s: failed to read the index" msgstr "" -#: urlmatch.c:172 -msgid "missing host and scheme is not 'file:'" +#: sequencer.c:850 +#, c-format +msgid "git %s: failed to refresh the index" msgstr "" -#: urlmatch.c:189 -msgid "a 'file:' URL may not have a port number" +#: sequencer.c:944 +#, c-format +msgid "invalid line %d: %.*s" msgstr "" -#: urlmatch.c:199 -msgid "invalid characters in host name" +#: sequencer.c:950 +msgid "no commits parsed." msgstr "" -#: urlmatch.c:244 urlmatch.c:255 -msgid "invalid port number" +#: sequencer.c:966 +#, c-format +msgid "could not read '%s'." msgstr "" -#: urlmatch.c:322 -msgid "invalid '..' path segment" +#: sequencer.c:972 +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "" + +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." msgstr "" -#: worktree.c:282 -#, c-format -msgid "failed to read '%s'" +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." msgstr "" -#: wrapper.c:222 wrapper.c:392 +#: sequencer.c:1028 #, c-format -msgid "could not open '%s' for reading and writing" +msgid "invalid key: %s" msgstr "" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 +#: sequencer.c:1031 #, c-format -msgid "could not open '%s' for writing" +msgid "invalid value for %s: %s" msgstr "" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 -#: builtin/pull.c:407 +#: sequencer.c:1063 #, c-format -msgid "could not open '%s' for reading" +msgid "malformed options sheet: '%s'" msgstr "" -#: wrapper.c:605 wrapper.c:626 -#, c-format -msgid "unable to access '%s'" +#: sequencer.c:1101 +msgid "a cherry-pick or revert is already in progress" msgstr "" -#: wrapper.c:634 -msgid "unable to get current working directory" +#: sequencer.c:1102 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: wrapper.c:658 +#: sequencer.c:1106 #, c-format -msgid "could not write to %s" +msgid "could not create sequencer directory '%s'" msgstr "" -#: wrapper.c:660 -#, c-format -msgid "could not close %s" +#: sequencer.c:1120 +msgid "could not lock HEAD" msgstr "" -#: wt-status.c:150 -msgid "Unmerged paths:" +#: sequencer.c:1151 sequencer.c:1289 +msgid "no cherry-pick or revert in progress" msgstr "" -#: wt-status.c:177 wt-status.c:204 -#, c-format -msgid " (use \"git reset %s ...\" to unstage)" +#: sequencer.c:1153 +msgid "cannot resolve HEAD" msgstr "" -#: wt-status.c:179 wt-status.c:206 -msgid " (use \"git rm --cached ...\" to unstage)" +#: sequencer.c:1155 sequencer.c:1189 +msgid "cannot abort from a branch yet to be born" msgstr "" -#: wt-status.c:183 -msgid " (use \"git add ...\" to mark resolution)" +#: sequencer.c:1175 builtin/grep.c:578 +#, c-format +msgid "cannot open '%s'" msgstr "" -#: wt-status.c:185 wt-status.c:189 -msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" +#: sequencer.c:1177 +#, c-format +msgid "cannot read '%s': %s" msgstr "" -#: wt-status.c:187 -msgid " (use \"git rm ...\" to mark resolution)" +#: sequencer.c:1178 +msgid "unexpected end of file" msgstr "" -#: wt-status.c:198 wt-status.c:882 -msgid "Changes to be committed:" +#: sequencer.c:1184 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: wt-status.c:216 wt-status.c:891 -msgid "Changes not staged for commit:" +#: sequencer.c:1354 +#, c-format +msgid "%s: can't cherry-pick a %s" msgstr "" -#: wt-status.c:220 -msgid " (use \"git add ...\" to update what will be committed)" +#: sequencer.c:1358 +#, c-format +msgid "%s: bad revision" msgstr "" -#: wt-status.c:222 -msgid " (use \"git add/rm ...\" to update what will be committed)" +#: sequencer.c:1391 +msgid "can't revert as initial commit" msgstr "" -#: wt-status.c:223 +#: setup.c:160 +#, c-format msgid "" -" (use \"git checkout -- ...\" to discard changes in working directory)" +"%s: no such path in the working tree.\n" +"Use 'git -- ...' to specify paths that do not exist locally." msgstr "" -#: wt-status.c:225 -msgid " (commit or discard the untracked or modified content in submodules)" +#: setup.c:173 +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git [...] -- [...]'" msgstr "" -#: wt-status.c:237 +#: setup.c:223 #, c-format -msgid " (use \"git %s ...\" to include in what will be committed)" +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git [...] -- [...]'" msgstr "" -#: wt-status.c:252 -msgid "both deleted:" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" msgstr "" -#: wt-status.c:254 -msgid "added by us:" +#: setup.c:476 +msgid "unknown repository extensions found:" msgstr "" -#: wt-status.c:256 -msgid "deleted by them:" +#: setup.c:762 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" msgstr "" -#: wt-status.c:258 -msgid "added by them:" +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" msgstr "" -#: wt-status.c:260 -msgid "deleted by us:" +#: setup.c:845 +msgid "Unable to read current working directory" msgstr "" -#: wt-status.c:262 -msgid "both added:" +#: setup.c:920 +#, c-format +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: wt-status.c:264 -msgid "both modified:" +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" msgstr "" -#: wt-status.c:274 -msgid "new file:" +#: setup.c:989 +#, c-format +msgid "" +"Problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." msgstr "" -#: wt-status.c:276 -msgid "copied:" +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" msgstr "" -#: wt-status.c:278 -msgid "deleted:" +#: sha1_file.c:499 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: wt-status.c:280 -msgid "modified:" +#: sha1_file.c:505 +#, c-format +msgid "reference repository '%s' is not a local repository." msgstr "" -#: wt-status.c:282 -msgid "renamed:" +#: sha1_file.c:511 +#, c-format +msgid "reference repository '%s' is shallow" msgstr "" -#: wt-status.c:284 -msgid "typechange:" +#: sha1_file.c:519 +#, c-format +msgid "reference repository '%s' is grafted" msgstr "" -#: wt-status.c:286 -msgid "unknown:" +#: sha1_file.c:1159 +msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: wt-status.c:288 -msgid "unmerged:" +#: sha1_file.c:2592 +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: wt-status.c:370 -msgid "new commits, " +#: sha1_file.c:2596 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: wt-status.c:372 -msgid "modified content, " +#: sha1_name.c:407 +#, c-format +msgid "short SHA1 %s is ambiguous" msgstr "" -#: wt-status.c:374 -msgid "untracked content, " +#: sha1_name.c:418 +msgid "The candidates are:" msgstr "" -#: wt-status.c:756 -msgid "Submodules changed but not updated:" +#: sha1_name.c:577 +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" +"may be created by mistake. For example,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" msgstr "" -#: wt-status.c:758 -msgid "Submodule changes to be committed:" +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: wt-status.c:839 -msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: wt-status.c:950 -msgid "You have unmerged paths." +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" msgstr "" -#: wt-status.c:953 -msgid " (fix conflicts and run \"git commit\")" +#: submodule.c:109 +#, c-format +msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: wt-status.c:955 -msgid " (use \"git merge --abort\" to abort the merge)" +#: submodule.c:120 +msgid "staging updated .gitmodules failed" msgstr "" -#: wt-status.c:960 -msgid "All conflicts fixed but you are still merging." +#: submodule.c:158 +msgid "negative values not allowed for submodule.fetchJobs" msgstr "" -#: wt-status.c:963 -msgid " (use \"git commit\" to conclude merge)" +#: submodule-config.c:358 +#, c-format +msgid "invalid value for %s" msgstr "" -#: wt-status.c:973 -msgid "You are in the middle of an am session." +#: trailer.c:238 +#, c-format +msgid "running trailer command '%s' failed" msgstr "" -#: wt-status.c:976 -msgid "The current patch is empty." +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 +#: trailer.c:541 +#, c-format +msgid "unknown value '%s' for key '%s'" msgstr "" -#: wt-status.c:980 -msgid " (fix conflicts and then run \"git am --continue\")" +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#, c-format +msgid "more than one %s" msgstr "" -#: wt-status.c:982 -msgid " (use \"git am --skip\" to skip this patch)" +#: trailer.c:672 +#, c-format +msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: wt-status.c:984 -msgid " (use \"git am --abort\" to restore the original branch)" +#: trailer.c:695 +#, c-format +msgid "could not read input file '%s'" msgstr "" -#: wt-status.c:1109 -msgid "No commands done." +#: trailer.c:698 +msgid "could not read from stdin" msgstr "" -#: wt-status.c:1112 +#: trailer.c:929 builtin/am.c:44 #, c-format -msgid "Last command done (%d command done):" -msgid_plural "Last commands done (%d commands done):" -msgstr[0] "" -msgstr[1] "" +msgid "could not stat %s" +msgstr "" -#: wt-status.c:1123 +#: trailer.c:931 #, c-format -msgid " (see more in file %s)" +msgid "file %s is not a regular file" msgstr "" -#: wt-status.c:1128 -msgid "No commands remaining." +#: trailer.c:933 +#, c-format +msgid "file %s is not writable by user" +msgstr "" + +#: trailer.c:945 +msgid "could not open temporary file" msgstr "" -#: wt-status.c:1131 +#: trailer.c:983 #, c-format -msgid "Next command to do (%d remaining command):" -msgid_plural "Next commands to do (%d remaining commands):" -msgstr[0] "" -msgstr[1] "" +msgid "could not rename temporary file to %s" +msgstr "" -#: wt-status.c:1139 -msgid " (use \"git rebase --edit-todo\" to view and edit)" +#: transport.c:62 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: wt-status.c:1152 +#: transport.c:151 #, c-format -msgid "You are currently rebasing branch '%s' on '%s'." +msgid "transport: invalid depth option '%s'" msgstr "" -#: wt-status.c:1157 -msgid "You are currently rebasing." +#: transport.c:817 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" msgstr "" -#: wt-status.c:1171 -msgid " (fix conflicts and then run \"git rebase --continue\")" +#: transport.c:821 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" msgstr "" -#: wt-status.c:1173 -msgid " (use \"git rebase --skip\" to skip this patch)" +#: transport.c:829 +msgid "Aborting." msgstr "" -#: wt-status.c:1175 -msgid " (use \"git rebase --abort\" to check out the original branch)" +#: transport-helper.c:1075 +#, c-format +msgid "Could not read ref %s" msgstr "" -#: wt-status.c:1181 -msgid " (all conflicts fixed: run \"git rebase --continue\")" +#: tree-walk.c:31 +msgid "too-short tree object" msgstr "" -#: wt-status.c:1185 -#, c-format -msgid "" -"You are currently splitting a commit while rebasing branch '%s' on '%s'." +#: tree-walk.c:37 +msgid "malformed mode in tree entry" msgstr "" -#: wt-status.c:1190 -msgid "You are currently splitting a commit during a rebase." +#: tree-walk.c:41 +msgid "empty filename in tree entry" msgstr "" -#: wt-status.c:1193 -msgid " (Once your working directory is clean, run \"git rebase --continue\")" +#: tree-walk.c:113 +msgid "too-short tree file" msgstr "" -#: wt-status.c:1197 +#: unpack-trees.c:64 #, c-format -msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +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 "" -#: wt-status.c:1202 -msgid "You are currently editing a commit during a rebase." +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" msgstr "" -#: wt-status.c:1205 -msgid " (use \"git commit --amend\" to amend the current commit)" +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you merge." +msgstr "" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" msgstr "" -#: wt-status.c:1207 +#: unpack-trees.c:74 +#, c-format msgid "" -" (use \"git rebase --continue\" once you are satisfied with your changes)" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you %s." msgstr "" -#: wt-status.c:1217 +#: unpack-trees.c:76 #, c-format -msgid "You are currently cherry-picking commit %s." +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" msgstr "" -#: wt-status.c:1222 -msgid " (fix conflicts and run \"git cherry-pick --continue\")" +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" msgstr "" -#: wt-status.c:1225 -msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you switch branches." msgstr "" -#: wt-status.c:1227 -msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" msgstr "" -#: wt-status.c:1236 +#: unpack-trees.c:90 #, c-format -msgid "You are currently reverting commit %s." +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." msgstr "" -#: wt-status.c:1241 -msgid " (fix conflicts and run \"git revert --continue\")" +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" msgstr "" -#: wt-status.c:1244 -msgid " (all conflicts fixed: run \"git revert --continue\")" +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you %s." msgstr "" -#: wt-status.c:1246 -msgid " (use \"git revert --abort\" to cancel the revert operation)" +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" msgstr "" -#: wt-status.c:1257 +#: unpack-trees.c:102 #, c-format -msgid "You are currently bisecting, started from branch '%s'." +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you switch branches." msgstr "" -#: wt-status.c:1261 -msgid "You are currently bisecting." +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" msgstr "" -#: wt-status.c:1264 -msgid " (use \"git bisect reset\" to get back to the original branch)" +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you merge." msgstr "" -#: wt-status.c:1464 -msgid "On branch " +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" msgstr "" -#: wt-status.c:1470 -msgid "interactive rebase in progress; onto " +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you %s." msgstr "" -#: wt-status.c:1472 -msgid "rebase in progress; onto " +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" msgstr "" -#: wt-status.c:1477 -msgid "HEAD detached at " +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: wt-status.c:1479 -msgid "HEAD detached from " +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" msgstr "" -#: wt-status.c:1482 -msgid "Not currently on any branch." +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" msgstr "" -#: wt-status.c:1500 -msgid "Initial commit" +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following working tree files would be removed by sparse checkout " +"update:\n" +"%s" msgstr "" -#: wt-status.c:1514 -msgid "Untracked files" +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" msgstr "" -#: wt-status.c:1516 -msgid "Ignored files" +#: unpack-trees.c:237 +msgid "Checking out files" msgstr "" -#: wt-status.c:1520 -#, c-format -msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" msgstr "" -#: wt-status.c:1526 +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format -msgid "Untracked files not listed%s" +msgid "invalid %XX escape sequence" msgstr "" -#: wt-status.c:1528 -msgid " (use -u option to show untracked files)" +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" msgstr "" -#: wt-status.c:1534 -msgid "No changes" +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" msgstr "" -#: wt-status.c:1539 -#, c-format -msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +#: urlmatch.c:199 +msgid "invalid characters in host name" msgstr "" -#: wt-status.c:1542 -#, c-format -msgid "no changes added to commit\n" +#: urlmatch.c:244 urlmatch.c:255 +msgid "invalid port number" msgstr "" -#: wt-status.c:1545 -#, c-format -msgid "" -"nothing added to commit but untracked files present (use \"git add\" to " -"track)\n" +#: urlmatch.c:322 +msgid "invalid '..' path segment" msgstr "" -#: wt-status.c:1548 +#: worktree.c:282 #, c-format -msgid "nothing added to commit but untracked files present\n" +msgid "failed to read '%s'" msgstr "" -#: wt-status.c:1551 +#: wrapper.c:222 wrapper.c:392 #, c-format -msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgid "could not open '%s' for reading and writing" msgstr "" -#: wt-status.c:1554 wt-status.c:1559 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 #, c-format -msgid "nothing to commit\n" +msgid "could not open '%s' for writing" msgstr "" -#: wt-status.c:1557 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 #, c-format -msgid "nothing to commit (use -u to show untracked files)\n" +msgid "could not open '%s' for reading" msgstr "" -#: wt-status.c:1561 +#: wrapper.c:605 wrapper.c:626 #, c-format -msgid "nothing to commit, working tree clean\n" -msgstr "" - -#: wt-status.c:1668 -msgid "Initial commit on " +msgid "unable to access '%s'" msgstr "" -#: wt-status.c:1672 -msgid "HEAD (no branch)" +#: wrapper.c:634 +msgid "unable to get current working directory" msgstr "" -#: wt-status.c:1701 -msgid "gone" +#: wrapper.c:658 +#, c-format +msgid "could not write to %s" msgstr "" -#: wt-status.c:1703 wt-status.c:1711 -msgid "behind " +#: wrapper.c:660 +#, c-format +msgid "could not close %s" msgstr "" -#: wt-status.c:1706 wt-status.c:1709 -msgid "ahead " +#: wt-status.c:151 +msgid "Unmerged paths:" msgstr "" -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#: wt-status.c:178 wt-status.c:205 #, c-format -msgid "failed to unlink '%s'" +msgid " (use \"git reset %s ...\" to unstage)" msgstr "" -#: builtin/add.c:22 -msgid "git add [] [--] ..." +#: wt-status.c:180 wt-status.c:207 +msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: builtin/add.c:65 -#, c-format -msgid "unexpected diff status %c" +#: wt-status.c:184 +msgid " (use \"git add ...\" to mark resolution)" msgstr "" -#: builtin/add.c:71 builtin/commit.c:281 -msgid "updating files failed" +#: wt-status.c:186 wt-status.c:190 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: builtin/add.c:81 -#, c-format -msgid "remove '%s'\n" +#: wt-status.c:188 +msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: builtin/add.c:136 -msgid "Unstaged changes after refreshing the index:" +#: wt-status.c:199 wt-status.c:945 +msgid "Changes to be committed:" msgstr "" -#: builtin/add.c:196 builtin/rev-parse.c:811 -msgid "Could not read the index" +#: wt-status.c:217 wt-status.c:954 +msgid "Changes not staged for commit:" msgstr "" -#: builtin/add.c:207 -#, c-format -msgid "Could not open '%s' for writing." +#: wt-status.c:221 +msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: builtin/add.c:211 -msgid "Could not write patch" +#: wt-status.c:223 +msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: builtin/add.c:214 -msgid "editing patch failed" +#: wt-status.c:224 +msgid "" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: builtin/add.c:217 -#, c-format -msgid "Could not stat '%s'" +#: wt-status.c:226 +msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: builtin/add.c:219 -msgid "Empty patch. Aborted." +#: wt-status.c:238 +#, c-format +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: builtin/add.c:224 -#, c-format -msgid "Could not apply '%s'" +#: wt-status.c:253 +msgid "both deleted:" msgstr "" -#: builtin/add.c:234 -msgid "The following paths are ignored by one of your .gitignore files:\n" +#: wt-status.c:255 +msgid "added by us:" msgstr "" -#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 -#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 -msgid "dry run" +#: wt-status.c:257 +msgid "deleted by them:" msgstr "" -#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 -#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 -#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" +#: wt-status.c:259 +msgid "added by them:" msgstr "" -#: builtin/add.c:256 -msgid "interactive picking" +#: wt-status.c:261 +msgid "deleted by us:" msgstr "" -#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 -msgid "select hunks interactively" +#: wt-status.c:263 +msgid "both added:" msgstr "" -#: builtin/add.c:258 -msgid "edit current diff and apply" +#: wt-status.c:265 +msgid "both modified:" msgstr "" -#: builtin/add.c:259 -msgid "allow adding otherwise ignored files" +#: wt-status.c:275 +msgid "new file:" msgstr "" -#: builtin/add.c:260 -msgid "update tracked files" +#: wt-status.c:277 +msgid "copied:" msgstr "" -#: builtin/add.c:261 -msgid "record only the fact that the path will be added later" +#: wt-status.c:279 +msgid "deleted:" msgstr "" -#: builtin/add.c:262 -msgid "add changes from all tracked and untracked files" +#: wt-status.c:281 +msgid "modified:" msgstr "" -#: builtin/add.c:265 -msgid "ignore paths removed in the working tree (same as --no-all)" +#: wt-status.c:283 +msgid "renamed:" msgstr "" -#: builtin/add.c:267 -msgid "don't add, only refresh the index" +#: wt-status.c:285 +msgid "typechange:" msgstr "" -#: builtin/add.c:268 -msgid "just skip files which cannot be added because of errors" +#: wt-status.c:287 +msgid "unknown:" msgstr "" -#: builtin/add.c:269 -msgid "check if - even missing - files are ignored in dry run" +#: wt-status.c:289 +msgid "unmerged:" msgstr "" -#: builtin/add.c:270 builtin/update-index.c:958 -msgid "(+/-)x" +#: wt-status.c:371 +msgid "new commits, " msgstr "" -#: builtin/add.c:270 builtin/update-index.c:959 -msgid "override the executable bit of the listed files" +#: wt-status.c:373 +msgid "modified content, " msgstr "" -#: builtin/add.c:292 -#, c-format -msgid "Use -f if you really want to add them.\n" +#: wt-status.c:375 +msgid "untracked content, " msgstr "" -#: builtin/add.c:300 -msgid "adding files failed" +#: wt-status.c:818 +msgid "Submodules changed but not updated:" msgstr "" -#: builtin/add.c:336 -msgid "-A and -u are mutually incompatible" +#: wt-status.c:820 +msgid "Submodule changes to be committed:" msgstr "" -#: builtin/add.c:343 -msgid "Option --ignore-missing can only be used together with --dry-run" +#: wt-status.c:901 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." msgstr "" -#: builtin/add.c:352 -#, c-format -msgid "--chmod param '%s' must be either -x or +x" +#: wt-status.c:1013 +msgid "You have unmerged paths." msgstr "" -#: builtin/add.c:367 -#, c-format -msgid "Nothing specified, nothing added.\n" +#: wt-status.c:1016 +msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: builtin/add.c:368 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" +#: wt-status.c:1018 +msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 -msgid "index file corrupt" +#: wt-status.c:1023 +msgid "All conflicts fixed but you are still merging." msgstr "" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" +#: wt-status.c:1026 +msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" +#: wt-status.c:1036 +msgid "You are in the middle of an am session." msgstr "" -#: builtin/am.c:426 -msgid "could not parse author script" +#: wt-status.c:1039 +msgid "The current patch is empty." msgstr "" -#: builtin/am.c:503 -#, c-format -msgid "'%s' was deleted by the applypatch-msg hook" +#: wt-status.c:1043 +msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: builtin/am.c:544 builtin/notes.c:301 -#, c-format -msgid "Malformed input line: '%s'." +#: wt-status.c:1045 +msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: builtin/am.c:581 builtin/notes.c:316 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" +#: wt-status.c:1047 +msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: builtin/am.c:607 -msgid "fseek failed" +#: wt-status.c:1172 +msgid "No commands done." msgstr "" -#: builtin/am.c:787 +#: wt-status.c:1175 #, c-format -msgid "could not parse patch '%s'" -msgstr "" +msgid "Last command done (%d command done):" +msgid_plural "Last commands done (%d commands done):" +msgstr[0] "" +msgstr[1] "" -#: builtin/am.c:852 -msgid "Only one StGIT patch series can be applied at once" +#: wt-status.c:1186 +#, c-format +msgid " (see more in file %s)" msgstr "" -#: builtin/am.c:899 -msgid "invalid timestamp" +#: wt-status.c:1191 +msgid "No commands remaining." msgstr "" -#: builtin/am.c:902 builtin/am.c:910 -msgid "invalid Date line" -msgstr "" +#: wt-status.c:1194 +#, c-format +msgid "Next command to do (%d remaining command):" +msgid_plural "Next commands to do (%d remaining commands):" +msgstr[0] "" +msgstr[1] "" -#: builtin/am.c:907 -msgid "invalid timezone offset" +#: wt-status.c:1202 +msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: builtin/am.c:996 -msgid "Patch format detection failed." +#: wt-status.c:1215 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: builtin/am.c:1001 builtin/clone.c:380 -#, c-format -msgid "failed to create directory '%s'" +#: wt-status.c:1220 +msgid "You are currently rebasing." msgstr "" -#: builtin/am.c:1005 -msgid "Failed to split patches." +#: wt-status.c:1234 +msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: builtin/am.c:1137 builtin/commit.c:366 -msgid "unable to write index file" +#: wt-status.c:1236 +msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: builtin/am.c:1188 -#, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." +#: wt-status.c:1238 +msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: builtin/am.c:1189 -#, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +#: wt-status.c:1244 +msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: builtin/am.c:1190 +#: wt-status.c:1248 #, c-format -msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: builtin/am.c:1328 -msgid "Patch is empty. Was it split wrong?" +#: wt-status.c:1253 +msgid "You are currently splitting a commit during a rebase." msgstr "" -#: builtin/am.c:1402 builtin/log.c:1543 -#, c-format -msgid "invalid ident line: %s" +#: wt-status.c:1256 +msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: builtin/am.c:1429 +#: wt-status.c:1260 #, c-format -msgid "unable to parse commit %s" +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: builtin/am.c:1602 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." +#: wt-status.c:1265 +msgid "You are currently editing a commit during a rebase." msgstr "" -#: builtin/am.c:1604 -msgid "Using index info to reconstruct a base tree..." +#: wt-status.c:1268 +msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: builtin/am.c:1623 +#: wt-status.c:1270 msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" - -#: builtin/am.c:1629 -msgid "Falling back to patching base and 3-way merge..." +" (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: builtin/am.c:1654 -msgid "Failed to merge in the changes." +#: wt-status.c:1280 +#, c-format +msgid "You are currently cherry-picking commit %s." msgstr "" -#: builtin/am.c:1679 builtin/merge.c:628 -msgid "git write-tree failed to write a tree" +#: wt-status.c:1285 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: builtin/am.c:1686 -msgid "applying to an empty history" +#: wt-status.c:1288 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 -#: builtin/merge.c:823 -msgid "failed to write commit object" +#: wt-status.c:1290 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: builtin/am.c:1731 builtin/am.c:1735 +#: wt-status.c:1299 #, c-format -msgid "cannot resume: %s does not exist." -msgstr "" - -#: builtin/am.c:1751 -msgid "cannot be interactive without stdin connected to a terminal." +msgid "You are currently reverting commit %s." msgstr "" -#: builtin/am.c:1756 -msgid "Commit Body is:" +#: wt-status.c:1304 +msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#. -#: builtin/am.c:1766 -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +#: wt-status.c:1307 +msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: builtin/am.c:1816 -#, c-format -msgid "Dirty index: cannot apply patches (dirty: %s)" +#: wt-status.c:1309 +msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: builtin/am.c:1853 builtin/am.c:1925 +#: wt-status.c:1320 #, c-format -msgid "Applying: %.*s" +msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: builtin/am.c:1869 -msgid "No changes -- Patch already applied." +#: wt-status.c:1324 +msgid "You are currently bisecting." msgstr "" -#: builtin/am.c:1877 -#, c-format -msgid "Patch failed at %s %.*s" +#: wt-status.c:1327 +msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: builtin/am.c:1883 -#, c-format -msgid "The copy of the patch that failed is found in: %s" +#: wt-status.c:1524 +msgid "On branch " msgstr "" -#: builtin/am.c:1928 -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." +#: wt-status.c:1530 +msgid "interactive rebase in progress; onto " msgstr "" -#: builtin/am.c:1935 -msgid "" -"You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +#: wt-status.c:1532 +msgid "rebase in progress; onto " msgstr "" -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 -#: builtin/reset.c:316 -#, c-format -msgid "Could not parse object '%s'." +#: wt-status.c:1537 +msgid "HEAD detached at " msgstr "" -#: builtin/am.c:2095 -msgid "failed to clean index" +#: wt-status.c:1539 +msgid "HEAD detached from " msgstr "" -#: builtin/am.c:2129 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" +#: wt-status.c:1542 +msgid "Not currently on any branch." msgstr "" -#: builtin/am.c:2192 -#, c-format -msgid "Invalid value for --patch-format: %s" +#: wt-status.c:1560 +msgid "Initial commit" msgstr "" -#: builtin/am.c:2225 -msgid "git am [] [(|)...]" +#: wt-status.c:1574 +msgid "Untracked files" msgstr "" -#: builtin/am.c:2226 -msgid "git am [] (--continue | --skip | --abort)" +#: wt-status.c:1576 +msgid "Ignored files" msgstr "" -#: builtin/am.c:2232 -msgid "run interactively" +#: wt-status.c:1580 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." msgstr "" -#: builtin/am.c:2234 -msgid "historical option -- no-op" +#: wt-status.c:1586 +#, c-format +msgid "Untracked files not listed%s" msgstr "" -#: builtin/am.c:2236 -msgid "allow fall back on 3way merging if needed" +#: wt-status.c:1588 +msgid " (use -u option to show untracked files)" msgstr "" -#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 -#: builtin/repack.c:172 -msgid "be quiet" +#: wt-status.c:1594 +msgid "No changes" msgstr "" -#: builtin/am.c:2239 -msgid "add a Signed-off-by line to the commit message" +#: wt-status.c:1599 +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: builtin/am.c:2242 -msgid "recode into utf8 (default)" +#: wt-status.c:1602 +#, c-format +msgid "no changes added to commit\n" msgstr "" -#: builtin/am.c:2244 -msgid "pass -k flag to git-mailinfo" +#: wt-status.c:1605 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" msgstr "" -#: builtin/am.c:2246 -msgid "pass -b flag to git-mailinfo" +#: wt-status.c:1608 +#, c-format +msgid "nothing added to commit but untracked files present\n" msgstr "" -#: builtin/am.c:2248 -msgid "pass -m flag to git-mailinfo" +#: wt-status.c:1611 +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: builtin/am.c:2250 -msgid "pass --keep-cr flag to git-mailsplit for mbox format" +#: wt-status.c:1614 wt-status.c:1619 +#, c-format +msgid "nothing to commit\n" msgstr "" -#: builtin/am.c:2253 -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +#: wt-status.c:1617 +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: builtin/am.c:2256 -msgid "strip everything before a scissors line" +#: wt-status.c:1621 +#, c-format +msgid "nothing to commit, working tree clean\n" msgstr "" -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" +#: wt-status.c:1728 +msgid "Initial commit on " msgstr "" -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/am.c:2285 -msgid "pass it through git-apply" +#: wt-status.c:1732 +msgid "HEAD (no branch)" msgstr "" -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" +#: wt-status.c:1761 +msgid "gone" msgstr "" -#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 -#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 -#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 -#: builtin/submodule--helper.c:826 -msgid "path" +#: wt-status.c:1763 wt-status.c:1771 +msgid "behind " msgstr "" -#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 -#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 -#: parse-options.h:132 parse-options.h:134 parse-options.h:244 -msgid "n" +#: wt-status.c:1766 wt-status.c:1769 +msgid "ahead " msgstr "" -#: builtin/am.c:2278 builtin/apply.c:4805 -msgid "num" +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 +#, c-format +msgid "cannot %s: You have unstaged changes." msgstr "" -#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 -msgid "format" +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." msgstr "" -#: builtin/am.c:2282 -msgid "format the patch(es) are in" +#: wt-status.c:2278 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: builtin/am.c:2288 -msgid "override error message when patch failure occurs" +#: compat/precompose_utf8.c:57 builtin/clone.c:414 +#, c-format +msgid "failed to unlink '%s'" msgstr "" -#: builtin/am.c:2290 -msgid "continue applying patches after resolving a conflict" +#: builtin/add.c:22 +msgid "git add [] [--] ..." msgstr "" -#: builtin/am.c:2293 -msgid "synonyms for --continue" +#: builtin/add.c:80 +#, c-format +msgid "unexpected diff status %c" msgstr "" -#: builtin/am.c:2296 -msgid "skip the current patch" +#: builtin/add.c:85 builtin/commit.c:291 +msgid "updating files failed" msgstr "" -#: builtin/am.c:2299 -msgid "restore the original branch and abort the patching operation." +#: builtin/add.c:95 +#, c-format +msgid "remove '%s'\n" msgstr "" -#: builtin/am.c:2303 -msgid "lie about committer date" +#: builtin/add.c:149 +msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/am.c:2305 -msgid "use current timestamp for author date" +#: builtin/add.c:209 builtin/rev-parse.c:840 +msgid "Could not read the index" msgstr "" -#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 -msgid "key-id" +#: builtin/add.c:220 +#, c-format +msgid "Could not open '%s' for writing." msgstr "" -#: builtin/am.c:2308 -msgid "GPG-sign commits" +#: builtin/add.c:224 +msgid "Could not write patch" msgstr "" -#: builtin/am.c:2311 -msgid "(internal use for git-rebase)" +#: builtin/add.c:227 +msgid "editing patch failed" msgstr "" -#: builtin/am.c:2326 -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." +#: builtin/add.c:230 +#, c-format +msgid "Could not stat '%s'" msgstr "" -#: builtin/am.c:2333 -msgid "failed to read the index" +#: builtin/add.c:232 +msgid "Empty patch. Aborted." msgstr "" -#: builtin/am.c:2348 +#: builtin/add.c:237 #, c-format -msgid "previous rebase directory %s still exists but mbox given." +msgid "Could not apply '%s'" msgstr "" -#: builtin/am.c:2372 -#, c-format -msgid "" -"Stray %s directory found.\n" -"Use \"git am --abort\" to remove it." +#: builtin/add.c:247 +msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/am.c:2378 -msgid "Resolve operation not in progress, we are not resuming." +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +msgid "dry run" msgstr "" -#: builtin/apply.c:122 -msgid "git apply [] [...]" +#: builtin/add.c:269 +msgid "interactive picking" msgstr "" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" +#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +msgid "select hunks interactively" msgstr "" -#: builtin/apply.c:169 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" +#: builtin/add.c:271 +msgid "edit current diff and apply" msgstr "" -#: builtin/apply.c:854 -#, c-format -msgid "Cannot prepare timestamp regexp %s" +#: builtin/add.c:272 +msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/apply.c:863 -#, c-format -msgid "regexec returned %d for input: %s" +#: builtin/add.c:273 +msgid "update tracked files" msgstr "" -#: builtin/apply.c:947 -#, c-format -msgid "unable to find filename in patch at line %d" +#: builtin/add.c:274 +msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/apply.c:984 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +#: builtin/add.c:275 +msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/apply.c:989 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" +#: builtin/add.c:278 +msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/apply.c:990 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" +#: builtin/add.c:280 +msgid "don't add, only refresh the index" msgstr "" -#: builtin/apply.c:995 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" +#: builtin/add.c:281 +msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" +#: builtin/add.c:282 +msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" +#: builtin/add.c:283 builtin/update-index.c:947 +msgid "(+/-)x" msgstr "" -#: builtin/apply.c:1567 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -msgstr[1] "" +#: builtin/add.c:283 builtin/update-index.c:948 +msgid "override the executable bit of the listed files" +msgstr "" -#: builtin/apply.c:1743 -msgid "new file depends on old contents" +#: builtin/add.c:305 +#, c-format +msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/apply.c:1745 -msgid "deleted file still has contents" +#: builtin/add.c:312 +msgid "adding files failed" msgstr "" -#: builtin/apply.c:1774 -#, c-format -msgid "corrupt patch at line %d" +#: builtin/add.c:348 +msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" +#: builtin/add.c:355 +msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/apply.c:1812 +#: builtin/add.c:359 #, c-format -msgid "deleted file %s still has contents" +msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/apply.c:1815 +#: builtin/add.c:374 #, c-format -msgid "** warning: file %s becomes empty but is not deleted" +msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/apply.c:1962 +#: builtin/add.c:375 #, c-format -msgid "corrupt binary patch at line %d: %.*s" +msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/apply.c:1999 -#, c-format -msgid "unrecognized binary patch at line %d" +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:244 +msgid "index file corrupt" msgstr "" -#: builtin/apply.c:2154 -#, c-format -msgid "patch with only garbage at line %d" +#: builtin/am.c:414 +msgid "could not parse author script" msgstr "" -#: builtin/apply.c:2244 +#: builtin/am.c:491 #, c-format -msgid "unable to read symlink %s" +msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/apply.c:2248 +#: builtin/am.c:532 #, c-format -msgid "unable to open or read %s" +msgid "Malformed input line: '%s'." msgstr "" -#: builtin/apply.c:2901 +#: builtin/am.c:569 #, c-format -msgid "invalid start of line: '%c'" +msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/apply.c:3020 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "" -msgstr[1] "" +#: builtin/am.c:595 +msgid "fseek failed" +msgstr "" -#: builtin/apply.c:3032 +#: builtin/am.c:775 #, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgid "could not parse patch '%s'" msgstr "" -#: builtin/apply.c:3038 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" +#: builtin/am.c:840 +msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/apply.c:3060 -#, c-format -msgid "missing binary patch data for '%s'" +#: builtin/am.c:887 +msgid "invalid timestamp" msgstr "" -#: builtin/apply.c:3163 -#, c-format -msgid "binary patch does not apply to '%s'" +#: builtin/am.c:890 builtin/am.c:898 +msgid "invalid Date line" msgstr "" -#: builtin/apply.c:3169 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +#: builtin/am.c:895 +msgid "invalid timezone offset" msgstr "" -#: builtin/apply.c:3190 -#, c-format -msgid "patch failed: %s:%ld" +#: builtin/am.c:984 +msgid "Patch format detection failed." msgstr "" -#: builtin/apply.c:3314 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format -msgid "cannot checkout %s" +msgid "failed to create directory '%s'" msgstr "" -#: builtin/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" +#: builtin/am.c:993 +msgid "Failed to split patches." msgstr "" -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" +#: builtin/am.c:1125 builtin/commit.c:376 +msgid "unable to write index file" msgstr "" -#: builtin/apply.c:3482 builtin/apply.c:3644 +#: builtin/am.c:1176 #, c-format -msgid "%s: does not exist in index" +msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 +#: builtin/am.c:1177 #, c-format -msgid "%s: %s" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/apply.c:3491 builtin/apply.c:3652 +#: builtin/am.c:1178 #, c-format -msgid "%s: does not match index" +msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" +#: builtin/am.c:1316 +msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/apply.c:3669 +#: builtin/am.c:1390 builtin/log.c:1550 #, c-format -msgid "%s: wrong type" +msgid "invalid ident line: %s" msgstr "" -#: builtin/apply.c:3671 +#: builtin/am.c:1417 #, c-format -msgid "%s has type %o, expected %o" +msgid "unable to parse commit %s" msgstr "" -#: builtin/apply.c:3822 builtin/apply.c:3824 -#, c-format -msgid "invalid path '%s'" +#: builtin/am.c:1610 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/apply.c:3879 -#, c-format -msgid "%s: already exists in index" +#: builtin/am.c:1612 +msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" +#: builtin/am.c:1631 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." msgstr "" -#: builtin/apply.c:3902 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" +#: builtin/am.c:1637 +msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/apply.c:3907 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" +#: builtin/am.c:1662 +msgid "Failed to merge in the changes." msgstr "" -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" +#: builtin/am.c:1686 builtin/merge.c:628 +msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" +#: builtin/am.c:1693 +msgid "applying to an empty history" msgstr "" -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 +#: builtin/merge.c:823 +msgid "failed to write commit object" msgstr "" -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format -msgid "make_cache_entry failed for path '%s'" +msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" +#: builtin/am.c:1759 +msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" +#: builtin/am.c:1764 +msgid "Commit Body is:" msgstr "" -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c:1774 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/apply.c:4224 +#: builtin/am.c:1824 #, c-format -msgid "unable to create backing store for newly created file %s" +msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/apply.c:4227 builtin/apply.c:4340 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format -msgid "unable to add cache entry for %s" +msgid "Applying: %.*s" msgstr "" -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" +#: builtin/am.c:1877 +msgid "No changes -- Patch already applied." msgstr "" -#: builtin/apply.c:4313 +#: builtin/am.c:1885 #, c-format -msgid "unable to write file '%s' mode %o" +msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/apply.c:4403 +#: builtin/am.c:1891 #, c-format -msgid "Applied patch %s cleanly." +msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/apply.c:4411 -msgid "internal error" +#: builtin/am.c:1936 +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/apply.c:4414 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "" -msgstr[1] "" +#: builtin/am.c:1943 +msgid "" +"You still have unmerged paths in your index.\n" +"Did you forget to use 'git add'?" +msgstr "" -#: builtin/apply.c:4424 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/reset.c:316 #, c-format -msgid "truncating .rej filename to %.*s.rej" +msgid "Could not parse object '%s'." msgstr "" -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" +#: builtin/am.c:2103 +msgid "failed to clean index" msgstr "" -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." +#: builtin/am.c:2137 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/apply.c:4448 +#: builtin/am.c:2200 #, c-format -msgid "Rejected hunk #%d." +msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/apply.c:4537 -#, c-format -msgid "Skipped patch '%s'." +#: builtin/am.c:2233 +msgid "git am [] [( | )...]" msgstr "" -#: builtin/apply.c:4545 -msgid "unrecognized input" +#: builtin/am.c:2234 +msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/apply.c:4556 -msgid "unable to read index file" +#: builtin/am.c:2240 +msgid "run interactively" msgstr "" -#: builtin/apply.c:4701 -msgid "--3way outside a repository" +#: builtin/am.c:2242 +msgid "historical option -- no-op" msgstr "" -#: builtin/apply.c:4709 -msgid "--index outside a repository" +#: builtin/am.c:2244 +msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/apply.c:4712 -msgid "--cached outside a repository" +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/repack.c:172 +msgid "be quiet" msgstr "" -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" +#: builtin/am.c:2247 +msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "" -msgstr[1] "" +#: builtin/am.c:2250 +msgid "recode into utf8 (default)" +msgstr "" -#: builtin/apply.c:4766 builtin/apply.c:4776 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "" -msgstr[1] "" +#: builtin/am.c:2252 +msgid "pass -k flag to git-mailinfo" +msgstr "" -#: builtin/apply.c:4800 -msgid "don't apply changes matching the given path" +#: builtin/am.c:2254 +msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/apply.c:4803 -msgid "apply changes matching the given path" +#: builtin/am.c:2256 +msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/apply.c:4806 -msgid "remove leading slashes from traditional diff paths" +#: builtin/am.c:2258 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/apply.c:4809 -msgid "ignore additions made by the patch" +#: builtin/am.c:2261 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/apply.c:4811 -msgid "instead of applying the patch, output diffstat for the input" +#: builtin/am.c:2264 +msgid "strip everything before a scissors line" msgstr "" -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 +msgid "pass it through git-apply" msgstr "" -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 +#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245 +msgid "n" msgstr "" -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 +msgid "format" msgstr "" -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" +#: builtin/am.c:2290 +msgid "format the patch(es) are in" msgstr "" -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" +#: builtin/am.c:2296 +msgid "override error message when patch failure occurs" msgstr "" -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" +#: builtin/am.c:2298 +msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" +#: builtin/am.c:2301 +msgid "synonyms for --continue" msgstr "" -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" +#: builtin/am.c:2304 +msgid "skip the current patch" msgstr "" -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" +#: builtin/am.c:2307 +msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" +#: builtin/am.c:2311 +msgid "lie about committer date" msgstr "" -#: builtin/apply.c:4836 -msgid "ensure at least lines of context match" +#: builtin/am.c:2313 +msgid "use current timestamp for author date" msgstr "" -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +msgid "key-id" msgstr "" -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" +#: builtin/am.c:2316 +msgid "GPG-sign commits" msgstr "" -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" +#: builtin/am.c:2319 +msgid "(internal use for git-rebase)" msgstr "" -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" +#: builtin/am.c:2334 +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/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" +#: builtin/am.c:2341 +msgid "failed to read the index" msgstr "" -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" +#: builtin/am.c:2356 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" +#: builtin/am.c:2380 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." msgstr "" -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" +#: builtin/am.c:2386 +msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/apply.c:4862 -msgid "prepend to all filenames" +#: builtin/apply.c:8 +msgid "git apply [] [...]" msgstr "" #: builtin/archive.c:17 @@ -3810,112 +4255,158 @@ msgstr "" msgid "Blaming lines" msgstr "" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "n,m" msgstr "" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "Process only line range n,m, counting from 1" msgstr "" +#: builtin/blame.c:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "" + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "" +msgstr[1] "" + #: builtin/branch.c:26 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "" @@ -4154,6 +4645,10 @@ msgstr "" msgid "change the upstream info" msgstr "" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "" + #: builtin/branch.c:661 msgid "use colored output" msgstr "" @@ -4226,8 +4721,8 @@ msgstr "" msgid "field name to sort on" msgstr "" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402 -#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 #: builtin/tag.c:369 msgid "object" msgstr "" @@ -4240,7 +4735,7 @@ msgstr "" msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "" @@ -4343,61 +4838,75 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:443 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"|--textconv) " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | | --textconv | --filters) [--path=] " msgstr "" -#: builtin/cat-file.c:444 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" msgstr "" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:551 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:490 +#: builtin/cat-file.c:560 +msgid "for blob objects, run filters on object's content" +msgstr "" + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "" + +#: builtin/cat-file.c:564 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:499 +#: builtin/cat-file.c:573 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "" @@ -4417,7 +4926,7 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "" @@ -4425,7 +4934,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "" @@ -4515,9 +5024,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491 -#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497 -#: builtin/submodule--helper.c:830 builtin/worktree.c:469 +#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 +#: builtin/worktree.c:469 msgid "string" msgstr "" @@ -4588,54 +5097,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:664 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:668 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:675 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:679 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:681 builtin/checkout.c:1070 +#: builtin/checkout.c:680 builtin/checkout.c:1069 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:683 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:734 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:740 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4650,7 +5159,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:759 +#: builtin/checkout.c:758 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4667,162 +5176,162 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:795 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:799 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:826 builtin/checkout.c:1065 +#: builtin/checkout.c:825 builtin/checkout.c:1064 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:971 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1011 builtin/worktree.c:214 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1040 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1079 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1082 builtin/checkout.c:1086 +#: builtin/checkout.c:1081 builtin/checkout.c:1085 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 +#: builtin/checkout.c:1100 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1105 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1144 builtin/worktree.c:328 +#: builtin/checkout.c:1143 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1154 builtin/merge.c:231 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout '" msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1162 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117 -#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1253 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1265 +#: builtin/checkout.c:1264 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1269 +#: builtin/checkout.c:1268 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4952,8 +5461,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 msgid "pattern" msgstr "" @@ -4989,290 +5498,306 @@ msgstr "" msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 +#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:80 builtin/init-db.c:473 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "" -#: builtin/clone.c:81 builtin/init-db.c:474 +#: builtin/clone.c:84 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:83 builtin/submodule--helper.c:495 -#: builtin/submodule--helper.c:833 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 +#: builtin/submodule--helper.c:954 msgid "reference repository" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 -#: builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/pull.c:202 msgid "depth" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:98 builtin/init-db.c:482 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "" -#: builtin/clone.c:99 builtin/init-db.c:483 +#: builtin/clone.c:108 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:307 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" - -#: builtin/clone.c:309 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "" - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "" - -#: builtin/clone.c:317 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' is grafted" +msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:461 +#: builtin/clone.c:460 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:538 +#: builtin/clone.c:537 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:863 builtin/receive-pack.c:1855 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:900 builtin/fetch.c:1293 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 #: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:997 +#: builtin/clone.c:963 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" + +#: builtin/clone.c:1019 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1000 +#: builtin/clone.c:1021 +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:1023 +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1058 builtin/clone.c:1066 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "" @@ -5375,103 +5900,103 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:585 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:705 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:707 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5481,7 +6006,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5491,14 +6016,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5506,341 +6031,345 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "" -#: builtin/commit.c:965 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1067 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1186 +#: builtin/commit.c:1191 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 +#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "" -#: builtin/commit.c:1349 builtin/commit.c:1634 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1596 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "author" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1598 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 -#: builtin/notes.c:559 builtin/tag.c:349 +#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:349 msgid "message" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "commit message" msgstr "" -#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 -#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 msgid "commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "" -#: builtin/commit.c:1608 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1761 +#: builtin/commit.c:1754 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1809 +#: builtin/commit.c:1802 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5998,11 +6527,18 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" + +#: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "" @@ -6116,7 +6652,7 @@ msgstr "" msgid "only consider tags matching " msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:321 +#: builtin/describe.c:410 builtin/name-rev.c:320 msgid "show abbreviated commit object as fallback" msgstr "" @@ -6150,21 +6686,21 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -6237,247 +6773,259 @@ msgstr "" msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:95 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:97 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:108 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:119 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 -#: builtin/fetch.c:684 +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, 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:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:979 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1201 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1219 +#: builtin/fetch.c:1257 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:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -6486,23 +7034,23 @@ msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "" @@ -6618,7 +7166,7 @@ msgstr "" msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "" @@ -6702,224 +7250,219 @@ msgstr "" msgid "invalid number of threads specified (%d) for %s" msgstr "" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:690 +#: builtin/grep.c:691 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:699 +#: builtin/grep.c:700 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:704 +#: builtin/grep.c:705 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use worker threads" msgstr "" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:718 +#: builtin/grep.c:719 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match " msgstr "" -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:742 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "" -#: builtin/grep.c:845 builtin/index-pack.c:1479 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "" @@ -6933,389 +7476,397 @@ msgstr "" msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "type" msgstr "" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:401 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:402 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:403 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "" -#: builtin/help.c:404 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:405 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:406 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:407 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:408 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:420 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:441 builtin/help.c:458 +#: builtin/help.c:440 #, c-format -msgid "usage: %s%s" +msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/help.c:474 +#: builtin/help.c:462 builtin/help.c:479 #, c-format -msgid "`git %s' is aliased to `%s'" +msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:153 +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version % unsupported" msgstr "" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %: %s" msgstr "" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:573 +#: builtin/index-pack.c:576 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 -#: builtin/index-pack.c:808 builtin/index-pack.c:817 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:748 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1256 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1268 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "" @@ -7355,126 +7906,126 @@ msgstr "" msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:312 builtin/init-db.c:315 +#: builtin/init-db.c:327 #, c-format -msgid "%s already exists" +msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:344 +#: builtin/init-db.c:330 #, c-format -msgid "unable to handle file type %d" +msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:347 +#: builtin/init-db.c:347 builtin/init-db.c:350 #, c-format -msgid "unable to move %s to %s" +msgid "%s already exists" msgstr "" -#: builtin/init-db.c:402 +#: builtin/init-db.c:403 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:403 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:407 +#: builtin/init-db.c:408 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:408 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:455 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:513 builtin/init-db.c:518 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:543 +#: builtin/init-db.c:545 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -7583,344 +8134,349 @@ msgstr "" msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1064 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 -#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 -#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 -#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1263 +#: builtin/log.c:1267 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= manually." msgstr "" -#: builtin/log.c:1283 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1294 +#: builtin/log.c:1298 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1298 +#: builtin/log.c:1302 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1347 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1404 +#: builtin/log.c:1408 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1415 +#: builtin/log.c:1419 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1416 +#: builtin/log.c:1420 msgid "sfx" msgstr "" -#: builtin/log.c:1417 +#: builtin/log.c:1421 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "" + +#: builtin/log.c:1430 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "" -#: builtin/log.c:1443 builtin/log.c:1445 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "add To: header" msgstr "" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "ident" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1452 builtin/log.c:1455 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [] [...]" msgstr "" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from " msgstr "" -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "" + +#: builtin/ls-files.c:553 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "" @@ -8034,31 +8590,31 @@ msgstr "" msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:195 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:127 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:198 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:201 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "" @@ -8066,28 +8622,28 @@ msgstr "" msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:211 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:215 builtin/pull.c:154 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "" @@ -8099,7 +8655,7 @@ msgstr "" msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:227 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "" @@ -8306,55 +8862,55 @@ msgstr "" msgid "Already up-to-date." msgstr "" -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1480 builtin/merge.c:1559 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8379,23 +8935,23 @@ msgstr "" msgid "git merge-base --fork-point []" msgstr "" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where forked from reflog of " msgstr "" @@ -8437,6 +8993,37 @@ msgstr "" msgid "set labels for file1/orig-file/file2" msgstr "" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "" +msgstr[1] "" + +#: builtin/merge-recursive.c:63 +msgid "not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" @@ -8545,43 +9132,43 @@ msgstr "" msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [] ..." msgstr "" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [] --all" msgstr "" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [] --stdin" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching " msgstr "" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "" @@ -8709,7 +9296,7 @@ msgid "failed to finish 'show' for object '%s'" msgstr "" #: builtin/notes.c:194 -msgid "Please supply the note contents using either -m or -F option" +msgid "please supply the note contents using either -m or -F option" msgstr "" #: builtin/notes.c:203 @@ -8718,7 +9305,7 @@ msgstr "" #: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" +msgid "the note contents have been left in %s" msgstr "" #: builtin/notes.c:233 builtin/tag.c:439 @@ -8731,158 +9318,214 @@ msgstr "" msgid "could not open or read '%s'" msgstr "" +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "" + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." +msgid "failed to read object '%s'." msgstr "" #: builtin/notes.c:261 #, c-format -msgid "Cannot read note data from non-blob object '%s'." +msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "" + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "" + +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "" + +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "" -#: builtin/notes.c:376 builtin/notes.c:663 +#: builtin/notes.c:378 builtin/notes.c:665 #, c-format -msgid "No note found for object %s." +msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:450 builtin/notes.c:529 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for (implies --stdin)" msgstr "" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." +msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:587 +#: builtin/notes.c:589 #, 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:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "" + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "" + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:821 +#: builtin/notes.c:823 #, c-format -msgid "Unknown -s/--strategy: %s" +msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" +msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" +msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -8890,222 +9533,218 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from " msgstr "" -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" +msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2652 +#: builtin/pack-objects.c:2800 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than