mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
l10n: Update git.pot (12 new messages)
Update file 'po/git.pot' to v1.7.9.2-315-g25a78 (Merge branch 'maint'), with 12 new string additions. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin
parent
508d1244dc
commit
1d4ac88d67
305
po/git.pot
305
po/git.pot
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
||||||
"POT-Creation-Date: 2012-02-13 14:24+0800\n"
|
"POT-Creation-Date: 2012-02-28 09:17+0800\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -73,14 +73,39 @@ msgstr ""
|
||||||
msgid " Unknown dirstat parameter '%.*s'\n"
|
msgid " Unknown dirstat parameter '%.*s'\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: diff.c:208
|
#: diff.c:205
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Found errors in 'diff.dirstat' config variable:\n"
|
"Found errors in 'diff.dirstat' config variable:\n"
|
||||||
"%s"
|
"%s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: diff.c:3308
|
#: diff.c:1331
|
||||||
|
msgid " 0 files changed\n"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: diff.c:1335
|
||||||
|
#, c-format
|
||||||
|
msgid " %d file changed"
|
||||||
|
msgid_plural " %d files changed"
|
||||||
|
msgstr[0] ""
|
||||||
|
msgstr[1] ""
|
||||||
|
|
||||||
|
#: diff.c:1352
|
||||||
|
#, c-format
|
||||||
|
msgid ", %d insertion(+)"
|
||||||
|
msgid_plural ", %d insertions(+)"
|
||||||
|
msgstr[0] ""
|
||||||
|
msgstr[1] ""
|
||||||
|
|
||||||
|
#: diff.c:1363
|
||||||
|
#, c-format
|
||||||
|
msgid ", %d deletion(-)"
|
||||||
|
msgid_plural ", %d deletions(-)"
|
||||||
|
msgstr[0] ""
|
||||||
|
msgstr[1] ""
|
||||||
|
|
||||||
|
#: diff.c:3364
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Failed to parse --dirstat/-X option parameter:\n"
|
"Failed to parse --dirstat/-X option parameter:\n"
|
||||||
|
|
@ -99,21 +124,36 @@ msgstr ""
|
||||||
msgid "gpg failed to sign the data"
|
msgid "gpg failed to sign the data"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: help.c:309
|
#: grep.c:1285
|
||||||
|
#, c-format
|
||||||
|
msgid "'%s': unable to read %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: grep.c:1302
|
||||||
|
#, c-format
|
||||||
|
msgid "'%s': %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: grep.c:1313
|
||||||
|
#, c-format
|
||||||
|
msgid "'%s': short read %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: help.c:287
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"'%s' appears to be a git command, but we were not\n"
|
"'%s' appears to be a git command, but we were not\n"
|
||||||
"able to execute it. Maybe git-%s is broken?"
|
"able to execute it. Maybe git-%s is broken?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: remote.c:1576
|
#: remote.c:1607
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Your branch is ahead of '%s' by %d commit.\n"
|
msgid "Your branch is ahead of '%s' by %d commit.\n"
|
||||||
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
|
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
#: remote.c:1582
|
#: remote.c:1613
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
||||||
msgid_plural ""
|
msgid_plural ""
|
||||||
|
|
@ -121,7 +161,7 @@ msgid_plural ""
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
#: remote.c:1590
|
#: remote.c:1621
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Your branch and '%s' have diverged,\n"
|
"Your branch and '%s' have diverged,\n"
|
||||||
|
|
@ -850,7 +890,7 @@ msgstr ""
|
||||||
msgid "Failed to resolve HEAD as a valid ref."
|
msgid "Failed to resolve HEAD as a valid ref."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/branch.c:747 builtin/clone.c:570
|
#: builtin/branch.c:747 builtin/clone.c:558
|
||||||
msgid "HEAD not found below refs/heads!"
|
msgid "HEAD not found below refs/heads!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -915,7 +955,7 @@ msgstr ""
|
||||||
msgid "path '%s' is unmerged"
|
msgid "path '%s' is unmerged"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:595
|
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
|
||||||
#: builtin/merge.c:809
|
#: builtin/merge.c:809
|
||||||
msgid "unable to write new index file"
|
msgid "unable to write new index file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1017,72 +1057,72 @@ msgstr ""
|
||||||
msgid "reference is not a tree: %s"
|
msgid "reference is not a tree: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:961
|
#: builtin/checkout.c:972
|
||||||
msgid "-B cannot be used with -b"
|
msgid "-B cannot be used with -b"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:970
|
#: builtin/checkout.c:981
|
||||||
msgid "--patch is incompatible with all other options"
|
msgid "--patch is incompatible with all other options"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:973
|
#: builtin/checkout.c:984
|
||||||
msgid "--detach cannot be used with -b/-B/--orphan"
|
msgid "--detach cannot be used with -b/-B/--orphan"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:975
|
#: builtin/checkout.c:986
|
||||||
msgid "--detach cannot be used with -t"
|
msgid "--detach cannot be used with -t"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:981
|
#: builtin/checkout.c:992
|
||||||
msgid "--track needs a branch name"
|
msgid "--track needs a branch name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:988
|
#: builtin/checkout.c:999
|
||||||
msgid "Missing branch name; try -b"
|
msgid "Missing branch name; try -b"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:994
|
#: builtin/checkout.c:1005
|
||||||
msgid "--orphan and -b|-B are mutually exclusive"
|
msgid "--orphan and -b|-B are mutually exclusive"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:996
|
#: builtin/checkout.c:1007
|
||||||
msgid "--orphan cannot be used with -t"
|
msgid "--orphan cannot be used with -t"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1006
|
#: builtin/checkout.c:1017
|
||||||
msgid "git checkout: -f and -m are incompatible"
|
msgid "git checkout: -f and -m are incompatible"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1040
|
#: builtin/checkout.c:1051
|
||||||
msgid "invalid path specification"
|
msgid "invalid path specification"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1048
|
#: builtin/checkout.c:1059
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"git checkout: updating paths is incompatible with switching branches.\n"
|
"git checkout: updating paths is incompatible with switching branches.\n"
|
||||||
"Did you intend to checkout '%s' which can not be resolved as commit?"
|
"Did you intend to checkout '%s' which can not be resolved as commit?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1050
|
#: builtin/checkout.c:1061
|
||||||
msgid "git checkout: updating paths is incompatible with switching branches."
|
msgid "git checkout: updating paths is incompatible with switching branches."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1055
|
#: builtin/checkout.c:1066
|
||||||
msgid "git checkout: --detach does not take a path argument"
|
msgid "git checkout: --detach does not take a path argument"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1058
|
#: builtin/checkout.c:1069
|
||||||
msgid ""
|
msgid ""
|
||||||
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
||||||
"checking out of the index."
|
"checking out of the index."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1077
|
#: builtin/checkout.c:1088
|
||||||
msgid "Cannot switch branch to a non-commit."
|
msgid "Cannot switch branch to a non-commit."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/checkout.c:1080
|
#: builtin/checkout.c:1091
|
||||||
msgid "--ours/--theirs is incompatible with switching branches."
|
msgid "--ours/--theirs is incompatible with switching branches."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1126,128 +1166,128 @@ msgstr ""
|
||||||
msgid "Not removing %s\n"
|
msgid "Not removing %s\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:246
|
#: builtin/clone.c:243
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "reference repository '%s' is not a local directory."
|
msgid "reference repository '%s' is not a local directory."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:313
|
#: builtin/clone.c:302
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to open '%s'"
|
msgid "failed to open '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:317
|
#: builtin/clone.c:306
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to create directory '%s'"
|
msgid "failed to create directory '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:319 builtin/diff.c:75
|
#: builtin/clone.c:308 builtin/diff.c:75
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to stat '%s'"
|
msgid "failed to stat '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:321
|
#: builtin/clone.c:310
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "%s exists and is not a directory"
|
msgid "%s exists and is not a directory"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:335
|
#: builtin/clone.c:324
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to stat %s\n"
|
msgid "failed to stat %s\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:352
|
#: builtin/clone.c:341
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to unlink '%s'"
|
msgid "failed to unlink '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:357
|
#: builtin/clone.c:346
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to create link '%s'"
|
msgid "failed to create link '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:361
|
#: builtin/clone.c:350
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "failed to copy file to '%s'"
|
msgid "failed to copy file to '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:384
|
#: builtin/clone.c:373
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "done.\n"
|
msgid "done.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:451
|
#: builtin/clone.c:440
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Could not find remote branch %s to clone."
|
msgid "Could not find remote branch %s to clone."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:561
|
#: builtin/clone.c:549
|
||||||
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:651
|
#: builtin/clone.c:639
|
||||||
msgid "Too many arguments."
|
msgid "Too many arguments."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:655
|
#: builtin/clone.c:643
|
||||||
msgid "You must specify a repository to clone."
|
msgid "You must specify a repository to clone."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:666
|
#: builtin/clone.c:654
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "--bare and --origin %s options are incompatible."
|
msgid "--bare and --origin %s options are incompatible."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:680
|
#: builtin/clone.c:668
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "repository '%s' does not exist"
|
msgid "repository '%s' does not exist"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:685
|
#: builtin/clone.c:673
|
||||||
msgid "--depth is ignored in local clones; use file:// instead."
|
msgid "--depth is ignored in local clones; use file:// instead."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:695
|
#: builtin/clone.c:683
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "destination path '%s' already exists and is not an empty directory."
|
msgid "destination path '%s' already exists and is not an empty directory."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:705
|
#: builtin/clone.c:693
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "working tree '%s' already exists."
|
msgid "working tree '%s' already exists."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:718 builtin/clone.c:732
|
#: builtin/clone.c:706 builtin/clone.c:720
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "could not create leading directories of '%s'"
|
msgid "could not create leading directories of '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:721
|
#: builtin/clone.c:709
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "could not create work tree dir '%s'."
|
msgid "could not create work tree dir '%s'."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:740
|
#: builtin/clone.c:728
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Cloning into bare repository '%s'...\n"
|
msgid "Cloning into bare repository '%s'...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:742
|
#: builtin/clone.c:730
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Cloning into '%s'...\n"
|
msgid "Cloning into '%s'...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:798
|
#: builtin/clone.c:786
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Don't know how to clone %s"
|
msgid "Don't know how to clone %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:847
|
#: builtin/clone.c:835
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Remote branch %s not found in upstream %s"
|
msgid "Remote branch %s not found in upstream %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/clone.c:854
|
#: builtin/clone.c:842
|
||||||
msgid "You appear to have cloned an empty repository."
|
msgid "You appear to have cloned an empty repository."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1423,7 +1463,7 @@ msgstr ""
|
||||||
msgid "Error building trees"
|
msgid "Error building trees"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/commit.c:895 builtin/tag.c:324
|
#: builtin/commit.c:895 builtin/tag.c:357
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Please supply the message using either -m or -F option.\n"
|
msgid "Please supply the message using either -m or -F option.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1483,7 +1523,7 @@ msgstr ""
|
||||||
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
|
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/commit.c:1096 builtin/tag.c:500
|
#: builtin/commit.c:1096 builtin/tag.c:556
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Invalid cleanup mode %s"
|
msgid "Invalid cleanup mode %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1845,77 +1885,62 @@ msgid ""
|
||||||
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:275
|
#: builtin/grep.c:216
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "grep: failed to create thread: %s"
|
msgid "grep: failed to create thread: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:390
|
#: builtin/grep.c:402
|
||||||
#, c-format
|
|
||||||
msgid "'%s': unable to read %s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: builtin/grep.c:441
|
|
||||||
#, c-format
|
|
||||||
msgid "'%s': %s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: builtin/grep.c:452
|
|
||||||
#, c-format
|
|
||||||
msgid "'%s': short read %s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: builtin/grep.c:514
|
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Failed to chdir: %s"
|
msgid "Failed to chdir: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:590 builtin/grep.c:624
|
#: builtin/grep.c:478 builtin/grep.c:512
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "unable to read tree (%s)"
|
msgid "unable to read tree (%s)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:638
|
#: builtin/grep.c:526
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "unable to grep from object of type %s"
|
msgid "unable to grep from object of type %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:696
|
#: builtin/grep.c:584
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "switch `%c' expects a numerical value"
|
msgid "switch `%c' expects a numerical value"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:713
|
#: builtin/grep.c:601
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "cannot open '%s'"
|
msgid "cannot open '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1001
|
#: builtin/grep.c:889
|
||||||
msgid "no pattern given."
|
msgid "no pattern given."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1015
|
#: builtin/grep.c:903
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "bad object %s"
|
msgid "bad object %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1058
|
#: builtin/grep.c:944
|
||||||
msgid "--open-files-in-pager only works on the worktree"
|
msgid "--open-files-in-pager only works on the worktree"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1081
|
#: builtin/grep.c:967
|
||||||
msgid "--cached or --untracked cannot be used with --no-index."
|
msgid "--cached or --untracked cannot be used with --no-index."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1086
|
#: builtin/grep.c:972
|
||||||
msgid "--no-index or --untracked cannot be used with revs."
|
msgid "--no-index or --untracked cannot be used with revs."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1089
|
#: builtin/grep.c:975
|
||||||
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/grep.c:1097
|
#: builtin/grep.c:983
|
||||||
msgid "both --cached and trees are given."
|
msgid "both --cached and trees are given."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2370,51 +2395,51 @@ msgstr ""
|
||||||
msgid "%s - not something we can merge"
|
msgid "%s - not something we can merge"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1382
|
#: builtin/merge.c:1383
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Updating %s..%s\n"
|
msgid "Updating %s..%s\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1420
|
#: builtin/merge.c:1421
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Trying really trivial in-index merge...\n"
|
msgid "Trying really trivial in-index merge...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1427
|
#: builtin/merge.c:1428
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Nope.\n"
|
msgid "Nope.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1459
|
#: builtin/merge.c:1460
|
||||||
msgid "Not possible to fast-forward, aborting."
|
msgid "Not possible to fast-forward, aborting."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1482 builtin/merge.c:1559
|
#: builtin/merge.c:1483 builtin/merge.c:1560
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Rewinding the tree to pristine...\n"
|
msgid "Rewinding the tree to pristine...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1486
|
#: builtin/merge.c:1487
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Trying merge strategy %s...\n"
|
msgid "Trying merge strategy %s...\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1550
|
#: builtin/merge.c:1551
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "No merge strategy handled the merge.\n"
|
msgid "No merge strategy handled the merge.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1552
|
#: builtin/merge.c:1553
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Merge with strategy %s failed.\n"
|
msgid "Merge with strategy %s failed.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1561
|
#: builtin/merge.c:1562
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Using the %s to prepare resolving by hand.\n"
|
msgid "Using the %s to prepare resolving by hand.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/merge.c:1572
|
#: builtin/merge.c:1573
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Automatic merge went well; stopped before committing as requested\n"
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2500,7 +2525,7 @@ msgstr ""
|
||||||
msgid "failed to finish 'show' for object '%s'"
|
msgid "failed to finish 'show' for object '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/notes.c:175 builtin/tag.c:310
|
#: builtin/notes.c:175 builtin/tag.c:343
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "could not create file '%s'"
|
msgid "could not create file '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2523,12 +2548,12 @@ msgstr ""
|
||||||
msgid "The note contents has been left in %s"
|
msgid "The note contents has been left in %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/notes.c:251 builtin/tag.c:465
|
#: builtin/notes.c:251 builtin/tag.c:521
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "cannot read '%s'"
|
msgid "cannot read '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/notes.c:253 builtin/tag.c:468
|
#: builtin/notes.c:253 builtin/tag.c:524
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "could not open or read '%s'"
|
msgid "could not open or read '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2536,7 +2561,7 @@ msgstr ""
|
||||||
#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
|
#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
|
||||||
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
|
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
|
||||||
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
|
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
|
||||||
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:481
|
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Failed to resolve '%s' as a valid ref."
|
msgid "Failed to resolve '%s' as a valid ref."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2633,6 +2658,26 @@ msgstr ""
|
||||||
msgid "Unknown subcommand: %s"
|
msgid "Unknown subcommand: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/pack-objects.c:2310
|
||||||
|
#, c-format
|
||||||
|
msgid "unsupported index version %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/pack-objects.c:2314
|
||||||
|
#, c-format
|
||||||
|
msgid "bad index version '%s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/pack-objects.c:2322
|
||||||
|
#, c-format
|
||||||
|
msgid "option %s does not accept negative form"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/pack-objects.c:2326
|
||||||
|
#, c-format
|
||||||
|
msgid "unable to parse value '%s' for option %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/push.c:44
|
#: builtin/push.c:44
|
||||||
msgid "tag shorthand without <tag>"
|
msgid "tag shorthand without <tag>"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2726,11 +2771,11 @@ msgstr ""
|
||||||
msgid "--all and --mirror are incompatible"
|
msgid "--all and --mirror are incompatible"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/push.c:272
|
#: builtin/push.c:274
|
||||||
msgid "--delete is incompatible with --all, --mirror and --tags"
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/push.c:274
|
#: builtin/push.c:276
|
||||||
msgid "--delete doesn't make sense without any refs"
|
msgid "--delete doesn't make sense without any refs"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2866,27 +2911,32 @@ msgstr ""
|
||||||
msgid "Missing author: %s"
|
msgid "Missing author: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:172
|
#: builtin/tag.c:58
|
||||||
|
#, c-format
|
||||||
|
msgid "malformed object at '%s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/tag.c:205
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "tag name too long: %.*s..."
|
msgid "tag name too long: %.*s..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:177
|
#: builtin/tag.c:210
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "tag '%s' not found."
|
msgid "tag '%s' not found."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:192
|
#: builtin/tag.c:225
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Deleted tag '%s' (was %s)\n"
|
msgid "Deleted tag '%s' (was %s)\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:204
|
#: builtin/tag.c:237
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "could not verify the tag '%s'"
|
msgid "could not verify the tag '%s'"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:214
|
#: builtin/tag.c:247
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"#\n"
|
"#\n"
|
||||||
|
|
@ -2895,7 +2945,7 @@ msgid ""
|
||||||
"#\n"
|
"#\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:221
|
#: builtin/tag.c:254
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
"#\n"
|
"#\n"
|
||||||
|
|
@ -2905,68 +2955,81 @@ msgid ""
|
||||||
"#\n"
|
"#\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:261
|
#: builtin/tag.c:294
|
||||||
msgid "unable to sign the tag"
|
msgid "unable to sign the tag"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:263
|
#: builtin/tag.c:296
|
||||||
msgid "unable to write tag file"
|
msgid "unable to write tag file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:288
|
#: builtin/tag.c:321
|
||||||
msgid "bad object type."
|
msgid "bad object type."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:301
|
#: builtin/tag.c:334
|
||||||
msgid "tag header too big."
|
msgid "tag header too big."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:333
|
#: builtin/tag.c:366
|
||||||
msgid "no tag message?"
|
msgid "no tag message?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:339
|
#: builtin/tag.c:372
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "The tag message has been left in %s\n"
|
msgid "The tag message has been left in %s\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:448
|
#: builtin/tag.c:421
|
||||||
|
msgid "switch 'points-at' requires an object"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/tag.c:423
|
||||||
|
#, c-format
|
||||||
|
msgid "malformed object name '%s'"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/tag.c:502
|
||||||
msgid "-n option is only allowed with -l."
|
msgid "-n option is only allowed with -l."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:450
|
#: builtin/tag.c:504
|
||||||
msgid "--contains option is only allowed with -l."
|
msgid "--contains option is only allowed with -l."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:458
|
#: builtin/tag.c:506
|
||||||
|
msgid "--points-at option is only allowed with -l."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: builtin/tag.c:514
|
||||||
msgid "only one -F or -m option is allowed."
|
msgid "only one -F or -m option is allowed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:478
|
#: builtin/tag.c:534
|
||||||
msgid "too many params"
|
msgid "too many params"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:484
|
#: builtin/tag.c:540
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "'%s' is not a valid tag name."
|
msgid "'%s' is not a valid tag name."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:489
|
#: builtin/tag.c:545
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "tag '%s' already exists"
|
msgid "tag '%s' already exists"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:507
|
#: builtin/tag.c:563
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "%s: cannot lock the ref"
|
msgid "%s: cannot lock the ref"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:509
|
#: builtin/tag.c:565
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "%s: cannot update the ref"
|
msgid "%s: cannot update the ref"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: builtin/tag.c:511
|
#: builtin/tag.c:567
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Updated tag '%s' (was %s)\n"
|
msgid "Updated tag '%s' (was %s)\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3153,15 +3216,15 @@ msgstr ""
|
||||||
msgid "Pull is not possible because you have unmerged files."
|
msgid "Pull is not possible because you have unmerged files."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: git-pull.sh:193
|
#: git-pull.sh:197
|
||||||
msgid "updating an unborn branch with changes added to the index"
|
msgid "updating an unborn branch with changes added to the index"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: git-pull.sh:249
|
#: git-pull.sh:253
|
||||||
msgid "Cannot merge multiple branches into empty head"
|
msgid "Cannot merge multiple branches into empty head"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: git-pull.sh:253
|
#: git-pull.sh:257
|
||||||
msgid "Cannot rebase onto multiple branches"
|
msgid "Cannot rebase onto multiple branches"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue