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>

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b6ae6ce76c88d3890b172fbce0c086bb26b9b893..467695f8a2531a016808a97aea09517c4e70b9c1 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -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