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

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

l10n: Improve zh_CN translation for msg "not something we can merge"
Signed-off-by: N Thynson <lanxingcan@gmail.com>
6672dc8e · Thynson · Jiang Xin · 1aabac65 · 6672dc8e
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

po/zh_CN.po po/zh_CN.po +1 -1

未找到文件。
--- 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