Skip to content

Commit

Permalink
l10n: Improve zh_CN trans for msg that cannot fast-forward
Browse files Browse the repository at this point in the history
Signed-off-by: Thynson <lanxingcan@gmail.com>
  • Loading branch information
Thynson authored and Jiang Xin committed Mar 8, 2012
1 parent 14c8bce commit 1aabac6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion po/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1aabac6

Please sign in to comment.