summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorThynson <lanxingcan@gmail.com>2012-02-29 01:58:30 +0800
committerJiang Xin <worldhello.net@gmail.com>2012-03-02 16:18:22 +0800
commit70fc47bf564260ccf22ebff4ea97941aaae751eb (patch)
tree32a93799f506f83c33566ba15f09b4fdcae9e9d9 /po
parent8ea38f47bbabf00c17ff8964c722e413ed37444e (diff)
downloadgit-70fc47bf564260ccf22ebff4ea97941aaae751eb.tar.gz
l10n: Improve zh_CN translation for msg about branch deletion deny
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.po6
1 files changed, 3 insertions, 3 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ea26daa717..a964030fc8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -803,7 +803,7 @@ msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-"要删除的分支 '%s' 已经合并到\n"
+"将要删除的分支 '%s' 已经被合并到\n"
" '%s',但未合并到 HEAD。"
#: builtin/branch.c:141
@@ -812,8 +812,8 @@ msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-"不要删除分支 '%s' 其尚未合并到\n"
-" '%s',虽然它已经合并到 HEAD。"
+"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
+" 然而却尚未被合并到分支 '%s' 。"
# 汉字之间无空格,故删除尾部空格
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"