l10n: Improve zh_CN trans for msg that cannot fast-forward

Signed-off-by: Thynson <lanxingcan@gmail.com>
This commit is contained in:
Thynson 2012-03-03 08:34:28 +08:00 committed by Jiang Xin
parent 14c8bced15
commit 1aabac6580

View File

@ -2546,7 +2546,7 @@ msgstr "无。\n"
#: builtin/merge.c:1462
msgid "Not possible to fast-forward, aborting."
msgstr "不可能快进式,终止。"
msgstr "无法快进,终止。"
#: builtin/merge.c:1485 builtin/merge.c:1562
#, c-format