t7800: Test difftool passing arguments to diff

[git.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d2137ac89f248c7e5c6f04e5af356fbfbdadf6e..713542fdcd22bd459cc6043a2dbe358724ab1ea0 100644 (file)
--- 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
@@ -2546,7 +2546,7 @@ msgstr "无。\n"
 
 #: builtin/merge.c:1462
 msgid "Not possible to fast-forward, aborting."
-msgstr "不可能快进式，终止。"
+msgstr "无法快进，终止。"
 
 #: builtin/merge.c:1485 builtin/merge.c:1562
 #, c-format