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

Signed-off-by: Thynson <lanxingcan@gmail.com>
2012-03-03 09:03:27 +08:00 · 2012-03-03 09:03:27 +08:00 · 6672dc8e69
commit 6672dc8e69
parent 1aabac6580
1 changed files with 1 additions and 1 deletions
--- 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