From d93ef2a150234079ca5990136dfc99e1c099a4a1 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Tue, 14 May 2019 17:09:58 +0800 Subject: l10n: git.pot: v2.22.0 round 1 (270 new, 56 removed) Generate po/git.pot from v2.22.0-rc0 for git v2.22.0 l10n round 1. Signed-off-by: Jiang Xin --- po/git.pot | 7392 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 4166 insertions(+), 3226 deletions(-) (limited to 'po/git.pot') diff --git a/po/git.pot b/po/git.pot index e00e84440f..1c394c66eb 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: 2019-02-15 10:09+0800\n" +"POT-Creation-Date: 2019-05-14 17:09+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:101 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:154 +#: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:156 +#: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:158 +#: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:160 +#: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:162 +#: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:164 +#: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:174 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:180 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:185 builtin/merge.c:1290 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:187 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:194 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -94,92 +94,92 @@ msgstr "" msgid "unclosed quote" msgstr "" -#: apply.c:59 +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:75 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:125 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:127 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:130 +#: apply.c:134 msgid "--3way outside a repository" msgstr "" -#: apply.c:141 +#: apply.c:145 msgid "--index outside a repository" msgstr "" -#: apply.c:144 +#: apply.c:148 msgid "--cached outside a repository" msgstr "" -#: apply.c:825 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:834 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:908 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:946 +#: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:952 +#: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:953 +#: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:958 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:987 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1306 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1478 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1547 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1567 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -190,528 +190,527 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1580 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1768 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "" -#: apply.c:1770 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "" -#: apply.c:1804 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1841 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1843 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1846 +#: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1993 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2030 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2192 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2278 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2282 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2941 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3062 +#: apply.c:3066 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3074 +#: apply.c:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3080 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3102 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3110 +#: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3157 +#: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3167 +#: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3175 +#: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3193 +#: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3206 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3212 +#: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3233 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3356 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3416 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3445 apply.c:3688 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3531 apply.c:3703 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3540 apply.c:3711 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3575 +#: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3578 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3594 apply.c:3598 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3610 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3624 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3629 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3655 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3728 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3730 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 -#: read-cache.c:1299 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3939 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3942 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3962 +#: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3967 +#: apply.c:3971 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3987 +#: apply.c:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3991 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4006 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4098 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4105 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4108 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143 +#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4117 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4127 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4265 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4299 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4305 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4313 +#: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4319 apply.c:4464 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4362 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4366 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4436 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4534 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4542 +#: apply.c:4546 msgid "internal error" msgstr "" -#: apply.c:4545 +#: apply.c:4549 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4556 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4578 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4582 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "" -#: apply.c:4720 +#: apply.c:4724 msgid "unable to read index file" msgstr "" -#: apply.c:4875 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4902 +#: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4908 apply.c:4923 +#: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4916 +#: apply.c:4920 #, 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:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263 -#: builtin/pull.c:200 builtin/submodule--helper.c:407 +#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 +#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271 +#: builtin/pull.c:207 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4960 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4963 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4965 builtin/am.c:2212 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "" -#: apply.c:4966 +#: apply.c:4970 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4969 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4971 +#: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4975 +#: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4977 +#: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4979 +#: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4981 +#: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4983 +#: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4985 +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4987 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4990 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4992 +#: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4994 +#: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4999 +#: apply.c:5003 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 +#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3314 builtin/rebase.c:1065 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "" -#: apply.c:5001 +#: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5004 apply.c:5007 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5010 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5012 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5014 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5016 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 -#: builtin/rebase--interactive.c:159 +#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5019 +#: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5022 +#: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5024 builtin/am.c:2200 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "" -#: apply.c:5025 +#: apply.c:5029 msgid "prepend to all filenames" msgstr "" @@ -732,7 +731,7 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -764,7 +763,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:456 builtin/log.c:1549 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "" @@ -772,11 +771,11 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 -#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:162 +#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 +#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:176 msgid "file" msgstr "" @@ -808,8 +807,8 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 msgid "repo" msgstr "" @@ -817,7 +816,7 @@ msgstr "" msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713 #: builtin/notes.c:498 msgid "command" msgstr "" @@ -863,16 +862,16 @@ msgstr "" msgid "cannot read %s" msgstr "" -#: archive-tar.c:458 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "" -#: archive-tar.c:461 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "" -#: archive-tar.c:468 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "" @@ -887,7 +886,7 @@ msgstr "" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "" @@ -975,33 +974,33 @@ msgstr "" msgid "a %s revision is needed" msgstr "" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:937 builtin/merge.c:139 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:967 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:986 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:994 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1013 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1011,49 +1010,49 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1019 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:1792 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:1806 +#: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:1827 +#: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 +#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 +#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 +#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:1854 +#: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:1865 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:1876 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1062,85 +1061,85 @@ msgid "" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "" -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "" -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "" -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1152,17 +1151,17 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" @@ -1187,8 +1186,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763 -#: builtin/commit.c:776 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 +#: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "" @@ -1236,7 +1235,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1259,9 +1258,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376 -#: builtin/replace.c:448 +#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "" @@ -1283,158 +1281,219 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1122 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1125 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1128 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1131 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1385 +#: commit.c:1391 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 "" -#: commit-graph.c:101 -#, c-format -msgid "graph file %s is too small" +#: commit-graph.c:105 +msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:136 +#: commit-graph.c:170 #, c-format -msgid "graph signature %X does not match signature %X" +msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:143 +#: commit-graph.c:177 #, c-format -msgid "graph version %X does not match version %X" +msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:150 +#: commit-graph.c:184 #, c-format -msgid "hash version %X does not match version %X" +msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:173 -msgid "chunk lookup table entry missing; graph file may be incomplete" +#: commit-graph.c:207 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:184 +#: commit-graph.c:218 #, c-format -msgid "improper chunk offset %08x%08x" +msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:221 +#: commit-graph.c:255 #, c-format -msgid "chunk id %08x appears multiple times" +msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:334 +#: commit-graph.c:388 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:671 builtin/pack-objects.c:2646 +#: commit-graph.c:730 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:704 +#: commit-graph.c:763 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:720 +#: commit-graph.c:779 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:732 +#: commit-graph.c:791 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:752 +#: commit-graph.c:811 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:869 +#: commit-graph.c:928 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:882 +#: commit-graph.c:941 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:884 +#: commit-graph.c:943 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:898 +#: commit-graph.c:957 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:930 +#: commit-graph.c:989 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:943 +#: commit-graph.c:1002 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:956 +#: commit-graph.c:1015 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:965 +#: commit-graph.c:1024 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:989 +#: commit-graph.c:1048 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:996 midx.c:769 +#: commit-graph.c:1055 midx.c:805 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1036 +#: commit-graph.c:1095 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1109 +#: commit-graph.c:1160 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1153 +#: commit-graph.c:1170 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "" + +#: commit-graph.c:1180 commit-graph.c:1195 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "" + +#: commit-graph.c:1187 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "" + +#: commit-graph.c:1204 msgid "Verifying commits in commit graph" msgstr "" +#: commit-graph.c:1217 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" + +#: commit-graph.c:1224 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "" + +#: commit-graph.c:1234 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "" + +#: commit-graph.c:1240 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "" + +#: commit-graph.c:1253 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "" + +#: commit-graph.c:1258 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" + +#: commit-graph.c:1262 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" + +#: commit-graph.c:1277 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "" + +#: commit-graph.c:1283 +#, c-format +msgid "commit date for commit %s in commit-graph is % != %" +msgstr "" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" @@ -1472,7 +1531,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:378 sequencer.c:2330 +#: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "" @@ -1608,135 +1667,135 @@ msgstr "" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1481 builtin/pack-objects.c:3394 +#: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1602 +#: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1605 +#: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1622 +#: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1652 +#: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1705 +#: config.c:1710 msgid "unable to parse command-line config" msgstr "" -#: config.c:2037 +#: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2207 +#: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2250 +#: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2276 +#: config.c:2298 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2322 +#: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2324 +#: config.c:2346 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2405 +#: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2437 +#: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2466 +#: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2716 config.c:3040 +#: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2727 +#: config.c:2751 #, c-format msgid "opening %s" msgstr "" -#: config.c:2762 builtin/config.c:328 +#: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2787 +#: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2800 config.c:3053 +#: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2811 +#: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2820 config.c:3058 +#: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2905 config.c:3155 +#: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2939 +#: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2941 builtin/remote.c:782 +#: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3031 +#: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3198 +#: config.c:3222 #, c-format msgid "missing value for '%s'" msgstr "" @@ -1883,28 +1942,28 @@ msgstr "" msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1259 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1304 +#: connect.c:1307 msgid "unable to fork" msgstr "" -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "" -#: connected.c:80 +#: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:100 +#: connected.c:117 msgid "failed write to rev-list" msgstr "" -#: connected.c:107 +#: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "" @@ -2126,443 +2185,935 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" +#: diff-no-index.c:238 +msgid "git diff --no-index [] " msgstr "" -#: diff.c:158 +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" + +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:319 +#: diff.c:324 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -#: diff.c:327 +#: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:400 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:460 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:4211 +#: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4553 +#: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4556 +#: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4634 +#: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4800 +#: diff.c:4684 +#, c-format +msgid "invalid --stat value: %s" +msgstr "" + +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5216 +#: parse-options.c:200 +#, c-format +msgid "%s expects a numerical value" +msgstr "" + +#: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4814 +#: diff.c:4806 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" +msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:5900 -msgid "inexact rename detection was skipped due to too many files." +#: diff.c:4830 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:5903 -msgid "only found copies from modified paths due to too many files." +#: diff.c:4844 +#, c-format +msgid "unable to resolve '%s'" msgstr "" -#: diff.c:5906 +#: diff.c:4894 diff.c:4900 #, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." +msgid "%s expects / form" msgstr "" -#: dir.c:538 +#: diff.c:4912 #, c-format -msgid "pathspec '%s' did not match any file(s) known to git" +msgid "%s expects a character, got '%s'" msgstr "" -#: dir.c:927 +#: diff.c:4933 #, c-format -msgid "cannot use %s as an exclude file" +msgid "bad --color-moved argument: %s" msgstr "" -#: dir.c:1842 +#: diff.c:4952 #, c-format -msgid "could not open directory '%s'" +msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: dir.c:2084 -msgid "failed to get kernel name and information" +#: diff.c:4992 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" msgstr "" -#: dir.c:2208 -msgid "untracked cache is disabled on this system or location" +#: diff.c:5028 diff.c:5048 +#, c-format +msgid "invalid argument to %s" msgstr "" -#: dir.c:3009 +#: diff.c:5186 #, c-format -msgid "index file corrupt in repo %s" +msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: dir.c:3054 dir.c:3059 +#: diff.c:5240 #, c-format -msgid "could not create directories for %s" +msgid "bad --word-diff argument: %s" msgstr "" -#: dir.c:3088 -#, c-format -msgid "could not migrate git directory from '%s' to '%s'" +#: diff.c:5263 +msgid "Diff output format options" msgstr "" -#: editor.c:73 -#, c-format -msgid "hint: Waiting for your editor to close the file...%c" +#: diff.c:5265 diff.c:5271 +msgid "generate patch" msgstr "" -#: entry.c:178 -msgid "Filtering content" +#: diff.c:5268 builtin/log.c:167 +msgid "suppress diff output" msgstr "" -#: entry.c:465 -#, c-format -msgid "could not stat file '%s'" +#: diff.c:5273 diff.c:5387 diff.c:5394 +msgid "" msgstr "" -#: environment.c:150 -#, c-format -msgid "bad git namespace path \"%s\"" +#: diff.c:5274 diff.c:5277 +msgid "generate diffs with lines context" msgstr "" -#: environment.c:332 -#, c-format -msgid "could not set GIT_DIR to '%s'" +#: diff.c:5279 +msgid "generate the diff in raw format" msgstr "" -#: exec-cmd.c:361 -#, c-format -msgid "too many args to run %s" +#: diff.c:5282 +msgid "synonym for '-p --raw'" msgstr "" -#: fetch-object.c:17 -msgid "Remote with no URL" +#: diff.c:5286 +msgid "synonym for '-p --stat'" msgstr "" -#: fetch-pack.c:151 -msgid "git fetch-pack: expected shallow list" +#: diff.c:5290 +msgid "machine friendly --stat" msgstr "" -#: fetch-pack.c:154 -msgid "git fetch-pack: expected a flush packet after shallow list" +#: diff.c:5293 +msgid "output only the last line of --stat" msgstr "" -#: fetch-pack.c:165 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +#: diff.c:5295 diff.c:5303 +msgid "..." msgstr "" -#: fetch-pack.c:185 -#, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" +#: diff.c:5296 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: fetch-pack.c:256 -msgid "--stateless-rpc requires multi_ack_detailed" +#: diff.c:5300 +msgid "synonym for --dirstat=cumulative" msgstr "" -#: fetch-pack.c:358 fetch-pack.c:1264 -#, c-format -msgid "invalid shallow line: %s" +#: diff.c:5304 +msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1271 -#, c-format -msgid "invalid unshallow line: %s" +#: diff.c:5308 +msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: fetch-pack.c:366 fetch-pack.c:1273 -#, c-format -msgid "object not found: %s" +#: diff.c:5311 +msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1276 -#, c-format -msgid "error in object: %s" +#: diff.c:5314 +msgid "show only names of changed files" msgstr "" -#: fetch-pack.c:371 fetch-pack.c:1278 -#, c-format -msgid "no shallow found: %s" +#: diff.c:5317 +msgid "show only names and status of changed files" msgstr "" -#: fetch-pack.c:374 fetch-pack.c:1282 -#, c-format -msgid "expected shallow/unshallow, got %s" +#: diff.c:5319 +msgid "[,[,]]" msgstr "" -#: fetch-pack.c:415 -#, c-format -msgid "got %s %d %s" +#: diff.c:5320 +msgid "generate diffstat" msgstr "" -#: fetch-pack.c:432 -#, c-format -msgid "invalid commit %s" +#: diff.c:5322 diff.c:5325 diff.c:5328 +msgid "" msgstr "" -#: fetch-pack.c:463 -msgid "giving up" +#: diff.c:5323 +msgid "generate diffstat with a given width" msgstr "" -#: fetch-pack.c:475 progress.c:229 -msgid "done" +#: diff.c:5326 +msgid "generate diffstat with a given name width" msgstr "" -#: fetch-pack.c:487 -#, c-format -msgid "got %s (%d) %s" +#: diff.c:5329 +msgid "generate diffstat with a given graph width" msgstr "" -#: fetch-pack.c:533 -#, c-format -msgid "Marking %s as complete" +#: diff.c:5331 +msgid "" msgstr "" -#: fetch-pack.c:740 -#, c-format -msgid "already have %s (%s)" +#: diff.c:5332 +msgid "generate diffstat with limited lines" msgstr "" -#: fetch-pack.c:779 -msgid "fetch-pack: unable to fork off sideband demultiplexer" +#: diff.c:5335 +msgid "generate compact summary in diffstat" msgstr "" -#: fetch-pack.c:787 -msgid "protocol error: bad pack header" +#: diff.c:5338 +msgid "output a binary diff that can be applied" msgstr "" -#: fetch-pack.c:855 -#, c-format -msgid "fetch-pack: unable to fork off %s" +#: diff.c:5341 +msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: fetch-pack.c:871 -#, c-format -msgid "%s failed" +#: diff.c:5343 +msgid "show colored diff" msgstr "" -#: fetch-pack.c:873 -msgid "error in sideband demultiplexer" +#: diff.c:5344 +msgid "" msgstr "" -#: fetch-pack.c:902 -msgid "Server does not support shallow clients" +#: diff.c:5345 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" msgstr "" -#: fetch-pack.c:906 -msgid "Server supports multi_ack_detailed" +#: diff.c:5348 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" msgstr "" -#: fetch-pack.c:909 -msgid "Server supports no-done" +#: diff.c:5351 diff.c:5354 diff.c:5357 diff.c:5463 +msgid "" msgstr "" -#: fetch-pack.c:915 -msgid "Server supports multi_ack" +#: diff.c:5352 +msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: fetch-pack.c:919 -msgid "Server supports side-band-64k" +#: diff.c:5355 +msgid "show the given source prefix instead of \"b/\"" msgstr "" -#: fetch-pack.c:923 -msgid "Server supports side-band" +#: diff.c:5358 +msgid "prepend an additional prefix to every line of output" msgstr "" -#: fetch-pack.c:927 -msgid "Server supports allow-tip-sha1-in-want" +#: diff.c:5361 +msgid "do not show any source or destination prefix" msgstr "" -#: fetch-pack.c:931 -msgid "Server supports allow-reachable-sha1-in-want" +#: diff.c:5364 +msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: fetch-pack.c:941 -msgid "Server supports ofs-delta" +#: diff.c:5368 diff.c:5373 diff.c:5378 +msgid "" msgstr "" -#: fetch-pack.c:947 fetch-pack.c:1140 -msgid "Server supports filter" +#: diff.c:5369 +msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: fetch-pack.c:955 -#, c-format -msgid "Server version is %.*s" +#: diff.c:5374 +msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: fetch-pack.c:961 -msgid "Server does not support --shallow-since" +#: diff.c:5379 +msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: fetch-pack.c:965 -msgid "Server does not support --shallow-exclude" +#: diff.c:5382 +msgid "Diff rename options" msgstr "" -#: fetch-pack.c:967 -msgid "Server does not support --deepen" +#: diff.c:5383 +msgid "[/]" msgstr "" -#: fetch-pack.c:984 -msgid "no common commits" +#: diff.c:5384 +msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: fetch-pack.c:996 fetch-pack.c:1419 -msgid "git fetch-pack: fetch failed." +#: diff.c:5388 +msgid "detect renames" msgstr "" -#: fetch-pack.c:1134 -msgid "Server does not support shallow requests" +#: diff.c:5392 +msgid "omit the preimage for deletes" msgstr "" -#: fetch-pack.c:1184 -#, c-format -msgid "error reading section header '%s'" +#: diff.c:5395 +msgid "detect copies" msgstr "" -#: fetch-pack.c:1190 -#, c-format -msgid "expected '%s', received '%s'" +#: diff.c:5399 +msgid "use unmodified files as source to find copies" msgstr "" -#: fetch-pack.c:1229 -#, c-format -msgid "unexpected acknowledgment line: '%s'" +#: diff.c:5401 +msgid "disable rename detection" msgstr "" -#: fetch-pack.c:1234 -#, c-format -msgid "error processing acks: %d" +#: diff.c:5404 +msgid "use empty blobs as rename source" msgstr "" -#: fetch-pack.c:1244 -msgid "expected packfile to be sent after 'ready'" +#: diff.c:5406 +msgid "continue listing the history of a file beyond renames" msgstr "" -#: fetch-pack.c:1246 -msgid "expected no other sections to be sent after no 'ready'" +#: diff.c:5409 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" msgstr "" -#: fetch-pack.c:1287 -#, c-format -msgid "error processing shallow info: %d" +#: diff.c:5411 +msgid "Diff algorithm options" msgstr "" -#: fetch-pack.c:1308 -#, c-format -msgid "expected wanted-ref, got '%s'" +#: diff.c:5413 +msgid "produce the smallest possible diff" msgstr "" -#: fetch-pack.c:1318 -#, c-format -msgid "unexpected wanted-ref: '%s'" +#: diff.c:5416 +msgid "ignore whitespace when comparing lines" msgstr "" -#: fetch-pack.c:1322 -#, c-format -msgid "error processing wanted refs: %d" +#: diff.c:5419 +msgid "ignore changes in amount of whitespace" msgstr "" -#: fetch-pack.c:1646 -msgid "no matching remote head" +#: diff.c:5422 +msgid "ignore changes in whitespace at EOL" msgstr "" -#: fetch-pack.c:1664 builtin/clone.c:671 -msgid "remote did not send all necessary objects" +#: diff.c:5425 +msgid "ignore carrier-return at the end of line" msgstr "" -#: fetch-pack.c:1690 -#, c-format -msgid "no such remote ref %s" +#: diff.c:5428 +msgid "ignore changes whose lines are all blank" msgstr "" -#: fetch-pack.c:1693 -#, c-format -msgid "Server does not allow request for unadvertised object %s" +#: diff.c:5431 +msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: gpg-interface.c:318 -msgid "gpg failed to sign the data" +#: diff.c:5434 +msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: gpg-interface.c:344 -msgid "could not create temporary file" +#: diff.c:5438 +msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: gpg-interface.c:347 -#, c-format -msgid "failed writing detached signature to '%s'" +#: diff.c:5440 +msgid "" msgstr "" -#: graph.c:97 -#, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +#: diff.c:5441 +msgid "choose a diff algorithm" msgstr "" -#: grep.c:2113 -#, c-format -msgid "'%s': unable to read %s" +#: diff.c:5443 +msgid "" msgstr "" -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 -#: builtin/rm.c:135 -#, c-format -msgid "failed to stat '%s'" +#: diff.c:5444 +msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: grep.c:2141 -#, c-format -msgid "'%s': short read" +#: diff.c:5446 diff.c:5455 diff.c:5458 +msgid "" msgstr "" -#: help.c:23 -msgid "start a working area (see also: git help tutorial)" +#: diff.c:5447 +msgid "show word diff, using to delimit changed words" +msgstr "" + +#: diff.c:5449 diff.c:5452 diff.c:5497 +msgid "" +msgstr "" + +#: diff.c:5450 +msgid "use to decide what a word is" +msgstr "" + +#: diff.c:5453 +msgid "equivalent to --word-diff=color --word-diff-regex=" +msgstr "" + +#: diff.c:5456 +msgid "move lines of code are colored differently" +msgstr "" + +#: diff.c:5459 +msgid "how white spaces are ignored in --color-moved" +msgstr "" + +#: diff.c:5462 +msgid "Diff other options" +msgstr "" + +#: diff.c:5464 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" + +#: diff.c:5468 +msgid "treat all files as text" +msgstr "" + +#: diff.c:5470 +msgid "swap two inputs, reverse the diff" +msgstr "" + +#: diff.c:5472 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "" + +#: diff.c:5474 +msgid "disable all output of the program" +msgstr "" + +#: diff.c:5476 +msgid "allow an external diff helper to be executed" +msgstr "" + +#: diff.c:5478 +msgid "run external text conversion filters when comparing binary files" +msgstr "" + +#: diff.c:5480 +msgid "" +msgstr "" + +#: diff.c:5481 +msgid "ignore changes to submodules in the diff generation" +msgstr "" + +#: diff.c:5484 +msgid "" +msgstr "" + +#: diff.c:5485 +msgid "specify how differences in submodules are shown" +msgstr "" + +#: diff.c:5489 +msgid "hide 'git add -N' entries from the index" +msgstr "" + +#: diff.c:5492 +msgid "treat 'git add -N' entries as real in the index" +msgstr "" + +#: diff.c:5494 +msgid "" +msgstr "" + +#: diff.c:5495 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" + +#: diff.c:5498 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" + +#: diff.c:5501 +msgid "show all changes in the changeset with -S or -G" +msgstr "" + +#: diff.c:5504 +msgid "treat in -S as extended POSIX regular expression" +msgstr "" + +#: diff.c:5507 +msgid "control the order in which files appear in the output" +msgstr "" + +#: diff.c:5508 +msgid "" +msgstr "" + +#: diff.c:5509 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" + +#: diff.c:5511 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "" + +#: diff.c:5512 +msgid "select files by diff type" +msgstr "" + +#: diff.c:5514 +msgid "" +msgstr "" + +#: diff.c:5515 +msgid "Output to a specific file" +msgstr "" + +#: diff.c:6148 +msgid "inexact rename detection was skipped due to too many files." +msgstr "" + +#: diff.c:6151 +msgid "only found copies from modified paths due to too many files." +msgstr "" + +#: diff.c:6154 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" + +#: dir.c:537 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "" + +#: dir.c:926 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "" + +#: dir.c:1843 +#, c-format +msgid "could not open directory '%s'" +msgstr "" + +#: dir.c:2085 +msgid "failed to get kernel name and information" +msgstr "" + +#: dir.c:2209 +msgid "untracked cache is disabled on this system or location" +msgstr "" + +#: dir.c:3013 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "" + +#: dir.c:3058 dir.c:3063 +#, c-format +msgid "could not create directories for %s" +msgstr "" + +#: dir.c:3092 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "" + +#: editor.c:73 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" + +#: entry.c:178 +msgid "Filtering content" +msgstr "" + +#: entry.c:476 +#, c-format +msgid "could not stat file '%s'" +msgstr "" + +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "" + +#: exec-cmd.c:363 +#, c-format +msgid "too many args to run %s" +msgstr "" + +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "" + +#: fetch-pack.c:151 +msgid "git fetch-pack: expected shallow list" +msgstr "" + +#: fetch-pack.c:154 +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "" + +#: fetch-pack.c:165 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "" + +#: fetch-pack.c:185 +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "" + +#: fetch-pack.c:196 +msgid "unable to write to remote" +msgstr "" + +#: fetch-pack.c:258 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "" + +#: fetch-pack.c:360 fetch-pack.c:1271 +#, c-format +msgid "invalid shallow line: %s" +msgstr "" + +#: fetch-pack.c:366 fetch-pack.c:1277 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "" + +#: fetch-pack.c:368 fetch-pack.c:1279 +#, c-format +msgid "object not found: %s" +msgstr "" + +#: fetch-pack.c:371 fetch-pack.c:1282 +#, c-format +msgid "error in object: %s" +msgstr "" + +#: fetch-pack.c:373 fetch-pack.c:1284 +#, c-format +msgid "no shallow found: %s" +msgstr "" + +#: fetch-pack.c:376 fetch-pack.c:1288 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "" + +#: fetch-pack.c:417 +#, c-format +msgid "got %s %d %s" +msgstr "" + +#: fetch-pack.c:434 +#, c-format +msgid "invalid commit %s" +msgstr "" + +#: fetch-pack.c:465 +msgid "giving up" +msgstr "" + +#: fetch-pack.c:477 progress.c:284 +msgid "done" +msgstr "" + +#: fetch-pack.c:489 +#, c-format +msgid "got %s (%d) %s" +msgstr "" + +#: fetch-pack.c:535 +#, c-format +msgid "Marking %s as complete" +msgstr "" + +#: fetch-pack.c:744 +#, c-format +msgid "already have %s (%s)" +msgstr "" + +#: fetch-pack.c:783 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "" + +#: fetch-pack.c:791 +msgid "protocol error: bad pack header" +msgstr "" + +#: fetch-pack.c:859 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "" + +#: fetch-pack.c:875 +#, c-format +msgid "%s failed" +msgstr "" + +#: fetch-pack.c:877 +msgid "error in sideband demultiplexer" +msgstr "" + +#: fetch-pack.c:906 +msgid "Server does not support shallow clients" +msgstr "" + +#: fetch-pack.c:910 +msgid "Server supports multi_ack_detailed" +msgstr "" + +#: fetch-pack.c:913 +msgid "Server supports no-done" +msgstr "" + +#: fetch-pack.c:919 +msgid "Server supports multi_ack" +msgstr "" + +#: fetch-pack.c:923 +msgid "Server supports side-band-64k" +msgstr "" + +#: fetch-pack.c:927 +msgid "Server supports side-band" +msgstr "" + +#: fetch-pack.c:931 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "" + +#: fetch-pack.c:935 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "" + +#: fetch-pack.c:945 +msgid "Server supports ofs-delta" +msgstr "" + +#: fetch-pack.c:951 fetch-pack.c:1144 +msgid "Server supports filter" +msgstr "" + +#: fetch-pack.c:959 +#, c-format +msgid "Server version is %.*s" +msgstr "" + +#: fetch-pack.c:965 +msgid "Server does not support --shallow-since" +msgstr "" + +#: fetch-pack.c:969 +msgid "Server does not support --shallow-exclude" +msgstr "" + +#: fetch-pack.c:971 +msgid "Server does not support --deepen" +msgstr "" + +#: fetch-pack.c:988 +msgid "no common commits" +msgstr "" + +#: fetch-pack.c:1000 fetch-pack.c:1449 +msgid "git fetch-pack: fetch failed." +msgstr "" + +#: fetch-pack.c:1138 +msgid "Server does not support shallow requests" +msgstr "" + +#: fetch-pack.c:1171 +msgid "unable to write request to remote" +msgstr "" + +#: fetch-pack.c:1189 +#, c-format +msgid "error reading section header '%s'" +msgstr "" + +#: fetch-pack.c:1195 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "" + +#: fetch-pack.c:1234 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#: fetch-pack.c:1239 +#, c-format +msgid "error processing acks: %d" +msgstr "" + +#: fetch-pack.c:1249 +msgid "expected packfile to be sent after 'ready'" +msgstr "" + +#: fetch-pack.c:1251 +msgid "expected no other sections to be sent after no 'ready'" +msgstr "" + +#: fetch-pack.c:1293 +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#: fetch-pack.c:1340 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "" + +#: fetch-pack.c:1345 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "" + +#: fetch-pack.c:1350 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +#: fetch-pack.c:1676 +msgid "no matching remote head" +msgstr "" + +#: fetch-pack.c:1699 builtin/clone.c:676 +msgid "remote did not send all necessary objects" +msgstr "" + +#: fetch-pack.c:1726 +#, c-format +msgid "no such remote ref %s" +msgstr "" + +#: fetch-pack.c:1729 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "" + +#: gpg-interface.c:318 +msgid "gpg failed to sign the data" +msgstr "" + +#: gpg-interface.c:344 +msgid "could not create temporary file" +msgstr "" + +#: gpg-interface.c:347 +#, c-format +msgid "failed writing detached signature to '%s'" +msgstr "" + +#: graph.c:97 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "" + +#: grep.c:2113 +#, c-format +msgid "'%s': unable to read %s" +msgstr "" + +#: grep.c:2130 setup.c:164 builtin/clone.c:414 builtin/diff.c:82 +#: builtin/rm.c:135 +#, c-format +msgid "failed to stat '%s'" +msgstr "" + +#: grep.c:2141 +#, c-format +msgid "'%s': short read" +msgstr "" + +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" msgstr "" #: help.c:24 @@ -2626,59 +3177,59 @@ msgstr "" msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:363 git.c:90 +#: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "" -#: help.c:410 +#: help.c:403 msgid "The common Git guides are:" msgstr "" -#: help.c:519 +#: help.c:512 msgid "See 'git help ' to read about a specific subcommand" msgstr "" -#: help.c:524 +#: help.c:517 msgid "External commands" msgstr "" -#: help.c:539 +#: help.c:532 msgid "Command aliases" msgstr "" -#: help.c:603 +#: help.c:596 #, 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:662 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:684 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:689 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:694 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:702 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:706 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2688,16 +3239,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:721 +#: help.c:714 msgid "git version []" msgstr "" -#: help.c:789 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:793 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -2707,7 +3258,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2722,37 +3273,52 @@ msgid "" "\n" msgstr "" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "" -#: ident.c:390 +#: ident.c:407 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "" + +#: ident.c:415 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "" + +#: ident.c:421 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "" + +#: ident.c:436 builtin/commit.c:608 #, c-format -msgid "unable to auto-detect name (got '%s')" +msgid "invalid date format: %s" msgstr "" -#: ident.c:398 +#: list-objects.c:129 #, c-format -msgid "empty ident name (for <%s>) not allowed" +msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" -#: ident.c:404 +#: list-objects.c:142 #, c-format -msgid "name consists only of disallowed characters: %s" +msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: ident.c:419 builtin/commit.c:608 +#: list-objects.c:378 #, c-format -msgid "invalid date format: %s" +msgid "unable to load root tree for commit %s" msgstr "" #: list-objects-filter-options.c:36 @@ -2763,7 +3329,7 @@ msgstr "" msgid "expected 'tree:'" msgstr "" -#: list-objects-filter-options.c:152 +#: list-objects-filter-options.c:156 msgid "cannot change partial clone promisor remote" msgstr "" @@ -2788,113 +3354,114 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771 +#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 +#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:776 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:332 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:355 +#: merge-recursive.c:345 #, c-format ms