projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14c8bce
)
l10n: Improve zh_CN trans for msg that cannot fast-forward
author
Thynson
<lanxingcan@gmail.com>
Sat, 3 Mar 2012 00:34:28 +0000
(08:34 +0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Thu, 8 Mar 2012 16:22:49 +0000
(
00:22
+0800)
Signed-off-by: Thynson <lanxingcan@gmail.com>
po/zh_CN.po
patch
|
blob
|
history
diff --git
a/po/zh_CN.po
b/po/zh_CN.po
index 3d2137ac89f248c7e5c6f04e5af356fbfbdadf6e..a1096e93c6764b1231acf48b974b971fc3aa9ffe 100644
(file)
--- a/
po/zh_CN.po
+++ b/
po/zh_CN.po
@@
-2546,7
+2546,7
@@
msgstr "无。\n"
#: builtin/merge.c:1462
msgid "Not possible to fast-forward, aborting."
-msgstr "
不可能快进式
,终止。"
+msgstr "
无法快进
,终止。"
#: builtin/merge.c:1485 builtin/merge.c:1562
#, c-format