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>
Thynson committed
Feb 29, 2012 at 02:03 UTC
a9ce45430b380b982de6f6cf24a96849e4d2feed
1 file changed
+3
-2
po/zh_CN.po
+3
-2
@@ -1395,11 +1395,12 @@ msgid ""
1395
"\n"
1396
"Otherwise, please use 'git reset'\n"
1397
msgstr ""
1398
-"之前的拣选操作现在为空，可能是由冲突解决导致的。如果您想继续提交，用：\n"
1398
+"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
1399
+"也要提交，使用命令：\n"
1400
"\n"
1401
" git commit --allow-empty\n"
1402
"\n"
1402
-"否则，请用 'git reset'\n"
1403
+"否则，请使用命令 'git reset'\n"
1404
1405
#: builtin/commit.c:205 builtin/reset.c:33
1406
msgid "merge"