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>
Yichao Yu committed
Feb 2, 2012 at 03:43 UTC
0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0
1 file changed
+1
-1
po/zh_CN.po
+1
-1
@@ -132,7 +132,7 @@ msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
132
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
133
msgid_plural ""
134
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
135
-msgstr[0] "您的分支落后 '%s' 共 %d 个提交，且可以快进式推送。\n"
135
+msgstr[0] "您的分支落后 '%s' 共 %d 个提交，且可以快进。\n"
136
137
#: remote.c:1590
138
#, c-format