l10n: zh_CN: review for git 2.18.0
Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Jun 29, 2018 at 09:46 UTC
0fcd668fc461bfc4f97db4307d2e6f6602c4dd89
1 file changed
+7
-9
po/zh_CN.po
+7
-9
@@ -139,7 +139,7 @@ msgstr ""
139
"Project-Id-Version: Git\n"
140
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
141
"POT-Creation-Date: 2018-06-16 22:06+0800\n"
142
-"PO-Revision-Date: 2018-06-18 00:28+0800\n"
142
+"PO-Revision-Date: 2018-07-02 10:22+0800\n"
143
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
144
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
145
"Language: zh_CN\n"
@@ -2324,12 +2324,12 @@ msgstr "（坏提交）\n"
2324
#: merge-recursive.c:320
2325
#, c-format
2326
msgid "add_cacheinfo failed for path '%s'; merge aborting."
2327
-msgstr "addinfo_cache 对路径 '%s' 执行失败，合并终止。"
2327
+msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
2328
2329
#: merge-recursive.c:328
2330
#, c-format
2331
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
2332
-msgstr "addinfo_cache 无法刷新路径 '%s'，合并终止。"
2332
+msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
2333
2334
#: merge-recursive.c:410
2335
msgid "error building trees"
@@ -2541,12 +2541,12 @@ msgstr ""
2541
#: merge-recursive.c:1733
2542
#, c-format
2543
msgid "Renaming %s to %s and %s to %s instead"
2544
-msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
2544
+msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"
2545
2546
#: merge-recursive.c:1745
2547
#, c-format
2548
msgid "Refusing to lose untracked file at %s, even though it's in the way."
2549
-msgstr "拒绝丢失未跟踪文件 '%s'，即使它妨碍了。"
2549
+msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
2550
2551
#: merge-recursive.c:1951
2552
#, c-format
@@ -2554,9 +2554,7 @@ msgid ""
2554
"CONFLICT (directory rename split): Unclear where to place %s because "
2555
"directory %s was renamed to multiple other directories, with no destination "
2556
"getting a majority of the files."
2557
-msgstr ""
2558
-"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
2559
-"其它目录，没有一个目录包含主要的文件。"
2557
+msgstr "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个其它目录，没有目录包含大部分文件。"
2558
2559
#: merge-recursive.c:1983
2560
#, c-format
@@ -9321,7 +9319,7 @@ msgstr "无法解析 gc.logexpiry 的值 %s"
9319
#: builtin/gc.c:539
9320
#, c-format
9321
msgid "failed to parse prune expiry value %s"
9324
-msgstr "无法解析 gc.logexpiry 的值 %s"
9322
+msgstr "无法解析清除期限值 %s"
9323
9324
#: builtin/gc.c:559
9325
#, c-format