Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

提交 0b9f4b63 编写于 作者: J Junio C Hamano
浏览文件
操作

Merge branch 'maint' of git://github.com/git-l10n/git-po into maint 

By Ralf Thielow (6) and others
via Jiang Xin
* 'maint' of git://github.com/git-l10n/git-po:
  l10n: zh_CN.po: translate 1 new message
  l10n: de.po: translate one new message
  l10n: de.po: unify translation of "ahead" and "behind"
  l10n: de.po: collection of improvements
  l10n: de.po: translate "remote" as "extern"
  l10n: de.po: translate "track" as "beobachten"
  l10n: add new members to German translation team
  l10n: de.po: collection of suggestions
  l10n: de.po: translate "bad" as "ungültig" ("invalid")
  l10n: de.po: hopefully uncontroversial fixes
  l10n: de.po: translate "bare" as "bloß"
  l10n: Update git.pot (1 new messages)
上级 5bed9f6a 2f64542f
展开全部 隐藏空白更改
内联 并排
Showing with 538 addition and 515 deletion
po/TEAMS
浏览文件 @ 0b9f4b63
...@@ -8,6 +8,9 @@ Leader: Byrial Jensen <byrial@vip.cybercity.dk> ...@@ -8,6 +8,9 @@ Leader: Byrial Jensen <byrial@vip.cybercity.dk>
Language: de (German) Language: de (German)
Repository: https://github.com/ralfth/git-po-de Repository: https://github.com/ralfth/git-po-de
Leader: Ralf Thielow <ralf.thielow@googlemail.com> Leader: Ralf Thielow <ralf.thielow@googlemail.com>
Members: Thomas Rast <trast@student.ethz.ch>
Jan Krüger <jk@jk.gs>
Christian Stimming <stimming@tuhh.de>
Language: is (Icelandic) Language: is (Icelandic)
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
......
po/de.po
浏览文件 @ 0b9f4b63
此差异已折叠。
po/git.pot
浏览文件 @ 0b9f4b63
...@@ -8,7 +8,7 @@ msgid "" ...@@ -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 "" ...@@ -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" ...@@ -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" ...@@ -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 "" ...@@ -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 "" ...@@ -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 "" ...@@ -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 "" ...@@ -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 "" ...@@ -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 "" ...@@ -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 ""
......
po/zh_CN.po
浏览文件 @ 0b9f4b63
...@@ -12,7 +12,7 @@ msgid "" ...@@ -12,7 +12,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Git\n" "Project-Id-Version: Git\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: 2012-01-30 00:00+0800\n" "PO-Revision-Date: 2012-01-30 00:00+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
...@@ -183,14 +183,14 @@ msgstr[0] "" ...@@ -183,14 +183,14 @@ msgstr[0] ""
"您的分支和 '%s' 出现了偏离，\n" "您的分支和 '%s' 出现了偏离，\n"
"并且各自分别有 %d 和 %d 处不同的提交。\n" "并且各自分别有 %d 和 %d 处不同的提交。\n"
#: 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 "不能为写入打开 '%s'" msgstr "不能为写入打开 '%s'"
#: 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 "不能写入 '%s'" msgstr "不能写入 '%s'"
...@@ -286,7 +286,7 @@ msgid "could not apply %s... %s" ...@@ -286,7 +286,7 @@ msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s" msgstr "不能应用 %s... %s"
#: 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 "版本遍历设置失败"
...@@ -1018,7 +1018,7 @@ msgid "path '%s' is unmerged" ...@@ -1018,7 +1018,7 @@ msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并" msgstr "路径 '%s' 未合并"
#: 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 "无法写新的索引文件"
...@@ -1691,7 +1691,7 @@ msgstr "终止提交；您未更改来自模版的提交说明。\n" ...@@ -1691,7 +1691,7 @@ msgstr "终止提交；您未更改来自模版的提交说明。\n"
msgid "Aborting commit due to empty commit message.\n" msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n" msgstr "终止提交因为提交说明为空。\n"
#: 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 "无法写提交对象"
...@@ -1834,69 +1834,73 @@ msgstr "提供了无法处理的对象 '%s'。" ...@@ -1834,69 +1834,73 @@ msgstr "提供了无法处理的对象 '%s'。"
msgid "Couldn't find remote ref HEAD" msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用" msgstr "无法发现远程 HEAD 引用"
#: builtin/fetch.c:252 #: builtin/fetch.c:253
#, c-format #, c-format
msgid "object %s not found" msgid "object %s not found"
msgstr "对象 %s 未发现" msgstr "对象 %s 未发现"
#: 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 "! %-*s %-*s -> %s （在当前分支下不能获取）" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
#: 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 "[tag更新]" msgstr "[tag更新]"
# 译者：注意保持前导空格 # 译者：注意保持前导空格
#: 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 "[新tag]" msgstr "[新tag]"
#: 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 "无法打开 %s：%s\n" msgstr "无法打开 %s：%s\n"
#: 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 "%s 未发送所有必须的对象\n" msgstr "%s 未发送所有必须的对象\n"
#: builtin/fetch.c:479 #: builtin/fetch.c:488
#, c-format #, c-format
msgid "From %.*s\n" msgid "From %.*s\n"
msgstr "来自 %.*s\n" msgstr "来自 %.*s\n"
#: 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"
...@@ -1906,79 +1910,79 @@ msgstr "" ...@@ -1906,79 +1910,79 @@ msgstr ""
" 'git remote prune %s' 来删除旧的、有冲突的分支" " 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格 # 译者：注意保持前导空格
#: 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 " （%s 将成为悬空状态）\n" msgstr " （%s 将成为悬空状态）\n"
# 译者：注意保持前导空格 # 译者：注意保持前导空格
#: 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 " （%s 已成为悬空状态）\n" msgstr " （%s 已成为悬空状态）\n"
#: 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 "拒绝获取到非裸版本库的当前分支 %s" msgstr "拒绝获取到非裸版本库的当前分支 %s"
#: 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 "不知道如何从 %s 获取" msgstr "不知道如何从 %s 获取"
#: 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 "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
#: 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 "选项 \"%s\" 对于 %s 被忽略\n" msgstr "选项 \"%s\" 对于 %s 被忽略\n"
#: builtin/fetch.c:879 #: builtin/fetch.c:888
#, c-format #, c-format
msgid "Fetching %s\n" msgid "Fetching %s\n"
msgstr "正在获取 %s\n" msgstr "正在获取 %s\n"
#: builtin/fetch.c:881 #: builtin/fetch.c:890
#, c-format #, c-format
msgid "Could not fetch %s" msgid "Could not fetch %s"
msgstr "不能获取 %s" msgstr "不能获取 %s"
#: 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 "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
#: 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 "您需要指定一个 tag 名称。" msgstr "您需要指定一个 tag 名称。"
#: 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 "fetch --all 不能带一个版本库参数" msgstr "fetch --all 不能带一个版本库参数"
#: 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 "fetch --all 带引用表达式没有任何意义" msgstr "fetch --all 带引用表达式没有任何意义"
#: 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 "没有这样的远程或远程组：%s" msgstr "没有这样的远程或远程组：%s"
#: 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 "获取组并指定引用表达式没有意义"
...@@ -2326,57 +2330,57 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" ...@@ -2326,57 +2330,57 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
msgid "Unknown commit %s" msgid "Unknown commit %s"
msgstr "未知提交 %s" msgstr "未知提交 %s"
#: builtin/merge.c:91 #: builtin/merge.c:90
msgid "switch `m' requires a value" msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值" msgstr "开关 `m' 需要一个值"
#: 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 "不能找到合并策略 '%s'。\n" msgstr "不能找到合并策略 '%s'。\n"
#: 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 "不是一个有效对象：%s" msgstr "不是一个有效对象：%s"
#: 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 "压缩提交 -- 未更新 HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n"
#: builtin/merge.c:362 #: builtin/merge.c:361
msgid "Writing SQUASH_MSG" msgid "Writing SQUASH_MSG"
msgstr "写入 SQUASH_MSG" msgstr "写入 SQUASH_MSG"
#: builtin/merge.c:364 #: builtin/merge.c:363
msgid "Finishing SQUASH_MSG" msgid "Finishing SQUASH_MSG"
msgstr "完成 SQUASH_MSG" msgstr "完成 SQUASH_MSG"
...@@ -2403,35 +2407,35 @@ msgstr "git write-tree 无法写入一树对象" ...@@ -2403,35 +2407,35 @@ msgstr "git write-tree 无法写入一树对象"
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 "merge-recursive 的未知选项：-X%s" msgstr "merge-recursive 的未知选项：-X%s"
#: builtin/merge.c:737 #: builtin/merge.c:738
#, c-format #, c-format
msgid "unable to write %s" msgid "unable to write %s"
msgstr "不能写 %s" msgstr "不能写 %s"
#: 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 "不能从 '%s' 读取" msgstr "不能从 '%s' 读取"
#: 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 "未提交合并，使用 'git commit' 完成此次合并。\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
#: 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"
...@@ -2444,47 +2448,52 @@ msgstr "" ...@@ -2444,47 +2448,52 @@ msgstr ""
"\n" "\n"
"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n" "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
#: 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 "太棒了。\n" msgstr "太棒了。\n"
#: 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 "自动合并失败，修正冲突然后提交修正的结果。\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
#: 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 "'%s' 不是一个提交" msgstr "'%s' 不是一个提交"
#: 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 "%s 没有来自 %s 的远程跟踪分支" msgstr "%s 没有来自 %s 的远程跟踪分支"
#: builtin/merge.c:1188 #: builtin/merge.c:1146 builtin/merge.c:1303
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
#: 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 "没有要终止的合并（MERGE_HEAD 丢失）。" msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
#: 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."
...@@ -2492,11 +2501,11 @@ msgstr "" ...@@ -2492,11 +2501,11 @@ msgstr ""
"您尚未结束您的合并（存在 MERGE_HEAD）。\n" "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。" "请在合并前先提交您的修改。"
#: 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 "您尚未结束您的合并（存在 MERGE_HEAD）。" msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
#: 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."
...@@ -2504,84 +2513,79 @@ msgstr "" ...@@ -2504,84 +2513,79 @@ msgstr ""
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。" "请在合并前先提交您的修改。"
#: 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 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
#: 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 "您不能将 --squash 与 --no-ff 共用。" msgstr "您不能将 --squash 与 --no-ff 共用。"
#: 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 "您不能将 --no-ff 与 --ff-only 共用。" msgstr "您不能将 --no-ff 与 --ff-only 共用。"
#: 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 "未指定提交并且 merge.defaultToUpstream 未设置。" msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
#: 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 "%s - 不能被合并"
#: builtin/merge.c:1382
#, c-format #, c-format
msgid "Updating %s..%s\n" msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n" msgstr "更新 %s..%s\n"
#: 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 "尝试非常小的索引内合并...\n" msgstr "尝试非常小的索引内合并...\n"
#: builtin/merge.c:1427 #: builtin/merge.c:1458
#, c-format #, c-format
msgid "Nope.\n" msgid "Nope.\n"
msgstr "无。\n" msgstr "无。\n"
#: 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 "将树回滚至原始状态...\n" msgstr "将树回滚至原始状态...\n"
#: 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 "尝试合并策略 %s...\n" msgstr "尝试合并策略 %s...\n"
#: 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 "没有合并策略处理此合并。\n" msgstr "没有合并策略处理此合并。\n"
#: 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 "使用策略 %s 合并失败。\n" msgstr "使用策略 %s 合并失败。\n"
#: 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 "使用 %s 以准备手工解决。\n" msgstr "使用 %s 以准备手工解决。\n"
#: 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 "自动合并进展顺利，按要求在提交前停止\n" msgstr "自动合并进展顺利，按要求在提交前停止\n"
...@@ -3043,11 +3047,11 @@ msgstr "%s：%s 不能和 %s 共用" ...@@ -3043,11 +3047,11 @@ msgstr "%s：%s 不能和 %s 共用"
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 "拣选失败"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或