From: Thynson <lanxingcan@gmail.com>
Date: Sat, 3 Mar 2012 00:34:28 +0000 (+0800)
Subject: l10n: Improve zh_CN trans for msg that cannot fast-forward
X-Git-Tag: v1.7.10-rc1~10^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1aabac6580f9902bddf6d150a4bd2967d15d9ca2;p=git.git

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

Signed-off-by: Thynson <lanxingcan@gmail.com>
---

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d2137ac8..a1096e93c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -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