From: Thynson <lanxingcan@gmail.com>
Date: Tue, 28 Feb 2012 18:03:39 +0000 (+0800)
Subject: l10n: Improve zh_CN translation for empty cherry-pick msg.
X-Git-Tag: v1.7.10-rc1~10^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9ce45430b380b982de6f6cf24a96849e4d2feed;p=git.git

l10n: Improve zh_CN translation for empty cherry-pick msg.

Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a964030fc..9d0674c4e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1395,11 +1395,12 @@ msgid ""
 "\n"
 "Otherwise, please use 'git reset'\n"
 msgstr ""
-"之前的拣选操作现在为空，可能是由冲突解决导致的。如果您想继续提交，用：\n"
+"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
+"也要提交，使用命令：\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
-"否则，请用 'git reset'\n"
+"否则，请使用命令 'git reset'\n"
 
 #: builtin/commit.c:205 builtin/reset.c:33
 msgid "merge"