undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

l10n: Update git.pot (3 new, 2 removed messages)

Browse Source 
Generate po/git.pot from v1.7.10.2-35-g0b9f4:

 * 3 new l10n messages at lines: 2743, 2751, 2759.

 * 2 removed l10n messages from lines: 1879, 2757.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin 2012-05-15 06:36:36 +08:00
parent 0b9f4b63a0
commit b741611c06
1 changed files with 108 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
po/git.pot
View File

@ -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-05-08 15:45+0800\n" "POT-Creation-Date: 2012-05-15 06:31+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"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: advice.c:34 #: advice.c:40
#, c-format #, c-format
msgid "hint: %.*s\n" msgid "hint: %.*s\n"
msgstr "" msgstr ""
@ -27,7 +27,7 @@ msgstr ""
#. * Message used both when 'git commit' fails and when #. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do. #. * other commands doing a merge do.
#. #.
#: advice.c:64 #: advice.c:70
msgid "" msgid ""
"Fix them up in the work tree,\n" "Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n" "and then use 'git add/rm <file>' as\n"
@ -105,7 +105,7 @@ msgid_plural ", %d deletions(-)"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: diff.c:3435 #: diff.c:3439
#, c-format #, c-format
msgid "" msgid ""
"Failed to parse --dirstat/-X option parameter:\n" "Failed to parse --dirstat/-X option parameter:\n"
@ -1039,96 +1039,96 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
#: builtin/checkout.c:692 #: builtin/checkout.c:693
msgid "internal error in revision walk" msgid "internal error in revision walk"
msgstr "" msgstr ""
#: builtin/checkout.c:696 #: builtin/checkout.c:697
msgid "Previous HEAD position was" msgid "Previous HEAD position was"
msgstr "" msgstr ""
#: builtin/checkout.c:722 #: builtin/checkout.c:723
msgid "You are on a branch yet to be born" msgid "You are on a branch yet to be born"
msgstr "" msgstr ""
#. case (1) #. case (1)
#: builtin/checkout.c:853 #: builtin/checkout.c:854
#, c-format #, c-format
msgid "invalid reference: %s" msgid "invalid reference: %s"
msgstr "" msgstr ""
#. case (1): want a tree #. case (1): want a tree
#: builtin/checkout.c:892 #: builtin/checkout.c:893
#, c-format #, c-format
msgid "reference is not a tree: %s" msgid "reference is not a tree: %s"
msgstr "" msgstr ""
#: builtin/checkout.c:972 #: builtin/checkout.c:973
msgid "-B cannot be used with -b" msgid "-B cannot be used with -b"
msgstr "" msgstr ""
#: builtin/checkout.c:981 #: builtin/checkout.c:982
msgid "--patch is incompatible with all other options" msgid "--patch is incompatible with all other options"
msgstr "" msgstr ""
#: builtin/checkout.c:984 #: builtin/checkout.c:985
msgid "--detach cannot be used with -b/-B/--orphan" msgid "--detach cannot be used with -b/-B/--orphan"
msgstr "" msgstr ""
#: builtin/checkout.c:986 #: builtin/checkout.c:987
msgid "--detach cannot be used with -t" msgid "--detach cannot be used with -t"
msgstr "" msgstr ""
#: builtin/checkout.c:992 #: builtin/checkout.c:993
msgid "--track needs a branch name" msgid "--track needs a branch name"
msgstr "" msgstr ""
#: builtin/checkout.c:999 #: builtin/checkout.c:1000
msgid "Missing branch name; try -b" msgid "Missing branch name; try -b"
msgstr "" msgstr ""
#: builtin/checkout.c:1005 #: builtin/checkout.c:1006
msgid "--orphan and -b|-B are mutually exclusive" msgid "--orphan and -b|-B are mutually exclusive"
msgstr "" msgstr ""
#: builtin/checkout.c:1007 #: builtin/checkout.c:1008
msgid "--orphan cannot be used with -t" msgid "--orphan cannot be used with -t"
msgstr "" msgstr ""
#: builtin/checkout.c:1017 #: builtin/checkout.c:1018
msgid "git checkout: -f and -m are incompatible" msgid "git checkout: -f and -m are incompatible"
msgstr "" msgstr ""
#: builtin/checkout.c:1051 #: builtin/checkout.c:1052
msgid "invalid path specification" msgid "invalid path specification"
msgstr "" msgstr ""
#: builtin/checkout.c:1059 #: builtin/checkout.c:1060
#, 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:1061 #: builtin/checkout.c:1062
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:1066 #: builtin/checkout.c:1067
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:1069 #: builtin/checkout.c:1070
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:1088 #: builtin/checkout.c:1089
msgid "Cannot switch branch to a non-commit." msgid "Cannot switch branch to a non-commit."
msgstr "" msgstr ""
#: builtin/checkout.c:1091 #: builtin/checkout.c:1092
msgid "--ours/--theirs is incompatible with switching branches." msgid "--ours/--theirs is incompatible with switching branches."
msgstr "" msgstr ""
@ -1874,28 +1874,24 @@ msgstr ""
msgid "Invalid %s: '%s'" msgid "Invalid %s: '%s'"
msgstr "" msgstr ""
#: builtin/gc.c:78 #: builtin/gc.c:90
msgid "Too many options specified"
msgstr ""
#: builtin/gc.c:103
#, c-format #, c-format
msgid "insanely long object directory %.*s" msgid "insanely long object directory %.*s"
msgstr "" msgstr ""
#: builtin/gc.c:223 #: builtin/gc.c:221
#, c-format #, c-format
msgid "Auto packing the repository for optimum performance.\n" msgid "Auto packing the repository for optimum performance.\n"
msgstr "" msgstr ""
#: builtin/gc.c:226 #: builtin/gc.c:224
#, c-format #, c-format
msgid "" msgid ""
"Auto packing the repository for optimum performance. You may also\n" "Auto packing the repository for optimum performance. You may also\n"
"run \"git gc\" manually. See \"git help gc\" for more information.\n" "run \"git gc\" manually. See \"git help gc\" for more information.\n"
msgstr "" msgstr ""
#: builtin/gc.c:256 #: builtin/gc.c:251
msgid "" 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 ""
@ -2673,35 +2669,35 @@ msgstr ""
msgid "Unknown subcommand: %s" msgid "Unknown subcommand: %s"
msgstr "" msgstr ""
#: builtin/pack-objects.c:2310 #: builtin/pack-objects.c:2315
#, c-format #, c-format
msgid "unsupported index version %s" msgid "unsupported index version %s"
msgstr "" msgstr ""
#: builtin/pack-objects.c:2314 #: builtin/pack-objects.c:2319
#, c-format #, c-format
msgid "bad index version '%s'" msgid "bad index version '%s'"
msgstr "" msgstr ""
#: builtin/pack-objects.c:2322 #: builtin/pack-objects.c:2342
#, c-format #, c-format
msgid "option %s does not accept negative form" msgid "option %s does not accept negative form"
msgstr "" msgstr ""
#: builtin/pack-objects.c:2326 #: builtin/pack-objects.c:2346
#, c-format #, c-format
msgid "unable to parse value '%s' for option %s" msgid "unable to parse value '%s' for option %s"
msgstr "" msgstr ""
#: builtin/push.c:44 #: builtin/push.c:45
msgid "tag shorthand without <tag>" msgid "tag shorthand without <tag>"
msgstr "" msgstr ""
#: builtin/push.c:63 #: builtin/push.c:64
msgid "--delete only accepts plain target ref names" msgid "--delete only accepts plain target ref names"
msgstr "" msgstr ""
#: builtin/push.c:83 #: builtin/push.c:84
#, c-format #, c-format
msgid "" msgid ""
"You are not currently on a branch.\n" "You are not currently on a branch.\n"
@ -2711,7 +2707,7 @@ msgid ""
" git push %s HEAD:<name-of-remote-branch>\n" " git push %s HEAD:<name-of-remote-branch>\n"
msgstr "" msgstr ""
#: builtin/push.c:90 #: builtin/push.c:91
#, c-format #, c-format
msgid "" msgid ""
"The current branch %s has no upstream branch.\n" "The current branch %s has no upstream branch.\n"
@ -2720,12 +2716,12 @@ msgid ""
" git push --set-upstream %s %s\n" " git push --set-upstream %s %s\n"
msgstr "" msgstr ""
#: builtin/push.c:98 #: builtin/push.c:99
#, c-format #, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push." msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "" msgstr ""
#: builtin/push.c:101 #: builtin/push.c:102
#, c-format #, c-format
msgid "" msgid ""
"You are pushing to remote '%s', which is not the upstream of\n" "You are pushing to remote '%s', which is not the upstream of\n"
@ -2733,35 +2729,51 @@ msgid ""
"to update which remote branch." "to update which remote branch."
msgstr "" msgstr ""
#: builtin/push.c:127 #: builtin/push.c:131
msgid "" msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"." "You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "" msgstr ""
#: builtin/push.c:147 #: builtin/push.c:138
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:144
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. If you did not intend to push that branch, you may want to\n"
"specify branches to push or set the 'push.default' configuration\n"
"variable to 'current' or 'upstream' to push only the current branch."
msgstr ""
#: builtin/push.c:150
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and merge the remote changes\n"
"(e.g. 'git pull') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
#: builtin/push.c:190
#, c-format #, c-format
msgid "Pushing to %s\n" msgid "Pushing to %s\n"
msgstr "" msgstr ""
#: builtin/push.c:151 #: builtin/push.c:194
#, c-format #, c-format
msgid "failed to push some refs to '%s'" msgid "failed to push some refs to '%s'"
msgstr "" msgstr ""
#: builtin/push.c:159 #: builtin/push.c:226
#, c-format
msgid ""
"To prevent you from losing history, non-fast-forward updates were rejected\n"
"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
"'Note about fast-forwards' section of 'git push --help' for details.\n"
msgstr ""
#: builtin/push.c:176
#, c-format #, c-format
msgid "bad repository '%s'" msgid "bad repository '%s'"
msgstr "" msgstr ""
#: builtin/push.c:177 #: builtin/push.c:227
msgid "" msgid ""
"No configured push destination.\n" "No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote " "Either specify the URL from the command-line or configure a remote "
@ -2774,31 +2786,31 @@ msgid ""
" git push <name>\n" " git push <name>\n"
msgstr "" msgstr ""
#: builtin/push.c:192 #: builtin/push.c:242
msgid "--all and --tags are incompatible" msgid "--all and --tags are incompatible"
msgstr "" msgstr ""
#: builtin/push.c:193 #: builtin/push.c:243
msgid "--all can't be combined with refspecs" msgid "--all can't be combined with refspecs"
msgstr "" msgstr ""
#: builtin/push.c:198 #: builtin/push.c:248
msgid "--mirror and --tags are incompatible" msgid "--mirror and --tags are incompatible"
msgstr "" msgstr ""
#: builtin/push.c:199 #: builtin/push.c:249
msgid "--mirror can't be combined with refspecs" msgid "--mirror can't be combined with refspecs"
msgstr "" msgstr ""
#: builtin/push.c:204 #: builtin/push.c:254
msgid "--all and --mirror are incompatible" msgid "--all and --mirror are incompatible"
msgstr "" msgstr ""
#: builtin/push.c:284 #: builtin/push.c:334
msgid "--delete is incompatible with --all, --mirror and --tags" msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "" msgstr ""
#: builtin/push.c:286 #: builtin/push.c:336
msgid "--delete doesn't make sense without any refs" msgid "--delete doesn't make sense without any refs"
msgstr "" msgstr ""
@ -2881,20 +2893,20 @@ msgstr ""
msgid "Could not reset index file to revision '%s'." msgid "Could not reset index file to revision '%s'."
msgstr "" msgstr ""
#: builtin/revert.c:70 builtin/revert.c:91 #: builtin/revert.c:70 builtin/revert.c:92
#, c-format #, c-format
msgid "%s: %s cannot be used with %s" msgid "%s: %s cannot be used with %s"
msgstr "" msgstr ""
#: builtin/revert.c:126 #: builtin/revert.c:127
msgid "program error" msgid "program error"
msgstr "" msgstr ""
#: builtin/revert.c:212 #: builtin/revert.c:213
msgid "revert failed" msgid "revert failed"
msgstr "" msgstr ""
#: builtin/revert.c:227 #: builtin/revert.c:228
msgid "cherry-pick failed" msgid "cherry-pick failed"
msgstr "" msgstr ""
@ -3377,146 +3389,146 @@ msgstr ""
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "" msgstr ""
#: git-submodule.sh:247 #: git-submodule.sh:248
#, sh-format #, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "" msgstr ""
#: git-submodule.sh:264 #: git-submodule.sh:265
#, sh-format #, sh-format
msgid "'$path' already exists in the index" msgid "'$path' already exists in the index"
msgstr "" msgstr ""
#: git-submodule.sh:281 #: git-submodule.sh:282
#, sh-format #, sh-format
msgid "'$path' already exists and is not a valid git repo" msgid "'$path' already exists and is not a valid git repo"
msgstr "" msgstr ""
#: git-submodule.sh:295 #: git-submodule.sh:296
#, sh-format #, sh-format
msgid "Unable to checkout submodule '$path'" msgid "Unable to checkout submodule '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:300 #: git-submodule.sh:301
#, sh-format #, sh-format
msgid "Failed to add submodule '$path'" msgid "Failed to add submodule '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:305 #: git-submodule.sh:306
#, sh-format #, sh-format
msgid "Failed to register submodule '$path'" msgid "Failed to register submodule '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:347 #: git-submodule.sh:348
#, sh-format #, sh-format
msgid "Entering '$prefix$path'" msgid "Entering '$prefix$path'"
msgstr "" msgstr ""
#: git-submodule.sh:359 #: git-submodule.sh:360
#, sh-format #, sh-format
msgid "Stopping at '$path'; script returned non-zero status." msgid "Stopping at '$path'; script returned non-zero status."
msgstr "" msgstr ""
#: git-submodule.sh:401 #: git-submodule.sh:402
#, sh-format #, sh-format
msgid "No url found for submodule path '$path' in .gitmodules" msgid "No url found for submodule path '$path' in .gitmodules"
msgstr "" msgstr ""
#: git-submodule.sh:410 #: git-submodule.sh:411
#, sh-format #, sh-format
msgid "Failed to register url for submodule path '$path'" msgid "Failed to register url for submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:418 #: git-submodule.sh:419
#, sh-format #, sh-format
msgid "Failed to register update mode for submodule path '$path'" msgid "Failed to register update mode for submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:420 #: git-submodule.sh:421
#, sh-format #, sh-format
msgid "Submodule '$name' ($url) registered for path '$path'" msgid "Submodule '$name' ($url) registered for path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:519 #: git-submodule.sh:520
#, sh-format #, sh-format
msgid "" msgid ""
"Submodule path '$path' not initialized\n" "Submodule path '$path' not initialized\n"
"Maybe you want to use 'update --init'?" "Maybe you want to use 'update --init'?"
msgstr "" msgstr ""
#: git-submodule.sh:532 #: git-submodule.sh:533
#, sh-format #, sh-format
msgid "Unable to find current revision in submodule path '$path'" msgid "Unable to find current revision in submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:551 #: git-submodule.sh:552
#, sh-format #, sh-format
msgid "Unable to fetch in submodule path '$path'" msgid "Unable to fetch in submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:565 #: git-submodule.sh:566
#, sh-format #, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$path'" msgid "Unable to rebase '$sha1' in submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:566 #: git-submodule.sh:567
#, sh-format #, sh-format
msgid "Submodule path '$path': rebased into '$sha1'" msgid "Submodule path '$path': rebased into '$sha1'"
msgstr "" msgstr ""
#: git-submodule.sh:571 #: git-submodule.sh:572
#, sh-format #, sh-format
msgid "Unable to merge '$sha1' in submodule path '$path'" msgid "Unable to merge '$sha1' in submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:572 #: git-submodule.sh:573
#, sh-format #, sh-format
msgid "Submodule path '$path': merged in '$sha1'" msgid "Submodule path '$path': merged in '$sha1'"
msgstr "" msgstr ""
#: git-submodule.sh:577 #: git-submodule.sh:578
#, sh-format #, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$path'" msgid "Unable to checkout '$sha1' in submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:578 #: git-submodule.sh:579
#, sh-format #, sh-format
msgid "Submodule path '$path': checked out '$sha1'" msgid "Submodule path '$path': checked out '$sha1'"
msgstr "" msgstr ""
#: git-submodule.sh:600 git-submodule.sh:923 #: git-submodule.sh:601 git-submodule.sh:924
#, sh-format #, sh-format
msgid "Failed to recurse into submodule path '$path'" msgid "Failed to recurse into submodule path '$path'"
msgstr "" msgstr ""
#: git-submodule.sh:708 #: git-submodule.sh:709
msgid "--" msgid "--"
msgstr "" msgstr ""
#: git-submodule.sh:766 #: git-submodule.sh:767
#, sh-format #, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src" msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr "" msgstr ""
#: git-submodule.sh:769 #: git-submodule.sh:770
#, sh-format #, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst" msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr "" msgstr ""
#: git-submodule.sh:772 #: git-submodule.sh:773
#, sh-format #, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr "" msgstr ""
#: git-submodule.sh:797 #: git-submodule.sh:798
msgid "blob" msgid "blob"
msgstr "" msgstr ""
#: git-submodule.sh:798 #: git-submodule.sh:799
msgid "submodule" msgid "submodule"
msgstr "" msgstr ""
#: git-submodule.sh:969 #: git-submodule.sh:970
#, sh-format #, sh-format
msgid "Synchronizing submodule url for '$name'" msgid "Synchronizing submodule url for '$name'"
msgstr "" msgstr ""