summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThynson <lanxingcan@gmail.com>2012-03-03 01:03:27 (GMT)
committerJiang Xin <worldhello.net@gmail.com>2012-03-08 16:22:56 (GMT)
commit6672dc8e694f412090417a95cd6cd4b2b5be6da1 (patch)
tree1ae6d3b2fd8d575957a83c60928ae6213126cb51
parent1aabac6580f9902bddf6d150a4bd2967d15d9ca2 (diff)
downloadgit-6672dc8e694f412090417a95cd6cd4b2b5be6da1.zip
git-6672dc8e694f412090417a95cd6cd4b2b5be6da1.tar.gz
git-6672dc8e694f412090417a95cd6cd4b2b5be6da1.tar.bz2
l10n: Improve zh_CN translation for msg "not something we can merge"
Signed-off-by: Thynson <lanxingcan@gmail.com>
-rw-r--r--po/zh_CN.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1096e9..713542f 100644
--- 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