l10n: Improve zh_CN translation for msg "not something we can merge"
Signed-off-by: Thynson <lanxingcan@gmail.com>
Thynson committed
Mar 3, 2012 at 09:03 UTC
6672dc8e694f412090417a95cd6cd4b2b5be6da1
1 file changed
+1
-1
po/zh_CN.po
+1
-1
@@ -2527,7 +2527,7 @@ msgstr "到空分支的非快进式提交没有意义"
2527
#: builtin/merge.c:1275 builtin/merge.c:1319
2528
#, c-format
2529
msgid "%s - not something we can merge"
2530
-msgstr "%s - 不是我们可以合并的东西"
2530
+msgstr "%s - 不能被合并"
2531
2532
#: builtin/merge.c:1385
2533
#, c-format