Skip to content

Commit 9aafc93

Browse files
committed
l10n: Unify the translation for '(un)expected'
Signed-off-by: Thynson <[email protected]>
1 parent e5e38ce commit 9aafc93

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

po/zh_CN.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ msgstr "不能读取 %s:%s"
886886

887887
#: sequencer.c:809
888888
msgid "unexpected end of file"
889-
msgstr "未预期的文件结束"
889+
msgstr "意外的文件结束"
890890

891891
#: sequencer.c:815
892892
#, c-format
@@ -1445,7 +1445,7 @@ msgstr "不能在补丁的第 %d 行找到文件名"
14451445
#: builtin/apply.c:946
14461446
#, c-format
14471447
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1448-
msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s"
1448+
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
14491449

14501450
#: builtin/apply.c:950
14511451
#, c-format
@@ -1460,7 +1460,7 @@ msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
14601460
#: builtin/apply.c:958
14611461
#, c-format
14621462
msgid "git apply: bad git-diff - expected /dev/null on line %d"
1463-
msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d 行"
1463+
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
14641464

14651465
#: builtin/apply.c:1403
14661466
#, c-format
@@ -1580,7 +1580,7 @@ msgstr "二进制补丁未应用到 '%s'"
15801580
#: builtin/apply.c:2918
15811581
#, c-format
15821582
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1583-
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(预期 %s,得到 %s)"
1583+
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
15841584

15851585
#: builtin/apply.c:2939
15861586
#, c-format
@@ -1629,7 +1629,7 @@ msgstr "%s:错误类型"
16291629
#: builtin/apply.c:3402
16301630
#, c-format
16311631
msgid "%s has type %o, expected %o"
1632-
msgstr "%s 的类型是 %o,预期是 %o"
1632+
msgstr "%s 的类型是 %o,应为 %o"
16331633

16341634
#: builtin/apply.c:3503
16351635
#, c-format
@@ -1903,7 +1903,7 @@ msgstr "git archive:未提供远程URL"
19031903

19041904
#: builtin/archive.c:58
19051905
msgid "git archive: expected ACK/NAK, got EOF"
1906-
msgstr "git archive:期待ACK/NACK,却得到EOF"
1906+
msgstr "git archive:应为ACK/NACK,却得到EOF"
19071907

19081908
#: builtin/archive.c:63
19091909
#, c-format
@@ -1921,7 +1921,7 @@ msgstr "git archive:协议错误"
19211921

19221922
#: builtin/archive.c:71
19231923
msgid "git archive: expected a flush"
1924-
msgstr "git archive:预期一个刷新"
1924+
msgstr "git archive:应为一个刷新"
19251925

19261926
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
19271927
#: builtin/branch.c:144

0 commit comments

Comments
 (0)