From 1aabac6580f9902bddf6d150a4bd2967d15d9ca2 Mon Sep 17 00:00:00 2001
From: Thynson <lanxingcan@gmail.com>
Date: Sat, 3 Mar 2012 08:34:28 +0800
Subject: [PATCH] l10n: Improve zh_CN trans for msg that cannot fast-forward

Signed-off-by: Thynson <lanxingcan@gmail.com>
---
 po/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d2137ac89..a1096e93c6 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
-- 
2.11.4.GIT