From: Zhou Fangyi Date: Sat, 11 Nov 2017 21:28:53 +0000 (+0000) Subject: l10n: zh_CN Fix typo X-Git-Tag: v2.16.0~1^2~13^2~4^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2090d5b4a0d142aa4500249eccfcdec26525c56e?ds=inline;hp=-c l10n: zh_CN Fix typo apply.c:125 say -> way Signed-off-by: Fangyi Zhou --- 2090d5b4a0d142aa4500249eccfcdec26525c56e diff --git a/po/zh_CN.po b/po/zh_CN.po index d3aaf09b99..9f6be8930b 100644 --- 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 和 --3say 不能同时使用。" +msgstr "--reject 和 --3way 不能同时使用。" #: apply.c:127 msgid "--cached and --3way cannot be used together."