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

Signed-off-by: Thynson <lanxingcan@gmail.com>
git-mirror · Mar 8, 2012 · 6672dc8 · 6672dc8
1 parent 1aabac6
commit 6672dc8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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