l10n: zh_CN: review for git v2.32.0 l10n round 1
Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
依云 committed
Jun 7, 2021 at 19:32 UTC
7b4d4954392c22dd6a7963c260bd22330f6c824f
1 file changed
+11
-11
po/zh_CN.po
+11
-11
@@ -4646,7 +4646,7 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"
4646
4647
#: mailinfo.c:1050
4648
msgid "quoted CRLF detected"
4649
-msgstr "检测到引号中的换行符"
4649
+msgstr "检测到被引用的 CRLF"
4650
4651
#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
4652
#, c-format
@@ -4839,14 +4839,14 @@ msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其
4839
msgid ""
4840
"CONFLICT (distinct types): %s had different types on each side; renamed both "
4841
"of them so each can be recorded somewhere."
4842
-msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，把它们都重命名以便每个能记录在不同位置。"
4842
+msgstr "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位置。"
4843
4844
#: merge-ort.c:3062
4845
#, c-format
4846
msgid ""
4847
"CONFLICT (distinct types): %s had different types on each side; renamed one "
4848
"of them so each can be recorded somewhere."
4849
-msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的一个以便每个被记录在不同位置。"
4849
+msgstr "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同位置。"
4850
4851
#: merge-ort.c:3162 merge-recursive.c:3081
4852
msgid "content"
@@ -4879,7 +4879,7 @@ msgstr ""
4879
msgid ""
4880
"Note: %s not up to date and in way of checking out conflicted version; old "
4881
"copy renamed to %s"
4882
-msgstr "注意：%s 不是最新的，并且正在检出冲突的版本。旧副本重命名为 %s"
4882
+msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s"
4883
4884
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4885
#. base, and 2-3) the trees for the two trees we're merging.
@@ -7344,7 +7344,7 @@ msgstr "send-pack：无法派生 fetch 子进程"
7344
7345
#: send-pack.c:455
7346
msgid "push negotiation failed; proceeding anyway with push"
7347
-msgstr "推送协商失败；无论如何继续推送"
7347
+msgstr "推送协商失败，但还是继续推送"
7348
7349
#: send-pack.c:520
7350
msgid "the receiving end does not support this repository's hash algorithm"
@@ -10032,7 +10032,7 @@ msgstr "无法读取 IPC 响应"
10032
#: compat/simple-ipc/ipc-unix-socket.c:862
10033
#, c-format
10034
msgid "could not start accept_thread '%s'"
10035
-msgstr "无法启动 accept_thread '%s'"
10035
+msgstr "无法启动 accept_thread '%s'"
10036
10037
#: compat/simple-ipc/ipc-unix-socket.c:874
10038
#, c-format
@@ -13799,7 +13799,7 @@ msgstr "终止提交；您未更改来自模版的提交说明。\n"
13799
#: builtin/commit.c:1788
13800
#, c-format
13801
msgid "Aborting commit due to empty commit message body.\n"
13802
-msgstr "终止提交因为提交说明的正文为空。\n"
13802
+msgstr "因提交说明的正文为空而终止提交。\n"
13803
13804
#: builtin/commit.c:1824
13805
msgid ""
@@ -17184,7 +17184,7 @@ msgstr "保持主题"
17184
17185
#: builtin/mailinfo.c:60
17186
msgid "keep non patch brackets in subject"
17187
-msgstr "在标题保持无补丁括号标注"
17187
+msgstr "在主题中保持无补丁括号标注"
17188
17189
#: builtin/mailinfo.c:62
17190
msgid "copy Message-ID to the end of commit message"
@@ -17220,7 +17220,7 @@ msgstr "找到引用的 CR 时的操作"
17220
17221
#: builtin/mailinfo.c:77
17222
msgid "use headers in message's body"
17223
-msgstr "在消息正文中使用标题"
17223
+msgstr "在消息正文中使用标头"
17224
17225
#: builtin/mailsplit.c:241
17226
#, c-format
@@ -23620,7 +23620,7 @@ msgstr "test-tool serve-v2 [<选项>]"
23620
23621
#: t/helper/test-serve-v2.c:19
23622
msgid "exit immediately after advertising capabilities"
23623
-msgstr "对能力广告之后立即退出"
23623
+msgstr "通告能力之后立即退出"
23624
23625
#: t/helper/test-simple-ipc.c:262
23626
#, c-format
@@ -25920,7 +25920,7 @@ msgid ""
25920
"fatal: %s:%d is longer than 998 characters\n"
25921
"warning: no patches were sent\n"
25922
msgstr ""
25923
-"致命错误：%s:%d 超过 998 字节\n"
25923
+"致命错误：%s:%d 超过 998 字符\n"
25924
"警告：补丁未能发送\n"
25925
25926
#: git-send-email.perl:1997