From: Thynson Date: Tue, 28 Feb 2012 17:58:30 +0000 (+0800) Subject: l10n: Improve zh_CN translation for msg about branch deletion deny X-Git-Tag: v1.7.10-rc1~10^2~11 X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=70fc47bf564260ccf22ebff4ea97941aaae751eb l10n: Improve zh_CN translation for msg about branch deletion deny Signed-off-by: Thynson Signed-off-by: Jiang Xin --- diff --git a/po/zh_CN.po b/po/zh_CN.po index ea26daa71..a964030fc 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"