mirror of
https://github.com/git/git.git
synced 2024-06-08 13:36:15 +02:00
l10n: git.pot: v2.12.0 round 2 (2 new)
Generate po/git.pot from v2.12.0-rc1 for git v2.12.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
53f7473403
commit
a4d94835af
342
po/git.pot
342
po/git.pot
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||
"POT-Creation-Date: 2017-02-04 13:02+0800\n"
|
||||
"POT-Creation-Date: 2017-02-18 01:00+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"
|
||||
|
|
@ -220,349 +220,349 @@ msgstr ""
|
|||
msgid "patch with only garbage at line %d"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:2274
|
||||
#: apply.c:2265
|
||||
#, c-format
|
||||
msgid "unable to read symlink %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:2278
|
||||
#: apply.c:2269
|
||||
#, c-format
|
||||
msgid "unable to open or read %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:2931
|
||||
#: apply.c:2922
|
||||
#, c-format
|
||||
msgid "invalid start of line: '%c'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3050
|
||||
#: apply.c:3041
|
||||
#, 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:3062
|
||||
#: apply.c:3053
|
||||
#, c-format
|
||||
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3068
|
||||
#: apply.c:3059
|
||||
#, c-format
|
||||
msgid ""
|
||||
"while searching for:\n"
|
||||
"%.*s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3090
|
||||
#: apply.c:3081
|
||||
#, c-format
|
||||
msgid "missing binary patch data for '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3098
|
||||
#: apply.c:3089
|
||||
#, c-format
|
||||
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3144
|
||||
#: apply.c:3135
|
||||
#, c-format
|
||||
msgid "cannot apply binary patch to '%s' without full index line"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3154
|
||||
#: apply.c:3145
|
||||
#, c-format
|
||||
msgid ""
|
||||
"the patch applies to '%s' (%s), which does not match the current contents."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3162
|
||||
#: apply.c:3153
|
||||
#, c-format
|
||||
msgid "the patch applies to an empty '%s' but it is not empty"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3180
|
||||
#: apply.c:3171
|
||||
#, c-format
|
||||
msgid "the necessary postimage %s for '%s' cannot be read"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3193
|
||||
#: apply.c:3184
|
||||
#, c-format
|
||||
msgid "binary patch does not apply to '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3199
|
||||
#: apply.c:3190
|
||||
#, c-format
|
||||
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3220
|
||||
#: apply.c:3211
|
||||
#, c-format
|
||||
msgid "patch failed: %s:%ld"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3342
|
||||
#: apply.c:3333
|
||||
#, c-format
|
||||
msgid "cannot checkout %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
|
||||
#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
|
||||
#, c-format
|
||||
msgid "failed to read %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3398
|
||||
#: apply.c:3389
|
||||
#, c-format
|
||||
msgid "reading from '%s' beyond a symbolic link"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3427 apply.c:3667
|
||||
#: apply.c:3418 apply.c:3658
|
||||
#, c-format
|
||||
msgid "path %s has been renamed/deleted"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3510 apply.c:3681
|
||||
#: apply.c:3501 apply.c:3672
|
||||
#, c-format
|
||||
msgid "%s: does not exist in index"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3519 apply.c:3689
|
||||
#: apply.c:3510 apply.c:3680
|
||||
#, c-format
|
||||
msgid "%s: does not match index"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3554
|
||||
#: apply.c:3545
|
||||
msgid "repository lacks the necessary blob to fall back on 3-way merge."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3557
|
||||
#: apply.c:3548
|
||||
#, c-format
|
||||
msgid "Falling back to three-way merge...\n"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3573 apply.c:3577
|
||||
#: apply.c:3564 apply.c:3568
|
||||
#, c-format
|
||||
msgid "cannot read the current contents of '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3589
|
||||
#: apply.c:3580
|
||||
#, c-format
|
||||
msgid "Failed to fall back on three-way merge...\n"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3603
|
||||
#: apply.c:3594
|
||||
#, c-format
|
||||
msgid "Applied patch to '%s' with conflicts.\n"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3608
|
||||
#: apply.c:3599
|
||||
#, c-format
|
||||
msgid "Applied patch to '%s' cleanly.\n"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3634
|
||||
#: apply.c:3625
|
||||
msgid "removal patch leaves file contents"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3706
|
||||
#: apply.c:3697
|
||||
#, c-format
|
||||
msgid "%s: wrong type"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3708
|
||||
#: apply.c:3699
|
||||
#, c-format
|
||||
msgid "%s has type %o, expected %o"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3859 apply.c:3861
|
||||
#: apply.c:3850 apply.c:3852
|
||||
#, c-format
|
||||
msgid "invalid path '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3917
|
||||
#: apply.c:3908
|
||||
#, c-format
|
||||
msgid "%s: already exists in index"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3920
|
||||
#: apply.c:3911
|
||||
#, c-format
|
||||
msgid "%s: already exists in working directory"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3940
|
||||
#: apply.c:3931
|
||||
#, c-format
|
||||
msgid "new mode (%o) of %s does not match old mode (%o)"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3945
|
||||
#: apply.c:3936
|
||||
#, c-format
|
||||
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3965
|
||||
#: apply.c:3956
|
||||
#, c-format
|
||||
msgid "affected file '%s' is beyond a symbolic link"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3969
|
||||
#: apply.c:3960
|
||||
#, c-format
|
||||
msgid "%s: patch does not apply"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:3984
|
||||
#: apply.c:3975
|
||||
#, c-format
|
||||
msgid "Checking patch %s..."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4075
|
||||
#: apply.c:4066
|
||||
#, c-format
|
||||
msgid "sha1 information is lacking or useless for submodule %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4082
|
||||
#: apply.c:4073
|
||||
#, c-format
|
||||
msgid "mode change for %s, which is not in current HEAD"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4085
|
||||
#: apply.c:4076
|
||||
#, c-format
|
||||
msgid "sha1 information is lacking or useless (%s)."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
|
||||
#, c-format
|
||||
msgid "make_cache_entry failed for path '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4094
|
||||
#: apply.c:4085
|
||||
#, c-format
|
||||
msgid "could not add %s to temporary index"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4104
|
||||
#: apply.c:4095
|
||||
#, c-format
|
||||
msgid "could not write temporary index to %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4242
|
||||
#: apply.c:4233
|
||||
#, c-format
|
||||
msgid "unable to remove %s from index"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4277
|
||||
#: apply.c:4268
|
||||
#, c-format
|
||||
msgid "corrupt patch for submodule %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4283
|
||||
#: apply.c:4274
|
||||
#, c-format
|
||||
msgid "unable to stat newly created file '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4291
|
||||
#: apply.c:4282
|
||||
#, c-format
|
||||
msgid "unable to create backing store for newly created file %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4297 apply.c:4441
|
||||
#: apply.c:4288 apply.c:4432
|
||||
#, c-format
|
||||
msgid "unable to add cache entry for %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4338
|
||||
#: apply.c:4329
|
||||
#, c-format
|
||||
msgid "failed to write to '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4342
|
||||
#: apply.c:4333
|
||||
#, c-format
|
||||
msgid "closing file '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4412
|
||||
#: apply.c:4403
|
||||
#, c-format
|
||||
msgid "unable to write file '%s' mode %o"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4510
|
||||
#: apply.c:4501
|
||||
#, c-format
|
||||
msgid "Applied patch %s cleanly."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4518
|
||||
#: apply.c:4509
|
||||
msgid "internal error"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4521
|
||||
#: apply.c:4512
|
||||
#, c-format
|
||||
msgid "Applying patch %%s with %d reject..."
|
||||
msgid_plural "Applying patch %%s with %d rejects..."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: apply.c:4532
|
||||
#: apply.c:4523
|
||||
#, c-format
|
||||
msgid "truncating .rej filename to %.*s.rej"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986
|
||||
#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
|
||||
#, c-format
|
||||
msgid "cannot open %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4554
|
||||
#: apply.c:4545
|
||||
#, c-format
|
||||
msgid "Hunk #%d applied cleanly."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4558
|
||||
#: apply.c:4549
|
||||
#, c-format
|
||||
msgid "Rejected hunk #%d."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4668
|
||||
#: apply.c:4659
|
||||
#, c-format
|
||||
msgid "Skipped patch '%s'."
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4676
|
||||
#: apply.c:4667
|
||||
msgid "unrecognized input"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4695
|
||||
#: apply.c:4686
|
||||
msgid "unable to read index file"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4833
|
||||
#: apply.c:4824
|
||||
#, c-format
|
||||
msgid "can't open patch '%s': %s"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4858
|
||||
#: apply.c:4849
|
||||
#, c-format
|
||||
msgid "squelched %d whitespace error"
|
||||
msgid_plural "squelched %d whitespace errors"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: apply.c:4864 apply.c:4879
|
||||
#: apply.c:4855 apply.c:4870
|
||||
#, c-format
|
||||
msgid "%d line adds whitespace errors."
|
||||
msgid_plural "%d lines add whitespace errors."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: apply.c:4872
|
||||
#: apply.c:4863
|
||||
#, c-format
|
||||
msgid "%d line applied after fixing whitespace errors."
|
||||
msgid_plural "%d lines applied after fixing whitespace errors."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
|
||||
#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
|
||||
msgid "Unable to write new index file"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
|
||||
#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
|
||||
#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
|
||||
#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
|
||||
#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
|
||||
|
|
@ -571,121 +571,121 @@ msgstr ""
|
|||
msgid "path"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4920
|
||||
#: apply.c:4911
|
||||
msgid "don't apply changes matching the given path"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4923
|
||||
#: apply.c:4914
|
||||
msgid "apply changes matching the given path"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4925 builtin/am.c:2286
|
||||
#: apply.c:4916 builtin/am.c:2286
|
||||
msgid "num"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4926
|
||||
#: apply.c:4917
|
||||
msgid "remove <num> leading slashes from traditional diff paths"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4929
|
||||
#: apply.c:4920
|
||||
msgid "ignore additions made by the patch"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4931
|
||||
#: apply.c:4922
|
||||
msgid "instead of applying the patch, output diffstat for the input"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4935
|
||||
#: apply.c:4926
|
||||
msgid "show number of added and deleted lines in decimal notation"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4937
|
||||
#: apply.c:4928
|
||||
msgid "instead of applying the patch, output a summary for the input"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4939
|
||||
#: apply.c:4930
|
||||
msgid "instead of applying the patch, see if the patch is applicable"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4941
|
||||
#: apply.c:4932
|
||||
msgid "make sure the patch is applicable to the current index"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4943
|
||||
#: apply.c:4934
|
||||
msgid "apply a patch without touching the working tree"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4945
|
||||
#: apply.c:4936
|
||||
msgid "accept a patch that touches outside the working area"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4947
|
||||
#: apply.c:4938
|
||||
msgid "also apply the patch (use with --stat/--summary/--check)"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4949
|
||||
#: apply.c:4940
|
||||
msgid "attempt three-way merge if a patch does not apply"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4951
|
||||
#: apply.c:4942
|
||||
msgid "build a temporary index based on embedded index information"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
|
||||
#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
|
||||
msgid "paths are separated with NUL character"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4956
|
||||
#: apply.c:4947
|
||||
msgid "ensure at least <n> lines of context match"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4957 builtin/am.c:2265
|
||||
#: apply.c:4948 builtin/am.c:2265
|
||||
msgid "action"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4958
|
||||
#: apply.c:4949
|
||||
msgid "detect new or modified lines that have whitespace errors"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4961 apply.c:4964
|
||||
#: apply.c:4952 apply.c:4955
|
||||
msgid "ignore changes in whitespace when finding context"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4967
|
||||
#: apply.c:4958
|
||||
msgid "apply the patch in reverse"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4969
|
||||
#: apply.c:4960
|
||||
msgid "don't expect at least one line of context"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4971
|
||||
#: apply.c:4962
|
||||
msgid "leave the rejected hunks in corresponding *.rej files"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4973
|
||||
#: apply.c:4964
|
||||
msgid "allow overlapping hunks"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
|
||||
#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
|
||||
#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
|
||||
#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
|
||||
msgid "be verbose"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4976
|
||||
#: apply.c:4967
|
||||
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4979
|
||||
#: apply.c:4970
|
||||
msgid "do not trust the line counts in the hunk headers"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4981 builtin/am.c:2274
|
||||
#: apply.c:4972 builtin/am.c:2274
|
||||
msgid "root"
|
||||
msgstr ""
|
||||
|
||||
#: apply.c:4982
|
||||
#: apply.c:4973
|
||||
msgid "prepend <root> to all filenames"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -729,7 +729,7 @@ msgstr ""
|
|||
|
||||
#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
|
||||
#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
|
||||
#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542
|
||||
#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
|
||||
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
|
||||
#: parse-options.h:153
|
||||
msgid "file"
|
||||
|
|
@ -1459,29 +1459,29 @@ msgstr ""
|
|||
msgid "Failed to parse --submodule option parameter: '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:4695
|
||||
#: diff.c:4696
|
||||
msgid "inexact rename detection was skipped due to too many files."
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:4698
|
||||
#: diff.c:4699
|
||||
msgid "only found copies from modified paths due to too many files."
|
||||
msgstr ""
|
||||
|
||||
#: diff.c:4701
|
||||
#: diff.c:4702
|
||||
#, c-format
|
||||
msgid ""
|
||||
"you may want to set your %s variable to at least %d and retry the command."
|
||||
msgstr ""
|
||||
|
||||
#: dir.c:1863
|
||||
#: dir.c:1862
|
||||
msgid "failed to get kernel name and information"
|
||||
msgstr ""
|
||||
|
||||
#: dir.c:1982
|
||||
#: dir.c:1981
|
||||
msgid "Untracked cache is disabled on this system or location."
|
||||
msgstr ""
|
||||
|
||||
#: dir.c:2760
|
||||
#: dir.c:2759
|
||||
#, c-format
|
||||
msgid "could not migrate git directory from '%s' to '%s'"
|
||||
msgstr ""
|
||||
|
|
@ -1676,7 +1676,7 @@ msgstr ""
|
|||
msgid "'%s': unable to read %s"
|
||||
msgstr ""
|
||||
|
||||
#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133
|
||||
#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
|
||||
#, c-format
|
||||
msgid "failed to stat '%s'"
|
||||
msgstr ""
|
||||
|
|
@ -1897,119 +1897,119 @@ msgstr ""
|
|||
msgid "Renaming %s to %s and %s to %s instead"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1538
|
||||
#: merge-recursive.c:1535
|
||||
#, c-format
|
||||
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1553
|
||||
#: merge-recursive.c:1550
|
||||
#, c-format
|
||||
msgid "Adding merged %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1560 merge-recursive.c:1774
|
||||
#: merge-recursive.c:1557 merge-recursive.c:1771
|
||||
#, c-format
|
||||
msgid "Adding as %s instead"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1617
|
||||
#: merge-recursive.c:1614
|
||||
#, c-format
|
||||
msgid "cannot read object %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1620
|
||||
#: merge-recursive.c:1617
|
||||
#, c-format
|
||||
msgid "object %s is not a blob"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1673
|
||||
#: merge-recursive.c:1670
|
||||
msgid "modify"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1673
|
||||
#: merge-recursive.c:1670
|
||||
msgid "modified"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1683
|
||||
#: merge-recursive.c:1680
|
||||
msgid "content"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1690
|
||||
#: merge-recursive.c:1687
|
||||
msgid "add/add"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1726
|
||||
#: merge-recursive.c:1723
|
||||
#, c-format
|
||||
msgid "Skipped %s (merged same as existing)"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1740
|
||||
#: merge-recursive.c:1737
|
||||
#, c-format
|
||||
msgid "Auto-merging %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1744 git-submodule.sh:930
|
||||
#: merge-recursive.c:1741 git-submodule.sh:930
|
||||
msgid "submodule"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1745
|
||||
#: merge-recursive.c:1742
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): Merge conflict in %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1839
|
||||
#: merge-recursive.c:1836
|
||||
#, c-format
|
||||
msgid "Removing %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1865
|
||||
#: merge-recursive.c:1862
|
||||
msgid "file/directory"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1871
|
||||
#: merge-recursive.c:1868
|
||||
msgid "directory/file"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1877
|
||||
#: merge-recursive.c:1874
|
||||
#, c-format
|
||||
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1886
|
||||
#: merge-recursive.c:1883
|
||||
#, c-format
|
||||
msgid "Adding %s"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1923
|
||||
#: merge-recursive.c:1920
|
||||
msgid "Already up-to-date!"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:1932
|
||||
#: merge-recursive.c:1929
|
||||
#, c-format
|
||||
msgid "merging of trees %s and %s failed"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:2015
|
||||
#: merge-recursive.c:2012
|
||||
msgid "Merging:"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:2028
|
||||
#: merge-recursive.c:2025
|
||||
#, c-format
|
||||
msgid "found %u common ancestor:"
|
||||
msgid_plural "found %u common ancestors:"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: merge-recursive.c:2067
|
||||
#: merge-recursive.c:2064
|
||||
msgid "merge returned no commit"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:2130
|
||||
#: merge-recursive.c:2127
|
||||
#, c-format
|
||||
msgid "Could not parse object '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792
|
||||
#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
|
||||
msgid "Unable to write index."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2047,7 +2047,7 @@ msgstr ""
|
|||
msgid "Bad %s value: '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: object.c:242
|
||||
#: object.c:240
|
||||
#, c-format
|
||||
msgid "unable to parse object: %s"
|
||||
msgstr ""
|
||||
|
|
@ -3249,7 +3249,7 @@ msgstr ""
|
|||
msgid "Aborting."
|
||||
msgstr ""
|
||||
|
||||
#: transport-helper.c:1075
|
||||
#: transport-helper.c:1082
|
||||
#, c-format
|
||||
msgid "Could not read ref %s"
|
||||
msgstr ""
|
||||
|
|
@ -5750,7 +5750,7 @@ msgid "remove whole directories"
|
|||
msgstr ""
|
||||
|
||||
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
|
||||
#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176
|
||||
#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
|
||||
msgid "pattern"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6961,31 +6961,31 @@ msgstr ""
|
|||
msgid "--dirty is incompatible with commit-ishes"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/diff.c:86
|
||||
#: builtin/diff.c:83
|
||||
#, c-format
|
||||
msgid "'%s': not a regular file or symlink"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/diff.c:237
|
||||
#: builtin/diff.c:234
|
||||
#, c-format
|
||||
msgid "invalid option: %s"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/diff.c:361
|
||||
#: builtin/diff.c:358
|
||||
msgid "Not a git repository"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/diff.c:404
|
||||
#: builtin/diff.c:401
|
||||
#, c-format
|
||||
msgid "invalid object '%s' given."
|
||||
msgstr ""
|
||||
|
||||
#: builtin/diff.c:413
|
||||
#: builtin/diff.c:410
|
||||
#, c-format
|
||||
msgid "more than two blobs given: '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/diff.c:420
|
||||
#: builtin/diff.c:417
|
||||
#, c-format
|
||||
msgid "unhandled object '%s' given."
|
||||
msgstr ""
|
||||
|
|
@ -8768,103 +8768,103 @@ msgid ""
|
|||
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:458
|
||||
#: builtin/ls-files.c:460
|
||||
msgid "git ls-files [<options>] [<file>...]"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:507
|
||||
#: builtin/ls-files.c:509
|
||||
msgid "identify the file status with tags"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:509
|
||||
#: builtin/ls-files.c:511
|
||||
msgid "use lowercase letters for 'assume unchanged' files"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:511
|
||||
#: builtin/ls-files.c:513
|
||||
msgid "show cached files in the output (default)"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:513
|
||||
#: builtin/ls-files.c:515
|
||||
msgid "show deleted files in the output"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:515
|
||||
#: builtin/ls-files.c:517
|
||||
msgid "show modified files in the output"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:517
|
||||
#: builtin/ls-files.c:519
|
||||
msgid "show other files in the output"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:519
|
||||
#: builtin/ls-files.c:521
|
||||
msgid "show ignored files in the output"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:522
|
||||
#: builtin/ls-files.c:524
|
||||
msgid "show staged contents' object name in the output"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:524
|
||||
#: builtin/ls-files.c:526
|
||||
msgid "show files on the filesystem that need to be removed"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:526
|
||||
#: builtin/ls-files.c:528
|
||||
msgid "show 'other' directories' names only"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:528
|
||||
#: builtin/ls-files.c:530
|
||||
msgid "show line endings of files"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:530
|
||||
#: builtin/ls-files.c:532
|
||||
msgid "don't show empty directories"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:533
|
||||
#: builtin/ls-files.c:535
|
||||
msgid "show unmerged files in the output"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:535
|
||||
#: builtin/ls-files.c:537
|
||||
msgid "show resolve-undo information"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:537
|
||||
#: builtin/ls-files.c:539
|
||||
msgid "skip files matching pattern"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:540
|
||||
#: builtin/ls-files.c:542
|
||||
msgid "exclude patterns are read from <file>"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:543
|
||||
#: builtin/ls-files.c:545
|
||||
msgid "read additional per-directory exclude patterns in <file>"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:545
|
||||
#: builtin/ls-files.c:547
|
||||
msgid "add the standard git exclusions"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:548
|
||||
#: builtin/ls-files.c:550
|
||||
msgid "make the output relative to the project top directory"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:551
|
||||
#: builtin/ls-files.c:553
|
||||
msgid "recurse through submodules"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:553
|
||||
#: builtin/ls-files.c:555
|
||||
msgid "if any <file> is not in the index, treat this as an error"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:554
|
||||
#: builtin/ls-files.c:556
|
||||
msgid "tree-ish"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:555
|
||||
#: builtin/ls-files.c:557
|
||||
msgid "pretend that paths removed since <tree-ish> are still present"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/ls-files.c:557
|
||||
#: builtin/ls-files.c:559
|
||||
msgid "show debugging data"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -10180,11 +10180,11 @@ msgstr ""
|
|||
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:106 builtin/worktree.c:128
|
||||
#: builtin/prune.c:106
|
||||
msgid "report pruned objects"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/prune.c:109 builtin/worktree.c:130
|
||||
#: builtin/prune.c:109
|
||||
msgid "expire objects older than <time>"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -12685,6 +12685,14 @@ msgstr ""
|
|||
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:128
|
||||
msgid "report pruned working trees"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:130
|
||||
msgid "expire working trees older than <time>"
|
||||
msgstr ""
|
||||
|
||||
#: builtin/worktree.c:204
|
||||
#, c-format
|
||||
msgid "'%s' already exists"
|
||||
|
|
|
|||
Loading…
Reference in New Issue