diff options
Diffstat (limited to 'po/git.pot')
-rw-r--r-- | po/git.pot | 6914 |
1 files changed, 3927 insertions, 2987 deletions
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 <git@vger.kernel.org>\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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c: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 <file>'\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 <num> 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 <n> 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 <root> to all filenames" msgstr "" @@ -732,7 +731,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --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 <repo>" 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 wr |