]>
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" | |
275588f9 JX |
138 | "POT-Creation-Date: 2016-11-22 22:10+0800\n" |
139 | "PO-Revision-Date: 2016-11-22 22:15+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 | ||
190 | #: advice.c:114 builtin/merge.c:1181 | |
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 | |
a0b6b246 | 363 | #: apply.c:2274 |
5c57d762 | 364 | #, c-format |
a0b6b246 JX |
365 | msgid "unable to read symlink %s" |
366 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 367 | |
a0b6b246 | 368 | #: apply.c:2278 |
5c57d762 | 369 | #, c-format |
a0b6b246 JX |
370 | msgid "unable to open or read %s" |
371 | msgstr "不能打开或读取 %s" | |
5c57d762 | 372 | |
a0b6b246 | 373 | #: apply.c:2931 |
5c57d762 | 374 | #, c-format |
a0b6b246 JX |
375 | msgid "invalid start of line: '%c'" |
376 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 377 | |
a0b6b246 | 378 | #: apply.c:3050 |
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 | |
a0b6b246 | 385 | #: apply.c:3062 |
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 | |
a0b6b246 | 390 | #: apply.c:3068 |
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 | |
a0b6b246 | 399 | #: apply.c:3090 |
5c57d762 | 400 | #, c-format |
a0b6b246 JX |
401 | msgid "missing binary patch data for '%s'" |
402 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 403 | |
a0b6b246 | 404 | #: apply.c:3098 |
5c57d762 | 405 | #, c-format |
a0b6b246 JX |
406 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
407 | msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁" | |
5c57d762 | 408 | |
a0b6b246 | 409 | #: apply.c:3144 |
5c57d762 | 410 | #, c-format |
a0b6b246 JX |
411 | msgid "cannot apply binary patch to '%s' without full index line" |
412 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 413 | |
a0b6b246 | 414 | #: apply.c:3154 |
5c57d762 | 415 | #, c-format |
a0b6b246 JX |
416 | msgid "" |
417 | "the patch applies to '%s' (%s), which does not match the current contents." | |
418 | msgstr "补丁引用到 '%s' (%s),但是和当前内容不匹配。" | |
5c57d762 | 419 | |
a0b6b246 JX |
420 | #: apply.c:3162 |
421 | #, c-format | |
422 | msgid "the patch applies to an empty '%s' but it is not empty" | |
423 | msgstr "补丁应用到空文件 '%s',但是它并不空" | |
5c57d762 | 424 | |
a0b6b246 | 425 | #: apply.c:3180 |
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 | |
a0b6b246 | 430 | #: apply.c:3193 |
5c57d762 | 431 | #, c-format |
a0b6b246 JX |
432 | msgid "binary patch does not apply to '%s'" |
433 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 434 | |
a0b6b246 | 435 | #: apply.c:3199 |
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 | |
a0b6b246 | 440 | #: apply.c:3220 |
276ceeaa | 441 | #, c-format |
a0b6b246 JX |
442 | msgid "patch failed: %s:%ld" |
443 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 444 | |
a0b6b246 | 445 | #: apply.c:3342 |
4dcdc3d8 | 446 | #, c-format |
a0b6b246 JX |
447 | msgid "cannot checkout %s" |
448 | msgstr "不能检出 %s" | |
4dcdc3d8 | 449 | |
a0b6b246 | 450 | #: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 |
4dcdc3d8 | 451 | #, c-format |
a0b6b246 JX |
452 | msgid "failed to read %s" |
453 | msgstr "无法读取 %s" | |
4dcdc3d8 | 454 | |
a0b6b246 | 455 | #: apply.c:3398 |
4dcdc3d8 | 456 | #, c-format |
a0b6b246 JX |
457 | msgid "reading from '%s' beyond a symbolic link" |
458 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 459 | |
a0b6b246 | 460 | #: apply.c:3427 apply.c:3667 |
4dcdc3d8 | 461 | #, c-format |
a0b6b246 JX |
462 | msgid "path %s has been renamed/deleted" |
463 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 464 | |
a0b6b246 | 465 | #: apply.c:3510 apply.c:3681 |
4dcdc3d8 | 466 | #, c-format |
a0b6b246 JX |
467 | msgid "%s: does not exist in index" |
468 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 469 | |
a0b6b246 | 470 | #: apply.c:3519 apply.c:3689 |
4dcdc3d8 | 471 | #, c-format |
a0b6b246 JX |
472 | msgid "%s: does not match index" |
473 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 474 | |
a0b6b246 JX |
475 | #: apply.c:3554 |
476 | msgid "repository lacks the necessary blob to fall back on 3-way merge." | |
477 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 478 | |
a0b6b246 | 479 | #: apply.c:3557 |
4dcdc3d8 | 480 | #, c-format |
a0b6b246 JX |
481 | msgid "Falling back to three-way merge...\n" |
482 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 483 | |
a0b6b246 | 484 | #: apply.c:3573 apply.c:3577 |
4dcdc3d8 | 485 | #, c-format |
a0b6b246 JX |
486 | msgid "cannot read the current contents of '%s'" |
487 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 488 | |
a0b6b246 | 489 | #: apply.c:3589 |
4dcdc3d8 | 490 | #, c-format |
a0b6b246 JX |
491 | msgid "Failed to fall back on three-way merge...\n" |
492 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 493 | |
a0b6b246 | 494 | #: apply.c:3603 |
4dcdc3d8 | 495 | #, c-format |
a0b6b246 JX |
496 | msgid "Applied patch to '%s' with conflicts.\n" |
497 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 498 | |
a0b6b246 | 499 | #: apply.c:3608 |
4dcdc3d8 | 500 | #, c-format |
a0b6b246 JX |
501 | msgid "Applied patch to '%s' cleanly.\n" |
502 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 503 | |
a0b6b246 JX |
504 | #: apply.c:3634 |
505 | msgid "removal patch leaves file contents" | |
506 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 507 | |
a0b6b246 | 508 | #: apply.c:3706 |
1003b3a5 | 509 | #, c-format |
a0b6b246 JX |
510 | msgid "%s: wrong type" |
511 | msgstr "%s:错误类型" | |
1003b3a5 | 512 | |
a0b6b246 | 513 | #: apply.c:3708 |
1003b3a5 | 514 | #, c-format |
a0b6b246 JX |
515 | msgid "%s has type %o, expected %o" |
516 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 517 | |
a0b6b246 | 518 | #: apply.c:3859 apply.c:3861 |
4dcdc3d8 | 519 | #, c-format |
a0b6b246 JX |
520 | msgid "invalid path '%s'" |
521 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 522 | |
a0b6b246 | 523 | #: apply.c:3917 |
4dcdc3d8 | 524 | #, c-format |
a0b6b246 JX |
525 | msgid "%s: already exists in index" |
526 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 527 | |
a0b6b246 | 528 | #: apply.c:3920 |
4dcdc3d8 | 529 | #, c-format |
a0b6b246 JX |
530 | msgid "%s: already exists in working directory" |
531 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 532 | |
a0b6b246 | 533 | #: apply.c:3940 |
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 | |
a0b6b246 | 538 | #: apply.c:3945 |
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 | |
a0b6b246 | 543 | #: apply.c:3965 |
8ada9598 | 544 | #, c-format |
a0b6b246 JX |
545 | msgid "affected file '%s' is beyond a symbolic link" |
546 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 547 | |
a0b6b246 | 548 | #: apply.c:3969 |
81809b99 | 549 | #, c-format |
a0b6b246 JX |
550 | msgid "%s: patch does not apply" |
551 | msgstr "%s:补丁未应用" | |
8ada9598 | 552 | |
a0b6b246 | 553 | #: apply.c:3984 |
8ada9598 | 554 | #, c-format |
a0b6b246 JX |
555 | msgid "Checking patch %s..." |
556 | msgstr "检查补丁 %s..." | |
8ada9598 | 557 | |
a0b6b246 JX |
558 | #: apply.c:4075 |
559 | #, c-format | |
560 | msgid "sha1 information is lacking or useless for submodule %s" | |
561 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 562 | |
a0b6b246 | 563 | #: apply.c:4082 |
8ada9598 | 564 | #, c-format |
a0b6b246 JX |
565 | msgid "mode change for %s, which is not in current HEAD" |
566 | msgstr "%s 的属性改变,但它不再当前 HEAD 中" | |
8ada9598 | 567 | |
a0b6b246 JX |
568 | #: apply.c:4085 |
569 | #, c-format | |
570 | msgid "sha1 information is lacking or useless (%s)." | |
571 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 572 | |
a0b6b246 | 573 | #: apply.c:4090 builtin/checkout.c:233 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 | |
a0b6b246 JX |
578 | #: apply.c:4094 |
579 | #, c-format | |
580 | msgid "could not add %s to temporary index" | |
581 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 582 | |
a0b6b246 JX |
583 | #: apply.c:4104 |
584 | #, c-format | |
585 | msgid "could not write temporary index to %s" | |
586 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 587 | |
a0b6b246 JX |
588 | #: apply.c:4242 |
589 | #, c-format | |
590 | msgid "unable to remove %s from index" | |
591 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 592 | |
a0b6b246 | 593 | #: apply.c:4277 |
8ada9598 | 594 | #, c-format |
a0b6b246 JX |
595 | msgid "corrupt patch for submodule %s" |
596 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 597 | |
a0b6b246 | 598 | #: apply.c:4283 |
9aeb4c2b | 599 | #, c-format |
a0b6b246 JX |
600 | msgid "unable to stat newly created file '%s'" |
601 | msgstr "不能枚举新建文件 '%s' 的状态" | |
9aeb4c2b | 602 | |
a0b6b246 JX |
603 | #: apply.c:4291 |
604 | #, c-format | |
605 | msgid "unable to create backing store for newly created file %s" | |
606 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 607 | |
a0b6b246 | 608 | #: apply.c:4297 apply.c:4441 |
81809b99 | 609 | #, c-format |
a0b6b246 JX |
610 | msgid "unable to add cache entry for %s" |
611 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 612 | |
a0b6b246 JX |
613 | #: apply.c:4338 |
614 | #, c-format | |
615 | msgid "failed to write to '%s'" | |
616 | msgstr "无法写入 '%s'" | |
8ada9598 | 617 | |
a0b6b246 | 618 | #: apply.c:4342 |
220c313c | 619 | #, c-format |
a0b6b246 JX |
620 | msgid "closing file '%s'" |
621 | msgstr "关闭文件 '%s'" | |
220c313c | 622 | |
a0b6b246 | 623 | #: apply.c:4412 |
c04f5ac3 | 624 | #, c-format |
a0b6b246 JX |
625 | msgid "unable to write file '%s' mode %o" |
626 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 627 | |
a0b6b246 | 628 | #: apply.c:4510 |
c04f5ac3 | 629 | #, c-format |
a0b6b246 JX |
630 | msgid "Applied patch %s cleanly." |
631 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 632 | |
a0b6b246 JX |
633 | #: apply.c:4518 |
634 | msgid "internal error" | |
635 | msgstr "内部错误" | |
c04f5ac3 | 636 | |
a0b6b246 | 637 | #: apply.c:4521 |
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 | |
a0b6b246 | 644 | #: apply.c:4532 |
5c57d762 | 645 | #, c-format |
a0b6b246 JX |
646 | msgid "truncating .rej filename to %.*s.rej" |
647 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 648 | |
a0b6b246 | 649 | #: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 |
220c313c | 650 | #, c-format |
a0b6b246 JX |
651 | msgid "cannot open %s" |
652 | msgstr "不能打开 %s" | |
220c313c | 653 | |
a0b6b246 | 654 | #: apply.c:4554 |
220c313c | 655 | #, c-format |
a0b6b246 JX |
656 | msgid "Hunk #%d applied cleanly." |
657 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 658 | |
a0b6b246 | 659 | #: apply.c:4558 |
5c57d762 | 660 | #, c-format |
a0b6b246 JX |
661 | msgid "Rejected hunk #%d." |
662 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 663 | |
a0b6b246 | 664 | #: apply.c:4668 |
5c57d762 | 665 | #, c-format |
a0b6b246 JX |
666 | msgid "Skipped patch '%s'." |
667 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 668 | |
a0b6b246 JX |
669 | #: apply.c:4676 |
670 | msgid "unrecognized input" | |
671 | msgstr "未能识别的输入" | |
5c57d762 | 672 | |
a0b6b246 JX |
673 | #: apply.c:4695 |
674 | msgid "unable to read index file" | |
675 | msgstr "无法读取索引文件" | |
5c57d762 | 676 | |
a0b6b246 | 677 | #: apply.c:4833 |
220c313c | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "can't open patch '%s': %s" |
680 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 681 | |
a0b6b246 | 682 | #: apply.c:4858 |
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 | |
a0b6b246 | 689 | #: apply.c:4864 apply.c:4879 |
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 | |
a0b6b246 | 696 | #: apply.c:4872 |
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 | |
a0b6b246 JX |
703 | #: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 |
704 | msgid "Unable to write new index file" | |
705 | msgstr "无法写入新索引文件" | |
5c57d762 | 706 | |
a0b6b246 JX |
707 | #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 |
708 | #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 | |
709 | #: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 | |
710 | #: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 | |
711 | #: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 | |
712 | msgid "path" | |
713 | msgstr "路径" | |
5c57d762 | 714 | |
a0b6b246 JX |
715 | #: apply.c:4920 |
716 | msgid "don't apply changes matching the given path" | |
717 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 718 | |
a0b6b246 JX |
719 | #: apply.c:4923 |
720 | msgid "apply changes matching the given path" | |
721 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 722 | |
a0b6b246 JX |
723 | #: apply.c:4925 builtin/am.c:2286 |
724 | msgid "num" | |
725 | msgstr "数字" | |
220c313c | 726 | |
a0b6b246 JX |
727 | #: apply.c:4926 |
728 | msgid "remove <num> leading slashes from traditional diff paths" | |
729 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 730 | |
a0b6b246 JX |
731 | #: apply.c:4929 |
732 | msgid "ignore additions made by the patch" | |
733 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 734 | |
a0b6b246 JX |
735 | #: apply.c:4931 |
736 | msgid "instead of applying the patch, output diffstat for the input" | |
737 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 738 | |
a0b6b246 JX |
739 | #: apply.c:4935 |
740 | msgid "show number of added and deleted lines in decimal notation" | |
741 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 742 | |
a0b6b246 JX |
743 | #: apply.c:4937 |
744 | msgid "instead of applying the patch, output a summary for the input" | |
745 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 746 | |
a0b6b246 JX |
747 | #: apply.c:4939 |
748 | msgid "instead of applying the patch, see if the patch is applicable" | |
749 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 750 | |
a0b6b246 JX |
751 | #: apply.c:4941 |
752 | msgid "make sure the patch is applicable to the current index" | |
753 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 754 | |
a0b6b246 JX |
755 | #: apply.c:4943 |
756 | msgid "apply a patch without touching the working tree" | |
757 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 758 | |
a0b6b246 JX |
759 | #: apply.c:4945 |
760 | msgid "accept a patch that touches outside the working area" | |
761 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 762 | |
a0b6b246 JX |
763 | #: apply.c:4947 |
764 | msgid "also apply the patch (use with --stat/--summary/--check)" | |
765 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 766 | |
a0b6b246 JX |
767 | #: apply.c:4949 |
768 | msgid "attempt three-way merge if a patch does not apply" | |
769 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 770 | |
a0b6b246 JX |
771 | #: apply.c:4951 |
772 | msgid "build a temporary index based on embedded index information" | |
773 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 774 | |
a0b6b246 JX |
775 | #: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 |
776 | msgid "paths are separated with NUL character" | |
777 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 778 | |
a0b6b246 JX |
779 | #: apply.c:4956 |
780 | msgid "ensure at least <n> lines of context match" | |
781 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 782 | |
a0b6b246 JX |
783 | #: apply.c:4957 builtin/am.c:2265 |
784 | msgid "action" | |
785 | msgstr "动作" | |
8ada9598 | 786 | |
a0b6b246 JX |
787 | #: apply.c:4958 |
788 | msgid "detect new or modified lines that have whitespace errors" | |
789 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 790 | |
a0b6b246 JX |
791 | #: apply.c:4961 apply.c:4964 |
792 | msgid "ignore changes in whitespace when finding context" | |
793 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 794 | |
a0b6b246 JX |
795 | #: apply.c:4967 |
796 | msgid "apply the patch in reverse" | |
797 | msgstr "反向应用补丁" | |
8ada9598 | 798 | |
a0b6b246 JX |
799 | #: apply.c:4969 |
800 | msgid "don't expect at least one line of context" | |
801 | msgstr "无需至少一行上下文" | |
8ada9598 | 802 | |
a0b6b246 JX |
803 | #: apply.c:4971 |
804 | msgid "leave the rejected hunks in corresponding *.rej files" | |
805 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 806 | |
a0b6b246 JX |
807 | #: apply.c:4973 |
808 | msgid "allow overlapping hunks" | |
809 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 810 | |
a0b6b246 JX |
811 | #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 |
812 | #: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 | |
813 | #: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 | |
814 | msgid "be verbose" | |
815 | msgstr "冗长输出" | |
8ada9598 | 816 | |
a0b6b246 JX |
817 | #: apply.c:4976 |
818 | msgid "tolerate incorrectly detected missing new-line at the end of file" | |
819 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 820 | |
a0b6b246 JX |
821 | #: apply.c:4979 |
822 | msgid "do not trust the line counts in the hunk headers" | |
823 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 824 | |
a0b6b246 JX |
825 | #: apply.c:4981 builtin/am.c:2274 |
826 | msgid "root" | |
827 | msgstr "根目录" | |
c04f5ac3 | 828 | |
a0b6b246 JX |
829 | #: apply.c:4982 |
830 | msgid "prepend <root> to all filenames" | |
831 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 832 | |
a0b6b246 JX |
833 | #: archive.c:12 |
834 | msgid "git archive [<options>] <tree-ish> [<path>...]" | |
835 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 836 | |
a0b6b246 JX |
837 | #: archive.c:13 |
838 | msgid "git archive --list" | |
839 | msgstr "git archive --list" | |
840 | ||
841 | #: archive.c:14 | |
c04f5ac3 | 842 | msgid "" |
a0b6b246 | 843 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 844 | msgstr "" |
a0b6b246 | 845 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 846 | |
a0b6b246 JX |
847 | #: archive.c:15 |
848 | msgid "git archive --remote <repo> [--exec <cmd>] --list" | |
849 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 850 | |
a0b6b246 | 851 | #: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 |
c04f5ac3 | 852 | #, c-format |
a0b6b246 JX |
853 | msgid "pathspec '%s' did not match any files" |
854 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 855 | |
a0b6b246 JX |
856 | #: archive.c:429 |
857 | msgid "fmt" | |
858 | msgstr "格式" | |
07432cef | 859 | |
a0b6b246 JX |
860 | #: archive.c:429 |
861 | msgid "archive format" | |
862 | msgstr "归档格式" | |
7aea43ff | 863 | |
a0b6b246 JX |
864 | #: archive.c:430 builtin/log.c:1429 |
865 | msgid "prefix" | |
866 | msgstr "前缀" | |
7aea43ff | 867 | |
a0b6b246 JX |
868 | #: archive.c:431 |
869 | msgid "prepend prefix to each pathname in the archive" | |
870 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 871 | |
a0b6b246 JX |
872 | #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 |
873 | #: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 | |
874 | #: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 | |
875 | #: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 | |
876 | #: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 | |
877 | msgid "file" | |
878 | msgstr "文件" | |
a77c07d9 | 879 | |
a0b6b246 JX |
880 | #: archive.c:433 builtin/archive.c:89 |
881 | msgid "write the archive to this file" | |
882 | msgstr "归档写入此文件" | |
a77c07d9 | 883 | |
a0b6b246 JX |
884 | #: archive.c:435 |
885 | msgid "read .gitattributes in working directory" | |
886 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 887 | |
a0b6b246 JX |
888 | #: archive.c:436 |
889 | msgid "report archived files on stderr" | |
890 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 891 | |
a0b6b246 JX |
892 | #: archive.c:437 |
893 | msgid "store only" | |
894 | msgstr "只存储" | |
7ac1c0ad | 895 | |
a0b6b246 JX |
896 | #: archive.c:438 |
897 | msgid "compress faster" | |
898 | msgstr "压缩速度更快" | |
8ada9598 | 899 | |
a0b6b246 JX |
900 | #: archive.c:446 |
901 | msgid "compress better" | |
902 | msgstr "压缩效果更好" | |
8ada9598 | 903 | |
a0b6b246 JX |
904 | #: archive.c:449 |
905 | msgid "list supported archive formats" | |
906 | msgstr "列出支持的归档格式" | |
a77c07d9 | 907 | |
a0b6b246 JX |
908 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 |
909 | #: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 | |
910 | msgid "repo" | |
911 | msgstr "仓库" | |
c04f5ac3 | 912 | |
a0b6b246 JX |
913 | #: archive.c:452 builtin/archive.c:91 |
914 | msgid "retrieve the archive from remote repository <repo>" | |
915 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 916 | |
a0b6b246 JX |
917 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 |
918 | msgid "command" | |
919 | msgstr "命令" | |
920 | ||
921 | #: archive.c:454 builtin/archive.c:93 | |
922 | msgid "path to the remote git-upload-archive command" | |
923 | msgstr "远程 git-upload-archive 命令的路径" | |
924 | ||
925 | #: archive.c:461 | |
926 | msgid "Unexpected option --remote" | |
927 | msgstr "未知参数 --remote" | |
928 | ||
929 | #: archive.c:463 | |
930 | msgid "Option --exec can only be used together with --remote" | |
931 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
932 | ||
933 | #: archive.c:465 | |
934 | msgid "Unexpected option --output" | |
935 | msgstr "未知参数 --output" | |
936 | ||
937 | #: archive.c:487 | |
938 | #, c-format | |
939 | msgid "Unknown archive format '%s'" | |
940 | msgstr "未知归档格式 '%s'" | |
941 | ||
942 | #: archive.c:494 | |
8ada9598 | 943 | #, c-format |
a0b6b246 JX |
944 | msgid "Argument not supported for format '%s': -%d" |
945 | msgstr "参数不支持此格式 '%s':-%d" | |
946 | ||
947 | #: attr.c:263 | |
8ada9598 | 948 | msgid "" |
a0b6b246 JX |
949 | "Negative patterns are ignored in git attributes\n" |
950 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 951 | msgstr "" |
a0b6b246 JX |
952 | "负值模版在 git attributes 中被忽略\n" |
953 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 954 | |
a0b6b246 | 955 | #: bisect.c:441 |
8ada9598 | 956 | #, c-format |
a0b6b246 JX |
957 | msgid "Could not open file '%s'" |
958 | msgstr "不能打开文件 '%s'" | |
8ada9598 | 959 | |
a0b6b246 | 960 | #: bisect.c:446 |
8ada9598 | 961 | #, c-format |
a0b6b246 JX |
962 | msgid "Badly quoted content in file '%s': %s" |
963 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 964 | |
a0b6b246 JX |
965 | #: bisect.c:655 |
966 | #, c-format | |
967 | msgid "We cannot bisect more!\n" | |
968 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 969 | |
a0b6b246 | 970 | #: bisect.c:708 |
2e8451e8 | 971 | #, c-format |
a0b6b246 JX |
972 | msgid "Not a valid commit name %s" |
973 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 974 | |
a0b6b246 | 975 | #: bisect.c:732 |
5b04ee3b JX |
976 | #, c-format |
977 | msgid "" | |
a0b6b246 JX |
978 | "The merge base %s is bad.\n" |
979 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 980 | msgstr "" |
a0b6b246 JX |
981 | "合并基线 %s 是坏的。\n" |
982 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 983 | |
a0b6b246 | 984 | #: bisect.c:737 |
5b04ee3b | 985 | #, c-format |
a0b6b246 JX |
986 | msgid "" |
987 | "The merge base %s is new.\n" | |
988 | "The property has changed between %s and [%s].\n" | |
989 | msgstr "" | |
990 | "合并基线 %s 是新的。\n" | |
991 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 992 | |
a0b6b246 JX |
993 | #: bisect.c:742 |
994 | #, c-format | |
995 | msgid "" | |
996 | "The merge base %s is %s.\n" | |
997 | "This means the first '%s' commit is between %s and [%s].\n" | |
998 | msgstr "" | |
999 | "合并基线 %s 是 %s。\n" | |
1000 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1001 | |
a0b6b246 JX |
1002 | #: bisect.c:750 |
1003 | #, c-format | |
1004 | msgid "" | |
1005 | "Some %s revs are not ancestor of the %s rev.\n" | |
1006 | "git bisect cannot work properly in this case.\n" | |
1007 | "Maybe you mistook %s and %s revs?\n" | |
1008 | msgstr "" | |
1009 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1010 | "这种情况下 git 二分查找无法正常工作。\n" | |
1011 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1012 | |
a0b6b246 JX |
1013 | #: bisect.c:763 |
1014 | #, c-format | |
1015 | msgid "" | |
1016 | "the merge base between %s and [%s] must be skipped.\n" | |
1017 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1018 | "We continue anyway." | |
1019 | msgstr "" | |
1020 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1021 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1022 | "我们仍旧继续。" | |
649900bc | 1023 | |
a0b6b246 | 1024 | #: bisect.c:798 |
649900bc | 1025 | #, c-format |
a0b6b246 JX |
1026 | msgid "Bisecting: a merge base must be tested\n" |
1027 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1028 | |
a0b6b246 JX |
1029 | #: bisect.c:849 |
1030 | #, c-format | |
1031 | msgid "a %s revision is needed" | |
1032 | msgstr "需要一个 %s 版本" | |
649900bc | 1033 | |
a0b6b246 | 1034 | #: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 |
649900bc | 1035 | #, c-format |
a0b6b246 JX |
1036 | msgid "could not create file '%s'" |
1037 | msgstr "不能创建文件 '%s'" | |
649900bc | 1038 | |
a0b6b246 | 1039 | #: bisect.c:917 |
649900bc | 1040 | #, c-format |
a0b6b246 JX |
1041 | msgid "could not read file '%s'" |
1042 | msgstr "不能读取文件 '%s'" | |
649900bc | 1043 | |
a0b6b246 JX |
1044 | #: bisect.c:947 |
1045 | msgid "reading bisect refs failed" | |
1046 | msgstr "读取二分查找引用失败" | |
649900bc | 1047 | |
a0b6b246 | 1048 | #: bisect.c:967 |
649900bc | 1049 | #, c-format |
a0b6b246 JX |
1050 | msgid "%s was both %s and %s\n" |
1051 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1052 | |
a0b6b246 | 1053 | #: bisect.c:975 |
649900bc | 1054 | #, c-format |
a0b6b246 JX |
1055 | msgid "" |
1056 | "No testable commit found.\n" | |
1057 | "Maybe you started with bad path parameters?\n" | |
1058 | msgstr "" | |
1059 | "没有发现可测试的提交。\n" | |
1060 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1061 | |
a0b6b246 | 1062 | #: bisect.c:994 |
649900bc | 1063 | #, c-format |
a0b6b246 JX |
1064 | msgid "(roughly %d step)" |
1065 | msgid_plural "(roughly %d steps)" | |
1066 | msgstr[0] "(大概 %d 步)" | |
1067 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1068 | |
a0b6b246 JX |
1069 | #. TRANSLATORS: the last %s will be replaced with |
1070 | #. "(roughly %d steps)" translation | |
1071 | #: bisect.c:998 | |
649900bc | 1072 | #, c-format |
a0b6b246 JX |
1073 | msgid "Bisecting: %d revision left to test after this %s\n" |
1074 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1075 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1076 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1077 | |
a0b6b246 | 1078 | #: branch.c:53 |
649900bc | 1079 | #, c-format |
a0b6b246 JX |
1080 | msgid "" |
1081 | "\n" | |
1082 | "After fixing the error cause you may try to fix up\n" | |
1083 | "the remote tracking information by invoking\n" | |
1084 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1085 | msgstr "" | |
1086 | "\n" | |
1087 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1088 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1089 | |
a0b6b246 | 1090 | #: branch.c:67 |
649900bc | 1091 | #, c-format |
a0b6b246 JX |
1092 | msgid "Not setting branch %s as its own upstream." |
1093 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1094 | |
a0b6b246 | 1095 | #: branch.c:93 |
649900bc | 1096 | #, c-format |
a0b6b246 JX |
1097 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
1098 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
649900bc | 1099 | |
a0b6b246 | 1100 | #: branch.c:94 |
649900bc | 1101 | #, c-format |
a0b6b246 JX |
1102 | msgid "Branch %s set up to track remote branch %s from %s." |
1103 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
649900bc | 1104 | |
a0b6b246 | 1105 | #: branch.c:98 |
649900bc | 1106 | #, c-format |
a0b6b246 JX |
1107 | msgid "Branch %s set up to track local branch %s by rebasing." |
1108 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
649900bc | 1109 | |
a0b6b246 | 1110 | #: branch.c:99 |
649900bc | 1111 | #, c-format |
a0b6b246 JX |
1112 | msgid "Branch %s set up to track local branch %s." |
1113 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
649900bc | 1114 | |
a0b6b246 | 1115 | #: branch.c:104 |
649900bc | 1116 | #, c-format |
a0b6b246 JX |
1117 | msgid "Branch %s set up to track remote ref %s by rebasing." |
1118 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
649900bc | 1119 | |
a0b6b246 | 1120 | #: branch.c:105 |
649900bc | 1121 | #, c-format |
a0b6b246 JX |
1122 | msgid "Branch %s set up to track remote ref %s." |
1123 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
649900bc | 1124 | |
a0b6b246 | 1125 | #: branch.c:109 |
649900bc | 1126 | #, c-format |
a0b6b246 JX |
1127 | msgid "Branch %s set up to track local ref %s by rebasing." |
1128 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
649900bc | 1129 | |
a0b6b246 | 1130 | #: branch.c:110 |
649900bc | 1131 | #, c-format |
a0b6b246 JX |
1132 | msgid "Branch %s set up to track local ref %s." |
1133 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
649900bc | 1134 | |
a0b6b246 JX |
1135 | #: branch.c:119 |
1136 | msgid "Unable to write upstream branch configuration" | |
1137 | msgstr "无法写入上游分支配置" | |
649900bc | 1138 | |
a0b6b246 | 1139 | #: branch.c:156 |
649900bc | 1140 | #, c-format |
a0b6b246 JX |
1141 | msgid "Not tracking: ambiguous information for ref %s" |
1142 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1143 | |
a0b6b246 | 1144 | #: branch.c:185 |
649900bc | 1145 | #, c-format |
a0b6b246 JX |
1146 | msgid "'%s' is not a valid branch name." |
1147 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1148 | |
a0b6b246 | 1149 | #: branch.c:190 |
649900bc | 1150 | #, c-format |
a0b6b246 JX |
1151 | msgid "A branch named '%s' already exists." |
1152 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1153 | |
a0b6b246 JX |
1154 | #: branch.c:198 |
1155 | msgid "Cannot force update the current branch." | |
1156 | msgstr "无法强制更新当前分支。" | |
649900bc | 1157 | |
a0b6b246 | 1158 | #: branch.c:218 |
649900bc | 1159 | #, c-format |
a0b6b246 JX |
1160 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1161 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1162 | |
a0b6b246 | 1163 | #: branch.c:220 |
649900bc | 1164 | #, c-format |
a0b6b246 JX |
1165 | msgid "the requested upstream branch '%s' does not exist" |
1166 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1167 | |
a0b6b246 JX |
1168 | #: branch.c:222 |
1169 | msgid "" | |
1170 | "\n" | |
1171 | "If you are planning on basing your work on an upstream\n" | |
1172 | "branch that already exists at the remote, you may need to\n" | |
1173 | "run \"git fetch\" to retrieve it.\n" | |
1174 | "\n" | |
1175 | "If you are planning to push out a new local branch that\n" | |
1176 | "will track its remote counterpart, you may want to use\n" | |
1177 | "\"git push -u\" to set the upstream config as you push." | |
1178 | msgstr "" | |
1179 | "\n" | |
1180 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1181 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1182 | "\n" | |
1183 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1184 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1185 | |
275588f9 | 1186 | #: branch.c:265 |
649900bc | 1187 | #, c-format |
a0b6b246 JX |
1188 | msgid "Not a valid object name: '%s'." |
1189 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1190 | |
275588f9 | 1191 | #: branch.c:285 |
649900bc | 1192 | #, c-format |
a0b6b246 JX |
1193 | msgid "Ambiguous object name: '%s'." |
1194 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1195 | |
275588f9 | 1196 | #: branch.c:290 |
649900bc | 1197 | #, c-format |
a0b6b246 JX |
1198 | msgid "Not a valid branch point: '%s'." |
1199 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1200 | |
275588f9 | 1201 | #: branch.c:344 |
649900bc | 1202 | #, c-format |
a0b6b246 JX |
1203 | msgid "'%s' is already checked out at '%s'" |
1204 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1205 | |
275588f9 | 1206 | #: branch.c:363 |
a0b6b246 JX |
1207 | #, c-format |
1208 | msgid "HEAD of working tree %s is not updated" | |
1209 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1210 | |
a0b6b246 | 1211 | #: bundle.c:34 |
649900bc | 1212 | #, c-format |
a0b6b246 JX |
1213 | msgid "'%s' does not look like a v2 bundle file" |
1214 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1215 | |
a0b6b246 JX |
1216 | #: bundle.c:61 |
1217 | #, c-format | |
1218 | msgid "unrecognized header: %s%s (%d)" | |
1219 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1220 | |
a0b6b246 | 1221 | #: bundle.c:87 sequencer.c:963 builtin/commit.c:777 |
649900bc | 1222 | #, c-format |
a0b6b246 JX |
1223 | msgid "could not open '%s'" |
1224 | msgstr "不能打开 '%s'" | |
649900bc | 1225 | |
a0b6b246 JX |
1226 | #: bundle.c:139 |
1227 | msgid "Repository lacks these prerequisite commits:" | |
1228 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1229 | |
a0b6b246 JX |
1230 | #: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 |
1231 | #: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 | |
1232 | #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 | |
1233 | #: builtin/merge.c:356 builtin/shortlog.c:170 | |
1234 | msgid "revision walk setup failed" | |
1235 | msgstr "版本遍历设置失败" | |
2e8451e8 | 1236 | |
a0b6b246 | 1237 | #: bundle.c:185 |
2e8451e8 | 1238 | #, c-format |
a0b6b246 JX |
1239 | msgid "The bundle contains this ref:" |
1240 | msgid_plural "The bundle contains these %d refs:" | |
1241 | msgstr[0] "这个包中含有这个引用:" | |
1242 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1243 | |
a0b6b246 JX |
1244 | #: bundle.c:192 |
1245 | msgid "The bundle records a complete history." | |
1246 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1247 | |
a0b6b246 | 1248 | #: bundle.c:194 |
2e8451e8 | 1249 | #, c-format |
a0b6b246 JX |
1250 | msgid "The bundle requires this ref:" |
1251 | msgid_plural "The bundle requires these %d refs:" | |
1252 | msgstr[0] "这个包需要这个引用:" | |
1253 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1254 | |
a0b6b246 JX |
1255 | #: bundle.c:253 |
1256 | msgid "Could not spawn pack-objects" | |
1257 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1258 | |
a0b6b246 JX |
1259 | #: bundle.c:264 |
1260 | msgid "pack-objects died" | |
1261 | msgstr "pack-objects 终止" | |
8ada9598 | 1262 | |
a0b6b246 JX |
1263 | #: bundle.c:304 |
1264 | msgid "rev-list died" | |
1265 | msgstr "rev-list 终止" | |
1266 | ||
1267 | #: bundle.c:353 | |
81809b99 | 1268 | #, c-format |
a0b6b246 JX |
1269 | msgid "ref '%s' is excluded by the rev-list options" |
1270 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1271 | |
a0b6b246 | 1272 | #: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 |
81809b99 | 1273 | #, c-format |
a0b6b246 JX |
1274 | msgid "unrecognized argument: %s" |
1275 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1276 | |
a0b6b246 JX |
1277 | #: bundle.c:451 |
1278 | msgid "Refusing to create empty bundle." | |
1279 | msgstr "不能创建空包。" | |
1280 | ||
1281 | #: bundle.c:463 | |
81809b99 | 1282 | #, c-format |
a0b6b246 JX |
1283 | msgid "cannot create '%s'" |
1284 | msgstr "不能创建 '%s'" | |
8ada9598 | 1285 | |
a0b6b246 JX |
1286 | #: bundle.c:491 |
1287 | msgid "index-pack died" | |
1288 | msgstr "index-pack 终止" | |
63af42fe | 1289 | |
a0b6b246 | 1290 | #: color.c:290 |
94550ed3 | 1291 | #, c-format |
a0b6b246 JX |
1292 | msgid "invalid color value: %.*s" |
1293 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1294 | |
a0b6b246 JX |
1295 | #: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 |
1296 | #: builtin/am.c:2127 | |
94550ed3 | 1297 | #, c-format |
a0b6b246 JX |
1298 | msgid "could not parse %s" |
1299 | msgstr "不能解析 %s" | |
94550ed3 | 1300 | |
a0b6b246 JX |
1301 | #: commit.c:42 |
1302 | #, c-format | |
1303 | msgid "%s %s is not a commit!" | |
1304 | msgstr "%s %s 不是一个提交!" | |
90314792 | 1305 | |
a0b6b246 | 1306 | #: commit.c:1514 |
90314792 | 1307 | msgid "" |
a0b6b246 JX |
1308 | "Warning: commit message did not conform to UTF-8.\n" |
1309 | "You may want to amend it after fixing the message, or set the config\n" | |
1310 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1311 | msgstr "" | |
1312 | "警告:提交说明不符合 UTF-8 字符集。\n" | |
1313 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" | |
1314 | "设置为您项目所用的字符集。\n" | |
90314792 | 1315 | |
a0b6b246 JX |
1316 | #: compat/obstack.c:406 compat/obstack.c:408 |
1317 | msgid "memory exhausted" | |
1318 | msgstr "内存耗尽" | |
90314792 | 1319 | |
a0b6b246 | 1320 | #: config.c:516 |
90314792 | 1321 | #, c-format |
a0b6b246 JX |
1322 | msgid "bad config line %d in blob %s" |
1323 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1324 | |
a0b6b246 | 1325 | #: config.c:520 |
a77c07d9 | 1326 | #, c-format |
a0b6b246 JX |
1327 | msgid "bad config line %d in file %s" |
1328 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1329 | |
a0b6b246 | 1330 | #: config.c:524 |
a77c07d9 | 1331 | #, c-format |
a0b6b246 JX |
1332 | msgid "bad config line %d in standard input" |
1333 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1334 | |
a0b6b246 | 1335 | #: config.c:528 |
90314792 | 1336 | #, c-format |
a0b6b246 JX |
1337 | msgid "bad config line %d in submodule-blob %s" |
1338 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1339 | |
a0b6b246 | 1340 | #: config.c:532 |
90314792 | 1341 | #, c-format |
a0b6b246 JX |
1342 | msgid "bad config line %d in command line %s" |
1343 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1344 | |
a0b6b246 | 1345 | #: config.c:536 |
90314792 | 1346 | #, c-format |
a0b6b246 JX |
1347 | msgid "bad config line %d in %s" |
1348 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1349 | |
a0b6b246 JX |
1350 | #: config.c:655 |
1351 | msgid "out of range" | |
1352 | msgstr "超出范围" | |
6c94aba5 | 1353 | |
a0b6b246 JX |
1354 | #: config.c:655 |
1355 | msgid "invalid unit" | |
1356 | msgstr "无效的单位" | |
6c94aba5 | 1357 | |
a0b6b246 | 1358 | #: config.c:661 |
6c94aba5 | 1359 | #, c-format |
a0b6b246 JX |
1360 | msgid "bad numeric config value '%s' for '%s': %s" |
1361 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1362 | |
a0b6b246 | 1363 | #: config.c:666 |
1b7f4a34 | 1364 | #, c-format |
a0b6b246 JX |
1365 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1366 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1367 | |
a0b6b246 | 1368 | #: config.c:669 |
1b7f4a34 | 1369 | #, c-format |
a0b6b246 JX |
1370 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1371 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1372 | |
a0b6b246 | 1373 | #: config.c:672 |
1b7f4a34 | 1374 | #, c-format |
a0b6b246 JX |
1375 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1376 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1377 | |
a0b6b246 | 1378 | #: config.c:675 |
1b7f4a34 | 1379 | #, c-format |
a0b6b246 JX |
1380 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1381 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1382 | |
a0b6b246 | 1383 | #: config.c:678 |
94550ed3 | 1384 | #, c-format |
a0b6b246 JX |
1385 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1386 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1387 | |
a0b6b246 | 1388 | #: config.c:681 |
276ceeaa | 1389 | #, c-format |
a0b6b246 JX |
1390 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1391 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1392 | |
a0b6b246 | 1393 | #: config.c:768 |
276ceeaa | 1394 | #, c-format |
a0b6b246 JX |
1395 | msgid "failed to expand user dir in: '%s'" |
1396 | msgstr "无法扩展 '%s' 中的用户目录" | |
94550ed3 | 1397 | |
a0b6b246 | 1398 | #: config.c:852 config.c:863 |
3495628d | 1399 | #, c-format |
a0b6b246 JX |
1400 | msgid "bad zlib compression level %d" |
1401 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1402 | |
a0b6b246 | 1403 | #: config.c:978 |
3495628d | 1404 | #, c-format |
a0b6b246 JX |
1405 | msgid "invalid mode for object creation: %s" |
1406 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1407 | |
a0b6b246 JX |
1408 | #: config.c:1312 |
1409 | msgid "unable to parse command-line config" | |
1410 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1411 | |
a0b6b246 JX |
1412 | #: config.c:1362 |
1413 | msgid "unknown error occurred while reading the configuration files" | |
1414 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1415 | |
a0b6b246 | 1416 | #: config.c:1716 |
276ceeaa | 1417 | #, c-format |
a0b6b246 JX |
1418 | msgid "unable to parse '%s' from command-line config" |
1419 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1420 | |
a0b6b246 | 1421 | #: config.c:1718 |
94550ed3 | 1422 | #, c-format |
a0b6b246 JX |
1423 | msgid "bad config variable '%s' in file '%s' at line %d" |
1424 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1425 | |
a0b6b246 | 1426 | #: config.c:1777 |
276ceeaa | 1427 | #, c-format |
a0b6b246 JX |
1428 | msgid "%s has multiple values" |
1429 | msgstr "%s 有多个取值" | |
276ceeaa | 1430 | |
a0b6b246 | 1431 | #: config.c:2311 |
94550ed3 | 1432 | #, c-format |
a0b6b246 JX |
1433 | msgid "could not set '%s' to '%s'" |
1434 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1435 | |
a0b6b246 | 1436 | #: config.c:2313 |
276ceeaa | 1437 | #, c-format |
a0b6b246 JX |
1438 | msgid "could not unset '%s'" |
1439 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1440 | |
a0b6b246 JX |
1441 | #: connect.c:49 |
1442 | msgid "The remote end hung up upon initial contact" | |
1443 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 1444 | |
a0b6b246 JX |
1445 | #: connect.c:51 |
1446 | msgid "" | |
1447 | "Could not read from remote repository.\n" | |
1448 | "\n" | |
1449 | "Please make sure you have the correct access rights\n" | |
1450 | "and the repository exists." | |
1451 | msgstr "" | |
1452 | "无法读取远程仓库。\n" | |
1453 | "\n" | |
1454 | "请确认您有正确的访问权限并且仓库存在。" | |
1455 | ||
1456 | #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 | |
1457 | msgid "Checking connectivity" | |
1458 | msgstr "检查连接中" | |
1459 | ||
1460 | #: connected.c:75 | |
1461 | msgid "Could not run 'git rev-list'" | |
1462 | msgstr "不能执行 'git rev-list'" | |
1463 | ||
1464 | #: connected.c:95 | |
1465 | msgid "failed write to rev-list" | |
1466 | msgstr "无法写入 rev-list" | |
1467 | ||
1468 | #: connected.c:102 | |
1469 | msgid "failed to close rev-list's stdin" | |
1470 | msgstr "无法关闭 rev-list 的标准输入" | |
1471 | ||
1472 | #: convert.c:201 | |
3495628d | 1473 | #, c-format |
a0b6b246 JX |
1474 | msgid "" |
1475 | "CRLF will be replaced by LF in %s.\n" | |
1476 | "The file will have its original line endings in your working directory." | |
1477 | msgstr "" | |
1478 | "文件 %s 中的 CRLF 将被 LF 替换。\n" | |
1479 | "在工作区中该文件仍保持原有的换行符。" | |
3495628d | 1480 | |
a0b6b246 | 1481 | #: convert.c:205 |
3495628d | 1482 | #, c-format |
a0b6b246 JX |
1483 | msgid "CRLF would be replaced by LF in %s." |
1484 | msgstr "文件 %s 中的 CRLF 将被 LF 替换。" | |
3495628d | 1485 | |
a0b6b246 | 1486 | #: convert.c:211 |
276ceeaa | 1487 | #, c-format |
a0b6b246 JX |
1488 | msgid "" |
1489 | "LF will be replaced by CRLF in %s.\n" | |
1490 | "The file will have its original line endings in your working directory." | |
1491 | msgstr "" | |
1492 | "文件 %s 中的 LF 将被 CRLF 替换。\n" | |
1493 | "在工作区中该文件仍保持原有的换行符。" | |
276ceeaa | 1494 | |
a0b6b246 | 1495 | #: convert.c:215 |
3495628d | 1496 | #, c-format |
a0b6b246 JX |
1497 | msgid "LF would be replaced by CRLF in %s" |
1498 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 1499 | |
a0b6b246 JX |
1500 | #: date.c:97 |
1501 | msgid "in the future" | |
1502 | msgstr "在将来" | |
3495628d | 1503 | |
a0b6b246 | 1504 | #: date.c:103 |
3495628d | 1505 | #, c-format |
a0b6b246 JX |
1506 | msgid "%lu second ago" |
1507 | msgid_plural "%lu seconds ago" | |
1508 | msgstr[0] "%lu 秒钟前" | |
1509 | msgstr[1] "%lu 秒钟前" | |
3495628d | 1510 | |
a0b6b246 | 1511 | #: date.c:110 |
3495628d | 1512 | #, c-format |
a0b6b246 JX |
1513 | msgid "%lu minute ago" |
1514 | msgid_plural "%lu minutes ago" | |
1515 | msgstr[0] "%lu 分钟前" | |
1516 | msgstr[1] "%lu 分钟前" | |
3495628d | 1517 | |
a0b6b246 | 1518 | #: date.c:117 |
3495628d | 1519 | #, c-format |
a0b6b246 JX |
1520 | msgid "%lu hour ago" |
1521 | msgid_plural "%lu hours ago" | |
1522 | msgstr[0] "%lu 小时前" | |
1523 | msgstr[1] "%lu 小时前" | |
3495628d | 1524 | |
a0b6b246 | 1525 | #: date.c:124 |
3495628d | 1526 | #, c-format |
a0b6b246 JX |
1527 | msgid "%lu day ago" |
1528 | msgid_plural "%lu days ago" | |
1529 | msgstr[0] "%lu 天前" | |
1530 | msgstr[1] "%lu 天前" | |
3495628d | 1531 | |
a0b6b246 | 1532 | #: date.c:130 |
94550ed3 | 1533 | #, c-format |
a0b6b246 JX |
1534 | msgid "%lu week ago" |
1535 | msgid_plural "%lu weeks ago" | |
1536 | msgstr[0] "%lu 周前" | |
1537 | msgstr[1] "%lu 周前" | |
94550ed3 | 1538 | |
a0b6b246 | 1539 | #: date.c:137 |
3495628d | 1540 | #, c-format |
a0b6b246 JX |
1541 | msgid "%lu month ago" |
1542 | msgid_plural "%lu months ago" | |
1543 | msgstr[0] "%lu 个月前" | |
1544 | msgstr[1] "%lu 个月前" | |
3495628d | 1545 | |
a0b6b246 | 1546 | #: date.c:148 |
3495628d | 1547 | #, c-format |
a0b6b246 JX |
1548 | msgid "%lu year" |
1549 | msgid_plural "%lu years" | |
1550 | msgstr[0] "%lu 年" | |
1551 | msgstr[1] "%lu 年" | |
3495628d | 1552 | |
a0b6b246 JX |
1553 | #. TRANSLATORS: "%s" is "<n> years" |
1554 | #: date.c:151 | |
94550ed3 | 1555 | #, c-format |
a0b6b246 JX |
1556 | msgid "%s, %lu month ago" |
1557 | msgid_plural "%s, %lu months ago" | |
1558 | msgstr[0] "%s %lu 个月前" | |
1559 | msgstr[1] "%s %lu 个月前" | |
94550ed3 | 1560 | |
a0b6b246 | 1561 | #: date.c:156 date.c:161 |
94550ed3 | 1562 | #, c-format |
a0b6b246 JX |
1563 | msgid "%lu year ago" |
1564 | msgid_plural "%lu years ago" | |
1565 | msgstr[0] "%lu 年前" | |
1566 | msgstr[1] "%lu 年前" | |
94550ed3 | 1567 | |
a0b6b246 | 1568 | #: diffcore-order.c:24 |
cfff71a9 | 1569 | #, c-format |
a0b6b246 JX |
1570 | msgid "failed to read orderfile '%s'" |
1571 | msgstr "无法读取排序文件 '%s'" | |
cfff71a9 | 1572 | |
275588f9 | 1573 | #: diffcore-rename.c:536 |
a0b6b246 JX |
1574 | msgid "Performing inexact rename detection" |
1575 | msgstr "正在进行非精确的重命名检测" | |
cfff71a9 | 1576 | |
a0b6b246 | 1577 | #: diff.c:62 |
cfff71a9 | 1578 | #, c-format |
a0b6b246 JX |
1579 | msgid "option '%s' requires a value" |
1580 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 1581 | |
a0b6b246 JX |
1582 | # 译者:注意保持前导空格 |
1583 | #: diff.c:124 | |
1584 | #, c-format | |
1585 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
1586 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 1587 | |
a0b6b246 JX |
1588 | # 译者:注意保持前导空格 |
1589 | #: diff.c:129 | |
1590 | #, c-format | |
1591 | msgid " Unknown dirstat parameter '%s'\n" | |
1592 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 1593 | |
a0b6b246 | 1594 | #: diff.c:283 |
7aea43ff | 1595 | #, c-format |
a0b6b246 JX |
1596 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
1597 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 1598 | |
a0b6b246 | 1599 | #: diff.c:346 |
7aea43ff | 1600 | #, c-format |
a0b6b246 JX |
1601 | msgid "" |
1602 | "Found errors in 'diff.dirstat' config variable:\n" | |
1603 | "%s" | |
1604 | msgstr "" | |
1605 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
1606 | "%s" | |
7aea43ff | 1607 | |
a0b6b246 | 1608 | #: diff.c:3087 |
7aea43ff | 1609 | #, c-format |
a0b6b246 JX |
1610 | msgid "external diff died, stopping at %s" |
1611 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 1612 | |
a0b6b246 JX |
1613 | #: diff.c:3412 |
1614 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" | |
1615 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
1616 | ||
1617 | #: diff.c:3502 | |
1618 | msgid "--follow requires exactly one pathspec" | |
1619 | msgstr "--follow 明确要求只跟一个路径规格" | |
1620 | ||
1621 | #: diff.c:3665 | |
7aea43ff | 1622 | #, c-format |
a0b6b246 JX |
1623 | msgid "" |
1624 | "Failed to parse --dirstat/-X option parameter:\n" | |
1625 | "%s" | |
1626 | msgstr "" | |
1627 | "无法解析 --dirstat/-X 选项的参数:\n" | |
1628 | "%s" | |
7aea43ff | 1629 | |
a0b6b246 | 1630 | #: diff.c:3679 |
7aea43ff | 1631 | #, c-format |
a0b6b246 JX |
1632 | msgid "Failed to parse --submodule option parameter: '%s'" |
1633 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 1634 | |
a0b6b246 JX |
1635 | #: diff.c:4700 |
1636 | msgid "inexact rename detection was skipped due to too many files." | |
1637 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
1638 | ||
1639 | #: diff.c:4703 | |
1640 | msgid "only found copies from modified paths due to too many files." | |
1641 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
1642 | ||
1643 | #: diff.c:4706 | |
7aea43ff | 1644 | #, c-format |
a0b6b246 JX |
1645 | msgid "" |
1646 | "you may want to set your %s variable to at least %d and retry the command." | |
1647 | msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。" | |
7aea43ff | 1648 | |
a0b6b246 JX |
1649 | #: dir.c:1866 |
1650 | msgid "failed to get kernel name and information" | |
1651 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 1652 | |
a0b6b246 JX |
1653 | #: dir.c:1985 |
1654 | msgid "Untracked cache is disabled on this system or location." | |
1655 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 1656 | |
a0b6b246 JX |
1657 | #: fetch-pack.c:213 |
1658 | msgid "git fetch-pack: expected shallow list" | |
1659 | msgstr "git fetch-pack:应为 shallow 列表" | |
1660 | ||
1661 | #: fetch-pack.c:225 | |
1662 | msgid "git fetch-pack: expected ACK/NAK, got EOF" | |
1663 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" | |
1664 | ||
1665 | #: fetch-pack.c:243 | |
90314792 | 1666 | #, c-format |
275588f9 | 1667 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 1668 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 1669 | |
a0b6b246 JX |
1670 | #: fetch-pack.c:295 |
1671 | msgid "--stateless-rpc requires multi_ack_detailed" | |
1672 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 1673 | |
a0b6b246 | 1674 | #: fetch-pack.c:381 |
90314792 | 1675 | #, c-format |
a0b6b246 JX |
1676 | msgid "invalid shallow line: %s" |
1677 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 1678 | |
a0b6b246 | 1679 | #: fetch-pack.c:387 |
c04f5ac3 | 1680 | #, c-format |
a0b6b246 JX |
1681 | msgid "invalid unshallow line: %s" |
1682 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 1683 | |
a0b6b246 JX |
1684 | #: fetch-pack.c:389 |
1685 | #, c-format | |
1686 | msgid "object not found: %s" | |
1687 | msgstr "对象未找到:%s" | |
07432cef | 1688 | |
a0b6b246 | 1689 | #: fetch-pack.c:392 |
c04f5ac3 | 1690 | #, c-format |
a0b6b246 JX |
1691 | msgid "error in object: %s" |
1692 | msgstr "对象中出错:%s" | |
07432cef | 1693 | |
a0b6b246 | 1694 | #: fetch-pack.c:394 |
c04f5ac3 | 1695 | #, c-format |
a0b6b246 JX |
1696 | msgid "no shallow found: %s" |
1697 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 1698 | |
a0b6b246 JX |
1699 | #: fetch-pack.c:397 |
1700 | #, c-format | |
1701 | msgid "expected shallow/unshallow, got %s" | |
1702 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 1703 | |
a0b6b246 JX |
1704 | #: fetch-pack.c:436 |
1705 | #, c-format | |
1706 | msgid "got %s %d %s" | |
1707 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 1708 | |
a0b6b246 | 1709 | #: fetch-pack.c:450 |
1b7f4a34 | 1710 | #, c-format |
a0b6b246 JX |
1711 | msgid "invalid commit %s" |
1712 | msgstr "无效提交 %s" | |
1b7f4a34 | 1713 | |
a0b6b246 JX |
1714 | #: fetch-pack.c:483 |
1715 | msgid "giving up" | |
1716 | msgstr "放弃" | |
814ff314 | 1717 | |
a0b6b246 JX |
1718 | #: fetch-pack.c:493 progress.c:235 |
1719 | msgid "done" | |
1720 | msgstr "完成" | |
2e8451e8 | 1721 | |
a0b6b246 | 1722 | #: fetch-pack.c:505 |
2e8451e8 | 1723 | #, c-format |
a0b6b246 JX |
1724 | msgid "got %s (%d) %s" |
1725 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 1726 | |
a0b6b246 JX |
1727 | #: fetch-pack.c:551 |
1728 | #, c-format | |
1729 | msgid "Marking %s as complete" | |
1730 | msgstr "标记 %s 为完成" | |
220c313c | 1731 | |
a0b6b246 JX |
1732 | #: fetch-pack.c:697 |
1733 | #, c-format | |
1734 | msgid "already have %s (%s)" | |
1735 | msgstr "已经有 %s (%s)" | |
220c313c | 1736 | |
a0b6b246 JX |
1737 | #: fetch-pack.c:735 |
1738 | msgid "fetch-pack: unable to fork off sideband demultiplexer" | |
1739 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 1740 | |
a0b6b246 JX |
1741 | #: fetch-pack.c:743 |
1742 | msgid "protocol error: bad pack header" | |
1743 | msgstr "协议错误:坏的包头" | |
814ff314 | 1744 | |
a0b6b246 JX |
1745 | #: fetch-pack.c:799 |
1746 | #, c-format | |
1747 | msgid "fetch-pack: unable to fork off %s" | |
1748 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 1749 | |
a0b6b246 JX |
1750 | #: fetch-pack.c:815 |
1751 | #, c-format | |
1752 | msgid "%s failed" | |
1753 | msgstr "%s 失败" | |
14c8bced | 1754 | |
a0b6b246 JX |
1755 | #: fetch-pack.c:817 |
1756 | msgid "error in sideband demultiplexer" | |
1757 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 1758 | |
a0b6b246 JX |
1759 | #: fetch-pack.c:844 |
1760 | msgid "Server does not support shallow clients" | |
1761 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 1762 | |
a0b6b246 JX |
1763 | #: fetch-pack.c:848 |
1764 | msgid "Server supports multi_ack_detailed" | |
1765 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 1766 | |
a0b6b246 JX |
1767 | #: fetch-pack.c:851 |
1768 | msgid "Server supports no-done" | |
1769 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 1770 | |
a0b6b246 JX |
1771 | #: fetch-pack.c:857 |
1772 | msgid "Server supports multi_ack" | |
1773 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 1774 | |
a0b6b246 JX |
1775 | #: fetch-pack.c:861 |
1776 | msgid "Server supports side-band-64k" | |
1777 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 1778 | |
a0b6b246 JX |
1779 | #: fetch-pack.c:865 |
1780 | msgid "Server supports side-band" | |
1781 | msgstr "服务器支持 side-band" | |
5c57d762 | 1782 | |
a0b6b246 JX |
1783 | #: fetch-pack.c:869 |
1784 | msgid "Server supports allow-tip-sha1-in-want" | |
1785 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 1786 | |
a0b6b246 JX |
1787 | #: fetch-pack.c:873 |
1788 | msgid "Server supports allow-reachable-sha1-in-want" | |
1789 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 1790 | |
a0b6b246 JX |
1791 | #: fetch-pack.c:883 |
1792 | msgid "Server supports ofs-delta" | |
1793 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 1794 | |
a0b6b246 | 1795 | #: fetch-pack.c:890 |
81809b99 | 1796 | #, c-format |
a0b6b246 JX |
1797 | msgid "Server version is %.*s" |
1798 | msgstr "服务器版本 %.*s" | |
8ada9598 | 1799 | |
a0b6b246 JX |
1800 | #: fetch-pack.c:896 |
1801 | msgid "Server does not support --shallow-since" | |
1802 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 1803 | |
a0b6b246 JX |
1804 | #: fetch-pack.c:900 |
1805 | msgid "Server does not support --shallow-exclude" | |
1806 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 1807 | |
a0b6b246 JX |
1808 | #: fetch-pack.c:902 |
1809 | msgid "Server does not support --deepen" | |
1810 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 1811 | |
a0b6b246 JX |
1812 | #: fetch-pack.c:913 |
1813 | msgid "no common commits" | |
1814 | msgstr "没有共同的提交" | |
c04f5ac3 | 1815 | |
a0b6b246 JX |
1816 | #: fetch-pack.c:925 |
1817 | msgid "git fetch-pack: fetch failed." | |
1818 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 1819 | |
a0b6b246 JX |
1820 | #: fetch-pack.c:1087 |
1821 | msgid "no matching remote head" | |
1822 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 1823 | |
a0b6b246 JX |
1824 | #: gpg-interface.c:185 |
1825 | msgid "gpg failed to sign the data" | |
1826 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 1827 | |
a0b6b246 JX |
1828 | #: gpg-interface.c:215 |
1829 | msgid "could not create temporary file" | |
1830 | msgstr "不能创建临时文件" | |
c04f5ac3 | 1831 | |
a0b6b246 | 1832 | #: gpg-interface.c:217 |
c04f5ac3 | 1833 | #, c-format |
a0b6b246 JX |
1834 | msgid "failed writing detached signature to '%s'" |
1835 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 1836 | |
a0b6b246 | 1837 | #: grep.c:1782 |
c04f5ac3 | 1838 | #, c-format |
a0b6b246 JX |
1839 | msgid "'%s': unable to read %s" |
1840 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 1841 | |
a0b6b246 | 1842 | #: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 |
c04f5ac3 | 1843 | #, c-format |
a0b6b246 JX |
1844 | msgid "failed to stat '%s'" |
1845 | msgstr "无法枚举 '%s' 状态" | |
c04f5ac3 | 1846 | |
a0b6b246 JX |
1847 | #: grep.c:1810 |
1848 | #, c-format | |
1849 | msgid "'%s': short read" | |
1850 | msgstr "'%s':读取不完整" | |
5c57d762 | 1851 | |
a0b6b246 JX |
1852 | #: help.c:203 |
1853 | #, c-format | |
1854 | msgid "available git commands in '%s'" | |
1855 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 1856 | |
a0b6b246 JX |
1857 | #: help.c:210 |
1858 | msgid "git commands available from elsewhere on your $PATH" | |
1859 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 1860 | |
a0b6b246 JX |
1861 | #: help.c:241 |
1862 | msgid "These are common Git commands used in various situations:" | |
1863 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 1864 | |
a0b6b246 | 1865 | #: help.c:306 |
c04f5ac3 | 1866 | #, c-format |
a0b6b246 JX |
1867 | msgid "" |
1868 | "'%s' appears to be a git command, but we were not\n" | |
1869 | "able to execute it. Maybe git-%s is broken?" | |
1870 | msgstr "" | |
1871 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
1872 | "可能是 git-%s 受损?" | |
c04f5ac3 | 1873 | |
a0b6b246 JX |
1874 | #: help.c:361 |
1875 | msgid "Uh oh. Your system reports no Git commands at all." | |
1876 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 1877 | |
a0b6b246 | 1878 | #: help.c:383 |
c04f5ac3 | 1879 | #, c-format |
a0b6b246 JX |
1880 | msgid "" |
1881 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
1882 | "Continuing under the assumption that you meant '%s'" | |
1883 | msgstr "" | |
1884 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" | |
1885 | "是 '%s'" | |
c04f5ac3 | 1886 | |
a0b6b246 | 1887 | #: help.c:388 |
c04f5ac3 | 1888 | #, c-format |
a0b6b246 JX |
1889 | msgid "in %0.1f seconds automatically..." |
1890 | msgstr "在 %0.1f 秒钟后自动运行..." | |
c04f5ac3 | 1891 | |
a0b6b246 | 1892 | #: help.c:395 |
c04f5ac3 | 1893 | #, c-format |
a0b6b246 JX |
1894 | msgid "git: '%s' is not a git command. See 'git --help'." |
1895 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 1896 | |
a0b6b246 JX |
1897 | #: help.c:399 help.c:465 |
1898 | msgid "" | |
1899 | "\n" | |
1900 | "Did you mean this?" | |
1901 | msgid_plural "" | |
1902 | "\n" | |
1903 | "Did you mean one of these?" | |
1904 | msgstr[0] "" | |
1905 | "\n" | |
1906 | "您指的是这个么?" | |
1907 | msgstr[1] "" | |
1908 | "\n" | |
1909 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 1910 | |
a0b6b246 | 1911 | #: help.c:461 |
c04f5ac3 | 1912 | #, c-format |
a0b6b246 JX |
1913 | msgid "%s: %s - %s" |
1914 | msgstr "%s:%s - %s" | |
1915 | ||
1916 | #: ident.c:334 | |
1917 | msgid "" | |
1918 | "\n" | |
1919 | "*** Please tell me who you are.\n" | |
1920 | "\n" | |
1921 | "Run\n" | |
1922 | "\n" | |
1923 | " git config --global user.email \"you@example.com\"\n" | |
1924 | " git config --global user.name \"Your Name\"\n" | |
1925 | "\n" | |
1926 | "to set your account's default identity.\n" | |
1927 | "Omit --global to set the identity only in this repository.\n" | |
1928 | "\n" | |
1929 | msgstr "" | |
1930 | "\n" | |
1931 | "*** 请告诉我你是谁。\n" | |
1932 | "\n" | |
1933 | "运行\n" | |
1934 | "\n" | |
1935 | " git config --global user.email \"you@example.com\"\n" | |
1936 | " git config --global user.name \"Your Name\"\n" | |
1937 | "\n" | |
1938 | "来设置您账号的缺省身份标识。\n" | |
1939 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 1940 | |
a0b6b246 | 1941 | #: lockfile.c:152 |
c04f5ac3 | 1942 | #, c-format |
a0b6b246 JX |
1943 | msgid "" |
1944 | "Unable to create '%s.lock': %s.\n" | |
1945 | "\n" | |
1946 | "Another git process seems to be running in this repository, e.g.\n" | |
1947 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
1948 | "are terminated then try again. If it still fails, a git process\n" | |
1949 | "may have crashed in this repository earlier:\n" | |
1950 | "remove the file manually to continue." | |
1951 | msgstr "" | |
1952 | "无法创建 '%s.lock':%s。\n" | |
1953 | "\n" | |
1954 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
1955 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
1956 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
1957 | "手动删除这个文件再继续。" | |
c04f5ac3 | 1958 | |
a0b6b246 JX |
1959 | #: lockfile.c:160 |
1960 | #, c-format | |
1961 | msgid "Unable to create '%s.lock': %s" | |
1962 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 1963 | |
a0b6b246 JX |
1964 | #: merge.c:41 |
1965 | msgid "failed to read the cache" | |
1966 | msgstr "无法读取缓存" | |
c04f5ac3 | 1967 | |
a0b6b246 JX |
1968 | #: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 |
1969 | #: builtin/checkout.c:588 builtin/clone.c:731 | |
1970 | msgid "unable to write new index file" | |
1971 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 1972 | |
a0b6b246 JX |
1973 | #: merge-recursive.c:209 |
1974 | msgid "(bad commit)\n" | |
1975 | msgstr "(坏提交)\n" | |
c04f5ac3 | 1976 | |
a0b6b246 JX |
1977 | #: merge-recursive.c:231 |
1978 | #, c-format | |
1979 | msgid "addinfo_cache failed for path '%s'" | |
1980 | msgstr "为路径 '%s' addinfo_cache 失败" | |
c04f5ac3 | 1981 | |
a0b6b246 JX |
1982 | #: merge-recursive.c:301 |
1983 | msgid "error building trees" | |
1984 | msgstr "无法创建树" | |
c04f5ac3 | 1985 | |
a0b6b246 | 1986 | #: merge-recursive.c:720 |
c04f5ac3 | 1987 | #, c-format |
a0b6b246 JX |
1988 | msgid "failed to create path '%s'%s" |
1989 | msgstr "无法创建路径 '%s'%s" | |
c04f5ac3 | 1990 | |
a0b6b246 | 1991 | #: merge-recursive.c:731 |
c04f5ac3 | 1992 | #, c-format |
a0b6b246 JX |
1993 | msgid "Removing %s to make room for subdirectory\n" |
1994 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 1995 | |
a0b6b246 JX |
1996 | #: merge-recursive.c:745 merge-recursive.c:764 |
1997 | msgid ": perhaps a D/F conflict?" | |
1998 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 1999 | |
a0b6b246 | 2000 | #: merge-recursive.c:754 |
c04f5ac3 | 2001 | #, c-format |
a0b6b246 JX |
2002 | msgid "refusing to lose untracked file at '%s'" |
2003 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2004 | |
a0b6b246 | 2005 | #: merge-recursive.c:796 builtin/cat-file.c:34 |
c04f5ac3 | 2006 | #, c-format |
a0b6b246 JX |
2007 | msgid "cannot read object %s '%s'" |
2008 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2009 | |
a0b6b246 | 2010 | #: merge-recursive.c:798 |
4dcdc3d8 | 2011 | #, c-format |
a0b6b246 JX |
2012 | msgid "blob expected for %s '%s'" |
2013 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 2014 | |
a0b6b246 | 2015 | #: merge-recursive.c:822 |
4dcdc3d8 | 2016 | #, c-format |
a0b6b246 JX |
2017 | msgid "failed to open '%s': %s" |
2018 | msgstr "无法打开 '%s':%s" | |
4dcdc3d8 | 2019 | |
a0b6b246 JX |
2020 | #: merge-recursive.c:833 |
2021 | #, c-format | |
2022 | msgid "failed to symlink '%s': %s" | |
2023 | msgstr "无法创建符号链接 '%s':%s" | |
c04f5ac3 | 2024 | |
a0b6b246 | 2025 | #: merge-recursive.c:838 |
5c57d762 | 2026 | #, c-format |
a0b6b246 JX |
2027 | msgid "do not know what to do with %06o %s '%s'" |
2028 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 2029 | |
a0b6b246 JX |
2030 | #: merge-recursive.c:978 |
2031 | msgid "Failed to execute internal merge" | |
2032 | msgstr "无法执行内部合并" | |
2033 | ||
2034 | #: merge-recursive.c:982 | |
5c57d762 | 2035 | #, c-format |
a0b6b246 JX |
2036 | msgid "Unable to add %s to database" |
2037 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 2038 | |
a0b6b246 | 2039 | #: merge-recursive.c:1081 merge-recursive.c:1095 |
5c57d762 JX |
2040 | #, c-format |
2041 | msgid "" | |
a0b6b246 JX |
2042 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
2043 | "in tree." | |
5c57d762 | 2044 | msgstr "" |
a0b6b246 JX |
2045 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" |
2046 | "的版本被保留。" | |
c04f5ac3 | 2047 | |
a0b6b246 | 2048 | #: merge-recursive.c:1087 merge-recursive.c:1100 |
7aea43ff | 2049 | #, c-format |
a0b6b246 JX |
2050 | msgid "" |
2051 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2052 | "in tree at %s." | |
2053 | msgstr "" | |
2054 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
2055 | "的版本保留于 %8$s 中。" | |
7aea43ff | 2056 | |
a0b6b246 JX |
2057 | #: merge-recursive.c:1143 |
2058 | msgid "rename" | |
2059 | msgstr "重命名" | |
5b04ee3b | 2060 | |
a0b6b246 JX |
2061 | #: merge-recursive.c:1143 |
2062 | msgid "renamed" | |
2063 | msgstr "重命名" | |
5b04ee3b | 2064 | |
a0b6b246 | 2065 | #: merge-recursive.c:1200 |
5c57d762 | 2066 | #, c-format |
a0b6b246 JX |
2067 | msgid "%s is a directory in %s adding as %s instead" |
2068 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 2069 | |
a0b6b246 | 2070 | #: merge-recursive.c:1225 |
5c57d762 JX |
2071 | #, c-format |
2072 | msgid "" | |
a0b6b246 JX |
2073 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
2074 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 2075 | msgstr "" |
a0b6b246 JX |
2076 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
2077 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 2078 | |
a0b6b246 JX |
2079 | #: merge-recursive.c:1230 |
2080 | msgid " (left unresolved)" | |
2081 | msgstr "(留下未解决)" | |
5c57d762 | 2082 | |
a0b6b246 | 2083 | #: merge-recursive.c:1292 |
5c57d762 | 2084 | #, c-format |
a0b6b246 | 2085 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 2086 | msgstr "" |
a0b6b246 JX |
2087 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
2088 | "%5$s" | |
3495628d | 2089 | |
a0b6b246 | 2090 | #: merge-recursive.c:1325 |
3495628d | 2091 | #, c-format |
a0b6b246 JX |
2092 | msgid "Renaming %s to %s and %s to %s instead" |
2093 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" | |
3495628d | 2094 | |
a0b6b246 | 2095 | #: merge-recursive.c:1531 |
3495628d | 2096 | #, c-format |
a0b6b246 JX |
2097 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
2098 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 2099 | |
a0b6b246 JX |
2100 | #: merge-recursive.c:1546 |
2101 | #, c-format | |
2102 | msgid "Adding merged %s" | |
2103 | msgstr "添加合并后的 %s" | |
90314792 | 2104 | |
a0b6b246 | 2105 | #: merge-recursive.c:1553 merge-recursive.c:1766 |
90314792 | 2106 | #, c-format |
a0b6b246 JX |
2107 | msgid "Adding as %s instead" |
2108 | msgstr "而是以 %s 为名添加" | |
90314792 | 2109 | |
a0b6b246 | 2110 | #: merge-recursive.c:1610 |
90314792 | 2111 | #, c-format |
a0b6b246 JX |
2112 | msgid "cannot read object %s" |
2113 | msgstr "不能读取对象 %s" | |
90314792 | 2114 | |
a0b6b246 | 2115 | #: merge-recursive.c:1613 |
90314792 | 2116 | #, c-format |
a0b6b246 JX |
2117 | msgid "object %s is not a blob" |
2118 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 2119 | |
a0b6b246 JX |
2120 | #: merge-recursive.c:1666 |
2121 | msgid "modify" | |
2122 | msgstr "修改" | |
90314792 | 2123 | |
a0b6b246 JX |
2124 | #: merge-recursive.c:1666 |
2125 | msgid "modified" | |
2126 | msgstr "修改" | |
5b04ee3b | 2127 | |
a0b6b246 JX |
2128 | #: merge-recursive.c:1676 |
2129 | msgid "content" | |
2130 | msgstr "内容" | |
5b04ee3b | 2131 | |
a0b6b246 JX |
2132 | #: merge-recursive.c:1683 |
2133 | msgid "add/add" | |
2134 | msgstr "添加/添加" | |
3495628d | 2135 | |
a0b6b246 | 2136 | #: merge-recursive.c:1718 |
220c313c | 2137 | #, c-format |
a0b6b246 JX |
2138 | msgid "Skipped %s (merged same as existing)" |
2139 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 2140 | |
a0b6b246 | 2141 | #: merge-recursive.c:1732 |
220c313c | 2142 | #, c-format |
a0b6b246 JX |
2143 | msgid "Auto-merging %s" |
2144 | msgstr "自动合并 %s" | |
220c313c | 2145 | |
a0b6b246 JX |
2146 | #: merge-recursive.c:1736 git-submodule.sh:924 |
2147 | msgid "submodule" | |
2148 | msgstr "子模组" | |
2149 | ||
2150 | #: merge-recursive.c:1737 | |
220c313c | 2151 | #, c-format |
a0b6b246 JX |
2152 | msgid "CONFLICT (%s): Merge conflict in %s" |
2153 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 2154 | |
a0b6b246 | 2155 | #: merge-recursive.c:1831 |
220c313c | 2156 | #, c-format |
a0b6b246 JX |
2157 | msgid "Removing %s" |
2158 | msgstr "删除 %s" | |
220c313c | 2159 | |
a0b6b246 JX |
2160 | #: merge-recursive.c:1857 |
2161 | msgid "file/directory" | |
2162 | msgstr "文件/目录" | |
220c313c | 2163 | |
a0b6b246 JX |
2164 | #: merge-recursive.c:1863 |
2165 | msgid "directory/file" | |
2166 | msgstr "目录/文件" | |
276ceeaa | 2167 | |
a0b6b246 | 2168 | #: merge-recursive.c:1868 |
276ceeaa | 2169 | #, c-format |
a0b6b246 JX |
2170 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
2171 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 2172 | |
a0b6b246 | 2173 | #: merge-recursive.c:1877 |
276ceeaa | 2174 | #, c-format |
a0b6b246 JX |
2175 | msgid "Adding %s" |
2176 | msgstr "添加 %s" | |
276ceeaa | 2177 | |
a0b6b246 JX |
2178 | #: merge-recursive.c:1914 |
2179 | msgid "Already up-to-date!" | |
2180 | msgstr "已经是最新的!" | |
276ceeaa | 2181 | |
a0b6b246 | 2182 | #: merge-recursive.c:1923 |
276ceeaa | 2183 | #, c-format |
a0b6b246 JX |
2184 | msgid "merging of trees %s and %s failed" |
2185 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 2186 | |
a0b6b246 JX |
2187 | #: merge-recursive.c:2006 |
2188 | msgid "Merging:" | |
2189 | msgstr "合并:" | |
5c57d762 | 2190 | |
a0b6b246 | 2191 | #: merge-recursive.c:2019 |
5c57d762 | 2192 | #, c-format |
a0b6b246 JX |
2193 | msgid "found %u common ancestor:" |
2194 | msgid_plural "found %u common ancestors:" | |
2195 | msgstr[0] "发现 %u 个共同祖先:" | |
2196 | msgstr[1] "发现 %u 个共同祖先:" | |
2197 | ||
2198 | #: merge-recursive.c:2058 | |
2199 | msgid "merge returned no commit" | |
2200 | msgstr "合并未返回提交" | |
2201 | ||
2202 | #: merge-recursive.c:2121 | |
5c57d762 | 2203 | #, c-format |
a0b6b246 JX |
2204 | msgid "Could not parse object '%s'" |
2205 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 2206 | |
a0b6b246 JX |
2207 | #: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 |
2208 | msgid "Unable to write index." | |
2209 | msgstr "不能写入索引。" | |
2210 | ||
2211 | #: notes-merge.c:273 | |
5c57d762 JX |
2212 | #, c-format |
2213 | msgid "" | |
a0b6b246 JX |
2214 | "You have not concluded your previous notes merge (%s exists).\n" |
2215 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
2216 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 2217 | msgstr "" |
a0b6b246 | 2218 | "您尚未结束您前一次注释合并(存在 %s)。\n" |
275588f9 JX |
2219 | "请您在开始一个新的注释合并之前,使用 'git notes merge --commit' 或者 'git " |
2220 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 2221 | |
a0b6b246 JX |
2222 | #: notes-merge.c:280 |
2223 | #, c-format | |
2224 | msgid "You have not concluded your notes merge (%s exists)." | |
2225 | msgstr "您尚未结束注释合并(存在 %s)。" | |
2226 | ||
2227 | #: notes-utils.c:41 | |
2228 | msgid "Cannot commit uninitialized/unreferenced notes tree" | |
2229 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 2230 | |
a0b6b246 | 2231 | #: notes-utils.c:100 |
1b7f4a34 | 2232 | #, c-format |
a0b6b246 JX |
2233 | msgid "Bad notes.rewriteMode value: '%s'" |
2234 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 2235 | |
a0b6b246 | 2236 | #: notes-utils.c:110 |
5b04ee3b | 2237 | #, c-format |
a0b6b246 JX |
2238 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
2239 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 2240 | |
a0b6b246 JX |
2241 | #. TRANSLATORS: The first %s is the name of the |
2242 | #. environment variable, the second %s is its value | |
2243 | #: notes-utils.c:137 | |
5b04ee3b | 2244 | #, c-format |
a0b6b246 JX |
2245 | msgid "Bad %s value: '%s'" |
2246 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 2247 | |
a0b6b246 | 2248 | #: object.c:242 |
5b04ee3b | 2249 | #, c-format |
a0b6b246 JX |
2250 | msgid "unable to parse object: %s" |
2251 | msgstr "不能解析对象:%s" | |
5b04ee3b | 2252 | |
a0b6b246 JX |
2253 | #: parse-options.c:572 |
2254 | msgid "..." | |
2255 | msgstr "..." | |
2256 | ||
2257 | #: parse-options.c:590 | |
5b04ee3b | 2258 | #, c-format |
a0b6b246 JX |
2259 | msgid "usage: %s" |
2260 | msgstr "用法:%s" | |
5b04ee3b | 2261 | |
a0b6b246 JX |
2262 | #. TRANSLATORS: the colon here should align with the |
2263 | #. one in "usage: %s" translation | |
2264 | #: parse-options.c:594 | |
5b04ee3b | 2265 | #, c-format |
a0b6b246 JX |
2266 | msgid " or: %s" |
2267 | msgstr " 或:%s" | |
5b04ee3b | 2268 | |
a0b6b246 JX |
2269 | # 译者:为保证在输出中对齐,注意调整句中空格! |
2270 | #: parse-options.c:597 | |
5b04ee3b | 2271 | #, c-format |
a0b6b246 JX |
2272 | msgid " %s" |
2273 | msgstr " %s" | |
5b04ee3b | 2274 | |
a0b6b246 JX |
2275 | #: parse-options.c:631 |
2276 | msgid "-NUM" | |
2277 | msgstr "-数字" | |
2278 | ||
2279 | #: parse-options-cb.c:108 | |
5b04ee3b | 2280 | #, c-format |
a0b6b246 JX |
2281 | msgid "malformed object name '%s'" |
2282 | msgstr "非法的对象名 '%s'" | |
5b04ee3b | 2283 | |
a0b6b246 | 2284 | #: path.c:826 |
5b04ee3b | 2285 | #, c-format |
a0b6b246 JX |
2286 | msgid "Could not make %s writable by group" |
2287 | msgstr "不能设置 %s 为组可写" | |
2288 | ||
2289 | #: pathspec.c:133 | |
2290 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" | |
2291 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
2292 | ||
2293 | #: pathspec.c:143 | |
5b04ee3b | 2294 | msgid "" |
a0b6b246 JX |
2295 | "global 'literal' pathspec setting is incompatible with all other global " |
2296 | "pathspec settings" | |
2297 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 2298 | |
a0b6b246 JX |
2299 | #: pathspec.c:177 |
2300 | msgid "invalid parameter for pathspec magic 'prefix'" | |
2301 | msgstr "路径规格包含无效的神奇前缀" | |
2302 | ||
2303 | #: pathspec.c:183 | |
5b04ee3b | 2304 | #, c-format |
a0b6b246 JX |
2305 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
2306 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 2307 | |
a0b6b246 | 2308 | #: pathspec.c:187 |
5b04ee3b | 2309 | #, c-format |
a0b6b246 JX |
2310 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
2311 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 2312 | |
a0b6b246 | 2313 | #: pathspec.c:205 |
5b04ee3b | 2314 | #, c-format |
a0b6b246 JX |
2315 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
2316 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 2317 | |
a0b6b246 | 2318 | #: pathspec.c:230 |
5b04ee3b | 2319 | #, c-format |
a0b6b246 JX |
2320 | msgid "%s: 'literal' and 'glob' are incompatible" |
2321 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 2322 | |
a0b6b246 | 2323 | #: pathspec.c:241 |
5b04ee3b | 2324 | #, c-format |
a0b6b246 JX |
2325 | msgid "%s: '%s' is outside repository" |
2326 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 2327 | |
a0b6b246 | 2328 | #: pathspec.c:291 |
5b04ee3b | 2329 | #, c-format |
a0b6b246 JX |
2330 | msgid "Pathspec '%s' is in submodule '%.*s'" |
2331 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
5b04ee3b | 2332 | |
a0b6b246 | 2333 | #: pathspec.c:353 |
5b04ee3b | 2334 | #, c-format |
a0b6b246 JX |
2335 | msgid "%s: pathspec magic not supported by this command: %s" |
2336 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
2337 | ||
2338 | #: pathspec.c:408 | |
5b04ee3b | 2339 | msgid "" |
a0b6b246 JX |
2340 | "empty strings as pathspecs will be made invalid in upcoming releases. please " |
2341 | "use . instead if you meant to match all paths" | |
5b04ee3b | 2342 | msgstr "" |
a0b6b246 JX |
2343 | "在即将到来的版本,不能再使用空字符串作为路径表达式。如果要匹配所有路径,\n" |
2344 | "请代之以 ." | |
5b04ee3b | 2345 | |
a0b6b246 | 2346 | #: pathspec.c:440 |
5b04ee3b | 2347 | #, c-format |
a0b6b246 JX |
2348 | msgid "pathspec '%s' is beyond a symbolic link" |
2349 | msgstr "路径规格 '%s' 位于符号链接中" | |
2350 | ||
2351 | #: pathspec.c:449 | |
5b04ee3b | 2352 | msgid "" |
a0b6b246 JX |
2353 | "There is nothing to exclude from by :(exclude) patterns.\n" |
2354 | "Perhaps you forgot to add either ':/' or '.' ?" | |
5b04ee3b | 2355 | msgstr "" |
a0b6b246 JX |
2356 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" |
2357 | "添加 ':/' 或 '.' ?" | |
5b04ee3b | 2358 | |
a0b6b246 JX |
2359 | #: pretty.c:971 |
2360 | msgid "unable to parse --pretty format" | |
2361 | msgstr "不能解析 --pretty 格式" | |
2362 | ||
2363 | #: read-cache.c:1315 | |
5b04ee3b JX |
2364 | #, c-format |
2365 | msgid "" | |
a0b6b246 JX |
2366 | "index.version set, but the value is invalid.\n" |
2367 | "Using version %i" | |
5b04ee3b | 2368 | msgstr "" |
a0b6b246 JX |
2369 | "设置了 index.version,但是取值无效。\n" |
2370 | "使用版本 %i" | |
5b04ee3b | 2371 | |
a0b6b246 | 2372 | #: read-cache.c:1325 |
5b04ee3b JX |
2373 | #, c-format |
2374 | msgid "" | |
a0b6b246 JX |
2375 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
2376 | "Using version %i" | |
5b04ee3b | 2377 | msgstr "" |
a0b6b246 JX |
2378 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
2379 | "使用版本 %i" | |
5b04ee3b | 2380 | |
a0b6b246 | 2381 | #: refs.c:576 builtin/merge.c:840 |
5b04ee3b | 2382 | #, c-format |
a0b6b246 JX |
2383 | msgid "Could not open '%s' for writing" |
2384 | msgstr "无法打开 '%s' 进行写入" | |
5b04ee3b | 2385 | |
a0b6b246 | 2386 | #: refs/files-backend.c:2481 |
5b04ee3b | 2387 | #, c-format |
a0b6b246 JX |
2388 | msgid "could not delete reference %s: %s" |
2389 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 2390 | |
a0b6b246 | 2391 | #: refs/files-backend.c:2484 |
5b04ee3b | 2392 | #, c-format |
a0b6b246 JX |
2393 | msgid "could not delete references: %s" |
2394 | msgstr "无法删除引用:%s" | |
5b04ee3b | 2395 | |
a0b6b246 | 2396 | #: refs/files-backend.c:2493 |
5b04ee3b | 2397 | #, c-format |
a0b6b246 JX |
2398 | msgid "could not remove reference %s" |
2399 | msgstr "无法删除引用 %s" | |
5b04ee3b | 2400 | |
a0b6b246 | 2401 | #: ref-filter.c:55 |
5b04ee3b | 2402 | #, c-format |
a0b6b246 JX |
2403 | msgid "expected format: %%(color:<color>)" |
2404 | msgstr "期望的格式:%%(color:<color>)" | |
5b04ee3b | 2405 | |
a0b6b246 | 2406 | #: ref-filter.c:57 |
5b04ee3b | 2407 | #, c-format |
a0b6b246 JX |
2408 | msgid "unrecognized color: %%(color:%s)" |
2409 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 2410 | |
a0b6b246 JX |
2411 | #: ref-filter.c:71 |
2412 | #, c-format | |
2413 | msgid "unrecognized format: %%(%s)" | |
2414 | msgstr "未能识别的格式:%%(%s)" | |
90314792 | 2415 | |
a0b6b246 | 2416 | #: ref-filter.c:77 |
90314792 | 2417 | #, c-format |
a0b6b246 JX |
2418 | msgid "%%(body) does not take arguments" |
2419 | msgstr "%%(body) 不带参数" | |
90314792 | 2420 | |
a0b6b246 JX |
2421 | #: ref-filter.c:84 |
2422 | #, c-format | |
2423 | msgid "%%(subject) does not take arguments" | |
2424 | msgstr "%%(subject) 不带参数" | |
90314792 | 2425 | |
a0b6b246 JX |
2426 | #: ref-filter.c:101 |
2427 | #, c-format | |
2428 | msgid "positive value expected contents:lines=%s" | |
2429 | msgstr "要为 contents:lines=%s 提供一个正数" | |
90314792 | 2430 | |
a0b6b246 JX |
2431 | #: ref-filter.c:103 |
2432 | #, c-format | |
2433 | msgid "unrecognized %%(contents) argument: %s" | |
2434 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 2435 | |
a0b6b246 JX |
2436 | #: ref-filter.c:113 |
2437 | #, c-format | |
2438 | msgid "unrecognized %%(objectname) argument: %s" | |
2439 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 2440 | |
a0b6b246 JX |
2441 | #: ref-filter.c:135 |
2442 | #, c-format | |
2443 | msgid "expected format: %%(align:<width>,<position>)" | |
2444 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
90314792 | 2445 | |
a0b6b246 | 2446 | #: ref-filter.c:147 |
5c57d762 | 2447 | #, c-format |
a0b6b246 JX |
2448 | msgid "unrecognized position:%s" |
2449 | msgstr "未能识别的位置:%s" | |
5c57d762 | 2450 | |
a0b6b246 | 2451 | #: ref-filter.c:151 |
1b7f4a34 | 2452 | #, c-format |
a0b6b246 JX |
2453 | msgid "unrecognized width:%s" |
2454 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 2455 | |
a0b6b246 | 2456 | #: ref-filter.c:157 |
1b7f4a34 | 2457 | #, c-format |
a0b6b246 JX |
2458 | msgid "unrecognized %%(align) argument: %s" |
2459 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 2460 | |
a0b6b246 | 2461 | #: ref-filter.c:161 |
1b7f4a34 | 2462 | #, c-format |
a0b6b246 JX |
2463 | msgid "positive width expected with the %%(align) atom" |
2464 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 2465 | |
a0b6b246 | 2466 | #: ref-filter.c:244 |
07432cef | 2467 | #, c-format |
a0b6b246 JX |
2468 | msgid "malformed field name: %.*s" |
2469 | msgstr "非法的字段名:%.*s" | |
ef317cd5 | 2470 | |
a0b6b246 JX |
2471 | #: ref-filter.c:270 |
2472 | #, c-format | |
2473 | msgid "unknown field name: %.*s" | |
2474 | msgstr "未知的字段名:%.*s" | |
220c313c | 2475 | |
a0b6b246 | 2476 | #: ref-filter.c:372 |
7aea43ff | 2477 | #, c-format |
a0b6b246 JX |
2478 | msgid "format: %%(end) atom used without corresponding atom" |
2479 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 2480 | |
a0b6b246 | 2481 | #: ref-filter.c:424 |
7aea43ff | 2482 | #, c-format |
a0b6b246 JX |
2483 | msgid "malformed format string %s" |
2484 | msgstr "非法的格式化字符串 %s" | |
7aea43ff | 2485 | |
a0b6b246 JX |
2486 | #: ref-filter.c:878 |
2487 | msgid ":strip= requires a positive integer argument" | |
2488 | msgstr ":strip= 需要一个正整型参数" | |
c04f5ac3 | 2489 | |
a0b6b246 | 2490 | #: ref-filter.c:883 |
c04f5ac3 | 2491 | #, c-format |
a0b6b246 JX |
2492 | msgid "ref '%s' does not have %ld components to :strip" |
2493 | msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" | |
c04f5ac3 | 2494 | |
a0b6b246 JX |
2495 | #: ref-filter.c:1046 |
2496 | #, c-format | |
2497 | msgid "unknown %.*s format %s" | |
2498 | msgstr "未知的 %.*s 格式 %s" | |
6792b93b | 2499 | |
a0b6b246 JX |
2500 | #: ref-filter.c:1066 ref-filter.c:1097 |
2501 | #, c-format | |
2502 | msgid "missing object %s for %s" | |
2503 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 2504 | |
a0b6b246 JX |
2505 | #: ref-filter.c:1069 ref-filter.c:1100 |
2506 | #, c-format | |
2507 | msgid "parse_object_buffer failed on %s for %s" | |
2508 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 2509 | |
a0b6b246 JX |
2510 | #: ref-filter.c:1311 |
2511 | #, c-format | |
2512 | msgid "malformed object at '%s'" | |
2513 | msgstr "非法的对象于 '%s'" | |
c04f5ac3 | 2514 | |
a0b6b246 JX |
2515 | #: ref-filter.c:1373 |
2516 | #, c-format | |
2517 | msgid "ignoring ref with broken name %s" | |
2518 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 2519 | |
a0b6b246 JX |
2520 | #: ref-filter.c:1378 |
2521 | #, c-format | |
2522 | msgid "ignoring broken ref %s" | |
2523 | msgstr "忽略损坏的引用 %s" | |
c04f5ac3 | 2524 | |
a0b6b246 JX |
2525 | #: ref-filter.c:1633 |
2526 | #, c-format | |
2527 | msgid "format: %%(end) atom missing" | |
2528 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 2529 | |
a0b6b246 JX |
2530 | #: ref-filter.c:1687 |
2531 | #, c-format | |
2532 | msgid "malformed object name %s" | |
2533 | msgstr "非法的对象名 %s" | |
c04f5ac3 | 2534 | |
a0b6b246 JX |
2535 | #: remote.c:746 |
2536 | #, c-format | |
2537 | msgid "Cannot fetch both %s and %s to %s" | |
2538 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 2539 | |
a0b6b246 | 2540 | #: remote.c:750 |
c04f5ac3 | 2541 | #, c-format |
a0b6b246 JX |
2542 | msgid "%s usually tracks %s, not %s" |
2543 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 2544 | |
a0b6b246 JX |
2545 | #: remote.c:754 |
2546 | #, c-format | |
2547 | msgid "%s tracks both %s and %s" | |
2548 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 2549 | |
a0b6b246 JX |
2550 | #: remote.c:762 |
2551 | msgid "Internal error" | |
2552 | msgstr "内部错误" | |
c04f5ac3 | 2553 | |
a0b6b246 JX |
2554 | #: remote.c:1677 remote.c:1720 |
2555 | msgid "HEAD does not point to a branch" | |
2556 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 2557 | |
a0b6b246 JX |
2558 | #: remote.c:1686 |
2559 | #, c-format | |
2560 | msgid "no such branch: '%s'" | |
2561 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 2562 | |
a0b6b246 JX |
2563 | #: remote.c:1689 |
2564 | #, c-format | |
2565 | msgid "no upstream configured for branch '%s'" | |
2566 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 2567 | |
a0b6b246 JX |
2568 | #: remote.c:1695 |
2569 | #, c-format | |
2570 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
2571 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 2572 | |
a0b6b246 JX |
2573 | #: remote.c:1710 |
2574 | #, c-format | |
2575 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
2576 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 2577 | |
a0b6b246 JX |
2578 | #: remote.c:1725 |
2579 | #, c-format | |
2580 | msgid "branch '%s' has no remote for pushing" | |
2581 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 2582 | |
a0b6b246 JX |
2583 | #: remote.c:1736 |
2584 | #, c-format | |
2585 | msgid "push refspecs for '%s' do not include '%s'" | |
2586 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 2587 | |
a0b6b246 JX |
2588 | #: remote.c:1749 |
2589 | msgid "push has no destination (push.default is 'nothing')" | |
2590 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 2591 | |
a0b6b246 JX |
2592 | #: remote.c:1771 |
2593 | msgid "cannot resolve 'simple' push to a single destination" | |
2594 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 2595 | |
a0b6b246 JX |
2596 | #: remote.c:2073 |
2597 | #, c-format | |
2598 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
2599 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 2600 | |
a0b6b246 JX |
2601 | #: remote.c:2077 |
2602 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" | |
2603 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 2604 | |
a0b6b246 JX |
2605 | #: remote.c:2080 |
2606 | #, c-format | |
2607 | msgid "Your branch is up-to-date with '%s'.\n" | |
2608 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
cfff71a9 | 2609 | |
a0b6b246 JX |
2610 | #: remote.c:2084 |
2611 | #, c-format | |
2612 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
2613 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
2614 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
2615 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 2616 | |
a0b6b246 JX |
2617 | #: remote.c:2090 |
2618 | msgid " (use \"git push\" to publish your local commits)\n" | |
2619 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 2620 | |
a0b6b246 JX |
2621 | #: remote.c:2093 |
2622 | #, c-format | |
2623 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
2624 | msgid_plural "" | |
2625 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
2626 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
2627 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 2628 | |
a0b6b246 JX |
2629 | # 译者:注意保持前导空格 |
2630 | #: remote.c:2101 | |
2631 | msgid " (use \"git pull\" to update your local branch)\n" | |
2632 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 2633 | |
a0b6b246 JX |
2634 | #: remote.c:2104 |
2635 | #, c-format | |
2636 | msgid "" | |
2637 | "Your branch and '%s' have diverged,\n" | |
2638 | "and have %d and %d different commit each, respectively.\n" | |
2639 | msgid_plural "" | |
2640 | "Your branch and '%s' have diverged,\n" | |
2641 | "and have %d and %d different commits each, respectively.\n" | |
2642 | msgstr[0] "" | |
2643 | "您的分支和 '%s' 出现了偏离,\n" | |
2644 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
2645 | msgstr[1] "" | |
2646 | "您的分支和 '%s' 出现了偏离,\n" | |
2647 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 2648 | |
a0b6b246 JX |
2649 | # 译者:注意保持前导空格 |
2650 | #: remote.c:2114 | |
2651 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" | |
2652 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 2653 | |
a0b6b246 JX |
2654 | #: revision.c:2158 |
2655 | msgid "your current branch appears to be broken" | |
2656 | msgstr "您的当前分支好像被损坏" | |
cfff71a9 | 2657 | |
a0b6b246 JX |
2658 | #: revision.c:2161 |
2659 | #, c-format | |
2660 | msgid "your current branch '%s' does not have any commits yet" | |
2661 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6792b93b | 2662 | |
a0b6b246 JX |
2663 | #: revision.c:2355 |
2664 | msgid "--first-parent is incompatible with --bisect" | |
2665 | msgstr "--first-parent 与 --bisect 不兼容" | |
6792b93b | 2666 | |
a0b6b246 JX |
2667 | #: run-command.c:106 |
2668 | msgid "open /dev/null failed" | |
2669 | msgstr "不能打开 /dev/null" | |
5c57d762 | 2670 | |
a0b6b246 JX |
2671 | #: run-command.c:108 |
2672 | #, c-format | |
2673 | msgid "dup2(%d,%d) failed" | |
2674 | msgstr "不能调用 dup2(%d,%d)" | |
6792b93b | 2675 | |
a0b6b246 JX |
2676 | #: send-pack.c:297 |
2677 | msgid "failed to sign the push certificate" | |
2678 | msgstr "无法为推送证书签名" | |
6792b93b | 2679 | |
a0b6b246 JX |
2680 | #: send-pack.c:410 |
2681 | msgid "the receiving end does not support --signed push" | |
2682 | msgstr "接收端不支持签名推送" | |
6792b93b | 2683 | |
a0b6b246 JX |
2684 | #: send-pack.c:412 |
2685 | msgid "" | |
2686 | "not sending a push certificate since the receiving end does not support --" | |
2687 | "signed push" | |
2688 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 2689 | |
a0b6b246 JX |
2690 | #: send-pack.c:424 |
2691 | msgid "the receiving end does not support --atomic push" | |
2692 | msgstr "接收端不支持原子推送" | |
6792b93b | 2693 | |
a0b6b246 JX |
2694 | #: send-pack.c:429 |
2695 | msgid "the receiving end does not support push options" | |
2696 | msgstr "接收端不支持推送选项" | |
6792b93b | 2697 | |
a0b6b246 JX |
2698 | #: sequencer.c:171 |
2699 | msgid "revert" | |
2700 | msgstr "还原" | |
6792b93b | 2701 | |
a0b6b246 JX |
2702 | #: sequencer.c:171 |
2703 | msgid "cherry-pick" | |
2704 | msgstr "拣选" | |
2705 | ||
2706 | #: sequencer.c:228 | |
2707 | msgid "" | |
2708 | "after resolving the conflicts, mark the corrected paths\n" | |
2709 | "with 'git add <paths>' or 'git rm <paths>'" | |
2710 | msgstr "" | |
2711 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
2712 | "命令标记修正后的文件" | |
2713 | ||
2714 | #: sequencer.c:231 | |
2715 | msgid "" | |
2716 | "after resolving the conflicts, mark the corrected paths\n" | |
2717 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
2718 | "and commit the result with 'git commit'" | |
2719 | msgstr "" | |
2720 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
2721 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 2722 | |
a0b6b246 | 2723 | #: sequencer.c:244 sequencer.c:1209 |
1b7f4a34 | 2724 | #, c-format |
a0b6b246 JX |
2725 | msgid "could not lock '%s'" |
2726 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 2727 | |
a0b6b246 | 2728 | #: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 |
1b7f4a34 | 2729 | #, c-format |
a0b6b246 JX |
2730 | msgid "could not write to '%s'" |
2731 | msgstr "不能写入 '%s'" | |
1b7f4a34 | 2732 | |
a0b6b246 JX |
2733 | #: sequencer.c:251 |
2734 | #, c-format | |
2735 | msgid "could not write eol to '%s" | |
2736 | msgstr "不能将换行符写入 '%s'" | |
1b7f4a34 | 2737 | |
a0b6b246 | 2738 | #: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 |
1b7f4a34 | 2739 | #, c-format |
a0b6b246 JX |
2740 | msgid "failed to finalize '%s'." |
2741 | msgstr "无法完成 '%s'。" | |
1b7f4a34 | 2742 | |
a0b6b246 JX |
2743 | #: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 |
2744 | #, c-format | |
2745 | msgid "could not read '%s'" | |
2746 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 2747 | |
a0b6b246 | 2748 | #: sequencer.c:305 |
63af42fe | 2749 | #, c-format |
a0b6b246 JX |
2750 | msgid "your local changes would be overwritten by %s." |
2751 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 2752 | |
a0b6b246 JX |
2753 | #: sequencer.c:309 |
2754 | msgid "commit your changes or stash them to proceed." | |
2755 | msgstr "提交您的修改或保存进度后再继续。" | |
6792b93b | 2756 | |
a0b6b246 JX |
2757 | #: sequencer.c:324 |
2758 | #, c-format | |
2759 | msgid "%s: fast-forward" | |
2760 | msgstr "%s:快进" | |
6792b93b | 2761 | |
a0b6b246 JX |
2762 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" |
2763 | #: sequencer.c:399 | |
2764 | #, c-format | |
2765 | msgid "%s: Unable to write new index file" | |
2766 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 2767 | |
a0b6b246 JX |
2768 | #: sequencer.c:418 |
2769 | msgid "could not resolve HEAD commit\n" | |
2770 | msgstr "不能解析 HEAD 提交\n" | |
6792b93b | 2771 | |
a0b6b246 JX |
2772 | #: sequencer.c:438 |
2773 | msgid "unable to update cache tree\n" | |
2774 | msgstr "不能更新缓存\n" | |
6792b93b | 2775 | |
a0b6b246 | 2776 | #: sequencer.c:483 |
63af42fe JX |
2777 | #, c-format |
2778 | msgid "" | |
a0b6b246 JX |
2779 | "you have staged changes in your working tree\n" |
2780 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
2781 | "\n" | |
2782 | " git commit --amend %s\n" | |
2783 | "\n" | |
2784 | "If they are meant to go into a new commit, run:\n" | |
2785 | "\n" | |
2786 | " git commit %s\n" | |
2787 | "\n" | |
2788 | "In both cases, once you're done, continue with:\n" | |
2789 | "\n" | |
2790 | " git rebase --continue\n" | |
2791 | msgstr "" | |
2792 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
2793 | "\n" | |
2794 | " git commit --amend %s\n" | |
2795 | "\n" | |
2796 | "如果这些变更要形成一个新提交,执行:\n" | |
2797 | "\n" | |
2798 | " git commit %s\n" | |
2799 | "\n" | |
2800 | "无论哪种情况,当您完成提交,继续执行:\n" | |
2801 | "\n" | |
2802 | " git rebase --continue\n" | |
6792b93b | 2803 | |
a0b6b246 JX |
2804 | #: sequencer.c:567 |
2805 | #, c-format | |
2806 | msgid "could not parse commit %s\n" | |
2807 | msgstr "不能解析提交 %s\n" | |
6792b93b | 2808 | |
a0b6b246 | 2809 | #: sequencer.c:572 |
63af42fe | 2810 | #, c-format |
a0b6b246 JX |
2811 | msgid "could not parse parent commit %s\n" |
2812 | msgstr "不能解析父提交 %s\n" | |
63af42fe | 2813 | |
a0b6b246 JX |
2814 | #: sequencer.c:656 |
2815 | msgid "your index file is unmerged." | |
2816 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 2817 | |
a0b6b246 JX |
2818 | #: sequencer.c:675 |
2819 | #, c-format | |
2820 | msgid "commit %s is a merge but no -m option was given." | |
2821 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 2822 | |
a0b6b246 JX |
2823 | #: sequencer.c:683 |
2824 | #, c-format | |
2825 | msgid "commit %s does not have parent %d" | |
2826 | msgstr "提交 %s 没有第 %d 个父提交" | |
2827 | ||
2828 | #: sequencer.c:687 | |
2829 | #, c-format | |
2830 | msgid "mainline was specified but commit %s is not a merge." | |
2831 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
2832 | ||
2833 | #. TRANSLATORS: The first %s will be a "todo" command like | |
2834 | #. "revert" or "pick", the second %s a SHA1. | |
2835 | #: sequencer.c:700 | |
2836 | #, c-format | |
2837 | msgid "%s: cannot parse parent commit %s" | |
2838 | msgstr "%s:不能解析父提交 %s" | |
2839 | ||
2840 | #: sequencer.c:705 | |
2841 | #, c-format | |
2842 | msgid "cannot get commit message for %s" | |
2843 | msgstr "不能得到 %s 的提交说明" | |
2844 | ||
2845 | #: sequencer.c:797 | |
2846 | #, c-format | |
2847 | msgid "could not revert %s... %s" | |
2848 | msgstr "不能还原 %s... %s" | |
2849 | ||
2850 | #: sequencer.c:798 | |
2851 | #, c-format | |
2852 | msgid "could not apply %s... %s" | |
2853 | msgstr "不能应用 %s... %s" | |
2854 | ||
2855 | #: sequencer.c:833 | |
2856 | msgid "empty commit set passed" | |
2857 | msgstr "提供了空的提交集" | |
2858 | ||
2859 | #: sequencer.c:843 | |
2860 | #, c-format | |
2861 | msgid "git %s: failed to read the index" | |
2862 | msgstr "git %s:无法读取索引" | |
2863 | ||
2864 | #: sequencer.c:850 | |
2865 | #, c-format | |
2866 | msgid "git %s: failed to refresh the index" | |
2867 | msgstr "git %s:无法刷新索引" | |
2868 | ||
2869 | #: sequencer.c:944 | |
2870 | #, c-format | |
2871 | msgid "invalid line %d: %.*s" | |
2872 | msgstr "无效行 %d:%.*s" | |
2873 | ||
2874 | #: sequencer.c:950 | |
2875 | msgid "no commits parsed." | |
2876 | msgstr "没有解析提交。" | |
2877 | ||
2878 | #: sequencer.c:966 | |
2879 | #, c-format | |
2880 | msgid "could not read '%s'." | |
2881 | msgstr "不能读取 '%s'。" | |
2882 | ||
2883 | #: sequencer.c:972 | |
2884 | #, c-format | |
2885 | msgid "unusable instruction sheet: '%s'" | |
2886 | msgstr "无用的指令清单:'%s'" | |
2887 | ||
2888 | #: sequencer.c:983 | |
2889 | msgid "cannot cherry-pick during a revert." | |
2890 | msgstr "不能在回退中执行拣选。" | |
2891 | ||
2892 | #: sequencer.c:985 | |
2893 | msgid "cannot revert during a cherry-pick." | |
2894 | msgstr "不能在拣选中执行回退。" | |
2895 | ||
2896 | #: sequencer.c:1028 | |
2897 | #, c-format | |
2898 | msgid "invalid key: %s" | |
2899 | msgstr "无效键名:%s" | |
2900 | ||
2901 | #: sequencer.c:1031 | |
2902 | #, c-format | |
2903 | msgid "invalid value for %s: %s" | |
2904 | msgstr "%s 的值无效:%s" | |
2905 | ||
2906 | #: sequencer.c:1063 | |
2907 | #, c-format | |
2908 | msgid "malformed options sheet: '%s'" | |
2909 | msgstr "非法的选项清单:'%s'" | |
2910 | ||
2911 | #: sequencer.c:1101 | |
2912 | msgid "a cherry-pick or revert is already in progress" | |
2913 | msgstr "一个拣选或还原操作已在进行" | |
2914 | ||
2915 | #: sequencer.c:1102 | |
2916 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" | |
2917 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
2918 | ||
2919 | #: sequencer.c:1106 | |
2920 | #, c-format | |
2921 | msgid "could not create sequencer directory '%s'" | |
2922 | msgstr "不能创建序列目录 '%s'" | |
2923 | ||
2924 | #: sequencer.c:1120 | |
2925 | msgid "could not lock HEAD" | |
2926 | msgstr "不能锁定 HEAD" | |
2927 | ||
2928 | #: sequencer.c:1151 sequencer.c:1289 | |
2929 | msgid "no cherry-pick or revert in progress" | |
2930 | msgstr "拣选或还原操作并未进行" | |
2931 | ||
2932 | #: sequencer.c:1153 | |
2933 | msgid "cannot resolve HEAD" | |
2934 | msgstr "不能解析 HEAD" | |
2935 | ||
2936 | #: sequencer.c:1155 sequencer.c:1189 | |
2937 | msgid "cannot abort from a branch yet to be born" | |
2938 | msgstr "不能从尚未建立的分支终止" | |
2939 | ||
2940 | #: sequencer.c:1175 builtin/grep.c:578 | |
2941 | #, c-format | |
2942 | msgid "cannot open '%s'" | |
2943 | msgstr "不能打开 '%s'" | |
2944 | ||
2945 | #: sequencer.c:1177 | |
2946 | #, c-format | |
2947 | msgid "cannot read '%s': %s" | |
2948 | msgstr "不能读取 '%s':%s" | |
2949 | ||
2950 | #: sequencer.c:1178 | |
2951 | msgid "unexpected end of file" | |
2952 | msgstr "意外的文件结束" | |
2953 | ||
2954 | #: sequencer.c:1184 | |
2955 | #, c-format | |
2956 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
2957 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
2958 | ||
2959 | #: sequencer.c:1354 | |
2960 | #, c-format | |
2961 | msgid "%s: can't cherry-pick a %s" | |
2962 | msgstr "%s:不能拣选一个%s" | |
2963 | ||
2964 | #: sequencer.c:1358 | |
2965 | #, c-format | |
2966 | msgid "%s: bad revision" | |
2967 | msgstr "%s:错误的版本" | |
2968 | ||
2969 | #: sequencer.c:1391 | |
2970 | msgid "can't revert as initial commit" | |
2971 | msgstr "不能作为初始提交回退" | |
2972 | ||
2973 | #: setup.c:160 | |
2974 | #, c-format | |
6792b93b | 2975 | msgid "" |
a0b6b246 JX |
2976 | "%s: no such path in the working tree.\n" |
2977 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
2978 | msgstr "" | |
2979 | "%s:工作区中无此路径。\n" | |
2980 | "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" | |
6792b93b | 2981 | |
a0b6b246 | 2982 | #: setup.c:173 |
90314792 | 2983 | #, c-format |
a0b6b246 JX |
2984 | msgid "" |
2985 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
2986 | "Use '--' to separate paths from revisions, like this:\n" | |
2987 | "'git <command> [<revision>...] -- [<file>...]'" | |
2988 | msgstr "" | |
2989 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
2990 | "使用 '--' 来分隔版本和路径,例如:\n" | |
2991 | "'git <command> [<revision>...] -- [<file>...]'" | |
6792b93b | 2992 | |
a0b6b246 JX |
2993 | #: setup.c:223 |
2994 | #, c-format | |
2995 | msgid "" | |
2996 | "ambiguous argument '%s': both revision and filename\n" | |
2997 | "Use '--' to separate paths from revisions, like this:\n" | |
2998 | "'git <command> [<revision>...] -- [<file>...]'" | |
2999 | msgstr "" | |
3000 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
3001 | "使用 '--' 来分隔版本和路径,例如:\n" | |
3002 | "'git <command> [<revision>...] -- [<file>...]'" | |
2e8451e8 | 3003 | |
a0b6b246 JX |
3004 | #: setup.c:468 |
3005 | #, c-format | |
3006 | msgid "Expected git repo version <= %d, found %d" | |
3007 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 3008 | |
a0b6b246 JX |
3009 | #: setup.c:476 |
3010 | msgid "unknown repository extensions found:" | |
3011 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 3012 | |
a0b6b246 | 3013 | #: setup.c:762 |
1003b3a5 | 3014 | #, c-format |
a0b6b246 JX |
3015 | msgid "Not a git repository (or any of the parent directories): %s" |
3016 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
1003b3a5 | 3017 | |
a0b6b246 JX |
3018 | #: setup.c:764 setup.c:915 builtin/index-pack.c:1641 |
3019 | msgid "Cannot come back to cwd" | |
3020 | msgstr "无法返回当前工作目录" | |
1003b3a5 | 3021 | |
a0b6b246 JX |
3022 | #: setup.c:845 |
3023 | msgid "Unable to read current working directory" | |
3024 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 3025 | |
a0b6b246 JX |
3026 | #: setup.c:920 |
3027 | #, c-format | |
3028 | msgid "" | |
3029 | "Not a git repository (or any parent up to mount point %s)\n" | |
3030 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." | |
3031 | msgstr "" | |
3032 | "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n" | |
3033 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" | |
1003b3a5 | 3034 | |
a0b6b246 | 3035 | #: setup.c:927 |
63af42fe | 3036 | #, c-format |
a0b6b246 JX |
3037 | msgid "Cannot change to '%s/..'" |
3038 | msgstr "不能切换到 '%s/..'" | |
63af42fe | 3039 | |
a0b6b246 JX |
3040 | #: setup.c:989 |
3041 | #, c-format | |
3042 | msgid "" | |
3043 | "Problem with core.sharedRepository filemode value (0%.3o).\n" | |
3044 | "The owner of files must always have read and write permissions." | |
3045 | msgstr "" | |
3046 | "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n" | |
3047 | "文件属主必须始终拥有读写权限。" | |
6792b93b | 3048 | |
a0b6b246 JX |
3049 | #: sha1_file.c:473 |
3050 | #, c-format | |
3051 | msgid "path '%s' does not exist" | |
3052 | msgstr "路径 '%s' 不存在" | |
3053 | ||
3054 | #: sha1_file.c:499 | |
3055 | #, c-format | |
3056 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
3057 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
3058 | ||
3059 | #: sha1_file.c:505 | |
3060 | #, c-format | |
3061 | msgid "reference repository '%s' is not a local repository." | |
3062 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
3063 | ||
3064 | #: sha1_file.c:511 | |
3065 | #, c-format | |
3066 | msgid "reference repository '%s' is shallow" | |
3067 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
3068 | ||
3069 | #: sha1_file.c:519 | |
3070 | #, c-format | |
3071 | msgid "reference repository '%s' is grafted" | |
3072 | msgstr "参考仓库 '%s' 已被嫁接" | |
3073 | ||
3074 | #: sha1_file.c:1159 | |
3075 | msgid "offset before end of packfile (broken .idx?)" | |
3076 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
3077 | ||
3078 | #: sha1_file.c:2592 | |
3079 | #, c-format | |
3080 | msgid "offset before start of pack index for %s (corrupt index?)" | |
3081 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
3082 | ||
3083 | #: sha1_file.c:2596 | |
3084 | #, c-format | |
3085 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
3086 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
3087 | ||
3088 | #: sha1_name.c:407 | |
3089 | #, c-format | |
3090 | msgid "short SHA1 %s is ambiguous" | |
3091 | msgstr "歧义的短 SHA1 %s" | |
3092 | ||
3093 | #: sha1_name.c:418 | |
3094 | msgid "The candidates are:" | |
3095 | msgstr "候选者有:" | |
3096 | ||
275588f9 | 3097 | #: sha1_name.c:578 |
a0b6b246 JX |
3098 | msgid "" |
3099 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
3100 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
3101 | "may be created by mistake. For example,\n" | |
3102 | "\n" | |
3103 | " git checkout -b $br $(git rev-parse ...)\n" | |
3104 | "\n" | |
3105 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
3106 | "examine these refs and maybe delete them. Turn this message off by\n" | |
3107 | "running \"git config advice.objectNameWarning false\"" | |
3108 | msgstr "" | |
3109 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
3110 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
3111 | "\n" | |
3112 | " git checkout -b $br $(git rev-parse ...)\n" | |
3113 | "\n" | |
3114 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
3115 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
3116 | "命令关闭本消息通知。" | |
3117 | ||
3118 | #: submodule.c:64 submodule.c:98 | |
3119 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" | |
3120 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
3121 | ||
3122 | #: submodule.c:68 submodule.c:102 | |
3123 | #, c-format | |
3124 | msgid "Could not find section in .gitmodules where path=%s" | |
3125 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
3126 | ||
3127 | #: submodule.c:76 | |
3128 | #, c-format | |
3129 | msgid "Could not update .gitmodules entry %s" | |
3130 | msgstr "不能更新 .gitmodules 条目 %s" | |
3131 | ||
3132 | #: submodule.c:109 | |
3133 | #, c-format | |
3134 | msgid "Could not remove .gitmodules entry for %s" | |
3135 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
3136 | ||
3137 | #: submodule.c:120 | |
3138 | msgid "staging updated .gitmodules failed" | |
3139 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
3140 | ||
3141 | #: submodule.c:158 | |
3142 | msgid "negative values not allowed for submodule.fetchJobs" | |
3143 | msgstr "submodule.fetchJobs 不允许为负值" | |
3144 | ||
3145 | #: submodule-config.c:358 | |
3146 | #, c-format | |
3147 | msgid "invalid value for %s" | |
3148 | msgstr "%s 的值无效" | |
3149 | ||
3150 | #: trailer.c:238 | |
3151 | #, c-format | |
3152 | msgid "running trailer command '%s' failed" | |
3153 | msgstr "执行 trailer 命令 '%s' 失败" | |
3154 | ||
3155 | #: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 | |
3156 | #: trailer.c:541 | |
3157 | #, c-format | |
3158 | msgid "unknown value '%s' for key '%s'" | |
3159 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
3160 | ||
3161 | #: trailer.c:523 trailer.c:528 builtin/remote.c:289 | |
3162 | #, c-format | |
3163 | msgid "more than one %s" | |
3164 | msgstr "多于一个 %s" | |
3165 | ||
3166 | #: trailer.c:672 | |
3167 | #, c-format | |
3168 | msgid "empty trailer token in trailer '%.*s'" | |
3169 | msgstr "签名 '%.*s' 的键为空" | |
3170 | ||
3171 | #: trailer.c:695 | |
3172 | #, c-format | |
3173 | msgid "could not read input file '%s'" | |
3174 | msgstr "不能读取输入文件 '%s'" | |
3175 | ||
3176 | #: trailer.c:698 | |
3177 | msgid "could not read from stdin" | |
3178 | msgstr "不能自标准输入读取" | |
3179 | ||
3180 | #: trailer.c:929 builtin/am.c:44 | |
3181 | #, c-format | |
3182 | msgid "could not stat %s" | |
3183 | msgstr "不能获取 %s 的文件状态" | |
3184 | ||
3185 | #: trailer.c:931 | |
3186 | #, c-format | |
3187 | msgid "file %s is not a regular file" | |
3188 | msgstr "文件 %s 不是一个正规文件" | |
3189 | ||
3190 | #: trailer.c:933 | |
3191 | #, c-format | |
3192 | msgid "file %s is not writable by user" | |
3193 | msgstr "文件 %s 用户不可写" | |
3194 | ||
3195 | #: trailer.c:945 | |
3196 | msgid "could not open temporary file" | |
3197 | msgstr "不能打开临时文件" | |
3198 | ||
3199 | #: trailer.c:983 | |
3200 | #, c-format | |
3201 | msgid "could not rename temporary file to %s" | |
3202 | msgstr "不能重命名临时文件为 %s" | |
3203 | ||
3204 | #: transport.c:62 | |
3205 | #, c-format | |
3206 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
3207 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
3208 | ||
3209 | #: transport.c:151 | |
3210 | #, c-format | |
3211 | msgid "transport: invalid depth option '%s'" | |
3212 | msgstr "传输:无效的深度选项 '%s'" | |
3213 | ||
3214 | #: transport.c:817 | |
3215 | #, c-format | |
3216 | msgid "" | |
3217 | "The following submodule paths contain changes that can\n" | |
3218 | "not be found on any remote:\n" | |
3219 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
3220 | ||
3221 | #: transport.c:821 | |
3222 | #, c-format | |
3223 | msgid "" | |
3224 | "\n" | |
3225 | "Please try\n" | |
3226 | "\n" | |
3227 | "\tgit push --recurse-submodules=on-demand\n" | |
3228 | "\n" | |
3229 | "or cd to the path and use\n" | |
3230 | "\n" | |
3231 | "\tgit push\n" | |
3232 | "\n" | |
3233 | "to push them to a remote.\n" | |
3234 | "\n" | |
3235 | msgstr "" | |
3236 | "\n" | |
3237 | "请尝试\n" | |
3238 | "\n" | |
3239 | "\tgit push --recurse-submodules=on-demand\n" | |
3240 | "\n" | |
3241 | "或者进入到子目录执行\n" | |
3242 | "\n" | |
3243 | "\tgit push\n" | |
3244 | "\n" | |
3245 | "以推送至远程。\n" | |
3246 | "\n" | |
3247 | ||
3248 | #: transport.c:829 | |
3249 | msgid "Aborting." | |
3250 | msgstr "正在终止。" | |
3251 | ||
3252 | #: transport-helper.c:1075 | |
3253 | #, c-format | |
3254 | msgid "Could not read ref %s" | |
3255 | msgstr "不能读取引用 %s" | |
3256 | ||
3257 | #: tree-walk.c:31 | |
3258 | msgid "too-short tree object" | |
3259 | msgstr "太短的树对象" | |
3260 | ||
3261 | #: tree-walk.c:37 | |
3262 | msgid "malformed mode in tree entry" | |
3263 | msgstr "树对象中的条目属性错误" | |
3264 | ||
3265 | #: tree-walk.c:41 | |
3266 | msgid "empty filename in tree entry" | |
3267 | msgstr "树对象条目中空的文件名" | |
3268 | ||
3269 | #: tree-walk.c:113 | |
3270 | msgid "too-short tree file" | |
3271 | msgstr "太短的树文件" | |
3272 | ||
3273 | #: unpack-trees.c:64 | |
3274 | #, c-format | |
3275 | msgid "" | |
3276 | "Your local changes to the following files would be overwritten by checkout:\n" | |
3277 | "%%sPlease commit your changes or stash them before you switch branches." | |
3278 | msgstr "" | |
3279 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
3280 | "%%s请在切换分支前提交您的修改或者保存进度。" | |
3281 | ||
3282 | #: unpack-trees.c:66 | |
3283 | #, c-format | |
3284 | msgid "" | |
3285 | "Your local changes to the following files would be overwritten by checkout:\n" | |
3286 | "%%s" | |
3287 | msgstr "" | |
3288 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
3289 | "%%s" | |
3290 | ||
3291 | #: unpack-trees.c:69 | |
3292 | #, c-format | |
3293 | msgid "" | |
3294 | "Your local changes to the following files would be overwritten by merge:\n" | |
3295 | "%%sPlease commit your changes or stash them before you merge." | |
3296 | msgstr "" | |
3297 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3298 | "%%s请在合并前提交您的修改或者保存进度。" | |
3299 | ||
3300 | #: unpack-trees.c:71 | |
3301 | #, c-format | |
3302 | msgid "" | |
3303 | "Your local changes to the following files would be overwritten by merge:\n" | |
3304 | "%%s" | |
3305 | msgstr "" | |
3306 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3307 | "%%s" | |
3308 | ||
3309 | #: unpack-trees.c:74 | |
3310 | #, c-format | |
3311 | msgid "" | |
3312 | "Your local changes to the following files would be overwritten by %s:\n" | |
3313 | "%%sPlease commit your changes or stash them before you %s." | |
3314 | msgstr "" | |
3315 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
3316 | "%%s请在 %s 之前提交您的修改或者保存进度。" | |
6792b93b | 3317 | |
a0b6b246 JX |
3318 | #: unpack-trees.c:76 |
3319 | #, c-format | |
3320 | msgid "" | |
3321 | "Your local changes to the following files would be overwritten by %s:\n" | |
3322 | "%%s" | |
3323 | msgstr "" | |
3324 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
3325 | "%%s" | |
c04f5ac3 | 3326 | |
a0b6b246 JX |
3327 | #: unpack-trees.c:81 |
3328 | #, c-format | |
3329 | msgid "" | |
3330 | "Updating the following directories would lose untracked files in it:\n" | |
3331 | "%s" | |
3332 | msgstr "" | |
3333 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
3334 | "%s" | |
1b7f4a34 | 3335 | |
a0b6b246 JX |
3336 | #: unpack-trees.c:85 |
3337 | #, c-format | |
3338 | msgid "" | |
3339 | "The following untracked working tree files would be removed by checkout:\n" | |
3340 | "%%sPlease move or remove them before you switch branches." | |
3341 | msgstr "" | |
3342 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
3343 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 3344 | |
a0b6b246 JX |
3345 | #: unpack-trees.c:87 |
3346 | #, c-format | |
3347 | msgid "" | |
3348 | "The following untracked working tree files would be removed by checkout:\n" | |
3349 | "%%s" | |
3350 | msgstr "" | |
3351 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
3352 | "%%s" | |
1003b3a5 | 3353 | |
a0b6b246 JX |
3354 | #: unpack-trees.c:90 |
3355 | #, c-format | |
3356 | msgid "" | |
3357 | "The following untracked working tree files would be removed by merge:\n" | |
3358 | "%%sPlease move or remove them before you merge." | |
3359 | msgstr "" | |
3360 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
3361 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 3362 | |
a0b6b246 JX |
3363 | #: unpack-trees.c:92 |
3364 | #, c-format | |
3365 | msgid "" | |
3366 | "The following untracked working tree files would be removed by merge:\n" | |
3367 | "%%s" | |
3368 | msgstr "" | |
3369 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
3370 | "%%s" | |
c04f5ac3 | 3371 | |
a0b6b246 JX |
3372 | #: unpack-trees.c:95 |
3373 | #, c-format | |
3374 | msgid "" | |
3375 | "The following untracked working tree files would be removed by %s:\n" | |
3376 | "%%sPlease move or remove them before you %s." | |
3377 | msgstr "" | |
3378 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
3379 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 3380 | |
a0b6b246 JX |
3381 | #: unpack-trees.c:97 |
3382 | #, c-format | |
3383 | msgid "" | |
3384 | "The following untracked working tree files would be removed by %s:\n" | |
3385 | "%%s" | |
3386 | msgstr "" | |
3387 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
3388 | "%%s" | |
c04f5ac3 | 3389 | |
a0b6b246 JX |
3390 | #: unpack-trees.c:102 |
3391 | #, c-format | |
3392 | msgid "" | |
3393 | "The following untracked working tree files would be overwritten by " | |
3394 | "checkout:\n" | |
3395 | "%%sPlease move or remove them before you switch branches." | |
3396 | msgstr "" | |
3397 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
3398 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 3399 | |
a0b6b246 | 3400 | #: unpack-trees.c:104 |
1003b3a5 | 3401 | #, c-format |
4dcdc3d8 | 3402 | msgid "" |
a0b6b246 JX |
3403 | "The following untracked working tree files would be overwritten by " |
3404 | "checkout:\n" | |
3405 | "%%s" | |
4dcdc3d8 | 3406 | msgstr "" |
a0b6b246 JX |
3407 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
3408 | "%%s" | |
1003b3a5 | 3409 | |
a0b6b246 | 3410 | #: unpack-trees.c:107 |
c04f5ac3 | 3411 | #, c-format |
a0b6b246 JX |
3412 | msgid "" |
3413 | "The following untracked working tree files would be overwritten by merge:\n" | |
3414 | "%%sPlease move or remove them before you merge." | |
3415 | msgstr "" | |
3416 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
3417 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 3418 | |
a0b6b246 JX |
3419 | #: unpack-trees.c:109 |
3420 | #, c-format | |
3421 | msgid "" | |
3422 | "The following untracked working tree files would be overwritten by merge:\n" | |
3423 | "%%s" | |
3424 | msgstr "" | |
3425 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
3426 | "%%s" | |
c04f5ac3 | 3427 | |
a0b6b246 JX |
3428 | #: unpack-trees.c:112 |
3429 | #, c-format | |
3430 | msgid "" | |
3431 | "The following untracked working tree files would be overwritten by %s:\n" | |
3432 | "%%sPlease move or remove them before you %s." | |
3433 | msgstr "" | |
3434 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
3435 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 3436 | |
a0b6b246 | 3437 | #: unpack-trees.c:114 |
07432cef | 3438 | #, c-format |
a0b6b246 JX |
3439 | msgid "" |
3440 | "The following untracked working tree files would be overwritten by %s:\n" | |
3441 | "%%s" | |
3442 | msgstr "" | |
3443 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
3444 | "%%s" | |
c04f5ac3 | 3445 | |
a0b6b246 | 3446 | #: unpack-trees.c:121 |
07432cef | 3447 | #, c-format |
a0b6b246 JX |
3448 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
3449 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 3450 | |
a0b6b246 | 3451 | #: unpack-trees.c:124 |
07432cef | 3452 | #, c-format |
ef317cd5 | 3453 | msgid "" |
a0b6b246 JX |
3454 | "Cannot update sparse checkout: the following entries are not up-to-date:\n" |
3455 | "%s" | |
3456 | msgstr "" | |
3457 | "无法更新稀疏检出:如下条目不是最新:\n" | |
3458 | "%s" | |
c04f5ac3 | 3459 | |
a0b6b246 | 3460 | #: unpack-trees.c:126 |
07432cef | 3461 | #, c-format |
a0b6b246 JX |
3462 | msgid "" |
3463 | "The following working tree files would be overwritten by sparse checkout " | |
3464 | "update:\n" | |
3465 | "%s" | |
3466 | msgstr "" | |
3467 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
3468 | "%s" | |
c04f5ac3 | 3469 | |
a0b6b246 | 3470 | #: unpack-trees.c:128 |
07432cef | 3471 | #, c-format |
a0b6b246 JX |
3472 | msgid "" |
3473 | "The following working tree files would be removed by sparse checkout " | |
3474 | "update:\n" | |
3475 | "%s" | |
3476 | msgstr "" | |
3477 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
3478 | "%s" | |
c04f5ac3 | 3479 | |
a0b6b246 | 3480 | #: unpack-trees.c:205 |
07432cef | 3481 | #, c-format |
a0b6b246 JX |
3482 | msgid "Aborting\n" |
3483 | msgstr "终止中\n" | |
ef317cd5 | 3484 | |
a0b6b246 JX |
3485 | #: unpack-trees.c:237 |
3486 | msgid "Checking out files" | |
3487 | msgstr "正在检出文件" | |
c04f5ac3 | 3488 | |
a0b6b246 JX |
3489 | #: urlmatch.c:120 |
3490 | msgid "invalid URL scheme name or missing '://' suffix" | |
3491 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
3492 | ||
3493 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
07432cef | 3494 | #, c-format |
a0b6b246 JX |
3495 | msgid "invalid %XX escape sequence" |
3496 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 3497 | |
a0b6b246 JX |
3498 | #: urlmatch.c:172 |
3499 | msgid "missing host and scheme is not 'file:'" | |
3500 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 3501 | |
a0b6b246 JX |
3502 | #: urlmatch.c:189 |
3503 | msgid "a 'file:' URL may not have a port number" | |
3504 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 3505 | |
a0b6b246 JX |
3506 | #: urlmatch.c:199 |
3507 | msgid "invalid characters in host name" | |
3508 | msgstr "主机名中包含无效的字符" | |
90314792 | 3509 | |
a0b6b246 JX |
3510 | #: urlmatch.c:244 urlmatch.c:255 |
3511 | msgid "invalid port number" | |
3512 | msgstr "无效的端口号" | |
c04f5ac3 | 3513 | |
a0b6b246 JX |
3514 | #: urlmatch.c:322 |
3515 | msgid "invalid '..' path segment" | |
3516 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 3517 | |
a0b6b246 | 3518 | #: worktree.c:282 |
a77c07d9 | 3519 | #, c-format |
a0b6b246 JX |
3520 | msgid "failed to read '%s'" |
3521 | msgstr "无法读取 '%s'" | |
ef317cd5 | 3522 | |
a0b6b246 | 3523 | #: wrapper.c:222 wrapper.c:392 |
c04f5ac3 | 3524 | #, c-format |
a0b6b246 JX |
3525 | msgid "could not open '%s' for reading and writing" |
3526 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 3527 | |
a0b6b246 JX |
3528 | #: wrapper.c:224 wrapper.c:394 builtin/am.c:766 |
3529 | #, c-format | |
3530 | msgid "could not open '%s' for writing" | |
3531 | msgstr "无法打开 '%s' 进行写入" | |
c04f5ac3 | 3532 | |
a0b6b246 JX |
3533 | #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 |
3534 | #: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 | |
3535 | #: builtin/pull.c:341 | |
c04f5ac3 | 3536 | #, c-format |
a0b6b246 JX |
3537 | msgid "could not open '%s' for reading" |
3538 | msgstr "无法打开 '%s' 进行读取" | |
c04f5ac3 | 3539 | |
a0b6b246 JX |
3540 | #: wrapper.c:605 wrapper.c:626 |
3541 | #, c-format | |
3542 | msgid "unable to access '%s'" | |
3543 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 3544 | |
a0b6b246 JX |
3545 | #: wrapper.c:634 |
3546 | msgid "unable to get current working directory" | |
3547 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 3548 | |
a0b6b246 | 3549 | #: wrapper.c:658 |
c04f5ac3 | 3550 | #, c-format |
a0b6b246 JX |
3551 | msgid "could not write to %s" |
3552 | msgstr "不能写入 %s" | |
c04f5ac3 | 3553 | |
a0b6b246 JX |
3554 | #: wrapper.c:660 |
3555 | #, c-format | |
3556 | msgid "could not close %s" | |
3557 | msgstr "不能关闭 %s" | |
c04f5ac3 | 3558 | |
a0b6b246 JX |
3559 | #: wt-status.c:151 |
3560 | msgid "Unmerged paths:" | |
3561 | msgstr "未合并的路径:" | |
7aea43ff | 3562 | |
a0b6b246 JX |
3563 | # 译者:注意保持前导空格 |
3564 | #: wt-status.c:178 wt-status.c:205 | |
c04f5ac3 | 3565 | #, c-format |
a0b6b246 JX |
3566 | msgid " (use \"git reset %s <file>...\" to unstage)" |
3567 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 3568 | |
a0b6b246 JX |
3569 | # 译者:注意保持前导空格 |
3570 | #: wt-status.c:180 wt-status.c:207 | |
3571 | msgid " (use \"git rm --cached <file>...\" to unstage)" | |
3572 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 3573 | |
a0b6b246 JX |
3574 | # 译者:注意保持前导空格 |
3575 | #: wt-status.c:184 | |
3576 | msgid " (use \"git add <file>...\" to mark resolution)" | |
3577 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 3578 | |
a0b6b246 JX |
3579 | # 译者:注意保持前导空格 |
3580 | #: wt-status.c:186 wt-status.c:190 | |
3581 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" | |
3582 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 3583 | |
a0b6b246 JX |
3584 | # 译者:注意保持前导空格 |
3585 | #: wt-status.c:188 | |
3586 | msgid " (use \"git rm <file>...\" to mark resolution)" | |
3587 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 3588 | |
a0b6b246 JX |
3589 | #: wt-status.c:199 wt-status.c:945 |
3590 | msgid "Changes to be committed:" | |
3591 | msgstr "要提交的变更:" | |
ef317cd5 | 3592 | |
a0b6b246 JX |
3593 | #: wt-status.c:217 wt-status.c:954 |
3594 | msgid "Changes not staged for commit:" | |
3595 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 3596 | |
a0b6b246 JX |
3597 | # 译者:注意保持前导空格 |
3598 | #: wt-status.c:221 | |
3599 | msgid " (use \"git add <file>...\" to update what will be committed)" | |
3600 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 3601 | |
a0b6b246 JX |
3602 | # 译者:注意保持前导空格 |
3603 | #: wt-status.c:223 | |
3604 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" | |
3605 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 3606 | |
a0b6b246 JX |
3607 | # 译者:注意保持前导空格 |
3608 | #: wt-status.c:224 | |
3609 | msgid "" | |
3610 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
3611 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 3612 | |
a0b6b246 JX |
3613 | # 译者:注意保持前导空格 |
3614 | #: wt-status.c:226 | |
3615 | msgid " (commit or discard the untracked or modified content in submodules)" | |
3616 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 3617 | |
a0b6b246 JX |
3618 | # 译者:注意保持前导空格 |
3619 | #: wt-status.c:238 | |
3620 | #, c-format | |
3621 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
3622 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 3623 | |
a0b6b246 JX |
3624 | #: wt-status.c:253 |
3625 | msgid "both deleted:" | |
3626 | msgstr "双方删除:" | |
ef317cd5 | 3627 | |
a0b6b246 JX |
3628 | #: wt-status.c:255 |
3629 | msgid "added by us:" | |
3630 | msgstr "由我们添加:" | |
4dcdc3d8 | 3631 | |
a0b6b246 JX |
3632 | #: wt-status.c:257 |
3633 | msgid "deleted by them:" | |
3634 | msgstr "由他们删除:" | |
ef317cd5 | 3635 | |
a0b6b246 JX |
3636 | #: wt-status.c:259 |
3637 | msgid "added by them:" | |
3638 | msgstr "由他们添加:" | |
ef317cd5 | 3639 | |
a0b6b246 JX |
3640 | #: wt-status.c:261 |
3641 | msgid "deleted by us:" | |
3642 | msgstr "由我们删除:" | |
ef317cd5 | 3643 | |
a0b6b246 JX |
3644 | #: wt-status.c:263 |
3645 | msgid "both added:" | |
3646 | msgstr "双方添加:" | |
5c57d762 | 3647 | |
a0b6b246 JX |
3648 | #: wt-status.c:265 |
3649 | msgid "both modified:" | |
3650 | msgstr "双方修改:" | |
5c57d762 | 3651 | |
a0b6b246 JX |
3652 | #: wt-status.c:275 |
3653 | msgid "new file:" | |
3654 | msgstr "新文件:" | |
8ada9598 | 3655 | |
a0b6b246 JX |
3656 | #: wt-status.c:277 |
3657 | msgid "copied:" | |
3658 | msgstr "拷贝:" | |
8ada9598 | 3659 | |
a0b6b246 JX |
3660 | #: wt-status.c:279 |
3661 | msgid "deleted:" | |
3662 | msgstr "删除:" | |
8ada9598 | 3663 | |
a0b6b246 JX |
3664 | #: wt-status.c:281 |
3665 | msgid "modified:" | |
3666 | msgstr "修改:" | |
8ada9598 | 3667 | |
a0b6b246 JX |
3668 | #: wt-status.c:283 |
3669 | msgid "renamed:" | |
3670 | msgstr "重命名:" | |
5c57d762 | 3671 | |
a0b6b246 JX |
3672 | #: wt-status.c:285 |
3673 | msgid "typechange:" | |
3674 | msgstr "类型变更:" | |
8ada9598 | 3675 | |
a0b6b246 JX |
3676 | #: wt-status.c:287 |
3677 | msgid "unknown:" | |
3678 | msgstr "未知:" | |
8ada9598 | 3679 | |
a0b6b246 JX |
3680 | #: wt-status.c:289 |
3681 | msgid "unmerged:" | |
3682 | msgstr "未合并:" | |
8ada9598 | 3683 | |
a0b6b246 JX |
3684 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
3685 | #: wt-status.c:371 | |
3686 | msgid "new commits, " | |
3687 | msgstr "新提交, " | |
8ada9598 | 3688 | |
a0b6b246 JX |
3689 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
3690 | #: wt-status.c:373 | |
3691 | msgid "modified content, " | |
3692 | msgstr "修改的内容, " | |
1b7f4a34 | 3693 | |
a0b6b246 JX |
3694 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
3695 | #: wt-status.c:375 | |
3696 | msgid "untracked content, " | |
3697 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 3698 | |
a0b6b246 JX |
3699 | #: wt-status.c:818 |
3700 | msgid "Submodules changed but not updated:" | |
3701 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 3702 | |
a0b6b246 JX |
3703 | #: wt-status.c:820 |
3704 | msgid "Submodule changes to be committed:" | |
3705 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 3706 | |
a0b6b246 JX |
3707 | #: wt-status.c:901 |
3708 | msgid "" | |
3709 | "Do not touch the line above.\n" | |
3710 | "Everything below will be removed." | |
3711 | msgstr "" | |
3712 | "不要改动上面的一行。\n" | |
3713 | "下面的所有内容均将被删除。" | |
1b7f4a34 | 3714 | |
a0b6b246 JX |
3715 | #: wt-status.c:1013 |
3716 | msgid "You have unmerged paths." | |
3717 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 3718 | |
a0b6b246 JX |
3719 | # 译者:注意保持前导空格 |
3720 | #: wt-status.c:1016 | |
3721 | msgid " (fix conflicts and run \"git commit\")" | |
3722 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 3723 | |
a0b6b246 JX |
3724 | # 译者:注意保持前导空格 |
3725 | #: wt-status.c:1018 | |
3726 | msgid " (use \"git merge --abort\" to abort the merge)" | |
3727 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 3728 | |
a0b6b246 JX |
3729 | #: wt-status.c:1023 |
3730 | msgid "All conflicts fixed but you are still merging." | |
3731 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 3732 | |
a0b6b246 JX |
3733 | # 译者:注意保持前导空格 |
3734 | #: wt-status.c:1026 | |
3735 | msgid " (use \"git commit\" to conclude merge)" | |
3736 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 3737 | |
a0b6b246 JX |
3738 | #: wt-status.c:1036 |
3739 | msgid "You are in the middle of an am session." | |
3740 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 3741 | |
a0b6b246 JX |
3742 | #: wt-status.c:1039 |
3743 | msgid "The current patch is empty." | |
3744 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 3745 | |
a0b6b246 JX |
3746 | # 译者:注意保持前导空格 |
3747 | #: wt-status.c:1043 | |
3748 | msgid " (fix conflicts and then run \"git am --continue\")" | |
3749 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 3750 | |
a0b6b246 JX |
3751 | # 译者:注意保持前导空格 |
3752 | #: wt-status.c:1045 | |
3753 | msgid " (use \"git am --skip\" to skip this patch)" | |
3754 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 3755 | |
a0b6b246 JX |
3756 | # 译者:注意保持前导空格 |
3757 | #: wt-status.c:1047 | |
3758 | msgid " (use \"git am --abort\" to restore the original branch)" | |
3759 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 3760 | |
a0b6b246 JX |
3761 | #: wt-status.c:1172 |
3762 | msgid "No commands done." | |
3763 | msgstr "没有命令被执行。" | |
3764 | ||
3765 | #: wt-status.c:1175 | |
1b7f4a34 | 3766 | #, c-format |
a0b6b246 JX |
3767 | msgid "Last command done (%d command done):" |
3768 | msgid_plural "Last commands done (%d commands done):" | |
3769 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
3770 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 3771 | |
a0b6b246 | 3772 | #: wt-status.c:1186 |
1b7f4a34 | 3773 | #, c-format |
a0b6b246 JX |
3774 | msgid " (see more in file %s)" |
3775 | msgstr " (更多参见文件 %s)" | |
3776 | ||
3777 | #: wt-status.c:1191 | |
3778 | msgid "No commands remaining." | |
3779 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 3780 | |
a0b6b246 | 3781 | #: wt-status.c:1194 |
1b7f4a34 | 3782 | #, c-format |
a0b6b246 JX |
3783 | msgid "Next command to do (%d remaining command):" |
3784 | msgid_plural "Next commands to do (%d remaining commands):" | |
3785 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
3786 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 3787 | |
a0b6b246 JX |
3788 | # 译者:注意保持前导空格 |
3789 | #: wt-status.c:1202 | |
3790 | msgid " (use \"git rebase --edit-todo\" to view and edit)" | |
3791 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 3792 | |
a0b6b246 | 3793 | #: wt-status.c:1215 |
1b7f4a34 | 3794 | #, c-format |
a0b6b246 JX |
3795 | msgid "You are currently rebasing branch '%s' on '%s'." |
3796 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 3797 | |
a0b6b246 JX |
3798 | #: wt-status.c:1220 |
3799 | msgid "You are currently rebasing." | |
3800 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 3801 | |
a0b6b246 JX |
3802 | # 译者:注意保持前导空格 |
3803 | #: wt-status.c:1234 | |
3804 | msgid " (fix conflicts and then run \"git rebase --continue\")" | |
3805 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 3806 | |
a0b6b246 JX |
3807 | # 译者:注意保持前导空格 |
3808 | #: wt-status.c:1236 | |
3809 | msgid " (use \"git rebase --skip\" to skip this patch)" | |
3810 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
3811 | ||
3812 | # 译者:注意保持前导空格 | |
3813 | #: wt-status.c:1238 | |
3814 | msgid " (use \"git rebase --abort\" to check out the original branch)" | |
3815 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
3816 | ||
3817 | # 译者:注意保持前导空格 | |
3818 | #: wt-status.c:1244 | |
3819 | msgid " (all conflicts fixed: run \"git rebase --continue\")" | |
3820 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 3821 | |
a0b6b246 JX |
3822 | #: wt-status.c:1248 |
3823 | #, c-format | |
1b7f4a34 | 3824 | msgid "" |
a0b6b246 JX |
3825 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
3826 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 3827 | |
a0b6b246 JX |
3828 | #: wt-status.c:1253 |
3829 | msgid "You are currently splitting a commit during a rebase." | |
3830 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 3831 | |
a0b6b246 JX |
3832 | # 译者:注意保持前导空格 |
3833 | #: wt-status.c:1256 | |
3834 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" | |
3835 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 3836 | |
a0b6b246 JX |
3837 | #: wt-status.c:1260 |
3838 | #, c-format | |
3839 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
3840 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 3841 | |
a0b6b246 JX |
3842 | #: wt-status.c:1265 |
3843 | msgid "You are currently editing a commit during a rebase." | |
3844 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 3845 | |
a0b6b246 JX |
3846 | # 译者:注意保持前导空格 |
3847 | #: wt-status.c:1268 | |
3848 | msgid " (use \"git commit --amend\" to amend the current commit)" | |
3849 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
3850 | ||
3851 | # 译者:注意保持前导空格 | |
3852 | #: wt-status.c:1270 | |
3853 | msgid "" | |
3854 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
3855 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 3856 | |
a0b6b246 | 3857 | #: wt-status.c:1280 |
1b7f4a34 | 3858 | #, c-format |
a0b6b246 JX |
3859 | msgid "You are currently cherry-picking commit %s." |
3860 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 3861 | |
a0b6b246 JX |
3862 | # 译者:注意保持前导空格 |
3863 | #: wt-status.c:1285 | |
3864 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" | |
3865 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 3866 | |
a0b6b246 JX |
3867 | # 译者:注意保持前导空格 |
3868 | #: wt-status.c:1288 | |
3869 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" | |
3870 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 3871 | |
a0b6b246 JX |
3872 | # 译者:注意保持前导空格 |
3873 | #: wt-status.c:1290 | |
3874 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" | |
3875 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 3876 | |
a0b6b246 | 3877 | #: wt-status.c:1299 |
1b7f4a34 | 3878 | #, c-format |
a0b6b246 JX |
3879 | msgid "You are currently reverting commit %s." |
3880 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 3881 | |
a0b6b246 JX |
3882 | # 译者:注意保持前导空格 |
3883 | #: wt-status.c:1304 | |
3884 | msgid " (fix conflicts and run \"git revert --continue\")" | |
3885 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 3886 | |
a0b6b246 JX |
3887 | # 译者:注意保持前导空格 |
3888 | #: wt-status.c:1307 | |
3889 | msgid " (all conflicts fixed: run \"git revert --continue\")" | |
3890 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 3891 | |
a0b6b246 JX |
3892 | # 译者:注意保持前导空格 |
3893 | #: wt-status.c:1309 | |
3894 | msgid " (use \"git revert --abort\" to cancel the revert operation)" | |
3895 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 3896 | |
a0b6b246 | 3897 | #: wt-status.c:1320 |
1b7f4a34 | 3898 | #, c-format |
a0b6b246 JX |
3899 | msgid "You are currently bisecting, started from branch '%s'." |
3900 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 3901 | |
a0b6b246 JX |
3902 | #: wt-status.c:1324 |
3903 | msgid "You are currently bisecting." | |
3904 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 3905 | |
a0b6b246 JX |
3906 | # 译者:注意保持前导空格 |
3907 | #: wt-status.c:1327 | |
3908 | msgid " (use \"git bisect reset\" to get back to the original branch)" | |
3909 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 3910 | |
a0b6b246 JX |
3911 | #: wt-status.c:1524 |
3912 | msgid "On branch " | |
3913 | msgstr "位于分支 " | |
1b7f4a34 | 3914 | |
a0b6b246 JX |
3915 | #: wt-status.c:1530 |
3916 | msgid "interactive rebase in progress; onto " | |
3917 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 3918 | |
a0b6b246 JX |
3919 | #: wt-status.c:1532 |
3920 | msgid "rebase in progress; onto " | |
3921 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 3922 | |
a0b6b246 JX |
3923 | #: wt-status.c:1537 |
3924 | msgid "HEAD detached at " | |
3925 | msgstr "头指针分离于 " | |
1b7f4a34 | 3926 | |
a0b6b246 JX |
3927 | #: wt-status.c:1539 |
3928 | msgid "HEAD detached from " | |
3929 | msgstr "头指针分离自 " | |
1b7f4a34 | 3930 | |
a0b6b246 JX |
3931 | #: wt-status.c:1542 |
3932 | msgid "Not currently on any branch." | |
3933 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 3934 | |
a0b6b246 JX |
3935 | #: wt-status.c:1560 |
3936 | msgid "Initial commit" | |
3937 | msgstr "初始提交" | |
1b7f4a34 | 3938 | |
a0b6b246 JX |
3939 | #: wt-status.c:1574 |
3940 | msgid "Untracked files" | |
3941 | msgstr "未跟踪的文件" | |
1b7f4a34 | 3942 | |
a0b6b246 JX |
3943 | #: wt-status.c:1576 |
3944 | msgid "Ignored files" | |
3945 | msgstr "忽略的文件" | |
1b7f4a34 | 3946 | |
a0b6b246 JX |
3947 | #: wt-status.c:1580 |
3948 | #, c-format | |
3949 | msgid "" | |
3950 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
3951 | "may speed it up, but you have to be careful not to forget to add\n" | |
3952 | "new files yourself (see 'git help status')." | |
3953 | msgstr "" | |
3954 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
3955 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 3956 | |
a0b6b246 JX |
3957 | #: wt-status.c:1586 |
3958 | #, c-format | |
3959 | msgid "Untracked files not listed%s" | |
3960 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 3961 | |
a0b6b246 JX |
3962 | # 译者:中文字符串拼接,可删除前导空格 |
3963 | #: wt-status.c:1588 | |
3964 | msgid " (use -u option to show untracked files)" | |
3965 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 3966 | |
a0b6b246 JX |
3967 | #: wt-status.c:1594 |
3968 | msgid "No changes" | |
3969 | msgstr "没有修改" | |
1b7f4a34 | 3970 | |
a0b6b246 JX |
3971 | #: wt-status.c:1599 |
3972 | #, c-format | |
3973 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
3974 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 3975 | |
a0b6b246 JX |
3976 | #: wt-status.c:1602 |
3977 | #, c-format | |
3978 | msgid "no changes added to commit\n" | |
3979 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 3980 | |
a0b6b246 JX |
3981 | #: wt-status.c:1605 |
3982 | #, c-format | |
3983 | msgid "" | |
3984 | "nothing added to commit but untracked files present (use \"git add\" to " | |
3985 | "track)\n" | |
3986 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 3987 | |
a0b6b246 JX |
3988 | #: wt-status.c:1608 |
3989 | #, c-format | |
3990 | msgid "nothing added to commit but untracked files present\n" | |
3991 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 3992 | |
a0b6b246 JX |
3993 | # 译者:中文字符串拼接,可删除前导空格 |
3994 | #: wt-status.c:1611 | |
3995 | #, c-format | |
3996 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
3997 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 3998 | |
a0b6b246 JX |
3999 | #: wt-status.c:1614 wt-status.c:1619 |
4000 | #, c-format | |
4001 | msgid "nothing to commit\n" | |
4002 | msgstr "无文件要提交\n" | |
1b7f4a34 | 4003 | |
a0b6b246 JX |
4004 | # 译者:中文字符串拼接,可删除前导空格 |
4005 | #: wt-status.c:1617 | |
4006 | #, c-format | |
4007 | msgid "nothing to commit (use -u to show untracked files)\n" | |
4008 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 4009 | |
a0b6b246 JX |
4010 | # 译者:中文字符串拼接,可删除前导空格 |
4011 | #: wt-status.c:1621 | |
4012 | #, c-format | |
4013 | msgid "nothing to commit, working tree clean\n" | |
4014 | msgstr "无文件要提交,干净的工作区\n" | |
4015 | ||
4016 | # 译者:注意保持句尾空格 | |
4017 | #: wt-status.c:1728 | |
4018 | msgid "Initial commit on " | |
4019 | msgstr "初始提交于 " | |
1b7f4a34 | 4020 | |
a0b6b246 JX |
4021 | #: wt-status.c:1732 |
4022 | msgid "HEAD (no branch)" | |
4023 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 4024 | |
a0b6b246 JX |
4025 | #: wt-status.c:1761 |
4026 | msgid "gone" | |
4027 | msgstr "丢失" | |
1b7f4a34 | 4028 | |
a0b6b246 JX |
4029 | # 译者:注意保持句尾空格 |
4030 | #: wt-status.c:1763 wt-status.c:1771 | |
4031 | msgid "behind " | |
4032 | msgstr "落后 " | |
1b7f4a34 | 4033 | |
a0b6b246 JX |
4034 | #: wt-status.c:1766 wt-status.c:1769 |
4035 | msgid "ahead " | |
4036 | msgstr "领先 " | |
1b7f4a34 | 4037 | |
a0b6b246 JX |
4038 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
4039 | #: wt-status.c:2270 | |
4040 | #, c-format | |
4041 | msgid "cannot %s: You have unstaged changes." | |
4042 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 4043 | |
a0b6b246 JX |
4044 | #: wt-status.c:2276 |
4045 | msgid "additionally, your index contains uncommitted changes." | |
4046 | msgstr "而且您的索引中包含未提交的变更。" | |
1b7f4a34 | 4047 | |
a0b6b246 JX |
4048 | #: wt-status.c:2278 |
4049 | #, c-format | |
4050 | msgid "cannot %s: Your index contains uncommitted changes." | |
4051 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 4052 | |
a0b6b246 JX |
4053 | #: compat/precompose_utf8.c:57 builtin/clone.c:414 |
4054 | #, c-format | |
4055 | msgid "failed to unlink '%s'" | |
4056 | msgstr "无法删除 '%s'" | |
1b7f4a34 | 4057 | |
a0b6b246 JX |
4058 | #: builtin/add.c:22 |
4059 | msgid "git add [<options>] [--] <pathspec>..." | |
4060 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 4061 | |
a0b6b246 JX |
4062 | #: builtin/add.c:80 |
4063 | #, c-format | |
4064 | msgid "unexpected diff status %c" | |
4065 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 4066 | |
a0b6b246 JX |
4067 | #: builtin/add.c:85 builtin/commit.c:291 |
4068 | msgid "updating files failed" | |
4069 | msgstr "更新文件失败" | |
1b7f4a34 | 4070 | |
a0b6b246 JX |
4071 | #: builtin/add.c:95 |
4072 | #, c-format | |
4073 | msgid "remove '%s'\n" | |
4074 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 4075 | |
a0b6b246 JX |
4076 | #: builtin/add.c:149 |
4077 | msgid "Unstaged changes after refreshing the index:" | |
4078 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 4079 | |
a0b6b246 JX |
4080 | #: builtin/add.c:209 builtin/rev-parse.c:840 |
4081 | msgid "Could not read the index" | |
4082 | msgstr "不能读取索引" | |
1b7f4a34 | 4083 | |
a0b6b246 JX |
4084 | #: builtin/add.c:220 |
4085 | #, c-format | |
4086 | msgid "Could not open '%s' for writing." | |
4087 | msgstr "无法打开 '%s' 进行写入。" | |
1b7f4a34 | 4088 | |
a0b6b246 JX |
4089 | #: builtin/add.c:224 |
4090 | msgid "Could not write patch" | |
4091 | msgstr "不能生成补丁" | |
1b7f4a34 | 4092 | |
a0b6b246 JX |
4093 | #: builtin/add.c:227 |
4094 | msgid "editing patch failed" | |
4095 | msgstr "编辑补丁失败" | |
1b7f4a34 | 4096 | |
a0b6b246 | 4097 | #: builtin/add.c:230 |
1b7f4a34 | 4098 | #, c-format |
a0b6b246 JX |
4099 | msgid "Could not stat '%s'" |
4100 | msgstr "不能查看文件状态 '%s'" | |
1b7f4a34 | 4101 | |
a0b6b246 JX |
4102 | #: builtin/add.c:232 |
4103 | msgid "Empty patch. Aborted." | |
4104 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 4105 | |
a0b6b246 JX |
4106 | #: builtin/add.c:237 |
4107 | #, c-format | |
4108 | msgid "Could not apply '%s'" | |
4109 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 4110 | |
a0b6b246 JX |
4111 | #: builtin/add.c:247 |
4112 | msgid "The following paths are ignored by one of your .gitignore files:\n" | |
4113 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 4114 | |
a0b6b246 JX |
4115 | #: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 |
4116 | #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 | |
4117 | #: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 | |
4118 | msgid "dry run" | |
4119 | msgstr "演习" | |
8ada9598 | 4120 | |
a0b6b246 JX |
4121 | #: builtin/add.c:269 |
4122 | msgid "interactive picking" | |
4123 | msgstr "交互式拣选" | |
8ada9598 | 4124 | |
a0b6b246 JX |
4125 | #: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 |
4126 | msgid "select hunks interactively" | |
4127 | msgstr "交互式挑选数据块" | |
8ada9598 | 4128 | |
a0b6b246 JX |
4129 | #: builtin/add.c:271 |
4130 | msgid "edit current diff and apply" | |
4131 | msgstr "编辑当前差异并应用" | |
8ada9598 | 4132 | |
a0b6b246 JX |
4133 | #: builtin/add.c:272 |
4134 | msgid "allow adding otherwise ignored files" | |
4135 | msgstr "允许添加忽略的文件" | |
8ada9598 | 4136 | |
a0b6b246 JX |
4137 | #: builtin/add.c:273 |
4138 | msgid "update tracked files" | |
4139 | msgstr "更新已跟踪的文件" | |
8ada9598 | 4140 | |
a0b6b246 JX |
4141 | #: builtin/add.c:274 |
4142 | msgid "record only the fact that the path will be added later" | |
4143 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 4144 | |
a0b6b246 JX |
4145 | #: builtin/add.c:275 |
4146 | msgid "add changes from all tracked and untracked files" | |
4147 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 4148 | |
a0b6b246 JX |
4149 | #: builtin/add.c:278 |
4150 | msgid "ignore paths removed in the working tree (same as --no-all)" | |
4151 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 4152 | |
a0b6b246 JX |
4153 | #: builtin/add.c:280 |
4154 | msgid "don't add, only refresh the index" | |
4155 | msgstr "不添加,只刷新索引" | |
8ada9598 | 4156 | |
a0b6b246 JX |
4157 | #: builtin/add.c:281 |
4158 | msgid "just skip files which cannot be added because of errors" | |
4159 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 4160 | |
a0b6b246 JX |
4161 | #: builtin/add.c:282 |
4162 | msgid "check if - even missing - files are ignored in dry run" | |
4163 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 4164 | |
a0b6b246 JX |
4165 | #: builtin/add.c:283 builtin/update-index.c:947 |
4166 | msgid "(+/-)x" | |
4167 | msgstr "(+/-)x" | |
8ada9598 | 4168 | |
a0b6b246 JX |
4169 | #: builtin/add.c:283 builtin/update-index.c:948 |
4170 | msgid "override the executable bit of the listed files" | |
4171 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 4172 | |
a0b6b246 | 4173 | #: builtin/add.c:305 |
8ada9598 | 4174 | #, c-format |
a0b6b246 JX |
4175 | msgid "Use -f if you really want to add them.\n" |
4176 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 4177 | |
a0b6b246 JX |
4178 | #: builtin/add.c:312 |
4179 | msgid "adding files failed" | |
4180 | msgstr "添加文件失败" | |
8ada9598 | 4181 | |
a0b6b246 JX |
4182 | #: builtin/add.c:348 |
4183 | msgid "-A and -u are mutually incompatible" | |
4184 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 4185 | |
a0b6b246 JX |
4186 | #: builtin/add.c:355 |
4187 | msgid "Option --ignore-missing can only be used together with --dry-run" | |
4188 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 4189 | |
a0b6b246 | 4190 | #: builtin/add.c:359 |
8ada9598 | 4191 | #, c-format |
a0b6b246 JX |
4192 | msgid "--chmod param '%s' must be either -x or +x" |
4193 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 4194 | |
a0b6b246 | 4195 | #: builtin/add.c:374 |
8ada9598 | 4196 | #, c-format |
a0b6b246 JX |
4197 | msgid "Nothing specified, nothing added.\n" |
4198 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 4199 | |
a0b6b246 | 4200 | #: builtin/add.c:375 |
8ada9598 | 4201 | #, c-format |
a0b6b246 JX |
4202 | msgid "Maybe you wanted to say 'git add .'?\n" |
4203 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 4204 | |
a0b6b246 JX |
4205 | #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 |
4206 | #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 | |
4207 | #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 | |
4208 | #: builtin/submodule--helper.c:244 | |
4209 | msgid "index file corrupt" | |
4210 | msgstr "索引文件损坏" | |
8ada9598 | 4211 | |
a0b6b246 JX |
4212 | #: builtin/am.c:414 |
4213 | msgid "could not parse author script" | |
4214 | msgstr "不能解析作者脚本" | |
8ada9598 | 4215 | |
a0b6b246 | 4216 | #: builtin/am.c:491 |
81809b99 | 4217 | #, c-format |
a0b6b246 JX |
4218 | msgid "'%s' was deleted by the applypatch-msg hook" |
4219 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 4220 | |
a0b6b246 | 4221 | #: builtin/am.c:532 |
8ada9598 | 4222 | #, c-format |
a0b6b246 JX |
4223 | msgid "Malformed input line: '%s'." |
4224 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 4225 | |
a0b6b246 | 4226 | #: builtin/am.c:569 |
8ada9598 | 4227 | #, c-format |
a0b6b246 JX |
4228 | msgid "Failed to copy notes from '%s' to '%s'" |
4229 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 4230 | |
a0b6b246 JX |
4231 | #: builtin/am.c:595 |
4232 | msgid "fseek failed" | |
4233 | msgstr "fseek 失败" | |
8ada9598 | 4234 | |
a0b6b246 | 4235 | #: builtin/am.c:775 |
8ada9598 | 4236 | #, c-format |
a0b6b246 JX |
4237 | msgid "could not parse patch '%s'" |
4238 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 4239 | |
a0b6b246 JX |
4240 | #: builtin/am.c:840 |
4241 | msgid "Only one StGIT patch series can be applied at once" | |
4242 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
4243 | ||
4244 | #: builtin/am.c:887 | |
4245 | msgid "invalid timestamp" | |
4246 | msgstr "无效的时间戳" | |
4247 | ||
4248 | #: builtin/am.c:890 builtin/am.c:898 | |
4249 | msgid "invalid Date line" | |
4250 | msgstr "无效的日期行" | |
8ada9598 | 4251 | |
a0b6b246 JX |
4252 | #: builtin/am.c:895 |
4253 | msgid "invalid timezone offset" | |
4254 | msgstr "无效的时区偏移值" | |
8ada9598 | 4255 | |
a0b6b246 JX |
4256 | #: builtin/am.c:984 |
4257 | msgid "Patch format detection failed." | |
4258 | msgstr "补丁格式检测失败。" | |
8ada9598 | 4259 | |
a0b6b246 | 4260 | #: builtin/am.c:989 builtin/clone.c:379 |
8ada9598 | 4261 | #, c-format |
a0b6b246 JX |
4262 | msgid "failed to create directory '%s'" |
4263 | msgstr "无法创建目录 '%s'" | |
8ada9598 | 4264 | |
a0b6b246 JX |
4265 | #: builtin/am.c:993 |
4266 | msgid "Failed to split patches." | |
4267 | msgstr "无法拆分补丁。" | |
814ff314 | 4268 | |
a0b6b246 JX |
4269 | #: builtin/am.c:1125 builtin/commit.c:376 |
4270 | msgid "unable to write index file" | |
4271 | msgstr "无法写入索引文件" | |
8ada9598 | 4272 | |
a0b6b246 | 4273 | #: builtin/am.c:1176 |
8ada9598 | 4274 | #, c-format |
a0b6b246 JX |
4275 | msgid "When you have resolved this problem, run \"%s --continue\"." |
4276 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 4277 | |
a0b6b246 | 4278 | #: builtin/am.c:1177 |
81809b99 | 4279 | #, c-format |
a0b6b246 JX |
4280 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
4281 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 4282 | |
a0b6b246 | 4283 | #: builtin/am.c:1178 |
81809b99 | 4284 | #, c-format |
a0b6b246 JX |
4285 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
4286 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 4287 | |
a0b6b246 JX |
4288 | #: builtin/am.c:1316 |
4289 | msgid "Patch is empty. Was it split wrong?" | |
4290 | msgstr "补丁为空。是不是切分错误?" | |
23ff3338 | 4291 | |
a0b6b246 | 4292 | #: builtin/am.c:1390 builtin/log.c:1550 |
8ada9598 | 4293 | #, c-format |
a0b6b246 JX |
4294 | msgid "invalid ident line: %s" |
4295 | msgstr "包含无效的身份标识:%s" | |
8ada9598 | 4296 | |
a0b6b246 | 4297 | #: builtin/am.c:1417 |
8ada9598 | 4298 | #, c-format |
a0b6b246 JX |
4299 | msgid "unable to parse commit %s" |
4300 | msgstr "不能解析提交 %s" | |
8ada9598 | 4301 | |
a0b6b246 JX |
4302 | #: builtin/am.c:1610 |
4303 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." | |
4304 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 4305 | |
a0b6b246 JX |
4306 | #: builtin/am.c:1612 |
4307 | msgid "Using index info to reconstruct a base tree..." | |
4308 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 4309 | |
a0b6b246 JX |
4310 | #: builtin/am.c:1631 |
4311 | msgid "" | |
4312 | "Did you hand edit your patch?\n" | |
4313 | "It does not apply to blobs recorded in its index." | |
4314 | msgstr "" | |
4315 | "您是否曾手动编辑过您的补丁?\n" | |
4316 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 4317 | |
a0b6b246 JX |
4318 | #: builtin/am.c:1637 |
4319 | msgid "Falling back to patching base and 3-way merge..." | |
4320 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 4321 | |
a0b6b246 JX |
4322 | #: builtin/am.c:1662 |
4323 | msgid "Failed to merge in the changes." | |
4324 | msgstr "无法合并变更。" | |
d691f479 | 4325 | |
a0b6b246 JX |
4326 | #: builtin/am.c:1686 builtin/merge.c:628 |
4327 | msgid "git write-tree failed to write a tree" | |
4328 | msgstr "git write-tree 无法写入一树对象" | |
814ff314 | 4329 | |
a0b6b246 JX |
4330 | #: builtin/am.c:1693 |
4331 | msgid "applying to an empty history" | |
4332 | msgstr "正应用到一个空历史上" | |
8ada9598 | 4333 | |
a0b6b246 JX |
4334 | #: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 |
4335 | #: builtin/merge.c:823 | |
4336 | msgid "failed to write commit object" | |
4337 | msgstr "无法写提交对象" | |
8ada9598 | 4338 | |
a0b6b246 | 4339 | #: builtin/am.c:1739 builtin/am.c:1743 |
8ada9598 | 4340 | #, c-format |
a0b6b246 JX |
4341 | msgid "cannot resume: %s does not exist." |
4342 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 4343 | |
a0b6b246 JX |
4344 | #: builtin/am.c:1759 |
4345 | msgid "cannot be interactive without stdin connected to a terminal." | |
4346 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 4347 | |
a0b6b246 JX |
4348 | #: builtin/am.c:1764 |
4349 | msgid "Commit Body is:" | |
4350 | msgstr "提交内容为:" | |
8ada9598 | 4351 | |
a0b6b246 JX |
4352 | # 译者:注意保持句尾空格 |
4353 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
4354 | #. in your translation. The program will only accept English | |
4355 | #. input at this point. | |
4356 | #. | |
4357 | #: builtin/am.c:1774 | |
4358 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " | |
4359 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 4360 | |
a0b6b246 | 4361 | #: builtin/am.c:1824 |
8ada9598 | 4362 | #, c-format |
a0b6b246 JX |
4363 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
4364 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 4365 | |
a0b6b246 | 4366 | #: builtin/am.c:1861 builtin/am.c:1933 |
81809b99 | 4367 | #, c-format |
a0b6b246 JX |
4368 | msgid "Applying: %.*s" |
4369 | msgstr "应用:%.*s" | |
8ada9598 | 4370 | |
a0b6b246 JX |
4371 | #: builtin/am.c:1877 |
4372 | msgid "No changes -- Patch already applied." | |
4373 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 4374 | |
a0b6b246 | 4375 | #: builtin/am.c:1885 |
81809b99 | 4376 | #, c-format |
a0b6b246 JX |
4377 | msgid "Patch failed at %s %.*s" |
4378 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 4379 | |
a0b6b246 | 4380 | #: builtin/am.c:1891 |
8ada9598 | 4381 | #, c-format |
a0b6b246 JX |
4382 | msgid "The copy of the patch that failed is found in: %s" |
4383 | msgstr "失败的补丁文件副本位于:%s" | |
8ada9598 | 4384 | |
a0b6b246 JX |
4385 | #: builtin/am.c:1936 |
4386 | msgid "" | |
4387 | "No changes - did you forget to use 'git add'?\n" | |
4388 | "If there is nothing left to stage, chances are that something else\n" | |
4389 | "already introduced the same changes; you might want to skip this patch." | |
4390 | msgstr "" | |
4391 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
4392 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
4393 | "您也许想要跳过这个补丁。" | |
8ada9598 | 4394 | |
a0b6b246 JX |
4395 | #: builtin/am.c:1943 |
4396 | msgid "" | |
4397 | "You still have unmerged paths in your index.\n" | |
4398 | "Did you forget to use 'git add'?" | |
4399 | msgstr "" | |
4400 | "您的索引中仍有未合并的路径。\n" | |
4401 | "您是否忘了执行 'git add'?" | |
8ada9598 | 4402 | |
a0b6b246 JX |
4403 | #: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 |
4404 | #: builtin/reset.c:316 | |
8ada9598 | 4405 | #, c-format |
a0b6b246 JX |
4406 | msgid "Could not parse object '%s'." |
4407 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 4408 | |
a0b6b246 JX |
4409 | #: builtin/am.c:2103 |
4410 | msgid "failed to clean index" | |
4411 | msgstr "无法清空索引" | |
5b04ee3b | 4412 | |
a0b6b246 JX |
4413 | #: builtin/am.c:2137 |
4414 | msgid "" | |
4415 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
4416 | "Not rewinding to ORIG_HEAD" | |
4417 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 4418 | |
a0b6b246 | 4419 | #: builtin/am.c:2200 |
8ada9598 | 4420 | #, c-format |
a0b6b246 JX |
4421 | msgid "Invalid value for --patch-format: %s" |
4422 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 4423 | |
a0b6b246 JX |
4424 | #: builtin/am.c:2233 |
4425 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" | |
4426 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 4427 | |
a0b6b246 JX |
4428 | #: builtin/am.c:2234 |
4429 | msgid "git am [<options>] (--continue | --skip | --abort)" | |
4430 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 4431 | |
a0b6b246 JX |
4432 | #: builtin/am.c:2240 |
4433 | msgid "run interactively" | |
4434 | msgstr "以交互式方式运行" | |
8ada9598 | 4435 | |
a0b6b246 JX |
4436 | #: builtin/am.c:2242 |
4437 | msgid "historical option -- no-op" | |
4438 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 4439 | |
a0b6b246 JX |
4440 | #: builtin/am.c:2244 |
4441 | msgid "allow fall back on 3way merging if needed" | |
4442 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 4443 | |
a0b6b246 JX |
4444 | #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 |
4445 | #: builtin/repack.c:172 | |
4446 | msgid "be quiet" | |
4447 | msgstr "静默模式" | |
8ada9598 | 4448 | |
a0b6b246 JX |
4449 | #: builtin/am.c:2247 |
4450 | msgid "add a Signed-off-by line to the commit message" | |
4451 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 4452 | |
a0b6b246 JX |
4453 | #: builtin/am.c:2250 |
4454 | msgid "recode into utf8 (default)" | |
4455 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 4456 | |
a0b6b246 JX |
4457 | #: builtin/am.c:2252 |
4458 | msgid "pass -k flag to git-mailinfo" | |
4459 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 4460 | |
a0b6b246 JX |
4461 | #: builtin/am.c:2254 |
4462 | msgid "pass -b flag to git-mailinfo" | |
4463 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 4464 | |
a0b6b246 JX |
4465 | #: builtin/am.c:2256 |
4466 | msgid "pass -m flag to git-mailinfo" | |
4467 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 4468 | |
a0b6b246 JX |
4469 | #: builtin/am.c:2258 |
4470 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" | |
4471 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 4472 | |
a0b6b246 JX |
4473 | #: builtin/am.c:2261 |
4474 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" | |
4475 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 4476 | |
a0b6b246 JX |
4477 | #: builtin/am.c:2264 |
4478 | msgid "strip everything before a scissors line" | |
4479 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 4480 | |
a0b6b246 JX |
4481 | #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 |
4482 | #: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 | |
4483 | #: builtin/am.c:2293 | |
4484 | msgid "pass it through git-apply" | |
4485 | msgstr "传递给 git-apply" | |
8ada9598 | 4486 | |
a0b6b246 JX |
4487 | #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 |
4488 | #: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 | |
4489 | #: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 | |
4490 | #: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 | |
4491 | #: parse-options.h:132 parse-options.h:134 parse-options.h:245 | |
4492 | msgid "n" | |
4493 | msgstr "n" | |
8ada9598 | 4494 | |
a0b6b246 JX |
4495 | #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 |
4496 | #: builtin/tag.c:372 | |
4497 | msgid "format" | |
4498 | msgstr "格式" | |
8ada9598 | 4499 | |
a0b6b246 JX |
4500 | #: builtin/am.c:2290 |
4501 | msgid "format the patch(es) are in" | |
4502 | msgstr "补丁的格式" | |
8ada9598 | 4503 | |
a0b6b246 JX |
4504 | #: builtin/am.c:2296 |
4505 | msgid "override error message when patch failure occurs" | |
4506 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 4507 | |
a0b6b246 JX |
4508 | #: builtin/am.c:2298 |
4509 | msgid "continue applying patches after resolving a conflict" | |
4510 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 4511 | |
a0b6b246 JX |
4512 | #: builtin/am.c:2301 |
4513 | msgid "synonyms for --continue" | |
4514 | msgstr "和 --continue 同义" | |
8ada9598 | 4515 | |
a0b6b246 JX |
4516 | #: builtin/am.c:2304 |
4517 | msgid "skip the current patch" | |
4518 | msgstr "跳过当前补丁" | |
23ff3338 | 4519 | |
a0b6b246 JX |
4520 | #: builtin/am.c:2307 |
4521 | msgid "restore the original branch and abort the patching operation." | |
4522 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 4523 | |
a0b6b246 JX |
4524 | #: builtin/am.c:2311 |
4525 | msgid "lie about committer date" | |
4526 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 4527 | |
a0b6b246 JX |
4528 | #: builtin/am.c:2313 |
4529 | msgid "use current timestamp for author date" | |
4530 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 4531 | |
a0b6b246 JX |
4532 | #: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 |
4533 | #: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 | |
4534 | msgid "key-id" | |
4535 | msgstr "key-id" | |
8ada9598 | 4536 | |
a0b6b246 JX |
4537 | #: builtin/am.c:2316 |
4538 | msgid "GPG-sign commits" | |
4539 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 4540 | |
a0b6b246 JX |
4541 | #: builtin/am.c:2319 |
4542 | msgid "(internal use for git-rebase)" | |
4543 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 4544 | |
a0b6b246 JX |
4545 | #: builtin/am.c:2334 |
4546 | msgid "" | |
4547 | "The -b/--binary option has been a no-op for long time, and\n" | |
4548 | "it will be removed. Please do not use it anymore." | |
4549 | msgstr "" | |
4550 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
4551 | "请不要再使用它了。" | |
8ada9598 | 4552 | |
a0b6b246 JX |
4553 | #: builtin/am.c:2341 |
4554 | msgid "failed to read the index" | |
4555 | msgstr "无法读取索引" | |
8ada9598 | 4556 | |
a0b6b246 JX |
4557 | #: builtin/am.c:2356 |
4558 | #, c-format | |
4559 | msgid "previous rebase directory %s still exists but mbox given." | |
4560 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 4561 | |
a0b6b246 JX |
4562 | #: builtin/am.c:2380 |
4563 | #, c-format | |
4564 | msgid "" | |
4565 | "Stray %s directory found.\n" | |
4566 | "Use \"git am --abort\" to remove it." | |
4567 | msgstr "" | |
4568 | "发现了错误的 %s 目录。\n" | |
4569 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 4570 | |
a0b6b246 JX |
4571 | #: builtin/am.c:2386 |
4572 | msgid "Resolve operation not in progress, we are not resuming." | |
4573 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 4574 | |
a0b6b246 JX |
4575 | #: builtin/apply.c:8 |
4576 | msgid "git apply [<options>] [<patch>...]" | |
4577 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 4578 | |
c04f5ac3 JX |
4579 | #: builtin/archive.c:17 |
4580 | #, c-format | |
4581 | msgid "could not create archive file '%s'" | |
90e6ef53 | 4582 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
4583 | |
4584 | #: builtin/archive.c:20 | |
4585 | msgid "could not redirect output" | |
195febda | 4586 | msgstr "不能重定向输出" |
c04f5ac3 JX |
4587 | |
4588 | #: builtin/archive.c:37 | |
4589 | msgid "git archive: Remote with no URL" | |
4375c10e | 4590 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
4591 | |
4592 | #: builtin/archive.c:58 | |
4593 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 4594 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 4595 | |
1003b3a5 | 4596 | #: builtin/archive.c:61 |
c04f5ac3 JX |
4597 | #, c-format |
4598 | msgid "git archive: NACK %s" | |
90e6ef53 | 4599 | msgstr "git archive:NACK %s" |
c04f5ac3 | 4600 | |
1003b3a5 | 4601 | #: builtin/archive.c:63 |
c04f5ac3 JX |
4602 | #, c-format |
4603 | msgid "remote error: %s" | |
4604 | msgstr "远程错误:%s" | |
4605 | ||
1003b3a5 | 4606 | #: builtin/archive.c:64 |
c04f5ac3 | 4607 | msgid "git archive: protocol error" |
90e6ef53 | 4608 | msgstr "git archive:协议错误" |
c04f5ac3 | 4609 | |
1003b3a5 | 4610 | #: builtin/archive.c:68 |
c04f5ac3 | 4611 | msgid "git archive: expected a flush" |
a0b6b246 | 4612 | msgstr "git archive:应有一个 flush 刷新" |
c04f5ac3 | 4613 | |
ef317cd5 JX |
4614 | #: builtin/bisect--helper.c:7 |
4615 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 4616 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
4617 | |
4618 | #: builtin/bisect--helper.c:17 | |
4619 | msgid "perform 'git bisect next'" | |
07432cef | 4620 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
4621 | |
4622 | #: builtin/bisect--helper.c:19 | |
4623 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 4624 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 4625 | |
276ceeaa | 4626 | #: builtin/blame.c:33 |
7aea43ff JX |
4627 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
4628 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 4629 | |
276ceeaa | 4630 | #: builtin/blame.c:38 |
814ff314 JX |
4631 | msgid "<rev-opts> are documented in git-rev-list(1)" |
4632 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 4633 | |
5c57d762 | 4634 | #: builtin/blame.c:1781 |
276ceeaa JX |
4635 | msgid "Blaming lines" |
4636 | msgstr "追踪代码行" | |
4637 | ||
a0b6b246 | 4638 | #: builtin/blame.c:2577 |
ef317cd5 | 4639 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 4640 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 4641 | |
a0b6b246 | 4642 | #: builtin/blame.c:2578 |
ef317cd5 | 4643 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 4644 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 4645 | |
a0b6b246 | 4646 | #: builtin/blame.c:2579 |
ef317cd5 | 4647 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 4648 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 4649 | |
a0b6b246 | 4650 | #: builtin/blame.c:2580 |
ef317cd5 | 4651 | msgid "Show work cost statistics" |
07432cef | 4652 | msgstr "显示命令消耗统计" |
ef317cd5 | 4653 | |
a0b6b246 | 4654 | #: builtin/blame.c:2581 |
276ceeaa JX |
4655 | msgid "Force progress reporting" |
4656 | msgstr "强制进度显示" | |
4657 | ||
a0b6b246 | 4658 | #: builtin/blame.c:2582 |
ef317cd5 | 4659 | msgid "Show output score for blame entries" |
07432cef | 4660 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 4661 | |
a0b6b246 | 4662 | #: builtin/blame.c:2583 |
ef317cd5 | 4663 | msgid "Show original filename (Default: auto)" |
07432cef | 4664 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 4665 | |
a0b6b246 | 4666 | #: builtin/blame.c:2584 |
ef317cd5 | 4667 | msgid "Show original linenumber (Default: off)" |
07432cef | 4668 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 4669 | |
a0b6b246 | 4670 | #: builtin/blame.c:2585 |
ef317cd5 | 4671 | msgid "Show in a format designed for machine consumption" |
07432cef | 4672 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 4673 | |
a0b6b246 | 4674 | #: builtin/blame.c:2586 |
ef317cd5 | 4675 | msgid "Show porcelain format with per-line commit information" |
07432cef | 4676 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 4677 | |
a0b6b246 | 4678 | #: builtin/blame.c:2587 |
ef317cd5 | 4679 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 4680 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 4681 | |
a0b6b246 | 4682 | #: builtin/blame.c:2588 |
ef317cd5 | 4683 | msgid "Show raw timestamp (Default: off)" |
07432cef | 4684 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 4685 | |
a0b6b246 | 4686 | #: builtin/blame.c:2589 |
ef317cd5 | 4687 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 4688 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 4689 | |
a0b6b246 | 4690 | #: builtin/blame.c:2590 |
ef317cd5 | 4691 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 4692 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 4693 | |
a0b6b246 | 4694 | #: builtin/blame.c:2591 |
ef317cd5 | 4695 | msgid "Show author email instead of name (Default: off)" |
07432cef | 4696 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 4697 | |
a0b6b246 | 4698 | #: builtin/blame.c:2592 |
ef317cd5 | 4699 | msgid "Ignore whitespace differences" |
07432cef | 4700 | msgstr "忽略空白差异" |
ef317cd5 | 4701 | |
a0b6b246 JX |
4702 | #: builtin/blame.c:2599 |
4703 | msgid "Use an experimental indent-based heuristic to improve diffs" | |
4704 | msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示" | |
4705 | ||
4706 | #: builtin/blame.c:2600 | |
4707 | msgid "Use an experimental blank-line-based heuristic to improve diffs" | |
4708 | msgstr "使用一个试验性的基于空行的启发式算法改进差异显示" | |
4709 | ||
4710 | #: builtin/blame.c:2602 | |
ef317cd5 | 4711 | msgid "Spend extra cycles to find better match" |
07432cef | 4712 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 4713 | |
a0b6b246 | 4714 | #: builtin/blame.c:2603 |
ef317cd5 | 4715 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 4716 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 4717 | |
a0b6b246 | 4718 | #: builtin/blame.c:2604 |
ef317cd5 | 4719 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 4720 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 4721 | |
a0b6b246 | 4722 | #: builtin/blame.c:2605 builtin/blame.c:2606 |
ef317cd5 | 4723 | msgid "score" |
07432cef | 4724 | msgstr "得分" |
ef317cd5 | 4725 | |
a0b6b246 | 4726 | #: builtin/blame.c:2605 |
ef317cd5 | 4727 | msgid "Find line copies within and across files" |
07432cef | 4728 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 4729 | |
a0b6b246 | 4730 | #: builtin/blame.c:2606 |
ef317cd5 | 4731 | msgid "Find line movements within and across files" |
07432cef | 4732 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 4733 | |
a0b6b246 | 4734 | #: builtin/blame.c:2607 |
ef317cd5 | 4735 | msgid "n,m" |
07432cef | 4736 | msgstr "n,m" |
ef317cd5 | 4737 | |
a0b6b246 | 4738 | #: builtin/blame.c:2607 |
ef317cd5 | 4739 | msgid "Process only line range n,m, counting from 1" |
07432cef | 4740 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 4741 | |
a0b6b246 JX |
4742 | #: builtin/blame.c:2654 |
4743 | msgid "--progress can't be used with --incremental or porcelain formats" | |
4744 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
4745 | ||
6c94aba5 JX |
4746 | #. TRANSLATORS: This string is used to tell us the maximum |
4747 | #. display width for a relative timestamp in "git blame" | |
4748 | #. output. For C locale, "4 years, 11 months ago", which | |
4749 | #. takes 22 places, is the longest among various forms of | |
4750 | #. relative timestamps, but your language may need more or | |
4751 | #. fewer display columns. | |
a0b6b246 | 4752 | #: builtin/blame.c:2700 |
6c94aba5 JX |
4753 | msgid "4 years, 11 months ago" |
4754 | msgstr "4 年 11 个月前" | |
4755 | ||
a0b6b246 JX |
4756 | #: builtin/blame.c:2780 |
4757 | msgid "--contents and --reverse do not blend well." | |
4758 | msgstr "--contents 和 --reverse 不能混用。" | |
4759 | ||
4760 | #: builtin/blame.c:2800 | |
4761 | msgid "cannot use --contents with final commit object name" | |
4762 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
4763 | ||
4764 | #: builtin/blame.c:2805 | |
4765 | msgid "--reverse and --first-parent together require specified latest commit" | |
4766 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
4767 | ||
4768 | #: builtin/blame.c:2832 | |
4769 | msgid "" | |
4770 | "--reverse --first-parent together require range along first-parent chain" | |
4771 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
4772 | ||
4773 | #: builtin/blame.c:2843 | |
4774 | #, c-format | |
4775 | msgid "no such path %s in %s" | |
4776 | msgstr "在 %2$s 中无此路径 %1$s" | |
4777 | ||
4778 | #: builtin/blame.c:2854 | |
4779 | #, c-format | |
4780 | msgid "cannot read blob %s for path %s" | |
4781 | msgstr "不能为路径 %2$s 读取对象 %1$s" | |
4782 | ||
4783 | #: builtin/blame.c:2873 | |
4784 | #, c-format | |
4785 | msgid "file %s has only %lu line" | |
4786 | msgid_plural "file %s has only %lu lines" | |
4787 | msgstr[0] "文件 %s 只有 %lu 行" | |
4788 | msgstr[1] "文件 %s 只有 %lu 行" | |
4789 | ||
5b04ee3b | 4790 | #: builtin/branch.c:26 |
814ff314 JX |
4791 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
4792 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 4793 | |
5b04ee3b | 4794 | #: builtin/branch.c:27 |
814ff314 JX |
4795 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
4796 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 4797 | |
5b04ee3b | 4798 | #: builtin/branch.c:28 |
814ff314 JX |
4799 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
4800 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 4801 | |
5b04ee3b | 4802 | #: builtin/branch.c:29 |
814ff314 JX |
4803 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
4804 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 4805 | |
5b04ee3b | 4806 | #: builtin/branch.c:30 |
94550ed3 JX |
4807 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
4808 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
4809 | ||
90e6ef53 | 4810 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
5b04ee3b | 4811 | #: builtin/branch.c:143 |
c04f5ac3 JX |
4812 | #, c-format |
4813 | msgid "" | |
4814 | "deleting branch '%s' that has been merged to\n" | |
4815 | " '%s', but not yet merged to HEAD." | |
4816 | msgstr "" | |
70fc47bf | 4817 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
4818 | " '%s',但未合并到 HEAD。" |
4819 | ||
90e6ef53 | 4820 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
5b04ee3b | 4821 | #: builtin/branch.c:147 |
c04f5ac3 JX |
4822 | #, c-format |
4823 | msgid "" | |
4824 | "not deleting branch '%s' that is not yet merged to\n" | |
4825 | " '%s', even though it is merged to HEAD." | |
4826 | msgstr "" | |
70fc47bf T |
4827 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
4828 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 4829 | |
5b04ee3b | 4830 | #: builtin/branch.c:161 |
07432cef WS |
4831 | #, c-format |
4832 | msgid "Couldn't look up commit object for '%s'" | |
4833 | msgstr "无法查询 '%s' 指向的提交对象" | |
4834 | ||
5b04ee3b | 4835 | #: builtin/branch.c:165 |
07432cef WS |
4836 | #, c-format |
4837 | msgid "" | |
4838 | "The branch '%s' is not fully merged.\n" | |
4839 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
4840 | msgstr "" | |
4841 | "分支 '%s' 没有完全合并。\n" | |
4842 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
4843 | ||
5b04ee3b | 4844 | #: builtin/branch.c:178 |
07432cef WS |
4845 | msgid "Update of config-file failed" |
4846 | msgstr "无法更新 config 文件" | |
4847 | ||
5b04ee3b | 4848 | #: builtin/branch.c:206 |
c04f5ac3 | 4849 | msgid "cannot use -a with -d" |
649900bc | 4850 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 4851 | |
5b04ee3b | 4852 | #: builtin/branch.c:212 |
c04f5ac3 JX |
4853 | msgid "Couldn't look up commit object for HEAD" |
4854 | msgstr "无法查询 HEAD 指向的提交对象" | |
4855 | ||
5b04ee3b | 4856 | #: builtin/branch.c:226 |
c04f5ac3 | 4857 | #, c-format |
5b04ee3b JX |
4858 | msgid "Cannot delete branch '%s' checked out at '%s'" |
4859 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 4860 | |
5b04ee3b | 4861 | #: builtin/branch.c:241 |
5ae481e0 | 4862 | #, c-format |
7aea43ff JX |
4863 | msgid "remote-tracking branch '%s' not found." |
4864 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 4865 | |
5b04ee3b | 4866 | #: builtin/branch.c:242 |
81809b99 | 4867 | #, c-format |
8ada9598 | 4868 | msgid "branch '%s' not found." |
81809b99 | 4869 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 4870 | |
5b04ee3b | 4871 | #: builtin/branch.c:257 |
81809b99 | 4872 | #, c-format |
7aea43ff JX |
4873 | msgid "Error deleting remote-tracking branch '%s'" |
4874 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 4875 | |
5b04ee3b | 4876 | #: builtin/branch.c:258 |
81809b99 | 4877 | #, c-format |
8ada9598 | 4878 | msgid "Error deleting branch '%s'" |
7aea43ff | 4879 | msgstr "无法删除分支 '%s'" |
8ada9598 | 4880 | |
5b04ee3b | 4881 | #: builtin/branch.c:265 |
81809b99 | 4882 | #, c-format |
7aea43ff JX |
4883 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
4884 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 4885 | |
5b04ee3b | 4886 | #: builtin/branch.c:266 |
81809b99 | 4887 | #, c-format |
8ada9598 | 4888 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 4889 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 4890 | |
5c57d762 | 4891 | #: builtin/branch.c:312 |
81809b99 | 4892 | #, c-format |
90314792 JX |
4893 | msgid "[%s: gone]" |
4894 | msgstr "[%s: 丢失]" | |
4895 | ||
5c57d762 | 4896 | #: builtin/branch.c:317 |
90314792 JX |
4897 | #, c-format |
4898 | msgid "[%s]" | |
4899 | msgstr "[%s]" | |
4900 | ||
5c57d762 | 4901 | #: builtin/branch.c:322 |
90314792 | 4902 | #, c-format |
8ada9598 | 4903 | msgid "[%s: behind %d]" |
81809b99 | 4904 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 4905 | |
5c57d762 | 4906 | #: builtin/branch.c:324 |
81809b99 | 4907 | #, c-format |
8ada9598 | 4908 | msgid "[behind %d]" |
81809b99 | 4909 | msgstr "[落后 %d]" |
8ada9598 | 4910 | |
5c57d762 | 4911 | #: builtin/branch.c:328 |
81809b99 | 4912 | #, c-format |
8ada9598 | 4913 | msgid "[%s: ahead %d]" |
81809b99 | 4914 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 4915 | |
5c57d762 | 4916 | #: builtin/branch.c:330 |
81809b99 | 4917 | #, c-format |
8ada9598 | 4918 | msgid "[ahead %d]" |
81809b99 | 4919 | msgstr "[领先 %d]" |
8ada9598 | 4920 | |
5c57d762 | 4921 | #: builtin/branch.c:333 |
81809b99 | 4922 | #, c-format |
8ada9598 | 4923 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 4924 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 4925 | |
5c57d762 | 4926 | #: builtin/branch.c:336 |
81809b99 | 4927 | #, c-format |
8ada9598 | 4928 | msgid "[ahead %d, behind %d]" |
81809b99 | 4929 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 4930 | |
5c57d762 | 4931 | #: builtin/branch.c:349 |
a77c07d9 JX |
4932 | msgid " **** invalid ref ****" |
4933 | msgstr " **** 无效引用 ****" | |
4934 | ||
5c57d762 | 4935 | #: builtin/branch.c:375 |
1003b3a5 JX |
4936 | #, c-format |
4937 | msgid "(no branch, rebasing %s)" | |
4938 | msgstr "(非分支,正变基 %s)" | |
4939 | ||
5c57d762 | 4940 | #: builtin/branch.c:378 |
1003b3a5 JX |
4941 | #, c-format |
4942 | msgid "(no branch, bisect started on %s)" | |
4943 | msgstr "(非分支,二分查找开始于 %s)" | |
4944 | ||
5b04ee3b JX |
4945 | #. TRANSLATORS: make sure this matches |
4946 | #. "HEAD detached at " in wt-status.c | |
5c57d762 | 4947 | #: builtin/branch.c:384 |
1003b3a5 | 4948 | #, c-format |
814ff314 JX |
4949 | msgid "(HEAD detached at %s)" |
4950 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 4951 | |
5b04ee3b JX |
4952 | #. TRANSLATORS: make sure this matches |
4953 | #. "HEAD detached from " in wt-status.c | |
5c57d762 | 4954 | #: builtin/branch.c:389 |
814ff314 JX |
4955 | #, c-format |
4956 | msgid "(HEAD detached from %s)" | |
4957 | msgstr "(头指针分离自 %s)" | |
4958 | ||
5c57d762 | 4959 | #: builtin/branch.c:393 |
c04f5ac3 JX |
4960 | msgid "(no branch)" |
4961 | msgstr "(非分支)" | |
4962 | ||
5c57d762 | 4963 | #: builtin/branch.c:544 |
5b04ee3b JX |
4964 | #, c-format |
4965 | msgid "Branch %s is being rebased at %s" | |
4966 | msgstr "分支 %s 正被变基到 %s" | |
4967 | ||
5c57d762 | 4968 | #: builtin/branch.c:548 |
5b04ee3b JX |
4969 | #, c-format |
4970 | msgid "Branch %s is being bisected at %s" | |
4971 | msgstr "分支 %s 正被二分查找于 %s" | |
4972 | ||
5c57d762 | 4973 | #: builtin/branch.c:563 |
c04f5ac3 | 4974 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 4975 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 4976 | |
5c57d762 | 4977 | #: builtin/branch.c:573 |
c04f5ac3 JX |
4978 | #, c-format |
4979 | msgid "Invalid branch name: '%s'" | |
4980 | msgstr "无效的分支名:'%s'" | |
4981 | ||
5c57d762 | 4982 | #: builtin/branch.c:590 |
c04f5ac3 JX |
4983 | msgid "Branch rename failed" |
4984 | msgstr "分支重命名失败" | |
4985 | ||
5c57d762 | 4986 | #: builtin/branch.c:594 |
c04f5ac3 JX |
4987 | #, c-format |
4988 | msgid "Renamed a misnamed branch '%s' away" | |
4989 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
4990 | ||
5c57d762 | 4991 | #: builtin/branch.c:597 |
c04f5ac3 JX |
4992 | #, c-format |
4993 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
4994 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
4995 | ||
5c57d762 | 4996 | #: builtin/branch.c:604 |
c04f5ac3 JX |
4997 | msgid "Branch is renamed, but update of config-file failed" |
4998 | msgstr "分支被重命名,但更新 config 文件失败" | |
4999 | ||
5c57d762 JX |
5000 | #: builtin/branch.c:620 |
5001 | #, c-format | |
5002 | msgid "" | |
5003 | "Please edit the description for the branch\n" | |
5004 | " %s\n" | |
5005 | "Lines starting with '%c' will be stripped.\n" | |
5006 | msgstr "" | |
5007 | "请编辑分支的描述\n" | |
5008 | " %s\n" | |
5009 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 5010 | |
5b04ee3b | 5011 | #: builtin/branch.c:651 |
ef317cd5 | 5012 | msgid "Generic options" |
07432cef | 5013 | msgstr "通用选项" |
c04f5ac3 | 5014 | |
5b04ee3b | 5015 | #: builtin/branch.c:653 |
ef317cd5 | 5016 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 5017 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 5018 | |
5b04ee3b | 5019 | #: builtin/branch.c:654 |
ef317cd5 | 5020 | msgid "suppress informational messages" |
07432cef | 5021 | msgstr "不显示信息" |
8ada9598 | 5022 | |
5b04ee3b | 5023 | #: builtin/branch.c:655 |
ef317cd5 | 5024 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 5025 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 5026 | |
5b04ee3b | 5027 | #: builtin/branch.c:657 |
ef317cd5 | 5028 | msgid "change upstream info" |
07432cef | 5029 | msgstr "改变上游信息" |
c04f5ac3 | 5030 | |
5b04ee3b JX |
5031 | #: builtin/branch.c:659 |
5032 | msgid "upstream" | |
5033 | msgstr "上游" | |
5034 | ||
5035 | #: builtin/branch.c:659 | |
5036 | msgid "change the upstream info" | |
5037 | msgstr "改变上游信息" | |
5038 | ||
a0b6b246 JX |
5039 | #: builtin/branch.c:660 |
5040 | msgid "Unset the upstream info" | |
5041 | msgstr "取消上游信息的设置" | |
5042 | ||
5b04ee3b | 5043 | #: builtin/branch.c:661 |
ef317cd5 | 5044 | msgid "use colored output" |
07432cef | 5045 | msgstr "使用彩色输出" |
c04f5ac3 | 5046 | |
5b04ee3b | 5047 | #: builtin/branch.c:662 |
ef317cd5 | 5048 | msgid "act on remote-tracking branches" |
07432cef | 5049 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 5050 | |
5b04ee3b | 5051 | #: builtin/branch.c:664 builtin/branch.c:665 |
ef317cd5 | 5052 | msgid "print only branches that contain the commit" |
07432cef | 5053 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 5054 | |
5b04ee3b | 5055 | #: builtin/branch.c:668 |
ef317cd5 | 5056 | msgid "Specific git-branch actions:" |
07432cef | 5057 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 5058 | |
5b04ee3b | 5059 | #: builtin/branch.c:669 |
ef317cd5 | 5060 | msgid "list both remote-tracking and local branches" |
07432cef | 5061 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 5062 | |
5b04ee3b | 5063 | #: builtin/branch.c:671 |
ef317cd5 | 5064 | msgid "delete fully merged branch" |
07432cef | 5065 | msgstr "删除完全合并的分支" |
c04f5ac3 | 5066 | |
5b04ee3b | 5067 | #: builtin/branch.c:672 |
ef317cd5 | 5068 | msgid "delete branch (even if not merged)" |
07432cef | 5069 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 5070 | |
5b04ee3b | 5071 | #: builtin/branch.c:673 |
ef317cd5 | 5072 | msgid "move/rename a branch and its reflog" |
07432cef | 5073 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 5074 | |
5b04ee3b | 5075 | #: builtin/branch.c:674 |
ef317cd5 | 5076 | msgid "move/rename a branch, even if target exists" |
07432cef | 5077 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 5078 | |
5b04ee3b | 5079 | #: builtin/branch.c:675 |
ef317cd5 | 5080 | msgid "list branch names" |
07432cef | 5081 | msgstr "列出分支名" |
c04f5ac3 | 5082 | |
5b04ee3b | 5083 | #: builtin/branch.c:676 |
ef317cd5 | 5084 | msgid "create the branch's reflog" |
07432cef | 5085 | msgstr "创建分支的引用日志" |
ef317cd5 | 5086 | |
5b04ee3b | 5087 | #: builtin/branch.c:678 |
ef317cd5 | 5088 | msgid "edit the description for the branch" |
07432cef | 5089 | msgstr "标记分支的描述" |
ef317cd5 | 5090 | |
5b04ee3b | 5091 | #: builtin/branch.c:679 |
04cb2f28 JX |
5092 | msgid "force creation, move/rename, deletion" |
5093 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 5094 | |
5b04ee3b | 5095 | #: builtin/branch.c:680 |
94550ed3 JX |
5096 | msgid "print only branches that are merged" |
5097 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 5098 | |
5b04ee3b | 5099 | #: builtin/branch.c:681 |
94550ed3 JX |
5100 | msgid "print only branches that are not merged" |
5101 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 5102 | |
5b04ee3b | 5103 | #: builtin/branch.c:682 |
ef317cd5 | 5104 | msgid "list branches in columns" |
07432cef | 5105 | msgstr "以列的方式显示分支" |
ef317cd5 | 5106 | |
5b04ee3b | 5107 | #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 |
94550ed3 JX |
5108 | msgid "key" |
5109 | msgstr "key" | |
5110 | ||
5b04ee3b | 5111 | #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 |
94550ed3 JX |
5112 | msgid "field name to sort on" |
5113 | msgstr "排序的字段名" | |
5114 | ||
a0b6b246 JX |
5115 | #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 |
5116 | #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 | |
94550ed3 JX |
5117 | #: builtin/tag.c:369 |
5118 | msgid "object" | |
5119 | msgstr "对象" | |
5120 | ||
5b04ee3b | 5121 | #: builtin/branch.c:687 |
94550ed3 JX |
5122 | msgid "print only branches of the object" |
5123 | msgstr "只打印指向该对象的分支" | |
5124 | ||
5b04ee3b | 5125 | #: builtin/branch.c:705 |
c04f5ac3 JX |
5126 | msgid "Failed to resolve HEAD as a valid ref." |
5127 | msgstr "无法将 HEAD 解析为有效引用。" | |
5128 | ||
a0b6b246 | 5129 | #: builtin/branch.c:709 builtin/clone.c:706 |
c04f5ac3 | 5130 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 5131 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 5132 | |
5b04ee3b | 5133 | #: builtin/branch.c:729 |
8ada9598 | 5134 | msgid "--column and --verbose are incompatible" |
81809b99 | 5135 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 5136 | |
5b04ee3b | 5137 | #: builtin/branch.c:740 builtin/branch.c:782 |
a77c07d9 JX |
5138 | msgid "branch name required" |
5139 | msgstr "必须提供分支名" | |
5140 | ||
5b04ee3b | 5141 | #: builtin/branch.c:758 |
a77c07d9 JX |
5142 | msgid "Cannot give description to detached HEAD" |
5143 | msgstr "不能向分离头指针提供描述" | |
5144 | ||
5b04ee3b | 5145 | #: builtin/branch.c:763 |
a77c07d9 JX |
5146 | msgid "cannot edit description of more than one branch" |
5147 | msgstr "不能为一个以上的分支编辑描述" | |
5148 | ||
5b04ee3b | 5149 | #: builtin/branch.c:770 |
a77c07d9 JX |
5150 | #, c-format |
5151 | msgid "No commit on branch '%s' yet." | |
5152 | msgstr "分支 '%s' 尚无提交。" | |
5153 | ||
5b04ee3b | 5154 | #: builtin/branch.c:773 |
a77c07d9 JX |
5155 | #, c-format |
5156 | msgid "No branch named '%s'." | |
5157 | msgstr "没有分支 '%s'。" | |
5158 | ||
5b04ee3b | 5159 | #: builtin/branch.c:788 |
a77c07d9 JX |
5160 | msgid "too many branches for a rename operation" |
5161 | msgstr "为重命名操作提供了太多的分支名" | |
5162 | ||
5b04ee3b | 5163 | #: builtin/branch.c:793 |
1003b3a5 JX |
5164 | msgid "too many branches to set new upstream" |
5165 | msgstr "为设置新上游提供了太多的分支名" | |
5166 | ||
5b04ee3b | 5167 | #: builtin/branch.c:797 |
1003b3a5 JX |
5168 | #, c-format |
5169 | msgid "" | |
5170 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
5171 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
5172 | ||
5b04ee3b | 5173 | #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 |
1003b3a5 JX |
5174 | #, c-format |
5175 | msgid "no such branch '%s'" | |
5176 | msgstr "没有此分支 '%s'" | |
5177 | ||
5b04ee3b | 5178 | #: builtin/branch.c:804 |
07432cef | 5179 | #, c-format |
ef317cd5 | 5180 | msgid "branch '%s' does not exist" |
07432cef | 5181 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 5182 | |
5b04ee3b | 5183 | #: builtin/branch.c:816 |
1003b3a5 JX |
5184 | msgid "too many branches to unset upstream" |
5185 | msgstr "为取消上游设置操作提供了太多的分支名" | |
5186 | ||
5b04ee3b | 5187 | #: builtin/branch.c:820 |
1003b3a5 JX |
5188 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
5189 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
5190 | ||
5b04ee3b | 5191 | #: builtin/branch.c:826 |
ef317cd5 JX |
5192 | #, c-format |
5193 | msgid "Branch '%s' has no upstream information" | |
07432cef | 5194 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 5195 | |
5b04ee3b | 5196 | #: builtin/branch.c:840 |
1003b3a5 JX |
5197 | msgid "it does not make sense to create 'HEAD' manually" |
5198 | msgstr "手工创建 'HEAD' 没有意义" | |
5199 | ||
5b04ee3b | 5200 | #: builtin/branch.c:846 |
c04f5ac3 JX |
5201 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
5202 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
5203 | ||
5b04ee3b | 5204 | #: builtin/branch.c:849 |
ef317cd5 JX |
5205 | #, c-format |
5206 | msgid "" | |
5207 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
5208 | "track or --set-upstream-to\n" | |
5209 | msgstr "" | |
07432cef | 5210 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 5211 | |
5b04ee3b | 5212 | #: builtin/branch.c:866 |
ef317cd5 JX |
5213 | #, c-format |
5214 | msgid "" | |
5215 | "\n" | |
5216 | "If you wanted to make '%s' track '%s', do this:\n" | |
5217 | "\n" | |
5218 | msgstr "" | |
07432cef WS |
5219 | "\n" |
5220 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
5221 | "\n" | |
ef317cd5 | 5222 | |
7aea43ff | 5223 | #: builtin/bundle.c:51 |
c04f5ac3 JX |
5224 | #, c-format |
5225 | msgid "%s is okay\n" | |
5226 | msgstr "%s 可以\n" | |
5227 | ||
7aea43ff | 5228 | #: builtin/bundle.c:64 |
c04f5ac3 | 5229 | msgid "Need a repository to create a bundle." |
160fb2b2 | 5230 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 5231 | |
7aea43ff | 5232 | #: builtin/bundle.c:68 |
c04f5ac3 | 5233 | msgid "Need a repository to unbundle." |
160fb2b2 | 5234 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 5235 | |
a0b6b246 | 5236 | #: builtin/cat-file.c:513 |
7aea43ff | 5237 | msgid "" |
a0b6b246 JX |
5238 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
5239 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
5240 | msgstr "" |
5241 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
5242 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 5243 | |
a0b6b246 JX |
5244 | #: builtin/cat-file.c:514 |
5245 | msgid "" | |
5246 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
5247 | "filters]" | |
275588f9 JX |
5248 | msgstr "" |
5249 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
5250 | "filters]" | |
ef317cd5 | 5251 | |
a0b6b246 | 5252 | #: builtin/cat-file.c:551 |
ef317cd5 | 5253 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 5254 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 5255 | |
a0b6b246 | 5256 | #: builtin/cat-file.c:552 |
ef317cd5 | 5257 | msgid "show object type" |
07432cef | 5258 | msgstr "显示对象类型" |
ef317cd5 | 5259 | |
a0b6b246 | 5260 | #: builtin/cat-file.c:553 |
ef317cd5 | 5261 | msgid "show object size" |
07432cef | 5262 | msgstr "显示对象大小" |
ef317cd5 | 5263 | |
a0b6b246 | 5264 | #: builtin/cat-file.c:555 |
ef317cd5 | 5265 | msgid "exit with zero when there's no error" |
07432cef | 5266 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 5267 | |
a0b6b246 | 5268 | #: builtin/cat-file.c:556 |
ef317cd5 | 5269 | msgid "pretty-print object's content" |
07432cef | 5270 | msgstr "美观地打印对象的内容" |
ef317cd5 | 5271 | |
a0b6b246 | 5272 | #: builtin/cat-file.c:558 |
ef317cd5 | 5273 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
5274 | msgstr "对于数据对象,对其内容做文本转换" |
5275 | ||
5276 | #: builtin/cat-file.c:560 | |
5277 | msgid "for blob objects, run filters on object's content" | |
5278 | msgstr "对于数据对象,对其内容做过滤" | |
5279 | ||
5280 | #: builtin/cat-file.c:561 git-submodule.sh:923 | |
5281 | msgid "blob" | |
5282 | msgstr "数据对象" | |
5283 | ||
5284 | #: builtin/cat-file.c:562 | |
5285 | msgid "use a specific path for --textconv/--filters" | |
5286 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 5287 | |
a0b6b246 | 5288 | #: builtin/cat-file.c:564 |
7aea43ff JX |
5289 | msgid "allow -s and -t to work with broken/corrupt objects" |
5290 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
5291 | ||
a0b6b246 | 5292 | #: builtin/cat-file.c:565 |
1b7f4a34 JX |
5293 | msgid "buffer --batch output" |
5294 | msgstr "缓冲 --batch 的输出" | |
5295 | ||
a0b6b246 | 5296 | #: builtin/cat-file.c:567 |
ef317cd5 | 5297 | msgid "show info and content of objects fed from the standard input" |
07432cef | 5298 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 5299 | |
a0b6b246 | 5300 | #: builtin/cat-file.c:570 |
ef317cd5 | 5301 | msgid "show info about objects fed from the standard input" |
07432cef | 5302 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 5303 | |
a0b6b246 | 5304 | #: builtin/cat-file.c:573 |
7aea43ff JX |
5305 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
5306 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
5307 | ||
a0b6b246 | 5308 | #: builtin/cat-file.c:575 |
1b7f4a34 JX |
5309 | msgid "show all objects with --batch or --batch-check" |
5310 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
5311 | ||
ef317cd5 | 5312 | #: builtin/check-attr.c:11 |
814ff314 JX |
5313 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
5314 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
5315 | |
5316 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
5317 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
5318 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
5319 | |
5320 | #: builtin/check-attr.c:19 | |
5321 | msgid "report all attributes set on file" | |
07432cef | 5322 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
5323 | |
5324 | #: builtin/check-attr.c:20 | |
5325 | msgid "use .gitattributes only from the index" | |
07432cef | 5326 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 5327 | |
a0b6b246 | 5328 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 |
ef317cd5 | 5329 | msgid "read file names from stdin" |
07432cef | 5330 | msgstr "从标准输入读出文件名" |
ef317cd5 | 5331 | |
a77c07d9 | 5332 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
5333 | msgid "terminate input and output records by a NUL character" |
5334 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 5335 | |
a0b6b246 | 5336 | #: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 |
a77c07d9 JX |
5337 | msgid "suppress progress reporting" |
5338 | msgstr "不显示进度报告" | |
5339 | ||
2e8451e8 JX |
5340 | #: builtin/check-ignore.c:26 |
5341 | msgid "show non-matching input paths" | |
5342 | msgstr "显示未匹配的输入路径" | |
5343 | ||
90314792 JX |
5344 | #: builtin/check-ignore.c:28 |
5345 | msgid "ignore index when checking" | |
5346 | msgstr "检查时忽略索引" | |
5347 | ||
5348 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 5349 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 5350 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 5351 | |
90314792 | 5352 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
5353 | msgid "-z only makes sense with --stdin" |
5354 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
5355 | ||
90314792 | 5356 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
5357 | msgid "no path specified" |
5358 | msgstr "未指定路径" | |
5359 | ||
90314792 | 5360 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
5361 | msgid "--quiet is only valid with a single pathname" |
5362 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
5363 | ||
90314792 | 5364 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
5365 | msgid "cannot have both --quiet and --verbose" |
5366 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
5367 | ||
90314792 | 5368 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
5369 | msgid "--non-matching is only valid with --verbose" |
5370 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
5371 | ||
5372 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
5373 | msgid "git check-mailmap [<options>] <contact>..." |
5374 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
5375 | |
5376 | #: builtin/check-mailmap.c:13 | |
5377 | msgid "also read contacts from stdin" | |
5378 | msgstr "还从标准输入读取联系地址" | |
5379 | ||
5380 | #: builtin/check-mailmap.c:24 | |
5381 | #, c-format | |
5382 | msgid "unable to parse contact: %s" | |
5383 | msgstr "不能解析联系地址:%s" | |
5384 | ||
5385 | #: builtin/check-mailmap.c:47 | |
5386 | msgid "no contacts specified" | |
5387 | msgstr "未指定联系地址" | |
5388 | ||
276ceeaa | 5389 | #: builtin/checkout-index.c:127 |
814ff314 JX |
5390 | msgid "git checkout-index [<options>] [--] [<file>...]" |
5391 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 5392 | |
276ceeaa JX |
5393 | #: builtin/checkout-index.c:144 |
5394 | msgid "stage should be between 1 and 3 or all" | |
5395 | msgstr "索引值应该取值 1 到 3 或者 all" | |
5396 | ||
5397 | #: builtin/checkout-index.c:160 | |
ef317cd5 | 5398 | msgid "check out all files in the index" |
07432cef | 5399 | msgstr "检出索引区的所有文件" |
ef317cd5 | 5400 | |
276ceeaa | 5401 | #: builtin/checkout-index.c:161 |
ef317cd5 | 5402 | msgid "force overwrite of existing files" |
07432cef | 5403 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 5404 | |
276ceeaa | 5405 | #: builtin/checkout-index.c:163 |
ef317cd5 | 5406 | msgid "no warning for existing files and files not in index" |
07432cef | 5407 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 5408 | |
276ceeaa | 5409 | #: builtin/checkout-index.c:165 |
ef317cd5 | 5410 | msgid "don't checkout new files" |
07432cef | 5411 | msgstr "不检出新文件" |
ef317cd5 | 5412 | |
276ceeaa | 5413 | #: builtin/checkout-index.c:167 |
ef317cd5 | 5414 | msgid "update stat information in the index file" |
07432cef | 5415 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 5416 | |
276ceeaa | 5417 | #: builtin/checkout-index.c:171 |
ef317cd5 | 5418 | msgid "read list of paths from the standard input" |
07432cef | 5419 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 5420 | |
276ceeaa | 5421 | #: builtin/checkout-index.c:173 |
ef317cd5 | 5422 | msgid "write the content to temporary files" |
07432cef | 5423 | msgstr "将内容写入临时文件" |
ef317cd5 | 5424 | |
276ceeaa | 5425 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
a0b6b246 JX |
5426 | #: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 |
5427 | #: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 | |
5428 | #: builtin/worktree.c:469 | |
ef317cd5 | 5429 | msgid "string" |
07432cef | 5430 | msgstr "字符串" |
ef317cd5 | 5431 | |
276ceeaa | 5432 | #: builtin/checkout-index.c:175 |
ef317cd5 | 5433 | msgid "when creating files, prepend <string>" |
4375c10e | 5434 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 5435 | |
276ceeaa | 5436 | #: builtin/checkout-index.c:177 |
ef317cd5 | 5437 | msgid "copy out the files from named stage" |
07432cef | 5438 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 5439 | |
1b7f4a34 | 5440 | #: builtin/checkout.c:25 |
814ff314 JX |
5441 | msgid "git checkout [<options>] <branch>" |
5442 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 5443 | |
1b7f4a34 | 5444 | #: builtin/checkout.c:26 |
814ff314 JX |
5445 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
5446 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 5447 | |
94550ed3 | 5448 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
5449 | #, c-format |
5450 | msgid "path '%s' does not have our version" | |
5451 | msgstr "路径 '%s' 没有我们的版本" | |
5452 | ||
94550ed3 | 5453 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
5454 | #, c-format |
5455 | msgid "path '%s' does not have their version" | |
5456 | msgstr "路径 '%s' 没有他们的版本" | |
5457 | ||
94550ed3 | 5458 | #: builtin/checkout.c:152 |
c04f5ac3 JX |
5459 | #, c-format |
5460 | msgid "path '%s' does not have all necessary versions" | |
5461 | msgstr "路径 '%s' 没有全部必须的版本" | |
5462 | ||
94550ed3 | 5463 | #: builtin/checkout.c:196 |
c04f5ac3 JX |
5464 | #, c-format |
5465 | msgid "path '%s' does not have necessary versions" | |
5466 | msgstr "路径 '%s' 没有必须的版本" | |
5467 | ||
94550ed3 | 5468 | #: builtin/checkout.c:213 |
c04f5ac3 JX |
5469 | #, c-format |
5470 | msgid "path '%s': cannot merge" | |
90e6ef53 | 5471 | msgstr "path '%s':无法合并" |
c04f5ac3 | 5472 | |
94550ed3 | 5473 | #: builtin/checkout.c:230 |
c04f5ac3 JX |
5474 | #, c-format |
5475 | msgid "Unable to add merge result for '%s'" | |
5476 | msgstr "无法为 '%s' 添加合并结果" | |
5477 | ||
5b04ee3b JX |
5478 | #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 |
5479 | #: builtin/checkout.c:259 | |
07432cef | 5480 | #, c-format |
ef317cd5 | 5481 | msgid "'%s' cannot be used with updating paths" |
07432cef | 5482 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 5483 | |
5b04ee3b | 5484 | #: builtin/checkout.c:262 builtin/checkout.c:265 |
07432cef | 5485 | #, c-format |
ef317cd5 | 5486 | msgid "'%s' cannot be used with %s" |
07432cef | 5487 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 5488 | |
5b04ee3b | 5489 | #: builtin/checkout.c:268 |
ef317cd5 JX |
5490 | #, c-format |
5491 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 5492 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 5493 | |
5b04ee3b | 5494 | #: builtin/checkout.c:339 builtin/checkout.c:346 |
c04f5ac3 JX |
5495 | #, c-format |
5496 | msgid "path '%s' is unmerged" | |
5497 | msgstr "路径 '%s' 未合并" | |
5498 | ||
a0b6b246 | 5499 | #: builtin/checkout.c:494 |
c04f5ac3 | 5500 | msgid "you need to resolve your current index first" |
90e6ef53 | 5501 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 5502 | |
a0b6b246 | 5503 | #: builtin/checkout.c:624 |
c04f5ac3 | 5504 | #, c-format |
1b7f4a34 JX |
5505 | msgid "Can not do reflog for '%s': %s\n" |
5506 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 5507 | |
a0b6b246 | 5508 | #: builtin/checkout.c:663 |
c04f5ac3 JX |
5509 | msgid "HEAD is now at" |
5510 | msgstr "HEAD 目前位于" | |
5511 | ||
a0b6b246 | 5512 | #: builtin/checkout.c:667 builtin/clone.c:660 |
3495628d JX |
5513 | msgid "unable to update HEAD" |
5514 | msgstr "不能更新 HEAD" | |
5515 | ||
a0b6b246 | 5516 | #: builtin/checkout.c:671 |
c04f5ac3 JX |
5517 | #, c-format |
5518 | msgid "Reset branch '%s'\n" | |
5519 | msgstr "重置分支 '%s'\n" | |
5520 | ||
a0b6b246 | 5521 | #: builtin/checkout.c:674 |
c04f5ac3 JX |
5522 | #, c-format |
5523 | msgid "Already on '%s'\n" | |
5524 | msgstr "已经位于 '%s'\n" | |
5525 | ||
a0b6b246 | 5526 | #: builtin/checkout.c:678 |
c04f5ac3 JX |
5527 | #, c-format |
5528 | msgid "Switched to and reset branch '%s'\n" | |
5529 | msgstr "切换并重置分支 '%s'\n" | |
5530 | ||
a0b6b246 | 5531 | #: builtin/checkout.c:680 builtin/checkout.c:1069 |
c04f5ac3 JX |
5532 | #, c-format |
5533 | msgid "Switched to a new branch '%s'\n" | |
5534 | msgstr "切换到一个新分支 '%s'\n" | |
5535 | ||
a0b6b246 | 5536 | #: builtin/checkout.c:682 |
c04f5ac3 JX |
5537 | #, c-format |
5538 | msgid "Switched to branch '%s'\n" | |
5539 | msgstr "切换到分支 '%s'\n" | |
5540 | ||
90e6ef53 | 5541 | # 译者:注意保持前导空格 |
a0b6b246 | 5542 | #: builtin/checkout.c:733 |
c04f5ac3 JX |
5543 | #, c-format |
5544 | msgid " ... and %d more.\n" | |
90e6ef53 | 5545 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 5546 | |
a0b6b246 | 5547 | #: builtin/checkout.c:739 |
c04f5ac3 JX |
5548 | #, c-format |
5549 | msgid "" | |
5550 | "Warning: you are leaving %d commit behind, not connected to\n" | |
5551 | "any of your branches:\n" | |
5552 | "\n" | |
5553 | "%s\n" | |
5554 | msgid_plural "" | |
5555 | "Warning: you are leaving %d commits behind, not connected to\n" | |
5556 | "any of your branches:\n" | |
5557 | "\n" | |
5558 | "%s\n" | |
5559 | msgstr[0] "" | |
5560 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
5561 | "\n" | |
5562 | "%s\n" | |
5ae481e0 JX |
5563 | msgstr[1] "" |
5564 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
5565 | "\n" | |
5566 | "%s\n" | |
c04f5ac3 | 5567 | |
a0b6b246 | 5568 | #: builtin/checkout.c:758 |
c04f5ac3 JX |
5569 | #, c-format |
5570 | msgid "" | |
7aea43ff JX |
5571 | "If you want to keep it by creating a new branch, this may be a good time\n" |
5572 | "to do so with:\n" | |
5573 | "\n" | |
5574 | " git branch <new-branch-name> %s\n" | |
5575 | "\n" | |
5576 | msgid_plural "" | |
c04f5ac3 JX |
5577 | "If you want to keep them by creating a new branch, this may be a good time\n" |
5578 | "to do so with:\n" | |
5579 | "\n" | |
814ff314 | 5580 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 5581 | "\n" |
7aea43ff JX |
5582 | msgstr[0] "" |
5583 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
5584 | "如下操作:\n" | |
5585 | "\n" | |
5586 | " git branch <新分支名> %s\n" | |
5587 | "\n" | |
5588 | msgstr[1] "" | |
5589 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
5590 | "如下操作:\n" |
5591 | "\n" | |
814ff314 | 5592 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
5593 | "\n" |
5594 | ||
a0b6b246 | 5595 | #: builtin/checkout.c:794 |
c04f5ac3 JX |
5596 | msgid "internal error in revision walk" |
5597 | msgstr "在版本遍历时遇到内部错误" | |
5598 | ||
a0b6b246 | 5599 | #: builtin/checkout.c:798 |
c04f5ac3 JX |
5600 | msgid "Previous HEAD position was" |
5601 | msgstr "之前的 HEAD 位置是" | |
5602 | ||
a0b6b246 | 5603 | #: builtin/checkout.c:825 builtin/checkout.c:1064 |
c04f5ac3 | 5604 | msgid "You are on a branch yet to be born" |
90e6ef53 | 5605 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 5606 | |
a0b6b246 | 5607 | #: builtin/checkout.c:970 |
90314792 JX |
5608 | #, c-format |
5609 | msgid "only one reference expected, %d given." | |
a0b6b246 | 5610 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 5611 | |
a0b6b246 | 5612 | #: builtin/checkout.c:1010 builtin/worktree.c:214 |
c04f5ac3 JX |
5613 | #, c-format |
5614 | msgid "invalid reference: %s" | |
5615 | msgstr "无效引用:%s" | |
5616 | ||
a0b6b246 | 5617 | #: builtin/checkout.c:1039 |
c04f5ac3 JX |
5618 | #, c-format |
5619 | msgid "reference is not a tree: %s" | |
5620 | msgstr "引用不是一个树:%s" | |
5621 | ||
a0b6b246 | 5622 | #: builtin/checkout.c:1078 |
ef317cd5 | 5623 | msgid "paths cannot be used with switching branches" |
07432cef | 5624 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 5625 | |
a0b6b246 | 5626 | #: builtin/checkout.c:1081 builtin/checkout.c:1085 |
07432cef | 5627 | #, c-format |
ef317cd5 | 5628 | msgid "'%s' cannot be used with switching branches" |
07432cef | 5629 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 5630 | |
a0b6b246 JX |
5631 | #: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 |
5632 | #: builtin/checkout.c:1100 | |
07432cef | 5633 | #, c-format |
ef317cd5 | 5634 | msgid "'%s' cannot be used with '%s'" |
07432cef | 5635 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 5636 | |
a0b6b246 | 5637 | #: builtin/checkout.c:1105 |
07432cef | 5638 | #, c-format |
ef317cd5 | 5639 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 5640 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 5641 | |
a0b6b246 | 5642 | #: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 |
5c57d762 JX |
5643 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 |
5644 | #: builtin/worktree.c:326 | |
ef317cd5 | 5645 | msgid "branch" |
07432cef | 5646 | msgstr "分支" |
c04f5ac3 | 5647 | |
a0b6b246 | 5648 | #: builtin/checkout.c:1139 |
ef317cd5 | 5649 | msgid "create and checkout a new branch" |
07432cef | 5650 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 5651 | |
a0b6b246 | 5652 | #: builtin/checkout.c:1141 |
ef317cd5 | 5653 | msgid "create/reset and checkout a branch" |
07432cef | 5654 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 5655 | |
a0b6b246 | 5656 | #: builtin/checkout.c:1142 |
ef317cd5 | 5657 | msgid "create reflog for new branch" |
07432cef | 5658 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 5659 | |
a0b6b246 | 5660 | #: builtin/checkout.c:1143 builtin/worktree.c:328 |
5c57d762 JX |
5661 | msgid "detach HEAD at named commit" |
5662 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 5663 | |
a0b6b246 | 5664 | #: builtin/checkout.c:1144 |
ef317cd5 | 5665 | msgid "set upstream info for new branch" |
07432cef | 5666 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 5667 | |
a0b6b246 | 5668 | #: builtin/checkout.c:1146 |
6c94aba5 | 5669 | msgid "new-branch" |
07432cef | 5670 | msgstr "新分支" |
ef317cd5 | 5671 | |
a0b6b246 | 5672 | #: builtin/checkout.c:1146 |
ef317cd5 | 5673 | msgid "new unparented branch" |
07432cef | 5674 | msgstr "新的没有父提交的分支" |
ef317cd5 | 5675 | |
a0b6b246 | 5676 | #: builtin/checkout.c:1147 |
ef317cd5 | 5677 | msgid "checkout our version for unmerged files" |
07432cef | 5678 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 5679 | |
a0b6b246 | 5680 | #: builtin/checkout.c:1149 |
ef317cd5 | 5681 | msgid "checkout their version for unmerged files" |
07432cef | 5682 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 5683 | |
a0b6b246 | 5684 | #: builtin/checkout.c:1151 |
ef317cd5 | 5685 | msgid "force checkout (throw away local modifications)" |
07432cef | 5686 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 5687 | |
a0b6b246 | 5688 | #: builtin/checkout.c:1152 |
ef317cd5 | 5689 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 5690 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 5691 | |
a0b6b246 | 5692 | #: builtin/checkout.c:1153 builtin/merge.c:231 |
ef317cd5 | 5693 | msgid "update ignored files (default)" |
07432cef | 5694 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 5695 | |
a0b6b246 | 5696 | #: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 |
ef317cd5 | 5697 | msgid "style" |
07432cef | 5698 | msgstr "风格" |
ef317cd5 | 5699 | |
a0b6b246 | 5700 | #: builtin/checkout.c:1155 |
ef317cd5 | 5701 | msgid "conflict style (merge or diff3)" |
07432cef | 5702 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 5703 | |
a0b6b246 | 5704 | #: builtin/checkout.c:1158 |
4dcdc3d8 JX |
5705 | msgid "do not limit pathspecs to sparse entries only" |
5706 | msgstr "对路径不做稀疏检出的限制" | |
5707 | ||
a0b6b246 | 5708 | #: builtin/checkout.c:1160 |
814ff314 JX |
5709 | msgid "second guess 'git checkout <no-such-branch>'" |
5710 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 5711 | |
a0b6b246 | 5712 | #: builtin/checkout.c:1162 |
7aea43ff JX |
5713 | msgid "do not check if another worktree is holding the given ref" |
5714 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
5715 | ||
a0b6b246 JX |
5716 | #: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 |
5717 | #: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 | |
94550ed3 JX |
5718 | #: builtin/send-pack.c:168 |
5719 | msgid "force progress reporting" | |
5720 | msgstr "强制显示进度报告" | |
5721 | ||
a0b6b246 | 5722 | #: builtin/checkout.c:1194 |
ef317cd5 | 5723 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 5724 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 5725 | |
a0b6b246 | 5726 | #: builtin/checkout.c:1211 |
ef317cd5 JX |
5727 | msgid "--track needs a branch name" |
5728 | msgstr "--track 需要一个分支名" | |
5729 | ||
a0b6b246 | 5730 | #: builtin/checkout.c:1216 |
ef317cd5 JX |
5731 | msgid "Missing branch name; try -b" |
5732 | msgstr "缺少分支名;尝试 -b" | |
5733 | ||
a0b6b246 | 5734 | #: builtin/checkout.c:1252 |
c04f5ac3 | 5735 | msgid "invalid path specification" |
90e6ef53 | 5736 | msgstr "无效的路径规格" |
c04f5ac3 | 5737 | |
a0b6b246 | 5738 | #: builtin/checkout.c:1259 |
07432cef | 5739 | #, c-format |
c04f5ac3 | 5740 | msgid "" |
ef317cd5 | 5741 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
5742 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
5743 | msgstr "" | |
07432cef WS |
5744 | "不能同时更新路径并切换到分支'%s'。\n" |
5745 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 5746 | |
a0b6b246 | 5747 | #: builtin/checkout.c:1264 |
07432cef | 5748 | #, c-format |
ef317cd5 | 5749 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 5750 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 5751 | |
a0b6b246 | 5752 | #: builtin/checkout.c:1268 |
c04f5ac3 JX |
5753 | msgid "" |
5754 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
5755 | "checking out of the index." | |
5756 | msgstr "" | |
90e6ef53 | 5757 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 5758 | |
1b7f4a34 | 5759 | #: builtin/clean.c:25 |
2e8451e8 JX |
5760 | msgid "" |
5761 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
5762 | msgstr "" | |
5763 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 5764 | |
1b7f4a34 | 5765 | #: builtin/clean.c:29 |
07432cef WS |
5766 | #, c-format |
5767 | msgid "Removing %s\n" | |
5768 | msgstr "正删除 %s\n" | |
5769 | ||
1b7f4a34 | 5770 | #: builtin/clean.c:30 |
07432cef WS |
5771 | #, c-format |
5772 | msgid "Would remove %s\n" | |
5773 | msgstr "将删除 %s\n" | |
5774 | ||
1b7f4a34 | 5775 | #: builtin/clean.c:31 |
07432cef WS |
5776 | #, c-format |
5777 | msgid "Skipping repository %s\n" | |
160fb2b2 | 5778 | msgstr "忽略仓库 %s\n" |
07432cef | 5779 | |
1b7f4a34 | 5780 | #: builtin/clean.c:32 |
07432cef WS |
5781 | #, c-format |
5782 | msgid "Would skip repository %s\n" | |
160fb2b2 | 5783 | msgstr "将忽略仓库 %s\n" |
07432cef | 5784 | |
1b7f4a34 | 5785 | #: builtin/clean.c:33 |
07432cef WS |
5786 | #, c-format |
5787 | msgid "failed to remove %s" | |
5788 | msgstr "无法删除 %s" | |
5789 | ||
276ceeaa | 5790 | #: builtin/clean.c:291 |
2e8451e8 JX |
5791 | msgid "" |
5792 | "Prompt help:\n" | |
5793 | "1 - select a numbered item\n" | |
5794 | "foo - select item based on unique prefix\n" | |
5795 | " - (empty) select nothing" | |
5796 | msgstr "" | |
5797 | "帮助:\n" | |
5798 | "1 - 通过编号选择一个选项\n" | |
5799 | "foo - 通过标题选择一个选项\n" | |
5800 | " - (空)什么也不选择" | |
5801 | ||
276ceeaa | 5802 | #: builtin/clean.c:295 |
2e8451e8 JX |
5803 | msgid "" |
5804 | "Prompt help:\n" | |
5805 | "1 - select a single item\n" | |
5806 | "3-5 - select a range of items\n" | |
5807 | "2-3,6-9 - select multiple ranges\n" | |
5808 | "foo - select item based on unique prefix\n" | |
5809 | "-... - unselect specified items\n" | |
5810 | "* - choose all items\n" | |
5811 | " - (empty) finish selecting" | |
5812 | msgstr "" | |
5813 | "帮助:\n" | |
5814 | "1 - 选择一个选项\n" | |
5815 | "3-5 - 选择一个范围内的所有选项\n" | |
5816 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
5817 | "foo - 通过标题选择一个选项\n" | |
5818 | "-... - 反选特定的选项\n" | |
5819 | "* - 选择所有选项\n" | |
5820 | " - (空)结束选择" | |
5821 | ||
276ceeaa | 5822 | #: builtin/clean.c:511 |
2e8451e8 JX |
5823 | #, c-format |
5824 | msgid "Huh (%s)?" | |
5825 | msgstr "嗯(%s)?" | |
5826 | ||
276ceeaa | 5827 | #: builtin/clean.c:653 |
2e8451e8 JX |
5828 | #, c-format |
5829 | msgid "Input ignore patterns>> " | |
5830 | msgstr "输入模版以排除条目>> " | |
5831 | ||
276ceeaa | 5832 | #: builtin/clean.c:690 |
2e8451e8 JX |
5833 | #, c-format |
5834 | msgid "WARNING: Cannot find items matched by: %s" | |
5835 | msgstr "警告:无法找到和 %s 匹配的条目" | |
5836 | ||
276ceeaa | 5837 | #: builtin/clean.c:711 |
2e8451e8 JX |
5838 | msgid "Select items to delete" |
5839 | msgstr "选择要删除的条目" | |
5840 | ||
814ff314 | 5841 | #. TRANSLATORS: Make sure to keep [y/N] as is |
276ceeaa | 5842 | #: builtin/clean.c:752 |
2e8451e8 | 5843 | #, c-format |
814ff314 JX |
5844 | msgid "Remove %s [y/N]? " |
5845 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 5846 | |
276ceeaa | 5847 | #: builtin/clean.c:777 |
2e8451e8 JX |
5848 | msgid "Bye." |
5849 | msgstr "再见。" | |
5850 | ||
276ceeaa | 5851 | #: builtin/clean.c:785 |
2e8451e8 JX |
5852 | msgid "" |
5853 | "clean - start cleaning\n" | |
5854 | "filter by pattern - exclude items from deletion\n" | |
5855 | "select by numbers - select items to be deleted by numbers\n" | |
5856 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
5857 | "quit - stop cleaning\n" | |
5858 | "help - this screen\n" | |
5859 | "? - help for prompt selection" | |
5860 | msgstr "" | |
5861 | "clean - 开始清理\n" | |
5862 | "filter by pattern - 通过模版排除要删除的条目\n" | |
5863 | "select by numbers - 通过数字选择要删除的条目\n" | |
5864 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
5865 | "quit - 停止删除并退出\n" | |
5866 | "help - 显示本帮助\n" | |
5867 | "? - 显示如何在提示符下选择的帮助" | |
5868 | ||
276ceeaa | 5869 | #: builtin/clean.c:812 |
2e8451e8 JX |
5870 | msgid "*** Commands ***" |
5871 | msgstr "*** 命令 ***" | |
5872 | ||
276ceeaa | 5873 | #: builtin/clean.c:813 |
2e8451e8 JX |
5874 | msgid "What now" |
5875 | msgstr "请选择" | |
5876 | ||
276ceeaa | 5877 | #: builtin/clean.c:821 |
2e8451e8 JX |
5878 | msgid "Would remove the following item:" |
5879 | msgid_plural "Would remove the following items:" | |
5880 | msgstr[0] "将删除如下条目:" | |
5881 | msgstr[1] "将删除如下条目:" | |
5882 | ||
276ceeaa | 5883 | #: builtin/clean.c:838 |
2e8451e8 JX |
5884 | msgid "No more files to clean, exiting." |
5885 | msgstr "没有要清理的文件,退出。" | |
5886 | ||
276ceeaa | 5887 | #: builtin/clean.c:869 |
ef317cd5 | 5888 | msgid "do not print names of files removed" |
07432cef | 5889 | msgstr "不打印删除文件的名称" |
ef317cd5 | 5890 | |
276ceeaa | 5891 | #: builtin/clean.c:871 |
ef317cd5 | 5892 | msgid "force" |
07432cef | 5893 | msgstr "强制" |
ef317cd5 | 5894 | |
276ceeaa | 5895 | #: builtin/clean.c:872 |
2e8451e8 JX |
5896 | msgid "interactive cleaning" |
5897 | msgstr "交互式清除" | |
5898 | ||
276ceeaa | 5899 | #: builtin/clean.c:874 |
ef317cd5 | 5900 | msgid "remove whole directories" |
07432cef | 5901 | msgstr "删除整个目录" |
ef317cd5 | 5902 | |
a0b6b246 JX |
5903 | #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 |
5904 | #: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 | |
ef317cd5 | 5905 | msgid "pattern" |
07432cef | 5906 | msgstr "模式" |
ef317cd5 | 5907 | |
276ceeaa | 5908 | #: builtin/clean.c:876 |
ef317cd5 | 5909 | msgid "add <pattern> to ignore rules" |
4375c10e | 5910 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 5911 | |
276ceeaa | 5912 | #: builtin/clean.c:877 |
ef317cd5 | 5913 | msgid "remove ignored files, too" |
07432cef | 5914 | msgstr "也删除忽略的文件" |
ef317cd5 | 5915 | |
276ceeaa | 5916 | #: builtin/clean.c:879 |
ef317cd5 | 5917 | msgid "remove only ignored files" |
07432cef | 5918 | msgstr "只删除忽略的文件" |
c04f5ac3 | 5919 | |
276ceeaa | 5920 | #: builtin/clean.c:897 |
c04f5ac3 | 5921 | msgid "-x and -X cannot be used together" |
649900bc | 5922 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 5923 | |
276ceeaa | 5924 | #: builtin/clean.c:901 |
c04f5ac3 | 5925 | msgid "" |
6c94aba5 | 5926 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 5927 | "clean" |
c04f5ac3 | 5928 | msgstr "" |
2e8451e8 | 5929 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 5930 | |
276ceeaa | 5931 | #: builtin/clean.c:904 |
c04f5ac3 | 5932 | msgid "" |
6c94aba5 | 5933 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 5934 | "refusing to clean" |
c04f5ac3 | 5935 | msgstr "" |
2e8451e8 | 5936 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 5937 | |
220c313c | 5938 | #: builtin/clone.c:37 |
814ff314 | 5939 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 5940 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 5941 | |
a0b6b246 | 5942 | #: builtin/clone.c:65 |
ef317cd5 | 5943 | msgid "don't create a checkout" |
07432cef | 5944 | msgstr "不创建一个检出" |
ef317cd5 | 5945 | |
a0b6b246 | 5946 | #: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 |
ef317cd5 | 5947 | msgid "create a bare repository" |
160fb2b2 | 5948 | msgstr "创建一个纯仓库" |
ef317cd5 | 5949 | |
a0b6b246 | 5950 | #: builtin/clone.c:70 |
ef317cd5 | 5951 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 5952 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 5953 | |
a0b6b246 | 5954 | #: builtin/clone.c:72 |
ef317cd5 | 5955 | msgid "to clone from a local repository" |
160fb2b2 | 5956 | msgstr "从本地仓库克隆" |
ef317cd5 | 5957 | |
a0b6b246 | 5958 | #: builtin/clone.c:74 |
ef317cd5 | 5959 | msgid "don't use local hardlinks, always copy" |
07432cef | 5960 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 5961 | |
a0b6b246 | 5962 | #: builtin/clone.c:76 |
ef317cd5 | 5963 | msgid "setup as shared repository" |
160fb2b2 | 5964 | msgstr "设置为共享仓库" |
ef317cd5 | 5965 | |
a0b6b246 | 5966 | #: builtin/clone.c:78 builtin/clone.c:80 |
ef317cd5 | 5967 | msgid "initialize submodules in the clone" |
07432cef | 5968 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 5969 | |
a0b6b246 | 5970 | #: builtin/clone.c:82 |
5b04ee3b JX |
5971 | msgid "number of submodules cloned in parallel" |
5972 | msgstr "并发克隆的子模组的数量" | |
5973 | ||
a0b6b246 | 5974 | #: builtin/clone.c:83 builtin/init-db.c:475 |
ef317cd5 | 5975 | msgid "template-directory" |
07432cef | 5976 | msgstr "模板目录" |
ef317cd5 | 5977 | |
a0b6b246 | 5978 | #: builtin/clone.c:84 builtin/init-db.c:476 |
ef317cd5 | 5979 | msgid "directory from which templates will be used" |
07432cef | 5980 | msgstr "模板目录将被使用" |
ef317cd5 | 5981 | |
a0b6b246 JX |
5982 | #: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 |
5983 | #: builtin/submodule--helper.c:954 | |
ef317cd5 | 5984 | msgid "reference repository" |
160fb2b2 | 5985 | msgstr "参考仓库" |
ef317cd5 | 5986 | |
a0b6b246 | 5987 | #: builtin/clone.c:90 |
7aea43ff | 5988 | msgid "use --reference only while cloning" |
160fb2b2 | 5989 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 5990 | |
a0b6b246 | 5991 | #: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 |
ef317cd5 | 5992 | msgid "name" |
07432cef | 5993 | msgstr "名称" |
ef317cd5 | 5994 | |
a0b6b246 | 5995 | #: builtin/clone.c:92 |
ef317cd5 | 5996 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 5997 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 5998 | |
a0b6b246 | 5999 | #: builtin/clone.c:94 |
ef317cd5 | 6000 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 6001 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 6002 | |
a0b6b246 | 6003 | #: builtin/clone.c:96 |
ef317cd5 | 6004 | msgid "path to git-upload-pack on the remote" |
07432cef | 6005 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 6006 | |
a0b6b246 JX |
6007 | #: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 |
6008 | #: builtin/pull.c:202 | |
ef317cd5 | 6009 | msgid "depth" |
07432cef | 6010 | msgstr "深度" |
ef317cd5 | 6011 | |
a0b6b246 | 6012 | #: builtin/clone.c:98 |
ef317cd5 | 6013 | msgid "create a shallow clone of that depth" |
07432cef | 6014 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 6015 | |
a0b6b246 JX |
6016 | #: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 |
6017 | #: parse-options.h:142 | |
6018 | msgid "time" | |
6019 | msgstr "时间" | |
6020 | ||
6021 | #: builtin/clone.c:100 | |
6022 | msgid "create a shallow clone since a specific time" | |
6023 | msgstr "从一个特定时间创建一个浅克隆" | |
6024 | ||
6025 | #: builtin/clone.c:101 builtin/fetch.c:124 | |
6026 | msgid "revision" | |
6027 | msgstr "版本" | |
6028 | ||
6029 | #: builtin/clone.c:102 builtin/fetch.c:125 | |
6030 | msgid "deepen history of shallow clone by excluding rev" | |
6031 | msgstr "通过排除版本来深化浅克隆的历史" | |
6032 | ||
6033 | #: builtin/clone.c:104 | |
ef317cd5 | 6034 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 6035 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 6036 | |
a0b6b246 | 6037 | #: builtin/clone.c:106 |
5b04ee3b JX |
6038 | msgid "any cloned submodules will be shallow" |
6039 | msgstr "子模组将以浅下载模式克隆" | |
6040 | ||
a0b6b246 | 6041 | #: builtin/clone.c:107 builtin/init-db.c:484 |
ef317cd5 | 6042 | msgid "gitdir" |
07432cef | 6043 | msgstr "git目录" |
ef317cd5 | 6044 | |
a0b6b246 | 6045 | #: builtin/clone.c:108 builtin/init-db.c:485 |
ef317cd5 | 6046 | msgid "separate git dir from working tree" |
07432cef | 6047 | msgstr "git目录和工作区分离" |
ef317cd5 | 6048 | |
a0b6b246 | 6049 | #: builtin/clone.c:109 |
ef317cd5 | 6050 | msgid "key=value" |
07432cef | 6051 | msgstr "key=value" |
ef317cd5 | 6052 | |
a0b6b246 | 6053 | #: builtin/clone.c:110 |
ef317cd5 | 6054 | msgid "set config inside the new repository" |
160fb2b2 | 6055 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 6056 | |
a0b6b246 | 6057 | #: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 |
276ceeaa JX |
6058 | msgid "use IPv4 addresses only" |
6059 | msgstr "只使用 IPv4 地址" | |
6060 | ||
a0b6b246 | 6061 | #: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 |
276ceeaa JX |
6062 | msgid "use IPv6 addresses only" |
6063 | msgstr "只使用 IPv6 地址" | |
6064 | ||
a0b6b246 | 6065 | #: builtin/clone.c:250 |
3495628d JX |
6066 | msgid "" |
6067 | "No directory name could be guessed.\n" | |
6068 | "Please specify a directory on the command line" | |
6069 | msgstr "" | |
6070 | "无法猜到目录名。\n" | |
26e4cbec | 6071 | "请在命令行指定一个目录" |
3495628d | 6072 | |
a0b6b246 | 6073 | #: builtin/clone.c:303 |
cfff71a9 | 6074 | #, c-format |
a0b6b246 JX |
6075 | msgid "info: Could not add alternate for '%s': %s\n" |
6076 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 6077 | |
a0b6b246 | 6078 | #: builtin/clone.c:375 |
5c57d762 JX |
6079 | #, c-format |
6080 | msgid "failed to open '%s'" | |
6081 | msgstr "无法打开 '%s'" | |
6082 | ||
a0b6b246 | 6083 | #: builtin/clone.c:383 |
c04f5ac3 JX |
6084 | #, c-format |
6085 | msgid "%s exists and is not a directory" | |
6086 | msgstr "%s 存在且不是一个目录" | |
6087 | ||
a0b6b246 | 6088 | #: builtin/clone.c:397 |
c04f5ac3 JX |
6089 | #, c-format |
6090 | msgid "failed to stat %s\n" | |
90e6ef53 | 6091 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 6092 | |
a0b6b246 | 6093 | #: builtin/clone.c:419 |
c04f5ac3 JX |
6094 | #, c-format |
6095 | msgid "failed to create link '%s'" | |
90e6ef53 | 6096 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 6097 | |
a0b6b246 | 6098 | #: builtin/clone.c:423 |
c04f5ac3 JX |
6099 | #, c-format |
6100 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 6101 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 6102 | |
a0b6b246 | 6103 | #: builtin/clone.c:448 |
c04f5ac3 JX |
6104 | #, c-format |
6105 | msgid "done.\n" | |
6106 | msgstr "完成。\n" | |
6107 | ||
a0b6b246 | 6108 | #: builtin/clone.c:460 |
1003b3a5 JX |
6109 | msgid "" |
6110 | "Clone succeeded, but checkout failed.\n" | |
6111 | "You can inspect what was checked out with 'git status'\n" | |
6112 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
6113 | msgstr "" | |
6114 | "克隆成功,但是检出失败。\n" | |
6115 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
6116 | "'git checkout -f HEAD' 重试\n" | |
6117 | ||
a0b6b246 | 6118 | #: builtin/clone.c:537 |
c04f5ac3 JX |
6119 | #, c-format |
6120 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 6121 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 6122 | |
a0b6b246 | 6123 | #: builtin/clone.c:632 |
1003b3a5 JX |
6124 | msgid "remote did not send all necessary objects" |
6125 | msgstr "远程没有发送所有必须的对象" | |
6126 | ||
a0b6b246 | 6127 | #: builtin/clone.c:648 |
3495628d JX |
6128 | #, c-format |
6129 | msgid "unable to update %s" | |
6130 | msgstr "不能更新 %s" | |
6131 | ||
a0b6b246 | 6132 | #: builtin/clone.c:697 |
c04f5ac3 JX |
6133 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
6134 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
6135 | ||
a0b6b246 | 6136 | #: builtin/clone.c:728 |
1003b3a5 JX |
6137 | msgid "unable to checkout working tree" |
6138 | msgstr "不能检出工作区" | |
6139 | ||
a0b6b246 | 6140 | #: builtin/clone.c:768 |
3495628d JX |
6141 | msgid "unable to write parameters to config file" |
6142 | msgstr "无法将参数写入配置文件" | |
6143 | ||
a0b6b246 | 6144 | #: builtin/clone.c:831 |
04cb2f28 JX |
6145 | msgid "cannot repack to clean up" |
6146 | msgstr "无法执行 repack 来清理" | |
6147 | ||
a0b6b246 | 6148 | #: builtin/clone.c:833 |
04cb2f28 JX |
6149 | msgid "cannot unlink temporary alternates file" |
6150 | msgstr "无法删除临时的 alternates 文件" | |
6151 | ||
a0b6b246 | 6152 | #: builtin/clone.c:866 builtin/receive-pack.c:1895 |
c04f5ac3 JX |
6153 | msgid "Too many arguments." |
6154 | msgstr "太多参数。" | |
6155 | ||
a0b6b246 | 6156 | #: builtin/clone.c:870 |
c04f5ac3 | 6157 | msgid "You must specify a repository to clone." |
160fb2b2 | 6158 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 6159 | |
a0b6b246 | 6160 | #: builtin/clone.c:883 |
c04f5ac3 JX |
6161 | #, c-format |
6162 | msgid "--bare and --origin %s options are incompatible." | |
6163 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
6164 | ||
a0b6b246 | 6165 | #: builtin/clone.c:886 |
07432cef WS |
6166 | msgid "--bare and --separate-git-dir are incompatible." |
6167 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
6168 | ||
a0b6b246 | 6169 | #: builtin/clone.c:899 |
c04f5ac3 JX |
6170 | #, c-format |
6171 | msgid "repository '%s' does not exist" | |
160fb2b2 | 6172 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 6173 | |
a0b6b246 | 6174 | #: builtin/clone.c:905 builtin/fetch.c:1338 |
cfff71a9 JX |
6175 | #, c-format |
6176 | msgid "depth %s is not a positive number" | |
6177 | msgstr "深度 %s 不是一个正数" | |
6178 | ||
a0b6b246 | 6179 | #: builtin/clone.c:915 |
c04f5ac3 JX |
6180 | #, c-format |
6181 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 6182 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 6183 | |
a0b6b246 | 6184 | #: builtin/clone.c:925 |
c04f5ac3 JX |
6185 | #, c-format |
6186 | msgid "working tree '%s' already exists." | |
6187 | msgstr "工作区 '%s' 已经存在。" | |
6188 | ||
a0b6b246 | 6189 | #: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 |
5c57d762 | 6190 | #: builtin/worktree.c:222 builtin/worktree.c:249 |
5bb01d4f JX |
6191 | #, c-format |
6192 | msgid "could not create leading directories of '%s'" | |
6193 | msgstr "不能为 '%s' 创建先导目录" | |
6194 | ||
a0b6b246 | 6195 | #: builtin/clone.c:943 |
c04f5ac3 | 6196 | #, c-format |
814ff314 JX |
6197 | msgid "could not create work tree dir '%s'" |
6198 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 6199 | |
a0b6b246 | 6200 | #: builtin/clone.c:955 |
c04f5ac3 JX |
6201 | #, c-format |
6202 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 6203 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 6204 | |
a0b6b246 | 6205 | #: builtin/clone.c:957 |
c04f5ac3 JX |
6206 | #, c-format |
6207 | msgid "Cloning into '%s'...\n" | |
6208 | msgstr "正克隆到 '%s'...\n" | |
6209 | ||
a0b6b246 JX |
6210 | #: builtin/clone.c:963 |
6211 | msgid "" | |
6212 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
6213 | "able" | |
6214 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
6215 | ||
6216 | #: builtin/clone.c:1019 | |
6acbf033 | 6217 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
6218 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
6219 | ||
6220 | #: builtin/clone.c:1021 | |
6221 | msgid "--shallow-since is ignored in local clones; use file:// instead." | |
6222 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 6223 | |
a0b6b246 JX |
6224 | #: builtin/clone.c:1023 |
6225 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." | |
6226 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
6227 | ||
6228 | #: builtin/clone.c:1026 | |
6acbf033 | 6229 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 6230 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 6231 | |
a0b6b246 | 6232 | #: builtin/clone.c:1031 |
6acbf033 JX |
6233 | msgid "--local is ignored" |
6234 | msgstr "--local 被忽略" | |
6235 | ||
a0b6b246 | 6236 | #: builtin/clone.c:1035 |
c04f5ac3 JX |
6237 | #, c-format |
6238 | msgid "Don't know how to clone %s" | |
6239 | msgstr "不知道如何克隆 %s" | |
6240 | ||
a0b6b246 | 6241 | #: builtin/clone.c:1090 builtin/clone.c:1098 |
c04f5ac3 JX |
6242 | #, c-format |
6243 | msgid "Remote branch %s not found in upstream %s" | |
6244 | msgstr "远程分支 %s 在上游 %s 未发现" | |
6245 | ||
a0b6b246 | 6246 | #: builtin/clone.c:1101 |
c04f5ac3 | 6247 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 6248 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 6249 | |
ef317cd5 | 6250 | #: builtin/column.c:9 |
814ff314 JX |
6251 | msgid "git column [<options>]" |
6252 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
6253 | |
6254 | #: builtin/column.c:26 | |
6255 | msgid "lookup config vars" | |
07432cef | 6256 | msgstr "查找配置变量" |
ef317cd5 JX |
6257 | |
6258 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 6259 | msgid "layout to use" |
07432cef | 6260 | msgstr "要使用的布局" |
ef317cd5 JX |
6261 | |
6262 | #: builtin/column.c:29 | |
6263 | msgid "Maximum width" | |
07432cef | 6264 | msgstr "最大宽度" |
ef317cd5 JX |
6265 | |
6266 | #: builtin/column.c:30 | |
6267 | msgid "Padding space on left border" | |
07432cef | 6268 | msgstr "左边框的填充空间" |
ef317cd5 JX |
6269 | |
6270 | #: builtin/column.c:31 | |
6271 | msgid "Padding space on right border" | |
07432cef | 6272 | msgstr "右边框的填充空间" |
ef317cd5 JX |
6273 | |
6274 | #: builtin/column.c:32 | |
6275 | msgid "Padding space between columns" | |
07432cef | 6276 | msgstr "两列之间的填充空间" |
ef317cd5 | 6277 | |
8ada9598 JX |
6278 | #: builtin/column.c:51 |
6279 | msgid "--command must be the first argument" | |
81809b99 | 6280 | msgstr "--command 必须是第一个参数" |
8ada9598 | 6281 | |
94550ed3 | 6282 | #: builtin/commit.c:38 |
814ff314 | 6283 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 6284 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 6285 | |
94550ed3 | 6286 | #: builtin/commit.c:43 |
814ff314 | 6287 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 6288 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 6289 | |
94550ed3 | 6290 | #: builtin/commit.c:48 |
220c313c JX |
6291 | msgid "" |
6292 | "Your name and email address were configured automatically based\n" | |
6293 | "on your username and hostname. Please check that they are accurate.\n" | |
6294 | "You can suppress this message by setting them explicitly. Run the\n" | |
6295 | "following command and follow the instructions in your editor to edit\n" | |
6296 | "your configuration file:\n" | |
6297 | "\n" | |
6298 | " git config --global --edit\n" | |
6299 | "\n" | |
6300 | "After doing this, you may fix the identity used for this commit with:\n" | |
6301 | "\n" | |
6302 | " git commit --amend --reset-author\n" | |
6303 | msgstr "" | |
6304 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
6305 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
6306 | "中编辑您的配置文件:\n" | |
6307 | "\n" | |
6308 | " git config --global --edit\n" | |
6309 | "\n" | |
6310 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
6311 | "\n" | |
6312 | " git commit --amend --reset-author\n" | |
6313 | ||
94550ed3 | 6314 | #: builtin/commit.c:61 |
c04f5ac3 JX |
6315 | msgid "" |
6316 | "Your name and email address were configured automatically based\n" | |
6317 | "on your username and hostname. Please check that they are accurate.\n" | |
6318 | "You can suppress this message by setting them explicitly:\n" | |
6319 | "\n" | |
6320 | " git config --global user.name \"Your Name\"\n" | |
6321 | " git config --global user.email you@example.com\n" | |
6322 | "\n" | |
6323 | "After doing this, you may fix the identity used for this commit with:\n" | |
6324 | "\n" | |
6325 | " git commit --amend --reset-author\n" | |
6326 | msgstr "" | |
90e6ef53 | 6327 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 6328 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
6329 | "\n" |
6330 | " git config --global user.name \"Your Name\"\n" | |
6331 | " git config --global user.email you@example.com\n" | |
6332 | "\n" | |
90e6ef53 | 6333 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
6334 | "\n" |
6335 | " git commit --amend --reset-author\n" | |
6336 | ||
94550ed3 | 6337 | #: builtin/commit.c:73 |
c04f5ac3 JX |
6338 | msgid "" |
6339 | "You asked to amend the most recent commit, but doing so would make\n" | |
6340 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
6341 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
6342 | msgstr "" | |
1b150dc9 T |
6343 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
6344 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 6345 | |
94550ed3 | 6346 | #: builtin/commit.c:78 |
c04f5ac3 JX |
6347 | msgid "" |
6348 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
6349 | "If you wish to commit it anyway, use:\n" | |
6350 | "\n" | |
6351 | " git commit --allow-empty\n" | |
6352 | "\n" | |
c04f5ac3 | 6353 | msgstr "" |
a9ce4543 T |
6354 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
6355 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
6356 | "\n" |
6357 | " git commit --allow-empty\n" | |
6358 | "\n" | |
c04f5ac3 | 6359 | |
94550ed3 | 6360 | #: builtin/commit.c:85 |
b1894384 JX |
6361 | msgid "Otherwise, please use 'git reset'\n" |
6362 | msgstr "否则,请使用命令 'git reset'\n" | |
6363 | ||
94550ed3 | 6364 | #: builtin/commit.c:88 |
b1894384 JX |
6365 | msgid "" |
6366 | "If you wish to skip this commit, use:\n" | |
6367 | "\n" | |
6368 | " git reset\n" | |
6369 | "\n" | |
6370 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
6371 | "the remaining commits.\n" | |
6372 | msgstr "" | |
6373 | "如果您想跳过这个提交,使用命令:\n" | |
6374 | "\n" | |
6375 | " git reset\n" | |
6376 | "\n" | |
6377 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
6378 | "操作。\n" | |
6379 | ||
a0b6b246 | 6380 | #: builtin/commit.c:318 |
c04f5ac3 | 6381 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 6382 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 6383 | |
a0b6b246 | 6384 | #: builtin/commit.c:359 |
c04f5ac3 | 6385 | msgid "unable to create temporary index" |
90e6ef53 | 6386 | msgstr "不能创建临时索引" |
c04f5ac3 | 6387 | |
a0b6b246 | 6388 | #: builtin/commit.c:365 |
c04f5ac3 JX |
6389 | msgid "interactive add failed" |
6390 | msgstr "交互式添加失败" | |
6391 | ||
a0b6b246 | 6392 | #: builtin/commit.c:378 |
220c313c JX |
6393 | msgid "unable to update temporary index" |
6394 | msgstr "无法更新临时索引" | |
6395 | ||
a0b6b246 | 6396 | #: builtin/commit.c:380 |
220c313c JX |
6397 | msgid "Failed to update main cache tree" |
6398 | msgstr "不能更新树的主缓存" | |
6399 | ||
a0b6b246 | 6400 | #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 |
c04f5ac3 | 6401 | msgid "unable to write new_index file" |
90e6ef53 | 6402 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 6403 | |
a0b6b246 | 6404 | #: builtin/commit.c:458 |
8ada9598 | 6405 | msgid "cannot do a partial commit during a merge." |
81809b99 | 6406 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 6407 | |
a0b6b246 | 6408 | #: builtin/commit.c:460 |
8ada9598 | 6409 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 6410 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 6411 | |
a0b6b246 | 6412 | #: builtin/commit.c:469 |
c04f5ac3 | 6413 | msgid "cannot read the index" |
90e6ef53 | 6414 | msgstr "无法读取索引" |
c04f5ac3 | 6415 | |
a0b6b246 | 6416 | #: builtin/commit.c:488 |
c04f5ac3 | 6417 | msgid "unable to write temporary index file" |
90e6ef53 | 6418 | msgstr "无法写临时索引文件" |
c04f5ac3 | 6419 | |
a0b6b246 | 6420 | #: builtin/commit.c:582 |
220c313c JX |
6421 | #, c-format |
6422 | msgid "commit '%s' lacks author header" | |
6423 | msgstr "提交 '%s' 缺少作者信息" | |
6424 | ||
a0b6b246 | 6425 | #: builtin/commit.c:584 |
c04f5ac3 | 6426 | #, c-format |
220c313c JX |
6427 | msgid "commit '%s' has malformed author line" |
6428 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 6429 | |
a0b6b246 | 6430 | #: builtin/commit.c:603 |
c04f5ac3 JX |
6431 | msgid "malformed --author parameter" |
6432 | msgstr "非法的 --author 参数" | |
6433 | ||
a0b6b246 | 6434 | #: builtin/commit.c:611 |
c04f5ac3 | 6435 | #, c-format |
6acbf033 JX |
6436 | msgid "invalid date format: %s" |
6437 | msgstr "无效的日期格式:%s" | |
6438 | ||
a0b6b246 | 6439 | #: builtin/commit.c:655 |
6acbf033 JX |
6440 | msgid "" |
6441 | "unable to select a comment character that is not used\n" | |
6442 | "in the current commit message" | |
6443 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
6444 | ||
a0b6b246 | 6445 | #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 |
c04f5ac3 JX |
6446 | #, c-format |
6447 | msgid "could not lookup commit %s" | |
6448 | msgstr "不能查询提交 %s" | |
6449 | ||
a0b6b246 | 6450 | #: builtin/commit.c:704 builtin/shortlog.c:286 |
c04f5ac3 JX |
6451 | #, c-format |
6452 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 6453 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 6454 | |
a0b6b246 | 6455 | #: builtin/commit.c:706 |
c04f5ac3 | 6456 | msgid "could not read log from standard input" |
90e6ef53 | 6457 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 6458 | |
a0b6b246 | 6459 | #: builtin/commit.c:710 |
c04f5ac3 JX |
6460 | #, c-format |
6461 | msgid "could not read log file '%s'" | |
90e6ef53 | 6462 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 6463 | |
a0b6b246 | 6464 | #: builtin/commit.c:737 builtin/commit.c:745 |
c04f5ac3 | 6465 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 6466 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 6467 | |
a0b6b246 | 6468 | #: builtin/commit.c:742 |
5b04ee3b JX |
6469 | msgid "could not read MERGE_MSG" |
6470 | msgstr "不能读取 MERGE_MSG" | |
6471 | ||
a0b6b246 | 6472 | #: builtin/commit.c:796 |
c04f5ac3 | 6473 | msgid "could not write commit template" |
90e6ef53 | 6474 | msgstr "不能写提交模版" |
c04f5ac3 | 6475 | |
a0b6b246 | 6476 | #: builtin/commit.c:814 |
81809b99 | 6477 | #, c-format |
c04f5ac3 JX |
6478 | msgid "" |
6479 | "\n" | |
8ada9598 | 6480 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
6481 | "If this is not correct, please remove the file\n" |
6482 | "\t%s\n" | |
6483 | "and try again.\n" | |
6484 | msgstr "" | |
6485 | "\n" | |
649900bc | 6486 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
6487 | "\t%s\n" |
6488 | "然后重试。\n" | |
6489 | ||
a0b6b246 | 6490 | #: builtin/commit.c:819 |
81809b99 | 6491 | #, c-format |
8ada9598 JX |
6492 | msgid "" |
6493 | "\n" | |
6494 | "It looks like you may be committing a cherry-pick.\n" | |
6495 | "If this is not correct, please remove the file\n" | |
6496 | "\t%s\n" | |
6497 | "and try again.\n" | |
6498 | msgstr "" | |
6499 | "\n" | |
649900bc | 6500 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
6501 | "\t%s\n" |
6502 | "然后重试。\n" | |
c04f5ac3 | 6503 | |
a0b6b246 | 6504 | #: builtin/commit.c:832 |
a77c07d9 | 6505 | #, c-format |
c04f5ac3 | 6506 | msgid "" |
8ada9598 | 6507 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 6508 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 6509 | msgstr "" |
a77c07d9 | 6510 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 6511 | "说明将会终止提交。\n" |
c04f5ac3 | 6512 | |
a0b6b246 | 6513 | #: builtin/commit.c:839 |
a77c07d9 | 6514 | #, c-format |
c04f5ac3 | 6515 | msgid "" |
8ada9598 | 6516 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 6517 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
6518 | "An empty message aborts the commit.\n" |
6519 | msgstr "" | |
a77c07d9 JX |
6520 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
6521 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 6522 | |
90e6ef53 | 6523 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a0b6b246 | 6524 | #: builtin/commit.c:859 |
6acbf033 JX |
6525 | #, c-format |
6526 | msgid "%sAuthor: %.*s <%.*s>" | |
6527 | msgstr "%s作者: %.*s <%.*s>" | |
6528 | ||
6529 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
a0b6b246 | 6530 | #: builtin/commit.c:867 |
c04f5ac3 | 6531 | #, c-format |
6acbf033 JX |
6532 | msgid "%sDate: %s" |
6533 | msgstr "%s日期: %s" | |
c04f5ac3 | 6534 | |
90e6ef53 | 6535 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a0b6b246 | 6536 | #: builtin/commit.c:874 |
c04f5ac3 | 6537 | #, c-format |
6acbf033 JX |
6538 | msgid "%sCommitter: %.*s <%.*s>" |
6539 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 6540 | |
a0b6b246 | 6541 | #: builtin/commit.c:892 |
c04f5ac3 | 6542 | msgid "Cannot read index" |
90e6ef53 | 6543 | msgstr "无法读取索引" |
c04f5ac3 | 6544 | |
a0b6b246 | 6545 | #: builtin/commit.c:954 |
c04f5ac3 JX |
6546 | msgid "Error building trees" |
6547 | msgstr "无法创建树对象" | |
6548 | ||
a0b6b246 | 6549 | #: builtin/commit.c:969 builtin/tag.c:266 |
c04f5ac3 JX |
6550 | #, c-format |
6551 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 6552 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 6553 | |
a0b6b246 | 6554 | #: builtin/commit.c:1071 |
c04f5ac3 | 6555 | #, c-format |
814ff314 JX |
6556 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
6557 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 6558 | |
a0b6b246 | 6559 | #: builtin/commit.c:1086 builtin/commit.c:1327 |
c04f5ac3 JX |
6560 | #, c-format |
6561 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 6562 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 6563 | |
a0b6b246 | 6564 | #: builtin/commit.c:1124 |
2e8451e8 JX |
6565 | msgid "--long and -z are incompatible" |
6566 | msgstr "--long 和 -z 选项不兼容" | |
6567 | ||
a0b6b246 | 6568 | #: builtin/commit.c:1154 |
c04f5ac3 JX |
6569 | msgid "Using both --reset-author and --author does not make sense" |
6570 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
6571 | ||
a0b6b246 | 6572 | #: builtin/commit.c:1163 |
c04f5ac3 | 6573 | msgid "You have nothing to amend." |
90e6ef53 | 6574 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 6575 | |
a0b6b246 | 6576 | #: builtin/commit.c:1166 |
8ada9598 | 6577 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 6578 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 6579 | |
a0b6b246 | 6580 | #: builtin/commit.c:1168 |
8ada9598 | 6581 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 6582 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 6583 | |
a0b6b246 | 6584 | #: builtin/commit.c:1171 |
c04f5ac3 | 6585 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 6586 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 6587 | |
a0b6b246 | 6588 | #: builtin/commit.c:1181 |
c04f5ac3 JX |
6589 | msgid "Only one of -c/-C/-F/--fixup can be used." |
6590 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
6591 | ||
a0b6b246 | 6592 | #: builtin/commit.c:1183 |
c04f5ac3 | 6593 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 6594 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 6595 | |
a0b6b246 | 6596 | #: builtin/commit.c:1191 |
c04f5ac3 | 6597 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 6598 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 6599 | |
a0b6b246 | 6600 | #: builtin/commit.c:1208 |
c04f5ac3 JX |
6601 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
6602 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
6603 | ||
a0b6b246 | 6604 | #: builtin/commit.c:1210 |
c04f5ac3 JX |
6605 | msgid "No paths with --include/--only does not make sense." |
6606 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
6607 | ||
a0b6b246 | 6608 | #: builtin/commit.c:1212 |
c04f5ac3 | 6609 | msgid "Clever... amending the last one with dirty index." |
160fb2b2 | 6610 | msgstr "聪明... 用脏索引修补最后一个提交。" |
c04f5ac3 | 6611 | |
a0b6b246 | 6612 | #: builtin/commit.c:1214 |
6c94aba5 JX |
6613 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
6614 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 6615 | |
a0b6b246 | 6616 | #: builtin/commit.c:1226 builtin/tag.c:474 |
c04f5ac3 JX |
6617 | #, c-format |
6618 | msgid "Invalid cleanup mode %s" | |
6619 | msgstr "无效的清理模式 %s" | |
6620 | ||
a0b6b246 | 6621 | #: builtin/commit.c:1231 |
c04f5ac3 | 6622 | msgid "Paths with -a does not make sense." |
649900bc | 6623 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 6624 | |
a0b6b246 | 6625 | #: builtin/commit.c:1341 builtin/commit.c:1617 |
ef317cd5 | 6626 | msgid "show status concisely" |
07432cef | 6627 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 6628 | |
a0b6b246 | 6629 | #: builtin/commit.c:1343 builtin/commit.c:1619 |
ef317cd5 | 6630 | msgid "show branch information" |
07432cef | 6631 | msgstr "显示分支信息" |
ef317cd5 | 6632 | |
a0b6b246 JX |
6633 | #: builtin/commit.c:1345 |
6634 | msgid "version" | |
6635 | msgstr "版本" | |
6636 | ||
6637 | #: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 | |
5c57d762 | 6638 | #: builtin/worktree.c:440 |
ef317cd5 | 6639 | msgid "machine-readable output" |
07432cef WS |
6640 | msgstr "机器可读的输出" |
6641 | ||
a0b6b246 | 6642 | #: builtin/commit.c:1348 builtin/commit.c:1623 |
07432cef WS |
6643 | msgid "show status in long format (default)" |
6644 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 6645 | |
a0b6b246 | 6646 | #: builtin/commit.c:1351 builtin/commit.c:1626 |
ef317cd5 | 6647 | msgid "terminate entries with NUL" |
4375c10e | 6648 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 6649 | |
a0b6b246 | 6650 | #: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 |
94550ed3 | 6651 | #: builtin/fast-export.c:984 builtin/tag.c:353 |
ef317cd5 | 6652 | msgid "mode" |
07432cef | 6653 | msgstr "模式" |
ef317cd5 | 6654 | |
a0b6b246 | 6655 | #: builtin/commit.c:1354 builtin/commit.c:1629 |
ef317cd5 | 6656 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 6657 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 6658 | |
a0b6b246 | 6659 | #: builtin/commit.c:1357 |
ef317cd5 | 6660 | msgid "show ignored files" |
07432cef | 6661 | msgstr "显示忽略的文件" |
ef317cd5 | 6662 | |
a0b6b246 | 6663 | #: builtin/commit.c:1358 parse-options.h:155 |
ef317cd5 JX |
6664 | msgid "when" |
6665 | msgstr "何时" | |
6666 | ||
a0b6b246 | 6667 | #: builtin/commit.c:1359 |
ef317cd5 JX |
6668 | msgid "" |
6669 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
6670 | "(Default: all)" | |
6671 | msgstr "" | |
07432cef | 6672 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 6673 | |
a0b6b246 | 6674 | #: builtin/commit.c:1361 |
ef317cd5 | 6675 | msgid "list untracked files in columns" |
07432cef | 6676 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 6677 | |
a0b6b246 | 6678 | #: builtin/commit.c:1437 |
c04f5ac3 JX |
6679 | msgid "couldn't look up newly created commit" |
6680 | msgstr "无法找到新创建的提交" | |
6681 | ||
a0b6b246 | 6682 | #: builtin/commit.c:1439 |
c04f5ac3 | 6683 | msgid "could not parse newly created commit" |
90e6ef53 | 6684 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 6685 | |
a0b6b246 | 6686 | #: builtin/commit.c:1484 |
c04f5ac3 JX |
6687 | msgid "detached HEAD" |
6688 | msgstr "分离头指针" | |
6689 | ||
7e238ab7 | 6690 | # 译者:中文字符串拼接,可删除前导空格 |
a0b6b246 | 6691 | #: builtin/commit.c:1487 |
c04f5ac3 | 6692 | msgid " (root-commit)" |
7e238ab7 | 6693 | msgstr "(根提交)" |
c04f5ac3 | 6694 | |
a0b6b246 | 6695 | #: builtin/commit.c:1587 |
ef317cd5 | 6696 | msgid "suppress summary after successful commit" |
07432cef | 6697 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 6698 | |
a0b6b246 | 6699 | #: builtin/commit.c:1588 |
ef317cd5 | 6700 | msgid "show diff in commit message template" |
07432cef | 6701 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 6702 | |
a0b6b246 | 6703 | #: builtin/commit.c:1590 |
ef317cd5 | 6704 | msgid "Commit message options" |
07432cef | 6705 | msgstr "提交说明选项" |
c04f5ac3 | 6706 | |
a0b6b246 | 6707 | #: builtin/commit.c:1591 builtin/tag.c:351 |
ef317cd5 | 6708 | msgid "read message from file" |
07432cef | 6709 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 6710 | |
a0b6b246 | 6711 | #: builtin/commit.c:1592 |
ef317cd5 | 6712 | msgid "author" |
07432cef | 6713 | msgstr "作者" |
c04f5ac3 | 6714 | |
a0b6b246 | 6715 | #: builtin/commit.c:1592 |
ef317cd5 | 6716 | msgid "override author for commit" |
07432cef | 6717 | msgstr "提交时覆盖作者" |
73a60cd2 | 6718 | |
a0b6b246 | 6719 | #: builtin/commit.c:1593 builtin/gc.c:326 |
ef317cd5 | 6720 | msgid "date" |
07432cef | 6721 | msgstr "日期" |
c04f5ac3 | 6722 | |
a0b6b246 | 6723 | #: builtin/commit.c:1593 |
ef317cd5 | 6724 | msgid "override date for commit" |
07432cef | 6725 | msgstr "提交时覆盖日期" |
c04f5ac3 | 6726 | |
a0b6b246 JX |
6727 | #: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 |
6728 | #: builtin/notes.c:561 builtin/tag.c:349 | |
ef317cd5 | 6729 | msgid "message" |
07432cef | 6730 | msgstr "说明" |
c04f5ac3 | 6731 | |
a0b6b246 | 6732 | #: builtin/commit.c:1594 |
ef317cd5 | 6733 | msgid "commit message" |
07432cef | 6734 | msgstr "提交说明" |
ef317cd5 | 6735 | |
a0b6b246 JX |
6736 | #: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 |
6737 | #: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 | |
94550ed3 JX |
6738 | msgid "commit" |
6739 | msgstr "提交" | |
6740 | ||
a0b6b246 | 6741 | #: builtin/commit.c:1595 |
ef317cd5 | 6742 | msgid "reuse and edit message from specified commit" |
07432cef | 6743 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 6744 | |
a0b6b246 | 6745 | #: builtin/commit.c:1596 |
ef317cd5 | 6746 | msgid "reuse message from specified commit" |
07432cef | 6747 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 6748 | |
a0b6b246 | 6749 | #: builtin/commit.c:1597 |
ef317cd5 | 6750 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 6751 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 6752 | |
a0b6b246 | 6753 | #: builtin/commit.c:1598 |
ef317cd5 | 6754 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 6755 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 6756 | |
a0b6b246 | 6757 | #: builtin/commit.c:1599 |
ef317cd5 | 6758 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 6759 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 6760 | |
a0b6b246 | 6761 | #: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 |
ef317cd5 | 6762 | msgid "add Signed-off-by:" |
07432cef | 6763 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 6764 | |
a0b6b246 | 6765 | #: builtin/commit.c:1601 |
ef317cd5 | 6766 | msgid "use specified template file" |
07432cef | 6767 | msgstr "使用指定的模板文件" |
ef317cd5 | 6768 | |
a0b6b246 | 6769 | #: builtin/commit.c:1602 |
ef317cd5 | 6770 | msgid "force edit of commit" |
07432cef | 6771 | msgstr "强制编辑提交" |
ef317cd5 | 6772 | |
07432cef | 6773 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
a0b6b246 | 6774 | #: builtin/commit.c:1603 |
ef317cd5 | 6775 | msgid "default" |
07432cef | 6776 | msgstr "default" |
ef317cd5 | 6777 | |
a0b6b246 | 6778 | #: builtin/commit.c:1603 builtin/tag.c:354 |
ef317cd5 | 6779 | msgid "how to strip spaces and #comments from message" |
07432cef | 6780 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 6781 | |
a0b6b246 | 6782 | #: builtin/commit.c:1604 |
ef317cd5 | 6783 | msgid "include status in commit message template" |
07432cef | 6784 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 6785 | |
a0b6b246 | 6786 | #: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 |
1b7f4a34 | 6787 | #: builtin/revert.c:93 |
ef317cd5 | 6788 | msgid "GPG sign commit" |
07432cef | 6789 | msgstr "GPG 提交签名" |
ef317cd5 | 6790 | |
a0b6b246 | 6791 | #: builtin/commit.c:1609 |
ef317cd5 | 6792 | msgid "Commit contents options" |
07432cef | 6793 | msgstr "提交内容选项" |
ef317cd5 | 6794 | |
a0b6b246 | 6795 | #: builtin/commit.c:1610 |
ef317cd5 | 6796 | msgid "commit all changed files" |
07432cef | 6797 | msgstr "提交所有改动的文件" |
ef317cd5 | 6798 | |
a0b6b246 | 6799 | #: builtin/commit.c:1611 |
ef317cd5 | 6800 | msgid "add specified files to index for commit" |
07432cef | 6801 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 6802 | |
a0b6b246 | 6803 | #: builtin/commit.c:1612 |
ef317cd5 | 6804 | msgid "interactively add files" |
07432cef | 6805 | msgstr "交互式添加文件" |
ef317cd5 | 6806 | |
a0b6b246 | 6807 | #: builtin/commit.c:1613 |
ef317cd5 | 6808 | msgid "interactively add changes" |
07432cef | 6809 | msgstr "交互式添加变更" |
ef317cd5 | 6810 | |
a0b6b246 | 6811 | #: builtin/commit.c:1614 |
ef317cd5 | 6812 | msgid "commit only specified files" |
07432cef | 6813 | msgstr "只提交指定的文件" |
ef317cd5 | 6814 | |
a0b6b246 | 6815 | #: builtin/commit.c:1615 |
5c57d762 JX |
6816 | msgid "bypass pre-commit and commit-msg hooks" |
6817 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
6818 | ||
a0b6b246 | 6819 | #: builtin/commit.c:1616 |
ef317cd5 | 6820 | msgid "show what would be committed" |
07432cef | 6821 | msgstr "显示将要提交的内容" |
ef317cd5 | 6822 | |
a0b6b246 | 6823 | #: builtin/commit.c:1627 |
ef317cd5 | 6824 | msgid "amend previous commit" |
07432cef | 6825 | msgstr "修改先前的提交" |
ef317cd5 | 6826 | |
a0b6b246 | 6827 | #: builtin/commit.c:1628 |
ef317cd5 | 6828 | msgid "bypass post-rewrite hook" |
07432cef | 6829 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 6830 | |
a0b6b246 | 6831 | #: builtin/commit.c:1633 |
ef317cd5 | 6832 | msgid "ok to record an empty change" |
07432cef | 6833 | msgstr "允许一个空提交" |
ef317cd5 | 6834 | |
a0b6b246 | 6835 | #: builtin/commit.c:1635 |
ef317cd5 | 6836 | msgid "ok to record a change with an empty message" |
07432cef | 6837 | msgstr "允许空的提交说明" |
ef317cd5 | 6838 | |
a0b6b246 | 6839 | #: builtin/commit.c:1664 |
c04f5ac3 | 6840 | msgid "could not parse HEAD commit" |
90e6ef53 | 6841 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 6842 | |
a0b6b246 | 6843 | #: builtin/commit.c:1712 |
c04f5ac3 JX |
6844 | #, c-format |
6845 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 6846 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 6847 | |
a0b6b246 | 6848 | #: builtin/commit.c:1719 |
c04f5ac3 | 6849 | msgid "could not read MERGE_MODE" |
90e6ef53 | 6850 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 6851 | |
a0b6b246 | 6852 | #: builtin/commit.c:1738 |
c04f5ac3 JX |
6853 | #, c-format |
6854 | msgid "could not read commit message: %s" | |
90e6ef53 | 6855 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 6856 | |
a0b6b246 | 6857 | #: builtin/commit.c:1749 |
73a60cd2 JX |
6858 | #, c-format |
6859 | msgid "Aborting commit; you did not edit the message.\n" | |
6860 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
6861 | ||
a0b6b246 | 6862 | #: builtin/commit.c:1754 |
c04f5ac3 JX |
6863 | #, c-format |
6864 | msgid "Aborting commit due to empty commit message.\n" | |
6865 | msgstr "终止提交因为提交说明为空。\n" | |
6866 | ||
a0b6b246 | 6867 | #: builtin/commit.c:1802 |
c04f5ac3 JX |
6868 | msgid "" |
6869 | "Repository has been updated, but unable to write\n" | |
220c313c | 6870 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
6871 | "not exceeded, and then \"git reset HEAD\" to recover." |
6872 | msgstr "" | |
160fb2b2 | 6873 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 6874 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 6875 | |
276ceeaa | 6876 | #: builtin/config.c:9 |
814ff314 JX |
6877 | msgid "git config [<options>]" |
6878 | msgstr "git config [<选项>]" | |
ef317cd5 | 6879 | |
5c57d762 | 6880 | #: builtin/config.c:55 |
ef317cd5 | 6881 | msgid "Config file location" |
07432cef | 6882 | msgstr "配置文件位置" |
ef317cd5 | 6883 | |
5c57d762 | 6884 | #: builtin/config.c:56 |
ef317cd5 | 6885 | msgid "use global config file" |
07432cef | 6886 | msgstr "使用全局配置文件" |
ef317cd5 | 6887 | |
5c57d762 | 6888 | #: builtin/config.c:57 |
ef317cd5 | 6889 | msgid "use system config file" |
07432cef | 6890 | msgstr "使用系统级配置文件" |
ef317cd5 | 6891 | |
5c57d762 | 6892 | #: builtin/config.c:58 |
ef317cd5 | 6893 | msgid "use repository config file" |
160fb2b2 | 6894 | msgstr "使用仓库级配置文件" |
ef317cd5 | 6895 | |
5c57d762 | 6896 | #: builtin/config.c:59 |
ef317cd5 | 6897 | msgid "use given config file" |
07432cef | 6898 | msgstr "使用指定的配置文件" |
ef317cd5 | 6899 | |
5c57d762 | 6900 | #: builtin/config.c:60 |
2e8451e8 | 6901 | msgid "blob-id" |
4375c10e | 6902 | msgstr "数据对象 ID" |
2e8451e8 | 6903 | |
5c57d762 | 6904 | #: builtin/config.c:60 |
2e8451e8 JX |
6905 | msgid "read config from given blob object" |
6906 | msgstr "从给定的数据对象读取配置" | |
6907 | ||
5c57d762 | 6908 | #: builtin/config.c:61 |
ef317cd5 | 6909 | msgid "Action" |
07432cef | 6910 | msgstr "操作" |
ef317cd5 | 6911 | |
5c57d762 | 6912 | #: builtin/config.c:62 |
ef317cd5 | 6913 | msgid "get value: name [value-regex]" |
07432cef | 6914 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 6915 | |
5c57d762 | 6916 | #: builtin/config.c:63 |
ef317cd5 | 6917 | msgid "get all values: key [value-regex]" |
07432cef | 6918 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 6919 | |
5c57d762 | 6920 | #: builtin/config.c:64 |
ef317cd5 | 6921 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 6922 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 6923 | |
5c57d762 | 6924 | #: builtin/config.c:65 |
90314792 JX |
6925 | msgid "get value specific for the URL: section[.var] URL" |
6926 | msgstr "获得 URL 取值:section[.var] URL" | |
6927 | ||
5c57d762 | 6928 | #: builtin/config.c:66 |
ef317cd5 | 6929 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 6930 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 6931 | |
5c57d762 | 6932 | #: builtin/config.c:67 |
ef317cd5 | 6933 | msgid "add a new variable: name value" |
07432cef | 6934 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 6935 | |
5c57d762 | 6936 | #: builtin/config.c:68 |
ef317cd5 | 6937 | msgid "remove a variable: name [value-regex]" |
07432cef | 6938 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 6939 | |
5c57d762 | 6940 | #: builtin/config.c:69 |
ef317cd5 | 6941 | msgid "remove all matches: name [value-regex]" |
07432cef | 6942 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 6943 | |
5c57d762 | 6944 | #: builtin/config.c:70 |
ef317cd5 | 6945 | msgid "rename section: old-name new-name" |
07432cef | 6946 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 6947 | |
5c57d762 | 6948 | #: builtin/config.c:71 |
ef317cd5 | 6949 | msgid "remove a section: name" |
07432cef | 6950 | msgstr "删除一个小节:name" |
ef317cd5 | 6951 | |
5c57d762 | 6952 | #: builtin/config.c:72 |
ef317cd5 | 6953 | msgid "list all" |
07432cef | 6954 | msgstr "列出所有" |
ef317cd5 | 6955 | |
5c57d762 | 6956 | #: builtin/config.c:73 |
ef317cd5 | 6957 | msgid "open an editor" |
07432cef | 6958 | msgstr "打开一个编辑器" |
ef317cd5 | 6959 | |
5c57d762 | 6960 | #: builtin/config.c:74 |
04cb2f28 JX |
6961 | msgid "find the color configured: slot [default]" |
6962 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 6963 | |
5c57d762 | 6964 | #: builtin/config.c:75 |
04cb2f28 JX |
6965 | msgid "find the color setting: slot [stdout-is-tty]" |
6966 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 6967 | |
5c57d762 | 6968 | #: builtin/config.c:76 |
ef317cd5 | 6969 | msgid "Type" |
07432cef | 6970 | msgstr "类型" |
ef317cd5 | 6971 | |
5c57d762 | 6972 | #: builtin/config.c:77 |
ef317cd5 | 6973 | msgid "value is \"true\" or \"false\"" |
07432cef | 6974 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 6975 | |
5c57d762 | 6976 | #: builtin/config.c:78 |
ef317cd5 | 6977 | msgid "value is decimal number" |
07432cef | 6978 | msgstr "值是十进制数" |
ef317cd5 | 6979 | |
5c57d762 | 6980 | #: builtin/config.c:79 |
ef317cd5 | 6981 | msgid "value is --bool or --int" |
07432cef | 6982 | msgstr "值是 --bool or --int" |
ef317cd5 | 6983 | |
5c57d762 | 6984 | #: builtin/config.c:80 |
ef317cd5 | 6985 | msgid "value is a path (file or directory name)" |
07432cef | 6986 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 6987 | |
5c57d762 | 6988 | #: builtin/config.c:81 |
ef317cd5 | 6989 | msgid "Other" |
07432cef | 6990 | msgstr "其它" |
ef317cd5 | 6991 | |
5c57d762 | 6992 | #: builtin/config.c:82 |
ef317cd5 | 6993 | msgid "terminate values with NUL byte" |
4375c10e | 6994 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 6995 | |
5c57d762 | 6996 | #: builtin/config.c:83 |
1b7f4a34 JX |
6997 | msgid "show variable names only" |
6998 | msgstr "只显示变量名" | |
6999 | ||
5c57d762 | 7000 | #: builtin/config.c:84 |
ef317cd5 | 7001 | msgid "respect include directives on lookup" |
07432cef | 7002 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 7003 | |
5c57d762 | 7004 | #: builtin/config.c:85 |
276ceeaa JX |
7005 | msgid "show origin of config (file, standard input, blob, command line)" |
7006 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
7007 | ||
5c57d762 | 7008 | #: builtin/config.c:327 |
220c313c | 7009 | msgid "unable to parse default color value" |
160fb2b2 | 7010 | msgstr "不能解析默认颜色值" |
220c313c | 7011 | |
5c57d762 | 7012 | #: builtin/config.c:471 |
220c313c JX |
7013 | #, c-format |
7014 | msgid "" | |
7015 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7016 | "[user]\n" |
220c313c | 7017 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7018 | "#\tname = %s\n" |
220c313c JX |
7019 | "#\temail = %s\n" |
7020 | msgstr "" | |
7021 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7022 | "[user]\n" |
220c313c | 7023 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7024 | "#\tname = %s\n" |
220c313c JX |
7025 | "#\temail = %s\n" |
7026 | ||
5c57d762 | 7027 | #: builtin/config.c:613 |
220c313c JX |
7028 | #, c-format |
7029 | msgid "cannot create configuration file %s" | |
7030 | msgstr "不能创建配置文件 %s" | |
7031 | ||
a0b6b246 JX |
7032 | #: builtin/config.c:625 |
7033 | #, c-format | |
7034 | msgid "" | |
7035 | "cannot overwrite multiple values with a single value\n" | |
7036 | " Use a regexp, --add or --replace-all to change %s." | |
7037 | msgstr "" | |
7038 | "无法用一个值覆盖多个值\n" | |
7039 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
7040 | ||
7041 | #: builtin/count-objects.c:86 | |
4dcdc3d8 JX |
7042 | msgid "git count-objects [-v] [-H | --human-readable]" |
7043 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
7044 | ||
a0b6b246 | 7045 | #: builtin/count-objects.c:96 |
4dcdc3d8 JX |
7046 | msgid "print sizes in human readable format" |
7047 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 7048 | |
220c313c | 7049 | #: builtin/describe.c:17 |
814ff314 JX |
7050 | msgid "git describe [<options>] [<commit-ish>...]" |
7051 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 7052 | |
220c313c | 7053 | #: builtin/describe.c:18 |
814ff314 JX |
7054 | msgid "git describe [<options>] --dirty" |
7055 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 7056 | |
220c313c | 7057 | #: builtin/describe.c:217 |
c04f5ac3 JX |
7058 | #, c-format |
7059 | msgid "annotated tag %s not available" | |
55a16ee4 | 7060 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 7061 | |
220c313c | 7062 | #: builtin/describe.c:221 |
c04f5ac3 JX |
7063 | #, c-format |
7064 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 7065 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 7066 | |
220c313c | 7067 | #: builtin/describe.c:223 |
c04f5ac3 JX |
7068 | #, c-format |
7069 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 7070 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 7071 | |
5c57d762 | 7072 | #: builtin/describe.c:250 builtin/log.c:480 |
c04f5ac3 JX |
7073 | #, c-format |
7074 | msgid "Not a valid object name %s" | |
7075 | msgstr "不是一个有效的对象名 %s" | |
7076 | ||
220c313c | 7077 | #: builtin/describe.c:253 |
c04f5ac3 JX |
7078 | #, c-format |
7079 | msgid "%s is not a valid '%s' object" | |
7080 | msgstr "%s 不是一个有效的 '%s' 对象" | |
7081 | ||
220c313c | 7082 | #: builtin/describe.c:270 |
c04f5ac3 JX |
7083 | #, c-format |
7084 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 7085 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 7086 | |
220c313c | 7087 | #: builtin/describe.c:272 |
c04f5ac3 JX |
7088 | #, c-format |
7089 | msgid "searching to describe %s\n" | |
7090 | msgstr "搜索描述 %s\n" | |
7091 | ||
220c313c | 7092 | #: builtin/describe.c:319 |
c04f5ac3 JX |
7093 | #, c-format |
7094 | msgid "finished search at %s\n" | |
7095 | msgstr "完成搜索 %s\n" | |
7096 | ||
220c313c | 7097 | #: builtin/describe.c:346 |
c04f5ac3 JX |
7098 | #, c-format |
7099 | msgid "" | |
7100 | "No annotated tags can describe '%s'.\n" | |
7101 | "However, there were unannotated tags: try --tags." | |
7102 | msgstr "" | |
55a16ee4 RC |
7103 | "没有附注标签能描述 '%s'。\n" |
7104 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 7105 | |
220c313c | 7106 | #: builtin/describe.c:350 |
c04f5ac3 JX |
7107 | #, c-format |
7108 | msgid "" | |
7109 | "No tags can describe '%s'.\n" | |
7110 | "Try --always, or create some tags." | |
7111 | msgstr "" | |
55a16ee4 RC |
7112 | "没有标签能描述 '%s'。\n" |
7113 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 7114 | |
220c313c | 7115 | #: builtin/describe.c:371 |
c04f5ac3 JX |
7116 | #, c-format |
7117 | msgid "traversed %lu commits\n" | |
7118 | msgstr "已遍历 %lu 个提交\n" | |
7119 | ||
220c313c | 7120 | #: builtin/describe.c:374 |
c04f5ac3 JX |
7121 | #, c-format |
7122 | msgid "" | |
7123 | "more than %i tags found; listed %i most recent\n" | |
7124 | "gave up search at %s\n" | |
7125 | msgstr "" | |
55a16ee4 | 7126 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 7127 | "在 %s 放弃搜索\n" |
c04f5ac3 | 7128 | |
220c313c | 7129 | #: builtin/describe.c:396 |
ef317cd5 | 7130 | msgid "find the tag that comes after the commit" |
55a16ee4 | 7131 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 7132 | |
220c313c | 7133 | #: builtin/describe.c:397 |
ef317cd5 | 7134 | msgid "debug search strategy on stderr" |
07432cef | 7135 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 7136 | |
220c313c | 7137 | #: builtin/describe.c:398 |
1003b3a5 JX |
7138 | msgid "use any ref" |
7139 | msgstr "使用任意引用" | |
7140 | ||
220c313c | 7141 | #: builtin/describe.c:399 |
1003b3a5 | 7142 | msgid "use any tag, even unannotated" |
55a16ee4 | 7143 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 7144 | |
220c313c | 7145 | #: builtin/describe.c:400 |
ef317cd5 | 7146 | msgid "always use long format" |
07432cef | 7147 | msgstr "始终使用长提交号格式" |
ef317cd5 | 7148 | |
220c313c | 7149 | #: builtin/describe.c:401 |
2e8451e8 JX |
7150 | msgid "only follow first parent" |
7151 | msgstr "只跟随第一个父提交" | |
7152 | ||
220c313c | 7153 | #: builtin/describe.c:404 |
ef317cd5 | 7154 | msgid "only output exact matches" |
07432cef | 7155 | msgstr "只输出精确匹配" |
ef317cd5 | 7156 | |
220c313c | 7157 | #: builtin/describe.c:406 |
ef317cd5 | 7158 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 7159 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 7160 | |
220c313c | 7161 | #: builtin/describe.c:408 |
ef317cd5 | 7162 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 7163 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 7164 | |
a0b6b246 | 7165 | #: builtin/describe.c:410 builtin/name-rev.c:320 |
ef317cd5 | 7166 | msgid "show abbreviated commit object as fallback" |
07432cef | 7167 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 7168 | |
220c313c | 7169 | #: builtin/describe.c:411 |
ef317cd5 | 7170 | msgid "mark" |
07432cef | 7171 | msgstr "标记" |
ef317cd5 | 7172 | |
220c313c | 7173 | #: builtin/describe.c:412 |
ef317cd5 | 7174 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 7175 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 7176 | |
220c313c | 7177 | #: builtin/describe.c:430 |
c04f5ac3 JX |
7178 | msgid "--long is incompatible with --abbrev=0" |
7179 | msgstr "--long 与 --abbrev=0 不兼容" | |
7180 | ||
220c313c | 7181 | #: builtin/describe.c:456 |
c04f5ac3 | 7182 | msgid "No names found, cannot describe anything." |
90e6ef53 | 7183 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 7184 | |
220c313c | 7185 | #: builtin/describe.c:476 |
a8a5406a | 7186 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 7187 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 7188 | |
220c313c | 7189 | #: builtin/diff.c:86 |
c04f5ac3 JX |
7190 | #, c-format |
7191 | msgid "'%s': not a regular file or symlink" | |
7192 | msgstr "'%s':不是一个正规文件或符号链接" | |
7193 | ||
220c313c | 7194 | #: builtin/diff.c:237 |
c04f5ac3 JX |
7195 | #, c-format |
7196 | msgid "invalid option: %s" | |
7197 | msgstr "无效选项:%s" | |
7198 | ||
a0b6b246 | 7199 | #: builtin/diff.c:361 |
c04f5ac3 | 7200 | msgid "Not a git repository" |
160fb2b2 | 7201 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 7202 | |
a0b6b246 | 7203 | #: builtin/diff.c:404 |
c04f5ac3 JX |
7204 | #, c-format |
7205 | msgid "invalid object '%s' given." | |
7206 | msgstr "提供了无效对象 '%s'。" | |
7207 | ||
a0b6b246 | 7208 | #: builtin/diff.c:413 |
c04f5ac3 JX |
7209 | #, c-format |
7210 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 7211 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 7212 | |
a0b6b246 | 7213 | #: builtin/diff.c:420 |
c04f5ac3 JX |
7214 | #, c-format |
7215 | msgid "unhandled object '%s' given." | |
6c94aba5 | 7216 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 7217 | |
1b7f4a34 | 7218 | #: builtin/fast-export.c:25 |
ef317cd5 | 7219 | msgid "git fast-export [rev-list-opts]" |
07432cef | 7220 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 7221 | |
1b7f4a34 | 7222 | #: builtin/fast-export.c:980 |
ef317cd5 | 7223 | msgid "show progress after <n> objects" |
07432cef | 7224 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 7225 | |
1b7f4a34 | 7226 | #: builtin/fast-export.c:982 |
ef317cd5 | 7227 | msgid "select handling of signed tags" |
55a16ee4 | 7228 | msgstr "选择如何处理签名标签" |
ef317cd5 | 7229 | |
1b7f4a34 | 7230 | #: builtin/fast-export.c:985 |
ef317cd5 | 7231 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 7232 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 7233 | |
1b7f4a34 | 7234 | #: builtin/fast-export.c:988 |
ef317cd5 | 7235 | msgid "Dump marks to this file" |
07432cef | 7236 | msgstr "把标记存储到这个文件" |
ef317cd5 | 7237 | |
1b7f4a34 | 7238 | #: builtin/fast-export.c:990 |
ef317cd5 | 7239 | msgid "Import marks from this file" |
07432cef | 7240 | msgstr "从这个文件导入标记" |
ef317cd5 | 7241 | |
1b7f4a34 | 7242 | #: builtin/fast-export.c:992 |
ef317cd5 | 7243 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 7244 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 7245 | |
1b7f4a34 | 7246 | #: builtin/fast-export.c:994 |
ef317cd5 | 7247 | msgid "Output full tree for each commit" |
07432cef | 7248 | msgstr "每次提交都输出整个树" |
ef317cd5 | 7249 | |
1b7f4a34 | 7250 | #: builtin/fast-export.c:996 |
ef317cd5 | 7251 | msgid "Use the done feature to terminate the stream" |
07432cef | 7252 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 7253 | |
1b7f4a34 | 7254 | #: builtin/fast-export.c:997 |
ef317cd5 | 7255 | msgid "Skip output of blob data" |
07432cef | 7256 | msgstr "跳过数据对象的输出" |
ef317cd5 | 7257 | |
1b7f4a34 | 7258 | #: builtin/fast-export.c:998 |
6acbf033 | 7259 | msgid "refspec" |
160fb2b2 | 7260 | msgstr "引用规格" |
6acbf033 | 7261 | |
1b7f4a34 | 7262 | #: builtin/fast-export.c:999 |
6acbf033 | 7263 | msgid "Apply refspec to exported refs" |
160fb2b2 | 7264 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 7265 | |
1b7f4a34 | 7266 | #: builtin/fast-export.c:1000 |
220c313c JX |
7267 | msgid "anonymize output" |
7268 | msgstr "匿名输出" | |
7269 | ||
5c57d762 | 7270 | #: builtin/fetch.c:21 |
ef317cd5 | 7271 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 7272 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 7273 | |
5c57d762 | 7274 | #: builtin/fetch.c:22 |
ef317cd5 | 7275 | msgid "git fetch [<options>] <group>" |
07432cef | 7276 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 7277 | |
5c57d762 | 7278 | #: builtin/fetch.c:23 |
ef317cd5 | 7279 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 7280 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 7281 | |
5c57d762 | 7282 | #: builtin/fetch.c:24 |
ef317cd5 | 7283 | msgid "git fetch --all [<options>]" |
07432cef | 7284 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 7285 | |
a0b6b246 | 7286 | #: builtin/fetch.c:95 builtin/pull.c:175 |
ef317cd5 | 7287 | msgid "fetch from all remotes" |
07432cef | 7288 | msgstr "从所有的远程抓取" |
ef317cd5 | 7289 | |
a0b6b246 | 7290 | #: builtin/fetch.c:97 builtin/pull.c:178 |
ef317cd5 | 7291 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 7292 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 7293 | |
a0b6b246 | 7294 | #: builtin/fetch.c:99 builtin/pull.c:181 |
ef317cd5 | 7295 | msgid "path to upload pack on remote end" |
07432cef | 7296 | msgstr "上传包到远程的路径" |
ef317cd5 | 7297 | |
a0b6b246 | 7298 | #: builtin/fetch.c:100 builtin/pull.c:183 |
ef317cd5 | 7299 | msgid "force overwrite of local branch" |
07432cef | 7300 | msgstr "强制覆盖本地分支" |
ef317cd5 | 7301 | |
a0b6b246 | 7302 | #: builtin/fetch.c:102 |
ef317cd5 | 7303 | msgid "fetch from multiple remotes" |
07432cef | 7304 | msgstr "从多个远程抓取" |
ef317cd5 | 7305 | |
a0b6b246 | 7306 | #: builtin/fetch.c:104 builtin/pull.c:185 |
ef317cd5 | 7307 | msgid "fetch all tags and associated objects" |
55a16ee4 | 7308 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 7309 | |
a0b6b246 | 7310 | #: builtin/fetch.c:106 |
ef317cd5 | 7311 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 7312 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 7313 | |
a0b6b246 | 7314 | #: builtin/fetch.c:108 |
276ceeaa JX |
7315 | msgid "number of submodules fetched in parallel" |
7316 | msgstr "子模组获取的并发数" | |
7317 | ||
a0b6b246 | 7318 | #: builtin/fetch.c:110 builtin/pull.c:188 |
ef317cd5 | 7319 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 7320 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 7321 | |
07432cef | 7322 | # 译者:可选值,不能翻译 |
a0b6b246 | 7323 | #: builtin/fetch.c:111 builtin/pull.c:191 |
ef317cd5 | 7324 | msgid "on-demand" |
07432cef | 7325 | msgstr "on-demand" |
ef317cd5 | 7326 | |
a0b6b246 | 7327 | #: builtin/fetch.c:112 builtin/pull.c:192 |
ef317cd5 | 7328 | msgid "control recursive fetching of submodules" |
07432cef | 7329 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 7330 | |
a0b6b246 | 7331 | #: builtin/fetch.c:116 builtin/pull.c:200 |
ef317cd5 | 7332 | msgid "keep downloaded pack" |
07432cef | 7333 | msgstr "保持下载包" |
ef317cd5 | 7334 | |
a0b6b246 | 7335 | #: builtin/fetch.c:118 |
ef317cd5 | 7336 | msgid "allow updating of HEAD ref" |
07432cef | 7337 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 7338 | |
a0b6b246 | 7339 | #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 |
ef317cd5 | 7340 | msgid "deepen history of shallow clone" |
07432cef | 7341 | msgstr "深化浅克隆的历史" |
ef317cd5 | 7342 | |
a0b6b246 JX |
7343 | #: builtin/fetch.c:123 |
7344 | msgid "deepen history of shallow repository based on time" | |
7345 | msgstr "基于时间来深化浅克隆的历史" | |
7346 | ||
7347 | #: builtin/fetch.c:129 builtin/pull.c:206 | |
a77c07d9 | 7348 | msgid "convert to a complete repository" |
160fb2b2 | 7349 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 7350 | |
a0b6b246 | 7351 | #: builtin/fetch.c:131 builtin/log.c:1433 |
ef317cd5 | 7352 | msgid "dir" |
07432cef | 7353 | msgstr "目录" |
ef317cd5 | 7354 | |
a0b6b246 | 7355 | #: builtin/fetch.c:132 |
ef317cd5 | 7356 | msgid "prepend this to submodule path output" |
07432cef | 7357 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 7358 | |
a0b6b246 | 7359 | #: builtin/fetch.c:135 |
ef317cd5 | 7360 | msgid "default mode for recursion" |
07432cef | 7361 | msgstr "递归的默认模式" |
ef317cd5 | 7362 | |
a0b6b246 | 7363 | #: builtin/fetch.c:137 builtin/pull.c:209 |
cfff71a9 JX |
7364 | msgid "accept refs that update .git/shallow" |
7365 | msgstr "接受更新 .git/shallow 的引用" | |
7366 | ||
a0b6b246 | 7367 | #: builtin/fetch.c:138 builtin/pull.c:211 |
6acbf033 JX |
7368 | msgid "refmap" |
7369 | msgstr "引用映射" | |
7370 | ||
a0b6b246 | 7371 | #: builtin/fetch.c:139 builtin/pull.c:212 |
6acbf033 JX |
7372 | msgid "specify fetch refmap" |
7373 | msgstr "指定获取操作的引用映射" | |
7374 | ||
a0b6b246 | 7375 | #: builtin/fetch.c:398 |
c04f5ac3 JX |
7376 | msgid "Couldn't find remote ref HEAD" |
7377 | msgstr "无法发现远程 HEAD 引用" | |
7378 | ||
a0b6b246 | 7379 | #: builtin/fetch.c:514 |
5c57d762 JX |
7380 | #, c-format |
7381 | msgid "configuration fetch.output contains invalid value %s" | |
7382 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
7383 | ||
a0b6b246 | 7384 | #: builtin/fetch.c:607 |
c04f5ac3 JX |
7385 | #, c-format |
7386 | msgid "object %s not found" | |
7387 | msgstr "对象 %s 未发现" | |
7388 | ||
a0b6b246 | 7389 | #: builtin/fetch.c:611 |
c04f5ac3 JX |
7390 | msgid "[up to date]" |
7391 | msgstr "[最新]" | |
7392 | ||
a0b6b246 | 7393 | #: builtin/fetch.c:624 builtin/fetch.c:704 |
c04f5ac3 JX |
7394 | msgid "[rejected]" |
7395 | msgstr "[已拒绝]" | |
7396 | ||
a0b6b246 | 7397 | #: builtin/fetch.c:625 |
5c57d762 | 7398 | msgid "can't fetch in current branch" |
9a4b694c | 7399 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 7400 | |
a0b6b246 | 7401 | #: builtin/fetch.c:634 |
c04f5ac3 | 7402 | msgid "[tag update]" |
55a16ee4 | 7403 | msgstr "[标签更新]" |
c04f5ac3 | 7404 | |
a0b6b246 JX |
7405 | #: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 |
7406 | #: builtin/fetch.c:699 | |
5c57d762 JX |
7407 | msgid "unable to update local ref" |
7408 | msgstr "不能更新本地引用" | |
c04f5ac3 | 7409 | |
a0b6b246 | 7410 | #: builtin/fetch.c:654 |
c04f5ac3 | 7411 | msgid "[new tag]" |
55a16ee4 | 7412 | msgstr "[新标签]" |
c04f5ac3 | 7413 | |
a0b6b246 | 7414 | #: builtin/fetch.c:657 |
c04f5ac3 JX |
7415 | msgid "[new branch]" |
7416 | msgstr "[新分支]" | |
7417 | ||
a0b6b246 | 7418 | #: builtin/fetch.c:660 |
170e9899 JX |
7419 | msgid "[new ref]" |
7420 | msgstr "[新引用]" | |
7421 | ||
a0b6b246 | 7422 | #: builtin/fetch.c:699 |
c04f5ac3 JX |
7423 | msgid "forced update" |
7424 | msgstr "强制更新" | |
7425 | ||
a0b6b246 | 7426 | #: builtin/fetch.c:704 |
5c57d762 JX |
7427 | msgid "non-fast-forward" |
7428 | msgstr "非快进" | |
c04f5ac3 | 7429 | |
a0b6b246 | 7430 | #: builtin/fetch.c:749 |
c04f5ac3 JX |
7431 | #, c-format |
7432 | msgid "%s did not send all necessary objects\n" | |
7433 | msgstr "%s 未发送所有必须的对象\n" | |
7434 | ||
a0b6b246 | 7435 | #: builtin/fetch.c:769 |
cfff71a9 JX |
7436 | #, c-format |
7437 | msgid "reject %s because shallow roots are not allowed to be updated" | |
7438 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
7439 | ||
a0b6b246 | 7440 | #: builtin/fetch.c:856 builtin/fetch.c:952 |
c04f5ac3 JX |
7441 | #, c-format |
7442 | msgid "From %.*s\n" | |
7443 | msgstr "来自 %.*s\n" | |
7444 | ||
a0b6b246 | 7445 | #: builtin/fetch.c:867 |
c04f5ac3 JX |
7446 | #, c-format |
7447 | msgid "" | |
7448 | "some local refs could not be updated; try running\n" | |
7449 | " 'git remote prune %s' to remove any old, conflicting branches" | |
7450 | msgstr "" | |
7451 | "一些本地引用不能被更新;尝试运行\n" | |
7452 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
7453 | ||
90e6ef53 | 7454 | # 译者:注意保持前导空格 |
a0b6b246 | 7455 | #: builtin/fetch.c:922 |
81809b99 | 7456 | #, c-format |
8ada9598 | 7457 | msgid " (%s will become dangling)" |
07432cef | 7458 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 7459 | |
90e6ef53 | 7460 | # 译者:注意保持前导空格 |
a0b6b246 | 7461 | #: builtin/fetch.c:923 |
81809b99 | 7462 | #, c-format |
8ada9598 | 7463 | msgid " (%s has become dangling)" |
07432cef | 7464 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 7465 | |
a0b6b246 | 7466 | #: builtin/fetch.c:955 |
c04f5ac3 JX |
7467 | msgid "[deleted]" |
7468 | msgstr "[已删除]" | |
7469 | ||
a0b6b246 | 7470 | #: builtin/fetch.c:956 builtin/remote.c:1020 |
c04f5ac3 JX |
7471 | msgid "(none)" |
7472 | msgstr "(无)" | |
7473 | ||
a0b6b246 | 7474 | #: builtin/fetch.c:979 |
c04f5ac3 JX |
7475 | #, c-format |
7476 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 7477 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 7478 | |
a0b6b246 | 7479 | #: builtin/fetch.c:998 |
c04f5ac3 JX |
7480 | #, c-format |
7481 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
7482 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
7483 | ||
a0b6b246 | 7484 | #: builtin/fetch.c:1001 |
c04f5ac3 JX |
7485 | #, c-format |
7486 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 7487 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 7488 | |
a0b6b246 | 7489 | #: builtin/fetch.c:1077 |
90314792 JX |
7490 | #, c-format |
7491 | msgid "Don't know how to fetch from %s" | |
7492 | msgstr "不知道如何从 %s 获取" | |
7493 | ||
a0b6b246 | 7494 | #: builtin/fetch.c:1237 |
c04f5ac3 JX |
7495 | #, c-format |
7496 | msgid "Fetching %s\n" | |
d4a8e00b | 7497 | msgstr "正在获取 %s\n" |
c04f5ac3 | 7498 | |
a0b6b246 | 7499 | #: builtin/fetch.c:1239 builtin/remote.c:96 |
c04f5ac3 JX |
7500 | #, c-format |
7501 | msgid "Could not fetch %s" | |
7502 | msgstr "不能获取 %s" | |
7503 | ||
a0b6b246 | 7504 | #: builtin/fetch.c:1257 |
c04f5ac3 JX |
7505 | msgid "" |
7506 | "No remote repository specified. Please, specify either a URL or a\n" | |
7507 | "remote name from which new revisions should be fetched." | |
4375c10e | 7508 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 7509 | |
a0b6b246 | 7510 | #: builtin/fetch.c:1280 |
c04f5ac3 | 7511 | msgid "You need to specify a tag name." |
55a16ee4 | 7512 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 7513 | |
a0b6b246 JX |
7514 | #: builtin/fetch.c:1322 |
7515 | msgid "Negative depth in --deepen is not supported" | |
7516 | msgstr "--deepen 不支持负数深度" | |
7517 | ||
7518 | #: builtin/fetch.c:1324 | |
7519 | msgid "--deepen and --depth are mutually exclusive" | |
7520 | msgstr "--deepen 和 --depth 是互斥的" | |
7521 | ||
7522 | #: builtin/fetch.c:1329 | |
a77c07d9 JX |
7523 | msgid "--depth and --unshallow cannot be used together" |
7524 | msgstr "--depth 和 --unshallow 不能同时使用" | |
7525 | ||
a0b6b246 | 7526 | #: builtin/fetch.c:1331 |
a77c07d9 | 7527 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 7528 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 7529 | |
a0b6b246 | 7530 | #: builtin/fetch.c:1353 |
c04f5ac3 | 7531 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 7532 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 7533 | |
a0b6b246 | 7534 | #: builtin/fetch.c:1355 |
c04f5ac3 | 7535 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 7536 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 7537 | |
a0b6b246 | 7538 | #: builtin/fetch.c:1366 |
c04f5ac3 JX |
7539 | #, c-format |
7540 | msgid "No such remote or remote group: %s" | |
7541 | msgstr "没有这样的远程或远程组:%s" | |
7542 | ||
a0b6b246 | 7543 | #: builtin/fetch.c:1374 |
c04f5ac3 | 7544 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 7545 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 7546 | |
1b7f4a34 | 7547 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
7548 | msgid "" |
7549 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
7550 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 7551 | |
a0b6b246 | 7552 | #: builtin/fmt-merge-msg.c:663 |
ef317cd5 | 7553 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 7554 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 7555 | |
a0b6b246 | 7556 | #: builtin/fmt-merge-msg.c:666 |
ef317cd5 | 7557 | msgid "alias for --log (deprecated)" |
07432cef | 7558 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 7559 | |
a0b6b246 | 7560 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 7561 | msgid "text" |
07432cef | 7562 | msgstr "文本" |
ef317cd5 | 7563 | |
a0b6b246 | 7564 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 7565 | msgid "use <text> as start of message" |
07432cef | 7566 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 7567 | |
a0b6b246 | 7568 | #: builtin/fmt-merge-msg.c:671 |
ef317cd5 | 7569 | msgid "file to read from" |
07432cef | 7570 | msgstr "从文件中读取" |
ef317cd5 | 7571 | |
1b7f4a34 | 7572 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
7573 | msgid "git for-each-ref [<options>] [<pattern>]" |
7574 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 7575 | |
94550ed3 JX |
7576 | #: builtin/for-each-ref.c:10 |
7577 | msgid "git for-each-ref [--points-at <object>]" | |
7578 | msgstr "git for-each-ref [--points-at <对象>]" | |
7579 | ||
7580 | #: builtin/for-each-ref.c:11 | |
7581 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" | |
7582 | msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" | |
7583 | ||
7584 | #: builtin/for-each-ref.c:12 | |
7585 | msgid "git for-each-ref [--contains [<object>]]" | |
7586 | msgstr "git for-each-ref [--contains [<对象>]]" | |
7587 | ||
7588 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 7589 | msgid "quote placeholders suitably for shells" |
07432cef | 7590 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 7591 | |
94550ed3 | 7592 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 7593 | msgid "quote placeholders suitably for perl" |
07432cef | 7594 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 7595 | |
94550ed3 | 7596 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 7597 | msgid "quote placeholders suitably for python" |
07432cef | 7598 | msgstr "引用占位符适用于 python" |
ef317cd5 | 7599 | |
94550ed3 | 7600 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
7601 | msgid "quote placeholders suitably for Tcl" |
7602 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 7603 | |
94550ed3 | 7604 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 7605 | msgid "show only <n> matched refs" |
07432cef | 7606 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 7607 | |
94550ed3 | 7608 | #: builtin/for-each-ref.c:37 builtin/tag.c:372 |
ef317cd5 | 7609 | msgid "format to use for the output" |
07432cef | 7610 | msgstr "输出格式" |
ef317cd5 | 7611 | |
94550ed3 JX |
7612 | #: builtin/for-each-ref.c:41 |
7613 | msgid "print only refs which points at the given object" | |
7614 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 7615 | |
94550ed3 JX |
7616 | #: builtin/for-each-ref.c:43 |
7617 | msgid "print only refs that are merged" | |
7618 | msgstr "只打印已经合并的引用" | |
7619 | ||
7620 | #: builtin/for-each-ref.c:44 | |
7621 | msgid "print only refs that are not merged" | |
7622 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 7623 | |
94550ed3 JX |
7624 | #: builtin/for-each-ref.c:45 |
7625 | msgid "print only refs which contain the commit" | |
7626 | msgstr "只打印包含该提交的引用" | |
7627 | ||
5c57d762 | 7628 | #: builtin/fsck.c:519 |
6c94aba5 JX |
7629 | msgid "Checking object directories" |
7630 | msgstr "检查对象目录中" | |
7631 | ||
5c57d762 | 7632 | #: builtin/fsck.c:588 |
814ff314 JX |
7633 | msgid "git fsck [<options>] [<object>...]" |
7634 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 7635 | |
5c57d762 | 7636 | #: builtin/fsck.c:594 |
ef317cd5 | 7637 | msgid "show unreachable objects" |
07432cef | 7638 | msgstr "显示不可达的对象" |
ef317cd5 | 7639 | |
5c57d762 | 7640 | #: builtin/fsck.c:595 |
ef317cd5 | 7641 | msgid "show dangling objects" |
07432cef | 7642 | msgstr "显示摇摆的对象" |
ef317cd5 | 7643 | |
5c57d762 | 7644 | #: builtin/fsck.c:596 |
ef317cd5 | 7645 | msgid "report tags" |
55a16ee4 | 7646 | msgstr "报告标签" |
ef317cd5 | 7647 | |
5c57d762 | 7648 | #: builtin/fsck.c:597 |
ef317cd5 | 7649 | msgid "report root nodes" |
07432cef | 7650 | msgstr "报告根节点" |
ef317cd5 | 7651 | |
5c57d762 | 7652 | #: builtin/fsck.c:598 |
ef317cd5 | 7653 | msgid "make index objects head nodes" |
07432cef | 7654 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 7655 | |
5c57d762 | 7656 | #: builtin/fsck.c:599 |
ef317cd5 | 7657 | msgid "make reflogs head nodes (default)" |
07432cef | 7658 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 7659 | |
5c57d762 | 7660 | #: builtin/fsck.c:600 |
ef317cd5 | 7661 | msgid "also consider packs and alternate objects" |
07432cef | 7662 | msgstr "也考虑包和备用对象" |
ef317cd5 | 7663 | |
5c57d762 | 7664 | #: builtin/fsck.c:601 |
1b7f4a34 JX |
7665 | msgid "check only connectivity" |
7666 | msgstr "仅检查连通性" | |
7667 | ||
5c57d762 | 7668 | #: builtin/fsck.c:602 |
ef317cd5 | 7669 | msgid "enable more strict checking" |
07432cef | 7670 | msgstr "启用更严格的检查" |
ef317cd5 | 7671 | |
5c57d762 | 7672 | #: builtin/fsck.c:604 |
ef317cd5 | 7673 | msgid "write dangling objects in .git/lost-found" |
07432cef | 7674 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 7675 | |
5c57d762 | 7676 | #: builtin/fsck.c:605 builtin/prune.c:107 |
ef317cd5 | 7677 | msgid "show progress" |
07432cef | 7678 | msgstr "显示进度" |
ef317cd5 | 7679 | |
5c57d762 JX |
7680 | #: builtin/fsck.c:606 |
7681 | msgid "show verbose names for reachable objects" | |
7682 | msgstr "显示可达对象的详细名称" | |
7683 | ||
a0b6b246 | 7684 | #: builtin/fsck.c:665 |
6c94aba5 JX |
7685 | msgid "Checking objects" |
7686 | msgstr "检查对象中" | |
7687 | ||
1b7f4a34 | 7688 | #: builtin/gc.c:25 |
814ff314 JX |
7689 | msgid "git gc [<options>]" |
7690 | msgstr "git gc [<选项>]" | |
ef317cd5 | 7691 | |
94550ed3 | 7692 | #: builtin/gc.c:72 |
c04f5ac3 | 7693 | #, c-format |
7aea43ff JX |
7694 | msgid "Invalid %s: '%s'" |
7695 | msgstr "无效 %s:'%s'" | |
c04f5ac3 | 7696 | |
94550ed3 | 7697 | #: builtin/gc.c:139 |
c04f5ac3 JX |
7698 | #, c-format |
7699 | msgid "insanely long object directory %.*s" | |
7700 | msgstr "不正常的长对象目录 %.*s" | |
7701 | ||
94550ed3 JX |
7702 | #: builtin/gc.c:290 |
7703 | #, c-format | |
7704 | msgid "" | |
7705 | "The last gc run reported the following. Please correct the root cause\n" | |
7706 | "and remove %s.\n" | |
7707 | "Automatic cleanup will not be performed until the file is removed.\n" | |
7708 | "\n" | |
7709 | "%s" | |
7710 | msgstr "" | |
7711 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
7712 | "在该文件被删除之前,自动清理将不会执行。\n" | |
7713 | "\n" | |
7714 | "%s" | |
7715 | ||
7716 | #: builtin/gc.c:327 | |
ef317cd5 | 7717 | msgid "prune unreferenced objects" |
07432cef | 7718 | msgstr "清除未引用的对象" |
ef317cd5 | 7719 | |
94550ed3 | 7720 | #: builtin/gc.c:329 |
ef317cd5 | 7721 | msgid "be more thorough (increased runtime)" |
07432cef | 7722 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 7723 | |
94550ed3 | 7724 | #: builtin/gc.c:330 |
ef317cd5 | 7725 | msgid "enable auto-gc mode" |
07432cef | 7726 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 7727 | |
94550ed3 | 7728 | #: builtin/gc.c:331 |
90314792 JX |
7729 | msgid "force running gc even if there may be another gc running" |
7730 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
7731 | ||
94550ed3 | 7732 | #: builtin/gc.c:373 |
c04f5ac3 | 7733 | #, c-format |
6c94aba5 | 7734 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 7735 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 7736 | |
94550ed3 | 7737 | #: builtin/gc.c:375 |
6c94aba5 JX |
7738 | #, c-format |
7739 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 7740 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 7741 | |
94550ed3 | 7742 | #: builtin/gc.c:376 |
6c94aba5 JX |
7743 | #, c-format |
7744 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
7745 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 7746 | |
94550ed3 | 7747 | #: builtin/gc.c:397 |
90314792 JX |
7748 | #, c-format |
7749 | msgid "" | |
7750 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
7751 | msgstr "" | |
7752 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
7753 | ||
94550ed3 | 7754 | #: builtin/gc.c:441 |
c04f5ac3 JX |
7755 | msgid "" |
7756 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 7757 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 7758 | |
90314792 | 7759 | #: builtin/grep.c:23 |
814ff314 JX |
7760 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
7761 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 7762 | |
276ceeaa | 7763 | #: builtin/grep.c:219 |
c04f5ac3 JX |
7764 | #, c-format |
7765 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 7766 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 7767 | |
276ceeaa JX |
7768 | #: builtin/grep.c:277 |
7769 | #, c-format | |
7770 | msgid "invalid number of threads specified (%d) for %s" | |
7771 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
7772 | ||
a0b6b246 | 7773 | #: builtin/grep.c:453 builtin/grep.c:488 |
c04f5ac3 JX |
7774 | #, c-format |
7775 | msgid "unable to read tree (%s)" | |
90e6ef53 | 7776 | msgstr "无法读取树(%s)" |
c04f5ac3 | 7777 | |
a0b6b246 | 7778 | #: builtin/grep.c:503 |
c04f5ac3 JX |
7779 | #, c-format |
7780 | msgid "unable to grep from object of type %s" | |
7781 | msgstr "无法抓取来自于 %s 类型的对象" | |
7782 | ||
a0b6b246 | 7783 | #: builtin/grep.c:561 |
c04f5ac3 JX |
7784 | #, c-format |
7785 | msgid "switch `%c' expects a numerical value" | |
7786 | msgstr "开关 `%c' 期望一个数字值" | |
7787 | ||
a0b6b246 | 7788 | #: builtin/grep.c:647 |
ef317cd5 | 7789 | msgid "search in index instead of in the work tree" |
07432cef | 7790 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 7791 | |
a0b6b246 | 7792 | #: builtin/grep.c:649 |
ef317cd5 | 7793 | msgid "find in contents not managed by git" |
07432cef | 7794 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
7795 | |
7796 | # 译者:中文字符串拼接,可删除前导空格 | |
a0b6b246 | 7797 | #: builtin/grep.c:651 |
ef317cd5 | 7798 | msgid "search in both tracked and untracked files" |
07432cef | 7799 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 7800 | |
a0b6b246 | 7801 | #: builtin/grep.c:653 |
814ff314 JX |
7802 | msgid "ignore files specified via '.gitignore'" |
7803 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 7804 | |
a0b6b246 | 7805 | #: builtin/grep.c:656 |
ef317cd5 | 7806 | msgid "show non-matching lines" |
07432cef | 7807 | msgstr "显示未匹配的行" |
ef317cd5 | 7808 | |
a0b6b246 | 7809 | #: builtin/grep.c:658 |
ef317cd5 | 7810 | msgid "case insensitive matching" |
07432cef | 7811 | msgstr "不区分大小写匹配" |
ef317cd5 | 7812 | |
a0b6b246 | 7813 | #: builtin/grep.c:660 |
ef317cd5 | 7814 | msgid "match patterns only at word boundaries" |
07432cef | 7815 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 7816 | |
a0b6b246 | 7817 | #: builtin/grep.c:662 |
ef317cd5 | 7818 | msgid "process binary files as text" |
07432cef | 7819 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 7820 | |
a0b6b246 | 7821 | #: builtin/grep.c:664 |
ef317cd5 | 7822 | msgid "don't match patterns in binary files" |
07432cef | 7823 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 7824 | |
a0b6b246 | 7825 | #: builtin/grep.c:667 |
90314792 JX |
7826 | msgid "process binary files with textconv filters" |
7827 | msgstr "用 textconv 过滤器处理二进制文件" | |
7828 | ||
a0b6b246 | 7829 | #: builtin/grep.c:669 |
ef317cd5 | 7830 | msgid "descend at most <depth> levels" |
07432cef | 7831 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 7832 | |
a0b6b246 | 7833 | #: builtin/grep.c:673 |
ef317cd5 | 7834 | msgid "use extended POSIX regular expressions" |
07432cef | 7835 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 7836 | |
a0b6b246 | 7837 | #: builtin/grep.c:676 |
ef317cd5 | 7838 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 7839 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 7840 | |
a0b6b246 | 7841 | #: builtin/grep.c:679 |
ef317cd5 | 7842 | msgid "interpret patterns as fixed strings" |
07432cef | 7843 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 7844 | |
a0b6b246 | 7845 | #: builtin/grep.c:682 |
ef317cd5 | 7846 | msgid "use Perl-compatible regular expressions" |
07432cef | 7847 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 7848 | |
a0b6b246 | 7849 | #: builtin/grep.c:685 |
ef317cd5 | 7850 | msgid "show line numbers" |
07432cef | 7851 | msgstr "显示行号" |
ef317cd5 | 7852 | |
a0b6b246 | 7853 | #: builtin/grep.c:686 |
ef317cd5 | 7854 | msgid "don't show filenames" |
07432cef | 7855 | msgstr "不显示文件名" |
ef317cd5 | 7856 | |
a0b6b246 | 7857 | #: builtin/grep.c:687 |
ef317cd5 | 7858 | msgid "show filenames" |
07432cef | 7859 | msgstr "显示文件名" |
ef317cd5 | 7860 | |
a0b6b246 | 7861 | #: builtin/grep.c:689 |
ef317cd5 | 7862 | msgid "show filenames relative to top directory" |
07432cef | 7863 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 7864 | |
a0b6b246 | 7865 | #: builtin/grep.c:691 |
ef317cd5 | 7866 | msgid "show only filenames instead of matching lines" |
07432cef | 7867 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 7868 | |
a0b6b246 | 7869 | #: builtin/grep.c:693 |
ef317cd5 | 7870 | msgid "synonym for --files-with-matches" |
07432cef | 7871 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 7872 | |
a0b6b246 | 7873 | #: builtin/grep.c:696 |
ef317cd5 | 7874 | msgid "show only the names of files without match" |
07432cef | 7875 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 7876 | |
a0b6b246 | 7877 | #: builtin/grep.c:698 |
ef317cd5 | 7878 | msgid "print NUL after filenames" |
07432cef | 7879 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 7880 | |
a0b6b246 | 7881 | #: builtin/grep.c:700 |
ef317cd5 | 7882 | msgid "show the number of matches instead of matching lines" |
07432cef | 7883 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 7884 | |
a0b6b246 | 7885 | #: builtin/grep.c:701 |
ef317cd5 | 7886 | msgid "highlight matches" |
07432cef | 7887 | msgstr "高亮显示匹配项" |
ef317cd5 | 7888 | |
a0b6b246 | 7889 | #: builtin/grep.c:703 |
ef317cd5 | 7890 | msgid "print empty line between matches from different files" |
07432cef | 7891 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 7892 | |
a0b6b246 | 7893 | #: builtin/grep.c:705 |
ef317cd5 | 7894 | msgid "show filename only once above matches from same file" |
07432cef | 7895 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 7896 | |
a0b6b246 | 7897 | #: builtin/grep.c:708 |
ef317cd5 | 7898 | msgid "show <n> context lines before and after matches" |
07432cef | 7899 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 7900 | |
a0b6b246 | 7901 | #: builtin/grep.c:711 |
ef317cd5 | 7902 | msgid "show <n> context lines before matches" |
07432cef | 7903 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 7904 | |
a0b6b246 | 7905 | #: builtin/grep.c:713 |
ef317cd5 | 7906 | msgid "show <n> context lines after matches" |
07432cef | 7907 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 7908 | |
a0b6b246 | 7909 | #: builtin/grep.c:715 |
276ceeaa JX |
7910 | msgid "use <n> worker threads" |
7911 | msgstr "使用 <n> 个工作线程" | |
7912 | ||
a0b6b246 | 7913 | #: builtin/grep.c:716 |
ef317cd5 | 7914 | msgid "shortcut for -C NUM" |
07432cef | 7915 | msgstr "快捷键 -C 数字" |
ef317cd5 | 7916 | |
a0b6b246 | 7917 | #: builtin/grep.c:719 |
ef317cd5 | 7918 | msgid "show a line with the function name before matches" |
07432cef | 7919 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 7920 | |
a0b6b246 | 7921 | #: builtin/grep.c:721 |
ef317cd5 | 7922 | msgid "show the surrounding function" |
07432cef | 7923 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 7924 | |
a0b6b246 | 7925 | #: builtin/grep.c:724 |
ef317cd5 | 7926 | msgid "read patterns from file" |
07432cef | 7927 | msgstr "从文件读取模式" |
ef317cd5 | 7928 | |
a0b6b246 | 7929 | #: builtin/grep.c:726 |
ef317cd5 | 7930 | msgid "match <pattern>" |
07432cef | 7931 | msgstr "匹配 <模式>" |
ef317cd5 | 7932 | |
a0b6b246 | 7933 | #: builtin/grep.c:728 |
ef317cd5 | 7934 | msgid "combine patterns specified with -e" |
07432cef | 7935 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 7936 | |
a0b6b246 | 7937 | #: builtin/grep.c:740 |
ef317cd5 | 7938 | msgid "indicate hit with exit status without output" |
07432cef | 7939 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 7940 | |
a0b6b246 | 7941 | #: builtin/grep.c:742 |
ef317cd5 | 7942 | msgid "show only matches from files that match all patterns" |
07432cef | 7943 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 7944 | |
a0b6b246 | 7945 | #: builtin/grep.c:744 |
07432cef WS |
7946 | msgid "show parse tree for grep expression" |
7947 | msgstr "显示 grep 表达式的解析树" | |
7948 | ||
a0b6b246 | 7949 | #: builtin/grep.c:748 |
ef317cd5 | 7950 | msgid "pager" |
07432cef | 7951 | msgstr "分页" |
ef317cd5 | 7952 | |
a0b6b246 | 7953 | #: builtin/grep.c:748 |
ef317cd5 | 7954 | msgid "show matching files in the pager" |
07432cef | 7955 | msgstr "分页显示匹配的文件" |
ef317cd5 | 7956 | |
a0b6b246 | 7957 | #: builtin/grep.c:751 |
ef317cd5 | 7958 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 7959 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 7960 | |
a0b6b246 | 7961 | #: builtin/grep.c:814 |
c04f5ac3 JX |
7962 | msgid "no pattern given." |
7963 | msgstr "未提供模式匹配。" | |
7964 | ||
a0b6b246 | 7965 | #: builtin/grep.c:846 builtin/index-pack.c:1480 |
276ceeaa JX |
7966 | #, c-format |
7967 | msgid "invalid number of threads specified (%d)" | |
7968 | msgstr "指定的线程数无效(%d)" | |
7969 | ||
a0b6b246 | 7970 | #: builtin/grep.c:876 |
c04f5ac3 JX |
7971 | msgid "--open-files-in-pager only works on the worktree" |
7972 | msgstr "--open-files-in-pager 仅用于工作区" | |
7973 | ||
a0b6b246 | 7974 | #: builtin/grep.c:902 |
c04f5ac3 | 7975 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 7976 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 7977 | |
a0b6b246 | 7978 | #: builtin/grep.c:907 |
c04f5ac3 | 7979 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 7980 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 7981 | |
a0b6b246 | 7982 | #: builtin/grep.c:910 |
c04f5ac3 | 7983 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 7984 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 7985 | |
a0b6b246 | 7986 | #: builtin/grep.c:918 |
c04f5ac3 JX |
7987 | msgid "both --cached and trees are given." |
7988 | msgstr "同时给出了 --cached 和树对象。" | |
7989 | ||
276ceeaa | 7990 | #: builtin/hash-object.c:81 |
ef317cd5 | 7991 | msgid "" |
814ff314 JX |
7992 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
7993 | "[--] <file>..." | |
ef317cd5 | 7994 | msgstr "" |
814ff314 JX |
7995 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
7996 | "[--] <文件>..." | |
ef317cd5 | 7997 | |
276ceeaa | 7998 | #: builtin/hash-object.c:82 |
94550ed3 JX |
7999 | msgid "git hash-object --stdin-paths" |
8000 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 8001 | |
a0b6b246 | 8002 | #: builtin/hash-object.c:94 |
ef317cd5 | 8003 | msgid "type" |
07432cef | 8004 | msgstr "类型" |
ef317cd5 | 8005 | |
a0b6b246 | 8006 | #: builtin/hash-object.c:94 |
ef317cd5 | 8007 | msgid "object type" |
07432cef | 8008 | msgstr "对象类型" |
ef317cd5 | 8009 | |
a0b6b246 | 8010 | #: builtin/hash-object.c:95 |
ef317cd5 | 8011 | msgid "write the object into the object database" |
07432cef | 8012 | msgstr "将对象写入对象数据库" |
ef317cd5 | 8013 | |
a0b6b246 | 8014 | #: builtin/hash-object.c:97 |
ef317cd5 | 8015 | msgid "read the object from stdin" |
07432cef | 8016 | msgstr "从标准输入读取对象" |
ef317cd5 | 8017 | |
a0b6b246 | 8018 | #: builtin/hash-object.c:99 |
ef317cd5 | 8019 | msgid "store file as is without filters" |
07432cef | 8020 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 8021 | |
a0b6b246 | 8022 | #: builtin/hash-object.c:100 |
220c313c JX |
8023 | msgid "" |
8024 | "just hash any random garbage to create corrupt objects for debugging Git" | |
8025 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
8026 | ||
a0b6b246 | 8027 | #: builtin/hash-object.c:101 |
ef317cd5 | 8028 | msgid "process file as it were from this path" |
07432cef | 8029 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 8030 | |
a0b6b246 | 8031 | #: builtin/help.c:42 |
ef317cd5 | 8032 | msgid "print all available commands" |
07432cef | 8033 | msgstr "打印所有可用的命令" |
ef317cd5 | 8034 | |
a0b6b246 JX |
8035 | #: builtin/help.c:43 |
8036 | msgid "exclude guides" | |
8037 | msgstr "排除向导" | |
8038 | ||
8039 | #: builtin/help.c:44 | |
4dcdc3d8 JX |
8040 | msgid "print list of useful guides" |
8041 | msgstr "显示有用的指南列表" | |
8042 | ||
a0b6b246 | 8043 | #: builtin/help.c:45 |
ef317cd5 | 8044 | msgid "show man page" |
07432cef | 8045 | msgstr "显示 man 手册" |
ef317cd5 | 8046 | |
a0b6b246 | 8047 | #: builtin/help.c:46 |
ef317cd5 | 8048 | msgid "show manual in web browser" |
07432cef | 8049 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 8050 | |
a0b6b246 | 8051 | #: builtin/help.c:48 |
ef317cd5 | 8052 | msgid "show info page" |
07432cef | 8053 | msgstr "显示 info 手册" |
ef317cd5 | 8054 | |
a0b6b246 | 8055 | #: builtin/help.c:54 |
814ff314 JX |
8056 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
8057 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 8058 | |
a0b6b246 | 8059 | #: builtin/help.c:66 |
81809b99 | 8060 | #, c-format |
8ada9598 | 8061 | msgid "unrecognized help format '%s'" |
81809b99 | 8062 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 8063 | |
a0b6b246 | 8064 | #: builtin/help.c:93 |
8ada9598 | 8065 | msgid "Failed to start emacsclient." |
81809b99 | 8066 | msgstr "无法启动 emacsclient。" |
8ada9598 | 8067 | |
a0b6b246 | 8068 | #: builtin/help.c:106 |
8ada9598 | 8069 | msgid "Failed to parse emacsclient version." |
81809b99 | 8070 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 8071 | |
a0b6b246 | 8072 | #: builtin/help.c:114 |
8ada9598 JX |
8073 | #, c-format |
8074 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 8075 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 8076 | |
a0b6b246 | 8077 | #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 |
81809b99 | 8078 | #, c-format |
5b04ee3b JX |
8079 | msgid "failed to exec '%s'" |
8080 | msgstr "无法执行 '%s'" | |
8ada9598 | 8081 | |
a0b6b246 | 8082 | #: builtin/help.c:207 |
8ada9598 JX |
8083 | #, c-format |
8084 | msgid "" | |
8085 | "'%s': path for unsupported man viewer.\n" | |
8086 | "Please consider using 'man.<tool>.cmd' instead." | |
8087 | msgstr "" | |
81809b99 | 8088 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 8089 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 8090 | |
a0b6b246 | 8091 | #: builtin/help.c:219 |
8ada9598 JX |
8092 | #, c-format |
8093 | msgid "" | |
8094 | "'%s': cmd for supported man viewer.\n" | |
8095 | "Please consider using 'man.<tool>.path' instead." | |
8096 | msgstr "" | |
81809b99 | 8097 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 8098 | "请使用 'man.<工具>.path'。" |
8ada9598 | 8099 | |
a0b6b246 | 8100 | #: builtin/help.c:336 |
8ada9598 JX |
8101 | #, c-format |
8102 | msgid "'%s': unknown man viewer." | |
81809b99 | 8103 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 8104 | |
a0b6b246 | 8105 | #: builtin/help.c:353 |
8ada9598 | 8106 | msgid "no man viewer handled the request" |
81809b99 | 8107 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 8108 | |
a0b6b246 | 8109 | #: builtin/help.c:361 |
8ada9598 | 8110 | msgid "no info viewer handled the request" |
81809b99 | 8111 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 8112 | |
a0b6b246 | 8113 | #: builtin/help.c:403 |
4dcdc3d8 JX |
8114 | msgid "Defining attributes per path" |
8115 | msgstr "定义路径的属性" | |
8116 | ||
a0b6b246 | 8117 | #: builtin/help.c:404 |
220c313c JX |
8118 | msgid "Everyday Git With 20 Commands Or So" |
8119 | msgstr "每一天 Git 常用的约 20 条命令" | |
8120 | ||
a0b6b246 | 8121 | #: builtin/help.c:405 |
4dcdc3d8 JX |
8122 | msgid "A Git glossary" |
8123 | msgstr "Git 词汇表" | |
8124 | ||
a0b6b246 | 8125 | #: builtin/help.c:406 |
4dcdc3d8 JX |
8126 | msgid "Specifies intentionally untracked files to ignore" |
8127 | msgstr "忽略指定的未跟踪文件" | |
8128 | ||
a0b6b246 | 8129 | #: builtin/help.c:407 |
4dcdc3d8 JX |
8130 | msgid "Defining submodule properties" |
8131 | msgstr "定义子模组属性" | |
8132 | ||
a0b6b246 | 8133 | #: builtin/help.c:408 |
4dcdc3d8 JX |
8134 | msgid "Specifying revisions and ranges for Git" |
8135 | msgstr "指定 Git 的版本和版本范围" | |
8136 | ||
a0b6b246 | 8137 | #: builtin/help.c:409 |
4dcdc3d8 JX |
8138 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
8139 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
8140 | ||
a0b6b246 | 8141 | #: builtin/help.c:410 |
4dcdc3d8 JX |
8142 | msgid "An overview of recommended workflows with Git" |
8143 | msgstr "Git 推荐的工作流概览" | |
8144 | ||
a0b6b246 | 8145 | #: builtin/help.c:422 |
4dcdc3d8 JX |
8146 | msgid "The common Git guides are:\n" |
8147 | msgstr "最常用的 Git 向导有:\n" | |
8148 | ||
a0b6b246 | 8149 | #: builtin/help.c:440 |
8ada9598 JX |
8150 | #, c-format |
8151 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 8152 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 8153 | |
a0b6b246 JX |
8154 | #: builtin/help.c:462 builtin/help.c:479 |
8155 | #, c-format | |
8156 | msgid "usage: %s%s" | |
8157 | msgstr "用法:%s%s" | |
8158 | ||
8159 | #: builtin/index-pack.c:154 | |
6acbf033 JX |
8160 | #, c-format |
8161 | msgid "unable to open %s" | |
8162 | msgstr "不能打开 %s" | |
8163 | ||
a0b6b246 | 8164 | #: builtin/index-pack.c:204 |
8ada9598 JX |
8165 | #, c-format |
8166 | msgid "object type mismatch at %s" | |
81809b99 | 8167 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 8168 | |
a0b6b246 | 8169 | #: builtin/index-pack.c:224 |
6acbf033 JX |
8170 | #, c-format |
8171 | msgid "did not receive expected object %s" | |
a0b6b246 | 8172 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 8173 | |
a0b6b246 | 8174 | #: builtin/index-pack.c:227 |
6acbf033 JX |
8175 | #, c-format |
8176 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 8177 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 8178 | |
a0b6b246 | 8179 | #: builtin/index-pack.c:269 |
81809b99 | 8180 | #, c-format |
8ada9598 JX |
8181 | msgid "cannot fill %d byte" |
8182 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 8183 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 8184 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 8185 | |
a0b6b246 | 8186 | #: builtin/index-pack.c:279 |
8ada9598 | 8187 | msgid "early EOF" |
81809b99 | 8188 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 8189 | |
a0b6b246 | 8190 | #: builtin/index-pack.c:280 |
8ada9598 | 8191 | msgid "read error on input" |
81809b99 | 8192 | msgstr "输入上的读错误" |
8ada9598 | 8193 | |
a0b6b246 | 8194 | #: builtin/index-pack.c:292 |
8ada9598 | 8195 | msgid "used more bytes than were available" |
81809b99 | 8196 | msgstr "用掉了超过可用的字节" |
8ada9598 | 8197 | |
a0b6b246 | 8198 | #: builtin/index-pack.c:299 |
8ada9598 | 8199 | msgid "pack too large for current definition of off_t" |
81809b99 | 8200 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 8201 | |
a0b6b246 JX |
8202 | #: builtin/index-pack.c:302 builtin/unpack-objects.c:92 |
8203 | msgid "pack exceeds maximum allowed size" | |
8204 | msgstr "包超过了最大允许值" | |
8205 | ||
8206 | #: builtin/index-pack.c:317 | |
81809b99 | 8207 | #, c-format |
8ada9598 | 8208 | msgid "unable to create '%s'" |
81809b99 | 8209 | msgstr "不能创建 '%s'" |
8ada9598 | 8210 | |
a0b6b246 | 8211 | #: builtin/index-pack.c:322 |
81809b99 | 8212 | #, c-format |
8ada9598 | 8213 | msgid "cannot open packfile '%s'" |
81809b99 | 8214 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 8215 | |
a0b6b246 | 8216 | #: builtin/index-pack.c:336 |
8ada9598 | 8217 | msgid "pack signature mismatch" |
81809b99 | 8218 | msgstr "包签名不匹配" |
8ada9598 | 8219 | |
a0b6b246 | 8220 | #: builtin/index-pack.c:338 |
ef317cd5 JX |
8221 | #, c-format |
8222 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 8223 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 8224 | |
a0b6b246 | 8225 | #: builtin/index-pack.c:356 |
8ada9598 | 8226 | #, c-format |
5c57d762 JX |
8227 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
8228 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 8229 | |
a0b6b246 | 8230 | #: builtin/index-pack.c:478 |
8ada9598 JX |
8231 | #, c-format |
8232 | msgid "inflate returned %d" | |
81809b99 | 8233 | msgstr "解压缩返回 %d" |
8ada9598 | 8234 | |
a0b6b246 | 8235 | #: builtin/index-pack.c:527 |
8ada9598 | 8236 | msgid "offset value overflow for delta base object" |
81809b99 | 8237 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 8238 | |
a0b6b246 | 8239 | #: builtin/index-pack.c:535 |
8ada9598 | 8240 | msgid "delta base offset is out of bound" |
81809b99 | 8241 | msgstr "delta 基准偏移越界" |
8ada9598 | 8242 | |
a0b6b246 | 8243 | #: builtin/index-pack.c:543 |
81809b99 | 8244 | #, c-format |
8ada9598 | 8245 | msgid "unknown object type %d" |
81809b99 | 8246 | msgstr "未知对象类型 %d" |
8ada9598 | 8247 | |
a0b6b246 | 8248 | #: builtin/index-pack.c:574 |
8ada9598 | 8249 | msgid "cannot pread pack file" |
81809b99 | 8250 | msgstr "无法读取包文件" |
8ada9598 | 8251 | |
a0b6b246 | 8252 | #: builtin/index-pack.c:576 |
8ada9598 | 8253 | #, c-format |
5c57d762 JX |
8254 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
8255 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
8256 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8257 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 8258 | |
a0b6b246 | 8259 | #: builtin/index-pack.c:602 |
8ada9598 | 8260 | msgid "serious inflate inconsistency" |
81809b99 | 8261 | msgstr "解压缩严重的不一致" |
8ada9598 | 8262 | |
a0b6b246 JX |
8263 | #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 |
8264 | #: builtin/index-pack.c:811 builtin/index-pack.c:820 | |
8ada9598 JX |
8265 | #, c-format |
8266 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 8267 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 8268 | |
a0b6b246 JX |
8269 | #: builtin/index-pack.c:751 builtin/pack-objects.c:166 |
8270 | #: builtin/pack-objects.c:258 | |
6792b93b JX |
8271 | #, c-format |
8272 | msgid "unable to read %s" | |
8273 | msgstr "不能读 %s" | |
8274 | ||
a0b6b246 | 8275 | #: builtin/index-pack.c:817 |
6792b93b JX |
8276 | #, c-format |
8277 | msgid "cannot read existing object %s" | |
8278 | msgstr "不能读取现存对象 %s" | |
8279 | ||
a0b6b246 | 8280 | #: builtin/index-pack.c:831 |
81809b99 | 8281 | #, c-format |
8ada9598 | 8282 | msgid "invalid blob object %s" |
160fb2b2 | 8283 | msgstr "无效的数据对象 %s" |
8ada9598 | 8284 | |
a0b6b246 | 8285 | #: builtin/index-pack.c:845 |
81809b99 | 8286 | #, c-format |
8ada9598 | 8287 | msgid "invalid %s" |
81809b99 | 8288 | msgstr "无效的 %s" |
8ada9598 | 8289 | |
a0b6b246 | 8290 | #: builtin/index-pack.c:848 |
8ada9598 | 8291 | msgid "Error in object" |
81809b99 | 8292 | msgstr "对象中出错" |
8ada9598 | 8293 | |
a0b6b246 | 8294 | #: builtin/index-pack.c:850 |
8ada9598 JX |
8295 | #, c-format |
8296 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 8297 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 8298 | |
a0b6b246 | 8299 | #: builtin/index-pack.c:922 builtin/index-pack.c:953 |
8ada9598 | 8300 | msgid "failed to apply delta" |
81809b99 | 8301 | msgstr "无法应用 delta" |
8ada9598 | 8302 | |
a0b6b246 | 8303 | #: builtin/index-pack.c:1123 |
8ada9598 | 8304 | msgid "Receiving objects" |
81809b99 | 8305 | msgstr "接收对象中" |
8ada9598 | 8306 | |
a0b6b246 | 8307 | #: builtin/index-pack.c:1123 |
8ada9598 | 8308 | msgid "Indexing objects" |
81809b99 | 8309 | msgstr "索引对象中" |
8ada9598 | 8310 | |
a0b6b246 | 8311 | #: builtin/index-pack.c:1155 |
8ada9598 | 8312 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 8313 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 8314 | |
a0b6b246 | 8315 | #: builtin/index-pack.c:1160 |
8ada9598 | 8316 | msgid "cannot fstat packfile" |
81809b99 | 8317 | msgstr "不能枚举包文件状态" |
8ada9598 | 8318 | |
a0b6b246 | 8319 | #: builtin/index-pack.c:1163 |
8ada9598 | 8320 | msgid "pack has junk at the end" |
81809b99 | 8321 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 8322 | |
a0b6b246 | 8323 | #: builtin/index-pack.c:1174 |
6792b93b JX |
8324 | msgid "confusion beyond insanity in parse_pack_objects()" |
8325 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
8326 | ||
a0b6b246 | 8327 | #: builtin/index-pack.c:1197 |
8ada9598 | 8328 | msgid "Resolving deltas" |
81809b99 | 8329 | msgstr "处理 delta 中" |
8ada9598 | 8330 | |
a0b6b246 | 8331 | #: builtin/index-pack.c:1208 |
07432cef | 8332 | #, c-format |
ef317cd5 | 8333 | msgid "unable to create thread: %s" |
07432cef | 8334 | msgstr "不能创建线程:%s" |
ef317cd5 | 8335 | |
a0b6b246 | 8336 | #: builtin/index-pack.c:1250 |
8ada9598 | 8337 | msgid "confusion beyond insanity" |
81809b99 | 8338 | msgstr "不可理喻" |
8ada9598 | 8339 | |
a0b6b246 | 8340 | #: builtin/index-pack.c:1256 |
ef317cd5 | 8341 | #, c-format |
5b04ee3b JX |
8342 | msgid "completed with %d local object" |
8343 | msgid_plural "completed with %d local objects" | |
8344 | msgstr[0] "完成 %d 个本地对象" | |
8345 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 8346 | |
a0b6b246 | 8347 | #: builtin/index-pack.c:1268 |
ef317cd5 JX |
8348 | #, c-format |
8349 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 8350 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 8351 | |
a0b6b246 | 8352 | #: builtin/index-pack.c:1272 |
8ada9598 JX |
8353 | #, c-format |
8354 | msgid "pack has %d unresolved delta" | |
8355 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 8356 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 8357 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 8358 | |
a0b6b246 | 8359 | #: builtin/index-pack.c:1296 |
81809b99 | 8360 | #, c-format |
8ada9598 | 8361 | msgid "unable to deflate appended object (%d)" |
07432cef | 8362 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 8363 | |
a0b6b246 | 8364 | #: builtin/index-pack.c:1372 |
8ada9598 JX |
8365 | #, c-format |
8366 | msgid "local object %s is corrupt" | |
81809b99 | 8367 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 8368 | |
a0b6b246 | 8369 | #: builtin/index-pack.c:1396 |
8ada9598 | 8370 | msgid "error while closing pack file" |
81809b99 | 8371 | msgstr "关闭包文件时出错" |
8ada9598 | 8372 | |
a0b6b246 | 8373 | #: builtin/index-pack.c:1409 |
81809b99 | 8374 | #, c-format |
8ada9598 | 8375 | msgid "cannot write keep file '%s'" |
81809b99 | 8376 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 8377 | |
a0b6b246 | 8378 | #: builtin/index-pack.c:1417 |
81809b99 | 8379 | #, c-format |
8ada9598 | 8380 | msgid "cannot close written keep file '%s'" |
81809b99 | 8381 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 8382 | |
a0b6b246 | 8383 | #: builtin/index-pack.c:1430 |
8ada9598 | 8384 | msgid "cannot store pack file" |
81809b99 | 8385 | msgstr "无法存储包文件" |
8ada9598 | 8386 | |
a0b6b246 | 8387 | #: builtin/index-pack.c:1441 |
8ada9598 | 8388 | msgid "cannot store index file" |
81809b99 | 8389 | msgstr "无法存储索引文件" |
8ada9598 | 8390 | |
a0b6b246 | 8391 | #: builtin/index-pack.c:1474 |
07432cef | 8392 | #, c-format |
ef317cd5 | 8393 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 8394 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 8395 | |
a0b6b246 | 8396 | #: builtin/index-pack.c:1484 builtin/index-pack.c:1681 |
ef317cd5 JX |
8397 | #, c-format |
8398 | msgid "no threads support, ignoring %s" | |
07432cef | 8399 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 8400 | |
5c57d762 | 8401 | #: builtin/index-pack.c:1542 |
81809b99 | 8402 | #, c-format |
8ada9598 | 8403 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 8404 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 8405 | |
5c57d762 | 8406 | #: builtin/index-pack.c:1544 |
81809b99 | 8407 | #, c-format |
8ada9598 | 8408 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 8409 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 8410 | |
5c57d762 | 8411 | #: builtin/index-pack.c:1591 |
81809b99 | 8412 | #, c-format |
8ada9598 JX |
8413 | msgid "non delta: %d object" |
8414 | msgid_plural "non delta: %d objects" | |
81809b99 | 8415 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 8416 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 8417 | |
5c57d762 | 8418 | #: builtin/index-pack.c:1598 |
8ada9598 JX |
8419 | #, c-format |
8420 | msgid "chain length = %d: %lu object" | |
8421 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 8422 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 8423 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 8424 | |
5c57d762 | 8425 | #: builtin/index-pack.c:1611 |
5b04ee3b JX |
8426 | #, c-format |
8427 | msgid "packfile name '%s' does not end with '.pack'" | |
8428 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8429 | ||
5c57d762 JX |
8430 | #: builtin/index-pack.c:1693 builtin/index-pack.c:1696 |
8431 | #: builtin/index-pack.c:1712 builtin/index-pack.c:1716 | |
81809b99 | 8432 | #, c-format |
8ada9598 | 8433 | msgid "bad %s" |
81809b99 | 8434 | msgstr "错误选项 %s" |
8ada9598 | 8435 | |
a0b6b246 | 8436 | #: builtin/index-pack.c:1732 |
8ada9598 | 8437 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 8438 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 8439 | |
a0b6b246 | 8440 | #: builtin/index-pack.c:1740 |
8ada9598 | 8441 | msgid "--verify with no packfile name given" |
dbd6cced | 8442 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 8443 | |
a0b6b246 | 8444 | #: builtin/init-db.c:54 |
c04f5ac3 JX |
8445 | #, c-format |
8446 | msgid "cannot stat '%s'" | |
8447 | msgstr "不能枚举 '%s' 状态" | |
8448 | ||
a0b6b246 | 8449 | #: builtin/init-db.c:60 |
c04f5ac3 JX |
8450 | #, c-format |
8451 | msgid "cannot stat template '%s'" | |
8452 | msgstr "不能枚举模版 '%s' 状态" | |
8453 | ||
a0b6b246 | 8454 | #: builtin/init-db.c:65 |
c04f5ac3 JX |
8455 | #, c-format |
8456 | msgid "cannot opendir '%s'" | |
8457 | msgstr "不能打开目录 '%s'" | |
8458 | ||
a0b6b246 | 8459 | #: builtin/init-db.c:76 |
c04f5ac3 JX |
8460 | #, c-format |
8461 | msgid "cannot readlink '%s'" | |
8462 | msgstr "不能读取链接 '%s'" | |
8463 | ||
a0b6b246 | 8464 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
8465 | #, c-format |
8466 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 8467 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 8468 | |
a0b6b246 | 8469 | #: builtin/init-db.c:84 |
c04f5ac3 JX |
8470 | #, c-format |
8471 | msgid "cannot copy '%s' to '%s'" | |
8472 | msgstr "不能拷贝 '%s' 至 '%s'" | |
8473 | ||
a0b6b246 | 8474 | #: builtin/init-db.c:88 |
c04f5ac3 JX |
8475 | #, c-format |
8476 | msgid "ignoring template %s" | |
8477 | msgstr "忽略模版 %s" | |
8478 | ||
a0b6b246 | 8479 | #: builtin/init-db.c:119 |
c04f5ac3 JX |
8480 | #, c-format |
8481 | msgid "templates not found %s" | |
8482 | msgstr "模版未找到 %s" | |
8483 | ||
a0b6b246 | 8484 | #: builtin/init-db.c:134 |
c04f5ac3 | 8485 | #, c-format |
5b04ee3b JX |
8486 | msgid "not copying templates from '%s': %s" |
8487 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 8488 | |
a0b6b246 | 8489 | #: builtin/init-db.c:327 |
c04f5ac3 JX |
8490 | #, c-format |
8491 | msgid "unable to handle file type %d" | |
8492 | msgstr "不能处理 %d 类型的文件" | |
8493 | ||
a0b6b246 | 8494 | #: builtin/init-db.c:330 |
c04f5ac3 JX |
8495 | #, c-format |
8496 | msgid "unable to move %s to %s" | |
8497 | msgstr "不能移动 %s 至 %s" | |
8498 | ||
a0b6b246 JX |
8499 | #: builtin/init-db.c:347 builtin/init-db.c:350 |
8500 | #, c-format | |
8501 | msgid "%s already exists" | |
8502 | msgstr "%s 已经存在" | |
8503 | ||
8504 | #: builtin/init-db.c:403 | |
c04f5ac3 | 8505 | #, c-format |
5c57d762 JX |
8506 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
8507 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 8508 | |
a0b6b246 | 8509 | #: builtin/init-db.c:404 |
5c57d762 JX |
8510 | #, c-format |
8511 | msgid "Reinitialized existing Git repository in %s%s\n" | |
8512 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 8513 | |
a0b6b246 | 8514 | #: builtin/init-db.c:408 |
5c57d762 JX |
8515 | #, c-format |
8516 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 8517 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 8518 | |
a0b6b246 | 8519 | #: builtin/init-db.c:409 |
5c57d762 JX |
8520 | #, c-format |
8521 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 8522 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 8523 | |
a0b6b246 | 8524 | #: builtin/init-db.c:457 |
ef317cd5 | 8525 | msgid "" |
a77c07d9 | 8526 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 8527 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 8528 | msgstr "" |
07432cef | 8529 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 8530 | "[<目录>]" |
ef317cd5 | 8531 | |
a0b6b246 | 8532 | #: builtin/init-db.c:480 |
ef317cd5 | 8533 | msgid "permissions" |
07432cef | 8534 | msgstr "权限" |
ef317cd5 | 8535 | |
a0b6b246 | 8536 | #: builtin/init-db.c:481 |
ef317cd5 | 8537 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 8538 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 8539 | |
a0b6b246 | 8540 | #: builtin/init-db.c:515 builtin/init-db.c:520 |
c04f5ac3 JX |
8541 | #, c-format |
8542 | msgid "cannot mkdir %s" | |
8543 | msgstr "不能创建目录 %s" | |
8544 | ||
a0b6b246 | 8545 | #: builtin/init-db.c:524 |
c04f5ac3 JX |
8546 | #, c-format |
8547 | msgid "cannot chdir to %s" | |
8548 | msgstr "不能切换目录到 %s" | |
8549 | ||
a0b6b246 | 8550 | #: builtin/init-db.c:545 |
c04f5ac3 JX |
8551 | #, c-format |
8552 | msgid "" | |
8553 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
8554 | "dir=<directory>)" | |
1e607449 | 8555 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 8556 | |
a0b6b246 | 8557 | #: builtin/init-db.c:573 |
c04f5ac3 JX |
8558 | #, c-format |
8559 | msgid "Cannot access work tree '%s'" | |
8560 | msgstr "不能访问工作区 '%s'" | |
8561 | ||
220c313c JX |
8562 | #: builtin/interpret-trailers.c:15 |
8563 | msgid "" | |
276ceeaa JX |
8564 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
8565 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
8566 | msgstr "" |
8567 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
8568 | ">])...] [<文件>...]" | |
276ceeaa JX |
8569 | |
8570 | #: builtin/interpret-trailers.c:26 | |
8571 | msgid "edit files in place" | |
8572 | msgstr "在原位编辑文件" | |
220c313c | 8573 | |
276ceeaa | 8574 | #: builtin/interpret-trailers.c:27 |
220c313c JX |
8575 | msgid "trim empty trailers" |
8576 | msgstr "删除空签名" | |
8577 | ||
276ceeaa | 8578 | #: builtin/interpret-trailers.c:28 |
220c313c JX |
8579 | msgid "trailer" |
8580 | msgstr "签名" | |
8581 | ||
276ceeaa | 8582 | #: builtin/interpret-trailers.c:29 |
220c313c JX |
8583 | msgid "trailer(s) to add" |
8584 | msgstr "要添加的签名" | |
8585 | ||
276ceeaa JX |
8586 | #: builtin/interpret-trailers.c:42 |
8587 | msgid "no input file given for in-place editing" | |
8588 | msgstr "没有给出要原位编辑的文件" | |
8589 | ||
5c57d762 | 8590 | #: builtin/log.c:44 |
7aea43ff | 8591 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 8592 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 8593 | |
5c57d762 | 8594 | #: builtin/log.c:45 |
814ff314 JX |
8595 | msgid "git show [<options>] <object>..." |
8596 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 8597 | |
5c57d762 | 8598 | #: builtin/log.c:84 |
220c313c JX |
8599 | #, c-format |
8600 | msgid "invalid --decorate option: %s" | |
8601 | msgstr "无效的 --decorate 选项:%s" | |
8602 | ||
5c57d762 | 8603 | #: builtin/log.c:139 |
ef317cd5 | 8604 | msgid "suppress diff output" |
07432cef | 8605 | msgstr "不显示差异输出" |
ef317cd5 | 8606 | |
5c57d762 | 8607 | #: builtin/log.c:140 |
ef317cd5 | 8608 | msgid "show source" |
07432cef | 8609 | msgstr "显示源" |
ef317cd5 | 8610 | |
5c57d762 | 8611 | #: builtin/log.c:141 |
07432cef WS |
8612 | msgid "Use mail map file" |
8613 | msgstr "使用邮件映射文件" | |
8614 | ||
5c57d762 | 8615 | #: builtin/log.c:142 |
ef317cd5 | 8616 | msgid "decorate options" |
07432cef | 8617 | msgstr "修饰选项" |
ef317cd5 | 8618 | |
5c57d762 | 8619 | #: builtin/log.c:145 |
220c313c JX |
8620 | msgid "Process line range n,m in file, counting from 1" |
8621 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
8622 | ||
5c57d762 | 8623 | #: builtin/log.c:241 |
c04f5ac3 JX |
8624 | #, c-format |
8625 | msgid "Final output: %d %s\n" | |
8626 | msgstr "最终输出:%d %s\n" | |
8627 | ||
5c57d762 | 8628 | #: builtin/log.c:486 |
220c313c JX |
8629 | #, c-format |
8630 | msgid "git show %s: bad file" | |
8631 | msgstr "git show %s: 损坏的文件" | |
8632 | ||
5c57d762 | 8633 | #: builtin/log.c:500 builtin/log.c:594 |
c04f5ac3 JX |
8634 | #, c-format |
8635 | msgid "Could not read object %s" | |
90e6ef53 | 8636 | msgstr "不能读取对象 %s" |
c04f5ac3 | 8637 | |
5c57d762 | 8638 | #: builtin/log.c:618 |
c04f5ac3 JX |
8639 | #, c-format |
8640 | msgid "Unknown type: %d" | |
8641 | msgstr "未知类型:%d" | |
8642 | ||
5c57d762 | 8643 | #: builtin/log.c:739 |
c04f5ac3 JX |
8644 | msgid "format.headers without value" |
8645 | msgstr "format.headers 没有值" | |
8646 | ||
5c57d762 | 8647 | #: builtin/log.c:839 |
c04f5ac3 JX |
8648 | msgid "name of output directory is too long" |
8649 | msgstr "输出目录名太长" | |
8650 | ||
5c57d762 | 8651 | #: builtin/log.c:854 |
c04f5ac3 JX |
8652 | #, c-format |
8653 | msgid "Cannot open patch file %s" | |
8654 | msgstr "无法打开补丁文件 %s" | |
8655 | ||
5c57d762 | 8656 | #: builtin/log.c:868 |
c04f5ac3 JX |
8657 | msgid "Need exactly one range." |
8658 | msgstr "只需要一个范围。" | |
8659 | ||
5c57d762 | 8660 | #: builtin/log.c:878 |
c04f5ac3 JX |
8661 | msgid "Not a range." |
8662 | msgstr "不是一个范围。" | |
8663 | ||
5c57d762 | 8664 | #: builtin/log.c:984 |
c04f5ac3 JX |
8665 | msgid "Cover letter needs email format" |
8666 | msgstr "信封需要邮件地址格式" | |
8667 | ||
a0b6b246 | 8668 | #: builtin/log.c:1063 |
c04f5ac3 JX |
8669 | #, c-format |
8670 | msgid "insane in-reply-to: %s" | |
8671 | msgstr "不正常的 in-reply-to:%s" | |
8672 | ||
a0b6b246 | 8673 | #: builtin/log.c:1091 |
814ff314 JX |
8674 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
8675 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 8676 | |
a0b6b246 | 8677 | #: builtin/log.c:1141 |
c04f5ac3 JX |
8678 | msgid "Two output directories?" |
8679 | msgstr "两个输出目录?" | |
8680 | ||
a0b6b246 | 8681 | #: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 |
5b04ee3b JX |
8682 | #, c-format |
8683 | msgid "Unknown commit %s" | |
8684 | msgstr "未知提交 %s" | |
8685 | ||
a0b6b246 | 8686 | #: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 |
5b04ee3b JX |
8687 | #, c-format |
8688 | msgid "Failed to resolve '%s' as a valid ref." | |
8689 | msgstr "无法解析 '%s' 为一个有效引用。" | |
8690 | ||
a0b6b246 | 8691 | #: builtin/log.c:1263 |
5b04ee3b JX |
8692 | msgid "Could not find exact merge base." |
8693 | msgstr "不能找到准确的合并基线。" | |
8694 | ||
a0b6b246 | 8695 | #: builtin/log.c:1267 |
5b04ee3b JX |
8696 | msgid "" |
8697 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
8698 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
8699 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
8700 | msgstr "" | |
8701 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 8702 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
5b04ee3b JX |
8703 | "参数 --base=<base-commit-id> 手动指定一个基线提交。" |
8704 | ||
a0b6b246 | 8705 | #: builtin/log.c:1287 |
5b04ee3b JX |
8706 | msgid "Failed to find exact merge base" |
8707 | msgstr "无法找到准确的合并基线" | |
8708 | ||
a0b6b246 | 8709 | #: builtin/log.c:1298 |
5b04ee3b JX |
8710 | msgid "base commit should be the ancestor of revision list" |
8711 | msgstr "基线提交应该是版本列表的祖先" | |
8712 | ||
a0b6b246 | 8713 | #: builtin/log.c:1302 |
5b04ee3b JX |
8714 | msgid "base commit shouldn't be in revision list" |
8715 | msgstr "基线提交不应该出现在版本列表中" | |
8716 | ||
a0b6b246 | 8717 | #: builtin/log.c:1351 |
5b04ee3b | 8718 | msgid "cannot get patch id" |
aef18cc6 | 8719 | msgstr "无法得到补丁 id" |
5b04ee3b | 8720 | |
a0b6b246 | 8721 | #: builtin/log.c:1408 |
ef317cd5 | 8722 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 8723 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 8724 | |
a0b6b246 | 8725 | #: builtin/log.c:1411 |
ef317cd5 | 8726 | msgid "use [PATCH] even with multiple patches" |
07432cef | 8727 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 8728 | |
a0b6b246 | 8729 | #: builtin/log.c:1415 |
ef317cd5 | 8730 | msgid "print patches to standard out" |
07432cef | 8731 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 8732 | |
a0b6b246 | 8733 | #: builtin/log.c:1417 |
ef317cd5 | 8734 | msgid "generate a cover letter" |
07432cef | 8735 | msgstr "生成一封附信" |
c04f5ac3 | 8736 | |
a0b6b246 | 8737 | #: builtin/log.c:1419 |
ef317cd5 | 8738 | msgid "use simple number sequence for output file names" |
07432cef | 8739 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 8740 | |
a0b6b246 | 8741 | #: builtin/log.c:1420 |
ef317cd5 | 8742 | msgid "sfx" |
07432cef | 8743 | msgstr "后缀" |
ef317cd5 | 8744 | |
a0b6b246 | 8745 | #: builtin/log.c:1421 |
ef317cd5 | 8746 | msgid "use <sfx> instead of '.patch'" |
07432cef | 8747 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 8748 | |
a0b6b246 | 8749 | #: builtin/log.c:1423 |
ef317cd5 | 8750 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
8751 | msgstr "补丁以 <n> 开始编号,而不是1" |
8752 | ||
a0b6b246 | 8753 | #: builtin/log.c:1425 |
07432cef WS |
8754 | msgid "mark the series as Nth re-roll" |
8755 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 8756 | |
a0b6b246 JX |
8757 | #: builtin/log.c:1427 |
8758 | msgid "Use [RFC PATCH] instead of [PATCH]" | |
8759 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
8760 | ||
8761 | #: builtin/log.c:1430 | |
ef317cd5 | 8762 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 8763 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 8764 | |
a0b6b246 | 8765 | #: builtin/log.c:1433 |
ef317cd5 | 8766 | msgid "store resulting files in <dir>" |
d9d56b23 | 8767 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 8768 | |
a0b6b246 | 8769 | #: builtin/log.c:1436 |
ef317cd5 | 8770 | msgid "don't strip/add [PATCH]" |
07432cef | 8771 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 8772 | |
a0b6b246 | 8773 | #: builtin/log.c:1439 |
ef317cd5 | 8774 | msgid "don't output binary diffs" |
07432cef | 8775 | msgstr "不输出二进制差异" |
ef317cd5 | 8776 | |
a0b6b246 | 8777 | #: builtin/log.c:1441 |
89f80d72 JX |
8778 | msgid "output all-zero hash in From header" |
8779 | msgstr "在 From 头信息中输出全为零的哈希值" | |
8780 | ||
a0b6b246 | 8781 | #: builtin/log.c:1443 |
ef317cd5 | 8782 | msgid "don't include a patch matching a commit upstream" |
07432cef | 8783 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 8784 | |
a0b6b246 | 8785 | #: builtin/log.c:1445 |
ef317cd5 | 8786 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 8787 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 8788 | |
a0b6b246 | 8789 | #: builtin/log.c:1447 |
ef317cd5 | 8790 | msgid "Messaging" |
07432cef | 8791 | msgstr "邮件发送" |
ef317cd5 | 8792 | |
a0b6b246 | 8793 | #: builtin/log.c:1448 |
ef317cd5 | 8794 | msgid "header" |
07432cef | 8795 | msgstr "header" |
ef317cd5 | 8796 | |
a0b6b246 | 8797 | #: builtin/log.c:1449 |
ef317cd5 | 8798 | msgid "add email header" |
07432cef | 8799 | msgstr "添加邮件头" |
ef317cd5 | 8800 | |
a0b6b246 | 8801 | #: builtin/log.c:1450 builtin/log.c:1452 |
ef317cd5 | 8802 | msgid "email" |
07432cef | 8803 | msgstr "邮件地址" |
ef317cd5 | 8804 | |
a0b6b246 | 8805 | #: builtin/log.c:1450 |
ef317cd5 | 8806 | msgid "add To: header" |
07432cef | 8807 | msgstr "添加收件人" |
ef317cd5 | 8808 | |
a0b6b246 | 8809 | #: builtin/log.c:1452 |
ef317cd5 | 8810 | msgid "add Cc: header" |
07432cef | 8811 | msgstr "添加抄送" |
ef317cd5 | 8812 | |
a0b6b246 | 8813 | #: builtin/log.c:1454 |
2e8451e8 | 8814 | msgid "ident" |
d9d56b23 | 8815 | msgstr "标识" |
2e8451e8 | 8816 | |
a0b6b246 | 8817 | #: builtin/log.c:1455 |
2e8451e8 | 8818 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 8819 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 8820 | |
a0b6b246 | 8821 | #: builtin/log.c:1457 |
ef317cd5 | 8822 | msgid "message-id" |
d9d56b23 | 8823 | msgstr "邮件标识" |
ef317cd5 | 8824 | |
a0b6b246 | 8825 | #: builtin/log.c:1458 |
ef317cd5 | 8826 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 8827 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 8828 | |
a0b6b246 | 8829 | #: builtin/log.c:1459 builtin/log.c:1462 |
ef317cd5 | 8830 | msgid "boundary" |
07432cef | 8831 | msgstr "边界" |
ef317cd5 | 8832 | |
a0b6b246 | 8833 | #: builtin/log.c:1460 |
ef317cd5 | 8834 | msgid "attach the patch" |
07432cef | 8835 | msgstr "附件方式添加补丁" |
ef317cd5 | 8836 | |
a0b6b246 | 8837 | #: builtin/log.c:1463 |
ef317cd5 | 8838 | msgid "inline the patch" |
07432cef | 8839 | msgstr "内联显示补丁" |
ef317cd5 | 8840 | |
a0b6b246 | 8841 | #: builtin/log.c:1467 |
ef317cd5 | 8842 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 8843 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 8844 | |
a0b6b246 | 8845 | #: builtin/log.c:1469 |
ef317cd5 | 8846 | msgid "signature" |
07432cef | 8847 | msgstr "签名" |
ef317cd5 | 8848 | |
a0b6b246 | 8849 | #: builtin/log.c:1470 |
ef317cd5 | 8850 | msgid "add a signature" |
07432cef | 8851 | msgstr "添加一个签名" |
ef317cd5 | 8852 | |
a0b6b246 | 8853 | #: builtin/log.c:1471 |
5b04ee3b JX |
8854 | msgid "base-commit" |
8855 | msgstr "基线提交" | |
8856 | ||
a0b6b246 | 8857 | #: builtin/log.c:1472 |
5b04ee3b JX |
8858 | msgid "add prerequisite tree info to the patch series" |
8859 | msgstr "为补丁列表添加前置树信息" | |
8860 | ||
a0b6b246 | 8861 | #: builtin/log.c:1474 |
6acbf033 JX |
8862 | msgid "add a signature from a file" |
8863 | msgstr "从文件添加一个签名" | |
8864 | ||
a0b6b246 | 8865 | #: builtin/log.c:1475 |
ef317cd5 | 8866 | msgid "don't print the patch filenames" |
07432cef | 8867 | msgstr "不要打印补丁文件名" |
ef317cd5 | 8868 | |
a0b6b246 | 8869 | #: builtin/log.c:1565 |
c04f5ac3 JX |
8870 | msgid "-n and -k are mutually exclusive." |
8871 | msgstr "-n 和 -k 互斥。" | |
8872 | ||
a0b6b246 JX |
8873 | #: builtin/log.c:1567 |
8874 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." | |
8875 | msgstr "--subject-prefix/--rfc 和 -k 互斥。" | |
c04f5ac3 | 8876 | |
a0b6b246 | 8877 | #: builtin/log.c:1575 |
c04f5ac3 JX |
8878 | msgid "--name-only does not make sense" |
8879 | msgstr "--name-only 无意义" | |
8880 | ||
a0b6b246 | 8881 | #: builtin/log.c:1577 |
c04f5ac3 JX |
8882 | msgid "--name-status does not make sense" |
8883 | msgstr "--name-status 无意义" | |
8884 | ||
a0b6b246 | 8885 | #: builtin/log.c:1579 |
c04f5ac3 JX |
8886 | msgid "--check does not make sense" |
8887 | msgstr "--check 无意义" | |
8888 | ||
a0b6b246 | 8889 | #: builtin/log.c:1609 |
c04f5ac3 JX |
8890 | msgid "standard output, or directory, which one?" |
8891 | msgstr "标准输出或目录,哪一个?" | |
8892 | ||
a0b6b246 | 8893 | #: builtin/log.c:1611 |
c04f5ac3 JX |
8894 | #, c-format |
8895 | msgid "Could not create directory '%s'" | |
90e6ef53 | 8896 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 8897 | |
a0b6b246 | 8898 | #: builtin/log.c:1705 |
6acbf033 JX |
8899 | #, c-format |
8900 | msgid "unable to read signature file '%s'" | |
8901 | msgstr "无法读取签名文件 '%s'" | |
8902 | ||
a0b6b246 | 8903 | #: builtin/log.c:1777 |
c04f5ac3 JX |
8904 | msgid "Failed to create output files" |
8905 | msgstr "无法创建输出文件" | |
8906 | ||
a0b6b246 | 8907 | #: builtin/log.c:1826 |
ef317cd5 | 8908 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 8909 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 8910 | |
a0b6b246 | 8911 | #: builtin/log.c:1880 |
c04f5ac3 JX |
8912 | #, c-format |
8913 | msgid "" | |
8914 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 8915 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 8916 | |
a0b6b246 | 8917 | #: builtin/ls-files.c:458 |
814ff314 JX |
8918 | msgid "git ls-files [<options>] [<file>...]" |
8919 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 8920 | |
a0b6b246 | 8921 | #: builtin/ls-files.c:507 |
ef317cd5 | 8922 | msgid "identify the file status with tags" |
07432cef | 8923 | msgstr "用标签标识文件的状态" |
ef317cd5 | 8924 | |
a0b6b246 | 8925 | #: builtin/ls-files.c:509 |
ef317cd5 | 8926 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 8927 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 8928 | |
a0b6b246 | 8929 | #: builtin/ls-files.c:511 |
ef317cd5 | 8930 | msgid "show cached files in the output (default)" |
07432cef | 8931 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 8932 | |
a0b6b246 | 8933 | #: builtin/ls-files.c:513 |
ef317cd5 | 8934 | msgid "show deleted files in the output" |
07432cef | 8935 | msgstr "显示已删除的文件" |
ef317cd5 | 8936 | |
a0b6b246 | 8937 | #: builtin/ls-files.c:515 |
ef317cd5 | 8938 | msgid "show modified files in the output" |
07432cef | 8939 | msgstr "显示已修改的文件" |
ef317cd5 | 8940 | |
a0b6b246 | 8941 | #: builtin/ls-files.c:517 |
ef317cd5 | 8942 | msgid "show other files in the output" |
07432cef | 8943 | msgstr "显示其它文件" |
ef317cd5 | 8944 | |
a0b6b246 | 8945 | #: builtin/ls-files.c:519 |
ef317cd5 | 8946 | msgid "show ignored files in the output" |
07432cef | 8947 | msgstr "显示忽略的文件" |
ef317cd5 | 8948 | |
a0b6b246 | 8949 | #: builtin/ls-files.c:522 |
ef317cd5 | 8950 | msgid "show staged contents' object name in the output" |
07432cef | 8951 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 8952 | |
a0b6b246 | 8953 | #: builtin/ls-files.c:524 |
ef317cd5 | 8954 | msgid "show files on the filesystem that need to be removed" |
07432cef | 8955 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 8956 | |
a0b6b246 | 8957 | #: builtin/ls-files.c:526 |
220c313c | 8958 | msgid "show 'other' directories' names only" |
07432cef | 8959 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 8960 | |
a0b6b246 | 8961 | #: builtin/ls-files.c:528 |
276ceeaa JX |
8962 | msgid "show line endings of files" |
8963 | msgstr "显示文件换行符格式" | |
8964 | ||
a0b6b246 | 8965 | #: builtin/ls-files.c:530 |
ef317cd5 | 8966 | msgid "don't show empty directories" |
07432cef | 8967 | msgstr "不显示空目录" |
ef317cd5 | 8968 | |
a0b6b246 | 8969 | #: builtin/ls-files.c:533 |
ef317cd5 | 8970 | msgid "show unmerged files in the output" |
07432cef | 8971 | msgstr "显示未合并的文件" |
ef317cd5 | 8972 | |
a0b6b246 | 8973 | #: builtin/ls-files.c:535 |
ef317cd5 | 8974 | msgid "show resolve-undo information" |
07432cef | 8975 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 8976 | |
a0b6b246 | 8977 | #: builtin/ls-files.c:537 |
ef317cd5 | 8978 | msgid "skip files matching pattern" |
07432cef | 8979 | msgstr "匹配排除文件的模式" |
ef317cd5 | 8980 | |
a0b6b246 | 8981 | #: builtin/ls-files.c:540 |
ef317cd5 | 8982 | msgid "exclude patterns are read from <file>" |
07432cef | 8983 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 8984 | |
a0b6b246 | 8985 | #: builtin/ls-files.c:543 |
ef317cd5 | 8986 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 8987 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 8988 | |
a0b6b246 | 8989 | #: builtin/ls-files.c:545 |
ef317cd5 | 8990 | msgid "add the standard git exclusions" |
07432cef | 8991 | msgstr "添加标准的 git 排除" |
ef317cd5 | 8992 | |
a0b6b246 | 8993 | #: builtin/ls-files.c:548 |
ef317cd5 | 8994 | msgid "make the output relative to the project top directory" |
07432cef | 8995 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 8996 | |
a0b6b246 JX |
8997 | #: builtin/ls-files.c:551 |
8998 | msgid "recurse through submodules" | |
8999 | msgstr "在子模组中递归" | |
9000 | ||
9001 | #: builtin/ls-files.c:553 | |
ef317cd5 | 9002 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 9003 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 9004 | |
a0b6b246 | 9005 | #: builtin/ls-files.c:554 |
ef317cd5 | 9006 | msgid "tree-ish" |
07432cef | 9007 | msgstr "树或提交" |
ef317cd5 | 9008 | |
a0b6b246 | 9009 | #: builtin/ls-files.c:555 |
ef317cd5 | 9010 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 9011 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 9012 | |
a0b6b246 | 9013 | #: builtin/ls-files.c:557 |
ef317cd5 | 9014 | msgid "show debugging data" |
07432cef | 9015 | msgstr "显示调试数据" |
ef317cd5 | 9016 | |
276ceeaa JX |
9017 | #: builtin/ls-remote.c:7 |
9018 | msgid "" | |
9019 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
9020 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
9021 | " [--symref] [<repository> [<refs>...]]" | |
9022 | msgstr "" | |
9023 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
9024 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
9025 | " [--symref] [<仓库> [<引用>...]]" | |
9026 | ||
9027 | #: builtin/ls-remote.c:50 | |
9028 | msgid "do not print remote URL" | |
9029 | msgstr "不打印远程 URL" | |
9030 | ||
9031 | #: builtin/ls-remote.c:51 builtin/ls-remote.c:53 | |
9032 | msgid "exec" | |
9033 | msgstr "exec" | |
9034 | ||
9035 | #: builtin/ls-remote.c:52 builtin/ls-remote.c:54 | |
9036 | msgid "path of git-upload-pack on the remote host" | |
9037 | msgstr "远程主机上的 git-upload-pack 路径" | |
9038 | ||
9039 | #: builtin/ls-remote.c:56 | |
9040 | msgid "limit to tags" | |
9041 | msgstr "仅限于标签" | |
9042 | ||
9043 | #: builtin/ls-remote.c:57 | |
9044 | msgid "limit to heads" | |
9045 | msgstr "仅限于分支" | |
9046 | ||
9047 | #: builtin/ls-remote.c:58 | |
9048 | msgid "do not show peeled tags" | |
9049 | msgstr "不显示已解析的标签" | |
9050 | ||
9051 | #: builtin/ls-remote.c:60 | |
9052 | msgid "take url.<base>.insteadOf into account" | |
9053 | msgstr "参考 url.<base>.insteadOf 设置" | |
9054 | ||
9055 | #: builtin/ls-remote.c:62 | |
9056 | msgid "exit with exit code 2 if no matching refs are found" | |
9057 | msgstr "若未找到匹配的引用则以退出码2退出" | |
9058 | ||
9059 | #: builtin/ls-remote.c:64 | |
9060 | msgid "show underlying ref in addition to the object pointed by it" | |
9061 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
9062 | ||
90314792 | 9063 | #: builtin/ls-tree.c:28 |
ef317cd5 | 9064 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 9065 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 9066 | |
94550ed3 | 9067 | #: builtin/ls-tree.c:128 |
ef317cd5 | 9068 | msgid "only show trees" |
07432cef | 9069 | msgstr "只显示树" |
ef317cd5 | 9070 | |
94550ed3 | 9071 | #: builtin/ls-tree.c:130 |
ef317cd5 | 9072 | msgid "recurse into subtrees" |
07432cef | 9073 | msgstr "递归到子树" |
ef317cd5 | 9074 | |
94550ed3 | 9075 | #: builtin/ls-tree.c:132 |
ef317cd5 | 9076 | msgid "show trees when recursing" |
07432cef | 9077 | msgstr "当递归时显示树" |
ef317cd5 | 9078 | |
94550ed3 | 9079 | #: builtin/ls-tree.c:135 |
ef317cd5 | 9080 | msgid "terminate entries with NUL byte" |
4375c10e | 9081 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 9082 | |
94550ed3 | 9083 | #: builtin/ls-tree.c:136 |
ef317cd5 | 9084 | msgid "include object size" |
07432cef | 9085 | msgstr "包括对象大小" |
ef317cd5 | 9086 | |
94550ed3 | 9087 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 9088 | msgid "list only filenames" |
07432cef | 9089 | msgstr "只列出文件名" |
ef317cd5 | 9090 | |
94550ed3 | 9091 | #: builtin/ls-tree.c:143 |
ef317cd5 | 9092 | msgid "use full path names" |
07432cef | 9093 | msgstr "使用文件的全路径" |
ef317cd5 | 9094 | |
94550ed3 | 9095 | #: builtin/ls-tree.c:145 |
ef317cd5 | 9096 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 9097 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 9098 | |
5c57d762 | 9099 | #: builtin/merge.c:46 |
814ff314 JX |
9100 | msgid "git merge [<options>] [<commit>...]" |
9101 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 9102 | |
5c57d762 | 9103 | #: builtin/merge.c:47 |
814ff314 JX |
9104 | msgid "git merge [<options>] <msg> HEAD <commit>" |
9105 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 9106 | |
5c57d762 | 9107 | #: builtin/merge.c:48 |
ef317cd5 | 9108 | msgid "git merge --abort" |
07432cef | 9109 | msgstr "git merge --abort" |
ef317cd5 | 9110 | |
5c57d762 | 9111 | #: builtin/merge.c:102 |
c04f5ac3 JX |
9112 | msgid "switch `m' requires a value" |
9113 | msgstr "开关 `m' 需要一个值" | |
9114 | ||
5c57d762 | 9115 | #: builtin/merge.c:139 |
c04f5ac3 JX |
9116 | #, c-format |
9117 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 9118 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 9119 | |
5c57d762 | 9120 | #: builtin/merge.c:140 |
c04f5ac3 JX |
9121 | #, c-format |
9122 | msgid "Available strategies are:" | |
9123 | msgstr "可用的策略有:" | |
9124 | ||
5c57d762 | 9125 | #: builtin/merge.c:145 |
c04f5ac3 JX |
9126 | #, c-format |
9127 | msgid "Available custom strategies are:" | |
9128 | msgstr "可用的自定义策略有:" | |
9129 | ||
a0b6b246 | 9130 | #: builtin/merge.c:195 builtin/pull.c:127 |
ef317cd5 | 9131 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 9132 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 9133 | |
a0b6b246 | 9134 | #: builtin/merge.c:198 builtin/pull.c:130 |
ef317cd5 | 9135 | msgid "show a diffstat at the end of the merge" |
07432cef | 9136 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 9137 | |
a0b6b246 | 9138 | #: builtin/merge.c:199 builtin/pull.c:133 |
ef317cd5 | 9139 | msgid "(synonym to --stat)" |
07432cef | 9140 | msgstr "(和 --stat 同义)" |
ef317cd5 | 9141 | |
a0b6b246 | 9142 | #: builtin/merge.c:201 builtin/pull.c:136 |
ef317cd5 | 9143 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 9144 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 9145 | |
a0b6b246 | 9146 | #: builtin/merge.c:204 builtin/pull.c:139 |
ef317cd5 | 9147 | msgid "create a single commit instead of doing a merge" |
07432cef | 9148 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 9149 | |
a0b6b246 | 9150 | #: builtin/merge.c:206 builtin/pull.c:142 |
ef317cd5 | 9151 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 9152 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 9153 | |
a0b6b246 | 9154 | #: builtin/merge.c:208 builtin/pull.c:145 |
ef317cd5 | 9155 | msgid "edit message before committing" |
07432cef | 9156 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 9157 | |
5c57d762 | 9158 | #: builtin/merge.c:209 |
ef317cd5 | 9159 | msgid "allow fast-forward (default)" |
07432cef | 9160 | msgstr "允许快进(默认)" |
ef317cd5 | 9161 | |
a0b6b246 | 9162 | #: builtin/merge.c:211 builtin/pull.c:151 |
ef317cd5 | 9163 | msgid "abort if fast-forward is not possible" |
07432cef | 9164 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 9165 | |
a0b6b246 | 9166 | #: builtin/merge.c:215 builtin/pull.c:154 |
5c57d762 | 9167 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
9168 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
9169 | ||
a0b6b246 | 9170 | #: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 |
1b7f4a34 | 9171 | #: builtin/revert.c:89 |
ef317cd5 | 9172 | msgid "strategy" |
07432cef | 9173 | msgstr "策略" |
ef317cd5 | 9174 | |
a0b6b246 | 9175 | #: builtin/merge.c:217 builtin/pull.c:159 |
ef317cd5 | 9176 | msgid "merge strategy to use" |
07432cef | 9177 | msgstr "要使用的合并策略" |
ef317cd5 | 9178 | |
a0b6b246 | 9179 | #: builtin/merge.c:218 builtin/pull.c:162 |
ef317cd5 | 9180 | msgid "option=value" |
07432cef | 9181 | msgstr "option=value" |
ef317cd5 | 9182 | |
a0b6b246 | 9183 | #: builtin/merge.c:219 builtin/pull.c:163 |
ef317cd5 | 9184 | msgid "option for selected merge strategy" |
07432cef | 9185 | msgstr "所选的合并策略的选项" |
ef317cd5 | 9186 | |
5c57d762 | 9187 | #: builtin/merge.c:221 |
ef317cd5 | 9188 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 9189 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 9190 | |
5c57d762 | 9191 | #: builtin/merge.c:225 |
ef317cd5 | 9192 | msgid "abort the current in-progress merge" |
07432cef | 9193 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 9194 | |
a0b6b246 | 9195 | #: builtin/merge.c:227 builtin/pull.c:170 |
5b04ee3b JX |
9196 | msgid "allow merging unrelated histories" |
9197 | msgstr "允许合并不相关的历史" | |
9198 | ||
5c57d762 | 9199 | #: builtin/merge.c:255 |
c04f5ac3 JX |
9200 | msgid "could not run stash." |
9201 | msgstr "不能进行进度保存。" | |
9202 | ||
5c57d762 | 9203 | #: builtin/merge.c:260 |
c04f5ac3 JX |
9204 | msgid "stash failed" |
9205 | msgstr "进度保存失败" | |
9206 | ||
5c57d762 | 9207 | #: builtin/merge.c:265 |
c04f5ac3 JX |
9208 | #, c-format |
9209 | msgid "not a valid object: %s" | |
9210 | msgstr "不是一个有效对象:%s" | |
9211 | ||
5c57d762 | 9212 | #: builtin/merge.c:284 builtin/merge.c:301 |
c04f5ac3 JX |
9213 | msgid "read-tree failed" |
9214 | msgstr "读取树失败" | |
9215 | ||
90e6ef53 | 9216 | # 译者:注意保持前导空格 |
5c57d762 | 9217 | #: builtin/merge.c:331 |
c04f5ac3 JX |
9218 | msgid " (nothing to squash)" |
9219 | msgstr " (无可压缩)" | |
9220 | ||
5c57d762 | 9221 | #: builtin/merge.c:342 |
c04f5ac3 JX |
9222 | #, c-format |
9223 | msgid "Squash commit -- not updating HEAD\n" | |
9224 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
9225 | ||
5c57d762 | 9226 | #: builtin/merge.c:392 |
c04f5ac3 JX |
9227 | #, c-format |
9228 | msgid "No merge message -- not updating HEAD\n" | |
9229 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
9230 | ||
5c57d762 | 9231 | #: builtin/merge.c:443 |
c04f5ac3 JX |
9232 | #, c-format |
9233 | msgid "'%s' does not point to a commit" | |
9234 | msgstr "'%s' 没有指向一个提交" | |
9235 | ||
5c57d762 | 9236 | #: builtin/merge.c:533 |
c04f5ac3 JX |
9237 | #, c-format |
9238 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 9239 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 9240 | |
5c57d762 | 9241 | #: builtin/merge.c:652 |
c04f5ac3 JX |
9242 | msgid "Not handling anything other than two heads merge." |
9243 | msgstr "不能处理两个头合并之外的任何操作。" | |
9244 | ||
5c57d762 | 9245 | #: builtin/merge.c:666 |
c04f5ac3 JX |
9246 | #, c-format |
9247 | msgid "Unknown option for merge-recursive: -X%s" | |
9248 | msgstr "merge-recursive 的未知选项:-X%s" | |
9249 | ||
5c57d762 | 9250 | #: builtin/merge.c:681 |
c04f5ac3 JX |
9251 | #, c-format |
9252 | msgid "unable to write %s" | |
9253 | msgstr "不能写 %s" | |
9254 | ||
5c57d762 | 9255 | #: builtin/merge.c:733 |
c04f5ac3 JX |
9256 | #, c-format |
9257 | msgid "Could not read from '%s'" | |
9258 | msgstr "不能从 '%s' 读取" | |
9259 | ||
5c57d762 | 9260 | #: builtin/merge.c:742 |
c04f5ac3 JX |
9261 | #, c-format |
9262 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
9263 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
9264 | ||
5c57d762 | 9265 | #: builtin/merge.c:748 |
a77c07d9 | 9266 | #, c-format |
c04f5ac3 JX |
9267 | msgid "" |
9268 | "Please enter a commit message to explain why this merge is necessary,\n" | |
9269 | "especially if it merges an updated upstream into a topic branch.\n" | |
9270 | "\n" | |
a77c07d9 | 9271 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
9272 | "the commit.\n" |
9273 | msgstr "" | |
9274 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
9275 | "合并到主题分支。\n" | |
9276 | "\n" | |
a77c07d9 | 9277 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 9278 | |
5c57d762 | 9279 | #: builtin/merge.c:772 |
c04f5ac3 JX |
9280 | msgid "Empty commit message." |
9281 | msgstr "空提交信息。" | |
9282 | ||
5c57d762 | 9283 | #: builtin/merge.c:792 |
c04f5ac3 JX |
9284 | #, c-format |
9285 | msgid "Wonderful.\n" | |
9286 | msgstr "太棒了。\n" | |
9287 | ||
5c57d762 | 9288 | #: builtin/merge.c:847 |
c04f5ac3 JX |
9289 | #, c-format |
9290 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
9291 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
9292 | ||
5c57d762 | 9293 | #: builtin/merge.c:863 |
c04f5ac3 JX |
9294 | #, c-format |
9295 | msgid "'%s' is not a commit" | |
9296 | msgstr "'%s' 不是一个提交" | |
9297 | ||
5c57d762 | 9298 | #: builtin/merge.c:904 |
c04f5ac3 | 9299 | msgid "No current branch." |
90e6ef53 | 9300 | msgstr "没有当前分支。" |
c04f5ac3 | 9301 | |
5c57d762 | 9302 | #: builtin/merge.c:906 |
c04f5ac3 | 9303 | msgid "No remote for the current branch." |
160fb2b2 | 9304 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 9305 | |
5c57d762 | 9306 | #: builtin/merge.c:908 |
c04f5ac3 | 9307 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 9308 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 9309 | |
5c57d762 | 9310 | #: builtin/merge.c:913 |
170e9899 | 9311 | #, c-format |
2e8451e8 JX |
9312 | msgid "No remote-tracking branch for %s from %s" |
9313 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 9314 | |
5c57d762 JX |
9315 | #: builtin/merge.c:960 |
9316 | #, c-format | |
9317 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 9318 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 JX |
9319 | |
9320 | #: builtin/merge.c:1034 | |
7aea43ff JX |
9321 | #, c-format |
9322 | msgid "could not close '%s'" | |
9323 | msgstr "不能关闭 '%s'" | |
9324 | ||
5c57d762 JX |
9325 | #: builtin/merge.c:1061 |
9326 | #, c-format | |
9327 | msgid "not something we can merge in %s: %s" | |
9328 | msgstr "不能在 %s 中合并:%s" | |
9329 | ||
9330 | #: builtin/merge.c:1095 | |
9331 | msgid "not something we can merge" | |
9332 | msgstr "不能合并" | |
9333 | ||
9334 | #: builtin/merge.c:1162 | |
c04f5ac3 | 9335 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 9336 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 9337 | |
5c57d762 | 9338 | #: builtin/merge.c:1178 |
c04f5ac3 JX |
9339 | msgid "" |
9340 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 9341 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
9342 | msgstr "" |
9343 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 9344 | "请在合并前先提交您的修改。" |
c04f5ac3 | 9345 | |
5c57d762 | 9346 | #: builtin/merge.c:1185 |
c04f5ac3 JX |
9347 | msgid "" |
9348 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 9349 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
9350 | msgstr "" |
9351 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 9352 | "请在合并前先提交您的修改。" |
c04f5ac3 | 9353 | |
5c57d762 | 9354 | #: builtin/merge.c:1188 |
c04f5ac3 JX |
9355 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
9356 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
9357 | ||
5c57d762 | 9358 | #: builtin/merge.c:1197 |
c04f5ac3 | 9359 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 9360 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 9361 | |
5c57d762 | 9362 | #: builtin/merge.c:1205 |
c04f5ac3 | 9363 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 9364 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 9365 | |
5c57d762 | 9366 | #: builtin/merge.c:1222 |
c04f5ac3 JX |
9367 | msgid "Squash commit into empty head not supported yet" |
9368 | msgstr "尚不支持到空分支的压缩提交" | |
9369 | ||
5c57d762 | 9370 | #: builtin/merge.c:1224 |
c04f5ac3 JX |
9371 | msgid "Non-fast-forward commit does not make sense into an empty head" |
9372 | msgstr "到空分支的非快进式提交没有意义" | |
9373 | ||
5c57d762 | 9374 | #: builtin/merge.c:1229 |
2e8451e8 JX |
9375 | #, c-format |
9376 | msgid "%s - not something we can merge" | |
9377 | msgstr "%s - 不能被合并" | |
9378 | ||
5c57d762 | 9379 | #: builtin/merge.c:1231 |
7aea43ff JX |
9380 | msgid "Can merge only exactly one commit into empty head" |
9381 | msgstr "只能将一个提交合并到空分支上" | |
9382 | ||
5c57d762 | 9383 | #: builtin/merge.c:1287 |
1003b3a5 JX |
9384 | #, c-format |
9385 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
9386 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
9387 | ||
5c57d762 | 9388 | #: builtin/merge.c:1290 |
1003b3a5 JX |
9389 | #, c-format |
9390 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
9391 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
9392 | ||
5c57d762 | 9393 | #: builtin/merge.c:1293 |
1003b3a5 JX |
9394 | #, c-format |
9395 | msgid "Commit %s does not have a GPG signature." | |
9396 | msgstr "提交 %s 没有一个 GPG 签名。" | |
9397 | ||
5c57d762 | 9398 | #: builtin/merge.c:1296 |
1003b3a5 JX |
9399 | #, c-format |
9400 | msgid "Commit %s has a good GPG signature by %s\n" | |
9401 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
9402 | ||
5c57d762 | 9403 | #: builtin/merge.c:1358 |
5b04ee3b JX |
9404 | msgid "refusing to merge unrelated histories" |
9405 | msgstr "拒绝合并无关的历史" | |
9406 | ||
5c57d762 JX |
9407 | #: builtin/merge.c:1367 |
9408 | msgid "Already up-to-date." | |
9409 | msgstr "已经是最新的。" | |
9410 | ||
a0b6b246 | 9411 | #: builtin/merge.c:1377 |
c04f5ac3 JX |
9412 | #, c-format |
9413 | msgid "Updating %s..%s\n" | |
9414 | msgstr "更新 %s..%s\n" | |
9415 | ||
a0b6b246 | 9416 | #: builtin/merge.c:1418 |
c04f5ac3 JX |
9417 | #, c-format |
9418 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 9419 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 9420 | |
a0b6b246 | 9421 | #: builtin/merge.c:1425 |
c04f5ac3 JX |
9422 | #, c-format |
9423 | msgid "Nope.\n" | |
9424 | msgstr "无。\n" | |
9425 | ||
a0b6b246 | 9426 | #: builtin/merge.c:1450 |
5c57d762 JX |
9427 | msgid "Already up-to-date. Yeeah!" |
9428 | msgstr "已经是最新的。耶!" | |
9429 | ||
a0b6b246 | 9430 | #: builtin/merge.c:1456 |
c04f5ac3 | 9431 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 9432 | msgstr "无法快进,终止。" |
c04f5ac3 | 9433 | |
a0b6b246 | 9434 | #: builtin/merge.c:1479 builtin/merge.c:1558 |
c04f5ac3 JX |
9435 | #, c-format |
9436 | msgid "Rewinding the tree to pristine...\n" | |
9437 | msgstr "将树回滚至原始状态...\n" | |
9438 | ||
a0b6b246 | 9439 | #: builtin/merge.c:1483 |
c04f5ac3 JX |
9440 | #, c-format |
9441 | msgid "Trying merge strategy %s...\n" | |
9442 | msgstr "尝试合并策略 %s...\n" | |
9443 | ||
a0b6b246 | 9444 | #: builtin/merge.c:1549 |
c04f5ac3 JX |
9445 | #, c-format |
9446 | msgid "No merge strategy handled the merge.\n" | |
9447 | msgstr "没有合并策略处理此合并。\n" | |
9448 | ||
a0b6b246 | 9449 | #: builtin/merge.c:1551 |
c04f5ac3 JX |
9450 | #, c-format |
9451 | msgid "Merge with strategy %s failed.\n" | |
9452 | msgstr "使用策略 %s 合并失败。\n" | |
9453 | ||
a0b6b246 | 9454 | #: builtin/merge.c:1560 |
c04f5ac3 JX |
9455 | #, c-format |
9456 | msgid "Using the %s to prepare resolving by hand.\n" | |
9457 | msgstr "使用 %s 以准备手工解决。\n" | |
9458 | ||
a0b6b246 | 9459 | #: builtin/merge.c:1572 |
c04f5ac3 JX |
9460 | #, c-format |
9461 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
9462 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
9463 | ||
cfff71a9 | 9464 | #: builtin/merge-base.c:29 |
814ff314 JX |
9465 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
9466 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 9467 | |
cfff71a9 | 9468 | #: builtin/merge-base.c:30 |
814ff314 JX |
9469 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
9470 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 9471 | |
cfff71a9 | 9472 | #: builtin/merge-base.c:31 |
ef317cd5 | 9473 | msgid "git merge-base --independent <commit>..." |
07432cef | 9474 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 9475 | |
cfff71a9 | 9476 | #: builtin/merge-base.c:32 |
ef317cd5 | 9477 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 9478 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 9479 | |
cfff71a9 JX |
9480 | #: builtin/merge-base.c:33 |
9481 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 9482 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 9483 | |
a0b6b246 | 9484 | #: builtin/merge-base.c:217 |
ef317cd5 | 9485 | msgid "output all common ancestors" |
07432cef | 9486 | msgstr "输出所有共同的祖先" |
ef317cd5 | 9487 | |
a0b6b246 | 9488 | #: builtin/merge-base.c:219 |
ef317cd5 | 9489 | msgid "find ancestors for a single n-way merge" |
07432cef | 9490 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 9491 | |
a0b6b246 | 9492 | #: builtin/merge-base.c:221 |
ef317cd5 | 9493 | msgid "list revs not reachable from others" |
07432cef | 9494 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 9495 | |
a0b6b246 | 9496 | #: builtin/merge-base.c:223 |
ef317cd5 | 9497 | msgid "is the first one ancestor of the other?" |
07432cef | 9498 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 9499 | |
a0b6b246 | 9500 | #: builtin/merge-base.c:225 |
cfff71a9 | 9501 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 9502 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 9503 | |
ef317cd5 JX |
9504 | #: builtin/merge-file.c:8 |
9505 | msgid "" | |
814ff314 JX |
9506 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
9507 | "<orig-file> <file2>" | |
ef317cd5 | 9508 | msgstr "" |
814ff314 JX |
9509 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
9510 | "件> <文件2>" | |
ef317cd5 JX |
9511 | |
9512 | #: builtin/merge-file.c:33 | |
9513 | msgid "send results to standard output" | |
07432cef | 9514 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
9515 | |
9516 | #: builtin/merge-file.c:34 | |
9517 | msgid "use a diff3 based merge" | |
07432cef | 9518 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
9519 | |
9520 | #: builtin/merge-file.c:35 | |
9521 | msgid "for conflicts, use our version" | |
07432cef | 9522 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
9523 | |
9524 | #: builtin/merge-file.c:37 | |
9525 | msgid "for conflicts, use their version" | |
07432cef | 9526 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
9527 | |
9528 | #: builtin/merge-file.c:39 | |
9529 | msgid "for conflicts, use a union version" | |
07432cef | 9530 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
9531 | |
9532 | #: builtin/merge-file.c:42 | |
9533 | msgid "for conflicts, use this marker size" | |
07432cef | 9534 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
9535 | |
9536 | #: builtin/merge-file.c:43 | |
9537 | msgid "do not warn about conflicts" | |
07432cef | 9538 | msgstr "不要警告冲突" |
ef317cd5 JX |
9539 | |
9540 | #: builtin/merge-file.c:45 | |
814ff314 JX |
9541 | msgid "set labels for file1/orig-file/file2" |
9542 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 9543 | |
a0b6b246 JX |
9544 | #: builtin/merge-recursive.c:45 |
9545 | #, c-format | |
9546 | msgid "unknown option %s" | |
9547 | msgstr "未知选项 %s" | |
9548 | ||
9549 | #: builtin/merge-recursive.c:51 | |
9550 | #, c-format | |
9551 | msgid "could not parse object '%s'" | |
9552 | msgstr "不能解析对象 '%s'" | |
9553 | ||
9554 | #: builtin/merge-recursive.c:55 | |
9555 | #, c-format | |
9556 | msgid "cannot handle more than %d base. Ignoring %s." | |
9557 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
9558 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
9559 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
9560 | ||
9561 | #: builtin/merge-recursive.c:63 | |
9562 | msgid "not handling anything other than two heads merge." | |
9563 | msgstr "不能处理两个头合并之外的任何操作。" | |
9564 | ||
9565 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
9566 | #, c-format | |
9567 | msgid "could not resolve ref '%s'" | |
9568 | msgstr "无法解析引用 '%s'" | |
9569 | ||
9570 | #: builtin/merge-recursive.c:77 | |
9571 | #, c-format | |
9572 | msgid "Merging %s with %s\n" | |
9573 | msgstr "合并 %s 和 %s\n" | |
9574 | ||
276ceeaa | 9575 | #: builtin/mktree.c:65 |
ef317cd5 | 9576 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 9577 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 9578 | |
276ceeaa | 9579 | #: builtin/mktree.c:152 |
ef317cd5 | 9580 | msgid "input is NUL terminated" |
07432cef | 9581 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 9582 | |
276ceeaa | 9583 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
ef317cd5 | 9584 | msgid "allow missing objects" |
07432cef | 9585 | msgstr "允许丢失的对象" |
c04f5ac3 | 9586 | |
276ceeaa | 9587 | #: builtin/mktree.c:154 |
ef317cd5 | 9588 | msgid "allow creation of more than one tree" |
07432cef | 9589 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 9590 | |
90314792 | 9591 | #: builtin/mv.c:15 |
814ff314 JX |
9592 | msgid "git mv [<options>] <source>... <destination>" |
9593 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 9594 | |
276ceeaa | 9595 | #: builtin/mv.c:70 |
220c313c JX |
9596 | #, c-format |
9597 | msgid "Directory %s is in index and no submodule?" | |
9598 | msgstr "目录 %s 在索引中并且不是子模组?" | |
9599 | ||
5b04ee3b | 9600 | #: builtin/mv.c:72 builtin/rm.c:317 |
220c313c | 9601 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 9602 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c | 9603 | |
276ceeaa | 9604 | #: builtin/mv.c:90 |
220c313c JX |
9605 | #, c-format |
9606 | msgid "%.*s is in index" | |
9607 | msgstr "%.*s 在索引中" | |
9608 | ||
276ceeaa | 9609 | #: builtin/mv.c:112 |
ef317cd5 | 9610 | msgid "force move/rename even if target exists" |
07432cef | 9611 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 9612 | |
276ceeaa | 9613 | #: builtin/mv.c:113 |
ef317cd5 | 9614 | msgid "skip move/rename errors" |
07432cef | 9615 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 9616 | |
5c57d762 | 9617 | #: builtin/mv.c:155 |
220c313c JX |
9618 | #, c-format |
9619 | msgid "destination '%s' is not a directory" | |
9620 | msgstr "目标 '%s' 不是一个目录" | |
9621 | ||
5c57d762 | 9622 | #: builtin/mv.c:166 |
c04f5ac3 JX |
9623 | #, c-format |
9624 | msgid "Checking rename of '%s' to '%s'\n" | |
9625 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
9626 | ||
5c57d762 | 9627 | #: builtin/mv.c:170 |
c04f5ac3 JX |
9628 | msgid "bad source" |
9629 | msgstr "坏的源" | |
9630 | ||
5c57d762 | 9631 | #: builtin/mv.c:173 |
c04f5ac3 JX |
9632 | msgid "can not move directory into itself" |
9633 | msgstr "不能将目录移动到自身" | |
9634 | ||
5c57d762 | 9635 | #: builtin/mv.c:176 |
c04f5ac3 JX |
9636 | msgid "cannot move directory over file" |
9637 | msgstr "不能将目录移动到文件" | |
9638 | ||
5c57d762 | 9639 | #: builtin/mv.c:185 |
c04f5ac3 JX |
9640 | msgid "source directory is empty" |
9641 | msgstr "源目录为空" | |
9642 | ||
5c57d762 | 9643 | #: builtin/mv.c:210 |
c04f5ac3 JX |
9644 | msgid "not under version control" |
9645 | msgstr "不在版本控制之下" | |
9646 | ||
5c57d762 | 9647 | #: builtin/mv.c:213 |
c04f5ac3 JX |
9648 | msgid "destination exists" |
9649 | msgstr "目标已存在" | |
9650 | ||
5c57d762 | 9651 | #: builtin/mv.c:221 |
c04f5ac3 JX |
9652 | #, c-format |
9653 | msgid "overwriting '%s'" | |
9654 | msgstr "覆盖 '%s'" | |
9655 | ||
5c57d762 | 9656 | #: builtin/mv.c:224 |
c04f5ac3 JX |
9657 | msgid "Cannot overwrite" |
9658 | msgstr "不能覆盖" | |
9659 | ||
5c57d762 | 9660 | #: builtin/mv.c:227 |
c04f5ac3 JX |
9661 | msgid "multiple sources for the same target" |
9662 | msgstr "同一目标具有多个源" | |
9663 | ||
5c57d762 | 9664 | #: builtin/mv.c:229 |
cfff71a9 JX |
9665 | msgid "destination directory does not exist" |
9666 | msgstr "目标目录不存在" | |
9667 | ||
5c57d762 | 9668 | #: builtin/mv.c:236 |
c04f5ac3 JX |
9669 | #, c-format |
9670 | msgid "%s, source=%s, destination=%s" | |
9671 | msgstr "%s,源=%s,目标=%s" | |
9672 | ||
5c57d762 | 9673 | #: builtin/mv.c:257 |
c04f5ac3 JX |
9674 | #, c-format |
9675 | msgid "Renaming %s to %s\n" | |
9676 | msgstr "重命名 %s 至 %s\n" | |
9677 | ||
5c57d762 | 9678 | #: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 |
c04f5ac3 JX |
9679 | #, c-format |
9680 | msgid "renaming '%s' failed" | |
9681 | msgstr "重命名 '%s' 失败" | |
9682 | ||
a0b6b246 | 9683 | #: builtin/name-rev.c:257 |
814ff314 JX |
9684 | msgid "git name-rev [<options>] <commit>..." |
9685 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 9686 | |
a0b6b246 | 9687 | #: builtin/name-rev.c:258 |
814ff314 JX |
9688 | msgid "git name-rev [<options>] --all" |
9689 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 9690 | |
a0b6b246 | 9691 | #: builtin/name-rev.c:259 |
814ff314 JX |
9692 | msgid "git name-rev [<options>] --stdin" |
9693 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 9694 | |
a0b6b246 | 9695 | #: builtin/name-rev.c:311 |
ef317cd5 | 9696 | msgid "print only names (no SHA-1)" |
07432cef | 9697 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 9698 | |
a0b6b246 | 9699 | #: builtin/name-rev.c:312 |
ef317cd5 | 9700 | msgid "only use tags to name the commits" |
55a16ee4 | 9701 | msgstr "只使用标签来命名提交" |
ef317cd5 | 9702 | |
a0b6b246 | 9703 | #: builtin/name-rev.c:314 |
ef317cd5 | 9704 | msgid "only use refs matching <pattern>" |
07432cef | 9705 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 9706 | |
a0b6b246 | 9707 | #: builtin/name-rev.c:316 |
ef317cd5 | 9708 | msgid "list all commits reachable from all refs" |
07432cef | 9709 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 9710 | |
a0b6b246 | 9711 | #: builtin/name-rev.c:317 |
ef317cd5 | 9712 | msgid "read from stdin" |
07432cef | 9713 | msgstr "从标准输入读取" |
ef317cd5 | 9714 | |
a0b6b246 | 9715 | #: builtin/name-rev.c:318 |
90314792 JX |
9716 | msgid "allow to print `undefined` names (default)" |
9717 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 9718 | |
a0b6b246 | 9719 | #: builtin/name-rev.c:324 |
2e8451e8 | 9720 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 9721 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 9722 | |
1b7f4a34 | 9723 | #: builtin/notes.c:25 |
814ff314 | 9724 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 9725 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 9726 | |
1b7f4a34 | 9727 | #: builtin/notes.c:26 |
ef317cd5 | 9728 | msgid "" |
814ff314 | 9729 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 9730 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 9731 | msgstr "" |
04cb2f28 JX |
9732 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
9733 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 9734 | |
1b7f4a34 | 9735 | #: builtin/notes.c:27 |
814ff314 | 9736 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 9737 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 9738 | |
1b7f4a34 | 9739 | #: builtin/notes.c:28 |
ef317cd5 | 9740 | msgid "" |
814ff314 | 9741 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 9742 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 9743 | msgstr "" |
04cb2f28 JX |
9744 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
9745 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 9746 | |
1b7f4a34 | 9747 | #: builtin/notes.c:29 |
814ff314 | 9748 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 9749 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 9750 | |
1b7f4a34 | 9751 | #: builtin/notes.c:30 |
814ff314 | 9752 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 9753 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 9754 | |
1b7f4a34 | 9755 | #: builtin/notes.c:31 |
ef317cd5 | 9756 | msgid "" |
814ff314 | 9757 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 9758 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 9759 | |
1b7f4a34 | 9760 | #: builtin/notes.c:32 |
ef317cd5 | 9761 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 9762 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 9763 | |
1b7f4a34 | 9764 | #: builtin/notes.c:33 |
ef317cd5 | 9765 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 9766 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 9767 | |
1b7f4a34 | 9768 | #: builtin/notes.c:34 |
814ff314 | 9769 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 9770 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 9771 | |
1b7f4a34 | 9772 | #: builtin/notes.c:35 |
814ff314 | 9773 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 9774 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 9775 | |
1b7f4a34 | 9776 | #: builtin/notes.c:36 |
814ff314 | 9777 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 9778 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 9779 | |
1b7f4a34 | 9780 | #: builtin/notes.c:41 |
ef317cd5 | 9781 | msgid "git notes [list [<object>]]" |
07432cef | 9782 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 9783 | |
1b7f4a34 | 9784 | #: builtin/notes.c:46 |
ef317cd5 | 9785 | msgid "git notes add [<options>] [<object>]" |
07432cef | 9786 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 9787 | |
1b7f4a34 | 9788 | #: builtin/notes.c:51 |
ef317cd5 | 9789 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 9790 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 9791 | |
1b7f4a34 | 9792 | #: builtin/notes.c:52 |
ef317cd5 | 9793 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 9794 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 9795 | |
1b7f4a34 | 9796 | #: builtin/notes.c:57 |
ef317cd5 | 9797 | msgid "git notes append [<options>] [<object>]" |
07432cef | 9798 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 9799 | |
1b7f4a34 | 9800 | #: builtin/notes.c:62 |
ef317cd5 | 9801 | msgid "git notes edit [<object>]" |
07432cef | 9802 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 9803 | |
1b7f4a34 | 9804 | #: builtin/notes.c:67 |
ef317cd5 | 9805 | msgid "git notes show [<object>]" |
07432cef | 9806 | msgstr "git notes show [<对象>]" |
ef317cd5 | 9807 | |
1b7f4a34 | 9808 | #: builtin/notes.c:72 |
814ff314 | 9809 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 9810 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 9811 | |
1b7f4a34 | 9812 | #: builtin/notes.c:73 |
ef317cd5 | 9813 | msgid "git notes merge --commit [<options>]" |
07432cef | 9814 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 9815 | |
1b7f4a34 | 9816 | #: builtin/notes.c:74 |
ef317cd5 | 9817 | msgid "git notes merge --abort [<options>]" |
07432cef | 9818 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 9819 | |
1b7f4a34 | 9820 | #: builtin/notes.c:79 |
ef317cd5 | 9821 | msgid "git notes remove [<object>]" |
07432cef | 9822 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 9823 | |
1b7f4a34 | 9824 | #: builtin/notes.c:84 |
ef317cd5 | 9825 | msgid "git notes prune [<options>]" |
07432cef | 9826 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 9827 | |
1b7f4a34 | 9828 | #: builtin/notes.c:89 |
ef317cd5 | 9829 | msgid "git notes get-ref" |
07432cef | 9830 | msgstr "git notes get-ref" |
ef317cd5 | 9831 | |
5c57d762 JX |
9832 | #: builtin/notes.c:94 |
9833 | msgid "Write/edit the notes for the following object:" | |
9834 | msgstr "为下面的对象写/编辑说明:" | |
9835 | ||
1b7f4a34 | 9836 | #: builtin/notes.c:147 |
c04f5ac3 JX |
9837 | #, c-format |
9838 | msgid "unable to start 'show' for object '%s'" | |
9839 | msgstr "不能为对象 '%s' 开始 'show'" | |
9840 | ||
1b7f4a34 | 9841 | #: builtin/notes.c:151 |
a77c07d9 JX |
9842 | msgid "could not read 'show' output" |
9843 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 9844 | |
1b7f4a34 | 9845 | #: builtin/notes.c:159 |
c04f5ac3 JX |
9846 | #, c-format |
9847 | msgid "failed to finish 'show' for object '%s'" | |
9848 | msgstr "无法为对象 '%s' 完成 'show'" | |
9849 | ||
5c57d762 | 9850 | #: builtin/notes.c:194 |
a0b6b246 | 9851 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
9852 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
9853 | ||
5c57d762 | 9854 | #: builtin/notes.c:203 |
c04f5ac3 JX |
9855 | msgid "unable to write note object" |
9856 | msgstr "不能写注解对象" | |
9857 | ||
5c57d762 | 9858 | #: builtin/notes.c:205 |
c04f5ac3 | 9859 | #, c-format |
a0b6b246 | 9860 | msgid "the note contents have been left in %s" |
220c313c | 9861 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 9862 | |
5c57d762 | 9863 | #: builtin/notes.c:233 builtin/tag.c:439 |
c04f5ac3 JX |
9864 | #, c-format |
9865 | msgid "cannot read '%s'" | |
9866 | msgstr "不能读取 '%s'" | |
9867 | ||
5c57d762 | 9868 | #: builtin/notes.c:235 builtin/tag.c:442 |
c04f5ac3 JX |
9869 | #, c-format |
9870 | msgid "could not open or read '%s'" | |
9871 | msgstr "不能打开或读取 '%s'" | |
9872 | ||
a0b6b246 JX |
9873 | #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 |
9874 | #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 | |
9875 | #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 | |
9876 | #, c-format | |
9877 | msgid "failed to resolve '%s' as a valid ref." | |
9878 | msgstr "无法解析 '%s' 为一个有效引用。" | |
9879 | ||
5c57d762 | 9880 | #: builtin/notes.c:257 |
c04f5ac3 | 9881 | #, c-format |
a0b6b246 | 9882 | msgid "failed to read object '%s'." |
c04f5ac3 JX |
9883 | msgstr "无法读取对象 '%s'。" |
9884 | ||
5c57d762 | 9885 | #: builtin/notes.c:261 |
6c94aba5 | 9886 | #, c-format |
a0b6b246 JX |
9887 | msgid "cannot read note data from non-blob object '%s'." |
9888 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
9889 | ||
9890 | #: builtin/notes.c:301 | |
9891 | #, c-format | |
9892 | msgid "malformed input line: '%s'." | |
9893 | msgstr "非法的输入行:'%s'。" | |
9894 | ||
9895 | #: builtin/notes.c:316 | |
9896 | #, c-format | |
9897 | msgid "failed to copy notes from '%s' to '%s'" | |
9898 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 9899 | |
a0b6b246 JX |
9900 | #. TRANSLATORS: the first %s will be replaced by a |
9901 | #. git notes command: 'add', 'merge', 'remove', etc. | |
9902 | #: builtin/notes.c:345 | |
9903 | #, c-format | |
9904 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
9905 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
9906 | ||
9907 | #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 | |
9908 | #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 | |
9909 | #: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 | |
c04f5ac3 JX |
9910 | msgid "too many parameters" |
9911 | msgstr "参数太多" | |
9912 | ||
a0b6b246 | 9913 | #: builtin/notes.c:378 builtin/notes.c:665 |
c04f5ac3 | 9914 | #, c-format |
a0b6b246 | 9915 | msgid "no note found for object %s." |
c04f5ac3 JX |
9916 | msgstr "未发现对象 %s 的注解。" |
9917 | ||
a0b6b246 | 9918 | #: builtin/notes.c:399 builtin/notes.c:562 |
ef317cd5 | 9919 | msgid "note contents as a string" |
07432cef | 9920 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 9921 | |
a0b6b246 | 9922 | #: builtin/notes.c:402 builtin/notes.c:565 |
ef317cd5 | 9923 | msgid "note contents in a file" |
07432cef | 9924 | msgstr "注解内容到一个文件中" |
ef317cd5 | 9925 | |
a0b6b246 | 9926 | #: builtin/notes.c:405 builtin/notes.c:568 |
ef317cd5 | 9927 | msgid "reuse and edit specified note object" |
07432cef | 9928 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 9929 | |
a0b6b246 | 9930 | #: builtin/notes.c:408 builtin/notes.c:571 |
ef317cd5 | 9931 | msgid "reuse specified note object" |
07432cef | 9932 | msgstr "重用指定的注解对象" |
ef317cd5 | 9933 | |
a0b6b246 | 9934 | #: builtin/notes.c:411 builtin/notes.c:574 |
04cb2f28 JX |
9935 | msgid "allow storing empty note" |
9936 | msgstr "允许保存空白注释" | |
9937 | ||
a0b6b246 | 9938 | #: builtin/notes.c:412 builtin/notes.c:483 |
ef317cd5 | 9939 | msgid "replace existing notes" |
07432cef | 9940 | msgstr "替换已存在的注解" |
ef317cd5 | 9941 | |
a0b6b246 | 9942 | #: builtin/notes.c:437 |
c04f5ac3 JX |
9943 | #, c-format |
9944 | msgid "" | |
9945 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
9946 | "existing notes" | |
9947 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
9948 | ||
a0b6b246 | 9949 | #: builtin/notes.c:452 builtin/notes.c:531 |
c04f5ac3 JX |
9950 | #, c-format |
9951 | msgid "Overwriting existing notes for object %s\n" | |
9952 | msgstr "覆盖对象 %s 现存注解\n" | |
9953 | ||
a0b6b246 | 9954 | #: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 |
04cb2f28 JX |
9955 | #, c-format |
9956 | msgid "Removing note for object %s\n" | |
9957 | msgstr "删除对象 %s 的注解\n" | |
9958 | ||
a0b6b246 | 9959 | #: builtin/notes.c:484 |
ef317cd5 | 9960 | msgid "read objects from stdin" |
07432cef | 9961 | msgstr "从标准输入读取对象" |
ef317cd5 | 9962 | |
a0b6b246 | 9963 | #: builtin/notes.c:486 |
ef317cd5 | 9964 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 9965 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 9966 | |
a0b6b246 | 9967 | #: builtin/notes.c:504 |
c04f5ac3 JX |
9968 | msgid "too few parameters" |
9969 | msgstr "参数太少" | |
9970 | ||
a0b6b246 | 9971 | #: builtin/notes.c:525 |
c04f5ac3 JX |
9972 | #, c-format |
9973 | msgid "" | |
9974 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
9975 | "existing notes" | |
9976 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
9977 | ||
a0b6b246 | 9978 | #: builtin/notes.c:537 |
c04f5ac3 | 9979 | #, c-format |
a0b6b246 | 9980 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
9981 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
9982 | ||
a0b6b246 | 9983 | #: builtin/notes.c:589 |
ef317cd5 JX |
9984 | #, c-format |
9985 | msgid "" | |
9986 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
9987 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
9988 | msgstr "" | |
9989 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
9990 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
9991 | ||
a0b6b246 JX |
9992 | #: builtin/notes.c:685 |
9993 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" | |
9994 | msgstr "无法删除引用 NOTES_MERGE_PARTIAL" | |
9995 | ||
9996 | #: builtin/notes.c:687 | |
9997 | msgid "failed to delete ref NOTES_MERGE_REF" | |
9998 | msgstr "无法删除引用 NOTES_MERGE_REF" | |
9999 | ||
10000 | #: builtin/notes.c:689 | |
10001 | msgid "failed to remove 'git notes merge' worktree" | |
10002 | msgstr "无法删除 'git notes merge' 工作区" | |
10003 | ||
10004 | #: builtin/notes.c:709 | |
10005 | msgid "failed to read ref NOTES_MERGE_PARTIAL" | |
10006 | msgstr "无法读取引用 NOTES_MERGE_PARTIAL" | |
10007 | ||
10008 | #: builtin/notes.c:711 | |
10009 | msgid "could not find commit from NOTES_MERGE_PARTIAL." | |
10010 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
10011 | ||
10012 | #: builtin/notes.c:713 | |
10013 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." | |
10014 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
10015 | ||
10016 | #: builtin/notes.c:726 | |
10017 | msgid "failed to resolve NOTES_MERGE_REF" | |
10018 | msgstr "无法解析 NOTES_MERGE_REF" | |
10019 | ||
10020 | #: builtin/notes.c:729 | |
10021 | msgid "failed to finalize notes merge" | |
10022 | msgstr "无法完成注解合并" | |
10023 | ||
10024 | #: builtin/notes.c:755 | |
5c57d762 JX |
10025 | #, c-format |
10026 | msgid "unknown notes merge strategy %s" | |
10027 | msgstr "未知的注解合并策略 %s" | |
10028 | ||
a0b6b246 | 10029 | #: builtin/notes.c:771 |
ef317cd5 | 10030 | msgid "General options" |
07432cef | 10031 | msgstr "通用选项" |
ef317cd5 | 10032 | |
a0b6b246 | 10033 | #: builtin/notes.c:773 |
ef317cd5 | 10034 | msgid "Merge options" |
07432cef | 10035 | msgstr "合并选项" |
ef317cd5 | 10036 | |
a0b6b246 | 10037 | #: builtin/notes.c:775 |
ef317cd5 JX |
10038 | msgid "" |
10039 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
10040 | "cat_sort_uniq)" | |
07432cef | 10041 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 10042 | |
a0b6b246 | 10043 | #: builtin/notes.c:777 |
ef317cd5 | 10044 | msgid "Committing unmerged notes" |
07432cef | 10045 | msgstr "提交未合并的注解" |
ef317cd5 | 10046 | |
a0b6b246 | 10047 | #: builtin/notes.c:779 |
ef317cd5 | 10048 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 10049 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 10050 | |
a0b6b246 | 10051 | #: builtin/notes.c:781 |
ef317cd5 | 10052 | msgid "Aborting notes merge resolution" |
07432cef | 10053 | msgstr "中止注解合并的方案" |
ef317cd5 | 10054 | |
a0b6b246 | 10055 | #: builtin/notes.c:783 |
ef317cd5 | 10056 | msgid "abort notes merge" |
07432cef | 10057 | msgstr "中止注解合并" |
ef317cd5 | 10058 | |
a0b6b246 | 10059 | #: builtin/notes.c:794 |
5c57d762 JX |
10060 | msgid "cannot mix --commit, --abort or -s/--strategy" |
10061 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
10062 | ||
a0b6b246 JX |
10063 | #: builtin/notes.c:799 |
10064 | msgid "must specify a notes ref to merge" | |
9a4b694c | 10065 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 10066 | |
a0b6b246 | 10067 | #: builtin/notes.c:823 |
5c57d762 | 10068 | #, c-format |
a0b6b246 | 10069 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
10070 | msgstr "未知的 -s/--strategy:%s" |
10071 | ||
a0b6b246 | 10072 | #: builtin/notes.c:860 |
1b7f4a34 | 10073 | #, c-format |
a0b6b246 JX |
10074 | msgid "a notes merge into %s is already in-progress at %s" |
10075 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 10076 | |
a0b6b246 | 10077 | #: builtin/notes.c:863 |
5c57d762 | 10078 | #, c-format |
a0b6b246 JX |
10079 | msgid "failed to store link to current notes ref (%s)" |
10080 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 10081 | |
a0b6b246 | 10082 | #: builtin/notes.c:865 |
5c57d762 JX |
10083 | #, c-format |
10084 | msgid "" | |
10085 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
10086 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
10087 | "abort'.\n" | |
a0b6b246 JX |
10088 | msgstr "" |
10089 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
10090 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 10091 | |
a0b6b246 | 10092 | #: builtin/notes.c:887 |
ef317cd5 JX |
10093 | #, c-format |
10094 | msgid "Object %s has no note\n" | |
10095 | msgstr "对象 %s 没有注解\n" | |
10096 | ||
a0b6b246 | 10097 | #: builtin/notes.c:899 |
ef317cd5 | 10098 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 10099 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 10100 | |
a0b6b246 | 10101 | #: builtin/notes.c:902 |
ef317cd5 | 10102 | msgid "read object names from the standard input" |
07432cef | 10103 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 10104 | |
a0b6b246 | 10105 | #: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 |
5c57d762 JX |
10106 | msgid "do not remove, show only" |
10107 | msgstr "不删除,只显示" | |
10108 | ||
a0b6b246 | 10109 | #: builtin/notes.c:941 |
5c57d762 JX |
10110 | msgid "report pruned notes" |
10111 | msgstr "报告清除的注解" | |
10112 | ||
a0b6b246 | 10113 | #: builtin/notes.c:983 |
6c94aba5 | 10114 | msgid "notes-ref" |
07432cef | 10115 | msgstr "注解引用" |
ef317cd5 | 10116 | |
a0b6b246 | 10117 | #: builtin/notes.c:984 |
814ff314 | 10118 | msgid "use notes from <notes-ref>" |
07432cef | 10119 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 10120 | |
a0b6b246 | 10121 | #: builtin/notes.c:1019 |
ef317cd5 | 10122 | #, c-format |
a0b6b246 | 10123 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
10124 | msgstr "未知子命令:%s" |
10125 | ||
a0b6b246 | 10126 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
10127 | msgid "" |
10128 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
10129 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 10130 | |
a0b6b246 | 10131 | #: builtin/pack-objects.c:30 |
1b7f4a34 JX |
10132 | msgid "" |
10133 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
10134 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 10135 | |
a0b6b246 | 10136 | #: builtin/pack-objects.c:179 builtin/pack-objects.c:182 |
ef317cd5 JX |
10137 | #, c-format |
10138 | msgid "deflate error (%d)" | |
10139 | msgstr "压缩错误 (%d)" | |
10140 | ||
a0b6b246 | 10141 | #: builtin/pack-objects.c:768 |
5b04ee3b JX |
10142 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
10143 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
10144 | ||
a0b6b246 | 10145 | #: builtin/pack-objects.c:781 |
6c94aba5 JX |
10146 | msgid "Writing objects" |
10147 | msgstr "写入对象中" | |
10148 | ||
a0b6b246 | 10149 | #: builtin/pack-objects.c:1070 |
6c94aba5 JX |
10150 | msgid "disabling bitmap writing, as some objects are not being packed" |
10151 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
10152 | ||
a0b6b246 | 10153 | #: builtin/pack-objects.c:2346 |
6c94aba5 JX |
10154 | msgid "Compressing objects" |
10155 | msgstr "压缩对象中" | |
10156 | ||
a0b6b246 | 10157 | #: builtin/pack-objects.c:2759 |
ef317cd5 JX |
10158 | #, c-format |
10159 | msgid "unsupported index version %s" | |
10160 | msgstr "不支持的索引版本 %s" | |
10161 | ||
a0b6b246 | 10162 | #: builtin/pack-objects.c:2763 |
ef317cd5 JX |
10163 | #, c-format |
10164 | msgid "bad index version '%s'" | |
10165 | msgstr "坏的索引版本 '%s'" | |
10166 | ||
a0b6b246 | 10167 | #: builtin/pack-objects.c:2793 |
ef317cd5 | 10168 | msgid "do not show progress meter" |
07432cef | 10169 | msgstr "不显示进度表" |
ef317cd5 | 10170 | |
a0b6b246 | 10171 | #: builtin/pack-objects.c:2795 |
ef317cd5 | 10172 | msgid "show progress meter" |
07432cef | 10173 | msgstr "显示进度表" |
ef317cd5 | 10174 | |
a0b6b246 | 10175 | #: builtin/pack-objects.c:2797 |
ef317cd5 | 10176 | msgid "show progress meter during object writing phase" |
07432cef | 10177 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 10178 | |
a0b6b246 | 10179 | #: builtin/pack-objects.c:2800 |
ef317cd5 | 10180 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 10181 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 10182 | |
a0b6b246 | 10183 | #: builtin/pack-objects.c:2801 |
ef317cd5 | 10184 | msgid "version[,offset]" |
07432cef | 10185 | msgstr "版本[,偏移]" |
ef317cd5 | 10186 | |
a0b6b246 | 10187 | #: builtin/pack-objects.c:2802 |
ef317cd5 | 10188 | msgid "write the pack index file in the specified idx format version" |
07432cef | 10189 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 10190 | |
a0b6b246 | 10191 | #: builtin/pack-objects.c:2805 |
ef317cd5 | 10192 | msgid "maximum size of each output pack file" |
07432cef | 10193 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 10194 | |
a0b6b246 | 10195 | #: builtin/pack-objects.c:2807 |
ef317cd5 | 10196 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 10197 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 10198 | |
a0b6b246 | 10199 | #: builtin/pack-objects.c:2809 |
ef317cd5 | 10200 | msgid "ignore packed objects" |
07432cef | 10201 | msgstr "忽略包对象" |
ef317cd5 | 10202 | |
a0b6b246 | 10203 | #: builtin/pack-objects.c:2811 |
ef317cd5 | 10204 | msgid "limit pack window by objects" |
07432cef | 10205 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 10206 | |
a0b6b246 | 10207 | #: builtin/pack-objects.c:2813 |
ef317cd5 | 10208 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 10209 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 10210 | |
a0b6b246 | 10211 | #: builtin/pack-objects.c:2815 |
ef317cd5 | 10212 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 10213 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 10214 | |
a0b6b246 | 10215 | #: builtin/pack-objects.c:2817 |
ef317cd5 | 10216 | msgid "reuse existing deltas" |
07432cef | 10217 | msgstr "重用已存在的 deltas" |
ef317cd5 | 10218 | |
a0b6b246 | 10219 | #: builtin/pack-objects.c:2819 |
ef317cd5 | 10220 | msgid "reuse existing objects" |
07432cef | 10221 | msgstr "重用已存在的对象" |
ef317cd5 | 10222 | |
a0b6b246 | 10223 | #: builtin/pack-objects.c:2821 |
ef317cd5 | 10224 | msgid "use OFS_DELTA objects" |
07432cef | 10225 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 10226 | |
a0b6b246 | 10227 | #: builtin/pack-objects.c:2823 |
ef317cd5 | 10228 | msgid "use threads when searching for best delta matches" |
07432cef | 10229 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 10230 | |
a0b6b246 | 10231 | #: builtin/pack-objects.c:2825 |
ef317cd5 | 10232 | msgid "do not create an empty pack output" |
07432cef | 10233 | msgstr "不创建空的包输出" |
ef317cd5 | 10234 | |
a0b6b246 | 10235 | #: builtin/pack-objects.c:2827 |
ef317cd5 | 10236 | msgid "read revision arguments from standard input" |
d9d56b23 | 10237 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 10238 | |
a0b6b246 | 10239 | #: builtin/pack-objects.c:2829 |
ef317cd5 | 10240 | msgid "limit the objects to those that are not yet packed" |
07432cef | 10241 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 10242 | |
a0b6b246 | 10243 | #: builtin/pack-objects.c:2832 |
ef317cd5 | 10244 | msgid "include objects reachable from any reference" |
07432cef | 10245 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 10246 | |
a0b6b246 | 10247 | #: builtin/pack-objects.c:2835 |
ef317cd5 | 10248 | msgid "include objects referred by reflog entries" |
07432cef | 10249 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 10250 | |
a0b6b246 | 10251 | #: builtin/pack-objects.c:2838 |
220c313c JX |
10252 | msgid "include objects referred to by the index" |
10253 | msgstr "包括被索引引用到的对象" | |
10254 | ||
a0b6b246 | 10255 | #: builtin/pack-objects.c:2841 |
ef317cd5 | 10256 | msgid "output pack to stdout" |
07432cef | 10257 | msgstr "输出包到标准输出" |
ef317cd5 | 10258 | |
a0b6b246 | 10259 | #: builtin/pack-objects.c:2843 |
ef317cd5 | 10260 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 10261 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 10262 | |
a0b6b246 | 10263 | #: builtin/pack-objects.c:2845 |
ef317cd5 | 10264 | msgid "keep unreachable objects" |
07432cef | 10265 | msgstr "维持不可达的对象" |
ef317cd5 | 10266 | |
a0b6b246 | 10267 | #: builtin/pack-objects.c:2847 |
5c57d762 JX |
10268 | msgid "pack loose unreachable objects" |
10269 | msgstr "打包松散的不可达对象" | |
10270 | ||
a0b6b246 | 10271 | #: builtin/pack-objects.c:2849 |
ef317cd5 | 10272 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 10273 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 10274 | |
a0b6b246 | 10275 | #: builtin/pack-objects.c:2852 |
ef317cd5 | 10276 | msgid "create thin packs" |
07432cef | 10277 | msgstr "创建精简包" |
ef317cd5 | 10278 | |
a0b6b246 | 10279 | #: builtin/pack-objects.c:2854 |
04cb2f28 | 10280 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 10281 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 10282 | |
a0b6b246 | 10283 | #: builtin/pack-objects.c:2856 |
ef317cd5 | 10284 | msgid "ignore packs that have companion .keep file" |
07432cef | 10285 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 10286 | |
a0b6b246 | 10287 | #: builtin/pack-objects.c:2858 |
ef317cd5 | 10288 | msgid "pack compression level" |
07432cef | 10289 | msgstr "打包压缩级别" |
ef317cd5 | 10290 | |
a0b6b246 | 10291 | #: builtin/pack-objects.c:2860 |
ef317cd5 | 10292 | msgid "do not hide commits by grafts" |
cfff71a9 | 10293 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 10294 | |
a0b6b246 | 10295 | #: builtin/pack-objects.c:2862 |
6c94aba5 JX |
10296 | msgid "use a bitmap index if available to speed up counting objects" |
10297 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
10298 | ||
a0b6b246 | 10299 | #: builtin/pack-objects.c:2864 |
6c94aba5 JX |
10300 | msgid "write a bitmap index together with the pack index" |
10301 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
10302 | ||
a0b6b246 | 10303 | #: builtin/pack-objects.c:2993 |
6c94aba5 JX |
10304 | msgid "Counting objects" |
10305 | msgstr "对象计数中" | |
10306 | ||
ef317cd5 | 10307 | #: builtin/pack-refs.c:6 |
814ff314 JX |
10308 | msgid "git pack-refs [<options>]" |
10309 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 10310 | |
ef317cd5 JX |
10311 | #: builtin/pack-refs.c:14 |
10312 | msgid "pack everything" | |
07432cef | 10313 | msgstr "打包一切" |
c04f5ac3 | 10314 | |
ef317cd5 JX |
10315 | #: builtin/pack-refs.c:15 |
10316 | msgid "prune loose refs (default)" | |
07432cef | 10317 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 10318 | |
ef317cd5 | 10319 | #: builtin/prune-packed.c:7 |
814ff314 JX |
10320 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
10321 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 10322 | |
220c313c | 10323 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
10324 | msgid "Removing duplicate objects" |
10325 | msgstr "正在删除重复对象" | |
10326 | ||
5bb01d4f | 10327 | #: builtin/prune.c:11 |
ef317cd5 | 10328 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 10329 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 10330 | |
5c57d762 | 10331 | #: builtin/prune.c:106 builtin/worktree.c:128 |
1b7f4a34 JX |
10332 | msgid "report pruned objects" |
10333 | msgstr "报告清除的对象" | |
10334 | ||
5c57d762 | 10335 | #: builtin/prune.c:109 builtin/worktree.c:130 |
1b7f4a34 JX |
10336 | msgid "expire objects older than <time>" |
10337 | msgstr "使早于给定时间的对象过期" | |
10338 | ||
94550ed3 JX |
10339 | #: builtin/prune.c:123 |
10340 | msgid "cannot prune in a precious-objects repo" | |
10341 | msgstr "不能在珍品仓库中执行清理操作" | |
10342 | ||
a0b6b246 JX |
10343 | #: builtin/pull.c:51 builtin/pull.c:53 |
10344 | #, c-format | |
10345 | msgid "Invalid value for %s: %s" | |
10346 | msgstr "%s 的值无效:%s" | |
10347 | ||
10348 | #: builtin/pull.c:73 | |
94550ed3 | 10349 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
10350 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
10351 | ||
a0b6b246 | 10352 | #: builtin/pull.c:121 |
1b7f4a34 JX |
10353 | msgid "Options related to merging" |
10354 | msgstr "和合并相关的选项" | |
10355 | ||
a0b6b246 | 10356 | #: builtin/pull.c:124 |
1b7f4a34 JX |
10357 | msgid "incorporate changes by rebasing rather than merging" |
10358 | msgstr "使用变基操作取代合并操作以合入修改" | |
10359 | ||
a0b6b246 | 10360 | #: builtin/pull.c:148 builtin/revert.c:101 |
1b7f4a34 JX |
10361 | msgid "allow fast-forward" |
10362 | msgstr "允许快进式" | |
10363 | ||
a0b6b246 | 10364 | #: builtin/pull.c:157 |
5b04ee3b JX |
10365 | msgid "automatically stash/stash pop before and after rebase" |
10366 | msgstr "自动在变基操作前后执行 stash/stash pop" | |
10367 | ||
a0b6b246 | 10368 | #: builtin/pull.c:173 |
1b7f4a34 JX |
10369 | msgid "Options related to fetching" |
10370 | msgstr "和获取相关的参数" | |
10371 | ||
a0b6b246 | 10372 | #: builtin/pull.c:195 |
276ceeaa JX |
10373 | msgid "number of submodules pulled in parallel" |
10374 | msgstr "并发拉取的子模组的数量" | |
10375 | ||
a0b6b246 | 10376 | #: builtin/pull.c:284 |
1b7f4a34 JX |
10377 | #, c-format |
10378 | msgid "Invalid value for pull.ff: %s" | |
10379 | msgstr "pull.ff 的取值无效:%s" | |
10380 | ||
a0b6b246 | 10381 | #: builtin/pull.c:397 |
1b7f4a34 JX |
10382 | msgid "" |
10383 | "There is no candidate for rebasing against among the refs that you just " | |
10384 | "fetched." | |
10385 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
10386 | ||
a0b6b246 | 10387 | #: builtin/pull.c:399 |
1b7f4a34 JX |
10388 | msgid "" |
10389 | "There are no candidates for merging among the refs that you just fetched." | |
10390 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
10391 | ||
a0b6b246 | 10392 | #: builtin/pull.c:400 |
1b7f4a34 JX |
10393 | msgid "" |
10394 | "Generally this means that you provided a wildcard refspec which had no\n" | |
10395 | "matches on the remote end." | |
10396 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
10397 | ||
a0b6b246 | 10398 | #: builtin/pull.c:403 |
1b7f4a34 JX |
10399 | #, c-format |
10400 | msgid "" | |
10401 | "You asked to pull from the remote '%s', but did not specify\n" | |
10402 | "a branch. Because this is not the default configured remote\n" | |
10403 | "for your current branch, you must specify a branch on the command line." | |
10404 | msgstr "" | |
10405 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
10406 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
10407 | ||
a0b6b246 | 10408 | #: builtin/pull.c:408 git-parse-remote.sh:73 |
1b7f4a34 JX |
10409 | msgid "You are not currently on a branch." |
10410 | msgstr "您当前不在一个分支上。" | |
10411 | ||
a0b6b246 | 10412 | #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 |
1b7f4a34 JX |
10413 | msgid "Please specify which branch you want to rebase against." |
10414 | msgstr "请指定您要变基到哪一个分支。" | |
10415 | ||
a0b6b246 | 10416 | #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 |
1b7f4a34 JX |
10417 | msgid "Please specify which branch you want to merge with." |
10418 | msgstr "请指定您要合并哪一个分支。" | |
10419 | ||
a0b6b246 | 10420 | #: builtin/pull.c:413 builtin/pull.c:428 |
1b7f4a34 JX |
10421 | msgid "See git-pull(1) for details." |
10422 | msgstr "详见 git-pull(1)。" | |
10423 | ||
a0b6b246 | 10424 | #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 |
5b04ee3b JX |
10425 | #: git-parse-remote.sh:64 |
10426 | msgid "<remote>" | |
10427 | msgstr "<远程>" | |
10428 | ||
a0b6b246 | 10429 | #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 |
5b04ee3b JX |
10430 | #: git-parse-remote.sh:65 |
10431 | msgid "<branch>" | |
10432 | msgstr "<分支>" | |
10433 | ||
a0b6b246 | 10434 | #: builtin/pull.c:423 git-parse-remote.sh:75 |
1b7f4a34 JX |
10435 | msgid "There is no tracking information for the current branch." |
10436 | msgstr "当前分支没有跟踪信息。" | |
10437 | ||
a0b6b246 | 10438 | #: builtin/pull.c:432 git-parse-remote.sh:95 |
1b7f4a34 | 10439 | msgid "" |
5b04ee3b JX |
10440 | "If you wish to set tracking information for this branch you can do so with:" |
10441 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 10442 | |
a0b6b246 | 10443 | #: builtin/pull.c:437 |
1b7f4a34 JX |
10444 | #, c-format |
10445 | msgid "" | |
10446 | "Your configuration specifies to merge with the ref '%s'\n" | |
10447 | "from the remote, but no such ref was fetched." | |
10448 | msgstr "" | |
10449 | "您的配置中指定要合并远程的引用 '%s',\n" | |
10450 | "但是没有获取到这个引用。" | |
7ac1c0ad | 10451 | |
a0b6b246 | 10452 | #: builtin/pull.c:754 |
5c57d762 JX |
10453 | msgid "ignoring --verify-signatures for rebase" |
10454 | msgstr "为变基操作忽略 --verify-signatures" | |
10455 | ||
a0b6b246 | 10456 | #: builtin/pull.c:801 |
5b04ee3b JX |
10457 | msgid "--[no-]autostash option is only valid with --rebase." |
10458 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
10459 | ||
a0b6b246 | 10460 | #: builtin/pull.c:809 |
1b7f4a34 JX |
10461 | msgid "Updating an unborn branch with changes added to the index." |
10462 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
10463 | ||
a0b6b246 JX |
10464 | #: builtin/pull.c:812 |
10465 | msgid "pull with rebase" | |
10466 | msgstr "变基式拉取" | |
10467 | ||
10468 | #: builtin/pull.c:813 | |
10469 | msgid "please commit or stash them." | |
10470 | msgstr "请提交或为它们保存进度。" | |
10471 | ||
10472 | #: builtin/pull.c:838 | |
1b7f4a34 JX |
10473 | #, c-format |
10474 | msgid "" | |
10475 | "fetch updated the current branch head.\n" | |
10476 | "fast-forwarding your working tree from\n" | |
10477 | "commit %s." | |
10478 | msgstr "" | |
10479 | "fetch 更新了当前的分支。快进您的工作区\n" | |
10480 | "至提交 %s。" | |
ef317cd5 | 10481 | |
a0b6b246 | 10482 | #: builtin/pull.c:843 |
1b7f4a34 JX |
10483 | #, c-format |
10484 | msgid "" | |
10485 | "Cannot fast-forward your working tree.\n" | |
10486 | "After making sure that you saved anything precious from\n" | |
10487 | "$ git diff %s\n" | |
10488 | "output, run\n" | |
10489 | "$ git reset --hard\n" | |
10490 | "to recover." | |
10491 | msgstr "" | |
10492 | "您当前的工作区无法执行快进操作。\n" | |
10493 | "首先执行如下命令:\n" | |
10494 | "$ git diff %s\n" | |
10495 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
10496 | "$ git reset --hard\n" | |
10497 | "恢复之前的状态。" | |
10498 | ||
a0b6b246 | 10499 | #: builtin/pull.c:858 |
1b7f4a34 JX |
10500 | msgid "Cannot merge multiple branches into empty head." |
10501 | msgstr "无法将多个分支合并到空分支。" | |
10502 | ||
a0b6b246 | 10503 | #: builtin/pull.c:862 |
1b7f4a34 JX |
10504 | msgid "Cannot rebase onto multiple branches." |
10505 | msgstr "无法变基到多个分支。" | |
10506 | ||
89f80d72 | 10507 | #: builtin/push.c:16 |
ef317cd5 | 10508 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 10509 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 10510 | |
276ceeaa | 10511 | #: builtin/push.c:89 |
c04f5ac3 | 10512 | msgid "tag shorthand without <tag>" |
55a16ee4 | 10513 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 10514 | |
276ceeaa | 10515 | #: builtin/push.c:99 |
c04f5ac3 | 10516 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 10517 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 10518 | |
276ceeaa | 10519 | #: builtin/push.c:143 |
8ada9598 JX |
10520 | msgid "" |
10521 | "\n" | |
10522 | "To choose either option permanently, see push.default in 'git help config'." | |
10523 | msgstr "" | |
81809b99 JX |
10524 | "\n" |
10525 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 10526 | |
276ceeaa | 10527 | #: builtin/push.c:146 |
8ada9598 JX |
10528 | #, c-format |
10529 | msgid "" | |
10530 | "The upstream branch of your current branch does not match\n" | |
10531 | "the name of your current branch. To push to the upstream branch\n" | |
10532 | "on the remote, use\n" | |
10533 | "\n" | |
10534 | " git push %s HEAD:%s\n" | |
10535 | "\n" | |
10536 | "To push to the branch of the same name on the remote, use\n" | |
10537 | "\n" | |
10538 | " git push %s %s\n" | |
10539 | "%s" | |
10540 | msgstr "" | |
81809b99 JX |
10541 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
10542 | "上游分支,使用\n" | |
10543 | "\n" | |
10544 | " git push %s HEAD:%s\n" | |
10545 | "\n" | |
10546 | "为推送至远程同名分支,使用\n" | |
10547 | "\n" | |
10548 | " git push %s %s\n" | |
10549 | "%s" | |
8ada9598 | 10550 | |
276ceeaa | 10551 | #: builtin/push.c:161 |
c04f5ac3 JX |
10552 | #, c-format |
10553 | msgid "" | |
10554 | "You are not currently on a branch.\n" | |
10555 | "To push the history leading to the current (detached HEAD)\n" | |
10556 | "state now, use\n" | |
10557 | "\n" | |
10558 | " git push %s HEAD:<name-of-remote-branch>\n" | |
10559 | msgstr "" | |
10560 | "您当前不在一个分支上。\n" | |
90e6ef53 | 10561 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 10562 | "\n" |
d9d56b23 | 10563 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 10564 | |
276ceeaa | 10565 | #: builtin/push.c:175 |
c04f5ac3 JX |
10566 | #, c-format |
10567 | msgid "" | |
10568 | "The current branch %s has no upstream branch.\n" | |
10569 | "To push the current branch and set the remote as upstream, use\n" | |
10570 | "\n" | |
10571 | " git push --set-upstream %s %s\n" | |
10572 | msgstr "" | |
10573 | "当前分支 %s 没有对应的上游分支。\n" | |
10574 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
10575 | "\n" | |
10576 | " git push --set-upstream %s %s\n" | |
10577 | ||
276ceeaa | 10578 | #: builtin/push.c:183 |
c04f5ac3 JX |
10579 | #, c-format |
10580 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
10581 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
10582 | ||
276ceeaa | 10583 | #: builtin/push.c:186 |
73a60cd2 JX |
10584 | #, c-format |
10585 | msgid "" | |
10586 | "You are pushing to remote '%s', which is not the upstream of\n" | |
10587 | "your current branch '%s', without telling me what to push\n" | |
10588 | "to update which remote branch." | |
10589 | msgstr "" | |
10590 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
10591 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
10592 | ||
276ceeaa | 10593 | #: builtin/push.c:242 |
c04f5ac3 JX |
10594 | msgid "" |
10595 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 10596 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 10597 | |
276ceeaa | 10598 | #: builtin/push.c:249 |
170e9899 JX |
10599 | msgid "" |
10600 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
10601 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
10602 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
10603 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
10604 | msgstr "" | |
eff6d3a9 | 10605 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 10606 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 10607 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 10608 | |
276ceeaa | 10609 | #: builtin/push.c:255 |
170e9899 JX |
10610 | msgid "" |
10611 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
10612 | "counterpart. Check out this branch and integrate the remote changes\n" |
10613 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
10614 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
10615 | msgstr "" | |
eff6d3a9 | 10616 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 10617 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 10618 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 10619 | |
276ceeaa | 10620 | #: builtin/push.c:261 |
07432cef | 10621 | msgid "" |
a77c07d9 JX |
10622 | "Updates were rejected because the remote contains work that you do\n" |
10623 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
10624 | "to the same ref. You may want to first integrate the remote changes\n" |
10625 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
10626 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
10627 | msgstr "" | |
160fb2b2 JX |
10628 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
10629 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 10630 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
10631 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
10632 | ||
276ceeaa | 10633 | #: builtin/push.c:268 |
a77c07d9 | 10634 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 10635 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 10636 | |
276ceeaa | 10637 | #: builtin/push.c:271 |
a77c07d9 JX |
10638 | msgid "" |
10639 | "You cannot update a remote ref that points at a non-commit object,\n" | |
10640 | "or update a remote ref to make it point at a non-commit object,\n" | |
10641 | "without using the '--force' option.\n" | |
10642 | msgstr "" | |
10643 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
10644 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 10645 | |
276ceeaa | 10646 | #: builtin/push.c:331 |
c04f5ac3 JX |
10647 | #, c-format |
10648 | msgid "Pushing to %s\n" | |
10649 | msgstr "推送到 %s\n" | |
10650 | ||
276ceeaa | 10651 | #: builtin/push.c:335 |
c04f5ac3 JX |
10652 | #, c-format |
10653 | msgid "failed to push some refs to '%s'" | |
10654 | msgstr "无法推送一些引用到 '%s'" | |
10655 | ||
5c57d762 | 10656 | #: builtin/push.c:366 |
c04f5ac3 JX |
10657 | #, c-format |
10658 | msgid "bad repository '%s'" | |
160fb2b2 | 10659 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 10660 | |
5c57d762 | 10661 | #: builtin/push.c:367 |
c04f5ac3 JX |
10662 | msgid "" |
10663 | "No configured push destination.\n" | |
10664 | "Either specify the URL from the command-line or configure a remote " | |
10665 | "repository using\n" | |
10666 | "\n" | |
10667 | " git remote add <name> <url>\n" | |
10668 | "\n" | |
10669 | "and then push using the remote name\n" | |
10670 | "\n" | |
10671 | " git push <name>\n" | |
10672 | msgstr "" | |
90e6ef53 | 10673 | "没有配置推送目标。\n" |
4375c10e | 10674 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 10675 | "\n" |
d9d56b23 | 10676 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 10677 | "\n" |
160fb2b2 | 10678 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 10679 | "\n" |
d9d56b23 | 10680 | " git push <名称>\n" |
c04f5ac3 | 10681 | |
5c57d762 | 10682 | #: builtin/push.c:385 |
c04f5ac3 JX |
10683 | msgid "--all and --tags are incompatible" |
10684 | msgstr "--all 和 --tags 不兼容" | |
10685 | ||
5c57d762 | 10686 | #: builtin/push.c:386 |
c04f5ac3 | 10687 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 10688 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 10689 | |
5c57d762 | 10690 | #: builtin/push.c:391 |
c04f5ac3 JX |
10691 | msgid "--mirror and --tags are incompatible" |
10692 | msgstr "--mirror 和 --tags 不兼容" | |
10693 | ||
5c57d762 | 10694 | #: builtin/push.c:392 |
c04f5ac3 | 10695 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 10696 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 10697 | |
5c57d762 | 10698 | #: builtin/push.c:397 |
c04f5ac3 JX |
10699 | msgid "--all and --mirror are incompatible" |
10700 | msgstr "--all 和 --mirror 不兼容" | |
10701 | ||
5c57d762 | 10702 | #: builtin/push.c:515 |
ef317cd5 | 10703 | msgid "repository" |
160fb2b2 | 10704 | msgstr "仓库" |
ef317cd5 | 10705 | |
5c57d762 | 10706 | #: builtin/push.c:516 builtin/send-pack.c:161 |
ef317cd5 | 10707 | msgid "push all refs" |
07432cef | 10708 | msgstr "推送所有引用" |
ef317cd5 | 10709 | |
5c57d762 | 10710 | #: builtin/push.c:517 builtin/send-pack.c:163 |
ef317cd5 | 10711 | msgid "mirror all refs" |
07432cef | 10712 | msgstr "镜像所有引用" |
ef317cd5 | 10713 | |
5c57d762 | 10714 | #: builtin/push.c:519 |
ef317cd5 | 10715 | msgid "delete refs" |
07432cef | 10716 | msgstr "删除引用" |
ef317cd5 | 10717 | |
5c57d762 | 10718 | #: builtin/push.c:520 |
ef317cd5 | 10719 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 10720 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 10721 | |
5c57d762 | 10722 | #: builtin/push.c:523 builtin/send-pack.c:164 |
ef317cd5 JX |
10723 | msgid "force updates" |
10724 | msgstr "强制更新" | |
10725 | ||
5c57d762 | 10726 | #: builtin/push.c:525 builtin/send-pack.c:175 |
90314792 JX |
10727 | msgid "refname>:<expect" |
10728 | msgstr "引用名>:<期望值" | |
10729 | ||
5c57d762 | 10730 | #: builtin/push.c:526 builtin/send-pack.c:176 |
90314792 JX |
10731 | msgid "require old value of ref to be at this value" |
10732 | msgstr "要求引用旧的取值为设定值" | |
10733 | ||
5c57d762 | 10734 | #: builtin/push.c:529 |
ef317cd5 | 10735 | msgid "control recursive pushing of submodules" |
07432cef | 10736 | msgstr "控制子模组的递归推送" |
ef317cd5 | 10737 | |
5c57d762 | 10738 | #: builtin/push.c:531 builtin/send-pack.c:169 |
ef317cd5 | 10739 | msgid "use thin pack" |
07432cef | 10740 | msgstr "使用精简打包" |
ef317cd5 | 10741 | |
5c57d762 | 10742 | #: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 |
1b7f4a34 | 10743 | #: builtin/send-pack.c:159 |
ef317cd5 | 10744 | msgid "receive pack program" |
07432cef | 10745 | msgstr "接收包程序" |
ef317cd5 | 10746 | |
5c57d762 | 10747 | #: builtin/push.c:534 |
ef317cd5 | 10748 | msgid "set upstream for git pull/status" |
07432cef | 10749 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 10750 | |
5c57d762 | 10751 | #: builtin/push.c:537 |
ef317cd5 | 10752 | msgid "prune locally removed refs" |
07432cef | 10753 | msgstr "清除本地删除的引用" |
ef317cd5 | 10754 | |
5c57d762 | 10755 | #: builtin/push.c:539 |
a77c07d9 JX |
10756 | msgid "bypass pre-push hook" |
10757 | msgstr "绕过 pre-push 钩子" | |
10758 | ||
5c57d762 | 10759 | #: builtin/push.c:540 |
1003b3a5 | 10760 | msgid "push missing but relevant tags" |
55a16ee4 | 10761 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 10762 | |
5c57d762 | 10763 | #: builtin/push.c:543 builtin/send-pack.c:166 |
220c313c JX |
10764 | msgid "GPG sign the push" |
10765 | msgstr "用 GPG 为推送签名" | |
10766 | ||
5c57d762 | 10767 | #: builtin/push.c:545 builtin/send-pack.c:170 |
814ff314 JX |
10768 | msgid "request atomic transaction on remote side" |
10769 | msgstr "需要远端支持原子事务" | |
10770 | ||
5c57d762 JX |
10771 | #: builtin/push.c:546 |
10772 | msgid "server-specific" | |
10773 | msgstr "server-specific" | |
10774 | ||
10775 | #: builtin/push.c:546 | |
10776 | msgid "option to transmit" | |
9a4b694c | 10777 | msgstr "传输选项" |
5c57d762 JX |
10778 | |
10779 | #: builtin/push.c:560 | |
c04f5ac3 JX |
10780 | msgid "--delete is incompatible with --all, --mirror and --tags" |
10781 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
10782 | ||
5c57d762 | 10783 | #: builtin/push.c:562 |
c04f5ac3 JX |
10784 | msgid "--delete doesn't make sense without any refs" |
10785 | msgstr "--delete 未接任何引用没有意义" | |
10786 | ||
5c57d762 JX |
10787 | #: builtin/push.c:579 |
10788 | msgid "push options must not have new line characters" | |
10789 | msgstr "推送选项不能有换行符" | |
10790 | ||
220c313c | 10791 | #: builtin/read-tree.c:37 |
ef317cd5 | 10792 | msgid "" |
1b7f4a34 | 10793 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
10794 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
10795 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
10796 | msgstr "" | |
1b7f4a34 | 10797 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 10798 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 10799 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 10800 | |
220c313c | 10801 | #: builtin/read-tree.c:110 |
ef317cd5 | 10802 | msgid "write resulting index to <file>" |
d9d56b23 | 10803 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 10804 | |
220c313c | 10805 | #: builtin/read-tree.c:113 |
ef317cd5 | 10806 | msgid "only empty the index" |
07432cef | 10807 | msgstr "只是清空索引" |
ef317cd5 | 10808 | |
220c313c | 10809 | #: builtin/read-tree.c:115 |
ef317cd5 | 10810 | msgid "Merging" |
07432cef | 10811 | msgstr "合并" |
ef317cd5 | 10812 | |
220c313c | 10813 | #: builtin/read-tree.c:117 |
ef317cd5 | 10814 | msgid "perform a merge in addition to a read" |
07432cef | 10815 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 10816 | |
220c313c | 10817 | #: builtin/read-tree.c:119 |
ef317cd5 | 10818 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 10819 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 10820 | |
220c313c | 10821 | #: builtin/read-tree.c:121 |
ef317cd5 | 10822 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 10823 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 10824 | |
220c313c | 10825 | #: builtin/read-tree.c:123 |
ef317cd5 | 10826 | msgid "same as -m, but discard unmerged entries" |
07432cef | 10827 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 10828 | |
220c313c | 10829 | #: builtin/read-tree.c:124 |
ef317cd5 | 10830 | msgid "<subdirectory>/" |
07432cef | 10831 | msgstr "<子目录>/" |
ef317cd5 | 10832 | |
220c313c | 10833 | #: builtin/read-tree.c:125 |
ef317cd5 | 10834 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 10835 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 10836 | |
220c313c | 10837 | #: builtin/read-tree.c:128 |
ef317cd5 | 10838 | msgid "update working tree with merge result" |
07432cef | 10839 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 10840 | |
220c313c | 10841 | #: builtin/read-tree.c:130 |
ef317cd5 | 10842 | msgid "gitignore" |
07432cef | 10843 | msgstr "gitignore" |
ef317cd5 | 10844 | |
220c313c | 10845 | #: builtin/read-tree.c:131 |
ef317cd5 | 10846 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 10847 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 10848 | |
220c313c | 10849 | #: builtin/read-tree.c:134 |
ef317cd5 | 10850 | msgid "don't check the working tree after merging" |
07432cef | 10851 | msgstr "合并后不检查工作区" |
ef317cd5 | 10852 | |
220c313c | 10853 | #: builtin/read-tree.c:135 |
ef317cd5 | 10854 | msgid "don't update the index or the work tree" |
07432cef | 10855 | msgstr "不更新索引区和工作区" |
ef317cd5 | 10856 | |
220c313c | 10857 | #: builtin/read-tree.c:137 |
ef317cd5 | 10858 | msgid "skip applying sparse checkout filter" |
07432cef | 10859 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 10860 | |
220c313c | 10861 | #: builtin/read-tree.c:139 |
ef317cd5 | 10862 | msgid "debug unpack-trees" |
07432cef | 10863 | msgstr "调试 unpack-trees" |
ef317cd5 | 10864 | |
a0b6b246 | 10865 | #: builtin/receive-pack.c:26 |
5b04ee3b JX |
10866 | msgid "git receive-pack <git-dir>" |
10867 | msgstr "git receive-pack <git-dir>" | |
10868 | ||
a0b6b246 JX |
10869 | #: builtin/receive-pack.c:793 |
10870 | msgid "" | |
10871 | "By default, updating the current branch in a non-bare repository\n" | |
10872 | "is denied, because it will make the index and work tree inconsistent\n" | |
10873 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
10874 | "the work tree to HEAD.\n" | |
10875 | "\n" | |
10876 | "You can set 'receive.denyCurrentBranch' configuration variable to\n" | |
10877 | "'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
10878 | "its current branch; however, this is not recommended unless you\n" | |
10879 | "arranged to update its work tree to match what you pushed in some\n" | |
10880 | "other way.\n" | |
10881 | "\n" | |
10882 | "To squelch this message and still keep the default behaviour, set\n" | |
10883 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
10884 | msgstr "" | |
10885 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
10886 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
10887 | "\n" | |
10888 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
10889 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
10890 | "用某种方式将其工作区更新至您推送的状态。\n" | |
10891 | "\n" | |
10892 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
10893 | "配置变量为 'refuse'。" | |
10894 | ||
10895 | #: builtin/receive-pack.c:813 | |
10896 | msgid "" | |
10897 | "By default, deleting the current branch is denied, because the next\n" | |
10898 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
10899 | "\n" | |
10900 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
10901 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
10902 | "current branch, with or without a warning message.\n" | |
10903 | "\n" | |
10904 | "To squelch this message, you can set it to 'refuse'." | |
10905 | msgstr "" | |
10906 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
10907 | "导致混淆。\n" | |
10908 | "\n" | |
10909 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
10910 | "'warn' 或 'ignore' 以允许删除当前分支,显示或者不显示警告。\n" | |
10911 | "\n" | |
10912 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
10913 | ||
10914 | #: builtin/receive-pack.c:1883 | |
5b04ee3b JX |
10915 | msgid "quiet" |
10916 | msgstr "静默模式" | |
10917 | ||
a0b6b246 | 10918 | #: builtin/receive-pack.c:1897 |
5b04ee3b JX |
10919 | msgid "You must specify a directory." |
10920 | msgstr "您必须指定一个目录。" | |
10921 | ||
276ceeaa | 10922 | #: builtin/reflog.c:423 |
2e8451e8 | 10923 | #, c-format |
1b7f4a34 | 10924 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
10925 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
10926 | ||
276ceeaa | 10927 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
2e8451e8 JX |
10928 | #, c-format |
10929 | msgid "'%s' is not a valid timestamp" | |
10930 | msgstr "'%s' 不是一个有效的时间戳" | |
10931 | ||
cfff71a9 | 10932 | #: builtin/remote.c:12 |
ef317cd5 | 10933 | msgid "git remote [-v | --verbose]" |
07432cef | 10934 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 10935 | |
cfff71a9 | 10936 | #: builtin/remote.c:13 |
ef317cd5 | 10937 | msgid "" |
814ff314 | 10938 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
10939 | "mirror=<fetch|push>] <name> <url>" |
10940 | msgstr "" | |
814ff314 | 10941 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 10942 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 10943 | |
94550ed3 | 10944 | #: builtin/remote.c:14 builtin/remote.c:34 |
ef317cd5 | 10945 | msgid "git remote rename <old> <new>" |
07432cef | 10946 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 10947 | |
94550ed3 | 10948 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 10949 | msgid "git remote remove <name>" |
07432cef | 10950 | msgstr "git remote remove <名称>" |
ef317cd5 | 10951 | |
94550ed3 | 10952 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
10953 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
10954 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 10955 | |
cfff71a9 | 10956 | #: builtin/remote.c:17 |
ef317cd5 | 10957 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 10958 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 10959 | |
cfff71a9 | 10960 | #: builtin/remote.c:18 |
ef317cd5 | 10961 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 10962 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 10963 | |
cfff71a9 | 10964 | #: builtin/remote.c:19 |
ef317cd5 JX |
10965 | msgid "" |
10966 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 10967 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 10968 | |
cfff71a9 | 10969 | #: builtin/remote.c:20 |
ef317cd5 | 10970 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 10971 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 10972 | |
94550ed3 JX |
10973 | #: builtin/remote.c:21 builtin/remote.c:70 |
10974 | msgid "git remote get-url [--push] [--all] <name>" | |
10975 | msgstr "git remote get-url [--push] [--all] <名称>" | |
10976 | ||
10977 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 10978 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 10979 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 10980 | |
94550ed3 | 10981 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 10982 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 10983 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 10984 | |
94550ed3 | 10985 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 10986 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 10987 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 10988 | |
94550ed3 | 10989 | #: builtin/remote.c:29 |
ef317cd5 | 10990 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 10991 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 10992 | |
94550ed3 | 10993 | #: builtin/remote.c:49 |
ef317cd5 | 10994 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 10995 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 10996 | |
94550ed3 | 10997 | #: builtin/remote.c:50 |
ef317cd5 | 10998 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 10999 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 11000 | |
94550ed3 | 11001 | #: builtin/remote.c:55 |
ef317cd5 | 11002 | msgid "git remote show [<options>] <name>" |
07432cef | 11003 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 11004 | |
94550ed3 | 11005 | #: builtin/remote.c:60 |
ef317cd5 | 11006 | msgid "git remote prune [<options>] <name>" |
07432cef | 11007 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 11008 | |
94550ed3 | 11009 | #: builtin/remote.c:65 |
ef317cd5 | 11010 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 11011 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 11012 | |
94550ed3 | 11013 | #: builtin/remote.c:94 |
81809b99 | 11014 | #, c-format |
8ada9598 | 11015 | msgid "Updating %s" |
81809b99 | 11016 | msgstr "更新 %s 中" |
8ada9598 | 11017 | |
94550ed3 | 11018 | #: builtin/remote.c:126 |
8ada9598 JX |
11019 | msgid "" |
11020 | "--mirror is dangerous and deprecated; please\n" | |
11021 | "\t use --mirror=fetch or --mirror=push instead" | |
11022 | msgstr "" | |
81809b99 JX |
11023 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
11024 | "\t 或 --mirror=push" | |
8ada9598 | 11025 | |
94550ed3 | 11026 | #: builtin/remote.c:143 |
81809b99 | 11027 | #, c-format |
8ada9598 | 11028 | msgid "unknown mirror argument: %s" |
81809b99 | 11029 | msgstr "未知的镜像参数:%s" |
8ada9598 | 11030 | |
94550ed3 | 11031 | #: builtin/remote.c:159 |
ef317cd5 | 11032 | msgid "fetch the remote branches" |
07432cef | 11033 | msgstr "抓取远程的分支" |
ef317cd5 | 11034 | |
94550ed3 | 11035 | #: builtin/remote.c:161 |
ef317cd5 | 11036 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 11037 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 11038 | |
94550ed3 | 11039 | #: builtin/remote.c:164 |
ef317cd5 | 11040 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 11041 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 11042 | |
94550ed3 | 11043 | #: builtin/remote.c:166 |
ef317cd5 | 11044 | msgid "branch(es) to track" |
07432cef | 11045 | msgstr "跟踪的分支" |
ef317cd5 | 11046 | |
94550ed3 | 11047 | #: builtin/remote.c:167 |
ef317cd5 | 11048 | msgid "master branch" |
07432cef | 11049 | msgstr "主线分支" |
ef317cd5 | 11050 | |
94550ed3 | 11051 | #: builtin/remote.c:168 |
ef317cd5 | 11052 | msgid "push|fetch" |
07432cef | 11053 | msgstr "push|fetch" |
ef317cd5 | 11054 | |
94550ed3 | 11055 | #: builtin/remote.c:169 |
ef317cd5 | 11056 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 11057 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 11058 | |
94550ed3 | 11059 | #: builtin/remote.c:181 |
8ada9598 | 11060 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 11061 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 11062 | |
94550ed3 | 11063 | #: builtin/remote.c:183 |
8ada9598 | 11064 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 11065 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 11066 | |
5c57d762 | 11067 | #: builtin/remote.c:190 builtin/remote.c:629 |
81809b99 | 11068 | #, c-format |
8ada9598 | 11069 | msgid "remote %s already exists." |
81809b99 | 11070 | msgstr "远程 %s 已经存在。" |
8ada9598 | 11071 | |
5c57d762 | 11072 | #: builtin/remote.c:194 builtin/remote.c:633 |
81809b99 | 11073 | #, c-format |
8ada9598 | 11074 | msgid "'%s' is not a valid remote name" |
81809b99 | 11075 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 11076 | |
276ceeaa | 11077 | #: builtin/remote.c:234 |
81809b99 | 11078 | #, c-format |
8ada9598 | 11079 | msgid "Could not setup master '%s'" |
81809b99 | 11080 | msgstr "无法设置 master '%s'" |
8ada9598 | 11081 | |
276ceeaa | 11082 | #: builtin/remote.c:336 |
81809b99 | 11083 | #, c-format |
8ada9598 | 11084 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 11085 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 11086 | |
276ceeaa | 11087 | #: builtin/remote.c:437 builtin/remote.c:445 |
8ada9598 | 11088 | msgid "(matching)" |
81809b99 | 11089 | msgstr "(匹配)" |
8ada9598 | 11090 | |
276ceeaa | 11091 | #: builtin/remote.c:449 |
8ada9598 | 11092 | msgid "(delete)" |
81809b99 | 11093 | msgstr "(删除)" |
8ada9598 | 11094 | |
5c57d762 | 11095 | #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 |
81809b99 | 11096 | #, c-format |
8ada9598 | 11097 | msgid "No such remote: %s" |
81809b99 | 11098 | msgstr "没有这样的远程:%s" |
8ada9598 | 11099 | |
5c57d762 | 11100 | #: builtin/remote.c:639 |
81809b99 | 11101 | #, c-format |
8ada9598 | 11102 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 11103 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 11104 | |
5c57d762 | 11105 | #: builtin/remote.c:659 |
8ada9598 JX |
11106 | #, c-format |
11107 | msgid "" | |
d691f479 | 11108 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
11109 | "\t%s\n" |
11110 | "\tPlease update the configuration manually if necessary." | |
11111 | msgstr "" | |
160fb2b2 | 11112 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
11113 | "\t%s\n" |
11114 | "\t如果必要请手动更新配置。" | |
8ada9598 | 11115 | |
5c57d762 | 11116 | #: builtin/remote.c:695 |
81809b99 | 11117 | #, c-format |
8ada9598 | 11118 | msgid "deleting '%s' failed" |
81809b99 | 11119 | msgstr "删除 '%s' 失败" |
8ada9598 | 11120 | |
5c57d762 | 11121 | #: builtin/remote.c:729 |
81809b99 | 11122 | #, c-format |
8ada9598 | 11123 | msgid "creating '%s' failed" |
81809b99 | 11124 | msgstr "创建 '%s' 失败" |
8ada9598 | 11125 | |
5c57d762 | 11126 | #: builtin/remote.c:792 |
8ada9598 JX |
11127 | msgid "" |
11128 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
11129 | "to delete it, use:" | |
11130 | msgid_plural "" | |
11131 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
11132 | "to delete them, use:" | |
5ae481e0 JX |
11133 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
11134 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 11135 | |
5c57d762 | 11136 | #: builtin/remote.c:806 |
276ceeaa JX |
11137 | #, c-format |
11138 | msgid "Could not remove config section '%s'" | |
11139 | msgstr "不能移除配置小节 '%s'" | |
11140 | ||
5c57d762 | 11141 | #: builtin/remote.c:907 |
8ada9598 JX |
11142 | #, c-format |
11143 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 11144 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 11145 | |
5c57d762 | 11146 | #: builtin/remote.c:910 |
8ada9598 | 11147 | msgid " tracked" |
81809b99 | 11148 | msgstr " 已跟踪" |
8ada9598 | 11149 | |
5c57d762 | 11150 | #: builtin/remote.c:912 |
8ada9598 | 11151 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 11152 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 11153 | |
5c57d762 | 11154 | #: builtin/remote.c:914 |
8ada9598 | 11155 | msgid " ???" |
81809b99 | 11156 | msgstr " ???" |
8ada9598 | 11157 | |
5c57d762 | 11158 | #: builtin/remote.c:955 |
8ada9598 JX |
11159 | #, c-format |
11160 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 11161 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 11162 | |
5c57d762 | 11163 | #: builtin/remote.c:963 |
81809b99 | 11164 | #, c-format |
276ceeaa JX |
11165 | msgid "rebases interactively onto remote %s" |
11166 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 11167 | |
5c57d762 JX |
11168 | #: builtin/remote.c:964 |
11169 | #, c-format | |
11170 | msgid "rebases onto remote %s" | |
11171 | msgstr "变基到远程 %s" | |
11172 | ||
11173 | #: builtin/remote.c:967 | |
81809b99 | 11174 | #, c-format |
8ada9598 | 11175 | msgid " merges with remote %s" |
81809b99 | 11176 | msgstr " 与远程 %s 合并" |
8ada9598 | 11177 | |
5c57d762 | 11178 | #: builtin/remote.c:970 |
81809b99 | 11179 | #, c-format |
8ada9598 | 11180 | msgid "merges with remote %s" |
81809b99 | 11181 | msgstr "与远程 %s 合并" |
8ada9598 | 11182 | |
5c57d762 JX |
11183 | #: builtin/remote.c:973 |
11184 | #, c-format | |
11185 | msgid "%-*s and with remote %s\n" | |
11186 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 11187 | |
5c57d762 | 11188 | #: builtin/remote.c:1016 |
8ada9598 | 11189 | msgid "create" |
81809b99 | 11190 | msgstr "创建" |
8ada9598 | 11191 | |
5c57d762 | 11192 | #: builtin/remote.c:1019 |
8ada9598 | 11193 | msgid "delete" |
81809b99 | 11194 | msgstr "删除" |
8ada9598 | 11195 | |
5c57d762 | 11196 | #: builtin/remote.c:1023 |
8ada9598 | 11197 | msgid "up to date" |
81809b99 | 11198 | msgstr "最新" |
8ada9598 | 11199 | |
5c57d762 | 11200 | #: builtin/remote.c:1026 |
8ada9598 | 11201 | msgid "fast-forwardable" |
81809b99 | 11202 | msgstr "可快进" |
8ada9598 | 11203 | |
5c57d762 | 11204 | #: builtin/remote.c:1029 |
8ada9598 | 11205 | msgid "local out of date" |
81809b99 | 11206 | msgstr "本地已过时" |
8ada9598 | 11207 | |
5c57d762 | 11208 | #: builtin/remote.c:1036 |
8ada9598 JX |
11209 | #, c-format |
11210 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 11211 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 11212 | |
5c57d762 | 11213 | #: builtin/remote.c:1039 |
8ada9598 JX |
11214 | #, c-format |
11215 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 11216 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 11217 | |
5c57d762 | 11218 | #: builtin/remote.c:1043 |
8ada9598 JX |
11219 | #, c-format |
11220 | msgid " %-*s forces to %s" | |
81809b99 | 11221 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 11222 | |
5c57d762 | 11223 | #: builtin/remote.c:1046 |
8ada9598 JX |
11224 | #, c-format |
11225 | msgid " %-*s pushes to %s" | |
81809b99 | 11226 | msgstr " %-*s 推送至 %s" |
8ada9598 | 11227 | |
5c57d762 | 11228 | #: builtin/remote.c:1114 |
ef317cd5 | 11229 | msgid "do not query remotes" |
07432cef | 11230 | msgstr "不查询远程" |
ef317cd5 | 11231 | |
5c57d762 | 11232 | #: builtin/remote.c:1141 |
81809b99 | 11233 | #, c-format |
8ada9598 | 11234 | msgid "* remote %s" |
81809b99 | 11235 | msgstr "* 远程 %s" |
8ada9598 | 11236 | |
5c57d762 | 11237 | #: builtin/remote.c:1142 |
8ada9598 JX |
11238 | #, c-format |
11239 | msgid " Fetch URL: %s" | |
81809b99 | 11240 | msgstr " 获取地址:%s" |
8ada9598 | 11241 | |
a0b6b246 | 11242 | #: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 |
8ada9598 | 11243 | msgid "(no URL)" |
81809b99 | 11244 | msgstr "(无 URL)" |
8ada9598 | 11245 | |
5b04ee3b JX |
11246 | #. TRANSLATORS: the colon ':' should align with |
11247 | #. the one in " Fetch URL: %s" translation | |
5c57d762 | 11248 | #: builtin/remote.c:1154 builtin/remote.c:1156 |
8ada9598 JX |
11249 | #, c-format |
11250 | msgid " Push URL: %s" | |
81809b99 | 11251 | msgstr " 推送地址:%s" |
8ada9598 | 11252 | |
5c57d762 | 11253 | #: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 |
81809b99 | 11254 | #, c-format |
8ada9598 | 11255 | msgid " HEAD branch: %s" |
4375c10e | 11256 | msgstr " HEAD 分支:%s" |
8ada9598 | 11257 | |
5c57d762 JX |
11258 | # 译者:中文字符串拼接,可删除前导空格 |
11259 | #: builtin/remote.c:1158 | |
11260 | msgid "(not queried)" | |
11261 | msgstr "(未查询)" | |
11262 | ||
11263 | #: builtin/remote.c:1160 | |
11264 | msgid "(unknown)" | |
11265 | msgstr "(未知)" | |
11266 | ||
11267 | #: builtin/remote.c:1164 | |
8ada9598 JX |
11268 | #, c-format |
11269 | msgid "" | |
11270 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 11271 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 11272 | |
5c57d762 | 11273 | #: builtin/remote.c:1176 |
81809b99 | 11274 | #, c-format |
8ada9598 JX |
11275 | msgid " Remote branch:%s" |
11276 | msgid_plural " Remote branches:%s" | |
81809b99 | 11277 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 11278 | msgstr[1] " 远程分支:%s" |
8ada9598 | 11279 | |
81809b99 | 11280 | # 译者:中文字符串拼接,可删除前导空格 |
a0b6b246 | 11281 | #: builtin/remote.c:1179 builtin/remote.c:1205 |
8ada9598 | 11282 | msgid " (status not queried)" |
81809b99 | 11283 | msgstr "(状态未查询)" |
8ada9598 | 11284 | |
5c57d762 | 11285 | #: builtin/remote.c:1188 |
8ada9598 JX |
11286 | msgid " Local branch configured for 'git pull':" |
11287 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 11288 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 11289 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 11290 | |
5c57d762 | 11291 | #: builtin/remote.c:1196 |
8ada9598 | 11292 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 11293 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 11294 | |
a0b6b246 | 11295 | #: builtin/remote.c:1202 |
81809b99 | 11296 | #, c-format |
8ada9598 JX |
11297 | msgid " Local ref configured for 'git push'%s:" |
11298 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 11299 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 11300 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 11301 | |
a0b6b246 | 11302 | #: builtin/remote.c:1223 |
ef317cd5 | 11303 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 11304 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 11305 | |
a0b6b246 | 11306 | #: builtin/remote.c:1225 |
ef317cd5 | 11307 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 11308 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 11309 | |
a0b6b246 | 11310 | #: builtin/remote.c:1240 |
8ada9598 | 11311 | msgid "Cannot determine remote HEAD" |
81809b99 | 11312 | msgstr "无法确定远程 HEAD" |
8ada9598 | 11313 | |
a0b6b246 | 11314 | #: builtin/remote.c:1242 |
8ada9598 | 11315 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 11316 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 11317 | |
a0b6b246 | 11318 | #: builtin/remote.c:1252 |
81809b99 | 11319 | #, c-format |
8ada9598 | 11320 | msgid "Could not delete %s" |
81809b99 | 11321 | msgstr "无法删除 %s" |
8ada9598 | 11322 | |
a0b6b246 | 11323 | #: builtin/remote.c:1260 |
81809b99 | 11324 | #, c-format |
8ada9598 | 11325 | msgid "Not a valid ref: %s" |
81809b99 | 11326 | msgstr "不是一个有效引用:%s" |
8ada9598 | 11327 | |
a0b6b246 | 11328 | #: builtin/remote.c:1262 |
81809b99 | 11329 | #, c-format |
8ada9598 | 11330 | msgid "Could not setup %s" |
81809b99 | 11331 | msgstr "不能设置 %s" |
8ada9598 JX |
11332 | |
11333 | # 译者:注意保持前导空格 | |
a0b6b246 | 11334 | #: builtin/remote.c:1280 |
81809b99 | 11335 | #, c-format |
8ada9598 | 11336 | msgid " %s will become dangling!" |
07432cef | 11337 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
11338 | |
11339 | # 译者:注意保持前导空格 | |
a0b6b246 | 11340 | #: builtin/remote.c:1281 |
81809b99 | 11341 | #, c-format |
8ada9598 | 11342 | msgid " %s has become dangling!" |
07432cef | 11343 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 11344 | |
a0b6b246 | 11345 | #: builtin/remote.c:1291 |
81809b99 | 11346 | #, c-format |
8ada9598 | 11347 | msgid "Pruning %s" |
81809b99 | 11348 | msgstr "修剪 %s" |
8ada9598 | 11349 | |
a0b6b246 | 11350 | #: builtin/remote.c:1292 |
8ada9598 JX |
11351 | #, c-format |
11352 | msgid "URL: %s" | |
81809b99 | 11353 | msgstr "URL:%s" |
8ada9598 | 11354 | |
a0b6b246 | 11355 | #: builtin/remote.c:1308 |
8ada9598 JX |
11356 | #, c-format |
11357 | msgid " * [would prune] %s" | |
81809b99 | 11358 | msgstr " * [将删除] %s" |
8ada9598 | 11359 | |
a0b6b246 | 11360 | #: builtin/remote.c:1311 |
8ada9598 JX |
11361 | #, c-format |
11362 | msgid " * [pruned] %s" | |
81809b99 | 11363 | msgstr " * [已删除] %s" |
8ada9598 | 11364 | |
a0b6b246 | 11365 | #: builtin/remote.c:1356 |
ef317cd5 | 11366 | msgid "prune remotes after fetching" |
07432cef | 11367 | msgstr "抓取后清除远程" |
ef317cd5 | 11368 | |
a0b6b246 | 11369 | #: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 |
81809b99 | 11370 | #, c-format |
8ada9598 | 11371 | msgid "No such remote '%s'" |
81809b99 | 11372 | msgstr "没有此远程 '%s'" |
8ada9598 | 11373 | |
a0b6b246 | 11374 | #: builtin/remote.c:1435 |
ef317cd5 | 11375 | msgid "add branch" |
07432cef | 11376 | msgstr "添加分支" |
ef317cd5 | 11377 | |
a0b6b246 | 11378 | #: builtin/remote.c:1442 |
8ada9598 | 11379 | msgid "no remote specified" |
81809b99 | 11380 | msgstr "未指定远程" |
8ada9598 | 11381 | |
a0b6b246 | 11382 | #: builtin/remote.c:1459 |
94550ed3 JX |
11383 | msgid "query push URLs rather than fetch URLs" |
11384 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
11385 | ||
a0b6b246 | 11386 | #: builtin/remote.c:1461 |
94550ed3 JX |
11387 | msgid "return all URLs" |
11388 | msgstr "返回所有 URL 地址" | |
11389 | ||
a0b6b246 | 11390 | #: builtin/remote.c:1489 |
94550ed3 JX |
11391 | #, c-format |
11392 | msgid "no URLs configured for remote '%s'" | |
11393 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
11394 | ||
a0b6b246 | 11395 | #: builtin/remote.c:1515 |
ef317cd5 | 11396 | msgid "manipulate push URLs" |
07432cef | 11397 | msgstr "操作推送 URLS" |
ef317cd5 | 11398 | |
a0b6b246 | 11399 | #: builtin/remote.c:1517 |
ef317cd5 | 11400 | msgid "add URL" |
07432cef | 11401 | msgstr "添加 URL" |
ef317cd5 | 11402 | |
a0b6b246 | 11403 | #: builtin/remote.c:1519 |
ef317cd5 | 11404 | msgid "delete URLs" |
07432cef | 11405 | msgstr "删除 URLS" |
ef317cd5 | 11406 | |
a0b6b246 | 11407 | #: builtin/remote.c:1526 |
8ada9598 | 11408 | msgid "--add --delete doesn't make sense" |
81809b99 | 11409 | msgstr "--add --delete 无意义" |
8ada9598 | 11410 | |
a0b6b246 | 11411 | #: builtin/remote.c:1567 |
81809b99 | 11412 | #, c-format |
8ada9598 | 11413 | msgid "Invalid old URL pattern: %s" |
4375c10e | 11414 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 11415 | |
a0b6b246 | 11416 | #: builtin/remote.c:1575 |
81809b99 | 11417 | #, c-format |
8ada9598 | 11418 | msgid "No such URL found: %s" |
4375c10e | 11419 | msgstr "未找到此 URL:%s" |
8ada9598 | 11420 | |
a0b6b246 | 11421 | #: builtin/remote.c:1577 |
8ada9598 | 11422 | msgid "Will not delete all non-push URLs" |
4375c10e | 11423 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 11424 | |
a0b6b246 | 11425 | #: builtin/remote.c:1591 |
ef317cd5 | 11426 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 11427 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 11428 | |
a0b6b246 JX |
11429 | #: builtin/remote.c:1622 |
11430 | #, c-format | |
11431 | msgid "Unknown subcommand: %s" | |
11432 | msgstr "未知子命令:%s" | |
11433 | ||
6acbf033 | 11434 | #: builtin/repack.c:17 |
814ff314 JX |
11435 | msgid "git repack [<options>]" |
11436 | msgstr "git repack [<选项>]" | |
90314792 | 11437 | |
5c57d762 | 11438 | #: builtin/repack.c:160 |
90314792 JX |
11439 | msgid "pack everything in a single pack" |
11440 | msgstr "所有内容打包到一个包文件中" | |
11441 | ||
5c57d762 | 11442 | #: builtin/repack.c:162 |
90314792 JX |
11443 | msgid "same as -a, and turn unreachable objects loose" |
11444 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
11445 | ||
5c57d762 | 11446 | #: builtin/repack.c:165 |
90314792 JX |
11447 | msgid "remove redundant packs, and run git-prune-packed" |
11448 | msgstr "删除多余的包,运行 git-prune-packed" | |
11449 | ||
5c57d762 | 11450 | #: builtin/repack.c:167 |
90314792 JX |
11451 | msgid "pass --no-reuse-delta to git-pack-objects" |
11452 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
11453 | ||
5c57d762 | 11454 | #: builtin/repack.c:169 |
90314792 JX |
11455 | msgid "pass --no-reuse-object to git-pack-objects" |
11456 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
11457 | ||
5c57d762 | 11458 | #: builtin/repack.c:171 |
90314792 JX |
11459 | msgid "do not run git-update-server-info" |
11460 | msgstr "不运行 git-update-server-info" | |
11461 | ||
5c57d762 | 11462 | #: builtin/repack.c:174 |
90314792 JX |
11463 | msgid "pass --local to git-pack-objects" |
11464 | msgstr "向 git-pack-objects 传递参数 --local" | |
11465 | ||
5c57d762 | 11466 | #: builtin/repack.c:176 |
6c94aba5 JX |
11467 | msgid "write bitmap index" |
11468 | msgstr "写 bitmap 索引" | |
11469 | ||
5c57d762 | 11470 | #: builtin/repack.c:177 |
90314792 JX |
11471 | msgid "approxidate" |
11472 | msgstr "近似日期" | |
11473 | ||
5c57d762 | 11474 | #: builtin/repack.c:178 |
90314792 JX |
11475 | msgid "with -A, do not loosen objects older than this" |
11476 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
11477 | ||
5c57d762 JX |
11478 | #: builtin/repack.c:180 |
11479 | msgid "with -a, repack unreachable objects" | |
11480 | msgstr "使用 -a ,重新对不可达对象打包" | |
11481 | ||
11482 | #: builtin/repack.c:182 | |
90314792 JX |
11483 | msgid "size of the window used for delta compression" |
11484 | msgstr "用于增量压缩的窗口值" | |
11485 | ||
5c57d762 | 11486 | #: builtin/repack.c:183 builtin/repack.c:187 |
8376b58d JX |
11487 | msgid "bytes" |
11488 | msgstr "字节" | |
11489 | ||
5c57d762 | 11490 | #: builtin/repack.c:184 |
90314792 JX |
11491 | msgid "same as the above, but limit memory size instead of entries count" |
11492 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
11493 | ||
5c57d762 | 11494 | #: builtin/repack.c:186 |
90314792 JX |
11495 | msgid "limits the maximum delta depth" |
11496 | msgstr "限制最大增量深度" | |
11497 | ||
5c57d762 | 11498 | #: builtin/repack.c:188 |
90314792 | 11499 | msgid "maximum size of each packfile" |
dbd6cced | 11500 | msgstr "每个包文件的最大尺寸" |
90314792 | 11501 | |
5c57d762 | 11502 | #: builtin/repack.c:190 |
6c94aba5 JX |
11503 | msgid "repack objects in packs marked with .keep" |
11504 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
11505 | ||
5c57d762 | 11506 | #: builtin/repack.c:200 |
94550ed3 JX |
11507 | msgid "cannot delete packs in a precious-objects repo" |
11508 | msgstr "不能删除珍品仓库中的打包文件" | |
11509 | ||
5c57d762 JX |
11510 | #: builtin/repack.c:204 |
11511 | msgid "--keep-unreachable and -A are incompatible" | |
11512 | msgstr "--keep-unreachable 和 -A 不兼容" | |
11513 | ||
11514 | #: builtin/repack.c:391 builtin/worktree.c:115 | |
90314792 | 11515 | #, c-format |
5c57d762 JX |
11516 | msgid "failed to remove '%s'" |
11517 | msgstr "无法删除 '%s'" | |
90314792 | 11518 | |
6acbf033 | 11519 | #: builtin/replace.c:19 |
ef317cd5 | 11520 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 11521 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 11522 | |
6acbf033 JX |
11523 | #: builtin/replace.c:20 |
11524 | msgid "git replace [-f] --edit <object>" | |
11525 | msgstr "git replace [-f] --edit <对象>" | |
11526 | ||
11527 | #: builtin/replace.c:21 | |
11528 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
11529 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
11530 | ||
11531 | #: builtin/replace.c:22 | |
ef317cd5 | 11532 | msgid "git replace -d <object>..." |
07432cef | 11533 | msgstr "git replace -d <对象>..." |
ef317cd5 | 11534 | |
6acbf033 | 11535 | #: builtin/replace.c:23 |
cfff71a9 JX |
11536 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
11537 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 11538 | |
220c313c | 11539 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
6acbf033 JX |
11540 | #, c-format |
11541 | msgid "Not a valid object name: '%s'" | |
11542 | msgstr "不是一个有效的对象名:'%s'" | |
11543 | ||
220c313c | 11544 | #: builtin/replace.c:355 |
6acbf033 JX |
11545 | #, c-format |
11546 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 11547 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 11548 | |
220c313c | 11549 | #: builtin/replace.c:357 |
6acbf033 JX |
11550 | #, c-format |
11551 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 11552 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 11553 | |
220c313c | 11554 | #: builtin/replace.c:368 |
6acbf033 JX |
11555 | #, c-format |
11556 | msgid "" | |
11557 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
11558 | "instead of --graft" | |
55a16ee4 | 11559 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 11560 | |
220c313c | 11561 | #: builtin/replace.c:401 |
6acbf033 JX |
11562 | #, c-format |
11563 | msgid "the original commit '%s' has a gpg signature." | |
11564 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
11565 | ||
220c313c | 11566 | #: builtin/replace.c:402 |
6acbf033 JX |
11567 | msgid "the signature will be removed in the replacement commit!" |
11568 | msgstr "在替换的提交中签名将被移除!" | |
11569 | ||
220c313c | 11570 | #: builtin/replace.c:408 |
6acbf033 JX |
11571 | #, c-format |
11572 | msgid "could not write replacement commit for: '%s'" | |
11573 | msgstr "不能为 '%s' 写替换提交" | |
11574 | ||
220c313c | 11575 | #: builtin/replace.c:432 |
ef317cd5 | 11576 | msgid "list replace refs" |
07432cef | 11577 | msgstr "列出替换的引用" |
ef317cd5 | 11578 | |
220c313c | 11579 | #: builtin/replace.c:433 |
ef317cd5 | 11580 | msgid "delete replace refs" |
07432cef | 11581 | msgstr "删除替换的引用" |
ef317cd5 | 11582 | |
220c313c | 11583 | #: builtin/replace.c:434 |
6acbf033 JX |
11584 | msgid "edit existing object" |
11585 | msgstr "编辑现存的对象" | |
11586 | ||
220c313c | 11587 | #: builtin/replace.c:435 |
6acbf033 JX |
11588 | msgid "change a commit's parents" |
11589 | msgstr "修改一个提交的父提交" | |
11590 | ||
220c313c | 11591 | #: builtin/replace.c:436 |
ef317cd5 | 11592 | msgid "replace the ref if it exists" |
07432cef | 11593 | msgstr "如果存在则替换引用" |
ef317cd5 | 11594 | |
220c313c | 11595 | #: builtin/replace.c:437 |
6acbf033 JX |
11596 | msgid "do not pretty-print contents for --edit" |
11597 | msgstr "不要为 --edit 操作美观显示内容" | |
11598 | ||
220c313c | 11599 | #: builtin/replace.c:438 |
cfff71a9 JX |
11600 | msgid "use this format" |
11601 | msgstr "使用此格式" | |
11602 | ||
90314792 | 11603 | #: builtin/rerere.c:12 |
814ff314 JX |
11604 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
11605 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 11606 | |
94550ed3 | 11607 | #: builtin/rerere.c:58 |
ef317cd5 | 11608 | msgid "register clean resolutions in index" |
07432cef | 11609 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 11610 | |
220c313c | 11611 | #: builtin/reset.c:26 |
ef317cd5 JX |
11612 | msgid "" |
11613 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 11614 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 11615 | |
220c313c | 11616 | #: builtin/reset.c:27 |
a0b6b246 JX |
11617 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
11618 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 11619 | |
220c313c | 11620 | #: builtin/reset.c:28 |
07432cef WS |
11621 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
11622 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 11623 | |
220c313c | 11624 | #: builtin/reset.c:34 |
c04f5ac3 JX |
11625 | msgid "mixed" |
11626 | msgstr "混杂" | |
11627 | ||
220c313c | 11628 | #: builtin/reset.c:34 |
c04f5ac3 JX |
11629 | msgid "soft" |
11630 | msgstr "软性" | |
11631 | ||
220c313c | 11632 | #: builtin/reset.c:34 |
c04f5ac3 JX |
11633 | msgid "hard" |
11634 | msgstr "硬性" | |
11635 | ||
220c313c | 11636 | #: builtin/reset.c:34 |
8ada9598 JX |
11637 | msgid "merge" |
11638 | msgstr "合并" | |
11639 | ||
220c313c | 11640 | #: builtin/reset.c:34 |
c04f5ac3 JX |
11641 | msgid "keep" |
11642 | msgstr "保持" | |
11643 | ||
220c313c | 11644 | #: builtin/reset.c:74 |
c04f5ac3 JX |
11645 | msgid "You do not have a valid HEAD." |
11646 | msgstr "您没有一个有效的 HEAD。" | |
11647 | ||
220c313c | 11648 | #: builtin/reset.c:76 |
c04f5ac3 JX |
11649 | msgid "Failed to find tree of HEAD." |
11650 | msgstr "无法找到 HEAD 指向的树。" | |
11651 | ||
220c313c | 11652 | #: builtin/reset.c:82 |
c04f5ac3 JX |
11653 | #, c-format |
11654 | msgid "Failed to find tree of %s." | |
11655 | msgstr "无法找到 %s 指向的树。" | |
11656 | ||
220c313c | 11657 | #: builtin/reset.c:100 |
c04f5ac3 JX |
11658 | #, c-format |
11659 | msgid "HEAD is now at %s" | |
11660 | msgstr "HEAD 现在位于 %s" | |
11661 | ||
90e6ef53 | 11662 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 11663 | #: builtin/reset.c:183 |
c04f5ac3 JX |
11664 | #, c-format |
11665 | msgid "Cannot do a %s reset in the middle of a merge." | |
11666 | msgstr "在合并过程中不能做%s重置操作。" | |
11667 | ||
220c313c | 11668 | #: builtin/reset.c:276 |
ef317cd5 | 11669 | msgid "be quiet, only report errors" |
07432cef | 11670 | msgstr "安静模式,只报告错误" |
ef317cd5 | 11671 | |
220c313c | 11672 | #: builtin/reset.c:278 |
ef317cd5 | 11673 | msgid "reset HEAD and index" |
07432cef | 11674 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 11675 | |
220c313c | 11676 | #: builtin/reset.c:279 |
ef317cd5 | 11677 | msgid "reset only HEAD" |
07432cef | 11678 | msgstr "只重置 HEAD" |
ef317cd5 | 11679 | |
220c313c | 11680 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 11681 | msgid "reset HEAD, index and working tree" |
07432cef | 11682 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 11683 | |
220c313c | 11684 | #: builtin/reset.c:285 |
ef317cd5 | 11685 | msgid "reset HEAD but keep local changes" |
07432cef | 11686 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 11687 | |
220c313c | 11688 | #: builtin/reset.c:288 |
6c94aba5 JX |
11689 | msgid "record only the fact that removed paths will be added later" |
11690 | msgstr "将删除的路径标记为稍后添加" | |
11691 | ||
220c313c | 11692 | #: builtin/reset.c:305 |
07432cef WS |
11693 | #, c-format |
11694 | msgid "Failed to resolve '%s' as a valid revision." | |
11695 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
11696 | ||
220c313c | 11697 | #: builtin/reset.c:313 |
07432cef WS |
11698 | #, c-format |
11699 | msgid "Failed to resolve '%s' as a valid tree." | |
11700 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
11701 | ||
220c313c | 11702 | #: builtin/reset.c:322 |
c04f5ac3 | 11703 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 11704 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 11705 | |
220c313c | 11706 | #: builtin/reset.c:331 |
c04f5ac3 | 11707 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 11708 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 11709 | |
90e6ef53 | 11710 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 11711 | #: builtin/reset.c:333 |
c04f5ac3 JX |
11712 | #, c-format |
11713 | msgid "Cannot do %s reset with paths." | |
11714 | msgstr "不能带路径进行%s重置。" | |
11715 | ||
90e6ef53 | 11716 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 11717 | #: builtin/reset.c:343 |
c04f5ac3 JX |
11718 | #, c-format |
11719 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 11720 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 11721 | |
220c313c | 11722 | #: builtin/reset.c:347 |
6c94aba5 JX |
11723 | msgid "-N can only be used with --mixed" |
11724 | msgstr "-N 只能和 --mixed 同时使用" | |
11725 | ||
220c313c | 11726 | #: builtin/reset.c:364 |
90314792 | 11727 | msgid "Unstaged changes after reset:" |
160fb2b2 | 11728 | msgstr "重置后取消暂存的变更:" |
90314792 | 11729 | |
220c313c | 11730 | #: builtin/reset.c:370 |
ef317cd5 JX |
11731 | #, c-format |
11732 | msgid "Could not reset index file to revision '%s'." | |
11733 | msgstr "不能重置索引文件至版本 '%s'。" | |
11734 | ||
220c313c | 11735 | #: builtin/reset.c:374 |
07432cef WS |
11736 | msgid "Could not write new index file." |
11737 | msgstr "不能写入新的索引文件。" | |
11738 | ||
a0b6b246 | 11739 | #: builtin/rev-list.c:354 |
1b7f4a34 JX |
11740 | msgid "rev-list does not support display of notes" |
11741 | msgstr "rev-list 不支持显示注解" | |
11742 | ||
a0b6b246 | 11743 | #: builtin/rev-parse.c:386 |
814ff314 JX |
11744 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
11745 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 11746 | |
a0b6b246 | 11747 | #: builtin/rev-parse.c:391 |
ef317cd5 | 11748 | msgid "keep the `--` passed as an arg" |
07432cef | 11749 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 11750 | |
a0b6b246 | 11751 | #: builtin/rev-parse.c:393 |
ef317cd5 | 11752 | msgid "stop parsing after the first non-option argument" |
07432cef | 11753 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 11754 | |
a0b6b246 | 11755 | #: builtin/rev-parse.c:396 |
cfff71a9 JX |
11756 | msgid "output in stuck long form" |
11757 | msgstr "以固定长格式输出" | |
11758 | ||
a0b6b246 | 11759 | #: builtin/rev-parse.c:527 |
ef317cd5 | 11760 | msgid "" |
814ff314 | 11761 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 11762 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 11763 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
11764 | "\n" |
11765 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
11766 | msgstr "" | |
814ff314 | 11767 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 11768 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 11769 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
11770 | "\n" |
11771 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
11772 | |
11773 | #: builtin/revert.c:22 | |
814ff314 JX |
11774 | msgid "git revert [<options>] <commit-ish>..." |
11775 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
11776 | |
11777 | #: builtin/revert.c:23 | |
11778 | msgid "git revert <subcommand>" | |
07432cef | 11779 | msgstr "git revert <子命令>" |
ef317cd5 JX |
11780 | |
11781 | #: builtin/revert.c:28 | |
814ff314 JX |
11782 | msgid "git cherry-pick [<options>] <commit-ish>..." |
11783 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
11784 | |
11785 | #: builtin/revert.c:29 | |
ef317cd5 | 11786 | msgid "git cherry-pick <subcommand>" |
07432cef | 11787 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 11788 | |
90314792 | 11789 | #: builtin/revert.c:71 |
ef317cd5 JX |
11790 | #, c-format |
11791 | msgid "%s: %s cannot be used with %s" | |
11792 | msgstr "%s:%s 不能和 %s 同时使用" | |
11793 | ||
90314792 | 11794 | #: builtin/revert.c:80 |
ef317cd5 | 11795 | msgid "end revert or cherry-pick sequence" |
07432cef | 11796 | msgstr "终止反转或拣选操作" |
ef317cd5 | 11797 | |
90314792 | 11798 | #: builtin/revert.c:81 |
ef317cd5 | 11799 | msgid "resume revert or cherry-pick sequence" |
07432cef | 11800 | msgstr "继续反转或拣选操作" |
ef317cd5 | 11801 | |
90314792 | 11802 | #: builtin/revert.c:82 |
ef317cd5 | 11803 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 11804 | msgstr "取消反转或拣选操作" |
ef317cd5 | 11805 | |
90314792 | 11806 | #: builtin/revert.c:83 |
ef317cd5 | 11807 | msgid "don't automatically commit" |
07432cef | 11808 | msgstr "不要自动提交" |
ef317cd5 | 11809 | |
90314792 | 11810 | #: builtin/revert.c:84 |
ef317cd5 | 11811 | msgid "edit the commit message" |
07432cef | 11812 | msgstr "编辑提交说明" |
ef317cd5 | 11813 | |
90314792 | 11814 | #: builtin/revert.c:87 |
ef317cd5 | 11815 | msgid "parent number" |
07432cef | 11816 | msgstr "父编号" |
ef317cd5 | 11817 | |
90314792 | 11818 | #: builtin/revert.c:89 |
ef317cd5 | 11819 | msgid "merge strategy" |
07432cef | 11820 | msgstr "合并策略" |
ef317cd5 | 11821 | |
90314792 | 11822 | #: builtin/revert.c:90 |
ef317cd5 | 11823 | msgid "option" |
07432cef | 11824 | msgstr "选项" |
ef317cd5 | 11825 | |
90314792 | 11826 | #: builtin/revert.c:91 |
ef317cd5 | 11827 | msgid "option for merge strategy" |
07432cef | 11828 | msgstr "合并策略的选项" |
ef317cd5 | 11829 | |
5c57d762 | 11830 | #: builtin/revert.c:100 |
ef317cd5 | 11831 | msgid "append commit name" |
07432cef | 11832 | msgstr "追加提交名称" |
ef317cd5 | 11833 | |
5c57d762 | 11834 | #: builtin/revert.c:102 |
ef317cd5 | 11835 | msgid "preserve initially empty commits" |
07432cef | 11836 | msgstr "保留初始化的空提交" |
ef317cd5 | 11837 | |
5c57d762 | 11838 | #: builtin/revert.c:103 |
ef317cd5 | 11839 | msgid "allow commits with empty messages" |
07432cef | 11840 | msgstr "允许提交说明为空" |
c04f5ac3 | 11841 | |
5c57d762 | 11842 | #: builtin/revert.c:104 |
ef317cd5 | 11843 | msgid "keep redundant, empty commits" |
07432cef | 11844 | msgstr "保持多余的、空的提交" |
ef317cd5 | 11845 | |
5c57d762 | 11846 | #: builtin/revert.c:192 |
c04f5ac3 JX |
11847 | msgid "revert failed" |
11848 | msgstr "还原失败" | |
11849 | ||
a0b6b246 | 11850 | #: builtin/revert.c:205 |
c04f5ac3 JX |
11851 | msgid "cherry-pick failed" |
11852 | msgstr "拣选失败" | |
11853 | ||
90314792 | 11854 | #: builtin/rm.c:17 |
814ff314 JX |
11855 | msgid "git rm [<options>] [--] <file>..." |
11856 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 11857 | |
90314792 | 11858 | #: builtin/rm.c:65 |
2e8451e8 JX |
11859 | msgid "" |
11860 | "the following submodule (or one of its nested submodules)\n" | |
11861 | "uses a .git directory:" | |
11862 | msgid_plural "" | |
220c313c | 11863 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 11864 | "use a .git directory:" |
220c313c JX |
11865 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
11866 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 11867 | |
90314792 | 11868 | #: builtin/rm.c:71 |
07432cef | 11869 | msgid "" |
2e8451e8 | 11870 | "\n" |
07432cef WS |
11871 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
11872 | msgstr "" | |
2e8451e8 | 11873 | "\n" |
07432cef | 11874 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 11875 | |
7aea43ff | 11876 | #: builtin/rm.c:230 |
c04f5ac3 | 11877 | msgid "" |
2e8451e8 JX |
11878 | "the following file has staged content different from both the\n" |
11879 | "file and the HEAD:" | |
11880 | msgid_plural "" | |
11881 | "the following files have staged content different from both the\n" | |
11882 | "file and the HEAD:" | |
11883 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
11884 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
11885 | ||
7aea43ff | 11886 | #: builtin/rm.c:235 |
2e8451e8 JX |
11887 | msgid "" |
11888 | "\n" | |
c04f5ac3 JX |
11889 | "(use -f to force removal)" |
11890 | msgstr "" | |
2e8451e8 | 11891 | "\n" |
c04f5ac3 JX |
11892 | "(使用 -f 强制删除)" |
11893 | ||
7aea43ff | 11894 | #: builtin/rm.c:239 |
2e8451e8 JX |
11895 | msgid "the following file has changes staged in the index:" |
11896 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
11897 | msgstr[0] "下列文件索引中有变更" |
11898 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 11899 | |
7aea43ff | 11900 | #: builtin/rm.c:243 builtin/rm.c:254 |
c04f5ac3 | 11901 | msgid "" |
2e8451e8 | 11902 | "\n" |
c04f5ac3 JX |
11903 | "(use --cached to keep the file, or -f to force removal)" |
11904 | msgstr "" | |
2e8451e8 JX |
11905 | "\n" |
11906 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
11907 | ||
7aea43ff | 11908 | #: builtin/rm.c:251 |
2e8451e8 JX |
11909 | msgid "the following file has local modifications:" |
11910 | msgid_plural "the following files have local modifications:" | |
11911 | msgstr[0] "如下文件有本地修改:" | |
11912 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 11913 | |
7aea43ff | 11914 | #: builtin/rm.c:269 |
ef317cd5 | 11915 | msgid "do not list removed files" |
07432cef | 11916 | msgstr "不列出删除的文件" |
ef317cd5 | 11917 | |
7aea43ff | 11918 | #: builtin/rm.c:270 |
ef317cd5 | 11919 | msgid "only remove from the index" |
07432cef | 11920 | msgstr "只从索引区删除" |
ef317cd5 | 11921 | |
7aea43ff | 11922 | #: builtin/rm.c:271 |
ef317cd5 | 11923 | msgid "override the up-to-date check" |
07432cef | 11924 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 11925 | |
7aea43ff | 11926 | #: builtin/rm.c:272 |
ef317cd5 | 11927 | msgid "allow recursive removal" |
07432cef | 11928 | msgstr "允许递归删除" |
ef317cd5 | 11929 | |
7aea43ff | 11930 | #: builtin/rm.c:274 |
ef317cd5 | 11931 | msgid "exit with a zero status even if nothing matched" |
07432cef | 11932 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 11933 | |
7aea43ff | 11934 | #: builtin/rm.c:335 |
c04f5ac3 JX |
11935 | #, c-format |
11936 | msgid "not removing '%s' recursively without -r" | |
11937 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
11938 | ||
7aea43ff | 11939 | #: builtin/rm.c:374 |
c04f5ac3 JX |
11940 | #, c-format |
11941 | msgid "git rm: unable to remove %s" | |
11942 | msgstr "git rm:不能删除 %s" | |
11943 | ||
1b7f4a34 JX |
11944 | #: builtin/send-pack.c:18 |
11945 | msgid "" | |
11946 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
11947 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
11948 | "[<ref>...]\n" | |
11949 | " --all and explicit <ref> specification are mutually exclusive." | |
11950 | msgstr "" | |
11951 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
11952 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
11953 | " --all 和明确的 <引用> 互斥。" | |
11954 | ||
11955 | #: builtin/send-pack.c:160 | |
11956 | msgid "remote name" | |
11957 | msgstr "远程名称" | |
11958 | ||
11959 | #: builtin/send-pack.c:171 | |
11960 | msgid "use stateless RPC protocol" | |
11961 | msgstr "使用无状态的 RPC 协议" | |
11962 | ||
11963 | #: builtin/send-pack.c:172 | |
11964 | msgid "read refs from stdin" | |
11965 | msgstr "从标准输入读取引用" | |
11966 | ||
11967 | #: builtin/send-pack.c:173 | |
11968 | msgid "print status from remote helper" | |
11969 | msgstr "打印来自远程 helper 的状态" | |
11970 | ||
ef317cd5 | 11971 | #: builtin/shortlog.c:13 |
814ff314 | 11972 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 11973 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 11974 | |
276ceeaa | 11975 | #: builtin/shortlog.c:242 |
ef317cd5 | 11976 | msgid "sort output according to the number of commits per author" |
07432cef | 11977 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 11978 | |
276ceeaa | 11979 | #: builtin/shortlog.c:244 |
ef317cd5 | 11980 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 11981 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 11982 | |
276ceeaa | 11983 | #: builtin/shortlog.c:246 |
ef317cd5 | 11984 | msgid "Show the email address of each author" |
07432cef | 11985 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 11986 | |
276ceeaa | 11987 | #: builtin/shortlog.c:247 |
ef317cd5 | 11988 | msgid "w[,i1[,i2]]" |
07432cef | 11989 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 11990 | |
276ceeaa | 11991 | #: builtin/shortlog.c:248 |
ef317cd5 | 11992 | msgid "Linewrap output" |
07432cef | 11993 | msgstr "折行输出" |
ef317cd5 | 11994 | |
94550ed3 | 11995 | #: builtin/show-branch.c:10 |
ef317cd5 | 11996 | msgid "" |
814ff314 | 11997 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
11998 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
11999 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
12000 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 12001 | msgstr "" |
814ff314 | 12002 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
12003 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
12004 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
12005 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 12006 | |
94550ed3 | 12007 | #: builtin/show-branch.c:14 |
814ff314 JX |
12008 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
12009 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 12010 | |
a0b6b246 JX |
12011 | #: builtin/show-branch.c:375 |
12012 | #, c-format | |
12013 | msgid "ignoring %s; cannot handle more than %d ref" | |
12014 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
12015 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
12016 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
12017 | ||
12018 | #: builtin/show-branch.c:541 | |
12019 | #, c-format | |
12020 | msgid "no matching refs with %s" | |
12021 | msgstr "没有和 %s 匹配的引用" | |
12022 | ||
12023 | #: builtin/show-branch.c:639 | |
ef317cd5 | 12024 | msgid "show remote-tracking and local branches" |
07432cef | 12025 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 12026 | |
a0b6b246 | 12027 | #: builtin/show-branch.c:641 |
ef317cd5 | 12028 | msgid "show remote-tracking branches" |
07432cef | 12029 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 12030 | |
a0b6b246 | 12031 | #: builtin/show-branch.c:643 |
ef317cd5 | 12032 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 12033 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 12034 | |
a0b6b246 | 12035 | #: builtin/show-branch.c:645 |
ef317cd5 | 12036 | msgid "show <n> more commits after the common ancestor" |
07432cef | 12037 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 12038 | |
a0b6b246 | 12039 | #: builtin/show-branch.c:647 |
ef317cd5 | 12040 | msgid "synonym to more=-1" |
07432cef | 12041 | msgstr "和 more=-1 同义" |
ef317cd5 | 12042 | |
a0b6b246 | 12043 | #: builtin/show-branch.c:648 |
ef317cd5 | 12044 | msgid "suppress naming strings" |
07432cef | 12045 | msgstr "不显示字符串命名" |
ef317cd5 | 12046 | |
a0b6b246 | 12047 | #: builtin/show-branch.c:650 |
ef317cd5 | 12048 | msgid "include the current branch" |
07432cef | 12049 | msgstr "包括当前分支" |
ef317cd5 | 12050 | |
a0b6b246 | 12051 | #: builtin/show-branch.c:652 |
ef317cd5 | 12052 | msgid "name commits with their object names" |
07432cef | 12053 | msgstr "以对象名字命名提交" |
ef317cd5 | 12054 | |
a0b6b246 | 12055 | #: builtin/show-branch.c:654 |
ef317cd5 | 12056 | msgid "show possible merge bases" |
07432cef | 12057 | msgstr "显示可能合并的基线" |
ef317cd5 | 12058 | |
a0b6b246 | 12059 | #: builtin/show-branch.c:656 |
ef317cd5 | 12060 | msgid "show refs unreachable from any other ref" |
07432cef | 12061 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 12062 | |
a0b6b246 | 12063 | #: builtin/show-branch.c:658 |
ef317cd5 | 12064 | msgid "show commits in topological order" |
07432cef | 12065 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 12066 | |
a0b6b246 | 12067 | #: builtin/show-branch.c:661 |
ef317cd5 | 12068 | msgid "show only commits not on the first branch" |
07432cef | 12069 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 12070 | |
a0b6b246 | 12071 | #: builtin/show-branch.c:663 |
ef317cd5 | 12072 | msgid "show merges reachable from only one tip" |
07432cef | 12073 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 12074 | |
a0b6b246 | 12075 | #: builtin/show-branch.c:665 |
2e8451e8 JX |
12076 | msgid "topologically sort, maintaining date order where possible" |
12077 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 12078 | |
a0b6b246 | 12079 | #: builtin/show-branch.c:668 |
ef317cd5 | 12080 | msgid "<n>[,<base>]" |
07432cef | 12081 | msgstr "<n>[,<base>]" |
ef317cd5 | 12082 | |
a0b6b246 | 12083 | #: builtin/show-branch.c:669 |
ef317cd5 | 12084 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 12085 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 12086 | |
a0b6b246 JX |
12087 | #: builtin/show-branch.c:703 |
12088 | msgid "" | |
12089 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
12090 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
12091 | ||
12092 | #: builtin/show-branch.c:727 | |
12093 | msgid "no branches given, and HEAD is not valid" | |
12094 | msgstr "未提供分支,且 HEAD 无效" | |
12095 | ||
12096 | #: builtin/show-branch.c:730 | |
12097 | msgid "--reflog option needs one branch name" | |
12098 | msgstr "选项 --reflog 需要一个分支名" | |
12099 | ||
12100 | #: builtin/show-branch.c:733 | |
12101 | #, c-format | |
12102 | msgid "only %d entry can be shown at one time." | |
12103 | msgid_plural "only %d entries can be shown at one time." | |
12104 | msgstr[0] "一次只能显示 %d 个条目。" | |
12105 | msgstr[1] "一次只能显示 %d 个条目。" | |
12106 | ||
12107 | #: builtin/show-branch.c:737 | |
12108 | #, c-format | |
12109 | msgid "no such ref %s" | |
12110 | msgstr "无此引用 %s" | |
12111 | ||
12112 | #: builtin/show-branch.c:829 | |
12113 | #, c-format | |
12114 | msgid "cannot handle more than %d rev." | |
12115 | msgid_plural "cannot handle more than %d revs." | |
12116 | msgstr[0] "不能处理 %d 个以上的版本。" | |
12117 | msgstr[1] "不能处理 %d 个以上的版本。" | |
12118 | ||
12119 | #: builtin/show-branch.c:833 | |
12120 | #, c-format | |
12121 | msgid "'%s' is not a valid ref." | |
12122 | msgstr "'%s' 不是一个有效的引用。" | |
12123 | ||
12124 | #: builtin/show-branch.c:836 | |
12125 | #, c-format | |
12126 | msgid "cannot find commit %s (%s)" | |
12127 | msgstr "不能找到提交 %s (%s)" | |
12128 | ||
ef317cd5 JX |
12129 | #: builtin/show-ref.c:10 |
12130 | msgid "" | |
814ff314 JX |
12131 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
12132 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 12133 | msgstr "" |
814ff314 JX |
12134 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
12135 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
12136 | |
12137 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
12138 | msgid "git show-ref --exclude-existing[=<pattern>]" |
12139 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 12140 | |
94550ed3 | 12141 | #: builtin/show-ref.c:165 |
ef317cd5 | 12142 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 12143 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 12144 | |
94550ed3 | 12145 | #: builtin/show-ref.c:166 |
ef317cd5 | 12146 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 12147 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 12148 | |
94550ed3 | 12149 | #: builtin/show-ref.c:167 |
ef317cd5 | 12150 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 12151 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 12152 | |
94550ed3 | 12153 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
2e8451e8 JX |
12154 | msgid "show the HEAD reference, even if it would be filtered out" |
12155 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 12156 | |
94550ed3 | 12157 | #: builtin/show-ref.c:174 |
ef317cd5 | 12158 | msgid "dereference tags into object IDs" |
4375c10e | 12159 | msgstr "转换标签到对象 ID" |
ef317cd5 | 12160 | |
94550ed3 | 12161 | #: builtin/show-ref.c:176 |
ef317cd5 | 12162 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 12163 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 12164 | |
94550ed3 | 12165 | #: builtin/show-ref.c:180 |
ef317cd5 | 12166 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 12167 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 12168 | |
94550ed3 | 12169 | #: builtin/show-ref.c:182 |
ef317cd5 | 12170 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 12171 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 12172 | |
94550ed3 JX |
12173 | #: builtin/stripspace.c:17 |
12174 | msgid "git stripspace [-s | --strip-comments]" | |
12175 | msgstr "git stripspace [-s | --strip-comments]" | |
12176 | ||
12177 | #: builtin/stripspace.c:18 | |
12178 | msgid "git stripspace [-c | --comment-lines]" | |
12179 | msgstr "git stripspace [-c | --comment-lines]" | |
12180 | ||
12181 | #: builtin/stripspace.c:35 | |
12182 | msgid "skip and remove all lines starting with comment character" | |
12183 | msgstr "跳过和移除所有的注释行" | |
12184 | ||
12185 | #: builtin/stripspace.c:38 | |
276ceeaa | 12186 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
12187 | msgstr "为每一行的行首添加注释符和空格" |
12188 | ||
a0b6b246 | 12189 | #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 |
5b04ee3b JX |
12190 | #, c-format |
12191 | msgid "No such ref: %s" | |
12192 | msgstr "没有这样的引用:%s" | |
12193 | ||
a0b6b246 | 12194 | #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 |
5b04ee3b JX |
12195 | #, c-format |
12196 | msgid "Expecting a full ref name, got %s" | |
12197 | msgstr "期望一个完整的引用名称,却得到 %s" | |
12198 | ||
12199 | #: builtin/submodule--helper.c:71 | |
12200 | #, c-format | |
12201 | msgid "cannot strip one component off url '%s'" | |
12202 | msgstr "无法从 url '%s' 剥离一个组件" | |
12203 | ||
a0b6b246 JX |
12204 | #: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 |
12205 | #: builtin/submodule--helper.c:590 | |
94550ed3 JX |
12206 | msgid "alternative anchor for relative paths" |
12207 | msgstr "相对路径的替代锚记(anchor)" | |
12208 | ||
a0b6b246 | 12209 | #: builtin/submodule--helper.c:287 |
94550ed3 JX |
12210 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
12211 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
12212 | ||
a0b6b246 | 12213 | #: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 |
5b04ee3b JX |
12214 | #, c-format |
12215 | msgid "No url found for submodule path '%s' in .gitmodules" | |
12216 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
12217 | ||
a0b6b246 | 12218 | #: builtin/submodule--helper.c:369 |
5b04ee3b JX |
12219 | #, c-format |
12220 | msgid "Failed to register url for submodule path '%s'" | |
12221 | msgstr "无法为子模组 '%s' 注册 url" | |
12222 | ||
a0b6b246 | 12223 | #: builtin/submodule--helper.c:373 |
5b04ee3b JX |
12224 | #, c-format |
12225 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 12226 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
12227 | |
12228 | # | |
a0b6b246 | 12229 | #: builtin/submodule--helper.c:383 |
aef18cc6 | 12230 | #, c-format |
5b04ee3b | 12231 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 12232 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 12233 | |
a0b6b246 | 12234 | #: builtin/submodule--helper.c:390 |
5b04ee3b JX |
12235 | #, c-format |
12236 | msgid "Failed to register update mode for submodule path '%s'" | |
12237 | msgstr "无法为子模组 '%s' 注册更新模式" | |
12238 | ||
a0b6b246 | 12239 | #: builtin/submodule--helper.c:409 |
5b04ee3b JX |
12240 | msgid "Suppress output for initializing a submodule" |
12241 | msgstr "初始化子模组时抑制输出" | |
12242 | ||
a0b6b246 | 12243 | #: builtin/submodule--helper.c:414 |
5b04ee3b JX |
12244 | msgid "git submodule--helper init [<path>]" |
12245 | msgstr "git submodule--helper init [<路径>]" | |
12246 | ||
a0b6b246 | 12247 | #: builtin/submodule--helper.c:435 |
94550ed3 JX |
12248 | msgid "git submodule--helper name <path>" |
12249 | msgstr "git submodule--helper name <路径>" | |
12250 | ||
a0b6b246 | 12251 | #: builtin/submodule--helper.c:441 |
94550ed3 JX |
12252 | #, c-format |
12253 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
12254 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
12255 | ||
a0b6b246 JX |
12256 | #: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 |
12257 | #, c-format | |
12258 | msgid "submodule '%s' cannot add alternate: %s" | |
12259 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
12260 | ||
12261 | #: builtin/submodule--helper.c:563 | |
12262 | #, c-format | |
12263 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
12264 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
12265 | ||
12266 | #: builtin/submodule--helper.c:570 | |
12267 | #, c-format | |
12268 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
12269 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
12270 | ||
12271 | #: builtin/submodule--helper.c:593 | |
94550ed3 JX |
12272 | msgid "where the new submodule will be cloned to" |
12273 | msgstr "新的子模组将要克隆的路径" | |
12274 | ||
a0b6b246 | 12275 | #: builtin/submodule--helper.c:596 |
94550ed3 JX |
12276 | msgid "name of the new submodule" |
12277 | msgstr "新子模组的名称" | |
12278 | ||
a0b6b246 | 12279 | #: builtin/submodule--helper.c:599 |
94550ed3 JX |
12280 | msgid "url where to clone the submodule from" |
12281 | msgstr "克隆子模组的 url 地址" | |
12282 | ||
a0b6b246 | 12283 | #: builtin/submodule--helper.c:605 |
94550ed3 JX |
12284 | msgid "depth for shallow clones" |
12285 | msgstr "浅克隆的深度" | |
12286 | ||
a0b6b246 JX |
12287 | #: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 |
12288 | msgid "force cloning progress" | |
12289 | msgstr "显示克隆进度" | |
12290 | ||
12291 | #: builtin/submodule--helper.c:613 | |
94550ed3 JX |
12292 | msgid "" |
12293 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 12294 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
12295 | msgstr "" |
12296 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
12297 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 12298 | |
a0b6b246 | 12299 | #: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 |
94550ed3 JX |
12300 | #, c-format |
12301 | msgid "could not create directory '%s'" | |
12302 | msgstr "不能创建目录 '%s'" | |
12303 | ||
a0b6b246 | 12304 | #: builtin/submodule--helper.c:644 |
94550ed3 JX |
12305 | #, c-format |
12306 | msgid "clone of '%s' into submodule path '%s' failed" | |
12307 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
12308 | ||
a0b6b246 | 12309 | #: builtin/submodule--helper.c:660 |
94550ed3 JX |
12310 | #, c-format |
12311 | msgid "cannot open file '%s'" | |
12312 | msgstr "无法打开文件 '%s'" | |
12313 | ||
a0b6b246 | 12314 | #: builtin/submodule--helper.c:665 |
94550ed3 JX |
12315 | #, c-format |
12316 | msgid "could not close file %s" | |
12317 | msgstr "无法关闭文件 %s" | |
12318 | ||
a0b6b246 | 12319 | #: builtin/submodule--helper.c:672 |
94550ed3 JX |
12320 | #, c-format |
12321 | msgid "could not get submodule directory for '%s'" | |
12322 | msgstr "无法得到 '%s' 的子模组目录" | |
12323 | ||
a0b6b246 | 12324 | #: builtin/submodule--helper.c:726 |
5b04ee3b JX |
12325 | #, c-format |
12326 | msgid "Submodule path '%s' not initialized" | |
12327 | msgstr "子模组 '%s' 尚未初始化" | |
12328 | ||
a0b6b246 | 12329 | #: builtin/submodule--helper.c:730 |
5b04ee3b JX |
12330 | msgid "Maybe you want to use 'update --init'?" |
12331 | msgstr "也许您想要执行 'update --init'?" | |
12332 | ||
a0b6b246 | 12333 | #: builtin/submodule--helper.c:756 |
5b04ee3b JX |
12334 | #, c-format |
12335 | msgid "Skipping unmerged submodule %s" | |
12336 | msgstr "略过未合并的子模组 %s" | |
12337 | ||
a0b6b246 | 12338 | #: builtin/submodule--helper.c:777 |
5b04ee3b JX |
12339 | #, c-format |
12340 | msgid "Skipping submodule '%s'" | |
12341 | msgstr "略过子模组 '%s'" | |
12342 | ||
a0b6b246 | 12343 | #: builtin/submodule--helper.c:913 |
5c57d762 JX |
12344 | #, c-format |
12345 | msgid "Failed to clone '%s'. Retry scheduled" | |
12346 | msgstr "克隆 '%s' 失败。按计划重试" | |
12347 | ||
a0b6b246 | 12348 | #: builtin/submodule--helper.c:924 |
5c57d762 JX |
12349 | #, c-format |
12350 | msgid "Failed to clone '%s' a second time, aborting" | |
12351 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
12352 | ||
a0b6b246 | 12353 | #: builtin/submodule--helper.c:945 |
5b04ee3b JX |
12354 | msgid "path into the working tree" |
12355 | msgstr "到工作区的路径" | |
12356 | ||
a0b6b246 | 12357 | #: builtin/submodule--helper.c:948 |
5b04ee3b JX |
12358 | msgid "path into the working tree, across nested submodule boundaries" |
12359 | msgstr "工作区中的路径,递归嵌套子模组" | |
12360 | ||
a0b6b246 | 12361 | #: builtin/submodule--helper.c:952 |
5b04ee3b JX |
12362 | msgid "rebase, merge, checkout or none" |
12363 | msgstr "rebase、merge、checkout 或 none" | |
12364 | ||
a0b6b246 | 12365 | #: builtin/submodule--helper.c:956 |
5b04ee3b JX |
12366 | msgid "Create a shallow clone truncated to the specified number of revisions" |
12367 | msgstr "创建一个指定深度的浅克隆" | |
12368 | ||
a0b6b246 | 12369 | #: builtin/submodule--helper.c:959 |
5b04ee3b JX |
12370 | msgid "parallel jobs" |
12371 | msgstr "并发任务" | |
12372 | ||
a0b6b246 | 12373 | #: builtin/submodule--helper.c:961 |
5c57d762 | 12374 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 12375 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 12376 | |
a0b6b246 | 12377 | #: builtin/submodule--helper.c:962 |
5b04ee3b JX |
12378 | msgid "don't print cloning progress" |
12379 | msgstr "不要输出克隆进度" | |
94550ed3 | 12380 | |
a0b6b246 | 12381 | #: builtin/submodule--helper.c:969 |
5b04ee3b JX |
12382 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
12383 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
12384 | ||
a0b6b246 | 12385 | #: builtin/submodule--helper.c:979 |
5b04ee3b JX |
12386 | msgid "bad value for update parameter" |
12387 | msgstr "update 参数取值错误" | |
12388 | ||
a0b6b246 | 12389 | #: builtin/submodule--helper.c:1050 |
5c57d762 JX |
12390 | #, c-format |
12391 | msgid "" | |
12392 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
12393 | "the superproject is not on any branch" | |
12394 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
12395 | ||
a0b6b246 | 12396 | #: builtin/submodule--helper.c:1100 |
5b04ee3b JX |
12397 | msgid "submodule--helper subcommand must be called with a subcommand" |
12398 | msgstr "submodule-helper 子命令必须由另外的子命令调用" | |
12399 | ||
a0b6b246 | 12400 | #: builtin/submodule--helper.c:1107 |
94550ed3 | 12401 | #, c-format |
5b04ee3b JX |
12402 | msgid "'%s' is not a valid submodule--helper subcommand" |
12403 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 12404 | |
ef317cd5 | 12405 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
12406 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
12407 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
12408 | |
12409 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
12410 | msgid "git symbolic-ref -d [-q] <name>" |
12411 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 12412 | |
07432cef | 12413 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 12414 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
12415 | msgstr "不显示非符号(分离的)引用的错误信息" |
12416 | ||
12417 | #: builtin/symbolic-ref.c:41 | |
12418 | msgid "delete symbolic ref" | |
12419 | msgstr "删除符号引用" | |
ef317cd5 | 12420 | |
07432cef | 12421 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 12422 | msgid "shorten ref output" |
07432cef | 12423 | msgstr "简短的引用输出" |
ef317cd5 | 12424 | |
1b7f4a34 | 12425 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 12426 | msgid "reason" |
07432cef | 12427 | msgstr "原因" |
ef317cd5 | 12428 | |
1b7f4a34 | 12429 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 12430 | msgid "reason of the update" |
07432cef | 12431 | msgstr "更新的原因" |
ef317cd5 | 12432 | |
94550ed3 | 12433 | #: builtin/tag.c:23 |
ef317cd5 | 12434 | msgid "" |
814ff314 JX |
12435 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
12436 | "[<head>]" | |
12437 | msgstr "" | |
12438 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 12439 | |
94550ed3 | 12440 | #: builtin/tag.c:24 |
ef317cd5 | 12441 | msgid "git tag -d <tagname>..." |
07432cef | 12442 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 12443 | |
94550ed3 | 12444 | #: builtin/tag.c:25 |
ef317cd5 | 12445 | msgid "" |
814ff314 | 12446 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
94550ed3 | 12447 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 12448 | msgstr "" |
94550ed3 JX |
12449 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" |
12450 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" | |
ef317cd5 | 12451 | |
94550ed3 | 12452 | #: builtin/tag.c:27 |
ef317cd5 | 12453 | msgid "git tag -v <tagname>..." |
07432cef | 12454 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 12455 | |
5b04ee3b | 12456 | #: builtin/tag.c:81 |
c04f5ac3 JX |
12457 | #, c-format |
12458 | msgid "tag name too long: %.*s..." | |
55a16ee4 | 12459 | msgstr "标签名称太长:%.*s..." |
c04f5ac3 | 12460 | |
5b04ee3b | 12461 | #: builtin/tag.c:86 |
c04f5ac3 JX |
12462 | #, c-format |
12463 | msgid "tag '%s' not found." | |
55a16ee4 | 12464 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 12465 | |
5b04ee3b | 12466 | #: builtin/tag.c:101 |
c04f5ac3 JX |
12467 | #, c-format |
12468 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 12469 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 12470 | |
5b04ee3b | 12471 | #: builtin/tag.c:117 |
a77c07d9 | 12472 | #, c-format |
c04f5ac3 JX |
12473 | msgid "" |
12474 | "\n" | |
6acbf033 JX |
12475 | "Write a message for tag:\n" |
12476 | " %s\n" | |
a77c07d9 | 12477 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
12478 | msgstr "" |
12479 | "\n" | |
55a16ee4 | 12480 | "输入一个标签说明:\n" |
6acbf033 | 12481 | " %s\n" |
a77c07d9 | 12482 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 12483 | |
5b04ee3b | 12484 | #: builtin/tag.c:121 |
a77c07d9 | 12485 | #, c-format |
c04f5ac3 JX |
12486 | msgid "" |
12487 | "\n" | |
6acbf033 JX |
12488 | "Write a message for tag:\n" |
12489 | " %s\n" | |
a77c07d9 | 12490 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 12491 | "want to.\n" |
c04f5ac3 JX |
12492 | msgstr "" |
12493 | "\n" | |
55a16ee4 | 12494 | "输入一个标签说明:\n" |
6acbf033 | 12495 | " %s\n" |
a77c07d9 | 12496 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 12497 | |
94550ed3 | 12498 | #: builtin/tag.c:199 |
c04f5ac3 | 12499 | msgid "unable to sign the tag" |
55a16ee4 | 12500 | msgstr "无法签署标签" |
c04f5ac3 | 12501 | |
94550ed3 | 12502 | #: builtin/tag.c:201 |
c04f5ac3 | 12503 | msgid "unable to write tag file" |
55a16ee4 | 12504 | msgstr "无法写标签文件" |
c04f5ac3 | 12505 | |
94550ed3 | 12506 | #: builtin/tag.c:226 |
c04f5ac3 | 12507 | msgid "bad object type." |
90e6ef53 | 12508 | msgstr "坏的对象类型。" |
c04f5ac3 | 12509 | |
94550ed3 | 12510 | #: builtin/tag.c:239 |
c04f5ac3 | 12511 | msgid "tag header too big." |
55a16ee4 | 12512 | msgstr "标签头信息太大。" |
c04f5ac3 | 12513 | |
94550ed3 | 12514 | #: builtin/tag.c:275 |
c04f5ac3 | 12515 | msgid "no tag message?" |
55a16ee4 | 12516 | msgstr "无标签说明?" |
c04f5ac3 | 12517 | |
94550ed3 | 12518 | #: builtin/tag.c:281 |
c04f5ac3 JX |
12519 | #, c-format |
12520 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 12521 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 12522 | |
94550ed3 | 12523 | #: builtin/tag.c:339 |
ef317cd5 | 12524 | msgid "list tag names" |
55a16ee4 | 12525 | msgstr "列出标签名称" |
ef317cd5 | 12526 | |
94550ed3 | 12527 | #: builtin/tag.c:341 |
ef317cd5 | 12528 | msgid "print <n> lines of each tag message" |
55a16ee4 | 12529 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 12530 | |
94550ed3 | 12531 | #: builtin/tag.c:343 |
ef317cd5 | 12532 | msgid "delete tags" |
55a16ee4 | 12533 | msgstr "删除标签" |
ef317cd5 | 12534 | |
94550ed3 | 12535 | #: builtin/tag.c:344 |
ef317cd5 | 12536 | msgid "verify tags" |
55a16ee4 | 12537 | msgstr "验证标签" |
ef317cd5 | 12538 | |
94550ed3 | 12539 | #: builtin/tag.c:346 |
ef317cd5 | 12540 | msgid "Tag creation options" |
55a16ee4 | 12541 | msgstr "标签创建选项" |
ef317cd5 | 12542 | |
94550ed3 | 12543 | #: builtin/tag.c:348 |
ef317cd5 | 12544 | msgid "annotated tag, needs a message" |
55a16ee4 | 12545 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 12546 | |
94550ed3 | 12547 | #: builtin/tag.c:350 |
ef317cd5 | 12548 | msgid "tag message" |
55a16ee4 | 12549 | msgstr "标签说明" |
ef317cd5 | 12550 | |
94550ed3 | 12551 | #: builtin/tag.c:352 |
ef317cd5 | 12552 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 12553 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 12554 | |
94550ed3 | 12555 | #: builtin/tag.c:356 |
ef317cd5 | 12556 | msgid "use another key to sign the tag" |
55a16ee4 | 12557 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 12558 | |
94550ed3 | 12559 | #: builtin/tag.c:357 |
ef317cd5 | 12560 | msgid "replace the tag if exists" |
55a16ee4 | 12561 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 12562 | |
94550ed3 | 12563 | #: builtin/tag.c:358 builtin/update-ref.c:368 |
03ea3327 | 12564 | msgid "create a reflog" |
1b7f4a34 JX |
12565 | msgstr "创建引用日志" |
12566 | ||
94550ed3 | 12567 | #: builtin/tag.c:360 |
814ff314 | 12568 | msgid "Tag listing options" |
55a16ee4 | 12569 | msgstr "标签列表选项" |
814ff314 | 12570 | |
94550ed3 | 12571 | #: builtin/tag.c:361 |
ef317cd5 | 12572 | msgid "show tag list in columns" |
55a16ee4 | 12573 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 12574 | |
94550ed3 | 12575 | #: builtin/tag.c:362 builtin/tag.c:363 |
ef317cd5 | 12576 | msgid "print only tags that contain the commit" |
55a16ee4 | 12577 | msgstr "只打印包含提交的标签" |
ef317cd5 | 12578 | |
94550ed3 JX |
12579 | #: builtin/tag.c:364 |
12580 | msgid "print only tags that are merged" | |
12581 | msgstr "只打印已经合并的标签" | |
12582 | ||
12583 | #: builtin/tag.c:365 | |
12584 | msgid "print only tags that are not merged" | |
12585 | msgstr "只打印尚未合并的标签" | |
12586 | ||
12587 | #: builtin/tag.c:370 | |
ef317cd5 | 12588 | msgid "print only tags of the object" |
55a16ee4 | 12589 | msgstr "只打印对象的标签" |
ef317cd5 | 12590 | |
94550ed3 | 12591 | #: builtin/tag.c:399 |
8ada9598 | 12592 | msgid "--column and -n are incompatible" |
81809b99 | 12593 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 12594 | |
94550ed3 | 12595 | #: builtin/tag.c:419 |
c04f5ac3 | 12596 | msgid "-n option is only allowed with -l." |
649900bc | 12597 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 12598 | |
94550ed3 | 12599 | #: builtin/tag.c:421 |
c04f5ac3 | 12600 | msgid "--contains option is only allowed with -l." |
649900bc | 12601 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 12602 | |
94550ed3 | 12603 | #: builtin/tag.c:423 |
7ac1c0ad | 12604 | msgid "--points-at option is only allowed with -l." |
649900bc | 12605 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 12606 | |
94550ed3 JX |
12607 | #: builtin/tag.c:425 |
12608 | msgid "--merged and --no-merged option are only allowed with -l" | |
12609 | msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" | |
12610 | ||
12611 | #: builtin/tag.c:433 | |
c04f5ac3 JX |
12612 | msgid "only one -F or -m option is allowed." |
12613 | msgstr "只允许一个 -F 或 -m 选项。" | |
12614 | ||
5b04ee3b | 12615 | #: builtin/tag.c:452 |
c04f5ac3 JX |
12616 | msgid "too many params" |
12617 | msgstr "太多参数" | |
12618 | ||
5b04ee3b | 12619 | #: builtin/tag.c:458 |
c04f5ac3 JX |
12620 | #, c-format |
12621 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 12622 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 12623 | |
5b04ee3b | 12624 | #: builtin/tag.c:463 |
c04f5ac3 JX |
12625 | #, c-format |
12626 | msgid "tag '%s' already exists" | |
55a16ee4 | 12627 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 12628 | |
5b04ee3b | 12629 | #: builtin/tag.c:491 |
c04f5ac3 JX |
12630 | #, c-format |
12631 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 12632 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 12633 | |
a0b6b246 | 12634 | #: builtin/unpack-objects.c:493 |
6c94aba5 JX |
12635 | msgid "Unpacking objects" |
12636 | msgstr "展开对象中" | |
12637 | ||
276ceeaa | 12638 | #: builtin/update-index.c:79 |
7aea43ff JX |
12639 | #, c-format |
12640 | msgid "failed to create directory %s" | |
12641 | msgstr "无法创建目录 %s" | |
12642 | ||
276ceeaa | 12643 | #: builtin/update-index.c:85 |
7aea43ff JX |
12644 | #, c-format |
12645 | msgid "failed to stat %s" | |
12646 | msgstr "无法枚举 %s 状态" | |
12647 | ||
276ceeaa | 12648 | #: builtin/update-index.c:95 |
7aea43ff JX |
12649 | #, c-format |
12650 | msgid "failed to create file %s" | |
12651 | msgstr "无法创建文件 %s" | |
12652 | ||
276ceeaa | 12653 | #: builtin/update-index.c:103 |
7aea43ff JX |
12654 | #, c-format |
12655 | msgid "failed to delete file %s" | |
12656 | msgstr "无法删除文件 %s" | |
12657 | ||
276ceeaa | 12658 | #: builtin/update-index.c:110 builtin/update-index.c:212 |
7aea43ff JX |
12659 | #, c-format |
12660 | msgid "failed to delete directory %s" | |
12661 | msgstr "无法删除目录 %s" | |
12662 | ||
276ceeaa | 12663 | #: builtin/update-index.c:133 |
7aea43ff | 12664 | #, c-format |
276ceeaa JX |
12665 | msgid "Testing mtime in '%s' " |
12666 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 12667 | |
276ceeaa | 12668 | #: builtin/update-index.c:145 |
7aea43ff JX |
12669 | msgid "directory stat info does not change after adding a new file" |
12670 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
12671 | ||
276ceeaa | 12672 | #: builtin/update-index.c:158 |
7aea43ff JX |
12673 | msgid "directory stat info does not change after adding a new directory" |
12674 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
12675 | ||
276ceeaa | 12676 | #: builtin/update-index.c:171 |
7aea43ff JX |
12677 | msgid "directory stat info changes after updating a file" |
12678 | msgstr "更新一个文件后,目录的状态信息被修改" | |
12679 | ||
276ceeaa | 12680 | #: builtin/update-index.c:182 |
7aea43ff JX |
12681 | msgid "directory stat info changes after adding a file inside subdirectory" |
12682 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
12683 | ||
276ceeaa | 12684 | #: builtin/update-index.c:193 |
7aea43ff JX |
12685 | msgid "directory stat info does not change after deleting a file" |
12686 | msgstr "删除一个文件后,目录的状态信息未改变" | |
12687 | ||
276ceeaa | 12688 | #: builtin/update-index.c:206 |
7aea43ff JX |
12689 | msgid "directory stat info does not change after deleting a directory" |
12690 | msgstr "删除一个目录后,目录的状态信息未改变" | |
12691 | ||
276ceeaa | 12692 | #: builtin/update-index.c:213 |
7aea43ff JX |
12693 | msgid " OK" |
12694 | msgstr " OK" | |
12695 | ||
a0b6b246 | 12696 | #: builtin/update-index.c:564 |
814ff314 JX |
12697 | msgid "git update-index [<options>] [--] [<file>...]" |
12698 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 12699 | |
a0b6b246 | 12700 | #: builtin/update-index.c:919 |
ef317cd5 | 12701 | msgid "continue refresh even when index needs update" |
07432cef | 12702 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 12703 | |
a0b6b246 | 12704 | #: builtin/update-index.c:922 |
ef317cd5 | 12705 | msgid "refresh: ignore submodules" |
07432cef | 12706 | msgstr "刷新:忽略子模组" |
8ada9598 | 12707 | |
a0b6b246 | 12708 | #: builtin/update-index.c:925 |
ef317cd5 | 12709 | msgid "do not ignore new files" |
07432cef | 12710 | msgstr "不忽略新的文件" |
8ada9598 | 12711 | |
a0b6b246 | 12712 | #: builtin/update-index.c:927 |
ef317cd5 | 12713 | msgid "let files replace directories and vice-versa" |
07432cef | 12714 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 12715 | |
a0b6b246 | 12716 | #: builtin/update-index.c:929 |
ef317cd5 | 12717 | msgid "notice files missing from worktree" |
07432cef | 12718 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 12719 | |
a0b6b246 | 12720 | #: builtin/update-index.c:931 |
ef317cd5 | 12721 | msgid "refresh even if index contains unmerged entries" |
07432cef | 12722 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 12723 | |
a0b6b246 | 12724 | #: builtin/update-index.c:934 |
ef317cd5 | 12725 | msgid "refresh stat information" |
07432cef | 12726 | msgstr "刷新统计信息" |
ef317cd5 | 12727 | |
a0b6b246 | 12728 | #: builtin/update-index.c:938 |
ef317cd5 | 12729 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 12730 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 12731 | |
a0b6b246 | 12732 | #: builtin/update-index.c:942 |
6c94aba5 | 12733 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 12734 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 12735 | |
a0b6b246 | 12736 | #: builtin/update-index.c:943 |
ef317cd5 | 12737 | msgid "add the specified entry to the index" |
07432cef | 12738 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 12739 | |
a0b6b246 | 12740 | #: builtin/update-index.c:952 |
ef317cd5 | 12741 | msgid "mark files as \"not changing\"" |
07432cef | 12742 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 12743 | |
a0b6b246 | 12744 | #: builtin/update-index.c:955 |
ef317cd5 | 12745 | msgid "clear assumed-unchanged bit" |
07432cef | 12746 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 12747 | |
a0b6b246 | 12748 | #: builtin/update-index.c:958 |
ef317cd5 | 12749 | msgid "mark files as \"index-only\"" |
07432cef | 12750 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 12751 | |
a0b6b246 | 12752 | #: builtin/update-index.c:961 |
ef317cd5 | 12753 | msgid "clear skip-worktree bit" |
07432cef | 12754 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 12755 | |
a0b6b246 | 12756 | #: builtin/update-index.c:964 |
ef317cd5 | 12757 | msgid "add to index only; do not add content to object database" |
07432cef | 12758 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 12759 | |
a0b6b246 | 12760 | #: builtin/update-index.c:966 |
ef317cd5 | 12761 | msgid "remove named paths even if present in worktree" |
07432cef | 12762 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 12763 | |
a0b6b246 | 12764 | #: builtin/update-index.c:968 |
ef317cd5 | 12765 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 12766 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 12767 | |
a0b6b246 | 12768 | #: builtin/update-index.c:970 |
ef317cd5 | 12769 | msgid "read list of paths to be updated from standard input" |
07432cef | 12770 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 12771 | |
a0b6b246 | 12772 | #: builtin/update-index.c:974 |
ef317cd5 | 12773 | msgid "add entries from standard input to the index" |
07432cef | 12774 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 12775 | |
a0b6b246 | 12776 | #: builtin/update-index.c:978 |
ef317cd5 | 12777 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 12778 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 12779 | |
a0b6b246 | 12780 | #: builtin/update-index.c:982 |
ef317cd5 | 12781 | msgid "only update entries that differ from HEAD" |
07432cef | 12782 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 12783 | |
a0b6b246 | 12784 | #: builtin/update-index.c:986 |
ef317cd5 | 12785 | msgid "ignore files missing from worktree" |
07432cef | 12786 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 12787 | |
a0b6b246 | 12788 | #: builtin/update-index.c:989 |
ef317cd5 | 12789 | msgid "report actions to standard output" |
07432cef | 12790 | msgstr "在标准输出显示操作" |
ef317cd5 | 12791 | |
a0b6b246 | 12792 | #: builtin/update-index.c:991 |
ef317cd5 | 12793 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 12794 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 12795 | |
a0b6b246 | 12796 | #: builtin/update-index.c:995 |
ef317cd5 | 12797 | msgid "write index in this format" |
07432cef | 12798 | msgstr "以这种格式写入索引区" |
ef317cd5 | 12799 | |
a0b6b246 | 12800 | #: builtin/update-index.c:997 |
6acbf033 JX |
12801 | msgid "enable or disable split index" |
12802 | msgstr "启用或禁用索引拆分" | |
12803 | ||
a0b6b246 | 12804 | #: builtin/update-index.c:999 |
7aea43ff JX |
12805 | msgid "enable/disable untracked cache" |
12806 | msgstr "启用/禁用对未跟踪文件的缓存" | |
12807 | ||
a0b6b246 | 12808 | #: builtin/update-index.c:1001 |
276ceeaa JX |
12809 | msgid "test if the filesystem supports untracked cache" |
12810 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
12811 | ||
a0b6b246 | 12812 | #: builtin/update-index.c:1003 |
7aea43ff JX |
12813 | msgid "enable untracked cache without testing the filesystem" |
12814 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
12815 | ||
a0b6b246 JX |
12816 | #: builtin/update-index.c:1119 |
12817 | msgid "" | |
12818 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
12819 | "to disable the untracked cache" | |
275588f9 JX |
12820 | msgstr "" |
12821 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
12822 | "改它。" | |
a0b6b246 JX |
12823 | |
12824 | #: builtin/update-index.c:1123 | |
276ceeaa JX |
12825 | msgid "Untracked cache disabled" |
12826 | msgstr "缓存未跟踪文件被禁用" | |
12827 | ||
a0b6b246 JX |
12828 | #: builtin/update-index.c:1131 |
12829 | msgid "" | |
12830 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
12831 | "to enable the untracked cache" | |
275588f9 JX |
12832 | msgstr "" |
12833 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
12834 | "修改它。" | |
a0b6b246 JX |
12835 | |
12836 | #: builtin/update-index.c:1135 | |
276ceeaa JX |
12837 | #, c-format |
12838 | msgid "Untracked cache enabled for '%s'" | |
12839 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
12840 | ||
90314792 | 12841 | #: builtin/update-ref.c:9 |
814ff314 JX |
12842 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
12843 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 12844 | |
90314792 | 12845 | #: builtin/update-ref.c:10 |
814ff314 JX |
12846 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
12847 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
12848 | |
12849 | #: builtin/update-ref.c:11 | |
814ff314 JX |
12850 | msgid "git update-ref [<options>] --stdin [-z]" |
12851 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 12852 | |
1b7f4a34 | 12853 | #: builtin/update-ref.c:363 |
ef317cd5 | 12854 | msgid "delete the reference" |
07432cef | 12855 | msgstr "删除引用" |
ef317cd5 | 12856 | |
1b7f4a34 | 12857 | #: builtin/update-ref.c:365 |
ef317cd5 | 12858 | msgid "update <refname> not the one it points to" |
07432cef | 12859 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 12860 | |
1b7f4a34 | 12861 | #: builtin/update-ref.c:366 |
90314792 JX |
12862 | msgid "stdin has NUL-terminated arguments" |
12863 | msgstr "标准输入有以 NUL 字符终止的参数" | |
12864 | ||
1b7f4a34 | 12865 | #: builtin/update-ref.c:367 |
90314792 JX |
12866 | msgid "read updates from stdin" |
12867 | msgstr "从标准输入读取更新" | |
12868 | ||
ef317cd5 JX |
12869 | #: builtin/update-server-info.c:6 |
12870 | msgid "git update-server-info [--force]" | |
07432cef | 12871 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
12872 | |
12873 | #: builtin/update-server-info.c:14 | |
12874 | msgid "update the info files from scratch" | |
07432cef | 12875 | msgstr "从头开始更新文件信息" |
ef317cd5 | 12876 | |
6acbf033 | 12877 | #: builtin/verify-commit.c:17 |
814ff314 JX |
12878 | msgid "git verify-commit [-v | --verbose] <commit>..." |
12879 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 12880 | |
1b7f4a34 | 12881 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
12882 | msgid "print commit contents" |
12883 | msgstr "打印提交内容" | |
12884 | ||
5b04ee3b | 12885 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:35 |
1b7f4a34 JX |
12886 | msgid "print raw gpg status output" |
12887 | msgstr "打印原始 gpg 状态输出" | |
12888 | ||
220c313c | 12889 | #: builtin/verify-pack.c:54 |
814ff314 JX |
12890 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
12891 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 12892 | |
220c313c | 12893 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
12894 | msgid "verbose" |
12895 | msgstr "冗长输出" | |
12896 | ||
220c313c | 12897 | #: builtin/verify-pack.c:66 |
ef317cd5 | 12898 | msgid "show statistics only" |
07432cef | 12899 | msgstr "只显示统计" |
ef317cd5 JX |
12900 | |
12901 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
12902 | msgid "git verify-tag [-v | --verbose] <tag>..." |
12903 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 | 12904 | |
5b04ee3b | 12905 | #: builtin/verify-tag.c:34 |
ef317cd5 | 12906 | msgid "print tag contents" |
55a16ee4 | 12907 | msgstr "打印标签内容" |
ef317cd5 | 12908 | |
94550ed3 JX |
12909 | #: builtin/worktree.c:15 |
12910 | msgid "git worktree add [<options>] <path> [<branch>]" | |
12911 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 12912 | |
94550ed3 | 12913 | #: builtin/worktree.c:16 |
5c57d762 JX |
12914 | msgid "git worktree list [<options>]" |
12915 | msgstr "git worktree list [<选项>]" | |
12916 | ||
12917 | #: builtin/worktree.c:17 | |
12918 | msgid "git worktree lock [<options>] <path>" | |
12919 | msgstr "git worktree lock [<选项>] <路径>" | |
12920 | ||
12921 | #: builtin/worktree.c:18 | |
5bb01d4f JX |
12922 | msgid "git worktree prune [<options>]" |
12923 | msgstr "git worktree prune [<选项>]" | |
12924 | ||
5c57d762 JX |
12925 | #: builtin/worktree.c:19 |
12926 | msgid "git worktree unlock <path>" | |
12927 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 12928 | |
5c57d762 | 12929 | #: builtin/worktree.c:42 |
5bb01d4f JX |
12930 | #, c-format |
12931 | msgid "Removing worktrees/%s: not a valid directory" | |
12932 | msgstr "删除工作区/%s:不是一个有效的目录" | |
12933 | ||
5c57d762 | 12934 | #: builtin/worktree.c:48 |
5bb01d4f JX |
12935 | #, c-format |
12936 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
12937 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
12938 | ||
5c57d762 | 12939 | #: builtin/worktree.c:53 |
5bb01d4f JX |
12940 | #, c-format |
12941 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
12942 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
12943 | ||
5c57d762 | 12944 | #: builtin/worktree.c:64 |
5bb01d4f JX |
12945 | #, c-format |
12946 | msgid "Removing worktrees/%s: invalid gitdir file" | |
12947 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
12948 | ||
5c57d762 | 12949 | #: builtin/worktree.c:80 |
5bb01d4f JX |
12950 | #, c-format |
12951 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
12952 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
12953 | ||
5c57d762 | 12954 | #: builtin/worktree.c:204 |
5bb01d4f JX |
12955 | #, c-format |
12956 | msgid "'%s' already exists" | |
12957 | msgstr "'%s' 已经存在" | |
12958 | ||
5c57d762 | 12959 | #: builtin/worktree.c:236 |
5bb01d4f JX |
12960 | #, c-format |
12961 | msgid "could not create directory of '%s'" | |
12962 | msgstr "不能创建目录 '%s'" | |
12963 | ||
5c57d762 | 12964 | #: builtin/worktree.c:272 |
5bb01d4f | 12965 | #, c-format |
1b7f4a34 JX |
12966 | msgid "Preparing %s (identifier %s)" |
12967 | msgstr "准备 %s (标识符 %s)" | |
5bb01d4f | 12968 | |
5c57d762 | 12969 | #: builtin/worktree.c:323 |
5bb01d4f JX |
12970 | msgid "checkout <branch> even if already checked out in other worktree" |
12971 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
12972 | ||
5c57d762 | 12973 | #: builtin/worktree.c:325 |
5bb01d4f JX |
12974 | msgid "create a new branch" |
12975 | msgstr "创建一个新分支" | |
12976 | ||
5c57d762 | 12977 | #: builtin/worktree.c:327 |
5bb01d4f JX |
12978 | msgid "create or reset a branch" |
12979 | msgstr "创建或重置一个分支" | |
12980 | ||
5c57d762 | 12981 | #: builtin/worktree.c:329 |
5b04ee3b JX |
12982 | msgid "populate the new working tree" |
12983 | msgstr "生成新的工作区" | |
12984 | ||
5c57d762 | 12985 | #: builtin/worktree.c:337 |
1b7f4a34 JX |
12986 | msgid "-b, -B, and --detach are mutually exclusive" |
12987 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 12988 | |
5c57d762 JX |
12989 | #: builtin/worktree.c:470 |
12990 | msgid "reason for locking" | |
12991 | msgstr "锁定原因" | |
12992 | ||
12993 | #: builtin/worktree.c:482 builtin/worktree.c:515 | |
12994 | #, c-format | |
12995 | msgid "'%s' is not a working tree" | |
12996 | msgstr "'%s' 不是一个工作区" | |
12997 | ||
12998 | #: builtin/worktree.c:484 builtin/worktree.c:517 | |
12999 | msgid "The main working tree cannot be locked or unlocked" | |
13000 | msgstr "主工作区无法被加锁或解锁" | |
13001 | ||
13002 | #: builtin/worktree.c:489 | |
13003 | #, c-format | |
13004 | msgid "'%s' is already locked, reason: %s" | |
13005 | msgstr "'%s' 已被锁定,原因:%s" | |
13006 | ||
13007 | #: builtin/worktree.c:491 | |
13008 | #, c-format | |
13009 | msgid "'%s' is already locked" | |
13010 | msgstr "'%s' 已被锁定" | |
13011 | ||
13012 | #: builtin/worktree.c:519 | |
13013 | #, c-format | |
13014 | msgid "'%s' is not locked" | |
13015 | msgstr "'%s' 未被锁定" | |
13016 | ||
ef317cd5 JX |
13017 | #: builtin/write-tree.c:13 |
13018 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 13019 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
13020 | |
13021 | #: builtin/write-tree.c:26 | |
13022 | msgid "<prefix>/" | |
07432cef | 13023 | msgstr "<前缀>/" |
ef317cd5 JX |
13024 | |
13025 | #: builtin/write-tree.c:27 | |
13026 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 13027 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
13028 | |
13029 | #: builtin/write-tree.c:30 | |
13030 | msgid "only useful for debugging" | |
07432cef | 13031 | msgstr "只对调试有用" |
ef317cd5 | 13032 | |
a0b6b246 | 13033 | #: upload-pack.c:22 |
5c57d762 JX |
13034 | msgid "git upload-pack [<options>] <dir>" |
13035 | msgstr "git upload-pack [<选项>] <目录>" | |
13036 | ||
a0b6b246 | 13037 | #: upload-pack.c:1028 |
5c57d762 JX |
13038 | msgid "quit after a single request/response exchange" |
13039 | msgstr "在一次单独的请求/响应(request/response)交换后退出" | |
13040 | ||
a0b6b246 | 13041 | #: upload-pack.c:1030 |
5c57d762 JX |
13042 | msgid "exit immediately after initial ref advertisement" |
13043 | msgstr "在初始的引用广告后立即退出" | |
13044 | ||
a0b6b246 | 13045 | #: upload-pack.c:1032 |
5c57d762 JX |
13046 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" |
13047 | msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" | |
13048 | ||
a0b6b246 | 13049 | #: upload-pack.c:1034 |
5c57d762 JX |
13050 | msgid "interrupt transfer after <n> seconds of inactivity" |
13051 | msgstr "不活动 <n> 秒钟后终止传输" | |
13052 | ||
a0b6b246 JX |
13053 | #: credential-cache--daemon.c:223 |
13054 | #, c-format | |
13055 | msgid "" | |
13056 | "The permissions on your socket directory are too loose; other\n" | |
13057 | "users may be able to read your cached credentials. Consider running:\n" | |
13058 | "\n" | |
13059 | "\tchmod 0700 %s" | |
13060 | msgstr "" | |
13061 | "您 socket 目录权限过于放松,其他用户可能会读取您缓存的认证信息。考虑执行:\n" | |
13062 | "\n" | |
13063 | "\tchmod 0700 %s" | |
13064 | ||
5b04ee3b | 13065 | #: credential-cache--daemon.c:271 |
220c313c JX |
13066 | msgid "print debugging messages to stderr" |
13067 | msgstr "调试信息输出到标准错误" | |
13068 | ||
d9d56b23 | 13069 | #: git.c:14 |
4dcdc3d8 | 13070 | msgid "" |
220c313c | 13071 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
13072 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
13073 | "to read about a specific subcommand or concept." | |
13074 | msgstr "" | |
220c313c JX |
13075 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
13076 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
13077 | "帮助。" | |
8ada9598 | 13078 | |
a0b6b246 JX |
13079 | #: http.c:342 |
13080 | msgid "Delegation control is not supported with cURL < 7.22.0" | |
13081 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" | |
13082 | ||
13083 | #: http.c:351 | |
276ceeaa JX |
13084 | msgid "Public key pinning not supported with cURL < 7.44.0" |
13085 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
13086 | ||
1b7f4a34 | 13087 | #: common-cmds.h:9 |
7aea43ff JX |
13088 | msgid "start a working area (see also: git help tutorial)" |
13089 | msgstr "开始一个工作区(参见:git help tutorial)" | |
13090 | ||
1b7f4a34 | 13091 | #: common-cmds.h:10 |
7aea43ff JX |
13092 | msgid "work on the current change (see also: git help everyday)" |
13093 | msgstr "在当前变更上工作(参见:git help everyday)" | |
13094 | ||
1b7f4a34 | 13095 | #: common-cmds.h:11 |
7aea43ff JX |
13096 | msgid "examine the history and state (see also: git help revisions)" |
13097 | msgstr "检查历史和状态(参见:git help revisions)" | |
13098 | ||
1b7f4a34 | 13099 | #: common-cmds.h:12 |
7aea43ff JX |
13100 | msgid "grow, mark and tweak your common history" |
13101 | msgstr "扩展、标记和调校您的历史记录" | |
13102 | ||
1b7f4a34 | 13103 | #: common-cmds.h:13 |
7aea43ff JX |
13104 | msgid "collaborate (see also: git help workflows)" |
13105 | msgstr "协同(参见:git help workflows)" | |
13106 | ||
1b7f4a34 | 13107 | #: common-cmds.h:17 |
8ada9598 | 13108 | msgid "Add file contents to the index" |
81809b99 | 13109 | msgstr "添加文件内容至索引" |
8ada9598 | 13110 | |
1b7f4a34 JX |
13111 | #: common-cmds.h:18 |
13112 | msgid "Use binary search to find the commit that introduced a bug" | |
13113 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 13114 | |
1b7f4a34 | 13115 | #: common-cmds.h:19 |
8ada9598 | 13116 | msgid "List, create, or delete branches" |
81809b99 | 13117 | msgstr "列出、创建或删除分支" |
8ada9598 | 13118 | |
1b7f4a34 | 13119 | #: common-cmds.h:20 |
5bb01d4f JX |
13120 | msgid "Switch branches or restore working tree files" |
13121 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 13122 | |
1b7f4a34 | 13123 | #: common-cmds.h:21 |
8ada9598 | 13124 | msgid "Clone a repository into a new directory" |
160fb2b2 | 13125 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 13126 | |
1b7f4a34 | 13127 | #: common-cmds.h:22 |
8ada9598 | 13128 | msgid "Record changes to the repository" |
160fb2b2 | 13129 | msgstr "记录变更到仓库" |
8ada9598 | 13130 | |
1b7f4a34 | 13131 | #: common-cmds.h:23 |
8ada9598 | 13132 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 13133 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 13134 | |
1b7f4a34 | 13135 | #: common-cmds.h:24 |
8ada9598 | 13136 | msgid "Download objects and refs from another repository" |
160fb2b2 | 13137 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 13138 | |
1b7f4a34 | 13139 | #: common-cmds.h:25 |
8ada9598 | 13140 | msgid "Print lines matching a pattern" |
81809b99 | 13141 | msgstr "输出和模式匹配的行" |
8ada9598 | 13142 | |
1b7f4a34 | 13143 | #: common-cmds.h:26 |
a77c07d9 | 13144 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 13145 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 13146 | |
1b7f4a34 | 13147 | #: common-cmds.h:27 |
8ada9598 | 13148 | msgid "Show commit logs" |
81809b99 | 13149 | msgstr "显示提交日志" |
8ada9598 | 13150 | |
1b7f4a34 | 13151 | #: common-cmds.h:28 |
8ada9598 | 13152 | msgid "Join two or more development histories together" |
81809b99 | 13153 | msgstr "合并两个或更多开发历史" |
8ada9598 | 13154 | |
1b7f4a34 | 13155 | #: common-cmds.h:29 |
8ada9598 | 13156 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 13157 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 13158 | |
1b7f4a34 | 13159 | #: common-cmds.h:30 |
2e8451e8 | 13160 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 13161 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 13162 | |
1b7f4a34 | 13163 | #: common-cmds.h:31 |
8ada9598 | 13164 | msgid "Update remote refs along with associated objects" |
81809b99 | 13165 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 13166 | |
1b7f4a34 | 13167 | #: common-cmds.h:32 |
3495628d JX |
13168 | msgid "Reapply commits on top of another base tip" |
13169 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 13170 | |
1b7f4a34 | 13171 | #: common-cmds.h:33 |
8ada9598 | 13172 | msgid "Reset current HEAD to the specified state" |
4375c10e | 13173 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 13174 | |
1b7f4a34 | 13175 | #: common-cmds.h:34 |
8ada9598 | 13176 | msgid "Remove files from the working tree and from the index" |
81809b99 | 13177 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 13178 | |
1b7f4a34 | 13179 | #: common-cmds.h:35 |
8ada9598 | 13180 | msgid "Show various types of objects" |
81809b99 | 13181 | msgstr "显示各种类型的对象" |
8ada9598 | 13182 | |
1b7f4a34 | 13183 | #: common-cmds.h:36 |
8ada9598 | 13184 | msgid "Show the working tree status" |
81809b99 | 13185 | msgstr "显示工作区状态" |
8ada9598 | 13186 | |
1b7f4a34 | 13187 | #: common-cmds.h:37 |
8ada9598 | 13188 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 13189 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 13190 | |
1b7f4a34 | 13191 | #: parse-options.h:145 |
220c313c JX |
13192 | msgid "expiry-date" |
13193 | msgstr "到期时间" | |
13194 | ||
1b7f4a34 | 13195 | #: parse-options.h:160 |
220c313c JX |
13196 | msgid "no-op (backward compatibility)" |
13197 | msgstr "空操作(向后兼容)" | |
13198 | ||
a0b6b246 | 13199 | #: parse-options.h:238 |
220c313c JX |
13200 | msgid "be more verbose" |
13201 | msgstr "更加详细" | |
13202 | ||
a0b6b246 | 13203 | #: parse-options.h:240 |
220c313c JX |
13204 | msgid "be more quiet" |
13205 | msgstr "更加安静" | |
13206 | ||
a0b6b246 | 13207 | #: parse-options.h:246 |
220c313c JX |
13208 | msgid "use <n> digits to display SHA-1s" |
13209 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
13210 | ||
5b04ee3b | 13211 | #: rerere.h:40 |
220c313c JX |
13212 | msgid "update the index with reused conflict resolution if possible" |
13213 | msgstr "如果可能,重用冲突解决更新索引" | |
13214 | ||
5c57d762 | 13215 | #: git-bisect.sh:54 |
b694fbb1 JX |
13216 | msgid "You need to start by \"git bisect start\"" |
13217 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
13218 | ||
90e6ef53 | 13219 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
13220 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
13221 | #. translation. The program will only accept English input | |
13222 | #. at this point. | |
5c57d762 | 13223 | #: git-bisect.sh:60 |
c04f5ac3 JX |
13224 | msgid "Do you want me to do it for you [Y/n]? " |
13225 | msgstr "您想让我为您这样做么[Y/n]? " | |
13226 | ||
5c57d762 | 13227 | #: git-bisect.sh:121 |
c04f5ac3 JX |
13228 | #, sh-format |
13229 | msgid "unrecognised option: '$arg'" | |
81809b99 | 13230 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 13231 | |
5c57d762 | 13232 | #: git-bisect.sh:125 |
c04f5ac3 JX |
13233 | #, sh-format |
13234 | msgid "'$arg' does not appear to be a valid revision" | |
13235 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
13236 | ||
5c57d762 | 13237 | #: git-bisect.sh:154 |
c04f5ac3 JX |
13238 | msgid "Bad HEAD - I need a HEAD" |
13239 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
13240 | ||
5c57d762 | 13241 | #: git-bisect.sh:167 |
c04f5ac3 JX |
13242 | #, sh-format |
13243 | msgid "" | |
814ff314 | 13244 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 13245 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 13246 | |
5c57d762 | 13247 | #: git-bisect.sh:177 |
cfff71a9 JX |
13248 | msgid "won't bisect on cg-seek'ed tree" |
13249 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 13250 | |
5c57d762 | 13251 | #: git-bisect.sh:181 |
c04f5ac3 | 13252 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 13253 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 13254 | |
5c57d762 | 13255 | #: git-bisect.sh:233 |
c04f5ac3 JX |
13256 | #, sh-format |
13257 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 13258 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 13259 | |
5c57d762 | 13260 | #: git-bisect.sh:262 |
c04f5ac3 JX |
13261 | #, sh-format |
13262 | msgid "Bad rev input: $arg" | |
9a4b694c | 13263 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 13264 | |
5c57d762 JX |
13265 | #: git-bisect.sh:281 |
13266 | #, sh-format | |
13267 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 13268 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 13269 | |
94550ed3 | 13270 | #: git-bisect.sh:290 |
c04f5ac3 JX |
13271 | #, sh-format |
13272 | msgid "Bad rev input: $rev" | |
9a4b694c | 13273 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 13274 | |
94550ed3 | 13275 | #: git-bisect.sh:299 |
1b7f4a34 JX |
13276 | #, sh-format |
13277 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
13278 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
13279 | ||
94550ed3 | 13280 | #: git-bisect.sh:322 |
1b7f4a34 JX |
13281 | #, sh-format |
13282 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
13283 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 13284 | |
90e6ef53 | 13285 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
13286 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
13287 | #. translation. The program will only accept English input | |
13288 | #. at this point. | |
94550ed3 | 13289 | #: git-bisect.sh:328 |
c04f5ac3 JX |
13290 | msgid "Are you sure [Y/n]? " |
13291 | msgstr "您确认么[Y/n]? " | |
13292 | ||
94550ed3 | 13293 | #: git-bisect.sh:340 |
1b7f4a34 | 13294 | #, sh-format |
b694fbb1 | 13295 | msgid "" |
1b7f4a34 JX |
13296 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
13297 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
13298 | msgstr "" |
13299 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 13300 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 13301 | |
94550ed3 | 13302 | #: git-bisect.sh:343 |
1b7f4a34 | 13303 | #, sh-format |
b694fbb1 JX |
13304 | msgid "" |
13305 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
13306 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
13307 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
13308 | msgstr "" |
13309 | "您需要执行 \"git bisect start\" 来开始。\n" | |
13310 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 13311 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 13312 | |
94550ed3 | 13313 | #: git-bisect.sh:414 git-bisect.sh:546 |
b694fbb1 JX |
13314 | msgid "We are not bisecting." |
13315 | msgstr "我们没有在二分查找。" | |
13316 | ||
94550ed3 | 13317 | #: git-bisect.sh:421 |
c04f5ac3 JX |
13318 | #, sh-format |
13319 | msgid "'$invalid' is not a valid commit" | |
13320 | msgstr "'$invalid' 不是一个有效的提交" | |
13321 | ||
94550ed3 | 13322 | #: git-bisect.sh:430 |
c04f5ac3 JX |
13323 | #, sh-format |
13324 | msgid "" | |
13325 | "Could not check out original HEAD '$branch'.\n" | |
13326 | "Try 'git bisect reset <commit>'." | |
13327 | msgstr "" | |
13328 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 13329 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 13330 | |
94550ed3 | 13331 | #: git-bisect.sh:458 |
c04f5ac3 JX |
13332 | msgid "No logfile given" |
13333 | msgstr "未提供日志文件" | |
13334 | ||
94550ed3 | 13335 | #: git-bisect.sh:459 |
c04f5ac3 JX |
13336 | #, sh-format |
13337 | msgid "cannot read $file for replaying" | |
13338 | msgstr "不能读取 $file 来重放" | |
13339 | ||
94550ed3 | 13340 | #: git-bisect.sh:480 |
c04f5ac3 JX |
13341 | msgid "?? what are you talking about?" |
13342 | msgstr "?? 您在说什么?" | |
13343 | ||
94550ed3 | 13344 | #: git-bisect.sh:492 |
b694fbb1 JX |
13345 | #, sh-format |
13346 | msgid "running $command" | |
13347 | msgstr "运行 $command" | |
13348 | ||
94550ed3 | 13349 | #: git-bisect.sh:499 |
b694fbb1 JX |
13350 | #, sh-format |
13351 | msgid "" | |
13352 | "bisect run failed:\n" | |
13353 | "exit code $res from '$command' is < 0 or >= 128" | |
13354 | msgstr "" | |
13355 | "二分查找运行失败:\n" | |
07432cef | 13356 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 13357 | |
94550ed3 | 13358 | #: git-bisect.sh:525 |
b694fbb1 JX |
13359 | msgid "bisect run cannot continue any more" |
13360 | msgstr "二分查找不能继续运行" | |
13361 | ||
94550ed3 | 13362 | #: git-bisect.sh:531 |
b694fbb1 JX |
13363 | #, sh-format |
13364 | msgid "" | |
13365 | "bisect run failed:\n" | |
13366 | "'bisect_state $state' exited with error code $res" | |
13367 | msgstr "" | |
13368 | "二分查找运行失败:\n" | |
13369 | "'bisect_state $state' 退出码为 $res" | |
13370 | ||
94550ed3 | 13371 | #: git-bisect.sh:538 |
b694fbb1 JX |
13372 | msgid "bisect run success" |
13373 | msgstr "二分查找运行成功" | |
c04f5ac3 | 13374 | |
94550ed3 JX |
13375 | #: git-bisect.sh:565 |
13376 | msgid "please use two different terms" | |
13377 | msgstr "请使用两个不同的术语" | |
13378 | ||
13379 | #: git-bisect.sh:575 | |
13380 | #, sh-format | |
13381 | msgid "'$term' is not a valid term" | |
13382 | msgstr "'$term' 不是一个有效的名称" | |
13383 | ||
13384 | #: git-bisect.sh:578 | |
13385 | #, sh-format | |
13386 | msgid "can't use the builtin command '$term' as a term" | |
13387 | msgstr "不能使用内置命令 '$term' 作为术语" | |
13388 | ||
13389 | #: git-bisect.sh:587 git-bisect.sh:593 | |
13390 | #, sh-format | |
13391 | msgid "can't change the meaning of term '$term'" | |
13392 | msgstr "不能修改术语 '$term' 的含义" | |
13393 | ||
13394 | #: git-bisect.sh:606 | |
b694fbb1 | 13395 | #, sh-format |
1b7f4a34 JX |
13396 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
13397 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 13398 | |
94550ed3 JX |
13399 | #: git-bisect.sh:636 |
13400 | msgid "no terms defined" | |
13401 | msgstr "未定义术语" | |
13402 | ||
13403 | #: git-bisect.sh:653 | |
13404 | #, sh-format | |
13405 | msgid "" | |
13406 | "invalid argument $arg for 'git bisect terms'.\n" | |
13407 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
13408 | msgstr "" | |
13409 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
13410 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
13411 | ||
5c57d762 JX |
13412 | #: git-merge-octopus.sh:46 |
13413 | msgid "" | |
13414 | "Error: Your local changes to the following files would be overwritten by " | |
13415 | "merge" | |
13416 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
13417 | ||
13418 | #: git-merge-octopus.sh:61 | |
13419 | msgid "Automated merge did not work." | |
9a4b694c | 13420 | msgstr "自动合并未生效。" |
5c57d762 JX |
13421 | |
13422 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 13423 | msgid "Should not be doing an octopus." |
5c57d762 JX |
13424 | msgstr "不应该执行章鱼式合并。" |
13425 | ||
13426 | #: git-merge-octopus.sh:73 | |
13427 | #, sh-format | |
13428 | msgid "Unable to find common commit with $pretty_name" | |
13429 | msgstr "无法找到和 $pretty_name 的基线提交" | |
13430 | ||
13431 | #: git-merge-octopus.sh:77 | |
13432 | #, sh-format | |
13433 | msgid "Already up-to-date with $pretty_name" | |
13434 | msgstr "已经和 $pretty_name 保持一致" | |
13435 | ||
13436 | #: git-merge-octopus.sh:89 | |
13437 | #, sh-format | |
13438 | msgid "Fast-forwarding to: $pretty_name" | |
13439 | msgstr "快进至:$pretty_name" | |
13440 | ||
13441 | #: git-merge-octopus.sh:97 | |
13442 | #, sh-format | |
13443 | msgid "Trying simple merge with $pretty_name" | |
13444 | msgstr "尝试和 $pretty_name 的简单合并" | |
13445 | ||
13446 | #: git-merge-octopus.sh:102 | |
13447 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 13448 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 JX |
13449 | |
13450 | #: git-rebase.sh:56 | |
649900bc JX |
13451 | msgid "" |
13452 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
13453 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
13454 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
13455 | "\"." | |
13456 | msgstr "" | |
13457 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
13458 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
13459 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
13460 | ||
5c57d762 JX |
13461 | #: git-rebase.sh:156 git-rebase.sh:395 |
13462 | #, sh-format | |
13463 | msgid "Could not move back to $head_name" | |
13464 | msgstr "无法移回 $head_name" | |
13465 | ||
13466 | #: git-rebase.sh:167 | |
2e8451e8 JX |
13467 | msgid "Applied autostash." |
13468 | msgstr "成功应用 autostash。" | |
13469 | ||
5c57d762 | 13470 | #: git-rebase.sh:170 |
2e8451e8 JX |
13471 | #, sh-format |
13472 | msgid "Cannot store $stash_sha1" | |
13473 | msgstr "无法保存 $stash_sha1" | |
13474 | ||
5c57d762 | 13475 | #: git-rebase.sh:171 |
2e8451e8 JX |
13476 | msgid "" |
13477 | "Applying autostash resulted in conflicts.\n" | |
13478 | "Your changes are safe in the stash.\n" | |
b1894384 | 13479 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
13480 | msgstr "" |
13481 | "应用 autostash 导致冲突。\n" | |
13482 | "您的修改安全地保存在 stash 中。\n" | |
13483 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
13484 | ||
5c57d762 | 13485 | #: git-rebase.sh:210 |
649900bc | 13486 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 13487 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 13488 | |
5c57d762 | 13489 | #: git-rebase.sh:215 |
649900bc JX |
13490 | msgid "It looks like git-am is in progress. Cannot rebase." |
13491 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
13492 | ||
5c57d762 | 13493 | #: git-rebase.sh:356 |
649900bc JX |
13494 | msgid "No rebase in progress?" |
13495 | msgstr "没有正在进行的变基?" | |
13496 | ||
5c57d762 | 13497 | #: git-rebase.sh:367 |
07432cef WS |
13498 | msgid "The --edit-todo action can only be used during interactive rebase." |
13499 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
13500 | ||
5c57d762 | 13501 | #: git-rebase.sh:374 |
649900bc JX |
13502 | msgid "Cannot read HEAD" |
13503 | msgstr "不能读取 HEAD" | |
13504 | ||
5c57d762 | 13505 | #: git-rebase.sh:377 |
649900bc JX |
13506 | msgid "" |
13507 | "You must edit all merge conflicts and then\n" | |
13508 | "mark them as resolved using git add" | |
13509 | msgstr "" | |
13510 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
13511 | "命令将它们标记为已解决" | |
13512 | ||
5c57d762 | 13513 | #: git-rebase.sh:414 |
649900bc JX |
13514 | #, sh-format |
13515 | msgid "" | |
13516 | "It seems that there is already a $state_dir_base directory, and\n" | |
13517 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
13518 | "case, please try\n" | |
13519 | "\t$cmd_live_rebase\n" | |
13520 | "If that is not the case, please\n" | |
13521 | "\t$cmd_clear_stale_rebase\n" | |
13522 | "and run me again. I am stopping in case you still have something\n" | |
13523 | "valuable there." | |
13524 | msgstr "" | |
98b2761d JX |
13525 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
13526 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
13527 | "\t$cmd_live_rebase\n" |
13528 | "如果不是这样,请执行\n" | |
13529 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 13530 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 13531 | |
5c57d762 | 13532 | #: git-rebase.sh:465 |
649900bc JX |
13533 | #, sh-format |
13534 | msgid "invalid upstream $upstream_name" | |
13535 | msgstr "无效的上游 $upstream_name" | |
13536 | ||
5c57d762 | 13537 | #: git-rebase.sh:489 |
649900bc JX |
13538 | #, sh-format |
13539 | msgid "$onto_name: there are more than one merge bases" | |
13540 | msgstr "$onto_name: 有一个以上的合并基准" | |
13541 | ||
5c57d762 | 13542 | #: git-rebase.sh:492 git-rebase.sh:496 |
649900bc JX |
13543 | #, sh-format |
13544 | msgid "$onto_name: there is no merge base" | |
13545 | msgstr "$onto_name: 没有合并基准" | |
13546 | ||
5c57d762 | 13547 | #: git-rebase.sh:501 |
649900bc JX |
13548 | #, sh-format |
13549 | msgid "Does not point to a valid commit: $onto_name" | |
13550 | msgstr "没有指向一个有效的提交:$onto_name" | |
13551 | ||
5c57d762 | 13552 | #: git-rebase.sh:524 |
649900bc JX |
13553 | #, sh-format |
13554 | msgid "fatal: no such branch: $branch_name" | |
13555 | msgstr "严重错误:无此分支:$branch_name" | |
13556 | ||
5c57d762 | 13557 | #: git-rebase.sh:557 |
2e8451e8 JX |
13558 | msgid "Cannot autostash" |
13559 | msgstr "无法 autostash" | |
13560 | ||
5c57d762 | 13561 | #: git-rebase.sh:562 |
2e8451e8 JX |
13562 | #, sh-format |
13563 | msgid "Created autostash: $stash_abbrev" | |
13564 | msgstr "创建了 autostash: $stash_abbrev" | |
13565 | ||
5c57d762 | 13566 | #: git-rebase.sh:566 |
649900bc JX |
13567 | msgid "Please commit or stash them." |
13568 | msgstr "请提交或为它们保存进度。" | |
13569 | ||
5c57d762 | 13570 | #: git-rebase.sh:586 |
649900bc JX |
13571 | #, sh-format |
13572 | msgid "Current branch $branch_name is up to date." | |
13573 | msgstr "当前分支 $branch_name 是最新的。" | |
13574 | ||
5c57d762 | 13575 | #: git-rebase.sh:590 |
649900bc JX |
13576 | #, sh-format |
13577 | msgid "Current branch $branch_name is up to date, rebase forced." | |
13578 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
13579 | ||
5c57d762 | 13580 | #: git-rebase.sh:601 |
649900bc JX |
13581 | #, sh-format |
13582 | msgid "Changes from $mb to $onto:" | |
13583 | msgstr "变更从 $mb 到 $onto:" | |
13584 | ||
5c57d762 | 13585 | #: git-rebase.sh:610 |
649900bc | 13586 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 13587 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 13588 | |
5c57d762 | 13589 | #: git-rebase.sh:620 |
649900bc JX |
13590 | #, sh-format |
13591 | msgid "Fast-forwarded $branch_name to $onto_name." | |
13592 | msgstr "快进 $branch_name 至 $onto_name。" | |
13593 | ||
5c57d762 | 13594 | #: git-stash.sh:50 |
c04f5ac3 JX |
13595 | msgid "git stash clear with parameters is unimplemented" |
13596 | msgstr "git stash clear 不支持参数" | |
13597 | ||
5c57d762 | 13598 | #: git-stash.sh:73 |
c04f5ac3 JX |
13599 | msgid "You do not have the initial commit yet" |
13600 | msgstr "您尚未建立初始提交" | |
13601 | ||
5c57d762 | 13602 | #: git-stash.sh:88 |
c04f5ac3 | 13603 | msgid "Cannot save the current index state" |
90e6ef53 | 13604 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 13605 | |
a0b6b246 JX |
13606 | #: git-stash.sh:103 |
13607 | msgid "Cannot save the untracked files" | |
13608 | msgstr "无法保存未跟踪文件" | |
13609 | ||
5c57d762 | 13610 | #: git-stash.sh:123 git-stash.sh:136 |
c04f5ac3 JX |
13611 | msgid "Cannot save the current worktree state" |
13612 | msgstr "无法保存当前工作区状态" | |
13613 | ||
5c57d762 | 13614 | #: git-stash.sh:140 |
c04f5ac3 | 13615 | msgid "No changes selected" |
90e6ef53 | 13616 | msgstr "没有选择变更" |
c04f5ac3 | 13617 | |
5c57d762 | 13618 | #: git-stash.sh:143 |
c04f5ac3 | 13619 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 13620 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 13621 | |
5c57d762 | 13622 | #: git-stash.sh:156 |
c04f5ac3 JX |
13623 | msgid "Cannot record working tree state" |
13624 | msgstr "不能记录工作区状态" | |
13625 | ||
5c57d762 | 13626 | #: git-stash.sh:188 |
2e8451e8 JX |
13627 | #, sh-format |
13628 | msgid "Cannot update $ref_stash with $w_commit" | |
13629 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
13630 | ||
b694fbb1 JX |
13631 | #. TRANSLATORS: $option is an invalid option, like |
13632 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
13633 | #. second line correspond to "error: ". So you should line | |
13634 | #. up the second line with however many characters the | |
13635 | #. translation of "error: " takes in your language. E.g. in | |
13636 | #. English this is: | |
13637 | #. | |
13638 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
13639 | #. error: unknown option for 'stash save': --blah-blah | |
13640 | #. To provide a message, use git stash save -- '--blah-blah' | |
5c57d762 | 13641 | #: git-stash.sh:238 |
b694fbb1 JX |
13642 | #, sh-format |
13643 | msgid "" | |
13644 | "error: unknown option for 'stash save': $option\n" | |
13645 | " To provide a message, use git stash save -- '$option'" | |
13646 | msgstr "" | |
13647 | "错误:'stash save' 的未知选项:$option\n" | |
13648 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
13649 | ||
a0b6b246 JX |
13650 | #: git-stash.sh:251 |
13651 | msgid "Can't use --patch and --include-untracked or --all at the same time" | |
13652 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
13653 | ||
5c57d762 | 13654 | #: git-stash.sh:259 |
c04f5ac3 JX |
13655 | msgid "No local changes to save" |
13656 | msgstr "没有要保存的本地修改" | |
13657 | ||
5c57d762 | 13658 | #: git-stash.sh:263 |
c04f5ac3 | 13659 | msgid "Cannot initialize stash" |
90e6ef53 | 13660 | msgstr "无法初始化 stash" |
c04f5ac3 | 13661 | |
5c57d762 | 13662 | #: git-stash.sh:267 |
c04f5ac3 JX |
13663 | msgid "Cannot save the current status" |
13664 | msgstr "无法保存当前状态" | |
13665 | ||
5c57d762 JX |
13666 | #: git-stash.sh:268 |
13667 | #, sh-format | |
13668 | msgid "Saved working directory and index state $stash_msg" | |
13669 | msgstr "保存工作目录和索引状态 $stash_msg" | |
13670 | ||
13671 | #: git-stash.sh:285 | |
c04f5ac3 JX |
13672 | msgid "Cannot remove worktree changes" |
13673 | msgstr "无法删除工作区变更" | |
13674 | ||
a0b6b246 | 13675 | #: git-stash.sh:403 |
7aea43ff JX |
13676 | #, sh-format |
13677 | msgid "unknown option: $opt" | |
13678 | msgstr "未知选项: $opt" | |
13679 | ||
a0b6b246 | 13680 | #: git-stash.sh:416 |
c04f5ac3 | 13681 | msgid "No stash found." |
90e6ef53 | 13682 | msgstr "未发现 stash。" |
c04f5ac3 | 13683 | |
a0b6b246 | 13684 | #: git-stash.sh:423 |
c04f5ac3 JX |
13685 | #, sh-format |
13686 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 13687 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 13688 | |
a0b6b246 | 13689 | #: git-stash.sh:438 |
c04f5ac3 | 13690 | #, sh-format |
220c313c JX |
13691 | msgid "$reference is not a valid reference" |
13692 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 13693 | |
a0b6b246 | 13694 | #: git-stash.sh:466 |
c04f5ac3 JX |
13695 | #, sh-format |
13696 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 13697 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 13698 | |
a0b6b246 | 13699 | #: git-stash.sh:477 |
c04f5ac3 JX |
13700 | #, sh-format |
13701 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 13702 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 13703 | |
a0b6b246 | 13704 | #: git-stash.sh:485 |
c04f5ac3 | 13705 | msgid "unable to refresh index" |
90e6ef53 | 13706 | msgstr "无法刷新索引" |
c04f5ac3 | 13707 | |
a0b6b246 | 13708 | #: git-stash.sh:489 |
c04f5ac3 JX |
13709 | msgid "Cannot apply a stash in the middle of a merge" |
13710 | msgstr "无法在合并过程中恢复进度" | |
13711 | ||
a0b6b246 | 13712 | #: git-stash.sh:497 |
c04f5ac3 | 13713 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 13714 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 13715 | |
a0b6b246 | 13716 | #: git-stash.sh:499 |
c04f5ac3 | 13717 | msgid "Could not save index tree" |
90e6ef53 | 13718 | msgstr "不能保存索引树" |
c04f5ac3 | 13719 | |
a0b6b246 JX |
13720 | #: git-stash.sh:508 |
13721 | msgid "Could not restore untracked files from stash" | |
13722 | msgstr "无法从进度保存中恢复未跟踪文件" | |
13723 | ||
13724 | #: git-stash.sh:533 | |
c04f5ac3 | 13725 | msgid "Cannot unstage modified files" |
160fb2b2 | 13726 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 13727 | |
a0b6b246 | 13728 | #: git-stash.sh:548 |
b694fbb1 JX |
13729 | msgid "Index was not unstashed." |
13730 | msgstr "索引的进度没有被恢复。" | |
13731 | ||
a0b6b246 | 13732 | #: git-stash.sh:562 |
5c57d762 | 13733 | msgid "The stash is kept in case you need it again." |
9a4b694c | 13734 | msgstr "暂存被保留以备您再次需要。" |
5c57d762 | 13735 | |
a0b6b246 | 13736 | #: git-stash.sh:571 |
c04f5ac3 JX |
13737 | #, sh-format |
13738 | msgid "Dropped ${REV} ($s)" | |
13739 | msgstr "丢弃了 ${REV} ($s)" | |
13740 | ||
a0b6b246 | 13741 | #: git-stash.sh:572 |
c04f5ac3 JX |
13742 | #, sh-format |
13743 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 13744 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 13745 | |
a0b6b246 | 13746 | #: git-stash.sh:580 |
c04f5ac3 JX |
13747 | msgid "No branch name specified" |
13748 | msgstr "未指定分支名" | |
13749 | ||
a0b6b246 | 13750 | #: git-stash.sh:652 |
c04f5ac3 JX |
13751 | msgid "(To restore them type \"git stash apply\")" |
13752 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
13753 | ||
a0b6b246 | 13754 | #: git-submodule.sh:184 |
2e8451e8 JX |
13755 | msgid "Relative path can only be used from the toplevel of the working tree" |
13756 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
13757 | ||
a0b6b246 | 13758 | #: git-submodule.sh:194 |
c04f5ac3 JX |
13759 | #, sh-format |
13760 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 13761 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 13762 | |
a0b6b246 | 13763 | #: git-submodule.sh:211 |
c04f5ac3 | 13764 | #, sh-format |
170e9899 JX |
13765 | msgid "'$sm_path' already exists in the index" |
13766 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 13767 | |
a0b6b246 | 13768 | #: git-submodule.sh:215 |
b694fbb1 JX |
13769 | #, sh-format |
13770 | msgid "" | |
13771 | "The following path is ignored by one of your .gitignore files:\n" | |
13772 | "$sm_path\n" | |
13773 | "Use -f if you really want to add it." | |
13774 | msgstr "" | |
13775 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
13776 | "$sm_path\n" | |
13777 | "如果您确实想添加它,使用 -f 参数。" | |
13778 | ||
a0b6b246 | 13779 | #: git-submodule.sh:233 |
b694fbb1 JX |
13780 | #, sh-format |
13781 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 13782 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 13783 | |
a0b6b246 | 13784 | #: git-submodule.sh:235 |
c04f5ac3 | 13785 | #, sh-format |
170e9899 | 13786 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 13787 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 13788 | |
a0b6b246 | 13789 | #: git-submodule.sh:243 |
07432cef WS |
13790 | #, sh-format |
13791 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 13792 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 13793 | |
a0b6b246 | 13794 | #: git-submodule.sh:245 |
07432cef WS |
13795 | #, sh-format |
13796 | msgid "" | |
5c57d762 JX |
13797 | "If you want to reuse this local git directory instead of cloning again from\n" |
13798 | " $realrepo\n" | |
13799 | "use the '--force' option. If the local git directory is not the correct " | |
13800 | "repo\n" | |
07432cef WS |
13801 | "or you are unsure what this means choose another name with the '--name' " |
13802 | "option." | |
5c57d762 JX |
13803 | msgstr "" |
13804 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
13805 | " $realrepo\n" | |
13806 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
13807 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 13808 | |
a0b6b246 | 13809 | #: git-submodule.sh:251 |
07432cef WS |
13810 | #, sh-format |
13811 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
13812 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
13813 | ||
a0b6b246 | 13814 | #: git-submodule.sh:263 |
c04f5ac3 | 13815 | #, sh-format |
170e9899 JX |
13816 | msgid "Unable to checkout submodule '$sm_path'" |
13817 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 13818 | |
a0b6b246 | 13819 | #: git-submodule.sh:268 |
c04f5ac3 | 13820 | #, sh-format |
170e9899 JX |
13821 | msgid "Failed to add submodule '$sm_path'" |
13822 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 13823 | |
a0b6b246 | 13824 | #: git-submodule.sh:277 |
c04f5ac3 | 13825 | #, sh-format |
170e9899 JX |
13826 | msgid "Failed to register submodule '$sm_path'" |
13827 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 13828 | |
a0b6b246 | 13829 | #: git-submodule.sh:324 |
c04f5ac3 | 13830 | #, sh-format |
5b04ee3b JX |
13831 | msgid "Entering '$displaypath'" |
13832 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 13833 | |
a0b6b246 | 13834 | #: git-submodule.sh:344 |
c04f5ac3 | 13835 | #, sh-format |
5b04ee3b | 13836 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 13837 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 13838 | |
a0b6b246 | 13839 | #: git-submodule.sh:415 |
c04f5ac3 | 13840 | #, sh-format |
5b04ee3b JX |
13841 | msgid "pathspec and --all are incompatible" |
13842 | msgstr "pathspec 和 --all 不兼容" | |
c04f5ac3 | 13843 | |
a0b6b246 | 13844 | #: git-submodule.sh:420 |
c04f5ac3 | 13845 | #, sh-format |
5b04ee3b | 13846 | msgid "Use '--all' if you really want to deinitialize all submodules" |
aef18cc6 | 13847 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" |
1003b3a5 | 13848 | |
a0b6b246 | 13849 | #: git-submodule.sh:440 |
1003b3a5 JX |
13850 | #, sh-format |
13851 | msgid "" | |
5c57d762 | 13852 | "Submodule work tree '$displaypath' contains a .git directory\n" |
1003b3a5 | 13853 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
5c57d762 JX |
13854 | msgstr "" |
13855 | "子模组工作区 '$displaypath' 包含一个 .git 目录\n" | |
9a4b694c | 13856 | "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)" |
1003b3a5 | 13857 | |
a0b6b246 | 13858 | #: git-submodule.sh:448 |
c04f5ac3 JX |
13859 | #, sh-format |
13860 | msgid "" | |
2e8451e8 | 13861 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 13862 | "discard them" |
2e8451e8 | 13863 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 13864 | |
a0b6b246 | 13865 | #: git-submodule.sh:451 |
1003b3a5 | 13866 | #, sh-format |
2e8451e8 JX |
13867 | msgid "Cleared directory '$displaypath'" |
13868 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 13869 | |
a0b6b246 | 13870 | #: git-submodule.sh:452 |
1003b3a5 | 13871 | #, sh-format |
2e8451e8 JX |
13872 | msgid "Could not remove submodule work tree '$displaypath'" |
13873 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 13874 | |
a0b6b246 | 13875 | #: git-submodule.sh:455 |
1003b3a5 | 13876 | #, sh-format |
2e8451e8 JX |
13877 | msgid "Could not create empty submodule directory '$displaypath'" |
13878 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 13879 | |
a0b6b246 | 13880 | #: git-submodule.sh:464 |
1003b3a5 | 13881 | #, sh-format |
2e8451e8 JX |
13882 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
13883 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 13884 | |
a0b6b246 | 13885 | #: git-submodule.sh:617 |
c04f5ac3 | 13886 | #, sh-format |
2e8451e8 JX |
13887 | msgid "Unable to find current revision in submodule path '$displaypath'" |
13888 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 13889 | |
a0b6b246 | 13890 | #: git-submodule.sh:627 |
c04f5ac3 | 13891 | #, sh-format |
170e9899 JX |
13892 | msgid "Unable to fetch in submodule path '$sm_path'" |
13893 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 13894 | |
a0b6b246 | 13895 | #: git-submodule.sh:632 |
5c57d762 JX |
13896 | #, sh-format |
13897 | msgid "" | |
13898 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
13899 | "'$sm_path'" | |
9a4b694c | 13900 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 13901 | |
a0b6b246 | 13902 | #: git-submodule.sh:650 |
2e8451e8 JX |
13903 | #, sh-format |
13904 | msgid "Unable to fetch in submodule path '$displaypath'" | |
13905 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
13906 | ||
a0b6b246 | 13907 | #: git-submodule.sh:656 |
5c57d762 JX |
13908 | #, sh-format |
13909 | msgid "" | |
13910 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
13911 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
13912 | msgstr "" |
13913 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 13914 | |
a0b6b246 | 13915 | #: git-submodule.sh:663 |
6c94aba5 JX |
13916 | #, sh-format |
13917 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
13918 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
13919 | ||
a0b6b246 | 13920 | #: git-submodule.sh:664 |
c04f5ac3 | 13921 | #, sh-format |
6c94aba5 JX |
13922 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
13923 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
13924 | ||
a0b6b246 | 13925 | #: git-submodule.sh:668 |
6c94aba5 | 13926 | #, sh-format |
2e8451e8 JX |
13927 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
13928 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 13929 | |
a0b6b246 | 13930 | #: git-submodule.sh:669 |
c04f5ac3 | 13931 | #, sh-format |
2e8451e8 JX |
13932 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
13933 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 13934 | |
a0b6b246 | 13935 | #: git-submodule.sh:674 |
c04f5ac3 | 13936 | #, sh-format |
2e8451e8 JX |
13937 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
13938 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 13939 | |
a0b6b246 | 13940 | #: git-submodule.sh:675 |
c04f5ac3 | 13941 | #, sh-format |
2e8451e8 JX |
13942 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
13943 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 13944 | |
a0b6b246 | 13945 | #: git-submodule.sh:680 |
c04f5ac3 | 13946 | #, sh-format |
5b04ee3b JX |
13947 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
13948 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 13949 | |
a0b6b246 | 13950 | #: git-submodule.sh:681 |
c04f5ac3 | 13951 | #, sh-format |
5b04ee3b | 13952 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 13953 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 13954 | |
a0b6b246 | 13955 | #: git-submodule.sh:712 |
2e8451e8 JX |
13956 | #, sh-format |
13957 | msgid "Failed to recurse into submodule path '$displaypath'" | |
13958 | msgstr "无法递归进子模组路径 '$displaypath'" | |
13959 | ||
a0b6b246 | 13960 | #: git-submodule.sh:820 |
649900bc JX |
13961 | msgid "The --cached option cannot be used with the --files option" |
13962 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 13963 | |
a0b6b246 | 13964 | #: git-submodule.sh:872 |
b694fbb1 JX |
13965 | #, sh-format |
13966 | msgid "unexpected mode $mod_dst" | |
13967 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 13968 | |
90e6ef53 | 13969 | # 译者:注意保持前导空格 |
a0b6b246 | 13970 | #: git-submodule.sh:892 |
c04f5ac3 | 13971 | #, sh-format |
2e8451e8 JX |
13972 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
13973 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 13974 | |
90e6ef53 | 13975 | # 译者:注意保持前导空格 |
a0b6b246 | 13976 | #: git-submodule.sh:895 |
c04f5ac3 | 13977 | #, sh-format |
2e8451e8 JX |
13978 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
13979 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 13980 | |
90e6ef53 | 13981 | # 译者:注意保持前导空格 |
a0b6b246 | 13982 | #: git-submodule.sh:898 |
c04f5ac3 | 13983 | #, sh-format |
2e8451e8 JX |
13984 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
13985 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 13986 | |
a0b6b246 | 13987 | #: git-submodule.sh:1045 |
1003b3a5 JX |
13988 | #, sh-format |
13989 | msgid "Failed to recurse into submodule path '$sm_path'" | |
13990 | msgstr "无法递归进子模组路径 '$sm_path'" | |
13991 | ||
a0b6b246 | 13992 | #: git-submodule.sh:1112 |
c04f5ac3 | 13993 | #, sh-format |
2e8451e8 JX |
13994 | msgid "Synchronizing submodule url for '$displaypath'" |
13995 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 13996 | |
5b04ee3b JX |
13997 | #: git-parse-remote.sh:89 |
13998 | #, sh-format | |
13999 | msgid "See git-${cmd}(1) for details." | |
14000 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 JX |
14001 | |
14002 | #: git-rebase--interactive.sh:131 | |
14003 | #, sh-format | |
14004 | msgid "Rebasing ($new_count/$total)" | |
14005 | msgstr "变基中($new_count/$total)" | |
14006 | ||
14007 | #: git-rebase--interactive.sh:147 | |
14008 | msgid "" | |
14009 | "\n" | |
14010 | "Commands:\n" | |
14011 | " p, pick = use commit\n" | |
14012 | " r, reword = use commit, but edit the commit message\n" | |
14013 | " e, edit = use commit, but stop for amending\n" | |
14014 | " s, squash = use commit, but meld into previous commit\n" | |
14015 | " f, fixup = like \"squash\", but discard this commit's log message\n" | |
14016 | " x, exec = run command (the rest of the line) using shell\n" | |
14017 | " d, drop = remove commit\n" | |
14018 | "\n" | |
14019 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
14020 | msgstr "" | |
14021 | "\n" | |
14022 | "命令:\n" | |
14023 | " p, pick = 使用提交\n" | |
14024 | " r, reword = 使用提交,但修改提交说明\n" | |
14025 | " e, edit = 使用提交,但停止以便进行提交修补\n" | |
14026 | " s, squash = 使用提交,但和前一个版本融合\n" | |
14027 | " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n" | |
14028 | " x, exec = 使用 shell 运行命令(此行剩余部分)\n" | |
14029 | " d, drop = 删除提交\n" | |
14030 | "\n" | |
9a4b694c | 14031 | "这些行可以被重新排序;它们会被从上至下地执行。\n" |
5c57d762 JX |
14032 | "\n" |
14033 | ||
14034 | #: git-rebase--interactive.sh:162 | |
14035 | msgid "" | |
14036 | "\n" | |
14037 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
a0b6b246 JX |
14038 | msgstr "" |
14039 | "\n" | |
14040 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5c57d762 JX |
14041 | |
14042 | #: git-rebase--interactive.sh:166 | |
14043 | msgid "" | |
14044 | "\n" | |
14045 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
a0b6b246 JX |
14046 | msgstr "" |
14047 | "\n" | |
14048 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5c57d762 JX |
14049 | |
14050 | #: git-rebase--interactive.sh:202 | |
14051 | #, sh-format | |
14052 | msgid "" | |
14053 | "You can amend the commit now, with\n" | |
14054 | "\n" | |
14055 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
14056 | "\n" | |
14057 | "Once you are satisfied with your changes, run\n" | |
14058 | "\n" | |
14059 | "\tgit rebase --continue" | |
14060 | msgstr "" | |
14061 | "您现在可以修补这个提交,使用\n" | |
14062 | "\n" | |
14063 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
14064 | "\n" | |
9a4b694c | 14065 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
14066 | "\n" |
14067 | "\tgit rebase --continue" | |
14068 | ||
14069 | #: git-rebase--interactive.sh:227 | |
14070 | #, sh-format | |
14071 | msgid "$sha1: not a commit that can be picked" | |
14072 | msgstr "$sha1:不是一个可以被拣选的提交" | |
14073 | ||
14074 | #: git-rebase--interactive.sh:266 | |
14075 | #, sh-format | |
14076 | msgid "Invalid commit name: $sha1" | |
14077 | msgstr "无效的提交名:$sha1" | |
14078 | ||
14079 | #: git-rebase--interactive.sh:308 | |
14080 | msgid "Cannot write current commit's replacement sha1" | |
14081 | msgstr "不能写入当前提交的替代 sha1" | |
14082 | ||
14083 | #: git-rebase--interactive.sh:360 | |
14084 | #, sh-format | |
14085 | msgid "Fast-forward to $sha1" | |
14086 | msgstr "快进到 $sha1" | |
14087 | ||
14088 | #: git-rebase--interactive.sh:362 | |
14089 | #, sh-format | |
14090 | msgid "Cannot fast-forward to $sha1" | |
14091 | msgstr "不能快进到 $sha1" | |
14092 | ||
14093 | #: git-rebase--interactive.sh:371 | |
14094 | #, sh-format | |
14095 | msgid "Cannot move HEAD to $first_parent" | |
14096 | msgstr "不能移动 HEAD 到 $first_parent" | |
14097 | ||
14098 | #: git-rebase--interactive.sh:376 | |
14099 | #, sh-format | |
14100 | msgid "Refusing to squash a merge: $sha1" | |
14101 | msgstr "拒绝压缩一个合并:$sha1" | |
14102 | ||
14103 | #: git-rebase--interactive.sh:390 | |
14104 | #, sh-format | |
14105 | msgid "Error redoing merge $sha1" | |
14106 | msgstr "无法重做合并 $sha1" | |
14107 | ||
14108 | #: git-rebase--interactive.sh:398 | |
14109 | #, sh-format | |
14110 | msgid "Could not pick $sha1" | |
14111 | msgstr "不能拣选 $sha1" | |
14112 | ||
14113 | #: git-rebase--interactive.sh:407 | |
14114 | #, sh-format | |
14115 | msgid "This is the commit message #${n}:" | |
9a4b694c | 14116 | msgstr "这是提交说明 #${n}:" |
5c57d762 JX |
14117 | |
14118 | #: git-rebase--interactive.sh:412 | |
14119 | #, sh-format | |
14120 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 14121 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 JX |
14122 | |
14123 | #: git-rebase--interactive.sh:423 | |
14124 | #, sh-format | |
14125 | msgid "This is a combination of $count commit." | |
14126 | msgid_plural "This is a combination of $count commits." | |
14127 | msgstr[0] "这是一个 $count 个提交的组合。" | |
14128 | msgstr[1] "这是一个 $count 个提交的组合。" | |
14129 | ||
14130 | #: git-rebase--interactive.sh:431 | |
14131 | #, sh-format | |
14132 | msgid "Cannot write $fixup_msg" | |
14133 | msgstr "不能写入 $fixup_msg" | |
14134 | ||
14135 | #: git-rebase--interactive.sh:434 | |
14136 | msgid "This is a combination of 2 commits." | |
14137 | msgstr "这是一个 2 个提交的组合。" | |
14138 | ||
14139 | #: git-rebase--interactive.sh:435 | |
14140 | msgid "This is the 1st commit message:" | |
14141 | msgstr "这是第一个提交说明:" | |
14142 | ||
14143 | #: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 | |
14144 | #: git-rebase--interactive.sh:521 | |
14145 | #, sh-format | |
14146 | msgid "Could not apply $sha1... $rest" | |
14147 | msgstr "不能应用 $sha1... $rest" | |
14148 | ||
14149 | #: git-rebase--interactive.sh:549 | |
14150 | #, sh-format | |
14151 | msgid "" | |
14152 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
14153 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
14154 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
14155 | "before\n" | |
14156 | "you are able to reword the commit." | |
14157 | msgstr "" | |
14158 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
14159 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
14160 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
14161 | ||
14162 | #: git-rebase--interactive.sh:564 | |
14163 | #, sh-format | |
14164 | msgid "Stopped at $sha1_abbrev... $rest" | |
14165 | msgstr "停止在 $sha1_abbrev... $rest" | |
14166 | ||
14167 | #: git-rebase--interactive.sh:579 | |
14168 | #, sh-format | |
14169 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 14170 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 JX |
14171 | |
14172 | #: git-rebase--interactive.sh:621 | |
14173 | #, sh-format | |
14174 | msgid "Executing: $rest" | |
14175 | msgstr "执行:$rest" | |
14176 | ||
14177 | #: git-rebase--interactive.sh:629 | |
14178 | #, sh-format | |
14179 | msgid "Execution failed: $rest" | |
14180 | msgstr "执行失败:$rest" | |
14181 | ||
14182 | #: git-rebase--interactive.sh:631 | |
14183 | msgid "and made changes to the index and/or the working tree" | |
14184 | msgstr "并且修改索引和/或工作区" | |
14185 | ||
14186 | # 译者:注意保持前导空格 | |
14187 | #: git-rebase--interactive.sh:633 | |
14188 | msgid "" | |
14189 | "You can fix the problem, and then run\n" | |
14190 | "\n" | |
14191 | "\tgit rebase --continue" | |
14192 | msgstr "" | |
14193 | "您可以解决这个问题,然后运行\n" | |
14194 | "\n" | |
14195 | "\tgit rebase --continue" | |
14196 | ||
14197 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
14198 | #: git-rebase--interactive.sh:646 | |
14199 | #, sh-format | |
14200 | msgid "" | |
14201 | "Execution succeeded: $rest\n" | |
14202 | "but left changes to the index and/or the working tree\n" | |
14203 | "Commit or stash your changes, and then run\n" | |
14204 | "\n" | |
14205 | "\tgit rebase --continue" | |
14206 | msgstr "" | |
14207 | "执行成功:$rest\n" | |
14208 | "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n" | |
14209 | "\n" | |
14210 | "\tgit rebase --continue" | |
14211 | ||
14212 | #: git-rebase--interactive.sh:657 | |
14213 | #, sh-format | |
14214 | msgid "Unknown command: $command $sha1 $rest" | |
14215 | msgstr "未知命令:$command $sha1 $rest" | |
14216 | ||
14217 | #: git-rebase--interactive.sh:658 | |
14218 | msgid "Please fix this using 'git rebase --edit-todo'." | |
14219 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
14220 | ||
14221 | #: git-rebase--interactive.sh:693 | |
14222 | #, sh-format | |
14223 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 14224 | msgstr "成功变基并更新 $head_name。" |
5c57d762 JX |
14225 | |
14226 | #: git-rebase--interactive.sh:740 | |
14227 | msgid "Could not skip unnecessary pick commands" | |
14228 | msgstr "不能跳过不必要的拣选命令" | |
14229 | ||
14230 | #: git-rebase--interactive.sh:898 | |
14231 | #, sh-format | |
14232 | msgid "" | |
14233 | "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" | |
14234 | " - $line" | |
14235 | msgstr "" | |
14236 | "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n" | |
14237 | " - $line" | |
14238 | ||
14239 | #: git-rebase--interactive.sh:931 | |
14240 | #, sh-format | |
14241 | msgid "" | |
14242 | "Warning: the command isn't recognized in the following line:\n" | |
14243 | " - $line" | |
14244 | msgstr "" | |
14245 | "警告:下面一行中的命令未能被识别:\n" | |
14246 | " - $line" | |
14247 | ||
14248 | #: git-rebase--interactive.sh:970 | |
14249 | msgid "could not detach HEAD" | |
14250 | msgstr "不能检出为分离头指针" | |
14251 | ||
14252 | #: git-rebase--interactive.sh:1008 | |
14253 | msgid "" | |
14254 | "Warning: some commits may have been dropped accidentally.\n" | |
14255 | "Dropped commits (newer to older):" | |
14256 | msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):" | |
14257 | ||
14258 | #: git-rebase--interactive.sh:1016 | |
14259 | msgid "" | |
14260 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
14261 | "\n" | |
14262 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
14263 | "warnings.\n" | |
14264 | "The possible behaviours are: ignore, warn, error." | |
14265 | msgstr "" | |
9a4b694c | 14266 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" |
5c57d762 | 14267 | "\n" |
9a4b694c RC |
14268 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" |
14269 | "可选值有:ignore、warn、error。" | |
5c57d762 JX |
14270 | |
14271 | #: git-rebase--interactive.sh:1027 | |
14272 | #, sh-format | |
14273 | msgid "" | |
14274 | "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " | |
14275 | "Ignoring." | |
9a4b694c | 14276 | msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" |
5c57d762 JX |
14277 | |
14278 | #: git-rebase--interactive.sh:1044 | |
a0b6b246 JX |
14279 | msgid "" |
14280 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
14281 | "continue'." | |
14282 | msgstr "" | |
14283 | "您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --" | |
14284 | "continue'。" | |
5c57d762 JX |
14285 | |
14286 | #: git-rebase--interactive.sh:1045 | |
14287 | msgid "Or you can abort the rebase with 'git rebase --abort'." | |
14288 | msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" | |
14289 | ||
14290 | #: git-rebase--interactive.sh:1069 | |
14291 | msgid "Could not remove CHERRY_PICK_HEAD" | |
14292 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
14293 | ||
14294 | #: git-rebase--interactive.sh:1074 | |
14295 | #, sh-format | |
14296 | msgid "" | |
14297 | "You have staged changes in your working tree.\n" | |
14298 | "If these changes are meant to be\n" | |
14299 | "squashed into the previous commit, run:\n" | |
14300 | "\n" | |
14301 | " git commit --amend $gpg_sign_opt_quoted\n" | |
14302 | "\n" | |
14303 | "If they are meant to go into a new commit, run:\n" | |
14304 | "\n" | |
14305 | " git commit $gpg_sign_opt_quoted\n" | |
14306 | "\n" | |
a0b6b246 | 14307 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
14308 | "\n" |
14309 | " git rebase --continue\n" | |
14310 | msgstr "" | |
14311 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
14312 | "\n" | |
14313 | " git commit --amend $gpg_sign_opt_quoted\n" | |
14314 | "\n" | |
14315 | "如果这些变更要形成一个新提交,执行:\n" | |
14316 | "\n" | |
14317 | " git commit $gpg_sign_opt_quoted\n" | |
14318 | "\n" | |
9a4b694c | 14319 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
14320 | "\n" |
14321 | " git rebase --continue\n" | |
14322 | ||
14323 | #: git-rebase--interactive.sh:1091 | |
14324 | msgid "Error trying to find the author identity to amend commit" | |
9a4b694c | 14325 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 JX |
14326 | |
14327 | #: git-rebase--interactive.sh:1096 | |
14328 | msgid "" | |
14329 | "You have uncommitted changes in your working tree. Please commit them\n" | |
14330 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
14331 | msgstr "" |
14332 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 JX |
14333 | |
14334 | #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 | |
14335 | msgid "Could not commit staged changes." | |
14336 | msgstr "不能提交暂存的修改。" | |
14337 | ||
14338 | #: git-rebase--interactive.sh:1129 | |
14339 | msgid "" | |
14340 | "\n" | |
14341 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
14342 | "To continue rebase after editing, run:\n" | |
14343 | " git rebase --continue\n" | |
14344 | "\n" | |
14345 | msgstr "" | |
14346 | "\n" | |
9a4b694c | 14347 | "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n" |
5c57d762 JX |
14348 | "请执行:\n" |
14349 | " git rebase --continue\n" | |
14350 | "\n" | |
14351 | ||
a0b6b246 | 14352 | #: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 |
5c57d762 JX |
14353 | msgid "Could not execute editor" |
14354 | msgstr "无法运行编辑器" | |
14355 | ||
a0b6b246 | 14356 | #: git-rebase--interactive.sh:1150 |
5c57d762 JX |
14357 | #, sh-format |
14358 | msgid "Could not checkout $switch_to" | |
14359 | msgstr "不能检出 $switch_to" | |
14360 | ||
a0b6b246 | 14361 | #: git-rebase--interactive.sh:1155 |
5c57d762 JX |
14362 | msgid "No HEAD?" |
14363 | msgstr "没有 HEAD?" | |
14364 | ||
a0b6b246 | 14365 | #: git-rebase--interactive.sh:1156 |
5c57d762 JX |
14366 | #, sh-format |
14367 | msgid "Could not create temporary $state_dir" | |
14368 | msgstr "不能创建临时 $state_dir" | |
14369 | ||
a0b6b246 | 14370 | #: git-rebase--interactive.sh:1158 |
5c57d762 JX |
14371 | msgid "Could not mark as interactive" |
14372 | msgstr "不能标记为交互式" | |
14373 | ||
a0b6b246 | 14374 | #: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 |
5c57d762 JX |
14375 | msgid "Could not init rewritten commits" |
14376 | msgstr "不能对重写提交进行初始化" | |
14377 | ||
a0b6b246 | 14378 | #: git-rebase--interactive.sh:1273 |
5c57d762 JX |
14379 | #, sh-format |
14380 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
14381 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
14382 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
14383 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
14384 | ||
a0b6b246 | 14385 | #: git-rebase--interactive.sh:1278 |
5c57d762 JX |
14386 | msgid "" |
14387 | "\n" | |
14388 | "However, if you remove everything, the rebase will be aborted.\n" | |
14389 | "\n" | |
a0b6b246 JX |
14390 | msgstr "" |
14391 | "\n" | |
14392 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
14393 | "\n" | |
5c57d762 | 14394 | |
a0b6b246 | 14395 | #: git-rebase--interactive.sh:1285 |
5c57d762 JX |
14396 | msgid "Note that empty commits are commented out" |
14397 | msgstr "注意空提交已被注释掉" | |
14398 | ||
14399 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 | |
14400 | #, sh-format | |
14401 | msgid "usage: $dashless $USAGE" | |
14402 | msgstr "用法:$dashless $USAGE" | |
14403 | ||
14404 | #: git-sh-setup.sh:190 | |
14405 | #, sh-format | |
14406 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 14407 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
14408 | |
14409 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
14410 | #, sh-format | |
14411 | msgid "fatal: $program_name cannot be used without a working tree." | |
14412 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
14413 | ||
14414 | #: git-sh-setup.sh:220 | |
14415 | msgid "Cannot rebase: You have unstaged changes." | |
14416 | msgstr "不能变基:您有未暂存的变更。" | |
14417 | ||
14418 | #: git-sh-setup.sh:223 | |
14419 | msgid "Cannot rewrite branches: You have unstaged changes." | |
14420 | msgstr "不能重写分支:您有未暂存的变更。" | |
14421 | ||
a0b6b246 JX |
14422 | #: git-sh-setup.sh:226 |
14423 | msgid "Cannot pull with rebase: You have unstaged changes." | |
14424 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
14425 | ||
5c57d762 JX |
14426 | #: git-sh-setup.sh:229 |
14427 | #, sh-format | |
14428 | msgid "Cannot $action: You have unstaged changes." | |
14429 | msgstr "不能 $action:您有未暂存的变更。" | |
14430 | ||
14431 | #: git-sh-setup.sh:242 | |
14432 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
14433 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
14434 | ||
a0b6b246 JX |
14435 | #: git-sh-setup.sh:245 |
14436 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
14437 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
14438 | ||
5c57d762 JX |
14439 | #: git-sh-setup.sh:248 |
14440 | #, sh-format | |
14441 | msgid "Cannot $action: Your index contains uncommitted changes." | |
14442 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
14443 | ||
a0b6b246 JX |
14444 | #: git-sh-setup.sh:252 |
14445 | msgid "Additionally, your index contains uncommitted changes." | |
14446 | msgstr "而且您的索引中包含未提交的变更。" | |
14447 | ||
5c57d762 JX |
14448 | #: git-sh-setup.sh:372 |
14449 | msgid "You need to run this command from the toplevel of the working tree." | |
14450 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
14451 | ||
14452 | #: git-sh-setup.sh:377 | |
14453 | msgid "Unable to determine absolute path of git directory" | |
14454 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 JX |
14455 | |
14456 | #~ msgid "Could not write to %s" | |
14457 | #~ msgstr "不能写入 %s" | |
14458 | ||
14459 | #~ msgid "Error wrapping up %s." | |
14460 | #~ msgstr "错误收尾 %s。" | |
14461 | ||
14462 | #~ msgid "Your local changes would be overwritten by cherry-pick." | |
14463 | #~ msgstr "您的本地修改将被拣选操作覆盖。" | |
14464 | ||
14465 | #~ msgid "Cannot revert during another revert." | |
14466 | #~ msgstr "不能在回退中执行另一回退。" | |
14467 | ||
14468 | #~ msgid "Cannot cherry-pick during another cherry-pick." | |
14469 | #~ msgstr "不能在拣选过程中执行另一拣选。" | |
14470 | ||
14471 | #~ msgid "Could not parse line %d." | |
14472 | #~ msgstr "不能解析第 %d 行。" | |
14473 | ||
14474 | #~ msgid "Could not open %s" | |
14475 | #~ msgstr "不能打开 %s" | |
14476 | ||
14477 | #~ msgid "Could not read %s." | |
14478 | #~ msgstr "不能读取 %s。" | |
14479 | ||
14480 | #~ msgid "Could not format %s." | |
14481 | #~ msgstr "不能格式化 %s。" | |
14482 | ||
14483 | #~ msgid "%s: %s" | |
14484 | #~ msgstr "%s:%s" | |
14485 | ||
14486 | #~ msgid "cannot open %s: %s" | |
14487 | #~ msgstr "不能打开 %s:%s" | |
14488 | ||
14489 | #~ msgid "You need to set your committer info first" | |
14490 | #~ msgstr "您需要先设置您的提交者信息" |