From: Yichao Yu <yyc1992@gmail.com>
Date: Thu, 2 Feb 2012 08:43:01 +0000 (-0500)
Subject: l10n: fast-forward here is ff-only merge, not push
X-Git-Tag: v1.7.10-rc0~26^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0;p=git.git

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 b6ae6ce76..467695f8a 100644
--- 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