summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70fc47b)
raw | patch | inline | side by side (parent: 70fc47b)
author | Thynson <lanxingcan@gmail.com> | |
Tue, 28 Feb 2012 18:03:39 +0000 (02:03 +0800) | ||
committer | Jiang Xin <worldhello.net@gmail.com> | |
Fri, 2 Mar 2012 08:28:10 +0000 (16:28 +0800) |
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/zh_CN.po | patch | blob | history |
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a964030fc889c6491fd861133f66bab3800d3f36..9d0674c4e6c69547c5054e7b10f32d5de9484889 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
"\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"