l10n: zh_CN.po: translate 27 new messages
Translate 19 new and 8 fuzzy messages which are marked by shell gettext wrappers, and ignored by previous 'git.pot' updates. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Jun 8, 2012 at 12:07 UTC
b694fbb1440976d1aa86f05fd819eb81b0fbc85a
1 file changed
+197
-20
po/zh_CN.po
+197
-20
@@ -12,8 +12,8 @@ msgid ""
12
msgstr ""
13
"Project-Id-Version: Git\n"
14
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15
-"POT-Creation-Date: 2012-06-02 07:03+0800\n"
16
-"PO-Revision-Date: 2012-06-02 17:05+0800\n"
15
+"POT-Creation-Date: 2012-06-08 10:20+0800\n"
16
+"PO-Revision-Date: 2012-06-08 12:24+0800\n"
17
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19
"Language: zh_CN\n"
@@ -4806,6 +4806,28 @@ msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
4806
msgid "You need to set your committer info first"
4807
msgstr "您需要先设置你的提交者信息"
4808
4809
+#: git-am.sh:95
4810
+msgid ""
4811
+"You seem to have moved HEAD since the last 'am' failure.\n"
4812
+"Not rewinding to ORIG_HEAD"
4813
+msgstr ""
4814
+"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4815
+
4816
+#: git-am.sh:105
4817
+#, sh-format
4818
+msgid ""
4819
+"When you have resolved this problem run \"$cmdline --resolved\".\n"
4820
+"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4821
+"To restore the original branch and stop patching run \"$cmdline --abort\"."
4822
+msgstr ""
4823
+"当您解决了此问题后，执行 \"$cmdline --resolved\"。\n"
4824
+"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
4825
+"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
4826
+
4827
+#: git-am.sh:121
4828
+msgid "Cannot fall back to three-way merge."
4829
+msgstr "无法求助于三路合并。"
4830
+
4831
#: git-am.sh:137
4832
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4833
msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
@@ -4820,7 +4842,7 @@ msgstr ""
4842
4843
#: git-am.sh:163
4844
msgid "Falling back to patching base and 3-way merge..."
4823
-msgstr "回退到补丁基础版本并使用三路合并..."
4845
+msgstr "转而在基础版本上打补丁及进行三路合并..."
4846
4847
#: git-am.sh:275
4848
msgid "Only one StGIT patch series can be applied at once"
@@ -4857,10 +4879,29 @@ msgstr "解决操作未进行，我们不会继续。"
4879
msgid "Dirty index: cannot apply patches (dirty: $files)"
4880
msgstr "脏的索引：不能应用补丁（脏文件：$files）"
4881
4882
+#: git-am.sh:671
4883
+#, sh-format
4884
+msgid ""
4885
+"Patch is empty. Was it split wrong?\n"
4886
+"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
4887
+"To restore the original branch and stop patching run \"$cmdline --abort\"."
4888
+msgstr ""
4889
+"补丁为空。是不是切分错误？\n"
4890
+"如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
4891
+"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
4892
+
4893
+#: git-am.sh:708
4894
+msgid "Patch does not have a valid e-mail address."
4895
+msgstr "补丁中没有一个有效的邮件地址。"
4896
+
4897
#: git-am.sh:755
4898
msgid "cannot be interactive without stdin connected to a terminal."
4899
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
4900
4901
+#: git-am.sh:759
4902
+msgid "Commit Body is:"
4903
+msgstr "提交内容为："
4904
+
4905
# 译者：注意保持句尾空格
4906
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4907
#. in your translation. The program will only accept English
@@ -4874,14 +4915,40 @@ msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4915
msgid "Applying: $FIRSTLINE"
4916
msgstr "正应用：$FIRSTLINE"
4917
4918
+#: git-am.sh:823
4919
+msgid ""
4920
+"No changes - did you forget to use 'git add'?\n"
4921
+"If there is nothing left to stage, chances are that something else\n"
4922
+"already introduced the same changes; you might want to skip this patch."
4923
+msgstr ""
4924
+"没有变更 —— 您是不是忘了执行 'git add'？\n"
4925
+"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
4926
+"您也许想要跳过这个补丁。"
4927
+
4928
+#: git-am.sh:831
4929
+msgid ""
4930
+"You still have unmerged paths in your index\n"
4931
+"did you forget to use 'git add'?"
4932
+msgstr ""
4933
+"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
4934
+
4935
#: git-am.sh:847
4936
msgid "No changes -- Patch already applied."
4937
msgstr "没有变更 -- 补丁已经应用过。"
4938
4939
+#: git-am.sh:857
4940
+#, sh-format
4941
+msgid "Patch failed at $msgnum $FIRSTLINE"
4942
+msgstr "补丁失败于 $msgnum $FIRSTLINE"
4943
+
4944
#: git-am.sh:873
4945
msgid "applying to an empty history"
4946
msgstr "正应用到一个空历史上"
4947
4948
+#: git-bisect.sh:48
4949
+msgid "You need to start by \"git bisect start\""
4950
+msgstr "您需要执行 \"git bisect start\" 来开始"
4951
+
4952
# 译者：注意保持句尾空格
4953
#. TRANSLATORS: Make sure to include [Y] and [n] in your
4954
#. translation. The program will only accept English input
@@ -4941,6 +5008,12 @@ msgstr "输入坏的版本：$rev"
5008
msgid "'git bisect bad' can take only one argument."
5009
msgstr "'git bisect bad' 只能带一个参数。"
5010
5011
+#. have bad but not good. we could bisect although
5012
+#. this is less optimum.
5013
+#: git-bisect.sh:273
5014
+msgid "Warning: bisecting only with a bad commit."
5015
+msgstr "警告：在仅有一个坏提交下进行二分查找。"
5016
+
5017
# 译者：注意保持句尾空格
5018
#. TRANSLATORS: Make sure to include [Y] and [n] in your
5019
#. translation. The program will only accept English input
@@ -4949,6 +5022,28 @@ msgstr "'git bisect bad' 只能带一个参数。"
5022
msgid "Are you sure [Y/n]? "
5023
msgstr "您确认么[Y/n]？ "
5024
5025
+#: git-bisect.sh:289
5026
+msgid ""
5027
+"You need to give me at least one good and one bad revisions.\n"
5028
+"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5029
+msgstr ""
5030
+"您需要给我至少一个好版本和一个坏版本。\n"
5031
+"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
5032
+
5033
+#: git-bisect.sh:292
5034
+msgid ""
5035
+"You need to start by \"git bisect start\".\n"
5036
+"You then need to give me at least one good and one bad revisions.\n"
5037
+"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
5038
+msgstr ""
5039
+"您需要执行 \"git bisect start\" 来开始。\n"
5040
+"然后需要提供我至少一个好版本和一个坏版本。\n"
5041
+"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"
5042
+
5043
+#: git-bisect.sh:347 git-bisect.sh:474
5044
+msgid "We are not bisecting."
5045
+msgstr "我们没有在二分查找。"
5046
+
5047
#: git-bisect.sh:354
5048
#, sh-format
5049
msgid "'$invalid' is not a valid commit"
@@ -4976,9 +5071,36 @@ msgstr "不能读取 $file 来重放"
5071
msgid "?? what are you talking about?"
5072
msgstr "?? 您在说什么?"
5073
4979
-#: git-bisect.sh:474
4980
-msgid "We are not bisecting."
4981
-msgstr "我们没有在二分查找。"
5074
+#: git-bisect.sh:420
5075
+#, sh-format
5076
+msgid "running $command"
5077
+msgstr "运行 $command"
5078
+
5079
+#: git-bisect.sh:427
5080
+#, sh-format
5081
+msgid ""
5082
+"bisect run failed:\n"
5083
+"exit code $res from '$command' is < 0 or >= 128"
5084
+msgstr ""
5085
+"二分查找运行失败：\n"
5086
+"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
5087
+
5088
+#: git-bisect.sh:453
5089
+msgid "bisect run cannot continue any more"
5090
+msgstr "二分查找不能继续运行"
5091
+
5092
+#: git-bisect.sh:459
5093
+#, sh-format
5094
+msgid ""
5095
+"bisect run failed:\n"
5096
+"'bisect_state $state' exited with error code $res"
5097
+msgstr ""
5098
+"二分查找运行失败：\n"
5099
+"'bisect_state $state' 退出码为 $res"
5100
+
5101
+#: git-bisect.sh:466
5102
+msgid "bisect run success"
5103
+msgstr "二分查找运行成功"
5104
5105
#: git-pull.sh:21
5106
msgid ""
@@ -4998,6 +5120,20 @@ msgstr "Pull 不可用，因为您尚有未合并的文件。"
5120
msgid "updating an unborn branch with changes added to the index"
5121
msgstr "更新尚未诞生的分支，变更添加至索引"
5122
5123
+#. The fetch involved updating the current branch.
5124
+#. The working tree and the index file is still based on the
5125
+#. $orig_head commit, but we are merging into $curr_head.
5126
+#. First update the working tree to match $curr_head.
5127
+#: git-pull.sh:228
5128
+#, sh-format
5129
+msgid ""
5130
+"Warning: fetch updated the current branch head.\n"
5131
+"Warning: fast-forwarding your working tree from\n"
5132
+"Warning: commit $orig_head."
5133
+msgstr ""
5134
+"警告：fetch 更新了当前的分支。您的工作区\n"
5135
+"警告：从原提交 $orig_head 快进。"
5136
+
5137
#: git-pull.sh:253
5138
msgid "Cannot merge multiple branches into empty head"
5139
msgstr "无法将多个分支合并到空分支"
@@ -5034,6 +5170,25 @@ msgstr "无法删除临时索引（不应发生）"
5170
msgid "Cannot record working tree state"
5171
msgstr "不能记录工作区状态"
5172
5173
+#. TRANSLATORS: $option is an invalid option, like
5174
+#. `--blah-blah'. The 7 spaces at the beginning of the
5175
+#. second line correspond to "error: ". So you should line
5176
+#. up the second line with however many characters the
5177
+#. translation of "error: " takes in your language. E.g. in
5178
+#. English this is:
5179
+#.
5180
+#. $ git stash save --blah-blah 2>&1 | head -n 2
5181
+#. error: unknown option for 'stash save': --blah-blah
5182
+#. To provide a message, use git stash save -- '--blah-blah'
5183
+#: git-stash.sh:202
5184
+#, sh-format
5185
+msgid ""
5186
+"error: unknown option for 'stash save': $option\n"
5187
+" To provide a message, use git stash save -- '$option'"
5188
+msgstr ""
5189
+"错误：'stash save' 的未知选项：$option\n"
5190
+" 要提供一个描述信息，使用 git stash save -- '$option'"
5191
+
5192
#: git-stash.sh:223
5193
msgid "No local changes to save"
5194
msgstr "没有要保存的本地修改"
@@ -5094,6 +5249,10 @@ msgstr "不能保存索引树"
5249
msgid "Cannot unstage modified files"
5250
msgstr "无法还原修改的文件"
5251
5252
+#: git-stash.sh:474
5253
+msgid "Index was not unstashed."
5254
+msgstr "索引的进度没有被恢复。"
5255
+
5256
#: git-stash.sh:491
5257
#, sh-format
5258
msgid "Dropped ${REV} ($s)"
@@ -5142,6 +5301,22 @@ msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
5301
msgid "'$sm_path' already exists in the index"
5302
msgstr "'$sm_path' 已经存在于索引中"
5303
5304
+#: git-submodule.sh:270
5305
+#, sh-format
5306
+msgid ""
5307
+"The following path is ignored by one of your .gitignore files:\n"
5308
+"$sm_path\n"
5309
+"Use -f if you really want to add it."
5310
+msgstr ""
5311
+"以下路径被您的一个 .gitignore 文件所忽略：\n"
5312
+"$sm_path\n"
5313
+"如果您确实想添加它，使用 -f 参数。"
5314
+
5315
+#: git-submodule.sh:281
5316
+#, sh-format
5317
+msgid "Adding existing repo at '$sm_path' to the index"
5318
+msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5319
+
5320
#: git-submodule.sh:283
5321
#, sh-format
5322
msgid "'$sm_path' already exists and is not a valid git repo"
@@ -5247,8 +5422,14 @@ msgid "Failed to recurse into submodule path '$sm_path'"
5422
msgstr "无法递归进子模组路径 '$sm_path'"
5423
5424
#: git-submodule.sh:713
5250
-msgid "--"
5251
-msgstr "--"
5425
+msgid "--cached cannot be used with --files"
5426
+msgstr "--cached 不能和 --files 共用"
5427
+
5428
+#. unexpected type
5429
+#: git-submodule.sh:753
5430
+#, sh-format
5431
+msgid "unexpected mode $mod_dst"
5432
+msgstr "意外的模式 $mod_dst"
5433
5434
# 译者：注意保持前导空格
5435
#: git-submodule.sh:771
@@ -5276,19 +5457,15 @@ msgstr "blob"
5457
msgid "submodule"
5458
msgstr "子模组"
5459
5460
+#: git-submodule.sh:840
5461
+msgid "# Submodules changed but not updated:"
5462
+msgstr "# 子模组已修改但尚未更新："
5463
+
5464
+#: git-submodule.sh:842
5465
+msgid "# Submodule changes to be committed:"
5466
+msgstr "要提交的子模组变更："
5467
+
5468
#: git-submodule.sh:974
5469
#, sh-format
5470
msgid "Synchronizing submodule url for '$name'"
5471
msgstr "为 '$name' 同步子模组 url"
5283
-
5284
-#~ msgid "Could not extract email from committer identity."
5285
-#~ msgstr "不能从提交者身份中提取邮件地址。"
5286
-
5287
-#~ msgid "cherry-pick"
5288
-#~ msgstr "拣选"
5289
-
5290
-#~ msgid "Please enter the commit message for your changes."
5291
-#~ msgstr "请为您的修改输入提交说明。"
5292
-
5293
-#~ msgid "Too many options specified"
5294
-#~ msgstr "指定了太多的选项"