summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorThynson <lanxingcan@gmail.com>2012-02-29 02:03:39 +0800
committerJiang Xin <worldhello.net@gmail.com>2012-03-02 16:28:10 +0800
commita9ce45430b380b982de6f6cf24a96849e4d2feed (patch)
tree378ad9c28a066ef8642eb64be89f4f65d7baebe5 /po
parent70fc47bf564260ccf22ebff4ea97941aaae751eb (diff)
downloadgit-a9ce45430b380b982de6f6cf24a96849e4d2feed.tar.gz
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>
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po5
1 files changed, 3 insertions, 2 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a964030fc8..9d0674c4e6 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"