OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16697bd
)
l10n: zh_CN Fix typo
author
Zhou Fangyi
<fangyi.zhou@yuriko.moe>
Sat, 11 Nov 2017 21:28:53 +0000
(21:28 +0000)
committer
Jiang Xin
<worldhello.net@gmail.com>
Sun, 3 Dec 2017 02:11:34 +0000
(10:11 +0800)
apply.c:125
say -> way
Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
po/zh_CN.po
patch
|
blob
|
history
diff --git
a/po/zh_CN.po
b/po/zh_CN.po
index
d3aaf09
..
9f6be89
100644
(file)
--- a/
po/zh_CN.po
+++ b/
po/zh_CN.po
@@
-240,7
+240,7
@@
msgstr "未能识别的空白字符忽略选项 '%s'"
#: apply.c:125
msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3
s
ay 不能同时使用。"
+msgstr "--reject 和 --3
w
ay 不能同时使用。"
#: apply.c:127
msgid "--cached and --3way cannot be used together."