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>
Thynson committed
Feb 29, 2012 at 01:58 UTC
70fc47bf564260ccf22ebff4ea97941aaae751eb
1 file changed
+3
-3
po/zh_CN.po
+3
-3
@@ -803,7 +803,7 @@ msgid ""
803
"deleting branch '%s' that has been merged to\n"
804
" '%s', but not yet merged to HEAD."
805
msgstr ""
806
-"要删除的分支 '%s' 已经合并到\n"
806
+"将要删除的分支 '%s' 已经被合并到\n"
807
" '%s'，但未合并到 HEAD。"
808
809
#: builtin/branch.c:141
@@ -812,8 +812,8 @@ msgid ""
812
"not deleting branch '%s' that is not yet merged to\n"
813
" '%s', even though it is merged to HEAD."
814
msgstr ""
815
-"不要删除分支 '%s' 其尚未合并到\n"
816
-" '%s'，虽然它已经合并到 HEAD。"
815
+"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
816
+" 然而却尚未被合并到分支 '%s' 。"
817
818
# 汉字之间无空格，故删除尾部空格
819
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"