diff options
| author | Yichao Yu <yyc1992@gmail.com> | 2012-02-02 03:43:01 -0500 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-02-27 23:36:53 +0800 |
| commit | 0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (patch) | |
| tree | e7638229965476e2c7a06e0df7ad2470a4791131 | |
| parent | d4a8e00b32b6fa5b2ec21c65ef7a692f74a0e016 (diff) | |
| download | git-0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0.tar.gz | |
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>
| -rw-r--r-- | po/zh_CN.po | 2 |
1 files changed, 1 insertions, 1 deletions
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 |