]>
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" | |
60638e98 JX |
138 | "POT-Creation-Date: 2017-05-05 09:35+0800\n" |
139 | "PO-Revision-Date: 2017-05-09 21:54+0800\n" | |
c04f5ac3 | 140 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 141 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
142 | "Language: zh_CN\n" |
143 | "MIME-Version: 1.0\n" | |
144 | "Content-Type: text/plain; charset=UTF-8\n" | |
145 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 146 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 147 | |
6c94aba5 | 148 | #: advice.c:55 |
c04f5ac3 JX |
149 | #, c-format |
150 | msgid "hint: %.*s\n" | |
151 | msgstr "提示:%.*s\n" | |
152 | ||
5c57d762 JX |
153 | #: advice.c:83 |
154 | msgid "Cherry-picking is not possible because you have unmerged files." | |
155 | msgstr "无法拣选,因为您有未合并的文件。" | |
156 | ||
157 | #: advice.c:85 | |
158 | msgid "Committing is not possible because you have unmerged files." | |
159 | msgstr "无法提交,因为您有未合并的文件。" | |
160 | ||
161 | #: advice.c:87 | |
162 | msgid "Merging is not possible because you have unmerged files." | |
163 | msgstr "无法合并,因为您有未合并的文件。" | |
164 | ||
165 | #: advice.c:89 | |
166 | msgid "Pulling is not possible because you have unmerged files." | |
167 | msgstr "无法拉取,因为您有未合并的文件。" | |
168 | ||
169 | #: advice.c:91 | |
170 | msgid "Reverting is not possible because you have unmerged files." | |
171 | msgstr "无法回退,因为您有未合并的文件。" | |
172 | ||
173 | #: advice.c:93 | |
174 | #, c-format | |
175 | msgid "It is not possible to %s because you have unmerged files." | |
176 | msgstr "无法 %s,因为您有未合并的文件。" | |
177 | ||
178 | #: advice.c:101 | |
c04f5ac3 | 179 | msgid "" |
6acbf033 | 180 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 181 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 182 | msgstr "" |
d9d56b23 | 183 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 184 | "解决方案并提交。" |
c04f5ac3 | 185 | |
5c57d762 JX |
186 | #: advice.c:109 |
187 | msgid "Exiting because of an unresolved conflict." | |
188 | msgstr "因为存在未解决的冲突而退出。" | |
189 | ||
87cb7997 | 190 | #: advice.c:114 builtin/merge.c:1185 |
1b7f4a34 JX |
191 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
192 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
193 | ||
5c57d762 | 194 | #: advice.c:116 |
94550ed3 | 195 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
196 | msgstr "请在合并前先提交您的修改。" |
197 | ||
5c57d762 | 198 | #: advice.c:117 |
1b7f4a34 JX |
199 | msgid "Exiting because of unfinished merge." |
200 | msgstr "因为存在未完成的合并而退出。" | |
201 | ||
5c57d762 JX |
202 | #: advice.c:123 |
203 | #, c-format | |
204 | msgid "" | |
205 | "Note: checking out '%s'.\n" | |
206 | "\n" | |
207 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
208 | "changes and commit them, and you can discard any commits you make in this\n" | |
209 | "state without impacting any branches by performing another checkout.\n" | |
210 | "\n" | |
211 | "If you want to create a new branch to retain commits you create, you may\n" | |
212 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
213 | "\n" | |
214 | " git checkout -b <new-branch-name>\n" | |
215 | "\n" | |
216 | msgstr "" | |
217 | "注意:正在检出 '%s'。\n" | |
218 | "\n" | |
a0b6b246 JX |
219 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" |
220 | "外\n" | |
5c57d762 JX |
221 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" |
222 | "\n" | |
223 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" | |
224 | "参数 -b 来实现(现在或稍后)。例如:\n" | |
225 | "\n" | |
226 | " git checkout -b <new-branch-name>\n" | |
227 | "\n" | |
228 | ||
a0b6b246 JX |
229 | #: apply.c:57 |
230 | #, c-format | |
231 | msgid "unrecognized whitespace option '%s'" | |
232 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 233 | |
a0b6b246 | 234 | #: apply.c:73 |
90314792 | 235 | #, c-format |
a0b6b246 JX |
236 | msgid "unrecognized whitespace ignore option '%s'" |
237 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 238 | |
a0b6b246 JX |
239 | #: apply.c:125 |
240 | msgid "--reject and --3way cannot be used together." | |
241 | msgstr "--reject 和 --3say 不能同时使用。" | |
ef317cd5 | 242 | |
a0b6b246 JX |
243 | #: apply.c:127 |
244 | msgid "--cached and --3way cannot be used together." | |
245 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 246 | |
a0b6b246 JX |
247 | #: apply.c:130 |
248 | msgid "--3way outside a repository" | |
249 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 250 | |
a0b6b246 JX |
251 | #: apply.c:141 |
252 | msgid "--index outside a repository" | |
253 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 254 | |
a0b6b246 JX |
255 | #: apply.c:144 |
256 | msgid "--cached outside a repository" | |
257 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 258 | |
a0b6b246 JX |
259 | #: apply.c:845 |
260 | #, c-format | |
261 | msgid "Cannot prepare timestamp regexp %s" | |
262 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 263 | |
a0b6b246 JX |
264 | #: apply.c:854 |
265 | #, c-format | |
266 | msgid "regexec returned %d for input: %s" | |
267 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 268 | |
a0b6b246 JX |
269 | #: apply.c:938 |
270 | #, c-format | |
271 | msgid "unable to find filename in patch at line %d" | |
272 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 273 | |
a0b6b246 JX |
274 | #: apply.c:977 |
275 | #, c-format | |
276 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
277 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 278 | |
a0b6b246 JX |
279 | #: apply.c:983 |
280 | #, c-format | |
281 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
282 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 283 | |
a0b6b246 JX |
284 | #: apply.c:984 |
285 | #, c-format | |
286 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
287 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 288 | |
a0b6b246 JX |
289 | #: apply.c:990 |
290 | #, c-format | |
291 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
292 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 293 | |
a0b6b246 JX |
294 | #: apply.c:1488 |
295 | #, c-format | |
296 | msgid "recount: unexpected line: %.*s" | |
297 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 298 | |
a0b6b246 JX |
299 | #: apply.c:1557 |
300 | #, c-format | |
301 | msgid "patch fragment without header at line %d: %.*s" | |
302 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 303 | |
a0b6b246 JX |
304 | #: apply.c:1577 |
305 | #, c-format | |
306 | msgid "" | |
307 | "git diff header lacks filename information when removing %d leading pathname " | |
308 | "component (line %d)" | |
309 | msgid_plural "" | |
310 | "git diff header lacks filename information when removing %d leading pathname " | |
311 | "components (line %d)" | |
312 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
313 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 314 | |
a0b6b246 JX |
315 | #: apply.c:1589 |
316 | #, c-format | |
317 | msgid "git diff header lacks filename information (line %d)" | |
318 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 319 | |
a0b6b246 JX |
320 | #: apply.c:1759 |
321 | msgid "new file depends on old contents" | |
322 | msgstr "新文件依赖旧内容" | |
5c57d762 | 323 | |
a0b6b246 JX |
324 | #: apply.c:1761 |
325 | msgid "deleted file still has contents" | |
326 | msgstr "删除的文件仍有内容" | |
5c57d762 | 327 | |
a0b6b246 JX |
328 | #: apply.c:1795 |
329 | #, c-format | |
330 | msgid "corrupt patch at line %d" | |
331 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 332 | |
a0b6b246 | 333 | #: apply.c:1832 |
5c57d762 | 334 | #, c-format |
a0b6b246 JX |
335 | msgid "new file %s depends on old contents" |
336 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 337 | |
a0b6b246 | 338 | #: apply.c:1834 |
5c57d762 | 339 | #, c-format |
a0b6b246 JX |
340 | msgid "deleted file %s still has contents" |
341 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 342 | |
a0b6b246 JX |
343 | #: apply.c:1837 |
344 | #, c-format | |
345 | msgid "** warning: file %s becomes empty but is not deleted" | |
346 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 347 | |
a0b6b246 | 348 | #: apply.c:1984 |
5c57d762 | 349 | #, c-format |
a0b6b246 JX |
350 | msgid "corrupt binary patch at line %d: %.*s" |
351 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 352 | |
a0b6b246 | 353 | #: apply.c:2021 |
5c57d762 | 354 | #, c-format |
a0b6b246 JX |
355 | msgid "unrecognized binary patch at line %d" |
356 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 357 | |
a0b6b246 | 358 | #: apply.c:2182 |
5c57d762 | 359 | #, c-format |
a0b6b246 JX |
360 | msgid "patch with only garbage at line %d" |
361 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 362 | |
1a79b2f1 | 363 | #: apply.c:2265 |
5c57d762 | 364 | #, c-format |
a0b6b246 JX |
365 | msgid "unable to read symlink %s" |
366 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 367 | |
1a79b2f1 | 368 | #: apply.c:2269 |
5c57d762 | 369 | #, c-format |
a0b6b246 JX |
370 | msgid "unable to open or read %s" |
371 | msgstr "不能打开或读取 %s" | |
5c57d762 | 372 | |
1a79b2f1 | 373 | #: apply.c:2922 |
5c57d762 | 374 | #, c-format |
a0b6b246 JX |
375 | msgid "invalid start of line: '%c'" |
376 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 377 | |
1a79b2f1 | 378 | #: apply.c:3041 |
5c57d762 | 379 | #, c-format |
a0b6b246 JX |
380 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
381 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
382 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
383 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 384 | |
1a79b2f1 | 385 | #: apply.c:3053 |
5c57d762 | 386 | #, c-format |
a0b6b246 JX |
387 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
388 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 389 | |
1a79b2f1 | 390 | #: apply.c:3059 |
5c57d762 JX |
391 | #, c-format |
392 | msgid "" | |
a0b6b246 JX |
393 | "while searching for:\n" |
394 | "%.*s" | |
5c57d762 | 395 | msgstr "" |
a0b6b246 JX |
396 | "当查询:\n" |
397 | "%.*s" | |
5c57d762 | 398 | |
1a79b2f1 | 399 | #: apply.c:3081 |
5c57d762 | 400 | #, c-format |
a0b6b246 JX |
401 | msgid "missing binary patch data for '%s'" |
402 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 403 | |
1a79b2f1 | 404 | #: apply.c:3089 |
5c57d762 | 405 | #, c-format |
a0b6b246 | 406 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 407 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 408 | |
1a79b2f1 | 409 | #: apply.c:3135 |
5c57d762 | 410 | #, c-format |
a0b6b246 JX |
411 | msgid "cannot apply binary patch to '%s' without full index line" |
412 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 413 | |
1a79b2f1 | 414 | #: apply.c:3145 |
5c57d762 | 415 | #, c-format |
a0b6b246 JX |
416 | msgid "" |
417 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 418 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 419 | |
1a79b2f1 | 420 | #: apply.c:3153 |
a0b6b246 JX |
421 | #, c-format |
422 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 423 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 424 | |
1a79b2f1 | 425 | #: apply.c:3171 |
5c57d762 | 426 | #, c-format |
a0b6b246 JX |
427 | msgid "the necessary postimage %s for '%s' cannot be read" |
428 | msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" | |
5c57d762 | 429 | |
1a79b2f1 | 430 | #: apply.c:3184 |
5c57d762 | 431 | #, c-format |
a0b6b246 JX |
432 | msgid "binary patch does not apply to '%s'" |
433 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 434 | |
1a79b2f1 | 435 | #: apply.c:3190 |
5c57d762 | 436 | #, c-format |
a0b6b246 JX |
437 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
438 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 439 | |
1a79b2f1 | 440 | #: apply.c:3211 |
276ceeaa | 441 | #, c-format |
a0b6b246 JX |
442 | msgid "patch failed: %s:%ld" |
443 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 444 | |
1a79b2f1 | 445 | #: apply.c:3333 |
4dcdc3d8 | 446 | #, c-format |
a0b6b246 JX |
447 | msgid "cannot checkout %s" |
448 | msgstr "不能检出 %s" | |
4dcdc3d8 | 449 | |
87cb7997 | 450 | #: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 |
4dcdc3d8 | 451 | #, c-format |
a0b6b246 JX |
452 | msgid "failed to read %s" |
453 | msgstr "无法读取 %s" | |
4dcdc3d8 | 454 | |
1a79b2f1 | 455 | #: apply.c:3389 |
4dcdc3d8 | 456 | #, c-format |
a0b6b246 JX |
457 | msgid "reading from '%s' beyond a symbolic link" |
458 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 459 | |
1a79b2f1 | 460 | #: apply.c:3418 apply.c:3658 |
4dcdc3d8 | 461 | #, c-format |
a0b6b246 JX |
462 | msgid "path %s has been renamed/deleted" |
463 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 464 | |
1a79b2f1 | 465 | #: apply.c:3501 apply.c:3672 |
4dcdc3d8 | 466 | #, c-format |
a0b6b246 JX |
467 | msgid "%s: does not exist in index" |
468 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 469 | |
1a79b2f1 | 470 | #: apply.c:3510 apply.c:3680 |
4dcdc3d8 | 471 | #, c-format |
a0b6b246 JX |
472 | msgid "%s: does not match index" |
473 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 474 | |
1a79b2f1 | 475 | #: apply.c:3545 |
a0b6b246 JX |
476 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
477 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 478 | |
1a79b2f1 | 479 | #: apply.c:3548 |
4dcdc3d8 | 480 | #, c-format |
a0b6b246 JX |
481 | msgid "Falling back to three-way merge...\n" |
482 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 483 | |
1a79b2f1 | 484 | #: apply.c:3564 apply.c:3568 |
4dcdc3d8 | 485 | #, c-format |
a0b6b246 JX |
486 | msgid "cannot read the current contents of '%s'" |
487 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 488 | |
1a79b2f1 | 489 | #: apply.c:3580 |
4dcdc3d8 | 490 | #, c-format |
a0b6b246 JX |
491 | msgid "Failed to fall back on three-way merge...\n" |
492 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 493 | |
1a79b2f1 | 494 | #: apply.c:3594 |
4dcdc3d8 | 495 | #, c-format |
a0b6b246 JX |
496 | msgid "Applied patch to '%s' with conflicts.\n" |
497 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 498 | |
1a79b2f1 | 499 | #: apply.c:3599 |
4dcdc3d8 | 500 | #, c-format |
a0b6b246 JX |
501 | msgid "Applied patch to '%s' cleanly.\n" |
502 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 503 | |
1a79b2f1 | 504 | #: apply.c:3625 |
a0b6b246 JX |
505 | msgid "removal patch leaves file contents" |
506 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 507 | |
1a79b2f1 | 508 | #: apply.c:3697 |
1003b3a5 | 509 | #, c-format |
a0b6b246 JX |
510 | msgid "%s: wrong type" |
511 | msgstr "%s:错误类型" | |
1003b3a5 | 512 | |
1a79b2f1 | 513 | #: apply.c:3699 |
1003b3a5 | 514 | #, c-format |
a0b6b246 JX |
515 | msgid "%s has type %o, expected %o" |
516 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 517 | |
1a79b2f1 | 518 | #: apply.c:3850 apply.c:3852 |
4dcdc3d8 | 519 | #, c-format |
a0b6b246 JX |
520 | msgid "invalid path '%s'" |
521 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 522 | |
1a79b2f1 | 523 | #: apply.c:3908 |
4dcdc3d8 | 524 | #, c-format |
a0b6b246 JX |
525 | msgid "%s: already exists in index" |
526 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 527 | |
1a79b2f1 | 528 | #: apply.c:3911 |
4dcdc3d8 | 529 | #, c-format |
a0b6b246 JX |
530 | msgid "%s: already exists in working directory" |
531 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 532 | |
1a79b2f1 | 533 | #: apply.c:3931 |
1b7f4a34 | 534 | #, c-format |
a0b6b246 JX |
535 | msgid "new mode (%o) of %s does not match old mode (%o)" |
536 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 537 | |
1a79b2f1 | 538 | #: apply.c:3936 |
5b04ee3b | 539 | #, c-format |
a0b6b246 JX |
540 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
541 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 542 | |
1a79b2f1 | 543 | #: apply.c:3956 |
8ada9598 | 544 | #, c-format |
a0b6b246 JX |
545 | msgid "affected file '%s' is beyond a symbolic link" |
546 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 547 | |
1a79b2f1 | 548 | #: apply.c:3960 |
81809b99 | 549 | #, c-format |
a0b6b246 JX |
550 | msgid "%s: patch does not apply" |
551 | msgstr "%s:补丁未应用" | |
8ada9598 | 552 | |
1a79b2f1 | 553 | #: apply.c:3975 |
8ada9598 | 554 | #, c-format |
a0b6b246 JX |
555 | msgid "Checking patch %s..." |
556 | msgstr "检查补丁 %s..." | |
8ada9598 | 557 | |
1a79b2f1 | 558 | #: apply.c:4066 |
a0b6b246 JX |
559 | #, c-format |
560 | msgid "sha1 information is lacking or useless for submodule %s" | |
561 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 562 | |
1a79b2f1 | 563 | #: apply.c:4073 |
8ada9598 | 564 | #, c-format |
a0b6b246 | 565 | msgid "mode change for %s, which is not in current HEAD" |
29004bbb | 566 | msgstr "%s 的模式被改变,但它不在当前 HEAD 中" |
8ada9598 | 567 | |
1a79b2f1 | 568 | #: apply.c:4076 |
a0b6b246 JX |
569 | #, c-format |
570 | msgid "sha1 information is lacking or useless (%s)." | |
571 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 572 | |
87cb7997 | 573 | #: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 |
8ada9598 | 574 | #, c-format |
a0b6b246 JX |
575 | msgid "make_cache_entry failed for path '%s'" |
576 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
8ada9598 | 577 | |
1a79b2f1 | 578 | #: apply.c:4085 |
a0b6b246 JX |
579 | #, c-format |
580 | msgid "could not add %s to temporary index" | |
581 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 582 | |
1a79b2f1 | 583 | #: apply.c:4095 |
a0b6b246 JX |
584 | #, c-format |
585 | msgid "could not write temporary index to %s" | |
586 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 587 | |
1a79b2f1 | 588 | #: apply.c:4233 |
a0b6b246 JX |
589 | #, c-format |
590 | msgid "unable to remove %s from index" | |
591 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 592 | |
1a79b2f1 | 593 | #: apply.c:4268 |
8ada9598 | 594 | #, c-format |
a0b6b246 JX |
595 | msgid "corrupt patch for submodule %s" |
596 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 597 | |
1a79b2f1 | 598 | #: apply.c:4274 |
9aeb4c2b | 599 | #, c-format |
a0b6b246 | 600 | msgid "unable to stat newly created file '%s'" |
65e2041e | 601 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 602 | |
1a79b2f1 | 603 | #: apply.c:4282 |
a0b6b246 JX |
604 | #, c-format |
605 | msgid "unable to create backing store for newly created file %s" | |
606 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 607 | |
1a79b2f1 | 608 | #: apply.c:4288 apply.c:4432 |
81809b99 | 609 | #, c-format |
a0b6b246 JX |
610 | msgid "unable to add cache entry for %s" |
611 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 612 | |
1a79b2f1 | 613 | #: apply.c:4329 |
a0b6b246 JX |
614 | #, c-format |
615 | msgid "failed to write to '%s'" | |
616 | msgstr "无法写入 '%s'" | |
8ada9598 | 617 | |
1a79b2f1 | 618 | #: apply.c:4333 |
220c313c | 619 | #, c-format |
a0b6b246 JX |
620 | msgid "closing file '%s'" |
621 | msgstr "关闭文件 '%s'" | |
220c313c | 622 | |
1a79b2f1 | 623 | #: apply.c:4403 |
c04f5ac3 | 624 | #, c-format |
a0b6b246 JX |
625 | msgid "unable to write file '%s' mode %o" |
626 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 627 | |
1a79b2f1 | 628 | #: apply.c:4501 |
c04f5ac3 | 629 | #, c-format |
a0b6b246 JX |
630 | msgid "Applied patch %s cleanly." |
631 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 632 | |
1a79b2f1 | 633 | #: apply.c:4509 |
a0b6b246 JX |
634 | msgid "internal error" |
635 | msgstr "内部错误" | |
c04f5ac3 | 636 | |
1a79b2f1 | 637 | #: apply.c:4512 |
5c57d762 | 638 | #, c-format |
a0b6b246 JX |
639 | msgid "Applying patch %%s with %d reject..." |
640 | msgid_plural "Applying patch %%s with %d rejects..." | |
641 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
642 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 643 | |
1a79b2f1 | 644 | #: apply.c:4523 |
5c57d762 | 645 | #, c-format |
a0b6b246 JX |
646 | msgid "truncating .rej filename to %.*s.rej" |
647 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 648 | |
87cb7997 | 649 | #: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 |
220c313c | 650 | #, c-format |
a0b6b246 JX |
651 | msgid "cannot open %s" |
652 | msgstr "不能打开 %s" | |
220c313c | 653 | |
1a79b2f1 | 654 | #: apply.c:4545 |
220c313c | 655 | #, c-format |
a0b6b246 JX |
656 | msgid "Hunk #%d applied cleanly." |
657 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 658 | |
1a79b2f1 | 659 | #: apply.c:4549 |
5c57d762 | 660 | #, c-format |
a0b6b246 JX |
661 | msgid "Rejected hunk #%d." |
662 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 663 | |
1a79b2f1 | 664 | #: apply.c:4659 |
5c57d762 | 665 | #, c-format |
a0b6b246 JX |
666 | msgid "Skipped patch '%s'." |
667 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 668 | |
1a79b2f1 | 669 | #: apply.c:4667 |
a0b6b246 JX |
670 | msgid "unrecognized input" |
671 | msgstr "未能识别的输入" | |
5c57d762 | 672 | |
1a79b2f1 | 673 | #: apply.c:4686 |
a0b6b246 JX |
674 | msgid "unable to read index file" |
675 | msgstr "无法读取索引文件" | |
5c57d762 | 676 | |
87cb7997 | 677 | #: apply.c:4823 |
220c313c | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "can't open patch '%s': %s" |
680 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 681 | |
87cb7997 | 682 | #: apply.c:4850 |
5c57d762 | 683 | #, c-format |
a0b6b246 JX |
684 | msgid "squelched %d whitespace error" |
685 | msgid_plural "squelched %d whitespace errors" | |
686 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
687 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 688 | |
87cb7997 | 689 | #: apply.c:4856 apply.c:4871 |
5c57d762 | 690 | #, c-format |
a0b6b246 JX |
691 | msgid "%d line adds whitespace errors." |
692 | msgid_plural "%d lines add whitespace errors." | |
693 | msgstr[0] "%d 行有空白字符误用。" | |
694 | msgstr[1] "%d 行有空白字符误用。" | |
5c57d762 | 695 | |
87cb7997 | 696 | #: apply.c:4864 |
5c57d762 | 697 | #, c-format |
a0b6b246 JX |
698 | msgid "%d line applied after fixing whitespace errors." |
699 | msgid_plural "%d lines applied after fixing whitespace errors." | |
700 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
701 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 702 | |
87cb7997 | 703 | #: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 |
a0b6b246 JX |
704 | msgid "Unable to write new index file" |
705 | msgstr "无法写入新索引文件" | |
5c57d762 | 706 | |
60638e98 | 707 | #: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 |
87cb7997 JX |
708 | #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 |
709 | #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 | |
710 | #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 | |
711 | #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 | |
1a79b2f1 | 712 | #: git-add--interactive.perl:239 |
a0b6b246 JX |
713 | msgid "path" |
714 | msgstr "路径" | |
5c57d762 | 715 | |
87cb7997 | 716 | #: apply.c:4912 |
a0b6b246 JX |
717 | msgid "don't apply changes matching the given path" |
718 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 719 | |
87cb7997 | 720 | #: apply.c:4915 |
a0b6b246 JX |
721 | msgid "apply changes matching the given path" |
722 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 723 | |
60638e98 | 724 | #: apply.c:4917 builtin/am.c:2285 |
a0b6b246 JX |
725 | msgid "num" |
726 | msgstr "数字" | |
220c313c | 727 | |
87cb7997 | 728 | #: apply.c:4918 |
a0b6b246 JX |
729 | msgid "remove <num> leading slashes from traditional diff paths" |
730 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 731 | |
87cb7997 | 732 | #: apply.c:4921 |
a0b6b246 JX |
733 | msgid "ignore additions made by the patch" |
734 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 735 | |
87cb7997 | 736 | #: apply.c:4923 |
a0b6b246 JX |
737 | msgid "instead of applying the patch, output diffstat for the input" |
738 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 739 | |
87cb7997 | 740 | #: apply.c:4927 |
a0b6b246 JX |
741 | msgid "show number of added and deleted lines in decimal notation" |
742 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 743 | |
87cb7997 | 744 | #: apply.c:4929 |
a0b6b246 JX |
745 | msgid "instead of applying the patch, output a summary for the input" |
746 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 747 | |
87cb7997 | 748 | #: apply.c:4931 |
a0b6b246 JX |
749 | msgid "instead of applying the patch, see if the patch is applicable" |
750 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 751 | |
87cb7997 | 752 | #: apply.c:4933 |
a0b6b246 JX |
753 | msgid "make sure the patch is applicable to the current index" |
754 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 755 | |
87cb7997 | 756 | #: apply.c:4935 |
a0b6b246 JX |
757 | msgid "apply a patch without touching the working tree" |
758 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 759 | |
87cb7997 | 760 | #: apply.c:4937 |
a0b6b246 JX |
761 | msgid "accept a patch that touches outside the working area" |
762 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 763 | |
87cb7997 | 764 | #: apply.c:4939 |
a0b6b246 JX |
765 | msgid "also apply the patch (use with --stat/--summary/--check)" |
766 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 767 | |
87cb7997 | 768 | #: apply.c:4941 |
a0b6b246 JX |
769 | msgid "attempt three-way merge if a patch does not apply" |
770 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 771 | |
87cb7997 | 772 | #: apply.c:4943 |
a0b6b246 JX |
773 | msgid "build a temporary index based on embedded index information" |
774 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 775 | |
60638e98 | 776 | #: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 |
a0b6b246 JX |
777 | msgid "paths are separated with NUL character" |
778 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 779 | |
87cb7997 | 780 | #: apply.c:4948 |
a0b6b246 JX |
781 | msgid "ensure at least <n> lines of context match" |
782 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 783 | |
60638e98 | 784 | #: apply.c:4949 builtin/am.c:2264 |
a0b6b246 JX |
785 | msgid "action" |
786 | msgstr "动作" | |
8ada9598 | 787 | |
87cb7997 | 788 | #: apply.c:4950 |
a0b6b246 JX |
789 | msgid "detect new or modified lines that have whitespace errors" |
790 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 791 | |
87cb7997 | 792 | #: apply.c:4953 apply.c:4956 |
a0b6b246 JX |
793 | msgid "ignore changes in whitespace when finding context" |
794 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 795 | |
87cb7997 | 796 | #: apply.c:4959 |
a0b6b246 JX |
797 | msgid "apply the patch in reverse" |
798 | msgstr "反向应用补丁" | |
8ada9598 | 799 | |
87cb7997 | 800 | #: apply.c:4961 |
a0b6b246 JX |
801 | msgid "don't expect at least one line of context" |
802 | msgstr "无需至少一行上下文" | |
8ada9598 | 803 | |
87cb7997 | 804 | #: apply.c:4963 |
a0b6b246 JX |
805 | msgid "leave the rejected hunks in corresponding *.rej files" |
806 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 807 | |
87cb7997 | 808 | #: apply.c:4965 |
a0b6b246 JX |
809 | msgid "allow overlapping hunks" |
810 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 811 | |
87cb7997 | 812 | #: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 |
1a79b2f1 | 813 | #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 |
87cb7997 | 814 | #: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 |
a0b6b246 JX |
815 | msgid "be verbose" |
816 | msgstr "冗长输出" | |
8ada9598 | 817 | |
87cb7997 | 818 | #: apply.c:4968 |
a0b6b246 JX |
819 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
820 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 821 | |
87cb7997 | 822 | #: apply.c:4971 |
a0b6b246 JX |
823 | msgid "do not trust the line counts in the hunk headers" |
824 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 825 | |
60638e98 | 826 | #: apply.c:4973 builtin/am.c:2273 |
a0b6b246 JX |
827 | msgid "root" |
828 | msgstr "根目录" | |
c04f5ac3 | 829 | |
87cb7997 | 830 | #: apply.c:4974 |
a0b6b246 JX |
831 | msgid "prepend <root> to all filenames" |
832 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 833 | |
a0b6b246 JX |
834 | #: archive.c:12 |
835 | msgid "git archive [<options>] <tree-ish> [<path>...]" | |
836 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 837 | |
a0b6b246 JX |
838 | #: archive.c:13 |
839 | msgid "git archive --list" | |
840 | msgstr "git archive --list" | |
841 | ||
842 | #: archive.c:14 | |
c04f5ac3 | 843 | msgid "" |
a0b6b246 | 844 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 845 | msgstr "" |
a0b6b246 | 846 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 847 | |
a0b6b246 JX |
848 | #: archive.c:15 |
849 | msgid "git archive --remote <repo> [--exec <cmd>] --list" | |
850 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 851 | |
87cb7997 | 852 | #: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 |
c04f5ac3 | 853 | #, c-format |
a0b6b246 JX |
854 | msgid "pathspec '%s' did not match any files" |
855 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 856 | |
87cb7997 | 857 | #: archive.c:417 |
a0b6b246 JX |
858 | msgid "fmt" |
859 | msgstr "格式" | |
07432cef | 860 | |
87cb7997 | 861 | #: archive.c:417 |
a0b6b246 JX |
862 | msgid "archive format" |
863 | msgstr "归档格式" | |
7aea43ff | 864 | |
87cb7997 | 865 | #: archive.c:418 builtin/log.c:1436 |
a0b6b246 JX |
866 | msgid "prefix" |
867 | msgstr "前缀" | |
7aea43ff | 868 | |
87cb7997 | 869 | #: archive.c:419 |
a0b6b246 JX |
870 | msgid "prepend prefix to each pathname in the archive" |
871 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 872 | |
60638e98 | 873 | #: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 |
87cb7997 | 874 | #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 |
60638e98 | 875 | #: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 |
87cb7997 | 876 | #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 |
1a79b2f1 | 877 | #: parse-options.h:153 |
a0b6b246 JX |
878 | msgid "file" |
879 | msgstr "文件" | |
a77c07d9 | 880 | |
87cb7997 | 881 | #: archive.c:421 builtin/archive.c:89 |
a0b6b246 JX |
882 | msgid "write the archive to this file" |
883 | msgstr "归档写入此文件" | |
a77c07d9 | 884 | |
87cb7997 | 885 | #: archive.c:423 |
a0b6b246 JX |
886 | msgid "read .gitattributes in working directory" |
887 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 888 | |
87cb7997 | 889 | #: archive.c:424 |
a0b6b246 JX |
890 | msgid "report archived files on stderr" |
891 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 892 | |
87cb7997 | 893 | #: archive.c:425 |
a0b6b246 JX |
894 | msgid "store only" |
895 | msgstr "只存储" | |
7ac1c0ad | 896 | |
87cb7997 | 897 | #: archive.c:426 |
a0b6b246 JX |
898 | msgid "compress faster" |
899 | msgstr "压缩速度更快" | |
8ada9598 | 900 | |
87cb7997 | 901 | #: archive.c:434 |
a0b6b246 JX |
902 | msgid "compress better" |
903 | msgstr "压缩效果更好" | |
8ada9598 | 904 | |
87cb7997 | 905 | #: archive.c:437 |
a0b6b246 JX |
906 | msgid "list supported archive formats" |
907 | msgstr "列出支持的归档格式" | |
a77c07d9 | 908 | |
87cb7997 JX |
909 | #: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 |
910 | #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 | |
a0b6b246 JX |
911 | msgid "repo" |
912 | msgstr "仓库" | |
c04f5ac3 | 913 | |
87cb7997 | 914 | #: archive.c:440 builtin/archive.c:91 |
a0b6b246 JX |
915 | msgid "retrieve the archive from remote repository <repo>" |
916 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 917 | |
87cb7997 | 918 | #: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 |
a0b6b246 JX |
919 | msgid "command" |
920 | msgstr "命令" | |
921 | ||
87cb7997 | 922 | #: archive.c:442 builtin/archive.c:93 |
a0b6b246 JX |
923 | msgid "path to the remote git-upload-archive command" |
924 | msgstr "远程 git-upload-archive 命令的路径" | |
925 | ||
87cb7997 | 926 | #: archive.c:449 |
a0b6b246 JX |
927 | msgid "Unexpected option --remote" |
928 | msgstr "未知参数 --remote" | |
929 | ||
87cb7997 | 930 | #: archive.c:451 |
a0b6b246 JX |
931 | msgid "Option --exec can only be used together with --remote" |
932 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
933 | ||
87cb7997 | 934 | #: archive.c:453 |
a0b6b246 JX |
935 | msgid "Unexpected option --output" |
936 | msgstr "未知参数 --output" | |
937 | ||
87cb7997 | 938 | #: archive.c:475 |
a0b6b246 JX |
939 | #, c-format |
940 | msgid "Unknown archive format '%s'" | |
941 | msgstr "未知归档格式 '%s'" | |
942 | ||
87cb7997 | 943 | #: archive.c:482 |
8ada9598 | 944 | #, c-format |
a0b6b246 JX |
945 | msgid "Argument not supported for format '%s': -%d" |
946 | msgstr "参数不支持此格式 '%s':-%d" | |
947 | ||
87cb7997 JX |
948 | #: attr.c:212 |
949 | #, c-format | |
950 | msgid "%.*s is not a valid attribute name" | |
951 | msgstr "%.*s 不是一个有效的属性名" | |
952 | ||
953 | #: attr.c:408 | |
8ada9598 | 954 | msgid "" |
a0b6b246 JX |
955 | "Negative patterns are ignored in git attributes\n" |
956 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 957 | msgstr "" |
a0b6b246 JX |
958 | "负值模版在 git attributes 中被忽略\n" |
959 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 960 | |
60638e98 | 961 | #: bisect.c:444 |
8ada9598 | 962 | #, c-format |
a0b6b246 JX |
963 | msgid "Could not open file '%s'" |
964 | msgstr "不能打开文件 '%s'" | |
8ada9598 | 965 | |
60638e98 | 966 | #: bisect.c:449 |
8ada9598 | 967 | #, c-format |
a0b6b246 JX |
968 | msgid "Badly quoted content in file '%s': %s" |
969 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 970 | |
60638e98 | 971 | #: bisect.c:657 |
a0b6b246 JX |
972 | #, c-format |
973 | msgid "We cannot bisect more!\n" | |
974 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 975 | |
60638e98 | 976 | #: bisect.c:710 |
2e8451e8 | 977 | #, c-format |
a0b6b246 JX |
978 | msgid "Not a valid commit name %s" |
979 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 980 | |
60638e98 | 981 | #: bisect.c:734 |
5b04ee3b JX |
982 | #, c-format |
983 | msgid "" | |
a0b6b246 JX |
984 | "The merge base %s is bad.\n" |
985 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 986 | msgstr "" |
a0b6b246 JX |
987 | "合并基线 %s 是坏的。\n" |
988 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 989 | |
60638e98 | 990 | #: bisect.c:739 |
5b04ee3b | 991 | #, c-format |
a0b6b246 JX |
992 | msgid "" |
993 | "The merge base %s is new.\n" | |
994 | "The property has changed between %s and [%s].\n" | |
995 | msgstr "" | |
996 | "合并基线 %s 是新的。\n" | |
997 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 998 | |
60638e98 | 999 | #: bisect.c:744 |
a0b6b246 JX |
1000 | #, c-format |
1001 | msgid "" | |
1002 | "The merge base %s is %s.\n" | |
1003 | "This means the first '%s' commit is between %s and [%s].\n" | |
1004 | msgstr "" | |
1005 | "合并基线 %s 是 %s。\n" | |
1006 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1007 | |
60638e98 | 1008 | #: bisect.c:752 |
a0b6b246 JX |
1009 | #, c-format |
1010 | msgid "" | |
1a79b2f1 | 1011 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1012 | "git bisect cannot work properly in this case.\n" |
1013 | "Maybe you mistook %s and %s revs?\n" | |
1014 | msgstr "" | |
1015 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1016 | "这种情况下 git 二分查找无法正常工作。\n" | |
1017 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1018 | |
60638e98 | 1019 | #: bisect.c:765 |
a0b6b246 JX |
1020 | #, c-format |
1021 | msgid "" | |
1022 | "the merge base between %s and [%s] must be skipped.\n" | |
1023 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1024 | "We continue anyway." | |
1025 | msgstr "" | |
1026 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1027 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1028 | "我们仍旧继续。" | |
649900bc | 1029 | |
60638e98 | 1030 | #: bisect.c:800 |
649900bc | 1031 | #, c-format |
a0b6b246 JX |
1032 | msgid "Bisecting: a merge base must be tested\n" |
1033 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1034 | |
60638e98 | 1035 | #: bisect.c:851 |
a0b6b246 JX |
1036 | #, c-format |
1037 | msgid "a %s revision is needed" | |
1038 | msgstr "需要一个 %s 版本" | |
649900bc | 1039 | |
60638e98 | 1040 | #: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 |
649900bc | 1041 | #, c-format |
a0b6b246 JX |
1042 | msgid "could not create file '%s'" |
1043 | msgstr "不能创建文件 '%s'" | |
649900bc | 1044 | |
60638e98 | 1045 | #: bisect.c:919 |
649900bc | 1046 | #, c-format |
a0b6b246 JX |
1047 | msgid "could not read file '%s'" |
1048 | msgstr "不能读取文件 '%s'" | |
649900bc | 1049 | |
60638e98 | 1050 | #: bisect.c:949 |
a0b6b246 JX |
1051 | msgid "reading bisect refs failed" |
1052 | msgstr "读取二分查找引用失败" | |
649900bc | 1053 | |
60638e98 | 1054 | #: bisect.c:969 |
649900bc | 1055 | #, c-format |
a0b6b246 JX |
1056 | msgid "%s was both %s and %s\n" |
1057 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1058 | |
60638e98 | 1059 | #: bisect.c:977 |
649900bc | 1060 | #, c-format |
a0b6b246 JX |
1061 | msgid "" |
1062 | "No testable commit found.\n" | |
1063 | "Maybe you started with bad path parameters?\n" | |
1064 | msgstr "" | |
1065 | "没有发现可测试的提交。\n" | |
1066 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1067 | |
60638e98 | 1068 | #: bisect.c:996 |
649900bc | 1069 | #, c-format |
a0b6b246 JX |
1070 | msgid "(roughly %d step)" |
1071 | msgid_plural "(roughly %d steps)" | |
1072 | msgstr[0] "(大概 %d 步)" | |
1073 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1074 | |
a0b6b246 JX |
1075 | #. TRANSLATORS: the last %s will be replaced with |
1076 | #. "(roughly %d steps)" translation | |
60638e98 | 1077 | #: bisect.c:1000 |
649900bc | 1078 | #, c-format |
a0b6b246 JX |
1079 | msgid "Bisecting: %d revision left to test after this %s\n" |
1080 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1081 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1082 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1083 | |
a0b6b246 | 1084 | #: branch.c:53 |
649900bc | 1085 | #, c-format |
a0b6b246 JX |
1086 | msgid "" |
1087 | "\n" | |
1088 | "After fixing the error cause you may try to fix up\n" | |
1089 | "the remote tracking information by invoking\n" | |
1090 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1091 | msgstr "" | |
1092 | "\n" | |
1093 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1094 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1095 | |
a0b6b246 | 1096 | #: branch.c:67 |
649900bc | 1097 | #, c-format |
a0b6b246 JX |
1098 | msgid "Not setting branch %s as its own upstream." |
1099 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1100 | |
a0b6b246 | 1101 | #: branch.c:93 |
649900bc | 1102 | #, c-format |
a0b6b246 JX |
1103 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." |
1104 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
649900bc | 1105 | |
a0b6b246 | 1106 | #: branch.c:94 |
649900bc | 1107 | #, c-format |
a0b6b246 JX |
1108 | msgid "Branch %s set up to track remote branch %s from %s." |
1109 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
649900bc | 1110 | |
a0b6b246 | 1111 | #: branch.c:98 |
649900bc | 1112 | #, c-format |
a0b6b246 JX |
1113 | msgid "Branch %s set up to track local branch %s by rebasing." |
1114 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
649900bc | 1115 | |
a0b6b246 | 1116 | #: branch.c:99 |
649900bc | 1117 | #, c-format |
a0b6b246 JX |
1118 | msgid "Branch %s set up to track local branch %s." |
1119 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
649900bc | 1120 | |
a0b6b246 | 1121 | #: branch.c:104 |
649900bc | 1122 | #, c-format |
a0b6b246 JX |
1123 | msgid "Branch %s set up to track remote ref %s by rebasing." |
1124 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
649900bc | 1125 | |
a0b6b246 | 1126 | #: branch.c:105 |
649900bc | 1127 | #, c-format |
a0b6b246 JX |
1128 | msgid "Branch %s set up to track remote ref %s." |
1129 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
649900bc | 1130 | |
a0b6b246 | 1131 | #: branch.c:109 |
649900bc | 1132 | #, c-format |
a0b6b246 JX |
1133 | msgid "Branch %s set up to track local ref %s by rebasing." |
1134 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
649900bc | 1135 | |
a0b6b246 | 1136 | #: branch.c:110 |
649900bc | 1137 | #, c-format |
a0b6b246 JX |
1138 | msgid "Branch %s set up to track local ref %s." |
1139 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
649900bc | 1140 | |
a0b6b246 JX |
1141 | #: branch.c:119 |
1142 | msgid "Unable to write upstream branch configuration" | |
1143 | msgstr "无法写入上游分支配置" | |
649900bc | 1144 | |
a0b6b246 | 1145 | #: branch.c:156 |
649900bc | 1146 | #, c-format |
a0b6b246 JX |
1147 | msgid "Not tracking: ambiguous information for ref %s" |
1148 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1149 | |
a0b6b246 | 1150 | #: branch.c:185 |
649900bc | 1151 | #, c-format |
a0b6b246 JX |
1152 | msgid "'%s' is not a valid branch name." |
1153 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1154 | |
a0b6b246 | 1155 | #: branch.c:190 |
649900bc | 1156 | #, c-format |
a0b6b246 JX |
1157 | msgid "A branch named '%s' already exists." |
1158 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1159 | |
a0b6b246 JX |
1160 | #: branch.c:198 |
1161 | msgid "Cannot force update the current branch." | |
1162 | msgstr "无法强制更新当前分支。" | |
649900bc | 1163 | |
a0b6b246 | 1164 | #: branch.c:218 |
649900bc | 1165 | #, c-format |
a0b6b246 JX |
1166 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1167 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1168 | |
a0b6b246 | 1169 | #: branch.c:220 |
649900bc | 1170 | #, c-format |
a0b6b246 JX |
1171 | msgid "the requested upstream branch '%s' does not exist" |
1172 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1173 | |
a0b6b246 JX |
1174 | #: branch.c:222 |
1175 | msgid "" | |
1176 | "\n" | |
1177 | "If you are planning on basing your work on an upstream\n" | |
1178 | "branch that already exists at the remote, you may need to\n" | |
1179 | "run \"git fetch\" to retrieve it.\n" | |
1180 | "\n" | |
1181 | "If you are planning to push out a new local branch that\n" | |
1182 | "will track its remote counterpart, you may want to use\n" | |
1183 | "\"git push -u\" to set the upstream config as you push." | |
1184 | msgstr "" | |
1185 | "\n" | |
1186 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1187 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1188 | "\n" | |
1189 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1190 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1191 | |
275588f9 | 1192 | #: branch.c:265 |
649900bc | 1193 | #, c-format |
a0b6b246 JX |
1194 | msgid "Not a valid object name: '%s'." |
1195 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1196 | |
275588f9 | 1197 | #: branch.c:285 |
649900bc | 1198 | #, c-format |
a0b6b246 JX |
1199 | msgid "Ambiguous object name: '%s'." |
1200 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1201 | |
275588f9 | 1202 | #: branch.c:290 |
649900bc | 1203 | #, c-format |
a0b6b246 JX |
1204 | msgid "Not a valid branch point: '%s'." |
1205 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1206 | |
275588f9 | 1207 | #: branch.c:344 |
649900bc | 1208 | #, c-format |
a0b6b246 JX |
1209 | msgid "'%s' is already checked out at '%s'" |
1210 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1211 | |
87cb7997 | 1212 | #: branch.c:364 |
a0b6b246 JX |
1213 | #, c-format |
1214 | msgid "HEAD of working tree %s is not updated" | |
1215 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1216 | |
a0b6b246 | 1217 | #: bundle.c:34 |
649900bc | 1218 | #, c-format |
a0b6b246 JX |
1219 | msgid "'%s' does not look like a v2 bundle file" |
1220 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1221 | |
a0b6b246 JX |
1222 | #: bundle.c:61 |
1223 | #, c-format | |
1224 | msgid "unrecognized header: %s%s (%d)" | |
1225 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1226 | |
60638e98 | 1227 | #: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 |
649900bc | 1228 | #, c-format |
a0b6b246 JX |
1229 | msgid "could not open '%s'" |
1230 | msgstr "不能打开 '%s'" | |
649900bc | 1231 | |
a0b6b246 JX |
1232 | #: bundle.c:139 |
1233 | msgid "Repository lacks these prerequisite commits:" | |
1234 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1235 | |
60638e98 | 1236 | #: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 |
87cb7997 JX |
1237 | #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 |
1238 | #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 | |
1239 | #: builtin/merge.c:359 builtin/shortlog.c:176 | |
a0b6b246 JX |
1240 | msgid "revision walk setup failed" |
1241 | msgstr "版本遍历设置失败" | |
2e8451e8 | 1242 | |
a0b6b246 | 1243 | #: bundle.c:185 |
2e8451e8 | 1244 | #, c-format |
a0b6b246 JX |
1245 | msgid "The bundle contains this ref:" |
1246 | msgid_plural "The bundle contains these %d refs:" | |
1247 | msgstr[0] "这个包中含有这个引用:" | |
1248 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1249 | |
a0b6b246 JX |
1250 | #: bundle.c:192 |
1251 | msgid "The bundle records a complete history." | |
1252 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1253 | |
a0b6b246 | 1254 | #: bundle.c:194 |
2e8451e8 | 1255 | #, c-format |
a0b6b246 JX |
1256 | msgid "The bundle requires this ref:" |
1257 | msgid_plural "The bundle requires these %d refs:" | |
1258 | msgstr[0] "这个包需要这个引用:" | |
1259 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1260 | |
a0b6b246 JX |
1261 | #: bundle.c:253 |
1262 | msgid "Could not spawn pack-objects" | |
1263 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1264 | |
a0b6b246 JX |
1265 | #: bundle.c:264 |
1266 | msgid "pack-objects died" | |
1267 | msgstr "pack-objects 终止" | |
8ada9598 | 1268 | |
a0b6b246 JX |
1269 | #: bundle.c:304 |
1270 | msgid "rev-list died" | |
1271 | msgstr "rev-list 终止" | |
1272 | ||
1273 | #: bundle.c:353 | |
81809b99 | 1274 | #, c-format |
a0b6b246 JX |
1275 | msgid "ref '%s' is excluded by the rev-list options" |
1276 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1277 | |
87cb7997 | 1278 | #: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 |
81809b99 | 1279 | #, c-format |
a0b6b246 JX |
1280 | msgid "unrecognized argument: %s" |
1281 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1282 | |
a0b6b246 JX |
1283 | #: bundle.c:451 |
1284 | msgid "Refusing to create empty bundle." | |
1285 | msgstr "不能创建空包。" | |
1286 | ||
1287 | #: bundle.c:463 | |
81809b99 | 1288 | #, c-format |
a0b6b246 JX |
1289 | msgid "cannot create '%s'" |
1290 | msgstr "不能创建 '%s'" | |
8ada9598 | 1291 | |
a0b6b246 JX |
1292 | #: bundle.c:491 |
1293 | msgid "index-pack died" | |
1294 | msgstr "index-pack 终止" | |
63af42fe | 1295 | |
1a79b2f1 | 1296 | #: color.c:300 |
94550ed3 | 1297 | #, c-format |
a0b6b246 JX |
1298 | msgid "invalid color value: %.*s" |
1299 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1300 | |
60638e98 JX |
1301 | #: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 |
1302 | #: builtin/am.c:1489 builtin/am.c:2126 | |
94550ed3 | 1303 | #, c-format |
a0b6b246 JX |
1304 | msgid "could not parse %s" |
1305 | msgstr "不能解析 %s" | |
94550ed3 | 1306 | |
a0b6b246 JX |
1307 | #: commit.c:42 |
1308 | #, c-format | |
1309 | msgid "%s %s is not a commit!" | |
1310 | msgstr "%s %s 不是一个提交!" | |
90314792 | 1311 | |
87cb7997 | 1312 | #: commit.c:1511 |
90314792 | 1313 | msgid "" |
a0b6b246 JX |
1314 | "Warning: commit message did not conform to UTF-8.\n" |
1315 | "You may want to amend it after fixing the message, or set the config\n" | |
1316 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1317 | msgstr "" | |
29004bbb | 1318 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1319 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1320 | "设置为您项目所用的字符编码。\n" |
90314792 | 1321 | |
a0b6b246 JX |
1322 | #: compat/obstack.c:406 compat/obstack.c:408 |
1323 | msgid "memory exhausted" | |
1324 | msgstr "内存耗尽" | |
90314792 | 1325 | |
87cb7997 JX |
1326 | #: config.c:191 |
1327 | msgid "relative config include conditionals must come from files" | |
1328 | msgstr "包含相对路径的条件引用必须来自于文件" | |
1329 | ||
60638e98 | 1330 | #: config.c:711 |
90314792 | 1331 | #, c-format |
a0b6b246 JX |
1332 | msgid "bad config line %d in blob %s" |
1333 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1334 | |
60638e98 | 1335 | #: config.c:715 |
a77c07d9 | 1336 | #, c-format |
a0b6b246 JX |
1337 | msgid "bad config line %d in file %s" |
1338 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1339 | |
60638e98 | 1340 | #: config.c:719 |
a77c07d9 | 1341 | #, c-format |
a0b6b246 JX |
1342 | msgid "bad config line %d in standard input" |
1343 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1344 | |
60638e98 | 1345 | #: config.c:723 |
90314792 | 1346 | #, c-format |
a0b6b246 JX |
1347 | msgid "bad config line %d in submodule-blob %s" |
1348 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1349 | |
60638e98 | 1350 | #: config.c:727 |
90314792 | 1351 | #, c-format |
a0b6b246 JX |
1352 | msgid "bad config line %d in command line %s" |
1353 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1354 | |
60638e98 | 1355 | #: config.c:731 |
90314792 | 1356 | #, c-format |
a0b6b246 JX |
1357 | msgid "bad config line %d in %s" |
1358 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1359 | |
60638e98 | 1360 | #: config.c:859 |
a0b6b246 JX |
1361 | msgid "out of range" |
1362 | msgstr "超出范围" | |
6c94aba5 | 1363 | |
60638e98 | 1364 | #: config.c:859 |
a0b6b246 JX |
1365 | msgid "invalid unit" |
1366 | msgstr "无效的单位" | |
6c94aba5 | 1367 | |
60638e98 | 1368 | #: config.c:865 |
6c94aba5 | 1369 | #, c-format |
a0b6b246 JX |
1370 | msgid "bad numeric config value '%s' for '%s': %s" |
1371 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1372 | |
60638e98 | 1373 | #: config.c:870 |
1b7f4a34 | 1374 | #, c-format |
a0b6b246 JX |
1375 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1376 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1377 | |
60638e98 | 1378 | #: config.c:873 |
1b7f4a34 | 1379 | #, c-format |
a0b6b246 JX |
1380 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1381 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1382 | |
60638e98 | 1383 | #: config.c:876 |
1b7f4a34 | 1384 | #, c-format |
a0b6b246 JX |
1385 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1386 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1387 | |
60638e98 | 1388 | #: config.c:879 |
1b7f4a34 | 1389 | #, c-format |
a0b6b246 JX |
1390 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1391 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1392 | |
60638e98 | 1393 | #: config.c:882 |
94550ed3 | 1394 | #, c-format |
a0b6b246 JX |
1395 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1396 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1397 | |
60638e98 | 1398 | #: config.c:885 |
276ceeaa | 1399 | #, c-format |
a0b6b246 JX |
1400 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1401 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1402 | |
60638e98 | 1403 | #: config.c:980 |
276ceeaa | 1404 | #, c-format |
a0b6b246 JX |
1405 | msgid "failed to expand user dir in: '%s'" |
1406 | msgstr "无法扩展 '%s' 中的用户目录" | |
94550ed3 | 1407 | |
60638e98 | 1408 | #: config.c:1075 config.c:1086 |
3495628d | 1409 | #, c-format |
a0b6b246 JX |
1410 | msgid "bad zlib compression level %d" |
1411 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1412 | |
60638e98 | 1413 | #: config.c:1203 |
3495628d | 1414 | #, c-format |
a0b6b246 JX |
1415 | msgid "invalid mode for object creation: %s" |
1416 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1417 | |
60638e98 | 1418 | #: config.c:1359 |
1a79b2f1 JX |
1419 | #, c-format |
1420 | msgid "bad pack compression level %d" | |
1421 | msgstr "错误的打包压缩级别 %d" | |
1422 | ||
60638e98 | 1423 | #: config.c:1557 |
a0b6b246 JX |
1424 | msgid "unable to parse command-line config" |
1425 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1426 | |
60638e98 | 1427 | #: config.c:1611 |
a0b6b246 JX |
1428 | msgid "unknown error occurred while reading the configuration files" |
1429 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1430 | |
60638e98 | 1431 | #: config.c:1970 |
87cb7997 JX |
1432 | #, c-format |
1433 | msgid "Invalid %s: '%s'" | |
1434 | msgstr "无效 %s:'%s'" | |
1435 | ||
60638e98 | 1436 | #: config.c:1991 |
87cb7997 JX |
1437 | #, c-format |
1438 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1439 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1440 | ||
60638e98 | 1441 | #: config.c:2017 |
87cb7997 JX |
1442 | #, c-format |
1443 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1444 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1445 | ||
60638e98 | 1446 | #: config.c:2028 |
276ceeaa | 1447 | #, c-format |
a0b6b246 JX |
1448 | msgid "unable to parse '%s' from command-line config" |
1449 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1450 | |
60638e98 | 1451 | #: config.c:2030 |
94550ed3 | 1452 | #, c-format |
a0b6b246 JX |
1453 | msgid "bad config variable '%s' in file '%s' at line %d" |
1454 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1455 | |
60638e98 | 1456 | #: config.c:2089 |
276ceeaa | 1457 | #, c-format |
a0b6b246 JX |
1458 | msgid "%s has multiple values" |
1459 | msgstr "%s 有多个取值" | |
276ceeaa | 1460 | |
60638e98 | 1461 | #: config.c:2423 config.c:2648 |
1a79b2f1 JX |
1462 | #, c-format |
1463 | msgid "fstat on %s failed" | |
65e2041e | 1464 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 1465 | |
60638e98 | 1466 | #: config.c:2541 |
94550ed3 | 1467 | #, c-format |
a0b6b246 JX |
1468 | msgid "could not set '%s' to '%s'" |
1469 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1470 | |
60638e98 | 1471 | #: config.c:2543 builtin/remote.c:774 |
276ceeaa | 1472 | #, c-format |
a0b6b246 JX |
1473 | msgid "could not unset '%s'" |
1474 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1475 | |
a0b6b246 JX |
1476 | #: connect.c:49 |
1477 | msgid "The remote end hung up upon initial contact" | |
29004bbb | 1478 | msgstr "远端在连接发起时即挂断" |
94550ed3 | 1479 | |
a0b6b246 JX |
1480 | #: connect.c:51 |
1481 | msgid "" | |
1482 | "Could not read from remote repository.\n" | |
1483 | "\n" | |
1484 | "Please make sure you have the correct access rights\n" | |
1485 | "and the repository exists." | |
1486 | msgstr "" | |
1487 | "无法读取远程仓库。\n" | |
1488 | "\n" | |
1489 | "请确认您有正确的访问权限并且仓库存在。" | |
1490 | ||
1a79b2f1 | 1491 | #: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 |
a0b6b246 JX |
1492 | msgid "Checking connectivity" |
1493 | msgstr "检查连接中" | |
1494 | ||
1495 | #: connected.c:75 | |
1496 | msgid "Could not run 'git rev-list'" | |
1497 | msgstr "不能执行 'git rev-list'" | |
1498 | ||
1499 | #: connected.c:95 | |
1500 | msgid "failed write to rev-list" | |
1501 | msgstr "无法写入 rev-list" | |
1502 | ||
1503 | #: connected.c:102 | |
1504 | msgid "failed to close rev-list's stdin" | |
1505 | msgstr "无法关闭 rev-list 的标准输入" | |
1506 | ||
1507 | #: convert.c:201 | |
3495628d | 1508 | #, c-format |
a0b6b246 JX |
1509 | msgid "" |
1510 | "CRLF will be replaced by LF in %s.\n" | |
1511 | "The file will have its original line endings in your working directory." | |
1512 | msgstr "" | |
1513 | "文件 %s 中的 CRLF 将被 LF 替换。\n" | |
1514 | "在工作区中该文件仍保持原有的换行符。" | |
3495628d | 1515 | |
a0b6b246 | 1516 | #: convert.c:205 |
3495628d | 1517 | #, c-format |
a0b6b246 JX |
1518 | msgid "CRLF would be replaced by LF in %s." |
1519 | msgstr "文件 %s 中的 CRLF 将被 LF 替换。" | |
3495628d | 1520 | |
a0b6b246 | 1521 | #: convert.c:211 |
276ceeaa | 1522 | #, c-format |
a0b6b246 JX |
1523 | msgid "" |
1524 | "LF will be replaced by CRLF in %s.\n" | |
1525 | "The file will have its original line endings in your working directory." | |
1526 | msgstr "" | |
1527 | "文件 %s 中的 LF 将被 CRLF 替换。\n" | |
1528 | "在工作区中该文件仍保持原有的换行符。" | |
276ceeaa | 1529 | |
a0b6b246 | 1530 | #: convert.c:215 |
3495628d | 1531 | #, c-format |
a0b6b246 JX |
1532 | msgid "LF would be replaced by CRLF in %s" |
1533 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 1534 | |
a0b6b246 JX |
1535 | #: date.c:97 |
1536 | msgid "in the future" | |
1537 | msgstr "在将来" | |
3495628d | 1538 | |
a0b6b246 | 1539 | #: date.c:103 |
3495628d | 1540 | #, c-format |
a0b6b246 JX |
1541 | msgid "%lu second ago" |
1542 | msgid_plural "%lu seconds ago" | |
1543 | msgstr[0] "%lu 秒钟前" | |
1544 | msgstr[1] "%lu 秒钟前" | |
3495628d | 1545 | |
a0b6b246 | 1546 | #: date.c:110 |
3495628d | 1547 | #, c-format |
a0b6b246 JX |
1548 | msgid "%lu minute ago" |
1549 | msgid_plural "%lu minutes ago" | |
1550 | msgstr[0] "%lu 分钟前" | |
1551 | msgstr[1] "%lu 分钟前" | |
3495628d | 1552 | |
a0b6b246 | 1553 | #: date.c:117 |
3495628d | 1554 | #, c-format |
a0b6b246 JX |
1555 | msgid "%lu hour ago" |
1556 | msgid_plural "%lu hours ago" | |
1557 | msgstr[0] "%lu 小时前" | |
1558 | msgstr[1] "%lu 小时前" | |
3495628d | 1559 | |
a0b6b246 | 1560 | #: date.c:124 |
3495628d | 1561 | #, c-format |
a0b6b246 JX |
1562 | msgid "%lu day ago" |
1563 | msgid_plural "%lu days ago" | |
1564 | msgstr[0] "%lu 天前" | |
1565 | msgstr[1] "%lu 天前" | |
3495628d | 1566 | |
a0b6b246 | 1567 | #: date.c:130 |
94550ed3 | 1568 | #, c-format |
a0b6b246 JX |
1569 | msgid "%lu week ago" |
1570 | msgid_plural "%lu weeks ago" | |
1571 | msgstr[0] "%lu 周前" | |
1572 | msgstr[1] "%lu 周前" | |
94550ed3 | 1573 | |
a0b6b246 | 1574 | #: date.c:137 |
3495628d | 1575 | #, c-format |
a0b6b246 JX |
1576 | msgid "%lu month ago" |
1577 | msgid_plural "%lu months ago" | |
1578 | msgstr[0] "%lu 个月前" | |
1579 | msgstr[1] "%lu 个月前" | |
3495628d | 1580 | |
a0b6b246 | 1581 | #: date.c:148 |
3495628d | 1582 | #, c-format |
a0b6b246 JX |
1583 | msgid "%lu year" |
1584 | msgid_plural "%lu years" | |
1585 | msgstr[0] "%lu 年" | |
1586 | msgstr[1] "%lu 年" | |
3495628d | 1587 | |
a0b6b246 JX |
1588 | #. TRANSLATORS: "%s" is "<n> years" |
1589 | #: date.c:151 | |
94550ed3 | 1590 | #, c-format |
a0b6b246 JX |
1591 | msgid "%s, %lu month ago" |
1592 | msgid_plural "%s, %lu months ago" | |
1593 | msgstr[0] "%s %lu 个月前" | |
1594 | msgstr[1] "%s %lu 个月前" | |
94550ed3 | 1595 | |
a0b6b246 | 1596 | #: date.c:156 date.c:161 |
94550ed3 | 1597 | #, c-format |
a0b6b246 JX |
1598 | msgid "%lu year ago" |
1599 | msgid_plural "%lu years ago" | |
1600 | msgstr[0] "%lu 年前" | |
1601 | msgstr[1] "%lu 年前" | |
94550ed3 | 1602 | |
a0b6b246 | 1603 | #: diffcore-order.c:24 |
cfff71a9 | 1604 | #, c-format |
a0b6b246 JX |
1605 | msgid "failed to read orderfile '%s'" |
1606 | msgstr "无法读取排序文件 '%s'" | |
cfff71a9 | 1607 | |
275588f9 | 1608 | #: diffcore-rename.c:536 |
a0b6b246 | 1609 | msgid "Performing inexact rename detection" |
87cb7997 | 1610 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 1611 | |
a0b6b246 | 1612 | #: diff.c:62 |
cfff71a9 | 1613 | #, c-format |
a0b6b246 JX |
1614 | msgid "option '%s' requires a value" |
1615 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 1616 | |
a0b6b246 JX |
1617 | # 译者:注意保持前导空格 |
1618 | #: diff.c:124 | |
1619 | #, c-format | |
1620 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
1621 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 1622 | |
a0b6b246 JX |
1623 | # 译者:注意保持前导空格 |
1624 | #: diff.c:129 | |
1625 | #, c-format | |
1626 | msgid " Unknown dirstat parameter '%s'\n" | |
1627 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 1628 | |
1a79b2f1 | 1629 | #: diff.c:281 |
7aea43ff | 1630 | #, c-format |
a0b6b246 JX |
1631 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
1632 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 1633 | |
1a79b2f1 | 1634 | #: diff.c:344 |
7aea43ff | 1635 | #, c-format |
a0b6b246 JX |
1636 | msgid "" |
1637 | "Found errors in 'diff.dirstat' config variable:\n" | |
1638 | "%s" | |
1639 | msgstr "" | |
1640 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
1641 | "%s" | |
7aea43ff | 1642 | |
87cb7997 | 1643 | #: diff.c:3102 |
7aea43ff | 1644 | #, c-format |
a0b6b246 JX |
1645 | msgid "external diff died, stopping at %s" |
1646 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 1647 | |
87cb7997 | 1648 | #: diff.c:3428 |
a0b6b246 JX |
1649 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
1650 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
1651 | ||
87cb7997 | 1652 | #: diff.c:3518 |
a0b6b246 JX |
1653 | msgid "--follow requires exactly one pathspec" |
1654 | msgstr "--follow 明确要求只跟一个路径规格" | |
1655 | ||
87cb7997 | 1656 | #: diff.c:3681 |
7aea43ff | 1657 | #, c-format |
a0b6b246 JX |
1658 | msgid "" |
1659 | "Failed to parse --dirstat/-X option parameter:\n" | |
1660 | "%s" | |
1661 | msgstr "" | |
1662 | "无法解析 --dirstat/-X 选项的参数:\n" | |
1663 | "%s" | |
7aea43ff | 1664 | |
87cb7997 | 1665 | #: diff.c:3695 |
7aea43ff | 1666 | #, c-format |
a0b6b246 JX |
1667 | msgid "Failed to parse --submodule option parameter: '%s'" |
1668 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 1669 | |
87cb7997 | 1670 | #: diff.c:4719 |
a0b6b246 JX |
1671 | msgid "inexact rename detection was skipped due to too many files." |
1672 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
1673 | ||
87cb7997 | 1674 | #: diff.c:4722 |
a0b6b246 JX |
1675 | msgid "only found copies from modified paths due to too many files." |
1676 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
1677 | ||
87cb7997 | 1678 | #: diff.c:4725 |
7aea43ff | 1679 | #, c-format |
a0b6b246 JX |
1680 | msgid "" |
1681 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 1682 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 1683 | |
87cb7997 | 1684 | #: dir.c:1899 |
a0b6b246 JX |
1685 | msgid "failed to get kernel name and information" |
1686 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 1687 | |
87cb7997 | 1688 | #: dir.c:2018 |
a0b6b246 JX |
1689 | msgid "Untracked cache is disabled on this system or location." |
1690 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 1691 | |
87cb7997 JX |
1692 | #: dir.c:2776 dir.c:2781 |
1693 | #, c-format | |
1694 | msgid "could not create directories for %s" | |
1695 | msgstr "不能为 %s 创建目录" | |
1696 | ||
1697 | #: dir.c:2806 | |
1a79b2f1 JX |
1698 | #, c-format |
1699 | msgid "could not migrate git directory from '%s' to '%s'" | |
1700 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
1701 | ||
87cb7997 JX |
1702 | #: entry.c:280 |
1703 | #, c-format | |
1704 | msgid "could not stat file '%s'" | |
65e2041e | 1705 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 JX |
1706 | |
1707 | #: fetch-pack.c:249 | |
a0b6b246 JX |
1708 | msgid "git fetch-pack: expected shallow list" |
1709 | msgstr "git fetch-pack:应为 shallow 列表" | |
1710 | ||
87cb7997 | 1711 | #: fetch-pack.c:261 |
a0b6b246 JX |
1712 | msgid "git fetch-pack: expected ACK/NAK, got EOF" |
1713 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" | |
1714 | ||
60638e98 JX |
1715 | #: fetch-pack.c:280 builtin/archive.c:63 |
1716 | #, c-format | |
1717 | msgid "remote error: %s" | |
1718 | msgstr "远程错误:%s" | |
1719 | ||
1720 | #: fetch-pack.c:281 | |
90314792 | 1721 | #, c-format |
275588f9 | 1722 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 1723 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 1724 | |
60638e98 | 1725 | #: fetch-pack.c:333 |
a0b6b246 JX |
1726 | msgid "--stateless-rpc requires multi_ack_detailed" |
1727 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 1728 | |
60638e98 | 1729 | #: fetch-pack.c:419 |
90314792 | 1730 | #, c-format |
a0b6b246 JX |
1731 | msgid "invalid shallow line: %s" |
1732 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 1733 | |
60638e98 | 1734 | #: fetch-pack.c:425 |
c04f5ac3 | 1735 | #, c-format |
a0b6b246 JX |
1736 | msgid "invalid unshallow line: %s" |
1737 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 1738 | |
60638e98 | 1739 | #: fetch-pack.c:427 |
a0b6b246 JX |
1740 | #, c-format |
1741 | msgid "object not found: %s" | |
1742 | msgstr "对象未找到:%s" | |
07432cef | 1743 | |
60638e98 | 1744 | #: fetch-pack.c:430 |
c04f5ac3 | 1745 | #, c-format |
a0b6b246 JX |
1746 | msgid "error in object: %s" |
1747 | msgstr "对象中出错:%s" | |
07432cef | 1748 | |
60638e98 | 1749 | #: fetch-pack.c:432 |
c04f5ac3 | 1750 | #, c-format |
a0b6b246 JX |
1751 | msgid "no shallow found: %s" |
1752 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 1753 | |
60638e98 | 1754 | #: fetch-pack.c:435 |
a0b6b246 JX |
1755 | #, c-format |
1756 | msgid "expected shallow/unshallow, got %s" | |
1757 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 1758 | |
60638e98 | 1759 | #: fetch-pack.c:474 |
a0b6b246 JX |
1760 | #, c-format |
1761 | msgid "got %s %d %s" | |
1762 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 1763 | |
60638e98 | 1764 | #: fetch-pack.c:488 |
1b7f4a34 | 1765 | #, c-format |
a0b6b246 JX |
1766 | msgid "invalid commit %s" |
1767 | msgstr "无效提交 %s" | |
1b7f4a34 | 1768 | |
60638e98 | 1769 | #: fetch-pack.c:521 |
a0b6b246 JX |
1770 | msgid "giving up" |
1771 | msgstr "放弃" | |
814ff314 | 1772 | |
60638e98 | 1773 | #: fetch-pack.c:531 progress.c:235 |
a0b6b246 JX |
1774 | msgid "done" |
1775 | msgstr "完成" | |
2e8451e8 | 1776 | |
60638e98 | 1777 | #: fetch-pack.c:543 |
2e8451e8 | 1778 | #, c-format |
a0b6b246 JX |
1779 | msgid "got %s (%d) %s" |
1780 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 1781 | |
60638e98 | 1782 | #: fetch-pack.c:589 |
a0b6b246 JX |
1783 | #, c-format |
1784 | msgid "Marking %s as complete" | |
1785 | msgstr "标记 %s 为完成" | |
220c313c | 1786 | |
60638e98 | 1787 | #: fetch-pack.c:737 |
a0b6b246 JX |
1788 | #, c-format |
1789 | msgid "already have %s (%s)" | |
29004bbb | 1790 | msgstr "已经有 %s(%s)" |
220c313c | 1791 | |
60638e98 | 1792 | #: fetch-pack.c:775 |
a0b6b246 JX |
1793 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
1794 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 1795 | |
60638e98 | 1796 | #: fetch-pack.c:783 |
a0b6b246 JX |
1797 | msgid "protocol error: bad pack header" |
1798 | msgstr "协议错误:坏的包头" | |
814ff314 | 1799 | |
60638e98 | 1800 | #: fetch-pack.c:839 |
a0b6b246 JX |
1801 | #, c-format |
1802 | msgid "fetch-pack: unable to fork off %s" | |
1803 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 1804 | |
60638e98 | 1805 | #: fetch-pack.c:855 |
a0b6b246 JX |
1806 | #, c-format |
1807 | msgid "%s failed" | |
1808 | msgstr "%s 失败" | |
14c8bced | 1809 | |
60638e98 | 1810 | #: fetch-pack.c:857 |
a0b6b246 JX |
1811 | msgid "error in sideband demultiplexer" |
1812 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 1813 | |
60638e98 | 1814 | #: fetch-pack.c:884 |
a0b6b246 JX |
1815 | msgid "Server does not support shallow clients" |
1816 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 1817 | |
60638e98 | 1818 | #: fetch-pack.c:888 |
a0b6b246 JX |
1819 | msgid "Server supports multi_ack_detailed" |
1820 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 1821 | |
60638e98 | 1822 | #: fetch-pack.c:891 |
a0b6b246 JX |
1823 | msgid "Server supports no-done" |
1824 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 1825 | |
60638e98 | 1826 | #: fetch-pack.c:897 |
a0b6b246 JX |
1827 | msgid "Server supports multi_ack" |
1828 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 1829 | |
60638e98 | 1830 | #: fetch-pack.c:901 |
a0b6b246 JX |
1831 | msgid "Server supports side-band-64k" |
1832 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 1833 | |
60638e98 | 1834 | #: fetch-pack.c:905 |
a0b6b246 JX |
1835 | msgid "Server supports side-band" |
1836 | msgstr "服务器支持 side-band" | |
5c57d762 | 1837 | |
60638e98 | 1838 | #: fetch-pack.c:909 |
a0b6b246 JX |
1839 | msgid "Server supports allow-tip-sha1-in-want" |
1840 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 1841 | |
60638e98 | 1842 | #: fetch-pack.c:913 |
a0b6b246 JX |
1843 | msgid "Server supports allow-reachable-sha1-in-want" |
1844 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 1845 | |
60638e98 | 1846 | #: fetch-pack.c:923 |
a0b6b246 JX |
1847 | msgid "Server supports ofs-delta" |
1848 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 1849 | |
60638e98 | 1850 | #: fetch-pack.c:930 |
81809b99 | 1851 | #, c-format |
a0b6b246 JX |
1852 | msgid "Server version is %.*s" |
1853 | msgstr "服务器版本 %.*s" | |
8ada9598 | 1854 | |
60638e98 | 1855 | #: fetch-pack.c:936 |
a0b6b246 JX |
1856 | msgid "Server does not support --shallow-since" |
1857 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 1858 | |
60638e98 | 1859 | #: fetch-pack.c:940 |
a0b6b246 JX |
1860 | msgid "Server does not support --shallow-exclude" |
1861 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 1862 | |
60638e98 | 1863 | #: fetch-pack.c:942 |
a0b6b246 JX |
1864 | msgid "Server does not support --deepen" |
1865 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 1866 | |
60638e98 | 1867 | #: fetch-pack.c:953 |
a0b6b246 JX |
1868 | msgid "no common commits" |
1869 | msgstr "没有共同的提交" | |
c04f5ac3 | 1870 | |
60638e98 | 1871 | #: fetch-pack.c:965 |
a0b6b246 JX |
1872 | msgid "git fetch-pack: fetch failed." |
1873 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 1874 | |
60638e98 | 1875 | #: fetch-pack.c:1127 |
a0b6b246 JX |
1876 | msgid "no matching remote head" |
1877 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 1878 | |
60638e98 | 1879 | #: fetch-pack.c:1149 |
87cb7997 JX |
1880 | #, c-format |
1881 | msgid "no such remote ref %s" | |
1882 | msgstr "没有这样的远程引用 %s" | |
1883 | ||
60638e98 | 1884 | #: fetch-pack.c:1152 |
87cb7997 JX |
1885 | #, c-format |
1886 | msgid "Server does not allow request for unadvertised object %s" | |
1887 | msgstr "服务器不允许请求未公开的对象 %s" | |
1888 | ||
a0b6b246 JX |
1889 | #: gpg-interface.c:185 |
1890 | msgid "gpg failed to sign the data" | |
1891 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 1892 | |
a0b6b246 JX |
1893 | #: gpg-interface.c:215 |
1894 | msgid "could not create temporary file" | |
1895 | msgstr "不能创建临时文件" | |
c04f5ac3 | 1896 | |
a0b6b246 | 1897 | #: gpg-interface.c:217 |
c04f5ac3 | 1898 | #, c-format |
a0b6b246 JX |
1899 | msgid "failed writing detached signature to '%s'" |
1900 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 1901 | |
1a79b2f1 JX |
1902 | #: graph.c:96 |
1903 | #, c-format | |
1904 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
1905 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
1906 | ||
87cb7997 | 1907 | #: grep.c:1796 |
c04f5ac3 | 1908 | #, c-format |
a0b6b246 JX |
1909 | msgid "'%s': unable to read %s" |
1910 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 1911 | |
87cb7997 | 1912 | #: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 |
c04f5ac3 | 1913 | #, c-format |
a0b6b246 | 1914 | msgid "failed to stat '%s'" |
65e2041e | 1915 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 1916 | |
87cb7997 | 1917 | #: grep.c:1824 |
a0b6b246 JX |
1918 | #, c-format |
1919 | msgid "'%s': short read" | |
1920 | msgstr "'%s':读取不完整" | |
5c57d762 | 1921 | |
1a79b2f1 | 1922 | #: help.c:218 |
a0b6b246 JX |
1923 | #, c-format |
1924 | msgid "available git commands in '%s'" | |
1925 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 1926 | |
1a79b2f1 | 1927 | #: help.c:225 |
a0b6b246 JX |
1928 | msgid "git commands available from elsewhere on your $PATH" |
1929 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 1930 | |
1a79b2f1 | 1931 | #: help.c:256 |
a0b6b246 JX |
1932 | msgid "These are common Git commands used in various situations:" |
1933 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 1934 | |
1a79b2f1 | 1935 | #: help.c:321 |
c04f5ac3 | 1936 | #, c-format |
a0b6b246 JX |
1937 | msgid "" |
1938 | "'%s' appears to be a git command, but we were not\n" | |
1939 | "able to execute it. Maybe git-%s is broken?" | |
1940 | msgstr "" | |
1941 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
1942 | "可能是 git-%s 受损?" | |
c04f5ac3 | 1943 | |
1a79b2f1 | 1944 | #: help.c:376 |
a0b6b246 JX |
1945 | msgid "Uh oh. Your system reports no Git commands at all." |
1946 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 1947 | |
1a79b2f1 | 1948 | #: help.c:398 |
c04f5ac3 | 1949 | #, c-format |
a0b6b246 JX |
1950 | msgid "" |
1951 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
1952 | "Continuing under the assumption that you meant '%s'" | |
1953 | msgstr "" | |
1954 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" | |
1955 | "是 '%s'" | |
c04f5ac3 | 1956 | |
1a79b2f1 | 1957 | #: help.c:403 |
c04f5ac3 | 1958 | #, c-format |
a0b6b246 JX |
1959 | msgid "in %0.1f seconds automatically..." |
1960 | msgstr "在 %0.1f 秒钟后自动运行..." | |
c04f5ac3 | 1961 | |
1a79b2f1 | 1962 | #: help.c:410 |
c04f5ac3 | 1963 | #, c-format |
a0b6b246 JX |
1964 | msgid "git: '%s' is not a git command. See 'git --help'." |
1965 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 1966 | |
1a79b2f1 | 1967 | #: help.c:414 help.c:480 |
a0b6b246 JX |
1968 | msgid "" |
1969 | "\n" | |
1970 | "Did you mean this?" | |
1971 | msgid_plural "" | |
1972 | "\n" | |
1973 | "Did you mean one of these?" | |
1974 | msgstr[0] "" | |
1975 | "\n" | |
1976 | "您指的是这个么?" | |
1977 | msgstr[1] "" | |
1978 | "\n" | |
1979 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 1980 | |
1a79b2f1 | 1981 | #: help.c:476 |
c04f5ac3 | 1982 | #, c-format |
a0b6b246 JX |
1983 | msgid "%s: %s - %s" |
1984 | msgstr "%s:%s - %s" | |
1985 | ||
87cb7997 | 1986 | #: ident.c:343 |
a0b6b246 JX |
1987 | msgid "" |
1988 | "\n" | |
1989 | "*** Please tell me who you are.\n" | |
1990 | "\n" | |
1991 | "Run\n" | |
1992 | "\n" | |
1993 | " git config --global user.email \"you@example.com\"\n" | |
1994 | " git config --global user.name \"Your Name\"\n" | |
1995 | "\n" | |
1996 | "to set your account's default identity.\n" | |
1997 | "Omit --global to set the identity only in this repository.\n" | |
1998 | "\n" | |
1999 | msgstr "" | |
2000 | "\n" | |
2001 | "*** 请告诉我你是谁。\n" | |
2002 | "\n" | |
2003 | "运行\n" | |
2004 | "\n" | |
2005 | " git config --global user.email \"you@example.com\"\n" | |
2006 | " git config --global user.name \"Your Name\"\n" | |
2007 | "\n" | |
2008 | "来设置您账号的缺省身份标识。\n" | |
2009 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 2010 | |
87cb7997 JX |
2011 | #: ident.c:367 |
2012 | msgid "no email was given and auto-detection is disabled" | |
65e2041e | 2013 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 JX |
2014 | |
2015 | #: ident.c:372 | |
2016 | #, c-format | |
2017 | msgid "unable to auto-detect email address (got '%s')" | |
2018 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
2019 | ||
2020 | #: ident.c:382 | |
2021 | msgid "no name was given and auto-detection is disabled" | |
2022 | msgstr "未提供姓名且自动探测被禁用" | |
2023 | ||
2024 | #: ident.c:388 | |
2025 | #, c-format | |
2026 | msgid "unable to auto-detect name (got '%s')" | |
2027 | msgstr "无法自动探测姓名(得到 '%s')" | |
2028 | ||
2029 | #: ident.c:396 | |
2030 | #, c-format | |
2031 | msgid "empty ident name (for <%s>) not allowed" | |
2032 | msgstr "不允许空的姓名(对于 <%s>)" | |
2033 | ||
2034 | #: ident.c:402 | |
2035 | #, c-format | |
2036 | msgid "name consists only of disallowed characters: %s" | |
2037 | msgstr "姓名中仅包含禁用字符:%s" | |
2038 | ||
2039 | #: ident.c:417 builtin/commit.c:611 | |
2040 | #, c-format | |
2041 | msgid "invalid date format: %s" | |
2042 | msgstr "无效的日期格式:%s" | |
2043 | ||
a0b6b246 | 2044 | #: lockfile.c:152 |
c04f5ac3 | 2045 | #, c-format |
a0b6b246 JX |
2046 | msgid "" |
2047 | "Unable to create '%s.lock': %s.\n" | |
2048 | "\n" | |
2049 | "Another git process seems to be running in this repository, e.g.\n" | |
2050 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2051 | "are terminated then try again. If it still fails, a git process\n" | |
2052 | "may have crashed in this repository earlier:\n" | |
2053 | "remove the file manually to continue." | |
2054 | msgstr "" | |
2055 | "无法创建 '%s.lock':%s。\n" | |
2056 | "\n" | |
2057 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
2058 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
2059 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
2060 | "手动删除这个文件再继续。" | |
c04f5ac3 | 2061 | |
a0b6b246 JX |
2062 | #: lockfile.c:160 |
2063 | #, c-format | |
2064 | msgid "Unable to create '%s.lock': %s" | |
2065 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 2066 | |
a0b6b246 JX |
2067 | #: merge.c:41 |
2068 | msgid "failed to read the cache" | |
2069 | msgstr "无法读取缓存" | |
c04f5ac3 | 2070 | |
60638e98 | 2071 | #: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 |
87cb7997 | 2072 | #: builtin/checkout.c:607 builtin/clone.c:749 |
a0b6b246 JX |
2073 | msgid "unable to write new index file" |
2074 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 2075 | |
a0b6b246 JX |
2076 | #: merge-recursive.c:209 |
2077 | msgid "(bad commit)\n" | |
2078 | msgstr "(坏提交)\n" | |
c04f5ac3 | 2079 | |
1a79b2f1 | 2080 | #: merge-recursive.c:231 merge-recursive.c:239 |
a0b6b246 JX |
2081 | #, c-format |
2082 | msgid "addinfo_cache failed for path '%s'" | |
2083 | msgstr "为路径 '%s' addinfo_cache 失败" | |
c04f5ac3 | 2084 | |
1a79b2f1 | 2085 | #: merge-recursive.c:303 |
a0b6b246 JX |
2086 | msgid "error building trees" |
2087 | msgstr "无法创建树" | |
c04f5ac3 | 2088 | |
1a79b2f1 | 2089 | #: merge-recursive.c:727 |
c04f5ac3 | 2090 | #, c-format |
a0b6b246 JX |
2091 | msgid "failed to create path '%s'%s" |
2092 | msgstr "无法创建路径 '%s'%s" | |
c04f5ac3 | 2093 | |
1a79b2f1 | 2094 | #: merge-recursive.c:738 |
c04f5ac3 | 2095 | #, c-format |
a0b6b246 JX |
2096 | msgid "Removing %s to make room for subdirectory\n" |
2097 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 2098 | |
1a79b2f1 | 2099 | #: merge-recursive.c:752 merge-recursive.c:771 |
a0b6b246 JX |
2100 | msgid ": perhaps a D/F conflict?" |
2101 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 2102 | |
1a79b2f1 | 2103 | #: merge-recursive.c:761 |
c04f5ac3 | 2104 | #, c-format |
a0b6b246 JX |
2105 | msgid "refusing to lose untracked file at '%s'" |
2106 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2107 | |
1a79b2f1 | 2108 | #: merge-recursive.c:803 builtin/cat-file.c:34 |
c04f5ac3 | 2109 | #, c-format |
a0b6b246 JX |
2110 | msgid "cannot read object %s '%s'" |
2111 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2112 | |
1a79b2f1 | 2113 | #: merge-recursive.c:805 |
4dcdc3d8 | 2114 | #, c-format |
a0b6b246 JX |
2115 | msgid "blob expected for %s '%s'" |
2116 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 2117 | |
1a79b2f1 | 2118 | #: merge-recursive.c:829 |
4dcdc3d8 | 2119 | #, c-format |
a0b6b246 JX |
2120 | msgid "failed to open '%s': %s" |
2121 | msgstr "无法打开 '%s':%s" | |
4dcdc3d8 | 2122 | |
1a79b2f1 | 2123 | #: merge-recursive.c:840 |
a0b6b246 JX |
2124 | #, c-format |
2125 | msgid "failed to symlink '%s': %s" | |
2126 | msgstr "无法创建符号链接 '%s':%s" | |
c04f5ac3 | 2127 | |
1a79b2f1 | 2128 | #: merge-recursive.c:845 |
5c57d762 | 2129 | #, c-format |
a0b6b246 JX |
2130 | msgid "do not know what to do with %06o %s '%s'" |
2131 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 2132 | |
1a79b2f1 | 2133 | #: merge-recursive.c:985 |
a0b6b246 JX |
2134 | msgid "Failed to execute internal merge" |
2135 | msgstr "无法执行内部合并" | |
2136 | ||
1a79b2f1 | 2137 | #: merge-recursive.c:989 |
5c57d762 | 2138 | #, c-format |
a0b6b246 JX |
2139 | msgid "Unable to add %s to database" |
2140 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 2141 | |
87cb7997 | 2142 | #: merge-recursive.c:1092 |
5c57d762 JX |
2143 | #, c-format |
2144 | msgid "" | |
a0b6b246 JX |
2145 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
2146 | "in tree." | |
5c57d762 | 2147 | msgstr "" |
87cb7997 JX |
2148 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2149 | "本被保留。" | |
2150 | ||
2151 | #: merge-recursive.c:1097 | |
2152 | #, c-format | |
2153 | msgid "" | |
2154 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2155 | "left in tree." | |
2156 | msgstr "" | |
2157 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2158 | "%7$s 版本被保留。" | |
c04f5ac3 | 2159 | |
87cb7997 | 2160 | #: merge-recursive.c:1104 |
7aea43ff | 2161 | #, c-format |
a0b6b246 JX |
2162 | msgid "" |
2163 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2164 | "in tree at %s." | |
2165 | msgstr "" | |
87cb7997 JX |
2166 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2167 | "本保留在 %8$s 中。" | |
7aea43ff | 2168 | |
87cb7997 JX |
2169 | #: merge-recursive.c:1109 |
2170 | #, c-format | |
2171 | msgid "" | |
2172 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2173 | "left in tree at %s." | |
2174 | msgstr "" | |
2175 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2176 | "%7$s 版本保留在 %9$s 中。" | |
2177 | ||
2178 | #: merge-recursive.c:1143 | |
a0b6b246 JX |
2179 | msgid "rename" |
2180 | msgstr "重命名" | |
5b04ee3b | 2181 | |
87cb7997 | 2182 | #: merge-recursive.c:1143 |
a0b6b246 JX |
2183 | msgid "renamed" |
2184 | msgstr "重命名" | |
5b04ee3b | 2185 | |
87cb7997 | 2186 | #: merge-recursive.c:1200 |
5c57d762 | 2187 | #, c-format |
a0b6b246 JX |
2188 | msgid "%s is a directory in %s adding as %s instead" |
2189 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 2190 | |
87cb7997 | 2191 | #: merge-recursive.c:1225 |
5c57d762 JX |
2192 | #, c-format |
2193 | msgid "" | |
a0b6b246 JX |
2194 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
2195 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 2196 | msgstr "" |
a0b6b246 JX |
2197 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
2198 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 2199 | |
87cb7997 | 2200 | #: merge-recursive.c:1230 |
a0b6b246 JX |
2201 | msgid " (left unresolved)" |
2202 | msgstr "(留下未解决)" | |
5c57d762 | 2203 | |
87cb7997 | 2204 | #: merge-recursive.c:1292 |
5c57d762 | 2205 | #, c-format |
a0b6b246 | 2206 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 2207 | msgstr "" |
a0b6b246 JX |
2208 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
2209 | "%5$s" | |
3495628d | 2210 | |
87cb7997 | 2211 | #: merge-recursive.c:1325 |
3495628d | 2212 | #, c-format |
a0b6b246 JX |
2213 | msgid "Renaming %s to %s and %s to %s instead" |
2214 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" | |
3495628d | 2215 | |
87cb7997 | 2216 | #: merge-recursive.c:1528 |
3495628d | 2217 | #, c-format |
a0b6b246 JX |
2218 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
2219 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 2220 | |
87cb7997 | 2221 | #: merge-recursive.c:1543 |
a0b6b246 JX |
2222 | #, c-format |
2223 | msgid "Adding merged %s" | |
2224 | msgstr "添加合并后的 %s" | |
90314792 | 2225 | |
87cb7997 | 2226 | #: merge-recursive.c:1550 merge-recursive.c:1780 |
90314792 | 2227 | #, c-format |
a0b6b246 JX |
2228 | msgid "Adding as %s instead" |
2229 | msgstr "而是以 %s 为名添加" | |
90314792 | 2230 | |
87cb7997 | 2231 | #: merge-recursive.c:1607 |
90314792 | 2232 | #, c-format |
a0b6b246 JX |
2233 | msgid "cannot read object %s" |
2234 | msgstr "不能读取对象 %s" | |
90314792 | 2235 | |
87cb7997 | 2236 | #: merge-recursive.c:1610 |
90314792 | 2237 | #, c-format |
a0b6b246 JX |
2238 | msgid "object %s is not a blob" |
2239 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 2240 | |
87cb7997 | 2241 | #: merge-recursive.c:1679 |
a0b6b246 JX |
2242 | msgid "modify" |
2243 | msgstr "修改" | |
90314792 | 2244 | |
87cb7997 | 2245 | #: merge-recursive.c:1679 |
a0b6b246 JX |
2246 | msgid "modified" |
2247 | msgstr "修改" | |
5b04ee3b | 2248 | |
87cb7997 | 2249 | #: merge-recursive.c:1689 |
a0b6b246 JX |
2250 | msgid "content" |
2251 | msgstr "内容" | |
5b04ee3b | 2252 | |
87cb7997 | 2253 | #: merge-recursive.c:1696 |
a0b6b246 JX |
2254 | msgid "add/add" |
2255 | msgstr "添加/添加" | |
3495628d | 2256 | |
87cb7997 | 2257 | #: merge-recursive.c:1732 |
220c313c | 2258 | #, c-format |
a0b6b246 JX |
2259 | msgid "Skipped %s (merged same as existing)" |
2260 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 2261 | |
87cb7997 | 2262 | #: merge-recursive.c:1746 |
220c313c | 2263 | #, c-format |
a0b6b246 JX |
2264 | msgid "Auto-merging %s" |
2265 | msgstr "自动合并 %s" | |
220c313c | 2266 | |
87cb7997 | 2267 | #: merge-recursive.c:1750 git-submodule.sh:944 |
a0b6b246 JX |
2268 | msgid "submodule" |
2269 | msgstr "子模组" | |
2270 | ||
87cb7997 | 2271 | #: merge-recursive.c:1751 |
220c313c | 2272 | #, c-format |
a0b6b246 JX |
2273 | msgid "CONFLICT (%s): Merge conflict in %s" |
2274 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 2275 | |
87cb7997 | 2276 | #: merge-recursive.c:1845 |
220c313c | 2277 | #, c-format |
a0b6b246 JX |
2278 | msgid "Removing %s" |
2279 | msgstr "删除 %s" | |
220c313c | 2280 | |
87cb7997 | 2281 | #: merge-recursive.c:1871 |
a0b6b246 JX |
2282 | msgid "file/directory" |
2283 | msgstr "文件/目录" | |
220c313c | 2284 | |
87cb7997 | 2285 | #: merge-recursive.c:1877 |
a0b6b246 JX |
2286 | msgid "directory/file" |
2287 | msgstr "目录/文件" | |
276ceeaa | 2288 | |
87cb7997 | 2289 | #: merge-recursive.c:1883 |
276ceeaa | 2290 | #, c-format |
a0b6b246 JX |
2291 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
2292 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 2293 | |
87cb7997 | 2294 | #: merge-recursive.c:1892 |
276ceeaa | 2295 | #, c-format |
a0b6b246 JX |
2296 | msgid "Adding %s" |
2297 | msgstr "添加 %s" | |
276ceeaa | 2298 | |
87cb7997 | 2299 | #: merge-recursive.c:1929 |
a0b6b246 JX |
2300 | msgid "Already up-to-date!" |
2301 | msgstr "已经是最新的!" | |
276ceeaa | 2302 | |
87cb7997 | 2303 | #: merge-recursive.c:1938 |
276ceeaa | 2304 | #, c-format |
a0b6b246 JX |
2305 | msgid "merging of trees %s and %s failed" |
2306 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 2307 | |
87cb7997 | 2308 | #: merge-recursive.c:2021 |
a0b6b246 JX |
2309 | msgid "Merging:" |
2310 | msgstr "合并:" | |
5c57d762 | 2311 | |
87cb7997 | 2312 | #: merge-recursive.c:2034 |
5c57d762 | 2313 | #, c-format |
a0b6b246 JX |
2314 | msgid "found %u common ancestor:" |
2315 | msgid_plural "found %u common ancestors:" | |
2316 | msgstr[0] "发现 %u 个共同祖先:" | |
2317 | msgstr[1] "发现 %u 个共同祖先:" | |
2318 | ||
87cb7997 | 2319 | #: merge-recursive.c:2073 |
a0b6b246 JX |
2320 | msgid "merge returned no commit" |
2321 | msgstr "合并未返回提交" | |
2322 | ||
87cb7997 | 2323 | #: merge-recursive.c:2136 |
5c57d762 | 2324 | #, c-format |
a0b6b246 JX |
2325 | msgid "Could not parse object '%s'" |
2326 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 2327 | |
87cb7997 | 2328 | #: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 |
a0b6b246 JX |
2329 | msgid "Unable to write index." |
2330 | msgstr "不能写入索引。" | |
2331 | ||
2332 | #: notes-merge.c:273 | |
5c57d762 JX |
2333 | #, c-format |
2334 | msgid "" | |
a0b6b246 JX |
2335 | "You have not concluded your previous notes merge (%s exists).\n" |
2336 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
2337 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 2338 | msgstr "" |
29004bbb | 2339 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
2340 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
2341 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 2342 | |
a0b6b246 JX |
2343 | #: notes-merge.c:280 |
2344 | #, c-format | |
2345 | msgid "You have not concluded your notes merge (%s exists)." | |
2346 | msgstr "您尚未结束注释合并(存在 %s)。" | |
2347 | ||
2348 | #: notes-utils.c:41 | |
2349 | msgid "Cannot commit uninitialized/unreferenced notes tree" | |
2350 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 2351 | |
a0b6b246 | 2352 | #: notes-utils.c:100 |
1b7f4a34 | 2353 | #, c-format |
a0b6b246 JX |
2354 | msgid "Bad notes.rewriteMode value: '%s'" |
2355 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 2356 | |
a0b6b246 | 2357 | #: notes-utils.c:110 |
5b04ee3b | 2358 | #, c-format |
a0b6b246 JX |
2359 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
2360 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 2361 | |
a0b6b246 JX |
2362 | #. TRANSLATORS: The first %s is the name of the |
2363 | #. environment variable, the second %s is its value | |
2364 | #: notes-utils.c:137 | |
5b04ee3b | 2365 | #, c-format |
a0b6b246 JX |
2366 | msgid "Bad %s value: '%s'" |
2367 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 2368 | |
1a79b2f1 | 2369 | #: object.c:240 |
5b04ee3b | 2370 | #, c-format |
a0b6b246 JX |
2371 | msgid "unable to parse object: %s" |
2372 | msgstr "不能解析对象:%s" | |
5b04ee3b | 2373 | |
a0b6b246 JX |
2374 | #: parse-options.c:572 |
2375 | msgid "..." | |
2376 | msgstr "..." | |
2377 | ||
2378 | #: parse-options.c:590 | |
5b04ee3b | 2379 | #, c-format |
a0b6b246 JX |
2380 | msgid "usage: %s" |
2381 | msgstr "用法:%s" | |
5b04ee3b | 2382 | |
a0b6b246 JX |
2383 | #. TRANSLATORS: the colon here should align with the |
2384 | #. one in "usage: %s" translation | |
2385 | #: parse-options.c:594 | |
5b04ee3b | 2386 | #, c-format |
a0b6b246 JX |
2387 | msgid " or: %s" |
2388 | msgstr " 或:%s" | |
5b04ee3b | 2389 | |
a0b6b246 JX |
2390 | # 译者:为保证在输出中对齐,注意调整句中空格! |
2391 | #: parse-options.c:597 | |
5b04ee3b | 2392 | #, c-format |
a0b6b246 JX |
2393 | msgid " %s" |
2394 | msgstr " %s" | |
5b04ee3b | 2395 | |
a0b6b246 JX |
2396 | #: parse-options.c:631 |
2397 | msgid "-NUM" | |
2398 | msgstr "-数字" | |
2399 | ||
2400 | #: parse-options-cb.c:108 | |
5b04ee3b | 2401 | #, c-format |
a0b6b246 JX |
2402 | msgid "malformed object name '%s'" |
2403 | msgstr "非法的对象名 '%s'" | |
5b04ee3b | 2404 | |
60638e98 | 2405 | #: path.c:810 |
5b04ee3b | 2406 | #, c-format |
a0b6b246 JX |
2407 | msgid "Could not make %s writable by group" |
2408 | msgstr "不能设置 %s 为组可写" | |
2409 | ||
87cb7997 JX |
2410 | #: pathspec.c:125 |
2411 | msgid "Escape character '\\' not allowed as last character in attr value" | |
2412 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
2413 | ||
2414 | #: pathspec.c:143 | |
2415 | msgid "Only one 'attr:' specification is allowed." | |
2416 | msgstr "只允许一个 'attr:' 规格。" | |
2417 | ||
2418 | #: pathspec.c:146 | |
2419 | msgid "attr spec must not be empty" | |
2420 | msgstr "属性规格不能为空" | |
2421 | ||
2422 | #: pathspec.c:189 | |
2423 | #, c-format | |
2424 | msgid "invalid attribute name %s" | |
2425 | msgstr "无效的属性名 %s" | |
2426 | ||
2427 | #: pathspec.c:254 | |
a0b6b246 JX |
2428 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
2429 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
2430 | ||
87cb7997 | 2431 | #: pathspec.c:261 |
5b04ee3b | 2432 | msgid "" |
a0b6b246 JX |
2433 | "global 'literal' pathspec setting is incompatible with all other global " |
2434 | "pathspec settings" | |
2435 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 2436 | |
87cb7997 | 2437 | #: pathspec.c:301 |
a0b6b246 JX |
2438 | msgid "invalid parameter for pathspec magic 'prefix'" |
2439 | msgstr "路径规格包含无效的神奇前缀" | |
2440 | ||
87cb7997 | 2441 | #: pathspec.c:322 |
5b04ee3b | 2442 | #, c-format |
a0b6b246 JX |
2443 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
2444 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 2445 | |
87cb7997 | 2446 | #: pathspec.c:327 |
5b04ee3b | 2447 | #, c-format |
a0b6b246 JX |
2448 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
2449 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 2450 | |
87cb7997 | 2451 | #: pathspec.c:365 |
5b04ee3b | 2452 | #, c-format |
a0b6b246 JX |
2453 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
2454 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 2455 | |
87cb7997 | 2456 | #: pathspec.c:421 pathspec.c:443 |
1a79b2f1 JX |
2457 | #, c-format |
2458 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
2459 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
2460 | ||
87cb7997 | 2461 | #: pathspec.c:483 |
5b04ee3b | 2462 | #, c-format |
a0b6b246 JX |
2463 | msgid "%s: 'literal' and 'glob' are incompatible" |
2464 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 2465 | |
87cb7997 | 2466 | #: pathspec.c:496 |
5b04ee3b | 2467 | #, c-format |
a0b6b246 JX |
2468 | msgid "%s: '%s' is outside repository" |
2469 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 2470 | |
87cb7997 | 2471 | #: pathspec.c:584 |
5b04ee3b | 2472 | #, c-format |
1a79b2f1 JX |
2473 | msgid "'%s' (mnemonic: '%c')" |
2474 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 2475 | |
87cb7997 | 2476 | #: pathspec.c:594 |
5b04ee3b | 2477 | #, c-format |
a0b6b246 JX |
2478 | msgid "%s: pathspec magic not supported by this command: %s" |
2479 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
2480 | ||
87cb7997 | 2481 | #: pathspec.c:644 |
5b04ee3b | 2482 | msgid "" |
a0b6b246 JX |
2483 | "empty strings as pathspecs will be made invalid in upcoming releases. please " |
2484 | "use . instead if you meant to match all paths" | |
5b04ee3b | 2485 | msgstr "" |
29004bbb | 2486 | "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n" |
a0b6b246 | 2487 | "请代之以 ." |
5b04ee3b | 2488 | |
87cb7997 | 2489 | #: pathspec.c:668 |
5b04ee3b | 2490 | #, c-format |
a0b6b246 JX |
2491 | msgid "pathspec '%s' is beyond a symbolic link" |
2492 | msgstr "路径规格 '%s' 位于符号链接中" | |
2493 | ||
1a79b2f1 | 2494 | #: pretty.c:982 |
a0b6b246 JX |
2495 | msgid "unable to parse --pretty format" |
2496 | msgstr "不能解析 --pretty 格式" | |
2497 | ||
60638e98 | 2498 | #: read-cache.c:1442 |
5b04ee3b JX |
2499 | #, c-format |
2500 | msgid "" | |
a0b6b246 JX |
2501 | "index.version set, but the value is invalid.\n" |
2502 | "Using version %i" | |
5b04ee3b | 2503 | msgstr "" |
a0b6b246 JX |
2504 | "设置了 index.version,但是取值无效。\n" |
2505 | "使用版本 %i" | |
5b04ee3b | 2506 | |
60638e98 | 2507 | #: read-cache.c:1452 |
5b04ee3b JX |
2508 | #, c-format |
2509 | msgid "" | |
a0b6b246 JX |
2510 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
2511 | "Using version %i" | |
5b04ee3b | 2512 | msgstr "" |
a0b6b246 JX |
2513 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
2514 | "使用版本 %i" | |
5b04ee3b | 2515 | |
60638e98 | 2516 | #: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 |
87cb7997 | 2517 | #, c-format |
60638e98 | 2518 | msgid "could not stat '%s'" |
65e2041e | 2519 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 2520 | |
60638e98 | 2521 | #: read-cache.c:2388 |
87cb7997 JX |
2522 | #, c-format |
2523 | msgid "unable to open git dir: %s" | |
2524 | msgstr "不能打开 git 目录:%s" | |
2525 | ||
60638e98 | 2526 | #: read-cache.c:2400 |
87cb7997 JX |
2527 | #, c-format |
2528 | msgid "unable to unlink: %s" | |
2529 | msgstr "无法删除:%s" | |
2530 | ||
60638e98 | 2531 | #: refs.c:620 builtin/merge.c:844 |
5b04ee3b | 2532 | #, c-format |
a0b6b246 JX |
2533 | msgid "Could not open '%s' for writing" |
2534 | msgstr "无法打开 '%s' 进行写入" | |
5b04ee3b | 2535 | |
60638e98 JX |
2536 | #: refs.c:1667 |
2537 | msgid "ref updates forbidden inside quarantine environment" | |
2538 | msgstr "在隔离环境中禁止更新引用" | |
2539 | ||
2540 | #: refs/files-backend.c:1631 | |
5b04ee3b | 2541 | #, c-format |
a0b6b246 JX |
2542 | msgid "could not delete reference %s: %s" |
2543 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 2544 | |
60638e98 | 2545 | #: refs/files-backend.c:1634 |
5b04ee3b | 2546 | #, c-format |
a0b6b246 JX |
2547 | msgid "could not delete references: %s" |
2548 | msgstr "无法删除引用:%s" | |
5b04ee3b | 2549 | |
60638e98 | 2550 | #: refs/files-backend.c:1643 |
5b04ee3b | 2551 | #, c-format |
a0b6b246 JX |
2552 | msgid "could not remove reference %s" |
2553 | msgstr "无法删除引用 %s" | |
5b04ee3b | 2554 | |
87cb7997 JX |
2555 | #: ref-filter.c:35 wt-status.c:1780 |
2556 | msgid "gone" | |
2557 | msgstr "丢失" | |
2558 | ||
2559 | #: ref-filter.c:36 | |
2560 | #, c-format | |
2561 | msgid "ahead %d" | |
2562 | msgstr "领先 %d" | |
2563 | ||
2564 | #: ref-filter.c:37 | |
2565 | #, c-format | |
2566 | msgid "behind %d" | |
2567 | msgstr "落后 %d" | |
2568 | ||
2569 | #: ref-filter.c:38 | |
2570 | #, c-format | |
2571 | msgid "ahead %d, behind %d" | |
2572 | msgstr "领先 %d,落后 %d" | |
2573 | ||
2574 | #: ref-filter.c:104 | |
5b04ee3b | 2575 | #, c-format |
a0b6b246 JX |
2576 | msgid "expected format: %%(color:<color>)" |
2577 | msgstr "期望的格式:%%(color:<color>)" | |
5b04ee3b | 2578 | |
87cb7997 | 2579 | #: ref-filter.c:106 |
5b04ee3b | 2580 | #, c-format |
a0b6b246 JX |
2581 | msgid "unrecognized color: %%(color:%s)" |
2582 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 2583 | |
87cb7997 | 2584 | #: ref-filter.c:120 |
a0b6b246 | 2585 | #, c-format |
87cb7997 JX |
2586 | msgid "Integer value expected refname:lstrip=%s" |
2587 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 2588 | |
87cb7997 JX |
2589 | #: ref-filter.c:124 |
2590 | #, c-format | |
2591 | msgid "Integer value expected refname:rstrip=%s" | |
2592 | msgstr "期望整数值 refname:rstrip=%s" | |
2593 | ||
2594 | #: ref-filter.c:126 | |
2595 | #, c-format | |
2596 | msgid "unrecognized %%(%s) argument: %s" | |
2597 | msgstr "未能识别的 %%(%s) 参数:%s" | |
2598 | ||
2599 | #: ref-filter.c:166 | |
90314792 | 2600 | #, c-format |
a0b6b246 JX |
2601 | msgid "%%(body) does not take arguments" |
2602 | msgstr "%%(body) 不带参数" | |
90314792 | 2603 | |
87cb7997 | 2604 | #: ref-filter.c:173 |
a0b6b246 JX |
2605 | #, c-format |
2606 | msgid "%%(subject) does not take arguments" | |
2607 | msgstr "%%(subject) 不带参数" | |
90314792 | 2608 | |
87cb7997 | 2609 | #: ref-filter.c:180 |
1a79b2f1 JX |
2610 | #, c-format |
2611 | msgid "%%(trailers) does not take arguments" | |
2612 | msgstr "%%(trailers) 不带参数" | |
2613 | ||
87cb7997 | 2614 | #: ref-filter.c:199 |
a0b6b246 JX |
2615 | #, c-format |
2616 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 2617 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 2618 | |
87cb7997 | 2619 | #: ref-filter.c:201 |
a0b6b246 JX |
2620 | #, c-format |
2621 | msgid "unrecognized %%(contents) argument: %s" | |
2622 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 2623 | |
87cb7997 JX |
2624 | #: ref-filter.c:214 |
2625 | #, c-format | |
2626 | msgid "positive value expected objectname:short=%s" | |
2627 | msgstr "期望一个正数 objectname:short=%s" | |
2628 | ||
2629 | #: ref-filter.c:218 | |
a0b6b246 JX |
2630 | #, c-format |
2631 | msgid "unrecognized %%(objectname) argument: %s" | |
2632 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 2633 | |
87cb7997 | 2634 | #: ref-filter.c:245 |
a0b6b246 JX |
2635 | #, c-format |
2636 | msgid "expected format: %%(align:<width>,<position>)" | |
2637 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
90314792 | 2638 | |
87cb7997 | 2639 | #: ref-filter.c:257 |
5c57d762 | 2640 | #, c-format |
a0b6b246 JX |
2641 | msgid "unrecognized position:%s" |
2642 | msgstr "未能识别的位置:%s" | |
5c57d762 | 2643 | |
87cb7997 | 2644 | #: ref-filter.c:261 |
1b7f4a34 | 2645 | #, c-format |
a0b6b246 JX |
2646 | msgid "unrecognized width:%s" |
2647 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 2648 | |
87cb7997 | 2649 | #: ref-filter.c:267 |
1b7f4a34 | 2650 | #, c-format |
a0b6b246 JX |
2651 | msgid "unrecognized %%(align) argument: %s" |
2652 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 2653 | |
87cb7997 | 2654 | #: ref-filter.c:271 |
1b7f4a34 | 2655 | #, c-format |
a0b6b246 JX |
2656 | msgid "positive width expected with the %%(align) atom" |
2657 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 2658 | |
87cb7997 JX |
2659 | #: ref-filter.c:286 |
2660 | #, c-format | |
2661 | msgid "unrecognized %%(if) argument: %s" | |
2662 | msgstr "未能识别的 %%(if) 参数:%s" | |
2663 | ||
2664 | #: ref-filter.c:371 | |
07432cef | 2665 | #, c-format |
a0b6b246 JX |
2666 | msgid "malformed field name: %.*s" |
2667 | msgstr "非法的字段名:%.*s" | |
ef317cd5 | 2668 | |
87cb7997 | 2669 | #: ref-filter.c:397 |
a0b6b246 JX |
2670 | #, c-format |
2671 | msgid "unknown field name: %.*s" | |
2672 | msgstr "未知的字段名:%.*s" | |
220c313c | 2673 | |
87cb7997 JX |
2674 | #: ref-filter.c:501 |
2675 | #, c-format | |
2676 | msgid "format: %%(if) atom used without a %%(then) atom" | |
2677 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
2678 | ||
2679 | #: ref-filter.c:561 | |
2680 | #, c-format | |
2681 | msgid "format: %%(then) atom used without an %%(if) atom" | |
2682 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
2683 | ||
2684 | #: ref-filter.c:563 | |
2685 | #, c-format | |
2686 | msgid "format: %%(then) atom used more than once" | |
2687 | msgstr "格式:%%(then) 元素用了多次" | |
2688 | ||
2689 | #: ref-filter.c:565 | |
2690 | #, c-format | |
2691 | msgid "format: %%(then) atom used after %%(else)" | |
2692 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
2693 | ||
2694 | #: ref-filter.c:591 | |
2695 | #, c-format | |
2696 | msgid "format: %%(else) atom used without an %%(if) atom" | |
2697 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
2698 | ||
2699 | #: ref-filter.c:593 | |
2700 | #, c-format | |
2701 | msgid "format: %%(else) atom used without a %%(then) atom" | |
2702 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
2703 | ||
2704 | #: ref-filter.c:595 | |
2705 | #, c-format | |
2706 | msgid "format: %%(else) atom used more than once" | |
2707 | msgstr "格式:%%(else) 元素用了多次" | |
2708 | ||
2709 | #: ref-filter.c:608 | |
7aea43ff | 2710 | #, c-format |
a0b6b246 JX |
2711 | msgid "format: %%(end) atom used without corresponding atom" |
2712 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 2713 | |
87cb7997 | 2714 | #: ref-filter.c:663 |
7aea43ff | 2715 | #, c-format |
a0b6b246 JX |
2716 | msgid "malformed format string %s" |
2717 | msgstr "非法的格式化字符串 %s" | |
7aea43ff | 2718 | |
87cb7997 JX |
2719 | #: ref-filter.c:1247 |
2720 | #, c-format | |
2721 | msgid "(no branch, rebasing %s)" | |
2722 | msgstr "(非分支,正变基 %s)" | |
2723 | ||
2724 | #: ref-filter.c:1250 | |
2725 | #, c-format | |
2726 | msgid "(no branch, bisect started on %s)" | |
2727 | msgstr "(非分支,二分查找开始于 %s)" | |
c04f5ac3 | 2728 | |
87cb7997 JX |
2729 | #. TRANSLATORS: make sure this matches |
2730 | #. "HEAD detached at " in wt-status.c | |
2731 | #: ref-filter.c:1256 | |
c04f5ac3 | 2732 | #, c-format |
87cb7997 JX |
2733 | msgid "(HEAD detached at %s)" |
2734 | msgstr "(头指针分离于 %s)" | |
c04f5ac3 | 2735 | |
87cb7997 JX |
2736 | #. TRANSLATORS: make sure this matches |
2737 | #. "HEAD detached from " in wt-status.c | |
2738 | #: ref-filter.c:1261 | |
a0b6b246 | 2739 | #, c-format |
87cb7997 JX |
2740 | msgid "(HEAD detached from %s)" |
2741 | msgstr "(头指针分离自 %s)" | |
6792b93b | 2742 | |
87cb7997 JX |
2743 | #: ref-filter.c:1265 |
2744 | msgid "(no branch)" | |
2745 | msgstr "(非分支)" | |
2746 | ||
2747 | #: ref-filter.c:1420 ref-filter.c:1451 | |
a0b6b246 JX |
2748 | #, c-format |
2749 | msgid "missing object %s for %s" | |
2750 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 2751 | |
87cb7997 | 2752 | #: ref-filter.c:1423 ref-filter.c:1454 |
a0b6b246 JX |
2753 | #, c-format |
2754 | msgid "parse_object_buffer failed on %s for %s" | |
2755 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 2756 | |
87cb7997 | 2757 | #: ref-filter.c:1692 |
a0b6b246 JX |
2758 | #, c-format |
2759 | msgid "malformed object at '%s'" | |
2760 | msgstr "非法的对象于 '%s'" | |
c04f5ac3 | 2761 | |
87cb7997 | 2762 | #: ref-filter.c:1759 |
a0b6b246 JX |
2763 | #, c-format |
2764 | msgid "ignoring ref with broken name %s" | |
2765 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 2766 | |
87cb7997 | 2767 | #: ref-filter.c:1764 |
a0b6b246 JX |
2768 | #, c-format |
2769 | msgid "ignoring broken ref %s" | |
2770 | msgstr "忽略损坏的引用 %s" | |
c04f5ac3 | 2771 | |
87cb7997 | 2772 | #: ref-filter.c:2028 |
a0b6b246 JX |
2773 | #, c-format |
2774 | msgid "format: %%(end) atom missing" | |
2775 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 2776 | |
87cb7997 | 2777 | #: ref-filter.c:2109 |
a0b6b246 JX |
2778 | #, c-format |
2779 | msgid "malformed object name %s" | |
2780 | msgstr "非法的对象名 %s" | |
c04f5ac3 | 2781 | |
1a79b2f1 | 2782 | #: remote.c:754 |
a0b6b246 JX |
2783 | #, c-format |
2784 | msgid "Cannot fetch both %s and %s to %s" | |
2785 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 2786 | |
1a79b2f1 | 2787 | #: remote.c:758 |
c04f5ac3 | 2788 | #, c-format |
a0b6b246 JX |
2789 | msgid "%s usually tracks %s, not %s" |
2790 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 2791 | |
1a79b2f1 | 2792 | #: remote.c:762 |
a0b6b246 JX |
2793 | #, c-format |
2794 | msgid "%s tracks both %s and %s" | |
2795 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 2796 | |
1a79b2f1 | 2797 | #: remote.c:770 |
a0b6b246 JX |
2798 | msgid "Internal error" |
2799 | msgstr "内部错误" | |
c04f5ac3 | 2800 | |
1a79b2f1 | 2801 | #: remote.c:1685 remote.c:1787 |
a0b6b246 JX |
2802 | msgid "HEAD does not point to a branch" |
2803 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 2804 | |
1a79b2f1 | 2805 | #: remote.c:1694 |
a0b6b246 JX |
2806 | #, c-format |
2807 | msgid "no such branch: '%s'" | |
2808 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 2809 | |
1a79b2f1 | 2810 | #: remote.c:1697 |
a0b6b246 JX |
2811 | #, c-format |
2812 | msgid "no upstream configured for branch '%s'" | |
2813 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 2814 | |
1a79b2f1 | 2815 | #: remote.c:1703 |
a0b6b246 JX |
2816 | #, c-format |
2817 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
2818 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 2819 | |
1a79b2f1 | 2820 | #: remote.c:1718 |
a0b6b246 JX |
2821 | #, c-format |
2822 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
2823 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 2824 | |
1a79b2f1 | 2825 | #: remote.c:1730 |
a0b6b246 JX |
2826 | #, c-format |
2827 | msgid "branch '%s' has no remote for pushing" | |
2828 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 2829 | |
1a79b2f1 | 2830 | #: remote.c:1741 |
a0b6b246 JX |
2831 | #, c-format |
2832 | msgid "push refspecs for '%s' do not include '%s'" | |
2833 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 2834 | |
1a79b2f1 | 2835 | #: remote.c:1754 |
a0b6b246 JX |
2836 | msgid "push has no destination (push.default is 'nothing')" |
2837 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 2838 | |
1a79b2f1 | 2839 | #: remote.c:1776 |
a0b6b246 JX |
2840 | msgid "cannot resolve 'simple' push to a single destination" |
2841 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 2842 | |
1a79b2f1 | 2843 | #: remote.c:2081 |
a0b6b246 JX |
2844 | #, c-format |
2845 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
2846 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 2847 | |
1a79b2f1 | 2848 | #: remote.c:2085 |
a0b6b246 JX |
2849 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
2850 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 2851 | |
1a79b2f1 | 2852 | #: remote.c:2088 |
a0b6b246 JX |
2853 | #, c-format |
2854 | msgid "Your branch is up-to-date with '%s'.\n" | |
2855 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
cfff71a9 | 2856 | |
1a79b2f1 | 2857 | #: remote.c:2092 |
a0b6b246 JX |
2858 | #, c-format |
2859 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
2860 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
2861 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
2862 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 2863 | |
1a79b2f1 | 2864 | #: remote.c:2098 |
a0b6b246 JX |
2865 | msgid " (use \"git push\" to publish your local commits)\n" |
2866 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 2867 | |
1a79b2f1 | 2868 | #: remote.c:2101 |
a0b6b246 JX |
2869 | #, c-format |
2870 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
2871 | msgid_plural "" | |
2872 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
2873 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
2874 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 2875 | |
a0b6b246 | 2876 | # 译者:注意保持前导空格 |
1a79b2f1 | 2877 | #: remote.c:2109 |
a0b6b246 JX |
2878 | msgid " (use \"git pull\" to update your local branch)\n" |
2879 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 2880 | |
1a79b2f1 | 2881 | #: remote.c:2112 |
a0b6b246 JX |
2882 | #, c-format |
2883 | msgid "" | |
2884 | "Your branch and '%s' have diverged,\n" | |
2885 | "and have %d and %d different commit each, respectively.\n" | |
2886 | msgid_plural "" | |
2887 | "Your branch and '%s' have diverged,\n" | |
2888 | "and have %d and %d different commits each, respectively.\n" | |
2889 | msgstr[0] "" | |
2890 | "您的分支和 '%s' 出现了偏离,\n" | |
2891 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
2892 | msgstr[1] "" | |
2893 | "您的分支和 '%s' 出现了偏离,\n" | |
2894 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 2895 | |
a0b6b246 | 2896 | # 译者:注意保持前导空格 |
1a79b2f1 | 2897 | #: remote.c:2122 |
a0b6b246 JX |
2898 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
2899 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 2900 | |
a0b6b246 JX |
2901 | #: revision.c:2158 |
2902 | msgid "your current branch appears to be broken" | |
2903 | msgstr "您的当前分支好像被损坏" | |
cfff71a9 | 2904 | |
a0b6b246 JX |
2905 | #: revision.c:2161 |
2906 | #, c-format | |
2907 | msgid "your current branch '%s' does not have any commits yet" | |
2908 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6792b93b | 2909 | |
a0b6b246 JX |
2910 | #: revision.c:2355 |
2911 | msgid "--first-parent is incompatible with --bisect" | |
2912 | msgstr "--first-parent 与 --bisect 不兼容" | |
6792b93b | 2913 | |
1a79b2f1 | 2914 | #: run-command.c:125 |
a0b6b246 JX |
2915 | msgid "open /dev/null failed" |
2916 | msgstr "不能打开 /dev/null" | |
5c57d762 | 2917 | |
1a79b2f1 | 2918 | #: run-command.c:127 |
a0b6b246 JX |
2919 | #, c-format |
2920 | msgid "dup2(%d,%d) failed" | |
2921 | msgstr "不能调用 dup2(%d,%d)" | |
6792b93b | 2922 | |
87cb7997 JX |
2923 | #: send-pack.c:150 |
2924 | #, c-format | |
2925 | msgid "unable to parse remote unpack status: %s" | |
2926 | msgstr "不能解析远程解包状态:%s" | |
2927 | ||
2928 | #: send-pack.c:152 | |
2929 | #, c-format | |
2930 | msgid "remote unpack failed: %s" | |
2931 | msgstr "远程解包失败:%s" | |
2932 | ||
2933 | #: send-pack.c:315 | |
a0b6b246 JX |
2934 | msgid "failed to sign the push certificate" |
2935 | msgstr "无法为推送证书签名" | |
6792b93b | 2936 | |
87cb7997 | 2937 | #: send-pack.c:428 |
a0b6b246 JX |
2938 | msgid "the receiving end does not support --signed push" |
2939 | msgstr "接收端不支持签名推送" | |
6792b93b | 2940 | |
87cb7997 | 2941 | #: send-pack.c:430 |
a0b6b246 JX |
2942 | msgid "" |
2943 | "not sending a push certificate since the receiving end does not support --" | |
2944 | "signed push" | |
2945 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 2946 | |
87cb7997 | 2947 | #: send-pack.c:442 |
a0b6b246 JX |
2948 | msgid "the receiving end does not support --atomic push" |
2949 | msgstr "接收端不支持原子推送" | |
6792b93b | 2950 | |
87cb7997 | 2951 | #: send-pack.c:447 |
a0b6b246 JX |
2952 | msgid "the receiving end does not support push options" |
2953 | msgstr "接收端不支持推送选项" | |
6792b93b | 2954 | |
1a79b2f1 | 2955 | #: sequencer.c:215 |
a0b6b246 JX |
2956 | msgid "revert" |
2957 | msgstr "还原" | |
6792b93b | 2958 | |
1a79b2f1 | 2959 | #: sequencer.c:217 |
a0b6b246 JX |
2960 | msgid "cherry-pick" |
2961 | msgstr "拣选" | |
2962 | ||
1a79b2f1 JX |
2963 | #: sequencer.c:219 |
2964 | msgid "rebase -i" | |
2965 | msgstr "rebase -i" | |
2966 | ||
2967 | #: sequencer.c:221 | |
2968 | #, c-format | |
2969 | msgid "Unknown action: %d" | |
2970 | msgstr "未知动作:%d" | |
2971 | ||
2972 | #: sequencer.c:278 | |
a0b6b246 JX |
2973 | msgid "" |
2974 | "after resolving the conflicts, mark the corrected paths\n" | |
2975 | "with 'git add <paths>' or 'git rm <paths>'" | |
2976 | msgstr "" | |
2977 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
2978 | "命令标记修正后的文件" | |
2979 | ||
1a79b2f1 | 2980 | #: sequencer.c:281 |
a0b6b246 JX |
2981 | msgid "" |
2982 | "after resolving the conflicts, mark the corrected paths\n" | |
2983 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
2984 | "and commit the result with 'git commit'" | |
2985 | msgstr "" | |
2986 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
2987 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 2988 | |
60638e98 | 2989 | #: sequencer.c:294 sequencer.c:1682 |
1b7f4a34 | 2990 | #, c-format |
a0b6b246 JX |
2991 | msgid "could not lock '%s'" |
2992 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 2993 | |
60638e98 | 2994 | #: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 |
1b7f4a34 | 2995 | #, c-format |
a0b6b246 JX |
2996 | msgid "could not write to '%s'" |
2997 | msgstr "不能写入 '%s'" | |
1b7f4a34 | 2998 | |
1a79b2f1 | 2999 | #: sequencer.c:301 |
a0b6b246 | 3000 | #, c-format |
72351d7d | 3001 | msgid "could not write eol to '%s'" |
a0b6b246 | 3002 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 3003 | |
60638e98 | 3004 | #: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 |
1b7f4a34 | 3005 | #, c-format |
a0b6b246 JX |
3006 | msgid "failed to finalize '%s'." |
3007 | msgstr "无法完成 '%s'。" | |
1b7f4a34 | 3008 | |
60638e98 | 3009 | #: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 |
87cb7997 | 3010 | #: builtin/commit.c:749 builtin/merge.c:1018 |
a0b6b246 JX |
3011 | #, c-format |
3012 | msgid "could not read '%s'" | |
3013 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 3014 | |
1a79b2f1 | 3015 | #: sequencer.c:355 |
63af42fe | 3016 | #, c-format |
a0b6b246 JX |
3017 | msgid "your local changes would be overwritten by %s." |
3018 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 3019 | |
1a79b2f1 | 3020 | #: sequencer.c:359 |
a0b6b246 JX |
3021 | msgid "commit your changes or stash them to proceed." |
3022 | msgstr "提交您的修改或保存进度后再继续。" | |
6792b93b | 3023 | |
1a79b2f1 | 3024 | #: sequencer.c:388 |
a0b6b246 JX |
3025 | #, c-format |
3026 | msgid "%s: fast-forward" | |
3027 | msgstr "%s:快进" | |
6792b93b | 3028 | |
1a79b2f1 JX |
3029 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
3030 | #. * "rebase -i". | |
3031 | #. | |
3032 | #: sequencer.c:470 | |
a0b6b246 JX |
3033 | #, c-format |
3034 | msgid "%s: Unable to write new index file" | |
3035 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 3036 | |
1a79b2f1 | 3037 | #: sequencer.c:489 |
a0b6b246 JX |
3038 | msgid "could not resolve HEAD commit\n" |
3039 | msgstr "不能解析 HEAD 提交\n" | |
6792b93b | 3040 | |
1a79b2f1 | 3041 | #: sequencer.c:509 |
a0b6b246 | 3042 | msgid "unable to update cache tree\n" |
29004bbb | 3043 | msgstr "不能更新缓存树\n" |
6792b93b | 3044 | |
1a79b2f1 | 3045 | #: sequencer.c:592 |
63af42fe JX |
3046 | #, c-format |
3047 | msgid "" | |
a0b6b246 JX |
3048 | "you have staged changes in your working tree\n" |
3049 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
3050 | "\n" | |
3051 | " git commit --amend %s\n" | |
3052 | "\n" | |
3053 | "If they are meant to go into a new commit, run:\n" | |
3054 | "\n" | |
3055 | " git commit %s\n" | |
3056 | "\n" | |
3057 | "In both cases, once you're done, continue with:\n" | |
3058 | "\n" | |
3059 | " git rebase --continue\n" | |
3060 | msgstr "" | |
1a79b2f1 JX |
3061 | "您的工作区中存在已暂存的修改\n" |
3062 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
3063 | "\n" |
3064 | " git commit --amend %s\n" | |
3065 | "\n" | |
29004bbb | 3066 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
3067 | "\n" |
3068 | " git commit %s\n" | |
3069 | "\n" | |
3070 | "无论哪种情况,当您完成提交,继续执行:\n" | |
3071 | "\n" | |
3072 | " git rebase --continue\n" | |
6792b93b | 3073 | |
87cb7997 | 3074 | #: sequencer.c:694 |
a0b6b246 JX |
3075 | #, c-format |
3076 | msgid "could not parse commit %s\n" | |
3077 | msgstr "不能解析提交 %s\n" | |
6792b93b | 3078 | |
87cb7997 | 3079 | #: sequencer.c:699 |
63af42fe | 3080 | #, c-format |
a0b6b246 JX |
3081 | msgid "could not parse parent commit %s\n" |
3082 | msgstr "不能解析父提交 %s\n" | |
63af42fe | 3083 | |
87cb7997 | 3084 | #: sequencer.c:821 |
1a79b2f1 JX |
3085 | #, c-format |
3086 | msgid "" | |
3087 | "unexpected 1st line of squash message:\n" | |
3088 | "\n" | |
3089 | "\t%.*s" | |
3090 | msgstr "" | |
3091 | "意外的压缩提交首行提交信息:\n" | |
3092 | "\n" | |
3093 | "\t%.*s" | |
3094 | ||
87cb7997 | 3095 | #: sequencer.c:827 |
1a79b2f1 JX |
3096 | #, c-format |
3097 | msgid "" | |
3098 | "invalid 1st line of squash message:\n" | |
3099 | "\n" | |
3100 | "\t%.*s" | |
3101 | msgstr "" | |
3102 | "压缩提交的首行提交信息无效:\n" | |
3103 | "\n" | |
3104 | "\t%.*s" | |
3105 | ||
87cb7997 | 3106 | #: sequencer.c:833 sequencer.c:858 |
1a79b2f1 JX |
3107 | #, c-format |
3108 | msgid "This is a combination of %d commits." | |
3109 | msgstr "这是一个 %d 个提交的组合。" | |
3110 | ||
87cb7997 | 3111 | #: sequencer.c:842 |
1a79b2f1 JX |
3112 | msgid "need a HEAD to fixup" |
3113 | msgstr "需要一个 HEAD 来修复" | |
3114 | ||
87cb7997 | 3115 | #: sequencer.c:844 |
1a79b2f1 JX |
3116 | msgid "could not read HEAD" |
3117 | msgstr "不能读取 HEAD" | |
3118 | ||
87cb7997 | 3119 | #: sequencer.c:846 |
1a79b2f1 JX |
3120 | msgid "could not read HEAD's commit message" |
3121 | msgstr "不能读取 HEAD 的提交说明" | |
3122 | ||
87cb7997 | 3123 | #: sequencer.c:852 |
1a79b2f1 JX |
3124 | #, c-format |
3125 | msgid "cannot write '%s'" | |
3126 | msgstr "不能写 '%s'" | |
3127 | ||
87cb7997 | 3128 | #: sequencer.c:861 git-rebase--interactive.sh:445 |
1a79b2f1 JX |
3129 | msgid "This is the 1st commit message:" |
3130 | msgstr "这是第一个提交说明:" | |
3131 | ||
87cb7997 | 3132 | #: sequencer.c:869 |
1a79b2f1 JX |
3133 | #, c-format |
3134 | msgid "could not read commit message of %s" | |
3135 | msgstr "不能读取 %s 的提交说明" | |
3136 | ||
87cb7997 | 3137 | #: sequencer.c:876 |
1a79b2f1 JX |
3138 | #, c-format |
3139 | msgid "This is the commit message #%d:" | |
3140 | msgstr "这是提交说明 #%d:" | |
3141 | ||
87cb7997 | 3142 | #: sequencer.c:881 |
1a79b2f1 JX |
3143 | #, c-format |
3144 | msgid "The commit message #%d will be skipped:" | |
3145 | msgstr "提交说明 #%d 将被跳过:" | |
3146 | ||
87cb7997 | 3147 | #: sequencer.c:886 |
1a79b2f1 JX |
3148 | #, c-format |
3149 | msgid "unknown command: %d" | |
3150 | msgstr "未知命令:%d" | |
3151 | ||
87cb7997 | 3152 | #: sequencer.c:952 |
a0b6b246 JX |
3153 | msgid "your index file is unmerged." |
3154 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 3155 | |
87cb7997 | 3156 | #: sequencer.c:970 |
a0b6b246 JX |
3157 | #, c-format |
3158 | msgid "commit %s is a merge but no -m option was given." | |
3159 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 3160 | |
87cb7997 | 3161 | #: sequencer.c:978 |
a0b6b246 JX |
3162 | #, c-format |
3163 | msgid "commit %s does not have parent %d" | |
3164 | msgstr "提交 %s 没有第 %d 个父提交" | |
3165 | ||
87cb7997 | 3166 | #: sequencer.c:982 |
a0b6b246 JX |
3167 | #, c-format |
3168 | msgid "mainline was specified but commit %s is not a merge." | |
3169 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
3170 | ||
87cb7997 | 3171 | #: sequencer.c:988 |
1a79b2f1 JX |
3172 | #, c-format |
3173 | msgid "cannot get commit message for %s" | |
3174 | msgstr "不能得到 %s 的提交说明" | |
3175 | ||
a0b6b246 JX |
3176 | #. TRANSLATORS: The first %s will be a "todo" command like |
3177 | #. "revert" or "pick", the second %s a SHA1. | |
87cb7997 | 3178 | #: sequencer.c:1009 |
a0b6b246 JX |
3179 | #, c-format |
3180 | msgid "%s: cannot parse parent commit %s" | |
3181 | msgstr "%s:不能解析父提交 %s" | |
3182 | ||
60638e98 | 3183 | #: sequencer.c:1071 sequencer.c:1827 |
a0b6b246 | 3184 | #, c-format |
1a79b2f1 JX |
3185 | msgid "could not rename '%s' to '%s'" |
3186 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 3187 | |
87cb7997 | 3188 | #: sequencer.c:1122 |
a0b6b246 JX |
3189 | #, c-format |
3190 | msgid "could not revert %s... %s" | |
3191 | msgstr "不能还原 %s... %s" | |
3192 | ||
87cb7997 | 3193 | #: sequencer.c:1123 |
a0b6b246 JX |
3194 | #, c-format |
3195 | msgid "could not apply %s... %s" | |
3196 | msgstr "不能应用 %s... %s" | |
3197 | ||
87cb7997 | 3198 | #: sequencer.c:1165 |
a0b6b246 JX |
3199 | msgid "empty commit set passed" |
3200 | msgstr "提供了空的提交集" | |
3201 | ||
87cb7997 | 3202 | #: sequencer.c:1175 |
a0b6b246 JX |
3203 | #, c-format |
3204 | msgid "git %s: failed to read the index" | |
3205 | msgstr "git %s:无法读取索引" | |
3206 | ||
87cb7997 | 3207 | #: sequencer.c:1182 |
a0b6b246 JX |
3208 | #, c-format |
3209 | msgid "git %s: failed to refresh the index" | |
3210 | msgstr "git %s:无法刷新索引" | |
3211 | ||
60638e98 | 3212 | #: sequencer.c:1303 |
a0b6b246 JX |
3213 | #, c-format |
3214 | msgid "invalid line %d: %.*s" | |
3215 | msgstr "无效行 %d:%.*s" | |
3216 | ||
60638e98 | 3217 | #: sequencer.c:1311 |
1a79b2f1 JX |
3218 | #, c-format |
3219 | msgid "cannot '%s' without a previous commit" | |
3220 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 3221 | |
60638e98 | 3222 | #: sequencer.c:1344 |
a0b6b246 JX |
3223 | #, c-format |
3224 | msgid "could not read '%s'." | |
3225 | msgstr "不能读取 '%s'。" | |
3226 | ||
60638e98 | 3227 | #: sequencer.c:1356 |
1a79b2f1 JX |
3228 | msgid "please fix this using 'git rebase --edit-todo'." |
3229 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
3230 | ||
60638e98 | 3231 | #: sequencer.c:1358 |
a0b6b246 JX |
3232 | #, c-format |
3233 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 3234 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 3235 | |
60638e98 | 3236 | #: sequencer.c:1363 |
1a79b2f1 JX |
3237 | msgid "no commits parsed." |
3238 | msgstr "没有解析提交。" | |
3239 | ||
60638e98 | 3240 | #: sequencer.c:1374 |
a0b6b246 JX |
3241 | msgid "cannot cherry-pick during a revert." |
3242 | msgstr "不能在回退中执行拣选。" | |
3243 | ||
60638e98 | 3244 | #: sequencer.c:1376 |
a0b6b246 JX |
3245 | msgid "cannot revert during a cherry-pick." |
3246 | msgstr "不能在拣选中执行回退。" | |
3247 | ||
60638e98 | 3248 | #: sequencer.c:1439 |
a0b6b246 JX |
3249 | #, c-format |
3250 | msgid "invalid key: %s" | |
3251 | msgstr "无效键名:%s" | |
3252 | ||
60638e98 | 3253 | #: sequencer.c:1442 |
a0b6b246 JX |
3254 | #, c-format |
3255 | msgid "invalid value for %s: %s" | |
3256 | msgstr "%s 的值无效:%s" | |
3257 | ||
60638e98 | 3258 | #: sequencer.c:1499 |
a0b6b246 JX |
3259 | #, c-format |
3260 | msgid "malformed options sheet: '%s'" | |
3261 | msgstr "非法的选项清单:'%s'" | |
3262 | ||
60638e98 | 3263 | #: sequencer.c:1537 |
a0b6b246 JX |
3264 | msgid "a cherry-pick or revert is already in progress" |
3265 | msgstr "一个拣选或还原操作已在进行" | |
3266 | ||
60638e98 | 3267 | #: sequencer.c:1538 |
a0b6b246 JX |
3268 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
3269 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
3270 | ||
60638e98 | 3271 | #: sequencer.c:1541 |
a0b6b246 JX |
3272 | #, c-format |
3273 | msgid "could not create sequencer directory '%s'" | |
3274 | msgstr "不能创建序列目录 '%s'" | |
3275 | ||
60638e98 | 3276 | #: sequencer.c:1555 |
a0b6b246 JX |
3277 | msgid "could not lock HEAD" |
3278 | msgstr "不能锁定 HEAD" | |
3279 | ||
60638e98 | 3280 | #: sequencer.c:1611 sequencer.c:2181 |
a0b6b246 JX |
3281 | msgid "no cherry-pick or revert in progress" |
3282 | msgstr "拣选或还原操作并未进行" | |
3283 | ||
60638e98 | 3284 | #: sequencer.c:1613 |
a0b6b246 JX |
3285 | msgid "cannot resolve HEAD" |
3286 | msgstr "不能解析 HEAD" | |
3287 | ||
60638e98 | 3288 | #: sequencer.c:1615 sequencer.c:1649 |
a0b6b246 JX |
3289 | msgid "cannot abort from a branch yet to be born" |
3290 | msgstr "不能从尚未建立的分支终止" | |
3291 | ||
60638e98 | 3292 | #: sequencer.c:1635 builtin/grep.c:910 |
a0b6b246 JX |
3293 | #, c-format |
3294 | msgid "cannot open '%s'" | |
3295 | msgstr "不能打开 '%s'" | |
3296 | ||
60638e98 | 3297 | #: sequencer.c:1637 |
a0b6b246 JX |
3298 | #, c-format |
3299 | msgid "cannot read '%s': %s" | |
3300 | msgstr "不能读取 '%s':%s" | |
3301 | ||
60638e98 | 3302 | #: sequencer.c:1638 |
a0b6b246 JX |
3303 | msgid "unexpected end of file" |
3304 | msgstr "意外的文件结束" | |
3305 | ||
60638e98 | 3306 | #: sequencer.c:1644 |
a0b6b246 JX |
3307 | #, c-format |
3308 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
3309 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
3310 | ||
60638e98 | 3311 | #: sequencer.c:1655 |
1a79b2f1 JX |
3312 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
3313 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
3314 | ||
60638e98 | 3315 | #: sequencer.c:1792 sequencer.c:2080 |
1a79b2f1 JX |
3316 | msgid "cannot read HEAD" |
3317 | msgstr "不能读取 HEAD" | |
3318 | ||
60638e98 | 3319 | #: sequencer.c:1832 builtin/difftool.c:616 |
1a79b2f1 JX |
3320 | #, c-format |
3321 | msgid "could not copy '%s' to '%s'" | |
3322 | msgstr "不能拷贝 '%s' 至 '%s'" | |
3323 | ||
60638e98 | 3324 | #: sequencer.c:1848 |
1a79b2f1 JX |
3325 | msgid "could not read index" |
3326 | msgstr "不能读取索引" | |
3327 | ||
3328 | # 译者:注意保持前导空格 | |
60638e98 | 3329 | #: sequencer.c:1853 |
1a79b2f1 JX |
3330 | #, c-format |
3331 | msgid "" | |
3332 | "execution failed: %s\n" | |
3333 | "%sYou can fix the problem, and then run\n" | |
3334 | "\n" | |
3335 | " git rebase --continue\n" | |
3336 | "\n" | |
3337 | msgstr "" | |
3338 | "执行失败:%s\n" | |
3339 | "%s您可以改正该问题,然后运行\n" | |
3340 | "\n" | |
3341 | " git rebase --continue\n" | |
3342 | "\n" | |
3343 | ||
60638e98 | 3344 | #: sequencer.c:1859 |
1a79b2f1 JX |
3345 | msgid "and made changes to the index and/or the working tree\n" |
3346 | msgstr "并且修改索引和/或工作区\n" | |
3347 | ||
60638e98 | 3348 | #: sequencer.c:1865 |
1a79b2f1 JX |
3349 | #, c-format |
3350 | msgid "" | |
3351 | "execution succeeded: %s\n" | |
3352 | "but left changes to the index and/or the working tree\n" | |
3353 | "Commit or stash your changes, and then run\n" | |
3354 | "\n" | |
3355 | " git rebase --continue\n" | |
3356 | "\n" | |
3357 | msgstr "" | |
3358 | "执行成功:%s\n" | |
3359 | "但是在索引和/或工作区中存在变更\n" | |
3360 | "提交或暂存修改,然后运行\n" | |
3361 | "\n" | |
3362 | " git rebase --continue\n" | |
3363 | "\n" | |
3364 | ||
60638e98 | 3365 | #: sequencer.c:1920 git-rebase.sh:169 |
1a79b2f1 JX |
3366 | #, c-format |
3367 | msgid "Applied autostash." | |
3368 | msgstr "成功应用 autostash。" | |
3369 | ||
60638e98 | 3370 | #: sequencer.c:1932 |
1a79b2f1 JX |
3371 | #, c-format |
3372 | msgid "cannot store %s" | |
3373 | msgstr "不能存储 %s" | |
3374 | ||
60638e98 | 3375 | #: sequencer.c:1934 git-rebase.sh:173 |
1a79b2f1 JX |
3376 | #, c-format |
3377 | msgid "" | |
3378 | "Applying autostash resulted in conflicts.\n" | |
3379 | "Your changes are safe in the stash.\n" | |
3380 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
3381 | msgstr "" | |
3382 | "应用 autostash 导致冲突。\n" | |
3383 | "您的修改安全地保存在 stash 中。\n" | |
3384 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
3385 | ||
60638e98 | 3386 | #: sequencer.c:2016 |
1a79b2f1 | 3387 | #, c-format |
87cb7997 JX |
3388 | msgid "Stopped at %s... %.*s\n" |
3389 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 3390 | |
60638e98 | 3391 | #: sequencer.c:2058 |
1a79b2f1 JX |
3392 | #, c-format |
3393 | msgid "unknown command %d" | |
3394 | msgstr "未知命令 %d" | |
3395 | ||
60638e98 | 3396 | #: sequencer.c:2088 |
1a79b2f1 JX |
3397 | msgid "could not read orig-head" |
3398 | msgstr "不能读取 orig-head" | |
3399 | ||
60638e98 | 3400 | #: sequencer.c:2092 |
1a79b2f1 JX |
3401 | msgid "could not read 'onto'" |
3402 | msgstr "不能读取 'onto'" | |
3403 | ||
60638e98 | 3404 | #: sequencer.c:2099 |
1a79b2f1 JX |
3405 | #, c-format |
3406 | msgid "could not update %s" | |
3407 | msgstr "不能更新 %s" | |
3408 | ||
60638e98 | 3409 | #: sequencer.c:2106 |
1a79b2f1 JX |
3410 | #, c-format |
3411 | msgid "could not update HEAD to %s" | |
3412 | msgstr "不能更新 HEAD 为 %s" | |
3413 | ||
60638e98 | 3414 | #: sequencer.c:2190 |
1a79b2f1 JX |
3415 | msgid "cannot rebase: You have unstaged changes." |
3416 | msgstr "不能变基:您有未暂存的变更。" | |
3417 | ||
60638e98 | 3418 | #: sequencer.c:2195 |
1a79b2f1 JX |
3419 | msgid "could not remove CHERRY_PICK_HEAD" |
3420 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
3421 | ||
60638e98 | 3422 | #: sequencer.c:2204 |
1a79b2f1 JX |
3423 | msgid "cannot amend non-existing commit" |
3424 | msgstr "不能修补不存在的提交" | |
3425 | ||
60638e98 | 3426 | #: sequencer.c:2206 |
1a79b2f1 JX |
3427 | #, c-format |
3428 | msgid "invalid file: '%s'" | |
3429 | msgstr "无效文件:'%s'" | |
3430 | ||
60638e98 | 3431 | #: sequencer.c:2208 |
1a79b2f1 JX |
3432 | #, c-format |
3433 | msgid "invalid contents: '%s'" | |
3434 | msgstr "无效内容:'%s'" | |
3435 | ||
60638e98 | 3436 | #: sequencer.c:2211 |
1a79b2f1 JX |
3437 | msgid "" |
3438 | "\n" | |
3439 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
3440 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
3441 | msgstr "" |
3442 | "\n" | |
3443 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 3444 | |
60638e98 | 3445 | #: sequencer.c:2221 |
1a79b2f1 JX |
3446 | msgid "could not commit staged changes." |
3447 | msgstr "不能提交暂存的修改。" | |
3448 | ||
60638e98 | 3449 | #: sequencer.c:2301 |
a0b6b246 JX |
3450 | #, c-format |
3451 | msgid "%s: can't cherry-pick a %s" | |
3452 | msgstr "%s:不能拣选一个%s" | |
3453 | ||
60638e98 | 3454 | #: sequencer.c:2305 |
a0b6b246 JX |
3455 | #, c-format |
3456 | msgid "%s: bad revision" | |
3457 | msgstr "%s:错误的版本" | |
3458 | ||
60638e98 | 3459 | #: sequencer.c:2338 |
a0b6b246 JX |
3460 | msgid "can't revert as initial commit" |
3461 | msgstr "不能作为初始提交回退" | |
3462 | ||
87cb7997 | 3463 | #: setup.c:165 |
a0b6b246 | 3464 | #, c-format |
6792b93b | 3465 | msgid "" |
a0b6b246 JX |
3466 | "%s: no such path in the working tree.\n" |
3467 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
3468 | msgstr "" | |
3469 | "%s:工作区中无此路径。\n" | |
3470 | "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" | |
6792b93b | 3471 | |
87cb7997 | 3472 | #: setup.c:178 |
90314792 | 3473 | #, c-format |
a0b6b246 JX |
3474 | msgid "" |
3475 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
3476 | "Use '--' to separate paths from revisions, like this:\n" | |
3477 | "'git <command> [<revision>...] -- [<file>...]'" | |
3478 | msgstr "" | |
3479 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
3480 | "使用 '--' 来分隔版本和路径,例如:\n" | |
3481 | "'git <command> [<revision>...] -- [<file>...]'" | |
6792b93b | 3482 | |
87cb7997 | 3483 | #: setup.c:228 |
a0b6b246 JX |
3484 | #, c-format |
3485 | msgid "" | |
3486 | "ambiguous argument '%s': both revision and filename\n" | |
3487 | "Use '--' to separate paths from revisions, like this:\n" | |
3488 | "'git <command> [<revision>...] -- [<file>...]'" | |
3489 | msgstr "" | |
3490 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
3491 | "使用 '--' 来分隔版本和路径,例如:\n" | |
3492 | "'git <command> [<revision>...] -- [<file>...]'" | |
2e8451e8 | 3493 | |
87cb7997 | 3494 | #: setup.c:475 |
a0b6b246 JX |
3495 | #, c-format |
3496 | msgid "Expected git repo version <= %d, found %d" | |
3497 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 3498 | |
87cb7997 | 3499 | #: setup.c:483 |
a0b6b246 JX |
3500 | msgid "unknown repository extensions found:" |
3501 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 3502 | |
87cb7997 | 3503 | #: setup.c:776 |
1003b3a5 | 3504 | #, c-format |
a0b6b246 JX |
3505 | msgid "Not a git repository (or any of the parent directories): %s" |
3506 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
1003b3a5 | 3507 | |
87cb7997 | 3508 | #: setup.c:778 builtin/index-pack.c:1646 |
a0b6b246 JX |
3509 | msgid "Cannot come back to cwd" |
3510 | msgstr "无法返回当前工作目录" | |
1003b3a5 | 3511 | |
87cb7997 | 3512 | #: setup.c:1010 |
a0b6b246 JX |
3513 | msgid "Unable to read current working directory" |
3514 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 3515 | |
87cb7997 JX |
3516 | #: setup.c:1022 setup.c:1028 |
3517 | #, c-format | |
3518 | msgid "Cannot change to '%s'" | |
3519 | msgstr "不能切换到 '%s'" | |
3520 | ||
3521 | #: setup.c:1041 | |
a0b6b246 JX |
3522 | #, c-format |
3523 | msgid "" | |
3524 | "Not a git repository (or any parent up to mount point %s)\n" | |
3525 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." | |
3526 | msgstr "" | |
3527 | "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n" | |
3528 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" | |
1003b3a5 | 3529 | |
87cb7997 | 3530 | #: setup.c:1106 |
a0b6b246 JX |
3531 | #, c-format |
3532 | msgid "" | |
3533 | "Problem with core.sharedRepository filemode value (0%.3o).\n" | |
3534 | "The owner of files must always have read and write permissions." | |
3535 | msgstr "" | |
3536 | "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n" | |
3537 | "文件属主必须始终拥有读写权限。" | |
6792b93b | 3538 | |
87cb7997 | 3539 | #: sha1_file.c:559 |
a0b6b246 JX |
3540 | #, c-format |
3541 | msgid "path '%s' does not exist" | |
3542 | msgstr "路径 '%s' 不存在" | |
3543 | ||
87cb7997 | 3544 | #: sha1_file.c:585 |
a0b6b246 JX |
3545 | #, c-format |
3546 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
3547 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
3548 | ||
87cb7997 | 3549 | #: sha1_file.c:591 |
a0b6b246 JX |
3550 | #, c-format |
3551 | msgid "reference repository '%s' is not a local repository." | |
3552 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
3553 | ||
87cb7997 | 3554 | #: sha1_file.c:597 |
a0b6b246 JX |
3555 | #, c-format |
3556 | msgid "reference repository '%s' is shallow" | |
3557 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
3558 | ||
87cb7997 | 3559 | #: sha1_file.c:605 |
a0b6b246 JX |
3560 | #, c-format |
3561 | msgid "reference repository '%s' is grafted" | |
3562 | msgstr "参考仓库 '%s' 已被嫁接" | |
3563 | ||
87cb7997 | 3564 | #: sha1_file.c:1245 |
a0b6b246 JX |
3565 | msgid "offset before end of packfile (broken .idx?)" |
3566 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
3567 | ||
87cb7997 | 3568 | #: sha1_file.c:2721 |
a0b6b246 JX |
3569 | #, c-format |
3570 | msgid "offset before start of pack index for %s (corrupt index?)" | |
3571 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
3572 | ||
87cb7997 | 3573 | #: sha1_file.c:2725 |
a0b6b246 JX |
3574 | #, c-format |
3575 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
3576 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
3577 | ||
87cb7997 | 3578 | #: sha1_name.c:409 |
a0b6b246 JX |
3579 | #, c-format |
3580 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 3581 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 3582 | |
87cb7997 | 3583 | #: sha1_name.c:420 |
a0b6b246 JX |
3584 | msgid "The candidates are:" |
3585 | msgstr "候选者有:" | |
3586 | ||
87cb7997 | 3587 | #: sha1_name.c:580 |
a0b6b246 JX |
3588 | msgid "" |
3589 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
3590 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
3591 | "may be created by mistake. For example,\n" | |
3592 | "\n" | |
3593 | " git checkout -b $br $(git rev-parse ...)\n" | |
3594 | "\n" | |
3595 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
3596 | "examine these refs and maybe delete them. Turn this message off by\n" | |
3597 | "running \"git config advice.objectNameWarning false\"" | |
3598 | msgstr "" | |
3599 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
3600 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
3601 | "\n" | |
3602 | " git checkout -b $br $(git rev-parse ...)\n" | |
3603 | "\n" | |
3604 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
3605 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
3606 | "命令关闭本消息通知。" | |
3607 | ||
87cb7997 | 3608 | #: submodule.c:67 submodule.c:101 |
a0b6b246 JX |
3609 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
3610 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
3611 | ||
87cb7997 | 3612 | #: submodule.c:71 submodule.c:105 |
a0b6b246 JX |
3613 | #, c-format |
3614 | msgid "Could not find section in .gitmodules where path=%s" | |
3615 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
3616 | ||
87cb7997 | 3617 | #: submodule.c:79 |
a0b6b246 JX |
3618 | #, c-format |
3619 | msgid "Could not update .gitmodules entry %s" | |
3620 | msgstr "不能更新 .gitmodules 条目 %s" | |
3621 | ||
87cb7997 | 3622 | #: submodule.c:112 |
a0b6b246 JX |
3623 | #, c-format |
3624 | msgid "Could not remove .gitmodules entry for %s" | |
3625 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
3626 | ||
87cb7997 | 3627 | #: submodule.c:123 |
a0b6b246 JX |
3628 | msgid "staging updated .gitmodules failed" |
3629 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
3630 | ||
87cb7997 | 3631 | #: submodule.c:161 |
a0b6b246 JX |
3632 | msgid "negative values not allowed for submodule.fetchJobs" |
3633 | msgstr "submodule.fetchJobs 不允许为负值" | |
3634 | ||
87cb7997 | 3635 | #: submodule.c:1194 |
1a79b2f1 | 3636 | #, c-format |
87cb7997 | 3637 | msgid "'%s' not recognized as a git repository" |
65e2041e | 3638 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 3639 | |
87cb7997 | 3640 | #: submodule.c:1332 |
1a79b2f1 | 3641 | #, c-format |
87cb7997 JX |
3642 | msgid "could not start 'git status' in submodule '%s'" |
3643 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 3644 | |
87cb7997 JX |
3645 | #: submodule.c:1345 |
3646 | #, c-format | |
3647 | msgid "could not run 'git status' in submodule '%s'" | |
3648 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
3649 | ||
3650 | #: submodule.c:1421 | |
3651 | #, c-format | |
3652 | msgid "submodule '%s' has dirty index" | |
3653 | msgstr "子模组 '%s' 中有脏索引" | |
3654 | ||
60638e98 | 3655 | #: submodule.c:1678 |
1a79b2f1 JX |
3656 | #, c-format |
3657 | msgid "" | |
3658 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
3659 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
3660 | ||
60638e98 | 3661 | #: submodule.c:1690 submodule.c:1746 |
1a79b2f1 JX |
3662 | #, c-format |
3663 | msgid "could not lookup name for submodule '%s'" | |
3664 | msgstr "不能查询子模组 '%s' 的名称" | |
3665 | ||
60638e98 | 3666 | #: submodule.c:1694 builtin/submodule--helper.c:678 |
87cb7997 | 3667 | #: builtin/submodule--helper.c:688 |
1a79b2f1 JX |
3668 | #, c-format |
3669 | msgid "could not create directory '%s'" | |
3670 | msgstr "不能创建目录 '%s'" | |
3671 | ||
60638e98 | 3672 | #: submodule.c:1697 |
1a79b2f1 JX |
3673 | #, c-format |
3674 | msgid "" | |
3675 | "Migrating git directory of '%s%s' from\n" | |
3676 | "'%s' to\n" | |
3677 | "'%s'\n" | |
3678 | msgstr "" | |
3679 | "将 '%s%s' 的 git 目录从\n" | |
3680 | "'%s' 迁移至\n" | |
3681 | "'%s'\n" | |
3682 | ||
60638e98 | 3683 | #: submodule.c:1781 |
1a79b2f1 JX |
3684 | #, c-format |
3685 | msgid "could not recurse into submodule '%s'" | |
3686 | msgstr "无法递归进子模组路径 '%s'" | |
3687 | ||
60638e98 | 3688 | #: submodule.c:1825 |
87cb7997 JX |
3689 | msgid "could not start ls-files in .." |
3690 | msgstr "无法在 .. 中启动 ls-files" | |
3691 | ||
60638e98 | 3692 | #: submodule.c:1845 |
87cb7997 JX |
3693 | msgid "BUG: returned path string doesn't match cwd?" |
3694 | msgstr "BUG:返回的路径和当前路径不匹配?" | |
3695 | ||
60638e98 | 3696 | #: submodule.c:1864 |
87cb7997 JX |
3697 | #, c-format |
3698 | msgid "ls-tree returned unexpected return code %d" | |
3699 | msgstr "ls-tree 返回未知返回值 %d" | |
3700 | ||
3701 | #: submodule-config.c:380 | |
a0b6b246 JX |
3702 | #, c-format |
3703 | msgid "invalid value for %s" | |
3704 | msgstr "%s 的值无效" | |
3705 | ||
1a79b2f1 | 3706 | #: trailer.c:240 |
a0b6b246 JX |
3707 | #, c-format |
3708 | msgid "running trailer command '%s' failed" | |
3709 | msgstr "执行 trailer 命令 '%s' 失败" | |
3710 | ||
1a79b2f1 JX |
3711 | #: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 |
3712 | #: trailer.c:543 | |
a0b6b246 JX |
3713 | #, c-format |
3714 | msgid "unknown value '%s' for key '%s'" | |
3715 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
3716 | ||
1a79b2f1 | 3717 | #: trailer.c:525 trailer.c:530 builtin/remote.c:289 |
a0b6b246 JX |
3718 | #, c-format |
3719 | msgid "more than one %s" | |
3720 | msgstr "多于一个 %s" | |
3721 | ||
1a79b2f1 | 3722 | #: trailer.c:702 |
a0b6b246 JX |
3723 | #, c-format |
3724 | msgid "empty trailer token in trailer '%.*s'" | |
3725 | msgstr "签名 '%.*s' 的键为空" | |
3726 | ||
1a79b2f1 | 3727 | #: trailer.c:722 |
a0b6b246 JX |
3728 | #, c-format |
3729 | msgid "could not read input file '%s'" | |
3730 | msgstr "不能读取输入文件 '%s'" | |
3731 | ||
1a79b2f1 | 3732 | #: trailer.c:725 |
a0b6b246 JX |
3733 | msgid "could not read from stdin" |
3734 | msgstr "不能自标准输入读取" | |
3735 | ||
1a79b2f1 | 3736 | #: trailer.c:949 builtin/am.c:44 |
a0b6b246 JX |
3737 | #, c-format |
3738 | msgid "could not stat %s" | |
65e2041e | 3739 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 3740 | |
1a79b2f1 | 3741 | #: trailer.c:951 |
a0b6b246 JX |
3742 | #, c-format |
3743 | msgid "file %s is not a regular file" | |
3744 | msgstr "文件 %s 不是一个正规文件" | |
3745 | ||
1a79b2f1 | 3746 | #: trailer.c:953 |
a0b6b246 JX |
3747 | #, c-format |
3748 | msgid "file %s is not writable by user" | |
3749 | msgstr "文件 %s 用户不可写" | |
3750 | ||
1a79b2f1 | 3751 | #: trailer.c:965 |
a0b6b246 JX |
3752 | msgid "could not open temporary file" |
3753 | msgstr "不能打开临时文件" | |
3754 | ||
1a79b2f1 | 3755 | #: trailer.c:1001 |
a0b6b246 JX |
3756 | #, c-format |
3757 | msgid "could not rename temporary file to %s" | |
3758 | msgstr "不能重命名临时文件为 %s" | |
3759 | ||
3760 | #: transport.c:62 | |
3761 | #, c-format | |
3762 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
3763 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
3764 | ||
3765 | #: transport.c:151 | |
3766 | #, c-format | |
3767 | msgid "transport: invalid depth option '%s'" | |
3768 | msgstr "传输:无效的深度选项 '%s'" | |
3769 | ||
87cb7997 | 3770 | #: transport.c:889 |
a0b6b246 JX |
3771 | #, c-format |
3772 | msgid "" | |
3773 | "The following submodule paths contain changes that can\n" | |
3774 | "not be found on any remote:\n" | |
3775 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
3776 | ||
87cb7997 | 3777 | #: transport.c:893 |
a0b6b246 JX |
3778 | #, c-format |
3779 | msgid "" | |
3780 | "\n" | |
3781 | "Please try\n" | |
3782 | "\n" | |
3783 | "\tgit push --recurse-submodules=on-demand\n" | |
3784 | "\n" | |
3785 | "or cd to the path and use\n" | |
3786 | "\n" | |
3787 | "\tgit push\n" | |
3788 | "\n" | |
3789 | "to push them to a remote.\n" | |
3790 | "\n" | |
3791 | msgstr "" | |
3792 | "\n" | |
3793 | "请尝试\n" | |
3794 | "\n" | |
3795 | "\tgit push --recurse-submodules=on-demand\n" | |
3796 | "\n" | |
3797 | "或者进入到子目录执行\n" | |
3798 | "\n" | |
3799 | "\tgit push\n" | |
3800 | "\n" | |
3801 | "以推送至远程。\n" | |
3802 | "\n" | |
3803 | ||
87cb7997 | 3804 | #: transport.c:901 |
a0b6b246 JX |
3805 | msgid "Aborting." |
3806 | msgstr "正在终止。" | |
3807 | ||
87cb7997 | 3808 | #: transport-helper.c:1080 |
a0b6b246 JX |
3809 | #, c-format |
3810 | msgid "Could not read ref %s" | |
3811 | msgstr "不能读取引用 %s" | |
3812 | ||
3813 | #: tree-walk.c:31 | |
3814 | msgid "too-short tree object" | |
3815 | msgstr "太短的树对象" | |
3816 | ||
3817 | #: tree-walk.c:37 | |
3818 | msgid "malformed mode in tree entry" | |
29004bbb | 3819 | msgstr "树对象中的条目模式错误" |
a0b6b246 JX |
3820 | |
3821 | #: tree-walk.c:41 | |
3822 | msgid "empty filename in tree entry" | |
3823 | msgstr "树对象条目中空的文件名" | |
3824 | ||
3825 | #: tree-walk.c:113 | |
3826 | msgid "too-short tree file" | |
3827 | msgstr "太短的树文件" | |
3828 | ||
87cb7997 | 3829 | #: unpack-trees.c:104 |
a0b6b246 JX |
3830 | #, c-format |
3831 | msgid "" | |
3832 | "Your local changes to the following files would be overwritten by checkout:\n" | |
3833 | "%%sPlease commit your changes or stash them before you switch branches." | |
3834 | msgstr "" | |
3835 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
3836 | "%%s请在切换分支前提交您的修改或者保存进度。" | |
3837 | ||
87cb7997 | 3838 | #: unpack-trees.c:106 |
a0b6b246 JX |
3839 | #, c-format |
3840 | msgid "" | |
3841 | "Your local changes to the following files would be overwritten by checkout:\n" | |
3842 | "%%s" | |
3843 | msgstr "" | |
3844 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
3845 | "%%s" | |
3846 | ||
87cb7997 | 3847 | #: unpack-trees.c:109 |
a0b6b246 JX |
3848 | #, c-format |
3849 | msgid "" | |
3850 | "Your local changes to the following files would be overwritten by merge:\n" | |
3851 | "%%sPlease commit your changes or stash them before you merge." | |
3852 | msgstr "" | |
3853 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3854 | "%%s请在合并前提交您的修改或者保存进度。" | |
3855 | ||
87cb7997 | 3856 | #: unpack-trees.c:111 |
a0b6b246 JX |
3857 | #, c-format |
3858 | msgid "" | |
3859 | "Your local changes to the following files would be overwritten by merge:\n" | |
3860 | "%%s" | |
3861 | msgstr "" | |
3862 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3863 | "%%s" | |
3864 | ||
87cb7997 | 3865 | #: unpack-trees.c:114 |
a0b6b246 JX |
3866 | #, c-format |
3867 | msgid "" | |
3868 | "Your local changes to the following files would be overwritten by %s:\n" | |
3869 | "%%sPlease commit your changes or stash them before you %s." | |
3870 | msgstr "" | |
3871 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
3872 | "%%s请在 %s 之前提交您的修改或者保存进度。" | |
6792b93b | 3873 | |
87cb7997 | 3874 | #: unpack-trees.c:116 |
a0b6b246 JX |
3875 | #, c-format |
3876 | msgid "" | |
3877 | "Your local changes to the following files would be overwritten by %s:\n" | |
3878 | "%%s" | |
3879 | msgstr "" | |
3880 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
3881 | "%%s" | |
c04f5ac3 | 3882 | |
87cb7997 | 3883 | #: unpack-trees.c:121 |
a0b6b246 JX |
3884 | #, c-format |
3885 | msgid "" | |
1a79b2f1 | 3886 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
3887 | "%s" |
3888 | msgstr "" | |
3889 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
3890 | "%s" | |
1b7f4a34 | 3891 | |
87cb7997 | 3892 | #: unpack-trees.c:125 |
a0b6b246 JX |
3893 | #, c-format |
3894 | msgid "" | |
3895 | "The following untracked working tree files would be removed by checkout:\n" | |
3896 | "%%sPlease move or remove them before you switch branches." | |
3897 | msgstr "" | |
3898 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
3899 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 3900 | |
87cb7997 | 3901 | #: unpack-trees.c:127 |
a0b6b246 JX |
3902 | #, c-format |
3903 | msgid "" | |
3904 | "The following untracked working tree files would be removed by checkout:\n" | |
3905 | "%%s" | |
3906 | msgstr "" | |
3907 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
3908 | "%%s" | |
1003b3a5 | 3909 | |
87cb7997 | 3910 | #: unpack-trees.c:130 |
a0b6b246 JX |
3911 | #, c-format |
3912 | msgid "" | |
3913 | "The following untracked working tree files would be removed by merge:\n" | |
3914 | "%%sPlease move or remove them before you merge." | |
3915 | msgstr "" | |
3916 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
3917 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 3918 | |
87cb7997 | 3919 | #: unpack-trees.c:132 |
a0b6b246 JX |
3920 | #, c-format |
3921 | msgid "" | |
3922 | "The following untracked working tree files would be removed by merge:\n" | |
3923 | "%%s" | |
3924 | msgstr "" | |
3925 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
3926 | "%%s" | |
c04f5ac3 | 3927 | |
87cb7997 | 3928 | #: unpack-trees.c:135 |
a0b6b246 JX |
3929 | #, c-format |
3930 | msgid "" | |
3931 | "The following untracked working tree files would be removed by %s:\n" | |
3932 | "%%sPlease move or remove them before you %s." | |
3933 | msgstr "" | |
3934 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
3935 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 3936 | |
87cb7997 | 3937 | #: unpack-trees.c:137 |
a0b6b246 JX |
3938 | #, c-format |
3939 | msgid "" | |
3940 | "The following untracked working tree files would be removed by %s:\n" | |
3941 | "%%s" | |
3942 | msgstr "" | |
3943 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
3944 | "%%s" | |
c04f5ac3 | 3945 | |
87cb7997 | 3946 | #: unpack-trees.c:142 |
a0b6b246 JX |
3947 | #, c-format |
3948 | msgid "" | |
3949 | "The following untracked working tree files would be overwritten by " | |
3950 | "checkout:\n" | |
3951 | "%%sPlease move or remove them before you switch branches." | |
3952 | msgstr "" | |
3953 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
3954 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 3955 | |
87cb7997 | 3956 | #: unpack-trees.c:144 |
1003b3a5 | 3957 | #, c-format |
4dcdc3d8 | 3958 | msgid "" |
a0b6b246 JX |
3959 | "The following untracked working tree files would be overwritten by " |
3960 | "checkout:\n" | |
3961 | "%%s" | |
4dcdc3d8 | 3962 | msgstr "" |
a0b6b246 JX |
3963 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
3964 | "%%s" | |
1003b3a5 | 3965 | |
87cb7997 | 3966 | #: unpack-trees.c:147 |
c04f5ac3 | 3967 | #, c-format |
a0b6b246 JX |
3968 | msgid "" |
3969 | "The following untracked working tree files would be overwritten by merge:\n" | |
3970 | "%%sPlease move or remove them before you merge." | |
3971 | msgstr "" | |
3972 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
3973 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 3974 | |
87cb7997 | 3975 | #: unpack-trees.c:149 |
a0b6b246 JX |
3976 | #, c-format |
3977 | msgid "" | |
3978 | "The following untracked working tree files would be overwritten by merge:\n" | |
3979 | "%%s" | |
3980 | msgstr "" | |
3981 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
3982 | "%%s" | |
c04f5ac3 | 3983 | |
87cb7997 | 3984 | #: unpack-trees.c:152 |
a0b6b246 JX |
3985 | #, c-format |
3986 | msgid "" | |
3987 | "The following untracked working tree files would be overwritten by %s:\n" | |
3988 | "%%sPlease move or remove them before you %s." | |
3989 | msgstr "" | |
3990 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
3991 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 3992 | |
87cb7997 | 3993 | #: unpack-trees.c:154 |
07432cef | 3994 | #, c-format |
a0b6b246 JX |
3995 | msgid "" |
3996 | "The following untracked working tree files would be overwritten by %s:\n" | |
3997 | "%%s" | |
3998 | msgstr "" | |
3999 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
4000 | "%%s" | |
c04f5ac3 | 4001 | |
87cb7997 | 4002 | #: unpack-trees.c:161 |
07432cef | 4003 | #, c-format |
a0b6b246 JX |
4004 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
4005 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 4006 | |
87cb7997 | 4007 | #: unpack-trees.c:164 |
07432cef | 4008 | #, c-format |
ef317cd5 | 4009 | msgid "" |
a0b6b246 JX |
4010 | "Cannot update sparse checkout: the following entries are not up-to-date:\n" |
4011 | "%s" | |
4012 | msgstr "" | |
4013 | "无法更新稀疏检出:如下条目不是最新:\n" | |
4014 | "%s" | |
c04f5ac3 | 4015 | |
87cb7997 | 4016 | #: unpack-trees.c:166 |
07432cef | 4017 | #, c-format |
a0b6b246 JX |
4018 | msgid "" |
4019 | "The following working tree files would be overwritten by sparse checkout " | |
4020 | "update:\n" | |
4021 | "%s" | |
4022 | msgstr "" | |
4023 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
4024 | "%s" | |
c04f5ac3 | 4025 | |
87cb7997 | 4026 | #: unpack-trees.c:168 |
07432cef | 4027 | #, c-format |
a0b6b246 JX |
4028 | msgid "" |
4029 | "The following working tree files would be removed by sparse checkout " | |
4030 | "update:\n" | |
4031 | "%s" | |
4032 | msgstr "" | |
4033 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
4034 | "%s" | |
c04f5ac3 | 4035 | |
87cb7997 JX |
4036 | #: unpack-trees.c:170 |
4037 | #, c-format | |
4038 | msgid "" | |
4039 | "Cannot update submodule:\n" | |
4040 | "%s" | |
4041 | msgstr "" | |
4042 | "无法更新子模组:\n" | |
4043 | "%s" | |
4044 | ||
4045 | #: unpack-trees.c:247 | |
07432cef | 4046 | #, c-format |
a0b6b246 JX |
4047 | msgid "Aborting\n" |
4048 | msgstr "终止中\n" | |
ef317cd5 | 4049 | |
87cb7997 JX |
4050 | #: unpack-trees.c:272 |
4051 | #, c-format | |
4052 | msgid "submodule update strategy not supported for submodule '%s'" | |
4053 | msgstr "子模组 %s 不支持子模组更新策略" | |
4054 | ||
4055 | #: unpack-trees.c:340 | |
a0b6b246 JX |
4056 | msgid "Checking out files" |
4057 | msgstr "正在检出文件" | |
c04f5ac3 | 4058 | |
87cb7997 | 4059 | #: urlmatch.c:163 |
a0b6b246 JX |
4060 | msgid "invalid URL scheme name or missing '://' suffix" |
4061 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
4062 | ||
87cb7997 | 4063 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 4064 | #, c-format |
a0b6b246 JX |
4065 | msgid "invalid %XX escape sequence" |
4066 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 4067 | |
87cb7997 | 4068 | #: urlmatch.c:215 |
a0b6b246 JX |
4069 | msgid "missing host and scheme is not 'file:'" |
4070 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 4071 | |
87cb7997 | 4072 | #: urlmatch.c:232 |
a0b6b246 JX |
4073 | msgid "a 'file:' URL may not have a port number" |
4074 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 4075 | |
87cb7997 | 4076 | #: urlmatch.c:247 |
a0b6b246 JX |
4077 | msgid "invalid characters in host name" |
4078 | msgstr "主机名中包含无效的字符" | |
90314792 | 4079 | |
87cb7997 | 4080 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
4081 | msgid "invalid port number" |
4082 | msgstr "无效的端口号" | |
c04f5ac3 | 4083 | |
87cb7997 | 4084 | #: urlmatch.c:371 |
a0b6b246 JX |
4085 | msgid "invalid '..' path segment" |
4086 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 4087 | |
87cb7997 | 4088 | #: worktree.c:285 |
a77c07d9 | 4089 | #, c-format |
a0b6b246 JX |
4090 | msgid "failed to read '%s'" |
4091 | msgstr "无法读取 '%s'" | |
ef317cd5 | 4092 | |
a0b6b246 | 4093 | #: wrapper.c:222 wrapper.c:392 |
c04f5ac3 | 4094 | #, c-format |
a0b6b246 JX |
4095 | msgid "could not open '%s' for reading and writing" |
4096 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 4097 | |
a0b6b246 JX |
4098 | #: wrapper.c:224 wrapper.c:394 builtin/am.c:766 |
4099 | #, c-format | |
4100 | msgid "could not open '%s' for writing" | |
4101 | msgstr "无法打开 '%s' 进行写入" | |
c04f5ac3 | 4102 | |
60638e98 JX |
4103 | #: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 |
4104 | #: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 | |
a0b6b246 | 4105 | #: builtin/pull.c:341 |
c04f5ac3 | 4106 | #, c-format |
a0b6b246 JX |
4107 | msgid "could not open '%s' for reading" |
4108 | msgstr "无法打开 '%s' 进行读取" | |
c04f5ac3 | 4109 | |
87cb7997 | 4110 | #: wrapper.c:581 wrapper.c:602 |
a0b6b246 JX |
4111 | #, c-format |
4112 | msgid "unable to access '%s'" | |
4113 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 4114 | |
87cb7997 | 4115 | #: wrapper.c:610 |
a0b6b246 JX |
4116 | msgid "unable to get current working directory" |
4117 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 4118 | |
87cb7997 | 4119 | #: wrapper.c:634 |
c04f5ac3 | 4120 | #, c-format |
a0b6b246 JX |
4121 | msgid "could not write to %s" |
4122 | msgstr "不能写入 %s" | |
c04f5ac3 | 4123 | |
87cb7997 | 4124 | #: wrapper.c:636 |
a0b6b246 JX |
4125 | #, c-format |
4126 | msgid "could not close %s" | |
4127 | msgstr "不能关闭 %s" | |
c04f5ac3 | 4128 | |
a0b6b246 JX |
4129 | #: wt-status.c:151 |
4130 | msgid "Unmerged paths:" | |
4131 | msgstr "未合并的路径:" | |
7aea43ff | 4132 | |
a0b6b246 JX |
4133 | # 译者:注意保持前导空格 |
4134 | #: wt-status.c:178 wt-status.c:205 | |
c04f5ac3 | 4135 | #, c-format |
a0b6b246 JX |
4136 | msgid " (use \"git reset %s <file>...\" to unstage)" |
4137 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4138 | |
a0b6b246 JX |
4139 | # 译者:注意保持前导空格 |
4140 | #: wt-status.c:180 wt-status.c:207 | |
4141 | msgid " (use \"git rm --cached <file>...\" to unstage)" | |
4142 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4143 | |
a0b6b246 JX |
4144 | # 译者:注意保持前导空格 |
4145 | #: wt-status.c:184 | |
4146 | msgid " (use \"git add <file>...\" to mark resolution)" | |
4147 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 4148 | |
a0b6b246 JX |
4149 | # 译者:注意保持前导空格 |
4150 | #: wt-status.c:186 wt-status.c:190 | |
4151 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" | |
4152 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 4153 | |
a0b6b246 JX |
4154 | # 译者:注意保持前导空格 |
4155 | #: wt-status.c:188 | |
4156 | msgid " (use \"git rm <file>...\" to mark resolution)" | |
4157 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 4158 | |
87cb7997 | 4159 | #: wt-status.c:199 wt-status.c:958 |
a0b6b246 JX |
4160 | msgid "Changes to be committed:" |
4161 | msgstr "要提交的变更:" | |
ef317cd5 | 4162 | |
87cb7997 | 4163 | #: wt-status.c:217 wt-status.c:967 |
a0b6b246 JX |
4164 | msgid "Changes not staged for commit:" |
4165 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 4166 | |
a0b6b246 JX |
4167 | # 译者:注意保持前导空格 |
4168 | #: wt-status.c:221 | |
4169 | msgid " (use \"git add <file>...\" to update what will be committed)" | |
4170 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4171 | |
a0b6b246 JX |
4172 | # 译者:注意保持前导空格 |
4173 | #: wt-status.c:223 | |
4174 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" | |
4175 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4176 | |
a0b6b246 JX |
4177 | # 译者:注意保持前导空格 |
4178 | #: wt-status.c:224 | |
4179 | msgid "" | |
4180 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
4181 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 4182 | |
a0b6b246 JX |
4183 | # 译者:注意保持前导空格 |
4184 | #: wt-status.c:226 | |
4185 | msgid " (commit or discard the untracked or modified content in submodules)" | |
4186 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 4187 | |
a0b6b246 JX |
4188 | # 译者:注意保持前导空格 |
4189 | #: wt-status.c:238 | |
4190 | #, c-format | |
4191 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
4192 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 4193 | |
a0b6b246 JX |
4194 | #: wt-status.c:253 |
4195 | msgid "both deleted:" | |
4196 | msgstr "双方删除:" | |
ef317cd5 | 4197 | |
a0b6b246 JX |
4198 | #: wt-status.c:255 |
4199 | msgid "added by us:" | |
4200 | msgstr "由我们添加:" | |
4dcdc3d8 | 4201 | |
a0b6b246 JX |
4202 | #: wt-status.c:257 |
4203 | msgid "deleted by them:" | |
4204 | msgstr "由他们删除:" | |
ef317cd5 | 4205 | |
a0b6b246 JX |
4206 | #: wt-status.c:259 |
4207 | msgid "added by them:" | |
4208 | msgstr "由他们添加:" | |
ef317cd5 | 4209 | |
a0b6b246 JX |
4210 | #: wt-status.c:261 |
4211 | msgid "deleted by us:" | |
4212 | msgstr "由我们删除:" | |
ef317cd5 | 4213 | |
a0b6b246 JX |
4214 | #: wt-status.c:263 |
4215 | msgid "both added:" | |
4216 | msgstr "双方添加:" | |
5c57d762 | 4217 | |
a0b6b246 JX |
4218 | #: wt-status.c:265 |
4219 | msgid "both modified:" | |
4220 | msgstr "双方修改:" | |
5c57d762 | 4221 | |
a0b6b246 JX |
4222 | #: wt-status.c:275 |
4223 | msgid "new file:" | |
4224 | msgstr "新文件:" | |
8ada9598 | 4225 | |
a0b6b246 JX |
4226 | #: wt-status.c:277 |
4227 | msgid "copied:" | |
4228 | msgstr "拷贝:" | |
8ada9598 | 4229 | |
a0b6b246 JX |
4230 | #: wt-status.c:279 |
4231 | msgid "deleted:" | |
4232 | msgstr "删除:" | |
8ada9598 | 4233 | |
a0b6b246 JX |
4234 | #: wt-status.c:281 |
4235 | msgid "modified:" | |
4236 | msgstr "修改:" | |
8ada9598 | 4237 | |
a0b6b246 JX |
4238 | #: wt-status.c:283 |
4239 | msgid "renamed:" | |
4240 | msgstr "重命名:" | |
5c57d762 | 4241 | |
a0b6b246 JX |
4242 | #: wt-status.c:285 |
4243 | msgid "typechange:" | |
4244 | msgstr "类型变更:" | |
8ada9598 | 4245 | |
a0b6b246 JX |
4246 | #: wt-status.c:287 |
4247 | msgid "unknown:" | |
4248 | msgstr "未知:" | |
8ada9598 | 4249 | |
a0b6b246 JX |
4250 | #: wt-status.c:289 |
4251 | msgid "unmerged:" | |
4252 | msgstr "未合并:" | |
8ada9598 | 4253 | |
a0b6b246 JX |
4254 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
4255 | #: wt-status.c:371 | |
4256 | msgid "new commits, " | |
4257 | msgstr "新提交, " | |
8ada9598 | 4258 | |
a0b6b246 JX |
4259 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
4260 | #: wt-status.c:373 | |
4261 | msgid "modified content, " | |
4262 | msgstr "修改的内容, " | |
1b7f4a34 | 4263 | |
a0b6b246 JX |
4264 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
4265 | #: wt-status.c:375 | |
4266 | msgid "untracked content, " | |
4267 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 4268 | |
87cb7997 | 4269 | #: wt-status.c:831 |
a0b6b246 JX |
4270 | msgid "Submodules changed but not updated:" |
4271 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 4272 | |
87cb7997 | 4273 | #: wt-status.c:833 |
a0b6b246 JX |
4274 | msgid "Submodule changes to be committed:" |
4275 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 4276 | |
87cb7997 | 4277 | #: wt-status.c:914 |
a0b6b246 JX |
4278 | msgid "" |
4279 | "Do not touch the line above.\n" | |
4280 | "Everything below will be removed." | |
4281 | msgstr "" | |
4282 | "不要改动上面的一行。\n" | |
4283 | "下面的所有内容均将被删除。" | |
1b7f4a34 | 4284 | |
87cb7997 | 4285 | #: wt-status.c:1026 |
a0b6b246 JX |
4286 | msgid "You have unmerged paths." |
4287 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 4288 | |
a0b6b246 | 4289 | # 译者:注意保持前导空格 |
87cb7997 | 4290 | #: wt-status.c:1029 |
a0b6b246 JX |
4291 | msgid " (fix conflicts and run \"git commit\")" |
4292 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 4293 | |
a0b6b246 | 4294 | # 译者:注意保持前导空格 |
87cb7997 | 4295 | #: wt-status.c:1031 |
a0b6b246 JX |
4296 | msgid " (use \"git merge --abort\" to abort the merge)" |
4297 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 4298 | |
87cb7997 | 4299 | #: wt-status.c:1036 |
a0b6b246 JX |
4300 | msgid "All conflicts fixed but you are still merging." |
4301 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 4302 | |
a0b6b246 | 4303 | # 译者:注意保持前导空格 |
87cb7997 | 4304 | #: wt-status.c:1039 |
a0b6b246 JX |
4305 | msgid " (use \"git commit\" to conclude merge)" |
4306 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 4307 | |
87cb7997 | 4308 | #: wt-status.c:1049 |
a0b6b246 JX |
4309 | msgid "You are in the middle of an am session." |
4310 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 4311 | |
87cb7997 | 4312 | #: wt-status.c:1052 |
a0b6b246 JX |
4313 | msgid "The current patch is empty." |
4314 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 4315 | |
a0b6b246 | 4316 | # 译者:注意保持前导空格 |
87cb7997 | 4317 | #: wt-status.c:1056 |
a0b6b246 JX |
4318 | msgid " (fix conflicts and then run \"git am --continue\")" |
4319 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 4320 | |
a0b6b246 | 4321 | # 译者:注意保持前导空格 |
87cb7997 | 4322 | #: wt-status.c:1058 |
a0b6b246 JX |
4323 | msgid " (use \"git am --skip\" to skip this patch)" |
4324 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 4325 | |
a0b6b246 | 4326 | # 译者:注意保持前导空格 |
87cb7997 | 4327 | #: wt-status.c:1060 |
a0b6b246 JX |
4328 | msgid " (use \"git am --abort\" to restore the original branch)" |
4329 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 4330 | |
87cb7997 | 4331 | #: wt-status.c:1189 |
1a79b2f1 JX |
4332 | msgid "git-rebase-todo is missing." |
4333 | msgstr "git-rebase-todo 丢失。" | |
4334 | ||
87cb7997 | 4335 | #: wt-status.c:1191 |
a0b6b246 JX |
4336 | msgid "No commands done." |
4337 | msgstr "没有命令被执行。" | |
4338 | ||
87cb7997 | 4339 | #: wt-status.c:1194 |
1b7f4a34 | 4340 | #, c-format |
a0b6b246 JX |
4341 | msgid "Last command done (%d command done):" |
4342 | msgid_plural "Last commands done (%d commands done):" | |
4343 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
4344 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 4345 | |
87cb7997 | 4346 | #: wt-status.c:1205 |
1b7f4a34 | 4347 | #, c-format |
a0b6b246 JX |
4348 | msgid " (see more in file %s)" |
4349 | msgstr " (更多参见文件 %s)" | |
4350 | ||
87cb7997 | 4351 | #: wt-status.c:1210 |
a0b6b246 JX |
4352 | msgid "No commands remaining." |
4353 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 4354 | |
87cb7997 | 4355 | #: wt-status.c:1213 |
1b7f4a34 | 4356 | #, c-format |
a0b6b246 JX |
4357 | msgid "Next command to do (%d remaining command):" |
4358 | msgid_plural "Next commands to do (%d remaining commands):" | |
4359 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
4360 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 4361 | |
a0b6b246 | 4362 | # 译者:注意保持前导空格 |
87cb7997 | 4363 | #: wt-status.c:1221 |
a0b6b246 JX |
4364 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
4365 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 4366 | |
87cb7997 | 4367 | #: wt-status.c:1234 |
1b7f4a34 | 4368 | #, c-format |
a0b6b246 JX |
4369 | msgid "You are currently rebasing branch '%s' on '%s'." |
4370 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 4371 | |
87cb7997 | 4372 | #: wt-status.c:1239 |
a0b6b246 JX |
4373 | msgid "You are currently rebasing." |
4374 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 4375 | |
a0b6b246 | 4376 | # 译者:注意保持前导空格 |
87cb7997 | 4377 | #: wt-status.c:1253 |
a0b6b246 JX |
4378 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
4379 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 4380 | |
a0b6b246 | 4381 | # 译者:注意保持前导空格 |
87cb7997 | 4382 | #: wt-status.c:1255 |
a0b6b246 JX |
4383 | msgid " (use \"git rebase --skip\" to skip this patch)" |
4384 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
4385 | ||
4386 | # 译者:注意保持前导空格 | |
87cb7997 | 4387 | #: wt-status.c:1257 |
a0b6b246 JX |
4388 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
4389 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
4390 | ||
4391 | # 译者:注意保持前导空格 | |
87cb7997 | 4392 | #: wt-status.c:1263 |
a0b6b246 JX |
4393 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
4394 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 4395 | |
87cb7997 | 4396 | #: wt-status.c:1267 |
a0b6b246 | 4397 | #, c-format |
1b7f4a34 | 4398 | msgid "" |
a0b6b246 JX |
4399 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
4400 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 4401 | |
87cb7997 | 4402 | #: wt-status.c:1272 |
a0b6b246 JX |
4403 | msgid "You are currently splitting a commit during a rebase." |
4404 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 4405 | |
a0b6b246 | 4406 | # 译者:注意保持前导空格 |
87cb7997 | 4407 | #: wt-status.c:1275 |
a0b6b246 JX |
4408 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
4409 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 4410 | |
87cb7997 | 4411 | #: wt-status.c:1279 |
a0b6b246 JX |
4412 | #, c-format |
4413 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
4414 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 4415 | |
87cb7997 | 4416 | #: wt-status.c:1284 |
a0b6b246 JX |
4417 | msgid "You are currently editing a commit during a rebase." |
4418 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 4419 | |
a0b6b246 | 4420 | # 译者:注意保持前导空格 |
87cb7997 | 4421 | #: wt-status.c:1287 |
a0b6b246 JX |
4422 | msgid " (use \"git commit --amend\" to amend the current commit)" |
4423 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
4424 | ||
4425 | # 译者:注意保持前导空格 | |
87cb7997 | 4426 | #: wt-status.c:1289 |
a0b6b246 JX |
4427 | msgid "" |
4428 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
4429 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 4430 | |
87cb7997 | 4431 | #: wt-status.c:1299 |
1b7f4a34 | 4432 | #, c-format |
a0b6b246 JX |
4433 | msgid "You are currently cherry-picking commit %s." |
4434 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 4435 | |
a0b6b246 | 4436 | # 译者:注意保持前导空格 |
87cb7997 | 4437 | #: wt-status.c:1304 |
a0b6b246 JX |
4438 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
4439 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 4440 | |
a0b6b246 | 4441 | # 译者:注意保持前导空格 |
87cb7997 | 4442 | #: wt-status.c:1307 |
a0b6b246 JX |
4443 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
4444 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 4445 | |
a0b6b246 | 4446 | # 译者:注意保持前导空格 |
87cb7997 | 4447 | #: wt-status.c:1309 |
a0b6b246 JX |
4448 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
4449 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 4450 | |
87cb7997 | 4451 | #: wt-status.c:1318 |
1b7f4a34 | 4452 | #, c-format |
a0b6b246 JX |
4453 | msgid "You are currently reverting commit %s." |
4454 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 4455 | |
a0b6b246 | 4456 | # 译者:注意保持前导空格 |
87cb7997 | 4457 | #: wt-status.c:1323 |
a0b6b246 JX |
4458 | msgid " (fix conflicts and run \"git revert --continue\")" |
4459 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 4460 | |
a0b6b246 | 4461 | # 译者:注意保持前导空格 |
87cb7997 | 4462 | #: wt-status.c:1326 |
a0b6b246 JX |
4463 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
4464 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 4465 | |
a0b6b246 | 4466 | # 译者:注意保持前导空格 |
87cb7997 | 4467 | #: wt-status.c:1328 |
a0b6b246 JX |
4468 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
4469 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 4470 | |
87cb7997 | 4471 | #: wt-status.c:1339 |
1b7f4a34 | 4472 | #, c-format |
a0b6b246 JX |
4473 | msgid "You are currently bisecting, started from branch '%s'." |
4474 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 4475 | |
87cb7997 | 4476 | #: wt-status.c:1343 |
a0b6b246 JX |
4477 | msgid "You are currently bisecting." |
4478 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 4479 | |
a0b6b246 | 4480 | # 译者:注意保持前导空格 |
87cb7997 | 4481 | #: wt-status.c:1346 |
a0b6b246 JX |
4482 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
4483 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 4484 | |
87cb7997 | 4485 | #: wt-status.c:1543 |
a0b6b246 JX |
4486 | msgid "On branch " |
4487 | msgstr "位于分支 " | |
1b7f4a34 | 4488 | |
87cb7997 | 4489 | #: wt-status.c:1549 |
a0b6b246 JX |
4490 | msgid "interactive rebase in progress; onto " |
4491 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 4492 | |
87cb7997 | 4493 | #: wt-status.c:1551 |
a0b6b246 JX |
4494 | msgid "rebase in progress; onto " |
4495 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 4496 | |
87cb7997 | 4497 | #: wt-status.c:1556 |
a0b6b246 JX |
4498 | msgid "HEAD detached at " |
4499 | msgstr "头指针分离于 " | |
1b7f4a34 | 4500 | |
87cb7997 | 4501 | #: wt-status.c:1558 |
a0b6b246 JX |
4502 | msgid "HEAD detached from " |
4503 | msgstr "头指针分离自 " | |
1b7f4a34 | 4504 | |
87cb7997 | 4505 | #: wt-status.c:1561 |
a0b6b246 JX |
4506 | msgid "Not currently on any branch." |
4507 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 4508 | |
87cb7997 | 4509 | #: wt-status.c:1579 |
a0b6b246 JX |
4510 | msgid "Initial commit" |
4511 | msgstr "初始提交" | |
1b7f4a34 | 4512 | |
87cb7997 | 4513 | #: wt-status.c:1593 |
a0b6b246 JX |
4514 | msgid "Untracked files" |
4515 | msgstr "未跟踪的文件" | |
1b7f4a34 | 4516 | |
87cb7997 | 4517 | #: wt-status.c:1595 |
a0b6b246 JX |
4518 | msgid "Ignored files" |
4519 | msgstr "忽略的文件" | |
1b7f4a34 | 4520 | |
87cb7997 | 4521 | #: wt-status.c:1599 |
a0b6b246 JX |
4522 | #, c-format |
4523 | msgid "" | |
4524 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
4525 | "may speed it up, but you have to be careful not to forget to add\n" | |
4526 | "new files yourself (see 'git help status')." | |
4527 | msgstr "" | |
4528 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
4529 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 4530 | |
87cb7997 | 4531 | #: wt-status.c:1605 |
a0b6b246 JX |
4532 | #, c-format |
4533 | msgid "Untracked files not listed%s" | |
4534 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 4535 | |
a0b6b246 | 4536 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4537 | #: wt-status.c:1607 |
a0b6b246 JX |
4538 | msgid " (use -u option to show untracked files)" |
4539 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 4540 | |
87cb7997 | 4541 | #: wt-status.c:1613 |
a0b6b246 JX |
4542 | msgid "No changes" |
4543 | msgstr "没有修改" | |
1b7f4a34 | 4544 | |
87cb7997 | 4545 | #: wt-status.c:1618 |
a0b6b246 JX |
4546 | #, c-format |
4547 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
4548 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 4549 | |
87cb7997 | 4550 | #: wt-status.c:1621 |
a0b6b246 JX |
4551 | #, c-format |
4552 | msgid "no changes added to commit\n" | |
4553 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 4554 | |
87cb7997 | 4555 | #: wt-status.c:1624 |
a0b6b246 JX |
4556 | #, c-format |
4557 | msgid "" | |
4558 | "nothing added to commit but untracked files present (use \"git add\" to " | |
4559 | "track)\n" | |
4560 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 4561 | |
87cb7997 | 4562 | #: wt-status.c:1627 |
a0b6b246 JX |
4563 | #, c-format |
4564 | msgid "nothing added to commit but untracked files present\n" | |
4565 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 4566 | |
a0b6b246 | 4567 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4568 | #: wt-status.c:1630 |
a0b6b246 JX |
4569 | #, c-format |
4570 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
4571 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 4572 | |
87cb7997 | 4573 | #: wt-status.c:1633 wt-status.c:1638 |
a0b6b246 JX |
4574 | #, c-format |
4575 | msgid "nothing to commit\n" | |
4576 | msgstr "无文件要提交\n" | |
1b7f4a34 | 4577 | |
a0b6b246 | 4578 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4579 | #: wt-status.c:1636 |
a0b6b246 JX |
4580 | #, c-format |
4581 | msgid "nothing to commit (use -u to show untracked files)\n" | |
4582 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 4583 | |
a0b6b246 | 4584 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 4585 | #: wt-status.c:1640 |
a0b6b246 JX |
4586 | #, c-format |
4587 | msgid "nothing to commit, working tree clean\n" | |
4588 | msgstr "无文件要提交,干净的工作区\n" | |
4589 | ||
4590 | # 译者:注意保持句尾空格 | |
87cb7997 | 4591 | #: wt-status.c:1749 |
a0b6b246 JX |
4592 | msgid "Initial commit on " |
4593 | msgstr "初始提交于 " | |
1b7f4a34 | 4594 | |
87cb7997 | 4595 | #: wt-status.c:1753 |
a0b6b246 JX |
4596 | msgid "HEAD (no branch)" |
4597 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 4598 | |
a0b6b246 | 4599 | # 译者:注意保持句尾空格 |
87cb7997 | 4600 | #: wt-status.c:1782 wt-status.c:1790 |
a0b6b246 JX |
4601 | msgid "behind " |
4602 | msgstr "落后 " | |
1b7f4a34 | 4603 | |
87cb7997 | 4604 | #: wt-status.c:1785 wt-status.c:1788 |
a0b6b246 JX |
4605 | msgid "ahead " |
4606 | msgstr "领先 " | |
1b7f4a34 | 4607 | |
a0b6b246 | 4608 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
87cb7997 | 4609 | #: wt-status.c:2280 |
a0b6b246 JX |
4610 | #, c-format |
4611 | msgid "cannot %s: You have unstaged changes." | |
4612 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 4613 | |
87cb7997 | 4614 | #: wt-status.c:2286 |
a0b6b246 | 4615 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 4616 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 4617 | |
87cb7997 | 4618 | #: wt-status.c:2288 |
a0b6b246 JX |
4619 | #, c-format |
4620 | msgid "cannot %s: Your index contains uncommitted changes." | |
4621 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 4622 | |
87cb7997 | 4623 | #: compat/precompose_utf8.c:57 builtin/clone.c:432 |
a0b6b246 JX |
4624 | #, c-format |
4625 | msgid "failed to unlink '%s'" | |
4626 | msgstr "无法删除 '%s'" | |
1b7f4a34 | 4627 | |
a0b6b246 JX |
4628 | #: builtin/add.c:22 |
4629 | msgid "git add [<options>] [--] <pathspec>..." | |
4630 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 4631 | |
a0b6b246 JX |
4632 | #: builtin/add.c:80 |
4633 | #, c-format | |
4634 | msgid "unexpected diff status %c" | |
4635 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 4636 | |
a0b6b246 JX |
4637 | #: builtin/add.c:85 builtin/commit.c:291 |
4638 | msgid "updating files failed" | |
4639 | msgstr "更新文件失败" | |
1b7f4a34 | 4640 | |
a0b6b246 JX |
4641 | #: builtin/add.c:95 |
4642 | #, c-format | |
4643 | msgid "remove '%s'\n" | |
4644 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 4645 | |
a0b6b246 JX |
4646 | #: builtin/add.c:149 |
4647 | msgid "Unstaged changes after refreshing the index:" | |
4648 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 4649 | |
87cb7997 | 4650 | #: builtin/add.c:209 builtin/rev-parse.c:872 |
a0b6b246 JX |
4651 | msgid "Could not read the index" |
4652 | msgstr "不能读取索引" | |
1b7f4a34 | 4653 | |
a0b6b246 JX |
4654 | #: builtin/add.c:220 |
4655 | #, c-format | |
4656 | msgid "Could not open '%s' for writing." | |
4657 | msgstr "无法打开 '%s' 进行写入。" | |
1b7f4a34 | 4658 | |
a0b6b246 JX |
4659 | #: builtin/add.c:224 |
4660 | msgid "Could not write patch" | |
4661 | msgstr "不能生成补丁" | |
1b7f4a34 | 4662 | |
a0b6b246 JX |
4663 | #: builtin/add.c:227 |
4664 | msgid "editing patch failed" | |
4665 | msgstr "编辑补丁失败" | |
1b7f4a34 | 4666 | |
a0b6b246 | 4667 | #: builtin/add.c:230 |
1b7f4a34 | 4668 | #, c-format |
a0b6b246 | 4669 | msgid "Could not stat '%s'" |
65e2041e | 4670 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 4671 | |
a0b6b246 JX |
4672 | #: builtin/add.c:232 |
4673 | msgid "Empty patch. Aborted." | |
4674 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 4675 | |
a0b6b246 JX |
4676 | #: builtin/add.c:237 |
4677 | #, c-format | |
4678 | msgid "Could not apply '%s'" | |
4679 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 4680 | |
a0b6b246 JX |
4681 | #: builtin/add.c:247 |
4682 | msgid "The following paths are ignored by one of your .gitignore files:\n" | |
4683 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 4684 | |
87cb7997 | 4685 | #: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 |
1a79b2f1 | 4686 | #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 |
87cb7997 | 4687 | #: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 |
a0b6b246 JX |
4688 | msgid "dry run" |
4689 | msgstr "演习" | |
8ada9598 | 4690 | |
a0b6b246 JX |
4691 | #: builtin/add.c:269 |
4692 | msgid "interactive picking" | |
4693 | msgstr "交互式拣选" | |
8ada9598 | 4694 | |
87cb7997 | 4695 | #: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 |
a0b6b246 JX |
4696 | msgid "select hunks interactively" |
4697 | msgstr "交互式挑选数据块" | |
8ada9598 | 4698 | |
a0b6b246 JX |
4699 | #: builtin/add.c:271 |
4700 | msgid "edit current diff and apply" | |
4701 | msgstr "编辑当前差异并应用" | |
8ada9598 | 4702 | |
a0b6b246 JX |
4703 | #: builtin/add.c:272 |
4704 | msgid "allow adding otherwise ignored files" | |
4705 | msgstr "允许添加忽略的文件" | |
8ada9598 | 4706 | |
a0b6b246 JX |
4707 | #: builtin/add.c:273 |
4708 | msgid "update tracked files" | |
4709 | msgstr "更新已跟踪的文件" | |
8ada9598 | 4710 | |
a0b6b246 JX |
4711 | #: builtin/add.c:274 |
4712 | msgid "record only the fact that the path will be added later" | |
4713 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 4714 | |
a0b6b246 JX |
4715 | #: builtin/add.c:275 |
4716 | msgid "add changes from all tracked and untracked files" | |
4717 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 4718 | |
a0b6b246 JX |
4719 | #: builtin/add.c:278 |
4720 | msgid "ignore paths removed in the working tree (same as --no-all)" | |
4721 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 4722 | |
a0b6b246 JX |
4723 | #: builtin/add.c:280 |
4724 | msgid "don't add, only refresh the index" | |
4725 | msgstr "不添加,只刷新索引" | |
8ada9598 | 4726 | |
a0b6b246 JX |
4727 | #: builtin/add.c:281 |
4728 | msgid "just skip files which cannot be added because of errors" | |
4729 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 4730 | |
a0b6b246 JX |
4731 | #: builtin/add.c:282 |
4732 | msgid "check if - even missing - files are ignored in dry run" | |
4733 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 4734 | |
87cb7997 | 4735 | #: builtin/add.c:283 builtin/update-index.c:951 |
a0b6b246 JX |
4736 | msgid "(+/-)x" |
4737 | msgstr "(+/-)x" | |
8ada9598 | 4738 | |
87cb7997 | 4739 | #: builtin/add.c:283 builtin/update-index.c:952 |
a0b6b246 JX |
4740 | msgid "override the executable bit of the listed files" |
4741 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 4742 | |
a0b6b246 | 4743 | #: builtin/add.c:305 |
8ada9598 | 4744 | #, c-format |
a0b6b246 JX |
4745 | msgid "Use -f if you really want to add them.\n" |
4746 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 4747 | |
a0b6b246 JX |
4748 | #: builtin/add.c:312 |
4749 | msgid "adding files failed" | |
4750 | msgstr "添加文件失败" | |
8ada9598 | 4751 | |
a0b6b246 JX |
4752 | #: builtin/add.c:348 |
4753 | msgid "-A and -u are mutually incompatible" | |
4754 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 4755 | |
a0b6b246 JX |
4756 | #: builtin/add.c:355 |
4757 | msgid "Option --ignore-missing can only be used together with --dry-run" | |
4758 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 4759 | |
a0b6b246 | 4760 | #: builtin/add.c:359 |
8ada9598 | 4761 | #, c-format |
a0b6b246 JX |
4762 | msgid "--chmod param '%s' must be either -x or +x" |
4763 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 4764 | |
a0b6b246 | 4765 | #: builtin/add.c:374 |
8ada9598 | 4766 | #, c-format |
a0b6b246 JX |
4767 | msgid "Nothing specified, nothing added.\n" |
4768 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 4769 | |
a0b6b246 | 4770 | #: builtin/add.c:375 |
8ada9598 | 4771 | #, c-format |
a0b6b246 JX |
4772 | msgid "Maybe you wanted to say 'git add .'?\n" |
4773 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 4774 | |
87cb7997 JX |
4775 | #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 |
4776 | #: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 | |
1a79b2f1 | 4777 | #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 |
a0b6b246 JX |
4778 | #: builtin/submodule--helper.c:244 |
4779 | msgid "index file corrupt" | |
4780 | msgstr "索引文件损坏" | |
8ada9598 | 4781 | |
60638e98 | 4782 | #: builtin/am.c:412 |
a0b6b246 JX |
4783 | msgid "could not parse author script" |
4784 | msgstr "不能解析作者脚本" | |
8ada9598 | 4785 | |
60638e98 | 4786 | #: builtin/am.c:489 |
81809b99 | 4787 | #, c-format |
a0b6b246 JX |
4788 | msgid "'%s' was deleted by the applypatch-msg hook" |
4789 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 4790 | |
60638e98 | 4791 | #: builtin/am.c:530 |
8ada9598 | 4792 | #, c-format |
a0b6b246 JX |
4793 | msgid "Malformed input line: '%s'." |
4794 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 4795 | |
60638e98 | 4796 | #: builtin/am.c:567 |
8ada9598 | 4797 | #, c-format |
a0b6b246 JX |
4798 | msgid "Failed to copy notes from '%s' to '%s'" |
4799 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 4800 | |
60638e98 | 4801 | #: builtin/am.c:593 |
a0b6b246 JX |
4802 | msgid "fseek failed" |
4803 | msgstr "fseek 失败" | |
8ada9598 | 4804 | |
60638e98 | 4805 | #: builtin/am.c:777 |
8ada9598 | 4806 | #, c-format |
a0b6b246 JX |
4807 | msgid "could not parse patch '%s'" |
4808 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 4809 | |
60638e98 | 4810 | #: builtin/am.c:842 |
a0b6b246 JX |
4811 | msgid "Only one StGIT patch series can be applied at once" |
4812 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
4813 | ||
60638e98 | 4814 | #: builtin/am.c:889 |
a0b6b246 JX |
4815 | msgid "invalid timestamp" |
4816 | msgstr "无效的时间戳" | |
4817 | ||
60638e98 | 4818 | #: builtin/am.c:892 builtin/am.c:900 |
a0b6b246 JX |
4819 | msgid "invalid Date line" |
4820 | msgstr "无效的日期行" | |
8ada9598 | 4821 | |
60638e98 | 4822 | #: builtin/am.c:897 |
a0b6b246 JX |
4823 | msgid "invalid timezone offset" |
4824 | msgstr "无效的时区偏移值" | |
8ada9598 | 4825 | |
60638e98 | 4826 | #: builtin/am.c:986 |
a0b6b246 | 4827 | msgid "Patch format detection failed." |
87cb7997 | 4828 | msgstr "补丁格式探测失败。" |
8ada9598 | 4829 | |
60638e98 | 4830 | #: builtin/am.c:991 builtin/clone.c:397 |
8ada9598 | 4831 | #, c-format |
a0b6b246 JX |
4832 | msgid "failed to create directory '%s'" |
4833 | msgstr "无法创建目录 '%s'" | |
8ada9598 | 4834 | |
60638e98 | 4835 | #: builtin/am.c:995 |
a0b6b246 JX |
4836 | msgid "Failed to split patches." |
4837 | msgstr "无法拆分补丁。" | |
814ff314 | 4838 | |
60638e98 | 4839 | #: builtin/am.c:1127 builtin/commit.c:376 |
a0b6b246 JX |
4840 | msgid "unable to write index file" |
4841 | msgstr "无法写入索引文件" | |
8ada9598 | 4842 | |
60638e98 | 4843 | #: builtin/am.c:1178 |
8ada9598 | 4844 | #, c-format |
a0b6b246 JX |
4845 | msgid "When you have resolved this problem, run \"%s --continue\"." |
4846 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 4847 | |
60638e98 | 4848 | #: builtin/am.c:1179 |
81809b99 | 4849 | #, c-format |
a0b6b246 JX |
4850 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
4851 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 4852 | |
60638e98 | 4853 | #: builtin/am.c:1180 |
81809b99 | 4854 | #, c-format |
a0b6b246 JX |
4855 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
4856 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 4857 | |
60638e98 | 4858 | #: builtin/am.c:1315 |
a0b6b246 JX |
4859 | msgid "Patch is empty. Was it split wrong?" |
4860 | msgstr "补丁为空。是不是切分错误?" | |
23ff3338 | 4861 | |
60638e98 | 4862 | #: builtin/am.c:1386 builtin/log.c:1557 |
8ada9598 | 4863 | #, c-format |
a0b6b246 JX |
4864 | msgid "invalid ident line: %s" |
4865 | msgstr "包含无效的身份标识:%s" | |
8ada9598 | 4866 | |
60638e98 | 4867 | #: builtin/am.c:1413 |
8ada9598 | 4868 | #, c-format |
a0b6b246 JX |
4869 | msgid "unable to parse commit %s" |
4870 | msgstr "不能解析提交 %s" | |
8ada9598 | 4871 | |
60638e98 | 4872 | #: builtin/am.c:1606 |
a0b6b246 JX |
4873 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
4874 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 4875 | |
60638e98 | 4876 | #: builtin/am.c:1608 |
a0b6b246 JX |
4877 | msgid "Using index info to reconstruct a base tree..." |
4878 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 4879 | |
60638e98 | 4880 | #: builtin/am.c:1627 |
a0b6b246 JX |
4881 | msgid "" |
4882 | "Did you hand edit your patch?\n" | |
4883 | "It does not apply to blobs recorded in its index." | |
4884 | msgstr "" | |
4885 | "您是否曾手动编辑过您的补丁?\n" | |
4886 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 4887 | |
60638e98 | 4888 | #: builtin/am.c:1633 |
a0b6b246 JX |
4889 | msgid "Falling back to patching base and 3-way merge..." |
4890 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 4891 | |
60638e98 | 4892 | #: builtin/am.c:1658 |
a0b6b246 JX |
4893 | msgid "Failed to merge in the changes." |
4894 | msgstr "无法合并变更。" | |
d691f479 | 4895 | |
60638e98 | 4896 | #: builtin/am.c:1682 builtin/merge.c:631 |
a0b6b246 JX |
4897 | msgid "git write-tree failed to write a tree" |
4898 | msgstr "git write-tree 无法写入一树对象" | |
814ff314 | 4899 | |
60638e98 | 4900 | #: builtin/am.c:1689 |
a0b6b246 JX |
4901 | msgid "applying to an empty history" |
4902 | msgstr "正应用到一个空历史上" | |
8ada9598 | 4903 | |
60638e98 | 4904 | #: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 |
1a79b2f1 | 4905 | #: builtin/merge.c:827 |
a0b6b246 JX |
4906 | msgid "failed to write commit object" |
4907 | msgstr "无法写提交对象" | |
8ada9598 | 4908 | |
60638e98 | 4909 | #: builtin/am.c:1735 builtin/am.c:1739 |
8ada9598 | 4910 | #, c-format |
a0b6b246 JX |
4911 | msgid "cannot resume: %s does not exist." |
4912 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 4913 | |
60638e98 | 4914 | #: builtin/am.c:1755 |
a0b6b246 JX |
4915 | msgid "cannot be interactive without stdin connected to a terminal." |
4916 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 4917 | |
60638e98 | 4918 | #: builtin/am.c:1760 |
a0b6b246 JX |
4919 | msgid "Commit Body is:" |
4920 | msgstr "提交内容为:" | |
8ada9598 | 4921 | |
a0b6b246 JX |
4922 | # 译者:注意保持句尾空格 |
4923 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
4924 | #. in your translation. The program will only accept English | |
4925 | #. input at this point. | |
4926 | #. | |
60638e98 | 4927 | #: builtin/am.c:1770 |
a0b6b246 JX |
4928 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
4929 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 4930 | |
60638e98 | 4931 | #: builtin/am.c:1820 |
8ada9598 | 4932 | #, c-format |
a0b6b246 JX |
4933 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
4934 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 4935 | |
60638e98 | 4936 | #: builtin/am.c:1860 builtin/am.c:1932 |
81809b99 | 4937 | #, c-format |
a0b6b246 JX |
4938 | msgid "Applying: %.*s" |
4939 | msgstr "应用:%.*s" | |
8ada9598 | 4940 | |
60638e98 | 4941 | #: builtin/am.c:1876 |
a0b6b246 JX |
4942 | msgid "No changes -- Patch already applied." |
4943 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 4944 | |
60638e98 | 4945 | #: builtin/am.c:1884 |
81809b99 | 4946 | #, c-format |
a0b6b246 JX |
4947 | msgid "Patch failed at %s %.*s" |
4948 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 4949 | |
60638e98 | 4950 | #: builtin/am.c:1890 |
8ada9598 | 4951 | #, c-format |
a0b6b246 JX |
4952 | msgid "The copy of the patch that failed is found in: %s" |
4953 | msgstr "失败的补丁文件副本位于:%s" | |
8ada9598 | 4954 | |
60638e98 | 4955 | #: builtin/am.c:1935 |
a0b6b246 JX |
4956 | msgid "" |
4957 | "No changes - did you forget to use 'git add'?\n" | |
4958 | "If there is nothing left to stage, chances are that something else\n" | |
4959 | "already introduced the same changes; you might want to skip this patch." | |
4960 | msgstr "" | |
4961 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
4962 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
4963 | "您也许想要跳过这个补丁。" | |
8ada9598 | 4964 | |
60638e98 | 4965 | #: builtin/am.c:1942 |
a0b6b246 JX |
4966 | msgid "" |
4967 | "You still have unmerged paths in your index.\n" | |
4968 | "Did you forget to use 'git add'?" | |
4969 | msgstr "" | |
4970 | "您的索引中仍有未合并的路径。\n" | |
4971 | "您是否忘了执行 'git add'?" | |
8ada9598 | 4972 | |
60638e98 | 4973 | #: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 |
a0b6b246 | 4974 | #: builtin/reset.c:316 |
8ada9598 | 4975 | #, c-format |
a0b6b246 JX |
4976 | msgid "Could not parse object '%s'." |
4977 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 4978 | |
60638e98 | 4979 | #: builtin/am.c:2102 |
a0b6b246 JX |
4980 | msgid "failed to clean index" |
4981 | msgstr "无法清空索引" | |
5b04ee3b | 4982 | |
60638e98 | 4983 | #: builtin/am.c:2136 |
a0b6b246 JX |
4984 | msgid "" |
4985 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
4986 | "Not rewinding to ORIG_HEAD" | |
4987 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 4988 | |
60638e98 | 4989 | #: builtin/am.c:2199 |
8ada9598 | 4990 | #, c-format |
a0b6b246 JX |
4991 | msgid "Invalid value for --patch-format: %s" |
4992 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 4993 | |
60638e98 | 4994 | #: builtin/am.c:2232 |
a0b6b246 JX |
4995 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
4996 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 4997 | |
60638e98 | 4998 | #: builtin/am.c:2233 |
a0b6b246 JX |
4999 | msgid "git am [<options>] (--continue | --skip | --abort)" |
5000 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 5001 | |
60638e98 | 5002 | #: builtin/am.c:2239 |
a0b6b246 JX |
5003 | msgid "run interactively" |
5004 | msgstr "以交互式方式运行" | |
8ada9598 | 5005 | |
60638e98 | 5006 | #: builtin/am.c:2241 |
a0b6b246 JX |
5007 | msgid "historical option -- no-op" |
5008 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 5009 | |
60638e98 | 5010 | #: builtin/am.c:2243 |
a0b6b246 JX |
5011 | msgid "allow fall back on 3way merging if needed" |
5012 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 5013 | |
60638e98 | 5014 | #: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 |
1a79b2f1 | 5015 | #: builtin/repack.c:178 |
a0b6b246 JX |
5016 | msgid "be quiet" |
5017 | msgstr "静默模式" | |
8ada9598 | 5018 | |
60638e98 | 5019 | #: builtin/am.c:2246 |
a0b6b246 JX |
5020 | msgid "add a Signed-off-by line to the commit message" |
5021 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 5022 | |
60638e98 | 5023 | #: builtin/am.c:2249 |
a0b6b246 JX |
5024 | msgid "recode into utf8 (default)" |
5025 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 5026 | |
60638e98 | 5027 | #: builtin/am.c:2251 |
a0b6b246 JX |
5028 | msgid "pass -k flag to git-mailinfo" |
5029 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 5030 | |
60638e98 | 5031 | #: builtin/am.c:2253 |
a0b6b246 JX |
5032 | msgid "pass -b flag to git-mailinfo" |
5033 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 5034 | |
60638e98 | 5035 | #: builtin/am.c:2255 |
a0b6b246 JX |
5036 | msgid "pass -m flag to git-mailinfo" |
5037 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 5038 | |
60638e98 | 5039 | #: builtin/am.c:2257 |
a0b6b246 JX |
5040 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
5041 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 5042 | |
60638e98 | 5043 | #: builtin/am.c:2260 |
a0b6b246 JX |
5044 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
5045 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 5046 | |
60638e98 | 5047 | #: builtin/am.c:2263 |
a0b6b246 JX |
5048 | msgid "strip everything before a scissors line" |
5049 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 5050 | |
60638e98 JX |
5051 | #: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 |
5052 | #: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 | |
5053 | #: builtin/am.c:2292 | |
a0b6b246 JX |
5054 | msgid "pass it through git-apply" |
5055 | msgstr "传递给 git-apply" | |
8ada9598 | 5056 | |
60638e98 | 5057 | #: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 |
87cb7997 | 5058 | #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 |
1a79b2f1 | 5059 | #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 |
87cb7997 | 5060 | #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 |
a0b6b246 JX |
5061 | #: parse-options.h:132 parse-options.h:134 parse-options.h:245 |
5062 | msgid "n" | |
5063 | msgstr "n" | |
8ada9598 | 5064 | |
60638e98 JX |
5065 | #: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 |
5066 | #: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 | |
a0b6b246 JX |
5067 | msgid "format" |
5068 | msgstr "格式" | |
8ada9598 | 5069 | |
60638e98 | 5070 | #: builtin/am.c:2289 |
a0b6b246 JX |
5071 | msgid "format the patch(es) are in" |
5072 | msgstr "补丁的格式" | |
8ada9598 | 5073 | |
60638e98 | 5074 | #: builtin/am.c:2295 |
a0b6b246 JX |
5075 | msgid "override error message when patch failure occurs" |
5076 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 5077 | |
60638e98 | 5078 | #: builtin/am.c:2297 |
a0b6b246 JX |
5079 | msgid "continue applying patches after resolving a conflict" |
5080 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 5081 | |
60638e98 | 5082 | #: builtin/am.c:2300 |
a0b6b246 JX |
5083 | msgid "synonyms for --continue" |
5084 | msgstr "和 --continue 同义" | |
8ada9598 | 5085 | |
60638e98 | 5086 | #: builtin/am.c:2303 |
a0b6b246 JX |
5087 | msgid "skip the current patch" |
5088 | msgstr "跳过当前补丁" | |
23ff3338 | 5089 | |
60638e98 | 5090 | #: builtin/am.c:2306 |
a0b6b246 JX |
5091 | msgid "restore the original branch and abort the patching operation." |
5092 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 5093 | |
60638e98 | 5094 | #: builtin/am.c:2310 |
a0b6b246 JX |
5095 | msgid "lie about committer date" |
5096 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 5097 | |
60638e98 | 5098 | #: builtin/am.c:2312 |
a0b6b246 JX |
5099 | msgid "use current timestamp for author date" |
5100 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 5101 | |
60638e98 | 5102 | #: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 |
87cb7997 | 5103 | #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 |
a0b6b246 JX |
5104 | msgid "key-id" |
5105 | msgstr "key-id" | |
8ada9598 | 5106 | |
60638e98 | 5107 | #: builtin/am.c:2315 |
a0b6b246 JX |
5108 | msgid "GPG-sign commits" |
5109 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 5110 | |
60638e98 | 5111 | #: builtin/am.c:2318 |
a0b6b246 JX |
5112 | msgid "(internal use for git-rebase)" |
5113 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 5114 | |
60638e98 | 5115 | #: builtin/am.c:2333 |
a0b6b246 JX |
5116 | msgid "" |
5117 | "The -b/--binary option has been a no-op for long time, and\n" | |
5118 | "it will be removed. Please do not use it anymore." | |
5119 | msgstr "" | |
5120 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
5121 | "请不要再使用它了。" | |
8ada9598 | 5122 | |
60638e98 | 5123 | #: builtin/am.c:2340 |
a0b6b246 JX |
5124 | msgid "failed to read the index" |
5125 | msgstr "无法读取索引" | |
8ada9598 | 5126 | |
60638e98 | 5127 | #: builtin/am.c:2355 |
a0b6b246 JX |
5128 | #, c-format |
5129 | msgid "previous rebase directory %s still exists but mbox given." | |
5130 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 5131 | |
60638e98 | 5132 | #: builtin/am.c:2379 |
a0b6b246 JX |
5133 | #, c-format |
5134 | msgid "" | |
5135 | "Stray %s directory found.\n" | |
5136 | "Use \"git am --abort\" to remove it." | |
5137 | msgstr "" | |
5138 | "发现了错误的 %s 目录。\n" | |
5139 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 5140 | |
60638e98 | 5141 | #: builtin/am.c:2385 |
a0b6b246 JX |
5142 | msgid "Resolve operation not in progress, we are not resuming." |
5143 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 5144 | |
a0b6b246 JX |
5145 | #: builtin/apply.c:8 |
5146 | msgid "git apply [<options>] [<patch>...]" | |
5147 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 5148 | |
c04f5ac3 JX |
5149 | #: builtin/archive.c:17 |
5150 | #, c-format | |
5151 | msgid "could not create archive file '%s'" | |
90e6ef53 | 5152 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
5153 | |
5154 | #: builtin/archive.c:20 | |
5155 | msgid "could not redirect output" | |
195febda | 5156 | msgstr "不能重定向输出" |
c04f5ac3 JX |
5157 | |
5158 | #: builtin/archive.c:37 | |
5159 | msgid "git archive: Remote with no URL" | |
4375c10e | 5160 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
5161 | |
5162 | #: builtin/archive.c:58 | |
5163 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 5164 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 5165 | |
1003b3a5 | 5166 | #: builtin/archive.c:61 |
c04f5ac3 JX |
5167 | #, c-format |
5168 | msgid "git archive: NACK %s" | |
90e6ef53 | 5169 | msgstr "git archive:NACK %s" |
c04f5ac3 | 5170 | |
1003b3a5 | 5171 | #: builtin/archive.c:64 |
c04f5ac3 | 5172 | msgid "git archive: protocol error" |
90e6ef53 | 5173 | msgstr "git archive:协议错误" |
c04f5ac3 | 5174 | |
1003b3a5 | 5175 | #: builtin/archive.c:68 |
c04f5ac3 | 5176 | msgid "git archive: expected a flush" |
a0b6b246 | 5177 | msgstr "git archive:应有一个 flush 刷新" |
c04f5ac3 | 5178 | |
ef317cd5 JX |
5179 | #: builtin/bisect--helper.c:7 |
5180 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 5181 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
5182 | |
5183 | #: builtin/bisect--helper.c:17 | |
5184 | msgid "perform 'git bisect next'" | |
07432cef | 5185 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
5186 | |
5187 | #: builtin/bisect--helper.c:19 | |
5188 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 5189 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 5190 | |
276ceeaa | 5191 | #: builtin/blame.c:33 |
7aea43ff JX |
5192 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
5193 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 5194 | |
276ceeaa | 5195 | #: builtin/blame.c:38 |
814ff314 JX |
5196 | msgid "<rev-opts> are documented in git-rev-list(1)" |
5197 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 5198 | |
87cb7997 | 5199 | #: builtin/blame.c:1777 |
276ceeaa JX |
5200 | msgid "Blaming lines" |
5201 | msgstr "追踪代码行" | |
5202 | ||
87cb7997 | 5203 | #: builtin/blame.c:2573 |
ef317cd5 | 5204 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 5205 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 5206 | |
87cb7997 | 5207 | #: builtin/blame.c:2574 |
ef317cd5 | 5208 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 5209 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 5210 | |
87cb7997 | 5211 | #: builtin/blame.c:2575 |
ef317cd5 | 5212 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 5213 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 5214 | |
87cb7997 | 5215 | #: builtin/blame.c:2576 |
ef317cd5 | 5216 | msgid "Show work cost statistics" |
07432cef | 5217 | msgstr "显示命令消耗统计" |
ef317cd5 | 5218 | |
87cb7997 | 5219 | #: builtin/blame.c:2577 |
276ceeaa JX |
5220 | msgid "Force progress reporting" |
5221 | msgstr "强制进度显示" | |
5222 | ||
87cb7997 | 5223 | #: builtin/blame.c:2578 |
ef317cd5 | 5224 | msgid "Show output score for blame entries" |
07432cef | 5225 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 5226 | |
87cb7997 | 5227 | #: builtin/blame.c:2579 |
ef317cd5 | 5228 | msgid "Show original filename (Default: auto)" |
07432cef | 5229 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 5230 | |
87cb7997 | 5231 | #: builtin/blame.c:2580 |
ef317cd5 | 5232 | msgid "Show original linenumber (Default: off)" |
07432cef | 5233 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 5234 | |
87cb7997 | 5235 | #: builtin/blame.c:2581 |
ef317cd5 | 5236 | msgid "Show in a format designed for machine consumption" |
07432cef | 5237 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 5238 | |
87cb7997 | 5239 | #: builtin/blame.c:2582 |
ef317cd5 | 5240 | msgid "Show porcelain format with per-line commit information" |
07432cef | 5241 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 5242 | |
87cb7997 | 5243 | #: builtin/blame.c:2583 |
ef317cd5 | 5244 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 5245 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 5246 | |
87cb7997 | 5247 | #: builtin/blame.c:2584 |
ef317cd5 | 5248 | msgid "Show raw timestamp (Default: off)" |
07432cef | 5249 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 5250 | |
87cb7997 | 5251 | #: builtin/blame.c:2585 |
ef317cd5 | 5252 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 5253 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 5254 | |
87cb7997 | 5255 | #: builtin/blame.c:2586 |
ef317cd5 | 5256 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 5257 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 5258 | |
87cb7997 | 5259 | #: builtin/blame.c:2587 |
ef317cd5 | 5260 | msgid "Show author email instead of name (Default: off)" |
07432cef | 5261 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 5262 | |
87cb7997 | 5263 | #: builtin/blame.c:2588 |
ef317cd5 | 5264 | msgid "Ignore whitespace differences" |
07432cef | 5265 | msgstr "忽略空白差异" |
ef317cd5 | 5266 | |
87cb7997 | 5267 | #: builtin/blame.c:2595 |
1a79b2f1 JX |
5268 | msgid "Use an experimental heuristic to improve diffs" |
5269 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 5270 | |
87cb7997 | 5271 | #: builtin/blame.c:2597 |
ef317cd5 | 5272 | msgid "Spend extra cycles to find better match" |
07432cef | 5273 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 5274 | |
87cb7997 | 5275 | #: builtin/blame.c:2598 |
ef317cd5 | 5276 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 5277 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 5278 | |
87cb7997 | 5279 | #: builtin/blame.c:2599 |
ef317cd5 | 5280 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 5281 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 5282 | |
87cb7997 | 5283 | #: builtin/blame.c:2600 builtin/blame.c:2601 |
ef317cd5 | 5284 | msgid "score" |
07432cef | 5285 | msgstr "得分" |
ef317cd5 | 5286 | |
87cb7997 | 5287 | #: builtin/blame.c:2600 |
ef317cd5 | 5288 | msgid "Find line copies within and across files" |
07432cef | 5289 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 5290 | |
87cb7997 | 5291 | #: builtin/blame.c:2601 |
ef317cd5 | 5292 | msgid "Find line movements within and across files" |
07432cef | 5293 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 5294 | |
87cb7997 | 5295 | #: builtin/blame.c:2602 |
ef317cd5 | 5296 | msgid "n,m" |
07432cef | 5297 | msgstr "n,m" |
ef317cd5 | 5298 | |
87cb7997 | 5299 | #: builtin/blame.c:2602 |
ef317cd5 | 5300 | msgid "Process only line range n,m, counting from 1" |
07432cef | 5301 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 5302 | |
87cb7997 | 5303 | #: builtin/blame.c:2649 |
a0b6b246 JX |
5304 | msgid "--progress can't be used with --incremental or porcelain formats" |
5305 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
5306 | ||
6c94aba5 JX |
5307 | #. TRANSLATORS: This string is used to tell us the maximum |
5308 | #. display width for a relative timestamp in "git blame" | |
5309 | #. output. For C locale, "4 years, 11 months ago", which | |
5310 | #. takes 22 places, is the longest among various forms of | |
5311 | #. relative timestamps, but your language may need more or | |
5312 | #. fewer display columns. | |
87cb7997 | 5313 | #: builtin/blame.c:2697 |
6c94aba5 JX |
5314 | msgid "4 years, 11 months ago" |
5315 | msgstr "4 年 11 个月前" | |
5316 | ||
87cb7997 | 5317 | #: builtin/blame.c:2777 |
a0b6b246 JX |
5318 | msgid "--contents and --reverse do not blend well." |
5319 | msgstr "--contents 和 --reverse 不能混用。" | |
5320 | ||
87cb7997 | 5321 | #: builtin/blame.c:2797 |
a0b6b246 JX |
5322 | msgid "cannot use --contents with final commit object name" |
5323 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
5324 | ||
87cb7997 | 5325 | #: builtin/blame.c:2802 |
a0b6b246 JX |
5326 | msgid "--reverse and --first-parent together require specified latest commit" |
5327 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
5328 | ||
87cb7997 | 5329 | #: builtin/blame.c:2829 |
a0b6b246 JX |
5330 | msgid "" |
5331 | "--reverse --first-parent together require range along first-parent chain" | |
5332 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
5333 | ||
87cb7997 | 5334 | #: builtin/blame.c:2840 |
a0b6b246 JX |
5335 | #, c-format |
5336 | msgid "no such path %s in %s" | |
5337 | msgstr "在 %2$s 中无此路径 %1$s" | |
5338 | ||
87cb7997 | 5339 | #: builtin/blame.c:2851 |
a0b6b246 JX |
5340 | #, c-format |
5341 | msgid "cannot read blob %s for path %s" | |
29004bbb | 5342 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" |
a0b6b246 | 5343 | |
87cb7997 | 5344 | #: builtin/blame.c:2870 |
a0b6b246 JX |
5345 | #, c-format |
5346 | msgid "file %s has only %lu line" | |
5347 | msgid_plural "file %s has only %lu lines" | |
5348 | msgstr[0] "文件 %s 只有 %lu 行" | |
5349 | msgstr[1] "文件 %s 只有 %lu 行" | |
5350 | ||
5b04ee3b | 5351 | #: builtin/branch.c:26 |
814ff314 JX |
5352 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
5353 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 5354 | |
5b04ee3b | 5355 | #: builtin/branch.c:27 |
814ff314 JX |
5356 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
5357 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 5358 | |
5b04ee3b | 5359 | #: builtin/branch.c:28 |
814ff314 JX |
5360 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
5361 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 5362 | |
5b04ee3b | 5363 | #: builtin/branch.c:29 |
814ff314 JX |
5364 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
5365 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 5366 | |
5b04ee3b | 5367 | #: builtin/branch.c:30 |
94550ed3 JX |
5368 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
5369 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
5370 | ||
87cb7997 JX |
5371 | #: builtin/branch.c:31 |
5372 | msgid "git branch [<options>] [-r | -a] [--format]" | |
5373 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
5374 | ||
90e6ef53 | 5375 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
87cb7997 | 5376 | #: builtin/branch.c:144 |
c04f5ac3 JX |
5377 | #, c-format |
5378 | msgid "" | |
5379 | "deleting branch '%s' that has been merged to\n" | |
5380 | " '%s', but not yet merged to HEAD." | |
5381 | msgstr "" | |
70fc47bf | 5382 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
5383 | " '%s',但未合并到 HEAD。" |
5384 | ||
90e6ef53 | 5385 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
87cb7997 | 5386 | #: builtin/branch.c:148 |
c04f5ac3 JX |
5387 | #, c-format |
5388 | msgid "" | |
5389 | "not deleting branch '%s' that is not yet merged to\n" | |
5390 | " '%s', even though it is merged to HEAD." | |
5391 | msgstr "" | |
70fc47bf T |
5392 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
5393 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 5394 | |
87cb7997 | 5395 | #: builtin/branch.c:162 |
07432cef WS |
5396 | #, c-format |
5397 | msgid "Couldn't look up commit object for '%s'" | |
5398 | msgstr "无法查询 '%s' 指向的提交对象" | |
5399 | ||
87cb7997 | 5400 | #: builtin/branch.c:166 |
07432cef WS |
5401 | #, c-format |
5402 | msgid "" | |
5403 | "The branch '%s' is not fully merged.\n" | |
5404 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
5405 | msgstr "" | |
5406 | "分支 '%s' 没有完全合并。\n" | |
5407 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
5408 | ||
87cb7997 | 5409 | #: builtin/branch.c:179 |
07432cef WS |
5410 | msgid "Update of config-file failed" |
5411 | msgstr "无法更新 config 文件" | |
5412 | ||
87cb7997 | 5413 | #: builtin/branch.c:210 |
c04f5ac3 | 5414 | msgid "cannot use -a with -d" |
649900bc | 5415 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 5416 | |
87cb7997 | 5417 | #: builtin/branch.c:216 |
c04f5ac3 JX |
5418 | msgid "Couldn't look up commit object for HEAD" |
5419 | msgstr "无法查询 HEAD 指向的提交对象" | |
5420 | ||
87cb7997 | 5421 | #: builtin/branch.c:230 |
c04f5ac3 | 5422 | #, c-format |
5b04ee3b JX |
5423 | msgid "Cannot delete branch '%s' checked out at '%s'" |
5424 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 5425 | |
87cb7997 | 5426 | #: builtin/branch.c:245 |
5ae481e0 | 5427 | #, c-format |
7aea43ff JX |
5428 | msgid "remote-tracking branch '%s' not found." |
5429 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 5430 | |
87cb7997 | 5431 | #: builtin/branch.c:246 |
81809b99 | 5432 | #, c-format |
8ada9598 | 5433 | msgid "branch '%s' not found." |
81809b99 | 5434 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 5435 | |
87cb7997 | 5436 | #: builtin/branch.c:261 |
81809b99 | 5437 | #, c-format |
7aea43ff JX |
5438 | msgid "Error deleting remote-tracking branch '%s'" |
5439 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 5440 | |
87cb7997 | 5441 | #: builtin/branch.c:262 |
81809b99 | 5442 | #, c-format |
8ada9598 | 5443 | msgid "Error deleting branch '%s'" |
7aea43ff | 5444 | msgstr "无法删除分支 '%s'" |
8ada9598 | 5445 | |
87cb7997 | 5446 | #: builtin/branch.c:269 |
81809b99 | 5447 | #, c-format |
7aea43ff JX |
5448 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
5449 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 5450 | |
87cb7997 | 5451 | #: builtin/branch.c:270 |
81809b99 | 5452 | #, c-format |
8ada9598 | 5453 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 5454 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 5455 | |
87cb7997 | 5456 | #: builtin/branch.c:441 |
5b04ee3b JX |
5457 | #, c-format |
5458 | msgid "Branch %s is being rebased at %s" | |
5459 | msgstr "分支 %s 正被变基到 %s" | |
5460 | ||
87cb7997 | 5461 | #: builtin/branch.c:445 |
5b04ee3b JX |
5462 | #, c-format |
5463 | msgid "Branch %s is being bisected at %s" | |
5464 | msgstr "分支 %s 正被二分查找于 %s" | |
5465 | ||
87cb7997 | 5466 | #: builtin/branch.c:460 |
c04f5ac3 | 5467 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 5468 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 5469 | |
87cb7997 | 5470 | #: builtin/branch.c:470 |
c04f5ac3 JX |
5471 | #, c-format |
5472 | msgid "Invalid branch name: '%s'" | |
5473 | msgstr "无效的分支名:'%s'" | |
5474 | ||
87cb7997 | 5475 | #: builtin/branch.c:487 |
c04f5ac3 JX |
5476 | msgid "Branch rename failed" |
5477 | msgstr "分支重命名失败" | |
5478 | ||
87cb7997 | 5479 | #: builtin/branch.c:490 |
c04f5ac3 JX |
5480 | #, c-format |
5481 | msgid "Renamed a misnamed branch '%s' away" | |
5482 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
5483 | ||
87cb7997 | 5484 | #: builtin/branch.c:493 |
c04f5ac3 JX |
5485 | #, c-format |
5486 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
5487 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
5488 | ||
87cb7997 | 5489 | #: builtin/branch.c:502 |
c04f5ac3 JX |
5490 | msgid "Branch is renamed, but update of config-file failed" |
5491 | msgstr "分支被重命名,但更新 config 文件失败" | |
5492 | ||
87cb7997 | 5493 | #: builtin/branch.c:518 |
5c57d762 JX |
5494 | #, c-format |
5495 | msgid "" | |
5496 | "Please edit the description for the branch\n" | |
5497 | " %s\n" | |
5498 | "Lines starting with '%c' will be stripped.\n" | |
5499 | msgstr "" | |
5500 | "请编辑分支的描述\n" | |
5501 | " %s\n" | |
5502 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 5503 | |
87cb7997 | 5504 | #: builtin/branch.c:551 |
ef317cd5 | 5505 | msgid "Generic options" |
07432cef | 5506 | msgstr "通用选项" |
c04f5ac3 | 5507 | |
87cb7997 | 5508 | #: builtin/branch.c:553 |
ef317cd5 | 5509 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 5510 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 5511 | |
87cb7997 | 5512 | #: builtin/branch.c:554 |
ef317cd5 | 5513 | msgid "suppress informational messages" |
07432cef | 5514 | msgstr "不显示信息" |
8ada9598 | 5515 | |
87cb7997 | 5516 | #: builtin/branch.c:555 |
ef317cd5 | 5517 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 5518 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 5519 | |
87cb7997 | 5520 | #: builtin/branch.c:557 |
ef317cd5 | 5521 | msgid "change upstream info" |
07432cef | 5522 | msgstr "改变上游信息" |
c04f5ac3 | 5523 | |
87cb7997 | 5524 | #: builtin/branch.c:559 |
5b04ee3b JX |
5525 | msgid "upstream" |
5526 | msgstr "上游" | |
5527 | ||
87cb7997 | 5528 | #: builtin/branch.c:559 |
5b04ee3b JX |
5529 | msgid "change the upstream info" |
5530 | msgstr "改变上游信息" | |
5531 | ||
87cb7997 | 5532 | #: builtin/branch.c:560 |
a0b6b246 JX |
5533 | msgid "Unset the upstream info" |
5534 | msgstr "取消上游信息的设置" | |
5535 | ||
87cb7997 | 5536 | #: builtin/branch.c:561 |
ef317cd5 | 5537 | msgid "use colored output" |
07432cef | 5538 | msgstr "使用彩色输出" |
c04f5ac3 | 5539 | |
87cb7997 | 5540 | #: builtin/branch.c:562 |
ef317cd5 | 5541 | msgid "act on remote-tracking branches" |
07432cef | 5542 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 5543 | |
87cb7997 | 5544 | #: builtin/branch.c:564 builtin/branch.c:566 |
ef317cd5 | 5545 | msgid "print only branches that contain the commit" |
07432cef | 5546 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 5547 | |
87cb7997 JX |
5548 | #: builtin/branch.c:565 builtin/branch.c:567 |
5549 | msgid "print only branches that don't contain the commit" | |
5550 | msgstr "只打印不包含该提交的分支" | |
5551 | ||
5552 | #: builtin/branch.c:570 | |
ef317cd5 | 5553 | msgid "Specific git-branch actions:" |
07432cef | 5554 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 5555 | |
87cb7997 | 5556 | #: builtin/branch.c:571 |
ef317cd5 | 5557 | msgid "list both remote-tracking and local branches" |
07432cef | 5558 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 5559 | |
87cb7997 | 5560 | #: builtin/branch.c:573 |
ef317cd5 | 5561 | msgid "delete fully merged branch" |
07432cef | 5562 | msgstr "删除完全合并的分支" |
c04f5ac3 | 5563 | |
87cb7997 | 5564 | #: builtin/branch.c:574 |
ef317cd5 | 5565 | msgid "delete branch (even if not merged)" |
07432cef | 5566 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 5567 | |
87cb7997 | 5568 | #: builtin/branch.c:575 |
ef317cd5 | 5569 | msgid "move/rename a branch and its reflog" |
07432cef | 5570 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 5571 | |
87cb7997 | 5572 | #: builtin/branch.c:576 |
ef317cd5 | 5573 | msgid "move/rename a branch, even if target exists" |
07432cef | 5574 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 5575 | |
87cb7997 | 5576 | #: builtin/branch.c:577 |
ef317cd5 | 5577 | msgid "list branch names" |
07432cef | 5578 | msgstr "列出分支名" |
c04f5ac3 | 5579 | |
87cb7997 | 5580 | #: builtin/branch.c:578 |
ef317cd5 | 5581 | msgid "create the branch's reflog" |
07432cef | 5582 | msgstr "创建分支的引用日志" |
ef317cd5 | 5583 | |
87cb7997 | 5584 | #: builtin/branch.c:580 |
ef317cd5 | 5585 | msgid "edit the description for the branch" |
07432cef | 5586 | msgstr "标记分支的描述" |
ef317cd5 | 5587 | |
87cb7997 | 5588 | #: builtin/branch.c:581 |
04cb2f28 JX |
5589 | msgid "force creation, move/rename, deletion" |
5590 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 5591 | |
87cb7997 | 5592 | #: builtin/branch.c:582 |
94550ed3 JX |
5593 | msgid "print only branches that are merged" |
5594 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 5595 | |
87cb7997 | 5596 | #: builtin/branch.c:583 |
94550ed3 JX |
5597 | msgid "print only branches that are not merged" |
5598 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 5599 | |
87cb7997 | 5600 | #: builtin/branch.c:584 |
ef317cd5 | 5601 | msgid "list branches in columns" |
07432cef | 5602 | msgstr "以列的方式显示分支" |
ef317cd5 | 5603 | |
87cb7997 | 5604 | #: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 |
94550ed3 JX |
5605 | msgid "key" |
5606 | msgstr "key" | |
5607 | ||
87cb7997 | 5608 | #: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 |
94550ed3 JX |
5609 | msgid "field name to sort on" |
5610 | msgstr "排序的字段名" | |
5611 | ||
87cb7997 | 5612 | #: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 |
a0b6b246 | 5613 | #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 |
87cb7997 | 5614 | #: builtin/tag.c:429 |
94550ed3 JX |
5615 | msgid "object" |
5616 | msgstr "对象" | |
5617 | ||
87cb7997 | 5618 | #: builtin/branch.c:589 |
94550ed3 JX |
5619 | msgid "print only branches of the object" |
5620 | msgstr "只打印指向该对象的分支" | |
5621 | ||
87cb7997 | 5622 | #: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 |
1a79b2f1 JX |
5623 | msgid "sorting and filtering are case insensitive" |
5624 | msgstr "排序和过滤属于大小写不敏感" | |
5625 | ||
87cb7997 JX |
5626 | #: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 |
5627 | #: builtin/verify-tag.c:38 | |
5628 | msgid "format to use for the output" | |
5629 | msgstr "输出格式" | |
5630 | ||
5631 | #: builtin/branch.c:611 | |
c04f5ac3 JX |
5632 | msgid "Failed to resolve HEAD as a valid ref." |
5633 | msgstr "无法将 HEAD 解析为有效引用。" | |
5634 | ||
87cb7997 | 5635 | #: builtin/branch.c:615 builtin/clone.c:724 |
c04f5ac3 | 5636 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 5637 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 5638 | |
87cb7997 | 5639 | #: builtin/branch.c:638 |
8ada9598 | 5640 | msgid "--column and --verbose are incompatible" |
81809b99 | 5641 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 5642 | |
87cb7997 | 5643 | #: builtin/branch.c:649 builtin/branch.c:701 |
a77c07d9 JX |
5644 | msgid "branch name required" |
5645 | msgstr "必须提供分支名" | |
5646 | ||
87cb7997 | 5647 | #: builtin/branch.c:677 |
a77c07d9 JX |
5648 | msgid "Cannot give description to detached HEAD" |
5649 | msgstr "不能向分离头指针提供描述" | |
5650 | ||
87cb7997 | 5651 | #: builtin/branch.c:682 |
a77c07d9 JX |
5652 | msgid "cannot edit description of more than one branch" |
5653 | msgstr "不能为一个以上的分支编辑描述" | |
5654 | ||
87cb7997 | 5655 | #: builtin/branch.c:689 |
a77c07d9 JX |
5656 | #, c-format |
5657 | msgid "No commit on branch '%s' yet." | |
5658 | msgstr "分支 '%s' 尚无提交。" | |
5659 | ||
87cb7997 | 5660 | #: builtin/branch.c:692 |
a77c07d9 JX |
5661 | #, c-format |
5662 | msgid "No branch named '%s'." | |
5663 | msgstr "没有分支 '%s'。" | |
5664 | ||
87cb7997 | 5665 | #: builtin/branch.c:707 |
a77c07d9 JX |
5666 | msgid "too many branches for a rename operation" |
5667 | msgstr "为重命名操作提供了太多的分支名" | |
5668 | ||
87cb7997 | 5669 | #: builtin/branch.c:712 |
1003b3a5 JX |
5670 | msgid "too many branches to set new upstream" |
5671 | msgstr "为设置新上游提供了太多的分支名" | |
5672 | ||
87cb7997 | 5673 | #: builtin/branch.c:716 |
1003b3a5 JX |
5674 | #, c-format |
5675 | msgid "" | |
5676 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
5677 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
5678 | ||
87cb7997 | 5679 | #: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 |
1003b3a5 JX |
5680 | #, c-format |
5681 | msgid "no such branch '%s'" | |
5682 | msgstr "没有此分支 '%s'" | |
5683 | ||
87cb7997 | 5684 | #: builtin/branch.c:723 |
07432cef | 5685 | #, c-format |
ef317cd5 | 5686 | msgid "branch '%s' does not exist" |
07432cef | 5687 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 5688 | |
87cb7997 | 5689 | #: builtin/branch.c:735 |
1003b3a5 JX |
5690 | msgid "too many branches to unset upstream" |
5691 | msgstr "为取消上游设置操作提供了太多的分支名" | |
5692 | ||
87cb7997 | 5693 | #: builtin/branch.c:739 |
1003b3a5 JX |
5694 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
5695 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
5696 | ||
87cb7997 | 5697 | #: builtin/branch.c:745 |
ef317cd5 JX |
5698 | #, c-format |
5699 | msgid "Branch '%s' has no upstream information" | |
07432cef | 5700 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 5701 | |
87cb7997 | 5702 | #: builtin/branch.c:759 |
1003b3a5 JX |
5703 | msgid "it does not make sense to create 'HEAD' manually" |
5704 | msgstr "手工创建 'HEAD' 没有意义" | |
5705 | ||
87cb7997 | 5706 | #: builtin/branch.c:765 |
c04f5ac3 JX |
5707 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
5708 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
5709 | ||
87cb7997 | 5710 | #: builtin/branch.c:768 |
ef317cd5 JX |
5711 | #, c-format |
5712 | msgid "" | |
5713 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
5714 | "track or --set-upstream-to\n" | |
5715 | msgstr "" | |
07432cef | 5716 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 5717 | |
87cb7997 | 5718 | #: builtin/branch.c:785 |
ef317cd5 JX |
5719 | #, c-format |
5720 | msgid "" | |
5721 | "\n" | |
5722 | "If you wanted to make '%s' track '%s', do this:\n" | |
5723 | "\n" | |
5724 | msgstr "" | |
07432cef WS |
5725 | "\n" |
5726 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
5727 | "\n" | |
ef317cd5 | 5728 | |
87cb7997 | 5729 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
5730 | #, c-format |
5731 | msgid "%s is okay\n" | |
5732 | msgstr "%s 可以\n" | |
5733 | ||
87cb7997 | 5734 | #: builtin/bundle.c:58 |
c04f5ac3 | 5735 | msgid "Need a repository to create a bundle." |
160fb2b2 | 5736 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 5737 | |
87cb7997 | 5738 | #: builtin/bundle.c:62 |
c04f5ac3 | 5739 | msgid "Need a repository to unbundle." |
160fb2b2 | 5740 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 5741 | |
a0b6b246 | 5742 | #: builtin/cat-file.c:513 |
7aea43ff | 5743 | msgid "" |
a0b6b246 JX |
5744 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
5745 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
5746 | msgstr "" |
5747 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
5748 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 5749 | |
a0b6b246 JX |
5750 | #: builtin/cat-file.c:514 |
5751 | msgid "" | |
5752 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
5753 | "filters]" | |
275588f9 JX |
5754 | msgstr "" |
5755 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
5756 | "filters]" | |
ef317cd5 | 5757 | |
a0b6b246 | 5758 | #: builtin/cat-file.c:551 |
ef317cd5 | 5759 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 5760 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 5761 | |
a0b6b246 | 5762 | #: builtin/cat-file.c:552 |
ef317cd5 | 5763 | msgid "show object type" |
07432cef | 5764 | msgstr "显示对象类型" |
ef317cd5 | 5765 | |
a0b6b246 | 5766 | #: builtin/cat-file.c:553 |
ef317cd5 | 5767 | msgid "show object size" |
07432cef | 5768 | msgstr "显示对象大小" |
ef317cd5 | 5769 | |
a0b6b246 | 5770 | #: builtin/cat-file.c:555 |
ef317cd5 | 5771 | msgid "exit with zero when there's no error" |
07432cef | 5772 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 5773 | |
a0b6b246 | 5774 | #: builtin/cat-file.c:556 |
ef317cd5 | 5775 | msgid "pretty-print object's content" |
07432cef | 5776 | msgstr "美观地打印对象的内容" |
ef317cd5 | 5777 | |
a0b6b246 | 5778 | #: builtin/cat-file.c:558 |
ef317cd5 | 5779 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
5780 | msgstr "对于数据对象,对其内容做文本转换" |
5781 | ||
5782 | #: builtin/cat-file.c:560 | |
5783 | msgid "for blob objects, run filters on object's content" | |
5784 | msgstr "对于数据对象,对其内容做过滤" | |
5785 | ||
87cb7997 | 5786 | #: builtin/cat-file.c:561 git-submodule.sh:943 |
a0b6b246 JX |
5787 | msgid "blob" |
5788 | msgstr "数据对象" | |
5789 | ||
5790 | #: builtin/cat-file.c:562 | |
5791 | msgid "use a specific path for --textconv/--filters" | |
5792 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 5793 | |
a0b6b246 | 5794 | #: builtin/cat-file.c:564 |
7aea43ff JX |
5795 | msgid "allow -s and -t to work with broken/corrupt objects" |
5796 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
5797 | ||
a0b6b246 | 5798 | #: builtin/cat-file.c:565 |
1b7f4a34 JX |
5799 | msgid "buffer --batch output" |
5800 | msgstr "缓冲 --batch 的输出" | |
5801 | ||
a0b6b246 | 5802 | #: builtin/cat-file.c:567 |
ef317cd5 | 5803 | msgid "show info and content of objects fed from the standard input" |
07432cef | 5804 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 5805 | |
a0b6b246 | 5806 | #: builtin/cat-file.c:570 |
ef317cd5 | 5807 | msgid "show info about objects fed from the standard input" |
07432cef | 5808 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 5809 | |
a0b6b246 | 5810 | #: builtin/cat-file.c:573 |
7aea43ff JX |
5811 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
5812 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
5813 | ||
a0b6b246 | 5814 | #: builtin/cat-file.c:575 |
1b7f4a34 JX |
5815 | msgid "show all objects with --batch or --batch-check" |
5816 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
5817 | ||
ef317cd5 | 5818 | #: builtin/check-attr.c:11 |
814ff314 JX |
5819 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
5820 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
5821 | |
5822 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
5823 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
5824 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
5825 | |
5826 | #: builtin/check-attr.c:19 | |
5827 | msgid "report all attributes set on file" | |
07432cef | 5828 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
5829 | |
5830 | #: builtin/check-attr.c:20 | |
5831 | msgid "use .gitattributes only from the index" | |
07432cef | 5832 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 5833 | |
a0b6b246 | 5834 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 |
ef317cd5 | 5835 | msgid "read file names from stdin" |
07432cef | 5836 | msgstr "从标准输入读出文件名" |
ef317cd5 | 5837 | |
a77c07d9 | 5838 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
5839 | msgid "terminate input and output records by a NUL character" |
5840 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 5841 | |
60638e98 | 5842 | #: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 |
a77c07d9 JX |
5843 | msgid "suppress progress reporting" |
5844 | msgstr "不显示进度报告" | |
5845 | ||
2e8451e8 JX |
5846 | #: builtin/check-ignore.c:26 |
5847 | msgid "show non-matching input paths" | |
5848 | msgstr "显示未匹配的输入路径" | |
5849 | ||
90314792 JX |
5850 | #: builtin/check-ignore.c:28 |
5851 | msgid "ignore index when checking" | |
5852 | msgstr "检查时忽略索引" | |
5853 | ||
5854 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 5855 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 5856 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 5857 | |
90314792 | 5858 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
5859 | msgid "-z only makes sense with --stdin" |
5860 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
5861 | ||
90314792 | 5862 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
5863 | msgid "no path specified" |
5864 | msgstr "未指定路径" | |
5865 | ||
90314792 | 5866 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
5867 | msgid "--quiet is only valid with a single pathname" |
5868 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
5869 | ||
90314792 | 5870 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
5871 | msgid "cannot have both --quiet and --verbose" |
5872 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
5873 | ||
90314792 | 5874 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
5875 | msgid "--non-matching is only valid with --verbose" |
5876 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
5877 | ||
5878 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
5879 | msgid "git check-mailmap [<options>] <contact>..." |
5880 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
5881 | |
5882 | #: builtin/check-mailmap.c:13 | |
5883 | msgid "also read contacts from stdin" | |
5884 | msgstr "还从标准输入读取联系地址" | |
5885 | ||
5886 | #: builtin/check-mailmap.c:24 | |
5887 | #, c-format | |
5888 | msgid "unable to parse contact: %s" | |
5889 | msgstr "不能解析联系地址:%s" | |
5890 | ||
5891 | #: builtin/check-mailmap.c:47 | |
5892 | msgid "no contacts specified" | |
5893 | msgstr "未指定联系地址" | |
5894 | ||
276ceeaa | 5895 | #: builtin/checkout-index.c:127 |
814ff314 JX |
5896 | msgid "git checkout-index [<options>] [--] [<file>...]" |
5897 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 5898 | |
276ceeaa JX |
5899 | #: builtin/checkout-index.c:144 |
5900 | msgid "stage should be between 1 and 3 or all" | |
5901 | msgstr "索引值应该取值 1 到 3 或者 all" | |
5902 | ||
5903 | #: builtin/checkout-index.c:160 | |
ef317cd5 | 5904 | msgid "check out all files in the index" |
07432cef | 5905 | msgstr "检出索引区的所有文件" |
ef317cd5 | 5906 | |
276ceeaa | 5907 | #: builtin/checkout-index.c:161 |
ef317cd5 | 5908 | msgid "force overwrite of existing files" |
07432cef | 5909 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 5910 | |
276ceeaa | 5911 | #: builtin/checkout-index.c:163 |
ef317cd5 | 5912 | msgid "no warning for existing files and files not in index" |
07432cef | 5913 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 5914 | |
276ceeaa | 5915 | #: builtin/checkout-index.c:165 |
ef317cd5 | 5916 | msgid "don't checkout new files" |
07432cef | 5917 | msgstr "不检出新文件" |
ef317cd5 | 5918 | |
276ceeaa | 5919 | #: builtin/checkout-index.c:167 |
ef317cd5 | 5920 | msgid "update stat information in the index file" |
07432cef | 5921 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 5922 | |
276ceeaa | 5923 | #: builtin/checkout-index.c:171 |
ef317cd5 | 5924 | msgid "read list of paths from the standard input" |
07432cef | 5925 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 5926 | |
276ceeaa | 5927 | #: builtin/checkout-index.c:173 |
ef317cd5 | 5928 | msgid "write the content to temporary files" |
07432cef | 5929 | msgstr "将内容写入临时文件" |
ef317cd5 | 5930 | |
276ceeaa | 5931 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
87cb7997 JX |
5932 | #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 |
5933 | #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 | |
60638e98 | 5934 | #: builtin/worktree.c:477 |
ef317cd5 | 5935 | msgid "string" |
07432cef | 5936 | msgstr "字符串" |
ef317cd5 | 5937 | |
276ceeaa | 5938 | #: builtin/checkout-index.c:175 |
ef317cd5 | 5939 | msgid "when creating files, prepend <string>" |
4375c10e | 5940 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 5941 | |
276ceeaa | 5942 | #: builtin/checkout-index.c:177 |
ef317cd5 | 5943 | msgid "copy out the files from named stage" |
07432cef | 5944 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 5945 | |
87cb7997 | 5946 | #: builtin/checkout.c:27 |
814ff314 JX |
5947 | msgid "git checkout [<options>] <branch>" |
5948 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 5949 | |
87cb7997 | 5950 | #: builtin/checkout.c:28 |
814ff314 JX |
5951 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
5952 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 5953 | |
87cb7997 | 5954 | #: builtin/checkout.c:153 builtin/checkout.c:186 |
c04f5ac3 JX |
5955 | #, c-format |
5956 | msgid "path '%s' does not have our version" | |
5957 | msgstr "路径 '%s' 没有我们的版本" | |
5958 | ||
87cb7997 | 5959 | #: builtin/checkout.c:155 builtin/checkout.c:188 |
c04f5ac3 JX |
5960 | #, c-format |
5961 | msgid "path '%s' does not have their version" | |
5962 | msgstr "路径 '%s' 没有他们的版本" | |
5963 | ||
87cb7997 | 5964 | #: builtin/checkout.c:171 |
c04f5ac3 JX |
5965 | #, c-format |
5966 | msgid "path '%s' does not have all necessary versions" | |
5967 | msgstr "路径 '%s' 没有全部必须的版本" | |
5968 | ||
87cb7997 | 5969 | #: builtin/checkout.c:215 |
c04f5ac3 JX |
5970 | #, c-format |
5971 | msgid "path '%s' does not have necessary versions" | |
5972 | msgstr "路径 '%s' 没有必须的版本" | |
5973 | ||
87cb7997 | 5974 | #: builtin/checkout.c:232 |
c04f5ac3 JX |
5975 | #, c-format |
5976 | msgid "path '%s': cannot merge" | |
90e6ef53 | 5977 | msgstr "path '%s':无法合并" |
c04f5ac3 | 5978 | |
87cb7997 | 5979 | #: builtin/checkout.c:249 |
c04f5ac3 JX |
5980 | #, c-format |
5981 | msgid "Unable to add merge result for '%s'" | |
5982 | msgstr "无法为 '%s' 添加合并结果" | |
5983 | ||
87cb7997 JX |
5984 | #: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 |
5985 | #: builtin/checkout.c:278 | |
07432cef | 5986 | #, c-format |
ef317cd5 | 5987 | msgid "'%s' cannot be used with updating paths" |
07432cef | 5988 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 5989 | |
87cb7997 | 5990 | #: builtin/checkout.c:281 builtin/checkout.c:284 |
07432cef | 5991 | #, c-format |
ef317cd5 | 5992 | msgid "'%s' cannot be used with %s" |
07432cef | 5993 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 5994 | |
87cb7997 | 5995 | #: builtin/checkout.c:287 |
ef317cd5 JX |
5996 | #, c-format |
5997 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 5998 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 5999 | |
87cb7997 | 6000 | #: builtin/checkout.c:358 builtin/checkout.c:365 |
c04f5ac3 JX |
6001 | #, c-format |
6002 | msgid "path '%s' is unmerged" | |
6003 | msgstr "路径 '%s' 未合并" | |
6004 | ||
87cb7997 | 6005 | #: builtin/checkout.c:513 |
c04f5ac3 | 6006 | msgid "you need to resolve your current index first" |
90e6ef53 | 6007 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 6008 | |
87cb7997 | 6009 | #: builtin/checkout.c:644 |
c04f5ac3 | 6010 | #, c-format |
1b7f4a34 JX |
6011 | msgid "Can not do reflog for '%s': %s\n" |
6012 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 6013 | |
87cb7997 | 6014 | #: builtin/checkout.c:685 |
c04f5ac3 JX |
6015 | msgid "HEAD is now at" |
6016 | msgstr "HEAD 目前位于" | |
6017 | ||
87cb7997 | 6018 | #: builtin/checkout.c:689 builtin/clone.c:678 |
3495628d JX |
6019 | msgid "unable to update HEAD" |
6020 | msgstr "不能更新 HEAD" | |
6021 | ||
87cb7997 | 6022 | #: builtin/checkout.c:693 |
c04f5ac3 JX |
6023 | #, c-format |
6024 | msgid "Reset branch '%s'\n" | |
6025 | msgstr "重置分支 '%s'\n" | |
6026 | ||
87cb7997 | 6027 | #: builtin/checkout.c:696 |
c04f5ac3 JX |
6028 | #, c-format |
6029 | msgid "Already on '%s'\n" | |
6030 | msgstr "已经位于 '%s'\n" | |
6031 | ||
87cb7997 | 6032 | #: builtin/checkout.c:700 |
c04f5ac3 JX |
6033 | #, c-format |
6034 | msgid "Switched to and reset branch '%s'\n" | |
6035 | msgstr "切换并重置分支 '%s'\n" | |
6036 | ||
87cb7997 | 6037 | #: builtin/checkout.c:702 builtin/checkout.c:1090 |
c04f5ac3 JX |
6038 | #, c-format |
6039 | msgid "Switched to a new branch '%s'\n" | |
6040 | msgstr "切换到一个新分支 '%s'\n" | |
6041 | ||
87cb7997 | 6042 | #: builtin/checkout.c:704 |
c04f5ac3 JX |
6043 | #, c-format |
6044 | msgid "Switched to branch '%s'\n" | |
6045 | msgstr "切换到分支 '%s'\n" | |
6046 | ||
90e6ef53 | 6047 | # 译者:注意保持前导空格 |
87cb7997 | 6048 | #: builtin/checkout.c:755 |
c04f5ac3 JX |
6049 | #, c-format |
6050 | msgid " ... and %d more.\n" | |
90e6ef53 | 6051 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 6052 | |
87cb7997 | 6053 | #: builtin/checkout.c:761 |
c04f5ac3 JX |
6054 | #, c-format |
6055 | msgid "" | |
6056 | "Warning: you are leaving %d commit behind, not connected to\n" | |
6057 | "any of your branches:\n" | |
6058 | "\n" | |
6059 | "%s\n" | |
6060 | msgid_plural "" | |
6061 | "Warning: you are leaving %d commits behind, not connected to\n" | |
6062 | "any of your branches:\n" | |
6063 | "\n" | |
6064 | "%s\n" | |
6065 | msgstr[0] "" | |
6066 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6067 | "\n" | |
6068 | "%s\n" | |
5ae481e0 JX |
6069 | msgstr[1] "" |
6070 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6071 | "\n" | |
6072 | "%s\n" | |
c04f5ac3 | 6073 | |
87cb7997 | 6074 | #: builtin/checkout.c:780 |
c04f5ac3 JX |
6075 | #, c-format |
6076 | msgid "" | |
7aea43ff JX |
6077 | "If you want to keep it by creating a new branch, this may be a good time\n" |
6078 | "to do so with:\n" | |
6079 | "\n" | |
6080 | " git branch <new-branch-name> %s\n" | |
6081 | "\n" | |
6082 | msgid_plural "" | |
c04f5ac3 JX |
6083 | "If you want to keep them by creating a new branch, this may be a good time\n" |
6084 | "to do so with:\n" | |
6085 | "\n" | |
814ff314 | 6086 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 6087 | "\n" |
7aea43ff JX |
6088 | msgstr[0] "" |
6089 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
6090 | "如下操作:\n" | |
6091 | "\n" | |
6092 | " git branch <新分支名> %s\n" | |
6093 | "\n" | |
6094 | msgstr[1] "" | |
6095 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
6096 | "如下操作:\n" |
6097 | "\n" | |
814ff314 | 6098 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
6099 | "\n" |
6100 | ||
87cb7997 | 6101 | #: builtin/checkout.c:816 |
c04f5ac3 JX |
6102 | msgid "internal error in revision walk" |
6103 | msgstr "在版本遍历时遇到内部错误" | |
6104 | ||
87cb7997 | 6105 | #: builtin/checkout.c:820 |
c04f5ac3 JX |
6106 | msgid "Previous HEAD position was" |
6107 | msgstr "之前的 HEAD 位置是" | |
6108 | ||
87cb7997 | 6109 | #: builtin/checkout.c:847 builtin/checkout.c:1085 |
c04f5ac3 | 6110 | msgid "You are on a branch yet to be born" |
90e6ef53 | 6111 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 6112 | |
87cb7997 | 6113 | #: builtin/checkout.c:991 |
90314792 JX |
6114 | #, c-format |
6115 | msgid "only one reference expected, %d given." | |
a0b6b246 | 6116 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 6117 | |
87cb7997 | 6118 | #: builtin/checkout.c:1031 builtin/worktree.c:214 |
c04f5ac3 JX |
6119 | #, c-format |
6120 | msgid "invalid reference: %s" | |
6121 | msgstr "无效引用:%s" | |
6122 | ||
87cb7997 | 6123 | #: builtin/checkout.c:1060 |
c04f5ac3 JX |
6124 | #, c-format |
6125 | msgid "reference is not a tree: %s" | |
6126 | msgstr "引用不是一个树:%s" | |
6127 | ||
87cb7997 | 6128 | #: builtin/checkout.c:1099 |
ef317cd5 | 6129 | msgid "paths cannot be used with switching branches" |
07432cef | 6130 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 6131 | |
87cb7997 | 6132 | #: builtin/checkout.c:1102 builtin/checkout.c:1106 |
07432cef | 6133 | #, c-format |
ef317cd5 | 6134 | msgid "'%s' cannot be used with switching branches" |
07432cef | 6135 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 6136 | |
87cb7997 JX |
6137 | #: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 |
6138 | #: builtin/checkout.c:1121 | |
07432cef | 6139 | #, c-format |
ef317cd5 | 6140 | msgid "'%s' cannot be used with '%s'" |
07432cef | 6141 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 6142 | |
87cb7997 | 6143 | #: builtin/checkout.c:1126 |
07432cef | 6144 | #, c-format |
ef317cd5 | 6145 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 6146 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 6147 | |
87cb7997 | 6148 | #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 |
60638e98 JX |
6149 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 |
6150 | #: builtin/worktree.c:331 | |
ef317cd5 | 6151 | msgid "branch" |
07432cef | 6152 | msgstr "分支" |
c04f5ac3 | 6153 | |
87cb7997 | 6154 | #: builtin/checkout.c:1160 |
ef317cd5 | 6155 | msgid "create and checkout a new branch" |
07432cef | 6156 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 6157 | |
87cb7997 | 6158 | #: builtin/checkout.c:1162 |
ef317cd5 | 6159 | msgid "create/reset and checkout a branch" |
07432cef | 6160 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 6161 | |
87cb7997 | 6162 | #: builtin/checkout.c:1163 |
ef317cd5 | 6163 | msgid "create reflog for new branch" |
07432cef | 6164 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 6165 | |
60638e98 | 6166 | #: builtin/checkout.c:1164 builtin/worktree.c:333 |
5c57d762 JX |
6167 | msgid "detach HEAD at named commit" |
6168 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 6169 | |
87cb7997 | 6170 | #: builtin/checkout.c:1165 |
ef317cd5 | 6171 | msgid "set upstream info for new branch" |
07432cef | 6172 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 6173 | |
87cb7997 | 6174 | #: builtin/checkout.c:1167 |
6c94aba5 | 6175 | msgid "new-branch" |
07432cef | 6176 | msgstr "新分支" |
ef317cd5 | 6177 | |
87cb7997 | 6178 | #: builtin/checkout.c:1167 |
ef317cd5 | 6179 | msgid "new unparented branch" |
07432cef | 6180 | msgstr "新的没有父提交的分支" |
ef317cd5 | 6181 | |
87cb7997 | 6182 | #: builtin/checkout.c:1168 |
ef317cd5 | 6183 | msgid "checkout our version for unmerged files" |
07432cef | 6184 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 6185 | |
87cb7997 | 6186 | #: builtin/checkout.c:1170 |
ef317cd5 | 6187 | msgid "checkout their version for unmerged files" |
07432cef | 6188 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 6189 | |
87cb7997 | 6190 | #: builtin/checkout.c:1172 |
ef317cd5 | 6191 | msgid "force checkout (throw away local modifications)" |
07432cef | 6192 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 6193 | |
87cb7997 | 6194 | #: builtin/checkout.c:1173 |
ef317cd5 | 6195 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 6196 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 6197 | |
87cb7997 | 6198 | #: builtin/checkout.c:1174 builtin/merge.c:234 |
ef317cd5 | 6199 | msgid "update ignored files (default)" |
07432cef | 6200 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 6201 | |
87cb7997 | 6202 | #: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 |
ef317cd5 | 6203 | msgid "style" |
07432cef | 6204 | msgstr "风格" |
ef317cd5 | 6205 | |
87cb7997 | 6206 | #: builtin/checkout.c:1176 |
ef317cd5 | 6207 | msgid "conflict style (merge or diff3)" |
07432cef | 6208 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 6209 | |
87cb7997 | 6210 | #: builtin/checkout.c:1179 |
4dcdc3d8 JX |
6211 | msgid "do not limit pathspecs to sparse entries only" |
6212 | msgstr "对路径不做稀疏检出的限制" | |
6213 | ||
87cb7997 | 6214 | #: builtin/checkout.c:1181 |
814ff314 JX |
6215 | msgid "second guess 'git checkout <no-such-branch>'" |
6216 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 6217 | |
87cb7997 | 6218 | #: builtin/checkout.c:1183 |
7aea43ff JX |
6219 | msgid "do not check if another worktree is holding the given ref" |
6220 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
6221 | ||
87cb7997 JX |
6222 | #: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 |
6223 | #: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 | |
6224 | #: builtin/send-pack.c:172 | |
94550ed3 JX |
6225 | msgid "force progress reporting" |
6226 | msgstr "强制显示进度报告" | |
6227 | ||
87cb7997 | 6228 | #: builtin/checkout.c:1224 |
ef317cd5 | 6229 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 6230 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 6231 | |
87cb7997 | 6232 | #: builtin/checkout.c:1241 |
ef317cd5 JX |
6233 | msgid "--track needs a branch name" |
6234 | msgstr "--track 需要一个分支名" | |
6235 | ||
87cb7997 | 6236 | #: builtin/checkout.c:1246 |
ef317cd5 JX |
6237 | msgid "Missing branch name; try -b" |
6238 | msgstr "缺少分支名;尝试 -b" | |
6239 | ||
87cb7997 | 6240 | #: builtin/checkout.c:1282 |
c04f5ac3 | 6241 | msgid "invalid path specification" |
90e6ef53 | 6242 | msgstr "无效的路径规格" |
c04f5ac3 | 6243 | |
87cb7997 | 6244 | #: builtin/checkout.c:1289 |
07432cef | 6245 | #, c-format |
c04f5ac3 | 6246 | msgid "" |
ef317cd5 | 6247 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
6248 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
6249 | msgstr "" | |
07432cef WS |
6250 | "不能同时更新路径并切换到分支'%s'。\n" |
6251 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 6252 | |
87cb7997 | 6253 | #: builtin/checkout.c:1294 |
07432cef | 6254 | #, c-format |
ef317cd5 | 6255 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 6256 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 6257 | |
87cb7997 | 6258 | #: builtin/checkout.c:1298 |
c04f5ac3 JX |
6259 | msgid "" |
6260 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
6261 | "checking out of the index." | |
6262 | msgstr "" | |
90e6ef53 | 6263 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 6264 | |
1b7f4a34 | 6265 | #: builtin/clean.c:25 |
2e8451e8 JX |
6266 | msgid "" |
6267 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
6268 | msgstr "" | |
6269 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 6270 | |
1b7f4a34 | 6271 | #: builtin/clean.c:29 |
07432cef WS |
6272 | #, c-format |
6273 | msgid "Removing %s\n" | |
6274 | msgstr "正删除 %s\n" | |
6275 | ||
1b7f4a34 | 6276 | #: builtin/clean.c:30 |
07432cef WS |
6277 | #, c-format |
6278 | msgid "Would remove %s\n" | |
6279 | msgstr "将删除 %s\n" | |
6280 | ||
1b7f4a34 | 6281 | #: builtin/clean.c:31 |
07432cef WS |
6282 | #, c-format |
6283 | msgid "Skipping repository %s\n" | |
160fb2b2 | 6284 | msgstr "忽略仓库 %s\n" |
07432cef | 6285 | |
1b7f4a34 | 6286 | #: builtin/clean.c:32 |
07432cef WS |
6287 | #, c-format |
6288 | msgid "Would skip repository %s\n" | |
160fb2b2 | 6289 | msgstr "将忽略仓库 %s\n" |
07432cef | 6290 | |
1b7f4a34 | 6291 | #: builtin/clean.c:33 |
07432cef WS |
6292 | #, c-format |
6293 | msgid "failed to remove %s" | |
6294 | msgstr "无法删除 %s" | |
6295 | ||
87cb7997 | 6296 | #: builtin/clean.c:297 git-add--interactive.perl:614 |
1a79b2f1 | 6297 | #, c-format |
2e8451e8 JX |
6298 | msgid "" |
6299 | "Prompt help:\n" | |
6300 | "1 - select a numbered item\n" | |
6301 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 6302 | " - (empty) select nothing\n" |
2e8451e8 JX |
6303 | msgstr "" |
6304 | "帮助:\n" | |
6305 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
6306 | "foo - 通过唯一前缀选择一个选项\n" |
6307 | " - (空)什么也不选择\n" | |
2e8451e8 | 6308 | |
87cb7997 | 6309 | #: builtin/clean.c:301 git-add--interactive.perl:623 |
1a79b2f1 | 6310 | #, c-format |
2e8451e8 JX |
6311 | msgid "" |
6312 | "Prompt help:\n" | |
6313 | "1 - select a single item\n" | |
6314 | "3-5 - select a range of items\n" | |
6315 | "2-3,6-9 - select multiple ranges\n" | |
6316 | "foo - select item based on unique prefix\n" | |
6317 | "-... - unselect specified items\n" | |
6318 | "* - choose all items\n" | |
1a79b2f1 | 6319 | " - (empty) finish selecting\n" |
2e8451e8 JX |
6320 | msgstr "" |
6321 | "帮助:\n" | |
6322 | "1 - 选择一个选项\n" | |
6323 | "3-5 - 选择一个范围内的所有选项\n" | |
6324 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 6325 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
6326 | "-... - 反选特定的选项\n" |
6327 | "* - 选择所有选项\n" | |
1a79b2f1 | 6328 | " - (空)结束选择\n" |
2e8451e8 | 6329 | |
87cb7997 JX |
6330 | #: builtin/clean.c:517 git-add--interactive.perl:589 |
6331 | #: git-add--interactive.perl:594 | |
1a79b2f1 JX |
6332 | #, c-format, perl-format |
6333 | msgid "Huh (%s)?\n" | |
6334 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 6335 | |
87cb7997 | 6336 | #: builtin/clean.c:659 |
2e8451e8 JX |
6337 | #, c-format |
6338 | msgid "Input ignore patterns>> " | |
6339 | msgstr "输入模版以排除条目>> " | |
6340 | ||
87cb7997 | 6341 | #: builtin/clean.c:696 |
2e8451e8 JX |
6342 | #, c-format |
6343 | msgid "WARNING: Cannot find items matched by: %s" | |
6344 | msgstr "警告:无法找到和 %s 匹配的条目" | |
6345 | ||
87cb7997 | 6346 | #: builtin/clean.c:717 |
2e8451e8 JX |
6347 | msgid "Select items to delete" |
6348 | msgstr "选择要删除的条目" | |
6349 | ||
814ff314 | 6350 | #. TRANSLATORS: Make sure to keep [y/N] as is |
87cb7997 | 6351 | #: builtin/clean.c:758 |
2e8451e8 | 6352 | #, c-format |
814ff314 JX |
6353 | msgid "Remove %s [y/N]? " |
6354 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 6355 | |
87cb7997 | 6356 | #: builtin/clean.c:783 git-add--interactive.perl:1660 |
1a79b2f1 JX |
6357 | #, c-format |
6358 | msgid "Bye.\n" | |
6359 | msgstr "再见。\n" | |
2e8451e8 | 6360 | |
87cb7997 | 6361 | #: builtin/clean.c:791 |
2e8451e8 JX |
6362 | msgid "" |
6363 | "clean - start cleaning\n" | |
6364 | "filter by pattern - exclude items from deletion\n" | |
6365 | "select by numbers - select items to be deleted by numbers\n" | |
6366 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
6367 | "quit - stop cleaning\n" | |
6368 | "help - this screen\n" | |
6369 | "? - help for prompt selection" | |
6370 | msgstr "" | |
6371 | "clean - 开始清理\n" | |
6372 | "filter by pattern - 通过模版排除要删除的条目\n" | |
6373 | "select by numbers - 通过数字选择要删除的条目\n" | |
6374 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
6375 | "quit - 停止删除并退出\n" | |
6376 | "help - 显示本帮助\n" | |
6377 | "? - 显示如何在提示符下选择的帮助" | |
6378 | ||
87cb7997 | 6379 | #: builtin/clean.c:818 git-add--interactive.perl:1736 |
2e8451e8 JX |
6380 | msgid "*** Commands ***" |
6381 | msgstr "*** 命令 ***" | |
6382 | ||
87cb7997 | 6383 | #: builtin/clean.c:819 git-add--interactive.perl:1733 |
2e8451e8 JX |
6384 | msgid "What now" |
6385 | msgstr "请选择" | |
6386 | ||
87cb7997 | 6387 | #: builtin/clean.c:827 |
2e8451e8 JX |
6388 | msgid "Would remove the following item:" |
6389 | msgid_plural "Would remove the following items:" | |
6390 | msgstr[0] "将删除如下条目:" | |
6391 | msgstr[1] "将删除如下条目:" | |
6392 | ||
87cb7997 | 6393 | #: builtin/clean.c:844 |
2e8451e8 JX |
6394 | msgid "No more files to clean, exiting." |
6395 | msgstr "没有要清理的文件,退出。" | |
6396 | ||
87cb7997 | 6397 | #: builtin/clean.c:875 |
ef317cd5 | 6398 | msgid "do not print names of files removed" |
07432cef | 6399 | msgstr "不打印删除文件的名称" |
ef317cd5 | 6400 | |
87cb7997 | 6401 | #: builtin/clean.c:877 |
ef317cd5 | 6402 | msgid "force" |
07432cef | 6403 | msgstr "强制" |
ef317cd5 | 6404 | |
87cb7997 | 6405 | #: builtin/clean.c:878 |
2e8451e8 JX |
6406 | msgid "interactive cleaning" |
6407 | msgstr "交互式清除" | |
6408 | ||
87cb7997 | 6409 | #: builtin/clean.c:880 |
ef317cd5 | 6410 | msgid "remove whole directories" |
07432cef | 6411 | msgstr "删除整个目录" |
ef317cd5 | 6412 | |
87cb7997 | 6413 | #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 |
60638e98 | 6414 | #: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 |
87cb7997 | 6415 | #: builtin/name-rev.c:350 builtin/show-ref.c:176 |
ef317cd5 | 6416 | msgid "pattern" |
07432cef | 6417 | msgstr "模式" |
ef317cd5 | 6418 | |
87cb7997 | 6419 | #: builtin/clean.c:882 |
ef317cd5 | 6420 | msgid "add <pattern> to ignore rules" |
4375c10e | 6421 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 6422 | |
87cb7997 | 6423 | #: builtin/clean.c:883 |
ef317cd5 | 6424 | msgid "remove ignored files, too" |
07432cef | 6425 | msgstr "也删除忽略的文件" |
ef317cd5 | 6426 | |
87cb7997 | 6427 | #: builtin/clean.c:885 |
ef317cd5 | 6428 | msgid "remove only ignored files" |
07432cef | 6429 | msgstr "只删除忽略的文件" |
c04f5ac3 | 6430 | |
87cb7997 | 6431 | #: builtin/clean.c:903 |
c04f5ac3 | 6432 | msgid "-x and -X cannot be used together" |
649900bc | 6433 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 6434 | |
87cb7997 | 6435 | #: builtin/clean.c:907 |
c04f5ac3 | 6436 | msgid "" |
6c94aba5 | 6437 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 6438 | "clean" |
c04f5ac3 | 6439 | msgstr "" |
2e8451e8 | 6440 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 6441 | |
87cb7997 | 6442 | #: builtin/clean.c:910 |
c04f5ac3 | 6443 | msgid "" |
6c94aba5 | 6444 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 6445 | "refusing to clean" |
c04f5ac3 | 6446 | msgstr "" |
2e8451e8 | 6447 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 6448 | |
220c313c | 6449 | #: builtin/clone.c:37 |
814ff314 | 6450 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 6451 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 6452 | |
87cb7997 | 6453 | #: builtin/clone.c:80 |
ef317cd5 | 6454 | msgid "don't create a checkout" |
07432cef | 6455 | msgstr "不创建一个检出" |
ef317cd5 | 6456 | |
87cb7997 | 6457 | #: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 |
ef317cd5 | 6458 | msgid "create a bare repository" |
160fb2b2 | 6459 | msgstr "创建一个纯仓库" |
ef317cd5 | 6460 | |
87cb7997 | 6461 | #: builtin/clone.c:85 |
ef317cd5 | 6462 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 6463 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 6464 | |
87cb7997 | 6465 | #: builtin/clone.c:87 |
ef317cd5 | 6466 | msgid "to clone from a local repository" |
160fb2b2 | 6467 | msgstr "从本地仓库克隆" |
ef317cd5 | 6468 | |
87cb7997 | 6469 | #: builtin/clone.c:89 |
ef317cd5 | 6470 | msgid "don't use local hardlinks, always copy" |
07432cef | 6471 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 6472 | |
87cb7997 | 6473 | #: builtin/clone.c:91 |
ef317cd5 | 6474 | msgid "setup as shared repository" |
160fb2b2 | 6475 | msgstr "设置为共享仓库" |
ef317cd5 | 6476 | |
87cb7997 JX |
6477 | #: builtin/clone.c:93 builtin/clone.c:97 |
6478 | msgid "pathspec" | |
65e2041e | 6479 | msgstr "路径规格" |
87cb7997 JX |
6480 | |
6481 | #: builtin/clone.c:93 builtin/clone.c:97 | |
ef317cd5 | 6482 | msgid "initialize submodules in the clone" |
07432cef | 6483 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 6484 | |
87cb7997 | 6485 | #: builtin/clone.c:100 |
5b04ee3b JX |
6486 | msgid "number of submodules cloned in parallel" |
6487 | msgstr "并发克隆的子模组的数量" | |
6488 | ||
87cb7997 | 6489 | #: builtin/clone.c:101 builtin/init-db.c:475 |
ef317cd5 | 6490 | msgid "template-directory" |
07432cef | 6491 | msgstr "模板目录" |
ef317cd5 | 6492 | |
87cb7997 | 6493 | #: builtin/clone.c:102 builtin/init-db.c:476 |
ef317cd5 | 6494 | msgid "directory from which templates will be used" |
07432cef | 6495 | msgstr "模板目录将被使用" |
ef317cd5 | 6496 | |
87cb7997 JX |
6497 | #: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 |
6498 | #: builtin/submodule--helper.c:983 | |
ef317cd5 | 6499 | msgid "reference repository" |
160fb2b2 | 6500 | msgstr "参考仓库" |
ef317cd5 | 6501 | |
87cb7997 | 6502 | #: builtin/clone.c:108 |
7aea43ff | 6503 | msgid "use --reference only while cloning" |
160fb2b2 | 6504 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 6505 | |
87cb7997 | 6506 | #: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 |
ef317cd5 | 6507 | msgid "name" |
07432cef | 6508 | msgstr "名称" |
ef317cd5 | 6509 | |
87cb7997 | 6510 | #: builtin/clone.c:110 |
ef317cd5 | 6511 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 6512 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 6513 | |
87cb7997 | 6514 | #: builtin/clone.c:112 |
ef317cd5 | 6515 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 6516 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 6517 | |
87cb7997 | 6518 | #: builtin/clone.c:114 |
ef317cd5 | 6519 | msgid "path to git-upload-pack on the remote" |
07432cef | 6520 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 6521 | |
87cb7997 | 6522 | #: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 |
a0b6b246 | 6523 | #: builtin/pull.c:202 |
ef317cd5 | 6524 | msgid "depth" |
07432cef | 6525 | msgstr "深度" |
ef317cd5 | 6526 | |
87cb7997 | 6527 | #: builtin/clone.c:116 |
ef317cd5 | 6528 | msgid "create a shallow clone of that depth" |
07432cef | 6529 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 6530 | |
87cb7997 | 6531 | #: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 |
a0b6b246 JX |
6532 | #: parse-options.h:142 |
6533 | msgid "time" | |
6534 | msgstr "时间" | |
6535 | ||
87cb7997 | 6536 | #: builtin/clone.c:118 |
a0b6b246 JX |
6537 | msgid "create a shallow clone since a specific time" |
6538 | msgstr "从一个特定时间创建一个浅克隆" | |
6539 | ||
87cb7997 | 6540 | #: builtin/clone.c:119 builtin/fetch.c:124 |
a0b6b246 JX |
6541 | msgid "revision" |
6542 | msgstr "版本" | |
6543 | ||
87cb7997 | 6544 | #: builtin/clone.c:120 builtin/fetch.c:125 |
1a79b2f1 JX |
6545 | msgid "deepen history of shallow clone, excluding rev" |
6546 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 6547 | |
87cb7997 | 6548 | #: builtin/clone.c:122 |
ef317cd5 | 6549 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 6550 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 6551 | |
87cb7997 | 6552 | #: builtin/clone.c:124 |
5b04ee3b JX |
6553 | msgid "any cloned submodules will be shallow" |
6554 | msgstr "子模组将以浅下载模式克隆" | |
6555 | ||
87cb7997 | 6556 | #: builtin/clone.c:125 builtin/init-db.c:484 |
ef317cd5 | 6557 | msgid "gitdir" |
07432cef | 6558 | msgstr "git目录" |
ef317cd5 | 6559 | |
87cb7997 | 6560 | #: builtin/clone.c:126 builtin/init-db.c:485 |
ef317cd5 | 6561 | msgid "separate git dir from working tree" |
07432cef | 6562 | msgstr "git目录和工作区分离" |
ef317cd5 | 6563 | |
87cb7997 | 6564 | #: builtin/clone.c:127 |
ef317cd5 | 6565 | msgid "key=value" |
07432cef | 6566 | msgstr "key=value" |
ef317cd5 | 6567 | |
87cb7997 | 6568 | #: builtin/clone.c:128 |
ef317cd5 | 6569 | msgid "set config inside the new repository" |
160fb2b2 | 6570 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 6571 | |
87cb7997 | 6572 | #: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 |
276ceeaa JX |
6573 | msgid "use IPv4 addresses only" |
6574 | msgstr "只使用 IPv4 地址" | |
6575 | ||
87cb7997 | 6576 | #: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 |
276ceeaa JX |
6577 | msgid "use IPv6 addresses only" |
6578 | msgstr "只使用 IPv6 地址" | |
6579 | ||
87cb7997 | 6580 | #: builtin/clone.c:268 |
3495628d JX |
6581 | msgid "" |
6582 | "No directory name could be guessed.\n" | |
6583 | "Please specify a directory on the command line" | |
6584 | msgstr "" | |
6585 | "无法猜到目录名。\n" | |
26e4cbec | 6586 | "请在命令行指定一个目录" |
3495628d | 6587 | |
87cb7997 | 6588 | #: builtin/clone.c:321 |
cfff71a9 | 6589 | #, c-format |
a0b6b246 JX |
6590 | msgid "info: Could not add alternate for '%s': %s\n" |
6591 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 6592 | |
87cb7997 | 6593 | #: builtin/clone.c:393 |
5c57d762 JX |
6594 | #, c-format |
6595 | msgid "failed to open '%s'" | |
6596 | msgstr "无法打开 '%s'" | |
6597 | ||
87cb7997 | 6598 | #: builtin/clone.c:401 |
c04f5ac3 JX |
6599 | #, c-format |
6600 | msgid "%s exists and is not a directory" | |
6601 | msgstr "%s 存在且不是一个目录" | |
6602 | ||
87cb7997 | 6603 | #: builtin/clone.c:415 |
c04f5ac3 JX |
6604 | #, c-format |
6605 | msgid "failed to stat %s\n" | |
65e2041e | 6606 | msgstr "对 %s 调用 stat 失败\n" |
c04f5ac3 | 6607 | |
87cb7997 | 6608 | #: builtin/clone.c:437 |
c04f5ac3 JX |
6609 | #, c-format |
6610 | msgid "failed to create link '%s'" | |
90e6ef53 | 6611 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 6612 | |
87cb7997 | 6613 | #: builtin/clone.c:441 |
c04f5ac3 JX |
6614 | #, c-format |
6615 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 6616 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 6617 | |
87cb7997 | 6618 | #: builtin/clone.c:466 |
c04f5ac3 JX |
6619 | #, c-format |
6620 | msgid "done.\n" | |
6621 | msgstr "完成。\n" | |
6622 | ||
87cb7997 | 6623 | #: builtin/clone.c:478 |
1003b3a5 JX |
6624 | msgid "" |
6625 | "Clone succeeded, but checkout failed.\n" | |
6626 | "You can inspect what was checked out with 'git status'\n" | |
6627 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
6628 | msgstr "" | |
6629 | "克隆成功,但是检出失败。\n" | |
6630 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
6631 | "'git checkout -f HEAD' 重试\n" | |
6632 | ||
87cb7997 | 6633 | #: builtin/clone.c:555 |
c04f5ac3 JX |
6634 | #, c-format |
6635 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 6636 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 6637 | |
87cb7997 | 6638 | #: builtin/clone.c:650 |
1003b3a5 JX |
6639 | msgid "remote did not send all necessary objects" |
6640 | msgstr "远程没有发送所有必须的对象" | |
6641 | ||
87cb7997 | 6642 | #: builtin/clone.c:666 |
3495628d JX |
6643 | #, c-format |
6644 | msgid "unable to update %s" | |
6645 | msgstr "不能更新 %s" | |
6646 | ||
87cb7997 | 6647 | #: builtin/clone.c:715 |
c04f5ac3 JX |
6648 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
6649 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
6650 | ||
87cb7997 | 6651 | #: builtin/clone.c:746 |
1003b3a5 JX |
6652 | msgid "unable to checkout working tree" |
6653 | msgstr "不能检出工作区" | |
6654 | ||
87cb7997 | 6655 | #: builtin/clone.c:786 |
3495628d JX |
6656 | msgid "unable to write parameters to config file" |
6657 | msgstr "无法将参数写入配置文件" | |
6658 | ||
87cb7997 | 6659 | #: builtin/clone.c:849 |
04cb2f28 JX |
6660 | msgid "cannot repack to clean up" |
6661 | msgstr "无法执行 repack 来清理" | |
6662 | ||
87cb7997 | 6663 | #: builtin/clone.c:851 |
04cb2f28 JX |
6664 | msgid "cannot unlink temporary alternates file" |
6665 | msgstr "无法删除临时的 alternates 文件" | |
6666 | ||
60638e98 | 6667 | #: builtin/clone.c:884 builtin/receive-pack.c:1900 |
c04f5ac3 JX |
6668 | msgid "Too many arguments." |
6669 | msgstr "太多参数。" | |
6670 | ||
87cb7997 | 6671 | #: builtin/clone.c:888 |
c04f5ac3 | 6672 | msgid "You must specify a repository to clone." |
160fb2b2 | 6673 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 6674 | |
87cb7997 | 6675 | #: builtin/clone.c:901 |
c04f5ac3 JX |
6676 | #, c-format |
6677 | msgid "--bare and --origin %s options are incompatible." | |
6678 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
6679 | ||
87cb7997 | 6680 | #: builtin/clone.c:904 |
07432cef WS |
6681 | msgid "--bare and --separate-git-dir are incompatible." |
6682 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
6683 | ||
87cb7997 | 6684 | #: builtin/clone.c:917 |
c04f5ac3 JX |
6685 | #, c-format |
6686 | msgid "repository '%s' does not exist" | |
160fb2b2 | 6687 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 6688 | |
87cb7997 | 6689 | #: builtin/clone.c:923 builtin/fetch.c:1337 |
cfff71a9 JX |
6690 | #, c-format |
6691 | msgid "depth %s is not a positive number" | |
6692 | msgstr "深度 %s 不是一个正数" | |
6693 | ||
87cb7997 | 6694 | #: builtin/clone.c:933 |
c04f5ac3 JX |
6695 | #, c-format |
6696 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 6697 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 6698 | |
87cb7997 | 6699 | #: builtin/clone.c:943 |
c04f5ac3 JX |
6700 | #, c-format |
6701 | msgid "working tree '%s' already exists." | |
6702 | msgstr "工作区 '%s' 已经存在。" | |
6703 | ||
87cb7997 | 6704 | #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 |
60638e98 | 6705 | #: builtin/worktree.c:221 builtin/worktree.c:251 |
5bb01d4f JX |
6706 | #, c-format |
6707 | msgid "could not create leading directories of '%s'" | |
6708 | msgstr "不能为 '%s' 创建先导目录" | |
6709 | ||
87cb7997 | 6710 | #: builtin/clone.c:961 |
c04f5ac3 | 6711 | #, c-format |
814ff314 JX |
6712 | msgid "could not create work tree dir '%s'" |
6713 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 6714 | |
87cb7997 | 6715 | #: builtin/clone.c:973 |
c04f5ac3 JX |
6716 | #, c-format |
6717 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 6718 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 6719 | |
87cb7997 | 6720 | #: builtin/clone.c:975 |
c04f5ac3 JX |
6721 | #, c-format |
6722 | msgid "Cloning into '%s'...\n" | |
6723 | msgstr "正克隆到 '%s'...\n" | |
6724 | ||
87cb7997 | 6725 | #: builtin/clone.c:999 |
a0b6b246 JX |
6726 | msgid "" |
6727 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
6728 | "able" | |
6729 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
6730 | ||
87cb7997 | 6731 | #: builtin/clone.c:1055 |
6acbf033 | 6732 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
6733 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
6734 | ||
87cb7997 | 6735 | #: builtin/clone.c:1057 |
a0b6b246 JX |
6736 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
6737 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 6738 | |
87cb7997 | 6739 | #: builtin/clone.c:1059 |
a0b6b246 JX |
6740 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
6741 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
6742 | ||
87cb7997 | 6743 | #: builtin/clone.c:1062 |
6acbf033 | 6744 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 6745 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 6746 | |
87cb7997 | 6747 | #: builtin/clone.c:1067 |
6acbf033 JX |
6748 | msgid "--local is ignored" |
6749 | msgstr "--local 被忽略" | |
6750 | ||
87cb7997 | 6751 | #: builtin/clone.c:1071 |
c04f5ac3 JX |
6752 | #, c-format |
6753 | msgid "Don't know how to clone %s" | |
6754 | msgstr "不知道如何克隆 %s" | |
6755 | ||
87cb7997 | 6756 | #: builtin/clone.c:1126 builtin/clone.c:1134 |
c04f5ac3 JX |
6757 | #, c-format |
6758 | msgid "Remote branch %s not found in upstream %s" | |
6759 | msgstr "远程分支 %s 在上游 %s 未发现" | |
6760 | ||
87cb7997 | 6761 | #: builtin/clone.c:1137 |
c04f5ac3 | 6762 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 6763 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 6764 | |
ef317cd5 | 6765 | #: builtin/column.c:9 |
814ff314 JX |
6766 | msgid "git column [<options>]" |
6767 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
6768 | |
6769 | #: builtin/column.c:26 | |
6770 | msgid "lookup config vars" | |
07432cef | 6771 | msgstr "查找配置变量" |
ef317cd5 JX |
6772 | |
6773 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 6774 | msgid "layout to use" |
07432cef | 6775 | msgstr "要使用的布局" |
ef317cd5 JX |
6776 | |
6777 | #: builtin/column.c:29 | |
6778 | msgid "Maximum width" | |
07432cef | 6779 | msgstr "最大宽度" |
ef317cd5 JX |
6780 | |
6781 | #: builtin/column.c:30 | |
6782 | msgid "Padding space on left border" | |
07432cef | 6783 | msgstr "左边框的填充空间" |
ef317cd5 JX |
6784 | |
6785 | #: builtin/column.c:31 | |
6786 | msgid "Padding space on right border" | |
07432cef | 6787 | msgstr "右边框的填充空间" |
ef317cd5 JX |
6788 | |
6789 | #: builtin/column.c:32 | |
6790 | msgid "Padding space between columns" | |
07432cef | 6791 | msgstr "两列之间的填充空间" |
ef317cd5 | 6792 | |
8ada9598 JX |
6793 | #: builtin/column.c:51 |
6794 | msgid "--command must be the first argument" | |
81809b99 | 6795 | msgstr "--command 必须是第一个参数" |
8ada9598 | 6796 | |
94550ed3 | 6797 | #: builtin/commit.c:38 |
814ff314 | 6798 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 6799 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 6800 | |
94550ed3 | 6801 | #: builtin/commit.c:43 |
814ff314 | 6802 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 6803 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 6804 | |
94550ed3 | 6805 | #: builtin/commit.c:48 |
220c313c JX |
6806 | msgid "" |
6807 | "Your name and email address were configured automatically based\n" | |
6808 | "on your username and hostname. Please check that they are accurate.\n" | |
6809 | "You can suppress this message by setting them explicitly. Run the\n" | |
6810 | "following command and follow the instructions in your editor to edit\n" | |
6811 | "your configuration file:\n" | |
6812 | "\n" | |
6813 | " git config --global --edit\n" | |
6814 | "\n" | |
6815 | "After doing this, you may fix the identity used for this commit with:\n" | |
6816 | "\n" | |
6817 | " git commit --amend --reset-author\n" | |
6818 | msgstr "" | |
6819 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
6820 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
6821 | "中编辑您的配置文件:\n" | |
6822 | "\n" | |
6823 | " git config --global --edit\n" | |
6824 | "\n" | |
6825 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
6826 | "\n" | |
6827 | " git commit --amend --reset-author\n" | |
6828 | ||
94550ed3 | 6829 | #: builtin/commit.c:61 |
c04f5ac3 JX |
6830 | msgid "" |
6831 | "Your name and email address were configured automatically based\n" | |
6832 | "on your username and hostname. Please check that they are accurate.\n" | |
6833 | "You can suppress this message by setting them explicitly:\n" | |
6834 | "\n" | |
6835 | " git config --global user.name \"Your Name\"\n" | |
6836 | " git config --global user.email you@example.com\n" | |
6837 | "\n" | |
6838 | "After doing this, you may fix the identity used for this commit with:\n" | |
6839 | "\n" | |
6840 | " git commit --amend --reset-author\n" | |
6841 | msgstr "" | |
90e6ef53 | 6842 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 6843 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
6844 | "\n" |
6845 | " git config --global user.name \"Your Name\"\n" | |
6846 | " git config --global user.email you@example.com\n" | |
6847 | "\n" | |
90e6ef53 | 6848 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
6849 | "\n" |
6850 | " git commit --amend --reset-author\n" | |
6851 | ||
94550ed3 | 6852 | #: builtin/commit.c:73 |
c04f5ac3 JX |
6853 | msgid "" |
6854 | "You asked to amend the most recent commit, but doing so would make\n" | |
6855 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
6856 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
6857 | msgstr "" | |
1b150dc9 T |
6858 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
6859 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 6860 | |
94550ed3 | 6861 | #: builtin/commit.c:78 |
c04f5ac3 JX |
6862 | msgid "" |
6863 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
6864 | "If you wish to commit it anyway, use:\n" | |
6865 | "\n" | |
6866 | " git commit --allow-empty\n" | |
6867 | "\n" | |
c04f5ac3 | 6868 | msgstr "" |
a9ce4543 T |
6869 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
6870 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
6871 | "\n" |
6872 | " git commit --allow-empty\n" | |
6873 | "\n" | |
c04f5ac3 | 6874 | |
94550ed3 | 6875 | #: builtin/commit.c:85 |
b1894384 JX |
6876 | msgid "Otherwise, please use 'git reset'\n" |
6877 | msgstr "否则,请使用命令 'git reset'\n" | |
6878 | ||
94550ed3 | 6879 | #: builtin/commit.c:88 |
b1894384 JX |
6880 | msgid "" |
6881 | "If you wish to skip this commit, use:\n" | |
6882 | "\n" | |
6883 | " git reset\n" | |
6884 | "\n" | |
6885 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
6886 | "the remaining commits.\n" | |
6887 | msgstr "" | |
6888 | "如果您想跳过这个提交,使用命令:\n" | |
6889 | "\n" | |
6890 | " git reset\n" | |
6891 | "\n" | |
6892 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
6893 | "操作。\n" | |
6894 | ||
a0b6b246 | 6895 | #: builtin/commit.c:318 |
c04f5ac3 | 6896 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 6897 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 6898 | |
a0b6b246 | 6899 | #: builtin/commit.c:359 |
c04f5ac3 | 6900 | msgid "unable to create temporary index" |
90e6ef53 | 6901 | msgstr "不能创建临时索引" |
c04f5ac3 | 6902 | |
a0b6b246 | 6903 | #: builtin/commit.c:365 |
c04f5ac3 JX |
6904 | msgid "interactive add failed" |
6905 | msgstr "交互式添加失败" | |
6906 | ||
a0b6b246 | 6907 | #: builtin/commit.c:378 |
220c313c JX |
6908 | msgid "unable to update temporary index" |
6909 | msgstr "无法更新临时索引" | |
6910 | ||
a0b6b246 | 6911 | #: builtin/commit.c:380 |
220c313c JX |
6912 | msgid "Failed to update main cache tree" |
6913 | msgstr "不能更新树的主缓存" | |
6914 | ||
a0b6b246 | 6915 | #: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 |
c04f5ac3 | 6916 | msgid "unable to write new_index file" |
90e6ef53 | 6917 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 6918 | |
a0b6b246 | 6919 | #: builtin/commit.c:458 |
8ada9598 | 6920 | msgid "cannot do a partial commit during a merge." |
81809b99 | 6921 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 6922 | |
a0b6b246 | 6923 | #: builtin/commit.c:460 |
8ada9598 | 6924 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 6925 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 6926 | |
a0b6b246 | 6927 | #: builtin/commit.c:469 |
c04f5ac3 | 6928 | msgid "cannot read the index" |
90e6ef53 | 6929 | msgstr "无法读取索引" |
c04f5ac3 | 6930 | |
a0b6b246 | 6931 | #: builtin/commit.c:488 |
c04f5ac3 | 6932 | msgid "unable to write temporary index file" |
90e6ef53 | 6933 | msgstr "无法写临时索引文件" |
c04f5ac3 | 6934 | |
a0b6b246 | 6935 | #: builtin/commit.c:582 |
220c313c JX |
6936 | #, c-format |
6937 | msgid "commit '%s' lacks author header" | |
6938 | msgstr "提交 '%s' 缺少作者信息" | |
6939 | ||
a0b6b246 | 6940 | #: builtin/commit.c:584 |
c04f5ac3 | 6941 | #, c-format |
220c313c JX |
6942 | msgid "commit '%s' has malformed author line" |
6943 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 6944 | |
a0b6b246 | 6945 | #: builtin/commit.c:603 |
c04f5ac3 JX |
6946 | msgid "malformed --author parameter" |
6947 | msgstr "非法的 --author 参数" | |
6948 | ||
a0b6b246 | 6949 | #: builtin/commit.c:655 |
6acbf033 JX |
6950 | msgid "" |
6951 | "unable to select a comment character that is not used\n" | |
6952 | "in the current commit message" | |
6953 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
6954 | ||
a0b6b246 | 6955 | #: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 |
c04f5ac3 JX |
6956 | #, c-format |
6957 | msgid "could not lookup commit %s" | |
6958 | msgstr "不能查询提交 %s" | |
6959 | ||
87cb7997 | 6960 | #: builtin/commit.c:704 builtin/shortlog.c:294 |
c04f5ac3 JX |
6961 | #, c-format |
6962 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 6963 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 6964 | |
a0b6b246 | 6965 | #: builtin/commit.c:706 |
c04f5ac3 | 6966 | msgid "could not read log from standard input" |
90e6ef53 | 6967 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 6968 | |
a0b6b246 | 6969 | #: builtin/commit.c:710 |
c04f5ac3 JX |
6970 | #, c-format |
6971 | msgid "could not read log file '%s'" | |
90e6ef53 | 6972 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 6973 | |
a0b6b246 | 6974 | #: builtin/commit.c:737 builtin/commit.c:745 |
c04f5ac3 | 6975 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 6976 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 6977 | |
a0b6b246 | 6978 | #: builtin/commit.c:742 |
5b04ee3b JX |
6979 | msgid "could not read MERGE_MSG" |
6980 | msgstr "不能读取 MERGE_MSG" | |
6981 | ||
a0b6b246 | 6982 | #: builtin/commit.c:796 |
c04f5ac3 | 6983 | msgid "could not write commit template" |
90e6ef53 | 6984 | msgstr "不能写提交模版" |
c04f5ac3 | 6985 | |
a0b6b246 | 6986 | #: builtin/commit.c:814 |
81809b99 | 6987 | #, c-format |
c04f5ac3 JX |
6988 | msgid "" |
6989 | "\n" | |
8ada9598 | 6990 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
6991 | "If this is not correct, please remove the file\n" |
6992 | "\t%s\n" | |
6993 | "and try again.\n" | |
6994 | msgstr "" | |
6995 | "\n" | |
649900bc | 6996 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
6997 | "\t%s\n" |
6998 | "然后重试。\n" | |
6999 | ||
a0b6b246 | 7000 | #: builtin/commit.c:819 |
81809b99 | 7001 | #, c-format |
8ada9598 JX |
7002 | msgid "" |
7003 | "\n" | |
7004 | "It looks like you may be committing a cherry-pick.\n" | |
7005 | "If this is not correct, please remove the file\n" | |
7006 | "\t%s\n" | |
7007 | "and try again.\n" | |
7008 | msgstr "" | |
7009 | "\n" | |
649900bc | 7010 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
7011 | "\t%s\n" |
7012 | "然后重试。\n" | |
c04f5ac3 | 7013 | |
a0b6b246 | 7014 | #: builtin/commit.c:832 |
a77c07d9 | 7015 | #, c-format |
c04f5ac3 | 7016 | msgid "" |
8ada9598 | 7017 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7018 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 7019 | msgstr "" |
a77c07d9 | 7020 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 7021 | "说明将会终止提交。\n" |
c04f5ac3 | 7022 | |
a0b6b246 | 7023 | #: builtin/commit.c:839 |
a77c07d9 | 7024 | #, c-format |
c04f5ac3 | 7025 | msgid "" |
8ada9598 | 7026 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7027 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
7028 | "An empty message aborts the commit.\n" |
7029 | msgstr "" | |
a77c07d9 JX |
7030 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
7031 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 7032 | |
90e6ef53 | 7033 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a0b6b246 | 7034 | #: builtin/commit.c:859 |
6acbf033 JX |
7035 | #, c-format |
7036 | msgid "%sAuthor: %.*s <%.*s>" | |
7037 | msgstr "%s作者: %.*s <%.*s>" | |
7038 | ||
7039 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
a0b6b246 | 7040 | #: builtin/commit.c:867 |
c04f5ac3 | 7041 | #, c-format |
6acbf033 JX |
7042 | msgid "%sDate: %s" |
7043 | msgstr "%s日期: %s" | |
c04f5ac3 | 7044 | |
90e6ef53 | 7045 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a0b6b246 | 7046 | #: builtin/commit.c:874 |
c04f5ac3 | 7047 | #, c-format |
6acbf033 JX |
7048 | msgid "%sCommitter: %.*s <%.*s>" |
7049 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 7050 | |
a0b6b246 | 7051 | #: builtin/commit.c:892 |
c04f5ac3 | 7052 | msgid "Cannot read index" |
90e6ef53 | 7053 | msgstr "无法读取索引" |
c04f5ac3 | 7054 | |
a0b6b246 | 7055 | #: builtin/commit.c:954 |
c04f5ac3 JX |
7056 | msgid "Error building trees" |
7057 | msgstr "无法创建树对象" | |
7058 | ||
87cb7997 | 7059 | #: builtin/commit.c:968 builtin/tag.c:273 |
c04f5ac3 JX |
7060 | #, c-format |
7061 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 7062 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 7063 | |
a0b6b246 | 7064 | #: builtin/commit.c:1071 |
c04f5ac3 | 7065 | #, c-format |
814ff314 JX |
7066 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
7067 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 7068 | |
1a79b2f1 | 7069 | #: builtin/commit.c:1086 builtin/commit.c:1325 |
c04f5ac3 JX |
7070 | #, c-format |
7071 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 7072 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 7073 | |
a0b6b246 | 7074 | #: builtin/commit.c:1124 |
2e8451e8 JX |
7075 | msgid "--long and -z are incompatible" |
7076 | msgstr "--long 和 -z 选项不兼容" | |
7077 | ||
a0b6b246 | 7078 | #: builtin/commit.c:1154 |
c04f5ac3 JX |
7079 | msgid "Using both --reset-author and --author does not make sense" |
7080 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
7081 | ||
a0b6b246 | 7082 | #: builtin/commit.c:1163 |
c04f5ac3 | 7083 | msgid "You have nothing to amend." |
90e6ef53 | 7084 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 7085 | |
a0b6b246 | 7086 | #: builtin/commit.c:1166 |
8ada9598 | 7087 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 7088 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 7089 | |
a0b6b246 | 7090 | #: builtin/commit.c:1168 |
8ada9598 | 7091 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 7092 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 7093 | |
a0b6b246 | 7094 | #: builtin/commit.c:1171 |
c04f5ac3 | 7095 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 7096 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 7097 | |
a0b6b246 | 7098 | #: builtin/commit.c:1181 |
c04f5ac3 JX |
7099 | msgid "Only one of -c/-C/-F/--fixup can be used." |
7100 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
7101 | ||
a0b6b246 | 7102 | #: builtin/commit.c:1183 |
c04f5ac3 | 7103 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 7104 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 7105 | |
a0b6b246 | 7106 | #: builtin/commit.c:1191 |
c04f5ac3 | 7107 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 7108 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 7109 | |
a0b6b246 | 7110 | #: builtin/commit.c:1208 |
c04f5ac3 JX |
7111 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
7112 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
7113 | ||
a0b6b246 | 7114 | #: builtin/commit.c:1210 |
c04f5ac3 JX |
7115 | msgid "No paths with --include/--only does not make sense." |
7116 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
7117 | ||
a0b6b246 | 7118 | #: builtin/commit.c:1212 |
6c94aba5 JX |
7119 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
7120 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 7121 | |
87cb7997 | 7122 | #: builtin/commit.c:1224 builtin/tag.c:551 |
c04f5ac3 JX |
7123 | #, c-format |
7124 | msgid "Invalid cleanup mode %s" | |
7125 | msgstr "无效的清理模式 %s" | |
7126 | ||
1a79b2f1 | 7127 | #: builtin/commit.c:1229 |
c04f5ac3 | 7128 | msgid "Paths with -a does not make sense." |
649900bc | 7129 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 7130 | |
1a79b2f1 | 7131 | #: builtin/commit.c:1339 builtin/commit.c:1612 |
ef317cd5 | 7132 | msgid "show status concisely" |
07432cef | 7133 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 7134 | |
1a79b2f1 | 7135 | #: builtin/commit.c:1341 builtin/commit.c:1614 |
ef317cd5 | 7136 | msgid "show branch information" |
07432cef | 7137 | msgstr "显示分支信息" |
ef317cd5 | 7138 | |
1a79b2f1 | 7139 | #: builtin/commit.c:1343 |
a0b6b246 JX |
7140 | msgid "version" |
7141 | msgstr "版本" | |
7142 | ||
1a79b2f1 | 7143 | #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 |
60638e98 | 7144 | #: builtin/worktree.c:448 |
ef317cd5 | 7145 | msgid "machine-readable output" |
07432cef WS |
7146 | msgstr "机器可读的输出" |
7147 | ||
1a79b2f1 | 7148 | #: builtin/commit.c:1346 builtin/commit.c:1618 |
07432cef WS |
7149 | msgid "show status in long format (default)" |
7150 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 7151 | |
1a79b2f1 | 7152 | #: builtin/commit.c:1349 builtin/commit.c:1621 |
ef317cd5 | 7153 | msgid "terminate entries with NUL" |
4375c10e | 7154 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 7155 | |
1a79b2f1 | 7156 | #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 |
87cb7997 | 7157 | #: builtin/fast-export.c:984 builtin/tag.c:411 |
ef317cd5 | 7158 | msgid "mode" |
07432cef | 7159 | msgstr "模式" |
ef317cd5 | 7160 | |
1a79b2f1 | 7161 | #: builtin/commit.c:1352 builtin/commit.c:1624 |
ef317cd5 | 7162 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 7163 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 7164 | |
1a79b2f1 | 7165 | #: builtin/commit.c:1355 |
ef317cd5 | 7166 | msgid "show ignored files" |
07432cef | 7167 | msgstr "显示忽略的文件" |
ef317cd5 | 7168 | |
1a79b2f1 | 7169 | #: builtin/commit.c:1356 parse-options.h:155 |
ef317cd5 JX |
7170 | msgid "when" |
7171 | msgstr "何时" | |
7172 | ||
1a79b2f1 | 7173 | #: builtin/commit.c:1357 |
ef317cd5 JX |
7174 | msgid "" |
7175 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
7176 | "(Default: all)" | |
7177 | msgstr "" | |
07432cef | 7178 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 7179 | |
1a79b2f1 | 7180 | #: builtin/commit.c:1359 |
ef317cd5 | 7181 | msgid "list untracked files in columns" |
07432cef | 7182 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 7183 | |
1a79b2f1 | 7184 | #: builtin/commit.c:1435 |
c04f5ac3 JX |
7185 | msgid "couldn't look up newly created commit" |
7186 | msgstr "无法找到新创建的提交" | |
7187 | ||
1a79b2f1 | 7188 | #: builtin/commit.c:1437 |
c04f5ac3 | 7189 | msgid "could not parse newly created commit" |
90e6ef53 | 7190 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 7191 | |
1a79b2f1 | 7192 | #: builtin/commit.c:1482 |
c04f5ac3 JX |
7193 | msgid "detached HEAD" |
7194 | msgstr "分离头指针" | |
7195 | ||
7e238ab7 | 7196 | # 译者:中文字符串拼接,可删除前导空格 |
1a79b2f1 | 7197 | #: builtin/commit.c:1485 |
c04f5ac3 | 7198 | msgid " (root-commit)" |
7e238ab7 | 7199 | msgstr "(根提交)" |
c04f5ac3 | 7200 | |
1a79b2f1 | 7201 | #: builtin/commit.c:1582 |
ef317cd5 | 7202 | msgid "suppress summary after successful commit" |
07432cef | 7203 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 7204 | |
1a79b2f1 | 7205 | #: builtin/commit.c:1583 |
ef317cd5 | 7206 | msgid "show diff in commit message template" |
07432cef | 7207 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 7208 | |
1a79b2f1 | 7209 | #: builtin/commit.c:1585 |
ef317cd5 | 7210 | msgid "Commit message options" |
07432cef | 7211 | msgstr "提交说明选项" |
c04f5ac3 | 7212 | |
87cb7997 | 7213 | #: builtin/commit.c:1586 builtin/tag.c:409 |
ef317cd5 | 7214 | msgid "read message from file" |
07432cef | 7215 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 7216 | |
1a79b2f1 | 7217 | #: builtin/commit.c:1587 |
ef317cd5 | 7218 | msgid "author" |
07432cef | 7219 | msgstr "作者" |
c04f5ac3 | 7220 | |
1a79b2f1 | 7221 | #: builtin/commit.c:1587 |
ef317cd5 | 7222 | msgid "override author for commit" |
07432cef | 7223 | msgstr "提交时覆盖作者" |
73a60cd2 | 7224 | |
60638e98 | 7225 | #: builtin/commit.c:1588 builtin/gc.c:357 |
ef317cd5 | 7226 | msgid "date" |
07432cef | 7227 | msgstr "日期" |
c04f5ac3 | 7228 | |
1a79b2f1 | 7229 | #: builtin/commit.c:1588 |
ef317cd5 | 7230 | msgid "override date for commit" |
07432cef | 7231 | msgstr "提交时覆盖日期" |
c04f5ac3 | 7232 | |
87cb7997 JX |
7233 | #: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 |
7234 | #: builtin/notes.c:561 builtin/tag.c:407 | |
ef317cd5 | 7235 | msgid "message" |
07432cef | 7236 | msgstr "说明" |
c04f5ac3 | 7237 | |
1a79b2f1 | 7238 | #: builtin/commit.c:1589 |
ef317cd5 | 7239 | msgid "commit message" |
07432cef | 7240 | msgstr "提交说明" |
ef317cd5 | 7241 | |
1a79b2f1 | 7242 | #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 |
87cb7997 | 7243 | #: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 |
94550ed3 JX |
7244 | msgid "commit" |
7245 | msgstr "提交" | |
7246 | ||
1a79b2f1 | 7247 | #: builtin/commit.c:1590 |
ef317cd5 | 7248 | msgid "reuse and edit message from specified commit" |
07432cef | 7249 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 7250 | |
1a79b2f1 | 7251 | #: builtin/commit.c:1591 |
ef317cd5 | 7252 | msgid "reuse message from specified commit" |
07432cef | 7253 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 7254 | |
1a79b2f1 | 7255 | #: builtin/commit.c:1592 |
ef317cd5 | 7256 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 7257 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 7258 | |
1a79b2f1 | 7259 | #: builtin/commit.c:1593 |
ef317cd5 | 7260 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 7261 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 7262 | |
1a79b2f1 | 7263 | #: builtin/commit.c:1594 |
ef317cd5 | 7264 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 7265 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 7266 | |
87cb7997 | 7267 | #: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 |
ef317cd5 | 7268 | msgid "add Signed-off-by:" |
07432cef | 7269 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 7270 | |
1a79b2f1 | 7271 | #: builtin/commit.c:1596 |
ef317cd5 | 7272 | msgid "use specified template file" |
07432cef | 7273 | msgstr "使用指定的模板文件" |
ef317cd5 | 7274 | |
1a79b2f1 | 7275 | #: builtin/commit.c:1597 |
ef317cd5 | 7276 | msgid "force edit of commit" |
07432cef | 7277 | msgstr "强制编辑提交" |
ef317cd5 | 7278 | |
07432cef | 7279 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
1a79b2f1 | 7280 | #: builtin/commit.c:1598 |
ef317cd5 | 7281 | msgid "default" |
07432cef | 7282 | msgstr "default" |
ef317cd5 | 7283 | |
87cb7997 | 7284 | #: builtin/commit.c:1598 builtin/tag.c:412 |
ef317cd5 | 7285 | msgid "how to strip spaces and #comments from message" |
07432cef | 7286 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 7287 | |
1a79b2f1 | 7288 | #: builtin/commit.c:1599 |
ef317cd5 | 7289 | msgid "include status in commit message template" |
07432cef | 7290 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 7291 | |
87cb7997 JX |
7292 | #: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 |
7293 | #: builtin/revert.c:112 | |
ef317cd5 | 7294 | msgid "GPG sign commit" |
07432cef | 7295 | msgstr "GPG 提交签名" |
ef317cd5 | 7296 | |
1a79b2f1 | 7297 | #: builtin/commit.c:1604 |
ef317cd5 | 7298 | msgid "Commit contents options" |
07432cef | 7299 | msgstr "提交内容选项" |
ef317cd5 | 7300 | |
1a79b2f1 | 7301 | #: builtin/commit.c:1605 |
ef317cd5 | 7302 | msgid "commit all changed files" |
07432cef | 7303 | msgstr "提交所有改动的文件" |
ef317cd5 | 7304 | |
1a79b2f1 | 7305 | #: builtin/commit.c:1606 |
ef317cd5 | 7306 | msgid "add specified files to index for commit" |
07432cef | 7307 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 7308 | |
1a79b2f1 | 7309 | #: builtin/commit.c:1607 |
ef317cd5 | 7310 | msgid "interactively add files" |
07432cef | 7311 | msgstr "交互式添加文件" |
ef317cd5 | 7312 | |
1a79b2f1 | 7313 | #: builtin/commit.c:1608 |
ef317cd5 | 7314 | msgid "interactively add changes" |
07432cef | 7315 | msgstr "交互式添加变更" |
ef317cd5 | 7316 | |
1a79b2f1 | 7317 | #: builtin/commit.c:1609 |
ef317cd5 | 7318 | msgid "commit only specified files" |
07432cef | 7319 | msgstr "只提交指定的文件" |
ef317cd5 | 7320 | |
1a79b2f1 | 7321 | #: builtin/commit.c:1610 |
5c57d762 JX |
7322 | msgid "bypass pre-commit and commit-msg hooks" |
7323 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
7324 | ||
1a79b2f1 | 7325 | #: builtin/commit.c:1611 |
ef317cd5 | 7326 | msgid "show what would be committed" |
07432cef | 7327 | msgstr "显示将要提交的内容" |
ef317cd5 | 7328 | |
1a79b2f1 | 7329 | #: builtin/commit.c:1622 |
ef317cd5 | 7330 | msgid "amend previous commit" |
07432cef | 7331 | msgstr "修改先前的提交" |
ef317cd5 | 7332 | |
1a79b2f1 | 7333 | #: builtin/commit.c:1623 |
ef317cd5 | 7334 | msgid "bypass post-rewrite hook" |
07432cef | 7335 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 7336 | |
1a79b2f1 | 7337 | #: builtin/commit.c:1628 |
ef317cd5 | 7338 | msgid "ok to record an empty change" |
07432cef | 7339 | msgstr "允许一个空提交" |
ef317cd5 | 7340 | |
1a79b2f1 | 7341 | #: builtin/commit.c:1630 |
ef317cd5 | 7342 | msgid "ok to record a change with an empty message" |
07432cef | 7343 | msgstr "允许空的提交说明" |
ef317cd5 | 7344 | |
1a79b2f1 | 7345 | #: builtin/commit.c:1659 |
c04f5ac3 | 7346 | msgid "could not parse HEAD commit" |
90e6ef53 | 7347 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 7348 | |
1a79b2f1 | 7349 | #: builtin/commit.c:1707 |
c04f5ac3 JX |
7350 | #, c-format |
7351 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 7352 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 7353 | |
1a79b2f1 | 7354 | #: builtin/commit.c:1714 |
c04f5ac3 | 7355 | msgid "could not read MERGE_MODE" |
90e6ef53 | 7356 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 7357 | |
1a79b2f1 | 7358 | #: builtin/commit.c:1733 |
c04f5ac3 JX |
7359 | #, c-format |
7360 | msgid "could not read commit message: %s" | |
90e6ef53 | 7361 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 7362 | |
1a79b2f1 | 7363 | #: builtin/commit.c:1744 |
73a60cd2 JX |
7364 | #, c-format |
7365 | msgid "Aborting commit; you did not edit the message.\n" | |
7366 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
7367 | ||
1a79b2f1 | 7368 | #: builtin/commit.c:1749 |
c04f5ac3 JX |
7369 | #, c-format |
7370 | msgid "Aborting commit due to empty commit message.\n" | |
7371 | msgstr "终止提交因为提交说明为空。\n" | |
7372 | ||
1a79b2f1 | 7373 | #: builtin/commit.c:1797 |
c04f5ac3 JX |
7374 | msgid "" |
7375 | "Repository has been updated, but unable to write\n" | |
220c313c | 7376 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
7377 | "not exceeded, and then \"git reset HEAD\" to recover." |
7378 | msgstr "" | |
160fb2b2 | 7379 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 7380 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 7381 | |
276ceeaa | 7382 | #: builtin/config.c:9 |
814ff314 JX |
7383 | msgid "git config [<options>]" |
7384 | msgstr "git config [<选项>]" | |
ef317cd5 | 7385 | |
60638e98 | 7386 | #: builtin/config.c:56 |
ef317cd5 | 7387 | msgid "Config file location" |
07432cef | 7388 | msgstr "配置文件位置" |
ef317cd5 | 7389 | |
60638e98 | 7390 | #: builtin/config.c:57 |
ef317cd5 | 7391 | msgid "use global config file" |
07432cef | 7392 | msgstr "使用全局配置文件" |
ef317cd5 | 7393 | |
60638e98 | 7394 | #: builtin/config.c:58 |
ef317cd5 | 7395 | msgid "use system config file" |
07432cef | 7396 | msgstr "使用系统级配置文件" |
ef317cd5 | 7397 | |
60638e98 | 7398 | #: builtin/config.c:59 |
ef317cd5 | 7399 | msgid "use repository config file" |
160fb2b2 | 7400 | msgstr "使用仓库级配置文件" |
ef317cd5 | 7401 | |
60638e98 | 7402 | #: builtin/config.c:60 |
ef317cd5 | 7403 | msgid "use given config file" |
07432cef | 7404 | msgstr "使用指定的配置文件" |
ef317cd5 | 7405 | |
60638e98 | 7406 | #: builtin/config.c:61 |
2e8451e8 | 7407 | msgid "blob-id" |
4375c10e | 7408 | msgstr "数据对象 ID" |
2e8451e8 | 7409 | |
60638e98 | 7410 | #: builtin/config.c:61 |
2e8451e8 JX |
7411 | msgid "read config from given blob object" |
7412 | msgstr "从给定的数据对象读取配置" | |
7413 | ||
60638e98 | 7414 | #: builtin/config.c:62 |
ef317cd5 | 7415 | msgid "Action" |
07432cef | 7416 | msgstr "操作" |
ef317cd5 | 7417 | |
60638e98 | 7418 | #: builtin/config.c:63 |
ef317cd5 | 7419 | msgid "get value: name [value-regex]" |
07432cef | 7420 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 7421 | |
60638e98 | 7422 | #: builtin/config.c:64 |
ef317cd5 | 7423 | msgid "get all values: key [value-regex]" |
07432cef | 7424 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 7425 | |
60638e98 | 7426 | #: builtin/config.c:65 |
ef317cd5 | 7427 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 7428 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 7429 | |
60638e98 | 7430 | #: builtin/config.c:66 |
90314792 JX |
7431 | msgid "get value specific for the URL: section[.var] URL" |
7432 | msgstr "获得 URL 取值:section[.var] URL" | |
7433 | ||
60638e98 | 7434 | #: builtin/config.c:67 |
ef317cd5 | 7435 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 7436 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 7437 | |
60638e98 | 7438 | #: builtin/config.c:68 |
ef317cd5 | 7439 | msgid "add a new variable: name value" |
07432cef | 7440 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 7441 | |
60638e98 | 7442 | #: builtin/config.c:69 |
ef317cd5 | 7443 | msgid "remove a variable: name [value-regex]" |
07432cef | 7444 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 7445 | |
60638e98 | 7446 | #: builtin/config.c:70 |
ef317cd5 | 7447 | msgid "remove all matches: name [value-regex]" |
07432cef | 7448 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 7449 | |
60638e98 | 7450 | #: builtin/config.c:71 |
ef317cd5 | 7451 | msgid "rename section: old-name new-name" |
07432cef | 7452 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 7453 | |
60638e98 | 7454 | #: builtin/config.c:72 |
ef317cd5 | 7455 | msgid "remove a section: name" |
07432cef | 7456 | msgstr "删除一个小节:name" |
ef317cd5 | 7457 | |
60638e98 | 7458 | #: builtin/config.c:73 |
ef317cd5 | 7459 | msgid "list all" |
07432cef | 7460 | msgstr "列出所有" |
ef317cd5 | 7461 | |
60638e98 | 7462 | #: builtin/config.c:74 |
ef317cd5 | 7463 | msgid "open an editor" |
07432cef | 7464 | msgstr "打开一个编辑器" |
ef317cd5 | 7465 | |
60638e98 | 7466 | #: builtin/config.c:75 |
04cb2f28 JX |
7467 | msgid "find the color configured: slot [default]" |
7468 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 7469 | |
60638e98 | 7470 | #: builtin/config.c:76 |
04cb2f28 JX |
7471 | msgid "find the color setting: slot [stdout-is-tty]" |
7472 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 7473 | |
60638e98 | 7474 | #: builtin/config.c:77 |
ef317cd5 | 7475 | msgid "Type" |
07432cef | 7476 | msgstr "类型" |
ef317cd5 | 7477 | |
60638e98 | 7478 | #: builtin/config.c:78 |
ef317cd5 | 7479 | msgid "value is \"true\" or \"false\"" |
07432cef | 7480 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 7481 | |
60638e98 | 7482 | #: builtin/config.c:79 |
ef317cd5 | 7483 | msgid "value is decimal number" |
07432cef | 7484 | msgstr "值是十进制数" |
ef317cd5 | 7485 | |
60638e98 | 7486 | #: builtin/config.c:80 |
ef317cd5 | 7487 | msgid "value is --bool or --int" |
07432cef | 7488 | msgstr "值是 --bool or --int" |
ef317cd5 | 7489 | |
60638e98 | 7490 | #: builtin/config.c:81 |
ef317cd5 | 7491 | msgid "value is a path (file or directory name)" |
07432cef | 7492 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 7493 | |
60638e98 | 7494 | #: builtin/config.c:82 |
ef317cd5 | 7495 | msgid "Other" |
07432cef | 7496 | msgstr "其它" |
ef317cd5 | 7497 | |
60638e98 | 7498 | #: builtin/config.c:83 |
ef317cd5 | 7499 | msgid "terminate values with NUL byte" |
4375c10e | 7500 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 7501 | |
60638e98 | 7502 | #: builtin/config.c:84 |
1b7f4a34 JX |
7503 | msgid "show variable names only" |
7504 | msgstr "只显示变量名" | |
7505 | ||
60638e98 | 7506 | #: builtin/config.c:85 |
ef317cd5 | 7507 | msgid "respect include directives on lookup" |
07432cef | 7508 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 7509 | |
60638e98 | 7510 | #: builtin/config.c:86 |
276ceeaa JX |
7511 | msgid "show origin of config (file, standard input, blob, command line)" |
7512 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
7513 | ||
60638e98 | 7514 | #: builtin/config.c:328 |
220c313c | 7515 | msgid "unable to parse default color value" |
160fb2b2 | 7516 | msgstr "不能解析默认颜色值" |
220c313c | 7517 | |
60638e98 | 7518 | #: builtin/config.c:472 |
220c313c JX |
7519 | #, c-format |
7520 | msgid "" | |
7521 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7522 | "[user]\n" |
220c313c | 7523 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7524 | "#\tname = %s\n" |
220c313c JX |
7525 | "#\temail = %s\n" |
7526 | msgstr "" | |
7527 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7528 | "[user]\n" |
220c313c | 7529 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7530 | "#\tname = %s\n" |
220c313c JX |
7531 | "#\temail = %s\n" |
7532 | ||
60638e98 | 7533 | #: builtin/config.c:615 |
220c313c JX |
7534 | #, c-format |
7535 | msgid "cannot create configuration file %s" | |
7536 | msgstr "不能创建配置文件 %s" | |
7537 | ||
60638e98 | 7538 | #: builtin/config.c:627 |
a0b6b246 JX |
7539 | #, c-format |
7540 | msgid "" | |
7541 | "cannot overwrite multiple values with a single value\n" | |
7542 | " Use a regexp, --add or --replace-all to change %s." | |
7543 | msgstr "" | |
7544 | "无法用一个值覆盖多个值\n" | |
7545 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
7546 | ||
7547 | #: builtin/count-objects.c:86 | |
4dcdc3d8 JX |
7548 | msgid "git count-objects [-v] [-H | --human-readable]" |
7549 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
7550 | ||
a0b6b246 | 7551 | #: builtin/count-objects.c:96 |
4dcdc3d8 JX |
7552 | msgid "print sizes in human readable format" |
7553 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 7554 | |
87cb7997 | 7555 | #: builtin/describe.c:18 |
814ff314 JX |
7556 | msgid "git describe [<options>] [<commit-ish>...]" |
7557 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 7558 | |
87cb7997 | 7559 | #: builtin/describe.c:19 |
814ff314 JX |
7560 | msgid "git describe [<options>] --dirty" |
7561 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 7562 | |
87cb7997 JX |
7563 | #: builtin/describe.c:53 |
7564 | msgid "head" | |
7565 | msgstr "头" | |
7566 | ||
7567 | #: builtin/describe.c:53 | |
7568 | msgid "lightweight" | |
7569 | msgstr "轻量级的" | |
7570 | ||
7571 | #: builtin/describe.c:53 | |
7572 | msgid "annotated" | |
7573 | msgstr "附注的" | |
7574 | ||
7575 | #: builtin/describe.c:250 | |
c04f5ac3 JX |
7576 | #, c-format |
7577 | msgid "annotated tag %s not available" | |
55a16ee4 | 7578 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 7579 | |
87cb7997 | 7580 | #: builtin/describe.c:254 |
c04f5ac3 JX |
7581 | #, c-format |
7582 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 7583 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 7584 | |
87cb7997 | 7585 | #: builtin/describe.c:256 |
c04f5ac3 JX |
7586 | #, c-format |
7587 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 7588 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 7589 | |
87cb7997 | 7590 | #: builtin/describe.c:283 builtin/log.c:487 |
c04f5ac3 JX |
7591 | #, c-format |
7592 | msgid "Not a valid object name %s" | |
7593 | msgstr "不是一个有效的对象名 %s" | |
7594 | ||
87cb7997 | 7595 | #: builtin/describe.c:286 |
c04f5ac3 JX |
7596 | #, c-format |
7597 | msgid "%s is not a valid '%s' object" | |
7598 | msgstr "%s 不是一个有效的 '%s' 对象" | |
7599 | ||
87cb7997 | 7600 | #: builtin/describe.c:303 |
c04f5ac3 JX |
7601 | #, c-format |
7602 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 7603 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 7604 | |
87cb7997 | 7605 | #: builtin/describe.c:305 |
c04f5ac3 JX |
7606 | #, c-format |
7607 | msgid "searching to describe %s\n" | |
7608 | msgstr "搜索描述 %s\n" | |
7609 | ||
87cb7997 | 7610 | #: builtin/describe.c:352 |
c04f5ac3 JX |
7611 | #, c-format |
7612 | msgid "finished search at %s\n" | |
7613 | msgstr "完成搜索 %s\n" | |
7614 | ||
87cb7997 | 7615 | #: builtin/describe.c:379 |
c04f5ac3 JX |
7616 | #, c-format |
7617 | msgid "" | |
7618 | "No annotated tags can describe '%s'.\n" | |
7619 | "However, there were unannotated tags: try --tags." | |
7620 | msgstr "" | |
55a16ee4 RC |
7621 | "没有附注标签能描述 '%s'。\n" |
7622 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 7623 | |
87cb7997 | 7624 | #: builtin/describe.c:383 |
c04f5ac3 JX |
7625 | #, c-format |
7626 | msgid "" | |
7627 | "No tags can describe '%s'.\n" | |
7628 | "Try --always, or create some tags." | |
7629 | msgstr "" | |
55a16ee4 RC |
7630 | "没有标签能描述 '%s'。\n" |
7631 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 7632 | |
87cb7997 | 7633 | #: builtin/describe.c:413 |
c04f5ac3 JX |
7634 | #, c-format |
7635 | msgid "traversed %lu commits\n" | |
7636 | msgstr "已遍历 %lu 个提交\n" | |
7637 | ||
87cb7997 | 7638 | #: builtin/describe.c:416 |
c04f5ac3 JX |
7639 | #, c-format |
7640 | msgid "" | |
7641 | "more than %i tags found; listed %i most recent\n" | |
7642 | "gave up search at %s\n" | |
7643 | msgstr "" | |
55a16ee4 | 7644 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 7645 | "在 %s 放弃搜索\n" |
c04f5ac3 | 7646 | |
87cb7997 | 7647 | #: builtin/describe.c:438 |
ef317cd5 | 7648 | msgid "find the tag that comes after the commit" |
55a16ee4 | 7649 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 7650 | |
87cb7997 | 7651 | #: builtin/describe.c:439 |
ef317cd5 | 7652 | msgid "debug search strategy on stderr" |
07432cef | 7653 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 7654 | |
87cb7997 | 7655 | #: builtin/describe.c:440 |
1003b3a5 JX |
7656 | msgid "use any ref" |
7657 | msgstr "使用任意引用" | |
7658 | ||
87cb7997 | 7659 | #: builtin/describe.c:441 |
1003b3a5 | 7660 | msgid "use any tag, even unannotated" |
55a16ee4 | 7661 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 7662 | |
87cb7997 | 7663 | #: builtin/describe.c:442 |
ef317cd5 | 7664 | msgid "always use long format" |
07432cef | 7665 | msgstr "始终使用长提交号格式" |
ef317cd5 | 7666 | |
87cb7997 | 7667 | #: builtin/describe.c:443 |
2e8451e8 JX |
7668 | msgid "only follow first parent" |
7669 | msgstr "只跟随第一个父提交" | |
7670 | ||
87cb7997 | 7671 | #: builtin/describe.c:446 |
ef317cd5 | 7672 | msgid "only output exact matches" |
07432cef | 7673 | msgstr "只输出精确匹配" |
ef317cd5 | 7674 | |
87cb7997 | 7675 | #: builtin/describe.c:448 |
ef317cd5 | 7676 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 7677 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 7678 | |
87cb7997 | 7679 | #: builtin/describe.c:450 |
ef317cd5 | 7680 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 7681 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 7682 | |
87cb7997 JX |
7683 | #: builtin/describe.c:452 |
7684 | msgid "do not consider tags matching <pattern>" | |
7685 | msgstr "不考虑匹配 <模式> 的标签" | |
7686 | ||
7687 | #: builtin/describe.c:454 builtin/name-rev.c:357 | |
ef317cd5 | 7688 | msgid "show abbreviated commit object as fallback" |
07432cef | 7689 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 7690 | |
87cb7997 | 7691 | #: builtin/describe.c:455 builtin/describe.c:458 |
ef317cd5 | 7692 | msgid "mark" |
07432cef | 7693 | msgstr "标记" |
ef317cd5 | 7694 | |
87cb7997 | 7695 | #: builtin/describe.c:456 |
ef317cd5 | 7696 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 7697 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 7698 | |
87cb7997 JX |
7699 | #: builtin/describe.c:459 |
7700 | msgid "append <mark> on broken working tree (default: \"-broken\")" | |
7701 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
7702 | ||
7703 | #: builtin/describe.c:477 | |
c04f5ac3 JX |
7704 | msgid "--long is incompatible with --abbrev=0" |
7705 | msgstr "--long 与 --abbrev=0 不兼容" | |
7706 | ||
87cb7997 | 7707 | #: builtin/describe.c:506 |
c04f5ac3 | 7708 | msgid "No names found, cannot describe anything." |
90e6ef53 | 7709 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 7710 | |
87cb7997 | 7711 | #: builtin/describe.c:549 |
a8a5406a | 7712 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
7713 | msgstr "--dirty 与提交号不兼容" |
7714 | ||
7715 | #: builtin/describe.c:551 | |
7716 | msgid "--broken is incompatible with commit-ishes" | |
7717 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 7718 | |
1a79b2f1 | 7719 | #: builtin/diff.c:83 |
c04f5ac3 JX |
7720 | #, c-format |
7721 | msgid "'%s': not a regular file or symlink" | |
7722 | msgstr "'%s':不是一个正规文件或符号链接" | |
7723 | ||
1a79b2f1 | 7724 | #: builtin/diff.c:234 |
c04f5ac3 JX |
7725 | #, c-format |
7726 | msgid "invalid option: %s" | |
7727 | msgstr "无效选项:%s" | |
7728 | ||
1a79b2f1 | 7729 | #: builtin/diff.c:358 |
c04f5ac3 | 7730 | msgid "Not a git repository" |
160fb2b2 | 7731 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 7732 | |
1a79b2f1 | 7733 | #: builtin/diff.c:401 |
c04f5ac3 JX |
7734 | #, c-format |
7735 | msgid "invalid object '%s' given." | |
7736 | msgstr "提供了无效对象 '%s'。" | |
7737 | ||
1a79b2f1 | 7738 | #: builtin/diff.c:410 |
c04f5ac3 JX |
7739 | #, c-format |
7740 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 7741 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 7742 | |
1a79b2f1 | 7743 | #: builtin/diff.c:417 |
c04f5ac3 JX |
7744 | #, c-format |
7745 | msgid "unhandled object '%s' given." | |
6c94aba5 | 7746 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 7747 | |
1a79b2f1 JX |
7748 | #: builtin/difftool.c:28 |
7749 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" | |
7750 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
7751 | ||
7752 | #: builtin/difftool.c:241 | |
7753 | #, c-format | |
7754 | msgid "failed: %d" | |
7755 | msgstr "失败:%d" | |
7756 | ||
87cb7997 JX |
7757 | #: builtin/difftool.c:283 |
7758 | #, c-format | |
7759 | msgid "could not read symlink %s" | |
7760 | msgstr "无法读取符号链接 %s" | |
7761 | ||
7762 | #: builtin/difftool.c:285 | |
7763 | #, c-format | |
7764 | msgid "could not read symlink file %s" | |
7765 | msgstr "无法读取符号链接文件 %s" | |
7766 | ||
7767 | #: builtin/difftool.c:293 | |
7768 | #, c-format | |
7769 | msgid "could not read object %s for symlink %s" | |
7770 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
7771 | ||
7772 | #: builtin/difftool.c:395 | |
1a79b2f1 JX |
7773 | msgid "" |
7774 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
7775 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
7776 | msgstr "" |
7777 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
7778 | "cc')。" | |
1a79b2f1 | 7779 | |
87cb7997 | 7780 | #: builtin/difftool.c:609 |
1a79b2f1 JX |
7781 | #, c-format |
7782 | msgid "both files modified: '%s' and '%s'." | |
7783 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
7784 | ||
87cb7997 | 7785 | #: builtin/difftool.c:611 |
1a79b2f1 JX |
7786 | msgid "working tree file has been left." |
7787 | msgstr "工作区文件被留了下来。" | |
7788 | ||
87cb7997 | 7789 | #: builtin/difftool.c:622 |
1a79b2f1 JX |
7790 | #, c-format |
7791 | msgid "temporary files exist in '%s'." | |
7792 | msgstr "临时文件存在于 '%s'。" | |
7793 | ||
87cb7997 | 7794 | #: builtin/difftool.c:623 |
1a79b2f1 JX |
7795 | msgid "you may want to cleanup or recover these." |
7796 | msgstr "您可能想要清理或者恢复它们。" | |
7797 | ||
87cb7997 | 7798 | #: builtin/difftool.c:669 |
1a79b2f1 JX |
7799 | msgid "use `diff.guitool` instead of `diff.tool`" |
7800 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
7801 | ||
87cb7997 | 7802 | #: builtin/difftool.c:671 |
1a79b2f1 JX |
7803 | msgid "perform a full-directory diff" |
7804 | msgstr "执行一个全目录差异比较" | |
7805 | ||
87cb7997 | 7806 | #: builtin/difftool.c:673 |
1a79b2f1 JX |
7807 | msgid "do not prompt before launching a diff tool" |
7808 | msgstr "启动差异比较工具之前不提示" | |
7809 | ||
87cb7997 | 7810 | #: builtin/difftool.c:679 |
1a79b2f1 JX |
7811 | msgid "use symlinks in dir-diff mode" |
7812 | msgstr "在 dir-diff 模式中使用符号链接" | |
7813 | ||
87cb7997 | 7814 | #: builtin/difftool.c:680 |
1a79b2f1 JX |
7815 | msgid "<tool>" |
7816 | msgstr "<工具>" | |
7817 | ||
87cb7997 | 7818 | #: builtin/difftool.c:681 |
1a79b2f1 JX |
7819 | msgid "use the specified diff tool" |
7820 | msgstr "使用指定的差异比较工具" | |
7821 | ||
87cb7997 | 7822 | #: builtin/difftool.c:683 |
1a79b2f1 JX |
7823 | msgid "print a list of diff tools that may be used with `--tool`" |
7824 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
7825 | ||
87cb7997 | 7826 | #: builtin/difftool.c:686 |
1a79b2f1 JX |
7827 | msgid "" |
7828 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
7829 | "code" | |
7830 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
7831 | ||
87cb7997 | 7832 | #: builtin/difftool.c:688 |
1a79b2f1 JX |
7833 | msgid "<command>" |
7834 | msgstr "<命令>" | |
7835 | ||
87cb7997 | 7836 | #: builtin/difftool.c:689 |
1a79b2f1 JX |
7837 | msgid "specify a custom command for viewing diffs" |
7838 | msgstr "指定一个用于查看差异的自定义命令" | |
7839 | ||
87cb7997 | 7840 | #: builtin/difftool.c:713 |
1a79b2f1 JX |
7841 | msgid "no <tool> given for --tool=<tool>" |
7842 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
7843 | ||
87cb7997 | 7844 | #: builtin/difftool.c:720 |
1a79b2f1 JX |
7845 | msgid "no <cmd> given for --extcmd=<cmd>" |
7846 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
7847 | ||
1b7f4a34 | 7848 | #: builtin/fast-export.c:25 |
ef317cd5 | 7849 | msgid "git fast-export [rev-list-opts]" |
07432cef | 7850 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 7851 | |
1b7f4a34 | 7852 | #: builtin/fast-export.c:980 |
ef317cd5 | 7853 | msgid "show progress after <n> objects" |
07432cef | 7854 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 7855 | |
1b7f4a34 | 7856 | #: builtin/fast-export.c:982 |
ef317cd5 | 7857 | msgid "select handling of signed tags" |
55a16ee4 | 7858 | msgstr "选择如何处理签名标签" |
ef317cd5 | 7859 | |
1b7f4a34 | 7860 | #: builtin/fast-export.c:985 |
ef317cd5 | 7861 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 7862 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 7863 | |
1b7f4a34 | 7864 | #: builtin/fast-export.c:988 |
ef317cd5 | 7865 | msgid "Dump marks to this file" |
07432cef | 7866 | msgstr "把标记存储到这个文件" |
ef317cd5 | 7867 | |
1b7f4a34 | 7868 | #: builtin/fast-export.c:990 |
ef317cd5 | 7869 | msgid "Import marks from this file" |
07432cef | 7870 | msgstr "从这个文件导入标记" |
ef317cd5 | 7871 | |
1b7f4a34 | 7872 | #: builtin/fast-export.c:992 |
ef317cd5 | 7873 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 7874 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 7875 | |
1b7f4a34 | 7876 | #: builtin/fast-export.c:994 |
ef317cd5 | 7877 | msgid "Output full tree for each commit" |
07432cef | 7878 | msgstr "每次提交都输出整个树" |
ef317cd5 | 7879 | |
1b7f4a34 | 7880 | #: builtin/fast-export.c:996 |
ef317cd5 | 7881 | msgid "Use the done feature to terminate the stream" |
07432cef | 7882 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 7883 | |
1b7f4a34 | 7884 | #: builtin/fast-export.c:997 |
ef317cd5 | 7885 | msgid "Skip output of blob data" |
07432cef | 7886 | msgstr "跳过数据对象的输出" |
ef317cd5 | 7887 | |
1b7f4a34 | 7888 | #: builtin/fast-export.c:998 |
6acbf033 | 7889 | msgid "refspec" |
160fb2b2 | 7890 | msgstr "引用规格" |
6acbf033 | 7891 | |
1b7f4a34 | 7892 | #: builtin/fast-export.c:999 |
6acbf033 | 7893 | msgid "Apply refspec to exported refs" |
160fb2b2 | 7894 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 7895 | |
1b7f4a34 | 7896 | #: builtin/fast-export.c:1000 |
220c313c JX |
7897 | msgid "anonymize output" |
7898 | msgstr "匿名输出" | |
7899 | ||
5c57d762 | 7900 | #: builtin/fetch.c:21 |
ef317cd5 | 7901 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 7902 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 7903 | |
5c57d762 | 7904 | #: builtin/fetch.c:22 |
ef317cd5 | 7905 | msgid "git fetch [<options>] <group>" |
07432cef | 7906 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 7907 | |
5c57d762 | 7908 | #: builtin/fetch.c:23 |
ef317cd5 | 7909 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 7910 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 7911 | |
5c57d762 | 7912 | #: builtin/fetch.c:24 |
ef317cd5 | 7913 | msgid "git fetch --all [<options>]" |
07432cef | 7914 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 7915 | |
a0b6b246 | 7916 | #: builtin/fetch.c:95 builtin/pull.c:175 |
ef317cd5 | 7917 | msgid "fetch from all remotes" |
07432cef | 7918 | msgstr "从所有的远程抓取" |
ef317cd5 | 7919 | |
a0b6b246 | 7920 | #: builtin/fetch.c:97 builtin/pull.c:178 |
ef317cd5 | 7921 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 7922 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 7923 | |
a0b6b246 | 7924 | #: builtin/fetch.c:99 builtin/pull.c:181 |
ef317cd5 | 7925 | msgid "path to upload pack on remote end" |
07432cef | 7926 | msgstr "上传包到远程的路径" |
ef317cd5 | 7927 | |
a0b6b246 | 7928 | #: builtin/fetch.c:100 builtin/pull.c:183 |
ef317cd5 | 7929 | msgid "force overwrite of local branch" |
07432cef | 7930 | msgstr "强制覆盖本地分支" |
ef317cd5 | 7931 | |
a0b6b246 | 7932 | #: builtin/fetch.c:102 |
ef317cd5 | 7933 | msgid "fetch from multiple remotes" |
07432cef | 7934 | msgstr "从多个远程抓取" |
ef317cd5 | 7935 | |
a0b6b246 | 7936 | #: builtin/fetch.c:104 builtin/pull.c:185 |
ef317cd5 | 7937 | msgid "fetch all tags and associated objects" |
55a16ee4 | 7938 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 7939 | |
a0b6b246 | 7940 | #: builtin/fetch.c:106 |
ef317cd5 | 7941 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 7942 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 7943 | |
a0b6b246 | 7944 | #: builtin/fetch.c:108 |
276ceeaa JX |
7945 | msgid "number of submodules fetched in parallel" |
7946 | msgstr "子模组获取的并发数" | |
7947 | ||
a0b6b246 | 7948 | #: builtin/fetch.c:110 builtin/pull.c:188 |
ef317cd5 | 7949 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 7950 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 7951 | |
07432cef | 7952 | # 译者:可选值,不能翻译 |
a0b6b246 | 7953 | #: builtin/fetch.c:111 builtin/pull.c:191 |
ef317cd5 | 7954 | msgid "on-demand" |
07432cef | 7955 | msgstr "on-demand" |
ef317cd5 | 7956 | |
a0b6b246 | 7957 | #: builtin/fetch.c:112 builtin/pull.c:192 |
ef317cd5 | 7958 | msgid "control recursive fetching of submodules" |
07432cef | 7959 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 7960 | |
a0b6b246 | 7961 | #: builtin/fetch.c:116 builtin/pull.c:200 |
ef317cd5 | 7962 | msgid "keep downloaded pack" |
07432cef | 7963 | msgstr "保持下载包" |
ef317cd5 | 7964 | |
a0b6b246 | 7965 | #: builtin/fetch.c:118 |
ef317cd5 | 7966 | msgid "allow updating of HEAD ref" |
07432cef | 7967 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 7968 | |
a0b6b246 | 7969 | #: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 |
ef317cd5 | 7970 | msgid "deepen history of shallow clone" |
07432cef | 7971 | msgstr "深化浅克隆的历史" |
ef317cd5 | 7972 | |
a0b6b246 JX |
7973 | #: builtin/fetch.c:123 |
7974 | msgid "deepen history of shallow repository based on time" | |
7975 | msgstr "基于时间来深化浅克隆的历史" | |
7976 | ||
7977 | #: builtin/fetch.c:129 builtin/pull.c:206 | |
a77c07d9 | 7978 | msgid "convert to a complete repository" |
160fb2b2 | 7979 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 7980 | |
87cb7997 | 7981 | #: builtin/fetch.c:131 builtin/log.c:1440 |
ef317cd5 | 7982 | msgid "dir" |
07432cef | 7983 | msgstr "目录" |
ef317cd5 | 7984 | |
a0b6b246 | 7985 | #: builtin/fetch.c:132 |
ef317cd5 | 7986 | msgid "prepend this to submodule path output" |
07432cef | 7987 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 7988 | |
a0b6b246 | 7989 | #: builtin/fetch.c:135 |
ef317cd5 | 7990 | msgid "default mode for recursion" |
07432cef | 7991 | msgstr "递归的默认模式" |
ef317cd5 | 7992 | |
a0b6b246 | 7993 | #: builtin/fetch.c:137 builtin/pull.c:209 |
cfff71a9 JX |
7994 | msgid "accept refs that update .git/shallow" |
7995 | msgstr "接受更新 .git/shallow 的引用" | |
7996 | ||
a0b6b246 | 7997 | #: builtin/fetch.c:138 builtin/pull.c:211 |
6acbf033 JX |
7998 | msgid "refmap" |
7999 | msgstr "引用映射" | |
8000 | ||
a0b6b246 | 8001 | #: builtin/fetch.c:139 builtin/pull.c:212 |
6acbf033 JX |
8002 | msgid "specify fetch refmap" |
8003 | msgstr "指定获取操作的引用映射" | |
8004 | ||
1a79b2f1 | 8005 | #: builtin/fetch.c:395 |
c04f5ac3 JX |
8006 | msgid "Couldn't find remote ref HEAD" |
8007 | msgstr "无法发现远程 HEAD 引用" | |
8008 | ||
87cb7997 | 8009 | #: builtin/fetch.c:513 |
5c57d762 JX |
8010 | #, c-format |
8011 | msgid "configuration fetch.output contains invalid value %s" | |
8012 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
8013 | ||
87cb7997 | 8014 | #: builtin/fetch.c:606 |
c04f5ac3 JX |
8015 | #, c-format |
8016 | msgid "object %s not found" | |
8017 | msgstr "对象 %s 未发现" | |
8018 | ||
87cb7997 | 8019 | #: builtin/fetch.c:610 |
c04f5ac3 JX |
8020 | msgid "[up to date]" |
8021 | msgstr "[最新]" | |
8022 | ||
87cb7997 | 8023 | #: builtin/fetch.c:623 builtin/fetch.c:703 |
c04f5ac3 JX |
8024 | msgid "[rejected]" |
8025 | msgstr "[已拒绝]" | |
8026 | ||
87cb7997 | 8027 | #: builtin/fetch.c:624 |
5c57d762 | 8028 | msgid "can't fetch in current branch" |
9a4b694c | 8029 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 8030 | |
87cb7997 | 8031 | #: builtin/fetch.c:633 |
c04f5ac3 | 8032 | msgid "[tag update]" |
55a16ee4 | 8033 | msgstr "[标签更新]" |
c04f5ac3 | 8034 | |
87cb7997 JX |
8035 | #: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 |
8036 | #: builtin/fetch.c:698 | |
5c57d762 JX |
8037 | msgid "unable to update local ref" |
8038 | msgstr "不能更新本地引用" | |
c04f5ac3 | 8039 | |
87cb7997 | 8040 | #: builtin/fetch.c:653 |
c04f5ac3 | 8041 | msgid "[new tag]" |
55a16ee4 | 8042 | msgstr "[新标签]" |
c04f5ac3 | 8043 | |
87cb7997 | 8044 | #: builtin/fetch.c:656 |
c04f5ac3 JX |
8045 | msgid "[new branch]" |
8046 | msgstr "[新分支]" | |
8047 | ||
87cb7997 | 8048 | #: builtin/fetch.c:659 |
170e9899 JX |
8049 | msgid "[new ref]" |
8050 | msgstr "[新引用]" | |
8051 | ||
87cb7997 | 8052 | #: builtin/fetch.c:698 |
c04f5ac3 JX |
8053 | msgid "forced update" |
8054 | msgstr "强制更新" | |
8055 | ||
87cb7997 | 8056 | #: builtin/fetch.c:703 |
5c57d762 JX |
8057 | msgid "non-fast-forward" |
8058 | msgstr "非快进" | |
c04f5ac3 | 8059 | |
87cb7997 | 8060 | #: builtin/fetch.c:748 |
c04f5ac3 JX |
8061 | #, c-format |
8062 | msgid "%s did not send all necessary objects\n" | |
8063 | msgstr "%s 未发送所有必须的对象\n" | |
8064 | ||
87cb7997 | 8065 | #: builtin/fetch.c:768 |
cfff71a9 JX |
8066 | #, c-format |
8067 | msgid "reject %s because shallow roots are not allowed to be updated" | |
8068 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
8069 | ||
87cb7997 | 8070 | #: builtin/fetch.c:855 builtin/fetch.c:951 |
c04f5ac3 JX |
8071 | #, c-format |
8072 | msgid "From %.*s\n" | |
8073 | msgstr "来自 %.*s\n" | |
8074 | ||
87cb7997 | 8075 | #: builtin/fetch.c:866 |
c04f5ac3 JX |
8076 | #, c-format |
8077 | msgid "" | |
8078 | "some local refs could not be updated; try running\n" | |
8079 | " 'git remote prune %s' to remove any old, conflicting branches" | |
8080 | msgstr "" | |
8081 | "一些本地引用不能被更新;尝试运行\n" | |
8082 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
8083 | ||
90e6ef53 | 8084 | # 译者:注意保持前导空格 |
87cb7997 | 8085 | #: builtin/fetch.c:921 |
81809b99 | 8086 | #, c-format |
8ada9598 | 8087 | msgid " (%s will become dangling)" |
07432cef | 8088 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 8089 | |
90e6ef53 | 8090 | # 译者:注意保持前导空格 |
87cb7997 | 8091 | #: builtin/fetch.c:922 |
81809b99 | 8092 | #, c-format |
8ada9598 | 8093 | msgid " (%s has become dangling)" |
07432cef | 8094 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 8095 | |
87cb7997 | 8096 | #: builtin/fetch.c:954 |
c04f5ac3 JX |
8097 | msgid "[deleted]" |
8098 | msgstr "[已删除]" | |
8099 | ||
87cb7997 | 8100 | #: builtin/fetch.c:955 builtin/remote.c:1022 |
c04f5ac3 JX |
8101 | msgid "(none)" |
8102 | msgstr "(无)" | |
8103 | ||
87cb7997 | 8104 | #: builtin/fetch.c:978 |
c04f5ac3 JX |
8105 | #, c-format |
8106 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 8107 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 8108 | |
87cb7997 | 8109 | #: builtin/fetch.c:997 |
c04f5ac3 JX |
8110 | #, c-format |
8111 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
8112 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
8113 | ||
87cb7997 | 8114 | #: builtin/fetch.c:1000 |
c04f5ac3 JX |
8115 | #, c-format |
8116 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 8117 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 8118 | |
87cb7997 | 8119 | #: builtin/fetch.c:1076 |
90314792 JX |
8120 | #, c-format |
8121 | msgid "Don't know how to fetch from %s" | |
8122 | msgstr "不知道如何从 %s 获取" | |
8123 | ||
87cb7997 | 8124 | #: builtin/fetch.c:1236 |
c04f5ac3 JX |
8125 | #, c-format |
8126 | msgid "Fetching %s\n" | |
d4a8e00b | 8127 | msgstr "正在获取 %s\n" |
c04f5ac3 | 8128 | |
87cb7997 | 8129 | #: builtin/fetch.c:1238 builtin/remote.c:96 |
c04f5ac3 JX |
8130 | #, c-format |
8131 | msgid "Could not fetch %s" | |
8132 | msgstr "不能获取 %s" | |
8133 | ||
87cb7997 | 8134 | #: builtin/fetch.c:1256 |
c04f5ac3 JX |
8135 | msgid "" |
8136 | "No remote repository specified. Please, specify either a URL or a\n" | |
8137 | "remote name from which new revisions should be fetched." | |
4375c10e | 8138 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 8139 | |
87cb7997 | 8140 | #: builtin/fetch.c:1279 |
c04f5ac3 | 8141 | msgid "You need to specify a tag name." |
55a16ee4 | 8142 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 8143 | |
87cb7997 | 8144 | #: builtin/fetch.c:1321 |
a0b6b246 JX |
8145 | msgid "Negative depth in --deepen is not supported" |
8146 | msgstr "--deepen 不支持负数深度" | |
8147 | ||
87cb7997 | 8148 | #: builtin/fetch.c:1323 |
a0b6b246 JX |
8149 | msgid "--deepen and --depth are mutually exclusive" |
8150 | msgstr "--deepen 和 --depth 是互斥的" | |
8151 | ||
87cb7997 | 8152 | #: builtin/fetch.c:1328 |
a77c07d9 JX |
8153 | msgid "--depth and --unshallow cannot be used together" |
8154 | msgstr "--depth 和 --unshallow 不能同时使用" | |
8155 | ||
87cb7997 | 8156 | #: builtin/fetch.c:1330 |
a77c07d9 | 8157 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 8158 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 8159 | |
87cb7997 | 8160 | #: builtin/fetch.c:1352 |
c04f5ac3 | 8161 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 8162 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 8163 | |
87cb7997 | 8164 | #: builtin/fetch.c:1354 |
c04f5ac3 | 8165 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 8166 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 8167 | |
87cb7997 | 8168 | #: builtin/fetch.c:1365 |
c04f5ac3 JX |
8169 | #, c-format |
8170 | msgid "No such remote or remote group: %s" | |
8171 | msgstr "没有这样的远程或远程组:%s" | |
8172 | ||
87cb7997 | 8173 | #: builtin/fetch.c:1373 |
c04f5ac3 | 8174 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 8175 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 8176 | |
1b7f4a34 | 8177 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
8178 | msgid "" |
8179 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
8180 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 8181 | |
a0b6b246 | 8182 | #: builtin/fmt-merge-msg.c:663 |
ef317cd5 | 8183 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 8184 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 8185 | |
a0b6b246 | 8186 | #: builtin/fmt-merge-msg.c:666 |
ef317cd5 | 8187 | msgid "alias for --log (deprecated)" |
07432cef | 8188 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 8189 | |
a0b6b246 | 8190 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 8191 | msgid "text" |
07432cef | 8192 | msgstr "文本" |
ef317cd5 | 8193 | |
a0b6b246 | 8194 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 8195 | msgid "use <text> as start of message" |
07432cef | 8196 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 8197 | |
a0b6b246 | 8198 | #: builtin/fmt-merge-msg.c:671 |
ef317cd5 | 8199 | msgid "file to read from" |
07432cef | 8200 | msgstr "从文件中读取" |
ef317cd5 | 8201 | |
1b7f4a34 | 8202 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
8203 | msgid "git for-each-ref [<options>] [<pattern>]" |
8204 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 8205 | |
94550ed3 JX |
8206 | #: builtin/for-each-ref.c:10 |
8207 | msgid "git for-each-ref [--points-at <object>]" | |
8208 | msgstr "git for-each-ref [--points-at <对象>]" | |
8209 | ||
8210 | #: builtin/for-each-ref.c:11 | |
87cb7997 JX |
8211 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
8212 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 JX |
8213 | |
8214 | #: builtin/for-each-ref.c:12 | |
87cb7997 JX |
8215 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
8216 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 JX |
8217 | |
8218 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 8219 | msgid "quote placeholders suitably for shells" |
07432cef | 8220 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 8221 | |
94550ed3 | 8222 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 8223 | msgid "quote placeholders suitably for perl" |
07432cef | 8224 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 8225 | |
94550ed3 | 8226 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 8227 | msgid "quote placeholders suitably for python" |
07432cef | 8228 | msgstr "引用占位符适用于 python" |
ef317cd5 | 8229 | |
94550ed3 | 8230 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
8231 | msgid "quote placeholders suitably for Tcl" |
8232 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 8233 | |
94550ed3 | 8234 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 8235 | msgid "show only <n> matched refs" |
07432cef | 8236 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 8237 | |
94550ed3 JX |
8238 | #: builtin/for-each-ref.c:41 |
8239 | msgid "print only refs which points at the given object" | |
8240 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 8241 | |
94550ed3 JX |
8242 | #: builtin/for-each-ref.c:43 |
8243 | msgid "print only refs that are merged" | |
8244 | msgstr "只打印已经合并的引用" | |
8245 | ||
8246 | #: builtin/for-each-ref.c:44 | |
8247 | msgid "print only refs that are not merged" | |
8248 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 8249 | |
94550ed3 JX |
8250 | #: builtin/for-each-ref.c:45 |
8251 | msgid "print only refs which contain the commit" | |
8252 | msgstr "只打印包含该提交的引用" | |
8253 | ||
87cb7997 JX |
8254 | #: builtin/for-each-ref.c:46 |
8255 | msgid "print only refs which don't contain the commit" | |
8256 | msgstr "只打印不包含该提交的引用" | |
8257 | ||
1a79b2f1 | 8258 | #: builtin/fsck.c:554 |
6c94aba5 JX |
8259 | msgid "Checking object directories" |
8260 | msgstr "检查对象目录中" | |
8261 | ||
1a79b2f1 | 8262 | #: builtin/fsck.c:646 |
814ff314 JX |
8263 | msgid "git fsck [<options>] [<object>...]" |
8264 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 8265 | |
1a79b2f1 | 8266 | #: builtin/fsck.c:652 |
ef317cd5 | 8267 | msgid "show unreachable objects" |
07432cef | 8268 | msgstr "显示不可达的对象" |
ef317cd5 | 8269 | |
1a79b2f1 | 8270 | #: builtin/fsck.c:653 |
ef317cd5 | 8271 | msgid "show dangling objects" |
07432cef | 8272 | msgstr "显示摇摆的对象" |
ef317cd5 | 8273 | |
1a79b2f1 | 8274 | #: builtin/fsck.c:654 |
ef317cd5 | 8275 | msgid "report tags" |
55a16ee4 | 8276 | msgstr "报告标签" |
ef317cd5 | 8277 | |
1a79b2f1 | 8278 | #: builtin/fsck.c:655 |
ef317cd5 | 8279 | msgid "report root nodes" |
07432cef | 8280 | msgstr "报告根节点" |
ef317cd5 | 8281 | |
1a79b2f1 | 8282 | #: builtin/fsck.c:656 |
ef317cd5 | 8283 | msgid "make index objects head nodes" |
07432cef | 8284 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 8285 | |
1a79b2f1 | 8286 | #: builtin/fsck.c:657 |
ef317cd5 | 8287 | msgid "make reflogs head nodes (default)" |
07432cef | 8288 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 8289 | |
1a79b2f1 | 8290 | #: builtin/fsck.c:658 |
ef317cd5 | 8291 | msgid "also consider packs and alternate objects" |
07432cef | 8292 | msgstr "也考虑包和备用对象" |
ef317cd5 | 8293 | |
1a79b2f1 | 8294 | #: builtin/fsck.c:659 |
1b7f4a34 JX |
8295 | msgid "check only connectivity" |
8296 | msgstr "仅检查连通性" | |
8297 | ||
1a79b2f1 | 8298 | #: builtin/fsck.c:660 |
ef317cd5 | 8299 | msgid "enable more strict checking" |
07432cef | 8300 | msgstr "启用更严格的检查" |
ef317cd5 | 8301 | |
1a79b2f1 | 8302 | #: builtin/fsck.c:662 |
ef317cd5 | 8303 | msgid "write dangling objects in .git/lost-found" |
07432cef | 8304 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 8305 | |
1a79b2f1 | 8306 | #: builtin/fsck.c:663 builtin/prune.c:107 |
ef317cd5 | 8307 | msgid "show progress" |
07432cef | 8308 | msgstr "显示进度" |
ef317cd5 | 8309 | |
1a79b2f1 | 8310 | #: builtin/fsck.c:664 |
5c57d762 JX |
8311 | msgid "show verbose names for reachable objects" |
8312 | msgstr "显示可达对象的详细名称" | |
8313 | ||
1a79b2f1 | 8314 | #: builtin/fsck.c:725 |
6c94aba5 JX |
8315 | msgid "Checking objects" |
8316 | msgstr "检查对象中" | |
8317 | ||
1b7f4a34 | 8318 | #: builtin/gc.c:25 |
814ff314 JX |
8319 | msgid "git gc [<options>]" |
8320 | msgstr "git gc [<选项>]" | |
ef317cd5 | 8321 | |
87cb7997 | 8322 | #: builtin/gc.c:78 |
c04f5ac3 | 8323 | #, c-format |
87cb7997 | 8324 | msgid "Failed to fstat %s: %s" |
65e2041e | 8325 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 8326 | |
60638e98 | 8327 | #: builtin/gc.c:310 |
c04f5ac3 | 8328 | #, c-format |
87cb7997 | 8329 | msgid "Can't stat %s" |
65e2041e | 8330 | msgstr "不能对 %s 调用 stat" |
c04f5ac3 | 8331 | |
60638e98 | 8332 | #: builtin/gc.c:319 |
94550ed3 JX |
8333 | #, c-format |
8334 | msgid "" | |
8335 | "The last gc run reported the following. Please correct the root cause\n" | |
8336 | "and remove %s.\n" | |
8337 | "Automatic cleanup will not be performed until the file is removed.\n" | |
8338 | "\n" | |
8339 | "%s" | |
8340 | msgstr "" | |
8341 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
8342 | "在该文件被删除之前,自动清理将不会执行。\n" | |
8343 | "\n" | |
8344 | "%s" | |
8345 | ||
60638e98 | 8346 | #: builtin/gc.c:358 |
ef317cd5 | 8347 | msgid "prune unreferenced objects" |
07432cef | 8348 | msgstr "清除未引用的对象" |
ef317cd5 | 8349 | |
60638e98 | 8350 | #: builtin/gc.c:360 |
ef317cd5 | 8351 | msgid "be more thorough (increased runtime)" |
07432cef | 8352 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 8353 | |
60638e98 | 8354 | #: builtin/gc.c:361 |
ef317cd5 | 8355 | msgid "enable auto-gc mode" |
07432cef | 8356 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 8357 | |
60638e98 | 8358 | #: builtin/gc.c:362 |
90314792 JX |
8359 | msgid "force running gc even if there may be another gc running" |
8360 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
8361 | ||
60638e98 | 8362 | #: builtin/gc.c:379 |
87cb7997 JX |
8363 | #, c-format |
8364 | msgid "Failed to parse gc.logexpiry value %s" | |
8365 | msgstr "无法解析 gc.logexpiry 的值 %s" | |
8366 | ||
60638e98 | 8367 | #: builtin/gc.c:407 |
c04f5ac3 | 8368 | #, c-format |
6c94aba5 | 8369 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 8370 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 8371 | |
60638e98 | 8372 | #: builtin/gc.c:409 |
6c94aba5 JX |
8373 | #, c-format |
8374 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 8375 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 8376 | |
60638e98 | 8377 | #: builtin/gc.c:410 |
6c94aba5 JX |
8378 | #, c-format |
8379 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
8380 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 8381 | |
60638e98 | 8382 | #: builtin/gc.c:431 |
90314792 JX |
8383 | #, c-format |
8384 | msgid "" | |
8385 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
8386 | msgstr "" | |
29004bbb | 8387 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 8388 | |
60638e98 | 8389 | #: builtin/gc.c:475 |
c04f5ac3 JX |
8390 | msgid "" |
8391 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 8392 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 8393 | |
1a79b2f1 | 8394 | #: builtin/grep.c:25 |
814ff314 JX |
8395 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
8396 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 8397 | |
1a79b2f1 | 8398 | #: builtin/grep.c:232 |
c04f5ac3 JX |
8399 | #, c-format |
8400 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 8401 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 8402 | |
1a79b2f1 | 8403 | #: builtin/grep.c:290 |
276ceeaa JX |
8404 | #, c-format |
8405 | msgid "invalid number of threads specified (%d) for %s" | |
8406 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
8407 | ||
87cb7997 | 8408 | #: builtin/grep.c:769 builtin/grep.c:810 |
c04f5ac3 JX |
8409 | #, c-format |
8410 | msgid "unable to read tree (%s)" | |
90e6ef53 | 8411 | msgstr "无法读取树(%s)" |
c04f5ac3 | 8412 | |
87cb7997 | 8413 | #: builtin/grep.c:829 |
c04f5ac3 JX |
8414 | #, c-format |
8415 | msgid "unable to grep from object of type %s" | |
8416 | msgstr "无法抓取来自于 %s 类型的对象" | |
8417 | ||
87cb7997 | 8418 | #: builtin/grep.c:893 |
c04f5ac3 JX |
8419 | #, c-format |
8420 | msgid "switch `%c' expects a numerical value" | |
8421 | msgstr "开关 `%c' 期望一个数字值" | |
8422 | ||
87cb7997 | 8423 | #: builtin/grep.c:980 |
ef317cd5 | 8424 | msgid "search in index instead of in the work tree" |
07432cef | 8425 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 8426 | |
87cb7997 | 8427 | #: builtin/grep.c:982 |
ef317cd5 | 8428 | msgid "find in contents not managed by git" |
07432cef | 8429 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
8430 | |
8431 | # 译者:中文字符串拼接,可删除前导空格 | |
87cb7997 | 8432 | #: builtin/grep.c:984 |
ef317cd5 | 8433 | msgid "search in both tracked and untracked files" |
07432cef | 8434 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 8435 | |
87cb7997 | 8436 | #: builtin/grep.c:986 |
814ff314 JX |
8437 | msgid "ignore files specified via '.gitignore'" |
8438 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 8439 | |
87cb7997 JX |
8440 | #: builtin/grep.c:988 |
8441 | msgid "recursively search in each submodule" | |
1a79b2f1 JX |
8442 | msgstr "在每一个子模组中递归搜索" |
8443 | ||
87cb7997 | 8444 | #: builtin/grep.c:990 |
1a79b2f1 JX |
8445 | msgid "basename" |
8446 | msgstr "基本名" | |
8447 | ||
87cb7997 | 8448 | #: builtin/grep.c:991 |
1a79b2f1 JX |
8449 | msgid "prepend parent project's basename to output" |
8450 | msgstr "在输出中以父项目的基本名为前缀" | |
8451 | ||
87cb7997 | 8452 | #: builtin/grep.c:994 |
ef317cd5 | 8453 | msgid "show non-matching lines" |
07432cef | 8454 | msgstr "显示未匹配的行" |
ef317cd5 | 8455 | |
87cb7997 | 8456 | #: builtin/grep.c:996 |
ef317cd5 | 8457 | msgid "case insensitive matching" |
07432cef | 8458 | msgstr "不区分大小写匹配" |
ef317cd5 | 8459 | |
87cb7997 | 8460 | #: builtin/grep.c:998 |
ef317cd5 | 8461 | msgid "match patterns only at word boundaries" |
07432cef | 8462 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 8463 | |
87cb7997 | 8464 | #: builtin/grep.c:1000 |
ef317cd5 | 8465 | msgid "process binary files as text" |
07432cef | 8466 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 8467 | |
87cb7997 | 8468 | #: builtin/grep.c:1002 |
ef317cd5 | 8469 | msgid "don't match patterns in binary files" |
07432cef | 8470 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 8471 | |
87cb7997 | 8472 | #: builtin/grep.c:1005 |
90314792 JX |
8473 | msgid "process binary files with textconv filters" |
8474 | msgstr "用 textconv 过滤器处理二进制文件" | |
8475 | ||
87cb7997 | 8476 | #: builtin/grep.c:1007 |
ef317cd5 | 8477 | msgid "descend at most <depth> levels" |
07432cef | 8478 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 8479 | |
87cb7997 | 8480 | #: builtin/grep.c:1011 |
ef317cd5 | 8481 | msgid "use extended POSIX regular expressions" |
07432cef | 8482 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 8483 | |
87cb7997 | 8484 | #: builtin/grep.c:1014 |
ef317cd5 | 8485 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 8486 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 8487 | |
87cb7997 | 8488 | #: builtin/grep.c:1017 |
ef317cd5 | 8489 | msgid "interpret patterns as fixed strings" |
07432cef | 8490 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 8491 | |
87cb7997 | 8492 | #: builtin/grep.c:1020 |
ef317cd5 | 8493 | msgid "use Perl-compatible regular expressions" |
07432cef | 8494 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 8495 | |
87cb7997 | 8496 | #: builtin/grep.c:1023 |
ef317cd5 | 8497 | msgid "show line numbers" |
07432cef | 8498 | msgstr "显示行号" |
ef317cd5 | 8499 | |
87cb7997 | 8500 | #: builtin/grep.c:1024 |
ef317cd5 | 8501 | msgid "don't show filenames" |
07432cef | 8502 | msgstr "不显示文件名" |
ef317cd5 | 8503 | |
87cb7997 | 8504 | #: builtin/grep.c:1025 |
ef317cd5 | 8505 | msgid "show filenames" |
07432cef | 8506 | msgstr "显示文件名" |
ef317cd5 | 8507 | |
87cb7997 | 8508 | #: builtin/grep.c:1027 |
ef317cd5 | 8509 | msgid "show filenames relative to top directory" |
07432cef | 8510 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 8511 | |
87cb7997 | 8512 | #: builtin/grep.c:1029 |
ef317cd5 | 8513 | msgid "show only filenames instead of matching lines" |
07432cef | 8514 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 8515 | |
87cb7997 | 8516 | #: builtin/grep.c:1031 |
ef317cd5 | 8517 | msgid "synonym for --files-with-matches" |
07432cef | 8518 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 8519 | |
87cb7997 | 8520 | #: builtin/grep.c:1034 |
ef317cd5 | 8521 | msgid "show only the names of files without match" |
07432cef | 8522 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 8523 | |
87cb7997 | 8524 | #: builtin/grep.c:1036 |
ef317cd5 | 8525 | msgid "print NUL after filenames" |
07432cef | 8526 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 8527 | |
87cb7997 | 8528 | #: builtin/grep.c:1038 |
ef317cd5 | 8529 | msgid "show the number of matches instead of matching lines" |
07432cef | 8530 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 8531 | |
87cb7997 | 8532 | #: builtin/grep.c:1039 |
ef317cd5 | 8533 | msgid "highlight matches" |
07432cef | 8534 | msgstr "高亮显示匹配项" |
ef317cd5 | 8535 | |
87cb7997 | 8536 | #: builtin/grep.c:1041 |
ef317cd5 | 8537 | msgid "print empty line between matches from different files" |
07432cef | 8538 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 8539 | |
87cb7997 | 8540 | #: builtin/grep.c:1043 |
ef317cd5 | 8541 | msgid "show filename only once above matches from same file" |
07432cef | 8542 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 8543 | |
87cb7997 | 8544 | #: builtin/grep.c:1046 |
ef317cd5 | 8545 | msgid "show <n> context lines before and after matches" |
07432cef | 8546 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 8547 | |
87cb7997 | 8548 | #: builtin/grep.c:1049 |
ef317cd5 | 8549 | msgid "show <n> context lines before matches" |
07432cef | 8550 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 8551 | |
87cb7997 | 8552 | #: builtin/grep.c:1051 |
ef317cd5 | 8553 | msgid "show <n> context lines after matches" |
07432cef | 8554 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 8555 | |
87cb7997 | 8556 | #: builtin/grep.c:1053 |
276ceeaa JX |
8557 | msgid "use <n> worker threads" |
8558 | msgstr "使用 <n> 个工作线程" | |
8559 | ||
87cb7997 | 8560 | #: builtin/grep.c:1054 |
ef317cd5 | 8561 | msgid "shortcut for -C NUM" |
07432cef | 8562 | msgstr "快捷键 -C 数字" |
ef317cd5 | 8563 | |
87cb7997 | 8564 | #: builtin/grep.c:1057 |
ef317cd5 | 8565 | msgid "show a line with the function name before matches" |
07432cef | 8566 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 8567 | |
87cb7997 | 8568 | #: builtin/grep.c:1059 |
ef317cd5 | 8569 | msgid "show the surrounding function" |
07432cef | 8570 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 8571 | |
87cb7997 | 8572 | #: builtin/grep.c:1062 |
ef317cd5 | 8573 | msgid "read patterns from file" |
07432cef | 8574 | msgstr "从文件读取模式" |
ef317cd5 | 8575 | |
87cb7997 | 8576 | #: builtin/grep.c:1064 |
ef317cd5 | 8577 | msgid "match <pattern>" |
07432cef | 8578 | msgstr "匹配 <模式>" |
ef317cd5 | 8579 | |
87cb7997 | 8580 | #: builtin/grep.c:1066 |
ef317cd5 | 8581 | msgid "combine patterns specified with -e" |
07432cef | 8582 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 8583 | |
87cb7997 | 8584 | #: builtin/grep.c:1078 |
ef317cd5 | 8585 | msgid "indicate hit with exit status without output" |
07432cef | 8586 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 8587 | |
87cb7997 | 8588 | #: builtin/grep.c:1080 |
ef317cd5 | 8589 | msgid "show only matches from files that match all patterns" |
07432cef | 8590 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 8591 | |
87cb7997 | 8592 | #: builtin/grep.c:1082 |
07432cef WS |
8593 | msgid "show parse tree for grep expression" |
8594 | msgstr "显示 grep 表达式的解析树" | |
8595 | ||
87cb7997 | 8596 | #: builtin/grep.c:1086 |
ef317cd5 | 8597 | msgid "pager" |
07432cef | 8598 | msgstr "分页" |
ef317cd5 | 8599 | |
87cb7997 | 8600 | #: builtin/grep.c:1086 |
ef317cd5 | 8601 | msgid "show matching files in the pager" |
07432cef | 8602 | msgstr "分页显示匹配的文件" |
ef317cd5 | 8603 | |
87cb7997 | 8604 | #: builtin/grep.c:1089 |
ef317cd5 | 8605 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 8606 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 8607 | |
87cb7997 | 8608 | #: builtin/grep.c:1153 |
c04f5ac3 JX |
8609 | msgid "no pattern given." |
8610 | msgstr "未提供模式匹配。" | |
8611 | ||
87cb7997 JX |
8612 | #: builtin/grep.c:1189 |
8613 | msgid "--no-index or --untracked cannot be used with revs" | |
8614 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
8615 | ||
8616 | #: builtin/grep.c:1195 | |
8617 | #, c-format | |
8618 | msgid "unable to resolve revision: %s" | |
8619 | msgstr "不能解析版本:%s" | |
8620 | ||
8621 | #: builtin/grep.c:1228 builtin/index-pack.c:1485 | |
276ceeaa JX |
8622 | #, c-format |
8623 | msgid "invalid number of threads specified (%d)" | |
8624 | msgstr "指定的线程数无效(%d)" | |
8625 | ||
87cb7997 | 8626 | #: builtin/grep.c:1251 |
c04f5ac3 JX |
8627 | msgid "--open-files-in-pager only works on the worktree" |
8628 | msgstr "--open-files-in-pager 仅用于工作区" | |
8629 | ||
87cb7997 | 8630 | #: builtin/grep.c:1274 |
1a79b2f1 JX |
8631 | msgid "option not supported with --recurse-submodules." |
8632 | msgstr "选项不支持和 --recurse-submodules 共用。" | |
8633 | ||
87cb7997 | 8634 | #: builtin/grep.c:1280 |
c04f5ac3 | 8635 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 8636 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 8637 | |
87cb7997 | 8638 | #: builtin/grep.c:1286 |
c04f5ac3 | 8639 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 8640 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 8641 | |
87cb7997 | 8642 | #: builtin/grep.c:1294 |
c04f5ac3 JX |
8643 | msgid "both --cached and trees are given." |
8644 | msgstr "同时给出了 --cached 和树对象。" | |
8645 | ||
276ceeaa | 8646 | #: builtin/hash-object.c:81 |
ef317cd5 | 8647 | msgid "" |
814ff314 JX |
8648 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
8649 | "[--] <file>..." | |
ef317cd5 | 8650 | msgstr "" |
814ff314 JX |
8651 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
8652 | "[--] <文件>..." | |
ef317cd5 | 8653 | |
276ceeaa | 8654 | #: builtin/hash-object.c:82 |
94550ed3 JX |
8655 | msgid "git hash-object --stdin-paths" |
8656 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 8657 | |
a0b6b246 | 8658 | #: builtin/hash-object.c:94 |
ef317cd5 | 8659 | msgid "type" |
07432cef | 8660 | msgstr "类型" |
ef317cd5 | 8661 | |
a0b6b246 | 8662 | #: builtin/hash-object.c:94 |
ef317cd5 | 8663 | msgid "object type" |
07432cef | 8664 | msgstr "对象类型" |
ef317cd5 | 8665 | |
a0b6b246 | 8666 | #: builtin/hash-object.c:95 |
ef317cd5 | 8667 | msgid "write the object into the object database" |
07432cef | 8668 | msgstr "将对象写入对象数据库" |
ef317cd5 | 8669 | |
a0b6b246 | 8670 | #: builtin/hash-object.c:97 |
ef317cd5 | 8671 | msgid "read the object from stdin" |
07432cef | 8672 | msgstr "从标准输入读取对象" |
ef317cd5 | 8673 | |
a0b6b246 | 8674 | #: builtin/hash-object.c:99 |
ef317cd5 | 8675 | msgid "store file as is without filters" |
07432cef | 8676 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 8677 | |
a0b6b246 | 8678 | #: builtin/hash-object.c:100 |
220c313c JX |
8679 | msgid "" |
8680 | "just hash any random garbage to create corrupt objects for debugging Git" | |
8681 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
8682 | ||
a0b6b246 | 8683 | #: builtin/hash-object.c:101 |
ef317cd5 | 8684 | msgid "process file as it were from this path" |
07432cef | 8685 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 8686 | |
a0b6b246 | 8687 | #: builtin/help.c:42 |
ef317cd5 | 8688 | msgid "print all available commands" |
07432cef | 8689 | msgstr "打印所有可用的命令" |
ef317cd5 | 8690 | |
a0b6b246 JX |
8691 | #: builtin/help.c:43 |
8692 | msgid "exclude guides" | |
8693 | msgstr "排除向导" | |
8694 | ||
8695 | #: builtin/help.c:44 | |
4dcdc3d8 JX |
8696 | msgid "print list of useful guides" |
8697 | msgstr "显示有用的指南列表" | |
8698 | ||
a0b6b246 | 8699 | #: builtin/help.c:45 |
ef317cd5 | 8700 | msgid "show man page" |
07432cef | 8701 | msgstr "显示 man 手册" |
ef317cd5 | 8702 | |
a0b6b246 | 8703 | #: builtin/help.c:46 |
ef317cd5 | 8704 | msgid "show manual in web browser" |
07432cef | 8705 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 8706 | |
a0b6b246 | 8707 | #: builtin/help.c:48 |
ef317cd5 | 8708 | msgid "show info page" |
07432cef | 8709 | msgstr "显示 info 手册" |
ef317cd5 | 8710 | |
a0b6b246 | 8711 | #: builtin/help.c:54 |
814ff314 JX |
8712 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
8713 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 8714 | |
a0b6b246 | 8715 | #: builtin/help.c:66 |
81809b99 | 8716 | #, c-format |
8ada9598 | 8717 | msgid "unrecognized help format '%s'" |
81809b99 | 8718 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 8719 | |
a0b6b246 | 8720 | #: builtin/help.c:93 |
8ada9598 | 8721 | msgid "Failed to start emacsclient." |
81809b99 | 8722 | msgstr "无法启动 emacsclient。" |
8ada9598 | 8723 | |
a0b6b246 | 8724 | #: builtin/help.c:106 |
8ada9598 | 8725 | msgid "Failed to parse emacsclient version." |
81809b99 | 8726 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 8727 | |
a0b6b246 | 8728 | #: builtin/help.c:114 |
8ada9598 JX |
8729 | #, c-format |
8730 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 8731 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 8732 | |
a0b6b246 | 8733 | #: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 |
81809b99 | 8734 | #, c-format |
5b04ee3b JX |
8735 | msgid "failed to exec '%s'" |
8736 | msgstr "无法执行 '%s'" | |
8ada9598 | 8737 | |
a0b6b246 | 8738 | #: builtin/help.c:207 |
8ada9598 JX |
8739 | #, c-format |
8740 | msgid "" | |
8741 | "'%s': path for unsupported man viewer.\n" | |
8742 | "Please consider using 'man.<tool>.cmd' instead." | |
8743 | msgstr "" | |
81809b99 | 8744 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 8745 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 8746 | |
a0b6b246 | 8747 | #: builtin/help.c:219 |
8ada9598 JX |
8748 | #, c-format |
8749 | msgid "" | |
8750 | "'%s': cmd for supported man viewer.\n" | |
8751 | "Please consider using 'man.<tool>.path' instead." | |
8752 | msgstr "" | |
81809b99 | 8753 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 8754 | "请使用 'man.<工具>.path'。" |
8ada9598 | 8755 | |
a0b6b246 | 8756 | #: builtin/help.c:336 |
8ada9598 JX |
8757 | #, c-format |
8758 | msgid "'%s': unknown man viewer." | |
81809b99 | 8759 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 8760 | |
a0b6b246 | 8761 | #: builtin/help.c:353 |
8ada9598 | 8762 | msgid "no man viewer handled the request" |
81809b99 | 8763 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 8764 | |
a0b6b246 | 8765 | #: builtin/help.c:361 |
8ada9598 | 8766 | msgid "no info viewer handled the request" |
81809b99 | 8767 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 8768 | |
a0b6b246 | 8769 | #: builtin/help.c:403 |
4dcdc3d8 JX |
8770 | msgid "Defining attributes per path" |
8771 | msgstr "定义路径的属性" | |
8772 | ||
a0b6b246 | 8773 | #: builtin/help.c:404 |
220c313c JX |
8774 | msgid "Everyday Git With 20 Commands Or So" |
8775 | msgstr "每一天 Git 常用的约 20 条命令" | |
8776 | ||
a0b6b246 | 8777 | #: builtin/help.c:405 |
4dcdc3d8 JX |
8778 | msgid "A Git glossary" |
8779 | msgstr "Git 词汇表" | |
8780 | ||
a0b6b246 | 8781 | #: builtin/help.c:406 |
4dcdc3d8 JX |
8782 | msgid "Specifies intentionally untracked files to ignore" |
8783 | msgstr "忽略指定的未跟踪文件" | |
8784 | ||
a0b6b246 | 8785 | #: builtin/help.c:407 |
4dcdc3d8 JX |
8786 | msgid "Defining submodule properties" |
8787 | msgstr "定义子模组属性" | |
8788 | ||
a0b6b246 | 8789 | #: builtin/help.c:408 |
4dcdc3d8 JX |
8790 | msgid "Specifying revisions and ranges for Git" |
8791 | msgstr "指定 Git 的版本和版本范围" | |
8792 | ||
a0b6b246 | 8793 | #: builtin/help.c:409 |
4dcdc3d8 JX |
8794 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
8795 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
8796 | ||
a0b6b246 | 8797 | #: builtin/help.c:410 |
4dcdc3d8 JX |
8798 | msgid "An overview of recommended workflows with Git" |
8799 | msgstr "Git 推荐的工作流概览" | |
8800 | ||
a0b6b246 | 8801 | #: builtin/help.c:422 |
4dcdc3d8 JX |
8802 | msgid "The common Git guides are:\n" |
8803 | msgstr "最常用的 Git 向导有:\n" | |
8804 | ||
a0b6b246 | 8805 | #: builtin/help.c:440 |
8ada9598 JX |
8806 | #, c-format |
8807 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 8808 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 8809 | |
a0b6b246 JX |
8810 | #: builtin/help.c:462 builtin/help.c:479 |
8811 | #, c-format | |
8812 | msgid "usage: %s%s" | |
8813 | msgstr "用法:%s%s" | |
8814 | ||
8815 | #: builtin/index-pack.c:154 | |
6acbf033 JX |
8816 | #, c-format |
8817 | msgid "unable to open %s" | |
8818 | msgstr "不能打开 %s" | |
8819 | ||
a0b6b246 | 8820 | #: builtin/index-pack.c:204 |
8ada9598 JX |
8821 | #, c-format |
8822 | msgid "object type mismatch at %s" | |
81809b99 | 8823 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 8824 | |
a0b6b246 | 8825 | #: builtin/index-pack.c:224 |
6acbf033 JX |
8826 | #, c-format |
8827 | msgid "did not receive expected object %s" | |
a0b6b246 | 8828 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 8829 | |
a0b6b246 | 8830 | #: builtin/index-pack.c:227 |
6acbf033 JX |
8831 | #, c-format |
8832 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 8833 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 8834 | |
a0b6b246 | 8835 | #: builtin/index-pack.c:269 |
81809b99 | 8836 | #, c-format |
8ada9598 JX |
8837 | msgid "cannot fill %d byte" |
8838 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 8839 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 8840 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 8841 | |
a0b6b246 | 8842 | #: builtin/index-pack.c:279 |
8ada9598 | 8843 | msgid "early EOF" |
81809b99 | 8844 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 8845 | |
a0b6b246 | 8846 | #: builtin/index-pack.c:280 |
8ada9598 | 8847 | msgid "read error on input" |
81809b99 | 8848 | msgstr "输入上的读错误" |
8ada9598 | 8849 | |
a0b6b246 | 8850 | #: builtin/index-pack.c:292 |
8ada9598 | 8851 | msgid "used more bytes than were available" |
81809b99 | 8852 | msgstr "用掉了超过可用的字节" |
8ada9598 | 8853 | |
a0b6b246 | 8854 | #: builtin/index-pack.c:299 |
8ada9598 | 8855 | msgid "pack too large for current definition of off_t" |
81809b99 | 8856 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 8857 | |
a0b6b246 JX |
8858 | #: builtin/index-pack.c:302 builtin/unpack-objects.c:92 |
8859 | msgid "pack exceeds maximum allowed size" | |
8860 | msgstr "包超过了最大允许值" | |
8861 | ||
8862 | #: builtin/index-pack.c:317 | |
81809b99 | 8863 | #, c-format |
8ada9598 | 8864 | msgid "unable to create '%s'" |
81809b99 | 8865 | msgstr "不能创建 '%s'" |
8ada9598 | 8866 | |
87cb7997 | 8867 | #: builtin/index-pack.c:323 |
81809b99 | 8868 | #, c-format |
8ada9598 | 8869 | msgid "cannot open packfile '%s'" |
81809b99 | 8870 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 8871 | |
87cb7997 | 8872 | #: builtin/index-pack.c:337 |
8ada9598 | 8873 | msgid "pack signature mismatch" |
81809b99 | 8874 | msgstr "包签名不匹配" |
8ada9598 | 8875 | |
87cb7997 | 8876 | #: builtin/index-pack.c:339 |
ef317cd5 JX |
8877 | #, c-format |
8878 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 8879 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 8880 | |
87cb7997 | 8881 | #: builtin/index-pack.c:357 |
8ada9598 | 8882 | #, c-format |
5c57d762 JX |
8883 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
8884 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 8885 | |
87cb7997 | 8886 | #: builtin/index-pack.c:479 |
8ada9598 JX |
8887 | #, c-format |
8888 | msgid "inflate returned %d" | |
81809b99 | 8889 | msgstr "解压缩返回 %d" |
8ada9598 | 8890 | |
87cb7997 | 8891 | #: builtin/index-pack.c:528 |
8ada9598 | 8892 | msgid "offset value overflow for delta base object" |
81809b99 | 8893 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 8894 | |
87cb7997 | 8895 | #: builtin/index-pack.c:536 |
8ada9598 | 8896 | msgid "delta base offset is out of bound" |
81809b99 | 8897 | msgstr "delta 基准偏移越界" |
8ada9598 | 8898 | |
87cb7997 | 8899 | #: builtin/index-pack.c:544 |
81809b99 | 8900 | #, c-format |
8ada9598 | 8901 | msgid "unknown object type %d" |
81809b99 | 8902 | msgstr "未知对象类型 %d" |
8ada9598 | 8903 | |
87cb7997 | 8904 | #: builtin/index-pack.c:575 |
8ada9598 | 8905 | msgid "cannot pread pack file" |
81809b99 | 8906 | msgstr "无法读取包文件" |
8ada9598 | 8907 | |
87cb7997 | 8908 | #: builtin/index-pack.c:577 |
8ada9598 | 8909 | #, c-format |
5c57d762 JX |
8910 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
8911 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
8912 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8913 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 8914 | |
87cb7997 | 8915 | #: builtin/index-pack.c:603 |
8ada9598 | 8916 | msgid "serious inflate inconsistency" |
81809b99 | 8917 | msgstr "解压缩严重的不一致" |
8ada9598 | 8918 | |
87cb7997 JX |
8919 | #: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 |
8920 | #: builtin/index-pack.c:816 builtin/index-pack.c:825 | |
8ada9598 JX |
8921 | #, c-format |
8922 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 8923 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 8924 | |
87cb7997 JX |
8925 | #: builtin/index-pack.c:752 builtin/pack-objects.c:164 |
8926 | #: builtin/pack-objects.c:257 | |
6792b93b JX |
8927 | #, c-format |
8928 | msgid "unable to read %s" | |
8929 | msgstr "不能读 %s" | |
8930 | ||
87cb7997 JX |
8931 | #: builtin/index-pack.c:814 |
8932 | #, c-format | |
8933 | msgid "cannot read existing object info %s" | |
8934 | msgstr "不能读取现存对象信息 %s" | |
8935 | ||
8936 | #: builtin/index-pack.c:822 | |
6792b93b JX |
8937 | #, c-format |
8938 | msgid "cannot read existing object %s" | |
8939 | msgstr "不能读取现存对象 %s" | |
8940 | ||
87cb7997 | 8941 | #: builtin/index-pack.c:836 |
81809b99 | 8942 | #, c-format |
8ada9598 | 8943 | msgid "invalid blob object %s" |
160fb2b2 | 8944 | msgstr "无效的数据对象 %s" |
8ada9598 | 8945 | |
87cb7997 | 8946 | #: builtin/index-pack.c:850 |
81809b99 | 8947 | #, c-format |
8ada9598 | 8948 | msgid "invalid %s" |
81809b99 | 8949 | msgstr "无效的 %s" |
8ada9598 | 8950 | |
87cb7997 | 8951 | #: builtin/index-pack.c:853 |
8ada9598 | 8952 | msgid "Error in object" |
81809b99 | 8953 | msgstr "对象中出错" |
8ada9598 | 8954 | |
87cb7997 | 8955 | #: builtin/index-pack.c:855 |
8ada9598 JX |
8956 | #, c-format |
8957 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 8958 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 8959 | |
87cb7997 | 8960 | #: builtin/index-pack.c:927 builtin/index-pack.c:958 |
8ada9598 | 8961 | msgid "failed to apply delta" |
81809b99 | 8962 | msgstr "无法应用 delta" |
8ada9598 | 8963 | |
87cb7997 | 8964 | #: builtin/index-pack.c:1128 |
8ada9598 | 8965 | msgid "Receiving objects" |
81809b99 | 8966 | msgstr "接收对象中" |
8ada9598 | 8967 | |
87cb7997 | 8968 | #: builtin/index-pack.c:1128 |
8ada9598 | 8969 | msgid "Indexing objects" |
81809b99 | 8970 | msgstr "索引对象中" |
8ada9598 | 8971 | |
87cb7997 | 8972 | #: builtin/index-pack.c:1160 |
8ada9598 | 8973 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 8974 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 8975 | |
87cb7997 | 8976 | #: builtin/index-pack.c:1165 |
8ada9598 | 8977 | msgid "cannot fstat packfile" |
65e2041e | 8978 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 8979 | |
87cb7997 | 8980 | #: builtin/index-pack.c:1168 |
8ada9598 | 8981 | msgid "pack has junk at the end" |
81809b99 | 8982 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 8983 | |
87cb7997 | 8984 | #: builtin/index-pack.c:1179 |
6792b93b JX |
8985 | msgid "confusion beyond insanity in parse_pack_objects()" |
8986 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
8987 | ||
87cb7997 | 8988 | #: builtin/index-pack.c:1202 |
8ada9598 | 8989 | msgid "Resolving deltas" |
81809b99 | 8990 | msgstr "处理 delta 中" |
8ada9598 | 8991 | |
87cb7997 | 8992 | #: builtin/index-pack.c:1213 |
07432cef | 8993 | #, c-format |
ef317cd5 | 8994 | msgid "unable to create thread: %s" |
07432cef | 8995 | msgstr "不能创建线程:%s" |
ef317cd5 | 8996 | |
87cb7997 | 8997 | #: builtin/index-pack.c:1255 |
8ada9598 | 8998 | msgid "confusion beyond insanity" |
81809b99 | 8999 | msgstr "不可理喻" |
8ada9598 | 9000 | |
87cb7997 | 9001 | #: builtin/index-pack.c:1261 |
ef317cd5 | 9002 | #, c-format |
5b04ee3b JX |
9003 | msgid "completed with %d local object" |
9004 | msgid_plural "completed with %d local objects" | |
9005 | msgstr[0] "完成 %d 个本地对象" | |
9006 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 9007 | |
87cb7997 | 9008 | #: builtin/index-pack.c:1273 |
ef317cd5 JX |
9009 | #, c-format |
9010 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 9011 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 9012 | |
87cb7997 | 9013 | #: builtin/index-pack.c:1277 |
8ada9598 JX |
9014 | #, c-format |
9015 | msgid "pack has %d unresolved delta" | |
9016 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 9017 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 9018 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 9019 | |
87cb7997 | 9020 | #: builtin/index-pack.c:1301 |
81809b99 | 9021 | #, c-format |
8ada9598 | 9022 | msgid "unable to deflate appended object (%d)" |
07432cef | 9023 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 9024 | |
87cb7997 | 9025 | #: builtin/index-pack.c:1377 |
8ada9598 JX |
9026 | #, c-format |
9027 | msgid "local object %s is corrupt" | |
81809b99 | 9028 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 9029 | |
87cb7997 | 9030 | #: builtin/index-pack.c:1403 |
8ada9598 | 9031 | msgid "error while closing pack file" |
81809b99 | 9032 | msgstr "关闭包文件时出错" |
8ada9598 | 9033 | |
87cb7997 | 9034 | #: builtin/index-pack.c:1415 |
81809b99 | 9035 | #, c-format |
8ada9598 | 9036 | msgid "cannot write keep file '%s'" |
81809b99 | 9037 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 9038 | |
87cb7997 | 9039 | #: builtin/index-pack.c:1423 |
81809b99 | 9040 | #, c-format |
8ada9598 | 9041 | msgid "cannot close written keep file '%s'" |
81809b99 | 9042 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 9043 | |
87cb7997 | 9044 | #: builtin/index-pack.c:1433 |
8ada9598 | 9045 | msgid "cannot store pack file" |
81809b99 | 9046 | msgstr "无法存储包文件" |
8ada9598 | 9047 | |
87cb7997 | 9048 | #: builtin/index-pack.c:1441 |
8ada9598 | 9049 | msgid "cannot store index file" |
81809b99 | 9050 | msgstr "无法存储索引文件" |
8ada9598 | 9051 | |
87cb7997 | 9052 | #: builtin/index-pack.c:1479 |
07432cef | 9053 | #, c-format |
ef317cd5 | 9054 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 9055 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 9056 | |
87cb7997 | 9057 | #: builtin/index-pack.c:1489 builtin/index-pack.c:1686 |
ef317cd5 JX |
9058 | #, c-format |
9059 | msgid "no threads support, ignoring %s" | |
07432cef | 9060 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 9061 | |
87cb7997 | 9062 | #: builtin/index-pack.c:1547 |
81809b99 | 9063 | #, c-format |
8ada9598 | 9064 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 9065 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 9066 | |
87cb7997 | 9067 | #: builtin/index-pack.c:1549 |
81809b99 | 9068 | #, c-format |
8ada9598 | 9069 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 9070 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 9071 | |
87cb7997 | 9072 | #: builtin/index-pack.c:1596 |
81809b99 | 9073 | #, c-format |
8ada9598 JX |
9074 | msgid "non delta: %d object" |
9075 | msgid_plural "non delta: %d objects" | |
81809b99 | 9076 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 9077 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 9078 | |
87cb7997 | 9079 | #: builtin/index-pack.c:1603 |
8ada9598 JX |
9080 | #, c-format |
9081 | msgid "chain length = %d: %lu object" | |
9082 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 9083 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 9084 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 9085 | |
87cb7997 | 9086 | #: builtin/index-pack.c:1616 |
5b04ee3b JX |
9087 | #, c-format |
9088 | msgid "packfile name '%s' does not end with '.pack'" | |
9089 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
9090 | ||
87cb7997 JX |
9091 | #: builtin/index-pack.c:1698 builtin/index-pack.c:1701 |
9092 | #: builtin/index-pack.c:1717 builtin/index-pack.c:1721 | |
81809b99 | 9093 | #, c-format |
8ada9598 | 9094 | msgid "bad %s" |
81809b99 | 9095 | msgstr "错误选项 %s" |
8ada9598 | 9096 | |
87cb7997 | 9097 | #: builtin/index-pack.c:1737 |
8ada9598 | 9098 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 9099 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 9100 | |
87cb7997 | 9101 | #: builtin/index-pack.c:1739 |
1a79b2f1 JX |
9102 | msgid "--stdin requires a git repository" |
9103 | msgstr "--stdin 需要一个 git 仓库" | |
9104 | ||
87cb7997 | 9105 | #: builtin/index-pack.c:1747 |
8ada9598 | 9106 | msgid "--verify with no packfile name given" |
dbd6cced | 9107 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 9108 | |
a0b6b246 | 9109 | #: builtin/init-db.c:54 |
c04f5ac3 JX |
9110 | #, c-format |
9111 | msgid "cannot stat '%s'" | |
65e2041e | 9112 | msgstr "不能对 '%s' 调用 stat" |
c04f5ac3 | 9113 | |
a0b6b246 | 9114 | #: builtin/init-db.c:60 |
c04f5ac3 JX |
9115 | #, c-format |
9116 | msgid "cannot stat template '%s'" | |
65e2041e | 9117 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 9118 | |
a0b6b246 | 9119 | #: builtin/init-db.c:65 |
c04f5ac3 JX |
9120 | #, c-format |
9121 | msgid "cannot opendir '%s'" | |
9122 | msgstr "不能打开目录 '%s'" | |
9123 | ||
a0b6b246 | 9124 | #: builtin/init-db.c:76 |
c04f5ac3 JX |
9125 | #, c-format |
9126 | msgid "cannot readlink '%s'" | |
9127 | msgstr "不能读取链接 '%s'" | |
9128 | ||
a0b6b246 | 9129 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
9130 | #, c-format |
9131 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 9132 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 9133 | |
a0b6b246 | 9134 | #: builtin/init-db.c:84 |
c04f5ac3 JX |
9135 | #, c-format |
9136 | msgid "cannot copy '%s' to '%s'" | |
9137 | msgstr "不能拷贝 '%s' 至 '%s'" | |
9138 | ||
a0b6b246 | 9139 | #: builtin/init-db.c:88 |
c04f5ac3 JX |
9140 | #, c-format |
9141 | msgid "ignoring template %s" | |
9142 | msgstr "忽略模版 %s" | |
9143 | ||
a0b6b246 | 9144 | #: builtin/init-db.c:119 |
c04f5ac3 JX |
9145 | #, c-format |
9146 | msgid "templates not found %s" | |
9147 | msgstr "模版未找到 %s" | |
9148 | ||
a0b6b246 | 9149 | #: builtin/init-db.c:134 |
c04f5ac3 | 9150 | #, c-format |
5b04ee3b JX |
9151 | msgid "not copying templates from '%s': %s" |
9152 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 9153 | |
a0b6b246 | 9154 | #: builtin/init-db.c:327 |
c04f5ac3 JX |
9155 | #, c-format |
9156 | msgid "unable to handle file type %d" | |
9157 | msgstr "不能处理 %d 类型的文件" | |
9158 | ||
a0b6b246 | 9159 | #: builtin/init-db.c:330 |
c04f5ac3 JX |
9160 | #, c-format |
9161 | msgid "unable to move %s to %s" | |
9162 | msgstr "不能移动 %s 至 %s" | |
9163 | ||
a0b6b246 JX |
9164 | #: builtin/init-db.c:347 builtin/init-db.c:350 |
9165 | #, c-format | |
9166 | msgid "%s already exists" | |
9167 | msgstr "%s 已经存在" | |
9168 | ||
9169 | #: builtin/init-db.c:403 | |
c04f5ac3 | 9170 | #, c-format |
5c57d762 JX |
9171 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
9172 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 9173 | |
a0b6b246 | 9174 | #: builtin/init-db.c:404 |
5c57d762 JX |
9175 | #, c-format |
9176 | msgid "Reinitialized existing Git repository in %s%s\n" | |
9177 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 9178 | |
a0b6b246 | 9179 | #: builtin/init-db.c:408 |
5c57d762 JX |
9180 | #, c-format |
9181 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 9182 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 9183 | |
a0b6b246 | 9184 | #: builtin/init-db.c:409 |
5c57d762 JX |
9185 | #, c-format |
9186 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 9187 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 9188 | |
a0b6b246 | 9189 | #: builtin/init-db.c:457 |
ef317cd5 | 9190 | msgid "" |
a77c07d9 | 9191 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 9192 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 9193 | msgstr "" |
07432cef | 9194 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 9195 | "[<目录>]" |
ef317cd5 | 9196 | |
a0b6b246 | 9197 | #: builtin/init-db.c:480 |
ef317cd5 | 9198 | msgid "permissions" |
07432cef | 9199 | msgstr "权限" |
ef317cd5 | 9200 | |
a0b6b246 | 9201 | #: builtin/init-db.c:481 |
ef317cd5 | 9202 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 9203 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 9204 | |
a0b6b246 | 9205 | #: builtin/init-db.c:515 builtin/init-db.c:520 |
c04f5ac3 JX |
9206 | #, c-format |
9207 | msgid "cannot mkdir %s" | |
9208 | msgstr "不能创建目录 %s" | |
9209 | ||
a0b6b246 | 9210 | #: builtin/init-db.c:524 |
c04f5ac3 JX |
9211 | #, c-format |
9212 | msgid "cannot chdir to %s" | |
9213 | msgstr "不能切换目录到 %s" | |
9214 | ||
a0b6b246 | 9215 | #: builtin/init-db.c:545 |
c04f5ac3 JX |
9216 | #, c-format |
9217 | msgid "" | |
9218 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
9219 | "dir=<directory>)" | |
1e607449 | 9220 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 9221 | |
a0b6b246 | 9222 | #: builtin/init-db.c:573 |
c04f5ac3 JX |
9223 | #, c-format |
9224 | msgid "Cannot access work tree '%s'" | |
9225 | msgstr "不能访问工作区 '%s'" | |
9226 | ||
220c313c JX |
9227 | #: builtin/interpret-trailers.c:15 |
9228 | msgid "" | |
276ceeaa JX |
9229 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
9230 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
9231 | msgstr "" |
9232 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
9233 | ">])...] [<文件>...]" | |
276ceeaa JX |
9234 | |
9235 | #: builtin/interpret-trailers.c:26 | |
9236 | msgid "edit files in place" | |
9237 | msgstr "在原位编辑文件" | |
220c313c | 9238 | |
276ceeaa | 9239 | #: builtin/interpret-trailers.c:27 |
220c313c JX |
9240 | msgid "trim empty trailers" |
9241 | msgstr "删除空签名" | |
9242 | ||
276ceeaa | 9243 | #: builtin/interpret-trailers.c:28 |
220c313c JX |
9244 | msgid "trailer" |
9245 | msgstr "签名" | |
9246 | ||
276ceeaa | 9247 | #: builtin/interpret-trailers.c:29 |
220c313c JX |
9248 | msgid "trailer(s) to add" |
9249 | msgstr "要添加的签名" | |
9250 | ||
276ceeaa JX |
9251 | #: builtin/interpret-trailers.c:42 |
9252 | msgid "no input file given for in-place editing" | |
9253 | msgstr "没有给出要原位编辑的文件" | |
9254 | ||
5c57d762 | 9255 | #: builtin/log.c:44 |
7aea43ff | 9256 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 9257 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 9258 | |
5c57d762 | 9259 | #: builtin/log.c:45 |
814ff314 JX |
9260 | msgid "git show [<options>] <object>..." |
9261 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 9262 | |
87cb7997 | 9263 | #: builtin/log.c:89 |
220c313c JX |
9264 | #, c-format |
9265 | msgid "invalid --decorate option: %s" | |
9266 | msgstr "无效的 --decorate 选项:%s" | |
9267 | ||
87cb7997 | 9268 | #: builtin/log.c:144 |
ef317cd5 | 9269 | msgid "suppress diff output" |
07432cef | 9270 | msgstr "不显示差异输出" |
ef317cd5 | 9271 | |
87cb7997 | 9272 | #: builtin/log.c:145 |
ef317cd5 | 9273 | msgid "show source" |
07432cef | 9274 | msgstr "显示源" |
ef317cd5 | 9275 | |
87cb7997 | 9276 | #: builtin/log.c:146 |
07432cef WS |
9277 | msgid "Use mail map file" |
9278 | msgstr "使用邮件映射文件" | |
9279 | ||
87cb7997 | 9280 | #: builtin/log.c:147 |
ef317cd5 | 9281 | msgid "decorate options" |
07432cef | 9282 | msgstr "修饰选项" |
ef317cd5 | 9283 | |
87cb7997 | 9284 | #: builtin/log.c:150 |
220c313c JX |
9285 | msgid "Process line range n,m in file, counting from 1" |
9286 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
9287 | ||
87cb7997 | 9288 | #: builtin/log.c:246 |
c04f5ac3 JX |
9289 | #, c-format |
9290 | msgid "Final output: %d %s\n" | |
9291 | msgstr "最终输出:%d %s\n" | |
9292 | ||
87cb7997 | 9293 | #: builtin/log.c:493 |
220c313c JX |
9294 | #, c-format |
9295 | msgid "git show %s: bad file" | |
9296 | msgstr "git show %s: 损坏的文件" | |
9297 | ||
87cb7997 | 9298 | #: builtin/log.c:507 builtin/log.c:601 |
c04f5ac3 JX |
9299 | #, c-format |
9300 | msgid "Could not read object %s" | |
90e6ef53 | 9301 | msgstr "不能读取对象 %s" |
c04f5ac3 | 9302 | |
87cb7997 | 9303 | #: builtin/log.c:625 |
c04f5ac3 JX |
9304 | #, c-format |
9305 | msgid "Unknown type: %d" | |
9306 | msgstr "未知类型:%d" | |
9307 | ||
87cb7997 | 9308 | #: builtin/log.c:746 |
c04f5ac3 JX |
9309 | msgid "format.headers without value" |
9310 | msgstr "format.headers 没有值" | |
9311 | ||
87cb7997 | 9312 | #: builtin/log.c:846 |
c04f5ac3 JX |
9313 | msgid "name of output directory is too long" |
9314 | msgstr "输出目录名太长" | |
9315 | ||
87cb7997 | 9316 | #: builtin/log.c:861 |
c04f5ac3 JX |
9317 | #, c-format |
9318 | msgid "Cannot open patch file %s" | |
9319 | msgstr "无法打开补丁文件 %s" | |
9320 | ||
87cb7997 | 9321 | #: builtin/log.c:875 |
c04f5ac3 JX |
9322 | msgid "Need exactly one range." |
9323 | msgstr "只需要一个范围。" | |
9324 | ||
87cb7997 | 9325 | #: builtin/log.c:885 |
c04f5ac3 JX |
9326 | msgid "Not a range." |
9327 | msgstr "不是一个范围。" | |
9328 | ||
87cb7997 | 9329 | #: builtin/log.c:991 |
c04f5ac3 JX |
9330 | msgid "Cover letter needs email format" |
9331 | msgstr "信封需要邮件地址格式" | |
9332 | ||
87cb7997 | 9333 | #: builtin/log.c:1071 |
c04f5ac3 JX |
9334 | #, c-format |
9335 | msgid "insane in-reply-to: %s" | |
9336 | msgstr "不正常的 in-reply-to:%s" | |
9337 | ||
87cb7997 | 9338 | #: builtin/log.c:1098 |
814ff314 JX |
9339 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
9340 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 9341 | |
87cb7997 | 9342 | #: builtin/log.c:1148 |
c04f5ac3 JX |
9343 | msgid "Two output directories?" |
9344 | msgstr "两个输出目录?" | |
9345 | ||
87cb7997 | 9346 | #: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 |
5b04ee3b JX |
9347 | #, c-format |
9348 | msgid "Unknown commit %s" | |
9349 | msgstr "未知提交 %s" | |
9350 | ||
87cb7997 | 9351 | #: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 |
5b04ee3b JX |
9352 | #, c-format |
9353 | msgid "Failed to resolve '%s' as a valid ref." | |
9354 | msgstr "无法解析 '%s' 为一个有效引用。" | |
9355 | ||
87cb7997 | 9356 | #: builtin/log.c:1270 |
5b04ee3b JX |
9357 | msgid "Could not find exact merge base." |
9358 | msgstr "不能找到准确的合并基线。" | |
9359 | ||
87cb7997 | 9360 | #: builtin/log.c:1274 |
5b04ee3b JX |
9361 | msgid "" |
9362 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
9363 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
9364 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
9365 | msgstr "" | |
9366 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 9367 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
5b04ee3b JX |
9368 | "参数 --base=<base-commit-id> 手动指定一个基线提交。" |
9369 | ||
87cb7997 | 9370 | #: builtin/log.c:1294 |
5b04ee3b JX |
9371 | msgid "Failed to find exact merge base" |
9372 | msgstr "无法找到准确的合并基线" | |
9373 | ||
87cb7997 | 9374 | #: builtin/log.c:1305 |
5b04ee3b JX |
9375 | msgid "base commit should be the ancestor of revision list" |
9376 | msgstr "基线提交应该是版本列表的祖先" | |
9377 | ||
87cb7997 | 9378 | #: builtin/log.c:1309 |
5b04ee3b JX |
9379 | msgid "base commit shouldn't be in revision list" |
9380 | msgstr "基线提交不应该出现在版本列表中" | |
9381 | ||
87cb7997 | 9382 | #: builtin/log.c:1358 |
5b04ee3b | 9383 | msgid "cannot get patch id" |
aef18cc6 | 9384 | msgstr "无法得到补丁 id" |
5b04ee3b | 9385 | |
87cb7997 | 9386 | #: builtin/log.c:1415 |
ef317cd5 | 9387 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 9388 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 9389 | |
87cb7997 | 9390 | #: builtin/log.c:1418 |
ef317cd5 | 9391 | msgid "use [PATCH] even with multiple patches" |
07432cef | 9392 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 9393 | |
87cb7997 | 9394 | #: builtin/log.c:1422 |
ef317cd5 | 9395 | msgid "print patches to standard out" |
07432cef | 9396 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 9397 | |
87cb7997 | 9398 | #: builtin/log.c:1424 |
ef317cd5 | 9399 | msgid "generate a cover letter" |
07432cef | 9400 | msgstr "生成一封附信" |
c04f5ac3 | 9401 | |
87cb7997 | 9402 | #: builtin/log.c:1426 |
ef317cd5 | 9403 | msgid "use simple number sequence for output file names" |
07432cef | 9404 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 9405 | |
87cb7997 | 9406 | #: builtin/log.c:1427 |
ef317cd5 | 9407 | msgid "sfx" |
07432cef | 9408 | msgstr "后缀" |
ef317cd5 | 9409 | |
87cb7997 | 9410 | #: builtin/log.c:1428 |
ef317cd5 | 9411 | msgid "use <sfx> instead of '.patch'" |
07432cef | 9412 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 9413 | |
87cb7997 | 9414 | #: builtin/log.c:1430 |
ef317cd5 | 9415 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
9416 | msgstr "补丁以 <n> 开始编号,而不是1" |
9417 | ||
87cb7997 | 9418 | #: builtin/log.c:1432 |
07432cef WS |
9419 | msgid "mark the series as Nth re-roll" |
9420 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 9421 | |
87cb7997 | 9422 | #: builtin/log.c:1434 |
a0b6b246 JX |
9423 | msgid "Use [RFC PATCH] instead of [PATCH]" |
9424 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
9425 | ||
87cb7997 | 9426 | #: builtin/log.c:1437 |
ef317cd5 | 9427 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 9428 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 9429 | |
87cb7997 | 9430 | #: builtin/log.c:1440 |
ef317cd5 | 9431 | msgid "store resulting files in <dir>" |
d9d56b23 | 9432 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 9433 | |
87cb7997 | 9434 | #: builtin/log.c:1443 |
ef317cd5 | 9435 | msgid "don't strip/add [PATCH]" |
07432cef | 9436 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 9437 | |
87cb7997 | 9438 | #: builtin/log.c:1446 |
ef317cd5 | 9439 | msgid "don't output binary diffs" |
07432cef | 9440 | msgstr "不输出二进制差异" |
ef317cd5 | 9441 | |
87cb7997 | 9442 | #: builtin/log.c:1448 |
89f80d72 JX |
9443 | msgid "output all-zero hash in From header" |
9444 | msgstr "在 From 头信息中输出全为零的哈希值" | |
9445 | ||
87cb7997 | 9446 | #: builtin/log.c:1450 |
ef317cd5 | 9447 | msgid "don't include a patch matching a commit upstream" |
07432cef | 9448 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 9449 | |
87cb7997 | 9450 | #: builtin/log.c:1452 |
ef317cd5 | 9451 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 9452 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 9453 | |
87cb7997 | 9454 | #: builtin/log.c:1454 |
ef317cd5 | 9455 | msgid "Messaging" |
07432cef | 9456 | msgstr "邮件发送" |
ef317cd5 | 9457 | |
87cb7997 | 9458 | #: builtin/log.c:1455 |
ef317cd5 | 9459 | msgid "header" |
07432cef | 9460 | msgstr "header" |
ef317cd5 | 9461 | |
87cb7997 | 9462 | #: builtin/log.c:1456 |
ef317cd5 | 9463 | msgid "add email header" |
07432cef | 9464 | msgstr "添加邮件头" |
ef317cd5 | 9465 | |
87cb7997 | 9466 | #: builtin/log.c:1457 builtin/log.c:1459 |
ef317cd5 | 9467 | msgid "email" |
07432cef | 9468 | msgstr "邮件地址" |
ef317cd5 | 9469 | |
87cb7997 | 9470 | #: builtin/log.c:1457 |
ef317cd5 | 9471 | msgid "add To: header" |
07432cef | 9472 | msgstr "添加收件人" |
ef317cd5 | 9473 | |
87cb7997 | 9474 | #: builtin/log.c:1459 |
ef317cd5 | 9475 | msgid "add Cc: header" |
07432cef | 9476 | msgstr "添加抄送" |
ef317cd5 | 9477 | |
87cb7997 | 9478 | #: builtin/log.c:1461 |
2e8451e8 | 9479 | msgid "ident" |
d9d56b23 | 9480 | msgstr "标识" |
2e8451e8 | 9481 | |
87cb7997 | 9482 | #: builtin/log.c:1462 |
2e8451e8 | 9483 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 9484 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 9485 | |
87cb7997 | 9486 | #: builtin/log.c:1464 |
ef317cd5 | 9487 | msgid "message-id" |
d9d56b23 | 9488 | msgstr "邮件标识" |
ef317cd5 | 9489 | |
87cb7997 | 9490 | #: builtin/log.c:1465 |
ef317cd5 | 9491 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 9492 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 9493 | |
87cb7997 | 9494 | #: builtin/log.c:1466 builtin/log.c:1469 |
ef317cd5 | 9495 | msgid "boundary" |
07432cef | 9496 | msgstr "边界" |
ef317cd5 | 9497 | |
87cb7997 | 9498 | #: builtin/log.c:1467 |
ef317cd5 | 9499 | msgid "attach the patch" |
07432cef | 9500 | msgstr "附件方式添加补丁" |
ef317cd5 | 9501 | |
87cb7997 | 9502 | #: builtin/log.c:1470 |
ef317cd5 | 9503 | msgid "inline the patch" |
07432cef | 9504 | msgstr "内联显示补丁" |
ef317cd5 | 9505 | |
87cb7997 | 9506 | #: builtin/log.c:1474 |
ef317cd5 | 9507 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 9508 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 9509 | |
87cb7997 | 9510 | #: builtin/log.c:1476 |
ef317cd5 | 9511 | msgid "signature" |
07432cef | 9512 | msgstr "签名" |
ef317cd5 | 9513 | |
87cb7997 | 9514 | #: builtin/log.c:1477 |
ef317cd5 | 9515 | msgid "add a signature" |
07432cef | 9516 | msgstr "添加一个签名" |
ef317cd5 | 9517 | |
87cb7997 | 9518 | #: builtin/log.c:1478 |
5b04ee3b JX |
9519 | msgid "base-commit" |
9520 | msgstr "基线提交" | |
9521 | ||
87cb7997 | 9522 | #: builtin/log.c:1479 |
5b04ee3b JX |
9523 | msgid "add prerequisite tree info to the patch series" |
9524 | msgstr "为补丁列表添加前置树信息" | |
9525 | ||
87cb7997 | 9526 | #: builtin/log.c:1481 |
6acbf033 JX |
9527 | msgid "add a signature from a file" |
9528 | msgstr "从文件添加一个签名" | |
9529 | ||
87cb7997 | 9530 | #: builtin/log.c:1482 |
ef317cd5 | 9531 | msgid "don't print the patch filenames" |
07432cef | 9532 | msgstr "不要打印补丁文件名" |
ef317cd5 | 9533 | |
87cb7997 | 9534 | #: builtin/log.c:1572 |
c04f5ac3 JX |
9535 | msgid "-n and -k are mutually exclusive." |
9536 | msgstr "-n 和 -k 互斥。" | |
9537 | ||
87cb7997 | 9538 | #: builtin/log.c:1574 |
a0b6b246 JX |
9539 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." |
9540 | msgstr "--subject-prefix/--rfc 和 -k 互斥。" | |
c04f5ac3 | 9541 | |
87cb7997 | 9542 | #: builtin/log.c:1582 |
c04f5ac3 JX |
9543 | msgid "--name-only does not make sense" |
9544 | msgstr "--name-only 无意义" | |
9545 | ||
87cb7997 | 9546 | #: builtin/log.c:1584 |
c04f5ac3 JX |
9547 | msgid "--name-status does not make sense" |
9548 | msgstr "--name-status 无意义" | |
9549 | ||
87cb7997 | 9550 | #: builtin/log.c:1586 |
c04f5ac3 JX |
9551 | msgid "--check does not make sense" |
9552 | msgstr "--check 无意义" | |
9553 | ||
87cb7997 | 9554 | #: builtin/log.c:1616 |
c04f5ac3 JX |
9555 | msgid "standard output, or directory, which one?" |
9556 | msgstr "标准输出或目录,哪一个?" | |
9557 | ||
87cb7997 | 9558 | #: builtin/log.c:1618 |
c04f5ac3 JX |
9559 | #, c-format |
9560 | msgid "Could not create directory '%s'" | |
90e6ef53 | 9561 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 9562 | |
87cb7997 | 9563 | #: builtin/log.c:1712 |
6acbf033 JX |
9564 | #, c-format |
9565 | msgid "unable to read signature file '%s'" | |
9566 | msgstr "无法读取签名文件 '%s'" | |
9567 | ||
87cb7997 | 9568 | #: builtin/log.c:1784 |
c04f5ac3 JX |
9569 | msgid "Failed to create output files" |
9570 | msgstr "无法创建输出文件" | |
9571 | ||
87cb7997 | 9572 | #: builtin/log.c:1833 |
ef317cd5 | 9573 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 9574 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 9575 | |
87cb7997 | 9576 | #: builtin/log.c:1887 |
c04f5ac3 JX |
9577 | #, c-format |
9578 | msgid "" | |
9579 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 9580 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 9581 | |
60638e98 | 9582 | #: builtin/ls-files.c:468 |
814ff314 JX |
9583 | msgid "git ls-files [<options>] [<file>...]" |
9584 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 9585 | |
60638e98 | 9586 | #: builtin/ls-files.c:517 |
ef317cd5 | 9587 | msgid "identify the file status with tags" |
07432cef | 9588 | msgstr "用标签标识文件的状态" |
ef317cd5 | 9589 | |
60638e98 | 9590 | #: builtin/ls-files.c:519 |
ef317cd5 | 9591 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 9592 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 9593 | |
60638e98 | 9594 | #: builtin/ls-files.c:521 |
ef317cd5 | 9595 | msgid "show cached files in the output (default)" |
07432cef | 9596 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 9597 | |
60638e98 | 9598 | #: builtin/ls-files.c:523 |
ef317cd5 | 9599 | msgid "show deleted files in the output" |
07432cef | 9600 | msgstr "显示已删除的文件" |
ef317cd5 | 9601 | |
60638e98 | 9602 | #: builtin/ls-files.c:525 |
ef317cd5 | 9603 | msgid "show modified files in the output" |
07432cef | 9604 | msgstr "显示已修改的文件" |
ef317cd5 | 9605 | |
60638e98 | 9606 | #: builtin/ls-files.c:527 |
ef317cd5 | 9607 | msgid "show other files in the output" |
07432cef | 9608 | msgstr "显示其它文件" |
ef317cd5 | 9609 | |
60638e98 | 9610 | #: builtin/ls-files.c:529 |
ef317cd5 | 9611 | msgid "show ignored files in the output" |
07432cef | 9612 | msgstr "显示忽略的文件" |
ef317cd5 | 9613 | |
60638e98 | 9614 | #: builtin/ls-files.c:532 |
ef317cd5 | 9615 | msgid "show staged contents' object name in the output" |
07432cef | 9616 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 9617 | |
60638e98 | 9618 | #: builtin/ls-files.c:534 |
ef317cd5 | 9619 | msgid "show files on the filesystem that need to be removed" |
07432cef | 9620 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 9621 | |
60638e98 | 9622 | #: builtin/ls-files.c:536 |
220c313c | 9623 | msgid "show 'other' directories' names only" |
07432cef | 9624 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 9625 | |
60638e98 | 9626 | #: builtin/ls-files.c:538 |
276ceeaa JX |
9627 | msgid "show line endings of files" |
9628 | msgstr "显示文件换行符格式" | |
9629 | ||
60638e98 | 9630 | #: builtin/ls-files.c:540 |
ef317cd5 | 9631 | msgid "don't show empty directories" |
07432cef | 9632 | msgstr "不显示空目录" |
ef317cd5 | 9633 | |
60638e98 | 9634 | #: builtin/ls-files.c:543 |
ef317cd5 | 9635 | msgid "show unmerged files in the output" |
07432cef | 9636 | msgstr "显示未合并的文件" |
ef317cd5 | 9637 | |
60638e98 | 9638 | #: builtin/ls-files.c:545 |
ef317cd5 | 9639 | msgid "show resolve-undo information" |
07432cef | 9640 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 9641 | |
60638e98 | 9642 | #: builtin/ls-files.c:547 |
ef317cd5 | 9643 | msgid "skip files matching pattern" |
07432cef | 9644 | msgstr "匹配排除文件的模式" |
ef317cd5 | 9645 | |
60638e98 | 9646 | #: builtin/ls-files.c:550 |
ef317cd5 | 9647 | msgid "exclude patterns are read from <file>" |
07432cef | 9648 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 9649 | |
60638e98 | 9650 | #: builtin/ls-files.c:553 |
ef317cd5 | 9651 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 9652 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 9653 | |
60638e98 | 9654 | #: builtin/ls-files.c:555 |
ef317cd5 | 9655 | msgid "add the standard git exclusions" |
07432cef | 9656 | msgstr "添加标准的 git 排除" |
ef317cd5 | 9657 | |
60638e98 | 9658 | #: builtin/ls-files.c:558 |
ef317cd5 | 9659 | msgid "make the output relative to the project top directory" |
07432cef | 9660 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 9661 | |
60638e98 | 9662 | #: builtin/ls-files.c:561 |
a0b6b246 JX |
9663 | msgid "recurse through submodules" |
9664 | msgstr "在子模组中递归" | |
9665 | ||
60638e98 | 9666 | #: builtin/ls-files.c:563 |
ef317cd5 | 9667 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 9668 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 9669 | |
60638e98 | 9670 | #: builtin/ls-files.c:564 |
ef317cd5 | 9671 | msgid "tree-ish" |
07432cef | 9672 | msgstr "树或提交" |
ef317cd5 | 9673 | |
60638e98 | 9674 | #: builtin/ls-files.c:565 |
ef317cd5 | 9675 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 9676 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 9677 | |
60638e98 | 9678 | #: builtin/ls-files.c:567 |
ef317cd5 | 9679 | msgid "show debugging data" |
07432cef | 9680 | msgstr "显示调试数据" |
ef317cd5 | 9681 | |
276ceeaa JX |
9682 | #: builtin/ls-remote.c:7 |
9683 | msgid "" | |
9684 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
9685 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
9686 | " [--symref] [<repository> [<refs>...]]" | |
9687 | msgstr "" | |
9688 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
9689 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
9690 | " [--symref] [<仓库> [<引用>...]]" | |
9691 | ||
87cb7997 | 9692 | #: builtin/ls-remote.c:52 |
276ceeaa JX |
9693 | msgid "do not print remote URL" |
9694 | msgstr "不打印远程 URL" | |
9695 | ||
87cb7997 | 9696 | #: builtin/ls-remote.c:53 builtin/ls-remote.c:55 |
276ceeaa JX |
9697 | msgid "exec" |
9698 | msgstr "exec" | |
9699 | ||
87cb7997 | 9700 | #: builtin/ls-remote.c:54 builtin/ls-remote.c:56 |
276ceeaa JX |
9701 | msgid "path of git-upload-pack on the remote host" |
9702 | msgstr "远程主机上的 git-upload-pack 路径" | |
9703 | ||
87cb7997 | 9704 | #: builtin/ls-remote.c:58 |
276ceeaa JX |
9705 | msgid "limit to tags" |
9706 | msgstr "仅限于标签" | |
9707 | ||
87cb7997 | 9708 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
9709 | msgid "limit to heads" |
9710 | msgstr "仅限于分支" | |
9711 | ||
87cb7997 | 9712 | #: builtin/ls-remote.c:60 |
276ceeaa JX |
9713 | msgid "do not show peeled tags" |
9714 | msgstr "不显示已解析的标签" | |
9715 | ||
87cb7997 | 9716 | #: builtin/ls-remote.c:62 |
276ceeaa JX |
9717 | msgid "take url.<base>.insteadOf into account" |
9718 | msgstr "参考 url.<base>.insteadOf 设置" | |
9719 | ||
87cb7997 | 9720 | #: builtin/ls-remote.c:64 |
276ceeaa JX |
9721 | msgid "exit with exit code 2 if no matching refs are found" |
9722 | msgstr "若未找到匹配的引用则以退出码2退出" | |
9723 | ||
87cb7997 | 9724 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
9725 | msgid "show underlying ref in addition to the object pointed by it" |
9726 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
9727 | ||
90314792 | 9728 | #: builtin/ls-tree.c:28 |
ef317cd5 | 9729 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 9730 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 9731 | |
1a79b2f1 | 9732 | #: builtin/ls-tree.c:126 |
ef317cd5 | 9733 | msgid "only show trees" |
07432cef | 9734 | msgstr "只显示树" |
ef317cd5 | 9735 | |
1a79b2f1 | 9736 | #: builtin/ls-tree.c:128 |
ef317cd5 | 9737 | msgid "recurse into subtrees" |
07432cef | 9738 | msgstr "递归到子树" |
ef317cd5 | 9739 | |
1a79b2f1 | 9740 | #: builtin/ls-tree.c:130 |
ef317cd5 | 9741 | msgid "show trees when recursing" |
07432cef | 9742 | msgstr "当递归时显示树" |
ef317cd5 | 9743 | |
1a79b2f1 | 9744 | #: builtin/ls-tree.c:133 |
ef317cd5 | 9745 | msgid "terminate entries with NUL byte" |
4375c10e | 9746 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 9747 | |
1a79b2f1 | 9748 | #: builtin/ls-tree.c:134 |
ef317cd5 | 9749 | msgid "include object size" |
07432cef | 9750 | msgstr "包括对象大小" |
ef317cd5 | 9751 | |
1a79b2f1 | 9752 | #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 |
ef317cd5 | 9753 | msgid "list only filenames" |
07432cef | 9754 | msgstr "只列出文件名" |
ef317cd5 | 9755 | |
1a79b2f1 | 9756 | #: builtin/ls-tree.c:141 |
ef317cd5 | 9757 | msgid "use full path names" |
07432cef | 9758 | msgstr "使用文件的全路径" |
ef317cd5 | 9759 | |
1a79b2f1 | 9760 | #: builtin/ls-tree.c:143 |
ef317cd5 | 9761 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 9762 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 9763 | |
5c57d762 | 9764 | #: builtin/merge.c:46 |
814ff314 JX |
9765 | msgid "git merge [<options>] [<commit>...]" |
9766 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 9767 | |
5c57d762 | 9768 | #: builtin/merge.c:47 |
ef317cd5 | 9769 | msgid "git merge --abort" |
07432cef | 9770 | msgstr "git merge --abort" |
ef317cd5 | 9771 | |
87cb7997 | 9772 | #: builtin/merge.c:48 |
1a79b2f1 JX |
9773 | msgid "git merge --continue" |
9774 | msgstr "git merge --continue" | |
9775 | ||
87cb7997 | 9776 | #: builtin/merge.c:103 |
c04f5ac3 JX |
9777 | msgid "switch `m' requires a value" |
9778 | msgstr "开关 `m' 需要一个值" | |
9779 | ||
87cb7997 | 9780 | #: builtin/merge.c:140 |
c04f5ac3 JX |
9781 | #, c-format |
9782 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 9783 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 9784 | |
87cb7997 | 9785 | #: builtin/merge.c:141 |
c04f5ac3 JX |
9786 | #, c-format |
9787 | msgid "Available strategies are:" | |
9788 | msgstr "可用的策略有:" | |
9789 | ||
87cb7997 | 9790 | #: builtin/merge.c:146 |
c04f5ac3 JX |
9791 | #, c-format |
9792 | msgid "Available custom strategies are:" | |
9793 | msgstr "可用的自定义策略有:" | |
9794 | ||
87cb7997 | 9795 | #: builtin/merge.c:196 builtin/pull.c:127 |
ef317cd5 | 9796 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 9797 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 9798 | |
87cb7997 | 9799 | #: builtin/merge.c:199 builtin/pull.c:130 |
ef317cd5 | 9800 | msgid "show a diffstat at the end of the merge" |
07432cef | 9801 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 9802 | |
87cb7997 | 9803 | #: builtin/merge.c:200 builtin/pull.c:133 |
ef317cd5 | 9804 | msgid "(synonym to --stat)" |
07432cef | 9805 | msgstr "(和 --stat 同义)" |
ef317cd5 | 9806 | |
87cb7997 | 9807 | #: builtin/merge.c:202 builtin/pull.c:136 |
ef317cd5 | 9808 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 9809 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 9810 | |
87cb7997 | 9811 | #: builtin/merge.c:205 builtin/pull.c:139 |
ef317cd5 | 9812 | msgid "create a single commit instead of doing a merge" |
07432cef | 9813 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 9814 | |
87cb7997 | 9815 | #: builtin/merge.c:207 builtin/pull.c:142 |
ef317cd5 | 9816 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 9817 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 9818 | |
87cb7997 | 9819 | #: builtin/merge.c:209 builtin/pull.c:145 |
ef317cd5 | 9820 | msgid "edit message before committing" |
07432cef | 9821 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 9822 | |
87cb7997 | 9823 | #: builtin/merge.c:210 |
ef317cd5 | 9824 | msgid "allow fast-forward (default)" |
07432cef | 9825 | msgstr "允许快进(默认)" |
ef317cd5 | 9826 | |
87cb7997 | 9827 | #: builtin/merge.c:212 builtin/pull.c:151 |
ef317cd5 | 9828 | msgid "abort if fast-forward is not possible" |
07432cef | 9829 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 9830 | |
87cb7997 | 9831 | #: builtin/merge.c:216 builtin/pull.c:154 |
5c57d762 | 9832 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
9833 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
9834 | ||
87cb7997 JX |
9835 | #: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 |
9836 | #: builtin/revert.c:108 | |
ef317cd5 | 9837 | msgid "strategy" |
07432cef | 9838 | msgstr "策略" |
ef317cd5 | 9839 | |
87cb7997 | 9840 | #: builtin/merge.c:218 builtin/pull.c:159 |
ef317cd5 | 9841 | msgid "merge strategy to use" |
07432cef | 9842 | msgstr "要使用的合并策略" |
ef317cd5 | 9843 | |
87cb7997 | 9844 | #: builtin/merge.c:219 builtin/pull.c:162 |
ef317cd5 | 9845 | msgid "option=value" |
07432cef | 9846 | msgstr "option=value" |
ef317cd5 | 9847 | |
87cb7997 | 9848 | #: builtin/merge.c:220 builtin/pull.c:163 |
ef317cd5 | 9849 | msgid "option for selected merge strategy" |
07432cef | 9850 | msgstr "所选的合并策略的选项" |
ef317cd5 | 9851 | |
87cb7997 | 9852 | #: builtin/merge.c:222 |
ef317cd5 | 9853 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 9854 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 9855 | |
87cb7997 | 9856 | #: builtin/merge.c:226 |
ef317cd5 | 9857 | msgid "abort the current in-progress merge" |
07432cef | 9858 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 9859 | |
87cb7997 | 9860 | #: builtin/merge.c:228 |
1a79b2f1 JX |
9861 | msgid "continue the current in-progress merge" |
9862 | msgstr "继续当前正在进行的合并" | |
9863 | ||
87cb7997 | 9864 | #: builtin/merge.c:230 builtin/pull.c:170 |
5b04ee3b JX |
9865 | msgid "allow merging unrelated histories" |
9866 | msgstr "允许合并不相关的历史" | |
9867 | ||
87cb7997 | 9868 | #: builtin/merge.c:258 |
c04f5ac3 JX |
9869 | msgid "could not run stash." |
9870 | msgstr "不能进行进度保存。" | |
9871 | ||
87cb7997 | 9872 | #: builtin/merge.c:263 |
c04f5ac3 JX |
9873 | msgid "stash failed" |
9874 | msgstr "进度保存失败" | |
9875 | ||
87cb7997 | 9876 | #: builtin/merge.c:268 |
c04f5ac3 JX |
9877 | #, c-format |
9878 | msgid "not a valid object: %s" | |
9879 | msgstr "不是一个有效对象:%s" | |
9880 | ||
87cb7997 | 9881 | #: builtin/merge.c:287 builtin/merge.c:304 |
c04f5ac3 JX |
9882 | msgid "read-tree failed" |
9883 | msgstr "读取树失败" | |
9884 | ||
90e6ef53 | 9885 | # 译者:注意保持前导空格 |
87cb7997 | 9886 | #: builtin/merge.c:334 |
c04f5ac3 JX |
9887 | msgid " (nothing to squash)" |
9888 | msgstr " (无可压缩)" | |
9889 | ||
87cb7997 | 9890 | #: builtin/merge.c:345 |
c04f5ac3 JX |
9891 | #, c-format |
9892 | msgid "Squash commit -- not updating HEAD\n" | |
9893 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
9894 | ||
87cb7997 | 9895 | #: builtin/merge.c:395 |
c04f5ac3 JX |
9896 | #, c-format |
9897 | msgid "No merge message -- not updating HEAD\n" | |
9898 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
9899 | ||
87cb7997 | 9900 | #: builtin/merge.c:446 |
c04f5ac3 JX |
9901 | #, c-format |
9902 | msgid "'%s' does not point to a commit" | |
9903 | msgstr "'%s' 没有指向一个提交" | |
9904 | ||
87cb7997 | 9905 | #: builtin/merge.c:536 |
c04f5ac3 JX |
9906 | #, c-format |
9907 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 9908 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 9909 | |
1a79b2f1 | 9910 | #: builtin/merge.c:656 |
c04f5ac3 | 9911 | msgid "Not handling anything other than two heads merge." |
29004bbb | 9912 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 9913 | |
1a79b2f1 | 9914 | #: builtin/merge.c:670 |
c04f5ac3 JX |
9915 | #, c-format |
9916 | msgid "Unknown option for merge-recursive: -X%s" | |
9917 | msgstr "merge-recursive 的未知选项:-X%s" | |
9918 | ||
1a79b2f1 | 9919 | #: builtin/merge.c:685 |
c04f5ac3 JX |
9920 | #, c-format |
9921 | msgid "unable to write %s" | |
9922 | msgstr "不能写 %s" | |
9923 | ||
1a79b2f1 | 9924 | #: builtin/merge.c:737 |
c04f5ac3 JX |
9925 | #, c-format |
9926 | msgid "Could not read from '%s'" | |
9927 | msgstr "不能从 '%s' 读取" | |
9928 | ||
1a79b2f1 | 9929 | #: builtin/merge.c:746 |
c04f5ac3 JX |
9930 | #, c-format |
9931 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
9932 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
9933 | ||
1a79b2f1 | 9934 | #: builtin/merge.c:752 |
a77c07d9 | 9935 | #, c-format |
c04f5ac3 JX |
9936 | msgid "" |
9937 | "Please enter a commit message to explain why this merge is necessary,\n" | |
9938 | "especially if it merges an updated upstream into a topic branch.\n" | |
9939 | "\n" | |
a77c07d9 | 9940 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
9941 | "the commit.\n" |
9942 | msgstr "" | |
9943 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
9944 | "合并到主题分支。\n" | |
9945 | "\n" | |
a77c07d9 | 9946 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 9947 | |
1a79b2f1 | 9948 | #: builtin/merge.c:776 |
c04f5ac3 JX |
9949 | msgid "Empty commit message." |
9950 | msgstr "空提交信息。" | |
9951 | ||
1a79b2f1 | 9952 | #: builtin/merge.c:796 |
c04f5ac3 JX |
9953 | #, c-format |
9954 | msgid "Wonderful.\n" | |
9955 | msgstr "太棒了。\n" | |
9956 | ||
1a79b2f1 | 9957 | #: builtin/merge.c:851 |
c04f5ac3 JX |
9958 | #, c-format |
9959 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
9960 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
9961 | ||
87cb7997 | 9962 | #: builtin/merge.c:890 |
c04f5ac3 | 9963 | msgid "No current branch." |
90e6ef53 | 9964 | msgstr "没有当前分支。" |
c04f5ac3 | 9965 | |
87cb7997 | 9966 | #: builtin/merge.c:892 |
c04f5ac3 | 9967 | msgid "No remote for the current branch." |
160fb2b2 | 9968 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 9969 | |
87cb7997 | 9970 | #: builtin/merge.c:894 |
c04f5ac3 | 9971 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 9972 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 9973 | |
87cb7997 | 9974 | #: builtin/merge.c:899 |
170e9899 | 9975 | #, c-format |
2e8451e8 JX |
9976 | msgid "No remote-tracking branch for %s from %s" |
9977 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 9978 | |
87cb7997 | 9979 | #: builtin/merge.c:946 |
5c57d762 JX |
9980 | #, c-format |
9981 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 9982 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 9983 | |
87cb7997 | 9984 | #: builtin/merge.c:1020 |
7aea43ff JX |
9985 | #, c-format |
9986 | msgid "could not close '%s'" | |
9987 | msgstr "不能关闭 '%s'" | |
9988 | ||
87cb7997 | 9989 | #: builtin/merge.c:1047 |
5c57d762 JX |
9990 | #, c-format |
9991 | msgid "not something we can merge in %s: %s" | |
9992 | msgstr "不能在 %s 中合并:%s" | |
9993 | ||
87cb7997 | 9994 | #: builtin/merge.c:1081 |
5c57d762 JX |
9995 | msgid "not something we can merge" |
9996 | msgstr "不能合并" | |
9997 | ||
87cb7997 | 9998 | #: builtin/merge.c:1146 |
1a79b2f1 JX |
9999 | msgid "--abort expects no arguments" |
10000 | msgstr "--abort 不带参数" | |
10001 | ||
87cb7997 | 10002 | #: builtin/merge.c:1150 |
c04f5ac3 | 10003 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 10004 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 10005 | |
87cb7997 | 10006 | #: builtin/merge.c:1162 |
1a79b2f1 JX |
10007 | msgid "--continue expects no arguments" |
10008 | msgstr "--continue 不带参数" | |
10009 | ||
87cb7997 | 10010 | #: builtin/merge.c:1166 |
1a79b2f1 JX |
10011 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
10012 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
10013 | ||
87cb7997 | 10014 | #: builtin/merge.c:1182 |
c04f5ac3 JX |
10015 | msgid "" |
10016 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 10017 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
10018 | msgstr "" |
10019 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 10020 | "请在合并前先提交您的修改。" |
c04f5ac3 | 10021 | |
87cb7997 | 10022 | #: builtin/merge.c:1189 |
c04f5ac3 JX |
10023 | msgid "" |
10024 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 10025 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
10026 | msgstr "" |
10027 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 10028 | "请在合并前先提交您的修改。" |
c04f5ac3 | 10029 | |
87cb7997 | 10030 | #: builtin/merge.c:1192 |
c04f5ac3 JX |
10031 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
10032 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
10033 | ||
87cb7997 | 10034 | #: builtin/merge.c:1201 |
c04f5ac3 | 10035 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 10036 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 10037 | |
87cb7997 | 10038 | #: builtin/merge.c:1209 |
c04f5ac3 | 10039 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 10040 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 10041 | |
87cb7997 | 10042 | #: builtin/merge.c:1226 |
c04f5ac3 JX |
10043 | msgid "Squash commit into empty head not supported yet" |
10044 | msgstr "尚不支持到空分支的压缩提交" | |
10045 | ||
87cb7997 | 10046 | #: builtin/merge.c:1228 |
c04f5ac3 JX |
10047 | msgid "Non-fast-forward commit does not make sense into an empty head" |
10048 | msgstr "到空分支的非快进式提交没有意义" | |
10049 | ||
87cb7997 | 10050 | #: builtin/merge.c:1233 |
2e8451e8 JX |
10051 | #, c-format |
10052 | msgid "%s - not something we can merge" | |
10053 | msgstr "%s - 不能被合并" | |
10054 | ||
87cb7997 | 10055 | #: builtin/merge.c:1235 |
7aea43ff JX |
10056 | msgid "Can merge only exactly one commit into empty head" |
10057 | msgstr "只能将一个提交合并到空分支上" | |
10058 | ||
87cb7997 | 10059 | #: builtin/merge.c:1269 |
1003b3a5 JX |
10060 | #, c-format |
10061 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
10062 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
10063 | ||
87cb7997 | 10064 | #: builtin/merge.c:1272 |
1003b3a5 JX |
10065 | #, c-format |
10066 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
10067 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
10068 | ||
87cb7997 | 10069 | #: builtin/merge.c:1275 |
1003b3a5 JX |
10070 | #, c-format |
10071 | msgid "Commit %s does not have a GPG signature." | |
10072 | msgstr "提交 %s 没有一个 GPG 签名。" | |
10073 | ||
87cb7997 | 10074 | #: builtin/merge.c:1278 |
1003b3a5 JX |
10075 | #, c-format |
10076 | msgid "Commit %s has a good GPG signature by %s\n" | |
10077 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
10078 | ||
87cb7997 | 10079 | #: builtin/merge.c:1340 |
5b04ee3b JX |
10080 | msgid "refusing to merge unrelated histories" |
10081 | msgstr "拒绝合并无关的历史" | |
10082 | ||
87cb7997 | 10083 | #: builtin/merge.c:1349 |
5c57d762 JX |
10084 | msgid "Already up-to-date." |
10085 | msgstr "已经是最新的。" | |
10086 | ||
87cb7997 | 10087 | #: builtin/merge.c:1359 |
c04f5ac3 JX |
10088 | #, c-format |
10089 | msgid "Updating %s..%s\n" | |
10090 | msgstr "更新 %s..%s\n" | |
10091 | ||
87cb7997 | 10092 | #: builtin/merge.c:1400 |
c04f5ac3 JX |
10093 | #, c-format |
10094 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 10095 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 10096 | |
87cb7997 | 10097 | #: builtin/merge.c:1407 |
c04f5ac3 JX |
10098 | #, c-format |
10099 | msgid "Nope.\n" | |
10100 | msgstr "无。\n" | |
10101 | ||
87cb7997 | 10102 | #: builtin/merge.c:1432 |
5c57d762 JX |
10103 | msgid "Already up-to-date. Yeeah!" |
10104 | msgstr "已经是最新的。耶!" | |
10105 | ||
87cb7997 | 10106 | #: builtin/merge.c:1438 |
c04f5ac3 | 10107 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 10108 | msgstr "无法快进,终止。" |
c04f5ac3 | 10109 | |
87cb7997 | 10110 | #: builtin/merge.c:1461 builtin/merge.c:1540 |
c04f5ac3 JX |
10111 | #, c-format |
10112 | msgid "Rewinding the tree to pristine...\n" | |
10113 | msgstr "将树回滚至原始状态...\n" | |
10114 | ||
87cb7997 | 10115 | #: builtin/merge.c:1465 |
c04f5ac3 JX |
10116 | #, c-format |
10117 | msgid "Trying merge strategy %s...\n" | |
10118 | msgstr "尝试合并策略 %s...\n" | |
10119 | ||
87cb7997 | 10120 | #: builtin/merge.c:1531 |
c04f5ac3 JX |
10121 | #, c-format |
10122 | msgid "No merge strategy handled the merge.\n" | |
10123 | msgstr "没有合并策略处理此合并。\n" | |
10124 | ||
87cb7997 | 10125 | #: builtin/merge.c:1533 |
c04f5ac3 JX |
10126 | #, c-format |
10127 | msgid "Merge with strategy %s failed.\n" | |
10128 | msgstr "使用策略 %s 合并失败。\n" | |
10129 | ||
87cb7997 | 10130 | #: builtin/merge.c:1542 |
c04f5ac3 JX |
10131 | #, c-format |
10132 | msgid "Using the %s to prepare resolving by hand.\n" | |
10133 | msgstr "使用 %s 以准备手工解决。\n" | |
10134 | ||
87cb7997 | 10135 | #: builtin/merge.c:1554 |
c04f5ac3 JX |
10136 | #, c-format |
10137 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
10138 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
10139 | ||
cfff71a9 | 10140 | #: builtin/merge-base.c:29 |
814ff314 JX |
10141 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
10142 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 10143 | |
cfff71a9 | 10144 | #: builtin/merge-base.c:30 |
814ff314 JX |
10145 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
10146 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 10147 | |
cfff71a9 | 10148 | #: builtin/merge-base.c:31 |
ef317cd5 | 10149 | msgid "git merge-base --independent <commit>..." |
07432cef | 10150 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 10151 | |
cfff71a9 | 10152 | #: builtin/merge-base.c:32 |
ef317cd5 | 10153 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 10154 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 10155 | |
cfff71a9 JX |
10156 | #: builtin/merge-base.c:33 |
10157 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 10158 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 10159 | |
a0b6b246 | 10160 | #: builtin/merge-base.c:217 |
ef317cd5 | 10161 | msgid "output all common ancestors" |
07432cef | 10162 | msgstr "输出所有共同的祖先" |
ef317cd5 | 10163 | |
a0b6b246 | 10164 | #: builtin/merge-base.c:219 |
ef317cd5 | 10165 | msgid "find ancestors for a single n-way merge" |
07432cef | 10166 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 10167 | |
a0b6b246 | 10168 | #: builtin/merge-base.c:221 |
ef317cd5 | 10169 | msgid "list revs not reachable from others" |
07432cef | 10170 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 10171 | |
a0b6b246 | 10172 | #: builtin/merge-base.c:223 |
ef317cd5 | 10173 | msgid "is the first one ancestor of the other?" |
07432cef | 10174 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 10175 | |
a0b6b246 | 10176 | #: builtin/merge-base.c:225 |
cfff71a9 | 10177 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 10178 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 10179 | |
ef317cd5 JX |
10180 | #: builtin/merge-file.c:8 |
10181 | msgid "" | |
814ff314 JX |
10182 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
10183 | "<orig-file> <file2>" | |
ef317cd5 | 10184 | msgstr "" |
814ff314 JX |
10185 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
10186 | "件> <文件2>" | |
ef317cd5 | 10187 | |
87cb7997 | 10188 | #: builtin/merge-file.c:32 |
ef317cd5 | 10189 | msgid "send results to standard output" |
07432cef | 10190 | msgstr "将结果发送到标准输出" |
ef317cd5 | 10191 | |
87cb7997 | 10192 | #: builtin/merge-file.c:33 |
ef317cd5 | 10193 | msgid "use a diff3 based merge" |
07432cef | 10194 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 10195 | |
87cb7997 | 10196 | #: builtin/merge-file.c:34 |
ef317cd5 | 10197 | msgid "for conflicts, use our version" |
07432cef | 10198 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 10199 | |
87cb7997 | 10200 | #: builtin/merge-file.c:36 |
ef317cd5 | 10201 | msgid "for conflicts, use their version" |
07432cef | 10202 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 10203 | |
87cb7997 | 10204 | #: builtin/merge-file.c:38 |
ef317cd5 | 10205 | msgid "for conflicts, use a union version" |
07432cef | 10206 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 10207 | |
87cb7997 | 10208 | #: builtin/merge-file.c:41 |
ef317cd5 | 10209 | msgid "for conflicts, use this marker size" |
07432cef | 10210 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 10211 | |
87cb7997 | 10212 | #: builtin/merge-file.c:42 |
ef317cd5 | 10213 | msgid "do not warn about conflicts" |
07432cef | 10214 | msgstr "不要警告冲突" |
ef317cd5 | 10215 | |
87cb7997 | 10216 | #: builtin/merge-file.c:44 |
814ff314 JX |
10217 | msgid "set labels for file1/orig-file/file2" |
10218 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 10219 | |
a0b6b246 JX |
10220 | #: builtin/merge-recursive.c:45 |
10221 | #, c-format | |
10222 | msgid "unknown option %s" | |
10223 | msgstr "未知选项 %s" | |
10224 | ||
10225 | #: builtin/merge-recursive.c:51 | |
10226 | #, c-format | |
10227 | msgid "could not parse object '%s'" | |
10228 | msgstr "不能解析对象 '%s'" | |
10229 | ||
10230 | #: builtin/merge-recursive.c:55 | |
10231 | #, c-format | |
10232 | msgid "cannot handle more than %d base. Ignoring %s." | |
10233 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
10234 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
10235 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
10236 | ||
10237 | #: builtin/merge-recursive.c:63 | |
10238 | msgid "not handling anything other than two heads merge." | |
10239 | msgstr "不能处理两个头合并之外的任何操作。" | |
10240 | ||
10241 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
10242 | #, c-format | |
10243 | msgid "could not resolve ref '%s'" | |
10244 | msgstr "无法解析引用 '%s'" | |
10245 | ||
10246 | #: builtin/merge-recursive.c:77 | |
10247 | #, c-format | |
10248 | msgid "Merging %s with %s\n" | |
10249 | msgstr "合并 %s 和 %s\n" | |
10250 | ||
276ceeaa | 10251 | #: builtin/mktree.c:65 |
ef317cd5 | 10252 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 10253 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 10254 | |
276ceeaa | 10255 | #: builtin/mktree.c:152 |
ef317cd5 | 10256 | msgid "input is NUL terminated" |
07432cef | 10257 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 10258 | |
276ceeaa | 10259 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
ef317cd5 | 10260 | msgid "allow missing objects" |
07432cef | 10261 | msgstr "允许丢失的对象" |
c04f5ac3 | 10262 | |
276ceeaa | 10263 | #: builtin/mktree.c:154 |
ef317cd5 | 10264 | msgid "allow creation of more than one tree" |
07432cef | 10265 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 10266 | |
1a79b2f1 | 10267 | #: builtin/mv.c:16 |
814ff314 JX |
10268 | msgid "git mv [<options>] <source>... <destination>" |
10269 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 10270 | |
1a79b2f1 | 10271 | #: builtin/mv.c:82 |
220c313c JX |
10272 | #, c-format |
10273 | msgid "Directory %s is in index and no submodule?" | |
10274 | msgstr "目录 %s 在索引中并且不是子模组?" | |
10275 | ||
1a79b2f1 | 10276 | #: builtin/mv.c:84 builtin/rm.c:290 |
220c313c | 10277 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 10278 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c | 10279 | |
1a79b2f1 | 10280 | #: builtin/mv.c:102 |
220c313c JX |
10281 | #, c-format |
10282 | msgid "%.*s is in index" | |
10283 | msgstr "%.*s 在索引中" | |
10284 | ||
1a79b2f1 | 10285 | #: builtin/mv.c:124 |
ef317cd5 | 10286 | msgid "force move/rename even if target exists" |
07432cef | 10287 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 10288 | |
1a79b2f1 | 10289 | #: builtin/mv.c:125 |
ef317cd5 | 10290 | msgid "skip move/rename errors" |
07432cef | 10291 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 10292 | |
1a79b2f1 | 10293 | #: builtin/mv.c:167 |
220c313c JX |
10294 | #, c-format |
10295 | msgid "destination '%s' is not a directory" | |
10296 | msgstr "目标 '%s' 不是一个目录" | |
10297 | ||
1a79b2f1 | 10298 | #: builtin/mv.c:178 |
c04f5ac3 JX |
10299 | #, c-format |
10300 | msgid "Checking rename of '%s' to '%s'\n" | |
10301 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
10302 | ||
1a79b2f1 | 10303 | #: builtin/mv.c:182 |
c04f5ac3 JX |
10304 | msgid "bad source" |
10305 | msgstr "坏的源" | |
10306 | ||
1a79b2f1 | 10307 | #: builtin/mv.c:185 |
c04f5ac3 JX |
10308 | msgid "can not move directory into itself" |
10309 | msgstr "不能将目录移动到自身" | |
10310 | ||
1a79b2f1 | 10311 | #: builtin/mv.c:188 |
c04f5ac3 JX |
10312 | msgid "cannot move directory over file" |
10313 | msgstr "不能将目录移动到文件" | |
10314 | ||
1a79b2f1 | 10315 | #: builtin/mv.c:197 |
c04f5ac3 JX |
10316 | msgid "source directory is empty" |
10317 | msgstr "源目录为空" | |
10318 | ||
1a79b2f1 | 10319 | #: builtin/mv.c:222 |
c04f5ac3 JX |
10320 | msgid "not under version control" |
10321 | msgstr "不在版本控制之下" | |
10322 | ||
1a79b2f1 | 10323 | #: builtin/mv.c:225 |
c04f5ac3 JX |
10324 | msgid "destination exists" |
10325 | msgstr "目标已存在" | |
10326 | ||
1a79b2f1 | 10327 | #: builtin/mv.c:233 |
c04f5ac3 JX |
10328 | #, c-format |
10329 | msgid "overwriting '%s'" | |
10330 | msgstr "覆盖 '%s'" | |
10331 | ||
1a79b2f1 | 10332 | #: builtin/mv.c:236 |
c04f5ac3 JX |
10333 | msgid "Cannot overwrite" |
10334 | msgstr "不能覆盖" | |
10335 | ||
1a79b2f1 | 10336 | #: builtin/mv.c:239 |
c04f5ac3 JX |
10337 | msgid "multiple sources for the same target" |
10338 | msgstr "同一目标具有多个源" | |
10339 | ||
1a79b2f1 | 10340 | #: builtin/mv.c:241 |
cfff71a9 JX |
10341 | msgid "destination directory does not exist" |
10342 | msgstr "目标目录不存在" | |
10343 | ||
1a79b2f1 | 10344 | #: builtin/mv.c:248 |
c04f5ac3 JX |
10345 | #, c-format |
10346 | msgid "%s, source=%s, destination=%s" | |
10347 | msgstr "%s,源=%s,目标=%s" | |
10348 | ||
1a79b2f1 | 10349 | #: builtin/mv.c:269 |
c04f5ac3 JX |
10350 | #, c-format |
10351 | msgid "Renaming %s to %s\n" | |
10352 | msgstr "重命名 %s 至 %s\n" | |
10353 | ||
1a79b2f1 | 10354 | #: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 |
c04f5ac3 JX |
10355 | #, c-format |
10356 | msgid "renaming '%s' failed" | |
10357 | msgstr "重命名 '%s' 失败" | |
10358 | ||
87cb7997 | 10359 | #: builtin/name-rev.c:289 |
814ff314 JX |
10360 | msgid "git name-rev [<options>] <commit>..." |
10361 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 10362 | |
87cb7997 | 10363 | #: builtin/name-rev.c:290 |
814ff314 JX |
10364 | msgid "git name-rev [<options>] --all" |
10365 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 10366 | |
87cb7997 | 10367 | #: builtin/name-rev.c:291 |
814ff314 JX |
10368 | msgid "git name-rev [<options>] --stdin" |
10369 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 10370 | |
87cb7997 | 10371 | #: builtin/name-rev.c:346 |
ef317cd5 | 10372 | msgid "print only names (no SHA-1)" |
07432cef | 10373 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 10374 | |
87cb7997 | 10375 | #: builtin/name-rev.c:347 |
ef317cd5 | 10376 | msgid "only use tags to name the commits" |
55a16ee4 | 10377 | msgstr "只使用标签来命名提交" |
ef317cd5 | 10378 | |
87cb7997 | 10379 | #: builtin/name-rev.c:349 |
ef317cd5 | 10380 | msgid "only use refs matching <pattern>" |
07432cef | 10381 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 10382 | |
87cb7997 JX |
10383 | #: builtin/name-rev.c:351 |
10384 | msgid "ignore refs matching <pattern>" | |
10385 | msgstr "忽略和 <模式> 相匹配的引用" | |
10386 | ||
10387 | #: builtin/name-rev.c:353 | |
ef317cd5 | 10388 | msgid "list all commits reachable from all refs" |
07432cef | 10389 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 10390 | |
87cb7997 | 10391 | #: builtin/name-rev.c:354 |
ef317cd5 | 10392 | msgid "read from stdin" |
07432cef | 10393 | msgstr "从标准输入读取" |
ef317cd5 | 10394 | |
87cb7997 | 10395 | #: builtin/name-rev.c:355 |
90314792 JX |
10396 | msgid "allow to print `undefined` names (default)" |
10397 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 10398 | |
87cb7997 | 10399 | #: builtin/name-rev.c:361 |
2e8451e8 | 10400 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 10401 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 10402 | |
1b7f4a34 | 10403 | #: builtin/notes.c:25 |
814ff314 | 10404 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 10405 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 10406 | |
1b7f4a34 | 10407 | #: builtin/notes.c:26 |
ef317cd5 | 10408 | msgid "" |
814ff314 | 10409 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 10410 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 10411 | msgstr "" |
04cb2f28 JX |
10412 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
10413 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 10414 | |
1b7f4a34 | 10415 | #: builtin/notes.c:27 |
814ff314 | 10416 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 10417 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 10418 | |
1b7f4a34 | 10419 | #: builtin/notes.c:28 |
ef317cd5 | 10420 | msgid "" |
814ff314 | 10421 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 10422 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 10423 | msgstr "" |
04cb2f28 JX |
10424 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
10425 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 10426 | |
1b7f4a34 | 10427 | #: builtin/notes.c:29 |
814ff314 | 10428 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 10429 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 10430 | |
1b7f4a34 | 10431 | #: builtin/notes.c:30 |
814ff314 | 10432 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 10433 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 10434 | |
1b7f4a34 | 10435 | #: builtin/notes.c:31 |
ef317cd5 | 10436 | msgid "" |
814ff314 | 10437 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 10438 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 10439 | |
1b7f4a34 | 10440 | #: builtin/notes.c:32 |
ef317cd5 | 10441 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 10442 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 10443 | |
1b7f4a34 | 10444 | #: builtin/notes.c:33 |
ef317cd5 | 10445 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 10446 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 10447 | |
1b7f4a34 | 10448 | #: builtin/notes.c:34 |
814ff314 | 10449 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 10450 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 10451 | |
1b7f4a34 | 10452 | #: builtin/notes.c:35 |
814ff314 | 10453 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 10454 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 10455 | |
1b7f4a34 | 10456 | #: builtin/notes.c:36 |
814ff314 | 10457 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 10458 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 10459 | |
1b7f4a34 | 10460 | #: builtin/notes.c:41 |
ef317cd5 | 10461 | msgid "git notes [list [<object>]]" |
07432cef | 10462 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 10463 | |
1b7f4a34 | 10464 | #: builtin/notes.c:46 |
ef317cd5 | 10465 | msgid "git notes add [<options>] [<object>]" |
07432cef | 10466 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 10467 | |
1b7f4a34 | 10468 | #: builtin/notes.c:51 |
ef317cd5 | 10469 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 10470 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 10471 | |
1b7f4a34 | 10472 | #: builtin/notes.c:52 |
ef317cd5 | 10473 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 10474 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 10475 | |
1b7f4a34 | 10476 | #: builtin/notes.c:57 |
ef317cd5 | 10477 | msgid "git notes append [<options>] [<object>]" |
07432cef | 10478 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 10479 | |
1b7f4a34 | 10480 | #: builtin/notes.c:62 |
ef317cd5 | 10481 | msgid "git notes edit [<object>]" |
07432cef | 10482 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 10483 | |
1b7f4a34 | 10484 | #: builtin/notes.c:67 |
ef317cd5 | 10485 | msgid "git notes show [<object>]" |
07432cef | 10486 | msgstr "git notes show [<对象>]" |
ef317cd5 | 10487 | |
1b7f4a34 | 10488 | #: builtin/notes.c:72 |
814ff314 | 10489 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 10490 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 10491 | |
1b7f4a34 | 10492 | #: builtin/notes.c:73 |
ef317cd5 | 10493 | msgid "git notes merge --commit [<options>]" |
07432cef | 10494 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 10495 | |
1b7f4a34 | 10496 | #: builtin/notes.c:74 |
ef317cd5 | 10497 | msgid "git notes merge --abort [<options>]" |
07432cef | 10498 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 10499 | |
1b7f4a34 | 10500 | #: builtin/notes.c:79 |
ef317cd5 | 10501 | msgid "git notes remove [<object>]" |
07432cef | 10502 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 10503 | |
1b7f4a34 | 10504 | #: builtin/notes.c:84 |
ef317cd5 | 10505 | msgid "git notes prune [<options>]" |
07432cef | 10506 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 10507 | |
1b7f4a34 | 10508 | #: builtin/notes.c:89 |
ef317cd5 | 10509 | msgid "git notes get-ref" |
07432cef | 10510 | msgstr "git notes get-ref" |
ef317cd5 | 10511 | |
5c57d762 JX |
10512 | #: builtin/notes.c:94 |
10513 | msgid "Write/edit the notes for the following object:" | |
10514 | msgstr "为下面的对象写/编辑说明:" | |
10515 | ||
1b7f4a34 | 10516 | #: builtin/notes.c:147 |
c04f5ac3 JX |
10517 | #, c-format |
10518 | msgid "unable to start 'show' for object '%s'" | |
10519 | msgstr "不能为对象 '%s' 开始 'show'" | |
10520 | ||
1b7f4a34 | 10521 | #: builtin/notes.c:151 |
a77c07d9 JX |
10522 | msgid "could not read 'show' output" |
10523 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 10524 | |
1b7f4a34 | 10525 | #: builtin/notes.c:159 |
c04f5ac3 JX |
10526 | #, c-format |
10527 | msgid "failed to finish 'show' for object '%s'" | |
10528 | msgstr "无法为对象 '%s' 完成 'show'" | |
10529 | ||
5c57d762 | 10530 | #: builtin/notes.c:194 |
a0b6b246 | 10531 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
10532 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
10533 | ||
5c57d762 | 10534 | #: builtin/notes.c:203 |
c04f5ac3 JX |
10535 | msgid "unable to write note object" |
10536 | msgstr "不能写注解对象" | |
10537 | ||
5c57d762 | 10538 | #: builtin/notes.c:205 |
c04f5ac3 | 10539 | #, c-format |
a0b6b246 | 10540 | msgid "the note contents have been left in %s" |
220c313c | 10541 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 10542 | |
87cb7997 | 10543 | #: builtin/notes.c:233 builtin/tag.c:516 |
c04f5ac3 JX |
10544 | #, c-format |
10545 | msgid "cannot read '%s'" | |
10546 | msgstr "不能读取 '%s'" | |
10547 | ||
87cb7997 | 10548 | #: builtin/notes.c:235 builtin/tag.c:519 |
c04f5ac3 JX |
10549 | #, c-format |
10550 | msgid "could not open or read '%s'" | |
10551 | msgstr "不能打开或读取 '%s'" | |
10552 | ||
a0b6b246 JX |
10553 | #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 |
10554 | #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 | |
87cb7997 | 10555 | #: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 |
a0b6b246 JX |
10556 | #, c-format |
10557 | msgid "failed to resolve '%s' as a valid ref." | |
10558 | msgstr "无法解析 '%s' 为一个有效引用。" | |
10559 | ||
5c57d762 | 10560 | #: builtin/notes.c:257 |
c04f5ac3 | 10561 | #, c-format |
a0b6b246 | 10562 | msgid "failed to read object '%s'." |
c04f5ac3 JX |
10563 | msgstr "无法读取对象 '%s'。" |
10564 | ||
5c57d762 | 10565 | #: builtin/notes.c:261 |
6c94aba5 | 10566 | #, c-format |
a0b6b246 JX |
10567 | msgid "cannot read note data from non-blob object '%s'." |
10568 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
10569 | ||
10570 | #: builtin/notes.c:301 | |
10571 | #, c-format | |
10572 | msgid "malformed input line: '%s'." | |
10573 | msgstr "非法的输入行:'%s'。" | |
10574 | ||
10575 | #: builtin/notes.c:316 | |
10576 | #, c-format | |
10577 | msgid "failed to copy notes from '%s' to '%s'" | |
10578 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 10579 | |
a0b6b246 JX |
10580 | #. TRANSLATORS: the first %s will be replaced by a |
10581 | #. git notes command: 'add', 'merge', 'remove', etc. | |
10582 | #: builtin/notes.c:345 | |
10583 | #, c-format | |
10584 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
10585 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
10586 | ||
10587 | #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 | |
87cb7997 JX |
10588 | #: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 |
10589 | #: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 | |
c04f5ac3 JX |
10590 | msgid "too many parameters" |
10591 | msgstr "参数太多" | |
10592 | ||
87cb7997 | 10593 | #: builtin/notes.c:378 builtin/notes.c:664 |
c04f5ac3 | 10594 | #, c-format |
a0b6b246 | 10595 | msgid "no note found for object %s." |
c04f5ac3 JX |
10596 | msgstr "未发现对象 %s 的注解。" |
10597 | ||
a0b6b246 | 10598 | #: builtin/notes.c:399 builtin/notes.c:562 |
ef317cd5 | 10599 | msgid "note contents as a string" |
07432cef | 10600 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 10601 | |
a0b6b246 | 10602 | #: builtin/notes.c:402 builtin/notes.c:565 |
ef317cd5 | 10603 | msgid "note contents in a file" |
07432cef | 10604 | msgstr "注解内容到一个文件中" |
ef317cd5 | 10605 | |
a0b6b246 | 10606 | #: builtin/notes.c:405 builtin/notes.c:568 |
ef317cd5 | 10607 | msgid "reuse and edit specified note object" |
07432cef | 10608 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 10609 | |
a0b6b246 | 10610 | #: builtin/notes.c:408 builtin/notes.c:571 |
ef317cd5 | 10611 | msgid "reuse specified note object" |
07432cef | 10612 | msgstr "重用指定的注解对象" |
ef317cd5 | 10613 | |
a0b6b246 | 10614 | #: builtin/notes.c:411 builtin/notes.c:574 |
04cb2f28 JX |
10615 | msgid "allow storing empty note" |
10616 | msgstr "允许保存空白注释" | |
10617 | ||
a0b6b246 | 10618 | #: builtin/notes.c:412 builtin/notes.c:483 |
ef317cd5 | 10619 | msgid "replace existing notes" |
07432cef | 10620 | msgstr "替换已存在的注解" |
ef317cd5 | 10621 | |
a0b6b246 | 10622 | #: builtin/notes.c:437 |
c04f5ac3 JX |
10623 | #, c-format |
10624 | msgid "" | |
10625 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
10626 | "existing notes" | |
10627 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
10628 | ||
a0b6b246 | 10629 | #: builtin/notes.c:452 builtin/notes.c:531 |
c04f5ac3 JX |
10630 | #, c-format |
10631 | msgid "Overwriting existing notes for object %s\n" | |
10632 | msgstr "覆盖对象 %s 现存注解\n" | |
10633 | ||
87cb7997 | 10634 | #: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 |
04cb2f28 JX |
10635 | #, c-format |
10636 | msgid "Removing note for object %s\n" | |
10637 | msgstr "删除对象 %s 的注解\n" | |
10638 | ||
a0b6b246 | 10639 | #: builtin/notes.c:484 |
ef317cd5 | 10640 | msgid "read objects from stdin" |
07432cef | 10641 | msgstr "从标准输入读取对象" |
ef317cd5 | 10642 | |
a0b6b246 | 10643 | #: builtin/notes.c:486 |
ef317cd5 | 10644 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 10645 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 10646 | |
a0b6b246 | 10647 | #: builtin/notes.c:504 |
c04f5ac3 JX |
10648 | msgid "too few parameters" |
10649 | msgstr "参数太少" | |
10650 | ||
a0b6b246 | 10651 | #: builtin/notes.c:525 |
c04f5ac3 JX |
10652 | #, c-format |
10653 | msgid "" | |
10654 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
10655 | "existing notes" | |
10656 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
10657 | ||
a0b6b246 | 10658 | #: builtin/notes.c:537 |
c04f5ac3 | 10659 | #, c-format |
a0b6b246 | 10660 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
10661 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
10662 | ||
a0b6b246 | 10663 | #: builtin/notes.c:589 |
ef317cd5 JX |
10664 | #, c-format |
10665 | msgid "" | |
10666 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
10667 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
10668 | msgstr "" | |
10669 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
10670 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
10671 | ||
87cb7997 | 10672 | #: builtin/notes.c:684 |
a0b6b246 JX |
10673 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
10674 | msgstr "无法删除引用 NOTES_MERGE_PARTIAL" | |
10675 | ||
87cb7997 | 10676 | #: builtin/notes.c:686 |
a0b6b246 JX |
10677 | msgid "failed to delete ref NOTES_MERGE_REF" |
10678 | msgstr "无法删除引用 NOTES_MERGE_REF" | |
10679 | ||
87cb7997 | 10680 | #: builtin/notes.c:688 |
a0b6b246 JX |
10681 | msgid "failed to remove 'git notes merge' worktree" |
10682 | msgstr "无法删除 'git notes merge' 工作区" | |
10683 | ||
87cb7997 | 10684 | #: builtin/notes.c:708 |
a0b6b246 JX |
10685 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
10686 | msgstr "无法读取引用 NOTES_MERGE_PARTIAL" | |
10687 | ||
87cb7997 | 10688 | #: builtin/notes.c:710 |
a0b6b246 JX |
10689 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
10690 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
10691 | ||
87cb7997 | 10692 | #: builtin/notes.c:712 |
a0b6b246 JX |
10693 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
10694 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
10695 | ||
87cb7997 | 10696 | #: builtin/notes.c:725 |
a0b6b246 JX |
10697 | msgid "failed to resolve NOTES_MERGE_REF" |
10698 | msgstr "无法解析 NOTES_MERGE_REF" | |
10699 | ||
87cb7997 | 10700 | #: builtin/notes.c:728 |
a0b6b246 JX |
10701 | msgid "failed to finalize notes merge" |
10702 | msgstr "无法完成注解合并" | |
10703 | ||
87cb7997 | 10704 | #: builtin/notes.c:754 |
5c57d762 JX |
10705 | #, c-format |
10706 | msgid "unknown notes merge strategy %s" | |
10707 | msgstr "未知的注解合并策略 %s" | |
10708 | ||
87cb7997 | 10709 | #: builtin/notes.c:770 |
ef317cd5 | 10710 | msgid "General options" |
07432cef | 10711 | msgstr "通用选项" |
ef317cd5 | 10712 | |
87cb7997 | 10713 | #: builtin/notes.c:772 |
ef317cd5 | 10714 | msgid "Merge options" |
07432cef | 10715 | msgstr "合并选项" |
ef317cd5 | 10716 | |
87cb7997 | 10717 | #: builtin/notes.c:774 |
ef317cd5 JX |
10718 | msgid "" |
10719 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
10720 | "cat_sort_uniq)" | |
07432cef | 10721 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 10722 | |
87cb7997 | 10723 | #: builtin/notes.c:776 |
ef317cd5 | 10724 | msgid "Committing unmerged notes" |
07432cef | 10725 | msgstr "提交未合并的注解" |
ef317cd5 | 10726 | |
87cb7997 | 10727 | #: builtin/notes.c:778 |
ef317cd5 | 10728 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 10729 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 10730 | |
87cb7997 | 10731 | #: builtin/notes.c:780 |
ef317cd5 | 10732 | msgid "Aborting notes merge resolution" |
07432cef | 10733 | msgstr "中止注解合并的方案" |
ef317cd5 | 10734 | |
87cb7997 | 10735 | #: builtin/notes.c:782 |
ef317cd5 | 10736 | msgid "abort notes merge" |
07432cef | 10737 | msgstr "中止注解合并" |
ef317cd5 | 10738 | |
87cb7997 | 10739 | #: builtin/notes.c:793 |
5c57d762 JX |
10740 | msgid "cannot mix --commit, --abort or -s/--strategy" |
10741 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
10742 | ||
87cb7997 | 10743 | #: builtin/notes.c:798 |
a0b6b246 | 10744 | msgid "must specify a notes ref to merge" |
9a4b694c | 10745 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 10746 | |
87cb7997 | 10747 | #: builtin/notes.c:822 |
5c57d762 | 10748 | #, c-format |
a0b6b246 | 10749 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
10750 | msgstr "未知的 -s/--strategy:%s" |
10751 | ||
87cb7997 | 10752 | #: builtin/notes.c:859 |
1b7f4a34 | 10753 | #, c-format |
a0b6b246 JX |
10754 | msgid "a notes merge into %s is already in-progress at %s" |
10755 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 10756 | |
87cb7997 | 10757 | #: builtin/notes.c:862 |
5c57d762 | 10758 | #, c-format |
a0b6b246 JX |
10759 | msgid "failed to store link to current notes ref (%s)" |
10760 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 10761 | |
87cb7997 | 10762 | #: builtin/notes.c:864 |
5c57d762 JX |
10763 | #, c-format |
10764 | msgid "" | |
10765 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
10766 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
10767 | "abort'.\n" | |
a0b6b246 JX |
10768 | msgstr "" |
10769 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
10770 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 10771 | |
87cb7997 | 10772 | #: builtin/notes.c:886 |
ef317cd5 JX |
10773 | #, c-format |
10774 | msgid "Object %s has no note\n" | |
10775 | msgstr "对象 %s 没有注解\n" | |
10776 | ||
87cb7997 | 10777 | #: builtin/notes.c:898 |
ef317cd5 | 10778 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 10779 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 10780 | |
87cb7997 | 10781 | #: builtin/notes.c:901 |
ef317cd5 | 10782 | msgid "read object names from the standard input" |
07432cef | 10783 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 10784 | |
87cb7997 | 10785 | #: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 |
5c57d762 JX |
10786 | msgid "do not remove, show only" |
10787 | msgstr "不删除,只显示" | |
10788 | ||
87cb7997 | 10789 | #: builtin/notes.c:940 |
5c57d762 JX |
10790 | msgid "report pruned notes" |
10791 | msgstr "报告清除的注解" | |
10792 | ||
87cb7997 | 10793 | #: builtin/notes.c:982 |
6c94aba5 | 10794 | msgid "notes-ref" |
07432cef | 10795 | msgstr "注解引用" |
ef317cd5 | 10796 | |
87cb7997 | 10797 | #: builtin/notes.c:983 |
814ff314 | 10798 | msgid "use notes from <notes-ref>" |
07432cef | 10799 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 10800 | |
87cb7997 | 10801 | #: builtin/notes.c:1018 |
ef317cd5 | 10802 | #, c-format |
a0b6b246 | 10803 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
10804 | msgstr "未知子命令:%s" |
10805 | ||
a0b6b246 | 10806 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
10807 | msgid "" |
10808 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
10809 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 10810 | |
a0b6b246 | 10811 | #: builtin/pack-objects.c:30 |
1b7f4a34 JX |
10812 | msgid "" |
10813 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
10814 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 10815 | |
1a79b2f1 | 10816 | #: builtin/pack-objects.c:177 builtin/pack-objects.c:180 |
ef317cd5 JX |
10817 | #, c-format |
10818 | msgid "deflate error (%d)" | |
10819 | msgstr "压缩错误 (%d)" | |
10820 | ||
87cb7997 | 10821 | #: builtin/pack-objects.c:770 |
5b04ee3b JX |
10822 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
10823 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
10824 | ||
87cb7997 | 10825 | #: builtin/pack-objects.c:783 |
6c94aba5 JX |
10826 | msgid "Writing objects" |
10827 | msgstr "写入对象中" | |
10828 | ||
87cb7997 | 10829 | #: builtin/pack-objects.c:1063 |
6c94aba5 JX |
10830 | msgid "disabling bitmap writing, as some objects are not being packed" |
10831 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
10832 | ||
87cb7997 | 10833 | #: builtin/pack-objects.c:2426 |
6c94aba5 JX |
10834 | msgid "Compressing objects" |
10835 | msgstr "压缩对象中" | |
10836 | ||
87cb7997 | 10837 | #: builtin/pack-objects.c:2829 |
ef317cd5 JX |
10838 | #, c-format |
10839 | msgid "unsupported index version %s" | |
10840 | msgstr "不支持的索引版本 %s" | |
10841 | ||
87cb7997 | 10842 | #: builtin/pack-objects.c:2833 |
ef317cd5 JX |
10843 | #, c-format |
10844 | msgid "bad index version '%s'" | |
10845 | msgstr "坏的索引版本 '%s'" | |
10846 | ||
87cb7997 | 10847 | #: builtin/pack-objects.c:2863 |
ef317cd5 | 10848 | msgid "do not show progress meter" |
07432cef | 10849 | msgstr "不显示进度表" |
ef317cd5 | 10850 | |
87cb7997 | 10851 | #: builtin/pack-objects.c:2865 |
ef317cd5 | 10852 | msgid "show progress meter" |
07432cef | 10853 | msgstr "显示进度表" |
ef317cd5 | 10854 | |
87cb7997 | 10855 | #: builtin/pack-objects.c:2867 |
ef317cd5 | 10856 | msgid "show progress meter during object writing phase" |
07432cef | 10857 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 10858 | |
87cb7997 | 10859 | #: builtin/pack-objects.c:2870 |
ef317cd5 | 10860 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 10861 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 10862 | |
87cb7997 | 10863 | #: builtin/pack-objects.c:2871 |
ef317cd5 | 10864 | msgid "version[,offset]" |
07432cef | 10865 | msgstr "版本[,偏移]" |
ef317cd5 | 10866 | |
87cb7997 | 10867 | #: builtin/pack-objects.c:2872 |
ef317cd5 | 10868 | msgid "write the pack index file in the specified idx format version" |
07432cef | 10869 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 10870 | |
87cb7997 | 10871 | #: builtin/pack-objects.c:2875 |
ef317cd5 | 10872 | msgid "maximum size of each output pack file" |
07432cef | 10873 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 10874 | |
87cb7997 | 10875 | #: builtin/pack-objects.c:2877 |
ef317cd5 | 10876 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 10877 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 10878 | |
87cb7997 | 10879 | #: builtin/pack-objects.c:2879 |
ef317cd5 | 10880 | msgid "ignore packed objects" |
07432cef | 10881 | msgstr "忽略包对象" |
ef317cd5 | 10882 | |
87cb7997 | 10883 | #: builtin/pack-objects.c:2881 |
ef317cd5 | 10884 | msgid "limit pack window by objects" |
07432cef | 10885 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 10886 | |
87cb7997 | 10887 | #: builtin/pack-objects.c:2883 |
ef317cd5 | 10888 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 10889 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 10890 | |
87cb7997 | 10891 | #: builtin/pack-objects.c:2885 |
ef317cd5 | 10892 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 10893 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 10894 | |
87cb7997 | 10895 | #: builtin/pack-objects.c:2887 |
ef317cd5 | 10896 | msgid "reuse existing deltas" |
07432cef | 10897 | msgstr "重用已存在的 deltas" |
ef317cd5 | 10898 | |
87cb7997 | 10899 | #: builtin/pack-objects.c:2889 |
ef317cd5 | 10900 | msgid "reuse existing objects" |
07432cef | 10901 | msgstr "重用已存在的对象" |
ef317cd5 | 10902 | |
87cb7997 | 10903 | #: builtin/pack-objects.c:2891 |
ef317cd5 | 10904 | msgid "use OFS_DELTA objects" |
07432cef | 10905 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 10906 | |
87cb7997 | 10907 | #: builtin/pack-objects.c:2893 |
ef317cd5 | 10908 | msgid "use threads when searching for best delta matches" |
07432cef | 10909 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 10910 | |
87cb7997 | 10911 | #: builtin/pack-objects.c:2895 |
ef317cd5 | 10912 | msgid "do not create an empty pack output" |
07432cef | 10913 | msgstr "不创建空的包输出" |
ef317cd5 | 10914 | |
87cb7997 | 10915 | #: builtin/pack-objects.c:2897 |
ef317cd5 | 10916 | msgid "read revision arguments from standard input" |
d9d56b23 | 10917 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 10918 | |
87cb7997 | 10919 | #: builtin/pack-objects.c:2899 |
ef317cd5 | 10920 | msgid "limit the objects to those that are not yet packed" |
07432cef | 10921 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 10922 | |
87cb7997 | 10923 | #: builtin/pack-objects.c:2902 |
ef317cd5 | 10924 | msgid "include objects reachable from any reference" |
07432cef | 10925 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 10926 | |
87cb7997 | 10927 | #: builtin/pack-objects.c:2905 |
ef317cd5 | 10928 | msgid "include objects referred by reflog entries" |
07432cef | 10929 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 10930 | |
87cb7997 | 10931 | #: builtin/pack-objects.c:2908 |
220c313c JX |
10932 | msgid "include objects referred to by the index" |
10933 | msgstr "包括被索引引用到的对象" | |
10934 | ||
87cb7997 | 10935 | #: builtin/pack-objects.c:2911 |
ef317cd5 | 10936 | msgid "output pack to stdout" |
07432cef | 10937 | msgstr "输出包到标准输出" |
ef317cd5 | 10938 | |
87cb7997 | 10939 | #: builtin/pack-objects.c:2913 |
ef317cd5 | 10940 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 10941 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 10942 | |
87cb7997 | 10943 | #: builtin/pack-objects.c:2915 |
ef317cd5 | 10944 | msgid "keep unreachable objects" |
07432cef | 10945 | msgstr "维持不可达的对象" |
ef317cd5 | 10946 | |
87cb7997 | 10947 | #: builtin/pack-objects.c:2917 |
5c57d762 JX |
10948 | msgid "pack loose unreachable objects" |
10949 | msgstr "打包松散的不可达对象" | |
10950 | ||
87cb7997 | 10951 | #: builtin/pack-objects.c:2919 |
ef317cd5 | 10952 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 10953 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 10954 | |
87cb7997 | 10955 | #: builtin/pack-objects.c:2922 |
ef317cd5 | 10956 | msgid "create thin packs" |
07432cef | 10957 | msgstr "创建精简包" |
ef317cd5 | 10958 | |
87cb7997 | 10959 | #: builtin/pack-objects.c:2924 |
04cb2f28 | 10960 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 10961 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 10962 | |
87cb7997 | 10963 | #: builtin/pack-objects.c:2926 |
ef317cd5 | 10964 | msgid "ignore packs that have companion .keep file" |
07432cef | 10965 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 10966 | |
87cb7997 | 10967 | #: builtin/pack-objects.c:2928 |
ef317cd5 | 10968 | msgid "pack compression level" |
07432cef | 10969 | msgstr "打包压缩级别" |
ef317cd5 | 10970 | |
87cb7997 | 10971 | #: builtin/pack-objects.c:2930 |
ef317cd5 | 10972 | msgid "do not hide commits by grafts" |
cfff71a9 | 10973 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 10974 | |
87cb7997 | 10975 | #: builtin/pack-objects.c:2932 |
6c94aba5 JX |
10976 | msgid "use a bitmap index if available to speed up counting objects" |
10977 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
10978 | ||
87cb7997 | 10979 | #: builtin/pack-objects.c:2934 |
6c94aba5 JX |
10980 | msgid "write a bitmap index together with the pack index" |
10981 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
10982 | ||
87cb7997 | 10983 | #: builtin/pack-objects.c:3061 |
6c94aba5 JX |
10984 | msgid "Counting objects" |
10985 | msgstr "对象计数中" | |
10986 | ||
ef317cd5 | 10987 | #: builtin/pack-refs.c:6 |
814ff314 JX |
10988 | msgid "git pack-refs [<options>]" |
10989 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 10990 | |
ef317cd5 JX |
10991 | #: builtin/pack-refs.c:14 |
10992 | msgid "pack everything" | |
07432cef | 10993 | msgstr "打包一切" |
c04f5ac3 | 10994 | |
ef317cd5 JX |
10995 | #: builtin/pack-refs.c:15 |
10996 | msgid "prune loose refs (default)" | |
07432cef | 10997 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 10998 | |
ef317cd5 | 10999 | #: builtin/prune-packed.c:7 |
814ff314 JX |
11000 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
11001 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 11002 | |
220c313c | 11003 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
11004 | msgid "Removing duplicate objects" |
11005 | msgstr "正在删除重复对象" | |
11006 | ||
5bb01d4f | 11007 | #: builtin/prune.c:11 |
ef317cd5 | 11008 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 11009 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 11010 | |
1a79b2f1 | 11011 | #: builtin/prune.c:106 |
1b7f4a34 JX |
11012 | msgid "report pruned objects" |
11013 | msgstr "报告清除的对象" | |
11014 | ||
1a79b2f1 | 11015 | #: builtin/prune.c:109 |
1b7f4a34 JX |
11016 | msgid "expire objects older than <time>" |
11017 | msgstr "使早于给定时间的对象过期" | |
11018 | ||
94550ed3 JX |
11019 | #: builtin/prune.c:123 |
11020 | msgid "cannot prune in a precious-objects repo" | |
11021 | msgstr "不能在珍品仓库中执行清理操作" | |
11022 | ||
a0b6b246 JX |
11023 | #: builtin/pull.c:51 builtin/pull.c:53 |
11024 | #, c-format | |
11025 | msgid "Invalid value for %s: %s" | |
11026 | msgstr "%s 的值无效:%s" | |
11027 | ||
11028 | #: builtin/pull.c:73 | |
94550ed3 | 11029 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
11030 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
11031 | ||
a0b6b246 | 11032 | #: builtin/pull.c:121 |
1b7f4a34 JX |
11033 | msgid "Options related to merging" |
11034 | msgstr "和合并相关的选项" | |
11035 | ||
a0b6b246 | 11036 | #: builtin/pull.c:124 |
1b7f4a34 JX |
11037 | msgid "incorporate changes by rebasing rather than merging" |
11038 | msgstr "使用变基操作取代合并操作以合入修改" | |
11039 | ||
87cb7997 | 11040 | #: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 |
1b7f4a34 JX |
11041 | msgid "allow fast-forward" |
11042 | msgstr "允许快进式" | |
11043 | ||
a0b6b246 | 11044 | #: builtin/pull.c:157 |
5b04ee3b JX |
11045 | msgid "automatically stash/stash pop before and after rebase" |
11046 | msgstr "自动在变基操作前后执行 stash/stash pop" | |
11047 | ||
a0b6b246 | 11048 | #: builtin/pull.c:173 |
1b7f4a34 JX |
11049 | msgid "Options related to fetching" |
11050 | msgstr "和获取相关的参数" | |
11051 | ||
a0b6b246 | 11052 | #: builtin/pull.c:195 |
276ceeaa JX |
11053 | msgid "number of submodules pulled in parallel" |
11054 | msgstr "并发拉取的子模组的数量" | |
11055 | ||
a0b6b246 | 11056 | #: builtin/pull.c:284 |
1b7f4a34 JX |
11057 | #, c-format |
11058 | msgid "Invalid value for pull.ff: %s" | |
11059 | msgstr "pull.ff 的取值无效:%s" | |
11060 | ||
a0b6b246 | 11061 | #: builtin/pull.c:397 |
1b7f4a34 JX |
11062 | msgid "" |
11063 | "There is no candidate for rebasing against among the refs that you just " | |
11064 | "fetched." | |
11065 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
11066 | ||
a0b6b246 | 11067 | #: builtin/pull.c:399 |
1b7f4a34 JX |
11068 | msgid "" |
11069 | "There are no candidates for merging among the refs that you just fetched." | |
11070 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
11071 | ||
a0b6b246 | 11072 | #: builtin/pull.c:400 |
1b7f4a34 JX |
11073 | msgid "" |
11074 | "Generally this means that you provided a wildcard refspec which had no\n" | |
11075 | "matches on the remote end." | |
11076 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
11077 | ||
a0b6b246 | 11078 | #: builtin/pull.c:403 |
1b7f4a34 JX |
11079 | #, c-format |
11080 | msgid "" | |
11081 | "You asked to pull from the remote '%s', but did not specify\n" | |
11082 | "a branch. Because this is not the default configured remote\n" | |
11083 | "for your current branch, you must specify a branch on the command line." | |
11084 | msgstr "" | |
11085 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
11086 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
11087 | ||
a0b6b246 | 11088 | #: builtin/pull.c:408 git-parse-remote.sh:73 |
1b7f4a34 JX |
11089 | msgid "You are not currently on a branch." |
11090 | msgstr "您当前不在一个分支上。" | |
11091 | ||
a0b6b246 | 11092 | #: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79 |
1b7f4a34 JX |
11093 | msgid "Please specify which branch you want to rebase against." |
11094 | msgstr "请指定您要变基到哪一个分支。" | |
11095 | ||
a0b6b246 | 11096 | #: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82 |
1b7f4a34 JX |
11097 | msgid "Please specify which branch you want to merge with." |
11098 | msgstr "请指定您要合并哪一个分支。" | |
11099 | ||
a0b6b246 | 11100 | #: builtin/pull.c:413 builtin/pull.c:428 |
1b7f4a34 JX |
11101 | msgid "See git-pull(1) for details." |
11102 | msgstr "详见 git-pull(1)。" | |
11103 | ||
a0b6b246 | 11104 | #: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 |
5b04ee3b JX |
11105 | #: git-parse-remote.sh:64 |
11106 | msgid "<remote>" | |
11107 | msgstr "<远程>" | |
11108 | ||
60638e98 | 11109 | #: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 |
5b04ee3b JX |
11110 | #: git-parse-remote.sh:65 |
11111 | msgid "<branch>" | |
11112 | msgstr "<分支>" | |
11113 | ||
a0b6b246 | 11114 | #: builtin/pull.c:423 git-parse-remote.sh:75 |
1b7f4a34 JX |
11115 | msgid "There is no tracking information for the current branch." |
11116 | msgstr "当前分支没有跟踪信息。" | |
11117 | ||
a0b6b246 | 11118 | #: builtin/pull.c:432 git-parse-remote.sh:95 |
1b7f4a34 | 11119 | msgid "" |
5b04ee3b JX |
11120 | "If you wish to set tracking information for this branch you can do so with:" |
11121 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 11122 | |
a0b6b246 | 11123 | #: builtin/pull.c:437 |
1b7f4a34 JX |
11124 | #, c-format |
11125 | msgid "" | |
11126 | "Your configuration specifies to merge with the ref '%s'\n" | |
11127 | "from the remote, but no such ref was fetched." | |
11128 | msgstr "" | |
11129 | "您的配置中指定要合并远程的引用 '%s',\n" | |
11130 | "但是没有获取到这个引用。" | |
7ac1c0ad | 11131 | |
a0b6b246 | 11132 | #: builtin/pull.c:754 |
5c57d762 JX |
11133 | msgid "ignoring --verify-signatures for rebase" |
11134 | msgstr "为变基操作忽略 --verify-signatures" | |
11135 | ||
a0b6b246 | 11136 | #: builtin/pull.c:801 |
5b04ee3b JX |
11137 | msgid "--[no-]autostash option is only valid with --rebase." |
11138 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
11139 | ||
a0b6b246 | 11140 | #: builtin/pull.c:809 |
1b7f4a34 JX |
11141 | msgid "Updating an unborn branch with changes added to the index." |
11142 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
11143 | ||
a0b6b246 JX |
11144 | #: builtin/pull.c:812 |
11145 | msgid "pull with rebase" | |
11146 | msgstr "变基式拉取" | |
11147 | ||
11148 | #: builtin/pull.c:813 | |
11149 | msgid "please commit or stash them." | |
11150 | msgstr "请提交或为它们保存进度。" | |
11151 | ||
11152 | #: builtin/pull.c:838 | |
1b7f4a34 JX |
11153 | #, c-format |
11154 | msgid "" | |
11155 | "fetch updated the current branch head.\n" | |
11156 | "fast-forwarding your working tree from\n" | |
11157 | "commit %s." | |
11158 | msgstr "" | |
11159 | "fetch 更新了当前的分支。快进您的工作区\n" | |
11160 | "至提交 %s。" | |
ef317cd5 | 11161 | |
a0b6b246 | 11162 | #: builtin/pull.c:843 |
1b7f4a34 JX |
11163 | #, c-format |
11164 | msgid "" | |
11165 | "Cannot fast-forward your working tree.\n" | |
11166 | "After making sure that you saved anything precious from\n" | |
11167 | "$ git diff %s\n" | |
11168 | "output, run\n" | |
11169 | "$ git reset --hard\n" | |
11170 | "to recover." | |
11171 | msgstr "" | |
11172 | "您当前的工作区无法执行快进操作。\n" | |
11173 | "首先执行如下命令:\n" | |
11174 | "$ git diff %s\n" | |
11175 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
11176 | "$ git reset --hard\n" | |
11177 | "恢复之前的状态。" | |
11178 | ||
a0b6b246 | 11179 | #: builtin/pull.c:858 |
1b7f4a34 JX |
11180 | msgid "Cannot merge multiple branches into empty head." |
11181 | msgstr "无法将多个分支合并到空分支。" | |
11182 | ||
a0b6b246 | 11183 | #: builtin/pull.c:862 |
1b7f4a34 JX |
11184 | msgid "Cannot rebase onto multiple branches." |
11185 | msgstr "无法变基到多个分支。" | |
11186 | ||
89f80d72 | 11187 | #: builtin/push.c:16 |
ef317cd5 | 11188 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 11189 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 11190 | |
276ceeaa | 11191 | #: builtin/push.c:89 |
c04f5ac3 | 11192 | msgid "tag shorthand without <tag>" |
55a16ee4 | 11193 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 11194 | |
276ceeaa | 11195 | #: builtin/push.c:99 |
c04f5ac3 | 11196 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 11197 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 11198 | |
276ceeaa | 11199 | #: builtin/push.c:143 |
8ada9598 JX |
11200 | msgid "" |
11201 | "\n" | |
11202 | "To choose either option permanently, see push.default in 'git help config'." | |
11203 | msgstr "" | |
81809b99 JX |
11204 | "\n" |
11205 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 11206 | |
276ceeaa | 11207 | #: builtin/push.c:146 |
8ada9598 JX |
11208 | #, c-format |
11209 | msgid "" | |
11210 | "The upstream branch of your current branch does not match\n" | |
11211 | "the name of your current branch. To push to the upstream branch\n" | |
11212 | "on the remote, use\n" | |
11213 | "\n" | |
11214 | " git push %s HEAD:%s\n" | |
11215 | "\n" | |
11216 | "To push to the branch of the same name on the remote, use\n" | |
11217 | "\n" | |
11218 | " git push %s %s\n" | |
11219 | "%s" | |
11220 | msgstr "" | |
81809b99 JX |
11221 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
11222 | "上游分支,使用\n" | |
11223 | "\n" | |
11224 | " git push %s HEAD:%s\n" | |
11225 | "\n" | |
11226 | "为推送至远程同名分支,使用\n" | |
11227 | "\n" | |
11228 | " git push %s %s\n" | |
11229 | "%s" | |
8ada9598 | 11230 | |
276ceeaa | 11231 | #: builtin/push.c:161 |
c04f5ac3 JX |
11232 | #, c-format |
11233 | msgid "" | |
11234 | "You are not currently on a branch.\n" | |
11235 | "To push the history leading to the current (detached HEAD)\n" | |
11236 | "state now, use\n" | |
11237 | "\n" | |
11238 | " git push %s HEAD:<name-of-remote-branch>\n" | |
11239 | msgstr "" | |
11240 | "您当前不在一个分支上。\n" | |
90e6ef53 | 11241 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 11242 | "\n" |
d9d56b23 | 11243 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 11244 | |
276ceeaa | 11245 | #: builtin/push.c:175 |
c04f5ac3 JX |
11246 | #, c-format |
11247 | msgid "" | |
11248 | "The current branch %s has no upstream branch.\n" | |
11249 | "To push the current branch and set the remote as upstream, use\n" | |
11250 | "\n" | |
11251 | " git push --set-upstream %s %s\n" | |
11252 | msgstr "" | |
11253 | "当前分支 %s 没有对应的上游分支。\n" | |
11254 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
11255 | "\n" | |
11256 | " git push --set-upstream %s %s\n" | |
11257 | ||
276ceeaa | 11258 | #: builtin/push.c:183 |
c04f5ac3 JX |
11259 | #, c-format |
11260 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
11261 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
11262 | ||
276ceeaa | 11263 | #: builtin/push.c:186 |
73a60cd2 JX |
11264 | #, c-format |
11265 | msgid "" | |
11266 | "You are pushing to remote '%s', which is not the upstream of\n" | |
11267 | "your current branch '%s', without telling me what to push\n" | |
11268 | "to update which remote branch." | |
11269 | msgstr "" | |
11270 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
11271 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
11272 | ||
1a79b2f1 | 11273 | #: builtin/push.c:245 |
c04f5ac3 JX |
11274 | msgid "" |
11275 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 11276 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 11277 | |
1a79b2f1 | 11278 | #: builtin/push.c:252 |
170e9899 JX |
11279 | msgid "" |
11280 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
11281 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
11282 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
11283 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11284 | msgstr "" | |
eff6d3a9 | 11285 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 11286 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 11287 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 11288 | |
1a79b2f1 | 11289 | #: builtin/push.c:258 |
170e9899 JX |
11290 | msgid "" |
11291 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
11292 | "counterpart. Check out this branch and integrate the remote changes\n" |
11293 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
11294 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11295 | msgstr "" | |
eff6d3a9 | 11296 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 11297 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 11298 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 11299 | |
1a79b2f1 | 11300 | #: builtin/push.c:264 |
07432cef | 11301 | msgid "" |
a77c07d9 JX |
11302 | "Updates were rejected because the remote contains work that you do\n" |
11303 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
11304 | "to the same ref. You may want to first integrate the remote changes\n" |
11305 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
11306 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11307 | msgstr "" | |
160fb2b2 JX |
11308 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
11309 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 11310 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
11311 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
11312 | ||
1a79b2f1 | 11313 | #: builtin/push.c:271 |
a77c07d9 | 11314 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 11315 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 11316 | |
1a79b2f1 | 11317 | #: builtin/push.c:274 |
a77c07d9 JX |
11318 | msgid "" |
11319 | "You cannot update a remote ref that points at a non-commit object,\n" | |
11320 | "or update a remote ref to make it point at a non-commit object,\n" | |
11321 | "without using the '--force' option.\n" | |
11322 | msgstr "" | |
11323 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
11324 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 11325 | |
1a79b2f1 | 11326 | #: builtin/push.c:334 |
c04f5ac3 JX |
11327 | #, c-format |
11328 | msgid "Pushing to %s\n" | |
11329 | msgstr "推送到 %s\n" | |
11330 | ||
1a79b2f1 | 11331 | #: builtin/push.c:338 |
c04f5ac3 JX |
11332 | #, c-format |
11333 | msgid "failed to push some refs to '%s'" | |
11334 | msgstr "无法推送一些引用到 '%s'" | |
11335 | ||
1a79b2f1 | 11336 | #: builtin/push.c:369 |
c04f5ac3 JX |
11337 | #, c-format |
11338 | msgid "bad repository '%s'" | |
160fb2b2 | 11339 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 11340 | |
1a79b2f1 | 11341 | #: builtin/push.c:370 |
c04f5ac3 JX |
11342 | msgid "" |
11343 | "No configured push destination.\n" | |
11344 | "Either specify the URL from the command-line or configure a remote " | |
11345 | "repository using\n" | |
11346 | "\n" | |
11347 | " git remote add <name> <url>\n" | |
11348 | "\n" | |
11349 | "and then push using the remote name\n" | |
11350 | "\n" | |
11351 | " git push <name>\n" | |
11352 | msgstr "" | |
90e6ef53 | 11353 | "没有配置推送目标。\n" |
4375c10e | 11354 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 11355 | "\n" |
d9d56b23 | 11356 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 11357 | "\n" |
160fb2b2 | 11358 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 11359 | "\n" |
d9d56b23 | 11360 | " git push <名称>\n" |
c04f5ac3 | 11361 | |
1a79b2f1 | 11362 | #: builtin/push.c:388 |
c04f5ac3 JX |
11363 | msgid "--all and --tags are incompatible" |
11364 | msgstr "--all 和 --tags 不兼容" | |
11365 | ||
1a79b2f1 | 11366 | #: builtin/push.c:389 |
c04f5ac3 | 11367 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 11368 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 11369 | |
1a79b2f1 | 11370 | #: builtin/push.c:394 |
c04f5ac3 JX |
11371 | msgid "--mirror and --tags are incompatible" |
11372 | msgstr "--mirror 和 --tags 不兼容" | |
11373 | ||
1a79b2f1 | 11374 | #: builtin/push.c:395 |
c04f5ac3 | 11375 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 11376 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 11377 | |
1a79b2f1 | 11378 | #: builtin/push.c:400 |
c04f5ac3 JX |
11379 | msgid "--all and --mirror are incompatible" |
11380 | msgstr "--all 和 --mirror 不兼容" | |
11381 | ||
1a79b2f1 | 11382 | #: builtin/push.c:518 |
ef317cd5 | 11383 | msgid "repository" |
160fb2b2 | 11384 | msgstr "仓库" |
ef317cd5 | 11385 | |
87cb7997 | 11386 | #: builtin/push.c:519 builtin/send-pack.c:162 |
ef317cd5 | 11387 | msgid "push all refs" |
07432cef | 11388 | msgstr "推送所有引用" |
ef317cd5 | 11389 | |
87cb7997 | 11390 | #: builtin/push.c:520 builtin/send-pack.c:164 |
ef317cd5 | 11391 | msgid "mirror all refs" |
07432cef | 11392 | msgstr "镜像所有引用" |
ef317cd5 | 11393 | |
1a79b2f1 | 11394 | #: builtin/push.c:522 |
ef317cd5 | 11395 | msgid "delete refs" |
07432cef | 11396 | msgstr "删除引用" |
ef317cd5 | 11397 | |
1a79b2f1 | 11398 | #: builtin/push.c:523 |
ef317cd5 | 11399 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 11400 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 11401 | |
87cb7997 | 11402 | #: builtin/push.c:526 builtin/send-pack.c:165 |
ef317cd5 JX |
11403 | msgid "force updates" |
11404 | msgstr "强制更新" | |
11405 | ||
87cb7997 | 11406 | #: builtin/push.c:528 builtin/send-pack.c:179 |
90314792 JX |
11407 | msgid "refname>:<expect" |
11408 | msgstr "引用名>:<期望值" | |
11409 | ||
87cb7997 | 11410 | #: builtin/push.c:529 builtin/send-pack.c:180 |
90314792 JX |
11411 | msgid "require old value of ref to be at this value" |
11412 | msgstr "要求引用旧的取值为设定值" | |
11413 | ||
1a79b2f1 | 11414 | #: builtin/push.c:532 |
ef317cd5 | 11415 | msgid "control recursive pushing of submodules" |
07432cef | 11416 | msgstr "控制子模组的递归推送" |
ef317cd5 | 11417 | |
87cb7997 | 11418 | #: builtin/push.c:534 builtin/send-pack.c:173 |
ef317cd5 | 11419 | msgid "use thin pack" |
07432cef | 11420 | msgstr "使用精简打包" |
ef317cd5 | 11421 | |
87cb7997 JX |
11422 | #: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 |
11423 | #: builtin/send-pack.c:160 | |
ef317cd5 | 11424 | msgid "receive pack program" |
07432cef | 11425 | msgstr "接收包程序" |
ef317cd5 | 11426 | |
1a79b2f1 | 11427 | #: builtin/push.c:537 |
ef317cd5 | 11428 | msgid "set upstream for git pull/status" |
07432cef | 11429 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 11430 | |
1a79b2f1 | 11431 | #: builtin/push.c:540 |
ef317cd5 | 11432 | msgid "prune locally removed refs" |
07432cef | 11433 | msgstr "清除本地删除的引用" |
ef317cd5 | 11434 | |
1a79b2f1 | 11435 | #: builtin/push.c:542 |
a77c07d9 JX |
11436 | msgid "bypass pre-push hook" |
11437 | msgstr "绕过 pre-push 钩子" | |
11438 | ||
1a79b2f1 | 11439 | #: builtin/push.c:543 |
1003b3a5 | 11440 | msgid "push missing but relevant tags" |
55a16ee4 | 11441 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 11442 | |
87cb7997 | 11443 | #: builtin/push.c:546 builtin/send-pack.c:167 |
220c313c JX |
11444 | msgid "GPG sign the push" |
11445 | msgstr "用 GPG 为推送签名" | |
11446 | ||
87cb7997 | 11447 | #: builtin/push.c:548 builtin/send-pack.c:174 |
814ff314 JX |
11448 | msgid "request atomic transaction on remote side" |
11449 | msgstr "需要远端支持原子事务" | |
11450 | ||
87cb7997 | 11451 | #: builtin/push.c:549 builtin/send-pack.c:170 |
5c57d762 JX |
11452 | msgid "server-specific" |
11453 | msgstr "server-specific" | |
11454 | ||
87cb7997 | 11455 | #: builtin/push.c:549 builtin/send-pack.c:171 |
5c57d762 | 11456 | msgid "option to transmit" |
9a4b694c | 11457 | msgstr "传输选项" |
5c57d762 | 11458 | |
1a79b2f1 | 11459 | #: builtin/push.c:563 |
c04f5ac3 JX |
11460 | msgid "--delete is incompatible with --all, --mirror and --tags" |
11461 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
11462 | ||
1a79b2f1 | 11463 | #: builtin/push.c:565 |
c04f5ac3 JX |
11464 | msgid "--delete doesn't make sense without any refs" |
11465 | msgstr "--delete 未接任何引用没有意义" | |
11466 | ||
1a79b2f1 | 11467 | #: builtin/push.c:584 |
5c57d762 JX |
11468 | msgid "push options must not have new line characters" |
11469 | msgstr "推送选项不能有换行符" | |
11470 | ||
87cb7997 | 11471 | #: builtin/read-tree.c:40 |
ef317cd5 | 11472 | msgid "" |
1b7f4a34 | 11473 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
11474 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
11475 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
11476 | msgstr "" | |
1b7f4a34 | 11477 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 11478 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 11479 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 11480 | |
87cb7997 | 11481 | #: builtin/read-tree.c:130 |
ef317cd5 | 11482 | msgid "write resulting index to <file>" |
d9d56b23 | 11483 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 11484 | |
87cb7997 | 11485 | #: builtin/read-tree.c:133 |
ef317cd5 | 11486 | msgid "only empty the index" |
07432cef | 11487 | msgstr "只是清空索引" |
ef317cd5 | 11488 | |
87cb7997 | 11489 | #: builtin/read-tree.c:135 |
ef317cd5 | 11490 | msgid "Merging" |
07432cef | 11491 | msgstr "合并" |
ef317cd5 | 11492 | |
87cb7997 | 11493 | #: builtin/read-tree.c:137 |
ef317cd5 | 11494 | msgid "perform a merge in addition to a read" |
07432cef | 11495 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 11496 | |
87cb7997 | 11497 | #: builtin/read-tree.c:139 |
ef317cd5 | 11498 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 11499 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 11500 | |
87cb7997 | 11501 | #: builtin/read-tree.c:141 |
ef317cd5 | 11502 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 11503 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 11504 | |
87cb7997 | 11505 | #: builtin/read-tree.c:143 |
ef317cd5 | 11506 | msgid "same as -m, but discard unmerged entries" |
07432cef | 11507 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 11508 | |
87cb7997 | 11509 | #: builtin/read-tree.c:144 |
ef317cd5 | 11510 | msgid "<subdirectory>/" |
07432cef | 11511 | msgstr "<子目录>/" |
ef317cd5 | 11512 | |
87cb7997 | 11513 | #: builtin/read-tree.c:145 |
ef317cd5 | 11514 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 11515 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 11516 | |
87cb7997 | 11517 | #: builtin/read-tree.c:148 |
ef317cd5 | 11518 | msgid "update working tree with merge result" |
07432cef | 11519 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 11520 | |
87cb7997 | 11521 | #: builtin/read-tree.c:150 |
ef317cd5 | 11522 | msgid "gitignore" |
07432cef | 11523 | msgstr "gitignore" |
ef317cd5 | 11524 | |
87cb7997 | 11525 | #: builtin/read-tree.c:151 |
ef317cd5 | 11526 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 11527 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 11528 | |
87cb7997 | 11529 | #: builtin/read-tree.c:154 |
ef317cd5 | 11530 | msgid "don't check the working tree after merging" |
07432cef | 11531 | msgstr "合并后不检查工作区" |
ef317cd5 | 11532 | |
87cb7997 | 11533 | #: builtin/read-tree.c:155 |
ef317cd5 | 11534 | msgid "don't update the index or the work tree" |
07432cef | 11535 | msgstr "不更新索引区和工作区" |
ef317cd5 | 11536 | |
87cb7997 | 11537 | #: builtin/read-tree.c:157 |
ef317cd5 | 11538 | msgid "skip applying sparse checkout filter" |
07432cef | 11539 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 11540 | |
87cb7997 | 11541 | #: builtin/read-tree.c:159 |
ef317cd5 | 11542 | msgid "debug unpack-trees" |
07432cef | 11543 | msgstr "调试 unpack-trees" |
ef317cd5 | 11544 | |
87cb7997 JX |
11545 | #: builtin/rebase--helper.c:7 |
11546 | msgid "git rebase--helper [<options>]" | |
11547 | msgstr "git rebase--helper [<选项>]" | |
11548 | ||
11549 | #: builtin/rebase--helper.c:19 | |
11550 | msgid "continue rebase" | |
11551 | msgstr "继续变基" | |
11552 | ||
11553 | #: builtin/rebase--helper.c:21 | |
11554 | msgid "abort rebase" | |
11555 | msgstr "中止变基" | |
11556 | ||
11557 | #: builtin/receive-pack.c:27 | |
5b04ee3b JX |
11558 | msgid "git receive-pack <git-dir>" |
11559 | msgstr "git receive-pack <git-dir>" | |
11560 | ||
60638e98 | 11561 | #: builtin/receive-pack.c:795 |
a0b6b246 JX |
11562 | msgid "" |
11563 | "By default, updating the current branch in a non-bare repository\n" | |
11564 | "is denied, because it will make the index and work tree inconsistent\n" | |
11565 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
11566 | "the work tree to HEAD.\n" | |
11567 | "\n" | |
1a79b2f1 JX |
11568 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
11569 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
11570 | "its current branch; however, this is not recommended unless you\n" |
11571 | "arranged to update its work tree to match what you pushed in some\n" | |
11572 | "other way.\n" | |
11573 | "\n" | |
11574 | "To squelch this message and still keep the default behaviour, set\n" | |
11575 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
11576 | msgstr "" | |
11577 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
11578 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
11579 | "\n" | |
11580 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
11581 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
11582 | "用某种方式将其工作区更新至您推送的状态。\n" | |
11583 | "\n" | |
11584 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
11585 | "配置变量为 'refuse'。" | |
11586 | ||
60638e98 | 11587 | #: builtin/receive-pack.c:815 |
a0b6b246 JX |
11588 | msgid "" |
11589 | "By default, deleting the current branch is denied, because the next\n" | |
11590 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
11591 | "\n" | |
11592 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
11593 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
11594 | "current branch, with or without a warning message.\n" | |
11595 | "\n" | |
11596 | "To squelch this message, you can set it to 'refuse'." | |
11597 | msgstr "" | |
11598 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 11599 | "导致困惑。\n" |
a0b6b246 JX |
11600 | "\n" |
11601 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 11602 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
11603 | "\n" |
11604 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
11605 | ||
60638e98 | 11606 | #: builtin/receive-pack.c:1888 |
5b04ee3b JX |
11607 | msgid "quiet" |
11608 | msgstr "静默模式" | |
11609 | ||
60638e98 | 11610 | #: builtin/receive-pack.c:1902 |
5b04ee3b JX |
11611 | msgid "You must specify a directory." |
11612 | msgstr "您必须指定一个目录。" | |
11613 | ||
276ceeaa | 11614 | #: builtin/reflog.c:423 |
2e8451e8 | 11615 | #, c-format |
1b7f4a34 | 11616 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
11617 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
11618 | ||
276ceeaa | 11619 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
2e8451e8 JX |
11620 | #, c-format |
11621 | msgid "'%s' is not a valid timestamp" | |
11622 | msgstr "'%s' 不是一个有效的时间戳" | |
11623 | ||
cfff71a9 | 11624 | #: builtin/remote.c:12 |
ef317cd5 | 11625 | msgid "git remote [-v | --verbose]" |
07432cef | 11626 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 11627 | |
cfff71a9 | 11628 | #: builtin/remote.c:13 |
ef317cd5 | 11629 | msgid "" |
814ff314 | 11630 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
11631 | "mirror=<fetch|push>] <name> <url>" |
11632 | msgstr "" | |
814ff314 | 11633 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 11634 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 11635 | |
94550ed3 | 11636 | #: builtin/remote.c:14 builtin/remote.c:34 |
ef317cd5 | 11637 | msgid "git remote rename <old> <new>" |
07432cef | 11638 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 11639 | |
94550ed3 | 11640 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 11641 | msgid "git remote remove <name>" |
07432cef | 11642 | msgstr "git remote remove <名称>" |
ef317cd5 | 11643 | |
94550ed3 | 11644 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
11645 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
11646 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 11647 | |
cfff71a9 | 11648 | #: builtin/remote.c:17 |
ef317cd5 | 11649 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 11650 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 11651 | |
cfff71a9 | 11652 | #: builtin/remote.c:18 |
ef317cd5 | 11653 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 11654 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 11655 | |
cfff71a9 | 11656 | #: builtin/remote.c:19 |
ef317cd5 JX |
11657 | msgid "" |
11658 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 11659 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 11660 | |
cfff71a9 | 11661 | #: builtin/remote.c:20 |
ef317cd5 | 11662 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 11663 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 11664 | |
94550ed3 JX |
11665 | #: builtin/remote.c:21 builtin/remote.c:70 |
11666 | msgid "git remote get-url [--push] [--all] <name>" | |
11667 | msgstr "git remote get-url [--push] [--all] <名称>" | |
11668 | ||
11669 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 11670 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 11671 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 11672 | |
94550ed3 | 11673 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 11674 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 11675 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 11676 | |
94550ed3 | 11677 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 11678 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 11679 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 11680 | |
94550ed3 | 11681 | #: builtin/remote.c:29 |
ef317cd5 | 11682 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 11683 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 11684 | |
94550ed3 | 11685 | #: builtin/remote.c:49 |
ef317cd5 | 11686 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 11687 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 11688 | |
94550ed3 | 11689 | #: builtin/remote.c:50 |
ef317cd5 | 11690 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 11691 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 11692 | |
94550ed3 | 11693 | #: builtin/remote.c:55 |
ef317cd5 | 11694 | msgid "git remote show [<options>] <name>" |
07432cef | 11695 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 11696 | |
94550ed3 | 11697 | #: builtin/remote.c:60 |
ef317cd5 | 11698 | msgid "git remote prune [<options>] <name>" |
07432cef | 11699 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 11700 | |
94550ed3 | 11701 | #: builtin/remote.c:65 |
ef317cd5 | 11702 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 11703 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 11704 | |
94550ed3 | 11705 | #: builtin/remote.c:94 |
81809b99 | 11706 | #, c-format |
8ada9598 | 11707 | msgid "Updating %s" |
81809b99 | 11708 | msgstr "更新 %s 中" |
8ada9598 | 11709 | |
94550ed3 | 11710 | #: builtin/remote.c:126 |
8ada9598 JX |
11711 | msgid "" |
11712 | "--mirror is dangerous and deprecated; please\n" | |
11713 | "\t use --mirror=fetch or --mirror=push instead" | |
11714 | msgstr "" | |
81809b99 JX |
11715 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
11716 | "\t 或 --mirror=push" | |
8ada9598 | 11717 | |
94550ed3 | 11718 | #: builtin/remote.c:143 |
81809b99 | 11719 | #, c-format |
8ada9598 | 11720 | msgid "unknown mirror argument: %s" |
81809b99 | 11721 | msgstr "未知的镜像参数:%s" |
8ada9598 | 11722 | |
94550ed3 | 11723 | #: builtin/remote.c:159 |
ef317cd5 | 11724 | msgid "fetch the remote branches" |
07432cef | 11725 | msgstr "抓取远程的分支" |
ef317cd5 | 11726 | |
94550ed3 | 11727 | #: builtin/remote.c:161 |
ef317cd5 | 11728 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 11729 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 11730 | |
94550ed3 | 11731 | #: builtin/remote.c:164 |
ef317cd5 | 11732 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 11733 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 11734 | |
94550ed3 | 11735 | #: builtin/remote.c:166 |
ef317cd5 | 11736 | msgid "branch(es) to track" |
07432cef | 11737 | msgstr "跟踪的分支" |
ef317cd5 | 11738 | |
94550ed3 | 11739 | #: builtin/remote.c:167 |
ef317cd5 | 11740 | msgid "master branch" |
07432cef | 11741 | msgstr "主线分支" |
ef317cd5 | 11742 | |
94550ed3 | 11743 | #: builtin/remote.c:168 |
ef317cd5 | 11744 | msgid "push|fetch" |
07432cef | 11745 | msgstr "push|fetch" |
ef317cd5 | 11746 | |
94550ed3 | 11747 | #: builtin/remote.c:169 |
ef317cd5 | 11748 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 11749 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 11750 | |
94550ed3 | 11751 | #: builtin/remote.c:181 |
8ada9598 | 11752 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 11753 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 11754 | |
94550ed3 | 11755 | #: builtin/remote.c:183 |
8ada9598 | 11756 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 11757 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 11758 | |
5c57d762 | 11759 | #: builtin/remote.c:190 builtin/remote.c:629 |
81809b99 | 11760 | #, c-format |
8ada9598 | 11761 | msgid "remote %s already exists." |
81809b99 | 11762 | msgstr "远程 %s 已经存在。" |
8ada9598 | 11763 | |
5c57d762 | 11764 | #: builtin/remote.c:194 builtin/remote.c:633 |
81809b99 | 11765 | #, c-format |
8ada9598 | 11766 | msgid "'%s' is not a valid remote name" |
81809b99 | 11767 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 11768 | |
276ceeaa | 11769 | #: builtin/remote.c:234 |
81809b99 | 11770 | #, c-format |
8ada9598 | 11771 | msgid "Could not setup master '%s'" |
81809b99 | 11772 | msgstr "无法设置 master '%s'" |
8ada9598 | 11773 | |
276ceeaa | 11774 | #: builtin/remote.c:336 |
81809b99 | 11775 | #, c-format |
8ada9598 | 11776 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 11777 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 11778 | |
276ceeaa | 11779 | #: builtin/remote.c:437 builtin/remote.c:445 |
8ada9598 | 11780 | msgid "(matching)" |
81809b99 | 11781 | msgstr "(匹配)" |
8ada9598 | 11782 | |
276ceeaa | 11783 | #: builtin/remote.c:449 |
8ada9598 | 11784 | msgid "(delete)" |
81809b99 | 11785 | msgstr "(删除)" |
8ada9598 | 11786 | |
87cb7997 | 11787 | #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 |
81809b99 | 11788 | #, c-format |
8ada9598 | 11789 | msgid "No such remote: %s" |
81809b99 | 11790 | msgstr "没有这样的远程:%s" |
8ada9598 | 11791 | |
5c57d762 | 11792 | #: builtin/remote.c:639 |
81809b99 | 11793 | #, c-format |
8ada9598 | 11794 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 11795 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 11796 | |
5c57d762 | 11797 | #: builtin/remote.c:659 |
8ada9598 JX |
11798 | #, c-format |
11799 | msgid "" | |
d691f479 | 11800 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
11801 | "\t%s\n" |
11802 | "\tPlease update the configuration manually if necessary." | |
11803 | msgstr "" | |
160fb2b2 | 11804 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
11805 | "\t%s\n" |
11806 | "\t如果必要请手动更新配置。" | |
8ada9598 | 11807 | |
5c57d762 | 11808 | #: builtin/remote.c:695 |
81809b99 | 11809 | #, c-format |
8ada9598 | 11810 | msgid "deleting '%s' failed" |
81809b99 | 11811 | msgstr "删除 '%s' 失败" |
8ada9598 | 11812 | |
5c57d762 | 11813 | #: builtin/remote.c:729 |
81809b99 | 11814 | #, c-format |
8ada9598 | 11815 | msgid "creating '%s' failed" |
81809b99 | 11816 | msgstr "创建 '%s' 失败" |
8ada9598 | 11817 | |
87cb7997 | 11818 | #: builtin/remote.c:794 |
8ada9598 JX |
11819 | msgid "" |
11820 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
11821 | "to delete it, use:" | |
11822 | msgid_plural "" | |
11823 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
11824 | "to delete them, use:" | |
5ae481e0 JX |
11825 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
11826 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 11827 | |
87cb7997 | 11828 | #: builtin/remote.c:808 |
276ceeaa JX |
11829 | #, c-format |
11830 | msgid "Could not remove config section '%s'" | |
11831 | msgstr "不能移除配置小节 '%s'" | |
11832 | ||
87cb7997 | 11833 | #: builtin/remote.c:909 |
8ada9598 JX |
11834 | #, c-format |
11835 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 11836 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 11837 | |
87cb7997 | 11838 | #: builtin/remote.c:912 |
8ada9598 | 11839 | msgid " tracked" |
81809b99 | 11840 | msgstr " 已跟踪" |
8ada9598 | 11841 | |
87cb7997 | 11842 | #: builtin/remote.c:914 |
8ada9598 | 11843 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 11844 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 11845 | |
87cb7997 | 11846 | #: builtin/remote.c:916 |
8ada9598 | 11847 | msgid " ???" |
81809b99 | 11848 | msgstr " ???" |
8ada9598 | 11849 | |
87cb7997 | 11850 | #: builtin/remote.c:957 |
8ada9598 JX |
11851 | #, c-format |
11852 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 11853 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 11854 | |
87cb7997 | 11855 | #: builtin/remote.c:965 |
81809b99 | 11856 | #, c-format |
276ceeaa JX |
11857 | msgid "rebases interactively onto remote %s" |
11858 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 11859 | |
87cb7997 | 11860 | #: builtin/remote.c:966 |
5c57d762 JX |
11861 | #, c-format |
11862 | msgid "rebases onto remote %s" | |
11863 | msgstr "变基到远程 %s" | |
11864 | ||
87cb7997 | 11865 | #: builtin/remote.c:969 |
81809b99 | 11866 | #, c-format |
8ada9598 | 11867 | msgid " merges with remote %s" |
81809b99 | 11868 | msgstr " 与远程 %s 合并" |
8ada9598 | 11869 | |
87cb7997 | 11870 | #: builtin/remote.c:972 |
81809b99 | 11871 | #, c-format |
8ada9598 | 11872 | msgid "merges with remote %s" |
81809b99 | 11873 | msgstr "与远程 %s 合并" |
8ada9598 | 11874 | |
87cb7997 | 11875 | #: builtin/remote.c:975 |
5c57d762 JX |
11876 | #, c-format |
11877 | msgid "%-*s and with remote %s\n" | |
11878 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 11879 | |
87cb7997 | 11880 | #: builtin/remote.c:1018 |
8ada9598 | 11881 | msgid "create" |
81809b99 | 11882 | msgstr "创建" |
8ada9598 | 11883 | |
87cb7997 | 11884 | #: builtin/remote.c:1021 |
8ada9598 | 11885 | msgid "delete" |
81809b99 | 11886 | msgstr "删除" |
8ada9598 | 11887 | |
87cb7997 | 11888 | #: builtin/remote.c:1025 |
8ada9598 | 11889 | msgid "up to date" |
81809b99 | 11890 | msgstr "最新" |
8ada9598 | 11891 | |
87cb7997 | 11892 | #: builtin/remote.c:1028 |
8ada9598 | 11893 | msgid "fast-forwardable" |
81809b99 | 11894 | msgstr "可快进" |
8ada9598 | 11895 | |
87cb7997 | 11896 | #: builtin/remote.c:1031 |
8ada9598 | 11897 | msgid "local out of date" |
81809b99 | 11898 | msgstr "本地已过时" |
8ada9598 | 11899 | |
87cb7997 | 11900 | #: builtin/remote.c:1038 |
8ada9598 JX |
11901 | #, c-format |
11902 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 11903 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 11904 | |
87cb7997 | 11905 | #: builtin/remote.c:1041 |
8ada9598 JX |
11906 | #, c-format |
11907 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 11908 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 11909 | |
87cb7997 | 11910 | #: builtin/remote.c:1045 |
8ada9598 JX |
11911 | #, c-format |
11912 | msgid " %-*s forces to %s" | |
81809b99 | 11913 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 11914 | |
87cb7997 | 11915 | #: builtin/remote.c:1048 |
8ada9598 JX |
11916 | #, c-format |
11917 | msgid " %-*s pushes to %s" | |
81809b99 | 11918 | msgstr " %-*s 推送至 %s" |
8ada9598 | 11919 | |
87cb7997 | 11920 | #: builtin/remote.c:1116 |
ef317cd5 | 11921 | msgid "do not query remotes" |
07432cef | 11922 | msgstr "不查询远程" |
ef317cd5 | 11923 | |
87cb7997 | 11924 | #: builtin/remote.c:1143 |
81809b99 | 11925 | #, c-format |
8ada9598 | 11926 | msgid "* remote %s" |
81809b99 | 11927 | msgstr "* 远程 %s" |
8ada9598 | 11928 | |
87cb7997 | 11929 | #: builtin/remote.c:1144 |
8ada9598 JX |
11930 | #, c-format |
11931 | msgid " Fetch URL: %s" | |
81809b99 | 11932 | msgstr " 获取地址:%s" |
8ada9598 | 11933 | |
87cb7997 | 11934 | #: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 |
8ada9598 | 11935 | msgid "(no URL)" |
81809b99 | 11936 | msgstr "(无 URL)" |
8ada9598 | 11937 | |
5b04ee3b JX |
11938 | #. TRANSLATORS: the colon ':' should align with |
11939 | #. the one in " Fetch URL: %s" translation | |
87cb7997 | 11940 | #: builtin/remote.c:1156 builtin/remote.c:1158 |
8ada9598 JX |
11941 | #, c-format |
11942 | msgid " Push URL: %s" | |
81809b99 | 11943 | msgstr " 推送地址:%s" |
8ada9598 | 11944 | |
87cb7997 | 11945 | #: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 |
81809b99 | 11946 | #, c-format |
8ada9598 | 11947 | msgid " HEAD branch: %s" |
4375c10e | 11948 | msgstr " HEAD 分支:%s" |
8ada9598 | 11949 | |
5c57d762 | 11950 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 11951 | #: builtin/remote.c:1160 |
5c57d762 JX |
11952 | msgid "(not queried)" |
11953 | msgstr "(未查询)" | |
11954 | ||
87cb7997 | 11955 | #: builtin/remote.c:1162 |
5c57d762 JX |
11956 | msgid "(unknown)" |
11957 | msgstr "(未知)" | |
11958 | ||
87cb7997 | 11959 | #: builtin/remote.c:1166 |
8ada9598 JX |
11960 | #, c-format |
11961 | msgid "" | |
11962 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 11963 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 11964 | |
87cb7997 | 11965 | #: builtin/remote.c:1178 |
81809b99 | 11966 | #, c-format |
8ada9598 JX |
11967 | msgid " Remote branch:%s" |
11968 | msgid_plural " Remote branches:%s" | |
81809b99 | 11969 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 11970 | msgstr[1] " 远程分支:%s" |
8ada9598 | 11971 | |
81809b99 | 11972 | # 译者:中文字符串拼接,可删除前导空格 |
87cb7997 | 11973 | #: builtin/remote.c:1181 builtin/remote.c:1207 |
8ada9598 | 11974 | msgid " (status not queried)" |
81809b99 | 11975 | msgstr "(状态未查询)" |
8ada9598 | 11976 | |
87cb7997 | 11977 | #: builtin/remote.c:1190 |
8ada9598 JX |
11978 | msgid " Local branch configured for 'git pull':" |
11979 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 11980 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 11981 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 11982 | |
87cb7997 | 11983 | #: builtin/remote.c:1198 |
8ada9598 | 11984 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 11985 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 11986 | |
87cb7997 | 11987 | #: builtin/remote.c:1204 |
81809b99 | 11988 | #, c-format |
8ada9598 JX |
11989 | msgid " Local ref configured for 'git push'%s:" |
11990 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 11991 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 11992 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 11993 | |
87cb7997 | 11994 | #: builtin/remote.c:1225 |
ef317cd5 | 11995 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 11996 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 11997 | |
87cb7997 | 11998 | #: builtin/remote.c:1227 |
ef317cd5 | 11999 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 12000 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 12001 | |
87cb7997 | 12002 | #: builtin/remote.c:1242 |
8ada9598 | 12003 | msgid "Cannot determine remote HEAD" |
81809b99 | 12004 | msgstr "无法确定远程 HEAD" |
8ada9598 | 12005 | |
87cb7997 | 12006 | #: builtin/remote.c:1244 |
8ada9598 | 12007 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 12008 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 12009 | |
87cb7997 | 12010 | #: builtin/remote.c:1254 |
81809b99 | 12011 | #, c-format |
8ada9598 | 12012 | msgid "Could not delete %s" |
81809b99 | 12013 | msgstr "无法删除 %s" |
8ada9598 | 12014 | |
87cb7997 | 12015 | #: builtin/remote.c:1262 |
81809b99 | 12016 | #, c-format |
8ada9598 | 12017 | msgid "Not a valid ref: %s" |
81809b99 | 12018 | msgstr "不是一个有效引用:%s" |
8ada9598 | 12019 | |
87cb7997 | 12020 | #: builtin/remote.c:1264 |
81809b99 | 12021 | #, c-format |
8ada9598 | 12022 | msgid "Could not setup %s" |
81809b99 | 12023 | msgstr "不能设置 %s" |
8ada9598 JX |
12024 | |
12025 | # 译者:注意保持前导空格 | |
87cb7997 | 12026 | #: builtin/remote.c:1282 |
81809b99 | 12027 | #, c-format |
8ada9598 | 12028 | msgid " %s will become dangling!" |
07432cef | 12029 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
12030 | |
12031 | # 译者:注意保持前导空格 | |
87cb7997 | 12032 | #: builtin/remote.c:1283 |
81809b99 | 12033 | #, c-format |
8ada9598 | 12034 | msgid " %s has become dangling!" |
07432cef | 12035 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 12036 | |
87cb7997 | 12037 | #: builtin/remote.c:1293 |
81809b99 | 12038 | #, c-format |
8ada9598 | 12039 | msgid "Pruning %s" |
81809b99 | 12040 | msgstr "修剪 %s" |
8ada9598 | 12041 | |
87cb7997 | 12042 | #: builtin/remote.c:1294 |
8ada9598 JX |
12043 | #, c-format |
12044 | msgid "URL: %s" | |
81809b99 | 12045 | msgstr "URL:%s" |
8ada9598 | 12046 | |
87cb7997 | 12047 | #: builtin/remote.c:1310 |
8ada9598 JX |
12048 | #, c-format |
12049 | msgid " * [would prune] %s" | |
81809b99 | 12050 | msgstr " * [将删除] %s" |
8ada9598 | 12051 | |
87cb7997 | 12052 | #: builtin/remote.c:1313 |
8ada9598 JX |
12053 | #, c-format |
12054 | msgid " * [pruned] %s" | |
81809b99 | 12055 | msgstr " * [已删除] %s" |
8ada9598 | 12056 | |
87cb7997 | 12057 | #: builtin/remote.c:1358 |
ef317cd5 | 12058 | msgid "prune remotes after fetching" |
07432cef | 12059 | msgstr "抓取后清除远程" |
ef317cd5 | 12060 | |
87cb7997 | 12061 | #: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 |
81809b99 | 12062 | #, c-format |
8ada9598 | 12063 | msgid "No such remote '%s'" |
81809b99 | 12064 | msgstr "没有此远程 '%s'" |
8ada9598 | 12065 | |
87cb7997 | 12066 | #: builtin/remote.c:1437 |
ef317cd5 | 12067 | msgid "add branch" |
07432cef | 12068 | msgstr "添加分支" |
ef317cd5 | 12069 | |
87cb7997 | 12070 | #: builtin/remote.c:1444 |
8ada9598 | 12071 | msgid "no remote specified" |
81809b99 | 12072 | msgstr "未指定远程" |
8ada9598 | 12073 | |
87cb7997 | 12074 | #: builtin/remote.c:1461 |
94550ed3 JX |
12075 | msgid "query push URLs rather than fetch URLs" |
12076 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
12077 | ||
87cb7997 | 12078 | #: builtin/remote.c:1463 |
94550ed3 JX |
12079 | msgid "return all URLs" |
12080 | msgstr "返回所有 URL 地址" | |
12081 | ||
87cb7997 | 12082 | #: builtin/remote.c:1491 |
94550ed3 JX |
12083 | #, c-format |
12084 | msgid "no URLs configured for remote '%s'" | |
12085 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
12086 | ||
87cb7997 | 12087 | #: builtin/remote.c:1517 |
ef317cd5 | 12088 | msgid "manipulate push URLs" |
07432cef | 12089 | msgstr "操作推送 URLS" |
ef317cd5 | 12090 | |
87cb7997 | 12091 | #: builtin/remote.c:1519 |
ef317cd5 | 12092 | msgid "add URL" |
07432cef | 12093 | msgstr "添加 URL" |
ef317cd5 | 12094 | |
87cb7997 | 12095 | #: builtin/remote.c:1521 |
ef317cd5 | 12096 | msgid "delete URLs" |
07432cef | 12097 | msgstr "删除 URLS" |
ef317cd5 | 12098 | |
87cb7997 | 12099 | #: builtin/remote.c:1528 |
8ada9598 | 12100 | msgid "--add --delete doesn't make sense" |
81809b99 | 12101 | msgstr "--add --delete 无意义" |
8ada9598 | 12102 | |
87cb7997 | 12103 | #: builtin/remote.c:1569 |
81809b99 | 12104 | #, c-format |
8ada9598 | 12105 | msgid "Invalid old URL pattern: %s" |
4375c10e | 12106 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 12107 | |
87cb7997 | 12108 | #: builtin/remote.c:1577 |
81809b99 | 12109 | #, c-format |
8ada9598 | 12110 | msgid "No such URL found: %s" |
4375c10e | 12111 | msgstr "未找到此 URL:%s" |
8ada9598 | 12112 | |
87cb7997 | 12113 | #: builtin/remote.c:1579 |
8ada9598 | 12114 | msgid "Will not delete all non-push URLs" |
4375c10e | 12115 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 12116 | |
87cb7997 | 12117 | #: builtin/remote.c:1593 |
ef317cd5 | 12118 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 12119 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 12120 | |
87cb7997 | 12121 | #: builtin/remote.c:1624 |
a0b6b246 JX |
12122 | #, c-format |
12123 | msgid "Unknown subcommand: %s" | |
12124 | msgstr "未知子命令:%s" | |
12125 | ||
6acbf033 | 12126 | #: builtin/repack.c:17 |
814ff314 JX |
12127 | msgid "git repack [<options>]" |
12128 | msgstr "git repack [<选项>]" | |
90314792 | 12129 | |
1a79b2f1 JX |
12130 | #: builtin/repack.c:22 |
12131 | msgid "" | |
12132 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
12133 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
12134 | msgstr "" | |
12135 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
12136 | "或禁用 pack.writebitmaps 配置。" | |
12137 | ||
12138 | #: builtin/repack.c:166 | |
90314792 JX |
12139 | msgid "pack everything in a single pack" |
12140 | msgstr "所有内容打包到一个包文件中" | |
12141 | ||
1a79b2f1 | 12142 | #: builtin/repack.c:168 |
90314792 JX |
12143 | msgid "same as -a, and turn unreachable objects loose" |
12144 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
12145 | ||
1a79b2f1 | 12146 | #: builtin/repack.c:171 |
90314792 JX |
12147 | msgid "remove redundant packs, and run git-prune-packed" |
12148 | msgstr "删除多余的包,运行 git-prune-packed" | |
12149 | ||
1a79b2f1 | 12150 | #: builtin/repack.c:173 |
90314792 JX |
12151 | msgid "pass --no-reuse-delta to git-pack-objects" |
12152 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
12153 | ||
1a79b2f1 | 12154 | #: builtin/repack.c:175 |
90314792 JX |
12155 | msgid "pass --no-reuse-object to git-pack-objects" |
12156 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
12157 | ||
1a79b2f1 | 12158 | #: builtin/repack.c:177 |
90314792 JX |
12159 | msgid "do not run git-update-server-info" |
12160 | msgstr "不运行 git-update-server-info" | |
12161 | ||
1a79b2f1 | 12162 | #: builtin/repack.c:180 |
90314792 JX |
12163 | msgid "pass --local to git-pack-objects" |
12164 | msgstr "向 git-pack-objects 传递参数 --local" | |
12165 | ||
1a79b2f1 | 12166 | #: builtin/repack.c:182 |
6c94aba5 JX |
12167 | msgid "write bitmap index" |
12168 | msgstr "写 bitmap 索引" | |
12169 | ||
1a79b2f1 | 12170 | #: builtin/repack.c:183 |
90314792 JX |
12171 | msgid "approxidate" |
12172 | msgstr "近似日期" | |
12173 | ||
1a79b2f1 | 12174 | #: builtin/repack.c:184 |
90314792 JX |
12175 | msgid "with -A, do not loosen objects older than this" |
12176 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
12177 | ||
1a79b2f1 | 12178 | #: builtin/repack.c:186 |
5c57d762 JX |
12179 | msgid "with -a, repack unreachable objects" |
12180 | msgstr "使用 -a ,重新对不可达对象打包" | |
12181 | ||
1a79b2f1 | 12182 | #: builtin/repack.c:188 |
90314792 JX |
12183 | msgid "size of the window used for delta compression" |
12184 | msgstr "用于增量压缩的窗口值" | |
12185 | ||
1a79b2f1 | 12186 | #: builtin/repack.c:189 builtin/repack.c:193 |
8376b58d JX |
12187 | msgid "bytes" |
12188 | msgstr "字节" | |
12189 | ||
1a79b2f1 | 12190 | #: builtin/repack.c:190 |
90314792 JX |
12191 | msgid "same as the above, but limit memory size instead of entries count" |
12192 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
12193 | ||
1a79b2f1 | 12194 | #: builtin/repack.c:192 |
90314792 JX |
12195 | msgid "limits the maximum delta depth" |
12196 | msgstr "限制最大增量深度" | |
12197 | ||
1a79b2f1 | 12198 | #: builtin/repack.c:194 |
90314792 | 12199 | msgid "maximum size of each packfile" |
dbd6cced | 12200 | msgstr "每个包文件的最大尺寸" |
90314792 | 12201 | |
1a79b2f1 | 12202 | #: builtin/repack.c:196 |
6c94aba5 JX |
12203 | msgid "repack objects in packs marked with .keep" |
12204 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
12205 | ||
1a79b2f1 | 12206 | #: builtin/repack.c:206 |
94550ed3 JX |
12207 | msgid "cannot delete packs in a precious-objects repo" |
12208 | msgstr "不能删除珍品仓库中的打包文件" | |
12209 | ||
1a79b2f1 | 12210 | #: builtin/repack.c:210 |
5c57d762 JX |
12211 | msgid "--keep-unreachable and -A are incompatible" |
12212 | msgstr "--keep-unreachable 和 -A 不兼容" | |
12213 | ||
1a79b2f1 | 12214 | #: builtin/repack.c:400 builtin/worktree.c:115 |
90314792 | 12215 | #, c-format |
5c57d762 JX |
12216 | msgid "failed to remove '%s'" |
12217 | msgstr "无法删除 '%s'" | |
90314792 | 12218 | |
6acbf033 | 12219 | #: builtin/replace.c:19 |
ef317cd5 | 12220 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 12221 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 12222 | |
6acbf033 JX |
12223 | #: builtin/replace.c:20 |
12224 | msgid "git replace [-f] --edit <object>" | |
12225 | msgstr "git replace [-f] --edit <对象>" | |
12226 | ||
12227 | #: builtin/replace.c:21 | |
12228 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
12229 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
12230 | ||
12231 | #: builtin/replace.c:22 | |
ef317cd5 | 12232 | msgid "git replace -d <object>..." |
07432cef | 12233 | msgstr "git replace -d <对象>..." |
ef317cd5 | 12234 | |
6acbf033 | 12235 | #: builtin/replace.c:23 |
cfff71a9 JX |
12236 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
12237 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 12238 | |
60638e98 | 12239 | #: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 |
6acbf033 JX |
12240 | #, c-format |
12241 | msgid "Not a valid object name: '%s'" | |
12242 | msgstr "不是一个有效的对象名:'%s'" | |
12243 | ||
60638e98 | 12244 | #: builtin/replace.c:360 |
6acbf033 JX |
12245 | #, c-format |
12246 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 12247 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 12248 | |
60638e98 | 12249 | #: builtin/replace.c:362 |
6acbf033 JX |
12250 | #, c-format |
12251 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 12252 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 12253 | |
60638e98 | 12254 | #: builtin/replace.c:373 |
6acbf033 JX |
12255 | #, c-format |
12256 | msgid "" | |
12257 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
12258 | "instead of --graft" | |
55a16ee4 | 12259 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 12260 | |
60638e98 | 12261 | #: builtin/replace.c:406 |
6acbf033 JX |
12262 | #, c-format |
12263 | msgid "the original commit '%s' has a gpg signature." | |
12264 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
12265 | ||
60638e98 | 12266 | #: builtin/replace.c:407 |
6acbf033 JX |
12267 | msgid "the signature will be removed in the replacement commit!" |
12268 | msgstr "在替换的提交中签名将被移除!" | |
12269 | ||
60638e98 | 12270 | #: builtin/replace.c:413 |
6acbf033 JX |
12271 | #, c-format |
12272 | msgid "could not write replacement commit for: '%s'" | |
12273 | msgstr "不能为 '%s' 写替换提交" | |
12274 | ||
60638e98 | 12275 | #: builtin/replace.c:437 |
ef317cd5 | 12276 | msgid "list replace refs" |
07432cef | 12277 | msgstr "列出替换的引用" |
ef317cd5 | 12278 | |
60638e98 | 12279 | #: builtin/replace.c:438 |
ef317cd5 | 12280 | msgid "delete replace refs" |
07432cef | 12281 | msgstr "删除替换的引用" |
ef317cd5 | 12282 | |
60638e98 | 12283 | #: builtin/replace.c:439 |
6acbf033 JX |
12284 | msgid "edit existing object" |
12285 | msgstr "编辑现存的对象" | |
12286 | ||
60638e98 | 12287 | #: builtin/replace.c:440 |
6acbf033 JX |
12288 | msgid "change a commit's parents" |
12289 | msgstr "修改一个提交的父提交" | |
12290 | ||
60638e98 | 12291 | #: builtin/replace.c:441 |
ef317cd5 | 12292 | msgid "replace the ref if it exists" |
07432cef | 12293 | msgstr "如果存在则替换引用" |
ef317cd5 | 12294 | |
60638e98 | 12295 | #: builtin/replace.c:442 |
6acbf033 JX |
12296 | msgid "do not pretty-print contents for --edit" |
12297 | msgstr "不要为 --edit 操作美观显示内容" | |
12298 | ||
60638e98 | 12299 | #: builtin/replace.c:443 |
cfff71a9 JX |
12300 | msgid "use this format" |
12301 | msgstr "使用此格式" | |
12302 | ||
90314792 | 12303 | #: builtin/rerere.c:12 |
814ff314 JX |
12304 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
12305 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 12306 | |
94550ed3 | 12307 | #: builtin/rerere.c:58 |
ef317cd5 | 12308 | msgid "register clean resolutions in index" |
07432cef | 12309 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 12310 | |
220c313c | 12311 | #: builtin/reset.c:26 |
ef317cd5 JX |
12312 | msgid "" |
12313 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 12314 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 12315 | |
220c313c | 12316 | #: builtin/reset.c:27 |
a0b6b246 JX |
12317 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
12318 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 12319 | |
220c313c | 12320 | #: builtin/reset.c:28 |
07432cef WS |
12321 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
12322 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 12323 | |
220c313c | 12324 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12325 | msgid "mixed" |
12326 | msgstr "混杂" | |
12327 | ||
220c313c | 12328 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12329 | msgid "soft" |
12330 | msgstr "软性" | |
12331 | ||
220c313c | 12332 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12333 | msgid "hard" |
12334 | msgstr "硬性" | |
12335 | ||
220c313c | 12336 | #: builtin/reset.c:34 |
8ada9598 JX |
12337 | msgid "merge" |
12338 | msgstr "合并" | |
12339 | ||
220c313c | 12340 | #: builtin/reset.c:34 |
c04f5ac3 JX |
12341 | msgid "keep" |
12342 | msgstr "保持" | |
12343 | ||
220c313c | 12344 | #: builtin/reset.c:74 |
c04f5ac3 JX |
12345 | msgid "You do not have a valid HEAD." |
12346 | msgstr "您没有一个有效的 HEAD。" | |
12347 | ||
220c313c | 12348 | #: builtin/reset.c:76 |
c04f5ac3 JX |
12349 | msgid "Failed to find tree of HEAD." |
12350 | msgstr "无法找到 HEAD 指向的树。" | |
12351 | ||
220c313c | 12352 | #: builtin/reset.c:82 |
c04f5ac3 JX |
12353 | #, c-format |
12354 | msgid "Failed to find tree of %s." | |
12355 | msgstr "无法找到 %s 指向的树。" | |
12356 | ||
220c313c | 12357 | #: builtin/reset.c:100 |
c04f5ac3 JX |
12358 | #, c-format |
12359 | msgid "HEAD is now at %s" | |
12360 | msgstr "HEAD 现在位于 %s" | |
12361 | ||
90e6ef53 | 12362 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 12363 | #: builtin/reset.c:183 |
c04f5ac3 JX |
12364 | #, c-format |
12365 | msgid "Cannot do a %s reset in the middle of a merge." | |
12366 | msgstr "在合并过程中不能做%s重置操作。" | |
12367 | ||
220c313c | 12368 | #: builtin/reset.c:276 |
ef317cd5 | 12369 | msgid "be quiet, only report errors" |
07432cef | 12370 | msgstr "安静模式,只报告错误" |
ef317cd5 | 12371 | |
220c313c | 12372 | #: builtin/reset.c:278 |
ef317cd5 | 12373 | msgid "reset HEAD and index" |
07432cef | 12374 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 12375 | |
220c313c | 12376 | #: builtin/reset.c:279 |
ef317cd5 | 12377 | msgid "reset only HEAD" |
07432cef | 12378 | msgstr "只重置 HEAD" |
ef317cd5 | 12379 | |
220c313c | 12380 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 12381 | msgid "reset HEAD, index and working tree" |
07432cef | 12382 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 12383 | |
220c313c | 12384 | #: builtin/reset.c:285 |
ef317cd5 | 12385 | msgid "reset HEAD but keep local changes" |
07432cef | 12386 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 12387 | |
220c313c | 12388 | #: builtin/reset.c:288 |
6c94aba5 JX |
12389 | msgid "record only the fact that removed paths will be added later" |
12390 | msgstr "将删除的路径标记为稍后添加" | |
12391 | ||
220c313c | 12392 | #: builtin/reset.c:305 |
07432cef WS |
12393 | #, c-format |
12394 | msgid "Failed to resolve '%s' as a valid revision." | |
12395 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
12396 | ||
220c313c | 12397 | #: builtin/reset.c:313 |
07432cef WS |
12398 | #, c-format |
12399 | msgid "Failed to resolve '%s' as a valid tree." | |
12400 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
12401 | ||
220c313c | 12402 | #: builtin/reset.c:322 |
c04f5ac3 | 12403 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 12404 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 12405 | |
220c313c | 12406 | #: builtin/reset.c:331 |
c04f5ac3 | 12407 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 12408 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 12409 | |
90e6ef53 | 12410 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 12411 | #: builtin/reset.c:333 |
c04f5ac3 JX |
12412 | #, c-format |
12413 | msgid "Cannot do %s reset with paths." | |
12414 | msgstr "不能带路径进行%s重置。" | |
12415 | ||
90e6ef53 | 12416 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 12417 | #: builtin/reset.c:343 |
c04f5ac3 JX |
12418 | #, c-format |
12419 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 12420 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 12421 | |
220c313c | 12422 | #: builtin/reset.c:347 |
6c94aba5 JX |
12423 | msgid "-N can only be used with --mixed" |
12424 | msgstr "-N 只能和 --mixed 同时使用" | |
12425 | ||
220c313c | 12426 | #: builtin/reset.c:364 |
90314792 | 12427 | msgid "Unstaged changes after reset:" |
160fb2b2 | 12428 | msgstr "重置后取消暂存的变更:" |
90314792 | 12429 | |
220c313c | 12430 | #: builtin/reset.c:370 |
ef317cd5 JX |
12431 | #, c-format |
12432 | msgid "Could not reset index file to revision '%s'." | |
12433 | msgstr "不能重置索引文件至版本 '%s'。" | |
12434 | ||
220c313c | 12435 | #: builtin/reset.c:374 |
07432cef WS |
12436 | msgid "Could not write new index file." |
12437 | msgstr "不能写入新的索引文件。" | |
12438 | ||
a0b6b246 | 12439 | #: builtin/rev-list.c:354 |
1b7f4a34 JX |
12440 | msgid "rev-list does not support display of notes" |
12441 | msgstr "rev-list 不支持显示注解" | |
12442 | ||
87cb7997 | 12443 | #: builtin/rev-parse.c:393 |
814ff314 JX |
12444 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
12445 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 12446 | |
87cb7997 | 12447 | #: builtin/rev-parse.c:398 |
ef317cd5 | 12448 | msgid "keep the `--` passed as an arg" |
07432cef | 12449 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 12450 | |
87cb7997 | 12451 | #: builtin/rev-parse.c:400 |
ef317cd5 | 12452 | msgid "stop parsing after the first non-option argument" |
07432cef | 12453 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 12454 | |
87cb7997 | 12455 | #: builtin/rev-parse.c:403 |
cfff71a9 JX |
12456 | msgid "output in stuck long form" |
12457 | msgstr "以固定长格式输出" | |
12458 | ||
87cb7997 | 12459 | #: builtin/rev-parse.c:534 |
ef317cd5 | 12460 | msgid "" |
814ff314 | 12461 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 12462 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 12463 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
12464 | "\n" |
12465 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
12466 | msgstr "" | |
814ff314 | 12467 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 12468 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 12469 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
12470 | "\n" |
12471 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
12472 | |
12473 | #: builtin/revert.c:22 | |
814ff314 JX |
12474 | msgid "git revert [<options>] <commit-ish>..." |
12475 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
12476 | |
12477 | #: builtin/revert.c:23 | |
12478 | msgid "git revert <subcommand>" | |
07432cef | 12479 | msgstr "git revert <子命令>" |
ef317cd5 JX |
12480 | |
12481 | #: builtin/revert.c:28 | |
814ff314 JX |
12482 | msgid "git cherry-pick [<options>] <commit-ish>..." |
12483 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
12484 | |
12485 | #: builtin/revert.c:29 | |
ef317cd5 | 12486 | msgid "git cherry-pick <subcommand>" |
07432cef | 12487 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 12488 | |
87cb7997 | 12489 | #: builtin/revert.c:89 |
ef317cd5 JX |
12490 | #, c-format |
12491 | msgid "%s: %s cannot be used with %s" | |
12492 | msgstr "%s:%s 不能和 %s 同时使用" | |
12493 | ||
87cb7997 | 12494 | #: builtin/revert.c:98 |
ef317cd5 | 12495 | msgid "end revert or cherry-pick sequence" |
07432cef | 12496 | msgstr "终止反转或拣选操作" |
ef317cd5 | 12497 | |
87cb7997 | 12498 | #: builtin/revert.c:99 |
ef317cd5 | 12499 | msgid "resume revert or cherry-pick sequence" |
07432cef | 12500 | msgstr "继续反转或拣选操作" |
ef317cd5 | 12501 | |
87cb7997 | 12502 | #: builtin/revert.c:100 |
ef317cd5 | 12503 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 12504 | msgstr "取消反转或拣选操作" |
ef317cd5 | 12505 | |
87cb7997 | 12506 | #: builtin/revert.c:101 |
ef317cd5 | 12507 | msgid "don't automatically commit" |
07432cef | 12508 | msgstr "不要自动提交" |
ef317cd5 | 12509 | |
87cb7997 | 12510 | #: builtin/revert.c:102 |
ef317cd5 | 12511 | msgid "edit the commit message" |
07432cef | 12512 | msgstr "编辑提交说明" |
ef317cd5 | 12513 | |
87cb7997 JX |
12514 | #: builtin/revert.c:105 |
12515 | msgid "parent-number" | |
07432cef | 12516 | msgstr "父编号" |
ef317cd5 | 12517 | |
87cb7997 JX |
12518 | #: builtin/revert.c:106 |
12519 | msgid "select mainline parent" | |
12520 | msgstr "选择主干父提交编号" | |
12521 | ||
12522 | #: builtin/revert.c:108 | |
ef317cd5 | 12523 | msgid "merge strategy" |
07432cef | 12524 | msgstr "合并策略" |
ef317cd5 | 12525 | |
87cb7997 | 12526 | #: builtin/revert.c:109 |
ef317cd5 | 12527 | msgid "option" |
07432cef | 12528 | msgstr "选项" |
ef317cd5 | 12529 | |
87cb7997 | 12530 | #: builtin/revert.c:110 |
ef317cd5 | 12531 | msgid "option for merge strategy" |
07432cef | 12532 | msgstr "合并策略的选项" |
ef317cd5 | 12533 | |
87cb7997 | 12534 | #: builtin/revert.c:119 |
ef317cd5 | 12535 | msgid "append commit name" |
07432cef | 12536 | msgstr "追加提交名称" |
ef317cd5 | 12537 | |
87cb7997 | 12538 | #: builtin/revert.c:121 |
ef317cd5 | 12539 | msgid "preserve initially empty commits" |
07432cef | 12540 | msgstr "保留初始化的空提交" |
ef317cd5 | 12541 | |
87cb7997 | 12542 | #: builtin/revert.c:122 |
ef317cd5 | 12543 | msgid "allow commits with empty messages" |
07432cef | 12544 | msgstr "允许提交说明为空" |
c04f5ac3 | 12545 | |
87cb7997 | 12546 | #: builtin/revert.c:123 |
ef317cd5 | 12547 | msgid "keep redundant, empty commits" |
07432cef | 12548 | msgstr "保持多余的、空的提交" |
ef317cd5 | 12549 | |
87cb7997 | 12550 | #: builtin/revert.c:211 |
c04f5ac3 JX |
12551 | msgid "revert failed" |
12552 | msgstr "还原失败" | |
12553 | ||
87cb7997 | 12554 | #: builtin/revert.c:224 |
c04f5ac3 JX |
12555 | msgid "cherry-pick failed" |
12556 | msgstr "拣选失败" | |
12557 | ||
90314792 | 12558 | #: builtin/rm.c:17 |
814ff314 JX |
12559 | msgid "git rm [<options>] [--] <file>..." |
12560 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 12561 | |
1a79b2f1 | 12562 | #: builtin/rm.c:205 |
c04f5ac3 | 12563 | msgid "" |
2e8451e8 JX |
12564 | "the following file has staged content different from both the\n" |
12565 | "file and the HEAD:" | |
12566 | msgid_plural "" | |
12567 | "the following files have staged content different from both the\n" | |
12568 | "file and the HEAD:" | |
12569 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
12570 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
12571 | ||
1a79b2f1 | 12572 | #: builtin/rm.c:210 |
2e8451e8 JX |
12573 | msgid "" |
12574 | "\n" | |
c04f5ac3 JX |
12575 | "(use -f to force removal)" |
12576 | msgstr "" | |
2e8451e8 | 12577 | "\n" |
c04f5ac3 JX |
12578 | "(使用 -f 强制删除)" |
12579 | ||
1a79b2f1 | 12580 | #: builtin/rm.c:214 |
2e8451e8 JX |
12581 | msgid "the following file has changes staged in the index:" |
12582 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
12583 | msgstr[0] "下列文件索引中有变更" |
12584 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 12585 | |
1a79b2f1 | 12586 | #: builtin/rm.c:218 builtin/rm.c:227 |
c04f5ac3 | 12587 | msgid "" |
2e8451e8 | 12588 | "\n" |
c04f5ac3 JX |
12589 | "(use --cached to keep the file, or -f to force removal)" |
12590 | msgstr "" | |
2e8451e8 JX |
12591 | "\n" |
12592 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
12593 | ||
1a79b2f1 | 12594 | #: builtin/rm.c:224 |
2e8451e8 JX |
12595 | msgid "the following file has local modifications:" |
12596 | msgid_plural "the following files have local modifications:" | |
12597 | msgstr[0] "如下文件有本地修改:" | |
12598 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 12599 | |
1a79b2f1 | 12600 | #: builtin/rm.c:242 |
ef317cd5 | 12601 | msgid "do not list removed files" |
07432cef | 12602 | msgstr "不列出删除的文件" |
ef317cd5 | 12603 | |
1a79b2f1 | 12604 | #: builtin/rm.c:243 |
ef317cd5 | 12605 | msgid "only remove from the index" |
07432cef | 12606 | msgstr "只从索引区删除" |
ef317cd5 | 12607 | |
1a79b2f1 | 12608 | #: builtin/rm.c:244 |
ef317cd5 | 12609 | msgid "override the up-to-date check" |
07432cef | 12610 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 12611 | |
1a79b2f1 | 12612 | #: builtin/rm.c:245 |
ef317cd5 | 12613 | msgid "allow recursive removal" |
07432cef | 12614 | msgstr "允许递归删除" |
ef317cd5 | 12615 | |
1a79b2f1 | 12616 | #: builtin/rm.c:247 |
ef317cd5 | 12617 | msgid "exit with a zero status even if nothing matched" |
07432cef | 12618 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 12619 | |
1a79b2f1 | 12620 | #: builtin/rm.c:308 |
c04f5ac3 JX |
12621 | #, c-format |
12622 | msgid "not removing '%s' recursively without -r" | |
12623 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
12624 | ||
1a79b2f1 | 12625 | #: builtin/rm.c:347 |
c04f5ac3 JX |
12626 | #, c-format |
12627 | msgid "git rm: unable to remove %s" | |
12628 | msgstr "git rm:不能删除 %s" | |
12629 | ||
1a79b2f1 JX |
12630 | #: builtin/rm.c:370 |
12631 | #, c-format | |
12632 | msgid "could not remove '%s'" | |
12633 | msgstr "无法删除 '%s'" | |
12634 | ||
1b7f4a34 JX |
12635 | #: builtin/send-pack.c:18 |
12636 | msgid "" | |
12637 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
12638 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
12639 | "[<ref>...]\n" | |
12640 | " --all and explicit <ref> specification are mutually exclusive." | |
12641 | msgstr "" | |
12642 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
12643 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
12644 | " --all 和明确的 <引用> 互斥。" | |
12645 | ||
87cb7997 | 12646 | #: builtin/send-pack.c:161 |
1b7f4a34 JX |
12647 | msgid "remote name" |
12648 | msgstr "远程名称" | |
12649 | ||
87cb7997 | 12650 | #: builtin/send-pack.c:175 |
1b7f4a34 JX |
12651 | msgid "use stateless RPC protocol" |
12652 | msgstr "使用无状态的 RPC 协议" | |
12653 | ||
87cb7997 | 12654 | #: builtin/send-pack.c:176 |
1b7f4a34 JX |
12655 | msgid "read refs from stdin" |
12656 | msgstr "从标准输入读取引用" | |
12657 | ||
87cb7997 | 12658 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
12659 | msgid "print status from remote helper" |
12660 | msgstr "打印来自远程 helper 的状态" | |
12661 | ||
ef317cd5 | 12662 | #: builtin/shortlog.c:13 |
814ff314 | 12663 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 12664 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 12665 | |
87cb7997 | 12666 | #: builtin/shortlog.c:248 |
1a79b2f1 JX |
12667 | msgid "Group by committer rather than author" |
12668 | msgstr "按照提交者分组而不是作者" | |
12669 | ||
87cb7997 | 12670 | #: builtin/shortlog.c:250 |
ef317cd5 | 12671 | msgid "sort output according to the number of commits per author" |
07432cef | 12672 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 12673 | |
87cb7997 | 12674 | #: builtin/shortlog.c:252 |
ef317cd5 | 12675 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 12676 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 12677 | |
87cb7997 | 12678 | #: builtin/shortlog.c:254 |
ef317cd5 | 12679 | msgid "Show the email address of each author" |
07432cef | 12680 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 12681 | |
87cb7997 | 12682 | #: builtin/shortlog.c:255 |
ef317cd5 | 12683 | msgid "w[,i1[,i2]]" |
07432cef | 12684 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 12685 | |
87cb7997 | 12686 | #: builtin/shortlog.c:256 |
ef317cd5 | 12687 | msgid "Linewrap output" |
07432cef | 12688 | msgstr "折行输出" |
ef317cd5 | 12689 | |
94550ed3 | 12690 | #: builtin/show-branch.c:10 |
ef317cd5 | 12691 | msgid "" |
814ff314 | 12692 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
12693 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
12694 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
12695 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 12696 | msgstr "" |
814ff314 | 12697 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
12698 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
12699 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
12700 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 12701 | |
94550ed3 | 12702 | #: builtin/show-branch.c:14 |
814ff314 JX |
12703 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
12704 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 12705 | |
87cb7997 | 12706 | #: builtin/show-branch.c:374 |
a0b6b246 JX |
12707 | #, c-format |
12708 | msgid "ignoring %s; cannot handle more than %d ref" | |
12709 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
12710 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
12711 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
12712 | ||
87cb7997 | 12713 | #: builtin/show-branch.c:536 |
a0b6b246 JX |
12714 | #, c-format |
12715 | msgid "no matching refs with %s" | |
12716 | msgstr "没有和 %s 匹配的引用" | |
12717 | ||
87cb7997 | 12718 | #: builtin/show-branch.c:632 |
ef317cd5 | 12719 | msgid "show remote-tracking and local branches" |
07432cef | 12720 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 12721 | |
87cb7997 | 12722 | #: builtin/show-branch.c:634 |
ef317cd5 | 12723 | msgid "show remote-tracking branches" |
07432cef | 12724 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 12725 | |
87cb7997 | 12726 | #: builtin/show-branch.c:636 |
ef317cd5 | 12727 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 12728 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 12729 | |
87cb7997 | 12730 | #: builtin/show-branch.c:638 |
ef317cd5 | 12731 | msgid "show <n> more commits after the common ancestor" |
07432cef | 12732 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 12733 | |
87cb7997 | 12734 | #: builtin/show-branch.c:640 |
ef317cd5 | 12735 | msgid "synonym to more=-1" |
07432cef | 12736 | msgstr "和 more=-1 同义" |
ef317cd5 | 12737 | |
87cb7997 | 12738 | #: builtin/show-branch.c:641 |
ef317cd5 | 12739 | msgid "suppress naming strings" |
07432cef | 12740 | msgstr "不显示字符串命名" |
ef317cd5 | 12741 | |
87cb7997 | 12742 | #: builtin/show-branch.c:643 |
ef317cd5 | 12743 | msgid "include the current branch" |
07432cef | 12744 | msgstr "包括当前分支" |
ef317cd5 | 12745 | |
87cb7997 | 12746 | #: builtin/show-branch.c:645 |
ef317cd5 | 12747 | msgid "name commits with their object names" |
07432cef | 12748 | msgstr "以对象名字命名提交" |
ef317cd5 | 12749 | |
87cb7997 | 12750 | #: builtin/show-branch.c:647 |
ef317cd5 | 12751 | msgid "show possible merge bases" |
07432cef | 12752 | msgstr "显示可能合并的基线" |
ef317cd5 | 12753 | |
87cb7997 | 12754 | #: builtin/show-branch.c:649 |
ef317cd5 | 12755 | msgid "show refs unreachable from any other ref" |
07432cef | 12756 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 12757 | |
87cb7997 | 12758 | #: builtin/show-branch.c:651 |
ef317cd5 | 12759 | msgid "show commits in topological order" |
07432cef | 12760 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 12761 | |
87cb7997 | 12762 | #: builtin/show-branch.c:654 |
ef317cd5 | 12763 | msgid "show only commits not on the first branch" |
07432cef | 12764 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 12765 | |
87cb7997 | 12766 | #: builtin/show-branch.c:656 |
ef317cd5 | 12767 | msgid "show merges reachable from only one tip" |
07432cef | 12768 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 12769 | |
87cb7997 | 12770 | #: builtin/show-branch.c:658 |
2e8451e8 JX |
12771 | msgid "topologically sort, maintaining date order where possible" |
12772 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 12773 | |
87cb7997 | 12774 | #: builtin/show-branch.c:661 |
ef317cd5 | 12775 | msgid "<n>[,<base>]" |
07432cef | 12776 | msgstr "<n>[,<base>]" |
ef317cd5 | 12777 | |
87cb7997 | 12778 | #: builtin/show-branch.c:662 |
ef317cd5 | 12779 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 12780 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 12781 | |
87cb7997 | 12782 | #: builtin/show-branch.c:696 |
a0b6b246 JX |
12783 | msgid "" |
12784 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
12785 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
12786 | ||
87cb7997 | 12787 | #: builtin/show-branch.c:720 |
a0b6b246 JX |
12788 | msgid "no branches given, and HEAD is not valid" |
12789 | msgstr "未提供分支,且 HEAD 无效" | |
12790 | ||
87cb7997 | 12791 | #: builtin/show-branch.c:723 |
a0b6b246 JX |
12792 | msgid "--reflog option needs one branch name" |
12793 | msgstr "选项 --reflog 需要一个分支名" | |
12794 | ||
87cb7997 | 12795 | #: builtin/show-branch.c:726 |
a0b6b246 JX |
12796 | #, c-format |
12797 | msgid "only %d entry can be shown at one time." | |
12798 | msgid_plural "only %d entries can be shown at one time." | |
12799 | msgstr[0] "一次只能显示 %d 个条目。" | |
12800 | msgstr[1] "一次只能显示 %d 个条目。" | |
12801 | ||
87cb7997 | 12802 | #: builtin/show-branch.c:730 |
a0b6b246 JX |
12803 | #, c-format |
12804 | msgid "no such ref %s" | |
12805 | msgstr "无此引用 %s" | |
12806 | ||
87cb7997 | 12807 | #: builtin/show-branch.c:814 |
a0b6b246 JX |
12808 | #, c-format |
12809 | msgid "cannot handle more than %d rev." | |
12810 | msgid_plural "cannot handle more than %d revs." | |
12811 | msgstr[0] "不能处理 %d 个以上的版本。" | |
12812 | msgstr[1] "不能处理 %d 个以上的版本。" | |
12813 | ||
87cb7997 | 12814 | #: builtin/show-branch.c:818 |
a0b6b246 JX |
12815 | #, c-format |
12816 | msgid "'%s' is not a valid ref." | |
12817 | msgstr "'%s' 不是一个有效的引用。" | |
12818 | ||
87cb7997 | 12819 | #: builtin/show-branch.c:821 |
a0b6b246 JX |
12820 | #, c-format |
12821 | msgid "cannot find commit %s (%s)" | |
29004bbb | 12822 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 12823 | |
ef317cd5 JX |
12824 | #: builtin/show-ref.c:10 |
12825 | msgid "" | |
814ff314 JX |
12826 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
12827 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 12828 | msgstr "" |
814ff314 JX |
12829 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
12830 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
12831 | |
12832 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
12833 | msgid "git show-ref --exclude-existing[=<pattern>]" |
12834 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 12835 | |
1a79b2f1 | 12836 | #: builtin/show-ref.c:159 |
ef317cd5 | 12837 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 12838 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 12839 | |
1a79b2f1 | 12840 | #: builtin/show-ref.c:160 |
ef317cd5 | 12841 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 12842 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 12843 | |
1a79b2f1 | 12844 | #: builtin/show-ref.c:161 |
ef317cd5 | 12845 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 12846 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 12847 | |
1a79b2f1 | 12848 | #: builtin/show-ref.c:164 builtin/show-ref.c:166 |
2e8451e8 JX |
12849 | msgid "show the HEAD reference, even if it would be filtered out" |
12850 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 12851 | |
1a79b2f1 | 12852 | #: builtin/show-ref.c:168 |
ef317cd5 | 12853 | msgid "dereference tags into object IDs" |
4375c10e | 12854 | msgstr "转换标签到对象 ID" |
ef317cd5 | 12855 | |
1a79b2f1 | 12856 | #: builtin/show-ref.c:170 |
ef317cd5 | 12857 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 12858 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 12859 | |
1a79b2f1 | 12860 | #: builtin/show-ref.c:174 |
ef317cd5 | 12861 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 12862 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 12863 | |
1a79b2f1 | 12864 | #: builtin/show-ref.c:176 |
ef317cd5 | 12865 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 12866 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 12867 | |
94550ed3 JX |
12868 | #: builtin/stripspace.c:17 |
12869 | msgid "git stripspace [-s | --strip-comments]" | |
12870 | msgstr "git stripspace [-s | --strip-comments]" | |
12871 | ||
12872 | #: builtin/stripspace.c:18 | |
12873 | msgid "git stripspace [-c | --comment-lines]" | |
12874 | msgstr "git stripspace [-c | --comment-lines]" | |
12875 | ||
12876 | #: builtin/stripspace.c:35 | |
12877 | msgid "skip and remove all lines starting with comment character" | |
12878 | msgstr "跳过和移除所有的注释行" | |
12879 | ||
12880 | #: builtin/stripspace.c:38 | |
276ceeaa | 12881 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
12882 | msgstr "为每一行的行首添加注释符和空格" |
12883 | ||
87cb7997 | 12884 | #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 |
5b04ee3b JX |
12885 | #, c-format |
12886 | msgid "No such ref: %s" | |
12887 | msgstr "没有这样的引用:%s" | |
12888 | ||
87cb7997 | 12889 | #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 |
5b04ee3b JX |
12890 | #, c-format |
12891 | msgid "Expecting a full ref name, got %s" | |
12892 | msgstr "期望一个完整的引用名称,却得到 %s" | |
12893 | ||
12894 | #: builtin/submodule--helper.c:71 | |
12895 | #, c-format | |
12896 | msgid "cannot strip one component off url '%s'" | |
12897 | msgstr "无法从 url '%s' 剥离一个组件" | |
12898 | ||
87cb7997 | 12899 | #: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 |
94550ed3 JX |
12900 | msgid "alternative anchor for relative paths" |
12901 | msgstr "相对路径的替代锚记(anchor)" | |
12902 | ||
87cb7997 | 12903 | #: builtin/submodule--helper.c:310 |
94550ed3 JX |
12904 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
12905 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
12906 | ||
60638e98 | 12907 | #: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 |
5b04ee3b JX |
12908 | #, c-format |
12909 | msgid "No url found for submodule path '%s' in .gitmodules" | |
12910 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
12911 | ||
87cb7997 JX |
12912 | #: builtin/submodule--helper.c:395 |
12913 | #, c-format | |
12914 | msgid "" | |
12915 | "could not lookup configuration '%s'. Assuming this repository is its own " | |
12916 | "authoritative upstream." | |
12917 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
12918 | ||
12919 | #: builtin/submodule--helper.c:406 | |
5b04ee3b JX |
12920 | #, c-format |
12921 | msgid "Failed to register url for submodule path '%s'" | |
12922 | msgstr "无法为子模组 '%s' 注册 url" | |
12923 | ||
87cb7997 | 12924 | #: builtin/submodule--helper.c:410 |
5b04ee3b JX |
12925 | #, c-format |
12926 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 12927 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
12928 | |
12929 | # | |
87cb7997 | 12930 | #: builtin/submodule--helper.c:420 |
aef18cc6 | 12931 | #, c-format |
5b04ee3b | 12932 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 12933 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 12934 | |
87cb7997 | 12935 | #: builtin/submodule--helper.c:427 |
5b04ee3b JX |
12936 | #, c-format |
12937 | msgid "Failed to register update mode for submodule path '%s'" | |
12938 | msgstr "无法为子模组 '%s' 注册更新模式" | |
12939 | ||
87cb7997 | 12940 | #: builtin/submodule--helper.c:443 |
5b04ee3b JX |
12941 | msgid "Suppress output for initializing a submodule" |
12942 | msgstr "初始化子模组时抑制输出" | |
12943 | ||
87cb7997 | 12944 | #: builtin/submodule--helper.c:448 |
5b04ee3b JX |
12945 | msgid "git submodule--helper init [<path>]" |
12946 | msgstr "git submodule--helper init [<路径>]" | |
12947 | ||
87cb7997 | 12948 | #: builtin/submodule--helper.c:476 |
94550ed3 JX |
12949 | msgid "git submodule--helper name <path>" |
12950 | msgstr "git submodule--helper name <路径>" | |
12951 | ||
87cb7997 | 12952 | #: builtin/submodule--helper.c:482 |
94550ed3 JX |
12953 | #, c-format |
12954 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
12955 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
12956 | ||
87cb7997 | 12957 | #: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 |
a0b6b246 JX |
12958 | #, c-format |
12959 | msgid "submodule '%s' cannot add alternate: %s" | |
12960 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
12961 | ||
87cb7997 | 12962 | #: builtin/submodule--helper.c:604 |
a0b6b246 JX |
12963 | #, c-format |
12964 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
12965 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
12966 | ||
87cb7997 | 12967 | #: builtin/submodule--helper.c:611 |
a0b6b246 JX |
12968 | #, c-format |
12969 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
12970 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
12971 | ||
87cb7997 | 12972 | #: builtin/submodule--helper.c:633 |
94550ed3 JX |
12973 | msgid "where the new submodule will be cloned to" |
12974 | msgstr "新的子模组将要克隆的路径" | |
12975 | ||
87cb7997 | 12976 | #: builtin/submodule--helper.c:636 |
94550ed3 JX |
12977 | msgid "name of the new submodule" |
12978 | msgstr "新子模组的名称" | |
12979 | ||
87cb7997 | 12980 | #: builtin/submodule--helper.c:639 |
94550ed3 JX |
12981 | msgid "url where to clone the submodule from" |
12982 | msgstr "克隆子模组的 url 地址" | |
12983 | ||
87cb7997 | 12984 | #: builtin/submodule--helper.c:645 |
94550ed3 JX |
12985 | msgid "depth for shallow clones" |
12986 | msgstr "浅克隆的深度" | |
12987 | ||
87cb7997 | 12988 | #: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 |
a0b6b246 | 12989 | msgid "force cloning progress" |
29004bbb | 12990 | msgstr "强制显示克隆进度" |
a0b6b246 | 12991 | |
87cb7997 | 12992 | #: builtin/submodule--helper.c:653 |
94550ed3 JX |
12993 | msgid "" |
12994 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 12995 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
12996 | msgstr "" |
12997 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
12998 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 12999 | |
87cb7997 | 13000 | #: builtin/submodule--helper.c:684 |
94550ed3 JX |
13001 | #, c-format |
13002 | msgid "clone of '%s' into submodule path '%s' failed" | |
13003 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
13004 | ||
87cb7997 | 13005 | #: builtin/submodule--helper.c:699 |
94550ed3 JX |
13006 | #, c-format |
13007 | msgid "could not get submodule directory for '%s'" | |
13008 | msgstr "无法得到 '%s' 的子模组目录" | |
13009 | ||
87cb7997 | 13010 | #: builtin/submodule--helper.c:764 |
5b04ee3b JX |
13011 | #, c-format |
13012 | msgid "Submodule path '%s' not initialized" | |
13013 | msgstr "子模组 '%s' 尚未初始化" | |
13014 | ||
87cb7997 | 13015 | #: builtin/submodule--helper.c:768 |
5b04ee3b JX |
13016 | msgid "Maybe you want to use 'update --init'?" |
13017 | msgstr "也许您想要执行 'update --init'?" | |
13018 | ||
87cb7997 | 13019 | #: builtin/submodule--helper.c:793 |
5b04ee3b JX |
13020 | #, c-format |
13021 | msgid "Skipping unmerged submodule %s" | |
13022 | msgstr "略过未合并的子模组 %s" | |
13023 | ||
87cb7997 | 13024 | #: builtin/submodule--helper.c:814 |
5b04ee3b JX |
13025 | #, c-format |
13026 | msgid "Skipping submodule '%s'" | |
13027 | msgstr "略过子模组 '%s'" | |
13028 | ||
87cb7997 | 13029 | #: builtin/submodule--helper.c:942 |
5c57d762 JX |
13030 | #, c-format |
13031 | msgid "Failed to clone '%s'. Retry scheduled" | |
13032 | msgstr "克隆 '%s' 失败。按计划重试" | |
13033 | ||
87cb7997 | 13034 | #: builtin/submodule--helper.c:953 |
5c57d762 JX |
13035 | #, c-format |
13036 | msgid "Failed to clone '%s' a second time, aborting" | |
13037 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
13038 | ||
87cb7997 | 13039 | #: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 |
5b04ee3b JX |
13040 | msgid "path into the working tree" |
13041 | msgstr "到工作区的路径" | |
13042 | ||
87cb7997 | 13043 | #: builtin/submodule--helper.c:977 |
5b04ee3b JX |
13044 | msgid "path into the working tree, across nested submodule boundaries" |
13045 | msgstr "工作区中的路径,递归嵌套子模组" | |
13046 | ||
87cb7997 | 13047 | #: builtin/submodule--helper.c:981 |
5b04ee3b JX |
13048 | msgid "rebase, merge, checkout or none" |
13049 | msgstr "rebase、merge、checkout 或 none" | |
13050 | ||
87cb7997 | 13051 | #: builtin/submodule--helper.c:985 |
5b04ee3b JX |
13052 | msgid "Create a shallow clone truncated to the specified number of revisions" |
13053 | msgstr "创建一个指定深度的浅克隆" | |
13054 | ||
87cb7997 | 13055 | #: builtin/submodule--helper.c:988 |
5b04ee3b JX |
13056 | msgid "parallel jobs" |
13057 | msgstr "并发任务" | |
13058 | ||
87cb7997 | 13059 | #: builtin/submodule--helper.c:990 |
5c57d762 | 13060 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 13061 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 13062 | |
87cb7997 | 13063 | #: builtin/submodule--helper.c:991 |
5b04ee3b JX |
13064 | msgid "don't print cloning progress" |
13065 | msgstr "不要输出克隆进度" | |
94550ed3 | 13066 | |
87cb7997 | 13067 | #: builtin/submodule--helper.c:998 |
5b04ee3b JX |
13068 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
13069 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
13070 | ||
87cb7997 | 13071 | #: builtin/submodule--helper.c:1008 |
5b04ee3b JX |
13072 | msgid "bad value for update parameter" |
13073 | msgstr "update 参数取值错误" | |
13074 | ||
87cb7997 | 13075 | #: builtin/submodule--helper.c:1079 |
5c57d762 JX |
13076 | #, c-format |
13077 | msgid "" | |
13078 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
13079 | "the superproject is not on any branch" | |
13080 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
13081 | ||
87cb7997 | 13082 | #: builtin/submodule--helper.c:1163 |
1a79b2f1 JX |
13083 | msgid "recurse into submodules" |
13084 | msgstr "在子模组中递归" | |
13085 | ||
87cb7997 | 13086 | #: builtin/submodule--helper.c:1169 |
1a79b2f1 JX |
13087 | msgid "git submodule--helper embed-git-dir [<path>...]" |
13088 | msgstr "git submodule--helper embed-git-dir [<路径>...]" | |
13089 | ||
87cb7997 | 13090 | #: builtin/submodule--helper.c:1226 |
5b04ee3b JX |
13091 | msgid "submodule--helper subcommand must be called with a subcommand" |
13092 | msgstr "submodule-helper 子命令必须由另外的子命令调用" | |
13093 | ||
87cb7997 | 13094 | #: builtin/submodule--helper.c:1233 |
1a79b2f1 JX |
13095 | #, c-format |
13096 | msgid "%s doesn't support --super-prefix" | |
13097 | msgstr "%s 不支持 --super-prefix" | |
13098 | ||
87cb7997 | 13099 | #: builtin/submodule--helper.c:1239 |
94550ed3 | 13100 | #, c-format |
5b04ee3b JX |
13101 | msgid "'%s' is not a valid submodule--helper subcommand" |
13102 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 13103 | |
ef317cd5 | 13104 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
13105 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
13106 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
13107 | |
13108 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
13109 | msgid "git symbolic-ref -d [-q] <name>" |
13110 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 13111 | |
07432cef | 13112 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 13113 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
13114 | msgstr "不显示非符号(分离的)引用的错误信息" |
13115 | ||
13116 | #: builtin/symbolic-ref.c:41 | |
13117 | msgid "delete symbolic ref" | |
13118 | msgstr "删除符号引用" | |
ef317cd5 | 13119 | |
07432cef | 13120 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 13121 | msgid "shorten ref output" |
07432cef | 13122 | msgstr "简短的引用输出" |
ef317cd5 | 13123 | |
1b7f4a34 | 13124 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 13125 | msgid "reason" |
07432cef | 13126 | msgstr "原因" |
ef317cd5 | 13127 | |
1b7f4a34 | 13128 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 13129 | msgid "reason of the update" |
07432cef | 13130 | msgstr "更新的原因" |
ef317cd5 | 13131 | |
94550ed3 | 13132 | #: builtin/tag.c:23 |
ef317cd5 | 13133 | msgid "" |
814ff314 JX |
13134 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
13135 | "[<head>]" | |
13136 | msgstr "" | |
13137 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 13138 | |
94550ed3 | 13139 | #: builtin/tag.c:24 |
ef317cd5 | 13140 | msgid "git tag -d <tagname>..." |
07432cef | 13141 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 13142 | |
94550ed3 | 13143 | #: builtin/tag.c:25 |
ef317cd5 | 13144 | msgid "" |
87cb7997 JX |
13145 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
13146 | "points-at <object>]\n" | |
94550ed3 | 13147 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 13148 | msgstr "" |
87cb7997 JX |
13149 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
13150 | "at <对象>]\n" | |
94550ed3 | 13151 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 13152 | |
94550ed3 | 13153 | #: builtin/tag.c:27 |
1a79b2f1 JX |
13154 | msgid "git tag -v [--format=<format>] <tagname>..." |
13155 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 13156 | |
87cb7997 | 13157 | #: builtin/tag.c:83 |
c04f5ac3 JX |
13158 | #, c-format |
13159 | msgid "tag '%s' not found." | |
55a16ee4 | 13160 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 13161 | |
87cb7997 | 13162 | #: builtin/tag.c:99 |
c04f5ac3 JX |
13163 | #, c-format |
13164 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 13165 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 13166 | |
87cb7997 | 13167 | #: builtin/tag.c:128 |
a77c07d9 | 13168 | #, c-format |
c04f5ac3 JX |
13169 | msgid "" |
13170 | "\n" | |
6acbf033 JX |
13171 | "Write a message for tag:\n" |
13172 | " %s\n" | |
a77c07d9 | 13173 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
13174 | msgstr "" |
13175 | "\n" | |
55a16ee4 | 13176 | "输入一个标签说明:\n" |
6acbf033 | 13177 | " %s\n" |
a77c07d9 | 13178 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 13179 | |
87cb7997 | 13180 | #: builtin/tag.c:132 |
a77c07d9 | 13181 | #, c-format |
c04f5ac3 JX |
13182 | msgid "" |
13183 | "\n" | |
6acbf033 JX |
13184 | "Write a message for tag:\n" |
13185 | " %s\n" | |
a77c07d9 | 13186 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 13187 | "want to.\n" |
c04f5ac3 JX |
13188 | msgstr "" |
13189 | "\n" | |
55a16ee4 | 13190 | "输入一个标签说明:\n" |
6acbf033 | 13191 | " %s\n" |
a77c07d9 | 13192 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 13193 | |
87cb7997 | 13194 | #: builtin/tag.c:210 |
c04f5ac3 | 13195 | msgid "unable to sign the tag" |
55a16ee4 | 13196 | msgstr "无法签署标签" |
c04f5ac3 | 13197 | |
87cb7997 | 13198 | #: builtin/tag.c:212 |
c04f5ac3 | 13199 | msgid "unable to write tag file" |
55a16ee4 | 13200 | msgstr "无法写标签文件" |
c04f5ac3 | 13201 | |
87cb7997 | 13202 | #: builtin/tag.c:236 |
c04f5ac3 | 13203 | msgid "bad object type." |
90e6ef53 | 13204 | msgstr "坏的对象类型。" |
c04f5ac3 | 13205 | |
87cb7997 | 13206 | #: builtin/tag.c:282 |
c04f5ac3 | 13207 | msgid "no tag message?" |
55a16ee4 | 13208 | msgstr "无标签说明?" |
c04f5ac3 | 13209 | |
87cb7997 | 13210 | #: builtin/tag.c:289 |
c04f5ac3 JX |
13211 | #, c-format |
13212 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 13213 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 13214 | |
87cb7997 | 13215 | #: builtin/tag.c:397 |
ef317cd5 | 13216 | msgid "list tag names" |
55a16ee4 | 13217 | msgstr "列出标签名称" |
ef317cd5 | 13218 | |
87cb7997 | 13219 | #: builtin/tag.c:399 |
ef317cd5 | 13220 | msgid "print <n> lines of each tag message" |
55a16ee4 | 13221 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 13222 | |
87cb7997 | 13223 | #: builtin/tag.c:401 |
ef317cd5 | 13224 | msgid "delete tags" |
55a16ee4 | 13225 | msgstr "删除标签" |
ef317cd5 | 13226 | |
87cb7997 | 13227 | #: builtin/tag.c:402 |
ef317cd5 | 13228 | msgid "verify tags" |
55a16ee4 | 13229 | msgstr "验证标签" |
ef317cd5 | 13230 | |
87cb7997 | 13231 | #: builtin/tag.c:404 |
ef317cd5 | 13232 | msgid "Tag creation options" |
55a16ee4 | 13233 | msgstr "标签创建选项" |
ef317cd5 | 13234 | |
87cb7997 | 13235 | #: builtin/tag.c:406 |
ef317cd5 | 13236 | msgid "annotated tag, needs a message" |
55a16ee4 | 13237 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 13238 | |
87cb7997 | 13239 | #: builtin/tag.c:408 |
ef317cd5 | 13240 | msgid "tag message" |
55a16ee4 | 13241 | msgstr "标签说明" |
ef317cd5 | 13242 | |
87cb7997 | 13243 | #: builtin/tag.c:410 |
ef317cd5 | 13244 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 13245 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 13246 | |
87cb7997 | 13247 | #: builtin/tag.c:414 |
ef317cd5 | 13248 | msgid "use another key to sign the tag" |
55a16ee4 | 13249 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 13250 | |
87cb7997 | 13251 | #: builtin/tag.c:415 |
ef317cd5 | 13252 | msgid "replace the tag if exists" |
55a16ee4 | 13253 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 13254 | |
87cb7997 | 13255 | #: builtin/tag.c:416 builtin/update-ref.c:368 |
03ea3327 | 13256 | msgid "create a reflog" |
1b7f4a34 JX |
13257 | msgstr "创建引用日志" |
13258 | ||
87cb7997 | 13259 | #: builtin/tag.c:418 |
814ff314 | 13260 | msgid "Tag listing options" |
55a16ee4 | 13261 | msgstr "标签列表选项" |
814ff314 | 13262 | |
87cb7997 | 13263 | #: builtin/tag.c:419 |
ef317cd5 | 13264 | msgid "show tag list in columns" |
55a16ee4 | 13265 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 13266 | |
87cb7997 | 13267 | #: builtin/tag.c:420 builtin/tag.c:422 |
ef317cd5 | 13268 | msgid "print only tags that contain the commit" |
87cb7997 | 13269 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 13270 | |
87cb7997 JX |
13271 | #: builtin/tag.c:421 builtin/tag.c:423 |
13272 | msgid "print only tags that don't contain the commit" | |
13273 | msgstr "只打印不包含该提交的标签" | |
13274 | ||
13275 | #: builtin/tag.c:424 | |
94550ed3 JX |
13276 | msgid "print only tags that are merged" |
13277 | msgstr "只打印已经合并的标签" | |
13278 | ||
87cb7997 | 13279 | #: builtin/tag.c:425 |
94550ed3 JX |
13280 | msgid "print only tags that are not merged" |
13281 | msgstr "只打印尚未合并的标签" | |
13282 | ||
87cb7997 | 13283 | #: builtin/tag.c:430 |
ef317cd5 | 13284 | msgid "print only tags of the object" |
87cb7997 | 13285 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 13286 | |
87cb7997 | 13287 | #: builtin/tag.c:469 |
8ada9598 | 13288 | msgid "--column and -n are incompatible" |
81809b99 | 13289 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 13290 | |
87cb7997 JX |
13291 | #: builtin/tag.c:491 |
13292 | msgid "-n option is only allowed in list mode" | |
13293 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 13294 | |
87cb7997 JX |
13295 | #: builtin/tag.c:493 |
13296 | msgid "--contains option is only allowed in list mode" | |
13297 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 13298 | |
87cb7997 JX |
13299 | #: builtin/tag.c:495 |
13300 | msgid "--no-contains option is only allowed in list mode" | |
13301 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 13302 | |
87cb7997 JX |
13303 | #: builtin/tag.c:497 |
13304 | msgid "--points-at option is only allowed in list mode" | |
13305 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 13306 | |
87cb7997 JX |
13307 | #: builtin/tag.c:499 |
13308 | msgid "--merged and --no-merged options are only allowed in list mode" | |
13309 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
13310 | ||
13311 | #: builtin/tag.c:510 | |
c04f5ac3 JX |
13312 | msgid "only one -F or -m option is allowed." |
13313 | msgstr "只允许一个 -F 或 -m 选项。" | |
13314 | ||
87cb7997 | 13315 | #: builtin/tag.c:529 |
c04f5ac3 JX |
13316 | msgid "too many params" |
13317 | msgstr "太多参数" | |
13318 | ||
87cb7997 | 13319 | #: builtin/tag.c:535 |
c04f5ac3 JX |
13320 | #, c-format |
13321 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 13322 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 13323 | |
87cb7997 | 13324 | #: builtin/tag.c:540 |
c04f5ac3 JX |
13325 | #, c-format |
13326 | msgid "tag '%s' already exists" | |
55a16ee4 | 13327 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 13328 | |
87cb7997 | 13329 | #: builtin/tag.c:570 |
c04f5ac3 JX |
13330 | #, c-format |
13331 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 13332 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 13333 | |
a0b6b246 | 13334 | #: builtin/unpack-objects.c:493 |
6c94aba5 JX |
13335 | msgid "Unpacking objects" |
13336 | msgstr "展开对象中" | |
13337 | ||
276ceeaa | 13338 | #: builtin/update-index.c:79 |
7aea43ff JX |
13339 | #, c-format |
13340 | msgid "failed to create directory %s" | |
13341 | msgstr "无法创建目录 %s" | |
13342 | ||
276ceeaa | 13343 | #: builtin/update-index.c:85 |
7aea43ff JX |
13344 | #, c-format |
13345 | msgid "failed to stat %s" | |
65e2041e | 13346 | msgstr "对 %s 调用 stat 失败" |
7aea43ff | 13347 | |
276ceeaa | 13348 | #: builtin/update-index.c:95 |
7aea43ff JX |
13349 | #, c-format |
13350 | msgid "failed to create file %s" | |
13351 | msgstr "无法创建文件 %s" | |
13352 | ||
276ceeaa | 13353 | #: builtin/update-index.c:103 |
7aea43ff JX |
13354 | #, c-format |
13355 | msgid "failed to delete file %s" | |
13356 | msgstr "无法删除文件 %s" | |
13357 | ||
87cb7997 | 13358 | #: builtin/update-index.c:110 builtin/update-index.c:216 |
7aea43ff JX |
13359 | #, c-format |
13360 | msgid "failed to delete directory %s" | |
13361 | msgstr "无法删除目录 %s" | |
13362 | ||
87cb7997 | 13363 | #: builtin/update-index.c:135 |
7aea43ff | 13364 | #, c-format |
276ceeaa JX |
13365 | msgid "Testing mtime in '%s' " |
13366 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 13367 | |
87cb7997 | 13368 | #: builtin/update-index.c:149 |
7aea43ff JX |
13369 | msgid "directory stat info does not change after adding a new file" |
13370 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
13371 | ||
87cb7997 | 13372 | #: builtin/update-index.c:162 |
7aea43ff JX |
13373 | msgid "directory stat info does not change after adding a new directory" |
13374 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
13375 | ||
87cb7997 | 13376 | #: builtin/update-index.c:175 |
7aea43ff JX |
13377 | msgid "directory stat info changes after updating a file" |
13378 | msgstr "更新一个文件后,目录的状态信息被修改" | |
13379 | ||
87cb7997 | 13380 | #: builtin/update-index.c:186 |
7aea43ff JX |
13381 | msgid "directory stat info changes after adding a file inside subdirectory" |
13382 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
13383 | ||
87cb7997 | 13384 | #: builtin/update-index.c:197 |
7aea43ff JX |
13385 | msgid "directory stat info does not change after deleting a file" |
13386 | msgstr "删除一个文件后,目录的状态信息未改变" | |
13387 | ||
87cb7997 | 13388 | #: builtin/update-index.c:210 |
7aea43ff JX |
13389 | msgid "directory stat info does not change after deleting a directory" |
13390 | msgstr "删除一个目录后,目录的状态信息未改变" | |
13391 | ||
87cb7997 | 13392 | #: builtin/update-index.c:217 |
7aea43ff JX |
13393 | msgid " OK" |
13394 | msgstr " OK" | |
13395 | ||
87cb7997 | 13396 | #: builtin/update-index.c:568 |
814ff314 JX |
13397 | msgid "git update-index [<options>] [--] [<file>...]" |
13398 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 13399 | |
87cb7997 | 13400 | #: builtin/update-index.c:923 |
ef317cd5 | 13401 | msgid "continue refresh even when index needs update" |
07432cef | 13402 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 13403 | |
87cb7997 | 13404 | #: builtin/update-index.c:926 |
ef317cd5 | 13405 | msgid "refresh: ignore submodules" |
07432cef | 13406 | msgstr "刷新:忽略子模组" |
8ada9598 | 13407 | |
87cb7997 | 13408 | #: builtin/update-index.c:929 |
ef317cd5 | 13409 | msgid "do not ignore new files" |
07432cef | 13410 | msgstr "不忽略新的文件" |
8ada9598 | 13411 | |
87cb7997 | 13412 | #: builtin/update-index.c:931 |
ef317cd5 | 13413 | msgid "let files replace directories and vice-versa" |
07432cef | 13414 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 13415 | |
87cb7997 | 13416 | #: builtin/update-index.c:933 |
ef317cd5 | 13417 | msgid "notice files missing from worktree" |
07432cef | 13418 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 13419 | |
87cb7997 | 13420 | #: builtin/update-index.c:935 |
ef317cd5 | 13421 | msgid "refresh even if index contains unmerged entries" |
07432cef | 13422 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 13423 | |
87cb7997 | 13424 | #: builtin/update-index.c:938 |
ef317cd5 | 13425 | msgid "refresh stat information" |
07432cef | 13426 | msgstr "刷新统计信息" |
ef317cd5 | 13427 | |
87cb7997 | 13428 | #: builtin/update-index.c:942 |
ef317cd5 | 13429 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 13430 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 13431 | |
87cb7997 | 13432 | #: builtin/update-index.c:946 |
6c94aba5 | 13433 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 13434 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 13435 | |
87cb7997 | 13436 | #: builtin/update-index.c:947 |
ef317cd5 | 13437 | msgid "add the specified entry to the index" |
07432cef | 13438 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 13439 | |
87cb7997 | 13440 | #: builtin/update-index.c:956 |
ef317cd5 | 13441 | msgid "mark files as \"not changing\"" |
07432cef | 13442 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 13443 | |
87cb7997 | 13444 | #: builtin/update-index.c:959 |
ef317cd5 | 13445 | msgid "clear assumed-unchanged bit" |
07432cef | 13446 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 13447 | |
87cb7997 | 13448 | #: builtin/update-index.c:962 |
ef317cd5 | 13449 | msgid "mark files as \"index-only\"" |
07432cef | 13450 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 13451 | |
87cb7997 | 13452 | #: builtin/update-index.c:965 |
ef317cd5 | 13453 | msgid "clear skip-worktree bit" |
07432cef | 13454 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 13455 | |
87cb7997 | 13456 | #: builtin/update-index.c:968 |
ef317cd5 | 13457 | msgid "add to index only; do not add content to object database" |
07432cef | 13458 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 13459 | |
87cb7997 | 13460 | #: builtin/update-index.c:970 |
ef317cd5 | 13461 | msgid "remove named paths even if present in worktree" |
07432cef | 13462 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 13463 | |
87cb7997 | 13464 | #: builtin/update-index.c:972 |
ef317cd5 | 13465 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 13466 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 13467 | |
87cb7997 | 13468 | #: builtin/update-index.c:974 |
ef317cd5 | 13469 | msgid "read list of paths to be updated from standard input" |
07432cef | 13470 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 13471 | |
87cb7997 | 13472 | #: builtin/update-index.c:978 |
ef317cd5 | 13473 | msgid "add entries from standard input to the index" |
07432cef | 13474 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 13475 | |
87cb7997 | 13476 | #: builtin/update-index.c:982 |
ef317cd5 | 13477 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 13478 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 13479 | |
87cb7997 | 13480 | #: builtin/update-index.c:986 |
ef317cd5 | 13481 | msgid "only update entries that differ from HEAD" |
07432cef | 13482 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 13483 | |
87cb7997 | 13484 | #: builtin/update-index.c:990 |
ef317cd5 | 13485 | msgid "ignore files missing from worktree" |
07432cef | 13486 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 13487 | |
87cb7997 | 13488 | #: builtin/update-index.c:993 |
ef317cd5 | 13489 | msgid "report actions to standard output" |
07432cef | 13490 | msgstr "在标准输出显示操作" |
ef317cd5 | 13491 | |
87cb7997 | 13492 | #: builtin/update-index.c:995 |
ef317cd5 | 13493 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 13494 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 13495 | |
87cb7997 | 13496 | #: builtin/update-index.c:999 |
ef317cd5 | 13497 | msgid "write index in this format" |
07432cef | 13498 | msgstr "以这种格式写入索引区" |
ef317cd5 | 13499 | |
87cb7997 | 13500 | #: builtin/update-index.c:1001 |
6acbf033 JX |
13501 | msgid "enable or disable split index" |
13502 | msgstr "启用或禁用索引拆分" | |
13503 | ||
87cb7997 | 13504 | #: builtin/update-index.c:1003 |
7aea43ff JX |
13505 | msgid "enable/disable untracked cache" |
13506 | msgstr "启用/禁用对未跟踪文件的缓存" | |
13507 | ||
87cb7997 | 13508 | #: builtin/update-index.c:1005 |
276ceeaa JX |
13509 | msgid "test if the filesystem supports untracked cache" |
13510 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
13511 | ||
87cb7997 | 13512 | #: builtin/update-index.c:1007 |
7aea43ff JX |
13513 | msgid "enable untracked cache without testing the filesystem" |
13514 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
13515 | ||
87cb7997 JX |
13516 | #: builtin/update-index.c:1107 |
13517 | msgid "" | |
13518 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
13519 | "enable split index" | |
13520 | msgstr "" | |
13521 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
13522 | ||
13523 | #: builtin/update-index.c:1116 | |
13524 | msgid "" | |
13525 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
13526 | "disable split index" | |
13527 | msgstr "" | |
13528 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
13529 | ||
13530 | #: builtin/update-index.c:1127 | |
a0b6b246 JX |
13531 | msgid "" |
13532 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
13533 | "to disable the untracked cache" | |
275588f9 JX |
13534 | msgstr "" |
13535 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
13536 | "改它。" | |
a0b6b246 | 13537 | |
87cb7997 | 13538 | #: builtin/update-index.c:1131 |
276ceeaa JX |
13539 | msgid "Untracked cache disabled" |
13540 | msgstr "缓存未跟踪文件被禁用" | |
13541 | ||
87cb7997 | 13542 | #: builtin/update-index.c:1139 |
a0b6b246 JX |
13543 | msgid "" |
13544 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
13545 | "to enable the untracked cache" | |
275588f9 JX |
13546 | msgstr "" |
13547 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
13548 | "修改它。" | |
a0b6b246 | 13549 | |
87cb7997 | 13550 | #: builtin/update-index.c:1143 |
276ceeaa JX |
13551 | #, c-format |
13552 | msgid "Untracked cache enabled for '%s'" | |
13553 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
13554 | ||
90314792 | 13555 | #: builtin/update-ref.c:9 |
814ff314 JX |
13556 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
13557 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 13558 | |
90314792 | 13559 | #: builtin/update-ref.c:10 |
814ff314 JX |
13560 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
13561 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
13562 | |
13563 | #: builtin/update-ref.c:11 | |
814ff314 JX |
13564 | msgid "git update-ref [<options>] --stdin [-z]" |
13565 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 13566 | |
1b7f4a34 | 13567 | #: builtin/update-ref.c:363 |
ef317cd5 | 13568 | msgid "delete the reference" |
07432cef | 13569 | msgstr "删除引用" |
ef317cd5 | 13570 | |
1b7f4a34 | 13571 | #: builtin/update-ref.c:365 |
ef317cd5 | 13572 | msgid "update <refname> not the one it points to" |
07432cef | 13573 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 13574 | |
1b7f4a34 | 13575 | #: builtin/update-ref.c:366 |
90314792 JX |
13576 | msgid "stdin has NUL-terminated arguments" |
13577 | msgstr "标准输入有以 NUL 字符终止的参数" | |
13578 | ||
1b7f4a34 | 13579 | #: builtin/update-ref.c:367 |
90314792 JX |
13580 | msgid "read updates from stdin" |
13581 | msgstr "从标准输入读取更新" | |
13582 | ||
ef317cd5 JX |
13583 | #: builtin/update-server-info.c:6 |
13584 | msgid "git update-server-info [--force]" | |
07432cef | 13585 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
13586 | |
13587 | #: builtin/update-server-info.c:14 | |
13588 | msgid "update the info files from scratch" | |
07432cef | 13589 | msgstr "从头开始更新文件信息" |
ef317cd5 | 13590 | |
6acbf033 | 13591 | #: builtin/verify-commit.c:17 |
814ff314 JX |
13592 | msgid "git verify-commit [-v | --verbose] <commit>..." |
13593 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 13594 | |
1b7f4a34 | 13595 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
13596 | msgid "print commit contents" |
13597 | msgstr "打印提交内容" | |
13598 | ||
1a79b2f1 | 13599 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:37 |
1b7f4a34 JX |
13600 | msgid "print raw gpg status output" |
13601 | msgstr "打印原始 gpg 状态输出" | |
13602 | ||
220c313c | 13603 | #: builtin/verify-pack.c:54 |
814ff314 JX |
13604 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
13605 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 13606 | |
220c313c | 13607 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
13608 | msgid "verbose" |
13609 | msgstr "冗长输出" | |
13610 | ||
220c313c | 13611 | #: builtin/verify-pack.c:66 |
ef317cd5 | 13612 | msgid "show statistics only" |
07432cef | 13613 | msgstr "只显示统计" |
ef317cd5 | 13614 | |
1a79b2f1 JX |
13615 | #: builtin/verify-tag.c:18 |
13616 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." | |
13617 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 13618 | |
1a79b2f1 | 13619 | #: builtin/verify-tag.c:36 |
ef317cd5 | 13620 | msgid "print tag contents" |
55a16ee4 | 13621 | msgstr "打印标签内容" |
ef317cd5 | 13622 | |
94550ed3 JX |
13623 | #: builtin/worktree.c:15 |
13624 | msgid "git worktree add [<options>] <path> [<branch>]" | |
13625 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 13626 | |
94550ed3 | 13627 | #: builtin/worktree.c:16 |
5c57d762 JX |
13628 | msgid "git worktree list [<options>]" |
13629 | msgstr "git worktree list [<选项>]" | |
13630 | ||
13631 | #: builtin/worktree.c:17 | |
13632 | msgid "git worktree lock [<options>] <path>" | |
13633 | msgstr "git worktree lock [<选项>] <路径>" | |
13634 | ||
13635 | #: builtin/worktree.c:18 | |
5bb01d4f JX |
13636 | msgid "git worktree prune [<options>]" |
13637 | msgstr "git worktree prune [<选项>]" | |
13638 | ||
5c57d762 JX |
13639 | #: builtin/worktree.c:19 |
13640 | msgid "git worktree unlock <path>" | |
13641 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 13642 | |
60638e98 | 13643 | #: builtin/worktree.c:43 |
5bb01d4f JX |
13644 | #, c-format |
13645 | msgid "Removing worktrees/%s: not a valid directory" | |
13646 | msgstr "删除工作区/%s:不是一个有效的目录" | |
13647 | ||
60638e98 | 13648 | #: builtin/worktree.c:49 |
5bb01d4f JX |
13649 | #, c-format |
13650 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
13651 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
13652 | ||
60638e98 | 13653 | #: builtin/worktree.c:54 |
5bb01d4f JX |
13654 | #, c-format |
13655 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
13656 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
13657 | ||
60638e98 | 13658 | #: builtin/worktree.c:65 |
5bb01d4f JX |
13659 | #, c-format |
13660 | msgid "Removing worktrees/%s: invalid gitdir file" | |
13661 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
13662 | ||
60638e98 | 13663 | #: builtin/worktree.c:81 |
5bb01d4f JX |
13664 | #, c-format |
13665 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
13666 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
13667 | ||
1a79b2f1 JX |
13668 | #: builtin/worktree.c:128 |
13669 | msgid "report pruned working trees" | |
13670 | msgstr "报告清除的工作区" | |
13671 | ||
13672 | #: builtin/worktree.c:130 | |
13673 | msgid "expire working trees older than <time>" | |
13674 | msgstr "将早于 <time> 的工作区过期" | |
13675 | ||
5c57d762 | 13676 | #: builtin/worktree.c:204 |
5bb01d4f JX |
13677 | #, c-format |
13678 | msgid "'%s' already exists" | |
13679 | msgstr "'%s' 已经存在" | |
13680 | ||
60638e98 | 13681 | #: builtin/worktree.c:235 |
5bb01d4f JX |
13682 | #, c-format |
13683 | msgid "could not create directory of '%s'" | |
13684 | msgstr "不能创建目录 '%s'" | |
13685 | ||
60638e98 | 13686 | #: builtin/worktree.c:274 |
5bb01d4f | 13687 | #, c-format |
1b7f4a34 | 13688 | msgid "Preparing %s (identifier %s)" |
29004bbb | 13689 | msgstr "准备 %s(标识符 %s)" |
5bb01d4f | 13690 | |
60638e98 | 13691 | #: builtin/worktree.c:328 |
5bb01d4f JX |
13692 | msgid "checkout <branch> even if already checked out in other worktree" |
13693 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
13694 | ||
60638e98 | 13695 | #: builtin/worktree.c:330 |
5bb01d4f JX |
13696 | msgid "create a new branch" |
13697 | msgstr "创建一个新分支" | |
13698 | ||
60638e98 | 13699 | #: builtin/worktree.c:332 |
5bb01d4f JX |
13700 | msgid "create or reset a branch" |
13701 | msgstr "创建或重置一个分支" | |
13702 | ||
60638e98 | 13703 | #: builtin/worktree.c:334 |
5b04ee3b JX |
13704 | msgid "populate the new working tree" |
13705 | msgstr "生成新的工作区" | |
13706 | ||
60638e98 JX |
13707 | #: builtin/worktree.c:335 |
13708 | msgid "keep the new working tree locked" | |
13709 | msgstr "锁定新工作区" | |
13710 | ||
13711 | #: builtin/worktree.c:343 | |
1b7f4a34 JX |
13712 | msgid "-b, -B, and --detach are mutually exclusive" |
13713 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 13714 | |
60638e98 | 13715 | #: builtin/worktree.c:478 |
5c57d762 JX |
13716 | msgid "reason for locking" |
13717 | msgstr "锁定原因" | |
13718 | ||
60638e98 | 13719 | #: builtin/worktree.c:490 builtin/worktree.c:523 |
5c57d762 JX |
13720 | #, c-format |
13721 | msgid "'%s' is not a working tree" | |
13722 | msgstr "'%s' 不是一个工作区" | |
13723 | ||
60638e98 | 13724 | #: builtin/worktree.c:492 builtin/worktree.c:525 |
5c57d762 JX |
13725 | msgid "The main working tree cannot be locked or unlocked" |
13726 | msgstr "主工作区无法被加锁或解锁" | |
13727 | ||
60638e98 | 13728 | #: builtin/worktree.c:497 |
5c57d762 JX |
13729 | #, c-format |
13730 | msgid "'%s' is already locked, reason: %s" | |
13731 | msgstr "'%s' 已被锁定,原因:%s" | |
13732 | ||
60638e98 | 13733 | #: builtin/worktree.c:499 |
5c57d762 JX |
13734 | #, c-format |
13735 | msgid "'%s' is already locked" | |
13736 | msgstr "'%s' 已被锁定" | |
13737 | ||
60638e98 | 13738 | #: builtin/worktree.c:527 |
5c57d762 JX |
13739 | #, c-format |
13740 | msgid "'%s' is not locked" | |
13741 | msgstr "'%s' 未被锁定" | |
13742 | ||
ef317cd5 JX |
13743 | #: builtin/write-tree.c:13 |
13744 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 13745 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
13746 | |
13747 | #: builtin/write-tree.c:26 | |
13748 | msgid "<prefix>/" | |
07432cef | 13749 | msgstr "<前缀>/" |
ef317cd5 JX |
13750 | |
13751 | #: builtin/write-tree.c:27 | |
13752 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 13753 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
13754 | |
13755 | #: builtin/write-tree.c:30 | |
13756 | msgid "only useful for debugging" | |
07432cef | 13757 | msgstr "只对调试有用" |
ef317cd5 | 13758 | |
a0b6b246 | 13759 | #: upload-pack.c:22 |
5c57d762 JX |
13760 | msgid "git upload-pack [<options>] <dir>" |
13761 | msgstr "git upload-pack [<选项>] <目录>" | |
13762 | ||
87cb7997 | 13763 | #: upload-pack.c:1040 |
5c57d762 JX |
13764 | msgid "quit after a single request/response exchange" |
13765 | msgstr "在一次单独的请求/响应(request/response)交换后退出" | |
13766 | ||
87cb7997 | 13767 | #: upload-pack.c:1042 |
5c57d762 JX |
13768 | msgid "exit immediately after initial ref advertisement" |
13769 | msgstr "在初始的引用广告后立即退出" | |
13770 | ||
87cb7997 | 13771 | #: upload-pack.c:1044 |
5c57d762 JX |
13772 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" |
13773 | msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" | |
13774 | ||
87cb7997 | 13775 | #: upload-pack.c:1046 |
5c57d762 JX |
13776 | msgid "interrupt transfer after <n> seconds of inactivity" |
13777 | msgstr "不活动 <n> 秒钟后终止传输" | |
13778 | ||
a0b6b246 JX |
13779 | #: credential-cache--daemon.c:223 |
13780 | #, c-format | |
13781 | msgid "" | |
13782 | "The permissions on your socket directory are too loose; other\n" | |
13783 | "users may be able to read your cached credentials. Consider running:\n" | |
13784 | "\n" | |
13785 | "\tchmod 0700 %s" | |
13786 | msgstr "" | |
1a79b2f1 JX |
13787 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
13788 | "行:\n" | |
a0b6b246 JX |
13789 | "\n" |
13790 | "\tchmod 0700 %s" | |
13791 | ||
5b04ee3b | 13792 | #: credential-cache--daemon.c:271 |
220c313c JX |
13793 | msgid "print debugging messages to stderr" |
13794 | msgstr "调试信息输出到标准错误" | |
13795 | ||
d9d56b23 | 13796 | #: git.c:14 |
4dcdc3d8 | 13797 | msgid "" |
220c313c | 13798 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
13799 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
13800 | "to read about a specific subcommand or concept." | |
13801 | msgstr "" | |
220c313c JX |
13802 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
13803 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
13804 | "帮助。" | |
8ada9598 | 13805 | |
60638e98 JX |
13806 | #: http.c:336 |
13807 | #, c-format | |
13808 | msgid "negative value for http.postbuffer; defaulting to %d" | |
13809 | msgstr "http.postbuffer 为负值,默认为 %d" | |
13810 | ||
13811 | #: http.c:357 | |
a0b6b246 JX |
13812 | msgid "Delegation control is not supported with cURL < 7.22.0" |
13813 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" | |
13814 | ||
60638e98 | 13815 | #: http.c:366 |
276ceeaa JX |
13816 | msgid "Public key pinning not supported with cURL < 7.44.0" |
13817 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
13818 | ||
60638e98 | 13819 | #: http.c:1766 |
1a79b2f1 JX |
13820 | #, c-format |
13821 | msgid "" | |
13822 | "unable to update url base from redirection:\n" | |
13823 | " asked for: %s\n" | |
13824 | " redirect: %s" | |
13825 | msgstr "" | |
13826 | "不能更新重定向的 url base:\n" | |
13827 | " 请求:%s\n" | |
13828 | " 重定向:%s" | |
13829 | ||
87cb7997 | 13830 | #: remote-curl.c:323 |
1a79b2f1 JX |
13831 | #, c-format |
13832 | msgid "redirecting to %s" | |
13833 | msgstr "重定向到 %s" | |
13834 | ||
1b7f4a34 | 13835 | #: common-cmds.h:9 |
7aea43ff JX |
13836 | msgid "start a working area (see also: git help tutorial)" |
13837 | msgstr "开始一个工作区(参见:git help tutorial)" | |
13838 | ||
1b7f4a34 | 13839 | #: common-cmds.h:10 |
7aea43ff JX |
13840 | msgid "work on the current change (see also: git help everyday)" |
13841 | msgstr "在当前变更上工作(参见:git help everyday)" | |
13842 | ||
1b7f4a34 | 13843 | #: common-cmds.h:11 |
7aea43ff JX |
13844 | msgid "examine the history and state (see also: git help revisions)" |
13845 | msgstr "检查历史和状态(参见:git help revisions)" | |
13846 | ||
1b7f4a34 | 13847 | #: common-cmds.h:12 |
7aea43ff JX |
13848 | msgid "grow, mark and tweak your common history" |
13849 | msgstr "扩展、标记和调校您的历史记录" | |
13850 | ||
1b7f4a34 | 13851 | #: common-cmds.h:13 |
7aea43ff JX |
13852 | msgid "collaborate (see also: git help workflows)" |
13853 | msgstr "协同(参见:git help workflows)" | |
13854 | ||
1b7f4a34 | 13855 | #: common-cmds.h:17 |
8ada9598 | 13856 | msgid "Add file contents to the index" |
81809b99 | 13857 | msgstr "添加文件内容至索引" |
8ada9598 | 13858 | |
1b7f4a34 JX |
13859 | #: common-cmds.h:18 |
13860 | msgid "Use binary search to find the commit that introduced a bug" | |
13861 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 13862 | |
1b7f4a34 | 13863 | #: common-cmds.h:19 |
8ada9598 | 13864 | msgid "List, create, or delete branches" |
81809b99 | 13865 | msgstr "列出、创建或删除分支" |
8ada9598 | 13866 | |
1b7f4a34 | 13867 | #: common-cmds.h:20 |
5bb01d4f JX |
13868 | msgid "Switch branches or restore working tree files" |
13869 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 13870 | |
1b7f4a34 | 13871 | #: common-cmds.h:21 |
8ada9598 | 13872 | msgid "Clone a repository into a new directory" |
160fb2b2 | 13873 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 13874 | |
1b7f4a34 | 13875 | #: common-cmds.h:22 |
8ada9598 | 13876 | msgid "Record changes to the repository" |
160fb2b2 | 13877 | msgstr "记录变更到仓库" |
8ada9598 | 13878 | |
1b7f4a34 | 13879 | #: common-cmds.h:23 |
8ada9598 | 13880 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 13881 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 13882 | |
1b7f4a34 | 13883 | #: common-cmds.h:24 |
8ada9598 | 13884 | msgid "Download objects and refs from another repository" |
160fb2b2 | 13885 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 13886 | |
1b7f4a34 | 13887 | #: common-cmds.h:25 |
8ada9598 | 13888 | msgid "Print lines matching a pattern" |
81809b99 | 13889 | msgstr "输出和模式匹配的行" |
8ada9598 | 13890 | |
1b7f4a34 | 13891 | #: common-cmds.h:26 |
a77c07d9 | 13892 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 13893 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 13894 | |
1b7f4a34 | 13895 | #: common-cmds.h:27 |
8ada9598 | 13896 | msgid "Show commit logs" |
81809b99 | 13897 | msgstr "显示提交日志" |
8ada9598 | 13898 | |
1b7f4a34 | 13899 | #: common-cmds.h:28 |
8ada9598 | 13900 | msgid "Join two or more development histories together" |
81809b99 | 13901 | msgstr "合并两个或更多开发历史" |
8ada9598 | 13902 | |
1b7f4a34 | 13903 | #: common-cmds.h:29 |
8ada9598 | 13904 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 13905 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 13906 | |
1b7f4a34 | 13907 | #: common-cmds.h:30 |
2e8451e8 | 13908 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 13909 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 13910 | |
1b7f4a34 | 13911 | #: common-cmds.h:31 |
8ada9598 | 13912 | msgid "Update remote refs along with associated objects" |
81809b99 | 13913 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 13914 | |
1b7f4a34 | 13915 | #: common-cmds.h:32 |
3495628d JX |
13916 | msgid "Reapply commits on top of another base tip" |
13917 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 13918 | |
1b7f4a34 | 13919 | #: common-cmds.h:33 |
8ada9598 | 13920 | msgid "Reset current HEAD to the specified state" |
4375c10e | 13921 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 13922 | |
1b7f4a34 | 13923 | #: common-cmds.h:34 |
8ada9598 | 13924 | msgid "Remove files from the working tree and from the index" |
81809b99 | 13925 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 13926 | |
1b7f4a34 | 13927 | #: common-cmds.h:35 |
8ada9598 | 13928 | msgid "Show various types of objects" |
81809b99 | 13929 | msgstr "显示各种类型的对象" |
8ada9598 | 13930 | |
1b7f4a34 | 13931 | #: common-cmds.h:36 |
8ada9598 | 13932 | msgid "Show the working tree status" |
81809b99 | 13933 | msgstr "显示工作区状态" |
8ada9598 | 13934 | |
1b7f4a34 | 13935 | #: common-cmds.h:37 |
8ada9598 | 13936 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 13937 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 13938 | |
1b7f4a34 | 13939 | #: parse-options.h:145 |
220c313c JX |
13940 | msgid "expiry-date" |
13941 | msgstr "到期时间" | |
13942 | ||
1b7f4a34 | 13943 | #: parse-options.h:160 |
220c313c JX |
13944 | msgid "no-op (backward compatibility)" |
13945 | msgstr "空操作(向后兼容)" | |
13946 | ||
a0b6b246 | 13947 | #: parse-options.h:238 |
220c313c JX |
13948 | msgid "be more verbose" |
13949 | msgstr "更加详细" | |
13950 | ||
a0b6b246 | 13951 | #: parse-options.h:240 |
220c313c JX |
13952 | msgid "be more quiet" |
13953 | msgstr "更加安静" | |
13954 | ||
a0b6b246 | 13955 | #: parse-options.h:246 |
220c313c JX |
13956 | msgid "use <n> digits to display SHA-1s" |
13957 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
13958 | ||
5b04ee3b | 13959 | #: rerere.h:40 |
220c313c JX |
13960 | msgid "update the index with reused conflict resolution if possible" |
13961 | msgstr "如果可能,重用冲突解决更新索引" | |
13962 | ||
5c57d762 | 13963 | #: git-bisect.sh:54 |
b694fbb1 JX |
13964 | msgid "You need to start by \"git bisect start\"" |
13965 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
13966 | ||
90e6ef53 | 13967 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
13968 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
13969 | #. translation. The program will only accept English input | |
13970 | #. at this point. | |
5c57d762 | 13971 | #: git-bisect.sh:60 |
c04f5ac3 JX |
13972 | msgid "Do you want me to do it for you [Y/n]? " |
13973 | msgstr "您想让我为您这样做么[Y/n]? " | |
13974 | ||
5c57d762 | 13975 | #: git-bisect.sh:121 |
c04f5ac3 JX |
13976 | #, sh-format |
13977 | msgid "unrecognised option: '$arg'" | |
81809b99 | 13978 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 13979 | |
5c57d762 | 13980 | #: git-bisect.sh:125 |
c04f5ac3 JX |
13981 | #, sh-format |
13982 | msgid "'$arg' does not appear to be a valid revision" | |
13983 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
13984 | ||
5c57d762 | 13985 | #: git-bisect.sh:154 |
c04f5ac3 JX |
13986 | msgid "Bad HEAD - I need a HEAD" |
13987 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
13988 | ||
5c57d762 | 13989 | #: git-bisect.sh:167 |
c04f5ac3 JX |
13990 | #, sh-format |
13991 | msgid "" | |
814ff314 | 13992 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 13993 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 13994 | |
5c57d762 | 13995 | #: git-bisect.sh:177 |
cfff71a9 JX |
13996 | msgid "won't bisect on cg-seek'ed tree" |
13997 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 13998 | |
5c57d762 | 13999 | #: git-bisect.sh:181 |
c04f5ac3 | 14000 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 14001 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 14002 | |
5c57d762 | 14003 | #: git-bisect.sh:233 |
c04f5ac3 JX |
14004 | #, sh-format |
14005 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 14006 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 14007 | |
5c57d762 | 14008 | #: git-bisect.sh:262 |
c04f5ac3 JX |
14009 | #, sh-format |
14010 | msgid "Bad rev input: $arg" | |
9a4b694c | 14011 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 14012 | |
5c57d762 JX |
14013 | #: git-bisect.sh:281 |
14014 | #, sh-format | |
14015 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 14016 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 14017 | |
94550ed3 | 14018 | #: git-bisect.sh:290 |
c04f5ac3 JX |
14019 | #, sh-format |
14020 | msgid "Bad rev input: $rev" | |
9a4b694c | 14021 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 14022 | |
94550ed3 | 14023 | #: git-bisect.sh:299 |
1b7f4a34 JX |
14024 | #, sh-format |
14025 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
14026 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
14027 | ||
94550ed3 | 14028 | #: git-bisect.sh:322 |
1b7f4a34 JX |
14029 | #, sh-format |
14030 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
14031 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 14032 | |
90e6ef53 | 14033 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
14034 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
14035 | #. translation. The program will only accept English input | |
14036 | #. at this point. | |
94550ed3 | 14037 | #: git-bisect.sh:328 |
c04f5ac3 JX |
14038 | msgid "Are you sure [Y/n]? " |
14039 | msgstr "您确认么[Y/n]? " | |
14040 | ||
94550ed3 | 14041 | #: git-bisect.sh:340 |
1b7f4a34 | 14042 | #, sh-format |
b694fbb1 | 14043 | msgid "" |
1b7f4a34 JX |
14044 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
14045 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
14046 | msgstr "" |
14047 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 14048 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 14049 | |
94550ed3 | 14050 | #: git-bisect.sh:343 |
1b7f4a34 | 14051 | #, sh-format |
b694fbb1 JX |
14052 | msgid "" |
14053 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
14054 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
14055 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
14056 | msgstr "" |
14057 | "您需要执行 \"git bisect start\" 来开始。\n" | |
14058 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 14059 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 14060 | |
94550ed3 | 14061 | #: git-bisect.sh:414 git-bisect.sh:546 |
b694fbb1 JX |
14062 | msgid "We are not bisecting." |
14063 | msgstr "我们没有在二分查找。" | |
14064 | ||
94550ed3 | 14065 | #: git-bisect.sh:421 |
c04f5ac3 JX |
14066 | #, sh-format |
14067 | msgid "'$invalid' is not a valid commit" | |
14068 | msgstr "'$invalid' 不是一个有效的提交" | |
14069 | ||
94550ed3 | 14070 | #: git-bisect.sh:430 |
c04f5ac3 JX |
14071 | #, sh-format |
14072 | msgid "" | |
14073 | "Could not check out original HEAD '$branch'.\n" | |
14074 | "Try 'git bisect reset <commit>'." | |
14075 | msgstr "" | |
14076 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 14077 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 14078 | |
94550ed3 | 14079 | #: git-bisect.sh:458 |
c04f5ac3 JX |
14080 | msgid "No logfile given" |
14081 | msgstr "未提供日志文件" | |
14082 | ||
94550ed3 | 14083 | #: git-bisect.sh:459 |
c04f5ac3 JX |
14084 | #, sh-format |
14085 | msgid "cannot read $file for replaying" | |
14086 | msgstr "不能读取 $file 来重放" | |
14087 | ||
94550ed3 | 14088 | #: git-bisect.sh:480 |
c04f5ac3 JX |
14089 | msgid "?? what are you talking about?" |
14090 | msgstr "?? 您在说什么?" | |
14091 | ||
94550ed3 | 14092 | #: git-bisect.sh:492 |
b694fbb1 JX |
14093 | #, sh-format |
14094 | msgid "running $command" | |
14095 | msgstr "运行 $command" | |
14096 | ||
94550ed3 | 14097 | #: git-bisect.sh:499 |
b694fbb1 JX |
14098 | #, sh-format |
14099 | msgid "" | |
14100 | "bisect run failed:\n" | |
14101 | "exit code $res from '$command' is < 0 or >= 128" | |
14102 | msgstr "" | |
14103 | "二分查找运行失败:\n" | |
07432cef | 14104 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 14105 | |
94550ed3 | 14106 | #: git-bisect.sh:525 |
b694fbb1 JX |
14107 | msgid "bisect run cannot continue any more" |
14108 | msgstr "二分查找不能继续运行" | |
14109 | ||
94550ed3 | 14110 | #: git-bisect.sh:531 |
b694fbb1 JX |
14111 | #, sh-format |
14112 | msgid "" | |
14113 | "bisect run failed:\n" | |
14114 | "'bisect_state $state' exited with error code $res" | |
14115 | msgstr "" | |
14116 | "二分查找运行失败:\n" | |
14117 | "'bisect_state $state' 退出码为 $res" | |
14118 | ||
94550ed3 | 14119 | #: git-bisect.sh:538 |
b694fbb1 JX |
14120 | msgid "bisect run success" |
14121 | msgstr "二分查找运行成功" | |
c04f5ac3 | 14122 | |
94550ed3 JX |
14123 | #: git-bisect.sh:565 |
14124 | msgid "please use two different terms" | |
14125 | msgstr "请使用两个不同的术语" | |
14126 | ||
14127 | #: git-bisect.sh:575 | |
14128 | #, sh-format | |
14129 | msgid "'$term' is not a valid term" | |
14130 | msgstr "'$term' 不是一个有效的名称" | |
14131 | ||
14132 | #: git-bisect.sh:578 | |
14133 | #, sh-format | |
14134 | msgid "can't use the builtin command '$term' as a term" | |
14135 | msgstr "不能使用内置命令 '$term' 作为术语" | |
14136 | ||
14137 | #: git-bisect.sh:587 git-bisect.sh:593 | |
14138 | #, sh-format | |
14139 | msgid "can't change the meaning of term '$term'" | |
14140 | msgstr "不能修改术语 '$term' 的含义" | |
14141 | ||
14142 | #: git-bisect.sh:606 | |
b694fbb1 | 14143 | #, sh-format |
1b7f4a34 JX |
14144 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
14145 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 14146 | |
94550ed3 JX |
14147 | #: git-bisect.sh:636 |
14148 | msgid "no terms defined" | |
14149 | msgstr "未定义术语" | |
14150 | ||
14151 | #: git-bisect.sh:653 | |
14152 | #, sh-format | |
14153 | msgid "" | |
14154 | "invalid argument $arg for 'git bisect terms'.\n" | |
14155 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
14156 | msgstr "" | |
14157 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
14158 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
14159 | ||
5c57d762 JX |
14160 | #: git-merge-octopus.sh:46 |
14161 | msgid "" | |
14162 | "Error: Your local changes to the following files would be overwritten by " | |
14163 | "merge" | |
14164 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
14165 | ||
14166 | #: git-merge-octopus.sh:61 | |
14167 | msgid "Automated merge did not work." | |
9a4b694c | 14168 | msgstr "自动合并未生效。" |
5c57d762 JX |
14169 | |
14170 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 14171 | msgid "Should not be doing an octopus." |
5c57d762 JX |
14172 | msgstr "不应该执行章鱼式合并。" |
14173 | ||
14174 | #: git-merge-octopus.sh:73 | |
14175 | #, sh-format | |
14176 | msgid "Unable to find common commit with $pretty_name" | |
14177 | msgstr "无法找到和 $pretty_name 的基线提交" | |
14178 | ||
14179 | #: git-merge-octopus.sh:77 | |
14180 | #, sh-format | |
14181 | msgid "Already up-to-date with $pretty_name" | |
14182 | msgstr "已经和 $pretty_name 保持一致" | |
14183 | ||
14184 | #: git-merge-octopus.sh:89 | |
14185 | #, sh-format | |
14186 | msgid "Fast-forwarding to: $pretty_name" | |
14187 | msgstr "快进至:$pretty_name" | |
14188 | ||
14189 | #: git-merge-octopus.sh:97 | |
14190 | #, sh-format | |
14191 | msgid "Trying simple merge with $pretty_name" | |
14192 | msgstr "尝试和 $pretty_name 的简单合并" | |
14193 | ||
14194 | #: git-merge-octopus.sh:102 | |
14195 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 14196 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 14197 | |
60638e98 | 14198 | #: git-rebase.sh:58 |
649900bc JX |
14199 | msgid "" |
14200 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
14201 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
14202 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
14203 | "\"." | |
14204 | msgstr "" | |
14205 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
14206 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
14207 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
14208 | ||
60638e98 | 14209 | #: git-rebase.sh:158 git-rebase.sh:397 |
5c57d762 JX |
14210 | #, sh-format |
14211 | msgid "Could not move back to $head_name" | |
14212 | msgstr "无法移回 $head_name" | |
14213 | ||
60638e98 | 14214 | #: git-rebase.sh:172 |
2e8451e8 JX |
14215 | #, sh-format |
14216 | msgid "Cannot store $stash_sha1" | |
14217 | msgstr "无法保存 $stash_sha1" | |
14218 | ||
60638e98 | 14219 | #: git-rebase.sh:212 |
649900bc | 14220 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 14221 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 14222 | |
60638e98 | 14223 | #: git-rebase.sh:217 |
649900bc JX |
14224 | msgid "It looks like git-am is in progress. Cannot rebase." |
14225 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
14226 | ||
60638e98 | 14227 | #: git-rebase.sh:358 |
649900bc JX |
14228 | msgid "No rebase in progress?" |
14229 | msgstr "没有正在进行的变基?" | |
14230 | ||
60638e98 | 14231 | #: git-rebase.sh:369 |
07432cef WS |
14232 | msgid "The --edit-todo action can only be used during interactive rebase." |
14233 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
14234 | ||
60638e98 | 14235 | #: git-rebase.sh:376 |
649900bc JX |
14236 | msgid "Cannot read HEAD" |
14237 | msgstr "不能读取 HEAD" | |
14238 | ||
60638e98 | 14239 | #: git-rebase.sh:379 |
649900bc JX |
14240 | msgid "" |
14241 | "You must edit all merge conflicts and then\n" | |
14242 | "mark them as resolved using git add" | |
14243 | msgstr "" | |
14244 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
14245 | "命令将它们标记为已解决" | |
14246 | ||
60638e98 | 14247 | #: git-rebase.sh:419 |
649900bc JX |
14248 | #, sh-format |
14249 | msgid "" | |
14250 | "It seems that there is already a $state_dir_base directory, and\n" | |
14251 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
14252 | "case, please try\n" | |
14253 | "\t$cmd_live_rebase\n" | |
14254 | "If that is not the case, please\n" | |
14255 | "\t$cmd_clear_stale_rebase\n" | |
14256 | "and run me again. I am stopping in case you still have something\n" | |
14257 | "valuable there." | |
14258 | msgstr "" | |
98b2761d JX |
14259 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
14260 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
14261 | "\t$cmd_live_rebase\n" |
14262 | "如果不是这样,请执行\n" | |
14263 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 14264 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 14265 | |
60638e98 | 14266 | #: git-rebase.sh:470 |
649900bc JX |
14267 | #, sh-format |
14268 | msgid "invalid upstream $upstream_name" | |
14269 | msgstr "无效的上游 $upstream_name" | |
14270 | ||
60638e98 | 14271 | #: git-rebase.sh:494 |
649900bc JX |
14272 | #, sh-format |
14273 | msgid "$onto_name: there are more than one merge bases" | |
14274 | msgstr "$onto_name: 有一个以上的合并基准" | |
14275 | ||
60638e98 | 14276 | #: git-rebase.sh:497 git-rebase.sh:501 |
649900bc JX |
14277 | #, sh-format |
14278 | msgid "$onto_name: there is no merge base" | |
14279 | msgstr "$onto_name: 没有合并基准" | |
14280 | ||
60638e98 | 14281 | #: git-rebase.sh:506 |
649900bc JX |
14282 | #, sh-format |
14283 | msgid "Does not point to a valid commit: $onto_name" | |
14284 | msgstr "没有指向一个有效的提交:$onto_name" | |
14285 | ||
60638e98 | 14286 | #: git-rebase.sh:529 |
649900bc JX |
14287 | #, sh-format |
14288 | msgid "fatal: no such branch: $branch_name" | |
14289 | msgstr "严重错误:无此分支:$branch_name" | |
14290 | ||
60638e98 | 14291 | #: git-rebase.sh:562 |
2e8451e8 JX |
14292 | msgid "Cannot autostash" |
14293 | msgstr "无法 autostash" | |
14294 | ||
60638e98 | 14295 | #: git-rebase.sh:567 |
2e8451e8 JX |
14296 | #, sh-format |
14297 | msgid "Created autostash: $stash_abbrev" | |
14298 | msgstr "创建了 autostash: $stash_abbrev" | |
14299 | ||
60638e98 | 14300 | #: git-rebase.sh:571 |
649900bc JX |
14301 | msgid "Please commit or stash them." |
14302 | msgstr "请提交或为它们保存进度。" | |
14303 | ||
60638e98 | 14304 | #: git-rebase.sh:591 |
649900bc JX |
14305 | #, sh-format |
14306 | msgid "Current branch $branch_name is up to date." | |
14307 | msgstr "当前分支 $branch_name 是最新的。" | |
14308 | ||
60638e98 | 14309 | #: git-rebase.sh:595 |
649900bc JX |
14310 | #, sh-format |
14311 | msgid "Current branch $branch_name is up to date, rebase forced." | |
14312 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
14313 | ||
60638e98 | 14314 | #: git-rebase.sh:606 |
649900bc JX |
14315 | #, sh-format |
14316 | msgid "Changes from $mb to $onto:" | |
14317 | msgstr "变更从 $mb 到 $onto:" | |
14318 | ||
60638e98 | 14319 | #: git-rebase.sh:615 |
649900bc | 14320 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 14321 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 14322 | |
60638e98 | 14323 | #: git-rebase.sh:625 |
649900bc JX |
14324 | #, sh-format |
14325 | msgid "Fast-forwarded $branch_name to $onto_name." | |
14326 | msgstr "快进 $branch_name 至 $onto_name。" | |
14327 | ||
87cb7997 | 14328 | #: git-stash.sh:53 |
c04f5ac3 JX |
14329 | msgid "git stash clear with parameters is unimplemented" |
14330 | msgstr "git stash clear 不支持参数" | |
14331 | ||
87cb7997 | 14332 | #: git-stash.sh:94 |
c04f5ac3 JX |
14333 | msgid "You do not have the initial commit yet" |
14334 | msgstr "您尚未建立初始提交" | |
14335 | ||
87cb7997 | 14336 | #: git-stash.sh:109 |
c04f5ac3 | 14337 | msgid "Cannot save the current index state" |
90e6ef53 | 14338 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 14339 | |
87cb7997 | 14340 | #: git-stash.sh:124 |
a0b6b246 JX |
14341 | msgid "Cannot save the untracked files" |
14342 | msgstr "无法保存未跟踪文件" | |
14343 | ||
87cb7997 | 14344 | #: git-stash.sh:144 git-stash.sh:157 |
c04f5ac3 JX |
14345 | msgid "Cannot save the current worktree state" |
14346 | msgstr "无法保存当前工作区状态" | |
14347 | ||
87cb7997 | 14348 | #: git-stash.sh:161 |
c04f5ac3 | 14349 | msgid "No changes selected" |
90e6ef53 | 14350 | msgstr "没有选择变更" |
c04f5ac3 | 14351 | |
87cb7997 | 14352 | #: git-stash.sh:164 |
c04f5ac3 | 14353 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 14354 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 14355 | |
87cb7997 | 14356 | #: git-stash.sh:177 |
c04f5ac3 JX |
14357 | msgid "Cannot record working tree state" |
14358 | msgstr "不能记录工作区状态" | |
14359 | ||
87cb7997 | 14360 | #: git-stash.sh:209 |
2e8451e8 JX |
14361 | #, sh-format |
14362 | msgid "Cannot update $ref_stash with $w_commit" | |
14363 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
14364 | ||
b694fbb1 JX |
14365 | #. TRANSLATORS: $option is an invalid option, like |
14366 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
14367 | #. second line correspond to "error: ". So you should line | |
14368 | #. up the second line with however many characters the | |
14369 | #. translation of "error: " takes in your language. E.g. in | |
14370 | #. English this is: | |
14371 | #. | |
14372 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
14373 | #. error: unknown option for 'stash save': --blah-blah | |
14374 | #. To provide a message, use git stash save -- '--blah-blah' | |
87cb7997 | 14375 | #: git-stash.sh:265 |
b694fbb1 JX |
14376 | #, sh-format |
14377 | msgid "" | |
14378 | "error: unknown option for 'stash save': $option\n" | |
14379 | " To provide a message, use git stash save -- '$option'" | |
14380 | msgstr "" | |
14381 | "错误:'stash save' 的未知选项:$option\n" | |
14382 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
14383 | ||
87cb7997 | 14384 | #: git-stash.sh:278 |
a0b6b246 JX |
14385 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
14386 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
14387 | ||
87cb7997 | 14388 | #: git-stash.sh:286 |
c04f5ac3 JX |
14389 | msgid "No local changes to save" |
14390 | msgstr "没有要保存的本地修改" | |
14391 | ||
87cb7997 | 14392 | #: git-stash.sh:291 |
c04f5ac3 | 14393 | msgid "Cannot initialize stash" |
90e6ef53 | 14394 | msgstr "无法初始化 stash" |
c04f5ac3 | 14395 | |
87cb7997 | 14396 | #: git-stash.sh:295 |
c04f5ac3 JX |
14397 | msgid "Cannot save the current status" |
14398 | msgstr "无法保存当前状态" | |
14399 | ||
87cb7997 | 14400 | #: git-stash.sh:296 |
5c57d762 JX |
14401 | #, sh-format |
14402 | msgid "Saved working directory and index state $stash_msg" | |
14403 | msgstr "保存工作目录和索引状态 $stash_msg" | |
14404 | ||
87cb7997 | 14405 | #: git-stash.sh:323 |
c04f5ac3 JX |
14406 | msgid "Cannot remove worktree changes" |
14407 | msgstr "无法删除工作区变更" | |
14408 | ||
87cb7997 | 14409 | #: git-stash.sh:471 |
7aea43ff JX |
14410 | #, sh-format |
14411 | msgid "unknown option: $opt" | |
14412 | msgstr "未知选项: $opt" | |
14413 | ||
87cb7997 | 14414 | #: git-stash.sh:484 |
c04f5ac3 | 14415 | msgid "No stash found." |
90e6ef53 | 14416 | msgstr "未发现 stash。" |
c04f5ac3 | 14417 | |
87cb7997 | 14418 | #: git-stash.sh:491 |
c04f5ac3 JX |
14419 | #, sh-format |
14420 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 14421 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 14422 | |
87cb7997 | 14423 | #: git-stash.sh:506 |
c04f5ac3 | 14424 | #, sh-format |
220c313c JX |
14425 | msgid "$reference is not a valid reference" |
14426 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 14427 | |
87cb7997 | 14428 | #: git-stash.sh:534 |
c04f5ac3 JX |
14429 | #, sh-format |
14430 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 14431 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 14432 | |
87cb7997 | 14433 | #: git-stash.sh:545 |
c04f5ac3 JX |
14434 | #, sh-format |
14435 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 14436 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 14437 | |
87cb7997 | 14438 | #: git-stash.sh:553 |
c04f5ac3 | 14439 | msgid "unable to refresh index" |
90e6ef53 | 14440 | msgstr "无法刷新索引" |
c04f5ac3 | 14441 | |
87cb7997 | 14442 | #: git-stash.sh:557 |
c04f5ac3 JX |
14443 | msgid "Cannot apply a stash in the middle of a merge" |
14444 | msgstr "无法在合并过程中恢复进度" | |
14445 | ||
87cb7997 | 14446 | #: git-stash.sh:565 |
c04f5ac3 | 14447 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 14448 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 14449 | |
87cb7997 | 14450 | #: git-stash.sh:567 |
c04f5ac3 | 14451 | msgid "Could not save index tree" |
90e6ef53 | 14452 | msgstr "不能保存索引树" |
c04f5ac3 | 14453 | |
87cb7997 | 14454 | #: git-stash.sh:576 |
a0b6b246 JX |
14455 | msgid "Could not restore untracked files from stash" |
14456 | msgstr "无法从进度保存中恢复未跟踪文件" | |
14457 | ||
87cb7997 | 14458 | #: git-stash.sh:601 |
c04f5ac3 | 14459 | msgid "Cannot unstage modified files" |
160fb2b2 | 14460 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 14461 | |
87cb7997 | 14462 | #: git-stash.sh:616 |
b694fbb1 JX |
14463 | msgid "Index was not unstashed." |
14464 | msgstr "索引的进度没有被恢复。" | |
14465 | ||
87cb7997 | 14466 | #: git-stash.sh:630 |
5c57d762 | 14467 | msgid "The stash is kept in case you need it again." |
9a4b694c | 14468 | msgstr "暂存被保留以备您再次需要。" |
5c57d762 | 14469 | |
87cb7997 | 14470 | #: git-stash.sh:639 |
c04f5ac3 JX |
14471 | #, sh-format |
14472 | msgid "Dropped ${REV} ($s)" | |
14473 | msgstr "丢弃了 ${REV} ($s)" | |
14474 | ||
87cb7997 | 14475 | #: git-stash.sh:640 |
c04f5ac3 JX |
14476 | #, sh-format |
14477 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 14478 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 14479 | |
87cb7997 | 14480 | #: git-stash.sh:648 |
c04f5ac3 JX |
14481 | msgid "No branch name specified" |
14482 | msgstr "未指定分支名" | |
14483 | ||
87cb7997 | 14484 | #: git-stash.sh:727 |
c04f5ac3 JX |
14485 | msgid "(To restore them type \"git stash apply\")" |
14486 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
14487 | ||
1a79b2f1 | 14488 | #: git-submodule.sh:181 |
2e8451e8 JX |
14489 | msgid "Relative path can only be used from the toplevel of the working tree" |
14490 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
14491 | ||
1a79b2f1 | 14492 | #: git-submodule.sh:191 |
c04f5ac3 JX |
14493 | #, sh-format |
14494 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 14495 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 14496 | |
1a79b2f1 | 14497 | #: git-submodule.sh:210 |
c04f5ac3 | 14498 | #, sh-format |
170e9899 JX |
14499 | msgid "'$sm_path' already exists in the index" |
14500 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 14501 | |
1a79b2f1 JX |
14502 | #: git-submodule.sh:213 |
14503 | #, sh-format | |
14504 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
14505 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
14506 | ||
14507 | #: git-submodule.sh:218 | |
b694fbb1 JX |
14508 | #, sh-format |
14509 | msgid "" | |
14510 | "The following path is ignored by one of your .gitignore files:\n" | |
14511 | "$sm_path\n" | |
14512 | "Use -f if you really want to add it." | |
14513 | msgstr "" | |
14514 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
14515 | "$sm_path\n" | |
14516 | "如果您确实想添加它,使用 -f 参数。" | |
14517 | ||
1a79b2f1 | 14518 | #: git-submodule.sh:236 |
b694fbb1 JX |
14519 | #, sh-format |
14520 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 14521 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 14522 | |
1a79b2f1 | 14523 | #: git-submodule.sh:238 |
c04f5ac3 | 14524 | #, sh-format |
170e9899 | 14525 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 14526 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 14527 | |
1a79b2f1 | 14528 | #: git-submodule.sh:246 |
07432cef WS |
14529 | #, sh-format |
14530 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 14531 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 14532 | |
1a79b2f1 | 14533 | #: git-submodule.sh:248 |
07432cef WS |
14534 | #, sh-format |
14535 | msgid "" | |
5c57d762 JX |
14536 | "If you want to reuse this local git directory instead of cloning again from\n" |
14537 | " $realrepo\n" | |
14538 | "use the '--force' option. If the local git directory is not the correct " | |
14539 | "repo\n" | |
07432cef WS |
14540 | "or you are unsure what this means choose another name with the '--name' " |
14541 | "option." | |
5c57d762 JX |
14542 | msgstr "" |
14543 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
14544 | " $realrepo\n" | |
14545 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
14546 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 14547 | |
1a79b2f1 | 14548 | #: git-submodule.sh:254 |
07432cef WS |
14549 | #, sh-format |
14550 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
14551 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
14552 | ||
1a79b2f1 | 14553 | #: git-submodule.sh:266 |
c04f5ac3 | 14554 | #, sh-format |
170e9899 JX |
14555 | msgid "Unable to checkout submodule '$sm_path'" |
14556 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 14557 | |
1a79b2f1 | 14558 | #: git-submodule.sh:271 |
c04f5ac3 | 14559 | #, sh-format |
170e9899 JX |
14560 | msgid "Failed to add submodule '$sm_path'" |
14561 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 14562 | |
1a79b2f1 | 14563 | #: git-submodule.sh:280 |
c04f5ac3 | 14564 | #, sh-format |
170e9899 JX |
14565 | msgid "Failed to register submodule '$sm_path'" |
14566 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 14567 | |
87cb7997 | 14568 | #: git-submodule.sh:341 |
c04f5ac3 | 14569 | #, sh-format |
5b04ee3b JX |
14570 | msgid "Entering '$displaypath'" |
14571 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 14572 | |
87cb7997 | 14573 | #: git-submodule.sh:361 |
c04f5ac3 | 14574 | #, sh-format |
5b04ee3b | 14575 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 14576 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 14577 | |
87cb7997 | 14578 | #: git-submodule.sh:432 |
c04f5ac3 | 14579 | #, sh-format |
5b04ee3b JX |
14580 | msgid "pathspec and --all are incompatible" |
14581 | msgstr "pathspec 和 --all 不兼容" | |
c04f5ac3 | 14582 | |
87cb7997 | 14583 | #: git-submodule.sh:437 |
c04f5ac3 | 14584 | #, sh-format |
5b04ee3b | 14585 | msgid "Use '--all' if you really want to deinitialize all submodules" |
aef18cc6 | 14586 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" |
1003b3a5 | 14587 | |
87cb7997 | 14588 | #: git-submodule.sh:457 |
1003b3a5 JX |
14589 | #, sh-format |
14590 | msgid "" | |
5c57d762 | 14591 | "Submodule work tree '$displaypath' contains a .git directory\n" |
1003b3a5 | 14592 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
5c57d762 JX |
14593 | msgstr "" |
14594 | "子模组工作区 '$displaypath' 包含一个 .git 目录\n" | |
9a4b694c | 14595 | "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)" |
1003b3a5 | 14596 | |
87cb7997 | 14597 | #: git-submodule.sh:465 |
c04f5ac3 JX |
14598 | #, sh-format |
14599 | msgid "" | |
2e8451e8 | 14600 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 14601 | "discard them" |
2e8451e8 | 14602 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 14603 | |
87cb7997 | 14604 | #: git-submodule.sh:468 |
1003b3a5 | 14605 | #, sh-format |
2e8451e8 JX |
14606 | msgid "Cleared directory '$displaypath'" |
14607 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 14608 | |
87cb7997 | 14609 | #: git-submodule.sh:469 |
1003b3a5 | 14610 | #, sh-format |
2e8451e8 JX |
14611 | msgid "Could not remove submodule work tree '$displaypath'" |
14612 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 14613 | |
87cb7997 | 14614 | #: git-submodule.sh:472 |
1003b3a5 | 14615 | #, sh-format |
2e8451e8 JX |
14616 | msgid "Could not create empty submodule directory '$displaypath'" |
14617 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 14618 | |
87cb7997 | 14619 | #: git-submodule.sh:481 |
1003b3a5 | 14620 | #, sh-format |
2e8451e8 JX |
14621 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
14622 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 14623 | |
87cb7997 | 14624 | #: git-submodule.sh:637 |
c04f5ac3 | 14625 | #, sh-format |
2e8451e8 JX |
14626 | msgid "Unable to find current revision in submodule path '$displaypath'" |
14627 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 14628 | |
87cb7997 | 14629 | #: git-submodule.sh:647 |
c04f5ac3 | 14630 | #, sh-format |
170e9899 JX |
14631 | msgid "Unable to fetch in submodule path '$sm_path'" |
14632 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 14633 | |
87cb7997 | 14634 | #: git-submodule.sh:652 |
5c57d762 JX |
14635 | #, sh-format |
14636 | msgid "" | |
14637 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
14638 | "'$sm_path'" | |
9a4b694c | 14639 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 14640 | |
87cb7997 | 14641 | #: git-submodule.sh:670 |
2e8451e8 JX |
14642 | #, sh-format |
14643 | msgid "Unable to fetch in submodule path '$displaypath'" | |
14644 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
14645 | ||
87cb7997 | 14646 | #: git-submodule.sh:676 |
5c57d762 JX |
14647 | #, sh-format |
14648 | msgid "" | |
14649 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
14650 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
14651 | msgstr "" |
14652 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 14653 | |
87cb7997 | 14654 | #: git-submodule.sh:683 |
6c94aba5 JX |
14655 | #, sh-format |
14656 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
14657 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
14658 | ||
87cb7997 | 14659 | #: git-submodule.sh:684 |
c04f5ac3 | 14660 | #, sh-format |
6c94aba5 JX |
14661 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
14662 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
14663 | ||
87cb7997 | 14664 | #: git-submodule.sh:688 |
6c94aba5 | 14665 | #, sh-format |
2e8451e8 JX |
14666 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
14667 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 14668 | |
87cb7997 | 14669 | #: git-submodule.sh:689 |
c04f5ac3 | 14670 | #, sh-format |
2e8451e8 JX |
14671 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
14672 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 14673 | |
87cb7997 | 14674 | #: git-submodule.sh:694 |
c04f5ac3 | 14675 | #, sh-format |
2e8451e8 JX |
14676 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
14677 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 14678 | |
87cb7997 | 14679 | #: git-submodule.sh:695 |
c04f5ac3 | 14680 | #, sh-format |
2e8451e8 JX |
14681 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
14682 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 14683 | |
87cb7997 | 14684 | #: git-submodule.sh:700 |
c04f5ac3 | 14685 | #, sh-format |
5b04ee3b JX |
14686 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
14687 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 14688 | |
87cb7997 | 14689 | #: git-submodule.sh:701 |
c04f5ac3 | 14690 | #, sh-format |
5b04ee3b | 14691 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 14692 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 14693 | |
87cb7997 | 14694 | #: git-submodule.sh:732 |
2e8451e8 JX |
14695 | #, sh-format |
14696 | msgid "Failed to recurse into submodule path '$displaypath'" | |
14697 | msgstr "无法递归进子模组路径 '$displaypath'" | |
14698 | ||
87cb7997 | 14699 | #: git-submodule.sh:840 |
649900bc JX |
14700 | msgid "The --cached option cannot be used with the --files option" |
14701 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 14702 | |
87cb7997 | 14703 | #: git-submodule.sh:892 |
b694fbb1 JX |
14704 | #, sh-format |
14705 | msgid "unexpected mode $mod_dst" | |
14706 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 14707 | |
90e6ef53 | 14708 | # 译者:注意保持前导空格 |
87cb7997 | 14709 | #: git-submodule.sh:912 |
c04f5ac3 | 14710 | #, sh-format |
2e8451e8 JX |
14711 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
14712 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 14713 | |
90e6ef53 | 14714 | # 译者:注意保持前导空格 |
87cb7997 | 14715 | #: git-submodule.sh:915 |
c04f5ac3 | 14716 | #, sh-format |
2e8451e8 JX |
14717 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
14718 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 14719 | |
90e6ef53 | 14720 | # 译者:注意保持前导空格 |
87cb7997 | 14721 | #: git-submodule.sh:918 |
c04f5ac3 | 14722 | #, sh-format |
2e8451e8 JX |
14723 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
14724 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 14725 | |
87cb7997 | 14726 | #: git-submodule.sh:1064 |
1003b3a5 JX |
14727 | #, sh-format |
14728 | msgid "Failed to recurse into submodule path '$sm_path'" | |
14729 | msgstr "无法递归进子模组路径 '$sm_path'" | |
14730 | ||
87cb7997 | 14731 | #: git-submodule.sh:1136 |
c04f5ac3 | 14732 | #, sh-format |
2e8451e8 JX |
14733 | msgid "Synchronizing submodule url for '$displaypath'" |
14734 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 14735 | |
5b04ee3b JX |
14736 | #: git-parse-remote.sh:89 |
14737 | #, sh-format | |
14738 | msgid "See git-${cmd}(1) for details." | |
14739 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 14740 | |
1a79b2f1 | 14741 | #: git-rebase--interactive.sh:140 |
5c57d762 JX |
14742 | #, sh-format |
14743 | msgid "Rebasing ($new_count/$total)" | |
14744 | msgstr "变基中($new_count/$total)" | |
14745 | ||
1a79b2f1 | 14746 | #: git-rebase--interactive.sh:156 |
5c57d762 JX |
14747 | msgid "" |
14748 | "\n" | |
14749 | "Commands:\n" | |
14750 | " p, pick = use commit\n" | |
14751 | " r, reword = use commit, but edit the commit message\n" | |
14752 | " e, edit = use commit, but stop for amending\n" | |
14753 | " s, squash = use commit, but meld into previous commit\n" | |
14754 | " f, fixup = like \"squash\", but discard this commit's log message\n" | |
14755 | " x, exec = run command (the rest of the line) using shell\n" | |
14756 | " d, drop = remove commit\n" | |
14757 | "\n" | |
14758 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
14759 | msgstr "" | |
14760 | "\n" | |
14761 | "命令:\n" | |
14762 | " p, pick = 使用提交\n" | |
14763 | " r, reword = 使用提交,但修改提交说明\n" | |
14764 | " e, edit = 使用提交,但停止以便进行提交修补\n" | |
14765 | " s, squash = 使用提交,但和前一个版本融合\n" | |
14766 | " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n" | |
14767 | " x, exec = 使用 shell 运行命令(此行剩余部分)\n" | |
14768 | " d, drop = 删除提交\n" | |
14769 | "\n" | |
9a4b694c | 14770 | "这些行可以被重新排序;它们会被从上至下地执行。\n" |
5c57d762 JX |
14771 | "\n" |
14772 | ||
1a79b2f1 | 14773 | #: git-rebase--interactive.sh:171 |
5c57d762 JX |
14774 | msgid "" |
14775 | "\n" | |
14776 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
a0b6b246 JX |
14777 | msgstr "" |
14778 | "\n" | |
14779 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5c57d762 | 14780 | |
1a79b2f1 | 14781 | #: git-rebase--interactive.sh:175 |
5c57d762 JX |
14782 | msgid "" |
14783 | "\n" | |
14784 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
a0b6b246 JX |
14785 | msgstr "" |
14786 | "\n" | |
14787 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5c57d762 | 14788 | |
1a79b2f1 | 14789 | #: git-rebase--interactive.sh:211 |
5c57d762 JX |
14790 | #, sh-format |
14791 | msgid "" | |
14792 | "You can amend the commit now, with\n" | |
14793 | "\n" | |
14794 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
14795 | "\n" | |
14796 | "Once you are satisfied with your changes, run\n" | |
14797 | "\n" | |
14798 | "\tgit rebase --continue" | |
14799 | msgstr "" | |
14800 | "您现在可以修补这个提交,使用\n" | |
14801 | "\n" | |
14802 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
14803 | "\n" | |
9a4b694c | 14804 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
14805 | "\n" |
14806 | "\tgit rebase --continue" | |
14807 | ||
1a79b2f1 | 14808 | #: git-rebase--interactive.sh:236 |
5c57d762 JX |
14809 | #, sh-format |
14810 | msgid "$sha1: not a commit that can be picked" | |
14811 | msgstr "$sha1:不是一个可以被拣选的提交" | |
14812 | ||
1a79b2f1 | 14813 | #: git-rebase--interactive.sh:275 |
5c57d762 JX |
14814 | #, sh-format |
14815 | msgid "Invalid commit name: $sha1" | |
14816 | msgstr "无效的提交名:$sha1" | |
14817 | ||
1a79b2f1 | 14818 | #: git-rebase--interactive.sh:317 |
5c57d762 JX |
14819 | msgid "Cannot write current commit's replacement sha1" |
14820 | msgstr "不能写入当前提交的替代 sha1" | |
14821 | ||
1a79b2f1 | 14822 | #: git-rebase--interactive.sh:369 |
5c57d762 JX |
14823 | #, sh-format |
14824 | msgid "Fast-forward to $sha1" | |
14825 | msgstr "快进到 $sha1" | |
14826 | ||
1a79b2f1 | 14827 | #: git-rebase--interactive.sh:371 |
5c57d762 JX |
14828 | #, sh-format |
14829 | msgid "Cannot fast-forward to $sha1" | |
14830 | msgstr "不能快进到 $sha1" | |
14831 | ||
1a79b2f1 | 14832 | #: git-rebase--interactive.sh:380 |
5c57d762 JX |
14833 | #, sh-format |
14834 | msgid "Cannot move HEAD to $first_parent" | |
14835 | msgstr "不能移动 HEAD 到 $first_parent" | |
14836 | ||
1a79b2f1 | 14837 | #: git-rebase--interactive.sh:385 |
5c57d762 JX |
14838 | #, sh-format |
14839 | msgid "Refusing to squash a merge: $sha1" | |
14840 | msgstr "拒绝压缩一个合并:$sha1" | |
14841 | ||
1a79b2f1 | 14842 | #: git-rebase--interactive.sh:399 |
5c57d762 JX |
14843 | #, sh-format |
14844 | msgid "Error redoing merge $sha1" | |
14845 | msgstr "无法重做合并 $sha1" | |
14846 | ||
1a79b2f1 | 14847 | #: git-rebase--interactive.sh:407 |
5c57d762 JX |
14848 | #, sh-format |
14849 | msgid "Could not pick $sha1" | |
14850 | msgstr "不能拣选 $sha1" | |
14851 | ||
1a79b2f1 | 14852 | #: git-rebase--interactive.sh:416 |
5c57d762 JX |
14853 | #, sh-format |
14854 | msgid "This is the commit message #${n}:" | |
9a4b694c | 14855 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 14856 | |
1a79b2f1 | 14857 | #: git-rebase--interactive.sh:421 |
5c57d762 JX |
14858 | #, sh-format |
14859 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 14860 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 14861 | |
1a79b2f1 | 14862 | #: git-rebase--interactive.sh:432 |
5c57d762 JX |
14863 | #, sh-format |
14864 | msgid "This is a combination of $count commit." | |
14865 | msgid_plural "This is a combination of $count commits." | |
14866 | msgstr[0] "这是一个 $count 个提交的组合。" | |
14867 | msgstr[1] "这是一个 $count 个提交的组合。" | |
14868 | ||
1a79b2f1 | 14869 | #: git-rebase--interactive.sh:441 |
5c57d762 JX |
14870 | #, sh-format |
14871 | msgid "Cannot write $fixup_msg" | |
14872 | msgstr "不能写入 $fixup_msg" | |
14873 | ||
1a79b2f1 | 14874 | #: git-rebase--interactive.sh:444 |
5c57d762 JX |
14875 | msgid "This is a combination of 2 commits." |
14876 | msgstr "这是一个 2 个提交的组合。" | |
14877 | ||
1a79b2f1 JX |
14878 | #: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 |
14879 | #: git-rebase--interactive.sh:531 | |
5c57d762 JX |
14880 | #, sh-format |
14881 | msgid "Could not apply $sha1... $rest" | |
14882 | msgstr "不能应用 $sha1... $rest" | |
14883 | ||
1a79b2f1 | 14884 | #: git-rebase--interactive.sh:559 |
5c57d762 JX |
14885 | #, sh-format |
14886 | msgid "" | |
14887 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
14888 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
14889 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
14890 | "before\n" | |
14891 | "you are able to reword the commit." | |
14892 | msgstr "" | |
14893 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
14894 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
14895 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
14896 | ||
1a79b2f1 | 14897 | #: git-rebase--interactive.sh:574 |
5c57d762 JX |
14898 | #, sh-format |
14899 | msgid "Stopped at $sha1_abbrev... $rest" | |
14900 | msgstr "停止在 $sha1_abbrev... $rest" | |
14901 | ||
1a79b2f1 | 14902 | #: git-rebase--interactive.sh:589 |
5c57d762 JX |
14903 | #, sh-format |
14904 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 14905 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 14906 | |
1a79b2f1 | 14907 | #: git-rebase--interactive.sh:631 |
5c57d762 JX |
14908 | #, sh-format |
14909 | msgid "Executing: $rest" | |
14910 | msgstr "执行:$rest" | |
14911 | ||
1a79b2f1 | 14912 | #: git-rebase--interactive.sh:639 |
5c57d762 JX |
14913 | #, sh-format |
14914 | msgid "Execution failed: $rest" | |
14915 | msgstr "执行失败:$rest" | |
14916 | ||
1a79b2f1 | 14917 | #: git-rebase--interactive.sh:641 |
5c57d762 JX |
14918 | msgid "and made changes to the index and/or the working tree" |
14919 | msgstr "并且修改索引和/或工作区" | |
14920 | ||
14921 | # 译者:注意保持前导空格 | |
1a79b2f1 | 14922 | #: git-rebase--interactive.sh:643 |
5c57d762 JX |
14923 | msgid "" |
14924 | "You can fix the problem, and then run\n" | |
14925 | "\n" | |
14926 | "\tgit rebase --continue" | |
14927 | msgstr "" | |
14928 | "您可以解决这个问题,然后运行\n" | |
14929 | "\n" | |
14930 | "\tgit rebase --continue" | |
14931 | ||
14932 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
1a79b2f1 | 14933 | #: git-rebase--interactive.sh:656 |
5c57d762 JX |
14934 | #, sh-format |
14935 | msgid "" | |
14936 | "Execution succeeded: $rest\n" | |
14937 | "but left changes to the index and/or the working tree\n" | |
14938 | "Commit or stash your changes, and then run\n" | |
14939 | "\n" | |
14940 | "\tgit rebase --continue" | |
14941 | msgstr "" | |
14942 | "执行成功:$rest\n" | |
14943 | "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n" | |
14944 | "\n" | |
14945 | "\tgit rebase --continue" | |
14946 | ||
1a79b2f1 | 14947 | #: git-rebase--interactive.sh:667 |
5c57d762 JX |
14948 | #, sh-format |
14949 | msgid "Unknown command: $command $sha1 $rest" | |
14950 | msgstr "未知命令:$command $sha1 $rest" | |
14951 | ||
1a79b2f1 | 14952 | #: git-rebase--interactive.sh:668 |
5c57d762 JX |
14953 | msgid "Please fix this using 'git rebase --edit-todo'." |
14954 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
14955 | ||
1a79b2f1 | 14956 | #: git-rebase--interactive.sh:703 |
5c57d762 JX |
14957 | #, sh-format |
14958 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 14959 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 14960 | |
1a79b2f1 | 14961 | #: git-rebase--interactive.sh:750 |
5c57d762 JX |
14962 | msgid "Could not skip unnecessary pick commands" |
14963 | msgstr "不能跳过不必要的拣选命令" | |
14964 | ||
1a79b2f1 | 14965 | #: git-rebase--interactive.sh:908 |
5c57d762 JX |
14966 | #, sh-format |
14967 | msgid "" | |
14968 | "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" | |
14969 | " - $line" | |
14970 | msgstr "" | |
14971 | "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n" | |
14972 | " - $line" | |
14973 | ||
1a79b2f1 | 14974 | #: git-rebase--interactive.sh:941 |
5c57d762 JX |
14975 | #, sh-format |
14976 | msgid "" | |
14977 | "Warning: the command isn't recognized in the following line:\n" | |
14978 | " - $line" | |
14979 | msgstr "" | |
14980 | "警告:下面一行中的命令未能被识别:\n" | |
14981 | " - $line" | |
14982 | ||
1a79b2f1 | 14983 | #: git-rebase--interactive.sh:980 |
5c57d762 JX |
14984 | msgid "could not detach HEAD" |
14985 | msgstr "不能检出为分离头指针" | |
14986 | ||
1a79b2f1 | 14987 | #: git-rebase--interactive.sh:1018 |
5c57d762 JX |
14988 | msgid "" |
14989 | "Warning: some commits may have been dropped accidentally.\n" | |
14990 | "Dropped commits (newer to older):" | |
14991 | msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):" | |
14992 | ||
1a79b2f1 | 14993 | #: git-rebase--interactive.sh:1026 |
5c57d762 JX |
14994 | msgid "" |
14995 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
14996 | "\n" | |
14997 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
14998 | "warnings.\n" | |
14999 | "The possible behaviours are: ignore, warn, error." | |
15000 | msgstr "" | |
9a4b694c | 15001 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" |
5c57d762 | 15002 | "\n" |
9a4b694c RC |
15003 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" |
15004 | "可选值有:ignore、warn、error。" | |
5c57d762 | 15005 | |
1a79b2f1 | 15006 | #: git-rebase--interactive.sh:1037 |
5c57d762 JX |
15007 | #, sh-format |
15008 | msgid "" | |
15009 | "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " | |
15010 | "Ignoring." | |
9a4b694c | 15011 | msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。" |
5c57d762 | 15012 | |
1a79b2f1 | 15013 | #: git-rebase--interactive.sh:1054 |
a0b6b246 JX |
15014 | msgid "" |
15015 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
15016 | "continue'." | |
15017 | msgstr "" | |
29004bbb | 15018 | "您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。" |
5c57d762 | 15019 | |
1a79b2f1 | 15020 | #: git-rebase--interactive.sh:1055 |
5c57d762 JX |
15021 | msgid "Or you can abort the rebase with 'git rebase --abort'." |
15022 | msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" | |
15023 | ||
87cb7997 | 15024 | #: git-rebase--interactive.sh:1083 |
5c57d762 JX |
15025 | msgid "Could not remove CHERRY_PICK_HEAD" |
15026 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
15027 | ||
87cb7997 | 15028 | #: git-rebase--interactive.sh:1088 |
5c57d762 JX |
15029 | #, sh-format |
15030 | msgid "" | |
15031 | "You have staged changes in your working tree.\n" | |
15032 | "If these changes are meant to be\n" | |
15033 | "squashed into the previous commit, run:\n" | |
15034 | "\n" | |
15035 | " git commit --amend $gpg_sign_opt_quoted\n" | |
15036 | "\n" | |
15037 | "If they are meant to go into a new commit, run:\n" | |
15038 | "\n" | |
15039 | " git commit $gpg_sign_opt_quoted\n" | |
15040 | "\n" | |
a0b6b246 | 15041 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
15042 | "\n" |
15043 | " git rebase --continue\n" | |
15044 | msgstr "" | |
15045 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
15046 | "\n" | |
15047 | " git commit --amend $gpg_sign_opt_quoted\n" | |
15048 | "\n" | |
15049 | "如果这些变更要形成一个新提交,执行:\n" | |
15050 | "\n" | |
15051 | " git commit $gpg_sign_opt_quoted\n" | |
15052 | "\n" | |
9a4b694c | 15053 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
15054 | "\n" |
15055 | " git rebase --continue\n" | |
15056 | ||
87cb7997 | 15057 | #: git-rebase--interactive.sh:1105 |
5c57d762 | 15058 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 15059 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 15060 | |
87cb7997 | 15061 | #: git-rebase--interactive.sh:1110 |
5c57d762 JX |
15062 | msgid "" |
15063 | "You have uncommitted changes in your working tree. Please commit them\n" | |
15064 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
15065 | msgstr "" |
15066 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 15067 | |
87cb7997 | 15068 | #: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 |
5c57d762 JX |
15069 | msgid "Could not commit staged changes." |
15070 | msgstr "不能提交暂存的修改。" | |
15071 | ||
87cb7997 | 15072 | #: git-rebase--interactive.sh:1147 |
5c57d762 JX |
15073 | msgid "" |
15074 | "\n" | |
15075 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
15076 | "To continue rebase after editing, run:\n" | |
15077 | " git rebase --continue\n" | |
15078 | "\n" | |
15079 | msgstr "" | |
15080 | "\n" | |
9a4b694c | 15081 | "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n" |
5c57d762 JX |
15082 | "请执行:\n" |
15083 | " git rebase --continue\n" | |
15084 | "\n" | |
15085 | ||
87cb7997 | 15086 | #: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 |
5c57d762 JX |
15087 | msgid "Could not execute editor" |
15088 | msgstr "无法运行编辑器" | |
15089 | ||
87cb7997 | 15090 | #: git-rebase--interactive.sh:1168 |
5c57d762 JX |
15091 | #, sh-format |
15092 | msgid "Could not checkout $switch_to" | |
15093 | msgstr "不能检出 $switch_to" | |
15094 | ||
87cb7997 | 15095 | #: git-rebase--interactive.sh:1173 |
5c57d762 JX |
15096 | msgid "No HEAD?" |
15097 | msgstr "没有 HEAD?" | |
15098 | ||
87cb7997 | 15099 | #: git-rebase--interactive.sh:1174 |
5c57d762 JX |
15100 | #, sh-format |
15101 | msgid "Could not create temporary $state_dir" | |
15102 | msgstr "不能创建临时 $state_dir" | |
15103 | ||
87cb7997 | 15104 | #: git-rebase--interactive.sh:1176 |
5c57d762 JX |
15105 | msgid "Could not mark as interactive" |
15106 | msgstr "不能标记为交互式" | |
15107 | ||
87cb7997 | 15108 | #: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 |
5c57d762 JX |
15109 | msgid "Could not init rewritten commits" |
15110 | msgstr "不能对重写提交进行初始化" | |
15111 | ||
87cb7997 | 15112 | #: git-rebase--interactive.sh:1291 |
5c57d762 JX |
15113 | #, sh-format |
15114 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
15115 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
15116 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
15117 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
15118 | ||
87cb7997 | 15119 | #: git-rebase--interactive.sh:1296 |
5c57d762 JX |
15120 | msgid "" |
15121 | "\n" | |
15122 | "However, if you remove everything, the rebase will be aborted.\n" | |
15123 | "\n" | |
a0b6b246 JX |
15124 | msgstr "" |
15125 | "\n" | |
15126 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
15127 | "\n" | |
5c57d762 | 15128 | |
87cb7997 | 15129 | #: git-rebase--interactive.sh:1303 |
5c57d762 JX |
15130 | msgid "Note that empty commits are commented out" |
15131 | msgstr "注意空提交已被注释掉" | |
15132 | ||
15133 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 | |
15134 | #, sh-format | |
15135 | msgid "usage: $dashless $USAGE" | |
15136 | msgstr "用法:$dashless $USAGE" | |
15137 | ||
15138 | #: git-sh-setup.sh:190 | |
15139 | #, sh-format | |
15140 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 15141 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
15142 | |
15143 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
15144 | #, sh-format | |
15145 | msgid "fatal: $program_name cannot be used without a working tree." | |
15146 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
15147 | ||
15148 | #: git-sh-setup.sh:220 | |
15149 | msgid "Cannot rebase: You have unstaged changes." | |
15150 | msgstr "不能变基:您有未暂存的变更。" | |
15151 | ||
15152 | #: git-sh-setup.sh:223 | |
15153 | msgid "Cannot rewrite branches: You have unstaged changes." | |
15154 | msgstr "不能重写分支:您有未暂存的变更。" | |
15155 | ||
a0b6b246 JX |
15156 | #: git-sh-setup.sh:226 |
15157 | msgid "Cannot pull with rebase: You have unstaged changes." | |
15158 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
15159 | ||
5c57d762 JX |
15160 | #: git-sh-setup.sh:229 |
15161 | #, sh-format | |
15162 | msgid "Cannot $action: You have unstaged changes." | |
15163 | msgstr "不能 $action:您有未暂存的变更。" | |
15164 | ||
15165 | #: git-sh-setup.sh:242 | |
15166 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
15167 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
15168 | ||
a0b6b246 JX |
15169 | #: git-sh-setup.sh:245 |
15170 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
15171 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
15172 | ||
5c57d762 JX |
15173 | #: git-sh-setup.sh:248 |
15174 | #, sh-format | |
15175 | msgid "Cannot $action: Your index contains uncommitted changes." | |
15176 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
15177 | ||
a0b6b246 JX |
15178 | #: git-sh-setup.sh:252 |
15179 | msgid "Additionally, your index contains uncommitted changes." | |
15180 | msgstr "而且您的索引中包含未提交的变更。" | |
15181 | ||
5c57d762 JX |
15182 | #: git-sh-setup.sh:372 |
15183 | msgid "You need to run this command from the toplevel of the working tree." | |
15184 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
15185 | ||
15186 | #: git-sh-setup.sh:377 | |
15187 | msgid "Unable to determine absolute path of git directory" | |
15188 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 15189 | |
1a79b2f1 JX |
15190 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
15191 | #: git-add--interactive.perl:238 | |
15192 | #, perl-format | |
15193 | msgid "%12s %12s %s" | |
15194 | msgstr "%12s %12s %s" | |
15195 | ||
15196 | #: git-add--interactive.perl:239 | |
15197 | msgid "staged" | |
15198 | msgstr "缓存" | |
15199 | ||
15200 | #: git-add--interactive.perl:239 | |
15201 | msgid "unstaged" | |
15202 | msgstr "未缓存" | |
15203 | ||
87cb7997 | 15204 | #: git-add--interactive.perl:288 git-add--interactive.perl:313 |
1a79b2f1 JX |
15205 | msgid "binary" |
15206 | msgstr "二进制" | |
15207 | ||
87cb7997 | 15208 | #: git-add--interactive.perl:297 git-add--interactive.perl:351 |
1a79b2f1 JX |
15209 | msgid "nothing" |
15210 | msgstr "无" | |
15211 | ||
87cb7997 | 15212 | #: git-add--interactive.perl:333 git-add--interactive.perl:348 |
1a79b2f1 JX |
15213 | msgid "unchanged" |
15214 | msgstr "没有修改" | |
15215 | ||
87cb7997 | 15216 | #: git-add--interactive.perl:644 |
1a79b2f1 JX |
15217 | #, perl-format |
15218 | msgid "added %d path\n" | |
15219 | msgid_plural "added %d paths\n" | |
15220 | msgstr[0] "增加了 %d 个路径\n" | |
15221 | msgstr[1] "增加了 %d 个路径\n" | |
15222 | ||
87cb7997 | 15223 | #: git-add--interactive.perl:647 |
1a79b2f1 JX |
15224 | #, perl-format |
15225 | msgid "updated %d path\n" | |
15226 | msgid_plural "updated %d paths\n" | |
15227 | msgstr[0] "更新了 %d 个路径\n" | |
15228 | msgstr[1] "更新了 %d 个路径\n" | |
15229 | ||
87cb7997 | 15230 | #: git-add--interactive.perl:650 |
1a79b2f1 JX |
15231 | #, perl-format |
15232 | msgid "reverted %d path\n" | |
15233 | msgid_plural "reverted %d paths\n" | |
15234 | msgstr[0] "还原了 %d 个路径\n" | |
15235 | msgstr[1] "还原了 %d 个路径\n" | |
15236 | ||
87cb7997 | 15237 | #: git-add--interactive.perl:653 |
1a79b2f1 JX |
15238 | #, perl-format |
15239 | msgid "touched %d path\n" | |
15240 | msgid_plural "touched %d paths\n" | |
15241 | msgstr[0] "触碰了 %d 个路径\n" | |
15242 | msgstr[1] "触碰了 %d 个路径\n" | |
15243 | ||
87cb7997 | 15244 | #: git-add--interactive.perl:662 |
1a79b2f1 JX |
15245 | msgid "Update" |
15246 | msgstr "更新" | |
15247 | ||
87cb7997 | 15248 | #: git-add--interactive.perl:674 |
1a79b2f1 JX |
15249 | msgid "Revert" |
15250 | msgstr "还原" | |
15251 | ||
87cb7997 | 15252 | #: git-add--interactive.perl:697 |
1a79b2f1 JX |
15253 | #, perl-format |
15254 | msgid "note: %s is untracked now.\n" | |
15255 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
15256 | ||
87cb7997 | 15257 | #: git-add--interactive.perl:708 |
1a79b2f1 JX |
15258 | msgid "Add untracked" |
15259 | msgstr "添加未跟踪的" | |
15260 | ||
87cb7997 | 15261 | #: git-add--interactive.perl:714 |
1a79b2f1 JX |
15262 | msgid "No untracked files.\n" |
15263 | msgstr "没有未跟踪的文件。\n" | |
15264 | ||
87cb7997 | 15265 | #: git-add--interactive.perl:1030 |
1a79b2f1 JX |
15266 | msgid "" |
15267 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15268 | "marked for staging." | |
15269 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
15270 | ||
87cb7997 | 15271 | #: git-add--interactive.perl:1033 |
1a79b2f1 JX |
15272 | msgid "" |
15273 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15274 | "marked for stashing." | |
15275 | msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。" | |
15276 | ||
87cb7997 | 15277 | #: git-add--interactive.perl:1036 |
1a79b2f1 JX |
15278 | msgid "" |
15279 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15280 | "marked for unstaging." | |
15281 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
15282 | ||
87cb7997 | 15283 | #: git-add--interactive.perl:1039 git-add--interactive.perl:1048 |
1a79b2f1 JX |
15284 | msgid "" |
15285 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15286 | "marked for applying." | |
15287 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
15288 | ||
87cb7997 | 15289 | #: git-add--interactive.perl:1042 git-add--interactive.perl:1045 |
1a79b2f1 JX |
15290 | msgid "" |
15291 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
15292 | "marked for discarding." | |
15293 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
15294 | ||
87cb7997 | 15295 | #: git-add--interactive.perl:1058 |
1a79b2f1 JX |
15296 | #, perl-format |
15297 | msgid "failed to open hunk edit file for writing: %s" | |
15298 | msgstr "无法写入块编辑文件:%s" | |
15299 | ||
87cb7997 | 15300 | #: git-add--interactive.perl:1059 |
1a79b2f1 JX |
15301 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
15302 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
15303 | ||
87cb7997 | 15304 | #: git-add--interactive.perl:1065 |
1a79b2f1 JX |
15305 | #, perl-format |
15306 | msgid "" | |
15307 | "---\n" | |
15308 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
15309 | "To remove '%s' lines, delete them.\n" | |
15310 | "Lines starting with %s will be removed.\n" | |
15311 | msgstr "" | |
15312 | "---\n" | |
15313 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
15314 | "要删除 '%s' 开始的行,删除它们。\n" | |
15315 | "以 %s 开始的行将被删除。\n" | |
15316 | ||
15317 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
87cb7997 | 15318 | #: git-add--interactive.perl:1073 |
1a79b2f1 JX |
15319 | msgid "" |
15320 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
15321 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
15322 | "aborted and the hunk is left unchanged.\n" | |
15323 | msgstr "" | |
15324 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
15325 | "此次编辑被终止,该块不会被修改。\n" | |
15326 | ||
87cb7997 | 15327 | #: git-add--interactive.perl:1087 |
1a79b2f1 JX |
15328 | #, perl-format |
15329 | msgid "failed to open hunk edit file for reading: %s" | |
15330 | msgstr "无法读取块编辑文件:%s" | |
15331 | ||
15332 | #. TRANSLATORS: do not translate [y/n] | |
15333 | #. The program will only accept that input | |
15334 | #. at this point. | |
15335 | #. Consider translating (saying "no" discards!) as | |
15336 | #. (saying "n" for "no" discards!) if the translation | |
15337 | #. of the word "no" does not start with n. | |
87cb7997 | 15338 | #: git-add--interactive.perl:1178 |
1a79b2f1 JX |
15339 | msgid "" |
15340 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
15341 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
15342 | ||
87cb7997 | 15343 | #: git-add--interactive.perl:1187 |
1a79b2f1 JX |
15344 | msgid "" |
15345 | "y - stage this hunk\n" | |
15346 | "n - do not stage this hunk\n" | |
15347 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
15348 | "a - stage this hunk and all later hunks in the file\n" | |
15349 | "d - do not stage this hunk or any of the later hunks in the file" | |
15350 | msgstr "" | |
15351 | "y - 暂存该块\n" | |
15352 | "n - 不要暂存该块\n" | |
15353 | "q - 退出。不暂存该块及后面的全部块\n" | |
15354 | "a - 暂存该块和本文件中后面的全部块\n" | |
15355 | "d - 不暂存该块和本文件中后面的全部块" | |
15356 | ||
87cb7997 | 15357 | #: git-add--interactive.perl:1193 |
1a79b2f1 JX |
15358 | msgid "" |
15359 | "y - stash this hunk\n" | |
15360 | "n - do not stash this hunk\n" | |
15361 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
15362 | "a - stash this hunk and all later hunks in the file\n" | |
15363 | "d - do not stash this hunk or any of the later hunks in the file" | |
15364 | msgstr "" | |
15365 | "y - 贮藏该块\n" | |
15366 | "n - 不要贮藏该块\n" | |
15367 | "q - 退出。不贮藏该块及后面的全部块\n" | |
15368 | "a - 贮藏该块和本文件中后面的全部块\n" | |
15369 | "d - 不贮藏该块和本文件中后面的全部块" | |
15370 | ||
87cb7997 | 15371 | #: git-add--interactive.perl:1199 |
1a79b2f1 JX |
15372 | msgid "" |
15373 | "y - unstage this hunk\n" | |
15374 | "n - do not unstage this hunk\n" | |
15375 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
15376 | "a - unstage this hunk and all later hunks in the file\n" | |
15377 | "d - do not unstage this hunk or any of the later hunks in the file" | |
15378 | msgstr "" | |
15379 | "y - 不暂存该块\n" | |
15380 | "n - 不要不暂存该块\n" | |
15381 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
15382 | "a - 不暂存该块和本文件中后面的全部块\n" | |
15383 | "d - 不要不暂存该块和本文件中后面的全部块" | |
15384 | ||
87cb7997 | 15385 | #: git-add--interactive.perl:1205 |
1a79b2f1 JX |
15386 | msgid "" |
15387 | "y - apply this hunk to index\n" | |
15388 | "n - do not apply this hunk to index\n" | |
15389 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
15390 | "a - apply this hunk and all later hunks in the file\n" | |
15391 | "d - do not apply this hunk or any of the later hunks in the file" | |
15392 | msgstr "" | |
15393 | "y - 在索引中应用该块\n" | |
15394 | "n - 不要在索引中应用该块\n" | |
15395 | "q - 退出。不要应用该块及后面的全部块\n" | |
15396 | "a - 应用该块和本文件中后面的全部块\n" | |
15397 | "d - 不要应用该块和本文件中后面的全部块" | |
15398 | ||
87cb7997 | 15399 | #: git-add--interactive.perl:1211 |
1a79b2f1 JX |
15400 | msgid "" |
15401 | "y - discard this hunk from worktree\n" | |
15402 | "n - do not discard this hunk from worktree\n" | |
15403 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
15404 | "a - discard this hunk and all later hunks in the file\n" | |
15405 | "d - do not discard this hunk or any of the later hunks in the file" | |
15406 | msgstr "" | |
15407 | "y - 在工作区中丢弃该块\n" | |
15408 | "n - 不要在工作区中丢弃该块\n" | |
15409 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
15410 | "a - 丢弃该块和本文件中后面的全部块\n" | |
15411 | "d - 不要丢弃该块和本文件中后面的全部块" | |
15412 | ||
87cb7997 | 15413 | #: git-add--interactive.perl:1217 |
1a79b2f1 JX |
15414 | msgid "" |
15415 | "y - discard this hunk from index and worktree\n" | |
15416 | "n - do not discard this hunk from index and worktree\n" | |
15417 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
15418 | "a - discard this hunk and all later hunks in the file\n" | |
15419 | "d - do not discard this hunk or any of the later hunks in the file" | |
15420 | msgstr "" | |
15421 | "y - 在索引和工作区中丢弃该块\n" | |
15422 | "n - 不要在索引和工作区中丢弃该块\n" | |
15423 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
15424 | "a - 丢弃该块和本文件中后面的全部块\n" | |
15425 | "d - 不要丢弃该块和本文件中后面的全部块" | |
15426 | ||
87cb7997 | 15427 | #: git-add--interactive.perl:1223 |
1a79b2f1 JX |
15428 | msgid "" |
15429 | "y - apply this hunk to index and worktree\n" | |
15430 | "n - do not apply this hunk to index and worktree\n" | |
15431 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
15432 | "a - apply this hunk and all later hunks in the file\n" | |
15433 | "d - do not apply this hunk or any of the later hunks in the file" | |
15434 | msgstr "" | |
15435 | "y - 在索引和工作区中应用该块\n" | |
15436 | "n - 不要在索引和工作区中应用该块\n" | |
15437 | "q - 退出。不要应用该块及后面的全部块\n" | |
15438 | "a - 应用该块和本文件中后面的全部块\n" | |
15439 | "d - 不要应用该块和本文件中后面的全部块" | |
15440 | ||
87cb7997 | 15441 | #: git-add--interactive.perl:1232 |
1a79b2f1 JX |
15442 | msgid "" |
15443 | "g - select a hunk to go to\n" | |
15444 | "/ - search for a hunk matching the given regex\n" | |
15445 | "j - leave this hunk undecided, see next undecided hunk\n" | |
15446 | "J - leave this hunk undecided, see next hunk\n" | |
15447 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
15448 | "K - leave this hunk undecided, see previous hunk\n" | |
15449 | "s - split the current hunk into smaller hunks\n" | |
15450 | "e - manually edit the current hunk\n" | |
15451 | "? - print help\n" | |
15452 | msgstr "" | |
15453 | "g - 选择跳转到一个块\n" | |
15454 | "/ - 查找和给定正则表达式匹配的块\n" | |
15455 | "j - 维持该块未决状态,查看下一个未决块\n" | |
15456 | "J - 维持该块未决状态,查看下一个块\n" | |
15457 | "k - 维持该块未决状态,查看上一个未决块\n" | |
15458 | "K - 维持该块未决状态,查看上一个块\n" | |
15459 | "s - 拆分当前块为更小的块\n" | |
15460 | "e - 手动编辑当前块\n" | |
15461 | "? - 显示帮助\n" | |
15462 | ||
87cb7997 | 15463 | #: git-add--interactive.perl:1263 |
1a79b2f1 JX |
15464 | msgid "The selected hunks do not apply to the index!\n" |
15465 | msgstr "选中的块不能应用到索引!\n" | |
15466 | ||
87cb7997 | 15467 | #: git-add--interactive.perl:1264 |
1a79b2f1 JX |
15468 | msgid "Apply them to the worktree anyway? " |
15469 | msgstr "无论如何都要应用到工作区么?" | |
15470 | ||
87cb7997 | 15471 | #: git-add--interactive.perl:1267 |
1a79b2f1 JX |
15472 | msgid "Nothing was applied.\n" |
15473 | msgstr "未应用。\n" | |
15474 | ||
87cb7997 | 15475 | #: git-add--interactive.perl:1278 |
1a79b2f1 JX |
15476 | #, perl-format |
15477 | msgid "ignoring unmerged: %s\n" | |
15478 | msgstr "忽略未合入的:%s\n" | |
15479 | ||
87cb7997 | 15480 | #: git-add--interactive.perl:1287 |
1a79b2f1 JX |
15481 | msgid "Only binary files changed.\n" |
15482 | msgstr "只有二进制文件被修改。\n" | |
15483 | ||
87cb7997 | 15484 | #: git-add--interactive.perl:1289 |
1a79b2f1 JX |
15485 | msgid "No changes.\n" |
15486 | msgstr "没有修改。\n" | |
15487 | ||
87cb7997 | 15488 | #: git-add--interactive.perl:1297 |
1a79b2f1 JX |
15489 | msgid "Patch update" |
15490 | msgstr "补丁更新" | |
15491 | ||
87cb7997 | 15492 | #: git-add--interactive.perl:1349 |
1a79b2f1 JX |
15493 | #, perl-format |
15494 | msgid "Stage mode change [y,n,q,a,d,/%s,?]? " | |
15495 | msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? " | |
15496 | ||
87cb7997 | 15497 | #: git-add--interactive.perl:1350 |
1a79b2f1 JX |
15498 | #, perl-format |
15499 | msgid "Stage deletion [y,n,q,a,d,/%s,?]? " | |
15500 | msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? " | |
15501 | ||
87cb7997 | 15502 | #: git-add--interactive.perl:1351 |
1a79b2f1 JX |
15503 | #, perl-format |
15504 | msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " | |
15505 | msgstr "暂存该块 [y,n,q,a,d,/%s,?]? " | |
15506 | ||
87cb7997 | 15507 | #: git-add--interactive.perl:1354 |
1a79b2f1 JX |
15508 | #, perl-format |
15509 | msgid "Stash mode change [y,n,q,a,d,/%s,?]? " | |
15510 | msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? " | |
15511 | ||
87cb7997 | 15512 | #: git-add--interactive.perl:1355 |
1a79b2f1 JX |
15513 | #, perl-format |
15514 | msgid "Stash deletion [y,n,q,a,d,/%s,?]? " | |
15515 | msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? " | |
15516 | ||
87cb7997 | 15517 | #: git-add--interactive.perl:1356 |
1a79b2f1 JX |
15518 | #, perl-format |
15519 | msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " | |
15520 | msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? " | |
15521 | ||
87cb7997 | 15522 | #: git-add--interactive.perl:1359 |
1a79b2f1 JX |
15523 | #, perl-format |
15524 | msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " | |
15525 | msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? " | |
15526 | ||
87cb7997 | 15527 | #: git-add--interactive.perl:1360 |
1a79b2f1 JX |
15528 | #, perl-format |
15529 | msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " | |
15530 | msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? " | |
15531 | ||
87cb7997 | 15532 | #: git-add--interactive.perl:1361 |
1a79b2f1 JX |
15533 | #, perl-format |
15534 | msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " | |
15535 | msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? " | |
15536 | ||
87cb7997 | 15537 | #: git-add--interactive.perl:1364 |
1a79b2f1 JX |
15538 | #, perl-format |
15539 | msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " | |
15540 | msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? " | |
15541 | ||
87cb7997 | 15542 | #: git-add--interactive.perl:1365 |
1a79b2f1 JX |
15543 | #, perl-format |
15544 | msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " | |
15545 | msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? " | |
15546 | ||
87cb7997 | 15547 | #: git-add--interactive.perl:1366 |
1a79b2f1 JX |
15548 | #, perl-format |
15549 | msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " | |
15550 | msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? " | |
15551 | ||
87cb7997 | 15552 | #: git-add--interactive.perl:1369 |
1a79b2f1 JX |
15553 | #, perl-format |
15554 | msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " | |
15555 | msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15556 | ||
87cb7997 | 15557 | #: git-add--interactive.perl:1370 |
1a79b2f1 JX |
15558 | #, perl-format |
15559 | msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " | |
15560 | msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15561 | ||
87cb7997 | 15562 | #: git-add--interactive.perl:1371 |
1a79b2f1 JX |
15563 | #, perl-format |
15564 | msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " | |
15565 | msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " | |
15566 | ||
87cb7997 | 15567 | #: git-add--interactive.perl:1374 |
1a79b2f1 JX |
15568 | #, perl-format |
15569 | msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " | |
15570 | msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15571 | ||
87cb7997 | 15572 | #: git-add--interactive.perl:1375 |
1a79b2f1 JX |
15573 | #, perl-format |
15574 | msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " | |
15575 | msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? " | |
15576 | ||
87cb7997 | 15577 | #: git-add--interactive.perl:1376 |
1a79b2f1 JX |
15578 | #, perl-format |
15579 | msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " | |
15580 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? " | |
15581 | ||
87cb7997 | 15582 | #: git-add--interactive.perl:1379 |
1a79b2f1 JX |
15583 | #, perl-format |
15584 | msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " | |
15585 | msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? " | |
15586 | ||
87cb7997 | 15587 | #: git-add--interactive.perl:1380 |
1a79b2f1 JX |
15588 | #, perl-format |
15589 | msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " | |
15590 | msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? " | |
15591 | ||
87cb7997 | 15592 | #: git-add--interactive.perl:1381 |
1a79b2f1 JX |
15593 | #, perl-format |
15594 | msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " | |
15595 | msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? " | |
15596 | ||
87cb7997 | 15597 | #: git-add--interactive.perl:1484 |
1a79b2f1 JX |
15598 | msgid "go to which hunk (<ret> to see more)? " |
15599 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
15600 | ||
87cb7997 | 15601 | #: git-add--interactive.perl:1486 |
1a79b2f1 JX |
15602 | msgid "go to which hunk? " |
15603 | msgstr "跳转到哪个块?" | |
15604 | ||
87cb7997 | 15605 | #: git-add--interactive.perl:1495 |
1a79b2f1 JX |
15606 | #, perl-format |
15607 | msgid "Invalid number: '%s'\n" | |
15608 | msgstr "无效数字:'%s'\n" | |
15609 | ||
87cb7997 | 15610 | #: git-add--interactive.perl:1500 |
1a79b2f1 JX |
15611 | #, perl-format |
15612 | msgid "Sorry, only %d hunk available.\n" | |
15613 | msgid_plural "Sorry, only %d hunks available.\n" | |
15614 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
15615 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
15616 | ||
87cb7997 | 15617 | #: git-add--interactive.perl:1526 |
1a79b2f1 JX |
15618 | msgid "search for regex? " |
15619 | msgstr "使用正则表达式搜索?" | |
15620 | ||
87cb7997 | 15621 | #: git-add--interactive.perl:1539 |
1a79b2f1 JX |
15622 | #, perl-format |
15623 | msgid "Malformed search regexp %s: %s\n" | |
15624 | msgstr "错误的正则表达式 %s:%s\n" | |
15625 | ||
87cb7997 | 15626 | #: git-add--interactive.perl:1549 |
1a79b2f1 JX |
15627 | msgid "No hunk matches the given pattern\n" |
15628 | msgstr "没有和给定模式相匹配的快\n" | |
15629 | ||
87cb7997 | 15630 | #: git-add--interactive.perl:1561 git-add--interactive.perl:1583 |
1a79b2f1 JX |
15631 | msgid "No previous hunk\n" |
15632 | msgstr "没有前一个块\n" | |
15633 | ||
87cb7997 | 15634 | #: git-add--interactive.perl:1570 git-add--interactive.perl:1589 |
1a79b2f1 JX |
15635 | msgid "No next hunk\n" |
15636 | msgstr "没有下一个块\n" | |
15637 | ||
87cb7997 | 15638 | #: git-add--interactive.perl:1597 |
1a79b2f1 JX |
15639 | #, perl-format |
15640 | msgid "Split into %d hunk.\n" | |
15641 | msgid_plural "Split into %d hunks.\n" | |
15642 | msgstr[0] "拆分为 %d 块。\n" | |
15643 | msgstr[1] "拆分为 %d 块。\n" | |
15644 | ||
87cb7997 | 15645 | #: git-add--interactive.perl:1649 |
1a79b2f1 JX |
15646 | msgid "Review diff" |
15647 | msgstr "检视 diff" | |
15648 | ||
15649 | #. TRANSLATORS: please do not translate the command names | |
15650 | #. 'status', 'update', 'revert', etc. | |
87cb7997 | 15651 | #: git-add--interactive.perl:1668 |
1a79b2f1 JX |
15652 | msgid "" |
15653 | "status - show paths with changes\n" | |
15654 | "update - add working tree state to the staged set of changes\n" | |
15655 | "revert - revert staged set of changes back to the HEAD version\n" | |
15656 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 15657 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
15658 | "add untracked - add contents of untracked files to the staged set of " |
15659 | "changes\n" | |
15660 | msgstr "" | |
15661 | "status - 显示含变更的路径\n" | |
15662 | "update - 添加工作区状态至暂存列表\n" | |
15663 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
15664 | "patch - 挑选块并且有选择地更新\n" | |
15665 | "diff - 显示 HEAD 和索引间差异\n" | |
15666 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
15667 | ||
87cb7997 JX |
15668 | #: git-add--interactive.perl:1685 git-add--interactive.perl:1690 |
15669 | #: git-add--interactive.perl:1693 git-add--interactive.perl:1700 | |
15670 | #: git-add--interactive.perl:1704 git-add--interactive.perl:1710 | |
1a79b2f1 JX |
15671 | msgid "missing --" |
15672 | msgstr "缺失 --" | |
15673 | ||
87cb7997 | 15674 | #: git-add--interactive.perl:1706 |
1a79b2f1 JX |
15675 | #, perl-format |
15676 | msgid "unknown --patch mode: %s" | |
15677 | msgstr "未知的 --patch 模式:%s" | |
15678 | ||
87cb7997 | 15679 | #: git-add--interactive.perl:1712 git-add--interactive.perl:1718 |
1a79b2f1 JX |
15680 | #, perl-format |
15681 | msgid "invalid argument %s, expecting --" | |
15682 | msgstr "无效的参数 %s,期望是 --" | |
15683 | ||
15684 | #: git-send-email.perl:121 | |
15685 | msgid "local zone differs from GMT by a non-minute interval\n" | |
15686 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
15687 | ||
15688 | #: git-send-email.perl:128 git-send-email.perl:134 | |
15689 | msgid "local time offset greater than or equal to 24 hours\n" | |
15690 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
15691 | ||
15692 | #: git-send-email.perl:202 git-send-email.perl:208 | |
15693 | msgid "the editor exited uncleanly, aborting everything" | |
15694 | msgstr "编辑器非正常退出,终止所有操作" | |
15695 | ||
15696 | #: git-send-email.perl:282 | |
15697 | #, perl-format | |
15698 | msgid "" | |
15699 | "'%s' contains an intermediate version of the email you were composing.\n" | |
15700 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
15701 | ||
15702 | #: git-send-email.perl:287 | |
15703 | #, perl-format | |
15704 | msgid "'%s.final' contains the composed email.\n" | |
15705 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
15706 | ||
15707 | #: git-send-email.perl:305 | |
15708 | msgid "--dump-aliases incompatible with other options\n" | |
15709 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
15710 | ||
15711 | #: git-send-email.perl:368 git-send-email.perl:623 | |
15712 | msgid "Cannot run git format-patch from outside a repository\n" | |
15713 | msgstr "不能在仓库之外运行 git format-patch\n" | |
15714 | ||
15715 | #: git-send-email.perl:437 | |
15716 | #, perl-format | |
15717 | msgid "Unknown --suppress-cc field: '%s'\n" | |
15718 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
15719 | ||
15720 | #: git-send-email.perl:466 | |
15721 | #, perl-format | |
15722 | msgid "Unknown --confirm setting: '%s'\n" | |
15723 | msgstr "未知的 --confirm 设置:'%s'\n" | |
15724 | ||
15725 | #: git-send-email.perl:498 | |
15726 | #, perl-format | |
15727 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
15728 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
15729 | ||
15730 | #: git-send-email.perl:500 | |
15731 | #, perl-format | |
15732 | msgid "warning: `:include:` not supported: %s\n" | |
15733 | msgstr "警告:不支持 `:include:`:%s\n" | |
15734 | ||
15735 | #: git-send-email.perl:502 | |
15736 | #, perl-format | |
15737 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
15738 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
15739 | ||
15740 | #: git-send-email.perl:507 | |
15741 | #, perl-format | |
15742 | msgid "warning: sendmail line is not recognized: %s\n" | |
15743 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
15744 | ||
15745 | #: git-send-email.perl:589 | |
15746 | #, perl-format | |
15747 | msgid "" | |
15748 | "File '%s' exists but it could also be the range of commits\n" | |
15749 | "to produce patches for. Please disambiguate by...\n" | |
15750 | "\n" | |
15751 | " * Saying \"./%s\" if you mean a file; or\n" | |
15752 | " * Giving --format-patch option if you mean a range.\n" | |
15753 | msgstr "" | |
87cb7997 JX |
15754 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
15755 | "歧义:\n" | |
1a79b2f1 JX |
15756 | "\n" |
15757 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
15758 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
15759 | ||
15760 | #: git-send-email.perl:610 | |
15761 | #, perl-format | |
15762 | msgid "Failed to opendir %s: %s" | |
15763 | msgstr "无法打开目录 %s: %s" | |
15764 | ||
15765 | #: git-send-email.perl:634 | |
15766 | #, perl-format | |
15767 | msgid "" | |
15768 | "fatal: %s: %s\n" | |
15769 | "warning: no patches were sent\n" | |
15770 | msgstr "" | |
15771 | "严重:%s:%s\n" | |
15772 | "警告:补丁未能发送\n" | |
15773 | ||
15774 | #: git-send-email.perl:645 | |
15775 | msgid "" | |
15776 | "\n" | |
15777 | "No patch files specified!\n" | |
15778 | "\n" | |
87cb7997 JX |
15779 | msgstr "" |
15780 | "\n" | |
15781 | "未指定补丁文件!\n" | |
15782 | "\n" | |
1a79b2f1 JX |
15783 | |
15784 | #: git-send-email.perl:658 | |
15785 | #, perl-format | |
15786 | msgid "No subject line in %s?" | |
15787 | msgstr "在 %s 中没有标题行?" | |
15788 | ||
15789 | #: git-send-email.perl:668 | |
15790 | #, perl-format | |
15791 | msgid "Failed to open for writing %s: %s" | |
15792 | msgstr "无法写入 %s: %s" | |
15793 | ||
15794 | #: git-send-email.perl:678 | |
15795 | msgid "" | |
15796 | "Lines beginning in \"GIT:\" will be removed.\n" | |
15797 | "Consider including an overall diffstat or table of contents\n" | |
15798 | "for the patch you are writing.\n" | |
15799 | "\n" | |
15800 | "Clear the body content if you don't wish to send a summary.\n" | |
15801 | msgstr "" | |
15802 | "以 \"GIT:\" 开头的行将被删除。\n" | |
15803 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" | |
15804 | "\n" | |
15805 | "如果您不想发送摘要,清除内容。\n" | |
15806 | ||
15807 | #: git-send-email.perl:701 | |
15808 | #, perl-format | |
15809 | msgid "Failed to open %s.final: %s" | |
15810 | msgstr "无法打开 %s.final: %s" | |
15811 | ||
15812 | #: git-send-email.perl:704 | |
15813 | #, perl-format | |
15814 | msgid "Failed to open %s: %s" | |
15815 | msgstr "无法打开 %s: %s" | |
15816 | ||
15817 | #: git-send-email.perl:739 | |
15818 | msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" | |
15819 | msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n" | |
15820 | ||
15821 | #: git-send-email.perl:748 | |
15822 | msgid "Summary email is empty, skipping it\n" | |
15823 | msgstr "摘要邮件为空,跳过\n" | |
15824 | ||
15825 | #. TRANSLATORS: please keep [y/N] as is. | |
15826 | #: git-send-email.perl:780 | |
15827 | #, perl-format | |
15828 | msgid "Are you sure you want to use <%s> [y/N]? " | |
15829 | msgstr "您确认要使用 <%s> [y/N]?" | |
15830 | ||
15831 | #: git-send-email.perl:809 | |
15832 | msgid "" | |
15833 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
15834 | "Encoding.\n" | |
15835 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
15836 | ||
15837 | #: git-send-email.perl:814 | |
15838 | msgid "Which 8bit encoding should I declare [UTF-8]? " | |
15839 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
15840 | ||
15841 | #: git-send-email.perl:822 | |
15842 | #, perl-format | |
15843 | msgid "" | |
15844 | "Refusing to send because the patch\n" | |
15845 | "\t%s\n" | |
15846 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
15847 | "want to send.\n" | |
15848 | msgstr "" | |
15849 | "拒绝发送,因为补丁\n" | |
15850 | "\t%s\n" | |
15851 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
15852 | ||
15853 | #: git-send-email.perl:841 | |
15854 | msgid "To whom should the emails be sent (if anyone)?" | |
15855 | msgstr "邮件将要发送给谁?" | |
15856 | ||
15857 | #: git-send-email.perl:859 | |
15858 | #, perl-format | |
15859 | msgid "fatal: alias '%s' expands to itself\n" | |
15860 | msgstr "严重:别名 '%s' 扩展为它自己\n" | |
15861 | ||
15862 | #: git-send-email.perl:871 | |
15863 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " | |
15864 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
15865 | ||
15866 | #: git-send-email.perl:921 git-send-email.perl:929 | |
15867 | #, perl-format | |
15868 | msgid "error: unable to extract a valid address from: %s\n" | |
15869 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
15870 | ||
15871 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
15872 | #. translation. The program will only accept English input | |
15873 | #. at this point. | |
15874 | #: git-send-email.perl:933 | |
15875 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " | |
15876 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
15877 | ||
15878 | #: git-send-email.perl:1234 | |
15879 | #, perl-format | |
15880 | msgid "CA path \"%s\" does not exist" | |
15881 | msgstr "CA 路径 \"%s\" 不存在" | |
15882 | ||
15883 | #: git-send-email.perl:1309 | |
15884 | msgid "" | |
15885 | " The Cc list above has been expanded by additional\n" | |
15886 | " addresses found in the patch commit message. By default\n" | |
15887 | " send-email prompts before sending whenever this occurs.\n" | |
15888 | " This behavior is controlled by the sendemail.confirm\n" | |
15889 | " configuration setting.\n" | |
15890 | "\n" | |
15891 | " For additional information, run 'git send-email --help'.\n" | |
15892 | " To retain the current behavior, but squelch this message,\n" | |
15893 | " run 'git config --global sendemail.confirm auto'.\n" | |
15894 | "\n" | |
15895 | msgstr "" | |
15896 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
15897 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
15898 | " sendemail.confirm 配置设置。\n" | |
15899 | "\n" | |
15900 | " 更多信息,执行 'git send-email --help'。\n" | |
15901 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
15902 | " sendemail.confirm auto'。\n" | |
15903 | "\n" | |
15904 | ||
15905 | #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your | |
15906 | #. translation. The program will only accept English input | |
15907 | #. at this point. | |
15908 | #: git-send-email.perl:1324 | |
15909 | msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " | |
15910 | msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):" | |
15911 | ||
15912 | #: git-send-email.perl:1327 | |
15913 | msgid "Send this email reply required" | |
15914 | msgstr "发送要求的邮件回复" | |
15915 | ||
15916 | #: git-send-email.perl:1353 | |
15917 | msgid "The required SMTP server is not properly defined." | |
15918 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
15919 | ||
15920 | #: git-send-email.perl:1397 | |
15921 | #, perl-format | |
15922 | msgid "Server does not support STARTTLS! %s" | |
15923 | msgstr "服务器不支持 STARTTLS!%s" | |
15924 | ||
15925 | #: git-send-email.perl:1403 | |
15926 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." | |
15927 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
15928 | ||
15929 | #: git-send-email.perl:1421 | |
15930 | #, perl-format | |
15931 | msgid "Failed to send %s\n" | |
15932 | msgstr "无法发送 %s\n" | |
15933 | ||
15934 | #: git-send-email.perl:1424 | |
15935 | #, perl-format | |
15936 | msgid "Dry-Sent %s\n" | |
15937 | msgstr "演习发送 %s\n" | |
15938 | ||
15939 | #: git-send-email.perl:1424 | |
15940 | #, perl-format | |
15941 | msgid "Sent %s\n" | |
15942 | msgstr "正发送 %s\n" | |
15943 | ||
15944 | #: git-send-email.perl:1426 | |
15945 | msgid "Dry-OK. Log says:\n" | |
15946 | msgstr "演习成功。日志说:\n" | |
15947 | ||
15948 | #: git-send-email.perl:1426 | |
15949 | msgid "OK. Log says:\n" | |
15950 | msgstr "OK。日志说:\n" | |
15951 | ||
15952 | #: git-send-email.perl:1438 | |
15953 | msgid "Result: " | |
15954 | msgstr "结果:" | |
15955 | ||
15956 | #: git-send-email.perl:1441 | |
15957 | msgid "Result: OK\n" | |
15958 | msgstr "结果:OK\n" | |
15959 | ||
15960 | #: git-send-email.perl:1454 | |
15961 | #, perl-format | |
15962 | msgid "can't open file %s" | |
15963 | msgstr "无法打开文件 %s" | |
15964 | ||
15965 | #: git-send-email.perl:1501 git-send-email.perl:1521 | |
15966 | #, perl-format | |
15967 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
15968 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
15969 | ||
15970 | #: git-send-email.perl:1507 | |
15971 | #, perl-format | |
15972 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
15973 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
15974 | ||
15975 | #: git-send-email.perl:1555 | |
15976 | #, perl-format | |
15977 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
15978 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
15979 | ||
15980 | #: git-send-email.perl:1578 | |
15981 | #, perl-format | |
15982 | msgid "(body) Adding cc: %s from line '%s'\n" | |
15983 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
15984 | ||
15985 | #: git-send-email.perl:1676 | |
15986 | #, perl-format | |
15987 | msgid "(%s) Could not execute '%s'" | |
15988 | msgstr "(%s) 不能执行 '%s'" | |
15989 | ||
15990 | #: git-send-email.perl:1683 | |
15991 | #, perl-format | |
15992 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
15993 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
15994 | ||
15995 | #: git-send-email.perl:1687 | |
15996 | #, perl-format | |
15997 | msgid "(%s) failed to close pipe to '%s'" | |
15998 | msgstr "(%s) 无法关闭管道至 '%s'" | |
15999 | ||
16000 | #: git-send-email.perl:1714 | |
16001 | msgid "cannot send message as 7bit" | |
16002 | msgstr "不能以 7bit 形式发送信息" | |
16003 | ||
16004 | #: git-send-email.perl:1722 | |
16005 | msgid "invalid transfer encoding" | |
16006 | msgstr "无效的传送编码" | |
16007 | ||
16008 | #: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 | |
16009 | #, perl-format | |
16010 | msgid "unable to open %s: %s\n" | |
16011 | msgstr "不能打开 %s:%s\n" | |
16012 | ||
16013 | #: git-send-email.perl:1744 | |
16014 | #, perl-format | |
16015 | msgid "%s: patch contains a line longer than 998 characters" | |
16016 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
16017 | ||
16018 | #: git-send-email.perl:1760 | |
16019 | #, perl-format | |
16020 | msgid "Skipping %s with backup suffix '%s'.\n" | |
16021 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
16022 | ||
16023 | #. TRANSLATORS: please keep "[y|N]" as is. | |
16024 | #: git-send-email.perl:1764 | |
16025 | #, perl-format | |
16026 | msgid "Do you really want to send %s? [y|N]: " | |
16027 | msgstr "您真的要发送 %s?[y|N]:" | |
16028 | ||
60638e98 JX |
16029 | #~ msgid "tag: tagging " |
16030 | #~ msgstr "tag: tagging " | |
16031 | ||
16032 | #~ msgid "object of unknown type" | |
16033 | #~ msgstr "未知类型的对象" | |
16034 | ||
16035 | #~ msgid "commit object" | |
16036 | #~ msgstr "提交对象" | |
16037 | ||
16038 | #~ msgid "tree object" | |
16039 | #~ msgstr "树对象" | |
16040 | ||
16041 | #~ msgid "blob object" | |
16042 | #~ msgstr "数据对象" | |
16043 | ||
16044 | #~ msgid "other tag object" | |
16045 | #~ msgstr "其它标签对象" | |
16046 | ||
87cb7997 JX |
16047 | #~ msgid "" |
16048 | #~ "There is nothing to exclude from by :(exclude) patterns.\n" | |
16049 | #~ "Perhaps you forgot to add either ':/' or '.' ?" | |
16050 | #~ msgstr "" | |
16051 | #~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
16052 | #~ "添加 ':/' 或 '.' ?" | |
16053 | ||
16054 | #~ msgid "unrecognized format: %%(%s)" | |
16055 | #~ msgstr "未能识别的格式:%%(%s)" | |
16056 | ||
16057 | #~ msgid ":strip= requires a positive integer argument" | |
16058 | #~ msgstr ":strip= 需要一个正整型参数" | |
16059 | ||
16060 | #~ msgid "ref '%s' does not have %ld components to :strip" | |
16061 | #~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" | |
16062 | ||
16063 | #~ msgid "unknown %.*s format %s" | |
16064 | #~ msgstr "未知的 %.*s 格式 %s" | |
16065 | ||
16066 | #~ msgid "[%s: gone]" | |
16067 | #~ msgstr "[%s: 丢失]" | |
16068 | ||
16069 | #~ msgid "[%s]" | |
16070 | #~ msgstr "[%s]" | |
16071 | ||
16072 | #~ msgid "[%s: behind %d]" | |
16073 | #~ msgstr "[%s:落后 %d]" | |
16074 | ||
16075 | #~ msgid "[%s: ahead %d]" | |
16076 | #~ msgstr "[%s:领先 %d]" | |
16077 | ||
16078 | #~ msgid "[%s: ahead %d, behind %d]" | |
16079 | #~ msgstr "[%s:领先 %d,落后 %d]" | |
16080 | ||
16081 | #~ msgid " **** invalid ref ****" | |
16082 | #~ msgstr " **** 无效引用 ****" | |
16083 | ||
16084 | #~ msgid "insanely long object directory %.*s" | |
16085 | #~ msgstr "不正常的长对象目录 %.*s" | |
16086 | ||
16087 | #~ msgid "git merge [<options>] <msg> HEAD <commit>" | |
16088 | #~ msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
16089 | ||
16090 | #~ msgid "'%s' is not a commit" | |
16091 | #~ msgstr "'%s' 不是一个提交" | |
16092 | ||
16093 | #~ msgid "cannot open file '%s'" | |
16094 | #~ msgstr "无法打开文件 '%s'" | |
16095 | ||
16096 | #~ msgid "could not close file %s" | |
16097 | #~ msgstr "无法关闭文件 %s" | |
16098 | ||
16099 | #~ msgid "tag name too long: %.*s..." | |
16100 | #~ msgstr "标签名称太长:%.*s..." | |
16101 | ||
16102 | #~ msgid "tag header too big." | |
16103 | #~ msgstr "标签头信息太大。" | |
16104 | ||
16105 | #~ msgid "" | |
16106 | #~ "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16107 | #~ "marked for discarding" | |
16108 | #~ msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃" | |
16109 | ||
1a79b2f1 JX |
16110 | #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" |
16111 | #~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示" | |
16112 | ||
16113 | #~ msgid "Clever... amending the last one with dirty index." | |
16114 | #~ msgstr "聪明... 用脏索引修补最后一个提交。" | |
16115 | ||
16116 | #~ msgid "" | |
16117 | #~ "the following submodule (or one of its nested submodules)\n" | |
16118 | #~ "uses a .git directory:" | |
16119 | #~ msgid_plural "" | |
16120 | #~ "the following submodules (or one of their nested submodules)\n" | |
16121 | #~ "use a .git directory:" | |
16122 | #~ msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
16123 | #~ msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
16124 | ||
16125 | #~ msgid "" | |
16126 | #~ "\n" | |
16127 | #~ "(use 'rm -rf' if you really want to remove it including all of its " | |
16128 | #~ "history)" | |
16129 | #~ msgstr "" | |
16130 | #~ "\n" | |
16131 | #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
16132 | ||
a0b6b246 JX |
16133 | #~ msgid "Could not write to %s" |
16134 | #~ msgstr "不能写入 %s" | |
16135 | ||
16136 | #~ msgid "Error wrapping up %s." | |
16137 | #~ msgstr "错误收尾 %s。" | |
16138 | ||
16139 | #~ msgid "Your local changes would be overwritten by cherry-pick." | |
16140 | #~ msgstr "您的本地修改将被拣选操作覆盖。" | |
16141 | ||
16142 | #~ msgid "Cannot revert during another revert." | |
16143 | #~ msgstr "不能在回退中执行另一回退。" | |
16144 | ||
16145 | #~ msgid "Cannot cherry-pick during another cherry-pick." | |
16146 | #~ msgstr "不能在拣选过程中执行另一拣选。" | |
16147 | ||
16148 | #~ msgid "Could not parse line %d." | |
16149 | #~ msgstr "不能解析第 %d 行。" | |
16150 | ||
16151 | #~ msgid "Could not open %s" | |
16152 | #~ msgstr "不能打开 %s" | |
16153 | ||
16154 | #~ msgid "Could not read %s." | |
16155 | #~ msgstr "不能读取 %s。" | |
16156 | ||
16157 | #~ msgid "Could not format %s." | |
16158 | #~ msgstr "不能格式化 %s。" | |
16159 | ||
16160 | #~ msgid "%s: %s" | |
16161 | #~ msgstr "%s:%s" | |
16162 | ||
16163 | #~ msgid "cannot open %s: %s" | |
16164 | #~ msgstr "不能打开 %s:%s" | |
16165 | ||
16166 | #~ msgid "You need to set your committer info first" | |
16167 | #~ msgstr "您需要先设置您的提交者信息" |