l10n: Improve many translation for zh_CN
Signed-off-by: Thynson <lanxingcan@gmail.com>
Thynson committed
Aug 7, 2012 at 17:39 UTC
195febdac2060b607c299c1f31bac12839a504d1
1 file changed
+17
-17
po/zh_CN.po
+17
-17
@@ -350,7 +350,7 @@ msgstr[0] ""
350
"您指的是这个么？"
351
msgstr[1] ""
352
"\n"
353
-"您指的是这些其中一个么？"
353
+"您指的是这其中的某一个么？"
354
355
#: merge-recursive.c:190
356
#, c-format
@@ -661,10 +661,10 @@ msgid_plural ""
661
"and have %d and %d different commits each, respectively.\n"
662
msgstr[0] ""
663
"您的分支和 '%s' 出现了偏离，\n"
664
-"并且各自分别有 %d 和 %d 处不同的提交。\n"
664
+"并且分别有 %d 和 %d 处不同的提交。\n"
665
msgstr[1] ""
666
"您的分支和 '%s' 出现了偏离，\n"
667
-"并且各自分别有 %d 和 %d 处不同的提交。\n"
667
+"并且分别有 %d 和 %d 处不同的提交。\n"
668
669
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
670
#: builtin/merge.c:1088 builtin/merge.c:1098
@@ -864,7 +864,7 @@ msgstr "错误收尾 %s。"
864
865
#: sequencer.c:779 sequencer.c:913
866
msgid "no cherry-pick or revert in progress"
867
-msgstr "没有拣选或还原操作在进行"
867
+msgstr "拣选或还原操作并未进行"
868
869
#: sequencer.c:781
870
msgid "cannot resolve HEAD"
@@ -928,7 +928,7 @@ msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
928
#: wrapper.c:413
929
#, c-format
930
msgid "unable to look up current user in the passwd file: %s"
931
-msgstr "无法在 passwd 文件中查询到当前用户：%s"
931
+msgstr "无法在 passwd 文件中查询到该用户：%s"
932
933
#: wrapper.c:414
934
msgid "no such user"
@@ -1106,7 +1106,7 @@ msgstr "bug：未处理的差异状态 %c"
1106
1107
#: wt-status.c:785
1108
msgid "You have unmerged paths."
1109
-msgstr "您有路径尚未合并。"
1109
+msgstr "您有尚未合并的路径。"
1110
1111
# 译者：注意保持前导空格
1112
#: wt-status.c:788 wt-status.c:912
@@ -1191,7 +1191,7 @@ msgstr " （使用 \"git commit --amend\" 修补当前提交）"
1191
#: wt-status.c:898
1192
msgid ""
1193
" (use \"git rebase --continue\" once you are satisfied with your changes)"
1194
-msgstr " （执行 \"git rebase --continue\" 一旦您满意您的修改）"
1194
+msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
1195
1196
#: wt-status.c:908
1197
msgid "You are currently cherry-picking."
@@ -1349,11 +1349,11 @@ msgstr "不能读取索引"
1349
#: builtin/add.c:286
1350
#, c-format
1351
msgid "Could not open '%s' for writing."
1352
-msgstr "不能为写入打开 '%s'。"
1352
+msgstr "不能打开 '%s' 以写入。"
1353
1354
#: builtin/add.c:290
1355
msgid "Could not write patch"
1356
-msgstr "不能写补丁"
1356
+msgstr "不能生成补丁"
1357
1358
#: builtin/add.c:295
1359
#, c-format
@@ -1371,7 +1371,7 @@ msgstr "不能应用 '%s'"
1371
1372
#: builtin/add.c:312
1373
msgid "The following paths are ignored by one of your .gitignore files:\n"
1374
-msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
1374
+msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
1375
1376
#: builtin/add.c:352
1377
#, c-format
@@ -1494,7 +1494,7 @@ msgstr "删除的文件仍有内容"
1494
#: builtin/apply.c:1665
1495
#, c-format
1496
msgid "corrupt patch at line %d"
1497
-msgstr "补丁损坏位于第 %d 行"
1497
+msgstr "补丁在第 %d 行损坏"
1498
1499
#: builtin/apply.c:1701
1500
#, c-format
@@ -1715,8 +1715,8 @@ msgstr "内部错误"
1715
#, c-format
1716
msgid "Applying patch %%s with %d reject..."
1717
msgid_plural "Applying patch %%s with %d rejects..."
1718
-msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1719
-msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1718
+msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1719
+msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1720
1721
#: builtin/apply.c:3980
1722
#, c-format
@@ -1791,7 +1791,7 @@ msgstr "应用补丁而不修改工作区"
1791
1792
#: builtin/apply.c:4310
1793
msgid "also apply the patch (use with --stat/--summary/--check)"
1794
-msgstr "还应用此补丁（使用 --stat/--summary/--check 参数）"
1794
+msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1795
1796
#: builtin/apply.c:4312
1797
msgid "attempt three-way merge if a patch does not apply"
@@ -1843,7 +1843,7 @@ msgstr "冗长输出"
1843
1844
#: builtin/apply.c:4339
1845
msgid "tolerate incorrectly detected missing new-line at the end of file"
1846
-msgstr "宽容不正确的文件末尾换行符"
1846
+msgstr "允许不正确的文件末尾换行符"
1847
1848
#: builtin/apply.c:4342
1849
msgid "do not trust the line counts in the hunk headers"
@@ -1895,7 +1895,7 @@ msgstr "不能创建归档文件 '%s'"
1895
1896
#: builtin/archive.c:20
1897
msgid "could not redirect output"
1898
-msgstr "不能输出重定向"
1898
+msgstr "不能重定向输出"
1899
1900
#: builtin/archive.c:37
1901
msgid "git archive: Remote with no URL"
@@ -1921,7 +1921,7 @@ msgstr "git archive：协议错误"
1921
1922
#: builtin/archive.c:71
1923
msgid "git archive: expected a flush"
1924
-msgstr "git archive：应为一个刷新"
1924
+msgstr "git archive：应为刷新"
1925
1926
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
1927
#: builtin/branch.c:144