From 12705546659f4c6ee31fd314b70c167cc822f965 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Tue, 20 Nov 2018 10:06:16 +0800 Subject: [PATCH] l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed) Generate po/git.pot from v2.20.0-rc0-23-gbb75be6cb9 for git v2.20.0 l10n round 1. Signed-off-by: Jiang Xin --- po/git.pot | 7205 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 4134 insertions(+), 3071 deletions(-) diff --git a/po/git.pot b/po/git.pot index e76b02aee4..b1179f6982 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: 2018-09-04 08:50+0800\n" +"POT-Creation-Date: 2018-11-20 10:05+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:97 +#: advice.c:99 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:150 +#: advice.c:152 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:152 +#: advice.c:154 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:154 +#: advice.c:156 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:156 +#: advice.c:158 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:158 +#: advice.c:160 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:160 +#: advice.c:162 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:168 +#: advice.c:170 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:176 +#: advice.c:178 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:181 builtin/merge.c:1286 +#: advice.c:183 builtin/merge.c:1289 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:183 +#: advice.c:185 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:184 +#: advice.c:186 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:190 +#: advice.c:192 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -156,22 +156,22 @@ msgstr "" msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1306 +#: apply.c:1307 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1478 +#: apply.c:1479 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1547 +#: apply.c:1548 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1567 +#: apply.c:1568 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -182,526 +182,527 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1580 +#: apply.c:1581 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1768 +#: apply.c:1769 msgid "new file depends on old contents" msgstr "" -#: apply.c:1770 +#: apply.c:1771 msgid "deleted file still has contents" msgstr "" -#: apply.c:1804 +#: apply.c:1805 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1841 +#: apply.c:1842 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1843 +#: apply.c:1844 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1846 +#: apply.c:1847 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1993 +#: apply.c:1994 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2030 +#: apply.c:2031 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2190 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2276 +#: apply.c:2279 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2280 +#: apply.c:2283 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2939 +#: apply.c:2942 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3060 +#: apply.c:3063 #, 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:3072 +#: apply.c:3075 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3078 +#: apply.c:3081 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3100 +#: apply.c:3103 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3108 +#: apply.c:3111 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3154 +#: apply.c:3158 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3164 +#: apply.c:3168 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3172 +#: apply.c:3176 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3190 +#: apply.c:3194 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3203 +#: apply.c:3207 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3209 +#: apply.c:3213 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3230 +#: apply.c:3234 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3352 +#: apply.c:3356 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3412 +#: apply.c:3416 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3441 apply.c:3681 +#: apply.c:3445 apply.c:3688 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3524 apply.c:3696 +#: apply.c:3531 apply.c:3703 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3533 apply.c:3704 +#: apply.c:3540 apply.c:3711 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3568 +#: apply.c:3575 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3571 +#: apply.c:3578 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3587 apply.c:3591 +#: apply.c:3594 apply.c:3598 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3603 +#: apply.c:3610 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3617 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3622 +#: apply.c:3629 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3648 +#: apply.c:3655 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3721 +#: apply.c:3728 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3723 +#: apply.c:3730 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3874 apply.c:3876 +#: apply.c:3881 apply.c:3883 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3932 +#: apply.c:3939 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3935 +#: apply.c:3942 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3955 +#: apply.c:3962 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3960 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3980 +#: apply.c:3987 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3984 +#: apply.c:3991 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3999 +#: apply.c:4006 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4091 +#: apply.c:4098 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4098 +#: apply.c:4105 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4101 +#: apply.c:4108 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4110 +#: apply.c:4117 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4120 +#: apply.c:4127 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4258 +#: apply.c:4265 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4292 +#: apply.c:4299 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4298 +#: apply.c:4305 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4306 +#: apply.c:4313 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4312 apply.c:4457 +#: apply.c:4319 apply.c:4464 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4355 +#: apply.c:4362 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4359 +#: apply.c:4366 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4429 +#: apply.c:4436 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4527 +#: apply.c:4534 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4535 +#: apply.c:4542 msgid "internal error" msgstr "" -#: apply.c:4538 +#: apply.c:4545 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4549 +#: apply.c:4556 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 +#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4571 +#: apply.c:4578 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4575 +#: apply.c:4582 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4685 +#: apply.c:4692 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4693 +#: apply.c:4700 msgid "unrecognized input" msgstr "" -#: apply.c:4712 +#: apply.c:4719 msgid "unable to read index file" msgstr "" -#: apply.c:4849 +#: apply.c:4874 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4876 +#: apply.c:4901 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4882 apply.c:4897 +#: apply.c:4907 apply.c:4922 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4890 +#: apply.c:4915 #, 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:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "" -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 -#: builtin/pull.c:198 builtin/submodule--helper.c:406 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 -#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262 +#: builtin/pull.c:199 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4934 +#: apply.c:4959 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4937 +#: apply.c:4962 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4939 builtin/am.c:2263 +#: apply.c:4964 builtin/am.c:2218 msgid "num" msgstr "" -#: apply.c:4940 +#: apply.c:4965 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4943 +#: apply.c:4968 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4945 +#: apply.c:4970 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4949 +#: apply.c:4974 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4951 +#: apply.c:4976 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4953 +#: apply.c:4978 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4955 +#: apply.c:4980 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4957 +#: apply.c:4982 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4959 +#: apply.c:4984 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4961 +#: apply.c:4986 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4964 +#: apply.c:4989 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4966 +#: apply.c:4991 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4968 +#: apply.c:4993 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4973 +#: apply.c:4998 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3202 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 +#: builtin/pack-objects.c:3310 builtin/rebase.c:839 msgid "action" msgstr "" -#: apply.c:4975 +#: apply.c:5000 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4978 apply.c:4981 +#: apply.c:5003 apply.c:5006 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4984 +#: apply.c:5009 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4986 +#: apply.c:5011 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4988 +#: apply.c:5013 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:4990 +#: apply.c:5015 msgid "allow overlapping hunks" msgstr "" -#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 -#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127 +#: builtin/rebase--interactive.c:157 msgid "be verbose" msgstr "" -#: apply.c:4993 +#: apply.c:5018 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:4996 +#: apply.c:5021 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:4998 builtin/am.c:2251 +#: apply.c:5023 builtin/am.c:2206 msgid "root" msgstr "" -#: apply.c:4999 +#: apply.c:5024 msgid "prepend to all filenames" msgstr "" @@ -722,114 +723,114 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:446 +#: archive.c:453 msgid "fmt" msgstr "" -#: archive.c:446 +#: archive.c:453 msgid "archive format" msgstr "" -#: archive.c:447 builtin/log.c:1473 +#: archive.c:454 builtin/log.c:1536 msgid "prefix" msgstr "" -#: archive.c:448 +#: archive.c:455 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 -#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 -#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 -#: parse-options.h:165 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122 +#: parse-options.h:162 msgid "file" msgstr "" -#: archive.c:450 builtin/archive.c:89 +#: archive.c:457 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:452 +#: archive.c:459 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:453 +#: archive.c:460 msgid "report archived files on stderr" msgstr "" -#: archive.c:454 +#: archive.c:461 msgid "store only" msgstr "" -#: archive.c:455 +#: archive.c:462 msgid "compress faster" msgstr "" -#: archive.c:463 +#: archive.c:470 msgid "compress better" msgstr "" -#: archive.c:466 +#: archive.c:473 msgid "list supported archive formats" msgstr "" -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855 msgid "repo" msgstr "" -#: archive.c:469 builtin/archive.c:91 +#: archive.c:476 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 -#: builtin/notes.c:491 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:496 msgid "command" msgstr "" -#: archive.c:471 builtin/archive.c:93 +#: archive.c:478 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:478 +#: archive.c:485 msgid "Unexpected option --remote" msgstr "" -#: archive.c:480 +#: archive.c:487 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:482 +#: archive.c:489 msgid "Unexpected option --output" msgstr "" -#: archive.c:504 +#: archive.c:511 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:511 +#: archive.c:518 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: archive-tar.c:125 archive-zip.c:344 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "" -#: archive-tar.c:260 archive-zip.c:361 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive-tar.c:287 archive-zip.c:352 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "" @@ -848,74 +849,74 @@ msgstr "" msgid "'%s' filter reported error" msgstr "" -#: archive-zip.c:313 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "" -#: archive-zip.c:317 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227 #, c-format msgid "deflate error (%d)" msgstr "" -#: archive-zip.c:605 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %" msgstr "" -#: attr.c:218 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:415 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:467 +#: bisect.c:468 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:675 +#: bisect.c:676 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:729 +#: bisect.c:730 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:753 +#: bisect.c:754 #, 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:758 +#: bisect.c:759 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:763 +#: bisect.c:764 #, 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:771 +#: bisect.c:772 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -923,7 +924,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:784 +#: bisect.c:785 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -931,43 +932,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:817 +#: bisect.c:818 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:857 +#: bisect.c:858 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:927 builtin/merge.c:137 +#: bisect.c:928 builtin/merge.c:138 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:957 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:976 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:984 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1003 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -977,44 +978,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1009 +#: 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:1784 +#: blame.c:1787 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:1798 +#: blame.c:1801 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:1819 +#: blame.c:1822 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406 +#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:1846 +#: blame.c:1849 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:1857 +#: blame.c:1860 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:1868 +#: blame.c:1871 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1153,7 +1154,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722 +#: builtin/commit.c:774 #, c-format msgid "could not open '%s'" msgstr "" @@ -1180,38 +1182,42 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:260 +#: bundle.c:267 +msgid "unable to dup bundle descriptor" +msgstr "" + +#: bundle.c:274 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:271 +#: bundle.c:285 msgid "pack-objects died" msgstr "" -#: bundle.c:313 +#: bundle.c:327 msgid "rev-list died" msgstr "" -#: bundle.c:362 +#: bundle.c:376 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:461 +#: bundle.c:464 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:473 +#: bundle.c:474 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:501 +#: bundle.c:498 msgid "index-pack died" msgstr "" @@ -1220,19 +1226,19 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376 #: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:191 +#: commit.c:193 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1244,81 +1250,117 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1629 +#: commit.c:1115 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: commit.c:1118 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#: commit.c:1121 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: commit.c:1124 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: commit.c:1378 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:83 +#: commit-graph.c:108 #, c-format msgid "graph file %s is too small" msgstr "" -#: commit-graph.c:90 +#: commit-graph.c:115 #, c-format msgid "graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:97 +#: commit-graph.c:122 #, c-format msgid "graph version %X does not match version %X" msgstr "" -#: commit-graph.c:104 +#: commit-graph.c:129 #, c-format msgid "hash version %X does not match version %X" msgstr "" -#: commit-graph.c:128 +#: commit-graph.c:153 #, c-format msgid "improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:164 +#: commit-graph.c:189 #, c-format msgid "chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:261 +#: commit-graph.c:308 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:565 builtin/pack-objects.c:2568 +#: commit-graph.c:617 builtin/pack-objects.c:2652 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:730 +#: commit-graph.c:651 +msgid "Annotating commits in commit graph" +msgstr "" + +#: commit-graph.c:691 +msgid "Computing commit graph generation numbers" +msgstr "" + +#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852 +msgid "Finding commits for commit graph" +msgstr "" + +#: commit-graph.c:812 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:732 +#: commit-graph.c:814 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:773 +#: commit-graph.c:868 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:800 +#: commit-graph.c:895 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:806 +#: commit-graph.c:902 midx.c:769 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:904 +#: commit-graph.c:1002 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" +#: commit-graph.c:1046 +msgid "Verifying commits in commit graph" +msgstr "" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "" @@ -1356,7 +1398,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:378 sequencer.c:2206 +#: config.c:378 sequencer.c:2296 #, c-format msgid "invalid key: %s" msgstr "" @@ -1478,149 +1520,149 @@ msgstr "" msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1403 +#: config.c:1395 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1429 +#: config.c:1421 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1430 +#: config.c:1422 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1489 builtin/pack-objects.c:3279 +#: config.c:1481 builtin/pack-objects.c:3389 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1610 +#: config.c:1602 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1613 +#: config.c:1605 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1630 +#: config.c:1622 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1660 +#: config.c:1652 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1700 +#: config.c:1705 msgid "unable to parse command-line config" msgstr "" -#: config.c:2032 +#: config.c:2037 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2202 +#: config.c:2207 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2245 +#: config.c:2250 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2271 +#: config.c:2276 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2296 +#: config.c:2319 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2298 +#: config.c:2321 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2379 +#: config.c:2402 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2411 +#: config.c:2434 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2440 +#: config.c:2463 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2691 config.c:3015 +#: config.c:2714 config.c:3038 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2702 +#: config.c:2725 #, c-format msgid "opening %s" msgstr "" -#: config.c:2737 builtin/config.c:324 +#: config.c:2760 builtin/config.c:327 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2762 +#: config.c:2785 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2775 config.c:3028 +#: config.c:2798 config.c:3051 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2786 +#: config.c:2809 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2795 config.c:3033 +#: config.c:2818 config.c:3056 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2880 config.c:3130 +#: config.c:2903 config.c:3153 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2914 +#: config.c:2937 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2916 builtin/remote.c:781 +#: config.c:2939 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3006 +#: config.c:3029 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3173 +#: config.c:3196 #, c-format msgid "missing value for '%s'" msgstr "" @@ -1669,7 +1711,7 @@ msgstr "" msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" @@ -1781,7 +1823,7 @@ msgstr "" msgid "unable to fork" msgstr "" -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 +#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147 msgid "Checking connectivity" msgstr "" @@ -1904,12 +1946,12 @@ msgstr "" msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1402 convert.c:1436 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1480 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -1982,12 +2024,36 @@ msgid_plural "% years ago" msgstr[0] "" msgstr[1] "" +#: delta-islands.c:268 +msgid "Propagating island marks" +msgstr "" + +#: delta-islands.c:286 +#, c-format +msgid "bad tree object %s" +msgstr "" + +#: delta-islands.c:330 +#, c-format +msgid "failed to load island regex for '%s': %s" +msgstr "" + +#: delta-islands.c:386 +#, c-format +msgid "island regex from config has too many capture groups (max=%d)" +msgstr "" + +#: delta-islands.c:462 +#, c-format +msgid "Marked %d islands, done.\n" +msgstr "" + #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:536 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "" @@ -2035,88 +2101,88 @@ msgid "" "%s" msgstr "" -#: diff.c:4096 +#: diff.c:4140 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4427 +#: diff.c:4482 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4430 +#: diff.c:4485 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4508 +#: diff.c:4563 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4674 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4688 +#: diff.c:4743 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5766 +#: diff.c:5823 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:5769 +#: diff.c:5826 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:5772 +#: diff.c:5829 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:569 +#: dir.c:576 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:958 +#: dir.c:965 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:1873 +#: dir.c:1880 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2115 +#: dir.c:2122 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2239 +#: dir.c:2246 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3037 +#: dir.c:3047 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3082 dir.c:3087 +#: dir.c:3092 dir.c:3097 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3116 +#: dir.c:3126 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:61 +#: editor.c:73 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -2125,7 +2191,7 @@ msgstr "" msgid "Filtering content" msgstr "" -#: entry.c:437 +#: entry.c:465 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -2149,77 +2215,77 @@ msgstr "" msgid "Remote with no URL" msgstr "" -#: fetch-pack.c:152 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:164 +#: fetch-pack.c:163 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:184 +#: fetch-pack.c:183 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:254 +#: fetch-pack.c:253 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:342 fetch-pack.c:1257 +#: fetch-pack.c:347 fetch-pack.c:1277 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:348 fetch-pack.c:1263 +#: fetch-pack.c:353 fetch-pack.c:1283 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:350 fetch-pack.c:1265 +#: fetch-pack.c:355 fetch-pack.c:1285 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:353 fetch-pack.c:1268 +#: fetch-pack.c:358 fetch-pack.c:1288 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:355 fetch-pack.c:1270 +#: fetch-pack.c:360 fetch-pack.c:1290 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:358 fetch-pack.c:1273 +#: fetch-pack.c:363 fetch-pack.c:1293 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:399 +#: fetch-pack.c:404 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:416 +#: fetch-pack.c:421 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:447 +#: fetch-pack.c:452 msgid "giving up" msgstr "" -#: fetch-pack.c:459 progress.c:229 +#: fetch-pack.c:464 progress.c:229 msgid "done" msgstr "" -#: fetch-pack.c:471 +#: fetch-pack.c:476 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:517 +#: fetch-pack.c:522 #, c-format msgid "Marking %s as complete" msgstr "" @@ -2287,7 +2353,7 @@ msgstr "" msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:971 fetch-pack.c:1150 +#: fetch-pack.c:971 fetch-pack.c:1158 msgid "Server supports filter" msgstr "" @@ -2308,85 +2374,93 @@ msgstr "" msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1004 +#: fetch-pack.c:1008 msgid "no common commits" msgstr "" -#: fetch-pack.c:1016 fetch-pack.c:1393 +#: fetch-pack.c:1020 fetch-pack.c:1418 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1145 +#: fetch-pack.c:1153 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1191 +#: fetch-pack.c:1199 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1197 +#: fetch-pack.c:1205 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1236 +#: fetch-pack.c:1244 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1241 +#: fetch-pack.c:1249 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1278 +#: fetch-pack.c:1259 +msgid "expected packfile to be sent after 'ready'" +msgstr "" + +#: fetch-pack.c:1261 +msgid "expected no other sections to be sent after no 'ready'" +msgstr "" + +#: fetch-pack.c:1298 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1294 +#: fetch-pack.c:1314 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1304 +#: fetch-pack.c:1324 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1308 +#: fetch-pack.c:1328 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1603 +#: fetch-pack.c:1642 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1621 builtin/clone.c:664 +#: fetch-pack.c:1660 builtin/clone.c:664 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1647 +#: fetch-pack.c:1686 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1650 +#: fetch-pack.c:1689 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:253 +#: gpg-interface.c:318 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:279 +#: gpg-interface.c:344 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:282 +#: gpg-interface.c:347 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" @@ -2396,18 +2470,18 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2115 +#: grep.c:2113 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2143 +#: grep.c:2141 #, c-format msgid "'%s': short read" msgstr "" @@ -2464,60 +2538,72 @@ msgstr "" msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:293 +#: help.c:296 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:300 +#: help.c:303 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:309 +#: help.c:312 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:358 git.c:90 +#: help.c:361 git.c:90 #, c-format msgid "unsupported command listing type '%s'" msgstr "" -#: help.c:405 +#: help.c:408 msgid "The common Git guides are:" msgstr "" -#: help.c:552 +#: help.c:517 +msgid "See 'git help ' to read about a specific subcommand" +msgstr "" + +#: help.c:522 +msgid "External commands" +msgstr "" + +#: help.c:530 +msgid "Command aliases" +msgstr "" + +#: help.c:594 #, 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:611 +#: help.c:653 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:633 +#: help.c:675 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:638 +#: help.c:680 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:643 +#: help.c:685 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:651 +#: help.c:693 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:655 +#: help.c:697 msgid "" "\n" "The most similar command is" @@ -2527,16 +2613,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:670 +#: help.c:712 msgid "git version []" msgstr "" -#: help.c:738 +#: help.c:780 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:742 +#: help.c:784 msgid "" "\n" "Did you mean this?" @@ -2546,7 +2632,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ident.c:342 +#: ident.c:345 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2561,44 +2647,48 @@ msgid "" "\n" msgstr "" -#: ident.c:366 +#: ident.c:369 msgid "no email was given and auto-detection is disabled" msgstr "" -#: ident.c:371 +#: ident.c:374 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -#: ident.c:381 +#: ident.c:384 msgid "no name was given and auto-detection is disabled" msgstr "" -#: ident.c:387 +#: ident.c:390 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "" -#: ident.c:395 +#: ident.c:398 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" -#: ident.c:401 +#: ident.c:404 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:416 builtin/commit.c:600 +#: ident.c:419 builtin/commit.c:606 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:35 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:126 +#: list-objects-filter-options.c:58 +msgid "only 'tree:0' is supported" +msgstr "" + +#: list-objects-filter-options.c:137 msgid "cannot change partial clone promisor remote" msgstr "" @@ -2619,117 +2709,117 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:40 +#: merge.c:41 msgid "failed to read the cache" msgstr "" -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 -#: builtin/checkout.c:608 builtin/clone.c:763 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:303 +#: merge-recursive.c:323 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:325 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:333 +#: merge-recursive.c:353 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:415 +#: merge-recursive.c:435 msgid "error building trees" msgstr "" -#: merge-recursive.c:886 +#: merge-recursive.c:906 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:897 +#: merge-recursive.c:917 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:911 merge-recursive.c:930 +#: merge-recursive.c:931 merge-recursive.c:950 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:920 +#: merge-recursive.c:940 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:962 builtin/cat-file.c:39 +#: merge-recursive.c:982 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:964 +#: merge-recursive.c:984 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:988 +#: merge-recursive.c:1008 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:999 +#: merge-recursive.c:1019 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:1004 +#: merge-recursive.c:1024 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1191 +#: merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1198 +#: merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1205 +#: merge-recursive.c:1226 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1234 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1237 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1250 +#: merge-recursive.c:1271 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1275 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1276 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1258 +#: merge-recursive.c:1279 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -2740,109 +2830,109 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1267 +#: merge-recursive.c:1288 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1326 +#: merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1331 +#: merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1363 +#: merge-recursive.c:1395 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1434 +#: merge-recursive.c:1416 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1501 +#: merge-recursive.c:1483 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1506 +#: merge-recursive.c:1488 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1513 +#: merge-recursive.c:1495 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1518 +#: merge-recursive.c:1500 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1552 +#: merge-recursive.c:1534 msgid "rename" msgstr "" -#: merge-recursive.c:1552 +#: merge-recursive.c:1534 msgid "renamed" msgstr "" -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 -#: merge-recursive.c:3129 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369 +#: merge-recursive.c:3124 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1620 +#: merge-recursive.c:1602 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1625 +#: merge-recursive.c:1607 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1656 +#: merge-recursive.c:1638 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1720 +#: merge-recursive.c:1699 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1759 +#: merge-recursive.c:1734 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1771 +#: merge-recursive.c:1746 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1977 +#: merge-recursive.c:1952 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -2850,153 +2940,280 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2009 +#: merge-recursive.c:1984 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2019 +#: merge-recursive.c:1994 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2111 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2356 +#: merge-recursive.c:2331 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2762 +#: merge-recursive.c:2737 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:2777 +#: merge-recursive.c:2763 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:2784 merge-recursive.c:3132 +#: merge-recursive.c:2770 merge-recursive.c:3127 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:2941 +#: merge-recursive.c:2934 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2944 +#: merge-recursive.c:2937 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3013 +#: merge-recursive.c:3006 msgid "modify" msgstr "" -#: merge-recursive.c:3013 +#: merge-recursive.c:3006 msgid "modified" msgstr "" -#: merge-recursive.c:3024 +#: merge-recursive.c:3017 msgid "content" msgstr "" -#: merge-recursive.c:3031 +#: merge-recursive.c:3024 msgid "add/add" msgstr "" -#: merge-recursive.c:3076 +#: merge-recursive.c:3071 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3098 git-submodule.sh:865 +#: merge-recursive.c:3093 git-submodule.sh:858 msgid "submodule" msgstr "" -#: merge-recursive.c:3099 +#: merge-recursive.c:3094 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3221 +#: merge-recursive.c:3216 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3247 +#: merge-recursive.c:3242 msgid "file/directory" msgstr "" -#: merge-recursive.c:3253 +#: merge-recursive.c:3248 msgid "directory/file" msgstr "" -#: merge-recursive.c:3260 +#: merge-recursive.c:3255 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3269 +#: merge-recursive.c:3264 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3303 +#: merge-recursive.c:3300 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-recursive.c:3314 +#: merge-recursive.c:3311 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3323 +#: merge-recursive.c:3320 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3422 +#: merge-recursive.c:3419 msgid "Merging:" msgstr "" -#: merge-recursive.c:3435 +#: merge-recursive.c:3432 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3474 +#: merge-recursive.c:3471 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3540 +#: merge-recursive.c:3537 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849 msgid "Unable to write index." msgstr "" -#: notes-merge.c:274 +#: midx.c:65 +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "" + +#: midx.c:81 +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "" + +#: midx.c:86 +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "" + +#: midx.c:91 +#, c-format +msgid "hash version %u does not match" +msgstr "" + +#: midx.c:105 +msgid "invalid chunk offset (too large)" +msgstr "" + +#: midx.c:129 +msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgstr "" + +#: midx.c:142 +msgid "multi-pack-index missing required pack-name chunk" +msgstr "" + +#: midx.c:144 +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "" + +#: midx.c:146 +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "" + +#: midx.c:148 +msgid "multi-pack-index missing required object offsets chunk" +msgstr "" + +#: midx.c:162 +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "" + +#: midx.c:205 +#, c-format +msgid "bad pack-int-id: %u (%u total packs" +msgstr "" + +#: midx.c:246 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "" + +#: midx.c:271 +msgid "error preparing packfile from multi-pack-index" +msgstr "" + +#: midx.c:407 +#, c-format +msgid "failed to add packfile '%s'" +msgstr "" + +#: midx.c:413 +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "" + +#: midx.c:507 +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "" + +#: midx.c:943 +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "" + +#: midx.c:981 +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "" + +#: midx.c:992 +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "" + +#: midx.c:996 +msgid "Verifying object offsets" +msgstr "" + +#: midx.c:1004 +#, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "" + +#: midx.c:1010 +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "" + +#: midx.c:1019 +#, c-format +msgid "incorrect object offset for oid[%d] = %s: % != %" +msgstr "" + +#: name-hash.c:532 +#, c-format +msgid "unable to create lazy_dir thread: %s" +msgstr "" + +#: name-hash.c:554 +#, c-format +msgid "unable to create lazy_name thread: %s" +msgstr "" + +#: name-hash.c:560 +#, c-format +msgid "unable to join lazy_name thread: %s" +msgstr "" + +#: notes-merge.c:275 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -3004,7 +3221,7 @@ msgid "" "commit/abort the previous merge before you start a new notes merge." msgstr "" -#: notes-merge.c:281 +#: notes-merge.c:282 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" @@ -3057,16 +3274,16 @@ msgstr "" msgid "sha1 mismatch %s" msgstr "" -#: packfile.c:563 +#: packfile.c:607 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1745 +#: packfile.c:1864 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1749 +#: packfile.c:1868 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -3097,17 +3314,17 @@ msgstr "" msgid "-NUM" msgstr "" -#: parse-options-cb.c:44 +#: parse-options-cb.c:37 #, c-format msgid "malformed expiration date '%s'" msgstr "" -#: parse-options-cb.c:112 +#: parse-options-cb.c:109 #, c-format msgid "malformed object name '%s'" msgstr "" -#: path.c:892 +#: path.c:894 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -3221,175 +3438,281 @@ msgstr "" msgid "protocol error: bad line length %d" msgstr "" +#: preload-index.c:118 +msgid "Refreshing index" +msgstr "" + +#: preload-index.c:137 +#, c-format +msgid "unable to create threaded lstat: %s" +msgstr "" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "" -#: range-diff.c:48 +#: range-diff.c:56 msgid "could not start `log`" msgstr "" -#: range-diff.c:51 +#: range-diff.c:59 msgid "could not read `log` output" msgstr "" -#: range-diff.c:66 sequencer.c:4540 +#: range-diff.c:74 sequencer.c:4764 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:196 +#: range-diff.c:224 msgid "failed to generate diff" msgstr "" -#: range-diff.c:421 range-diff.c:423 +#: range-diff.c:455 range-diff.c:457 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:1579 +#: read-cache.c:1490 +msgid "Refresh index" +msgstr "" + +#: read-cache.c:1604 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1589 +#: read-cache.c:1614 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 +#: read-cache.c:1792 +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "" + +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329 +msgid "index file corrupt" +msgstr "" + +#: read-cache.c:2101 +#, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "" + +#: read-cache.c:2114 +#, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "" + +#: read-cache.c:2200 +#, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "" + +#: read-cache.c:2227 +#, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "" + +#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 +#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2666 +#: read-cache.c:3039 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2678 +#: read-cache.c:3051 #, c-format msgid "unable to unlink: %s" msgstr "" +#: rebase-interactive.c:10 +msgid "" +"\n" +"Commands:\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" +"d, drop = remove commit\n" +"l, label