diff options
| author | Thynson <lanxingcan@gmail.com> | 2012-03-03 09:03:27 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-03-09 00:22:56 +0800 |
| commit | 6672dc8e694f412090417a95cd6cd4b2b5be6da1 (patch) | |
| tree | 1ae6d3b2fd8d575957a83c60928ae6213126cb51 | |
| parent | 1aabac6580f9902bddf6d150a4bd2967d15d9ca2 (diff) | |
| download | git-6672dc8e694f412090417a95cd6cd4b2b5be6da1.tar.gz | |
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.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index a1096e93c6..713542fdcd 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 |