Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: Improve zh_CN translation for msg about branch deletion deny
author
Thynson
<lanxingcan@gmail.com>
Tue, 28 Feb 2012 17:58:30 +0000
(
01:58
+0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Fri, 2 Mar 2012 08:18:22 +0000
(16:18 +0800)
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/zh_CN.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8ea38f4
)
diff --git
a/po/zh_CN.po
b/po/zh_CN.po
index ea26daa7179c94b24d2ada49553f35f044c82325..a964030fc889c6491fd861133f66bab3800d3f36 100644
(file)
--- 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 ""
"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
" '%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 ""
"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"
# 汉字之间无空格,故删除尾部空格
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"