Browse Source

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>
maint
Thynson 13 years ago committed by Jiang Xin
parent
commit
a9ce45430b
  1. 5
      po/zh_CN.po

5
po/zh_CN.po

@ -1395,11 +1395,12 @@ msgid "" @@ -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"

Loading…
Cancel
Save