l10n: zh_CN: review for git v2.9.0 l10n round 1
Signed-off-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Ray Chen committed
Jun 6, 2016 at 00:06 UTC
aef18cc6063106075afeb3a78ec72656b19c8bde
1 file changed
+15
-15
po/zh_CN.po
+15
-15
@@ -136,7 +136,7 @@ msgstr ""
136
"Project-Id-Version: Git\n"
137
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138
"POT-Creation-Date: 2016-05-24 23:42+0800\n"
139
-"PO-Revision-Date: 2016-06-04 22:06+0800\n"
139
+"PO-Revision-Date: 2016-06-06 23:05+0800\n"
140
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
142
"Language: zh_CN\n"
@@ -1941,7 +1941,7 @@ msgid ""
1941
"%%sPlease commit your changes or stash them before you can switch branches."
1942
msgstr ""
1943
"您对下列文件的本地修改将被检出操作覆盖：\n"
1944
-"%%s请在切换分支前提交您的修改或者进度保存。"
1944
+"%%s请在切换分支前提交您的修改或者保存进度。"
1945
1946
#: unpack-trees.c:66
1947
#, c-format
@@ -1959,7 +1959,7 @@ msgid ""
1959
"%%sPlease commit your changes or stash them before you can merge."
1960
msgstr ""
1961
"您对下列文件的本地修改将被合并操作覆盖：\n"
1962
-"%%s请在合并前提交您的修改或者进度保存。"
1962
+"%%s请在合并前提交您的修改或者保存进度。"
1963
1964
#: unpack-trees.c:71
1965
#, c-format
@@ -1977,7 +1977,7 @@ msgid ""
1977
"%%sPlease commit your changes or stash them before you can %s."
1978
msgstr ""
1979
"您对下列文件的本地修改将被 %s 覆盖：\n"
1980
-"%%s请在 %s 之前提交您的修改或者进度保存。"
1980
+"%%s请在 %s 之前提交您的修改或者保存进度。"
1981
1982
#: unpack-trees.c:76
1983
#, c-format
@@ -2003,8 +2003,8 @@ msgid ""
2003
"The following untracked working tree files would be removed by checkout:\n"
2004
"%%sPlease move or remove them before you can switch branches."
2005
msgstr ""
2006
-"如下未跟踪的工作区文件将因为检出而被删除：\n"
2007
-"%%s请在切换分支之前移动或删除这些文件。"
2006
+"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
2007
+"%%s请在切换分支之前移动或删除。"
2008
2009
#: unpack-trees.c:87
2010
#, c-format
@@ -2118,7 +2118,7 @@ msgid ""
2118
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
2119
"%s"
2120
msgstr ""
2121
-"无法更新稀疏检出。如下条目不是最新：\n"
2121
+"无法更新稀疏检出：如下条目不是最新：\n"
2122
"%s"
2123
2124
#: unpack-trees.c:126
@@ -7744,7 +7744,7 @@ msgid ""
7744
"Or you could specify base commit by --base=<base-commit-id> manually."
7745
msgstr ""
7746
"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
7747
-"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过 \n"
7747
+"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
7748
"参数 --base=<base-commit-id> 手动指定一个基线提交。"
7749
7750
#: builtin/log.c:1255
@@ -7761,7 +7761,7 @@ msgstr "基线提交不应该出现在版本列表中"
7761
7762
#: builtin/log.c:1319
7763
msgid "cannot get patch id"
7764
-msgstr "无法得到补丁id"
7764
+msgstr "无法得到补丁 id"
7765
7766
#: builtin/log.c:1377
7767
msgid "use [PATCH n/m] even with a single patch"
@@ -10997,13 +10997,13 @@ msgstr "无法为子模组 '%s' 注册 url"
10997
#: builtin/submodule--helper.c:370
10998
#, c-format
10999
msgid "Submodule '%s' (%s) registered for path '%s'\n"
11000
-msgstr "子模组 '%s' (%s) 未对路径 '%s' 注册\n"
11000
+msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
11001
11002
#
11003
#: builtin/submodule--helper.c:380
11004
-#, c-format, fuzzy
11004
+#, c-format
11005
msgid "warning: command update mode suggested for submodule '%s'\n"
11006
-msgstr "警告：子模组 '%s' 使用了命令模式作为 update 选项\n"
11006
+msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
11007
11008
#: builtin/submodule--helper.c:387
11009
#, c-format
@@ -12439,7 +12439,7 @@ msgstr "正在进入 '$displaypath'"
12439
#: git-submodule.sh:375
12440
#, sh-format
12441
msgid "Stopping at '$displaypath'; script returned non-zero status."
12442
-msgstr "停止于 '$displaypath'，脚本返回非零值。"
12442
+msgstr "停止于 '$displaypath'；脚本返回非零值。"
12443
12444
#: git-submodule.sh:448
12445
#, sh-format
@@ -12449,7 +12449,7 @@ msgstr "pathspec 和 --all 不兼容"
12449
#: git-submodule.sh:453
12450
#, sh-format
12451
msgid "Use '--all' if you really want to deinitialize all submodules"
12452
-msgstr "使用 '--all' 如果您真的想要对所有子模组取消初始化"
12452
+msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
12453
12454
#: git-submodule.sh:470
12455
#, sh-format
@@ -12542,7 +12542,7 @@ msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
12542
#: git-submodule.sh:698
12543
#, sh-format
12544
msgid "Submodule path '$displaypath': '$command $sha1'"
12545
-msgstr "子模组 '$displaypath': '$command $sha1'"
12545
+msgstr "子模组 '$displaypath'：'$command $sha1'"
12546
12547
#: git-submodule.sh:729
12548
#, sh-format