|
10 | 10 | # - Thynson <lanxingcan AT gmail.com>
|
11 | 11 | # - ws3389 <willsmith3389 AT gmail.com>
|
12 | 12 | # - Wang Sheng <wangsheng2008love AT 163.com>
|
| 13 | +# - 依云 <lilydjwg AT gmail.com> |
13 | 14 | # - Yichao Yu <yyc1992 AT gmail.com>
|
14 | 15 | # - Zhuang Ya <zhuangya AT me.com>
|
15 | 16 | #
|
@@ -136,7 +137,7 @@ msgstr ""
|
136 | 137 | "Project-Id-Version: Git\n"
|
137 | 138 | " Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
|
138 | 139 | "POT-Creation-Date: 2017-07-24 21:54+0800\n"
|
139 |
| -"PO-Revision-Date: 2017-08-01 09:21+0800\n" |
| 140 | +"PO-Revision-Date: 2017-08-02 08:00+0800\n" |
140 | 141 | " Last-Translator: Jiang Xin <[email protected]>\n"
|
141 | 142 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
|
142 | 143 | "Language: zh_CN\n"
|
@@ -1981,17 +1982,17 @@ msgstr "唉呀,您的系统中未发现 Git 命令。"
|
1981 | 1982 | #: help.c:358
|
1982 | 1983 | #, c-format
|
1983 | 1984 | msgid "WARNING: You called a Git command named '%s', which does not exist."
|
1984 |
| -msgstr "警告:您运行一个 Git 命令 '%s',但是并不存在。" |
| 1985 | +msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
1985 | 1986 |
|
1986 | 1987 | #: help.c:363
|
1987 | 1988 | #, c-format
|
1988 | 1989 | msgid "Continuing under the assumption that you meant '%s'."
|
1989 |
| -msgstr "继续运行,假定你想要的是 '%s'。" |
| 1990 | +msgstr "假定你想要的是 '%s' 并继续。" |
1990 | 1991 |
|
1991 | 1992 | #: help.c:368
|
1992 | 1993 | #, c-format
|
1993 | 1994 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
|
1994 |
| -msgstr "在 %0.1f 秒钟后继续,假定你想要的是 '%s'。" |
| 1995 | +msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
1995 | 1996 |
|
1996 | 1997 | #: help.c:376
|
1997 | 1998 | #, c-format
|
@@ -11150,7 +11151,7 @@ msgstr "允许快进式"
|
11150 | 11151 |
|
11151 | 11152 | #: builtin/pull.c:164
|
11152 | 11153 | msgid "automatically stash/stash pop before and after rebase"
|
11153 |
| -msgstr "变基操作前后执行自动贮藏和 stash pop" |
| 11154 | +msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
11154 | 11155 |
|
11155 | 11156 | #: builtin/pull.c:180
|
11156 | 11157 | msgid "Options related to fetching"
|
@@ -11254,7 +11255,7 @@ msgstr "变基式拉取"
|
11254 | 11255 |
|
11255 | 11256 | #: builtin/pull.c:852
|
11256 | 11257 | msgid "please commit or stash them."
|
11257 |
| -msgstr "请提交或为贮藏修改。" |
| 11258 | +msgstr "请提交或贮藏它们。" |
11258 | 11259 |
|
11259 | 11260 | #: builtin/pull.c:877
|
11260 | 11261 | #, c-format
|
|
0 commit comments