]>
Commit | Line | Data |
---|---|---|
c04f5ac3 JX |
1 | # Chinese translations for Git package |
2 | # Git 软件包的简体中文翻译. | |
07432cef | 3 | # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> |
c04f5ac3 | 4 | # This file is distributed under the same license as the Git package. |
814ff314 | 5 | # Contributors: |
c04f5ac3 | 6 | # - Jiang Xin <worldhello.net AT gmail.com> |
bbdf0acc JX |
7 | # - Lian Cheng <rhythm.mail AT gmail.com> |
8 | # - Ray Chen <oldsharp AT gmail.com> | |
c04f5ac3 | 9 | # - Riku <lu.riku AT gmail.com> |
bbdf0acc JX |
10 | # - Thynson <lanxingcan AT gmail.com> |
11 | # - ws3389 <willsmith3389 AT gmail.com> | |
12 | # - Wang Sheng <wangsheng2008love AT 163.com> | |
13 | # - Yichao Yu <yyc1992 AT gmail.com> | |
c04f5ac3 | 14 | # - Zhuang Ya <zhuangya AT me.com> |
c04f5ac3 | 15 | # |
160fb2b2 JX |
16 | # Git glossary for Chinese translators |
17 | # | |
18 | # English | Chinese | |
19 | # ---------------------------------+-------------------------------------- | |
20 | # 3-way merge | 三方合并 | |
21 | # abbreviate | 简写(的 SHA-1 值) | |
22 | # alternate object database | 备用对象库 | |
23 | # amend | 修补 | |
24 | # ancestor | 祖先,祖先提交 | |
25 | # annotated tag | 附注标签 | |
26 | # bare repository | 纯仓库 | |
27 | # bisect | 二分查找 | |
28 | # blob object | 数据对象 | |
29 | # branch | 分支 | |
30 | # bundle | 包 | |
31 | # bypass | 绕过 | |
32 | # cache | 索引(的别称) | |
33 | # chain | (提交)链 | |
34 | # changeset | 变更集 | |
35 | # checkout | 检出 | |
36 | # checksum | 校验,校验和 | |
37 | # cherry-picking | 拣选 | |
38 | # clean | 干净(的工作区) | |
39 | # clone | 克隆 | |
40 | # commit | 提交 | |
667599e8 | 41 | # commit message | 提交说明 |
160fb2b2 JX |
42 | # commit object | 提交对象 |
43 | # commit-ish (also committish) | 提交号 | |
44 | # conflict | 冲突 | |
45 | # core Git | 核心 Git 工具 | |
46 | # DAG | 有向无环图 | |
47 | # dangling object | 摇摆对象 | |
48 | # detached HEAD | 分离头指针 | |
49 | # directory | 目录 | |
50 | # dirty | 脏(的工作区) | |
755c831b | 51 | # dumb HTTP protocol | 哑 HTTP 协议 |
160fb2b2 JX |
52 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
53 | # fast-forward | 快进 | |
54 | # fetch | 获取 | |
55 | # file system | 文件系统 | |
e397e7e3 | 56 | # fork | 派生 |
160fb2b2 JX |
57 | # Git archive | 仓库(对于 arch 用户) |
58 | # gitfile | gitfile(仓库链接文件) | |
59 | # grafts | (提交)嫁接 | |
60 | # hash | 哈希值 | |
61 | # HEAD | HEAD(头指针,亦即当前分支) | |
62 | # head | 头、分支 | |
63 | # head ref | 分支 | |
64 | # header | 头信息 | |
65 | # hook | 钩子 | |
66 | # hunk | 补丁片段 | |
67 | # index | 索引 | |
68 | # index entry | 索引条目 | |
69 | # loose object | 松散对象 | |
70 | # loose refs | 松散引用 | |
71 | # master | master(默认分支名) | |
72 | # merge | 合并 | |
73 | # object | 对象 | |
74 | # object database | 对象库 | |
75 | # object identifier | 对象标识符 | |
76 | # object name | 对象名称 | |
77 | # object type | 对象类型 | |
78 | # octopus | 章鱼式合并(两分支以上的合并) | |
79 | # origin | origin(默认的远程名称) | |
80 | # pack | 包 | |
81 | # pack index | 包索引 | |
82 | # packfile | 包文件 | |
83 | # parent | 父提交 | |
84 | # patch | 补丁 | |
85 | # pathspec | 路径规格 | |
86 | # pattern | 模式 | |
12e59059 | 87 | # pickaxe | 挖掘 |
160fb2b2 JX |
88 | # plumbing | 管件(Git 底层核心命令的别称) |
89 | # porcelain | 瓷件(Git 上层封装命令的别称) | |
94550ed3 | 90 | # precious-objects repo | 珍品仓库 |
160fb2b2 JX |
91 | # prune | 清除 |
92 | # pull | 拉,拉取 | |
93 | # push | 推,推送 | |
94 | # reachable | 可达 | |
95 | # rebase | 变基 | |
96 | # ref | 引用 | |
97 | # reflog | 引用日志 | |
98 | # refspec | 引用规格 | |
99 | # remote | 远程,远程仓库 | |
100 | # remote-tracking branch | 远程跟踪分支 | |
101 | # replay | 重放 | |
102 | # repo | 仓库 | |
103 | # repository | 仓库 | |
104 | # resolve | (冲突)解决 | |
105 | # revert | 还原 | |
106 | # revision | 版本 | |
107 | # rewind | 回退 | |
108 | # SCM | 源代码管理(工具) | |
ee7589bb | 109 | # SHA-1 | SHA-1(安全哈希算法1) |
160fb2b2 JX |
110 | # shallow repository | 浅(克隆)仓库 |
111 | # signed tag | 签名标签 | |
755c831b | 112 | # smart HTTP protocol | 智能 HTTP 协议 |
160fb2b2 JX |
113 | # squash | 压缩 |
114 | # stage | n. 暂存区(即索引); v. 暂存 | |
115 | # stash | n. 进度保存; v. 保存进度 | |
116 | # submodule | 子模组 | |
117 | # symref | 符号引用 | |
933c015e | 118 | # tag | n. 标签; v. 打标签 |
160fb2b2 JX |
119 | # tag object | 标签对象 |
120 | # tagger | 打标签者 | |
121 | # topic branch | 主题分支 | |
122 | # track | 跟踪 | |
123 | # tree | 树(工作区或树对象) | |
124 | # tree object | 树对象 | |
125 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) | |
126 | # unmerged index | 未合并索引 | |
127 | # unpack | 解包 | |
128 | # unreachable object | 不可达对象 | |
129 | # unstage | 取消暂存 | |
130 | # upstream | 上游 | |
131 | # upstream branch | 上游分支 | |
132 | # working tree | 工作区 | |
133 | # | |
c04f5ac3 JX |
134 | msgid "" |
135 | msgstr "" | |
136 | "Project-Id-Version: Git\n" | |
137 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
87cb7997 JX |
138 | "POT-Creation-Date: 2017-04-23 09:54+0800\n" |
139 | "PO-Revision-Date: 2017-05-02 22:07+0800\n" | |
c04f5ac3 | 140 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 141 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
142 | "Language: zh_CN\n" |
143 | "MIME-Version: 1.0\n" | |
144 | "Content-Type: text/plain; charset=UTF-8\n" | |
145 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 146 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 147 | |
6c94aba5 | 148 | #: advice.c:55 |
c04f5ac3 JX |
149 | #, c-format |
150 | msgid "hint: %.*s\n" | |
151 | msgstr "提示:%.*s\n" | |
152 | ||
5c57d762 JX |
153 | #: advice.c:83 |
154 | msgid "Cherry-picking is not possible because you have unmerged files." | |
155 | msgstr "无法拣选,因为您有未合并的文件。" | |
156 | ||
157 | #: advice.c:85 | |
158 | msgid "Committing is not possible because you have unmerged files." | |
159 | msgstr "无法提交,因为您有未合并的文件。" | |
160 | ||
161 | #: advice.c:87 | |
162 | msgid "Merging is not possible because you have unmerged files." | |
163 | msgstr "无法合并,因为您有未合并的文件。" | |
164 | ||
165 | #: advice.c:89 | |
166 | msgid "Pulling is not possible because you have unmerged files." | |
167 | msgstr "无法拉取,因为您有未合并的文件。" | |
168 | ||
169 | #: advice.c:91 | |
170 | msgid "Reverting is not possible because you have unmerged files." | |
171 | msgstr "无法回退,因为您有未合并的文件。" | |
172 | ||
173 | #: advice.c:93 | |
174 | #, c-format | |
175 | msgid "It is not possible to %s because you have unmerged files." | |
176 | msgstr "无法 %s,因为您有未合并的文件。" | |
177 | ||
178 | #: advice.c:101 | |
c04f5ac3 | 179 | msgid "" |
6acbf033 | 180 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 181 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 182 | msgstr "" |
d9d56b23 | 183 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 184 | "解决方案并提交。" |
c04f5ac3 | 185 | |
5c57d762 JX |
186 | #: advice.c:109 |
187 | msgid "Exiting because of an unresolved conflict." | |
188 | msgstr "因为存在未解决的冲突而退出。" | |
189 | ||
87cb7997 | 190 | #: advice.c:114 builtin/merge.c:1185 |
1b7f4a34 JX |
191 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
192 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
193 | ||
5c57d762 | 194 | #: advice.c:116 |
94550ed3 | 195 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
196 | msgstr "请在合并前先提交您的修改。" |
197 | ||
5c57d762 | 198 | #: advice.c:117 |
1b7f4a34 JX |
199 | msgid "Exiting because of unfinished merge." |
200 | msgstr "因为存在未完成的合并而退出。" | |
201 | ||
5c57d762 JX |
202 | #: advice.c:123 |
203 | #, c-format | |
204 | msgid "" | |
205 | "Note: checking out '%s'.\n" | |
206 | "\n" | |
207 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
208 | "changes and commit them, and you can discard any commits you make in this\n" | |
209 | "state without impacting any branches by performing another checkout.\n" | |
210 | "\n" | |
211 | "If you want to create a new branch to retain commits you create, you may\n" | |
212 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
213 | "\n" | |
214 | " git checkout -b <new-branch-name>\n" | |
215 | "\n" | |
216 | msgstr "" | |
217 | "注意:正在检出 '%s'。\n" | |
218 | "\n" | |
a0b6b246 JX |
219 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" |
220 | "外\n" | |
5c57d762 JX |
221 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" |
222 | "\n" | |
223 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" | |
224 | "参数 -b 来实现(现在或稍后)。例如:\n" | |
225 | "\n" | |
226 | " git checkout -b <new-branch-name>\n" | |
227 | "\n" | |
228 | ||
a0b6b246 JX |
229 | #: apply.c:57 |
230 | #, c-format | |
231 | msgid "unrecognized whitespace option '%s'" | |
232 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 233 | |
a0b6b246 | 234 | #: apply.c:73 |
90314792 | 235 | #, c-format |
a0b6b246 JX |
236 | msgid "unrecognized whitespace ignore option '%s'" |
237 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 238 | |
a0b6b246 JX |
239 | #: apply.c:125 |
240 | msgid "--reject and --3way cannot be used together." | |
241 | msgstr "--reject 和 --3say 不能同时使用。" | |
ef317cd5 | 242 | |
a0b6b246 JX |
243 | #: apply.c:127 |
244 | msgid "--cached and --3way cannot be used together." | |
245 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 246 | |
a0b6b246 JX |
247 | #: apply.c:130 |
248 | msgid "--3way outside a repository" | |
249 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 250 | |
a0b6b246 JX |
251 | #: apply.c:141 |
252 | msgid "--index outside a repository" | |
253 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 254 | |
a0b6b246 JX |
255 | #: apply.c:144 |
256 | msgid "--cached outside a repository" | |
257 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 258 | |
a0b6b246 JX |
259 | #: apply.c:845 |
260 | #, c-format | |
261 | msgid "Cannot prepare timestamp regexp %s" | |
262 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 263 | |
a0b6b246 JX |
264 | #: apply.c:854 |
265 | #, c-format | |
266 | msgid "regexec returned %d for input: %s" | |
267 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 268 | |
a0b6b246 JX |
269 | #: apply.c:938 |
270 | #, c-format | |
271 | msgid "unable to find filename in patch at line %d" | |
272 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 273 | |
a0b6b246 JX |
274 | #: apply.c:977 |
275 | #, c-format | |
276 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
277 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 278 | |
a0b6b246 JX |
279 | #: apply.c:983 |
280 | #, c-format | |
281 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
282 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 283 | |
a0b6b246 JX |
284 | #: apply.c:984 |
285 | #, c-format | |
286 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
287 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 288 | |
a0b6b246 JX |
289 | #: apply.c:990 |
290 | #, c-format | |
291 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
292 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 293 | |
a0b6b246 JX |
294 | #: apply.c:1488 |
295 | #, c-format | |
296 | msgid "recount: unexpected line: %.*s" | |
297 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 298 | |
a0b6b246 JX |
299 | #: apply.c:1557 |
300 | #, c-format | |
301 | msgid "patch fragment without header at line %d: %.*s" | |
302 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 303 | |
a0b6b246 JX |
304 | #: apply.c:1577 |
305 | #, c-format | |
306 | msgid "" | |
307 | "git diff header lacks filename information when removing %d leading pathname " | |
308 | "component (line %d)" | |
309 | msgid_plural "" | |
310 | "git diff header lacks filename information when removing %d leading pathname " | |
311 | "components (line %d)" | |
312 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
313 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 314 | |
a0b6b246 JX |
315 | #: apply.c:1589 |
316 | #, c-format | |
317 | msgid "git diff header lacks filename information (line %d)" | |
318 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 319 | |
a0b6b246 JX |
320 | #: apply.c:1759 |
321 | msgid "new file depends on old contents" | |
322 | msgstr "新文件依赖旧内容" | |
5c57d762 | 323 | |
a0b6b246 JX |
324 | #: apply.c:1761 |
325 | msgid "deleted file still has contents" | |
326 | msgstr "删除的文件仍有内容" | |
5c57d762 | 327 | |
a0b6b246 JX |
328 | #: apply.c:1795 |
329 | #, c-format | |
330 | msgid "corrupt patch at line %d" | |
331 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 332 | |
a0b6b246 | 333 | #: apply.c:1832 |
5c57d762 | 334 | #, c-format |
a0b6b246 JX |
335 | msgid "new file %s depends on old contents" |
336 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 337 | |
a0b6b246 | 338 | #: apply.c:1834 |
5c57d762 | 339 | #, c-format |
a0b6b246 JX |
340 | msgid "deleted file %s still has contents" |
341 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 342 | |
a0b6b246 JX |
343 | #: apply.c:1837 |
344 | #, c-format | |
345 | msgid "** warning: file %s becomes empty but is not deleted" | |
346 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 347 | |
a0b6b246 | 348 | #: apply.c:1984 |
5c57d762 | 349 | #, c-format |
a0b6b246 JX |
350 | msgid "corrupt binary patch at line %d: %.*s" |
351 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 352 | |
a0b6b246 | 353 | #: apply.c:2021 |
5c57d762 | 354 | #, c-format |
a0b6b246 JX |
355 | msgid "unrecognized binary patch at line %d" |
356 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 357 | |
a0b6b246 | 358 | #: apply.c:2182 |
5c57d762 | 359 | #, c-format |
a0b6b246 JX |
360 | msgid "patch with only garbage at line %d" |
361 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 362 | |
1a79b2f1 | 363 | #: apply.c:2265 |
5c57d762 | 364 | #, c-format |
a0b6b246 JX |
365 | msgid "unable to read symlink %s" |
366 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 367 | |
1a79b2f1 | 368 | #: apply.c:2269 |
5c57d762 | 369 | #, c-format |
a0b6b246 JX |
370 | msgid "unable to open or read %s" |
371 | msgstr "不能打开或读取 %s" | |
5c57d762 | 372 | |
1a79b2f1 | 373 | #: apply.c:2922 |
5c57d762 | 374 | #, c-format |
a0b6b246 JX |
375 | msgid "invalid start of line: '%c'" |
376 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 377 | |
1a79b2f1 | 378 | #: apply.c:3041 |
5c57d762 | 379 | #, c-format |
a0b6b246 JX |
380 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
381 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
382 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
383 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 384 | |
1a79b2f1 | 385 | #: apply.c:3053 |
5c57d762 | 386 | #, c-format |
a0b6b246 JX |
387 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
388 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 389 | |
1a79b2f1 | 390 | #: apply.c:3059 |
5c57d762 JX |
391 | #, c-format |
392 | msgid "" | |
a0b6b246 JX |
393 | "while searching for:\n" |
394 | "%.*s" | |
5c57d762 | 395 | msgstr "" |
a0b6b246 JX |
396 | "当查询:\n" |
397 | "%.*s" | |
5c57d762 | 398 | |
1a79b2f1 | 399 | #: apply.c:3081 |
5c57d762 | 400 | #, c-format |
a0b6b246 JX |
401 | msgid "missing binary patch data for '%s'" |
402 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 403 | |
1a79b2f1 | 404 | #: apply.c:3089 |
5c57d762 | 405 | #, c-format |
a0b6b246 | 406 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 407 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 408 | |
1a79b2f1 | 409 | #: apply.c:3135 |
5c57d762 | 410 | #, c-format |
a0b6b246 JX |
411 | msgid "cannot apply binary patch to '%s' without full index line" |
412 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 413 | |
1a79b2f1 | 414 | #: apply.c:3145 |
5c57d762 | 415 | #, c-format |
a0b6b246 JX |
416 | msgid "" |
417 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 418 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 419 | |
1a79b2f1 | 420 | #: apply.c:3153 |
a0b6b246 JX |
421 | #, c-format |
422 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 423 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 424 | |
1a79b2f1 | 425 | #: apply.c:3171 |
5c57d762 | 426 | #, c-format |
a0b6b246 JX |
427 | msgid "the necessary postimage %s for '%s' cannot be read" |
428 | msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" | |
5c57d762 | 429 | |
1a79b2f1 | 430 | #: apply.c:3184 |
5c57d762 | 431 | #, c-format |
a0b6b246 JX |
432 | msgid "binary patch does not apply to '%s'" |
433 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 434 | |
1a79b2f1 | 435 | #: apply.c:3190 |
5c57d762 | 436 | #, c-format |
a0b6b246 JX |
437 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
438 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 439 | |
1a79b2f1 | 440 | #: apply.c:3211 |
276ceeaa | 441 | #, c-format |
a0b6b246 JX |
442 | msgid "patch failed: %s:%ld" |
443 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 444 | |
1a79b2f1 | 445 | #: apply.c:3333 |
4dcdc3d8 | 446 | #, c-format |
a0b6b246 JX |
447 | msgid "cannot checkout %s" |
448 | msgstr "不能检出 %s" | |
4dcdc3d8 | 449 | |
87cb7997 | 450 | #: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 |
4dcdc3d8 | 451 | #, c-format |
a0b6b246 JX |
452 | msgid "failed to read %s" |
453 | msgstr "无法读取 %s" | |
4dcdc3d8 | 454 | |
1a79b2f1 | 455 | #: apply.c:3389 |
4dcdc3d8 | 456 | #, c-format |
a0b6b246 JX |
457 | msgid "reading from '%s' beyond a symbolic link" |
458 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 459 | |
1a79b2f1 | 460 | #: apply.c:3418 apply.c:3658 |
4dcdc3d8 | 461 | #, c-format |
a0b6b246 JX |
462 | msgid "path %s has been renamed/deleted" |
463 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 464 | |
1a79b2f1 | 465 | #: apply.c:3501 apply.c:3672 |
4dcdc3d8 | 466 | #, c-format |
a0b6b246 JX |
467 | msgid "%s: does not exist in index" |
468 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 469 | |
1a79b2f1 | 470 | #: apply.c:3510 apply.c:3680 |
4dcdc3d8 | 471 | #, c-format |
a0b6b246 JX |
472 | msgid "%s: does not match index" |
473 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 474 | |
1a79b2f1 | 475 | #: apply.c:3545 |
a0b6b246 JX |
476 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
477 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 478 | |
1a79b2f1 | 479 | #: apply.c:3548 |
4dcdc3d8 | 480 | #, c-format |
a0b6b246 JX |
481 | msgid "Falling back to three-way merge...\n" |
482 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 483 | |
1a79b2f1 | 484 | #: apply.c:3564 apply.c:3568 |
4dcdc3d8 | 485 | #, c-format |
a0b6b246 JX |
486 | msgid "cannot read the current contents of '%s'" |
487 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 488 | |
1a79b2f1 | 489 | #: apply.c:3580 |
4dcdc3d8 | 490 | #, c-format |
a0b6b246 JX |
491 | msgid "Failed to fall back on three-way merge...\n" |
492 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 493 | |
1a79b2f1 | 494 | #: apply.c:3594 |
4dcdc3d8 | 495 | #, c-format |
a0b6b246 JX |
496 | msgid "Applied patch to '%s' with conflicts.\n" |
497 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 498 | |
1a79b2f1 | 499 | #: apply.c:3599 |
4dcdc3d8 | 500 | #, c-format |
a0b6b246 JX |
501 | msgid "Applied patch to '%s' cleanly.\n" |
502 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 503 | |
1a79b2f1 | 504 | #: apply.c:3625 |
a0b6b246 JX |
505 | msgid "removal patch leaves file contents" |
506 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 507 | |
1a79b2f1 | 508 | #: apply.c:3697 |
1003b3a5 | 509 | #, c-format |
a0b6b246 JX |
510 | msgid "%s: wrong type" |
511 | msgstr "%s:错误类型" | |
1003b3a5 | 512 | |
1a79b2f1 | 513 | #: apply.c:3699 |
1003b3a5 | 514 | #, c-format |
a0b6b246 JX |
515 | msgid "%s has type %o, expected %o" |
516 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 517 | |
1a79b2f1 | 518 | #: apply.c:3850 apply.c:3852 |
4dcdc3d8 | 519 | #, c-format |
a0b6b246 JX |
520 | msgid "invalid path '%s'" |
521 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 522 | |
1a79b2f1 | 523 | #: apply.c:3908 |
4dcdc3d8 | 524 | #, c-format |
a0b6b246 JX |
525 | msgid "%s: already exists in index" |
526 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 527 | |
1a79b2f1 | 528 | #: apply.c:3911 |
4dcdc3d8 | 529 | #, c-format |
a0b6b246 JX |
530 | msgid "%s: already exists in working directory" |
531 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 532 | |
1a79b2f1 | 533 | #: apply.c:3931 |
1b7f4a34 | 534 | #, c-format |
a0b6b246 JX |
535 | msgid "new mode (%o) of %s does not match old mode (%o)" |
536 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 537 | |
1a79b2f1 | 538 | #: apply.c:3936 |
5b04ee3b | 539 | #, c-format |
a0b6b246 JX |
540 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
541 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 542 | |
1a79b2f1 | 543 | #: apply.c:3956 |
8ada9598 | 544 | #, c-format |
a0b6b246 JX |
545 | msgid "affected file '%s' is beyond a symbolic link" |
546 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 547 | |
1a79b2f1 | 548 | #: apply.c:3960 |
81809b99 | 549 | #, c-format |
a0b6b246 JX |
550 | msgid "%s: patch does not apply" |
551 | msgstr "%s:补丁未应用" | |
8ada9598 | 552 | |
1a79b2f1 | 553 | #: apply.c:3975 |
8ada9598 | 554 | #, c-format |
a0b6b246 JX |
555 | msgid "Checking patch %s..." |
556 | msgstr "检查补丁 %s..." | |
8ada9598 | 557 | |
1a79b2f1 | 558 | #: apply.c:4066 |
a0b6b246 JX |
559 | #, c-format |
560 | msgid "sha1 information is lacking or useless for submodule %s" | |
561 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 562 | |
1a79b2f1 | 563 | #: apply.c:4073 |
8ada9598 | 564 | #, c-format |
a0b6b246 | 565 | msgid "mode change for %s, which is not in current HEAD" |
29004bbb | 566 | msgstr "%s 的模式被改变,但它不在当前 HEAD 中" |
8ada9598 | 567 | |
1a79b2f1 | 568 | #: apply.c:4076 |
a0b6b246 JX |
569 | #, c-format |
570 | msgid "sha1 information is lacking or useless (%s)." | |
571 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 572 | |
87cb7997 | 573 | #: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 |
8ada9598 | 574 | #, c-format |
a0b6b246 JX |
575 | msgid "make_cache_entry failed for path '%s'" |
576 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
8ada9598 | 577 | |
1a79b2f1 | 578 | #: apply.c:4085 |
a0b6b246 JX |
579 | #, c-format |
580 | msgid "could not add %s to temporary index" | |
581 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 582 | |
1a79b2f1 | 583 | #: apply.c:4095 |
a0b6b246 JX |
584 | #, c-format |
585 | msgid "could not write temporary index to %s" | |
586 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 587 | |
1a79b2f1 | 588 | #: apply.c:4233 |
a0b6b246 JX |
589 | #, c-format |
590 | msgid "unable to remove %s from index" | |
591 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 592 | |
1a79b2f1 | 593 | #: apply.c:4268 |
8ada9598 | 594 | #, c-format |
a0b6b246 JX |
595 | msgid "corrupt patch for submodule %s" |
596 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 597 | |
1a79b2f1 | 598 | #: apply.c:4274 |
9aeb4c2b | 599 | #, c-format |
a0b6b246 JX |
600 | msgid "unable to stat newly created file '%s'" |
601 | msgstr "不能枚举新建文件 '%s' 的状态" | |
9aeb4c2b | 602 | |
1a79b2f1 | 603 | #: apply.c:4282 |
a0b6b246 JX |
604 | #, c-format |
605 | msgid "unable to create backing store for newly created file %s" | |
606 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 607 | |
1a79b2f1 | 608 | #: apply.c:4288 apply.c:4432 |
81809b99 | 609 | #, c-format |
a0b6b246 JX |
610 | msgid "unable to add cache entry for %s" |
611 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 612 | |
1a79b2f1 | 613 | #: apply.c:4329 |
a0b6b246 JX |
614 | #, c-format |
615 | msgid "failed to write to '%s'" | |
616 | msgstr "无法写入 '%s'" | |
8ada9598 | 617 | |
1a79b2f1 | 618 | #: apply.c:4333 |
220c313c | 619 | #, c-format |
a0b6b246 JX |
620 | msgid "closing file '%s'" |
621 | msgstr "关闭文件 '%s'" | |
220c313c | 622 | |
1a79b2f1 | 623 | #: apply.c:4403 |
c04f5ac3 | 624 | #, c-format |
a0b6b246 JX |
625 | msgid "unable to write file '%s' mode %o" |
626 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 627 | |
1a79b2f1 | 628 | #: apply.c:4501 |
c04f5ac3 | 629 | #, c-format |
a0b6b246 JX |
630 | msgid "Applied patch %s cleanly." |
631 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 632 | |
1a79b2f1 | 633 | #: apply.c:4509 |
a0b6b246 JX |
634 | msgid "internal error" |
635 | msgstr "内部错误" | |
c04f5ac3 | 636 | |
1a79b2f1 | 637 | #: apply.c:4512 |
5c57d762 | 638 | #, c-format |
a0b6b246 JX |
639 | msgid "Applying patch %%s with %d reject..." |
640 | msgid_plural "Applying patch %%s with %d rejects..." | |
641 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
642 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 643 | |
1a79b2f1 | 644 | #: apply.c:4523 |
5c57d762 | 645 | #, c-format |
a0b6b246 JX |
646 | msgid "truncating .rej filename to %.*s.rej" |
647 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 648 | |
87cb7997 | 649 | #: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 |
220c313c | 650 | #, c-format |
a0b6b246 JX |
651 | msgid "cannot open %s" |
652 | msgstr "不能打开 %s" | |
220c313c | 653 | |
1a79b2f1 | 654 | #: apply.c:4545 |
220c313c | 655 | #, c-format |
a0b6b246 JX |
656 | msgid "Hunk #%d applied cleanly." |
657 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 658 | |
1a79b2f1 | 659 | #: apply.c:4549 |
5c57d762 | 660 | #, c-format |
a0b6b246 JX |
661 | msgid "Rejected hunk #%d." |
662 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 663 | |
1a79b2f1 | 664 | #: apply.c:4659 |
5c57d762 | 665 | #, c-format |
a0b6b246 JX |
666 | msgid "Skipped patch '%s'." |
667 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 668 | |
1a79b2f1 | 669 | #: apply.c:4667 |
a0b6b246 JX |
670 | msgid "unrecognized input" |
671 | msgstr "未能识别的输入" | |
5c57d762 | 672 | |
1a79b2f1 | 673 | #: apply.c:4686 |
a0b6b246 JX |
674 | msgid "unable to read index file" |
675 | msgstr "无法读取索引文件" | |
5c57d762 | 676 | |
87cb7997 | 677 | #: apply.c:4823 |
220c313c | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "can't open patch '%s': %s" |
680 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 681 | |
87cb7997 | 682 | #: apply.c:4850 |
5c57d762 | 683 | #, c-format |
a0b6b246 JX |
684 | msgid "squelched %d whitespace error" |
685 | msgid_plural "squelched %d whitespace errors" | |
686 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
687 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 688 | |
87cb7997 | 689 | #: apply.c:4856 apply.c:4871 |
5c57d762 | 690 | #, c-format |
a0b6b246 JX |
691 | msgid "%d line adds whitespace errors." |
692 | msgid_plural "%d lines add whitespace errors." | |
693 | msgstr[0] "%d 行有空白字符误用。" | |
694 | msgstr[1] "%d 行有空白字符误用。" | |
5c57d762 | 695 | |
87cb7997 | 696 | #: apply.c:4864 |
5c57d762 | 697 | #, c-format |
a0b6b246 JX |
698 | msgid "%d line applied after fixing whitespace errors." |
699 | msgid_plural "%d lines applied after fixing whitespace errors." | |
700 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
701 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 702 | |
87cb7997 | 703 | #: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 |
a0b6b246 JX |
704 | msgid "Unable to write new index file" |
705 | msgstr "无法写入新索引文件" | |
5c57d762 | 706 | |
87cb7997 JX |
707 | #: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280 |
708 | #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 | |
709 | #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 | |
710 | #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 | |
711 | #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 | |
1a79b2f1 | 712 | #: git-add--interactive.perl:239 |
a0b6b246 JX |
713 | msgid "path" |
714 | msgstr "路径" | |
5c57d762 | 715 | |
87cb7997 | 716 | #: apply.c:4912 |
a0b6b246 JX |
717 | msgid "don't apply changes matching the given path" |
718 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 719 | |
87cb7997 | 720 | #: apply.c:4915 |
a0b6b246 JX |
721 | msgid "apply changes matching the given path" |
722 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 723 | |
87cb7997 | 724 | #: apply.c:4917 builtin/am.c:2286 |
a0b6b246 JX |
725 | msgid "num" |
726 | msgstr "数字" | |
220c313c | 727 | |
87cb7997 | 728 | #: apply.c:4918 |
a0b6b246 JX |
729 | msgid "remove <num> leading slashes from traditional diff paths" |
730 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 731 | |
87cb7997 | 732 | #: apply.c:4921 |
a0b6b246 JX |
733 | msgid "ignore additions made by the patch" |
734 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 735 | |
87cb7997 | 736 | #: apply.c:4923 |
a0b6b246 JX |
737 | msgid "instead of applying the patch, output diffstat for the input" |
738 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 739 | |
87cb7997 | 740 | #: apply.c:4927 |
a0b6b246 JX |
741 | msgid "show number of added and deleted lines in decimal notation" |
742 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 743 | |
87cb7997 | 744 | #: apply.c:4929 |
a0b6b246 JX |
745 | msgid "instead of applying the patch, output a summary for the input" |
746 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 747 | |
87cb7997 | 748 | #: apply.c:4931 |
a0b6b246 JX |
749 | msgid "instead of applying the patch, see if the patch is applicable" |
750 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 751 | |
87cb7997 | 752 | #: apply.c:4933 |
a0b6b246 JX |
753 | msgid "make sure the patch is applicable to the current index" |
754 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 755 | |
87cb7997 | 756 | #: apply.c:4935 |
a0b6b246 JX |
757 | msgid "apply a patch without touching the working tree" |
758 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 759 | |
87cb7997 | 760 | #: apply.c:4937 |
a0b6b246 JX |
761 | msgid "accept a patch that touches outside the working area" |
762 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 763 | |
87cb7997 | 764 | #: apply.c:4939 |
a0b6b246 JX |
765 | msgid "also apply the patch (use with --stat/--summary/--check)" |
766 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 767 | |
87cb7997 | 768 | #: apply.c:4941 |
a0b6b246 JX |
769 | msgid "attempt three-way merge if a patch does not apply" |
770 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 771 | |
87cb7997 | 772 | #: apply.c:4943 |
a0b6b246 JX |
773 | msgid "build a temporary index based on embedded index information" |
774 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 775 | |
87cb7997 | 776 | #: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508 |
a0b6b246 JX |
777 | msgid "paths are separated with NUL character" |
778 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 779 | |
87cb7997 | 780 | #: apply.c:4948 |
a0b6b246 JX |
781 | msgid "ensure at least <n> lines of context match" |
782 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 783 | |
87cb7997 | 784 | #: apply.c:4949 builtin/am.c:2265 |
a0b6b246 JX |
785 | msgid "action" |
786 | msgstr "动作" | |
8ada9598 | 787 | |
87cb7997 | 788 | #: apply.c:4950 |
a0b6b246 JX |
789 | msgid "detect new or modified lines that have whitespace errors" |
790 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 791 | |
87cb7997 | 792 | #: apply.c:4953 apply.c:4956 |
a0b6b246 JX |
793 | msgid "ignore changes in whitespace when finding context" |
794 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 795 | |
87cb7997 | 796 | #: apply.c:4959 |
a0b6b246 JX |
797 | msgid "apply the patch in reverse" |
798 | msgstr "反向应用补丁" | |
8ada9598 | 799 | |
87cb7997 | 800 | #: apply.c:4961 |
a0b6b246 JX |
801 | msgid "don't expect at least one line of context" |
802 | msgstr "无需至少一行上下文" | |
8ada9598 | 803 | |
87cb7997 | 804 | #: apply.c:4963 |
a0b6b246 JX |
805 | msgid "leave the rejected hunks in corresponding *.rej files" |
806 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 807 | |
87cb7997 | 808 | #: apply.c:4965 |
a0b6b246 JX |
809 | msgid "allow overlapping hunks" |
810 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 811 | |
87cb7997 | 812 | #: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 |
1a79b2f1 | 813 | #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 |
87cb7997 | 814 | #: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 |
a0b6b246 JX |
815 | msgid "be verbose" |
816 | msgstr "冗长输出" | |
8ada9598 | 817 | |
87cb7997 | 818 | #: apply.c:4968 |
a0b6b246 JX |
819 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
820 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 821 | |
87cb7997 | 822 | #: apply.c:4971 |
a0b6b246 JX |
823 | msgid "do not trust the line counts in the hunk headers" |
824 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 825 | |
87cb7997 | 826 | #: apply.c:4973 builtin/am.c:2274 |
a0b6b246 JX |
827 | msgid "root" |
828 | msgstr "根目录" | |
c04f5ac3 | 829 | |
87cb7997 | 830 | #: apply.c:4974 |
a0b6b246 JX |
831 | msgid "prepend <root> to all filenames" |
832 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 833 | |
a0b6b246 JX |
834 | #: archive.c:12 |
835 | msgid "git archive [<options>] <tree-ish> [<path>...]" | |
836 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 837 | |
a0b6b246 JX |
838 | #: archive.c:13 |
839 | msgid "git archive --list" | |
840 | msgstr "git archive --list" | |
841 | ||
842 | #: archive.c:14 | |
c04f5ac3 | 843 | msgid "" |
a0b6b246 | 844 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 845 | msgstr "" |
a0b6b246 | 846 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 847 | |
a0b6b246 JX |
848 | #: archive.c:15 |
849 | msgid "git archive --remote <repo> [--exec <cmd>] --list" | |
850 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 851 | |
87cb7997 | 852 | #: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 |
c04f5ac3 | 853 | #, c-format |
a0b6b246 JX |
854 | msgid "pathspec '%s' did not match any files" |
855 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 856 | |
87cb7997 | 857 | #: archive.c:417 |
a0b6b246 JX |
858 | msgid "fmt" |
859 | msgstr "格式" | |
07432cef | 860 | |
87cb7997 | 861 | #: archive.c:417 |
a0b6b246 JX |
862 | msgid "archive format" |
863 | msgstr "归档格式" | |
7aea43ff | 864 | |
87cb7997 | 865 | #: archive.c:418 builtin/log.c:1436 |
a0b6b246 JX |
866 | msgid "prefix" |
867 | msgstr "前缀" | |
7aea43ff | 868 | |
87cb7997 | 869 | #: archive.c:419 |
a0b6b246 JX |
870 | msgid "prepend prefix to each pathname in the archive" |
871 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 872 | |
87cb7997 JX |
873 | #: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59 |
874 | #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 | |
875 | #: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545 | |
876 | #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 | |
1a79b2f1 | 877 | #: parse-options.h:153 |
a0b6b246 JX |
878 | msgid "file" |
879 | msgstr "文件" | |
a77c07d9 | 880 | |
87cb7997 | 881 | #: archive.c:421 builtin/archive.c:89 |
a0b6b246 JX |
882 | msgid "write the archive to this file" |
883 | msgstr "归档写入此文件" | |
a77c07d9 | 884 | |
87cb7997 | 885 | #: archive.c:423 |
a0b6b246 JX |
886 | msgid "read .gitattributes in working directory" |
887 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 888 | |
87cb7997 | 889 | #: archive.c:424 |
a0b6b246 JX |
890 | msgid "report archived files on stderr" |
891 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 892 | |
87cb7997 | 893 | #: archive.c:425 |
a0b6b246 JX |
894 | msgid "store only" |
895 | msgstr "只存储" | |
7ac1c0ad | 896 | |
87cb7997 | 897 | #: archive.c:426 |
a0b6b246 JX |
898 | msgid "compress faster" |
899 | msgstr "压缩速度更快" | |
8ada9598 | 900 | |
87cb7997 | 901 | #: archive.c:434 |
a0b6b246 JX |
902 | msgid "compress better" |
903 | msgstr "压缩效果更好" | |
8ada9598 | 904 | |
87cb7997 | 905 | #: archive.c:437 |
a0b6b246 JX |
906 | msgid "list supported archive formats" |
907 | msgstr "列出支持的归档格式" | |
a77c07d9 | 908 | |
87cb7997 JX |
909 | #: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 |
910 | #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 | |
a0b6b246 JX |
911 | msgid "repo" |
912 | msgstr "仓库" | |
c04f5ac3 | 913 | |
87cb7997 | 914 | #: archive.c:440 builtin/archive.c:91 |
a0b6b246 JX |
915 | msgid "retrieve the archive from remote repository <repo>" |
916 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 917 | |
87cb7997 | 918 | #: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 |
a0b6b246 JX |
919 | msgid "command" |
920 | msgstr "命令" | |
921 | ||
87cb7997 | 922 | #: archive.c:442 builtin/archive.c:93 |
a0b6b246 JX |
923 | msgid "path to the remote git-upload-archive command" |
924 | msgstr "远程 git-upload-archive 命令的路径" | |
925 | ||
87cb7997 | 926 | #: archive.c:449 |
a0b6b246 JX |
927 | msgid "Unexpected option --remote" |
928 | msgstr "未知参数 --remote" | |
929 | ||
87cb7997 | 930 | #: archive.c:451 |
a0b6b246 JX |
931 | msgid "Option --exec can only be used together with --remote" |
932 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
933 | ||
87cb7997 | 934 | #: archive.c:453 |
a0b6b246 JX |
935 | msgid "Unexpected option --output" |
936 | msgstr "未知参数 --output" | |
937 | ||
87cb7997 | 938 | #: archive.c:475 |
a0b6b246 JX |
939 | #, c-format |
940 | msgid "Unknown archive format '%s'" | |
941 | msgstr "未知归档格式 '%s'" | |
942 | ||
87cb7997 | 943 | #: archive.c:482 |
8ada9598 | 944 | #, c-format |
a0b6b246 JX |
945 | msgid "Argument not supported for format '%s': -%d" |
946 | msgstr "参数不支持此格式 '%s':-%d" | |
947 | ||
87cb7997 JX |
948 | #: attr.c:212 |
949 | #, c-format | |
950 | msgid "%.*s is not a valid attribute name" | |
951 | msgstr "%.*s 不是一个有效的属性名" | |
952 | ||
953 | #: attr.c:408 | |
8ada9598 | 954 | msgid "" |
a0b6b246 JX |
955 | "Negative patterns are ignored in git attributes\n" |
956 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 957 | msgstr "" |
a0b6b246 JX |
958 | "负值模版在 git attributes 中被忽略\n" |
959 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 960 | |
87cb7997 | 961 | #: bisect.c:443 |
8ada9598 | 962 | #, c-format |
a0b6b246 JX |
963 | msgid "Could not open file '%s'" |
964 | msgstr "不能打开文件 '%s'" | |
8ada9598 | 965 | |
87cb7997 | 966 | #: bisect.c:448 |
8ada9598 | 967 | #, c-format |
a0b6b246 JX |
968 | msgid "Badly quoted content in file '%s': %s" |
969 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 970 | |
87cb7997 | 971 | #: bisect.c:656 |
a0b6b246 JX |
972 | #, c-format |
973 | msgid "We cannot bisect more!\n" | |
974 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 975 | |
87cb7997 | 976 | #: bisect.c:709 |
2e8451e8 | 977 | #, c-format |
a0b6b246 JX |
978 | msgid "Not a valid commit name %s" |
979 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 980 | |
87cb7997 | 981 | #: bisect.c:733 |
5b04ee3b JX |
982 | #, c-format |
983 | msgid "" | |
a0b6b246 JX |
984 | "The merge base %s is bad.\n" |
985 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 986 | msgstr "" |
a0b6b246 JX |
987 | "合并基线 %s 是坏的。\n" |
988 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 989 | |
87cb7997 | 990 | #: bisect.c:738 |
5b04ee3b | 991 | #, c-format |
a0b6b246 JX |
992 | msgid "" |
993 | "The merge base %s is new.\n" | |
994 | "The property has changed between %s and [%s].\n" | |
995 | msgstr "" | |
996 | "合并基线 %s 是新的。\n" | |
997 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 998 | |
87cb7997 | 999 | #: bisect.c:743 |
a0b6b246 JX |
1000 | #, c-format |
1001 | msgid "" | |
1002 | "The merge base %s is %s.\n" | |
1003 | "This means the first '%s' commit is between %s and [%s].\n" | |
1004 | msgstr "" | |
1005 | "合并基线 %s 是 %s。\n" | |
1006 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1007 | |
87cb7997 | 1008 | #: bisect.c:751 |
a0b6b246 JX |
1009 | #, c-format |
1010 | msgid "" | |
1a79b2f1 | 1011 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1012 | "git bisect cannot work properly in this case.\n" |
1013 | "Maybe you mistook %s and %s revs?\n" | |
1014 | msgstr "" | |
1015 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1016 | "这种情况下 git 二分查找无法正常工作。\n" | |
1017 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1018 | |
87cb7997 | 1019 | #: bisect.c:764 |
a0b6b246 JX |
1020 | #, c-format |
1021 | msgid "" | |
1022 | "the merge base between %s and [%s] must be skipped.\n" | |
1023 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1024 | "We continue anyway." | |
1025 | msgstr "" | |
1026 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1027 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1028 | "我们仍旧继续。" | |
649900bc | 1029 | |
87cb7997 | 1030 | #: bisect.c:799 |
649900bc | 1031 | #, c-format |
a0b6b246 JX |
1032 | msgid "Bisecting: a merge base must be tested\n" |
1033 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1034 | |
87cb7997 | 1035 | #: bisect.c:850 |
a0b6b246 JX |
1036 | #, c-format |
1037 | msgid "a %s revision is needed" | |
1038 | msgstr "需要一个 %s 版本" | |
649900bc | 1039 | |
87cb7997 | 1040 | #: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255 |
649900bc | 1041 | #, c-format |
a0b6b246 JX |
1042 | msgid "could not create file '%s'" |
1043 | msgstr "不能创建文件 '%s'" | |
649900bc | 1044 | |
87cb7997 | 1045 | #: bisect.c:918 |
649900bc | 1046 | #, c-format |
a0b6b246 JX |
1047 | msgid "could not read file '%s'" |
1048 | msgstr "不能读取文件 '%s'" | |
649900bc | 1049 | |
87cb7997 | 1050 | #: bisect.c:948 |
a0b6b246 JX |
1051 | msgid "reading bisect refs failed" |
1052 | msgstr "读取二分查找引用失败" | |
649900bc | 1053 | |
87cb7997 | 1054 | #: bisect.c:968 |
649900bc | 1055 | #, c-format |
a0b6b246 JX |
1056 | msgid "%s was both %s and %s\n" |
1057 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1058 | |
87cb7997 | 1059 | #: bisect.c:976 |
649900bc | 1060 | #, c-format |
a0b6b246 JX |
1061 | msgid "" |
1062 | "No testable commit found.\n" | |
1063 | "Maybe you started with bad path parameters?\n" | |
1064 | msgstr "" | |
1065 | "没有发现可测试的提交。\n" | |
1066 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1067 | |
87cb7997 | 1068 | #: bisect.c:995 |
649900bc | 1069 | #, c-format |
a0b6b246 JX |
1070 | msgid "(roughly %d step)" |
1071 | msgid_plural "(roughly %d steps)" | |
1072 | msgstr[0] "(大概 %d 步)" | |
1073 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1074 | |
a0b6b246 JX |
1075 | #. TRANSLATORS: the last %s will be replaced with |
1076 | #. "(roughly %d steps)" translation | |
87cb7997 | 1077 | #: bisect.c:999 |
649900bc | 1078 | #, c-format |
a0b6b246 JX |
1079 | msgid "Bisecting: %d revision left to test after this %s\n" |
1080 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1081 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1082 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1083 | |
a0b6b246 | 1084 | #: branch.c:53 |
649900bc | 1085 | #, c-format |
a0b6b246 JX |
1086 | msgid "" |
1087 | "\n" | |
1088 | "After fixing the error cause you may try to fix up\n" | |
1089 | "the remote tracking information by invoking\n" | |
1090 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1091 | msgstr "" | |
1092 | "\n" | |
1093 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1094 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1095 | |
a0b6b246 | 1096 | #: branch.c:67 |
649900bc | 1097 | #, c-format |
a0b6b246 JX |
1098 | msgid "Not setting branch %s as its own upstream." |
1099 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1100 | |
a0b6b246 | 1101 | #: branch.c:93 |
649900bc | 1102 | #, c-format |
a0b6b246 JX |
1103 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
1104 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
649900bc | 1105 | |
a0b6b246 | 1106 | #: branch.c:94 |
649900bc | 1107 | #, c-format |
a0b6b246 JX |
1108 | msgid "Branch %s set up to track remote branch %s from %s." |
1109 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
649900bc | 1110 | |
a0b6b246 | 1111 | #: branch.c:98 |
649900bc | 1112 | #, c-format |
a0b6b246 JX |
1113 | msgid "Branch %s set up to track local branch %s by rebasing." |
1114 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
649900bc | 1115 | |
a0b6b246 | 1116 | #: branch.c:99 |
649900bc | 1117 | #, c-format |
a0b6b246 JX |
1118 | msgid "Branch %s set up to track local branch %s." |
1119 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
649900bc | 1120 | |
a0b6b246 | 1121 | #: branch.c:104 |
649900bc | 1122 | #, c-format |
a0b6b246 JX |
1123 | msgid "Branch %s set up to track remote ref %s by rebasing." |
1124 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
649900bc | 1125 | |
a0b6b246 | 1126 | #: branch.c:105 |
649900bc | 1127 | #, c-format |
a0b6b246 JX |
1128 | msgid "Branch %s set up to track remote ref %s." |
1129 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
649900bc | 1130 | |
a0b6b246 | 1131 | #: branch.c:109 |
649900bc | 1132 | #, c-format |
a0b6b246 JX |
1133 | msgid "Branch %s set up to track local ref %s by rebasing." |
1134 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
649900bc | 1135 | |
a0b6b246 | 1136 | #: branch.c:110 |
649900bc | 1137 | #, c-format |
a0b6b246 JX |
1138 | msgid "Branch %s set up to track local ref %s." |
1139 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
649900bc | 1140 | |
a0b6b246 JX |
1141 | #: branch.c:119 |
1142 | msgid "Unable to write upstream branch configuration" | |
1143 | msgstr "无法写入上游分支配置" | |
649900bc | 1144 | |
a0b6b246 | 1145 | #: branch.c:156 |
649900bc | 1146 | #, c-format |
a0b6b246 JX |
1147 | msgid "Not tracking: ambiguous information for ref %s" |
1148 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1149 | |
a0b6b246 | 1150 | #: branch.c:185 |
649900bc | 1151 | #, c-format |
a0b6b246 JX |
1152 | msgid "'%s' is not a valid branch name." |
1153 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1154 | |
a0b6b246 | 1155 | #: branch.c:190 |
649900bc | 1156 | #, c-format |
a0b6b246 JX |
1157 | msgid "A branch named '%s' already exists." |
1158 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1159 | |
a0b6b246 JX |
1160 | #: branch.c:198 |
1161 | msgid "Cannot force update the current branch." | |
1162 | msgstr "无法强制更新当前分支。" | |
649900bc | 1163 | |
a0b6b246 | 1164 | #: branch.c:218 |
649900bc | 1165 | #, c-format |
a0b6b246 JX |
1166 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1167 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1168 | |
a0b6b246 | 1169 | #: branch.c:220 |
649900bc | 1170 | #, c-format |
a0b6b246 JX |
1171 | msgid "the requested upstream branch '%s' does not exist" |
1172 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1173 | |
a0b6b246 JX |
1174 | #: branch.c:222 |
1175 | msgid "" | |
1176 | "\n" | |
1177 | "If you are planning on basing your work on an upstream\n" | |
1178 | "branch that already exists at the remote, you may need to\n" | |
1179 | "run \"git fetch\" to retrieve it.\n" | |
1180 | "\n" | |
1181 | "If you are planning to push out a new local branch that\n" | |
1182 | "will track its remote counterpart, you may want to use\n" | |
1183 | "\"git push -u\" to set the upstream config as you push." | |
1184 | msgstr "" | |
1185 | "\n" | |
1186 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1187 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1188 | "\n" | |
1189 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1190 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1191 | |
275588f9 | 1192 | #: branch.c:265 |
649900bc | 1193 | #, c-format |
a0b6b246 JX |
1194 | msgid "Not a valid object name: '%s'." |
1195 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1196 | |
275588f9 | 1197 | #: branch.c:285 |
649900bc | 1198 | #, c-format |
a0b6b246 JX |
1199 | msgid "Ambiguous object name: '%s'." |
1200 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1201 | |
275588f9 | 1202 | #: branch.c:290 |
649900bc | 1203 | #, c-format |
a0b6b246 JX |
1204 | msgid "Not a valid branch point: '%s'." |
1205 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1206 | |
275588f9 | 1207 | #: branch.c:344 |
649900bc | 1208 | #, c-format |
a0b6b246 JX |
1209 | msgid "'%s' is already checked out at '%s'" |
1210 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1211 | |
87cb7997 | 1212 | #: branch.c:364 |
a0b6b246 JX |
1213 | #, c-format |
1214 | msgid "HEAD of working tree %s is not updated" | |
1215 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1216 | |
a0b6b246 | 1217 | #: bundle.c:34 |
649900bc | 1218 | #, c-format |
a0b6b246 JX |
1219 | msgid "'%s' does not look like a v2 bundle file" |
1220 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1221 | |
a0b6b246 JX |
1222 | #: bundle.c:61 |
1223 | #, c-format | |
1224 | msgid "unrecognized header: %s%s (%d)" | |
1225 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1226 | |
87cb7997 | 1227 | #: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777 |
649900bc | 1228 | #, c-format |
a0b6b246 JX |
1229 | msgid "could not open '%s'" |
1230 | msgstr "不能打开 '%s'" | |
649900bc | 1231 | |
a0b6b246 JX |
1232 | #: bundle.c:139 |
1233 | msgid "Repository lacks these prerequisite commits:" | |
1234 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1235 | |
87cb7997 JX |
1236 | #: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299 |
1237 | #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 | |
1238 | #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 | |
1239 | #: builtin/merge.c:359 builtin/shortlog.c:176 | |
a0b6b246 JX |
1240 | msgid "revision walk setup failed" |
1241 | msgstr "版本遍历设置失败" | |
2e8451e8 | 1242 | |
a0b6b246 | 1243 | #: bundle.c:185 |
2e8451e8 | 1244 | #, c-format |
a0b6b246 JX |
1245 | msgid "The bundle contains this ref:" |
1246 | msgid_plural "The bundle contains these %d refs:" | |
1247 | msgstr[0] "这个包中含有这个引用:" | |
1248 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1249 | |
a0b6b246 JX |
1250 | #: bundle.c:192 |
1251 | msgid "The bundle records a complete history." | |
1252 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1253 | |
a0b6b246 | 1254 | #: bundle.c:194 |
2e8451e8 | 1255 | #, c-format |
a0b6b246 JX |
1256 | msgid "The bundle requires this ref:" |
1257 | msgid_plural "The bundle requires these %d refs:" | |
1258 | msgstr[0] "这个包需要这个引用:" | |
1259 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1260 | |
a0b6b246 JX |
1261 | #: bundle.c:253 |
1262 | msgid "Could not spawn pack-objects" | |
1263 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1264 | |
a0b6b246 JX |
1265 | #: bundle.c:264 |
1266 | msgid "pack-objects died" | |
1267 | msgstr "pack-objects 终止" | |
8ada9598 | 1268 | |
a0b6b246 JX |
1269 | #: bundle.c:304 |
1270 | msgid "rev-list died" | |
1271 | msgstr "rev-list 终止" | |
1272 | ||
1273 | #: bundle.c:353 | |
81809b99 | 1274 | #, c-format |
a0b6b246 JX |
1275 | msgid "ref '%s' is excluded by the rev-list options" |
1276 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1277 | |
87cb7997 | 1278 | #: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 |
81809b99 | 1279 | #, c-format |
a0b6b246 JX |
1280 | msgid "unrecognized argument: %s" |
1281 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1282 | |
a0b6b246 JX |
1283 | #: bundle.c:451 |
1284 | msgid "Refusing to create empty bundle." | |
1285 | msgstr "不能创建空包。" | |
1286 | ||
1287 | #: bundle.c:463 | |
81809b99 | 1288 | #, c-format |
a0b6b246 JX |
1289 | msgid "cannot create '%s'" |
1290 | msgstr "不能创建 '%s'" | |
8ada9598 | 1291 | |
a0b6b246 JX |
1292 | #: bundle.c:491 |
1293 | msgid "index-pack died" | |
1294 | msgstr "index-pack 终止" | |
63af42fe | 1295 | |
1a79b2f1 | 1296 | #: color.c:300 |
94550ed3 | 1297 | #, c-format |
a0b6b246 JX |
1298 | msgid "invalid color value: %.*s" |
1299 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1300 | |
87cb7997 | 1301 | #: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457 |
1a79b2f1 | 1302 | #: builtin/am.c:1493 builtin/am.c:2127 |
94550ed3 | 1303 | #, c-format |
a0b6b246 JX |
1304 | msgid "could not parse %s" |
1305 | msgstr "不能解析 %s" | |
94550ed3 | 1306 | |
a0b6b246 JX |
1307 | #: commit.c:42 |
1308 | #, c-format | |
1309 | msgid "%s %s is not a commit!" | |
1310 | msgstr "%s %s 不是一个提交!" | |
90314792 | 1311 | |
87cb7997 | 1312 | #: commit.c:1511 |
90314792 | 1313 | msgid "" |
a0b6b246 JX |
1314 | "Warning: commit message did not conform to UTF-8.\n" |
1315 | "You may want to amend it after fixing the message, or set the config\n" | |
1316 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1317 | msgstr "" | |
29004bbb | 1318 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1319 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1320 | "设置为您项目所用的字符编码。\n" |
90314792 | 1321 | |
a0b6b246 JX |
1322 | #: compat/obstack.c:406 compat/obstack.c:408 |
1323 | msgid "memory exhausted" | |
1324 | msgstr "内存耗尽" | |
90314792 | 1325 | |
87cb7997 JX |
1326 | #: config.c:191 |
1327 | msgid "relative config include conditionals must come from files" | |
1328 | msgstr "包含相对路径的条件引用必须来自于文件" | |
1329 | ||
1330 | #: config.c:701 | |
90314792 | 1331 | #, c-format |
a0b6b246 JX |
1332 | msgid "bad config line %d in blob %s" |
1333 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1334 | |
87cb7997 | 1335 | #: config.c:705 |
a77c07d9 | 1336 | #, c-format |
a0b6b246 JX |
1337 | msgid "bad config line %d in file %s" |
1338 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1339 | |
87cb7997 | 1340 | #: config.c:709 |
a77c07d9 | 1341 | #, c-format |
a0b6b246 JX |
1342 | msgid "bad config line %d in standard input" |
1343 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1344 | |
87cb7997 | 1345 | #: config.c:713 |
90314792 | 1346 | #, c-format |
a0b6b246 JX |
1347 | msgid "bad config line %d in submodule-blob %s" |
1348 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1349 | |
87cb7997 | 1350 | #: config.c:717 |
90314792 | 1351 | #, c-format |
a0b6b246 JX |
1352 | msgid "bad config line %d in command line %s" |
1353 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1354 | |
87cb7997 | 1355 | #: config.c:721 |
90314792 | 1356 | #, c-format |
a0b6b246 JX |
1357 | msgid "bad config line %d in %s" |
1358 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1359 | |
87cb7997 | 1360 | #: config.c:840 |
a0b6b246 JX |
1361 | msgid "out of range" |
1362 | msgstr "超出范围" | |
6c94aba5 | 1363 | |
87cb7997 | 1364 | #: config.c:840 |
a0b6b246 JX |
1365 | msgid "invalid unit" |
1366 | msgstr "无效的单位" | |
6c94aba5 | 1367 | |
87cb7997 | 1368 | #: config.c:846 |
6c94aba5 | 1369 | #, c-format |
a0b6b246 JX |
1370 | msgid "bad numeric config value '%s' for '%s': %s" |
1371 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1372 | |
87cb7997 | 1373 | #: config.c:851 |
1b7f4a34 | 1374 | #, c-format |
a0b6b246 JX |
1375 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1376 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1377 | |
87cb7997 | 1378 | #: config.c:854 |
1b7f4a34 | 1379 | #, c-format |
a0b6b246 JX |
1380 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1381 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1382 | |
87cb7997 | 1383 | #: config.c:857 |
1b7f4a34 | 1384 | #, c-format |
a0b6b246 JX |
1385 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1386 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1387 | |
87cb7997 | 1388 | #: config.c:860 |
1b7f4a34 | 1389 | #, c-format |
a0b6b246 JX |
1390 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1391 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1392 | |
87cb7997 | 1393 | #: config.c:863 |
94550ed3 | 1394 | #, c-format |
a0b6b246 JX |
1395 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1396 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1397 | |
87cb7997 | 1398 | #: config.c:866 |
276ceeaa | 1399 | #, c-format |
a0b6b246 JX |
1400 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1401 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1402 | |
87cb7997 | 1403 | #: config.c:953 |
276ceeaa | 1404 | #, c-format |
a0b6b246 JX |
1405 | msgid "failed to expand user dir in: '%s'" |
1406 | msgstr "无法扩展 '%s' 中的用户目录" | |
94550ed3 | 1407 | |
87cb7997 | 1408 | #: config.c:1048 config.c:1059 |
3495628d | 1409 | #, c-format |
a0b6b246 JX |
1410 | msgid "bad zlib compression level %d" |
1411 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1412 | |
87cb7997 | 1413 | #: config.c:1176 |
3495628d | 1414 | #, c-format |
a0b6b246 JX |
1415 | msgid "invalid mode for object creation: %s" |
1416 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1417 | |
87cb7997 | 1418 | #: config.c:1332 |
1a79b2f1 JX |
1419 | #, c-format |
1420 | msgid "bad pack compression level %d" | |
1421 | msgstr "错误的打包压缩级别 %d" | |
1422 | ||
87cb7997 | 1423 | #: config.c:1522 |
a0b6b246 JX |
1424 | msgid "unable to parse command-line config" |
1425 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1426 | |
87cb7997 | 1427 | #: config.c:1572 |
a0b6b246 JX |
1428 | msgid "unknown error occurred while reading the configuration files" |
1429 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1430 | |
87cb7997 JX |
1431 | #: config.c:1931 |
1432 | #, c-format | |
1433 | msgid "Invalid %s: '%s'" | |
1434 | msgstr "无效 %s:'%s'" | |
1435 | ||
1436 | #: config.c:1952 | |
1437 | #, c-format | |
1438 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1439 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1440 | ||
1441 | #: config.c:1978 | |
1442 | #, c-format | |
1443 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1444 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1445 | ||
1446 | #: config.c:1989 | |
276ceeaa | 1447 | #, c-format |
a0b6b246 JX |
1448 | msgid "unable to parse '%s' from command-line config" |
1449 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1450 | |
87cb7997 | 1451 | #: config.c:1991 |
94550ed3 | 1452 | #, c-format |
a0b6b246 JX |
1453 | msgid "bad config variable '%s' in file '%s' at line %d" |
1454 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1455 | |
87cb7997 | 1456 | #: config.c:2050 |
276ceeaa | 1457 | #, c-format |
a0b6b246 JX |
1458 | msgid "%s has multiple values" |
1459 | msgstr "%s 有多个取值" | |
276ceeaa | 1460 | |
87cb7997 | 1461 | #: config.c:2384 config.c:2609 |
1a79b2f1 JX |
1462 | #, c-format |
1463 | msgid "fstat on %s failed" | |
1464 | msgstr "在 %s 上执行 fstat 失败" | |
1465 | ||
87cb7997 | 1466 | #: config.c:2502 |
94550ed3 | 1467 | #, c-format |
a0b6b246 JX |
1468 | msgid "could not set '%s' to '%s'" |
1469 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1470 | |
87cb7997 | 1471 | #: config.c:2504 builtin/remote.c:774 |
276ceeaa | 1472 | #, c-format |
a0b6b246 JX |
1473 | msgid "could not unset '%s'" |
1474 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1475 | |
a0b6b246 JX |
1476 | #: connect.c:49 |
1477 | msgid "The remote end hung up upon initial contact" | |
29004bbb | 1478 | msgstr "远端在连接发起时即挂断" |
94550ed3 | 1479 | |
a0b6b246 JX |
1480 | #: connect.c:51 |
1481 | msgid "" | |
1482 | "Could not read from remote repository.\n" | |
1483 | "\n" | |
1484 | "Please make sure you have the correct access rights\n" | |
1485 | "and the repository exists." | |
1486 | msgstr "" | |
1487 | "无法读取远程仓库。\n" | |
1488 | "\n" | |
1489 | "请确认您有正确的访问权限并且仓库存在。" | |
1490 | ||
1a79b2f1 | 1491 | #: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 |
a0b6b246 JX |
1492 | msgid "Checking connectivity" |
1493 | msgstr "检查连接中" | |
1494 | ||
1495 | #: connected.c:75 | |
1496 | msgid "Could not run 'git rev-list'" | |
1497 | msgstr "不能执行 'git rev-list'" | |
1498 | ||
1499 | #: connected.c:95 | |
1500 | msgid "failed write to rev-list" | |
1501 | msgstr "无法写入 rev-list" | |
1502 | ||
1503 | #: connected.c:102 | |
1504 | msgid "failed to close rev-list's stdin" | |
1505 | msgstr "无法关闭 rev-list 的标准输入" | |
1506 | ||
1507 | #: convert.c:201 | |
3495628d | 1508 | #, c-format |
a0b6b246 JX |
1509 | msgid "" |
1510 | "CRLF will be replaced by LF in %s.\n" | |
1511 | "The file will have its original line endings in your working directory." | |
1512 | msgstr "" | |
1513 | "文件 %s 中的 CRLF 将被 LF 替换。\n" | |
1514 | "在工作区中该文件仍保持原有的换行符。" | |
3495628d | 1515 | |
a0b6b246 | 1516 | #: convert.c:205 |
3495628d | 1517 | #, c-format |
a0b6b246 JX |
1518 | msgid "CRLF would be replaced by LF in %s." |
1519 | msgstr "文件 %s 中的 CRLF 将被 LF 替换。" | |
3495628d | 1520 | |
a0b6b246 | 1521 | #: convert.c:211 |
276ceeaa | 1522 | #, c-format |
a0b6b246 JX |
1523 | msgid "" |
1524 | "LF will be replaced by CRLF in %s.\n" | |
1525 | "The file will have its original line endings in your working directory." | |
1526 | msgstr "" | |
1527 | "文件 %s 中的 LF 将被 CRLF 替换。\n" | |
1528 | "在工作区中该文件仍保持原有的换行符。" | |
276ceeaa | 1529 | |
a0b6b246 | 1530 | #: convert.c:215 |
3495628d | 1531 | #, c-format |
a0b6b246 JX |
1532 | msgid "LF would be replaced by CRLF in %s" |
1533 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 1534 | |
a0b6b246 JX |
1535 | #: date.c:97 |
1536 | msgid "in the future" | |
1537 | msgstr "在将来" | |
3495628d | 1538 | |
a0b6b246 | 1539 | #: date.c:103 |
3495628d | 1540 | #, c-format |
a0b6b246 JX |
1541 | msgid "%lu second ago" |
1542 | msgid_plural "%lu seconds ago" | |
1543 | msgstr[0] "%lu 秒钟前" | |
1544 | msgstr[1] "%lu 秒钟前" | |
3495628d | 1545 | |
a0b6b246 | 1546 | #: date.c:110 |
3495628d | 1547 | #, c-format |
a0b6b246 JX |
1548 | msgid "%lu minute ago" |
1549 | msgid_plural "%lu minutes ago" | |
1550 | msgstr[0] "%lu 分钟前" | |
1551 | msgstr[1] "%lu 分钟前" | |
3495628d | 1552 | |
a0b6b246 | 1553 | #: date.c:117 |
3495628d | 1554 | #, c-format |
a0b6b246 JX |
1555 | msgid "%lu hour ago" |
1556 | msgid_plural "%lu hours ago" | |
1557 | msgstr[0] "%lu 小时前" | |
1558 | msgstr[1] "%lu 小时前" | |
3495628d | 1559 | |
a0b6b246 | 1560 | #: date.c:124 |
3495628d | 1561 | #, c-format |
a0b6b246 JX |
1562 | msgid "%lu day ago" |
1563 | msgid_plural "%lu days ago" | |
1564 | msgstr[0] "%lu 天前" | |
1565 | msgstr[1] "%lu 天前" | |
3495628d | 1566 | |
a0b6b246 | 1567 | #: date.c:130 |
94550ed3 | 1568 | #, c-format |
a0b6b246 JX |
1569 | msgid "%lu week ago" |
1570 | msgid_plural "%lu weeks ago" | |
1571 | msgstr[0] "%lu 周前" | |
1572 | msgstr[1] "%lu 周前" | |
94550ed3 | 1573 | |
a0b6b246 | 1574 | #: date.c:137 |
3495628d | 1575 | #, c-format |
a0b6b246 JX |
1576 | msgid "%lu month ago" |
1577 | msgid_plural "%lu months ago" | |
1578 | msgstr[0] "%lu 个月前" | |
1579 | msgstr[1] "%lu 个月前" | |
3495628d | 1580 | |
a0b6b246 | 1581 | #: date.c:148 |
3495628d | 1582 | #, c-format |
a0b6b246 JX |
1583 | msgid "%lu year" |
1584 | msgid_plural "%lu years" | |
1585 | msgstr[0] "%lu 年" | |
1586 | msgstr[1] "%lu 年" | |
3495628d | 1587 | |
a0b6b246 JX |
1588 | #. TRANSLATORS: "%s" is "<n> years" |
1589 | #: date.c:151 | |
94550ed3 | 1590 | #, c-format |
a0b6b246 JX |
1591 | msgid "%s, %lu month ago" |
1592 | msgid_plural "%s, %lu months ago" | |
1593 | msgstr[0] "%s %lu 个月前" | |
1594 | msgstr[1] "%s %lu 个月前" | |
94550ed3 | 1595 | |
a0b6b246 | 1596 | #: date.c:156 date.c:161 |
94550ed3 | 1597 | #, c-format |
a0b6b246 JX |
1598 | msgid "%lu year ago" |
1599 | msgid_plural "%lu years ago" | |
1600 | msgstr[0] "%lu 年前" | |
1601 | msgstr[1] "%lu 年前" | |
94550ed3 | 1602 | |
a0b6b246 | 1603 | #: diffcore-order.c:24 |
cfff71a9 | 1604 | #, c-format |
a0b6b246 JX |
1605 | msgid "failed to read orderfile '%s'" |
1606 | msgstr "无法读取排序文件 '%s'" | |
cfff71a9 | 1607 | |
275588f9 | 1608 | #: diffcore-rename.c:536 |
a0b6b246 | 1609 | msgid "Performing inexact rename detection" |
87cb7997 | 1610 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 1611 | |
a0b6b246 | 1612 | #: diff.c:62 |
cfff71a9 | 1613 | #, c-format |
a0b6b246 JX |
1614 | msgid "option '%s' requires a value" |
1615 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 1616 | |
a0b6b246 JX |
1617 | # 译者:注意保持前导空格 |
1618 | #: diff.c:124 | |
1619 | #, c-format | |
1620 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
1621 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 1622 | |
a0b6b246 JX |
1623 | # 译者:注意保持前导空格 |
1624 | #: diff.c:129 | |
1625 | #, c-format | |
1626 | msgid " Unknown dirstat parameter '%s'\n" | |
1627 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 1628 | |
1a79b2f1 | 1629 | #: diff.c:281 |
7aea43ff | 1630 | #, c-format |
a0b6b246 JX |
1631 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
1632 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 1633 | |
1a79b2f1 | 1634 | #: diff.c:344 |
7aea43ff | 1635 | #, c-format |
a0b6b246 JX |
1636 | msgid "" |
1637 | "Found errors in 'diff.dirstat' config variable:\n" | |
1638 | "%s" | |
1639 | msgstr "" | |
1640 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
1641 | "%s" | |
7aea43ff | 1642 | |
87cb7997 | 1643 | #: diff.c:3102 |
7aea43ff | 1644 | #, c-format |
a0b6b246 JX |
1645 | msgid "external diff died, stopping at %s" |
1646 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 1647 | |
87cb7997 | 1648 | #: diff.c:3428 |
a0b6b246 JX |
1649 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
1650 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
1651 | ||
87cb7997 | 1652 | #: diff.c:3518 |
a0b6b246 JX |
1653 | msgid "--follow requires exactly one pathspec" |
1654 | msgstr "--follow 明确要求只跟一个路径规格" | |
1655 | ||
87cb7997 | 1656 | #: diff.c:3681 |
7aea43ff | 1657 | #, c-format |
a0b6b246 JX |
1658 | msgid "" |
1659 | "Failed to parse --dirstat/-X option parameter:\n" | |
1660 | "%s" | |
1661 | msgstr "" | |
1662 | "无法解析 --dirstat/-X 选项的参数:\n" | |
1663 | "%s" | |
7aea43ff | 1664 | |
87cb7997 | 1665 | #: diff.c:3695 |
7aea43ff | 1666 | #, c-format |
a0b6b246 JX |
1667 | msgid "Failed to parse --submodule option parameter: '%s'" |
1668 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 1669 | |
87cb7997 | 1670 | #: diff.c:4719 |
a0b6b246 JX |
1671 | msgid "inexact rename detection was skipped due to too many files." |
1672 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
1673 | ||
87cb7997 | 1674 | #: diff.c:4722 |
a0b6b246 JX |
1675 | msgid "only found copies from modified paths due to too many files." |
1676 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
1677 | ||
87cb7997 | 1678 | #: diff.c:4725 |
7aea43ff | 1679 | #, c-format |
a0b6b246 JX |
1680 | msgid "" |
1681 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 1682 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 1683 | |
87cb7997 | 1684 | #: dir.c:1899 |
a0b6b246 JX |
1685 | msgid "failed to get kernel name and information" |
1686 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 1687 | |
87cb7997 | 1688 | #: dir.c:2018 |
a0b6b246 JX |
1689 | msgid "Untracked cache is disabled on this system or location." |
1690 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 1691 | |
87cb7997 JX |
1692 | #: dir.c:2776 dir.c:2781 |
1693 | #, c-format | |
1694 | msgid "could not create directories for %s" | |
1695 | msgstr "不能为 %s 创建目录" | |
1696 | ||
1697 | #: dir.c:2806 | |
1a79b2f1 JX |
1698 | #, c-format |
1699 | msgid "could not migrate git directory from '%s' to '%s'" | |
1700 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
1701 | ||
87cb7997 JX |
1702 | #: entry.c:280 |
1703 | #, c-format | |
1704 | msgid "could not stat file '%s'" | |
1705 | msgstr "不能获取文件 %s 的状态" | |
1706 | ||
1707 | #: fetch-pack.c:249 | |
a0b6b246 JX |
1708 | msgid "git fetch-pack: expected shallow list" |
1709 | msgstr "git fetch-pack:应为 shallow 列表" | |
1710 | ||
87cb7997 | 1711 | #: fetch-pack.c:261 |
a0b6b246 JX |
1712 | msgid "git fetch-pack: expected ACK/NAK, got EOF" |
1713 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" | |
1714 | ||
87cb7997 | 1715 | #: fetch-pack.c:279 |
90314792 | 1716 | #, c-format |
275588f9 | 1717 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 1718 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 1719 | |
87cb7997 | 1720 | #: fetch-pack.c:331 |
a0b6b246 JX |
1721 | msgid "--stateless-rpc requires multi_ack_detailed" |
1722 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 1723 | |
87cb7997 | 1724 | #: fetch-pack.c:417 |
90314792 | 1725 | #, c-format |
a0b6b246 JX |
1726 | msgid "invalid shallow line: %s" |
1727 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 1728 | |
87cb7997 | 1729 | #: fetch-pack.c:423 |
c04f5ac3 | 1730 | #, c-format |
a0b6b246 JX |
1731 | msgid "invalid unshallow line: %s" |
1732 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 1733 | |
87cb7997 | 1734 | #: fetch-pack.c:425 |
a0b6b246 JX |
1735 | #, c-format |
1736 | msgid "object not found: %s" | |
1737 | msgstr "对象未找到:%s" | |
07432cef | 1738 | |
87cb7997 | 1739 | #: fetch-pack.c:428 |
c04f5ac3 | 1740 | #, c-format |
a0b6b246 JX |
1741 | msgid "error in object: %s" |
1742 | msgstr "对象中出错:%s" | |
07432cef | 1743 | |
87cb7997 | 1744 | #: fetch-pack.c:430 |
c04f5ac3 | 1745 | #, c-format |
a0b6b246 JX |
1746 | msgid "no shallow found: %s" |
1747 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 1748 | |
87cb7997 | 1749 | #: fetch-pack.c:433 |
a0b6b246 JX |
1750 | #, c-format |
1751 | msgid "expected shallow/unshallow, got %s" | |
1752 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 1753 | |
87cb7997 | 1754 | #: fetch-pack.c:472 |
a0b6b246 JX |
1755 | #, c-format |
1756 | msgid "got %s %d %s" | |
1757 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 1758 | |
87cb7997 | 1759 | #: fetch-pack.c:486 |
1b7f4a34 | 1760 | #, c-format |
a0b6b246 JX |
1761 | msgid "invalid commit %s" |
1762 | msgstr "无效提交 %s" | |
1b7f4a34 | 1763 | |
87cb7997 | 1764 | #: fetch-pack.c:519 |
a0b6b246 JX |
1765 | msgid "giving up" |
1766 | msgstr "放弃" | |
814ff314 | 1767 | |
87cb7997 | 1768 | #: fetch-pack.c:529 progress.c:235 |
a0b6b246 JX |
1769 | msgid "done" |
1770 | msgstr "完成" | |
2e8451e8 | 1771 | |
87cb7997 | 1772 | #: fetch-pack.c:541 |
2e8451e8 | 1773 | #, c-format |
a0b6b246 JX |
1774 | msgid "got %s (%d) %s" |
1775 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 1776 | |
87cb7997 | 1777 | #: fetch-pack.c:587 |
a0b6b246 JX |
1778 | #, c-format |
1779 | msgid "Marking %s as complete" | |
1780 | msgstr "标记 %s 为完成" | |
220c313c | 1781 | |
87cb7997 | 1782 | #: fetch-pack.c:735 |
a0b6b246 JX |
1783 | #, c-format |
1784 | msgid "already have %s (%s)" | |
29004bbb | 1785 | msgstr "已经有 %s(%s)" |
220c313c | 1786 | |
87cb7997 | 1787 | #: fetch-pack.c:773 |
a0b6b246 JX |
1788 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
1789 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 1790 | |
87cb7997 | 1791 | #: fetch-pack.c:781 |
a0b6b246 JX |
1792 | msgid "protocol error: bad pack header" |
1793 | msgstr "协议错误:坏的包头" | |
814ff314 | 1794 | |
87cb7997 | 1795 | #: fetch-pack.c:837 |
a0b6b246 JX |
1796 | #, c-format |
1797 | msgid "fetch-pack: unable to fork off %s" | |
1798 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 1799 | |
87cb7997 | 1800 | #: fetch-pack.c:853 |
a0b6b246 JX |
1801 | #, c-format |
1802 | msgid "%s failed" | |
1803 | msgstr "%s 失败" | |
14c8bced | 1804 | |
87cb7997 | 1805 | #: fetch-pack.c:855 |
a0b6b246 JX |
1806 | msgid "error in sideband demultiplexer" |
1807 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 1808 | |
87cb7997 | 1809 | #: fetch-pack.c:882 |
a0b6b246 JX |
1810 | msgid "Server does not support shallow clients" |
1811 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 1812 | |
87cb7997 | 1813 | #: fetch-pack.c:886 |
a0b6b246 JX |
1814 | msgid "Server supports multi_ack_detailed" |
1815 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 1816 | |
87cb7997 | 1817 | #: fetch-pack.c:889 |
a0b6b246 JX |
1818 | msgid "Server supports no-done" |
1819 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 1820 | |
87cb7997 | 1821 | #: fetch-pack.c:895 |
a0b6b246 JX |
1822 | msgid "Server supports multi_ack" |
1823 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 1824 | |
87cb7997 | 1825 | #: fetch-pack.c:899 |
a0b6b246 JX |
1826 | msgid "Server supports side-band-64k" |
1827 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 1828 | |
87cb7997 | 1829 | #: fetch-pack.c:903 |
a0b6b246 JX |
1830 | msgid "Server supports side-band" |
1831 | msgstr "服务器支持 side-band" | |
5c57d762 | 1832 | |
87cb7997 | 1833 | #: fetch-pack.c:907 |
a0b6b246 JX |
1834 | msgid "Server supports allow-tip-sha1-in-want" |
1835 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 1836 | |
87cb7997 | 1837 | #: fetch-pack.c:911 |
a0b6b246 JX |
1838 | msgid "Server supports allow-reachable-sha1-in-want" |
1839 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 1840 | |
87cb7997 | 1841 | #: fetch-pack.c:921 |
a0b6b246 JX |
1842 | msgid "Server supports ofs-delta" |
1843 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 1844 | |
87cb7997 | 1845 | #: fetch-pack.c:928 |
81809b99 | 1846 | #, c-format |
a0b6b246 JX |
1847 | msgid "Server version is %.*s" |
1848 | msgstr "服务器版本 %.*s" | |
8ada9598 | 1849 | |
87cb7997 | 1850 | #: fetch-pack.c:934 |
a0b6b246 JX |
1851 | msgid "Server does not support --shallow-since" |
1852 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 1853 | |
87cb7997 | 1854 | #: fetch-pack.c:938 |
a0b6b246 JX |
1855 | msgid "Server does not support --shallow-exclude" |
1856 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 1857 | |
87cb7997 | 1858 | #: fetch-pack.c:940 |
a0b6b246 JX |
1859 | msgid "Server does not support --deepen" |
1860 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 1861 | |
87cb7997 | 1862 | #: fetch-pack.c:951 |
a0b6b246 JX |
1863 | msgid "no common commits" |
1864 | msgstr "没有共同的提交" | |
c04f5ac3 | 1865 | |
87cb7997 | 1866 | #: fetch-pack.c:963 |
a0b6b246 JX |
1867 | msgid "git fetch-pack: fetch failed." |
1868 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 1869 | |
87cb7997 | 1870 | #: fetch-pack.c:1125 |
a0b6b246 JX |
1871 | msgid "no matching remote head" |
1872 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 1873 | |
87cb7997 JX |
1874 | #: fetch-pack.c:1147 |
1875 | #, c-format | |
1876 | msgid "no such remote ref %s" | |
1877 | msgstr "没有这样的远程引用 %s" | |
1878 | ||
1879 | #: fetch-pack.c:1150 | |
1880 | #, c-format | |
1881 | msgid "Server does not allow request for unadvertised object %s" | |
1882 | msgstr "服务器不允许请求未公开的对象 %s" | |
1883 | ||
a0b6b246 JX |
1884 | #: gpg-interface.c:185 |
1885 | msgid "gpg failed to sign the data" | |
1886 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 1887 | |
a0b6b246 JX |
1888 | #: gpg-interface.c:215 |
1889 | msgid "could not create temporary file" | |
1890 | msgstr "不能创建临时文件" | |
c04f5ac3 | 1891 | |
a0b6b246 | 1892 | #: gpg-interface.c:217 |
c04f5ac3 | 1893 | #, c-format |
a0b6b246 JX |
1894 | msgid "failed writing detached signature to '%s'" |
1895 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 1896 | |
1a79b2f1 JX |
1897 | #: graph.c:96 |
1898 | #, c-format | |
1899 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
1900 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
1901 | ||
87cb7997 | 1902 | #: grep.c:1796 |
c04f5ac3 | 1903 | #, c-format |
a0b6b246 JX |
1904 | msgid "'%s': unable to read %s" |
1905 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 1906 | |
87cb7997 | 1907 | #: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 |
c04f5ac3 | 1908 | #, c-format |
a0b6b246 JX |
1909 | msgid "failed to stat '%s'" |
1910 | msgstr "无法枚举 '%s' 状态" | |
c04f5ac3 | 1911 | |
87cb7997 | 1912 | #: grep.c:1824 |
a0b6b246 JX |
1913 | #, c-format |
1914 | msgid "'%s': short read" | |
1915 | msgstr "'%s':读取不完整" | |
5c57d762 | 1916 | |
1a79b2f1 | 1917 | #: help.c:218 |
a0b6b246 JX |
1918 | #, c-format |
1919 | msgid "available git commands in '%s'" | |
1920 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 1921 | |
1a79b2f1 | 1922 | #: help.c:225 |
a0b6b246 JX |
1923 | msgid "git commands available from elsewhere on your $PATH" |
1924 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 1925 | |
1a79b2f1 | 1926 | #: help.c:256 |
a0b6b246 JX |
1927 | msgid "These are common Git commands used in various situations:" |
1928 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 1929 | |
1a79b2f1 | 1930 | #: help.c:321 |
c04f5ac3 | 1931 | #, c-format |
a0b6b246 JX |
1932 | msgid "" |
1933 | "'%s' appears to be a git command, but we were not\n" | |
1934 | "able to execute it. Maybe git-%s is broken?" | |
1935 | msgstr "" | |
1936 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
1937 | "可能是 git-%s 受损?" | |
c04f5ac3 | 1938 | |
1a79b2f1 | 1939 | #: help.c:376 |
a0b6b246 JX |
1940 | msgid "Uh oh. Your system reports no Git commands at all." |
1941 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 1942 | |
1a79b2f1 | 1943 | #: help.c:398 |
c04f5ac3 | 1944 | #, c-format |
a0b6b246 JX |
1945 | msgid "" |
1946 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
1947 | "Continuing under the assumption that you meant '%s'" | |
1948 | msgstr "" | |
1949 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" | |
1950 | "是 '%s'" | |
c04f5ac3 | 1951 | |
1a79b2f1 | 1952 | #: help.c:403 |
c04f5ac3 | 1953 | #, c-format |
a0b6b246 JX |
1954 | msgid "in %0.1f seconds automatically..." |
1955 | msgstr "在 %0.1f 秒钟后自动运行..." | |
c04f5ac3 | 1956 | |
1a79b2f1 | 1957 | #: help.c:410 |
c04f5ac3 | 1958 | #, c-format |
a0b6b246 JX |
1959 | msgid "git: '%s' is not a git command. See 'git --help'." |
1960 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 1961 | |
1a79b2f1 | 1962 | #: help.c:414 help.c:480 |
a0b6b246 JX |
1963 | msgid "" |
1964 | "\n" | |
1965 | "Did you mean this?" | |
1966 | msgid_plural "" | |
1967 | "\n" | |
1968 | "Did you mean one of these?" | |
1969 | msgstr[0] "" | |
1970 | "\n" | |
1971 | "您指的是这个么?" | |
1972 | msgstr[1] "" | |
1973 | "\n" | |
1974 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 1975 | |
1a79b2f1 | 1976 | #: help.c:476 |
c04f5ac3 | 1977 | #, c-format |
a0b6b246 JX |
1978 | msgid "%s: %s - %s" |
1979 | msgstr "%s:%s - %s" | |
1980 | ||
87cb7997 | 1981 | #: ident.c:343 |
a0b6b246 JX |
1982 | msgid "" |
1983 | "\n" | |
1984 | "*** Please tell me who you are.\n" | |
1985 | "\n" | |
1986 | "Run\n" | |
1987 | "\n" | |
1988 | " git config --global user.email \"you@example.com\"\n" | |
1989 | " git config --global user.name \"Your Name\"\n" | |
1990 | "\n" | |
1991 | "to set your account's default identity.\n" | |
1992 | "Omit --global to set the identity only in this repository.\n" | |
1993 | "\n" | |
1994 | msgstr "" | |
1995 | "\n" | |
1996 | "*** 请告诉我你是谁。\n" | |
1997 | "\n" | |
1998 | "运行\n" | |
1999 | "\n" | |
2000 | " git config --global user.email \"you@example.com\"\n" | |
2001 | " git config --global user.name \"Your Name\"\n" | |
2002 | "\n" | |
2003 | "来设置您账号的缺省身份标识。\n" | |
2004 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 2005 | |
87cb7997 JX |
2006 | #: ident.c:367 |
2007 | msgid "no email was given and auto-detection is disabled" | |
2008 | msgstr "未提供邮件地址且自动探测引用被禁用" | |
2009 | ||
2010 | #: ident.c:372 | |
2011 | #, c-format | |
2012 | msgid "unable to auto-detect email address (got '%s')" | |
2013 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
2014 | ||
2015 | #: ident.c:382 | |
2016 | msgid "no name was given and auto-detection is disabled" | |
2017 | msgstr "未提供姓名且自动探测被禁用" | |
2018 | ||
2019 | #: ident.c:388 | |
2020 | #, c-format | |
2021 | msgid "unable to auto-detect name (got '%s')" | |
2022 | msgstr "无法自动探测姓名(得到 '%s')" | |
2023 | ||
2024 | #: ident.c:396 | |
2025 | #, c-format | |
2026 | msgid "empty ident name (for <%s>) not allowed" | |
2027 | msgstr "不允许空的姓名(对于 <%s>)" | |
2028 | ||
2029 | #: ident.c:402 | |
2030 | #, c-format | |
2031 | msgid "name consists only of disallowed characters: %s" | |
2032 | msgstr "姓名中仅包含禁用字符:%s" | |
2033 | ||
2034 | #: ident.c:417 builtin/commit.c:611 | |
2035 | #, c-format | |
2036 | msgid "invalid date format: %s" | |
2037 | msgstr "无效的日期格式:%s" | |
2038 | ||
a0b6b246 | 2039 | #: lockfile.c:152 |
c04f5ac3 | 2040 | #, c-format |
a0b6b246 JX |
2041 | msgid "" |
2042 | "Unable to create '%s.lock': %s.\n" | |
2043 | "\n" | |
2044 | "Another git process seems to be running in this repository, e.g.\n" | |
2045 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2046 | "are terminated then try again. If it still fails, a git process\n" | |
2047 | "may have crashed in this repository earlier:\n" | |
2048 | "remove the file manually to continue." | |
2049 | msgstr "" | |
2050 | "无法创建 '%s.lock':%s。\n" | |
2051 | "\n" | |
2052 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
2053 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
2054 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
2055 | "手动删除这个文件再继续。" | |
c04f5ac3 | 2056 | |
a0b6b246 JX |
2057 | #: lockfile.c:160 |
2058 | #, c-format | |
2059 | msgid "Unable to create '%s.lock': %s" | |
2060 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 2061 | |
a0b6b246 JX |
2062 | #: merge.c:41 |
2063 | msgid "failed to read the cache" | |
2064 | msgstr "无法读取缓存" | |
c04f5ac3 | 2065 | |
87cb7997 JX |
2066 | #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393 |
2067 | #: builtin/checkout.c:607 builtin/clone.c:749 | |
a0b6b246 JX |
2068 | msgid "unable to write new index file" |
2069 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 2070 | |
a0b6b246 JX |
2071 | #: merge-recursive.c:209 |
2072 | msgid "(bad commit)\n" | |
2073 | msgstr "(坏提交)\n" | |
c04f5ac3 | 2074 | |
1a79b2f1 | 2075 | #: merge-recursive.c:231 merge-recursive.c:239 |
a0b6b246 JX |
2076 | #, c-format |
2077 | msgid "addinfo_cache failed for path '%s'" | |
2078 | msgstr "为路径 '%s' addinfo_cache 失败" | |
c04f5ac3 | 2079 | |
1a79b2f1 | 2080 | #: merge-recursive.c:303 |
a0b6b246 JX |
2081 | msgid "error building trees" |
2082 | msgstr "无法创建树" | |
c04f5ac3 | 2083 | |
1a79b2f1 | 2084 | #: merge-recursive.c:727 |
c04f5ac3 | 2085 | #, c-format |
a0b6b246 JX |
2086 | msgid "failed to create path '%s'%s" |
2087 | msgstr "无法创建路径 '%s'%s" | |
c04f5ac3 | 2088 | |
1a79b2f1 | 2089 | #: merge-recursive.c:738 |
c04f5ac3 | 2090 | #, c-format |
a0b6b246 JX |
2091 | msgid "Removing %s to make room for subdirectory\n" |
2092 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 2093 | |
1a79b2f1 | 2094 | #: merge-recursive.c:752 merge-recursive.c:771 |
a0b6b246 JX |
2095 | msgid ": perhaps a D/F conflict?" |
2096 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 2097 | |
1a79b2f1 | 2098 | #: merge-recursive.c:761 |
c04f5ac3 | 2099 | #, c-format |
a0b6b246 JX |
2100 | msgid "refusing to lose untracked file at '%s'" |
2101 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2102 | |
1a79b2f1 | 2103 | #: merge-recursive.c:803 builtin/cat-file.c:34 |
c04f5ac3 | 2104 | #, c-format |
a0b6b246 JX |
2105 | msgid "cannot read object %s '%s'" |
2106 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2107 | |
1a79b2f1 | 2108 | #: merge-recursive.c:805 |
4dcdc3d8 | 2109 | #, c-format |
a0b6b246 JX |
2110 | msgid "blob expected for %s '%s'" |
2111 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 2112 | |
1a79b2f1 | 2113 | #: merge-recursive.c:829 |
4dcdc3d8 | 2114 | #, c-format |
a0b6b246 JX |
2115 | msgid "failed to open '%s': %s" |
2116 | msgstr "无法打开 '%s':%s" | |
4dcdc3d8 | 2117 | |
1a79b2f1 | 2118 | #: merge-recursive.c:840 |
a0b6b246 JX |
2119 | #, c-format |
2120 | msgid "failed to symlink '%s': %s" | |
2121 | msgstr "无法创建符号链接 '%s':%s" | |
c04f5ac3 | 2122 | |
1a79b2f1 | 2123 | #: merge-recursive.c:845 |
5c57d762 | 2124 | #, c-format |
a0b6b246 JX |
2125 | msgid "do not know what to do with %06o %s '%s'" |
2126 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 2127 | |
1a79b2f1 | 2128 | #: merge-recursive.c:985 |
a0b6b246 JX |
2129 | msgid "Failed to execute internal merge" |
2130 | msgstr "无法执行内部合并" | |
2131 | ||
1a79b2f1 | 2132 | #: merge-recursive.c:989 |
5c57d762 | 2133 | #, c-format |
a0b6b246 JX |
2134 | msgid "Unable to add %s to database" |
2135 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 2136 | |
87cb7997 | 2137 | #: merge-recursive.c:1092 |
5c57d762 JX |
2138 | #, c-format |
2139 | msgid "" | |
a0b6b246 JX |
2140 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
2141 | "in tree." | |
5c57d762 | 2142 | msgstr "" |
87cb7997 JX |
2143 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2144 | "本被保留。" | |
2145 | ||
2146 | #: merge-recursive.c:1097 | |
2147 | #, c-format | |
2148 | msgid "" | |
2149 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2150 | "left in tree." | |
2151 | msgstr "" | |
2152 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2153 | "%7$s 版本被保留。" | |
c04f5ac3 | 2154 | |
87cb7997 | 2155 | #: merge-recursive.c:1104 |
7aea43ff | 2156 | #, c-format |
a0b6b246 JX |
2157 | msgid "" |
2158 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2159 | "in tree at %s." | |
2160 | msgstr "" | |
87cb7997 JX |
2161 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2162 | "本保留在 %8$s 中。" | |
7aea43ff | 2163 | |
87cb7997 JX |
2164 | #: merge-recursive.c:1109 |
2165 | #, c-format | |
2166 | msgid "" | |
2167 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2168 | "left in tree at %s." | |
2169 | msgstr "" | |
2170 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2171 | "%7$s 版本保留在 %9$s 中。" | |
2172 | ||
2173 | #: merge-recursive.c:1143 | |
a0b6b246 JX |
2174 | msgid "rename" |
2175 | msgstr "重命名" | |
5b04ee3b | 2176 | |
87cb7997 | 2177 | #: merge-recursive.c:1143 |
a0b6b246 JX |
2178 | msgid "renamed" |
2179 | msgstr "重命名" | |
5b04ee3b | 2180 | |
87cb7997 | 2181 | #: merge-recursive.c:1200 |
5c57d762 | 2182 | #, c-format |
a0b6b246 JX |
2183 | msgid "%s is a directory in %s adding as %s instead" |
2184 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 2185 | |
87cb7997 | 2186 | #: merge-recursive.c:1225 |
5c57d762 JX |
2187 | #, c-format |
2188 | msgid "" | |
a0b6b246 JX |
2189 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
2190 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 2191 | msgstr "" |
a0b6b246 JX |
2192 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
2193 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 2194 | |
87cb7997 | 2195 | #: merge-recursive.c:1230 |
a0b6b246 JX |
2196 | msgid " (left unresolved)" |
2197 | msgstr "(留下未解决)" | |
5c57d762 | 2198 | |
87cb7997 | 2199 | #: merge-recursive.c:1292 |
5c57d762 | 2200 | #, c-format |
a0b6b246 | 2201 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 2202 | msgstr "" |
a0b6b246 JX |
2203 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
2204 | "%5$s" | |
3495628d | 2205 | |
87cb7997 | 2206 | #: merge-recursive.c:1325 |
3495628d | 2207 | #, c-format |
a0b6b246 JX |
2208 | msgid "Renaming %s to %s and %s to %s instead" |
2209 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" | |
3495628d | 2210 | |
87cb7997 | 2211 | #: merge-recursive.c:1528 |
3495628d | 2212 | #, c-format |
a0b6b246 JX |
2213 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
2214 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 2215 | |
87cb7997 | 2216 | #: merge-recursive.c:1543 |
a0b6b246 JX |
2217 | #, c-format |
2218 | msgid "Adding merged %s" | |
2219 | msgstr "添加合并后的 %s" | |
90314792 | 2220 | |
87cb7997 | 2221 | #: merge-recursive.c:1550 merge-recursive.c:1780 |
90314792 | 2222 | #, c-format |
a0b6b246 JX |
2223 | msgid "Adding as %s instead" |
2224 | msgstr "而是以 %s 为名添加" | |
90314792 | 2225 | |
87cb7997 | 2226 | #: merge-recursive.c:1607 |
90314792 | 2227 | #, c-format |
a0b6b246 JX |
2228 | msgid "cannot read object %s" |
2229 | msgstr "不能读取对象 %s" | |
90314792 | 2230 | |
87cb7997 | 2231 | #: merge-recursive.c:1610 |
90314792 | 2232 | #, c-format |
a0b6b246 JX |
2233 | msgid "object %s is not a blob" |
2234 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 2235 | |
87cb7997 | 2236 | #: merge-recursive.c:1679 |
a0b6b246 JX |
2237 | msgid "modify" |
2238 | msgstr "修改" | |
90314792 | 2239 | |
87cb7997 | 2240 | #: merge-recursive.c:1679 |
a0b6b246 JX |
2241 | msgid "modified" |
2242 | msgstr "修改" | |
5b04ee3b | 2243 | |
87cb7997 | 2244 | #: merge-recursive.c:1689 |
a0b6b246 JX |
2245 | msgid "content" |
2246 | msgstr "内容" | |
5b04ee3b | 2247 | |
87cb7997 | 2248 | #: merge-recursive.c:1696 |
a0b6b246 JX |
2249 | msgid "add/add" |
2250 | msgstr "添加/添加" | |
3495628d | 2251 | |
87cb7997 | 2252 | #: merge-recursive.c:1732 |
220c313c | 2253 | #, c-format |
a0b6b246 JX |
2254 | msgid "Skipped %s (merged same as existing)" |
2255 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 2256 | |
87cb7997 | 2257 | #: merge-recursive.c:1746 |
220c313c | 2258 | #, c-format |
a0b6b246 JX |
2259 | msgid "Auto-merging %s" |
2260 | msgstr "自动合并 %s" | |
220c313c | 2261 | |
87cb7997 | 2262 | #: merge-recursive.c:1750 git-submodule.sh:944 |
a0b6b246 JX |
2263 | msgid "submodule" |
2264 | msgstr "子模组" | |
2265 | ||
87cb7997 | 2266 | #: merge-recursive.c:1751 |
220c313c | 2267 | #, c-format |
a0b6b246 JX |
2268 | msgid "CONFLICT (%s): Merge conflict in %s" |
2269 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 2270 | |
87cb7997 | 2271 | #: merge-recursive.c:1845 |
220c313c | 2272 | #, c-format |
a0b6b246 JX |
2273 | msgid "Removing %s" |
2274 | msgstr "删除 %s" | |
220c313c | 2275 | |
87cb7997 | 2276 | #: merge-recursive.c:1871 |
a0b6b246 JX |
2277 | msgid "file/directory" |
2278 | msgstr "文件/目录" | |
220c313c | 2279 | |
87cb7997 | 2280 | #: merge-recursive.c:1877 |
a0b6b246 JX |
2281 | msgid "directory/file" |
2282 | msgstr "目录/文件" | |
276ceeaa | 2283 | |
87cb7997 | 2284 | #: merge-recursive.c:1883 |
276ceeaa | 2285 | #, c-format |
a0b6b246 JX |
2286 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
2287 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 2288 | |
87cb7997 | 2289 | #: merge-recursive.c:1892 |
276ceeaa | 2290 | #, c-format |
a0b6b246 JX |
2291 | msgid "Adding %s" |
2292 | msgstr "添加 %s" | |
276ceeaa | 2293 | |
87cb7997 | 2294 | #: merge-recursive.c:1929 |
a0b6b246 JX |
2295 | msgid "Already up-to-date!" |
2296 | msgstr "已经是最新的!" | |
276ceeaa | 2297 | |
87cb7997 | 2298 | #: merge-recursive.c:1938 |
276ceeaa | 2299 | #, c-format |
a0b6b246 JX |
2300 | msgid "merging of trees %s and %s failed" |
2301 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 2302 | |
87cb7997 | 2303 | #: merge-recursive.c:2021 |
a0b6b246 JX |
2304 | msgid "Merging:" |
2305 | msgstr "合并:" | |
5c57d762 | 2306 | |
87cb7997 | 2307 | #: merge-recursive.c:2034 |
5c57d762 | 2308 | #, c-format |
a0b6b246 JX |
2309 | msgid "found %u common ancestor:" |
2310 | msgid_plural "found %u common ancestors:" | |
2311 | msgstr[0] "发现 %u 个共同祖先:" | |
2312 | msgstr[1] "发现 %u 个共同祖先:" | |
2313 | ||
87cb7997 | 2314 | #: merge-recursive.c:2073 |
a0b6b246 JX |
2315 | msgid "merge returned no commit" |
2316 | msgstr "合并未返回提交" | |
2317 | ||
87cb7997 | 2318 | #: merge-recursive.c:2136 |
5c57d762 | 2319 | #, c-format |
a0b6b246 JX |
2320 | msgid "Could not parse object '%s'" |
2321 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 2322 | |
87cb7997 | 2323 | #: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 |
a0b6b246 JX |
2324 | msgid "Unable to write index." |
2325 | msgstr "不能写入索引。" | |
2326 | ||
2327 | #: notes-merge.c:273 | |
5c57d762 JX |
2328 | #, c-format |
2329 | msgid "" | |
a0b6b246 JX |
2330 | "You have not concluded your previous notes merge (%s exists).\n" |
2331 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
2332 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 2333 | msgstr "" |
29004bbb | 2334 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
2335 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
2336 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 2337 | |
a0b6b246 JX |
2338 | #: notes-merge.c:280 |
2339 | #, c-format | |
2340 | msgid "You have not concluded your notes merge (%s exists)." | |
2341 | msgstr "您尚未结束注释合并(存在 %s)。" | |
2342 | ||
2343 | #: notes-utils.c:41 | |
2344 | msgid "Cannot commit uninitialized/unreferenced notes tree" | |
2345 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 2346 | |
a0b6b246 | 2347 | #: notes-utils.c:100 |
1b7f4a34 | 2348 | #, c-format |
a0b6b246 JX |
2349 | msgid "Bad notes.rewriteMode value: '%s'" |
2350 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 2351 | |
a0b6b246 | 2352 | #: notes-utils.c:110 |
5b04ee3b | 2353 | #, c-format |
a0b6b246 JX |
2354 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
2355 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 2356 | |
a0b6b246 JX |
2357 | #. TRANSLATORS: The first %s is the name of the |
2358 | #. environment variable, the second %s is its value | |
2359 | #: notes-utils.c:137 | |
5b04ee3b | 2360 | #, c-format |
a0b6b246 JX |
2361 | msgid "Bad %s value: '%s'" |
2362 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 2363 | |
1a79b2f1 | 2364 | #: object.c:240 |
5b04ee3b | 2365 | #, c-format |
a0b6b246 JX |
2366 | msgid "unable to parse object: %s" |
2367 | msgstr "不能解析对象:%s" | |
5b04ee3b | 2368 | |
a0b6b246 JX |
2369 | #: parse-options.c:572 |
2370 | msgid "..." | |
2371 | msgstr "..." | |
2372 | ||
2373 | #: parse-options.c:590 | |
5b04ee3b | 2374 | #, c-format |
a0b6b246 JX |
2375 | msgid "usage: %s" |
2376 | msgstr "用法:%s" | |
5b04ee3b | 2377 | |
a0b6b246 JX |
2378 | #. TRANSLATORS: the colon here should align with the |
2379 | #. one in "usage: %s" translation | |
2380 | #: parse-options.c:594 | |
5b04ee3b | 2381 | #, c-format |
a0b6b246 JX |
2382 | msgid " or: %s" |
2383 | msgstr " 或:%s" | |
5b04ee3b | 2384 | |
a0b6b246 JX |
2385 | # 译者:为保证在输出中对齐,注意调整句中空格! |
2386 | #: parse-options.c:597 | |
5b04ee3b | 2387 | #, c-format |
a0b6b246 JX |
2388 | msgid " %s" |
2389 | msgstr " %s" | |
5b04ee3b | 2390 | |
a0b6b246 JX |
2391 | #: parse-options.c:631 |
2392 | msgid "-NUM" | |
2393 | msgstr "-数字" | |
2394 | ||
2395 | #: parse-options-cb.c:108 | |
5b04ee3b | 2396 | #, c-format |
a0b6b246 JX |
2397 | msgid "malformed object name '%s'" |
2398 | msgstr "非法的对象名 '%s'" | |
5b04ee3b | 2399 | |
87cb7997 | 2400 | #: path.c:805 |
5b04ee3b | 2401 | #, c-format |
a0b6b246 JX |
2402 | msgid "Could not make %s writable by group" |
2403 | msgstr "不能设置 %s 为组可写" | |
2404 | ||
87cb7997 JX |
2405 | #: pathspec.c:125 |
2406 | msgid "Escape character '\\' not allowed as last character in attr value" | |
2407 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
2408 | ||
2409 | #: pathspec.c:143 | |
2410 | msgid "Only one 'attr:' specification is allowed." | |
2411 | msgstr "只允许一个 'attr:' 规格。" | |
2412 | ||
2413 | #: pathspec.c:146 | |
2414 | msgid "attr spec must not be empty" | |
2415 | msgstr "属性规格不能为空" | |
2416 | ||
2417 | #: pathspec.c:189 | |
2418 | #, c-format | |
2419 | msgid "invalid attribute name %s" | |
2420 | msgstr "无效的属性名 %s" | |
2421 | ||
2422 | #: pathspec.c:254 | |
a0b6b246 JX |
2423 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
2424 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
2425 | ||
87cb7997 | 2426 | #: pathspec.c:261 |
5b04ee3b | 2427 | msgid "" |
a0b6b246 JX |
2428 | "global 'literal' pathspec setting is incompatible with all other global " |
2429 | "pathspec settings" | |
2430 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 2431 | |
87cb7997 | 2432 | #: pathspec.c:301 |
a0b6b246 JX |
2433 | msgid "invalid parameter for pathspec magic 'prefix'" |
2434 | msgstr "路径规格包含无效的神奇前缀" | |
2435 | ||
87cb7997 | 2436 | #: pathspec.c:322 |
5b04ee3b | 2437 | #, c-format |
a0b6b246 JX |
2438 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
2439 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 2440 | |
87cb7997 | 2441 | #: pathspec.c:327 |
5b04ee3b | 2442 | #, c-format |
a0b6b246 JX |
2443 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
2444 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 2445 | |
87cb7997 | 2446 | #: pathspec.c:365 |
5b04ee3b | 2447 | #, c-format |
a0b6b246 JX |
2448 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
2449 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 2450 | |
87cb7997 | 2451 | #: pathspec.c:421 pathspec.c:443 |
1a79b2f1 JX |
2452 | #, c-format |
2453 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
2454 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
2455 | ||
87cb7997 | 2456 | #: pathspec.c:483 |
5b04ee3b | 2457 | #, c-format |
a0b6b246 JX |
2458 | msgid "%s: 'literal' and 'glob' are incompatible" |
2459 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 2460 | |
87cb7997 | 2461 | #: pathspec.c:496 |
5b04ee3b | 2462 | #, c-format |
a0b6b246 JX |
2463 | msgid "%s: '%s' is outside repository" |
2464 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 2465 | |
87cb7997 | 2466 | #: pathspec.c:584 |
5b04ee3b | 2467 | #, c-format |
1a79b2f1 JX |
2468 | msgid "'%s' (mnemonic: '%c')" |
2469 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 2470 | |
87cb7997 | 2471 | #: pathspec.c:594 |
5b04ee3b | 2472 | #, c-format |
a0b6b246 JX |
2473 | msgid "%s: pathspec magic not supported by this command: %s" |
2474 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
2475 | ||
87cb7997 | 2476 | #: pathspec.c:644 |
5b04ee3b | 2477 | msgid "" |
a0b6b246 JX |
2478 | "empty strings as pathspecs will be made invalid in upcoming releases. please " |
2479 | "use . instead if you meant to match all paths" | |
5b04ee3b | 2480 | msgstr "" |
29004bbb | 2481 | "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n" |
a0b6b246 | 2482 | "请代之以 ." |
5b04ee3b | 2483 | |
87cb7997 | 2484 | #: pathspec.c:668 |
5b04ee3b | 2485 | #, c-format |
a0b6b246 JX |
2486 | msgid "pathspec '%s' is beyond a symbolic link" |
2487 | msgstr "路径规格 '%s' 位于符号链接中" | |
2488 | ||
1a79b2f1 | 2489 | #: pretty.c:982 |
a0b6b246 JX |
2490 | msgid "unable to parse --pretty format" |
2491 | msgstr "不能解析 --pretty 格式" | |
2492 | ||
1a79b2f1 | 2493 | #: read-cache.c:1307 |
5b04ee3b JX |
2494 | #, c-format |
2495 | msgid "" | |
a0b6b246 JX |
2496 | "index.version set, but the value is invalid.\n" |
2497 | "Using version %i" | |
5b04ee3b | 2498 | msgstr "" |
a0b6b246 JX |
2499 | "设置了 index.version,但是取值无效。\n" |
2500 | "使用版本 %i" | |
5b04ee3b | 2501 | |
1a79b2f1 | 2502 | #: read-cache.c:1317 |
5b04ee3b JX |
2503 | #, c-format |
2504 | msgid "" | |
a0b6b246 JX |
2505 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
2506 | "Using version %i" | |
5b04ee3b | 2507 | msgstr "" |
a0b6b246 JX |
2508 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
2509 | "使用版本 %i" | |
5b04ee3b | 2510 | |
87cb7997 JX |
2511 | #: read-cache.c:2232 |
2512 | #, c-format | |
2513 | msgid "could not stat '%s" | |
2514 | msgstr "不能获取 '%s' 的文件状态" | |
2515 | ||
2516 | #: read-cache.c:2245 | |
2517 | #, c-format | |
2518 | msgid "unable to open git dir: %s" | |
2519 | msgstr "不能打开 git 目录:%s" | |
2520 | ||
2521 | #: read-cache.c:2257 | |
2522 | #, c-format | |
2523 | msgid "unable to unlink: %s" | |
2524 | msgstr "无法删除:%s" | |
2525 | ||
2526 | #: refs.c:619 builtin/merge.c:844 | |
5b04ee3b | 2527 | #, c-format |
a0b6b246 JX |
2528 | msgid "Could not open '%s' for writing" |
2529 | msgstr "无法打开 '%s' 进行写入" | |
5b04ee3b | 2530 | |
87cb7997 | 2531 | #: refs/files-backend.c:2531 |
5b04ee3b | 2532 | #, c-format |
a0b6b246 JX |
2533 | msgid "could not delete reference %s: %s" |
2534 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 2535 | |
87cb7997 | 2536 | #: refs/files-backend.c:2534 |
5b04ee3b | 2537 | #, c-format |
a0b6b246 JX |
2538 | msgid "could not delete references: %s" |
2539 | msgstr "无法删除引用:%s" | |
5b04ee3b | 2540 | |
87cb7997 | 2541 | #: refs/files-backend.c:2543 |
5b04ee3b | 2542 | #, c-format |
a0b6b246 JX |
2543 | msgid "could not remove reference %s" |
2544 | msgstr "无法删除引用 %s" | |
5b04ee3b | 2545 | |
87cb7997 JX |
2546 | #: ref-filter.c:35 wt-status.c:1780 |
2547 | msgid "gone" | |
2548 | msgstr "丢失" | |
2549 | ||
2550 | #: ref-filter.c:36 | |
2551 | #, c-format | |
2552 | msgid "ahead %d" | |
2553 | msgstr "领先 %d" | |
2554 | ||
2555 | #: ref-filter.c:37 | |
2556 | #, c-format | |
2557 | msgid "behind %d" | |
2558 | msgstr "落后 %d" | |
2559 | ||
2560 | #: ref-filter.c:38 | |
2561 | #, c-format | |
2562 | msgid "ahead %d, behind %d" | |
2563 | msgstr "领先 %d,落后 %d" | |
2564 | ||
2565 | #: ref-filter.c:104 | |
5b04ee3b | 2566 | #, c-format |
a0b6b246 JX |
2567 | msgid "expected format: %%(color:<color>)" |
2568 | msgstr "期望的格式:%%(color:<color>)" | |
5b04ee3b | 2569 | |
87cb7997 | 2570 | #: ref-filter.c:106 |
5b04ee3b | 2571 | #, c-format |
a0b6b246 JX |
2572 | msgid "unrecognized color: %%(color:%s)" |
2573 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 2574 | |
87cb7997 | 2575 | #: ref-filter.c:120 |
a0b6b246 | 2576 | #, c-format |
87cb7997 JX |
2577 | msgid "Integer value expected refname:lstrip=%s" |
2578 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 2579 | |
87cb7997 JX |
2580 | #: ref-filter.c:124 |
2581 | #, c-format | |
2582 | msgid "Integer value expected refname:rstrip=%s" | |
2583 | msgstr "期望整数值 refname:rstrip=%s" | |
2584 | ||
2585 | #: ref-filter.c:126 | |
2586 | #, c-format | |
2587 | msgid "unrecognized %%(%s) argument: %s" | |
2588 | msgstr "未能识别的 %%(%s) 参数:%s" | |
2589 | ||
2590 | #: ref-filter.c:166 | |
90314792 | 2591 | #, c-format |
a0b6b246 JX |
2592 | msgid "%%(body) does not take arguments" |
2593 | msgstr "%%(body) 不带参数" | |
90314792 | 2594 | |
87cb7997 | 2595 | #: ref-filter.c:173 |
a0b6b246 JX |
2596 | #, c-format |
2597 | msgid "%%(subject) does not take arguments" | |
2598 | msgstr "%%(subject) 不带参数" | |
90314792 | 2599 | |
87cb7997 | 2600 | #: ref-filter.c:180 |
1a79b2f1 JX |
2601 | #, c-format |
2602 | msgid "%%(trailers) does not take arguments" | |
2603 | msgstr "%%(trailers) 不带参数" | |
2604 | ||
87cb7997 | 2605 | #: ref-filter.c:199 |
a0b6b246 JX |
2606 | #, c-format |
2607 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 2608 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 2609 | |
87cb7997 | 2610 | #: ref-filter.c:201 |
a0b6b246 JX |
2611 | #, c-format |
2612 | msgid "unrecognized %%(contents) argument: %s" | |
2613 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 2614 | |
87cb7997 JX |
2615 | #: ref-filter.c:214 |
2616 | #, c-format | |
2617 | msgid "positive value expected objectname:short=%s" | |
2618 | msgstr "期望一个正数 objectname:short=%s" | |
2619 | ||
2620 | #: ref-filter.c:218 | |
a0b6b246 JX |
2621 | #, c-format |
2622 | msgid "unrecognized %%(objectname) argument: %s" | |
2623 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 2624 | |
87cb7997 | 2625 | #: ref-filter.c:245 |
a0b6b246 JX |
2626 | #, c-format |
2627 | msgid "expected format: %%(align:<width>,<position>)" | |
2628 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
90314792 | 2629 | |
87cb7997 | 2630 | #: ref-filter.c:257 |
5c57d762 | 2631 | #, c-format |
a0b6b246 JX |
2632 | msgid "unrecognized position:%s" |
2633 | msgstr "未能识别的位置:%s" | |
5c57d762 | 2634 | |
87cb7997 | 2635 | #: ref-filter.c:261 |
1b7f4a34 | 2636 | #, c-format |
a0b6b246 JX |
2637 | msgid "unrecognized width:%s" |
2638 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 2639 | |
87cb7997 | 2640 | #: ref-filter.c:267 |
1b7f4a34 | 2641 | #, c-format |
a0b6b246 JX |
2642 | msgid "unrecognized %%(align) argument: %s" |
2643 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 2644 | |
87cb7997 | 2645 | #: ref-filter.c:271 |
1b7f4a34 | 2646 | #, c-format |
a0b6b246 JX |
2647 | msgid "positive width expected with the %%(align) atom" |
2648 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 2649 | |
87cb7997 JX |
2650 | #: ref-filter.c:286 |
2651 | #, c-format | |
2652 | msgid "unrecognized %%(if) argument: %s" | |
2653 | msgstr "未能识别的 %%(if) 参数:%s" | |
2654 | ||
2655 | #: ref-filter.c:371 | |
07432cef | 2656 | #, c-format |
a0b6b246 JX |
2657 | msgid "malformed field name: %.*s" |
2658 | msgstr "非法的字段名:%.*s" | |
ef317cd5 | 2659 | |
87cb7997 | 2660 | #: ref-filter.c:397 |
a0b6b246 JX |
2661 | #, c-format |
2662 | msgid "unknown field name: %.*s" | |
2663 | msgstr "未知的字段名:%.*s" | |
220c313c | 2664 | |
87cb7997 JX |
2665 | #: ref-filter.c:501 |
2666 | #, c-format | |
2667 | msgid "format: %%(if) atom used without a %%(then) atom" | |
2668 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
2669 | ||
2670 | #: ref-filter.c:561 | |
2671 | #, c-format | |
2672 | msgid "format: %%(then) atom used without an %%(if) atom" | |
2673 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
2674 | ||
2675 | #: ref-filter.c:563 | |
2676 | #, c-format | |
2677 | msgid "format: %%(then) atom used more than once" | |
2678 | msgstr "格式:%%(then) 元素用了多次" | |
2679 | ||
2680 | #: ref-filter.c:565 | |
2681 | #, c-format | |
2682 | msgid "format: %%(then) atom used after %%(else)" | |
2683 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
2684 | ||
2685 | #: ref-filter.c:591 | |
2686 | #, c-format | |
2687 | msgid "format: %%(else) atom used without an %%(if) atom" | |
2688 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
2689 | ||
2690 | #: ref-filter.c:593 | |
2691 | #, c-format | |
2692 | msgid "format: %%(else) atom used without a %%(then) atom" | |
2693 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
2694 | ||
2695 | #: ref-filter.c:595 | |
2696 | #, c-format | |
2697 | msgid "format: %%(else) atom used more than once" | |
2698 | msgstr "格式:%%(else) 元素用了多次" | |
2699 | ||
2700 | #: ref-filter.c:608 | |
7aea43ff | 2701 | #, c-format |
a0b6b246 JX |
2702 | msgid "format: %%(end) atom used without corresponding atom" |
2703 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 2704 | |
87cb7997 | 2705 | #: ref-filter.c:663 |
7aea43ff | 2706 | #, c-format |
a0b6b246 JX |
2707 | msgid "malformed format string %s" |
2708 | msgstr "非法的格式化字符串 %s" | |
7aea43ff | 2709 | |
87cb7997 JX |
2710 | #: ref-filter.c:1247 |
2711 | #, c-format | |
2712 | msgid "(no branch, rebasing %s)" | |
2713 | msgstr "(非分支,正变基 %s)" | |
2714 | ||
2715 | #: ref-filter.c:1250 | |
2716 | #, c-format | |
2717 | msgid "(no branch, bisect started on %s)" | |
2718 | msgstr "(非分支,二分查找开始于 %s)" | |
c04f5ac3 | 2719 | |
87cb7997 JX |
2720 | #. TRANSLATORS: make sure this matches |
2721 | #. "HEAD detached at " in wt-status.c | |
2722 | #: ref-filter.c:1256 | |
c04f5ac3 | 2723 | #, c-format |
87cb7997 JX |
2724 | msgid "(HEAD detached at %s)" |
2725 | msgstr "(头指针分离于 %s)" | |
c04f5ac3 | 2726 | |
87cb7997 JX |
2727 | #. TRANSLATORS: make sure this matches |
2728 | #. "HEAD detached from " in wt-status.c | |
2729 | #: ref-filter.c:1261 | |
a0b6b246 | 2730 | #, c-format |
87cb7997 JX |
2731 | msgid "(HEAD detached from %s)" |
2732 | msgstr "(头指针分离自 %s)" | |
6792b93b | 2733 | |
87cb7997 JX |
2734 | #: ref-filter.c:1265 |
2735 | msgid "(no branch)" | |
2736 | msgstr "(非分支)" | |
2737 | ||
2738 | #: ref-filter.c:1420 ref-filter.c:1451 | |
a0b6b246 JX |
2739 | #, c-format |
2740 | msgid "missing object %s for %s" | |
2741 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 2742 | |
87cb7997 | 2743 | #: ref-filter.c:1423 ref-filter.c:1454 |
a0b6b246 JX |
2744 | #, c-format |
2745 | msgid "parse_object_buffer failed on %s for %s" | |
2746 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 2747 | |
87cb7997 | 2748 | #: ref-filter.c:1692 |
a0b6b246 JX |
2749 | #, c-format |
2750 | msgid "malformed object at '%s'" | |
2751 | msgstr "非法的对象于 '%s'" | |
c04f5ac3 | 2752 | |
87cb7997 | 2753 | #: ref-filter.c:1759 |
a0b6b246 JX |
2754 | #, c-format |
2755 | msgid "ignoring ref with broken name %s" | |
2756 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 2757 | |
87cb7997 | 2758 | #: ref-filter.c:1764 |
a0b6b246 JX |
2759 | #, c-format |
2760 | msgid "ignoring broken ref %s" | |
2761 | msgstr "忽略损坏的引用 %s" | |
c04f5ac3 | 2762 | |
87cb7997 | 2763 | #: ref-filter.c:2028 |
a0b6b246 JX |
2764 | #, c-format |
2765 | msgid "format: %%(end) atom missing" | |
2766 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 2767 | |
87cb7997 | 2768 | #: ref-filter.c:2109 |
a0b6b246 JX |
2769 | #, c-format |
2770 | msgid "malformed object name %s" | |
2771 | msgstr "非法的对象名 %s" | |
c04f5ac3 | 2772 | |
1a79b2f1 | 2773 | #: remote.c:754 |
a0b6b246 JX |
2774 | #, c-format |
2775 | msgid "Cannot fetch both %s and %s to %s" | |
2776 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 2777 | |
1a79b2f1 | 2778 | #: remote.c:758 |
c04f5ac3 | 2779 | #, c-format |
a0b6b246 JX |
2780 | msgid "%s usually tracks %s, not %s" |
2781 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 2782 | |
1a79b2f1 | 2783 | #: remote.c:762 |
a0b6b246 JX |
2784 | #, c-format |
2785 | msgid "%s tracks both %s and %s" | |
2786 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 2787 | |
1a79b2f1 | 2788 | #: remote.c:770 |
a0b6b246 JX |
2789 | msgid "Internal error" |
2790 | msgstr "内部错误" | |
c04f5ac3 | 2791 | |
1a79b2f1 | 2792 | #: remote.c:1685 remote.c:1787 |
a0b6b246 JX |
2793 | msgid "HEAD does not point to a branch" |
2794 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 2795 | |
1a79b2f1 | 2796 | #: remote.c:1694 |
a0b6b246 JX |
2797 | #, c-format |
2798 | msgid "no such branch: '%s'" | |
2799 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 2800 | |
1a79b2f1 | 2801 | #: remote.c:1697 |
a0b6b246 JX |
2802 | #, c-format |
2803 | msgid "no upstream configured for branch '%s'" | |
2804 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 2805 | |
1a79b2f1 | 2806 | #: remote.c:1703 |
a0b6b246 JX |
2807 | #, c-format |
2808 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
2809 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 2810 | |
1a79b2f1 | 2811 | #: remote.c:1718 |
a0b6b246 JX |
2812 | #, c-format |
2813 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
2814 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 2815 | |
1a79b2f1 | 2816 | #: remote.c:1730 |
a0b6b246 JX |
2817 | #, c-format |
2818 | msgid "branch '%s' has no remote for pushing" | |
2819 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 2820 | |
1a79b2f1 | 2821 | #: remote.c:1741 |
a0b6b246 JX |
2822 | #, c-format |
2823 | msgid "push refspecs for '%s' do not include '%s'" | |
2824 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 2825 | |
1a79b2f1 | 2826 | #: remote.c:1754 |
a0b6b246 JX |
2827 | msgid "push has no destination (push.default is 'nothing')" |
2828 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 2829 | |
1a79b2f1 | 2830 | #: remote.c:1776 |
a0b6b246 JX |
2831 | msgid "cannot resolve 'simple' push to a single destination" |
2832 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 2833 | |
1a79b2f1 | 2834 | #: remote.c:2081 |
a0b6b246 JX |
2835 | #, c-format |
2836 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
2837 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 2838 | |
1a79b2f1 | 2839 | #: remote.c:2085 |
a0b6b246 JX |
2840 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
2841 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 2842 | |
1a79b2f1 | 2843 | #: remote.c:2088 |
a0b6b246 JX |
2844 | #, c-format |
2845 | msgid "Your branch is up-to-date with '%s'.\n" | |
2846 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
cfff71a9 | 2847 | |
1a79b2f1 | 2848 | #: remote.c:2092 |
a0b6b246 JX |
2849 | #, c-format |
2850 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
2851 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
2852 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
2853 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 2854 | |
1a79b2f1 | 2855 | #: remote.c:2098 |
a0b6b246 JX |
2856 | msgid " (use \"git push\" to publish your local commits)\n" |
2857 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 2858 | |
1a79b2f1 | 2859 | #: remote.c:2101 |
a0b6b246 JX |
2860 | #, c-format |
2861 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
2862 | msgid_plural "" | |
2863 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
2864 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
2865 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 2866 | |
a0b6b246 | 2867 | # 译者:注意保持前导空格 |
1a79b2f1 | 2868 | #: remote.c:2109 |
a0b6b246 JX |
2869 | msgid " (use \"git pull\" to update your local branch)\n" |
2870 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 2871 | |
1a79b2f1 | 2872 | #: remote.c:2112 |
a0b6b246 JX |
2873 | #, c-format |
2874 | msgid "" | |
2875 | "Your branch and '%s' have diverged,\n" | |
2876 | "and have %d and %d different commit each, respectively.\n" | |
2877 | msgid_plural "" | |
2878 | "Your branch and '%s' have diverged,\n" | |
2879 | "and have %d and %d different commits each, respectively.\n" | |
2880 | msgstr[0] "" | |
2881 | "您的分支和 '%s' 出现了偏离,\n" | |
2882 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
2883 | msgstr[1] "" | |
2884 | "您的分支和 '%s' 出现了偏离,\n" | |
2885 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 2886 | |
a0b6b246 | 2887 | # 译者:注意保持前导空格 |
1a79b2f1 | 2888 | #: remote.c:2122 |
a0b6b246 JX |
2889 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
2890 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 2891 | |
a0b6b246 JX |
2892 | #: revision.c:2158 |
2893 | msgid "your current branch appears to be broken" | |
2894 | msgstr "您的当前分支好像被损坏" | |
cfff71a9 | 2895 | |
a0b6b246 JX |
2896 | #: revision.c:2161 |
2897 | #, c-format | |
2898 | msgid "your current branch '%s' does not have any commits yet" | |
2899 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6792b93b | 2900 | |
a0b6b246 JX |
2901 | #: revision.c:2355 |
2902 | msgid "--first-parent is incompatible with --bisect" | |
2903 | msgstr "--first-parent 与 --bisect 不兼容" | |
6792b93b | 2904 | |
1a79b2f1 | 2905 | #: run-command.c:125 |
a0b6b246 JX |
2906 | msgid "open /dev/null failed" |
2907 | msgstr "不能打开 /dev/null" | |
5c57d762 | 2908 | |
1a79b2f1 | 2909 | #: run-command.c:127 |
a0b6b246 JX |
2910 | #, c-format |
2911 | msgid "dup2(%d,%d) failed" | |
2912 | msgstr "不能调用 dup2(%d,%d)" | |
6792b93b | 2913 | |
87cb7997 JX |
2914 | #: send-pack.c:150 |
2915 | #, c-format | |
2916 | msgid "unable to parse remote unpack status: %s" | |
2917 | msgstr "不能解析远程解包状态:%s" | |
2918 | ||
2919 | #: send-pack.c:152 | |
2920 | #, c-format | |
2921 | msgid "remote unpack failed: %s" | |
2922 | msgstr "远程解包失败:%s" | |
2923 | ||
2924 | #: send-pack.c:315 | |
a0b6b246 JX |
2925 | msgid "failed to sign the push certificate" |
2926 | msgstr "无法为推送证书签名" | |
6792b93b | 2927 | |
87cb7997 | 2928 | #: send-pack.c:428 |
a0b6b246 JX |
2929 | msgid "the receiving end does not support --signed push" |
2930 | msgstr "接收端不支持签名推送" | |
6792b93b | 2931 | |
87cb7997 | 2932 | #: send-pack.c:430 |
a0b6b246 JX |
2933 | msgid "" |
2934 | "not sending a push certificate since the receiving end does not support --" | |
2935 | "signed push" | |
2936 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 2937 | |
87cb7997 | 2938 | #: send-pack.c:442 |
a0b6b246 JX |
2939 | msgid "the receiving end does not support --atomic push" |
2940 | msgstr "接收端不支持原子推送" | |
6792b93b | 2941 | |
87cb7997 | 2942 | #: send-pack.c:447 |
a0b6b246 JX |
2943 | msgid "the receiving end does not support push options" |
2944 | msgstr "接收端不支持推送选项" | |
6792b93b | 2945 | |
1a79b2f1 | 2946 | #: sequencer.c:215 |
a0b6b246 JX |
2947 | msgid "revert" |
2948 | msgstr "还原" | |
6792b93b | 2949 | |
1a79b2f1 | 2950 | #: sequencer.c:217 |
a0b6b246 JX |
2951 | msgid "cherry-pick" |
2952 | msgstr "拣选" | |
2953 | ||
1a79b2f1 JX |
2954 | #: sequencer.c:219 |
2955 | msgid "rebase -i" | |
2956 | msgstr "rebase -i" | |
2957 | ||
2958 | #: sequencer.c:221 | |
2959 | #, c-format | |
2960 | msgid "Unknown action: %d" | |
2961 | msgstr "未知动作:%d" | |
2962 | ||
2963 | #: sequencer.c:278 | |
a0b6b246 JX |
2964 | msgid "" |
2965 | "after resolving the conflicts, mark the corrected paths\n" | |
2966 | "with 'git add <paths>' or 'git rm <paths>'" | |
2967 | msgstr "" | |
2968 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
2969 | "命令标记修正后的文件" | |
2970 | ||
1a79b2f1 | 2971 | #: sequencer.c:281 |
a0b6b246 JX |
2972 | msgid "" |
2973 | "after resolving the conflicts, mark the corrected paths\n" | |
2974 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
2975 | "and commit the result with 'git commit'" | |
2976 | msgstr "" | |
2977 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
2978 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 2979 | |
87cb7997 | 2980 | #: sequencer.c:294 sequencer.c:1675 |
1b7f4a34 | 2981 | #, c-format |
a0b6b246 JX |
2982 | msgid "could not lock '%s'" |
2983 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 2984 | |
87cb7997 | 2985 | #: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694 |
1b7f4a34 | 2986 | #, c-format |
a0b6b246 JX |
2987 | msgid "could not write to '%s'" |
2988 | msgstr "不能写入 '%s'" | |
1b7f4a34 | 2989 | |
1a79b2f1 | 2990 | #: sequencer.c:301 |
a0b6b246 | 2991 | #, c-format |
72351d7d | 2992 | msgid "could not write eol to '%s'" |
a0b6b246 | 2993 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 2994 | |
87cb7997 | 2995 | #: sequencer.c:305 sequencer.c:1558 sequencer.c:1682 |
1b7f4a34 | 2996 | #, c-format |
a0b6b246 JX |
2997 | msgid "failed to finalize '%s'." |
2998 | msgstr "无法完成 '%s'。" | |
1b7f4a34 | 2999 | |
87cb7997 JX |
3000 | #: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259 |
3001 | #: builtin/commit.c:749 builtin/merge.c:1018 | |
a0b6b246 JX |
3002 | #, c-format |
3003 | msgid "could not read '%s'" | |
3004 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 3005 | |
1a79b2f1 | 3006 | #: sequencer.c:355 |
63af42fe | 3007 | #, c-format |
a0b6b246 JX |
3008 | msgid "your local changes would be overwritten by %s." |
3009 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 3010 | |
1a79b2f1 | 3011 | #: sequencer.c:359 |
a0b6b246 JX |
3012 | msgid "commit your changes or stash them to proceed." |
3013 | msgstr "提交您的修改或保存进度后再继续。" | |
6792b93b | 3014 | |
1a79b2f1 | 3015 | #: sequencer.c:388 |
a0b6b246 JX |
3016 | #, c-format |
3017 | msgid "%s: fast-forward" | |
3018 | msgstr "%s:快进" | |
6792b93b | 3019 | |
1a79b2f1 JX |
3020 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
3021 | #. * "rebase -i". | |
3022 | #. | |
3023 | #: sequencer.c:470 | |
a0b6b246 JX |
3024 | #, c-format |
3025 | msgid "%s: Unable to write new index file" | |
3026 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 3027 | |
1a79b2f1 | 3028 | #: sequencer.c:489 |
a0b6b246 JX |
3029 | msgid "could not resolve HEAD commit\n" |
3030 | msgstr "不能解析 HEAD 提交\n" | |
6792b93b | 3031 | |
1a79b2f1 | 3032 | #: sequencer.c:509 |
a0b6b246 | 3033 | msgid "unable to update cache tree\n" |
29004bbb | 3034 | msgstr "不能更新缓存树\n" |
6792b93b | 3035 | |
1a79b2f1 | 3036 | #: sequencer.c:592 |
63af42fe JX |
3037 | #, c-format |
3038 | msgid "" | |
a0b6b246 JX |
3039 | "you have staged changes in your working tree\n" |
3040 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
3041 | "\n" | |
3042 | " git commit --amend %s\n" | |
3043 | "\n" | |
3044 | "If they are meant to go into a new commit, run:\n" | |
3045 | "\n" | |
3046 | " git commit %s\n" | |
3047 | "\n" | |
3048 | "In both cases, once you're done, continue with:\n" | |
3049 | "\n" | |
3050 | " git rebase --continue\n" | |
3051 | msgstr "" | |
1a79b2f1 JX |
3052 | "您的工作区中存在已暂存的修改\n" |
3053 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
3054 | "\n" |
3055 | " git commit --amend %s\n" | |
3056 | "\n" | |
29004bbb | 3057 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
3058 | "\n" |
3059 | " git commit %s\n" | |
3060 | "\n" | |
3061 | "无论哪种情况,当您完成提交,继续执行:\n" | |
3062 | "\n" | |
3063 | " git rebase --continue\n" | |
6792b93b | 3064 | |
87cb7997 | 3065 | #: sequencer.c:694 |
a0b6b246 JX |
3066 | #, c-format |
3067 | msgid "could not parse commit %s\n" | |
3068 | msgstr "不能解析提交 %s\n" | |
6792b93b | 3069 | |
87cb7997 | 3070 | #: sequencer.c:699 |
63af42fe | 3071 | #, c-format |
a0b6b246 JX |
3072 | msgid "could not parse parent commit %s\n" |
3073 | msgstr "不能解析父提交 %s\n" | |
63af42fe | 3074 | |
87cb7997 | 3075 | #: sequencer.c:821 |
1a79b2f1 JX |
3076 | #, c-format |
3077 | msgid "" | |
3078 | "unexpected 1st line of squash message:\n" | |
3079 | "\n" | |
3080 | "\t%.*s" | |
3081 | msgstr "" | |
3082 | "意外的压缩提交首行提交信息:\n" | |
3083 | "\n" | |
3084 | "\t%.*s" | |
3085 | ||
87cb7997 | 3086 | #: sequencer.c:827 |
1a79b2f1 JX |
3087 | #, c-format |
3088 | msgid "" | |
3089 | "invalid 1st line of squash message:\n" | |
3090 | "\n" | |
3091 | "\t%.*s" | |
3092 | msgstr "" | |
3093 | "压缩提交的首行提交信息无效:\n" | |
3094 | "\n" | |
3095 | "\t%.*s" | |
3096 | ||
87cb7997 | 3097 | #: sequencer.c:833 sequencer.c:858 |
1a79b2f1 JX |
3098 | #, c-format |
3099 | msgid "This is a combination of %d commits." | |
3100 | msgstr "这是一个 %d 个提交的组合。" | |
3101 | ||
87cb7997 | 3102 | #: sequencer.c:842 |
1a79b2f1 JX |
3103 | msgid "need a HEAD to fixup" |
3104 | msgstr "需要一个 HEAD 来修复" | |
3105 | ||
87cb7997 | 3106 | #: sequencer.c:844 |
1a79b2f1 JX |
3107 | msgid "could not read HEAD" |
3108 | msgstr "不能读取 HEAD" | |
3109 | ||
87cb7997 | 3110 | #: sequencer.c:846 |
1a79b2f1 JX |
3111 | msgid "could not read HEAD's commit message" |
3112 | msgstr "不能读取 HEAD 的提交说明" | |
3113 | ||
87cb7997 | 3114 | #: sequencer.c:852 |
1a79b2f1 JX |
3115 | #, c-format |
3116 | msgid "cannot write '%s'" | |
3117 | msgstr "不能写 '%s'" | |
3118 | ||
87cb7997 | 3119 | #: sequencer.c:861 git-rebase--interactive.sh:445 |
1a79b2f1 JX |
3120 | msgid "This is the 1st commit message:" |
3121 | msgstr "这是第一个提交说明:" | |
3122 | ||
87cb7997 | 3123 | #: sequencer.c:869 |
1a79b2f1 JX |
3124 | #, c-format |
3125 | msgid "could not read commit message of %s" | |
3126 | msgstr "不能读取 %s 的提交说明" | |
3127 | ||
87cb7997 | 3128 | #: sequencer.c:876 |
1a79b2f1 JX |
3129 | #, c-format |
3130 | msgid "This is the commit message #%d:" | |
3131 | msgstr "这是提交说明 #%d:" | |
3132 | ||
87cb7997 | 3133 | #: sequencer.c:881 |
1a79b2f1 JX |
3134 | #, c-format |
3135 | msgid "The commit message #%d will be skipped:" | |
3136 | msgstr "提交说明 #%d 将被跳过:" | |
3137 | ||
87cb7997 | 3138 | #: sequencer.c:886 |
1a79b2f1 JX |
3139 | #, c-format |
3140 | msgid "unknown command: %d" | |
3141 | msgstr "未知命令:%d" | |
3142 | ||
87cb7997 | 3143 | #: sequencer.c:952 |
a0b6b246 JX |
3144 | msgid "your index file is unmerged." |
3145 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 3146 | |
87cb7997 | 3147 | #: sequencer.c:970 |
a0b6b246 JX |
3148 | #, c-format |
3149 | msgid "commit %s is a merge but no -m option was given." | |
3150 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 3151 | |
87cb7997 | 3152 | #: sequencer.c:978 |
a0b6b246 JX |
3153 | #, c-format |
3154 | msgid "commit %s does not have parent %d" | |
3155 | msgstr "提交 %s 没有第 %d 个父提交" | |
3156 | ||
87cb7997 | 3157 | #: sequencer.c:982 |
a0b6b246 JX |
3158 | #, c-format |
3159 | msgid "mainline was specified but commit %s is not a merge." | |
3160 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
3161 | ||
87cb7997 | 3162 | #: sequencer.c:988 |
1a79b2f1 JX |
3163 | #, c-format |
3164 | msgid "cannot get commit message for %s" | |
3165 | msgstr "不能得到 %s 的提交说明" | |
3166 | ||
a0b6b246 JX |
3167 | #. TRANSLATORS: The first %s will be a "todo" command like |
3168 | #. "revert" or "pick", the second %s a SHA1. | |
87cb7997 | 3169 | #: sequencer.c:1009 |
a0b6b246 JX |
3170 | #, c-format |
3171 | msgid "%s: cannot parse parent commit %s" | |
3172 | msgstr "%s:不能解析父提交 %s" | |
3173 | ||
87cb7997 | 3174 | #: sequencer.c:1071 sequencer.c:1820 |
a0b6b246 | 3175 | #, c-format |
1a79b2f1 JX |
3176 | msgid "could not rename '%s' to '%s'" |
3177 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 3178 | |
87cb7997 | 3179 | #: sequencer.c:1122 |
a0b6b246 JX |
3180 | #, c-format |
3181 | msgid "could not revert %s... %s" | |
3182 | msgstr "不能还原 %s... %s" | |
3183 | ||
87cb7997 | 3184 | #: sequencer.c:1123 |
a0b6b246 JX |
3185 | #, c-format |
3186 | msgid "could not apply %s... %s" | |
3187 | msgstr "不能应用 %s... %s" | |
3188 | ||
87cb7997 | 3189 | #: sequencer.c:1165 |
a0b6b246 JX |
3190 | msgid "empty commit set passed" |
3191 | msgstr "提供了空的提交集" | |
3192 | ||
87cb7997 | 3193 | #: sequencer.c:1175 |
a0b6b246 JX |
3194 | #, c-format |
3195 | msgid "git %s: failed to read the index" | |
3196 | msgstr "git %s:无法读取索引" | |
3197 | ||
87cb7997 | 3198 | #: sequencer.c:1182 |
a0b6b246 JX |
3199 | #, c-format |
3200 | msgid "git %s: failed to refresh the index" | |
3201 | msgstr "git %s:无法刷新索引" | |
3202 | ||
87cb7997 | 3203 | #: sequencer.c:1302 |
a0b6b246 JX |
3204 | #, c-format |
3205 | msgid "invalid line %d: %.*s" | |
3206 | msgstr "无效行 %d:%.*s" | |
3207 | ||
87cb7997 | 3208 | #: sequencer.c:1310 |
1a79b2f1 JX |
3209 | #, c-format |
3210 | msgid "cannot '%s' without a previous commit" | |
3211 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 3212 | |
87cb7997 | 3213 | #: sequencer.c:1342 |
a0b6b246 JX |
3214 | #, c-format |
3215 | msgid "could not read '%s'." | |
3216 | msgstr "不能读取 '%s'。" | |
3217 | ||
87cb7997 | 3218 | #: sequencer.c:1349 |
1a79b2f1 JX |
3219 | msgid "please fix this using 'git rebase --edit-todo'." |
3220 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
3221 | ||
87cb7997 | 3222 | #: sequencer.c:1351 |
a0b6b246 JX |
3223 | #, c-format |
3224 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 3225 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 3226 | |
87cb7997 | 3227 | #: sequencer.c:1356 |
1a79b2f1 JX |
3228 | msgid "no commits parsed." |
3229 | msgstr "没有解析提交。" | |
3230 | ||
87cb7997 | 3231 | #: sequencer.c:1367 |
a0b6b246 JX |
3232 | msgid "cannot cherry-pick during a revert." |
3233 | msgstr "不能在回退中执行拣选。" | |
3234 | ||
87cb7997 | 3235 | #: sequencer.c:1369 |
a0b6b246 JX |
3236 | msgid "cannot revert during a cherry-pick." |
3237 | msgstr "不能在拣选中执行回退。" | |
3238 | ||
87cb7997 | 3239 | #: sequencer.c:1432 |
a0b6b246 JX |
3240 | #, c-format |
3241 | msgid "invalid key: %s" | |
3242 | msgstr "无效键名:%s" | |
3243 | ||
87cb7997 | 3244 | #: sequencer.c:1435 |
a0b6b246 JX |
3245 | #, c-format |
3246 | msgid "invalid value for %s: %s" | |
3247 | msgstr "%s 的值无效:%s" | |
3248 | ||
87cb7997 | 3249 | #: sequencer.c:1492 |
a0b6b246 JX |
3250 | #, c-format |
3251 | msgid "malformed options sheet: '%s'" | |
3252 | msgstr "非法的选项清单:'%s'" | |
3253 | ||
87cb7997 | 3254 | #: sequencer.c:1530 |
a0b6b246 JX |
3255 | msgid "a cherry-pick or revert is already in progress" |
3256 | msgstr "一个拣选或还原操作已在进行" | |
3257 | ||
87cb7997 | 3258 | #: sequencer.c:1531 |
a0b6b246 JX |
3259 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
3260 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
3261 | ||
87cb7997 | 3262 | #: sequencer.c:1534 |
a0b6b246 JX |
3263 | #, c-format |
3264 | msgid "could not create sequencer directory '%s'" | |
3265 | msgstr "不能创建序列目录 '%s'" | |
3266 | ||
87cb7997 | 3267 | #: sequencer.c:1548 |
a0b6b246 JX |
3268 | msgid "could not lock HEAD" |
3269 | msgstr "不能锁定 HEAD" | |
3270 | ||
87cb7997 | 3271 | #: sequencer.c:1604 sequencer.c:2159 |
a0b6b246 JX |
3272 | msgid "no cherry-pick or revert in progress" |
3273 | msgstr "拣选或还原操作并未进行" | |
3274 | ||
87cb7997 | 3275 | #: sequencer.c:1606 |
a0b6b246 JX |
3276 | msgid "cannot resolve HEAD" |
3277 | msgstr "不能解析 HEAD" | |
3278 | ||
87cb7997 | 3279 | #: sequencer.c:1608 sequencer.c:1642 |
a0b6b246 JX |
3280 | msgid "cannot abort from a branch yet to be born" |
3281 | msgstr "不能从尚未建立的分支终止" | |
3282 | ||
87cb7997 | 3283 | #: sequencer.c:1628 builtin/grep.c:910 |
a0b6b246 JX |
3284 | #, c-format |
3285 | msgid "cannot open '%s'" | |
3286 | msgstr "不能打开 '%s'" | |
3287 | ||
87cb7997 | 3288 | #: sequencer.c:1630 |
a0b6b246 JX |
3289 | #, c-format |
3290 | msgid "cannot read '%s': %s" | |
3291 | msgstr "不能读取 '%s':%s" | |
3292 | ||
87cb7997 | 3293 | #: sequencer.c:1631 |
a0b6b246 JX |
3294 | msgid "unexpected end of file" |
3295 | msgstr "意外的文件结束" | |
3296 | ||
87cb7997 | 3297 | #: sequencer.c:1637 |
a0b6b246 JX |
3298 | #, c-format |
3299 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
3300 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
3301 | ||
87cb7997 | 3302 | #: sequencer.c:1648 |
1a79b2f1 JX |
3303 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
3304 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
3305 | ||
87cb7997 | 3306 | #: sequencer.c:1785 sequencer.c:2058 |
1a79b2f1 JX |
3307 | msgid "cannot read HEAD" |
3308 | msgstr "不能读取 HEAD" | |
3309 | ||
87cb7997 | 3310 | #: sequencer.c:1825 builtin/difftool.c:616 |
1a79b2f1 JX |
3311 | #, c-format |
3312 | msgid "could not copy '%s' to '%s'" | |
3313 | msgstr "不能拷贝 '%s' 至 '%s'" | |
3314 | ||
87cb7997 | 3315 | #: sequencer.c:1841 |
1a79b2f1 JX |
3316 | msgid "could not read index" |
3317 | msgstr "不能读取索引" | |
3318 | ||
3319 | # 译者:注意保持前导空格 | |
87cb7997 | 3320 | #: sequencer.c:1846 |
1a79b2f1 JX |
3321 | #, c-format |
3322 | msgid "" | |
3323 | "execution failed: %s\n" | |
3324 | "%sYou can fix the problem, and then run\n" | |
3325 | "\n" | |
3326 | " git rebase --continue\n" | |
3327 | "\n" | |
3328 | msgstr "" | |
3329 | "执行失败:%s\n" | |
3330 | "%s您可以改正该问题,然后运行\n" | |
3331 | "\n" | |
3332 | " git rebase --continue\n" | |
3333 | "\n" | |
3334 | ||
87cb7997 | 3335 | #: sequencer.c:1852 |
1a79b2f1 JX |
3336 | msgid "and made changes to the index and/or the working tree\n" |
3337 | msgstr "并且修改索引和/或工作区\n" | |
3338 | ||
87cb7997 | 3339 | #: sequencer.c:1858 |
1a79b2f1 JX |
3340 | #, c-format |
3341 | msgid "" | |
3342 | "execution succeeded: %s\n" | |
3343 | "but left changes to the index and/or the working tree\n" | |
3344 | "Commit or stash your changes, and then run\n" | |
3345 | "\n" | |
3346 | " git rebase --continue\n" | |
3347 | "\n" | |
3348 | msgstr "" | |
3349 | "执行成功:%s\n" | |
3350 | "但是在索引和/或工作区中存在变更\n" | |
3351 | "提交或暂存修改,然后运行\n" | |
3352 | "\n" | |
3353 | " git rebase --continue\n" | |
3354 | "\n" | |
3355 | ||
87cb7997 | 3356 | #: sequencer.c:1913 git-rebase.sh:168 |
1a79b2f1 JX |
3357 | #, c-format |
3358 | msgid "Applied autostash." | |
3359 | msgstr "成功应用 autostash。" | |
3360 | ||
87cb7997 | 3361 | #: sequencer.c:1925 |
1a79b2f1 JX |
3362 | #, c-format |
3363 | msgid "cannot store %s" | |
3364 | msgstr "不能存储 %s" | |
3365 | ||
87cb7997 | 3366 | #: sequencer.c:1927 git-rebase.sh:172 |
1a79b2f1 JX |
3367 | #, c-format |
3368 | msgid "" | |
3369 | "Applying autostash resulted in conflicts.\n" | |
3370 | "Your changes are safe in the stash.\n" | |
3371 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
3372 | msgstr "" | |
3373 | "应用 autostash 导致冲突。\n" | |
3374 | "您的修改安全地保存在 stash 中。\n" | |
3375 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
3376 | ||
87cb7997 | 3377 | #: sequencer.c:2009 |
1a79b2f1 | 3378 | #, c-format |
87cb7997 JX |
3379 | msgid "Stopped at %s... %.*s\n" |
3380 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 3381 | |
87cb7997 | 3382 | #: sequencer.c:2036 |
1a79b2f1 JX |
3383 | #, c-format |
3384 | msgid "unknown command %d" | |
3385 | msgstr "未知命令 %d" | |
3386 | ||
87cb7997 | 3387 | #: sequencer.c:2066 |
1a79b2f1 JX |
3388 | msgid "could not read orig-head" |
3389 | msgstr "不能读取 orig-head" | |
3390 | ||
87cb7997 | 3391 | #: sequencer.c:2070 |
1a79b2f1 JX |
3392 | msgid "could not read 'onto'" |
3393 | msgstr "不能读取 'onto'" | |
3394 | ||
87cb7997 | 3395 | #: sequencer.c:2077 |
1a79b2f1 JX |
3396 | #, c-format |
3397 | msgid "could not update %s" | |
3398 | msgstr "不能更新 %s" | |
3399 | ||
87cb7997 | 3400 | #: sequencer.c:2084 |
1a79b2f1 JX |
3401 | #, c-format |
3402 | msgid "could not update HEAD to %s" | |
3403 | msgstr "不能更新 HEAD 为 %s" | |
3404 | ||
87cb7997 | 3405 | #: sequencer.c:2168 |
1a79b2f1 JX |
3406 | msgid "cannot rebase: You have unstaged changes." |
3407 | msgstr "不能变基:您有未暂存的变更。" | |
3408 | ||
87cb7997 | 3409 | #: sequencer.c:2173 |
1a79b2f1 JX |
3410 | msgid "could not remove CHERRY_PICK_HEAD" |
3411 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
3412 | ||
87cb7997 | 3413 | #: sequencer.c:2182 |
1a79b2f1 JX |
3414 | msgid "cannot amend non-existing commit" |
3415 | msgstr "不能修补不存在的提交" | |
3416 | ||
87cb7997 | 3417 | #: sequencer.c:2184 |
1a79b2f1 JX |
3418 | #, c-format |
3419 | msgid "invalid file: '%s'" | |
3420 | msgstr "无效文件:'%s'" | |
3421 | ||
87cb7997 | 3422 | #: sequencer.c:2186 |
1a79b2f1 JX |
3423 | #, c-format |
3424 | msgid "invalid contents: '%s'" | |
3425 | msgstr "无效内容:'%s'" | |
3426 | ||
87cb7997 | 3427 | #: sequencer.c:2189 |
1a79b2f1 JX |
3428 | msgid "" |
3429 | "\n" | |
3430 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
3431 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
3432 | msgstr "" |
3433 | "\n" | |
3434 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 3435 | |
87cb7997 | 3436 | #: sequencer.c:2199 |
1a79b2f1 JX |
3437 | msgid "could not commit staged changes." |
3438 | msgstr "不能提交暂存的修改。" | |
3439 | ||
87cb7997 | 3440 | #: sequencer.c:2279 |
a0b6b246 JX |
3441 | #, c-format |
3442 | msgid "%s: can't cherry-pick a %s" | |
3443 | msgstr "%s:不能拣选一个%s" | |
3444 | ||
87cb7997 | 3445 | #: sequencer.c:2283 |
a0b6b246 JX |
3446 | #, c-format |
3447 | msgid "%s: bad revision" | |
3448 | msgstr "%s:错误的版本" | |
3449 | ||
87cb7997 | 3450 | #: sequencer.c:2316 |
a0b6b246 JX |
3451 | msgid "can't revert as initial commit" |
3452 | msgstr "不能作为初始提交回退" | |
3453 | ||
87cb7997 | 3454 | #: setup.c:165 |
a0b6b246 | 3455 | #, c-format |
6792b93b | 3456 | msgid "" |
a0b6b246 JX |
3457 | "%s: no such path in the working tree.\n" |
3458 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
3459 | msgstr "" | |
3460 | "%s:工作区中无此路径。\n" | |
3461 | "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" | |
6792b93b | 3462 | |
87cb7997 | 3463 | #: setup.c:178 |
90314792 | 3464 | #, c-format |
a0b6b246 JX |
3465 | msgid "" |
3466 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
3467 | "Use '--' to separate paths from revisions, like this:\n" | |
3468 | "'git <command> [<revision>...] -- [<file>...]'" | |
3469 | msgstr "" | |
3470 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
3471 | "使用 '--' 来分隔版本和路径,例如:\n" | |
3472 | "'git <command> [<revision>...] -- [<file>...]'" | |
6792b93b | 3473 | |
87cb7997 | 3474 | #: setup.c:228 |
a0b6b246 JX |
3475 | #, c-format |
3476 | msgid "" | |
3477 | "ambiguous argument '%s': both revision and filename\n" | |
3478 | "Use '--' to separate paths from revisions, like this:\n" | |
3479 | "'git <command> [<revision>...] -- [<file>...]'" | |
3480 | msgstr "" | |
3481 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
3482 | "使用 '--' 来分隔版本和路径,例如:\n" | |
3483 | "'git <command> [<revision>...] -- [<file>...]'" | |
2e8451e8 | 3484 | |
87cb7997 | 3485 | #: setup.c:475 |
a0b6b246 JX |
3486 | #, c-format |
3487 | msgid "Expected git repo version <= %d, found %d" | |
3488 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 3489 | |
87cb7997 | 3490 | #: setup.c:483 |
a0b6b246 JX |
3491 | msgid "unknown repository extensions found:" |
3492 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 3493 | |
87cb7997 | 3494 | #: setup.c:776 |
1003b3a5 | 3495 | #, c-format |
a0b6b246 JX |
3496 | msgid "Not a git repository (or any of the parent directories): %s" |
3497 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
1003b3a5 | 3498 | |
87cb7997 | 3499 | #: setup.c:778 builtin/index-pack.c:1646 |
a0b6b246 JX |
3500 | msgid "Cannot come back to cwd" |
3501 | msgstr "无法返回当前工作目录" | |
1003b3a5 | 3502 | |
87cb7997 | 3503 | #: setup.c:1010 |
a0b6b246 JX |
3504 | msgid "Unable to read current working directory" |
3505 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 3506 | |
87cb7997 JX |
3507 | #: setup.c:1022 setup.c:1028 |
3508 | #, c-format | |
3509 | msgid "Cannot change to '%s'" | |
3510 | msgstr "不能切换到 '%s'" | |
3511 | ||
3512 | #: setup.c:1041 | |
a0b6b246 JX |
3513 | #, c-format |
3514 | msgid "" | |
3515 | "Not a git repository (or any parent up to mount point %s)\n" | |
3516 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." | |
3517 | msgstr "" | |
3518 | "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n" | |
3519 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" | |
1003b3a5 | 3520 | |
87cb7997 | 3521 | #: setup.c:1106 |
a0b6b246 JX |
3522 | #, c-format |
3523 | msgid "" | |
3524 | "Problem with core.sharedRepository filemode value (0%.3o).\n" | |
3525 | "The owner of files must always have read and write permissions." | |
3526 | msgstr "" | |
3527 | "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n" | |
3528 | "文件属主必须始终拥有读写权限。" | |
6792b93b | 3529 | |
87cb7997 | 3530 | #: sha1_file.c:559 |
a0b6b246 JX |
3531 | #, c-format |
3532 | msgid "path '%s' does not exist" | |
3533 | msgstr "路径 '%s' 不存在" | |
3534 | ||
87cb7997 | 3535 | #: sha1_file.c:585 |
a0b6b246 JX |
3536 | #, c-format |
3537 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
3538 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
3539 | ||
87cb7997 | 3540 | #: sha1_file.c:591 |
a0b6b246 JX |
3541 | #, c-format |
3542 | msgid "reference repository '%s' is not a local repository." | |
3543 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
3544 | ||
87cb7997 | 3545 | #: sha1_file.c:597 |
a0b6b246 JX |
3546 | #, c-format |
3547 | msgid "reference repository '%s' is shallow" | |
3548 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
3549 | ||
87cb7997 | 3550 | #: sha1_file.c:605 |
a0b6b246 JX |
3551 | #, c-format |
3552 | msgid "reference repository '%s' is grafted" | |
3553 | msgstr "参考仓库 '%s' 已被嫁接" | |
3554 | ||
87cb7997 | 3555 | #: sha1_file.c:1245 |
a0b6b246 JX |
3556 | msgid "offset before end of packfile (broken .idx?)" |
3557 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
3558 | ||
87cb7997 | 3559 | #: sha1_file.c:2721 |
a0b6b246 JX |
3560 | #, c-format |
3561 | msgid "offset before start of pack index for %s (corrupt index?)" | |
3562 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
3563 | ||
87cb7997 | 3564 | #: sha1_file.c:2725 |
a0b6b246 JX |
3565 | #, c-format |
3566 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
3567 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
3568 | ||
87cb7997 | 3569 | #: sha1_name.c:409 |
a0b6b246 JX |
3570 | #, c-format |
3571 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 3572 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 3573 | |
87cb7997 | 3574 | #: sha1_name.c:420 |
a0b6b246 JX |
3575 | msgid "The candidates are:" |
3576 | msgstr "候选者有:" | |
3577 | ||
87cb7997 | 3578 | #: sha1_name.c:580 |
a0b6b246 JX |
3579 | msgid "" |
3580 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
3581 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
3582 | "may be created by mistake. For example,\n" | |
3583 | "\n" | |
3584 | " git checkout -b $br $(git rev-parse ...)\n" | |
3585 | "\n" | |
3586 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
3587 | "examine these refs and maybe delete them. Turn this message off by\n" | |
3588 | "running \"git config advice.objectNameWarning false\"" | |
3589 | msgstr "" | |
3590 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
3591 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
3592 | "\n" | |
3593 | " git checkout -b $br $(git rev-parse ...)\n" | |
3594 | "\n" | |
3595 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
3596 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
3597 | "命令关闭本消息通知。" | |
3598 | ||
87cb7997 | 3599 | #: submodule.c:67 submodule.c:101 |
a0b6b246 JX |
3600 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
3601 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
3602 | ||
87cb7997 | 3603 | #: submodule.c:71 submodule.c:105 |
a0b6b246 JX |
3604 | #, c-format |
3605 | msgid "Could not find section in .gitmodules where path=%s" | |
3606 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
3607 | ||
87cb7997 | 3608 | #: submodule.c:79 |
a0b6b246 JX |
3609 | #, c-format |
3610 | msgid "Could not update .gitmodules entry %s" | |
3611 | msgstr "不能更新 .gitmodules 条目 %s" | |
3612 | ||
87cb7997 | 3613 | #: submodule.c:112 |
a0b6b246 JX |
3614 | #, c-format |
3615 | msgid "Could not remove .gitmodules entry for %s" | |
3616 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
3617 | ||
87cb7997 | 3618 | #: submodule.c:123 |
a0b6b246 JX |
3619 | msgid "staging updated .gitmodules failed" |
3620 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
3621 | ||
87cb7997 | 3622 | #: submodule.c:161 |
a0b6b246 JX |
3623 | msgid "negative values not allowed for submodule.fetchJobs" |
3624 | msgstr "submodule.fetchJobs 不允许为负值" | |
3625 | ||
87cb7997 | 3626 | #: submodule.c:1194 |
1a79b2f1 | 3627 | #, c-format |
87cb7997 JX |
3628 | msgid "'%s' not recognized as a git repository" |
3629 | msgstr "'%s' 没有识别为一个 git 仓库" | |
1a79b2f1 | 3630 | |
87cb7997 | 3631 | #: submodule.c:1332 |
1a79b2f1 | 3632 | #, c-format |
87cb7997 JX |
3633 | msgid "could not start 'git status' in submodule '%s'" |
3634 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 3635 | |
87cb7997 JX |
3636 | #: submodule.c:1345 |
3637 | #, c-format | |
3638 | msgid "could not run 'git status' in submodule '%s'" | |
3639 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
3640 | ||
3641 | #: submodule.c:1421 | |
3642 | #, c-format | |
3643 | msgid "submodule '%s' has dirty index" | |
3644 | msgstr "子模组 '%s' 中有脏索引" | |
3645 | ||
3646 | #: submodule.c:1679 | |
1a79b2f1 JX |
3647 | #, c-format |
3648 | msgid "" | |
3649 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
3650 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
3651 | ||
87cb7997 | 3652 | #: submodule.c:1691 submodule.c:1747 |
1a79b2f1 JX |
3653 | #, c-format |
3654 | msgid "could not lookup name for submodule '%s'" | |
3655 | msgstr "不能查询子模组 '%s' 的名称" | |
3656 | ||
87cb7997 JX |
3657 | #: submodule.c:1695 builtin/submodule--helper.c:678 |
3658 | #: builtin/submodule--helper.c:688 | |
1a79b2f1 JX |
3659 | #, c-format |
3660 | msgid "could not create directory '%s'" | |
3661 | msgstr "不能创建目录 '%s'" | |
3662 | ||
87cb7997 | 3663 | #: submodule.c:1698 |
1a79b2f1 JX |
3664 | #, c-format |
3665 | msgid "" | |
3666 | "Migrating git directory of '%s%s' from\n" | |
3667 | "'%s' to\n" | |
3668 | "'%s'\n" | |
3669 | msgstr "" | |
3670 | "将 '%s%s' 的 git 目录从\n" | |
3671 | "'%s' 迁移至\n" | |
3672 | "'%s'\n" | |
3673 | ||
87cb7997 | 3674 | #: submodule.c:1782 |
1a79b2f1 JX |
3675 | #, c-format |
3676 | msgid "could not recurse into submodule '%s'" | |
3677 | msgstr "无法递归进子模组路径 '%s'" | |
3678 | ||
87cb7997 JX |
3679 | #: submodule.c:1826 |
3680 | msgid "could not start ls-files in .." | |
3681 | msgstr "无法在 .. 中启动 ls-files" | |
3682 | ||
3683 | #: submodule.c:1846 | |
3684 | msgid "BUG: returned path string doesn't match cwd?" | |
3685 | msgstr "BUG:返回的路径和当前路径不匹配?" | |
3686 | ||
3687 | #: submodule.c:1865 | |
3688 | #, c-format | |
3689 | msgid "ls-tree returned unexpected return code %d" | |
3690 | msgstr "ls-tree 返回未知返回值 %d" | |
3691 | ||
3692 | #: submodule-config.c:380 | |
a0b6b246 JX |
3693 | #, c-format |
3694 | msgid "invalid value for %s" | |
3695 | msgstr "%s 的值无效" | |
3696 | ||
1a79b2f1 | 3697 | #: trailer.c:240 |
a0b6b246 JX |
3698 | #, c-format |
3699 | msgid "running trailer command '%s' failed" | |
3700 | msgstr "执行 trailer 命令 '%s' 失败" | |
3701 | ||
1a79b2f1 JX |
3702 | #: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 |
3703 | #: trailer.c:543 | |
a0b6b246 JX |
3704 | #, c-format |
3705 | msgid "unknown value '%s' for key '%s'" | |
3706 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
3707 | ||
1a79b2f1 | 3708 | #: trailer.c:525 trailer.c:530 builtin/remote.c:289 |
a0b6b246 JX |
3709 | #, c-format |
3710 | msgid "more than one %s" | |
3711 | msgstr "多于一个 %s" | |
3712 | ||
1a79b2f1 | 3713 | #: trailer.c:702 |
a0b6b246 JX |
3714 | #, c-format |
3715 | msgid "empty trailer token in trailer '%.*s'" | |
3716 | msgstr "签名 '%.*s' 的键为空" | |
3717 | ||
1a79b2f1 | 3718 | #: trailer.c:722 |
a0b6b246 JX |
3719 | #, c-format |
3720 | msgid "could not read input file '%s'" | |
3721 | msgstr "不能读取输入文件 '%s'" | |
3722 | ||
1a79b2f1 | 3723 | #: trailer.c:725 |
a0b6b246 JX |
3724 | msgid "could not read from stdin" |
3725 | msgstr "不能自标准输入读取" | |
3726 | ||
1a79b2f1 | 3727 | #: trailer.c:949 builtin/am.c:44 |
a0b6b246 JX |
3728 | #, c-format |
3729 | msgid "could not stat %s" | |
87cb7997 | 3730 | msgstr "不能获取 %s 的状态" |
a0b6b246 | 3731 | |
1a79b2f1 | 3732 | #: trailer.c:951 |
a0b6b246 JX |
3733 | #, c-format |
3734 | msgid "file %s is not a regular file" | |
3735 | msgstr "文件 %s 不是一个正规文件" | |
3736 | ||
1a79b2f1 | 3737 | #: trailer.c:953 |
a0b6b246 JX |
3738 | #, c-format |
3739 | msgid "file %s is not writable by user" | |
3740 | msgstr "文件 %s 用户不可写" | |
3741 | ||
1a79b2f1 | 3742 | #: trailer.c:965 |
a0b6b246 JX |
3743 | msgid "could not open temporary file" |
3744 | msgstr "不能打开临时文件" | |
3745 | ||
1a79b2f1 | 3746 | #: trailer.c:1001 |
a0b6b246 JX |
3747 | #, c-format |
3748 | msgid "could not rename temporary file to %s" | |
3749 | msgstr "不能重命名临时文件为 %s" | |
3750 | ||
3751 | #: transport.c:62 | |
3752 | #, c-format | |
3753 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
3754 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
3755 | ||
3756 | #: transport.c:151 | |
3757 | #, c-format | |
3758 | msgid "transport: invalid depth option '%s'" | |
3759 | msgstr "传输:无效的深度选项 '%s'" | |
3760 | ||
87cb7997 | 3761 | #: transport.c:889 |
a0b6b246 JX |
3762 | #, c-format |
3763 | msgid "" | |
3764 | "The following submodule paths contain changes that can\n" | |
3765 | "not be found on any remote:\n" | |
3766 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
3767 | ||
87cb7997 | 3768 | #: transport.c:893 |
a0b6b246 JX |
3769 | #, c-format |
3770 | msgid "" | |
3771 | "\n" | |
3772 | "Please try\n" | |
3773 | "\n" | |
3774 | "\tgit push --recurse-submodules=on-demand\n" | |
3775 | "\n" | |
3776 | "or cd to the path and use\n" | |
3777 | "\n" | |
3778 | "\tgit push\n" | |
3779 | "\n" | |
3780 | "to push them to a remote.\n" | |
3781 | "\n" | |
3782 | msgstr "" | |
3783 | "\n" | |
3784 | "请尝试\n" | |
3785 | "\n" | |
3786 | "\tgit push --recurse-submodules=on-demand\n" | |
3787 | "\n" | |
3788 | "或者进入到子目录执行\n" | |
3789 | "\n" | |
3790 | "\tgit push\n" | |
3791 | "\n" | |
3792 | "以推送至远程。\n" | |
3793 | "\n" | |
3794 | ||
87cb7997 | 3795 | #: transport.c:901 |
a0b6b246 JX |
3796 | msgid "Aborting." |
3797 | msgstr "正在终止。" | |
3798 | ||
87cb7997 | 3799 | #: transport-helper.c:1080 |
a0b6b246 JX |
3800 | #, c-format |
3801 | msgid "Could not read ref %s" | |
3802 | msgstr "不能读取引用 %s" | |
3803 | ||
3804 | #: tree-walk.c:31 | |
3805 | msgid "too-short tree object" | |
3806 | msgstr "太短的树对象" | |
3807 | ||
3808 | #: tree-walk.c:37 | |
3809 | msgid "malformed mode in tree entry" | |
29004bbb | 3810 | msgstr "树对象中的条目模式错误" |
a0b6b246 JX |
3811 | |
3812 | #: tree-walk.c:41 | |
3813 | msgid "empty filename in tree entry" | |
3814 | msgstr "树对象条目中空的文件名" | |
3815 | ||
3816 | #: tree-walk.c:113 | |
3817 | msgid "too-short tree file" | |
3818 | msgstr "太短的树文件" | |
3819 | ||
87cb7997 | 3820 | #: unpack-trees.c:104 |
a0b6b246 JX |
3821 | #, c-format |
3822 | msgid "" | |
3823 | "Your local changes to the following files would be overwritten by checkout:\n" | |
3824 | "%%sPlease commit your changes or stash them before you switch branches." | |
3825 | msgstr "" | |
3826 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
3827 | "%%s请在切换分支前提交您的修改或者保存进度。" | |
3828 | ||
87cb7997 | 3829 | #: unpack-trees.c:106 |
a0b6b246 JX |
3830 | #, c-format |
3831 | msgid "" | |
3832 | "Your local changes to the following files would be overwritten by checkout:\n" | |
3833 | "%%s" | |
3834 | msgstr "" | |
3835 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
3836 | "%%s" | |
3837 | ||
87cb7997 | 3838 | #: unpack-trees.c:109 |
a0b6b246 JX |
3839 | #, c-format |
3840 | msgid "" | |
3841 | "Your local changes to the following files would be overwritten by merge:\n" | |
3842 | "%%sPlease commit your changes or stash them before you merge." | |
3843 | msgstr "" | |
3844 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3845 | "%%s请在合并前提交您的修改或者保存进度。" | |
3846 | ||
87cb7997 | 3847 | #: unpack-trees.c:111 |
a0b6b246 JX |
3848 | #, c-format |
3849 | msgid "" | |
3850 | "Your local changes to the following files would be overwritten by merge:\n" | |
3851 | "%%s" | |
3852 | msgstr "" | |
3853 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3854 | "%%s" | |
3855 | ||
87cb7997 | 3856 | #: unpack-trees.c:114 |
a0b6b246 JX |
3857 | #, c-format |
3858 | msgid "" | |
3859 | "Your local changes to the following files would be overwritten by %s:\n" | |
3860 | "%%sPlease commit your changes or stash them before you %s." | |
3861 | msgstr "" | |
3862 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
3863 | "%%s请在 %s 之前提交您的修改或者保存进度。" | |
6792b93b | 3864 | |
87cb7997 | 3865 | #: unpack-trees.c:116 |
a0b6b246 JX |
3866 | #, c-format |
3867 | msgid "" | |
3868 | "Your local changes to the following files would be overwritten by %s:\n" | |
3869 | "%%s" | |
3870 | msgstr "" | |
3871 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
3872 | "%%s" | |
c04f5ac3 | 3873 | |
87cb7997 | 3874 | #: unpack-trees.c:121 |
a0b6b246 JX |
3875 | #, c-format |
3876 | msgid "" | |
1a79b2f1 | 3877 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
3878 | "%s" |
3879 | msgstr "" | |
3880 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
3881 | "%s" | |
1b7f4a34 | 3882 | |
87cb7997 | 3883 | #: unpack-trees.c:125 |
a0b6b246 JX |
3884 | #, c-format |
3885 | msgid "" | |
3886 | "The following untracked working tree files would be removed by checkout:\n" | |
3887 | "%%sPlease move or remove them before you switch branches." | |
3888 | msgstr "" | |
3889 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
3890 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 3891 | |
87cb7997 | 3892 | #: unpack-trees.c:127 |
a0b6b246 JX |
3893 | #, c-format |
3894 | msgid "" | |
3895 | "The following untracked working tree files would be removed by checkout:\n" | |
3896 | "%%s" | |
3897 | msgstr "" | |
3898 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
3899 | "%%s" | |
1003b3a5 | 3900 | |
87cb7997 | 3901 | #: unpack-trees.c:130 |
a0b6b246 JX |
3902 | #, c-format |
3903 | msgid "" | |
3904 | "The following untracked working tree files would be removed by merge:\n" | |
3905 | "%%sPlease move or remove them before you merge." | |
3906 | msgstr "" | |
3907 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
3908 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 3909 | |
87cb7997 | 3910 | #: unpack-trees.c:132 |
a0b6b246 JX |
3911 | #, c-format |
3912 | msgid "" | |
3913 | "The following untracked working tree files would be removed by merge:\n" | |
3914 | "%%s" | |
3915 | msgstr "" | |
3916 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
3917 | "%%s" | |
c04f5ac3 | 3918 | |
87cb7997 | 3919 | #: unpack-trees.c:135 |
a0b6b246 JX |
3920 | #, c-format |
3921 | msgid "" | |
3922 | "The following untracked working tree files would be removed by %s:\n" | |
3923 | "%%sPlease move or remove them before you %s." | |
3924 | msgstr "" | |
3925 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
3926 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 3927 | |
87cb7997 | 3928 | #: unpack-trees.c:137 |
a0b6b246 JX |
3929 | #, c-format |
3930 | msgid "" | |
3931 | "The following untracked working tree files would be removed by %s:\n" | |
3932 | "%%s" | |
3933 | msgstr "" | |
3934 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
3935 | "%%s" | |
c04f5ac3 | 3936 | |
87cb7997 | 3937 | #: unpack-trees.c:142 |
a0b6b246 JX |
3938 | #, c-format |
3939 | msgid "" | |
3940 | "The following untracked working tree files would be overwritten by " | |
3941 | "checkout:\n" | |
3942 | "%%sPlease move or remove them before you switch branches." | |
3943 | msgstr "" | |
3944 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
3945 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 3946 | |
87cb7997 | 3947 | #: unpack-trees.c:144 |
1003b3a5 | 3948 | #, c-format |
4dcdc3d8 | 3949 | msgid "" |
a0b6b246 JX |
3950 | "The following untracked working tree files would be overwritten by " |
3951 | "checkout:\n" | |
3952 | "%%s" | |
4dcdc3d8 | 3953 | msgstr "" |
a0b6b246 JX |
3954 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
3955 | "%%s" | |
1003b3a5 | 3956 | |
87cb7997 | 3957 | #: unpack-trees.c:147 |
c04f5ac3 | 3958 | #, c-format |
a0b6b246 JX |
3959 | msgid "" |
3960 | "The following untracked working tree files would be overwritten by merge:\n" | |
3961 | "%%sPlease move or remove them before you merge." | |
3962 | msgstr "" | |
3963 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
3964 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 3965 | |
87cb7997 | 3966 | #: unpack-trees.c:149 |
a0b6b246 JX |
3967 | #, c-format |
3968 | msgid "" | |
3969 | "The following untracked working tree files would be overwritten by merge:\n" | |
3970 | "%%s" | |
3971 | msgstr "" | |
3972 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
3973 | "%%s" | |
c04f5ac3 | 3974 | |
87cb7997 | 3975 | #: unpack-trees.c:152 |
a0b6b246 JX |
3976 | #, c-format |
3977 | msgid "" | |
3978 | "The following untracked working tree files would be overwritten by %s:\n" | |
3979 | "%%sPlease move or remove them before you %s." | |
3980 | msgstr "" | |
3981 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
3982 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 3983 | |
87cb7997 | 3984 | #: unpack-trees.c:154 |
07432cef | 3985 | #, c-format |
a0b6b246 JX |
3986 | msgid "" |
3987 | "The following untracked working tree files would be overwritten by %s:\n" | |
3988 | "%%s" | |
3989 | msgstr "" | |
3990 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
3991 | "%%s" | |
c04f5ac3 | 3992 | |
87cb7997 | 3993 | #: unpack-trees.c:161 |
07432cef | 3994 | #, c-format |
a0b6b246 JX |
3995 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
3996 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 3997 | |
87cb7997 | 3998 | #: unpack-trees.c:164 |
07432cef | 3999 | #, c-format |
ef317cd5 | 4000 | msgid "" |
a0b6b246 JX |
4001 | "Cannot update sparse checkout: the following entries are not up-to-date:\n" |
4002 | "%s" | |
4003 | msgstr "" | |
4004 | "无法更新稀疏检出:如下条目不是最新:\n" | |
4005 | "%s" | |
c04f5ac3 | 4006 | |
87cb7997 | 4007 | #: unpack-trees.c:166 |
07432cef | 4008 | #, c-format |
a0b6b246 JX |
4009 | msgid "" |
4010 | "The following working tree files would be overwritten by sparse checkout " | |
4011 | "update:\n" | |
4012 | "%s" | |
4013 | msgstr "" | |
4014 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
4015 | "%s" | |
c04f5ac3 | 4016 | |
87cb7997 | 4017 | #: unpack-trees.c:168 |
07432cef | 4018 | #, c-format |
a0b6b246 JX |
4019 | msgid "" |
4020 | "The following working tree files would be removed by sparse checkout " | |
4021 | "update:\n" | |
4022 | "%s" | |
4023 | msgstr "" | |
4024 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
4025 | "%s" | |
c04f5ac3 | 4026 | |
87cb7997 JX |
4027 | #: unpack-trees.c:170 |
4028 | #, c-format | |
4029 | msgid "" | |
4030 | "Cannot update submodule:\n" | |
4031 | "%s" | |
4032 | msgstr "" | |
4033 | "无法更新子模组:\n" | |
4034 | "%s" | |
4035 | ||
4036 | #: unpack-trees.c:247 | |
07432cef | 4037 | #, c-format |
a0b6b246 JX |
4038 | msgid "Aborting\n" |
4039 | msgstr "终止中\n" | |
ef317cd5 | 4040 | |
87cb7997 JX |
4041 | #: unpack-trees.c:272 |
4042 | #, c-format | |
4043 | msgid "submodule update strategy not supported for submodule '%s'" | |
4044 | msgstr "子模组 %s 不支持子模组更新策略" | |
4045 | ||
4046 | #: unpack-trees.c:340 | |
a0b6b246 JX |
4047 | msgid "Checking out files" |
4048 | msgstr "正在检出文件" | |
c04f5ac3 | 4049 | |
87cb7997 | 4050 | #: urlmatch.c:163 |
a0b6b246 JX |
4051 | msgid "invalid URL scheme name or missing '://' suffix" |
4052 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
4053 | ||
87cb7997 | 4054 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 4055 | #, c-format |
a0b6b246 JX |
4056 | msgid "invalid %XX escape sequence" |
4057 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 4058 | |
87cb7997 | 4059 | #: urlmatch.c:215 |
a0b6b246 JX |
4060 | msgid "missing host and scheme is not 'file:'" |
4061 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 4062 | |
87cb7997 | 4063 | #: urlmatch.c:232 |
a0b6b246 JX |
4064 | msgid "a 'file:' URL may not have a port number" |
4065 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 4066 | |
87cb7997 | 4067 | #: urlmatch.c:247 |
a0b6b246 JX |
4068 | msgid "invalid characters in host name" |
4069 | msgstr "主机名中包含无效的字符" | |
90314792 | 4070 | |
87cb7997 | 4071 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
4072 | msgid "invalid port number" |
4073 | msgstr "无效的端口号" | |
c04f5ac3 | 4074 | |
87cb7997 | 4075 | #: urlmatch.c:371 |
a0b6b246 JX |
4076 | msgid "invalid '..' path segment" |
4077 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 4078 | |
87cb7997 | 4079 | #: worktree.c:285 |
a77c07d9 | 4080 | #, c-format |
a0b6b246 JX |
4081 | msgid "failed to read '%s'" |
4082 | msgstr "无法读取 '%s'" | |
ef317cd5 | 4083 | |
a0b6b246 | 4084 | #: wrapper.c:222 wrapper.c:392 |
c04f5ac3 | 4085 | #, c-format |
a0b6b246 JX |
4086 | msgid "could not open '%s' for reading and writing" |
4087 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 4088 | |
a0b6b246 JX |
4089 | #: wrapper.c:224 wrapper.c:394 builtin/am.c:766 |
4090 | #, c-format | |
4091 | msgid "could not open '%s' for writing" | |
4092 | msgstr "无法打开 '%s' 进行写入" | |
c04f5ac3 | 4093 | |
a0b6b246 | 4094 | #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 |
87cb7997 | 4095 | #: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015 |
a0b6b246 | 4096 | #: builtin/pull.c:341 |
c04f5ac3 | 4097 | #, c-format |
a0b6b246 JX |
4098 | msgid "could not open '%s' for reading" |
4099 | msgstr "无法打开 '%s' 进行读取" | |
c04f5ac3 | 4100 | |
87cb7997 | 4101 | #: wrapper.c:581 wrapper.c:602 |
a0b6b246 JX |
4102 | #, c-format |
4103 | msgid "unable to access '%s'" | |
4104 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 4105 | |
87cb7997 | 4106 | #: wrapper.c:610 |
a0b6b246 JX |
4107 | msgid "unable to get current working directory" |
4108 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 4109 | |
87cb7997 | 4110 | #: wrapper.c:634 |
c04f5ac3 | 4111 | #, c-format |
a0b6b246 JX |
4112 | msgid "could not write to %s" |
4113 | msgstr "不能写入 %s" | |
c04f5ac3 | 4114 | |
87cb7997 | 4115 | #: wrapper.c:636 |
a0b6b246 JX |
4116 | #, c-format |
4117 | msgid "could not close %s" | |
4118 | msgstr "不能关闭 %s" | |
c04f5ac3 | 4119 | |
a0b6b246 JX |
4120 | #: wt-status.c:151 |
4121 | msgid "Unmerged paths:" | |
4122 | msgstr "未合并的路径:" | |
7aea43ff | 4123 | |
a0b6b246 JX |
4124 | # 译者:注意保持前导空格 |
4125 | #: wt-status.c:178 wt-status.c:205 | |
c04f5ac3 | 4126 | #, c-format |
a0b6b246 JX |
4127 | msgid " (use \"git reset %s <file>...\" to unstage)" |
4128 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4129 | |
a0b6b246 JX |
4130 | # 译者:注意保持前导空格 |
4131 | #: wt-status.c:180 wt-status.c:207 | |
4132 | msgid " (use \"git rm --cached <file>...\" to unstage)" | |
4133 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4134 | |
a0b6b246 JX |
4135 | # 译者:注意保持前导空格 |
4136 | #: wt-status.c:184 | |
4137 | msgid " (use \"git add <file>...\" to mark resolution)" | |
4138 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 4139 | |
a0b6b246 JX |
4140 | # 译者:注意保持前导空格 |
4141 | #: wt-status.c:186 wt-status.c:190 | |
4142 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" | |
4143 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 4144 | |
a0b6b246 JX |
4145 | # 译者:注意保持前导空格 |
4146 | #: wt-status.c:188 | |
4147 | msgid " (use \"git rm <file>...\" to mark resolution)" | |
4148 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 4149 | |
87cb7997 | 4150 | #: wt-status.c:199 wt-status.c:958 |
a0b6b246 JX |
4151 | msgid "Changes to be committed:" |
4152 | msgstr "要提交的变更:" | |
ef317cd5 | 4153 | |
87cb7997 | 4154 | #: wt-status.c:217 wt-status.c:967 |
a0b6b246 JX |
4155 | msgid "Changes not staged for commit:" |
4156 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 4157 | |
a0b6b246 JX |
4158 | # 译者:注意保持前导空格 |
4159 | #: wt-status.c:221 | |
4160 | msgid " (use \"git add <file>...\" to update what will be committed)" | |
4161 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4162 | |
a0b6b246 JX |
4163 | # 译者:注意保持前导空格 |
4164 | #: wt-status.c:223 | |
4165 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" | |
4166 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4167 | |
a0b6b246 JX |
4168 | # 译者:注意保持前导空格 |
4169 | #: wt-status.c:224 | |
4170 | msgid "" | |
4171 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
4172 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 4173 | |
a0b6b246 JX |
4174 | # 译者:注意保持前导空格 |
4175 | #: wt-status.c:226 | |
4176 | msgid " (commit or discard the untracked or modified content in submodules)" | |
4177 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 4178 | |
a0b6b246 JX |
4179 | # 译者:注意保持前导空格 |
4180 | #: wt-status.c:238 | |
4181 | #, c-format | |
4182 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
4183 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 4184 | |
a0b6b246 JX |
4185 | #: wt-status.c:253 |
4186 | msgid "both deleted:" | |
4187 | msgstr "双方删除:" | |
ef317cd5 | 4188 | |
a0b6b246 JX |
4189 | #: wt-status.c:255 |
4190 | msgid "added by us:" | |
4191 | msgstr "由我们添加:" | |
4dcdc3d8 | 4192 | |
a0b6b246 JX |
4193 | #: wt-status.c:257 |
4194 | msgid "deleted by them:" | |
4195 | msgstr "由他们删除:" | |
ef317cd5 | 4196 | |
a0b6b246 JX |
4197 | #: wt-status.c:259 |
4198 | msgid "added by them:" | |
4199 | msgstr "由他们添加:" | |
ef317cd5 | 4200 | |
a0b6b246 JX |
4201 | #: wt-status.c:261 |
4202 | msgid "deleted by us:" | |
4203 | msgstr "由我们删除:" | |
ef317cd5 | 4204 | |
a0b6b246 JX |
4205 | #: wt-status.c:263 |
4206 | msgid "both added:" | |
4207 | msgstr "双方添加:" | |
5c57d762 | 4208 | |
a0b6b246 JX |
4209 | #: wt-status.c:265 |
4210 | msgid "both modified:" | |
4211 | msgstr "双方修改:" | |
5c57d762 | 4212 | |
a0b6b246 JX |
4213 | #: wt-status.c:275 |
4214 | msgid "new file:" | |
4215 | msgstr "新文件:" | |
8ada9598 | 4216 | |
a0b6b246 JX |
4217 | #: wt-status.c:277 |
4218 | msgid "copied:" | |
4219 | msgstr "拷贝:" | |
8ada9598 | 4220 | |
a0b6b246 JX |
4221 | #: wt-status.c:279 |
4222 | msgid "deleted:" | |
4223 | msgstr "删除:" | |
8ada9598 | 4224 | |
a0b6b246 JX |
4225 | #: wt-status.c:281 |
4226 | msgid "modified:" | |
4227 | msgstr "修改:" | |
8ada9598 | 4228 | |
a0b6b246 JX |
4229 | #: wt-status.c:283 |
4230 | msgid "renamed:" | |
4231 | msgstr "重命名:" | |
5c57d762 | 4232 | |
a0b6b246 JX |
4233 | #: wt-status.c:285 |
4234 | msgid "typechange:" | |
4235 | msgstr "类型变更:" | |
8ada9598 | 4236 | |
a0b6b246 JX |
4237 | #: wt-status.c:287 |
4238 | msgid "unknown:" | |
4239 | msgstr "未知:" | |
8ada9598 | 4240 | |
a0b6b246 JX |
4241 | #: wt-status.c:289 |
4242 | msgid "unmerged:" | |
4243 | msgstr "未合并:" | |
8ada9598 | 4244 | |
a0b6b246 JX |
4245 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
4246 | #: wt-status.c:371 | |
4247 | msgid "new commits, " | |
4248 | msgstr "新提交, " | |
8ada9598 | 4249 | |
a0b6b246 JX |
4250 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
4251 | #: wt-status.c:373 | |
4252 | msgid "modified content, " | |
4253 | msgstr "修改的内容, " | |
1b7f4a34 | 4254 | |
a0b6b246 JX |
4255 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
4256 | #: wt-status.c:375 | |
4257 | msgid "untracked content, " | |
4258 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 4259 | |
87cb7997 | 4260 | #: wt-status.c:831 |
a0b6b246 JX |
4261 | msgid "Submodules changed but not updated:" |
4262 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 4263 | |
87cb7997 | 4264 | #: wt-status.c:833 |
a0b6b246 JX |
4265 | msgid "Submodule changes to be committed:" |
4266 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 4267 | |
87cb7997 | 4268 | #: wt-status.c:914 |
a0b6b246 JX |
4269 | msgid "" |
4270 | "Do not touch the line above.\n" | |
4271 | "Everything below will be removed." | |
4272 | msgstr "" | |
4273 | "不要改动上面的一行。\n" | |
4274 | "下面的所有内容均将被删除。" | |
1b7f4a34 | 4275 | |
87cb7997 | 4276 | #: wt-status.c:1026 |
a0b6b246 JX |
4277 | msgid "You have unmerged paths." |
4278 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 4279 | |
a0b6b246 | 4280 | # 译者:注意保持前导空格 |
87cb7997 | 4281 | #: wt-status.c:1029 |
a0b6b246 JX |
4282 | msgid " (fix conflicts and run \"git commit\")" |
4283 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 4284 | |
a0b6b246 | 4285 | # 译者:注意保持前导空格 |
87cb7997 | 4286 | #: wt-status.c:1031 |
a0b6b246 JX |
4287 | msgid " (use \"git merge --abort\" to abort the merge)" |
4288 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 4289 | |
87cb7997 | 4290 | #: wt-status.c:1036 |
a0b6b246 JX |
4291 | msgid "All conflicts fixed but you are still merging." |
4292 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 4293 | |
a0b6b246 | 4294 | # 译者:注意保持前导空格 |
87cb7997 | 4295 | #: wt-status.c:1039 |
a0b6b246 JX |
4296 | msgid " (use \"git commit\" to conclude merge)" |
4297 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 4298 | |
87cb7997 | 4299 | #: wt-status.c:1049 |
a0b6b246 JX |
4300 | msgid "You are in the middle of an am session." |
4301 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 4302 | |
87cb7997 | 4303 | #: wt-status.c:1052 |
a0b6b246 JX |
4304 | msgid "The current patch is empty." |
4305 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 4306 | |
a0b6b246 | 4307 | # 译者:注意保持前导空格 |
87cb7997 | 4308 | #: wt-status.c:1056 |
a0b6b246 JX |
4309 | msgid " (fix conflicts and then run \"git am --continue\")" |
4310 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 4311 | |
a0b6b246 | 4312 | # 译者:注意保持前导空格 |
87cb7997 | 4313 | #: wt-status.c:1058 |
a0b6b246 JX |
4314 | msgid " (use \"git am --skip\" to skip this patch)" |
4315 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 4316 | |
a0b6b246 | 4317 | # 译者:注意保持前导空格 |
87cb7997 | 4318 | #: wt-status.c:1060 |
a0b6b246 JX |
4319 | msgid " (use \"git am --abort\" to restore the original branch)" |
4320 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 4321 | |
87cb7997 | 4322 | #: wt-status.c:1189 |
1a79b2f1 JX |
4323 | msgid "git-rebase-todo is missing." |
4324 | msgstr "git-rebase-todo 丢失。" | |
4325 | ||
87cb7997 | 4326 | #: wt-status.c:1191 |
a0b6b246 JX |
4327 | msgid "No commands done." |
4328 | msgstr "没有命令被执行。" | |
4329 | ||
87cb7997 | 4330 | #: wt-status.c:1194 |
1b7f4a34 | 4331 | #, c-format |
a0b6b246 JX |
4332 | msgid "Last command done (%d command done):" |
4333 | msgid_plural "Last commands done (%d commands done):" | |
4334 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
4335 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 4336 | |
87cb7997 | 4337 | #: wt-status.c:1205 |
1b7f4a34 | 4338 | #, c-format |
a0b6b246 JX |
4339 | msgid " (see more in file %s)" |
4340 | msgstr " (更多参见文件 %s)" | |
4341 | ||
87cb7997 | 4342 | #: wt-status.c:1210 |
a0b6b246 JX |
4343 | msgid "No commands remaining." |
4344 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 4345 | |
87cb7997 | 4346 | #: wt-status.c:1213 |
1b7f4a34 | 4347 | #, c-format |
a0b6b246 JX |
4348 | msgid "Next command to do (%d remaining command):" |
4349 | msgid_plural "Next commands to do (%d remaining commands):" | |
4350 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
4351 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 4352 | |
a0b6b246 | 4353 | # 译者:注意保持前导空格 |
87cb7997 | 4354 | #: wt-status.c:1221 |
a0b6b246 JX |
4355 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
4356 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 4357 | |
87cb7997 | 4358 | #: wt-status.c:1234 |
1b7f4a34 | 4359 | #, c-format |
a0b6b246 JX |
4360 | msgid "You are currently rebasing branch '%s' on '%s'." |
4361 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 4362 | |
87cb7997 | 4363 | #: wt-status.c:1239 |
a0b6b246 JX |
4364 | msgid "You are currently rebasing." |
4365 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 4366 | |
a0b6b246 | 4367 | # 译者:注意保持前导空格 |
87cb7997 | 4368 | #: wt-status.c:1253 |
a0b6b246 JX |
4369 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
4370 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 4371 | |
a0b6b246 | 4372 | # 译者:注意保持前导空格 |
87cb7997 | 4373 | #: wt-status.c:1255 |
a0b6b246 JX |
4374 | msgid " (use \"git rebase --skip\" to skip this patch)" |
4375 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
4376 | ||
4377 | # 译者:注意保持前导空格 | |
87cb7997 | 4378 | #: wt-status.c:1257 |
a0b6b246 JX |
4379 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
4380 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
4381 | ||
4382 | # 译者:注意保持前导空格 | |
87cb7997 | 4383 | #: wt-status.c:1263 |
a0b6b246 JX |
4384 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
4385 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 4386 | |
87cb7997 | 4387 | #: wt-status.c:1267 |
a0b6b246 | 4388 | #, c-format |
1b7f4a34 | 4389 | msgid "" |
a0b6b246 JX |
4390 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
4391 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 4392 | |
87cb7997 | 4393 | #: wt-status.c:1272 |
a0b6b246 JX |
4394 | msgid "You are currently splitting a commit during a rebase." |
4395 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 4396 | |
a0b6b246 | 4397 | # 译者:注意保持前导空格 |
87cb7997 | 4398 | #: wt-status.c:1275 |
a0b6b246 JX |
4399 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
4400 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 4401 | |
87cb7997 | 4402 | #: wt-status.c:1279 |
a0b6b246 JX |
4403 | #, c-format |
4404 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
4405 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 4406 | |
87cb7997 | 4407 | #: wt-status.c:1284 |
a0b6b246 JX |
4408 | msgid "You are currently editing a commit during a rebase." |
4409 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 4410 | |
a0b6b246 | 4411 | # 译者:注意保持前导空格 |
87cb7997 | 4412 | #: wt-status.c:1287 |
a0b6b246 JX |
4413 | msgid " (use \"git commit --amend\" to amend the current commit)" |
4414 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
4415 | ||
4416 | # 译者:注意保持前导空格 | |
87cb7997 | 4417 | #: wt-status.c:1289 |
a0b6b246 JX |
4418 | msgid "" |
4419 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
4420 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 4421 | |
87cb7997 | 4422 | #: wt-status.c:1299 |
1b7f4a34 | 4423 | #, c-format |
a0b6b246 JX |
4424 | msgid "You are currently cherry-picking commit %s." |
4425 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 4426 | |
a0b6b246 | 4427 | # 译者:注意保持前导空格 |
87cb7997 | 4428 | #: wt-status.c:1304 |
a0b6b246 JX |
4429 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
4430 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 4431 | |
a0b6b246 | 4432 | # 译者:注意保持前导空格 |
87cb7997 | 4433 | #: wt-status.c:1307 |
a0b6b246 JX |
4434 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
4435 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 4436 | |
a0b6b246 | 4437 | # 译者:注意保持前导空格 |
87cb7997 | 4438 | #: wt-status.c:1309 |
a0b6b246 JX |
4439 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
4440 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 4441 | |
87cb7997 | 4442 | #: wt-status.c:1318 |
1b7f4a34 | 4443 | #, c-format |
a0b6b246 JX |
4444 | msgid "You are currently reverting commit %s." |
4445 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 4446 | |
a0b6b246 | 4447 | # 译者:注意保持前导空格 |
87cb7997 | 4448 | #: wt-status.c:1323 |
a0b6b246 JX |
4449 | msgid " (fix conflicts and run \"git revert --continue\")" |
4450 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 4451 | |
a0b6b246 | 4452 | # 译者:注意保持前导空格 |
87cb7997 | 4453 | #: wt-status.c:1326 |
a0b6b246 JX |
4454 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
4455 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 4456 | |
a0b6b246 | 4457 | # 译者:注意保持前导空格 |
87cb7997 | 4458 | #: wt-status.c:1328 |
a0b6b246 JX |
4459 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
4460 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 4461 | |
87cb7997 | 4462 | #: wt-status.c:1339 |
1b7f4a34 | 4463 | #, c-format |
a0b6b246 JX |
4464 | msgid "You are currently bisecting, started from branch '%s'." |
4465 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 4466 | |
87cb7997 | 4467 | #: wt-status.c:1343 |
a0b6b246 JX |
4468 | msgid "You are currently bisecting." |
4469 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 4470 | |
a0b6b246 | 4471 | # 译者:注意保持前导空格 |
87cb7997 | 4472 | #: wt-status.c:1346 |
a0b6b246 JX |
4473 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
4474 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 4475 | |
87cb7997 | 4476 | #: wt-status.c:1543 |
a0b6b246 JX |
4477 | msgid "On branch " |
4478 | msgstr "位于分支 " | |
1b7f4a34 | 4479 | |
87cb7997 | 4480 | #: wt-status.c:1549 |
a0b6b246 JX |
4481 | msgid "interactive rebase in progress; onto " |
4482 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 4483 | |
87cb7997 | 4484 | #: wt-status.c:1551 |
a0b6b246 JX |
4485 | msgid "rebase in progress; onto " |
4486 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 4487 | |
87cb7997 | 4488 | #: wt-status.c:1556 |
a0b6b246 JX |
4489 | msgid "HEAD detached at " |
4490 | msgstr "头指针分离于 " | |
1b7f4a34 | 4491 | |
87cb7997 | 4492 | #: wt-status.c:1558 |
a0b6b246 JX |
4493 | msgid "HEAD detached from " |
4494 | msgstr "头指针分离自 " | |
1b7f4a34 | 4495 | |
87cb7997 | 4496 | #: wt-status.c:1561 |
a0b6b246 JX |
4497 | msgid "Not currently on any branch." |
4498 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 4499 | |
87cb7997 | 4500 | #: wt-status.c:1579 |
a0b6b246 JX |
4501 | msgid "Initial commit" |
4502 | msgstr "初始提交" | |
1b7f4a34 | 4503 | |
87cb7997 | 4504 | #: wt-status.c:1593 |
a0b6b246 JX |
4505 | msgid "Untracked files" |
4506 | msgstr "未跟踪的文件" | |
1b7f4a34 | 4507 | |
87cb7997 | 4508 | #: wt-status.c:1595 |
a0b6b246 JX |
4509 | msgid "Ignored files" |
4510 | msgstr "忽略的文件" | |
1b7f4a34 | 4511 | |
87cb7997 | 4512 | #: wt-status.c:1599 |
a0b6b246 JX |
4513 | #, c-format |
4514 | msgid "" | |
4515 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
4516 | "may speed it up, but you have to be careful not to forget to add\n" | |
4517 | "new files yourself (see 'git help status')." | |
4518 | msgstr "" | |
4519 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
4520 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 4521 | |
87cb7997 | 4522 | #: wt-status.c:1605 |
a0b6b246 JX |
4523 | #, c-format |
4524 | msgid "Untracked files not listed%s" | |
4525 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 4526 | |
a0b6b246 | 4527 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4528 | #: wt-status.c:1607 |
a0b6b246 JX |
4529 | msgid " (use -u option to show untracked files)" |
4530 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 4531 | |
87cb7997 | 4532 | #: wt-status.c:1613 |
a0b6b246 JX |
4533 | msgid "No changes" |
4534 | msgstr "没有修改" | |
1b7f4a34 | 4535 | |
87cb7997 | 4536 | #: wt-status.c:1618 |
a0b6b246 JX |
4537 | #, c-format |
4538 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
4539 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 4540 | |
87cb7997 | 4541 | #: wt-status.c:1621 |
a0b6b246 JX |
4542 | #, c-format |
4543 | msgid "no changes added to commit\n" | |
4544 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 4545 | |
87cb7997 | 4546 | #: wt-status.c:1624 |
a0b6b246 JX |
4547 | #, c-format |
4548 | msgid "" | |
4549 | "nothing added to commit but untracked files present (use \"git add\" to " | |
4550 | "track)\n" | |
4551 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 4552 | |
87cb7997 | 4553 | #: wt-status.c:1627 |
a0b6b246 JX |
4554 | #, c-format |
4555 | msgid "nothing added to commit but untracked files present\n" | |
4556 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 4557 | |
a0b6b246 | 4558 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4559 | #: wt-status.c:1630 |
a0b6b246 JX |
4560 | #, c-format |
4561 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
4562 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 4563 | |
87cb7997 | 4564 | #: wt-status.c:1633 wt-status.c:1638 |
a0b6b246 JX |
4565 | #, c-format |
4566 | msgid "nothing to commit\n" | |
4567 | msgstr "无文件要提交\n" | |
1b7f4a34 | 4568 | |
a0b6b246 | 4569 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4570 | #: wt-status.c:1636 |
a0b6b246 JX |
4571 | #, c-format |
4572 | msgid "nothing to commit (use -u to show untracked files)\n" | |
4573 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 4574 | |
a0b6b246 | 4575 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4576 | #: wt-status.c:1640 |
a0b6b246 JX |
4577 | #, c-format |
4578 | msgid "nothing to commit, working tree clean\n" | |
4579 | msgstr "无文件要提交,干净的工作区\n" | |
4580 | ||
4581 | # 译者:注意保持句尾空格 | |
87cb7997 | 4582 | #: wt-status.c:1749 |
a0b6b246 JX |
4583 | msgid "Initial commit on " |
4584 | msgstr "初始提交于 " | |
1b7f4a34 | 4585 | |
87cb7997 | 4586 | #: wt-status.c:1753 |
a0b6b246 JX |
4587 | msgid "HEAD (no branch)" |
4588 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 4589 | |
a0b6b246 | 4590 | # 译者:注意保持句尾空格 |
87cb7997 | 4591 | #: wt-status.c:1782 wt-status.c:1790 |
a0b6b246 JX |
4592 | msgid "behind " |
4593 | msgstr "落后 " | |
1b7f4a34 | 4594 | |
87cb7997 | 4595 | #: wt-status.c:1785 wt-status.c:1788 |
a0b6b246 JX |
4596 | msgid "ahead " |
4597 | msgstr "领先 " | |
1b7f4a34 | 4598 | |
a0b6b246 | 4599 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
87cb7997 | 4600 | #: wt-status.c:2280 |
a0b6b246 JX |
4601 | #, c-format |
4602 | msgid "cannot %s: You have unstaged changes." | |
4603 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 4604 | |
87cb7997 | 4605 | #: wt-status.c:2286 |
a0b6b246 | 4606 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 4607 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 4608 | |
87cb7997 | 4609 | #: wt-status.c:2288 |
a0b6b246 JX |
4610 | #, c-format |
4611 | msgid "cannot %s: Your index contains uncommitted changes." | |
4612 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 4613 | |
87cb7997 | 4614 | #: compat/precompose_utf8.c:57 builtin/clone.c:432 |
a0b6b246 JX |
4615 | #, c-format |
4616 | msgid "failed to unlink '%s'" | |
4617 | msgstr "无法删除 '%s'" | |
1b7f4a34 | 4618 | |
a0b6b246 JX |
4619 | #: builtin/add.c:22 |
4620 | msgid "git add [<options>] [--] <pathspec>..." | |
4621 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 4622 | |
a0b6b246 JX |
4623 | #: builtin/add.c:80 |
4624 | #, c-format | |
4625 | msgid "unexpected diff status %c" | |
4626 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 4627 | |
a0b6b246 JX |
4628 | #: builtin/add.c:85 builtin/commit.c:291 |
4629 | msgid "updating files failed" | |
4630 | msgstr "更新文件失败" | |
1b7f4a34 | 4631 | |
a0b6b246 JX |
4632 | #: builtin/add.c:95 |
4633 | #, c-format | |
4634 | msgid "remove '%s'\n" | |
4635 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 4636 | |
a0b6b246 JX |
4637 | #: builtin/add.c:149 |
4638 | msgid "Unstaged changes after refreshing the index:" | |
4639 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 4640 | |
87cb7997 | 4641 | #: builtin/add.c:209 builtin/rev-parse.c:872 |
a0b6b246 JX |
4642 | msgid "Could not read the index" |
4643 | msgstr "不能读取索引" | |
1b7f4a34 | 4644 | |
a0b6b246 JX |
4645 | #: builtin/add.c:220 |
4646 | #, c-format | |
4647 | msgid "Could not open '%s' for writing." | |
4648 | msgstr "无法打开 '%s' 进行写入。" | |
1b7f4a34 | 4649 | |
a0b6b246 JX |
4650 | #: builtin/add.c:224 |
4651 | msgid "Could not write patch" | |
4652 | msgstr "不能生成补丁" | |
1b7f4a34 | 4653 | |
a0b6b246 JX |
4654 | #: builtin/add.c:227 |
4655 | msgid "editing patch failed" | |
4656 | msgstr "编辑补丁失败" | |
1b7f4a34 | 4657 | |
a0b6b246 | 4658 | #: builtin/add.c:230 |
1b7f4a34 | 4659 | #, c-format |
a0b6b246 JX |
4660 | msgid "Could not stat '%s'" |
4661 | msgstr "不能查看文件状态 '%s'" | |
1b7f4a34 | 4662 | |
a0b6b246 JX |
4663 | #: builtin/add.c:232 |
4664 | msgid "Empty patch. Aborted." | |
4665 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 4666 | |
a0b6b246 JX |
4667 | #: builtin/add.c:237 |
4668 | #, c-format | |
4669 | msgid "Could not apply '%s'" | |
4670 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 4671 | |
a0b6b246 JX |
4672 | #: builtin/add.c:247 |
4673 | msgid "The following paths are ignored by one of your .gitignore files:\n" | |
4674 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 4675 | |
87cb7997 | 4676 | #: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 |
1a79b2f1 | 4677 | #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 |
87cb7997 | 4678 | #: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 |
a0b6b246 JX |
4679 | msgid "dry run" |
4680 | msgstr "演习" | |
8ada9598 | 4681 | |
a0b6b246 JX |
4682 | #: builtin/add.c:269 |
4683 | msgid "interactive picking" | |
4684 | msgstr "交互式拣选" | |
8ada9598 | 4685 | |
87cb7997 | 4686 | #: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 |
a0b6b246 JX |
4687 | msgid "select hunks interactively" |
4688 | msgstr "交互式挑选数据块" | |
8ada9598 | 4689 | |
a0b6b246 JX |
4690 | #: builtin/add.c:271 |
4691 | msgid "edit current diff and apply" | |
4692 | msgstr "编辑当前差异并应用" | |
8ada9598 | 4693 | |
a0b6b246 JX |
4694 | #: builtin/add.c:272 |
4695 | msgid "allow adding otherwise ignored files" | |
4696 | msgstr "允许添加忽略的文件" | |
8ada9598 | 4697 | |
a0b6b246 JX |
4698 | #: builtin/add.c:273 |
4699 | msgid "update tracked files" | |
4700 | msgstr "更新已跟踪的文件" | |
8ada9598 | 4701 | |
a0b6b246 JX |
4702 | #: builtin/add.c:274 |
4703 | msgid "record only the fact that the path will be added later" | |
4704 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 4705 | |
a0b6b246 JX |
4706 | #: builtin/add.c:275 |
4707 | msgid "add changes from all tracked and untracked files" | |
4708 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 4709 | |
a0b6b246 JX |
4710 | #: builtin/add.c:278 |
4711 | msgid "ignore paths removed in the working tree (same as --no-all)" | |
4712 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 4713 | |
a0b6b246 JX |
4714 | #: builtin/add.c:280 |
4715 | msgid "don't add, only refresh the index" | |
4716 | msgstr "不添加,只刷新索引" | |
8ada9598 | 4717 | |
a0b6b246 JX |
4718 | #: builtin/add.c:281 |
4719 | msgid "just skip files which cannot be added because of errors" | |
4720 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 4721 | |
a0b6b246 JX |
4722 | #: builtin/add.c:282 |
4723 | msgid "check if - even missing - files are ignored in dry run" | |
4724 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 4725 | |
87cb7997 | 4726 | #: builtin/add.c:283 builtin/update-index.c:951 |
a0b6b246 JX |
4727 | msgid "(+/-)x" |
4728 | msgstr "(+/-)x" | |
8ada9598 | 4729 | |
87cb7997 | 4730 | #: builtin/add.c:283 builtin/update-index.c:952 |
a0b6b246 JX |
4731 | msgid "override the executable bit of the listed files" |
4732 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 4733 | |
a0b6b246 | 4734 | #: builtin/add.c:305 |
8ada9598 | 4735 | #, c-format |
a0b6b246 JX |
4736 | msgid "Use -f if you really want to add them.\n" |
4737 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 4738 | |
a0b6b246 JX |
4739 | #: builtin/add.c:312 |
4740 | msgid "adding files failed" | |
4741 | msgstr "添加文件失败" | |
8ada9598 | 4742 | |
a0b6b246 JX |
4743 | #: builtin/add.c:348 |
4744 | msgid "-A and -u are mutually incompatible" | |
4745 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 4746 | |
a0b6b246 JX |
4747 | #: builtin/add.c:355 |
4748 | msgid "Option --ignore-missing can only be used together with --dry-run" | |
4749 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 4750 | |
a0b6b246 | 4751 | #: builtin/add.c:359 |
8ada9598 | 4752 | #, c-format |
a0b6b246 JX |
4753 | msgid "--chmod param '%s' must be either -x or +x" |
4754 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 4755 | |
a0b6b246 | 4756 | #: builtin/add.c:374 |
8ada9598 | 4757 | #, c-format |
a0b6b246 JX |
4758 | msgid "Nothing specified, nothing added.\n" |
4759 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 4760 | |
a0b6b246 | 4761 | #: builtin/add.c:375 |
8ada9598 | 4762 | #, c-format |
a0b6b246 JX |
4763 | msgid "Maybe you wanted to say 'git add .'?\n" |
4764 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 4765 | |
87cb7997 JX |
4766 | #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 |
4767 | #: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 | |
1a79b2f1 | 4768 | #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 |
a0b6b246 JX |
4769 | #: builtin/submodule--helper.c:244 |
4770 | msgid "index file corrupt" | |
4771 | msgstr "索引文件损坏" | |
8ada9598 | 4772 | |
a0b6b246 JX |
4773 | #: builtin/am.c:414 |
4774 | msgid "could not parse author script" | |
4775 | msgstr "不能解析作者脚本" | |
8ada9598 | 4776 | |
a0b6b246 | 4777 | #: builtin/am.c:491 |
81809b99 | 4778 | #, c-format |
a0b6b246 JX |
4779 | msgid "'%s' was deleted by the applypatch-msg hook" |
4780 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 4781 | |
a0b6b246 | 4782 | #: builtin/am.c:532 |
8ada9598 | 4783 | #, c-format |
a0b6b246 JX |
4784 | msgid "Malformed input line: '%s'." |
4785 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 4786 | |
a0b6b246 | 4787 | #: builtin/am.c:569 |
8ada9598 | 4788 | #, c-format |
a0b6b246 JX |
4789 | msgid "Failed to copy notes from '%s' to '%s'" |
4790 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 4791 | |
a0b6b246 JX |
4792 | #: builtin/am.c:595 |
4793 | msgid "fseek failed" | |
4794 | msgstr "fseek 失败" | |
8ada9598 | 4795 | |
a0b6b246 | 4796 | #: builtin/am.c:775 |
8ada9598 | 4797 | #, c-format |
a0b6b246 JX |
4798 | msgid "could not parse patch '%s'" |
4799 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 4800 | |
a0b6b246 JX |
4801 | #: builtin/am.c:840 |
4802 | msgid "Only one StGIT patch series can be applied at once" | |
4803 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
4804 | ||
4805 | #: builtin/am.c:887 | |
4806 | msgid "invalid timestamp" | |
4807 | msgstr "无效的时间戳" | |
4808 | ||
4809 | #: builtin/am.c:890 builtin/am.c:898 | |
4810 | msgid "invalid Date line" | |
4811 | msgstr "无效的日期行" | |
8ada9598 | 4812 | |
a0b6b246 JX |
4813 | #: builtin/am.c:895 |
4814 | msgid "invalid timezone offset" | |
4815 | msgstr "无效的时区偏移值" | |
8ada9598 | 4816 | |
a0b6b246 JX |
4817 | #: builtin/am.c:984 |
4818 | msgid "Patch format detection failed." | |
87cb7997 | 4819 | msgstr "补丁格式探测失败。" |
8ada9598 | 4820 | |
87cb7997 | 4821 | #: builtin/am.c:989 builtin/clone.c:397 |
8ada9598 | 4822 | #, c-format |
a0b6b246 JX |
4823 | msgid "failed to create directory '%s'" |
4824 | msgstr "无法创建目录 '%s'" | |
8ada9598 | 4825 | |
a0b6b246 JX |
4826 | #: builtin/am.c:993 |
4827 | msgid "Failed to split patches." | |
4828 | msgstr "无法拆分补丁。" | |
814ff314 | 4829 | |
a0b6b246 JX |
4830 | #: builtin/am.c:1125 builtin/commit.c:376 |
4831 | msgid "unable to write index file" | |
4832 | msgstr "无法写入索引文件" | |
8ada9598 | 4833 | |
a0b6b246 | 4834 | #: builtin/am.c:1176 |
8ada9598 | 4835 | #, c-format |
a0b6b246 JX |
4836 | msgid "When you have resolved this problem, run \"%s --continue\"." |
4837 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 4838 | |
a0b6b246 | 4839 | #: builtin/am.c:1177 |
81809b99 | 4840 | #, c-format |
a0b6b246 JX |
4841 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
4842 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 4843 | |
a0b6b246 | 4844 | #: builtin/am.c:1178 |
81809b99 | 4845 | #, c-format |
a0b6b246 JX |
4846 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
4847 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 4848 | |
a0b6b246 JX |
4849 | #: builtin/am.c:1316 |
4850 | msgid "Patch is empty. Was it split wrong?" | |
4851 | msgstr "补丁为空。是不是切分错误?" | |
23ff3338 | 4852 | |
87cb7997 | 4853 | #: builtin/am.c:1390 builtin/log.c:1557 |
8ada9598 | 4854 | #, c-format |
a0b6b246 JX |
4855 | msgid "invalid ident line: %s" |
4856 | msgstr "包含无效的身份标识:%s" | |
8ada9598 | 4857 | |
a0b6b246 | 4858 | #: builtin/am.c:1417 |
8ada9598 | 4859 | #, c-format |
a0b6b246 JX |
4860 | msgid "unable to parse commit %s" |
4861 | msgstr "不能解析提交 %s" | |
8ada9598 | 4862 | |
a0b6b246 JX |
4863 | #: builtin/am.c:1610 |
4864 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." | |
4865 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 4866 | |
a0b6b246 JX |
4867 | #: builtin/am.c:1612 |
4868 | msgid "Using index info to reconstruct a base tree..." | |
4869 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 4870 | |
a0b6b246 JX |
4871 | #: builtin/am.c:1631 |
4872 | msgid "" | |
4873 | "Did you hand edit your patch?\n" | |
4874 | "It does not apply to blobs recorded in its index." | |
4875 | msgstr "" | |
4876 | "您是否曾手动编辑过您的补丁?\n" | |
4877 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 4878 | |
a0b6b246 JX |
4879 | #: builtin/am.c:1637 |
4880 | msgid "Falling back to patching base and 3-way merge..." | |
4881 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 4882 | |
a0b6b246 JX |
4883 | #: builtin/am.c:1662 |
4884 | msgid "Failed to merge in the changes." | |
4885 | msgstr "无法合并变更。" | |
d691f479 | 4886 | |
87cb7997 | 4887 | #: builtin/am.c:1686 builtin/merge.c:631 |
a0b6b246 JX |
4888 | msgid "git write-tree failed to write a tree" |
4889 | msgstr "git write-tree 无法写入一树对象" | |
814ff314 | 4890 | |
a0b6b246 JX |
4891 | #: builtin/am.c:1693 |
4892 | msgid "applying to an empty history" | |
4893 | msgstr "正应用到一个空历史上" | |
8ada9598 | 4894 | |
1a79b2f1 JX |
4895 | #: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 |
4896 | #: builtin/merge.c:827 | |
a0b6b246 JX |
4897 | msgid "failed to write commit object" |
4898 | msgstr "无法写提交对象" | |
8ada9598 | 4899 | |
a0b6b246 | 4900 | #: builtin/am.c:1739 builtin/am.c:1743 |
8ada9598 | 4901 | #, c-format |
a0b6b246 JX |
4902 | msgid "cannot resume: %s does not exist." |
4903 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 4904 | |
a0b6b246 JX |
4905 | #: builtin/am.c:1759 |
4906 | msgid "cannot be interactive without stdin connected to a terminal." | |
4907 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 4908 | |
a0b6b246 JX |
4909 | #: builtin/am.c:1764 |
4910 | msgid "Commit Body is:" | |
4911 | msgstr "提交内容为:" | |
8ada9598 | 4912 | |
a0b6b246 JX |
4913 | # 译者:注意保持句尾空格 |
4914 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
4915 | #. in your translation. The program will only accept English | |
4916 | #. input at this point. | |
4917 | #. | |
4918 | #: builtin/am.c:1774 | |
4919 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " | |
4920 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 4921 | |
a0b6b246 | 4922 | #: builtin/am.c:1824 |
8ada9598 | 4923 | #, c-format |
a0b6b246 JX |
4924 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
4925 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 4926 | |
a0b6b246 | 4927 | #: builtin/am.c:1861 builtin/am.c:1933 |
81809b99 | 4928 | #, c-format |
a0b6b246 JX |
4929 | msgid "Applying: %.*s" |
4930 | msgstr "应用:%.*s" | |
8ada9598 | 4931 | |
a0b6b246 JX |
4932 | #: builtin/am.c:1877 |
4933 | msgid "No changes -- Patch already applied." | |
4934 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 4935 | |
a0b6b246 | 4936 | #: builtin/am.c:1885 |
81809b99 | 4937 | #, c-format |
a0b6b246 JX |
4938 | msgid "Patch failed at %s %.*s" |
4939 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 4940 | |
a0b6b246 | 4941 | #: builtin/am.c:1891 |
8ada9598 | 4942 | #, c-format |
a0b6b246 JX |
4943 | msgid "The copy of the patch that failed is found in: %s" |
4944 | msgstr "失败的补丁文件副本位于:%s" | |
8ada9598 | 4945 | |
a0b6b246 JX |
4946 | #: builtin/am.c:1936 |
4947 | msgid "" | |
4948 | "No changes - did you forget to use 'git add'?\n" | |
4949 | "If there is nothing left to stage, chances are that something else\n" | |
4950 | "already introduced the same changes; you might want to skip this patch." | |
4951 | msgstr "" | |
4952 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
4953 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
4954 | "您也许想要跳过这个补丁。" | |
8ada9598 | 4955 | |
a0b6b246 JX |
4956 | #: builtin/am.c:1943 |
4957 | msgid "" | |
4958 | "You still have unmerged paths in your index.\n" | |
4959 | "Did you forget to use 'git add'?" | |
4960 | msgstr "" | |
4961 | "您的索引中仍有未合并的路径。\n" | |
4962 | "您是否忘了执行 'git add'?" | |
8ada9598 | 4963 | |
a0b6b246 JX |
4964 | #: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 |
4965 | #: builtin/reset.c:316 | |
8ada9598 | 4966 | #, c-format |
a0b6b246 JX |
4967 | msgid "Could not parse object '%s'." |
4968 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 4969 | |
a0b6b246 JX |
4970 | #: builtin/am.c:2103 |
4971 | msgid "failed to clean index" | |
4972 | msgstr "无法清空索引" | |
5b04ee3b | 4973 | |
a0b6b246 JX |
4974 | #: builtin/am.c:2137 |
4975 | msgid "" | |
4976 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
4977 | "Not rewinding to ORIG_HEAD" | |
4978 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 4979 | |
a0b6b246 | 4980 | #: builtin/am.c:2200 |
8ada9598 | 4981 | #, c-format |
a0b6b246 JX |
4982 | msgid "Invalid value for --patch-format: %s" |
4983 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 4984 | |
a0b6b246 JX |
4985 | #: builtin/am.c:2233 |
4986 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" | |
4987 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 4988 | |
a0b6b246 JX |
4989 | #: builtin/am.c:2234 |
4990 | msgid "git am [<options>] (--continue | --skip | --abort)" | |
4991 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 4992 | |
a0b6b246 JX |
4993 | #: builtin/am.c:2240 |
4994 | msgid "run interactively" | |
4995 | msgstr "以交互式方式运行" | |
8ada9598 | 4996 | |
a0b6b246 JX |
4997 | #: builtin/am.c:2242 |
4998 | msgid "historical option -- no-op" | |
4999 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 5000 | |
a0b6b246 JX |
5001 | #: builtin/am.c:2244 |
5002 | msgid "allow fall back on 3way merging if needed" | |
5003 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 5004 | |
a0b6b246 | 5005 | #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 |
1a79b2f1 | 5006 | #: builtin/repack.c:178 |
a0b6b246 JX |
5007 | msgid "be quiet" |
5008 | msgstr "静默模式" | |
8ada9598 | 5009 | |
a0b6b246 JX |
5010 | #: builtin/am.c:2247 |
5011 | msgid "add a Signed-off-by line to the commit message" | |
5012 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 5013 | |
a0b6b246 JX |
5014 | #: builtin/am.c:2250 |
5015 | msgid "recode into utf8 (default)" | |
5016 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 5017 | |
a0b6b246 JX |
5018 | #: builtin/am.c:2252 |
5019 | msgid "pass -k flag to git-mailinfo" | |
5020 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 5021 | |
a0b6b246 JX |
5022 | #: builtin/am.c:2254 |
5023 | msgid "pass -b flag to git-mailinfo" | |
5024 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 5025 | |
a0b6b246 JX |
5026 | #: builtin/am.c:2256 |
5027 | msgid "pass -m flag to git-mailinfo" | |
5028 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 5029 | |
a0b6b246 JX |
5030 | #: builtin/am.c:2258 |
5031 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" | |
5032 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 5033 | |
a0b6b246 JX |
5034 | #: builtin/am.c:2261 |
5035 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" | |
5036 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 5037 | |
a0b6b246 JX |
5038 | #: builtin/am.c:2264 |
5039 | msgid "strip everything before a scissors line" | |
5040 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 5041 | |
a0b6b246 JX |
5042 | #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 |
5043 | #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 | |
5044 | #: builtin/am.c:2293 | |
5045 | msgid "pass it through git-apply" | |
5046 | msgstr "传递给 git-apply" | |
8ada9598 | 5047 | |
a0b6b246 | 5048 | #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 |
87cb7997 | 5049 | #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 |
1a79b2f1 | 5050 | #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 |
87cb7997 | 5051 | #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 |
a0b6b246 JX |
5052 | #: parse-options.h:132 parse-options.h:134 parse-options.h:245 |
5053 | msgid "n" | |
5054 | msgstr "n" | |
8ada9598 | 5055 | |
87cb7997 JX |
5056 | #: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37 |
5057 | #: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38 | |
a0b6b246 JX |
5058 | msgid "format" |
5059 | msgstr "格式" | |
8ada9598 | 5060 | |
a0b6b246 JX |
5061 | #: builtin/am.c:2290 |
5062 | msgid "format the patch(es) are in" | |
5063 | msgstr "补丁的格式" | |
8ada9598 | 5064 | |
a0b6b246 JX |
5065 | #: builtin/am.c:2296 |
5066 | msgid "override error message when patch failure occurs" | |
5067 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 5068 | |
a0b6b246 JX |
5069 | #: builtin/am.c:2298 |
5070 | msgid "continue applying patches after resolving a conflict" | |
5071 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 5072 | |
a0b6b246 JX |
5073 | #: builtin/am.c:2301 |
5074 | msgid "synonyms for --continue" | |
5075 | msgstr "和 --continue 同义" | |
8ada9598 | 5076 | |
a0b6b246 JX |
5077 | #: builtin/am.c:2304 |
5078 | msgid "skip the current patch" | |
5079 | msgstr "跳过当前补丁" | |
23ff3338 | 5080 | |
a0b6b246 JX |
5081 | #: builtin/am.c:2307 |
5082 | msgid "restore the original branch and abort the patching operation." | |
5083 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 5084 | |
a0b6b246 JX |
5085 | #: builtin/am.c:2311 |
5086 | msgid "lie about committer date" | |
5087 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 5088 | |
a0b6b246 JX |
5089 | #: builtin/am.c:2313 |
5090 | msgid "use current timestamp for author date" | |
5091 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 5092 | |
87cb7997 JX |
5093 | #: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232 |
5094 | #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 | |
a0b6b246 JX |
5095 | msgid "key-id" |
5096 | msgstr "key-id" | |
8ada9598 | 5097 | |
a0b6b246 JX |
5098 | #: builtin/am.c:2316 |
5099 | msgid "GPG-sign commits" | |
5100 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 5101 | |
a0b6b246 JX |
5102 | #: builtin/am.c:2319 |
5103 | msgid "(internal use for git-rebase)" | |
5104 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 5105 | |
a0b6b246 JX |
5106 | #: builtin/am.c:2334 |
5107 | msgid "" | |
5108 | "The -b/--binary option has been a no-op for long time, and\n" | |
5109 | "it will be removed. Please do not use it anymore." | |
5110 | msgstr "" | |
5111 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
5112 | "请不要再使用它了。" | |
8ada9598 | 5113 | |
a0b6b246 JX |
5114 | #: builtin/am.c:2341 |
5115 | msgid "failed to read the index" | |
5116 | msgstr "无法读取索引" | |
8ada9598 | 5117 | |
a0b6b246 JX |
5118 | #: builtin/am.c:2356 |
5119 | #, c-format | |
5120 | msgid "previous rebase directory %s still exists but mbox given." | |
5121 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 5122 | |
a0b6b246 JX |
5123 | #: builtin/am.c:2380 |
5124 | #, c-format | |
5125 | msgid "" | |
5126 | "Stray %s directory found.\n" | |
5127 | "Use \"git am --abort\" to remove it." | |
5128 | msgstr "" | |
5129 | "发现了错误的 %s 目录。\n" | |
5130 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 5131 | |
a0b6b246 JX |
5132 | #: builtin/am.c:2386 |
5133 | msgid "Resolve operation not in progress, we are not resuming." | |
5134 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 5135 | |
a0b6b246 JX |
5136 | #: builtin/apply.c:8 |
5137 | msgid "git apply [<options>] [<patch>...]" | |
5138 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 5139 | |
c04f5ac3 JX |
5140 | #: builtin/archive.c:17 |
5141 | #, c-format | |
5142 | msgid "could not create archive file '%s'" | |
90e6ef53 | 5143 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
5144 | |
5145 | #: builtin/archive.c:20 | |
5146 | msgid "could not redirect output" | |
195febda | 5147 | msgstr "不能重定向输出" |
c04f5ac3 JX |
5148 | |
5149 | #: builtin/archive.c:37 | |
5150 | msgid "git archive: Remote with no URL" | |
4375c10e | 5151 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
5152 | |
5153 | #: builtin/archive.c:58 | |
5154 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 5155 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 5156 | |
1003b3a5 | 5157 | #: builtin/archive.c:61 |
c04f5ac3 JX |
5158 | #, c-format |
5159 | msgid "git archive: NACK %s" | |
90e6ef53 | 5160 | msgstr "git archive:NACK %s" |
c04f5ac3 | 5161 | |
1003b3a5 | 5162 | #: builtin/archive.c:63 |
c04f5ac3 JX |
5163 | #, c-format |
5164 | msgid "remote error: %s" | |
5165 | msgstr "远程错误:%s" | |
5166 | ||
1003b3a5 | 5167 | #: builtin/archive.c:64 |
c04f5ac3 | 5168 | msgid "git archive: protocol error" |
90e6ef53 | 5169 | msgstr "git archive:协议错误" |
c04f5ac3 | 5170 | |
1003b3a5 | 5171 | #: builtin/archive.c:68 |
c04f5ac3 | 5172 | msgid "git archive: expected a flush" |
a0b6b246 | 5173 | msgstr "git archive:应有一个 flush 刷新" |
c04f5ac3 | 5174 | |
ef317cd5 JX |
5175 | #: builtin/bisect--helper.c:7 |
5176 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 5177 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
5178 | |
5179 | #: builtin/bisect--helper.c:17 | |
5180 | msgid "perform 'git bisect next'" | |
07432cef | 5181 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
5182 | |
5183 | #: builtin/bisect--helper.c:19 | |
5184 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 5185 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 5186 | |
276ceeaa | 5187 | #: builtin/blame.c:33 |
7aea43ff JX |
5188 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
5189 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 5190 | |
276ceeaa | 5191 | #: builtin/blame.c:38 |
814ff314 JX |
5192 | msgid "<rev-opts> are documented in git-rev-list(1)" |
5193 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 5194 | |
87cb7997 | 5195 | #: builtin/blame.c:1777 |
276ceeaa JX |
5196 | msgid "Blaming lines" |
5197 | msgstr "追踪代码行" | |
5198 | ||
87cb7997 | 5199 | #: builtin/blame.c:2573 |
ef317cd5 | 5200 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 5201 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 5202 | |
87cb7997 | 5203 | #: builtin/blame.c:2574 |
ef317cd5 | 5204 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 5205 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 5206 | |
87cb7997 | 5207 | #: builtin/blame.c:2575 |
ef317cd5 | 5208 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 5209 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 5210 | |
87cb7997 | 5211 | #: builtin/blame.c:2576 |
ef317cd5 | 5212 | msgid "Show work cost statistics" |
07432cef | 5213 | msgstr "显示命令消耗统计" |
ef317cd5 | 5214 | |
87cb7997 | 5215 | #: builtin/blame.c:2577 |
276ceeaa JX |
5216 | msgid "Force progress reporting" |
5217 | msgstr "强制进度显示" | |
5218 | ||
87cb7997 | 5219 | #: builtin/blame.c:2578 |
ef317cd5 | 5220 | msgid "Show output score for blame entries" |
07432cef | 5221 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 5222 | |
87cb7997 | 5223 | #: builtin/blame.c:2579 |
ef317cd5 | 5224 | msgid "Show original filename (Default: auto)" |
07432cef | 5225 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 5226 | |
87cb7997 | 5227 | #: builtin/blame.c:2580 |
ef317cd5 | 5228 | msgid "Show original linenumber (Default: off)" |
07432cef | 5229 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 5230 | |
87cb7997 | 5231 | #: builtin/blame.c:2581 |
ef317cd5 | 5232 | msgid "Show in a format designed for machine consumption" |
07432cef | 5233 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 5234 | |
87cb7997 | 5235 | #: builtin/blame.c:2582 |
ef317cd5 | 5236 | msgid "Show porcelain format with per-line commit information" |
07432cef | 5237 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 5238 | |
87cb7997 | 5239 | #: builtin/blame.c:2583 |
ef317cd5 | 5240 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 5241 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 5242 | |
87cb7997 | 5243 | #: builtin/blame.c:2584 |
ef317cd5 | 5244 | msgid "Show raw timestamp (Default: off)" |
07432cef | 5245 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 5246 | |
87cb7997 | 5247 | #: builtin/blame.c:2585 |
ef317cd5 | 5248 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 5249 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 5250 | |
87cb7997 | 5251 | #: builtin/blame.c:2586 |
ef317cd5 | 5252 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 5253 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 5254 | |
87cb7997 | 5255 | #: builtin/blame.c:2587 |
ef317cd5 | 5256 | msgid "Show author email instead of name (Default: off)" |
07432cef | 5257 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 5258 | |
87cb7997 | 5259 | #: builtin/blame.c:2588 |
ef317cd5 | 5260 | msgid "Ignore whitespace differences" |
07432cef | 5261 | msgstr "忽略空白差异" |
ef317cd5 | 5262 | |
87cb7997 | 5263 | #: builtin/blame.c:2595 |
1a79b2f1 JX |
5264 | msgid "Use an experimental heuristic to improve diffs" |
5265 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 5266 | |
87cb7997 | 5267 | #: builtin/blame.c:2597 |
ef317cd5 | 5268 | msgid "Spend extra cycles to find better match" |
07432cef | 5269 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 5270 | |
87cb7997 | 5271 | #: builtin/blame.c:2598 |
ef317cd5 | 5272 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 5273 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 5274 | |
87cb7997 | 5275 | #: builtin/blame.c:2599 |
ef317cd5 | 5276 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 5277 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 5278 | |
87cb7997 | 5279 | #: builtin/blame.c:2600 builtin/blame.c:2601 |
ef317cd5 | 5280 | msgid "score" |
07432cef | 5281 | msgstr "得分" |
ef317cd5 | 5282 | |
87cb7997 | 5283 | #: builtin/blame.c:2600 |
ef317cd5 | 5284 | msgid "Find line copies within and across files" |
07432cef | 5285 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 5286 | |
87cb7997 | 5287 | #: builtin/blame.c:2601 |
ef317cd5 | 5288 | msgid "Find line movements within and across files" |
07432cef | 5289 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 5290 | |
87cb7997 | 5291 | #: builtin/blame.c:2602 |
ef317cd5 | 5292 | msgid "n,m" |
07432cef | 5293 | msgstr "n,m" |
ef317cd5 | 5294 | |
87cb7997 | 5295 | #: builtin/blame.c:2602 |
ef317cd5 | 5296 | msgid "Process only line range n,m, counting from 1" |
07432cef | 5297 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 5298 | |
87cb7997 | 5299 | #: builtin/blame.c:2649 |
a0b6b246 JX |
5300 | msgid "--progress can't be used with --incremental or porcelain formats" |
5301 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
5302 | ||
6c94aba5 JX |
5303 | #. TRANSLATORS: This string is used to tell us the maximum |
5304 | #. display width for a relative timestamp in "git blame" | |
5305 | #. output. For C locale, "4 years, 11 months ago", which | |
5306 | #. takes 22 places, is the longest among various forms of | |
5307 | #. relative timestamps, but your language may need more or | |
5308 | #. fewer display columns. | |
87cb7997 | 5309 | #: builtin/blame.c:2697 |
6c94aba5 JX |
5310 | msgid "4 years, 11 months ago" |
5311 | msgstr "4 年 11 个月前" | |
5312 | ||
87cb7997 | 5313 | #: builtin/blame.c:2777 |
a0b6b246 JX |
5314 | msgid "--contents and --reverse do not blend well." |
5315 | msgstr "--contents 和 --reverse 不能混用。" | |
5316 | ||
87cb7997 | 5317 | #: builtin/blame.c:2797 |
a0b6b246 JX |
5318 | msgid "cannot use --contents with final commit object name" |
5319 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
5320 | ||
87cb7997 | 5321 | #: builtin/blame.c:2802 |
a0b6b246 JX |
5322 | msgid "--reverse and --first-parent together require specified latest commit" |
5323 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
5324 | ||
87cb7997 | 5325 | #: builtin/blame.c:2829 |
a0b6b246 JX |
5326 | msgid "" |
5327 | "--reverse --first-parent together require range along first-parent chain" | |
5328 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
5329 | ||
87cb7997 | 5330 | #: builtin/blame.c:2840 |
a0b6b246 JX |
5331 | #, c-format |
5332 | msgid "no such path %s in %s" | |
5333 | msgstr "在 %2$s 中无此路径 %1$s" | |
5334 | ||
87cb7997 | 5335 | #: builtin/blame.c:2851 |
a0b6b246 JX |
5336 | #, c-format |
5337 | msgid "cannot read blob %s for path %s" | |
29004bbb | 5338 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" |
a0b6b246 | 5339 | |
87cb7997 | 5340 | #: builtin/blame.c:2870 |
a0b6b246 JX |
5341 | #, c-format |
5342 | msgid "file %s has only %lu line" | |
5343 | msgid_plural "file %s has only %lu lines" | |
5344 | msgstr[0] "文件 %s 只有 %lu 行" | |
5345 | msgstr[1] "文件 %s 只有 %lu 行" | |
5346 | ||
5b04ee3b | 5347 | #: builtin/branch.c:26 |
814ff314 JX |
5348 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
5349 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 5350 | |
5b04ee3b | 5351 | #: builtin/branch.c:27 |
814ff314 JX |
5352 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
5353 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 5354 | |
5b04ee3b | 5355 | #: builtin/branch.c:28 |
814ff314 JX |
5356 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
5357 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 5358 | |
5b04ee3b | 5359 | #: builtin/branch.c:29 |
814ff314 JX |
5360 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
5361 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 5362 | |
5b04ee3b | 5363 | #: builtin/branch.c:30 |
94550ed3 JX |
5364 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
5365 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
5366 | ||
87cb7997 JX |
5367 | #: builtin/branch.c:31 |
5368 | msgid "git branch [<options>] [-r | -a] [--format]" | |
5369 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
5370 | ||
90e6ef53 | 5371 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
87cb7997 | 5372 | #: builtin/branch.c:144 |
c04f5ac3 JX |
5373 | #, c-format |
5374 | msgid "" | |
5375 | "deleting branch '%s' that has been merged to\n" | |
5376 | " '%s', but not yet merged to HEAD." | |
5377 | msgstr "" | |
70fc47bf | 5378 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
5379 | " '%s',但未合并到 HEAD。" |
5380 | ||
90e6ef53 | 5381 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
87cb7997 | 5382 | #: builtin/branch.c:148 |
c04f5ac3 JX |
5383 | #, c-format |
5384 | msgid "" | |
5385 | "not deleting branch '%s' that is not yet merged to\n" | |
5386 | " '%s', even though it is merged to HEAD." | |
5387 | msgstr "" | |
70fc47bf T |
5388 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
5389 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 5390 | |
87cb7997 | 5391 | #: builtin/branch.c:162 |
07432cef WS |
5392 | #, c-format |
5393 | msgid "Couldn't look up commit object for '%s'" | |
5394 | msgstr "无法查询 '%s' 指向的提交对象" | |
5395 | ||
87cb7997 | 5396 | #: builtin/branch.c:166 |
07432cef WS |
5397 | #, c-format |
5398 | msgid "" | |
5399 | "The branch '%s' is not fully merged.\n" | |
5400 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
5401 | msgstr "" | |
5402 | "分支 '%s' 没有完全合并。\n" | |
5403 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
5404 | ||
87cb7997 | 5405 | #: builtin/branch.c:179 |
07432cef WS |
5406 | msgid "Update of config-file failed" |
5407 | msgstr "无法更新 config 文件" | |
5408 | ||
87cb7997 | 5409 | #: builtin/branch.c:210 |
c04f5ac3 | 5410 | msgid "cannot use -a with -d" |
649900bc | 5411 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 5412 | |
87cb7997 | 5413 | #: builtin/branch.c:216 |
c04f5ac3 JX |
5414 | msgid "Couldn't look up commit object for HEAD" |
5415 | msgstr "无法查询 HEAD 指向的提交对象" | |
5416 | ||
87cb7997 | 5417 | #: builtin/branch.c:230 |
c04f5ac3 | 5418 | #, c-format |
5b04ee3b JX |
5419 | msgid "Cannot delete branch '%s' checked out at '%s'" |
5420 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 5421 | |
87cb7997 | 5422 | #: builtin/branch.c:245 |
5ae481e0 | 5423 | #, c-format |
7aea43ff JX |
5424 | msgid "remote-tracking branch '%s' not found." |
5425 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 5426 | |
87cb7997 | 5427 | #: builtin/branch.c:246 |
81809b99 | 5428 | #, c-format |
8ada9598 | 5429 | msgid "branch '%s' not found." |
81809b99 | 5430 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 5431 | |
87cb7997 | 5432 | #: builtin/branch.c:261 |
81809b99 | 5433 | #, c-format |
7aea43ff JX |
5434 | msgid "Error deleting remote-tracking branch '%s'" |
5435 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 5436 | |
87cb7997 | 5437 | #: builtin/branch.c:262 |
81809b99 | 5438 | #, c-format |
8ada9598 | 5439 | msgid "Error deleting branch '%s'" |
7aea43ff | 5440 | msgstr "无法删除分支 '%s'" |
8ada9598 | 5441 | |
87cb7997 | 5442 | #: builtin/branch.c:269 |
81809b99 | 5443 | #, c-format |
7aea43ff JX |
5444 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
5445 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 5446 | |
87cb7997 | 5447 | #: builtin/branch.c:270 |
81809b99 | 5448 | #, c-format |
8ada9598 | 5449 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 5450 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 5451 | |
87cb7997 | 5452 | #: builtin/branch.c:441 |
5b04ee3b JX |
5453 | #, c-format |
5454 | msgid "Branch %s is being rebased at %s" | |
5455 | msgstr "分支 %s 正被变基到 %s" | |
5456 | ||
87cb7997 | 5457 | #: builtin/branch.c:445 |
5b04ee3b JX |
5458 | #, c-format |
5459 | msgid "Branch %s is being bisected at %s" | |
5460 | msgstr "分支 %s 正被二分查找于 %s" | |
5461 | ||
87cb7997 | 5462 | #: builtin/branch.c:460 |
c04f5ac3 | 5463 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 5464 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 5465 | |
87cb7997 | 5466 | #: builtin/branch.c:470 |
c04f5ac3 JX |
5467 | #, c-format |
5468 | msgid "Invalid branch name: '%s'" | |
5469 | msgstr "无效的分支名:'%s'" | |
5470 | ||
87cb7997 | 5471 | #: builtin/branch.c:487 |
c04f5ac3 JX |
5472 | msgid "Branch rename failed" |
5473 | msgstr "分支重命名失败" | |
5474 | ||
87cb7997 | 5475 | #: builtin/branch.c:490 |
c04f5ac3 JX |
5476 | #, c-format |
5477 | msgid "Renamed a misnamed branch '%s' away" | |
5478 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
5479 | ||
87cb7997 | 5480 | #: builtin/branch.c:493 |
c04f5ac3 JX |
5481 | #, c-format |
5482 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
5483 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
5484 | ||
87cb7997 | 5485 | #: builtin/branch.c:502 |
c04f5ac3 JX |
5486 | msgid "Branch is renamed, but update of config-file failed" |
5487 | msgstr "分支被重命名,但更新 config 文件失败" | |
5488 | ||
87cb7997 | 5489 | #: builtin/branch.c:518 |
5c57d762 JX |
5490 | #, c-format |
5491 | msgid "" | |
5492 | "Please edit the description for the branch\n" | |
5493 | " %s\n" | |
5494 | "Lines starting with '%c' will be stripped.\n" | |
5495 | msgstr "" | |
5496 | "请编辑分支的描述\n" | |
5497 | " %s\n" | |
5498 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 5499 | |
87cb7997 | 5500 | #: builtin/branch.c:551 |
ef317cd5 | 5501 | msgid "Generic options" |
07432cef | 5502 | msgstr "通用选项" |
c04f5ac3 | 5503 | |
87cb7997 | 5504 | #: builtin/branch.c:553 |
ef317cd5 | 5505 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 5506 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 5507 | |
87cb7997 | 5508 | #: builtin/branch.c:554 |
ef317cd5 | 5509 | msgid "suppress informational messages" |
07432cef | 5510 | msgstr "不显示信息" |
8ada9598 | 5511 | |
87cb7997 | 5512 | #: builtin/branch.c:555 |
ef317cd5 | 5513 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 5514 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 5515 | |
87cb7997 | 5516 | #: builtin/branch.c:557 |
ef317cd5 | 5517 | msgid "change upstream info" |
07432cef | 5518 | msgstr "改变上游信息" |
c04f5ac3 | 5519 | |
87cb7997 | 5520 | #: builtin/branch.c:559 |
5b04ee3b JX |
5521 | msgid "upstream" |
5522 | msgstr "上游" | |
5523 | ||
87cb7997 | 5524 | #: builtin/branch.c:559 |
5b04ee3b JX |
5525 | msgid "change the upstream info" |
5526 | msgstr "改变上游信息" | |
5527 | ||
87cb7997 | 5528 | #: builtin/branch.c:560 |
a0b6b246 JX |
5529 | msgid "Unset the upstream info" |
5530 | msgstr "取消上游信息的设置" | |
5531 | ||
87cb7997 | 5532 | #: builtin/branch.c:561 |
ef317cd5 | 5533 | msgid "use colored output" |
07432cef | 5534 | msgstr "使用彩色输出" |
c04f5ac3 | 5535 | |
87cb7997 | 5536 | #: builtin/branch.c:562 |
ef317cd5 | 5537 | msgid "act on remote-tracking branches" |
07432cef | 5538 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 5539 | |
87cb7997 | 5540 | #: builtin/branch.c:564 builtin/branch.c:566 |
ef317cd5 | 5541 | msgid "print only branches that contain the commit" |
07432cef | 5542 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 5543 | |
87cb7997 JX |
5544 | #: builtin/branch.c:565 builtin/branch.c:567 |
5545 | msgid "print only branches that don't contain the commit" | |
5546 | msgstr "只打印不包含该提交的分支" | |
5547 | ||
5548 | #: builtin/branch.c:570 | |
ef317cd5 | 5549 | msgid "Specific git-branch actions:" |
07432cef | 5550 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 5551 | |
87cb7997 | 5552 | #: builtin/branch.c:571 |
ef317cd5 | 5553 | msgid "list both remote-tracking and local branches" |
07432cef | 5554 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 5555 | |
87cb7997 | 5556 | #: builtin/branch.c:573 |
ef317cd5 | 5557 | msgid "delete fully merged branch" |
07432cef | 5558 | msgstr "删除完全合并的分支" |
c04f5ac3 | 5559 | |
87cb7997 | 5560 | #: builtin/branch.c:574 |
ef317cd5 | 5561 | msgid "delete branch (even if not merged)" |
07432cef | 5562 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 5563 | |
87cb7997 | 5564 | #: builtin/branch.c:575 |
ef317cd5 | 5565 | msgid "move/rename a branch and its reflog" |
07432cef | 5566 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 5567 | |
87cb7997 | 5568 | #: builtin/branch.c:576 |
ef317cd5 | 5569 | msgid "move/rename a branch, even if target exists" |
07432cef | 5570 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 5571 | |
87cb7997 | 5572 | #: builtin/branch.c:577 |
ef317cd5 | 5573 | msgid "list branch names" |
07432cef | 5574 | msgstr "列出分支名" |
c04f5ac3 | 5575 | |
87cb7997 | 5576 | #: builtin/branch.c:578 |
ef317cd5 | 5577 | msgid "create the branch's reflog" |
07432cef | 5578 | msgstr "创建分支的引用日志" |
ef317cd5 | 5579 | |
87cb7997 | 5580 | #: builtin/branch.c:580 |
ef317cd5 | 5581 | msgid "edit the description for the branch" |
07432cef | 5582 | msgstr "标记分支的描述" |
ef317cd5 | 5583 | |
87cb7997 | 5584 | #: builtin/branch.c:581 |
04cb2f28 JX |
5585 | msgid "force creation, move/rename, deletion" |
5586 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 5587 | |
87cb7997 | 5588 | #: builtin/branch.c:582 |
94550ed3 JX |
5589 | msgid "print only branches that are merged" |
5590 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 5591 | |
87cb7997 | 5592 | #: builtin/branch.c:583 |
94550ed3 JX |
5593 | msgid "print only branches that are not merged" |
5594 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 5595 | |
87cb7997 | 5596 | #: builtin/branch.c:584 |
ef317cd5 | 5597 | msgid "list branches in columns" |
07432cef | 5598 | msgstr "以列的方式显示分支" |
ef317cd5 | 5599 | |
87cb7997 | 5600 | #: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 |
94550ed3 JX |
5601 | msgid "key" |
5602 | msgstr "key" | |
5603 | ||
87cb7997 | 5604 | #: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 |
94550ed3 JX |
5605 | msgid "field name to sort on" |
5606 | msgstr "排序的字段名" | |
5607 | ||
87cb7997 | 5608 | #: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 |
a0b6b246 | 5609 | #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 |
87cb7997 | 5610 | #: builtin/tag.c:429 |
94550ed3 JX |
5611 | msgid "object" |
5612 | msgstr "对象" | |
5613 | ||
87cb7997 | 5614 | #: builtin/branch.c:589 |
94550ed3 JX |
5615 | msgid "print only branches of the object" |
5616 | msgstr "只打印指向该对象的分支" | |
5617 | ||
87cb7997 | 5618 | #: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 |
1a79b2f1 JX |
5619 | msgid "sorting and filtering are case insensitive" |
5620 | msgstr "排序和过滤属于大小写不敏感" | |
5621 | ||
87cb7997 JX |
5622 | #: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 |
5623 | #: builtin/verify-tag.c:38 | |
5624 | msgid "format to use for the output" | |
5625 | msgstr "输出格式" | |
5626 | ||
5627 | #: builtin/branch.c:611 | |
c04f5ac3 JX |
5628 | msgid "Failed to resolve HEAD as a valid ref." |
5629 | msgstr "无法将 HEAD 解析为有效引用。" | |
5630 | ||
87cb7997 | 5631 | #: builtin/branch.c:615 builtin/clone.c:724 |
c04f5ac3 | 5632 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 5633 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 5634 | |
87cb7997 | 5635 | #: builtin/branch.c:638 |
8ada9598 | 5636 | msgid "--column and --verbose are incompatible" |
81809b99 | 5637 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 5638 | |
87cb7997 | 5639 | #: builtin/branch.c:649 builtin/branch.c:701 |
a77c07d9 JX |
5640 | msgid "branch name required" |
5641 | msgstr "必须提供分支名" | |
5642 | ||
87cb7997 | 5643 | #: builtin/branch.c:677 |
a77c07d9 JX |
5644 | msgid "Cannot give description to detached HEAD" |
5645 | msgstr "不能向分离头指针提供描述" | |
5646 | ||
87cb7997 | 5647 | #: builtin/branch.c:682 |
a77c07d9 JX |
5648 | msgid "cannot edit description of more than one branch" |
5649 | msgstr "不能为一个以上的分支编辑描述" | |
5650 | ||
87cb7997 | 5651 | #: builtin/branch.c:689 |
a77c07d9 JX |
5652 | #, c-format |
5653 | msgid "No commit on branch '%s' yet." | |
5654 | msgstr "分支 '%s' 尚无提交。" | |
5655 | ||
87cb7997 | 5656 | #: builtin/branch.c:692 |
a77c07d9 JX |
5657 | #, c-format |
5658 | msgid "No branch named '%s'." | |
5659 | msgstr "没有分支 '%s'。" | |
5660 | ||
87cb7997 | 5661 | #: builtin/branch.c:707 |
a77c07d9 JX |
5662 | msgid "too many branches for a rename operation" |
5663 | msgstr "为重命名操作提供了太多的分支名" | |
5664 | ||
87cb7997 | 5665 | #: builtin/branch.c:712 |
1003b3a5 JX |
5666 | msgid "too many branches to set new upstream" |
5667 | msgstr "为设置新上游提供了太多的分支名" | |
5668 | ||
87cb7997 | 5669 | #: builtin/branch.c:716 |
1003b3a5 JX |
5670 | #, c-format |
5671 | msgid "" | |
5672 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
5673 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
5674 | ||
87cb7997 | 5675 | #: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 |
1003b3a5 JX |
5676 | #, c-format |
5677 | msgid "no such branch '%s'" | |
5678 | msgstr "没有此分支 '%s'" | |
5679 | ||
87cb7997 | 5680 | #: builtin/branch.c:723 |
07432cef | 5681 | #, c-format |
ef317cd5 | 5682 | msgid "branch '%s' does not exist" |
07432cef | 5683 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 5684 | |
87cb7997 | 5685 | #: builtin/branch.c:735 |
1003b3a5 JX |
5686 | msgid "too many branches to unset upstream" |
5687 | msgstr "为取消上游设置操作提供了太多的分支名" | |
5688 | ||
87cb7997 | 5689 | #: builtin/branch.c:739 |
1003b3a5 JX |
5690 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
5691 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
5692 | ||
87cb7997 | 5693 | #: builtin/branch.c:745 |
ef317cd5 JX |
5694 | #, c-format |
5695 | msgid "Branch '%s' has no upstream information" | |
07432cef | 5696 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 5697 | |
87cb7997 | 5698 | #: builtin/branch.c:759 |
1003b3a5 JX |
5699 | msgid "it does not make sense to create 'HEAD' manually" |
5700 | msgstr "手工创建 'HEAD' 没有意义" | |
5701 | ||
87cb7997 | 5702 | #: builtin/branch.c:765 |
c04f5ac3 JX |
5703 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
5704 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
5705 | ||
87cb7997 | 5706 | #: builtin/branch.c:768 |
ef317cd5 JX |
5707 | #, c-format |
5708 | msgid "" | |
5709 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
5710 | "track or --set-upstream-to\n" | |
5711 | msgstr "" | |
07432cef | 5712 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 5713 | |
87cb7997 | 5714 | #: builtin/branch.c:785 |
ef317cd5 JX |
5715 | #, c-format |
5716 | msgid "" | |
5717 | "\n" | |
5718 | "If you wanted to make '%s' track '%s', do this:\n" | |
5719 | "\n" | |
5720 | msgstr "" | |
07432cef WS |
5721 | "\n" |
5722 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
5723 | "\n" | |
ef317cd5 | 5724 | |
87cb7997 | 5725 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
5726 | #, c-format |
5727 | msgid "%s is okay\n" | |
5728 | msgstr "%s 可以\n" | |
5729 | ||
87cb7997 | 5730 | #: builtin/bundle.c:58 |
c04f5ac3 | 5731 | msgid "Need a repository to create a bundle." |
160fb2b2 | 5732 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 5733 | |
87cb7997 | 5734 | #: builtin/bundle.c:62 |
c04f5ac3 | 5735 | msgid "Need a repository to unbundle." |
160fb2b2 | 5736 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 5737 | |
a0b6b246 | 5738 | #: builtin/cat-file.c:513 |
7aea43ff | 5739 | msgid "" |
a0b6b246 JX |
5740 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
5741 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
5742 | msgstr "" |
5743 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
5744 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 5745 | |
a0b6b246 JX |
5746 | #: builtin/cat-file.c:514 |
5747 | msgid "" | |
5748 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
5749 | "filters]" | |
275588f9 JX |
5750 | msgstr "" |
5751 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
5752 | "filters]" | |
ef317cd5 | 5753 | |
a0b6b246 | 5754 | #: builtin/cat-file.c:551 |
ef317cd5 | 5755 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 5756 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 5757 | |
a0b6b246 | 5758 | #: builtin/cat-file.c:552 |
ef317cd5 | 5759 | msgid "show object type" |
07432cef | 5760 | msgstr "显示对象类型" |
ef317cd5 | 5761 | |
a0b6b246 | 5762 | #: builtin/cat-file.c:553 |
ef317cd5 | 5763 | msgid "show object size" |
07432cef | 5764 | msgstr "显示对象大小" |
ef317cd5 | 5765 | |
a0b6b246 | 5766 | #: builtin/cat-file.c:555 |
ef317cd5 | 5767 | msgid "exit with zero when there's no error" |
07432cef | 5768 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 5769 | |
a0b6b246 | 5770 | #: builtin/cat-file.c:556 |
ef317cd5 | 5771 | msgid "pretty-print object's content" |
07432cef | 5772 | msgstr "美观地打印对象的内容" |
ef317cd5 | 5773 | |
a0b6b246 | 5774 | #: builtin/cat-file.c:558 |
ef317cd5 | 5775 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
5776 | msgstr "对于数据对象,对其内容做文本转换" |
5777 | ||
5778 | #: builtin/cat-file.c:560 | |
5779 | msgid "for blob objects, run filters on object's content" | |
5780 | msgstr "对于数据对象,对其内容做过滤" | |
5781 | ||
87cb7997 | 5782 | #: builtin/cat-file.c:561 git-submodule.sh:943 |
a0b6b246 JX |
5783 | msgid "blob" |
5784 | msgstr "数据对象" | |
5785 | ||
5786 | #: builtin/cat-file.c:562 | |
5787 | msgid "use a specific path for --textconv/--filters" | |
5788 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 5789 | |
a0b6b246 | 5790 | #: builtin/cat-file.c:564 |
7aea43ff JX |
5791 | msgid "allow -s and -t to work with broken/corrupt objects" |
5792 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
5793 | ||
a0b6b246 | 5794 | #: builtin/cat-file.c:565 |
1b7f4a34 JX |
5795 | msgid "buffer --batch output" |
5796 | msgstr "缓冲 --batch 的输出" | |
5797 | ||
a0b6b246 | 5798 | #: builtin/cat-file.c:567 |
ef317cd5 | 5799 | msgid "show info and content of objects fed from the standard input" |
07432cef | 5800 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 5801 | |
a0b6b246 | 5802 | #: builtin/cat-file.c:570 |
ef317cd5 | 5803 | msgid "show info about objects fed from the standard input" |
07432cef | 5804 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 5805 | |
a0b6b246 | 5806 | #: builtin/cat-file.c:573 |
7aea43ff JX |
5807 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
5808 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
5809 | ||
a0b6b246 | 5810 | #: builtin/cat-file.c:575 |
1b7f4a34 JX |
5811 | msgid "show all objects with --batch or --batch-check" |
5812 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
5813 | ||
ef317cd5 | 5814 | #: builtin/check-attr.c:11 |
814ff314 JX |
5815 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
5816 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
5817 | |
5818 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
5819 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
5820 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
5821 | |
5822 | #: builtin/check-attr.c:19 | |
5823 | msgid "report all attributes set on file" | |
07432cef | 5824 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
5825 | |
5826 | #: builtin/check-attr.c:20 | |
5827 | msgid "use .gitattributes only from the index" | |
07432cef | 5828 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 5829 | |
a0b6b246 | 5830 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 |
ef317cd5 | 5831 | msgid "read file names from stdin" |
07432cef | 5832 | msgstr "从标准输入读出文件名" |
ef317cd5 | 5833 | |
a77c07d9 | 5834 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
5835 | msgid "terminate input and output records by a NUL character" |
5836 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 5837 | |
87cb7997 | 5838 | #: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352 |
a77c07d9 JX |
5839 | msgid "suppress progress reporting" |
5840 | msgstr "不显示进度报告" | |
5841 | ||
2e8451e8 JX |
5842 | #: builtin/check-ignore.c:26 |
5843 | msgid "show non-matching input paths" | |
5844 | msgstr "显示未匹配的输入路径" | |
5845 | ||
90314792 JX |
5846 | #: builtin/check-ignore.c:28 |
5847 | msgid "ignore index when checking" | |
5848 | msgstr "检查时忽略索引" | |
5849 | ||
5850 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 5851 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 5852 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 5853 | |
90314792 | 5854 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
5855 | msgid "-z only makes sense with --stdin" |
5856 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
5857 | ||
90314792 | 5858 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
5859 | msgid "no path specified" |
5860 | msgstr "未指定路径" | |
5861 | ||
90314792 | 5862 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
5863 | msgid "--quiet is only valid with a single pathname" |
5864 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
5865 | ||
90314792 | 5866 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
5867 | msgid "cannot have both --quiet and --verbose" |
5868 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
5869 | ||
90314792 | 5870 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
5871 | msgid "--non-matching is only valid with --verbose" |
5872 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
5873 | ||
5874 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
5875 | msgid "git check-mailmap [<options>] <contact>..." |
5876 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
5877 | |
5878 | #: builtin/check-mailmap.c:13 | |
5879 | msgid "also read contacts from stdin" | |
5880 | msgstr "还从标准输入读取联系地址" | |
5881 | ||
5882 | #: builtin/check-mailmap.c:24 | |
5883 | #, c-format | |
5884 | msgid "unable to parse contact: %s" | |
5885 | msgstr "不能解析联系地址:%s" | |
5886 | ||
5887 | #: builtin/check-mailmap.c:47 | |
5888 | msgid "no contacts specified" | |
5889 | msgstr "未指定联系地址" | |
5890 | ||
276ceeaa | 5891 | #: builtin/checkout-index.c:127 |
814ff314 JX |
5892 | msgid "git checkout-index [<options>] [--] [<file>...]" |
5893 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 5894 | |
276ceeaa JX |
5895 | #: builtin/checkout-index.c:144 |
5896 | msgid "stage should be between 1 and 3 or all" | |
5897 | msgstr "索引值应该取值 1 到 3 或者 all" | |
5898 | ||
5899 | #: builtin/checkout-index.c:160 | |
ef317cd5 | 5900 | msgid "check out all files in the index" |
07432cef | 5901 | msgstr "检出索引区的所有文件" |
ef317cd5 | 5902 | |
276ceeaa | 5903 | #: builtin/checkout-index.c:161 |
ef317cd5 | 5904 | msgid "force overwrite of existing files" |
07432cef | 5905 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 5906 | |
276ceeaa | 5907 | #: builtin/checkout-index.c:163 |
ef317cd5 | 5908 | msgid "no warning for existing files and files not in index" |
07432cef | 5909 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 5910 | |
276ceeaa | 5911 | #: builtin/checkout-index.c:165 |
ef317cd5 | 5912 | msgid "don't checkout new files" |
07432cef | 5913 | msgstr "不检出新文件" |
ef317cd5 | 5914 | |
276ceeaa | 5915 | #: builtin/checkout-index.c:167 |
ef317cd5 | 5916 | msgid "update stat information in the index file" |
07432cef | 5917 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 5918 | |
276ceeaa | 5919 | #: builtin/checkout-index.c:171 |
ef317cd5 | 5920 | msgid "read list of paths from the standard input" |
07432cef | 5921 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 5922 | |
276ceeaa | 5923 | #: builtin/checkout-index.c:173 |
ef317cd5 | 5924 | msgid "write the content to temporary files" |
07432cef | 5925 | msgstr "将内容写入临时文件" |
ef317cd5 | 5926 | |
276ceeaa | 5927 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
87cb7997 JX |
5928 | #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 |
5929 | #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 | |
5930 | #: builtin/worktree.c:472 | |
ef317cd5 | 5931 | msgid "string" |
07432cef | 5932 | msgstr "字符串" |
ef317cd5 | 5933 | |
276ceeaa | 5934 | #: builtin/checkout-index.c:175 |
ef317cd5 | 5935 | msgid "when creating files, prepend <string>" |
4375c10e | 5936 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 5937 | |
276ceeaa | 5938 | #: builtin/checkout-index.c:177 |
ef317cd5 | 5939 | msgid "copy out the files from named stage" |
07432cef | 5940 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 5941 | |
87cb7997 | 5942 | #: builtin/checkout.c:27 |
814ff314 JX |
5943 | msgid "git checkout [<options>] <branch>" |
5944 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 5945 | |
87cb7997 | 5946 | #: builtin/checkout.c:28 |
814ff314 JX |
5947 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
5948 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 5949 | |
87cb7997 | 5950 | #: builtin/checkout.c:153 builtin/checkout.c:186 |
c04f5ac3 JX |
5951 | #, c-format |
5952 | msgid "path '%s' does not have our version" | |
5953 | msgstr "路径 '%s' 没有我们的版本" | |
5954 | ||
87cb7997 | 5955 | #: builtin/checkout.c:155 builtin/checkout.c:188 |
c04f5ac3 JX |
5956 | #, c-format |
5957 | msgid "path '%s' does not have their version" | |
5958 | msgstr "路径 '%s' 没有他们的版本" | |
5959 | ||
87cb7997 | 5960 | #: builtin/checkout.c:171 |
c04f5ac3 JX |
5961 | #, c-format |
5962 | msgid "path '%s' does not have all necessary versions" | |
5963 | msgstr "路径 '%s' 没有全部必须的版本" | |
5964 | ||
87cb7997 | 5965 | #: builtin/checkout.c:215 |
c04f5ac3 JX |
5966 | #, c-format |
5967 | msgid "path '%s' does not have necessary versions" | |
5968 | msgstr "路径 '%s' 没有必须的版本" | |
5969 | ||
87cb7997 | 5970 | #: builtin/checkout.c:232 |
c04f5ac3 JX |
5971 | #, c-format |
5972 | msgid "path '%s': cannot merge" | |
90e6ef53 | 5973 | msgstr "path '%s':无法合并" |
c04f5ac3 | 5974 | |
87cb7997 | 5975 | #: builtin/checkout.c:249 |
c04f5ac3 JX |
5976 | #, c-format |
5977 | msgid "Unable to add merge result for '%s'" | |
5978 | msgstr "无法为 '%s' 添加合并结果" | |
5979 | ||
87cb7997 JX |
5980 | #: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 |
5981 | #: builtin/checkout.c:278 | |
07432cef | 5982 | #, c-format |
ef317cd5 | 5983 | msgid "'%s' cannot be used with updating paths" |
07432cef | 5984 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 5985 | |
87cb7997 | 5986 | #: builtin/checkout.c:281 builtin/checkout.c:284 |
07432cef | 5987 | #, c-format |
ef317cd5 | 5988 | msgid "'%s' cannot be used with %s" |
07432cef | 5989 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 5990 | |
87cb7997 | 5991 | #: builtin/checkout.c:287 |
ef317cd5 JX |
5992 | #, c-format |
5993 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 5994 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 5995 | |
87cb7997 | 5996 | #: builtin/checkout.c:358 builtin/checkout.c:365 |
c04f5ac3 JX |
5997 | #, c-format |
5998 | msgid "path '%s' is unmerged" | |
5999 | msgstr "路径 '%s' 未合并" | |
6000 | ||
87cb7997 | 6001 | #: builtin/checkout.c:513 |
c04f5ac3 | 6002 | msgid "you need to resolve your current index first" |
90e6ef53 | 6003 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 6004 | |
87cb7997 | 6005 | #: builtin/checkout.c:644 |
c04f5ac3 | 6006 | #, c-format |
1b7f4a34 JX |
6007 | msgid "Can not do reflog for '%s': %s\n" |
6008 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 6009 | |
87cb7997 | 6010 | #: builtin/checkout.c:685 |
c04f5ac3 JX |
6011 | msgid "HEAD is now at" |
6012 | msgstr "HEAD 目前位于" | |
6013 | ||
87cb7997 | 6014 | #: builtin/checkout.c:689 builtin/clone.c:678 |
3495628d JX |
6015 | msgid "unable to update HEAD" |
6016 | msgstr "不能更新 HEAD" | |
6017 | ||
87cb7997 | 6018 | #: builtin/checkout.c:693 |
c04f5ac3 JX |
6019 | #, c-format |
6020 | msgid "Reset branch '%s'\n" | |
6021 | msgstr "重置分支 '%s'\n" | |
6022 | ||
87cb7997 | 6023 | #: builtin/checkout.c:696 |
c04f5ac3 JX |
6024 | #, c-format |
6025 | msgid "Already on '%s'\n" | |
6026 | msgstr "已经位于 '%s'\n" | |
6027 | ||
87cb7997 | 6028 | #: builtin/checkout.c:700 |
c04f5ac3 JX |
6029 | #, c-format |
6030 | msgid "Switched to and reset branch '%s'\n" | |
6031 | msgstr "切换并重置分支 '%s'\n" | |
6032 | ||
87cb7997 | 6033 | #: builtin/checkout.c:702 builtin/checkout.c:1090 |
c04f5ac3 JX |
6034 | #, c-format |
6035 | msgid "Switched to a new branch '%s'\n" | |
6036 | msgstr "切换到一个新分支 '%s'\n" | |
6037 | ||
87cb7997 | 6038 | #: builtin/checkout.c:704 |
c04f5ac3 JX |
6039 | #, c-format |
6040 | msgid "Switched to branch '%s'\n" | |
6041 | msgstr "切换到分支 '%s'\n" | |
6042 | ||
90e6ef53 | 6043 | # 译者:注意保持前导空格 |
87cb7997 | 6044 | #: builtin/checkout.c:755 |
c04f5ac3 JX |
6045 | #, c-format |
6046 | msgid " ... and %d more.\n" | |
90e6ef53 | 6047 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 6048 | |
87cb7997 | 6049 | #: builtin/checkout.c:761 |
c04f5ac3 JX |
6050 | #, c-format |
6051 | msgid "" | |
6052 | "Warning: you are leaving %d commit behind, not connected to\n" | |
6053 | "any of your branches:\n" | |
6054 | "\n" | |
6055 | "%s\n" | |
6056 | msgid_plural "" | |
6057 | "Warning: you are leaving %d commits behind, not connected to\n" | |
6058 | "any of your branches:\n" | |
6059 | "\n" | |
6060 | "%s\n" | |
6061 | msgstr[0] "" | |
6062 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6063 | "\n" | |
6064 | "%s\n" | |
5ae481e0 JX |
6065 | msgstr[1] "" |
6066 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6067 | "\n" | |
6068 | "%s\n" | |
c04f5ac3 | 6069 | |
87cb7997 | 6070 | #: builtin/checkout.c:780 |
c04f5ac3 JX |
6071 | #, c-format |
6072 | msgid "" | |
7aea43ff JX |
6073 | "If you want to keep it by creating a new branch, this may be a good time\n" |
6074 | "to do so with:\n" | |
6075 | "\n" | |
6076 | " git branch <new-branch-name> %s\n" | |
6077 | "\n" | |
6078 | msgid_plural "" | |
c04f5ac3 JX |
6079 | "If you want to keep them by creating a new branch, this may be a good time\n" |
6080 | "to do so with:\n" | |
6081 | "\n" | |
814ff314 | 6082 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 6083 | "\n" |
7aea43ff JX |
6084 | msgstr[0] "" |
6085 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
6086 | "如下操作:\n" | |
6087 | "\n" | |
6088 | " git branch <新分支名> %s\n" | |
6089 | "\n" | |
6090 | msgstr[1] "" | |
6091 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
6092 | "如下操作:\n" |
6093 | "\n" | |
814ff314 | 6094 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
6095 | "\n" |
6096 | ||
87cb7997 | 6097 | #: builtin/checkout.c:816 |
c04f5ac3 JX |
6098 | msgid "internal error in revision walk" |
6099 | msgstr "在版本遍历时遇到内部错误" | |
6100 | ||
87cb7997 | 6101 | #: builtin/checkout.c:820 |
c04f5ac3 JX |
6102 | msgid "Previous HEAD position was" |
6103 | msgstr "之前的 HEAD 位置是" | |
6104 | ||
87cb7997 | 6105 | #: builtin/checkout.c:847 builtin/checkout.c:1085 |
c04f5ac3 | 6106 | msgid "You are on a branch yet to be born" |
90e6ef53 | 6107 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 6108 | |
87cb7997 | 6109 | #: builtin/checkout.c:991 |
90314792 JX |
6110 | #, c-format |
6111 | msgid "only one reference expected, %d given." | |
a0b6b246 | 6112 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 6113 | |
87cb7997 | 6114 | #: builtin/checkout.c:1031 builtin/worktree.c:214 |
c04f5ac3 JX |
6115 | #, c-format |
6116 | msgid "invalid reference: %s" | |
6117 | msgstr "无效引用:%s" | |
6118 | ||
87cb7997 | 6119 | #: builtin/checkout.c:1060 |
c04f5ac3 JX |
6120 | #, c-format |
6121 | msgid "reference is not a tree: %s" | |
6122 | msgstr "引用不是一个树:%s" | |
6123 | ||
87cb7997 | 6124 | #: builtin/checkout.c:1099 |
ef317cd5 | 6125 | msgid "paths cannot be used with switching branches" |
07432cef | 6126 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 6127 | |
87cb7997 | 6128 | #: builtin/checkout.c:1102 builtin/checkout.c:1106 |
07432cef | 6129 | #, c-format |
ef317cd5 | 6130 | msgid "'%s' cannot be used with switching branches" |
07432cef | 6131 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 6132 | |
87cb7997 JX |
6133 | #: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 |
6134 | #: builtin/checkout.c:1121 | |
07432cef | 6135 | #, c-format |
ef317cd5 | 6136 | msgid "'%s' cannot be used with '%s'" |
07432cef | 6137 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 6138 | |
87cb7997 | 6139 | #: builtin/checkout.c:1126 |
07432cef | 6140 | #, c-format |
ef317cd5 | 6141 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 6142 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 6143 | |
87cb7997 JX |
6144 | #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 |
6145 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325 | |
6146 | #: builtin/worktree.c:327 | |
ef317cd5 | 6147 | msgid "branch" |
07432cef | 6148 | msgstr "分支" |
c04f5ac3 | 6149 | |
87cb7997 | 6150 | #: builtin/checkout.c:1160 |
ef317cd5 | 6151 | msgid "create and checkout a new branch" |
07432cef | 6152 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 6153 | |
87cb7997 | 6154 | #: builtin/checkout.c:1162 |
ef317cd5 | 6155 | msgid "create/reset and checkout a branch" |
07432cef | 6156 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 6157 | |
87cb7997 | 6158 | #: builtin/checkout.c:1163 |
ef317cd5 | 6159 | msgid "create reflog for new branch" |
07432cef | 6160 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 6161 | |
87cb7997 | 6162 | #: builtin/checkout.c:1164 builtin/worktree.c:329 |
5c57d762 JX |
6163 | msgid "detach HEAD at named commit" |
6164 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 6165 | |
87cb7997 | 6166 | #: builtin/checkout.c:1165 |
ef317cd5 | 6167 | msgid "set upstream info for new branch" |
07432cef | 6168 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 6169 | |
87cb7997 | 6170 | #: builtin/checkout.c:1167 |
6c94aba5 | 6171 | msgid "new-branch" |
07432cef | 6172 | msgstr "新分支" |
ef317cd5 | 6173 | |
87cb7997 | 6174 | #: builtin/checkout.c:1167 |
ef317cd5 | 6175 | msgid "new unparented branch" |
07432cef | 6176 | msgstr "新的没有父提交的分支" |
ef317cd5 | 6177 | |
87cb7997 | 6178 | #: builtin/checkout.c:1168 |
ef317cd5 | 6179 | msgid "checkout our version for unmerged files" |
07432cef | 6180 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 6181 | |
87cb7997 | 6182 | #: builtin/checkout.c:1170 |
ef317cd5 | 6183 | msgid "checkout their version for unmerged files" |
07432cef | 6184 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 6185 | |
87cb7997 | 6186 | #: builtin/checkout.c:1172 |
ef317cd5 | 6187 | msgid "force checkout (throw away local modifications)" |
07432cef | 6188 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 6189 | |
87cb7997 | 6190 | #: builtin/checkout.c:1173 |
ef317cd5 | 6191 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 6192 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 6193 | |
87cb7997 | 6194 | #: builtin/checkout.c:1174 builtin/merge.c:234 |
ef317cd5 | 6195 | msgid "update ignored files (default)" |
07432cef | 6196 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 6197 | |
87cb7997 | 6198 | #: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 |
ef317cd5 | 6199 | msgid "style" |
07432cef | 6200 | msgstr "风格" |
ef317cd5 | 6201 | |
87cb7997 | 6202 | #: builtin/checkout.c:1176 |
ef317cd5 | 6203 | msgid "conflict style (merge or diff3)" |
07432cef | 6204 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 6205 | |
87cb7997 | 6206 | #: builtin/checkout.c:1179 |
4dcdc3d8 JX |
6207 | msgid "do not limit pathspecs to sparse entries only" |
6208 | msgstr "对路径不做稀疏检出的限制" | |
6209 | ||
87cb7997 | 6210 | #: builtin/checkout.c:1181 |
814ff314 JX |
6211 | msgid "second guess 'git checkout <no-such-branch>'" |
6212 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 6213 | |
87cb7997 | 6214 | #: builtin/checkout.c:1183 |
7aea43ff JX |
6215 | msgid "do not check if another worktree is holding the given ref" |
6216 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
6217 | ||
87cb7997 JX |
6218 | #: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 |
6219 | #: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 | |
6220 | #: builtin/send-pack.c:172 | |
94550ed3 JX |
6221 | msgid "force progress reporting" |
6222 | msgstr "强制显示进度报告" | |
6223 | ||
87cb7997 | 6224 | #: builtin/checkout.c:1224 |
ef317cd5 | 6225 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 6226 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 6227 | |
87cb7997 | 6228 | #: builtin/checkout.c:1241 |
ef317cd5 JX |
6229 | msgid "--track needs a branch name" |
6230 | msgstr "--track 需要一个分支名" | |
6231 | ||
87cb7997 | 6232 | #: builtin/checkout.c:1246 |
ef317cd5 JX |
6233 | msgid "Missing branch name; try -b" |
6234 | msgstr "缺少分支名;尝试 -b" | |
6235 | ||
87cb7997 | 6236 | #: builtin/checkout.c:1282 |
c04f5ac3 | 6237 | msgid "invalid path specification" |
90e6ef53 | 6238 | msgstr "无效的路径规格" |
c04f5ac3 | 6239 | |
87cb7997 | 6240 | #: builtin/checkout.c:1289 |
07432cef | 6241 | #, c-format |
c04f5ac3 | 6242 | msgid "" |
ef317cd5 | 6243 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
6244 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
6245 | msgstr "" | |
07432cef WS |
6246 | "不能同时更新路径并切换到分支'%s'。\n" |
6247 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 6248 | |
87cb7997 | 6249 | #: builtin/checkout.c:1294 |
07432cef | 6250 | #, c-format |
ef317cd5 | 6251 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 6252 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 6253 | |
87cb7997 | 6254 | #: builtin/checkout.c:1298 |
c04f5ac3 JX |
6255 | msgid "" |
6256 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
6257 | "checking out of the index." | |
6258 | msgstr "" | |
90e6ef53 | 6259 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 6260 | |
1b7f4a34 | 6261 | #: builtin/clean.c:25 |
2e8451e8 JX |
6262 | msgid "" |
6263 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
6264 | msgstr "" | |
6265 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 6266 | |
1b7f4a34 | 6267 | #: builtin/clean.c:29 |
07432cef WS |
6268 | #, c-format |
6269 | msgid "Removing %s\n" | |
6270 | msgstr "正删除 %s\n" | |
6271 | ||
1b7f4a34 | 6272 | #: builtin/clean.c:30 |
07432cef WS |
6273 | #, c-format |
6274 | msgid "Would remove %s\n" | |
6275 | msgstr "将删除 %s\n" | |
6276 | ||
1b7f4a34 | 6277 | #: builtin/clean.c:31 |
07432cef WS |
6278 | #, c-format |
6279 | msgid "Skipping repository %s\n" | |
160fb2b2 | 6280 | msgstr "忽略仓库 %s\n" |
07432cef | 6281 | |
1b7f4a34 | 6282 | #: builtin/clean.c:32 |
07432cef WS |
6283 | #, c-format |
6284 | msgid "Would skip repository %s\n" | |
160fb2b2 | 6285 | msgstr "将忽略仓库 %s\n" |
07432cef | 6286 | |
1b7f4a34 | 6287 | #: builtin/clean.c:33 |
07432cef WS |
6288 | #, c-format |
6289 | msgid "failed to remove %s" | |
6290 | msgstr "无法删除 %s" | |
6291 | ||
87cb7997 | 6292 | #: builtin/clean.c:297 git-add--interactive.perl:614 |
1a79b2f1 | 6293 | #, c-format |
2e8451e8 JX |
6294 | msgid "" |
6295 | "Prompt help:\n" | |
6296 | "1 - select a numbered item\n" | |
6297 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 6298 | " - (empty) select nothing\n" |
2e8451e8 JX |
6299 | msgstr "" |
6300 | "帮助:\n" | |
6301 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
6302 | "foo - 通过唯一前缀选择一个选项\n" |
6303 | " - (空)什么也不选择\n" | |
2e8451e8 | 6304 | |
87cb7997 | 6305 | #: builtin/clean.c:301 git-add--interactive.perl:623 |
1a79b2f1 | 6306 | #, c-format |
2e8451e8 JX |
6307 | msgid "" |
6308 | "Prompt help:\n" | |
6309 | "1 - select a single item\n" | |
6310 | "3-5 - select a range of items\n" | |
6311 | "2-3,6-9 - select multiple ranges\n" | |
6312 | "foo - select item based on unique prefix\n" | |
6313 | "-... - unselect specified items\n" | |
6314 | "* - choose all items\n" | |
1a79b2f1 | 6315 | " - (empty) finish selecting\n" |
2e8451e8 JX |
6316 | msgstr "" |
6317 | "帮助:\n" | |
6318 | "1 - 选择一个选项\n" | |
6319 | "3-5 - 选择一个范围内的所有选项\n" | |
6320 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 6321 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
6322 | "-... - 反选特定的选项\n" |
6323 | "* - 选择所有选项\n" | |
1a79b2f1 | 6324 | " - (空)结束选择\n" |
2e8451e8 | 6325 | |
87cb7997 JX |
6326 | #: builtin/clean.c:517 git-add--interactive.perl:589 |
6327 | #: git-add--interactive.perl:594 | |
1a79b2f1 JX |
6328 | #, c-format, perl-format |
6329 | msgid "Huh (%s)?\n" | |
6330 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 6331 | |
87cb7997 | 6332 | #: builtin/clean.c:659 |
2e8451e8 JX |
6333 | #, c-format |
6334 | msgid "Input ignore patterns>> " | |
6335 | msgstr "输入模版以排除条目>> " | |
6336 | ||
87cb7997 | 6337 | #: builtin/clean.c:696 |
2e8451e8 JX |
6338 | #, c-format |
6339 | msgid "WARNING: Cannot find items matched by: %s" | |
6340 | msgstr "警告:无法找到和 %s 匹配的条目" | |
6341 | ||
87cb7997 | 6342 | #: builtin/clean.c:717 |
2e8451e8 JX |
6343 | msgid "Select items to delete" |
6344 | msgstr "选择要删除的条目" | |
6345 | ||
814ff314 | 6346 | #. TRANSLATORS: Make sure to keep [y/N] as is |
87cb7997 | 6347 | #: builtin/clean.c:758 |
2e8451e8 | 6348 | #, c-format |
814ff314 JX |
6349 | msgid "Remove %s [y/N]? " |
6350 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 6351 | |
87cb7997 | 6352 | #: builtin/clean.c:783 git-add--interactive.perl:1660 |
1a79b2f1 JX |
6353 | #, c-format |
6354 | msgid "Bye.\n" | |
6355 | msgstr "再见。\n" | |
2e8451e8 | 6356 | |
87cb7997 | 6357 | #: builtin/clean.c:791 |
2e8451e8 JX |
6358 | msgid "" |
6359 | "clean - start cleaning\n" | |
6360 | "filter by pattern - exclude items from deletion\n" | |
6361 | "select by numbers - select items to be deleted by numbers\n" | |
6362 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
6363 | "quit - stop cleaning\n" | |
6364 | "help - this screen\n" | |
6365 | "? - help for prompt selection" | |
6366 | msgstr "" | |
6367 | "clean - 开始清理\n" | |
6368 | "filter by pattern - 通过模版排除要删除的条目\n" | |
6369 | "select by numbers - 通过数字选择要删除的条目\n" | |
6370 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
6371 | "quit - 停止删除并退出\n" | |
6372 | "help - 显示本帮助\n" | |
6373 | "? - 显示如何在提示符下选择的帮助" | |
6374 | ||
87cb7997 | 6375 | #: builtin/clean.c:818 git-add--interactive.perl:1736 |
2e8451e8 JX |
6376 | msgid "*** Commands ***" |
6377 | msgstr "*** 命令 ***" | |
6378 | ||
87cb7997 | 6379 | #: builtin/clean.c:819 git-add--interactive.perl:1733 |
2e8451e8 JX |
6380 | msgid "What now" |
6381 | msgstr "请选择" | |
6382 | ||
87cb7997 | 6383 | #: builtin/clean.c:827 |
2e8451e8 JX |
6384 | msgid "Would remove the following item:" |
6385 | msgid_plural "Would remove the following items:" | |
6386 | msgstr[0] "将删除如下条目:" | |
6387 | msgstr[1] "将删除如下条目:" | |
6388 | ||
87cb7997 | 6389 | #: builtin/clean.c:844 |
2e8451e8 JX |
6390 | msgid "No more files to clean, exiting." |
6391 | msgstr "没有要清理的文件,退出。" | |
6392 | ||
87cb7997 | 6393 | #: builtin/clean.c:875 |
ef317cd5 | 6394 | msgid "do not print names of files removed" |
07432cef | 6395 | msgstr "不打印删除文件的名称" |
ef317cd5 | 6396 | |
87cb7997 | 6397 | #: builtin/clean.c:877 |
ef317cd5 | 6398 | msgid "force" |
07432cef | 6399 | msgstr "强制" |
ef317cd5 | 6400 | |
87cb7997 | 6401 | #: builtin/clean.c:878 |
2e8451e8 JX |
6402 | msgid "interactive cleaning" |
6403 | msgstr "交互式清除" | |
6404 | ||
87cb7997 | 6405 | #: builtin/clean.c:880 |
ef317cd5 | 6406 | msgid "remove whole directories" |
07432cef | 6407 | msgstr "删除整个目录" |
ef317cd5 | 6408 | |
87cb7997 JX |
6409 | #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 |
6410 | #: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348 | |
6411 | #: builtin/name-rev.c:350 builtin/show-ref.c:176 | |
ef317cd5 | 6412 | msgid "pattern" |
07432cef | 6413 | msgstr "模式" |
ef317cd5 | 6414 | |
87cb7997 | 6415 | #: builtin/clean.c:882 |
ef317cd5 | 6416 | msgid "add <pattern> to ignore rules" |
4375c10e | 6417 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 6418 | |
87cb7997 | 6419 | #: builtin/clean.c:883 |
ef317cd5 | 6420 | msgid "remove ignored files, too" |
07432cef | 6421 | msgstr "也删除忽略的文件" |
ef317cd5 | 6422 | |
87cb7997 | 6423 | #: builtin/clean.c:885 |
ef317cd5 | 6424 | msgid "remove only ignored files" |
07432cef | 6425 | msgstr "只删除忽略的文件" |
c04f5ac3 | 6426 | |
87cb7997 | 6427 | #: builtin/clean.c:903 |
c04f5ac3 | 6428 | msgid "-x and -X cannot be used together" |
649900bc | 6429 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 6430 | |
87cb7997 | 6431 | #: builtin/clean.c:907 |
c04f5ac3 | 6432 | msgid "" |
6c94aba5 | 6433 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 6434 | "clean" |
c04f5ac3 | 6435 | msgstr "" |
2e8451e8 | 6436 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 6437 | |
87cb7997 | 6438 | #: builtin/clean.c:910 |
c04f5ac3 | 6439 | msgid "" |
6c94aba5 | 6440 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 6441 | "refusing to clean" |
c04f5ac3 | 6442 | msgstr "" |
2e8451e8 | 6443 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 6444 | |
220c313c | 6445 | #: builtin/clone.c:37 |
814ff314 | 6446 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 6447 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 6448 | |
87cb7997 | 6449 | #: builtin/clone.c:80 |
ef317cd5 | 6450 | msgid "don't create a checkout" |
07432cef | 6451 | msgstr "不创建一个检出" |
ef317cd5 | 6452 | |
87cb7997 | 6453 | #: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 |
ef317cd5 | 6454 | msgid "create a bare repository" |
160fb2b2 | 6455 | msgstr "创建一个纯仓库" |
ef317cd5 | 6456 | |
87cb7997 | 6457 | #: builtin/clone.c:85 |
ef317cd5 | 6458 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 6459 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 6460 | |
87cb7997 | 6461 | #: builtin/clone.c:87 |
ef317cd5 | 6462 | msgid "to clone from a local repository" |
160fb2b2 | 6463 | msgstr "从本地仓库克隆" |
ef317cd5 | 6464 | |
87cb7997 | 6465 | #: builtin/clone.c:89 |
ef317cd5 | 6466 | msgid "don't use local hardlinks, always copy" |
07432cef | 6467 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 6468 | |
87cb7997 | 6469 | #: builtin/clone.c:91 |
ef317cd5 | 6470 | msgid "setup as shared repository" |
160fb2b2 | 6471 | msgstr "设置为共享仓库" |
ef317cd5 | 6472 | |
87cb7997 JX |
6473 | #: builtin/clone.c:93 builtin/clone.c:97 |
6474 | msgid "pathspec" | |
6475 | msgstr "路径" | |
6476 | ||
6477 | #: builtin/clone.c:93 builtin/clone.c:97 | |
ef317cd5 | 6478 | msgid "initialize submodules in the clone" |
07432cef | 6479 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 6480 | |
87cb7997 | 6481 | #: builtin/clone.c:100 |
5b04ee3b JX |
6482 | msgid "number of submodules cloned in parallel" |
6483 | msgstr "并发克隆的子模组的数量" | |
6484 | ||
87cb7997 | 6485 | #: builtin/clone.c:101 builtin/init-db.c:475 |
ef317cd5 | 6486 | msgid "template-directory" |
07432cef | 6487 | msgstr "模板目录" |
ef317cd5 | 6488 | |
87cb7997 | 6489 | #: builtin/clone.c:102 builtin/init-db.c:476 |
ef317cd5 | 6490 | msgid "directory from which templates will be used" |
07432cef | 6491 | msgstr "模板目录将被使用" |
ef317cd5 | 6492 | |
87cb7997 JX |
6493 | #: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 |
6494 | #: builtin/submodule--helper.c:983 | |
ef317cd5 | 6495 | msgid "reference repository" |
160fb2b2 | 6496 | msgstr "参考仓库" |
ef317cd5 | 6497 | |
87cb7997 | 6498 | #: builtin/clone.c:108 |
7aea43ff | 6499 | msgid "use --reference only while cloning" |
160fb2b2 | 6500 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 6501 | |
87cb7997 | 6502 | #: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 |
ef317cd5 | 6503 | msgid "name" |
07432cef | 6504 | msgstr "名称" |
ef317cd5 | 6505 | |
87cb7997 | 6506 | #: builtin/clone.c:110 |
ef317cd5 | 6507 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 6508 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 6509 | |
87cb7997 | 6510 | #: builtin/clone.c:112 |
ef317cd5 | 6511 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 6512 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 6513 | |
87cb7997 | 6514 | #: builtin/clone.c:114 |
ef317cd5 | 6515 | msgid "path to git-upload-pack on the remote" |
07432cef | 6516 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 6517 | |
87cb7997 | 6518 | #: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 |
a0b6b246 | 6519 | #: builtin/pull.c:202 |
ef317cd5 | 6520 | msgid "depth" |
07432cef | 6521 | msgstr "深度" |
ef317cd5 | 6522 | |
87cb7997 | 6523 | #: builtin/clone.c:116 |
ef317cd5 | 6524 | msgid "create a shallow clone of that depth" |
07432cef | 6525 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 6526 | |
87cb7997 | 6527 | #: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 |
a0b6b246 JX |
6528 | #: parse-options.h:142 |
6529 | msgid "time" | |
6530 | msgstr "时间" | |
6531 | ||
87cb7997 | 6532 | #: builtin/clone.c:118 |
a0b6b246 JX |
6533 | msgid "create a shallow clone since a specific time" |
6534 | msgstr "从一个特定时间创建一个浅克隆" | |
6535 | ||
87cb7997 | 6536 | #: builtin/clone.c:119 builtin/fetch.c:124 |
a0b6b246 JX |
6537 | msgid "revision" |
6538 | msgstr "版本" | |
6539 | ||
87cb7997 | 6540 | #: builtin/clone.c:120 builtin/fetch.c:125 |
1a79b2f1 JX |
6541 | msgid "deepen history of shallow clone, excluding rev" |
6542 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 6543 | |
87cb7997 | 6544 | #: builtin/clone.c:122 |
ef317cd5 | 6545 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 6546 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 6547 | |
87cb7997 | 6548 | #: builtin/clone.c:124 |
5b04ee3b JX |
6549 | msgid "any cloned submodules will be shallow" |
6550 | msgstr "子模组将以浅下载模式克隆" | |
6551 | ||
87cb7997 | 6552 | #: builtin/clone.c:125 builtin/init-db.c:484 |
ef317cd5 | 6553 | msgid "gitdir" |
07432cef | 6554 | msgstr "git目录" |
ef317cd5 | 6555 | |
87cb7997 | 6556 | #: builtin/clone.c:126 builtin/init-db.c:485 |
ef317cd5 | 6557 | msgid "separate git dir from working tree" |
07432cef | 6558 | msgstr "git目录和工作区分离" |
ef317cd5 | 6559 | |
87cb7997 | 6560 | #: builtin/clone.c:127 |
ef317cd5 | 6561 | msgid "key=value" |
07432cef | 6562 | msgstr "key=value" |
ef317cd5 | 6563 | |
87cb7997 | 6564 | #: builtin/clone.c:128 |
ef317cd5 | 6565 | msgid "set config inside the new repository" |
160fb2b2 | 6566 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 6567 | |
87cb7997 | 6568 | #: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 |
276ceeaa JX |
6569 | msgid "use IPv4 addresses only" |
6570 | msgstr "只使用 IPv4 地址" | |
6571 | ||
87cb7997 | 6572 | #: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 |
276ceeaa JX |
6573 | msgid "use IPv6 addresses only" |
6574 | msgstr "只使用 IPv6 地址" | |
6575 | ||
87cb7997 | 6576 | #: builtin/clone.c:268 |
3495628d JX |
6577 | msgid "" |
6578 | "No directory name could be guessed.\n" | |
6579 | "Please specify a directory on the command line" | |
6580 | msgstr "" | |
6581 | "无法猜到目录名。\n" | |
26e4cbec | 6582 | "请在命令行指定一个目录" |
3495628d | 6583 | |
87cb7997 | 6584 | #: builtin/clone.c:321 |
cfff71a9 | 6585 | #, c-format |
a0b6b246 JX |
6586 | msgid "info: Could not add alternate for '%s': %s\n" |
6587 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 6588 | |
87cb7997 | 6589 | #: builtin/clone.c:393 |
5c57d762 JX |
6590 | #, c-format |
6591 | msgid "failed to open '%s'" | |
6592 | msgstr "无法打开 '%s'" | |
6593 | ||
87cb7997 | 6594 | #: builtin/clone.c:401 |
c04f5ac3 JX |
6595 | #, c-format |
6596 | msgid "%s exists and is not a directory" | |
6597 | msgstr "%s 存在且不是一个目录" | |
6598 | ||
87cb7997 | 6599 | #: builtin/clone.c:415 |
c04f5ac3 JX |
6600 | #, c-format |
6601 | msgid "failed to stat %s\n" | |
90e6ef53 | 6602 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 6603 | |
87cb7997 | 6604 | #: builtin/clone.c:437 |
c04f5ac3 JX |
6605 | #, c-format |
6606 | msgid "failed to create link '%s'" | |
90e6ef53 | 6607 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 6608 | |
87cb7997 | 6609 | #: builtin/clone.c:441 |
c04f5ac3 JX |
6610 | #, c-format |
6611 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 6612 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 6613 | |
87cb7997 | 6614 | #: builtin/clone.c:466 |
c04f5ac3 JX |
6615 | #, c-format |
6616 | msgid "done.\n" | |
6617 | msgstr "完成。\n" | |
6618 | ||
87cb7997 | 6619 | #: builtin/clone.c:478 |
1003b3a5 JX |
6620 | msgid "" |
6621 | "Clone succeeded, but checkout failed.\n" | |
6622 | "You can inspect what was checked out with 'git status'\n" | |
6623 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
6624 | msgstr "" | |
6625 | "克隆成功,但是检出失败。\n" | |
6626 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
6627 | "'git checkout -f HEAD' 重试\n" | |
6628 | ||
87cb7997 | 6629 | #: builtin/clone.c:555 |
c04f5ac3 JX |
6630 | #, c-format |
6631 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 6632 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 6633 | |
87cb7997 | 6634 | #: builtin/clone.c:650 |
1003b3a5 JX |
6635 | msgid "remote did not send all necessary objects" |
6636 | msgstr "远程没有发送所有必须的对象" | |
6637 | ||
87cb7997 | 6638 | #: builtin/clone.c:666 |
3495628d JX |
6639 | #, c-format |
6640 | msgid "unable to update %s" | |
6641 | msgstr "不能更新 %s" | |
6642 | ||
87cb7997 | 6643 | #: builtin/clone.c:715 |
c04f5ac3 JX |
6644 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
6645 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
6646 | ||
87cb7997 | 6647 | #: builtin/clone.c:746 |
1003b3a5 JX |
6648 | msgid "unable to checkout working tree" |
6649 | msgstr "不能检出工作区" | |
6650 | ||
87cb7997 | 6651 | #: builtin/clone.c:786 |
3495628d JX |
6652 | msgid "unable to write parameters to config file" |
6653 | msgstr "无法将参数写入配置文件" | |
6654 | ||
87cb7997 | 6655 | #: builtin/clone.c:849 |
04cb2f28 JX |
6656 | msgid "cannot repack to clean up" |
6657 | msgstr "无法执行 repack 来清理" | |
6658 | ||
87cb7997 | 6659 | #: builtin/clone.c:851 |
04cb2f28 JX |
6660 | msgid "cannot unlink temporary alternates file" |
6661 | msgstr "无法删除临时的 alternates 文件" | |
6662 | ||
87cb7997 | 6663 | #: builtin/clone.c:884 builtin/receive-pack.c:1901 |
c04f5ac3 JX |
6664 | msgid "Too many arguments." |
6665 | msgstr "太多参数。" | |
6666 | ||
87cb7997 | 6667 | #: builtin/clone.c:888 |
c04f5ac3 | 6668 | msgid "You must specify a repository to clone." |
160fb2b2 | 6669 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 6670 | |
87cb7997 | 6671 | #: builtin/clone.c:901 |
c04f5ac3 JX |
6672 | #, c-format |
6673 | msgid "--bare and --origin %s options are incompatible." | |
6674 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
6675 | ||
87cb7997 | 6676 | #: builtin/clone.c:904 |
07432cef WS |
6677 | msgid "--bare and --separate-git-dir are incompatible." |
6678 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
6679 | ||
87cb7997 | 6680 | #: builtin/clone.c:917 |
c04f5ac3 JX |
6681 | #, c-format |
6682 | msgid "repository '%s' does not exist" | |
160fb2b2 | 6683 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 6684 | |
87cb7997 | 6685 | #: builtin/clone.c:923 builtin/fetch.c:1337 |
cfff71a9 JX |
6686 | #, c-format |
6687 | msgid "depth %s is not a positive number" | |
6688 | msgstr "深度 %s 不是一个正数" | |
6689 | ||
87cb7997 | 6690 | #: builtin/clone.c:933 |
c04f5ac3 JX |
6691 | #, c-format |
6692 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 6693 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 6694 | |
87cb7997 | 6695 | #: builtin/clone.c:943 |
c04f5ac3 JX |
6696 | #, c-format |
6697 | msgid "working tree '%s' already exists." | |
6698 | msgstr "工作区 '%s' 已经存在。" | |
6699 | ||
87cb7997 JX |
6700 | #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 |
6701 | #: builtin/worktree.c:222 builtin/worktree.c:249 | |
5bb01d4f JX |
6702 | #, c-format |
6703 | msgid "could not create leading directories of '%s'" | |
6704 | msgstr "不能为 '%s' 创建先导目录" | |
6705 | ||
87cb7997 | 6706 | #: builtin/clone.c:961 |
c04f5ac3 | 6707 | #, c-format |
814ff314 JX |
6708 | msgid "could not create work tree dir '%s'" |
6709 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 6710 | |
87cb7997 | 6711 | #: builtin/clone.c:973 |
c04f5ac3 JX |
6712 | #, c-format |
6713 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 6714 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 6715 | |
87cb7997 | 6716 | #: builtin/clone.c:975 |
c04f5ac3 JX |
6717 | #, c-format |
6718 | msgid "Cloning into '%s'...\n" | |
6719 | msgstr "正克隆到 '%s'...\n" | |
6720 | ||
87cb7997 | 6721 | #: builtin/clone.c:999 |
a0b6b246 JX |
6722 | msgid "" |
6723 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
6724 | "able" | |
6725 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
6726 | ||
87cb7997 | 6727 | #: builtin/clone.c:1055 |
6acbf033 | 6728 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
6729 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
6730 | ||
87cb7997 | 6731 | #: builtin/clone.c:1057 |
a0b6b246 JX |
6732 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
6733 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 6734 | |
87cb7997 | 6735 | #: builtin/clone.c:1059 |
a0b6b246 JX |
6736 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
6737 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
6738 | ||
87cb7997 | 6739 | #: builtin/clone.c:1062 |
6acbf033 | 6740 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 6741 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 6742 | |
87cb7997 | 6743 | #: builtin/clone.c:1067 |
6acbf033 JX |
6744 | msgid "--local is ignored" |
6745 | msgstr "--local 被忽略" | |
6746 | ||
87cb7997 | 6747 | #: builtin/clone.c:1071 |
c04f5ac3 JX |
6748 | #, c-format |
6749 | msgid "Don't know how to clone %s" | |
6750 | msgstr "不知道如何克隆 %s" | |
6751 | ||
87cb7997 | 6752 | #: builtin/clone.c:1126 builtin/clone.c:1134 |
c04f5ac3 JX |
6753 | #, c-format |
6754 | msgid "Remote branch %s not found in upstream %s" | |
6755 | msgstr "远程分支 %s 在上游 %s 未发现" | |
6756 | ||
87cb7997 | 6757 | #: builtin/clone.c:1137 |
c04f5ac3 | 6758 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 6759 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 6760 | |
ef317cd5 | 6761 | #: builtin/column.c:9 |
814ff314 JX |
6762 | msgid "git column [<options>]" |
6763 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
6764 | |
6765 | #: builtin/column.c:26 | |
6766 | msgid "lookup config vars" | |
07432cef | 6767 | msgstr "查找配置变量" |
ef317cd5 JX |
6768 | |
6769 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 6770 | msgid "layout to use" |
07432cef | 6771 | msgstr "要使用的布局" |
ef317cd5 JX |
6772 | |
6773 | #: builtin/column.c:29 | |
6774 | msgid "Maximum width" | |
07432cef | 6775 | msgstr "最大宽度" |
ef317cd5 JX |
6776 | |
6777 | #: builtin/column.c:30 | |
6778 | msgid "Padding space on left border" | |
07432cef | 6779 | msgstr "左边框的填充空间" |
ef317cd5 JX |
6780 | |
6781 | #: builtin/column.c:31 | |
6782 | msgid "Padding space on right border" | |
07432cef | 6783 | msgstr "右边框的填充空间" |
ef317cd5 JX |
6784 | |
6785 | #: builtin/column.c:32 | |
6786 | msgid "Padding space between columns" | |
07432cef | 6787 | msgstr "两列之间的填充空间" |
ef317cd5 | 6788 | |
8ada9598 JX |
6789 | #: builtin/column.c:51 |
6790 | msgid "--command must be the first argument" | |
81809b99 | 6791 | msgstr "--command 必须是第一个参数" |
8ada9598 | 6792 | |
94550ed3 | 6793 | #: builtin/commit.c:38 |
814ff314 | 6794 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 6795 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 6796 | |
94550ed3 | 6797 | #: builtin/commit.c:43 |
814ff314 | 6798 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 6799 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 6800 | |
94550ed3 | 6801 | #: builtin/commit.c:48 |
220c313c JX |
6802 | msgid "" |
6803 | "Your name and email address were configured automatically based\n" | |
6804 | "on your username and hostname. Please check that they are accurate.\n" | |
6805 | "You can suppress this message by setting them explicitly. Run the\n" | |
6806 | "following command and follow the instructions in your editor to edit\n" | |
6807 | "your configuration file:\n" | |
6808 | "\n" | |
6809 | " git config --global --edit\n" | |
6810 | "\n" | |
6811 | "After doing this, you may fix the identity used for this commit with:\n" | |
6812 | "\n" | |
6813 | " git commit --amend --reset-author\n" | |
6814 | msgstr "" | |
6815 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
6816 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
6817 | "中编辑您的配置文件:\n" | |
6818 | "\n" | |
6819 | " git config --global --edit\n" | |
6820 | "\n" | |
6821 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
6822 | "\n" | |
6823 | " git commit --amend --reset-author\n" | |
6824 | ||
94550ed3 | 6825 | #: builtin/commit.c:61 |
c04f5ac3 JX |
6826 | msgid "" |
6827 | "Your name and email address were configured automatically based\n" | |
6828 | "on your username and hostname. Please check that they are accurate.\n" | |
6829 | "You can suppress this message by setting them explicitly:\n" | |
6830 | "\n" | |
6831 | " git config --global user.name \"Your Name\"\n" | |
6832 | " git config --global user.email you@example.com\n" | |
6833 | "\n" | |
6834 | "After doing this, you may fix the identity used for this commit with:\n" | |
6835 | "\n" | |
6836 | " git commit --amend --reset-author\n" | |
6837 | msgstr "" | |
90e6ef53 | 6838 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 6839 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
6840 | "\n" |
6841 | " git config --global user.name \"Your Name\"\n" | |
6842 | " git config --global user.email you@example.com\n" | |
6843 | "\n" | |
90e6ef53 | 6844 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
6845 | "\n" |
6846 | " git commit --amend --reset-author\n" | |
6847 | ||
94550ed3 | 6848 | #: builtin/commit.c:73 |
c04f5ac3 JX |
6849 | msgid "" |
6850 | "You asked to amend the most recent commit, but doing so would make\n" | |
6851 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
6852 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
6853 | msgstr "" | |
1b150dc9 T |
6854 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
6855 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 6856 | |
94550ed3 | 6857 | #: builtin/commit.c:78 |
c04f5ac3 JX |
6858 | msgid "" |
6859 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
6860 | "If you wish to commit it anyway, use:\n" | |
6861 | "\n" | |
6862 | " git commit --allow-empty\n" | |
6863 | "\n" | |
c04f5ac3 | 6864 | msgstr "" |
a9ce4543 T |
6865 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
6866 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
6867 | "\n" |
6868 | " git commit --allow-empty\n" | |
6869 | "\n" | |
c04f5ac3 | 6870 | |
94550ed3 | 6871 | #: builtin/commit.c:85 |
b1894384 JX |
6872 | msgid "Otherwise, please use 'git reset'\n" |
6873 | msgstr "否则,请使用命令 'git reset'\n" | |
6874 | ||
94550ed3 | 6875 | #: builtin/commit.c:88 |
b1894384 JX |
6876 | msgid "" |
6877 | "If you wish to skip this commit, use:\n" | |
6878 | "\n" | |
6879 | " git reset\n" | |
6880 | "\n" | |
6881 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
6882 | "the remaining commits.\n" | |
6883 | msgstr "" | |
6884 | "如果您想跳过这个提交,使用命令:\n" | |
6885 | "\n" | |
6886 | " git reset\n" | |
6887 | "\n" | |
6888 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
6889 | "操作。\n" | |
6890 | ||
a0b6b246 | 6891 | #: builtin/commit.c:318 |
c04f5ac3 | 6892 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 6893 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 6894 | |
a0b6b246 | 6895 | #: builtin/commit.c:359 |
c04f5ac3 | 6896 | msgid "unable to create temporary index" |
90e6ef53 | 6897 | msgstr "不能创建临时索引" |
c04f5ac3 | 6898 | |
a0b6b246 | 6899 | #: builtin/commit.c:365 |
c04f5ac3 JX |
6900 | msgid "interactive add failed" |
6901 | msgstr "交互式添加失败" | |
6902 | ||
a0b6b246 | 6903 | #: builtin/commit.c:378 |
220c313c JX |
6904 | msgid "unable to update temporary index" |
6905 | msgstr "无法更新临时索引" | |
6906 | ||
a0b6b246 | 6907 | #: builtin/commit.c:380 |
220c313c JX |
6908 | msgid "Failed to update main cache tree" |
6909 | msgstr "不能更新树的主缓存" | |
6910 | ||
a0b6b246 | 6911 | #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 |
c04f5ac3 | 6912 | msgid "unable to write new_index file" |
90e6ef53 | 6913 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 6914 | |
a0b6b246 | 6915 | #: builtin/commit.c:458 |
8ada9598 | 6916 | msgid "cannot do a partial commit during a merge." |
81809b99 | 6917 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 6918 | |
a0b6b246 | 6919 | #: builtin/commit.c:460 |
8ada9598 | 6920 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 6921 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 6922 | |
a0b6b246 | 6923 | #: builtin/commit.c:469 |
c04f5ac3 | 6924 | msgid "cannot read the index" |
90e6ef53 | 6925 | msgstr "无法读取索引" |
c04f5ac3 | 6926 | |
a0b6b246 | 6927 | #: builtin/commit.c:488 |
c04f5ac3 | 6928 | msgid "unable to write temporary index file" |
90e6ef53 | 6929 | msgstr "无法写临时索引文件" |
c04f5ac3 | 6930 | |
a0b6b246 | 6931 | #: builtin/commit.c:582 |
220c313c JX |
6932 | #, c-format |
6933 | msgid "commit '%s' lacks author header" | |
6934 | msgstr "提交 '%s' 缺少作者信息" | |
6935 | ||
a0b6b246 | 6936 | #: builtin/commit.c:584 |
c04f5ac3 | 6937 | #, c-format |
220c313c JX |
6938 | msgid "commit '%s' has malformed author line" |
6939 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 6940 | |
a0b6b246 | 6941 | #: builtin/commit.c:603 |
c04f5ac3 JX |
6942 | msgid "malformed --author parameter" |
6943 | msgstr "非法的 --author 参数" | |
6944 | ||
a0b6b246 | 6945 | #: builtin/commit.c:655 |
6acbf033 JX |
6946 | msgid "" |
6947 | "unable to select a comment character that is not used\n" | |
6948 | "in the current commit message" | |
6949 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
6950 | ||
a0b6b246 | 6951 | #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 |
c04f5ac3 JX |
6952 | #, c-format |
6953 | msgid "could not lookup commit %s" | |
6954 | msgstr "不能查询提交 %s" | |
6955 | ||
87cb7997 | 6956 | #: builtin/commit.c:704 builtin/shortlog.c:294 |
c04f5ac3 JX |
6957 | #, c-format |
6958 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 6959 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 6960 | |
a0b6b246 | 6961 | #: builtin/commit.c:706 |
c04f5ac3 | 6962 | msgid "could not read log from standard input" |
90e6ef53 | 6963 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 6964 | |
a0b6b246 | 6965 | #: builtin/commit.c:710 |
c04f5ac3 JX |
6966 | #, c-format |
6967 | msgid "could not read log file '%s'" | |
90e6ef53 | 6968 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 6969 | |
a0b6b246 | 6970 | #: builtin/commit.c:737 builtin/commit.c:745 |
c04f5ac3 | 6971 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 6972 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 6973 | |
a0b6b246 | 6974 | #: builtin/commit.c:742 |
5b04ee3b JX |
6975 | msgid "could not read MERGE_MSG" |
6976 | msgstr "不能读取 MERGE_MSG" | |
6977 | ||
a0b6b246 | 6978 | #: builtin/commit.c:796 |
c04f5ac3 | 6979 | msgid "could not write commit template" |
90e6ef53 | 6980 | msgstr "不能写提交模版" |
c04f5ac3 | 6981 | |
a0b6b246 | 6982 | #: builtin/commit.c:814 |
81809b99 | 6983 | #, c-format |
c04f5ac3 JX |
6984 | msgid "" |
6985 | "\n" | |
8ada9598 | 6986 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
6987 | "If this is not correct, please remove the file\n" |
6988 | "\t%s\n" | |
6989 | "and try again.\n" | |
6990 | msgstr "" | |
6991 | "\n" | |
649900bc | 6992 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
6993 | "\t%s\n" |
6994 | "然后重试。\n" | |
6995 | ||
a0b6b246 | 6996 | #: builtin/commit.c:819 |
81809b99 | 6997 | #, c-format |
8ada9598 JX |
6998 | msgid "" |
6999 | "\n" | |
7000 | "It looks like you may be committing a cherry-pick.\n" | |
7001 | "If this is not correct, please remove the file\n" | |
7002 | "\t%s\n" | |
7003 | "and try again.\n" | |
7004 | msgstr "" | |
7005 | "\n" | |
649900bc | 7006 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
7007 | "\t%s\n" |
7008 | "然后重试。\n" | |
c04f5ac3 | 7009 | |
a0b6b246 | 7010 | #: builtin/commit.c:832 |
a77c07d9 | 7011 | #, c-format |
c04f5ac3 | 7012 | msgid "" |
8ada9598 | 7013 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7014 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 7015 | msgstr "" |
a77c07d9 | 7016 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 7017 | "说明将会终止提交。\n" |
c04f5ac3 | 7018 | |
a0b6b246 | 7019 | #: builtin/commit.c:839 |
a77c07d9 | 7020 | #, c-format |
c04f5ac3 | 7021 | msgid "" |
8ada9598 | 7022 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7023 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
7024 | "An empty message aborts the commit.\n" |
7025 | msgstr "" | |
a77c07d9 JX |
7026 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
7027 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 7028 | |
90e6ef53 | 7029 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a0b6b246 | 7030 | #: builtin/commit.c:859 |
6acbf033 JX |
7031 | #, c-format |
7032 | msgid "%sAuthor: %.*s <%.*s>" | |
7033 | msgstr "%s作者: %.*s <%.*s>" | |
7034 | ||
7035 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
a0b6b246 | 7036 | #: builtin/commit.c:867 |
c04f5ac3 | 7037 | #, c-format |
6acbf033 JX |
7038 | msgid "%sDate: %s" |
7039 | msgstr "%s日期: %s" | |
c04f5ac3 | 7040 | |
90e6ef53 | 7041 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a0b6b246 | 7042 | #: builtin/commit.c:874 |
c04f5ac3 | 7043 | #, c-format |
6acbf033 JX |
7044 | msgid "%sCommitter: %.*s <%.*s>" |
7045 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 7046 | |
a0b6b246 | 7047 | #: builtin/commit.c:892 |
c04f5ac3 | 7048 | msgid "Cannot read index" |
90e6ef53 | 7049 | msgstr "无法读取索引" |
c04f5ac3 | 7050 | |
a0b6b246 | 7051 | #: builtin/commit.c:954 |
c04f5ac3 JX |
7052 | msgid "Error building trees" |
7053 | msgstr "无法创建树对象" | |
7054 | ||
87cb7997 | 7055 | #: builtin/commit.c:968 builtin/tag.c:273 |
c04f5ac3 JX |
7056 | #, c-format |
7057 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 7058 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 7059 | |
a0b6b246 | 7060 | #: builtin/commit.c:1071 |
c04f5ac3 | 7061 | #, c-format |
814ff314 JX |
7062 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
7063 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 7064 | |
1a79b2f1 | 7065 | #: builtin/commit.c:1086 builtin/commit.c:1325 |
c04f5ac3 JX |
7066 | #, c-format |
7067 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 7068 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 7069 | |
a0b6b246 | 7070 | #: builtin/commit.c:1124 |
2e8451e8 JX |
7071 | msgid "--long and -z are incompatible" |
7072 | msgstr "--long 和 -z 选项不兼容" | |
7073 | ||
a0b6b246 | 7074 | #: builtin/commit.c:1154 |
c04f5ac3 JX |
7075 | msgid "Using both --reset-author and --author does not make sense" |
7076 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
7077 | ||
a0b6b246 | 7078 | #: builtin/commit.c:1163 |
c04f5ac3 | 7079 | msgid "You have nothing to amend." |
90e6ef53 | 7080 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 7081 | |
a0b6b246 | 7082 | #: builtin/commit.c:1166 |
8ada9598 | 7083 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 7084 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 7085 | |
a0b6b246 | 7086 | #: builtin/commit.c:1168 |
8ada9598 | 7087 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 7088 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 7089 | |
a0b6b246 | 7090 | #: builtin/commit.c:1171 |
c04f5ac3 | 7091 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 7092 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 7093 | |
a0b6b246 | 7094 | #: builtin/commit.c:1181 |
c04f5ac3 JX |
7095 | msgid "Only one of -c/-C/-F/--fixup can be used." |
7096 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
7097 | ||
a0b6b246 | 7098 | #: builtin/commit.c:1183 |
c04f5ac3 | 7099 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 7100 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 7101 | |
a0b6b246 | 7102 | #: builtin/commit.c:1191 |
c04f5ac3 | 7103 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 7104 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 7105 | |
a0b6b246 | 7106 | #: builtin/commit.c:1208 |
c04f5ac3 JX |
7107 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
7108 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
7109 | ||
a0b6b246 | 7110 | #: builtin/commit.c:1210 |
c04f5ac3 JX |
7111 | msgid "No paths with --include/--only does not make sense." |
7112 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
7113 | ||
a0b6b246 | 7114 | #: builtin/commit.c:1212 |
6c94aba5 JX |
7115 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
7116 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 7117 | |
87cb7997 | 7118 | #: builtin/commit.c:1224 builtin/tag.c:551 |
c04f5ac3 JX |
7119 | #, c-format |
7120 | msgid "Invalid cleanup mode %s" | |
7121 | msgstr "无效的清理模式 %s" | |
7122 | ||
1a79b2f1 | 7123 | #: builtin/commit.c:1229 |
c04f5ac3 | 7124 | msgid "Paths with -a does not make sense." |
649900bc | 7125 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 7126 | |
1a79b2f1 | 7127 | #: builtin/commit.c:1339 builtin/commit.c:1612 |
ef317cd5 | 7128 | msgid "show status concisely" |
07432cef | 7129 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 7130 | |
1a79b2f1 | 7131 | #: builtin/commit.c:1341 builtin/commit.c:1614 |
ef317cd5 | 7132 | msgid "show branch information" |
07432cef | 7133 | msgstr "显示分支信息" |
ef317cd5 | 7134 | |
1a79b2f1 | 7135 | #: builtin/commit.c:1343 |
a0b6b246 JX |
7136 | msgid "version" |
7137 | msgstr "版本" | |
7138 | ||
1a79b2f1 | 7139 | #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 |
87cb7997 | 7140 | #: builtin/worktree.c:443 |
ef317cd5 | 7141 | msgid "machine-readable output" |
07432cef WS |
7142 | msgstr "机器可读的输出" |
7143 | ||
1a79b2f1 | 7144 | #: builtin/commit.c:1346 builtin/commit.c:1618 |
07432cef WS |
7145 | msgid "show status in long format (default)" |
7146 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 7147 | |
1a79b2f1 | 7148 | #: builtin/commit.c:1349 builtin/commit.c:1621 |
ef317cd5 | 7149 | msgid "terminate entries with NUL" |
4375c10e | 7150 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 7151 | |
1a79b2f1 | 7152 | #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 |
87cb7997 | 7153 | #: builtin/fast-export.c:984 builtin/tag.c:411 |
ef317cd5 | 7154 | msgid "mode" |
07432cef | 7155 | msgstr "模式" |
ef317cd5 | 7156 | |
1a79b2f1 | 7157 | #: builtin/commit.c:1352 builtin/commit.c:1624 |
ef317cd5 | 7158 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 7159 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 7160 | |
1a79b2f1 | 7161 | #: builtin/commit.c:1355 |
ef317cd5 | 7162 | msgid "show ignored files" |
07432cef | 7163 | msgstr "显示忽略的文件" |
ef317cd5 | 7164 | |
1a79b2f1 | 7165 | #: builtin/commit.c:1356 parse-options.h:155 |
ef317cd5 JX |
7166 | msgid "when" |
7167 | msgstr "何时" | |
7168 | ||
1a79b2f1 | 7169 | #: builtin/commit.c:1357 |
ef317cd5 JX |
7170 | msgid "" |
7171 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
7172 | "(Default: all)" | |
7173 | msgstr "" | |
07432cef | 7174 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 7175 | |
1a79b2f1 | 7176 | #: builtin/commit.c:1359 |
ef317cd5 | 7177 | msgid "list untracked files in columns" |
07432cef | 7178 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 7179 | |
1a79b2f1 | 7180 | #: builtin/commit.c:1435 |
c04f5ac3 JX |
7181 | msgid "couldn't look up newly created commit" |
7182 | msgstr "无法找到新创建的提交" | |
7183 | ||
1a79b2f1 | 7184 | #: builtin/commit.c:1437 |
c04f5ac3 | 7185 | msgid "could not parse newly created commit" |
90e6ef53 | 7186 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 7187 | |
1a79b2f1 | 7188 | #: builtin/commit.c:1482 |
c04f5ac3 JX |
7189 | msgid "detached HEAD" |
7190 | msgstr "分离头指针" | |
7191 | ||
7e238ab7 | 7192 | # 译者:中文字符串拼接,可删除前导空格 |
1a79b2f1 | 7193 | #: builtin/commit.c:1485 |
c04f5ac3 | 7194 | msgid " (root-commit)" |
7e238ab7 | 7195 | msgstr "(根提交)" |
c04f5ac3 | 7196 | |
1a79b2f1 | 7197 | #: builtin/commit.c:1582 |
ef317cd5 | 7198 | msgid "suppress summary after successful commit" |
07432cef | 7199 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 7200 | |
1a79b2f1 | 7201 | #: builtin/commit.c:1583 |
ef317cd5 | 7202 | msgid "show diff in commit message template" |
07432cef | 7203 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 7204 | |
1a79b2f1 | 7205 | #: builtin/commit.c:1585 |
ef317cd5 | 7206 | msgid "Commit message options" |
07432cef | 7207 | msgstr "提交说明选项" |
c04f5ac3 | 7208 | |
87cb7997 | 7209 | #: builtin/commit.c:1586 builtin/tag.c:409 |
ef317cd5 | 7210 | msgid "read message from file" |
07432cef | 7211 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 7212 | |
1a79b2f1 | 7213 | #: builtin/commit.c:1587 |
ef317cd5 | 7214 | msgid "author" |
07432cef | 7215 | msgstr "作者" |
c04f5ac3 | 7216 | |
1a79b2f1 | 7217 | #: builtin/commit.c:1587 |
ef317cd5 | 7218 | msgid "override author for commit" |
07432cef | 7219 | msgstr "提交时覆盖作者" |
73a60cd2 | 7220 | |
87cb7997 | 7221 | #: builtin/commit.c:1588 builtin/gc.c:353 |
ef317cd5 | 7222 | msgid "date" |
07432cef | 7223 | msgstr "日期" |
c04f5ac3 | 7224 | |
1a79b2f1 | 7225 | #: builtin/commit.c:1588 |
ef317cd5 | 7226 | msgid "override date for commit" |
07432cef | 7227 | msgstr "提交时覆盖日期" |
c04f5ac3 | 7228 | |
87cb7997 JX |
7229 | #: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 |
7230 | #: builtin/notes.c:561 builtin/tag.c:407 | |
ef317cd5 | 7231 | msgid "message" |
07432cef | 7232 | msgstr "说明" |
c04f5ac3 | 7233 | |
1a79b2f1 | 7234 | #: builtin/commit.c:1589 |
ef317cd5 | 7235 | msgid "commit message" |
07432cef | 7236 | msgstr "提交说明" |
ef317cd5 | 7237 | |
1a79b2f1 | 7238 | #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 |
87cb7997 | 7239 | #: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 |
94550ed3 JX |
7240 | msgid "commit" |
7241 | msgstr "提交" | |
7242 | ||
1a79b2f1 | 7243 | #: builtin/commit.c:1590 |
ef317cd5 | 7244 | msgid "reuse and edit message from specified commit" |
07432cef | 7245 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 7246 | |
1a79b2f1 | 7247 | #: builtin/commit.c:1591 |
ef317cd5 | 7248 | msgid "reuse message from specified commit" |
07432cef | 7249 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 7250 | |
1a79b2f1 | 7251 | #: builtin/commit.c:1592 |
ef317cd5 | 7252 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 7253 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 7254 | |
1a79b2f1 | 7255 | #: builtin/commit.c:1593 |
ef317cd5 | 7256 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 7257 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 7258 | |
1a79b2f1 | 7259 | #: builtin/commit.c:1594 |
ef317cd5 | 7260 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 7261 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 7262 | |
87cb7997 | 7263 | #: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 |
ef317cd5 | 7264 | msgid "add Signed-off-by:" |
07432cef | 7265 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 7266 | |
1a79b2f1 | 7267 | #: builtin/commit.c:1596 |
ef317cd5 | 7268 | msgid "use specified template file" |
07432cef | 7269 | msgstr "使用指定的模板文件" |
ef317cd5 | 7270 | |
1a79b2f1 | 7271 | #: builtin/commit.c:1597 |
ef317cd5 | 7272 | msgid "force edit of commit" |
07432cef | 7273 | msgstr "强制编辑提交" |
ef317cd5 | 7274 | |
07432cef | 7275 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
1a79b2f1 | 7276 | #: builtin/commit.c:1598 |
ef317cd5 | 7277 | msgid "default" |
07432cef | 7278 | msgstr "default" |
ef317cd5 | 7279 | |
87cb7997 | 7280 | #: builtin/commit.c:1598 builtin/tag.c:412 |
ef317cd5 | 7281 | msgid "how to strip spaces and #comments from message" |
07432cef | 7282 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 7283 | |
1a79b2f1 | 7284 | #: builtin/commit.c:1599 |
ef317cd5 | 7285 | msgid "include status in commit message template" |
07432cef | 7286 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 7287 | |
87cb7997 JX |
7288 | #: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 |
7289 | #: builtin/revert.c:112 | |
ef317cd5 | 7290 | msgid "GPG sign commit" |
07432cef | 7291 | msgstr "GPG 提交签名" |
ef317cd5 | 7292 | |
1a79b2f1 | 7293 | #: builtin/commit.c:1604 |
ef317cd5 | 7294 | msgid "Commit contents options" |
07432cef | 7295 | msgstr "提交内容选项" |
ef317cd5 | 7296 | |
1a79b2f1 | 7297 | #: builtin/commit.c:1605 |
ef317cd5 | 7298 | msgid "commit all changed files" |
07432cef | 7299 | msgstr "提交所有改动的文件" |
ef317cd5 | 7300 | |
1a79b2f1 | 7301 | #: builtin/commit.c:1606 |
ef317cd5 | 7302 | msgid "add specified files to index for commit" |
07432cef | 7303 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 7304 | |
1a79b2f1 | 7305 | #: builtin/commit.c:1607 |
ef317cd5 | 7306 | msgid "interactively add files" |
07432cef | 7307 | msgstr "交互式添加文件" |
ef317cd5 | 7308 | |
1a79b2f1 | 7309 | #: builtin/commit.c:1608 |
ef317cd5 | 7310 | msgid "interactively add changes" |
07432cef | 7311 | msgstr "交互式添加变更" |
ef317cd5 | 7312 | |
1a79b2f1 | 7313 | #: builtin/commit.c:1609 |
ef317cd5 | 7314 | msgid "commit only specified files" |
07432cef | 7315 | msgstr "只提交指定的文件" |
ef317cd5 | 7316 | |
1a79b2f1 | 7317 | #: builtin/commit.c:1610 |
5c57d762 JX |
7318 | msgid "bypass pre-commit and commit-msg hooks" |
7319 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
7320 | ||
1a79b2f1 | 7321 | #: builtin/commit.c:1611 |
ef317cd5 | 7322 | msgid "show what would be committed" |
07432cef | 7323 | msgstr "显示将要提交的内容" |
ef317cd5 | 7324 | |
1a79b2f1 | 7325 | #: builtin/commit.c:1622 |
ef317cd5 | 7326 | msgid "amend previous commit" |
07432cef | 7327 | msgstr "修改先前的提交" |
ef317cd5 | 7328 | |
1a79b2f1 | 7329 | #: builtin/commit.c:1623 |
ef317cd5 | 7330 | msgid "bypass post-rewrite hook" |
07432cef | 7331 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 7332 | |
1a79b2f1 | 7333 | #: builtin/commit.c:1628 |
ef317cd5 | 7334 | msgid "ok to record an empty change" |
07432cef | 7335 | msgstr "允许一个空提交" |
ef317cd5 | 7336 | |
1a79b2f1 | 7337 | #: builtin/commit.c:1630 |
ef317cd5 | 7338 | msgid "ok to record a change with an empty message" |
07432cef | 7339 | msgstr "允许空的提交说明" |
ef317cd5 | 7340 | |
1a79b2f1 | 7341 | #: builtin/commit.c:1659 |
c04f5ac3 | 7342 | msgid "could not parse HEAD commit" |
90e6ef53 | 7343 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 7344 | |
1a79b2f1 | 7345 | #: builtin/commit.c:1707 |
c04f5ac3 JX |
7346 | #, c-format |
7347 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 7348 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 7349 | |
1a79b2f1 | 7350 | #: builtin/commit.c:1714 |
c04f5ac3 | 7351 | msgid "could not read MERGE_MODE" |
90e6ef53 | 7352 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 7353 | |
1a79b2f1 | 7354 | #: builtin/commit.c:1733 |
c04f5ac3 JX |
7355 | #, c-format |
7356 | msgid "could not read commit message: %s" | |
90e6ef53 | 7357 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 7358 | |
1a79b2f1 | 7359 | #: builtin/commit.c:1744 |
73a60cd2 JX |
7360 | #, c-format |
7361 | msgid "Aborting commit; you did not edit the message.\n" | |
7362 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
7363 | ||
1a79b2f1 | 7364 | #: builtin/commit.c:1749 |
c04f5ac3 JX |
7365 | #, c-format |
7366 | msgid "Aborting commit due to empty commit message.\n" | |
7367 | msgstr "终止提交因为提交说明为空。\n" | |
7368 | ||
1a79b2f1 | 7369 | #: builtin/commit.c:1797 |
c04f5ac3 JX |
7370 | msgid "" |
7371 | "Repository has been updated, but unable to write\n" | |
220c313c | 7372 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
7373 | "not exceeded, and then \"git reset HEAD\" to recover." |
7374 | msgstr "" | |
160fb2b2 | 7375 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 7376 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 7377 | |
276ceeaa | 7378 | #: builtin/config.c:9 |
814ff314 JX |
7379 | msgid "git config [<options>]" |
7380 | msgstr "git config [<选项>]" | |
ef317cd5 | 7381 | |
5c57d762 | 7382 | #: builtin/config.c:55 |
ef317cd5 | 7383 | msgid "Config file location" |
07432cef | 7384 | msgstr "配置文件位置" |
ef317cd5 | 7385 | |
5c57d762 | 7386 | #: builtin/config.c:56 |
ef317cd5 | 7387 | msgid "use global config file" |
07432cef | 7388 | msgstr "使用全局配置文件" |
ef317cd5 | 7389 | |
5c57d762 | 7390 | #: builtin/config.c:57 |
ef317cd5 | 7391 | msgid "use system config file" |
07432cef | 7392 | msgstr "使用系统级配置文件" |
ef317cd5 | 7393 | |
5c57d762 | 7394 | #: builtin/config.c:58 |
ef317cd5 | 7395 | msgid "use repository config file" |
160fb2b2 | 7396 | msgstr "使用仓库级配置文件" |
ef317cd5 | 7397 | |
5c57d762 | 7398 | #: builtin/config.c:59 |
ef317cd5 | 7399 | msgid "use given config file" |
07432cef | 7400 | msgstr "使用指定的配置文件" |
ef317cd5 | 7401 | |
5c57d762 | 7402 | #: builtin/config.c:60 |
2e8451e8 | 7403 | msgid "blob-id" |
4375c10e | 7404 | msgstr "数据对象 ID" |
2e8451e8 | 7405 | |
5c57d762 | 7406 | #: builtin/config.c:60 |
2e8451e8 JX |
7407 | msgid "read config from given blob object" |
7408 | msgstr "从给定的数据对象读取配置" | |
7409 | ||
5c57d762 | 7410 | #: builtin/config.c:61 |
ef317cd5 | 7411 | msgid "Action" |
07432cef | 7412 | msgstr "操作" |
ef317cd5 | 7413 | |
5c57d762 | 7414 | #: builtin/config.c:62 |
ef317cd5 | 7415 | msgid "get value: name [value-regex]" |
07432cef | 7416 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 7417 | |
5c57d762 | 7418 | #: builtin/config.c:63 |
ef317cd5 | 7419 | msgid "get all values: key [value-regex]" |
07432cef | 7420 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 7421 | |
5c57d762 | 7422 | #: builtin/config.c:64 |
ef317cd5 | 7423 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 7424 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 7425 | |
5c57d762 | 7426 | #: builtin/config.c:65 |
90314792 JX |
7427 | msgid "get value specific for the URL: section[.var] URL" |
7428 | msgstr "获得 URL 取值:section[.var] URL" | |
7429 | ||
5c57d762 | 7430 | #: builtin/config.c:66 |
ef317cd5 | 7431 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 7432 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 7433 | |
5c57d762 | 7434 | #: builtin/config.c:67 |
ef317cd5 | 7435 | msgid "add a new variable: name value" |
07432cef | 7436 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 7437 | |
5c57d762 | 7438 | #: builtin/config.c:68 |
ef317cd5 | 7439 | msgid "remove a variable: name [value-regex]" |
07432cef | 7440 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 7441 | |
5c57d762 | 7442 | #: builtin/config.c:69 |
ef317cd5 | 7443 | msgid "remove all matches: name [value-regex]" |
07432cef | 7444 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 7445 | |
5c57d762 | 7446 | #: builtin/config.c:70 |
ef317cd5 | 7447 | msgid "rename section: old-name new-name" |
07432cef | 7448 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 7449 | |
5c57d762 | 7450 | #: builtin/config.c:71 |
ef317cd5 | 7451 | msgid "remove a section: name" |
07432cef | 7452 | msgstr "删除一个小节:name" |
ef317cd5 | 7453 | |
5c57d762 | 7454 | #: builtin/config.c:72 |
ef317cd5 | 7455 | msgid "list all" |
07432cef | 7456 | msgstr "列出所有" |
ef317cd5 | 7457 | |
5c57d762 | 7458 | #: builtin/config.c:73 |
ef317cd5 | 7459 | msgid "open an editor" |
07432cef | 7460 | msgstr "打开一个编辑器" |
ef317cd5 | 7461 | |
5c57d762 | 7462 | #: builtin/config.c:74 |
04cb2f28 JX |
7463 | msgid "find the color configured: slot [default]" |
7464 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 7465 | |
5c57d762 | 7466 | #: builtin/config.c:75 |
04cb2f28 JX |
7467 | msgid "find the color setting: slot [stdout-is-tty]" |
7468 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 7469 | |
5c57d762 | 7470 | #: builtin/config.c:76 |
ef317cd5 | 7471 | msgid "Type" |
07432cef | 7472 | msgstr "类型" |
ef317cd5 | 7473 | |
5c57d762 | 7474 | #: builtin/config.c:77 |
ef317cd5 | 7475 | msgid "value is \"true\" or \"false\"" |
07432cef | 7476 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 7477 | |
5c57d762 | 7478 | #: builtin/config.c:78 |
ef317cd5 | 7479 | msgid "value is decimal number" |
07432cef | 7480 | msgstr "值是十进制数" |
ef317cd5 | 7481 | |
5c57d762 | 7482 | #: builtin/config.c:79 |
ef317cd5 | 7483 | msgid "value is --bool or --int" |
07432cef | 7484 | msgstr "值是 --bool or --int" |
ef317cd5 | 7485 | |
5c57d762 | 7486 | #: builtin/config.c:80 |
ef317cd5 | 7487 | msgid "value is a path (file or directory name)" |
07432cef | 7488 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 7489 | |
5c57d762 | 7490 | #: builtin/config.c:81 |
ef317cd5 | 7491 | msgid "Other" |
07432cef | 7492 | msgstr "其它" |
ef317cd5 | 7493 | |
5c57d762 | 7494 | #: builtin/config.c:82 |
ef317cd5 | 7495 | msgid "terminate values with NUL byte" |
4375c10e | 7496 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 7497 | |
5c57d762 | 7498 | #: builtin/config.c:83 |
1b7f4a34 JX |
7499 | msgid "show variable names only" |
7500 | msgstr "只显示变量名" | |
7501 | ||
5c57d762 | 7502 | #: builtin/config.c:84 |
ef317cd5 | 7503 | msgid "respect include directives on lookup" |
07432cef | 7504 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 7505 | |
5c57d762 | 7506 | #: builtin/config.c:85 |
276ceeaa JX |
7507 | msgid "show origin of config (file, standard input, blob, command line)" |
7508 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
7509 | ||
5c57d762 | 7510 | #: builtin/config.c:327 |
220c313c | 7511 | msgid "unable to parse default color value" |
160fb2b2 | 7512 | msgstr "不能解析默认颜色值" |
220c313c | 7513 | |
5c57d762 | 7514 | #: builtin/config.c:471 |
220c313c JX |
7515 | #, c-format |
7516 | msgid "" | |
7517 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7518 | "[user]\n" |
220c313c | 7519 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7520 | "#\tname = %s\n" |
220c313c JX |
7521 | "#\temail = %s\n" |
7522 | msgstr "" | |
7523 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7524 | "[user]\n" |
220c313c | 7525 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7526 | "#\tname = %s\n" |
220c313c JX |
7527 | "#\temail = %s\n" |
7528 | ||
87cb7997 | 7529 | #: builtin/config.c:611 |
220c313c JX |
7530 | #, c-format |
7531 | msgid "cannot create configuration file %s" | |
7532 | msgstr "不能创建配置文件 %s" | |
7533 | ||
87cb7997 | 7534 | #: builtin/config.c:623 |
a0b6b246 JX |
7535 | #, c-format |
7536 | msgid "" | |
7537 | "cannot overwrite multiple values with a single value\n" | |
7538 | " Use a regexp, --add or --replace-all to change %s." | |
7539 | msgstr "" | |
7540 | "无法用一个值覆盖多个值\n" | |
7541 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
7542 | ||
7543 | #: builtin/count-objects.c:86 | |
4dcdc3d8 JX |
7544 | msgid "git count-objects [-v] [-H | --human-readable]" |
7545 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
7546 | ||
a0b6b246 | 7547 | #: builtin/count-objects.c:96 |
4dcdc3d8 JX |
7548 | msgid "print sizes in human readable format" |
7549 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 7550 | |
87cb7997 | 7551 | #: builtin/describe.c:18 |
814ff314 JX |
7552 | msgid "git describe [<options>] [<commit-ish>...]" |
7553 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 7554 | |
87cb7997 | 7555 | #: builtin/describe.c:19 |
814ff314 JX |
7556 | msgid "git describe [<options>] --dirty" |
7557 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 7558 | |
87cb7997 JX |
7559 | #: builtin/describe.c:53 |
7560 | msgid "head" | |
7561 | msgstr "头" | |
7562 | ||
7563 | #: builtin/describe.c:53 | |
7564 | msgid "lightweight" | |
7565 | msgstr "轻量级的" | |
7566 | ||
7567 | #: builtin/describe.c:53 | |
7568 | msgid "annotated" | |
7569 | msgstr "附注的" | |
7570 | ||
7571 | #: builtin/describe.c:250 | |
c04f5ac3 JX |
7572 | #, c-format |
7573 | msgid "annotated tag %s not available" | |
55a16ee4 | 7574 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 7575 | |
87cb7997 | 7576 | #: builtin/describe.c:254 |
c04f5ac3 JX |
7577 | #, c-format |
7578 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 7579 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 7580 | |
87cb7997 | 7581 | #: builtin/describe.c:256 |
c04f5ac3 JX |
7582 | #, c-format |
7583 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 7584 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 7585 | |
87cb7997 | 7586 | #: builtin/describe.c:283 builtin/log.c:487 |
c04f5ac3 JX |
7587 | #, c-format |
7588 | msgid "Not a valid object name %s" | |
7589 | msgstr "不是一个有效的对象名 %s" | |
7590 | ||
87cb7997 | 7591 | #: builtin/describe.c:286 |
c04f5ac3 JX |
7592 | #, c-format |
7593 | msgid "%s is not a valid '%s' object" | |
7594 | msgstr "%s 不是一个有效的 '%s' 对象" | |
7595 | ||
87cb7997 | 7596 | #: builtin/describe.c:303 |
c04f5ac3 JX |
7597 | #, c-format |
7598 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 7599 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 7600 | |
87cb7997 | 7601 | #: builtin/describe.c:305 |
c04f5ac3 JX |
7602 | #, c-format |
7603 | msgid "searching to describe %s\n" | |
7604 | msgstr "搜索描述 %s\n" | |
7605 | ||
87cb7997 | 7606 | #: builtin/describe.c:352 |
c04f5ac3 JX |
7607 | #, c-format |
7608 | msgid "finished search at %s\n" | |
7609 | msgstr "完成搜索 %s\n" | |
7610 | ||
87cb7997 | 7611 | #: builtin/describe.c:379 |
c04f5ac3 JX |
7612 | #, c-format |
7613 | msgid "" | |
7614 | "No annotated tags can describe '%s'.\n" | |
7615 | "However, there were unannotated tags: try --tags." | |
7616 | msgstr "" | |
55a16ee4 RC |
7617 | "没有附注标签能描述 '%s'。\n" |
7618 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 7619 | |
87cb7997 | 7620 | #: builtin/describe.c:383 |
c04f5ac3 JX |
7621 | #, c-format |
7622 | msgid "" | |
7623 | "No tags can describe '%s'.\n" | |
7624 | "Try --always, or create some tags." | |
7625 | msgstr "" | |
55a16ee4 RC |
7626 | "没有标签能描述 '%s'。\n" |
7627 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 7628 | |
87cb7997 | 7629 | #: builtin/describe.c:413 |
c04f5ac3 JX |
7630 | #, c-format |
7631 | msgid "traversed %lu commits\n" | |
7632 | msgstr "已遍历 %lu 个提交\n" | |
7633 | ||
87cb7997 | 7634 | #: builtin/describe.c:416 |
c04f5ac3 JX |
7635 | #, c-format |
7636 | msgid "" | |
7637 | "more than %i tags found; listed %i most recent\n" | |
7638 | "gave up search at %s\n" | |
7639 | msgstr "" | |
55a16ee4 | 7640 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 7641 | "在 %s 放弃搜索\n" |
c04f5ac3 | 7642 | |
87cb7997 | 7643 | #: builtin/describe.c:438 |
ef317cd5 | 7644 | msgid "find the tag that comes after the commit" |
55a16ee4 | 7645 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 7646 | |
87cb7997 | 7647 | #: builtin/describe.c:439 |
ef317cd5 | 7648 | msgid "debug search strategy on stderr" |
07432cef | 7649 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 7650 | |
87cb7997 | 7651 | #: builtin/describe.c:440 |
1003b3a5 JX |
7652 | msgid "use any ref" |
7653 | msgstr "使用任意引用" | |
7654 | ||
87cb7997 | 7655 | #: builtin/describe.c:441 |
1003b3a5 | 7656 | msgid "use any tag, even unannotated" |
55a16ee4 | 7657 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 7658 | |
87cb7997 | 7659 | #: builtin/describe.c:442 |
ef317cd5 | 7660 | msgid "always use long format" |
07432cef | 7661 | msgstr "始终使用长提交号格式" |
ef317cd5 | 7662 | |
87cb7997 | 7663 | #: builtin/describe.c:443 |
2e8451e8 JX |
7664 | msgid "only follow first parent" |
7665 | msgstr "只跟随第一个父提交" | |
7666 | ||
87cb7997 | 7667 | #: builtin/describe.c:446 |
ef317cd5 | 7668 | msgid "only output exact matches" |
07432cef | 7669 | msgstr "只输出精确匹配" |
ef317cd5 | 7670 | |
87cb7997 | 7671 | #: builtin/describe.c:448 |
ef317cd5 | 7672 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 7673 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 7674 | |
87cb7997 | 7675 | #: builtin/describe.c:450 |
ef317cd5 | 7676 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 7677 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 7678 | |
87cb7997 JX |
7679 | #: builtin/describe.c:452 |
7680 | msgid "do not consider tags matching <pattern>" | |
7681 | msgstr "不考虑匹配 <模式> 的标签" | |
7682 | ||
7683 | #: builtin/describe.c:454 builtin/name-rev.c:357 | |
ef317cd5 | 7684 | msgid "show abbreviated commit object as fallback" |
07432cef | 7685 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 7686 | |
87cb7997 | 7687 | #: builtin/describe.c:455 builtin/describe.c:458 |
ef317cd5 | 7688 | msgid "mark" |
07432cef | 7689 | msgstr "标记" |
ef317cd5 | 7690 | |
87cb7997 | 7691 | #: builtin/describe.c:456 |
ef317cd5 | 7692 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 7693 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 7694 | |
87cb7997 JX |
7695 | #: builtin/describe.c:459 |
7696 | msgid "append <mark> on broken working tree (default: \"-broken\")" | |
7697 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
7698 | ||
7699 | #: builtin/describe.c:477 | |
c04f5ac3 JX |
7700 | msgid "--long is incompatible with --abbrev=0" |
7701 | msgstr "--long 与 --abbrev=0 不兼容" | |
7702 | ||
87cb7997 | 7703 | #: builtin/describe.c:506 |
c04f5ac3 | 7704 | msgid "No names found, cannot describe anything." |
90e6ef53 | 7705 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 7706 | |
87cb7997 | 7707 | #: builtin/describe.c:549 |
a8a5406a | 7708 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
7709 | msgstr "--dirty 与提交号不兼容" |
7710 | ||
7711 | #: builtin/describe.c:551 | |
7712 | msgid "--broken is incompatible with commit-ishes" | |
7713 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 7714 | |
1a79b2f1 | 7715 | #: builtin/diff.c:83 |
c04f5ac3 JX |
7716 | #, c-format |
7717 | msgid "'%s': not a regular file or symlink" | |
7718 | msgstr "'%s':不是一个正规文件或符号链接" | |
7719 | ||
1a79b2f1 | 7720 | #: builtin/diff.c:234 |
c04f5ac3 JX |
7721 | #, c-format |
7722 | msgid "invalid option: %s" | |
7723 | msgstr "无效选项:%s" | |
7724 | ||
1a79b2f1 | 7725 | #: builtin/diff.c:358 |
c04f5ac3 | 7726 | msgid "Not a git repository" |
160fb2b2 | 7727 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 7728 | |
1a79b2f1 | 7729 | #: builtin/diff.c:401 |
c04f5ac3 JX |
7730 | #, c-format |
7731 | msgid "invalid object '%s' given." | |
7732 | msgstr "提供了无效对象 '%s'。" | |
7733 | ||
1a79b2f1 | 7734 | #: builtin/diff.c:410 |
c04f5ac3 JX |
7735 | #, c-format |
7736 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 7737 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 7738 | |
1a79b2f1 | 7739 | #: builtin/diff.c:417 |
c04f5ac3 JX |
7740 | #, c-format |
7741 | msgid "unhandled object '%s' given." | |
6c94aba5 | 7742 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 7743 | |
1a79b2f1 JX |
7744 | #: builtin/difftool.c:28 |
7745 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" | |
7746 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
7747 | ||
7748 | #: builtin/difftool.c:241 | |
7749 | #, c-format | |
7750 | msgid "failed: %d" | |
7751 | msgstr "失败:%d" | |
7752 | ||
87cb7997 JX |
7753 | #: builtin/difftool.c:283 |
7754 | #, c-format | |
7755 | msgid "could not read symlink %s" | |
7756 | msgstr "无法读取符号链接 %s" | |
7757 | ||
7758 | #: builtin/difftool.c:285 | |
7759 | #, c-format | |
7760 | msgid "could not read symlink file %s" | |
7761 | msgstr "无法读取符号链接文件 %s" | |
7762 | ||
7763 | #: builtin/difftool.c:293 | |
7764 | #, c-format | |
7765 | msgid "could not read object %s for symlink %s" | |
7766 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
7767 | ||
7768 | #: builtin/difftool.c:395 | |
1a79b2f1 JX |
7769 | msgid "" |
7770 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
7771 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
7772 | msgstr "" |
7773 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
7774 | "cc')。" | |
1a79b2f1 | 7775 | |
87cb7997 | 7776 | #: builtin/difftool.c:609 |
1a79b2f1 JX |
7777 | #, c-format |
7778 | msgid "both files modified: '%s' and '%s'." | |
7779 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
7780 | ||
87cb7997 | 7781 | #: builtin/difftool.c:611 |
1a79b2f1 JX |
7782 | msgid "working tree file has been left." |
7783 | msgstr "工作区文件被留了下来。" | |
7784 | ||
87cb7997 | 7785 | #: builtin/difftool.c:622 |
1a79b2f1 JX |
7786 | #, c-format |
7787 | msgid "temporary files exist in '%s'." | |
7788 | msgstr "临时文件存在于 '%s'。" | |
7789 | ||
87cb7997 | 7790 | #: builtin/difftool.c:623 |
1a79b2f1 JX |
7791 | msgid "you may want to cleanup or recover these." |
7792 | msgstr "您可能想要清理或者恢复它们。" | |
7793 | ||
87cb7997 | 7794 | #: builtin/difftool.c:669 |
1a79b2f1 JX |
7795 | msgid "use `diff.guitool` instead of `diff.tool`" |
7796 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
7797 | ||
87cb7997 | 7798 | #: builtin/difftool.c:671 |
1a79b2f1 JX |
7799 | msgid "perform a full-directory diff" |
7800 | msgstr "执行一个全目录差异比较" | |
7801 | ||
87cb7997 | 7802 | #: builtin/difftool.c:673 |
1a79b2f1 JX |
7803 | msgid "do not prompt before launching a diff tool" |
7804 | msgstr "启动差异比较工具之前不提示" | |
7805 | ||
87cb7997 | 7806 | #: builtin/difftool.c:679 |
1a79b2f1 JX |
7807 | msgid "use symlinks in dir-diff mode" |
7808 | msgstr "在 dir-diff 模式中使用符号链接" | |
7809 | ||
87cb7997 | 7810 | #: builtin/difftool.c:680 |
1a79b2f1 JX |
7811 | msgid "<tool>" |
7812 | msgstr "<工具>" | |
7813 | ||
87cb7997 | 7814 | #: builtin/difftool.c:681 |
1a79b2f1 JX |
7815 | msgid "use the specified diff tool" |
7816 | msgstr "使用指定的差异比较工具" | |
7817 | ||
87cb7997 | 7818 | #: builtin/difftool.c:683 |
1a79b2f1 JX |
7819 | msgid "print a list of diff tools that may be used with `--tool`" |
7820 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
7821 | ||
87cb7997 | 7822 | #: builtin/difftool.c:686 |
1a79b2f1 JX |
7823 | msgid "" |
7824 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
7825 | "code" | |
7826 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
7827 | ||
87cb7997 | 7828 | #: builtin/difftool.c:688 |
1a79b2f1 JX |
7829 | msgid "<command>" |
7830 | msgstr "<命令>" | |
7831 | ||
87cb7997 | 7832 | #: builtin/difftool.c:689 |
1a79b2f1 JX |
7833 | msgid "specify a custom command for viewing diffs" |
7834 | msgstr "指定一个用于查看差异的自定义命令" | |
7835 | ||
87cb7997 | 7836 | #: builtin/difftool.c:713 |
1a79b2f1 JX |
7837 | msgid "no <tool> given for --tool=<tool>" |
7838 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
7839 | ||
87cb7997 | 7840 | #: builtin/difftool.c:720 |
1a79b2f1 JX |
7841 | msgid "no <cmd> given for --extcmd=<cmd>" |
7842 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
7843 | ||
1b7f4a34 | 7844 | #: builtin/fast-export.c:25 |
ef317cd5 | 7845 | msgid "git fast-export [rev-list-opts]" |
07432cef | 7846 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 7847 | |
1b7f4a34 | 7848 | #: builtin/fast-export.c:980 |
ef317cd5 | 7849 | msgid "show progress after <n> objects" |
07432cef | 7850 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 7851 | |
1b7f4a34 | 7852 | #: builtin/fast-export.c:982 |
ef317cd5 | 7853 | msgid "select handling of signed tags" |
55a16ee4 | 7854 | msgstr "选择如何处理签名标签" |
ef317cd5 | 7855 | |
1b7f4a34 | 7856 | #: builtin/fast-export.c:985 |
ef317cd5 | 7857 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 7858 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 7859 | |
1b7f4a34 | 7860 | #: builtin/fast-export.c:988 |
ef317cd5 | 7861 | msgid "Dump marks to this file" |
07432cef | 7862 | msgstr "把标记存储到这个文件" |
ef317cd5 | 7863 | |
1b7f4a34 | 7864 | #: builtin/fast-export.c:990 |
ef317cd5 | 7865 | msgid "Import marks from this file" |
07432cef | 7866 | msgstr "从这个文件导入标记" |
ef317cd5 | 7867 | |
1b7f4a34 | 7868 | #: builtin/fast-export.c:992 |
ef317cd5 | 7869 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 7870 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 7871 | |
1b7f4a34 | 7872 | #: builtin/fast-export.c:994 |
ef317cd5 | 7873 | msgid "Output full tree for each commit" |
07432cef | 7874 | msgstr "每次提交都输出整个树" |
ef317cd5 | 7875 | |
1b7f4a34 | 7876 | #: builtin/fast-export.c:996 |
ef317cd5 | 7877 | msgid "Use the done feature to terminate the stream" |
07432cef | 7878 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 7879 | |
1b7f4a34 | 7880 | #: builtin/fast-export.c:997 |
ef317cd5 | 7881 | msgid "Skip output of blob data" |
07432cef | 7882 | msgstr "跳过数据对象的输出" |
ef317cd5 | 7883 | |
1b7f4a34 | 7884 | #: builtin/fast-export.c:998 |
6acbf033 | 7885 | msgid "refspec" |
160fb2b2 | 7886 | msgstr "引用规格" |
6acbf033 | 7887 | |
1b7f4a34 | 7888 | #: builtin/fast-export.c:999 |
6acbf033 | 7889 | msgid "Apply refspec to exported refs" |
160fb2b2 | 7890 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 7891 | |
1b7f4a34 | 7892 | #: builtin/fast-export.c:1000 |
220c313c JX |
7893 | msgid "anonymize output" |
7894 | msgstr "匿名输出" | |
7895 | ||
5c57d762 | 7896 | #: builtin/fetch.c:21 |
ef317cd5 | 7897 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 7898 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 7899 | |
5c57d762 | 7900 | #: builtin/fetch.c:22 |
ef317cd5 | 7901 | msgid "git fetch [<options>] <group>" |
07432cef | 7902 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 7903 | |
5c57d762 | 7904 | #: builtin/fetch.c:23 |
ef317cd5 | 7905 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 7906 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 7907 | |
5c57d762 | 7908 | #: builtin/fetch.c:24 |
ef317cd5 | 7909 | msgid "git fetch --all [<options>]" |
07432cef | 7910 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 7911 | |
a0b6b246 | 7912 | #: builtin/fetch.c:95 builtin/pull.c:175 |
ef317cd5 | 7913 | msgid "fetch from all remotes" |
07432cef | 7914 | msgstr "从所有的远程抓取" |
ef317cd5 | 7915 | |
a0b6b246 | 7916 | #: builtin/fetch.c:97 builtin/pull.c:178 |
ef317cd5 | 7917 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 7918 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 7919 | |
a0b6b246 | 7920 | #: builtin/fetch.c:99 builtin/pull.c:181 |
ef317cd5 | 7921 | msgid "path to upload pack on remote end" |
07432cef | 7922 | msgstr "上传包到远程的路径" |
ef317cd5 | 7923 | |
a0b6b246 | 7924 | #: builtin/fetch.c:100 builtin/pull.c:183 |
ef317cd5 | 7925 | msgid "force overwrite of local branch" |
07432cef | 7926 | msgstr "强制覆盖本地分支" |
ef317cd5 | 7927 | |
a0b6b246 | 7928 | #: builtin/fetch.c:102 |
ef317cd5 | 7929 | msgid "fetch from multiple remotes" |
07432cef | 7930 | msgstr "从多个远程抓取" |
ef317cd5 | 7931 | |
a0b6b246 | 7932 | #: builtin/fetch.c:104 builtin/pull.c:185 |
ef317cd5 | 7933 | msgid "fetch all tags and associated objects" |
55a16ee4 | 7934 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 7935 | |
a0b6b246 | 7936 | #: builtin/fetch.c:106 |
ef317cd5 | 7937 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 7938 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 7939 | |
a0b6b246 | 7940 | #: builtin/fetch.c:108 |
276ceeaa JX |
7941 | msgid "number of submodules fetched in parallel" |
7942 | msgstr "子模组获取的并发数" | |
7943 | ||
a0b6b246 | 7944 | #: builtin/fetch.c:110 builtin/pull.c:188 |
ef317cd5 | 7945 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 7946 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 7947 | |
07432cef | 7948 | # 译者:可选值,不能翻译 |
a0b6b246 | 7949 | #: builtin/fetch.c:111 builtin/pull.c:191 |
ef317cd5 | 7950 | msgid "on-demand" |
07432cef | 7951 | msgstr "on-demand" |
ef317cd5 | 7952 | |
a0b6b246 | 7953 | #: builtin/fetch.c:112 builtin/pull.c:192 |
ef317cd5 | 7954 | msgid "control recursive fetching of submodules" |
07432cef | 7955 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 7956 | |
a0b6b246 | 7957 | #: builtin/fetch.c:116 builtin/pull.c:200 |
ef317cd5 | 7958 | msgid "keep downloaded pack" |
07432cef | 7959 | msgstr "保持下载包" |
ef317cd5 | 7960 | |
a0b6b246 | 7961 | #: builtin/fetch.c:118 |
ef317cd5 | 7962 | msgid "allow updating of HEAD ref" |
07432cef | 7963 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 7964 | |
a0b6b246 | 7965 | #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 |
ef317cd5 | 7966 | msgid "deepen history of shallow clone" |
07432cef | 7967 | msgstr "深化浅克隆的历史" |
ef317cd5 | 7968 | |
a0b6b246 JX |
7969 | #: builtin/fetch.c:123 |
7970 | msgid "deepen history of shallow repository based on time" | |
7971 | msgstr "基于时间来深化浅克隆的历史" | |
7972 | ||
7973 | #: builtin/fetch.c:129 builtin/pull.c:206 | |
a77c07d9 | 7974 | msgid "convert to a complete repository" |
160fb2b2 | 7975 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 7976 | |
87cb7997 | 7977 | #: builtin/fetch.c:131 builtin/log.c:1440 |
ef317cd5 | 7978 | msgid "dir" |
07432cef | 7979 | msgstr "目录" |
ef317cd5 | 7980 | |
a0b6b246 | 7981 | #: builtin/fetch.c:132 |
ef317cd5 | 7982 | msgid "prepend this to submodule path output" |
07432cef | 7983 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 7984 | |
a0b6b246 | 7985 | #: builtin/fetch.c:135 |
ef317cd5 | 7986 | msgid "default mode for recursion" |
07432cef | 7987 | msgstr "递归的默认模式" |
ef317cd5 | 7988 | |
a0b6b246 | 7989 | #: builtin/fetch.c:137 builtin/pull.c:209 |
cfff71a9 JX |
7990 | msgid "accept refs that update .git/shallow" |
7991 | msgstr "接受更新 .git/shallow 的引用" | |
7992 | ||
a0b6b246 | 7993 | #: builtin/fetch.c:138 builtin/pull.c:211 |
6acbf033 JX |
7994 | msgid "refmap" |
7995 | msgstr "引用映射" | |
7996 | ||
a0b6b246 | 7997 | #: builtin/fetch.c:139 builtin/pull.c:212 |
6acbf033 JX |
7998 | msgid "specify fetch refmap" |
7999 | msgstr "指定获取操作的引用映射" | |
8000 | ||
1a79b2f1 | 8001 | #: builtin/fetch.c:395 |
c04f5ac3 JX |
8002 | msgid "Couldn't find remote ref HEAD" |
8003 | msgstr "无法发现远程 HEAD 引用" | |
8004 | ||
87cb7997 | 8005 | #: builtin/fetch.c:513 |
5c57d762 JX |
8006 | #, c-format |
8007 | msgid "configuration fetch.output contains invalid value %s" | |
8008 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
8009 | ||
87cb7997 | 8010 | #: builtin/fetch.c:606 |
c04f5ac3 JX |
8011 | #, c-format |
8012 | msgid "object %s not found" | |
8013 | msgstr "对象 %s 未发现" | |
8014 | ||
87cb7997 | 8015 | #: builtin/fetch.c:610 |
c04f5ac3 JX |
8016 | msgid "[up to date]" |
8017 | msgstr "[最新]" | |
8018 | ||
87cb7997 | 8019 | #: builtin/fetch.c:623 builtin/fetch.c:703 |
c04f5ac3 JX |
8020 | msgid "[rejected]" |
8021 | msgstr "[已拒绝]" | |
8022 | ||
87cb7997 | 8023 | #: builtin/fetch.c:624 |
5c57d762 | 8024 | msgid "can't fetch in current branch" |
9a4b694c | 8025 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 8026 | |
87cb7997 | 8027 | #: builtin/fetch.c:633 |
c04f5ac3 | 8028 | msgid "[tag update]" |
55a16ee4 | 8029 | msgstr "[标签更新]" |
c04f5ac3 | 8030 | |
87cb7997 JX |
8031 | #: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 |
8032 | #: builtin/fetch.c:698 | |
5c57d762 JX |
8033 | msgid "unable to update local ref" |
8034 | msgstr "不能更新本地引用" | |
c04f5ac3 | 8035 | |
87cb7997 | 8036 | #: builtin/fetch.c:653 |
c04f5ac3 | 8037 | msgid "[new tag]" |
55a16ee4 | 8038 | msgstr "[新标签]" |
c04f5ac3 | 8039 | |
87cb7997 | 8040 | #: builtin/fetch.c:656 |
c04f5ac3 JX |
8041 | msgid "[new branch]" |
8042 | msgstr "[新分支]" | |
8043 | ||
87cb7997 | 8044 | #: builtin/fetch.c:659 |
170e9899 JX |
8045 | msgid "[new ref]" |
8046 | msgstr "[新引用]" | |
8047 | ||
87cb7997 | 8048 | #: builtin/fetch.c:698 |
c04f5ac3 JX |
8049 | msgid "forced update" |
8050 | msgstr "强制更新" | |
8051 | ||
87cb7997 | 8052 | #: builtin/fetch.c:703 |
5c57d762 JX |
8053 | msgid "non-fast-forward" |
8054 | msgstr "非快进" | |
c04f5ac3 | 8055 | |
87cb7997 | 8056 | #: builtin/fetch.c:748 |
c04f5ac3 JX |
8057 | #, c-format |
8058 | msgid "%s did not send all necessary objects\n" | |
8059 | msgstr "%s 未发送所有必须的对象\n" | |
8060 | ||
87cb7997 | 8061 | #: builtin/fetch.c:768 |
cfff71a9 JX |
8062 | #, c-format |
8063 | msgid "reject %s because shallow roots are not allowed to be updated" | |
8064 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
8065 | ||
87cb7997 | 8066 | #: builtin/fetch.c:855 builtin/fetch.c:951 |
c04f5ac3 JX |
8067 | #, c-format |
8068 | msgid "From %.*s\n" | |
8069 | msgstr "来自 %.*s\n" | |
8070 | ||
87cb7997 | 8071 | #: builtin/fetch.c:866 |
c04f5ac3 JX |
8072 | #, c-format |
8073 | msgid "" | |
8074 | "some local refs could not be updated; try running\n" | |
8075 | " 'git remote prune %s' to remove any old, conflicting branches" | |
8076 | msgstr "" | |
8077 | "一些本地引用不能被更新;尝试运行\n" | |
8078 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
8079 | ||
90e6ef53 | 8080 | # 译者:注意保持前导空格 |
87cb7997 | 8081 | #: builtin/fetch.c:921 |
81809b99 | 8082 | #, c-format |
8ada9598 | 8083 | msgid " (%s will become dangling)" |
07432cef | 8084 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 8085 | |
90e6ef53 | 8086 | # 译者:注意保持前导空格 |
87cb7997 | 8087 | #: builtin/fetch.c:922 |
81809b99 | 8088 | #, c-format |
8ada9598 | 8089 | msgid " (%s has become dangling)" |
07432cef | 8090 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 8091 | |
87cb7997 | 8092 | #: builtin/fetch.c:954 |
c04f5ac3 JX |
8093 | msgid "[deleted]" |
8094 | msgstr "[已删除]" | |
8095 | ||
87cb7997 | 8096 | #: builtin/fetch.c:955 builtin/remote.c:1022 |
c04f5ac3 JX |
8097 | msgid "(none)" |
8098 | msgstr "(无)" | |
8099 | ||
87cb7997 | 8100 | #: builtin/fetch.c:978 |
c04f5ac3 JX |
8101 | #, c-format |
8102 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 8103 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 8104 | |
87cb7997 | 8105 | #: builtin/fetch.c:997 |
c04f5ac3 JX |
8106 | #, c-format |
8107 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
8108 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
8109 | ||
87cb7997 | 8110 | #: builtin/fetch.c:1000 |
c04f5ac3 JX |
8111 | #, c-format |
8112 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 8113 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 8114 | |
87cb7997 | 8115 | #: builtin/fetch.c:1076 |
90314792 JX |
8116 | #, c-format |
8117 | msgid "Don't know how to fetch from %s" | |
8118 | msgstr "不知道如何从 %s 获取" | |
8119 | ||
87cb7997 | 8120 | #: builtin/fetch.c:1236 |
c04f5ac3 JX |
8121 | #, c-format |
8122 | msgid "Fetching %s\n" | |
d4a8e00b | 8123 | msgstr "正在获取 %s\n" |
c04f5ac3 | 8124 | |
87cb7997 | 8125 | #: builtin/fetch.c:1238 builtin/remote.c:96 |
c04f5ac3 JX |
8126 | #, c-format |
8127 | msgid "Could not fetch %s" | |
8128 | msgstr "不能获取 %s" | |
8129 | ||
87cb7997 | 8130 | #: builtin/fetch.c:1256 |
c04f5ac3 JX |
8131 | msgid "" |
8132 | "No remote repository specified. Please, specify either a URL or a\n" | |
8133 | "remote name from which new revisions should be fetched." | |
4375c10e | 8134 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 8135 | |
87cb7997 | 8136 | #: builtin/fetch.c:1279 |
c04f5ac3 | 8137 | msgid "You need to specify a tag name." |
55a16ee4 | 8138 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 8139 | |
87cb7997 | 8140 | #: builtin/fetch.c:1321 |
a0b6b246 JX |
8141 | msgid "Negative depth in --deepen is not supported" |
8142 | msgstr "--deepen 不支持负数深度" | |
8143 | ||
87cb7997 | 8144 | #: builtin/fetch.c:1323 |
a0b6b246 JX |
8145 | msgid "--deepen and --depth are mutually exclusive" |
8146 | msgstr "--deepen 和 --depth 是互斥的" | |
8147 | ||
87cb7997 | 8148 | #: builtin/fetch.c:1328 |
a77c07d9 JX |
8149 | msgid "--depth and --unshallow cannot be used together" |
8150 | msgstr "--depth 和 --unshallow 不能同时使用" | |
8151 | ||
87cb7997 | 8152 | #: builtin/fetch.c:1330 |
a77c07d9 | 8153 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 8154 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 8155 | |
87cb7997 | 8156 | #: builtin/fetch.c:1352 |
c04f5ac3 | 8157 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 8158 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 8159 | |
87cb7997 | 8160 | #: builtin/fetch.c:1354 |
c04f5ac3 | 8161 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 8162 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 8163 | |
87cb7997 | 8164 | #: builtin/fetch.c:1365 |
c04f5ac3 JX |
8165 | #, c-format |
8166 | msgid "No such remote or remote group: %s" | |
8167 | msgstr "没有这样的远程或远程组:%s" | |
8168 | ||
87cb7997 | 8169 | #: builtin/fetch.c:1373 |
c04f5ac3 | 8170 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 8171 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 8172 | |
1b7f4a34 | 8173 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
8174 | msgid "" |
8175 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
8176 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 8177 | |
a0b6b246 | 8178 | #: builtin/fmt-merge-msg.c:663 |
ef317cd5 | 8179 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 8180 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 8181 | |
a0b6b246 | 8182 | #: builtin/fmt-merge-msg.c:666 |
ef317cd5 | 8183 | msgid "alias for --log (deprecated)" |
07432cef | 8184 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 8185 | |
a0b6b246 | 8186 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 8187 | msgid "text" |
07432cef | 8188 | msgstr "文本" |
ef317cd5 | 8189 | |
a0b6b246 | 8190 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 8191 | msgid "use <text> as start of message" |
07432cef | 8192 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 8193 | |
a0b6b246 | 8194 | #: builtin/fmt-merge-msg.c:671 |
ef317cd5 | 8195 | msgid "file to read from" |
07432cef | 8196 | msgstr "从文件中读取" |
ef317cd5 | 8197 | |
1b7f4a34 | 8198 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
8199 | msgid "git for-each-ref [<options>] [<pattern>]" |
8200 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 8201 | |
94550ed3 JX |
8202 | #: builtin/for-each-ref.c:10 |
8203 | msgid "git for-each-ref [--points-at <object>]" | |
8204 | msgstr "git for-each-ref [--points-at <对象>]" | |
8205 | ||
8206 | #: builtin/for-each-ref.c:11 | |
87cb7997 JX |
8207 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
8208 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 JX |
8209 | |
8210 | #: builtin/for-each-ref.c:12 | |
87cb7997 JX |
8211 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
8212 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 JX |
8213 | |
8214 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 8215 | msgid "quote placeholders suitably for shells" |
07432cef | 8216 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 8217 | |
94550ed3 | 8218 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 8219 | msgid "quote placeholders suitably for perl" |
07432cef | 8220 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 8221 | |
94550ed3 | 8222 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 8223 | msgid "quote placeholders suitably for python" |
07432cef | 8224 | msgstr "引用占位符适用于 python" |
ef317cd5 | 8225 | |
94550ed3 | 8226 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
8227 | msgid "quote placeholders suitably for Tcl" |
8228 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 8229 | |
94550ed3 | 8230 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 8231 | msgid "show only <n> matched refs" |
07432cef | 8232 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 8233 | |
94550ed3 JX |
8234 | #: builtin/for-each-ref.c:41 |
8235 | msgid "print only refs which points at the given object" | |
8236 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 8237 | |
94550ed3 JX |
8238 | #: builtin/for-each-ref.c:43 |
8239 | msgid "print only refs that are merged" | |
8240 | msgstr "只打印已经合并的引用" | |
8241 | ||
8242 | #: builtin/for-each-ref.c:44 | |
8243 | msgid "print only refs that are not merged" | |
8244 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 8245 | |
94550ed3 JX |
8246 | #: builtin/for-each-ref.c:45 |
8247 | msgid "print only refs which contain the commit" | |
8248 | msgstr "只打印包含该提交的引用" | |
8249 | ||
87cb7997 JX |
8250 | #: builtin/for-each-ref.c:46 |
8251 | msgid "print only refs which don't contain the commit" | |
8252 | msgstr "只打印不包含该提交的引用" | |
8253 | ||
1a79b2f1 | 8254 | #: builtin/fsck.c:554 |
6c94aba5 JX |
8255 | msgid "Checking object directories" |
8256 | msgstr "检查对象目录中" | |
8257 | ||
1a79b2f1 | 8258 | #: builtin/fsck.c:646 |
814ff314 JX |
8259 | msgid "git fsck [<options>] [<object>...]" |
8260 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 8261 | |
1a79b2f1 | 8262 | #: builtin/fsck.c:652 |
ef317cd5 | 8263 | msgid "show unreachable objects" |
07432cef | 8264 | msgstr "显示不可达的对象" |
ef317cd5 | 8265 | |
1a79b2f1 | 8266 | #: builtin/fsck.c:653 |
ef317cd5 | 8267 | msgid "show dangling objects" |
07432cef | 8268 | msgstr "显示摇摆的对象" |
ef317cd5 | 8269 | |
1a79b2f1 | 8270 | #: builtin/fsck.c:654 |
ef317cd5 | 8271 | msgid "report tags" |
55a16ee4 | 8272 | msgstr "报告标签" |
ef317cd5 | 8273 | |
1a79b2f1 | 8274 | #: builtin/fsck.c:655 |
ef317cd5 | 8275 | msgid "report root nodes" |
07432cef | 8276 | msgstr "报告根节点" |
ef317cd5 | 8277 | |
1a79b2f1 | 8278 | #: builtin/fsck.c:656 |
ef317cd5 | 8279 | msgid "make index objects head nodes" |
07432cef | 8280 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 8281 | |
1a79b2f1 | 8282 | #: builtin/fsck.c:657 |
ef317cd5 | 8283 | msgid "make reflogs head nodes (default)" |
07432cef | 8284 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 8285 | |
1a79b2f1 | 8286 | #: builtin/fsck.c:658 |
ef317cd5 | 8287 | msgid "also consider packs and alternate objects" |
07432cef | 8288 | msgstr "也考虑包和备用对象" |
ef317cd5 | 8289 | |
1a79b2f1 | 8290 | #: builtin/fsck.c:659 |
1b7f4a34 JX |
8291 | msgid "check only connectivity" |
8292 | msgstr "仅检查连通性" | |
8293 | ||
1a79b2f1 | 8294 | #: builtin/fsck.c:660 |
ef317cd5 | 8295 | msgid "enable more strict checking" |
07432cef | 8296 | msgstr "启用更严格的检查" |
ef317cd5 | 8297 | |
1a79b2f1 | 8298 | #: builtin/fsck.c:662 |
ef317cd5 | 8299 | msgid "write dangling objects in .git/lost-found" |
07432cef | 8300 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 8301 | |
1a79b2f1 | 8302 | #: builtin/fsck.c:663 builtin/prune.c:107 |
ef317cd5 | 8303 | msgid "show progress" |
07432cef | 8304 | msgstr "显示进度" |
ef317cd5 | 8305 | |
1a79b2f1 | 8306 | #: builtin/fsck.c:664 |
5c57d762 JX |
8307 | msgid "show verbose names for reachable objects" |
8308 | msgstr "显示可达对象的详细名称" | |
8309 | ||
1a79b2f1 | 8310 | #: builtin/fsck.c:725 |
6c94aba5 JX |
8311 | msgid "Checking objects" |
8312 | msgstr "检查对象中" | |
8313 | ||
1b7f4a34 | 8314 | #: builtin/gc.c:25 |
814ff314 JX |
8315 | msgid "git gc [<options>]" |
8316 | msgstr "git gc [<选项>]" | |
ef317cd5 | 8317 | |
87cb7997 | 8318 | #: builtin/gc.c:78 |
c04f5ac3 | 8319 | #, c-format |
87cb7997 JX |
8320 | msgid "Failed to fstat %s: %s" |
8321 | msgstr "无法获取 %s 状态:%s" | |
c04f5ac3 | 8322 | |
87cb7997 | 8323 | #: builtin/gc.c:306 |
c04f5ac3 | 8324 | #, c-format |
87cb7997 JX |
8325 | msgid "Can't stat %s" |
8326 | msgstr "不能获取 %s 状态" | |
c04f5ac3 | 8327 | |
87cb7997 | 8328 | #: builtin/gc.c:315 |
94550ed3 JX |
8329 | #, c-format |
8330 | msgid "" | |
8331 | "The last gc run reported the following. Please correct the root cause\n" | |
8332 | "and remove %s.\n" | |
8333 | "Automatic cleanup will not be performed until the file is removed.\n" | |
8334 | "\n" | |
8335 | "%s" | |
8336 | msgstr "" | |
8337 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
8338 | "在该文件被删除之前,自动清理将不会执行。\n" | |
8339 | "\n" | |
8340 | "%s" | |
8341 | ||
87cb7997 | 8342 | #: builtin/gc.c:354 |
ef317cd5 | 8343 | msgid "prune unreferenced objects" |
07432cef | 8344 | msgstr "清除未引用的对象" |
ef317cd5 | 8345 | |
87cb7997 | 8346 | #: builtin/gc.c:356 |
ef317cd5 | 8347 | msgid "be more thorough (increased runtime)" |
07432cef | 8348 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 8349 | |
87cb7997 | 8350 | #: builtin/gc.c:357 |
ef317cd5 | 8351 | msgid "enable auto-gc mode" |
07432cef | 8352 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 8353 | |
87cb7997 | 8354 | #: builtin/gc.c:358 |
90314792 JX |
8355 | msgid "force running gc even if there may be another gc running" |
8356 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
8357 | ||
87cb7997 JX |
8358 | #: builtin/gc.c:375 |
8359 | #, c-format | |
8360 | msgid "Failed to parse gc.logexpiry value %s" | |
8361 | msgstr "无法解析 gc.logexpiry 的值 %s" | |
8362 | ||
8363 | #: builtin/gc.c:403 | |
c04f5ac3 | 8364 | #, c-format |
6c94aba5 | 8365 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 8366 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 8367 | |
87cb7997 | 8368 | #: builtin/gc.c:405 |
6c94aba5 JX |
8369 | #, c-format |
8370 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 8371 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 8372 | |
87cb7997 | 8373 | #: builtin/gc.c:406 |
6c94aba5 JX |
8374 | #, c-format |
8375 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
8376 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 8377 | |
87cb7997 | 8378 | #: builtin/gc.c:427 |
90314792 JX |
8379 | #, c-format |
8380 | msgid "" | |
8381 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
8382 | msgstr "" | |
29004bbb | 8383 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 8384 | |
87cb7997 | 8385 | #: builtin/gc.c:471 |
c04f5ac3 JX |
8386 | msgid "" |
8387 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 8388 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 8389 | |
1a79b2f1 | 8390 | #: builtin/grep.c:25 |
814ff314 JX |
8391 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
8392 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 8393 | |
1a79b2f1 | 8394 | #: builtin/grep.c:232 |
c04f5ac3 JX |
8395 | #, c-format |
8396 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 8397 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 8398 | |
1a79b2f1 | 8399 | #: builtin/grep.c:290 |
276ceeaa JX |
8400 | #, c-format |
8401 | msgid "invalid number of threads specified (%d) for %s" | |
8402 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
8403 | ||
87cb7997 | 8404 | #: builtin/grep.c:769 builtin/grep.c:810 |
c04f5ac3 JX |
8405 | #, c-format |
8406 | msgid "unable to read tree (%s)" | |
90e6ef53 | 8407 | msgstr "无法读取树(%s)" |
c04f5ac3 | 8408 | |
87cb7997 | 8409 | #: builtin/grep.c:829 |
c04f5ac3 JX |
8410 | #, c-format |
8411 | msgid "unable to grep from object of type %s" | |
8412 | msgstr "无法抓取来自于 %s 类型的对象" | |
8413 | ||
87cb7997 | 8414 | #: builtin/grep.c:893 |
c04f5ac3 JX |
8415 | #, c-format |
8416 | msgid "switch `%c' expects a numerical value" | |
8417 | msgstr "开关 `%c' 期望一个数字值" | |
8418 | ||
87cb7997 | 8419 | #: builtin/grep.c:980 |
ef317cd5 | 8420 | msgid "search in index instead of in the work tree" |
07432cef | 8421 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 8422 | |
87cb7997 | 8423 | #: builtin/grep.c:982 |
ef317cd5 | 8424 | msgid "find in contents not managed by git" |
07432cef | 8425 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
8426 | |
8427 | # 译者:中文字符串拼接,可删除前导空格 | |
87cb7997 | 8428 | #: builtin/grep.c:984 |
ef317cd5 | 8429 | msgid "search in both tracked and untracked files" |
07432cef | 8430 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 8431 | |
87cb7997 | 8432 | #: builtin/grep.c:986 |
814ff314 JX |
8433 | msgid "ignore files specified via '.gitignore'" |
8434 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 8435 | |
87cb7997 JX |
8436 | #: builtin/grep.c:988 |
8437 | msgid "recursively search in each submodule" | |
1a79b2f1 JX |
8438 | msgstr "在每一个子模组中递归搜索" |
8439 | ||
87cb7997 | 8440 | #: builtin/grep.c:990 |
1a79b2f1 JX |
8441 | msgid "basename" |
8442 | msgstr "基本名" | |
8443 | ||
87cb7997 | 8444 | #: builtin/grep.c:991 |
1a79b2f1 JX |
8445 | msgid "prepend parent project's basename to output" |
8446 | msgstr "在输出中以父项目的基本名为前缀" | |
8447 | ||
87cb7997 | 8448 | #: builtin/grep.c:994 |
ef317cd5 | 8449 | msgid "show non-matching lines" |
07432cef | 8450 | msgstr "显示未匹配的行" |
ef317cd5 | 8451 | |
87cb7997 | 8452 | #: builtin/grep.c:996 |
ef317cd5 | 8453 | msgid "case insensitive matching" |
07432cef | 8454 | msgstr "不区分大小写匹配" |
ef317cd5 | 8455 | |
87cb7997 | 8456 | #: builtin/grep.c:998 |
ef317cd5 | 8457 | msgid "match patterns only at word boundaries" |
07432cef | 8458 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 8459 | |
87cb7997 | 8460 | #: builtin/grep.c:1000 |
ef317cd5 | 8461 | msgid "process binary files as text" |
07432cef | 8462 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 8463 | |
87cb7997 | 8464 | #: builtin/grep.c:1002 |
ef317cd5 | 8465 | msgid "don't match patterns in binary files" |
07432cef | 8466 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 8467 | |
87cb7997 | 8468 | #: builtin/grep.c:1005 |
90314792 JX |
8469 | msgid "process binary files with textconv filters" |
8470 | msgstr "用 textconv 过滤器处理二进制文件" | |
8471 | ||
87cb7997 | 8472 | #: builtin/grep.c:1007 |
ef317cd5 | 8473 | msgid "descend at most <depth> levels" |
07432cef | 8474 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 8475 | |
87cb7997 | 8476 | #: builtin/grep.c:1011 |
ef317cd5 | 8477 | msgid "use extended POSIX regular expressions" |
07432cef | 8478 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 8479 | |
87cb7997 | 8480 | #: builtin/grep.c:1014 |
ef317cd5 | 8481 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 8482 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 8483 | |
87cb7997 | 8484 | #: builtin/grep.c:1017 |
ef317cd5 | 8485 | msgid "interpret patterns as fixed strings" |
07432cef | 8486 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 8487 | |
87cb7997 | 8488 | #: builtin/grep.c:1020 |
ef317cd5 | 8489 | msgid "use Perl-compatible regular expressions" |
07432cef | 8490 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 8491 | |
87cb7997 | 8492 | #: builtin/grep.c:1023 |
ef317cd5 | 8493 | msgid "show line numbers" |
07432cef | 8494 | msgstr "显示行号" |
ef317cd5 | 8495 | |
87cb7997 | 8496 | #: builtin/grep.c:1024 |
ef317cd5 | 8497 | msgid "don't show filenames" |
07432cef | 8498 | msgstr "不显示文件名" |
ef317cd5 | 8499 | |
87cb7997 | 8500 | #: builtin/grep.c:1025 |
ef317cd5 | 8501 | msgid "show filenames" |
07432cef | 8502 | msgstr "显示文件名" |
ef317cd5 | 8503 | |
87cb7997 | 8504 | #: builtin/grep.c:1027 |
ef317cd5 | 8505 | msgid "show filenames relative to top directory" |
07432cef | 8506 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 8507 | |
87cb7997 | 8508 | #: builtin/grep.c:1029 |
ef317cd5 | 8509 | msgid "show only filenames instead of matching lines" |
07432cef | 8510 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 8511 | |
87cb7997 | 8512 | #: builtin/grep.c:1031 |
ef317cd5 | 8513 | msgid "synonym for --files-with-matches" |
07432cef | 8514 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 8515 | |
87cb7997 | 8516 | #: builtin/grep.c:1034 |
ef317cd5 | 8517 | msgid "show only the names of files without match" |
07432cef | 8518 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 8519 | |
87cb7997 | 8520 | #: builtin/grep.c:1036 |
ef317cd5 | 8521 | msgid "print NUL after filenames" |
07432cef | 8522 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 8523 | |
87cb7997 | 8524 | #: builtin/grep.c:1038 |
ef317cd5 | 8525 | msgid "show the number of matches instead of matching lines" |
07432cef | 8526 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 8527 | |
87cb7997 | 8528 | #: builtin/grep.c:1039 |
ef317cd5 | 8529 | msgid "highlight matches" |
07432cef | 8530 | msgstr "高亮显示匹配项" |
ef317cd5 | 8531 | |
87cb7997 | 8532 | #: builtin/grep.c:1041 |
ef317cd5 | 8533 | msgid "print empty line between matches from different files" |
07432cef | 8534 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 8535 | |
87cb7997 | 8536 | #: builtin/grep.c:1043 |
ef317cd5 | 8537 | msgid "show filename only once above matches from same file" |
07432cef | 8538 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 8539 | |
87cb7997 | 8540 | #: builtin/grep.c:1046 |
ef317cd5 | 8541 | msgid "show <n> context lines before and after matches" |
07432cef | 8542 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 8543 | |
87cb7997 | 8544 | #: builtin/grep.c:1049 |
ef317cd5 | 8545 | msgid "show <n> context lines before matches" |
07432cef | 8546 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 8547 | |
87cb7997 | 8548 | #: builtin/grep.c:1051 |
ef317cd5 | 8549 | msgid "show <n> context lines after matches" |
07432cef | 8550 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 8551 | |
87cb7997 | 8552 | #: builtin/grep.c:1053 |
276ceeaa JX |
8553 | msgid "use <n> worker threads" |
8554 | msgstr "使用 <n> 个工作线程" | |
8555 | ||
87cb7997 | 8556 | #: builtin/grep.c:1054 |
ef317cd5 | 8557 | msgid "shortcut for -C NUM" |
07432cef | 8558 | msgstr "快捷键 -C 数字" |
ef317cd5 | 8559 | |
87cb7997 | 8560 | #: builtin/grep.c:1057 |
ef317cd5 | 8561 | msgid "show a line with the function name before matches" |
07432cef | 8562 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 8563 | |
87cb7997 | 8564 | #: builtin/grep.c:1059 |
ef317cd5 | 8565 | msgid "show the surrounding function" |
07432cef | 8566 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 8567 | |
87cb7997 | 8568 | #: builtin/grep.c:1062 |
ef317cd5 | 8569 | msgid "read patterns from file" |
07432cef | 8570 | msgstr "从文件读取模式" |
ef317cd5 | 8571 | |
87cb7997 | 8572 | #: builtin/grep.c:1064 |
ef317cd5 | 8573 | msgid "match <pattern>" |
07432cef | 8574 | msgstr "匹配 <模式>" |
ef317cd5 | 8575 | |
87cb7997 | 8576 | #: builtin/grep.c:1066 |
ef317cd5 | 8577 | msgid "combine patterns specified with -e" |
07432cef | 8578 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 8579 | |
87cb7997 | 8580 | #: builtin/grep.c:1078 |
ef317cd5 | 8581 | msgid "indicate hit with exit status without output" |
07432cef | 8582 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 8583 | |
87cb7997 | 8584 | #: builtin/grep.c:1080 |
ef317cd5 | 8585 | msgid "show only matches from files that match all patterns" |
07432cef | 8586 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 8587 | |
87cb7997 | 8588 | #: builtin/grep.c:1082 |
07432cef WS |
8589 | msgid "show parse tree for grep expression" |
8590 | msgstr "显示 grep 表达式的解析树" | |
8591 | ||
87cb7997 | 8592 | #: builtin/grep.c:1086 |
ef317cd5 | 8593 | msgid "pager" |
07432cef | 8594 | msgstr "分页" |
ef317cd5 | 8595 | |
87cb7997 | 8596 | #: builtin/grep.c:1086 |
ef317cd5 | 8597 | msgid "show matching files in the pager" |
07432cef | 8598 | msgstr "分页显示匹配的文件" |
ef317cd5 | 8599 | |
87cb7997 | 8600 | #: builtin/grep.c:1089 |
ef317cd5 | 8601 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 8602 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 8603 | |
87cb7997 | 8604 | #: builtin/grep.c:1153 |
c04f5ac3 JX |
8605 | msgid "no pattern given." |
8606 | msgstr "未提供模式匹配。" | |
8607 | ||
87cb7997 JX |
8608 | #: builtin/grep.c:1189 |
8609 | msgid "--no-index or --untracked cannot be used with revs" | |
8610 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
8611 | ||
8612 | #: builtin/grep.c:1195 | |
8613 | #, c-format | |
8614 | msgid "unable to resolve revision: %s" | |
8615 | msgstr "不能解析版本:%s" | |
8616 | ||
8617 | #: builtin/grep.c:1228 builtin/index-pack.c:1485 | |
276ceeaa JX |
8618 | #, c-format |
8619 | msgid "invalid number of threads specified (%d)" | |
8620 | msgstr "指定的线程数无效(%d)" | |
8621 | ||
87cb7997 | 8622 | #: builtin/grep.c:1251 |
c04f5ac3 JX |
8623 | msgid "--open-files-in-pager only works on the worktree" |
8624 | msgstr "--open-files-in-pager 仅用于工作区" | |
8625 | ||
87cb7997 | 8626 | #: builtin/grep.c:1274 |
1a79b2f1 JX |
8627 | msgid "option not supported with --recurse-submodules." |
8628 | msgstr "选项不支持和 --recurse-submodules 共用。" | |
8629 | ||
87cb7997 | 8630 | #: builtin/grep.c:1280 |
c04f5ac3 | 8631 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 8632 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 8633 | |
87cb7997 | 8634 | #: builtin/grep.c:1286 |
c04f5ac3 | 8635 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 8636 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 8637 | |
87cb7997 | 8638 | #: builtin/grep.c:1294 |
c04f5ac3 JX |
8639 | msgid "both --cached and trees are given." |
8640 | msgstr "同时给出了 --cached 和树对象。" | |
8641 | ||
276ceeaa | 8642 | #: builtin/hash-object.c:81 |
ef317cd5 | 8643 | msgid "" |
814ff314 JX |
8644 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
8645 | "[--] <file>..." | |
ef317cd5 | 8646 | msgstr "" |
814ff314 JX |
8647 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
8648 | "[--] <文件>..." | |
ef317cd5 | 8649 | |
276ceeaa | 8650 | #: builtin/hash-object.c:82 |
94550ed3 JX |
8651 | msgid "git hash-object --stdin-paths" |
8652 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 8653 | |
a0b6b246 | 8654 | #: builtin/hash-object.c:94 |
ef317cd5 | 8655 | msgid "type" |
07432cef | 8656 | msgstr "类型" |
ef317cd5 | 8657 | |
a0b6b246 | 8658 | #: builtin/hash-object.c:94 |
ef317cd5 | 8659 | msgid "object type" |
07432cef | 8660 | msgstr "对象类型" |
ef317cd5 | 8661 | |
a0b6b246 | 8662 | #: builtin/hash-object.c:95 |
ef317cd5 | 8663 | msgid "write the object into the object database" |
07432cef | 8664 | msgstr "将对象写入对象数据库" |
ef317cd5 | 8665 | |
a0b6b246 | 8666 | #: builtin/hash-object.c:97 |
ef317cd5 | 8667 | msgid "read the object from stdin" |
07432cef | 8668 | msgstr "从标准输入读取对象" |
ef317cd5 | 8669 | |
a0b6b246 | 8670 | #: builtin/hash-object.c:99 |
ef317cd5 | 8671 | msgid "store file as is without filters" |
07432cef | 8672 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 8673 | |
a0b6b246 | 8674 | #: builtin/hash-object.c:100 |
220c313c JX |
8675 | msgid "" |
8676 | "just hash any random garbage to create corrupt objects for debugging Git" | |
8677 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
8678 | ||
a0b6b246 | 8679 | #: builtin/hash-object.c:101 |
ef317cd5 | 8680 | msgid "process file as it were from this path" |
07432cef | 8681 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 8682 | |
a0b6b246 | 8683 | #: builtin/help.c:42 |
ef317cd5 | 8684 | msgid "print all available commands" |
07432cef | 8685 | msgstr "打印所有可用的命令" |
ef317cd5 | 8686 | |
a0b6b246 JX |
8687 | #: builtin/help.c:43 |
8688 | msgid "exclude guides" | |
8689 | msgstr "排除向导" | |
8690 | ||
8691 | #: builtin/help.c:44 | |
4dcdc3d8 JX |
8692 | msgid "print list of useful guides" |
8693 | msgstr "显示有用的指南列表" | |
8694 | ||
a0b6b246 | 8695 | #: builtin/help.c:45 |
ef317cd5 | 8696 | msgid "show man page" |
07432cef | 8697 | msgstr "显示 man 手册" |
ef317cd5 | 8698 | |
a0b6b246 | 8699 | #: builtin/help.c:46 |
ef317cd5 | 8700 | msgid "show manual in web browser" |
07432cef | 8701 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 8702 | |
a0b6b246 | 8703 | #: builtin/help.c:48 |
ef317cd5 | 8704 | msgid "show info page" |
07432cef | 8705 | msgstr "显示 info 手册" |
ef317cd5 | 8706 | |
a0b6b246 | 8707 | #: builtin/help.c:54 |
814ff314 JX |
8708 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
8709 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 8710 | |
a0b6b246 | 8711 | #: builtin/help.c:66 |
81809b99 | 8712 | #, c-format |
8ada9598 | 8713 | msgid "unrecognized help format '%s'" |
81809b99 | 8714 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 8715 | |
a0b6b246 | 8716 | #: builtin/help.c:93 |
8ada9598 | 8717 | msgid "Failed to start emacsclient." |
81809b99 | 8718 | msgstr "无法启动 emacsclient。" |
8ada9598 | 8719 | |
a0b6b246 | 8720 | #: builtin/help.c:106 |
8ada9598 | 8721 | msgid "Failed to parse emacsclient version." |
81809b99 | 8722 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 8723 | |
a0b6b246 | 8724 | #: builtin/help.c:114 |
8ada9598 JX |
8725 | #, c-format |
8726 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 8727 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 8728 | |
a0b6b246 | 8729 | #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 |
81809b99 | 8730 | #, c-format |
5b04ee3b JX |
8731 | msgid "failed to exec '%s'" |
8732 | msgstr "无法执行 '%s'" | |
8ada9598 | 8733 | |
a0b6b246 | 8734 | #: builtin/help.c:207 |
8ada9598 JX |
8735 | #, c-format |
8736 | msgid "" | |
8737 | "'%s': path for unsupported man viewer.\n" | |
8738 | "Please consider using 'man.<tool>.cmd' instead." | |
8739 | msgstr "" | |
81809b99 | 8740 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 8741 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 8742 | |
a0b6b246 | 8743 | #: builtin/help.c:219 |
8ada9598 JX |
8744 | #, c-format |
8745 | msgid "" | |
8746 | "'%s': cmd for supported man viewer.\n" | |
8747 | "Please consider using 'man.<tool>.path' instead." | |
8748 | msgstr "" | |
81809b99 | 8749 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 8750 | "请使用 'man.<工具>.path'。" |
8ada9598 | 8751 | |
a0b6b246 | 8752 | #: builtin/help.c:336 |
8ada9598 JX |
8753 | #, c-format |
8754 | msgid "'%s': unknown man viewer." | |
81809b99 | 8755 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 8756 | |
a0b6b246 | 8757 | #: builtin/help.c:353 |
8ada9598 | 8758 | msgid "no man viewer handled the request" |
81809b99 | 8759 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 8760 | |
a0b6b246 | 8761 | #: builtin/help.c:361 |
8ada9598 | 8762 | msgid "no info viewer handled the request" |
81809b99 | 8763 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 8764 | |
a0b6b246 | 8765 | #: builtin/help.c:403 |
4dcdc3d8 JX |
8766 | msgid "Defining attributes per path" |
8767 | msgstr "定义路径的属性" | |
8768 | ||
a0b6b246 | 8769 | #: builtin/help.c:404 |
220c313c JX |
8770 | msgid "Everyday Git With 20 Commands Or So" |
8771 | msgstr "每一天 Git 常用的约 20 条命令" | |
8772 | ||
a0b6b246 | 8773 | #: builtin/help.c:405 |
4dcdc3d8 JX |
8774 | msgid "A Git glossary" |
8775 | msgstr "Git 词汇表" | |
8776 | ||
a0b6b246 | 8777 | #: builtin/help.c:406 |
4dcdc3d8 JX |
8778 | msgid "Specifies intentionally untracked files to ignore" |
8779 | msgstr "忽略指定的未跟踪文件" | |
8780 | ||
a0b6b246 | 8781 | #: builtin/help.c:407 |
4dcdc3d8 JX |
8782 | msgid "Defining submodule properties" |
8783 | msgstr "定义子模组属性" | |
8784 | ||
a0b6b246 | 8785 | #: builtin/help.c:408 |
4dcdc3d8 JX |
8786 | msgid "Specifying revisions and ranges for Git" |
8787 | msgstr "指定 Git 的版本和版本范围" | |
8788 | ||
a0b6b246 | 8789 | #: builtin/help.c:409 |
4dcdc3d8 JX |
8790 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
8791 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
8792 | ||
a0b6b246 | 8793 | #: builtin/help.c:410 |
4dcdc3d8 JX |
8794 | msgid "An overview of recommended workflows with Git" |
8795 | msgstr "Git 推荐的工作流概览" | |
8796 | ||
a0b6b246 | 8797 | #: builtin/help.c:422 |
4dcdc3d8 JX |
8798 | msgid "The common Git guides are:\n" |
8799 | msgstr "最常用的 Git 向导有:\n" | |
8800 | ||
a0b6b246 | 8801 | #: builtin/help.c:440 |
8ada9598 JX |
8802 | #, c-format |
8803 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 8804 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 8805 | |
a0b6b246 JX |
8806 | #: builtin/help.c:462 builtin/help.c:479 |
8807 | #, c-format | |
8808 | msgid "usage: %s%s" | |
8809 | msgstr "用法:%s%s" | |
8810 | ||
8811 | #: builtin/index-pack.c:154 | |
6acbf033 JX |
8812 | #, c-format |
8813 | msgid "unable to open %s" | |
8814 | msgstr "不能打开 %s" | |
8815 | ||
a0b6b246 | 8816 | #: builtin/index-pack.c:204 |
8ada9598 JX |
8817 | #, c-format |
8818 | msgid "object type mismatch at %s" | |
81809b99 | 8819 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 8820 | |
a0b6b246 | 8821 | #: builtin/index-pack.c:224 |
6acbf033 JX |
8822 | #, c-format |
8823 | msgid "did not receive expected object %s" | |
a0b6b246 | 8824 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 8825 | |
a0b6b246 | 8826 | #: builtin/index-pack.c:227 |
6acbf033 JX |
8827 | #, c-format |
8828 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 8829 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 8830 | |
a0b6b246 | 8831 | #: builtin/index-pack.c:269 |
81809b99 | 8832 | #, c-format |
8ada9598 JX |
8833 | msgid "cannot fill %d byte" |
8834 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 8835 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 8836 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 8837 | |
a0b6b246 | 8838 | #: builtin/index-pack.c:279 |
8ada9598 | 8839 | msgid "early EOF" |
81809b99 | 8840 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 8841 | |
a0b6b246 | 8842 | #: builtin/index-pack.c:280 |
8ada9598 | 8843 | msgid "read error on input" |
81809b99 | 8844 | msgstr "输入上的读错误" |
8ada9598 | 8845 | |
a0b6b246 | 8846 | #: builtin/index-pack.c:292 |
8ada9598 | 8847 | msgid "used more bytes than were available" |
81809b99 | 8848 | msgstr "用掉了超过可用的字节" |
8ada9598 | 8849 | |
a0b6b246 | 8850 | #: builtin/index-pack.c:299 |
8ada9598 | 8851 | msgid "pack too large for current definition of off_t" |
81809b99 | 8852 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 8853 | |
a0b6b246 JX |
8854 | #: builtin/index-pack.c:302 builtin/unpack-objects.c:92 |
8855 | msgid "pack exceeds maximum allowed size" | |
8856 | msgstr "包超过了最大允许值" | |
8857 | ||
8858 | #: builtin/index-pack.c:317 | |
81809b99 | 8859 | #, c-format |
8ada9598 | 8860 | msgid "unable to create '%s'" |
81809b99 | 8861 | msgstr "不能创建 '%s'" |
8ada9598 | 8862 | |
87cb7997 | 8863 | #: builtin/index-pack.c:323 |
81809b99 | 8864 | #, c-format |
8ada9598 | 8865 | msgid "cannot open packfile '%s'" |
81809b99 | 8866 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 8867 | |
87cb7997 | 8868 | #: builtin/index-pack.c:337 |
8ada9598 | 8869 | msgid "pack signature mismatch" |
81809b99 | 8870 | msgstr "包签名不匹配" |
8ada9598 | 8871 | |
87cb7997 | 8872 | #: builtin/index-pack.c:339 |
ef317cd5 JX |
8873 | #, c-format |
8874 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 8875 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 8876 | |
87cb7997 | 8877 | #: builtin/index-pack.c:357 |
8ada9598 | 8878 | #, c-format |
5c57d762 JX |
8879 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
8880 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 8881 | |
87cb7997 | 8882 | #: builtin/index-pack.c:479 |
8ada9598 JX |
8883 | #, c-format |
8884 | msgid "inflate returned %d" | |
81809b99 | 8885 | msgstr "解压缩返回 %d" |
8ada9598 | 8886 | |
87cb7997 | 8887 | #: builtin/index-pack.c:528 |
8ada9598 | 8888 | msgid "offset value overflow for delta base object" |
81809b99 | 8889 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 8890 | |
87cb7997 | 8891 | #: builtin/index-pack.c:536 |
8ada9598 | 8892 | msgid "delta base offset is out of bound" |
81809b99 | 8893 | msgstr "delta 基准偏移越界" |
8ada9598 | 8894 | |
87cb7997 | 8895 | #: builtin/index-pack.c:544 |
81809b99 | 8896 | #, c-format |
8ada9598 | 8897 | msgid "unknown object type %d" |
81809b99 | 8898 | msgstr "未知对象类型 %d" |
8ada9598 | 8899 | |
87cb7997 | 8900 | #: builtin/index-pack.c:575 |
8ada9598 | 8901 | msgid "cannot pread pack file" |
81809b99 | 8902 | msgstr "无法读取包文件" |
8ada9598 | 8903 | |
87cb7997 | 8904 | #: builtin/index-pack.c:577 |
8ada9598 | 8905 | #, c-format |
5c57d762 JX |
8906 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
8907 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
8908 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8909 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 8910 | |
87cb7997 | 8911 | #: builtin/index-pack.c:603 |
8ada9598 | 8912 | msgid "serious inflate inconsistency" |
81809b99 | 8913 | msgstr "解压缩严重的不一致" |
8ada9598 | 8914 | |
87cb7997 JX |
8915 | #: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 |
8916 | #: builtin/index-pack.c:816 builtin/index-pack.c:825 | |
8ada9598 JX |
8917 | #, c-format |
8918 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 8919 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 8920 | |
87cb7997 JX |
8921 | #: builtin/index-pack.c:752 builtin/pack-objects.c:164 |
8922 | #: builtin/pack-objects.c:257 | |
6792b93b JX |
8923 | #, c-format |
8924 | msgid "unable to read %s" | |
8925 | msgstr "不能读 %s" | |
8926 | ||
87cb7997 JX |
8927 | #: builtin/index-pack.c:814 |
8928 | #, c-format | |
8929 | msgid "cannot read existing object info %s" | |
8930 | msgstr "不能读取现存对象信息 %s" | |
8931 | ||
8932 | #: builtin/index-pack.c:822 | |
6792b93b JX |
8933 | #, c-format |
8934 | msgid "cannot read existing object %s" | |
8935 | msgstr "不能读取现存对象 %s" | |
8936 | ||
87cb7997 | 8937 | #: builtin/index-pack.c:836 |
81809b99 | 8938 | #, c-format |
8ada9598 | 8939 | msgid "invalid blob object %s" |
160fb2b2 | 8940 | msgstr "无效的数据对象 %s" |
8ada9598 | 8941 | |
87cb7997 | 8942 | #: builtin/index-pack.c:850 |
81809b99 | 8943 | #, c-format |
8ada9598 | 8944 | msgid "invalid %s" |
81809b99 | 8945 | msgstr "无效的 %s" |
8ada9598 | 8946 | |
87cb7997 | 8947 | #: builtin/index-pack.c:853 |
8ada9598 | 8948 | msgid "Error in object" |
81809b99 | 8949 | msgstr "对象中出错" |
8ada9598 | 8950 | |
87cb7997 | 8951 | #: builtin/index-pack.c:855 |
8ada9598 JX |
8952 | #, c-format |
8953 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 8954 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 8955 | |
87cb7997 | 8956 | #: builtin/index-pack.c:927 builtin/index-pack.c:958 |
8ada9598 | 8957 | msgid "failed to apply delta" |
81809b99 | 8958 | msgstr "无法应用 delta" |
8ada9598 | 8959 | |
87cb7997 | 8960 | #: builtin/index-pack.c:1128 |
8ada9598 | 8961 | msgid "Receiving objects" |
81809b99 | 8962 | msgstr "接收对象中" |
8ada9598 | 8963 | |
87cb7997 | 8964 | #: builtin/index-pack.c:1128 |
8ada9598 | 8965 | msgid "Indexing objects" |
81809b99 | 8966 | msgstr "索引对象中" |
8ada9598 | 8967 | |
87cb7997 | 8968 | #: builtin/index-pack.c:1160 |
8ada9598 | 8969 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 8970 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 8971 | |
87cb7997 | 8972 | #: builtin/index-pack.c:1165 |
8ada9598 | 8973 | msgid "cannot fstat packfile" |
81809b99 | 8974 | msgstr "不能枚举包文件状态" |
8ada9598 | 8975 | |
87cb7997 | 8976 | #: builtin/index-pack.c:1168 |
8ada9598 | 8977 | msgid "pack has junk at the end" |
81809b99 | 8978 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 8979 | |
87cb7997 | 8980 | #: builtin/index-pack.c:1179 |
6792b93b JX |
8981 | msgid "confusion beyond insanity in parse_pack_objects()" |
8982 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
8983 | ||
87cb7997 | 8984 | #: builtin/index-pack.c:1202 |
8ada9598 | 8985 | msgid "Resolving deltas" |
81809b99 | 8986 | msgstr "处理 delta 中" |
8ada9598 | 8987 | |
87cb7997 | 8988 | #: builtin/index-pack.c:1213 |
07432cef | 8989 | #, c-format |
ef317cd5 | 8990 | msgid "unable to create thread: %s" |
07432cef | 8991 | msgstr "不能创建线程:%s" |
ef317cd5 | 8992 | |
87cb7997 | 8993 | #: builtin/index-pack.c:1255 |
8ada9598 | 8994 | msgid "confusion beyond insanity" |
81809b99 | 8995 | msgstr "不可理喻" |
8ada9598 | 8996 | |
87cb7997 | 8997 | #: builtin/index-pack.c:1261 |
ef317cd5 | 8998 | #, c-format |
5b04ee3b JX |
8999 | msgid "completed with %d local object" |
9000 | msgid_plural "completed with %d local objects" | |
9001 | msgstr[0] "完成 %d 个本地对象" | |
9002 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 9003 | |
87cb7997 | 9004 | #: builtin/index-pack.c:1273 |
ef317cd5 JX |
9005 | #, c-format |
9006 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 9007 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 9008 | |
87cb7997 | 9009 | #: builtin/index-pack.c:1277 |
8ada9598 JX |
9010 | #, c-format |
9011 | msgid "pack has %d unresolved delta" | |
9012 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 9013 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 9014 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 9015 | |
87cb7997 | 9016 | #: builtin/index-pack.c:1301 |
81809b99 | 9017 | #, c-format |
8ada9598 | 9018 | msgid "unable to deflate appended object (%d)" |
07432cef | 9019 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 9020 | |
87cb7997 | 9021 | #: builtin/index-pack.c:1377 |
8ada9598 JX |
9022 | #, c-format |
9023 | msgid "local object %s is corrupt" | |
81809b99 | 9024 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 9025 | |
87cb7997 | 9026 | #: builtin/index-pack.c:1403 |
8ada9598 | 9027 | msgid "error while closing pack file" |
81809b99 | 9028 | msgstr "关闭包文件时出错" |
8ada9598 | 9029 | |
87cb7997 | 9030 | #: builtin/index-pack.c:1415 |
81809b99 | 9031 | #, c-format |
8ada9598 | 9032 | msgid "cannot write keep file '%s'" |
81809b99 | 9033 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 9034 | |
87cb7997 | 9035 | #: builtin/index-pack.c:1423 |
81809b99 | 9036 | #, c-format |
8ada9598 | 9037 | msgid "cannot close written keep file '%s'" |
81809b99 | 9038 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 9039 | |
87cb7997 | 9040 | #: builtin/index-pack.c:1433 |
8ada9598 | 9041 | msgid "cannot store pack file" |
81809b99 | 9042 | msgstr "无法存储包文件" |
8ada9598 | 9043 | |
87cb7997 | 9044 | #: builtin/index-pack.c:1441 |
8ada9598 | 9045 | msgid "cannot store index file" |
81809b99 | 9046 | msgstr "无法存储索引文件" |
8ada9598 | 9047 | |
87cb7997 | 9048 | #: builtin/index-pack.c:1479 |
07432cef | 9049 | #, c-format |
ef317cd5 | 9050 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 9051 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 9052 | |
87cb7997 | 9053 | #: builtin/index-pack.c:1489 builtin/index-pack.c:1686 |
ef317cd5 JX |
9054 | #, c-format |
9055 | msgid "no threads support, ignoring %s" | |
07432cef | 9056 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 9057 | |
87cb7997 | 9058 | #: builtin/index-pack.c:1547 |
81809b99 | 9059 | #, c-format |
8ada9598 | 9060 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 9061 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 9062 | |
87cb7997 | 9063 | #: builtin/index-pack.c:1549 |
81809b99 | 9064 | #, c-format |
8ada9598 | 9065 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 9066 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 9067 | |
87cb7997 | 9068 | #: builtin/index-pack.c:1596 |
81809b99 | 9069 | #, c-format |
8ada9598 JX |
9070 | msgid "non delta: %d object" |
9071 | msgid_plural "non delta: %d objects" | |
81809b99 | 9072 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 9073 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 9074 | |
87cb7997 | 9075 | #: builtin/index-pack.c:1603 |
8ada9598 JX |
9076 | #, c-format |
9077 | msgid "chain length = %d: %lu object" | |
9078 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 9079 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 9080 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 9081 | |
87cb7997 | 9082 | #: builtin/index-pack.c:1616 |
5b04ee3b JX |
9083 | #, c-format |
9084 | msgid "packfile name '%s' does not end with '.pack'" | |
9085 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
9086 | ||
87cb7997 JX |
9087 | #: builtin/index-pack.c:1698 builtin/index-pack.c:1701 |
9088 | #: builtin/index-pack.c:1717 builtin/index-pack.c:1721 | |
81809b99 | 9089 | #, c-format |
8ada9598 | 9090 | msgid "bad %s" |
81809b99 | 9091 | msgstr "错误选项 %s" |
8ada9598 | 9092 | |
87cb7997 | 9093 | #: builtin/index-pack.c:1737 |
8ada9598 | 9094 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 9095 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 9096 | |
87cb7997 | 9097 | #: builtin/index-pack.c:1739 |
1a79b2f1 JX |
9098 | msgid "--stdin requires a git repository" |
9099 | msgstr "--stdin 需要一个 git 仓库" | |
9100 | ||
87cb7997 | 9101 | #: builtin/index-pack.c:1747 |
8ada9598 | 9102 | msgid "--verify with no packfile name given" |
dbd6cced | 9103 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 9104 | |
a0b6b246 | 9105 | #: builtin/init-db.c:54 |
c04f5ac3 JX |
9106 | #, c-format |
9107 | msgid "cannot stat '%s'" | |
9108 | msgstr "不能枚举 '%s' 状态" | |
9109 | ||
a0b6b246 | 9110 | #: builtin/init-db.c:60 |
c04f5ac3 JX |
9111 | #, c-format |
9112 | msgid "cannot stat template '%s'" | |
9113 | msgstr "不能枚举模版 '%s' 状态" | |
9114 | ||
a0b6b246 | 9115 | #: builtin/init-db.c:65 |
c04f5ac3 JX |
9116 | #, c-format |
9117 | msgid "cannot opendir '%s'" | |
9118 | msgstr "不能打开目录 '%s'" | |
9119 | ||
a0b6b246 | 9120 | #: builtin/init-db.c:76 |
c04f5ac3 JX |
9121 | #, c-format |
9122 | msgid "cannot readlink '%s'" | |
9123 | msgstr "不能读取链接 '%s'" | |
9124 | ||
a0b6b246 | 9125 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
9126 | #, c-format |
9127 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 9128 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 9129 | |
a0b6b246 | 9130 | #: builtin/init-db.c:84 |
c04f5ac3 JX |
9131 | #, c-format |
9132 | msgid "cannot copy '%s' to '%s'" | |
9133 | msgstr "不能拷贝 '%s' 至 '%s'" | |
9134 | ||
a0b6b246 | 9135 | #: builtin/init-db.c:88 |
c04f5ac3 JX |
9136 | #, c-format |
9137 | msgid "ignoring template %s" | |
9138 | msgstr "忽略模版 %s" | |
9139 | ||
a0b6b246 | 9140 | #: builtin/init-db.c:119 |
c04f5ac3 JX |
9141 | #, c-format |
9142 | msgid "templates not found %s" | |
9143 | msgstr "模版未找到 %s" | |
9144 | ||
a0b6b246 | 9145 | #: builtin/init-db.c:134 |
c04f5ac3 | 9146 | #, c-format |
5b04ee3b JX |
9147 | msgid "not copying templates from '%s': %s" |
9148 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 9149 | |
a0b6b246 | 9150 | #: builtin/init-db.c:327 |
c04f5ac3 JX |
9151 | #, c-format |
9152 | msgid "unable to handle file type %d" | |
9153 | msgstr "不能处理 %d 类型的文件" | |
9154 | ||
a0b6b246 | 9155 | #: builtin/init-db.c:330 |
c04f5ac3 JX |
9156 | #, c-format |
9157 | msgid "unable to move %s to %s" | |
9158 | msgstr "不能移动 %s 至 %s" | |
9159 | ||
a0b6b246 JX |
9160 | #: builtin/init-db.c:347 builtin/init-db.c:350 |
9161 | #, c-format | |
9162 | msgid "%s already exists" | |
9163 | msgstr "%s 已经存在" | |
9164 | ||
9165 | #: builtin/init-db.c:403 | |
c04f5ac3 | 9166 | #, c-format |
5c57d762 JX |
9167 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
9168 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 9169 | |
a0b6b246 | 9170 | #: builtin/init-db.c:404 |
5c57d762 JX |
9171 | #, c-format |
9172 | msgid "Reinitialized existing Git repository in %s%s\n" | |
9173 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 9174 | |
a0b6b246 | 9175 | #: builtin/init-db.c:408 |
5c57d762 JX |
9176 | #, c-format |
9177 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 9178 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 9179 | |
a0b6b246 | 9180 | #: builtin/init-db.c:409 |
5c57d762 JX |
9181 | #, c-format |
9182 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 9183 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 9184 | |
a0b6b246 | 9185 | #: builtin/init-db.c:457 |
ef317cd5 | 9186 | msgid "" |
a77c07d9 | 9187 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 9188 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 9189 | msgstr "" |
07432cef | 9190 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 9191 | "[<目录>]" |
ef317cd5 | 9192 | |
a0b6b246 | 9193 | #: builtin/init-db.c:480 |
ef317cd5 | 9194 | msgid "permissions" |
07432cef | 9195 | msgstr "权限" |
ef317cd5 | 9196 | |
a0b6b246 | 9197 | #: builtin/init-db.c:481 |
ef317cd5 | 9198 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 9199 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 9200 | |
a0b6b246 | 9201 | #: builtin/init-db.c:515 builtin/init-db.c:520 |
c04f5ac3 JX |
9202 | #, c-format |
9203 | msgid "cannot mkdir %s" | |
9204 | msgstr "不能创建目录 %s" | |
9205 | ||
a0b6b246 | 9206 | #: builtin/init-db.c:524 |
c04f5ac3 JX |
9207 | #, c-format |
9208 | msgid "cannot chdir to %s" | |
9209 | msgstr "不能切换目录到 %s" | |
9210 | ||
a0b6b246 | 9211 | #: builtin/init-db.c:545 |
c04f5ac3 JX |
9212 | #, c-format |
9213 | msgid "" | |
9214 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
9215 | "dir=<directory>)" | |
1e607449 | 9216 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 9217 | |
a0b6b246 | 9218 | #: builtin/init-db.c:573 |
c04f5ac3 JX |
9219 | #, c-format |
9220 | msgid "Cannot access work tree '%s'" | |
9221 | msgstr "不能访问工作区 '%s'" | |
9222 | ||
220c313c JX |
9223 | #: builtin/interpret-trailers.c:15 |
9224 | msgid "" | |
276ceeaa JX |
9225 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
9226 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
9227 | msgstr "" |
9228 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
9229 | ">])...] [<文件>...]" | |
276ceeaa JX |
9230 | |
9231 | #: builtin/interpret-trailers.c:26 | |
9232 | msgid "edit files in place" | |
9233 | msgstr "在原位编辑文件" | |
220c313c | 9234 | |
276ceeaa | 9235 | #: builtin/interpret-trailers.c:27 |
220c313c JX |
9236 | msgid "trim empty trailers" |
9237 | msgstr "删除空签名" | |
9238 | ||
276ceeaa | 9239 | #: builtin/interpret-trailers.c:28 |
220c313c JX |
9240 | msgid "trailer" |
9241 | msgstr "签名" | |
9242 | ||
276ceeaa | 9243 | #: builtin/interpret-trailers.c:29 |
220c313c JX |
9244 | msgid "trailer(s) to add" |
9245 | msgstr "要添加的签名" | |
9246 | ||
276ceeaa JX |
9247 | #: builtin/interpret-trailers.c:42 |
9248 | msgid "no input file given for in-place editing" | |
9249 | msgstr "没有给出要原位编辑的文件" | |
9250 | ||
5c57d762 | 9251 | #: builtin/log.c:44 |
7aea43ff | 9252 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 9253 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 9254 | |
5c57d762 | 9255 | #: builtin/log.c:45 |
814ff314 JX |
9256 | msgid "git show [<options>] <object>..." |
9257 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 9258 | |
87cb7997 | 9259 | #: builtin/log.c:89 |
220c313c JX |
9260 | #, c-format |
9261 | msgid "invalid --decorate option: %s" | |
9262 | msgstr "无效的 --decorate 选项:%s" | |
9263 | ||
87cb7997 | 9264 | #: builtin/log.c:144 |
ef317cd5 | 9265 | msgid "suppress diff output" |
07432cef | 9266 | msgstr "不显示差异输出" |
ef317cd5 | 9267 | |
87cb7997 | 9268 | #: builtin/log.c:145 |
ef317cd5 | 9269 | msgid "show source" |
07432cef | 9270 | msgstr "显示源" |
ef317cd5 | 9271 | |
87cb7997 | 9272 | #: builtin/log.c:146 |
07432cef WS |
9273 | msgid "Use mail map file" |
9274 | msgstr "使用邮件映射文件" | |
9275 | ||
87cb7997 | 9276 | #: builtin/log.c:147 |
ef317cd5 | 9277 | msgid "decorate options" |
07432cef | 9278 | msgstr "修饰选项" |
ef317cd5 | 9279 | |
87cb7997 | 9280 | #: builtin/log.c:150 |
220c313c JX |
9281 | msgid "Process line range n,m in file, counting from 1" |
9282 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
9283 | ||
87cb7997 | 9284 | #: builtin/log.c:246 |
c04f5ac3 JX |
9285 | #, c-format |
9286 | msgid "Final output: %d %s\n" | |
9287 | msgstr "最终输出:%d %s\n" | |
9288 | ||
87cb7997 | 9289 | #: builtin/log.c:493 |
220c313c JX |
9290 | #, c-format |
9291 | msgid "git show %s: bad file" | |
9292 | msgstr "git show %s: 损坏的文件" | |
9293 | ||
87cb7997 | 9294 | #: builtin/log.c:507 builtin/log.c:601 |
c04f5ac3 JX |
9295 | #, c-format |
9296 | msgid "Could not read object %s" | |
90e6ef53 | 9297 | msgstr "不能读取对象 %s" |
c04f5ac3 | 9298 | |
87cb7997 | 9299 | #: builtin/log.c:625 |
c04f5ac3 JX |
9300 | #, c-format |
9301 | msgid "Unknown type: %d" | |
9302 | msgstr "未知类型:%d" | |
9303 | ||
87cb7997 | 9304 | #: builtin/log.c:746 |
c04f5ac3 JX |
9305 | msgid "format.headers without value" |
9306 | msgstr "format.headers 没有值" | |
9307 | ||
87cb7997 | 9308 | #: builtin/log.c:846 |
c04f5ac3 JX |
9309 | msgid "name of output directory is too long" |
9310 | msgstr "输出目录名太长" | |
9311 | ||
87cb7997 | 9312 | #: builtin/log.c:861 |
c04f5ac3 JX |
9313 | #, c-format |
9314 | msgid "Cannot open patch file %s" | |
9315 | msgstr "无法打开补丁文件 %s" | |
9316 | ||
87cb7997 | 9317 | #: builtin/log.c:875 |
c04f5ac3 JX |
9318 | msgid "Need exactly one range." |
9319 | msgstr "只需要一个范围。" | |
9320 | ||
87cb7997 | 9321 | #: builtin/log.c:885 |
c04f5ac3 JX |
9322 | msgid "Not a range." |
9323 | msgstr "不是一个范围。" | |
9324 | ||
87cb7997 | 9325 | #: builtin/log.c:991 |
c04f5ac3 JX |
9326 | msgid "Cover letter needs email format" |
9327 | msgstr "信封需要邮件地址格式" | |
9328 | ||
87cb7997 | 9329 | #: builtin/log.c:1071 |
c04f5ac3 JX |
9330 | #, c-format |
9331 | msgid "insane in-reply-to: %s" | |
9332 | msgstr "不正常的 in-reply-to:%s" | |
9333 | ||
87cb7997 | 9334 | #: builtin/log.c:1098 |
814ff314 JX |
9335 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
9336 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 9337 | |
87cb7997 | 9338 | #: builtin/log.c:1148 |
c04f5ac3 JX |
9339 | msgid "Two output directories?" |
9340 | msgstr "两个输出目录?" | |
9341 | ||
87cb7997 | 9342 | #: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 |
5b04ee3b JX |
9343 | #, c-format |
9344 | msgid "Unknown commit %s" | |
9345 | msgstr "未知提交 %s" | |
9346 | ||
87cb7997 | 9347 | #: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 |
5b04ee3b JX |
9348 | #, c-format |
9349 | msgid "Failed to resolve '%s' as a valid ref." | |
9350 | msgstr "无法解析 '%s' 为一个有效引用。" | |
9351 | ||
87cb7997 | 9352 | #: builtin/log.c:1270 |
5b04ee3b JX |
9353 | msgid "Could not find exact merge base." |
9354 | msgstr "不能找到准确的合并基线。" | |
9355 | ||
87cb7997 | 9356 | #: builtin/log.c:1274 |
5b04ee3b JX |
9357 | msgid "" |
9358 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
9359 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
9360 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
9361 | msgstr "" | |
9362 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 9363 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
5b04ee3b JX |
9364 | "参数 --base=<base-commit-id> 手动指定一个基线提交。" |
9365 | ||
87cb7997 | 9366 | #: builtin/log.c:1294 |
5b04ee3b JX |
9367 | msgid "Failed to find exact merge base" |
9368 | msgstr "无法找到准确的合并基线" | |
9369 | ||
87cb7997 | 9370 | #: builtin/log.c:1305 |
5b04ee3b JX |
9371 | msgid "base commit should be the ancestor of revision list" |
9372 | msgstr "基线提交应该是版本列表的祖先" | |
9373 | ||
87cb7997 | 9374 | #: builtin/log.c:1309 |
5b04ee3b JX |
9375 | msgid "base commit shouldn't be in revision list" |
9376 | msgstr "基线提交不应该出现在版本列表中" | |
9377 | ||
87cb7997 | 9378 | #: builtin/log.c:1358 |
5b04ee3b | 9379 | msgid "cannot get patch id" |
aef18cc6 | 9380 | msgstr "无法得到补丁 id" |
5b04ee3b | 9381 | |
87cb7997 | 9382 | #: builtin/log.c:1415 |
ef317cd5 | 9383 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 9384 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 9385 | |
87cb7997 | 9386 | #: builtin/log.c:1418 |
ef317cd5 | 9387 | msgid "use [PATCH] even with multiple patches" |
07432cef | 9388 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 9389 | |
87cb7997 | 9390 | #: builtin/log.c:1422 |
ef317cd5 | 9391 | msgid "print patches to standard out" |
07432cef | 9392 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 9393 | |
87cb7997 | 9394 | #: builtin/log.c:1424 |
ef317cd5 | 9395 | msgid "generate a cover letter" |
07432cef | 9396 | msgstr "生成一封附信" |
c04f5ac3 | 9397 | |
87cb7997 | 9398 | #: builtin/log.c:1426 |
ef317cd5 | 9399 | msgid "use simple number sequence for output file names" |
07432cef | 9400 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 9401 | |
87cb7997 | 9402 | #: builtin/log.c:1427 |
ef317cd5 | 9403 | msgid "sfx" |
07432cef | 9404 | msgstr "后缀" |
ef317cd5 | 9405 | |
87cb7997 | 9406 | #: builtin/log.c:1428 |
ef317cd5 | 9407 | msgid "use <sfx> instead of '.patch'" |
07432cef | 9408 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 9409 | |
87cb7997 | 9410 | #: builtin/log.c:1430 |
ef317cd5 | 9411 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
9412 | msgstr "补丁以 <n> 开始编号,而不是1" |
9413 | ||
87cb7997 | 9414 | #: builtin/log.c:1432 |
07432cef WS |
9415 | msgid "mark the series as Nth re-roll" |
9416 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 9417 | |
87cb7997 | 9418 | #: builtin/log.c:1434 |
a0b6b246 JX |
9419 | msgid "Use [RFC PATCH] instead of [PATCH]" |
9420 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
9421 | ||
87cb7997 | 9422 | #: builtin/log.c:1437 |
ef317cd5 | 9423 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 9424 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 9425 | |
87cb7997 | 9426 | #: builtin/log.c:1440 |
ef317cd5 | 9427 | msgid "store resulting files in <dir>" |
d9d56b23 | 9428 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 9429 | |
87cb7997 | 9430 | #: builtin/log.c:1443 |
ef317cd5 | 9431 | msgid "don't strip/add [PATCH]" |
07432cef | 9432 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 9433 | |
87cb7997 | 9434 | #: builtin/log.c:1446 |
ef317cd5 | 9435 | msgid "don't output binary diffs" |
07432cef | 9436 | msgstr "不输出二进制差异" |
ef317cd5 | 9437 | |
87cb7997 | 9438 | #: builtin/log.c:1448 |
89f80d72 JX |
9439 | msgid "output all-zero hash in From header" |
9440 | msgstr "在 From 头信息中输出全为零的哈希值" | |
9441 | ||
87cb7997 | 9442 | #: builtin/log.c:1450 |
ef317cd5 | 9443 | msgid "don't include a patch matching a commit upstream" |
07432cef | 9444 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 9445 | |
87cb7997 | 9446 | #: builtin/log.c:1452 |
ef317cd5 | 9447 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 9448 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 9449 | |
87cb7997 | 9450 | #: builtin/log.c:1454 |
ef317cd5 | 9451 | msgid "Messaging" |
07432cef | 9452 | msgstr "邮件发送" |
ef317cd5 | 9453 | |
87cb7997 | 9454 | #: builtin/log.c:1455 |
ef317cd5 | 9455 | msgid "header" |
07432cef | 9456 | msgstr "header" |
ef317cd5 | 9457 | |
87cb7997 | 9458 | #: builtin/log.c:1456 |
ef317cd5 | 9459 | msgid "add email header" |
07432cef | 9460 | msgstr "添加邮件头" |
ef317cd5 | 9461 | |
87cb7997 | 9462 | #: builtin/log.c:1457 builtin/log.c:1459 |
ef317cd5 | 9463 | msgid "email" |
07432cef | 9464 | msgstr "邮件地址" |
ef317cd5 | 9465 | |
87cb7997 | 9466 | #: builtin/log.c:1457 |
ef317cd5 | 9467 | msgid "add To: header" |
07432cef | 9468 | msgstr "添加收件人" |
ef317cd5 | 9469 | |
87cb7997 | 9470 | #: builtin/log.c:1459 |
ef317cd5 | 9471 | msgid "add Cc: header" |
07432cef | 9472 | msgstr "添加抄送" |
ef317cd5 | 9473 | |
87cb7997 | 9474 | #: builtin/log.c:1461 |
2e8451e8 | 9475 | msgid "ident" |
d9d56b23 | 9476 | msgstr "标识" |
2e8451e8 | 9477 | |
87cb7997 | 9478 | #: builtin/log.c:1462 |
2e8451e8 | 9479 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 9480 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 9481 | |
87cb7997 | 9482 | #: builtin/log.c:1464 |
ef317cd5 | 9483 | msgid "message-id" |
d9d56b23 | 9484 | msgstr "邮件标识" |
ef317cd5 | 9485 | |
87cb7997 | 9486 | #: builtin/log.c:1465 |
ef317cd5 | 9487 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 9488 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 9489 | |
87cb7997 | 9490 | #: builtin/log.c:1466 builtin/log.c:1469 |
ef317cd5 | 9491 | msgid "boundary" |
07432cef | 9492 | msgstr "边界" |
ef317cd5 | 9493 | |
87cb7997 | 9494 | #: builtin/log.c:1467 |
ef317cd5 | 9495 | msgid "attach the patch" |
07432cef | 9496 | msgstr "附件方式添加补丁" |
ef317cd5 | 9497 | |
87cb7997 | 9498 | #: builtin/log.c:1470 |
ef317cd5 | 9499 | msgid "inline the patch" |
07432cef | 9500 | msgstr "内联显示补丁" |
ef317cd5 | 9501 | |
87cb7997 | 9502 | #: builtin/log.c:1474 |
ef317cd5 | 9503 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 9504 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 9505 | |
87cb7997 | 9506 | #: builtin/log.c:1476 |
ef317cd5 | 9507 | msgid "signature" |
07432cef | 9508 | msgstr "签名" |
ef317cd5 | 9509 | |
87cb7997 | 9510 | #: builtin/log.c:1477 |
ef317cd5 | 9511 | msgid "add a signature" |
07432cef | 9512 | msgstr "添加一个签名" |
ef317cd5 | 9513 | |
87cb7997 | 9514 | #: builtin/log.c:1478 |
5b04ee3b JX |
9515 | msgid "base-commit" |
9516 | msgstr "基线提交" | |
9517 | ||
87cb7997 | 9518 | #: builtin/log.c:1479 |
5b04ee3b JX |
9519 | msgid "add prerequisite tree info to the patch series" |
9520 | msgstr "为补丁列表添加前置树信息" | |
9521 | ||
87cb7997 | 9522 | #: builtin/log.c:1481 |
6acbf033 JX |
9523 | msgid "add a signature from a file" |
9524 | msgstr "从文件添加一个签名" | |
9525 | ||
87cb7997 | 9526 | #: builtin/log.c:1482 |
ef317cd5 | 9527 | msgid "don't print the patch filenames" |
07432cef | 9528 | msgstr "不要打印补丁文件名" |
ef317cd5 | 9529 | |
87cb7997 | 9530 | #: builtin/log.c:1572 |
c04f5ac3 JX |
9531 | msgid "-n and -k are mutually exclusive." |
9532 | msgstr "-n 和 -k 互斥。" | |
9533 | ||
87cb7997 | 9534 | #: builtin/log.c:1574 |
a0b6b246 JX |
9535 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." |
9536 | msgstr "--subject-prefix/--rfc 和 -k 互斥。" | |
c04f5ac3 | 9537 | |
87cb7997 | 9538 | #: builtin/log.c:1582 |
c04f5ac3 JX |
9539 | msgid "--name-only does not make sense" |
9540 | msgstr "--name-only 无意义" | |
9541 | ||
87cb7997 | 9542 | #: builtin/log.c:1584 |
c04f5ac3 JX |
9543 | msgid "--name-status does not make sense" |
9544 | msgstr "--name-status 无意义" | |
9545 | ||
87cb7997 | 9546 | #: builtin/log.c:1586 |
c04f5ac3 JX |
9547 | msgid "--check does not make sense" |
9548 | msgstr "--check 无意义" | |
9549 | ||
87cb7997 | 9550 | #: builtin/log.c:1616 |
c04f5ac3 JX |
9551 | msgid "standard output, or directory, which one?" |
9552 | msgstr "标准输出或目录,哪一个?" | |
9553 | ||
87cb7997 | 9554 | #: builtin/log.c:1618 |
c04f5ac3 JX |
9555 | #, c-format |
9556 | msgid "Could not create directory '%s'" | |
90e6ef53 | 9557 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 9558 | |
87cb7997 | 9559 | #: builtin/log.c:1712 |
6acbf033 JX |
9560 | #, c-format |
9561 | msgid "unable to read signature file '%s'" | |
9562 | msgstr "无法读取签名文件 '%s'" | |
9563 | ||
87cb7997 | 9564 | #: builtin/log.c:1784 |
c04f5ac3 JX |
9565 | msgid "Failed to create output files" |
9566 | msgstr "无法创建输出文件" | |
9567 | ||
87cb7997 | 9568 | #: builtin/log.c:1833 |
ef317cd5 | 9569 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 9570 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 9571 | |
87cb7997 | 9572 | #: builtin/log.c:1887 |
c04f5ac3 JX |
9573 | #, c-format |
9574 | msgid "" | |
9575 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 9576 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 9577 | |
87cb7997 | 9578 | #: builtin/ls-files.c:461 |
814ff314 JX |
9579 | msgid "git ls-files [<options>] [<file>...]" |
9580 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 9581 | |
87cb7997 | 9582 | #: builtin/ls-files.c:510 |
ef317cd5 | 9583 | msgid "identify the file status with tags" |
07432cef | 9584 | msgstr "用标签标识文件的状态" |
ef317cd5 | 9585 | |
87cb7997 | 9586 | #: builtin/ls-files.c:512 |
ef317cd5 | 9587 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 9588 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 9589 | |
87cb7997 | 9590 | #: builtin/ls-files.c:514 |
ef317cd5 | 9591 | msgid "show cached files in the output (default)" |
07432cef | 9592 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 9593 | |
87cb7997 | 9594 | #: builtin/ls-files.c:516 |
ef317cd5 | 9595 | msgid "show deleted files in the output" |
07432cef | 9596 | msgstr "显示已删除的文件" |
ef317cd5 | 9597 | |
87cb7997 | 9598 | #: builtin/ls-files.c:518 |
ef317cd5 | 9599 | msgid "show modified files in the output" |
07432cef | 9600 | msgstr "显示已修改的文件" |
ef317cd5 | 9601 | |
87cb7997 | 9602 | #: builtin/ls-files.c:520 |
ef317cd5 | 9603 | msgid "show other files in the output" |
07432cef | 9604 | msgstr "显示其它文件" |
ef317cd5 | 9605 | |
87cb7997 | 9606 | #: builtin/ls-files.c:522 |
ef317cd5 | 9607 | msgid "show ignored files in the output" |
07432cef | 9608 | msgstr "显示忽略的文件" |
ef317cd5 | 9609 | |
87cb7997 | 9610 | #: builtin/ls-files.c:525 |
ef317cd5 | 9611 | msgid "show staged contents' object name in the output" |
07432cef | 9612 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 9613 | |
87cb7997 | 9614 | #: builtin/ls-files.c:527 |
ef317cd5 | 9615 | msgid "show files on the filesystem that need to be removed" |
07432cef | 9616 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 9617 | |
87cb7997 | 9618 | #: builtin/ls-files.c:529 |
220c313c | 9619 | msgid "show 'other' directories' names only" |
07432cef | 9620 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 9621 | |
87cb7997 | 9622 | #: builtin/ls-files.c:531 |
276ceeaa JX |
9623 | msgid "show line endings of files" |
9624 | msgstr "显示文件换行符格式" | |
9625 | ||
87cb7997 | 9626 | #: builtin/ls-files.c:533 |
ef317cd5 | 9627 | msgid "don't show empty directories" |
07432cef | 9628 | msgstr "不显示空目录" |
ef317cd5 | 9629 | |
87cb7997 | 9630 | #: builtin/ls-files.c:536 |
ef317cd5 | 9631 | msgid "show unmerged files in the output" |
07432cef | 9632 | msgstr "显示未合并的文件" |
ef317cd5 | 9633 | |
87cb7997 | 9634 | #: builtin/ls-files.c:538 |
ef317cd5 | 9635 | msgid "show resolve-undo information" |
07432cef | 9636 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 9637 | |
87cb7997 | 9638 | #: builtin/ls-files.c:540 |
ef317cd5 | 9639 | msgid "skip files matching pattern" |
07432cef | 9640 | msgstr "匹配排除文件的模式" |
ef317cd5 | 9641 | |
87cb7997 | 9642 | #: builtin/ls-files.c:543 |
ef317cd5 | 9643 | msgid "exclude patterns are read from <file>" |
07432cef | 9644 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 9645 | |
87cb7997 | 9646 | #: builtin/ls-files.c:546 |
ef317cd5 | 9647 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 9648 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 9649 | |
87cb7997 | 9650 | #: builtin/ls-files.c:548 |
ef317cd5 | 9651 | msgid "add the standard git exclusions" |
07432cef | 9652 | msgstr "添加标准的 git 排除" |
ef317cd5 | 9653 | |
87cb7997 | 9654 | #: builtin/ls-files.c:551 |
ef317cd5 | 9655 | msgid "make the output relative to the project top directory" |
07432cef | 9656 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 9657 | |
87cb7997 | 9658 | #: builtin/ls-files.c:554 |
a0b6b246 JX |
9659 | msgid "recurse through submodules" |
9660 | msgstr "在子模组中递归" | |
9661 | ||
87cb7997 | 9662 | #: builtin/ls-files.c:556 |
ef317cd5 | 9663 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 9664 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 9665 | |
87cb7997 | 9666 | #: builtin/ls-files.c:557 |
ef317cd5 | 9667 | msgid "tree-ish" |
07432cef | 9668 | msgstr "树或提交" |
ef317cd5 | 9669 | |
87cb7997 | 9670 | #: builtin/ls-files.c:558 |
ef317cd5 | 9671 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 9672 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 9673 | |
87cb7997 | 9674 | #: builtin/ls-files.c:560 |
ef317cd5 | 9675 | msgid "show debugging data" |
07432cef | 9676 | msgstr "显示调试数据" |
ef317cd5 | 9677 | |
276ceeaa JX |
9678 | #: builtin/ls-remote.c:7 |
9679 | msgid "" | |
9680 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
9681 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
9682 | " [--symref] [<repository> [<refs>...]]" | |
9683 | msgstr "" | |
9684 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
9685 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
9686 | " [--symref] [<仓库> [<引用>...]]" | |
9687 | ||
87cb7997 | 9688 | #: builtin/ls-remote.c:52 |
276ceeaa JX |
9689 | msgid "do not print remote URL" |
9690 | msgstr "不打印远程 URL" | |
9691 | ||
87cb7997 | 9692 | #: builtin/ls-remote.c:53 builtin/ls-remote.c:55 |
276ceeaa JX |
9693 | msgid "exec" |
9694 | msgstr "exec" | |
9695 | ||
87cb7997 | 9696 | #: builtin/ls-remote.c:54 builtin/ls-remote.c:56 |
276ceeaa JX |
9697 | msgid "path of git-upload-pack on the remote host" |
9698 | msgstr "远程主机上的 git-upload-pack 路径" | |
9699 | ||
87cb7997 | 9700 | #: builtin/ls-remote.c:58 |
276ceeaa JX |
9701 | msgid "limit to tags" |
9702 | msgstr "仅限于标签" | |
9703 | ||
87cb7997 | 9704 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
9705 | msgid "limit to heads" |
9706 | msgstr "仅限于分支" | |
9707 | ||
87cb7997 | 9708 | #: builtin/ls-remote.c:60 |
276ceeaa JX |
9709 | msgid "do not show peeled tags" |
9710 | msgstr "不显示已解析的标签" | |
9711 | ||
87cb7997 | 9712 | #: builtin/ls-remote.c:62 |
276ceeaa JX |
9713 | msgid "take url.<base>.insteadOf into account" |
9714 | msgstr "参考 url.<base>.insteadOf 设置" | |
9715 | ||
87cb7997 | 9716 | #: builtin/ls-remote.c:64 |
276ceeaa JX |
9717 | msgid "exit with exit code 2 if no matching refs are found" |
9718 | msgstr "若未找到匹配的引用则以退出码2退出" | |
9719 | ||
87cb7997 | 9720 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
9721 | msgid "show underlying ref in addition to the object pointed by it" |
9722 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
9723 | ||
90314792 | 9724 | #: builtin/ls-tree.c:28 |
ef317cd5 | 9725 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 9726 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 9727 | |
1a79b2f1 | 9728 | #: builtin/ls-tree.c:126 |
ef317cd5 | 9729 | msgid "only show trees" |
07432cef | 9730 | msgstr "只显示树" |
ef317cd5 | 9731 | |
1a79b2f1 | 9732 | #: builtin/ls-tree.c:128 |
ef317cd5 | 9733 | msgid "recurse into subtrees" |
07432cef | 9734 | msgstr "递归到子树" |
ef317cd5 | 9735 | |
1a79b2f1 | 9736 | #: builtin/ls-tree.c:130 |
ef317cd5 | 9737 | msgid "show trees when recursing" |
07432cef | 9738 | msgstr "当递归时显示树" |
ef317cd5 | 9739 | |
1a79b2f1 | 9740 | #: builtin/ls-tree.c:133 |
ef317cd5 | 9741 | msgid "terminate entries with NUL byte" |
4375c10e | 9742 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 9743 | |
1a79b2f1 | 9744 | #: builtin/ls-tree.c:134 |
ef317cd5 | 9745 | msgid "include object size" |
07432cef | 9746 | msgstr "包括对象大小" |
ef317cd5 | 9747 | |
1a79b2f1 | 9748 | #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 |
ef317cd5 | 9749 | msgid "list only filenames" |
07432cef | 9750 | msgstr "只列出文件名" |
ef317cd5 | 9751 | |
1a79b2f1 | 9752 | #: builtin/ls-tree.c:141 |
ef317cd5 | 9753 | msgid "use full path names" |
07432cef | 9754 | msgstr "使用文件的全路径" |
ef317cd5 | 9755 | |
1a79b2f1 | 9756 | #: builtin/ls-tree.c:143 |
ef317cd5 | 9757 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 9758 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 9759 | |
5c57d762 | 9760 | #: builtin/merge.c:46 |
814ff314 JX |
9761 | msgid "git merge [<options>] [<commit>...]" |
9762 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 9763 | |
5c57d762 | 9764 | #: builtin/merge.c:47 |
ef317cd5 | 9765 | msgid "git merge --abort" |
07432cef | 9766 | msgstr "git merge --abort" |
ef317cd5 | 9767 | |
87cb7997 | 9768 | #: builtin/merge.c:48 |
1a79b2f1 JX |
9769 | msgid "git merge --continue" |
9770 | msgstr "git merge --continue" | |
9771 | ||
87cb7997 | 9772 | #: builtin/merge.c:103 |
c04f5ac3 JX |
9773 | msgid "switch `m' requires a value" |
9774 | msgstr "开关 `m' 需要一个值" | |
9775 | ||
87cb7997 | 9776 | #: builtin/merge.c:140 |
c04f5ac3 JX |
9777 | #, c-format |
9778 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 9779 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 9780 | |
87cb7997 | 9781 | #: builtin/merge.c:141 |
c04f5ac3 JX |
9782 | #, c-format |
9783 | msgid "Available strategies are:" | |
9784 | msgstr "可用的策略有:" | |
9785 | ||
87cb7997 | 9786 | #: builtin/merge.c:146 |
c04f5ac3 JX |
9787 | #, c-format |
9788 | msgid "Available custom strategies are:" | |
9789 | msgstr "可用的自定义策略有:" | |
9790 | ||
87cb7997 | 9791 | #: builtin/merge.c:196 builtin/pull.c:127 |
ef317cd5 | 9792 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 9793 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 9794 | |
87cb7997 | 9795 | #: builtin/merge.c:199 builtin/pull.c:130 |
ef317cd5 | 9796 | msgid "show a diffstat at the end of the merge" |
07432cef | 9797 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 9798 | |
87cb7997 | 9799 | #: builtin/merge.c:200 builtin/pull.c:133 |
ef317cd5 | 9800 | msgid "(synonym to --stat)" |
07432cef | 9801 | msgstr "(和 --stat 同义)" |
ef317cd5 | 9802 | |
87cb7997 | 9803 | #: builtin/merge.c:202 builtin/pull.c:136 |
ef317cd5 | 9804 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 9805 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 9806 | |
87cb7997 | 9807 | #: builtin/merge.c:205 builtin/pull.c:139 |
ef317cd5 | 9808 | msgid "create a single commit instead of doing a merge" |
07432cef | 9809 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 9810 | |
87cb7997 | 9811 | #: builtin/merge.c:207 builtin/pull.c:142 |
ef317cd5 | 9812 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 9813 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 9814 | |
87cb7997 | 9815 | #: builtin/merge.c:209 builtin/pull.c:145 |
ef317cd5 | 9816 | msgid "edit message before committing" |
07432cef | 9817 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 9818 | |
87cb7997 | 9819 | #: builtin/merge.c:210 |
ef317cd5 | 9820 | msgid "allow fast-forward (default)" |
07432cef | 9821 | msgstr "允许快进(默认)" |
ef317cd5 | 9822 | |
87cb7997 | 9823 | #: builtin/merge.c:212 builtin/pull.c:151 |
ef317cd5 | 9824 | msgid "abort if fast-forward is not possible" |
07432cef | 9825 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 9826 | |
87cb7997 | 9827 | #: builtin/merge.c:216 builtin/pull.c:154 |
5c57d762 | 9828 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
9829 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
9830 | ||
87cb7997 JX |
9831 | #: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 |
9832 | #: builtin/revert.c:108 | |
ef317cd5 | 9833 | msgid "strategy" |
07432cef | 9834 | msgstr "策略" |
ef317cd5 | 9835 | |
87cb7997 | 9836 | #: builtin/merge.c:218 builtin/pull.c:159 |
ef317cd5 | 9837 | msgid "merge strategy to use" |
07432cef | 9838 | msgstr "要使用的合并策略" |
ef317cd5 | 9839 | |
87cb7997 | 9840 | #: builtin/merge.c:219 builtin/pull.c:162 |
ef317cd5 | 9841 | msgid "option=value" |
07432cef | 9842 | msgstr "option=value" |
ef317cd5 | 9843 | |
87cb7997 | 9844 | #: builtin/merge.c:220 builtin/pull.c:163 |
ef317cd5 | 9845 | msgid "option for selected merge strategy" |
07432cef | 9846 | msgstr "所选的合并策略的选项" |
ef317cd5 | 9847 | |
87cb7997 | 9848 | #: builtin/merge.c:222 |
ef317cd5 | 9849 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 9850 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 9851 | |
87cb7997 | 9852 | #: builtin/merge.c:226 |
ef317cd5 | 9853 | msgid "abort the current in-progress merge" |
07432cef | 9854 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 9855 | |
87cb7997 | 9856 | #: builtin/merge.c:228 |
1a79b2f1 JX |
9857 | msgid "continue the current in-progress merge" |
9858 | msgstr "继续当前正在进行的合并" | |
9859 | ||
87cb7997 | 9860 | #: builtin/merge.c:230 builtin/pull.c:170 |
5b04ee3b JX |
9861 | msgid "allow merging unrelated histories" |
9862 | msgstr "允许合并不相关的历史" | |
9863 | ||
87cb7997 | 9864 | #: builtin/merge.c:258 |
c04f5ac3 JX |
9865 | msgid "could not run stash." |
9866 | msgstr "不能进行进度保存。" | |
9867 | ||
87cb7997 | 9868 | #: builtin/merge.c:263 |
c04f5ac3 JX |
9869 | msgid "stash failed" |
9870 | msgstr "进度保存失败" | |
9871 | ||
87cb7997 | 9872 | #: builtin/merge.c:268 |
c04f5ac3 JX |
9873 | #, c-format |
9874 | msgid "not a valid object: %s" | |
9875 | msgstr "不是一个有效对象:%s" | |
9876 | ||
87cb7997 | 9877 | #: builtin/merge.c:287 builtin/merge.c:304 |
c04f5ac3 JX |
9878 | msgid "read-tree failed" |
9879 | msgstr "读取树失败" | |
9880 | ||
90e6ef53 | 9881 | # 译者:注意保持前导空格 |
87cb7997 | 9882 | #: builtin/merge.c:334 |
c04f5ac3 JX |
9883 | msgid " (nothing to squash)" |
9884 | msgstr " (无可压缩)" | |
9885 | ||
87cb7997 | 9886 | #: builtin/merge.c:345 |
c04f5ac3 JX |
9887 | #, c-format |
9888 | msgid "Squash commit -- not updating HEAD\n" | |
9889 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
9890 | ||
87cb7997 | 9891 | #: builtin/merge.c:395 |
c04f5ac3 JX |
9892 | #, c-format |
9893 | msgid "No merge message -- not updating HEAD\n" | |
9894 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
9895 | ||
87cb7997 | 9896 | #: builtin/merge.c:446 |
c04f5ac3 JX |
9897 | #, c-format |
9898 | msgid "'%s' does not point to a commit" | |
9899 | msgstr "'%s' 没有指向一个提交" | |
9900 | ||
87cb7997 | 9901 | #: builtin/merge.c:536 |
c04f5ac3 JX |
9902 | #, c-format |
9903 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 9904 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 9905 | |
1a79b2f1 | 9906 | #: builtin/merge.c:656 |
c04f5ac3 | 9907 | msgid "Not handling anything other than two heads merge." |
29004bbb | 9908 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 9909 | |
1a79b2f1 | 9910 | #: builtin/merge.c:670 |
c04f5ac3 JX |
9911 | #, c-format |
9912 | msgid "Unknown option for merge-recursive: -X%s" | |
9913 | msgstr "merge-recursive 的未知选项:-X%s" | |
9914 | ||
1a79b2f1 | 9915 | #: builtin/merge.c:685 |
c04f5ac3 JX |
9916 | #, c-format |
9917 | msgid "unable to write %s" | |
9918 | msgstr "不能写 %s" | |
9919 | ||
1a79b2f1 | 9920 | #: builtin/merge.c:737 |
c04f5ac3 JX |
9921 | #, c-format |
9922 | msgid "Could not read from '%s'" | |
9923 | msgstr "不能从 '%s' 读取" | |
9924 | ||
1a79b2f1 | 9925 | #: builtin/merge.c:746 |
c04f5ac3 JX |
9926 | #, c-format |
9927 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
9928 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
9929 | ||
1a79b2f1 | 9930 | #: builtin/merge.c:752 |
a77c07d9 | 9931 | #, c-format |
c04f5ac3 JX |
9932 | msgid "" |
9933 | "Please enter a commit message to explain why this merge is necessary,\n" | |
9934 | "especially if it merges an updated upstream into a topic branch.\n" | |
9935 | "\n" | |
a77c07d9 | 9936 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
9937 | "the commit.\n" |
9938 | msgstr "" | |
9939 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
9940 | "合并到主题分支。\n" | |
9941 | "\n" | |
a77c07d9 | 9942 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 9943 | |
1a79b2f1 | 9944 | #: builtin/merge.c:776 |
c04f5ac3 JX |
9945 | msgid "Empty commit message." |
9946 | msgstr "空提交信息。" | |
9947 | ||
1a79b2f1 | 9948 | #: builtin/merge.c:796 |
c04f5ac3 JX |
9949 | #, c-format |
9950 | msgid "Wonderful.\n" | |
9951 | msgstr "太棒了。\n" | |
9952 | ||
1a79b2f1 | 9953 | #: builtin/merge.c:851 |
c04f5ac3 JX |
9954 | #, c-format |
9955 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
9956 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
9957 | ||
87cb7997 | 9958 | #: builtin/merge.c:890 |
c04f5ac3 | 9959 | msgid "No current branch." |
90e6ef53 | 9960 | msgstr "没有当前分支。" |
c04f5ac3 | 9961 | |
87cb7997 | 9962 | #: builtin/merge.c:892 |
c04f5ac3 | 9963 | msgid "No remote for the current branch." |
160fb2b2 | 9964 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 9965 | |
87cb7997 | 9966 | #: builtin/merge.c:894 |
c04f5ac3 | 9967 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 9968 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 9969 | |
87cb7997 | 9970 | #: builtin/merge.c:899 |
170e9899 | 9971 | #, c-format |
2e8451e8 JX |
9972 | msgid "No remote-tracking branch for %s from %s" |
9973 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 9974 | |
87cb7997 | 9975 | #: builtin/merge.c:946 |
5c57d762 JX |
9976 | #, c-format |
9977 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 9978 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 9979 | |
87cb7997 | 9980 | #: builtin/merge.c:1020 |
7aea43ff JX |
9981 | #, c-format |
9982 | msgid "could not close '%s'" | |
9983 | msgstr "不能关闭 '%s'" | |
9984 | ||
87cb7997 | 9985 | #: builtin/merge.c:1047 |
5c57d762 JX |
9986 | #, c-format |
9987 | msgid "not something we can merge in %s: %s" | |
9988 | msgstr "不能在 %s 中合并:%s" | |
9989 | ||
87cb7997 | 9990 | #: builtin/merge.c:1081 |
5c57d762 JX |
9991 | msgid "not something we can merge" |
9992 | msgstr "不能合并" | |
9993 | ||
87cb7997 | 9994 | #: builtin/merge.c:1146 |
1a79b2f1 JX |
9995 | msgid "--abort expects no arguments" |
9996 | msgstr "--abort 不带参数" | |
9997 | ||
87cb7997 | 9998 | #: builtin/merge.c:1150 |
c04f5ac3 | 9999 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 10000 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 10001 | |
87cb7997 | 10002 | #: builtin/merge.c:1162 |
1a79b2f1 JX |
10003 | msgid "--continue expects no arguments" |
10004 | msgstr "--continue 不带参数" | |
10005 | ||
87cb7997 | 10006 | #: builtin/merge.c:1166 |
1a79b2f1 JX |
10007 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
10008 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
10009 | ||
87cb7997 | 10010 | #: builtin/merge.c:1182 |
c04f5ac3 JX |
10011 | msgid "" |
10012 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 10013 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
10014 | msgstr "" |
10015 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 10016 | "请在合并前先提交您的修改。" |
c04f5ac3 | 10017 | |
87cb7997 | 10018 | #: builtin/merge.c:1189 |
c04f5ac3 JX |
10019 | msgid "" |
10020 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 10021 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
10022 | msgstr "" |
10023 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 10024 | "请在合并前先提交您的修改。" |
c04f5ac3 | 10025 | |
87cb7997 | 10026 | #: builtin/merge.c:1192 |
c04f5ac3 JX |
10027 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
10028 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
10029 | ||
87cb7997 | 10030 | #: builtin/merge.c:1201 |
c04f5ac3 | 10031 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 10032 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 10033 | |
87cb7997 | 10034 | #: builtin/merge.c:1209 |
c04f5ac3 | 10035 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 10036 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 10037 | |
87cb7997 | 10038 | #: builtin/merge.c:1226 |
c04f5ac3 JX |
10039 | msgid "Squash commit into empty head not supported yet" |
10040 | msgstr "尚不支持到空分支的压缩提交" | |
10041 | ||
87cb7997 | 10042 | #: builtin/merge.c:1228 |
c04f5ac3 JX |
10043 | msgid "Non-fast-forward commit does not make sense into an empty head" |
10044 | msgstr "到空分支的非快进式提交没有意义" | |
10045 | ||
87cb7997 | 10046 | #: builtin/merge.c:1233 |
2e8451e8 JX |
10047 | #, c-format |
10048 | msgid "%s - not something we can merge" | |
10049 | msgstr "%s - 不能被合并" | |
10050 | ||
87cb7997 | 10051 | #: builtin/merge.c:1235 |
7aea43ff JX |
10052 | msgid "Can merge only exactly one commit into empty head" |
10053 | msgstr "只能将一个提交合并到空分支上" | |
10054 | ||
87cb7997 | 10055 | #: builtin/merge.c:1269 |
1003b3a5 JX |
10056 | #, c-format |
10057 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
10058 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
10059 | ||
87cb7997 | 10060 | #: builtin/merge.c:1272 |
1003b3a5 JX |
10061 | #, c-format |
10062 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
10063 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
10064 | ||
87cb7997 | 10065 | #: builtin/merge.c:1275 |
1003b3a5 JX |
10066 | #, c-format |
10067 | msgid "Commit %s does not have a GPG signature." | |
10068 | msgstr "提交 %s 没有一个 GPG 签名。" | |
10069 | ||
87cb7997 | 10070 | #: builtin/merge.c:1278 |
1003b3a5 JX |
10071 | #, c-format |
10072 | msgid "Commit %s has a good GPG signature by %s\n" | |
10073 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
10074 | ||
87cb7997 | 10075 | #: builtin/merge.c:1340 |
5b04ee3b JX |
10076 | msgid "refusing to merge unrelated histories" |
10077 | msgstr "拒绝合并无关的历史" | |
10078 | ||
87cb7997 | 10079 | #: builtin/merge.c:1349 |
5c57d762 JX |
10080 | msgid "Already up-to-date." |
10081 | msgstr "已经是最新的。" | |
10082 | ||
87cb7997 | 10083 | #: builtin/merge.c:1359 |
c04f5ac3 JX |
10084 | #, c-format |
10085 | msgid "Updating %s..%s\n" | |
10086 | msgstr "更新 %s..%s\n" | |
10087 | ||
87cb7997 | 10088 | #: builtin/merge.c:1400 |
c04f5ac3 JX |
10089 | #, c-format |
10090 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 10091 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 10092 | |
87cb7997 | 10093 | #: builtin/merge.c:1407 |
c04f5ac3 JX |
10094 | #, c-format |
10095 | msgid "Nope.\n" | |
10096 | msgstr "无。\n" | |
10097 | ||
87cb7997 | 10098 | #: builtin/merge.c:1432 |
5c57d762 JX |
10099 | msgid "Already up-to-date. Yeeah!" |
10100 | msgstr "已经是最新的。耶!" | |
10101 | ||
87cb7997 | 10102 | #: builtin/merge.c:1438 |
c04f5ac3 | 10103 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 10104 | msgstr "无法快进,终止。" |
c04f5ac3 | 10105 | |
87cb7997 | 10106 | #: builtin/merge.c:1461 builtin/merge.c:1540 |
c04f5ac3 JX |
10107 | #, c-format |
10108 | msgid "Rewinding the tree to pristine...\n" | |
10109 | msgstr "将树回滚至原始状态...\n" | |
10110 | ||
87cb7997 | 10111 | #: builtin/merge.c:1465 |
c04f5ac3 JX |
10112 | #, c-format |
10113 | msgid "Trying merge strategy %s...\n" | |
10114 | msgstr "尝试合并策略 %s...\n" | |
10115 | ||
87cb7997 | 10116 | #: builtin/merge.c:1531 |
c04f5ac3 JX |
10117 | #, c-format |
10118 | msgid "No merge strategy handled the merge.\n" | |
10119 | msgstr "没有合并策略处理此合并。\n" | |
10120 | ||
87cb7997 | 10121 | #: builtin/merge.c:1533 |
c04f5ac3 JX |
10122 | #, c-format |
10123 | msgid "Merge with strategy %s failed.\n" | |
10124 | msgstr "使用策略 %s 合并失败。\n" | |
10125 | ||
87cb7997 | 10126 | #: builtin/merge.c:1542 |
c04f5ac3 JX |
10127 | #, c-format |
10128 | msgid "Using the %s to prepare resolving by hand.\n" | |
10129 | msgstr "使用 %s 以准备手工解决。\n" | |
10130 | ||
87cb7997 | 10131 | #: builtin/merge.c:1554 |
c04f5ac3 JX |
10132 | #, c-format |
10133 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
10134 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
10135 | ||
cfff71a9 | 10136 | #: builtin/merge-base.c:29 |
814ff314 JX |
10137 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
10138 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 10139 | |
cfff71a9 | 10140 | #: builtin/merge-base.c:30 |
814ff314 JX |
10141 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
10142 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 10143 | |
cfff71a9 | 10144 | #: builtin/merge-base.c:31 |
ef317cd5 | 10145 | msgid "git merge-base --independent <commit>..." |
07432cef | 10146 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 10147 | |
cfff71a9 | 10148 | #: builtin/merge-base.c:32 |
ef317cd5 | 10149 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 10150 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 10151 | |
cfff71a9 JX |
10152 | #: builtin/merge-base.c:33 |
10153 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 10154 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 10155 | |
a0b6b246 | 10156 | #: builtin/merge-base.c:217 |
ef317cd5 | 10157 | msgid "output all common ancestors" |
07432cef | 10158 | msgstr "输出所有共同的祖先" |
ef317cd5 | 10159 | |
a0b6b246 | 10160 | #: builtin/merge-base.c:219 |
ef317cd5 | 10161 | msgid "find ancestors for a single n-way merge" |
07432cef | 10162 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 10163 | |
a0b6b246 | 10164 | #: builtin/merge-base.c:221 |
ef317cd5 | 10165 | msgid "list revs not reachable from others" |
07432cef | 10166 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 10167 | |
a0b6b246 | 10168 | #: builtin/merge-base.c:223 |
ef317cd5 | 10169 | msgid "is the first one ancestor of the other?" |
07432cef | 10170 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 10171 | |
a0b6b246 | 10172 | #: builtin/merge-base.c:225 |
cfff71a9 | 10173 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 10174 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 10175 | |
ef317cd5 JX |
10176 | #: builtin/merge-file.c:8 |
10177 | msgid "" | |
814ff314 JX |
10178 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
10179 | "<orig-file> <file2>" | |
ef317cd5 | 10180 | msgstr "" |
814ff314 JX |
10181 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
10182 | "件> <文件2>" | |
ef317cd5 | 10183 | |
87cb7997 | 10184 | #: builtin/merge-file.c:32 |
ef317cd5 | 10185 | msgid "send results to standard output" |
07432cef | 10186 | msgstr "将结果发送到标准输出" |
ef317cd5 | 10187 | |
87cb7997 | 10188 | #: builtin/merge-file.c:33 |
ef317cd5 | 10189 | msgid "use a diff3 based merge" |
07432cef | 10190 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 10191 | |
87cb7997 | 10192 | #: builtin/merge-file.c:34 |
ef317cd5 | 10193 | msgid "for conflicts, use our version" |
07432cef | 10194 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 10195 | |
87cb7997 | 10196 | #: builtin/merge-file.c:36 |
ef317cd5 | 10197 | msgid "for conflicts, use their version" |
07432cef | 10198 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 10199 | |
87cb7997 | 10200 | #: builtin/merge-file.c:38 |
ef317cd5 | 10201 | msgid "for conflicts, use a union version" |
07432cef | 10202 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 10203 | |
87cb7997 | 10204 | #: builtin/merge-file.c:41 |
ef317cd5 | 10205 | msgid "for conflicts, use this marker size" |
07432cef | 10206 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 10207 | |
87cb7997 | 10208 | #: builtin/merge-file.c:42 |
ef317cd5 | 10209 | msgid "do not warn about conflicts" |
07432cef | 10210 | msgstr "不要警告冲突" |
ef317cd5 | 10211 | |
87cb7997 | 10212 | #: builtin/merge-file.c:44 |
814ff314 JX |
10213 | msgid "set labels for file1/orig-file/file2" |
10214 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 10215 | |
a0b6b246 JX |
10216 | #: builtin/merge-recursive.c:45 |
10217 | #, c-format | |
10218 | msgid "unknown option %s" | |
10219 | msgstr "未知选项 %s" | |
10220 | ||
10221 | #: builtin/merge-recursive.c:51 | |
10222 | #, c-format | |
10223 | msgid "could not parse object '%s'" | |
10224 | msgstr "不能解析对象 '%s'" | |
10225 | ||
10226 | #: builtin/merge-recursive.c:55 | |
10227 | #, c-format | |
10228 | msgid "cannot handle more than %d base. Ignoring %s." | |
10229 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
10230 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
10231 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
10232 | ||
10233 | #: builtin/merge-recursive.c:63 | |
10234 | msgid "not handling anything other than two heads merge." | |
10235 | msgstr "不能处理两个头合并之外的任何操作。" | |
10236 | ||
10237 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
10238 | #, c-format | |
10239 | msgid "could not resolve ref '%s'" | |
10240 | msgstr "无法解析引用 '%s'" | |
10241 | ||
10242 | #: builtin/merge-recursive.c:77 | |
10243 | #, c-format | |
10244 | msgid "Merging %s with %s\n" | |
10245 | msgstr "合并 %s 和 %s\n" | |
10246 | ||
276ceeaa | 10247 | #: builtin/mktree.c:65 |
ef317cd5 | 10248 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 10249 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 10250 | |
276ceeaa | 10251 | #: builtin/mktree.c:152 |
ef317cd5 | 10252 | msgid "input is NUL terminated" |
07432cef | 10253 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 10254 | |
276ceeaa | 10255 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
ef317cd5 | 10256 | msgid "allow missing objects" |
07432cef | 10257 | msgstr "允许丢失的对象" |
c04f5ac3 | 10258 | |
276ceeaa | 10259 | #: builtin/mktree.c:154 |
ef317cd5 | 10260 | msgid "allow creation of more than one tree" |
07432cef | 10261 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 10262 | |
1a79b2f1 | 10263 | #: builtin/mv.c:16 |
814ff314 JX |
10264 | msgid "git mv [<options>] <source>... <destination>" |
10265 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 10266 | |
1a79b2f1 | 10267 | #: builtin/mv.c:82 |
220c313c JX |
10268 | #, c-format |
10269 | msgid "Directory %s is in index and no submodule?" | |
10270 | msgstr "目录 %s 在索引中并且不是子模组?" | |
10271 | ||
1a79b2f1 | 10272 | #: builtin/mv.c:84 builtin/rm.c:290 |
220c313c | 10273 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 10274 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c | 10275 | |
1a79b2f1 | 10276 | #: builtin/mv.c:102 |
220c313c JX |
10277 | #, c-format |
10278 | msgid "%.*s is in index" | |
10279 | msgstr "%.*s 在索引中" | |
10280 | ||
1a79b2f1 | 10281 | #: builtin/mv.c:124 |
ef317cd5 | 10282 | msgid "force move/rename even if target exists" |
07432cef | 10283 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 10284 | |
1a79b2f1 | 10285 | #: builtin/mv.c:125 |
ef317cd5 | 10286 | msgid "skip move/rename errors" |
07432cef | 10287 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 10288 | |
1a79b2f1 | 10289 | #: builtin/mv.c:167 |
220c313c JX |
10290 | #, c-format |
10291 | msgid "destination '%s' is not a directory" | |
10292 | msgstr "目标 '%s' 不是一个目录" | |
10293 | ||
1a79b2f1 | 10294 | #: builtin/mv.c:178 |
c04f5ac3 JX |
10295 | #, c-format |
10296 | msgid "Checking rename of '%s' to '%s'\n" | |
10297 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
10298 | ||
1a79b2f1 | 10299 | #: builtin/mv.c:182 |
c04f5ac3 JX |
10300 | msgid "bad source" |
10301 | msgstr "坏的源" | |
10302 | ||
1a79b2f1 | 10303 | #: builtin/mv.c:185 |
c04f5ac3 JX |
10304 | msgid "can not move directory into itself" |
10305 | msgstr "不能将目录移动到自身" | |
10306 | ||
1a79b2f1 | 10307 | #: builtin/mv.c:188 |
c04f5ac3 JX |
10308 | msgid "cannot move directory over file" |
10309 | msgstr "不能将目录移动到文件" | |
10310 | ||
1a79b2f1 | 10311 | #: builtin/mv.c:197 |
c04f5ac3 JX |
10312 | msgid "source directory is empty" |
10313 | msgstr "源目录为空" | |
10314 | ||
1a79b2f1 | 10315 | #: builtin/mv.c:222 |
c04f5ac3 JX |
10316 | msgid "not under version control" |
10317 | msgstr "不在版本控制之下" | |
10318 | ||
1a79b2f1 | 10319 | #: builtin/mv.c:225 |
c04f5ac3 JX |
10320 | msgid "destination exists" |
10321 | msgstr "目标已存在" | |
10322 | ||
1a79b2f1 | 10323 | #: builtin/mv.c:233 |
c04f5ac3 JX |
10324 | #, c-format |
10325 | msgid "overwriting '%s'" | |
10326 | msgstr "覆盖 '%s'" | |
10327 | ||
1a79b2f1 | 10328 | #: builtin/mv.c:236 |
c04f5ac3 JX |
10329 | msgid "Cannot overwrite" |
10330 | msgstr "不能覆盖" | |
10331 | ||
1a79b2f1 | 10332 | #: builtin/mv.c:239 |
c04f5ac3 JX |
10333 | msgid "multiple sources for the same target" |
10334 | msgstr "同一目标具有多个源" | |
10335 | ||
1a79b2f1 | 10336 | #: builtin/mv.c:241 |
cfff71a9 JX |
10337 | msgid "destination directory does not exist" |
10338 | msgstr "目标目录不存在" | |
10339 | ||
1a79b2f1 | 10340 | #: builtin/mv.c:248 |
c04f5ac3 JX |
10341 | #, c-format |
10342 | msgid "%s, source=%s, destination=%s" | |
10343 | msgstr "%s,源=%s,目标=%s" | |
10344 | ||
1a79b2f1 | 10345 | #: builtin/mv.c:269 |
c04f5ac3 JX |
10346 | #, c-format |
10347 | msgid "Renaming %s to %s\n" | |
10348 | msgstr "重命名 %s 至 %s\n" | |
10349 | ||
1a79b2f1 | 10350 | #: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 |
c04f5ac3 JX |
10351 | #, c-format |
10352 | msgid "renaming '%s' failed" | |
10353 | msgstr "重命名 '%s' 失败" | |
10354 | ||
87cb7997 | 10355 | #: builtin/name-rev.c:289 |
814ff314 JX |
10356 | msgid "git name-rev [<options>] <commit>..." |
10357 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 10358 | |
87cb7997 | 10359 | #: builtin/name-rev.c:290 |
814ff314 JX |
10360 | msgid "git name-rev [<options>] --all" |
10361 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 10362 | |
87cb7997 | 10363 | #: builtin/name-rev.c:291 |
814ff314 JX |
10364 | msgid "git name-rev [<options>] --stdin" |
10365 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 10366 | |
87cb7997 | 10367 | #: builtin/name-rev.c:346 |
ef317cd5 | 10368 | msgid "print only names (no SHA-1)" |
07432cef | 10369 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 10370 | |
87cb7997 | 10371 | #: builtin/name-rev.c:347 |
ef317cd5 | 10372 | msgid "only use tags to name the commits" |
55a16ee4 | 10373 | msgstr "只使用标签来命名提交" |
ef317cd5 | 10374 | |
87cb7997 | 10375 | #: builtin/name-rev.c:349 |
ef317cd5 | 10376 | msgid "only use refs matching <pattern>" |
07432cef | 10377 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 10378 | |
87cb7997 JX |
10379 | #: builtin/name-rev.c:351 |
10380 | msgid "ignore refs matching <pattern>" | |
10381 | msgstr "忽略和 <模式> 相匹配的引用" | |
10382 | ||
10383 | #: builtin/name-rev.c:353 | |
ef317cd5 | 10384 | msgid "list all commits reachable from all refs" |
07432cef | 10385 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 10386 | |
87cb7997 | 10387 | #: builtin/name-rev.c:354 |
ef317cd5 | 10388 | msgid "read from stdin" |
07432cef | 10389 | msgstr "从标准输入读取" |
ef317cd5 | 10390 | |
87cb7997 | 10391 | #: builtin/name-rev.c:355 |
90314792 JX |
10392 | msgid "allow to print `undefined` names (default)" |
10393 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 10394 | |
87cb7997 | 10395 | #: builtin/name-rev.c:361 |
2e8451e8 | 10396 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 10397 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 10398 | |
1b7f4a34 | 10399 | #: builtin/notes.c:25 |
814ff314 | 10400 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 10401 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 10402 | |
1b7f4a34 | 10403 | #: builtin/notes.c:26 |
ef317cd5 | 10404 | msgid "" |
814ff314 | 10405 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 10406 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 10407 | msgstr "" |
04cb2f28 JX |
10408 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
10409 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 10410 | |
1b7f4a34 | 10411 | #: builtin/notes.c:27 |
814ff314 | 10412 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 10413 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 10414 | |
1b7f4a34 | 10415 | #: builtin/notes.c:28 |
ef317cd5 | 10416 | msgid "" |
814ff314 | 10417 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 10418 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 10419 | msgstr "" |
04cb2f28 JX |
10420 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
10421 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 10422 | |
1b7f4a34 | 10423 | #: builtin/notes.c:29 |
814ff314 | 10424 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 10425 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 10426 | |
1b7f4a34 | 10427 | #: builtin/notes.c:30 |
814ff314 | 10428 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 10429 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 10430 | |
1b7f4a34 | 10431 | #: builtin/notes.c:31 |
ef317cd5 | 10432 | msgid "" |
814ff314 | 10433 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 10434 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 10435 | |
1b7f4a34 | 10436 | #: builtin/notes.c:32 |
ef317cd5 | 10437 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 10438 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 10439 | |
1b7f4a34 | 10440 | #: builtin/notes.c:33 |
ef317cd5 | 10441 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 10442 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 10443 | |
1b7f4a34 | 10444 | #: builtin/notes.c:34 |
814ff314 | 10445 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 10446 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 10447 | |
1b7f4a34 | 10448 | #: builtin/notes.c:35 |
814ff314 | 10449 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 10450 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 10451 | |
1b7f4a34 | 10452 | #: builtin/notes.c:36 |
814ff314 | 10453 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 10454 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 10455 | |
1b7f4a34 | 10456 | #: builtin/notes.c:41 |
ef317cd5 | 10457 | msgid "git notes [list [<object>]]" |
07432cef | 10458 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 10459 | |
1b7f4a34 | 10460 | #: builtin/notes.c:46 |
ef317cd5 | 10461 | msgid "git notes add [<options>] [<object>]" |
07432cef | 10462 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 10463 | |
1b7f4a34 | 10464 | #: builtin/notes.c:51 |
ef317cd5 | 10465 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 10466 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 10467 | |
1b7f4a34 | 10468 | #: builtin/notes.c:52 |
ef317cd5 | 10469 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 10470 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 10471 | |
1b7f4a34 | 10472 | #: builtin/notes.c:57 |
ef317cd5 | 10473 | msgid "git notes append [<options>] [<object>]" |
07432cef | 10474 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 10475 | |
1b7f4a34 | 10476 | #: builtin/notes.c:62 |
ef317cd5 | 10477 | msgid "git notes edit [<object>]" |
07432cef | 10478 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 10479 | |
1b7f4a34 | 10480 | #: builtin/notes.c:67 |
ef317cd5 | 10481 | msgid "git notes show [<object>]" |
07432cef | 10482 | msgstr "git notes show [<对象>]" |
ef317cd5 | 10483 | |
1b7f4a34 | 10484 | #: builtin/notes.c:72 |
814ff314 | 10485 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 10486 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 10487 | |
1b7f4a34 | 10488 | #: builtin/notes.c:73 |
ef317cd5 | 10489 | msgid "git notes merge --commit [<options>]" |
07432cef | 10490 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 10491 | |
1b7f4a34 | 10492 | #: builtin/notes.c:74 |
ef317cd5 | 10493 | msgid "git notes merge --abort [<options>]" |
07432cef | 10494 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 10495 | |
1b7f4a34 | 10496 | #: builtin/notes.c:79 |
ef317cd5 | 10497 | msgid "git notes remove [<object>]" |
07432cef | 10498 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 10499 | |
1b7f4a34 | 10500 | #: builtin/notes.c:84 |
ef317cd5 | 10501 | msgid "git notes prune [<options>]" |
07432cef | 10502 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 10503 | |
1b7f4a34 | 10504 | #: builtin/notes.c:89 |
ef317cd5 | 10505 | msgid "git notes get-ref" |
07432cef | 10506 | msgstr "git notes get-ref" |
ef317cd5 | 10507 | |
5c57d762 JX |
10508 | #: builtin/notes.c:94 |
10509 | msgid "Write/edit the notes for the following object:" | |
10510 | msgstr "为下面的对象写/编辑说明:" | |
10511 | ||
1b7f4a34 | 10512 | #: builtin/notes.c:147 |
c04f5ac3 JX |
10513 | #, c-format |
10514 | msgid "unable to start 'show' for object '%s'" | |
10515 | msgstr "不能为对象 '%s' 开始 'show'" | |
10516 | ||
1b7f4a34 | 10517 | #: builtin/notes.c:151 |
a77c07d9 JX |
10518 | msgid "could not read 'show' output" |
10519 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 10520 | |
1b7f4a34 | 10521 | #: builtin/notes.c:159 |
c04f5ac3 JX |
10522 | #, c-format |
10523 | msgid "failed to finish 'show' for object '%s'" | |
10524 | msgstr "无法为对象 '%s' 完成 'show'" | |
10525 | ||
5c57d762 | 10526 | #: builtin/notes.c:194 |
a0b6b246 | 10527 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
10528 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
10529 | ||
5c57d762 | 10530 | #: builtin/notes.c:203 |
c04f5ac3 JX |
10531 | msgid "unable to write note object" |
10532 | msgstr "不能写注解对象" | |
10533 | ||
5c57d762 | 10534 | #: builtin/notes.c:205 |
c04f5ac3 | 10535 | #, c-format |
a0b6b246 | 10536 | msgid "the note contents have been left in %s" |
220c313c | 10537 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 10538 | |
87cb7997 | 10539 | #: builtin/notes.c:233 builtin/tag.c:516 |
c04f5ac3 JX |
10540 | #, c-format |
10541 | msgid "cannot read '%s'" | |
10542 | msgstr "不能读取 '%s'" | |
10543 | ||
87cb7997 | 10544 | #: builtin/notes.c:235 builtin/tag.c:519 |
c04f5ac3 JX |
10545 | #, c-format |
10546 | msgid "could not open or read '%s'" | |
10547 | msgstr "不能打开或读取 '%s'" | |
10548 | ||
a0b6b246 JX |
10549 | #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 |
10550 | #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 | |
87cb7997 | 10551 | #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 |
a0b6b246 JX |
10552 | #, c-format |
10553 | msgid "failed to resolve '%s' as a valid ref." | |
10554 | msgstr "无法解析 '%s' 为一个有效引用。" | |
10555 | ||
5c57d762 | 10556 | #: builtin/notes.c:257 |
c04f5ac3 | 10557 | #, c-format |
a0b6b246 | 10558 | msgid "failed to read object '%s'." |
c04f5ac3 JX |
10559 | msgstr "无法读取对象 '%s'。" |
10560 | ||
5c57d762 | 10561 | #: builtin/notes.c:261 |
6c94aba5 | 10562 | #, c-format |
a0b6b246 JX |
10563 | msgid "cannot read note data from non-blob object '%s'." |
10564 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
10565 | ||
10566 | #: builtin/notes.c:301 | |
10567 | #, c-format | |
10568 | msgid "malformed input line: '%s'." | |
10569 | msgstr "非法的输入行:'%s'。" | |
10570 | ||
10571 | #: builtin/notes.c:316 | |
10572 | #, c-format | |
10573 | msgid "failed to copy notes from '%s' to '%s'" | |
10574 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 10575 | |
a0b6b246 JX |
10576 | #. TRANSLATORS: the first %s will be replaced by a |
10577 | #. git notes command: 'add', 'merge', 'remove', etc. | |
10578 | #: builtin/notes.c:345 | |
10579 | #, c-format | |
10580 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
10581 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
10582 | ||
10583 | #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 | |
87cb7997 JX |
10584 | #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 |
10585 | #: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 | |
c04f5ac3 JX |
10586 | msgid "too many parameters" |
10587 | msgstr "参数太多" | |
10588 | ||
87cb7997 | 10589 | #: builtin/notes.c:378 builtin/notes.c:664 |
c04f5ac3 | 10590 | #, c-format |
a0b6b246 | 10591 | msgid "no note found for object %s." |
c04f5ac3 JX |
10592 | msgstr "未发现对象 %s 的注解。" |
10593 | ||
a0b6b246 | 10594 | #: builtin/notes.c:399 builtin/notes.c:562 |
ef317cd5 | 10595 | msgid "note contents as a string" |
07432cef | 10596 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 10597 | |
a0b6b246 | 10598 | #: builtin/notes.c:402 builtin/notes.c:565 |
ef317cd5 | 10599 | msgid "note contents in a file" |
07432cef | 10600 | msgstr "注解内容到一个文件中" |
ef317cd5 | 10601 | |
a0b6b246 | 10602 | #: builtin/notes.c:405 builtin/notes.c:568 |
ef317cd5 | 10603 | msgid "reuse and edit specified note object" |
07432cef | 10604 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 10605 | |
a0b6b246 | 10606 | #: builtin/notes.c:408 builtin/notes.c:571 |
ef317cd5 | 10607 | msgid "reuse specified note object" |
07432cef | 10608 | msgstr "重用指定的注解对象" |
ef317cd5 | 10609 | |
a0b6b246 | 10610 | #: builtin/notes.c:411 builtin/notes.c:574 |
04cb2f28 JX |
10611 | msgid "allow storing empty note" |
10612 | msgstr "允许保存空白注释" | |
10613 | ||
a0b6b246 | 10614 | #: builtin/notes.c:412 builtin/notes.c:483 |
ef317cd5 | 10615 | msgid "replace existing notes" |
07432cef | 10616 | msgstr "替换已存在的注解" |
ef317cd5 | 10617 | |
a0b6b246 | 10618 | #: builtin/notes.c:437 |
c04f5ac3 JX |
10619 | #, c-format |
10620 | msgid "" | |
10621 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
10622 | "existing notes" | |
10623 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
10624 | ||
a0b6b246 | 10625 | #: builtin/notes.c:452 builtin/notes.c:531 |
c04f5ac3 JX |
10626 | #, c-format |
10627 | msgid "Overwriting existing notes for object %s\n" | |
10628 | msgstr "覆盖对象 %s 现存注解\n" | |
10629 | ||
87cb7997 | 10630 | #: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 |
04cb2f28 JX |
10631 | #, c-format |
10632 | msgid "Removing note for object %s\n" | |
10633 | msgstr "删除对象 %s 的注解\n" | |
10634 | ||
a0b6b246 | 10635 | #: builtin/notes.c:484 |
ef317cd5 | 10636 | msgid "read objects from stdin" |
07432cef | 10637 | msgstr "从标准输入读取对象" |
ef317cd5 | 10638 | |
a0b6b246 | 10639 | #: builtin/notes.c:486 |
ef317cd5 | 10640 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 10641 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 10642 | |
a0b6b246 | 10643 | #: builtin/notes.c:504 |
c04f5ac3 JX |
10644 | msgid "too few parameters" |
10645 | msgstr "参数太少" | |
10646 | ||
a0b6b246 | 10647 | #: builtin/notes.c:525 |
c04f5ac3 JX |
10648 | #, c-format |
10649 | msgid "" | |
10650 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
10651 | "existing notes" | |
10652 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
10653 | ||
a0b6b246 | 10654 | #: builtin/notes.c:537 |
c04f5ac3 | 10655 | #, c-format |
a0b6b246 | 10656 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
10657 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
10658 | ||
a0b6b246 | 10659 | #: builtin/notes.c:589 |
ef317cd5 JX |
10660 | #, c-format |
10661 | msgid "" | |
10662 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
10663 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
10664 | msgstr "" | |
10665 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
10666 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
10667 | ||
87cb7997 | 10668 | #: builtin/notes.c:684 |
a0b6b246 JX |
10669 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
10670 | msgstr "无法删除引用 NOTES_MERGE_PARTIAL" | |
10671 | ||
87cb7997 | 10672 | #: builtin/notes.c:686 |
a0b6b246 JX |
10673 | msgid "failed to delete ref NOTES_MERGE_REF" |
10674 | msgstr "无法删除引用 NOTES_MERGE_REF" | |
10675 | ||
87cb7997 | 10676 | #: builtin/notes.c:688 |
a0b6b246 JX |
10677 | msgid "failed to remove 'git notes merge' worktree" |
10678 | msgstr "无法删除 'git notes merge' 工作区" | |
10679 | ||
87cb7997 | 10680 | #: builtin/notes.c:708 |
a0b6b246 JX |
10681 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
10682 | msgstr "无法读取引用 NOTES_MERGE_PARTIAL" | |
10683 | ||
87cb7997 | 10684 | #: builtin/notes.c:710 |
a0b6b246 JX |
10685 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
10686 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
10687 | ||
87cb7997 | 10688 | #: builtin/notes.c:712 |
a0b6b246 JX |
10689 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
10690 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
10691 | ||
87cb7997 | 10692 | #: builtin/notes.c:725 |
a0b6b246 JX |
10693 | msgid "failed to resolve NOTES_MERGE_REF" |
10694 | msgstr "无法解析 NOTES_MERGE_REF" | |
10695 | ||
87cb7997 | 10696 | #: builtin/notes.c:728 |
a0b6b246 JX |
10697 | msgid "failed to finalize notes merge" |
10698 | msgstr "无法完成注解合并" | |
10699 | ||
87cb7997 | 10700 | #: builtin/notes.c:754 |
5c57d762 JX |
10701 | #, c-format |
10702 | msgid "unknown notes merge strategy %s" | |
10703 | msgstr "未知的注解合并策略 %s" | |
10704 | ||
87cb7997 | 10705 | #: builtin/notes.c:770 |
ef317cd5 | 10706 | msgid "General options" |
07432cef | 10707 | msgstr "通用选项" |
ef317cd5 | 10708 | |
87cb7997 | 10709 | #: builtin/notes.c:772 |
ef317cd5 | 10710 | msgid "Merge options" |
07432cef | 10711 | msgstr "合并选项" |
ef317cd5 | 10712 | |
87cb7997 | 10713 | #: builtin/notes.c:774 |
ef317cd5 JX |
10714 | msgid "" |
10715 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
10716 | "cat_sort_uniq)" | |
07432cef | 10717 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 10718 | |
87cb7997 | 10719 | #: builtin/notes.c:776 |
ef317cd5 | 10720 | msgid "Committing unmerged notes" |
07432cef | 10721 | msgstr "提交未合并的注解" |
ef317cd5 | 10722 | |
87cb7997 | 10723 | #: builtin/notes.c:778 |
ef317cd5 | 10724 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 10725 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 10726 | |
87cb7997 | 10727 | #: builtin/notes.c:780 |
ef317cd5 | 10728 | msgid "Aborting notes merge resolution" |
07432cef | 10729 | msgstr "中止注解合并的方案" |
ef317cd5 | 10730 | |
87cb7997 | 10731 | #: builtin/notes.c:782 |
ef317cd5 | 10732 | msgid "abort notes merge" |
07432cef | 10733 | msgstr "中止注解合并" |
ef317cd5 | 10734 | |
87cb7997 | 10735 | #: builtin/notes.c:793 |
5c57d762 JX |
10736 | msgid "cannot mix --commit, --abort or -s/--strategy" |
10737 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
10738 | ||
87cb7997 | 10739 | #: builtin/notes.c:798 |
a0b6b246 | 10740 | msgid "must specify a notes ref to merge" |
9a4b694c | 10741 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 10742 | |
87cb7997 | 10743 | #: builtin/notes.c:822 |
5c57d762 | 10744 | #, c-format |
a0b6b246 | 10745 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
10746 | msgstr "未知的 -s/--strategy:%s" |
10747 | ||
87cb7997 | 10748 | #: builtin/notes.c:859 |
1b7f4a34 | 10749 | #, c-format |
a0b6b246 JX |
10750 | msgid "a notes merge into %s is already in-progress at %s" |
10751 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 10752 | |
87cb7997 | 10753 | #: builtin/notes.c:862 |
5c57d762 | 10754 | #, c-format |
a0b6b246 JX |
10755 | msgid "failed to store link to current notes ref (%s)" |
10756 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 10757 | |
87cb7997 | 10758 | #: builtin/notes.c:864 |
5c57d762 JX |
10759 | #, c-format |
10760 | msgid "" | |
10761 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
10762 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
10763 | "abort'.\n" | |
a0b6b246 JX |
10764 | msgstr "" |
10765 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
10766 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 10767 | |
87cb7997 | 10768 | #: builtin/notes.c:886 |
ef317cd5 JX |
10769 | #, c-format |
10770 | msgid "Object %s has no note\n" | |
10771 | msgstr "对象 %s 没有注解\n" | |
10772 | ||
87cb7997 | 10773 | #: builtin/notes.c:898 |
ef317cd5 | 10774 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 10775 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 10776 | |
87cb7997 | 10777 | #: builtin/notes.c:901 |
ef317cd5 | 10778 | msgid "read object names from the standard input" |
07432cef | 10779 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 10780 | |
87cb7997 | 10781 | #: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 |
5c57d762 JX |
10782 | msgid "do not remove, show only" |
10783 | msgstr "不删除,只显示" | |
10784 | ||
87cb7997 | 10785 | #: builtin/notes.c:940 |
5c57d762 JX |
10786 | msgid "report pruned notes" |
10787 | msgstr "报告清除的注解" | |
10788 | ||
87cb7997 | 10789 | #: builtin/notes.c:982 |
6c94aba5 | 10790 | msgid "notes-ref" |
07432cef | 10791 | msgstr "注解引用" |
ef317cd5 | 10792 | |
87cb7997 | 10793 | #: builtin/notes.c:983 |
814ff314 | 10794 | msgid "use notes from <notes-ref>" |
07432cef | 10795 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 10796 | |
87cb7997 | 10797 | #: builtin/notes.c:1018 |
ef317cd5 | 10798 | #, c-format |
a0b6b246 | 10799 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
10800 | msgstr "未知子命令:%s" |
10801 | ||
a0b6b246 | 10802 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
10803 | msgid "" |
10804 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
10805 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 10806 | |
a0b6b246 | 10807 | #: builtin/pack-objects.c:30 |
1b7f4a34 JX |
10808 | msgid "" |
10809 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
10810 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 10811 | |
1a79b2f1 | 10812 | #: builtin/pack-objects.c:177 builtin/pack-objects.c:180 |
ef317cd5 JX |
10813 | #, c-format |
10814 | msgid "deflate error (%d)" | |
10815 | msgstr "压缩错误 (%d)" | |
10816 | ||
87cb7997 | 10817 | #: builtin/pack-objects.c:770 |
5b04ee3b JX |
10818 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
10819 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
10820 | ||
87cb7997 | 10821 | #: builtin/pack-objects.c:783 |
6c94aba5 JX |
10822 | msgid "Writing objects" |
10823 | msgstr "写入对象中" | |
10824 | ||
87cb7997 | 10825 | #: builtin/pack-objects.c:1063 |
6c94aba5 JX |
10826 | msgid "disabling bitmap writing, as some objects are not being packed" |
10827 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
10828 | ||
87cb7997 | 10829 | #: builtin/pack-objects.c:2426 |
6c94aba5 JX |
10830 | msgid "Compressing objects" |
10831 | msgstr "压缩对象中" | |
10832 | ||
87cb7997 | 10833 | #: builtin/pack-objects.c:2829 |
ef317cd5 JX |
10834 | #, c-format |
10835 | msgid "unsupported index version %s" | |
10836 | msgstr "不支持的索引版本 %s" | |
10837 | ||
87cb7997 | 10838 | #: builtin/pack-objects.c:2833 |
ef317cd5 JX |
10839 | #, c-format |
10840 | msgid "bad index version '%s'" | |
10841 | msgstr "坏的索引版本 '%s'" | |
10842 | ||
87cb7997 | 10843 | #: builtin/pack-objects.c:2863 |
ef317cd5 | 10844 | msgid "do not show progress meter" |
07432cef | 10845 | msgstr "不显示进度表" |
ef317cd5 | 10846 | |
87cb7997 | 10847 | #: builtin/pack-objects.c:2865 |
ef317cd5 | 10848 | msgid "show progress meter" |
07432cef | 10849 | msgstr "显示进度表" |
ef317cd5 | 10850 | |
87cb7997 | 10851 | #: builtin/pack-objects.c:2867 |
ef317cd5 | 10852 | msgid "show progress meter during object writing phase" |
07432cef | 10853 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 10854 | |
87cb7997 | 10855 | #: builtin/pack-objects.c:2870 |
ef317cd5 | 10856 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 10857 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 10858 | |
87cb7997 | 10859 | #: builtin/pack-objects.c:2871 |
ef317cd5 | 10860 | msgid "version[,offset]" |
07432cef | 10861 | msgstr "版本[,偏移]" |
ef317cd5 | 10862 | |
87cb7997 | 10863 | #: builtin/pack-objects.c:2872 |
ef317cd5 | 10864 | msgid "write the pack index file in the specified idx format version" |
07432cef | 10865 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 10866 | |
87cb7997 | 10867 | #: builtin/pack-objects.c:2875 |
ef317cd5 | 10868 | msgid "maximum size of each output pack file" |
07432cef | 10869 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 10870 | |
87cb7997 | 10871 | #: builtin/pack-objects.c:2877 |
ef317cd5 | 10872 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 10873 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 10874 | |
87cb7997 | 10875 | #: builtin/pack-objects.c:2879 |
ef317cd5 | 10876 | msgid "ignore packed objects" |
07432cef | 10877 | msgstr "忽略包对象" |
ef317cd5 | 10878 | |
87cb7997 | 10879 | #: builtin/pack-objects.c:2881 |
ef317cd5 | 10880 | msgid "limit pack window by objects" |
07432cef | 10881 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 10882 | |
87cb7997 | 10883 | #: builtin/pack-objects.c:2883 |
ef317cd5 | 10884 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 10885 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 10886 | |
87cb7997 | 10887 | #: builtin/pack-objects.c:2885 |
ef317cd5 | 10888 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 10889 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 10890 | |
87cb7997 | 10891 | #: builtin/pack-objects.c:2887 |
ef317cd5 | 10892 | msgid "reuse existing deltas" |
07432cef | 10893 | msgstr "重用已存在的 deltas" |
ef317cd5 | 10894 | |
87cb7997 | 10895 | #: builtin/pack-objects.c:2889 |
ef317cd5 | 10896 | msgid "reuse existing objects" |
07432cef | 10897 | msgstr "重用已存在的对象" |
ef317cd5 | 10898 | |
87cb7997 | 10899 | #: builtin/pack-objects.c:2891 |
ef317cd5 | 10900 | msgid "use OFS_DELTA objects" |
07432cef | 10901 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 10902 | |
87cb7997 | 10903 | #: builtin/pack-objects.c:2893 |
ef317cd5 | 10904 | msgid "use threads when searching for best delta matches" |
07432cef | 10905 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 10906 | |
87cb7997 | 10907 | #: builtin/pack-objects.c:2895 |
ef317cd5 | 10908 | msgid "do not create an empty pack output" |
07432cef | 10909 | msgstr "不创建空的包输出" |
ef317cd5 | 10910 | |
87cb7997 | 10911 | #: builtin/pack-objects.c:2897 |
ef317cd5 | 10912 | msgid "read revision arguments from standard input" |
d9d56b23 | 10913 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 10914 | |
87cb7997 | 10915 | #: builtin/pack-objects.c:2899 |
ef317cd5 | 10916 | msgid "limit the objects to those that are not yet packed" |
07432cef | 10917 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 10918 | |
87cb7997 | 10919 | #: builtin/pack-objects.c:2902 |
ef317cd5 | 10920 | msgid "include objects reachable from any reference" |
07432cef | 10921 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 10922 | |
87cb7997 | 10923 | #: builtin/pack-objects.c:2905 |
ef317cd5 | 10924 | msgid "include objects referred by reflog entries" |
07432cef | 10925 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 10926 | |
87cb7997 | 10927 | #: builtin/pack-objects.c:2908 |
220c313c JX |
10928 | msgid "include objects referred to by the index" |
10929 | msgstr "包括被索引引用到的对象" | |
10930 | ||
87cb7997 | 10931 | #: builtin/pack-objects.c:2911 |
ef317cd5 | 10932 | msgid "output pack to stdout" |
07432cef | 10933 | msgstr "输出包到标准输出" |
ef317cd5 | 10934 | |
87cb7997 | 10935 | #: builtin/pack-objects.c:2913 |
ef317cd5 | 10936 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 10937 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 10938 | |
87cb7997 | 10939 | #: builtin/pack-objects.c:2915 |
ef317cd5 | 10940 | msgid "keep unreachable objects" |
07432cef | 10941 | msgstr "维持不可达的对象" |
ef317cd5 | 10942 | |
87cb7997 | 10943 | #: builtin/pack-objects.c:2917 |
5c57d762 JX |
10944 | msgid "pack loose unreachable objects" |
10945 | msgstr "打包松散的不可达对象" | |
10946 | ||
87cb7997 | 10947 | #: builtin/pack-objects.c:2919 |
ef317cd5 | 10948 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 10949 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 10950 | |
87cb7997 | 10951 | #: builtin/pack-objects.c:2922 |
ef317cd5 | 10952 | msgid "create thin packs" |
07432cef | 10953 | msgstr "创建精简包" |
ef317cd5 | 10954 | |
87cb7997 | 10955 | #: builtin/pack-objects.c:2924 |
04cb2f28 | 10956 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 10957 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 10958 | |
87cb7997 | 10959 | #: builtin/pack-objects.c:2926 |
ef317cd5 | 10960 | msgid "ignore packs that have companion .keep file" |
07432cef | 10961 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 10962 | |
87cb7997 | 10963 | #: builtin/pack-objects.c:2928 |
ef317cd5 | 10964 | msgid "pack compression level" |
07432cef | 10965 | msgstr "打包压缩级别" |
ef317cd5 | 10966 | |
87cb7997 | 10967 | #: builtin/pack-objects.c:2930 |
ef317cd5 | 10968 | msgid "do not hide commits by grafts" |
cfff71a9 | 10969 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 10970 | |
87cb7997 | 10971 | #: builtin/pack-objects.c:2932 |
6c94aba5 JX |
10972 | msgid "use a bitmap index if available to speed up counting objects" |
10973 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
10974 | ||
87cb7997 | 10975 | #: builtin/pack-objects.c:2934 |
6c94aba5 JX |
10976 | msgid "write a bitmap index together with the pack index" |
10977 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
10978 | ||
87cb7997 | 10979 | #: builtin/pack-objects.c:3061 |
6c94aba5 JX |
10980 | msgid "Counting objects" |
10981 | msgstr "对象计数中" | |
10982 | ||
ef317cd5 | 10983 | #: builtin/pack-refs.c:6 |
814ff314 JX |
10984 | msgid "git pack-refs [<options>]" |
10985 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 10986 | |
ef317cd5 JX |
10987 | #: builtin/pack-refs.c:14 |
10988 | msgid "pack everything" | |
07432cef | 10989 | msgstr "打包一切" |
c04f5ac3 | 10990 | |
ef317cd5 JX |
10991 | #: builtin/pack-refs.c:15 |
10992 | msgid "prune loose refs (default)" | |
07432cef | 10993 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 10994 | |
ef317cd5 | 10995 | #: builtin/prune-packed.c:7 |
814ff314 JX |
10996 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
10997 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 10998 | |
220c313c | 10999 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
11000 | msgid "Removing duplicate objects" |
11001 | msgstr "正在删除重复对象" | |
11002 | ||
5bb01d4f | 11003 | #: builtin/prune.c:11 |
ef317cd5 | 11004 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 11005 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 11006 | |
1a79b2f1 | 11007 | #: builtin/prune.c:106 |
1b7f4a34 JX |
11008 | msgid "report pruned objects" |
11009 | msgstr "报告清除的对象" | |
11010 | ||
1a79b2f1 | 11011 | #: builtin/prune.c:109 |
1b7f4a34 JX |
11012 | msgid "expire objects older than <time>" |
11013 | msgstr "使早于给定时间的对象过期" | |
11014 | ||
94550ed3 JX |
11015 | #: builtin/prune.c:123 |
11016 | msgid "cannot prune in a precious-objects repo" | |
11017 | msgstr "不能在珍品仓库中执行清理操作" | |
11018 | ||
a0b6b246 JX |
11019 | #: builtin/pull.c:51 builtin/pull.c:53 |
11020 | #, c-format | |
11021 | msgid "Invalid value for %s: %s" | |
11022 | msgstr "%s 的值无效:%s" | |
11023 | ||
11024 | #: builtin/pull.c:73 | |
94550ed3 | 11025 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
11026 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
11027 | ||
a0b6b246 | 11028 | #: builtin/pull.c:121 |
1b7f4a34 JX |
11029 | msgid "Options related to merging" |
11030 | msgstr "和合并相关的选项" | |
11031 | ||
a0b6b246 | 11032 | #: builtin/pull.c:124 |
1b7f4a34 JX |
11033 | msgid "incorporate changes by rebasing rather than merging" |
11034 | msgstr "使用变基操作取代合并操作以合入修改" | |
11035 | ||
87cb7997 | 11036 | #: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 |
1b7f4a34 JX |
11037 | msgid "allow fast-forward" |
11038 | msgstr "允许快进式" | |
11039 | ||
a0b6b246 | 11040 | #: builtin/pull.c:157 |
5b04ee3b JX |
11041 | msgid "automatically stash/stash pop before and after rebase" |
11042 | msgstr "自动在变基操作前后执行 stash/stash pop" | |
11043 | ||
a0b6b246 | 11044 | #: builtin/pull.c:173 |
1b7f4a34 JX |
11045 | msgid "Options related to fetching" |
11046 | msgstr "和获取相关的参数" | |
11047 | ||
a0b6b246 | 11048 | #: builtin/pull.c:195 |
276ceeaa JX |
11049 | msgid "number of submodules pulled in parallel" |
11050 | msgstr "并发拉取的子模组的数量" | |
11051 | ||
a0b6b246 | 11052 | #: builtin/pull.c:284 |
1b7f4a34 JX |
11053 | #, c-format |
11054 | msgid "Invalid value for pull.ff: %s" | |
11055 | msgstr "pull.ff 的取值无效:%s" | |
11056 | ||
a0b6b246 | 11057 | #: builtin/pull.c:397 |
1b7f4a34 JX |
11058 | msgid "" |
11059 | "There is no candidate for rebasing against among the refs that you just " | |
11060 | "fetched." | |
11061 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
11062 | ||
a0b6b246 | 11063 | #: builtin/pull.c:399 |
1b7f4a34 JX |
11064 | msgid "" |
11065 | "There are no candidates for merging among the refs that you just fetched." | |
11066 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
11067 | ||
a0b6b246 | 11068 | #: builtin/pull.c:400 |
1b7f4a34 JX |
11069 | msgid "" |
11070 | "Generally this means that you provided a wildcard refspec which had no\n" | |
11071 | "matches on the remote end." | |
11072 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
11073 | ||
a0b6b246 | 11074 | #: builtin/pull.c:403 |
1b7f4a34 JX |
11075 | #, c-format |
11076 | msgid "" | |
11077 | "You asked to pull from the remote '%s', but did not specify\n" | |
11078 | "a branch. Because this is not the default configured remote\n" | |
11079 | "for your current branch, you must specify a branch on the command line." | |
11080 | msgstr "" | |
11081 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
11082 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
11083 | ||
a0b6b246 | 11084 | #: builtin/pull.c:408 git-parse-remote.sh:73 |
1b7f4a34 JX |
11085 | msgid "You are not currently on a branch." |
11086 | msgstr "您当前不在一个分支上。" | |
11087 | ||
a0b6b246 | 11088 | #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 |
1b7f4a34 JX |
11089 | msgid "Please specify which branch you want to rebase against." |
11090 | msgstr "请指定您要变基到哪一个分支。" | |
11091 | ||
a0b6b246 | 11092 | #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 |
1b7f4a34 JX |
11093 | msgid "Please specify which branch you want to merge with." |
11094 | msgstr "请指定您要合并哪一个分支。" | |
11095 | ||
a0b6b246 | 11096 | #: builtin/pull.c:413 builtin/pull.c:428 |
1b7f4a34 JX |
11097 | msgid "See git-pull(1) for details." |
11098 | msgstr "详见 git-pull(1)。" | |
11099 | ||
a0b6b246 | 11100 | #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 |
5b04ee3b JX |
11101 | #: git-parse-remote.sh:64 |
11102 | msgid "<remote>" | |
11103 | msgstr "<远程>" | |
11104 | ||
1a79b2f1 | 11105 | #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 |
5b04ee3b JX |
11106 | #: git-parse-remote.sh:65 |
11107 | msgid "<branch>" | |
11108 | msgstr "<分支>" | |
11109 | ||
a0b6b246 | 11110 | #: builtin/pull.c:423 git-parse-remote.sh:75 |
1b7f4a34 JX |
11111 | msgid "There is no tracking information for the current branch." |
11112 | msgstr "当前分支没有跟踪信息。" | |
11113 | ||
a0b6b246 | 11114 | #: builtin/pull.c:432 git-parse-remote.sh:95 |
1b7f4a34 | 11115 | msgid "" |
5b04ee3b JX |
11116 | "If you wish to set tracking information for this branch you can do so with:" |
11117 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 11118 | |
a0b6b246 | 11119 | #: builtin/pull.c:437 |
1b7f4a34 JX |
11120 | #, c-format |
11121 | msgid "" | |
11122 | "Your configuration specifies to merge with the ref '%s'\n" | |
11123 | "from the remote, but no such ref was fetched." | |
11124 | msgstr "" | |
11125 | "您的配置中指定要合并远程的引用 '%s',\n" | |
11126 | "但是没有获取到这个引用。" | |
7ac1c0ad | 11127 | |
a0b6b246 | 11128 | #: builtin/pull.c:754 |
5c57d762 JX |
11129 | msgid "ignoring --verify-signatures for rebase" |
11130 | msgstr "为变基操作忽略 --verify-signatures" | |
11131 | ||
a0b6b246 | 11132 | #: builtin/pull.c:801 |
5b04ee3b JX |
11133 | msgid "--[no-]autostash option is only valid with --rebase." |
11134 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
11135 | ||
a0b6b246 | 11136 | #: builtin/pull.c:809 |
1b7f4a34 JX |
11137 | msgid "Updating an unborn branch with changes added to the index." |
11138 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
11139 | ||
a0b6b246 JX |
11140 | #: builtin/pull.c:812 |
11141 | msgid "pull with rebase" | |
11142 | msgstr "变基式拉取" | |
11143 | ||
11144 | #: builtin/pull.c:813 | |
11145 | msgid "please commit or stash them." | |
11146 | msgstr "请提交或为它们保存进度。" | |
11147 | ||
11148 | #: builtin/pull.c:838 | |
1b7f4a34 JX |
11149 | #, c-format |
11150 | msgid "" | |
11151 | "fetch updated the current branch head.\n" | |
11152 | "fast-forwarding your working tree from\n" | |
11153 | "commit %s." | |
11154 | msgstr "" | |
11155 | "fetch 更新了当前的分支。快进您的工作区\n" | |
11156 | "至提交 %s。" | |
ef317cd5 | 11157 | |
a0b6b246 | 11158 | #: builtin/pull.c:843 |
1b7f4a34 JX |
11159 | #, c-format |
11160 | msgid "" | |
11161 | "Cannot fast-forward your working tree.\n" | |
11162 | "After making sure that you saved anything precious from\n" | |
11163 | "$ git diff %s\n" | |
11164 | "output, run\n" | |
11165 | "$ git reset --hard\n" | |
11166 | "to recover." | |
11167 | msgstr "" | |
11168 | "您当前的工作区无法执行快进操作。\n" | |
11169 | "首先执行如下命令:\n" | |
11170 | "$ git diff %s\n" | |
11171 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
11172 | "$ git reset --hard\n" | |
11173 | "恢复之前的状态。" | |
11174 | ||
a0b6b246 | 11175 | #: builtin/pull.c:858 |
1b7f4a34 JX |
11176 | msgid "Cannot merge multiple branches into empty head." |
11177 | msgstr "无法将多个分支合并到空分支。" | |
11178 | ||
a0b6b246 | 11179 | #: builtin/pull.c:862 |
1b7f4a34 JX |
11180 | msgid "Cannot rebase onto multiple branches." |
11181 | msgstr "无法变基到多个分支。" | |
11182 | ||
89f80d72 | 11183 | #: builtin/push.c:16 |
ef317cd5 | 11184 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 11185 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 11186 | |
276ceeaa | 11187 | #: builtin/push.c:89 |
c04f5ac3 | 11188 | msgid "tag shorthand without <tag>" |
55a16ee4 | 11189 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 11190 | |
276ceeaa | 11191 | #: builtin/push.c:99 |
c04f5ac3 | 11192 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 11193 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 11194 | |
276ceeaa | 11195 | #: builtin/push.c:143 |
8ada9598 JX |
11196 | msgid "" |
11197 | "\n" | |
11198 | "To choose either option permanently, see push.default in 'git help config'." | |
11199 | msgstr "" | |
81809b99 JX |
11200 | "\n" |
11201 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 11202 | |
276ceeaa | 11203 | #: builtin/push.c:146 |
8ada9598 JX |
11204 | #, c-format |
11205 | msgid "" | |
11206 | "The upstream branch of your current branch does not match\n" | |
11207 | "the name of your current branch. To push to the upstream branch\n" | |
11208 | "on the remote, use\n" | |
11209 | "\n" | |
11210 | " git push %s HEAD:%s\n" | |
11211 | "\n" | |
11212 | "To push to the branch of the same name on the remote, use\n" | |
11213 | "\n" | |
11214 | " git push %s %s\n" | |
11215 | "%s" | |
11216 | msgstr "" | |
81809b99 JX |
11217 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
11218 | "上游分支,使用\n" | |
11219 | "\n" | |
11220 | " git push %s HEAD:%s\n" | |
11221 | "\n" | |
11222 | "为推送至远程同名分支,使用\n" | |
11223 | "\n" | |
11224 | " git push %s %s\n" | |
11225 | "%s" | |
8ada9598 | 11226 | |
276ceeaa | 11227 | #: builtin/push.c:161 |
c04f5ac3 JX |
11228 | #, c-format |
11229 | msgid "" | |
11230 | "You are not currently on a branch.\n" | |
11231 | "To push the history leading to the current (detached HEAD)\n" | |
11232 | "state now, use\n" | |
11233 | "\n" | |
11234 | " git push %s HEAD:<name-of-remote-branch>\n" | |
11235 | msgstr "" | |
11236 | "您当前不在一个分支上。\n" | |
90e6ef53 | 11237 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 11238 | "\n" |
d9d56b23 | 11239 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 11240 | |
276ceeaa | 11241 | #: builtin/push.c:175 |
c04f5ac3 JX |
11242 | #, c-format |
11243 | msgid "" | |
11244 | "The current branch %s has no upstream branch.\n" | |
11245 | "To push the current branch and set the remote as upstream, use\n" | |
11246 | "\n" | |
11247 | " git push --set-upstream %s %s\n" | |
11248 | msgstr "" | |
11249 | "当前分支 %s 没有对应的上游分支。\n" | |
11250 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
11251 | "\n" | |
11252 | " git push --set-upstream %s %s\n" | |
11253 | ||
276ceeaa | 11254 | #: builtin/push.c:183 |
c04f5ac3 JX |
11255 | #, c-format |
11256 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
11257 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
11258 | ||
276ceeaa | 11259 | #: builtin/push.c:186 |
73a60cd2 JX |
11260 | #, c-format |
11261 | msgid "" | |
11262 | "You are pushing to remote '%s', which is not the upstream of\n" | |
11263 | "your current branch '%s', without telling me what to push\n" | |
11264 | "to update which remote branch." | |
11265 | msgstr "" | |
11266 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
11267 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
11268 | ||
1a79b2f1 | 11269 | #: builtin/push.c:245 |
c04f5ac3 JX |
11270 | msgid "" |
11271 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 11272 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 11273 | |
1a79b2f1 | 11274 | #: builtin/push.c:252 |
170e9899 JX |
11275 | msgid "" |
11276 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
11277 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
11278 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
11279 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11280 | msgstr "" | |
eff6d3a9 | 11281 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 11282 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 11283 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 11284 | |
1a79b2f1 | 11285 | #: builtin/push.c:258 |
170e9899 JX |
11286 | msgid "" |
11287 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
11288 | "counterpart. Check out this branch and integrate the remote changes\n" |
11289 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
11290 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11291 | msgstr "" | |
eff6d3a9 | 11292 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 11293 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 11294 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 11295 | |
1a79b2f1 | 11296 | #: builtin/push.c:264 |
07432cef | 11297 | msgid "" |
a77c07d9 JX |
11298 | "Updates were rejected because the remote contains work that you do\n" |
11299 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
11300 | "to the same ref. You may want to first integrate the remote changes\n" |
11301 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
11302 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11303 | msgstr "" | |
160fb2b2 JX |
11304 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
11305 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 11306 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
11307 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
11308 | ||
1a79b2f1 | 11309 | #: builtin/push.c:271 |
a77c07d9 | 11310 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 11311 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 11312 | |
1a79b2f1 | 11313 | #: builtin/push.c:274 |
a77c07d9 JX |
11314 | msgid "" |
11315 | "You cannot update a remote ref that points at a non-commit object,\n" | |
11316 | "or update a remote ref to make it point at a non-commit object,\n" | |
11317 | "without using the '--force' option.\n" | |
11318 | msgstr "" | |
11319 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
11320 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 11321 | |
1a79b2f1 | 11322 | #: builtin/push.c:334 |
c04f5ac3 JX |
11323 | #, c-format |
11324 | msgid "Pushing to %s\n" | |
11325 | msgstr "推送到 %s\n" | |
11326 | ||
1a79b2f1 | 11327 | #: builtin/push.c:338 |
c04f5ac3 JX |
11328 | #, c-format |
11329 | msgid "failed to push some refs to '%s'" | |
11330 | msgstr "无法推送一些引用到 '%s'" | |
11331 | ||
1a79b2f1 | 11332 | #: builtin/push.c:369 |
c04f5ac3 JX |
11333 | #, c-format |
11334 | msgid "bad repository '%s'" | |
160fb2b2 | 11335 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 11336 | |
1a79b2f1 | 11337 | #: builtin/push.c:370 |
c04f5ac3 JX |
11338 | msgid "" |
11339 | "No configured push destination.\n" | |
11340 | "Either specify the URL from the command-line or configure a remote " | |
11341 | "repository using\n" | |
11342 | "\n" | |
11343 | " git remote add <name> <url>\n" | |
11344 | "\n" | |
11345 | "and then push using the remote name\n" | |
11346 | "\n" | |
11347 | " git push <name>\n" | |
11348 | msgstr "" | |
90e6ef53 | 11349 | "没有配置推送目标。\n" |
4375c10e | 11350 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 11351 | "\n" |
d9d56b23 | 11352 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 11353 | "\n" |
160fb2b2 | 11354 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 11355 | "\n" |
d9d56b23 | 11356 | " git push <名称>\n" |
c04f5ac3 | 11357 | |
1a79b2f1 | 11358 | #: builtin/push.c:388 |
c04f5ac3 JX |
11359 | msgid "--all and --tags are incompatible" |
11360 | msgstr "--all 和 --tags 不兼容" | |
11361 | ||
1a79b2f1 | 11362 | #: builtin/push.c:389 |
c04f5ac3 | 11363 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 11364 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 11365 | |
1a79b2f1 | 11366 | #: builtin/push.c:394 |
c04f5ac3 JX |
11367 | msgid "--mirror and --tags are incompatible" |
11368 | msgstr "--mirror 和 --tags 不兼容" | |
11369 | ||
1a79b2f1 | 11370 | #: builtin/push.c:395 |
c04f5ac3 | 11371 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 11372 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 11373 | |
1a79b2f1 | 11374 | #: builtin/push.c:400 |
c04f5ac3 JX |
11375 | msgid "--all and --mirror are incompatible" |
11376 | msgstr "--all 和 --mirror 不兼容" | |
11377 | ||
1a79b2f1 | 11378 | #: builtin/push.c:518 |
ef317cd5 | 11379 | msgid "repository" |
160fb2b2 | 11380 | msgstr "仓库" |
ef317cd5 | 11381 | |
87cb7997 | 11382 | #: builtin/push.c:519 builtin/send-pack.c:162 |
ef317cd5 | 11383 | msgid "push all refs" |
07432cef | 11384 | msgstr "推送所有引用" |
ef317cd5 | 11385 | |
87cb7997 | 11386 | #: builtin/push.c:520 builtin/send-pack.c:164 |
ef317cd5 | 11387 | msgid "mirror all refs" |
07432cef | 11388 | msgstr "镜像所有引用" |
ef317cd5 | 11389 | |
1a79b2f1 | 11390 | #: builtin/push.c:522 |
ef317cd5 | 11391 | msgid "delete refs" |
07432cef | 11392 | msgstr "删除引用" |
ef317cd5 | 11393 | |
1a79b2f1 | 11394 | #: builtin/push.c:523 |
ef317cd5 | 11395 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 11396 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 11397 | |
87cb7997 | 11398 | #: builtin/push.c:526 builtin/send-pack.c:165 |
ef317cd5 JX |
11399 | msgid "force updates" |
11400 | msgstr "强制更新" | |
11401 | ||
87cb7997 | 11402 | #: builtin/push.c:528 builtin/send-pack.c:179 |
90314792 JX |
11403 | msgid "refname>:<expect" |
11404 | msgstr "引用名>:<期望值" | |
11405 | ||
87cb7997 | 11406 | #: builtin/push.c:529 builtin/send-pack.c:180 |
90314792 JX |
11407 | msgid "require old value of ref to be at this value" |
11408 | msgstr "要求引用旧的取值为设定值" | |
11409 | ||
1a79b2f1 | 11410 | #: builtin/push.c:532 |
ef317cd5 | 11411 | msgid "control recursive pushing of submodules" |
07432cef | 11412 | msgstr "控制子模组的递归推送" |
ef317cd5 | 11413 | |
87cb7997 | 11414 | #: builtin/push.c:534 builtin/send-pack.c:173 |
ef317cd5 | 11415 | msgid "use thin pack" |
07432cef | 11416 | msgstr "使用精简打包" |
ef317cd5 | 11417 | |
87cb7997 JX |
11418 | #: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 |
11419 | #: builtin/send-pack.c:160 | |
ef317cd5 | 11420 | msgid "receive pack program" |
07432cef | 11421 | msgstr "接收包程序" |
ef317cd5 | 11422 | |
1a79b2f1 | 11423 | #: builtin/push.c:537 |
ef317cd5 | 11424 | msgid "set upstream for git pull/status" |
07432cef | 11425 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 11426 | |
1a79b2f1 | 11427 | #: builtin/push.c:540 |
ef317cd5 | 11428 | msgid "prune locally removed refs" |
07432cef | 11429 | msgstr "清除本地删除的引用" |
ef317cd5 | 11430 | |
1a79b2f1 | 11431 | #: builtin/push.c:542 |
a77c07d9 JX |
11432 | msgid "bypass pre-push hook" |
11433 | msgstr "绕过 pre-push 钩子" | |
11434 | ||
1a79b2f1 | 11435 | #: builtin/push.c:543 |
1003b3a5 | 11436 | msgid "push missing but relevant tags" |
55a16ee4 | 11437 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 11438 | |
87cb7997 | 11439 | #: builtin/push.c:546 builtin/send-pack.c:167 |
220c313c JX |
11440 | msgid "GPG sign the push" |
11441 | msgstr "用 GPG 为推送签名" | |
11442 | ||
87cb7997 | 11443 | #: builtin/push.c:548 builtin/send-pack.c:174 |
814ff314 JX |
11444 | msgid "request atomic transaction on remote side" |
11445 | msgstr "需要远端支持原子事务" | |
11446 | ||
87cb7997 | 11447 | #: builtin/push.c:549 builtin/send-pack.c:170 |
5c57d762 JX |
11448 | msgid "server-specific" |
11449 | msgstr "server-specific" | |
11450 | ||
87cb7997 | 11451 | #: builtin/push.c:549 builtin/send-pack.c:171 |
5c57d762 | 11452 | msgid "option to transmit" |
9a4b694c | 11453 | msgstr "传输选项" |
5c57d762 | 11454 | |
1a79b2f1 | 11455 | #: builtin/push.c:563 |
c04f5ac3 JX |
11456 | msgid "--delete is incompatible with --all, --mirror and --tags" |
11457 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
11458 | ||
1a79b2f1 | 11459 | #: builtin/push.c:565 |
c04f5ac3 JX |
11460 | msgid "--delete doesn't make sense without any refs" |
11461 | msgstr "--delete 未接任何引用没有意义" | |
11462 | ||
1a79b2f1 | 11463 | #: builtin/push.c:584 |
5c57d762 JX |
11464 | msgid "push options must not have new line characters" |
11465 | msgstr "推送选项不能有换行符" | |
11466 | ||
87cb7997 | 11467 | #: builtin/read-tree.c:40 |
ef317cd5 | 11468 | msgid "" |
1b7f4a34 | 11469 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
11470 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
11471 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
11472 | msgstr "" | |
1b7f4a34 | 11473 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 11474 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 11475 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 11476 | |
87cb7997 | 11477 | #: builtin/read-tree.c:130 |
ef317cd5 | 11478 | msgid "write resulting index to <file>" |
d9d56b23 | 11479 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 11480 | |
87cb7997 | 11481 | #: builtin/read-tree.c:133 |
ef317cd5 | 11482 | msgid "only empty the index" |
07432cef | 11483 | msgstr "只是清空索引" |
ef317cd5 | 11484 | |
87cb7997 | 11485 | #: builtin/read-tree.c:135 |
ef317cd5 | 11486 | msgid "Merging" |
07432cef | 11487 | msgstr "合并" |
ef317cd5 | 11488 | |
87cb7997 | 11489 | #: builtin/read-tree.c:137 |
ef317cd5 | 11490 | msgid "perform a merge in addition to a read" |
07432cef | 11491 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 11492 | |
87cb7997 | 11493 | #: builtin/read-tree.c:139 |
ef317cd5 | 11494 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 11495 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 11496 | |
87cb7997 | 11497 | #: builtin/read-tree.c:141 |
ef317cd5 | 11498 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 11499 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 11500 | |
87cb7997 | 11501 | #: builtin/read-tree.c:143 |
ef317cd5 | 11502 | msgid "same as -m, but discard unmerged entries" |
07432cef | 11503 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 11504 | |
87cb7997 | 11505 | #: builtin/read-tree.c:144 |
ef317cd5 | 11506 | msgid "<subdirectory>/" |
07432cef | 11507 | msgstr "<子目录>/" |
ef317cd5 | 11508 | |
87cb7997 | 11509 | #: builtin/read-tree.c:145 |
ef317cd5 | 11510 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 11511 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 11512 | |
87cb7997 | 11513 | #: builtin/read-tree.c:148 |
ef317cd5 | 11514 | msgid "update working tree with merge result" |
07432cef | 11515 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 11516 | |
87cb7997 | 11517 | #: builtin/read-tree.c:150 |
ef317cd5 | 11518 | msgid "gitignore" |
07432cef | 11519 | msgstr "gitignore" |
ef317cd5 | 11520 | |
87cb7997 | 11521 | #: builtin/read-tree.c:151 |
ef317cd5 | 11522 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 11523 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 11524 | |
87cb7997 | 11525 | #: builtin/read-tree.c:154 |
ef317cd5 | 11526 | msgid "don't check the working tree after merging" |
07432cef | 11527 | msgstr "合并后不检查工作区" |
ef317cd5 | 11528 | |
87cb7997 | 11529 | #: builtin/read-tree.c:155 |
ef317cd5 | 11530 | msgid "don't update the index or the work tree" |
07432cef | 11531 | msgstr "不更新索引区和工作区" |
ef317cd5 | 11532 | |
87cb7997 | 11533 | #: builtin/read-tree.c:157 |
ef317cd5 | 11534 | msgid "skip applying sparse checkout filter" |
07432cef | 11535 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 11536 | |
87cb7997 | 11537 | #: builtin/read-tree.c:159 |
ef317cd5 | 11538 | msgid "debug unpack-trees" |
07432cef | 11539 | msgstr "调试 unpack-trees" |
ef317cd5 | 11540 | |
87cb7997 JX |
11541 | #: builtin/rebase--helper.c:7 |
11542 | msgid "git rebase--helper [<options>]" | |
11543 | msgstr "git rebase--helper [<选项>]" | |
11544 | ||
11545 | #: builtin/rebase--helper.c:19 | |
11546 | msgid "continue rebase" | |
11547 | msgstr "继续变基" | |
11548 | ||
11549 | #: builtin/rebase--helper.c:21 | |
11550 | msgid "abort rebase" | |
11551 | msgstr "中止变基" | |
11552 | ||
11553 | #: builtin/receive-pack.c:27 | |
5b04ee3b JX |
11554 | msgid "git receive-pack <git-dir>" |
11555 | msgstr "git receive-pack <git-dir>" | |
11556 | ||
87cb7997 | 11557 | #: builtin/receive-pack.c:796 |
a0b6b246 JX |
11558 | msgid "" |
11559 | "By default, updating the current branch in a non-bare repository\n" | |
11560 | "is denied, because it will make the index and work tree inconsistent\n" | |
11561 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
11562 | "the work tree to HEAD.\n" | |
11563 | "\n" | |
1a79b2f1 JX |
11564 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
11565 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
11566 | "its current branch; however, this is not recommended unless you\n" |
11567 | "arranged to update its work tree to match what you pushed in some\n" | |
11568 | "other way.\n" | |
11569 | "\n" | |
11570 | "To squelch this message and still keep the default behaviour, set\n" | |
11571 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
11572 | msgstr "" | |
11573 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
11574 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
11575 | "\n" | |
11576 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
11577 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
11578 | "用某种方式将其工作区更新至您推送的状态。\n" | |
11579 | "\n" | |
11580 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
11581 | "配置变量为 'refuse'。" | |
11582 | ||
87cb7997 | 11583 | #: builtin/receive-pack.c:816 |
a0b6b246 JX |
11584 | msgid "" |
11585 | "By default, deleting the current branch is denied, because the next\n" | |
11586 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
11587 | "\n" | |
11588 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
11589 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
11590 | "current branch, with or without a warning message.\n" | |
11591 | "\n" | |
11592 | "To squelch this message, you can set it to 'refuse'." | |
11593 | msgstr "" | |
11594 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 11595 | "导致困惑。\n" |
a0b6b246 JX |
11596 | "\n" |
11597 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 11598 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
11599 | "\n" |
11600 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
11601 | ||
87cb7997 | 11602 | #: builtin/receive-pack.c:1889 |
5b04ee3b JX |
11603 | msgid "quiet" |
11604 | msgstr "静默模式" | |
11605 | ||
87cb7997 | 11606 | #: builtin/receive-pack.c:1903 |
5b04ee3b JX |
11607 | msgid "You must specify a directory." |
11608 | msgstr "您必须指定一个目录。" | |
11609 | ||
276ceeaa | 11610 | #: builtin/reflog.c:423 |
2e8451e8 | 11611 | #, c-format |
1b7f4a34 | 11612 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
11613 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
11614 | ||
276ceeaa | 11615 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
2e8451e8 JX |
11616 | #, c-format |
11617 | msgid "'%s' is not a valid timestamp" | |
11618 | msgstr "'%s' 不是一个有效的时间戳" | |
11619 | ||
cfff71a9 | 11620 | #: builtin/remote.c:12 |
ef317cd5 | 11621 | msgid "git remote [-v | --verbose]" |
07432cef | 11622 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 11623 | |
cfff71a9 | 11624 | #: builtin/remote.c:13 |
ef317cd5 | 11625 | msgid "" |
814ff314 | 11626 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
11627 | "mirror=<fetch|push>] <name> <url>" |
11628 | msgstr "" | |
814ff314 | 11629 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 11630 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 11631 | |
94550ed3 | 11632 | #: builtin/remote.c:14 builtin/remote.c:34 |
ef317cd5 | 11633 | msgid "git remote rename <old> <new>" |
07432cef | 11634 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 11635 | |
94550ed3 | 11636 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 11637 | msgid "git remote remove <name>" |
07432cef | 11638 | msgstr "git remote remove <名称>" |
ef317cd5 | 11639 | |
94550ed3 | 11640 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
11641 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
11642 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 11643 | |
cfff71a9 | 11644 | #: builtin/remote.c:17 |
ef317cd5 | 11645 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 11646 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 11647 | |
cfff71a9 | 11648 | #: builtin/remote.c:18 |
ef317cd5 | 11649 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 11650 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 11651 | |
cfff71a9 | 11652 | #: builtin/remote.c:19 |
ef317cd5 JX |
11653 | msgid "" |
11654 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 11655 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 11656 | |
cfff71a9 | 11657 | #: builtin/remote.c:20 |
ef317cd5 | 11658 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 11659 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 11660 | |
94550ed3 JX |
11661 | #: builtin/remote.c:21 builtin/remote.c:70 |
11662 | msgid "git remote get-url [--push] [--all] <name>" | |
11663 | msgstr "git remote get-url [--push] [--all] <名称>" | |
11664 | ||
11665 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 11666 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 11667 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 11668 | |
94550ed3 | 11669 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 11670 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 11671 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 11672 | |
94550ed3 | 11673 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 11674 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 11675 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 11676 | |
94550ed3 | 11677 | #: builtin/remote.c:29 |
ef317cd5 | 11678 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 11679 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 11680 | |
94550ed3 | 11681 | #: builtin/remote.c:49 |
ef317cd5 | 11682 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 11683 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 11684 | |
94550ed3 | 11685 | #: builtin/remote.c:50 |
ef317cd5 | 11686 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 11687 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 11688 | |
94550ed3 | 11689 | #: builtin/remote.c:55 |
ef317cd5 | 11690 | msgid "git remote show [<options>] <name>" |
07432cef | 11691 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 11692 | |
94550ed3 | 11693 | #: builtin/remote.c:60 |
ef317cd5 | 11694 | msgid "git remote prune [<options>] <name>" |
07432cef | 11695 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 11696 | |
94550ed3 | 11697 | #: builtin/remote.c:65 |
ef317cd5 | 11698 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 11699 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 11700 | |
94550ed3 | 11701 | #: builtin/remote.c:94 |
81809b99 | 11702 | #, c-format |
8ada9598 | 11703 | msgid "Updating %s" |
81809b99 | 11704 | msgstr "更新 %s 中" |
8ada9598 | 11705 | |
94550ed3 | 11706 | #: builtin/remote.c:126 |
8ada9598 JX |
11707 | msgid "" |
11708 | "--mirror is dangerous and deprecated; please\n" | |
11709 | "\t use --mirror=fetch or --mirror=push instead" | |
11710 | msgstr "" | |
81809b99 JX |
11711 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
11712 | "\t 或 --mirror=push" | |
8ada9598 | 11713 | |
94550ed3 | 11714 | #: builtin/remote.c:143 |
81809b99 | 11715 | #, c-format |
8ada9598 | 11716 | msgid "unknown mirror argument: %s" |
81809b99 | 11717 | msgstr "未知的镜像参数:%s" |
8ada9598 | 11718 | |
94550ed3 | 11719 | #: builtin/remote.c:159 |
ef317cd5 | 11720 | msgid "fetch the remote branches" |
07432cef | 11721 | msgstr "抓取远程的分支" |
ef317cd5 | 11722 | |
94550ed3 | 11723 | #: builtin/remote.c:161 |
ef317cd5 | 11724 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 11725 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 11726 | |
94550ed3 | 11727 | #: builtin/remote.c:164 |
ef317cd5 | 11728 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 11729 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 11730 | |
94550ed3 | 11731 | #: builtin/remote.c:166 |
ef317cd5 | 11732 | msgid "branch(es) to track" |
07432cef | 11733 | msgstr "跟踪的分支" |
ef317cd5 | 11734 | |
94550ed3 | 11735 | #: builtin/remote.c:167 |
ef317cd5 | 11736 | msgid "master branch" |
07432cef | 11737 | msgstr "主线分支" |
ef317cd5 | 11738 | |
94550ed3 | 11739 | #: builtin/remote.c:168 |
ef317cd5 | 11740 | msgid "push|fetch" |
07432cef | 11741 | msgstr "push|fetch" |
ef317cd5 | 11742 | |
94550ed3 | 11743 | #: builtin/remote.c:169 |
ef317cd5 | 11744 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 11745 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 11746 | |
94550ed3 | 11747 | #: builtin/remote.c:181 |
8ada9598 | 11748 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 11749 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 11750 | |
94550ed3 | 11751 | #: builtin/remote.c:183 |
8ada9598 | 11752 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 11753 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 11754 | |
5c57d762 | 11755 | #: builtin/remote.c:190 builtin/remote.c:629 |
81809b99 | 11756 | #, c-format |
8ada9598 | 11757 | msgid "remote %s already exists." |
81809b99 | 11758 | msgstr "远程 %s 已经存在。" |
8ada9598 | 11759 | |
5c57d762 | 11760 | #: builtin/remote.c:194 builtin/remote.c:633 |
81809b99 | 11761 | #, c-format |
8ada9598 | 11762 | msgid "'%s' is not a valid remote name" |
81809b99 | 11763 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 11764 | |
276ceeaa | 11765 | #: builtin/remote.c:234 |
81809b99 | 11766 | #, c-format |
8ada9598 | 11767 | msgid "Could not setup master '%s'" |
81809b99 | 11768 | msgstr "无法设置 master '%s'" |
8ada9598 | 11769 | |
276ceeaa | 11770 | #: builtin/remote.c:336 |
81809b99 | 11771 | #, c-format |
8ada9598 | 11772 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 11773 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 11774 | |
276ceeaa | 11775 | #: builtin/remote.c:437 builtin/remote.c:445 |
8ada9598 | 11776 | msgid "(matching)" |
81809b99 | 11777 | msgstr "(匹配)" |
8ada9598 | 11778 | |
276ceeaa | 11779 | #: builtin/remote.c:449 |
8ada9598 | 11780 | msgid "(delete)" |
81809b99 | 11781 | msgstr "(删除)" |
8ada9598 | 11782 | |
87cb7997 | 11783 | #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 |
81809b99 | 11784 | #, c-format |
8ada9598 | 11785 | msgid "No such remote: %s" |
81809b99 | 11786 | msgstr "没有这样的远程:%s" |
8ada9598 | 11787 | |
5c57d762 | 11788 | #: builtin/remote.c:639 |
81809b99 | 11789 | #, c-format |
8ada9598 | 11790 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 11791 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 11792 | |
5c57d762 | 11793 | #: builtin/remote.c:659 |
8ada9598 JX |
11794 | #, c-format |
11795 | msgid "" | |
d691f479 | 11796 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
11797 | "\t%s\n" |
11798 | "\tPlease update the configuration manually if necessary." | |
11799 | msgstr "" | |
160fb2b2 | 11800 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
11801 | "\t%s\n" |
11802 | "\t如果必要请手动更新配置。" | |
8ada9598 | 11803 | |
5c57d762 | 11804 | #: builtin/remote.c:695 |
81809b99 | 11805 | #, c-format |
8ada9598 | 11806 | msgid "deleting '%s' failed" |
81809b99 | 11807 | msgstr "删除 '%s' 失败" |
8ada9598 | 11808 | |
5c57d762 | 11809 | #: builtin/remote.c:729 |
81809b99 | 11810 | #, c-format |
8ada9598 | 11811 | msgid "creating '%s' failed" |
81809b99 | 11812 | msgstr "创建 '%s' 失败" |
8ada9598 | 11813 | |
87cb7997 | 11814 | #: builtin/remote.c:794 |
8ada9598 JX |
11815 | msgid "" |
11816 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
11817 | "to delete it, use:" | |
11818 | msgid_plural "" | |
11819 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
11820 | "to delete them, use:" | |
5ae481e0 JX |
11821 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
11822 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 11823 | |
87cb7997 | 11824 | #: builtin/remote.c:808 |
276ceeaa JX |
11825 | #, c-format |
11826 | msgid "Could not remove config section '%s'" | |
11827 | msgstr "不能移除配置小节 '%s'" | |
11828 | ||
87cb7997 | 11829 | #: builtin/remote.c:909 |
8ada9598 JX |
11830 | #, c-format |
11831 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 11832 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 11833 | |
87cb7997 | 11834 | #: builtin/remote.c:912 |
8ada9598 | 11835 | msgid " tracked" |
81809b99 | 11836 | msgstr " 已跟踪" |
8ada9598 | 11837 | |
87cb7997 | 11838 | #: builtin/remote.c:914 |
8ada9598 | 11839 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 11840 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 11841 | |
87cb7997 | 11842 | #: builtin/remote.c:916 |
8ada9598 | 11843 | msgid " ???" |
81809b99 | 11844 | msgstr " ???" |
8ada9598 | 11845 | |
87cb7997 | 11846 | #: builtin/remote.c:957 |
8ada9598 JX |
11847 | #, c-format |
11848 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 11849 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 11850 | |
87cb7997 | 11851 | #: builtin/remote.c:965 |
81809b99 | 11852 | #, c-format |
276ceeaa JX |
11853 | msgid "rebases interactively onto remote %s" |
11854 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 11855 | |
87cb7997 | 11856 | #: builtin/remote.c:966 |
5c57d762 JX |
11857 | #, c-format |
11858 | msgid "rebases onto remote %s" | |
11859 | msgstr "变基到远程 %s" | |
11860 | ||
87cb7997 | 11861 | #: builtin/remote.c:969 |
81809b99 | 11862 | #, c-format |
8ada9598 | 11863 | msgid " merges with remote %s" |
81809b99 | 11864 | msgstr " 与远程 %s 合并" |
8ada9598 | 11865 | |
87cb7997 | 11866 | #: builtin/remote.c:972 |
81809b99 | 11867 | #, c-format |
8ada9598 | 11868 | msgid "merges with remote %s" |
81809b99 | 11869 | msgstr "与远程 %s 合并" |
8ada9598 | 11870 | |
87cb7997 | 11871 | #: builtin/remote.c:975 |
5c57d762 JX |
11872 | #, c-format |
11873 | msgid "%-*s and with remote %s\n" | |
11874 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 11875 | |
87cb7997 | 11876 | #: builtin/remote.c:1018 |
8ada9598 | 11877 | msgid "create" |
81809b99 | 11878 | msgstr "创建" |
8ada9598 | 11879 | |
87cb7997 | 11880 | #: builtin/remote.c:1021 |
8ada9598 | 11881 | msgid "delete" |
81809b99 | 11882 | msgstr "删除" |
8ada9598 | 11883 | |
87cb7997 | 11884 | #: builtin/remote.c:1025 |
8ada9598 | 11885 | msgid "up to date" |
81809b99 | 11886 | msgstr "最新" |
8ada9598 | 11887 | |
87cb7997 | 11888 | #: builtin/remote.c:1028 |
8ada9598 | 11889 | msgid "fast-forwardable" |
81809b99 | 11890 | msgstr "可快进" |
8ada9598 | 11891 | |
87cb7997 | 11892 | #: builtin/remote.c:1031 |
8ada9598 | 11893 | msgid "local out of date" |
81809b99 | 11894 | msgstr "本地已过时" |
8ada9598 | 11895 | |
87cb7997 | 11896 | #: builtin/remote.c:1038 |
8ada9598 JX |
11897 | #, c-format |
11898 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 11899 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 11900 | |
87cb7997 | 11901 | #: builtin/remote.c:1041 |
8ada9598 JX |
11902 | #, c-format |
11903 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 11904 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 11905 | |
87cb7997 | 11906 | #: builtin/remote.c:1045 |
8ada9598 JX |
11907 | #, c-format |
11908 | msgid " %-*s forces to %s" | |
81809b99 | 11909 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 11910 | |
87cb7997 | 11911 | #: builtin/remote.c:1048 |
8ada9598 JX |
11912 | #, c-format |
11913 | msgid " %-*s pushes to %s" | |
81809b99 | 11914 | msgstr " %-*s 推送至 %s" |
8ada9598 | 11915 | |
87cb7997 | 11916 | #: builtin/remote.c:1116 |
ef317cd5 | 11917 | msgid "do not query remotes" |
07432cef | 11918 | msgstr "不查询远程" |
ef317cd5 | 11919 | |
87cb7997 | 11920 | #: builtin/remote.c:1143 |
81809b99 | 11921 | #, c-format |
8ada9598 | 11922 | msgid "* remote %s" |
81809b99 | 11923 | msgstr "* 远程 %s" |
8ada9598 | 11924 | |
87cb7997 | 11925 | #: builtin/remote.c:1144 |
8ada9598 JX |
11926 | #, c-format |
11927 | msgid " Fetch URL: %s" | |
81809b99 | 11928 | msgstr " 获取地址:%s" |
8ada9598 | 11929 | |
87cb7997 | 11930 | #: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 |
8ada9598 | 11931 | msgid "(no URL)" |
81809b99 | 11932 | msgstr "(无 URL)" |
8ada9598 | 11933 | |
5b04ee3b JX |
11934 | #. TRANSLATORS: the colon ':' should align with |
11935 | #. the one in " Fetch URL: %s" translation | |
87cb7997 | 11936 | #: builtin/remote.c:1156 builtin/remote.c:1158 |
8ada9598 JX |
11937 | #, c-format |
11938 | msgid " Push URL: %s" | |
81809b99 | 11939 | msgstr " 推送地址:%s" |
8ada9598 | 11940 | |
87cb7997 | 11941 | #: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 |
81809b99 | 11942 | #, c-format |
8ada9598 | 11943 | msgid " HEAD branch: %s" |
4375c10e | 11944 | msgstr " HEAD 分支:%s" |
8ada9598 | 11945 | |
5c57d762 | 11946 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 11947 | #: builtin/remote.c:1160 |
5c57d762 JX |
11948 | msgid "(not queried)" |
11949 | msgstr "(未查询)" | |
11950 | ||
87cb7997 | 11951 | #: builtin/remote.c:1162 |
5c57d762 JX |
11952 | msgid "(unknown)" |
11953 | msgstr "(未知)" | |
11954 | ||
87cb7997 | 11955 | #: builtin/remote.c:1166 |
8ada9598 JX |
11956 | #, c-format |
11957 | msgid "" | |
11958 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 11959 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 11960 | |
87cb7997 | 11961 | #: builtin/remote.c:1178 |
81809b99 | 11962 | #, c-format |
8ada9598 JX |
11963 | msgid " Remote branch:%s" |
11964 | msgid_plural " Remote branches:%s" | |
81809b99 | 11965 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 11966 | msgstr[1] " 远程分支:%s" |
8ada9598 | 11967 | |
81809b99 | 11968 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 11969 | #: builtin/remote.c:1181 builtin/remote.c:1207 |
8ada9598 | 11970 | msgid " (status not queried)" |
81809b99 | 11971 | msgstr "(状态未查询)" |
8ada9598 | 11972 | |
87cb7997 | 11973 | #: builtin/remote.c:1190 |
8ada9598 JX |
11974 | msgid " Local branch configured for 'git pull':" |
11975 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 11976 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 11977 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 11978 | |
87cb7997 | 11979 | #: builtin/remote.c:1198 |
8ada9598 | 11980 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 11981 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 11982 | |
87cb7997 | 11983 | #: builtin/remote.c:1204 |
81809b99 | 11984 | #, c-format |
8ada9598 JX |
11985 | msgid " Local ref configured for 'git push'%s:" |
11986 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 11987 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 11988 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 11989 | |
87cb7997 | 11990 | #: builtin/remote.c:1225 |
ef317cd5 | 11991 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 11992 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 11993 | |
87cb7997 | 11994 | #: builtin/remote.c:1227 |
ef317cd5 | 11995 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 11996 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 11997 | |
87cb7997 | 11998 | #: builtin/remote.c:1242 |
8ada9598 | 11999 | msgid "Cannot determine remote HEAD" |
81809b99 | 12000 | msgstr "无法确定远程 HEAD" |
8ada9598 | 12001 | |
87cb7997 | 12002 | #: builtin/remote.c:1244 |
8ada9598 | 12003 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 12004 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 12005 | |
87cb7997 | 12006 | #: builtin/remote.c:1254 |
81809b99 | 12007 | #, c-format |
8ada9598 | 12008 | msgid "Could not delete %s" |
81809b99 | 12009 | msgstr "无法删除 %s" |
8ada9598 | 12010 | |
87cb7997 | 12011 | #: builtin/remote.c:1262 |
81809b99 | 12012 | #, c-format |
8ada9598 | 12013 | msgid "Not a valid ref: %s" |
81809b99 | 12014 | msgstr "不是一个有效引用:%s" |
8ada9598 | 12015 | |
87cb7997 | 12016 | #: builtin/remote.c:1264 |
81809b99 | 12017 | #, c-format |
8ada9598 | 12018 | msgid "Could not setup %s" |
81809b99 | 12019 | msgstr "不能设置 %s" |
8ada9598 JX |
12020 | |
12021 | # 译者:注意保持前导空格 | |
87cb7997 | 12022 | #: builtin/remote.c:1282 |
81809b99 | 12023 | #, c-format |
8ada9598 | 12024 | msgid " %s will become dangling!" |
07432cef | 12025 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
12026 | |
12027 | # 译者:注意保持前导空格 | |
87cb7997 | 12028 | #: builtin/remote.c:1283 |
81809b99 | 12029 | #, c-format |
8ada9598 | 12030 | msgid " %s has become dangling!" |
07432cef | 12031 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 12032 | |
87cb7997 | 12033 | #: builtin/remote.c:1293 |
81809b99 | 12034 | #, c-format |
8ada9598 | 12035 | msgid "Pruning %s" |
81809b99 | 12036 | msgstr "修剪 %s" |
8ada9598 | 12037 | |
87cb7997 | 12038 | #: builtin/remote.c:1294 |
8ada9598 JX |
12039 | #, c-format |
12040 | msgid "URL: %s" | |
81809b99 | 12041 | msgstr "URL:%s" |
8ada9598 | 12042 | |
87cb7997 | 12043 | #: builtin/remote.c:1310 |
8ada9598 JX |
12044 | #, c-format |
12045 | msgid " * [would prune] %s" | |
81809b99 | 12046 | msgstr " * [将删除] %s" |
8ada9598 | 12047 | |
87cb7997 | 12048 | #: builtin/remote.c:1313 |
8ada9598 JX |
12049 | #, c-format |
12050 | msgid " * [pruned] %s" | |
81809b99 | 12051 | msgstr " * [已删除] %s" |
8ada9598 | 12052 | |
87cb7997 | 12053 | #: builtin/remote.c:1358 |
ef317cd5 | 12054 | msgid "prune remotes after fetching" |
07432cef | 12055 | msgstr "抓取后清除远程" |
ef317cd5 | 12056 | |
87cb7997 | 12057 | #: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 |
81809b99 | 12058 | #, c-format |
8ada9598 | 12059 | msgid "No such remote '%s'" |
81809b99 | 12060 | msgstr "没有此远程 '%s'" |
8ada9598 | 12061 | |
87cb7997 | 12062 | #: builtin/remote.c:1437 |
ef317cd5 | 12063 | msgid "add branch" |
07432cef | 12064 | msgstr "添加分支" |
ef317cd5 | 12065 | |
87cb7997 | 12066 | #: builtin/remote.c:1444 |
8ada9598 | 12067 | msgid "no remote specified" |
81809b99 | 12068 | msgstr "未指定远程" |
8ada9598 | 12069 | |
87cb7997 | 12070 | #: builtin/remote.c:1461 |
94550ed3 JX |
12071 | msgid "query push URLs rather than fetch URLs" |
12072 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
12073 | ||
87cb7997 | 12074 | #: builtin/remote.c:1463 |
94550ed3 JX |
12075 | msgid "return all URLs" |
12076 | msgstr "返回所有 URL 地址" | |
12077 | ||
87cb7997 | 12078 | #: builtin/remote.c:1491 |
94550ed3 JX |
12079 | #, c-format |
12080 | msgid "no URLs configured for remote '%s'" | |
12081 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
12082 | ||
87cb7997 | 12083 | #: builtin/remote.c:1517 |
ef317cd5 | 12084 | msgid "manipulate push URLs" |
07432cef | 12085 | msgstr "操作推送 URLS" |
ef317cd5 | 12086 | |
87cb7997 | 12087 | #: builtin/remote.c:1519 |
ef317cd5 | 12088 | msgid "add URL" |
07432cef | 12089 | msgstr "添加 URL" |
ef317cd5 | 12090 | |
87cb7997 | 12091 | #: builtin/remote.c:1521 |
ef317cd5 | 12092 | msgid "delete URLs" |
07432cef | 12093 | msgstr "删除 URLS" |
ef317cd5 | 12094 | |
87cb7997 | 12095 | #: builtin/remote.c:1528 |
8ada9598 | 12096 | msgid "--add --delete doesn't make sense" |
81809b99 | 12097 | msgstr "--add --delete 无意义" |
8ada9598 | 12098 | |
87cb7997 | 12099 | #: builtin/remote.c:1569 |
81809b99 | 12100 | #, c-format |
8ada9598 | 12101 | msgid "Invalid old URL pattern: %s" |
4375c10e | 12102 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 12103 | |
87cb7997 | 12104 | #: builtin/remote.c:1577 |
81809b99 | 12105 | #, c-format |
8ada9598 | 12106 | msgid "No such URL found: %s" |
4375c10e | 12107 | msgstr "未找到此 URL:%s" |
8ada9598 | 12108 | |
87cb7997 | 12109 | #: builtin/remote.c:1579 |
8ada9598 | 12110 | msgid "Will not delete all non-push URLs" |
4375c10e | 12111 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 12112 | |
87cb7997 | 12113 | #: builtin/remote.c:1593 |
ef317cd5 | 12114 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 12115 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 12116 | |
87cb7997 | 12117 | #: builtin/remote.c:1624 |
a0b6b246 JX |
12118 | #, c-format |
12119 | msgid "Unknown subcommand: %s" | |
12120 | msgstr "未知子命令:%s" | |
12121 | ||
6acbf033 | 12122 | #: builtin/repack.c:17 |
814ff314 JX |
12123 | msgid "git repack [<options>]" |
12124 | msgstr "git repack [<选项>]" | |
90314792 | 12125 | |
1a79b2f1 JX |
12126 | #: builtin/repack.c:22 |
12127 | msgid "" | |
12128 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
12129 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
12130 | msgstr "" | |
12131 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
12132 | "或禁用 pack.writebitmaps 配置。" | |
12133 | ||
12134 | #: builtin/repack.c:166 | |
90314792 JX |
12135 | msgid "pack everything in a single pack" |
12136 | msgstr "所有内容打包到一个包文件中" | |
12137 | ||
1a79b2f1 | 12138 | #: builtin/repack.c:168 |
90314792 JX |
12139 | msgid "same as -a, and turn unreachable objects loose" |
12140 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
12141 | ||
1a79b2f1 | 12142 | #: builtin/repack.c:171 |
90314792 JX |
12143 | msgid "remove redundant packs, and run git-prune-packed" |
12144 | msgstr "删除多余的包,运行 git-prune-packed" | |
12145 | ||
1a79b2f1 | 12146 | #: builtin/repack.c:173 |
90314792 JX |
12147 | msgid "pass --no-reuse-delta to git-pack-objects" |
12148 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
12149 | ||
1a79b2f1 | 12150 | #: builtin/repack.c:175 |
90314792 JX |
12151 | msgid "pass --no-reuse-object to git-pack-objects" |
12152 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
12153 | ||
1a79b2f1 | 12154 | #: builtin/repack.c:177 |
90314792 JX |
12155 | msgid "do not run git-update-server-info" |
12156 | msgstr "不运行 git-update-server-info" | |
12157 | ||
1a79b2f1 | 12158 | #: builtin/repack.c:180 |
90314792 JX |
12159 | msgid "pass --local to git-pack-objects" |
12160 | msgstr "向 git-pack-objects 传递参数 --local" | |
12161 | ||
1a79b2f1 | 12162 | #: builtin/repack.c:182 |
6c94aba5 JX |
12163 | msgid "write bitmap index" |
12164 | msgstr "写 bitmap 索引" | |
12165 | ||
1a79b2f1 | 12166 | #: builtin/repack.c:183 |
90314792 JX |
12167 | msgid "approxidate" |
12168 | msgstr "近似日期" | |
12169 | ||
1a79b2f1 | 12170 | #: builtin/repack.c:184 |
90314792 JX |
12171 | msgid "with -A, do not loosen objects older than this" |
12172 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
12173 | ||
1a79b2f1 | 12174 | #: builtin/repack.c:186 |
5c57d762 JX |
12175 | msgid "with -a, repack unreachable objects" |
12176 | msgstr "使用 -a ,重新对不可达对象打包" | |
12177 | ||
1a79b2f1 | 12178 | #: builtin/repack.c:188 |
90314792 JX |
12179 | msgid "size of the window used for delta compression" |
12180 | msgstr "用于增量压缩的窗口值" | |
12181 | ||
1a79b2f1 | 12182 | #: builtin/repack.c:189 builtin/repack.c:193 |
8376b58d JX |
12183 | msgid "bytes" |
12184 | msgstr "字节" | |
12185 | ||
1a79b2f1 | 12186 | #: builtin/repack.c:190 |
90314792 JX |
12187 | msgid "same as the above, but limit memory size instead of entries count" |
12188 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
12189 | ||
1a79b2f1 | 12190 | #: builtin/repack.c:192 |
90314792 JX |
12191 | msgid "limits the maximum delta depth" |
12192 | msgstr "限制最大增量深度" | |
12193 | ||
1a79b2f1 | 12194 | #: builtin/repack.c:194 |
90314792 | 12195 | msgid "maximum size of each packfile" |
dbd6cced | 12196 | msgstr "每个包文件的最大尺寸" |
90314792 | 12197 | |
1a79b2f1 | 12198 | #: builtin/repack.c:196 |
6c94aba5 JX |
12199 | msgid "repack objects in packs marked with .keep" |
12200 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
12201 | ||
1a79b2f1 | 12202 | #: builtin/repack.c:206 |
94550ed3 JX |
12203 | msgid "cannot delete packs in a precious-objects repo" |
12204 | msgstr "不能删除珍品仓库中的打包文件" | |
12205 | ||
1a79b2f1 | 12206 | #: builtin/repack.c:210 |
5c57d762 JX |
12207 | msgid "--keep-unreachable and -A are incompatible" |
12208 | msgstr "--keep-unreachable 和 -A 不兼容" | |
12209 | ||
1a79b2f1 | 12210 | #: builtin/repack.c:400 builtin/worktree.c:115 |
90314792 | 12211 | #, c-format |
5c57d762 JX |
12212 | msgid "failed to remove '%s'" |
12213 | msgstr "无法删除 '%s'" | |
90314792 | 12214 | |
6acbf033 | 12215 | #: builtin/replace.c:19 |
ef317cd5 | 12216 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 12217 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 12218 | |
6acbf033 JX |
12219 | #: builtin/replace.c:20 |
12220 | msgid "git replace [-f] --edit <object>" | |
12221 | msgstr "git replace [-f] --edit <对象>" | |
12222 | ||
12223 | #: builtin/replace.c:21 | |
12224 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
12225 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
12226 | ||
12227 | #: builtin/replace.c:22 | |
ef317cd5 | 12228 | msgid "git replace -d <object>..." |
07432cef | 12229 | msgstr "git replace -d <对象>..." |
ef317cd5 | 12230 | |
6acbf033 | 12231 | #: builtin/replace.c:23 |
cfff71a9 JX |
12232 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
12233 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 12234 | |
87cb7997 | 12235 | #: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395 |
6acbf033 JX |
12236 | #, c-format |
12237 | msgid "Not a valid object name: '%s'" | |
12238 | msgstr "不是一个有效的对象名:'%s'" | |
12239 | ||
87cb7997 | 12240 | #: builtin/replace.c:359 |
6acbf033 JX |
12241 | #, c-format |
12242 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 12243 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 12244 | |
87cb7997 | 12245 | #: builtin/replace.c:361 |
6acbf033 JX |
12246 | #, c-format |
12247 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 12248 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 12249 | |
87cb7997 | 12250 | #: builtin/replace.c:372 |
6acbf033 JX |
12251 | #, c-format |
12252 | msgid "" | |
12253 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
12254 | "instead of --graft" | |
55a16ee4 | 12255 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 12256 | |
87cb7997 | 12257 | #: builtin/replace.c:405 |
6acbf033 JX |
12258 | #, c-format |
12259 | msgid "the original commit '%s' has a gpg signature." | |
12260 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
12261 | ||
87cb7997 | 12262 | #: builtin/replace.c:406 |
6acbf033 JX |
12263 | msgid "the signature will be removed in the replacement commit!" |
12264 | msgstr "在替换的提交中签名将被移除!" | |
12265 | ||
87cb7997 | 12266 | #: builtin/replace.c:412 |
6acbf033 JX |
12267 | #, c-format |
12268 | msgid "could not write replacement commit for: '%s'" | |
12269 | msgstr "不能为 '%s' 写替换提交" | |
12270 | ||
87cb7997 | 12271 | #: builtin/replace.c:436 |
ef317cd5 | 12272 | msgid "list replace refs" |
07432cef | 12273 | msgstr "列出替换的引用" |
ef317cd5 | 12274 | |
87cb7997 | 12275 | #: builtin/replace.c:437 |
ef317cd5 | 12276 | msgid "delete replace refs" |
07432cef | 12277 | msgstr "删除替换的引用" |
ef317cd5 | 12278 | |
87cb7997 | 12279 | #: builtin/replace.c:438 |
6acbf033 JX |
12280 | msgid "edit existing object" |
12281 | msgstr "编辑现存的对象" | |
12282 | ||
87cb7997 | 12283 | #: builtin/replace.c:439 |
6acbf033 JX |
12284 | msgid "change a commit's parents" |
12285 | msgstr "修改一个提交的父提交" | |
12286 | ||
87cb7997 | 12287 | #: builtin/replace.c:440 |
ef317cd5 | 12288 | msgid "replace the ref if it exists" |
07432cef | 12289 | msgstr "如果存在则替换引用" |
ef317cd5 | 12290 | |
87cb7997 | 12291 | #: builtin/replace.c:441 |
6acbf033 JX |
12292 | msgid "do not pretty-print contents for --edit" |
12293 | msgstr "不要为 --edit 操作美观显示内容" | |
12294 | ||
87cb7997 | 12295 | #: builtin/replace.c:442 |
cfff71a9 JX |
12296 | msgid "use this format" |
12297 | msgstr "使用此格式" | |
12298 | ||
90314792 | 12299 | #: builtin/rerere.c:12 |
814ff314 JX |
12300 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
12301 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 12302 | |
94550ed3 | 12303 | #: builtin/rerere.c:58 |
ef317cd5 | 12304 | msgid "register clean resolutions in index" |
07432cef | 12305 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 12306 | |
220c313c | 12307 | #: builtin/reset.c:26 |
ef317cd5 JX |
12308 | msgid "" |
12309 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 12310 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 12311 | |
220c313c | 12312 | #: builtin/reset.c:27 |
a0b6b246 JX |
12313 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
12314 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 12315 | |
220c313c | 12316 | #: builtin/reset.c:28 |
07432cef WS |
12317 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
12318 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 12319 | |
220c313c | 12320 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12321 | msgid "mixed" |
12322 | msgstr "混杂" | |
12323 | ||
220c313c | 12324 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12325 | msgid "soft" |
12326 | msgstr "软性" | |
12327 | ||
220c313c | 12328 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12329 | msgid "hard" |
12330 | msgstr "硬性" | |
12331 | ||
220c313c | 12332 | #: builtin/reset.c:34 |
8ada9598 JX |
12333 | msgid "merge" |
12334 | msgstr "合并" | |
12335 | ||
220c313c | 12336 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12337 | msgid "keep" |
12338 | msgstr "保持" | |
12339 | ||
220c313c | 12340 | #: builtin/reset.c:74 |
c04f5ac3 JX |
12341 | msgid "You do not have a valid HEAD." |
12342 | msgstr "您没有一个有效的 HEAD。" | |
12343 | ||
220c313c | 12344 | #: builtin/reset.c:76 |
c04f5ac3 JX |
12345 | msgid "Failed to find tree of HEAD." |
12346 | msgstr "无法找到 HEAD 指向的树。" | |
12347 | ||
220c313c | 12348 | #: builtin/reset.c:82 |
c04f5ac3 JX |
12349 | #, c-format |
12350 | msgid "Failed to find tree of %s." | |
12351 | msgstr "无法找到 %s 指向的树。" | |
12352 | ||
220c313c | 12353 | #: builtin/reset.c:100 |
c04f5ac3 JX |
12354 | #, c-format |
12355 | msgid "HEAD is now at %s" | |
12356 | msgstr "HEAD 现在位于 %s" | |
12357 | ||
90e6ef53 | 12358 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 12359 | #: builtin/reset.c:183 |
c04f5ac3 JX |
12360 | #, c-format |
12361 | msgid "Cannot do a %s reset in the middle of a merge." | |
12362 | msgstr "在合并过程中不能做%s重置操作。" | |
12363 | ||
220c313c | 12364 | #: builtin/reset.c:276 |
ef317cd5 | 12365 | msgid "be quiet, only report errors" |
07432cef | 12366 | msgstr "安静模式,只报告错误" |
ef317cd5 | 12367 | |
220c313c | 12368 | #: builtin/reset.c:278 |
ef317cd5 | 12369 | msgid "reset HEAD and index" |
07432cef | 12370 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 12371 | |
220c313c | 12372 | #: builtin/reset.c:279 |
ef317cd5 | 12373 | msgid "reset only HEAD" |
07432cef | 12374 | msgstr "只重置 HEAD" |
ef317cd5 | 12375 | |
220c313c | 12376 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 12377 | msgid "reset HEAD, index and working tree" |
07432cef | 12378 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 12379 | |
220c313c | 12380 | #: builtin/reset.c:285 |
ef317cd5 | 12381 | msgid "reset HEAD but keep local changes" |
07432cef | 12382 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 12383 | |
220c313c | 12384 | #: builtin/reset.c:288 |
6c94aba5 JX |
12385 | msgid "record only the fact that removed paths will be added later" |
12386 | msgstr "将删除的路径标记为稍后添加" | |
12387 | ||
220c313c | 12388 | #: builtin/reset.c:305 |
07432cef WS |
12389 | #, c-format |
12390 | msgid "Failed to resolve '%s' as a valid revision." | |
12391 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
12392 | ||
220c313c | 12393 | #: builtin/reset.c:313 |
07432cef WS |
12394 | #, c-format |
12395 | msgid "Failed to resolve '%s' as a valid tree." | |
12396 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
12397 | ||
220c313c | 12398 | #: builtin/reset.c:322 |
c04f5ac3 | 12399 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 12400 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 12401 | |
220c313c | 12402 | #: builtin/reset.c:331 |
c04f5ac3 | 12403 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 12404 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 12405 | |
90e6ef53 | 12406 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 12407 | #: builtin/reset.c:333 |
c04f5ac3 JX |
12408 | #, c-format |
12409 | msgid "Cannot do %s reset with paths." | |
12410 | msgstr "不能带路径进行%s重置。" | |
12411 | ||
90e6ef53 | 12412 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 12413 | #: builtin/reset.c:343 |
c04f5ac3 JX |
12414 | #, c-format |
12415 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 12416 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 12417 | |
220c313c | 12418 | #: builtin/reset.c:347 |
6c94aba5 JX |
12419 | msgid "-N can only be used with --mixed" |
12420 | msgstr "-N 只能和 --mixed 同时使用" | |
12421 | ||
220c313c | 12422 | #: builtin/reset.c:364 |
90314792 | 12423 | msgid "Unstaged changes after reset:" |
160fb2b2 | 12424 | msgstr "重置后取消暂存的变更:" |
90314792 | 12425 | |
220c313c | 12426 | #: builtin/reset.c:370 |
ef317cd5 JX |
12427 | #, c-format |
12428 | msgid "Could not reset index file to revision '%s'." | |
12429 | msgstr "不能重置索引文件至版本 '%s'。" | |
12430 | ||
220c313c | 12431 | #: builtin/reset.c:374 |
07432cef WS |
12432 | msgid "Could not write new index file." |
12433 | msgstr "不能写入新的索引文件。" | |
12434 | ||
a0b6b246 | 12435 | #: builtin/rev-list.c:354 |
1b7f4a34 JX |
12436 | msgid "rev-list does not support display of notes" |
12437 | msgstr "rev-list 不支持显示注解" | |
12438 | ||
87cb7997 | 12439 | #: builtin/rev-parse.c:393 |
814ff314 JX |
12440 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
12441 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 12442 | |
87cb7997 | 12443 | #: builtin/rev-parse.c:398 |
ef317cd5 | 12444 | msgid "keep the `--` passed as an arg" |
07432cef | 12445 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 12446 | |
87cb7997 | 12447 | #: builtin/rev-parse.c:400 |
ef317cd5 | 12448 | msgid "stop parsing after the first non-option argument" |
07432cef | 12449 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 12450 | |
87cb7997 | 12451 | #: builtin/rev-parse.c:403 |
cfff71a9 JX |
12452 | msgid "output in stuck long form" |
12453 | msgstr "以固定长格式输出" | |
12454 | ||
87cb7997 | 12455 | #: builtin/rev-parse.c:534 |
ef317cd5 | 12456 | msgid "" |
814ff314 | 12457 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 12458 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 12459 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
12460 | "\n" |
12461 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
12462 | msgstr "" | |
814ff314 | 12463 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 12464 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 12465 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
12466 | "\n" |
12467 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
12468 | |
12469 | #: builtin/revert.c:22 | |
814ff314 JX |
12470 | msgid "git revert [<options>] <commit-ish>..." |
12471 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
12472 | |
12473 | #: builtin/revert.c:23 | |
12474 | msgid "git revert <subcommand>" | |
07432cef | 12475 | msgstr "git revert <子命令>" |
ef317cd5 JX |
12476 | |
12477 | #: builtin/revert.c:28 | |
814ff314 JX |
12478 | msgid "git cherry-pick [<options>] <commit-ish>..." |
12479 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
12480 | |
12481 | #: builtin/revert.c:29 | |
ef317cd5 | 12482 | msgid "git cherry-pick <subcommand>" |
07432cef | 12483 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 12484 | |
87cb7997 | 12485 | #: builtin/revert.c:89 |
ef317cd5 JX |
12486 | #, c-format |
12487 | msgid "%s: %s cannot be used with %s" | |
12488 | msgstr "%s:%s 不能和 %s 同时使用" | |
12489 | ||
87cb7997 | 12490 | #: builtin/revert.c:98 |
ef317cd5 | 12491 | msgid "end revert or cherry-pick sequence" |
07432cef | 12492 | msgstr "终止反转或拣选操作" |
ef317cd5 | 12493 | |
87cb7997 | 12494 | #: builtin/revert.c:99 |
ef317cd5 | 12495 | msgid "resume revert or cherry-pick sequence" |
07432cef | 12496 | msgstr "继续反转或拣选操作" |
ef317cd5 | 12497 | |
87cb7997 | 12498 | #: builtin/revert.c:100 |
ef317cd5 | 12499 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 12500 | msgstr "取消反转或拣选操作" |
ef317cd5 | 12501 | |
87cb7997 | 12502 | #: builtin/revert.c:101 |
ef317cd5 | 12503 | msgid "don't automatically commit" |
07432cef | 12504 | msgstr "不要自动提交" |
ef317cd5 | 12505 | |
87cb7997 | 12506 | #: builtin/revert.c:102 |
ef317cd5 | 12507 | msgid "edit the commit message" |
07432cef | 12508 | msgstr "编辑提交说明" |
ef317cd5 | 12509 | |
87cb7997 JX |
12510 | #: builtin/revert.c:105 |
12511 | msgid "parent-number" | |
07432cef | 12512 | msgstr "父编号" |
ef317cd5 | 12513 | |
87cb7997 JX |
12514 | #: builtin/revert.c:106 |
12515 | msgid "select mainline parent" | |
12516 | msgstr "选择主干父提交编号" | |
12517 | ||
12518 | #: builtin/revert.c:108 | |
ef317cd5 | 12519 | msgid "merge strategy" |
07432cef | 12520 | msgstr "合并策略" |
ef317cd5 | 12521 | |
87cb7997 | 12522 | #: builtin/revert.c:109 |
ef317cd5 | 12523 | msgid "option" |
07432cef | 12524 | msgstr "选项" |
ef317cd5 | 12525 | |
87cb7997 | 12526 | #: builtin/revert.c:110 |
ef317cd5 | 12527 | msgid "option for merge strategy" |
07432cef | 12528 | msgstr "合并策略的选项" |
ef317cd5 | 12529 | |
87cb7997 | 12530 | #: builtin/revert.c:119 |
ef317cd5 | 12531 | msgid "append commit name" |
07432cef | 12532 | msgstr "追加提交名称" |
ef317cd5 | 12533 | |
87cb7997 | 12534 | #: builtin/revert.c:121 |
ef317cd5 | 12535 | msgid "preserve initially empty commits" |
07432cef | 12536 | msgstr "保留初始化的空提交" |
ef317cd5 | 12537 | |
87cb7997 | 12538 | #: builtin/revert.c:122 |
ef317cd5 | 12539 | msgid "allow commits with empty messages" |
07432cef | 12540 | msgstr "允许提交说明为空" |
c04f5ac3 | 12541 | |
87cb7997 | 12542 | #: builtin/revert.c:123 |
ef317cd5 | 12543 | msgid "keep redundant, empty commits" |
07432cef | 12544 | msgstr "保持多余的、空的提交" |
ef317cd5 | 12545 | |
87cb7997 | 12546 | #: builtin/revert.c:211 |
c04f5ac3 JX |
12547 | msgid "revert failed" |
12548 | msgstr "还原失败" | |
12549 | ||
87cb7997 | 12550 | #: builtin/revert.c:224 |
c04f5ac3 JX |
12551 | msgid "cherry-pick failed" |
12552 | msgstr "拣选失败" | |
12553 | ||
90314792 | 12554 | #: builtin/rm.c:17 |
814ff314 JX |
12555 | msgid "git rm [<options>] [--] <file>..." |
12556 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 12557 | |
1a79b2f1 | 12558 | #: builtin/rm.c:205 |
c04f5ac3 | 12559 | msgid "" |
2e8451e8 JX |
12560 | "the following file has staged content different from both the\n" |
12561 | "file and the HEAD:" | |
12562 | msgid_plural "" | |
12563 | "the following files have staged content different from both the\n" | |
12564 | "file and the HEAD:" | |
12565 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
12566 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
12567 | ||
1a79b2f1 | 12568 | #: builtin/rm.c:210 |
2e8451e8 JX |
12569 | msgid "" |
12570 | "\n" | |
c04f5ac3 JX |
12571 | "(use -f to force removal)" |
12572 | msgstr "" | |
2e8451e8 | 12573 | "\n" |
c04f5ac3 JX |
12574 | "(使用 -f 强制删除)" |
12575 | ||
1a79b2f1 | 12576 | #: builtin/rm.c:214 |
2e8451e8 JX |
12577 | msgid "the following file has changes staged in the index:" |
12578 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
12579 | msgstr[0] "下列文件索引中有变更" |
12580 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 12581 | |
1a79b2f1 | 12582 | #: builtin/rm.c:218 builtin/rm.c:227 |
c04f5ac3 | 12583 | msgid "" |
2e8451e8 | 12584 | "\n" |
c04f5ac3 JX |
12585 | "(use --cached to keep the file, or -f to force removal)" |
12586 | msgstr "" | |
2e8451e8 JX |
12587 | "\n" |
12588 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
12589 | ||
1a79b2f1 | 12590 | #: builtin/rm.c:224 |
2e8451e8 JX |
12591 | msgid "the following file has local modifications:" |
12592 | msgid_plural "the following files have local modifications:" | |
12593 | msgstr[0] "如下文件有本地修改:" | |
12594 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 12595 | |
1a79b2f1 | 12596 | #: builtin/rm.c:242 |
ef317cd5 | 12597 | msgid "do not list removed files" |
07432cef | 12598 | msgstr "不列出删除的文件" |
ef317cd5 | 12599 | |
1a79b2f1 | 12600 | #: builtin/rm.c:243 |
ef317cd5 | 12601 | msgid "only remove from the index" |
07432cef | 12602 | msgstr "只从索引区删除" |
ef317cd5 | 12603 | |
1a79b2f1 | 12604 | #: builtin/rm.c:244 |
ef317cd5 | 12605 | msgid "override the up-to-date check" |
07432cef | 12606 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 12607 | |
1a79b2f1 | 12608 | #: builtin/rm.c:245 |
ef317cd5 | 12609 | msgid "allow recursive removal" |
07432cef | 12610 | msgstr "允许递归删除" |
ef317cd5 | 12611 | |
1a79b2f1 | 12612 | #: builtin/rm.c:247 |
ef317cd5 | 12613 | msgid "exit with a zero status even if nothing matched" |
07432cef | 12614 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 12615 | |
1a79b2f1 | 12616 | #: builtin/rm.c:308 |
c04f5ac3 JX |
12617 | #, c-format |
12618 | msgid "not removing '%s' recursively without -r" | |
12619 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
12620 | ||
1a79b2f1 | 12621 | #: builtin/rm.c:347 |
c04f5ac3 JX |
12622 | #, c-format |
12623 | msgid "git rm: unable to remove %s" | |
12624 | msgstr "git rm:不能删除 %s" | |
12625 | ||
1a79b2f1 JX |
12626 | #: builtin/rm.c:370 |
12627 | #, c-format | |
12628 | msgid "could not remove '%s'" | |
12629 | msgstr "无法删除 '%s'" | |
12630 | ||
1b7f4a34 JX |
12631 | #: builtin/send-pack.c:18 |
12632 | msgid "" | |
12633 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
12634 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
12635 | "[<ref>...]\n" | |
12636 | " --all and explicit <ref> specification are mutually exclusive." | |
12637 | msgstr "" | |
12638 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
12639 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
12640 | " --all 和明确的 <引用> 互斥。" | |
12641 | ||
87cb7997 | 12642 | #: builtin/send-pack.c:161 |
1b7f4a34 JX |
12643 | msgid "remote name" |
12644 | msgstr "远程名称" | |
12645 | ||
87cb7997 | 12646 | #: builtin/send-pack.c:175 |
1b7f4a34 JX |
12647 | msgid "use stateless RPC protocol" |
12648 | msgstr "使用无状态的 RPC 协议" | |
12649 | ||
87cb7997 | 12650 | #: builtin/send-pack.c:176 |
1b7f4a34 JX |
12651 | msgid "read refs from stdin" |
12652 | msgstr "从标准输入读取引用" | |
12653 | ||
87cb7997 | 12654 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
12655 | msgid "print status from remote helper" |
12656 | msgstr "打印来自远程 helper 的状态" | |
12657 | ||
ef317cd5 | 12658 | #: builtin/shortlog.c:13 |
814ff314 | 12659 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 12660 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 12661 | |
87cb7997 | 12662 | #: builtin/shortlog.c:248 |
1a79b2f1 JX |
12663 | msgid "Group by committer rather than author" |
12664 | msgstr "按照提交者分组而不是作者" | |
12665 | ||
87cb7997 | 12666 | #: builtin/shortlog.c:250 |
ef317cd5 | 12667 | msgid "sort output according to the number of commits per author" |
07432cef | 12668 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 12669 | |
87cb7997 | 12670 | #: builtin/shortlog.c:252 |
ef317cd5 | 12671 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 12672 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 12673 | |
87cb7997 | 12674 | #: builtin/shortlog.c:254 |
ef317cd5 | 12675 | msgid "Show the email address of each author" |
07432cef | 12676 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 12677 | |
87cb7997 | 12678 | #: builtin/shortlog.c:255 |
ef317cd5 | 12679 | msgid "w[,i1[,i2]]" |
07432cef | 12680 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 12681 | |
87cb7997 | 12682 | #: builtin/shortlog.c:256 |
ef317cd5 | 12683 | msgid "Linewrap output" |
07432cef | 12684 | msgstr "折行输出" |
ef317cd5 | 12685 | |
94550ed3 | 12686 | #: builtin/show-branch.c:10 |
ef317cd5 | 12687 | msgid "" |
814ff314 | 12688 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
12689 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
12690 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
12691 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 12692 | msgstr "" |
814ff314 | 12693 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
12694 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
12695 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
12696 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 12697 | |
94550ed3 | 12698 | #: builtin/show-branch.c:14 |
814ff314 JX |
12699 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
12700 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 12701 | |
87cb7997 | 12702 | #: builtin/show-branch.c:374 |
a0b6b246 JX |
12703 | #, c-format |
12704 | msgid "ignoring %s; cannot handle more than %d ref" | |
12705 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
12706 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
12707 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
12708 | ||
87cb7997 | 12709 | #: builtin/show-branch.c:536 |
a0b6b246 JX |
12710 | #, c-format |
12711 | msgid "no matching refs with %s" | |
12712 | msgstr "没有和 %s 匹配的引用" | |
12713 | ||
87cb7997 | 12714 | #: builtin/show-branch.c:632 |
ef317cd5 | 12715 | msgid "show remote-tracking and local branches" |
07432cef | 12716 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 12717 | |
87cb7997 | 12718 | #: builtin/show-branch.c:634 |
ef317cd5 | 12719 | msgid "show remote-tracking branches" |
07432cef | 12720 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 12721 | |
87cb7997 | 12722 | #: builtin/show-branch.c:636 |
ef317cd5 | 12723 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 12724 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 12725 | |
87cb7997 | 12726 | #: builtin/show-branch.c:638 |
ef317cd5 | 12727 | msgid "show <n> more commits after the common ancestor" |
07432cef | 12728 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 12729 | |
87cb7997 | 12730 | #: builtin/show-branch.c:640 |
ef317cd5 | 12731 | msgid "synonym to more=-1" |
07432cef | 12732 | msgstr "和 more=-1 同义" |
ef317cd5 | 12733 | |
87cb7997 | 12734 | #: builtin/show-branch.c:641 |
ef317cd5 | 12735 | msgid "suppress naming strings" |
07432cef | 12736 | msgstr "不显示字符串命名" |
ef317cd5 | 12737 | |
87cb7997 | 12738 | #: builtin/show-branch.c:643 |
ef317cd5 | 12739 | msgid "include the current branch" |
07432cef | 12740 | msgstr "包括当前分支" |
ef317cd5 | 12741 | |
87cb7997 | 12742 | #: builtin/show-branch.c:645 |
ef317cd5 | 12743 | msgid "name commits with their object names" |
07432cef | 12744 | msgstr "以对象名字命名提交" |
ef317cd5 | 12745 | |
87cb7997 | 12746 | #: builtin/show-branch.c:647 |
ef317cd5 | 12747 | msgid "show possible merge bases" |
07432cef | 12748 | msgstr "显示可能合并的基线" |
ef317cd5 | 12749 | |
87cb7997 | 12750 | #: builtin/show-branch.c:649 |
ef317cd5 | 12751 | msgid "show refs unreachable from any other ref" |
07432cef | 12752 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 12753 | |
87cb7997 | 12754 | #: builtin/show-branch.c:651 |
ef317cd5 | 12755 | msgid "show commits in topological order" |
07432cef | 12756 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 12757 | |
87cb7997 | 12758 | #: builtin/show-branch.c:654 |
ef317cd5 | 12759 | msgid "show only commits not on the first branch" |
07432cef | 12760 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 12761 | |
87cb7997 | 12762 | #: builtin/show-branch.c:656 |
ef317cd5 | 12763 | msgid "show merges reachable from only one tip" |
07432cef | 12764 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 12765 | |
87cb7997 | 12766 | #: builtin/show-branch.c:658 |
2e8451e8 JX |
12767 | msgid "topologically sort, maintaining date order where possible" |
12768 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 12769 | |
87cb7997 | 12770 | #: builtin/show-branch.c:661 |
ef317cd5 | 12771 | msgid "<n>[,<base>]" |
07432cef | 12772 | msgstr "<n>[,<base>]" |
ef317cd5 | 12773 | |
87cb7997 | 12774 | #: builtin/show-branch.c:662 |
ef317cd5 | 12775 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 12776 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 12777 | |
87cb7997 | 12778 | #: builtin/show-branch.c:696 |
a0b6b246 JX |
12779 | msgid "" |
12780 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
12781 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
12782 | ||
87cb7997 | 12783 | #: builtin/show-branch.c:720 |
a0b6b246 JX |
12784 | msgid "no branches given, and HEAD is not valid" |
12785 | msgstr "未提供分支,且 HEAD 无效" | |
12786 | ||
87cb7997 | 12787 | #: builtin/show-branch.c:723 |
a0b6b246 JX |
12788 | msgid "--reflog option needs one branch name" |
12789 | msgstr "选项 --reflog 需要一个分支名" | |
12790 | ||
87cb7997 | 12791 | #: builtin/show-branch.c:726 |
a0b6b246 JX |
12792 | #, c-format |
12793 | msgid "only %d entry can be shown at one time." | |
12794 | msgid_plural "only %d entries can be shown at one time." | |
12795 | msgstr[0] "一次只能显示 %d 个条目。" | |
12796 | msgstr[1] "一次只能显示 %d 个条目。" | |
12797 | ||
87cb7997 | 12798 | #: builtin/show-branch.c:730 |
a0b6b246 JX |
12799 | #, c-format |
12800 | msgid "no such ref %s" | |
12801 | msgstr "无此引用 %s" | |
12802 | ||
87cb7997 | 12803 | #: builtin/show-branch.c:814 |
a0b6b246 JX |
12804 | #, c-format |
12805 | msgid "cannot handle more than %d rev." | |
12806 | msgid_plural "cannot handle more than %d revs." | |
12807 | msgstr[0] "不能处理 %d 个以上的版本。" | |
12808 | msgstr[1] "不能处理 %d 个以上的版本。" | |
12809 | ||
87cb7997 | 12810 | #: builtin/show-branch.c:818 |
a0b6b246 JX |
12811 | #, c-format |
12812 | msgid "'%s' is not a valid ref." | |
12813 | msgstr "'%s' 不是一个有效的引用。" | |
12814 | ||
87cb7997 | 12815 | #: builtin/show-branch.c:821 |
a0b6b246 JX |
12816 | #, c-format |
12817 | msgid "cannot find commit %s (%s)" | |
29004bbb | 12818 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 12819 | |
ef317cd5 JX |
12820 | #: builtin/show-ref.c:10 |
12821 | msgid "" | |
814ff314 JX |
12822 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
12823 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 12824 | msgstr "" |
814ff314 JX |
12825 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
12826 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
12827 | |
12828 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
12829 | msgid "git show-ref --exclude-existing[=<pattern>]" |
12830 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 12831 | |
1a79b2f1 | 12832 | #: builtin/show-ref.c:159 |
ef317cd5 | 12833 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 12834 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 12835 | |
1a79b2f1 | 12836 | #: builtin/show-ref.c:160 |
ef317cd5 | 12837 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 12838 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 12839 | |
1a79b2f1 | 12840 | #: builtin/show-ref.c:161 |
ef317cd5 | 12841 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 12842 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 12843 | |
1a79b2f1 | 12844 | #: builtin/show-ref.c:164 builtin/show-ref.c:166 |
2e8451e8 JX |
12845 | msgid "show the HEAD reference, even if it would be filtered out" |
12846 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 12847 | |
1a79b2f1 | 12848 | #: builtin/show-ref.c:168 |
ef317cd5 | 12849 | msgid "dereference tags into object IDs" |
4375c10e | 12850 | msgstr "转换标签到对象 ID" |
ef317cd5 | 12851 | |
1a79b2f1 | 12852 | #: builtin/show-ref.c:170 |
ef317cd5 | 12853 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 12854 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 12855 | |
1a79b2f1 | 12856 | #: builtin/show-ref.c:174 |
ef317cd5 | 12857 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 12858 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 12859 | |
1a79b2f1 | 12860 | #: builtin/show-ref.c:176 |
ef317cd5 | 12861 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 12862 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 12863 | |
94550ed3 JX |
12864 | #: builtin/stripspace.c:17 |
12865 | msgid "git stripspace [-s | --strip-comments]" | |
12866 | msgstr "git stripspace [-s | --strip-comments]" | |
12867 | ||
12868 | #: builtin/stripspace.c:18 | |
12869 | msgid "git stripspace [-c | --comment-lines]" | |
12870 | msgstr "git stripspace [-c | --comment-lines]" | |
12871 | ||
12872 | #: builtin/stripspace.c:35 | |
12873 | msgid "skip and remove all lines starting with comment character" | |
12874 | msgstr "跳过和移除所有的注释行" | |
12875 | ||
12876 | #: builtin/stripspace.c:38 | |
276ceeaa | 12877 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
12878 | msgstr "为每一行的行首添加注释符和空格" |
12879 | ||
87cb7997 | 12880 | #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 |
5b04ee3b JX |
12881 | #, c-format |
12882 | msgid "No such ref: %s" | |
12883 | msgstr "没有这样的引用:%s" | |
12884 | ||
87cb7997 | 12885 | #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 |
5b04ee3b JX |
12886 | #, c-format |
12887 | msgid "Expecting a full ref name, got %s" | |
12888 | msgstr "期望一个完整的引用名称,却得到 %s" | |
12889 | ||
12890 | #: builtin/submodule--helper.c:71 | |
12891 | #, c-format | |
12892 | msgid "cannot strip one component off url '%s'" | |
12893 | msgstr "无法从 url '%s' 剥离一个组件" | |
12894 | ||
87cb7997 | 12895 | #: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 |
94550ed3 JX |
12896 | msgid "alternative anchor for relative paths" |
12897 | msgstr "相对路径的替代锚记(anchor)" | |
12898 | ||
87cb7997 | 12899 | #: builtin/submodule--helper.c:310 |
94550ed3 JX |
12900 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
12901 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
12902 | ||
87cb7997 | 12903 | #: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382 |
5b04ee3b JX |
12904 | #, c-format |
12905 | msgid "No url found for submodule path '%s' in .gitmodules" | |
12906 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
12907 | ||
87cb7997 JX |
12908 | #: builtin/submodule--helper.c:395 |
12909 | #, c-format | |
12910 | msgid "" | |
12911 | "could not lookup configuration '%s'. Assuming this repository is its own " | |
12912 | "authoritative upstream." | |
12913 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
12914 | ||
12915 | #: builtin/submodule--helper.c:406 | |
5b04ee3b JX |
12916 | #, c-format |
12917 | msgid "Failed to register url for submodule path '%s'" | |
12918 | msgstr "无法为子模组 '%s' 注册 url" | |
12919 | ||
87cb7997 | 12920 | #: builtin/submodule--helper.c:410 |
5b04ee3b JX |
12921 | #, c-format |
12922 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 12923 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
12924 | |
12925 | # | |
87cb7997 | 12926 | #: builtin/submodule--helper.c:420 |
aef18cc6 | 12927 | #, c-format |
5b04ee3b | 12928 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 12929 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 12930 | |
87cb7997 | 12931 | #: builtin/submodule--helper.c:427 |
5b04ee3b JX |
12932 | #, c-format |
12933 | msgid "Failed to register update mode for submodule path '%s'" | |
12934 | msgstr "无法为子模组 '%s' 注册更新模式" | |
12935 | ||
87cb7997 | 12936 | #: builtin/submodule--helper.c:443 |
5b04ee3b JX |
12937 | msgid "Suppress output for initializing a submodule" |
12938 | msgstr "初始化子模组时抑制输出" | |
12939 | ||
87cb7997 | 12940 | #: builtin/submodule--helper.c:448 |
5b04ee3b JX |
12941 | msgid "git submodule--helper init [<path>]" |
12942 | msgstr "git submodule--helper init [<路径>]" | |
12943 | ||
87cb7997 | 12944 | #: builtin/submodule--helper.c:476 |
94550ed3 JX |
12945 | msgid "git submodule--helper name <path>" |
12946 | msgstr "git submodule--helper name <路径>" | |
12947 | ||
87cb7997 | 12948 | #: builtin/submodule--helper.c:482 |
94550ed3 JX |
12949 | #, c-format |
12950 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
12951 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
12952 | ||
87cb7997 | 12953 | #: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 |
a0b6b246 JX |
12954 | #, c-format |
12955 | msgid "submodule '%s' cannot add alternate: %s" | |
12956 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
12957 | ||
87cb7997 | 12958 | #: builtin/submodule--helper.c:604 |
a0b6b246 JX |
12959 | #, c-format |
12960 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
12961 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
12962 | ||
87cb7997 | 12963 | #: builtin/submodule--helper.c:611 |
a0b6b246 JX |
12964 | #, c-format |
12965 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
12966 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
12967 | ||
87cb7997 | 12968 | #: builtin/submodule--helper.c:633 |
94550ed3 JX |
12969 | msgid "where the new submodule will be cloned to" |
12970 | msgstr "新的子模组将要克隆的路径" | |
12971 | ||
87cb7997 | 12972 | #: builtin/submodule--helper.c:636 |
94550ed3 JX |
12973 | msgid "name of the new submodule" |
12974 | msgstr "新子模组的名称" | |
12975 | ||
87cb7997 | 12976 | #: builtin/submodule--helper.c:639 |
94550ed3 JX |
12977 | msgid "url where to clone the submodule from" |
12978 | msgstr "克隆子模组的 url 地址" | |
12979 | ||
87cb7997 | 12980 | #: builtin/submodule--helper.c:645 |
94550ed3 JX |
12981 | msgid "depth for shallow clones" |
12982 | msgstr "浅克隆的深度" | |
12983 | ||
87cb7997 | 12984 | #: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 |
a0b6b246 | 12985 | msgid "force cloning progress" |
29004bbb | 12986 | msgstr "强制显示克隆进度" |
a0b6b246 | 12987 | |
87cb7997 | 12988 | #: builtin/submodule--helper.c:653 |
94550ed3 JX |
12989 | msgid "" |
12990 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 12991 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
12992 | msgstr "" |
12993 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
12994 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 12995 | |
87cb7997 | 12996 | #: builtin/submodule--helper.c:684 |
94550ed3 JX |
12997 | #, c-format |
12998 | msgid "clone of '%s' into submodule path '%s' failed" | |
12999 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
13000 | ||
87cb7997 | 13001 | #: builtin/submodule--helper.c:699 |
94550ed3 JX |
13002 | #, c-format |
13003 | msgid "could not get submodule directory for '%s'" | |
13004 | msgstr "无法得到 '%s' 的子模组目录" | |
13005 | ||
87cb7997 | 13006 | #: builtin/submodule--helper.c:764 |
5b04ee3b JX |
13007 | #, c-format |
13008 | msgid "Submodule path '%s' not initialized" | |
13009 | msgstr "子模组 '%s' 尚未初始化" | |
13010 | ||
87cb7997 | 13011 | #: builtin/submodule--helper.c:768 |
5b04ee3b JX |
13012 | msgid "Maybe you want to use 'update --init'?" |
13013 | msgstr "也许您想要执行 'update --init'?" | |
13014 | ||
87cb7997 | 13015 | #: builtin/submodule--helper.c:793 |
5b04ee3b JX |
13016 | #, c-format |
13017 | msgid "Skipping unmerged submodule %s" | |
13018 | msgstr "略过未合并的子模组 %s" | |
13019 | ||
87cb7997 | 13020 | #: builtin/submodule--helper.c:814 |
5b04ee3b JX |
13021 | #, c-format |
13022 | msgid "Skipping submodule '%s'" | |
13023 | msgstr "略过子模组 '%s'" | |
13024 | ||
87cb7997 | 13025 | #: builtin/submodule--helper.c:942 |
5c57d762 JX |
13026 | #, c-format |
13027 | msgid "Failed to clone '%s'. Retry scheduled" | |
13028 | msgstr "克隆 '%s' 失败。按计划重试" | |
13029 | ||
87cb7997 | 13030 | #: builtin/submodule--helper.c:953 |
5c57d762 JX |
13031 | #, c-format |
13032 | msgid "Failed to clone '%s' a second time, aborting" | |
13033 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
13034 | ||
87cb7997 | 13035 | #: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 |
5b04ee3b JX |
13036 | msgid "path into the working tree" |
13037 | msgstr "到工作区的路径" | |
13038 | ||
87cb7997 | 13039 | #: builtin/submodule--helper.c:977 |
5b04ee3b JX |
13040 | msgid "path into the working tree, across nested submodule boundaries" |
13041 | msgstr "工作区中的路径,递归嵌套子模组" | |
13042 | ||
87cb7997 | 13043 | #: builtin/submodule--helper.c:981 |
5b04ee3b JX |
13044 | msgid "rebase, merge, checkout or none" |
13045 | msgstr "rebase、merge、checkout 或 none" | |
13046 | ||
87cb7997 | 13047 | #: builtin/submodule--helper.c:985 |
5b04ee3b JX |
13048 | msgid "Create a shallow clone truncated to the specified number of revisions" |
13049 | msgstr "创建一个指定深度的浅克隆" | |
13050 | ||
87cb7997 | 13051 | #: builtin/submodule--helper.c:988 |
5b04ee3b JX |
13052 | msgid "parallel jobs" |
13053 | msgstr "并发任务" | |
13054 | ||
87cb7997 | 13055 | #: builtin/submodule--helper.c:990 |
5c57d762 | 13056 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 13057 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 13058 | |
87cb7997 | 13059 | #: builtin/submodule--helper.c:991 |
5b04ee3b JX |
13060 | msgid "don't print cloning progress" |
13061 | msgstr "不要输出克隆进度" | |
94550ed3 | 13062 | |
87cb7997 | 13063 | #: builtin/submodule--helper.c:998 |
5b04ee3b JX |
13064 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
13065 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
13066 | ||
87cb7997 | 13067 | #: builtin/submodule--helper.c:1008 |
5b04ee3b JX |
13068 | msgid "bad value for update parameter" |
13069 | msgstr "update 参数取值错误" | |
13070 | ||
87cb7997 | 13071 | #: builtin/submodule--helper.c:1079 |
5c57d762 JX |
13072 | #, c-format |
13073 | msgid "" | |
13074 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
13075 | "the superproject is not on any branch" | |
13076 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
13077 | ||
87cb7997 | 13078 | #: builtin/submodule--helper.c:1163 |
1a79b2f1 JX |
13079 | msgid "recurse into submodules" |
13080 | msgstr "在子模组中递归" | |
13081 | ||
87cb7997 | 13082 | #: builtin/submodule--helper.c:1169 |
1a79b2f1 JX |
13083 | msgid "git submodule--helper embed-git-dir [<path>...]" |
13084 | msgstr "git submodule--helper embed-git-dir [<路径>...]" | |
13085 | ||
87cb7997 | 13086 | #: builtin/submodule--helper.c:1226 |
5b04ee3b JX |
13087 | msgid "submodule--helper subcommand must be called with a subcommand" |
13088 | msgstr "submodule-helper 子命令必须由另外的子命令调用" | |
13089 | ||
87cb7997 | 13090 | #: builtin/submodule--helper.c:1233 |
1a79b2f1 JX |
13091 | #, c-format |
13092 | msgid "%s doesn't support --super-prefix" | |
13093 | msgstr "%s 不支持 --super-prefix" | |
13094 | ||
87cb7997 | 13095 | #: builtin/submodule--helper.c:1239 |
94550ed3 | 13096 | #, c-format |
5b04ee3b JX |
13097 | msgid "'%s' is not a valid submodule--helper subcommand" |
13098 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 13099 | |
ef317cd5 | 13100 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
13101 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
13102 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
13103 | |
13104 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
13105 | msgid "git symbolic-ref -d [-q] <name>" |
13106 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 13107 | |
07432cef | 13108 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 13109 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
13110 | msgstr "不显示非符号(分离的)引用的错误信息" |
13111 | ||
13112 | #: builtin/symbolic-ref.c:41 | |
13113 | msgid "delete symbolic ref" | |
13114 | msgstr "删除符号引用" | |
ef317cd5 | 13115 | |
07432cef | 13116 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 13117 | msgid "shorten ref output" |
07432cef | 13118 | msgstr "简短的引用输出" |
ef317cd5 | 13119 | |
1b7f4a34 | 13120 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 13121 | msgid "reason" |
07432cef | 13122 | msgstr "原因" |
ef317cd5 | 13123 | |
1b7f4a34 | 13124 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 13125 | msgid "reason of the update" |
07432cef | 13126 | msgstr "更新的原因" |
ef317cd5 | 13127 | |
94550ed3 | 13128 | #: builtin/tag.c:23 |
ef317cd5 | 13129 | msgid "" |
814ff314 JX |
13130 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
13131 | "[<head>]" | |
13132 | msgstr "" | |
13133 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 13134 | |
94550ed3 | 13135 | #: builtin/tag.c:24 |
ef317cd5 | 13136 | msgid "git tag -d <tagname>..." |
07432cef | 13137 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 13138 | |
94550ed3 | 13139 | #: builtin/tag.c:25 |
ef317cd5 | 13140 | msgid "" |
87cb7997 JX |
13141 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
13142 | "points-at <object>]\n" | |
94550ed3 | 13143 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 13144 | msgstr "" |
87cb7997 JX |
13145 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
13146 | "at <对象>]\n" | |
94550ed3 | 13147 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 13148 | |
94550ed3 | 13149 | #: builtin/tag.c:27 |
1a79b2f1 JX |
13150 | msgid "git tag -v [--format=<format>] <tagname>..." |
13151 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 13152 | |
87cb7997 | 13153 | #: builtin/tag.c:83 |
c04f5ac3 JX |
13154 | #, c-format |
13155 | msgid "tag '%s' not found." | |
55a16ee4 | 13156 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 13157 | |
87cb7997 | 13158 | #: builtin/tag.c:99 |
c04f5ac3 JX |
13159 | #, c-format |
13160 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 13161 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 13162 | |
87cb7997 | 13163 | #: builtin/tag.c:128 |
a77c07d9 | 13164 | #, c-format |
c04f5ac3 JX |
13165 | msgid "" |
13166 | "\n" | |
6acbf033 JX |
13167 | "Write a message for tag:\n" |
13168 | " %s\n" | |
a77c07d9 | 13169 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
13170 | msgstr "" |
13171 | "\n" | |
55a16ee4 | 13172 | "输入一个标签说明:\n" |
6acbf033 | 13173 | " %s\n" |
a77c07d9 | 13174 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 13175 | |
87cb7997 | 13176 | #: builtin/tag.c:132 |
a77c07d9 | 13177 | #, c-format |
c04f5ac3 JX |
13178 | msgid "" |
13179 | "\n" | |
6acbf033 JX |
13180 | "Write a message for tag:\n" |
13181 | " %s\n" | |
a77c07d9 | 13182 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 13183 | "want to.\n" |
c04f5ac3 JX |
13184 | msgstr "" |
13185 | "\n" | |
55a16ee4 | 13186 | "输入一个标签说明:\n" |
6acbf033 | 13187 | " %s\n" |
a77c07d9 | 13188 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 13189 | |
87cb7997 | 13190 | #: builtin/tag.c:210 |
c04f5ac3 | 13191 | msgid "unable to sign the tag" |
55a16ee4 | 13192 | msgstr "无法签署标签" |
c04f5ac3 | 13193 | |
87cb7997 | 13194 | #: builtin/tag.c:212 |
c04f5ac3 | 13195 | msgid "unable to write tag file" |
55a16ee4 | 13196 | msgstr "无法写标签文件" |
c04f5ac3 | 13197 | |
87cb7997 | 13198 | #: builtin/tag.c:236 |
c04f5ac3 | 13199 | msgid "bad object type." |
90e6ef53 | 13200 | msgstr "坏的对象类型。" |
c04f5ac3 | 13201 | |
87cb7997 | 13202 | #: builtin/tag.c:282 |
c04f5ac3 | 13203 | msgid "no tag message?" |
55a16ee4 | 13204 | msgstr "无标签说明?" |
c04f5ac3 | 13205 | |
87cb7997 | 13206 | #: builtin/tag.c:289 |
c04f5ac3 JX |
13207 | #, c-format |
13208 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 13209 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 13210 | |
87cb7997 JX |
13211 | #: builtin/tag.c:312 |
13212 | msgid "tag: tagging " | |
13213 | msgstr "tag: tagging " | |
13214 | ||
13215 | #: builtin/tag.c:320 | |
13216 | msgid "object of unknown type" | |
13217 | msgstr "未知类型的对象" | |
13218 | ||
13219 | #: builtin/tag.c:327 | |
13220 | msgid "commit object" | |
13221 | msgstr "提交对象" | |
13222 | ||
13223 | #: builtin/tag.c:335 | |
13224 | msgid "tree object" | |
13225 | msgstr "树对象" | |
13226 | ||
13227 | #: builtin/tag.c:338 | |
13228 | msgid "blob object" | |
13229 | msgstr "数据对象" | |
13230 | ||
13231 | #: builtin/tag.c:341 | |
13232 | msgid "other tag object" | |
13233 | msgstr "其它标签对象" | |
13234 | ||
13235 | #: builtin/tag.c:397 | |
ef317cd5 | 13236 | msgid "list tag names" |
55a16ee4 | 13237 | msgstr "列出标签名称" |
ef317cd5 | 13238 | |
87cb7997 | 13239 | #: builtin/tag.c:399 |
ef317cd5 | 13240 | msgid "print <n> lines of each tag message" |
55a16ee4 | 13241 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 13242 | |
87cb7997 | 13243 | #: builtin/tag.c:401 |
ef317cd5 | 13244 | msgid "delete tags" |
55a16ee4 | 13245 | msgstr "删除标签" |
ef317cd5 | 13246 | |
87cb7997 | 13247 | #: builtin/tag.c:402 |
ef317cd5 | 13248 | msgid "verify tags" |
55a16ee4 | 13249 | msgstr "验证标签" |
ef317cd5 | 13250 | |
87cb7997 | 13251 | #: builtin/tag.c:404 |
ef317cd5 | 13252 | msgid "Tag creation options" |
55a16ee4 | 13253 | msgstr "标签创建选项" |
ef317cd5 | 13254 | |
87cb7997 | 13255 | #: builtin/tag.c:406 |
ef317cd5 | 13256 | msgid "annotated tag, needs a message" |
55a16ee4 | 13257 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 13258 | |
87cb7997 | 13259 | #: builtin/tag.c:408 |
ef317cd5 | 13260 | msgid "tag message" |
55a16ee4 | 13261 | msgstr "标签说明" |
ef317cd5 | 13262 | |
87cb7997 | 13263 | #: builtin/tag.c:410 |
ef317cd5 | 13264 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 13265 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 13266 | |
87cb7997 | 13267 | #: builtin/tag.c:414 |
ef317cd5 | 13268 | msgid "use another key to sign the tag" |
55a16ee4 | 13269 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 13270 | |
87cb7997 | 13271 | #: builtin/tag.c:415 |
ef317cd5 | 13272 | msgid "replace the tag if exists" |
55a16ee4 | 13273 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 13274 | |
87cb7997 | 13275 | #: builtin/tag.c:416 builtin/update-ref.c:368 |
03ea3327 | 13276 | msgid "create a reflog" |
1b7f4a34 JX |
13277 | msgstr "创建引用日志" |
13278 | ||
87cb7997 | 13279 | #: builtin/tag.c:418 |
814ff314 | 13280 | msgid "Tag listing options" |
55a16ee4 | 13281 | msgstr "标签列表选项" |
814ff314 | 13282 | |
87cb7997 | 13283 | #: builtin/tag.c:419 |
ef317cd5 | 13284 | msgid "show tag list in columns" |
55a16ee4 | 13285 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 13286 | |
87cb7997 | 13287 | #: builtin/tag.c:420 builtin/tag.c:422 |
ef317cd5 | 13288 | msgid "print only tags that contain the commit" |
87cb7997 | 13289 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 13290 | |
87cb7997 JX |
13291 | #: builtin/tag.c:421 builtin/tag.c:423 |
13292 | msgid "print only tags that don't contain the commit" | |
13293 | msgstr "只打印不包含该提交的标签" | |
13294 | ||
13295 | #: builtin/tag.c:424 | |
94550ed3 JX |
13296 | msgid "print only tags that are merged" |
13297 | msgstr "只打印已经合并的标签" | |
13298 | ||
87cb7997 | 13299 | #: builtin/tag.c:425 |
94550ed3 JX |
13300 | msgid "print only tags that are not merged" |
13301 | msgstr "只打印尚未合并的标签" | |
13302 | ||
87cb7997 | 13303 | #: builtin/tag.c:430 |
ef317cd5 | 13304 | msgid "print only tags of the object" |
87cb7997 | 13305 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 13306 | |
87cb7997 | 13307 | #: builtin/tag.c:469 |
8ada9598 | 13308 | msgid "--column and -n are incompatible" |
81809b99 | 13309 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 13310 | |
87cb7997 JX |
13311 | #: builtin/tag.c:491 |
13312 | msgid "-n option is only allowed in list mode" | |
13313 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 13314 | |
87cb7997 JX |
13315 | #: builtin/tag.c:493 |
13316 | msgid "--contains option is only allowed in list mode" | |
13317 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 13318 | |
87cb7997 JX |
13319 | #: builtin/tag.c:495 |
13320 | msgid "--no-contains option is only allowed in list mode" | |
13321 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 13322 | |
87cb7997 JX |
13323 | #: builtin/tag.c:497 |
13324 | msgid "--points-at option is only allowed in list mode" | |
13325 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 13326 | |
87cb7997 JX |
13327 | #: builtin/tag.c:499 |
13328 | msgid "--merged and --no-merged options are only allowed in list mode" | |
13329 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
13330 | ||
13331 | #: builtin/tag.c:510 | |
c04f5ac3 JX |
13332 | msgid "only one -F or -m option is allowed." |
13333 | msgstr "只允许一个 -F 或 -m 选项。" | |
13334 | ||
87cb7997 | 13335 | #: builtin/tag.c:529 |
c04f5ac3 JX |
13336 | msgid "too many params" |
13337 | msgstr "太多参数" | |
13338 | ||
87cb7997 | 13339 | #: builtin/tag.c:535 |
c04f5ac3 JX |
13340 | #, c-format |
13341 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 13342 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 13343 | |
87cb7997 | 13344 | #: builtin/tag.c:540 |
c04f5ac3 JX |
13345 | #, c-format |
13346 | msgid "tag '%s' already exists" | |
55a16ee4 | 13347 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 13348 | |
87cb7997 | 13349 | #: builtin/tag.c:570 |
c04f5ac3 JX |
13350 | #, c-format |
13351 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 13352 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 13353 | |
a0b6b246 | 13354 | #: builtin/unpack-objects.c:493 |
6c94aba5 JX |
13355 | msgid "Unpacking objects" |
13356 | msgstr "展开对象中" | |
13357 | ||
276ceeaa | 13358 | #: builtin/update-index.c:79 |
7aea43ff JX |
13359 | #, c-format |
13360 | msgid "failed to create directory %s" | |
13361 | msgstr "无法创建目录 %s" | |
13362 | ||
276ceeaa | 13363 | #: builtin/update-index.c:85 |
7aea43ff JX |
13364 | #, c-format |
13365 | msgid "failed to stat %s" | |
13366 | msgstr "无法枚举 %s 状态" | |
13367 | ||
276ceeaa | 13368 | #: builtin/update-index.c:95 |
7aea43ff JX |
13369 | #, c-format |
13370 | msgid "failed to create file %s" | |
13371 | msgstr "无法创建文件 %s" | |
13372 | ||
276ceeaa | 13373 | #: builtin/update-index.c:103 |
7aea43ff JX |
13374 | #, c-format |
13375 | msgid "failed to delete file %s" | |
13376 | msgstr "无法删除文件 %s" | |
13377 | ||
87cb7997 | 13378 | #: builtin/update-index.c:110 builtin/update-index.c:216 |
7aea43ff JX |
13379 | #, c-format |
13380 | msgid "failed to delete directory %s" | |
13381 | msgstr "无法删除目录 %s" | |
13382 | ||
87cb7997 | 13383 | #: builtin/update-index.c:135 |
7aea43ff | 13384 | #, c-format |
276ceeaa JX |
13385 | msgid "Testing mtime in '%s' " |
13386 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 13387 | |
87cb7997 | 13388 | #: builtin/update-index.c:149 |
7aea43ff JX |
13389 | msgid "directory stat info does not change after adding a new file" |
13390 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
13391 | ||
87cb7997 | 13392 | #: builtin/update-index.c:162 |
7aea43ff JX |
13393 | msgid "directory stat info does not change after adding a new directory" |
13394 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
13395 | ||
87cb7997 | 13396 | #: builtin/update-index.c:175 |
7aea43ff JX |
13397 | msgid "directory stat info changes after updating a file" |
13398 | msgstr "更新一个文件后,目录的状态信息被修改" | |
13399 | ||
87cb7997 | 13400 | #: builtin/update-index.c:186 |
7aea43ff JX |
13401 | msgid "directory stat info changes after adding a file inside subdirectory" |
13402 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
13403 | ||
87cb7997 | 13404 | #: builtin/update-index.c:197 |
7aea43ff JX |
13405 | msgid "directory stat info does not change after deleting a file" |
13406 | msgstr "删除一个文件后,目录的状态信息未改变" | |
13407 | ||
87cb7997 | 13408 | #: builtin/update-index.c:210 |
7aea43ff JX |
13409 | msgid "directory stat info does not change after deleting a directory" |
13410 | msgstr "删除一个目录后,目录的状态信息未改变" | |
13411 | ||
87cb7997 | 13412 | #: builtin/update-index.c:217 |
7aea43ff JX |
13413 | msgid " OK" |
13414 | msgstr " OK" | |
13415 | ||
87cb7997 | 13416 | #: builtin/update-index.c:568 |
814ff314 JX |
13417 | msgid "git update-index [<options>] [--] [<file>...]" |
13418 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 13419 | |
87cb7997 | 13420 | #: builtin/update-index.c:923 |
ef317cd5 | 13421 | msgid "continue refresh even when index needs update" |
07432cef | 13422 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 13423 | |
87cb7997 | 13424 | #: builtin/update-index.c:926 |
ef317cd5 | 13425 | msgid "refresh: ignore submodules" |
07432cef | 13426 | msgstr "刷新:忽略子模组" |
8ada9598 | 13427 | |
87cb7997 | 13428 | #: builtin/update-index.c:929 |
ef317cd5 | 13429 | msgid "do not ignore new files" |
07432cef | 13430 | msgstr "不忽略新的文件" |
8ada9598 | 13431 | |
87cb7997 | 13432 | #: builtin/update-index.c:931 |
ef317cd5 | 13433 | msgid "let files replace directories and vice-versa" |
07432cef | 13434 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 13435 | |
87cb7997 | 13436 | #: builtin/update-index.c:933 |
ef317cd5 | 13437 | msgid "notice files missing from worktree" |
07432cef | 13438 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 13439 | |
87cb7997 | 13440 | #: builtin/update-index.c:935 |
ef317cd5 | 13441 | msgid "refresh even if index contains unmerged entries" |
07432cef | 13442 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 13443 | |
87cb7997 | 13444 | #: builtin/update-index.c:938 |
ef317cd5 | 13445 | msgid "refresh stat information" |
07432cef | 13446 | msgstr "刷新统计信息" |
ef317cd5 | 13447 | |
87cb7997 | 13448 | #: builtin/update-index.c:942 |
ef317cd5 | 13449 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 13450 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 13451 | |
87cb7997 | 13452 | #: builtin/update-index.c:946 |
6c94aba5 | 13453 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 13454 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 13455 | |
87cb7997 | 13456 | #: builtin/update-index.c:947 |
ef317cd5 | 13457 | msgid "add the specified entry to the index" |
07432cef | 13458 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 13459 | |
87cb7997 | 13460 | #: builtin/update-index.c:956 |
ef317cd5 | 13461 | msgid "mark files as \"not changing\"" |
07432cef | 13462 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 13463 | |
87cb7997 | 13464 | #: builtin/update-index.c:959 |
ef317cd5 | 13465 | msgid "clear assumed-unchanged bit" |
07432cef | 13466 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 13467 | |
87cb7997 | 13468 | #: builtin/update-index.c:962 |
ef317cd5 | 13469 | msgid "mark files as \"index-only\"" |
07432cef | 13470 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 13471 | |
87cb7997 | 13472 | #: builtin/update-index.c:965 |
ef317cd5 | 13473 | msgid "clear skip-worktree bit" |
07432cef | 13474 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 13475 | |
87cb7997 | 13476 | #: builtin/update-index.c:968 |
ef317cd5 | 13477 | msgid "add to index only; do not add content to object database" |
07432cef | 13478 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 13479 | |
87cb7997 | 13480 | #: builtin/update-index.c:970 |
ef317cd5 | 13481 | msgid "remove named paths even if present in worktree" |
07432cef | 13482 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 13483 | |
87cb7997 | 13484 | #: builtin/update-index.c:972 |
ef317cd5 | 13485 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 13486 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 13487 | |
87cb7997 | 13488 | #: builtin/update-index.c:974 |
ef317cd5 | 13489 | msgid "read list of paths to be updated from standard input" |
07432cef | 13490 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 13491 | |
87cb7997 | 13492 | #: builtin/update-index.c:978 |
ef317cd5 | 13493 | msgid "add entries from standard input to the index" |
07432cef | 13494 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 13495 | |
87cb7997 | 13496 | #: builtin/update-index.c:982 |
ef317cd5 | 13497 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 13498 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 13499 | |
87cb7997 | 13500 | #: builtin/update-index.c:986 |
ef317cd5 | 13501 | msgid "only update entries that differ from HEAD" |
07432cef | 13502 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 13503 | |
87cb7997 | 13504 | #: builtin/update-index.c:990 |
ef317cd5 | 13505 | msgid "ignore files missing from worktree" |
07432cef | 13506 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 13507 | |
87cb7997 | 13508 | #: builtin/update-index.c:993 |
ef317cd5 | 13509 | msgid "report actions to standard output" |
07432cef | 13510 | msgstr "在标准输出显示操作" |
ef317cd5 | 13511 | |
87cb7997 | 13512 | #: builtin/update-index.c:995 |
ef317cd5 | 13513 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 13514 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 13515 | |
87cb7997 | 13516 | #: builtin/update-index.c:999 |
ef317cd5 | 13517 | msgid "write index in this format" |
07432cef | 13518 | msgstr "以这种格式写入索引区" |
ef317cd5 | 13519 | |
87cb7997 | 13520 | #: builtin/update-index.c:1001 |
6acbf033 JX |
13521 | msgid "enable or disable split index" |
13522 | msgstr "启用或禁用索引拆分" | |
13523 | ||
87cb7997 | 13524 | #: builtin/update-index.c:1003 |
7aea43ff JX |
13525 | msgid "enable/disable untracked cache" |
13526 | msgstr "启用/禁用对未跟踪文件的缓存" | |
13527 | ||
87cb7997 | 13528 | #: builtin/update-index.c:1005 |
276ceeaa JX |
13529 | msgid "test if the filesystem supports untracked cache" |
13530 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
13531 | ||
87cb7997 | 13532 | #: builtin/update-index.c:1007 |
7aea43ff JX |
13533 | msgid "enable untracked cache without testing the filesystem" |
13534 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
13535 | ||
87cb7997 JX |
13536 | #: builtin/update-index.c:1107 |
13537 | msgid "" | |
13538 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
13539 | "enable split index" | |
13540 | msgstr "" | |
13541 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
13542 | ||
13543 | #: builtin/update-index.c:1116 | |
13544 | msgid "" | |
13545 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
13546 | "disable split index" | |
13547 | msgstr "" | |
13548 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
13549 | ||
13550 | #: builtin/update-index.c:1127 | |
a0b6b246 JX |
13551 | msgid "" |
13552 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
13553 | "to disable the untracked cache" | |
275588f9 JX |
13554 | msgstr "" |
13555 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
13556 | "改它。" | |
a0b6b246 | 13557 | |
87cb7997 | 13558 | #: builtin/update-index.c:1131 |
276ceeaa JX |
13559 | msgid "Untracked cache disabled" |
13560 | msgstr "缓存未跟踪文件被禁用" | |
13561 | ||
87cb7997 | 13562 | #: builtin/update-index.c:1139 |
a0b6b246 JX |
13563 | msgid "" |
13564 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
13565 | "to enable the untracked cache" | |
275588f9 JX |
13566 | msgstr "" |
13567 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
13568 | "修改它。" | |
a0b6b246 | 13569 | |
87cb7997 | 13570 | #: builtin/update-index.c:1143 |
276ceeaa JX |
13571 | #, c-format |
13572 | msgid "Untracked cache enabled for '%s'" | |
13573 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
13574 | ||
90314792 | 13575 | #: builtin/update-ref.c:9 |
814ff314 JX |
13576 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
13577 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 13578 | |
90314792 | 13579 | #: builtin/update-ref.c:10 |
814ff314 JX |
13580 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
13581 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
13582 | |
13583 | #: builtin/update-ref.c:11 | |
814ff314 JX |
13584 | msgid "git update-ref [<options>] --stdin [-z]" |
13585 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 13586 | |
1b7f4a34 | 13587 | #: builtin/update-ref.c:363 |
ef317cd5 | 13588 | msgid "delete the reference" |
07432cef | 13589 | msgstr "删除引用" |
ef317cd5 | 13590 | |
1b7f4a34 | 13591 | #: builtin/update-ref.c:365 |
ef317cd5 | 13592 | msgid "update <refname> not the one it points to" |
07432cef | 13593 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 13594 | |
1b7f4a34 | 13595 | #: builtin/update-ref.c:366 |
90314792 JX |
13596 | msgid "stdin has NUL-terminated arguments" |
13597 | msgstr "标准输入有以 NUL 字符终止的参数" | |
13598 | ||
1b7f4a34 | 13599 | #: builtin/update-ref.c:367 |
90314792 JX |
13600 | msgid "read updates from stdin" |
13601 | msgstr "从标准输入读取更新" | |
13602 | ||
ef317cd5 JX |
13603 | #: builtin/update-server-info.c:6 |
13604 | msgid "git update-server-info [--force]" | |
07432cef | 13605 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
13606 | |
13607 | #: builtin/update-server-info.c:14 | |
13608 | msgid "update the info files from scratch" | |
07432cef | 13609 | msgstr "从头开始更新文件信息" |
ef317cd5 | 13610 | |
6acbf033 | 13611 | #: builtin/verify-commit.c:17 |
814ff314 JX |
13612 | msgid "git verify-commit [-v | --verbose] <commit>..." |
13613 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 13614 | |
1b7f4a34 | 13615 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
13616 | msgid "print commit contents" |
13617 | msgstr "打印提交内容" | |
13618 | ||
1a79b2f1 | 13619 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:37 |
1b7f4a34 JX |
13620 | msgid "print raw gpg status output" |
13621 | msgstr "打印原始 gpg 状态输出" | |
13622 | ||
220c313c | 13623 | #: builtin/verify-pack.c:54 |
814ff314 JX |
13624 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
13625 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 13626 | |
220c313c | 13627 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
13628 | msgid "verbose" |
13629 | msgstr "冗长输出" | |
13630 | ||
220c313c | 13631 | #: builtin/verify-pack.c:66 |
ef317cd5 | 13632 | msgid "show statistics only" |
07432cef | 13633 | msgstr "只显示统计" |
ef317cd5 | 13634 | |
1a79b2f1 JX |
13635 | #: builtin/verify-tag.c:18 |
13636 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." | |
13637 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 13638 | |
1a79b2f1 | 13639 | #: builtin/verify-tag.c:36 |
ef317cd5 | 13640 | msgid "print tag contents" |
55a16ee4 | 13641 | msgstr "打印标签内容" |
ef317cd5 | 13642 | |
94550ed3 JX |
13643 | #: builtin/worktree.c:15 |
13644 | msgid "git worktree add [<options>] <path> [<branch>]" | |
13645 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 13646 | |
94550ed3 | 13647 | #: builtin/worktree.c:16 |
5c57d762 JX |
13648 | msgid "git worktree list [<options>]" |
13649 | msgstr "git worktree list [<选项>]" | |
13650 | ||
13651 | #: builtin/worktree.c:17 | |
13652 | msgid "git worktree lock [<options>] <path>" | |
13653 | msgstr "git worktree lock [<选项>] <路径>" | |
13654 | ||
13655 | #: builtin/worktree.c:18 | |
5bb01d4f JX |
13656 | msgid "git worktree prune [<options>]" |
13657 | msgstr "git worktree prune [<选项>]" | |
13658 | ||
5c57d762 JX |
13659 | #: builtin/worktree.c:19 |
13660 | msgid "git worktree unlock <path>" | |
13661 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 13662 | |
5c57d762 | 13663 | #: builtin/worktree.c:42 |
5bb01d4f JX |
13664 | #, c-format |
13665 | msgid "Removing worktrees/%s: not a valid directory" | |
13666 | msgstr "删除工作区/%s:不是一个有效的目录" | |
13667 | ||
5c57d762 | 13668 | #: builtin/worktree.c:48 |
5bb01d4f JX |
13669 | #, c-format |
13670 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
13671 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
13672 | ||
5c57d762 | 13673 | #: builtin/worktree.c:53 |
5bb01d4f JX |
13674 | #, c-format |
13675 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
13676 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
13677 | ||
5c57d762 | 13678 | #: builtin/worktree.c:64 |
5bb01d4f JX |
13679 | #, c-format |
13680 | msgid "Removing worktrees/%s: invalid gitdir file" | |
13681 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
13682 | ||
5c57d762 | 13683 | #: builtin/worktree.c:80 |
5bb01d4f JX |
13684 | #, c-format |
13685 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
13686 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
13687 | ||
1a79b2f1 JX |
13688 | #: builtin/worktree.c:128 |
13689 | msgid "report pruned working trees" | |
13690 | msgstr "报告清除的工作区" | |
13691 | ||
13692 | #: builtin/worktree.c:130 | |
13693 | msgid "expire working trees older than <time>" | |
13694 | msgstr "将早于 <time> 的工作区过期" | |
13695 | ||
5c57d762 | 13696 | #: builtin/worktree.c:204 |
5bb01d4f JX |
13697 | #, c-format |
13698 | msgid "'%s' already exists" | |
13699 | msgstr "'%s' 已经存在" | |
13700 | ||
5c57d762 | 13701 | #: builtin/worktree.c:236 |
5bb01d4f JX |
13702 | #, c-format |
13703 | msgid "could not create directory of '%s'" | |
13704 | msgstr "不能创建目录 '%s'" | |
13705 | ||
5c57d762 | 13706 | #: builtin/worktree.c:272 |
5bb01d4f | 13707 | #, c-format |
1b7f4a34 | 13708 | msgid "Preparing %s (identifier %s)" |
29004bbb | 13709 | msgstr "准备 %s(标识符 %s)" |
5bb01d4f | 13710 | |
87cb7997 | 13711 | #: builtin/worktree.c:324 |
5bb01d4f JX |
13712 | msgid "checkout <branch> even if already checked out in other worktree" |
13713 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
13714 | ||
87cb7997 | 13715 | #: builtin/worktree.c:326 |
5bb01d4f JX |
13716 | msgid "create a new branch" |
13717 | msgstr "创建一个新分支" | |
13718 | ||
87cb7997 | 13719 | #: builtin/worktree.c:328 |
5bb01d4f JX |
13720 | msgid "create or reset a branch" |
13721 | msgstr "创建或重置一个分支" | |
13722 | ||
87cb7997 | 13723 | #: builtin/worktree.c:330 |
5b04ee3b JX |
13724 | msgid "populate the new working tree" |
13725 | msgstr "生成新的工作区" | |
13726 | ||
87cb7997 | 13727 | #: builtin/worktree.c:338 |
1b7f4a34 JX |
13728 | msgid "-b, -B, and --detach are mutually exclusive" |
13729 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 13730 | |
87cb7997 | 13731 | #: builtin/worktree.c:473 |
5c57d762 JX |
13732 | msgid "reason for locking" |
13733 | msgstr "锁定原因" | |
13734 | ||
87cb7997 | 13735 | #: builtin/worktree.c:485 builtin/worktree.c:518 |
5c57d762 JX |
13736 | #, c-format |
13737 | msgid "'%s' is not a working tree" | |
13738 | msgstr "'%s' 不是一个工作区" | |
13739 | ||
87cb7997 | 13740 | #: builtin/worktree.c:487 builtin/worktree.c:520 |
5c57d762 JX |
13741 | msgid "The main working tree cannot be locked or unlocked" |
13742 | msgstr "主工作区无法被加锁或解锁" | |
13743 | ||
87cb7997 | 13744 | #: builtin/worktree.c:492 |
5c57d762 JX |
13745 | #, c-format |
13746 | msgid "'%s' is already locked, reason: %s" | |
13747 | msgstr "'%s' 已被锁定,原因:%s" | |
13748 | ||
87cb7997 | 13749 | #: builtin/worktree.c:494 |
5c57d762 JX |
13750 | #, c-format |
13751 | msgid "'%s' is already locked" | |
13752 | msgstr "'%s' 已被锁定" | |
13753 | ||
87cb7997 | 13754 | #: builtin/worktree.c:522 |
5c57d762 JX |
13755 | #, c-format |
13756 | msgid "'%s' is not locked" | |
13757 | msgstr "'%s' 未被锁定" | |
13758 | ||
ef317cd5 JX |
13759 | #: builtin/write-tree.c:13 |
13760 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 13761 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
13762 | |
13763 | #: builtin/write-tree.c:26 | |
13764 | msgid "<prefix>/" | |
07432cef | 13765 | msgstr "<前缀>/" |
ef317cd5 JX |
13766 | |
13767 | #: builtin/write-tree.c:27 | |
13768 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 13769 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
13770 | |
13771 | #: builtin/write-tree.c:30 | |
13772 | msgid "only useful for debugging" | |
07432cef | 13773 | msgstr "只对调试有用" |
ef317cd5 | 13774 | |
a0b6b246 | 13775 | #: upload-pack.c:22 |
5c57d762 JX |
13776 | msgid "git upload-pack [<options>] <dir>" |
13777 | msgstr "git upload-pack [<选项>] <目录>" | |
13778 | ||
87cb7997 | 13779 | #: upload-pack.c:1040 |
5c57d762 JX |
13780 | msgid "quit after a single request/response exchange" |
13781 | msgstr "在一次单独的请求/响应(request/response)交换后退出" | |
13782 | ||
87cb7997 | 13783 | #: upload-pack.c:1042 |
5c57d762 JX |
13784 | msgid "exit immediately after initial ref advertisement" |
13785 | msgstr "在初始的引用广告后立即退出" | |
13786 | ||
87cb7997 | 13787 | #: upload-pack.c:1044 |
5c57d762 JX |
13788 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" |
13789 | msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" | |
13790 | ||
87cb7997 | 13791 | #: upload-pack.c:1046 |
5c57d762 JX |
13792 | msgid "interrupt transfer after <n> seconds of inactivity" |
13793 | msgstr "不活动 <n> 秒钟后终止传输" | |
13794 | ||
a0b6b246 JX |
13795 | #: credential-cache--daemon.c:223 |
13796 | #, c-format | |
13797 | msgid "" | |
13798 | "The permissions on your socket directory are too loose; other\n" | |
13799 | "users may be able to read your cached credentials. Consider running:\n" | |
13800 | "\n" | |
13801 | "\tchmod 0700 %s" | |
13802 | msgstr "" | |
1a79b2f1 JX |
13803 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
13804 | "行:\n" | |
a0b6b246 JX |
13805 | "\n" |
13806 | "\tchmod 0700 %s" | |
13807 | ||
5b04ee3b | 13808 | #: credential-cache--daemon.c:271 |
220c313c JX |
13809 | msgid "print debugging messages to stderr" |
13810 | msgstr "调试信息输出到标准错误" | |
13811 | ||
d9d56b23 | 13812 | #: git.c:14 |
4dcdc3d8 | 13813 | msgid "" |
220c313c | 13814 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
13815 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
13816 | "to read about a specific subcommand or concept." | |
13817 | msgstr "" | |
220c313c JX |
13818 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
13819 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
13820 | "帮助。" | |
8ada9598 | 13821 | |
87cb7997 | 13822 | #: http.c:355 |
a0b6b246 JX |
13823 | msgid "Delegation control is not supported with cURL < 7.22.0" |
13824 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" | |
13825 | ||
87cb7997 | 13826 | #: http.c:364 |
276ceeaa JX |
13827 | msgid "Public key pinning not supported with cURL < 7.44.0" |
13828 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
13829 | ||
87cb7997 | 13830 | #: http.c:1755 |
1a79b2f1 JX |
13831 | #, c-format |
13832 | msgid "" | |
13833 | "unable to update url base from redirection:\n" | |
13834 | " asked for: %s\n" | |
13835 | " redirect: %s" | |
13836 | msgstr "" | |
13837 | "不能更新重定向的 url base:\n" | |
13838 | " 请求:%s\n" | |
13839 | " 重定向:%s" | |
13840 | ||
87cb7997 | 13841 | #: remote-curl.c:323 |
1a79b2f1 JX |
13842 | #, c-format |
13843 | msgid "redirecting to %s" | |
13844 | msgstr "重定向到 %s" | |
13845 | ||
1b7f4a34 | 13846 | #: common-cmds.h:9 |
7aea43ff JX |
13847 | msgid "start a working area (see also: git help tutorial)" |
13848 | msgstr "开始一个工作区(参见:git help tutorial)" | |
13849 | ||
1b7f4a34 | 13850 | #: common-cmds.h:10 |
7aea43ff JX |
13851 | msgid "work on the current change (see also: git help everyday)" |
13852 | msgstr "在当前变更上工作(参见:git help everyday)" | |
13853 | ||
1b7f4a34 | 13854 | #: common-cmds.h:11 |
7aea43ff JX |
13855 | msgid "examine the history and state (see also: git help revisions)" |
13856 | msgstr "检查历史和状态(参见:git help revisions)" | |
13857 | ||
1b7f4a34 | 13858 | #: common-cmds.h:12 |
7aea43ff JX |
13859 | msgid "grow, mark and tweak your common history" |
13860 | msgstr "扩展、标记和调校您的历史记录" | |
13861 | ||
1b7f4a34 | 13862 | #: common-cmds.h:13 |
7aea43ff JX |
13863 | msgid "collaborate (see also: git help workflows)" |
13864 | msgstr "协同(参见:git help workflows)" | |
13865 | ||
1b7f4a34 | 13866 | #: common-cmds.h:17 |
8ada9598 | 13867 | msgid "Add file contents to the index" |
81809b99 | 13868 | msgstr "添加文件内容至索引" |
8ada9598 | 13869 | |
1b7f4a34 JX |
13870 | #: common-cmds.h:18 |
13871 | msgid "Use binary search to find the commit that introduced a bug" | |
13872 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 13873 | |
1b7f4a34 | 13874 | #: common-cmds.h:19 |
8ada9598 | 13875 | msgid "List, create, or delete branches" |
81809b99 | 13876 | msgstr "列出、创建或删除分支" |
8ada9598 | 13877 | |
1b7f4a34 | 13878 | #: common-cmds.h:20 |
5bb01d4f JX |
13879 | msgid "Switch branches or restore working tree files" |
13880 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 13881 | |
1b7f4a34 | 13882 | #: common-cmds.h:21 |
8ada9598 | 13883 | msgid "Clone a repository into a new directory" |
160fb2b2 | 13884 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 13885 | |
1b7f4a34 | 13886 | #: common-cmds.h:22 |
8ada9598 | 13887 | msgid "Record changes to the repository" |
160fb2b2 | 13888 | msgstr "记录变更到仓库" |
8ada9598 | 13889 | |
1b7f4a34 | 13890 | #: common-cmds.h:23 |
8ada9598 | 13891 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 13892 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 13893 | |
1b7f4a34 | 13894 | #: common-cmds.h:24 |
8ada9598 | 13895 | msgid "Download objects and refs from another repository" |
160fb2b2 | 13896 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 13897 | |
1b7f4a34 | 13898 | #: common-cmds.h:25 |
8ada9598 | 13899 | msgid "Print lines matching a pattern" |
81809b99 | 13900 | msgstr "输出和模式匹配的行" |
8ada9598 | 13901 | |
1b7f4a34 | 13902 | #: common-cmds.h:26 |
a77c07d9 | 13903 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 13904 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 13905 | |
1b7f4a34 | 13906 | #: common-cmds.h:27 |
8ada9598 | 13907 | msgid "Show commit logs" |
81809b99 | 13908 | msgstr "显示提交日志" |
8ada9598 | 13909 | |
1b7f4a34 | 13910 | #: common-cmds.h:28 |
8ada9598 | 13911 | msgid "Join two or more development histories together" |
81809b99 | 13912 | msgstr "合并两个或更多开发历史" |
8ada9598 | 13913 | |
1b7f4a34 | 13914 | #: common-cmds.h:29 |
8ada9598 | 13915 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 13916 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 13917 | |
1b7f4a34 | 13918 | #: common-cmds.h:30 |
2e8451e8 | 13919 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 13920 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 13921 | |
1b7f4a34 | 13922 | #: common-cmds.h:31 |
8ada9598 | 13923 | msgid "Update remote refs along with associated objects" |
81809b99 | 13924 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 13925 | |
1b7f4a34 | 13926 | #: common-cmds.h:32 |
3495628d JX |
13927 | msgid "Reapply commits on top of another base tip" |
13928 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 13929 | |
1b7f4a34 | 13930 | #: common-cmds.h:33 |
8ada9598 | 13931 | msgid "Reset current HEAD to the specified state" |
4375c10e | 13932 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 13933 | |
1b7f4a34 | 13934 | #: common-cmds.h:34 |
8ada9598 | 13935 | msgid "Remove files from the working tree and from the index" |
81809b99 | 13936 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 13937 | |
1b7f4a34 | 13938 | #: common-cmds.h:35 |
8ada9598 | 13939 | msgid "Show various types of objects" |
81809b99 | 13940 | msgstr "显示各种类型的对象" |
8ada9598 | 13941 | |
1b7f4a34 | 13942 | #: common-cmds.h:36 |
8ada9598 | 13943 | msgid "Show the working tree status" |
81809b99 | 13944 | msgstr "显示工作区状态" |
8ada9598 | 13945 | |
1b7f4a34 | 13946 | #: common-cmds.h:37 |
8ada9598 | 13947 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 13948 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 13949 | |
1b7f4a34 | 13950 | #: parse-options.h:145 |
220c313c JX |
13951 | msgid "expiry-date" |
13952 | msgstr "到期时间" | |
13953 | ||
1b7f4a34 | 13954 | #: parse-options.h:160 |
220c313c JX |
13955 | msgid "no-op (backward compatibility)" |
13956 | msgstr "空操作(向后兼容)" | |
13957 | ||
a0b6b246 | 13958 | #: parse-options.h:238 |
220c313c JX |
13959 | msgid "be more verbose" |
13960 | msgstr "更加详细" | |
13961 | ||
a0b6b246 | 13962 | #: parse-options.h:240 |
220c313c JX |
13963 | msgid "be more quiet" |
13964 | msgstr "更加安静" | |
13965 | ||
a0b6b246 | 13966 | #: parse-options.h:246 |
220c313c JX |
13967 | msgid "use <n> digits to display SHA-1s" |
13968 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
13969 | ||
5b04ee3b | 13970 | #: rerere.h:40 |
220c313c JX |
13971 | msgid "update the index with reused conflict resolution if possible" |
13972 | msgstr "如果可能,重用冲突解决更新索引" | |
13973 | ||
5c57d762 | 13974 | #: git-bisect.sh:54 |
b694fbb1 JX |
13975 | msgid "You need to start by \"git bisect start\"" |
13976 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
13977 | ||
90e6ef53 | 13978 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
13979 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
13980 | #. translation. The program will only accept English input | |
13981 | #. at this point. | |
5c57d762 | 13982 | #: git-bisect.sh:60 |
c04f5ac3 JX |
13983 | msgid "Do you want me to do it for you [Y/n]? " |
13984 | msgstr "您想让我为您这样做么[Y/n]? " | |
13985 | ||
5c57d762 | 13986 | #: git-bisect.sh:121 |
c04f5ac3 JX |
13987 | #, sh-format |
13988 | msgid "unrecognised option: '$arg'" | |
81809b99 | 13989 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 13990 | |
5c57d762 | 13991 | #: git-bisect.sh:125 |
c04f5ac3 JX |
13992 | #, sh-format |
13993 | msgid "'$arg' does not appear to be a valid revision" | |
13994 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
13995 | ||
5c57d762 | 13996 | #: git-bisect.sh:154 |
c04f5ac3 JX |
13997 | msgid "Bad HEAD - I need a HEAD" |
13998 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
13999 | ||
5c57d762 | 14000 | #: git-bisect.sh:167 |
c04f5ac3 JX |
14001 | #, sh-format |
14002 | msgid "" | |
814ff314 | 14003 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 14004 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 14005 | |
5c57d762 | 14006 | #: git-bisect.sh:177 |
cfff71a9 JX |
14007 | msgid "won't bisect on cg-seek'ed tree" |
14008 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 14009 | |
5c57d762 | 14010 | #: git-bisect.sh:181 |
c04f5ac3 | 14011 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 14012 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 14013 | |
5c57d762 | 14014 | #: git-bisect.sh:233 |
c04f5ac3 JX |
14015 | #, sh-format |
14016 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 14017 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 14018 | |
5c57d762 | 14019 | #: git-bisect.sh:262 |
c04f5ac3 JX |
14020 | #, sh-format |
14021 | msgid "Bad rev input: $arg" | |
9a4b694c | 14022 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 14023 | |
5c57d762 JX |
14024 | #: git-bisect.sh:281 |
14025 | #, sh-format | |
14026 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 14027 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 14028 | |
94550ed3 | 14029 | #: git-bisect.sh:290 |
c04f5ac3 JX |
14030 | #, sh-format |
14031 | msgid "Bad rev input: $rev" | |
9a4b694c | 14032 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 14033 | |
94550ed3 | 14034 | #: git-bisect.sh:299 |
1b7f4a34 JX |
14035 | #, sh-format |
14036 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
14037 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
14038 | ||
94550ed3 | 14039 | #: git-bisect.sh:322 |
1b7f4a34 JX |
14040 | #, sh-format |
14041 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
14042 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 14043 | |
90e6ef53 | 14044 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
14045 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
14046 | #. translation. The program will only accept English input | |
14047 | #. at this point. | |
94550ed3 | 14048 | #: git-bisect.sh:328 |
c04f5ac3 JX |
14049 | msgid "Are you sure [Y/n]? " |
14050 | msgstr "您确认么[Y/n]? " | |
14051 | ||
94550ed3 | 14052 | #: git-bisect.sh:340 |
1b7f4a34 | 14053 | #, sh-format |
b694fbb1 | 14054 | msgid "" |
1b7f4a34 JX |
14055 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
14056 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
14057 | msgstr "" |
14058 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 14059 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 14060 | |
94550ed3 | 14061 | #: git-bisect.sh:343 |
1b7f4a34 | 14062 | #, sh-format |
b694fbb1 JX |
14063 | msgid "" |
14064 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
14065 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
14066 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
14067 | msgstr "" |
14068 | "您需要执行 \"git bisect start\" 来开始。\n" | |
14069 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 14070 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 14071 | |
94550ed3 | 14072 | #: git-bisect.sh:414 git-bisect.sh:546 |
b694fbb1 JX |
14073 | msgid "We are not bisecting." |
14074 | msgstr "我们没有在二分查找。" | |
14075 | ||
94550ed3 | 14076 | #: git-bisect.sh:421 |
c04f5ac3 JX |
14077 | #, sh-format |
14078 | msgid "'$invalid' is not a valid commit" | |
14079 | msgstr "'$invalid' 不是一个有效的提交" | |
14080 | ||
94550ed3 | 14081 | #: git-bisect.sh:430 |
c04f5ac3 JX |
14082 | #, sh-format |
14083 | msgid "" | |
14084 | "Could not check out original HEAD '$branch'.\n" | |
14085 | "Try 'git bisect reset <commit>'." | |
14086 | msgstr "" | |
14087 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 14088 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 14089 | |
94550ed3 | 14090 | #: git-bisect.sh:458 |
c04f5ac3 JX |
14091 | msgid "No logfile given" |
14092 | msgstr "未提供日志文件" | |
14093 | ||
94550ed3 | 14094 | #: git-bisect.sh:459 |
c04f5ac3 JX |
14095 | #, sh-format |
14096 | msgid "cannot read $file for replaying" | |
14097 | msgstr "不能读取 $file 来重放" | |
14098 | ||
94550ed3 | 14099 | #: git-bisect.sh:480 |
c04f5ac3 JX |
14100 | msgid "?? what are you talking about?" |
14101 | msgstr "?? 您在说什么?" | |
14102 | ||
94550ed3 | 14103 | #: git-bisect.sh:492 |
b694fbb1 JX |
14104 | #, sh-format |
14105 | msgid "running $command" | |
14106 | msgstr "运行 $command" | |
14107 | ||
94550ed3 | 14108 | #: git-bisect.sh:499 |
b694fbb1 JX |
14109 | #, sh-format |
14110 | msgid "" | |
14111 | "bisect run failed:\n" | |
14112 | "exit code $res from '$command' is < 0 or >= 128" | |
14113 | msgstr "" | |
14114 | "二分查找运行失败:\n" | |
07432cef | 14115 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 14116 | |
94550ed3 | 14117 | #: git-bisect.sh:525 |
b694fbb1 JX |
14118 | msgid "bisect run cannot continue any more" |
14119 | msgstr "二分查找不能继续运行" | |
14120 | ||
94550ed3 | 14121 | #: git-bisect.sh:531 |
b694fbb1 JX |
14122 | #, sh-format |
14123 | msgid "" | |
14124 | "bisect run failed:\n" | |
14125 | "'bisect_state $state' exited with error code $res" | |
14126 | msgstr "" | |
14127 | "二分查找运行失败:\n" | |
14128 | "'bisect_state $state' 退出码为 $res" | |
14129 | ||
94550ed3 | 14130 | #: git-bisect.sh:538 |
b694fbb1 JX |
14131 | msgid "bisect run success" |
14132 | msgstr "二分查找运行成功" | |
c04f5ac3 | 14133 | |
94550ed3 JX |
14134 | #: git-bisect.sh:565 |
14135 | msgid "please use two different terms" | |
14136 | msgstr "请使用两个不同的术语" | |
14137 | ||
14138 | #: git-bisect.sh:575 | |
14139 | #, sh-format | |
14140 | msgid "'$term' is not a valid term" | |
14141 | msgstr "'$term' 不是一个有效的名称" | |
14142 | ||
14143 | #: git-bisect.sh:578 | |
14144 | #, sh-format | |
14145 | msgid "can't use the builtin command '$term' as a term" | |
14146 | msgstr "不能使用内置命令 '$term' 作为术语" | |
14147 | ||
14148 | #: git-bisect.sh:587 git-bisect.sh:593 | |
14149 | #, sh-format | |
14150 | msgid "can't change the meaning of term '$term'" | |
14151 | msgstr "不能修改术语 '$term' 的含义" | |
14152 | ||
14153 | #: git-bisect.sh:606 | |
b694fbb1 | 14154 | #, sh-format |
1b7f4a34 JX |
14155 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
14156 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 14157 | |
94550ed3 JX |
14158 | #: git-bisect.sh:636 |
14159 | msgid "no terms defined" | |
14160 | msgstr "未定义术语" | |
14161 | ||
14162 | #: git-bisect.sh:653 | |
14163 | #, sh-format | |
14164 | msgid "" | |
14165 | "invalid argument $arg for 'git bisect terms'.\n" | |
14166 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
14167 | msgstr "" | |
14168 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
14169 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
14170 | ||
5c57d762 JX |
14171 | #: git-merge-octopus.sh:46 |
14172 | msgid "" | |
14173 | "Error: Your local changes to the following files would be overwritten by " | |
14174 | "merge" | |
14175 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
14176 | ||
14177 | #: git-merge-octopus.sh:61 | |
14178 | msgid "Automated merge did not work." | |
9a4b694c | 14179 | msgstr "自动合并未生效。" |
5c57d762 JX |
14180 | |
14181 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 14182 | msgid "Should not be doing an octopus." |
5c57d762 JX |
14183 | msgstr "不应该执行章鱼式合并。" |
14184 | ||
14185 | #: git-merge-octopus.sh:73 | |
14186 | #, sh-format | |
14187 | msgid "Unable to find common commit with $pretty_name" | |
14188 | msgstr "无法找到和 $pretty_name 的基线提交" | |
14189 | ||
14190 | #: git-merge-octopus.sh:77 | |
14191 | #, sh-format | |
14192 | msgid "Already up-to-date with $pretty_name" | |
14193 | msgstr "已经和 $pretty_name 保持一致" | |
14194 | ||
14195 | #: git-merge-octopus.sh:89 | |
14196 | #, sh-format | |
14197 | msgid "Fast-forwarding to: $pretty_name" | |
14198 | msgstr "快进至:$pretty_name" | |
14199 | ||
14200 | #: git-merge-octopus.sh:97 | |
14201 | #, sh-format | |
14202 | msgid "Trying simple merge with $pretty_name" | |
14203 | msgstr "尝试和 $pretty_name 的简单合并" | |
14204 | ||
14205 | #: git-merge-octopus.sh:102 | |
14206 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 14207 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 14208 | |
1a79b2f1 | 14209 | #: git-rebase.sh:57 |
649900bc JX |
14210 | msgid "" |
14211 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
14212 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
14213 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
14214 | "\"." | |
14215 | msgstr "" | |
14216 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
14217 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
14218 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
14219 | ||
1a79b2f1 | 14220 | #: git-rebase.sh:157 git-rebase.sh:396 |
5c57d762 JX |
14221 | #, sh-format |
14222 | msgid "Could not move back to $head_name" | |
14223 | msgstr "无法移回 $head_name" | |
14224 | ||
1a79b2f1 | 14225 | #: git-rebase.sh:171 |
2e8451e8 JX |
14226 | #, sh-format |
14227 | msgid "Cannot store $stash_sha1" | |
14228 | msgstr "无法保存 $stash_sha1" | |
14229 | ||
1a79b2f1 | 14230 | #: git-rebase.sh:211 |
649900bc | 14231 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 14232 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 14233 | |
1a79b2f1 | 14234 | #: git-rebase.sh:216 |
649900bc JX |
14235 | msgid "It looks like git-am is in progress. Cannot rebase." |
14236 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
14237 | ||
1a79b2f1 | 14238 | #: git-rebase.sh:357 |
649900bc JX |
14239 | msgid "No rebase in progress?" |
14240 | msgstr "没有正在进行的变基?" | |
14241 | ||
1a79b2f1 | 14242 | #: git-rebase.sh:368 |
07432cef WS |
14243 | msgid "The --edit-todo action can only be used during interactive rebase." |
14244 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
14245 | ||
1a79b2f1 | 14246 | #: git-rebase.sh:375 |
649900bc JX |
14247 | msgid "Cannot read HEAD" |
14248 | msgstr "不能读取 HEAD" | |
14249 | ||
1a79b2f1 | 14250 | #: git-rebase.sh:378 |
649900bc JX |
14251 | msgid "" |
14252 | "You must edit all merge conflicts and then\n" | |
14253 | "mark them as resolved using git add" | |
14254 | msgstr "" | |
14255 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
14256 | "命令将它们标记为已解决" | |
14257 | ||
1a79b2f1 | 14258 | #: git-rebase.sh:418 |
649900bc JX |
14259 | #, sh-format |
14260 | msgid "" | |
14261 | "It seems that there is already a $state_dir_base directory, and\n" | |
14262 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
14263 | "case, please try\n" | |
14264 | "\t$cmd_live_rebase\n" | |
14265 | "If that is not the case, please\n" | |
14266 | "\t$cmd_clear_stale_rebase\n" | |
14267 | "and run me again. I am stopping in case you still have something\n" | |
14268 | "valuable there." | |
14269 | msgstr "" | |
98b2761d JX |
14270 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
14271 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
14272 | "\t$cmd_live_rebase\n" |
14273 | "如果不是这样,请执行\n" | |
14274 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 14275 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 14276 | |
1a79b2f1 | 14277 | #: git-rebase.sh:469 |
649900bc JX |
14278 | #, sh-format |
14279 | msgid "invalid upstream $upstream_name" | |
14280 | msgstr "无效的上游 $upstream_name" | |
14281 | ||
1a79b2f1 | 14282 | #: git-rebase.sh:493 |
649900bc JX |
14283 | #, sh-format |
14284 | msgid "$onto_name: there are more than one merge bases" | |
14285 | msgstr "$onto_name: 有一个以上的合并基准" | |
14286 | ||
1a79b2f1 | 14287 | #: git-rebase.sh:496 git-rebase.sh:500 |
649900bc JX |
14288 | #, sh-format |
14289 | msgid "$onto_name: there is no merge base" | |
14290 | msgstr "$onto_name: 没有合并基准" | |
14291 | ||
1a79b2f1 | 14292 | #: git-rebase.sh:505 |
649900bc JX |
14293 | #, sh-format |
14294 | msgid "Does not point to a valid commit: $onto_name" | |
14295 | msgstr "没有指向一个有效的提交:$onto_name" | |
14296 | ||
1a79b2f1 | 14297 | #: git-rebase.sh:528 |
649900bc JX |
14298 | #, sh-format |
14299 | msgid "fatal: no such branch: $branch_name" | |
14300 | msgstr "严重错误:无此分支:$branch_name" | |
14301 | ||
1a79b2f1 | 14302 | #: git-rebase.sh:561 |
2e8451e8 JX |
14303 | msgid "Cannot autostash" |
14304 | msgstr "无法 autostash" | |
14305 | ||
1a79b2f1 | 14306 | #: git-rebase.sh:566 |
2e8451e8 JX |
14307 | #, sh-format |
14308 | msgid "Created autostash: $stash_abbrev" | |
14309 | msgstr "创建了 autostash: $stash_abbrev" | |
14310 | ||
1a79b2f1 | 14311 | #: git-rebase.sh:570 |
649900bc JX |
14312 | msgid "Please commit or stash them." |
14313 | msgstr "请提交或为它们保存进度。" | |
14314 | ||
1a79b2f1 | 14315 | #: git-rebase.sh:590 |
649900bc JX |
14316 | #, sh-format |
14317 | msgid "Current branch $branch_name is up to date." | |
14318 | msgstr "当前分支 $branch_name 是最新的。" | |
14319 | ||
1a79b2f1 | 14320 | #: git-rebase.sh:594 |
649900bc JX |
14321 | #, sh-format |
14322 | msgid "Current branch $branch_name is up to date, rebase forced." | |
14323 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
14324 | ||
1a79b2f1 | 14325 | #: git-rebase.sh:605 |
649900bc JX |
14326 | #, sh-format |
14327 | msgid "Changes from $mb to $onto:" | |
14328 | msgstr "变更从 $mb 到 $onto:" | |
14329 | ||
1a79b2f1 | 14330 | #: git-rebase.sh:614 |
649900bc | 14331 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 14332 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 14333 | |
1a79b2f1 | 14334 | #: git-rebase.sh:624 |
649900bc JX |
14335 | #, sh-format |
14336 | msgid "Fast-forwarded $branch_name to $onto_name." | |
14337 | msgstr "快进 $branch_name 至 $onto_name。" | |
14338 | ||
87cb7997 | 14339 | #: git-stash.sh:53 |
c04f5ac3 JX |
14340 | msgid "git stash clear with parameters is unimplemented" |
14341 | msgstr "git stash clear 不支持参数" | |
14342 | ||
87cb7997 | 14343 | #: git-stash.sh:94 |
c04f5ac3 JX |
14344 | msgid "You do not have the initial commit yet" |
14345 | msgstr "您尚未建立初始提交" | |
14346 | ||
87cb7997 | 14347 | #: git-stash.sh:109 |
c04f5ac3 | 14348 | msgid "Cannot save the current index state" |
90e6ef53 | 14349 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 14350 | |
87cb7997 | 14351 | #: git-stash.sh:124 |
a0b6b246 JX |
14352 | msgid "Cannot save the untracked files" |
14353 | msgstr "无法保存未跟踪文件" | |
14354 | ||
87cb7997 | 14355 | #: git-stash.sh:144 git-stash.sh:157 |
c04f5ac3 JX |
14356 | msgid "Cannot save the current worktree state" |
14357 | msgstr "无法保存当前工作区状态" | |
14358 | ||
87cb7997 | 14359 | #: git-stash.sh:161 |
c04f5ac3 | 14360 | msgid "No changes selected" |
90e6ef53 | 14361 | msgstr "没有选择变更" |
c04f5ac3 | 14362 | |
87cb7997 | 14363 | #: git-stash.sh:164 |
c04f5ac3 | 14364 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 14365 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 14366 | |
87cb7997 | 14367 | #: git-stash.sh:177 |
c04f5ac3 JX |
14368 | msgid "Cannot record working tree state" |
14369 | msgstr "不能记录工作区状态" | |
14370 | ||
87cb7997 | 14371 | #: git-stash.sh:209 |
2e8451e8 JX |
14372 | #, sh-format |
14373 | msgid "Cannot update $ref_stash with $w_commit" | |
14374 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
14375 | ||
b694fbb1 JX |
14376 | #. TRANSLATORS: $option is an invalid option, like |
14377 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
14378 | #. second line correspond to "error: ". So you should line | |
14379 | #. up the second line with however many characters the | |
14380 | #. translation of "error: " takes in your language. E.g. in | |
14381 | #. English this is: | |
14382 | #. | |
14383 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
14384 | #. error: unknown option for 'stash save': --blah-blah | |
14385 | #. To provide a message, use git stash save -- '--blah-blah' | |
87cb7997 | 14386 | #: git-stash.sh:265 |
b694fbb1 JX |
14387 | #, sh-format |
14388 | msgid "" | |
14389 | "error: unknown option for 'stash save': $option\n" | |
14390 | " To provide a message, use git stash save -- '$option'" | |
14391 | msgstr "" | |
14392 | "错误:'stash save' 的未知选项:$option\n" | |
14393 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
14394 | ||
87cb7997 | 14395 | #: git-stash.sh:278 |
a0b6b246 JX |
14396 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
14397 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
14398 | ||
87cb7997 | 14399 | #: git-stash.sh:286 |
c04f5ac3 JX |
14400 | msgid "No local changes to save" |
14401 | msgstr "没有要保存的本地修改" | |
14402 | ||
87cb7997 | 14403 | #: git-stash.sh:291 |
c04f5ac3 | 14404 | msgid "Cannot initialize stash" |
90e6ef53 | 14405 | msgstr "无法初始化 stash" |
c04f5ac3 | 14406 | |
87cb7997 | 14407 | #: git-stash.sh:295 |
c04f5ac3 JX |
14408 | msgid "Cannot save the current status" |
14409 | msgstr "无法保存当前状态" | |
14410 | ||
87cb7997 | 14411 | #: git-stash.sh:296 |
5c57d762 JX |
14412 | #, sh-format |
14413 | msgid "Saved working directory and index state $stash_msg" | |
14414 | msgstr "保存工作目录和索引状态 $stash_msg" | |
14415 | ||
87cb7997 | 14416 | #: git-stash.sh:323 |
c04f5ac3 JX |
14417 | msgid "Cannot remove worktree changes" |
14418 | msgstr "无法删除工作区变更" | |
14419 | ||
87cb7997 | 14420 | #: git-stash.sh:471 |
7aea43ff JX |
14421 | #, sh-format |
14422 | msgid "unknown option: $opt" | |
14423 | msgstr "未知选项: $opt" | |
14424 | ||
87cb7997 | 14425 | #: git-stash.sh:484 |
c04f5ac3 | 14426 | msgid "No stash found." |
90e6ef53 | 14427 | msgstr "未发现 stash。" |
c04f5ac3 | 14428 | |
87cb7997 | 14429 | #: git-stash.sh:491 |
c04f5ac3 JX |
14430 | #, sh-format |
14431 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 14432 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 14433 | |
87cb7997 | 14434 | #: git-stash.sh:506 |
c04f5ac3 | 14435 | #, sh-format |
220c313c JX |
14436 | msgid "$reference is not a valid reference" |
14437 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 14438 | |
87cb7997 | 14439 | #: git-stash.sh:534 |
c04f5ac3 JX |
14440 | #, sh-format |
14441 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 14442 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 14443 | |
87cb7997 | 14444 | #: git-stash.sh:545 |
c04f5ac3 JX |
14445 | #, sh-format |
14446 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 14447 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 14448 | |
87cb7997 | 14449 | #: git-stash.sh:553 |
c04f5ac3 | 14450 | msgid "unable to refresh index" |
90e6ef53 | 14451 | msgstr "无法刷新索引" |
c04f5ac3 | 14452 | |
87cb7997 | 14453 | #: git-stash.sh:557 |
c04f5ac3 JX |
14454 | msgid "Cannot apply a stash in the middle of a merge" |
14455 | msgstr "无法在合并过程中恢复进度" | |
14456 | ||
87cb7997 | 14457 | #: git-stash.sh:565 |
c04f5ac3 | 14458 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 14459 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 14460 | |
87cb7997 | 14461 | #: git-stash.sh:567 |
c04f5ac3 | 14462 | msgid "Could not save index tree" |
90e6ef53 | 14463 | msgstr "不能保存索引树" |
c04f5ac3 | 14464 | |
87cb7997 | 14465 | #: git-stash.sh:576 |
a0b6b246 JX |
14466 | msgid "Could not restore untracked files from stash" |
14467 | msgstr "无法从进度保存中恢复未跟踪文件" | |
14468 | ||
87cb7997 | 14469 | #: git-stash.sh:601 |
c04f5ac3 | 14470 | msgid "Cannot unstage modified files" |
160fb2b2 | 14471 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 14472 | |
87cb7997 | 14473 | #: git-stash.sh:616 |
b694fbb1 JX |
14474 | msgid "Index was not unstashed." |
14475 | msgstr "索引的进度没有被恢复。" | |
14476 | ||
87cb7997 | 14477 | #: git-stash.sh:630 |
5c57d762 | 14478 | msgid "The stash is kept in case you need it again." |
9a4b694c | 14479 | msgstr "暂存被保留以备您再次需要。" |
5c57d762 | 14480 | |
87cb7997 | 14481 | #: git-stash.sh:639 |
c04f5ac3 JX |
14482 | #, sh-format |
14483 | msgid "Dropped ${REV} ($s)" | |
14484 | msgstr "丢弃了 ${REV} ($s)" | |
14485 | ||
87cb7997 | 14486 | #: git-stash.sh:640 |
c04f5ac3 JX |
14487 | #, sh-format |
14488 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 14489 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 14490 | |
87cb7997 | 14491 | #: git-stash.sh:648 |
c04f5ac3 JX |
14492 | msgid "No branch name specified" |
14493 | msgstr "未指定分支名" | |
14494 | ||
87cb7997 | 14495 | #: git-stash.sh:727 |
c04f5ac3 JX |
14496 | msgid "(To restore them type \"git stash apply\")" |
14497 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
14498 | ||
1a79b2f1 | 14499 | #: git-submodule.sh:181 |
2e8451e8 JX |
14500 | msgid "Relative path can only be used from the toplevel of the working tree" |
14501 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
14502 | ||
1a79b2f1 | 14503 | #: git-submodule.sh:191 |
c04f5ac3 JX |
14504 | #, sh-format |
14505 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 14506 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 14507 | |
1a79b2f1 | 14508 | #: git-submodule.sh:210 |
c04f5ac3 | 14509 | #, sh-format |
170e9899 JX |
14510 | msgid "'$sm_path' already exists in the index" |
14511 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 14512 | |
1a79b2f1 JX |
14513 | #: git-submodule.sh:213 |
14514 | #, sh-format | |
14515 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
14516 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
14517 | ||
14518 | #: git-submodule.sh:218 | |
b694fbb1 JX |
14519 | #, sh-format |
14520 | msgid "" | |
14521 | "The following path is ignored by one of your .gitignore files:\n" | |
14522 | "$sm_path\n" | |
14523 | "Use -f if you really want to add it." | |
14524 | msgstr "" | |
14525 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
14526 | "$sm_path\n" | |
14527 | "如果您确实想添加它,使用 -f 参数。" | |
14528 | ||
1a79b2f1 | 14529 | #: git-submodule.sh:236 |
b694fbb1 JX |
14530 | #, sh-format |
14531 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 14532 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 14533 | |
1a79b2f1 | 14534 | #: git-submodule.sh:238 |
c04f5ac3 | 14535 | #, sh-format |
170e9899 | 14536 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 14537 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 14538 | |
1a79b2f1 | 14539 | #: git-submodule.sh:246 |
07432cef WS |
14540 | #, sh-format |
14541 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 14542 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 14543 | |
1a79b2f1 | 14544 | #: git-submodule.sh:248 |
07432cef WS |
14545 | #, sh-format |
14546 | msgid "" | |
5c57d762 JX |
14547 | "If you want to reuse this local git directory instead of cloning again from\n" |
14548 | " $realrepo\n" | |
14549 | "use the '--force' option. If the local git directory is not the correct " | |
14550 | "repo\n" | |
07432cef WS |
14551 | "or you are unsure what this means choose another name with the '--name' " |
14552 | "option." | |
5c57d762 JX |
14553 | msgstr "" |
14554 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
14555 | " $realrepo\n" | |
14556 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
14557 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 14558 | |
1a79b2f1 | 14559 | #: git-submodule.sh:254 |
07432cef WS |
14560 | #, sh-format |
14561 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
14562 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
14563 | ||
1a79b2f1 | 14564 | #: git-submodule.sh:266 |
c04f5ac3 | 14565 | #, sh-format |
170e9899 JX |
14566 | msgid "Unable to checkout submodule '$sm_path'" |
14567 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 14568 | |
1a79b2f1 | 14569 | #: git-submodule.sh:271 |
c04f5ac3 | 14570 | #, sh-format |
170e9899 JX |
14571 | msgid "Failed to add submodule '$sm_path'" |
14572 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 14573 | |
1a79b2f1 | 14574 | #: git-submodule.sh:280 |
c04f5ac3 | 14575 | #, sh-format |
170e9899 JX |
14576 | msgid "Failed to register submodule '$sm_path'" |
14577 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 14578 | |
87cb7997 | 14579 | #: git-submodule.sh:341 |
c04f5ac3 | 14580 | #, sh-format |
5b04ee3b JX |
14581 | msgid "Entering '$displaypath'" |
14582 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 14583 | |
87cb7997 | 14584 | #: git-submodule.sh:361 |
c04f5ac3 | 14585 | #, sh-format |
5b04ee3b | 14586 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 14587 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 14588 | |
87cb7997 | 14589 | #: git-submodule.sh:432 |
c04f5ac3 | 14590 | #, sh-format |
5b04ee3b JX |
14591 | msgid "pathspec and --all are incompatible" |
14592 | msgstr "pathspec 和 --all 不兼容" | |
c04f5ac3 | 14593 | |
87cb7997 | 14594 | #: git-submodule.sh:437 |
c04f5ac3 | 14595 | #, sh-format |
5b04ee3b | 14596 | msgid "Use '--all' if you really want to deinitialize all submodules" |
aef18cc6 | 14597 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" |
1003b3a5 | 14598 | |
87cb7997 | 14599 | #: git-submodule.sh:457 |
1003b3a5 JX |
14600 | #, sh-format |
14601 | msgid "" | |
5c57d762 | 14602 | "Submodule work tree '$displaypath' contains a .git directory\n" |
1003b3a5 | 14603 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
5c57d762 JX |
14604 | msgstr "" |
14605 | "子模组工作区 '$displaypath' 包含一个 .git 目录\n" | |
9a4b694c | 14606 | "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)" |
1003b3a5 | 14607 | |
87cb7997 | 14608 | #: git-submodule.sh:465 |
c04f5ac3 JX |
14609 | #, sh-format |
14610 | msgid "" | |
2e8451e8 | 14611 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 14612 | "discard them" |
2e8451e8 | 14613 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 14614 | |
87cb7997 | 14615 | #: git-submodule.sh:468 |
1003b3a5 | 14616 | #, sh-format |
2e8451e8 JX |
14617 | msgid "Cleared directory '$displaypath'" |
14618 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 14619 | |
87cb7997 | 14620 | #: git-submodule.sh:469 |
1003b3a5 | 14621 | #, sh-format |
2e8451e8 JX |
14622 | msgid "Could not remove submodule work tree '$displaypath'" |
14623 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 14624 | |
87cb7997 | 14625 | #: git-submodule.sh:472 |
1003b3a5 | 14626 | #, sh-format |
2e8451e8 JX |
14627 | msgid "Could not create empty submodule directory '$displaypath'" |
14628 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 14629 | |
87cb7997 | 14630 | #: git-submodule.sh:481 |
1003b3a5 | 14631 | #, sh-format |
2e8451e8 JX |
14632 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
14633 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 14634 | |
87cb7997 | 14635 | #: git-submodule.sh:637 |
c04f5ac3 | 14636 | #, sh-format |
2e8451e8 JX |
14637 | msgid "Unable to find current revision in submodule path '$displaypath'" |
14638 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 14639 | |
87cb7997 | 14640 | #: git-submodule.sh:647 |
c04f5ac3 | 14641 | #, sh-format |
170e9899 JX |
14642 | msgid "Unable to fetch in submodule path '$sm_path'" |
14643 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 14644 | |
87cb7997 | 14645 | #: git-submodule.sh:652 |
5c57d762 JX |
14646 | #, sh-format |
14647 | msgid "" | |
14648 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
14649 | "'$sm_path'" | |
9a4b694c | 14650 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 14651 | |
87cb7997 | 14652 | #: git-submodule.sh:670 |
2e8451e8 JX |
14653 | #, sh-format |
14654 | msgid "Unable to fetch in submodule path '$displaypath'" | |
14655 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
14656 | ||
87cb7997 | 14657 | #: git-submodule.sh:676 |
5c57d762 JX |
14658 | #, sh-format |
14659 | msgid "" | |
14660 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
14661 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
14662 | msgstr "" |
14663 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 14664 | |
87cb7997 | 14665 | #: git-submodule.sh:683 |
6c94aba5 JX |
14666 | #, sh-format |
14667 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
14668 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
14669 | ||
87cb7997 | 14670 | #: git-submodule.sh:684 |
c04f5ac3 | 14671 | #, sh-format |
6c94aba5 JX |
14672 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
14673 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
14674 | ||
87cb7997 | 14675 | #: git-submodule.sh:688 |
6c94aba5 | 14676 | #, sh-format |
2e8451e8 JX |
14677 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
14678 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 14679 | |
87cb7997 | 14680 | #: git-submodule.sh:689 |
c04f5ac3 | 14681 | #, sh-format |
2e8451e8 JX |
14682 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
14683 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 14684 | |
87cb7997 | 14685 | #: git-submodule.sh:694 |
c04f5ac3 | 14686 | #, sh-format |
2e8451e8 JX |
14687 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
14688 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 14689 | |
87cb7997 | 14690 | #: git-submodule.sh:695 |
c04f5ac3 | 14691 | #, sh-format |
2e8451e8 JX |
14692 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
14693 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 14694 | |
87cb7997 | 14695 | #: git-submodule.sh:700 |
c04f5ac3 | 14696 | #, sh-format |
5b04ee3b JX |
14697 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
14698 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 14699 | |
87cb7997 | 14700 | #: git-submodule.sh:701 |
c04f5ac3 | 14701 | #, sh-format |
5b04ee3b | 14702 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 14703 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 14704 | |
87cb7997 | 14705 | #: git-submodule.sh:732 |
2e8451e8 JX |
14706 | #, sh-format |
14707 | msgid "Failed to recurse into submodule path '$displaypath'" | |
14708 | msgstr "无法递归进子模组路径 '$displaypath'" | |
14709 | ||
87cb7997 | 14710 | #: git-submodule.sh:840 |
649900bc JX |
14711 | msgid "The --cached option cannot be used with the --files option" |
14712 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 14713 | |
87cb7997 | 14714 | #: git-submodule.sh:892 |
b694fbb1 JX |
14715 | #, sh-format |
14716 | msgid "unexpected mode $mod_dst" | |
14717 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 14718 | |
90e6ef53 | 14719 | # 译者:注意保持前导空格 |
87cb7997 | 14720 | #: git-submodule.sh:912 |
c04f5ac3 | 14721 | #, sh-format |
2e8451e8 JX |
14722 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
14723 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 14724 | |
90e6ef53 | 14725 | # 译者:注意保持前导空格 |
87cb7997 | 14726 | #: git-submodule.sh:915 |
c04f5ac3 | 14727 | #, sh-format |
2e8451e8 JX |
14728 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
14729 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 14730 | |
90e6ef53 | 14731 | # 译者:注意保持前导空格 |
87cb7997 | 14732 | #: git-submodule.sh:918 |
c04f5ac3 | 14733 | #, sh-format |
2e8451e8 JX |
14734 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
14735 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 14736 | |
87cb7997 | 14737 | #: git-submodule.sh:1064 |
1003b3a5 JX |
14738 | #, sh-format |
14739 | msgid "Failed to recurse into submodule path '$sm_path'" | |
14740 | msgstr "无法递归进子模组路径 '$sm_path'" | |
14741 | ||
87cb7997 | 14742 | #: git-submodule.sh:1136 |
c04f5ac3 | 14743 | #, sh-format |
2e8451e8 JX |
14744 | msgid "Synchronizing submodule url for '$displaypath'" |
14745 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 14746 | |
5b04ee3b JX |
14747 | #: git-parse-remote.sh:89 |
14748 | #, sh-format | |
14749 | msgid "See git-${cmd}(1) for details." | |
14750 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 14751 | |
1a79b2f1 | 14752 | #: git-rebase--interactive.sh:140 |
5c57d762 JX |
14753 | #, sh-format |
14754 | msgid "Rebasing ($new_count/$total)" | |
14755 | msgstr "变基中($new_count/$total)" | |
14756 | ||
1a79b2f1 | 14757 | #: git-rebase--interactive.sh:156 |
5c57d762 JX |
14758 | msgid "" |
14759 | "\n" | |
14760 | "Commands:\n" | |
14761 | " p, pick = use commit\n" | |
14762 | " r, reword = use commit, but edit the commit message\n" | |
14763 | " e, edit = use commit, but stop for amending\n" | |
14764 | " s, squash = use commit, but meld into previous commit\n" | |
14765 | " f, fixup = like \"squash\", but discard this commit's log message\n" | |
14766 | " x, exec = run command (the rest of the line) using shell\n" | |
14767 | " d, drop = remove commit\n" | |
14768 | "\n" | |
14769 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
14770 | msgstr "" | |
14771 | "\n" | |
14772 | "命令:\n" | |
14773 | " p, pick = 使用提交\n" | |
14774 | " r, reword = 使用提交,但修改提交说明\n" | |
14775 | " e, edit = 使用提交,但停止以便进行提交修补\n" | |
14776 | " s, squash = 使用提交,但和前一个版本融合\n" | |
14777 | " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n" | |
14778 | " x, exec = 使用 shell 运行命令(此行剩余部分)\n" | |
14779 | " d, drop = 删除提交\n" | |
14780 | "\n" | |
9a4b694c | 14781 | "这些行可以被重新排序;它们会被从上至下地执行。\n" |
5c57d762 JX |
14782 | "\n" |
14783 | ||
1a79b2f1 | 14784 | #: git-rebase--interactive.sh:171 |
5c57d762 JX |
14785 | msgid "" |
14786 | "\n" | |
14787 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
a0b6b246 JX |
14788 | msgstr "" |
14789 | "\n" | |
14790 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5c57d762 | 14791 | |
1a79b2f1 | 14792 | #: git-rebase--interactive.sh:175 |
5c57d762 JX |
14793 | msgid "" |
14794 | "\n" | |
14795 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
a0b6b246 JX |
14796 | msgstr "" |
14797 | "\n" | |
14798 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5c57d762 | 14799 | |
1a79b2f1 | 14800 | #: git-rebase--interactive.sh:211 |
5c57d762 JX |
14801 | #, sh-format |
14802 | msgid "" | |
14803 | "You can amend the commit now, with\n" | |
14804 | "\n" | |
14805 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
14806 | "\n" | |
14807 | "Once you are satisfied with your changes, run\n" | |
14808 | "\n" | |
14809 | "\tgit rebase --continue" | |
14810 | msgstr "" | |
14811 | "您现在可以修补这个提交,使用\n" | |
14812 | "\n" | |
14813 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
14814 | "\n" | |
9a4b694c | 14815 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
14816 | "\n" |
14817 | "\tgit rebase --continue" | |
14818 | ||
1a79b2f1 | 14819 | #: git-rebase--interactive.sh:236 |
5c57d762 JX |
14820 | #, sh-format |
14821 | msgid "$sha1: not a commit that can be picked" | |
14822 | msgstr "$sha1:不是一个可以被拣选的提交" | |
14823 | ||
1a79b2f1 | 14824 | #: git-rebase--interactive.sh:275 |
5c57d762 JX |
14825 | #, sh-format |
14826 | msgid "Invalid commit name: $sha1" | |
14827 | msgstr "无效的提交名:$sha1" | |
14828 | ||
1a79b2f1 | 14829 | #: git-rebase--interactive.sh:317 |
5c57d762 JX |
14830 | msgid "Cannot write current commit's replacement sha1" |
14831 | msgstr "不能写入当前提交的替代 sha1" | |
14832 | ||
1a79b2f1 | 14833 | #: git-rebase--interactive.sh:369 |
5c57d762 JX |
14834 | #, sh-format |
14835 | msgid "Fast-forward to $sha1" | |
14836 | msgstr "快进到 $sha1" | |
14837 | ||
1a79b2f1 | 14838 | #: git-rebase--interactive.sh:371 |
5c57d762 JX |
14839 | #, sh-format |
14840 | msgid "Cannot fast-forward to $sha1" | |
14841 | msgstr "不能快进到 $sha1" | |
14842 | ||
1a79b2f1 | 14843 | #: git-rebase--interactive.sh:380 |
5c57d762 JX |
14844 | #, sh-format |
14845 | msgid "Cannot move HEAD to $first_parent" | |
14846 | msgstr "不能移动 HEAD 到 $first_parent" | |
14847 | ||
1a79b2f1 | 14848 | #: git-rebase--interactive.sh:385 |
5c57d762 JX |
14849 | #, sh-format |
14850 | msgid "Refusing to squash a merge: $sha1" | |
14851 | msgstr "拒绝压缩一个合并:$sha1" | |
14852 | ||
1a79b2f1 | 14853 | #: git-rebase--interactive.sh:399 |
5c57d762 JX |
14854 | #, sh-format |
14855 | msgid "Error redoing merge $sha1" | |
14856 | msgstr "无法重做合并 $sha1" | |
14857 | ||
1a79b2f1 | 14858 | #: git-rebase--interactive.sh:407 |
5c57d762 JX |
14859 | #, sh-format |
14860 | msgid "Could not pick $sha1" | |
14861 | msgstr "不能拣选 $sha1" | |
14862 | ||
1a79b2f1 | 14863 | #: git-rebase--interactive.sh:416 |
5c57d762 JX |
14864 | #, sh-format |
14865 | msgid "This is the commit message #${n}:" | |
9a4b694c | 14866 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 14867 | |
1a79b2f1 | 14868 | #: git-rebase--interactive.sh:421 |
5c57d762 JX |
14869 | #, sh-format |
14870 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 14871 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 14872 | |
1a79b2f1 | 14873 | #: git-rebase--interactive.sh:432 |
5c57d762 JX |
14874 | #, sh-format |
14875 | msgid "This is a combination of $count commit." | |
14876 | msgid_plural "This is a combination of $count commits." | |
14877 | msgstr[0] "这是一个 $count 个提交的组合。" | |
14878 | msgstr[1] "这是一个 $count 个提交的组合。" | |
14879 | ||
1a79b2f1 | 14880 | #: git-rebase--interactive.sh:441 |
5c57d762 JX |
14881 | #, sh-format |
14882 | msgid "Cannot write $fixup_msg" | |
14883 | msgstr "不能写入 $fixup_msg" | |
14884 | ||
1a79b2f1 | 14885 | #: git-rebase--interactive.sh:444 |
5c57d762 JX |
14886 | msgid "This is a combination of 2 commits." |
14887 | msgstr "这是一个 2 个提交的组合。" | |
14888 | ||
1a79b2f1 JX |
14889 | #: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 |
14890 | #: git-rebase--interactive.sh:531 | |
5c57d762 JX |
14891 | #, sh-format |
14892 | msgid "Could not apply $sha1... $rest" | |
14893 | msgstr "不能应用 $sha1... $rest" | |
14894 | ||
1a79b2f1 | 14895 | #: git-rebase--interactive.sh:559 |
5c57d762 JX |
14896 | #, sh-format |
14897 | msgid "" | |
14898 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
14899 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
14900 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
14901 | "before\n" | |
14902 | "you are able to reword the commit." | |
14903 | msgstr "" | |
14904 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
14905 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
14906 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
14907 | ||
1a79b2f1 | 14908 | #: git-rebase--interactive.sh:574 |
5c57d762 JX |
14909 | #, sh-format |
14910 | msgid "Stopped at $sha1_abbrev... $rest" | |
14911 | msgstr "停止在 $sha1_abbrev... $rest" | |
14912 | ||
1a79b2f1 | 14913 | #: git-rebase--interactive.sh:589 |
5c57d762 JX |
14914 | #, sh-format |
14915 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 14916 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 14917 | |
1a79b2f1 | 14918 | #: git-rebase--interactive.sh:631 |
5c57d762 JX |
14919 | #, sh-format |
14920 | msgid "Executing: $rest" | |
14921 | msgstr "执行:$rest" | |
14922 | ||
1a79b2f1 | 14923 | #: git-rebase--interactive.sh:639 |
5c57d762 JX |
14924 | #, sh-format |
14925 | msgid "Execution failed: $rest" | |
14926 | msgstr "执行失败:$rest" | |
14927 | ||
1a79b2f1 | 14928 | #: git-rebase--interactive.sh:641 |
5c57d762 JX |
14929 | msgid "and made changes to the index and/or the working tree" |
14930 | msgstr "并且修改索引和/或工作区" | |
14931 | ||
14932 | # 译者:注意保持前导空格 | |
1a79b2f1 | 14933 | #: git-rebase--interactive.sh:643 |
5c57d762 JX |
14934 | msgid "" |
14935 | "You can fix the problem, and then run\n" | |
14936 | "\n" | |
14937 | "\tgit rebase --continue" | |
14938 | msgstr "" | |
14939 | "您可以解决这个问题,然后运行\n" | |
14940 | "\n" | |
14941 | "\tgit rebase --continue" | |
14942 | ||
14943 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
1a79b2f1 | 14944 | #: git-rebase--interactive.sh:656 |
5c57d762 JX |
14945 | #, sh-format |
14946 | msgid "" | |
14947 | "Execution succeeded: $rest\n" | |
14948 | "but left changes to the index and/or the working tree\n" | |
14949 | "Commit or stash your changes, and then run\n" | |
14950 | "\n" | |
14951 | "\tgit rebase --continue" | |
14952 | msgstr "" | |
14953 | "执行成功:$rest\n" | |
14954 | "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n" | |
14955 | "\n" | |
14956 | "\tgit rebase --continue" | |
14957 | ||
1a79b2f1 | 14958 | #: git-rebase--interactive.sh:667 |
5c57d762 JX |
14959 | #, sh-format |
14960 | msgid "Unknown command: $command $sha1 $rest" | |
14961 | msgstr "未知命令:$command $sha1 $rest" | |
14962 | ||
1a79b2f1 | 14963 | #: git-rebase--interactive.sh:668 |
5c57d762 JX |
14964 | msgid "Please fix this using 'git rebase --edit-todo'." |
14965 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
14966 | ||
1a79b2f1 | 14967 | #: git-rebase--interactive.sh:703 |
5c57d762 JX |
14968 | #, sh-format |
14969 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 14970 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 14971 | |
1a79b2f1 | 14972 | #: git-rebase--interactive.sh:750 |
5c57d762 JX |
14973 | msgid "Could not skip unnecessary pick commands" |
14974 | msgstr "不能跳过不必要的拣选命令" | |
14975 | ||
1a79b2f1 | 14976 | #: git-rebase--interactive.sh:908 |
5c57d762 JX |
14977 | #, sh-format |
14978 | msgid "" | |
14979 | "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" | |
14980 | " - $line" | |
14981 | msgstr "" | |
14982 | "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n" | |
14983 | " - $line" | |
14984 | ||
1a79b2f1 | 14985 | #: git-rebase--interactive.sh:941 |
5c57d762 JX |
14986 | #, sh-format |
14987 | msgid "" | |
14988 | "Warning: the command isn't recognized in the following line:\n" | |
14989 | " - $line" | |
14990 | msgstr "" | |
14991 | "警告:下面一行中的命令未能被识别:\n" | |
14992 | " - $line" | |
14993 | ||
1a79b2f1 | 14994 | #: git-rebase--interactive.sh:980 |
5c57d762 JX |
14995 | msgid "could not detach HEAD" |
14996 | msgstr "不能检出为分离头指针" | |
14997 | ||
1a79b2f1 | 14998 | #: git-rebase--interactive.sh:1018 |
5c57d762 JX |
14999 | msgid "" |
15000 | "Warning: some commits may have been dropped accidentally.\n" | |
15001 | "Dropped commits (newer to older):" | |
15002 | msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):" | |
15003 | ||
1a79b2f1 | 15004 | #: git-rebase--interactive.sh:1026 |
5c57d762 JX |
15005 | msgid "" |
15006 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
15007 | "\n" | |
15008 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
15009 | "warnings.\n" | |
15010 | "The possible behaviours are: ignore, warn, error." | |
15011 | msgstr "" | |
9a4b694c | 15012 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" |
5c57d762 | 15013 | "\n" |
9a4b694c RC |
15014 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" |
15015 | "可选值有:ignore、warn、error。" | |
5c57d762 | 15016 | |
1a79b2f1 | 15017 | #: git-rebase--interactive.sh:1037 |
5c57d762 JX |
15018 | #, sh-format |
15019 | msgid "" | |
15020 | "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " | |
15021 | "Ignoring." | |
9a4b694c | 15022 | msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" |
5c57d762 | 15023 | |
1a79b2f1 | 15024 | #: git-rebase--interactive.sh:1054 |
a0b6b246 JX |
15025 | msgid "" |
15026 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
15027 | "continue'." | |
15028 | msgstr "" | |
29004bbb | 15029 | "您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。" |
5c57d762 | 15030 | |
1a79b2f1 | 15031 | #: git-rebase--interactive.sh:1055 |
5c57d762 JX |
15032 | msgid "Or you can abort the rebase with 'git rebase --abort'." |
15033 | msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" | |
15034 | ||
87cb7997 | 15035 | #: git-rebase--interactive.sh:1083 |
5c57d762 JX |
15036 | msgid "Could not remove CHERRY_PICK_HEAD" |
15037 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
15038 | ||
87cb7997 | 15039 | #: git-rebase--interactive.sh:1088 |
5c57d762 JX |
15040 | #, sh-format |
15041 | msgid "" | |
15042 | "You have staged changes in your working tree.\n" | |
15043 | "If these changes are meant to be\n" | |
15044 | "squashed into the previous commit, run:\n" | |
15045 | "\n" | |
15046 | " git commit --amend $gpg_sign_opt_quoted\n" | |
15047 | "\n" | |
15048 | "If they are meant to go into a new commit, run:\n" | |
15049 | "\n" | |
15050 | " git commit $gpg_sign_opt_quoted\n" | |
15051 | "\n" | |
a0b6b246 | 15052 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
15053 | "\n" |
15054 | " git rebase --continue\n" | |
15055 | msgstr "" | |
15056 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
15057 | "\n" | |
15058 | " git commit --amend $gpg_sign_opt_quoted\n" | |
15059 | "\n" | |
15060 | "如果这些变更要形成一个新提交,执行:\n" | |
15061 | "\n" | |
15062 | " git commit $gpg_sign_opt_quoted\n" | |
15063 | "\n" | |
9a4b694c | 15064 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
15065 | "\n" |
15066 | " git rebase --continue\n" | |
15067 | ||
87cb7997 | 15068 | #: git-rebase--interactive.sh:1105 |
5c57d762 | 15069 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 15070 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 15071 | |
87cb7997 | 15072 | #: git-rebase--interactive.sh:1110 |
5c57d762 JX |
15073 | msgid "" |
15074 | "You have uncommitted changes in your working tree. Please commit them\n" | |
15075 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
15076 | msgstr "" |
15077 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 15078 | |
87cb7997 | 15079 | #: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 |
5c57d762 JX |
15080 | msgid "Could not commit staged changes." |
15081 | msgstr "不能提交暂存的修改。" | |
15082 | ||
87cb7997 | 15083 | #: git-rebase--interactive.sh:1147 |
5c57d762 JX |
15084 | msgid "" |
15085 | "\n" | |
15086 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
15087 | "To continue rebase after editing, run:\n" | |
15088 | " git rebase --continue\n" | |
15089 | "\n" | |
15090 | msgstr "" | |
15091 | "\n" | |
9a4b694c | 15092 | "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n" |
5c57d762 JX |
15093 | "请执行:\n" |
15094 | " git rebase --continue\n" | |
15095 | "\n" | |
15096 | ||
87cb7997 | 15097 | #: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 |
5c57d762 JX |
15098 | msgid "Could not execute editor" |
15099 | msgstr "无法运行编辑器" | |
15100 | ||
87cb7997 | 15101 | #: git-rebase--interactive.sh:1168 |
5c57d762 JX |
15102 | #, sh-format |
15103 | msgid "Could not checkout $switch_to" | |
15104 | msgstr "不能检出 $switch_to" | |
15105 | ||
87cb7997 | 15106 | #: git-rebase--interactive.sh:1173 |
5c57d762 JX |
15107 | msgid "No HEAD?" |
15108 | msgstr "没有 HEAD?" | |
15109 | ||
87cb7997 | 15110 | #: git-rebase--interactive.sh:1174 |
5c57d762 JX |
15111 | #, sh-format |
15112 | msgid "Could not create temporary $state_dir" | |
15113 | msgstr "不能创建临时 $state_dir" | |
15114 | ||
87cb7997 | 15115 | #: git-rebase--interactive.sh:1176 |
5c57d762 JX |
15116 | msgid "Could not mark as interactive" |
15117 | msgstr "不能标记为交互式" | |
15118 | ||
87cb7997 | 15119 | #: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 |
5c57d762 JX |
15120 | msgid "Could not init rewritten commits" |
15121 | msgstr "不能对重写提交进行初始化" | |
15122 | ||
87cb7997 | 15123 | #: git-rebase--interactive.sh:1291 |
5c57d762 JX |
15124 | #, sh-format |
15125 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
15126 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
15127 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
15128 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
15129 | ||
87cb7997 | 15130 | #: git-rebase--interactive.sh:1296 |
5c57d762 JX |
15131 | msgid "" |
15132 | "\n" | |
15133 | "However, if you remove everything, the rebase will be aborted.\n" | |
15134 | "\n" | |
a0b6b246 JX |
15135 | msgstr "" |
15136 | "\n" | |
15137 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
15138 | "\n" | |
5c57d762 | 15139 | |
87cb7997 | 15140 | #: git-rebase--interactive.sh:1303 |
5c57d762 JX |
15141 | msgid "Note that empty commits are commented out" |
15142 | msgstr "注意空提交已被注释掉" | |
15143 | ||
15144 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 | |
15145 | #, sh-format | |
15146 | msgid "usage: $dashless $USAGE" | |
15147 | msgstr "用法:$dashless $USAGE" | |
15148 | ||
15149 | #: git-sh-setup.sh:190 | |
15150 | #, sh-format | |
15151 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 15152 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
15153 | |
15154 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
15155 | #, sh-format | |
15156 | msgid "fatal: $program_name cannot be used without a working tree." | |
15157 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
15158 | ||
15159 | #: git-sh-setup.sh:220 | |
15160 | msgid "Cannot rebase: You have unstaged changes." | |
15161 | msgstr "不能变基:您有未暂存的变更。" | |
15162 | ||
15163 | #: git-sh-setup.sh:223 | |
15164 | msgid "Cannot rewrite branches: You have unstaged changes." | |
15165 | msgstr "不能重写分支:您有未暂存的变更。" | |
15166 | ||
a0b6b246 JX |
15167 | #: git-sh-setup.sh:226 |
15168 | msgid "Cannot pull with rebase: You have unstaged changes." | |
15169 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
15170 | ||
5c57d762 JX |
15171 | #: git-sh-setup.sh:229 |
15172 | #, sh-format | |
15173 | msgid "Cannot $action: You have unstaged changes." | |
15174 | msgstr "不能 $action:您有未暂存的变更。" | |
15175 | ||
15176 | #: git-sh-setup.sh:242 | |
15177 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
15178 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
15179 | ||
a0b6b246 JX |
15180 | #: git-sh-setup.sh:245 |
15181 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
15182 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
15183 | ||
5c57d762 JX |
15184 | #: git-sh-setup.sh:248 |
15185 | #, sh-format | |
15186 | msgid "Cannot $action: Your index contains uncommitted changes." | |
15187 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
15188 | ||
a0b6b246 JX |
15189 | #: git-sh-setup.sh:252 |
15190 | msgid "Additionally, your index contains uncommitted changes." | |
15191 | msgstr "而且您的索引中包含未提交的变更。" | |
15192 | ||
5c57d762 JX |
15193 | #: git-sh-setup.sh:372 |
15194 | msgid "You need to run this command from the toplevel of the working tree." | |
15195 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
15196 | ||
15197 | #: git-sh-setup.sh:377 | |
15198 | msgid "Unable to determine absolute path of git directory" | |
15199 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 15200 | |
1a79b2f1 JX |
15201 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
15202 | #: git-add--interactive.perl:238 | |
15203 | #, perl-format | |
15204 | msgid "%12s %12s %s" | |
15205 | msgstr "%12s %12s %s" | |
15206 | ||
15207 | #: git-add--interactive.perl:239 | |
15208 | msgid "staged" | |
15209 | msgstr "缓存" | |
15210 | ||
15211 | #: git-add--interactive.perl:239 | |
15212 | msgid "unstaged" | |
15213 | msgstr "未缓存" | |
15214 | ||
87cb7997 | 15215 | #: git-add--interactive.perl:288 git-add--interactive.perl:313 |
1a79b2f1 JX |
15216 | msgid "binary" |
15217 | msgstr "二进制" | |
15218 | ||
87cb7997 | 15219 | #: git-add--interactive.perl:297 git-add--interactive.perl:351 |
1a79b2f1 JX |
15220 | msgid "nothing" |
15221 | msgstr "无" | |
15222 | ||
87cb7997 | 15223 | #: git-add--interactive.perl:333 git-add--interactive.perl:348 |
1a79b2f1 JX |
15224 | msgid "unchanged" |
15225 | msgstr "没有修改" | |
15226 | ||
87cb7997 | 15227 | #: git-add--interactive.perl:644 |
1a79b2f1 JX |
15228 | #, perl-format |
15229 | msgid "added %d path\n" | |
15230 | msgid_plural "added %d paths\n" | |
15231 | msgstr[0] "增加了 %d 个路径\n" | |
15232 | msgstr[1] "增加了 %d 个路径\n" | |
15233 | ||
87cb7997 | 15234 | #: git-add--interactive.perl:647 |
1a79b2f1 JX |
15235 | #, perl-format |
15236 | msgid "updated %d path\n" | |
15237 | msgid_plural "updated %d paths\n" | |
15238 | msgstr[0] "更新了 %d 个路径\n" | |
15239 | msgstr[1] "更新了 %d 个路径\n" | |
15240 | ||
87cb7997 | 15241 | #: git-add--interactive.perl:650 |
1a79b2f1 JX |
15242 | #, perl-format |
15243 | msgid "reverted %d path\n" | |
15244 | msgid_plural "reverted %d paths\n" | |
15245 | msgstr[0] "还原了 %d 个路径\n" | |
15246 | msgstr[1] "还原了 %d 个路径\n" | |
15247 | ||
87cb7997 | 15248 | #: git-add--interactive.perl:653 |
1a79b2f1 JX |
15249 | #, perl-format |
15250 | msgid "touched %d path\n" | |
15251 | msgid_plural "touched %d paths\n" | |
15252 | msgstr[0] "触碰了 %d 个路径\n" | |
15253 | msgstr[1] "触碰了 %d 个路径\n" | |
15254 | ||
87cb7997 | 15255 | #: git-add--interactive.perl:662 |
1a79b2f1 JX |
15256 | msgid "Update" |
15257 | msgstr "更新" | |
15258 | ||
87cb7997 | 15259 | #: git-add--interactive.perl:674 |
1a79b2f1 JX |
15260 | msgid "Revert" |
15261 | msgstr "还原" | |
15262 | ||
87cb7997 | 15263 | #: git-add--interactive.perl:697 |
1a79b2f1 JX |
15264 | #, perl-format |
15265 | msgid "note: %s is untracked now.\n" | |
15266 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
15267 | ||
87cb7997 | 15268 | #: git-add--interactive.perl:708 |
1a79b2f1 JX |
15269 | msgid "Add untracked" |
15270 | msgstr "添加未跟踪的" | |
15271 | ||
87cb7997 | 15272 | #: git-add--interactive.perl:714 |
1a79b2f1 JX |
15273 | msgid "No untracked files.\n" |
15274 | msgstr "没有未跟踪的文件。\n" | |
15275 | ||
87cb7997 | 15276 | #: git-add--interactive.perl:1030 |
1a79b2f1 JX |
15277 | msgid "" |
15278 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15279 | "marked for staging." | |
15280 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
15281 | ||
87cb7997 | 15282 | #: git-add--interactive.perl:1033 |
1a79b2f1 JX |
15283 | msgid "" |
15284 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15285 | "marked for stashing." | |
15286 | msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。" | |
15287 | ||
87cb7997 | 15288 | #: git-add--interactive.perl:1036 |
1a79b2f1 JX |
15289 | msgid "" |
15290 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15291 | "marked for unstaging." | |
15292 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
15293 | ||
87cb7997 | 15294 | #: git-add--interactive.perl:1039 git-add--interactive.perl:1048 |
1a79b2f1 JX |
15295 | msgid "" |
15296 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15297 | "marked for applying." | |
15298 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
15299 | ||
87cb7997 | 15300 | #: git-add--interactive.perl:1042 git-add--interactive.perl:1045 |
1a79b2f1 JX |
15301 | msgid "" |
15302 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15303 | "marked for discarding." | |
15304 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
15305 | ||
87cb7997 | 15306 | #: git-add--interactive.perl:1058 |
1a79b2f1 JX |
15307 | #, perl-format |
15308 | msgid "failed to open hunk edit file for writing: %s" | |
15309 | msgstr "无法写入块编辑文件:%s" | |
15310 | ||
87cb7997 | 15311 | #: git-add--interactive.perl:1059 |
1a79b2f1 JX |
15312 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
15313 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
15314 | ||
87cb7997 | 15315 | #: git-add--interactive.perl:1065 |
1a79b2f1 JX |
15316 | #, perl-format |
15317 | msgid "" | |
15318 | "---\n" | |
15319 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
15320 | "To remove '%s' lines, delete them.\n" | |
15321 | "Lines starting with %s will be removed.\n" | |
15322 | msgstr "" | |
15323 | "---\n" | |
15324 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
15325 | "要删除 '%s' 开始的行,删除它们。\n" | |
15326 | "以 %s 开始的行将被删除。\n" | |
15327 | ||
15328 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
87cb7997 | 15329 | #: git-add--interactive.perl:1073 |
1a79b2f1 JX |
15330 | msgid "" |
15331 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
15332 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
15333 | "aborted and the hunk is left unchanged.\n" | |
15334 | msgstr "" | |
15335 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
15336 | "此次编辑被终止,该块不会被修改。\n" | |
15337 | ||
87cb7997 | 15338 | #: git-add--interactive.perl:1087 |
1a79b2f1 JX |
15339 | #, perl-format |
15340 | msgid "failed to open hunk edit file for reading: %s" | |
15341 | msgstr "无法读取块编辑文件:%s" | |
15342 | ||
15343 | #. TRANSLATORS: do not translate [y/n] | |
15344 | #. The program will only accept that input | |
15345 | #. at this point. | |
15346 | #. Consider translating (saying "no" discards!) as | |
15347 | #. (saying "n" for "no" discards!) if the translation | |
15348 | #. of the word "no" does not start with n. | |
87cb7997 | 15349 | #: git-add--interactive.perl:1178 |
1a79b2f1 JX |
15350 | msgid "" |
15351 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
15352 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
15353 | ||
87cb7997 | 15354 | #: git-add--interactive.perl:1187 |
1a79b2f1 JX |
15355 | msgid "" |
15356 | "y - stage this hunk\n" | |
15357 | "n - do not stage this hunk\n" | |
15358 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
15359 | "a - stage this hunk and all later hunks in the file\n" | |
15360 | "d - do not stage this hunk or any of the later hunks in the file" | |
15361 | msgstr "" | |
15362 | "y - 暂存该块\n" | |
15363 | "n - 不要暂存该块\n" | |
15364 | "q - 退出。不暂存该块及后面的全部块\n" | |
15365 | "a - 暂存该块和本文件中后面的全部块\n" | |
15366 | "d - 不暂存该块和本文件中后面的全部块" | |
15367 | ||
87cb7997 | 15368 | #: git-add--interactive.perl:1193 |
1a79b2f1 JX |
15369 | msgid "" |
15370 | "y - stash this hunk\n" | |
15371 | "n - do not stash this hunk\n" | |
15372 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
15373 | "a - stash this hunk and all later hunks in the file\n" | |
15374 | "d - do not stash this hunk or any of the later hunks in the file" | |
15375 | msgstr "" | |
15376 | "y - 贮藏该块\n" | |
15377 | "n - 不要贮藏该块\n" | |
15378 | "q - 退出。不贮藏该块及后面的全部块\n" | |
15379 | "a - 贮藏该块和本文件中后面的全部块\n" | |
15380 | "d - 不贮藏该块和本文件中后面的全部块" | |
15381 | ||
87cb7997 | 15382 | #: git-add--interactive.perl:1199 |
1a79b2f1 JX |
15383 | msgid "" |
15384 | "y - unstage this hunk\n" | |
15385 | "n - do not unstage this hunk\n" | |
15386 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
15387 | "a - unstage this hunk and all later hunks in the file\n" | |
15388 | "d - do not unstage this hunk or any of the later hunks in the file" | |
15389 | msgstr "" | |
15390 | "y - 不暂存该块\n" | |
15391 | "n - 不要不暂存该块\n" | |
15392 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
15393 | "a - 不暂存该块和本文件中后面的全部块\n" | |
15394 | "d - 不要不暂存该块和本文件中后面的全部块" | |
15395 | ||
87cb7997 | 15396 | #: git-add--interactive.perl:1205 |
1a79b2f1 JX |
15397 | msgid "" |
15398 | "y - apply this hunk to index\n" | |
15399 | "n - do not apply this hunk to index\n" | |
15400 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
15401 | "a - apply this hunk and all later hunks in the file\n" | |
15402 | "d - do not apply this hunk or any of the later hunks in the file" | |
15403 | msgstr "" | |
15404 | "y - 在索引中应用该块\n" | |
15405 | "n - 不要在索引中应用该块\n" | |
15406 | "q - 退出。不要应用该块及后面的全部块\n" | |
15407 | "a - 应用该块和本文件中后面的全部块\n" | |
15408 | "d - 不要应用该块和本文件中后面的全部块" | |
15409 | ||
87cb7997 | 15410 | #: git-add--interactive.perl:1211 |
1a79b2f1 JX |
15411 | msgid "" |
15412 | "y - discard this hunk from worktree\n" | |
15413 | "n - do not discard this hunk from worktree\n" | |
15414 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
15415 | "a - discard this hunk and all later hunks in the file\n" | |
15416 | "d - do not discard this hunk or any of the later hunks in the file" | |
15417 | msgstr "" | |
15418 | "y - 在工作区中丢弃该块\n" | |
15419 | "n - 不要在工作区中丢弃该块\n" | |
15420 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
15421 | "a - 丢弃该块和本文件中后面的全部块\n" | |
15422 | "d - 不要丢弃该块和本文件中后面的全部块" | |
15423 | ||
87cb7997 | 15424 | #: git-add--interactive.perl:1217 |
1a79b2f1 JX |
15425 | msgid "" |
15426 | "y - discard this hunk from index and worktree\n" | |
15427 | "n - do not discard this hunk from index and worktree\n" | |
15428 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
15429 | "a - discard this hunk and all later hunks in the file\n" | |
15430 | "d - do not discard this hunk or any of the later hunks in the file" | |
15431 | msgstr "" | |
15432 | "y - 在索引和工作区中丢弃该块\n" | |
15433 | "n - 不要在索引和工作区中丢弃该块\n" | |
15434 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
15435 | "a - 丢弃该块和本文件中后面的全部块\n" | |
15436 | "d - 不要丢弃该块和本文件中后面的全部块" | |
15437 | ||
87cb7997 | 15438 | #: git-add--interactive.perl:1223 |
1a79b2f1 JX |
15439 | msgid "" |
15440 | "y - apply this hunk to index and worktree\n" | |
15441 | "n - do not apply this hunk to index and worktree\n" | |
15442 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
15443 | "a - apply this hunk and all later hunks in the file\n" | |
15444 | "d - do not apply this hunk or any of the later hunks in the file" | |
15445 | msgstr "" | |
15446 | "y - 在索引和工作区中应用该块\n" | |
15447 | "n - 不要在索引和工作区中应用该块\n" | |
15448 | "q - 退出。不要应用该块及后面的全部块\n" | |
15449 | "a - 应用该块和本文件中后面的全部块\n" | |
15450 | "d - 不要应用该块和本文件中后面的全部块" | |
15451 | ||
87cb7997 | 15452 | #: git-add--interactive.perl:1232 |
1a79b2f1 JX |
15453 | msgid "" |
15454 | "g - select a hunk to go to\n" | |
15455 | "/ - search for a hunk matching the given regex\n" | |
15456 | "j - leave this hunk undecided, see next undecided hunk\n" | |
15457 | "J - leave this hunk undecided, see next hunk\n" | |
15458 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
15459 | "K - leave this hunk undecided, see previous hunk\n" | |
15460 | "s - split the current hunk into smaller hunks\n" | |
15461 | "e - manually edit the current hunk\n" | |
15462 | "? - print help\n" | |
15463 | msgstr "" | |
15464 | "g - 选择跳转到一个块\n" | |
15465 | "/ - 查找和给定正则表达式匹配的块\n" | |
15466 | "j - 维持该块未决状态,查看下一个未决块\n" | |
15467 | "J - 维持该块未决状态,查看下一个块\n" | |
15468 | "k - 维持该块未决状态,查看上一个未决块\n" | |
15469 | "K - 维持该块未决状态,查看上一个块\n" | |
15470 | "s - 拆分当前块为更小的块\n" | |
15471 | "e - 手动编辑当前块\n" | |
15472 | "? - 显示帮助\n" | |
15473 | ||
87cb7997 | 15474 | #: git-add--interactive.perl:1263 |
1a79b2f1 JX |
15475 | msgid "The selected hunks do not apply to the index!\n" |
15476 | msgstr "选中的块不能应用到索引!\n" | |
15477 | ||
87cb7997 | 15478 | #: git-add--interactive.perl:1264 |
1a79b2f1 JX |
15479 | msgid "Apply them to the worktree anyway? " |
15480 | msgstr "无论如何都要应用到工作区么?" | |
15481 | ||
87cb7997 | 15482 | #: git-add--interactive.perl:1267 |
1a79b2f1 JX |
15483 | msgid "Nothing was applied.\n" |
15484 | msgstr "未应用。\n" | |
15485 | ||
87cb7997 | 15486 | #: git-add--interactive.perl:1278 |
1a79b2f1 JX |
15487 | #, perl-format |
15488 | msgid "ignoring unmerged: %s\n" | |
15489 | msgstr "忽略未合入的:%s\n" | |
15490 | ||
87cb7997 | 15491 | #: git-add--interactive.perl:1287 |
1a79b2f1 JX |
15492 | msgid "Only binary files changed.\n" |
15493 | msgstr "只有二进制文件被修改。\n" | |
15494 | ||
87cb7997 | 15495 | #: git-add--interactive.perl:1289 |
1a79b2f1 JX |
15496 | msgid "No changes.\n" |
15497 | msgstr "没有修改。\n" | |
15498 | ||
87cb7997 | 15499 | #: git-add--interactive.perl:1297 |
1a79b2f1 JX |
15500 | msgid "Patch update" |
15501 | msgstr "补丁更新" | |
15502 | ||
87cb7997 | 15503 | #: git-add--interactive.perl:1349 |
1a79b2f1 JX |
15504 | #, perl-format |
15505 | msgid "Stage mode change [y,n,q,a,d,/%s,?]? " | |
15506 | msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? " | |
15507 | ||
87cb7997 | 15508 | #: git-add--interactive.perl:1350 |
1a79b2f1 JX |
15509 | #, perl-format |
15510 | msgid "Stage deletion [y,n,q,a,d,/%s,?]? " | |
15511 | msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? " | |
15512 | ||
87cb7997 | 15513 | #: git-add--interactive.perl:1351 |
1a79b2f1 JX |
15514 | #, perl-format |
15515 | msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " | |
15516 | msgstr "暂存该块 [y,n,q,a,d,/%s,?]? " | |
15517 | ||
87cb7997 | 15518 | #: git-add--interactive.perl:1354 |
1a79b2f1 JX |
15519 | #, perl-format |
15520 | msgid "Stash mode change [y,n,q,a,d,/%s,?]? " | |
15521 | msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? " | |
15522 | ||
87cb7997 | 15523 | #: git-add--interactive.perl:1355 |
1a79b2f1 JX |
15524 | #, perl-format |
15525 | msgid "Stash deletion [y,n,q,a,d,/%s,?]? " | |
15526 | msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? " | |
15527 | ||
87cb7997 | 15528 | #: git-add--interactive.perl:1356 |
1a79b2f1 JX |
15529 | #, perl-format |
15530 | msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " | |
15531 | msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? " | |
15532 | ||
87cb7997 | 15533 | #: git-add--interactive.perl:1359 |
1a79b2f1 JX |
15534 | #, perl-format |
15535 | msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " | |
15536 | msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? " | |
15537 | ||
87cb7997 | 15538 | #: git-add--interactive.perl:1360 |
1a79b2f1 JX |
15539 | #, perl-format |
15540 | msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " | |
15541 | msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? " | |
15542 | ||
87cb7997 | 15543 | #: git-add--interactive.perl:1361 |
1a79b2f1 JX |
15544 | #, perl-format |
15545 | msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " | |
15546 | msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? " | |
15547 | ||
87cb7997 | 15548 | #: git-add--interactive.perl:1364 |
1a79b2f1 JX |
15549 | #, perl-format |
15550 | msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " | |
15551 | msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? " | |
15552 | ||
87cb7997 | 15553 | #: git-add--interactive.perl:1365 |
1a79b2f1 JX |
15554 | #, perl-format |
15555 | msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " | |
15556 | msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? " | |
15557 | ||
87cb7997 | 15558 | #: git-add--interactive.perl:1366 |
1a79b2f1 JX |
15559 | #, perl-format |
15560 | msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " | |
15561 | msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? " | |
15562 | ||
87cb7997 | 15563 | #: git-add--interactive.perl:1369 |
1a79b2f1 JX |
15564 | #, perl-format |
15565 | msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " | |
15566 | msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15567 | ||
87cb7997 | 15568 | #: git-add--interactive.perl:1370 |
1a79b2f1 JX |
15569 | #, perl-format |
15570 | msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " | |
15571 | msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15572 | ||
87cb7997 | 15573 | #: git-add--interactive.perl:1371 |
1a79b2f1 JX |
15574 | #, perl-format |
15575 | msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " | |
15576 | msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " | |
15577 | ||
87cb7997 | 15578 | #: git-add--interactive.perl:1374 |
1a79b2f1 JX |
15579 | #, perl-format |
15580 | msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " | |
15581 | msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15582 | ||
87cb7997 | 15583 | #: git-add--interactive.perl:1375 |
1a79b2f1 JX |
15584 | #, perl-format |
15585 | msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " | |
15586 | msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15587 | ||
87cb7997 | 15588 | #: git-add--interactive.perl:1376 |
1a79b2f1 JX |
15589 | #, perl-format |
15590 | msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " | |
15591 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " | |
15592 | ||
87cb7997 | 15593 | #: git-add--interactive.perl:1379 |
1a79b2f1 JX |
15594 | #, perl-format |
15595 | msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " | |
15596 | msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? " | |
15597 | ||
87cb7997 | 15598 | #: git-add--interactive.perl:1380 |
1a79b2f1 JX |
15599 | #, perl-format |
15600 | msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " | |
15601 | msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? " | |
15602 | ||
87cb7997 | 15603 | #: git-add--interactive.perl:1381 |
1a79b2f1 JX |
15604 | #, perl-format |
15605 | msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " | |
15606 | msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? " | |
15607 | ||
87cb7997 | 15608 | #: git-add--interactive.perl:1484 |
1a79b2f1 JX |
15609 | msgid "go to which hunk (<ret> to see more)? " |
15610 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
15611 | ||
87cb7997 | 15612 | #: git-add--interactive.perl:1486 |
1a79b2f1 JX |
15613 | msgid "go to which hunk? " |
15614 | msgstr "跳转到哪个块?" | |
15615 | ||
87cb7997 | 15616 | #: git-add--interactive.perl:1495 |
1a79b2f1 JX |
15617 | #, perl-format |
15618 | msgid "Invalid number: '%s'\n" | |
15619 | msgstr "无效数字:'%s'\n" | |
15620 | ||
87cb7997 | 15621 | #: git-add--interactive.perl:1500 |
1a79b2f1 JX |
15622 | #, perl-format |
15623 | msgid "Sorry, only %d hunk available.\n" | |
15624 | msgid_plural "Sorry, only %d hunks available.\n" | |
15625 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
15626 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
15627 | ||
87cb7997 | 15628 | #: git-add--interactive.perl:1526 |
1a79b2f1 JX |
15629 | msgid "search for regex? " |
15630 | msgstr "使用正则表达式搜索?" | |
15631 | ||
87cb7997 | 15632 | #: git-add--interactive.perl:1539 |
1a79b2f1 JX |
15633 | #, perl-format |
15634 | msgid "Malformed search regexp %s: %s\n" | |
15635 | msgstr "错误的正则表达式 %s:%s\n" | |
15636 | ||
87cb7997 | 15637 | #: git-add--interactive.perl:1549 |
1a79b2f1 JX |
15638 | msgid "No hunk matches the given pattern\n" |
15639 | msgstr "没有和给定模式相匹配的快\n" | |
15640 | ||
87cb7997 | 15641 | #: git-add--interactive.perl:1561 git-add--interactive.perl:1583 |
1a79b2f1 JX |
15642 | msgid "No previous hunk\n" |
15643 | msgstr "没有前一个块\n" | |
15644 | ||
87cb7997 | 15645 | #: git-add--interactive.perl:1570 git-add--interactive.perl:1589 |
1a79b2f1 JX |
15646 | msgid "No next hunk\n" |
15647 | msgstr "没有下一个块\n" | |
15648 | ||
87cb7997 | 15649 | #: git-add--interactive.perl:1597 |
1a79b2f1 JX |
15650 | #, perl-format |
15651 | msgid "Split into %d hunk.\n" | |
15652 | msgid_plural "Split into %d hunks.\n" | |
15653 | msgstr[0] "拆分为 %d 块。\n" | |
15654 | msgstr[1] "拆分为 %d 块。\n" | |
15655 | ||
87cb7997 | 15656 | #: git-add--interactive.perl:1649 |
1a79b2f1 JX |
15657 | msgid "Review diff" |
15658 | msgstr "检视 diff" | |
15659 | ||
15660 | #. TRANSLATORS: please do not translate the command names | |
15661 | #. 'status', 'update', 'revert', etc. | |
87cb7997 | 15662 | #: git-add--interactive.perl:1668 |
1a79b2f1 JX |
15663 | msgid "" |
15664 | "status - show paths with changes\n" | |
15665 | "update - add working tree state to the staged set of changes\n" | |
15666 | "revert - revert staged set of changes back to the HEAD version\n" | |
15667 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 15668 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
15669 | "add untracked - add contents of untracked files to the staged set of " |
15670 | "changes\n" | |
15671 | msgstr "" | |
15672 | "status - 显示含变更的路径\n" | |
15673 | "update - 添加工作区状态至暂存列表\n" | |
15674 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
15675 | "patch - 挑选块并且有选择地更新\n" | |
15676 | "diff - 显示 HEAD 和索引间差异\n" | |
15677 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
15678 | ||
87cb7997 JX |
15679 | #: git-add--interactive.perl:1685 git-add--interactive.perl:1690 |
15680 | #: git-add--interactive.perl:1693 git-add--interactive.perl:1700 | |
15681 | #: git-add--interactive.perl:1704 git-add--interactive.perl:1710 | |
1a79b2f1 JX |
15682 | msgid "missing --" |
15683 | msgstr "缺失 --" | |
15684 | ||
87cb7997 | 15685 | #: git-add--interactive.perl:1706 |
1a79b2f1 JX |
15686 | #, perl-format |
15687 | msgid "unknown --patch mode: %s" | |
15688 | msgstr "未知的 --patch 模式:%s" | |
15689 | ||
87cb7997 | 15690 | #: git-add--interactive.perl:1712 git-add--interactive.perl:1718 |
1a79b2f1 JX |
15691 | #, perl-format |
15692 | msgid "invalid argument %s, expecting --" | |
15693 | msgstr "无效的参数 %s,期望是 --" | |
15694 | ||
15695 | #: git-send-email.perl:121 | |
15696 | msgid "local zone differs from GMT by a non-minute interval\n" | |
15697 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
15698 | ||
15699 | #: git-send-email.perl:128 git-send-email.perl:134 | |
15700 | msgid "local time offset greater than or equal to 24 hours\n" | |
15701 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
15702 | ||
15703 | #: git-send-email.perl:202 git-send-email.perl:208 | |
15704 | msgid "the editor exited uncleanly, aborting everything" | |
15705 | msgstr "编辑器非正常退出,终止所有操作" | |
15706 | ||
15707 | #: git-send-email.perl:282 | |
15708 | #, perl-format | |
15709 | msgid "" | |
15710 | "'%s' contains an intermediate version of the email you were composing.\n" | |
15711 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
15712 | ||
15713 | #: git-send-email.perl:287 | |
15714 | #, perl-format | |
15715 | msgid "'%s.final' contains the composed email.\n" | |
15716 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
15717 | ||
15718 | #: git-send-email.perl:305 | |
15719 | msgid "--dump-aliases incompatible with other options\n" | |
15720 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
15721 | ||
15722 | #: git-send-email.perl:368 git-send-email.perl:623 | |
15723 | msgid "Cannot run git format-patch from outside a repository\n" | |
15724 | msgstr "不能在仓库之外运行 git format-patch\n" | |
15725 | ||
15726 | #: git-send-email.perl:437 | |
15727 | #, perl-format | |
15728 | msgid "Unknown --suppress-cc field: '%s'\n" | |
15729 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
15730 | ||
15731 | #: git-send-email.perl:466 | |
15732 | #, perl-format | |
15733 | msgid "Unknown --confirm setting: '%s'\n" | |
15734 | msgstr "未知的 --confirm 设置:'%s'\n" | |
15735 | ||
15736 | #: git-send-email.perl:498 | |
15737 | #, perl-format | |
15738 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
15739 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
15740 | ||
15741 | #: git-send-email.perl:500 | |
15742 | #, perl-format | |
15743 | msgid "warning: `:include:` not supported: %s\n" | |
15744 | msgstr "警告:不支持 `:include:`:%s\n" | |
15745 | ||
15746 | #: git-send-email.perl:502 | |
15747 | #, perl-format | |
15748 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
15749 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
15750 | ||
15751 | #: git-send-email.perl:507 | |
15752 | #, perl-format | |
15753 | msgid "warning: sendmail line is not recognized: %s\n" | |
15754 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
15755 | ||
15756 | #: git-send-email.perl:589 | |
15757 | #, perl-format | |
15758 | msgid "" | |
15759 | "File '%s' exists but it could also be the range of commits\n" | |
15760 | "to produce patches for. Please disambiguate by...\n" | |
15761 | "\n" | |
15762 | " * Saying \"./%s\" if you mean a file; or\n" | |
15763 | " * Giving --format-patch option if you mean a range.\n" | |
15764 | msgstr "" | |
87cb7997 JX |
15765 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
15766 | "歧义:\n" | |
1a79b2f1 JX |
15767 | "\n" |
15768 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
15769 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
15770 | ||
15771 | #: git-send-email.perl:610 | |
15772 | #, perl-format | |
15773 | msgid "Failed to opendir %s: %s" | |
15774 | msgstr "无法打开目录 %s: %s" | |
15775 | ||
15776 | #: git-send-email.perl:634 | |
15777 | #, perl-format | |
15778 | msgid "" | |
15779 | "fatal: %s: %s\n" | |
15780 | "warning: no patches were sent\n" | |
15781 | msgstr "" | |
15782 | "严重:%s:%s\n" | |
15783 | "警告:补丁未能发送\n" | |
15784 | ||
15785 | #: git-send-email.perl:645 | |
15786 | msgid "" | |
15787 | "\n" | |
15788 | "No patch files specified!\n" | |
15789 | "\n" | |
87cb7997 JX |
15790 | msgstr "" |
15791 | "\n" | |
15792 | "未指定补丁文件!\n" | |
15793 | "\n" | |
1a79b2f1 JX |
15794 | |
15795 | #: git-send-email.perl:658 | |
15796 | #, perl-format | |
15797 | msgid "No subject line in %s?" | |
15798 | msgstr "在 %s 中没有标题行?" | |
15799 | ||
15800 | #: git-send-email.perl:668 | |
15801 | #, perl-format | |
15802 | msgid "Failed to open for writing %s: %s" | |
15803 | msgstr "无法写入 %s: %s" | |
15804 | ||
15805 | #: git-send-email.perl:678 | |
15806 | msgid "" | |
15807 | "Lines beginning in \"GIT:\" will be removed.\n" | |
15808 | "Consider including an overall diffstat or table of contents\n" | |
15809 | "for the patch you are writing.\n" | |
15810 | "\n" | |
15811 | "Clear the body content if you don't wish to send a summary.\n" | |
15812 | msgstr "" | |
15813 | "以 \"GIT:\" 开头的行将被删除。\n" | |
15814 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" | |
15815 | "\n" | |
15816 | "如果您不想发送摘要,清除内容。\n" | |
15817 | ||
15818 | #: git-send-email.perl:701 | |
15819 | #, perl-format | |
15820 | msgid "Failed to open %s.final: %s" | |
15821 | msgstr "无法打开 %s.final: %s" | |
15822 | ||
15823 | #: git-send-email.perl:704 | |
15824 | #, perl-format | |
15825 | msgid "Failed to open %s: %s" | |
15826 | msgstr "无法打开 %s: %s" | |
15827 | ||
15828 | #: git-send-email.perl:739 | |
15829 | msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" | |
15830 | msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n" | |
15831 | ||
15832 | #: git-send-email.perl:748 | |
15833 | msgid "Summary email is empty, skipping it\n" | |
15834 | msgstr "摘要邮件为空,跳过\n" | |
15835 | ||
15836 | #. TRANSLATORS: please keep [y/N] as is. | |
15837 | #: git-send-email.perl:780 | |
15838 | #, perl-format | |
15839 | msgid "Are you sure you want to use <%s> [y/N]? " | |
15840 | msgstr "您确认要使用 <%s> [y/N]?" | |
15841 | ||
15842 | #: git-send-email.perl:809 | |
15843 | msgid "" | |
15844 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
15845 | "Encoding.\n" | |
15846 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
15847 | ||
15848 | #: git-send-email.perl:814 | |
15849 | msgid "Which 8bit encoding should I declare [UTF-8]? " | |
15850 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
15851 | ||
15852 | #: git-send-email.perl:822 | |
15853 | #, perl-format | |
15854 | msgid "" | |
15855 | "Refusing to send because the patch\n" | |
15856 | "\t%s\n" | |
15857 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
15858 | "want to send.\n" | |
15859 | msgstr "" | |
15860 | "拒绝发送,因为补丁\n" | |
15861 | "\t%s\n" | |
15862 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
15863 | ||
15864 | #: git-send-email.perl:841 | |
15865 | msgid "To whom should the emails be sent (if anyone)?" | |
15866 | msgstr "邮件将要发送给谁?" | |
15867 | ||
15868 | #: git-send-email.perl:859 | |
15869 | #, perl-format | |
15870 | msgid "fatal: alias '%s' expands to itself\n" | |
15871 | msgstr "严重:别名 '%s' 扩展为它自己\n" | |
15872 | ||
15873 | #: git-send-email.perl:871 | |
15874 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " | |
15875 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
15876 | ||
15877 | #: git-send-email.perl:921 git-send-email.perl:929 | |
15878 | #, perl-format | |
15879 | msgid "error: unable to extract a valid address from: %s\n" | |
15880 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
15881 | ||
15882 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
15883 | #. translation. The program will only accept English input | |
15884 | #. at this point. | |
15885 | #: git-send-email.perl:933 | |
15886 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " | |
15887 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
15888 | ||
15889 | #: git-send-email.perl:1234 | |
15890 | #, perl-format | |
15891 | msgid "CA path \"%s\" does not exist" | |
15892 | msgstr "CA 路径 \"%s\" 不存在" | |
15893 | ||
15894 | #: git-send-email.perl:1309 | |
15895 | msgid "" | |
15896 | " The Cc list above has been expanded by additional\n" | |
15897 | " addresses found in the patch commit message. By default\n" | |
15898 | " send-email prompts before sending whenever this occurs.\n" | |
15899 | " This behavior is controlled by the sendemail.confirm\n" | |
15900 | " configuration setting.\n" | |
15901 | "\n" | |
15902 | " For additional information, run 'git send-email --help'.\n" | |
15903 | " To retain the current behavior, but squelch this message,\n" | |
15904 | " run 'git config --global sendemail.confirm auto'.\n" | |
15905 | "\n" | |
15906 | msgstr "" | |
15907 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
15908 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
15909 | " sendemail.confirm 配置设置。\n" | |
15910 | "\n" | |
15911 | " 更多信息,执行 'git send-email --help'。\n" | |
15912 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
15913 | " sendemail.confirm auto'。\n" | |
15914 | "\n" | |
15915 | ||
15916 | #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your | |
15917 | #. translation. The program will only accept English input | |
15918 | #. at this point. | |
15919 | #: git-send-email.perl:1324 | |
15920 | msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " | |
15921 | msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):" | |
15922 | ||
15923 | #: git-send-email.perl:1327 | |
15924 | msgid "Send this email reply required" | |
15925 | msgstr "发送要求的邮件回复" | |
15926 | ||
15927 | #: git-send-email.perl:1353 | |
15928 | msgid "The required SMTP server is not properly defined." | |
15929 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
15930 | ||
15931 | #: git-send-email.perl:1397 | |
15932 | #, perl-format | |
15933 | msgid "Server does not support STARTTLS! %s" | |
15934 | msgstr "服务器不支持 STARTTLS!%s" | |
15935 | ||
15936 | #: git-send-email.perl:1403 | |
15937 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." | |
15938 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
15939 | ||
15940 | #: git-send-email.perl:1421 | |
15941 | #, perl-format | |
15942 | msgid "Failed to send %s\n" | |
15943 | msgstr "无法发送 %s\n" | |
15944 | ||
15945 | #: git-send-email.perl:1424 | |
15946 | #, perl-format | |
15947 | msgid "Dry-Sent %s\n" | |
15948 | msgstr "演习发送 %s\n" | |
15949 | ||
15950 | #: git-send-email.perl:1424 | |
15951 | #, perl-format | |
15952 | msgid "Sent %s\n" | |
15953 | msgstr "正发送 %s\n" | |
15954 | ||
15955 | #: git-send-email.perl:1426 | |
15956 | msgid "Dry-OK. Log says:\n" | |
15957 | msgstr "演习成功。日志说:\n" | |
15958 | ||
15959 | #: git-send-email.perl:1426 | |
15960 | msgid "OK. Log says:\n" | |
15961 | msgstr "OK。日志说:\n" | |
15962 | ||
15963 | #: git-send-email.perl:1438 | |
15964 | msgid "Result: " | |
15965 | msgstr "结果:" | |
15966 | ||
15967 | #: git-send-email.perl:1441 | |
15968 | msgid "Result: OK\n" | |
15969 | msgstr "结果:OK\n" | |
15970 | ||
15971 | #: git-send-email.perl:1454 | |
15972 | #, perl-format | |
15973 | msgid "can't open file %s" | |
15974 | msgstr "无法打开文件 %s" | |
15975 | ||
15976 | #: git-send-email.perl:1501 git-send-email.perl:1521 | |
15977 | #, perl-format | |
15978 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
15979 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
15980 | ||
15981 | #: git-send-email.perl:1507 | |
15982 | #, perl-format | |
15983 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
15984 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
15985 | ||
15986 | #: git-send-email.perl:1555 | |
15987 | #, perl-format | |
15988 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
15989 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
15990 | ||
15991 | #: git-send-email.perl:1578 | |
15992 | #, perl-format | |
15993 | msgid "(body) Adding cc: %s from line '%s'\n" | |
15994 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
15995 | ||
15996 | #: git-send-email.perl:1676 | |
15997 | #, perl-format | |
15998 | msgid "(%s) Could not execute '%s'" | |
15999 | msgstr "(%s) 不能执行 '%s'" | |
16000 | ||
16001 | #: git-send-email.perl:1683 | |
16002 | #, perl-format | |
16003 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
16004 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
16005 | ||
16006 | #: git-send-email.perl:1687 | |
16007 | #, perl-format | |
16008 | msgid "(%s) failed to close pipe to '%s'" | |
16009 | msgstr "(%s) 无法关闭管道至 '%s'" | |
16010 | ||
16011 | #: git-send-email.perl:1714 | |
16012 | msgid "cannot send message as 7bit" | |
16013 | msgstr "不能以 7bit 形式发送信息" | |
16014 | ||
16015 | #: git-send-email.perl:1722 | |
16016 | msgid "invalid transfer encoding" | |
16017 | msgstr "无效的传送编码" | |
16018 | ||
16019 | #: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 | |
16020 | #, perl-format | |
16021 | msgid "unable to open %s: %s\n" | |
16022 | msgstr "不能打开 %s:%s\n" | |
16023 | ||
16024 | #: git-send-email.perl:1744 | |
16025 | #, perl-format | |
16026 | msgid "%s: patch contains a line longer than 998 characters" | |
16027 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
16028 | ||
16029 | #: git-send-email.perl:1760 | |
16030 | #, perl-format | |
16031 | msgid "Skipping %s with backup suffix '%s'.\n" | |
16032 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
16033 | ||
16034 | #. TRANSLATORS: please keep "[y|N]" as is. | |
16035 | #: git-send-email.perl:1764 | |
16036 | #, perl-format | |
16037 | msgid "Do you really want to send %s? [y|N]: " | |
16038 | msgstr "您真的要发送 %s?[y|N]:" | |
16039 | ||
87cb7997 JX |
16040 | #~ msgid "" |
16041 | #~ "There is nothing to exclude from by :(exclude) patterns.\n" | |
16042 | #~ "Perhaps you forgot to add either ':/' or '.' ?" | |
16043 | #~ msgstr "" | |
16044 | #~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
16045 | #~ "添加 ':/' 或 '.' ?" | |
16046 | ||
16047 | #~ msgid "unrecognized format: %%(%s)" | |
16048 | #~ msgstr "未能识别的格式:%%(%s)" | |
16049 | ||
16050 | #~ msgid ":strip= requires a positive integer argument" | |
16051 | #~ msgstr ":strip= 需要一个正整型参数" | |
16052 | ||
16053 | #~ msgid "ref '%s' does not have %ld components to :strip" | |
16054 | #~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" | |
16055 | ||
16056 | #~ msgid "unknown %.*s format %s" | |
16057 | #~ msgstr "未知的 %.*s 格式 %s" | |
16058 | ||
16059 | #~ msgid "[%s: gone]" | |
16060 | #~ msgstr "[%s: 丢失]" | |
16061 | ||
16062 | #~ msgid "[%s]" | |
16063 | #~ msgstr "[%s]" | |
16064 | ||
16065 | #~ msgid "[%s: behind %d]" | |
16066 | #~ msgstr "[%s:落后 %d]" | |
16067 | ||
16068 | #~ msgid "[%s: ahead %d]" | |
16069 | #~ msgstr "[%s:领先 %d]" | |
16070 | ||
16071 | #~ msgid "[%s: ahead %d, behind %d]" | |
16072 | #~ msgstr "[%s:领先 %d,落后 %d]" | |
16073 | ||
16074 | #~ msgid " **** invalid ref ****" | |
16075 | #~ msgstr " **** 无效引用 ****" | |
16076 | ||
16077 | #~ msgid "insanely long object directory %.*s" | |
16078 | #~ msgstr "不正常的长对象目录 %.*s" | |
16079 | ||
16080 | #~ msgid "git merge [<options>] <msg> HEAD <commit>" | |
16081 | #~ msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
16082 | ||
16083 | #~ msgid "'%s' is not a commit" | |
16084 | #~ msgstr "'%s' 不是一个提交" | |
16085 | ||
16086 | #~ msgid "cannot open file '%s'" | |
16087 | #~ msgstr "无法打开文件 '%s'" | |
16088 | ||
16089 | #~ msgid "could not close file %s" | |
16090 | #~ msgstr "无法关闭文件 %s" | |
16091 | ||
16092 | #~ msgid "tag name too long: %.*s..." | |
16093 | #~ msgstr "标签名称太长:%.*s..." | |
16094 | ||
16095 | #~ msgid "tag header too big." | |
16096 | #~ msgstr "标签头信息太大。" | |
16097 | ||
16098 | #~ msgid "" | |
16099 | #~ "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16100 | #~ "marked for discarding" | |
16101 | #~ msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃" | |
16102 | ||
1a79b2f1 JX |
16103 | #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" |
16104 | #~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示" | |
16105 | ||
16106 | #~ msgid "Clever... amending the last one with dirty index." | |
16107 | #~ msgstr "聪明... 用脏索引修补最后一个提交。" | |
16108 | ||
16109 | #~ msgid "" | |
16110 | #~ "the following submodule (or one of its nested submodules)\n" | |
16111 | #~ "uses a .git directory:" | |
16112 | #~ msgid_plural "" | |
16113 | #~ "the following submodules (or one of their nested submodules)\n" | |
16114 | #~ "use a .git directory:" | |
16115 | #~ msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
16116 | #~ msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
16117 | ||
16118 | #~ msgid "" | |
16119 | #~ "\n" | |
16120 | #~ "(use 'rm -rf' if you really want to remove it including all of its " | |
16121 | #~ "history)" | |
16122 | #~ msgstr "" | |
16123 | #~ "\n" | |
16124 | #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
16125 | ||
a0b6b246 JX |
16126 | #~ msgid "Could not write to %s" |
16127 | #~ msgstr "不能写入 %s" | |
16128 | ||
16129 | #~ msgid "Error wrapping up %s." | |
16130 | #~ msgstr "错误收尾 %s。" | |
16131 | ||
16132 | #~ msgid "Your local changes would be overwritten by cherry-pick." | |
16133 | #~ msgstr "您的本地修改将被拣选操作覆盖。" | |
16134 | ||
16135 | #~ msgid "Cannot revert during another revert." | |
16136 | #~ msgstr "不能在回退中执行另一回退。" | |
16137 | ||
16138 | #~ msgid "Cannot cherry-pick during another cherry-pick." | |
16139 | #~ msgstr "不能在拣选过程中执行另一拣选。" | |
16140 | ||
16141 | #~ msgid "Could not parse line %d." | |
16142 | #~ msgstr "不能解析第 %d 行。" | |
16143 | ||
16144 | #~ msgid "Could not open %s" | |
16145 | #~ msgstr "不能打开 %s" | |
16146 | ||
16147 | #~ msgid "Could not read %s." | |
16148 | #~ msgstr "不能读取 %s。" | |
16149 | ||
16150 | #~ msgid "Could not format %s." | |
16151 | #~ msgstr "不能格式化 %s。" | |
16152 | ||
16153 | #~ msgid "%s: %s" | |
16154 | #~ msgstr "%s:%s" | |
16155 | ||
16156 | #~ msgid "cannot open %s: %s" | |
16157 | #~ msgstr "不能打开 %s:%s" | |
16158 | ||
16159 | #~ msgid "You need to set your committer info first" | |
16160 | #~ msgstr "您需要先设置您的提交者信息" |