From 0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Thu, 2 Feb 2012 03:43:01 -0500 Subject: [PATCH] l10n: fast-forward here is ff-only merge, not push Signed-off-by: Yichao Yu Signed-off-by: Jiang Xin --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b6ae6ce76c..467695f8a2 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 -- 2.11.4.GIT