From: Thynson <lanxingcan@gmail.com>
Date: Sat, 3 Mar 2012 01:03:27 +0000 (+0800)
Subject: l10n: Improve zh_CN translation for msg "not something we can merge"
X-Git-Tag: v1.7.10-rc1~10^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6672dc8e694f412090417a95cd6cd4b2b5be6da1;p=git.git

l10n: Improve zh_CN translation for msg "not something we can merge"

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1096e93c..713542fdc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2527,7 +2527,7 @@ msgstr "到空分支的非快进式提交没有意义"
 #: builtin/merge.c:1275 builtin/merge.c:1319
 #, c-format
 msgid "%s - not something we can merge"
-msgstr "%s - 不是我们可以合并的东西"
+msgstr "%s - 不能被合并"
 
 #: builtin/merge.c:1385
 #, c-format