l10n: Improve zh_CN translation for msg "not something we can merge"
authorThynson <lanxingcan@gmail.com>
Sat, 3 Mar 2012 01:03:27 +0000 (09:03 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Thu, 8 Mar 2012 16:22:56 +0000 (00:22 +0800)
Signed-off-by: Thynson <lanxingcan@gmail.com>
po/zh_CN.po

index a1096e93c6764b1231acf48b974b971fc3aa9ffe..713542fdcd22bd459cc6043a2dbe358724ab1ea0 100644 (file)
@@ -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