diff options
| author | Thynson <lanxingcan@gmail.com> | 2012-03-03 08:34:28 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-03-09 00:22:49 +0800 |
| commit | 1aabac6580f9902bddf6d150a4bd2967d15d9ca2 (patch) | |
| tree | 348cec84f6e06f130a27ba56f136acb0210179b7 /po/zh_CN.po | |
| parent | 14c8bced15cb1148f3e3211c10732b1992334784 (diff) | |
| download | git-1aabac6580f9902bddf6d150a4bd2967d15d9ca2.tar.gz git-1aabac6580f9902bddf6d150a4bd2967d15d9ca2.tar.xz | |
l10n: Improve zh_CN trans for msg that cannot fast-forward
Signed-off-by: Thynson <lanxingcan@gmail.com>
Diffstat (limited to 'po/zh_CN.po')
| -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 3d2137ac8..a1096e93c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2546,7 +2546,7 @@ msgstr "无。\n" #: builtin/merge.c:1462 msgid "Not possible to fast-forward, aborting." -msgstr "不可能快进式，终止。" +msgstr "无法快进，终止。" #: builtin/merge.c:1485 builtin/merge.c:1562 #, c-format |