l10n: fast-forward here is ff-only merge, not push

Signed-off-by: Yichao Yu <yyc1992@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
This commit is contained in:
Yichao Yu 2012-02-02 03:43:01 -05:00 committed by Jiang Xin
parent d4a8e00b32
commit 0ad9e96d2e

View file

@ -132,7 +132,7 @@ msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,且可以快进式推送。\n"
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,且可以快进。\n"
#: remote.c:1590
#, c-format