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

l10n: Update git.pot (1 new messages)

Browse Source 
Changes of po/git.pot from v1.7.10.1 to v1.7.10.1-36-g42325:

 * 1 new l10n message at line: 1761

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Jiang Xin 2012-05-08 15:49:57 +08:00
parent 42325fb2e0
commit 7795e424c6
1 changed files with 98 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
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-04-28 20:33+0800\n" "POT-Creation-Date: 2012-05-08 15:45+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"
@ -172,14 +172,14 @@ msgid_plural ""
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 #: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
#: builtin/merge.c:1095 builtin/merge.c:1105 #: builtin/merge.c:1088 builtin/merge.c:1098
#, c-format #, c-format
msgid "Could not open '%s' for writing" msgid "Could not open '%s' for writing"
msgstr "" msgstr ""
#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 #: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
#: builtin/merge.c:1097 builtin/merge.c:1110 #: builtin/merge.c:1090 builtin/merge.c:1103
#, c-format #, c-format
msgid "Could not write to '%s'" msgid "Could not write to '%s'"
msgstr "" msgstr ""
@ -271,7 +271,7 @@ msgid "could not apply %s... %s"
msgstr "" msgstr ""
#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 #: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 #: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347
#: builtin/shortlog.c:181 #: builtin/shortlog.c:181
msgid "revision walk setup failed" msgid "revision walk setup failed"
msgstr "" msgstr ""
@ -962,7 +962,7 @@ msgid "path '%s' is unmerged"
msgstr "" msgstr ""
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
#: builtin/merge.c:811 #: builtin/merge.c:812
msgid "unable to write new index file" msgid "unable to write new index file"
msgstr "" msgstr ""
@ -1587,7 +1587,7 @@ msgstr ""
msgid "Aborting commit due to empty commit message.\n" msgid "Aborting commit due to empty commit message.\n"
msgstr "" msgstr ""
#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968 #: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object" msgid "failed to write commit object"
msgstr "" msgstr ""
@ -1722,146 +1722,150 @@ msgstr ""
msgid "Couldn't find remote ref HEAD" msgid "Couldn't find remote ref HEAD"
msgstr "" msgstr ""
#: builtin/fetch.c:252 #: builtin/fetch.c:253
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "" msgstr ""
#: builtin/fetch.c:258 #: builtin/fetch.c:259
msgid "[up to date]" msgid "[up to date]"
msgstr "" msgstr ""
#: builtin/fetch.c:272 #: builtin/fetch.c:273
#, c-format #, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "" msgstr ""
#: builtin/fetch.c:273 builtin/fetch.c:351 #: builtin/fetch.c:274 builtin/fetch.c:360
msgid "[rejected]" msgid "[rejected]"
msgstr "" msgstr ""
#: builtin/fetch.c:284 #: builtin/fetch.c:285
msgid "[tag update]" msgid "[tag update]"
msgstr "" msgstr ""
#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
msgid " (unable to update local ref)" msgid " (unable to update local ref)"
msgstr "" msgstr ""
#: builtin/fetch.c:298 #: builtin/fetch.c:305
msgid "[new tag]" msgid "[new tag]"
msgstr "" msgstr ""
#: builtin/fetch.c:302 #: builtin/fetch.c:308
msgid "[new branch]" msgid "[new branch]"
msgstr "" msgstr ""
#: builtin/fetch.c:347 #: builtin/fetch.c:311
msgid "[new ref]"
msgstr ""
#: builtin/fetch.c:356
msgid "unable to update local ref" msgid "unable to update local ref"
msgstr "" msgstr ""
#: builtin/fetch.c:347 #: builtin/fetch.c:356
msgid "forced update" msgid "forced update"
msgstr "" msgstr ""
#: builtin/fetch.c:353 #: builtin/fetch.c:362
msgid "(non-fast-forward)" msgid "(non-fast-forward)"
msgstr "" msgstr ""
#: builtin/fetch.c:384 builtin/fetch.c:676 #: builtin/fetch.c:393 builtin/fetch.c:685
#, c-format #, c-format
msgid "cannot open %s: %s\n" msgid "cannot open %s: %s\n"
msgstr "" msgstr ""
#: builtin/fetch.c:393 #: builtin/fetch.c:402
#, c-format #, c-format
msgid "%s did not send all necessary objects\n" msgid "%s did not send all necessary objects\n"
msgstr "" msgstr ""
#: builtin/fetch.c:479 #: builtin/fetch.c:488
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "" msgstr ""
#: builtin/fetch.c:490 #: builtin/fetch.c:499
#, c-format #, c-format
msgid "" msgid ""
"some local refs could not be updated; try running\n" "some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches" " 'git remote prune %s' to remove any old, conflicting branches"
msgstr "" msgstr ""
#: builtin/fetch.c:540 #: builtin/fetch.c:549
#, c-format #, c-format
msgid " (%s will become dangling)\n" msgid " (%s will become dangling)\n"
msgstr "" msgstr ""
#: builtin/fetch.c:541 #: builtin/fetch.c:550
#, c-format #, c-format
msgid " (%s has become dangling)\n" msgid " (%s has become dangling)\n"
msgstr "" msgstr ""
#: builtin/fetch.c:548 #: builtin/fetch.c:557
msgid "[deleted]" msgid "[deleted]"
msgstr "" msgstr ""
#: builtin/fetch.c:549 #: builtin/fetch.c:558
msgid "(none)" msgid "(none)"
msgstr "" msgstr ""
#: builtin/fetch.c:666 #: builtin/fetch.c:675
#, c-format #, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository" msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "" msgstr ""
#: builtin/fetch.c:700 #: builtin/fetch.c:709
#, c-format #, c-format
msgid "Don't know how to fetch from %s" msgid "Don't know how to fetch from %s"
msgstr "" msgstr ""
#: builtin/fetch.c:777 #: builtin/fetch.c:786
#, c-format #, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s" msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "" msgstr ""
#: builtin/fetch.c:780 #: builtin/fetch.c:789
#, c-format #, c-format
msgid "Option \"%s\" is ignored for %s\n" msgid "Option \"%s\" is ignored for %s\n"
msgstr "" msgstr ""
#: builtin/fetch.c:879 #: builtin/fetch.c:888
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "" msgstr ""
#: builtin/fetch.c:881 #: builtin/fetch.c:890
#, c-format #, c-format
msgid "Could not fetch %s" msgid "Could not fetch %s"
msgstr "" msgstr ""
#: builtin/fetch.c:898 #: builtin/fetch.c:907
msgid "" msgid ""
"No remote repository specified. Please, specify either a URL or a\n" "No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched." "remote name from which new revisions should be fetched."
msgstr "" msgstr ""
#: builtin/fetch.c:918 #: builtin/fetch.c:927
msgid "You need to specify a tag name." msgid "You need to specify a tag name."
msgstr "" msgstr ""
#: builtin/fetch.c:970 #: builtin/fetch.c:979
msgid "fetch --all does not take a repository argument" msgid "fetch --all does not take a repository argument"
msgstr "" msgstr ""
#: builtin/fetch.c:972 #: builtin/fetch.c:981
msgid "fetch --all does not make sense with refspecs" msgid "fetch --all does not make sense with refspecs"
msgstr "" msgstr ""
#: builtin/fetch.c:983 #: builtin/fetch.c:992
#, c-format #, c-format
msgid "No such remote or remote group: %s" msgid "No such remote or remote group: %s"
msgstr "" msgstr ""
#: builtin/fetch.c:991 #: builtin/fetch.c:1000
msgid "Fetching a group and specifying refspecs does not make sense" msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "" msgstr ""
@ -2204,56 +2208,56 @@ msgstr ""
msgid "Unknown commit %s" msgid "Unknown commit %s"
msgstr "" msgstr ""
#: builtin/merge.c:91 #: builtin/merge.c:90
msgid "switch `m' requires a value" msgid "switch `m' requires a value"
msgstr "" msgstr ""
#: builtin/merge.c:128 #: builtin/merge.c:127
#, c-format #, c-format
msgid "Could not find merge strategy '%s'.\n" msgid "Could not find merge strategy '%s'.\n"
msgstr "" msgstr ""
#: builtin/merge.c:129 #: builtin/merge.c:128
#, c-format #, c-format
msgid "Available strategies are:" msgid "Available strategies are:"
msgstr "" msgstr ""
#: builtin/merge.c:134 #: builtin/merge.c:133
#, c-format #, c-format
msgid "Available custom strategies are:" msgid "Available custom strategies are:"
msgstr "" msgstr ""
#: builtin/merge.c:241 #: builtin/merge.c:240
msgid "could not run stash." msgid "could not run stash."
msgstr "" msgstr ""
#: builtin/merge.c:246 #: builtin/merge.c:245
msgid "stash failed" msgid "stash failed"
msgstr "" msgstr ""
#: builtin/merge.c:251 #: builtin/merge.c:250
#, c-format #, c-format
msgid "not a valid object: %s" msgid "not a valid object: %s"
msgstr "" msgstr ""
#: builtin/merge.c:270 builtin/merge.c:287 #: builtin/merge.c:269 builtin/merge.c:286
msgid "read-tree failed" msgid "read-tree failed"
msgstr "" msgstr ""
#: builtin/merge.c:317 #: builtin/merge.c:316
msgid " (nothing to squash)" msgid " (nothing to squash)"
msgstr "" msgstr ""
#: builtin/merge.c:330 #: builtin/merge.c:329
#, c-format #, c-format
msgid "Squash commit -- not updating HEAD\n" msgid "Squash commit -- not updating HEAD\n"
msgstr "" msgstr ""
#: builtin/merge.c:362 #: builtin/merge.c:361
msgid "Writing SQUASH_MSG" msgid "Writing SQUASH_MSG"
msgstr "" msgstr ""
#: builtin/merge.c:364 #: builtin/merge.c:363
msgid "Finishing SQUASH_MSG" msgid "Finishing SQUASH_MSG"
msgstr "" msgstr ""
@ -2280,35 +2284,35 @@ msgstr ""
msgid "failed to read the cache" msgid "failed to read the cache"
msgstr "" msgstr ""
#: builtin/merge.c:696 #: builtin/merge.c:697
msgid "Unable to write index." msgid "Unable to write index."
msgstr "" msgstr ""
#: builtin/merge.c:709 #: builtin/merge.c:710
msgid "Not handling anything other than two heads merge." msgid "Not handling anything other than two heads merge."
msgstr "" msgstr ""
#: builtin/merge.c:723 #: builtin/merge.c:724
#, c-format #, c-format
msgid "Unknown option for merge-recursive: -X%s" msgid "Unknown option for merge-recursive: -X%s"
msgstr "" msgstr ""
#: builtin/merge.c:737 #: builtin/merge.c:738
#, c-format #, c-format
msgid "unable to write %s" msgid "unable to write %s"
msgstr "" msgstr ""
#: builtin/merge.c:876 #: builtin/merge.c:877
#, c-format #, c-format
msgid "Could not read from '%s'" msgid "Could not read from '%s'"
msgstr "" msgstr ""
#: builtin/merge.c:885 #: builtin/merge.c:886
#, c-format #, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "" msgstr ""
#: builtin/merge.c:891 #: builtin/merge.c:892
msgid "" msgid ""
"Please enter a commit message to explain why this merge is necessary,\n" "Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n" "especially if it merges an updated upstream into a topic branch.\n"
@ -2317,140 +2321,140 @@ msgid ""
"the commit.\n" "the commit.\n"
msgstr "" msgstr ""
#: builtin/merge.c:915 #: builtin/merge.c:916
msgid "Empty commit message." msgid "Empty commit message."
msgstr "" msgstr ""
#: builtin/merge.c:927 #: builtin/merge.c:928
#, c-format #, c-format
msgid "Wonderful.\n" msgid "Wonderful.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1000 #: builtin/merge.c:993
#, c-format #, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1016 #: builtin/merge.c:1009
#, c-format #, c-format
msgid "'%s' is not a commit" msgid "'%s' is not a commit"
msgstr "" msgstr ""
#: builtin/merge.c:1057 #: builtin/merge.c:1050
msgid "No current branch." msgid "No current branch."
msgstr "" msgstr ""
#: builtin/merge.c:1059 #: builtin/merge.c:1052
msgid "No remote for the current branch." msgid "No remote for the current branch."
msgstr "" msgstr ""
#: builtin/merge.c:1061 #: builtin/merge.c:1054
msgid "No default upstream defined for the current branch." msgid "No default upstream defined for the current branch."
msgstr "" msgstr ""
#: builtin/merge.c:1066 #: builtin/merge.c:1059
#, c-format #, c-format
msgid "No remote tracking branch for %s from %s" msgid "No remote tracking branch for %s from %s"
msgstr "" msgstr ""
#: builtin/merge.c:1188 #: builtin/merge.c:1146 builtin/merge.c:1303
#, c-format
msgid "%s - not something we can merge"
msgstr ""
#: builtin/merge.c:1214
msgid "There is no merge to abort (MERGE_HEAD missing)." msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "" msgstr ""
#: builtin/merge.c:1204 git-pull.sh:31 #: builtin/merge.c:1230 git-pull.sh:31
msgid "" msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n" "You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge." "Please, commit your changes before you can merge."
msgstr "" msgstr ""
#: builtin/merge.c:1207 git-pull.sh:34 #: builtin/merge.c:1233 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)." msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "" msgstr ""
#: builtin/merge.c:1211 #: builtin/merge.c:1237
msgid "" msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge." "Please, commit your changes before you can merge."
msgstr "" msgstr ""
#: builtin/merge.c:1214 #: builtin/merge.c:1240
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "" msgstr ""
#: builtin/merge.c:1223 #: builtin/merge.c:1249
msgid "You cannot combine --squash with --no-ff." msgid "You cannot combine --squash with --no-ff."
msgstr "" msgstr ""
#: builtin/merge.c:1228 #: builtin/merge.c:1254
msgid "You cannot combine --no-ff with --ff-only." msgid "You cannot combine --no-ff with --ff-only."
msgstr "" msgstr ""
#: builtin/merge.c:1235 #: builtin/merge.c:1261
msgid "No commit specified and merge.defaultToUpstream not set." msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "" msgstr ""
#: builtin/merge.c:1266 #: builtin/merge.c:1293
msgid "Can merge only exactly one commit into empty head" msgid "Can merge only exactly one commit into empty head"
msgstr "" msgstr ""
#: builtin/merge.c:1269 #: builtin/merge.c:1296
msgid "Squash commit into empty head not supported yet" msgid "Squash commit into empty head not supported yet"
msgstr "" msgstr ""
#: builtin/merge.c:1271 #: builtin/merge.c:1298
msgid "Non-fast-forward commit does not make sense into an empty head" msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "" msgstr ""
#: builtin/merge.c:1275 builtin/merge.c:1319 #: builtin/merge.c:1413
#, c-format
msgid "%s - not something we can merge"
msgstr ""
#: builtin/merge.c:1382
#, c-format #, c-format
msgid "Updating %s..%s\n" msgid "Updating %s..%s\n"
msgstr "" msgstr ""
#: builtin/merge.c:1420 #: builtin/merge.c:1451
#, 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:1458
#, c-format #, c-format
msgid "Nope.\n" msgid "Nope.\n"
msgstr "" msgstr ""
#: builtin/merge.c:1459 #: builtin/merge.c:1490
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:1513 builtin/merge.c:1592
#, 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:1517
#, 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:1583
#, 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:1585
#, 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:1594
#, 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:1606
#, 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 ""
@ -2886,11 +2890,11 @@ msgstr ""
msgid "program error" msgid "program error"
msgstr "" msgstr ""
#: builtin/revert.c:209 #: builtin/revert.c:212
msgid "revert failed" msgid "revert failed"
msgstr "" msgstr ""
#: builtin/revert.c:224 #: builtin/revert.c:227
msgid "cherry-pick failed" msgid "cherry-pick failed"
msgstr "" msgstr ""