]>
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: |
5b533632 | 6 | # - Fangyi Zhou <me AT fangyi.io> |
c04f5ac3 | 7 | # - Jiang Xin <worldhello.net AT gmail.com> |
bbdf0acc JX |
8 | # - Lian Cheng <rhythm.mail AT gmail.com> |
9 | # - Ray Chen <oldsharp AT gmail.com> | |
c04f5ac3 | 10 | # - Riku <lu.riku AT gmail.com> |
bbdf0acc JX |
11 | # - Thynson <lanxingcan AT gmail.com> |
12 | # - ws3389 <willsmith3389 AT gmail.com> | |
13 | # - Wang Sheng <wangsheng2008love AT 163.com> | |
554e8501 | 14 | # - 依云 <lilydjwg AT gmail.com> |
bbdf0acc | 15 | # - Yichao Yu <yyc1992 AT gmail.com> |
c04f5ac3 | 16 | # - Zhuang Ya <zhuangya AT me.com> |
c04f5ac3 | 17 | # |
160fb2b2 JX |
18 | # Git glossary for Chinese translators |
19 | # | |
20 | # English | Chinese | |
21 | # ---------------------------------+-------------------------------------- | |
22 | # 3-way merge | 三方合并 | |
23 | # abbreviate | 简写(的 SHA-1 值) | |
24 | # alternate object database | 备用对象库 | |
25 | # amend | 修补 | |
26 | # ancestor | 祖先,祖先提交 | |
27 | # annotated tag | 附注标签 | |
28 | # bare repository | 纯仓库 | |
29 | # bisect | 二分查找 | |
30 | # blob object | 数据对象 | |
31 | # branch | 分支 | |
32 | # bundle | 包 | |
33 | # bypass | 绕过 | |
34 | # cache | 索引(的别称) | |
35 | # chain | (提交)链 | |
36 | # changeset | 变更集 | |
37 | # checkout | 检出 | |
38 | # checksum | 校验,校验和 | |
39 | # cherry-picking | 拣选 | |
40 | # clean | 干净(的工作区) | |
41 | # clone | 克隆 | |
42 | # commit | 提交 | |
667599e8 | 43 | # commit message | 提交说明 |
160fb2b2 JX |
44 | # commit object | 提交对象 |
45 | # commit-ish (also committish) | 提交号 | |
46 | # conflict | 冲突 | |
47 | # core Git | 核心 Git 工具 | |
d46c5519 | 48 | # cover letter | 附函 |
160fb2b2 | 49 | # DAG | 有向无环图 |
e640d114 | 50 | # dangling object | 悬空对象 |
160fb2b2 JX |
51 | # detached HEAD | 分离头指针 |
52 | # directory | 目录 | |
53 | # dirty | 脏(的工作区) | |
755c831b | 54 | # dumb HTTP protocol | 哑 HTTP 协议 |
160fb2b2 JX |
55 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
56 | # fast-forward | 快进 | |
57 | # fetch | 获取 | |
58 | # file system | 文件系统 | |
e397e7e3 | 59 | # fork | 派生 |
160fb2b2 JX |
60 | # Git archive | 仓库(对于 arch 用户) |
61 | # gitfile | gitfile(仓库链接文件) | |
fd8cb379 | 62 | # grafts | (提交)移植 |
160fb2b2 JX |
63 | # hash | 哈希值 |
64 | # HEAD | HEAD(头指针,亦即当前分支) | |
65 | # head | 头、分支 | |
66 | # head ref | 分支 | |
67 | # header | 头信息 | |
68 | # hook | 钩子 | |
69 | # hunk | 补丁片段 | |
70 | # index | 索引 | |
71 | # index entry | 索引条目 | |
72 | # loose object | 松散对象 | |
73 | # loose refs | 松散引用 | |
74 | # master | master(默认分支名) | |
75 | # merge | 合并 | |
76 | # object | 对象 | |
77 | # object database | 对象库 | |
78 | # object identifier | 对象标识符 | |
79 | # object name | 对象名称 | |
80 | # object type | 对象类型 | |
81 | # octopus | 章鱼式合并(两分支以上的合并) | |
82 | # origin | origin(默认的远程名称) | |
83 | # pack | 包 | |
84 | # pack index | 包索引 | |
85 | # packfile | 包文件 | |
86 | # parent | 父提交 | |
87 | # patch | 补丁 | |
88 | # pathspec | 路径规格 | |
89 | # pattern | 模式 | |
12e59059 | 90 | # pickaxe | 挖掘 |
160fb2b2 JX |
91 | # plumbing | 管件(Git 底层核心命令的别称) |
92 | # porcelain | 瓷件(Git 上层封装命令的别称) | |
94550ed3 | 93 | # precious-objects repo | 珍品仓库 |
160fb2b2 JX |
94 | # prune | 清除 |
95 | # pull | 拉,拉取 | |
96 | # push | 推,推送 | |
97 | # reachable | 可达 | |
98 | # rebase | 变基 | |
99 | # ref | 引用 | |
100 | # reflog | 引用日志 | |
101 | # refspec | 引用规格 | |
102 | # remote | 远程,远程仓库 | |
103 | # remote-tracking branch | 远程跟踪分支 | |
104 | # replay | 重放 | |
105 | # repo | 仓库 | |
106 | # repository | 仓库 | |
107 | # resolve | (冲突)解决 | |
108 | # revert | 还原 | |
109 | # revision | 版本 | |
110 | # rewind | 回退 | |
111 | # SCM | 源代码管理(工具) | |
ee7589bb | 112 | # SHA-1 | SHA-1(安全哈希算法1) |
160fb2b2 JX |
113 | # shallow repository | 浅(克隆)仓库 |
114 | # signed tag | 签名标签 | |
755c831b | 115 | # smart HTTP protocol | 智能 HTTP 协议 |
160fb2b2 JX |
116 | # squash | 压缩 |
117 | # stage | n. 暂存区(即索引); v. 暂存 | |
a4f16749 | 118 | # stash | n. 贮藏区; v. 贮藏 |
160fb2b2 JX |
119 | # submodule | 子模组 |
120 | # symref | 符号引用 | |
933c015e | 121 | # tag | n. 标签; v. 打标签 |
160fb2b2 JX |
122 | # tag object | 标签对象 |
123 | # tagger | 打标签者 | |
124 | # topic branch | 主题分支 | |
125 | # track | 跟踪 | |
6937cb4e | 126 | # trailer | 尾部署名 |
160fb2b2 JX |
127 | # tree | 树(工作区或树对象) |
128 | # tree object | 树对象 | |
129 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) | |
130 | # unmerged index | 未合并索引 | |
131 | # unpack | 解包 | |
132 | # unreachable object | 不可达对象 | |
133 | # unstage | 取消暂存 | |
134 | # upstream | 上游 | |
135 | # upstream branch | 上游分支 | |
136 | # working tree | 工作区 | |
137 | # | |
c04f5ac3 JX |
138 | msgid "" |
139 | msgstr "" | |
140 | "Project-Id-Version: Git\n" | |
141 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
a5cd71ca JX |
142 | "POT-Creation-Date: 2019-10-28 13:19+0800\n" |
143 | "PO-Revision-Date: 2019-10-30 14:58+0800\n" | |
c04f5ac3 | 144 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 145 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
146 | "Language: zh_CN\n" |
147 | "MIME-Version: 1.0\n" | |
148 | "Content-Type: text/plain; charset=UTF-8\n" | |
149 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 150 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 151 | |
a6cd2cc4 | 152 | #: advice.c:109 |
c04f5ac3 | 153 | #, c-format |
fd8cb379 JX |
154 | msgid "%shint: %.*s%s\n" |
155 | msgstr "%s提示:%.*s%s\n" | |
c04f5ac3 | 156 | |
a6cd2cc4 | 157 | #: advice.c:162 |
5c57d762 JX |
158 | msgid "Cherry-picking is not possible because you have unmerged files." |
159 | msgstr "无法拣选,因为您有未合并的文件。" | |
160 | ||
a6cd2cc4 | 161 | #: advice.c:164 |
5c57d762 JX |
162 | msgid "Committing is not possible because you have unmerged files." |
163 | msgstr "无法提交,因为您有未合并的文件。" | |
164 | ||
a6cd2cc4 | 165 | #: advice.c:166 |
5c57d762 JX |
166 | msgid "Merging is not possible because you have unmerged files." |
167 | msgstr "无法合并,因为您有未合并的文件。" | |
168 | ||
a6cd2cc4 | 169 | #: advice.c:168 |
5c57d762 JX |
170 | msgid "Pulling is not possible because you have unmerged files." |
171 | msgstr "无法拉取,因为您有未合并的文件。" | |
172 | ||
a6cd2cc4 | 173 | #: advice.c:170 |
5c57d762 JX |
174 | msgid "Reverting is not possible because you have unmerged files." |
175 | msgstr "无法回退,因为您有未合并的文件。" | |
176 | ||
a6cd2cc4 | 177 | #: advice.c:172 |
5c57d762 JX |
178 | #, c-format |
179 | msgid "It is not possible to %s because you have unmerged files." | |
180 | msgstr "无法 %s,因为您有未合并的文件。" | |
181 | ||
a6cd2cc4 | 182 | #: advice.c:180 |
c04f5ac3 | 183 | msgid "" |
6acbf033 | 184 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 185 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 186 | msgstr "" |
d9d56b23 | 187 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 188 | "解决方案并提交。" |
c04f5ac3 | 189 | |
a6cd2cc4 | 190 | #: advice.c:188 |
5c57d762 JX |
191 | msgid "Exiting because of an unresolved conflict." |
192 | msgstr "因为存在未解决的冲突而退出。" | |
193 | ||
a5cd71ca | 194 | #: advice.c:193 builtin/merge.c:1332 |
1b7f4a34 JX |
195 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
196 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
197 | ||
a6cd2cc4 | 198 | #: advice.c:195 |
94550ed3 | 199 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
200 | msgstr "请在合并前先提交您的修改。" |
201 | ||
a6cd2cc4 | 202 | #: advice.c:196 |
1b7f4a34 JX |
203 | msgid "Exiting because of unfinished merge." |
204 | msgstr "因为存在未完成的合并而退出。" | |
205 | ||
a6cd2cc4 | 206 | #: advice.c:202 |
5c57d762 JX |
207 | #, c-format |
208 | msgid "" | |
a6cd2cc4 | 209 | "Note: switching to '%s'.\n" |
5c57d762 JX |
210 | "\n" |
211 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
212 | "changes and commit them, and you can discard any commits you make in this\n" | |
a6cd2cc4 | 213 | "state without impacting any branches by switching back to a branch.\n" |
5c57d762 JX |
214 | "\n" |
215 | "If you want to create a new branch to retain commits you create, you may\n" | |
a6cd2cc4 | 216 | "do so (now or later) by using -c with the switch command. Example:\n" |
5c57d762 | 217 | "\n" |
a6cd2cc4 JX |
218 | " git switch -c <new-branch-name>\n" |
219 | "\n" | |
220 | "Or undo this operation with:\n" | |
221 | "\n" | |
222 | " git switch -\n" | |
223 | "\n" | |
224 | "Turn off this advice by setting config variable advice.detachedHead to " | |
225 | "false\n" | |
5c57d762 JX |
226 | "\n" |
227 | msgstr "" | |
a6cd2cc4 JX |
228 | "注意:正在切换到 '%s'。\n" |
229 | "\n" | |
230 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n" | |
231 | "回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n" | |
5c57d762 | 232 | "\n" |
a6cd2cc4 JX |
233 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n" |
234 | "中添加参数 -c 来实现(现在或稍后)。例如:\n" | |
5c57d762 | 235 | "\n" |
a6cd2cc4 | 236 | " git switch -c <新分支名>\n" |
5c57d762 | 237 | "\n" |
a6cd2cc4 JX |
238 | "或者撤销此操作:\n" |
239 | "\n" | |
240 | " git switch -\n" | |
241 | "\n" | |
242 | "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" | |
5c57d762 JX |
243 | "\n" |
244 | ||
06991777 JX |
245 | #: alias.c:50 |
246 | msgid "cmdline ends with \\" | |
247 | msgstr "命令行以 \\ 结尾" | |
248 | ||
249 | #: alias.c:51 | |
250 | msgid "unclosed quote" | |
251 | msgstr "未关闭的引号" | |
252 | ||
a6cd2cc4 | 253 | #: apply.c:69 |
a0b6b246 JX |
254 | #, c-format |
255 | msgid "unrecognized whitespace option '%s'" | |
256 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 257 | |
a6cd2cc4 | 258 | #: apply.c:85 |
90314792 | 259 | #, c-format |
a0b6b246 JX |
260 | msgid "unrecognized whitespace ignore option '%s'" |
261 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 262 | |
a6cd2cc4 | 263 | #: apply.c:135 |
a0b6b246 | 264 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 265 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 266 | |
a6cd2cc4 | 267 | #: apply.c:137 |
a0b6b246 JX |
268 | msgid "--cached and --3way cannot be used together." |
269 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 270 | |
a6cd2cc4 | 271 | #: apply.c:140 |
a0b6b246 JX |
272 | msgid "--3way outside a repository" |
273 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 274 | |
a6cd2cc4 | 275 | #: apply.c:151 |
a0b6b246 JX |
276 | msgid "--index outside a repository" |
277 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 278 | |
a6cd2cc4 | 279 | #: apply.c:154 |
a0b6b246 JX |
280 | msgid "--cached outside a repository" |
281 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 282 | |
a6cd2cc4 | 283 | #: apply.c:801 |
a0b6b246 JX |
284 | #, c-format |
285 | msgid "Cannot prepare timestamp regexp %s" | |
286 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 287 | |
a6cd2cc4 | 288 | #: apply.c:810 |
a0b6b246 JX |
289 | #, c-format |
290 | msgid "regexec returned %d for input: %s" | |
291 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 292 | |
a6cd2cc4 | 293 | #: apply.c:884 |
a0b6b246 JX |
294 | #, c-format |
295 | msgid "unable to find filename in patch at line %d" | |
296 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 297 | |
a6cd2cc4 | 298 | #: apply.c:922 |
a0b6b246 JX |
299 | #, c-format |
300 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
301 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 302 | |
a6cd2cc4 | 303 | #: apply.c:928 |
a0b6b246 JX |
304 | #, c-format |
305 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
306 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 307 | |
a6cd2cc4 | 308 | #: apply.c:929 |
a0b6b246 JX |
309 | #, c-format |
310 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
311 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 312 | |
a6cd2cc4 | 313 | #: apply.c:934 |
a0b6b246 JX |
314 | #, c-format |
315 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
316 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 317 | |
a6cd2cc4 | 318 | #: apply.c:963 |
a4f16749 JX |
319 | #, c-format |
320 | msgid "invalid mode on line %d: %s" | |
321 | msgstr "第 %d 行包含无效文件模式:%s" | |
322 | ||
a6cd2cc4 | 323 | #: apply.c:1282 |
a4f16749 JX |
324 | #, c-format |
325 | msgid "inconsistent header lines %d and %d" | |
326 | msgstr "不一致的文件头,%d 行和 %d 行" | |
327 | ||
a5cd71ca | 328 | #: apply.c:1372 |
a0b6b246 JX |
329 | #, c-format |
330 | msgid "" | |
331 | "git diff header lacks filename information when removing %d leading pathname " | |
332 | "component (line %d)" | |
333 | msgid_plural "" | |
334 | "git diff header lacks filename information when removing %d leading pathname " | |
335 | "components (line %d)" | |
336 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
337 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 338 | |
a5cd71ca | 339 | #: apply.c:1385 |
a0b6b246 JX |
340 | #, c-format |
341 | msgid "git diff header lacks filename information (line %d)" | |
342 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 343 | |
a5cd71ca JX |
344 | #: apply.c:1481 |
345 | #, c-format | |
346 | msgid "recount: unexpected line: %.*s" | |
347 | msgstr "recount:意外的行:%.*s" | |
348 | ||
349 | #: apply.c:1550 | |
350 | #, c-format | |
351 | msgid "patch fragment without header at line %d: %.*s" | |
352 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
353 | ||
354 | #: apply.c:1753 | |
a0b6b246 JX |
355 | msgid "new file depends on old contents" |
356 | msgstr "新文件依赖旧内容" | |
5c57d762 | 357 | |
a5cd71ca | 358 | #: apply.c:1755 |
a0b6b246 JX |
359 | msgid "deleted file still has contents" |
360 | msgstr "删除的文件仍有内容" | |
5c57d762 | 361 | |
a5cd71ca | 362 | #: apply.c:1789 |
a0b6b246 JX |
363 | #, c-format |
364 | msgid "corrupt patch at line %d" | |
365 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 366 | |
a5cd71ca | 367 | #: apply.c:1826 |
5c57d762 | 368 | #, c-format |
a0b6b246 JX |
369 | msgid "new file %s depends on old contents" |
370 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 371 | |
a5cd71ca | 372 | #: apply.c:1828 |
5c57d762 | 373 | #, c-format |
a0b6b246 JX |
374 | msgid "deleted file %s still has contents" |
375 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 376 | |
a5cd71ca | 377 | #: apply.c:1831 |
a0b6b246 JX |
378 | #, c-format |
379 | msgid "** warning: file %s becomes empty but is not deleted" | |
380 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 381 | |
a5cd71ca | 382 | #: apply.c:1978 |
5c57d762 | 383 | #, c-format |
a0b6b246 JX |
384 | msgid "corrupt binary patch at line %d: %.*s" |
385 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 386 | |
a5cd71ca | 387 | #: apply.c:2015 |
5c57d762 | 388 | #, c-format |
a0b6b246 JX |
389 | msgid "unrecognized binary patch at line %d" |
390 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 391 | |
a5cd71ca | 392 | #: apply.c:2177 |
5c57d762 | 393 | #, c-format |
a0b6b246 JX |
394 | msgid "patch with only garbage at line %d" |
395 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 396 | |
a5cd71ca | 397 | #: apply.c:2263 |
5c57d762 | 398 | #, c-format |
a0b6b246 JX |
399 | msgid "unable to read symlink %s" |
400 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 401 | |
a5cd71ca | 402 | #: apply.c:2267 |
5c57d762 | 403 | #, c-format |
a0b6b246 JX |
404 | msgid "unable to open or read %s" |
405 | msgstr "不能打开或读取 %s" | |
5c57d762 | 406 | |
a5cd71ca | 407 | #: apply.c:2926 |
5c57d762 | 408 | #, c-format |
a0b6b246 JX |
409 | msgid "invalid start of line: '%c'" |
410 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 411 | |
a5cd71ca | 412 | #: apply.c:3047 |
5c57d762 | 413 | #, c-format |
a0b6b246 JX |
414 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
415 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
416 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
417 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 418 | |
a5cd71ca | 419 | #: apply.c:3059 |
5c57d762 | 420 | #, c-format |
a0b6b246 JX |
421 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
422 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 423 | |
a5cd71ca | 424 | #: apply.c:3065 |
5c57d762 JX |
425 | #, c-format |
426 | msgid "" | |
a0b6b246 JX |
427 | "while searching for:\n" |
428 | "%.*s" | |
5c57d762 | 429 | msgstr "" |
a0b6b246 JX |
430 | "当查询:\n" |
431 | "%.*s" | |
5c57d762 | 432 | |
a5cd71ca | 433 | #: apply.c:3087 |
5c57d762 | 434 | #, c-format |
a0b6b246 JX |
435 | msgid "missing binary patch data for '%s'" |
436 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 437 | |
a5cd71ca | 438 | #: apply.c:3095 |
5c57d762 | 439 | #, c-format |
a0b6b246 | 440 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 441 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 442 | |
a5cd71ca | 443 | #: apply.c:3142 |
5c57d762 | 444 | #, c-format |
a0b6b246 JX |
445 | msgid "cannot apply binary patch to '%s' without full index line" |
446 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 447 | |
a5cd71ca | 448 | #: apply.c:3152 |
5c57d762 | 449 | #, c-format |
a0b6b246 JX |
450 | msgid "" |
451 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 452 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 453 | |
a5cd71ca | 454 | #: apply.c:3160 |
a0b6b246 JX |
455 | #, c-format |
456 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 457 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 458 | |
a5cd71ca | 459 | #: apply.c:3178 |
5c57d762 | 460 | #, c-format |
a0b6b246 | 461 | msgid "the necessary postimage %s for '%s' cannot be read" |
e640d114 | 462 | msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" |
5c57d762 | 463 | |
a5cd71ca | 464 | #: apply.c:3191 |
5c57d762 | 465 | #, c-format |
a0b6b246 JX |
466 | msgid "binary patch does not apply to '%s'" |
467 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 468 | |
a5cd71ca | 469 | #: apply.c:3197 |
5c57d762 | 470 | #, c-format |
a0b6b246 JX |
471 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
472 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 473 | |
a5cd71ca | 474 | #: apply.c:3218 |
276ceeaa | 475 | #, c-format |
a0b6b246 JX |
476 | msgid "patch failed: %s:%ld" |
477 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 478 | |
a5cd71ca | 479 | #: apply.c:3341 |
4dcdc3d8 | 480 | #, c-format |
a0b6b246 JX |
481 | msgid "cannot checkout %s" |
482 | msgstr "不能检出 %s" | |
4dcdc3d8 | 483 | |
a5cd71ca | 484 | #: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 |
4dcdc3d8 | 485 | #, c-format |
a0b6b246 JX |
486 | msgid "failed to read %s" |
487 | msgstr "无法读取 %s" | |
4dcdc3d8 | 488 | |
a5cd71ca | 489 | #: apply.c:3401 |
4dcdc3d8 | 490 | #, c-format |
a0b6b246 JX |
491 | msgid "reading from '%s' beyond a symbolic link" |
492 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 493 | |
a5cd71ca | 494 | #: apply.c:3430 apply.c:3673 |
4dcdc3d8 | 495 | #, c-format |
a0b6b246 JX |
496 | msgid "path %s has been renamed/deleted" |
497 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 498 | |
a5cd71ca | 499 | #: apply.c:3516 apply.c:3688 |
4dcdc3d8 | 500 | #, c-format |
a0b6b246 JX |
501 | msgid "%s: does not exist in index" |
502 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 503 | |
a5cd71ca | 504 | #: apply.c:3525 apply.c:3696 |
4dcdc3d8 | 505 | #, c-format |
a0b6b246 JX |
506 | msgid "%s: does not match index" |
507 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 508 | |
a5cd71ca | 509 | #: apply.c:3560 |
a0b6b246 JX |
510 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
511 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 512 | |
a5cd71ca | 513 | #: apply.c:3563 |
4dcdc3d8 | 514 | #, c-format |
a0b6b246 JX |
515 | msgid "Falling back to three-way merge...\n" |
516 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 517 | |
a5cd71ca | 518 | #: apply.c:3579 apply.c:3583 |
4dcdc3d8 | 519 | #, c-format |
a0b6b246 JX |
520 | msgid "cannot read the current contents of '%s'" |
521 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 522 | |
a5cd71ca | 523 | #: apply.c:3595 |
4dcdc3d8 | 524 | #, c-format |
a0b6b246 JX |
525 | msgid "Failed to fall back on three-way merge...\n" |
526 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 527 | |
a5cd71ca | 528 | #: apply.c:3609 |
4dcdc3d8 | 529 | #, c-format |
a0b6b246 JX |
530 | msgid "Applied patch to '%s' with conflicts.\n" |
531 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 532 | |
a5cd71ca | 533 | #: apply.c:3614 |
4dcdc3d8 | 534 | #, c-format |
a0b6b246 JX |
535 | msgid "Applied patch to '%s' cleanly.\n" |
536 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 537 | |
a5cd71ca | 538 | #: apply.c:3640 |
a0b6b246 JX |
539 | msgid "removal patch leaves file contents" |
540 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 541 | |
a5cd71ca | 542 | #: apply.c:3713 |
1003b3a5 | 543 | #, c-format |
a0b6b246 JX |
544 | msgid "%s: wrong type" |
545 | msgstr "%s:错误类型" | |
1003b3a5 | 546 | |
a5cd71ca | 547 | #: apply.c:3715 |
1003b3a5 | 548 | #, c-format |
a0b6b246 JX |
549 | msgid "%s has type %o, expected %o" |
550 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 551 | |
a5cd71ca | 552 | #: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 |
d46c5519 | 553 | #: read-cache.c:1309 |
4dcdc3d8 | 554 | #, c-format |
a0b6b246 JX |
555 | msgid "invalid path '%s'" |
556 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 557 | |
a5cd71ca | 558 | #: apply.c:3924 |
4dcdc3d8 | 559 | #, c-format |
a0b6b246 JX |
560 | msgid "%s: already exists in index" |
561 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 562 | |
a5cd71ca | 563 | #: apply.c:3927 |
4dcdc3d8 | 564 | #, c-format |
a0b6b246 JX |
565 | msgid "%s: already exists in working directory" |
566 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 567 | |
a5cd71ca | 568 | #: apply.c:3947 |
1b7f4a34 | 569 | #, c-format |
a0b6b246 JX |
570 | msgid "new mode (%o) of %s does not match old mode (%o)" |
571 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 572 | |
a5cd71ca | 573 | #: apply.c:3952 |
5b04ee3b | 574 | #, c-format |
a0b6b246 JX |
575 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
576 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 577 | |
a5cd71ca | 578 | #: apply.c:3972 |
8ada9598 | 579 | #, c-format |
a0b6b246 JX |
580 | msgid "affected file '%s' is beyond a symbolic link" |
581 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 582 | |
a5cd71ca | 583 | #: apply.c:3976 |
81809b99 | 584 | #, c-format |
a0b6b246 JX |
585 | msgid "%s: patch does not apply" |
586 | msgstr "%s:补丁未应用" | |
8ada9598 | 587 | |
a5cd71ca | 588 | #: apply.c:3991 |
8ada9598 | 589 | #, c-format |
a0b6b246 | 590 | msgid "Checking patch %s..." |
06991777 | 591 | msgstr "正在检查补丁 %s..." |
8ada9598 | 592 | |
a5cd71ca | 593 | #: apply.c:4083 |
a0b6b246 JX |
594 | #, c-format |
595 | msgid "sha1 information is lacking or useless for submodule %s" | |
596 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 597 | |
a5cd71ca | 598 | #: apply.c:4090 |
8ada9598 | 599 | #, c-format |
a0b6b246 | 600 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 601 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 602 | |
a5cd71ca | 603 | #: apply.c:4093 |
a0b6b246 JX |
604 | #, c-format |
605 | msgid "sha1 information is lacking or useless (%s)." | |
606 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 607 | |
a5cd71ca | 608 | #: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 |
8ada9598 | 609 | #, c-format |
a0b6b246 JX |
610 | msgid "make_cache_entry failed for path '%s'" |
611 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
8ada9598 | 612 | |
a5cd71ca | 613 | #: apply.c:4102 |
a0b6b246 JX |
614 | #, c-format |
615 | msgid "could not add %s to temporary index" | |
616 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 617 | |
a5cd71ca | 618 | #: apply.c:4112 |
a0b6b246 JX |
619 | #, c-format |
620 | msgid "could not write temporary index to %s" | |
621 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 622 | |
a5cd71ca | 623 | #: apply.c:4250 |
a0b6b246 JX |
624 | #, c-format |
625 | msgid "unable to remove %s from index" | |
626 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 627 | |
a5cd71ca | 628 | #: apply.c:4284 |
8ada9598 | 629 | #, c-format |
a0b6b246 JX |
630 | msgid "corrupt patch for submodule %s" |
631 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 632 | |
a5cd71ca | 633 | #: apply.c:4290 |
9aeb4c2b | 634 | #, c-format |
a0b6b246 | 635 | msgid "unable to stat newly created file '%s'" |
65e2041e | 636 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 637 | |
a5cd71ca | 638 | #: apply.c:4298 |
a0b6b246 JX |
639 | #, c-format |
640 | msgid "unable to create backing store for newly created file %s" | |
641 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 642 | |
a5cd71ca | 643 | #: apply.c:4304 apply.c:4449 |
81809b99 | 644 | #, c-format |
a0b6b246 JX |
645 | msgid "unable to add cache entry for %s" |
646 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 647 | |
a5cd71ca | 648 | #: apply.c:4347 |
a0b6b246 JX |
649 | #, c-format |
650 | msgid "failed to write to '%s'" | |
c1ac5258 | 651 | msgstr "写入 '%s' 失败" |
8ada9598 | 652 | |
a5cd71ca | 653 | #: apply.c:4351 |
220c313c | 654 | #, c-format |
a0b6b246 JX |
655 | msgid "closing file '%s'" |
656 | msgstr "关闭文件 '%s'" | |
220c313c | 657 | |
a5cd71ca | 658 | #: apply.c:4421 |
c04f5ac3 | 659 | #, c-format |
a0b6b246 JX |
660 | msgid "unable to write file '%s' mode %o" |
661 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 662 | |
a5cd71ca | 663 | #: apply.c:4519 |
c04f5ac3 | 664 | #, c-format |
a0b6b246 JX |
665 | msgid "Applied patch %s cleanly." |
666 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 667 | |
a5cd71ca | 668 | #: apply.c:4527 |
a0b6b246 JX |
669 | msgid "internal error" |
670 | msgstr "内部错误" | |
c04f5ac3 | 671 | |
a5cd71ca | 672 | #: apply.c:4530 |
5c57d762 | 673 | #, c-format |
a0b6b246 JX |
674 | msgid "Applying patch %%s with %d reject..." |
675 | msgid_plural "Applying patch %%s with %d rejects..." | |
676 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
677 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 678 | |
a5cd71ca | 679 | #: apply.c:4541 |
5c57d762 | 680 | #, c-format |
a0b6b246 JX |
681 | msgid "truncating .rej filename to %.*s.rej" |
682 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 683 | |
a5cd71ca | 684 | #: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 |
220c313c | 685 | #, c-format |
a0b6b246 JX |
686 | msgid "cannot open %s" |
687 | msgstr "不能打开 %s" | |
220c313c | 688 | |
a5cd71ca | 689 | #: apply.c:4563 |
220c313c | 690 | #, c-format |
a0b6b246 JX |
691 | msgid "Hunk #%d applied cleanly." |
692 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 693 | |
a5cd71ca | 694 | #: apply.c:4567 |
5c57d762 | 695 | #, c-format |
a0b6b246 JX |
696 | msgid "Rejected hunk #%d." |
697 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 698 | |
a5cd71ca | 699 | #: apply.c:4686 |
5c57d762 | 700 | #, c-format |
a0b6b246 JX |
701 | msgid "Skipped patch '%s'." |
702 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 703 | |
a5cd71ca | 704 | #: apply.c:4694 |
a0b6b246 JX |
705 | msgid "unrecognized input" |
706 | msgstr "未能识别的输入" | |
5c57d762 | 707 | |
a5cd71ca | 708 | #: apply.c:4714 |
a0b6b246 JX |
709 | msgid "unable to read index file" |
710 | msgstr "无法读取索引文件" | |
5c57d762 | 711 | |
a5cd71ca | 712 | #: apply.c:4871 |
220c313c | 713 | #, c-format |
a0b6b246 JX |
714 | msgid "can't open patch '%s': %s" |
715 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 716 | |
a5cd71ca | 717 | #: apply.c:4898 |
5c57d762 | 718 | #, c-format |
a0b6b246 JX |
719 | msgid "squelched %d whitespace error" |
720 | msgid_plural "squelched %d whitespace errors" | |
721 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
722 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 723 | |
a5cd71ca | 724 | #: apply.c:4904 apply.c:4919 |
5c57d762 | 725 | #, c-format |
a0b6b246 JX |
726 | msgid "%d line adds whitespace errors." |
727 | msgid_plural "%d lines add whitespace errors." | |
a4f16749 JX |
728 | msgstr[0] "%d 行新增了空白字符误用。" |
729 | msgstr[1] "%d 行新增了空白字符误用。" | |
5c57d762 | 730 | |
a5cd71ca | 731 | #: apply.c:4912 |
5c57d762 | 732 | #, c-format |
a0b6b246 JX |
733 | msgid "%d line applied after fixing whitespace errors." |
734 | msgid_plural "%d lines applied after fixing whitespace errors." | |
735 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
736 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 737 | |
a5cd71ca | 738 | #: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 |
a0b6b246 JX |
739 | msgid "Unable to write new index file" |
740 | msgstr "无法写入新索引文件" | |
5c57d762 | 741 | |
a5cd71ca JX |
742 | #: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 |
743 | #: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 | |
744 | #: builtin/pull.c:209 builtin/submodule--helper.c:407 | |
a6cd2cc4 JX |
745 | #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 |
746 | #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 | |
747 | #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 | |
a0b6b246 JX |
748 | msgid "path" |
749 | msgstr "路径" | |
5c57d762 | 750 | |
a5cd71ca | 751 | #: apply.c:4956 |
a0b6b246 JX |
752 | msgid "don't apply changes matching the given path" |
753 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 754 | |
a5cd71ca | 755 | #: apply.c:4959 |
a0b6b246 JX |
756 | msgid "apply changes matching the given path" |
757 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 758 | |
a5cd71ca | 759 | #: apply.c:4961 builtin/am.c:2206 |
a0b6b246 JX |
760 | msgid "num" |
761 | msgstr "数字" | |
220c313c | 762 | |
a5cd71ca | 763 | #: apply.c:4962 |
a0b6b246 JX |
764 | msgid "remove <num> leading slashes from traditional diff paths" |
765 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 766 | |
a5cd71ca | 767 | #: apply.c:4965 |
a0b6b246 JX |
768 | msgid "ignore additions made by the patch" |
769 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 770 | |
a5cd71ca | 771 | #: apply.c:4967 |
a0b6b246 JX |
772 | msgid "instead of applying the patch, output diffstat for the input" |
773 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 774 | |
a5cd71ca | 775 | #: apply.c:4971 |
a0b6b246 JX |
776 | msgid "show number of added and deleted lines in decimal notation" |
777 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 778 | |
a5cd71ca | 779 | #: apply.c:4973 |
a0b6b246 JX |
780 | msgid "instead of applying the patch, output a summary for the input" |
781 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 782 | |
a5cd71ca | 783 | #: apply.c:4975 |
a0b6b246 JX |
784 | msgid "instead of applying the patch, see if the patch is applicable" |
785 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 786 | |
a5cd71ca | 787 | #: apply.c:4977 |
a0b6b246 JX |
788 | msgid "make sure the patch is applicable to the current index" |
789 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 790 | |
a5cd71ca | 791 | #: apply.c:4979 |
c1ac5258 JX |
792 | msgid "mark new files with `git add --intent-to-add`" |
793 | msgstr "使用命令 `git add --intent-to-add` 标记新增文件" | |
794 | ||
a5cd71ca | 795 | #: apply.c:4981 |
a0b6b246 JX |
796 | msgid "apply a patch without touching the working tree" |
797 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 798 | |
a5cd71ca | 799 | #: apply.c:4983 |
a0b6b246 JX |
800 | msgid "accept a patch that touches outside the working area" |
801 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 802 | |
a5cd71ca | 803 | #: apply.c:4986 |
a0b6b246 JX |
804 | msgid "also apply the patch (use with --stat/--summary/--check)" |
805 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 806 | |
a5cd71ca | 807 | #: apply.c:4988 |
a0b6b246 JX |
808 | msgid "attempt three-way merge if a patch does not apply" |
809 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 810 | |
a5cd71ca | 811 | #: apply.c:4990 |
a0b6b246 JX |
812 | msgid "build a temporary index based on embedded index information" |
813 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 814 | |
a5cd71ca | 815 | #: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 |
a0b6b246 JX |
816 | msgid "paths are separated with NUL character" |
817 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 818 | |
a5cd71ca | 819 | #: apply.c:4995 |
a0b6b246 JX |
820 | msgid "ensure at least <n> lines of context match" |
821 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 822 | |
a5cd71ca | 823 | #: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 |
a6cd2cc4 | 824 | #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 |
a5cd71ca | 825 | #: builtin/pack-objects.c:3310 builtin/rebase.c:1445 |
a0b6b246 JX |
826 | msgid "action" |
827 | msgstr "动作" | |
8ada9598 | 828 | |
a5cd71ca | 829 | #: apply.c:4997 |
a0b6b246 JX |
830 | msgid "detect new or modified lines that have whitespace errors" |
831 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 832 | |
a5cd71ca | 833 | #: apply.c:5000 apply.c:5003 |
a0b6b246 JX |
834 | msgid "ignore changes in whitespace when finding context" |
835 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 836 | |
a5cd71ca | 837 | #: apply.c:5006 |
a0b6b246 JX |
838 | msgid "apply the patch in reverse" |
839 | msgstr "反向应用补丁" | |
8ada9598 | 840 | |
a5cd71ca | 841 | #: apply.c:5008 |
a0b6b246 JX |
842 | msgid "don't expect at least one line of context" |
843 | msgstr "无需至少一行上下文" | |
8ada9598 | 844 | |
a5cd71ca | 845 | #: apply.c:5010 |
a0b6b246 JX |
846 | msgid "leave the rejected hunks in corresponding *.rej files" |
847 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 848 | |
a5cd71ca | 849 | #: apply.c:5012 |
a0b6b246 JX |
850 | msgid "allow overlapping hunks" |
851 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 852 | |
a5cd71ca | 853 | #: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 |
a6cd2cc4 | 854 | #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 |
a5cd71ca | 855 | #: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 |
a0b6b246 JX |
856 | msgid "be verbose" |
857 | msgstr "冗长输出" | |
8ada9598 | 858 | |
a5cd71ca | 859 | #: apply.c:5015 |
a0b6b246 JX |
860 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
861 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 862 | |
a5cd71ca | 863 | #: apply.c:5018 |
a0b6b246 JX |
864 | msgid "do not trust the line counts in the hunk headers" |
865 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 866 | |
a5cd71ca | 867 | #: apply.c:5020 builtin/am.c:2194 |
a0b6b246 JX |
868 | msgid "root" |
869 | msgstr "根目录" | |
c04f5ac3 | 870 | |
a5cd71ca | 871 | #: apply.c:5021 |
a0b6b246 JX |
872 | msgid "prepend <root> to all filenames" |
873 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 874 | |
c1ac5258 | 875 | #: archive.c:14 |
a0b6b246 JX |
876 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
877 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 878 | |
c1ac5258 | 879 | #: archive.c:15 |
a0b6b246 JX |
880 | msgid "git archive --list" |
881 | msgstr "git archive --list" | |
882 | ||
c1ac5258 | 883 | #: archive.c:16 |
c04f5ac3 | 884 | msgid "" |
a0b6b246 | 885 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 886 | msgstr "" |
a0b6b246 | 887 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 888 | |
c1ac5258 | 889 | #: archive.c:17 |
a0b6b246 JX |
890 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
891 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 892 | |
d46c5519 | 893 | #: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 |
c04f5ac3 | 894 | #, c-format |
a0b6b246 JX |
895 | msgid "pathspec '%s' did not match any files" |
896 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 897 | |
06991777 JX |
898 | #: archive.c:396 |
899 | #, c-format | |
900 | msgid "no such ref: %.*s" | |
901 | msgstr "无此引用:%.*s" | |
902 | ||
903 | #: archive.c:401 | |
904 | #, c-format | |
905 | msgid "not a valid object name: %s" | |
906 | msgstr "不是一个有效的对象名:%s" | |
907 | ||
908 | #: archive.c:414 | |
909 | #, c-format | |
910 | msgid "not a tree object: %s" | |
911 | msgstr "不是一个树对象:%s" | |
912 | ||
a6cd2cc4 | 913 | #: archive.c:426 |
06991777 JX |
914 | msgid "current working directory is untracked" |
915 | msgstr "当前工作目录未被跟踪" | |
916 | ||
a6cd2cc4 | 917 | #: archive.c:457 |
a0b6b246 JX |
918 | msgid "fmt" |
919 | msgstr "格式" | |
07432cef | 920 | |
a6cd2cc4 | 921 | #: archive.c:457 |
a0b6b246 JX |
922 | msgid "archive format" |
923 | msgstr "归档格式" | |
7aea43ff | 924 | |
a5cd71ca | 925 | #: archive.c:458 builtin/log.c:1581 |
a0b6b246 JX |
926 | msgid "prefix" |
927 | msgstr "前缀" | |
7aea43ff | 928 | |
a6cd2cc4 | 929 | #: archive.c:459 |
a0b6b246 JX |
930 | msgid "prepend prefix to each pathname in the archive" |
931 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 932 | |
a5cd71ca JX |
933 | #: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 |
934 | #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 | |
935 | #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 | |
936 | #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 | |
937 | #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 | |
938 | #: parse-options.h:186 | |
a0b6b246 JX |
939 | msgid "file" |
940 | msgstr "文件" | |
a77c07d9 | 941 | |
a6cd2cc4 | 942 | #: archive.c:461 builtin/archive.c:90 |
a0b6b246 JX |
943 | msgid "write the archive to this file" |
944 | msgstr "归档写入此文件" | |
a77c07d9 | 945 | |
a6cd2cc4 | 946 | #: archive.c:463 |
a0b6b246 JX |
947 | msgid "read .gitattributes in working directory" |
948 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 949 | |
a6cd2cc4 | 950 | #: archive.c:464 |
a0b6b246 JX |
951 | msgid "report archived files on stderr" |
952 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 953 | |
a6cd2cc4 | 954 | #: archive.c:465 |
a0b6b246 JX |
955 | msgid "store only" |
956 | msgstr "只存储" | |
7ac1c0ad | 957 | |
a6cd2cc4 | 958 | #: archive.c:466 |
a0b6b246 JX |
959 | msgid "compress faster" |
960 | msgstr "压缩速度更快" | |
8ada9598 | 961 | |
a6cd2cc4 | 962 | #: archive.c:474 |
a0b6b246 JX |
963 | msgid "compress better" |
964 | msgstr "压缩效果更好" | |
8ada9598 | 965 | |
a6cd2cc4 | 966 | #: archive.c:477 |
a0b6b246 JX |
967 | msgid "list supported archive formats" |
968 | msgstr "列出支持的归档格式" | |
a77c07d9 | 969 | |
a5cd71ca | 970 | #: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 |
a6cd2cc4 | 971 | #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 |
a0b6b246 JX |
972 | msgid "repo" |
973 | msgstr "仓库" | |
c04f5ac3 | 974 | |
a6cd2cc4 | 975 | #: archive.c:480 builtin/archive.c:92 |
a0b6b246 JX |
976 | msgid "retrieve the archive from remote repository <repo>" |
977 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 978 | |
a5cd71ca | 979 | #: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 |
06991777 | 980 | #: builtin/notes.c:498 |
a0b6b246 JX |
981 | msgid "command" |
982 | msgstr "命令" | |
983 | ||
a6cd2cc4 | 984 | #: archive.c:482 builtin/archive.c:94 |
a0b6b246 JX |
985 | msgid "path to the remote git-upload-archive command" |
986 | msgstr "远程 git-upload-archive 命令的路径" | |
987 | ||
a6cd2cc4 | 988 | #: archive.c:489 |
a0b6b246 JX |
989 | msgid "Unexpected option --remote" |
990 | msgstr "未知参数 --remote" | |
991 | ||
a6cd2cc4 | 992 | #: archive.c:491 |
a0b6b246 JX |
993 | msgid "Option --exec can only be used together with --remote" |
994 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
995 | ||
a6cd2cc4 | 996 | #: archive.c:493 |
a0b6b246 JX |
997 | msgid "Unexpected option --output" |
998 | msgstr "未知参数 --output" | |
999 | ||
a6cd2cc4 | 1000 | #: archive.c:515 |
a0b6b246 JX |
1001 | #, c-format |
1002 | msgid "Unknown archive format '%s'" | |
1003 | msgstr "未知归档格式 '%s'" | |
1004 | ||
a6cd2cc4 | 1005 | #: archive.c:522 |
8ada9598 | 1006 | #, c-format |
a0b6b246 JX |
1007 | msgid "Argument not supported for format '%s': -%d" |
1008 | msgstr "参数不支持此格式 '%s':-%d" | |
1009 | ||
4c27fcb5 | 1010 | #: archive-tar.c:125 archive-zip.c:345 |
c1ac5258 JX |
1011 | #, c-format |
1012 | msgid "cannot stream blob %s" | |
e640d114 | 1013 | msgstr "不能打开数据对象 %s" |
c1ac5258 | 1014 | |
a5cd71ca | 1015 | #: archive-tar.c:266 archive-zip.c:363 |
c1ac5258 JX |
1016 | #, c-format |
1017 | msgid "unsupported file mode: 0%o (SHA1: %s)" | |
e640d114 | 1018 | msgstr "不支持的文件模式:0%o (SHA1: %s)" |
c1ac5258 | 1019 | |
a5cd71ca | 1020 | #: archive-tar.c:293 archive-zip.c:353 |
c1ac5258 JX |
1021 | #, c-format |
1022 | msgid "cannot read %s" | |
1023 | msgstr "不能读取 %s" | |
1024 | ||
a5cd71ca | 1025 | #: archive-tar.c:465 |
c1ac5258 JX |
1026 | #, c-format |
1027 | msgid "unable to start '%s' filter" | |
1028 | msgstr "无法启动 '%s' 过滤器" | |
1029 | ||
a5cd71ca | 1030 | #: archive-tar.c:468 |
c1ac5258 JX |
1031 | msgid "unable to redirect descriptor" |
1032 | msgstr "无法重定向描述符" | |
1033 | ||
a5cd71ca | 1034 | #: archive-tar.c:475 |
c1ac5258 JX |
1035 | #, c-format |
1036 | msgid "'%s' filter reported error" | |
e640d114 | 1037 | msgstr "'%s' 过滤器报告了错误" |
c1ac5258 | 1038 | |
4c27fcb5 | 1039 | #: archive-zip.c:314 |
c1ac5258 JX |
1040 | #, c-format |
1041 | msgid "path is not valid UTF-8: %s" | |
1042 | msgstr "路径不是有效的 UTF-8:%s" | |
1043 | ||
4c27fcb5 | 1044 | #: archive-zip.c:318 |
c1ac5258 JX |
1045 | #, c-format |
1046 | msgid "path too long (%d chars, SHA1: %s): %s" | |
1047 | msgstr "路径太长(%d 字符,SHA1:%s):%s" | |
1048 | ||
a6cd2cc4 | 1049 | #: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 |
c1ac5258 JX |
1050 | #, c-format |
1051 | msgid "deflate error (%d)" | |
1052 | msgstr "压缩错误 (%d)" | |
1053 | ||
4c27fcb5 | 1054 | #: archive-zip.c:609 |
c1ac5258 JX |
1055 | #, c-format |
1056 | msgid "timestamp too large for this system: %<PRIuMAX>" | |
e640d114 | 1057 | msgstr "对于本系统时间戳太大:%<PRIuMAX>" |
c1ac5258 | 1058 | |
a5cd71ca | 1059 | #: attr.c:213 |
87cb7997 JX |
1060 | #, c-format |
1061 | msgid "%.*s is not a valid attribute name" | |
1062 | msgstr "%.*s 不是一个有效的属性名" | |
1063 | ||
a5cd71ca | 1064 | #: attr.c:370 |
06991777 JX |
1065 | #, c-format |
1066 | msgid "%s not allowed: %s:%d" | |
5b533632 | 1067 | msgstr "不允许 %s:%s:%d" |
06991777 | 1068 | |
a5cd71ca | 1069 | #: attr.c:410 |
8ada9598 | 1070 | msgid "" |
a0b6b246 JX |
1071 | "Negative patterns are ignored in git attributes\n" |
1072 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 1073 | msgstr "" |
a0b6b246 JX |
1074 | "负值模版在 git attributes 中被忽略\n" |
1075 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 1076 | |
4c27fcb5 | 1077 | #: bisect.c:468 |
8ada9598 | 1078 | #, c-format |
a0b6b246 JX |
1079 | msgid "Badly quoted content in file '%s': %s" |
1080 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 1081 | |
06991777 | 1082 | #: bisect.c:678 |
a0b6b246 JX |
1083 | #, c-format |
1084 | msgid "We cannot bisect more!\n" | |
1085 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 1086 | |
06991777 | 1087 | #: bisect.c:733 |
2e8451e8 | 1088 | #, c-format |
a0b6b246 JX |
1089 | msgid "Not a valid commit name %s" |
1090 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 1091 | |
06991777 | 1092 | #: bisect.c:758 |
5b04ee3b JX |
1093 | #, c-format |
1094 | msgid "" | |
a0b6b246 JX |
1095 | "The merge base %s is bad.\n" |
1096 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 1097 | msgstr "" |
a0b6b246 JX |
1098 | "合并基线 %s 是坏的。\n" |
1099 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 1100 | |
06991777 | 1101 | #: bisect.c:763 |
5b04ee3b | 1102 | #, c-format |
a0b6b246 JX |
1103 | msgid "" |
1104 | "The merge base %s is new.\n" | |
1105 | "The property has changed between %s and [%s].\n" | |
1106 | msgstr "" | |
1107 | "合并基线 %s 是新的。\n" | |
1108 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1109 | |
06991777 | 1110 | #: bisect.c:768 |
a0b6b246 JX |
1111 | #, c-format |
1112 | msgid "" | |
1113 | "The merge base %s is %s.\n" | |
1114 | "This means the first '%s' commit is between %s and [%s].\n" | |
1115 | msgstr "" | |
1116 | "合并基线 %s 是 %s。\n" | |
1117 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1118 | |
06991777 | 1119 | #: bisect.c:776 |
a0b6b246 JX |
1120 | #, c-format |
1121 | msgid "" | |
1a79b2f1 | 1122 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1123 | "git bisect cannot work properly in this case.\n" |
1124 | "Maybe you mistook %s and %s revs?\n" | |
1125 | msgstr "" | |
1126 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1127 | "这种情况下 git 二分查找无法正常工作。\n" | |
1128 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1129 | |
06991777 | 1130 | #: bisect.c:789 |
a0b6b246 JX |
1131 | #, c-format |
1132 | msgid "" | |
1133 | "the merge base between %s and [%s] must be skipped.\n" | |
1134 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1135 | "We continue anyway." | |
1136 | msgstr "" | |
1137 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1138 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1139 | "我们仍旧继续。" | |
649900bc | 1140 | |
06991777 | 1141 | #: bisect.c:822 |
649900bc | 1142 | #, c-format |
a0b6b246 JX |
1143 | msgid "Bisecting: a merge base must be tested\n" |
1144 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1145 | |
06991777 | 1146 | #: bisect.c:865 |
a0b6b246 JX |
1147 | #, c-format |
1148 | msgid "a %s revision is needed" | |
1149 | msgstr "需要一个 %s 版本" | |
649900bc | 1150 | |
a6cd2cc4 | 1151 | #: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 |
649900bc | 1152 | #, c-format |
a0b6b246 JX |
1153 | msgid "could not create file '%s'" |
1154 | msgstr "不能创建文件 '%s'" | |
649900bc | 1155 | |
a6cd2cc4 | 1156 | #: bisect.c:928 builtin/merge.c:148 |
649900bc | 1157 | #, c-format |
a0b6b246 JX |
1158 | msgid "could not read file '%s'" |
1159 | msgstr "不能读取文件 '%s'" | |
649900bc | 1160 | |
d46c5519 | 1161 | #: bisect.c:958 |
a0b6b246 JX |
1162 | msgid "reading bisect refs failed" |
1163 | msgstr "读取二分查找引用失败" | |
649900bc | 1164 | |
d46c5519 | 1165 | #: bisect.c:977 |
649900bc | 1166 | #, c-format |
a0b6b246 JX |
1167 | msgid "%s was both %s and %s\n" |
1168 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1169 | |
d46c5519 | 1170 | #: bisect.c:985 |
649900bc | 1171 | #, c-format |
a0b6b246 JX |
1172 | msgid "" |
1173 | "No testable commit found.\n" | |
1174 | "Maybe you started with bad path parameters?\n" | |
1175 | msgstr "" | |
1176 | "没有发现可测试的提交。\n" | |
1177 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1178 | |
d46c5519 | 1179 | #: bisect.c:1004 |
649900bc | 1180 | #, c-format |
a0b6b246 JX |
1181 | msgid "(roughly %d step)" |
1182 | msgid_plural "(roughly %d steps)" | |
1183 | msgstr[0] "(大概 %d 步)" | |
1184 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1185 | |
a4f16749 JX |
1186 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1187 | #. steps)" translation. | |
1188 | #. | |
d46c5519 | 1189 | #: bisect.c:1010 |
649900bc | 1190 | #, c-format |
a0b6b246 JX |
1191 | msgid "Bisecting: %d revision left to test after this %s\n" |
1192 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1193 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1194 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1195 | |
a5cd71ca | 1196 | #: blame.c:2700 |
a4f16749 JX |
1197 | msgid "--contents and --reverse do not blend well." |
1198 | msgstr "--contents 和 --reverse 不能混用。" | |
1199 | ||
a5cd71ca | 1200 | #: blame.c:2714 |
a4f16749 JX |
1201 | msgid "cannot use --contents with final commit object name" |
1202 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1203 | ||
a5cd71ca | 1204 | #: blame.c:2735 |
a4f16749 JX |
1205 | msgid "--reverse and --first-parent together require specified latest commit" |
1206 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1207 | ||
a5cd71ca JX |
1208 | #: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 |
1209 | #: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 | |
1210 | #: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 | |
1211 | #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 | |
fd8cb379 | 1212 | #: builtin/shortlog.c:192 |
a4f16749 JX |
1213 | msgid "revision walk setup failed" |
1214 | msgstr "版本遍历设置失败" | |
1215 | ||
a5cd71ca | 1216 | #: blame.c:2762 |
a4f16749 JX |
1217 | msgid "" |
1218 | "--reverse --first-parent together require range along first-parent chain" | |
1219 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1220 | ||
a5cd71ca | 1221 | #: blame.c:2773 |
a4f16749 JX |
1222 | #, c-format |
1223 | msgid "no such path %s in %s" | |
1224 | msgstr "在 %2$s 中无此路径 %1$s" | |
1225 | ||
a5cd71ca | 1226 | #: blame.c:2784 |
a4f16749 JX |
1227 | #, c-format |
1228 | msgid "cannot read blob %s for path %s" | |
1229 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1230 | ||
d46c5519 | 1231 | #: branch.c:53 |
649900bc | 1232 | #, c-format |
a0b6b246 JX |
1233 | msgid "" |
1234 | "\n" | |
1235 | "After fixing the error cause you may try to fix up\n" | |
1236 | "the remote tracking information by invoking\n" | |
1237 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1238 | msgstr "" | |
1239 | "\n" | |
1240 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1241 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1242 | |
d46c5519 | 1243 | #: branch.c:67 |
649900bc | 1244 | #, c-format |
a0b6b246 JX |
1245 | msgid "Not setting branch %s as its own upstream." |
1246 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1247 | |
d46c5519 | 1248 | #: branch.c:93 |
649900bc | 1249 | #, c-format |
6937cb4e JX |
1250 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1251 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1252 | |
d46c5519 | 1253 | #: branch.c:94 |
649900bc | 1254 | #, c-format |
6937cb4e JX |
1255 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1256 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1257 | |
d46c5519 | 1258 | #: branch.c:98 |
649900bc | 1259 | #, c-format |
6937cb4e JX |
1260 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1261 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1262 | |
d46c5519 | 1263 | #: branch.c:99 |
649900bc | 1264 | #, c-format |
6937cb4e | 1265 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1266 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1267 | |
d46c5519 | 1268 | #: branch.c:104 |
649900bc | 1269 | #, c-format |
6937cb4e JX |
1270 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1271 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1272 | |
d46c5519 | 1273 | #: branch.c:105 |
649900bc | 1274 | #, c-format |
6937cb4e JX |
1275 | msgid "Branch '%s' set up to track remote ref '%s'." |
1276 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1277 | |
d46c5519 | 1278 | #: branch.c:109 |
649900bc | 1279 | #, c-format |
6937cb4e JX |
1280 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1281 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1282 | |
d46c5519 | 1283 | #: branch.c:110 |
649900bc | 1284 | #, c-format |
6937cb4e JX |
1285 | msgid "Branch '%s' set up to track local ref '%s'." |
1286 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1287 | |
d46c5519 | 1288 | #: branch.c:119 |
a0b6b246 JX |
1289 | msgid "Unable to write upstream branch configuration" |
1290 | msgstr "无法写入上游分支配置" | |
649900bc | 1291 | |
d46c5519 | 1292 | #: branch.c:156 |
649900bc | 1293 | #, c-format |
a0b6b246 JX |
1294 | msgid "Not tracking: ambiguous information for ref %s" |
1295 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1296 | |
d46c5519 | 1297 | #: branch.c:189 |
649900bc | 1298 | #, c-format |
a0b6b246 JX |
1299 | msgid "'%s' is not a valid branch name." |
1300 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1301 | |
d46c5519 | 1302 | #: branch.c:208 |
649900bc | 1303 | #, c-format |
a0b6b246 JX |
1304 | msgid "A branch named '%s' already exists." |
1305 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1306 | |
d46c5519 | 1307 | #: branch.c:213 |
a0b6b246 JX |
1308 | msgid "Cannot force update the current branch." |
1309 | msgstr "无法强制更新当前分支。" | |
649900bc | 1310 | |
d46c5519 | 1311 | #: branch.c:233 |
649900bc | 1312 | #, c-format |
a0b6b246 JX |
1313 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1314 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1315 | |
d46c5519 | 1316 | #: branch.c:235 |
649900bc | 1317 | #, c-format |
a0b6b246 JX |
1318 | msgid "the requested upstream branch '%s' does not exist" |
1319 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1320 | |
d46c5519 | 1321 | #: branch.c:237 |
a0b6b246 JX |
1322 | msgid "" |
1323 | "\n" | |
1324 | "If you are planning on basing your work on an upstream\n" | |
1325 | "branch that already exists at the remote, you may need to\n" | |
1326 | "run \"git fetch\" to retrieve it.\n" | |
1327 | "\n" | |
1328 | "If you are planning to push out a new local branch that\n" | |
1329 | "will track its remote counterpart, you may want to use\n" | |
1330 | "\"git push -u\" to set the upstream config as you push." | |
1331 | msgstr "" | |
1332 | "\n" | |
1333 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1334 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1335 | "\n" | |
1336 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1337 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1338 | |
d46c5519 | 1339 | #: branch.c:281 |
649900bc | 1340 | #, c-format |
a0b6b246 JX |
1341 | msgid "Not a valid object name: '%s'." |
1342 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1343 | |
d46c5519 | 1344 | #: branch.c:301 |
649900bc | 1345 | #, c-format |
a0b6b246 JX |
1346 | msgid "Ambiguous object name: '%s'." |
1347 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1348 | |
d46c5519 | 1349 | #: branch.c:306 |
649900bc | 1350 | #, c-format |
a0b6b246 JX |
1351 | msgid "Not a valid branch point: '%s'." |
1352 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1353 | |
a6cd2cc4 | 1354 | #: branch.c:364 |
649900bc | 1355 | #, c-format |
a0b6b246 JX |
1356 | msgid "'%s' is already checked out at '%s'" |
1357 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1358 | |
a6cd2cc4 | 1359 | #: branch.c:387 |
a0b6b246 JX |
1360 | #, c-format |
1361 | msgid "HEAD of working tree %s is not updated" | |
1362 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1363 | |
c1ac5258 | 1364 | #: bundle.c:36 |
649900bc | 1365 | #, c-format |
a0b6b246 JX |
1366 | msgid "'%s' does not look like a v2 bundle file" |
1367 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1368 | |
c1ac5258 | 1369 | #: bundle.c:64 |
a0b6b246 JX |
1370 | #, c-format |
1371 | msgid "unrecognized header: %s%s (%d)" | |
1372 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1373 | |
a5cd71ca | 1374 | #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 |
a6cd2cc4 | 1375 | #: builtin/commit.c:791 |
649900bc | 1376 | #, c-format |
a0b6b246 JX |
1377 | msgid "could not open '%s'" |
1378 | msgstr "不能打开 '%s'" | |
649900bc | 1379 | |
06991777 | 1380 | #: bundle.c:143 |
a0b6b246 JX |
1381 | msgid "Repository lacks these prerequisite commits:" |
1382 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1383 | |
a6cd2cc4 JX |
1384 | #: bundle.c:146 |
1385 | msgid "need a repository to verify a bundle" | |
1386 | msgstr "需要一个仓库来校验一个包" | |
1387 | ||
1388 | #: bundle.c:197 | |
2e8451e8 | 1389 | #, c-format |
a0b6b246 JX |
1390 | msgid "The bundle contains this ref:" |
1391 | msgid_plural "The bundle contains these %d refs:" | |
1392 | msgstr[0] "这个包中含有这个引用:" | |
1393 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1394 | |
a6cd2cc4 | 1395 | #: bundle.c:204 |
a0b6b246 JX |
1396 | msgid "The bundle records a complete history." |
1397 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1398 | |
a6cd2cc4 | 1399 | #: bundle.c:206 |
2e8451e8 | 1400 | #, c-format |
a0b6b246 JX |
1401 | msgid "The bundle requires this ref:" |
1402 | msgid_plural "The bundle requires these %d refs:" | |
1403 | msgstr[0] "这个包需要这个引用:" | |
1404 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1405 | |
a6cd2cc4 | 1406 | #: bundle.c:272 |
4c27fcb5 JX |
1407 | msgid "unable to dup bundle descriptor" |
1408 | msgstr "无法复制 bundle 描述符" | |
1409 | ||
a6cd2cc4 | 1410 | #: bundle.c:279 |
a0b6b246 JX |
1411 | msgid "Could not spawn pack-objects" |
1412 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1413 | |
a6cd2cc4 | 1414 | #: bundle.c:290 |
a0b6b246 JX |
1415 | msgid "pack-objects died" |
1416 | msgstr "pack-objects 终止" | |
8ada9598 | 1417 | |
a6cd2cc4 | 1418 | #: bundle.c:332 |
a0b6b246 JX |
1419 | msgid "rev-list died" |
1420 | msgstr "rev-list 终止" | |
1421 | ||
a6cd2cc4 | 1422 | #: bundle.c:381 |
81809b99 | 1423 | #, c-format |
a0b6b246 JX |
1424 | msgid "ref '%s' is excluded by the rev-list options" |
1425 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1426 | |
a5cd71ca | 1427 | #: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 |
81809b99 | 1428 | #, c-format |
a0b6b246 JX |
1429 | msgid "unrecognized argument: %s" |
1430 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1431 | |
a6cd2cc4 | 1432 | #: bundle.c:468 |
a0b6b246 JX |
1433 | msgid "Refusing to create empty bundle." |
1434 | msgstr "不能创建空包。" | |
1435 | ||
a6cd2cc4 | 1436 | #: bundle.c:478 |
81809b99 | 1437 | #, c-format |
a0b6b246 JX |
1438 | msgid "cannot create '%s'" |
1439 | msgstr "不能创建 '%s'" | |
8ada9598 | 1440 | |
a6cd2cc4 | 1441 | #: bundle.c:503 |
a0b6b246 JX |
1442 | msgid "index-pack died" |
1443 | msgstr "index-pack 终止" | |
63af42fe | 1444 | |
31e5e17b | 1445 | #: color.c:296 |
94550ed3 | 1446 | #, c-format |
a0b6b246 JX |
1447 | msgid "invalid color value: %.*s" |
1448 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1449 | |
a5cd71ca JX |
1450 | #: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 |
1451 | #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 | |
94550ed3 | 1452 | #, c-format |
a0b6b246 JX |
1453 | msgid "could not parse %s" |
1454 | msgstr "不能解析 %s" | |
94550ed3 | 1455 | |
4c27fcb5 | 1456 | #: commit.c:52 |
a0b6b246 JX |
1457 | #, c-format |
1458 | msgid "%s %s is not a commit!" | |
31e5e17b | 1459 | msgstr "%s %s 不是一个提交!" |
90314792 | 1460 | |
a6cd2cc4 | 1461 | #: commit.c:192 |
fd8cb379 JX |
1462 | msgid "" |
1463 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
1464 | "and will be removed in a future Git version.\n" | |
1465 | "\n" | |
1466 | "Please use \"git replace --convert-graft-file\"\n" | |
1467 | "to convert the grafts into replace refs.\n" | |
1468 | "\n" | |
1469 | "Turn this message off by running\n" | |
1470 | "\"git config advice.graftFileDeprecated false\"" | |
1471 | msgstr "" | |
1472 | "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n" | |
1473 | "未来的Git版本中被移除。\n" | |
1474 | "\n" | |
1475 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
1476 | "grafts 转换为替换引用。\n" | |
1477 | "\n" | |
1478 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
1479 | "可关闭本消息" | |
1480 | ||
a5cd71ca | 1481 | #: commit.c:1128 |
4c27fcb5 JX |
1482 | #, c-format |
1483 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
1484 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
1485 | ||
a5cd71ca | 1486 | #: commit.c:1131 |
4c27fcb5 JX |
1487 | #, c-format |
1488 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
1489 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
1490 | ||
a5cd71ca | 1491 | #: commit.c:1134 |
4c27fcb5 JX |
1492 | #, c-format |
1493 | msgid "Commit %s does not have a GPG signature." | |
1494 | msgstr "提交 %s 没有 GPG 签名。" | |
1495 | ||
a5cd71ca | 1496 | #: commit.c:1137 |
4c27fcb5 JX |
1497 | #, c-format |
1498 | msgid "Commit %s has a good GPG signature by %s\n" | |
1499 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
1500 | ||
a5cd71ca | 1501 | #: commit.c:1391 |
90314792 | 1502 | msgid "" |
a0b6b246 JX |
1503 | "Warning: commit message did not conform to UTF-8.\n" |
1504 | "You may want to amend it after fixing the message, or set the config\n" | |
1505 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1506 | msgstr "" | |
29004bbb | 1507 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1508 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1509 | "设置为您项目所用的字符编码。\n" |
90314792 | 1510 | |
a6cd2cc4 | 1511 | #: commit-graph.c:127 |
d46c5519 JX |
1512 | msgid "commit-graph file is too small" |
1513 | msgstr "提交图形文件太小" | |
c1ac5258 | 1514 | |
a6cd2cc4 | 1515 | #: commit-graph.c:192 |
c1ac5258 | 1516 | #, c-format |
d46c5519 JX |
1517 | msgid "commit-graph signature %X does not match signature %X" |
1518 | msgstr "提交图形签名 %X 和签名 %X 不匹配" | |
c1ac5258 | 1519 | |
a6cd2cc4 | 1520 | #: commit-graph.c:199 |
c1ac5258 | 1521 | #, c-format |
d46c5519 JX |
1522 | msgid "commit-graph version %X does not match version %X" |
1523 | msgstr "提交图形版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 1524 | |
a6cd2cc4 | 1525 | #: commit-graph.c:206 |
c1ac5258 | 1526 | #, c-format |
d46c5519 JX |
1527 | msgid "commit-graph hash version %X does not match version %X" |
1528 | msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 1529 | |
a6cd2cc4 | 1530 | #: commit-graph.c:229 |
d46c5519 JX |
1531 | msgid "commit-graph chunk lookup table entry missing; file may be incomplete" |
1532 | msgstr "提交图形块查找表条目丢失,文件可能不完整" | |
06991777 | 1533 | |
a6cd2cc4 | 1534 | #: commit-graph.c:240 |
c1ac5258 | 1535 | #, c-format |
d46c5519 JX |
1536 | msgid "commit-graph improper chunk offset %08x%08x" |
1537 | msgstr "提交图形不正确的块偏移 %08x%08x" | |
c1ac5258 | 1538 | |
a6cd2cc4 | 1539 | #: commit-graph.c:283 |
c1ac5258 | 1540 | #, c-format |
d46c5519 JX |
1541 | msgid "commit-graph chunk id %08x appears multiple times" |
1542 | msgstr "提交图形块 id %08x 出现了多次" | |
c1ac5258 | 1543 | |
a6cd2cc4 JX |
1544 | #: commit-graph.c:347 |
1545 | msgid "commit-graph has no base graphs chunk" | |
1546 | msgstr "提交图形没有基础图形块" | |
1547 | ||
1548 | #: commit-graph.c:357 | |
1549 | msgid "commit-graph chain does not match" | |
1550 | msgstr "提交图形链不匹配" | |
1551 | ||
1552 | #: commit-graph.c:404 | |
1553 | #, c-format | |
1554 | msgid "invalid commit-graph chain: line '%s' not a hash" | |
1555 | msgstr "无效的提交图形链:行 '%s' 不是一个哈希值" | |
1556 | ||
1557 | #: commit-graph.c:430 | |
1558 | msgid "unable to find all commit-graph files" | |
1559 | msgstr "无法找到所有提交图形文件" | |
1560 | ||
a5cd71ca | 1561 | #: commit-graph.c:561 commit-graph.c:621 |
a6cd2cc4 JX |
1562 | msgid "invalid commit position. commit-graph is likely corrupt" |
1563 | msgstr "无效的提交位置。提交图形可能已损坏" | |
1564 | ||
a5cd71ca | 1565 | #: commit-graph.c:582 |
c1ac5258 JX |
1566 | #, c-format |
1567 | msgid "could not find commit %s" | |
1568 | msgstr "无法找到提交 %s" | |
1569 | ||
a5cd71ca JX |
1570 | #: commit-graph.c:855 builtin/am.c:1287 |
1571 | #, c-format | |
1572 | msgid "unable to parse commit %s" | |
1573 | msgstr "不能解析提交 %s" | |
1574 | ||
1575 | #: commit-graph.c:859 | |
1576 | #, c-format | |
1577 | msgid "unable to get tree for %s" | |
1578 | msgstr "无法得到 %s 的树对象" | |
1579 | ||
1580 | #: commit-graph.c:1017 builtin/pack-objects.c:2641 | |
c1ac5258 JX |
1581 | #, c-format |
1582 | msgid "unable to get type of object %s" | |
1583 | msgstr "无法获得对象 %s 类型" | |
1584 | ||
a5cd71ca | 1585 | #: commit-graph.c:1049 |
06991777 JX |
1586 | msgid "Loading known commits in commit graph" |
1587 | msgstr "正在加载提交图中的已知提交" | |
1588 | ||
a5cd71ca | 1589 | #: commit-graph.c:1066 |
06991777 JX |
1590 | msgid "Expanding reachable commits in commit graph" |
1591 | msgstr "正在扩展提交图中的可达提交" | |
1592 | ||
a5cd71ca | 1593 | #: commit-graph.c:1085 |
06991777 JX |
1594 | msgid "Clearing commit marks in commit graph" |
1595 | msgstr "正在清除提交图中的提交标记" | |
4c27fcb5 | 1596 | |
a5cd71ca | 1597 | #: commit-graph.c:1104 |
4c27fcb5 JX |
1598 | msgid "Computing commit graph generation numbers" |
1599 | msgstr "正在计算提交图世代数字" | |
1600 | ||
a5cd71ca | 1601 | #: commit-graph.c:1179 |
06991777 JX |
1602 | #, c-format |
1603 | msgid "Finding commits for commit graph in %d pack" | |
1604 | msgid_plural "Finding commits for commit graph in %d packs" | |
1605 | msgstr[0] "正在 %d 个包中查找提交图的提交" | |
1606 | msgstr[1] "正在 %d 个包中查找提交图的提交" | |
4c27fcb5 | 1607 | |
a5cd71ca | 1608 | #: commit-graph.c:1192 |
c1ac5258 JX |
1609 | #, c-format |
1610 | msgid "error adding pack %s" | |
1611 | msgstr "添加包 %s 出错" | |
1612 | ||
a5cd71ca | 1613 | #: commit-graph.c:1196 |
c1ac5258 JX |
1614 | #, c-format |
1615 | msgid "error opening index for %s" | |
1616 | msgstr "为 %s 打开索引出错" | |
1617 | ||
a5cd71ca | 1618 | #: commit-graph.c:1220 |
06991777 JX |
1619 | #, c-format |
1620 | msgid "Finding commits for commit graph from %d ref" | |
1621 | msgid_plural "Finding commits for commit graph from %d refs" | |
1622 | msgstr[0] "正在从 %d 个引用中查找提交图的提交" | |
1623 | msgstr[1] "正在从 %d 个引用中查找提交图的提交" | |
1624 | ||
a5cd71ca JX |
1625 | #: commit-graph.c:1240 |
1626 | #, c-format | |
1627 | msgid "invalid commit object id: %s" | |
1628 | msgstr "无效的提交对象 ID:%s" | |
1629 | ||
1630 | #: commit-graph.c:1255 | |
06991777 JX |
1631 | msgid "Finding commits for commit graph among packed objects" |
1632 | msgstr "正在打包对象中查找提交图的提交" | |
1633 | ||
a5cd71ca | 1634 | #: commit-graph.c:1270 |
06991777 | 1635 | msgid "Counting distinct commits in commit graph" |
8e4e0555 | 1636 | msgstr "正在计算提交图中不同的提交" |
06991777 | 1637 | |
a5cd71ca | 1638 | #: commit-graph.c:1300 |
06991777 | 1639 | msgid "Finding extra edges in commit graph" |
8e4e0555 | 1640 | msgstr "正在查找提交图中额外的边" |
06991777 | 1641 | |
a5cd71ca | 1642 | #: commit-graph.c:1346 |
a6cd2cc4 JX |
1643 | msgid "failed to write correct number of base graph ids" |
1644 | msgstr "无法写入正确数量的基础图形 ID" | |
fd8cb379 | 1645 | |
a5cd71ca | 1646 | #: commit-graph.c:1379 midx.c:810 |
fd8cb379 | 1647 | #, c-format |
c1ac5258 JX |
1648 | msgid "unable to create leading directories of %s" |
1649 | msgstr "不能为 %s 创建先导目录" | |
1650 | ||
a5cd71ca | 1651 | #: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 |
a6cd2cc4 JX |
1652 | #, c-format |
1653 | msgid "unable to create '%s'" | |
1654 | msgstr "不能创建 '%s'" | |
1655 | ||
a5cd71ca | 1656 | #: commit-graph.c:1451 |
06991777 JX |
1657 | #, c-format |
1658 | msgid "Writing out commit graph in %d pass" | |
1659 | msgid_plural "Writing out commit graph in %d passes" | |
8e4e0555 FZ |
1660 | msgstr[0] "正在用 %d 步写出提交图" |
1661 | msgstr[1] "正在用 %d 步写出提交图" | |
06991777 | 1662 | |
a5cd71ca | 1663 | #: commit-graph.c:1492 |
a6cd2cc4 JX |
1664 | msgid "unable to open commit-graph chain file" |
1665 | msgstr "无法打开提交图形链文件" | |
1666 | ||
a5cd71ca | 1667 | #: commit-graph.c:1504 |
a6cd2cc4 JX |
1668 | msgid "failed to rename base commit-graph file" |
1669 | msgstr "无法重命名基础提交图形文件" | |
1670 | ||
a5cd71ca | 1671 | #: commit-graph.c:1524 |
a6cd2cc4 JX |
1672 | msgid "failed to rename temporary commit-graph file" |
1673 | msgstr "无法重命名临时提交图形文件" | |
1674 | ||
a5cd71ca | 1675 | #: commit-graph.c:1635 |
a6cd2cc4 JX |
1676 | msgid "Scanning merged commits" |
1677 | msgstr "正在扫描合并提交" | |
1678 | ||
a5cd71ca | 1679 | #: commit-graph.c:1646 |
a6cd2cc4 JX |
1680 | #, c-format |
1681 | msgid "unexpected duplicate commit id %s" | |
1682 | msgstr "意外的重复提交 ID %s" | |
1683 | ||
a5cd71ca | 1684 | #: commit-graph.c:1670 |
a6cd2cc4 JX |
1685 | msgid "Merging commit-graph" |
1686 | msgstr "正在合并提交图形" | |
1687 | ||
a5cd71ca | 1688 | #: commit-graph.c:1860 |
a6cd2cc4 JX |
1689 | #, c-format |
1690 | msgid "the commit graph format cannot write %d commits" | |
1691 | msgstr "提交图格式不能写入 %d 个提交" | |
1692 | ||
a5cd71ca | 1693 | #: commit-graph.c:1871 |
a6cd2cc4 JX |
1694 | msgid "too many commits to write graph" |
1695 | msgstr "提交太多不能画图" | |
1696 | ||
a5cd71ca | 1697 | #: commit-graph.c:1961 |
c1ac5258 | 1698 | msgid "the commit-graph file has incorrect checksum and is likely corrupt" |
4c27fcb5 JX |
1699 | msgstr "提交图文件的校验码错误,可能已经损坏" |
1700 | ||
a5cd71ca | 1701 | #: commit-graph.c:1971 |
d46c5519 JX |
1702 | #, c-format |
1703 | msgid "commit-graph has incorrect OID order: %s then %s" | |
5b533632 | 1704 | msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" |
d46c5519 | 1705 | |
a5cd71ca | 1706 | #: commit-graph.c:1981 commit-graph.c:1996 |
d46c5519 JX |
1707 | #, c-format |
1708 | msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" | |
1709 | msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" | |
1710 | ||
a5cd71ca | 1711 | #: commit-graph.c:1988 |
d46c5519 JX |
1712 | #, c-format |
1713 | msgid "failed to parse commit %s from commit-graph" | |
1714 | msgstr "无法从提交图形中解析提交 %s" | |
1715 | ||
a5cd71ca | 1716 | #: commit-graph.c:2006 |
4c27fcb5 | 1717 | msgid "Verifying commits in commit graph" |
8e4e0555 | 1718 | msgstr "正在校验提交图中的提交" |
fd8cb379 | 1719 | |
a5cd71ca | 1720 | #: commit-graph.c:2020 |
d46c5519 JX |
1721 | #, c-format |
1722 | msgid "failed to parse commit %s from object database for commit-graph" | |
1723 | msgstr "无法从提交图形的对象库中解析提交 %s" | |
1724 | ||
a5cd71ca | 1725 | #: commit-graph.c:2027 |
d46c5519 JX |
1726 | #, c-format |
1727 | msgid "root tree OID for commit %s in commit-graph is %s != %s" | |
5b533632 | 1728 | msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" |
d46c5519 | 1729 | |
a5cd71ca | 1730 | #: commit-graph.c:2037 |
d46c5519 JX |
1731 | #, c-format |
1732 | msgid "commit-graph parent list for commit %s is too long" | |
1733 | msgstr "提交 %s 的提交图形父提交列表太长了" | |
1734 | ||
a5cd71ca | 1735 | #: commit-graph.c:2046 |
d46c5519 JX |
1736 | #, c-format |
1737 | msgid "commit-graph parent for %s is %s != %s" | |
1738 | msgstr "%s 的提交图形父提交是 %s != %s" | |
1739 | ||
a5cd71ca | 1740 | #: commit-graph.c:2059 |
d46c5519 JX |
1741 | #, c-format |
1742 | msgid "commit-graph parent list for commit %s terminates early" | |
1743 | msgstr "提交 %s 的提交图形父提交列表过早终止" | |
1744 | ||
a5cd71ca | 1745 | #: commit-graph.c:2064 |
d46c5519 JX |
1746 | #, c-format |
1747 | msgid "" | |
1748 | "commit-graph has generation number zero for commit %s, but non-zero elsewhere" | |
1749 | msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" | |
1750 | ||
a5cd71ca | 1751 | #: commit-graph.c:2068 |
d46c5519 JX |
1752 | #, c-format |
1753 | msgid "" | |
1754 | "commit-graph has non-zero generation number for commit %s, but zero elsewhere" | |
1755 | msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" | |
1756 | ||
a5cd71ca | 1757 | #: commit-graph.c:2083 |
d46c5519 JX |
1758 | #, c-format |
1759 | msgid "commit-graph generation for commit %s is %u != %u" | |
1760 | msgstr "提交图形中的提交 %s 的世代号是 %u != %u" | |
1761 | ||
a5cd71ca | 1762 | #: commit-graph.c:2089 |
d46c5519 JX |
1763 | #, c-format |
1764 | msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" | |
1765 | msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" | |
1766 | ||
06991777 | 1767 | #: compat/obstack.c:406 compat/obstack.c:408 |
a0b6b246 JX |
1768 | msgid "memory exhausted" |
1769 | msgstr "内存耗尽" | |
90314792 | 1770 | |
a6cd2cc4 | 1771 | #: config.c:124 |
c1ac5258 JX |
1772 | #, c-format |
1773 | msgid "" | |
1774 | "exceeded maximum include depth (%d) while including\n" | |
1775 | "\t%s\n" | |
1776 | "from\n" | |
1777 | "\t%s\n" | |
1778 | "This might be due to circular includes." | |
1779 | msgstr "" | |
e640d114 | 1780 | "超过了最大包含深度(%1$d),当从\n" |
c1ac5258 JX |
1781 | "\t%3$s\n" |
1782 | "包含\n" | |
1783 | "\t%2$s\n" | |
e640d114 | 1784 | "这可能是因为循环包含。" |
c1ac5258 | 1785 | |
a6cd2cc4 | 1786 | #: config.c:140 |
c1ac5258 JX |
1787 | #, c-format |
1788 | msgid "could not expand include path '%s'" | |
1789 | msgstr "无法扩展包含路径 '%s'" | |
1790 | ||
a6cd2cc4 | 1791 | #: config.c:151 |
c1ac5258 JX |
1792 | msgid "relative config includes must come from files" |
1793 | msgstr "相对路径的配置文件引用必须来自于文件" | |
1794 | ||
a6cd2cc4 | 1795 | #: config.c:197 |
87cb7997 | 1796 | msgid "relative config include conditionals must come from files" |
c1ac5258 JX |
1797 | msgstr "相对路径的配置文件条件引用必须来自于文件" |
1798 | ||
a6cd2cc4 | 1799 | #: config.c:376 |
c1ac5258 JX |
1800 | #, c-format |
1801 | msgid "key does not contain a section: %s" | |
1802 | msgstr "键名没有包含一个小节名称:%s" | |
87cb7997 | 1803 | |
a6cd2cc4 | 1804 | #: config.c:382 |
c1ac5258 JX |
1805 | #, c-format |
1806 | msgid "key does not contain variable name: %s" | |
1807 | msgstr "键名没有包含变量名:%s" | |
1808 | ||
a5cd71ca | 1809 | #: config.c:406 sequencer.c:2401 |
c1ac5258 JX |
1810 | #, c-format |
1811 | msgid "invalid key: %s" | |
1812 | msgstr "无效键名:%s" | |
1813 | ||
a6cd2cc4 | 1814 | #: config.c:412 |
c1ac5258 JX |
1815 | #, c-format |
1816 | msgid "invalid key (newline): %s" | |
1817 | msgstr "无效键名(有换行符):%s" | |
1818 | ||
a6cd2cc4 | 1819 | #: config.c:448 config.c:460 |
c1ac5258 JX |
1820 | #, c-format |
1821 | msgid "bogus config parameter: %s" | |
1822 | msgstr "伪配置参数:%s" | |
1823 | ||
a6cd2cc4 | 1824 | #: config.c:495 |
c1ac5258 JX |
1825 | #, c-format |
1826 | msgid "bogus format in %s" | |
1827 | msgstr "%s 中格式错误" | |
1828 | ||
a6cd2cc4 | 1829 | #: config.c:821 |
90314792 | 1830 | #, c-format |
a0b6b246 JX |
1831 | msgid "bad config line %d in blob %s" |
1832 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1833 | |
a6cd2cc4 | 1834 | #: config.c:825 |
a77c07d9 | 1835 | #, c-format |
a0b6b246 JX |
1836 | msgid "bad config line %d in file %s" |
1837 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1838 | |
a6cd2cc4 | 1839 | #: config.c:829 |
a77c07d9 | 1840 | #, c-format |
a0b6b246 JX |
1841 | msgid "bad config line %d in standard input" |
1842 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1843 | |
a6cd2cc4 | 1844 | #: config.c:833 |
90314792 | 1845 | #, c-format |
a0b6b246 JX |
1846 | msgid "bad config line %d in submodule-blob %s" |
1847 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1848 | |
a6cd2cc4 | 1849 | #: config.c:837 |
90314792 | 1850 | #, c-format |
a0b6b246 JX |
1851 | msgid "bad config line %d in command line %s" |
1852 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1853 | |
a6cd2cc4 | 1854 | #: config.c:841 |
90314792 | 1855 | #, c-format |
a0b6b246 JX |
1856 | msgid "bad config line %d in %s" |
1857 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1858 | |
a6cd2cc4 | 1859 | #: config.c:978 |
a0b6b246 JX |
1860 | msgid "out of range" |
1861 | msgstr "超出范围" | |
6c94aba5 | 1862 | |
a6cd2cc4 | 1863 | #: config.c:978 |
a0b6b246 JX |
1864 | msgid "invalid unit" |
1865 | msgstr "无效的单位" | |
6c94aba5 | 1866 | |
a6cd2cc4 | 1867 | #: config.c:979 |
6c94aba5 | 1868 | #, c-format |
a0b6b246 JX |
1869 | msgid "bad numeric config value '%s' for '%s': %s" |
1870 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1871 | |
a6cd2cc4 | 1872 | #: config.c:998 |
1b7f4a34 | 1873 | #, c-format |
a0b6b246 JX |
1874 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1875 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1876 | |
a6cd2cc4 | 1877 | #: config.c:1001 |
1b7f4a34 | 1878 | #, c-format |
a0b6b246 JX |
1879 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1880 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1881 | |
a6cd2cc4 | 1882 | #: config.c:1004 |
1b7f4a34 | 1883 | #, c-format |
a0b6b246 JX |
1884 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1885 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1886 | |
a6cd2cc4 | 1887 | #: config.c:1007 |
1b7f4a34 | 1888 | #, c-format |
a0b6b246 JX |
1889 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1890 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1891 | |
a6cd2cc4 | 1892 | #: config.c:1010 |
94550ed3 | 1893 | #, c-format |
a0b6b246 JX |
1894 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1895 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1896 | |
a6cd2cc4 | 1897 | #: config.c:1013 |
276ceeaa | 1898 | #, c-format |
a0b6b246 JX |
1899 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1900 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1901 | |
a6cd2cc4 | 1902 | #: config.c:1108 |
276ceeaa | 1903 | #, c-format |
a0b6b246 | 1904 | msgid "failed to expand user dir in: '%s'" |
c1ac5258 | 1905 | msgstr "无法扩展用户目录:'%s'" |
94550ed3 | 1906 | |
a6cd2cc4 | 1907 | #: config.c:1117 |
5809aa05 JX |
1908 | #, c-format |
1909 | msgid "'%s' for '%s' is not a valid timestamp" | |
1910 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
1911 | ||
a6cd2cc4 | 1912 | #: config.c:1208 |
c1ac5258 JX |
1913 | #, c-format |
1914 | msgid "abbrev length out of range: %d" | |
1915 | msgstr "缩写长度超出范围:%d" | |
1916 | ||
a6cd2cc4 | 1917 | #: config.c:1222 config.c:1233 |
3495628d | 1918 | #, c-format |
a0b6b246 JX |
1919 | msgid "bad zlib compression level %d" |
1920 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1921 | |
a6cd2cc4 | 1922 | #: config.c:1325 |
c1ac5258 JX |
1923 | msgid "core.commentChar should only be one character" |
1924 | msgstr "core.commentChar 应该是一个字符" | |
1925 | ||
a6cd2cc4 | 1926 | #: config.c:1358 |
3495628d | 1927 | #, c-format |
a0b6b246 JX |
1928 | msgid "invalid mode for object creation: %s" |
1929 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1930 | |
a5cd71ca | 1931 | #: config.c:1425 |
c1ac5258 JX |
1932 | #, c-format |
1933 | msgid "malformed value for %s" | |
1934 | msgstr "%s 的取值格式错误" | |
1935 | ||
a5cd71ca | 1936 | #: config.c:1451 |
c1ac5258 JX |
1937 | #, c-format |
1938 | msgid "malformed value for %s: %s" | |
1939 | msgstr "%s 的取值格式错误:%s" | |
1940 | ||
a5cd71ca | 1941 | #: config.c:1452 |
c1ac5258 JX |
1942 | msgid "must be one of nothing, matching, simple, upstream or current" |
1943 | msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" | |
1944 | ||
a5cd71ca | 1945 | #: config.c:1513 builtin/pack-objects.c:3394 |
1a79b2f1 JX |
1946 | #, c-format |
1947 | msgid "bad pack compression level %d" | |
1948 | msgstr "错误的打包压缩级别 %d" | |
1949 | ||
a5cd71ca | 1950 | #: config.c:1634 |
c1ac5258 JX |
1951 | #, c-format |
1952 | msgid "unable to load config blob object '%s'" | |
1953 | msgstr "无法从数据对象 '%s' 加载配置" | |
1954 | ||
a5cd71ca | 1955 | #: config.c:1637 |
c1ac5258 JX |
1956 | #, c-format |
1957 | msgid "reference '%s' does not point to a blob" | |
1958 | msgstr "引用 '%s' 没有指向一个数据对象" | |
1959 | ||
a5cd71ca | 1960 | #: config.c:1654 |
c1ac5258 JX |
1961 | #, c-format |
1962 | msgid "unable to resolve config blob '%s'" | |
1963 | msgstr "不能解析配置对象 '%s'" | |
1964 | ||
a5cd71ca | 1965 | #: config.c:1684 |
c1ac5258 JX |
1966 | #, c-format |
1967 | msgid "failed to parse %s" | |
1968 | msgstr "解析 %s 失败" | |
1969 | ||
a5cd71ca | 1970 | #: config.c:1740 |
a0b6b246 JX |
1971 | msgid "unable to parse command-line config" |
1972 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1973 | |
a5cd71ca | 1974 | #: config.c:2091 |
a0b6b246 JX |
1975 | msgid "unknown error occurred while reading the configuration files" |
1976 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1977 | |
a5cd71ca | 1978 | #: config.c:2261 |
87cb7997 JX |
1979 | #, c-format |
1980 | msgid "Invalid %s: '%s'" | |
1981 | msgstr "无效 %s:'%s'" | |
1982 | ||
a5cd71ca | 1983 | #: config.c:2306 |
87cb7997 JX |
1984 | #, c-format |
1985 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1986 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1987 | ||
a5cd71ca | 1988 | #: config.c:2352 |
276ceeaa | 1989 | #, c-format |
a0b6b246 JX |
1990 | msgid "unable to parse '%s' from command-line config" |
1991 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1992 | |
a5cd71ca | 1993 | #: config.c:2354 |
94550ed3 | 1994 | #, c-format |
a0b6b246 JX |
1995 | msgid "bad config variable '%s' in file '%s' at line %d" |
1996 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1997 | |
a5cd71ca | 1998 | #: config.c:2435 |
c1ac5258 JX |
1999 | #, c-format |
2000 | msgid "invalid section name '%s'" | |
2001 | msgstr "无效的小节名称 '%s'" | |
2002 | ||
a5cd71ca | 2003 | #: config.c:2467 |
276ceeaa | 2004 | #, c-format |
a0b6b246 JX |
2005 | msgid "%s has multiple values" |
2006 | msgstr "%s 有多个取值" | |
276ceeaa | 2007 | |
a5cd71ca | 2008 | #: config.c:2496 |
c1ac5258 JX |
2009 | #, c-format |
2010 | msgid "failed to write new configuration file %s" | |
2011 | msgstr "写入新的配置文件 %s 失败" | |
2012 | ||
a5cd71ca | 2013 | #: config.c:2748 config.c:3072 |
c1ac5258 JX |
2014 | #, c-format |
2015 | msgid "could not lock config file %s" | |
2016 | msgstr "不能锁定配置文件 %s" | |
2017 | ||
a5cd71ca | 2018 | #: config.c:2759 |
c1ac5258 JX |
2019 | #, c-format |
2020 | msgid "opening %s" | |
2021 | msgstr "打开 %s" | |
2022 | ||
a5cd71ca | 2023 | #: config.c:2794 builtin/config.c:328 |
c1ac5258 JX |
2024 | #, c-format |
2025 | msgid "invalid pattern: %s" | |
2026 | msgstr "无效模式:%s" | |
2027 | ||
a5cd71ca | 2028 | #: config.c:2819 |
c1ac5258 JX |
2029 | #, c-format |
2030 | msgid "invalid config file %s" | |
2031 | msgstr "无效的配置文件 %s" | |
2032 | ||
a5cd71ca | 2033 | #: config.c:2832 config.c:3085 |
1a79b2f1 JX |
2034 | #, c-format |
2035 | msgid "fstat on %s failed" | |
65e2041e | 2036 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 2037 | |
a5cd71ca | 2038 | #: config.c:2843 |
c1ac5258 JX |
2039 | #, c-format |
2040 | msgid "unable to mmap '%s'" | |
2041 | msgstr "不能 mmap '%s'" | |
2042 | ||
a5cd71ca | 2043 | #: config.c:2852 config.c:3090 |
c1ac5258 JX |
2044 | #, c-format |
2045 | msgid "chmod on %s failed" | |
2046 | msgstr "对 %s 调用 chmod 失败" | |
2047 | ||
a5cd71ca | 2048 | #: config.c:2937 config.c:3187 |
c1ac5258 JX |
2049 | #, c-format |
2050 | msgid "could not write config file %s" | |
2051 | msgstr "不能写入配置文件 %s" | |
2052 | ||
a5cd71ca | 2053 | #: config.c:2971 |
94550ed3 | 2054 | #, c-format |
a0b6b246 JX |
2055 | msgid "could not set '%s' to '%s'" |
2056 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 2057 | |
a5cd71ca | 2058 | #: config.c:2973 builtin/remote.c:782 |
276ceeaa | 2059 | #, c-format |
a0b6b246 JX |
2060 | msgid "could not unset '%s'" |
2061 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 2062 | |
a5cd71ca | 2063 | #: config.c:3063 |
c1ac5258 JX |
2064 | #, c-format |
2065 | msgid "invalid section name: %s" | |
2066 | msgstr "无效的小节名称:%s" | |
2067 | ||
a5cd71ca | 2068 | #: config.c:3230 |
c1ac5258 JX |
2069 | #, c-format |
2070 | msgid "missing value for '%s'" | |
2071 | msgstr "%s 的取值缺失" | |
2072 | ||
fd8cb379 | 2073 | #: connect.c:61 |
c1ac5258 JX |
2074 | msgid "the remote end hung up upon initial contact" |
2075 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 2076 | |
fd8cb379 | 2077 | #: connect.c:63 |
a0b6b246 JX |
2078 | msgid "" |
2079 | "Could not read from remote repository.\n" | |
2080 | "\n" | |
2081 | "Please make sure you have the correct access rights\n" | |
2082 | "and the repository exists." | |
2083 | msgstr "" | |
2084 | "无法读取远程仓库。\n" | |
2085 | "\n" | |
2086 | "请确认您有正确的访问权限并且仓库存在。" | |
2087 | ||
c1ac5258 JX |
2088 | #: connect.c:81 |
2089 | #, c-format | |
2090 | msgid "server doesn't support '%s'" | |
2091 | msgstr "服务器不支持 '%s'" | |
2092 | ||
2093 | #: connect.c:103 | |
2094 | #, c-format | |
2095 | msgid "server doesn't support feature '%s'" | |
2096 | msgstr "服务器不支持特性 '%s'" | |
2097 | ||
2098 | #: connect.c:114 | |
2099 | msgid "expected flush after capabilities" | |
2100 | msgstr "在能力之后应为一个 flush 包" | |
2101 | ||
2102 | #: connect.c:233 | |
2103 | #, c-format | |
2104 | msgid "ignoring capabilities after first line '%s'" | |
e640d114 | 2105 | msgstr "忽略第一行 '%s' 之后的能力字段" |
c1ac5258 JX |
2106 | |
2107 | #: connect.c:252 | |
2108 | msgid "protocol error: unexpected capabilities^{}" | |
2109 | msgstr "协议错误:意外的 capabilities^{}" | |
2110 | ||
2111 | #: connect.c:273 | |
2112 | #, c-format | |
2113 | msgid "protocol error: expected shallow sha-1, got '%s'" | |
2114 | msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" | |
2115 | ||
2116 | #: connect.c:275 | |
2117 | msgid "repository on the other end cannot be shallow" | |
2118 | msgstr "另一端的仓库不能是浅克隆仓库" | |
2119 | ||
06991777 | 2120 | #: connect.c:313 |
c1ac5258 JX |
2121 | msgid "invalid packet" |
2122 | msgstr "无效数据包" | |
2123 | ||
06991777 | 2124 | #: connect.c:333 |
c1ac5258 JX |
2125 | #, c-format |
2126 | msgid "protocol error: unexpected '%s'" | |
2127 | msgstr "协议错误:意外的 '%s'" | |
2128 | ||
06991777 | 2129 | #: connect.c:441 |
c1ac5258 JX |
2130 | #, c-format |
2131 | msgid "invalid ls-refs response: %s" | |
2132 | msgstr "无效的 ls-refs 响应:%s" | |
2133 | ||
06991777 | 2134 | #: connect.c:445 |
c1ac5258 JX |
2135 | msgid "expected flush after ref listing" |
2136 | msgstr "在引用列表之后应该有一个 flush 包" | |
2137 | ||
06991777 | 2138 | #: connect.c:544 |
c1ac5258 JX |
2139 | #, c-format |
2140 | msgid "protocol '%s' is not supported" | |
2141 | msgstr "不支持 '%s' 协议" | |
2142 | ||
06991777 | 2143 | #: connect.c:595 |
c1ac5258 JX |
2144 | msgid "unable to set SO_KEEPALIVE on socket" |
2145 | msgstr "无法为 socket 设置 SO_KEEPALIVE" | |
2146 | ||
06991777 | 2147 | #: connect.c:635 connect.c:698 |
c1ac5258 JX |
2148 | #, c-format |
2149 | msgid "Looking up %s ... " | |
2150 | msgstr "查找 %s ..." | |
2151 | ||
06991777 | 2152 | #: connect.c:639 |
c1ac5258 JX |
2153 | #, c-format |
2154 | msgid "unable to look up %s (port %s) (%s)" | |
2155 | msgstr "无法查找 %s(端口 %s)(%s)" | |
2156 | ||
2157 | #. TRANSLATORS: this is the end of "Looking up %s ... " | |
06991777 | 2158 | #: connect.c:643 connect.c:714 |
c1ac5258 JX |
2159 | #, c-format |
2160 | msgid "" | |
2161 | "done.\n" | |
2162 | "Connecting to %s (port %s) ... " | |
2163 | msgstr "" | |
2164 | "完成。\n" | |
2165 | "连接到 %s(端口 %s)... " | |
2166 | ||
06991777 | 2167 | #: connect.c:665 connect.c:742 |
c1ac5258 JX |
2168 | #, c-format |
2169 | msgid "" | |
2170 | "unable to connect to %s:\n" | |
2171 | "%s" | |
2172 | msgstr "" | |
2173 | "无法连接到 %s:\n" | |
2174 | "%s" | |
2175 | ||
2176 | #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " | |
06991777 | 2177 | #: connect.c:671 connect.c:748 |
c1ac5258 JX |
2178 | msgid "done." |
2179 | msgstr "完成。" | |
2180 | ||
06991777 | 2181 | #: connect.c:702 |
c1ac5258 JX |
2182 | #, c-format |
2183 | msgid "unable to look up %s (%s)" | |
2184 | msgstr "无法查找 %s(%s)" | |
2185 | ||
06991777 | 2186 | #: connect.c:708 |
c1ac5258 JX |
2187 | #, c-format |
2188 | msgid "unknown port %s" | |
2189 | msgstr "未知端口 %s" | |
2190 | ||
a5cd71ca | 2191 | #: connect.c:845 connect.c:1175 |
c1ac5258 JX |
2192 | #, c-format |
2193 | msgid "strange hostname '%s' blocked" | |
2194 | msgstr "已阻止奇怪的主机名 '%s'" | |
2195 | ||
06991777 | 2196 | #: connect.c:847 |
c1ac5258 JX |
2197 | #, c-format |
2198 | msgid "strange port '%s' blocked" | |
2199 | msgstr "已阻止奇怪的端口号 '%s'" | |
2200 | ||
06991777 | 2201 | #: connect.c:857 |
c1ac5258 JX |
2202 | #, c-format |
2203 | msgid "cannot start proxy %s" | |
2204 | msgstr "不能启动代理 %s" | |
2205 | ||
a5cd71ca | 2206 | #: connect.c:928 |
c1ac5258 JX |
2207 | msgid "no path specified; see 'git help pull' for valid url syntax" |
2208 | msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" | |
2209 | ||
a5cd71ca | 2210 | #: connect.c:1123 |
c1ac5258 JX |
2211 | msgid "ssh variant 'simple' does not support -4" |
2212 | msgstr "ssh 变体 'simple' 不支持 -4" | |
2213 | ||
a5cd71ca | 2214 | #: connect.c:1135 |
c1ac5258 JX |
2215 | msgid "ssh variant 'simple' does not support -6" |
2216 | msgstr "ssh 变体 'simple' 不支持 -6" | |
2217 | ||
a5cd71ca | 2218 | #: connect.c:1152 |
c1ac5258 | 2219 | msgid "ssh variant 'simple' does not support setting port" |
e640d114 | 2220 | msgstr "ssh 变体 'simple' 不支持设置端口" |
c1ac5258 | 2221 | |
a5cd71ca | 2222 | #: connect.c:1264 |
c1ac5258 JX |
2223 | #, c-format |
2224 | msgid "strange pathname '%s' blocked" | |
2225 | msgstr "已阻止奇怪的路径名 '%s'" | |
2226 | ||
a5cd71ca | 2227 | #: connect.c:1311 |
c1ac5258 JX |
2228 | msgid "unable to fork" |
2229 | msgstr "无法 fork" | |
2230 | ||
a5cd71ca | 2231 | #: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 |
a0b6b246 | 2232 | msgid "Checking connectivity" |
06991777 | 2233 | msgstr "正在检查连通性" |
a0b6b246 | 2234 | |
a5cd71ca | 2235 | #: connected.c:100 |
a0b6b246 JX |
2236 | msgid "Could not run 'git rev-list'" |
2237 | msgstr "不能执行 'git rev-list'" | |
2238 | ||
a5cd71ca | 2239 | #: connected.c:120 |
a0b6b246 | 2240 | msgid "failed write to rev-list" |
c1ac5258 | 2241 | msgstr "写入 rev-list 失败" |
a0b6b246 | 2242 | |
a5cd71ca | 2243 | #: connected.c:127 |
a0b6b246 | 2244 | msgid "failed to close rev-list's stdin" |
c1ac5258 JX |
2245 | msgstr "关闭 rev-list 的标准输入失败" |
2246 | ||
a5cd71ca | 2247 | #: convert.c:194 |
c1ac5258 JX |
2248 | #, c-format |
2249 | msgid "illegal crlf_action %d" | |
2250 | msgstr "非法的 crlf 动作 %d" | |
a0b6b246 | 2251 | |
a5cd71ca | 2252 | #: convert.c:207 |
3495628d | 2253 | #, c-format |
c1ac5258 JX |
2254 | msgid "CRLF would be replaced by LF in %s" |
2255 | msgstr "%s 中的 CRLF 将被 LF 替换" | |
31e5e17b | 2256 | |
a5cd71ca | 2257 | #: convert.c:209 |
31e5e17b | 2258 | #, c-format |
a0b6b246 JX |
2259 | msgid "" |
2260 | "CRLF will be replaced by LF in %s.\n" | |
c1ac5258 | 2261 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2262 | msgstr "" |
c1ac5258 | 2263 | "%s 中的 CRLF 将被 LF 替换。<\n" |
a0b6b246 | 2264 | "在工作区中该文件仍保持原有的换行符。" |
3495628d | 2265 | |
a5cd71ca | 2266 | #: convert.c:217 |
3495628d | 2267 | #, c-format |
31e5e17b JX |
2268 | msgid "LF would be replaced by CRLF in %s" |
2269 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 2270 | |
a5cd71ca | 2271 | #: convert.c:219 |
276ceeaa | 2272 | #, c-format |
a0b6b246 JX |
2273 | msgid "" |
2274 | "LF will be replaced by CRLF in %s.\n" | |
c1ac5258 | 2275 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2276 | msgstr "" |
c1ac5258 JX |
2277 | "%s 中的 LF 将被 CRLF 替换。\n" |
2278 | "在工作区中该文件仍保持原有的换行符" | |
276ceeaa | 2279 | |
a5cd71ca | 2280 | #: convert.c:280 |
fd8cb379 JX |
2281 | #, c-format |
2282 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
2283 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
2284 | ||
a5cd71ca | 2285 | #: convert.c:287 |
fd8cb379 JX |
2286 | #, c-format |
2287 | msgid "" | |
2288 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" | |
2289 | "tree-encoding." | |
2290 | msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。" | |
2291 | ||
a5cd71ca | 2292 | #: convert.c:305 |
fd8cb379 JX |
2293 | #, c-format |
2294 | msgid "BOM is required in '%s' if encoded as %s" | |
2295 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
2296 | ||
a5cd71ca | 2297 | #: convert.c:307 |
fd8cb379 JX |
2298 | #, c-format |
2299 | msgid "" | |
2300 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
2301 | "%sLE (depending on the byte order) as working-tree-encoding." | |
2302 | msgstr "" | |
2303 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
2304 | "节序)作为工作区编码。" | |
2305 | ||
a5cd71ca | 2306 | #: convert.c:425 convert.c:496 |
fd8cb379 JX |
2307 | #, c-format |
2308 | msgid "failed to encode '%s' from %s to %s" | |
2309 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
2310 | ||
a5cd71ca | 2311 | #: convert.c:468 |
fd8cb379 JX |
2312 | #, c-format |
2313 | msgid "encoding '%s' from %s to %s and back is not the same" | |
2314 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
2315 | ||
a5cd71ca | 2316 | #: convert.c:674 |
c1ac5258 JX |
2317 | #, c-format |
2318 | msgid "cannot fork to run external filter '%s'" | |
e640d114 | 2319 | msgstr "不能 fork 以执行外部过滤器 '%s'" |
c1ac5258 | 2320 | |
a5cd71ca | 2321 | #: convert.c:694 |
c1ac5258 JX |
2322 | #, c-format |
2323 | msgid "cannot feed the input to external filter '%s'" | |
e640d114 | 2324 | msgstr "不能将输入传递给外部过滤器 '%s'" |
c1ac5258 | 2325 | |
a5cd71ca | 2326 | #: convert.c:701 |
c1ac5258 JX |
2327 | #, c-format |
2328 | msgid "external filter '%s' failed %d" | |
e640d114 | 2329 | msgstr "外部过滤器 '%s' 失败码 %d" |
c1ac5258 | 2330 | |
a5cd71ca | 2331 | #: convert.c:736 convert.c:739 |
c1ac5258 JX |
2332 | #, c-format |
2333 | msgid "read from external filter '%s' failed" | |
2334 | msgstr "从外部过滤器 '%s' 读取失败" | |
2335 | ||
a5cd71ca | 2336 | #: convert.c:742 convert.c:797 |
c1ac5258 JX |
2337 | #, c-format |
2338 | msgid "external filter '%s' failed" | |
2339 | msgstr "外部过滤器 '%s' 失败" | |
2340 | ||
a5cd71ca | 2341 | #: convert.c:845 |
c1ac5258 JX |
2342 | msgid "unexpected filter type" |
2343 | msgstr "意外的过滤类型" | |
2344 | ||
a5cd71ca | 2345 | #: convert.c:856 |
c1ac5258 JX |
2346 | msgid "path name too long for external filter" |
2347 | msgstr "外部过滤器的路径名太长" | |
2348 | ||
a5cd71ca | 2349 | #: convert.c:930 |
c1ac5258 JX |
2350 | #, c-format |
2351 | msgid "" | |
2352 | "external filter '%s' is not available anymore although not all paths have " | |
2353 | "been filtered" | |
2354 | msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" | |
2355 | ||
a5cd71ca | 2356 | #: convert.c:1229 |
fd8cb379 JX |
2357 | msgid "true/false are no valid working-tree-encodings" |
2358 | msgstr "true/false 不是有效的工作区编码" | |
2359 | ||
a5cd71ca | 2360 | #: convert.c:1417 convert.c:1451 |
c1ac5258 JX |
2361 | #, c-format |
2362 | msgid "%s: clean filter '%s' failed" | |
2363 | msgstr "%s:clean 过滤器 '%s' 失败" | |
2364 | ||
a5cd71ca | 2365 | #: convert.c:1495 |
c1ac5258 JX |
2366 | #, c-format |
2367 | msgid "%s: smudge filter %s failed" | |
2368 | msgstr "%s:smudge 过滤器 %s 失败" | |
2369 | ||
a5cd71ca | 2370 | #: date.c:138 |
a0b6b246 JX |
2371 | msgid "in the future" |
2372 | msgstr "在将来" | |
3495628d | 2373 | |
a5cd71ca | 2374 | #: date.c:144 |
3495628d | 2375 | #, c-format |
a4f16749 JX |
2376 | msgid "%<PRIuMAX> second ago" |
2377 | msgid_plural "%<PRIuMAX> seconds ago" | |
2378 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
2379 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 2380 | |
a5cd71ca | 2381 | #: date.c:151 |
3495628d | 2382 | #, c-format |
a4f16749 JX |
2383 | msgid "%<PRIuMAX> minute ago" |
2384 | msgid_plural "%<PRIuMAX> minutes ago" | |
2385 | msgstr[0] "%<PRIuMAX> 分钟前" | |
2386 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 2387 | |
a5cd71ca | 2388 | #: date.c:158 |
3495628d | 2389 | #, c-format |
a4f16749 JX |
2390 | msgid "%<PRIuMAX> hour ago" |
2391 | msgid_plural "%<PRIuMAX> hours ago" | |
2392 | msgstr[0] "%<PRIuMAX> 小时前" | |
2393 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 2394 | |
a5cd71ca | 2395 | #: date.c:165 |
3495628d | 2396 | #, c-format |
a4f16749 JX |
2397 | msgid "%<PRIuMAX> day ago" |
2398 | msgid_plural "%<PRIuMAX> days ago" | |
2399 | msgstr[0] "%<PRIuMAX> 天前" | |
2400 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 2401 | |
a5cd71ca | 2402 | #: date.c:171 |
94550ed3 | 2403 | #, c-format |
a4f16749 JX |
2404 | msgid "%<PRIuMAX> week ago" |
2405 | msgid_plural "%<PRIuMAX> weeks ago" | |
2406 | msgstr[0] "%<PRIuMAX> 周前" | |
2407 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 2408 | |
a5cd71ca | 2409 | #: date.c:178 |
3495628d | 2410 | #, c-format |
a4f16749 JX |
2411 | msgid "%<PRIuMAX> month ago" |
2412 | msgid_plural "%<PRIuMAX> months ago" | |
2413 | msgstr[0] "%<PRIuMAX> 个月前" | |
2414 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 2415 | |
a5cd71ca | 2416 | #: date.c:189 |
3495628d | 2417 | #, c-format |
a4f16749 JX |
2418 | msgid "%<PRIuMAX> year" |
2419 | msgid_plural "%<PRIuMAX> years" | |
2420 | msgstr[0] "%<PRIuMAX> 年" | |
2421 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 2422 | |
a0b6b246 | 2423 | #. TRANSLATORS: "%s" is "<n> years" |
a5cd71ca | 2424 | #: date.c:192 |
94550ed3 | 2425 | #, c-format |
a4f16749 JX |
2426 | msgid "%s, %<PRIuMAX> month ago" |
2427 | msgid_plural "%s, %<PRIuMAX> months ago" | |
2428 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
2429 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 2430 | |
a5cd71ca | 2431 | #: date.c:197 date.c:202 |
94550ed3 | 2432 | #, c-format |
a4f16749 JX |
2433 | msgid "%<PRIuMAX> year ago" |
2434 | msgid_plural "%<PRIuMAX> years ago" | |
2435 | msgstr[0] "%<PRIuMAX> 年前" | |
2436 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 2437 | |
06991777 | 2438 | #: delta-islands.c:272 |
4c27fcb5 JX |
2439 | msgid "Propagating island marks" |
2440 | msgstr "正在传播数据岛标记" | |
2441 | ||
06991777 | 2442 | #: delta-islands.c:290 |
4c27fcb5 JX |
2443 | #, c-format |
2444 | msgid "bad tree object %s" | |
2445 | msgstr "坏的树对象 %s" | |
2446 | ||
06991777 | 2447 | #: delta-islands.c:334 |
4c27fcb5 JX |
2448 | #, c-format |
2449 | msgid "failed to load island regex for '%s': %s" | |
2450 | msgstr "未能加载 '%s' 的数据岛正则表达式:%s" | |
2451 | ||
06991777 | 2452 | #: delta-islands.c:390 |
4c27fcb5 JX |
2453 | #, c-format |
2454 | msgid "island regex from config has too many capture groups (max=%d)" | |
2455 | msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)" | |
2456 | ||
a6cd2cc4 | 2457 | #: delta-islands.c:467 |
4c27fcb5 JX |
2458 | #, c-format |
2459 | msgid "Marked %d islands, done.\n" | |
2460 | msgstr "已标记 %d 个数据岛,结束。\n" | |
2461 | ||
a0b6b246 | 2462 | #: diffcore-order.c:24 |
cfff71a9 | 2463 | #, c-format |
a0b6b246 | 2464 | msgid "failed to read orderfile '%s'" |
c1ac5258 | 2465 | msgstr "读取排序文件 '%s' 失败" |
cfff71a9 | 2466 | |
a5cd71ca | 2467 | #: diffcore-rename.c:543 |
a0b6b246 | 2468 | msgid "Performing inexact rename detection" |
87cb7997 | 2469 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 2470 | |
d46c5519 JX |
2471 | #: diff-no-index.c:238 |
2472 | msgid "git diff --no-index [<options>] <path> <path>" | |
2473 | msgstr "git diff --no-index [<选项>] <路径> <路径>" | |
2474 | ||
2475 | #: diff-no-index.c:263 | |
2476 | msgid "" | |
2477 | "Not a git repository. Use --no-index to compare two paths outside a working " | |
2478 | "tree" | |
2479 | msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" | |
cfff71a9 | 2480 | |
a0b6b246 | 2481 | # 译者:注意保持前导空格 |
d46c5519 | 2482 | #: diff.c:155 |
a0b6b246 JX |
2483 | #, c-format |
2484 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
2485 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 2486 | |
a0b6b246 | 2487 | # 译者:注意保持前导空格 |
d46c5519 | 2488 | #: diff.c:160 |
a0b6b246 JX |
2489 | #, c-format |
2490 | msgid " Unknown dirstat parameter '%s'\n" | |
2491 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 2492 | |
d46c5519 | 2493 | #: diff.c:296 |
6937cb4e | 2494 | msgid "" |
c1ac5258 JX |
2495 | "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " |
2496 | "'dimmed-zebra', 'plain'" | |
5809aa05 | 2497 | msgstr "" |
c1ac5258 JX |
2498 | "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " |
2499 | "'plain'" | |
2500 | ||
d46c5519 | 2501 | #: diff.c:324 |
c1ac5258 | 2502 | #, c-format |
06991777 JX |
2503 | msgid "" |
2504 | "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " | |
2505 | "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" | |
2506 | msgstr "" | |
2507 | "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-" | |
2508 | "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" | |
c1ac5258 | 2509 | |
d46c5519 | 2510 | #: diff.c:332 |
c1ac5258 | 2511 | msgid "" |
06991777 JX |
2512 | "color-moved-ws: allow-indentation-change cannot be combined with other " |
2513 | "whitespace modes" | |
c1ac5258 | 2514 | msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" |
6937cb4e | 2515 | |
d46c5519 | 2516 | #: diff.c:405 |
7aea43ff | 2517 | #, c-format |
a0b6b246 JX |
2518 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
2519 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 2520 | |
d46c5519 | 2521 | #: diff.c:465 |
7aea43ff | 2522 | #, c-format |
a0b6b246 JX |
2523 | msgid "" |
2524 | "Found errors in 'diff.dirstat' config variable:\n" | |
2525 | "%s" | |
2526 | msgstr "" | |
2527 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
2528 | "%s" | |
7aea43ff | 2529 | |
a5cd71ca | 2530 | #: diff.c:4218 |
7aea43ff | 2531 | #, c-format |
a0b6b246 JX |
2532 | msgid "external diff died, stopping at %s" |
2533 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 2534 | |
a5cd71ca | 2535 | #: diff.c:4563 |
a0b6b246 JX |
2536 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
2537 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
2538 | ||
a5cd71ca | 2539 | #: diff.c:4566 |
31e5e17b JX |
2540 | msgid "-G, -S and --find-object are mutually exclusive" |
2541 | msgstr "-G、-S 和 --find-object 是互斥的" | |
2542 | ||
a5cd71ca | 2543 | #: diff.c:4644 |
a0b6b246 JX |
2544 | msgid "--follow requires exactly one pathspec" |
2545 | msgstr "--follow 明确要求只跟一个路径规格" | |
2546 | ||
a5cd71ca | 2547 | #: diff.c:4692 |
d46c5519 JX |
2548 | #, c-format |
2549 | msgid "invalid --stat value: %s" | |
2550 | msgstr "无效的 --stat 值:%s" | |
2551 | ||
a5cd71ca | 2552 | #: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 |
d46c5519 JX |
2553 | #: parse-options.c:199 parse-options.c:203 |
2554 | #, c-format | |
2555 | msgid "%s expects a numerical value" | |
2556 | msgstr "%s 期望一个数字值" | |
2557 | ||
a5cd71ca | 2558 | #: diff.c:4729 |
7aea43ff | 2559 | #, c-format |
a0b6b246 JX |
2560 | msgid "" |
2561 | "Failed to parse --dirstat/-X option parameter:\n" | |
2562 | "%s" | |
2563 | msgstr "" | |
2564 | "无法解析 --dirstat/-X 选项的参数:\n" | |
2565 | "%s" | |
7aea43ff | 2566 | |
a5cd71ca | 2567 | #: diff.c:4814 |
d46c5519 JX |
2568 | #, c-format |
2569 | msgid "unknown change class '%c' in --diff-filter=%s" | |
2570 | msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" | |
2571 | ||
a5cd71ca | 2572 | #: diff.c:4838 |
d46c5519 JX |
2573 | #, c-format |
2574 | msgid "unknown value after ws-error-highlight=%.*s" | |
2575 | msgstr "ws-error-highlight=%.*s 之后未知的值" | |
2576 | ||
a5cd71ca | 2577 | #: diff.c:4852 |
7aea43ff | 2578 | #, c-format |
d46c5519 JX |
2579 | msgid "unable to resolve '%s'" |
2580 | msgstr "不能解析 '%s'" | |
2581 | ||
a5cd71ca | 2582 | #: diff.c:4902 diff.c:4908 |
d46c5519 JX |
2583 | #, c-format |
2584 | msgid "%s expects <n>/<m> form" | |
2585 | msgstr "%s 期望 <n>/<m> 格式" | |
2586 | ||
a5cd71ca | 2587 | #: diff.c:4920 |
d46c5519 JX |
2588 | #, c-format |
2589 | msgid "%s expects a character, got '%s'" | |
2590 | msgstr "%s 期望一个字符,得到 '%s'" | |
2591 | ||
a5cd71ca | 2592 | #: diff.c:4941 |
d46c5519 JX |
2593 | #, c-format |
2594 | msgid "bad --color-moved argument: %s" | |
2595 | msgstr "坏的 --color-moved 参数:%s" | |
2596 | ||
a5cd71ca | 2597 | #: diff.c:4960 |
d46c5519 JX |
2598 | #, c-format |
2599 | msgid "invalid mode '%s' in --color-moved-ws" | |
2600 | msgstr "--color-moved-ws 中的无效模式 '%s' " | |
2601 | ||
a5cd71ca | 2602 | #: diff.c:5000 |
d46c5519 JX |
2603 | msgid "" |
2604 | "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " | |
2605 | "\"histogram\"" | |
2606 | msgstr "" | |
2607 | "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" | |
2608 | ||
a5cd71ca | 2609 | #: diff.c:5036 diff.c:5056 |
d46c5519 JX |
2610 | #, c-format |
2611 | msgid "invalid argument to %s" | |
2612 | msgstr "%s 的参数无效" | |
2613 | ||
a5cd71ca | 2614 | #: diff.c:5194 |
d46c5519 JX |
2615 | #, c-format |
2616 | msgid "failed to parse --submodule option parameter: '%s'" | |
a0b6b246 | 2617 | msgstr "无法解析 --submodule 选项的参数:'%s'" |
7aea43ff | 2618 | |
a5cd71ca | 2619 | #: diff.c:5250 |
d46c5519 JX |
2620 | #, c-format |
2621 | msgid "bad --word-diff argument: %s" | |
2622 | msgstr "坏的 --word-diff 参数:%s" | |
2623 | ||
a5cd71ca | 2624 | #: diff.c:5273 |
d46c5519 JX |
2625 | msgid "Diff output format options" |
2626 | msgstr "差异输出格式化选项" | |
2627 | ||
a5cd71ca | 2628 | #: diff.c:5275 diff.c:5281 |
d46c5519 JX |
2629 | msgid "generate patch" |
2630 | msgstr "生成补丁" | |
2631 | ||
a5cd71ca | 2632 | #: diff.c:5278 builtin/log.c:172 |
d46c5519 JX |
2633 | msgid "suppress diff output" |
2634 | msgstr "不显示差异输出" | |
2635 | ||
a5cd71ca | 2636 | #: diff.c:5283 diff.c:5397 diff.c:5404 |
d46c5519 JX |
2637 | msgid "<n>" |
2638 | msgstr "<n>" | |
2639 | ||
a5cd71ca | 2640 | #: diff.c:5284 diff.c:5287 |
d46c5519 JX |
2641 | msgid "generate diffs with <n> lines context" |
2642 | msgstr "生成含 <n> 行上下文的差异" | |
2643 | ||
a5cd71ca | 2644 | #: diff.c:5289 |
d46c5519 JX |
2645 | msgid "generate the diff in raw format" |
2646 | msgstr "生成原始格式的差异" | |
2647 | ||
a5cd71ca | 2648 | #: diff.c:5292 |
d46c5519 JX |
2649 | msgid "synonym for '-p --raw'" |
2650 | msgstr "和 '-p --raw' 同义" | |
2651 | ||
a5cd71ca | 2652 | #: diff.c:5296 |
d46c5519 JX |
2653 | msgid "synonym for '-p --stat'" |
2654 | msgstr "和 '-p --stat' 同义" | |
2655 | ||
a5cd71ca | 2656 | #: diff.c:5300 |
d46c5519 JX |
2657 | msgid "machine friendly --stat" |
2658 | msgstr "机器友好的 --stat" | |
2659 | ||
a5cd71ca | 2660 | #: diff.c:5303 |
d46c5519 JX |
2661 | msgid "output only the last line of --stat" |
2662 | msgstr "只输出 --stat 的最后一行" | |
2663 | ||
a5cd71ca | 2664 | #: diff.c:5305 diff.c:5313 |
d46c5519 JX |
2665 | msgid "<param1,param2>..." |
2666 | msgstr "<参数1,参数2>..." | |
2667 | ||
a5cd71ca | 2668 | #: diff.c:5306 |
d46c5519 JX |
2669 | msgid "" |
2670 | "output the distribution of relative amount of changes for each sub-directory" | |
2671 | msgstr "输出每个子目录相对变更的分布" | |
2672 | ||
a5cd71ca | 2673 | #: diff.c:5310 |
d46c5519 JX |
2674 | msgid "synonym for --dirstat=cumulative" |
2675 | msgstr "和 --dirstat=cumulative 同义" | |
2676 | ||
a5cd71ca | 2677 | #: diff.c:5314 |
d46c5519 JX |
2678 | msgid "synonym for --dirstat=files,param1,param2..." |
2679 | msgstr "是 --dirstat=files,param1,param2... 的同义词" | |
2680 | ||
a5cd71ca | 2681 | #: diff.c:5318 |
d46c5519 JX |
2682 | msgid "warn if changes introduce conflict markers or whitespace errors" |
2683 | msgstr "如果变更中引入冲突定界符或空白错误,给出警告" | |
2684 | ||
a5cd71ca | 2685 | #: diff.c:5321 |
d46c5519 JX |
2686 | msgid "condensed summary such as creations, renames and mode changes" |
2687 | msgstr "精简摘要,例如创建、重命名和模式变更" | |
2688 | ||
a5cd71ca | 2689 | #: diff.c:5324 |
d46c5519 JX |
2690 | msgid "show only names of changed files" |
2691 | msgstr "只显示变更文件的文件名" | |
2692 | ||
a5cd71ca | 2693 | #: diff.c:5327 |
d46c5519 JX |
2694 | msgid "show only names and status of changed files" |
2695 | msgstr "只显示变更文件的文件名和状态" | |
2696 | ||
a5cd71ca | 2697 | #: diff.c:5329 |
d46c5519 JX |
2698 | msgid "<width>[,<name-width>[,<count>]]" |
2699 | msgstr "<宽度>[,<文件名宽度>[,<次数>]]" | |
2700 | ||
a5cd71ca | 2701 | #: diff.c:5330 |
d46c5519 | 2702 | msgid "generate diffstat" |
5b533632 | 2703 | msgstr "生成差异统计(diffstat)" |
d46c5519 | 2704 | |
a5cd71ca | 2705 | #: diff.c:5332 diff.c:5335 diff.c:5338 |
d46c5519 JX |
2706 | msgid "<width>" |
2707 | msgstr "<宽度>" | |
2708 | ||
a5cd71ca | 2709 | #: diff.c:5333 |
d46c5519 JX |
2710 | msgid "generate diffstat with a given width" |
2711 | msgstr "使用给定的长度生成差异统计" | |
2712 | ||
a5cd71ca | 2713 | #: diff.c:5336 |
d46c5519 JX |
2714 | msgid "generate diffstat with a given name width" |
2715 | msgstr "使用给定的文件名长度生成差异统计" | |
2716 | ||
a5cd71ca | 2717 | #: diff.c:5339 |
d46c5519 JX |
2718 | msgid "generate diffstat with a given graph width" |
2719 | msgstr "使用给定的图形长度生成差异统计" | |
2720 | ||
a5cd71ca | 2721 | #: diff.c:5341 |
d46c5519 JX |
2722 | msgid "<count>" |
2723 | msgstr "<次数>" | |
2724 | ||
a5cd71ca | 2725 | #: diff.c:5342 |
d46c5519 JX |
2726 | msgid "generate diffstat with limited lines" |
2727 | msgstr "生成有限行数的差异统计" | |
2728 | ||
a5cd71ca | 2729 | #: diff.c:5345 |
d46c5519 JX |
2730 | msgid "generate compact summary in diffstat" |
2731 | msgstr "生成差异统计的简洁摘要" | |
2732 | ||
a5cd71ca | 2733 | #: diff.c:5348 |
d46c5519 JX |
2734 | msgid "output a binary diff that can be applied" |
2735 | msgstr "输出一个可以应用的二进制差异" | |
2736 | ||
a5cd71ca | 2737 | #: diff.c:5351 |
d46c5519 JX |
2738 | msgid "show full pre- and post-image object names on the \"index\" lines" |
2739 | msgstr "在 \"index\" 行显示完整的前后对象名称" | |
2740 | ||
a5cd71ca | 2741 | #: diff.c:5353 |
d46c5519 JX |
2742 | msgid "show colored diff" |
2743 | msgstr "显示带颜色的差异" | |
2744 | ||
a5cd71ca | 2745 | #: diff.c:5354 |
d46c5519 JX |
2746 | msgid "<kind>" |
2747 | msgstr "<类型>" | |
2748 | ||
a5cd71ca | 2749 | #: diff.c:5355 |
d46c5519 JX |
2750 | msgid "" |
2751 | "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " | |
2752 | "diff" | |
2753 | msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符" | |
2754 | ||
a5cd71ca | 2755 | #: diff.c:5358 |
d46c5519 JX |
2756 | msgid "" |
2757 | "do not munge pathnames and use NULs as output field terminators in --raw or " | |
2758 | "--numstat" | |
2759 | msgstr "" | |
2760 | "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔" | |
2761 | "符" | |
2762 | ||
a5cd71ca | 2763 | #: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 |
d46c5519 JX |
2764 | msgid "<prefix>" |
2765 | msgstr "<前缀>" | |
2766 | ||
a5cd71ca | 2767 | #: diff.c:5362 |
d46c5519 JX |
2768 | msgid "show the given source prefix instead of \"a/\"" |
2769 | msgstr "显示给定的源前缀取代 \"a/\"" | |
2770 | ||
a5cd71ca | 2771 | #: diff.c:5365 |
d46c5519 JX |
2772 | msgid "show the given destination prefix instead of \"b/\"" |
2773 | msgstr "显示给定的目标前缀取代 \"b/\"" | |
2774 | ||
a5cd71ca | 2775 | #: diff.c:5368 |
d46c5519 JX |
2776 | msgid "prepend an additional prefix to every line of output" |
2777 | msgstr "输出的每一行附加前缀" | |
2778 | ||
a5cd71ca | 2779 | #: diff.c:5371 |
d46c5519 JX |
2780 | msgid "do not show any source or destination prefix" |
2781 | msgstr "不显示任何源和目标前缀" | |
2782 | ||
a5cd71ca | 2783 | #: diff.c:5374 |
d46c5519 JX |
2784 | msgid "show context between diff hunks up to the specified number of lines" |
2785 | msgstr "显示指定行数的差异块间的上下文" | |
2786 | ||
a5cd71ca | 2787 | #: diff.c:5378 diff.c:5383 diff.c:5388 |
d46c5519 JX |
2788 | msgid "<char>" |
2789 | msgstr "<字符>" | |
2790 | ||
a5cd71ca | 2791 | #: diff.c:5379 |
d46c5519 JX |
2792 | msgid "specify the character to indicate a new line instead of '+'" |
2793 | msgstr "指定一个字符取代 '+' 来表示新的一行" | |
2794 | ||
a5cd71ca | 2795 | #: diff.c:5384 |
d46c5519 JX |
2796 | msgid "specify the character to indicate an old line instead of '-'" |
2797 | msgstr "指定一个字符取代 '-' 来表示旧的一行" | |
2798 | ||
a5cd71ca | 2799 | #: diff.c:5389 |
d46c5519 JX |
2800 | msgid "specify the character to indicate a context instead of ' '" |
2801 | msgstr "指定一个字符取代 ' ' 来表示一行上下文" | |
2802 | ||
a5cd71ca | 2803 | #: diff.c:5392 |
d46c5519 JX |
2804 | msgid "Diff rename options" |
2805 | msgstr "差异重命名选项" | |
2806 | ||
a5cd71ca | 2807 | #: diff.c:5393 |
d46c5519 JX |
2808 | msgid "<n>[/<m>]" |
2809 | msgstr "<n>[/<m>]" | |
2810 | ||
a5cd71ca | 2811 | #: diff.c:5394 |
d46c5519 | 2812 | msgid "break complete rewrite changes into pairs of delete and create" |
5b533632 | 2813 | msgstr "将完全重写的变更打破为成对的删除和创建" |
d46c5519 | 2814 | |
a5cd71ca | 2815 | #: diff.c:5398 |
d46c5519 JX |
2816 | msgid "detect renames" |
2817 | msgstr "检测重命名" | |
2818 | ||
a5cd71ca | 2819 | #: diff.c:5402 |
d46c5519 JX |
2820 | msgid "omit the preimage for deletes" |
2821 | msgstr "省略删除操作的差异输出" | |
2822 | ||
a5cd71ca | 2823 | #: diff.c:5405 |
d46c5519 JX |
2824 | msgid "detect copies" |
2825 | msgstr "检测拷贝" | |
2826 | ||
a5cd71ca | 2827 | #: diff.c:5409 |
d46c5519 JX |
2828 | msgid "use unmodified files as source to find copies" |
2829 | msgstr "使用未修改的文件做为发现拷贝的源" | |
2830 | ||
a5cd71ca | 2831 | #: diff.c:5411 |
d46c5519 JX |
2832 | msgid "disable rename detection" |
2833 | msgstr "禁用重命名探测" | |
2834 | ||
a5cd71ca | 2835 | #: diff.c:5414 |
d46c5519 JX |
2836 | msgid "use empty blobs as rename source" |
2837 | msgstr "使用空的数据对象做为重命名的源" | |
2838 | ||
a5cd71ca | 2839 | #: diff.c:5416 |
d46c5519 JX |
2840 | msgid "continue listing the history of a file beyond renames" |
2841 | msgstr "继续列出文件重命名以外的历史记录" | |
2842 | ||
a5cd71ca | 2843 | #: diff.c:5419 |
d46c5519 JX |
2844 | msgid "" |
2845 | "prevent rename/copy detection if the number of rename/copy targets exceeds " | |
2846 | "given limit" | |
2847 | msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测" | |
2848 | ||
a5cd71ca | 2849 | #: diff.c:5421 |
d46c5519 JX |
2850 | msgid "Diff algorithm options" |
2851 | msgstr "差异算法选项" | |
2852 | ||
a5cd71ca | 2853 | #: diff.c:5423 |
d46c5519 JX |
2854 | msgid "produce the smallest possible diff" |
2855 | msgstr "生成尽可能小的差异" | |
2856 | ||
a5cd71ca | 2857 | #: diff.c:5426 |
d46c5519 JX |
2858 | msgid "ignore whitespace when comparing lines" |
2859 | msgstr "行比较时忽略空白字符" | |
2860 | ||
a5cd71ca | 2861 | #: diff.c:5429 |
d46c5519 JX |
2862 | msgid "ignore changes in amount of whitespace" |
2863 | msgstr "忽略空白字符的变更" | |
2864 | ||
a5cd71ca | 2865 | #: diff.c:5432 |
d46c5519 JX |
2866 | msgid "ignore changes in whitespace at EOL" |
2867 | msgstr "忽略行尾的空白字符变更" | |
2868 | ||
a5cd71ca | 2869 | #: diff.c:5435 |
d46c5519 JX |
2870 | msgid "ignore carrier-return at the end of line" |
2871 | msgstr "忽略行尾的回车符(CR)" | |
2872 | ||
a5cd71ca | 2873 | #: diff.c:5438 |
d46c5519 JX |
2874 | msgid "ignore changes whose lines are all blank" |
2875 | msgstr "忽略整行都是空白的变更" | |
2876 | ||
a5cd71ca | 2877 | #: diff.c:5441 |
d46c5519 JX |
2878 | msgid "heuristic to shift diff hunk boundaries for easy reading" |
2879 | msgstr "启发式转换差异边界以便阅读" | |
2880 | ||
a5cd71ca | 2881 | #: diff.c:5444 |
d46c5519 JX |
2882 | msgid "generate diff using the \"patience diff\" algorithm" |
2883 | msgstr "使用 \"patience diff\" 算法生成差异" | |
2884 | ||
a5cd71ca | 2885 | #: diff.c:5448 |
d46c5519 JX |
2886 | msgid "generate diff using the \"histogram diff\" algorithm" |
2887 | msgstr "使用 \"histogram diff\" 算法生成差异" | |
2888 | ||
a5cd71ca | 2889 | #: diff.c:5450 |
d46c5519 JX |
2890 | msgid "<algorithm>" |
2891 | msgstr "<算法>" | |
2892 | ||
a5cd71ca | 2893 | #: diff.c:5451 |
d46c5519 JX |
2894 | msgid "choose a diff algorithm" |
2895 | msgstr "选择一个差异算法" | |
2896 | ||
a5cd71ca | 2897 | #: diff.c:5453 |
d46c5519 JX |
2898 | msgid "<text>" |
2899 | msgstr "<文本>" | |
2900 | ||
a5cd71ca | 2901 | #: diff.c:5454 |
d46c5519 | 2902 | msgid "generate diff using the \"anchored diff\" algorithm" |
5b533632 | 2903 | msgstr "使用 \"anchored diff\" 算法生成差异" |
d46c5519 | 2904 | |
a5cd71ca | 2905 | #: diff.c:5456 diff.c:5465 diff.c:5468 |
d46c5519 JX |
2906 | msgid "<mode>" |
2907 | msgstr "<模式>" | |
2908 | ||
a5cd71ca | 2909 | #: diff.c:5457 |
d46c5519 JX |
2910 | msgid "show word diff, using <mode> to delimit changed words" |
2911 | msgstr "显示单词差异,使用 <模式> 分隔变更的单词" | |
2912 | ||
a5cd71ca | 2913 | #: diff.c:5459 diff.c:5462 diff.c:5507 |
d46c5519 JX |
2914 | msgid "<regex>" |
2915 | msgstr "<正则>" | |
2916 | ||
a5cd71ca | 2917 | #: diff.c:5460 |
d46c5519 JX |
2918 | msgid "use <regex> to decide what a word is" |
2919 | msgstr "使用 <正则表达式> 确定何为一个词" | |
2920 | ||
a5cd71ca | 2921 | #: diff.c:5463 |
d46c5519 JX |
2922 | msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" |
2923 | msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" | |
2924 | ||
a5cd71ca | 2925 | #: diff.c:5466 |
d46c5519 JX |
2926 | msgid "moved lines of code are colored differently" |
2927 | msgstr "移动的代码行用不同方式着色" | |
2928 | ||
a5cd71ca | 2929 | #: diff.c:5469 |
d46c5519 JX |
2930 | msgid "how white spaces are ignored in --color-moved" |
2931 | msgstr "在 --color-moved 下如何忽略空白字符" | |
2932 | ||
a5cd71ca | 2933 | #: diff.c:5472 |
d46c5519 JX |
2934 | msgid "Other diff options" |
2935 | msgstr "其它差异选项" | |
2936 | ||
a5cd71ca | 2937 | #: diff.c:5474 |
d46c5519 JX |
2938 | msgid "when run from subdir, exclude changes outside and show relative paths" |
2939 | msgstr "当从子目录运行,排除目录之外的变更并显示相对路径" | |
2940 | ||
a5cd71ca | 2941 | #: diff.c:5478 |
d46c5519 JX |
2942 | msgid "treat all files as text" |
2943 | msgstr "把所有文件当做文本处理" | |
2944 | ||
a5cd71ca | 2945 | #: diff.c:5480 |
d46c5519 JX |
2946 | msgid "swap two inputs, reverse the diff" |
2947 | msgstr "交换两个输入,反转差异" | |
2948 | ||
a5cd71ca | 2949 | #: diff.c:5482 |
d46c5519 JX |
2950 | msgid "exit with 1 if there were differences, 0 otherwise" |
2951 | msgstr "有差异时退出码为 1,否则为 0" | |
2952 | ||
a5cd71ca | 2953 | #: diff.c:5484 |
d46c5519 JX |
2954 | msgid "disable all output of the program" |
2955 | msgstr "禁用本程序的所有输出" | |
2956 | ||
a5cd71ca | 2957 | #: diff.c:5486 |
d46c5519 JX |
2958 | msgid "allow an external diff helper to be executed" |
2959 | msgstr "允许执行一个外置的差异助手" | |
2960 | ||
a5cd71ca | 2961 | #: diff.c:5488 |
d46c5519 JX |
2962 | msgid "run external text conversion filters when comparing binary files" |
2963 | msgstr "当比较二进制文件时,运行外部的文本转换过滤器" | |
2964 | ||
a5cd71ca | 2965 | #: diff.c:5490 |
d46c5519 JX |
2966 | msgid "<when>" |
2967 | msgstr "<何时>" | |
2968 | ||
a5cd71ca | 2969 | #: diff.c:5491 |
d46c5519 JX |
2970 | msgid "ignore changes to submodules in the diff generation" |
2971 | msgstr "在生成差异时,忽略子模组的更改" | |
2972 | ||
a5cd71ca | 2973 | #: diff.c:5494 |
d46c5519 JX |
2974 | msgid "<format>" |
2975 | msgstr "<格式>" | |
2976 | ||
a5cd71ca | 2977 | #: diff.c:5495 |
d46c5519 JX |
2978 | msgid "specify how differences in submodules are shown" |
2979 | msgstr "指定子模组的差异如何显示" | |
2980 | ||
a5cd71ca | 2981 | #: diff.c:5499 |
d46c5519 JX |
2982 | msgid "hide 'git add -N' entries from the index" |
2983 | msgstr "隐藏索引中 'git add -N' 条目" | |
2984 | ||
a5cd71ca | 2985 | #: diff.c:5502 |
d46c5519 JX |
2986 | msgid "treat 'git add -N' entries as real in the index" |
2987 | msgstr "将索引中 'git add -N' 条目当做真实的" | |
2988 | ||
a5cd71ca | 2989 | #: diff.c:5504 |
d46c5519 JX |
2990 | msgid "<string>" |
2991 | msgstr "<字符串>" | |
2992 | ||
a5cd71ca | 2993 | #: diff.c:5505 |
d46c5519 JX |
2994 | msgid "" |
2995 | "look for differences that change the number of occurrences of the specified " | |
2996 | "string" | |
2997 | msgstr "查找改变了指定字符串出现次数的差异" | |
2998 | ||
a5cd71ca | 2999 | #: diff.c:5508 |
d46c5519 JX |
3000 | msgid "" |
3001 | "look for differences that change the number of occurrences of the specified " | |
3002 | "regex" | |
3003 | msgstr "查找改变指定正则匹配出现次数的差异" | |
3004 | ||
a5cd71ca | 3005 | #: diff.c:5511 |
d46c5519 JX |
3006 | msgid "show all changes in the changeset with -S or -G" |
3007 | msgstr "显示使用 -S 或 -G 的变更集的所有变更" | |
3008 | ||
a5cd71ca | 3009 | #: diff.c:5514 |
d46c5519 JX |
3010 | msgid "treat <string> in -S as extended POSIX regular expression" |
3011 | msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" | |
3012 | ||
a5cd71ca | 3013 | #: diff.c:5517 |
d46c5519 JX |
3014 | msgid "control the order in which files appear in the output" |
3015 | msgstr "控制输出中的文件显示顺序" | |
3016 | ||
a5cd71ca | 3017 | #: diff.c:5518 |
d46c5519 | 3018 | msgid "<object-id>" |
5b533632 | 3019 | msgstr "<对象 ID>" |
d46c5519 | 3020 | |
a5cd71ca | 3021 | #: diff.c:5519 |
d46c5519 JX |
3022 | msgid "" |
3023 | "look for differences that change the number of occurrences of the specified " | |
3024 | "object" | |
3025 | msgstr "查找改变指定对象出现次数的差异" | |
3026 | ||
a5cd71ca | 3027 | #: diff.c:5521 |
d46c5519 JX |
3028 | msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" |
3029 | msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" | |
3030 | ||
a5cd71ca | 3031 | #: diff.c:5522 |
d46c5519 JX |
3032 | msgid "select files by diff type" |
3033 | msgstr "通过差异类型选择文件" | |
3034 | ||
a5cd71ca | 3035 | #: diff.c:5524 |
d46c5519 JX |
3036 | msgid "<file>" |
3037 | msgstr "<文件>" | |
3038 | ||
a5cd71ca | 3039 | #: diff.c:5525 |
d46c5519 JX |
3040 | msgid "Output to a specific file" |
3041 | msgstr "输出到一个指定的文件" | |
3042 | ||
a5cd71ca | 3043 | #: diff.c:6180 |
a0b6b246 JX |
3044 | msgid "inexact rename detection was skipped due to too many files." |
3045 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
3046 | ||
a5cd71ca | 3047 | #: diff.c:6183 |
a0b6b246 JX |
3048 | msgid "only found copies from modified paths due to too many files." |
3049 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
3050 | ||
a5cd71ca | 3051 | #: diff.c:6186 |
7aea43ff | 3052 | #, c-format |
a0b6b246 JX |
3053 | msgid "" |
3054 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 3055 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 3056 | |
a5cd71ca | 3057 | #: dir.c:549 |
c1ac5258 JX |
3058 | #, c-format |
3059 | msgid "pathspec '%s' did not match any file(s) known to git" | |
3060 | msgstr "路径规格 '%s' 未匹配任何 git 已知文件" | |
3061 | ||
a5cd71ca | 3062 | #: dir.c:938 |
c1ac5258 JX |
3063 | #, c-format |
3064 | msgid "cannot use %s as an exclude file" | |
3065 | msgstr "不能将 %s 用作排除文件" | |
3066 | ||
a5cd71ca | 3067 | #: dir.c:1877 |
31e5e17b JX |
3068 | #, c-format |
3069 | msgid "could not open directory '%s'" | |
3070 | msgstr "不能打开目录 '%s'" | |
3071 | ||
a5cd71ca | 3072 | #: dir.c:2128 |
a0b6b246 JX |
3073 | msgid "failed to get kernel name and information" |
3074 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 3075 | |
a5cd71ca | 3076 | #: dir.c:2252 |
c1ac5258 JX |
3077 | msgid "untracked cache is disabled on this system or location" |
3078 | msgstr "缓存未跟踪文件在本系统或位置中被禁用" | |
3079 | ||
a5cd71ca | 3080 | #: dir.c:3056 |
c1ac5258 JX |
3081 | #, c-format |
3082 | msgid "index file corrupt in repo %s" | |
3083 | msgstr "仓库 %s 中的索引文件损坏" | |
7aea43ff | 3084 | |
a5cd71ca | 3085 | #: dir.c:3101 dir.c:3106 |
87cb7997 JX |
3086 | #, c-format |
3087 | msgid "could not create directories for %s" | |
3088 | msgstr "不能为 %s 创建目录" | |
3089 | ||
a5cd71ca | 3090 | #: dir.c:3135 |
1a79b2f1 JX |
3091 | #, c-format |
3092 | msgid "could not migrate git directory from '%s' to '%s'" | |
3093 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
3094 | ||
4c27fcb5 | 3095 | #: editor.c:73 |
5809aa05 JX |
3096 | #, c-format |
3097 | msgid "hint: Waiting for your editor to close the file...%c" | |
3098 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
3099 | ||
c1ac5258 | 3100 | #: entry.c:178 |
6937cb4e JX |
3101 | msgid "Filtering content" |
3102 | msgstr "过滤内容" | |
3103 | ||
d46c5519 | 3104 | #: entry.c:476 |
87cb7997 JX |
3105 | #, c-format |
3106 | msgid "could not stat file '%s'" | |
65e2041e | 3107 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 3108 | |
a5cd71ca | 3109 | #: environment.c:148 |
c1ac5258 JX |
3110 | #, c-format |
3111 | msgid "bad git namespace path \"%s\"" | |
e640d114 | 3112 | msgstr "错误的 git 名字空间路径 \"%s\"" |
c1ac5258 | 3113 | |
a5cd71ca | 3114 | #: environment.c:330 |
c1ac5258 JX |
3115 | #, c-format |
3116 | msgid "could not set GIT_DIR to '%s'" | |
3117 | msgstr "不能设置 GIT_DIR 为 '%s'" | |
3118 | ||
d46c5519 | 3119 | #: exec-cmd.c:363 |
c1ac5258 JX |
3120 | #, c-format |
3121 | msgid "too many args to run %s" | |
3122 | msgstr "执行 %s 的参数太多" | |
3123 | ||
a5cd71ca | 3124 | #: fetch-pack.c:150 |
a0b6b246 JX |
3125 | msgid "git fetch-pack: expected shallow list" |
3126 | msgstr "git fetch-pack:应为 shallow 列表" | |
3127 | ||
a5cd71ca | 3128 | #: fetch-pack.c:153 |
06991777 JX |
3129 | msgid "git fetch-pack: expected a flush packet after shallow list" |
3130 | msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包" | |
3131 | ||
a5cd71ca | 3132 | #: fetch-pack.c:164 |
31e5e17b JX |
3133 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
3134 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 3135 | |
a5cd71ca | 3136 | #: fetch-pack.c:184 |
90314792 | 3137 | #, c-format |
275588f9 | 3138 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 3139 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 3140 | |
a5cd71ca | 3141 | #: fetch-pack.c:195 |
d46c5519 JX |
3142 | msgid "unable to write to remote" |
3143 | msgstr "无法写到远程" | |
3144 | ||
a5cd71ca | 3145 | #: fetch-pack.c:257 |
a0b6b246 JX |
3146 | msgid "--stateless-rpc requires multi_ack_detailed" |
3147 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 3148 | |
a5cd71ca | 3149 | #: fetch-pack.c:356 fetch-pack.c:1280 |
90314792 | 3150 | #, c-format |
a0b6b246 JX |
3151 | msgid "invalid shallow line: %s" |
3152 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 3153 | |
a5cd71ca | 3154 | #: fetch-pack.c:362 fetch-pack.c:1286 |
c04f5ac3 | 3155 | #, c-format |
a0b6b246 JX |
3156 | msgid "invalid unshallow line: %s" |
3157 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 3158 | |
a5cd71ca | 3159 | #: fetch-pack.c:364 fetch-pack.c:1288 |
a0b6b246 JX |
3160 | #, c-format |
3161 | msgid "object not found: %s" | |
3162 | msgstr "对象未找到:%s" | |
07432cef | 3163 | |
a5cd71ca | 3164 | #: fetch-pack.c:367 fetch-pack.c:1291 |
c04f5ac3 | 3165 | #, c-format |
a0b6b246 JX |
3166 | msgid "error in object: %s" |
3167 | msgstr "对象中出错:%s" | |
07432cef | 3168 | |
a5cd71ca | 3169 | #: fetch-pack.c:369 fetch-pack.c:1293 |
c04f5ac3 | 3170 | #, c-format |
a0b6b246 JX |
3171 | msgid "no shallow found: %s" |
3172 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 3173 | |
a5cd71ca | 3174 | #: fetch-pack.c:372 fetch-pack.c:1297 |
a0b6b246 JX |
3175 | #, c-format |
3176 | msgid "expected shallow/unshallow, got %s" | |
3177 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 3178 | |
a5cd71ca | 3179 | #: fetch-pack.c:414 |
a0b6b246 JX |
3180 | #, c-format |
3181 | msgid "got %s %d %s" | |
3182 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 3183 | |
a5cd71ca | 3184 | #: fetch-pack.c:431 |
1b7f4a34 | 3185 | #, c-format |
a0b6b246 JX |
3186 | msgid "invalid commit %s" |
3187 | msgstr "无效提交 %s" | |
1b7f4a34 | 3188 | |
a5cd71ca | 3189 | #: fetch-pack.c:462 |
a0b6b246 JX |
3190 | msgid "giving up" |
3191 | msgstr "放弃" | |
814ff314 | 3192 | |
a5cd71ca | 3193 | #: fetch-pack.c:475 progress.c:312 |
a0b6b246 JX |
3194 | msgid "done" |
3195 | msgstr "完成" | |
2e8451e8 | 3196 | |
a5cd71ca | 3197 | #: fetch-pack.c:487 |
2e8451e8 | 3198 | #, c-format |
a0b6b246 JX |
3199 | msgid "got %s (%d) %s" |
3200 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 3201 | |
a5cd71ca | 3202 | #: fetch-pack.c:533 |
a0b6b246 JX |
3203 | #, c-format |
3204 | msgid "Marking %s as complete" | |
3205 | msgstr "标记 %s 为完成" | |
220c313c | 3206 | |
a5cd71ca | 3207 | #: fetch-pack.c:742 |
a0b6b246 JX |
3208 | #, c-format |
3209 | msgid "already have %s (%s)" | |
29004bbb | 3210 | msgstr "已经有 %s(%s)" |
220c313c | 3211 | |
a5cd71ca | 3212 | #: fetch-pack.c:781 |
a0b6b246 JX |
3213 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
3214 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 3215 | |
a5cd71ca | 3216 | #: fetch-pack.c:789 |
a0b6b246 JX |
3217 | msgid "protocol error: bad pack header" |
3218 | msgstr "协议错误:坏的包头" | |
814ff314 | 3219 | |
a5cd71ca | 3220 | #: fetch-pack.c:857 |
a0b6b246 JX |
3221 | #, c-format |
3222 | msgid "fetch-pack: unable to fork off %s" | |
3223 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 3224 | |
a5cd71ca | 3225 | #: fetch-pack.c:873 |
a0b6b246 JX |
3226 | #, c-format |
3227 | msgid "%s failed" | |
3228 | msgstr "%s 失败" | |
14c8bced | 3229 | |
a5cd71ca | 3230 | #: fetch-pack.c:875 |
a0b6b246 JX |
3231 | msgid "error in sideband demultiplexer" |
3232 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 3233 | |
a5cd71ca | 3234 | #: fetch-pack.c:907 |
81809b99 | 3235 | #, c-format |
a0b6b246 JX |
3236 | msgid "Server version is %.*s" |
3237 | msgstr "服务器版本 %.*s" | |
8ada9598 | 3238 | |
a5cd71ca JX |
3239 | #: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 |
3240 | #: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 | |
3241 | #: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 | |
3242 | #: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 | |
a6cd2cc4 JX |
3243 | #, c-format |
3244 | msgid "Server supports %s" | |
3245 | msgstr "服务器支持 %s" | |
3246 | ||
a5cd71ca | 3247 | #: fetch-pack.c:914 |
a6cd2cc4 JX |
3248 | msgid "Server does not support shallow clients" |
3249 | msgstr "服务器不支持 shalllow 客户端" | |
3250 | ||
a5cd71ca | 3251 | #: fetch-pack.c:974 |
a0b6b246 JX |
3252 | msgid "Server does not support --shallow-since" |
3253 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 3254 | |
a5cd71ca | 3255 | #: fetch-pack.c:979 |
a0b6b246 JX |
3256 | msgid "Server does not support --shallow-exclude" |
3257 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 3258 | |
a5cd71ca | 3259 | #: fetch-pack.c:983 |
a0b6b246 JX |
3260 | msgid "Server does not support --deepen" |
3261 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 3262 | |
a5cd71ca | 3263 | #: fetch-pack.c:1000 |
a0b6b246 JX |
3264 | msgid "no common commits" |
3265 | msgstr "没有共同的提交" | |
c04f5ac3 | 3266 | |
a5cd71ca | 3267 | #: fetch-pack.c:1012 fetch-pack.c:1468 |
a0b6b246 JX |
3268 | msgid "git fetch-pack: fetch failed." |
3269 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 3270 | |
a5cd71ca | 3271 | #: fetch-pack.c:1150 |
fd8cb379 JX |
3272 | msgid "Server does not support shallow requests" |
3273 | msgstr "服务器不支持 shalllow 请求" | |
3274 | ||
a6cd2cc4 JX |
3275 | #: fetch-pack.c:1157 |
3276 | msgid "Server supports filter" | |
3277 | msgstr "服务器支持 filter" | |
3278 | ||
a5cd71ca | 3279 | #: fetch-pack.c:1180 |
d46c5519 JX |
3280 | msgid "unable to write request to remote" |
3281 | msgstr "无法将请求写到远程" | |
3282 | ||
a5cd71ca | 3283 | #: fetch-pack.c:1198 |
c1ac5258 JX |
3284 | #, c-format |
3285 | msgid "error reading section header '%s'" | |
3286 | msgstr "读取节标题 '%s' 出错" | |
3287 | ||
a5cd71ca | 3288 | #: fetch-pack.c:1204 |
c1ac5258 JX |
3289 | #, c-format |
3290 | msgid "expected '%s', received '%s'" | |
3291 | msgstr "预期 '%s',得到 '%s'" | |
3292 | ||
a5cd71ca | 3293 | #: fetch-pack.c:1243 |
c1ac5258 JX |
3294 | #, c-format |
3295 | msgid "unexpected acknowledgment line: '%s'" | |
3296 | msgstr "意外的确认行:'%s'" | |
3297 | ||
a5cd71ca | 3298 | #: fetch-pack.c:1248 |
c1ac5258 JX |
3299 | #, c-format |
3300 | msgid "error processing acks: %d" | |
3301 | msgstr "处理 ack 出错:%d" | |
3302 | ||
a5cd71ca | 3303 | #: fetch-pack.c:1258 |
4c27fcb5 JX |
3304 | msgid "expected packfile to be sent after 'ready'" |
3305 | msgstr "预期在 'ready' 之后发送 packfile" | |
3306 | ||
a5cd71ca | 3307 | #: fetch-pack.c:1260 |
4c27fcb5 JX |
3308 | msgid "expected no other sections to be sent after no 'ready'" |
3309 | msgstr "在没有 'ready' 不应该发送其它小节" | |
3310 | ||
a5cd71ca | 3311 | #: fetch-pack.c:1302 |
c1ac5258 JX |
3312 | #, c-format |
3313 | msgid "error processing shallow info: %d" | |
3314 | msgstr "处理浅克隆信息出错:%d" | |
3315 | ||
a5cd71ca | 3316 | #: fetch-pack.c:1349 |
c1ac5258 JX |
3317 | #, c-format |
3318 | msgid "expected wanted-ref, got '%s'" | |
3319 | msgstr "预期 wanted-ref,得到 '%s'" | |
3320 | ||
a5cd71ca | 3321 | #: fetch-pack.c:1354 |
c1ac5258 JX |
3322 | #, c-format |
3323 | msgid "unexpected wanted-ref: '%s'" | |
3324 | msgstr "意外的 wanted-ref:'%s'" | |
3325 | ||
a5cd71ca | 3326 | #: fetch-pack.c:1359 |
c1ac5258 JX |
3327 | #, c-format |
3328 | msgid "error processing wanted refs: %d" | |
3329 | msgstr "处理要获取的引用出错:%d" | |
3330 | ||
a5cd71ca | 3331 | #: fetch-pack.c:1693 |
a0b6b246 JX |
3332 | msgid "no matching remote head" |
3333 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 3334 | |
a5cd71ca | 3335 | #: fetch-pack.c:1716 builtin/clone.c:685 |
c1ac5258 | 3336 | msgid "remote did not send all necessary objects" |
e640d114 | 3337 | msgstr "远程没有发送所有必需的对象" |
c1ac5258 | 3338 | |
a5cd71ca | 3339 | #: fetch-pack.c:1743 |
87cb7997 JX |
3340 | #, c-format |
3341 | msgid "no such remote ref %s" | |
3342 | msgstr "没有这样的远程引用 %s" | |
3343 | ||
a5cd71ca | 3344 | #: fetch-pack.c:1746 |
87cb7997 JX |
3345 | #, c-format |
3346 | msgid "Server does not allow request for unadvertised object %s" | |
3347 | msgstr "服务器不允许请求未公开的对象 %s" | |
3348 | ||
a6cd2cc4 | 3349 | #: gpg-interface.c:321 |
a0b6b246 JX |
3350 | msgid "gpg failed to sign the data" |
3351 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 3352 | |
a6cd2cc4 | 3353 | #: gpg-interface.c:347 |
a0b6b246 JX |
3354 | msgid "could not create temporary file" |
3355 | msgstr "不能创建临时文件" | |
c04f5ac3 | 3356 | |
a6cd2cc4 | 3357 | #: gpg-interface.c:350 |
c04f5ac3 | 3358 | #, c-format |
a0b6b246 JX |
3359 | msgid "failed writing detached signature to '%s'" |
3360 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 3361 | |
a4f16749 | 3362 | #: graph.c:97 |
1a79b2f1 JX |
3363 | #, c-format |
3364 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
3365 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
3366 | ||
a5cd71ca JX |
3367 | #: grep.c:668 |
3368 | msgid "" | |
3369 | "given pattern contains NULL byte (via -f <file>). This is only supported " | |
3370 | "with -P under PCRE v2" | |
3371 | msgstr "" | |
3372 | "给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此功能" | |
3373 | ||
3374 | #: grep.c:2124 | |
c04f5ac3 | 3375 | #, c-format |
a0b6b246 JX |
3376 | msgid "'%s': unable to read %s" |
3377 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 3378 | |
a5cd71ca | 3379 | #: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 |
06991777 | 3380 | #: builtin/rm.c:135 |
c04f5ac3 | 3381 | #, c-format |
a0b6b246 | 3382 | msgid "failed to stat '%s'" |
65e2041e | 3383 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 3384 | |
a5cd71ca | 3385 | #: grep.c:2152 |
a0b6b246 JX |
3386 | #, c-format |
3387 | msgid "'%s': short read" | |
3388 | msgstr "'%s':读取不完整" | |
5c57d762 | 3389 | |
fd8cb379 JX |
3390 | #: help.c:23 |
3391 | msgid "start a working area (see also: git help tutorial)" | |
3392 | msgstr "开始一个工作区(参见:git help tutorial)" | |
3393 | ||
3394 | #: help.c:24 | |
3395 | msgid "work on the current change (see also: git help everyday)" | |
3396 | msgstr "在当前变更上工作(参见:git help everyday)" | |
3397 | ||
3398 | #: help.c:25 | |
3399 | msgid "examine the history and state (see also: git help revisions)" | |
3400 | msgstr "检查历史和状态(参见:git help revisions)" | |
3401 | ||
3402 | #: help.c:26 | |
3403 | msgid "grow, mark and tweak your common history" | |
3404 | msgstr "扩展、标记和调校您的历史记录" | |
3405 | ||
3406 | #: help.c:27 | |
3407 | msgid "collaborate (see also: git help workflows)" | |
3408 | msgstr "协同(参见:git help workflows)" | |
3409 | ||
3410 | #: help.c:31 | |
3411 | msgid "Main Porcelain Commands" | |
3412 | msgstr "主要的上层命令" | |
3413 | ||
3414 | #: help.c:32 | |
3415 | msgid "Ancillary Commands / Manipulators" | |
3416 | msgstr "辅助命令/操作者" | |
3417 | ||
3418 | #: help.c:33 | |
3419 | msgid "Ancillary Commands / Interrogators" | |
3420 | msgstr "辅助命令/询问者" | |
3421 | ||
3422 | #: help.c:34 | |
3423 | msgid "Interacting with Others" | |
3424 | msgstr "与其它系统交互" | |
3425 | ||
3426 | #: help.c:35 | |
3427 | msgid "Low-level Commands / Manipulators" | |
3428 | msgstr "低级命令/操作者" | |
3429 | ||
3430 | #: help.c:36 | |
3431 | msgid "Low-level Commands / Interrogators" | |
3432 | msgstr "低级命令/询问者" | |
3433 | ||
3434 | #: help.c:37 | |
3435 | msgid "Low-level Commands / Synching Repositories" | |
3436 | msgstr "低级命令/同步仓库" | |
3437 | ||
3438 | #: help.c:38 | |
3439 | msgid "Low-level Commands / Internal Helpers" | |
3440 | msgstr "低级命令/内部助手" | |
3441 | ||
06991777 | 3442 | #: help.c:298 |
a0b6b246 JX |
3443 | #, c-format |
3444 | msgid "available git commands in '%s'" | |
3445 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 3446 | |
06991777 | 3447 | #: help.c:305 |
a0b6b246 JX |
3448 | msgid "git commands available from elsewhere on your $PATH" |
3449 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 3450 | |
06991777 | 3451 | #: help.c:314 |
a0b6b246 JX |
3452 | msgid "These are common Git commands used in various situations:" |
3453 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 3454 | |
a6cd2cc4 | 3455 | #: help.c:363 git.c:98 |
fd8cb379 JX |
3456 | #, c-format |
3457 | msgid "unsupported command listing type '%s'" | |
3458 | msgstr "不支持的命令列表类型 '%s'" | |
3459 | ||
d46c5519 | 3460 | #: help.c:403 |
fd8cb379 JX |
3461 | msgid "The common Git guides are:" |
3462 | msgstr "最常用的 Git 向导有:" | |
3463 | ||
d46c5519 | 3464 | #: help.c:512 |
4c27fcb5 JX |
3465 | msgid "See 'git help <command>' to read about a specific subcommand" |
3466 | msgstr "执行 'git help <command>' 来查看特定子命令" | |
3467 | ||
d46c5519 | 3468 | #: help.c:517 |
4c27fcb5 JX |
3469 | msgid "External commands" |
3470 | msgstr "外部命令" | |
3471 | ||
d46c5519 | 3472 | #: help.c:532 |
4c27fcb5 JX |
3473 | msgid "Command aliases" |
3474 | msgstr "命令别名" | |
3475 | ||
d46c5519 | 3476 | #: help.c:596 |
c04f5ac3 | 3477 | #, c-format |
a0b6b246 JX |
3478 | msgid "" |
3479 | "'%s' appears to be a git command, but we were not\n" | |
3480 | "able to execute it. Maybe git-%s is broken?" | |
3481 | msgstr "" | |
3482 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
3483 | "可能是 git-%s 受损?" | |
c04f5ac3 | 3484 | |
d46c5519 | 3485 | #: help.c:655 |
a0b6b246 JX |
3486 | msgid "Uh oh. Your system reports no Git commands at all." |
3487 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 3488 | |
d46c5519 | 3489 | #: help.c:677 |
c04f5ac3 | 3490 | #, c-format |
a4f16749 | 3491 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 3492 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 3493 | |
d46c5519 | 3494 | #: help.c:682 |
a4f16749 JX |
3495 | #, c-format |
3496 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 3497 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 3498 | |
d46c5519 | 3499 | #: help.c:687 |
c04f5ac3 | 3500 | #, c-format |
a4f16749 | 3501 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 3502 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 3503 | |
d46c5519 | 3504 | #: help.c:695 |
c04f5ac3 | 3505 | #, c-format |
a0b6b246 JX |
3506 | msgid "git: '%s' is not a git command. See 'git --help'." |
3507 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 3508 | |
d46c5519 | 3509 | #: help.c:699 |
a4f16749 JX |
3510 | msgid "" |
3511 | "\n" | |
3512 | "The most similar command is" | |
3513 | msgid_plural "" | |
3514 | "\n" | |
3515 | "The most similar commands are" | |
6937cb4e JX |
3516 | msgstr[0] "" |
3517 | "\n" | |
3518 | "最相似的命令是" | |
3519 | msgstr[1] "" | |
3520 | "\n" | |
3521 | "最相似的命令是" | |
a4f16749 | 3522 | |
d46c5519 | 3523 | #: help.c:714 |
a4f16749 JX |
3524 | msgid "git version [<options>]" |
3525 | msgstr "git version [<选项>]" | |
3526 | ||
a5cd71ca | 3527 | #: help.c:783 |
a4f16749 JX |
3528 | #, c-format |
3529 | msgid "%s: %s - %s" | |
3530 | msgstr "%s:%s - %s" | |
3531 | ||
a5cd71ca | 3532 | #: help.c:787 |
a0b6b246 JX |
3533 | msgid "" |
3534 | "\n" | |
3535 | "Did you mean this?" | |
3536 | msgid_plural "" | |
3537 | "\n" | |
3538 | "Did you mean one of these?" | |
3539 | msgstr[0] "" | |
3540 | "\n" | |
3541 | "您指的是这个么?" | |
3542 | msgstr[1] "" | |
3543 | "\n" | |
3544 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 3545 | |
d46c5519 | 3546 | #: ident.c:349 |
a0b6b246 JX |
3547 | msgid "" |
3548 | "\n" | |
3549 | "*** Please tell me who you are.\n" | |
3550 | "\n" | |
3551 | "Run\n" | |
3552 | "\n" | |
3553 | " git config --global user.email \"you@example.com\"\n" | |
3554 | " git config --global user.name \"Your Name\"\n" | |
3555 | "\n" | |
3556 | "to set your account's default identity.\n" | |
3557 | "Omit --global to set the identity only in this repository.\n" | |
3558 | "\n" | |
3559 | msgstr "" | |
3560 | "\n" | |
3561 | "*** 请告诉我你是谁。\n" | |
3562 | "\n" | |
3563 | "运行\n" | |
3564 | "\n" | |
3565 | " git config --global user.email \"you@example.com\"\n" | |
3566 | " git config --global user.name \"Your Name\"\n" | |
3567 | "\n" | |
3568 | "来设置您账号的缺省身份标识。\n" | |
3569 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 3570 | |
d46c5519 | 3571 | #: ident.c:379 |
87cb7997 | 3572 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 3573 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 3574 | |
d46c5519 | 3575 | #: ident.c:384 |
87cb7997 JX |
3576 | #, c-format |
3577 | msgid "unable to auto-detect email address (got '%s')" | |
3578 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
3579 | ||
d46c5519 | 3580 | #: ident.c:401 |
87cb7997 JX |
3581 | msgid "no name was given and auto-detection is disabled" |
3582 | msgstr "未提供姓名且自动探测被禁用" | |
3583 | ||
d46c5519 | 3584 | #: ident.c:407 |
87cb7997 JX |
3585 | #, c-format |
3586 | msgid "unable to auto-detect name (got '%s')" | |
3587 | msgstr "无法自动探测姓名(得到 '%s')" | |
3588 | ||
d46c5519 | 3589 | #: ident.c:415 |
87cb7997 JX |
3590 | #, c-format |
3591 | msgid "empty ident name (for <%s>) not allowed" | |
3592 | msgstr "不允许空的姓名(对于 <%s>)" | |
3593 | ||
d46c5519 | 3594 | #: ident.c:421 |
87cb7997 JX |
3595 | #, c-format |
3596 | msgid "name consists only of disallowed characters: %s" | |
3597 | msgstr "姓名中仅包含禁用字符:%s" | |
3598 | ||
a6cd2cc4 | 3599 | #: ident.c:436 builtin/commit.c:611 |
87cb7997 JX |
3600 | #, c-format |
3601 | msgid "invalid date format: %s" | |
3602 | msgstr "无效的日期格式:%s" | |
3603 | ||
a5cd71ca | 3604 | #: list-objects.c:127 |
d46c5519 JX |
3605 | #, c-format |
3606 | msgid "entry '%s' in tree %s has tree mode, but is not a tree" | |
3607 | msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象" | |
3608 | ||
a5cd71ca | 3609 | #: list-objects.c:140 |
d46c5519 JX |
3610 | #, c-format |
3611 | msgid "entry '%s' in tree %s has blob mode, but is not a blob" | |
3612 | msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象" | |
3613 | ||
a5cd71ca | 3614 | #: list-objects.c:375 |
d46c5519 JX |
3615 | #, c-format |
3616 | msgid "unable to load root tree for commit %s" | |
3617 | msgstr "无法为提交 %s 加载根树" | |
3618 | ||
a5cd71ca JX |
3619 | #: list-objects-filter.c:492 |
3620 | #, c-format | |
3621 | msgid "unable to access sparse blob in '%s'" | |
3622 | msgstr "不能访问 '%s' 中的稀疏数据对象" | |
3623 | ||
3624 | #: list-objects-filter.c:495 | |
3625 | #, c-format | |
3626 | msgid "unable to parse sparse filter data in %s" | |
3627 | msgstr "无法解析 %s 中的稀疏过滤器数据" | |
5809aa05 | 3628 | |
4c27fcb5 | 3629 | #: list-objects-filter-options.c:58 |
06991777 JX |
3630 | msgid "expected 'tree:<depth>'" |
3631 | msgstr "期望 'tree:<深度>'" | |
4c27fcb5 | 3632 | |
a5cd71ca | 3633 | #: list-objects-filter-options.c:73 |
d46c5519 JX |
3634 | msgid "sparse:path filters support has been dropped" |
3635 | msgstr "sparse:path 过滤器支持已被删除" | |
3636 | ||
a5cd71ca | 3637 | #: list-objects-filter-options.c:86 |
a6cd2cc4 JX |
3638 | #, c-format |
3639 | msgid "invalid filter-spec '%s'" | |
3640 | msgstr "无效的过滤器表达式 '%s'" | |
3641 | ||
a5cd71ca JX |
3642 | #: list-objects-filter-options.c:102 |
3643 | #, c-format | |
3644 | msgid "must escape char in sub-filter-spec: '%c'" | |
3645 | msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'" | |
3646 | ||
3647 | #: list-objects-filter-options.c:144 | |
3648 | msgid "expected something after combine:" | |
3649 | msgstr "期望在组合后有一些东西:" | |
3650 | ||
3651 | #: list-objects-filter-options.c:226 | |
3652 | msgid "multiple filter-specs cannot be combined" | |
3653 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 3654 | |
6937cb4e | 3655 | #: lockfile.c:151 |
c04f5ac3 | 3656 | #, c-format |
a0b6b246 JX |
3657 | msgid "" |
3658 | "Unable to create '%s.lock': %s.\n" | |
3659 | "\n" | |
3660 | "Another git process seems to be running in this repository, e.g.\n" | |
3661 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
3662 | "are terminated then try again. If it still fails, a git process\n" | |
3663 | "may have crashed in this repository earlier:\n" | |
3664 | "remove the file manually to continue." | |
3665 | msgstr "" | |
3666 | "无法创建 '%s.lock':%s。\n" | |
3667 | "\n" | |
3668 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
3669 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
3670 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
3671 | "手动删除这个文件再继续。" | |
c04f5ac3 | 3672 | |
6937cb4e | 3673 | #: lockfile.c:159 |
a0b6b246 JX |
3674 | #, c-format |
3675 | msgid "Unable to create '%s.lock': %s" | |
3676 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 3677 | |
4c27fcb5 | 3678 | #: merge.c:41 |
a0b6b246 | 3679 | msgid "failed to read the cache" |
c1ac5258 | 3680 | msgstr "读取缓存失败" |
c04f5ac3 | 3681 | |
a5cd71ca JX |
3682 | #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 |
3683 | #: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 | |
d46c5519 | 3684 | #: builtin/stash.c:264 |
a0b6b246 JX |
3685 | msgid "unable to write new index file" |
3686 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 3687 | |
a5cd71ca | 3688 | #: merge-recursive.c:367 |
a0b6b246 JX |
3689 | msgid "(bad commit)\n" |
3690 | msgstr "(坏提交)\n" | |
c04f5ac3 | 3691 | |
a5cd71ca | 3692 | #: merge-recursive.c:390 |
a0b6b246 | 3693 | #, c-format |
fd8cb379 | 3694 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 3695 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 3696 | |
a5cd71ca | 3697 | #: merge-recursive.c:399 |
fd8cb379 JX |
3698 | #, c-format |
3699 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 3700 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 | 3701 | |
a5cd71ca | 3702 | #: merge-recursive.c:885 |
c04f5ac3 | 3703 | #, c-format |
a0b6b246 | 3704 | msgid "failed to create path '%s'%s" |
c1ac5258 | 3705 | msgstr "创建路径 '%s'%s 失败" |
c04f5ac3 | 3706 | |
a5cd71ca | 3707 | #: merge-recursive.c:896 |
c04f5ac3 | 3708 | #, c-format |
a0b6b246 JX |
3709 | msgid "Removing %s to make room for subdirectory\n" |
3710 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 3711 | |
a5cd71ca | 3712 | #: merge-recursive.c:910 merge-recursive.c:929 |
a0b6b246 JX |
3713 | msgid ": perhaps a D/F conflict?" |
3714 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 3715 | |
a5cd71ca | 3716 | #: merge-recursive.c:919 |
c04f5ac3 | 3717 | #, c-format |
a0b6b246 JX |
3718 | msgid "refusing to lose untracked file at '%s'" |
3719 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 3720 | |
a5cd71ca | 3721 | #: merge-recursive.c:960 builtin/cat-file.c:41 |
c04f5ac3 | 3722 | #, c-format |
a0b6b246 JX |
3723 | msgid "cannot read object %s '%s'" |
3724 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 3725 | |
a5cd71ca | 3726 | #: merge-recursive.c:965 |
4dcdc3d8 | 3727 | #, c-format |
a0b6b246 JX |
3728 | msgid "blob expected for %s '%s'" |
3729 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 3730 | |
a5cd71ca | 3731 | #: merge-recursive.c:990 |
4dcdc3d8 | 3732 | #, c-format |
a0b6b246 | 3733 | msgid "failed to open '%s': %s" |
c1ac5258 | 3734 | msgstr "打开 '%s' 失败:%s" |
4dcdc3d8 | 3735 | |
a5cd71ca | 3736 | #: merge-recursive.c:1001 |
a0b6b246 JX |
3737 | #, c-format |
3738 | msgid "failed to symlink '%s': %s" | |
c1ac5258 | 3739 | msgstr "创建符号链接 '%s' 失败:%s" |
c04f5ac3 | 3740 | |
a5cd71ca | 3741 | #: merge-recursive.c:1006 |
5c57d762 | 3742 | #, c-format |
a0b6b246 JX |
3743 | msgid "do not know what to do with %06o %s '%s'" |
3744 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 3745 | |
a5cd71ca | 3746 | #: merge-recursive.c:1199 |
fd8cb379 JX |
3747 | #, c-format |
3748 | msgid "Failed to merge submodule %s (not checked out)" | |
3749 | msgstr "无法合并子模组 %s (没有检出)" | |
3750 | ||
a5cd71ca | 3751 | #: merge-recursive.c:1206 |
fd8cb379 JX |
3752 | #, c-format |
3753 | msgid "Failed to merge submodule %s (commits not present)" | |
3754 | msgstr "无法合并子模组 %s(提交不存在)" | |
3755 | ||
a5cd71ca | 3756 | #: merge-recursive.c:1213 |
fd8cb379 JX |
3757 | #, c-format |
3758 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
3759 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
3760 | ||
a5cd71ca | 3761 | #: merge-recursive.c:1221 merge-recursive.c:1233 |
fd8cb379 JX |
3762 | #, c-format |
3763 | msgid "Fast-forwarding submodule %s to the following commit:" | |
3764 | msgstr "子模组 %s 快进到如下提交:" | |
3765 | ||
a5cd71ca | 3766 | #: merge-recursive.c:1224 merge-recursive.c:1236 |
fd8cb379 JX |
3767 | #, c-format |
3768 | msgid "Fast-forwarding submodule %s" | |
3769 | msgstr "快进子模组 %s" | |
3770 | ||
a5cd71ca | 3771 | #: merge-recursive.c:1259 |
fd8cb379 JX |
3772 | #, c-format |
3773 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
3774 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
3775 | ||
a5cd71ca | 3776 | #: merge-recursive.c:1263 |
fd8cb379 JX |
3777 | #, c-format |
3778 | msgid "Failed to merge submodule %s (not fast-forward)" | |
3779 | msgstr "无法合并子模组 %s(非快进)" | |
3780 | ||
a5cd71ca | 3781 | #: merge-recursive.c:1264 |
fd8cb379 JX |
3782 | msgid "Found a possible merge resolution for the submodule:\n" |
3783 | msgstr "找到子模组的一个可能的合并方案:\n" | |
3784 | ||
a5cd71ca | 3785 | #: merge-recursive.c:1267 |
fd8cb379 JX |
3786 | #, c-format |
3787 | msgid "" | |
3788 | "If this is correct simply add it to the index for example\n" | |
3789 | "by using:\n" | |
3790 | "\n" | |
3791 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
3792 | "\n" | |
3793 | "which will accept this suggestion.\n" | |
3794 | msgstr "" | |
3795 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
3796 | "\n" | |
3797 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
3798 | "\n" | |
3799 | "以接受此建议。\n" | |
3800 | ||
a5cd71ca | 3801 | #: merge-recursive.c:1276 |
fd8cb379 JX |
3802 | #, c-format |
3803 | msgid "Failed to merge submodule %s (multiple merges found)" | |
3804 | msgstr "无法合并子模组 %s (发现多个合并)" | |
3805 | ||
a5cd71ca | 3806 | #: merge-recursive.c:1349 |
a0b6b246 JX |
3807 | msgid "Failed to execute internal merge" |
3808 | msgstr "无法执行内部合并" | |
3809 | ||
a5cd71ca | 3810 | #: merge-recursive.c:1354 |
5c57d762 | 3811 | #, c-format |
a0b6b246 JX |
3812 | msgid "Unable to add %s to database" |
3813 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 3814 | |
a5cd71ca | 3815 | #: merge-recursive.c:1386 |
fd8cb379 JX |
3816 | #, c-format |
3817 | msgid "Auto-merging %s" | |
3818 | msgstr "自动合并 %s" | |
3819 | ||
a5cd71ca | 3820 | #: merge-recursive.c:1410 |
fd8cb379 JX |
3821 | #, c-format |
3822 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
3823 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
3824 | ||
a5cd71ca | 3825 | #: merge-recursive.c:1482 |
5c57d762 JX |
3826 | #, c-format |
3827 | msgid "" | |
a0b6b246 JX |
3828 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
3829 | "in tree." | |
5c57d762 | 3830 | msgstr "" |
87cb7997 JX |
3831 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3832 | "本被保留。" | |
3833 | ||
a5cd71ca | 3834 | #: merge-recursive.c:1487 |
87cb7997 JX |
3835 | #, c-format |
3836 | msgid "" | |
3837 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3838 | "left in tree." | |
3839 | msgstr "" | |
3840 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3841 | "%7$s 版本被保留。" | |
c04f5ac3 | 3842 | |
a5cd71ca | 3843 | #: merge-recursive.c:1494 |
7aea43ff | 3844 | #, c-format |
a0b6b246 JX |
3845 | msgid "" |
3846 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
3847 | "in tree at %s." | |
3848 | msgstr "" | |
87cb7997 JX |
3849 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3850 | "本保留在 %8$s 中。" | |
7aea43ff | 3851 | |
a5cd71ca | 3852 | #: merge-recursive.c:1499 |
87cb7997 JX |
3853 | #, c-format |
3854 | msgid "" | |
3855 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3856 | "left in tree at %s." | |
3857 | msgstr "" | |
3858 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3859 | "%7$s 版本保留在 %9$s 中。" | |
3860 | ||
a5cd71ca | 3861 | #: merge-recursive.c:1534 |
a0b6b246 JX |
3862 | msgid "rename" |
3863 | msgstr "重命名" | |
5b04ee3b | 3864 | |
a5cd71ca | 3865 | #: merge-recursive.c:1534 |
a0b6b246 JX |
3866 | msgid "renamed" |
3867 | msgstr "重命名" | |
5b04ee3b | 3868 | |
a5cd71ca | 3869 | #: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 |
fd8cb379 JX |
3870 | #, c-format |
3871 | msgid "Refusing to lose dirty file at %s" | |
3872 | msgstr "拒绝丢失脏文件 '%s'" | |
3873 | ||
a5cd71ca | 3874 | #: merge-recursive.c:1624 |
06991777 JX |
3875 | #, c-format |
3876 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
3877 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" | |
3878 | ||
a5cd71ca | 3879 | #: merge-recursive.c:1682 |
06991777 JX |
3880 | #, c-format |
3881 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" | |
3882 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
3883 | ||
a5cd71ca | 3884 | #: merge-recursive.c:1713 |
5c57d762 | 3885 | #, c-format |
a0b6b246 JX |
3886 | msgid "%s is a directory in %s adding as %s instead" |
3887 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 3888 | |
a5cd71ca | 3889 | #: merge-recursive.c:1718 |
fd8cb379 JX |
3890 | #, c-format |
3891 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
3892 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
3893 | ||
a5cd71ca | 3894 | #: merge-recursive.c:1737 |
5c57d762 JX |
3895 | #, c-format |
3896 | msgid "" | |
a0b6b246 JX |
3897 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
3898 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 3899 | msgstr "" |
a0b6b246 JX |
3900 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
3901 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 3902 | |
a5cd71ca | 3903 | #: merge-recursive.c:1742 |
a0b6b246 JX |
3904 | msgid " (left unresolved)" |
3905 | msgstr "(留下未解决)" | |
5c57d762 | 3906 | |
a5cd71ca | 3907 | #: merge-recursive.c:1851 |
5c57d762 | 3908 | #, c-format |
a0b6b246 | 3909 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 3910 | msgstr "" |
a0b6b246 JX |
3911 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
3912 | "%5$s" | |
3495628d | 3913 | |
a5cd71ca | 3914 | #: merge-recursive.c:2056 |
fd8cb379 JX |
3915 | #, c-format |
3916 | msgid "" | |
3917 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
3918 | "directory %s was renamed to multiple other directories, with no destination " | |
3919 | "getting a majority of the files." | |
c1ac5258 JX |
3920 | msgstr "" |
3921 | "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" | |
3922 | "其它目录,没有目录包含大部分文件。" | |
fd8cb379 | 3923 | |
a5cd71ca | 3924 | #: merge-recursive.c:2088 |
fd8cb379 JX |
3925 | #, c-format |
3926 | msgid "" | |
3927 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
3928 | "implicit directory rename(s) putting the following path(s) there: %s." | |
3929 | msgstr "" | |
3930 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
3931 | "在:%s。" | |
3932 | ||
a5cd71ca | 3933 | #: merge-recursive.c:2098 |
fd8cb379 JX |
3934 | #, c-format |
3935 | msgid "" | |
3936 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
3937 | "implicit directory renames tried to put these paths there: %s" | |
3938 | msgstr "" | |
3939 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
3940 | "径放置于此:%s" | |
3941 | ||
a5cd71ca | 3942 | #: merge-recursive.c:2190 |
fd8cb379 JX |
3943 | #, c-format |
3944 | msgid "" | |
3945 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
3946 | ">%s in %s" | |
3947 | msgstr "" | |
3948 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
3949 | "%4$s->%5$s" | |
3950 | ||
a5cd71ca | 3951 | #: merge-recursive.c:2435 |
fd8cb379 JX |
3952 | #, c-format |
3953 | msgid "" | |
3954 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
3955 | "renamed." | |
3956 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
3957 | ||
a5cd71ca | 3958 | #: merge-recursive.c:2961 |
90314792 | 3959 | #, c-format |
a0b6b246 JX |
3960 | msgid "cannot read object %s" |
3961 | msgstr "不能读取对象 %s" | |
90314792 | 3962 | |
a5cd71ca | 3963 | #: merge-recursive.c:2964 |
90314792 | 3964 | #, c-format |
a0b6b246 JX |
3965 | msgid "object %s is not a blob" |
3966 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 3967 | |
a5cd71ca | 3968 | #: merge-recursive.c:3028 |
a0b6b246 JX |
3969 | msgid "modify" |
3970 | msgstr "修改" | |
90314792 | 3971 | |
a5cd71ca | 3972 | #: merge-recursive.c:3028 |
a0b6b246 JX |
3973 | msgid "modified" |
3974 | msgstr "修改" | |
5b04ee3b | 3975 | |
a5cd71ca | 3976 | #: merge-recursive.c:3040 |
a0b6b246 JX |
3977 | msgid "content" |
3978 | msgstr "内容" | |
5b04ee3b | 3979 | |
a5cd71ca | 3980 | #: merge-recursive.c:3044 |
a0b6b246 JX |
3981 | msgid "add/add" |
3982 | msgstr "添加/添加" | |
3495628d | 3983 | |
a5cd71ca | 3984 | #: merge-recursive.c:3067 |
220c313c | 3985 | #, c-format |
a0b6b246 JX |
3986 | msgid "Skipped %s (merged same as existing)" |
3987 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 3988 | |
a5cd71ca | 3989 | #: merge-recursive.c:3089 git-submodule.sh:937 |
a0b6b246 JX |
3990 | msgid "submodule" |
3991 | msgstr "子模组" | |
3992 | ||
a5cd71ca | 3993 | #: merge-recursive.c:3090 |
220c313c | 3994 | #, c-format |
a0b6b246 JX |
3995 | msgid "CONFLICT (%s): Merge conflict in %s" |
3996 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 3997 | |
a5cd71ca | 3998 | #: merge-recursive.c:3120 |
220c313c | 3999 | #, c-format |
06991777 JX |
4000 | msgid "Adding as %s instead" |
4001 | msgstr "而是以 %s 为名添加" | |
4002 | ||
a5cd71ca | 4003 | #: merge-recursive.c:3203 |
06991777 | 4004 | #, c-format |
d46c5519 JX |
4005 | msgid "" |
4006 | "Path updated: %s added in %s inside a directory that was renamed in %s; " | |
4007 | "moving it to %s." | |
4008 | msgstr "" | |
5b533632 | 4009 | "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。" |
220c313c | 4010 | |
a5cd71ca | 4011 | #: merge-recursive.c:3206 |
d46c5519 JX |
4012 | #, c-format |
4013 | msgid "" | |
4014 | "CONFLICT (file location): %s added in %s inside a directory that was renamed " | |
4015 | "in %s, suggesting it should perhaps be moved to %s." | |
4016 | msgstr "" | |
4017 | "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动" | |
4018 | "到 %s。" | |
4019 | ||
a5cd71ca | 4020 | #: merge-recursive.c:3210 |
d46c5519 JX |
4021 | #, c-format |
4022 | msgid "" | |
4023 | "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " | |
4024 | "%s; moving it to %s." | |
4025 | msgstr "" | |
5b533632 FZ |
4026 | "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移" |
4027 | "动到 %5$s。" | |
d46c5519 | 4028 | |
a5cd71ca | 4029 | #: merge-recursive.c:3213 |
d46c5519 JX |
4030 | #, c-format |
4031 | msgid "" | |
4032 | "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " | |
4033 | "was renamed in %s, suggesting it should perhaps be moved to %s." | |
4034 | msgstr "" | |
5b533632 | 4035 | "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中," |
d46c5519 JX |
4036 | "建议将其移动到 %5$s。" |
4037 | ||
a5cd71ca | 4038 | #: merge-recursive.c:3327 |
d46c5519 JX |
4039 | #, c-format |
4040 | msgid "Removing %s" | |
4041 | msgstr "删除 %s" | |
4042 | ||
a5cd71ca | 4043 | #: merge-recursive.c:3350 |
d46c5519 JX |
4044 | msgid "file/directory" |
4045 | msgstr "文件/目录" | |
220c313c | 4046 | |
a5cd71ca | 4047 | #: merge-recursive.c:3355 |
a0b6b246 JX |
4048 | msgid "directory/file" |
4049 | msgstr "目录/文件" | |
276ceeaa | 4050 | |
a5cd71ca | 4051 | #: merge-recursive.c:3362 |
276ceeaa | 4052 | #, c-format |
a0b6b246 JX |
4053 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
4054 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 4055 | |
a5cd71ca | 4056 | #: merge-recursive.c:3371 |
276ceeaa | 4057 | #, c-format |
a0b6b246 JX |
4058 | msgid "Adding %s" |
4059 | msgstr "添加 %s" | |
276ceeaa | 4060 | |
a5cd71ca | 4061 | #: merge-recursive.c:3380 |
06991777 JX |
4062 | #, c-format |
4063 | msgid "CONFLICT (add/add): Merge conflict in %s" | |
4064 | msgstr "冲突(add/add):合并冲突于 %s" | |
4065 | ||
a5cd71ca | 4066 | #: merge-recursive.c:3424 |
6937cb4e | 4067 | msgid "Already up to date!" |
a0b6b246 | 4068 | msgstr "已经是最新的!" |
276ceeaa | 4069 | |
a5cd71ca | 4070 | #: merge-recursive.c:3433 |
276ceeaa | 4071 | #, c-format |
a0b6b246 JX |
4072 | msgid "merging of trees %s and %s failed" |
4073 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 4074 | |
a5cd71ca | 4075 | #: merge-recursive.c:3537 |
a0b6b246 JX |
4076 | msgid "Merging:" |
4077 | msgstr "合并:" | |
5c57d762 | 4078 | |
a5cd71ca | 4079 | #: merge-recursive.c:3550 |
5c57d762 | 4080 | #, c-format |
a0b6b246 JX |
4081 | msgid "found %u common ancestor:" |
4082 | msgid_plural "found %u common ancestors:" | |
4083 | msgstr[0] "发现 %u 个共同祖先:" | |
4084 | msgstr[1] "发现 %u 个共同祖先:" | |
4085 | ||
a5cd71ca | 4086 | #: merge-recursive.c:3600 |
a0b6b246 JX |
4087 | msgid "merge returned no commit" |
4088 | msgstr "合并未返回提交" | |
4089 | ||
a5cd71ca JX |
4090 | #: merge-recursive.c:3659 |
4091 | #, c-format | |
4092 | msgid "" | |
4093 | "Your local changes to the following files would be overwritten by merge:\n" | |
4094 | " %s" | |
4095 | msgstr "" | |
4096 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
4097 | " %s" | |
4098 | ||
4099 | #: merge-recursive.c:3756 | |
5c57d762 | 4100 | #, c-format |
a0b6b246 JX |
4101 | msgid "Could not parse object '%s'" |
4102 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 4103 | |
a5cd71ca | 4104 | #: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 |
a0b6b246 JX |
4105 | msgid "Unable to write index." |
4106 | msgstr "不能写入索引。" | |
4107 | ||
a5cd71ca | 4108 | #: midx.c:68 |
4c27fcb5 JX |
4109 | #, c-format |
4110 | msgid "multi-pack-index file %s is too small" | |
4111 | msgstr "多包索引文件 %s 太小" | |
4112 | ||
a5cd71ca | 4113 | #: midx.c:84 |
4c27fcb5 JX |
4114 | #, c-format |
4115 | msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" | |
4116 | msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" | |
4117 | ||
a5cd71ca | 4118 | #: midx.c:89 |
4c27fcb5 JX |
4119 | #, c-format |
4120 | msgid "multi-pack-index version %d not recognized" | |
4121 | msgstr "multi-pack-index 版本 %d 不能被识别" | |
4122 | ||
a5cd71ca | 4123 | #: midx.c:94 |
4c27fcb5 JX |
4124 | #, c-format |
4125 | msgid "hash version %u does not match" | |
4126 | msgstr "散列版本 %u 不匹配" | |
4127 | ||
a5cd71ca | 4128 | #: midx.c:108 |
4c27fcb5 JX |
4129 | msgid "invalid chunk offset (too large)" |
4130 | msgstr "无效的块偏移(太大)" | |
4131 | ||
a5cd71ca | 4132 | #: midx.c:132 |
4c27fcb5 JX |
4133 | msgid "terminating multi-pack-index chunk id appears earlier than expected" |
4134 | msgstr "终止多包索引块 id 出现时间早于预期" | |
4135 | ||
a5cd71ca | 4136 | #: midx.c:145 |
4c27fcb5 JX |
4137 | msgid "multi-pack-index missing required pack-name chunk" |
4138 | msgstr "多包索引缺少必需的包名块" | |
4139 | ||
a5cd71ca | 4140 | #: midx.c:147 |
4c27fcb5 | 4141 | msgid "multi-pack-index missing required OID fanout chunk" |
5b533632 | 4142 | msgstr "多包索引缺少必需的对象 ID 扇出块" |
4c27fcb5 | 4143 | |
a5cd71ca | 4144 | #: midx.c:149 |
4c27fcb5 | 4145 | msgid "multi-pack-index missing required OID lookup chunk" |
5b533632 | 4146 | msgstr "多包索引缺少必需的对象 ID 查询块" |
4c27fcb5 | 4147 | |
a5cd71ca | 4148 | #: midx.c:151 |
4c27fcb5 JX |
4149 | msgid "multi-pack-index missing required object offsets chunk" |
4150 | msgstr "多包索引缺少必需的对象偏移块" | |
4151 | ||
a5cd71ca | 4152 | #: midx.c:165 |
4c27fcb5 JX |
4153 | #, c-format |
4154 | msgid "multi-pack-index pack names out of order: '%s' before '%s'" | |
4155 | msgstr "多包索引包名无序:'%s' 在 '%s' 之前" | |
4156 | ||
a5cd71ca | 4157 | #: midx.c:210 |
4c27fcb5 JX |
4158 | #, c-format |
4159 | msgid "bad pack-int-id: %u (%u total packs)" | |
4160 | msgstr "错的 pack-int-id:%u(共有 %u 个包)" | |
4161 | ||
a5cd71ca | 4162 | #: midx.c:260 |
4c27fcb5 JX |
4163 | msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" |
4164 | msgstr "多包索引存储一个64位偏移,但是 off_t 太小" | |
4165 | ||
a5cd71ca | 4166 | #: midx.c:288 |
4c27fcb5 JX |
4167 | msgid "error preparing packfile from multi-pack-index" |
4168 | msgstr "从多包索引准备 packfile 出错" | |
4169 | ||
a5cd71ca | 4170 | #: midx.c:469 |
4c27fcb5 JX |
4171 | #, c-format |
4172 | msgid "failed to add packfile '%s'" | |
4173 | msgstr "添加包文件 '%s' 失败" | |
4174 | ||
a5cd71ca | 4175 | #: midx.c:475 |
4c27fcb5 JX |
4176 | #, c-format |
4177 | msgid "failed to open pack-index '%s'" | |
4178 | msgstr "打开包索引 '%s' 失败" | |
4179 | ||
a5cd71ca | 4180 | #: midx.c:535 |
4c27fcb5 JX |
4181 | #, c-format |
4182 | msgid "failed to locate object %d in packfile" | |
4183 | msgstr "在包文件中定位对象 %d 失败" | |
4184 | ||
a5cd71ca | 4185 | #: midx.c:864 |
a6cd2cc4 JX |
4186 | #, c-format |
4187 | msgid "did not see pack-file %s to drop" | |
4188 | msgstr "没有看到要丢弃的包文件 %s" | |
4189 | ||
a5cd71ca | 4190 | #: midx.c:1035 |
4c27fcb5 JX |
4191 | #, c-format |
4192 | msgid "failed to clear multi-pack-index at %s" | |
4193 | msgstr "清理位于 %s 的多包索引失败" | |
4194 | ||
a5cd71ca | 4195 | #: midx.c:1090 |
d46c5519 JX |
4196 | msgid "Looking for referenced packfiles" |
4197 | msgstr "正在查找引用的包文件" | |
4198 | ||
a5cd71ca | 4199 | #: midx.c:1105 |
4c27fcb5 JX |
4200 | #, c-format |
4201 | msgid "" | |
4202 | "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" | |
5b533632 | 4203 | msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" |
4c27fcb5 | 4204 | |
a5cd71ca | 4205 | #: midx.c:1109 |
d46c5519 | 4206 | msgid "Verifying OID order in MIDX" |
5b533632 | 4207 | msgstr "正在校验 MIDX 中的对象 ID 顺序" |
d46c5519 | 4208 | |
a5cd71ca | 4209 | #: midx.c:1118 |
4c27fcb5 JX |
4210 | #, c-format |
4211 | msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" | |
5b533632 | 4212 | msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]" |
4c27fcb5 | 4213 | |
a5cd71ca | 4214 | #: midx.c:1137 |
d46c5519 JX |
4215 | msgid "Sorting objects by packfile" |
4216 | msgstr "通过包文件为对象排序" | |
4217 | ||
a5cd71ca | 4218 | #: midx.c:1143 |
4c27fcb5 JX |
4219 | msgid "Verifying object offsets" |
4220 | msgstr "校验对象偏移" | |
4221 | ||
a5cd71ca | 4222 | #: midx.c:1159 |
4c27fcb5 JX |
4223 | #, c-format |
4224 | msgid "failed to load pack entry for oid[%d] = %s" | |
4225 | msgstr "为 oid[%d] = %s 加载包条目失败" | |
4226 | ||
a5cd71ca | 4227 | #: midx.c:1165 |
4c27fcb5 JX |
4228 | #, c-format |
4229 | msgid "failed to load pack-index for packfile %s" | |
4230 | msgstr "为包文件 %s 加载包索引失败" | |
4231 | ||
a5cd71ca | 4232 | #: midx.c:1174 |
4c27fcb5 JX |
4233 | #, c-format |
4234 | msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" | |
4235 | msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>" | |
4236 | ||
a5cd71ca | 4237 | #: midx.c:1349 |
a6cd2cc4 JX |
4238 | msgid "could not start pack-objects" |
4239 | msgstr "不能开始 pack-objects" | |
4240 | ||
a5cd71ca | 4241 | #: midx.c:1368 |
a6cd2cc4 JX |
4242 | msgid "could not finish pack-objects" |
4243 | msgstr "不能结束 pack-objects" | |
4244 | ||
a5cd71ca | 4245 | #: name-hash.c:537 |
4c27fcb5 JX |
4246 | #, c-format |
4247 | msgid "unable to create lazy_dir thread: %s" | |
4248 | msgstr "不能创建 lazy_dir 线程:%s" | |
4249 | ||
a5cd71ca | 4250 | #: name-hash.c:559 |
4c27fcb5 JX |
4251 | #, c-format |
4252 | msgid "unable to create lazy_name thread: %s" | |
4253 | msgstr "不能创建 lazy_name 线程:%s" | |
4254 | ||
a5cd71ca | 4255 | #: name-hash.c:565 |
4c27fcb5 JX |
4256 | #, c-format |
4257 | msgid "unable to join lazy_name thread: %s" | |
4258 | msgstr "不能加入 lasy_name 线程:%s" | |
4259 | ||
06991777 | 4260 | #: notes-merge.c:277 |
5c57d762 JX |
4261 | #, c-format |
4262 | msgid "" | |
a0b6b246 JX |
4263 | "You have not concluded your previous notes merge (%s exists).\n" |
4264 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
4265 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 4266 | msgstr "" |
29004bbb | 4267 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
4268 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
4269 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 4270 | |
06991777 | 4271 | #: notes-merge.c:284 |
a0b6b246 JX |
4272 | #, c-format |
4273 | msgid "You have not concluded your notes merge (%s exists)." | |
4274 | msgstr "您尚未结束注释合并(存在 %s)。" | |
4275 | ||
06991777 | 4276 | #: notes-utils.c:46 |
a0b6b246 JX |
4277 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
4278 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 4279 | |
06991777 | 4280 | #: notes-utils.c:105 |
1b7f4a34 | 4281 | #, c-format |
a0b6b246 JX |
4282 | msgid "Bad notes.rewriteMode value: '%s'" |
4283 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 4284 | |
06991777 | 4285 | #: notes-utils.c:115 |
5b04ee3b | 4286 | #, c-format |
a0b6b246 JX |
4287 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
4288 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 4289 | |
a4f16749 JX |
4290 | #. TRANSLATORS: The first %s is the name of |
4291 | #. the environment variable, the second %s is | |
4292 | #. its value. | |
4293 | #. | |
06991777 | 4294 | #: notes-utils.c:145 |
5b04ee3b | 4295 | #, c-format |
a0b6b246 JX |
4296 | msgid "Bad %s value: '%s'" |
4297 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 4298 | |
a5cd71ca | 4299 | #: object.c:53 |
c1ac5258 JX |
4300 | #, c-format |
4301 | msgid "invalid object type \"%s\"" | |
4302 | msgstr "无效的对象类型 \"%s\"" | |
4303 | ||
a5cd71ca | 4304 | #: object.c:173 |
c1ac5258 JX |
4305 | #, c-format |
4306 | msgid "object %s is a %s, not a %s" | |
4307 | msgstr "对象 %s 是一个 %s,不是一个 %s" | |
4308 | ||
a5cd71ca | 4309 | #: object.c:233 |
c1ac5258 JX |
4310 | #, c-format |
4311 | msgid "object %s has unknown type id %d" | |
4312 | msgstr "对象 %s 有未知的类型 id %d" | |
4313 | ||
a5cd71ca | 4314 | #: object.c:246 |
5b04ee3b | 4315 | #, c-format |
a0b6b246 JX |
4316 | msgid "unable to parse object: %s" |
4317 | msgstr "不能解析对象:%s" | |
5b04ee3b | 4318 | |
a5cd71ca | 4319 | #: object.c:266 object.c:277 |
c1ac5258 | 4320 | #, c-format |
06991777 JX |
4321 | msgid "hash mismatch %s" |
4322 | msgstr "哈希值与 %s 不匹配" | |
c1ac5258 | 4323 | |
a5cd71ca | 4324 | #: packfile.c:641 |
6937cb4e JX |
4325 | msgid "offset before end of packfile (broken .idx?)" |
4326 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
4327 | ||
a5cd71ca | 4328 | #: packfile.c:1887 |
6937cb4e JX |
4329 | #, c-format |
4330 | msgid "offset before start of pack index for %s (corrupt index?)" | |
4331 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
4332 | ||
a5cd71ca | 4333 | #: packfile.c:1891 |
6937cb4e JX |
4334 | #, c-format |
4335 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
4336 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
4337 | ||
d46c5519 | 4338 | #: parse-options.c:38 |
06991777 JX |
4339 | #, c-format |
4340 | msgid "%s requires a value" | |
8e4e0555 | 4341 | msgstr "%s 需要一个值" |
06991777 | 4342 | |
d46c5519 | 4343 | #: parse-options.c:73 |
06991777 JX |
4344 | #, c-format |
4345 | msgid "%s is incompatible with %s" | |
4346 | msgstr "%s 与 %s 不兼容" | |
4347 | ||
d46c5519 | 4348 | #: parse-options.c:78 |
06991777 JX |
4349 | #, c-format |
4350 | msgid "%s : incompatible with something else" | |
4351 | msgstr "%s:和其它的不兼容" | |
4352 | ||
d46c5519 | 4353 | #: parse-options.c:92 parse-options.c:96 parse-options.c:319 |
06991777 JX |
4354 | #, c-format |
4355 | msgid "%s takes no value" | |
8e4e0555 | 4356 | msgstr "%s 不取值" |
06991777 | 4357 | |
d46c5519 | 4358 | #: parse-options.c:94 |
06991777 JX |
4359 | #, c-format |
4360 | msgid "%s isn't available" | |
4361 | msgstr "%s 不可用" | |
4362 | ||
d46c5519 | 4363 | #: parse-options.c:219 |
06991777 JX |
4364 | #, c-format |
4365 | msgid "%s expects a non-negative integer value with an optional k/m/g suffix" | |
4366 | msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" | |
4367 | ||
d46c5519 | 4368 | #: parse-options.c:389 |
06991777 JX |
4369 | #, c-format |
4370 | msgid "ambiguous option: %s (could be --%s%s or --%s%s)" | |
8e4e0555 | 4371 | msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)" |
06991777 | 4372 | |
d46c5519 | 4373 | #: parse-options.c:423 parse-options.c:431 |
06991777 JX |
4374 | #, c-format |
4375 | msgid "did you mean `--%s` (with two dashes ?)" | |
4376 | msgstr "你的意思是 `--%s`(有两个短线?)" | |
4377 | ||
a5cd71ca | 4378 | #: parse-options.c:860 |
06991777 JX |
4379 | #, c-format |
4380 | msgid "unknown option `%s'" | |
4381 | msgstr "未知选项 `%s'" | |
4382 | ||
a5cd71ca | 4383 | #: parse-options.c:862 |
06991777 JX |
4384 | #, c-format |
4385 | msgid "unknown switch `%c'" | |
4386 | msgstr "未知开关 `%c'" | |
4387 | ||
a5cd71ca | 4388 | #: parse-options.c:864 |
06991777 JX |
4389 | #, c-format |
4390 | msgid "unknown non-ascii option in string: `%s'" | |
5b533632 | 4391 | msgstr "字符串中未知的非 ascii 字符选项:`%s'" |
06991777 | 4392 | |
a5cd71ca | 4393 | #: parse-options.c:888 |
a0b6b246 JX |
4394 | msgid "..." |
4395 | msgstr "..." | |
4396 | ||
a5cd71ca | 4397 | #: parse-options.c:907 |
5b04ee3b | 4398 | #, c-format |
a0b6b246 JX |
4399 | msgid "usage: %s" |
4400 | msgstr "用法:%s" | |
5b04ee3b | 4401 | |
a0b6b246 | 4402 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
4403 | #. one in "usage: %s" translation. |
4404 | #. | |
a5cd71ca | 4405 | #: parse-options.c:913 |
5b04ee3b | 4406 | #, c-format |
a0b6b246 JX |
4407 | msgid " or: %s" |
4408 | msgstr " 或:%s" | |
5b04ee3b | 4409 | |
a0b6b246 | 4410 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a5cd71ca | 4411 | #: parse-options.c:916 |
5b04ee3b | 4412 | #, c-format |
a0b6b246 JX |
4413 | msgid " %s" |
4414 | msgstr " %s" | |
5b04ee3b | 4415 | |
a5cd71ca | 4416 | #: parse-options.c:955 |
a0b6b246 JX |
4417 | msgid "-NUM" |
4418 | msgstr "-数字" | |
4419 | ||
a5cd71ca | 4420 | #: parse-options.c:969 |
d46c5519 JX |
4421 | #, c-format |
4422 | msgid "alias of --%s" | |
4423 | msgstr "--%s 的别名" | |
4424 | ||
4425 | #: parse-options-cb.c:20 parse-options-cb.c:24 | |
06991777 JX |
4426 | #, c-format |
4427 | msgid "option `%s' expects a numerical value" | |
4428 | msgstr "选项 `%s' 期望一个数字值" | |
4429 | ||
d46c5519 | 4430 | #: parse-options-cb.c:41 |
fd8cb379 JX |
4431 | #, c-format |
4432 | msgid "malformed expiration date '%s'" | |
4433 | msgstr "格式错误的到期时间:'%s'" | |
4434 | ||
d46c5519 | 4435 | #: parse-options-cb.c:54 |
06991777 JX |
4436 | #, c-format |
4437 | msgid "option `%s' expects \"always\", \"auto\", or \"never\"" | |
4438 | msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" | |
4439 | ||
d46c5519 | 4440 | #: parse-options-cb.c:130 parse-options-cb.c:147 |
5b04ee3b | 4441 | #, c-format |
a0b6b246 | 4442 | msgid "malformed object name '%s'" |
fd8cb379 | 4443 | msgstr "格式错误的对象名 '%s'" |
5b04ee3b | 4444 | |
d46c5519 | 4445 | #: path.c:897 |
5b04ee3b | 4446 | #, c-format |
a0b6b246 JX |
4447 | msgid "Could not make %s writable by group" |
4448 | msgstr "不能设置 %s 为组可写" | |
4449 | ||
06991777 | 4450 | #: pathspec.c:128 |
87cb7997 JX |
4451 | msgid "Escape character '\\' not allowed as last character in attr value" |
4452 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
4453 | ||
06991777 | 4454 | #: pathspec.c:146 |
87cb7997 JX |
4455 | msgid "Only one 'attr:' specification is allowed." |
4456 | msgstr "只允许一个 'attr:' 规格。" | |
4457 | ||
06991777 | 4458 | #: pathspec.c:149 |
87cb7997 JX |
4459 | msgid "attr spec must not be empty" |
4460 | msgstr "属性规格不能为空" | |
4461 | ||
06991777 | 4462 | #: pathspec.c:192 |
87cb7997 JX |
4463 | #, c-format |
4464 | msgid "invalid attribute name %s" | |
4465 | msgstr "无效的属性名 %s" | |
4466 | ||
06991777 | 4467 | #: pathspec.c:257 |
a0b6b246 JX |
4468 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
4469 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
4470 | ||
06991777 | 4471 | #: pathspec.c:264 |
5b04ee3b | 4472 | msgid "" |
a0b6b246 JX |
4473 | "global 'literal' pathspec setting is incompatible with all other global " |
4474 | "pathspec settings" | |
4475 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 4476 | |
06991777 | 4477 | #: pathspec.c:304 |
a0b6b246 JX |
4478 | msgid "invalid parameter for pathspec magic 'prefix'" |
4479 | msgstr "路径规格包含无效的神奇前缀" | |
4480 | ||
06991777 | 4481 | #: pathspec.c:325 |
5b04ee3b | 4482 | #, c-format |
a0b6b246 JX |
4483 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
4484 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 4485 | |
06991777 | 4486 | #: pathspec.c:330 |
5b04ee3b | 4487 | #, c-format |
a0b6b246 JX |
4488 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
4489 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 4490 | |
06991777 | 4491 | #: pathspec.c:368 |
5b04ee3b | 4492 | #, c-format |
a0b6b246 JX |
4493 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
4494 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 4495 | |
06991777 | 4496 | #: pathspec.c:427 |
5b04ee3b | 4497 | #, c-format |
a0b6b246 JX |
4498 | msgid "%s: 'literal' and 'glob' are incompatible" |
4499 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 4500 | |
06991777 | 4501 | #: pathspec.c:440 |
5b04ee3b | 4502 | #, c-format |
a0b6b246 JX |
4503 | msgid "%s: '%s' is outside repository" |
4504 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 4505 | |
06991777 | 4506 | #: pathspec.c:514 |
5b04ee3b | 4507 | #, c-format |
1a79b2f1 JX |
4508 | msgid "'%s' (mnemonic: '%c')" |
4509 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 4510 | |
06991777 | 4511 | #: pathspec.c:524 |
5b04ee3b | 4512 | #, c-format |
a0b6b246 JX |
4513 | msgid "%s: pathspec magic not supported by this command: %s" |
4514 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
4515 | ||
06991777 | 4516 | #: pathspec.c:591 |
5b04ee3b | 4517 | #, c-format |
a0b6b246 JX |
4518 | msgid "pathspec '%s' is beyond a symbolic link" |
4519 | msgstr "路径规格 '%s' 位于符号链接中" | |
4520 | ||
d46c5519 JX |
4521 | #: pkt-line.c:92 |
4522 | msgid "unable to write flush packet" | |
4523 | msgstr "无法写 flush 包" | |
4524 | ||
4525 | #: pkt-line.c:99 | |
4526 | msgid "unable to write delim packet" | |
4527 | msgstr "无法写 delim 包" | |
4528 | ||
4529 | #: pkt-line.c:106 | |
c1ac5258 JX |
4530 | msgid "flush packet write failed" |
4531 | msgstr "flush 包写错误" | |
4532 | ||
d46c5519 | 4533 | #: pkt-line.c:146 pkt-line.c:232 |
c1ac5258 JX |
4534 | msgid "protocol error: impossibly long line" |
4535 | msgstr "协议错误:不可能的长行" | |
4536 | ||
d46c5519 | 4537 | #: pkt-line.c:162 pkt-line.c:164 |
c1ac5258 JX |
4538 | msgid "packet write with format failed" |
4539 | msgstr "格式化包写入错误" | |
4540 | ||
d46c5519 | 4541 | #: pkt-line.c:196 |
c1ac5258 JX |
4542 | msgid "packet write failed - data exceeds max packet size" |
4543 | msgstr "写数据包失败:数据超过了包的最大长度" | |
4544 | ||
d46c5519 | 4545 | #: pkt-line.c:203 pkt-line.c:210 |
c1ac5258 JX |
4546 | msgid "packet write failed" |
4547 | msgstr "数据包写入失败" | |
4548 | ||
d46c5519 | 4549 | #: pkt-line.c:295 |
c1ac5258 JX |
4550 | msgid "read error" |
4551 | msgstr "读取错误" | |
4552 | ||
d46c5519 | 4553 | #: pkt-line.c:303 |
c1ac5258 JX |
4554 | msgid "the remote end hung up unexpectedly" |
4555 | msgstr "远端意外挂断了" | |
4556 | ||
d46c5519 | 4557 | #: pkt-line.c:331 |
c1ac5258 JX |
4558 | #, c-format |
4559 | msgid "protocol error: bad line length character: %.4s" | |
4560 | msgstr "协议错误:错误的行长度字符串:%.4s" | |
4561 | ||
d46c5519 | 4562 | #: pkt-line.c:341 pkt-line.c:346 |
c1ac5258 JX |
4563 | #, c-format |
4564 | msgid "protocol error: bad line length %d" | |
4565 | msgstr "协议错误:错误的行长度 %d" | |
4566 | ||
d46c5519 | 4567 | #: pkt-line.c:362 |
06991777 JX |
4568 | #, c-format |
4569 | msgid "remote error: %s" | |
4570 | msgstr "远程错误:%s" | |
4571 | ||
4572 | #: preload-index.c:119 | |
4c27fcb5 JX |
4573 | msgid "Refreshing index" |
4574 | msgstr "正在刷新索引" | |
4575 | ||
06991777 | 4576 | #: preload-index.c:138 |
4c27fcb5 JX |
4577 | #, c-format |
4578 | msgid "unable to create threaded lstat: %s" | |
4579 | msgstr "无法创建线程 lstat:%s" | |
4580 | ||
d46c5519 | 4581 | #: pretty.c:966 |
a0b6b246 JX |
4582 | msgid "unable to parse --pretty format" |
4583 | msgstr "不能解析 --pretty 格式" | |
4584 | ||
a5cd71ca JX |
4585 | #: promisor-remote.c:25 |
4586 | msgid "Remote with no URL" | |
4587 | msgstr "远程未设置 URL" | |
4588 | ||
4589 | #: promisor-remote.c:61 | |
4590 | #, c-format | |
4591 | msgid "promisor remote name cannot begin with '/': %s" | |
4592 | msgstr "promisor 远程名称不能以 '/' 开始:%s" | |
4593 | ||
4594 | #: range-diff.c:71 | |
c1ac5258 JX |
4595 | msgid "could not start `log`" |
4596 | msgstr "不能启动 `log`" | |
4597 | ||
a5cd71ca | 4598 | #: range-diff.c:73 |
c1ac5258 JX |
4599 | msgid "could not read `log` output" |
4600 | msgstr "不能读取 `log` 的输出" | |
4601 | ||
a5cd71ca | 4602 | #: range-diff.c:92 sequencer.c:4985 |
c1ac5258 JX |
4603 | #, c-format |
4604 | msgid "could not parse commit '%s'" | |
4605 | msgstr "不能解析提交 '%s'" | |
4606 | ||
a5cd71ca | 4607 | #: range-diff.c:118 |
a6cd2cc4 JX |
4608 | #, c-format |
4609 | msgid "could not parse git header '%.*s'" | |
4610 | msgstr "无法解析 git 头 '%.*s'" | |
4611 | ||
a5cd71ca | 4612 | #: range-diff.c:275 |
c1ac5258 JX |
4613 | msgid "failed to generate diff" |
4614 | msgstr "生成 diff 失败" | |
4615 | ||
a5cd71ca | 4616 | #: range-diff.c:507 range-diff.c:509 |
c1ac5258 JX |
4617 | #, c-format |
4618 | msgid "could not parse log for '%s'" | |
4619 | msgstr "不能解析 '%s' 的日志" | |
4620 | ||
d46c5519 | 4621 | #: read-cache.c:680 |
06991777 JX |
4622 | #, c-format |
4623 | msgid "will not add file alias '%s' ('%s' already exists in index)" | |
4624 | msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)" | |
4625 | ||
d46c5519 | 4626 | #: read-cache.c:696 |
06991777 JX |
4627 | msgid "cannot create an empty blob in the object database" |
4628 | msgstr "不能在对象数据库中创建空的数据对象" | |
4629 | ||
d46c5519 | 4630 | #: read-cache.c:718 |
06991777 JX |
4631 | #, c-format |
4632 | msgid "%s: can only add regular files, symbolic links or git-directories" | |
4633 | msgstr "%s:只能添加常规文件、符号链接或 git 目录" | |
4634 | ||
d46c5519 JX |
4635 | #: read-cache.c:723 |
4636 | #, c-format | |
4637 | msgid "'%s' does not have a commit checked out" | |
4638 | msgstr "'%s' 没有检出一个提交" | |
4639 | ||
4640 | #: read-cache.c:775 | |
06991777 JX |
4641 | #, c-format |
4642 | msgid "unable to index file '%s'" | |
4643 | msgstr "无法索引文件 '%s'" | |
4644 | ||
d46c5519 | 4645 | #: read-cache.c:794 |
06991777 JX |
4646 | #, c-format |
4647 | msgid "unable to add '%s' to index" | |
4648 | msgstr "无法在索引中添加 '%s'" | |
4649 | ||
d46c5519 | 4650 | #: read-cache.c:805 |
06991777 JX |
4651 | #, c-format |
4652 | msgid "unable to stat '%s'" | |
4653 | msgstr "无法对 %s 执行 stat" | |
4654 | ||
d46c5519 | 4655 | #: read-cache.c:1314 |
06991777 JX |
4656 | #, c-format |
4657 | msgid "'%s' appears as both a file and as a directory" | |
5b533632 | 4658 | msgstr "'%s' 看起来既是文件又是目录" |
06991777 | 4659 | |
a5cd71ca | 4660 | #: read-cache.c:1520 |
4c27fcb5 JX |
4661 | msgid "Refresh index" |
4662 | msgstr "刷新索引" | |
4663 | ||
a5cd71ca | 4664 | #: read-cache.c:1635 |
5b04ee3b JX |
4665 | #, c-format |
4666 | msgid "" | |
a0b6b246 JX |
4667 | "index.version set, but the value is invalid.\n" |
4668 | "Using version %i" | |
5b04ee3b | 4669 | msgstr "" |
a0b6b246 JX |
4670 | "设置了 index.version,但是取值无效。\n" |
4671 | "使用版本 %i" | |
5b04ee3b | 4672 | |
a5cd71ca | 4673 | #: read-cache.c:1645 |
5b04ee3b JX |
4674 | #, c-format |
4675 | msgid "" | |
a0b6b246 JX |
4676 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
4677 | "Using version %i" | |
5b04ee3b | 4678 | msgstr "" |
a0b6b246 JX |
4679 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
4680 | "使用版本 %i" | |
5b04ee3b | 4681 | |
a5cd71ca | 4682 | #: read-cache.c:1701 |
06991777 JX |
4683 | #, c-format |
4684 | msgid "bad signature 0x%08x" | |
4685 | msgstr "坏的签名 0x%08x" | |
4686 | ||
a5cd71ca | 4687 | #: read-cache.c:1704 |
06991777 JX |
4688 | #, c-format |
4689 | msgid "bad index version %d" | |
4690 | msgstr "坏的索引版本 %d" | |
4691 | ||
a5cd71ca | 4692 | #: read-cache.c:1713 |
06991777 | 4693 | msgid "bad index file sha1 signature" |
5b533632 | 4694 | msgstr "坏的索引文件 sha1 签名" |
06991777 | 4695 | |
a5cd71ca | 4696 | #: read-cache.c:1743 |
06991777 JX |
4697 | #, c-format |
4698 | msgid "index uses %.4s extension, which we do not understand" | |
4699 | msgstr "索引使用不被支持的 %.4s 扩展" | |
4700 | ||
4701 | # | |
a5cd71ca | 4702 | #: read-cache.c:1745 |
06991777 JX |
4703 | #, c-format |
4704 | msgid "ignoring %.4s extension" | |
4705 | msgstr "忽略 %.4s 扩展" | |
4706 | ||
a5cd71ca | 4707 | #: read-cache.c:1782 |
06991777 JX |
4708 | #, c-format |
4709 | msgid "unknown index entry format 0x%08x" | |
4710 | msgstr "未知的索引条目格式 0x%08x" | |
4711 | ||
a5cd71ca | 4712 | #: read-cache.c:1798 |
4c27fcb5 JX |
4713 | #, c-format |
4714 | msgid "malformed name field in the index, near path '%s'" | |
4715 | msgstr "索引中靠近路径 '%s' 有错误的名称字段" | |
4716 | ||
a5cd71ca | 4717 | #: read-cache.c:1855 |
06991777 JX |
4718 | msgid "unordered stage entries in index" |
4719 | msgstr "索引中有未排序的暂存条目" | |
4720 | ||
a5cd71ca | 4721 | #: read-cache.c:1858 |
06991777 JX |
4722 | #, c-format |
4723 | msgid "multiple stage entries for merged file '%s'" | |
4724 | msgstr "合并文件 '%s' 有多个暂存条目" | |
4725 | ||
a5cd71ca | 4726 | #: read-cache.c:1861 |
06991777 JX |
4727 | #, c-format |
4728 | msgid "unordered stage entries for '%s'" | |
4729 | msgstr "'%s' 的未排序暂存条目" | |
4730 | ||
a5cd71ca JX |
4731 | #: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 |
4732 | #: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 | |
4733 | #: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 | |
a6cd2cc4 JX |
4734 | #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 |
4735 | #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 | |
4c27fcb5 JX |
4736 | msgid "index file corrupt" |
4737 | msgstr "索引文件损坏" | |
4738 | ||
a5cd71ca | 4739 | #: read-cache.c:2108 |
4c27fcb5 JX |
4740 | #, c-format |
4741 | msgid "unable to create load_cache_entries thread: %s" | |
4742 | msgstr "无法创建 load_cache_entries 线程:%s" | |
4743 | ||
a5cd71ca | 4744 | #: read-cache.c:2121 |
4c27fcb5 JX |
4745 | #, c-format |
4746 | msgid "unable to join load_cache_entries thread: %s" | |
4747 | msgstr "无法加入 load_cache_entries 线程:%s" | |
4748 | ||
a5cd71ca | 4749 | #: read-cache.c:2154 |
06991777 JX |
4750 | #, c-format |
4751 | msgid "%s: index file open failed" | |
4752 | msgstr "%s:打开索引文件失败" | |
4753 | ||
a5cd71ca | 4754 | #: read-cache.c:2158 |
06991777 JX |
4755 | #, c-format |
4756 | msgid "%s: cannot stat the open index" | |
4757 | msgstr "%s:不能对打开的索引执行 stat 操作" | |
4758 | ||
a5cd71ca | 4759 | #: read-cache.c:2162 |
06991777 JX |
4760 | #, c-format |
4761 | msgid "%s: index file smaller than expected" | |
4762 | msgstr "%s:索引文件比预期的小" | |
4763 | ||
a5cd71ca | 4764 | #: read-cache.c:2166 |
06991777 JX |
4765 | #, c-format |
4766 | msgid "%s: unable to map index file" | |
4767 | msgstr "%s:无法对索引文件执行 map 操作" | |
4768 | ||
a5cd71ca | 4769 | #: read-cache.c:2208 |
4c27fcb5 JX |
4770 | #, c-format |
4771 | msgid "unable to create load_index_extensions thread: %s" | |
4772 | msgstr "无法创建 load_index_extensions 线程:%s" | |
4773 | ||
a5cd71ca | 4774 | #: read-cache.c:2235 |
4c27fcb5 JX |
4775 | #, c-format |
4776 | msgid "unable to join load_index_extensions thread: %s" | |
4777 | msgstr "无法加入 load_index_extensions 线程:%s" | |
4778 | ||
a5cd71ca | 4779 | #: read-cache.c:2267 |
06991777 JX |
4780 | #, c-format |
4781 | msgid "could not freshen shared index '%s'" | |
4782 | msgstr "无法刷新共享索引 '%s'" | |
4783 | ||
a5cd71ca | 4784 | #: read-cache.c:2314 |
06991777 JX |
4785 | #, c-format |
4786 | msgid "broken index, expect %s in %s, got %s" | |
4787 | msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s" | |
4788 | ||
a5cd71ca | 4789 | #: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 |
a4f16749 JX |
4790 | #, c-format |
4791 | msgid "could not close '%s'" | |
4792 | msgstr "不能关闭 '%s'" | |
4793 | ||
a5cd71ca | 4794 | #: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 |
87cb7997 | 4795 | #, c-format |
60638e98 | 4796 | msgid "could not stat '%s'" |
65e2041e | 4797 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 4798 | |
a5cd71ca | 4799 | #: read-cache.c:3126 |
87cb7997 JX |
4800 | #, c-format |
4801 | msgid "unable to open git dir: %s" | |
4802 | msgstr "不能打开 git 目录:%s" | |
4803 | ||
a5cd71ca | 4804 | #: read-cache.c:3138 |
87cb7997 JX |
4805 | #, c-format |
4806 | msgid "unable to unlink: %s" | |
4807 | msgstr "无法删除:%s" | |
4808 | ||
a5cd71ca | 4809 | #: read-cache.c:3163 |
06991777 JX |
4810 | #, c-format |
4811 | msgid "cannot fix permission bits on '%s'" | |
4812 | msgstr "不能修复 '%s' 的权限位" | |
4813 | ||
a5cd71ca | 4814 | #: read-cache.c:3312 |
06991777 JX |
4815 | #, c-format |
4816 | msgid "%s: cannot drop to stage #0" | |
4817 | msgstr "%s:不能落到暂存区 #0" | |
4818 | ||
d46c5519 JX |
4819 | #: rebase-interactive.c:26 |
4820 | #, c-format | |
4821 | msgid "" | |
4822 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
4823 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
4824 | ||
4825 | #: rebase-interactive.c:35 | |
4c27fcb5 JX |
4826 | msgid "" |
4827 | "\n" | |
4828 | "Commands:\n" | |
4829 | "p, pick <commit> = use commit\n" | |
4830 | "r, reword <commit> = use commit, but edit the commit message\n" | |
4831 | "e, edit <commit> = use commit, but stop for amending\n" | |
4832 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
4833 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
4834 | "x, exec <command> = run command (the rest of the line) using shell\n" | |
4835 | "b, break = stop here (continue rebase later with 'git rebase --continue')\n" | |
4836 | "d, drop <commit> = remove commit\n" | |
4837 | "l, label <label> = label current HEAD with a name\n" | |
4838 | "t, reset <label> = reset HEAD to a label\n" | |
4839 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
4840 | ". create a merge commit using the original merge commit's\n" | |
4841 | ". message (or the oneline, if no original merge commit was\n" | |
4842 | ". specified). Use -c <commit> to reword the commit message.\n" | |
4843 | "\n" | |
4844 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
4845 | msgstr "" | |
4846 | "\n" | |
4847 | "命令:\n" | |
4848 | "p, pick <提交> = 使用提交\n" | |
4849 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
4850 | "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n" | |
4851 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
4852 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
4853 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
4854 | "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n" | |
4855 | "d, drop <提交> = 删除提交\n" | |
4856 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
4857 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
4858 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
4859 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
4860 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
4861 | ". -c <提交> 可以编辑提交说明。\n" | |
4862 | "\n" | |
4863 | "可以对这些行重新排序,将从上至下执行。\n" | |
4864 | ||
d46c5519 JX |
4865 | #: rebase-interactive.c:56 |
4866 | #, c-format | |
4867 | msgid "Rebase %s onto %s (%d command)" | |
4868 | msgid_plural "Rebase %s onto %s (%d commands)" | |
4869 | msgstr[0] "变基 %s 到 %s(%d 个提交)" | |
4870 | msgstr[1] "变基 %s 到 %s(%d 个提交)" | |
4871 | ||
a6cd2cc4 | 4872 | #: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 |
4c27fcb5 JX |
4873 | msgid "" |
4874 | "\n" | |
4875 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
4876 | msgstr "" | |
4877 | "\n" | |
4878 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
4879 | ||
a6cd2cc4 | 4880 | #: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 |
4c27fcb5 JX |
4881 | msgid "" |
4882 | "\n" | |
4883 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
4884 | msgstr "" | |
4885 | "\n" | |
4886 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
4887 | ||
a6cd2cc4 | 4888 | #: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 |
4c27fcb5 JX |
4889 | msgid "" |
4890 | "\n" | |
4891 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
4892 | "To continue rebase after editing, run:\n" | |
4893 | " git rebase --continue\n" | |
4894 | "\n" | |
4895 | msgstr "" | |
4896 | "\n" | |
4897 | "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" | |
4898 | "请执行:\n" | |
4899 | " git rebase --continue\n" | |
4900 | "\n" | |
4901 | ||
a6cd2cc4 | 4902 | #: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 |
4c27fcb5 JX |
4903 | msgid "" |
4904 | "\n" | |
4905 | "However, if you remove everything, the rebase will be aborted.\n" | |
4906 | "\n" | |
4907 | msgstr "" | |
4908 | "\n" | |
4909 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
4910 | "\n" | |
4911 | ||
a6cd2cc4 | 4912 | #: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 |
4c27fcb5 JX |
4913 | msgid "Note that empty commits are commented out" |
4914 | msgstr "注意空提交已被注释掉" | |
4915 | ||
a5cd71ca JX |
4916 | #: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 |
4917 | #: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 | |
4c27fcb5 | 4918 | #, c-format |
d46c5519 JX |
4919 | msgid "could not write '%s'" |
4920 | msgstr "不能写入 '%s'" | |
4921 | ||
4922 | #: rebase-interactive.c:108 | |
4923 | #, c-format | |
4924 | msgid "could not copy '%s' to '%s'." | |
4925 | msgstr "不能拷贝 '%s' 至 '%s'。" | |
4926 | ||
4927 | #: rebase-interactive.c:173 | |
4928 | #, c-format | |
4929 | msgid "" | |
4930 | "Warning: some commits may have been dropped accidentally.\n" | |
4931 | "Dropped commits (newer to older):\n" | |
4932 | msgstr "" | |
4933 | "警告:一些提交可能被意外丢弃。\n" | |
4934 | "丢弃的提交(从新到旧):\n" | |
4935 | ||
4936 | #: rebase-interactive.c:180 | |
4937 | #, c-format | |
4938 | msgid "" | |
4939 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
4940 | "\n" | |
4941 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
4942 | "warnings.\n" | |
4943 | "The possible behaviours are: ignore, warn, error.\n" | |
4944 | "\n" | |
4945 | msgstr "" | |
4946 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
4947 | "\n" | |
4948 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
4949 | "可选值有:ignore、warn、error。\n" | |
4950 | "\n" | |
4c27fcb5 | 4951 | |
a6cd2cc4 | 4952 | #: refs.c:262 |
c1ac5258 JX |
4953 | #, c-format |
4954 | msgid "%s does not point to a valid object!" | |
4955 | msgstr "%s 没有指向一个有效的对象!" | |
4956 | ||
a6cd2cc4 | 4957 | #: refs.c:667 |
c1ac5258 JX |
4958 | #, c-format |
4959 | msgid "ignoring dangling symref %s" | |
e640d114 | 4960 | msgstr "忽略悬空符号引用 %s" |
c1ac5258 | 4961 | |
a5cd71ca | 4962 | #: refs.c:669 ref-filter.c:2098 |
c1ac5258 JX |
4963 | #, c-format |
4964 | msgid "ignoring broken ref %s" | |
4965 | msgstr "忽略损坏的引用 %s" | |
4966 | ||
a6cd2cc4 | 4967 | #: refs.c:804 |
c1ac5258 JX |
4968 | #, c-format |
4969 | msgid "could not open '%s' for writing: %s" | |
4970 | msgstr "无法为写入打开 '%s':%s" | |
4971 | ||
a6cd2cc4 | 4972 | #: refs.c:814 refs.c:865 |
c1ac5258 JX |
4973 | #, c-format |
4974 | msgid "could not read ref '%s'" | |
4975 | msgstr "无法读取引用 '%s'" | |
4976 | ||
a6cd2cc4 | 4977 | #: refs.c:820 |
c1ac5258 JX |
4978 | #, c-format |
4979 | msgid "ref '%s' already exists" | |
4980 | msgstr "引用 '%s' 已经存在" | |
4981 | ||
a6cd2cc4 | 4982 | #: refs.c:825 |
c1ac5258 JX |
4983 | #, c-format |
4984 | msgid "unexpected object ID when writing '%s'" | |
4985 | msgstr "写入 '%s' 时意外的对象 ID" | |
4986 | ||
a5cd71ca JX |
4987 | #: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 |
4988 | #: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 | |
c1ac5258 JX |
4989 | #, c-format |
4990 | msgid "could not write to '%s'" | |
4991 | msgstr "不能写入 '%s'" | |
4992 | ||
a5cd71ca JX |
4993 | #: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 |
4994 | #: builtin/rebase.c:1004 | |
5b04ee3b | 4995 | #, c-format |
fd8cb379 | 4996 | msgid "could not open '%s' for writing" |
a0b6b246 | 4997 | msgstr "无法打开 '%s' 进行写入" |
5b04ee3b | 4998 | |
a6cd2cc4 | 4999 | #: refs.c:867 |
c1ac5258 JX |
5000 | #, c-format |
5001 | msgid "unexpected object ID when deleting '%s'" | |
5002 | msgstr "删除 '%s' 时意外的对象 ID" | |
5003 | ||
a6cd2cc4 | 5004 | #: refs.c:998 |
c1ac5258 JX |
5005 | #, c-format |
5006 | msgid "log for ref %s has gap after %s" | |
5007 | msgstr "引用 %s 的日志在 %s 之后有缺口" | |
5008 | ||
a6cd2cc4 | 5009 | #: refs.c:1004 |
c1ac5258 JX |
5010 | #, c-format |
5011 | msgid "log for ref %s unexpectedly ended on %s" | |
5012 | msgstr "引用 %s 的日志意外终止于 %s " | |
5013 | ||
a6cd2cc4 | 5014 | #: refs.c:1063 |
c1ac5258 JX |
5015 | #, c-format |
5016 | msgid "log for %s is empty" | |
5017 | msgstr "%s 的日志为空" | |
5018 | ||
a6cd2cc4 | 5019 | #: refs.c:1155 |
c1ac5258 JX |
5020 | #, c-format |
5021 | msgid "refusing to update ref with bad name '%s'" | |
5022 | msgstr "拒绝更新有错误名称 '%s' 的引用" | |
5023 | ||
a6cd2cc4 | 5024 | #: refs.c:1231 |
c1ac5258 JX |
5025 | #, c-format |
5026 | msgid "update_ref failed for ref '%s': %s" | |
5027 | msgstr "对引用 '%s' 执行 update_ref 失败:%s" | |
5028 | ||
a5cd71ca | 5029 | #: refs.c:2023 |
c1ac5258 JX |
5030 | #, c-format |
5031 | msgid "multiple updates for ref '%s' not allowed" | |
5032 | msgstr "不允许对引用 '%s' 多次更新" | |
5033 | ||
a5cd71ca | 5034 | #: refs.c:2055 |
60638e98 JX |
5035 | msgid "ref updates forbidden inside quarantine environment" |
5036 | msgstr "在隔离环境中禁止更新引用" | |
5037 | ||
a5cd71ca | 5038 | #: refs.c:2151 refs.c:2181 |
c1ac5258 JX |
5039 | #, c-format |
5040 | msgid "'%s' exists; cannot create '%s'" | |
5041 | msgstr "'%s' 已存在,无法创建 '%s'" | |
5042 | ||
a5cd71ca | 5043 | #: refs.c:2157 refs.c:2192 |
c1ac5258 JX |
5044 | #, c-format |
5045 | msgid "cannot process '%s' and '%s' at the same time" | |
5046 | msgstr "无法同时处理 '%s' 和 '%s'" | |
5047 | ||
d46c5519 | 5048 | #: refs/files-backend.c:1234 |
6937cb4e JX |
5049 | #, c-format |
5050 | msgid "could not remove reference %s" | |
5051 | msgstr "无法删除引用 %s" | |
5052 | ||
a5cd71ca JX |
5053 | #: refs/files-backend.c:1248 refs/packed-backend.c:1541 |
5054 | #: refs/packed-backend.c:1551 | |
5b04ee3b | 5055 | #, c-format |
a0b6b246 JX |
5056 | msgid "could not delete reference %s: %s" |
5057 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 5058 | |
a5cd71ca | 5059 | #: refs/files-backend.c:1251 refs/packed-backend.c:1554 |
5b04ee3b | 5060 | #, c-format |
a0b6b246 JX |
5061 | msgid "could not delete references: %s" |
5062 | msgstr "无法删除引用:%s" | |
5b04ee3b | 5063 | |
c1ac5258 JX |
5064 | #: refspec.c:137 |
5065 | #, c-format | |
5066 | msgid "invalid refspec '%s'" | |
5067 | msgstr "无效的引用表达式:'%s'" | |
5068 | ||
a5cd71ca | 5069 | #: ref-filter.c:42 wt-status.c:1938 |
87cb7997 JX |
5070 | msgid "gone" |
5071 | msgstr "丢失" | |
5072 | ||
a6cd2cc4 | 5073 | #: ref-filter.c:43 |
87cb7997 JX |
5074 | #, c-format |
5075 | msgid "ahead %d" | |
5076 | msgstr "领先 %d" | |
5077 | ||
a6cd2cc4 | 5078 | #: ref-filter.c:44 |
87cb7997 JX |
5079 | #, c-format |
5080 | msgid "behind %d" | |
5081 | msgstr "落后 %d" | |
5082 | ||
a6cd2cc4 | 5083 | #: ref-filter.c:45 |
87cb7997 JX |
5084 | #, c-format |
5085 | msgid "ahead %d, behind %d" | |
5086 | msgstr "领先 %d,落后 %d" | |
5087 | ||
a5cd71ca | 5088 | #: ref-filter.c:165 |
5b04ee3b | 5089 | #, c-format |
a0b6b246 | 5090 | msgid "expected format: %%(color:<color>)" |
58b6f078 | 5091 | msgstr "期望的格式:%%(color:<颜色>)" |
5b04ee3b | 5092 | |
a5cd71ca | 5093 | #: ref-filter.c:167 |
5b04ee3b | 5094 | #, c-format |
a0b6b246 JX |
5095 | msgid "unrecognized color: %%(color:%s)" |
5096 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 5097 | |
a5cd71ca | 5098 | #: ref-filter.c:189 |
a0b6b246 | 5099 | #, c-format |
87cb7997 JX |
5100 | msgid "Integer value expected refname:lstrip=%s" |
5101 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 5102 | |
a5cd71ca | 5103 | #: ref-filter.c:193 |
87cb7997 JX |
5104 | #, c-format |
5105 | msgid "Integer value expected refname:rstrip=%s" | |
5106 | msgstr "期望整数值 refname:rstrip=%s" | |
5107 | ||
a5cd71ca | 5108 | #: ref-filter.c:195 |
87cb7997 JX |
5109 | #, c-format |
5110 | msgid "unrecognized %%(%s) argument: %s" | |
5111 | msgstr "未能识别的 %%(%s) 参数:%s" | |
5112 | ||
a5cd71ca | 5113 | #: ref-filter.c:250 |
c1ac5258 JX |
5114 | #, c-format |
5115 | msgid "%%(objecttype) does not take arguments" | |
5116 | msgstr "%%(objecttype) 不带参数" | |
5117 | ||
a5cd71ca | 5118 | #: ref-filter.c:272 |
06991777 JX |
5119 | #, c-format |
5120 | msgid "unrecognized %%(objectsize) argument: %s" | |
5121 | msgstr "未能识别的 %%(objectsize) 参数:%s" | |
5122 | ||
a5cd71ca | 5123 | #: ref-filter.c:280 |
c1ac5258 | 5124 | #, c-format |
06991777 JX |
5125 | msgid "%%(deltabase) does not take arguments" |
5126 | msgstr "%%(deltabase) 不带参数" | |
c1ac5258 | 5127 | |
a5cd71ca | 5128 | #: ref-filter.c:292 |
90314792 | 5129 | #, c-format |
a0b6b246 JX |
5130 | msgid "%%(body) does not take arguments" |
5131 | msgstr "%%(body) 不带参数" | |
90314792 | 5132 | |
a5cd71ca | 5133 | #: ref-filter.c:301 |
a0b6b246 JX |
5134 | #, c-format |
5135 | msgid "%%(subject) does not take arguments" | |
5136 | msgstr "%%(subject) 不带参数" | |
90314792 | 5137 | |
a5cd71ca | 5138 | #: ref-filter.c:323 |
1a79b2f1 | 5139 | #, c-format |
6937cb4e JX |
5140 | msgid "unknown %%(trailers) argument: %s" |
5141 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 5142 | |
a5cd71ca | 5143 | #: ref-filter.c:352 |
a0b6b246 JX |
5144 | #, c-format |
5145 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 5146 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 5147 | |
a5cd71ca | 5148 | #: ref-filter.c:354 |
a0b6b246 JX |
5149 | #, c-format |
5150 | msgid "unrecognized %%(contents) argument: %s" | |
5151 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 5152 | |
a5cd71ca | 5153 | #: ref-filter.c:369 |
87cb7997 JX |
5154 | #, c-format |
5155 | msgid "positive value expected objectname:short=%s" | |
5156 | msgstr "期望一个正数 objectname:short=%s" | |
5157 | ||
a5cd71ca | 5158 | #: ref-filter.c:373 |
a0b6b246 JX |
5159 | #, c-format |
5160 | msgid "unrecognized %%(objectname) argument: %s" | |
5161 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 5162 | |
a5cd71ca | 5163 | #: ref-filter.c:403 |
a0b6b246 JX |
5164 | #, c-format |
5165 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 5166 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 5167 | |
a5cd71ca | 5168 | #: ref-filter.c:415 |
5c57d762 | 5169 | #, c-format |
a0b6b246 JX |
5170 | msgid "unrecognized position:%s" |
5171 | msgstr "未能识别的位置:%s" | |
5c57d762 | 5172 | |
a5cd71ca | 5173 | #: ref-filter.c:422 |
1b7f4a34 | 5174 | #, c-format |
a0b6b246 JX |
5175 | msgid "unrecognized width:%s" |
5176 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 5177 | |
a5cd71ca | 5178 | #: ref-filter.c:431 |
1b7f4a34 | 5179 | #, c-format |
a0b6b246 JX |
5180 | msgid "unrecognized %%(align) argument: %s" |
5181 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 5182 | |
a5cd71ca | 5183 | #: ref-filter.c:439 |
1b7f4a34 | 5184 | #, c-format |
a0b6b246 JX |
5185 | msgid "positive width expected with the %%(align) atom" |
5186 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 5187 | |
a5cd71ca | 5188 | #: ref-filter.c:457 |
87cb7997 JX |
5189 | #, c-format |
5190 | msgid "unrecognized %%(if) argument: %s" | |
5191 | msgstr "未能识别的 %%(if) 参数:%s" | |
5192 | ||
a5cd71ca | 5193 | #: ref-filter.c:559 |
07432cef | 5194 | #, c-format |
a0b6b246 | 5195 | msgid "malformed field name: %.*s" |
fd8cb379 | 5196 | msgstr "格式错误的字段名:%.*s" |
ef317cd5 | 5197 | |
a5cd71ca | 5198 | #: ref-filter.c:586 |
a0b6b246 JX |
5199 | #, c-format |
5200 | msgid "unknown field name: %.*s" | |
5201 | msgstr "未知的字段名:%.*s" | |
220c313c | 5202 | |
a5cd71ca | 5203 | #: ref-filter.c:590 |
4c27fcb5 JX |
5204 | #, c-format |
5205 | msgid "" | |
5206 | "not a git repository, but the field '%.*s' requires access to object data" | |
5207 | msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据" | |
5208 | ||
a5cd71ca | 5209 | #: ref-filter.c:714 |
87cb7997 JX |
5210 | #, c-format |
5211 | msgid "format: %%(if) atom used without a %%(then) atom" | |
5212 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
5213 | ||
a5cd71ca | 5214 | #: ref-filter.c:777 |
87cb7997 JX |
5215 | #, c-format |
5216 | msgid "format: %%(then) atom used without an %%(if) atom" | |
5217 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
5218 | ||
a5cd71ca | 5219 | #: ref-filter.c:779 |
87cb7997 JX |
5220 | #, c-format |
5221 | msgid "format: %%(then) atom used more than once" | |
5222 | msgstr "格式:%%(then) 元素用了多次" | |
5223 | ||
a5cd71ca | 5224 | #: ref-filter.c:781 |
87cb7997 JX |
5225 | #, c-format |
5226 | msgid "format: %%(then) atom used after %%(else)" | |
5227 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
5228 | ||
a5cd71ca | 5229 | #: ref-filter.c:809 |
87cb7997 JX |
5230 | #, c-format |
5231 | msgid "format: %%(else) atom used without an %%(if) atom" | |
5232 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
5233 | ||
a5cd71ca | 5234 | #: ref-filter.c:811 |
87cb7997 JX |
5235 | #, c-format |
5236 | msgid "format: %%(else) atom used without a %%(then) atom" | |
5237 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
5238 | ||
a5cd71ca | 5239 | #: ref-filter.c:813 |
87cb7997 JX |
5240 | #, c-format |
5241 | msgid "format: %%(else) atom used more than once" | |
5242 | msgstr "格式:%%(else) 元素用了多次" | |
5243 | ||
a5cd71ca | 5244 | #: ref-filter.c:828 |
7aea43ff | 5245 | #, c-format |
a0b6b246 JX |
5246 | msgid "format: %%(end) atom used without corresponding atom" |
5247 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 5248 | |
a5cd71ca | 5249 | #: ref-filter.c:885 |
7aea43ff | 5250 | #, c-format |
a0b6b246 | 5251 | msgid "malformed format string %s" |
fd8cb379 | 5252 | msgstr "错误的格式化字符串 %s" |
7aea43ff | 5253 | |
a5cd71ca | 5254 | #: ref-filter.c:1488 |
87cb7997 | 5255 | #, c-format |
a6cd2cc4 JX |
5256 | msgid "no branch, rebasing %s" |
5257 | msgstr "非分支,正变基 %s" | |
c04f5ac3 | 5258 | |
a5cd71ca | 5259 | #: ref-filter.c:1491 |
c04f5ac3 | 5260 | #, c-format |
a6cd2cc4 JX |
5261 | msgid "no branch, rebasing detached HEAD %s" |
5262 | msgstr "非分支,正变基分离头指针 %s" | |
c04f5ac3 | 5263 | |
a5cd71ca | 5264 | #: ref-filter.c:1494 |
a0b6b246 | 5265 | #, c-format |
a6cd2cc4 JX |
5266 | msgid "no branch, bisect started on %s" |
5267 | msgstr "非分支,二分查找开始于 %s" | |
6792b93b | 5268 | |
a5cd71ca | 5269 | #: ref-filter.c:1504 |
a6cd2cc4 JX |
5270 | msgid "no branch" |
5271 | msgstr "非分支" | |
87cb7997 | 5272 | |
a5cd71ca | 5273 | #: ref-filter.c:1540 ref-filter.c:1749 |
a0b6b246 JX |
5274 | #, c-format |
5275 | msgid "missing object %s for %s" | |
5276 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 5277 | |
a5cd71ca | 5278 | #: ref-filter.c:1550 |
a0b6b246 JX |
5279 | #, c-format |
5280 | msgid "parse_object_buffer failed on %s for %s" | |
5281 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 5282 | |
a5cd71ca | 5283 | #: ref-filter.c:2004 |
a0b6b246 JX |
5284 | #, c-format |
5285 | msgid "malformed object at '%s'" | |
fd8cb379 | 5286 | msgstr "格式错误的对象 '%s'" |
c04f5ac3 | 5287 | |
a5cd71ca | 5288 | #: ref-filter.c:2093 |
a0b6b246 JX |
5289 | #, c-format |
5290 | msgid "ignoring ref with broken name %s" | |
5291 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 5292 | |
a5cd71ca | 5293 | #: ref-filter.c:2389 |
a0b6b246 JX |
5294 | #, c-format |
5295 | msgid "format: %%(end) atom missing" | |
5296 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 5297 | |
a5cd71ca | 5298 | #: ref-filter.c:2489 |
06991777 JX |
5299 | #, c-format |
5300 | msgid "option `%s' is incompatible with --merged" | |
5301 | msgstr "选项 `%s' 和 --merged 不兼容" | |
5302 | ||
a5cd71ca | 5303 | #: ref-filter.c:2492 |
06991777 JX |
5304 | #, c-format |
5305 | msgid "option `%s' is incompatible with --no-merged" | |
5306 | msgstr "选项 `%s' 和 --no-merged 不兼容" | |
5307 | ||
a5cd71ca | 5308 | #: ref-filter.c:2502 |
a0b6b246 JX |
5309 | #, c-format |
5310 | msgid "malformed object name %s" | |
fd8cb379 | 5311 | msgstr "格式错误的对象名 %s" |
c04f5ac3 | 5312 | |
a5cd71ca | 5313 | #: ref-filter.c:2507 |
06991777 JX |
5314 | #, c-format |
5315 | msgid "option `%s' must point to a commit" | |
5316 | msgstr "选项 `%s' 必须指向一个提交" | |
5317 | ||
a5cd71ca | 5318 | #: remote.c:366 |
06991777 JX |
5319 | #, c-format |
5320 | msgid "config remote shorthand cannot begin with '/': %s" | |
5b533632 | 5321 | msgstr "配置的远程短名称不能以 '/' 开始:%s" |
06991777 | 5322 | |
a5cd71ca | 5323 | #: remote.c:413 |
06991777 JX |
5324 | msgid "more than one receivepack given, using the first" |
5325 | msgstr "提供了一个以上的 receivepack,使用第一个" | |
5326 | ||
a5cd71ca | 5327 | #: remote.c:421 |
06991777 JX |
5328 | msgid "more than one uploadpack given, using the first" |
5329 | msgstr "提供了一个以上的 uploadpack,使用第一个" | |
5330 | ||
a5cd71ca | 5331 | #: remote.c:611 |
a0b6b246 JX |
5332 | #, c-format |
5333 | msgid "Cannot fetch both %s and %s to %s" | |
5334 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 5335 | |
a5cd71ca | 5336 | #: remote.c:615 |
c04f5ac3 | 5337 | #, c-format |
a0b6b246 JX |
5338 | msgid "%s usually tracks %s, not %s" |
5339 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 5340 | |
a5cd71ca | 5341 | #: remote.c:619 |
a0b6b246 JX |
5342 | #, c-format |
5343 | msgid "%s tracks both %s and %s" | |
5344 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 5345 | |
a5cd71ca | 5346 | #: remote.c:687 |
06991777 JX |
5347 | #, c-format |
5348 | msgid "key '%s' of pattern had no '*'" | |
5349 | msgstr "模式的键 '%s' 没有 '*'" | |
5350 | ||
a5cd71ca | 5351 | #: remote.c:697 |
06991777 JX |
5352 | #, c-format |
5353 | msgid "value '%s' of pattern has no '*'" | |
5354 | msgstr "模式的值 '%s' 没有 '*'" | |
5355 | ||
a5cd71ca | 5356 | #: remote.c:1003 |
06991777 JX |
5357 | #, c-format |
5358 | msgid "src refspec %s does not match any" | |
5359 | msgstr "源引用表达式 %s 没有匹配" | |
5360 | ||
a5cd71ca | 5361 | #: remote.c:1008 |
06991777 JX |
5362 | #, c-format |
5363 | msgid "src refspec %s matches more than one" | |
5364 | msgstr "源引用表达式 %s 匹配超过一个" | |
5365 | ||
5366 | #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push | |
5367 | #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is | |
5368 | #. the <src>. | |
5369 | #. | |
a5cd71ca | 5370 | #: remote.c:1023 |
06991777 JX |
5371 | #, c-format |
5372 | msgid "" | |
5373 | "The destination you provided is not a full refname (i.e.,\n" | |
5374 | "starting with \"refs/\"). We tried to guess what you meant by:\n" | |
5375 | "\n" | |
5376 | "- Looking for a ref that matches '%s' on the remote side.\n" | |
5377 | "- Checking if the <src> being pushed ('%s')\n" | |
5378 | " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" | |
5379 | " refs/{heads,tags}/ prefix on the remote side.\n" | |
5380 | "\n" | |
5381 | "Neither worked, so we gave up. You must fully qualify the ref." | |
5382 | msgstr "" | |
5383 | "您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n" | |
5384 | "试着猜测您的想法:\n" | |
5385 | "\n" | |
5386 | "- 在远端查询和 '%s' 匹配的引用。\n" | |
5387 | "- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n" | |
5388 | " 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n" | |
5389 | "\n" | |
5390 | "都不行,所以我们已放弃。您必须给出完整的引用。" | |
5391 | ||
a5cd71ca | 5392 | #: remote.c:1043 |
06991777 JX |
5393 | #, c-format |
5394 | msgid "" | |
5395 | "The <src> part of the refspec is a commit object.\n" | |
5396 | "Did you mean to create a new branch by pushing to\n" | |
5397 | "'%s:refs/heads/%s'?" | |
5398 | msgstr "" | |
5399 | "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" | |
5400 | "'%s:refs/heads/%s' 推送么?" | |
5401 | ||
a5cd71ca | 5402 | #: remote.c:1048 |
06991777 JX |
5403 | #, c-format |
5404 | msgid "" | |
5405 | "The <src> part of the refspec is a tag object.\n" | |
5406 | "Did you mean to create a new tag by pushing to\n" | |
5407 | "'%s:refs/tags/%s'?" | |
5408 | msgstr "" | |
5409 | "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" | |
5410 | "'%s:refs/tags/%s' 推送么?" | |
5411 | ||
a5cd71ca | 5412 | #: remote.c:1053 |
06991777 JX |
5413 | #, c-format |
5414 | msgid "" | |
5415 | "The <src> part of the refspec is a tree object.\n" | |
5416 | "Did you mean to tag a new tree by pushing to\n" | |
5417 | "'%s:refs/tags/%s'?" | |
5418 | msgstr "" | |
5419 | "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" | |
5420 | "'%s:refs/tags/%s' 推送么?" | |
5421 | ||
a5cd71ca | 5422 | #: remote.c:1058 |
06991777 JX |
5423 | #, c-format |
5424 | msgid "" | |
5425 | "The <src> part of the refspec is a blob object.\n" | |
5426 | "Did you mean to tag a new blob by pushing to\n" | |
5427 | "'%s:refs/tags/%s'?" | |
5428 | msgstr "" | |
5429 | "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" | |
5430 | "'%s:refs/tags/%s' 推送么?" | |
5431 | ||
a5cd71ca | 5432 | #: remote.c:1094 |
06991777 JX |
5433 | #, c-format |
5434 | msgid "%s cannot be resolved to branch" | |
5435 | msgstr "%s 无法被解析为分支" | |
5436 | ||
a5cd71ca | 5437 | #: remote.c:1105 |
06991777 JX |
5438 | #, c-format |
5439 | msgid "unable to delete '%s': remote ref does not exist" | |
8e4e0555 | 5440 | msgstr "无法删除 '%s':远程引用不存在" |
06991777 | 5441 | |
a5cd71ca | 5442 | #: remote.c:1117 |
06991777 JX |
5443 | #, c-format |
5444 | msgid "dst refspec %s matches more than one" | |
5445 | msgstr "目标引用表达式 %s 匹配超过一个" | |
5446 | ||
a5cd71ca | 5447 | #: remote.c:1124 |
06991777 JX |
5448 | #, c-format |
5449 | msgid "dst ref %s receives from more than one src" | |
5450 | msgstr "目标引用 %s 接收超过一个源" | |
c04f5ac3 | 5451 | |
a5cd71ca | 5452 | #: remote.c:1627 remote.c:1728 |
a0b6b246 JX |
5453 | msgid "HEAD does not point to a branch" |
5454 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 5455 | |
a5cd71ca | 5456 | #: remote.c:1636 |
a0b6b246 JX |
5457 | #, c-format |
5458 | msgid "no such branch: '%s'" | |
5459 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 5460 | |
a5cd71ca | 5461 | #: remote.c:1639 |
a0b6b246 JX |
5462 | #, c-format |
5463 | msgid "no upstream configured for branch '%s'" | |
5464 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 5465 | |
a5cd71ca | 5466 | #: remote.c:1645 |
a0b6b246 JX |
5467 | #, c-format |
5468 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
5469 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 5470 | |
a5cd71ca | 5471 | #: remote.c:1660 |
a0b6b246 JX |
5472 | #, c-format |
5473 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
5474 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 5475 | |
a5cd71ca | 5476 | #: remote.c:1672 |
a0b6b246 JX |
5477 | #, c-format |
5478 | msgid "branch '%s' has no remote for pushing" | |
5479 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 5480 | |
a5cd71ca | 5481 | #: remote.c:1682 |
a0b6b246 JX |
5482 | #, c-format |
5483 | msgid "push refspecs for '%s' do not include '%s'" | |
5484 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 5485 | |
a5cd71ca | 5486 | #: remote.c:1695 |
a0b6b246 JX |
5487 | msgid "push has no destination (push.default is 'nothing')" |
5488 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 5489 | |
a5cd71ca | 5490 | #: remote.c:1717 |
a0b6b246 JX |
5491 | msgid "cannot resolve 'simple' push to a single destination" |
5492 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 5493 | |
a5cd71ca | 5494 | #: remote.c:1843 |
06991777 JX |
5495 | #, c-format |
5496 | msgid "couldn't find remote ref %s" | |
8e4e0555 | 5497 | msgstr "无法找到远程引用 %s" |
06991777 | 5498 | |
a5cd71ca | 5499 | #: remote.c:1856 |
06991777 JX |
5500 | #, c-format |
5501 | msgid "* Ignoring funny ref '%s' locally" | |
5502 | msgstr "* 在本地忽略可笑的引用 '%s'" | |
5503 | ||
a5cd71ca | 5504 | #: remote.c:2019 |
a0b6b246 JX |
5505 | #, c-format |
5506 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
5507 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 5508 | |
a5cd71ca | 5509 | #: remote.c:2023 |
a0b6b246 JX |
5510 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
5511 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 5512 | |
a5cd71ca | 5513 | #: remote.c:2026 |
a0b6b246 | 5514 | #, c-format |
6937cb4e | 5515 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 5516 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 5517 | |
a5cd71ca | 5518 | #: remote.c:2030 |
31e5e17b JX |
5519 | #, c-format |
5520 | msgid "Your branch and '%s' refer to different commits.\n" | |
5521 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
5522 | ||
a5cd71ca | 5523 | #: remote.c:2033 |
31e5e17b JX |
5524 | #, c-format |
5525 | msgid " (use \"%s\" for details)\n" | |
5526 | msgstr " (使用 \"%s\" 查看详情)\n" | |
5527 | ||
a5cd71ca | 5528 | #: remote.c:2037 |
a0b6b246 JX |
5529 | #, c-format |
5530 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
5531 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
5532 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5533 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 5534 | |
a5cd71ca | 5535 | #: remote.c:2043 |
a0b6b246 JX |
5536 | msgid " (use \"git push\" to publish your local commits)\n" |
5537 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 5538 | |
a5cd71ca | 5539 | #: remote.c:2046 |
a0b6b246 JX |
5540 | #, c-format |
5541 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
5542 | msgid_plural "" | |
5543 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
5544 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
5545 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 5546 | |
a0b6b246 | 5547 | # 译者:注意保持前导空格 |
a5cd71ca | 5548 | #: remote.c:2054 |
a0b6b246 JX |
5549 | msgid " (use \"git pull\" to update your local branch)\n" |
5550 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 5551 | |
a5cd71ca | 5552 | #: remote.c:2057 |
a0b6b246 JX |
5553 | #, c-format |
5554 | msgid "" | |
5555 | "Your branch and '%s' have diverged,\n" | |
5556 | "and have %d and %d different commit each, respectively.\n" | |
5557 | msgid_plural "" | |
5558 | "Your branch and '%s' have diverged,\n" | |
5559 | "and have %d and %d different commits each, respectively.\n" | |
5560 | msgstr[0] "" | |
5561 | "您的分支和 '%s' 出现了偏离,\n" | |
5562 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
5563 | msgstr[1] "" | |
5564 | "您的分支和 '%s' 出现了偏离,\n" | |
5565 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 5566 | |
a0b6b246 | 5567 | # 译者:注意保持前导空格 |
a5cd71ca | 5568 | #: remote.c:2067 |
a0b6b246 JX |
5569 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
5570 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 5571 | |
a5cd71ca | 5572 | #: remote.c:2250 |
06991777 JX |
5573 | #, c-format |
5574 | msgid "cannot parse expected object name '%s'" | |
5575 | msgstr "无法解析期望的对象名 '%s'" | |
5576 | ||
4c27fcb5 | 5577 | #: replace-object.c:21 |
c1ac5258 JX |
5578 | #, c-format |
5579 | msgid "bad replace ref name: %s" | |
5580 | msgstr "错误的替换引用名称:%s" | |
5581 | ||
4c27fcb5 | 5582 | #: replace-object.c:30 |
c1ac5258 JX |
5583 | #, c-format |
5584 | msgid "duplicate replace ref: %s" | |
5585 | msgstr "重复的替换引用:%s" | |
5586 | ||
4c27fcb5 | 5587 | #: replace-object.c:73 |
c1ac5258 JX |
5588 | #, c-format |
5589 | msgid "replace depth too high for object %s" | |
5590 | msgstr "对象 %s 的替换层级太深" | |
5591 | ||
4c27fcb5 JX |
5592 | #: rerere.c:217 rerere.c:226 rerere.c:229 |
5593 | msgid "corrupt MERGE_RR" | |
5594 | msgstr "损坏的 MERGE_RR" | |
5595 | ||
5596 | #: rerere.c:264 rerere.c:269 | |
5597 | msgid "unable to write rerere record" | |
5598 | msgstr "无法写入 rerere 记录" | |
cfff71a9 | 5599 | |
4c27fcb5 JX |
5600 | #: rerere.c:495 |
5601 | #, c-format | |
5602 | msgid "there were errors while writing '%s' (%s)" | |
5603 | msgstr "写入 '%s' (%s) 时出错" | |
6792b93b | 5604 | |
4c27fcb5 JX |
5605 | #: rerere.c:498 |
5606 | #, c-format | |
5607 | msgid "failed to flush '%s'" | |
5608 | msgstr "刷新 '%s' 失败" | |
5c57d762 | 5609 | |
4c27fcb5 | 5610 | #: rerere.c:503 rerere.c:1039 |
5809aa05 | 5611 | #, c-format |
4c27fcb5 JX |
5612 | msgid "could not parse conflict hunks in '%s'" |
5613 | msgstr "不能解析 '%s' 中的冲突块" | |
5809aa05 | 5614 | |
4c27fcb5 JX |
5615 | #: rerere.c:684 |
5616 | #, c-format | |
5617 | msgid "failed utime() on '%s'" | |
5618 | msgstr "在 '%s' 上调用 utime() 失败" | |
31e5e17b | 5619 | |
4c27fcb5 | 5620 | #: rerere.c:694 |
87cb7997 | 5621 | #, c-format |
4c27fcb5 JX |
5622 | msgid "writing '%s' failed" |
5623 | msgstr "写入 '%s' 失败" | |
87cb7997 | 5624 | |
4c27fcb5 | 5625 | #: rerere.c:714 |
87cb7997 | 5626 | #, c-format |
4c27fcb5 JX |
5627 | msgid "Staged '%s' using previous resolution." |
5628 | msgstr "使用之前的解决方案暂存 '%s'。" | |
87cb7997 | 5629 | |
4c27fcb5 JX |
5630 | #: rerere.c:753 |
5631 | #, c-format | |
5632 | msgid "Recorded resolution for '%s'." | |
5633 | msgstr "已记录 '%s' 的解决方案。" | |
6792b93b | 5634 | |
4c27fcb5 JX |
5635 | #: rerere.c:788 |
5636 | #, c-format | |
5637 | msgid "Resolved '%s' using previous resolution." | |
5638 | msgstr "使用之前的解决方案解决 '%s'。" | |
5639 | ||
5640 | #: rerere.c:803 | |
5641 | #, c-format | |
5642 | msgid "cannot unlink stray '%s'" | |
5643 | msgstr "不能删除 stray '%s'" | |
5644 | ||
5645 | #: rerere.c:807 | |
5646 | #, c-format | |
5647 | msgid "Recorded preimage for '%s'" | |
5648 | msgstr "为 '%s' 记录 preimage" | |
5649 | ||
a5cd71ca | 5650 | #: rerere.c:881 submodule.c:2023 builtin/log.c:1790 |
a6cd2cc4 | 5651 | #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 |
4c27fcb5 JX |
5652 | #, c-format |
5653 | msgid "could not create directory '%s'" | |
5654 | msgstr "不能创建目录 '%s'" | |
5655 | ||
5656 | #: rerere.c:1057 | |
5657 | #, c-format | |
5658 | msgid "failed to update conflicted state in '%s'" | |
5659 | msgstr "更新 '%s' 中的冲突状态失败" | |
5660 | ||
5661 | #: rerere.c:1068 rerere.c:1075 | |
5662 | #, c-format | |
5663 | msgid "no remembered resolution for '%s'" | |
5664 | msgstr "没有为 '%s' 记忆的解决方案" | |
5665 | ||
5666 | #: rerere.c:1077 | |
5667 | #, c-format | |
5668 | msgid "cannot unlink '%s'" | |
5669 | msgstr "不能删除 '%s'" | |
5670 | ||
5671 | #: rerere.c:1087 | |
5672 | #, c-format | |
5673 | msgid "Updated preimage for '%s'" | |
5674 | msgstr "已为 '%s' 更新 preimage" | |
5675 | ||
5676 | #: rerere.c:1096 | |
5677 | #, c-format | |
5678 | msgid "Forgot resolution for '%s'\n" | |
5679 | msgstr "忘记 '%s' 的解决方案\n" | |
5680 | ||
5681 | #: rerere.c:1199 | |
5682 | msgid "unable to open rr-cache directory" | |
5683 | msgstr "不能打开 rr-cache 目录" | |
5684 | ||
a5cd71ca | 5685 | #: revision.c:2509 |
4c27fcb5 JX |
5686 | msgid "your current branch appears to be broken" |
5687 | msgstr "您的当前分支好像被损坏" | |
5688 | ||
a5cd71ca | 5689 | #: revision.c:2512 |
4c27fcb5 JX |
5690 | #, c-format |
5691 | msgid "your current branch '%s' does not have any commits yet" | |
5692 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
5693 | ||
a5cd71ca | 5694 | #: revision.c:2720 |
4c27fcb5 JX |
5695 | msgid "--first-parent is incompatible with --bisect" |
5696 | msgstr "--first-parent 与 --bisect 不兼容" | |
5697 | ||
a5cd71ca | 5698 | #: revision.c:2724 |
d46c5519 JX |
5699 | msgid "-L does not yet support diff formats besides -p and -s" |
5700 | msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" | |
5701 | ||
5702 | #: run-command.c:763 | |
4c27fcb5 JX |
5703 | msgid "open /dev/null failed" |
5704 | msgstr "不能打开 /dev/null" | |
5705 | ||
d46c5519 | 5706 | #: run-command.c:1269 |
4c27fcb5 JX |
5707 | #, c-format |
5708 | msgid "cannot create async thread: %s" | |
5709 | msgstr "不能创建 async 线程:%s" | |
5710 | ||
d46c5519 | 5711 | #: run-command.c:1333 |
4c27fcb5 JX |
5712 | #, c-format |
5713 | msgid "" | |
5714 | "The '%s' hook was ignored because it's not set as executable.\n" | |
5715 | "You can disable this warning with `git config advice.ignoredHook false`." | |
5716 | msgstr "" | |
5717 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
5718 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
5719 | ||
a5cd71ca | 5720 | #: send-pack.c:142 |
4c27fcb5 JX |
5721 | msgid "unexpected flush packet while reading remote unpack status" |
5722 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
5723 | ||
a5cd71ca | 5724 | #: send-pack.c:144 |
4c27fcb5 JX |
5725 | #, c-format |
5726 | msgid "unable to parse remote unpack status: %s" | |
5727 | msgstr "不能解析远程解包状态:%s" | |
5728 | ||
a5cd71ca | 5729 | #: send-pack.c:146 |
4c27fcb5 JX |
5730 | #, c-format |
5731 | msgid "remote unpack failed: %s" | |
5732 | msgstr "远程解包失败:%s" | |
5733 | ||
a5cd71ca | 5734 | #: send-pack.c:307 |
4c27fcb5 JX |
5735 | msgid "failed to sign the push certificate" |
5736 | msgstr "为推送证书签名失败" | |
5737 | ||
a5cd71ca | 5738 | #: send-pack.c:421 |
a0b6b246 JX |
5739 | msgid "the receiving end does not support --signed push" |
5740 | msgstr "接收端不支持签名推送" | |
6792b93b | 5741 | |
a5cd71ca | 5742 | #: send-pack.c:423 |
a0b6b246 JX |
5743 | msgid "" |
5744 | "not sending a push certificate since the receiving end does not support --" | |
5745 | "signed push" | |
5746 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 5747 | |
a5cd71ca | 5748 | #: send-pack.c:435 |
a0b6b246 JX |
5749 | msgid "the receiving end does not support --atomic push" |
5750 | msgstr "接收端不支持原子推送" | |
6792b93b | 5751 | |
a5cd71ca | 5752 | #: send-pack.c:440 |
a0b6b246 JX |
5753 | msgid "the receiving end does not support push options" |
5754 | msgstr "接收端不支持推送选项" | |
6792b93b | 5755 | |
d46c5519 | 5756 | #: sequencer.c:187 |
31e5e17b JX |
5757 | #, c-format |
5758 | msgid "invalid commit message cleanup mode '%s'" | |
5759 | msgstr "无效的提交信息清理模式 '%s'" | |
5760 | ||
d46c5519 | 5761 | #: sequencer.c:292 |
fd8cb379 JX |
5762 | #, c-format |
5763 | msgid "could not delete '%s'" | |
5764 | msgstr "无法删除 '%s'" | |
5765 | ||
a5cd71ca | 5766 | #: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 |
a6cd2cc4 JX |
5767 | #, c-format |
5768 | msgid "could not remove '%s'" | |
5769 | msgstr "无法删除 '%s'" | |
5770 | ||
5771 | #: sequencer.c:321 | |
a0b6b246 JX |
5772 | msgid "revert" |
5773 | msgstr "还原" | |
6792b93b | 5774 | |
a6cd2cc4 | 5775 | #: sequencer.c:323 |
a0b6b246 JX |
5776 | msgid "cherry-pick" |
5777 | msgstr "拣选" | |
5778 | ||
a6cd2cc4 | 5779 | #: sequencer.c:325 |
1a79b2f1 JX |
5780 | msgid "rebase -i" |
5781 | msgstr "rebase -i" | |
5782 | ||
a6cd2cc4 | 5783 | #: sequencer.c:327 |
1a79b2f1 | 5784 | #, c-format |
c1ac5258 | 5785 | msgid "unknown action: %d" |
1a79b2f1 JX |
5786 | msgstr "未知动作:%d" |
5787 | ||
a6cd2cc4 | 5788 | #: sequencer.c:385 |
a0b6b246 JX |
5789 | msgid "" |
5790 | "after resolving the conflicts, mark the corrected paths\n" | |
5791 | "with 'git add <paths>' or 'git rm <paths>'" | |
5792 | msgstr "" | |
5793 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
5794 | "命令标记修正后的文件" | |
5795 | ||
a6cd2cc4 | 5796 | #: sequencer.c:388 |
a0b6b246 JX |
5797 | msgid "" |
5798 | "after resolving the conflicts, mark the corrected paths\n" | |
5799 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
5800 | "and commit the result with 'git commit'" | |
5801 | msgstr "" | |
5802 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
5803 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 5804 | |
a5cd71ca | 5805 | #: sequencer.c:401 sequencer.c:2847 |
1b7f4a34 | 5806 | #, c-format |
a0b6b246 JX |
5807 | msgid "could not lock '%s'" |
5808 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 5809 | |
a6cd2cc4 | 5810 | #: sequencer.c:408 |
a0b6b246 | 5811 | #, c-format |
72351d7d | 5812 | msgid "could not write eol to '%s'" |
a0b6b246 | 5813 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 5814 | |
a5cd71ca JX |
5815 | #: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 |
5816 | #: sequencer.c:3130 | |
1b7f4a34 | 5817 | #, c-format |
31e5e17b JX |
5818 | msgid "failed to finalize '%s'" |
5819 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 5820 | |
a5cd71ca JX |
5821 | #: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 |
5822 | #: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 | |
5823 | #: builtin/rebase.c:568 | |
a0b6b246 JX |
5824 | #, c-format |
5825 | msgid "could not read '%s'" | |
5826 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 5827 | |
a6cd2cc4 | 5828 | #: sequencer.c:462 |
63af42fe | 5829 | #, c-format |
a0b6b246 JX |
5830 | msgid "your local changes would be overwritten by %s." |
5831 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 5832 | |
a6cd2cc4 | 5833 | #: sequencer.c:466 |
a0b6b246 | 5834 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 5835 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 5836 | |
a6cd2cc4 | 5837 | #: sequencer.c:498 |
a0b6b246 JX |
5838 | #, c-format |
5839 | msgid "%s: fast-forward" | |
5840 | msgstr "%s:快进" | |
6792b93b | 5841 | |
a6cd2cc4 | 5842 | #: sequencer.c:537 builtin/tag.c:565 |
d46c5519 JX |
5843 | #, c-format |
5844 | msgid "Invalid cleanup mode %s" | |
5845 | msgstr "无效的清理模式 %s" | |
5846 | ||
1a79b2f1 | 5847 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
a4f16749 | 5848 | #. "rebase -i". |
1a79b2f1 | 5849 | #. |
a5cd71ca | 5850 | #: sequencer.c:631 |
a0b6b246 JX |
5851 | #, c-format |
5852 | msgid "%s: Unable to write new index file" | |
5853 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 5854 | |
a5cd71ca | 5855 | #: sequencer.c:648 |
5809aa05 JX |
5856 | msgid "unable to update cache tree" |
5857 | msgstr "不能更新缓存树" | |
6792b93b | 5858 | |
a5cd71ca | 5859 | #: sequencer.c:662 |
fd8cb379 JX |
5860 | msgid "could not resolve HEAD commit" |
5861 | msgstr "不能解析 HEAD 提交" | |
5862 | ||
a5cd71ca | 5863 | #: sequencer.c:742 |
4c27fcb5 JX |
5864 | #, c-format |
5865 | msgid "no key present in '%.*s'" | |
5866 | msgstr "在 '%.*s' 中没有 key" | |
5867 | ||
a5cd71ca | 5868 | #: sequencer.c:753 |
c1ac5258 | 5869 | #, c-format |
4c27fcb5 JX |
5870 | msgid "unable to dequote value of '%s'" |
5871 | msgstr "无法为 '%s' 的值去引号" | |
c1ac5258 | 5872 | |
a5cd71ca JX |
5873 | #: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 |
5874 | #: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 | |
c1ac5258 | 5875 | #, c-format |
4c27fcb5 JX |
5876 | msgid "could not open '%s' for reading" |
5877 | msgstr "无法打开 '%s' 进行读取" | |
5878 | ||
a5cd71ca | 5879 | #: sequencer.c:800 |
4c27fcb5 JX |
5880 | msgid "'GIT_AUTHOR_NAME' already given" |
5881 | msgstr "已经给出 'GIT_AUTHOR_NAME'" | |
c1ac5258 | 5882 | |
a5cd71ca | 5883 | #: sequencer.c:805 |
4c27fcb5 JX |
5884 | msgid "'GIT_AUTHOR_EMAIL' already given" |
5885 | msgstr "已经给出 'GIT_AUTHOR_EMAIL'" | |
5886 | ||
a5cd71ca | 5887 | #: sequencer.c:810 |
4c27fcb5 JX |
5888 | msgid "'GIT_AUTHOR_DATE' already given" |
5889 | msgstr "已经给出 'GIT_AUTHOR_DATE'" | |
5890 | ||
a5cd71ca | 5891 | #: sequencer.c:814 |
4c27fcb5 JX |
5892 | #, c-format |
5893 | msgid "unknown variable '%s'" | |
5894 | msgstr "未知变量 '%s'" | |
5895 | ||
a5cd71ca | 5896 | #: sequencer.c:819 |
4c27fcb5 JX |
5897 | msgid "missing 'GIT_AUTHOR_NAME'" |
5898 | msgstr "缺少 'GIT_AUTHOR_NAME'" | |
5899 | ||
a5cd71ca | 5900 | #: sequencer.c:821 |
4c27fcb5 JX |
5901 | msgid "missing 'GIT_AUTHOR_EMAIL'" |
5902 | msgstr "缺少 'GIT_AUTHOR_EMAIL'" | |
5903 | ||
a5cd71ca | 5904 | #: sequencer.c:823 |
4c27fcb5 JX |
5905 | msgid "missing 'GIT_AUTHOR_DATE'" |
5906 | msgstr "缺少 'GIT_AUTHOR_DATE'" | |
5907 | ||
a5cd71ca | 5908 | #: sequencer.c:872 |
63af42fe JX |
5909 | #, c-format |
5910 | msgid "" | |
a0b6b246 JX |
5911 | "you have staged changes in your working tree\n" |
5912 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
5913 | "\n" | |
5914 | " git commit --amend %s\n" | |
5915 | "\n" | |
5916 | "If they are meant to go into a new commit, run:\n" | |
5917 | "\n" | |
5918 | " git commit %s\n" | |
5919 | "\n" | |
5920 | "In both cases, once you're done, continue with:\n" | |
5921 | "\n" | |
5922 | " git rebase --continue\n" | |
5923 | msgstr "" | |
1a79b2f1 JX |
5924 | "您的工作区中存在已暂存的修改\n" |
5925 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
5926 | "\n" |
5927 | " git commit --amend %s\n" | |
5928 | "\n" | |
29004bbb | 5929 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
5930 | "\n" |
5931 | " git commit %s\n" | |
5932 | "\n" | |
5933 | "无论哪种情况,当您完成提交,继续执行:\n" | |
5934 | "\n" | |
5935 | " git rebase --continue\n" | |
6792b93b | 5936 | |
a5cd71ca | 5937 | #: sequencer.c:1146 |
31e5e17b JX |
5938 | msgid "'prepare-commit-msg' hook failed" |
5939 | msgstr "'prepare-commit-msg' 钩子失败" | |
5940 | ||
a5cd71ca | 5941 | #: sequencer.c:1153 |
31e5e17b JX |
5942 | msgid "" |
5943 | "Your name and email address were configured automatically based\n" | |
5944 | "on your username and hostname. Please check that they are accurate.\n" | |
5945 | "You can suppress this message by setting them explicitly. Run the\n" | |
5946 | "following command and follow the instructions in your editor to edit\n" | |
5947 | "your configuration file:\n" | |
5948 | "\n" | |
5949 | " git config --global --edit\n" | |
5950 | "\n" | |
5951 | "After doing this, you may fix the identity used for this commit with:\n" | |
5952 | "\n" | |
5953 | " git commit --amend --reset-author\n" | |
5954 | msgstr "" | |
5955 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
5956 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
5957 | "中编辑您的配置文件:\n" | |
5958 | "\n" | |
5959 | " git config --global --edit\n" | |
5960 | "\n" | |
5961 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
5962 | "\n" | |
5963 | " git commit --amend --reset-author\n" | |
5964 | ||
a5cd71ca | 5965 | #: sequencer.c:1166 |
31e5e17b JX |
5966 | msgid "" |
5967 | "Your name and email address were configured automatically based\n" | |
5968 | "on your username and hostname. Please check that they are accurate.\n" | |
5969 | "You can suppress this message by setting them explicitly:\n" | |
5970 | "\n" | |
5971 | " git config --global user.name \"Your Name\"\n" | |
5972 | " git config --global user.email you@example.com\n" | |
5973 | "\n" | |
5974 | "After doing this, you may fix the identity used for this commit with:\n" | |
5975 | "\n" | |
5976 | " git commit --amend --reset-author\n" | |
5977 | msgstr "" | |
5978 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
5979 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
5980 | "\n" | |
5981 | " git config --global user.name \"Your Name\"\n" | |
5982 | " git config --global user.email you@example.com\n" | |
5983 | "\n" | |
5984 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
5985 | "\n" | |
5986 | " git commit --amend --reset-author\n" | |
5987 | ||
a5cd71ca | 5988 | #: sequencer.c:1208 |
31e5e17b JX |
5989 | msgid "couldn't look up newly created commit" |
5990 | msgstr "无法找到新创建的提交" | |
5991 | ||
a5cd71ca | 5992 | #: sequencer.c:1210 |
31e5e17b JX |
5993 | msgid "could not parse newly created commit" |
5994 | msgstr "不能解析新创建的提交" | |
5995 | ||
a5cd71ca | 5996 | #: sequencer.c:1256 |
31e5e17b JX |
5997 | msgid "unable to resolve HEAD after creating commit" |
5998 | msgstr "创建提交后,不能解析 HEAD" | |
5999 | ||
a5cd71ca | 6000 | #: sequencer.c:1258 |
31e5e17b JX |
6001 | msgid "detached HEAD" |
6002 | msgstr "分离头指针" | |
6003 | ||
6004 | # 译者:中文字符串拼接,可删除前导空格 | |
a5cd71ca | 6005 | #: sequencer.c:1262 |
31e5e17b JX |
6006 | msgid " (root-commit)" |
6007 | msgstr "(根提交)" | |
6008 | ||
a5cd71ca | 6009 | #: sequencer.c:1283 |
31e5e17b JX |
6010 | msgid "could not parse HEAD" |
6011 | msgstr "不能解析 HEAD" | |
6012 | ||
a5cd71ca | 6013 | #: sequencer.c:1285 |
31e5e17b JX |
6014 | #, c-format |
6015 | msgid "HEAD %s is not a commit!" | |
6016 | msgstr "HEAD %s 不是一个提交!" | |
6017 | ||
a5cd71ca | 6018 | #: sequencer.c:1289 builtin/commit.c:1571 |
31e5e17b JX |
6019 | msgid "could not parse HEAD commit" |
6020 | msgstr "不能解析 HEAD 提交" | |
6021 | ||
a5cd71ca | 6022 | #: sequencer.c:1341 sequencer.c:1933 |
31e5e17b JX |
6023 | msgid "unable to parse commit author" |
6024 | msgstr "不能解析提交作者" | |
6025 | ||
a5cd71ca | 6026 | #: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 |
31e5e17b JX |
6027 | msgid "git write-tree failed to write a tree" |
6028 | msgstr "git write-tree 无法写入树对象" | |
6029 | ||
a5cd71ca | 6030 | #: sequencer.c:1369 sequencer.c:1429 |
31e5e17b JX |
6031 | #, c-format |
6032 | msgid "unable to read commit message from '%s'" | |
6033 | msgstr "不能从 '%s' 读取提交说明" | |
6034 | ||
a5cd71ca JX |
6035 | #: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 |
6036 | #: builtin/merge.c:908 | |
31e5e17b | 6037 | msgid "failed to write commit object" |
c1ac5258 | 6038 | msgstr "写提交对象失败" |
31e5e17b | 6039 | |
a5cd71ca | 6040 | #: sequencer.c:1456 |
a0b6b246 | 6041 | #, c-format |
5809aa05 JX |
6042 | msgid "could not parse commit %s" |
6043 | msgstr "不能解析提交 %s" | |
6792b93b | 6044 | |
a5cd71ca | 6045 | #: sequencer.c:1461 |
63af42fe | 6046 | #, c-format |
5809aa05 JX |
6047 | msgid "could not parse parent commit %s" |
6048 | msgstr "不能解析父提交 %s" | |
63af42fe | 6049 | |
a5cd71ca | 6050 | #: sequencer.c:1535 sequencer.c:1645 |
c1ac5258 JX |
6051 | #, c-format |
6052 | msgid "unknown command: %d" | |
6053 | msgstr "未知命令:%d" | |
6054 | ||
a5cd71ca | 6055 | #: sequencer.c:1592 sequencer.c:1617 |
1a79b2f1 JX |
6056 | #, c-format |
6057 | msgid "This is a combination of %d commits." | |
6058 | msgstr "这是一个 %d 个提交的组合。" | |
6059 | ||
a5cd71ca | 6060 | #: sequencer.c:1602 |
1a79b2f1 JX |
6061 | msgid "need a HEAD to fixup" |
6062 | msgstr "需要一个 HEAD 来修复" | |
6063 | ||
a5cd71ca | 6064 | #: sequencer.c:1604 sequencer.c:3157 |
1a79b2f1 JX |
6065 | msgid "could not read HEAD" |
6066 | msgstr "不能读取 HEAD" | |
6067 | ||
a5cd71ca | 6068 | #: sequencer.c:1606 |
1a79b2f1 JX |
6069 | msgid "could not read HEAD's commit message" |
6070 | msgstr "不能读取 HEAD 的提交说明" | |
6071 | ||
a5cd71ca | 6072 | #: sequencer.c:1612 |
1a79b2f1 JX |
6073 | #, c-format |
6074 | msgid "cannot write '%s'" | |
6075 | msgstr "不能写 '%s'" | |
6076 | ||
a5cd71ca | 6077 | #: sequencer.c:1619 git-rebase--preserve-merges.sh:496 |
1a79b2f1 JX |
6078 | msgid "This is the 1st commit message:" |
6079 | msgstr "这是第一个提交说明:" | |
6080 | ||
a5cd71ca | 6081 | #: sequencer.c:1627 |
1a79b2f1 JX |
6082 | #, c-format |
6083 | msgid "could not read commit message of %s" | |
6084 | msgstr "不能读取 %s 的提交说明" | |
6085 | ||
a5cd71ca | 6086 | #: sequencer.c:1634 |
1a79b2f1 JX |
6087 | #, c-format |
6088 | msgid "This is the commit message #%d:" | |
6089 | msgstr "这是提交说明 #%d:" | |
6090 | ||
a5cd71ca | 6091 | #: sequencer.c:1640 |
1a79b2f1 JX |
6092 | #, c-format |
6093 | msgid "The commit message #%d will be skipped:" | |
6094 | msgstr "提交说明 #%d 将被跳过:" | |
6095 | ||
a5cd71ca | 6096 | #: sequencer.c:1728 |
a0b6b246 JX |
6097 | msgid "your index file is unmerged." |
6098 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 6099 | |
a5cd71ca | 6100 | #: sequencer.c:1735 |
fd8cb379 JX |
6101 | msgid "cannot fixup root commit" |
6102 | msgstr "不能修复根提交" | |
6103 | ||
a5cd71ca | 6104 | #: sequencer.c:1754 |
a0b6b246 JX |
6105 | #, c-format |
6106 | msgid "commit %s is a merge but no -m option was given." | |
6107 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 6108 | |
a5cd71ca | 6109 | #: sequencer.c:1762 sequencer.c:1770 |
a0b6b246 JX |
6110 | #, c-format |
6111 | msgid "commit %s does not have parent %d" | |
6112 | msgstr "提交 %s 没有第 %d 个父提交" | |
6113 | ||
a5cd71ca | 6114 | #: sequencer.c:1776 |
1a79b2f1 JX |
6115 | #, c-format |
6116 | msgid "cannot get commit message for %s" | |
6117 | msgstr "不能得到 %s 的提交说明" | |
6118 | ||
a0b6b246 JX |
6119 | #. TRANSLATORS: The first %s will be a "todo" command like |
6120 | #. "revert" or "pick", the second %s a SHA1. | |
a5cd71ca | 6121 | #: sequencer.c:1795 |
a0b6b246 JX |
6122 | #, c-format |
6123 | msgid "%s: cannot parse parent commit %s" | |
6124 | msgstr "%s:不能解析父提交 %s" | |
6125 | ||
a5cd71ca | 6126 | #: sequencer.c:1860 |
a0b6b246 | 6127 | #, c-format |
1a79b2f1 JX |
6128 | msgid "could not rename '%s' to '%s'" |
6129 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 6130 | |
a5cd71ca | 6131 | #: sequencer.c:1915 |
a0b6b246 JX |
6132 | #, c-format |
6133 | msgid "could not revert %s... %s" | |
6134 | msgstr "不能还原 %s... %s" | |
6135 | ||
a5cd71ca | 6136 | #: sequencer.c:1916 |
a0b6b246 JX |
6137 | #, c-format |
6138 | msgid "could not apply %s... %s" | |
6139 | msgstr "不能应用 %s... %s" | |
6140 | ||
a5cd71ca | 6141 | #: sequencer.c:1983 |
a0b6b246 JX |
6142 | #, c-format |
6143 | msgid "git %s: failed to read the index" | |
6144 | msgstr "git %s:无法读取索引" | |
6145 | ||
a5cd71ca | 6146 | #: sequencer.c:1990 |
a0b6b246 JX |
6147 | #, c-format |
6148 | msgid "git %s: failed to refresh the index" | |
6149 | msgstr "git %s:无法刷新索引" | |
6150 | ||
a5cd71ca | 6151 | #: sequencer.c:2066 |
5809aa05 JX |
6152 | #, c-format |
6153 | msgid "%s does not accept arguments: '%s'" | |
6154 | msgstr "%s 不接受参数:'%s'" | |
6155 | ||
a5cd71ca | 6156 | #: sequencer.c:2075 |
5809aa05 JX |
6157 | #, c-format |
6158 | msgid "missing arguments for %s" | |
6159 | msgstr "缺少 %s 的参数" | |
6160 | ||
a5cd71ca | 6161 | #: sequencer.c:2112 |
d46c5519 JX |
6162 | #, c-format |
6163 | msgid "could not parse '%.*s'" | |
6164 | msgstr "无法解析 '%.*s'" | |
6165 | ||
a5cd71ca | 6166 | #: sequencer.c:2166 |
a0b6b246 JX |
6167 | #, c-format |
6168 | msgid "invalid line %d: %.*s" | |
6169 | msgstr "无效行 %d:%.*s" | |
6170 | ||
a5cd71ca | 6171 | #: sequencer.c:2177 |
1a79b2f1 JX |
6172 | #, c-format |
6173 | msgid "cannot '%s' without a previous commit" | |
6174 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 6175 | |
a5cd71ca | 6176 | #: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 |
d46c5519 JX |
6177 | #: builtin/rebase.c:204 builtin/rebase.c:229 |
6178 | #, c-format | |
6179 | msgid "could not read '%s'." | |
6180 | msgstr "不能读取 '%s'。" | |
6181 | ||
a5cd71ca | 6182 | #: sequencer.c:2261 |
a6cd2cc4 JX |
6183 | msgid "cancelling a cherry picking in progress" |
6184 | msgstr "正在取消一个进行中的拣选" | |
6185 | ||
a5cd71ca | 6186 | #: sequencer.c:2268 |
a6cd2cc4 JX |
6187 | msgid "cancelling a revert in progress" |
6188 | msgstr "正在取消一个进行中的还原" | |
6189 | ||
a5cd71ca | 6190 | #: sequencer.c:2302 |
1a79b2f1 JX |
6191 | msgid "please fix this using 'git rebase --edit-todo'." |
6192 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
6193 | ||
a5cd71ca | 6194 | #: sequencer.c:2304 |
a0b6b246 JX |
6195 | #, c-format |
6196 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 6197 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 6198 | |
a5cd71ca | 6199 | #: sequencer.c:2309 |
1a79b2f1 JX |
6200 | msgid "no commits parsed." |
6201 | msgstr "没有解析提交。" | |
6202 | ||
a5cd71ca | 6203 | #: sequencer.c:2320 |
a0b6b246 JX |
6204 | msgid "cannot cherry-pick during a revert." |
6205 | msgstr "不能在回退中执行拣选。" | |
6206 | ||
a5cd71ca | 6207 | #: sequencer.c:2322 |
a0b6b246 JX |
6208 | msgid "cannot revert during a cherry-pick." |
6209 | msgstr "不能在拣选中执行回退。" | |
6210 | ||
a5cd71ca | 6211 | #: sequencer.c:2404 |
a0b6b246 JX |
6212 | #, c-format |
6213 | msgid "invalid value for %s: %s" | |
6214 | msgstr "%s 的值无效:%s" | |
6215 | ||
a5cd71ca | 6216 | #: sequencer.c:2491 |
fd8cb379 JX |
6217 | msgid "unusable squash-onto" |
6218 | msgstr "不可用的 squash-onto" | |
6219 | ||
a5cd71ca | 6220 | #: sequencer.c:2507 |
a0b6b246 JX |
6221 | #, c-format |
6222 | msgid "malformed options sheet: '%s'" | |
fd8cb379 | 6223 | msgstr "格式错误的选项清单:'%s'" |
a0b6b246 | 6224 | |
a5cd71ca | 6225 | #: sequencer.c:2590 sequencer.c:4308 |
c1ac5258 JX |
6226 | msgid "empty commit set passed" |
6227 | msgstr "提供了空的提交集" | |
6228 | ||
a5cd71ca | 6229 | #: sequencer.c:2606 |
a6cd2cc4 JX |
6230 | msgid "revert is already in progress" |
6231 | msgstr "一个还原操作已在进行" | |
a0b6b246 | 6232 | |
a5cd71ca | 6233 | #: sequencer.c:2608 |
a6cd2cc4 JX |
6234 | #, c-format |
6235 | msgid "try \"git revert (--continue | %s--abort | --quit)\"" | |
6236 | msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" | |
6237 | ||
a5cd71ca | 6238 | #: sequencer.c:2611 |
a6cd2cc4 JX |
6239 | msgid "cherry-pick is already in progress" |
6240 | msgstr "拣选操作已在进行" | |
6241 | ||
a5cd71ca | 6242 | #: sequencer.c:2613 |
a6cd2cc4 JX |
6243 | #, c-format |
6244 | msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
6245 | msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
a0b6b246 | 6246 | |
a5cd71ca | 6247 | #: sequencer.c:2627 |
a0b6b246 JX |
6248 | #, c-format |
6249 | msgid "could not create sequencer directory '%s'" | |
6250 | msgstr "不能创建序列目录 '%s'" | |
6251 | ||
a5cd71ca | 6252 | #: sequencer.c:2642 |
a0b6b246 JX |
6253 | msgid "could not lock HEAD" |
6254 | msgstr "不能锁定 HEAD" | |
6255 | ||
a5cd71ca | 6256 | #: sequencer.c:2702 sequencer.c:4057 |
a0b6b246 JX |
6257 | msgid "no cherry-pick or revert in progress" |
6258 | msgstr "拣选或还原操作并未进行" | |
6259 | ||
a5cd71ca | 6260 | #: sequencer.c:2704 sequencer.c:2715 |
a0b6b246 JX |
6261 | msgid "cannot resolve HEAD" |
6262 | msgstr "不能解析 HEAD" | |
6263 | ||
a5cd71ca | 6264 | #: sequencer.c:2706 sequencer.c:2750 |
a0b6b246 JX |
6265 | msgid "cannot abort from a branch yet to be born" |
6266 | msgstr "不能从尚未建立的分支终止" | |
6267 | ||
a5cd71ca | 6268 | #: sequencer.c:2736 builtin/grep.c:736 |
a0b6b246 JX |
6269 | #, c-format |
6270 | msgid "cannot open '%s'" | |
6271 | msgstr "不能打开 '%s'" | |
6272 | ||
a5cd71ca | 6273 | #: sequencer.c:2738 |
a0b6b246 JX |
6274 | #, c-format |
6275 | msgid "cannot read '%s': %s" | |
6276 | msgstr "不能读取 '%s':%s" | |
6277 | ||
a5cd71ca | 6278 | #: sequencer.c:2739 |
a0b6b246 JX |
6279 | msgid "unexpected end of file" |
6280 | msgstr "意外的文件结束" | |
6281 | ||
a5cd71ca | 6282 | #: sequencer.c:2745 |
a0b6b246 JX |
6283 | #, c-format |
6284 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
6285 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
6286 | ||
a5cd71ca | 6287 | #: sequencer.c:2756 |
1a79b2f1 JX |
6288 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
6289 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
6290 | ||
a5cd71ca | 6291 | #: sequencer.c:2797 |
a6cd2cc4 JX |
6292 | msgid "no revert in progress" |
6293 | msgstr "没有正在进行的还原" | |
6294 | ||
a5cd71ca | 6295 | #: sequencer.c:2805 |
a6cd2cc4 JX |
6296 | msgid "no cherry-pick in progress" |
6297 | msgstr "没有正在进行的拣选" | |
6298 | ||
a5cd71ca | 6299 | #: sequencer.c:2815 |
a6cd2cc4 JX |
6300 | msgid "failed to skip the commit" |
6301 | msgstr "无法跳过这个提交" | |
6302 | ||
a5cd71ca | 6303 | #: sequencer.c:2822 |
a6cd2cc4 JX |
6304 | msgid "there is nothing to skip" |
6305 | msgstr "没有要跳过的" | |
6306 | ||
a5cd71ca | 6307 | #: sequencer.c:2825 |
a6cd2cc4 JX |
6308 | #, c-format |
6309 | msgid "" | |
6310 | "have you committed already?\n" | |
6311 | "try \"git %s --continue\"" | |
6312 | msgstr "" | |
6313 | "您已经提交了么?\n" | |
6314 | "试试 \"git %s --continue\"" | |
6315 | ||
a5cd71ca | 6316 | #: sequencer.c:2949 sequencer.c:3969 |
31e5e17b JX |
6317 | #, c-format |
6318 | msgid "could not update %s" | |
6319 | msgstr "不能更新 %s" | |
6320 | ||
a5cd71ca | 6321 | #: sequencer.c:2987 sequencer.c:3949 |
1a79b2f1 JX |
6322 | msgid "cannot read HEAD" |
6323 | msgstr "不能读取 HEAD" | |
6324 | ||
a5cd71ca | 6325 | #: sequencer.c:3004 |
c1ac5258 JX |
6326 | #, c-format |
6327 | msgid "unable to copy '%s' to '%s'" | |
6328 | msgstr "无法拷贝 '%s' 至 '%s'" | |
6329 | ||
a5cd71ca | 6330 | #: sequencer.c:3012 |
c1ac5258 JX |
6331 | #, c-format |
6332 | msgid "" | |
6333 | "You can amend the commit now, with\n" | |
6334 | "\n" | |
6335 | " git commit --amend %s\n" | |
6336 | "\n" | |
6337 | "Once you are satisfied with your changes, run\n" | |
6338 | "\n" | |
6339 | " git rebase --continue\n" | |
6340 | msgstr "" | |
6341 | "您现在可以修补这个提交,使用\n" | |
6342 | "\n" | |
6343 | " git commit --amend %s\n" | |
6344 | "\n" | |
6345 | "当您对变更感到满意,执行\n" | |
6346 | "\n" | |
6347 | " git rebase --continue\n" | |
6348 | ||
a5cd71ca | 6349 | #: sequencer.c:3022 |
c1ac5258 JX |
6350 | #, c-format |
6351 | msgid "Could not apply %s... %.*s" | |
6352 | msgstr "不能应用 %s... %.*s" | |
6353 | ||
a5cd71ca | 6354 | #: sequencer.c:3029 |
c1ac5258 JX |
6355 | #, c-format |
6356 | msgid "Could not merge %.*s" | |
6357 | msgstr "不能合并 %.*s" | |
6358 | ||
a5cd71ca | 6359 | #: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 |
1a79b2f1 JX |
6360 | #, c-format |
6361 | msgid "could not copy '%s' to '%s'" | |
6362 | msgstr "不能拷贝 '%s' 至 '%s'" | |
6363 | ||
a5cd71ca JX |
6364 | #: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 |
6365 | #: builtin/rebase.c:1987 builtin/rebase.c:2031 | |
1a79b2f1 JX |
6366 | msgid "could not read index" |
6367 | msgstr "不能读取索引" | |
6368 | ||
6369 | # 译者:注意保持前导空格 | |
a5cd71ca | 6370 | #: sequencer.c:3074 |
1a79b2f1 JX |
6371 | #, c-format |
6372 | msgid "" | |
6373 | "execution failed: %s\n" | |
6374 | "%sYou can fix the problem, and then run\n" | |
6375 | "\n" | |
6376 | " git rebase --continue\n" | |
6377 | "\n" | |
6378 | msgstr "" | |
6379 | "执行失败:%s\n" | |
6380 | "%s您可以改正该问题,然后运行\n" | |
6381 | "\n" | |
6382 | " git rebase --continue\n" | |
6383 | "\n" | |
6384 | ||
a5cd71ca | 6385 | #: sequencer.c:3080 |
1a79b2f1 JX |
6386 | msgid "and made changes to the index and/or the working tree\n" |
6387 | msgstr "并且修改索引和/或工作区\n" | |
6388 | ||
a5cd71ca | 6389 | #: sequencer.c:3086 |
1a79b2f1 JX |
6390 | #, c-format |
6391 | msgid "" | |
6392 | "execution succeeded: %s\n" | |
6393 | "but left changes to the index and/or the working tree\n" | |
6394 | "Commit or stash your changes, and then run\n" | |
6395 | "\n" | |
6396 | " git rebase --continue\n" | |
6397 | "\n" | |
6398 | msgstr "" | |
6399 | "执行成功:%s\n" | |
6400 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 6401 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
6402 | "\n" |
6403 | " git rebase --continue\n" | |
6404 | "\n" | |
6405 | ||
a5cd71ca | 6406 | #: sequencer.c:3147 |
c1ac5258 JX |
6407 | #, c-format |
6408 | msgid "illegal label name: '%.*s'" | |
6409 | msgstr "非法的标签名称:'%.*s'" | |
6410 | ||
a5cd71ca | 6411 | #: sequencer.c:3201 |
fd8cb379 JX |
6412 | msgid "writing fake root commit" |
6413 | msgstr "写伪根提交" | |
6414 | ||
a5cd71ca | 6415 | #: sequencer.c:3206 |
fd8cb379 JX |
6416 | msgid "writing squash-onto" |
6417 | msgstr "写入 squash-onto" | |
6418 | ||
a5cd71ca | 6419 | #: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 |
fd8cb379 JX |
6420 | #, c-format |
6421 | msgid "failed to find tree of %s" | |
6422 | msgstr "无法找到 %s 指向的树。" | |
6423 | ||
a5cd71ca | 6424 | #: sequencer.c:3262 builtin/rebase.c:874 |
fd8cb379 JX |
6425 | msgid "could not write index" |
6426 | msgstr "不能写入索引" | |
6427 | ||
a5cd71ca | 6428 | #: sequencer.c:3289 |
c1ac5258 JX |
6429 | #, c-format |
6430 | msgid "could not resolve '%s'" | |
6431 | msgstr "无法解析 '%s'" | |
6432 | ||
a5cd71ca | 6433 | #: sequencer.c:3320 |
fd8cb379 JX |
6434 | msgid "cannot merge without a current revision" |
6435 | msgstr "没有当前版本不能合并" | |
6436 | ||
a5cd71ca | 6437 | #: sequencer.c:3342 |
fd8cb379 | 6438 | #, c-format |
c1ac5258 JX |
6439 | msgid "unable to parse '%.*s'" |
6440 | msgstr "无法解析 '%.*s'" | |
6441 | ||
a5cd71ca | 6442 | #: sequencer.c:3351 |
c1ac5258 JX |
6443 | #, c-format |
6444 | msgid "nothing to merge: '%.*s'" | |
6445 | msgstr "无可用合并:'%.*s'" | |
6446 | ||
a5cd71ca | 6447 | #: sequencer.c:3363 |
c1ac5258 JX |
6448 | msgid "octopus merge cannot be executed on top of a [new root]" |
6449 | msgstr "章鱼合并不能在一个新的根提交上执行" | |
fd8cb379 | 6450 | |
a5cd71ca | 6451 | #: sequencer.c:3378 |
fd8cb379 JX |
6452 | #, c-format |
6453 | msgid "could not get commit message of '%s'" | |
6454 | msgstr "不能获取 '%s' 的提交说明" | |
6455 | ||
a5cd71ca | 6456 | #: sequencer.c:3538 |
fd8cb379 JX |
6457 | #, c-format |
6458 | msgid "could not even attempt to merge '%.*s'" | |
6459 | msgstr "甚至不能尝试合并 '%.*s'" | |
6460 | ||
a5cd71ca | 6461 | #: sequencer.c:3554 |
fd8cb379 JX |
6462 | msgid "merge: Unable to write new index file" |
6463 | msgstr "合并:无法写入新索引文件" | |
6464 | ||
a5cd71ca | 6465 | #: sequencer.c:3623 builtin/rebase.c:712 |
1a79b2f1 | 6466 | #, c-format |
a4f16749 JX |
6467 | msgid "Applied autostash.\n" |
6468 | msgstr "已应用 autostash。\n" | |
1a79b2f1 | 6469 | |
a5cd71ca | 6470 | #: sequencer.c:3635 |
1a79b2f1 JX |
6471 | #, c-format |
6472 | msgid "cannot store %s" | |
6473 | msgstr "不能存储 %s" | |
6474 | ||
a5cd71ca | 6475 | #: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 |
1a79b2f1 JX |
6476 | #, c-format |
6477 | msgid "" | |
6478 | "Applying autostash resulted in conflicts.\n" | |
6479 | "Your changes are safe in the stash.\n" | |
6480 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
6481 | msgstr "" | |
6482 | "应用 autostash 导致冲突。\n" | |
a4f16749 | 6483 | "您的修改安全地保存在贮藏区中。\n" |
1a79b2f1 JX |
6484 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
6485 | ||
a5cd71ca | 6486 | #: sequencer.c:3699 |
4c27fcb5 JX |
6487 | #, c-format |
6488 | msgid "could not checkout %s" | |
6489 | msgstr "不能检出 %s" | |
6490 | ||
a5cd71ca | 6491 | #: sequencer.c:3713 |
4c27fcb5 JX |
6492 | #, c-format |
6493 | msgid "%s: not a valid OID" | |
5b533632 | 6494 | msgstr "%s:不是一个有效的对象 ID" |
4c27fcb5 | 6495 | |
a5cd71ca | 6496 | #: sequencer.c:3718 git-rebase--preserve-merges.sh:779 |
4c27fcb5 JX |
6497 | msgid "could not detach HEAD" |
6498 | msgstr "不能分离头指针" | |
6499 | ||
a5cd71ca | 6500 | #: sequencer.c:3733 |
4c27fcb5 JX |
6501 | #, c-format |
6502 | msgid "Stopped at HEAD\n" | |
6503 | msgstr "停止在 HEAD\n" | |
6504 | ||
a5cd71ca | 6505 | #: sequencer.c:3735 |
4c27fcb5 JX |
6506 | #, c-format |
6507 | msgid "Stopped at %s\n" | |
6508 | msgstr "停止在 %s\n" | |
6509 | ||
a5cd71ca | 6510 | #: sequencer.c:3743 |
fd8cb379 JX |
6511 | #, c-format |
6512 | msgid "" | |
6513 | "Could not execute the todo command\n" | |
6514 | "\n" | |
6515 | " %.*s\n" | |
6516 | "It has been rescheduled; To edit the command before continuing, please\n" | |
6517 | "edit the todo list first:\n" | |
6518 | "\n" | |
6519 | " git rebase --edit-todo\n" | |
6520 | " git rebase --continue\n" | |
6521 | msgstr "" | |
6522 | "无法执行待办命令\n" | |
6523 | "\n" | |
6524 | " %.*s\n" | |
6525 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
6526 | "\n" | |
6527 | " git rebase --edit-todo\n" | |
6528 | " git rebase --continue\n" | |
6529 | ||
a5cd71ca | 6530 | #: sequencer.c:3827 |
1a79b2f1 | 6531 | #, c-format |
87cb7997 JX |
6532 | msgid "Stopped at %s... %.*s\n" |
6533 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 6534 | |
a5cd71ca | 6535 | #: sequencer.c:3898 |
1a79b2f1 JX |
6536 | #, c-format |
6537 | msgid "unknown command %d" | |
6538 | msgstr "未知命令 %d" | |
6539 | ||
a5cd71ca | 6540 | #: sequencer.c:3957 |
1a79b2f1 JX |
6541 | msgid "could not read orig-head" |
6542 | msgstr "不能读取 orig-head" | |
6543 | ||
a5cd71ca | 6544 | #: sequencer.c:3962 |
1a79b2f1 JX |
6545 | msgid "could not read 'onto'" |
6546 | msgstr "不能读取 'onto'" | |
6547 | ||
a5cd71ca | 6548 | #: sequencer.c:3976 |
1a79b2f1 JX |
6549 | #, c-format |
6550 | msgid "could not update HEAD to %s" | |
6551 | msgstr "不能更新 HEAD 为 %s" | |
6552 | ||
a5cd71ca | 6553 | #: sequencer.c:4069 |
1a79b2f1 JX |
6554 | msgid "cannot rebase: You have unstaged changes." |
6555 | msgstr "不能变基:您有未暂存的变更。" | |
6556 | ||
a5cd71ca | 6557 | #: sequencer.c:4078 |
1a79b2f1 JX |
6558 | msgid "cannot amend non-existing commit" |
6559 | msgstr "不能修补不存在的提交" | |
6560 | ||
a5cd71ca | 6561 | #: sequencer.c:4080 |
1a79b2f1 JX |
6562 | #, c-format |
6563 | msgid "invalid file: '%s'" | |
6564 | msgstr "无效文件:'%s'" | |
6565 | ||
a5cd71ca | 6566 | #: sequencer.c:4082 |
1a79b2f1 JX |
6567 | #, c-format |
6568 | msgid "invalid contents: '%s'" | |
6569 | msgstr "无效内容:'%s'" | |
6570 | ||
a5cd71ca | 6571 | #: sequencer.c:4085 |
1a79b2f1 JX |
6572 | msgid "" |
6573 | "\n" | |
6574 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
6575 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
6576 | msgstr "" |
6577 | "\n" | |
6578 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 6579 | |
a5cd71ca | 6580 | #: sequencer.c:4121 sequencer.c:4159 |
fd8cb379 JX |
6581 | #, c-format |
6582 | msgid "could not write file: '%s'" | |
6583 | msgstr "不能写入文件:'%s'" | |
6584 | ||
a5cd71ca | 6585 | #: sequencer.c:4174 |
fd8cb379 JX |
6586 | msgid "could not remove CHERRY_PICK_HEAD" |
6587 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
6588 | ||
a5cd71ca | 6589 | #: sequencer.c:4181 |
1a79b2f1 JX |
6590 | msgid "could not commit staged changes." |
6591 | msgstr "不能提交暂存的修改。" | |
6592 | ||
a5cd71ca | 6593 | #: sequencer.c:4285 |
a0b6b246 JX |
6594 | #, c-format |
6595 | msgid "%s: can't cherry-pick a %s" | |
6596 | msgstr "%s:不能拣选一个%s" | |
6597 | ||
a5cd71ca | 6598 | #: sequencer.c:4289 |
a0b6b246 JX |
6599 | #, c-format |
6600 | msgid "%s: bad revision" | |
6601 | msgstr "%s:错误的版本" | |
6602 | ||
a5cd71ca | 6603 | #: sequencer.c:4324 |
a0b6b246 JX |
6604 | msgid "can't revert as initial commit" |
6605 | msgstr "不能作为初始提交回退" | |
6606 | ||
a5cd71ca | 6607 | #: sequencer.c:4774 |
6937cb4e JX |
6608 | msgid "make_script: unhandled options" |
6609 | msgstr "make_script:有未能处理的选项" | |
6610 | ||
a5cd71ca | 6611 | #: sequencer.c:4777 |
6937cb4e JX |
6612 | msgid "make_script: error preparing revisions" |
6613 | msgstr "make_script:准备版本时错误" | |
6614 | ||
a5cd71ca | 6615 | #: sequencer.c:4935 |
6937cb4e JX |
6616 | msgid "" |
6617 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
6618 | "continue'.\n" | |
6619 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
6620 | msgstr "" | |
6621 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
6622 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
6623 | ||
a5cd71ca | 6624 | #: sequencer.c:5047 sequencer.c:5064 |
4c27fcb5 JX |
6625 | msgid "nothing to do" |
6626 | msgstr "无事可做" | |
6627 | ||
a5cd71ca | 6628 | #: sequencer.c:5078 |
4c27fcb5 JX |
6629 | msgid "could not skip unnecessary pick commands" |
6630 | msgstr "无法跳过不必要的拣选" | |
6631 | ||
a5cd71ca | 6632 | #: sequencer.c:5166 |
6937cb4e JX |
6633 | msgid "the script was already rearranged." |
6634 | msgstr "脚本已经重新编排。" | |
6635 | ||
a5cd71ca | 6636 | #: setup.c:124 |
31e5e17b JX |
6637 | #, c-format |
6638 | msgid "'%s' is outside repository" | |
6639 | msgstr "'%s' 在仓库之外" | |
6640 | ||
a5cd71ca | 6641 | #: setup.c:174 |
a0b6b246 | 6642 | #, c-format |
6792b93b | 6643 | msgid "" |
a0b6b246 JX |
6644 | "%s: no such path in the working tree.\n" |
6645 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
6646 | msgstr "" | |
6647 | "%s:工作区中无此路径。\n" | |
58b6f078 | 6648 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 6649 | |
a5cd71ca | 6650 | #: setup.c:187 |
90314792 | 6651 | #, c-format |
a0b6b246 JX |
6652 | msgid "" |
6653 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
6654 | "Use '--' to separate paths from revisions, like this:\n" | |
6655 | "'git <command> [<revision>...] -- [<file>...]'" | |
6656 | msgstr "" | |
6657 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
6658 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 6659 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 6660 | |
a5cd71ca | 6661 | #: setup.c:236 |
31e5e17b JX |
6662 | #, c-format |
6663 | msgid "option '%s' must come before non-option arguments" | |
6664 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
6665 | ||
a5cd71ca | 6666 | #: setup.c:255 |
a0b6b246 JX |
6667 | #, c-format |
6668 | msgid "" | |
6669 | "ambiguous argument '%s': both revision and filename\n" | |
6670 | "Use '--' to separate paths from revisions, like this:\n" | |
6671 | "'git <command> [<revision>...] -- [<file>...]'" | |
6672 | msgstr "" | |
6673 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
6674 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 6675 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 6676 | |
a5cd71ca | 6677 | #: setup.c:391 |
31e5e17b JX |
6678 | msgid "unable to set up work tree using invalid config" |
6679 | msgstr "无法使用无效配置来创建工作区" | |
6680 | ||
a5cd71ca | 6681 | #: setup.c:395 |
31e5e17b | 6682 | msgid "this operation must be run in a work tree" |
610f8099 | 6683 | msgstr "该操作必须在一个工作区中运行" |
31e5e17b | 6684 | |
a5cd71ca | 6685 | #: setup.c:541 |
a0b6b246 JX |
6686 | #, c-format |
6687 | msgid "Expected git repo version <= %d, found %d" | |
6688 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 6689 | |
a5cd71ca | 6690 | #: setup.c:549 |
a0b6b246 JX |
6691 | msgid "unknown repository extensions found:" |
6692 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 6693 | |
a5cd71ca | 6694 | #: setup.c:568 |
1003b3a5 | 6695 | #, c-format |
31e5e17b | 6696 | msgid "error opening '%s'" |
c1ac5258 | 6697 | msgstr "打开 '%s' 出错" |
1003b3a5 | 6698 | |
a5cd71ca | 6699 | #: setup.c:570 |
31e5e17b JX |
6700 | #, c-format |
6701 | msgid "too large to be a .git file: '%s'" | |
610f8099 | 6702 | msgstr "文件太大,无法作为 .git 文件:'%s'" |
31e5e17b | 6703 | |
a5cd71ca | 6704 | #: setup.c:572 |
31e5e17b JX |
6705 | #, c-format |
6706 | msgid "error reading %s" | |
c1ac5258 | 6707 | msgstr "读取 %s 出错" |
31e5e17b | 6708 | |
a5cd71ca | 6709 | #: setup.c:574 |
31e5e17b JX |
6710 | #, c-format |
6711 | msgid "invalid gitfile format: %s" | |
6712 | msgstr "无效的 gitfile 格式:%s" | |
6713 | ||
a5cd71ca | 6714 | #: setup.c:576 |
31e5e17b JX |
6715 | #, c-format |
6716 | msgid "no path in gitfile: %s" | |
6717 | msgstr "在 gitfile 中没有路径:%s" | |
6718 | ||
a5cd71ca | 6719 | #: setup.c:578 |
31e5e17b JX |
6720 | #, c-format |
6721 | msgid "not a git repository: %s" | |
6722 | msgstr "不是一个 git 仓库:%s" | |
6723 | ||
a5cd71ca | 6724 | #: setup.c:677 |
31e5e17b JX |
6725 | #, c-format |
6726 | msgid "'$%s' too big" | |
6727 | msgstr "'$%s' 太大" | |
6728 | ||
a5cd71ca | 6729 | #: setup.c:691 |
31e5e17b JX |
6730 | #, c-format |
6731 | msgid "not a git repository: '%s'" | |
6732 | msgstr "不是一个 git 仓库:'%s'" | |
6733 | ||
a5cd71ca | 6734 | #: setup.c:720 setup.c:722 setup.c:753 |
31e5e17b JX |
6735 | #, c-format |
6736 | msgid "cannot chdir to '%s'" | |
6737 | msgstr "不能切换目录到 '%s'" | |
6738 | ||
a5cd71ca | 6739 | #: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 |
31e5e17b | 6740 | msgid "cannot come back to cwd" |
a0b6b246 | 6741 | msgstr "无法返回当前工作目录" |
1003b3a5 | 6742 | |
a5cd71ca | 6743 | #: setup.c:852 |
31e5e17b JX |
6744 | #, c-format |
6745 | msgid "failed to stat '%*s%s%s'" | |
c1ac5258 | 6746 | msgstr "获取 '%*s%s%s' 状态(stat)失败" |
31e5e17b | 6747 | |
a5cd71ca | 6748 | #: setup.c:1090 |
a0b6b246 JX |
6749 | msgid "Unable to read current working directory" |
6750 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 6751 | |
a5cd71ca | 6752 | #: setup.c:1099 setup.c:1105 |
87cb7997 | 6753 | #, c-format |
31e5e17b | 6754 | msgid "cannot change to '%s'" |
87cb7997 JX |
6755 | msgstr "不能切换到 '%s'" |
6756 | ||
a5cd71ca | 6757 | #: setup.c:1110 |
06991777 JX |
6758 | #, c-format |
6759 | msgid "not a git repository (or any of the parent directories): %s" | |
6760 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
6761 | ||
a5cd71ca | 6762 | #: setup.c:1116 |
a0b6b246 JX |
6763 | #, c-format |
6764 | msgid "" | |
31e5e17b | 6765 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
6766 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
6767 | msgstr "" | |
31e5e17b | 6768 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 6769 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 6770 | |
a5cd71ca | 6771 | #: setup.c:1227 |
a0b6b246 JX |
6772 | #, c-format |
6773 | msgid "" | |
31e5e17b | 6774 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
6775 | "The owner of files must always have read and write permissions." |
6776 | msgstr "" | |
31e5e17b | 6777 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 6778 | "文件属主必须始终拥有读写权限。" |
6792b93b | 6779 | |
a5cd71ca | 6780 | #: setup.c:1271 |
31e5e17b JX |
6781 | msgid "open /dev/null or dup failed" |
6782 | msgstr "不能打开或者复制 /dev/null" | |
6783 | ||
a5cd71ca | 6784 | #: setup.c:1286 |
31e5e17b JX |
6785 | msgid "fork failed" |
6786 | msgstr "fork 失败" | |
6787 | ||
a5cd71ca | 6788 | #: setup.c:1291 |
31e5e17b JX |
6789 | msgid "setsid failed" |
6790 | msgstr "setsid 失败" | |
6791 | ||
a5cd71ca | 6792 | #: sha1-file.c:452 |
c1ac5258 JX |
6793 | #, c-format |
6794 | msgid "object directory %s does not exist; check .git/objects/info/alternates" | |
6795 | msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" | |
6796 | ||
a5cd71ca | 6797 | #: sha1-file.c:503 |
c1ac5258 JX |
6798 | #, c-format |
6799 | msgid "unable to normalize alternate object path: %s" | |
6800 | msgstr "无法规范化备用对象路径:%s" | |
6801 | ||
a5cd71ca | 6802 | #: sha1-file.c:575 |
c1ac5258 JX |
6803 | #, c-format |
6804 | msgid "%s: ignoring alternate object stores, nesting too deep" | |
6805 | msgstr "%s:忽略备用对象库,嵌套太深" | |
6806 | ||
a5cd71ca | 6807 | #: sha1-file.c:582 |
c1ac5258 JX |
6808 | #, c-format |
6809 | msgid "unable to normalize object directory: %s" | |
6810 | msgstr "无法规范化对象目录: %s" | |
6811 | ||
a5cd71ca | 6812 | #: sha1-file.c:625 |
c1ac5258 JX |
6813 | msgid "unable to fdopen alternates lockfile" |
6814 | msgstr "无法 fdopen 替换锁文件" | |
6815 | ||
a5cd71ca | 6816 | #: sha1-file.c:643 |
c1ac5258 JX |
6817 | msgid "unable to read alternates file" |
6818 | msgstr "无法读取替代文件" | |
6819 | ||
a5cd71ca | 6820 | #: sha1-file.c:650 |
c1ac5258 JX |
6821 | msgid "unable to move new alternates file into place" |
6822 | msgstr "无法将新的替代文件移动到位" | |
6823 | ||
a5cd71ca | 6824 | #: sha1-file.c:685 |
a0b6b246 JX |
6825 | #, c-format |
6826 | msgid "path '%s' does not exist" | |
6827 | msgstr "路径 '%s' 不存在" | |
6828 | ||
a5cd71ca | 6829 | #: sha1-file.c:711 |
a0b6b246 JX |
6830 | #, c-format |
6831 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
6832 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
6833 | ||
a5cd71ca | 6834 | #: sha1-file.c:717 |
a0b6b246 JX |
6835 | #, c-format |
6836 | msgid "reference repository '%s' is not a local repository." | |
6837 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
6838 | ||
a5cd71ca | 6839 | #: sha1-file.c:723 |
a0b6b246 JX |
6840 | #, c-format |
6841 | msgid "reference repository '%s' is shallow" | |
6842 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
6843 | ||
a5cd71ca | 6844 | #: sha1-file.c:731 |
a0b6b246 JX |
6845 | #, c-format |
6846 | msgid "reference repository '%s' is grafted" | |
fd8cb379 | 6847 | msgstr "参考仓库 '%s' 已被移植" |
a0b6b246 | 6848 | |
a5cd71ca | 6849 | #: sha1-file.c:791 |
a6cd2cc4 JX |
6850 | #, c-format |
6851 | msgid "invalid line while parsing alternate refs: %s" | |
6852 | msgstr "解析备用引用时无效的行:%s" | |
6853 | ||
a5cd71ca | 6854 | #: sha1-file.c:943 |
c1ac5258 JX |
6855 | #, c-format |
6856 | msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" | |
6857 | msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" | |
6858 | ||
a5cd71ca | 6859 | #: sha1-file.c:964 |
c1ac5258 JX |
6860 | msgid "mmap failed" |
6861 | msgstr "mmap 失败" | |
6862 | ||
a5cd71ca | 6863 | #: sha1-file.c:1128 |
c1ac5258 JX |
6864 | #, c-format |
6865 | msgid "object file %s is empty" | |
6866 | msgstr "对象文件 %s 为空" | |
6867 | ||
a5cd71ca | 6868 | #: sha1-file.c:1252 sha1-file.c:2392 |
c1ac5258 JX |
6869 | #, c-format |
6870 | msgid "corrupt loose object '%s'" | |
6871 | msgstr "损坏的松散对象 '%s'" | |
6872 | ||
a5cd71ca | 6873 | #: sha1-file.c:1254 sha1-file.c:2396 |
c1ac5258 JX |
6874 | #, c-format |
6875 | msgid "garbage at end of loose object '%s'" | |
6876 | msgstr "松散对象 '%s' 后面有垃圾数据" | |
6877 | ||
a5cd71ca | 6878 | #: sha1-file.c:1296 |
c1ac5258 JX |
6879 | msgid "invalid object type" |
6880 | msgstr "无效的对象类型" | |
6881 | ||
a5cd71ca | 6882 | #: sha1-file.c:1380 |
c1ac5258 JX |
6883 | #, c-format |
6884 | msgid "unable to unpack %s header with --allow-unknown-type" | |
6885 | msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" | |
6886 | ||
a5cd71ca | 6887 | #: sha1-file.c:1383 |
c1ac5258 JX |
6888 | #, c-format |
6889 | msgid "unable to unpack %s header" | |
6890 | msgstr "无法解开 %s 头部" | |
6891 | ||
a5cd71ca | 6892 | #: sha1-file.c:1389 |
c1ac5258 JX |
6893 | #, c-format |
6894 | msgid "unable to parse %s header with --allow-unknown-type" | |
6895 | msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" | |
6896 | ||
a5cd71ca | 6897 | #: sha1-file.c:1392 |
c1ac5258 JX |
6898 | #, c-format |
6899 | msgid "unable to parse %s header" | |
6900 | msgstr "无法解析 %s 头部" | |
6901 | ||
a5cd71ca | 6902 | #: sha1-file.c:1584 |
c1ac5258 JX |
6903 | #, c-format |
6904 | msgid "failed to read object %s" | |
6905 | msgstr "读取对象 %s 失败" | |
6906 | ||
a5cd71ca | 6907 | #: sha1-file.c:1588 |
c1ac5258 JX |
6908 | #, c-format |
6909 | msgid "replacement %s not found for %s" | |
6910 | msgstr "找不到 %2$s 的替代 %1$s" | |
6911 | ||
a5cd71ca | 6912 | #: sha1-file.c:1592 |
c1ac5258 JX |
6913 | #, c-format |
6914 | msgid "loose object %s (stored in %s) is corrupt" | |
6915 | msgstr "松散对象 %s(保存在 %s)已损坏" | |
6916 | ||
a5cd71ca | 6917 | #: sha1-file.c:1596 |
c1ac5258 JX |
6918 | #, c-format |
6919 | msgid "packed object %s (stored in %s) is corrupt" | |
6920 | msgstr "打包对象 %s(保存在 %s)已损坏" | |
6921 | ||
a5cd71ca | 6922 | #: sha1-file.c:1699 |
c1ac5258 | 6923 | #, c-format |
06991777 JX |
6924 | msgid "unable to write file %s" |
6925 | msgstr "无法写文件 %s" | |
c1ac5258 | 6926 | |
a5cd71ca | 6927 | #: sha1-file.c:1706 |
c1ac5258 JX |
6928 | #, c-format |
6929 | msgid "unable to set permission to '%s'" | |
6930 | msgstr "无法为 '%s' 设置权限" | |
6931 | ||
a5cd71ca | 6932 | #: sha1-file.c:1713 |
c1ac5258 JX |
6933 | msgid "file write error" |
6934 | msgstr "文件写错误" | |
6935 | ||
a5cd71ca | 6936 | #: sha1-file.c:1732 |
06991777 JX |
6937 | msgid "error when closing loose object file" |
6938 | msgstr "关闭松散对象文件时出错" | |
c1ac5258 | 6939 | |
a5cd71ca | 6940 | #: sha1-file.c:1797 |
c1ac5258 JX |
6941 | #, c-format |
6942 | msgid "insufficient permission for adding an object to repository database %s" | |
6943 | msgstr "权限不足,无法在仓库对象库 %s 中添加对象" | |
6944 | ||
a5cd71ca | 6945 | #: sha1-file.c:1799 |
c1ac5258 JX |
6946 | msgid "unable to create temporary file" |
6947 | msgstr "无法创建临时文件" | |
6948 | ||
a5cd71ca | 6949 | #: sha1-file.c:1823 |
06991777 JX |
6950 | msgid "unable to write loose object file" |
6951 | msgstr "不能写松散对象文件" | |
c1ac5258 | 6952 | |
a5cd71ca | 6953 | #: sha1-file.c:1829 |
c1ac5258 JX |
6954 | #, c-format |
6955 | msgid "unable to deflate new object %s (%d)" | |
6956 | msgstr "不能压缩新对象 %s(%d)" | |
6957 | ||
a5cd71ca | 6958 | #: sha1-file.c:1833 |
c1ac5258 JX |
6959 | #, c-format |
6960 | msgid "deflateEnd on object %s failed (%d)" | |
6961 | msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" | |
6962 | ||
a5cd71ca | 6963 | #: sha1-file.c:1837 |
c1ac5258 JX |
6964 | #, c-format |
6965 | msgid "confused by unstable object source data for %s" | |
6966 | msgstr "被 %s 的不稳定对象源数据搞糊涂了" | |
6967 | ||
a5cd71ca | 6968 | #: sha1-file.c:1847 builtin/pack-objects.c:925 |
c1ac5258 JX |
6969 | #, c-format |
6970 | msgid "failed utime() on %s" | |
6971 | msgstr "在 %s 上调用 utime() 失败" | |
6972 | ||
a5cd71ca | 6973 | #: sha1-file.c:1922 |
c1ac5258 | 6974 | #, c-format |
06991777 JX |
6975 | msgid "cannot read object for %s" |
6976 | msgstr "不能读取对象 %s" | |
c1ac5258 | 6977 | |
a5cd71ca | 6978 | #: sha1-file.c:1962 |
c1ac5258 JX |
6979 | msgid "corrupt commit" |
6980 | msgstr "损坏的提交" | |
6981 | ||
a5cd71ca | 6982 | #: sha1-file.c:1970 |
c1ac5258 JX |
6983 | msgid "corrupt tag" |
6984 | msgstr "损坏的标签" | |
6985 | ||
a5cd71ca | 6986 | #: sha1-file.c:2069 |
c1ac5258 JX |
6987 | #, c-format |
6988 | msgid "read error while indexing %s" | |
6989 | msgstr "索引 %s 时读取错误" | |
6990 | ||
a5cd71ca | 6991 | #: sha1-file.c:2072 |
c1ac5258 JX |
6992 | #, c-format |
6993 | msgid "short read while indexing %s" | |
6994 | msgstr "索引 %s 时读入不完整" | |
6995 | ||
a5cd71ca | 6996 | #: sha1-file.c:2145 sha1-file.c:2154 |
c1ac5258 JX |
6997 | #, c-format |
6998 | msgid "%s: failed to insert into database" | |
6999 | msgstr "%s:插入数据库失败" | |
7000 | ||
a5cd71ca | 7001 | #: sha1-file.c:2160 |
c1ac5258 JX |
7002 | #, c-format |
7003 | msgid "%s: unsupported file type" | |
7004 | msgstr "%s:不支持的文件类型" | |
7005 | ||
a5cd71ca | 7006 | #: sha1-file.c:2184 |
c1ac5258 JX |
7007 | #, c-format |
7008 | msgid "%s is not a valid object" | |
7009 | msgstr "%s 不是一个有效的对象" | |
7010 | ||
a5cd71ca | 7011 | #: sha1-file.c:2186 |
c1ac5258 JX |
7012 | #, c-format |
7013 | msgid "%s is not a valid '%s' object" | |
7014 | msgstr "%s 不是一个有效的 '%s' 对象" | |
7015 | ||
a5cd71ca | 7016 | #: sha1-file.c:2213 builtin/index-pack.c:155 |
c1ac5258 JX |
7017 | #, c-format |
7018 | msgid "unable to open %s" | |
7019 | msgstr "不能打开 %s" | |
7020 | ||
a5cd71ca | 7021 | #: sha1-file.c:2403 sha1-file.c:2455 |
c1ac5258 | 7022 | #, c-format |
06991777 JX |
7023 | msgid "hash mismatch for %s (expected %s)" |
7024 | msgstr "%s 的哈希值不匹配(预期 %s)" | |
c1ac5258 | 7025 | |
a5cd71ca | 7026 | #: sha1-file.c:2427 |
c1ac5258 JX |
7027 | #, c-format |
7028 | msgid "unable to mmap %s" | |
7029 | msgstr "不能 mmap %s" | |
7030 | ||
a5cd71ca | 7031 | #: sha1-file.c:2432 |
c1ac5258 JX |
7032 | #, c-format |
7033 | msgid "unable to unpack header of %s" | |
7034 | msgstr "无法解压缩 %s 的头部" | |
7035 | ||
a5cd71ca | 7036 | #: sha1-file.c:2438 |
c1ac5258 JX |
7037 | #, c-format |
7038 | msgid "unable to parse header of %s" | |
7039 | msgstr "无法解析 %s 的头部" | |
7040 | ||
a5cd71ca | 7041 | #: sha1-file.c:2449 |
c1ac5258 JX |
7042 | #, c-format |
7043 | msgid "unable to unpack contents of %s" | |
7044 | msgstr "无法解压缩 %s 的内容" | |
7045 | ||
a5cd71ca | 7046 | #: sha1-name.c:487 |
a0b6b246 JX |
7047 | #, c-format |
7048 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 7049 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 7050 | |
a5cd71ca | 7051 | #: sha1-name.c:498 |
a0b6b246 JX |
7052 | msgid "The candidates are:" |
7053 | msgstr "候选者有:" | |
7054 | ||
a5cd71ca | 7055 | #: sha1-name.c:797 |
a0b6b246 JX |
7056 | msgid "" |
7057 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
7058 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
7059 | "may be created by mistake. For example,\n" | |
7060 | "\n" | |
a6cd2cc4 | 7061 | " git switch -c $br $(git rev-parse ...)\n" |
a0b6b246 JX |
7062 | "\n" |
7063 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
7064 | "examine these refs and maybe delete them. Turn this message off by\n" | |
7065 | "running \"git config advice.objectNameWarning false\"" | |
7066 | msgstr "" | |
a6cd2cc4 JX |
7067 | "Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n" |
7068 | "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n" | |
a0b6b246 | 7069 | "\n" |
a6cd2cc4 | 7070 | " git switch -c $br $(git rev-parse ...)\n" |
a0b6b246 | 7071 | "\n" |
a6cd2cc4 JX |
7072 | "当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n" |
7073 | "引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n" | |
7074 | "false\" 命令关闭本消息通知。" | |
7075 | ||
7076 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte | |
a5cd71ca | 7077 | #: strbuf.c:822 |
a6cd2cc4 JX |
7078 | #, c-format |
7079 | msgid "%u.%2.2u GiB" | |
7080 | msgstr "%u.%2.2u GiB" | |
7081 | ||
7082 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second | |
a5cd71ca | 7083 | #: strbuf.c:824 |
a6cd2cc4 JX |
7084 | #, c-format |
7085 | msgid "%u.%2.2u GiB/s" | |
7086 | msgstr "%u.%2.2u GiB/s" | |
7087 | ||
7088 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte | |
a5cd71ca | 7089 | #: strbuf.c:832 |
a6cd2cc4 JX |
7090 | #, c-format |
7091 | msgid "%u.%2.2u MiB" | |
7092 | msgstr "%u.%2.2u MiB" | |
7093 | ||
7094 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second | |
a5cd71ca | 7095 | #: strbuf.c:834 |
a6cd2cc4 JX |
7096 | #, c-format |
7097 | msgid "%u.%2.2u MiB/s" | |
7098 | msgstr "%u.%2.2u MiB/s" | |
7099 | ||
7100 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte | |
a5cd71ca | 7101 | #: strbuf.c:841 |
a6cd2cc4 JX |
7102 | #, c-format |
7103 | msgid "%u.%2.2u KiB" | |
7104 | msgstr "%u.%2.2u KiB" | |
7105 | ||
7106 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second | |
a5cd71ca | 7107 | #: strbuf.c:843 |
a6cd2cc4 JX |
7108 | #, c-format |
7109 | msgid "%u.%2.2u KiB/s" | |
7110 | msgstr "%u.%2.2u KiB/s" | |
7111 | ||
7112 | #. TRANSLATORS: IEC 80000-13:2008 byte | |
a5cd71ca | 7113 | #: strbuf.c:849 |
a6cd2cc4 JX |
7114 | #, c-format |
7115 | msgid "%u byte" | |
7116 | msgid_plural "%u bytes" | |
7117 | msgstr[0] "%u 字节" | |
7118 | msgstr[1] "%u 字节" | |
7119 | ||
7120 | #. TRANSLATORS: IEC 80000-13:2008 byte/second | |
a5cd71ca | 7121 | #: strbuf.c:851 |
a6cd2cc4 JX |
7122 | #, c-format |
7123 | msgid "%u byte/s" | |
7124 | msgid_plural "%u bytes/s" | |
7125 | msgstr[0] "%u 字节/秒" | |
7126 | msgstr[1] "%u 字节/秒" | |
a0b6b246 | 7127 | |
06991777 | 7128 | #: submodule.c:114 submodule.c:143 |
a0b6b246 JX |
7129 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
7130 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
7131 | ||
06991777 | 7132 | #: submodule.c:118 submodule.c:147 |
a0b6b246 JX |
7133 | #, c-format |
7134 | msgid "Could not find section in .gitmodules where path=%s" | |
7135 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
7136 | ||
06991777 | 7137 | #: submodule.c:154 |
a0b6b246 JX |
7138 | #, c-format |
7139 | msgid "Could not remove .gitmodules entry for %s" | |
7140 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
7141 | ||
06991777 | 7142 | #: submodule.c:165 |
a0b6b246 JX |
7143 | msgid "staging updated .gitmodules failed" |
7144 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
7145 | ||
06991777 | 7146 | #: submodule.c:327 |
a4f16749 JX |
7147 | #, c-format |
7148 | msgid "in unpopulated submodule '%s'" | |
7149 | msgstr "位于未检出的子模组 '%s'" | |
7150 | ||
06991777 | 7151 | #: submodule.c:358 |
a4f16749 JX |
7152 | #, c-format |
7153 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
7154 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
7155 | ||
d46c5519 | 7156 | #: submodule.c:910 |
6937cb4e JX |
7157 | #, c-format |
7158 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 7159 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 7160 | |
a6cd2cc4 | 7161 | #: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 |
6937cb4e JX |
7162 | msgid "Failed to resolve HEAD as a valid ref." |
7163 | msgstr "无法将 HEAD 解析为有效引用。" | |
7164 | ||
d46c5519 | 7165 | #: submodule.c:1481 |
06991777 JX |
7166 | #, c-format |
7167 | msgid "Could not access submodule '%s'" | |
7168 | msgstr "无法访问子模组 '%s'" | |
7169 | ||
d46c5519 | 7170 | #: submodule.c:1651 |
1a79b2f1 | 7171 | #, c-format |
87cb7997 | 7172 | msgid "'%s' not recognized as a git repository" |
65e2041e | 7173 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 7174 | |
d46c5519 | 7175 | #: submodule.c:1789 |
1a79b2f1 | 7176 | #, c-format |
87cb7997 JX |
7177 | msgid "could not start 'git status' in submodule '%s'" |
7178 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 7179 | |
d46c5519 | 7180 | #: submodule.c:1802 |
87cb7997 JX |
7181 | #, c-format |
7182 | msgid "could not run 'git status' in submodule '%s'" | |
7183 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
7184 | ||
d46c5519 | 7185 | #: submodule.c:1817 |
06991777 JX |
7186 | #, c-format |
7187 | msgid "Could not unset core.worktree setting in submodule '%s'" | |
7188 | msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" | |
7189 | ||
d46c5519 | 7190 | #: submodule.c:1907 |
87cb7997 JX |
7191 | #, c-format |
7192 | msgid "submodule '%s' has dirty index" | |
7193 | msgstr "子模组 '%s' 中有脏索引" | |
7194 | ||
d46c5519 | 7195 | #: submodule.c:1959 |
c1ac5258 JX |
7196 | #, c-format |
7197 | msgid "Submodule '%s' could not be updated." | |
7198 | msgstr "子模组 '%s' 无法被更新。" | |
7199 | ||
a6cd2cc4 | 7200 | #: submodule.c:2007 |
1a79b2f1 JX |
7201 | #, c-format |
7202 | msgid "" | |
7203 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
7204 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
7205 | ||
a6cd2cc4 | 7206 | #: submodule.c:2019 submodule.c:2074 |
1a79b2f1 JX |
7207 | #, c-format |
7208 | msgid "could not lookup name for submodule '%s'" | |
7209 | msgstr "不能查询子模组 '%s' 的名称" | |
7210 | ||
a6cd2cc4 | 7211 | #: submodule.c:2026 |
1a79b2f1 JX |
7212 | #, c-format |
7213 | msgid "" | |
7214 | "Migrating git directory of '%s%s' from\n" | |
7215 | "'%s' to\n" | |
7216 | "'%s'\n" | |
7217 | msgstr "" | |
7218 | "将 '%s%s' 的 git 目录从\n" | |
7219 | "'%s' 迁移至\n" | |
7220 | "'%s'\n" | |
7221 | ||
a6cd2cc4 | 7222 | #: submodule.c:2109 |
1a79b2f1 JX |
7223 | #, c-format |
7224 | msgid "could not recurse into submodule '%s'" | |
7225 | msgstr "无法递归进子模组路径 '%s'" | |
7226 | ||
a6cd2cc4 | 7227 | #: submodule.c:2153 |
87cb7997 JX |
7228 | msgid "could not start ls-files in .." |
7229 | msgstr "无法在 .. 中启动 ls-files" | |
7230 | ||
a6cd2cc4 | 7231 | #: submodule.c:2192 |
87cb7997 JX |
7232 | #, c-format |
7233 | msgid "ls-tree returned unexpected return code %d" | |
7234 | msgstr "ls-tree 返回未知返回值 %d" | |
7235 | ||
a5cd71ca | 7236 | #: submodule-config.c:236 |
fd8cb379 JX |
7237 | #, c-format |
7238 | msgid "ignoring suspicious submodule name: %s" | |
7239 | msgstr "忽略可疑的子模组名称:%s" | |
7240 | ||
a5cd71ca | 7241 | #: submodule-config.c:303 |
6937cb4e JX |
7242 | msgid "negative values not allowed for submodule.fetchjobs" |
7243 | msgstr "submodule.fetchjobs 不允许为负值" | |
7244 | ||
a5cd71ca | 7245 | #: submodule-config.c:401 |
4c27fcb5 JX |
7246 | #, c-format |
7247 | msgid "ignoring '%s' which may be interpreted as a command-line option: %s" | |
7248 | msgstr "忽略可能被解析为命令行选项的 '%s':%s" | |
7249 | ||
a5cd71ca | 7250 | #: submodule-config.c:490 |
a0b6b246 JX |
7251 | #, c-format |
7252 | msgid "invalid value for %s" | |
7253 | msgstr "%s 的值无效" | |
7254 | ||
a5cd71ca | 7255 | #: submodule-config.c:761 |
4c27fcb5 JX |
7256 | #, c-format |
7257 | msgid "Could not update .gitmodules entry %s" | |
7258 | msgstr "不能更新 .gitmodules 条目 %s" | |
7259 | ||
6937cb4e | 7260 | #: trailer.c:238 |
a0b6b246 JX |
7261 | #, c-format |
7262 | msgid "running trailer command '%s' failed" | |
7263 | msgstr "执行 trailer 命令 '%s' 失败" | |
7264 | ||
6937cb4e JX |
7265 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
7266 | #: trailer.c:557 | |
a0b6b246 JX |
7267 | #, c-format |
7268 | msgid "unknown value '%s' for key '%s'" | |
7269 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
7270 | ||
4c27fcb5 | 7271 | #: trailer.c:539 trailer.c:544 builtin/remote.c:295 |
a0b6b246 JX |
7272 | #, c-format |
7273 | msgid "more than one %s" | |
7274 | msgstr "多于一个 %s" | |
7275 | ||
6937cb4e | 7276 | #: trailer.c:730 |
a0b6b246 JX |
7277 | #, c-format |
7278 | msgid "empty trailer token in trailer '%.*s'" | |
7279 | msgstr "签名 '%.*s' 的键为空" | |
7280 | ||
6937cb4e | 7281 | #: trailer.c:750 |
a0b6b246 JX |
7282 | #, c-format |
7283 | msgid "could not read input file '%s'" | |
7284 | msgstr "不能读取输入文件 '%s'" | |
7285 | ||
6937cb4e | 7286 | #: trailer.c:753 |
a0b6b246 JX |
7287 | msgid "could not read from stdin" |
7288 | msgstr "不能自标准输入读取" | |
7289 | ||
a5cd71ca | 7290 | #: trailer.c:1011 wrapper.c:665 |
a0b6b246 JX |
7291 | #, c-format |
7292 | msgid "could not stat %s" | |
65e2041e | 7293 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 7294 | |
4c27fcb5 | 7295 | #: trailer.c:1013 |
a0b6b246 JX |
7296 | #, c-format |
7297 | msgid "file %s is not a regular file" | |
7298 | msgstr "文件 %s 不是一个正规文件" | |
7299 | ||
4c27fcb5 | 7300 | #: trailer.c:1015 |
a0b6b246 JX |
7301 | #, c-format |
7302 | msgid "file %s is not writable by user" | |
7303 | msgstr "文件 %s 用户不可写" | |
7304 | ||
4c27fcb5 | 7305 | #: trailer.c:1027 |
a0b6b246 JX |
7306 | msgid "could not open temporary file" |
7307 | msgstr "不能打开临时文件" | |
7308 | ||
4c27fcb5 | 7309 | #: trailer.c:1067 |
a0b6b246 JX |
7310 | #, c-format |
7311 | msgid "could not rename temporary file to %s" | |
7312 | msgstr "不能重命名临时文件为 %s" | |
7313 | ||
fd8cb379 | 7314 | #: transport.c:116 |
a0b6b246 JX |
7315 | #, c-format |
7316 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
7317 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
7318 | ||
a5cd71ca | 7319 | #: transport.c:145 |
c1ac5258 JX |
7320 | #, c-format |
7321 | msgid "could not read bundle '%s'" | |
7322 | msgstr "无法读取 bundle '%s'" | |
7323 | ||
a5cd71ca | 7324 | #: transport.c:214 |
a0b6b246 JX |
7325 | #, c-format |
7326 | msgid "transport: invalid depth option '%s'" | |
7327 | msgstr "传输:无效的深度选项 '%s'" | |
7328 | ||
a5cd71ca | 7329 | #: transport.c:266 |
d46c5519 JX |
7330 | msgid "see protocol.version in 'git help config' for more details" |
7331 | msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" | |
7332 | ||
a5cd71ca | 7333 | #: transport.c:267 |
d46c5519 JX |
7334 | msgid "server options require protocol version 2 or later" |
7335 | msgstr "服务端选项需要版本 2 协议或更高" | |
7336 | ||
a5cd71ca | 7337 | #: transport.c:632 |
fd8cb379 JX |
7338 | msgid "could not parse transport.color.* config" |
7339 | msgstr "不能解析 transport.color.* 配置" | |
7340 | ||
a5cd71ca | 7341 | #: transport.c:705 |
c1ac5258 JX |
7342 | msgid "support for protocol v2 not implemented yet" |
7343 | msgstr "协议 v2 的支持尚未实现" | |
7344 | ||
a5cd71ca | 7345 | #: transport.c:831 |
c1ac5258 JX |
7346 | #, c-format |
7347 | msgid "unknown value for config '%s': %s" | |
7348 | msgstr "配置 '%s' 的取值未知:%s" | |
7349 | ||
a5cd71ca | 7350 | #: transport.c:897 |
c1ac5258 JX |
7351 | #, c-format |
7352 | msgid "transport '%s' not allowed" | |
7353 | msgstr "传输 '%s' 不允许" | |
7354 | ||
a5cd71ca | 7355 | #: transport.c:949 |
c1ac5258 JX |
7356 | msgid "git-over-rsync is no longer supported" |
7357 | msgstr "不再支持 git-over-rsync" | |
7358 | ||
a5cd71ca | 7359 | #: transport.c:1044 |
a0b6b246 JX |
7360 | #, c-format |
7361 | msgid "" | |
7362 | "The following submodule paths contain changes that can\n" | |
7363 | "not be found on any remote:\n" | |
7364 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
7365 | ||
a5cd71ca | 7366 | #: transport.c:1048 |
a0b6b246 JX |
7367 | #, c-format |
7368 | msgid "" | |
7369 | "\n" | |
7370 | "Please try\n" | |
7371 | "\n" | |
7372 | "\tgit push --recurse-submodules=on-demand\n" | |
7373 | "\n" | |
7374 | "or cd to the path and use\n" | |
7375 | "\n" | |
7376 | "\tgit push\n" | |
7377 | "\n" | |
7378 | "to push them to a remote.\n" | |
7379 | "\n" | |
7380 | msgstr "" | |
7381 | "\n" | |
7382 | "请尝试\n" | |
7383 | "\n" | |
7384 | "\tgit push --recurse-submodules=on-demand\n" | |
7385 | "\n" | |
7386 | "或者进入到子目录执行\n" | |
7387 | "\n" | |
7388 | "\tgit push\n" | |
7389 | "\n" | |
7390 | "以推送至远程。\n" | |
7391 | "\n" | |
7392 | ||
a5cd71ca | 7393 | #: transport.c:1056 |
a0b6b246 JX |
7394 | msgid "Aborting." |
7395 | msgstr "正在终止。" | |
7396 | ||
a5cd71ca | 7397 | #: transport.c:1201 |
c1ac5258 JX |
7398 | msgid "failed to push all needed submodules" |
7399 | msgstr "不能推送全部需要的子模组" | |
7400 | ||
a5cd71ca | 7401 | #: transport.c:1345 transport-helper.c:655 |
c1ac5258 JX |
7402 | msgid "operation not supported by protocol" |
7403 | msgstr "协议不支持该操作" | |
7404 | ||
a5cd71ca | 7405 | #: transport-helper.c:61 transport-helper.c:90 |
c1ac5258 JX |
7406 | msgid "full write to remote helper failed" |
7407 | msgstr "完整写入远程助手失败" | |
7408 | ||
a5cd71ca | 7409 | #: transport-helper.c:144 |
c1ac5258 JX |
7410 | #, c-format |
7411 | msgid "unable to find remote helper for '%s'" | |
7412 | msgstr "无法为 '%s' 找到远程助手" | |
7413 | ||
a5cd71ca | 7414 | #: transport-helper.c:160 transport-helper.c:569 |
c1ac5258 JX |
7415 | msgid "can't dup helper output fd" |
7416 | msgstr "无法复制助手输出文件句柄" | |
7417 | ||
a5cd71ca | 7418 | #: transport-helper.c:211 |
c1ac5258 JX |
7419 | #, c-format |
7420 | msgid "" | |
7421 | "unknown mandatory capability %s; this remote helper probably needs newer " | |
7422 | "version of Git" | |
7423 | msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" | |
7424 | ||
a5cd71ca | 7425 | #: transport-helper.c:217 |
c1ac5258 JX |
7426 | msgid "this remote helper should implement refspec capability" |
7427 | msgstr "远程助手需要实现 refspec 能力" | |
7428 | ||
a5cd71ca | 7429 | #: transport-helper.c:284 transport-helper.c:424 |
c1ac5258 JX |
7430 | #, c-format |
7431 | msgid "%s unexpectedly said: '%s'" | |
7432 | msgstr "%s 意外地说:'%s'" | |
7433 | ||
a5cd71ca | 7434 | #: transport-helper.c:413 |
c1ac5258 JX |
7435 | #, c-format |
7436 | msgid "%s also locked %s" | |
7437 | msgstr "%s 也锁定了 %s" | |
7438 | ||
a5cd71ca | 7439 | #: transport-helper.c:491 |
c1ac5258 JX |
7440 | msgid "couldn't run fast-import" |
7441 | msgstr "不能执行 fast-import" | |
7442 | ||
a5cd71ca | 7443 | #: transport-helper.c:514 |
c1ac5258 JX |
7444 | msgid "error while running fast-import" |
7445 | msgstr "执行 fast-import 出错" | |
7446 | ||
a5cd71ca | 7447 | #: transport-helper.c:543 transport-helper.c:1132 |
c1ac5258 JX |
7448 | #, c-format |
7449 | msgid "could not read ref %s" | |
7450 | msgstr "无法读取引用 %s" | |
7451 | ||
a5cd71ca | 7452 | #: transport-helper.c:588 |
c1ac5258 JX |
7453 | #, c-format |
7454 | msgid "unknown response to connect: %s" | |
7455 | msgstr "连接时未知的响应:%s" | |
7456 | ||
a5cd71ca | 7457 | #: transport-helper.c:610 |
c1ac5258 JX |
7458 | msgid "setting remote service path not supported by protocol" |
7459 | msgstr "协议不支持设置远程服务路径" | |
7460 | ||
a5cd71ca | 7461 | #: transport-helper.c:612 |
c1ac5258 JX |
7462 | msgid "invalid remote service path" |
7463 | msgstr "无效的远程服务路径" | |
7464 | ||
a5cd71ca | 7465 | #: transport-helper.c:658 |
c1ac5258 JX |
7466 | #, c-format |
7467 | msgid "can't connect to subservice %s" | |
7468 | msgstr "不能连接到子服务 %s" | |
7469 | ||
a5cd71ca | 7470 | #: transport-helper.c:734 |
c1ac5258 JX |
7471 | #, c-format |
7472 | msgid "expected ok/error, helper said '%s'" | |
7473 | msgstr "预期 ok/error,助手说 '%s'" | |
7474 | ||
a5cd71ca | 7475 | #: transport-helper.c:787 |
c1ac5258 JX |
7476 | #, c-format |
7477 | msgid "helper reported unexpected status of %s" | |
7478 | msgstr "助手报告 %s 的意外状态" | |
7479 | ||
a5cd71ca | 7480 | #: transport-helper.c:848 |
a0b6b246 | 7481 | #, c-format |
c1ac5258 JX |
7482 | msgid "helper %s does not support dry-run" |
7483 | msgstr "助手 %s 不支持 dry-run" | |
a0b6b246 | 7484 | |
a5cd71ca | 7485 | #: transport-helper.c:851 |
c1ac5258 JX |
7486 | #, c-format |
7487 | msgid "helper %s does not support --signed" | |
7488 | msgstr "助手 %s 不支持 --signed" | |
7489 | ||
a5cd71ca | 7490 | #: transport-helper.c:854 |
c1ac5258 JX |
7491 | #, c-format |
7492 | msgid "helper %s does not support --signed=if-asked" | |
7493 | msgstr "助手 %s 不支持 --signed=if-asked" | |
7494 | ||
a5cd71ca JX |
7495 | #: transport-helper.c:859 |
7496 | #, c-format | |
7497 | msgid "helper %s does not support --atomic" | |
7498 | msgstr "助手 %s 不支持 --atomic" | |
7499 | ||
7500 | #: transport-helper.c:865 | |
c1ac5258 JX |
7501 | #, c-format |
7502 | msgid "helper %s does not support 'push-option'" | |
7503 | msgstr "助手 %s 不支持 'push-option'" | |
7504 | ||
a5cd71ca | 7505 | #: transport-helper.c:963 |
c1ac5258 JX |
7506 | msgid "remote-helper doesn't support push; refspec needed" |
7507 | msgstr "remote-heper 不支持 push,需要引用表达式" | |
7508 | ||
a5cd71ca | 7509 | #: transport-helper.c:968 |
c1ac5258 JX |
7510 | #, c-format |
7511 | msgid "helper %s does not support 'force'" | |
7512 | msgstr "助手 %s 不支持 'force'" | |
7513 | ||
a5cd71ca | 7514 | #: transport-helper.c:1015 |
c1ac5258 JX |
7515 | msgid "couldn't run fast-export" |
7516 | msgstr "无法执行 fast-export" | |
7517 | ||
a5cd71ca | 7518 | #: transport-helper.c:1020 |
c1ac5258 JX |
7519 | msgid "error while running fast-export" |
7520 | msgstr "执行 fast-export 时出错" | |
7521 | ||
a5cd71ca | 7522 | #: transport-helper.c:1045 |
c1ac5258 JX |
7523 | #, c-format |
7524 | msgid "" | |
7525 | "No refs in common and none specified; doing nothing.\n" | |
7526 | "Perhaps you should specify a branch such as 'master'.\n" | |
7527 | msgstr "" | |
7528 | "没有共同的引用并且也没有指定,什么也不会做。\n" | |
7529 | "可能您应该指定一个分支如 'master'。\n" | |
7530 | ||
a5cd71ca | 7531 | #: transport-helper.c:1118 |
c1ac5258 JX |
7532 | #, c-format |
7533 | msgid "malformed response in ref list: %s" | |
7534 | msgstr "引用列表中格式错误的响应:%s" | |
7535 | ||
a5cd71ca | 7536 | #: transport-helper.c:1270 |
c1ac5258 JX |
7537 | #, c-format |
7538 | msgid "read(%s) failed" | |
7539 | msgstr "读取(%s)失败" | |
7540 | ||
a5cd71ca | 7541 | #: transport-helper.c:1297 |
c1ac5258 JX |
7542 | #, c-format |
7543 | msgid "write(%s) failed" | |
7544 | msgstr "写(%s)失败" | |
7545 | ||
a5cd71ca | 7546 | #: transport-helper.c:1346 |
c1ac5258 JX |
7547 | #, c-format |
7548 | msgid "%s thread failed" | |
7549 | msgstr "%s 线程失败" | |
7550 | ||
a5cd71ca | 7551 | #: transport-helper.c:1350 |
c1ac5258 JX |
7552 | #, c-format |
7553 | msgid "%s thread failed to join: %s" | |
e640d114 | 7554 | msgstr "%s 线程等待失败:%s" |
c1ac5258 | 7555 | |
a5cd71ca | 7556 | #: transport-helper.c:1369 transport-helper.c:1373 |
c1ac5258 JX |
7557 | #, c-format |
7558 | msgid "can't start thread for copying data: %s" | |
7559 | msgstr "不能启动线程来拷贝数据:%s" | |
7560 | ||
a5cd71ca | 7561 | #: transport-helper.c:1410 |
c1ac5258 JX |
7562 | #, c-format |
7563 | msgid "%s process failed to wait" | |
7564 | msgstr "%s 进程等待失败" | |
7565 | ||
a5cd71ca | 7566 | #: transport-helper.c:1414 |
c1ac5258 JX |
7567 | #, c-format |
7568 | msgid "%s process failed" | |
7569 | msgstr "%s 进程失败" | |
7570 | ||
a5cd71ca | 7571 | #: transport-helper.c:1432 transport-helper.c:1441 |
c1ac5258 JX |
7572 | msgid "can't start thread for copying data" |
7573 | msgstr "不能启动线程来拷贝数据" | |
7574 | ||
7575 | #: tree-walk.c:33 | |
a0b6b246 JX |
7576 | msgid "too-short tree object" |
7577 | msgstr "太短的树对象" | |
7578 | ||
c1ac5258 | 7579 | #: tree-walk.c:39 |
a0b6b246 | 7580 | msgid "malformed mode in tree entry" |
29004bbb | 7581 | msgstr "树对象中的条目模式错误" |
a0b6b246 | 7582 | |
c1ac5258 | 7583 | #: tree-walk.c:43 |
a0b6b246 JX |
7584 | msgid "empty filename in tree entry" |
7585 | msgstr "树对象条目中空的文件名" | |
7586 | ||
a6cd2cc4 | 7587 | #: tree-walk.c:118 |
a0b6b246 JX |
7588 | msgid "too-short tree file" |
7589 | msgstr "太短的树文件" | |
7590 | ||
a5cd71ca | 7591 | #: unpack-trees.c:110 |
a0b6b246 JX |
7592 | #, c-format |
7593 | msgid "" | |
7594 | "Your local changes to the following files would be overwritten by checkout:\n" | |
7595 | "%%sPlease commit your changes or stash them before you switch branches." | |
7596 | msgstr "" | |
7597 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 7598 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 7599 | |
a5cd71ca | 7600 | #: unpack-trees.c:112 |
a0b6b246 JX |
7601 | #, c-format |
7602 | msgid "" | |
7603 | "Your local changes to the following files would be overwritten by checkout:\n" | |
7604 | "%%s" | |
7605 | msgstr "" | |
7606 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
7607 | "%%s" | |
7608 | ||
a5cd71ca | 7609 | #: unpack-trees.c:115 |
a0b6b246 JX |
7610 | #, c-format |
7611 | msgid "" | |
7612 | "Your local changes to the following files would be overwritten by merge:\n" | |
7613 | "%%sPlease commit your changes or stash them before you merge." | |
7614 | msgstr "" | |
7615 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 7616 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 7617 | |
a5cd71ca | 7618 | #: unpack-trees.c:117 |
a0b6b246 JX |
7619 | #, c-format |
7620 | msgid "" | |
7621 | "Your local changes to the following files would be overwritten by merge:\n" | |
7622 | "%%s" | |
7623 | msgstr "" | |
7624 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
7625 | "%%s" | |
7626 | ||
a5cd71ca | 7627 | #: unpack-trees.c:120 |
a0b6b246 JX |
7628 | #, c-format |
7629 | msgid "" | |
7630 | "Your local changes to the following files would be overwritten by %s:\n" | |
7631 | "%%sPlease commit your changes or stash them before you %s." | |
7632 | msgstr "" | |
7633 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 7634 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 7635 | |
a5cd71ca | 7636 | #: unpack-trees.c:122 |
a0b6b246 JX |
7637 | #, c-format |
7638 | msgid "" | |
7639 | "Your local changes to the following files would be overwritten by %s:\n" | |
7640 | "%%s" | |
7641 | msgstr "" | |
7642 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
7643 | "%%s" | |
c04f5ac3 | 7644 | |
a5cd71ca | 7645 | #: unpack-trees.c:127 |
a0b6b246 JX |
7646 | #, c-format |
7647 | msgid "" | |
1a79b2f1 | 7648 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
7649 | "%s" |
7650 | msgstr "" | |
7651 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
7652 | "%s" | |
1b7f4a34 | 7653 | |
a5cd71ca | 7654 | #: unpack-trees.c:131 |
a0b6b246 JX |
7655 | #, c-format |
7656 | msgid "" | |
7657 | "The following untracked working tree files would be removed by checkout:\n" | |
7658 | "%%sPlease move or remove them before you switch branches." | |
7659 | msgstr "" | |
7660 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
7661 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 7662 | |
a5cd71ca | 7663 | #: unpack-trees.c:133 |
a0b6b246 JX |
7664 | #, c-format |
7665 | msgid "" | |
7666 | "The following untracked working tree files would be removed by checkout:\n" | |
7667 | "%%s" | |
7668 | msgstr "" | |
7669 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
7670 | "%%s" | |
1003b3a5 | 7671 | |
a5cd71ca | 7672 | #: unpack-trees.c:136 |
a0b6b246 JX |
7673 | #, c-format |
7674 | msgid "" | |
7675 | "The following untracked working tree files would be removed by merge:\n" | |
7676 | "%%sPlease move or remove them before you merge." | |
7677 | msgstr "" | |
7678 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
7679 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 7680 | |
a5cd71ca | 7681 | #: unpack-trees.c:138 |
a0b6b246 JX |
7682 | #, c-format |
7683 | msgid "" | |
7684 | "The following untracked working tree files would be removed by merge:\n" | |
7685 | "%%s" | |
7686 | msgstr "" | |
7687 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
7688 | "%%s" | |
c04f5ac3 | 7689 | |
a5cd71ca | 7690 | #: unpack-trees.c:141 |
a0b6b246 JX |
7691 | #, c-format |
7692 | msgid "" | |
7693 | "The following untracked working tree files would be removed by %s:\n" | |
7694 | "%%sPlease move or remove them before you %s." | |
7695 | msgstr "" | |
7696 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
7697 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 7698 | |
a5cd71ca | 7699 | #: unpack-trees.c:143 |
a0b6b246 JX |
7700 | #, c-format |
7701 | msgid "" | |
7702 | "The following untracked working tree files would be removed by %s:\n" | |
7703 | "%%s" | |
7704 | msgstr "" | |
7705 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
7706 | "%%s" | |
c04f5ac3 | 7707 | |
a5cd71ca | 7708 | #: unpack-trees.c:149 |
a0b6b246 JX |
7709 | #, c-format |
7710 | msgid "" | |
7711 | "The following untracked working tree files would be overwritten by " | |
7712 | "checkout:\n" | |
7713 | "%%sPlease move or remove them before you switch branches." | |
7714 | msgstr "" | |
7715 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
7716 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 7717 | |
a5cd71ca | 7718 | #: unpack-trees.c:151 |
1003b3a5 | 7719 | #, c-format |
4dcdc3d8 | 7720 | msgid "" |
a0b6b246 JX |
7721 | "The following untracked working tree files would be overwritten by " |
7722 | "checkout:\n" | |
7723 | "%%s" | |
4dcdc3d8 | 7724 | msgstr "" |
a0b6b246 JX |
7725 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
7726 | "%%s" | |
1003b3a5 | 7727 | |
a5cd71ca | 7728 | #: unpack-trees.c:154 |
c04f5ac3 | 7729 | #, c-format |
a0b6b246 JX |
7730 | msgid "" |
7731 | "The following untracked working tree files would be overwritten by merge:\n" | |
7732 | "%%sPlease move or remove them before you merge." | |
7733 | msgstr "" | |
7734 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
7735 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 7736 | |
a5cd71ca | 7737 | #: unpack-trees.c:156 |
a0b6b246 JX |
7738 | #, c-format |
7739 | msgid "" | |
7740 | "The following untracked working tree files would be overwritten by merge:\n" | |
7741 | "%%s" | |
7742 | msgstr "" | |
7743 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
7744 | "%%s" | |
c04f5ac3 | 7745 | |
a5cd71ca | 7746 | #: unpack-trees.c:159 |
a0b6b246 JX |
7747 | #, c-format |
7748 | msgid "" | |
7749 | "The following untracked working tree files would be overwritten by %s:\n" | |
7750 | "%%sPlease move or remove them before you %s." | |
7751 | msgstr "" | |
7752 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
7753 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 7754 | |
a5cd71ca | 7755 | #: unpack-trees.c:161 |
07432cef | 7756 | #, c-format |
a0b6b246 JX |
7757 | msgid "" |
7758 | "The following untracked working tree files would be overwritten by %s:\n" | |
7759 | "%%s" | |
7760 | msgstr "" | |
7761 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
7762 | "%%s" | |
c04f5ac3 | 7763 | |
a5cd71ca | 7764 | #: unpack-trees.c:169 |
07432cef | 7765 | #, c-format |
a0b6b246 JX |
7766 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
7767 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 7768 | |
a5cd71ca | 7769 | #: unpack-trees.c:172 |
07432cef | 7770 | #, c-format |
ef317cd5 | 7771 | msgid "" |
6937cb4e | 7772 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
a0b6b246 JX |
7773 | "%s" |
7774 | msgstr "" | |
7775 | "无法更新稀疏检出:如下条目不是最新:\n" | |
7776 | "%s" | |
c04f5ac3 | 7777 | |
a5cd71ca | 7778 | #: unpack-trees.c:174 |
07432cef | 7779 | #, c-format |
a0b6b246 JX |
7780 | msgid "" |
7781 | "The following working tree files would be overwritten by sparse checkout " | |
7782 | "update:\n" | |
7783 | "%s" | |
7784 | msgstr "" | |
7785 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
7786 | "%s" | |
c04f5ac3 | 7787 | |
a5cd71ca | 7788 | #: unpack-trees.c:176 |
07432cef | 7789 | #, c-format |
a0b6b246 JX |
7790 | msgid "" |
7791 | "The following working tree files would be removed by sparse checkout " | |
7792 | "update:\n" | |
7793 | "%s" | |
7794 | msgstr "" | |
7795 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
7796 | "%s" | |
c04f5ac3 | 7797 | |
a5cd71ca | 7798 | #: unpack-trees.c:178 |
87cb7997 JX |
7799 | #, c-format |
7800 | msgid "" | |
7801 | "Cannot update submodule:\n" | |
7802 | "%s" | |
7803 | msgstr "" | |
7804 | "无法更新子模组:\n" | |
7805 | "%s" | |
7806 | ||
a5cd71ca | 7807 | #: unpack-trees.c:255 |
07432cef | 7808 | #, c-format |
a0b6b246 | 7809 | msgid "Aborting\n" |
a6cd2cc4 | 7810 | msgstr "正在终止\n" |
ef317cd5 | 7811 | |
a5cd71ca | 7812 | #: unpack-trees.c:317 |
a6cd2cc4 JX |
7813 | msgid "Updating files" |
7814 | msgstr "正在更新文件" | |
c04f5ac3 | 7815 | |
a5cd71ca | 7816 | #: unpack-trees.c:349 |
4c27fcb5 JX |
7817 | msgid "" |
7818 | "the following paths have collided (e.g. case-sensitive paths\n" | |
7819 | "on a case-insensitive filesystem) and only one from the same\n" | |
7820 | "colliding group is in the working tree:\n" | |
7821 | msgstr "" | |
7822 | "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n" | |
7823 | "并且碰撞组中只有一个文件存在工作区中:\n" | |
7824 | ||
87cb7997 | 7825 | #: urlmatch.c:163 |
a0b6b246 JX |
7826 | msgid "invalid URL scheme name or missing '://' suffix" |
7827 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
7828 | ||
87cb7997 | 7829 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 7830 | #, c-format |
a0b6b246 JX |
7831 | msgid "invalid %XX escape sequence" |
7832 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 7833 | |
87cb7997 | 7834 | #: urlmatch.c:215 |
a0b6b246 JX |
7835 | msgid "missing host and scheme is not 'file:'" |
7836 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 7837 | |
87cb7997 | 7838 | #: urlmatch.c:232 |
a0b6b246 JX |
7839 | msgid "a 'file:' URL may not have a port number" |
7840 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 7841 | |
87cb7997 | 7842 | #: urlmatch.c:247 |
a0b6b246 JX |
7843 | msgid "invalid characters in host name" |
7844 | msgstr "主机名中包含无效的字符" | |
90314792 | 7845 | |
87cb7997 | 7846 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
7847 | msgid "invalid port number" |
7848 | msgstr "无效的端口号" | |
c04f5ac3 | 7849 | |
87cb7997 | 7850 | #: urlmatch.c:371 |
a0b6b246 JX |
7851 | msgid "invalid '..' path segment" |
7852 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 7853 | |
a5cd71ca | 7854 | #: worktree.c:258 builtin/am.c:2084 |
a77c07d9 | 7855 | #, c-format |
a0b6b246 | 7856 | msgid "failed to read '%s'" |
c1ac5258 | 7857 | msgstr "读取 '%s' 失败" |
ef317cd5 | 7858 | |
a6cd2cc4 | 7859 | #: worktree.c:304 |
31e5e17b JX |
7860 | #, c-format |
7861 | msgid "'%s' at main working tree is not the repository directory" | |
7862 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
7863 | ||
a6cd2cc4 | 7864 | #: worktree.c:315 |
31e5e17b JX |
7865 | #, c-format |
7866 | msgid "'%s' file does not contain absolute path to the working tree location" | |
7867 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
7868 | ||
a6cd2cc4 | 7869 | #: worktree.c:327 |
31e5e17b JX |
7870 | #, c-format |
7871 | msgid "'%s' does not exist" | |
7872 | msgstr "'%s' 不存在" | |
7873 | ||
a6cd2cc4 | 7874 | #: worktree.c:333 |
31e5e17b JX |
7875 | #, c-format |
7876 | msgid "'%s' is not a .git file, error code %d" | |
7877 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
7878 | ||
a6cd2cc4 | 7879 | #: worktree.c:341 |
31e5e17b JX |
7880 | #, c-format |
7881 | msgid "'%s' does not point back to '%s'" | |
7882 | msgstr "'%s' 没有指回到 '%s'" | |
7883 | ||
a5cd71ca | 7884 | #: wrapper.c:186 wrapper.c:356 |
c04f5ac3 | 7885 | #, c-format |
a0b6b246 JX |
7886 | msgid "could not open '%s' for reading and writing" |
7887 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 7888 | |
a5cd71ca | 7889 | #: wrapper.c:387 wrapper.c:588 |
a0b6b246 JX |
7890 | #, c-format |
7891 | msgid "unable to access '%s'" | |
7892 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 7893 | |
a5cd71ca | 7894 | #: wrapper.c:596 |
a0b6b246 JX |
7895 | msgid "unable to get current working directory" |
7896 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 7897 | |
a6cd2cc4 | 7898 | #: wt-status.c:158 |
a0b6b246 JX |
7899 | msgid "Unmerged paths:" |
7900 | msgstr "未合并的路径:" | |
7aea43ff | 7901 | |
a0b6b246 | 7902 | # 译者:注意保持前导空格 |
a6cd2cc4 JX |
7903 | #: wt-status.c:187 wt-status.c:219 |
7904 | msgid " (use \"git restore --staged <file>...\" to unstage)" | |
7905 | msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)" | |
7906 | ||
7907 | # 译者:注意保持前导空格 | |
7908 | #: wt-status.c:190 wt-status.c:222 | |
c04f5ac3 | 7909 | #, c-format |
a6cd2cc4 JX |
7910 | msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" |
7911 | msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)" | |
c04f5ac3 | 7912 | |
a0b6b246 | 7913 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7914 | #: wt-status.c:193 wt-status.c:225 |
a0b6b246 JX |
7915 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
7916 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 7917 | |
a0b6b246 | 7918 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7919 | #: wt-status.c:197 |
a0b6b246 JX |
7920 | msgid " (use \"git add <file>...\" to mark resolution)" |
7921 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 7922 | |
a0b6b246 | 7923 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7924 | #: wt-status.c:199 wt-status.c:203 |
a0b6b246 JX |
7925 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
7926 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 7927 | |
a0b6b246 | 7928 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7929 | #: wt-status.c:201 |
a0b6b246 JX |
7930 | msgid " (use \"git rm <file>...\" to mark resolution)" |
7931 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 7932 | |
a6cd2cc4 | 7933 | #: wt-status.c:211 wt-status.c:1074 |
a0b6b246 JX |
7934 | msgid "Changes to be committed:" |
7935 | msgstr "要提交的变更:" | |
ef317cd5 | 7936 | |
a6cd2cc4 | 7937 | #: wt-status.c:234 wt-status.c:1083 |
a0b6b246 JX |
7938 | msgid "Changes not staged for commit:" |
7939 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 7940 | |
a0b6b246 | 7941 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7942 | #: wt-status.c:238 |
a0b6b246 JX |
7943 | msgid " (use \"git add <file>...\" to update what will be committed)" |
7944 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 7945 | |
a0b6b246 | 7946 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7947 | #: wt-status.c:240 |
a0b6b246 JX |
7948 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
7949 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 7950 | |
a0b6b246 | 7951 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7952 | #: wt-status.c:241 |
a0b6b246 | 7953 | msgid "" |
a6cd2cc4 JX |
7954 | " (use \"git restore <file>...\" to discard changes in working directory)" |
7955 | msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 7956 | |
a0b6b246 | 7957 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7958 | #: wt-status.c:243 |
a0b6b246 JX |
7959 | msgid " (commit or discard the untracked or modified content in submodules)" |
7960 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 7961 | |
a0b6b246 | 7962 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7963 | #: wt-status.c:254 |
a0b6b246 JX |
7964 | #, c-format |
7965 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
7966 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 7967 | |
a6cd2cc4 | 7968 | #: wt-status.c:268 |
a0b6b246 JX |
7969 | msgid "both deleted:" |
7970 | msgstr "双方删除:" | |
ef317cd5 | 7971 | |
a6cd2cc4 | 7972 | #: wt-status.c:270 |
a0b6b246 JX |
7973 | msgid "added by us:" |
7974 | msgstr "由我们添加:" | |
4dcdc3d8 | 7975 | |
a6cd2cc4 | 7976 | #: wt-status.c:272 |
a0b6b246 JX |
7977 | msgid "deleted by them:" |
7978 | msgstr "由他们删除:" | |
ef317cd5 | 7979 | |
a6cd2cc4 | 7980 | #: wt-status.c:274 |
a0b6b246 JX |
7981 | msgid "added by them:" |
7982 | msgstr "由他们添加:" | |
ef317cd5 | 7983 | |
a6cd2cc4 | 7984 | #: wt-status.c:276 |
a0b6b246 JX |
7985 | msgid "deleted by us:" |
7986 | msgstr "由我们删除:" | |
ef317cd5 | 7987 | |
a6cd2cc4 | 7988 | #: wt-status.c:278 |
a0b6b246 JX |
7989 | msgid "both added:" |
7990 | msgstr "双方添加:" | |
5c57d762 | 7991 | |
a6cd2cc4 | 7992 | #: wt-status.c:280 |
a0b6b246 JX |
7993 | msgid "both modified:" |
7994 | msgstr "双方修改:" | |
5c57d762 | 7995 | |
a6cd2cc4 | 7996 | #: wt-status.c:290 |
a0b6b246 JX |
7997 | msgid "new file:" |
7998 | msgstr "新文件:" | |
8ada9598 | 7999 | |
a6cd2cc4 | 8000 | #: wt-status.c:292 |
a0b6b246 JX |
8001 | msgid "copied:" |
8002 | msgstr "拷贝:" | |
8ada9598 | 8003 | |
a6cd2cc4 | 8004 | #: wt-status.c:294 |
a0b6b246 JX |
8005 | msgid "deleted:" |
8006 | msgstr "删除:" | |
8ada9598 | 8007 | |
a6cd2cc4 | 8008 | #: wt-status.c:296 |
a0b6b246 JX |
8009 | msgid "modified:" |
8010 | msgstr "修改:" | |
8ada9598 | 8011 | |
a6cd2cc4 | 8012 | #: wt-status.c:298 |
a0b6b246 JX |
8013 | msgid "renamed:" |
8014 | msgstr "重命名:" | |
5c57d762 | 8015 | |
a6cd2cc4 | 8016 | #: wt-status.c:300 |
a0b6b246 JX |
8017 | msgid "typechange:" |
8018 | msgstr "类型变更:" | |
8ada9598 | 8019 | |
a6cd2cc4 | 8020 | #: wt-status.c:302 |
a0b6b246 JX |
8021 | msgid "unknown:" |
8022 | msgstr "未知:" | |
8ada9598 | 8023 | |
a6cd2cc4 | 8024 | #: wt-status.c:304 |
a0b6b246 JX |
8025 | msgid "unmerged:" |
8026 | msgstr "未合并:" | |
8ada9598 | 8027 | |
a0b6b246 | 8028 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 8029 | #: wt-status.c:384 |
a0b6b246 JX |
8030 | msgid "new commits, " |
8031 | msgstr "新提交, " | |
8ada9598 | 8032 | |
a0b6b246 | 8033 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 8034 | #: wt-status.c:386 |
a0b6b246 JX |
8035 | msgid "modified content, " |
8036 | msgstr "修改的内容, " | |
1b7f4a34 | 8037 | |
a0b6b246 | 8038 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 8039 | #: wt-status.c:388 |
a0b6b246 JX |
8040 | msgid "untracked content, " |
8041 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 8042 | |
a6cd2cc4 | 8043 | #: wt-status.c:906 |
a4f16749 JX |
8044 | #, c-format |
8045 | msgid "Your stash currently has %d entry" | |
8046 | msgid_plural "Your stash currently has %d entries" | |
8047 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
8048 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
8049 | ||
a6cd2cc4 | 8050 | #: wt-status.c:938 |
a0b6b246 JX |
8051 | msgid "Submodules changed but not updated:" |
8052 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 8053 | |
a6cd2cc4 | 8054 | #: wt-status.c:940 |
a0b6b246 JX |
8055 | msgid "Submodule changes to be committed:" |
8056 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 8057 | |
a6cd2cc4 | 8058 | #: wt-status.c:1022 |
a0b6b246 | 8059 | msgid "" |
6937cb4e JX |
8060 | "Do not modify or remove the line above.\n" |
8061 | "Everything below it will be ignored." | |
a0b6b246 | 8062 | msgstr "" |
6937cb4e JX |
8063 | "不要改动或删除上面的一行。\n" |
8064 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 8065 | |
a6cd2cc4 JX |
8066 | #: wt-status.c:1114 |
8067 | #, c-format | |
8068 | msgid "" | |
8069 | "\n" | |
8070 | "It took %.2f seconds to compute the branch ahead/behind values.\n" | |
8071 | "You can use '--no-ahead-behind' to avoid this.\n" | |
8072 | msgstr "" | |
8073 | "\n" | |
8074 | "花了 %.2f 秒才计算出分支的领先/落后范围。\n" | |
8075 | "为避免,您可以使用 '--no-ahead-behind'。\n" | |
8076 | ||
8077 | #: wt-status.c:1144 | |
a0b6b246 JX |
8078 | msgid "You have unmerged paths." |
8079 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 8080 | |
a0b6b246 | 8081 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8082 | #: wt-status.c:1147 |
a0b6b246 JX |
8083 | msgid " (fix conflicts and run \"git commit\")" |
8084 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 8085 | |
a0b6b246 | 8086 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8087 | #: wt-status.c:1149 |
a0b6b246 JX |
8088 | msgid " (use \"git merge --abort\" to abort the merge)" |
8089 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 8090 | |
a6cd2cc4 | 8091 | #: wt-status.c:1153 |
a0b6b246 JX |
8092 | msgid "All conflicts fixed but you are still merging." |
8093 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 8094 | |
a0b6b246 | 8095 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8096 | #: wt-status.c:1156 |
a0b6b246 JX |
8097 | msgid " (use \"git commit\" to conclude merge)" |
8098 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 8099 | |
a6cd2cc4 | 8100 | #: wt-status.c:1165 |
a0b6b246 JX |
8101 | msgid "You are in the middle of an am session." |
8102 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 8103 | |
a6cd2cc4 | 8104 | #: wt-status.c:1168 |
a0b6b246 JX |
8105 | msgid "The current patch is empty." |
8106 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 8107 | |
a0b6b246 | 8108 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8109 | #: wt-status.c:1172 |
a0b6b246 JX |
8110 | msgid " (fix conflicts and then run \"git am --continue\")" |
8111 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 8112 | |
a0b6b246 | 8113 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8114 | #: wt-status.c:1174 |
a0b6b246 JX |
8115 | msgid " (use \"git am --skip\" to skip this patch)" |
8116 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 8117 | |
a0b6b246 | 8118 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8119 | #: wt-status.c:1176 |
a0b6b246 JX |
8120 | msgid " (use \"git am --abort\" to restore the original branch)" |
8121 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 8122 | |
a6cd2cc4 | 8123 | #: wt-status.c:1309 |
1a79b2f1 JX |
8124 | msgid "git-rebase-todo is missing." |
8125 | msgstr "git-rebase-todo 丢失。" | |
8126 | ||
a6cd2cc4 | 8127 | #: wt-status.c:1311 |
a0b6b246 JX |
8128 | msgid "No commands done." |
8129 | msgstr "没有命令被执行。" | |
8130 | ||
a6cd2cc4 | 8131 | #: wt-status.c:1314 |
1b7f4a34 | 8132 | #, c-format |
a0b6b246 JX |
8133 | msgid "Last command done (%d command done):" |
8134 | msgid_plural "Last commands done (%d commands done):" | |
8135 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
8136 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 8137 | |
a6cd2cc4 | 8138 | #: wt-status.c:1325 |
1b7f4a34 | 8139 | #, c-format |
a0b6b246 JX |
8140 | msgid " (see more in file %s)" |
8141 | msgstr " (更多参见文件 %s)" | |
8142 | ||
a6cd2cc4 | 8143 | #: wt-status.c:1330 |
a0b6b246 JX |
8144 | msgid "No commands remaining." |
8145 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 8146 | |
a6cd2cc4 | 8147 | #: wt-status.c:1333 |
1b7f4a34 | 8148 | #, c-format |
a0b6b246 JX |
8149 | msgid "Next command to do (%d remaining command):" |
8150 | msgid_plural "Next commands to do (%d remaining commands):" | |
8151 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
8152 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 8153 | |
a0b6b246 | 8154 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8155 | #: wt-status.c:1341 |
a0b6b246 JX |
8156 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
8157 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 8158 | |
a6cd2cc4 | 8159 | #: wt-status.c:1353 |
1b7f4a34 | 8160 | #, c-format |
a0b6b246 JX |
8161 | msgid "You are currently rebasing branch '%s' on '%s'." |
8162 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 8163 | |
a6cd2cc4 | 8164 | #: wt-status.c:1358 |
a0b6b246 JX |
8165 | msgid "You are currently rebasing." |
8166 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 8167 | |
a0b6b246 | 8168 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8169 | #: wt-status.c:1371 |
a0b6b246 JX |
8170 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
8171 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 8172 | |
a0b6b246 | 8173 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8174 | #: wt-status.c:1373 |
a0b6b246 JX |
8175 | msgid " (use \"git rebase --skip\" to skip this patch)" |
8176 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
8177 | ||
8178 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8179 | #: wt-status.c:1375 |
a0b6b246 JX |
8180 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
8181 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
8182 | ||
8183 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8184 | #: wt-status.c:1382 |
a0b6b246 JX |
8185 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
8186 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 8187 | |
a6cd2cc4 | 8188 | #: wt-status.c:1386 |
a0b6b246 | 8189 | #, c-format |
1b7f4a34 | 8190 | msgid "" |
a0b6b246 JX |
8191 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
8192 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 8193 | |
a6cd2cc4 | 8194 | #: wt-status.c:1391 |
a0b6b246 JX |
8195 | msgid "You are currently splitting a commit during a rebase." |
8196 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 8197 | |
a0b6b246 | 8198 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8199 | #: wt-status.c:1394 |
a0b6b246 JX |
8200 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
8201 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 8202 | |
a6cd2cc4 | 8203 | #: wt-status.c:1398 |
a0b6b246 JX |
8204 | #, c-format |
8205 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
8206 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 8207 | |
a6cd2cc4 | 8208 | #: wt-status.c:1403 |
a0b6b246 JX |
8209 | msgid "You are currently editing a commit during a rebase." |
8210 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 8211 | |
a0b6b246 | 8212 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8213 | #: wt-status.c:1406 |
a0b6b246 JX |
8214 | msgid " (use \"git commit --amend\" to amend the current commit)" |
8215 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
8216 | ||
8217 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8218 | #: wt-status.c:1408 |
a0b6b246 JX |
8219 | msgid "" |
8220 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
8221 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 8222 | |
a6cd2cc4 | 8223 | #: wt-status.c:1419 |
d46c5519 JX |
8224 | msgid "Cherry-pick currently in progress." |
8225 | msgstr "拣选操作正在进行中。" | |
8226 | ||
a6cd2cc4 | 8227 | #: wt-status.c:1422 |
1b7f4a34 | 8228 | #, c-format |
a0b6b246 JX |
8229 | msgid "You are currently cherry-picking commit %s." |
8230 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 8231 | |
a0b6b246 | 8232 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8233 | #: wt-status.c:1429 |
a0b6b246 JX |
8234 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
8235 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 8236 | |
a0b6b246 | 8237 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8238 | #: wt-status.c:1432 |
d46c5519 JX |
8239 | msgid " (run \"git cherry-pick --continue\" to continue)" |
8240 | msgstr " (执行 \"git cherry-pick --continue\" 以继续)" | |
8241 | ||
8242 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8243 | #: wt-status.c:1435 |
a0b6b246 JX |
8244 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
8245 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 8246 | |
a0b6b246 | 8247 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8248 | #: wt-status.c:1437 |
a5cd71ca JX |
8249 | msgid " (use \"git cherry-pick --skip\" to skip this patch)" |
8250 | msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)" | |
8251 | ||
8252 | # 译者:注意保持前导空格 | |
8253 | #: wt-status.c:1439 | |
a0b6b246 JX |
8254 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
8255 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 8256 | |
a5cd71ca | 8257 | #: wt-status.c:1449 |
d46c5519 JX |
8258 | msgid "Revert currently in progress." |
8259 | msgstr "还原操作正在行中。" | |
8260 | ||
a5cd71ca | 8261 | #: wt-status.c:1452 |
1b7f4a34 | 8262 | #, c-format |
a0b6b246 JX |
8263 | msgid "You are currently reverting commit %s." |
8264 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 8265 | |
a0b6b246 | 8266 | # 译者:注意保持前导空格 |
a5cd71ca | 8267 | #: wt-status.c:1458 |
a0b6b246 | 8268 | msgid " (fix conflicts and run \"git revert --continue\")" |
5b533632 | 8269 | msgstr " (解决冲突并执行 \"git revert --continue\")" |
1b7f4a34 | 8270 | |
a0b6b246 | 8271 | # 译者:注意保持前导空格 |
a5cd71ca | 8272 | #: wt-status.c:1461 |
d46c5519 | 8273 | msgid " (run \"git revert --continue\" to continue)" |
5b533632 | 8274 | msgstr " (执行 \"git revert --continue\" 以继续)" |
d46c5519 JX |
8275 | |
8276 | # 译者:注意保持前导空格 | |
a5cd71ca | 8277 | #: wt-status.c:1464 |
a0b6b246 | 8278 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
5b533632 | 8279 | msgstr " (所有冲突已解决:执行 \"git revert --continue\")" |
1b7f4a34 | 8280 | |
a0b6b246 | 8281 | # 译者:注意保持前导空格 |
a5cd71ca JX |
8282 | #: wt-status.c:1466 |
8283 | msgid " (use \"git revert --skip\" to skip this patch)" | |
8284 | msgstr " (使用 \"git revert --skip\" 跳过此补丁)" | |
8285 | ||
8286 | # 译者:注意保持前导空格 | |
8287 | #: wt-status.c:1468 | |
a0b6b246 JX |
8288 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
8289 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 8290 | |
a5cd71ca | 8291 | #: wt-status.c:1478 |
1b7f4a34 | 8292 | #, c-format |
a0b6b246 JX |
8293 | msgid "You are currently bisecting, started from branch '%s'." |
8294 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 8295 | |
a5cd71ca | 8296 | #: wt-status.c:1482 |
a0b6b246 JX |
8297 | msgid "You are currently bisecting." |
8298 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 8299 | |
a0b6b246 | 8300 | # 译者:注意保持前导空格 |
a5cd71ca | 8301 | #: wt-status.c:1485 |
a0b6b246 JX |
8302 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
8303 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 8304 | |
a5cd71ca | 8305 | #: wt-status.c:1694 |
a0b6b246 JX |
8306 | msgid "On branch " |
8307 | msgstr "位于分支 " | |
1b7f4a34 | 8308 | |
a5cd71ca | 8309 | #: wt-status.c:1701 |
a0b6b246 JX |
8310 | msgid "interactive rebase in progress; onto " |
8311 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 8312 | |
a5cd71ca | 8313 | #: wt-status.c:1703 |
a0b6b246 JX |
8314 | msgid "rebase in progress; onto " |
8315 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 8316 | |
a5cd71ca | 8317 | #: wt-status.c:1713 |
a0b6b246 JX |
8318 | msgid "Not currently on any branch." |
8319 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 8320 | |
a5cd71ca | 8321 | #: wt-status.c:1730 |
a0b6b246 JX |
8322 | msgid "Initial commit" |
8323 | msgstr "初始提交" | |
1b7f4a34 | 8324 | |
a5cd71ca | 8325 | #: wt-status.c:1731 |
a4f16749 JX |
8326 | msgid "No commits yet" |
8327 | msgstr "尚无提交" | |
8328 | ||
a5cd71ca | 8329 | #: wt-status.c:1745 |
a0b6b246 JX |
8330 | msgid "Untracked files" |
8331 | msgstr "未跟踪的文件" | |
1b7f4a34 | 8332 | |
a5cd71ca | 8333 | #: wt-status.c:1747 |
a0b6b246 JX |
8334 | msgid "Ignored files" |
8335 | msgstr "忽略的文件" | |
1b7f4a34 | 8336 | |
a5cd71ca | 8337 | #: wt-status.c:1751 |
a0b6b246 JX |
8338 | #, c-format |
8339 | msgid "" | |
8340 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
8341 | "may speed it up, but you have to be careful not to forget to add\n" | |
8342 | "new files yourself (see 'git help status')." | |
8343 | msgstr "" | |
8344 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
8345 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 8346 | |
a5cd71ca | 8347 | #: wt-status.c:1757 |
a0b6b246 JX |
8348 | #, c-format |
8349 | msgid "Untracked files not listed%s" | |
8350 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 8351 | |
a0b6b246 | 8352 | # 译者:中文字符串拼接,可删除前导空格 |
a5cd71ca | 8353 | #: wt-status.c:1759 |
a0b6b246 JX |
8354 | msgid " (use -u option to show untracked files)" |
8355 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 8356 | |
a5cd71ca | 8357 | #: wt-status.c:1765 |
a0b6b246 JX |
8358 | msgid "No changes" |
8359 | msgstr "没有修改" | |
1b7f4a34 | 8360 | |
a5cd71ca | 8361 | #: wt-status.c:1770 |
a0b6b246 JX |
8362 | #, c-format |
8363 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
8364 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 8365 | |
a5cd71ca | 8366 | #: wt-status.c:1773 |
a0b6b246 JX |
8367 | #, c-format |
8368 | msgid "no changes added to commit\n" | |
8369 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 8370 | |
a5cd71ca | 8371 | #: wt-status.c:1776 |
a0b6b246 JX |
8372 | #, c-format |
8373 | msgid "" | |
8374 | "nothing added to commit but untracked files present (use \"git add\" to " | |
8375 | "track)\n" | |
8376 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 8377 | |
a5cd71ca | 8378 | #: wt-status.c:1779 |
a0b6b246 JX |
8379 | #, c-format |
8380 | msgid "nothing added to commit but untracked files present\n" | |
8381 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 8382 | |
a0b6b246 | 8383 | # 译者:中文字符串拼接,可删除前导空格 |
a5cd71ca | 8384 | #: wt-status.c:1782 |
a0b6b246 JX |
8385 | #, c-format |
8386 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
8387 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 8388 | |
a5cd71ca | 8389 | #: wt-status.c:1785 wt-status.c:1790 |
a0b6b246 JX |
8390 | #, c-format |
8391 | msgid "nothing to commit\n" | |
8392 | msgstr "无文件要提交\n" | |
1b7f4a34 | 8393 | |
a0b6b246 | 8394 | # 译者:中文字符串拼接,可删除前导空格 |
a5cd71ca | 8395 | #: wt-status.c:1788 |
a0b6b246 JX |
8396 | #, c-format |
8397 | msgid "nothing to commit (use -u to show untracked files)\n" | |
8398 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 8399 | |
a0b6b246 | 8400 | # 译者:中文字符串拼接,可删除前导空格 |
a5cd71ca | 8401 | #: wt-status.c:1792 |
a0b6b246 JX |
8402 | #, c-format |
8403 | msgid "nothing to commit, working tree clean\n" | |
8404 | msgstr "无文件要提交,干净的工作区\n" | |
8405 | ||
a5cd71ca | 8406 | #: wt-status.c:1905 |
a4f16749 JX |
8407 | msgid "No commits yet on " |
8408 | msgstr "尚无提交在 " | |
1b7f4a34 | 8409 | |
a5cd71ca | 8410 | #: wt-status.c:1909 |
a0b6b246 JX |
8411 | msgid "HEAD (no branch)" |
8412 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 8413 | |
a5cd71ca | 8414 | #: wt-status.c:1940 |
31e5e17b JX |
8415 | msgid "different" |
8416 | msgstr "不同" | |
8417 | ||
a0b6b246 | 8418 | # 译者:注意保持句尾空格 |
a5cd71ca | 8419 | #: wt-status.c:1942 wt-status.c:1950 |
a0b6b246 JX |
8420 | msgid "behind " |
8421 | msgstr "落后 " | |
1b7f4a34 | 8422 | |
a5cd71ca | 8423 | #: wt-status.c:1945 wt-status.c:1948 |
a0b6b246 JX |
8424 | msgid "ahead " |
8425 | msgstr "领先 " | |
1b7f4a34 | 8426 | |
a0b6b246 | 8427 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
a5cd71ca | 8428 | #: wt-status.c:2470 |
a0b6b246 JX |
8429 | #, c-format |
8430 | msgid "cannot %s: You have unstaged changes." | |
8431 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 8432 | |
a5cd71ca | 8433 | #: wt-status.c:2476 |
a0b6b246 | 8434 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 8435 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 8436 | |
a5cd71ca | 8437 | #: wt-status.c:2478 |
a0b6b246 JX |
8438 | #, c-format |
8439 | msgid "cannot %s: Your index contains uncommitted changes." | |
8440 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 8441 | |
a5cd71ca JX |
8442 | #: compat/precompose_utf8.c:58 builtin/clone.c:452 |
8443 | #, c-format | |
8444 | msgid "failed to unlink '%s'" | |
8445 | msgstr "删除 '%s' 失败" | |
8446 | ||
06991777 | 8447 | #: builtin/add.c:25 |
a0b6b246 JX |
8448 | msgid "git add [<options>] [--] <pathspec>..." |
8449 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 8450 | |
06991777 | 8451 | #: builtin/add.c:84 |
a0b6b246 JX |
8452 | #, c-format |
8453 | msgid "unexpected diff status %c" | |
8454 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 8455 | |
a6cd2cc4 | 8456 | #: builtin/add.c:89 builtin/commit.c:288 |
a0b6b246 JX |
8457 | msgid "updating files failed" |
8458 | msgstr "更新文件失败" | |
1b7f4a34 | 8459 | |
06991777 | 8460 | #: builtin/add.c:99 |
a0b6b246 JX |
8461 | #, c-format |
8462 | msgid "remove '%s'\n" | |
8463 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 8464 | |
06991777 | 8465 | #: builtin/add.c:174 |
a0b6b246 JX |
8466 | msgid "Unstaged changes after refreshing the index:" |
8467 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 8468 | |
a5cd71ca | 8469 | #: builtin/add.c:234 builtin/rev-parse.c:897 |
a0b6b246 JX |
8470 | msgid "Could not read the index" |
8471 | msgstr "不能读取索引" | |
1b7f4a34 | 8472 | |
06991777 | 8473 | #: builtin/add.c:245 |
a0b6b246 JX |
8474 | #, c-format |
8475 | msgid "Could not open '%s' for writing." | |
c1ac5258 | 8476 | msgstr "无法为写入打开 '%s'。" |
1b7f4a34 | 8477 | |
06991777 | 8478 | #: builtin/add.c:249 |
a0b6b246 JX |
8479 | msgid "Could not write patch" |
8480 | msgstr "不能生成补丁" | |
1b7f4a34 | 8481 | |
06991777 | 8482 | #: builtin/add.c:252 |
a0b6b246 JX |
8483 | msgid "editing patch failed" |
8484 | msgstr "编辑补丁失败" | |
1b7f4a34 | 8485 | |
06991777 | 8486 | #: builtin/add.c:255 |
1b7f4a34 | 8487 | #, c-format |
a0b6b246 | 8488 | msgid "Could not stat '%s'" |
65e2041e | 8489 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 8490 | |
06991777 | 8491 | #: builtin/add.c:257 |
a0b6b246 JX |
8492 | msgid "Empty patch. Aborted." |
8493 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 8494 | |
06991777 | 8495 | #: builtin/add.c:262 |
a0b6b246 JX |
8496 | #, c-format |
8497 | msgid "Could not apply '%s'" | |
8498 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 8499 | |
06991777 | 8500 | #: builtin/add.c:270 |
a0b6b246 JX |
8501 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
8502 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 8503 | |
a5cd71ca JX |
8504 | #: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 |
8505 | #: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 | |
06991777 | 8506 | #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 |
a0b6b246 JX |
8507 | msgid "dry run" |
8508 | msgstr "演习" | |
8ada9598 | 8509 | |
06991777 | 8510 | #: builtin/add.c:293 |
a0b6b246 JX |
8511 | msgid "interactive picking" |
8512 | msgstr "交互式拣选" | |
8ada9598 | 8513 | |
a6cd2cc4 | 8514 | #: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 |
a0b6b246 JX |
8515 | msgid "select hunks interactively" |
8516 | msgstr "交互式挑选数据块" | |
8ada9598 | 8517 | |
06991777 | 8518 | #: builtin/add.c:295 |
a0b6b246 JX |
8519 | msgid "edit current diff and apply" |
8520 | msgstr "编辑当前差异并应用" | |
8ada9598 | 8521 | |
06991777 | 8522 | #: builtin/add.c:296 |
a0b6b246 JX |
8523 | msgid "allow adding otherwise ignored files" |
8524 | msgstr "允许添加忽略的文件" | |
8ada9598 | 8525 | |
06991777 | 8526 | #: builtin/add.c:297 |
a0b6b246 JX |
8527 | msgid "update tracked files" |
8528 | msgstr "更新已跟踪的文件" | |
8ada9598 | 8529 | |
06991777 | 8530 | #: builtin/add.c:298 |
5809aa05 JX |
8531 | msgid "renormalize EOL of tracked files (implies -u)" |
8532 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
8533 | ||
06991777 | 8534 | #: builtin/add.c:299 |
a0b6b246 JX |
8535 | msgid "record only the fact that the path will be added later" |
8536 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 8537 | |
06991777 | 8538 | #: builtin/add.c:300 |
a0b6b246 JX |
8539 | msgid "add changes from all tracked and untracked files" |
8540 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 8541 | |
06991777 | 8542 | #: builtin/add.c:303 |
a0b6b246 JX |
8543 | msgid "ignore paths removed in the working tree (same as --no-all)" |
8544 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 8545 | |
06991777 | 8546 | #: builtin/add.c:305 |
a0b6b246 JX |
8547 | msgid "don't add, only refresh the index" |
8548 | msgstr "不添加,只刷新索引" | |
8ada9598 | 8549 | |
06991777 | 8550 | #: builtin/add.c:306 |
a0b6b246 JX |
8551 | msgid "just skip files which cannot be added because of errors" |
8552 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 8553 | |
06991777 | 8554 | #: builtin/add.c:307 |
a0b6b246 JX |
8555 | msgid "check if - even missing - files are ignored in dry run" |
8556 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 8557 | |
a5cd71ca | 8558 | #: builtin/add.c:309 builtin/update-index.c:1002 |
a0b6b246 JX |
8559 | msgid "override the executable bit of the listed files" |
8560 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 8561 | |
06991777 | 8562 | #: builtin/add.c:311 |
a4f16749 JX |
8563 | msgid "warn when adding an embedded repository" |
8564 | msgstr "创建一个嵌入式仓库时给予警告" | |
8565 | ||
06991777 | 8566 | #: builtin/add.c:326 |
a4f16749 JX |
8567 | #, c-format |
8568 | msgid "" | |
8569 | "You've added another git repository inside your current repository.\n" | |
8570 | "Clones of the outer repository will not contain the contents of\n" | |
8571 | "the embedded repository and will not know how to obtain it.\n" | |
8572 | "If you meant to add a submodule, use:\n" | |
8573 | "\n" | |
8574 | "\tgit submodule add <url> %s\n" | |
8575 | "\n" | |
8576 | "If you added this path by mistake, you can remove it from the\n" | |
8577 | "index with:\n" | |
8578 | "\n" | |
8579 | "\tgit rm --cached %s\n" | |
8580 | "\n" | |
8581 | "See \"git help submodule\" for more information." | |
8582 | msgstr "" | |
6937cb4e JX |
8583 | "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并" |
8584 | "且不知道该如何获取它。\n" | |
a4f16749 JX |
8585 | "如果您要添加一个子模组,使用:\n" |
8586 | "\n" | |
8587 | "\tgit submodule add <url> %s\n" | |
8588 | "\n" | |
8589 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
8590 | "\n" | |
8591 | "\tgit rm --cached %s\n" | |
8592 | "\n" | |
8593 | "参见 \"git help submodule\" 获取更多信息。" | |
8594 | ||
06991777 | 8595 | #: builtin/add.c:354 |
a4f16749 JX |
8596 | #, c-format |
8597 | msgid "adding embedded git repository: %s" | |
8598 | msgstr "正在添加嵌入式 git 仓库:%s" | |
8599 | ||
06991777 | 8600 | #: builtin/add.c:372 |
8ada9598 | 8601 | #, c-format |
a0b6b246 JX |
8602 | msgid "Use -f if you really want to add them.\n" |
8603 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 8604 | |
d46c5519 | 8605 | #: builtin/add.c:379 |
a0b6b246 JX |
8606 | msgid "adding files failed" |
8607 | msgstr "添加文件失败" | |
8ada9598 | 8608 | |
d46c5519 | 8609 | #: builtin/add.c:419 |
a0b6b246 JX |
8610 | msgid "-A and -u are mutually incompatible" |
8611 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 8612 | |
d46c5519 | 8613 | #: builtin/add.c:426 |
a0b6b246 JX |
8614 | msgid "Option --ignore-missing can only be used together with --dry-run" |
8615 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 8616 | |
d46c5519 | 8617 | #: builtin/add.c:430 |
8ada9598 | 8618 | #, c-format |
a0b6b246 JX |
8619 | msgid "--chmod param '%s' must be either -x or +x" |
8620 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 8621 | |
d46c5519 | 8622 | #: builtin/add.c:445 |
8ada9598 | 8623 | #, c-format |
a0b6b246 JX |
8624 | msgid "Nothing specified, nothing added.\n" |
8625 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 8626 | |
d46c5519 | 8627 | #: builtin/add.c:446 |
8ada9598 | 8628 | #, c-format |
a0b6b246 JX |
8629 | msgid "Maybe you wanted to say 'git add .'?\n" |
8630 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 8631 | |
a5cd71ca | 8632 | #: builtin/am.c:347 |
a0b6b246 JX |
8633 | msgid "could not parse author script" |
8634 | msgstr "不能解析作者脚本" | |
8ada9598 | 8635 | |
a5cd71ca | 8636 | #: builtin/am.c:431 |
81809b99 | 8637 | #, c-format |
a0b6b246 JX |
8638 | msgid "'%s' was deleted by the applypatch-msg hook" |
8639 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 8640 | |
a5cd71ca | 8641 | #: builtin/am.c:473 |
8ada9598 | 8642 | #, c-format |
a0b6b246 JX |
8643 | msgid "Malformed input line: '%s'." |
8644 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 8645 | |
a5cd71ca | 8646 | #: builtin/am.c:511 |
8ada9598 | 8647 | #, c-format |
a0b6b246 JX |
8648 | msgid "Failed to copy notes from '%s' to '%s'" |
8649 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 8650 | |
a5cd71ca | 8651 | #: builtin/am.c:537 |
a0b6b246 JX |
8652 | msgid "fseek failed" |
8653 | msgstr "fseek 失败" | |
8ada9598 | 8654 | |
a5cd71ca | 8655 | #: builtin/am.c:725 |
8ada9598 | 8656 | #, c-format |
a0b6b246 JX |
8657 | msgid "could not parse patch '%s'" |
8658 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 8659 | |
a5cd71ca | 8660 | #: builtin/am.c:790 |
a0b6b246 JX |
8661 | msgid "Only one StGIT patch series can be applied at once" |
8662 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
8663 | ||
a5cd71ca | 8664 | #: builtin/am.c:838 |
a0b6b246 JX |
8665 | msgid "invalid timestamp" |
8666 | msgstr "无效的时间戳" | |
8667 | ||
a5cd71ca | 8668 | #: builtin/am.c:843 builtin/am.c:855 |
a0b6b246 JX |
8669 | msgid "invalid Date line" |
8670 | msgstr "无效的日期行" | |
8ada9598 | 8671 | |
a5cd71ca | 8672 | #: builtin/am.c:850 |
a0b6b246 JX |
8673 | msgid "invalid timezone offset" |
8674 | msgstr "无效的时区偏移值" | |
8ada9598 | 8675 | |
a5cd71ca | 8676 | #: builtin/am.c:943 |
a0b6b246 | 8677 | msgid "Patch format detection failed." |
87cb7997 | 8678 | msgstr "补丁格式探测失败。" |
8ada9598 | 8679 | |
a5cd71ca | 8680 | #: builtin/am.c:948 builtin/clone.c:406 |
8ada9598 | 8681 | #, c-format |
a0b6b246 | 8682 | msgid "failed to create directory '%s'" |
c1ac5258 | 8683 | msgstr "创建目录 '%s' 失败" |
8ada9598 | 8684 | |
a5cd71ca | 8685 | #: builtin/am.c:953 |
a0b6b246 | 8686 | msgid "Failed to split patches." |
c1ac5258 | 8687 | msgstr "拆分补丁失败。" |
814ff314 | 8688 | |
a5cd71ca | 8689 | #: builtin/am.c:1084 |
8ada9598 | 8690 | #, c-format |
a0b6b246 JX |
8691 | msgid "When you have resolved this problem, run \"%s --continue\"." |
8692 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 8693 | |
a5cd71ca | 8694 | #: builtin/am.c:1085 |
81809b99 | 8695 | #, c-format |
a0b6b246 JX |
8696 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
8697 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 8698 | |
a5cd71ca | 8699 | #: builtin/am.c:1086 |
81809b99 | 8700 | #, c-format |
a0b6b246 JX |
8701 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
8702 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 8703 | |
a5cd71ca | 8704 | #: builtin/am.c:1169 |
4c27fcb5 JX |
8705 | msgid "Patch sent with format=flowed; space at the end of lines might be lost." |
8706 | msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。" | |
8707 | ||
a5cd71ca | 8708 | #: builtin/am.c:1197 |
a4f16749 JX |
8709 | msgid "Patch is empty." |
8710 | msgstr "补丁为空。" | |
23ff3338 | 8711 | |
a5cd71ca JX |
8712 | #: builtin/am.c:1262 |
8713 | #, c-format | |
8714 | msgid "missing author line in commit %s" | |
8715 | msgstr "在提交 %s 中缺失作者行" | |
8716 | ||
8717 | #: builtin/am.c:1265 | |
8ada9598 | 8718 | #, c-format |
a4f16749 JX |
8719 | msgid "invalid ident line: %.*s" |
8720 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 8721 | |
a5cd71ca | 8722 | #: builtin/am.c:1484 |
a0b6b246 JX |
8723 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
8724 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 8725 | |
a5cd71ca | 8726 | #: builtin/am.c:1486 |
a0b6b246 JX |
8727 | msgid "Using index info to reconstruct a base tree..." |
8728 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 8729 | |
a5cd71ca | 8730 | #: builtin/am.c:1505 |
a0b6b246 JX |
8731 | msgid "" |
8732 | "Did you hand edit your patch?\n" | |
8733 | "It does not apply to blobs recorded in its index." | |
8734 | msgstr "" | |
8735 | "您是否曾手动编辑过您的补丁?\n" | |
8736 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 8737 | |
a5cd71ca | 8738 | #: builtin/am.c:1511 |
a0b6b246 JX |
8739 | msgid "Falling back to patching base and 3-way merge..." |
8740 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 8741 | |
a5cd71ca | 8742 | #: builtin/am.c:1537 |
a0b6b246 JX |
8743 | msgid "Failed to merge in the changes." |
8744 | msgstr "无法合并变更。" | |
d691f479 | 8745 | |
a5cd71ca | 8746 | #: builtin/am.c:1569 |
a0b6b246 JX |
8747 | msgid "applying to an empty history" |
8748 | msgstr "正应用到一个空历史上" | |
8ada9598 | 8749 | |
a5cd71ca | 8750 | #: builtin/am.c:1616 builtin/am.c:1620 |
8ada9598 | 8751 | #, c-format |
a0b6b246 JX |
8752 | msgid "cannot resume: %s does not exist." |
8753 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 8754 | |
a5cd71ca | 8755 | #: builtin/am.c:1638 |
a0b6b246 JX |
8756 | msgid "Commit Body is:" |
8757 | msgstr "提交内容为:" | |
8ada9598 | 8758 | |
a0b6b246 JX |
8759 | # 译者:注意保持句尾空格 |
8760 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
8761 | #. in your translation. The program will only accept English | |
8762 | #. input at this point. | |
8763 | #. | |
a5cd71ca | 8764 | #: builtin/am.c:1648 |
a6cd2cc4 | 8765 | #, c-format |
a0b6b246 JX |
8766 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
8767 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 8768 | |
a5cd71ca JX |
8769 | #: builtin/am.c:1695 builtin/commit.c:374 |
8770 | msgid "unable to write index file" | |
8771 | msgstr "无法写入索引文件" | |
8772 | ||
8773 | #: builtin/am.c:1699 | |
8ada9598 | 8774 | #, c-format |
a0b6b246 JX |
8775 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
8776 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 8777 | |
a5cd71ca | 8778 | #: builtin/am.c:1739 builtin/am.c:1807 |
81809b99 | 8779 | #, c-format |
a0b6b246 JX |
8780 | msgid "Applying: %.*s" |
8781 | msgstr "应用:%.*s" | |
8ada9598 | 8782 | |
a5cd71ca | 8783 | #: builtin/am.c:1756 |
a0b6b246 JX |
8784 | msgid "No changes -- Patch already applied." |
8785 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 8786 | |
a5cd71ca | 8787 | #: builtin/am.c:1762 |
81809b99 | 8788 | #, c-format |
a0b6b246 JX |
8789 | msgid "Patch failed at %s %.*s" |
8790 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 8791 | |
a5cd71ca | 8792 | #: builtin/am.c:1766 |
31e5e17b JX |
8793 | msgid "Use 'git am --show-current-patch' to see the failed patch" |
8794 | msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" | |
8ada9598 | 8795 | |
a5cd71ca | 8796 | #: builtin/am.c:1810 |
a0b6b246 JX |
8797 | msgid "" |
8798 | "No changes - did you forget to use 'git add'?\n" | |
8799 | "If there is nothing left to stage, chances are that something else\n" | |
8800 | "already introduced the same changes; you might want to skip this patch." | |
8801 | msgstr "" | |
8802 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
8803 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
8804 | "您也许想要跳过这个补丁。" | |
8ada9598 | 8805 | |
a5cd71ca | 8806 | #: builtin/am.c:1817 |
a0b6b246 JX |
8807 | msgid "" |
8808 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
8809 | "You should 'git add' each file with resolved conflicts to mark them as " |
8810 | "such.\n" | |
8811 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 8812 | msgstr "" |
a4f16749 JX |
8813 | "在您的索引中仍存在未合并的路径。\n" |
8814 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
8815 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 8816 | |
a5cd71ca | 8817 | #: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 |
06991777 | 8818 | #: builtin/reset.c:337 |
8ada9598 | 8819 | #, c-format |
a0b6b246 JX |
8820 | msgid "Could not parse object '%s'." |
8821 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 8822 | |
a5cd71ca | 8823 | #: builtin/am.c:1976 |
a0b6b246 | 8824 | msgid "failed to clean index" |
c1ac5258 | 8825 | msgstr "清空索引失败" |
5b04ee3b | 8826 | |
a5cd71ca | 8827 | #: builtin/am.c:2020 |
a0b6b246 JX |
8828 | msgid "" |
8829 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
8830 | "Not rewinding to ORIG_HEAD" | |
8831 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 8832 | |
a5cd71ca | 8833 | #: builtin/am.c:2117 |
8ada9598 | 8834 | #, c-format |
a0b6b246 JX |
8835 | msgid "Invalid value for --patch-format: %s" |
8836 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 8837 | |
a5cd71ca | 8838 | #: builtin/am.c:2153 |
a0b6b246 JX |
8839 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
8840 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 8841 | |
a5cd71ca | 8842 | #: builtin/am.c:2154 |
a0b6b246 JX |
8843 | msgid "git am [<options>] (--continue | --skip | --abort)" |
8844 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 8845 | |
a5cd71ca | 8846 | #: builtin/am.c:2160 |
a0b6b246 JX |
8847 | msgid "run interactively" |
8848 | msgstr "以交互式方式运行" | |
8ada9598 | 8849 | |
a5cd71ca | 8850 | #: builtin/am.c:2162 |
a0b6b246 JX |
8851 | msgid "historical option -- no-op" |
8852 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 8853 | |
a5cd71ca | 8854 | #: builtin/am.c:2164 |
a0b6b246 JX |
8855 | msgid "allow fall back on 3way merging if needed" |
8856 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 8857 | |
a5cd71ca JX |
8858 | #: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 |
8859 | #: builtin/repack.c:297 builtin/stash.c:812 | |
a0b6b246 JX |
8860 | msgid "be quiet" |
8861 | msgstr "静默模式" | |
8ada9598 | 8862 | |
a5cd71ca | 8863 | #: builtin/am.c:2167 |
a0b6b246 JX |
8864 | msgid "add a Signed-off-by line to the commit message" |
8865 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 8866 | |
a5cd71ca | 8867 | #: builtin/am.c:2170 |
a0b6b246 JX |
8868 | msgid "recode into utf8 (default)" |
8869 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 8870 | |
a5cd71ca | 8871 | #: builtin/am.c:2172 |
a0b6b246 JX |
8872 | msgid "pass -k flag to git-mailinfo" |
8873 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 8874 | |
a5cd71ca | 8875 | #: builtin/am.c:2174 |
a0b6b246 JX |
8876 | msgid "pass -b flag to git-mailinfo" |
8877 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 8878 | |
a5cd71ca | 8879 | #: builtin/am.c:2176 |
a0b6b246 JX |
8880 | msgid "pass -m flag to git-mailinfo" |
8881 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 8882 | |
a5cd71ca | 8883 | #: builtin/am.c:2178 |
a0b6b246 JX |
8884 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
8885 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 8886 | |
a5cd71ca | 8887 | #: builtin/am.c:2181 |
a0b6b246 JX |
8888 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
8889 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 8890 | |
a5cd71ca | 8891 | #: builtin/am.c:2184 |
a0b6b246 JX |
8892 | msgid "strip everything before a scissors line" |
8893 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 8894 | |
a5cd71ca JX |
8895 | #: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 |
8896 | #: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 | |
8897 | #: builtin/am.c:2213 | |
a0b6b246 JX |
8898 | msgid "pass it through git-apply" |
8899 | msgstr "传递给 git-apply" | |
8ada9598 | 8900 | |
a5cd71ca JX |
8901 | #: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 |
8902 | #: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 | |
8903 | #: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 | |
8904 | #: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 | |
a6cd2cc4 | 8905 | #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 |
a5cd71ca | 8906 | #: parse-options.h:150 parse-options.h:171 parse-options.h:312 |
a0b6b246 JX |
8907 | msgid "n" |
8908 | msgstr "n" | |
8ada9598 | 8909 | |
a5cd71ca JX |
8910 | #: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 |
8911 | #: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 | |
a0b6b246 JX |
8912 | msgid "format" |
8913 | msgstr "格式" | |
8ada9598 | 8914 | |
a5cd71ca | 8915 | #: builtin/am.c:2210 |
a0b6b246 JX |
8916 | msgid "format the patch(es) are in" |
8917 | msgstr "补丁的格式" | |
8ada9598 | 8918 | |
a5cd71ca | 8919 | #: builtin/am.c:2216 |
a0b6b246 JX |
8920 | msgid "override error message when patch failure occurs" |
8921 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 8922 | |
a5cd71ca | 8923 | #: builtin/am.c:2218 |
a0b6b246 JX |
8924 | msgid "continue applying patches after resolving a conflict" |
8925 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 8926 | |
a5cd71ca | 8927 | #: builtin/am.c:2221 |
a0b6b246 JX |
8928 | msgid "synonyms for --continue" |
8929 | msgstr "和 --continue 同义" | |
8ada9598 | 8930 | |
a5cd71ca | 8931 | #: builtin/am.c:2224 |
a0b6b246 JX |
8932 | msgid "skip the current patch" |
8933 | msgstr "跳过当前补丁" | |
23ff3338 | 8934 | |
a5cd71ca | 8935 | #: builtin/am.c:2227 |
a0b6b246 JX |
8936 | msgid "restore the original branch and abort the patching operation." |
8937 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 8938 | |
a5cd71ca | 8939 | #: builtin/am.c:2230 |
31e5e17b JX |
8940 | msgid "abort the patching operation but keep HEAD where it is." |
8941 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
8942 | ||
a5cd71ca | 8943 | #: builtin/am.c:2233 |
31e5e17b JX |
8944 | msgid "show the patch being applied." |
8945 | msgstr "显示正在应用的补丁。" | |
8946 | ||
a5cd71ca | 8947 | #: builtin/am.c:2237 |
a0b6b246 JX |
8948 | msgid "lie about committer date" |
8949 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 8950 | |
a5cd71ca | 8951 | #: builtin/am.c:2239 |
a0b6b246 JX |
8952 | msgid "use current timestamp for author date" |
8953 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 8954 | |
a5cd71ca JX |
8955 | #: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 |
8956 | #: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 | |
8957 | #: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 | |
a0b6b246 JX |
8958 | msgid "key-id" |
8959 | msgstr "key-id" | |
8ada9598 | 8960 | |
a5cd71ca | 8961 | #: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 |
a0b6b246 JX |
8962 | msgid "GPG-sign commits" |
8963 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 8964 | |
a5cd71ca | 8965 | #: builtin/am.c:2245 |
a0b6b246 JX |
8966 | msgid "(internal use for git-rebase)" |
8967 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 8968 | |
a5cd71ca | 8969 | #: builtin/am.c:2263 |
a0b6b246 JX |
8970 | msgid "" |
8971 | "The -b/--binary option has been a no-op for long time, and\n" | |
8972 | "it will be removed. Please do not use it anymore." | |
8973 | msgstr "" | |
8974 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
8975 | "请不要再使用它了。" | |
8ada9598 | 8976 | |
a5cd71ca | 8977 | #: builtin/am.c:2270 |
a0b6b246 | 8978 | msgid "failed to read the index" |
c1ac5258 | 8979 | msgstr "读取索引失败" |
8ada9598 | 8980 | |
a5cd71ca | 8981 | #: builtin/am.c:2285 |
a0b6b246 JX |
8982 | #, c-format |
8983 | msgid "previous rebase directory %s still exists but mbox given." | |
8984 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 8985 | |
a5cd71ca | 8986 | #: builtin/am.c:2309 |
a0b6b246 JX |
8987 | #, c-format |
8988 | msgid "" | |
8989 | "Stray %s directory found.\n" | |
8990 | "Use \"git am --abort\" to remove it." | |
8991 | msgstr "" | |
8992 | "发现了错误的 %s 目录。\n" | |
8993 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 8994 | |
a5cd71ca | 8995 | #: builtin/am.c:2315 |
a0b6b246 JX |
8996 | msgid "Resolve operation not in progress, we are not resuming." |
8997 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 8998 | |
a5cd71ca | 8999 | #: builtin/am.c:2325 |
a6cd2cc4 JX |
9000 | msgid "interactive mode requires patches on the command line" |
9001 | msgstr "交互式模式需要命令行上提供补丁" | |
9002 | ||
a0b6b246 JX |
9003 | #: builtin/apply.c:8 |
9004 | msgid "git apply [<options>] [<patch>...]" | |
9005 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 9006 | |
c04f5ac3 JX |
9007 | #: builtin/archive.c:17 |
9008 | #, c-format | |
9009 | msgid "could not create archive file '%s'" | |
90e6ef53 | 9010 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
9011 | |
9012 | #: builtin/archive.c:20 | |
9013 | msgid "could not redirect output" | |
195febda | 9014 | msgstr "不能重定向输出" |
c04f5ac3 JX |
9015 | |
9016 | #: builtin/archive.c:37 | |
9017 | msgid "git archive: Remote with no URL" | |
4375c10e | 9018 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 | 9019 | |
06991777 | 9020 | #: builtin/archive.c:61 |
31e5e17b JX |
9021 | msgid "git archive: expected ACK/NAK, got a flush packet" |
9022 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 9023 | |
06991777 | 9024 | #: builtin/archive.c:64 |
c04f5ac3 JX |
9025 | #, c-format |
9026 | msgid "git archive: NACK %s" | |
90e6ef53 | 9027 | msgstr "git archive:NACK %s" |
c04f5ac3 | 9028 | |
06991777 | 9029 | #: builtin/archive.c:65 |
c04f5ac3 | 9030 | msgid "git archive: protocol error" |
90e6ef53 | 9031 | msgstr "git archive:协议错误" |
c04f5ac3 | 9032 | |
06991777 | 9033 | #: builtin/archive.c:69 |
c04f5ac3 | 9034 | msgid "git archive: expected a flush" |
31e5e17b | 9035 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 9036 | |
06991777 | 9037 | #: builtin/bisect--helper.c:22 |
ef317cd5 | 9038 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 9039 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 9040 | |
06991777 | 9041 | #: builtin/bisect--helper.c:23 |
5809aa05 JX |
9042 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" |
9043 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
9044 | ||
06991777 | 9045 | #: builtin/bisect--helper.c:24 |
5809aa05 JX |
9046 | msgid "git bisect--helper --bisect-clean-state" |
9047 | msgstr "git bisect--helper --bisect-clean-state" | |
9048 | ||
06991777 JX |
9049 | #: builtin/bisect--helper.c:25 |
9050 | msgid "git bisect--helper --bisect-reset [<commit>]" | |
9051 | msgstr "git bisect--helper --bisect-reset [<提交>]" | |
9052 | ||
9053 | #: builtin/bisect--helper.c:26 | |
9054 | msgid "" | |
9055 | "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " | |
9056 | "<bad_term>" | |
9057 | msgstr "" | |
9058 | "git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语" | |
9059 | ">" | |
9060 | ||
9061 | #: builtin/bisect--helper.c:27 | |
9062 | msgid "" | |
9063 | "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " | |
9064 | "<bad_term>" | |
9065 | msgstr "" | |
9066 | "git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>" | |
9067 | ||
9068 | #: builtin/bisect--helper.c:28 | |
9069 | msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" | |
9070 | msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" | |
9071 | ||
9072 | #: builtin/bisect--helper.c:29 | |
9073 | msgid "" | |
9074 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
9075 | "term-new]" | |
9076 | msgstr "" | |
9077 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
9078 | "term-new]" | |
9079 | ||
9080 | #: builtin/bisect--helper.c:30 | |
9081 | msgid "" | |
9082 | "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" | |
9083 | "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" | |
9084 | msgstr "" | |
9085 | "git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}" | |
9086 | "=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]" | |
9087 | ||
9088 | #: builtin/bisect--helper.c:86 | |
5809aa05 JX |
9089 | #, c-format |
9090 | msgid "'%s' is not a valid term" | |
9091 | msgstr "'%s' 不是一个有效的术语" | |
9092 | ||
06991777 | 9093 | #: builtin/bisect--helper.c:90 |
5809aa05 JX |
9094 | #, c-format |
9095 | msgid "can't use the builtin command '%s' as a term" | |
9096 | msgstr "不能使用内置命令 '%s' 作为术语" | |
9097 | ||
06991777 | 9098 | #: builtin/bisect--helper.c:100 |
5809aa05 JX |
9099 | #, c-format |
9100 | msgid "can't change the meaning of the term '%s'" | |
9101 | msgstr "不能修改术语 '%s' 的含义" | |
9102 | ||
06991777 | 9103 | #: builtin/bisect--helper.c:111 |
5809aa05 JX |
9104 | msgid "please use two different terms" |
9105 | msgstr "请使用两个不同的术语" | |
9106 | ||
06991777 | 9107 | #: builtin/bisect--helper.c:118 |
5809aa05 JX |
9108 | msgid "could not open the file BISECT_TERMS" |
9109 | msgstr "不能打开文件 BISECT_TERMS" | |
9110 | ||
06991777 JX |
9111 | #: builtin/bisect--helper.c:155 |
9112 | #, c-format | |
9113 | msgid "We are not bisecting.\n" | |
9114 | msgstr "我们没有在二分查找。\n" | |
9115 | ||
9116 | #: builtin/bisect--helper.c:163 | |
9117 | #, c-format | |
9118 | msgid "'%s' is not a valid commit" | |
9119 | msgstr "'%s' 不是一个有效的提交" | |
9120 | ||
9121 | #: builtin/bisect--helper.c:174 | |
9122 | #, c-format | |
9123 | msgid "" | |
9124 | "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." | |
9125 | msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" | |
9126 | ||
9127 | #: builtin/bisect--helper.c:215 | |
9128 | #, c-format | |
9129 | msgid "Bad bisect_write argument: %s" | |
9130 | msgstr "坏的 bisect_write 参数:%s" | |
9131 | ||
9132 | #: builtin/bisect--helper.c:220 | |
9133 | #, c-format | |
9134 | msgid "couldn't get the oid of the rev '%s'" | |
5b533632 | 9135 | msgstr "无法获取版本 '%s' 的对象 ID" |
06991777 JX |
9136 | |
9137 | #: builtin/bisect--helper.c:232 | |
9138 | #, c-format | |
9139 | msgid "couldn't open the file '%s'" | |
9140 | msgstr "无法打开文件 '%s'" | |
9141 | ||
9142 | #: builtin/bisect--helper.c:258 | |
9143 | #, c-format | |
9144 | msgid "Invalid command: you're currently in a %s/%s bisect" | |
9145 | msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中" | |
9146 | ||
9147 | #: builtin/bisect--helper.c:285 | |
9148 | #, c-format | |
9149 | msgid "" | |
9150 | "You need to give me at least one %s and %s revision.\n" | |
9151 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
9152 | msgstr "" | |
9153 | "您需要给我至少一个 %s 和一个 %s 版本。\n" | |
9154 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" | |
9155 | ||
9156 | #: builtin/bisect--helper.c:289 | |
9157 | #, c-format | |
9158 | msgid "" | |
9159 | "You need to start by \"git bisect start\".\n" | |
9160 | "You then need to give me at least one %s and %s revision.\n" | |
9161 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
9162 | msgstr "" | |
9163 | "您需要执行 \"git bisect start\" 来开始。\n" | |
9164 | "然后需要提供我至少一个 %s 和一个 %s 版本。\n" | |
9165 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" | |
9166 | ||
9167 | #: builtin/bisect--helper.c:321 | |
9168 | #, c-format | |
9169 | msgid "bisecting only with a %s commit" | |
5b533632 | 9170 | msgstr "在只有一个 %s 提交的情况下二分查找" |
06991777 JX |
9171 | |
9172 | # 译者:注意保持句尾空格 | |
9173 | #. TRANSLATORS: Make sure to include [Y] and [n] in your | |
9174 | #. translation. The program will only accept English input | |
9175 | #. at this point. | |
9176 | #. | |
9177 | #: builtin/bisect--helper.c:329 | |
9178 | msgid "Are you sure [Y/n]? " | |
9179 | msgstr "您确认么[Y/n]? " | |
9180 | ||
9181 | #: builtin/bisect--helper.c:376 | |
9182 | msgid "no terms defined" | |
9183 | msgstr "未定义术语" | |
9184 | ||
9185 | #: builtin/bisect--helper.c:379 | |
9186 | #, c-format | |
9187 | msgid "" | |
9188 | "Your current terms are %s for the old state\n" | |
9189 | "and %s for the new state.\n" | |
9190 | msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n" | |
9191 | ||
9192 | #: builtin/bisect--helper.c:389 | |
9193 | #, c-format | |
9194 | msgid "" | |
9195 | "invalid argument %s for 'git bisect terms'.\n" | |
9196 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
9197 | msgstr "" | |
9198 | "命令 'git bisect terms' 的参数 %s 无效。\n" | |
9199 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
9200 | ||
9201 | #: builtin/bisect--helper.c:475 | |
9202 | #, c-format | |
9203 | msgid "unrecognized option: '%s'" | |
9204 | msgstr "未识别的选项:'%s'" | |
9205 | ||
9206 | #: builtin/bisect--helper.c:479 | |
9207 | #, c-format | |
9208 | msgid "'%s' does not appear to be a valid revision" | |
8e4e0555 | 9209 | msgstr "'%s' 看起来不是一个有效的版本" |
06991777 JX |
9210 | |
9211 | #: builtin/bisect--helper.c:511 | |
9212 | msgid "bad HEAD - I need a HEAD" | |
9213 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
9214 | ||
9215 | #: builtin/bisect--helper.c:526 | |
9216 | #, c-format | |
9217 | msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." | |
9218 | msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" | |
9219 | ||
9220 | #: builtin/bisect--helper.c:547 | |
9221 | msgid "won't bisect on cg-seek'ed tree" | |
9222 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
9223 | ||
9224 | #: builtin/bisect--helper.c:550 | |
9225 | msgid "bad HEAD - strange symbolic ref" | |
9226 | msgstr "坏的 HEAD - 奇怪的符号引用" | |
9227 | ||
a6cd2cc4 JX |
9228 | #: builtin/bisect--helper.c:574 |
9229 | #, c-format | |
9230 | msgid "invalid ref: '%s'" | |
9231 | msgstr "无效的引用:'%s'" | |
9232 | ||
9233 | #: builtin/bisect--helper.c:630 | |
ef317cd5 | 9234 | msgid "perform 'git bisect next'" |
07432cef | 9235 | msgstr "执行 'git bisect next'" |
ef317cd5 | 9236 | |
a6cd2cc4 | 9237 | #: builtin/bisect--helper.c:632 |
5809aa05 JX |
9238 | msgid "write the terms to .git/BISECT_TERMS" |
9239 | msgstr "将术语写入 .git/BISECT_TERMS" | |
9240 | ||
a6cd2cc4 | 9241 | #: builtin/bisect--helper.c:634 |
5809aa05 JX |
9242 | msgid "cleanup the bisection state" |
9243 | msgstr "清除二分查找状态" | |
9244 | ||
a6cd2cc4 | 9245 | #: builtin/bisect--helper.c:636 |
5809aa05 JX |
9246 | msgid "check for expected revs" |
9247 | msgstr "检查预期的版本" | |
9248 | ||
a6cd2cc4 | 9249 | #: builtin/bisect--helper.c:638 |
06991777 JX |
9250 | msgid "reset the bisection state" |
9251 | msgstr "清除二分查找状态" | |
9252 | ||
a6cd2cc4 | 9253 | #: builtin/bisect--helper.c:640 |
06991777 JX |
9254 | msgid "write out the bisection state in BISECT_LOG" |
9255 | msgstr "将二分查找的状态写入 BISECT_LOG" | |
9256 | ||
a6cd2cc4 | 9257 | #: builtin/bisect--helper.c:642 |
06991777 JX |
9258 | msgid "check and set terms in a bisection state" |
9259 | msgstr "在一个二分查找状态中检查和设置术语" | |
9260 | ||
a6cd2cc4 | 9261 | #: builtin/bisect--helper.c:644 |
06991777 JX |
9262 | msgid "check whether bad or good terms exist" |
9263 | msgstr "检查坏的或好的术语是否存在" | |
9264 | ||
a6cd2cc4 | 9265 | #: builtin/bisect--helper.c:646 |
06991777 JX |
9266 | msgid "print out the bisect terms" |
9267 | msgstr "打印二分查找术语" | |
9268 | ||
a6cd2cc4 | 9269 | #: builtin/bisect--helper.c:648 |
06991777 | 9270 | msgid "start the bisect session" |
5b533632 | 9271 | msgstr "启动二分查找过程" |
06991777 | 9272 | |
a6cd2cc4 | 9273 | #: builtin/bisect--helper.c:650 |
ef317cd5 | 9274 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 9275 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 9276 | |
a6cd2cc4 | 9277 | #: builtin/bisect--helper.c:652 |
06991777 JX |
9278 | msgid "no log for BISECT_WRITE" |
9279 | msgstr "BISECT_WRITE 无日志" | |
9280 | ||
a6cd2cc4 | 9281 | #: builtin/bisect--helper.c:669 |
5809aa05 JX |
9282 | msgid "--write-terms requires two arguments" |
9283 | msgstr "--write-terms 需要两个参数" | |
9284 | ||
a6cd2cc4 | 9285 | #: builtin/bisect--helper.c:673 |
5809aa05 | 9286 | msgid "--bisect-clean-state requires no arguments" |
8e4e0555 | 9287 | msgstr "--bisect-clean-state 不带参数" |
5809aa05 | 9288 | |
a6cd2cc4 | 9289 | #: builtin/bisect--helper.c:680 |
06991777 JX |
9290 | msgid "--bisect-reset requires either no argument or a commit" |
9291 | msgstr "--bisect-reset 无需参数或者需要一个提交" | |
9292 | ||
a6cd2cc4 | 9293 | #: builtin/bisect--helper.c:684 |
06991777 JX |
9294 | msgid "--bisect-write requires either 4 or 5 arguments" |
9295 | msgstr "--bisect-write 需要 4 或 5 个参数" | |
9296 | ||
a6cd2cc4 | 9297 | #: builtin/bisect--helper.c:690 |
06991777 JX |
9298 | msgid "--check-and-set-terms requires 3 arguments" |
9299 | msgstr "--check-and-set-terms 需要 3 个参数" | |
9300 | ||
a6cd2cc4 | 9301 | #: builtin/bisect--helper.c:696 |
06991777 JX |
9302 | msgid "--bisect-next-check requires 2 or 3 arguments" |
9303 | msgstr "--bisect-next-check 需要 2 或 3 个参数" | |
9304 | ||
a6cd2cc4 | 9305 | #: builtin/bisect--helper.c:702 |
06991777 JX |
9306 | msgid "--bisect-terms requires 0 or 1 argument" |
9307 | msgstr "--bisect-terms 需要 0 或 1 个参数" | |
9308 | ||
a5cd71ca | 9309 | #: builtin/blame.c:31 |
7aea43ff JX |
9310 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
9311 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 9312 | |
a5cd71ca | 9313 | #: builtin/blame.c:36 |
814ff314 JX |
9314 | msgid "<rev-opts> are documented in git-rev-list(1)" |
9315 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 9316 | |
a5cd71ca | 9317 | #: builtin/blame.c:409 |
fd8cb379 JX |
9318 | #, c-format |
9319 | msgid "expecting a color: %s" | |
9320 | msgstr "期望一个颜色:%s" | |
9321 | ||
a5cd71ca | 9322 | #: builtin/blame.c:416 |
fd8cb379 JX |
9323 | msgid "must end with a color" |
9324 | msgstr "必须以一个颜色结尾" | |
9325 | ||
a5cd71ca | 9326 | #: builtin/blame.c:729 |
fd8cb379 JX |
9327 | #, c-format |
9328 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
9329 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
9330 | ||
a5cd71ca | 9331 | #: builtin/blame.c:747 |
fd8cb379 JX |
9332 | msgid "invalid value for blame.coloring" |
9333 | msgstr "设置 blame.coloring 中的无效取值" | |
9334 | ||
a5cd71ca | 9335 | #: builtin/blame.c:822 |
a6cd2cc4 JX |
9336 | #, c-format |
9337 | msgid "cannot find revision %s to ignore" | |
9338 | msgstr "不能找到要忽略的版本 %s" | |
9339 | ||
a5cd71ca | 9340 | #: builtin/blame.c:844 |
ef317cd5 | 9341 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 9342 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 9343 | |
a5cd71ca | 9344 | #: builtin/blame.c:845 |
ef317cd5 | 9345 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 9346 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 9347 | |
a5cd71ca | 9348 | #: builtin/blame.c:846 |
ef317cd5 | 9349 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 9350 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 9351 | |
a5cd71ca | 9352 | #: builtin/blame.c:847 |
ef317cd5 | 9353 | msgid "Show work cost statistics" |
07432cef | 9354 | msgstr "显示命令消耗统计" |
ef317cd5 | 9355 | |
a5cd71ca | 9356 | #: builtin/blame.c:848 |
276ceeaa JX |
9357 | msgid "Force progress reporting" |
9358 | msgstr "强制进度显示" | |
9359 | ||
a5cd71ca | 9360 | #: builtin/blame.c:849 |
ef317cd5 | 9361 | msgid "Show output score for blame entries" |
07432cef | 9362 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 9363 | |
a5cd71ca | 9364 | #: builtin/blame.c:850 |
ef317cd5 | 9365 | msgid "Show original filename (Default: auto)" |
07432cef | 9366 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 9367 | |
a5cd71ca | 9368 | #: builtin/blame.c:851 |
ef317cd5 | 9369 | msgid "Show original linenumber (Default: off)" |
07432cef | 9370 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 9371 | |
a5cd71ca | 9372 | #: builtin/blame.c:852 |
ef317cd5 | 9373 | msgid "Show in a format designed for machine consumption" |
07432cef | 9374 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 9375 | |
a5cd71ca | 9376 | #: builtin/blame.c:853 |
ef317cd5 | 9377 | msgid "Show porcelain format with per-line commit information" |
07432cef | 9378 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 9379 | |
a5cd71ca | 9380 | #: builtin/blame.c:854 |
ef317cd5 | 9381 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 9382 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 9383 | |
a5cd71ca | 9384 | #: builtin/blame.c:855 |
ef317cd5 | 9385 | msgid "Show raw timestamp (Default: off)" |
07432cef | 9386 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 9387 | |
a5cd71ca | 9388 | #: builtin/blame.c:856 |
ef317cd5 | 9389 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 9390 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 9391 | |
a5cd71ca | 9392 | #: builtin/blame.c:857 |
ef317cd5 | 9393 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 9394 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 9395 | |
a5cd71ca | 9396 | #: builtin/blame.c:858 |
ef317cd5 | 9397 | msgid "Show author email instead of name (Default: off)" |
07432cef | 9398 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 9399 | |
a5cd71ca | 9400 | #: builtin/blame.c:859 |
ef317cd5 | 9401 | msgid "Ignore whitespace differences" |
07432cef | 9402 | msgstr "忽略空白差异" |
ef317cd5 | 9403 | |
a5cd71ca | 9404 | #: builtin/blame.c:860 builtin/log.c:1630 |
a6cd2cc4 JX |
9405 | msgid "rev" |
9406 | msgstr "版本" | |
9407 | ||
a5cd71ca | 9408 | #: builtin/blame.c:860 |
a6cd2cc4 JX |
9409 | msgid "Ignore <rev> when blaming" |
9410 | msgstr "在执行 blame 操作时忽略 <版本>" | |
9411 | ||
a5cd71ca | 9412 | #: builtin/blame.c:861 |
a6cd2cc4 JX |
9413 | msgid "Ignore revisions from <file>" |
9414 | msgstr "忽略来自 <文件> 中的版本" | |
9415 | ||
a5cd71ca | 9416 | #: builtin/blame.c:862 |
fd8cb379 JX |
9417 | msgid "color redundant metadata from previous line differently" |
9418 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
9419 | ||
a5cd71ca | 9420 | #: builtin/blame.c:863 |
fd8cb379 JX |
9421 | msgid "color lines by age" |
9422 | msgstr "依据时间着色" | |
9423 | ||
a5cd71ca | 9424 | #: builtin/blame.c:870 |
1a79b2f1 JX |
9425 | msgid "Use an experimental heuristic to improve diffs" |
9426 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 9427 | |
a5cd71ca | 9428 | #: builtin/blame.c:872 |
ef317cd5 | 9429 | msgid "Spend extra cycles to find better match" |
07432cef | 9430 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 9431 | |
a5cd71ca | 9432 | #: builtin/blame.c:873 |
ef317cd5 | 9433 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 9434 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 9435 | |
a5cd71ca | 9436 | #: builtin/blame.c:874 |
ef317cd5 | 9437 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 9438 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 9439 | |
a5cd71ca | 9440 | #: builtin/blame.c:875 builtin/blame.c:876 |
ef317cd5 | 9441 | msgid "score" |
07432cef | 9442 | msgstr "得分" |
ef317cd5 | 9443 | |
a5cd71ca | 9444 | #: builtin/blame.c:875 |
ef317cd5 | 9445 | msgid "Find line copies within and across files" |
07432cef | 9446 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 9447 | |
a5cd71ca | 9448 | #: builtin/blame.c:876 |
ef317cd5 | 9449 | msgid "Find line movements within and across files" |
07432cef | 9450 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 9451 | |
a5cd71ca | 9452 | #: builtin/blame.c:877 |
ef317cd5 | 9453 | msgid "n,m" |
07432cef | 9454 | msgstr "n,m" |
ef317cd5 | 9455 | |
a5cd71ca | 9456 | #: builtin/blame.c:877 |
ef317cd5 | 9457 | msgid "Process only line range n,m, counting from 1" |
07432cef | 9458 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 9459 | |
a6cd2cc4 | 9460 | #: builtin/blame.c:929 |
a0b6b246 JX |
9461 | msgid "--progress can't be used with --incremental or porcelain formats" |
9462 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
9463 | ||
a4f16749 JX |
9464 | #. TRANSLATORS: This string is used to tell us the |
9465 | #. maximum display width for a relative timestamp in | |
9466 | #. "git blame" output. For C locale, "4 years, 11 | |
9467 | #. months ago", which takes 22 places, is the longest | |
9468 | #. among various forms of relative timestamps, but | |
9469 | #. your language may need more or fewer display | |
9470 | #. columns. | |
9471 | #. | |
a6cd2cc4 | 9472 | #: builtin/blame.c:980 |
6c94aba5 JX |
9473 | msgid "4 years, 11 months ago" |
9474 | msgstr "4 年 11 个月前" | |
9475 | ||
a6cd2cc4 | 9476 | #: builtin/blame.c:1087 |
a0b6b246 JX |
9477 | #, c-format |
9478 | msgid "file %s has only %lu line" | |
9479 | msgid_plural "file %s has only %lu lines" | |
9480 | msgstr[0] "文件 %s 只有 %lu 行" | |
9481 | msgstr[1] "文件 %s 只有 %lu 行" | |
9482 | ||
a6cd2cc4 | 9483 | #: builtin/blame.c:1133 |
a4f16749 JX |
9484 | msgid "Blaming lines" |
9485 | msgstr "追踪代码行" | |
9486 | ||
4c27fcb5 | 9487 | #: builtin/branch.c:29 |
814ff314 JX |
9488 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
9489 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 9490 | |
4c27fcb5 | 9491 | #: builtin/branch.c:30 |
814ff314 JX |
9492 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
9493 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 9494 | |
4c27fcb5 | 9495 | #: builtin/branch.c:31 |
814ff314 JX |
9496 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
9497 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 9498 | |
4c27fcb5 | 9499 | #: builtin/branch.c:32 |
814ff314 JX |
9500 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
9501 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 9502 | |
4c27fcb5 | 9503 | #: builtin/branch.c:33 |
6937cb4e JX |
9504 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
9505 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
9506 | ||
4c27fcb5 | 9507 | #: builtin/branch.c:34 |
94550ed3 JX |
9508 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
9509 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
9510 | ||
4c27fcb5 | 9511 | #: builtin/branch.c:35 |
87cb7997 JX |
9512 | msgid "git branch [<options>] [-r | -a] [--format]" |
9513 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
9514 | ||
90e6ef53 | 9515 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 9516 | #: builtin/branch.c:154 |
c04f5ac3 JX |
9517 | #, c-format |
9518 | msgid "" | |
9519 | "deleting branch '%s' that has been merged to\n" | |
9520 | " '%s', but not yet merged to HEAD." | |
9521 | msgstr "" | |
70fc47bf | 9522 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
9523 | " '%s',但未合并到 HEAD。" |
9524 | ||
90e6ef53 | 9525 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 9526 | #: builtin/branch.c:158 |
c04f5ac3 JX |
9527 | #, c-format |
9528 | msgid "" | |
9529 | "not deleting branch '%s' that is not yet merged to\n" | |
9530 | " '%s', even though it is merged to HEAD." | |
9531 | msgstr "" | |
70fc47bf T |
9532 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
9533 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 9534 | |
a6cd2cc4 | 9535 | #: builtin/branch.c:172 |
07432cef WS |
9536 | #, c-format |
9537 | msgid "Couldn't look up commit object for '%s'" | |
9538 | msgstr "无法查询 '%s' 指向的提交对象" | |
9539 | ||
a6cd2cc4 | 9540 | #: builtin/branch.c:176 |
07432cef WS |
9541 | #, c-format |
9542 | msgid "" | |
9543 | "The branch '%s' is not fully merged.\n" | |
9544 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
9545 | msgstr "" | |
9546 | "分支 '%s' 没有完全合并。\n" | |
9547 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
9548 | ||
a6cd2cc4 | 9549 | #: builtin/branch.c:189 |
07432cef | 9550 | msgid "Update of config-file failed" |
6937cb4e | 9551 | msgstr "更新配置文件失败" |
07432cef | 9552 | |
a6cd2cc4 | 9553 | #: builtin/branch.c:220 |
c04f5ac3 | 9554 | msgid "cannot use -a with -d" |
649900bc | 9555 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 9556 | |
a6cd2cc4 | 9557 | #: builtin/branch.c:226 |
c04f5ac3 JX |
9558 | msgid "Couldn't look up commit object for HEAD" |
9559 | msgstr "无法查询 HEAD 指向的提交对象" | |
9560 | ||
a6cd2cc4 | 9561 | #: builtin/branch.c:240 |
c04f5ac3 | 9562 | #, c-format |
5b04ee3b JX |
9563 | msgid "Cannot delete branch '%s' checked out at '%s'" |
9564 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 9565 | |
a6cd2cc4 | 9566 | #: builtin/branch.c:255 |
5ae481e0 | 9567 | #, c-format |
7aea43ff JX |
9568 | msgid "remote-tracking branch '%s' not found." |
9569 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 9570 | |
a6cd2cc4 | 9571 | #: builtin/branch.c:256 |
81809b99 | 9572 | #, c-format |
8ada9598 | 9573 | msgid "branch '%s' not found." |
81809b99 | 9574 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 9575 | |
a6cd2cc4 | 9576 | #: builtin/branch.c:271 |
81809b99 | 9577 | #, c-format |
7aea43ff JX |
9578 | msgid "Error deleting remote-tracking branch '%s'" |
9579 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 9580 | |
a6cd2cc4 | 9581 | #: builtin/branch.c:272 |
81809b99 | 9582 | #, c-format |
8ada9598 | 9583 | msgid "Error deleting branch '%s'" |
7aea43ff | 9584 | msgstr "无法删除分支 '%s'" |
8ada9598 | 9585 | |
a6cd2cc4 | 9586 | #: builtin/branch.c:279 |
81809b99 | 9587 | #, c-format |
7aea43ff JX |
9588 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
9589 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 9590 | |
a6cd2cc4 | 9591 | #: builtin/branch.c:280 |
81809b99 | 9592 | #, c-format |
8ada9598 | 9593 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 9594 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 9595 | |
a6cd2cc4 | 9596 | #: builtin/branch.c:429 builtin/tag.c:61 |
6937cb4e JX |
9597 | msgid "unable to parse format string" |
9598 | msgstr "不能解析格式化字符串" | |
9599 | ||
a6cd2cc4 | 9600 | #: builtin/branch.c:460 |
d46c5519 JX |
9601 | msgid "could not resolve HEAD" |
9602 | msgstr "不能解析 HEAD 提交" | |
9603 | ||
a6cd2cc4 | 9604 | #: builtin/branch.c:466 |
5b04ee3b | 9605 | #, c-format |
d46c5519 JX |
9606 | msgid "HEAD (%s) points outside of refs/heads/" |
9607 | msgstr "HEAD (%s) 指向 refs/heads/ 之外" | |
9608 | ||
a6cd2cc4 | 9609 | #: builtin/branch.c:481 |
d46c5519 | 9610 | #, c-format |
5b04ee3b JX |
9611 | msgid "Branch %s is being rebased at %s" |
9612 | msgstr "分支 %s 正被变基到 %s" | |
9613 | ||
a6cd2cc4 | 9614 | #: builtin/branch.c:485 |
5b04ee3b JX |
9615 | #, c-format |
9616 | msgid "Branch %s is being bisected at %s" | |
9617 | msgstr "分支 %s 正被二分查找于 %s" | |
9618 | ||
a6cd2cc4 | 9619 | #: builtin/branch.c:502 |
6937cb4e JX |
9620 | msgid "cannot copy the current branch while not on any." |
9621 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
9622 | ||
a6cd2cc4 | 9623 | #: builtin/branch.c:504 |
c04f5ac3 | 9624 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 9625 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 9626 | |
a6cd2cc4 | 9627 | #: builtin/branch.c:515 |
c04f5ac3 JX |
9628 | #, c-format |
9629 | msgid "Invalid branch name: '%s'" | |
9630 | msgstr "无效的分支名:'%s'" | |
9631 | ||
a6cd2cc4 | 9632 | #: builtin/branch.c:542 |
c04f5ac3 JX |
9633 | msgid "Branch rename failed" |
9634 | msgstr "分支重命名失败" | |
9635 | ||
a6cd2cc4 | 9636 | #: builtin/branch.c:544 |
6937cb4e JX |
9637 | msgid "Branch copy failed" |
9638 | msgstr "分支拷贝失败" | |
9639 | ||
a6cd2cc4 | 9640 | #: builtin/branch.c:548 |
6937cb4e | 9641 | #, c-format |
5809aa05 JX |
9642 | msgid "Created a copy of a misnamed branch '%s'" |
9643 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 9644 | |
a6cd2cc4 | 9645 | #: builtin/branch.c:551 |
c04f5ac3 JX |
9646 | #, c-format |
9647 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 9648 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 9649 | |
a6cd2cc4 | 9650 | #: builtin/branch.c:557 |
c04f5ac3 JX |
9651 | #, c-format |
9652 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
9653 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
9654 | ||
a6cd2cc4 | 9655 | #: builtin/branch.c:566 |
c04f5ac3 | 9656 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
9657 | msgstr "分支被重命名,但更新配置文件失败" |
9658 | ||
a6cd2cc4 | 9659 | #: builtin/branch.c:568 |
6937cb4e JX |
9660 | msgid "Branch is copied, but update of config-file failed" |
9661 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 9662 | |
a6cd2cc4 | 9663 | #: builtin/branch.c:584 |
5c57d762 JX |
9664 | #, c-format |
9665 | msgid "" | |
9666 | "Please edit the description for the branch\n" | |
9667 | " %s\n" | |
9668 | "Lines starting with '%c' will be stripped.\n" | |
9669 | msgstr "" | |
9670 | "请编辑分支的描述\n" | |
9671 | " %s\n" | |
9672 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 9673 | |
a6cd2cc4 | 9674 | #: builtin/branch.c:618 |
ef317cd5 | 9675 | msgid "Generic options" |
07432cef | 9676 | msgstr "通用选项" |
c04f5ac3 | 9677 | |
a6cd2cc4 | 9678 | #: builtin/branch.c:620 |
ef317cd5 | 9679 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 9680 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 9681 | |
a6cd2cc4 | 9682 | #: builtin/branch.c:621 |
ef317cd5 | 9683 | msgid "suppress informational messages" |
07432cef | 9684 | msgstr "不显示信息" |
8ada9598 | 9685 | |
a6cd2cc4 | 9686 | #: builtin/branch.c:622 |
ef317cd5 | 9687 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 9688 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 9689 | |
a6cd2cc4 | 9690 | #: builtin/branch.c:624 |
6937cb4e JX |
9691 | msgid "do not use" |
9692 | msgstr "不要使用" | |
c04f5ac3 | 9693 | |
a5cd71ca | 9694 | #: builtin/branch.c:626 builtin/rebase.c:486 |
5b04ee3b JX |
9695 | msgid "upstream" |
9696 | msgstr "上游" | |
9697 | ||
a6cd2cc4 | 9698 | #: builtin/branch.c:626 |
5b04ee3b JX |
9699 | msgid "change the upstream info" |
9700 | msgstr "改变上游信息" | |
9701 | ||
a6cd2cc4 | 9702 | #: builtin/branch.c:627 |
a0b6b246 JX |
9703 | msgid "Unset the upstream info" |
9704 | msgstr "取消上游信息的设置" | |
9705 | ||
a6cd2cc4 | 9706 | #: builtin/branch.c:628 |
ef317cd5 | 9707 | msgid "use colored output" |
07432cef | 9708 | msgstr "使用彩色输出" |
c04f5ac3 | 9709 | |
a6cd2cc4 | 9710 | #: builtin/branch.c:629 |
ef317cd5 | 9711 | msgid "act on remote-tracking branches" |
07432cef | 9712 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 9713 | |
a6cd2cc4 | 9714 | #: builtin/branch.c:631 builtin/branch.c:633 |
ef317cd5 | 9715 | msgid "print only branches that contain the commit" |
07432cef | 9716 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 9717 | |
a6cd2cc4 | 9718 | #: builtin/branch.c:632 builtin/branch.c:634 |
87cb7997 JX |
9719 | msgid "print only branches that don't contain the commit" |
9720 | msgstr "只打印不包含该提交的分支" | |
9721 | ||
a6cd2cc4 | 9722 | #: builtin/branch.c:637 |
ef317cd5 | 9723 | msgid "Specific git-branch actions:" |
07432cef | 9724 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 9725 | |
a6cd2cc4 | 9726 | #: builtin/branch.c:638 |
ef317cd5 | 9727 | msgid "list both remote-tracking and local branches" |
07432cef | 9728 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 9729 | |
a6cd2cc4 | 9730 | #: builtin/branch.c:640 |
ef317cd5 | 9731 | msgid "delete fully merged branch" |
07432cef | 9732 | msgstr "删除完全合并的分支" |
c04f5ac3 | 9733 | |
a6cd2cc4 | 9734 | #: builtin/branch.c:641 |
ef317cd5 | 9735 | msgid "delete branch (even if not merged)" |
07432cef | 9736 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 9737 | |
a6cd2cc4 | 9738 | #: builtin/branch.c:642 |
ef317cd5 | 9739 | msgid "move/rename a branch and its reflog" |
07432cef | 9740 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 9741 | |
a6cd2cc4 | 9742 | #: builtin/branch.c:643 |
ef317cd5 | 9743 | msgid "move/rename a branch, even if target exists" |
07432cef | 9744 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 9745 | |
a6cd2cc4 | 9746 | #: builtin/branch.c:644 |
6937cb4e JX |
9747 | msgid "copy a branch and its reflog" |
9748 | msgstr "拷贝一个分支和它的引用日志" | |
9749 | ||
a6cd2cc4 | 9750 | #: builtin/branch.c:645 |
6937cb4e JX |
9751 | msgid "copy a branch, even if target exists" |
9752 | msgstr "拷贝一个分支,即使目标已存在" | |
9753 | ||
a6cd2cc4 | 9754 | #: builtin/branch.c:646 |
ef317cd5 | 9755 | msgid "list branch names" |
07432cef | 9756 | msgstr "列出分支名" |
c04f5ac3 | 9757 | |
a6cd2cc4 | 9758 | #: builtin/branch.c:647 |
d46c5519 JX |
9759 | msgid "show current branch name" |
9760 | msgstr "显示当前分支名" | |
9761 | ||
a6cd2cc4 | 9762 | #: builtin/branch.c:648 |
ef317cd5 | 9763 | msgid "create the branch's reflog" |
07432cef | 9764 | msgstr "创建分支的引用日志" |
ef317cd5 | 9765 | |
a6cd2cc4 | 9766 | #: builtin/branch.c:650 |
ef317cd5 | 9767 | msgid "edit the description for the branch" |
07432cef | 9768 | msgstr "标记分支的描述" |
ef317cd5 | 9769 | |
a6cd2cc4 | 9770 | #: builtin/branch.c:651 |
04cb2f28 JX |
9771 | msgid "force creation, move/rename, deletion" |
9772 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 9773 | |
a6cd2cc4 | 9774 | #: builtin/branch.c:652 |
94550ed3 JX |
9775 | msgid "print only branches that are merged" |
9776 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 9777 | |
a6cd2cc4 | 9778 | #: builtin/branch.c:653 |
94550ed3 JX |
9779 | msgid "print only branches that are not merged" |
9780 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 9781 | |
a6cd2cc4 | 9782 | #: builtin/branch.c:654 |
ef317cd5 | 9783 | msgid "list branches in columns" |
07432cef | 9784 | msgstr "以列的方式显示分支" |
ef317cd5 | 9785 | |
a6cd2cc4 | 9786 | #: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 |
06991777 | 9787 | #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 |
a6cd2cc4 | 9788 | #: builtin/tag.c:433 |
94550ed3 JX |
9789 | msgid "object" |
9790 | msgstr "对象" | |
9791 | ||
a6cd2cc4 | 9792 | #: builtin/branch.c:658 |
94550ed3 JX |
9793 | msgid "print only branches of the object" |
9794 | msgstr "只打印指向该对象的分支" | |
9795 | ||
a6cd2cc4 | 9796 | #: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 |
1a79b2f1 JX |
9797 | msgid "sorting and filtering are case insensitive" |
9798 | msgstr "排序和过滤属于大小写不敏感" | |
9799 | ||
a6cd2cc4 JX |
9800 | #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 |
9801 | #: builtin/verify-tag.c:38 | |
87cb7997 JX |
9802 | msgid "format to use for the output" |
9803 | msgstr "输出格式" | |
9804 | ||
a5cd71ca | 9805 | #: builtin/branch.c:684 builtin/clone.c:760 |
c04f5ac3 | 9806 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 9807 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 9808 | |
a6cd2cc4 | 9809 | #: builtin/branch.c:708 |
8ada9598 | 9810 | msgid "--column and --verbose are incompatible" |
81809b99 | 9811 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 9812 | |
a6cd2cc4 | 9813 | #: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 |
a77c07d9 JX |
9814 | msgid "branch name required" |
9815 | msgstr "必须提供分支名" | |
9816 | ||
a6cd2cc4 | 9817 | #: builtin/branch.c:753 |
a77c07d9 JX |
9818 | msgid "Cannot give description to detached HEAD" |
9819 | msgstr "不能向分离头指针提供描述" | |
9820 | ||
a6cd2cc4 | 9821 | #: builtin/branch.c:758 |
a77c07d9 JX |
9822 | msgid "cannot edit description of more than one branch" |
9823 | msgstr "不能为一个以上的分支编辑描述" | |
9824 | ||
a6cd2cc4 | 9825 | #: builtin/branch.c:765 |
a77c07d9 JX |
9826 | #, c-format |
9827 | msgid "No commit on branch '%s' yet." | |
9828 | msgstr "分支 '%s' 尚无提交。" | |
9829 | ||
a6cd2cc4 | 9830 | #: builtin/branch.c:768 |
a77c07d9 JX |
9831 | #, c-format |
9832 | msgid "No branch named '%s'." | |
9833 | msgstr "没有分支 '%s'。" | |
9834 | ||
a6cd2cc4 | 9835 | #: builtin/branch.c:783 |
6937cb4e JX |
9836 | msgid "too many branches for a copy operation" |
9837 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 9838 | |
a6cd2cc4 | 9839 | #: builtin/branch.c:792 |
6937cb4e JX |
9840 | msgid "too many arguments for a rename operation" |
9841 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 9842 | |
a6cd2cc4 | 9843 | #: builtin/branch.c:797 |
6937cb4e JX |
9844 | msgid "too many arguments to set new upstream" |
9845 | msgstr "为设置新上游提供了太多的参数" | |
9846 | ||
a6cd2cc4 | 9847 | #: builtin/branch.c:801 |
1003b3a5 JX |
9848 | #, c-format |
9849 | msgid "" | |
9850 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
9851 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
9852 | ||
a6cd2cc4 | 9853 | #: builtin/branch.c:804 builtin/branch.c:827 |
1003b3a5 JX |
9854 | #, c-format |
9855 | msgid "no such branch '%s'" | |
9856 | msgstr "没有此分支 '%s'" | |
9857 | ||
a6cd2cc4 | 9858 | #: builtin/branch.c:808 |
07432cef | 9859 | #, c-format |
ef317cd5 | 9860 | msgid "branch '%s' does not exist" |
07432cef | 9861 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 9862 | |
a6cd2cc4 | 9863 | #: builtin/branch.c:821 |
6937cb4e JX |
9864 | msgid "too many arguments to unset upstream" |
9865 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 9866 | |
a6cd2cc4 | 9867 | #: builtin/branch.c:825 |
1003b3a5 JX |
9868 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
9869 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
9870 | ||
a6cd2cc4 | 9871 | #: builtin/branch.c:831 |
ef317cd5 JX |
9872 | #, c-format |
9873 | msgid "Branch '%s' has no upstream information" | |
07432cef | 9874 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 9875 | |
a6cd2cc4 JX |
9876 | #: builtin/branch.c:841 |
9877 | msgid "" | |
9878 | "The -a, and -r, options to 'git branch' do not take a branch name.\n" | |
9879 | "Did you mean to use: -a|-r --list <pattern>?" | |
9880 | msgstr "" | |
9881 | "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" | |
9882 | "您是否想要使用:-a|-r --list <模式>?" | |
c04f5ac3 | 9883 | |
a6cd2cc4 | 9884 | #: builtin/branch.c:845 |
ef317cd5 | 9885 | msgid "" |
6937cb4e JX |
9886 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
9887 | "'--set-upstream-to' instead." | |
ef317cd5 | 9888 | msgstr "" |
6937cb4e | 9889 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" |
ef317cd5 | 9890 | |
87cb7997 | 9891 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
9892 | #, c-format |
9893 | msgid "%s is okay\n" | |
9894 | msgstr "%s 可以\n" | |
9895 | ||
87cb7997 | 9896 | #: builtin/bundle.c:58 |
c04f5ac3 | 9897 | msgid "Need a repository to create a bundle." |
160fb2b2 | 9898 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 9899 | |
87cb7997 | 9900 | #: builtin/bundle.c:62 |
c04f5ac3 | 9901 | msgid "Need a repository to unbundle." |
160fb2b2 | 9902 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 9903 | |
a5cd71ca | 9904 | #: builtin/cat-file.c:595 |
7aea43ff | 9905 | msgid "" |
a0b6b246 JX |
9906 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
9907 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
9908 | msgstr "" |
9909 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
9910 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 9911 | |
a5cd71ca | 9912 | #: builtin/cat-file.c:596 |
a0b6b246 JX |
9913 | msgid "" |
9914 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
9915 | "filters]" | |
275588f9 JX |
9916 | msgstr "" |
9917 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
9918 | "filters]" | |
ef317cd5 | 9919 | |
a5cd71ca | 9920 | #: builtin/cat-file.c:617 |
4c27fcb5 JX |
9921 | msgid "only one batch option may be specified" |
9922 | msgstr "只能指定一个批处理选项" | |
9923 | ||
a5cd71ca | 9924 | #: builtin/cat-file.c:635 |
ef317cd5 | 9925 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 9926 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 9927 | |
a5cd71ca | 9928 | #: builtin/cat-file.c:636 |
ef317cd5 | 9929 | msgid "show object type" |
07432cef | 9930 | msgstr "显示对象类型" |
ef317cd5 | 9931 | |
a5cd71ca | 9932 | #: builtin/cat-file.c:637 |
ef317cd5 | 9933 | msgid "show object size" |
07432cef | 9934 | msgstr "显示对象大小" |
ef317cd5 | 9935 | |
a5cd71ca | 9936 | #: builtin/cat-file.c:639 |
ef317cd5 | 9937 | msgid "exit with zero when there's no error" |
07432cef | 9938 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 9939 | |
a5cd71ca | 9940 | #: builtin/cat-file.c:640 |
ef317cd5 | 9941 | msgid "pretty-print object's content" |
07432cef | 9942 | msgstr "美观地打印对象的内容" |
ef317cd5 | 9943 | |
a5cd71ca | 9944 | #: builtin/cat-file.c:642 |
ef317cd5 | 9945 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
9946 | msgstr "对于数据对象,对其内容做文本转换" |
9947 | ||
a5cd71ca | 9948 | #: builtin/cat-file.c:644 |
a0b6b246 JX |
9949 | msgid "for blob objects, run filters on object's content" |
9950 | msgstr "对于数据对象,对其内容做过滤" | |
9951 | ||
a5cd71ca | 9952 | #: builtin/cat-file.c:645 git-submodule.sh:936 |
a0b6b246 JX |
9953 | msgid "blob" |
9954 | msgstr "数据对象" | |
9955 | ||
a5cd71ca | 9956 | #: builtin/cat-file.c:646 |
a0b6b246 JX |
9957 | msgid "use a specific path for --textconv/--filters" |
9958 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 9959 | |
a5cd71ca | 9960 | #: builtin/cat-file.c:648 |
7aea43ff JX |
9961 | msgid "allow -s and -t to work with broken/corrupt objects" |
9962 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
9963 | ||
a5cd71ca | 9964 | #: builtin/cat-file.c:649 |
1b7f4a34 JX |
9965 | msgid "buffer --batch output" |
9966 | msgstr "缓冲 --batch 的输出" | |
9967 | ||
a5cd71ca | 9968 | #: builtin/cat-file.c:651 |
ef317cd5 | 9969 | msgid "show info and content of objects fed from the standard input" |
07432cef | 9970 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 9971 | |
a5cd71ca | 9972 | #: builtin/cat-file.c:655 |
ef317cd5 | 9973 | msgid "show info about objects fed from the standard input" |
07432cef | 9974 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 9975 | |
a5cd71ca | 9976 | #: builtin/cat-file.c:659 |
7aea43ff JX |
9977 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
9978 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
9979 | ||
a5cd71ca | 9980 | #: builtin/cat-file.c:661 |
1b7f4a34 JX |
9981 | msgid "show all objects with --batch or --batch-check" |
9982 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
9983 | ||
a5cd71ca | 9984 | #: builtin/cat-file.c:663 |
c1ac5258 JX |
9985 | msgid "do not order --batch-all-objects output" |
9986 | msgstr "不要对 --batch-all-objects 的输出排序" | |
9987 | ||
06991777 | 9988 | #: builtin/check-attr.c:13 |
814ff314 JX |
9989 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
9990 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 9991 | |
06991777 | 9992 | #: builtin/check-attr.c:14 |
94550ed3 JX |
9993 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
9994 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 9995 | |
06991777 | 9996 | #: builtin/check-attr.c:21 |
ef317cd5 | 9997 | msgid "report all attributes set on file" |
07432cef | 9998 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 9999 | |
06991777 | 10000 | #: builtin/check-attr.c:22 |
ef317cd5 | 10001 | msgid "use .gitattributes only from the index" |
07432cef | 10002 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 10003 | |
06991777 | 10004 | #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 |
ef317cd5 | 10005 | msgid "read file names from stdin" |
07432cef | 10006 | msgstr "从标准输入读出文件名" |
ef317cd5 | 10007 | |
06991777 | 10008 | #: builtin/check-attr.c:25 builtin/check-ignore.c:27 |
90314792 JX |
10009 | msgid "terminate input and output records by a NUL character" |
10010 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 10011 | |
a5cd71ca JX |
10012 | #: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 |
10013 | #: builtin/worktree.c:506 | |
a77c07d9 JX |
10014 | msgid "suppress progress reporting" |
10015 | msgstr "不显示进度报告" | |
10016 | ||
06991777 | 10017 | #: builtin/check-ignore.c:29 |
2e8451e8 JX |
10018 | msgid "show non-matching input paths" |
10019 | msgstr "显示未匹配的输入路径" | |
10020 | ||
06991777 | 10021 | #: builtin/check-ignore.c:31 |
90314792 JX |
10022 | msgid "ignore index when checking" |
10023 | msgstr "检查时忽略索引" | |
10024 | ||
06991777 | 10025 | #: builtin/check-ignore.c:160 |
a77c07d9 | 10026 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 10027 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 10028 | |
06991777 | 10029 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
10030 | msgid "-z only makes sense with --stdin" |
10031 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
10032 | ||
06991777 | 10033 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
10034 | msgid "no path specified" |
10035 | msgstr "未指定路径" | |
10036 | ||
06991777 | 10037 | #: builtin/check-ignore.c:169 |
a77c07d9 JX |
10038 | msgid "--quiet is only valid with a single pathname" |
10039 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
10040 | ||
06991777 | 10041 | #: builtin/check-ignore.c:171 |
a77c07d9 JX |
10042 | msgid "cannot have both --quiet and --verbose" |
10043 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
10044 | ||
06991777 | 10045 | #: builtin/check-ignore.c:174 |
2e8451e8 JX |
10046 | msgid "--non-matching is only valid with --verbose" |
10047 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
10048 | ||
a4f16749 | 10049 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
10050 | msgid "git check-mailmap [<options>] <contact>..." |
10051 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 10052 | |
a4f16749 | 10053 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
10054 | msgid "also read contacts from stdin" |
10055 | msgstr "还从标准输入读取联系地址" | |
10056 | ||
a4f16749 | 10057 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
10058 | #, c-format |
10059 | msgid "unable to parse contact: %s" | |
10060 | msgstr "不能解析联系地址:%s" | |
10061 | ||
a4f16749 | 10062 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
10063 | msgid "no contacts specified" |
10064 | msgstr "未指定联系地址" | |
10065 | ||
06991777 | 10066 | #: builtin/checkout-index.c:131 |
814ff314 JX |
10067 | msgid "git checkout-index [<options>] [--] [<file>...]" |
10068 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 10069 | |
06991777 | 10070 | #: builtin/checkout-index.c:148 |
276ceeaa JX |
10071 | msgid "stage should be between 1 and 3 or all" |
10072 | msgstr "索引值应该取值 1 到 3 或者 all" | |
10073 | ||
06991777 | 10074 | #: builtin/checkout-index.c:164 |
ef317cd5 | 10075 | msgid "check out all files in the index" |
07432cef | 10076 | msgstr "检出索引区的所有文件" |
ef317cd5 | 10077 | |
06991777 | 10078 | #: builtin/checkout-index.c:165 |
ef317cd5 | 10079 | msgid "force overwrite of existing files" |
07432cef | 10080 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 10081 | |
06991777 | 10082 | #: builtin/checkout-index.c:167 |
ef317cd5 | 10083 | msgid "no warning for existing files and files not in index" |
07432cef | 10084 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 10085 | |
06991777 | 10086 | #: builtin/checkout-index.c:169 |
ef317cd5 | 10087 | msgid "don't checkout new files" |
07432cef | 10088 | msgstr "不检出新文件" |
ef317cd5 | 10089 | |
06991777 | 10090 | #: builtin/checkout-index.c:171 |
ef317cd5 | 10091 | msgid "update stat information in the index file" |
07432cef | 10092 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 10093 | |
06991777 | 10094 | #: builtin/checkout-index.c:175 |
ef317cd5 | 10095 | msgid "read list of paths from the standard input" |
07432cef | 10096 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 10097 | |
06991777 | 10098 | #: builtin/checkout-index.c:177 |
ef317cd5 | 10099 | msgid "write the content to temporary files" |
07432cef | 10100 | msgstr "将内容写入临时文件" |
ef317cd5 | 10101 | |
06991777 | 10102 | #: builtin/checkout-index.c:178 builtin/column.c:31 |
a6cd2cc4 JX |
10103 | #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 |
10104 | #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 | |
a5cd71ca | 10105 | #: builtin/worktree.c:679 |
ef317cd5 | 10106 | msgid "string" |
07432cef | 10107 | msgstr "字符串" |
ef317cd5 | 10108 | |
06991777 | 10109 | #: builtin/checkout-index.c:179 |
ef317cd5 | 10110 | msgid "when creating files, prepend <string>" |
4375c10e | 10111 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 10112 | |
06991777 | 10113 | #: builtin/checkout-index.c:181 |
ef317cd5 | 10114 | msgid "copy out the files from named stage" |
07432cef | 10115 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 10116 | |
a6cd2cc4 | 10117 | #: builtin/checkout.c:31 |
814ff314 JX |
10118 | msgid "git checkout [<options>] <branch>" |
10119 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 10120 | |
a6cd2cc4 | 10121 | #: builtin/checkout.c:32 |
814ff314 JX |
10122 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
10123 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 10124 | |
a6cd2cc4 JX |
10125 | #: builtin/checkout.c:37 |
10126 | msgid "git switch [<options>] [<branch>]" | |
10127 | msgstr "git switch [<选项>] [<分支>]" | |
10128 | ||
10129 | #: builtin/checkout.c:42 | |
10130 | msgid "git restore [<options>] [--source=<branch>] <file>..." | |
10131 | msgstr "git restore [<选项>] [--source=<分支>] <文件>..." | |
10132 | ||
a5cd71ca | 10133 | #: builtin/checkout.c:173 builtin/checkout.c:212 |
c04f5ac3 JX |
10134 | #, c-format |
10135 | msgid "path '%s' does not have our version" | |
10136 | msgstr "路径 '%s' 没有我们的版本" | |
10137 | ||
a5cd71ca | 10138 | #: builtin/checkout.c:175 builtin/checkout.c:214 |
c04f5ac3 JX |
10139 | #, c-format |
10140 | msgid "path '%s' does not have their version" | |
10141 | msgstr "路径 '%s' 没有他们的版本" | |
10142 | ||
a5cd71ca | 10143 | #: builtin/checkout.c:191 |
c04f5ac3 JX |
10144 | #, c-format |
10145 | msgid "path '%s' does not have all necessary versions" | |
e640d114 | 10146 | msgstr "路径 '%s' 没有全部必需的版本" |
c04f5ac3 | 10147 | |
a5cd71ca | 10148 | #: builtin/checkout.c:241 |
c04f5ac3 JX |
10149 | #, c-format |
10150 | msgid "path '%s' does not have necessary versions" | |
e640d114 | 10151 | msgstr "路径 '%s' 没有必需的版本" |
c04f5ac3 | 10152 | |
a5cd71ca | 10153 | #: builtin/checkout.c:259 |
c04f5ac3 JX |
10154 | #, c-format |
10155 | msgid "path '%s': cannot merge" | |
90e6ef53 | 10156 | msgstr "path '%s':无法合并" |
c04f5ac3 | 10157 | |
a5cd71ca | 10158 | #: builtin/checkout.c:275 |
c04f5ac3 JX |
10159 | #, c-format |
10160 | msgid "Unable to add merge result for '%s'" | |
10161 | msgstr "无法为 '%s' 添加合并结果" | |
10162 | ||
a5cd71ca | 10163 | #: builtin/checkout.c:375 |
a6cd2cc4 JX |
10164 | #, c-format |
10165 | msgid "Recreated %d merge conflict" | |
10166 | msgid_plural "Recreated %d merge conflicts" | |
10167 | msgstr[0] "重新创建了 %d 个合并冲突" | |
10168 | msgstr[1] "重新创建了 %d 个合并冲突" | |
10169 | ||
a5cd71ca | 10170 | #: builtin/checkout.c:380 |
a6cd2cc4 JX |
10171 | #, c-format |
10172 | msgid "Updated %d path from %s" | |
10173 | msgid_plural "Updated %d paths from %s" | |
10174 | msgstr[0] "从 %2$s 更新了 %1$d 个路径" | |
10175 | msgstr[1] "从 %2$s 更新了 %1$d 个路径" | |
10176 | ||
a5cd71ca | 10177 | #: builtin/checkout.c:387 |
a6cd2cc4 JX |
10178 | #, c-format |
10179 | msgid "Updated %d path from the index" | |
10180 | msgid_plural "Updated %d paths from the index" | |
10181 | msgstr[0] "从索引区更新了 %d 个路径" | |
10182 | msgstr[1] "从索引区更新了 %d 个路径" | |
10183 | ||
a5cd71ca JX |
10184 | #: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 |
10185 | #: builtin/checkout.c:420 | |
07432cef | 10186 | #, c-format |
ef317cd5 | 10187 | msgid "'%s' cannot be used with updating paths" |
07432cef | 10188 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 10189 | |
a5cd71ca | 10190 | #: builtin/checkout.c:423 builtin/checkout.c:426 |
07432cef | 10191 | #, c-format |
ef317cd5 | 10192 | msgid "'%s' cannot be used with %s" |
07432cef | 10193 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 10194 | |
a5cd71ca | 10195 | #: builtin/checkout.c:430 |
ef317cd5 JX |
10196 | #, c-format |
10197 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 10198 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 10199 | |
a5cd71ca | 10200 | #: builtin/checkout.c:434 |
c04f5ac3 | 10201 | #, c-format |
a6cd2cc4 JX |
10202 | msgid "neither '%s' or '%s' is specified" |
10203 | msgstr "'%s' 或 '%s' 都没有指定" | |
c04f5ac3 | 10204 | |
a5cd71ca | 10205 | #: builtin/checkout.c:438 |
06991777 | 10206 | #, c-format |
a6cd2cc4 JX |
10207 | msgid "'%s' must be used when '%s' is not specified" |
10208 | msgstr "未指定 '%2$s' 时,必须使用 '%1$s'" | |
06991777 | 10209 | |
a5cd71ca | 10210 | #: builtin/checkout.c:443 builtin/checkout.c:448 |
06991777 | 10211 | #, c-format |
a6cd2cc4 JX |
10212 | msgid "'%s' or '%s' cannot be used with %s" |
10213 | msgstr "'%s' 或 '%s' 不能和 %s 一起使用" | |
06991777 | 10214 | |
a5cd71ca | 10215 | #: builtin/checkout.c:507 builtin/checkout.c:514 |
06991777 | 10216 | #, c-format |
a6cd2cc4 JX |
10217 | msgid "path '%s' is unmerged" |
10218 | msgstr "路径 '%s' 未合并" | |
06991777 | 10219 | |
a5cd71ca | 10220 | #: builtin/checkout.c:680 |
c04f5ac3 | 10221 | msgid "you need to resolve your current index first" |
90e6ef53 | 10222 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 10223 | |
a5cd71ca | 10224 | #: builtin/checkout.c:730 |
d46c5519 JX |
10225 | #, c-format |
10226 | msgid "" | |
10227 | "cannot continue with staged changes in the following files:\n" | |
10228 | "%s" | |
10229 | msgstr "" | |
10230 | "不能继续,下列文件有暂存的修改:\n" | |
10231 | "%s" | |
10232 | ||
a6cd2cc4 | 10233 | #: builtin/checkout.c:833 |
c04f5ac3 | 10234 | #, c-format |
1b7f4a34 JX |
10235 | msgid "Can not do reflog for '%s': %s\n" |
10236 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 10237 | |
a6cd2cc4 | 10238 | #: builtin/checkout.c:875 |
c04f5ac3 JX |
10239 | msgid "HEAD is now at" |
10240 | msgstr "HEAD 目前位于" | |
10241 | ||
a5cd71ca | 10242 | #: builtin/checkout.c:879 builtin/clone.c:713 |
3495628d JX |
10243 | msgid "unable to update HEAD" |
10244 | msgstr "不能更新 HEAD" | |
10245 | ||
a6cd2cc4 | 10246 | #: builtin/checkout.c:883 |
c04f5ac3 JX |
10247 | #, c-format |
10248 | msgid "Reset branch '%s'\n" | |
10249 | msgstr "重置分支 '%s'\n" | |
10250 | ||
a6cd2cc4 | 10251 | #: builtin/checkout.c:886 |
c04f5ac3 JX |
10252 | #, c-format |
10253 | msgid "Already on '%s'\n" | |
10254 | msgstr "已经位于 '%s'\n" | |
10255 | ||
a6cd2cc4 | 10256 | #: builtin/checkout.c:890 |
c04f5ac3 JX |
10257 | #, c-format |
10258 | msgid "Switched to and reset branch '%s'\n" | |
10259 | msgstr "切换并重置分支 '%s'\n" | |
10260 | ||
a6cd2cc4 | 10261 | #: builtin/checkout.c:892 builtin/checkout.c:1289 |
c04f5ac3 JX |
10262 | #, c-format |
10263 | msgid "Switched to a new branch '%s'\n" | |
10264 | msgstr "切换到一个新分支 '%s'\n" | |
10265 | ||
a6cd2cc4 | 10266 | #: builtin/checkout.c:894 |
c04f5ac3 JX |
10267 | #, c-format |
10268 | msgid "Switched to branch '%s'\n" | |
10269 | msgstr "切换到分支 '%s'\n" | |
10270 | ||
90e6ef53 | 10271 | # 译者:注意保持前导空格 |
a6cd2cc4 | 10272 | #: builtin/checkout.c:945 |
c04f5ac3 JX |
10273 | #, c-format |
10274 | msgid " ... and %d more.\n" | |
90e6ef53 | 10275 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 10276 | |
a6cd2cc4 | 10277 | #: builtin/checkout.c:951 |
c04f5ac3 JX |
10278 | #, c-format |
10279 | msgid "" | |
10280 | "Warning: you are leaving %d commit behind, not connected to\n" | |
10281 | "any of your branches:\n" | |
10282 | "\n" | |
10283 | "%s\n" | |
10284 | msgid_plural "" | |
10285 | "Warning: you are leaving %d commits behind, not connected to\n" | |
10286 | "any of your branches:\n" | |
10287 | "\n" | |
10288 | "%s\n" | |
10289 | msgstr[0] "" | |
10290 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
10291 | "\n" | |
10292 | "%s\n" | |
5ae481e0 JX |
10293 | msgstr[1] "" |
10294 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
10295 | "\n" | |
10296 | "%s\n" | |
c04f5ac3 | 10297 | |
a6cd2cc4 | 10298 | #: builtin/checkout.c:970 |
c04f5ac3 JX |
10299 | #, c-format |
10300 | msgid "" | |
7aea43ff JX |
10301 | "If you want to keep it by creating a new branch, this may be a good time\n" |
10302 | "to do so with:\n" | |
10303 | "\n" | |
10304 | " git branch <new-branch-name> %s\n" | |
10305 | "\n" | |
10306 | msgid_plural "" | |
c04f5ac3 JX |
10307 | "If you want to keep them by creating a new branch, this may be a good time\n" |
10308 | "to do so with:\n" | |
10309 | "\n" | |
814ff314 | 10310 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 10311 | "\n" |
7aea43ff JX |
10312 | msgstr[0] "" |
10313 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
10314 | "如下操作:\n" | |
10315 | "\n" | |
10316 | " git branch <新分支名> %s\n" | |
10317 | "\n" | |
10318 | msgstr[1] "" | |
10319 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
10320 | "如下操作:\n" |
10321 | "\n" | |
814ff314 | 10322 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
10323 | "\n" |
10324 | ||
a6cd2cc4 | 10325 | #: builtin/checkout.c:1005 |
c04f5ac3 JX |
10326 | msgid "internal error in revision walk" |
10327 | msgstr "在版本遍历时遇到内部错误" | |
10328 | ||
a6cd2cc4 | 10329 | #: builtin/checkout.c:1009 |
c04f5ac3 JX |
10330 | msgid "Previous HEAD position was" |
10331 | msgstr "之前的 HEAD 位置是" | |
10332 | ||
a6cd2cc4 | 10333 | #: builtin/checkout.c:1049 builtin/checkout.c:1284 |
c04f5ac3 | 10334 | msgid "You are on a branch yet to be born" |
90e6ef53 | 10335 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 10336 | |
a6cd2cc4 JX |
10337 | #: builtin/checkout.c:1176 |
10338 | msgid "only one reference expected" | |
10339 | msgstr "预期只有一个引用" | |
10340 | ||
10341 | #: builtin/checkout.c:1193 | |
90314792 JX |
10342 | #, c-format |
10343 | msgid "only one reference expected, %d given." | |
a0b6b246 | 10344 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 10345 | |
a6cd2cc4 | 10346 | #: builtin/checkout.c:1230 |
06991777 JX |
10347 | #, c-format |
10348 | msgid "" | |
10349 | "'%s' could be both a local file and a tracking branch.\n" | |
10350 | "Please use -- (and optionally --no-guess) to disambiguate" | |
10351 | msgstr "" | |
10352 | "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n" | |
10353 | "请使用 --(和可选的 --no-guess)来消除歧义" | |
10354 | ||
a5cd71ca | 10355 | #: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 |
c04f5ac3 JX |
10356 | #, c-format |
10357 | msgid "invalid reference: %s" | |
10358 | msgstr "无效引用:%s" | |
10359 | ||
a6cd2cc4 | 10360 | #: builtin/checkout.c:1256 builtin/checkout.c:1618 |
c04f5ac3 JX |
10361 | #, c-format |
10362 | msgid "reference is not a tree: %s" | |
10363 | msgstr "引用不是一个树:%s" | |
10364 | ||
a6cd2cc4 JX |
10365 | #: builtin/checkout.c:1303 |
10366 | #, c-format | |
10367 | msgid "a branch is expected, got tag '%s'" | |
10368 | msgstr "期望一个分支,得到标签 '%s'" | |
10369 | ||
10370 | #: builtin/checkout.c:1305 | |
10371 | #, c-format | |
10372 | msgid "a branch is expected, got remote branch '%s'" | |
10373 | msgstr "期望一个分支,得到远程分支 '%s'" | |
10374 | ||
10375 | #: builtin/checkout.c:1306 builtin/checkout.c:1314 | |
10376 | #, c-format | |
10377 | msgid "a branch is expected, got '%s'" | |
10378 | msgstr "期望一个分支,得到 '%s'" | |
10379 | ||
10380 | #: builtin/checkout.c:1309 | |
10381 | #, c-format | |
10382 | msgid "a branch is expected, got commit '%s'" | |
10383 | msgstr "期望一个分支,得到提交 '%s'" | |
10384 | ||
10385 | #: builtin/checkout.c:1325 | |
10386 | msgid "" | |
10387 | "cannot switch branch while merging\n" | |
10388 | "Consider \"git merge --quit\" or \"git worktree add\"." | |
10389 | msgstr "" | |
10390 | "不能在合并时切换分支\n" | |
10391 | "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" | |
10392 | ||
10393 | #: builtin/checkout.c:1329 | |
10394 | msgid "" | |
10395 | "cannot switch branch in the middle of an am session\n" | |
10396 | "Consider \"git am --quit\" or \"git worktree add\"." | |
10397 | msgstr "" | |
10398 | "不能在一个 am 会话期间切换分支\n" | |
10399 | "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" | |
10400 | ||
10401 | #: builtin/checkout.c:1333 | |
10402 | msgid "" | |
10403 | "cannot switch branch while rebasing\n" | |
10404 | "Consider \"git rebase --quit\" or \"git worktree add\"." | |
10405 | msgstr "" | |
10406 | "不能在变基时切换分支\n" | |
10407 | "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" | |
10408 | ||
10409 | #: builtin/checkout.c:1337 | |
10410 | msgid "" | |
10411 | "cannot switch branch while cherry-picking\n" | |
10412 | "Consider \"git cherry-pick --quit\" or \"git worktree add\"." | |
10413 | msgstr "" | |
10414 | "不能在拣选时切换分支\n" | |
10415 | "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" | |
10416 | ||
10417 | #: builtin/checkout.c:1341 | |
10418 | msgid "" | |
10419 | "cannot switch branch while reverting\n" | |
10420 | "Consider \"git revert --quit\" or \"git worktree add\"." | |
10421 | msgstr "" | |
10422 | "不能在还原时切换分支\n" | |
10423 | "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" | |
10424 | ||
10425 | #: builtin/checkout.c:1345 | |
10426 | msgid "you are switching branch while bisecting" | |
10427 | msgstr "您在执行二分查找时切换分支" | |
10428 | ||
10429 | #: builtin/checkout.c:1352 | |
ef317cd5 | 10430 | msgid "paths cannot be used with switching branches" |
07432cef | 10431 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 10432 | |
a6cd2cc4 | 10433 | #: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 |
07432cef | 10434 | #, c-format |
ef317cd5 | 10435 | msgid "'%s' cannot be used with switching branches" |
07432cef | 10436 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 10437 | |
a6cd2cc4 JX |
10438 | #: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 |
10439 | #: builtin/checkout.c:1378 builtin/checkout.c:1383 | |
07432cef | 10440 | #, c-format |
ef317cd5 | 10441 | msgid "'%s' cannot be used with '%s'" |
07432cef | 10442 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 10443 | |
a6cd2cc4 JX |
10444 | #: builtin/checkout.c:1380 |
10445 | #, c-format | |
10446 | msgid "'%s' cannot take <start-point>" | |
10447 | msgstr "'%s' 不带 <起始点>" | |
10448 | ||
10449 | #: builtin/checkout.c:1388 | |
07432cef | 10450 | #, c-format |
ef317cd5 | 10451 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 10452 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 10453 | |
a6cd2cc4 JX |
10454 | #: builtin/checkout.c:1395 |
10455 | msgid "missing branch or commit argument" | |
10456 | msgstr "缺少分支或提交参数" | |
c04f5ac3 | 10457 | |
a5cd71ca JX |
10458 | #: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 |
10459 | #: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 | |
10460 | #: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 | |
a6cd2cc4 JX |
10461 | msgid "force progress reporting" |
10462 | msgstr "强制显示进度报告" | |
c04f5ac3 | 10463 | |
a6cd2cc4 JX |
10464 | #: builtin/checkout.c:1438 |
10465 | msgid "perform a 3-way merge with the new branch" | |
10466 | msgstr "和新的分支执行三方合并" | |
c04f5ac3 | 10467 | |
a5cd71ca | 10468 | #: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 |
a6cd2cc4 JX |
10469 | msgid "style" |
10470 | msgstr "风格" | |
ef317cd5 | 10471 | |
a6cd2cc4 JX |
10472 | #: builtin/checkout.c:1440 |
10473 | msgid "conflict style (merge or diff3)" | |
10474 | msgstr "冲突输出风格(merge 或 diff3)" | |
10475 | ||
a5cd71ca | 10476 | #: builtin/checkout.c:1452 builtin/worktree.c:503 |
5c57d762 JX |
10477 | msgid "detach HEAD at named commit" |
10478 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 10479 | |
a6cd2cc4 | 10480 | #: builtin/checkout.c:1453 |
ef317cd5 | 10481 | msgid "set upstream info for new branch" |
07432cef | 10482 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 10483 | |
a6cd2cc4 JX |
10484 | #: builtin/checkout.c:1455 |
10485 | msgid "force checkout (throw away local modifications)" | |
10486 | msgstr "强制检出(丢弃本地修改)" | |
10487 | ||
10488 | #: builtin/checkout.c:1457 | |
6c94aba5 | 10489 | msgid "new-branch" |
07432cef | 10490 | msgstr "新分支" |
ef317cd5 | 10491 | |
a6cd2cc4 | 10492 | #: builtin/checkout.c:1457 |
ef317cd5 | 10493 | msgid "new unparented branch" |
07432cef | 10494 | msgstr "新的没有父提交的分支" |
ef317cd5 | 10495 | |
a6cd2cc4 JX |
10496 | #: builtin/checkout.c:1459 builtin/merge.c:288 |
10497 | msgid "update ignored files (default)" | |
10498 | msgstr "更新忽略的文件(默认)" | |
10499 | ||
10500 | #: builtin/checkout.c:1462 | |
10501 | msgid "do not check if another worktree is holding the given ref" | |
10502 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
10503 | ||
10504 | #: builtin/checkout.c:1475 | |
ef317cd5 | 10505 | msgid "checkout our version for unmerged files" |
07432cef | 10506 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 10507 | |
a6cd2cc4 | 10508 | #: builtin/checkout.c:1478 |
ef317cd5 | 10509 | msgid "checkout their version for unmerged files" |
07432cef | 10510 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 10511 | |
a6cd2cc4 | 10512 | #: builtin/checkout.c:1482 |
4dcdc3d8 JX |
10513 | msgid "do not limit pathspecs to sparse entries only" |
10514 | msgstr "对路径不做稀疏检出的限制" | |
10515 | ||
a6cd2cc4 | 10516 | #: builtin/checkout.c:1533 |
ef317cd5 | 10517 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 10518 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 10519 | |
a6cd2cc4 | 10520 | #: builtin/checkout.c:1536 |
d46c5519 JX |
10521 | msgid "-p and --overlay are mutually exclusive" |
10522 | msgstr "-p 和 --overlay 互斥" | |
10523 | ||
a6cd2cc4 | 10524 | #: builtin/checkout.c:1573 |
ef317cd5 JX |
10525 | msgid "--track needs a branch name" |
10526 | msgstr "--track 需要一个分支名" | |
10527 | ||
a6cd2cc4 | 10528 | #: builtin/checkout.c:1578 |
c1ac5258 JX |
10529 | msgid "missing branch name; try -b" |
10530 | msgstr "缺少分支名,尝试 -b" | |
ef317cd5 | 10531 | |
a6cd2cc4 JX |
10532 | #: builtin/checkout.c:1611 |
10533 | #, c-format | |
10534 | msgid "could not resolve %s" | |
10535 | msgstr "无法解析 %s" | |
10536 | ||
10537 | #: builtin/checkout.c:1623 | |
10538 | msgid "you must specify path(s) to restore" | |
10539 | msgstr "您必须指定一个要恢复的路径" | |
10540 | ||
10541 | #: builtin/checkout.c:1631 | |
c04f5ac3 | 10542 | msgid "invalid path specification" |
90e6ef53 | 10543 | msgstr "无效的路径规格" |
c04f5ac3 | 10544 | |
a6cd2cc4 | 10545 | #: builtin/checkout.c:1638 |
07432cef | 10546 | #, c-format |
a4f16749 JX |
10547 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
10548 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 10549 | |
a6cd2cc4 | 10550 | #: builtin/checkout.c:1642 |
07432cef | 10551 | #, c-format |
ef317cd5 | 10552 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 10553 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 10554 | |
a6cd2cc4 | 10555 | #: builtin/checkout.c:1646 |
c04f5ac3 JX |
10556 | msgid "" |
10557 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
10558 | "checking out of the index." | |
10559 | msgstr "" | |
90e6ef53 | 10560 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 10561 | |
a6cd2cc4 | 10562 | #: builtin/checkout.c:1666 |
c1ac5258 JX |
10563 | #, c-format |
10564 | msgid "" | |
10565 | "'%s' matched more than one remote tracking branch.\n" | |
10566 | "We found %d remotes with a reference that matched. So we fell back\n" | |
10567 | "on trying to resolve the argument as a path, but failed there too!\n" | |
10568 | "\n" | |
10569 | "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" | |
10570 | "you can do so by fully qualifying the name with the --track option:\n" | |
10571 | "\n" | |
10572 | " git checkout --track origin/<name>\n" | |
10573 | "\n" | |
10574 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
10575 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
10576 | "checkout.defaultRemote=origin in your config." | |
10577 | msgstr "" | |
10578 | "'%s' 匹配了一个以上的远程跟踪分支。\n" | |
10579 | "我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n" | |
10580 | "路径,但是也失败了!\n" | |
10581 | "\n" | |
10582 | "如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n" | |
10583 | "使用分支全名和 --track 选项:\n" | |
10584 | "\n" | |
10585 | " git checkout --track origin/<name>\n" | |
10586 | "\n" | |
10587 | "如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n" | |
10588 | "仓库名,可以在配置中设置 checkout.defaultRemote=origin。" | |
10589 | ||
a5cd71ca JX |
10590 | #: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 |
10591 | #: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 | |
10592 | #: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 | |
a6cd2cc4 JX |
10593 | msgid "branch" |
10594 | msgstr "分支" | |
10595 | ||
10596 | #: builtin/checkout.c:1692 | |
10597 | msgid "create and checkout a new branch" | |
10598 | msgstr "创建并检出一个新的分支" | |
10599 | ||
10600 | #: builtin/checkout.c:1694 | |
10601 | msgid "create/reset and checkout a branch" | |
10602 | msgstr "创建/重置并检出一个分支" | |
10603 | ||
10604 | #: builtin/checkout.c:1695 | |
10605 | msgid "create reflog for new branch" | |
10606 | msgstr "为新的分支创建引用日志" | |
10607 | ||
10608 | #: builtin/checkout.c:1697 | |
10609 | msgid "second guess 'git checkout <no-such-branch>' (default)" | |
10610 | msgstr "二次猜测 'git checkout <无此分支>'(默认)" | |
10611 | ||
10612 | #: builtin/checkout.c:1698 | |
10613 | msgid "use overlay mode (default)" | |
10614 | msgstr "使用叠加模式(默认)" | |
10615 | ||
a5cd71ca | 10616 | #: builtin/checkout.c:1743 |
a6cd2cc4 JX |
10617 | msgid "create and switch to a new branch" |
10618 | msgstr "创建并切换一个新分支" | |
10619 | ||
a5cd71ca | 10620 | #: builtin/checkout.c:1745 |
a6cd2cc4 JX |
10621 | msgid "create/reset and switch to a branch" |
10622 | msgstr "创建/重置并切换一个分支" | |
10623 | ||
a5cd71ca | 10624 | #: builtin/checkout.c:1747 |
a6cd2cc4 JX |
10625 | msgid "second guess 'git switch <no-such-branch>'" |
10626 | msgstr "二次猜测 'git switch <无此分支>'" | |
10627 | ||
a5cd71ca | 10628 | #: builtin/checkout.c:1749 |
a6cd2cc4 JX |
10629 | msgid "throw away local modifications" |
10630 | msgstr "丢弃本地修改" | |
10631 | ||
a5cd71ca | 10632 | #: builtin/checkout.c:1781 |
a6cd2cc4 JX |
10633 | msgid "which tree-ish to checkout from" |
10634 | msgstr "要检出哪一个树" | |
10635 | ||
a5cd71ca | 10636 | #: builtin/checkout.c:1783 |
a6cd2cc4 JX |
10637 | msgid "restore the index" |
10638 | msgstr "恢复索引" | |
10639 | ||
a5cd71ca | 10640 | #: builtin/checkout.c:1785 |
a6cd2cc4 JX |
10641 | msgid "restore the working tree (default)" |
10642 | msgstr "恢复工作区(默认)" | |
10643 | ||
a5cd71ca | 10644 | #: builtin/checkout.c:1787 |
a6cd2cc4 JX |
10645 | msgid "ignore unmerged entries" |
10646 | msgstr "忽略未合并条目" | |
10647 | ||
a5cd71ca | 10648 | #: builtin/checkout.c:1788 |
a6cd2cc4 JX |
10649 | msgid "use overlay mode" |
10650 | msgstr "使用叠加模式" | |
10651 | ||
06991777 | 10652 | #: builtin/clean.c:28 |
2e8451e8 JX |
10653 | msgid "" |
10654 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
10655 | msgstr "" | |
10656 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 10657 | |
06991777 | 10658 | #: builtin/clean.c:32 |
07432cef WS |
10659 | #, c-format |
10660 | msgid "Removing %s\n" | |
10661 | msgstr "正删除 %s\n" | |
10662 | ||
06991777 | 10663 | #: builtin/clean.c:33 |
07432cef WS |
10664 | #, c-format |
10665 | msgid "Would remove %s\n" | |
10666 | msgstr "将删除 %s\n" | |
10667 | ||
06991777 | 10668 | #: builtin/clean.c:34 |
07432cef WS |
10669 | #, c-format |
10670 | msgid "Skipping repository %s\n" | |
160fb2b2 | 10671 | msgstr "忽略仓库 %s\n" |
07432cef | 10672 | |
06991777 | 10673 | #: builtin/clean.c:35 |
07432cef WS |
10674 | #, c-format |
10675 | msgid "Would skip repository %s\n" | |
160fb2b2 | 10676 | msgstr "将忽略仓库 %s\n" |
07432cef | 10677 | |
06991777 | 10678 | #: builtin/clean.c:36 |
07432cef WS |
10679 | #, c-format |
10680 | msgid "failed to remove %s" | |
c1ac5258 | 10681 | msgstr "删除 %s 失败" |
07432cef | 10682 | |
a6cd2cc4 JX |
10683 | #: builtin/clean.c:37 |
10684 | #, c-format | |
10685 | msgid "could not lstat %s\n" | |
10686 | msgstr "不能对 %s 调用 lstat\n" | |
10687 | ||
a5cd71ca | 10688 | #: builtin/clean.c:301 git-add--interactive.perl:593 |
1a79b2f1 | 10689 | #, c-format |
2e8451e8 JX |
10690 | msgid "" |
10691 | "Prompt help:\n" | |
10692 | "1 - select a numbered item\n" | |
10693 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 10694 | " - (empty) select nothing\n" |
2e8451e8 JX |
10695 | msgstr "" |
10696 | "帮助:\n" | |
10697 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
10698 | "foo - 通过唯一前缀选择一个选项\n" |
10699 | " - (空)什么也不选择\n" | |
2e8451e8 | 10700 | |
a5cd71ca | 10701 | #: builtin/clean.c:305 git-add--interactive.perl:602 |
1a79b2f1 | 10702 | #, c-format |
2e8451e8 JX |
10703 | msgid "" |
10704 | "Prompt help:\n" | |
10705 | "1 - select a single item\n" | |
10706 | "3-5 - select a range of items\n" | |
10707 | "2-3,6-9 - select multiple ranges\n" | |
10708 | "foo - select item based on unique prefix\n" | |
10709 | "-... - unselect specified items\n" | |
10710 | "* - choose all items\n" | |
1a79b2f1 | 10711 | " - (empty) finish selecting\n" |
2e8451e8 JX |
10712 | msgstr "" |
10713 | "帮助:\n" | |
10714 | "1 - 选择一个选项\n" | |
10715 | "3-5 - 选择一个范围内的所有选项\n" | |
10716 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 10717 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
10718 | "-... - 反选特定的选项\n" |
10719 | "* - 选择所有选项\n" | |
1a79b2f1 | 10720 | " - (空)结束选择\n" |
2e8451e8 | 10721 | |
a5cd71ca | 10722 | #: builtin/clean.c:521 git-add--interactive.perl:568 |
a6cd2cc4 | 10723 | #: git-add--interactive.perl:573 |
1a79b2f1 JX |
10724 | #, c-format, perl-format |
10725 | msgid "Huh (%s)?\n" | |
10726 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 10727 | |
a5cd71ca | 10728 | #: builtin/clean.c:663 |
2e8451e8 JX |
10729 | #, c-format |
10730 | msgid "Input ignore patterns>> " | |
10731 | msgstr "输入模版以排除条目>> " | |
10732 | ||
a5cd71ca | 10733 | #: builtin/clean.c:700 |
2e8451e8 JX |
10734 | #, c-format |
10735 | msgid "WARNING: Cannot find items matched by: %s" | |
10736 | msgstr "警告:无法找到和 %s 匹配的条目" | |
10737 | ||
a5cd71ca | 10738 | #: builtin/clean.c:721 |
2e8451e8 JX |
10739 | msgid "Select items to delete" |
10740 | msgstr "选择要删除的条目" | |
10741 | ||
814ff314 | 10742 | #. TRANSLATORS: Make sure to keep [y/N] as is |
a5cd71ca | 10743 | #: builtin/clean.c:762 |
2e8451e8 | 10744 | #, c-format |
814ff314 JX |
10745 | msgid "Remove %s [y/N]? " |
10746 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 10747 | |
a5cd71ca | 10748 | #: builtin/clean.c:787 git-add--interactive.perl:1763 |
1a79b2f1 JX |
10749 | #, c-format |
10750 | msgid "Bye.\n" | |
10751 | msgstr "再见。\n" | |
2e8451e8 | 10752 | |
a5cd71ca | 10753 | #: builtin/clean.c:795 |
2e8451e8 JX |
10754 | msgid "" |
10755 | "clean - start cleaning\n" | |
10756 | "filter by pattern - exclude items from deletion\n" | |
10757 | "select by numbers - select items to be deleted by numbers\n" | |
10758 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
10759 | "quit - stop cleaning\n" | |
10760 | "help - this screen\n" | |
10761 | "? - help for prompt selection" | |
10762 | msgstr "" | |
10763 | "clean - 开始清理\n" | |
10764 | "filter by pattern - 通过模版排除要删除的条目\n" | |
10765 | "select by numbers - 通过数字选择要删除的条目\n" | |
10766 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
10767 | "quit - 停止删除并退出\n" | |
10768 | "help - 显示本帮助\n" | |
10769 | "? - 显示如何在提示符下选择的帮助" | |
10770 | ||
a5cd71ca | 10771 | #: builtin/clean.c:822 git-add--interactive.perl:1849 |
2e8451e8 JX |
10772 | msgid "*** Commands ***" |
10773 | msgstr "*** 命令 ***" | |
10774 | ||
a5cd71ca | 10775 | #: builtin/clean.c:823 git-add--interactive.perl:1846 |
2e8451e8 JX |
10776 | msgid "What now" |
10777 | msgstr "请选择" | |
10778 | ||
a5cd71ca | 10779 | #: builtin/clean.c:831 |
2e8451e8 JX |
10780 | msgid "Would remove the following item:" |
10781 | msgid_plural "Would remove the following items:" | |
10782 | msgstr[0] "将删除如下条目:" | |
10783 | msgstr[1] "将删除如下条目:" | |
10784 | ||
a5cd71ca | 10785 | #: builtin/clean.c:847 |
2e8451e8 JX |
10786 | msgid "No more files to clean, exiting." |
10787 | msgstr "没有要清理的文件,退出。" | |
10788 | ||
a5cd71ca | 10789 | #: builtin/clean.c:909 |
ef317cd5 | 10790 | msgid "do not print names of files removed" |
07432cef | 10791 | msgstr "不打印删除文件的名称" |
ef317cd5 | 10792 | |
a5cd71ca | 10793 | #: builtin/clean.c:911 |
ef317cd5 | 10794 | msgid "force" |
07432cef | 10795 | msgstr "强制" |
ef317cd5 | 10796 | |
a5cd71ca | 10797 | #: builtin/clean.c:912 |
2e8451e8 JX |
10798 | msgid "interactive cleaning" |
10799 | msgstr "交互式清除" | |
10800 | ||
a5cd71ca | 10801 | #: builtin/clean.c:914 |
ef317cd5 | 10802 | msgid "remove whole directories" |
07432cef | 10803 | msgstr "删除整个目录" |
ef317cd5 | 10804 | |
a5cd71ca JX |
10805 | #: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 |
10806 | #: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 | |
10807 | #: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 | |
d46c5519 | 10808 | #: builtin/show-ref.c:179 |
ef317cd5 | 10809 | msgid "pattern" |
07432cef | 10810 | msgstr "模式" |
ef317cd5 | 10811 | |
a5cd71ca | 10812 | #: builtin/clean.c:916 |
ef317cd5 | 10813 | msgid "add <pattern> to ignore rules" |
4375c10e | 10814 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 10815 | |
a5cd71ca | 10816 | #: builtin/clean.c:917 |
ef317cd5 | 10817 | msgid "remove ignored files, too" |
07432cef | 10818 | msgstr "也删除忽略的文件" |
ef317cd5 | 10819 | |
a5cd71ca | 10820 | #: builtin/clean.c:919 |
ef317cd5 | 10821 | msgid "remove only ignored files" |
07432cef | 10822 | msgstr "只删除忽略的文件" |
c04f5ac3 | 10823 | |
a5cd71ca | 10824 | #: builtin/clean.c:937 |
c04f5ac3 | 10825 | msgid "-x and -X cannot be used together" |
649900bc | 10826 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 10827 | |
a5cd71ca | 10828 | #: builtin/clean.c:941 |
c04f5ac3 | 10829 | msgid "" |
6c94aba5 | 10830 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 10831 | "clean" |
c04f5ac3 | 10832 | msgstr "" |
2e8451e8 | 10833 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 10834 | |
a5cd71ca | 10835 | #: builtin/clean.c:944 |
c04f5ac3 | 10836 | msgid "" |
6c94aba5 | 10837 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 10838 | "refusing to clean" |
c04f5ac3 | 10839 | msgstr "" |
2e8451e8 | 10840 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 10841 | |
a5cd71ca | 10842 | #: builtin/clone.c:45 |
814ff314 | 10843 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 10844 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 10845 | |
a5cd71ca | 10846 | #: builtin/clone.c:92 |
ef317cd5 | 10847 | msgid "don't create a checkout" |
07432cef | 10848 | msgstr "不创建一个检出" |
ef317cd5 | 10849 | |
a5cd71ca | 10850 | #: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 |
ef317cd5 | 10851 | msgid "create a bare repository" |
160fb2b2 | 10852 | msgstr "创建一个纯仓库" |
ef317cd5 | 10853 | |
a5cd71ca | 10854 | #: builtin/clone.c:97 |
ef317cd5 | 10855 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 10856 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 10857 | |
a5cd71ca | 10858 | #: builtin/clone.c:99 |
ef317cd5 | 10859 | msgid "to clone from a local repository" |
160fb2b2 | 10860 | msgstr "从本地仓库克隆" |
ef317cd5 | 10861 | |
a5cd71ca | 10862 | #: builtin/clone.c:101 |
ef317cd5 | 10863 | msgid "don't use local hardlinks, always copy" |
07432cef | 10864 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 10865 | |
a5cd71ca | 10866 | #: builtin/clone.c:103 |
ef317cd5 | 10867 | msgid "setup as shared repository" |
160fb2b2 | 10868 | msgstr "设置为共享仓库" |
ef317cd5 | 10869 | |
a5cd71ca | 10870 | #: builtin/clone.c:106 |
87cb7997 | 10871 | msgid "pathspec" |
65e2041e | 10872 | msgstr "路径规格" |
87cb7997 | 10873 | |
a5cd71ca | 10874 | #: builtin/clone.c:106 |
ef317cd5 | 10875 | msgid "initialize submodules in the clone" |
07432cef | 10876 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 10877 | |
a5cd71ca | 10878 | #: builtin/clone.c:109 |
5b04ee3b JX |
10879 | msgid "number of submodules cloned in parallel" |
10880 | msgstr "并发克隆的子模组的数量" | |
10881 | ||
a5cd71ca | 10882 | #: builtin/clone.c:110 builtin/init-db.c:486 |
ef317cd5 | 10883 | msgid "template-directory" |
07432cef | 10884 | msgstr "模板目录" |
ef317cd5 | 10885 | |
a5cd71ca | 10886 | #: builtin/clone.c:111 builtin/init-db.c:487 |
ef317cd5 | 10887 | msgid "directory from which templates will be used" |
07432cef | 10888 | msgstr "模板目录将被使用" |
ef317cd5 | 10889 | |
a5cd71ca | 10890 | #: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 |
a6cd2cc4 | 10891 | #: builtin/submodule--helper.c:1860 |
ef317cd5 | 10892 | msgid "reference repository" |
160fb2b2 | 10893 | msgstr "参考仓库" |
ef317cd5 | 10894 | |
a5cd71ca | 10895 | #: builtin/clone.c:117 builtin/submodule--helper.c:1382 |
a6cd2cc4 | 10896 | #: builtin/submodule--helper.c:1862 |
7aea43ff | 10897 | msgid "use --reference only while cloning" |
160fb2b2 | 10898 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 10899 | |
a5cd71ca JX |
10900 | #: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 |
10901 | #: builtin/pack-objects.c:3294 builtin/repack.c:320 | |
ef317cd5 | 10902 | msgid "name" |
07432cef | 10903 | msgstr "名称" |
ef317cd5 | 10904 | |
a5cd71ca | 10905 | #: builtin/clone.c:119 |
ef317cd5 | 10906 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 10907 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 10908 | |
a5cd71ca | 10909 | #: builtin/clone.c:121 |
ef317cd5 | 10910 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 10911 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 10912 | |
a5cd71ca | 10913 | #: builtin/clone.c:123 |
ef317cd5 | 10914 | msgid "path to git-upload-pack on the remote" |
07432cef | 10915 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 10916 | |
a5cd71ca JX |
10917 | #: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 |
10918 | #: builtin/pull.c:227 | |
ef317cd5 | 10919 | msgid "depth" |
07432cef | 10920 | msgstr "深度" |
ef317cd5 | 10921 | |
a5cd71ca | 10922 | #: builtin/clone.c:125 |
ef317cd5 | 10923 | msgid "create a shallow clone of that depth" |
07432cef | 10924 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 10925 | |
a5cd71ca | 10926 | #: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 |
a0b6b246 JX |
10927 | msgid "time" |
10928 | msgstr "时间" | |
10929 | ||
a5cd71ca | 10930 | #: builtin/clone.c:127 |
a0b6b246 JX |
10931 | msgid "create a shallow clone since a specific time" |
10932 | msgstr "从一个特定时间创建一个浅克隆" | |
10933 | ||
a5cd71ca JX |
10934 | #: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 |
10935 | #: builtin/rebase.c:1417 | |
a0b6b246 JX |
10936 | msgid "revision" |
10937 | msgstr "版本" | |
10938 | ||
a5cd71ca | 10939 | #: builtin/clone.c:129 builtin/fetch.c:172 |
1a79b2f1 JX |
10940 | msgid "deepen history of shallow clone, excluding rev" |
10941 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 10942 | |
a5cd71ca | 10943 | #: builtin/clone.c:131 |
ef317cd5 | 10944 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 10945 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 10946 | |
a5cd71ca | 10947 | #: builtin/clone.c:133 |
a4f16749 JX |
10948 | msgid "don't clone any tags, and make later fetches not to follow them" |
10949 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
10950 | ||
a5cd71ca | 10951 | #: builtin/clone.c:135 |
5b04ee3b JX |
10952 | msgid "any cloned submodules will be shallow" |
10953 | msgstr "子模组将以浅下载模式克隆" | |
10954 | ||
a5cd71ca | 10955 | #: builtin/clone.c:136 builtin/init-db.c:495 |
ef317cd5 | 10956 | msgid "gitdir" |
07432cef | 10957 | msgstr "git目录" |
ef317cd5 | 10958 | |
a5cd71ca | 10959 | #: builtin/clone.c:137 builtin/init-db.c:496 |
ef317cd5 | 10960 | msgid "separate git dir from working tree" |
07432cef | 10961 | msgstr "git目录和工作区分离" |
ef317cd5 | 10962 | |
a5cd71ca | 10963 | #: builtin/clone.c:138 |
ef317cd5 | 10964 | msgid "key=value" |
07432cef | 10965 | msgstr "key=value" |
ef317cd5 | 10966 | |
a5cd71ca | 10967 | #: builtin/clone.c:139 |
ef317cd5 | 10968 | msgid "set config inside the new repository" |
160fb2b2 | 10969 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 10970 | |
a5cd71ca JX |
10971 | #: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 |
10972 | #: builtin/push.c:572 builtin/send-pack.c:172 | |
d46c5519 JX |
10973 | msgid "server-specific" |
10974 | msgstr "server-specific" | |
10975 | ||
a5cd71ca JX |
10976 | #: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 |
10977 | #: builtin/push.c:572 builtin/send-pack.c:173 | |
d46c5519 JX |
10978 | msgid "option to transmit" |
10979 | msgstr "传输选项" | |
10980 | ||
a5cd71ca JX |
10981 | #: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 |
10982 | #: builtin/push.c:573 | |
276ceeaa JX |
10983 | msgid "use IPv4 addresses only" |
10984 | msgstr "只使用 IPv4 地址" | |
10985 | ||
a5cd71ca JX |
10986 | #: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 |
10987 | #: builtin/push.c:575 | |
276ceeaa JX |
10988 | msgid "use IPv6 addresses only" |
10989 | msgstr "只使用 IPv6 地址" | |
10990 | ||
a5cd71ca | 10991 | #: builtin/clone.c:148 |
a6cd2cc4 JX |
10992 | msgid "any cloned submodules will use their remote-tracking branch" |
10993 | msgstr "任何克隆的子模组将使用它们的远程跟踪分支" | |
10994 | ||
a5cd71ca | 10995 | #: builtin/clone.c:284 |
3495628d JX |
10996 | msgid "" |
10997 | "No directory name could be guessed.\n" | |
10998 | "Please specify a directory on the command line" | |
10999 | msgstr "" | |
11000 | "无法猜到目录名。\n" | |
26e4cbec | 11001 | "请在命令行指定一个目录" |
3495628d | 11002 | |
a5cd71ca | 11003 | #: builtin/clone.c:337 |
cfff71a9 | 11004 | #, c-format |
a0b6b246 JX |
11005 | msgid "info: Could not add alternate for '%s': %s\n" |
11006 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 11007 | |
a5cd71ca | 11008 | #: builtin/clone.c:410 |
c04f5ac3 JX |
11009 | #, c-format |
11010 | msgid "%s exists and is not a directory" | |
11011 | msgstr "%s 存在且不是一个目录" | |
11012 | ||
a5cd71ca | 11013 | #: builtin/clone.c:427 |
c04f5ac3 | 11014 | #, c-format |
a6cd2cc4 JX |
11015 | msgid "failed to start iterator over '%s'" |
11016 | msgstr "无法在 '%s' 上启动迭代器" | |
c04f5ac3 | 11017 | |
a5cd71ca | 11018 | #: builtin/clone.c:457 |
c04f5ac3 JX |
11019 | #, c-format |
11020 | msgid "failed to create link '%s'" | |
c1ac5258 | 11021 | msgstr "创建链接 '%s' 失败" |
c04f5ac3 | 11022 | |
a5cd71ca | 11023 | #: builtin/clone.c:461 |
c04f5ac3 JX |
11024 | #, c-format |
11025 | msgid "failed to copy file to '%s'" | |
c1ac5258 | 11026 | msgstr "拷贝文件至 '%s' 失败" |
c04f5ac3 | 11027 | |
a5cd71ca | 11028 | #: builtin/clone.c:466 |
a6cd2cc4 JX |
11029 | #, c-format |
11030 | msgid "failed to iterate over '%s'" | |
11031 | msgstr "无法在 '%s' 上迭代" | |
11032 | ||
a5cd71ca | 11033 | #: builtin/clone.c:491 |
c04f5ac3 JX |
11034 | #, c-format |
11035 | msgid "done.\n" | |
11036 | msgstr "完成。\n" | |
11037 | ||
a5cd71ca | 11038 | #: builtin/clone.c:505 |
1003b3a5 JX |
11039 | msgid "" |
11040 | "Clone succeeded, but checkout failed.\n" | |
11041 | "You can inspect what was checked out with 'git status'\n" | |
a6cd2cc4 | 11042 | "and retry with 'git restore --source=HEAD :/'\n" |
1003b3a5 JX |
11043 | msgstr "" |
11044 | "克隆成功,但是检出失败。\n" | |
11045 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
a6cd2cc4 | 11046 | "'git restore --source=HEAD :/' 重试\n" |
1003b3a5 | 11047 | |
a5cd71ca | 11048 | #: builtin/clone.c:582 |
c04f5ac3 JX |
11049 | #, c-format |
11050 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 11051 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 11052 | |
a5cd71ca | 11053 | #: builtin/clone.c:701 |
3495628d JX |
11054 | #, c-format |
11055 | msgid "unable to update %s" | |
11056 | msgstr "不能更新 %s" | |
11057 | ||
a5cd71ca | 11058 | #: builtin/clone.c:751 |
c04f5ac3 JX |
11059 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
11060 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
11061 | ||
a5cd71ca | 11062 | #: builtin/clone.c:782 |
1003b3a5 JX |
11063 | msgid "unable to checkout working tree" |
11064 | msgstr "不能检出工作区" | |
11065 | ||
a5cd71ca | 11066 | #: builtin/clone.c:832 |
3495628d JX |
11067 | msgid "unable to write parameters to config file" |
11068 | msgstr "无法将参数写入配置文件" | |
11069 | ||
a5cd71ca | 11070 | #: builtin/clone.c:895 |
04cb2f28 JX |
11071 | msgid "cannot repack to clean up" |
11072 | msgstr "无法执行 repack 来清理" | |
11073 | ||
a5cd71ca | 11074 | #: builtin/clone.c:897 |
04cb2f28 JX |
11075 | msgid "cannot unlink temporary alternates file" |
11076 | msgstr "无法删除临时的 alternates 文件" | |
11077 | ||
a5cd71ca | 11078 | #: builtin/clone.c:937 builtin/receive-pack.c:1948 |
c04f5ac3 JX |
11079 | msgid "Too many arguments." |
11080 | msgstr "太多参数。" | |
11081 | ||
a5cd71ca | 11082 | #: builtin/clone.c:941 |
c04f5ac3 | 11083 | msgid "You must specify a repository to clone." |
160fb2b2 | 11084 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 11085 | |
a5cd71ca | 11086 | #: builtin/clone.c:954 |
c04f5ac3 JX |
11087 | #, c-format |
11088 | msgid "--bare and --origin %s options are incompatible." | |
11089 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
11090 | ||
a5cd71ca | 11091 | #: builtin/clone.c:957 |
07432cef WS |
11092 | msgid "--bare and --separate-git-dir are incompatible." |
11093 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
11094 | ||
a5cd71ca | 11095 | #: builtin/clone.c:970 |
c04f5ac3 JX |
11096 | #, c-format |
11097 | msgid "repository '%s' does not exist" | |
160fb2b2 | 11098 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 11099 | |
a5cd71ca | 11100 | #: builtin/clone.c:976 builtin/fetch.c:1790 |
cfff71a9 JX |
11101 | #, c-format |
11102 | msgid "depth %s is not a positive number" | |
11103 | msgstr "深度 %s 不是一个正数" | |
11104 | ||
a5cd71ca | 11105 | #: builtin/clone.c:986 |
c04f5ac3 JX |
11106 | #, c-format |
11107 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 11108 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 11109 | |
a5cd71ca | 11110 | #: builtin/clone.c:996 |
c04f5ac3 JX |
11111 | #, c-format |
11112 | msgid "working tree '%s' already exists." | |
11113 | msgstr "工作区 '%s' 已经存在。" | |
11114 | ||
a5cd71ca JX |
11115 | #: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 |
11116 | #: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 | |
5bb01d4f JX |
11117 | #, c-format |
11118 | msgid "could not create leading directories of '%s'" | |
11119 | msgstr "不能为 '%s' 创建先导目录" | |
11120 | ||
a5cd71ca | 11121 | #: builtin/clone.c:1016 |
c04f5ac3 | 11122 | #, c-format |
814ff314 JX |
11123 | msgid "could not create work tree dir '%s'" |
11124 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 11125 | |
a5cd71ca | 11126 | #: builtin/clone.c:1036 |
c04f5ac3 JX |
11127 | #, c-format |
11128 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 11129 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 11130 | |
a5cd71ca | 11131 | #: builtin/clone.c:1038 |
c04f5ac3 JX |
11132 | #, c-format |
11133 | msgid "Cloning into '%s'...\n" | |
11134 | msgstr "正克隆到 '%s'...\n" | |
11135 | ||
a5cd71ca | 11136 | #: builtin/clone.c:1062 |
a0b6b246 JX |
11137 | msgid "" |
11138 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
11139 | "able" | |
11140 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
11141 | ||
a5cd71ca | 11142 | #: builtin/clone.c:1123 |
6acbf033 | 11143 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
11144 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
11145 | ||
a5cd71ca | 11146 | #: builtin/clone.c:1125 |
a0b6b246 JX |
11147 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
11148 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 11149 | |
a5cd71ca | 11150 | #: builtin/clone.c:1127 |
a0b6b246 JX |
11151 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
11152 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
11153 | ||
a5cd71ca | 11154 | #: builtin/clone.c:1129 |
31e5e17b JX |
11155 | msgid "--filter is ignored in local clones; use file:// instead." |
11156 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
11157 | ||
a5cd71ca | 11158 | #: builtin/clone.c:1132 |
6acbf033 | 11159 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 11160 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 11161 | |
a5cd71ca | 11162 | #: builtin/clone.c:1137 |
6acbf033 JX |
11163 | msgid "--local is ignored" |
11164 | msgstr "--local 被忽略" | |
11165 | ||
a5cd71ca | 11166 | #: builtin/clone.c:1212 builtin/clone.c:1220 |
c04f5ac3 JX |
11167 | #, c-format |
11168 | msgid "Remote branch %s not found in upstream %s" | |
11169 | msgstr "远程分支 %s 在上游 %s 未发现" | |
11170 | ||
a5cd71ca | 11171 | #: builtin/clone.c:1223 |
c04f5ac3 | 11172 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 11173 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 11174 | |
a4f16749 | 11175 | #: builtin/column.c:10 |
814ff314 JX |
11176 | msgid "git column [<options>]" |
11177 | msgstr "git column [<选项>]" | |
ef317cd5 | 11178 | |
a4f16749 | 11179 | #: builtin/column.c:27 |
ef317cd5 | 11180 | msgid "lookup config vars" |
07432cef | 11181 | msgstr "查找配置变量" |
ef317cd5 | 11182 | |
a4f16749 | 11183 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 11184 | msgid "layout to use" |
07432cef | 11185 | msgstr "要使用的布局" |
ef317cd5 | 11186 | |
a4f16749 | 11187 | #: builtin/column.c:30 |
ef317cd5 | 11188 | msgid "Maximum width" |
07432cef | 11189 | msgstr "最大宽度" |
ef317cd5 | 11190 | |
a4f16749 | 11191 | #: builtin/column.c:31 |
ef317cd5 | 11192 | msgid "Padding space on left border" |
07432cef | 11193 | msgstr "左边框的填充空间" |
ef317cd5 | 11194 | |
a4f16749 | 11195 | #: builtin/column.c:32 |
ef317cd5 | 11196 | msgid "Padding space on right border" |
07432cef | 11197 | msgstr "右边框的填充空间" |
ef317cd5 | 11198 | |
a4f16749 | 11199 | #: builtin/column.c:33 |
ef317cd5 | 11200 | msgid "Padding space between columns" |
07432cef | 11201 | msgstr "两列之间的填充空间" |
ef317cd5 | 11202 | |
fd8cb379 | 11203 | #: builtin/column.c:51 |
8ada9598 | 11204 | msgid "--command must be the first argument" |
81809b99 | 11205 | msgstr "--command 必须是第一个参数" |
8ada9598 | 11206 | |
d46c5519 JX |
11207 | #: builtin/commit-tree.c:18 |
11208 | msgid "" | |
11209 | "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " | |
11210 | "<file>)...] <tree>" | |
11211 | msgstr "" | |
11212 | "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" | |
11213 | ">)...] <树>" | |
11214 | ||
11215 | #: builtin/commit-tree.c:31 | |
11216 | #, c-format | |
11217 | msgid "duplicate parent %s ignored" | |
11218 | msgstr "忽略重复的父提交 %s" | |
11219 | ||
a6cd2cc4 | 11220 | #: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 |
d46c5519 JX |
11221 | #, c-format |
11222 | msgid "not a valid object name %s" | |
11223 | msgstr "不是一个有效的对象名 %s" | |
11224 | ||
11225 | #: builtin/commit-tree.c:93 | |
11226 | #, c-format | |
11227 | msgid "git commit-tree: failed to open '%s'" | |
11228 | msgstr "git commit-tree:无法打开 '%s'" | |
11229 | ||
11230 | #: builtin/commit-tree.c:96 | |
11231 | #, c-format | |
11232 | msgid "git commit-tree: failed to read '%s'" | |
11233 | msgstr "git commit-tree:无法读取 '%s'" | |
11234 | ||
11235 | #: builtin/commit-tree.c:98 | |
11236 | #, c-format | |
11237 | msgid "git commit-tree: failed to close '%s'" | |
11238 | msgstr "git commit-tree:无法关闭 '%s'" | |
11239 | ||
11240 | #: builtin/commit-tree.c:111 | |
11241 | msgid "parent" | |
11242 | msgstr "父提交" | |
11243 | ||
11244 | #: builtin/commit-tree.c:112 | |
11245 | msgid "id of a parent commit object" | |
5b533632 | 11246 | msgstr "父提交对象 ID" |
d46c5519 | 11247 | |
a6cd2cc4 | 11248 | #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 |
a5cd71ca | 11249 | #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 |
a6cd2cc4 | 11250 | #: builtin/tag.c:412 |
d46c5519 JX |
11251 | msgid "message" |
11252 | msgstr "说明" | |
11253 | ||
a6cd2cc4 | 11254 | #: builtin/commit-tree.c:115 builtin/commit.c:1500 |
d46c5519 JX |
11255 | msgid "commit message" |
11256 | msgstr "提交说明" | |
11257 | ||
11258 | #: builtin/commit-tree.c:118 | |
11259 | msgid "read commit log message from file" | |
11260 | msgstr "从文件中读取提交说明" | |
11261 | ||
a6cd2cc4 | 11262 | #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 |
a5cd71ca | 11263 | #: builtin/pull.c:195 builtin/revert.c:118 |
d46c5519 JX |
11264 | msgid "GPG sign commit" |
11265 | msgstr "GPG 提交签名" | |
11266 | ||
11267 | #: builtin/commit-tree.c:133 | |
11268 | msgid "must give exactly one tree" | |
11269 | msgstr "必须精确地提供一个树" | |
11270 | ||
11271 | #: builtin/commit-tree.c:140 | |
11272 | msgid "git commit-tree: failed to read" | |
11273 | msgstr "git commit-tree:读取失败" | |
11274 | ||
06991777 | 11275 | #: builtin/commit.c:41 |
814ff314 | 11276 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 11277 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 11278 | |
06991777 | 11279 | #: builtin/commit.c:46 |
814ff314 | 11280 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 11281 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 11282 | |
06991777 | 11283 | #: builtin/commit.c:51 |
c04f5ac3 JX |
11284 | msgid "" |
11285 | "You asked to amend the most recent commit, but doing so would make\n" | |
11286 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
11287 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
11288 | msgstr "" | |
1b150dc9 T |
11289 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
11290 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 11291 | |
06991777 | 11292 | #: builtin/commit.c:56 |
c04f5ac3 JX |
11293 | msgid "" |
11294 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
11295 | "If you wish to commit it anyway, use:\n" | |
11296 | "\n" | |
11297 | " git commit --allow-empty\n" | |
11298 | "\n" | |
c04f5ac3 | 11299 | msgstr "" |
a9ce4543 T |
11300 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
11301 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
11302 | "\n" |
11303 | " git commit --allow-empty\n" | |
11304 | "\n" | |
c04f5ac3 | 11305 | |
06991777 | 11306 | #: builtin/commit.c:63 |
a6cd2cc4 JX |
11307 | msgid "Otherwise, please use 'git cherry-pick --skip'\n" |
11308 | msgstr "否则,请使用 'git cherry-pick --skip'\n" | |
b1894384 | 11309 | |
06991777 | 11310 | #: builtin/commit.c:66 |
b1894384 | 11311 | msgid "" |
a6cd2cc4 JX |
11312 | "and then use:\n" |
11313 | "\n" | |
11314 | " git cherry-pick --continue\n" | |
11315 | "\n" | |
11316 | "to resume cherry-picking the remaining commits.\n" | |
b1894384 JX |
11317 | "If you wish to skip this commit, use:\n" |
11318 | "\n" | |
a6cd2cc4 | 11319 | " git cherry-pick --skip\n" |
b1894384 | 11320 | "\n" |
b1894384 | 11321 | msgstr "" |
a6cd2cc4 JX |
11322 | "然后使用:\n" |
11323 | "\n" | |
11324 | " git cherry-pick --continue\n" | |
b1894384 | 11325 | "\n" |
a6cd2cc4 JX |
11326 | "来继续拣选剩余提交。如果您想跳过此提交,使用:\n" |
11327 | "\n" | |
11328 | " git cherry-pick --skip\n" | |
b1894384 | 11329 | "\n" |
b1894384 | 11330 | |
a6cd2cc4 | 11331 | #: builtin/commit.c:315 |
c04f5ac3 | 11332 | msgid "failed to unpack HEAD tree object" |
c1ac5258 | 11333 | msgstr "解包 HEAD 树对象失败" |
c04f5ac3 | 11334 | |
a6cd2cc4 | 11335 | #: builtin/commit.c:356 |
c04f5ac3 | 11336 | msgid "unable to create temporary index" |
90e6ef53 | 11337 | msgstr "不能创建临时索引" |
c04f5ac3 | 11338 | |
a6cd2cc4 | 11339 | #: builtin/commit.c:362 |
c04f5ac3 JX |
11340 | msgid "interactive add failed" |
11341 | msgstr "交互式添加失败" | |
11342 | ||
a6cd2cc4 | 11343 | #: builtin/commit.c:376 |
220c313c JX |
11344 | msgid "unable to update temporary index" |
11345 | msgstr "无法更新临时索引" | |
11346 | ||
a6cd2cc4 | 11347 | #: builtin/commit.c:378 |
220c313c JX |
11348 | msgid "Failed to update main cache tree" |
11349 | msgstr "不能更新树的主缓存" | |
11350 | ||
a6cd2cc4 | 11351 | #: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 |
c04f5ac3 | 11352 | msgid "unable to write new_index file" |
90e6ef53 | 11353 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 11354 | |
a6cd2cc4 | 11355 | #: builtin/commit.c:455 |
8ada9598 | 11356 | msgid "cannot do a partial commit during a merge." |
81809b99 | 11357 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 11358 | |
a6cd2cc4 | 11359 | #: builtin/commit.c:457 |
8ada9598 | 11360 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 11361 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 11362 | |
a6cd2cc4 | 11363 | #: builtin/commit.c:465 |
c04f5ac3 | 11364 | msgid "cannot read the index" |
90e6ef53 | 11365 | msgstr "无法读取索引" |
c04f5ac3 | 11366 | |
a6cd2cc4 | 11367 | #: builtin/commit.c:484 |
c04f5ac3 | 11368 | msgid "unable to write temporary index file" |
90e6ef53 | 11369 | msgstr "无法写临时索引文件" |
c04f5ac3 | 11370 | |
a6cd2cc4 | 11371 | #: builtin/commit.c:582 |
220c313c JX |
11372 | #, c-format |
11373 | msgid "commit '%s' lacks author header" | |
11374 | msgstr "提交 '%s' 缺少作者信息" | |
11375 | ||
a6cd2cc4 | 11376 | #: builtin/commit.c:584 |
c04f5ac3 | 11377 | #, c-format |
220c313c | 11378 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 11379 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 11380 | |
a6cd2cc4 | 11381 | #: builtin/commit.c:603 |
c04f5ac3 | 11382 | msgid "malformed --author parameter" |
fd8cb379 | 11383 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 11384 | |
a6cd2cc4 | 11385 | #: builtin/commit.c:656 |
6acbf033 JX |
11386 | msgid "" |
11387 | "unable to select a comment character that is not used\n" | |
11388 | "in the current commit message" | |
11389 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
11390 | ||
a6cd2cc4 | 11391 | #: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 |
c04f5ac3 JX |
11392 | #, c-format |
11393 | msgid "could not lookup commit %s" | |
11394 | msgstr "不能查询提交 %s" | |
11395 | ||
a6cd2cc4 | 11396 | #: builtin/commit.c:706 builtin/shortlog.c:319 |
c04f5ac3 JX |
11397 | #, c-format |
11398 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 11399 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 11400 | |
a6cd2cc4 | 11401 | #: builtin/commit.c:708 |
c04f5ac3 | 11402 | msgid "could not read log from standard input" |
90e6ef53 | 11403 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 11404 | |
a6cd2cc4 | 11405 | #: builtin/commit.c:712 |
c04f5ac3 JX |
11406 | #, c-format |
11407 | msgid "could not read log file '%s'" | |
90e6ef53 | 11408 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 11409 | |
a6cd2cc4 | 11410 | #: builtin/commit.c:743 builtin/commit.c:759 |
c04f5ac3 | 11411 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 11412 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 11413 | |
a6cd2cc4 | 11414 | #: builtin/commit.c:750 |
5b04ee3b JX |
11415 | msgid "could not read MERGE_MSG" |
11416 | msgstr "不能读取 MERGE_MSG" | |
11417 | ||
a6cd2cc4 | 11418 | #: builtin/commit.c:810 |
c04f5ac3 | 11419 | msgid "could not write commit template" |
90e6ef53 | 11420 | msgstr "不能写提交模版" |
c04f5ac3 | 11421 | |
a6cd2cc4 | 11422 | #: builtin/commit.c:829 |
81809b99 | 11423 | #, c-format |
c04f5ac3 JX |
11424 | msgid "" |
11425 | "\n" | |
8ada9598 | 11426 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
11427 | "If this is not correct, please remove the file\n" |
11428 | "\t%s\n" | |
11429 | "and try again.\n" | |
11430 | msgstr "" | |
11431 | "\n" | |
649900bc | 11432 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
11433 | "\t%s\n" |
11434 | "然后重试。\n" | |
11435 | ||
a6cd2cc4 | 11436 | #: builtin/commit.c:834 |
81809b99 | 11437 | #, c-format |
8ada9598 JX |
11438 | msgid "" |
11439 | "\n" | |
11440 | "It looks like you may be committing a cherry-pick.\n" | |
11441 | "If this is not correct, please remove the file\n" | |
11442 | "\t%s\n" | |
11443 | "and try again.\n" | |
11444 | msgstr "" | |
11445 | "\n" | |
649900bc | 11446 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
11447 | "\t%s\n" |
11448 | "然后重试。\n" | |
c04f5ac3 | 11449 | |
a6cd2cc4 | 11450 | #: builtin/commit.c:847 |
a77c07d9 | 11451 | #, c-format |
c04f5ac3 | 11452 | msgid "" |
8ada9598 | 11453 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 11454 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 11455 | msgstr "" |
a77c07d9 | 11456 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 11457 | "说明将会终止提交。\n" |
c04f5ac3 | 11458 | |
a6cd2cc4 | 11459 | #: builtin/commit.c:855 |
a77c07d9 | 11460 | #, c-format |
c04f5ac3 | 11461 | msgid "" |
8ada9598 | 11462 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 11463 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
11464 | "An empty message aborts the commit.\n" |
11465 | msgstr "" | |
a77c07d9 JX |
11466 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
11467 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 11468 | |
90e6ef53 | 11469 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a6cd2cc4 | 11470 | #: builtin/commit.c:872 |
6acbf033 JX |
11471 | #, c-format |
11472 | msgid "%sAuthor: %.*s <%.*s>" | |
11473 | msgstr "%s作者: %.*s <%.*s>" | |
11474 | ||
11475 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
a6cd2cc4 | 11476 | #: builtin/commit.c:880 |
c04f5ac3 | 11477 | #, c-format |
6acbf033 JX |
11478 | msgid "%sDate: %s" |
11479 | msgstr "%s日期: %s" | |
c04f5ac3 | 11480 | |
90e6ef53 | 11481 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a6cd2cc4 | 11482 | #: builtin/commit.c:887 |
c04f5ac3 | 11483 | #, c-format |
6acbf033 JX |
11484 | msgid "%sCommitter: %.*s <%.*s>" |
11485 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 11486 | |
a6cd2cc4 | 11487 | #: builtin/commit.c:905 |
c04f5ac3 | 11488 | msgid "Cannot read index" |
90e6ef53 | 11489 | msgstr "无法读取索引" |
c04f5ac3 | 11490 | |
a6cd2cc4 | 11491 | #: builtin/commit.c:972 |
c04f5ac3 JX |
11492 | msgid "Error building trees" |
11493 | msgstr "无法创建树对象" | |
11494 | ||
a6cd2cc4 | 11495 | #: builtin/commit.c:986 builtin/tag.c:275 |
c04f5ac3 JX |
11496 | #, c-format |
11497 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 11498 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 11499 | |
a6cd2cc4 | 11500 | #: builtin/commit.c:1030 |
c04f5ac3 | 11501 | #, c-format |
814ff314 | 11502 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 11503 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 11504 | |
a6cd2cc4 | 11505 | #: builtin/commit.c:1044 |
5809aa05 JX |
11506 | #, c-format |
11507 | msgid "Invalid ignored mode '%s'" | |
11508 | msgstr "无效的忽略模式 '%s'" | |
11509 | ||
a6cd2cc4 | 11510 | #: builtin/commit.c:1062 builtin/commit.c:1304 |
c04f5ac3 JX |
11511 | #, c-format |
11512 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 11513 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 11514 | |
a6cd2cc4 | 11515 | #: builtin/commit.c:1102 |
2e8451e8 JX |
11516 | msgid "--long and -z are incompatible" |
11517 | msgstr "--long 和 -z 选项不兼容" | |
11518 | ||
a6cd2cc4 | 11519 | #: builtin/commit.c:1146 |
c04f5ac3 JX |
11520 | msgid "Using both --reset-author and --author does not make sense" |
11521 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
11522 | ||
a6cd2cc4 | 11523 | #: builtin/commit.c:1155 |
c04f5ac3 | 11524 | msgid "You have nothing to amend." |
90e6ef53 | 11525 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 11526 | |
a6cd2cc4 | 11527 | #: builtin/commit.c:1158 |
8ada9598 | 11528 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 11529 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 11530 | |
a6cd2cc4 | 11531 | #: builtin/commit.c:1160 |
8ada9598 | 11532 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 11533 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 11534 | |
a6cd2cc4 | 11535 | #: builtin/commit.c:1163 |
c04f5ac3 | 11536 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 11537 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 11538 | |
a6cd2cc4 | 11539 | #: builtin/commit.c:1173 |
c04f5ac3 JX |
11540 | msgid "Only one of -c/-C/-F/--fixup can be used." |
11541 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
11542 | ||
a6cd2cc4 | 11543 | #: builtin/commit.c:1175 |
31e5e17b JX |
11544 | msgid "Option -m cannot be combined with -c/-C/-F." |
11545 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 11546 | |
a6cd2cc4 | 11547 | #: builtin/commit.c:1183 |
c04f5ac3 | 11548 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 11549 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 11550 | |
a6cd2cc4 | 11551 | #: builtin/commit.c:1200 |
c04f5ac3 JX |
11552 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
11553 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
11554 | ||
a6cd2cc4 | 11555 | #: builtin/commit.c:1202 |
c04f5ac3 JX |
11556 | msgid "No paths with --include/--only does not make sense." |
11557 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
11558 | ||
a6cd2cc4 | 11559 | #: builtin/commit.c:1208 |
c04f5ac3 | 11560 | #, c-format |
d46c5519 JX |
11561 | msgid "paths '%s ...' with -a does not make sense" |
11562 | msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" | |
c04f5ac3 | 11563 | |
a6cd2cc4 | 11564 | #: builtin/commit.c:1339 builtin/commit.c:1523 |
ef317cd5 | 11565 | msgid "show status concisely" |
07432cef | 11566 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 11567 | |
a6cd2cc4 | 11568 | #: builtin/commit.c:1341 builtin/commit.c:1525 |
ef317cd5 | 11569 | msgid "show branch information" |
07432cef | 11570 | msgstr "显示分支信息" |
ef317cd5 | 11571 | |
a6cd2cc4 | 11572 | #: builtin/commit.c:1343 |
a4f16749 JX |
11573 | msgid "show stash information" |
11574 | msgstr "显示贮藏区信息" | |
11575 | ||
a6cd2cc4 | 11576 | #: builtin/commit.c:1345 builtin/commit.c:1527 |
31e5e17b JX |
11577 | msgid "compute full ahead/behind values" |
11578 | msgstr "计算完整的领先/落后值" | |
11579 | ||
a6cd2cc4 | 11580 | #: builtin/commit.c:1347 |
a0b6b246 JX |
11581 | msgid "version" |
11582 | msgstr "版本" | |
11583 | ||
a5cd71ca JX |
11584 | #: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 |
11585 | #: builtin/worktree.c:650 | |
ef317cd5 | 11586 | msgid "machine-readable output" |
07432cef WS |
11587 | msgstr "机器可读的输出" |
11588 | ||
a6cd2cc4 | 11589 | #: builtin/commit.c:1350 builtin/commit.c:1531 |
07432cef WS |
11590 | msgid "show status in long format (default)" |
11591 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 11592 | |
a6cd2cc4 | 11593 | #: builtin/commit.c:1353 builtin/commit.c:1534 |
ef317cd5 | 11594 | msgid "terminate entries with NUL" |
4375c10e | 11595 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 11596 | |
a6cd2cc4 | 11597 | #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 |
a5cd71ca JX |
11598 | #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 |
11599 | #: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 | |
ef317cd5 | 11600 | msgid "mode" |
07432cef | 11601 | msgstr "模式" |
ef317cd5 | 11602 | |
a6cd2cc4 | 11603 | #: builtin/commit.c:1356 builtin/commit.c:1537 |
ef317cd5 | 11604 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 11605 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 11606 | |
a6cd2cc4 | 11607 | #: builtin/commit.c:1360 |
5809aa05 JX |
11608 | msgid "" |
11609 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
11610 | "traditional)" | |
31e5e17b JX |
11611 | msgstr "" |
11612 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 11613 | |
a5cd71ca | 11614 | #: builtin/commit.c:1362 parse-options.h:188 |
ef317cd5 JX |
11615 | msgid "when" |
11616 | msgstr "何时" | |
11617 | ||
a6cd2cc4 | 11618 | #: builtin/commit.c:1363 |
ef317cd5 JX |
11619 | msgid "" |
11620 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
11621 | "(Default: all)" | |
11622 | msgstr "" | |
07432cef | 11623 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 11624 | |
a6cd2cc4 | 11625 | #: builtin/commit.c:1365 |
ef317cd5 | 11626 | msgid "list untracked files in columns" |
07432cef | 11627 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 11628 | |
a6cd2cc4 | 11629 | #: builtin/commit.c:1366 |
fd8cb379 JX |
11630 | msgid "do not detect renames" |
11631 | msgstr "不检测重命名" | |
11632 | ||
a6cd2cc4 | 11633 | #: builtin/commit.c:1368 |
fd8cb379 JX |
11634 | msgid "detect renames, optionally set similarity index" |
11635 | msgstr "检测重命名,可以设置索引相似度" | |
11636 | ||
a6cd2cc4 | 11637 | #: builtin/commit.c:1388 |
5809aa05 JX |
11638 | msgid "Unsupported combination of ignored and untracked-files arguments" |
11639 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
11640 | ||
a6cd2cc4 | 11641 | #: builtin/commit.c:1493 |
ef317cd5 | 11642 | msgid "suppress summary after successful commit" |
07432cef | 11643 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 11644 | |
a6cd2cc4 | 11645 | #: builtin/commit.c:1494 |
ef317cd5 | 11646 | msgid "show diff in commit message template" |
07432cef | 11647 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 11648 | |
a6cd2cc4 | 11649 | #: builtin/commit.c:1496 |
ef317cd5 | 11650 | msgid "Commit message options" |
07432cef | 11651 | msgstr "提交说明选项" |
c04f5ac3 | 11652 | |
a6cd2cc4 | 11653 | #: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 |
ef317cd5 | 11654 | msgid "read message from file" |
07432cef | 11655 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 11656 | |
a6cd2cc4 | 11657 | #: builtin/commit.c:1498 |
ef317cd5 | 11658 | msgid "author" |
07432cef | 11659 | msgstr "作者" |
c04f5ac3 | 11660 | |
a6cd2cc4 | 11661 | #: builtin/commit.c:1498 |
ef317cd5 | 11662 | msgid "override author for commit" |
07432cef | 11663 | msgstr "提交时覆盖作者" |
73a60cd2 | 11664 | |
a5cd71ca | 11665 | #: builtin/commit.c:1499 builtin/gc.c:538 |
ef317cd5 | 11666 | msgid "date" |
07432cef | 11667 | msgstr "日期" |
c04f5ac3 | 11668 | |
a6cd2cc4 | 11669 | #: builtin/commit.c:1499 |
ef317cd5 | 11670 | msgid "override date for commit" |
07432cef | 11671 | msgstr "提交时覆盖日期" |
c04f5ac3 | 11672 | |
a6cd2cc4 JX |
11673 | #: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 |
11674 | #: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 | |
94550ed3 JX |
11675 | msgid "commit" |
11676 | msgstr "提交" | |
11677 | ||
a6cd2cc4 | 11678 | #: builtin/commit.c:1501 |
ef317cd5 | 11679 | msgid "reuse and edit message from specified commit" |
07432cef | 11680 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 11681 | |
a6cd2cc4 | 11682 | #: builtin/commit.c:1502 |
ef317cd5 | 11683 | msgid "reuse message from specified commit" |
07432cef | 11684 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 11685 | |
a6cd2cc4 | 11686 | #: builtin/commit.c:1503 |
ef317cd5 | 11687 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 11688 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 11689 | |
a6cd2cc4 | 11690 | #: builtin/commit.c:1504 |
ef317cd5 | 11691 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 11692 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 11693 | |
a6cd2cc4 | 11694 | #: builtin/commit.c:1505 |
ef317cd5 | 11695 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 11696 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 11697 | |
a5cd71ca JX |
11698 | #: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 |
11699 | #: builtin/pull.c:164 builtin/revert.c:110 | |
ef317cd5 | 11700 | msgid "add Signed-off-by:" |
07432cef | 11701 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 11702 | |
a6cd2cc4 | 11703 | #: builtin/commit.c:1507 |
ef317cd5 | 11704 | msgid "use specified template file" |
07432cef | 11705 | msgstr "使用指定的模板文件" |
ef317cd5 | 11706 | |
a6cd2cc4 | 11707 | #: builtin/commit.c:1508 |
ef317cd5 | 11708 | msgid "force edit of commit" |
07432cef | 11709 | msgstr "强制编辑提交" |
ef317cd5 | 11710 | |
a6cd2cc4 | 11711 | #: builtin/commit.c:1510 |
ef317cd5 | 11712 | msgid "include status in commit message template" |
07432cef | 11713 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 11714 | |
a6cd2cc4 | 11715 | #: builtin/commit.c:1515 |
ef317cd5 | 11716 | msgid "Commit contents options" |
07432cef | 11717 | msgstr "提交内容选项" |
ef317cd5 | 11718 | |
a6cd2cc4 | 11719 | #: builtin/commit.c:1516 |
ef317cd5 | 11720 | msgid "commit all changed files" |
07432cef | 11721 | msgstr "提交所有改动的文件" |
ef317cd5 | 11722 | |
a6cd2cc4 | 11723 | #: builtin/commit.c:1517 |
ef317cd5 | 11724 | msgid "add specified files to index for commit" |
07432cef | 11725 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 11726 | |
a6cd2cc4 | 11727 | #: builtin/commit.c:1518 |
ef317cd5 | 11728 | msgid "interactively add files" |
07432cef | 11729 | msgstr "交互式添加文件" |
ef317cd5 | 11730 | |
a6cd2cc4 | 11731 | #: builtin/commit.c:1519 |
ef317cd5 | 11732 | msgid "interactively add changes" |
07432cef | 11733 | msgstr "交互式添加变更" |
ef317cd5 | 11734 | |
a6cd2cc4 | 11735 | #: builtin/commit.c:1520 |
ef317cd5 | 11736 | msgid "commit only specified files" |
07432cef | 11737 | msgstr "只提交指定的文件" |
ef317cd5 | 11738 | |
a6cd2cc4 | 11739 | #: builtin/commit.c:1521 |
5c57d762 JX |
11740 | msgid "bypass pre-commit and commit-msg hooks" |
11741 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
11742 | ||
a6cd2cc4 | 11743 | #: builtin/commit.c:1522 |
ef317cd5 | 11744 | msgid "show what would be committed" |
07432cef | 11745 | msgstr "显示将要提交的内容" |
ef317cd5 | 11746 | |
a6cd2cc4 | 11747 | #: builtin/commit.c:1535 |
ef317cd5 | 11748 | msgid "amend previous commit" |
07432cef | 11749 | msgstr "修改先前的提交" |
ef317cd5 | 11750 | |
a6cd2cc4 | 11751 | #: builtin/commit.c:1536 |
ef317cd5 | 11752 | msgid "bypass post-rewrite hook" |
07432cef | 11753 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 11754 | |
a6cd2cc4 | 11755 | #: builtin/commit.c:1541 |
ef317cd5 | 11756 | msgid "ok to record an empty change" |
07432cef | 11757 | msgstr "允许一个空提交" |
ef317cd5 | 11758 | |
a6cd2cc4 | 11759 | #: builtin/commit.c:1543 |
ef317cd5 | 11760 | msgid "ok to record a change with an empty message" |
07432cef | 11761 | msgstr "允许空的提交说明" |
ef317cd5 | 11762 | |
a6cd2cc4 | 11763 | #: builtin/commit.c:1616 |
c04f5ac3 JX |
11764 | #, c-format |
11765 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 11766 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 11767 | |
a6cd2cc4 | 11768 | #: builtin/commit.c:1623 |
c04f5ac3 | 11769 | msgid "could not read MERGE_MODE" |
90e6ef53 | 11770 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 11771 | |
a6cd2cc4 | 11772 | #: builtin/commit.c:1642 |
c04f5ac3 JX |
11773 | #, c-format |
11774 | msgid "could not read commit message: %s" | |
90e6ef53 | 11775 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 11776 | |
a6cd2cc4 | 11777 | #: builtin/commit.c:1649 |
c04f5ac3 JX |
11778 | #, c-format |
11779 | msgid "Aborting commit due to empty commit message.\n" | |
11780 | msgstr "终止提交因为提交说明为空。\n" | |
11781 | ||
a6cd2cc4 | 11782 | #: builtin/commit.c:1654 |
6937cb4e JX |
11783 | #, c-format |
11784 | msgid "Aborting commit; you did not edit the message.\n" | |
11785 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
11786 | ||
a6cd2cc4 | 11787 | #: builtin/commit.c:1688 |
c04f5ac3 | 11788 | msgid "" |
c1ac5258 | 11789 | "repository has been updated, but unable to write\n" |
220c313c | 11790 | "new_index file. Check that disk is not full and quota is\n" |
a6cd2cc4 | 11791 | "not exceeded, and then \"git restore --staged :/\" to recover." |
c04f5ac3 | 11792 | msgstr "" |
a6cd2cc4 JX |
11793 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n" |
11794 | "磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。" | |
c04f5ac3 | 11795 | |
a6cd2cc4 | 11796 | #: builtin/commit-graph.c:11 |
fd8cb379 JX |
11797 | msgid "git commit-graph [--object-dir <objdir>]" |
11798 | msgstr "git commit-graph [--object-dir <对象目录>]" | |
11799 | ||
a6cd2cc4 | 11800 | #: builtin/commit-graph.c:12 builtin/commit-graph.c:24 |
fd8cb379 JX |
11801 | msgid "git commit-graph read [--object-dir <objdir>]" |
11802 | msgstr "git commit-graph read [--object-dir <对象目录>]" | |
11803 | ||
a6cd2cc4 | 11804 | #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 |
a5cd71ca JX |
11805 | msgid "" |
11806 | "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" | |
11807 | msgstr "" | |
11808 | "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" | |
11809 | "[no-]progress]" | |
c1ac5258 | 11810 | |
a6cd2cc4 | 11811 | #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 |
fd8cb379 | 11812 | msgid "" |
a6cd2cc4 | 11813 | "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" |
a5cd71ca JX |
11814 | "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" |
11815 | msgstr "" | |
11816 | "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--" | |
11817 | "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" | |
fd8cb379 | 11818 | |
a5cd71ca JX |
11819 | #: builtin/commit-graph.c:55 builtin/commit-graph.c:107 |
11820 | #: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 | |
11821 | #: builtin/log.c:1585 | |
fd8cb379 JX |
11822 | msgid "dir" |
11823 | msgstr "目录" | |
11824 | ||
a5cd71ca JX |
11825 | #: builtin/commit-graph.c:56 builtin/commit-graph.c:108 |
11826 | #: builtin/commit-graph.c:171 builtin/commit-graph.c:255 | |
fd8cb379 JX |
11827 | msgid "The object directory to store the graph" |
11828 | msgstr "保存图形的对象目录" | |
11829 | ||
a5cd71ca | 11830 | #: builtin/commit-graph.c:58 |
a6cd2cc4 JX |
11831 | msgid "if the commit-graph is split, only verify the tip file" |
11832 | msgstr "如果提交图形被拆分,只验证头一个文件" | |
11833 | ||
a5cd71ca | 11834 | #: builtin/commit-graph.c:80 builtin/commit-graph.c:125 |
d46c5519 JX |
11835 | #, c-format |
11836 | msgid "Could not open commit-graph '%s'" | |
11837 | msgstr "无法打开提交图形 '%s'" | |
11838 | ||
a5cd71ca | 11839 | #: builtin/commit-graph.c:173 |
c1ac5258 JX |
11840 | msgid "start walk at all refs" |
11841 | msgstr "开始遍历所有引用" | |
11842 | ||
a5cd71ca | 11843 | #: builtin/commit-graph.c:175 |
fd8cb379 JX |
11844 | msgid "scan pack-indexes listed by stdin for commits" |
11845 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
11846 | ||
a5cd71ca | 11847 | #: builtin/commit-graph.c:177 |
fd8cb379 JX |
11848 | msgid "start walk at commits listed by stdin" |
11849 | msgstr "从标准输入中的提交开始扫描" | |
11850 | ||
a5cd71ca | 11851 | #: builtin/commit-graph.c:179 |
fd8cb379 JX |
11852 | msgid "include all commits already in the commit-graph file" |
11853 | msgstr "包含 commit-graph 文件中已有所有提交" | |
11854 | ||
a5cd71ca | 11855 | #: builtin/commit-graph.c:182 |
a6cd2cc4 JX |
11856 | msgid "allow writing an incremental commit-graph file" |
11857 | msgstr "允许写一个增量提交图形文件" | |
11858 | ||
a5cd71ca | 11859 | #: builtin/commit-graph.c:184 builtin/commit-graph.c:188 |
a6cd2cc4 JX |
11860 | msgid "maximum number of commits in a non-base split commit-graph" |
11861 | msgstr "在非基本拆分提交图形中的最大提交数" | |
11862 | ||
a5cd71ca | 11863 | #: builtin/commit-graph.c:186 |
a6cd2cc4 JX |
11864 | msgid "maximum ratio between two levels of a split commit-graph" |
11865 | msgstr "一个拆分提交图形的两个级别之间的最大比率" | |
11866 | ||
a5cd71ca | 11867 | #: builtin/commit-graph.c:204 |
c1ac5258 JX |
11868 | msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" |
11869 | msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" | |
fd8cb379 | 11870 | |
4c27fcb5 | 11871 | #: builtin/config.c:11 |
814ff314 JX |
11872 | msgid "git config [<options>]" |
11873 | msgstr "git config [<选项>]" | |
ef317cd5 | 11874 | |
a6cd2cc4 | 11875 | #: builtin/config.c:103 builtin/env--helper.c:23 |
fd8cb379 JX |
11876 | #, c-format |
11877 | msgid "unrecognized --type argument, %s" | |
11878 | msgstr "未能识别的 --type 参数,%s" | |
11879 | ||
4c27fcb5 | 11880 | #: builtin/config.c:115 |
c1ac5258 JX |
11881 | msgid "only one type at a time" |
11882 | msgstr "一次只能一个类型" | |
11883 | ||
4c27fcb5 | 11884 | #: builtin/config.c:124 |
ef317cd5 | 11885 | msgid "Config file location" |
07432cef | 11886 | msgstr "配置文件位置" |
ef317cd5 | 11887 | |
4c27fcb5 | 11888 | #: builtin/config.c:125 |
ef317cd5 | 11889 | msgid "use global config file" |
07432cef | 11890 | msgstr "使用全局配置文件" |
ef317cd5 | 11891 | |
4c27fcb5 | 11892 | #: builtin/config.c:126 |
ef317cd5 | 11893 | msgid "use system config file" |
07432cef | 11894 | msgstr "使用系统级配置文件" |
ef317cd5 | 11895 | |
4c27fcb5 | 11896 | #: builtin/config.c:127 |
ef317cd5 | 11897 | msgid "use repository config file" |
160fb2b2 | 11898 | msgstr "使用仓库级配置文件" |
ef317cd5 | 11899 | |
4c27fcb5 JX |
11900 | #: builtin/config.c:128 |
11901 | msgid "use per-worktree config file" | |
11902 | msgstr "使用工作区级别的配置文件" | |
11903 | ||
11904 | #: builtin/config.c:129 | |
ef317cd5 | 11905 | msgid "use given config file" |
07432cef | 11906 | msgstr "使用指定的配置文件" |
ef317cd5 | 11907 | |
4c27fcb5 | 11908 | #: builtin/config.c:130 |
2e8451e8 | 11909 | msgid "blob-id" |
4375c10e | 11910 | msgstr "数据对象 ID" |
2e8451e8 | 11911 | |
4c27fcb5 | 11912 | #: builtin/config.c:130 |
2e8451e8 JX |
11913 | msgid "read config from given blob object" |
11914 | msgstr "从给定的数据对象读取配置" | |
11915 | ||
4c27fcb5 | 11916 | #: builtin/config.c:131 |
ef317cd5 | 11917 | msgid "Action" |
07432cef | 11918 | msgstr "操作" |
ef317cd5 | 11919 | |
4c27fcb5 | 11920 | #: builtin/config.c:132 |
ef317cd5 | 11921 | msgid "get value: name [value-regex]" |
07432cef | 11922 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 11923 | |
4c27fcb5 | 11924 | #: builtin/config.c:133 |
ef317cd5 | 11925 | msgid "get all values: key [value-regex]" |
07432cef | 11926 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 11927 | |
4c27fcb5 | 11928 | #: builtin/config.c:134 |
ef317cd5 | 11929 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 11930 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 11931 | |
4c27fcb5 | 11932 | #: builtin/config.c:135 |
90314792 JX |
11933 | msgid "get value specific for the URL: section[.var] URL" |
11934 | msgstr "获得 URL 取值:section[.var] URL" | |
11935 | ||
4c27fcb5 | 11936 | #: builtin/config.c:136 |
ef317cd5 | 11937 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 11938 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 11939 | |
4c27fcb5 | 11940 | #: builtin/config.c:137 |
ef317cd5 | 11941 | msgid "add a new variable: name value" |
07432cef | 11942 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 11943 | |
4c27fcb5 | 11944 | #: builtin/config.c:138 |
ef317cd5 | 11945 | msgid "remove a variable: name [value-regex]" |
07432cef | 11946 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 11947 | |
4c27fcb5 | 11948 | #: builtin/config.c:139 |
ef317cd5 | 11949 | msgid "remove all matches: name [value-regex]" |
07432cef | 11950 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 11951 | |
4c27fcb5 | 11952 | #: builtin/config.c:140 |
ef317cd5 | 11953 | msgid "rename section: old-name new-name" |
07432cef | 11954 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 11955 | |
4c27fcb5 | 11956 | #: builtin/config.c:141 |
ef317cd5 | 11957 | msgid "remove a section: name" |
07432cef | 11958 | msgstr "删除一个小节:name" |
ef317cd5 | 11959 | |
4c27fcb5 | 11960 | #: builtin/config.c:142 |
ef317cd5 | 11961 | msgid "list all" |
07432cef | 11962 | msgstr "列出所有" |
ef317cd5 | 11963 | |
4c27fcb5 | 11964 | #: builtin/config.c:143 |
ef317cd5 | 11965 | msgid "open an editor" |
07432cef | 11966 | msgstr "打开一个编辑器" |
ef317cd5 | 11967 | |
4c27fcb5 | 11968 | #: builtin/config.c:144 |
04cb2f28 JX |
11969 | msgid "find the color configured: slot [default]" |
11970 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 11971 | |
4c27fcb5 | 11972 | #: builtin/config.c:145 |
04cb2f28 JX |
11973 | msgid "find the color setting: slot [stdout-is-tty]" |
11974 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 11975 | |
4c27fcb5 | 11976 | #: builtin/config.c:146 |
ef317cd5 | 11977 | msgid "Type" |
07432cef | 11978 | msgstr "类型" |
ef317cd5 | 11979 | |
a6cd2cc4 | 11980 | #: builtin/config.c:147 builtin/env--helper.c:38 |
fd8cb379 JX |
11981 | msgid "value is given this type" |
11982 | msgstr "取值为该类型" | |
11983 | ||
4c27fcb5 | 11984 | #: builtin/config.c:148 |
ef317cd5 | 11985 | msgid "value is \"true\" or \"false\"" |
07432cef | 11986 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 11987 | |
4c27fcb5 | 11988 | #: builtin/config.c:149 |
ef317cd5 | 11989 | msgid "value is decimal number" |
07432cef | 11990 | msgstr "值是十进制数" |
ef317cd5 | 11991 | |
4c27fcb5 | 11992 | #: builtin/config.c:150 |
ef317cd5 | 11993 | msgid "value is --bool or --int" |
07432cef | 11994 | msgstr "值是 --bool or --int" |
ef317cd5 | 11995 | |
4c27fcb5 | 11996 | #: builtin/config.c:151 |
ef317cd5 | 11997 | msgid "value is a path (file or directory name)" |
07432cef | 11998 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 11999 | |
4c27fcb5 | 12000 | #: builtin/config.c:152 |
5809aa05 JX |
12001 | msgid "value is an expiry date" |
12002 | msgstr "值是一个到期日期" | |
12003 | ||
4c27fcb5 | 12004 | #: builtin/config.c:153 |
ef317cd5 | 12005 | msgid "Other" |
07432cef | 12006 | msgstr "其它" |
ef317cd5 | 12007 | |
4c27fcb5 | 12008 | #: builtin/config.c:154 |
ef317cd5 | 12009 | msgid "terminate values with NUL byte" |
4375c10e | 12010 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 12011 | |
4c27fcb5 | 12012 | #: builtin/config.c:155 |
1b7f4a34 JX |
12013 | msgid "show variable names only" |
12014 | msgstr "只显示变量名" | |
12015 | ||
4c27fcb5 | 12016 | #: builtin/config.c:156 |
ef317cd5 | 12017 | msgid "respect include directives on lookup" |
07432cef | 12018 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 12019 | |
4c27fcb5 | 12020 | #: builtin/config.c:157 |
276ceeaa JX |
12021 | msgid "show origin of config (file, standard input, blob, command line)" |
12022 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
12023 | ||
a6cd2cc4 | 12024 | #: builtin/config.c:158 builtin/env--helper.c:40 |
fd8cb379 JX |
12025 | msgid "value" |
12026 | msgstr "取值" | |
12027 | ||
4c27fcb5 | 12028 | #: builtin/config.c:158 |
fd8cb379 JX |
12029 | msgid "with --get, use default value when missing entry" |
12030 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
12031 | ||
06991777 | 12032 | #: builtin/config.c:172 |
c1ac5258 JX |
12033 | #, c-format |
12034 | msgid "wrong number of arguments, should be %d" | |
12035 | msgstr "错误的参数个数,应该为 %d 个" | |
12036 | ||
06991777 | 12037 | #: builtin/config.c:174 |
c1ac5258 JX |
12038 | #, c-format |
12039 | msgid "wrong number of arguments, should be from %d to %d" | |
12040 | msgstr "错误的参数个数,应该为从 %d 个到 %d 个" | |
12041 | ||
06991777 | 12042 | #: builtin/config.c:308 |
c1ac5258 JX |
12043 | #, c-format |
12044 | msgid "invalid key pattern: %s" | |
12045 | msgstr "无效键名模式:%s" | |
12046 | ||
06991777 | 12047 | #: builtin/config.c:344 |
fd8cb379 JX |
12048 | #, c-format |
12049 | msgid "failed to format default config value: %s" | |
c1ac5258 JX |
12050 | msgstr "格式化默认配置值失败:%s" |
12051 | ||
06991777 | 12052 | #: builtin/config.c:401 |
c1ac5258 JX |
12053 | #, c-format |
12054 | msgid "cannot parse color '%s'" | |
12055 | msgstr "无法解析颜色 '%s'" | |
fd8cb379 | 12056 | |
06991777 | 12057 | #: builtin/config.c:443 |
220c313c | 12058 | msgid "unable to parse default color value" |
c1ac5258 JX |
12059 | msgstr "无法解析默认颜色值" |
12060 | ||
06991777 | 12061 | #: builtin/config.c:496 builtin/config.c:742 |
c1ac5258 JX |
12062 | msgid "not in a git directory" |
12063 | msgstr "不在 git 仓库中" | |
12064 | ||
06991777 | 12065 | #: builtin/config.c:499 |
c1ac5258 JX |
12066 | msgid "writing to stdin is not supported" |
12067 | msgstr "不支持写到标准输入" | |
12068 | ||
06991777 | 12069 | #: builtin/config.c:502 |
c1ac5258 JX |
12070 | msgid "writing config blobs is not supported" |
12071 | msgstr "不支持写到配置数据对象" | |
220c313c | 12072 | |
06991777 | 12073 | #: builtin/config.c:587 |
220c313c JX |
12074 | #, c-format |
12075 | msgid "" | |
12076 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 12077 | "[user]\n" |
220c313c | 12078 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 12079 | "#\tname = %s\n" |
220c313c JX |
12080 | "#\temail = %s\n" |
12081 | msgstr "" | |
12082 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 12083 | "[user]\n" |
220c313c | 12084 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 12085 | "#\tname = %s\n" |
220c313c JX |
12086 | "#\temail = %s\n" |
12087 | ||
06991777 | 12088 | #: builtin/config.c:611 |
c1ac5258 JX |
12089 | msgid "only one config file at a time" |
12090 | msgstr "一次只能有一个配置文件" | |
12091 | ||
06991777 | 12092 | #: builtin/config.c:616 |
a4f16749 JX |
12093 | msgid "--local can only be used inside a git repository" |
12094 | msgstr "--local 只能在一个仓库内使用" | |
12095 | ||
06991777 | 12096 | #: builtin/config.c:619 |
fd8cb379 JX |
12097 | msgid "--blob can only be used inside a git repository" |
12098 | msgstr "--blob 只能在一个仓库内使用" | |
12099 | ||
06991777 | 12100 | #: builtin/config.c:638 |
c1ac5258 JX |
12101 | msgid "$HOME not set" |
12102 | msgstr "$HOME 未设置" | |
12103 | ||
06991777 | 12104 | #: builtin/config.c:658 |
4c27fcb5 JX |
12105 | msgid "" |
12106 | "--worktree cannot be used with multiple working trees unless the config\n" | |
12107 | "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" | |
12108 | "section in \"git help worktree\" for details" | |
12109 | msgstr "" | |
12110 | "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n" | |
12111 | "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" | |
12112 | ||
06991777 | 12113 | #: builtin/config.c:688 |
c1ac5258 JX |
12114 | msgid "--get-color and variable type are incoherent" |
12115 | msgstr "--get-color 和变量类型不兼容" | |
12116 | ||
06991777 | 12117 | #: builtin/config.c:693 |
c1ac5258 JX |
12118 | msgid "only one action at a time" |
12119 | msgstr "一次只能有一个动作" | |
12120 | ||
06991777 | 12121 | #: builtin/config.c:706 |
c1ac5258 JX |
12122 | msgid "--name-only is only applicable to --list or --get-regexp" |
12123 | msgstr "--name-only 仅适用于 --list 或 --get-regexp" | |
12124 | ||
06991777 | 12125 | #: builtin/config.c:712 |
c1ac5258 JX |
12126 | msgid "" |
12127 | "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" | |
12128 | "list" | |
12129 | msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" | |
12130 | ||
06991777 | 12131 | #: builtin/config.c:718 |
c1ac5258 JX |
12132 | msgid "--default is only applicable to --get" |
12133 | msgstr "--default 仅适用于 --get" | |
12134 | ||
06991777 | 12135 | #: builtin/config.c:731 |
c1ac5258 JX |
12136 | #, c-format |
12137 | msgid "unable to read config file '%s'" | |
12138 | msgstr "无法读取配置文件 '%s'" | |
12139 | ||
06991777 | 12140 | #: builtin/config.c:734 |
c1ac5258 JX |
12141 | msgid "error processing config file(s)" |
12142 | msgstr "处理配置文件出错" | |
12143 | ||
06991777 | 12144 | #: builtin/config.c:744 |
c1ac5258 JX |
12145 | msgid "editing stdin is not supported" |
12146 | msgstr "不支持编辑标准输入" | |
12147 | ||
06991777 | 12148 | #: builtin/config.c:746 |
c1ac5258 JX |
12149 | msgid "editing blobs is not supported" |
12150 | msgstr "不支持编辑数据对象" | |
12151 | ||
06991777 | 12152 | #: builtin/config.c:760 |
220c313c JX |
12153 | #, c-format |
12154 | msgid "cannot create configuration file %s" | |
12155 | msgstr "不能创建配置文件 %s" | |
12156 | ||
06991777 | 12157 | #: builtin/config.c:773 |
a0b6b246 JX |
12158 | #, c-format |
12159 | msgid "" | |
12160 | "cannot overwrite multiple values with a single value\n" | |
12161 | " Use a regexp, --add or --replace-all to change %s." | |
12162 | msgstr "" | |
12163 | "无法用一个值覆盖多个值\n" | |
12164 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
12165 | ||
06991777 | 12166 | #: builtin/config.c:847 builtin/config.c:858 |
c1ac5258 JX |
12167 | #, c-format |
12168 | msgid "no such section: %s" | |
12169 | msgstr "无此小节:%s" | |
12170 | ||
fd8cb379 | 12171 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
12172 | msgid "git count-objects [-v] [-H | --human-readable]" |
12173 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
12174 | ||
fd8cb379 | 12175 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
12176 | msgid "print sizes in human readable format" |
12177 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 12178 | |
a5cd71ca | 12179 | #: builtin/describe.c:26 |
814ff314 JX |
12180 | msgid "git describe [<options>] [<commit-ish>...]" |
12181 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 12182 | |
a5cd71ca | 12183 | #: builtin/describe.c:27 |
814ff314 JX |
12184 | msgid "git describe [<options>] --dirty" |
12185 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 12186 | |
a5cd71ca | 12187 | #: builtin/describe.c:62 |
87cb7997 JX |
12188 | msgid "head" |
12189 | msgstr "头" | |
12190 | ||
a5cd71ca | 12191 | #: builtin/describe.c:62 |
87cb7997 JX |
12192 | msgid "lightweight" |
12193 | msgstr "轻量级的" | |
12194 | ||
a5cd71ca | 12195 | #: builtin/describe.c:62 |
87cb7997 JX |
12196 | msgid "annotated" |
12197 | msgstr "附注的" | |
12198 | ||
a5cd71ca | 12199 | #: builtin/describe.c:275 |
c04f5ac3 JX |
12200 | #, c-format |
12201 | msgid "annotated tag %s not available" | |
55a16ee4 | 12202 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 12203 | |
a5cd71ca | 12204 | #: builtin/describe.c:279 |
c04f5ac3 JX |
12205 | #, c-format |
12206 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 12207 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 12208 | |
a5cd71ca | 12209 | #: builtin/describe.c:281 |
c04f5ac3 JX |
12210 | #, c-format |
12211 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 12212 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 12213 | |
a5cd71ca | 12214 | #: builtin/describe.c:325 |
c04f5ac3 JX |
12215 | #, c-format |
12216 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 12217 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 12218 | |
a5cd71ca | 12219 | #: builtin/describe.c:327 |
c04f5ac3 | 12220 | #, c-format |
5809aa05 JX |
12221 | msgid "No exact match on refs or tags, searching to describe\n" |
12222 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 12223 | |
a5cd71ca | 12224 | #: builtin/describe.c:381 |
c04f5ac3 JX |
12225 | #, c-format |
12226 | msgid "finished search at %s\n" | |
12227 | msgstr "完成搜索 %s\n" | |
12228 | ||
a5cd71ca | 12229 | #: builtin/describe.c:407 |
c04f5ac3 JX |
12230 | #, c-format |
12231 | msgid "" | |
12232 | "No annotated tags can describe '%s'.\n" | |
12233 | "However, there were unannotated tags: try --tags." | |
12234 | msgstr "" | |
55a16ee4 RC |
12235 | "没有附注标签能描述 '%s'。\n" |
12236 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 12237 | |
a5cd71ca | 12238 | #: builtin/describe.c:411 |
c04f5ac3 JX |
12239 | #, c-format |
12240 | msgid "" | |
12241 | "No tags can describe '%s'.\n" | |
12242 | "Try --always, or create some tags." | |
12243 | msgstr "" | |
55a16ee4 RC |
12244 | "没有标签能描述 '%s'。\n" |
12245 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 12246 | |
a5cd71ca | 12247 | #: builtin/describe.c:441 |
c04f5ac3 JX |
12248 | #, c-format |
12249 | msgid "traversed %lu commits\n" | |
12250 | msgstr "已遍历 %lu 个提交\n" | |
12251 | ||
a5cd71ca | 12252 | #: builtin/describe.c:444 |
c04f5ac3 JX |
12253 | #, c-format |
12254 | msgid "" | |
12255 | "more than %i tags found; listed %i most recent\n" | |
12256 | "gave up search at %s\n" | |
12257 | msgstr "" | |
55a16ee4 | 12258 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 12259 | "在 %s 放弃搜索\n" |
c04f5ac3 | 12260 | |
a5cd71ca | 12261 | #: builtin/describe.c:512 |
5809aa05 JX |
12262 | #, c-format |
12263 | msgid "describe %s\n" | |
12264 | msgstr "描述 %s\n" | |
12265 | ||
a5cd71ca | 12266 | #: builtin/describe.c:515 |
5809aa05 JX |
12267 | #, c-format |
12268 | msgid "Not a valid object name %s" | |
12269 | msgstr "不是一个有效的对象名 %s" | |
12270 | ||
a5cd71ca | 12271 | #: builtin/describe.c:523 |
5809aa05 JX |
12272 | #, c-format |
12273 | msgid "%s is neither a commit nor blob" | |
12274 | msgstr "%s 既不是提交也不是数据对象" | |
12275 | ||
a5cd71ca | 12276 | #: builtin/describe.c:537 |
ef317cd5 | 12277 | msgid "find the tag that comes after the commit" |
55a16ee4 | 12278 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 12279 | |
a5cd71ca | 12280 | #: builtin/describe.c:538 |
ef317cd5 | 12281 | msgid "debug search strategy on stderr" |
07432cef | 12282 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 12283 | |
a5cd71ca | 12284 | #: builtin/describe.c:539 |
1003b3a5 JX |
12285 | msgid "use any ref" |
12286 | msgstr "使用任意引用" | |
12287 | ||
a5cd71ca | 12288 | #: builtin/describe.c:540 |
1003b3a5 | 12289 | msgid "use any tag, even unannotated" |
55a16ee4 | 12290 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 12291 | |
a5cd71ca | 12292 | #: builtin/describe.c:541 |
ef317cd5 | 12293 | msgid "always use long format" |
07432cef | 12294 | msgstr "始终使用长提交号格式" |
ef317cd5 | 12295 | |
a5cd71ca | 12296 | #: builtin/describe.c:542 |
2e8451e8 JX |
12297 | msgid "only follow first parent" |
12298 | msgstr "只跟随第一个父提交" | |
12299 | ||
a5cd71ca | 12300 | #: builtin/describe.c:545 |
ef317cd5 | 12301 | msgid "only output exact matches" |
07432cef | 12302 | msgstr "只输出精确匹配" |
ef317cd5 | 12303 | |
a5cd71ca | 12304 | #: builtin/describe.c:547 |
ef317cd5 | 12305 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 12306 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 12307 | |
a5cd71ca | 12308 | #: builtin/describe.c:549 |
ef317cd5 | 12309 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 12310 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 12311 | |
a5cd71ca | 12312 | #: builtin/describe.c:551 |
87cb7997 JX |
12313 | msgid "do not consider tags matching <pattern>" |
12314 | msgstr "不考虑匹配 <模式> 的标签" | |
12315 | ||
a5cd71ca | 12316 | #: builtin/describe.c:553 builtin/name-rev.c:426 |
ef317cd5 | 12317 | msgid "show abbreviated commit object as fallback" |
07432cef | 12318 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 12319 | |
a5cd71ca | 12320 | #: builtin/describe.c:554 builtin/describe.c:557 |
ef317cd5 | 12321 | msgid "mark" |
07432cef | 12322 | msgstr "标记" |
ef317cd5 | 12323 | |
a5cd71ca | 12324 | #: builtin/describe.c:555 |
ef317cd5 | 12325 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 12326 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 12327 | |
a5cd71ca | 12328 | #: builtin/describe.c:558 |
87cb7997 JX |
12329 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
12330 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
12331 | ||
a5cd71ca | 12332 | #: builtin/describe.c:576 |
c04f5ac3 JX |
12333 | msgid "--long is incompatible with --abbrev=0" |
12334 | msgstr "--long 与 --abbrev=0 不兼容" | |
12335 | ||
a5cd71ca | 12336 | #: builtin/describe.c:605 |
c04f5ac3 | 12337 | msgid "No names found, cannot describe anything." |
90e6ef53 | 12338 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 12339 | |
a5cd71ca | 12340 | #: builtin/describe.c:656 |
a8a5406a | 12341 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
12342 | msgstr "--dirty 与提交号不兼容" |
12343 | ||
a5cd71ca | 12344 | #: builtin/describe.c:658 |
87cb7997 JX |
12345 | msgid "--broken is incompatible with commit-ishes" |
12346 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 12347 | |
06991777 | 12348 | #: builtin/diff.c:84 |
c04f5ac3 JX |
12349 | #, c-format |
12350 | msgid "'%s': not a regular file or symlink" | |
12351 | msgstr "'%s':不是一个正规文件或符号链接" | |
12352 | ||
06991777 | 12353 | #: builtin/diff.c:235 |
c04f5ac3 JX |
12354 | #, c-format |
12355 | msgid "invalid option: %s" | |
12356 | msgstr "无效选项:%s" | |
12357 | ||
d46c5519 | 12358 | #: builtin/diff.c:350 |
c04f5ac3 | 12359 | msgid "Not a git repository" |
160fb2b2 | 12360 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 12361 | |
d46c5519 | 12362 | #: builtin/diff.c:394 |
c04f5ac3 JX |
12363 | #, c-format |
12364 | msgid "invalid object '%s' given." | |
12365 | msgstr "提供了无效对象 '%s'。" | |
12366 | ||
d46c5519 | 12367 | #: builtin/diff.c:403 |
c04f5ac3 JX |
12368 | #, c-format |
12369 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 12370 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 12371 | |
d46c5519 | 12372 | #: builtin/diff.c:408 |
c04f5ac3 JX |
12373 | #, c-format |
12374 | msgid "unhandled object '%s' given." | |
6c94aba5 | 12375 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 12376 | |
d46c5519 | 12377 | #: builtin/difftool.c:30 |
1a79b2f1 JX |
12378 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
12379 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
12380 | ||
a5cd71ca | 12381 | #: builtin/difftool.c:260 |
1a79b2f1 JX |
12382 | #, c-format |
12383 | msgid "failed: %d" | |
12384 | msgstr "失败:%d" | |
12385 | ||
a5cd71ca | 12386 | #: builtin/difftool.c:302 |
87cb7997 JX |
12387 | #, c-format |
12388 | msgid "could not read symlink %s" | |
12389 | msgstr "无法读取符号链接 %s" | |
12390 | ||
a5cd71ca | 12391 | #: builtin/difftool.c:304 |
87cb7997 JX |
12392 | #, c-format |
12393 | msgid "could not read symlink file %s" | |
12394 | msgstr "无法读取符号链接文件 %s" | |
12395 | ||
a5cd71ca | 12396 | #: builtin/difftool.c:312 |
87cb7997 JX |
12397 | #, c-format |
12398 | msgid "could not read object %s for symlink %s" | |
12399 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
12400 | ||
a5cd71ca | 12401 | #: builtin/difftool.c:413 |
1a79b2f1 JX |
12402 | msgid "" |
12403 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
12404 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
12405 | msgstr "" |
12406 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
12407 | "cc')。" | |
1a79b2f1 | 12408 | |
a5cd71ca | 12409 | #: builtin/difftool.c:634 |
1a79b2f1 JX |
12410 | #, c-format |
12411 | msgid "both files modified: '%s' and '%s'." | |
12412 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
12413 | ||
a5cd71ca | 12414 | #: builtin/difftool.c:636 |
1a79b2f1 JX |
12415 | msgid "working tree file has been left." |
12416 | msgstr "工作区文件被留了下来。" | |
12417 | ||
a5cd71ca | 12418 | #: builtin/difftool.c:647 |
1a79b2f1 JX |
12419 | #, c-format |
12420 | msgid "temporary files exist in '%s'." | |
12421 | msgstr "临时文件存在于 '%s'。" | |
12422 | ||
a5cd71ca | 12423 | #: builtin/difftool.c:648 |
1a79b2f1 JX |
12424 | msgid "you may want to cleanup or recover these." |
12425 | msgstr "您可能想要清理或者恢复它们。" | |
12426 | ||
a5cd71ca | 12427 | #: builtin/difftool.c:697 |
1a79b2f1 JX |
12428 | msgid "use `diff.guitool` instead of `diff.tool`" |
12429 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
12430 | ||
a5cd71ca | 12431 | #: builtin/difftool.c:699 |
1a79b2f1 JX |
12432 | msgid "perform a full-directory diff" |
12433 | msgstr "执行一个全目录差异比较" | |
12434 | ||
a5cd71ca | 12435 | #: builtin/difftool.c:701 |
1a79b2f1 JX |
12436 | msgid "do not prompt before launching a diff tool" |
12437 | msgstr "启动差异比较工具之前不提示" | |
12438 | ||
a5cd71ca | 12439 | #: builtin/difftool.c:706 |
1a79b2f1 JX |
12440 | msgid "use symlinks in dir-diff mode" |
12441 | msgstr "在 dir-diff 模式中使用符号链接" | |
12442 | ||
a5cd71ca | 12443 | #: builtin/difftool.c:707 |
c1ac5258 JX |
12444 | msgid "tool" |
12445 | msgstr "工具" | |
12446 | ||
a5cd71ca | 12447 | #: builtin/difftool.c:708 |
1a79b2f1 JX |
12448 | msgid "use the specified diff tool" |
12449 | msgstr "使用指定的差异比较工具" | |
12450 | ||
a5cd71ca | 12451 | #: builtin/difftool.c:710 |
1a79b2f1 JX |
12452 | msgid "print a list of diff tools that may be used with `--tool`" |
12453 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
12454 | ||
a5cd71ca | 12455 | #: builtin/difftool.c:713 |
1a79b2f1 JX |
12456 | msgid "" |
12457 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
12458 | "code" | |
12459 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
12460 | ||
a5cd71ca | 12461 | #: builtin/difftool.c:716 |
1a79b2f1 JX |
12462 | msgid "specify a custom command for viewing diffs" |
12463 | msgstr "指定一个用于查看差异的自定义命令" | |
12464 | ||
a5cd71ca | 12465 | #: builtin/difftool.c:717 |
d46c5519 JX |
12466 | msgid "passed to `diff`" |
12467 | msgstr "传递给 `diff`" | |
12468 | ||
a5cd71ca | 12469 | #: builtin/difftool.c:732 |
d46c5519 JX |
12470 | msgid "difftool requires worktree or --no-index" |
12471 | msgstr "difftool 要求工作区或者 --no-index" | |
12472 | ||
a5cd71ca | 12473 | #: builtin/difftool.c:739 |
d46c5519 JX |
12474 | msgid "--dir-diff is incompatible with --no-index" |
12475 | msgstr "--dir-diff 和 --no-index 不兼容" | |
12476 | ||
a5cd71ca | 12477 | #: builtin/difftool.c:742 |
d46c5519 JX |
12478 | msgid "--gui, --tool and --extcmd are mutually exclusive" |
12479 | msgstr "--gui、--tool 和 --extcmd 互斥" | |
12480 | ||
a5cd71ca | 12481 | #: builtin/difftool.c:750 |
1a79b2f1 JX |
12482 | msgid "no <tool> given for --tool=<tool>" |
12483 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
12484 | ||
a5cd71ca | 12485 | #: builtin/difftool.c:757 |
1a79b2f1 JX |
12486 | msgid "no <cmd> given for --extcmd=<cmd>" |
12487 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
12488 | ||
a6cd2cc4 JX |
12489 | #: builtin/env--helper.c:6 |
12490 | msgid "git env--helper --type=[bool|ulong] <options> <env-var>" | |
12491 | msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" | |
12492 | ||
12493 | #: builtin/env--helper.c:37 builtin/hash-object.c:98 | |
12494 | msgid "type" | |
12495 | msgstr "类型" | |
12496 | ||
12497 | #: builtin/env--helper.c:41 | |
12498 | msgid "default for git_env_*(...) to fall back on" | |
12499 | msgstr "git_env_*(...) 的默认值" | |
12500 | ||
12501 | #: builtin/env--helper.c:43 | |
12502 | msgid "be quiet only use git_env_*() value as exit code" | |
12503 | msgstr "安静模式,只使用 git_env_*() 的值作为退出码" | |
12504 | ||
12505 | #: builtin/env--helper.c:62 | |
12506 | #, c-format | |
12507 | msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" | |
12508 | msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`" | |
12509 | ||
12510 | #: builtin/env--helper.c:77 | |
12511 | #, c-format | |
12512 | msgid "" | |
12513 | "option `--default' expects an unsigned long value with `--type=ulong`, not `" | |
12514 | "%s`" | |
12515 | msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`" | |
12516 | ||
c1ac5258 | 12517 | #: builtin/fast-export.c:29 |
ef317cd5 | 12518 | msgid "git fast-export [rev-list-opts]" |
07432cef | 12519 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 12520 | |
a5cd71ca JX |
12521 | #: builtin/fast-export.c:852 |
12522 | msgid "Error: Cannot export nested tags unless --mark-tags is specified." | |
12523 | msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。" | |
12524 | ||
12525 | #: builtin/fast-export.c:1152 | |
ef317cd5 | 12526 | msgid "show progress after <n> objects" |
07432cef | 12527 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 12528 | |
a5cd71ca | 12529 | #: builtin/fast-export.c:1154 |
ef317cd5 | 12530 | msgid "select handling of signed tags" |
55a16ee4 | 12531 | msgstr "选择如何处理签名标签" |
ef317cd5 | 12532 | |
a5cd71ca | 12533 | #: builtin/fast-export.c:1157 |
ef317cd5 | 12534 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 12535 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 12536 | |
a5cd71ca | 12537 | #: builtin/fast-export.c:1160 |
a6cd2cc4 JX |
12538 | msgid "select handling of commit messages in an alternate encoding" |
12539 | msgstr "选择使用备用编码处理提交说明" | |
12540 | ||
a5cd71ca | 12541 | #: builtin/fast-export.c:1163 |
ef317cd5 | 12542 | msgid "Dump marks to this file" |
07432cef | 12543 | msgstr "把标记存储到这个文件" |
ef317cd5 | 12544 | |
a5cd71ca | 12545 | #: builtin/fast-export.c:1165 |
ef317cd5 | 12546 | msgid "Import marks from this file" |
07432cef | 12547 | msgstr "从这个文件导入标记" |
ef317cd5 | 12548 | |
a5cd71ca JX |
12549 | #: builtin/fast-export.c:1169 |
12550 | msgid "Import marks from this file if it exists" | |
12551 | msgstr "从该文件导入标记(如果存在的话)" | |
12552 | ||
12553 | #: builtin/fast-export.c:1171 | |
ef317cd5 | 12554 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 12555 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 12556 | |
a5cd71ca | 12557 | #: builtin/fast-export.c:1173 |
ef317cd5 | 12558 | msgid "Output full tree for each commit" |
07432cef | 12559 | msgstr "每次提交都输出整个树" |
ef317cd5 | 12560 | |
a5cd71ca | 12561 | #: builtin/fast-export.c:1175 |
ef317cd5 | 12562 | msgid "Use the done feature to terminate the stream" |
07432cef | 12563 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 12564 | |
a5cd71ca | 12565 | #: builtin/fast-export.c:1176 |
ef317cd5 | 12566 | msgid "Skip output of blob data" |
07432cef | 12567 | msgstr "跳过数据对象的输出" |
ef317cd5 | 12568 | |
a5cd71ca | 12569 | #: builtin/fast-export.c:1177 builtin/log.c:1633 |
6acbf033 | 12570 | msgid "refspec" |
160fb2b2 | 12571 | msgstr "引用规格" |
6acbf033 | 12572 | |
a5cd71ca | 12573 | #: builtin/fast-export.c:1178 |
6acbf033 | 12574 | msgid "Apply refspec to exported refs" |
160fb2b2 | 12575 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 12576 | |
a5cd71ca | 12577 | #: builtin/fast-export.c:1179 |
220c313c JX |
12578 | msgid "anonymize output" |
12579 | msgstr "匿名输出" | |
12580 | ||
a5cd71ca | 12581 | #: builtin/fast-export.c:1181 |
06991777 | 12582 | msgid "Reference parents which are not in fast-export stream by object id" |
5b533632 | 12583 | msgstr "引用父对象 ID 不在 fast-export 流中" |
06991777 | 12584 | |
a5cd71ca | 12585 | #: builtin/fast-export.c:1183 |
06991777 | 12586 | msgid "Show original object ids of blobs/commits" |
5b533632 | 12587 | msgstr "显示数据对象/提交的原始对象 ID" |
06991777 | 12588 | |
a5cd71ca JX |
12589 | #: builtin/fast-export.c:1185 |
12590 | msgid "Label tags with mark ids" | |
12591 | msgstr "对带有标记 ID 的标签做标记" | |
12592 | ||
12593 | #: builtin/fast-export.c:1220 | |
12594 | msgid "Cannot pass both --import-marks and --import-marks-if-exists" | |
12595 | msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" | |
12596 | ||
12597 | #: builtin/fetch.c:34 | |
ef317cd5 | 12598 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 12599 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 12600 | |
a5cd71ca | 12601 | #: builtin/fetch.c:35 |
ef317cd5 | 12602 | msgid "git fetch [<options>] <group>" |
07432cef | 12603 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 12604 | |
a5cd71ca | 12605 | #: builtin/fetch.c:36 |
ef317cd5 | 12606 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 12607 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 12608 | |
a5cd71ca | 12609 | #: builtin/fetch.c:37 |
ef317cd5 | 12610 | msgid "git fetch --all [<options>]" |
07432cef | 12611 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 12612 | |
a5cd71ca JX |
12613 | #: builtin/fetch.c:115 |
12614 | msgid "fetch.parallel cannot be negative" | |
12615 | msgstr "fetch.parallel 不能为负数" | |
12616 | ||
12617 | #: builtin/fetch.c:138 builtin/pull.c:204 | |
ef317cd5 | 12618 | msgid "fetch from all remotes" |
07432cef | 12619 | msgstr "从所有的远程抓取" |
ef317cd5 | 12620 | |
a5cd71ca JX |
12621 | #: builtin/fetch.c:140 builtin/pull.c:248 |
12622 | msgid "set upstream for git pull/fetch" | |
12623 | msgstr "为 git pull/fetch 设置上游" | |
12624 | ||
12625 | #: builtin/fetch.c:142 builtin/pull.c:207 | |
ef317cd5 | 12626 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 12627 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 12628 | |
a5cd71ca | 12629 | #: builtin/fetch.c:144 builtin/pull.c:210 |
ef317cd5 | 12630 | msgid "path to upload pack on remote end" |
07432cef | 12631 | msgstr "上传包到远程的路径" |
ef317cd5 | 12632 | |
a5cd71ca | 12633 | #: builtin/fetch.c:145 |
4c27fcb5 JX |
12634 | msgid "force overwrite of local reference" |
12635 | msgstr "强制覆盖本地引用" | |
ef317cd5 | 12636 | |
a5cd71ca | 12637 | #: builtin/fetch.c:147 |
ef317cd5 | 12638 | msgid "fetch from multiple remotes" |
07432cef | 12639 | msgstr "从多个远程抓取" |
ef317cd5 | 12640 | |
a5cd71ca | 12641 | #: builtin/fetch.c:149 builtin/pull.c:214 |
ef317cd5 | 12642 | msgid "fetch all tags and associated objects" |
55a16ee4 | 12643 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 12644 | |
a5cd71ca | 12645 | #: builtin/fetch.c:151 |
ef317cd5 | 12646 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 12647 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 12648 | |
a5cd71ca | 12649 | #: builtin/fetch.c:153 |
276ceeaa JX |
12650 | msgid "number of submodules fetched in parallel" |
12651 | msgstr "子模组获取的并发数" | |
12652 | ||
a5cd71ca | 12653 | #: builtin/fetch.c:155 builtin/pull.c:217 |
ef317cd5 | 12654 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 12655 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 12656 | |
a5cd71ca | 12657 | #: builtin/fetch.c:157 |
31e5e17b JX |
12658 | msgid "prune local tags no longer on remote and clobber changed tags" |
12659 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
12660 | ||
07432cef | 12661 | # 译者:可选值,不能翻译 |
a5cd71ca | 12662 | #: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 |
ef317cd5 | 12663 | msgid "on-demand" |
07432cef | 12664 | msgstr "on-demand" |
ef317cd5 | 12665 | |
a5cd71ca | 12666 | #: builtin/fetch.c:159 |
ef317cd5 | 12667 | msgid "control recursive fetching of submodules" |
07432cef | 12668 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 12669 | |
a5cd71ca | 12670 | #: builtin/fetch.c:163 builtin/pull.c:225 |
ef317cd5 | 12671 | msgid "keep downloaded pack" |
07432cef | 12672 | msgstr "保持下载包" |
ef317cd5 | 12673 | |
a5cd71ca | 12674 | #: builtin/fetch.c:165 |
ef317cd5 | 12675 | msgid "allow updating of HEAD ref" |
07432cef | 12676 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 12677 | |
a5cd71ca | 12678 | #: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 |
ef317cd5 | 12679 | msgid "deepen history of shallow clone" |
07432cef | 12680 | msgstr "深化浅克隆的历史" |
ef317cd5 | 12681 | |
a5cd71ca | 12682 | #: builtin/fetch.c:170 |
a0b6b246 JX |
12683 | msgid "deepen history of shallow repository based on time" |
12684 | msgstr "基于时间来深化浅克隆的历史" | |
12685 | ||
a5cd71ca | 12686 | #: builtin/fetch.c:176 builtin/pull.c:231 |
a77c07d9 | 12687 | msgid "convert to a complete repository" |
160fb2b2 | 12688 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 12689 | |
a5cd71ca | 12690 | #: builtin/fetch.c:179 |
ef317cd5 | 12691 | msgid "prepend this to submodule path output" |
07432cef | 12692 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 12693 | |
a5cd71ca | 12694 | #: builtin/fetch.c:182 |
a4f16749 JX |
12695 | msgid "" |
12696 | "default for recursive fetching of submodules (lower priority than config " | |
12697 | "files)" | |
12698 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 12699 | |
a5cd71ca | 12700 | #: builtin/fetch.c:186 builtin/pull.c:234 |
cfff71a9 JX |
12701 | msgid "accept refs that update .git/shallow" |
12702 | msgstr "接受更新 .git/shallow 的引用" | |
12703 | ||
a5cd71ca | 12704 | #: builtin/fetch.c:187 builtin/pull.c:236 |
6acbf033 JX |
12705 | msgid "refmap" |
12706 | msgstr "引用映射" | |
12707 | ||
a5cd71ca | 12708 | #: builtin/fetch.c:188 builtin/pull.c:237 |
6acbf033 JX |
12709 | msgid "specify fetch refmap" |
12710 | msgstr "指定获取操作的引用映射" | |
12711 | ||
a5cd71ca | 12712 | #: builtin/fetch.c:195 |
c1ac5258 JX |
12713 | msgid "report that we have only objects reachable from this object" |
12714 | msgstr "报告我们只拥有从该对象开始可达的对象" | |
12715 | ||
a5cd71ca | 12716 | #: builtin/fetch.c:198 |
a6cd2cc4 JX |
12717 | msgid "run 'gc --auto' after fetching" |
12718 | msgstr "获取后执行 'gc --auto'" | |
12719 | ||
a5cd71ca | 12720 | #: builtin/fetch.c:200 builtin/pull.c:246 |
a6cd2cc4 JX |
12721 | msgid "check for forced-updates on all updated branches" |
12722 | msgstr "在所有更新分支上检查强制更新" | |
12723 | ||
a5cd71ca | 12724 | #: builtin/fetch.c:510 |
c04f5ac3 JX |
12725 | msgid "Couldn't find remote ref HEAD" |
12726 | msgstr "无法发现远程 HEAD 引用" | |
12727 | ||
a5cd71ca | 12728 | #: builtin/fetch.c:650 |
5c57d762 JX |
12729 | #, c-format |
12730 | msgid "configuration fetch.output contains invalid value %s" | |
12731 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
12732 | ||
a5cd71ca | 12733 | #: builtin/fetch.c:748 |
c04f5ac3 JX |
12734 | #, c-format |
12735 | msgid "object %s not found" | |
12736 | msgstr "对象 %s 未发现" | |
12737 | ||
a5cd71ca | 12738 | #: builtin/fetch.c:752 |
c04f5ac3 JX |
12739 | msgid "[up to date]" |
12740 | msgstr "[最新]" | |
12741 | ||
a5cd71ca | 12742 | #: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 |
c04f5ac3 JX |
12743 | msgid "[rejected]" |
12744 | msgstr "[已拒绝]" | |
12745 | ||
a5cd71ca | 12746 | #: builtin/fetch.c:766 |
5c57d762 | 12747 | msgid "can't fetch in current branch" |
9a4b694c | 12748 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 12749 | |
a5cd71ca | 12750 | #: builtin/fetch.c:776 |
c04f5ac3 | 12751 | msgid "[tag update]" |
55a16ee4 | 12752 | msgstr "[标签更新]" |
c04f5ac3 | 12753 | |
a5cd71ca JX |
12754 | #: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 |
12755 | #: builtin/fetch.c:848 | |
5c57d762 JX |
12756 | msgid "unable to update local ref" |
12757 | msgstr "不能更新本地引用" | |
c04f5ac3 | 12758 | |
a5cd71ca | 12759 | #: builtin/fetch.c:781 |
4c27fcb5 JX |
12760 | msgid "would clobber existing tag" |
12761 | msgstr "会破坏现有的标签" | |
12762 | ||
a5cd71ca | 12763 | #: builtin/fetch.c:803 |
c04f5ac3 | 12764 | msgid "[new tag]" |
55a16ee4 | 12765 | msgstr "[新标签]" |
c04f5ac3 | 12766 | |
a5cd71ca | 12767 | #: builtin/fetch.c:806 |
c04f5ac3 JX |
12768 | msgid "[new branch]" |
12769 | msgstr "[新分支]" | |
12770 | ||
a5cd71ca | 12771 | #: builtin/fetch.c:809 |
170e9899 JX |
12772 | msgid "[new ref]" |
12773 | msgstr "[新引用]" | |
12774 | ||
a5cd71ca | 12775 | #: builtin/fetch.c:848 |
c04f5ac3 JX |
12776 | msgid "forced update" |
12777 | msgstr "强制更新" | |
12778 | ||
a5cd71ca | 12779 | #: builtin/fetch.c:853 |
5c57d762 JX |
12780 | msgid "non-fast-forward" |
12781 | msgstr "非快进" | |
c04f5ac3 | 12782 | |
a5cd71ca | 12783 | #: builtin/fetch.c:874 |
a6cd2cc4 JX |
12784 | msgid "" |
12785 | "Fetch normally indicates which branches had a forced update,\n" | |
12786 | "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" | |
12787 | "flag or run 'git config fetch.showForcedUpdates true'." | |
12788 | msgstr "" | |
12789 | "获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n" | |
12790 | "要重新启用,请使用 '--show-forced-updates' 选项或运行\n" | |
12791 | "'git config fetch.showForcedUpdates true'。" | |
12792 | ||
a5cd71ca | 12793 | #: builtin/fetch.c:878 |
a6cd2cc4 JX |
12794 | #, c-format |
12795 | msgid "" | |
12796 | "It took %.2f seconds to check forced updates. You can use\n" | |
12797 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " | |
12798 | "false'\n" | |
12799 | " to avoid this check.\n" | |
12800 | msgstr "" | |
12801 | "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" | |
12802 | "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" | |
12803 | ||
a5cd71ca | 12804 | #: builtin/fetch.c:908 |
c04f5ac3 JX |
12805 | #, c-format |
12806 | msgid "%s did not send all necessary objects\n" | |
e640d114 | 12807 | msgstr "%s 未发送所有必需的对象\n" |
c04f5ac3 | 12808 | |
a5cd71ca | 12809 | #: builtin/fetch.c:929 |
cfff71a9 JX |
12810 | #, c-format |
12811 | msgid "reject %s because shallow roots are not allowed to be updated" | |
12812 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
12813 | ||
a5cd71ca | 12814 | #: builtin/fetch.c:1020 builtin/fetch.c:1157 |
c04f5ac3 JX |
12815 | #, c-format |
12816 | msgid "From %.*s\n" | |
12817 | msgstr "来自 %.*s\n" | |
12818 | ||
a5cd71ca | 12819 | #: builtin/fetch.c:1031 |
c04f5ac3 JX |
12820 | #, c-format |
12821 | msgid "" | |
12822 | "some local refs could not be updated; try running\n" | |
12823 | " 'git remote prune %s' to remove any old, conflicting branches" | |
12824 | msgstr "" | |
12825 | "一些本地引用不能被更新;尝试运行\n" | |
12826 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
12827 | ||
90e6ef53 | 12828 | # 译者:注意保持前导空格 |
a5cd71ca | 12829 | #: builtin/fetch.c:1127 |
81809b99 | 12830 | #, c-format |
8ada9598 | 12831 | msgid " (%s will become dangling)" |
e640d114 | 12832 | msgstr " (%s 将成为悬空状态)" |
c04f5ac3 | 12833 | |
90e6ef53 | 12834 | # 译者:注意保持前导空格 |
a5cd71ca | 12835 | #: builtin/fetch.c:1128 |
81809b99 | 12836 | #, c-format |
8ada9598 | 12837 | msgid " (%s has become dangling)" |
e640d114 | 12838 | msgstr " (%s 已成为悬空状态)" |
c04f5ac3 | 12839 | |
a5cd71ca | 12840 | #: builtin/fetch.c:1160 |
c04f5ac3 JX |
12841 | msgid "[deleted]" |
12842 | msgstr "[已删除]" | |
12843 | ||
a5cd71ca | 12844 | #: builtin/fetch.c:1161 builtin/remote.c:1036 |
c04f5ac3 JX |
12845 | msgid "(none)" |
12846 | msgstr "(无)" | |
12847 | ||
a5cd71ca | 12848 | #: builtin/fetch.c:1184 |
c04f5ac3 JX |
12849 | #, c-format |
12850 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 12851 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 12852 | |
a5cd71ca | 12853 | #: builtin/fetch.c:1203 |
c04f5ac3 JX |
12854 | #, c-format |
12855 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
12856 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
12857 | ||
a5cd71ca | 12858 | #: builtin/fetch.c:1206 |
c04f5ac3 JX |
12859 | #, c-format |
12860 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 12861 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 12862 | |
a5cd71ca JX |
12863 | #: builtin/fetch.c:1414 |
12864 | msgid "multiple branch detected, incompatible with --set-upstream" | |
12865 | msgstr "检测到多分支,和 --set-upstream 不兼容" | |
12866 | ||
12867 | #: builtin/fetch.c:1429 | |
12868 | msgid "not setting upstream for a remote remote-tracking branch" | |
12869 | msgstr "没有为一个远程跟踪分支设置上游" | |
12870 | ||
12871 | #: builtin/fetch.c:1431 | |
12872 | msgid "not setting upstream for a remote tag" | |
12873 | msgstr "没有为一个远程标签设置上游" | |
12874 | ||
12875 | #: builtin/fetch.c:1433 | |
12876 | msgid "unknown branch type" | |
12877 | msgstr "未知的分支类型" | |
12878 | ||
12879 | #: builtin/fetch.c:1435 | |
12880 | msgid "" | |
12881 | "no source branch found.\n" | |
12882 | "you need to specify exactly one branch with the --set-upstream option." | |
12883 | msgstr "" | |
12884 | "未发现源分支。\n" | |
12885 | "您需要使用 --set-upstream 选项指定一个分支。" | |
12886 | ||
12887 | #: builtin/fetch.c:1561 builtin/fetch.c:1623 | |
c04f5ac3 JX |
12888 | #, c-format |
12889 | msgid "Fetching %s\n" | |
d4a8e00b | 12890 | msgstr "正在获取 %s\n" |
c04f5ac3 | 12891 | |
a5cd71ca | 12892 | #: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 |
c04f5ac3 JX |
12893 | #, c-format |
12894 | msgid "Could not fetch %s" | |
12895 | msgstr "不能获取 %s" | |
12896 | ||
a5cd71ca JX |
12897 | #: builtin/fetch.c:1583 |
12898 | #, c-format | |
12899 | msgid "could not fetch '%s' (exit code: %d)\n" | |
12900 | msgstr "无法获取 '%s'(退出码:%d)\n" | |
31e5e17b | 12901 | |
a5cd71ca | 12902 | #: builtin/fetch.c:1685 |
c04f5ac3 JX |
12903 | msgid "" |
12904 | "No remote repository specified. Please, specify either a URL or a\n" | |
12905 | "remote name from which new revisions should be fetched." | |
4375c10e | 12906 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 12907 | |
a5cd71ca | 12908 | #: builtin/fetch.c:1722 |
c04f5ac3 | 12909 | msgid "You need to specify a tag name." |
55a16ee4 | 12910 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 12911 | |
a5cd71ca | 12912 | #: builtin/fetch.c:1774 |
a0b6b246 JX |
12913 | msgid "Negative depth in --deepen is not supported" |
12914 | msgstr "--deepen 不支持负数深度" | |
12915 | ||
a5cd71ca | 12916 | #: builtin/fetch.c:1776 |
a0b6b246 JX |
12917 | msgid "--deepen and --depth are mutually exclusive" |
12918 | msgstr "--deepen 和 --depth 是互斥的" | |
12919 | ||
a5cd71ca | 12920 | #: builtin/fetch.c:1781 |
a77c07d9 JX |
12921 | msgid "--depth and --unshallow cannot be used together" |
12922 | msgstr "--depth 和 --unshallow 不能同时使用" | |
12923 | ||
a5cd71ca | 12924 | #: builtin/fetch.c:1783 |
a77c07d9 | 12925 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 12926 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 12927 | |
a5cd71ca | 12928 | #: builtin/fetch.c:1799 |
c04f5ac3 | 12929 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 12930 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 12931 | |
a5cd71ca | 12932 | #: builtin/fetch.c:1801 |
c04f5ac3 | 12933 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 12934 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 12935 | |
a5cd71ca | 12936 | #: builtin/fetch.c:1810 |
c04f5ac3 JX |
12937 | #, c-format |
12938 | msgid "No such remote or remote group: %s" | |
12939 | msgstr "没有这样的远程或远程组:%s" | |
12940 | ||
a5cd71ca | 12941 | #: builtin/fetch.c:1817 |
c04f5ac3 | 12942 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 12943 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 12944 | |
a5cd71ca | 12945 | #: builtin/fetch.c:1835 |
06991777 JX |
12946 | msgid "" |
12947 | "--filter can only be used with the remote configured in extensions." | |
12948 | "partialclone" | |
12949 | msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" | |
12950 | ||
4c27fcb5 | 12951 | #: builtin/fmt-merge-msg.c:18 |
814ff314 JX |
12952 | msgid "" |
12953 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
12954 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 12955 | |
4c27fcb5 | 12956 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 12957 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 12958 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 12959 | |
4c27fcb5 | 12960 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 12961 | msgid "alias for --log (deprecated)" |
07432cef | 12962 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 12963 | |
4c27fcb5 | 12964 | #: builtin/fmt-merge-msg.c:678 |
ef317cd5 | 12965 | msgid "text" |
07432cef | 12966 | msgstr "文本" |
ef317cd5 | 12967 | |
4c27fcb5 | 12968 | #: builtin/fmt-merge-msg.c:679 |
ef317cd5 | 12969 | msgid "use <text> as start of message" |
07432cef | 12970 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 12971 | |
4c27fcb5 | 12972 | #: builtin/fmt-merge-msg.c:680 |
ef317cd5 | 12973 | msgid "file to read from" |
07432cef | 12974 | msgstr "从文件中读取" |
ef317cd5 | 12975 | |
a4f16749 | 12976 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
12977 | msgid "git for-each-ref [<options>] [<pattern>]" |
12978 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 12979 | |
a4f16749 | 12980 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
12981 | msgid "git for-each-ref [--points-at <object>]" |
12982 | msgstr "git for-each-ref [--points-at <对象>]" | |
12983 | ||
a4f16749 | 12984 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
12985 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
12986 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 12987 | |
a4f16749 | 12988 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
12989 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
12990 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 12991 | |
a4f16749 | 12992 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 12993 | msgid "quote placeholders suitably for shells" |
07432cef | 12994 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 12995 | |
a4f16749 | 12996 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 12997 | msgid "quote placeholders suitably for perl" |
07432cef | 12998 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 12999 | |
a4f16749 | 13000 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 13001 | msgid "quote placeholders suitably for python" |
07432cef | 13002 | msgstr "引用占位符适用于 python" |
ef317cd5 | 13003 | |
a4f16749 | 13004 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
13005 | msgid "quote placeholders suitably for Tcl" |
13006 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 13007 | |
a4f16749 | 13008 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 13009 | msgid "show only <n> matched refs" |
07432cef | 13010 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 13011 | |
a6cd2cc4 | 13012 | #: builtin/for-each-ref.c:39 builtin/tag.c:439 |
6937cb4e JX |
13013 | msgid "respect format colors" |
13014 | msgstr "遵照格式中的颜色输出" | |
13015 | ||
d46c5519 | 13016 | #: builtin/for-each-ref.c:42 |
94550ed3 JX |
13017 | msgid "print only refs which points at the given object" |
13018 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 13019 | |
d46c5519 | 13020 | #: builtin/for-each-ref.c:44 |
94550ed3 JX |
13021 | msgid "print only refs that are merged" |
13022 | msgstr "只打印已经合并的引用" | |
13023 | ||
d46c5519 | 13024 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
13025 | msgid "print only refs that are not merged" |
13026 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 13027 | |
d46c5519 | 13028 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
13029 | msgid "print only refs which contain the commit" |
13030 | msgstr "只打印包含该提交的引用" | |
13031 | ||
d46c5519 | 13032 | #: builtin/for-each-ref.c:47 |
87cb7997 JX |
13033 | msgid "print only refs which don't contain the commit" |
13034 | msgstr "只打印不包含该提交的引用" | |
13035 | ||
06991777 JX |
13036 | #: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 |
13037 | msgid "unknown" | |
13038 | msgstr "未知" | |
13039 | ||
13040 | #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> | |
13041 | #: builtin/fsck.c:120 builtin/fsck.c:136 | |
13042 | #, c-format | |
13043 | msgid "error in %s %s: %s" | |
13044 | msgstr "%s %s 错误:%s" | |
13045 | ||
13046 | #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> | |
13047 | #: builtin/fsck.c:131 | |
13048 | #, c-format | |
13049 | msgid "warning in %s %s: %s" | |
13050 | msgstr "%s %s 警告:%s" | |
13051 | ||
13052 | #: builtin/fsck.c:157 builtin/fsck.c:159 | |
13053 | #, c-format | |
13054 | msgid "broken link from %7s %s" | |
13055 | msgstr "来自 %7s %s 的损坏的链接" | |
13056 | ||
13057 | #: builtin/fsck.c:168 | |
13058 | msgid "wrong object type in link" | |
13059 | msgstr "链接中错误的对象类型" | |
13060 | ||
13061 | #: builtin/fsck.c:184 | |
13062 | #, c-format | |
13063 | msgid "" | |
13064 | "broken link from %7s %s\n" | |
13065 | " to %7s %s" | |
13066 | msgstr "" | |
13067 | "损坏的链接来自于 %7s %s\n" | |
13068 | " 到 %7s %s" | |
13069 | ||
d46c5519 | 13070 | #: builtin/fsck.c:295 |
06991777 JX |
13071 | #, c-format |
13072 | msgid "missing %s %s" | |
13073 | msgstr "缺失 %s %s" | |
13074 | ||
d46c5519 | 13075 | #: builtin/fsck.c:321 |
06991777 JX |
13076 | #, c-format |
13077 | msgid "unreachable %s %s" | |
5b533632 | 13078 | msgstr "不可达 %s %s" |
06991777 | 13079 | |
d46c5519 | 13080 | #: builtin/fsck.c:340 |
06991777 JX |
13081 | #, c-format |
13082 | msgid "dangling %s %s" | |
13083 | msgstr "悬空 %s %s" | |
13084 | ||
d46c5519 | 13085 | #: builtin/fsck.c:349 |
06991777 JX |
13086 | msgid "could not create lost-found" |
13087 | msgstr "不能创建 lost-found" | |
13088 | ||
d46c5519 | 13089 | #: builtin/fsck.c:360 |
06991777 JX |
13090 | #, c-format |
13091 | msgid "could not finish '%s'" | |
13092 | msgstr "不能完成 '%s'" | |
13093 | ||
d46c5519 | 13094 | #: builtin/fsck.c:377 |
06991777 JX |
13095 | #, c-format |
13096 | msgid "Checking %s" | |
13097 | msgstr "正在检查 %s" | |
13098 | ||
d46c5519 | 13099 | #: builtin/fsck.c:415 |
06991777 JX |
13100 | #, c-format |
13101 | msgid "Checking connectivity (%d objects)" | |
13102 | msgstr "正在检查连通性(%d 个对象)" | |
13103 | ||
d46c5519 | 13104 | #: builtin/fsck.c:434 |
06991777 JX |
13105 | #, c-format |
13106 | msgid "Checking %s %s" | |
13107 | msgstr "正在检查 %s %s" | |
13108 | ||
d46c5519 | 13109 | #: builtin/fsck.c:438 |
06991777 JX |
13110 | msgid "broken links" |
13111 | msgstr "损坏的链接" | |
13112 | ||
d46c5519 | 13113 | #: builtin/fsck.c:447 |
06991777 JX |
13114 | #, c-format |
13115 | msgid "root %s" | |
13116 | msgstr "根 %s" | |
13117 | ||
d46c5519 | 13118 | #: builtin/fsck.c:455 |
06991777 JX |
13119 | #, c-format |
13120 | msgid "tagged %s %s (%s) in %s" | |
13121 | msgstr "标记 %s %s (%s) 于 %s" | |
13122 | ||
d46c5519 | 13123 | #: builtin/fsck.c:484 |
06991777 JX |
13124 | #, c-format |
13125 | msgid "%s: object corrupt or missing" | |
13126 | msgstr "%s:对象损坏或丢失" | |
13127 | ||
d46c5519 | 13128 | #: builtin/fsck.c:509 |
06991777 JX |
13129 | #, c-format |
13130 | msgid "%s: invalid reflog entry %s" | |
13131 | msgstr "%s:无效的引用日志条目 %s" | |
13132 | ||
d46c5519 | 13133 | #: builtin/fsck.c:523 |
06991777 JX |
13134 | #, c-format |
13135 | msgid "Checking reflog %s->%s" | |
13136 | msgstr "正在检查引用日志 %s->%s" | |
13137 | ||
d46c5519 | 13138 | #: builtin/fsck.c:557 |
06991777 JX |
13139 | #, c-format |
13140 | msgid "%s: invalid sha1 pointer %s" | |
13141 | msgstr "%s:无效的 sha1 指针 %s" | |
13142 | ||
d46c5519 | 13143 | #: builtin/fsck.c:564 |
06991777 JX |
13144 | #, c-format |
13145 | msgid "%s: not a commit" | |
13146 | msgstr "%s:不是一个提交" | |
13147 | ||
d46c5519 | 13148 | #: builtin/fsck.c:619 |
06991777 JX |
13149 | msgid "notice: No default references" |
13150 | msgstr "注意:无默认引用" | |
13151 | ||
d46c5519 | 13152 | #: builtin/fsck.c:634 |
06991777 JX |
13153 | #, c-format |
13154 | msgid "%s: object corrupt or missing: %s" | |
13155 | msgstr "%s:对象损坏或丢失:%s" | |
13156 | ||
d46c5519 | 13157 | #: builtin/fsck.c:647 |
06991777 JX |
13158 | #, c-format |
13159 | msgid "%s: object could not be parsed: %s" | |
13160 | msgstr "%s:不能解析对象:%s" | |
13161 | ||
d46c5519 | 13162 | #: builtin/fsck.c:667 |
06991777 JX |
13163 | #, c-format |
13164 | msgid "bad sha1 file: %s" | |
13165 | msgstr "坏的 sha1 文件:%s" | |
13166 | ||
d46c5519 | 13167 | #: builtin/fsck.c:682 |
06991777 JX |
13168 | msgid "Checking object directory" |
13169 | msgstr "正在检查对象目录" | |
13170 | ||
d46c5519 | 13171 | #: builtin/fsck.c:685 |
6c94aba5 | 13172 | msgid "Checking object directories" |
06991777 JX |
13173 | msgstr "正在检查对象目录" |
13174 | ||
d46c5519 | 13175 | #: builtin/fsck.c:700 |
06991777 JX |
13176 | #, c-format |
13177 | msgid "Checking %s link" | |
13178 | msgstr "正在检查 %s 链接" | |
13179 | ||
a6cd2cc4 | 13180 | #: builtin/fsck.c:705 builtin/index-pack.c:842 |
06991777 JX |
13181 | #, c-format |
13182 | msgid "invalid %s" | |
13183 | msgstr "无效的 %s" | |
13184 | ||
d46c5519 | 13185 | #: builtin/fsck.c:712 |
06991777 JX |
13186 | #, c-format |
13187 | msgid "%s points to something strange (%s)" | |
13188 | msgstr "%s 指向奇怪的东西(%s)" | |
13189 | ||
d46c5519 | 13190 | #: builtin/fsck.c:718 |
06991777 JX |
13191 | #, c-format |
13192 | msgid "%s: detached HEAD points at nothing" | |
13193 | msgstr "%s:分离头指针的指向不存在" | |
13194 | ||
d46c5519 | 13195 | #: builtin/fsck.c:722 |
06991777 JX |
13196 | #, c-format |
13197 | msgid "notice: %s points to an unborn branch (%s)" | |
13198 | msgstr "注意:%s 指向一个尚未诞生的分支(%s)" | |
13199 | ||
d46c5519 | 13200 | #: builtin/fsck.c:734 |
06991777 JX |
13201 | msgid "Checking cache tree" |
13202 | msgstr "正在检查缓存树" | |
13203 | ||
d46c5519 | 13204 | #: builtin/fsck.c:739 |
06991777 JX |
13205 | #, c-format |
13206 | msgid "%s: invalid sha1 pointer in cache-tree" | |
13207 | msgstr "%s:cache-tree 中无效的 sha1 指针" | |
6c94aba5 | 13208 | |
d46c5519 | 13209 | #: builtin/fsck.c:750 |
06991777 JX |
13210 | msgid "non-tree in cache-tree" |
13211 | msgstr "cache-tree 中非树对象" | |
13212 | ||
d46c5519 | 13213 | #: builtin/fsck.c:781 |
814ff314 JX |
13214 | msgid "git fsck [<options>] [<object>...]" |
13215 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 13216 | |
d46c5519 | 13217 | #: builtin/fsck.c:787 |
ef317cd5 | 13218 | msgid "show unreachable objects" |
07432cef | 13219 | msgstr "显示不可达的对象" |
ef317cd5 | 13220 | |
d46c5519 | 13221 | #: builtin/fsck.c:788 |
ef317cd5 | 13222 | msgid "show dangling objects" |
e640d114 | 13223 | msgstr "显示悬空的对象" |
ef317cd5 | 13224 | |
d46c5519 | 13225 | #: builtin/fsck.c:789 |
ef317cd5 | 13226 | msgid "report tags" |
55a16ee4 | 13227 | msgstr "报告标签" |
ef317cd5 | 13228 | |
d46c5519 | 13229 | #: builtin/fsck.c:790 |
ef317cd5 | 13230 | msgid "report root nodes" |
07432cef | 13231 | msgstr "报告根节点" |
ef317cd5 | 13232 | |
d46c5519 | 13233 | #: builtin/fsck.c:791 |
ef317cd5 | 13234 | msgid "make index objects head nodes" |
07432cef | 13235 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 13236 | |
d46c5519 | 13237 | #: builtin/fsck.c:792 |
ef317cd5 | 13238 | msgid "make reflogs head nodes (default)" |
07432cef | 13239 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 13240 | |
d46c5519 | 13241 | #: builtin/fsck.c:793 |
ef317cd5 | 13242 | msgid "also consider packs and alternate objects" |
07432cef | 13243 | msgstr "也考虑包和备用对象" |
ef317cd5 | 13244 | |
d46c5519 | 13245 | #: builtin/fsck.c:794 |
1b7f4a34 JX |
13246 | msgid "check only connectivity" |
13247 | msgstr "仅检查连通性" | |
13248 | ||
d46c5519 | 13249 | #: builtin/fsck.c:795 |
ef317cd5 | 13250 | msgid "enable more strict checking" |
07432cef | 13251 | msgstr "启用更严格的检查" |
ef317cd5 | 13252 | |
d46c5519 | 13253 | #: builtin/fsck.c:797 |
ef317cd5 | 13254 | msgid "write dangling objects in .git/lost-found" |
e640d114 | 13255 | msgstr "将悬空对象写入 .git/lost-found 中" |
ef317cd5 | 13256 | |
d46c5519 | 13257 | #: builtin/fsck.c:798 builtin/prune.c:132 |
ef317cd5 | 13258 | msgid "show progress" |
07432cef | 13259 | msgstr "显示进度" |
ef317cd5 | 13260 | |
d46c5519 | 13261 | #: builtin/fsck.c:799 |
5c57d762 JX |
13262 | msgid "show verbose names for reachable objects" |
13263 | msgstr "显示可达对象的详细名称" | |
13264 | ||
a6cd2cc4 | 13265 | #: builtin/fsck.c:859 builtin/index-pack.c:225 |
6c94aba5 | 13266 | msgid "Checking objects" |
06991777 JX |
13267 | msgstr "正在检查对象" |
13268 | ||
d46c5519 | 13269 | #: builtin/fsck.c:887 |
06991777 JX |
13270 | #, c-format |
13271 | msgid "%s: object missing" | |
13272 | msgstr "%s:对象缺失" | |
13273 | ||
d46c5519 | 13274 | #: builtin/fsck.c:899 |
06991777 JX |
13275 | #, c-format |
13276 | msgid "invalid parameter: expected sha1, got '%s'" | |
13277 | msgstr "无效的参数:期望 sha1,得到 '%s'" | |
6c94aba5 | 13278 | |
a5cd71ca | 13279 | #: builtin/gc.c:35 |
814ff314 JX |
13280 | msgid "git gc [<options>]" |
13281 | msgstr "git gc [<选项>]" | |
ef317cd5 | 13282 | |
c1ac5258 | 13283 | #: builtin/gc.c:90 |
c04f5ac3 | 13284 | #, c-format |
87cb7997 | 13285 | msgid "Failed to fstat %s: %s" |
65e2041e | 13286 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 13287 | |
d46c5519 JX |
13288 | #: builtin/gc.c:126 |
13289 | #, c-format | |
13290 | msgid "failed to parse '%s' value '%s'" | |
13291 | msgstr "无法解析 '%s' 值 '%s'" | |
13292 | ||
a5cd71ca | 13293 | #: builtin/gc.c:475 builtin/init-db.c:55 |
c04f5ac3 | 13294 | #, c-format |
4c27fcb5 JX |
13295 | msgid "cannot stat '%s'" |
13296 | msgstr "不能对 '%s' 调用 stat" | |
13297 | ||
a5cd71ca | 13298 | #: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 |
4c27fcb5 JX |
13299 | #, c-format |
13300 | msgid "cannot read '%s'" | |
13301 | msgstr "不能读取 '%s'" | |
c04f5ac3 | 13302 | |
a5cd71ca | 13303 | #: builtin/gc.c:491 |
94550ed3 JX |
13304 | #, c-format |
13305 | msgid "" | |
13306 | "The last gc run reported the following. Please correct the root cause\n" | |
13307 | "and remove %s.\n" | |
13308 | "Automatic cleanup will not be performed until the file is removed.\n" | |
13309 | "\n" | |
13310 | "%s" | |
13311 | msgstr "" | |
13312 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
13313 | "在该文件被删除之前,自动清理将不会执行。\n" | |
13314 | "\n" | |
13315 | "%s" | |
13316 | ||
a5cd71ca | 13317 | #: builtin/gc.c:539 |
ef317cd5 | 13318 | msgid "prune unreferenced objects" |
07432cef | 13319 | msgstr "清除未引用的对象" |
ef317cd5 | 13320 | |
a5cd71ca | 13321 | #: builtin/gc.c:541 |
ef317cd5 | 13322 | msgid "be more thorough (increased runtime)" |
07432cef | 13323 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 13324 | |
a5cd71ca | 13325 | #: builtin/gc.c:542 |
ef317cd5 | 13326 | msgid "enable auto-gc mode" |
07432cef | 13327 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 13328 | |
a5cd71ca | 13329 | #: builtin/gc.c:545 |
90314792 JX |
13330 | msgid "force running gc even if there may be another gc running" |
13331 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
13332 | ||
a5cd71ca | 13333 | #: builtin/gc.c:548 |
fd8cb379 JX |
13334 | msgid "repack all other packs except the largest pack" |
13335 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
13336 | ||
a5cd71ca | 13337 | #: builtin/gc.c:565 |
fd8cb379 JX |
13338 | #, c-format |
13339 | msgid "failed to parse gc.logexpiry value %s" | |
c1ac5258 | 13340 | msgstr "解析 gc.logexpiry 的值 %s 失败" |
fd8cb379 | 13341 | |
a5cd71ca | 13342 | #: builtin/gc.c:576 |
87cb7997 | 13343 | #, c-format |
fd8cb379 | 13344 | msgid "failed to parse prune expiry value %s" |
c1ac5258 | 13345 | msgstr "解析清除期限值 %s 失败" |
87cb7997 | 13346 | |
a5cd71ca | 13347 | #: builtin/gc.c:596 |
c04f5ac3 | 13348 | #, c-format |
6c94aba5 | 13349 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 13350 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 13351 | |
a5cd71ca | 13352 | #: builtin/gc.c:598 |
6c94aba5 JX |
13353 | #, c-format |
13354 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 13355 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 13356 | |
a5cd71ca | 13357 | #: builtin/gc.c:599 |
6c94aba5 JX |
13358 | #, c-format |
13359 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
13360 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 13361 | |
a5cd71ca | 13362 | #: builtin/gc.c:639 |
90314792 JX |
13363 | #, c-format |
13364 | msgid "" | |
13365 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
13366 | msgstr "" | |
29004bbb | 13367 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 13368 | |
a5cd71ca | 13369 | #: builtin/gc.c:694 |
c04f5ac3 JX |
13370 | msgid "" |
13371 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 13372 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 13373 | |
06991777 | 13374 | #: builtin/grep.c:29 |
814ff314 JX |
13375 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
13376 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 13377 | |
06991777 | 13378 | #: builtin/grep.c:225 |
c04f5ac3 JX |
13379 | #, c-format |
13380 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 13381 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 13382 | |
06991777 | 13383 | #: builtin/grep.c:279 |
276ceeaa JX |
13384 | #, c-format |
13385 | msgid "invalid number of threads specified (%d) for %s" | |
13386 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
13387 | ||
a4f16749 JX |
13388 | #. TRANSLATORS: %s is the configuration |
13389 | #. variable for tweaking threads, currently | |
13390 | #. grep.threads | |
13391 | #. | |
a6cd2cc4 | 13392 | #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 |
a5cd71ca | 13393 | #: builtin/pack-objects.c:2708 |
a4f16749 JX |
13394 | #, c-format |
13395 | msgid "no threads support, ignoring %s" | |
13396 | msgstr "没有线程支持,忽略 %s" | |
13397 | ||
a5cd71ca | 13398 | #: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 |
c04f5ac3 JX |
13399 | #, c-format |
13400 | msgid "unable to read tree (%s)" | |
90e6ef53 | 13401 | msgstr "无法读取树(%s)" |
c04f5ac3 | 13402 | |
a5cd71ca | 13403 | #: builtin/grep.c:650 |
c04f5ac3 JX |
13404 | #, c-format |
13405 | msgid "unable to grep from object of type %s" | |
13406 | msgstr "无法抓取来自于 %s 类型的对象" | |
13407 | ||
a5cd71ca | 13408 | #: builtin/grep.c:716 |
c04f5ac3 JX |
13409 | #, c-format |
13410 | msgid "switch `%c' expects a numerical value" | |
13411 | msgstr "开关 `%c' 期望一个数字值" | |
13412 | ||
a5cd71ca | 13413 | #: builtin/grep.c:815 |
ef317cd5 | 13414 | msgid "search in index instead of in the work tree" |
07432cef | 13415 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 13416 | |
a5cd71ca | 13417 | #: builtin/grep.c:817 |
ef317cd5 | 13418 | msgid "find in contents not managed by git" |
07432cef | 13419 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
13420 | |
13421 | # 译者:中文字符串拼接,可删除前导空格 | |
a5cd71ca | 13422 | #: builtin/grep.c:819 |
ef317cd5 | 13423 | msgid "search in both tracked and untracked files" |
07432cef | 13424 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 13425 | |
a5cd71ca | 13426 | #: builtin/grep.c:821 |
814ff314 JX |
13427 | msgid "ignore files specified via '.gitignore'" |
13428 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 13429 | |
a5cd71ca | 13430 | #: builtin/grep.c:823 |
87cb7997 | 13431 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
13432 | msgstr "在每一个子模组中递归搜索" |
13433 | ||
a5cd71ca | 13434 | #: builtin/grep.c:826 |
ef317cd5 | 13435 | msgid "show non-matching lines" |
07432cef | 13436 | msgstr "显示未匹配的行" |
ef317cd5 | 13437 | |
a5cd71ca | 13438 | #: builtin/grep.c:828 |
ef317cd5 | 13439 | msgid "case insensitive matching" |
07432cef | 13440 | msgstr "不区分大小写匹配" |
ef317cd5 | 13441 | |
a5cd71ca | 13442 | #: builtin/grep.c:830 |
ef317cd5 | 13443 | msgid "match patterns only at word boundaries" |
07432cef | 13444 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 13445 | |
a5cd71ca | 13446 | #: builtin/grep.c:832 |
ef317cd5 | 13447 | msgid "process binary files as text" |
07432cef | 13448 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 13449 | |
a5cd71ca | 13450 | #: builtin/grep.c:834 |
ef317cd5 | 13451 | msgid "don't match patterns in binary files" |
07432cef | 13452 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 13453 | |
a5cd71ca | 13454 | #: builtin/grep.c:837 |
90314792 JX |
13455 | msgid "process binary files with textconv filters" |
13456 | msgstr "用 textconv 过滤器处理二进制文件" | |
13457 | ||
a5cd71ca | 13458 | #: builtin/grep.c:839 |
4c27fcb5 JX |
13459 | msgid "search in subdirectories (default)" |
13460 | msgstr "在子目录中寻找(默认)" | |
13461 | ||
a5cd71ca | 13462 | #: builtin/grep.c:841 |
ef317cd5 | 13463 | msgid "descend at most <depth> levels" |
07432cef | 13464 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 13465 | |
a5cd71ca | 13466 | #: builtin/grep.c:845 |
ef317cd5 | 13467 | msgid "use extended POSIX regular expressions" |
07432cef | 13468 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 13469 | |
a5cd71ca | 13470 | #: builtin/grep.c:848 |
ef317cd5 | 13471 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 13472 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 13473 | |
a5cd71ca | 13474 | #: builtin/grep.c:851 |
ef317cd5 | 13475 | msgid "interpret patterns as fixed strings" |
07432cef | 13476 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 13477 | |
a5cd71ca | 13478 | #: builtin/grep.c:854 |
ef317cd5 | 13479 | msgid "use Perl-compatible regular expressions" |
07432cef | 13480 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 13481 | |
a5cd71ca | 13482 | #: builtin/grep.c:857 |
ef317cd5 | 13483 | msgid "show line numbers" |
07432cef | 13484 | msgstr "显示行号" |
ef317cd5 | 13485 | |
a5cd71ca | 13486 | #: builtin/grep.c:858 |
c1ac5258 JX |
13487 | msgid "show column number of first match" |
13488 | msgstr "显示第一个匹配的列号" | |
13489 | ||
a5cd71ca | 13490 | #: builtin/grep.c:859 |
ef317cd5 | 13491 | msgid "don't show filenames" |
07432cef | 13492 | msgstr "不显示文件名" |
ef317cd5 | 13493 | |
a5cd71ca | 13494 | #: builtin/grep.c:860 |
ef317cd5 | 13495 | msgid "show filenames" |
07432cef | 13496 | msgstr "显示文件名" |
ef317cd5 | 13497 | |
a5cd71ca | 13498 | #: builtin/grep.c:862 |
ef317cd5 | 13499 | msgid "show filenames relative to top directory" |
07432cef | 13500 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 13501 | |
a5cd71ca | 13502 | #: builtin/grep.c:864 |
ef317cd5 | 13503 | msgid "show only filenames instead of matching lines" |
07432cef | 13504 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 13505 | |
a5cd71ca | 13506 | #: builtin/grep.c:866 |
ef317cd5 | 13507 | msgid "synonym for --files-with-matches" |
07432cef | 13508 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 13509 | |
a5cd71ca | 13510 | #: builtin/grep.c:869 |
ef317cd5 | 13511 | msgid "show only the names of files without match" |
07432cef | 13512 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 13513 | |
a5cd71ca | 13514 | #: builtin/grep.c:871 |
ef317cd5 | 13515 | msgid "print NUL after filenames" |
07432cef | 13516 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 13517 | |
a5cd71ca | 13518 | #: builtin/grep.c:874 |
c1ac5258 JX |
13519 | msgid "show only matching parts of a line" |
13520 | msgstr "只显示行中的匹配的部分" | |
13521 | ||
a5cd71ca | 13522 | #: builtin/grep.c:876 |
ef317cd5 | 13523 | msgid "show the number of matches instead of matching lines" |
07432cef | 13524 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 13525 | |
a5cd71ca | 13526 | #: builtin/grep.c:877 |
ef317cd5 | 13527 | msgid "highlight matches" |
07432cef | 13528 | msgstr "高亮显示匹配项" |
ef317cd5 | 13529 | |
a5cd71ca | 13530 | #: builtin/grep.c:879 |
ef317cd5 | 13531 | msgid "print empty line between matches from different files" |
07432cef | 13532 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 13533 | |
a5cd71ca | 13534 | #: builtin/grep.c:881 |
ef317cd5 | 13535 | msgid "show filename only once above matches from same file" |
07432cef | 13536 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 13537 | |
a5cd71ca | 13538 | #: builtin/grep.c:884 |
ef317cd5 | 13539 | msgid "show <n> context lines before and after matches" |
07432cef | 13540 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 13541 | |
a5cd71ca | 13542 | #: builtin/grep.c:887 |
ef317cd5 | 13543 | msgid "show <n> context lines before matches" |
07432cef | 13544 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 13545 | |
a5cd71ca | 13546 | #: builtin/grep.c:889 |
ef317cd5 | 13547 | msgid "show <n> context lines after matches" |
07432cef | 13548 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 13549 | |
a5cd71ca | 13550 | #: builtin/grep.c:891 |
276ceeaa JX |
13551 | msgid "use <n> worker threads" |
13552 | msgstr "使用 <n> 个工作线程" | |
13553 | ||
a5cd71ca | 13554 | #: builtin/grep.c:892 |
ef317cd5 | 13555 | msgid "shortcut for -C NUM" |
07432cef | 13556 | msgstr "快捷键 -C 数字" |
ef317cd5 | 13557 | |
a5cd71ca | 13558 | #: builtin/grep.c:895 |
ef317cd5 | 13559 | msgid "show a line with the function name before matches" |
07432cef | 13560 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 13561 | |
a5cd71ca | 13562 | #: builtin/grep.c:897 |
ef317cd5 | 13563 | msgid "show the surrounding function" |
07432cef | 13564 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 13565 | |
a5cd71ca | 13566 | #: builtin/grep.c:900 |
ef317cd5 | 13567 | msgid "read patterns from file" |
07432cef | 13568 | msgstr "从文件读取模式" |
ef317cd5 | 13569 | |
a5cd71ca | 13570 | #: builtin/grep.c:902 |
ef317cd5 | 13571 | msgid "match <pattern>" |
07432cef | 13572 | msgstr "匹配 <模式>" |
ef317cd5 | 13573 | |
a5cd71ca | 13574 | #: builtin/grep.c:904 |
ef317cd5 | 13575 | msgid "combine patterns specified with -e" |
07432cef | 13576 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 13577 | |
a5cd71ca | 13578 | #: builtin/grep.c:916 |
ef317cd5 | 13579 | msgid "indicate hit with exit status without output" |
07432cef | 13580 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 13581 | |
a5cd71ca | 13582 | #: builtin/grep.c:918 |
ef317cd5 | 13583 | msgid "show only matches from files that match all patterns" |
07432cef | 13584 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 13585 | |
a5cd71ca | 13586 | #: builtin/grep.c:920 |
07432cef WS |
13587 | msgid "show parse tree for grep expression" |
13588 | msgstr "显示 grep 表达式的解析树" | |
13589 | ||
a5cd71ca | 13590 | #: builtin/grep.c:924 |
ef317cd5 | 13591 | msgid "pager" |
07432cef | 13592 | msgstr "分页" |
ef317cd5 | 13593 | |
a5cd71ca | 13594 | #: builtin/grep.c:924 |
ef317cd5 | 13595 | msgid "show matching files in the pager" |
07432cef | 13596 | msgstr "分页显示匹配的文件" |
ef317cd5 | 13597 | |
a5cd71ca | 13598 | #: builtin/grep.c:928 |
ef317cd5 | 13599 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 13600 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 13601 | |
a5cd71ca | 13602 | #: builtin/grep.c:992 |
c1ac5258 JX |
13603 | msgid "no pattern given" |
13604 | msgstr "未提供匹配模式" | |
c04f5ac3 | 13605 | |
a5cd71ca | 13606 | #: builtin/grep.c:1028 |
87cb7997 JX |
13607 | msgid "--no-index or --untracked cannot be used with revs" |
13608 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
13609 | ||
a5cd71ca | 13610 | #: builtin/grep.c:1036 |
87cb7997 JX |
13611 | #, c-format |
13612 | msgid "unable to resolve revision: %s" | |
13613 | msgstr "不能解析版本:%s" | |
13614 | ||
a5cd71ca | 13615 | #: builtin/grep.c:1067 |
4c27fcb5 JX |
13616 | msgid "invalid option combination, ignoring --threads" |
13617 | msgstr "无效的选项组合,忽略 --threads" | |
276ceeaa | 13618 | |
a5cd71ca | 13619 | #: builtin/grep.c:1070 builtin/pack-objects.c:3400 |
a4f16749 JX |
13620 | msgid "no threads support, ignoring --threads" |
13621 | msgstr "没有线程支持,忽略 --threads" | |
13622 | ||
a5cd71ca | 13623 | #: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 |
4c27fcb5 JX |
13624 | #, c-format |
13625 | msgid "invalid number of threads specified (%d)" | |
13626 | msgstr "指定的线程数无效(%d)" | |
13627 | ||
a5cd71ca | 13628 | #: builtin/grep.c:1096 |
c04f5ac3 JX |
13629 | msgid "--open-files-in-pager only works on the worktree" |
13630 | msgstr "--open-files-in-pager 仅用于工作区" | |
13631 | ||
a5cd71ca | 13632 | #: builtin/grep.c:1119 |
c1ac5258 JX |
13633 | msgid "option not supported with --recurse-submodules" |
13634 | msgstr "选项不支持和 --recurse-submodules 共用" | |
c04f5ac3 | 13635 | |
a5cd71ca | 13636 | #: builtin/grep.c:1125 |
c1ac5258 JX |
13637 | msgid "--cached or --untracked cannot be used with --no-index" |
13638 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" | |
c04f5ac3 | 13639 | |
a5cd71ca | 13640 | #: builtin/grep.c:1131 |
c1ac5258 JX |
13641 | msgid "--[no-]exclude-standard cannot be used for tracked contents" |
13642 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容" | |
c04f5ac3 | 13643 | |
a5cd71ca | 13644 | #: builtin/grep.c:1139 |
c1ac5258 JX |
13645 | msgid "both --cached and trees are given" |
13646 | msgstr "同时给出了 --cached 和树对象" | |
13647 | ||
06991777 | 13648 | #: builtin/hash-object.c:85 |
ef317cd5 | 13649 | msgid "" |
814ff314 JX |
13650 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
13651 | "[--] <file>..." | |
ef317cd5 | 13652 | msgstr "" |
814ff314 JX |
13653 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
13654 | "[--] <文件>..." | |
ef317cd5 | 13655 | |
06991777 | 13656 | #: builtin/hash-object.c:86 |
94550ed3 JX |
13657 | msgid "git hash-object --stdin-paths" |
13658 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 13659 | |
06991777 | 13660 | #: builtin/hash-object.c:98 |
ef317cd5 | 13661 | msgid "object type" |
07432cef | 13662 | msgstr "对象类型" |
ef317cd5 | 13663 | |
06991777 | 13664 | #: builtin/hash-object.c:99 |
ef317cd5 | 13665 | msgid "write the object into the object database" |
07432cef | 13666 | msgstr "将对象写入对象数据库" |
ef317cd5 | 13667 | |
06991777 | 13668 | #: builtin/hash-object.c:101 |
ef317cd5 | 13669 | msgid "read the object from stdin" |
07432cef | 13670 | msgstr "从标准输入读取对象" |
ef317cd5 | 13671 | |
06991777 | 13672 | #: builtin/hash-object.c:103 |
ef317cd5 | 13673 | msgid "store file as is without filters" |
07432cef | 13674 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 13675 | |
06991777 | 13676 | #: builtin/hash-object.c:104 |
220c313c JX |
13677 | msgid "" |
13678 | "just hash any random garbage to create corrupt objects for debugging Git" | |
13679 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
13680 | ||
06991777 | 13681 | #: builtin/hash-object.c:105 |
ef317cd5 | 13682 | msgid "process file as it were from this path" |
07432cef | 13683 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 13684 | |
c1ac5258 | 13685 | #: builtin/help.c:46 |
ef317cd5 | 13686 | msgid "print all available commands" |
07432cef | 13687 | msgstr "打印所有可用的命令" |
ef317cd5 | 13688 | |
c1ac5258 | 13689 | #: builtin/help.c:47 |
a0b6b246 JX |
13690 | msgid "exclude guides" |
13691 | msgstr "排除向导" | |
13692 | ||
c1ac5258 | 13693 | #: builtin/help.c:48 |
4dcdc3d8 JX |
13694 | msgid "print list of useful guides" |
13695 | msgstr "显示有用的指南列表" | |
13696 | ||
c1ac5258 JX |
13697 | #: builtin/help.c:49 |
13698 | msgid "print all configuration variable names" | |
13699 | msgstr "打印所有配置变量名称" | |
13700 | ||
13701 | #: builtin/help.c:51 | |
ef317cd5 | 13702 | msgid "show man page" |
07432cef | 13703 | msgstr "显示 man 手册" |
ef317cd5 | 13704 | |
c1ac5258 | 13705 | #: builtin/help.c:52 |
ef317cd5 | 13706 | msgid "show manual in web browser" |
07432cef | 13707 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 13708 | |
c1ac5258 | 13709 | #: builtin/help.c:54 |
ef317cd5 | 13710 | msgid "show info page" |
07432cef | 13711 | msgstr "显示 info 手册" |
ef317cd5 | 13712 | |
c1ac5258 | 13713 | #: builtin/help.c:56 |
fd8cb379 JX |
13714 | msgid "print command description" |
13715 | msgstr "打印命令描述" | |
13716 | ||
c1ac5258 | 13717 | #: builtin/help.c:61 |
814ff314 JX |
13718 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
13719 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 13720 | |
d46c5519 | 13721 | #: builtin/help.c:77 |
81809b99 | 13722 | #, c-format |
8ada9598 | 13723 | msgid "unrecognized help format '%s'" |
81809b99 | 13724 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 13725 | |
d46c5519 | 13726 | #: builtin/help.c:104 |
8ada9598 | 13727 | msgid "Failed to start emacsclient." |
81809b99 | 13728 | msgstr "无法启动 emacsclient。" |
8ada9598 | 13729 | |
d46c5519 | 13730 | #: builtin/help.c:117 |
8ada9598 | 13731 | msgid "Failed to parse emacsclient version." |
81809b99 | 13732 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 13733 | |
d46c5519 | 13734 | #: builtin/help.c:125 |
8ada9598 JX |
13735 | #, c-format |
13736 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 13737 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 13738 | |
d46c5519 | 13739 | #: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 |
81809b99 | 13740 | #, c-format |
5b04ee3b | 13741 | msgid "failed to exec '%s'" |
c1ac5258 | 13742 | msgstr "执行 '%s' 失败" |
8ada9598 | 13743 | |
d46c5519 | 13744 | #: builtin/help.c:221 |
8ada9598 JX |
13745 | #, c-format |
13746 | msgid "" | |
13747 | "'%s': path for unsupported man viewer.\n" | |
13748 | "Please consider using 'man.<tool>.cmd' instead." | |
13749 | msgstr "" | |
81809b99 | 13750 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 13751 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 13752 | |
d46c5519 | 13753 | #: builtin/help.c:233 |
8ada9598 JX |
13754 | #, c-format |
13755 | msgid "" | |
13756 | "'%s': cmd for supported man viewer.\n" | |
13757 | "Please consider using 'man.<tool>.path' instead." | |
13758 | msgstr "" | |
81809b99 | 13759 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 13760 | "请使用 'man.<工具>.path'。" |
8ada9598 | 13761 | |
d46c5519 | 13762 | #: builtin/help.c:350 |
8ada9598 JX |
13763 | #, c-format |
13764 | msgid "'%s': unknown man viewer." | |
81809b99 | 13765 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 13766 | |
d46c5519 | 13767 | #: builtin/help.c:367 |
8ada9598 | 13768 | msgid "no man viewer handled the request" |
81809b99 | 13769 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 13770 | |
d46c5519 | 13771 | #: builtin/help.c:375 |
8ada9598 | 13772 | msgid "no info viewer handled the request" |
81809b99 | 13773 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 13774 | |
a6cd2cc4 | 13775 | #: builtin/help.c:434 builtin/help.c:445 git.c:336 |
fd8cb379 JX |
13776 | #, c-format |
13777 | msgid "'%s' is aliased to '%s'" | |
13778 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 13779 | |
a6cd2cc4 | 13780 | #: builtin/help.c:448 git.c:365 |
4c27fcb5 JX |
13781 | #, c-format |
13782 | msgid "bad alias.%s string: %s" | |
13783 | msgstr "坏的 alias.%s 字符串:%s" | |
13784 | ||
d46c5519 | 13785 | #: builtin/help.c:477 builtin/help.c:507 |
fd8cb379 JX |
13786 | #, c-format |
13787 | msgid "usage: %s%s" | |
13788 | msgstr "用法:%s%s" | |
4dcdc3d8 | 13789 | |
d46c5519 | 13790 | #: builtin/help.c:491 |
c1ac5258 JX |
13791 | msgid "'git help config' for more information" |
13792 | msgstr "'git help config' 获取更多信息" | |
4dcdc3d8 | 13793 | |
a6cd2cc4 | 13794 | #: builtin/index-pack.c:185 |
8ada9598 JX |
13795 | #, c-format |
13796 | msgid "object type mismatch at %s" | |
81809b99 | 13797 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 13798 | |
a6cd2cc4 | 13799 | #: builtin/index-pack.c:205 |
6acbf033 JX |
13800 | #, c-format |
13801 | msgid "did not receive expected object %s" | |
a0b6b246 | 13802 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 13803 | |
a6cd2cc4 | 13804 | #: builtin/index-pack.c:208 |
6acbf033 JX |
13805 | #, c-format |
13806 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 13807 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 13808 | |
a6cd2cc4 | 13809 | #: builtin/index-pack.c:258 |
81809b99 | 13810 | #, c-format |
8ada9598 JX |
13811 | msgid "cannot fill %d byte" |
13812 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 13813 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 13814 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 13815 | |
a6cd2cc4 | 13816 | #: builtin/index-pack.c:268 |
8ada9598 | 13817 | msgid "early EOF" |
81809b99 | 13818 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 13819 | |
a6cd2cc4 | 13820 | #: builtin/index-pack.c:269 |
8ada9598 | 13821 | msgid "read error on input" |
81809b99 | 13822 | msgstr "输入上的读错误" |
8ada9598 | 13823 | |
a6cd2cc4 | 13824 | #: builtin/index-pack.c:281 |
8ada9598 | 13825 | msgid "used more bytes than were available" |
81809b99 | 13826 | msgstr "用掉了超过可用的字节" |
8ada9598 | 13827 | |
a6cd2cc4 | 13828 | #: builtin/index-pack.c:288 builtin/pack-objects.c:604 |
8ada9598 | 13829 | msgid "pack too large for current definition of off_t" |
81809b99 | 13830 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 13831 | |
a6cd2cc4 | 13832 | #: builtin/index-pack.c:291 builtin/unpack-objects.c:94 |
a0b6b246 JX |
13833 | msgid "pack exceeds maximum allowed size" |
13834 | msgstr "包超过了最大允许值" | |
13835 | ||
a6cd2cc4 | 13836 | #: builtin/index-pack.c:312 |
81809b99 | 13837 | #, c-format |
8ada9598 | 13838 | msgid "cannot open packfile '%s'" |
81809b99 | 13839 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 13840 | |
a6cd2cc4 | 13841 | #: builtin/index-pack.c:326 |
8ada9598 | 13842 | msgid "pack signature mismatch" |
81809b99 | 13843 | msgstr "包签名不匹配" |
8ada9598 | 13844 | |
a6cd2cc4 | 13845 | #: builtin/index-pack.c:328 |
ef317cd5 JX |
13846 | #, c-format |
13847 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 13848 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 13849 | |
a6cd2cc4 | 13850 | #: builtin/index-pack.c:346 |
8ada9598 | 13851 | #, c-format |
5c57d762 JX |
13852 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
13853 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 13854 | |
a6cd2cc4 | 13855 | #: builtin/index-pack.c:466 |
8ada9598 JX |
13856 | #, c-format |
13857 | msgid "inflate returned %d" | |
81809b99 | 13858 | msgstr "解压缩返回 %d" |
8ada9598 | 13859 | |
a6cd2cc4 | 13860 | #: builtin/index-pack.c:515 |
8ada9598 | 13861 | msgid "offset value overflow for delta base object" |
81809b99 | 13862 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 13863 | |
a6cd2cc4 | 13864 | #: builtin/index-pack.c:523 |
8ada9598 | 13865 | msgid "delta base offset is out of bound" |
81809b99 | 13866 | msgstr "delta 基准偏移越界" |
8ada9598 | 13867 | |
a6cd2cc4 | 13868 | #: builtin/index-pack.c:531 |
81809b99 | 13869 | #, c-format |
8ada9598 | 13870 | msgid "unknown object type %d" |
81809b99 | 13871 | msgstr "未知对象类型 %d" |
8ada9598 | 13872 | |
a6cd2cc4 | 13873 | #: builtin/index-pack.c:562 |
8ada9598 | 13874 | msgid "cannot pread pack file" |
81809b99 | 13875 | msgstr "无法读取包文件" |
8ada9598 | 13876 | |
a6cd2cc4 | 13877 | #: builtin/index-pack.c:564 |
8ada9598 | 13878 | #, c-format |
5c57d762 JX |
13879 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
13880 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
13881 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
13882 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 13883 | |
a6cd2cc4 | 13884 | #: builtin/index-pack.c:590 |
8ada9598 | 13885 | msgid "serious inflate inconsistency" |
81809b99 | 13886 | msgstr "解压缩严重的不一致" |
8ada9598 | 13887 | |
a6cd2cc4 JX |
13888 | #: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 |
13889 | #: builtin/index-pack.c:803 builtin/index-pack.c:812 | |
8ada9598 JX |
13890 | #, c-format |
13891 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 13892 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 13893 | |
a6cd2cc4 JX |
13894 | #: builtin/index-pack.c:738 builtin/pack-objects.c:157 |
13895 | #: builtin/pack-objects.c:217 builtin/pack-objects.c:311 | |
6792b93b JX |
13896 | #, c-format |
13897 | msgid "unable to read %s" | |
13898 | msgstr "不能读 %s" | |
13899 | ||
a6cd2cc4 | 13900 | #: builtin/index-pack.c:801 |
87cb7997 JX |
13901 | #, c-format |
13902 | msgid "cannot read existing object info %s" | |
13903 | msgstr "不能读取现存对象信息 %s" | |
13904 | ||
a6cd2cc4 | 13905 | #: builtin/index-pack.c:809 |
6792b93b JX |
13906 | #, c-format |
13907 | msgid "cannot read existing object %s" | |
13908 | msgstr "不能读取现存对象 %s" | |
13909 | ||
a6cd2cc4 | 13910 | #: builtin/index-pack.c:823 |
81809b99 | 13911 | #, c-format |
8ada9598 | 13912 | msgid "invalid blob object %s" |
160fb2b2 | 13913 | msgstr "无效的数据对象 %s" |
8ada9598 | 13914 | |
a6cd2cc4 | 13915 | #: builtin/index-pack.c:826 builtin/index-pack.c:845 |
fd8cb379 JX |
13916 | msgid "fsck error in packed object" |
13917 | msgstr "对打包对象 fsck 检查出错" | |
13918 | ||
a6cd2cc4 | 13919 | #: builtin/index-pack.c:847 |
8ada9598 JX |
13920 | #, c-format |
13921 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 13922 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 13923 | |
a6cd2cc4 | 13924 | #: builtin/index-pack.c:919 builtin/index-pack.c:950 |
8ada9598 | 13925 | msgid "failed to apply delta" |
c1ac5258 | 13926 | msgstr "应用 delta 失败" |
8ada9598 | 13927 | |
a6cd2cc4 | 13928 | #: builtin/index-pack.c:1118 |
8ada9598 | 13929 | msgid "Receiving objects" |
81809b99 | 13930 | msgstr "接收对象中" |
8ada9598 | 13931 | |
a6cd2cc4 | 13932 | #: builtin/index-pack.c:1118 |
8ada9598 | 13933 | msgid "Indexing objects" |
81809b99 | 13934 | msgstr "索引对象中" |
8ada9598 | 13935 | |
a6cd2cc4 | 13936 | #: builtin/index-pack.c:1152 |
8ada9598 | 13937 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 13938 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 13939 | |
a6cd2cc4 | 13940 | #: builtin/index-pack.c:1157 |
8ada9598 | 13941 | msgid "cannot fstat packfile" |
65e2041e | 13942 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 13943 | |
a6cd2cc4 | 13944 | #: builtin/index-pack.c:1160 |
8ada9598 | 13945 | msgid "pack has junk at the end" |
81809b99 | 13946 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 13947 | |
a6cd2cc4 | 13948 | #: builtin/index-pack.c:1172 |
6792b93b JX |
13949 | msgid "confusion beyond insanity in parse_pack_objects()" |
13950 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
13951 | ||
a6cd2cc4 | 13952 | #: builtin/index-pack.c:1195 |
8ada9598 | 13953 | msgid "Resolving deltas" |
81809b99 | 13954 | msgstr "处理 delta 中" |
8ada9598 | 13955 | |
a5cd71ca | 13956 | #: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 |
07432cef | 13957 | #, c-format |
ef317cd5 | 13958 | msgid "unable to create thread: %s" |
07432cef | 13959 | msgstr "不能创建线程:%s" |
ef317cd5 | 13960 | |
a6cd2cc4 | 13961 | #: builtin/index-pack.c:1246 |
8ada9598 | 13962 | msgid "confusion beyond insanity" |
81809b99 | 13963 | msgstr "不可理喻" |
8ada9598 | 13964 | |
a6cd2cc4 | 13965 | #: builtin/index-pack.c:1252 |
ef317cd5 | 13966 | #, c-format |
5b04ee3b JX |
13967 | msgid "completed with %d local object" |
13968 | msgid_plural "completed with %d local objects" | |
13969 | msgstr[0] "完成 %d 个本地对象" | |
13970 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 13971 | |
a6cd2cc4 | 13972 | #: builtin/index-pack.c:1264 |
ef317cd5 JX |
13973 | #, c-format |
13974 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 13975 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 13976 | |
a6cd2cc4 | 13977 | #: builtin/index-pack.c:1268 |
8ada9598 JX |
13978 | #, c-format |
13979 | msgid "pack has %d unresolved delta" | |
13980 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 13981 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 13982 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 13983 | |
a6cd2cc4 | 13984 | #: builtin/index-pack.c:1292 |
81809b99 | 13985 | #, c-format |
8ada9598 | 13986 | msgid "unable to deflate appended object (%d)" |
07432cef | 13987 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 13988 | |
a6cd2cc4 | 13989 | #: builtin/index-pack.c:1388 |
8ada9598 JX |
13990 | #, c-format |
13991 | msgid "local object %s is corrupt" | |
81809b99 | 13992 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 13993 | |
a6cd2cc4 | 13994 | #: builtin/index-pack.c:1402 |
31e5e17b JX |
13995 | #, c-format |
13996 | msgid "packfile name '%s' does not end with '.pack'" | |
13997 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 13998 | |
a6cd2cc4 | 13999 | #: builtin/index-pack.c:1427 |
81809b99 | 14000 | #, c-format |
31e5e17b JX |
14001 | msgid "cannot write %s file '%s'" |
14002 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 14003 | |
a6cd2cc4 | 14004 | #: builtin/index-pack.c:1435 |
81809b99 | 14005 | #, c-format |
31e5e17b JX |
14006 | msgid "cannot close written %s file '%s'" |
14007 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
14008 | ||
a6cd2cc4 | 14009 | #: builtin/index-pack.c:1459 |
31e5e17b JX |
14010 | msgid "error while closing pack file" |
14011 | msgstr "关闭包文件时出错" | |
8ada9598 | 14012 | |
a6cd2cc4 | 14013 | #: builtin/index-pack.c:1473 |
8ada9598 | 14014 | msgid "cannot store pack file" |
81809b99 | 14015 | msgstr "无法存储包文件" |
8ada9598 | 14016 | |
a6cd2cc4 | 14017 | #: builtin/index-pack.c:1481 |
8ada9598 | 14018 | msgid "cannot store index file" |
81809b99 | 14019 | msgstr "无法存储索引文件" |
8ada9598 | 14020 | |
a5cd71ca | 14021 | #: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 |
07432cef | 14022 | #, c-format |
ef317cd5 | 14023 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 14024 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 14025 | |
a6cd2cc4 | 14026 | #: builtin/index-pack.c:1593 |
81809b99 | 14027 | #, c-format |
8ada9598 | 14028 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 14029 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 14030 | |
a6cd2cc4 | 14031 | #: builtin/index-pack.c:1595 |
81809b99 | 14032 | #, c-format |
8ada9598 | 14033 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 14034 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 14035 | |
a6cd2cc4 | 14036 | #: builtin/index-pack.c:1643 |
81809b99 | 14037 | #, c-format |
8ada9598 JX |
14038 | msgid "non delta: %d object" |
14039 | msgid_plural "non delta: %d objects" | |
81809b99 | 14040 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 14041 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 14042 | |
a6cd2cc4 | 14043 | #: builtin/index-pack.c:1650 |
8ada9598 JX |
14044 | #, c-format |
14045 | msgid "chain length = %d: %lu object" | |
14046 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 14047 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 14048 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 14049 | |
a6cd2cc4 | 14050 | #: builtin/index-pack.c:1689 |
31e5e17b JX |
14051 | msgid "Cannot come back to cwd" |
14052 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 14053 | |
a6cd2cc4 JX |
14054 | #: builtin/index-pack.c:1738 builtin/index-pack.c:1741 |
14055 | #: builtin/index-pack.c:1757 builtin/index-pack.c:1761 | |
81809b99 | 14056 | #, c-format |
8ada9598 | 14057 | msgid "bad %s" |
81809b99 | 14058 | msgstr "错误选项 %s" |
8ada9598 | 14059 | |
a6cd2cc4 | 14060 | #: builtin/index-pack.c:1777 |
8ada9598 | 14061 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 14062 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 14063 | |
a6cd2cc4 | 14064 | #: builtin/index-pack.c:1779 |
1a79b2f1 JX |
14065 | msgid "--stdin requires a git repository" |
14066 | msgstr "--stdin 需要一个 git 仓库" | |
14067 | ||
a6cd2cc4 | 14068 | #: builtin/index-pack.c:1785 |
8ada9598 | 14069 | msgid "--verify with no packfile name given" |
dbd6cced | 14070 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 14071 | |
a6cd2cc4 | 14072 | #: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 |
fd8cb379 JX |
14073 | msgid "fsck error in pack objects" |
14074 | msgstr "在打包对象中 fsck 检查出错" | |
14075 | ||
a4f16749 | 14076 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
14077 | #, c-format |
14078 | msgid "cannot stat template '%s'" | |
65e2041e | 14079 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 14080 | |
a4f16749 | 14081 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
14082 | #, c-format |
14083 | msgid "cannot opendir '%s'" | |
14084 | msgstr "不能打开目录 '%s'" | |
14085 | ||
c1ac5258 | 14086 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
14087 | #, c-format |
14088 | msgid "cannot readlink '%s'" | |
14089 | msgstr "不能读取链接 '%s'" | |
14090 | ||
c1ac5258 | 14091 | #: builtin/init-db.c:80 |
c04f5ac3 JX |
14092 | #, c-format |
14093 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 14094 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 14095 | |
c1ac5258 | 14096 | #: builtin/init-db.c:86 |
c04f5ac3 JX |
14097 | #, c-format |
14098 | msgid "cannot copy '%s' to '%s'" | |
14099 | msgstr "不能拷贝 '%s' 至 '%s'" | |
14100 | ||
c1ac5258 | 14101 | #: builtin/init-db.c:90 |
c04f5ac3 JX |
14102 | #, c-format |
14103 | msgid "ignoring template %s" | |
14104 | msgstr "忽略模版 %s" | |
14105 | ||
c1ac5258 | 14106 | #: builtin/init-db.c:121 |
c04f5ac3 | 14107 | #, c-format |
fd8cb379 JX |
14108 | msgid "templates not found in %s" |
14109 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 14110 | |
c1ac5258 | 14111 | #: builtin/init-db.c:136 |
c04f5ac3 | 14112 | #, c-format |
5b04ee3b JX |
14113 | msgid "not copying templates from '%s': %s" |
14114 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 14115 | |
d46c5519 | 14116 | #: builtin/init-db.c:334 |
c04f5ac3 JX |
14117 | #, c-format |
14118 | msgid "unable to handle file type %d" | |
14119 | msgstr "不能处理 %d 类型的文件" | |
14120 | ||
d46c5519 | 14121 | #: builtin/init-db.c:337 |
c04f5ac3 JX |
14122 | #, c-format |
14123 | msgid "unable to move %s to %s" | |
14124 | msgstr "不能移动 %s 至 %s" | |
14125 | ||
d46c5519 | 14126 | #: builtin/init-db.c:354 builtin/init-db.c:357 |
a0b6b246 JX |
14127 | #, c-format |
14128 | msgid "%s already exists" | |
14129 | msgstr "%s 已经存在" | |
14130 | ||
d46c5519 | 14131 | #: builtin/init-db.c:413 |
c04f5ac3 | 14132 | #, c-format |
5c57d762 JX |
14133 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
14134 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 14135 | |
d46c5519 | 14136 | #: builtin/init-db.c:414 |
5c57d762 JX |
14137 | #, c-format |
14138 | msgid "Reinitialized existing Git repository in %s%s\n" | |
14139 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 14140 | |
d46c5519 | 14141 | #: builtin/init-db.c:418 |
5c57d762 JX |
14142 | #, c-format |
14143 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 14144 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 14145 | |
d46c5519 | 14146 | #: builtin/init-db.c:419 |
5c57d762 JX |
14147 | #, c-format |
14148 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 14149 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 14150 | |
d46c5519 | 14151 | #: builtin/init-db.c:468 |
ef317cd5 | 14152 | msgid "" |
a77c07d9 | 14153 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 14154 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 14155 | msgstr "" |
07432cef | 14156 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 14157 | "[<目录>]" |
ef317cd5 | 14158 | |
d46c5519 | 14159 | #: builtin/init-db.c:491 |
ef317cd5 | 14160 | msgid "permissions" |
07432cef | 14161 | msgstr "权限" |
ef317cd5 | 14162 | |
d46c5519 | 14163 | #: builtin/init-db.c:492 |
ef317cd5 | 14164 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 14165 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 14166 | |
a6cd2cc4 | 14167 | #: builtin/init-db.c:529 builtin/init-db.c:534 |
c1ac5258 JX |
14168 | #, c-format |
14169 | msgid "cannot mkdir %s" | |
14170 | msgstr "不能创建目录 %s" | |
14171 | ||
a6cd2cc4 | 14172 | #: builtin/init-db.c:538 |
c04f5ac3 JX |
14173 | #, c-format |
14174 | msgid "cannot chdir to %s" | |
14175 | msgstr "不能切换目录到 %s" | |
14176 | ||
a6cd2cc4 | 14177 | #: builtin/init-db.c:559 |
c04f5ac3 JX |
14178 | #, c-format |
14179 | msgid "" | |
14180 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
14181 | "dir=<directory>)" | |
1e607449 | 14182 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 14183 | |
a6cd2cc4 | 14184 | #: builtin/init-db.c:587 |
c04f5ac3 JX |
14185 | #, c-format |
14186 | msgid "Cannot access work tree '%s'" | |
14187 | msgstr "不能访问工作区 '%s'" | |
14188 | ||
a6cd2cc4 | 14189 | #: builtin/interpret-trailers.c:16 |
220c313c | 14190 | msgid "" |
276ceeaa JX |
14191 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
14192 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
14193 | msgstr "" |
14194 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
14195 | ">])...] [<文件>...]" | |
276ceeaa | 14196 | |
a6cd2cc4 | 14197 | #: builtin/interpret-trailers.c:95 |
276ceeaa JX |
14198 | msgid "edit files in place" |
14199 | msgstr "在原位编辑文件" | |
220c313c | 14200 | |
a6cd2cc4 | 14201 | #: builtin/interpret-trailers.c:96 |
220c313c | 14202 | msgid "trim empty trailers" |
6937cb4e JX |
14203 | msgstr "删除空的尾部署名" |
14204 | ||
a6cd2cc4 | 14205 | #: builtin/interpret-trailers.c:99 |
6937cb4e JX |
14206 | msgid "where to place the new trailer" |
14207 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 14208 | |
a6cd2cc4 | 14209 | #: builtin/interpret-trailers.c:101 |
6937cb4e JX |
14210 | msgid "action if trailer already exists" |
14211 | msgstr "当尾部署名已经存在时所采取的动作" | |
14212 | ||
a6cd2cc4 | 14213 | #: builtin/interpret-trailers.c:103 |
6937cb4e JX |
14214 | msgid "action if trailer is missing" |
14215 | msgstr "当尾部署名缺失时所采取的动作" | |
14216 | ||
a6cd2cc4 | 14217 | #: builtin/interpret-trailers.c:105 |
6937cb4e JX |
14218 | msgid "output only the trailers" |
14219 | msgstr "只输出尾部署名" | |
14220 | ||
a6cd2cc4 | 14221 | #: builtin/interpret-trailers.c:106 |
6937cb4e JX |
14222 | msgid "do not apply config rules" |
14223 | msgstr "不要应用配置规则" | |
14224 | ||
a6cd2cc4 | 14225 | #: builtin/interpret-trailers.c:107 |
6937cb4e JX |
14226 | msgid "join whitespace-continued values" |
14227 | msgstr "连接空白折行的值" | |
14228 | ||
a6cd2cc4 | 14229 | #: builtin/interpret-trailers.c:108 |
6937cb4e JX |
14230 | msgid "set parsing options" |
14231 | msgstr "设置解析选项" | |
14232 | ||
a6cd2cc4 | 14233 | #: builtin/interpret-trailers.c:110 |
4c27fcb5 JX |
14234 | msgid "do not treat --- specially" |
14235 | msgstr "不要对 --- 特殊处理" | |
14236 | ||
a6cd2cc4 | 14237 | #: builtin/interpret-trailers.c:111 |
220c313c | 14238 | msgid "trailer" |
6937cb4e | 14239 | msgstr "尾部署名" |
220c313c | 14240 | |
a6cd2cc4 | 14241 | #: builtin/interpret-trailers.c:112 |
220c313c | 14242 | msgid "trailer(s) to add" |
6937cb4e | 14243 | msgstr "要添加的尾部署名" |
220c313c | 14244 | |
a6cd2cc4 | 14245 | #: builtin/interpret-trailers.c:123 |
6937cb4e JX |
14246 | msgid "--trailer with --only-input does not make sense" |
14247 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
14248 | ||
a6cd2cc4 | 14249 | #: builtin/interpret-trailers.c:133 |
276ceeaa JX |
14250 | msgid "no input file given for in-place editing" |
14251 | msgstr "没有给出要原位编辑的文件" | |
14252 | ||
06991777 | 14253 | #: builtin/log.c:55 |
7aea43ff | 14254 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 14255 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 14256 | |
06991777 | 14257 | #: builtin/log.c:56 |
814ff314 JX |
14258 | msgid "git show [<options>] <object>..." |
14259 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 14260 | |
a6cd2cc4 | 14261 | #: builtin/log.c:109 |
220c313c JX |
14262 | #, c-format |
14263 | msgid "invalid --decorate option: %s" | |
14264 | msgstr "无效的 --decorate 选项:%s" | |
14265 | ||
a6cd2cc4 | 14266 | #: builtin/log.c:173 |
ef317cd5 | 14267 | msgid "show source" |
07432cef | 14268 | msgstr "显示源" |
ef317cd5 | 14269 | |
a6cd2cc4 | 14270 | #: builtin/log.c:174 |
07432cef WS |
14271 | msgid "Use mail map file" |
14272 | msgstr "使用邮件映射文件" | |
14273 | ||
a6cd2cc4 | 14274 | #: builtin/log.c:176 |
5809aa05 JX |
14275 | msgid "only decorate refs that match <pattern>" |
14276 | msgstr "只修饰与 <模式> 匹配的引用" | |
14277 | ||
a6cd2cc4 | 14278 | #: builtin/log.c:178 |
5809aa05 JX |
14279 | msgid "do not decorate refs that match <pattern>" |
14280 | msgstr "不修饰和 <模式> 匹配的引用" | |
14281 | ||
a6cd2cc4 | 14282 | #: builtin/log.c:179 |
ef317cd5 | 14283 | msgid "decorate options" |
07432cef | 14284 | msgstr "修饰选项" |
ef317cd5 | 14285 | |
a6cd2cc4 | 14286 | #: builtin/log.c:182 |
220c313c JX |
14287 | msgid "Process line range n,m in file, counting from 1" |
14288 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
14289 | ||
a6cd2cc4 | 14290 | #: builtin/log.c:280 |
c04f5ac3 JX |
14291 | #, c-format |
14292 | msgid "Final output: %d %s\n" | |
14293 | msgstr "最终输出:%d %s\n" | |
14294 | ||
a6cd2cc4 | 14295 | #: builtin/log.c:534 |
220c313c JX |
14296 | #, c-format |
14297 | msgid "git show %s: bad file" | |
14298 | msgstr "git show %s: 损坏的文件" | |
14299 | ||
a5cd71ca | 14300 | #: builtin/log.c:549 builtin/log.c:644 |
c04f5ac3 | 14301 | #, c-format |
d46c5519 | 14302 | msgid "could not read object %s" |
90e6ef53 | 14303 | msgstr "不能读取对象 %s" |
c04f5ac3 | 14304 | |
a5cd71ca | 14305 | #: builtin/log.c:669 |
c04f5ac3 | 14306 | #, c-format |
d46c5519 | 14307 | msgid "unknown type: %d" |
c04f5ac3 JX |
14308 | msgstr "未知类型:%d" |
14309 | ||
a5cd71ca | 14310 | #: builtin/log.c:792 |
c04f5ac3 JX |
14311 | msgid "format.headers without value" |
14312 | msgstr "format.headers 没有值" | |
14313 | ||
a5cd71ca | 14314 | #: builtin/log.c:909 |
c04f5ac3 JX |
14315 | msgid "name of output directory is too long" |
14316 | msgstr "输出目录名太长" | |
14317 | ||
a5cd71ca | 14318 | #: builtin/log.c:925 |
c04f5ac3 | 14319 | #, c-format |
d46c5519 | 14320 | msgid "cannot open patch file %s" |
c04f5ac3 JX |
14321 | msgstr "无法打开补丁文件 %s" |
14322 | ||
a5cd71ca | 14323 | #: builtin/log.c:942 |
d46c5519 JX |
14324 | msgid "need exactly one range" |
14325 | msgstr "只需要一个范围" | |
c04f5ac3 | 14326 | |
a5cd71ca | 14327 | #: builtin/log.c:952 |
d46c5519 JX |
14328 | msgid "not a range" |
14329 | msgstr "不是一个范围" | |
c04f5ac3 | 14330 | |
a5cd71ca | 14331 | #: builtin/log.c:1075 |
d46c5519 JX |
14332 | msgid "cover letter needs email format" |
14333 | msgstr "附函需要邮件地址格式" | |
c04f5ac3 | 14334 | |
a5cd71ca | 14335 | #: builtin/log.c:1081 |
d46c5519 JX |
14336 | msgid "failed to create cover-letter file" |
14337 | msgstr "无法创建附函文件" | |
14338 | ||
a5cd71ca | 14339 | #: builtin/log.c:1160 |
c04f5ac3 JX |
14340 | #, c-format |
14341 | msgid "insane in-reply-to: %s" | |
14342 | msgstr "不正常的 in-reply-to:%s" | |
14343 | ||
a5cd71ca | 14344 | #: builtin/log.c:1187 |
814ff314 JX |
14345 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
14346 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 14347 | |
a5cd71ca | 14348 | #: builtin/log.c:1245 |
d46c5519 | 14349 | msgid "two output directories?" |
c04f5ac3 JX |
14350 | msgstr "两个输出目录?" |
14351 | ||
a5cd71ca | 14352 | #: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 |
5b04ee3b | 14353 | #, c-format |
d46c5519 | 14354 | msgid "unknown commit %s" |
5b04ee3b JX |
14355 | msgstr "未知提交 %s" |
14356 | ||
a5cd71ca | 14357 | #: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 |
d46c5519 | 14358 | #: builtin/replace.c:210 |
5b04ee3b | 14359 | #, c-format |
d46c5519 JX |
14360 | msgid "failed to resolve '%s' as a valid ref" |
14361 | msgstr "无法将 '%s' 解析为一个有效引用" | |
5b04ee3b | 14362 | |
a5cd71ca | 14363 | #: builtin/log.c:1371 |
d46c5519 JX |
14364 | msgid "could not find exact merge base" |
14365 | msgstr "不能找到准确的合并基线" | |
5b04ee3b | 14366 | |
a5cd71ca | 14367 | #: builtin/log.c:1375 |
5b04ee3b | 14368 | msgid "" |
d46c5519 | 14369 | "failed to get upstream, if you want to record base commit automatically,\n" |
5b04ee3b | 14370 | "please use git branch --set-upstream-to to track a remote branch.\n" |
d46c5519 | 14371 | "Or you could specify base commit by --base=<base-commit-id> manually" |
5b04ee3b JX |
14372 | msgstr "" |
14373 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 14374 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
d46c5519 | 14375 | "参数 --base=<基线提交> 手动指定一个基线提交" |
5b04ee3b | 14376 | |
a5cd71ca | 14377 | #: builtin/log.c:1395 |
d46c5519 | 14378 | msgid "failed to find exact merge base" |
5b04ee3b JX |
14379 | msgstr "无法找到准确的合并基线" |
14380 | ||
a5cd71ca | 14381 | #: builtin/log.c:1406 |
5b04ee3b JX |
14382 | msgid "base commit should be the ancestor of revision list" |
14383 | msgstr "基线提交应该是版本列表的祖先" | |
14384 | ||
a5cd71ca | 14385 | #: builtin/log.c:1410 |
5b04ee3b JX |
14386 | msgid "base commit shouldn't be in revision list" |
14387 | msgstr "基线提交不应该出现在版本列表中" | |
14388 | ||
a5cd71ca | 14389 | #: builtin/log.c:1463 |
5b04ee3b | 14390 | msgid "cannot get patch id" |
aef18cc6 | 14391 | msgstr "无法得到补丁 id" |
5b04ee3b | 14392 | |
a5cd71ca | 14393 | #: builtin/log.c:1515 |
4c27fcb5 JX |
14394 | msgid "failed to infer range-diff ranges" |
14395 | msgstr "无法推断 range-diff 范围" | |
14396 | ||
a5cd71ca | 14397 | #: builtin/log.c:1560 |
ef317cd5 | 14398 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 14399 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 14400 | |
a5cd71ca | 14401 | #: builtin/log.c:1563 |
ef317cd5 | 14402 | msgid "use [PATCH] even with multiple patches" |
07432cef | 14403 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 14404 | |
a5cd71ca | 14405 | #: builtin/log.c:1567 |
ef317cd5 | 14406 | msgid "print patches to standard out" |
07432cef | 14407 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 14408 | |
a5cd71ca | 14409 | #: builtin/log.c:1569 |
ef317cd5 | 14410 | msgid "generate a cover letter" |
d46c5519 | 14411 | msgstr "生成一封附函" |
c04f5ac3 | 14412 | |
a5cd71ca | 14413 | #: builtin/log.c:1571 |
ef317cd5 | 14414 | msgid "use simple number sequence for output file names" |
07432cef | 14415 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 14416 | |
a5cd71ca | 14417 | #: builtin/log.c:1572 |
ef317cd5 | 14418 | msgid "sfx" |
07432cef | 14419 | msgstr "后缀" |
ef317cd5 | 14420 | |
a5cd71ca | 14421 | #: builtin/log.c:1573 |
ef317cd5 | 14422 | msgid "use <sfx> instead of '.patch'" |
07432cef | 14423 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 14424 | |
a5cd71ca | 14425 | #: builtin/log.c:1575 |
ef317cd5 | 14426 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
14427 | msgstr "补丁以 <n> 开始编号,而不是1" |
14428 | ||
a5cd71ca | 14429 | #: builtin/log.c:1577 |
07432cef WS |
14430 | msgid "mark the series as Nth re-roll" |
14431 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 14432 | |
a5cd71ca | 14433 | #: builtin/log.c:1579 |
a0b6b246 JX |
14434 | msgid "Use [RFC PATCH] instead of [PATCH]" |
14435 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
14436 | ||
a5cd71ca | 14437 | #: builtin/log.c:1582 |
ef317cd5 | 14438 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 14439 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 14440 | |
a5cd71ca | 14441 | #: builtin/log.c:1585 |
ef317cd5 | 14442 | msgid "store resulting files in <dir>" |
d9d56b23 | 14443 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 14444 | |
a5cd71ca | 14445 | #: builtin/log.c:1588 |
ef317cd5 | 14446 | msgid "don't strip/add [PATCH]" |
07432cef | 14447 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 14448 | |
a5cd71ca | 14449 | #: builtin/log.c:1591 |
ef317cd5 | 14450 | msgid "don't output binary diffs" |
07432cef | 14451 | msgstr "不输出二进制差异" |
ef317cd5 | 14452 | |
a5cd71ca | 14453 | #: builtin/log.c:1593 |
89f80d72 JX |
14454 | msgid "output all-zero hash in From header" |
14455 | msgstr "在 From 头信息中输出全为零的哈希值" | |
14456 | ||
a5cd71ca | 14457 | #: builtin/log.c:1595 |
ef317cd5 | 14458 | msgid "don't include a patch matching a commit upstream" |
07432cef | 14459 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 14460 | |
a5cd71ca | 14461 | #: builtin/log.c:1597 |
ef317cd5 | 14462 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 14463 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 14464 | |
a5cd71ca | 14465 | #: builtin/log.c:1599 |
ef317cd5 | 14466 | msgid "Messaging" |
07432cef | 14467 | msgstr "邮件发送" |
ef317cd5 | 14468 | |
a5cd71ca | 14469 | #: builtin/log.c:1600 |
ef317cd5 | 14470 | msgid "header" |
07432cef | 14471 | msgstr "header" |
ef317cd5 | 14472 | |
a5cd71ca | 14473 | #: builtin/log.c:1601 |
ef317cd5 | 14474 | msgid "add email header" |
07432cef | 14475 | msgstr "添加邮件头" |
ef317cd5 | 14476 | |
a5cd71ca | 14477 | #: builtin/log.c:1602 builtin/log.c:1604 |
ef317cd5 | 14478 | msgid "email" |
07432cef | 14479 | msgstr "邮件地址" |
ef317cd5 | 14480 | |
a5cd71ca | 14481 | #: builtin/log.c:1602 |
ef317cd5 | 14482 | msgid "add To: header" |
07432cef | 14483 | msgstr "添加收件人" |
ef317cd5 | 14484 | |
a5cd71ca | 14485 | #: builtin/log.c:1604 |
ef317cd5 | 14486 | msgid "add Cc: header" |
07432cef | 14487 | msgstr "添加抄送" |
ef317cd5 | 14488 | |
a5cd71ca | 14489 | #: builtin/log.c:1606 |
2e8451e8 | 14490 | msgid "ident" |
d9d56b23 | 14491 | msgstr "标识" |
2e8451e8 | 14492 | |
a5cd71ca | 14493 | #: builtin/log.c:1607 |
2e8451e8 | 14494 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 14495 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 14496 | |
a5cd71ca | 14497 | #: builtin/log.c:1609 |
ef317cd5 | 14498 | msgid "message-id" |
d9d56b23 | 14499 | msgstr "邮件标识" |
ef317cd5 | 14500 | |
a5cd71ca | 14501 | #: builtin/log.c:1610 |
ef317cd5 | 14502 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 14503 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 14504 | |
a5cd71ca | 14505 | #: builtin/log.c:1611 builtin/log.c:1614 |
ef317cd5 | 14506 | msgid "boundary" |
07432cef | 14507 | msgstr "边界" |
ef317cd5 | 14508 | |
a5cd71ca | 14509 | #: builtin/log.c:1612 |
ef317cd5 | 14510 | msgid "attach the patch" |
07432cef | 14511 | msgstr "附件方式添加补丁" |
ef317cd5 | 14512 | |
a5cd71ca | 14513 | #: builtin/log.c:1615 |
ef317cd5 | 14514 | msgid "inline the patch" |
07432cef | 14515 | msgstr "内联显示补丁" |
ef317cd5 | 14516 | |
a5cd71ca | 14517 | #: builtin/log.c:1619 |
ef317cd5 | 14518 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 14519 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 14520 | |
a5cd71ca | 14521 | #: builtin/log.c:1621 |
ef317cd5 | 14522 | msgid "signature" |
07432cef | 14523 | msgstr "签名" |
ef317cd5 | 14524 | |
a5cd71ca | 14525 | #: builtin/log.c:1622 |
ef317cd5 | 14526 | msgid "add a signature" |
07432cef | 14527 | msgstr "添加一个签名" |
ef317cd5 | 14528 | |
a5cd71ca | 14529 | #: builtin/log.c:1623 |
5b04ee3b JX |
14530 | msgid "base-commit" |
14531 | msgstr "基线提交" | |
14532 | ||
a5cd71ca | 14533 | #: builtin/log.c:1624 |
5b04ee3b JX |
14534 | msgid "add prerequisite tree info to the patch series" |
14535 | msgstr "为补丁列表添加前置树信息" | |
14536 | ||
a5cd71ca | 14537 | #: builtin/log.c:1626 |
6acbf033 JX |
14538 | msgid "add a signature from a file" |
14539 | msgstr "从文件添加一个签名" | |
14540 | ||
a5cd71ca | 14541 | #: builtin/log.c:1627 |
ef317cd5 | 14542 | msgid "don't print the patch filenames" |
07432cef | 14543 | msgstr "不要打印补丁文件名" |
ef317cd5 | 14544 | |
a5cd71ca | 14545 | #: builtin/log.c:1629 |
6937cb4e JX |
14546 | msgid "show progress while generating patches" |
14547 | msgstr "在生成补丁时显示进度" | |
14548 | ||
a5cd71ca | 14549 | #: builtin/log.c:1631 |
4c27fcb5 JX |
14550 | msgid "show changes against <rev> in cover letter or single patch" |
14551 | msgstr "在附函或单个补丁中显示和 <rev> 的差异" | |
14552 | ||
a5cd71ca | 14553 | #: builtin/log.c:1634 |
4c27fcb5 JX |
14554 | msgid "show changes against <refspec> in cover letter or single patch" |
14555 | msgstr "在附函或单个补丁中显示和 <refspec> 的差异" | |
14556 | ||
a5cd71ca | 14557 | #: builtin/log.c:1636 |
4c27fcb5 JX |
14558 | msgid "percentage by which creation is weighted" |
14559 | msgstr "创建权重的百分比" | |
14560 | ||
a5cd71ca | 14561 | #: builtin/log.c:1711 |
a4f16749 JX |
14562 | #, c-format |
14563 | msgid "invalid ident line: %s" | |
14564 | msgstr "包含无效的身份标识:%s" | |
14565 | ||
a5cd71ca | 14566 | #: builtin/log.c:1726 |
c1ac5258 JX |
14567 | msgid "-n and -k are mutually exclusive" |
14568 | msgstr "-n 和 -k 互斥" | |
c04f5ac3 | 14569 | |
a5cd71ca | 14570 | #: builtin/log.c:1728 |
c1ac5258 JX |
14571 | msgid "--subject-prefix/--rfc and -k are mutually exclusive" |
14572 | msgstr "--subject-prefix/--rfc 和 -k 互斥" | |
c04f5ac3 | 14573 | |
a5cd71ca | 14574 | #: builtin/log.c:1736 |
c04f5ac3 JX |
14575 | msgid "--name-only does not make sense" |
14576 | msgstr "--name-only 无意义" | |
14577 | ||
a5cd71ca | 14578 | #: builtin/log.c:1738 |
c04f5ac3 JX |
14579 | msgid "--name-status does not make sense" |
14580 | msgstr "--name-status 无意义" | |
14581 | ||
a5cd71ca | 14582 | #: builtin/log.c:1740 |
c04f5ac3 JX |
14583 | msgid "--check does not make sense" |
14584 | msgstr "--check 无意义" | |
14585 | ||
a5cd71ca | 14586 | #: builtin/log.c:1773 |
c04f5ac3 JX |
14587 | msgid "standard output, or directory, which one?" |
14588 | msgstr "标准输出或目录,哪一个?" | |
14589 | ||
a5cd71ca | 14590 | #: builtin/log.c:1877 |
4c27fcb5 JX |
14591 | msgid "--interdiff requires --cover-letter or single patch" |
14592 | msgstr "--interdiff 需要 --cover-letter 或单一补丁" | |
14593 | ||
a5cd71ca | 14594 | #: builtin/log.c:1881 |
4c27fcb5 JX |
14595 | msgid "Interdiff:" |
14596 | msgstr "版本间差异:" | |
14597 | ||
a5cd71ca | 14598 | #: builtin/log.c:1882 |
4c27fcb5 JX |
14599 | #, c-format |
14600 | msgid "Interdiff against v%d:" | |
14601 | msgstr "对 v%d 的版本差异:" | |
14602 | ||
a5cd71ca | 14603 | #: builtin/log.c:1888 |
4c27fcb5 JX |
14604 | msgid "--creation-factor requires --range-diff" |
14605 | msgstr "--creation-factor 需要 --range-diff" | |
14606 | ||
a5cd71ca | 14607 | #: builtin/log.c:1892 |
4c27fcb5 JX |
14608 | msgid "--range-diff requires --cover-letter or single patch" |
14609 | msgstr "--range-diff 需要 --cover-letter 或单一补丁" | |
14610 | ||
a5cd71ca | 14611 | #: builtin/log.c:1900 |
4c27fcb5 JX |
14612 | msgid "Range-diff:" |
14613 | msgstr "范围差异:" | |
14614 | ||
a5cd71ca | 14615 | #: builtin/log.c:1901 |
4c27fcb5 JX |
14616 | #, c-format |
14617 | msgid "Range-diff against v%d:" | |
14618 | msgstr "对 v%d 的范围差异:" | |
14619 | ||
a5cd71ca | 14620 | #: builtin/log.c:1912 |
6acbf033 JX |
14621 | #, c-format |
14622 | msgid "unable to read signature file '%s'" | |
14623 | msgstr "无法读取签名文件 '%s'" | |
14624 | ||
a5cd71ca | 14625 | #: builtin/log.c:1948 |
6937cb4e JX |
14626 | msgid "Generating patches" |
14627 | msgstr "生成补丁" | |
14628 | ||
a5cd71ca | 14629 | #: builtin/log.c:1992 |
d46c5519 | 14630 | msgid "failed to create output files" |
c04f5ac3 JX |
14631 | msgstr "无法创建输出文件" |
14632 | ||
a5cd71ca | 14633 | #: builtin/log.c:2051 |
ef317cd5 | 14634 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 14635 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 14636 | |
a5cd71ca | 14637 | #: builtin/log.c:2105 |
c04f5ac3 JX |
14638 | #, c-format |
14639 | msgid "" | |
14640 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 14641 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 14642 | |
06991777 | 14643 | #: builtin/ls-files.c:470 |
814ff314 JX |
14644 | msgid "git ls-files [<options>] [<file>...]" |
14645 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 14646 | |
06991777 | 14647 | #: builtin/ls-files.c:526 |
ef317cd5 | 14648 | msgid "identify the file status with tags" |
07432cef | 14649 | msgstr "用标签标识文件的状态" |
ef317cd5 | 14650 | |
06991777 | 14651 | #: builtin/ls-files.c:528 |
ef317cd5 | 14652 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 14653 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 14654 | |
06991777 | 14655 | #: builtin/ls-files.c:530 |
5809aa05 JX |
14656 | msgid "use lowercase letters for 'fsmonitor clean' files" |
14657 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
14658 | ||
06991777 | 14659 | #: builtin/ls-files.c:532 |
ef317cd5 | 14660 | msgid "show cached files in the output (default)" |
07432cef | 14661 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 14662 | |
06991777 | 14663 | #: builtin/ls-files.c:534 |
ef317cd5 | 14664 | msgid "show deleted files in the output" |
07432cef | 14665 | msgstr "显示已删除的文件" |
ef317cd5 | 14666 | |
06991777 | 14667 | #: builtin/ls-files.c:536 |
ef317cd5 | 14668 | msgid "show modified files in the output" |
07432cef | 14669 | msgstr "显示已修改的文件" |
ef317cd5 | 14670 | |
06991777 | 14671 | #: builtin/ls-files.c:538 |
ef317cd5 | 14672 | msgid "show other files in the output" |
07432cef | 14673 | msgstr "显示其它文件" |
ef317cd5 | 14674 | |
06991777 | 14675 | #: builtin/ls-files.c:540 |
ef317cd5 | 14676 | msgid "show ignored files in the output" |
07432cef | 14677 | msgstr "显示忽略的文件" |
ef317cd5 | 14678 | |
06991777 | 14679 | #: builtin/ls-files.c:543 |
ef317cd5 | 14680 | msgid "show staged contents' object name in the output" |
07432cef | 14681 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 14682 | |
06991777 | 14683 | #: builtin/ls-files.c:545 |
ef317cd5 | 14684 | msgid "show files on the filesystem that need to be removed" |
07432cef | 14685 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 14686 | |
06991777 | 14687 | #: builtin/ls-files.c:547 |
220c313c | 14688 | msgid "show 'other' directories' names only" |
07432cef | 14689 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 14690 | |
06991777 | 14691 | #: builtin/ls-files.c:549 |
276ceeaa JX |
14692 | msgid "show line endings of files" |
14693 | msgstr "显示文件换行符格式" | |
14694 | ||
06991777 | 14695 | #: builtin/ls-files.c:551 |
ef317cd5 | 14696 | msgid "don't show empty directories" |
07432cef | 14697 | msgstr "不显示空目录" |
ef317cd5 | 14698 | |
06991777 | 14699 | #: builtin/ls-files.c:554 |
ef317cd5 | 14700 | msgid "show unmerged files in the output" |
07432cef | 14701 | msgstr "显示未合并的文件" |
ef317cd5 | 14702 | |
06991777 | 14703 | #: builtin/ls-files.c:556 |
ef317cd5 | 14704 | msgid "show resolve-undo information" |
07432cef | 14705 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 14706 | |
06991777 | 14707 | #: builtin/ls-files.c:558 |
ef317cd5 | 14708 | msgid "skip files matching pattern" |
07432cef | 14709 | msgstr "匹配排除文件的模式" |
ef317cd5 | 14710 | |
06991777 | 14711 | #: builtin/ls-files.c:561 |
ef317cd5 | 14712 | msgid "exclude patterns are read from <file>" |
07432cef | 14713 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 14714 | |
06991777 | 14715 | #: builtin/ls-files.c:564 |
ef317cd5 | 14716 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 14717 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 14718 | |
06991777 | 14719 | #: builtin/ls-files.c:566 |
ef317cd5 | 14720 | msgid "add the standard git exclusions" |
07432cef | 14721 | msgstr "添加标准的 git 排除" |
ef317cd5 | 14722 | |
06991777 | 14723 | #: builtin/ls-files.c:570 |
ef317cd5 | 14724 | msgid "make the output relative to the project top directory" |
07432cef | 14725 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 14726 | |
06991777 | 14727 | #: builtin/ls-files.c:573 |
a0b6b246 JX |
14728 | msgid "recurse through submodules" |
14729 | msgstr "在子模组中递归" | |
14730 | ||
06991777 | 14731 | #: builtin/ls-files.c:575 |
ef317cd5 | 14732 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 14733 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 14734 | |
06991777 | 14735 | #: builtin/ls-files.c:576 |
ef317cd5 | 14736 | msgid "tree-ish" |
07432cef | 14737 | msgstr "树或提交" |
ef317cd5 | 14738 | |
06991777 | 14739 | #: builtin/ls-files.c:577 |
ef317cd5 | 14740 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 14741 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 14742 | |
06991777 | 14743 | #: builtin/ls-files.c:579 |
ef317cd5 | 14744 | msgid "show debugging data" |
07432cef | 14745 | msgstr "显示调试数据" |
ef317cd5 | 14746 | |
fd8cb379 | 14747 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
14748 | msgid "" |
14749 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
14750 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
14751 | " [--symref] [<repository> [<refs>...]]" | |
14752 | msgstr "" | |
14753 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
14754 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
14755 | " [--symref] [<仓库> [<引用>...]]" | |
14756 | ||
fd8cb379 | 14757 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
14758 | msgid "do not print remote URL" |
14759 | msgstr "不打印远程 URL" | |
14760 | ||
a5cd71ca | 14761 | #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 |
276ceeaa JX |
14762 | msgid "exec" |
14763 | msgstr "exec" | |
14764 | ||
fd8cb379 | 14765 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 |
276ceeaa JX |
14766 | msgid "path of git-upload-pack on the remote host" |
14767 | msgstr "远程主机上的 git-upload-pack 路径" | |
14768 | ||
fd8cb379 | 14769 | #: builtin/ls-remote.c:65 |
276ceeaa JX |
14770 | msgid "limit to tags" |
14771 | msgstr "仅限于标签" | |
14772 | ||
fd8cb379 | 14773 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
14774 | msgid "limit to heads" |
14775 | msgstr "仅限于分支" | |
14776 | ||
fd8cb379 | 14777 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
14778 | msgid "do not show peeled tags" |
14779 | msgstr "不显示已解析的标签" | |
14780 | ||
fd8cb379 | 14781 | #: builtin/ls-remote.c:69 |
276ceeaa JX |
14782 | msgid "take url.<base>.insteadOf into account" |
14783 | msgstr "参考 url.<base>.insteadOf 设置" | |
14784 | ||
d46c5519 | 14785 | #: builtin/ls-remote.c:72 |
276ceeaa JX |
14786 | msgid "exit with exit code 2 if no matching refs are found" |
14787 | msgstr "若未找到匹配的引用则以退出码2退出" | |
14788 | ||
d46c5519 | 14789 | #: builtin/ls-remote.c:75 |
276ceeaa JX |
14790 | msgid "show underlying ref in addition to the object pointed by it" |
14791 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
14792 | ||
c1ac5258 | 14793 | #: builtin/ls-tree.c:30 |
ef317cd5 | 14794 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 14795 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 14796 | |
c1ac5258 | 14797 | #: builtin/ls-tree.c:128 |
ef317cd5 | 14798 | msgid "only show trees" |
07432cef | 14799 | msgstr "只显示树" |
ef317cd5 | 14800 | |
c1ac5258 | 14801 | #: builtin/ls-tree.c:130 |
ef317cd5 | 14802 | msgid "recurse into subtrees" |
07432cef | 14803 | msgstr "递归到子树" |
ef317cd5 | 14804 | |
c1ac5258 | 14805 | #: builtin/ls-tree.c:132 |
ef317cd5 | 14806 | msgid "show trees when recursing" |
07432cef | 14807 | msgstr "当递归时显示树" |
ef317cd5 | 14808 | |
c1ac5258 | 14809 | #: builtin/ls-tree.c:135 |
ef317cd5 | 14810 | msgid "terminate entries with NUL byte" |
4375c10e | 14811 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 14812 | |
c1ac5258 | 14813 | #: builtin/ls-tree.c:136 |
ef317cd5 | 14814 | msgid "include object size" |
07432cef | 14815 | msgstr "包括对象大小" |
ef317cd5 | 14816 | |
c1ac5258 | 14817 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 14818 | msgid "list only filenames" |
07432cef | 14819 | msgstr "只列出文件名" |
ef317cd5 | 14820 | |
c1ac5258 | 14821 | #: builtin/ls-tree.c:143 |
ef317cd5 | 14822 | msgid "use full path names" |
07432cef | 14823 | msgstr "使用文件的全路径" |
ef317cd5 | 14824 | |
c1ac5258 | 14825 | #: builtin/ls-tree.c:145 |
ef317cd5 | 14826 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 14827 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 14828 | |
a4f16749 JX |
14829 | #: builtin/mailsplit.c:241 |
14830 | #, c-format | |
14831 | msgid "empty mbox: '%s'" | |
14832 | msgstr "空的 mbox:'%s'" | |
14833 | ||
a6cd2cc4 | 14834 | #: builtin/merge.c:55 |
814ff314 JX |
14835 | msgid "git merge [<options>] [<commit>...]" |
14836 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 14837 | |
a6cd2cc4 | 14838 | #: builtin/merge.c:56 |
ef317cd5 | 14839 | msgid "git merge --abort" |
07432cef | 14840 | msgstr "git merge --abort" |
ef317cd5 | 14841 | |
a6cd2cc4 | 14842 | #: builtin/merge.c:57 |
1a79b2f1 JX |
14843 | msgid "git merge --continue" |
14844 | msgstr "git merge --continue" | |
14845 | ||
a6cd2cc4 | 14846 | #: builtin/merge.c:118 |
c04f5ac3 JX |
14847 | msgid "switch `m' requires a value" |
14848 | msgstr "开关 `m' 需要一个值" | |
14849 | ||
a6cd2cc4 | 14850 | #: builtin/merge.c:141 |
06991777 JX |
14851 | #, c-format |
14852 | msgid "option `%s' requires a value" | |
14853 | msgstr "选项 `%s' 需要一个值" | |
14854 | ||
a6cd2cc4 | 14855 | #: builtin/merge.c:187 |
c04f5ac3 JX |
14856 | #, c-format |
14857 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 14858 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 14859 | |
a6cd2cc4 | 14860 | #: builtin/merge.c:188 |
c04f5ac3 JX |
14861 | #, c-format |
14862 | msgid "Available strategies are:" | |
14863 | msgstr "可用的策略有:" | |
14864 | ||
a6cd2cc4 | 14865 | #: builtin/merge.c:193 |
c04f5ac3 JX |
14866 | #, c-format |
14867 | msgid "Available custom strategies are:" | |
14868 | msgstr "可用的自定义策略有:" | |
14869 | ||
a5cd71ca | 14870 | #: builtin/merge.c:244 builtin/pull.c:152 |
ef317cd5 | 14871 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 14872 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 14873 | |
a5cd71ca | 14874 | #: builtin/merge.c:247 builtin/pull.c:155 |
ef317cd5 | 14875 | msgid "show a diffstat at the end of the merge" |
07432cef | 14876 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 14877 | |
a5cd71ca | 14878 | #: builtin/merge.c:248 builtin/pull.c:158 |
ef317cd5 | 14879 | msgid "(synonym to --stat)" |
07432cef | 14880 | msgstr "(和 --stat 同义)" |
ef317cd5 | 14881 | |
a5cd71ca | 14882 | #: builtin/merge.c:250 builtin/pull.c:161 |
ef317cd5 | 14883 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 14884 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 14885 | |
a5cd71ca | 14886 | #: builtin/merge.c:253 builtin/pull.c:167 |
ef317cd5 | 14887 | msgid "create a single commit instead of doing a merge" |
07432cef | 14888 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 14889 | |
a5cd71ca | 14890 | #: builtin/merge.c:255 builtin/pull.c:170 |
ef317cd5 | 14891 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 14892 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 14893 | |
a5cd71ca | 14894 | #: builtin/merge.c:257 builtin/pull.c:173 |
ef317cd5 | 14895 | msgid "edit message before committing" |
07432cef | 14896 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 14897 | |
a6cd2cc4 | 14898 | #: builtin/merge.c:259 |
ef317cd5 | 14899 | msgid "allow fast-forward (default)" |
07432cef | 14900 | msgstr "允许快进(默认)" |
ef317cd5 | 14901 | |
a5cd71ca | 14902 | #: builtin/merge.c:261 builtin/pull.c:180 |
ef317cd5 | 14903 | msgid "abort if fast-forward is not possible" |
07432cef | 14904 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 14905 | |
a5cd71ca | 14906 | #: builtin/merge.c:265 builtin/pull.c:183 |
5c57d762 | 14907 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
14908 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
14909 | ||
a5cd71ca JX |
14910 | #: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 |
14911 | #: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 | |
ef317cd5 | 14912 | msgid "strategy" |
07432cef | 14913 | msgstr "策略" |
ef317cd5 | 14914 | |
a5cd71ca | 14915 | #: builtin/merge.c:267 builtin/pull.c:188 |
ef317cd5 | 14916 | msgid "merge strategy to use" |
07432cef | 14917 | msgstr "要使用的合并策略" |
ef317cd5 | 14918 | |
a5cd71ca | 14919 | #: builtin/merge.c:268 builtin/pull.c:191 |
ef317cd5 | 14920 | msgid "option=value" |
07432cef | 14921 | msgstr "option=value" |
ef317cd5 | 14922 | |
a5cd71ca | 14923 | #: builtin/merge.c:269 builtin/pull.c:192 |
ef317cd5 | 14924 | msgid "option for selected merge strategy" |
07432cef | 14925 | msgstr "所选的合并策略的选项" |
ef317cd5 | 14926 | |
a6cd2cc4 | 14927 | #: builtin/merge.c:271 |
ef317cd5 | 14928 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 14929 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 14930 | |
a6cd2cc4 | 14931 | #: builtin/merge.c:278 |
ef317cd5 | 14932 | msgid "abort the current in-progress merge" |
07432cef | 14933 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 14934 | |
a6cd2cc4 JX |
14935 | # |
14936 | #: builtin/merge.c:280 | |
14937 | msgid "--abort but leave index and working tree alone" | |
14938 | msgstr "--abort,但是保留索引和工作区" | |
14939 | ||
14940 | #: builtin/merge.c:282 | |
1a79b2f1 JX |
14941 | msgid "continue the current in-progress merge" |
14942 | msgstr "继续当前正在进行的合并" | |
14943 | ||
a5cd71ca | 14944 | #: builtin/merge.c:284 builtin/pull.c:199 |
5b04ee3b JX |
14945 | msgid "allow merging unrelated histories" |
14946 | msgstr "允许合并不相关的历史" | |
14947 | ||
a6cd2cc4 | 14948 | #: builtin/merge.c:290 |
a5cd71ca JX |
14949 | msgid "bypass pre-merge-commit and commit-msg hooks" |
14950 | msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" | |
6937cb4e | 14951 | |
a6cd2cc4 | 14952 | #: builtin/merge.c:307 |
c04f5ac3 | 14953 | msgid "could not run stash." |
a4f16749 | 14954 | msgstr "不能运行贮藏。" |
c04f5ac3 | 14955 | |
a6cd2cc4 | 14956 | #: builtin/merge.c:312 |
c04f5ac3 | 14957 | msgid "stash failed" |
a4f16749 | 14958 | msgstr "贮藏失败" |
c04f5ac3 | 14959 | |
a6cd2cc4 | 14960 | #: builtin/merge.c:317 |
c04f5ac3 JX |
14961 | #, c-format |
14962 | msgid "not a valid object: %s" | |
14963 | msgstr "不是一个有效对象:%s" | |
14964 | ||
a6cd2cc4 | 14965 | #: builtin/merge.c:339 builtin/merge.c:356 |
c04f5ac3 JX |
14966 | msgid "read-tree failed" |
14967 | msgstr "读取树失败" | |
14968 | ||
90e6ef53 | 14969 | # 译者:注意保持前导空格 |
a6cd2cc4 | 14970 | #: builtin/merge.c:386 |
c04f5ac3 JX |
14971 | msgid " (nothing to squash)" |
14972 | msgstr " (无可压缩)" | |
14973 | ||
a6cd2cc4 | 14974 | #: builtin/merge.c:397 |
c04f5ac3 JX |
14975 | #, c-format |
14976 | msgid "Squash commit -- not updating HEAD\n" | |
14977 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
14978 | ||
a6cd2cc4 | 14979 | #: builtin/merge.c:447 |
c04f5ac3 JX |
14980 | #, c-format |
14981 | msgid "No merge message -- not updating HEAD\n" | |
14982 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
14983 | ||
a6cd2cc4 | 14984 | #: builtin/merge.c:498 |
c04f5ac3 JX |
14985 | #, c-format |
14986 | msgid "'%s' does not point to a commit" | |
14987 | msgstr "'%s' 没有指向一个提交" | |
14988 | ||
a6cd2cc4 | 14989 | #: builtin/merge.c:585 |
c04f5ac3 JX |
14990 | #, c-format |
14991 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 14992 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 14993 | |
a5cd71ca | 14994 | #: builtin/merge.c:705 |
c04f5ac3 | 14995 | msgid "Not handling anything other than two heads merge." |
29004bbb | 14996 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 14997 | |
a5cd71ca | 14998 | #: builtin/merge.c:719 |
c04f5ac3 JX |
14999 | #, c-format |
15000 | msgid "Unknown option for merge-recursive: -X%s" | |
15001 | msgstr "merge-recursive 的未知选项:-X%s" | |
15002 | ||
a5cd71ca | 15003 | #: builtin/merge.c:734 |
c04f5ac3 JX |
15004 | #, c-format |
15005 | msgid "unable to write %s" | |
15006 | msgstr "不能写 %s" | |
15007 | ||
a5cd71ca | 15008 | #: builtin/merge.c:786 |
c04f5ac3 JX |
15009 | #, c-format |
15010 | msgid "Could not read from '%s'" | |
15011 | msgstr "不能从 '%s' 读取" | |
15012 | ||
a5cd71ca | 15013 | #: builtin/merge.c:795 |
c04f5ac3 JX |
15014 | #, c-format |
15015 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
15016 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
15017 | ||
a5cd71ca | 15018 | #: builtin/merge.c:801 |
c04f5ac3 JX |
15019 | msgid "" |
15020 | "Please enter a commit message to explain why this merge is necessary,\n" | |
15021 | "especially if it merges an updated upstream into a topic branch.\n" | |
15022 | "\n" | |
c04f5ac3 JX |
15023 | msgstr "" |
15024 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
15025 | "合并到主题分支。\n" | |
15026 | "\n" | |
c04f5ac3 | 15027 | |
a5cd71ca | 15028 | #: builtin/merge.c:806 |
d46c5519 | 15029 | msgid "An empty message aborts the commit.\n" |
5b533632 | 15030 | msgstr "空的提交说明会终止提交。\n" |
d46c5519 | 15031 | |
a5cd71ca | 15032 | #: builtin/merge.c:809 |
d46c5519 JX |
15033 | #, c-format |
15034 | msgid "" | |
15035 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" | |
15036 | "the commit.\n" | |
5b533632 | 15037 | msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n" |
d46c5519 | 15038 | |
a5cd71ca | 15039 | #: builtin/merge.c:862 |
c04f5ac3 JX |
15040 | msgid "Empty commit message." |
15041 | msgstr "空提交信息。" | |
15042 | ||
a5cd71ca | 15043 | #: builtin/merge.c:877 |
c04f5ac3 JX |
15044 | #, c-format |
15045 | msgid "Wonderful.\n" | |
15046 | msgstr "太棒了。\n" | |
15047 | ||
a5cd71ca | 15048 | #: builtin/merge.c:938 |
c04f5ac3 JX |
15049 | #, c-format |
15050 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
15051 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
15052 | ||
a5cd71ca | 15053 | #: builtin/merge.c:977 |
c04f5ac3 | 15054 | msgid "No current branch." |
90e6ef53 | 15055 | msgstr "没有当前分支。" |
c04f5ac3 | 15056 | |
a5cd71ca | 15057 | #: builtin/merge.c:979 |
c04f5ac3 | 15058 | msgid "No remote for the current branch." |
160fb2b2 | 15059 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 15060 | |
a5cd71ca | 15061 | #: builtin/merge.c:981 |
c04f5ac3 | 15062 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 15063 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 15064 | |
a5cd71ca | 15065 | #: builtin/merge.c:986 |
170e9899 | 15066 | #, c-format |
2e8451e8 JX |
15067 | msgid "No remote-tracking branch for %s from %s" |
15068 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 15069 | |
a5cd71ca | 15070 | #: builtin/merge.c:1043 |
5c57d762 JX |
15071 | #, c-format |
15072 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 15073 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 15074 | |
a5cd71ca | 15075 | #: builtin/merge.c:1146 |
5c57d762 JX |
15076 | #, c-format |
15077 | msgid "not something we can merge in %s: %s" | |
15078 | msgstr "不能在 %s 中合并:%s" | |
15079 | ||
a5cd71ca | 15080 | #: builtin/merge.c:1180 |
5c57d762 JX |
15081 | msgid "not something we can merge" |
15082 | msgstr "不能合并" | |
15083 | ||
a5cd71ca | 15084 | #: builtin/merge.c:1283 |
1a79b2f1 JX |
15085 | msgid "--abort expects no arguments" |
15086 | msgstr "--abort 不带参数" | |
15087 | ||
a5cd71ca | 15088 | #: builtin/merge.c:1287 |
c04f5ac3 | 15089 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 15090 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 15091 | |
a5cd71ca | 15092 | #: builtin/merge.c:1296 |
a6cd2cc4 JX |
15093 | msgid "--quit expects no arguments" |
15094 | msgstr "--quit 不带参数" | |
15095 | ||
a5cd71ca | 15096 | #: builtin/merge.c:1309 |
1a79b2f1 JX |
15097 | msgid "--continue expects no arguments" |
15098 | msgstr "--continue 不带参数" | |
15099 | ||
a5cd71ca | 15100 | #: builtin/merge.c:1313 |
1a79b2f1 JX |
15101 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
15102 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
15103 | ||
a5cd71ca | 15104 | #: builtin/merge.c:1329 |
c04f5ac3 JX |
15105 | msgid "" |
15106 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 15107 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
15108 | msgstr "" |
15109 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 15110 | "请在合并前先提交您的修改。" |
c04f5ac3 | 15111 | |
a5cd71ca | 15112 | #: builtin/merge.c:1336 |
c04f5ac3 JX |
15113 | msgid "" |
15114 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 15115 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
15116 | msgstr "" |
15117 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 15118 | "请在合并前先提交您的修改。" |
c04f5ac3 | 15119 | |
a5cd71ca | 15120 | #: builtin/merge.c:1339 |
c04f5ac3 JX |
15121 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
15122 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
15123 | ||
a5cd71ca | 15124 | #: builtin/merge.c:1353 |
c04f5ac3 | 15125 | msgid "You cannot combine --squash with --no-ff." |
a6cd2cc4 | 15126 | msgstr "您不能将 --squash 和 --no-ff 组合使用。" |
c04f5ac3 | 15127 | |
a5cd71ca | 15128 | #: builtin/merge.c:1355 |
a6cd2cc4 JX |
15129 | msgid "You cannot combine --squash with --commit." |
15130 | msgstr "您不能将 --squash 和 --commit 组合使用。" | |
15131 | ||
a5cd71ca | 15132 | #: builtin/merge.c:1371 |
c04f5ac3 | 15133 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 15134 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 15135 | |
a5cd71ca | 15136 | #: builtin/merge.c:1388 |
c04f5ac3 JX |
15137 | msgid "Squash commit into empty head not supported yet" |
15138 | msgstr "尚不支持到空分支的压缩提交" | |
15139 | ||
a5cd71ca | 15140 | #: builtin/merge.c:1390 |
c04f5ac3 JX |
15141 | msgid "Non-fast-forward commit does not make sense into an empty head" |
15142 | msgstr "到空分支的非快进式提交没有意义" | |
15143 | ||
a5cd71ca | 15144 | #: builtin/merge.c:1395 |
2e8451e8 JX |
15145 | #, c-format |
15146 | msgid "%s - not something we can merge" | |
15147 | msgstr "%s - 不能被合并" | |
15148 | ||
a5cd71ca | 15149 | #: builtin/merge.c:1397 |
7aea43ff JX |
15150 | msgid "Can merge only exactly one commit into empty head" |
15151 | msgstr "只能将一个提交合并到空分支上" | |
15152 | ||
a5cd71ca | 15153 | #: builtin/merge.c:1476 |
5b04ee3b JX |
15154 | msgid "refusing to merge unrelated histories" |
15155 | msgstr "拒绝合并无关的历史" | |
15156 | ||
a5cd71ca | 15157 | #: builtin/merge.c:1485 |
6937cb4e | 15158 | msgid "Already up to date." |
5c57d762 JX |
15159 | msgstr "已经是最新的。" |
15160 | ||
a5cd71ca | 15161 | #: builtin/merge.c:1495 |
c04f5ac3 JX |
15162 | #, c-format |
15163 | msgid "Updating %s..%s\n" | |
15164 | msgstr "更新 %s..%s\n" | |
15165 | ||
a5cd71ca | 15166 | #: builtin/merge.c:1537 |
c04f5ac3 JX |
15167 | #, c-format |
15168 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 15169 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 15170 | |
a5cd71ca | 15171 | #: builtin/merge.c:1544 |
c04f5ac3 JX |
15172 | #, c-format |
15173 | msgid "Nope.\n" | |
15174 | msgstr "无。\n" | |
15175 | ||
a5cd71ca | 15176 | #: builtin/merge.c:1569 |
6937cb4e | 15177 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
15178 | msgstr "已经是最新的。耶!" |
15179 | ||
a5cd71ca | 15180 | #: builtin/merge.c:1575 |
c04f5ac3 | 15181 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 15182 | msgstr "无法快进,终止。" |
c04f5ac3 | 15183 | |
a5cd71ca | 15184 | #: builtin/merge.c:1598 builtin/merge.c:1663 |
c04f5ac3 JX |
15185 | #, c-format |
15186 | msgid "Rewinding the tree to pristine...\n" | |
15187 | msgstr "将树回滚至原始状态...\n" | |
15188 | ||
a5cd71ca | 15189 | #: builtin/merge.c:1602 |
c04f5ac3 JX |
15190 | #, c-format |
15191 | msgid "Trying merge strategy %s...\n" | |
15192 | msgstr "尝试合并策略 %s...\n" | |
15193 | ||
a5cd71ca | 15194 | #: builtin/merge.c:1654 |
c04f5ac3 JX |
15195 | #, c-format |
15196 | msgid "No merge strategy handled the merge.\n" | |
15197 | msgstr "没有合并策略处理此合并。\n" | |
15198 | ||
a5cd71ca | 15199 | #: builtin/merge.c:1656 |
c04f5ac3 JX |
15200 | #, c-format |
15201 | msgid "Merge with strategy %s failed.\n" | |
15202 | msgstr "使用策略 %s 合并失败。\n" | |
15203 | ||
a5cd71ca | 15204 | #: builtin/merge.c:1665 |
c04f5ac3 JX |
15205 | #, c-format |
15206 | msgid "Using the %s to prepare resolving by hand.\n" | |
15207 | msgstr "使用 %s 以准备手工解决。\n" | |
15208 | ||
a5cd71ca | 15209 | #: builtin/merge.c:1677 |
c04f5ac3 JX |
15210 | #, c-format |
15211 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
15212 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
15213 | ||
4c27fcb5 | 15214 | #: builtin/merge-base.c:32 |
814ff314 JX |
15215 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
15216 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 15217 | |
4c27fcb5 | 15218 | #: builtin/merge-base.c:33 |
814ff314 JX |
15219 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
15220 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 15221 | |
4c27fcb5 | 15222 | #: builtin/merge-base.c:34 |
ef317cd5 | 15223 | msgid "git merge-base --independent <commit>..." |
07432cef | 15224 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 15225 | |
4c27fcb5 | 15226 | #: builtin/merge-base.c:35 |
ef317cd5 | 15227 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 15228 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 15229 | |
4c27fcb5 | 15230 | #: builtin/merge-base.c:36 |
cfff71a9 | 15231 | msgid "git merge-base --fork-point <ref> [<commit>]" |
d9d56b23 | 15232 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 15233 | |
4c27fcb5 | 15234 | #: builtin/merge-base.c:153 |
ef317cd5 | 15235 | msgid "output all common ancestors" |
07432cef | 15236 | msgstr "输出所有共同的祖先" |
ef317cd5 | 15237 | |
4c27fcb5 | 15238 | #: builtin/merge-base.c:155 |
ef317cd5 | 15239 | msgid "find ancestors for a single n-way merge" |
07432cef | 15240 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 15241 | |
4c27fcb5 | 15242 | #: builtin/merge-base.c:157 |
ef317cd5 | 15243 | msgid "list revs not reachable from others" |
07432cef | 15244 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 15245 | |
4c27fcb5 | 15246 | #: builtin/merge-base.c:159 |
ef317cd5 | 15247 | msgid "is the first one ancestor of the other?" |
07432cef | 15248 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 15249 | |
4c27fcb5 | 15250 | #: builtin/merge-base.c:161 |
cfff71a9 | 15251 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 15252 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 15253 | |
a4f16749 | 15254 | #: builtin/merge-file.c:9 |
ef317cd5 | 15255 | msgid "" |
814ff314 JX |
15256 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
15257 | "<orig-file> <file2>" | |
ef317cd5 | 15258 | msgstr "" |
814ff314 JX |
15259 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
15260 | "件> <文件2>" | |
ef317cd5 | 15261 | |
4c27fcb5 | 15262 | #: builtin/merge-file.c:35 |
ef317cd5 | 15263 | msgid "send results to standard output" |
07432cef | 15264 | msgstr "将结果发送到标准输出" |
ef317cd5 | 15265 | |
4c27fcb5 | 15266 | #: builtin/merge-file.c:36 |
ef317cd5 | 15267 | msgid "use a diff3 based merge" |
07432cef | 15268 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 15269 | |
4c27fcb5 | 15270 | #: builtin/merge-file.c:37 |
ef317cd5 | 15271 | msgid "for conflicts, use our version" |
07432cef | 15272 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 15273 | |
4c27fcb5 | 15274 | #: builtin/merge-file.c:39 |
ef317cd5 | 15275 | msgid "for conflicts, use their version" |
07432cef | 15276 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 15277 | |
4c27fcb5 | 15278 | #: builtin/merge-file.c:41 |
ef317cd5 | 15279 | msgid "for conflicts, use a union version" |
07432cef | 15280 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 15281 | |
4c27fcb5 | 15282 | #: builtin/merge-file.c:44 |
ef317cd5 | 15283 | msgid "for conflicts, use this marker size" |
07432cef | 15284 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 15285 | |
4c27fcb5 | 15286 | #: builtin/merge-file.c:45 |
ef317cd5 | 15287 | msgid "do not warn about conflicts" |
07432cef | 15288 | msgstr "不要警告冲突" |
ef317cd5 | 15289 | |
4c27fcb5 | 15290 | #: builtin/merge-file.c:47 |
814ff314 JX |
15291 | msgid "set labels for file1/orig-file/file2" |
15292 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 15293 | |
a5cd71ca | 15294 | #: builtin/merge-recursive.c:47 |
a0b6b246 JX |
15295 | #, c-format |
15296 | msgid "unknown option %s" | |
15297 | msgstr "未知选项 %s" | |
15298 | ||
a5cd71ca | 15299 | #: builtin/merge-recursive.c:53 |
a0b6b246 JX |
15300 | #, c-format |
15301 | msgid "could not parse object '%s'" | |
15302 | msgstr "不能解析对象 '%s'" | |
15303 | ||
a5cd71ca | 15304 | #: builtin/merge-recursive.c:57 |
a0b6b246 JX |
15305 | #, c-format |
15306 | msgid "cannot handle more than %d base. Ignoring %s." | |
15307 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
15308 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
15309 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
15310 | ||
a5cd71ca | 15311 | #: builtin/merge-recursive.c:65 |
a0b6b246 JX |
15312 | msgid "not handling anything other than two heads merge." |
15313 | msgstr "不能处理两个头合并之外的任何操作。" | |
15314 | ||
a5cd71ca | 15315 | #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 |
a0b6b246 JX |
15316 | #, c-format |
15317 | msgid "could not resolve ref '%s'" | |
15318 | msgstr "无法解析引用 '%s'" | |
15319 | ||
a5cd71ca | 15320 | #: builtin/merge-recursive.c:82 |
a0b6b246 JX |
15321 | #, c-format |
15322 | msgid "Merging %s with %s\n" | |
15323 | msgstr "合并 %s 和 %s\n" | |
15324 | ||
c1ac5258 | 15325 | #: builtin/mktree.c:66 |
ef317cd5 | 15326 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 15327 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 15328 | |
c1ac5258 | 15329 | #: builtin/mktree.c:154 |
ef317cd5 | 15330 | msgid "input is NUL terminated" |
07432cef | 15331 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 15332 | |
06991777 | 15333 | #: builtin/mktree.c:155 builtin/write-tree.c:26 |
ef317cd5 | 15334 | msgid "allow missing objects" |
07432cef | 15335 | msgstr "允许丢失的对象" |
c04f5ac3 | 15336 | |
c1ac5258 | 15337 | #: builtin/mktree.c:156 |
ef317cd5 | 15338 | msgid "allow creation of more than one tree" |
07432cef | 15339 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 15340 | |
d46c5519 | 15341 | #: builtin/multi-pack-index.c:9 |
a6cd2cc4 JX |
15342 | msgid "" |
15343 | "git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" | |
15344 | "batch-size=<size>)" | |
15345 | msgstr "" | |
15346 | "git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --" | |
15347 | "batch-size=<大小>)" | |
4c27fcb5 | 15348 | |
a6cd2cc4 | 15349 | #: builtin/multi-pack-index.c:23 |
4c27fcb5 JX |
15350 | msgid "object directory containing set of packfile and pack-index pairs" |
15351 | msgstr "包含成对包文件和包索引的对象目录" | |
15352 | ||
a6cd2cc4 JX |
15353 | #: builtin/multi-pack-index.c:25 |
15354 | msgid "" | |
15355 | "during repack, collect pack-files of smaller size into a batch that is " | |
15356 | "larger than this size" | |
15357 | msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中" | |
15358 | ||
15359 | #: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 | |
4c27fcb5 JX |
15360 | msgid "too many arguments" |
15361 | msgstr "太多参数" | |
15362 | ||
a6cd2cc4 JX |
15363 | #: builtin/multi-pack-index.c:52 |
15364 | msgid "--batch-size option is only for 'repack' subcommand" | |
15365 | msgstr "--batch-size 选项仅用于 'repack' 子命令" | |
15366 | ||
15367 | #: builtin/multi-pack-index.c:61 | |
4c27fcb5 | 15368 | #, c-format |
a6cd2cc4 JX |
15369 | msgid "unrecognized subcommand: %s" |
15370 | msgstr "未识别的子命令:%s" | |
4c27fcb5 | 15371 | |
06991777 | 15372 | #: builtin/mv.c:18 |
814ff314 JX |
15373 | msgid "git mv [<options>] <source>... <destination>" |
15374 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 15375 | |
06991777 | 15376 | #: builtin/mv.c:83 |
220c313c JX |
15377 | #, c-format |
15378 | msgid "Directory %s is in index and no submodule?" | |
15379 | msgstr "目录 %s 在索引中并且不是子模组?" | |
15380 | ||
06991777 | 15381 | #: builtin/mv.c:85 |
220c313c | 15382 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 15383 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 15384 | |
06991777 | 15385 | #: builtin/mv.c:103 |
220c313c JX |
15386 | #, c-format |
15387 | msgid "%.*s is in index" | |
15388 | msgstr "%.*s 在索引中" | |
15389 | ||
06991777 | 15390 | #: builtin/mv.c:125 |
ef317cd5 | 15391 | msgid "force move/rename even if target exists" |
07432cef | 15392 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 15393 | |
06991777 | 15394 | #: builtin/mv.c:127 |
ef317cd5 | 15395 | msgid "skip move/rename errors" |
07432cef | 15396 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 15397 | |
06991777 | 15398 | #: builtin/mv.c:169 |
220c313c JX |
15399 | #, c-format |
15400 | msgid "destination '%s' is not a directory" | |
15401 | msgstr "目标 '%s' 不是一个目录" | |
15402 | ||
06991777 | 15403 | #: builtin/mv.c:180 |
c04f5ac3 JX |
15404 | #, c-format |
15405 | msgid "Checking rename of '%s' to '%s'\n" | |
15406 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
15407 | ||
06991777 | 15408 | #: builtin/mv.c:184 |
c04f5ac3 JX |
15409 | msgid "bad source" |
15410 | msgstr "坏的源" | |
15411 | ||
06991777 | 15412 | #: builtin/mv.c:187 |
c04f5ac3 JX |
15413 | msgid "can not move directory into itself" |
15414 | msgstr "不能将目录移动到自身" | |
15415 | ||
06991777 | 15416 | #: builtin/mv.c:190 |
c04f5ac3 JX |
15417 | msgid "cannot move directory over file" |
15418 | msgstr "不能将目录移动到文件" | |
15419 | ||
06991777 | 15420 | #: builtin/mv.c:199 |
c04f5ac3 JX |
15421 | msgid "source directory is empty" |
15422 | msgstr "源目录为空" | |
15423 | ||
06991777 | 15424 | #: builtin/mv.c:224 |
c04f5ac3 JX |
15425 | msgid "not under version control" |
15426 | msgstr "不在版本控制之下" | |
15427 | ||
06991777 | 15428 | #: builtin/mv.c:227 |
c04f5ac3 JX |
15429 | msgid "destination exists" |
15430 | msgstr "目标已存在" | |
15431 | ||
06991777 | 15432 | #: builtin/mv.c:235 |
c04f5ac3 JX |
15433 | #, c-format |
15434 | msgid "overwriting '%s'" | |
15435 | msgstr "覆盖 '%s'" | |
15436 | ||
06991777 | 15437 | #: builtin/mv.c:238 |
c04f5ac3 JX |
15438 | msgid "Cannot overwrite" |
15439 | msgstr "不能覆盖" | |
15440 | ||
06991777 | 15441 | #: builtin/mv.c:241 |
c04f5ac3 JX |
15442 | msgid "multiple sources for the same target" |
15443 | msgstr "同一目标具有多个源" | |
15444 | ||
06991777 | 15445 | #: builtin/mv.c:243 |
cfff71a9 JX |
15446 | msgid "destination directory does not exist" |
15447 | msgstr "目标目录不存在" | |
15448 | ||
06991777 | 15449 | #: builtin/mv.c:250 |
c04f5ac3 JX |
15450 | #, c-format |
15451 | msgid "%s, source=%s, destination=%s" | |
15452 | msgstr "%s,源=%s,目标=%s" | |
15453 | ||
06991777 | 15454 | #: builtin/mv.c:271 |
c04f5ac3 JX |
15455 | #, c-format |
15456 | msgid "Renaming %s to %s\n" | |
15457 | msgstr "重命名 %s 至 %s\n" | |
15458 | ||
a5cd71ca | 15459 | #: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 |
c04f5ac3 JX |
15460 | #, c-format |
15461 | msgid "renaming '%s' failed" | |
15462 | msgstr "重命名 '%s' 失败" | |
15463 | ||
a5cd71ca | 15464 | #: builtin/name-rev.c:356 |
814ff314 JX |
15465 | msgid "git name-rev [<options>] <commit>..." |
15466 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 15467 | |
a5cd71ca | 15468 | #: builtin/name-rev.c:357 |
814ff314 JX |
15469 | msgid "git name-rev [<options>] --all" |
15470 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 15471 | |
a5cd71ca | 15472 | #: builtin/name-rev.c:358 |
814ff314 JX |
15473 | msgid "git name-rev [<options>] --stdin" |
15474 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 15475 | |
a5cd71ca | 15476 | #: builtin/name-rev.c:415 |
ef317cd5 | 15477 | msgid "print only names (no SHA-1)" |
07432cef | 15478 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 15479 | |
a5cd71ca | 15480 | #: builtin/name-rev.c:416 |
ef317cd5 | 15481 | msgid "only use tags to name the commits" |
55a16ee4 | 15482 | msgstr "只使用标签来命名提交" |
ef317cd5 | 15483 | |
a5cd71ca | 15484 | #: builtin/name-rev.c:418 |
ef317cd5 | 15485 | msgid "only use refs matching <pattern>" |
07432cef | 15486 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 15487 | |
a5cd71ca | 15488 | #: builtin/name-rev.c:420 |
87cb7997 JX |
15489 | msgid "ignore refs matching <pattern>" |
15490 | msgstr "忽略和 <模式> 相匹配的引用" | |
15491 | ||
a5cd71ca | 15492 | #: builtin/name-rev.c:422 |
ef317cd5 | 15493 | msgid "list all commits reachable from all refs" |
07432cef | 15494 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 15495 | |
a5cd71ca | 15496 | #: builtin/name-rev.c:423 |
ef317cd5 | 15497 | msgid "read from stdin" |
07432cef | 15498 | msgstr "从标准输入读取" |
ef317cd5 | 15499 | |
a5cd71ca | 15500 | #: builtin/name-rev.c:424 |
90314792 JX |
15501 | msgid "allow to print `undefined` names (default)" |
15502 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 15503 | |
a5cd71ca | 15504 | #: builtin/name-rev.c:430 |
2e8451e8 | 15505 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 15506 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 15507 | |
c1ac5258 | 15508 | #: builtin/notes.c:28 |
814ff314 | 15509 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 15510 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 15511 | |
c1ac5258 | 15512 | #: builtin/notes.c:29 |
ef317cd5 | 15513 | msgid "" |
814ff314 | 15514 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 15515 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 15516 | msgstr "" |
04cb2f28 JX |
15517 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
15518 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 15519 | |
c1ac5258 | 15520 | #: builtin/notes.c:30 |
814ff314 | 15521 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 15522 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 15523 | |
c1ac5258 | 15524 | #: builtin/notes.c:31 |
ef317cd5 | 15525 | msgid "" |
814ff314 | 15526 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 15527 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 15528 | msgstr "" |
04cb2f28 JX |
15529 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
15530 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 15531 | |
c1ac5258 | 15532 | #: builtin/notes.c:32 |
814ff314 | 15533 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 15534 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 15535 | |
c1ac5258 | 15536 | #: builtin/notes.c:33 |
814ff314 | 15537 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 15538 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 15539 | |
c1ac5258 | 15540 | #: builtin/notes.c:34 |
ef317cd5 | 15541 | msgid "" |
814ff314 | 15542 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 15543 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 15544 | |
c1ac5258 | 15545 | #: builtin/notes.c:35 |
ef317cd5 | 15546 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 15547 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 15548 | |
c1ac5258 | 15549 | #: builtin/notes.c:36 |
ef317cd5 | 15550 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 15551 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 15552 | |
c1ac5258 | 15553 | #: builtin/notes.c:37 |
814ff314 | 15554 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 15555 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 15556 | |
c1ac5258 | 15557 | #: builtin/notes.c:38 |
5809aa05 JX |
15558 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
15559 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 15560 | |
c1ac5258 | 15561 | #: builtin/notes.c:39 |
814ff314 | 15562 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 15563 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 15564 | |
c1ac5258 | 15565 | #: builtin/notes.c:44 |
ef317cd5 | 15566 | msgid "git notes [list [<object>]]" |
07432cef | 15567 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 15568 | |
c1ac5258 | 15569 | #: builtin/notes.c:49 |
ef317cd5 | 15570 | msgid "git notes add [<options>] [<object>]" |
07432cef | 15571 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 15572 | |
c1ac5258 | 15573 | #: builtin/notes.c:54 |
ef317cd5 | 15574 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 15575 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 15576 | |
c1ac5258 | 15577 | #: builtin/notes.c:55 |
ef317cd5 | 15578 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 15579 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 15580 | |
c1ac5258 | 15581 | #: builtin/notes.c:60 |
ef317cd5 | 15582 | msgid "git notes append [<options>] [<object>]" |
07432cef | 15583 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 15584 | |
c1ac5258 | 15585 | #: builtin/notes.c:65 |
ef317cd5 | 15586 | msgid "git notes edit [<object>]" |
07432cef | 15587 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 15588 | |
c1ac5258 | 15589 | #: builtin/notes.c:70 |
ef317cd5 | 15590 | msgid "git notes show [<object>]" |
07432cef | 15591 | msgstr "git notes show [<对象>]" |
ef317cd5 | 15592 | |
c1ac5258 | 15593 | #: builtin/notes.c:75 |
814ff314 | 15594 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 15595 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 15596 | |
c1ac5258 | 15597 | #: builtin/notes.c:76 |
ef317cd5 | 15598 | msgid "git notes merge --commit [<options>]" |
07432cef | 15599 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 15600 | |
c1ac5258 | 15601 | #: builtin/notes.c:77 |
ef317cd5 | 15602 | msgid "git notes merge --abort [<options>]" |
07432cef | 15603 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 15604 | |
c1ac5258 | 15605 | #: builtin/notes.c:82 |
ef317cd5 | 15606 | msgid "git notes remove [<object>]" |
07432cef | 15607 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 15608 | |
c1ac5258 | 15609 | #: builtin/notes.c:87 |
ef317cd5 | 15610 | msgid "git notes prune [<options>]" |
07432cef | 15611 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 15612 | |
c1ac5258 | 15613 | #: builtin/notes.c:92 |
ef317cd5 | 15614 | msgid "git notes get-ref" |
07432cef | 15615 | msgstr "git notes get-ref" |
ef317cd5 | 15616 | |
c1ac5258 | 15617 | #: builtin/notes.c:97 |
5c57d762 JX |
15618 | msgid "Write/edit the notes for the following object:" |
15619 | msgstr "为下面的对象写/编辑说明:" | |
15620 | ||
c1ac5258 | 15621 | #: builtin/notes.c:150 |
c04f5ac3 JX |
15622 | #, c-format |
15623 | msgid "unable to start 'show' for object '%s'" | |
15624 | msgstr "不能为对象 '%s' 开始 'show'" | |
15625 | ||
c1ac5258 | 15626 | #: builtin/notes.c:154 |
a77c07d9 JX |
15627 | msgid "could not read 'show' output" |
15628 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 15629 | |
c1ac5258 | 15630 | #: builtin/notes.c:162 |
c04f5ac3 JX |
15631 | #, c-format |
15632 | msgid "failed to finish 'show' for object '%s'" | |
15633 | msgstr "无法为对象 '%s' 完成 'show'" | |
15634 | ||
c1ac5258 | 15635 | #: builtin/notes.c:197 |
a0b6b246 | 15636 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
15637 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
15638 | ||
c1ac5258 | 15639 | #: builtin/notes.c:206 |
c04f5ac3 JX |
15640 | msgid "unable to write note object" |
15641 | msgstr "不能写注解对象" | |
15642 | ||
c1ac5258 | 15643 | #: builtin/notes.c:208 |
c04f5ac3 | 15644 | #, c-format |
a0b6b246 | 15645 | msgid "the note contents have been left in %s" |
220c313c | 15646 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 15647 | |
a6cd2cc4 | 15648 | #: builtin/notes.c:242 builtin/tag.c:532 |
c04f5ac3 JX |
15649 | #, c-format |
15650 | msgid "could not open or read '%s'" | |
15651 | msgstr "不能打开或读取 '%s'" | |
15652 | ||
4c27fcb5 | 15653 | #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 |
06991777 JX |
15654 | #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 |
15655 | #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 | |
a0b6b246 JX |
15656 | #, c-format |
15657 | msgid "failed to resolve '%s' as a valid ref." | |
15658 | msgstr "无法解析 '%s' 为一个有效引用。" | |
15659 | ||
4c27fcb5 | 15660 | #: builtin/notes.c:265 |
c04f5ac3 | 15661 | #, c-format |
a0b6b246 | 15662 | msgid "failed to read object '%s'." |
c1ac5258 | 15663 | msgstr "读取对象 '%s' 失败。" |
c04f5ac3 | 15664 | |
4c27fcb5 | 15665 | #: builtin/notes.c:268 |
6c94aba5 | 15666 | #, c-format |
a0b6b246 JX |
15667 | msgid "cannot read note data from non-blob object '%s'." |
15668 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
15669 | ||
4c27fcb5 | 15670 | #: builtin/notes.c:309 |
a0b6b246 JX |
15671 | #, c-format |
15672 | msgid "malformed input line: '%s'." | |
fd8cb379 | 15673 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 15674 | |
4c27fcb5 | 15675 | #: builtin/notes.c:324 |
a0b6b246 JX |
15676 | #, c-format |
15677 | msgid "failed to copy notes from '%s' to '%s'" | |
15678 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 15679 | |
a4f16749 JX |
15680 | #. TRANSLATORS: the first %s will be replaced by a git |
15681 | #. notes command: 'add', 'merge', 'remove', etc. | |
15682 | #. | |
4c27fcb5 | 15683 | #: builtin/notes.c:356 |
a0b6b246 JX |
15684 | #, c-format |
15685 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
15686 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
15687 | ||
06991777 JX |
15688 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 |
15689 | #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 | |
15690 | #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 | |
c04f5ac3 JX |
15691 | msgid "too many parameters" |
15692 | msgstr "参数太多" | |
15693 | ||
06991777 | 15694 | #: builtin/notes.c:389 builtin/notes.c:678 |
c04f5ac3 | 15695 | #, c-format |
a0b6b246 | 15696 | msgid "no note found for object %s." |
c04f5ac3 JX |
15697 | msgstr "未发现对象 %s 的注解。" |
15698 | ||
06991777 | 15699 | #: builtin/notes.c:410 builtin/notes.c:576 |
ef317cd5 | 15700 | msgid "note contents as a string" |
07432cef | 15701 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 15702 | |
06991777 | 15703 | #: builtin/notes.c:413 builtin/notes.c:579 |
ef317cd5 | 15704 | msgid "note contents in a file" |
07432cef | 15705 | msgstr "注解内容到一个文件中" |
ef317cd5 | 15706 | |
06991777 | 15707 | #: builtin/notes.c:416 builtin/notes.c:582 |
ef317cd5 | 15708 | msgid "reuse and edit specified note object" |
07432cef | 15709 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 15710 | |
06991777 | 15711 | #: builtin/notes.c:419 builtin/notes.c:585 |
ef317cd5 | 15712 | msgid "reuse specified note object" |
07432cef | 15713 | msgstr "重用指定的注解对象" |
ef317cd5 | 15714 | |
06991777 | 15715 | #: builtin/notes.c:422 builtin/notes.c:588 |
04cb2f28 JX |
15716 | msgid "allow storing empty note" |
15717 | msgstr "允许保存空白注释" | |
15718 | ||
06991777 | 15719 | #: builtin/notes.c:423 builtin/notes.c:496 |
ef317cd5 | 15720 | msgid "replace existing notes" |
07432cef | 15721 | msgstr "替换已存在的注解" |
ef317cd5 | 15722 | |
4c27fcb5 | 15723 | #: builtin/notes.c:448 |
c04f5ac3 JX |
15724 | #, c-format |
15725 | msgid "" | |
15726 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
15727 | "existing notes" | |
15728 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
15729 | ||
06991777 | 15730 | #: builtin/notes.c:463 builtin/notes.c:544 |
c04f5ac3 JX |
15731 | #, c-format |
15732 | msgid "Overwriting existing notes for object %s\n" | |
15733 | msgstr "覆盖对象 %s 现存注解\n" | |
15734 | ||
06991777 | 15735 | #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 |
04cb2f28 JX |
15736 | #, c-format |
15737 | msgid "Removing note for object %s\n" | |
15738 | msgstr "删除对象 %s 的注解\n" | |
15739 | ||
06991777 | 15740 | #: builtin/notes.c:497 |
ef317cd5 | 15741 | msgid "read objects from stdin" |
07432cef | 15742 | msgstr "从标准输入读取对象" |
ef317cd5 | 15743 | |
06991777 | 15744 | #: builtin/notes.c:499 |
ef317cd5 | 15745 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 15746 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 15747 | |
06991777 | 15748 | #: builtin/notes.c:517 |
c04f5ac3 JX |
15749 | msgid "too few parameters" |
15750 | msgstr "参数太少" | |
15751 | ||
06991777 | 15752 | #: builtin/notes.c:538 |
c04f5ac3 JX |
15753 | #, c-format |
15754 | msgid "" | |
15755 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
15756 | "existing notes" | |
15757 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
15758 | ||
06991777 | 15759 | #: builtin/notes.c:550 |
c04f5ac3 | 15760 | #, c-format |
a0b6b246 | 15761 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
15762 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
15763 | ||
06991777 | 15764 | #: builtin/notes.c:603 |
ef317cd5 JX |
15765 | #, c-format |
15766 | msgid "" | |
15767 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
15768 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
15769 | msgstr "" | |
15770 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
15771 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
15772 | ||
06991777 | 15773 | #: builtin/notes.c:698 |
a0b6b246 | 15774 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 15775 | msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 15776 | |
06991777 | 15777 | #: builtin/notes.c:700 |
a0b6b246 | 15778 | msgid "failed to delete ref NOTES_MERGE_REF" |
c1ac5258 | 15779 | msgstr "删除引用 NOTES_MERGE_REF 失败" |
a0b6b246 | 15780 | |
06991777 | 15781 | #: builtin/notes.c:702 |
a0b6b246 | 15782 | msgid "failed to remove 'git notes merge' worktree" |
c1ac5258 | 15783 | msgstr "删除 'git notes merge' 工作区失败" |
a0b6b246 | 15784 | |
06991777 | 15785 | #: builtin/notes.c:722 |
a0b6b246 | 15786 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 15787 | msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 15788 | |
06991777 | 15789 | #: builtin/notes.c:724 |
a0b6b246 JX |
15790 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
15791 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
15792 | ||
06991777 | 15793 | #: builtin/notes.c:726 |
a0b6b246 JX |
15794 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
15795 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
15796 | ||
06991777 | 15797 | #: builtin/notes.c:739 |
a0b6b246 | 15798 | msgid "failed to resolve NOTES_MERGE_REF" |
c1ac5258 | 15799 | msgstr "解析 NOTES_MERGE_REF 失败" |
a0b6b246 | 15800 | |
06991777 | 15801 | #: builtin/notes.c:742 |
a0b6b246 JX |
15802 | msgid "failed to finalize notes merge" |
15803 | msgstr "无法完成注解合并" | |
15804 | ||
06991777 | 15805 | #: builtin/notes.c:768 |
5c57d762 JX |
15806 | #, c-format |
15807 | msgid "unknown notes merge strategy %s" | |
15808 | msgstr "未知的注解合并策略 %s" | |
15809 | ||
06991777 | 15810 | #: builtin/notes.c:784 |
ef317cd5 | 15811 | msgid "General options" |
07432cef | 15812 | msgstr "通用选项" |
ef317cd5 | 15813 | |
06991777 | 15814 | #: builtin/notes.c:786 |
ef317cd5 | 15815 | msgid "Merge options" |
07432cef | 15816 | msgstr "合并选项" |
ef317cd5 | 15817 | |
06991777 | 15818 | #: builtin/notes.c:788 |
ef317cd5 JX |
15819 | msgid "" |
15820 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
15821 | "cat_sort_uniq)" | |
07432cef | 15822 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 15823 | |
06991777 | 15824 | #: builtin/notes.c:790 |
ef317cd5 | 15825 | msgid "Committing unmerged notes" |
07432cef | 15826 | msgstr "提交未合并的注解" |
ef317cd5 | 15827 | |
06991777 | 15828 | #: builtin/notes.c:792 |
ef317cd5 | 15829 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 15830 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 15831 | |
06991777 | 15832 | #: builtin/notes.c:794 |
ef317cd5 | 15833 | msgid "Aborting notes merge resolution" |
07432cef | 15834 | msgstr "中止注解合并的方案" |
ef317cd5 | 15835 | |
06991777 | 15836 | #: builtin/notes.c:796 |
ef317cd5 | 15837 | msgid "abort notes merge" |
07432cef | 15838 | msgstr "中止注解合并" |
ef317cd5 | 15839 | |
06991777 | 15840 | #: builtin/notes.c:807 |
5c57d762 JX |
15841 | msgid "cannot mix --commit, --abort or -s/--strategy" |
15842 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
15843 | ||
06991777 | 15844 | #: builtin/notes.c:812 |
a0b6b246 | 15845 | msgid "must specify a notes ref to merge" |
9a4b694c | 15846 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 15847 | |
06991777 | 15848 | #: builtin/notes.c:836 |
5c57d762 | 15849 | #, c-format |
a0b6b246 | 15850 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
15851 | msgstr "未知的 -s/--strategy:%s" |
15852 | ||
06991777 | 15853 | #: builtin/notes.c:873 |
1b7f4a34 | 15854 | #, c-format |
a0b6b246 JX |
15855 | msgid "a notes merge into %s is already in-progress at %s" |
15856 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 15857 | |
06991777 | 15858 | #: builtin/notes.c:876 |
5c57d762 | 15859 | #, c-format |
a0b6b246 JX |
15860 | msgid "failed to store link to current notes ref (%s)" |
15861 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 15862 | |
06991777 | 15863 | #: builtin/notes.c:878 |
5c57d762 JX |
15864 | #, c-format |
15865 | msgid "" | |
15866 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
15867 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
15868 | "abort'.\n" | |
a0b6b246 JX |
15869 | msgstr "" |
15870 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
15871 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 15872 | |
a6cd2cc4 | 15873 | #: builtin/notes.c:897 builtin/tag.c:545 |
d46c5519 JX |
15874 | #, c-format |
15875 | msgid "Failed to resolve '%s' as a valid ref." | |
15876 | msgstr "无法解析 '%s' 为一个有效引用。" | |
15877 | ||
06991777 | 15878 | #: builtin/notes.c:900 |
ef317cd5 JX |
15879 | #, c-format |
15880 | msgid "Object %s has no note\n" | |
15881 | msgstr "对象 %s 没有注解\n" | |
15882 | ||
06991777 | 15883 | #: builtin/notes.c:912 |
ef317cd5 | 15884 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 15885 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 15886 | |
06991777 | 15887 | #: builtin/notes.c:915 |
ef317cd5 | 15888 | msgid "read object names from the standard input" |
07432cef | 15889 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 15890 | |
a5cd71ca | 15891 | #: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 |
5c57d762 JX |
15892 | msgid "do not remove, show only" |
15893 | msgstr "不删除,只显示" | |
15894 | ||
06991777 | 15895 | #: builtin/notes.c:955 |
5c57d762 JX |
15896 | msgid "report pruned notes" |
15897 | msgstr "报告清除的注解" | |
15898 | ||
06991777 | 15899 | #: builtin/notes.c:998 |
6c94aba5 | 15900 | msgid "notes-ref" |
07432cef | 15901 | msgstr "注解引用" |
ef317cd5 | 15902 | |
06991777 | 15903 | #: builtin/notes.c:999 |
814ff314 | 15904 | msgid "use notes from <notes-ref>" |
07432cef | 15905 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 15906 | |
a5cd71ca | 15907 | #: builtin/notes.c:1034 builtin/stash.c:1607 |
ef317cd5 | 15908 | #, c-format |
a0b6b246 | 15909 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
15910 | msgstr "未知子命令:%s" |
15911 | ||
d46c5519 | 15912 | #: builtin/pack-objects.c:52 |
1b7f4a34 JX |
15913 | msgid "" |
15914 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
15915 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 15916 | |
d46c5519 | 15917 | #: builtin/pack-objects.c:53 |
1b7f4a34 JX |
15918 | msgid "" |
15919 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 15920 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 15921 | |
a6cd2cc4 | 15922 | #: builtin/pack-objects.c:428 |
ef317cd5 | 15923 | #, c-format |
c1ac5258 JX |
15924 | msgid "bad packed object CRC for %s" |
15925 | msgstr "%s 错的包对象 CRC" | |
15926 | ||
a6cd2cc4 | 15927 | #: builtin/pack-objects.c:439 |
c1ac5258 JX |
15928 | #, c-format |
15929 | msgid "corrupt packed object for %s" | |
15930 | msgstr "%s 损坏的包对象" | |
15931 | ||
a6cd2cc4 | 15932 | #: builtin/pack-objects.c:570 |
c1ac5258 JX |
15933 | #, c-format |
15934 | msgid "recursive delta detected for object %s" | |
15935 | msgstr "发现对象 %s 递归 delta" | |
15936 | ||
a6cd2cc4 | 15937 | #: builtin/pack-objects.c:781 |
c1ac5258 JX |
15938 | #, c-format |
15939 | msgid "ordered %u objects, expected %<PRIu32>" | |
15940 | msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" | |
15941 | ||
a6cd2cc4 | 15942 | #: builtin/pack-objects.c:794 |
c1ac5258 JX |
15943 | #, c-format |
15944 | msgid "packfile is invalid: %s" | |
15945 | msgstr "无效的包文件:%s" | |
15946 | ||
a6cd2cc4 | 15947 | #: builtin/pack-objects.c:798 |
c1ac5258 JX |
15948 | #, c-format |
15949 | msgid "unable to open packfile for reuse: %s" | |
15950 | msgstr "无法为重用打开包文件:%s" | |
15951 | ||
a6cd2cc4 | 15952 | #: builtin/pack-objects.c:802 |
c1ac5258 JX |
15953 | msgid "unable to seek in reused packfile" |
15954 | msgstr "无法在重用的包文件中查找" | |
ef317cd5 | 15955 | |
a6cd2cc4 | 15956 | #: builtin/pack-objects.c:813 |
c1ac5258 JX |
15957 | msgid "unable to read from reused packfile" |
15958 | msgstr "无法读取索引文件" | |
15959 | ||
a6cd2cc4 | 15960 | #: builtin/pack-objects.c:841 |
5b04ee3b JX |
15961 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
15962 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
15963 | ||
a6cd2cc4 | 15964 | #: builtin/pack-objects.c:854 |
6c94aba5 JX |
15965 | msgid "Writing objects" |
15966 | msgstr "写入对象中" | |
15967 | ||
a6cd2cc4 | 15968 | #: builtin/pack-objects.c:917 builtin/update-index.c:89 |
c1ac5258 JX |
15969 | #, c-format |
15970 | msgid "failed to stat %s" | |
15971 | msgstr "对 %s 调用 stat 失败" | |
15972 | ||
a6cd2cc4 | 15973 | #: builtin/pack-objects.c:970 |
c1ac5258 JX |
15974 | #, c-format |
15975 | msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" | |
15976 | msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" | |
15977 | ||
a5cd71ca | 15978 | #: builtin/pack-objects.c:1164 |
6c94aba5 JX |
15979 | msgid "disabling bitmap writing, as some objects are not being packed" |
15980 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
15981 | ||
a5cd71ca | 15982 | #: builtin/pack-objects.c:1592 |
c1ac5258 JX |
15983 | #, c-format |
15984 | msgid "delta base offset overflow in pack for %s" | |
15985 | msgstr "%s 压缩中 delta 基准偏移越界" | |
15986 | ||
a5cd71ca | 15987 | #: builtin/pack-objects.c:1601 |
c1ac5258 JX |
15988 | #, c-format |
15989 | msgid "delta base offset out of bound for %s" | |
15990 | msgstr "%s 的 delta 基准偏移越界" | |
15991 | ||
a5cd71ca | 15992 | #: builtin/pack-objects.c:1870 |
fd8cb379 JX |
15993 | msgid "Counting objects" |
15994 | msgstr "对象计数中" | |
15995 | ||
a5cd71ca | 15996 | #: builtin/pack-objects.c:2000 |
fd8cb379 JX |
15997 | #, c-format |
15998 | msgid "unable to get size of %s" | |
15999 | msgstr "不能得到 %s 的大小" | |
16000 | ||
a5cd71ca | 16001 | #: builtin/pack-objects.c:2015 |
fd8cb379 JX |
16002 | #, c-format |
16003 | msgid "unable to parse object header of %s" | |
16004 | msgstr "无法解析对象 %s 头信息" | |
16005 | ||
a5cd71ca JX |
16006 | #: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 |
16007 | #: builtin/pack-objects.c:2111 | |
c1ac5258 JX |
16008 | #, c-format |
16009 | msgid "object %s cannot be read" | |
16010 | msgstr "对象 %s 无法读取" | |
16011 | ||
a5cd71ca | 16012 | #: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 |
c1ac5258 | 16013 | #, c-format |
4c27fcb5 JX |
16014 | msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" |
16015 | msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)" | |
c1ac5258 | 16016 | |
a5cd71ca | 16017 | #: builtin/pack-objects.c:2125 |
c1ac5258 JX |
16018 | msgid "suboptimal pack - out of memory" |
16019 | msgstr "次优(suboptimal)打包 - 内存不足" | |
16020 | ||
a5cd71ca | 16021 | #: builtin/pack-objects.c:2440 |
c1ac5258 JX |
16022 | #, c-format |
16023 | msgid "Delta compression using up to %d threads" | |
16024 | msgstr "使用 %d 个线程进行压缩" | |
16025 | ||
a5cd71ca | 16026 | #: builtin/pack-objects.c:2572 |
c1ac5258 JX |
16027 | #, c-format |
16028 | msgid "unable to pack objects reachable from tag %s" | |
16029 | msgstr "无法为标签 %s 压缩对象" | |
16030 | ||
a5cd71ca | 16031 | #: builtin/pack-objects.c:2659 |
6c94aba5 JX |
16032 | msgid "Compressing objects" |
16033 | msgstr "压缩对象中" | |
16034 | ||
a5cd71ca | 16035 | #: builtin/pack-objects.c:2665 |
c1ac5258 JX |
16036 | msgid "inconsistency with delta count" |
16037 | msgstr "不一致的差异计数" | |
16038 | ||
a5cd71ca | 16039 | #: builtin/pack-objects.c:2742 |
c1ac5258 JX |
16040 | #, c-format |
16041 | msgid "" | |
16042 | "expected edge object ID, got garbage:\n" | |
16043 | " %s" | |
16044 | msgstr "" | |
16045 | "预期边界对象(edge object)ID,却得到垃圾数据:\n" | |
16046 | " %s" | |
16047 | ||
a5cd71ca | 16048 | #: builtin/pack-objects.c:2748 |
c1ac5258 JX |
16049 | #, c-format |
16050 | msgid "" | |
16051 | "expected object ID, got garbage:\n" | |
16052 | " %s" | |
16053 | msgstr "" | |
16054 | "预期对象 ID,却得到垃圾数据:\n" | |
16055 | " %s" | |
16056 | ||
a5cd71ca | 16057 | #: builtin/pack-objects.c:2846 |
5809aa05 JX |
16058 | msgid "invalid value for --missing" |
16059 | msgstr "选项 --missing 的值无效" | |
16060 | ||
a5cd71ca | 16061 | #: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 |
c1ac5258 JX |
16062 | msgid "cannot open pack index" |
16063 | msgstr "无法打开包文件索引" | |
16064 | ||
a5cd71ca | 16065 | #: builtin/pack-objects.c:2936 |
c1ac5258 JX |
16066 | #, c-format |
16067 | msgid "loose object at %s could not be examined" | |
16068 | msgstr "无法检查 %s 处的松散对象" | |
16069 | ||
a5cd71ca | 16070 | #: builtin/pack-objects.c:3021 |
c1ac5258 JX |
16071 | msgid "unable to force loose object" |
16072 | msgstr "无法强制松散对象" | |
16073 | ||
a5cd71ca | 16074 | #: builtin/pack-objects.c:3113 |
c1ac5258 JX |
16075 | #, c-format |
16076 | msgid "not a rev '%s'" | |
16077 | msgstr "不是一个版本 '%s'" | |
16078 | ||
a5cd71ca | 16079 | #: builtin/pack-objects.c:3116 |
c1ac5258 JX |
16080 | #, c-format |
16081 | msgid "bad revision '%s'" | |
16082 | msgstr "坏的版本 '%s'" | |
16083 | ||
a5cd71ca | 16084 | #: builtin/pack-objects.c:3141 |
c1ac5258 JX |
16085 | msgid "unable to add recent objects" |
16086 | msgstr "无法添加最近的对象" | |
16087 | ||
a5cd71ca | 16088 | #: builtin/pack-objects.c:3194 |
ef317cd5 JX |
16089 | #, c-format |
16090 | msgid "unsupported index version %s" | |
16091 | msgstr "不支持的索引版本 %s" | |
16092 | ||
a5cd71ca | 16093 | #: builtin/pack-objects.c:3198 |
ef317cd5 JX |
16094 | #, c-format |
16095 | msgid "bad index version '%s'" | |
16096 | msgstr "坏的索引版本 '%s'" | |
16097 | ||
a5cd71ca | 16098 | #: builtin/pack-objects.c:3228 |
ef317cd5 | 16099 | msgid "do not show progress meter" |
07432cef | 16100 | msgstr "不显示进度表" |
ef317cd5 | 16101 | |
a5cd71ca | 16102 | #: builtin/pack-objects.c:3230 |
ef317cd5 | 16103 | msgid "show progress meter" |
07432cef | 16104 | msgstr "显示进度表" |
ef317cd5 | 16105 | |
a5cd71ca | 16106 | #: builtin/pack-objects.c:3232 |
ef317cd5 | 16107 | msgid "show progress meter during object writing phase" |
07432cef | 16108 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 16109 | |
a5cd71ca | 16110 | #: builtin/pack-objects.c:3235 |
ef317cd5 | 16111 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 16112 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 16113 | |
a5cd71ca | 16114 | #: builtin/pack-objects.c:3236 |
c1ac5258 JX |
16115 | msgid "<version>[,<offset>]" |
16116 | msgstr "<版本>[,<偏移>]" | |
ef317cd5 | 16117 | |
a5cd71ca | 16118 | #: builtin/pack-objects.c:3237 |
ef317cd5 | 16119 | msgid "write the pack index file in the specified idx format version" |
07432cef | 16120 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 16121 | |
a5cd71ca | 16122 | #: builtin/pack-objects.c:3240 |
ef317cd5 | 16123 | msgid "maximum size of each output pack file" |
07432cef | 16124 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 16125 | |
a5cd71ca | 16126 | #: builtin/pack-objects.c:3242 |
ef317cd5 | 16127 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 16128 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 16129 | |
a5cd71ca | 16130 | #: builtin/pack-objects.c:3244 |
ef317cd5 | 16131 | msgid "ignore packed objects" |
07432cef | 16132 | msgstr "忽略包对象" |
ef317cd5 | 16133 | |
a5cd71ca | 16134 | #: builtin/pack-objects.c:3246 |
ef317cd5 | 16135 | msgid "limit pack window by objects" |
07432cef | 16136 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 16137 | |
a5cd71ca | 16138 | #: builtin/pack-objects.c:3248 |
ef317cd5 | 16139 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 16140 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 16141 | |
a5cd71ca | 16142 | #: builtin/pack-objects.c:3250 |
ef317cd5 | 16143 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 16144 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 16145 | |
a5cd71ca | 16146 | #: builtin/pack-objects.c:3252 |
ef317cd5 | 16147 | msgid "reuse existing deltas" |
07432cef | 16148 | msgstr "重用已存在的 deltas" |
ef317cd5 | 16149 | |
a5cd71ca | 16150 | #: builtin/pack-objects.c:3254 |
ef317cd5 | 16151 | msgid "reuse existing objects" |
07432cef | 16152 | msgstr "重用已存在的对象" |
ef317cd5 | 16153 | |
a5cd71ca | 16154 | #: builtin/pack-objects.c:3256 |
ef317cd5 | 16155 | msgid "use OFS_DELTA objects" |
07432cef | 16156 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 16157 | |
a5cd71ca | 16158 | #: builtin/pack-objects.c:3258 |
ef317cd5 | 16159 | msgid "use threads when searching for best delta matches" |
07432cef | 16160 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 16161 | |
a5cd71ca | 16162 | #: builtin/pack-objects.c:3260 |
ef317cd5 | 16163 | msgid "do not create an empty pack output" |
07432cef | 16164 | msgstr "不创建空的包输出" |
ef317cd5 | 16165 | |
a5cd71ca | 16166 | #: builtin/pack-objects.c:3262 |
ef317cd5 | 16167 | msgid "read revision arguments from standard input" |
d9d56b23 | 16168 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 16169 | |
a5cd71ca | 16170 | #: builtin/pack-objects.c:3264 |
ef317cd5 | 16171 | msgid "limit the objects to those that are not yet packed" |
07432cef | 16172 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 16173 | |
a5cd71ca | 16174 | #: builtin/pack-objects.c:3267 |
ef317cd5 | 16175 | msgid "include objects reachable from any reference" |
07432cef | 16176 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 16177 | |
a5cd71ca | 16178 | #: builtin/pack-objects.c:3270 |
ef317cd5 | 16179 | msgid "include objects referred by reflog entries" |
07432cef | 16180 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 16181 | |
a5cd71ca | 16182 | #: builtin/pack-objects.c:3273 |
220c313c JX |
16183 | msgid "include objects referred to by the index" |
16184 | msgstr "包括被索引引用到的对象" | |
16185 | ||
a5cd71ca | 16186 | #: builtin/pack-objects.c:3276 |
ef317cd5 | 16187 | msgid "output pack to stdout" |
07432cef | 16188 | msgstr "输出包到标准输出" |
ef317cd5 | 16189 | |
a5cd71ca | 16190 | #: builtin/pack-objects.c:3278 |
ef317cd5 | 16191 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 16192 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 16193 | |
a5cd71ca | 16194 | #: builtin/pack-objects.c:3280 |
ef317cd5 | 16195 | msgid "keep unreachable objects" |
07432cef | 16196 | msgstr "维持不可达的对象" |
ef317cd5 | 16197 | |
a5cd71ca | 16198 | #: builtin/pack-objects.c:3282 |
5c57d762 JX |
16199 | msgid "pack loose unreachable objects" |
16200 | msgstr "打包松散的不可达对象" | |
16201 | ||
a5cd71ca | 16202 | #: builtin/pack-objects.c:3284 |
ef317cd5 | 16203 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 16204 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 16205 | |
a5cd71ca | 16206 | #: builtin/pack-objects.c:3287 |
06991777 JX |
16207 | msgid "use the sparse reachability algorithm" |
16208 | msgstr "使用稀疏可达性算法" | |
16209 | ||
a5cd71ca | 16210 | #: builtin/pack-objects.c:3289 |
ef317cd5 | 16211 | msgid "create thin packs" |
07432cef | 16212 | msgstr "创建精简包" |
ef317cd5 | 16213 | |
a5cd71ca | 16214 | #: builtin/pack-objects.c:3291 |
04cb2f28 | 16215 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 16216 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 16217 | |
a5cd71ca | 16218 | #: builtin/pack-objects.c:3293 |
ef317cd5 | 16219 | msgid "ignore packs that have companion .keep file" |
07432cef | 16220 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 16221 | |
a5cd71ca | 16222 | #: builtin/pack-objects.c:3295 |
fd8cb379 JX |
16223 | msgid "ignore this pack" |
16224 | msgstr "忽略该 pack" | |
16225 | ||
a5cd71ca | 16226 | #: builtin/pack-objects.c:3297 |
ef317cd5 | 16227 | msgid "pack compression level" |
07432cef | 16228 | msgstr "打包压缩级别" |
ef317cd5 | 16229 | |
a5cd71ca | 16230 | #: builtin/pack-objects.c:3299 |
ef317cd5 | 16231 | msgid "do not hide commits by grafts" |
fd8cb379 | 16232 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 16233 | |
a5cd71ca | 16234 | #: builtin/pack-objects.c:3301 |
6c94aba5 JX |
16235 | msgid "use a bitmap index if available to speed up counting objects" |
16236 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
16237 | ||
a5cd71ca | 16238 | #: builtin/pack-objects.c:3303 |
6c94aba5 JX |
16239 | msgid "write a bitmap index together with the pack index" |
16240 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
16241 | ||
a5cd71ca | 16242 | #: builtin/pack-objects.c:3307 |
a6cd2cc4 JX |
16243 | msgid "write a bitmap index if possible" |
16244 | msgstr "如果可能,写 bitmap 索引" | |
16245 | ||
a5cd71ca | 16246 | #: builtin/pack-objects.c:3311 |
5809aa05 JX |
16247 | msgid "handling for missing objects" |
16248 | msgstr "处理丢失的对象" | |
16249 | ||
a5cd71ca | 16250 | #: builtin/pack-objects.c:3314 |
31e5e17b JX |
16251 | msgid "do not pack objects in promisor packfiles" |
16252 | msgstr "不要打包 promisor 包文件中的对象" | |
16253 | ||
a5cd71ca | 16254 | #: builtin/pack-objects.c:3316 |
4c27fcb5 JX |
16255 | msgid "respect islands during delta compression" |
16256 | msgstr "在增量压缩时参考数据岛" | |
16257 | ||
a5cd71ca | 16258 | #: builtin/pack-objects.c:3345 |
fd8cb379 JX |
16259 | #, c-format |
16260 | msgid "delta chain depth %d is too deep, forcing %d" | |
16261 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
16262 | ||
a5cd71ca | 16263 | #: builtin/pack-objects.c:3350 |
fd8cb379 JX |
16264 | #, c-format |
16265 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
16266 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 16267 | |
a5cd71ca | 16268 | #: builtin/pack-objects.c:3404 |
c1ac5258 JX |
16269 | msgid "--max-pack-size cannot be used to build a pack for transfer" |
16270 | msgstr "不能使用 --max-pack-size 来构建传输用的包文件" | |
16271 | ||
a5cd71ca | 16272 | #: builtin/pack-objects.c:3406 |
c1ac5258 | 16273 | msgid "minimum pack size limit is 1 MiB" |
e640d114 | 16274 | msgstr "最小的包文件大小是 1 MiB" |
c1ac5258 | 16275 | |
a5cd71ca | 16276 | #: builtin/pack-objects.c:3411 |
c1ac5258 JX |
16277 | msgid "--thin cannot be used to build an indexable pack" |
16278 | msgstr "--thin 不能用于创建一个可索引包" | |
16279 | ||
a5cd71ca | 16280 | #: builtin/pack-objects.c:3414 |
c1ac5258 JX |
16281 | msgid "--keep-unreachable and --unpack-unreachable are incompatible" |
16282 | msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" | |
16283 | ||
a5cd71ca | 16284 | #: builtin/pack-objects.c:3420 |
c1ac5258 | 16285 | msgid "cannot use --filter without --stdout" |
e640d114 | 16286 | msgstr "不能在没有 --stdout 的情况下使用 --filter" |
c1ac5258 | 16287 | |
a5cd71ca | 16288 | #: builtin/pack-objects.c:3481 |
fd8cb379 JX |
16289 | msgid "Enumerating objects" |
16290 | msgstr "枚举对象" | |
16291 | ||
a5cd71ca | 16292 | #: builtin/pack-objects.c:3511 |
c1ac5258 JX |
16293 | #, c-format |
16294 | msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" | |
16295 | msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)" | |
16296 | ||
d46c5519 | 16297 | #: builtin/pack-refs.c:8 |
814ff314 JX |
16298 | msgid "git pack-refs [<options>]" |
16299 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 16300 | |
d46c5519 | 16301 | #: builtin/pack-refs.c:16 |
ef317cd5 | 16302 | msgid "pack everything" |
07432cef | 16303 | msgstr "打包一切" |
c04f5ac3 | 16304 | |
d46c5519 | 16305 | #: builtin/pack-refs.c:17 |
ef317cd5 | 16306 | msgid "prune loose refs (default)" |
07432cef | 16307 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 16308 | |
c1ac5258 | 16309 | #: builtin/prune-packed.c:9 |
814ff314 JX |
16310 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
16311 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 16312 | |
c1ac5258 | 16313 | #: builtin/prune-packed.c:42 |
6c94aba5 JX |
16314 | msgid "Removing duplicate objects" |
16315 | msgstr "正在删除重复对象" | |
16316 | ||
c1ac5258 | 16317 | #: builtin/prune.c:12 |
5809aa05 JX |
16318 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
16319 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 16320 | |
d46c5519 | 16321 | #: builtin/prune.c:131 |
1b7f4a34 JX |
16322 | msgid "report pruned objects" |
16323 | msgstr "报告清除的对象" | |
16324 | ||
d46c5519 | 16325 | #: builtin/prune.c:134 |
1b7f4a34 JX |
16326 | msgid "expire objects older than <time>" |
16327 | msgstr "使早于给定时间的对象过期" | |
16328 | ||
d46c5519 | 16329 | #: builtin/prune.c:136 |
31e5e17b JX |
16330 | msgid "limit traversal to objects outside promisor packfiles" |
16331 | msgstr "限制遍历 promisor 包以外的对象" | |
16332 | ||
d46c5519 | 16333 | #: builtin/prune.c:150 |
94550ed3 JX |
16334 | msgid "cannot prune in a precious-objects repo" |
16335 | msgstr "不能在珍品仓库中执行清理操作" | |
16336 | ||
d46c5519 | 16337 | #: builtin/pull.c:66 builtin/pull.c:68 |
a0b6b246 JX |
16338 | #, c-format |
16339 | msgid "Invalid value for %s: %s" | |
16340 | msgstr "%s 的值无效:%s" | |
16341 | ||
d46c5519 | 16342 | #: builtin/pull.c:88 |
94550ed3 | 16343 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
16344 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
16345 | ||
a5cd71ca | 16346 | #: builtin/pull.c:142 |
a4f16749 JX |
16347 | msgid "control for recursive fetching of submodules" |
16348 | msgstr "控制子模组的递归获取" | |
16349 | ||
a5cd71ca | 16350 | #: builtin/pull.c:146 |
1b7f4a34 JX |
16351 | msgid "Options related to merging" |
16352 | msgstr "和合并相关的选项" | |
16353 | ||
a5cd71ca | 16354 | #: builtin/pull.c:149 |
1b7f4a34 JX |
16355 | msgid "incorporate changes by rebasing rather than merging" |
16356 | msgstr "使用变基操作取代合并操作以合入修改" | |
16357 | ||
a5cd71ca | 16358 | #: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 |
1b7f4a34 JX |
16359 | msgid "allow fast-forward" |
16360 | msgstr "允许快进式" | |
16361 | ||
a5cd71ca | 16362 | #: builtin/pull.c:186 |
5b04ee3b | 16363 | msgid "automatically stash/stash pop before and after rebase" |
554e8501 | 16364 | msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
5b04ee3b | 16365 | |
a5cd71ca | 16366 | #: builtin/pull.c:202 |
1b7f4a34 JX |
16367 | msgid "Options related to fetching" |
16368 | msgstr "和获取相关的参数" | |
16369 | ||
a5cd71ca | 16370 | #: builtin/pull.c:212 |
4c27fcb5 JX |
16371 | msgid "force overwrite of local branch" |
16372 | msgstr "强制覆盖本地分支" | |
16373 | ||
a5cd71ca | 16374 | #: builtin/pull.c:220 |
276ceeaa JX |
16375 | msgid "number of submodules pulled in parallel" |
16376 | msgstr "并发拉取的子模组的数量" | |
16377 | ||
a5cd71ca | 16378 | #: builtin/pull.c:320 |
1b7f4a34 JX |
16379 | #, c-format |
16380 | msgid "Invalid value for pull.ff: %s" | |
16381 | msgstr "pull.ff 的取值无效:%s" | |
16382 | ||
a5cd71ca | 16383 | #: builtin/pull.c:437 |
1b7f4a34 JX |
16384 | msgid "" |
16385 | "There is no candidate for rebasing against among the refs that you just " | |
16386 | "fetched." | |
16387 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
16388 | ||
a5cd71ca | 16389 | #: builtin/pull.c:439 |
1b7f4a34 JX |
16390 | msgid "" |
16391 | "There are no candidates for merging among the refs that you just fetched." | |
16392 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
16393 | ||
a5cd71ca | 16394 | #: builtin/pull.c:440 |
1b7f4a34 JX |
16395 | msgid "" |
16396 | "Generally this means that you provided a wildcard refspec which had no\n" | |
16397 | "matches on the remote end." | |
16398 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
16399 | ||
a5cd71ca | 16400 | #: builtin/pull.c:443 |
1b7f4a34 JX |
16401 | #, c-format |
16402 | msgid "" | |
16403 | "You asked to pull from the remote '%s', but did not specify\n" | |
16404 | "a branch. Because this is not the default configured remote\n" | |
16405 | "for your current branch, you must specify a branch on the command line." | |
16406 | msgstr "" | |
16407 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
16408 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
16409 | ||
a5cd71ca | 16410 | #: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 |
1b7f4a34 JX |
16411 | msgid "You are not currently on a branch." |
16412 | msgstr "您当前不在一个分支上。" | |
16413 | ||
a5cd71ca | 16414 | #: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 |
1b7f4a34 JX |
16415 | msgid "Please specify which branch you want to rebase against." |
16416 | msgstr "请指定您要变基到哪一个分支。" | |
16417 | ||
a5cd71ca | 16418 | #: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 |
1b7f4a34 JX |
16419 | msgid "Please specify which branch you want to merge with." |
16420 | msgstr "请指定您要合并哪一个分支。" | |
16421 | ||
a5cd71ca | 16422 | #: builtin/pull.c:453 builtin/pull.c:468 |
1b7f4a34 JX |
16423 | msgid "See git-pull(1) for details." |
16424 | msgstr "详见 git-pull(1)。" | |
16425 | ||
a5cd71ca JX |
16426 | #: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 |
16427 | #: builtin/rebase.c:1353 git-parse-remote.sh:64 | |
5b04ee3b JX |
16428 | msgid "<remote>" |
16429 | msgstr "<远程>" | |
16430 | ||
a5cd71ca | 16431 | #: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 |
d46c5519 | 16432 | #: git-parse-remote.sh:65 |
5b04ee3b JX |
16433 | msgid "<branch>" |
16434 | msgstr "<分支>" | |
16435 | ||
a5cd71ca | 16436 | #: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 |
1b7f4a34 JX |
16437 | msgid "There is no tracking information for the current branch." |
16438 | msgstr "当前分支没有跟踪信息。" | |
16439 | ||
a5cd71ca | 16440 | #: builtin/pull.c:472 git-parse-remote.sh:95 |
1b7f4a34 | 16441 | msgid "" |
5b04ee3b JX |
16442 | "If you wish to set tracking information for this branch you can do so with:" |
16443 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 16444 | |
a5cd71ca | 16445 | #: builtin/pull.c:477 |
1b7f4a34 JX |
16446 | #, c-format |
16447 | msgid "" | |
16448 | "Your configuration specifies to merge with the ref '%s'\n" | |
16449 | "from the remote, but no such ref was fetched." | |
16450 | msgstr "" | |
16451 | "您的配置中指定要合并远程的引用 '%s',\n" | |
16452 | "但是没有获取到这个引用。" | |
7ac1c0ad | 16453 | |
a5cd71ca | 16454 | #: builtin/pull.c:587 |
4c27fcb5 JX |
16455 | #, c-format |
16456 | msgid "unable to access commit %s" | |
16457 | msgstr "无法访问提交 %s" | |
16458 | ||
a5cd71ca | 16459 | #: builtin/pull.c:867 |
5c57d762 JX |
16460 | msgid "ignoring --verify-signatures for rebase" |
16461 | msgstr "为变基操作忽略 --verify-signatures" | |
16462 | ||
a5cd71ca | 16463 | #: builtin/pull.c:922 |
5b04ee3b JX |
16464 | msgid "--[no-]autostash option is only valid with --rebase." |
16465 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
16466 | ||
a5cd71ca | 16467 | #: builtin/pull.c:930 |
1b7f4a34 JX |
16468 | msgid "Updating an unborn branch with changes added to the index." |
16469 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
16470 | ||
a5cd71ca | 16471 | #: builtin/pull.c:934 |
a0b6b246 JX |
16472 | msgid "pull with rebase" |
16473 | msgstr "变基式拉取" | |
16474 | ||
a5cd71ca | 16475 | #: builtin/pull.c:935 |
a0b6b246 | 16476 | msgid "please commit or stash them." |
554e8501 | 16477 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 16478 | |
a5cd71ca | 16479 | #: builtin/pull.c:960 |
1b7f4a34 JX |
16480 | #, c-format |
16481 | msgid "" | |
16482 | "fetch updated the current branch head.\n" | |
16483 | "fast-forwarding your working tree from\n" | |
16484 | "commit %s." | |
16485 | msgstr "" | |
16486 | "fetch 更新了当前的分支。快进您的工作区\n" | |
16487 | "至提交 %s。" | |
ef317cd5 | 16488 | |
a5cd71ca | 16489 | #: builtin/pull.c:966 |
1b7f4a34 JX |
16490 | #, c-format |
16491 | msgid "" | |
16492 | "Cannot fast-forward your working tree.\n" | |
16493 | "After making sure that you saved anything precious from\n" | |
16494 | "$ git diff %s\n" | |
16495 | "output, run\n" | |
16496 | "$ git reset --hard\n" | |
16497 | "to recover." | |
16498 | msgstr "" | |
16499 | "您当前的工作区无法执行快进操作。\n" | |
16500 | "首先执行如下命令:\n" | |
16501 | "$ git diff %s\n" | |
16502 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
16503 | "$ git reset --hard\n" | |
16504 | "恢复之前的状态。" | |
16505 | ||
a5cd71ca | 16506 | #: builtin/pull.c:981 |
1b7f4a34 JX |
16507 | msgid "Cannot merge multiple branches into empty head." |
16508 | msgstr "无法将多个分支合并到空分支。" | |
16509 | ||
a5cd71ca | 16510 | #: builtin/pull.c:985 |
1b7f4a34 JX |
16511 | msgid "Cannot rebase onto multiple branches." |
16512 | msgstr "无法变基到多个分支。" | |
16513 | ||
a5cd71ca | 16514 | #: builtin/pull.c:992 |
a4f16749 JX |
16515 | msgid "cannot rebase with locally recorded submodule modifications" |
16516 | msgstr "本地子模组中有修改,无法变基" | |
16517 | ||
fd8cb379 | 16518 | #: builtin/push.c:19 |
ef317cd5 | 16519 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 16520 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 16521 | |
fd8cb379 | 16522 | #: builtin/push.c:111 |
c04f5ac3 | 16523 | msgid "tag shorthand without <tag>" |
55a16ee4 | 16524 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 16525 | |
fd8cb379 | 16526 | #: builtin/push.c:121 |
c04f5ac3 | 16527 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 16528 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 16529 | |
06991777 | 16530 | #: builtin/push.c:167 |
8ada9598 JX |
16531 | msgid "" |
16532 | "\n" | |
16533 | "To choose either option permanently, see push.default in 'git help config'." | |
16534 | msgstr "" | |
81809b99 JX |
16535 | "\n" |
16536 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 16537 | |
06991777 | 16538 | #: builtin/push.c:170 |
8ada9598 JX |
16539 | #, c-format |
16540 | msgid "" | |
16541 | "The upstream branch of your current branch does not match\n" | |
16542 | "the name of your current branch. To push to the upstream branch\n" | |
16543 | "on the remote, use\n" | |
16544 | "\n" | |
16545 | " git push %s HEAD:%s\n" | |
16546 | "\n" | |
16547 | "To push to the branch of the same name on the remote, use\n" | |
16548 | "\n" | |
4c27fcb5 | 16549 | " git push %s HEAD\n" |
8ada9598 JX |
16550 | "%s" |
16551 | msgstr "" | |
4c27fcb5 JX |
16552 | "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n" |
16553 | "使用\n" | |
81809b99 JX |
16554 | "\n" |
16555 | " git push %s HEAD:%s\n" | |
16556 | "\n" | |
16557 | "为推送至远程同名分支,使用\n" | |
16558 | "\n" | |
4c27fcb5 | 16559 | " git push %s HEAD\n" |
81809b99 | 16560 | "%s" |
8ada9598 | 16561 | |
06991777 | 16562 | #: builtin/push.c:185 |
c04f5ac3 JX |
16563 | #, c-format |
16564 | msgid "" | |
16565 | "You are not currently on a branch.\n" | |
16566 | "To push the history leading to the current (detached HEAD)\n" | |
16567 | "state now, use\n" | |
16568 | "\n" | |
16569 | " git push %s HEAD:<name-of-remote-branch>\n" | |
16570 | msgstr "" | |
16571 | "您当前不在一个分支上。\n" | |
90e6ef53 | 16572 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 16573 | "\n" |
d9d56b23 | 16574 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 16575 | |
06991777 | 16576 | #: builtin/push.c:199 |
c04f5ac3 JX |
16577 | #, c-format |
16578 | msgid "" | |
16579 | "The current branch %s has no upstream branch.\n" | |
16580 | "To push the current branch and set the remote as upstream, use\n" | |
16581 | "\n" | |
16582 | " git push --set-upstream %s %s\n" | |
16583 | msgstr "" | |
16584 | "当前分支 %s 没有对应的上游分支。\n" | |
16585 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
16586 | "\n" | |
16587 | " git push --set-upstream %s %s\n" | |
16588 | ||
06991777 | 16589 | #: builtin/push.c:207 |
c04f5ac3 JX |
16590 | #, c-format |
16591 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
16592 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
16593 | ||
06991777 | 16594 | #: builtin/push.c:210 |
73a60cd2 JX |
16595 | #, c-format |
16596 | msgid "" | |
16597 | "You are pushing to remote '%s', which is not the upstream of\n" | |
16598 | "your current branch '%s', without telling me what to push\n" | |
16599 | "to update which remote branch." | |
16600 | msgstr "" | |
16601 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
16602 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
16603 | ||
06991777 | 16604 | #: builtin/push.c:269 |
c04f5ac3 JX |
16605 | msgid "" |
16606 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 16607 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 16608 | |
06991777 | 16609 | #: builtin/push.c:276 |
170e9899 JX |
16610 | msgid "" |
16611 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
16612 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
16613 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
16614 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
16615 | msgstr "" | |
eff6d3a9 | 16616 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 16617 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 16618 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 16619 | |
06991777 | 16620 | #: builtin/push.c:282 |
170e9899 JX |
16621 | msgid "" |
16622 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
16623 | "counterpart. Check out this branch and integrate the remote changes\n" |
16624 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
16625 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
16626 | msgstr "" | |
eff6d3a9 | 16627 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 16628 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 16629 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 16630 | |
06991777 | 16631 | #: builtin/push.c:288 |
07432cef | 16632 | msgid "" |
a77c07d9 JX |
16633 | "Updates were rejected because the remote contains work that you do\n" |
16634 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
16635 | "to the same ref. You may want to first integrate the remote changes\n" |
16636 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
16637 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
16638 | msgstr "" | |
160fb2b2 JX |
16639 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
16640 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 16641 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
16642 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
16643 | ||
06991777 | 16644 | #: builtin/push.c:295 |
a77c07d9 | 16645 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 16646 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 16647 | |
06991777 | 16648 | #: builtin/push.c:298 |
a77c07d9 JX |
16649 | msgid "" |
16650 | "You cannot update a remote ref that points at a non-commit object,\n" | |
16651 | "or update a remote ref to make it point at a non-commit object,\n" | |
16652 | "without using the '--force' option.\n" | |
16653 | msgstr "" | |
16654 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
16655 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 16656 | |
06991777 | 16657 | #: builtin/push.c:359 |
c04f5ac3 JX |
16658 | #, c-format |
16659 | msgid "Pushing to %s\n" | |
16660 | msgstr "推送到 %s\n" | |
16661 | ||
a5cd71ca | 16662 | #: builtin/push.c:366 |
c04f5ac3 JX |
16663 | #, c-format |
16664 | msgid "failed to push some refs to '%s'" | |
c1ac5258 | 16665 | msgstr "推送一些引用到 '%s' 失败" |
c04f5ac3 | 16666 | |
a5cd71ca | 16667 | #: builtin/push.c:541 |
ef317cd5 | 16668 | msgid "repository" |
160fb2b2 | 16669 | msgstr "仓库" |
ef317cd5 | 16670 | |
a5cd71ca | 16671 | #: builtin/push.c:542 builtin/send-pack.c:164 |
ef317cd5 | 16672 | msgid "push all refs" |
07432cef | 16673 | msgstr "推送所有引用" |
ef317cd5 | 16674 | |
a5cd71ca | 16675 | #: builtin/push.c:543 builtin/send-pack.c:166 |
ef317cd5 | 16676 | msgid "mirror all refs" |
07432cef | 16677 | msgstr "镜像所有引用" |
ef317cd5 | 16678 | |
a5cd71ca | 16679 | #: builtin/push.c:545 |
ef317cd5 | 16680 | msgid "delete refs" |
07432cef | 16681 | msgstr "删除引用" |
ef317cd5 | 16682 | |
a5cd71ca | 16683 | #: builtin/push.c:546 |
ef317cd5 | 16684 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 16685 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 16686 | |
a5cd71ca | 16687 | #: builtin/push.c:549 builtin/send-pack.c:167 |
ef317cd5 JX |
16688 | msgid "force updates" |
16689 | msgstr "强制更新" | |
16690 | ||
a5cd71ca | 16691 | #: builtin/push.c:551 builtin/send-pack.c:181 |
c1ac5258 JX |
16692 | msgid "<refname>:<expect>" |
16693 | msgstr "<引用名>:<期望值>" | |
90314792 | 16694 | |
a5cd71ca | 16695 | #: builtin/push.c:552 builtin/send-pack.c:182 |
90314792 JX |
16696 | msgid "require old value of ref to be at this value" |
16697 | msgstr "要求引用旧的取值为设定值" | |
16698 | ||
a5cd71ca | 16699 | #: builtin/push.c:555 |
ef317cd5 | 16700 | msgid "control recursive pushing of submodules" |
07432cef | 16701 | msgstr "控制子模组的递归推送" |
ef317cd5 | 16702 | |
a5cd71ca | 16703 | #: builtin/push.c:557 builtin/send-pack.c:175 |
ef317cd5 | 16704 | msgid "use thin pack" |
07432cef | 16705 | msgstr "使用精简打包" |
ef317cd5 | 16706 | |
a5cd71ca | 16707 | #: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 |
fd8cb379 | 16708 | #: builtin/send-pack.c:162 |
ef317cd5 | 16709 | msgid "receive pack program" |
07432cef | 16710 | msgstr "接收包程序" |
ef317cd5 | 16711 | |
a5cd71ca | 16712 | #: builtin/push.c:560 |
ef317cd5 | 16713 | msgid "set upstream for git pull/status" |
07432cef | 16714 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 16715 | |
a5cd71ca | 16716 | #: builtin/push.c:563 |
ef317cd5 | 16717 | msgid "prune locally removed refs" |
07432cef | 16718 | msgstr "清除本地删除的引用" |
ef317cd5 | 16719 | |
a5cd71ca | 16720 | #: builtin/push.c:565 |
a77c07d9 JX |
16721 | msgid "bypass pre-push hook" |
16722 | msgstr "绕过 pre-push 钩子" | |
16723 | ||
a5cd71ca | 16724 | #: builtin/push.c:566 |
1003b3a5 | 16725 | msgid "push missing but relevant tags" |
55a16ee4 | 16726 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 16727 | |
a5cd71ca | 16728 | #: builtin/push.c:569 builtin/send-pack.c:169 |
220c313c JX |
16729 | msgid "GPG sign the push" |
16730 | msgstr "用 GPG 为推送签名" | |
16731 | ||
a5cd71ca | 16732 | #: builtin/push.c:571 builtin/send-pack.c:176 |
814ff314 JX |
16733 | msgid "request atomic transaction on remote side" |
16734 | msgstr "需要远端支持原子事务" | |
16735 | ||
a5cd71ca | 16736 | #: builtin/push.c:589 |
c04f5ac3 JX |
16737 | msgid "--delete is incompatible with --all, --mirror and --tags" |
16738 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
16739 | ||
a5cd71ca | 16740 | #: builtin/push.c:591 |
c04f5ac3 JX |
16741 | msgid "--delete doesn't make sense without any refs" |
16742 | msgstr "--delete 未接任何引用没有意义" | |
16743 | ||
a5cd71ca JX |
16744 | #: builtin/push.c:611 |
16745 | #, c-format | |
16746 | msgid "bad repository '%s'" | |
16747 | msgstr "坏的仓库 '%s'" | |
16748 | ||
16749 | #: builtin/push.c:612 | |
16750 | msgid "" | |
16751 | "No configured push destination.\n" | |
16752 | "Either specify the URL from the command-line or configure a remote " | |
16753 | "repository using\n" | |
16754 | "\n" | |
16755 | " git remote add <name> <url>\n" | |
16756 | "\n" | |
16757 | "and then push using the remote name\n" | |
16758 | "\n" | |
16759 | " git push <name>\n" | |
16760 | msgstr "" | |
16761 | "没有配置推送目标。\n" | |
16762 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" | |
16763 | "\n" | |
16764 | " git remote add <名称> <地址>\n" | |
16765 | "\n" | |
16766 | "然后使用该远程仓库名执行推送\n" | |
16767 | "\n" | |
16768 | " git push <名称>\n" | |
16769 | ||
16770 | #: builtin/push.c:627 | |
fd8cb379 JX |
16771 | msgid "--all and --tags are incompatible" |
16772 | msgstr "--all 和 --tags 不兼容" | |
16773 | ||
a5cd71ca | 16774 | #: builtin/push.c:629 |
fd8cb379 JX |
16775 | msgid "--all can't be combined with refspecs" |
16776 | msgstr "--all 不能和引用规格同时使用" | |
16777 | ||
a5cd71ca | 16778 | #: builtin/push.c:633 |
fd8cb379 JX |
16779 | msgid "--mirror and --tags are incompatible" |
16780 | msgstr "--mirror 和 --tags 不兼容" | |
16781 | ||
a5cd71ca | 16782 | #: builtin/push.c:635 |
fd8cb379 JX |
16783 | msgid "--mirror can't be combined with refspecs" |
16784 | msgstr "--mirror 不能和引用规格同时使用" | |
16785 | ||
a5cd71ca | 16786 | #: builtin/push.c:638 |
fd8cb379 JX |
16787 | msgid "--all and --mirror are incompatible" |
16788 | msgstr "--all 和 --mirror 不兼容" | |
16789 | ||
a5cd71ca | 16790 | #: builtin/push.c:642 |
5c57d762 JX |
16791 | msgid "push options must not have new line characters" |
16792 | msgstr "推送选项不能有换行符" | |
16793 | ||
c1ac5258 JX |
16794 | #: builtin/range-diff.c:8 |
16795 | msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
16796 | msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
16797 | ||
16798 | #: builtin/range-diff.c:9 | |
16799 | msgid "git range-diff [<options>] <old-tip>...<new-tip>" | |
16800 | msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" | |
16801 | ||
16802 | #: builtin/range-diff.c:10 | |
16803 | msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" | |
16804 | msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" | |
16805 | ||
4c27fcb5 | 16806 | #: builtin/range-diff.c:21 |
c1ac5258 JX |
16807 | msgid "Percentage by which creation is weighted" |
16808 | msgstr "创建权重的百分比" | |
16809 | ||
4c27fcb5 | 16810 | #: builtin/range-diff.c:23 |
c1ac5258 JX |
16811 | msgid "use simple diff colors" |
16812 | msgstr "使用简单差异颜色" | |
16813 | ||
d46c5519 | 16814 | #: builtin/range-diff.c:46 builtin/range-diff.c:50 |
c1ac5258 JX |
16815 | #, c-format |
16816 | msgid "no .. in range: '%s'" | |
16817 | msgstr "没有在范围中使用 ..:'%s'" | |
16818 | ||
d46c5519 | 16819 | #: builtin/range-diff.c:60 |
c1ac5258 JX |
16820 | msgid "single arg format must be symmetric range" |
16821 | msgstr "单个参数格式必须是对称范围(即包含...)" | |
16822 | ||
d46c5519 | 16823 | #: builtin/range-diff.c:75 |
c1ac5258 JX |
16824 | msgid "need two commit ranges" |
16825 | msgstr "需要两个提交范围" | |
16826 | ||
06991777 | 16827 | #: builtin/read-tree.c:41 |
ef317cd5 | 16828 | msgid "" |
1b7f4a34 | 16829 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
16830 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
16831 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
16832 | msgstr "" | |
1b7f4a34 | 16833 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 16834 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 16835 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 16836 | |
06991777 | 16837 | #: builtin/read-tree.c:124 |
ef317cd5 | 16838 | msgid "write resulting index to <file>" |
d9d56b23 | 16839 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 16840 | |
06991777 | 16841 | #: builtin/read-tree.c:127 |
ef317cd5 | 16842 | msgid "only empty the index" |
07432cef | 16843 | msgstr "只是清空索引" |
ef317cd5 | 16844 | |
06991777 | 16845 | #: builtin/read-tree.c:129 |
ef317cd5 | 16846 | msgid "Merging" |
07432cef | 16847 | msgstr "合并" |
ef317cd5 | 16848 | |
06991777 | 16849 | #: builtin/read-tree.c:131 |
ef317cd5 | 16850 | msgid "perform a merge in addition to a read" |
07432cef | 16851 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 16852 | |
06991777 | 16853 | #: builtin/read-tree.c:133 |
ef317cd5 | 16854 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 16855 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 16856 | |
06991777 | 16857 | #: builtin/read-tree.c:135 |
ef317cd5 | 16858 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 16859 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 16860 | |
06991777 | 16861 | #: builtin/read-tree.c:137 |
ef317cd5 | 16862 | msgid "same as -m, but discard unmerged entries" |
07432cef | 16863 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 16864 | |
06991777 | 16865 | #: builtin/read-tree.c:138 |
ef317cd5 | 16866 | msgid "<subdirectory>/" |
07432cef | 16867 | msgstr "<子目录>/" |
ef317cd5 | 16868 | |
06991777 | 16869 | #: builtin/read-tree.c:139 |
ef317cd5 | 16870 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 16871 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 16872 | |
06991777 | 16873 | #: builtin/read-tree.c:142 |
ef317cd5 | 16874 | msgid "update working tree with merge result" |
07432cef | 16875 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 16876 | |
06991777 | 16877 | #: builtin/read-tree.c:144 |
ef317cd5 | 16878 | msgid "gitignore" |
07432cef | 16879 | msgstr "gitignore" |
ef317cd5 | 16880 | |
06991777 | 16881 | #: builtin/read-tree.c:145 |
ef317cd5 | 16882 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 16883 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 16884 | |
06991777 | 16885 | #: builtin/read-tree.c:148 |
ef317cd5 | 16886 | msgid "don't check the working tree after merging" |
07432cef | 16887 | msgstr "合并后不检查工作区" |
ef317cd5 | 16888 | |
06991777 | 16889 | #: builtin/read-tree.c:149 |
ef317cd5 | 16890 | msgid "don't update the index or the work tree" |
07432cef | 16891 | msgstr "不更新索引区和工作区" |
ef317cd5 | 16892 | |
06991777 | 16893 | #: builtin/read-tree.c:151 |
ef317cd5 | 16894 | msgid "skip applying sparse checkout filter" |
07432cef | 16895 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 16896 | |
06991777 | 16897 | #: builtin/read-tree.c:153 |
ef317cd5 | 16898 | msgid "debug unpack-trees" |
07432cef | 16899 | msgstr "调试 unpack-trees" |
ef317cd5 | 16900 | |
d46c5519 JX |
16901 | #: builtin/read-tree.c:157 |
16902 | msgid "suppress feedback messages" | |
16903 | msgstr "抑制反馈信息" | |
16904 | ||
16905 | #: builtin/rebase.c:32 | |
4c27fcb5 | 16906 | msgid "" |
a5cd71ca JX |
16907 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " |
16908 | "[<upstream> [<branch>]]" | |
16909 | msgstr "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<上游> [<分支>]]" | |
4c27fcb5 | 16910 | |
d46c5519 | 16911 | #: builtin/rebase.c:34 |
4c27fcb5 JX |
16912 | msgid "" |
16913 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" | |
16914 | msgstr "" | |
16915 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" | |
16916 | ||
d46c5519 | 16917 | #: builtin/rebase.c:36 |
4c27fcb5 JX |
16918 | msgid "git rebase --continue | --abort | --skip | --edit-todo" |
16919 | msgstr "git rebase --continue | --abort | --skip | --edit-todo" | |
16920 | ||
d46c5519 JX |
16921 | #: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 |
16922 | #, c-format | |
16923 | msgid "unusable todo list: '%s'" | |
16924 | msgstr "不可用的待办列表:'%s'" | |
16925 | ||
16926 | #: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 | |
16927 | #, c-format | |
16928 | msgid "could not write '%s'." | |
16929 | msgstr "不能写入 '%s'。" | |
16930 | ||
16931 | #: builtin/rebase.c:252 | |
16932 | msgid "no HEAD?" | |
16933 | msgstr "没有 HEAD?" | |
16934 | ||
16935 | #: builtin/rebase.c:279 | |
16936 | #, c-format | |
16937 | msgid "could not create temporary %s" | |
16938 | msgstr "无法创建临时的 %s" | |
16939 | ||
16940 | #: builtin/rebase.c:285 | |
16941 | msgid "could not mark as interactive" | |
16942 | msgstr "无法标记为交互式" | |
16943 | ||
16944 | #: builtin/rebase.c:343 | |
16945 | msgid "could not generate todo list" | |
16946 | msgstr "无法生成待办列表" | |
16947 | ||
a5cd71ca | 16948 | #: builtin/rebase.c:383 |
d46c5519 JX |
16949 | msgid "a base commit must be provided with --upstream or --onto" |
16950 | msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" | |
16951 | ||
a5cd71ca | 16952 | #: builtin/rebase.c:438 |
d46c5519 JX |
16953 | msgid "git rebase--interactive [<options>]" |
16954 | msgstr "git rebase--interactive [<选项>]" | |
16955 | ||
a5cd71ca | 16956 | #: builtin/rebase.c:450 |
d46c5519 JX |
16957 | msgid "keep empty commits" |
16958 | msgstr "保持空提交" | |
16959 | ||
a5cd71ca | 16960 | #: builtin/rebase.c:452 builtin/revert.c:128 |
d46c5519 JX |
16961 | msgid "allow commits with empty messages" |
16962 | msgstr "允许提交说明为空" | |
16963 | ||
a5cd71ca | 16964 | #: builtin/rebase.c:453 |
d46c5519 JX |
16965 | msgid "rebase merge commits" |
16966 | msgstr "对合并提交变基" | |
16967 | ||
a5cd71ca | 16968 | #: builtin/rebase.c:455 |
d46c5519 JX |
16969 | msgid "keep original branch points of cousins" |
16970 | msgstr "保持兄弟提交的原始分支点" | |
16971 | ||
a5cd71ca | 16972 | #: builtin/rebase.c:457 |
d46c5519 JX |
16973 | msgid "move commits that begin with squash!/fixup!" |
16974 | msgstr "移动以 squash!/fixup! 开头的提交" | |
16975 | ||
a5cd71ca | 16976 | #: builtin/rebase.c:458 |
d46c5519 JX |
16977 | msgid "sign commits" |
16978 | msgstr "签名提交" | |
16979 | ||
a5cd71ca | 16980 | #: builtin/rebase.c:460 builtin/rebase.c:1427 |
d46c5519 | 16981 | msgid "display a diffstat of what changed upstream" |
5b533632 | 16982 | msgstr "显示上游变化的差异统计" |
d46c5519 | 16983 | |
a5cd71ca | 16984 | #: builtin/rebase.c:462 |
d46c5519 JX |
16985 | msgid "continue rebase" |
16986 | msgstr "继续变基" | |
16987 | ||
a5cd71ca | 16988 | #: builtin/rebase.c:464 |
d46c5519 JX |
16989 | msgid "skip commit" |
16990 | msgstr "跳过提交" | |
16991 | ||
a5cd71ca | 16992 | #: builtin/rebase.c:465 |
d46c5519 JX |
16993 | msgid "edit the todo list" |
16994 | msgstr "变基待办列表" | |
16995 | ||
a5cd71ca | 16996 | #: builtin/rebase.c:467 |
d46c5519 JX |
16997 | msgid "show the current patch" |
16998 | msgstr "显示当前补丁" | |
16999 | ||
a5cd71ca | 17000 | #: builtin/rebase.c:470 |
d46c5519 JX |
17001 | msgid "shorten commit ids in the todo list" |
17002 | msgstr "缩短待办列表中的提交号" | |
17003 | ||
a5cd71ca | 17004 | #: builtin/rebase.c:472 |
d46c5519 JX |
17005 | msgid "expand commit ids in the todo list" |
17006 | msgstr "扩展待办列表中的提交号" | |
17007 | ||
a5cd71ca | 17008 | #: builtin/rebase.c:474 |
d46c5519 JX |
17009 | msgid "check the todo list" |
17010 | msgstr "检查待办列表" | |
17011 | ||
a5cd71ca | 17012 | #: builtin/rebase.c:476 |
d46c5519 JX |
17013 | msgid "rearrange fixup/squash lines" |
17014 | msgstr "重新排列 fixup/squash 行" | |
17015 | ||
a5cd71ca | 17016 | #: builtin/rebase.c:478 |
d46c5519 JX |
17017 | msgid "insert exec commands in todo list" |
17018 | msgstr "在待办列表中插入 exec 执行命令" | |
17019 | ||
a5cd71ca | 17020 | #: builtin/rebase.c:479 |
d46c5519 JX |
17021 | msgid "onto" |
17022 | msgstr "onto" | |
17023 | ||
a5cd71ca | 17024 | #: builtin/rebase.c:482 |
d46c5519 JX |
17025 | msgid "restrict-revision" |
17026 | msgstr "restrict-revision" | |
17027 | ||
a5cd71ca | 17028 | #: builtin/rebase.c:482 |
d46c5519 JX |
17029 | msgid "restrict revision" |
17030 | msgstr "限制版本" | |
17031 | ||
a5cd71ca | 17032 | #: builtin/rebase.c:484 |
d46c5519 JX |
17033 | msgid "squash-onto" |
17034 | msgstr "squash-onto" | |
17035 | ||
a5cd71ca | 17036 | #: builtin/rebase.c:485 |
d46c5519 JX |
17037 | msgid "squash onto" |
17038 | msgstr "squash onto" | |
17039 | ||
a5cd71ca | 17040 | #: builtin/rebase.c:487 |
d46c5519 JX |
17041 | msgid "the upstream commit" |
17042 | msgstr "上游提交" | |
17043 | ||
a5cd71ca | 17044 | #: builtin/rebase.c:489 |
d46c5519 JX |
17045 | msgid "head-name" |
17046 | msgstr "head-name" | |
17047 | ||
a5cd71ca | 17048 | #: builtin/rebase.c:489 |
d46c5519 JX |
17049 | msgid "head name" |
17050 | msgstr "head 名称" | |
17051 | ||
a5cd71ca | 17052 | #: builtin/rebase.c:494 |
d46c5519 JX |
17053 | msgid "rebase strategy" |
17054 | msgstr "变基策略" | |
17055 | ||
a5cd71ca | 17056 | #: builtin/rebase.c:495 |
d46c5519 JX |
17057 | msgid "strategy-opts" |
17058 | msgstr "strategy-opts" | |
17059 | ||
a5cd71ca | 17060 | #: builtin/rebase.c:496 |
d46c5519 JX |
17061 | msgid "strategy options" |
17062 | msgstr "策略选项" | |
17063 | ||
a5cd71ca | 17064 | #: builtin/rebase.c:497 |
d46c5519 JX |
17065 | msgid "switch-to" |
17066 | msgstr "切换到" | |
17067 | ||
a5cd71ca | 17068 | #: builtin/rebase.c:498 |
d46c5519 JX |
17069 | msgid "the branch or commit to checkout" |
17070 | msgstr "要检出的分支或提交" | |
17071 | ||
a5cd71ca | 17072 | #: builtin/rebase.c:499 |
d46c5519 JX |
17073 | msgid "onto-name" |
17074 | msgstr "onto-name" | |
17075 | ||
a5cd71ca | 17076 | #: builtin/rebase.c:499 |
d46c5519 JX |
17077 | msgid "onto name" |
17078 | msgstr "onto name" | |
17079 | ||
a5cd71ca | 17080 | #: builtin/rebase.c:500 |
d46c5519 JX |
17081 | msgid "cmd" |
17082 | msgstr "cmd" | |
17083 | ||
a5cd71ca | 17084 | #: builtin/rebase.c:500 |
d46c5519 JX |
17085 | msgid "the command to run" |
17086 | msgstr "要执行的命令" | |
17087 | ||
a5cd71ca | 17088 | #: builtin/rebase.c:503 builtin/rebase.c:1510 |
d46c5519 JX |
17089 | msgid "automatically re-schedule any `exec` that fails" |
17090 | msgstr "自动重新安排任何失败的 `exec`" | |
17091 | ||
a5cd71ca | 17092 | #: builtin/rebase.c:519 |
d46c5519 JX |
17093 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" |
17094 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
17095 | ||
a5cd71ca | 17096 | #: builtin/rebase.c:535 |
4c27fcb5 JX |
17097 | #, c-format |
17098 | msgid "%s requires an interactive rebase" | |
17099 | msgstr "%s 需要交互式变基" | |
17100 | ||
a5cd71ca | 17101 | #: builtin/rebase.c:587 |
4c27fcb5 JX |
17102 | #, c-format |
17103 | msgid "could not get 'onto': '%s'" | |
17104 | msgstr "无法获取 'onto':'%s'" | |
17105 | ||
a5cd71ca | 17106 | #: builtin/rebase.c:602 |
4c27fcb5 JX |
17107 | #, c-format |
17108 | msgid "invalid orig-head: '%s'" | |
17109 | msgstr "无效的原始 head:'%s'" | |
17110 | ||
a5cd71ca | 17111 | #: builtin/rebase.c:627 |
4c27fcb5 JX |
17112 | #, c-format |
17113 | msgid "ignoring invalid allow_rerere_autoupdate: '%s'" | |
17114 | msgstr "忽略无效的 allow_rerere_autoupdate:'%s'" | |
17115 | ||
a5cd71ca | 17116 | #: builtin/rebase.c:703 |
4c27fcb5 JX |
17117 | #, c-format |
17118 | msgid "Could not read '%s'" | |
17119 | msgstr "不能读取 '%s'" | |
17120 | ||
a5cd71ca | 17121 | #: builtin/rebase.c:721 |
4c27fcb5 JX |
17122 | #, c-format |
17123 | msgid "Cannot store %s" | |
17124 | msgstr "不能存储 %s" | |
17125 | ||
a5cd71ca | 17126 | #: builtin/rebase.c:828 |
06991777 JX |
17127 | msgid "could not determine HEAD revision" |
17128 | msgstr "不能确定 HEAD 版本" | |
17129 | ||
a5cd71ca | 17130 | #: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 |
4c27fcb5 JX |
17131 | msgid "" |
17132 | "Resolve all conflicts manually, mark them as resolved with\n" | |
17133 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
17134 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
17135 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
17136 | "abort\"." | |
17137 | msgstr "" | |
17138 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" | |
17139 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" | |
17140 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
17141 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
17142 | ||
a5cd71ca | 17143 | #: builtin/rebase.c:1032 |
06991777 JX |
17144 | #, c-format |
17145 | msgid "" | |
17146 | "\n" | |
17147 | "git encountered an error while preparing the patches to replay\n" | |
17148 | "these revisions:\n" | |
17149 | "\n" | |
17150 | " %s\n" | |
17151 | "\n" | |
17152 | "As a result, git cannot rebase them." | |
17153 | msgstr "" | |
17154 | "\n" | |
17155 | "在为重放这些版本而准备补丁时,git 遇到了一个错误:\n" | |
17156 | "\n" | |
17157 | " %s\n" | |
17158 | "\n" | |
17159 | "因此 git 无法对其变基。" | |
4c27fcb5 | 17160 | |
a5cd71ca | 17161 | #: builtin/rebase.c:1339 |
4c27fcb5 JX |
17162 | #, c-format |
17163 | msgid "" | |
17164 | "%s\n" | |
17165 | "Please specify which branch you want to rebase against.\n" | |
17166 | "See git-rebase(1) for details.\n" | |
17167 | "\n" | |
17168 | " git rebase '<branch>'\n" | |
17169 | "\n" | |
17170 | msgstr "" | |
17171 | "%s\n" | |
17172 | "请指定您要变基到哪个分支。\n" | |
17173 | "详见 git-rebase(1)。\n" | |
17174 | "\n" | |
17175 | " git rebase '<branch>'\n" | |
17176 | "\n" | |
17177 | ||
a5cd71ca | 17178 | #: builtin/rebase.c:1355 |
4c27fcb5 JX |
17179 | #, c-format |
17180 | msgid "" | |
17181 | "If you wish to set tracking information for this branch you can do so with:\n" | |
17182 | "\n" | |
17183 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
17184 | "\n" | |
17185 | msgstr "" | |
17186 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
17187 | "\n" | |
17188 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
17189 | "\n" | |
17190 | ||
a5cd71ca | 17191 | #: builtin/rebase.c:1385 |
06991777 JX |
17192 | msgid "exec commands cannot contain newlines" |
17193 | msgstr "exec 命令不能包含换行符" | |
17194 | ||
a5cd71ca | 17195 | #: builtin/rebase.c:1389 |
06991777 JX |
17196 | msgid "empty exec command" |
17197 | msgstr "空的 exec 命令" | |
17198 | ||
a5cd71ca | 17199 | #: builtin/rebase.c:1418 |
4c27fcb5 JX |
17200 | msgid "rebase onto given branch instead of upstream" |
17201 | msgstr "变基到给定的分支而非上游" | |
17202 | ||
a5cd71ca JX |
17203 | #: builtin/rebase.c:1420 |
17204 | msgid "use the merge-base of upstream and branch as the current base" | |
17205 | msgstr "使用上游和分支的合并基线做为当前基线" | |
17206 | ||
17207 | #: builtin/rebase.c:1422 | |
4c27fcb5 JX |
17208 | msgid "allow pre-rebase hook to run" |
17209 | msgstr "允许执行 pre-rebase 钩子" | |
17210 | ||
a5cd71ca | 17211 | #: builtin/rebase.c:1424 |
4c27fcb5 JX |
17212 | msgid "be quiet. implies --no-stat" |
17213 | msgstr "安静。暗示 --no-stat" | |
17214 | ||
a5cd71ca | 17215 | #: builtin/rebase.c:1430 |
4c27fcb5 | 17216 | msgid "do not show diffstat of what changed upstream" |
5b533632 | 17217 | msgstr "不显示上游变化的差异统计" |
4c27fcb5 | 17218 | |
a5cd71ca | 17219 | #: builtin/rebase.c:1433 |
4c27fcb5 JX |
17220 | msgid "add a Signed-off-by: line to each commit" |
17221 | msgstr "为每一个提交添加一个 Signed-off-by: 签名" | |
17222 | ||
a5cd71ca | 17223 | #: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 |
4c27fcb5 JX |
17224 | msgid "passed to 'git am'" |
17225 | msgstr "传递给 'git am'" | |
17226 | ||
a5cd71ca | 17227 | #: builtin/rebase.c:1443 builtin/rebase.c:1445 |
4c27fcb5 JX |
17228 | msgid "passed to 'git apply'" |
17229 | msgstr "传递给 'git apply'" | |
17230 | ||
a5cd71ca | 17231 | #: builtin/rebase.c:1447 builtin/rebase.c:1450 |
4c27fcb5 JX |
17232 | msgid "cherry-pick all commits, even if unchanged" |
17233 | msgstr "拣选所有提交,即使未修改" | |
17234 | ||
a5cd71ca | 17235 | #: builtin/rebase.c:1452 |
4c27fcb5 JX |
17236 | msgid "continue" |
17237 | msgstr "继续" | |
17238 | ||
a5cd71ca | 17239 | #: builtin/rebase.c:1455 |
4c27fcb5 JX |
17240 | msgid "skip current patch and continue" |
17241 | msgstr "跳过当前补丁并继续" | |
17242 | ||
17243 | # 译者:注意保持前导空格 | |
a5cd71ca | 17244 | #: builtin/rebase.c:1457 |
4c27fcb5 JX |
17245 | msgid "abort and check out the original branch" |
17246 | msgstr "终止并检出原有分支" | |
17247 | ||
a5cd71ca | 17248 | #: builtin/rebase.c:1460 |
4c27fcb5 JX |
17249 | msgid "abort but keep HEAD where it is" |
17250 | msgstr "终止但保持 HEAD 不变" | |
17251 | ||
a5cd71ca | 17252 | #: builtin/rebase.c:1461 |
4c27fcb5 JX |
17253 | msgid "edit the todo list during an interactive rebase" |
17254 | msgstr "在交互式变基中编辑待办列表" | |
17255 | ||
a5cd71ca | 17256 | #: builtin/rebase.c:1464 |
4c27fcb5 JX |
17257 | msgid "show the patch file being applied or merged" |
17258 | msgstr "显示正在应用或合并的补丁文件" | |
17259 | ||
a5cd71ca | 17260 | #: builtin/rebase.c:1467 |
4c27fcb5 JX |
17261 | msgid "use merging strategies to rebase" |
17262 | msgstr "使用合并策略进行变基" | |
17263 | ||
a5cd71ca | 17264 | #: builtin/rebase.c:1471 |
4c27fcb5 JX |
17265 | msgid "let the user edit the list of commits to rebase" |
17266 | msgstr "让用户编辑要变基的提交列表" | |
17267 | ||
a5cd71ca | 17268 | #: builtin/rebase.c:1475 |
d46c5519 JX |
17269 | msgid "(DEPRECATED) try to recreate merges instead of ignoring them" |
17270 | msgstr "(已弃用)尝试重建合并提交而非忽略它们" | |
4c27fcb5 | 17271 | |
a5cd71ca | 17272 | #: builtin/rebase.c:1479 |
4c27fcb5 JX |
17273 | msgid "preserve empty commits during rebase" |
17274 | msgstr "变基时保留空提交" | |
17275 | ||
a5cd71ca | 17276 | #: builtin/rebase.c:1481 |
4c27fcb5 JX |
17277 | msgid "move commits that begin with squash!/fixup! under -i" |
17278 | msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交" | |
17279 | ||
a5cd71ca | 17280 | #: builtin/rebase.c:1487 |
4c27fcb5 JX |
17281 | msgid "automatically stash/stash pop before and after" |
17282 | msgstr "在操作前后执行自动贮藏和弹出贮藏" | |
17283 | ||
a5cd71ca | 17284 | #: builtin/rebase.c:1489 |
4c27fcb5 JX |
17285 | msgid "add exec lines after each commit of the editable list" |
17286 | msgstr "可编辑列表的每一个提交下面增加一行 exec" | |
17287 | ||
a5cd71ca | 17288 | #: builtin/rebase.c:1493 |
4c27fcb5 JX |
17289 | msgid "allow rebasing commits with empty messages" |
17290 | msgstr "允许针对空提交说明的提交变基" | |
17291 | ||
a5cd71ca | 17292 | #: builtin/rebase.c:1496 |
4c27fcb5 JX |
17293 | msgid "try to rebase merges instead of skipping them" |
17294 | msgstr "尝试对合并提交变基而不是忽略它们" | |
17295 | ||
a5cd71ca | 17296 | #: builtin/rebase.c:1499 |
4c27fcb5 JX |
17297 | msgid "use 'merge-base --fork-point' to refine upstream" |
17298 | msgstr "使用 'merge-base --fork-point' 来优化上游" | |
17299 | ||
a5cd71ca | 17300 | #: builtin/rebase.c:1501 |
4c27fcb5 JX |
17301 | msgid "use the given merge strategy" |
17302 | msgstr "使用给定的合并策略" | |
17303 | ||
a5cd71ca | 17304 | #: builtin/rebase.c:1503 builtin/revert.c:115 |
4c27fcb5 JX |
17305 | msgid "option" |
17306 | msgstr "选项" | |
17307 | ||
a5cd71ca | 17308 | #: builtin/rebase.c:1504 |
4c27fcb5 JX |
17309 | msgid "pass the argument through to the merge strategy" |
17310 | msgstr "将参数传递给合并策略" | |
17311 | ||
a5cd71ca | 17312 | #: builtin/rebase.c:1507 |
4c27fcb5 JX |
17313 | msgid "rebase all reachable commits up to the root(s)" |
17314 | msgstr "将所有可达的提交变基到根提交" | |
17315 | ||
a5cd71ca | 17316 | #: builtin/rebase.c:1524 |
d46c5519 JX |
17317 | msgid "" |
17318 | "the rebase.useBuiltin support has been removed!\n" | |
17319 | "See its entry in 'git help config' for details." | |
17320 | msgstr "" | |
17321 | "对 rebase.useBuiltin 的支持已被删除!\n" | |
17322 | "详见 'git help config' 中的条目。" | |
4c27fcb5 | 17323 | |
a5cd71ca | 17324 | #: builtin/rebase.c:1530 |
4c27fcb5 JX |
17325 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
17326 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
17327 | ||
a5cd71ca | 17328 | #: builtin/rebase.c:1571 |
d46c5519 JX |
17329 | msgid "" |
17330 | "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." | |
17331 | msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" | |
17332 | ||
a5cd71ca JX |
17333 | #: builtin/rebase.c:1576 |
17334 | msgid "cannot combine '--keep-base' with '--onto'" | |
17335 | msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" | |
17336 | ||
17337 | #: builtin/rebase.c:1578 | |
17338 | msgid "cannot combine '--keep-base' with '--root'" | |
17339 | msgstr "不能将 '--keep-base' 和 '--root' 组合使用" | |
17340 | ||
17341 | #: builtin/rebase.c:1582 | |
4c27fcb5 JX |
17342 | msgid "No rebase in progress?" |
17343 | msgstr "没有正在进行的变基?" | |
17344 | ||
a5cd71ca | 17345 | #: builtin/rebase.c:1586 |
4c27fcb5 JX |
17346 | msgid "The --edit-todo action can only be used during interactive rebase." |
17347 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
17348 | ||
a5cd71ca | 17349 | #: builtin/rebase.c:1609 |
4c27fcb5 JX |
17350 | msgid "Cannot read HEAD" |
17351 | msgstr "不能读取 HEAD" | |
17352 | ||
a5cd71ca | 17353 | #: builtin/rebase.c:1621 |
4c27fcb5 JX |
17354 | msgid "" |
17355 | "You must edit all merge conflicts and then\n" | |
17356 | "mark them as resolved using git add" | |
17357 | msgstr "" | |
17358 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
17359 | "命令将它们标记为已解决" | |
17360 | ||
a5cd71ca | 17361 | #: builtin/rebase.c:1640 |
4c27fcb5 JX |
17362 | msgid "could not discard worktree changes" |
17363 | msgstr "无法丢弃工作区变更" | |
17364 | ||
a5cd71ca | 17365 | #: builtin/rebase.c:1659 |
4c27fcb5 JX |
17366 | #, c-format |
17367 | msgid "could not move back to %s" | |
17368 | msgstr "无法移回 %s" | |
17369 | ||
a5cd71ca | 17370 | #: builtin/rebase.c:1704 |
4c27fcb5 JX |
17371 | #, c-format |
17372 | msgid "" | |
17373 | "It seems that there is already a %s directory, and\n" | |
17374 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
17375 | "case, please try\n" | |
17376 | "\t%s\n" | |
17377 | "If that is not the case, please\n" | |
17378 | "\t%s\n" | |
17379 | "and run me again. I am stopping in case you still have something\n" | |
17380 | "valuable there.\n" | |
17381 | msgstr "" | |
17382 | "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n" | |
17383 | "如果是这样,请执行\n" | |
17384 | "\t%s\n" | |
17385 | "如果不是这样,请执行\n" | |
17386 | "\t%s\n" | |
17387 | "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n" | |
17388 | ||
a5cd71ca | 17389 | #: builtin/rebase.c:1725 |
4c27fcb5 JX |
17390 | msgid "switch `C' expects a numerical value" |
17391 | msgstr "开关 `C' 期望一个数字值" | |
17392 | ||
a5cd71ca | 17393 | #: builtin/rebase.c:1766 |
4c27fcb5 JX |
17394 | #, c-format |
17395 | msgid "Unknown mode: %s" | |
17396 | msgstr "未知模式:%s" | |
17397 | ||
a5cd71ca | 17398 | #: builtin/rebase.c:1788 |
4c27fcb5 JX |
17399 | msgid "--strategy requires --merge or --interactive" |
17400 | msgstr "--strategy 需要 --merge 或 --interactive" | |
17401 | ||
a5cd71ca | 17402 | #: builtin/rebase.c:1828 |
a6cd2cc4 JX |
17403 | msgid "--reschedule-failed-exec requires --exec or --interactive" |
17404 | msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" | |
17405 | ||
a5cd71ca | 17406 | #: builtin/rebase.c:1840 |
06991777 | 17407 | msgid "cannot combine am options with either interactive or merge options" |
5b533632 | 17408 | msgstr "不能将 am 选项与交互或合并选项同时使用" |
4c27fcb5 | 17409 | |
a5cd71ca | 17410 | #: builtin/rebase.c:1859 |
06991777 | 17411 | msgid "cannot combine '--preserve-merges' with '--rebase-merges'" |
5b533632 | 17412 | msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" |
4c27fcb5 | 17413 | |
a5cd71ca | 17414 | #: builtin/rebase.c:1863 |
06991777 JX |
17415 | msgid "" |
17416 | "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" | |
17417 | msgstr "" | |
5b533632 | 17418 | "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" |
4c27fcb5 | 17419 | |
a5cd71ca | 17420 | #: builtin/rebase.c:1887 |
4c27fcb5 JX |
17421 | #, c-format |
17422 | msgid "invalid upstream '%s'" | |
17423 | msgstr "无效的上游 '%s'" | |
17424 | ||
a5cd71ca | 17425 | #: builtin/rebase.c:1893 |
4c27fcb5 JX |
17426 | msgid "Could not create new root commit" |
17427 | msgstr "不能创建新的根提交" | |
17428 | ||
a5cd71ca JX |
17429 | #: builtin/rebase.c:1919 |
17430 | #, c-format | |
17431 | msgid "'%s': need exactly one merge base with branch" | |
17432 | msgstr "'%s':只需要与分支的一个合并基线" | |
17433 | ||
17434 | #: builtin/rebase.c:1922 | |
4c27fcb5 JX |
17435 | #, c-format |
17436 | msgid "'%s': need exactly one merge base" | |
17437 | msgstr "'%s':只需要一个合并基线" | |
17438 | ||
a5cd71ca | 17439 | #: builtin/rebase.c:1930 |
4c27fcb5 JX |
17440 | #, c-format |
17441 | msgid "Does not point to a valid commit '%s'" | |
17442 | msgstr "没有指向一个有效的提交 '%s'" | |
17443 | ||
a5cd71ca | 17444 | #: builtin/rebase.c:1955 |
4c27fcb5 JX |
17445 | #, c-format |
17446 | msgid "fatal: no such branch/commit '%s'" | |
06991777 | 17447 | msgstr "致命错误:无此分支/提交 '%s'" |
4c27fcb5 | 17448 | |
a5cd71ca | 17449 | #: builtin/rebase.c:1963 builtin/submodule--helper.c:38 |
a6cd2cc4 | 17450 | #: builtin/submodule--helper.c:1934 |
4c27fcb5 JX |
17451 | #, c-format |
17452 | msgid "No such ref: %s" | |
17453 | msgstr "没有这样的引用:%s" | |
17454 | ||
a5cd71ca | 17455 | #: builtin/rebase.c:1974 |
4c27fcb5 JX |
17456 | msgid "Could not resolve HEAD to a revision" |
17457 | msgstr "无法将 HEAD 解析为一个版本" | |
17458 | ||
a5cd71ca | 17459 | #: builtin/rebase.c:2012 |
4c27fcb5 JX |
17460 | msgid "Cannot autostash" |
17461 | msgstr "无法 autostash" | |
17462 | ||
a5cd71ca | 17463 | #: builtin/rebase.c:2015 |
4c27fcb5 JX |
17464 | #, c-format |
17465 | msgid "Unexpected stash response: '%s'" | |
17466 | msgstr "意外的 stash 响应:'%s'" | |
17467 | ||
a5cd71ca | 17468 | #: builtin/rebase.c:2021 |
4c27fcb5 JX |
17469 | #, c-format |
17470 | msgid "Could not create directory for '%s'" | |
17471 | msgstr "不能为 '%s' 创建目录" | |
17472 | ||
a5cd71ca | 17473 | #: builtin/rebase.c:2024 |
4c27fcb5 JX |
17474 | #, c-format |
17475 | msgid "Created autostash: %s\n" | |
17476 | msgstr "创建了 autostash:%s\n" | |
17477 | ||
a5cd71ca | 17478 | #: builtin/rebase.c:2027 |
4c27fcb5 JX |
17479 | msgid "could not reset --hard" |
17480 | msgstr "无法 reset --hard" | |
17481 | ||
a5cd71ca | 17482 | #: builtin/rebase.c:2036 |
4c27fcb5 JX |
17483 | msgid "Please commit or stash them." |
17484 | msgstr "请提交或贮藏修改。" | |
17485 | ||
a5cd71ca | 17486 | #: builtin/rebase.c:2063 |
4c27fcb5 JX |
17487 | #, c-format |
17488 | msgid "could not parse '%s'" | |
17489 | msgstr "无法解析 '%s'" | |
17490 | ||
a5cd71ca | 17491 | #: builtin/rebase.c:2076 |
4c27fcb5 JX |
17492 | #, c-format |
17493 | msgid "could not switch to %s" | |
17494 | msgstr "无法切换到 %s" | |
17495 | ||
a5cd71ca | 17496 | #: builtin/rebase.c:2087 |
4c27fcb5 JX |
17497 | msgid "HEAD is up to date." |
17498 | msgstr "HEAD 是最新的。" | |
17499 | ||
a5cd71ca | 17500 | #: builtin/rebase.c:2089 |
4c27fcb5 JX |
17501 | #, c-format |
17502 | msgid "Current branch %s is up to date.\n" | |
17503 | msgstr "当前分支 %s 是最新的。\n" | |
17504 | ||
a5cd71ca | 17505 | #: builtin/rebase.c:2097 |
4c27fcb5 JX |
17506 | msgid "HEAD is up to date, rebase forced." |
17507 | msgstr "HEAD 是最新的,强制变基。" | |
17508 | ||
a5cd71ca | 17509 | #: builtin/rebase.c:2099 |
4c27fcb5 JX |
17510 | #, c-format |
17511 | msgid "Current branch %s is up to date, rebase forced.\n" | |
17512 | msgstr "当前分支 %s 是最新的,强制变基。\n" | |
17513 | ||
a5cd71ca | 17514 | #: builtin/rebase.c:2107 |
4c27fcb5 JX |
17515 | msgid "The pre-rebase hook refused to rebase." |
17516 | msgstr "pre-rebase 钩子拒绝了变基操作。" | |
17517 | ||
a5cd71ca | 17518 | #: builtin/rebase.c:2114 |
4c27fcb5 JX |
17519 | #, c-format |
17520 | msgid "Changes to %s:\n" | |
17521 | msgstr "到 %s 的变更:\n" | |
17522 | ||
a5cd71ca | 17523 | #: builtin/rebase.c:2117 |
4c27fcb5 JX |
17524 | #, c-format |
17525 | msgid "Changes from %s to %s:\n" | |
17526 | msgstr "从 %s 到 %s 的变更:\n" | |
17527 | ||
a5cd71ca | 17528 | #: builtin/rebase.c:2142 |
4c27fcb5 JX |
17529 | #, c-format |
17530 | msgid "First, rewinding head to replay your work on top of it...\n" | |
17531 | msgstr "首先,回退头指针以便在其上重放您的工作...\n" | |
17532 | ||
a5cd71ca | 17533 | #: builtin/rebase.c:2151 |
4c27fcb5 JX |
17534 | msgid "Could not detach HEAD" |
17535 | msgstr "无法分离头指针" | |
17536 | ||
a5cd71ca | 17537 | #: builtin/rebase.c:2160 |
4c27fcb5 JX |
17538 | #, c-format |
17539 | msgid "Fast-forwarded %s to %s.\n" | |
17540 | msgstr "快进 %s 到 %s。\n" | |
17541 | ||
a6cd2cc4 | 17542 | #: builtin/receive-pack.c:32 |
5b04ee3b | 17543 | msgid "git receive-pack <git-dir>" |
58b6f078 | 17544 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 17545 | |
a5cd71ca | 17546 | #: builtin/receive-pack.c:830 |
a0b6b246 JX |
17547 | msgid "" |
17548 | "By default, updating the current branch in a non-bare repository\n" | |
17549 | "is denied, because it will make the index and work tree inconsistent\n" | |
17550 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
17551 | "the work tree to HEAD.\n" | |
17552 | "\n" | |
1a79b2f1 JX |
17553 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
17554 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
17555 | "its current branch; however, this is not recommended unless you\n" |
17556 | "arranged to update its work tree to match what you pushed in some\n" | |
17557 | "other way.\n" | |
17558 | "\n" | |
17559 | "To squelch this message and still keep the default behaviour, set\n" | |
17560 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
17561 | msgstr "" | |
17562 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
17563 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
17564 | "\n" | |
17565 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
17566 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
17567 | "用某种方式将其工作区更新至您推送的状态。\n" | |
17568 | "\n" | |
17569 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
17570 | "配置变量为 'refuse'。" | |
17571 | ||
a5cd71ca | 17572 | #: builtin/receive-pack.c:850 |
a0b6b246 JX |
17573 | msgid "" |
17574 | "By default, deleting the current branch is denied, because the next\n" | |
17575 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
17576 | "\n" | |
17577 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
17578 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
17579 | "current branch, with or without a warning message.\n" | |
17580 | "\n" | |
17581 | "To squelch this message, you can set it to 'refuse'." | |
17582 | msgstr "" | |
17583 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 17584 | "导致困惑。\n" |
a0b6b246 JX |
17585 | "\n" |
17586 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 17587 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
17588 | "\n" |
17589 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
17590 | ||
a5cd71ca | 17591 | #: builtin/receive-pack.c:1936 |
5b04ee3b JX |
17592 | msgid "quiet" |
17593 | msgstr "静默模式" | |
17594 | ||
a5cd71ca | 17595 | #: builtin/receive-pack.c:1950 |
5b04ee3b JX |
17596 | msgid "You must specify a directory." |
17597 | msgstr "您必须指定一个目录。" | |
17598 | ||
06991777 JX |
17599 | #: builtin/reflog.c:17 |
17600 | msgid "" | |
17601 | "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" | |
17602 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " | |
17603 | "<refs>..." | |
17604 | msgstr "" | |
17605 | "git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--" | |
17606 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引" | |
17607 | "用>..." | |
17608 | ||
17609 | #: builtin/reflog.c:22 | |
17610 | msgid "" | |
17611 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " | |
17612 | "<refs>..." | |
17613 | msgstr "" | |
17614 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引" | |
17615 | "用>..." | |
17616 | ||
17617 | #: builtin/reflog.c:25 | |
17618 | msgid "git reflog exists <ref>" | |
17619 | msgstr "git reflog exists <引用>" | |
17620 | ||
17621 | #: builtin/reflog.c:567 builtin/reflog.c:572 | |
2e8451e8 JX |
17622 | #, c-format |
17623 | msgid "'%s' is not a valid timestamp" | |
17624 | msgstr "'%s' 不是一个有效的时间戳" | |
17625 | ||
06991777 JX |
17626 | #: builtin/reflog.c:605 |
17627 | #, c-format | |
17628 | msgid "Marking reachable objects..." | |
17629 | msgstr "正在标记可达对象..." | |
17630 | ||
17631 | #: builtin/reflog.c:643 | |
17632 | #, c-format | |
17633 | msgid "%s points nowhere!" | |
17634 | msgstr "%s 指向不存在!" | |
17635 | ||
17636 | #: builtin/reflog.c:695 | |
17637 | msgid "no reflog specified to delete" | |
17638 | msgstr "未指定要删除的引用日志" | |
17639 | ||
17640 | #: builtin/reflog.c:704 | |
17641 | #, c-format | |
17642 | msgid "not a reflog: %s" | |
17643 | msgstr "不是一个引用日志:%s" | |
17644 | ||
17645 | #: builtin/reflog.c:709 | |
17646 | #, c-format | |
17647 | msgid "no reflog for '%s'" | |
17648 | msgstr "没有 '%s' 的引用日志" | |
17649 | ||
17650 | #: builtin/reflog.c:755 | |
17651 | #, c-format | |
17652 | msgid "invalid ref format: %s" | |
17653 | msgstr "无效的引用格式:%s" | |
17654 | ||
17655 | #: builtin/reflog.c:764 | |
17656 | msgid "git reflog [ show | expire | delete | exists ]" | |
17657 | msgstr "git reflog [ show | expire | delete | exists ]" | |
17658 | ||
4c27fcb5 | 17659 | #: builtin/remote.c:16 |
ef317cd5 | 17660 | msgid "git remote [-v | --verbose]" |
07432cef | 17661 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 17662 | |
4c27fcb5 | 17663 | #: builtin/remote.c:17 |
ef317cd5 | 17664 | msgid "" |
814ff314 | 17665 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
17666 | "mirror=<fetch|push>] <name> <url>" |
17667 | msgstr "" | |
814ff314 | 17668 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 17669 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 17670 | |
4c27fcb5 | 17671 | #: builtin/remote.c:18 builtin/remote.c:38 |
ef317cd5 | 17672 | msgid "git remote rename <old> <new>" |
07432cef | 17673 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 17674 | |
4c27fcb5 | 17675 | #: builtin/remote.c:19 builtin/remote.c:43 |
ef317cd5 | 17676 | msgid "git remote remove <name>" |
07432cef | 17677 | msgstr "git remote remove <名称>" |
ef317cd5 | 17678 | |
4c27fcb5 | 17679 | #: builtin/remote.c:20 builtin/remote.c:48 |
814ff314 JX |
17680 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
17681 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 17682 | |
4c27fcb5 | 17683 | #: builtin/remote.c:21 |
ef317cd5 | 17684 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 17685 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 17686 | |
4c27fcb5 | 17687 | #: builtin/remote.c:22 |
ef317cd5 | 17688 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 17689 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 17690 | |
4c27fcb5 | 17691 | #: builtin/remote.c:23 |
ef317cd5 JX |
17692 | msgid "" |
17693 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 17694 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 17695 | |
4c27fcb5 | 17696 | #: builtin/remote.c:24 |
ef317cd5 | 17697 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 17698 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 17699 | |
4c27fcb5 | 17700 | #: builtin/remote.c:25 builtin/remote.c:74 |
94550ed3 JX |
17701 | msgid "git remote get-url [--push] [--all] <name>" |
17702 | msgstr "git remote get-url [--push] [--all] <名称>" | |
17703 | ||
4c27fcb5 | 17704 | #: builtin/remote.c:26 builtin/remote.c:79 |
ef317cd5 | 17705 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 17706 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 17707 | |
4c27fcb5 | 17708 | #: builtin/remote.c:27 builtin/remote.c:80 |
ef317cd5 | 17709 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 17710 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 17711 | |
4c27fcb5 | 17712 | #: builtin/remote.c:28 builtin/remote.c:81 |
ef317cd5 | 17713 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 17714 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 17715 | |
4c27fcb5 | 17716 | #: builtin/remote.c:33 |
ef317cd5 | 17717 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 17718 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 17719 | |
4c27fcb5 | 17720 | #: builtin/remote.c:53 |
ef317cd5 | 17721 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 17722 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 17723 | |
4c27fcb5 | 17724 | #: builtin/remote.c:54 |
ef317cd5 | 17725 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 17726 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 17727 | |
4c27fcb5 | 17728 | #: builtin/remote.c:59 |
ef317cd5 | 17729 | msgid "git remote show [<options>] <name>" |
07432cef | 17730 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 17731 | |
4c27fcb5 | 17732 | #: builtin/remote.c:64 |
ef317cd5 | 17733 | msgid "git remote prune [<options>] <name>" |
07432cef | 17734 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 17735 | |
4c27fcb5 | 17736 | #: builtin/remote.c:69 |
ef317cd5 | 17737 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 17738 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 17739 | |
4c27fcb5 | 17740 | #: builtin/remote.c:98 |
81809b99 | 17741 | #, c-format |
8ada9598 | 17742 | msgid "Updating %s" |
81809b99 | 17743 | msgstr "更新 %s 中" |
8ada9598 | 17744 | |
4c27fcb5 | 17745 | #: builtin/remote.c:130 |
8ada9598 JX |
17746 | msgid "" |
17747 | "--mirror is dangerous and deprecated; please\n" | |
17748 | "\t use --mirror=fetch or --mirror=push instead" | |
17749 | msgstr "" | |
81809b99 JX |
17750 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
17751 | "\t 或 --mirror=push" | |
8ada9598 | 17752 | |
4c27fcb5 | 17753 | #: builtin/remote.c:147 |
81809b99 | 17754 | #, c-format |
8ada9598 | 17755 | msgid "unknown mirror argument: %s" |
81809b99 | 17756 | msgstr "未知的镜像参数:%s" |
8ada9598 | 17757 | |
4c27fcb5 | 17758 | #: builtin/remote.c:163 |
ef317cd5 | 17759 | msgid "fetch the remote branches" |
07432cef | 17760 | msgstr "抓取远程的分支" |
ef317cd5 | 17761 | |
4c27fcb5 | 17762 | #: builtin/remote.c:165 |
ef317cd5 | 17763 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 17764 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 17765 | |
4c27fcb5 | 17766 | #: builtin/remote.c:168 |
ef317cd5 | 17767 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 17768 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 17769 | |
4c27fcb5 | 17770 | #: builtin/remote.c:170 |
ef317cd5 | 17771 | msgid "branch(es) to track" |
07432cef | 17772 | msgstr "跟踪的分支" |
ef317cd5 | 17773 | |
4c27fcb5 | 17774 | #: builtin/remote.c:171 |
ef317cd5 | 17775 | msgid "master branch" |
07432cef | 17776 | msgstr "主线分支" |
ef317cd5 | 17777 | |
4c27fcb5 | 17778 | #: builtin/remote.c:173 |
ef317cd5 | 17779 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 17780 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 17781 | |
4c27fcb5 | 17782 | #: builtin/remote.c:185 |
8ada9598 | 17783 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 17784 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 17785 | |
4c27fcb5 | 17786 | #: builtin/remote.c:187 |
8ada9598 | 17787 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 17788 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 17789 | |
4c27fcb5 | 17790 | #: builtin/remote.c:194 builtin/remote.c:636 |
81809b99 | 17791 | #, c-format |
8ada9598 | 17792 | msgid "remote %s already exists." |
81809b99 | 17793 | msgstr "远程 %s 已经存在。" |
8ada9598 | 17794 | |
4c27fcb5 | 17795 | #: builtin/remote.c:198 builtin/remote.c:640 |
81809b99 | 17796 | #, c-format |
8ada9598 | 17797 | msgid "'%s' is not a valid remote name" |
81809b99 | 17798 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 17799 | |
4c27fcb5 | 17800 | #: builtin/remote.c:238 |
81809b99 | 17801 | #, c-format |
8ada9598 | 17802 | msgid "Could not setup master '%s'" |
81809b99 | 17803 | msgstr "无法设置 master '%s'" |
8ada9598 | 17804 | |
4c27fcb5 | 17805 | #: builtin/remote.c:344 |
81809b99 | 17806 | #, c-format |
8ada9598 | 17807 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 17808 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 17809 | |
4c27fcb5 | 17810 | #: builtin/remote.c:443 builtin/remote.c:451 |
8ada9598 | 17811 | msgid "(matching)" |
81809b99 | 17812 | msgstr "(匹配)" |
8ada9598 | 17813 | |
4c27fcb5 | 17814 | #: builtin/remote.c:455 |
8ada9598 | 17815 | msgid "(delete)" |
81809b99 | 17816 | msgstr "(删除)" |
8ada9598 | 17817 | |
4c27fcb5 | 17818 | #: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 |
81809b99 | 17819 | #, c-format |
4c27fcb5 JX |
17820 | msgid "No such remote: '%s'" |
17821 | msgstr "没有此远程仓库:'%s'" | |
8ada9598 | 17822 | |
4c27fcb5 | 17823 | #: builtin/remote.c:646 |
81809b99 | 17824 | #, c-format |
8ada9598 | 17825 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 17826 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 17827 | |
4c27fcb5 | 17828 | #: builtin/remote.c:666 |
8ada9598 JX |
17829 | #, c-format |
17830 | msgid "" | |
d691f479 | 17831 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
17832 | "\t%s\n" |
17833 | "\tPlease update the configuration manually if necessary." | |
17834 | msgstr "" | |
160fb2b2 | 17835 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
17836 | "\t%s\n" |
17837 | "\t如果必要请手动更新配置。" | |
8ada9598 | 17838 | |
4c27fcb5 | 17839 | #: builtin/remote.c:702 |
81809b99 | 17840 | #, c-format |
8ada9598 | 17841 | msgid "deleting '%s' failed" |
81809b99 | 17842 | msgstr "删除 '%s' 失败" |
8ada9598 | 17843 | |
4c27fcb5 | 17844 | #: builtin/remote.c:736 |
81809b99 | 17845 | #, c-format |
8ada9598 | 17846 | msgid "creating '%s' failed" |
81809b99 | 17847 | msgstr "创建 '%s' 失败" |
8ada9598 | 17848 | |
4c27fcb5 | 17849 | #: builtin/remote.c:802 |
8ada9598 JX |
17850 | msgid "" |
17851 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
17852 | "to delete it, use:" | |
17853 | msgid_plural "" | |
17854 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
17855 | "to delete them, use:" | |
5ae481e0 JX |
17856 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
17857 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 17858 | |
4c27fcb5 | 17859 | #: builtin/remote.c:816 |
276ceeaa JX |
17860 | #, c-format |
17861 | msgid "Could not remove config section '%s'" | |
17862 | msgstr "不能移除配置小节 '%s'" | |
17863 | ||
4c27fcb5 | 17864 | #: builtin/remote.c:917 |
8ada9598 JX |
17865 | #, c-format |
17866 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 17867 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 17868 | |
4c27fcb5 | 17869 | #: builtin/remote.c:920 |
8ada9598 | 17870 | msgid " tracked" |
81809b99 | 17871 | msgstr " 已跟踪" |
8ada9598 | 17872 | |
4c27fcb5 | 17873 | #: builtin/remote.c:922 |
8ada9598 | 17874 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 17875 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 17876 | |
4c27fcb5 | 17877 | #: builtin/remote.c:924 |
8ada9598 | 17878 | msgid " ???" |
81809b99 | 17879 | msgstr " ???" |
8ada9598 | 17880 | |
4c27fcb5 | 17881 | #: builtin/remote.c:965 |
8ada9598 JX |
17882 | #, c-format |
17883 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 17884 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 17885 | |
4c27fcb5 | 17886 | #: builtin/remote.c:974 |
81809b99 | 17887 | #, c-format |
276ceeaa JX |
17888 | msgid "rebases interactively onto remote %s" |
17889 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 17890 | |
4c27fcb5 | 17891 | #: builtin/remote.c:976 |
fd8cb379 JX |
17892 | #, c-format |
17893 | msgid "rebases interactively (with merges) onto remote %s" | |
17894 | msgstr "交互式变基(含合并提交)到远程 %s" | |
17895 | ||
4c27fcb5 | 17896 | #: builtin/remote.c:979 |
5c57d762 JX |
17897 | #, c-format |
17898 | msgid "rebases onto remote %s" | |
17899 | msgstr "变基到远程 %s" | |
17900 | ||
4c27fcb5 | 17901 | #: builtin/remote.c:983 |
81809b99 | 17902 | #, c-format |
8ada9598 | 17903 | msgid " merges with remote %s" |
81809b99 | 17904 | msgstr " 与远程 %s 合并" |
8ada9598 | 17905 | |
4c27fcb5 | 17906 | #: builtin/remote.c:986 |
81809b99 | 17907 | #, c-format |
8ada9598 | 17908 | msgid "merges with remote %s" |
81809b99 | 17909 | msgstr "与远程 %s 合并" |
8ada9598 | 17910 | |
4c27fcb5 | 17911 | #: builtin/remote.c:989 |
5c57d762 JX |
17912 | #, c-format |
17913 | msgid "%-*s and with remote %s\n" | |
17914 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 17915 | |
4c27fcb5 | 17916 | #: builtin/remote.c:1032 |
8ada9598 | 17917 | msgid "create" |
81809b99 | 17918 | msgstr "创建" |
8ada9598 | 17919 | |
4c27fcb5 | 17920 | #: builtin/remote.c:1035 |
8ada9598 | 17921 | msgid "delete" |
81809b99 | 17922 | msgstr "删除" |
8ada9598 | 17923 | |
4c27fcb5 | 17924 | #: builtin/remote.c:1039 |
8ada9598 | 17925 | msgid "up to date" |
81809b99 | 17926 | msgstr "最新" |
8ada9598 | 17927 | |
4c27fcb5 | 17928 | #: builtin/remote.c:1042 |
8ada9598 | 17929 | msgid "fast-forwardable" |
81809b99 | 17930 | msgstr "可快进" |
8ada9598 | 17931 | |
4c27fcb5 | 17932 | #: builtin/remote.c:1045 |
8ada9598 | 17933 | msgid "local out of date" |
81809b99 | 17934 | msgstr "本地已过时" |
8ada9598 | 17935 | |
4c27fcb5 | 17936 | #: builtin/remote.c:1052 |
8ada9598 JX |
17937 | #, c-format |
17938 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 17939 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 17940 | |
4c27fcb5 | 17941 | #: builtin/remote.c:1055 |
8ada9598 JX |
17942 | #, c-format |
17943 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 17944 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 17945 | |
4c27fcb5 | 17946 | #: builtin/remote.c:1059 |
8ada9598 JX |
17947 | #, c-format |
17948 | msgid " %-*s forces to %s" | |
81809b99 | 17949 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 17950 | |
4c27fcb5 | 17951 | #: builtin/remote.c:1062 |
8ada9598 JX |
17952 | #, c-format |
17953 | msgid " %-*s pushes to %s" | |
81809b99 | 17954 | msgstr " %-*s 推送至 %s" |
8ada9598 | 17955 | |
4c27fcb5 | 17956 | #: builtin/remote.c:1130 |
ef317cd5 | 17957 | msgid "do not query remotes" |
07432cef | 17958 | msgstr "不查询远程" |
ef317cd5 | 17959 | |
4c27fcb5 | 17960 | #: builtin/remote.c:1157 |
81809b99 | 17961 | #, c-format |
8ada9598 | 17962 | msgid "* remote %s" |
81809b99 | 17963 | msgstr "* 远程 %s" |
8ada9598 | 17964 | |
4c27fcb5 | 17965 | #: builtin/remote.c:1158 |
8ada9598 JX |
17966 | #, c-format |
17967 | msgid " Fetch URL: %s" | |
81809b99 | 17968 | msgstr " 获取地址:%s" |
8ada9598 | 17969 | |
4c27fcb5 | 17970 | #: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 |
8ada9598 | 17971 | msgid "(no URL)" |
81809b99 | 17972 | msgstr "(无 URL)" |
8ada9598 | 17973 | |
a4f16749 JX |
17974 | #. TRANSLATORS: the colon ':' should align |
17975 | #. with the one in " Fetch URL: %s" | |
17976 | #. translation. | |
17977 | #. | |
4c27fcb5 | 17978 | #: builtin/remote.c:1173 builtin/remote.c:1175 |
8ada9598 JX |
17979 | #, c-format |
17980 | msgid " Push URL: %s" | |
81809b99 | 17981 | msgstr " 推送地址:%s" |
8ada9598 | 17982 | |
4c27fcb5 | 17983 | #: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 |
81809b99 | 17984 | #, c-format |
8ada9598 | 17985 | msgid " HEAD branch: %s" |
4375c10e | 17986 | msgstr " HEAD 分支:%s" |
8ada9598 | 17987 | |
5c57d762 | 17988 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 17989 | #: builtin/remote.c:1177 |
5c57d762 JX |
17990 | msgid "(not queried)" |
17991 | msgstr "(未查询)" | |
17992 | ||
4c27fcb5 | 17993 | #: builtin/remote.c:1179 |
5c57d762 JX |
17994 | msgid "(unknown)" |
17995 | msgstr "(未知)" | |
17996 | ||
4c27fcb5 | 17997 | #: builtin/remote.c:1183 |
8ada9598 JX |
17998 | #, c-format |
17999 | msgid "" | |
18000 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 18001 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 18002 | |
4c27fcb5 | 18003 | #: builtin/remote.c:1195 |
81809b99 | 18004 | #, c-format |
8ada9598 JX |
18005 | msgid " Remote branch:%s" |
18006 | msgid_plural " Remote branches:%s" | |
81809b99 | 18007 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 18008 | msgstr[1] " 远程分支:%s" |
8ada9598 | 18009 | |
81809b99 | 18010 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 18011 | #: builtin/remote.c:1198 builtin/remote.c:1224 |
8ada9598 | 18012 | msgid " (status not queried)" |
81809b99 | 18013 | msgstr "(状态未查询)" |
8ada9598 | 18014 | |
4c27fcb5 | 18015 | #: builtin/remote.c:1207 |
8ada9598 JX |
18016 | msgid " Local branch configured for 'git pull':" |
18017 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 18018 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 18019 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 18020 | |
4c27fcb5 | 18021 | #: builtin/remote.c:1215 |
8ada9598 | 18022 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 18023 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 18024 | |
4c27fcb5 | 18025 | #: builtin/remote.c:1221 |
81809b99 | 18026 | #, c-format |
8ada9598 JX |
18027 | msgid " Local ref configured for 'git push'%s:" |
18028 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 18029 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 18030 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 18031 | |
4c27fcb5 | 18032 | #: builtin/remote.c:1242 |
ef317cd5 | 18033 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 18034 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 18035 | |
4c27fcb5 | 18036 | #: builtin/remote.c:1244 |
ef317cd5 | 18037 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 18038 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 18039 | |
4c27fcb5 | 18040 | #: builtin/remote.c:1259 |
8ada9598 | 18041 | msgid "Cannot determine remote HEAD" |
81809b99 | 18042 | msgstr "无法确定远程 HEAD" |
8ada9598 | 18043 | |
4c27fcb5 | 18044 | #: builtin/remote.c:1261 |
8ada9598 | 18045 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 18046 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 18047 | |
4c27fcb5 | 18048 | #: builtin/remote.c:1271 |
81809b99 | 18049 | #, c-format |
8ada9598 | 18050 | msgid "Could not delete %s" |
81809b99 | 18051 | msgstr "无法删除 %s" |
8ada9598 | 18052 | |
4c27fcb5 | 18053 | #: builtin/remote.c:1279 |
81809b99 | 18054 | #, c-format |
8ada9598 | 18055 | msgid "Not a valid ref: %s" |
81809b99 | 18056 | msgstr "不是一个有效引用:%s" |
8ada9598 | 18057 | |
4c27fcb5 | 18058 | #: builtin/remote.c:1281 |
81809b99 | 18059 | #, c-format |
8ada9598 | 18060 | msgid "Could not setup %s" |
81809b99 | 18061 | msgstr "不能设置 %s" |
8ada9598 JX |
18062 | |
18063 | # 译者:注意保持前导空格 | |
4c27fcb5 | 18064 | #: builtin/remote.c:1299 |
81809b99 | 18065 | #, c-format |
8ada9598 | 18066 | msgid " %s will become dangling!" |
e640d114 | 18067 | msgstr " %s 将成为悬空状态!" |
8ada9598 JX |
18068 | |
18069 | # 译者:注意保持前导空格 | |
4c27fcb5 | 18070 | #: builtin/remote.c:1300 |
81809b99 | 18071 | #, c-format |
8ada9598 | 18072 | msgid " %s has become dangling!" |
e640d114 | 18073 | msgstr " %s 已成为悬空状态!" |
8ada9598 | 18074 | |
4c27fcb5 | 18075 | #: builtin/remote.c:1310 |
81809b99 | 18076 | #, c-format |
8ada9598 | 18077 | msgid "Pruning %s" |
81809b99 | 18078 | msgstr "修剪 %s" |
8ada9598 | 18079 | |
4c27fcb5 | 18080 | #: builtin/remote.c:1311 |
8ada9598 JX |
18081 | #, c-format |
18082 | msgid "URL: %s" | |
81809b99 | 18083 | msgstr "URL:%s" |
8ada9598 | 18084 | |
4c27fcb5 | 18085 | #: builtin/remote.c:1327 |
8ada9598 JX |
18086 | #, c-format |
18087 | msgid " * [would prune] %s" | |
81809b99 | 18088 | msgstr " * [将删除] %s" |
8ada9598 | 18089 | |
4c27fcb5 | 18090 | #: builtin/remote.c:1330 |
8ada9598 JX |
18091 | #, c-format |
18092 | msgid " * [pruned] %s" | |
81809b99 | 18093 | msgstr " * [已删除] %s" |
8ada9598 | 18094 | |
4c27fcb5 | 18095 | #: builtin/remote.c:1375 |
ef317cd5 | 18096 | msgid "prune remotes after fetching" |
07432cef | 18097 | msgstr "抓取后清除远程" |
ef317cd5 | 18098 | |
4c27fcb5 | 18099 | #: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 |
81809b99 | 18100 | #, c-format |
8ada9598 | 18101 | msgid "No such remote '%s'" |
81809b99 | 18102 | msgstr "没有此远程 '%s'" |
8ada9598 | 18103 | |
4c27fcb5 | 18104 | #: builtin/remote.c:1454 |
ef317cd5 | 18105 | msgid "add branch" |
07432cef | 18106 | msgstr "添加分支" |
ef317cd5 | 18107 | |
4c27fcb5 | 18108 | #: builtin/remote.c:1461 |
8ada9598 | 18109 | msgid "no remote specified" |
81809b99 | 18110 | msgstr "未指定远程" |
8ada9598 | 18111 | |
4c27fcb5 | 18112 | #: builtin/remote.c:1478 |
94550ed3 JX |
18113 | msgid "query push URLs rather than fetch URLs" |
18114 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
18115 | ||
4c27fcb5 | 18116 | #: builtin/remote.c:1480 |
94550ed3 JX |
18117 | msgid "return all URLs" |
18118 | msgstr "返回所有 URL 地址" | |
18119 | ||
4c27fcb5 | 18120 | #: builtin/remote.c:1508 |
94550ed3 JX |
18121 | #, c-format |
18122 | msgid "no URLs configured for remote '%s'" | |
18123 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
18124 | ||
4c27fcb5 | 18125 | #: builtin/remote.c:1534 |
ef317cd5 | 18126 | msgid "manipulate push URLs" |
07432cef | 18127 | msgstr "操作推送 URLS" |
ef317cd5 | 18128 | |
4c27fcb5 | 18129 | #: builtin/remote.c:1536 |
ef317cd5 | 18130 | msgid "add URL" |
07432cef | 18131 | msgstr "添加 URL" |
ef317cd5 | 18132 | |
4c27fcb5 | 18133 | #: builtin/remote.c:1538 |
ef317cd5 | 18134 | msgid "delete URLs" |
07432cef | 18135 | msgstr "删除 URLS" |
ef317cd5 | 18136 | |
4c27fcb5 | 18137 | #: builtin/remote.c:1545 |
8ada9598 | 18138 | msgid "--add --delete doesn't make sense" |
81809b99 | 18139 | msgstr "--add --delete 无意义" |
8ada9598 | 18140 | |
4c27fcb5 | 18141 | #: builtin/remote.c:1584 |
81809b99 | 18142 | #, c-format |
8ada9598 | 18143 | msgid "Invalid old URL pattern: %s" |
4375c10e | 18144 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 18145 | |
4c27fcb5 | 18146 | #: builtin/remote.c:1592 |
81809b99 | 18147 | #, c-format |
8ada9598 | 18148 | msgid "No such URL found: %s" |
4375c10e | 18149 | msgstr "未找到此 URL:%s" |
8ada9598 | 18150 | |
4c27fcb5 | 18151 | #: builtin/remote.c:1594 |
8ada9598 | 18152 | msgid "Will not delete all non-push URLs" |
4375c10e | 18153 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 18154 | |
4c27fcb5 | 18155 | #: builtin/remote.c:1610 |
ef317cd5 | 18156 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 18157 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 18158 | |
4c27fcb5 | 18159 | #: builtin/remote.c:1641 |
a0b6b246 JX |
18160 | #, c-format |
18161 | msgid "Unknown subcommand: %s" | |
18162 | msgstr "未知子命令:%s" | |
18163 | ||
a5cd71ca | 18164 | #: builtin/repack.c:23 |
814ff314 JX |
18165 | msgid "git repack [<options>]" |
18166 | msgstr "git repack [<选项>]" | |
90314792 | 18167 | |
a5cd71ca | 18168 | #: builtin/repack.c:28 |
1a79b2f1 JX |
18169 | msgid "" |
18170 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
18171 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
18172 | msgstr "" | |
18173 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
18174 | "或禁用 pack.writebitmaps 配置。" | |
18175 | ||
a5cd71ca | 18176 | #: builtin/repack.c:191 |
06991777 | 18177 | msgid "could not start pack-objects to repack promisor objects" |
5b533632 | 18178 | msgstr "无法开始 pack-objects 来重新打包 promisor 对象" |
06991777 | 18179 | |
a5cd71ca | 18180 | #: builtin/repack.c:230 builtin/repack.c:409 |
06991777 | 18181 | msgid "repack: Expecting full hex object ID lines only from pack-objects." |
5b533632 | 18182 | msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。" |
06991777 | 18183 | |
a5cd71ca | 18184 | #: builtin/repack.c:247 |
06991777 | 18185 | msgid "could not finish pack-objects to repack promisor objects" |
5b533632 | 18186 | msgstr "无法完成 pack-objects 来重新打包 promisor 对象" |
06991777 | 18187 | |
a5cd71ca | 18188 | #: builtin/repack.c:285 |
90314792 JX |
18189 | msgid "pack everything in a single pack" |
18190 | msgstr "所有内容打包到一个包文件中" | |
18191 | ||
a5cd71ca | 18192 | #: builtin/repack.c:287 |
90314792 JX |
18193 | msgid "same as -a, and turn unreachable objects loose" |
18194 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
18195 | ||
a5cd71ca | 18196 | #: builtin/repack.c:290 |
90314792 JX |
18197 | msgid "remove redundant packs, and run git-prune-packed" |
18198 | msgstr "删除多余的包,运行 git-prune-packed" | |
18199 | ||
a5cd71ca | 18200 | #: builtin/repack.c:292 |
90314792 JX |
18201 | msgid "pass --no-reuse-delta to git-pack-objects" |
18202 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
18203 | ||
a5cd71ca | 18204 | #: builtin/repack.c:294 |
90314792 JX |
18205 | msgid "pass --no-reuse-object to git-pack-objects" |
18206 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
18207 | ||
a5cd71ca | 18208 | #: builtin/repack.c:296 |
90314792 JX |
18209 | msgid "do not run git-update-server-info" |
18210 | msgstr "不运行 git-update-server-info" | |
18211 | ||
a5cd71ca | 18212 | #: builtin/repack.c:299 |
90314792 JX |
18213 | msgid "pass --local to git-pack-objects" |
18214 | msgstr "向 git-pack-objects 传递参数 --local" | |
18215 | ||
a5cd71ca | 18216 | #: builtin/repack.c:301 |
6c94aba5 JX |
18217 | msgid "write bitmap index" |
18218 | msgstr "写 bitmap 索引" | |
18219 | ||
a5cd71ca | 18220 | #: builtin/repack.c:303 |
4c27fcb5 JX |
18221 | msgid "pass --delta-islands to git-pack-objects" |
18222 | msgstr "向 git-pack-objects 传递参数 --delta-islands" | |
18223 | ||
a5cd71ca | 18224 | #: builtin/repack.c:304 |
90314792 JX |
18225 | msgid "approxidate" |
18226 | msgstr "近似日期" | |
18227 | ||
a5cd71ca | 18228 | #: builtin/repack.c:305 |
90314792 JX |
18229 | msgid "with -A, do not loosen objects older than this" |
18230 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
18231 | ||
a5cd71ca | 18232 | #: builtin/repack.c:307 |
5c57d762 JX |
18233 | msgid "with -a, repack unreachable objects" |
18234 | msgstr "使用 -a ,重新对不可达对象打包" | |
18235 | ||
a5cd71ca | 18236 | #: builtin/repack.c:309 |
90314792 JX |
18237 | msgid "size of the window used for delta compression" |
18238 | msgstr "用于增量压缩的窗口值" | |
18239 | ||
a5cd71ca | 18240 | #: builtin/repack.c:310 builtin/repack.c:316 |
8376b58d JX |
18241 | msgid "bytes" |
18242 | msgstr "字节" | |
18243 | ||
a5cd71ca | 18244 | #: builtin/repack.c:311 |
90314792 JX |
18245 | msgid "same as the above, but limit memory size instead of entries count" |
18246 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
18247 | ||
a5cd71ca | 18248 | #: builtin/repack.c:313 |
90314792 JX |
18249 | msgid "limits the maximum delta depth" |
18250 | msgstr "限制最大增量深度" | |
18251 | ||
a5cd71ca | 18252 | #: builtin/repack.c:315 |
a4f16749 JX |
18253 | msgid "limits the maximum number of threads" |
18254 | msgstr "限制最大线程数" | |
18255 | ||
a5cd71ca | 18256 | #: builtin/repack.c:317 |
90314792 | 18257 | msgid "maximum size of each packfile" |
dbd6cced | 18258 | msgstr "每个包文件的最大尺寸" |
90314792 | 18259 | |
a5cd71ca | 18260 | #: builtin/repack.c:319 |
6c94aba5 JX |
18261 | msgid "repack objects in packs marked with .keep" |
18262 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
18263 | ||
a5cd71ca | 18264 | #: builtin/repack.c:321 |
fd8cb379 JX |
18265 | msgid "do not repack this pack" |
18266 | msgstr "不要对该包文件重新打包" | |
18267 | ||
a5cd71ca | 18268 | #: builtin/repack.c:331 |
94550ed3 JX |
18269 | msgid "cannot delete packs in a precious-objects repo" |
18270 | msgstr "不能删除珍品仓库中的打包文件" | |
18271 | ||
a5cd71ca | 18272 | #: builtin/repack.c:335 |
5c57d762 JX |
18273 | msgid "--keep-unreachable and -A are incompatible" |
18274 | msgstr "--keep-unreachable 和 -A 不兼容" | |
18275 | ||
a5cd71ca | 18276 | #: builtin/repack.c:418 |
06991777 JX |
18277 | msgid "Nothing new to pack." |
18278 | msgstr "没有新的要打包。" | |
18279 | ||
a5cd71ca | 18280 | #: builtin/repack.c:479 |
06991777 JX |
18281 | #, c-format |
18282 | msgid "" | |
18283 | "WARNING: Some packs in use have been renamed by\n" | |
18284 | "WARNING: prefixing old- to their name, in order to\n" | |
18285 | "WARNING: replace them with the new version of the\n" | |
18286 | "WARNING: file. But the operation failed, and the\n" | |
18287 | "WARNING: attempt to rename them back to their\n" | |
18288 | "WARNING: original names also failed.\n" | |
18289 | "WARNING: Please rename them in %s manually:\n" | |
18290 | msgstr "" | |
18291 | "警告:为了将包文件替换为新版本,一些使用中的包已经\n" | |
18292 | "警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n" | |
18293 | "警告:并且尝试重命名改回原有文件名的操作也失败。\n" | |
18294 | "警告:请手动将 %s 下的这些文件重命名:\n" | |
18295 | ||
a5cd71ca | 18296 | #: builtin/repack.c:527 |
90314792 | 18297 | #, c-format |
5c57d762 | 18298 | msgid "failed to remove '%s'" |
c1ac5258 | 18299 | msgstr "删除 '%s' 失败" |
90314792 | 18300 | |
fd8cb379 | 18301 | #: builtin/replace.c:22 |
ef317cd5 | 18302 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 18303 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 18304 | |
fd8cb379 | 18305 | #: builtin/replace.c:23 |
6acbf033 JX |
18306 | msgid "git replace [-f] --edit <object>" |
18307 | msgstr "git replace [-f] --edit <对象>" | |
18308 | ||
fd8cb379 | 18309 | #: builtin/replace.c:24 |
6acbf033 JX |
18310 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
18311 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
18312 | ||
fd8cb379 JX |
18313 | #: builtin/replace.c:25 |
18314 | msgid "git replace [-f] --convert-graft-file" | |
18315 | msgstr "git replace [-f] --convert-graft-file" | |
18316 | ||
18317 | #: builtin/replace.c:26 | |
ef317cd5 | 18318 | msgid "git replace -d <object>..." |
07432cef | 18319 | msgstr "git replace -d <对象>..." |
ef317cd5 | 18320 | |
fd8cb379 | 18321 | #: builtin/replace.c:27 |
cfff71a9 JX |
18322 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
18323 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 18324 | |
d46c5519 | 18325 | #: builtin/replace.c:90 |
c1ac5258 JX |
18326 | #, c-format |
18327 | msgid "" | |
18328 | "invalid replace format '%s'\n" | |
18329 | "valid formats are 'short', 'medium' and 'long'" | |
18330 | msgstr "" | |
18331 | "无效的替换格式 '%s'\n" | |
18332 | "有效的格式有 'short'、'medium' 和 'long'" | |
18333 | ||
d46c5519 | 18334 | #: builtin/replace.c:125 |
c1ac5258 JX |
18335 | #, c-format |
18336 | msgid "replace ref '%s' not found" | |
18337 | msgstr "未发现替换引用 '%s'" | |
18338 | ||
d46c5519 | 18339 | #: builtin/replace.c:141 |
c1ac5258 JX |
18340 | #, c-format |
18341 | msgid "Deleted replace ref '%s'" | |
e640d114 | 18342 | msgstr "已删除替换引用 '%s'" |
c1ac5258 | 18343 | |
d46c5519 | 18344 | #: builtin/replace.c:153 |
c1ac5258 JX |
18345 | #, c-format |
18346 | msgid "'%s' is not a valid ref name" | |
18347 | msgstr "'%s' 不是一个有效的引用名" | |
18348 | ||
d46c5519 | 18349 | #: builtin/replace.c:158 |
c1ac5258 JX |
18350 | #, c-format |
18351 | msgid "replace ref '%s' already exists" | |
18352 | msgstr "替换引用 '%s' 已经存在" | |
18353 | ||
d46c5519 | 18354 | #: builtin/replace.c:178 |
c1ac5258 JX |
18355 | #, c-format |
18356 | msgid "" | |
18357 | "Objects must be of the same type.\n" | |
18358 | "'%s' points to a replaced object of type '%s'\n" | |
18359 | "while '%s' points to a replacement object of type '%s'." | |
18360 | msgstr "" | |
18361 | "对象必须属于同一类型。\n" | |
18362 | "'%s' 指向 '%s' 类型的替换对象\n" | |
18363 | "而 '%s' 指向 '%s' 类型的替换对象。" | |
18364 | ||
d46c5519 | 18365 | #: builtin/replace.c:229 |
c1ac5258 JX |
18366 | #, c-format |
18367 | msgid "unable to open %s for writing" | |
18368 | msgstr "无法为写入打开 %s" | |
18369 | ||
d46c5519 | 18370 | #: builtin/replace.c:242 |
c1ac5258 JX |
18371 | msgid "cat-file reported failure" |
18372 | msgstr "cat-file 报告失败" | |
18373 | ||
d46c5519 | 18374 | #: builtin/replace.c:258 |
c1ac5258 JX |
18375 | #, c-format |
18376 | msgid "unable to open %s for reading" | |
18377 | msgstr "无法为读取打开 %s" | |
18378 | ||
d46c5519 | 18379 | #: builtin/replace.c:272 |
c1ac5258 JX |
18380 | msgid "unable to spawn mktree" |
18381 | msgstr "无法启动 mktree" | |
18382 | ||
d46c5519 | 18383 | #: builtin/replace.c:276 |
c1ac5258 JX |
18384 | msgid "unable to read from mktree" |
18385 | msgstr "无法从 mktree 读取" | |
18386 | ||
d46c5519 | 18387 | #: builtin/replace.c:285 |
c1ac5258 JX |
18388 | msgid "mktree reported failure" |
18389 | msgstr "mktree 报告失败" | |
18390 | ||
d46c5519 | 18391 | #: builtin/replace.c:289 |
c1ac5258 JX |
18392 | msgid "mktree did not return an object name" |
18393 | msgstr "mktree 没有返回一个对象名" | |
18394 | ||
d46c5519 | 18395 | #: builtin/replace.c:298 |
c1ac5258 JX |
18396 | #, c-format |
18397 | msgid "unable to fstat %s" | |
18398 | msgstr "无法对 %s 执行 fstat" | |
18399 | ||
d46c5519 | 18400 | #: builtin/replace.c:303 |
c1ac5258 JX |
18401 | msgid "unable to write object to database" |
18402 | msgstr "无法向数据库写入对象" | |
18403 | ||
a5cd71ca JX |
18404 | #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 |
18405 | #: builtin/replace.c:453 | |
c1ac5258 JX |
18406 | #, c-format |
18407 | msgid "not a valid object name: '%s'" | |
6acbf033 JX |
18408 | msgstr "不是一个有效的对象名:'%s'" |
18409 | ||
d46c5519 | 18410 | #: builtin/replace.c:326 |
c1ac5258 JX |
18411 | #, c-format |
18412 | msgid "unable to get object type for %s" | |
18413 | msgstr "无法得到 %s 的对象类型" | |
18414 | ||
d46c5519 | 18415 | #: builtin/replace.c:342 |
c1ac5258 JX |
18416 | msgid "editing object file failed" |
18417 | msgstr "编辑对象文件失败" | |
18418 | ||
d46c5519 | 18419 | #: builtin/replace.c:351 |
c1ac5258 JX |
18420 | #, c-format |
18421 | msgid "new object is the same as the old one: '%s'" | |
18422 | msgstr "新对象和旧对象相同:'%s'" | |
18423 | ||
a5cd71ca | 18424 | #: builtin/replace.c:384 |
d46c5519 JX |
18425 | #, c-format |
18426 | msgid "could not parse %s as a commit" | |
18427 | msgstr "无法将 %s 解析为一个提交" | |
18428 | ||
a5cd71ca | 18429 | #: builtin/replace.c:415 |
6acbf033 JX |
18430 | #, c-format |
18431 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 18432 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 18433 | |
a5cd71ca | 18434 | #: builtin/replace.c:417 |
6acbf033 JX |
18435 | #, c-format |
18436 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 18437 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 18438 | |
a5cd71ca | 18439 | #: builtin/replace.c:429 |
6acbf033 JX |
18440 | #, c-format |
18441 | msgid "" | |
18442 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
18443 | "instead of --graft" | |
55a16ee4 | 18444 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 18445 | |
a5cd71ca | 18446 | #: builtin/replace.c:468 |
6acbf033 | 18447 | #, c-format |
c1ac5258 JX |
18448 | msgid "the original commit '%s' has a gpg signature" |
18449 | msgstr "原始提交 '%s' 中有一个 gpg 签名" | |
6acbf033 | 18450 | |
a5cd71ca | 18451 | #: builtin/replace.c:469 |
6acbf033 JX |
18452 | msgid "the signature will be removed in the replacement commit!" |
18453 | msgstr "在替换的提交中签名将被移除!" | |
18454 | ||
a5cd71ca | 18455 | #: builtin/replace.c:479 |
6acbf033 JX |
18456 | #, c-format |
18457 | msgid "could not write replacement commit for: '%s'" | |
18458 | msgstr "不能为 '%s' 写替换提交" | |
18459 | ||
a5cd71ca | 18460 | #: builtin/replace.c:487 |
c1ac5258 JX |
18461 | #, c-format |
18462 | msgid "graft for '%s' unnecessary" | |
18463 | msgstr "对 '%s' 移植没有必要" | |
18464 | ||
a5cd71ca | 18465 | #: builtin/replace.c:491 |
c1ac5258 JX |
18466 | #, c-format |
18467 | msgid "new commit is the same as the old one: '%s'" | |
18468 | msgstr "新提交和旧的一样:'%s'" | |
18469 | ||
a5cd71ca | 18470 | #: builtin/replace.c:526 |
fd8cb379 JX |
18471 | #, c-format |
18472 | msgid "" | |
18473 | "could not convert the following graft(s):\n" | |
18474 | "%s" | |
18475 | msgstr "" | |
18476 | "不能转换下列移植:\n" | |
18477 | "%s" | |
18478 | ||
a5cd71ca | 18479 | #: builtin/replace.c:547 |
ef317cd5 | 18480 | msgid "list replace refs" |
07432cef | 18481 | msgstr "列出替换的引用" |
ef317cd5 | 18482 | |
a5cd71ca | 18483 | #: builtin/replace.c:548 |
ef317cd5 | 18484 | msgid "delete replace refs" |
07432cef | 18485 | msgstr "删除替换的引用" |
ef317cd5 | 18486 | |
a5cd71ca | 18487 | #: builtin/replace.c:549 |
6acbf033 JX |
18488 | msgid "edit existing object" |
18489 | msgstr "编辑现存的对象" | |
18490 | ||
a5cd71ca | 18491 | #: builtin/replace.c:550 |
6acbf033 JX |
18492 | msgid "change a commit's parents" |
18493 | msgstr "修改一个提交的父提交" | |
18494 | ||
a5cd71ca | 18495 | #: builtin/replace.c:551 |
fd8cb379 JX |
18496 | msgid "convert existing graft file" |
18497 | msgstr "转换现存的移植文件" | |
18498 | ||
a5cd71ca | 18499 | #: builtin/replace.c:552 |
ef317cd5 | 18500 | msgid "replace the ref if it exists" |
07432cef | 18501 | msgstr "如果存在则替换引用" |
ef317cd5 | 18502 | |
a5cd71ca | 18503 | #: builtin/replace.c:554 |
6acbf033 JX |
18504 | msgid "do not pretty-print contents for --edit" |
18505 | msgstr "不要为 --edit 操作美观显示内容" | |
18506 | ||
a5cd71ca | 18507 | #: builtin/replace.c:555 |
cfff71a9 JX |
18508 | msgid "use this format" |
18509 | msgstr "使用此格式" | |
18510 | ||
a5cd71ca | 18511 | #: builtin/replace.c:568 |
c1ac5258 | 18512 | msgid "--format cannot be used when not listing" |
e640d114 | 18513 | msgstr "不列出时不能使用 --format" |
c1ac5258 | 18514 | |
a5cd71ca | 18515 | #: builtin/replace.c:576 |
c1ac5258 JX |
18516 | msgid "-f only makes sense when writing a replacement" |
18517 | msgstr "只有写一个替换时 -f 才有意义" | |
18518 | ||
a5cd71ca | 18519 | #: builtin/replace.c:580 |
c1ac5258 JX |
18520 | msgid "--raw only makes sense with --edit" |
18521 | msgstr "--raw 只有和 --edit 共用才有意义" | |
18522 | ||
a5cd71ca | 18523 | #: builtin/replace.c:586 |
c1ac5258 JX |
18524 | msgid "-d needs at least one argument" |
18525 | msgstr "-d 需要至少一个参数" | |
18526 | ||
a5cd71ca | 18527 | #: builtin/replace.c:592 |
c1ac5258 JX |
18528 | msgid "bad number of arguments" |
18529 | msgstr "错误的参数个数" | |
18530 | ||
a5cd71ca | 18531 | #: builtin/replace.c:598 |
c1ac5258 | 18532 | msgid "-e needs exactly one argument" |
e640d114 | 18533 | msgstr "-e 需要且仅需要一个参数" |
c1ac5258 | 18534 | |
a5cd71ca | 18535 | #: builtin/replace.c:604 |
c1ac5258 JX |
18536 | msgid "-g needs at least one argument" |
18537 | msgstr "-g 需要至少一个参数" | |
18538 | ||
a5cd71ca | 18539 | #: builtin/replace.c:610 |
c1ac5258 JX |
18540 | msgid "--convert-graft-file takes no argument" |
18541 | msgstr "--convert-graft-file 不带参数" | |
18542 | ||
a5cd71ca | 18543 | #: builtin/replace.c:616 |
c1ac5258 JX |
18544 | msgid "only one pattern can be given with -l" |
18545 | msgstr "只能为 -l 提供一个模式" | |
18546 | ||
a4f16749 | 18547 | #: builtin/rerere.c:13 |
814ff314 JX |
18548 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
18549 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 18550 | |
4c27fcb5 | 18551 | #: builtin/rerere.c:60 |
ef317cd5 | 18552 | msgid "register clean resolutions in index" |
07432cef | 18553 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 18554 | |
4c27fcb5 JX |
18555 | #: builtin/rerere.c:79 |
18556 | msgid "'git rerere forget' without paths is deprecated" | |
18557 | msgstr "没有路径的 'git rerere forget' 已经过时" | |
18558 | ||
06991777 | 18559 | #: builtin/rerere.c:113 |
4c27fcb5 JX |
18560 | #, c-format |
18561 | msgid "unable to generate diff for '%s'" | |
18562 | msgstr "无法为 '%s' 生成差异" | |
18563 | ||
06991777 | 18564 | #: builtin/reset.c:32 |
ef317cd5 JX |
18565 | msgid "" |
18566 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 18567 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 18568 | |
06991777 | 18569 | #: builtin/reset.c:33 |
a0b6b246 JX |
18570 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
18571 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 18572 | |
06991777 | 18573 | #: builtin/reset.c:34 |
07432cef WS |
18574 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
18575 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 18576 | |
06991777 | 18577 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18578 | msgid "mixed" |
18579 | msgstr "混杂" | |
18580 | ||
06991777 | 18581 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18582 | msgid "soft" |
18583 | msgstr "软性" | |
18584 | ||
06991777 | 18585 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18586 | msgid "hard" |
18587 | msgstr "硬性" | |
18588 | ||
06991777 | 18589 | #: builtin/reset.c:40 |
8ada9598 JX |
18590 | msgid "merge" |
18591 | msgstr "合并" | |
18592 | ||
06991777 | 18593 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18594 | msgid "keep" |
18595 | msgstr "保持" | |
18596 | ||
06991777 | 18597 | #: builtin/reset.c:81 |
c04f5ac3 JX |
18598 | msgid "You do not have a valid HEAD." |
18599 | msgstr "您没有一个有效的 HEAD。" | |
18600 | ||
06991777 | 18601 | #: builtin/reset.c:83 |
c04f5ac3 JX |
18602 | msgid "Failed to find tree of HEAD." |
18603 | msgstr "无法找到 HEAD 指向的树。" | |
18604 | ||
06991777 | 18605 | #: builtin/reset.c:89 |
c04f5ac3 JX |
18606 | #, c-format |
18607 | msgid "Failed to find tree of %s." | |
18608 | msgstr "无法找到 %s 指向的树。" | |
18609 | ||
a5cd71ca JX |
18610 | #: builtin/reset.c:114 |
18611 | #, c-format | |
18612 | msgid "HEAD is now at %s" | |
18613 | msgstr "HEAD 现在位于 %s" | |
18614 | ||
90e6ef53 | 18615 | # 译者:汉字之间无空格,故删除%s前后空格 |
06991777 | 18616 | #: builtin/reset.c:193 |
c04f5ac3 JX |
18617 | #, c-format |
18618 | msgid "Cannot do a %s reset in the middle of a merge." | |
18619 | msgstr "在合并过程中不能做%s重置操作。" | |
18620 | ||
a5cd71ca JX |
18621 | #: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 |
18622 | #: builtin/stash.c:619 | |
ef317cd5 | 18623 | msgid "be quiet, only report errors" |
07432cef | 18624 | msgstr "安静模式,只报告错误" |
ef317cd5 | 18625 | |
06991777 | 18626 | #: builtin/reset.c:295 |
ef317cd5 | 18627 | msgid "reset HEAD and index" |
07432cef | 18628 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 18629 | |
06991777 | 18630 | #: builtin/reset.c:296 |
ef317cd5 | 18631 | msgid "reset only HEAD" |
07432cef | 18632 | msgstr "只重置 HEAD" |
ef317cd5 | 18633 | |
06991777 | 18634 | #: builtin/reset.c:298 builtin/reset.c:300 |
ef317cd5 | 18635 | msgid "reset HEAD, index and working tree" |
07432cef | 18636 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 18637 | |
06991777 | 18638 | #: builtin/reset.c:302 |
ef317cd5 | 18639 | msgid "reset HEAD but keep local changes" |
07432cef | 18640 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 18641 | |
06991777 | 18642 | #: builtin/reset.c:308 |
6c94aba5 JX |
18643 | msgid "record only the fact that removed paths will be added later" |
18644 | msgstr "将删除的路径标记为稍后添加" | |
18645 | ||
06991777 | 18646 | #: builtin/reset.c:326 |
07432cef WS |
18647 | #, c-format |
18648 | msgid "Failed to resolve '%s' as a valid revision." | |
18649 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
18650 | ||
06991777 | 18651 | #: builtin/reset.c:334 |
07432cef WS |
18652 | #, c-format |
18653 | msgid "Failed to resolve '%s' as a valid tree." | |
18654 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
18655 | ||
06991777 | 18656 | #: builtin/reset.c:343 |
c04f5ac3 | 18657 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 18658 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 18659 | |
d46c5519 | 18660 | #: builtin/reset.c:353 |
c04f5ac3 | 18661 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 18662 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 18663 | |
90e6ef53 | 18664 | # 译者:汉字之间无空格,故删除%s前后空格 |
d46c5519 | 18665 | #: builtin/reset.c:355 |
c04f5ac3 JX |
18666 | #, c-format |
18667 | msgid "Cannot do %s reset with paths." | |
18668 | msgstr "不能带路径进行%s重置。" | |
18669 | ||
90e6ef53 | 18670 | # 译者:汉字之间无空格,故删除%s前后空格 |
d46c5519 | 18671 | #: builtin/reset.c:370 |
c04f5ac3 JX |
18672 | #, c-format |
18673 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 18674 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 18675 | |
d46c5519 | 18676 | #: builtin/reset.c:374 |
6c94aba5 JX |
18677 | msgid "-N can only be used with --mixed" |
18678 | msgstr "-N 只能和 --mixed 同时使用" | |
18679 | ||
d46c5519 | 18680 | #: builtin/reset.c:395 |
90314792 | 18681 | msgid "Unstaged changes after reset:" |
160fb2b2 | 18682 | msgstr "重置后取消暂存的变更:" |
90314792 | 18683 | |
d46c5519 | 18684 | #: builtin/reset.c:398 |
4c27fcb5 JX |
18685 | #, c-format |
18686 | msgid "" | |
18687 | "\n" | |
18688 | "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" | |
18689 | "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" | |
18690 | "to make this the default.\n" | |
18691 | msgstr "" | |
18692 | "\n" | |
18693 | "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" | |
18694 | "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" | |
18695 | ||
d46c5519 | 18696 | #: builtin/reset.c:408 |
ef317cd5 JX |
18697 | #, c-format |
18698 | msgid "Could not reset index file to revision '%s'." | |
18699 | msgstr "不能重置索引文件至版本 '%s'。" | |
18700 | ||
d46c5519 | 18701 | #: builtin/reset.c:412 |
07432cef WS |
18702 | msgid "Could not write new index file." |
18703 | msgstr "不能写入新的索引文件。" | |
18704 | ||
a5cd71ca | 18705 | #: builtin/rev-list.c:411 |
31e5e17b JX |
18706 | msgid "cannot combine --exclude-promisor-objects and --missing" |
18707 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
18708 | ||
a5cd71ca | 18709 | #: builtin/rev-list.c:472 |
5809aa05 JX |
18710 | msgid "object filtering requires --objects" |
18711 | msgstr "对象过滤需要 --objects" | |
18712 | ||
a5cd71ca | 18713 | #: builtin/rev-list.c:522 |
1b7f4a34 JX |
18714 | msgid "rev-list does not support display of notes" |
18715 | msgstr "rev-list 不支持显示注解" | |
18716 | ||
a5cd71ca | 18717 | #: builtin/rev-list.c:525 |
5809aa05 JX |
18718 | msgid "cannot combine --use-bitmap-index with object filtering" |
18719 | msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" | |
18720 | ||
06991777 | 18721 | #: builtin/rev-parse.c:408 |
814ff314 JX |
18722 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
18723 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 18724 | |
06991777 | 18725 | #: builtin/rev-parse.c:413 |
ef317cd5 | 18726 | msgid "keep the `--` passed as an arg" |
07432cef | 18727 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 18728 | |
06991777 | 18729 | #: builtin/rev-parse.c:415 |
ef317cd5 | 18730 | msgid "stop parsing after the first non-option argument" |
07432cef | 18731 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 18732 | |
06991777 | 18733 | #: builtin/rev-parse.c:418 |
cfff71a9 JX |
18734 | msgid "output in stuck long form" |
18735 | msgstr "以固定长格式输出" | |
18736 | ||
06991777 | 18737 | #: builtin/rev-parse.c:551 |
ef317cd5 | 18738 | msgid "" |
814ff314 | 18739 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 18740 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 18741 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
18742 | "\n" |
18743 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
18744 | msgstr "" | |
814ff314 | 18745 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 18746 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 18747 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
18748 | "\n" |
18749 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 18750 | |
c1ac5258 | 18751 | #: builtin/revert.c:24 |
814ff314 JX |
18752 | msgid "git revert [<options>] <commit-ish>..." |
18753 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 18754 | |
c1ac5258 | 18755 | #: builtin/revert.c:25 |
ef317cd5 | 18756 | msgid "git revert <subcommand>" |
07432cef | 18757 | msgstr "git revert <子命令>" |
ef317cd5 | 18758 | |
c1ac5258 | 18759 | #: builtin/revert.c:30 |
814ff314 JX |
18760 | msgid "git cherry-pick [<options>] <commit-ish>..." |
18761 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 18762 | |
c1ac5258 | 18763 | #: builtin/revert.c:31 |
ef317cd5 | 18764 | msgid "git cherry-pick <subcommand>" |
07432cef | 18765 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 18766 | |
06991777 JX |
18767 | #: builtin/revert.c:72 |
18768 | #, c-format | |
18769 | msgid "option `%s' expects a number greater than zero" | |
18770 | msgstr "选项 `%s' 期望一个大于零的数字" | |
18771 | ||
18772 | #: builtin/revert.c:92 | |
ef317cd5 JX |
18773 | #, c-format |
18774 | msgid "%s: %s cannot be used with %s" | |
18775 | msgstr "%s:%s 不能和 %s 同时使用" | |
18776 | ||
d46c5519 | 18777 | #: builtin/revert.c:102 |
ef317cd5 | 18778 | msgid "end revert or cherry-pick sequence" |
07432cef | 18779 | msgstr "终止反转或拣选操作" |
ef317cd5 | 18780 | |
d46c5519 | 18781 | #: builtin/revert.c:103 |
ef317cd5 | 18782 | msgid "resume revert or cherry-pick sequence" |
07432cef | 18783 | msgstr "继续反转或拣选操作" |
ef317cd5 | 18784 | |
d46c5519 | 18785 | #: builtin/revert.c:104 |
ef317cd5 | 18786 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 18787 | msgstr "取消反转或拣选操作" |
ef317cd5 | 18788 | |
a6cd2cc4 JX |
18789 | #: builtin/revert.c:105 |
18790 | msgid "skip current commit and continue" | |
18791 | msgstr "跳过当前提交并继续" | |
18792 | ||
18793 | #: builtin/revert.c:107 | |
ef317cd5 | 18794 | msgid "don't automatically commit" |
07432cef | 18795 | msgstr "不要自动提交" |
ef317cd5 | 18796 | |
a6cd2cc4 | 18797 | #: builtin/revert.c:108 |
ef317cd5 | 18798 | msgid "edit the commit message" |
07432cef | 18799 | msgstr "编辑提交说明" |
ef317cd5 | 18800 | |
a6cd2cc4 | 18801 | #: builtin/revert.c:111 |
87cb7997 | 18802 | msgid "parent-number" |
07432cef | 18803 | msgstr "父编号" |
ef317cd5 | 18804 | |
a6cd2cc4 | 18805 | #: builtin/revert.c:112 |
87cb7997 JX |
18806 | msgid "select mainline parent" |
18807 | msgstr "选择主干父提交编号" | |
18808 | ||
a6cd2cc4 | 18809 | #: builtin/revert.c:114 |
ef317cd5 | 18810 | msgid "merge strategy" |
07432cef | 18811 | msgstr "合并策略" |
ef317cd5 | 18812 | |
a6cd2cc4 | 18813 | #: builtin/revert.c:116 |
ef317cd5 | 18814 | msgid "option for merge strategy" |
07432cef | 18815 | msgstr "合并策略的选项" |
ef317cd5 | 18816 | |
a6cd2cc4 | 18817 | #: builtin/revert.c:125 |
ef317cd5 | 18818 | msgid "append commit name" |
07432cef | 18819 | msgstr "追加提交名称" |
ef317cd5 | 18820 | |
a6cd2cc4 | 18821 | #: builtin/revert.c:127 |
ef317cd5 | 18822 | msgid "preserve initially empty commits" |
07432cef | 18823 | msgstr "保留初始化的空提交" |
ef317cd5 | 18824 | |
a6cd2cc4 | 18825 | #: builtin/revert.c:129 |
ef317cd5 | 18826 | msgid "keep redundant, empty commits" |
07432cef | 18827 | msgstr "保持多余的、空的提交" |
ef317cd5 | 18828 | |
a6cd2cc4 | 18829 | #: builtin/revert.c:232 |
c04f5ac3 JX |
18830 | msgid "revert failed" |
18831 | msgstr "还原失败" | |
18832 | ||
a6cd2cc4 | 18833 | #: builtin/revert.c:245 |
c04f5ac3 JX |
18834 | msgid "cherry-pick failed" |
18835 | msgstr "拣选失败" | |
18836 | ||
06991777 | 18837 | #: builtin/rm.c:19 |
814ff314 JX |
18838 | msgid "git rm [<options>] [--] <file>..." |
18839 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 18840 | |
06991777 | 18841 | #: builtin/rm.c:207 |
c04f5ac3 | 18842 | msgid "" |
2e8451e8 JX |
18843 | "the following file has staged content different from both the\n" |
18844 | "file and the HEAD:" | |
18845 | msgid_plural "" | |
18846 | "the following files have staged content different from both the\n" | |
18847 | "file and the HEAD:" | |
18848 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
18849 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
18850 | ||
06991777 | 18851 | #: builtin/rm.c:212 |
2e8451e8 JX |
18852 | msgid "" |
18853 | "\n" | |
c04f5ac3 JX |
18854 | "(use -f to force removal)" |
18855 | msgstr "" | |
2e8451e8 | 18856 | "\n" |
c04f5ac3 JX |
18857 | "(使用 -f 强制删除)" |
18858 | ||
06991777 | 18859 | #: builtin/rm.c:216 |
2e8451e8 JX |
18860 | msgid "the following file has changes staged in the index:" |
18861 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
18862 | msgstr[0] "下列文件索引中有变更" |
18863 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 18864 | |
06991777 | 18865 | #: builtin/rm.c:220 builtin/rm.c:229 |
c04f5ac3 | 18866 | msgid "" |
2e8451e8 | 18867 | "\n" |
c04f5ac3 JX |
18868 | "(use --cached to keep the file, or -f to force removal)" |
18869 | msgstr "" | |
2e8451e8 JX |
18870 | "\n" |
18871 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
18872 | ||
06991777 | 18873 | #: builtin/rm.c:226 |
2e8451e8 JX |
18874 | msgid "the following file has local modifications:" |
18875 | msgid_plural "the following files have local modifications:" | |
18876 | msgstr[0] "如下文件有本地修改:" | |
18877 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 18878 | |
06991777 | 18879 | #: builtin/rm.c:242 |
ef317cd5 | 18880 | msgid "do not list removed files" |
07432cef | 18881 | msgstr "不列出删除的文件" |
ef317cd5 | 18882 | |
06991777 | 18883 | #: builtin/rm.c:243 |
ef317cd5 | 18884 | msgid "only remove from the index" |
07432cef | 18885 | msgstr "只从索引区删除" |
ef317cd5 | 18886 | |
06991777 | 18887 | #: builtin/rm.c:244 |
ef317cd5 | 18888 | msgid "override the up-to-date check" |
07432cef | 18889 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 18890 | |
06991777 | 18891 | #: builtin/rm.c:245 |
ef317cd5 | 18892 | msgid "allow recursive removal" |
07432cef | 18893 | msgstr "允许递归删除" |
ef317cd5 | 18894 | |
06991777 | 18895 | #: builtin/rm.c:247 |
ef317cd5 | 18896 | msgid "exit with a zero status even if nothing matched" |
07432cef | 18897 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 18898 | |
06991777 | 18899 | #: builtin/rm.c:289 |
c1ac5258 JX |
18900 | msgid "please stage your changes to .gitmodules or stash them to proceed" |
18901 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" | |
18902 | ||
06991777 | 18903 | #: builtin/rm.c:307 |
c04f5ac3 JX |
18904 | #, c-format |
18905 | msgid "not removing '%s' recursively without -r" | |
18906 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
18907 | ||
06991777 | 18908 | #: builtin/rm.c:346 |
c04f5ac3 JX |
18909 | #, c-format |
18910 | msgid "git rm: unable to remove %s" | |
18911 | msgstr "git rm:不能删除 %s" | |
18912 | ||
fd8cb379 | 18913 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
18914 | msgid "" |
18915 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
18916 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
18917 | "[<ref>...]\n" | |
18918 | " --all and explicit <ref> specification are mutually exclusive." | |
18919 | msgstr "" | |
18920 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
18921 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
18922 | " --all 和明确的 <引用> 互斥。" | |
18923 | ||
fd8cb379 | 18924 | #: builtin/send-pack.c:163 |
1b7f4a34 JX |
18925 | msgid "remote name" |
18926 | msgstr "远程名称" | |
18927 | ||
fd8cb379 | 18928 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
18929 | msgid "use stateless RPC protocol" |
18930 | msgstr "使用无状态的 RPC 协议" | |
18931 | ||
fd8cb379 | 18932 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
18933 | msgid "read refs from stdin" |
18934 | msgstr "从标准输入读取引用" | |
18935 | ||
fd8cb379 | 18936 | #: builtin/send-pack.c:179 |
1b7f4a34 JX |
18937 | msgid "print status from remote helper" |
18938 | msgstr "打印来自远程 helper 的状态" | |
18939 | ||
a4f16749 | 18940 | #: builtin/shortlog.c:14 |
fd8cb379 JX |
18941 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
18942 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
18943 | ||
18944 | #: builtin/shortlog.c:15 | |
18945 | msgid "git log --pretty=short | git shortlog [<options>]" | |
18946 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 18947 | |
fd8cb379 | 18948 | #: builtin/shortlog.c:264 |
1a79b2f1 JX |
18949 | msgid "Group by committer rather than author" |
18950 | msgstr "按照提交者分组而不是作者" | |
18951 | ||
fd8cb379 | 18952 | #: builtin/shortlog.c:266 |
ef317cd5 | 18953 | msgid "sort output according to the number of commits per author" |
07432cef | 18954 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 18955 | |
fd8cb379 | 18956 | #: builtin/shortlog.c:268 |
ef317cd5 | 18957 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 18958 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 18959 | |
fd8cb379 | 18960 | #: builtin/shortlog.c:270 |
ef317cd5 | 18961 | msgid "Show the email address of each author" |
07432cef | 18962 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 18963 | |
fd8cb379 | 18964 | #: builtin/shortlog.c:271 |
c1ac5258 JX |
18965 | msgid "<w>[,<i1>[,<i2>]]" |
18966 | msgstr "<w>[,<i1>[,<i2>]]" | |
ef317cd5 | 18967 | |
fd8cb379 | 18968 | #: builtin/shortlog.c:272 |
ef317cd5 | 18969 | msgid "Linewrap output" |
07432cef | 18970 | msgstr "折行输出" |
ef317cd5 | 18971 | |
06991777 | 18972 | #: builtin/shortlog.c:301 |
fd8cb379 JX |
18973 | msgid "too many arguments given outside repository" |
18974 | msgstr "仓库外执行提供了太多的参数" | |
18975 | ||
c1ac5258 | 18976 | #: builtin/show-branch.c:13 |
ef317cd5 | 18977 | msgid "" |
814ff314 | 18978 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
18979 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
18980 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
18981 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 18982 | msgstr "" |
814ff314 | 18983 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
18984 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
18985 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
18986 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 18987 | |
c1ac5258 | 18988 | #: builtin/show-branch.c:17 |
814ff314 | 18989 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 18990 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 18991 | |
c1ac5258 | 18992 | #: builtin/show-branch.c:395 |
a0b6b246 JX |
18993 | #, c-format |
18994 | msgid "ignoring %s; cannot handle more than %d ref" | |
18995 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
18996 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
18997 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
18998 | ||
a6cd2cc4 | 18999 | #: builtin/show-branch.c:548 |
a0b6b246 JX |
19000 | #, c-format |
19001 | msgid "no matching refs with %s" | |
19002 | msgstr "没有和 %s 匹配的引用" | |
19003 | ||
a6cd2cc4 | 19004 | #: builtin/show-branch.c:645 |
ef317cd5 | 19005 | msgid "show remote-tracking and local branches" |
07432cef | 19006 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 19007 | |
a6cd2cc4 | 19008 | #: builtin/show-branch.c:647 |
ef317cd5 | 19009 | msgid "show remote-tracking branches" |
07432cef | 19010 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 19011 | |
a6cd2cc4 | 19012 | #: builtin/show-branch.c:649 |
ef317cd5 | 19013 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 19014 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 19015 | |
a6cd2cc4 | 19016 | #: builtin/show-branch.c:651 |
ef317cd5 | 19017 | msgid "show <n> more commits after the common ancestor" |
07432cef | 19018 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 19019 | |
a6cd2cc4 | 19020 | #: builtin/show-branch.c:653 |
ef317cd5 | 19021 | msgid "synonym to more=-1" |
07432cef | 19022 | msgstr "和 more=-1 同义" |
ef317cd5 | 19023 | |
a6cd2cc4 | 19024 | #: builtin/show-branch.c:654 |
ef317cd5 | 19025 | msgid "suppress naming strings" |
07432cef | 19026 | msgstr "不显示字符串命名" |
ef317cd5 | 19027 | |
a6cd2cc4 | 19028 | #: builtin/show-branch.c:656 |
ef317cd5 | 19029 | msgid "include the current branch" |
07432cef | 19030 | msgstr "包括当前分支" |
ef317cd5 | 19031 | |
a6cd2cc4 | 19032 | #: builtin/show-branch.c:658 |
ef317cd5 | 19033 | msgid "name commits with their object names" |
07432cef | 19034 | msgstr "以对象名字命名提交" |
ef317cd5 | 19035 | |
a6cd2cc4 | 19036 | #: builtin/show-branch.c:660 |
ef317cd5 | 19037 | msgid "show possible merge bases" |
07432cef | 19038 | msgstr "显示可能合并的基线" |
ef317cd5 | 19039 | |
a6cd2cc4 | 19040 | #: builtin/show-branch.c:662 |
ef317cd5 | 19041 | msgid "show refs unreachable from any other ref" |
07432cef | 19042 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 19043 | |
a6cd2cc4 | 19044 | #: builtin/show-branch.c:664 |
ef317cd5 | 19045 | msgid "show commits in topological order" |
07432cef | 19046 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 19047 | |
a6cd2cc4 | 19048 | #: builtin/show-branch.c:667 |
ef317cd5 | 19049 | msgid "show only commits not on the first branch" |
07432cef | 19050 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 19051 | |
a6cd2cc4 | 19052 | #: builtin/show-branch.c:669 |
ef317cd5 | 19053 | msgid "show merges reachable from only one tip" |
07432cef | 19054 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 19055 | |
a6cd2cc4 | 19056 | #: builtin/show-branch.c:671 |
2e8451e8 JX |
19057 | msgid "topologically sort, maintaining date order where possible" |
19058 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 19059 | |
a6cd2cc4 | 19060 | #: builtin/show-branch.c:674 |
ef317cd5 | 19061 | msgid "<n>[,<base>]" |
07432cef | 19062 | msgstr "<n>[,<base>]" |
ef317cd5 | 19063 | |
a6cd2cc4 | 19064 | #: builtin/show-branch.c:675 |
ef317cd5 | 19065 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 19066 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 19067 | |
a6cd2cc4 | 19068 | #: builtin/show-branch.c:711 |
a0b6b246 JX |
19069 | msgid "" |
19070 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
19071 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
19072 | ||
a6cd2cc4 | 19073 | #: builtin/show-branch.c:735 |
a0b6b246 JX |
19074 | msgid "no branches given, and HEAD is not valid" |
19075 | msgstr "未提供分支,且 HEAD 无效" | |
19076 | ||
a6cd2cc4 | 19077 | #: builtin/show-branch.c:738 |
a0b6b246 JX |
19078 | msgid "--reflog option needs one branch name" |
19079 | msgstr "选项 --reflog 需要一个分支名" | |
19080 | ||
a6cd2cc4 | 19081 | #: builtin/show-branch.c:741 |
a0b6b246 JX |
19082 | #, c-format |
19083 | msgid "only %d entry can be shown at one time." | |
19084 | msgid_plural "only %d entries can be shown at one time." | |
19085 | msgstr[0] "一次只能显示 %d 个条目。" | |
19086 | msgstr[1] "一次只能显示 %d 个条目。" | |
19087 | ||
a6cd2cc4 | 19088 | #: builtin/show-branch.c:745 |
a0b6b246 JX |
19089 | #, c-format |
19090 | msgid "no such ref %s" | |
19091 | msgstr "无此引用 %s" | |
19092 | ||
a6cd2cc4 | 19093 | #: builtin/show-branch.c:831 |
a0b6b246 JX |
19094 | #, c-format |
19095 | msgid "cannot handle more than %d rev." | |
19096 | msgid_plural "cannot handle more than %d revs." | |
19097 | msgstr[0] "不能处理 %d 个以上的版本。" | |
19098 | msgstr[1] "不能处理 %d 个以上的版本。" | |
19099 | ||
a6cd2cc4 | 19100 | #: builtin/show-branch.c:835 |
a0b6b246 JX |
19101 | #, c-format |
19102 | msgid "'%s' is not a valid ref." | |
19103 | msgstr "'%s' 不是一个有效的引用。" | |
19104 | ||
a6cd2cc4 | 19105 | #: builtin/show-branch.c:838 |
a0b6b246 JX |
19106 | #, c-format |
19107 | msgid "cannot find commit %s (%s)" | |
29004bbb | 19108 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 19109 | |
d46c5519 | 19110 | #: builtin/show-ref.c:12 |
ef317cd5 | 19111 | msgid "" |
814ff314 JX |
19112 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
19113 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 19114 | msgstr "" |
814ff314 JX |
19115 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
19116 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 | 19117 | |
d46c5519 | 19118 | #: builtin/show-ref.c:13 |
94550ed3 JX |
19119 | msgid "git show-ref --exclude-existing[=<pattern>]" |
19120 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 19121 | |
d46c5519 | 19122 | #: builtin/show-ref.c:162 |
ef317cd5 | 19123 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 19124 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 19125 | |
d46c5519 | 19126 | #: builtin/show-ref.c:163 |
ef317cd5 | 19127 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 19128 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 19129 | |
d46c5519 | 19130 | #: builtin/show-ref.c:164 |
ef317cd5 | 19131 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 19132 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 19133 | |
d46c5519 | 19134 | #: builtin/show-ref.c:167 builtin/show-ref.c:169 |
2e8451e8 JX |
19135 | msgid "show the HEAD reference, even if it would be filtered out" |
19136 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 19137 | |
d46c5519 | 19138 | #: builtin/show-ref.c:171 |
ef317cd5 | 19139 | msgid "dereference tags into object IDs" |
4375c10e | 19140 | msgstr "转换标签到对象 ID" |
ef317cd5 | 19141 | |
d46c5519 JX |
19142 | #: builtin/show-ref.c:173 |
19143 | msgid "only show SHA1 hash using <n> digits" | |
19144 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" | |
19145 | ||
19146 | #: builtin/show-ref.c:177 | |
19147 | msgid "do not print results to stdout (useful with --verify)" | |
19148 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" | |
19149 | ||
19150 | #: builtin/show-ref.c:179 | |
19151 | msgid "show refs from stdin that aren't in local repository" | |
19152 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" | |
19153 | ||
19154 | #: builtin/stash.c:22 builtin/stash.c:37 | |
19155 | msgid "git stash list [<options>]" | |
19156 | msgstr "git stash list [<选项>]" | |
19157 | ||
19158 | #: builtin/stash.c:23 builtin/stash.c:42 | |
19159 | msgid "git stash show [<options>] [<stash>]" | |
19160 | msgstr "git stash show [<选项>] [<stash>]" | |
19161 | ||
19162 | #: builtin/stash.c:24 builtin/stash.c:47 | |
19163 | msgid "git stash drop [-q|--quiet] [<stash>]" | |
19164 | msgstr "git stash drop [-q|--quiet] [<stash>]" | |
19165 | ||
19166 | #: builtin/stash.c:25 | |
19167 | msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
19168 | msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
19169 | ||
19170 | #: builtin/stash.c:26 builtin/stash.c:62 | |
19171 | msgid "git stash branch <branchname> [<stash>]" | |
19172 | msgstr "git stash branch <分支名> [<stash>]" | |
19173 | ||
19174 | #: builtin/stash.c:27 builtin/stash.c:67 | |
19175 | msgid "git stash clear" | |
19176 | msgstr "git stash clear" | |
19177 | ||
19178 | #: builtin/stash.c:28 builtin/stash.c:77 | |
19179 | msgid "" | |
19180 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19181 | " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" | |
19182 | " [--] [<pathspec>...]]" | |
19183 | msgstr "" | |
19184 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19185 | " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" | |
19186 | " [--] [<路径规格>...]]" | |
19187 | ||
19188 | #: builtin/stash.c:31 builtin/stash.c:84 | |
19189 | msgid "" | |
19190 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19191 | " [-u|--include-untracked] [-a|--all] [<message>]" | |
19192 | msgstr "" | |
19193 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19194 | " [-u|--include-untracked] [-a|--all] [<消息>]" | |
19195 | ||
19196 | #: builtin/stash.c:52 | |
19197 | msgid "git stash pop [--index] [-q|--quiet] [<stash>]" | |
19198 | msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" | |
19199 | ||
19200 | #: builtin/stash.c:57 | |
19201 | msgid "git stash apply [--index] [-q|--quiet] [<stash>]" | |
19202 | msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" | |
19203 | ||
19204 | #: builtin/stash.c:72 | |
19205 | msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" | |
19206 | msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" | |
19207 | ||
19208 | #: builtin/stash.c:127 | |
19209 | #, c-format | |
19210 | msgid "'%s' is not a stash-like commit" | |
19211 | msgstr "'%s' 不像是一个贮藏提交" | |
19212 | ||
19213 | #: builtin/stash.c:147 | |
19214 | #, c-format | |
19215 | msgid "Too many revisions specified:%s" | |
19216 | msgstr "指定了太多的版本:%s" | |
19217 | ||
19218 | #: builtin/stash.c:161 git-legacy-stash.sh:548 | |
19219 | msgid "No stash entries found." | |
19220 | msgstr "未发现贮藏条目。" | |
19221 | ||
19222 | #: builtin/stash.c:175 | |
19223 | #, c-format | |
19224 | msgid "%s is not a valid reference" | |
19225 | msgstr "%s 不是一个有效的引用名" | |
19226 | ||
19227 | #: builtin/stash.c:224 git-legacy-stash.sh:75 | |
19228 | msgid "git stash clear with parameters is unimplemented" | |
19229 | msgstr "git stash clear 不支持参数" | |
19230 | ||
19231 | #: builtin/stash.c:403 | |
19232 | msgid "cannot apply a stash in the middle of a merge" | |
19233 | msgstr "无法在合并过程应用贮藏" | |
19234 | ||
19235 | #: builtin/stash.c:414 | |
19236 | #, c-format | |
19237 | msgid "could not generate diff %s^!." | |
19238 | msgstr "无法生成差异 %s^!." | |
19239 | ||
19240 | #: builtin/stash.c:421 | |
19241 | msgid "conflicts in index.Try without --index." | |
19242 | msgstr "索引中有冲突。尝试不用 --index。" | |
19243 | ||
19244 | #: builtin/stash.c:427 | |
19245 | msgid "could not save index tree" | |
19246 | msgstr "不能保存索引树" | |
19247 | ||
a5cd71ca | 19248 | #: builtin/stash.c:436 |
d46c5519 JX |
19249 | msgid "could not restore untracked files from stash" |
19250 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
19251 | ||
a5cd71ca | 19252 | #: builtin/stash.c:450 |
d46c5519 JX |
19253 | #, c-format |
19254 | msgid "Merging %s with %s" | |
19255 | msgstr "正在合并 %s 和 %s" | |
19256 | ||
a5cd71ca | 19257 | #: builtin/stash.c:460 git-legacy-stash.sh:680 |
d46c5519 JX |
19258 | msgid "Index was not unstashed." |
19259 | msgstr "索引未从贮藏中恢复。" | |
19260 | ||
a5cd71ca | 19261 | #: builtin/stash.c:522 builtin/stash.c:621 |
d46c5519 JX |
19262 | msgid "attempt to recreate the index" |
19263 | msgstr "尝试重建索引" | |
19264 | ||
a5cd71ca | 19265 | #: builtin/stash.c:555 |
d46c5519 JX |
19266 | #, c-format |
19267 | msgid "Dropped %s (%s)" | |
19268 | msgstr "丢弃了 %s(%s)" | |
19269 | ||
a5cd71ca | 19270 | #: builtin/stash.c:558 |
d46c5519 JX |
19271 | #, c-format |
19272 | msgid "%s: Could not drop stash entry" | |
19273 | msgstr "%s:无法丢弃贮藏条目" | |
19274 | ||
a5cd71ca | 19275 | #: builtin/stash.c:583 |
d46c5519 JX |
19276 | #, c-format |
19277 | msgid "'%s' is not a stash reference" | |
19278 | msgstr "'%s' 不是一个贮藏引用" | |
19279 | ||
a5cd71ca | 19280 | #: builtin/stash.c:633 git-legacy-stash.sh:694 |
d46c5519 JX |
19281 | msgid "The stash entry is kept in case you need it again." |
19282 | msgstr "贮藏条目被保留以备您再次需要。" | |
19283 | ||
a5cd71ca | 19284 | #: builtin/stash.c:656 git-legacy-stash.sh:712 |
d46c5519 JX |
19285 | msgid "No branch name specified" |
19286 | msgstr "未指定分支名" | |
19287 | ||
a5cd71ca | 19288 | #: builtin/stash.c:796 builtin/stash.c:833 |
d46c5519 JX |
19289 | #, c-format |
19290 | msgid "Cannot update %s with %s" | |
19291 | msgstr "无法用 %2$s 更新 %1$s" | |
19292 | ||
a5cd71ca | 19293 | #: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 |
d46c5519 JX |
19294 | msgid "stash message" |
19295 | msgstr "贮藏说明" | |
19296 | ||
a5cd71ca | 19297 | #: builtin/stash.c:824 |
d46c5519 JX |
19298 | msgid "\"git stash store\" requires one <commit> argument" |
19299 | msgstr "\"git stash store\" 需要一个 <提交> 参数" | |
19300 | ||
a5cd71ca | 19301 | #: builtin/stash.c:1046 git-legacy-stash.sh:217 |
d46c5519 JX |
19302 | msgid "No changes selected" |
19303 | msgstr "没有选择变更" | |
19304 | ||
a5cd71ca | 19305 | #: builtin/stash.c:1145 git-legacy-stash.sh:150 |
d46c5519 JX |
19306 | msgid "You do not have the initial commit yet" |
19307 | msgstr "您尚未建立初始提交" | |
19308 | ||
a5cd71ca | 19309 | #: builtin/stash.c:1172 git-legacy-stash.sh:165 |
d46c5519 JX |
19310 | msgid "Cannot save the current index state" |
19311 | msgstr "无法保存当前索引状态" | |
19312 | ||
a5cd71ca | 19313 | #: builtin/stash.c:1181 git-legacy-stash.sh:180 |
d46c5519 JX |
19314 | msgid "Cannot save the untracked files" |
19315 | msgstr "无法保存未跟踪文件" | |
19316 | ||
a5cd71ca | 19317 | #: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 |
d46c5519 JX |
19318 | #: git-legacy-stash.sh:213 |
19319 | msgid "Cannot save the current worktree state" | |
19320 | msgstr "无法保存当前工作区状态" | |
19321 | ||
a5cd71ca | 19322 | #: builtin/stash.c:1229 git-legacy-stash.sh:233 |
d46c5519 JX |
19323 | msgid "Cannot record working tree state" |
19324 | msgstr "不能记录工作区状态" | |
19325 | ||
a5cd71ca | 19326 | #: builtin/stash.c:1278 git-legacy-stash.sh:337 |
d46c5519 JX |
19327 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
19328 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
19329 | ||
a5cd71ca | 19330 | #: builtin/stash.c:1294 |
d46c5519 JX |
19331 | msgid "Did you forget to 'git add'?" |
19332 | msgstr "您是否忘了执行 'git add'?" | |
19333 | ||
a5cd71ca | 19334 | #: builtin/stash.c:1309 git-legacy-stash.sh:345 |
d46c5519 JX |
19335 | msgid "No local changes to save" |
19336 | msgstr "没有要保存的本地修改" | |
19337 | ||
a5cd71ca | 19338 | #: builtin/stash.c:1316 git-legacy-stash.sh:350 |
d46c5519 JX |
19339 | msgid "Cannot initialize stash" |
19340 | msgstr "无法初始化贮藏" | |
19341 | ||
a5cd71ca | 19342 | #: builtin/stash.c:1331 git-legacy-stash.sh:354 |
d46c5519 JX |
19343 | msgid "Cannot save the current status" |
19344 | msgstr "无法保存当前状态" | |
19345 | ||
a5cd71ca | 19346 | #: builtin/stash.c:1336 |
d46c5519 JX |
19347 | #, c-format |
19348 | msgid "Saved working directory and index state %s" | |
19349 | msgstr "保存工作目录和索引状态 %s" | |
19350 | ||
a5cd71ca | 19351 | #: builtin/stash.c:1426 git-legacy-stash.sh:384 |
d46c5519 JX |
19352 | msgid "Cannot remove worktree changes" |
19353 | msgstr "无法删除工作区变更" | |
19354 | ||
a5cd71ca | 19355 | #: builtin/stash.c:1461 builtin/stash.c:1497 |
d46c5519 JX |
19356 | msgid "keep index" |
19357 | msgstr "保持索引" | |
19358 | ||
a5cd71ca | 19359 | #: builtin/stash.c:1463 builtin/stash.c:1499 |
d46c5519 JX |
19360 | msgid "stash in patch mode" |
19361 | msgstr "以补丁模式贮藏" | |
19362 | ||
a5cd71ca | 19363 | #: builtin/stash.c:1464 builtin/stash.c:1500 |
d46c5519 JX |
19364 | msgid "quiet mode" |
19365 | msgstr "静默模式" | |
19366 | ||
a5cd71ca | 19367 | #: builtin/stash.c:1466 builtin/stash.c:1502 |
d46c5519 JX |
19368 | msgid "include untracked files in stash" |
19369 | msgstr "贮藏中包含未跟踪文件" | |
ef317cd5 | 19370 | |
a5cd71ca | 19371 | #: builtin/stash.c:1468 builtin/stash.c:1504 |
d46c5519 JX |
19372 | msgid "include ignore files" |
19373 | msgstr "包含忽略的文件" | |
ef317cd5 | 19374 | |
a5cd71ca | 19375 | #: builtin/stash.c:1564 |
d46c5519 JX |
19376 | #, c-format |
19377 | msgid "could not exec %s" | |
19378 | msgstr "不能执行 %s" | |
ef317cd5 | 19379 | |
a4f16749 | 19380 | #: builtin/stripspace.c:18 |
94550ed3 JX |
19381 | msgid "git stripspace [-s | --strip-comments]" |
19382 | msgstr "git stripspace [-s | --strip-comments]" | |
19383 | ||
a4f16749 | 19384 | #: builtin/stripspace.c:19 |
94550ed3 JX |
19385 | msgid "git stripspace [-c | --comment-lines]" |
19386 | msgstr "git stripspace [-c | --comment-lines]" | |
19387 | ||
06991777 | 19388 | #: builtin/stripspace.c:37 |
94550ed3 JX |
19389 | msgid "skip and remove all lines starting with comment character" |
19390 | msgstr "跳过和移除所有的注释行" | |
19391 | ||
06991777 | 19392 | #: builtin/stripspace.c:40 |
276ceeaa | 19393 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
19394 | msgstr "为每一行的行首添加注释符和空格" |
19395 | ||
a6cd2cc4 | 19396 | #: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 |
5b04ee3b JX |
19397 | #, c-format |
19398 | msgid "Expecting a full ref name, got %s" | |
19399 | msgstr "期望一个完整的引用名称,却得到 %s" | |
19400 | ||
06991777 | 19401 | #: builtin/submodule--helper.c:62 |
31e5e17b JX |
19402 | msgid "submodule--helper print-default-remote takes no arguments" |
19403 | msgstr "submodule--helper print-default-remote 不带参数" | |
19404 | ||
06991777 | 19405 | #: builtin/submodule--helper.c:100 |
5b04ee3b JX |
19406 | #, c-format |
19407 | msgid "cannot strip one component off url '%s'" | |
19408 | msgstr "无法从 url '%s' 剥离一个组件" | |
19409 | ||
a6cd2cc4 | 19410 | #: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 |
94550ed3 JX |
19411 | msgid "alternative anchor for relative paths" |
19412 | msgstr "相对路径的替代锚记(anchor)" | |
19413 | ||
06991777 | 19414 | #: builtin/submodule--helper.c:413 |
94550ed3 JX |
19415 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
19416 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
19417 | ||
a6cd2cc4 JX |
19418 | #: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 |
19419 | #: builtin/submodule--helper.c:651 | |
5b04ee3b JX |
19420 | #, c-format |
19421 | msgid "No url found for submodule path '%s' in .gitmodules" | |
19422 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
19423 | ||
06991777 | 19424 | #: builtin/submodule--helper.c:522 |
c1ac5258 JX |
19425 | #, c-format |
19426 | msgid "Entering '%s'\n" | |
19427 | msgstr "进入 '%s'\n" | |
19428 | ||
06991777 | 19429 | #: builtin/submodule--helper.c:525 |
c1ac5258 JX |
19430 | #, c-format |
19431 | msgid "" | |
19432 | "run_command returned non-zero status for %s\n" | |
19433 | "." | |
4c27fcb5 JX |
19434 | msgstr "" |
19435 | "对 %s 执行 run_command 返回非零值。\n" | |
19436 | "." | |
c1ac5258 | 19437 | |
a6cd2cc4 | 19438 | #: builtin/submodule--helper.c:547 |
c1ac5258 JX |
19439 | #, c-format |
19440 | msgid "" | |
19441 | "run_command returned non-zero status while recursing in the nested " | |
19442 | "submodules of %s\n" | |
19443 | "." | |
4c27fcb5 JX |
19444 | msgstr "" |
19445 | "在递归 %s 的子模组执行 run_command 时返回非零值。\n" | |
19446 | "." | |
c1ac5258 | 19447 | |
a6cd2cc4 | 19448 | #: builtin/submodule--helper.c:563 |
c1ac5258 JX |
19449 | msgid "Suppress output of entering each submodule command" |
19450 | msgstr "阻止进入每一个子模组命令的输出" | |
19451 | ||
a6cd2cc4 | 19452 | #: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 |
c1ac5258 JX |
19453 | msgid "Recurse into nested submodules" |
19454 | msgstr "递归进入嵌套子模组中" | |
19455 | ||
a6cd2cc4 | 19456 | #: builtin/submodule--helper.c:570 |
d46c5519 JX |
19457 | msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" |
19458 | msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" | |
c1ac5258 | 19459 | |
a6cd2cc4 | 19460 | #: builtin/submodule--helper.c:597 |
87cb7997 JX |
19461 | #, c-format |
19462 | msgid "" | |
4c27fcb5 | 19463 | "could not look up configuration '%s'. Assuming this repository is its own " |
87cb7997 JX |
19464 | "authoritative upstream." |
19465 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
19466 | ||
a6cd2cc4 | 19467 | #: builtin/submodule--helper.c:665 |
5b04ee3b JX |
19468 | #, c-format |
19469 | msgid "Failed to register url for submodule path '%s'" | |
19470 | msgstr "无法为子模组 '%s' 注册 url" | |
19471 | ||
a6cd2cc4 | 19472 | #: builtin/submodule--helper.c:669 |
5b04ee3b JX |
19473 | #, c-format |
19474 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
25c75902 | 19475 | msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n" |
5b04ee3b | 19476 | |
a6cd2cc4 | 19477 | #: builtin/submodule--helper.c:679 |
aef18cc6 | 19478 | #, c-format |
5b04ee3b | 19479 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 19480 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 19481 | |
a6cd2cc4 | 19482 | #: builtin/submodule--helper.c:686 |
5b04ee3b JX |
19483 | #, c-format |
19484 | msgid "Failed to register update mode for submodule path '%s'" | |
19485 | msgstr "无法为子模组 '%s' 注册更新模式" | |
19486 | ||
a6cd2cc4 | 19487 | #: builtin/submodule--helper.c:708 |
5b04ee3b | 19488 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 19489 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 19490 | |
a6cd2cc4 | 19491 | #: builtin/submodule--helper.c:713 |
d46c5519 JX |
19492 | msgid "git submodule--helper init [<options>] [<path>]" |
19493 | msgstr "git submodule--helper init [<选项>] [<路径>]" | |
5b04ee3b | 19494 | |
a6cd2cc4 | 19495 | #: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 |
94550ed3 JX |
19496 | #, c-format |
19497 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
19498 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
19499 | ||
a6cd2cc4 | 19500 | #: builtin/submodule--helper.c:824 |
5809aa05 JX |
19501 | #, c-format |
19502 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
19503 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
19504 | ||
a6cd2cc4 | 19505 | #: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 |
5809aa05 JX |
19506 | #, c-format |
19507 | msgid "failed to recurse into submodule '%s'" | |
c1ac5258 | 19508 | msgstr "递归子模组 '%s' 失败" |
5809aa05 | 19509 | |
a6cd2cc4 | 19510 | #: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 |
5809aa05 | 19511 | msgid "Suppress submodule status output" |
31e5e17b | 19512 | msgstr "阻止子模组状态输出" |
5809aa05 | 19513 | |
a6cd2cc4 | 19514 | #: builtin/submodule--helper.c:876 |
5809aa05 JX |
19515 | msgid "" |
19516 | "Use commit stored in the index instead of the one stored in the submodule " | |
19517 | "HEAD" | |
19518 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
19519 | ||
a6cd2cc4 | 19520 | #: builtin/submodule--helper.c:877 |
5809aa05 | 19521 | msgid "recurse into nested submodules" |
31e5e17b | 19522 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 19523 | |
a6cd2cc4 | 19524 | #: builtin/submodule--helper.c:882 |
5809aa05 JX |
19525 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
19526 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
19527 | ||
a6cd2cc4 | 19528 | #: builtin/submodule--helper.c:906 |
5809aa05 JX |
19529 | msgid "git submodule--helper name <path>" |
19530 | msgstr "git submodule--helper name <路径>" | |
19531 | ||
a6cd2cc4 | 19532 | #: builtin/submodule--helper.c:970 |
31e5e17b JX |
19533 | #, c-format |
19534 | msgid "Synchronizing submodule url for '%s'\n" | |
19535 | msgstr "为 '%s' 同步子模组 url\n" | |
19536 | ||
a6cd2cc4 | 19537 | #: builtin/submodule--helper.c:976 |
31e5e17b JX |
19538 | #, c-format |
19539 | msgid "failed to register url for submodule path '%s'" | |
19540 | msgstr "无法为子模组路径 '%s' 注册 url" | |
19541 | ||
a6cd2cc4 | 19542 | #: builtin/submodule--helper.c:990 |
31e5e17b JX |
19543 | #, c-format |
19544 | msgid "failed to get the default remote for submodule '%s'" | |
19545 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
19546 | ||
a6cd2cc4 | 19547 | #: builtin/submodule--helper.c:1001 |
31e5e17b JX |
19548 | #, c-format |
19549 | msgid "failed to update remote for submodule '%s'" | |
19550 | msgstr "无法为子模组 '%s' 更新远程关联" | |
19551 | ||
a6cd2cc4 | 19552 | #: builtin/submodule--helper.c:1048 |
31e5e17b JX |
19553 | msgid "Suppress output of synchronizing submodule url" |
19554 | msgstr "阻止子模组 url 同步的输出" | |
19555 | ||
a6cd2cc4 | 19556 | #: builtin/submodule--helper.c:1055 |
31e5e17b JX |
19557 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
19558 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
19559 | ||
a6cd2cc4 | 19560 | #: builtin/submodule--helper.c:1109 |
31e5e17b JX |
19561 | #, c-format |
19562 | msgid "" | |
19563 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
19564 | "really want to remove it including all of its history)" | |
19565 | msgstr "" | |
fd8cb379 JX |
19566 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
19567 | "-rf' 命令)" | |
31e5e17b | 19568 | |
a6cd2cc4 | 19569 | #: builtin/submodule--helper.c:1121 |
31e5e17b JX |
19570 | #, c-format |
19571 | msgid "" | |
19572 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
19573 | "them" | |
19574 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
19575 | ||
a6cd2cc4 | 19576 | #: builtin/submodule--helper.c:1129 |
31e5e17b JX |
19577 | #, c-format |
19578 | msgid "Cleared directory '%s'\n" | |
19579 | msgstr "已清除目录 '%s'\n" | |
19580 | ||
a6cd2cc4 | 19581 | #: builtin/submodule--helper.c:1131 |
31e5e17b JX |
19582 | #, c-format |
19583 | msgid "Could not remove submodule work tree '%s'\n" | |
19584 | msgstr "无法移除子模组工作区 '%s'\n" | |
19585 | ||
a6cd2cc4 | 19586 | #: builtin/submodule--helper.c:1142 |
31e5e17b JX |
19587 | #, c-format |
19588 | msgid "could not create empty submodule directory %s" | |
19589 | msgstr "不能创建空的子模组目录 %s" | |
19590 | ||
a6cd2cc4 | 19591 | #: builtin/submodule--helper.c:1158 |
31e5e17b JX |
19592 | #, c-format |
19593 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
19594 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
19595 | ||
a6cd2cc4 | 19596 | #: builtin/submodule--helper.c:1187 |
31e5e17b JX |
19597 | msgid "Remove submodule working trees even if they contain local changes" |
19598 | msgstr "删除子模组工作区,即使包含本地修改" | |
19599 | ||
a6cd2cc4 | 19600 | #: builtin/submodule--helper.c:1188 |
31e5e17b JX |
19601 | msgid "Unregister all submodules" |
19602 | msgstr "将所有子模组取消注册" | |
19603 | ||
a6cd2cc4 | 19604 | #: builtin/submodule--helper.c:1193 |
31e5e17b JX |
19605 | msgid "" |
19606 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
19607 | msgstr "" | |
19608 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
19609 | ||
a6cd2cc4 | 19610 | #: builtin/submodule--helper.c:1207 |
31e5e17b JX |
19611 | msgid "Use '--all' if you really want to deinitialize all submodules" |
19612 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
19613 | ||
a6cd2cc4 | 19614 | #: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 |
a0b6b246 JX |
19615 | #, c-format |
19616 | msgid "submodule '%s' cannot add alternate: %s" | |
19617 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
19618 | ||
a6cd2cc4 | 19619 | #: builtin/submodule--helper.c:1341 |
a0b6b246 JX |
19620 | #, c-format |
19621 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
19622 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
19623 | ||
a6cd2cc4 | 19624 | #: builtin/submodule--helper.c:1348 |
a0b6b246 JX |
19625 | #, c-format |
19626 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
19627 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
19628 | ||
a6cd2cc4 | 19629 | #: builtin/submodule--helper.c:1371 |
94550ed3 JX |
19630 | msgid "where the new submodule will be cloned to" |
19631 | msgstr "新的子模组将要克隆的路径" | |
19632 | ||
a6cd2cc4 | 19633 | #: builtin/submodule--helper.c:1374 |
94550ed3 JX |
19634 | msgid "name of the new submodule" |
19635 | msgstr "新子模组的名称" | |
19636 | ||
a6cd2cc4 | 19637 | #: builtin/submodule--helper.c:1377 |
94550ed3 JX |
19638 | msgid "url where to clone the submodule from" |
19639 | msgstr "克隆子模组的 url 地址" | |
19640 | ||
a6cd2cc4 | 19641 | #: builtin/submodule--helper.c:1385 |
94550ed3 JX |
19642 | msgid "depth for shallow clones" |
19643 | msgstr "浅克隆的深度" | |
19644 | ||
a6cd2cc4 | 19645 | #: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 |
a0b6b246 | 19646 | msgid "force cloning progress" |
29004bbb | 19647 | msgstr "强制显示克隆进度" |
a0b6b246 | 19648 | |
a6cd2cc4 | 19649 | #: builtin/submodule--helper.c:1393 |
94550ed3 JX |
19650 | msgid "" |
19651 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 19652 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
19653 | msgstr "" |
19654 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
19655 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 19656 | |
a6cd2cc4 | 19657 | #: builtin/submodule--helper.c:1424 |
94550ed3 JX |
19658 | #, c-format |
19659 | msgid "clone of '%s' into submodule path '%s' failed" | |
19660 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
19661 | ||
a6cd2cc4 | 19662 | #: builtin/submodule--helper.c:1438 |
94550ed3 JX |
19663 | #, c-format |
19664 | msgid "could not get submodule directory for '%s'" | |
19665 | msgstr "无法得到 '%s' 的子模组目录" | |
19666 | ||
a6cd2cc4 | 19667 | #: builtin/submodule--helper.c:1474 |
4c27fcb5 JX |
19668 | #, c-format |
19669 | msgid "Invalid update mode '%s' for submodule path '%s'" | |
19670 | msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" | |
19671 | ||
a6cd2cc4 | 19672 | #: builtin/submodule--helper.c:1478 |
4c27fcb5 JX |
19673 | #, c-format |
19674 | msgid "Invalid update mode '%s' configured for submodule path '%s'" | |
19675 | msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" | |
19676 | ||
a6cd2cc4 | 19677 | #: builtin/submodule--helper.c:1571 |
5b04ee3b JX |
19678 | #, c-format |
19679 | msgid "Submodule path '%s' not initialized" | |
19680 | msgstr "子模组 '%s' 尚未初始化" | |
19681 | ||
a6cd2cc4 | 19682 | #: builtin/submodule--helper.c:1575 |
5b04ee3b JX |
19683 | msgid "Maybe you want to use 'update --init'?" |
19684 | msgstr "也许您想要执行 'update --init'?" | |
19685 | ||
a6cd2cc4 | 19686 | #: builtin/submodule--helper.c:1605 |
5b04ee3b JX |
19687 | #, c-format |
19688 | msgid "Skipping unmerged submodule %s" | |
19689 | msgstr "略过未合并的子模组 %s" | |
19690 | ||
a6cd2cc4 | 19691 | #: builtin/submodule--helper.c:1634 |
5b04ee3b JX |
19692 | #, c-format |
19693 | msgid "Skipping submodule '%s'" | |
19694 | msgstr "略过子模组 '%s'" | |
19695 | ||
a6cd2cc4 | 19696 | #: builtin/submodule--helper.c:1778 |
5c57d762 JX |
19697 | #, c-format |
19698 | msgid "Failed to clone '%s'. Retry scheduled" | |
19699 | msgstr "克隆 '%s' 失败。按计划重试" | |
19700 | ||
a6cd2cc4 | 19701 | #: builtin/submodule--helper.c:1789 |
5c57d762 JX |
19702 | #, c-format |
19703 | msgid "Failed to clone '%s' a second time, aborting" | |
19704 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
19705 | ||
a6cd2cc4 | 19706 | #: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 |
5b04ee3b JX |
19707 | msgid "path into the working tree" |
19708 | msgstr "到工作区的路径" | |
19709 | ||
a6cd2cc4 | 19710 | #: builtin/submodule--helper.c:1854 |
5b04ee3b JX |
19711 | msgid "path into the working tree, across nested submodule boundaries" |
19712 | msgstr "工作区中的路径,递归嵌套子模组" | |
19713 | ||
a6cd2cc4 | 19714 | #: builtin/submodule--helper.c:1858 |
5b04ee3b JX |
19715 | msgid "rebase, merge, checkout or none" |
19716 | msgstr "rebase、merge、checkout 或 none" | |
19717 | ||
a6cd2cc4 | 19718 | #: builtin/submodule--helper.c:1864 |
5b04ee3b JX |
19719 | msgid "Create a shallow clone truncated to the specified number of revisions" |
19720 | msgstr "创建一个指定深度的浅克隆" | |
19721 | ||
a6cd2cc4 | 19722 | #: builtin/submodule--helper.c:1867 |
5b04ee3b JX |
19723 | msgid "parallel jobs" |
19724 | msgstr "并发任务" | |
19725 | ||
a6cd2cc4 | 19726 | #: builtin/submodule--helper.c:1869 |
5c57d762 | 19727 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 19728 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 19729 | |
a6cd2cc4 | 19730 | #: builtin/submodule--helper.c:1870 |
5b04ee3b JX |
19731 | msgid "don't print cloning progress" |
19732 | msgstr "不要输出克隆进度" | |
94550ed3 | 19733 | |
a6cd2cc4 | 19734 | #: builtin/submodule--helper.c:1877 |
a5cd71ca JX |
19735 | msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" |
19736 | msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" | |
5b04ee3b | 19737 | |
a6cd2cc4 | 19738 | #: builtin/submodule--helper.c:1890 |
5b04ee3b JX |
19739 | msgid "bad value for update parameter" |
19740 | msgstr "update 参数取值错误" | |
19741 | ||
a6cd2cc4 | 19742 | #: builtin/submodule--helper.c:1938 |
5c57d762 JX |
19743 | #, c-format |
19744 | msgid "" | |
19745 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
19746 | "the superproject is not on any branch" | |
19747 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
19748 | ||
a6cd2cc4 | 19749 | #: builtin/submodule--helper.c:2061 |
4c27fcb5 JX |
19750 | #, c-format |
19751 | msgid "could not get a repository handle for submodule '%s'" | |
19752 | msgstr "无法获得子模组 '%s' 的仓库句柄" | |
19753 | ||
a6cd2cc4 | 19754 | #: builtin/submodule--helper.c:2094 |
1a79b2f1 JX |
19755 | msgid "recurse into submodules" |
19756 | msgstr "在子模组中递归" | |
19757 | ||
a6cd2cc4 | 19758 | #: builtin/submodule--helper.c:2100 |
d46c5519 JX |
19759 | msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" |
19760 | msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" | |
1a79b2f1 | 19761 | |
06991777 | 19762 | #: builtin/submodule--helper.c:2156 |
4c27fcb5 JX |
19763 | msgid "check if it is safe to write to the .gitmodules file" |
19764 | msgstr "检查写入 .gitmodules 文件是否安全" | |
19765 | ||
d46c5519 JX |
19766 | #: builtin/submodule--helper.c:2159 |
19767 | msgid "unset the config in the .gitmodules file" | |
19768 | msgstr "取消 .gitmodules 文件中的设置" | |
19769 | ||
19770 | #: builtin/submodule--helper.c:2164 | |
19771 | msgid "git submodule--helper config <name> [<value>]" | |
19772 | msgstr "git submodule--helper config <名称> [<值>]" | |
4c27fcb5 | 19773 | |
d46c5519 JX |
19774 | #: builtin/submodule--helper.c:2165 |
19775 | msgid "git submodule--helper config --unset <name>" | |
19776 | msgstr "git submodule--helper config --unset <名称>" | |
19777 | ||
19778 | #: builtin/submodule--helper.c:2166 | |
4c27fcb5 JX |
19779 | msgid "git submodule--helper config --check-writeable" |
19780 | msgstr "git submodule--helper config --check-writeable" | |
19781 | ||
d46c5519 | 19782 | #: builtin/submodule--helper.c:2185 git-submodule.sh:171 |
4c27fcb5 JX |
19783 | #, sh-format |
19784 | msgid "please make sure that the .gitmodules file is in the working tree" | |
19785 | msgstr "请确认 .gitmodules 文件在工作区里" | |
19786 | ||
a5cd71ca | 19787 | #: builtin/submodule--helper.c:2235 git.c:433 git.c:683 |
1a79b2f1 JX |
19788 | #, c-format |
19789 | msgid "%s doesn't support --super-prefix" | |
19790 | msgstr "%s 不支持 --super-prefix" | |
19791 | ||
d46c5519 | 19792 | #: builtin/submodule--helper.c:2241 |
94550ed3 | 19793 | #, c-format |
5b04ee3b JX |
19794 | msgid "'%s' is not a valid submodule--helper subcommand" |
19795 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 19796 | |
a4f16749 | 19797 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
19798 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
19799 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 19800 | |
a4f16749 | 19801 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
19802 | msgid "git symbolic-ref -d [-q] <name>" |
19803 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 19804 | |
6937cb4e | 19805 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 19806 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
19807 | msgstr "不显示非符号(分离的)引用的错误信息" |
19808 | ||
6937cb4e | 19809 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
19810 | msgid "delete symbolic ref" |
19811 | msgstr "删除符号引用" | |
ef317cd5 | 19812 | |
6937cb4e | 19813 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 19814 | msgid "shorten ref output" |
6937cb4e | 19815 | msgstr "缩短引用输出" |
ef317cd5 | 19816 | |
c1ac5258 | 19817 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 19818 | msgid "reason" |
07432cef | 19819 | msgstr "原因" |
ef317cd5 | 19820 | |
c1ac5258 | 19821 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 19822 | msgid "reason of the update" |
07432cef | 19823 | msgstr "更新的原因" |
ef317cd5 | 19824 | |
c1ac5258 | 19825 | #: builtin/tag.c:25 |
ef317cd5 | 19826 | msgid "" |
d46c5519 JX |
19827 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" |
19828 | "\t\t<tagname> [<head>]" | |
814ff314 | 19829 | msgstr "" |
d46c5519 JX |
19830 | "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" |
19831 | "\t\t<标签名> [<头>]" | |
ef317cd5 | 19832 | |
d46c5519 | 19833 | #: builtin/tag.c:27 |
ef317cd5 | 19834 | msgid "git tag -d <tagname>..." |
07432cef | 19835 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 19836 | |
d46c5519 | 19837 | #: builtin/tag.c:28 |
ef317cd5 | 19838 | msgid "" |
87cb7997 JX |
19839 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
19840 | "points-at <object>]\n" | |
94550ed3 | 19841 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 19842 | msgstr "" |
87cb7997 JX |
19843 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
19844 | "at <对象>]\n" | |
94550ed3 | 19845 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 19846 | |
d46c5519 | 19847 | #: builtin/tag.c:30 |
1a79b2f1 JX |
19848 | msgid "git tag -v [--format=<format>] <tagname>..." |
19849 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 19850 | |
a6cd2cc4 | 19851 | #: builtin/tag.c:89 |
c04f5ac3 JX |
19852 | #, c-format |
19853 | msgid "tag '%s' not found." | |
55a16ee4 | 19854 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 19855 | |
a6cd2cc4 | 19856 | #: builtin/tag.c:105 |
c04f5ac3 JX |
19857 | #, c-format |
19858 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 19859 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 19860 | |
a6cd2cc4 | 19861 | #: builtin/tag.c:135 |
a77c07d9 | 19862 | #, c-format |
c04f5ac3 JX |
19863 | msgid "" |
19864 | "\n" | |
6acbf033 JX |
19865 | "Write a message for tag:\n" |
19866 | " %s\n" | |
a77c07d9 | 19867 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
19868 | msgstr "" |
19869 | "\n" | |
55a16ee4 | 19870 | "输入一个标签说明:\n" |
6acbf033 | 19871 | " %s\n" |
a77c07d9 | 19872 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 19873 | |
a6cd2cc4 | 19874 | #: builtin/tag.c:139 |
a77c07d9 | 19875 | #, c-format |
c04f5ac3 JX |
19876 | msgid "" |
19877 | "\n" | |
6acbf033 JX |
19878 | "Write a message for tag:\n" |
19879 | " %s\n" | |
a77c07d9 | 19880 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 19881 | "want to.\n" |
c04f5ac3 JX |
19882 | msgstr "" |
19883 | "\n" | |
55a16ee4 | 19884 | "输入一个标签说明:\n" |
6acbf033 | 19885 | " %s\n" |
a77c07d9 | 19886 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 19887 | |
a6cd2cc4 | 19888 | #: builtin/tag.c:198 |
c04f5ac3 | 19889 | msgid "unable to sign the tag" |
55a16ee4 | 19890 | msgstr "无法签署标签" |
c04f5ac3 | 19891 | |
a6cd2cc4 | 19892 | #: builtin/tag.c:200 |
c04f5ac3 | 19893 | msgid "unable to write tag file" |
55a16ee4 | 19894 | msgstr "无法写标签文件" |
c04f5ac3 | 19895 | |
a6cd2cc4 | 19896 | #: builtin/tag.c:216 |
d46c5519 JX |
19897 | #, c-format |
19898 | msgid "" | |
19899 | "You have created a nested tag. The object referred to by your new tag is\n" | |
19900 | "already a tag. If you meant to tag the object that it points to, use:\n" | |
19901 | "\n" | |
19902 | "\tgit tag -f %s %s^{}" | |
19903 | msgstr "" | |
19904 | "您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n" | |
19905 | "对其指向的目标创建标签,使用:\n" | |
19906 | "\n" | |
19907 | "\tgit tag -f %s %s^{}" | |
19908 | ||
a6cd2cc4 | 19909 | #: builtin/tag.c:232 |
c04f5ac3 | 19910 | msgid "bad object type." |
90e6ef53 | 19911 | msgstr "坏的对象类型。" |
c04f5ac3 | 19912 | |
a6cd2cc4 | 19913 | #: builtin/tag.c:284 |
c04f5ac3 | 19914 | msgid "no tag message?" |
55a16ee4 | 19915 | msgstr "无标签说明?" |
c04f5ac3 | 19916 | |
a6cd2cc4 | 19917 | #: builtin/tag.c:291 |
c04f5ac3 JX |
19918 | #, c-format |
19919 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 19920 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 19921 | |
a6cd2cc4 | 19922 | #: builtin/tag.c:402 |
ef317cd5 | 19923 | msgid "list tag names" |
55a16ee4 | 19924 | msgstr "列出标签名称" |
ef317cd5 | 19925 | |
a6cd2cc4 | 19926 | #: builtin/tag.c:404 |
ef317cd5 | 19927 | msgid "print <n> lines of each tag message" |
55a16ee4 | 19928 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 19929 | |
a6cd2cc4 | 19930 | #: builtin/tag.c:406 |
ef317cd5 | 19931 | msgid "delete tags" |
55a16ee4 | 19932 | msgstr "删除标签" |
ef317cd5 | 19933 | |
a6cd2cc4 | 19934 | #: builtin/tag.c:407 |
ef317cd5 | 19935 | msgid "verify tags" |
55a16ee4 | 19936 | msgstr "验证标签" |
ef317cd5 | 19937 | |
a6cd2cc4 | 19938 | #: builtin/tag.c:409 |
ef317cd5 | 19939 | msgid "Tag creation options" |
55a16ee4 | 19940 | msgstr "标签创建选项" |
ef317cd5 | 19941 | |
a6cd2cc4 | 19942 | #: builtin/tag.c:411 |
ef317cd5 | 19943 | msgid "annotated tag, needs a message" |
55a16ee4 | 19944 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 19945 | |
a6cd2cc4 | 19946 | #: builtin/tag.c:413 |
ef317cd5 | 19947 | msgid "tag message" |
55a16ee4 | 19948 | msgstr "标签说明" |
ef317cd5 | 19949 | |
a6cd2cc4 | 19950 | #: builtin/tag.c:415 |
31e5e17b JX |
19951 | msgid "force edit of tag message" |
19952 | msgstr "强制编辑标签说明" | |
19953 | ||
a6cd2cc4 | 19954 | #: builtin/tag.c:416 |
ef317cd5 | 19955 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 19956 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 19957 | |
a6cd2cc4 | 19958 | #: builtin/tag.c:419 |
ef317cd5 | 19959 | msgid "use another key to sign the tag" |
55a16ee4 | 19960 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 19961 | |
a6cd2cc4 | 19962 | #: builtin/tag.c:420 |
ef317cd5 | 19963 | msgid "replace the tag if exists" |
55a16ee4 | 19964 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 19965 | |
a6cd2cc4 | 19966 | #: builtin/tag.c:421 builtin/update-ref.c:369 |
03ea3327 | 19967 | msgid "create a reflog" |
1b7f4a34 JX |
19968 | msgstr "创建引用日志" |
19969 | ||
a6cd2cc4 | 19970 | #: builtin/tag.c:423 |
814ff314 | 19971 | msgid "Tag listing options" |
55a16ee4 | 19972 | msgstr "标签列表选项" |
814ff314 | 19973 | |
a6cd2cc4 | 19974 | #: builtin/tag.c:424 |
ef317cd5 | 19975 | msgid "show tag list in columns" |
55a16ee4 | 19976 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 19977 | |
a6cd2cc4 | 19978 | #: builtin/tag.c:425 builtin/tag.c:427 |
ef317cd5 | 19979 | msgid "print only tags that contain the commit" |
87cb7997 | 19980 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 19981 | |
a6cd2cc4 | 19982 | #: builtin/tag.c:426 builtin/tag.c:428 |
87cb7997 JX |
19983 | msgid "print only tags that don't contain the commit" |
19984 | msgstr "只打印不包含该提交的标签" | |
19985 | ||
a6cd2cc4 | 19986 | #: builtin/tag.c:429 |
94550ed3 JX |
19987 | msgid "print only tags that are merged" |
19988 | msgstr "只打印已经合并的标签" | |
19989 | ||
a6cd2cc4 | 19990 | #: builtin/tag.c:430 |
94550ed3 JX |
19991 | msgid "print only tags that are not merged" |
19992 | msgstr "只打印尚未合并的标签" | |
19993 | ||
a6cd2cc4 | 19994 | #: builtin/tag.c:434 |
ef317cd5 | 19995 | msgid "print only tags of the object" |
87cb7997 | 19996 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 19997 | |
a6cd2cc4 | 19998 | #: builtin/tag.c:482 |
8ada9598 | 19999 | msgid "--column and -n are incompatible" |
81809b99 | 20000 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 20001 | |
a6cd2cc4 | 20002 | #: builtin/tag.c:504 |
87cb7997 JX |
20003 | msgid "-n option is only allowed in list mode" |
20004 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 20005 | |
a6cd2cc4 | 20006 | #: builtin/tag.c:506 |
87cb7997 JX |
20007 | msgid "--contains option is only allowed in list mode" |
20008 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 20009 | |
a6cd2cc4 | 20010 | #: builtin/tag.c:508 |
87cb7997 JX |
20011 | msgid "--no-contains option is only allowed in list mode" |
20012 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 20013 | |
a6cd2cc4 | 20014 | #: builtin/tag.c:510 |
87cb7997 JX |
20015 | msgid "--points-at option is only allowed in list mode" |
20016 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 20017 | |
a6cd2cc4 | 20018 | #: builtin/tag.c:512 |
87cb7997 JX |
20019 | msgid "--merged and --no-merged options are only allowed in list mode" |
20020 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
20021 | ||
a6cd2cc4 | 20022 | #: builtin/tag.c:523 |
c04f5ac3 JX |
20023 | msgid "only one -F or -m option is allowed." |
20024 | msgstr "只允许一个 -F 或 -m 选项。" | |
20025 | ||
a6cd2cc4 | 20026 | #: builtin/tag.c:542 |
c04f5ac3 JX |
20027 | msgid "too many params" |
20028 | msgstr "太多参数" | |
20029 | ||
a6cd2cc4 | 20030 | #: builtin/tag.c:548 |
c04f5ac3 JX |
20031 | #, c-format |
20032 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 20033 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 20034 | |
a6cd2cc4 | 20035 | #: builtin/tag.c:553 |
c04f5ac3 JX |
20036 | #, c-format |
20037 | msgid "tag '%s' already exists" | |
55a16ee4 | 20038 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 20039 | |
a6cd2cc4 | 20040 | #: builtin/tag.c:584 |
c04f5ac3 JX |
20041 | #, c-format |
20042 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 20043 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 20044 | |
c1ac5258 | 20045 | #: builtin/unpack-objects.c:500 |
6c94aba5 JX |
20046 | msgid "Unpacking objects" |
20047 | msgstr "展开对象中" | |
20048 | ||
06991777 | 20049 | #: builtin/update-index.c:83 |
7aea43ff JX |
20050 | #, c-format |
20051 | msgid "failed to create directory %s" | |
c1ac5258 | 20052 | msgstr "创建目录 %s 失败" |
7aea43ff | 20053 | |
06991777 | 20054 | #: builtin/update-index.c:99 |
7aea43ff JX |
20055 | #, c-format |
20056 | msgid "failed to create file %s" | |
c1ac5258 | 20057 | msgstr "创建文件 %s 失败" |
7aea43ff | 20058 | |
06991777 | 20059 | #: builtin/update-index.c:107 |
7aea43ff JX |
20060 | #, c-format |
20061 | msgid "failed to delete file %s" | |
c1ac5258 | 20062 | msgstr "删除文件 %s 失败" |
7aea43ff | 20063 | |
06991777 | 20064 | #: builtin/update-index.c:114 builtin/update-index.c:220 |
7aea43ff JX |
20065 | #, c-format |
20066 | msgid "failed to delete directory %s" | |
c1ac5258 | 20067 | msgstr "删除目录 %s 失败" |
7aea43ff | 20068 | |
06991777 | 20069 | #: builtin/update-index.c:139 |
7aea43ff | 20070 | #, c-format |
276ceeaa JX |
20071 | msgid "Testing mtime in '%s' " |
20072 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 20073 | |
06991777 | 20074 | #: builtin/update-index.c:153 |
7aea43ff JX |
20075 | msgid "directory stat info does not change after adding a new file" |
20076 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
20077 | ||
06991777 | 20078 | #: builtin/update-index.c:166 |
7aea43ff JX |
20079 | msgid "directory stat info does not change after adding a new directory" |
20080 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
20081 | ||
06991777 | 20082 | #: builtin/update-index.c:179 |
7aea43ff JX |
20083 | msgid "directory stat info changes after updating a file" |
20084 | msgstr "更新一个文件后,目录的状态信息被修改" | |
20085 | ||
06991777 | 20086 | #: builtin/update-index.c:190 |
7aea43ff JX |
20087 | msgid "directory stat info changes after adding a file inside subdirectory" |
20088 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
20089 | ||
06991777 | 20090 | #: builtin/update-index.c:201 |
7aea43ff JX |
20091 | msgid "directory stat info does not change after deleting a file" |
20092 | msgstr "删除一个文件后,目录的状态信息未改变" | |
20093 | ||
06991777 | 20094 | #: builtin/update-index.c:214 |
7aea43ff JX |
20095 | msgid "directory stat info does not change after deleting a directory" |
20096 | msgstr "删除一个目录后,目录的状态信息未改变" | |
20097 | ||
06991777 | 20098 | #: builtin/update-index.c:221 |
7aea43ff JX |
20099 | msgid " OK" |
20100 | msgstr " OK" | |
20101 | ||
06991777 | 20102 | #: builtin/update-index.c:589 |
814ff314 JX |
20103 | msgid "git update-index [<options>] [--] [<file>...]" |
20104 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 20105 | |
a5cd71ca | 20106 | #: builtin/update-index.c:972 |
ef317cd5 | 20107 | msgid "continue refresh even when index needs update" |
07432cef | 20108 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 20109 | |
a5cd71ca | 20110 | #: builtin/update-index.c:975 |
ef317cd5 | 20111 | msgid "refresh: ignore submodules" |
07432cef | 20112 | msgstr "刷新:忽略子模组" |
8ada9598 | 20113 | |
a5cd71ca | 20114 | #: builtin/update-index.c:978 |
ef317cd5 | 20115 | msgid "do not ignore new files" |
07432cef | 20116 | msgstr "不忽略新的文件" |
8ada9598 | 20117 | |
a5cd71ca | 20118 | #: builtin/update-index.c:980 |
ef317cd5 | 20119 | msgid "let files replace directories and vice-versa" |
07432cef | 20120 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 20121 | |
a5cd71ca | 20122 | #: builtin/update-index.c:982 |
ef317cd5 | 20123 | msgid "notice files missing from worktree" |
07432cef | 20124 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 20125 | |
a5cd71ca | 20126 | #: builtin/update-index.c:984 |
ef317cd5 | 20127 | msgid "refresh even if index contains unmerged entries" |
07432cef | 20128 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 20129 | |
a5cd71ca | 20130 | #: builtin/update-index.c:987 |
ef317cd5 | 20131 | msgid "refresh stat information" |
07432cef | 20132 | msgstr "刷新统计信息" |
ef317cd5 | 20133 | |
a5cd71ca | 20134 | #: builtin/update-index.c:991 |
ef317cd5 | 20135 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 20136 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 20137 | |
a5cd71ca | 20138 | #: builtin/update-index.c:995 |
6c94aba5 | 20139 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 20140 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 20141 | |
a5cd71ca | 20142 | #: builtin/update-index.c:996 |
ef317cd5 | 20143 | msgid "add the specified entry to the index" |
07432cef | 20144 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 20145 | |
a5cd71ca | 20146 | #: builtin/update-index.c:1006 |
ef317cd5 | 20147 | msgid "mark files as \"not changing\"" |
07432cef | 20148 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 20149 | |
a5cd71ca | 20150 | #: builtin/update-index.c:1009 |
ef317cd5 | 20151 | msgid "clear assumed-unchanged bit" |
07432cef | 20152 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 20153 | |
a5cd71ca | 20154 | #: builtin/update-index.c:1012 |
ef317cd5 | 20155 | msgid "mark files as \"index-only\"" |
07432cef | 20156 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 20157 | |
a5cd71ca | 20158 | #: builtin/update-index.c:1015 |
ef317cd5 | 20159 | msgid "clear skip-worktree bit" |
07432cef | 20160 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 20161 | |
a5cd71ca | 20162 | #: builtin/update-index.c:1018 |
ef317cd5 | 20163 | msgid "add to index only; do not add content to object database" |
07432cef | 20164 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 20165 | |
a5cd71ca | 20166 | #: builtin/update-index.c:1020 |
ef317cd5 | 20167 | msgid "remove named paths even if present in worktree" |
07432cef | 20168 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 20169 | |
a5cd71ca | 20170 | #: builtin/update-index.c:1022 |
ef317cd5 | 20171 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 20172 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 20173 | |
a5cd71ca | 20174 | #: builtin/update-index.c:1024 |
ef317cd5 | 20175 | msgid "read list of paths to be updated from standard input" |
07432cef | 20176 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 20177 | |
a5cd71ca | 20178 | #: builtin/update-index.c:1028 |
ef317cd5 | 20179 | msgid "add entries from standard input to the index" |
07432cef | 20180 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 20181 | |
a5cd71ca | 20182 | #: builtin/update-index.c:1032 |
ef317cd5 | 20183 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 20184 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 20185 | |
a5cd71ca | 20186 | #: builtin/update-index.c:1036 |
ef317cd5 | 20187 | msgid "only update entries that differ from HEAD" |
07432cef | 20188 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 20189 | |
a5cd71ca | 20190 | #: builtin/update-index.c:1040 |
ef317cd5 | 20191 | msgid "ignore files missing from worktree" |
07432cef | 20192 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 20193 | |
a5cd71ca | 20194 | #: builtin/update-index.c:1043 |
ef317cd5 | 20195 | msgid "report actions to standard output" |
07432cef | 20196 | msgstr "在标准输出显示操作" |
ef317cd5 | 20197 | |
a5cd71ca | 20198 | #: builtin/update-index.c:1045 |
ef317cd5 | 20199 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 20200 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 20201 | |
a5cd71ca | 20202 | #: builtin/update-index.c:1049 |
ef317cd5 | 20203 | msgid "write index in this format" |
07432cef | 20204 | msgstr "以这种格式写入索引区" |
ef317cd5 | 20205 | |
a5cd71ca | 20206 | #: builtin/update-index.c:1051 |
6acbf033 JX |
20207 | msgid "enable or disable split index" |
20208 | msgstr "启用或禁用索引拆分" | |
20209 | ||
a5cd71ca | 20210 | #: builtin/update-index.c:1053 |
7aea43ff JX |
20211 | msgid "enable/disable untracked cache" |
20212 | msgstr "启用/禁用对未跟踪文件的缓存" | |
20213 | ||
a5cd71ca | 20214 | #: builtin/update-index.c:1055 |
276ceeaa JX |
20215 | msgid "test if the filesystem supports untracked cache" |
20216 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
20217 | ||
a5cd71ca | 20218 | #: builtin/update-index.c:1057 |
7aea43ff JX |
20219 | msgid "enable untracked cache without testing the filesystem" |
20220 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
20221 | ||
a5cd71ca | 20222 | #: builtin/update-index.c:1059 |
5809aa05 JX |
20223 | msgid "write out the index even if is not flagged as changed" |
20224 | msgstr "即使没有被标记为已更改,也要写出索引" | |
20225 | ||
a5cd71ca | 20226 | #: builtin/update-index.c:1061 |
5809aa05 JX |
20227 | msgid "enable or disable file system monitor" |
20228 | msgstr "启用或禁用文件系统监控" | |
20229 | ||
a5cd71ca | 20230 | #: builtin/update-index.c:1063 |
5809aa05 JX |
20231 | msgid "mark files as fsmonitor valid" |
20232 | msgstr "标记文件为 fsmonitor 有效" | |
20233 | ||
a5cd71ca | 20234 | #: builtin/update-index.c:1066 |
5809aa05 JX |
20235 | msgid "clear fsmonitor valid bit" |
20236 | msgstr "清除 fsmonitor 有效位" | |
20237 | ||
a5cd71ca | 20238 | #: builtin/update-index.c:1169 |
87cb7997 JX |
20239 | msgid "" |
20240 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
20241 | "enable split index" | |
20242 | msgstr "" | |
20243 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
20244 | ||
a5cd71ca | 20245 | #: builtin/update-index.c:1178 |
87cb7997 JX |
20246 | msgid "" |
20247 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
20248 | "disable split index" | |
20249 | msgstr "" | |
20250 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
20251 | ||
a5cd71ca | 20252 | #: builtin/update-index.c:1190 |
a0b6b246 JX |
20253 | msgid "" |
20254 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
20255 | "to disable the untracked cache" | |
275588f9 JX |
20256 | msgstr "" |
20257 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
20258 | "改它。" | |
a0b6b246 | 20259 | |
a5cd71ca | 20260 | #: builtin/update-index.c:1194 |
276ceeaa JX |
20261 | msgid "Untracked cache disabled" |
20262 | msgstr "缓存未跟踪文件被禁用" | |
20263 | ||
a5cd71ca | 20264 | #: builtin/update-index.c:1202 |
a0b6b246 JX |
20265 | msgid "" |
20266 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
20267 | "to enable the untracked cache" | |
275588f9 JX |
20268 | msgstr "" |
20269 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
20270 | "修改它。" | |
a0b6b246 | 20271 | |
a5cd71ca | 20272 | #: builtin/update-index.c:1206 |
276ceeaa JX |
20273 | #, c-format |
20274 | msgid "Untracked cache enabled for '%s'" | |
20275 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
20276 | ||
a5cd71ca | 20277 | #: builtin/update-index.c:1214 |
5809aa05 | 20278 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 20279 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 20280 | |
a5cd71ca | 20281 | #: builtin/update-index.c:1218 |
5809aa05 JX |
20282 | msgid "fsmonitor enabled" |
20283 | msgstr "fsmonitor 被启用" | |
20284 | ||
a5cd71ca | 20285 | #: builtin/update-index.c:1221 |
5809aa05 JX |
20286 | msgid "" |
20287 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 20288 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 20289 | |
a5cd71ca | 20290 | #: builtin/update-index.c:1225 |
5809aa05 JX |
20291 | msgid "fsmonitor disabled" |
20292 | msgstr "fsmonitor 被禁用" | |
20293 | ||
a4f16749 | 20294 | #: builtin/update-ref.c:10 |
814ff314 JX |
20295 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
20296 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 20297 | |
a4f16749 | 20298 | #: builtin/update-ref.c:11 |
814ff314 JX |
20299 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
20300 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 20301 | |
a4f16749 | 20302 | #: builtin/update-ref.c:12 |
814ff314 JX |
20303 | msgid "git update-ref [<options>] --stdin [-z]" |
20304 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 20305 | |
c1ac5258 | 20306 | #: builtin/update-ref.c:364 |
ef317cd5 | 20307 | msgid "delete the reference" |
07432cef | 20308 | msgstr "删除引用" |
ef317cd5 | 20309 | |
c1ac5258 | 20310 | #: builtin/update-ref.c:366 |
ef317cd5 | 20311 | msgid "update <refname> not the one it points to" |
07432cef | 20312 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 20313 | |
c1ac5258 | 20314 | #: builtin/update-ref.c:367 |
90314792 JX |
20315 | msgid "stdin has NUL-terminated arguments" |
20316 | msgstr "标准输入有以 NUL 字符终止的参数" | |
20317 | ||
c1ac5258 | 20318 | #: builtin/update-ref.c:368 |
90314792 JX |
20319 | msgid "read updates from stdin" |
20320 | msgstr "从标准输入读取更新" | |
20321 | ||
a4f16749 | 20322 | #: builtin/update-server-info.c:7 |
ef317cd5 | 20323 | msgid "git update-server-info [--force]" |
07432cef | 20324 | msgstr "git update-server-info [--force]" |
ef317cd5 | 20325 | |
a4f16749 | 20326 | #: builtin/update-server-info.c:15 |
ef317cd5 | 20327 | msgid "update the info files from scratch" |
07432cef | 20328 | msgstr "从头开始更新文件信息" |
ef317cd5 | 20329 | |
fd8cb379 JX |
20330 | #: builtin/upload-pack.c:11 |
20331 | msgid "git upload-pack [<options>] <dir>" | |
20332 | msgstr "git upload-pack [<选项>] <目录>" | |
20333 | ||
d46c5519 JX |
20334 | #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 |
20335 | msgid "quit after a single request/response exchange" | |
20336 | msgstr "在一次单独的请求/响应之后退出" | |
20337 | ||
fd8cb379 JX |
20338 | #: builtin/upload-pack.c:25 |
20339 | msgid "exit immediately after initial ref advertisement" | |
20340 | msgstr "在初始的引用广告后立即退出" | |
20341 | ||
20342 | #: builtin/upload-pack.c:27 | |
20343 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
20344 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
20345 | ||
20346 | #: builtin/upload-pack.c:29 | |
20347 | msgid "interrupt transfer after <n> seconds of inactivity" | |
20348 | msgstr "不活动 <n> 秒钟后终止传输" | |
20349 | ||
a6cd2cc4 | 20350 | #: builtin/verify-commit.c:19 |
814ff314 JX |
20351 | msgid "git verify-commit [-v | --verbose] <commit>..." |
20352 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 20353 | |
a6cd2cc4 | 20354 | #: builtin/verify-commit.c:68 |
6acbf033 JX |
20355 | msgid "print commit contents" |
20356 | msgstr "打印提交内容" | |
20357 | ||
a6cd2cc4 | 20358 | #: builtin/verify-commit.c:69 builtin/verify-tag.c:37 |
1b7f4a34 JX |
20359 | msgid "print raw gpg status output" |
20360 | msgstr "打印原始 gpg 状态输出" | |
20361 | ||
a4f16749 | 20362 | #: builtin/verify-pack.c:55 |
814ff314 JX |
20363 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
20364 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 20365 | |
a4f16749 | 20366 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
20367 | msgid "verbose" |
20368 | msgstr "冗长输出" | |
20369 | ||
a4f16749 | 20370 | #: builtin/verify-pack.c:67 |
ef317cd5 | 20371 | msgid "show statistics only" |
07432cef | 20372 | msgstr "只显示统计" |
ef317cd5 | 20373 | |
a6cd2cc4 | 20374 | #: builtin/verify-tag.c:18 |
1a79b2f1 JX |
20375 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
20376 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 20377 | |
a6cd2cc4 | 20378 | #: builtin/verify-tag.c:36 |
ef317cd5 | 20379 | msgid "print tag contents" |
55a16ee4 | 20380 | msgstr "打印标签内容" |
ef317cd5 | 20381 | |
a5cd71ca | 20382 | #: builtin/worktree.c:17 |
31e5e17b JX |
20383 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
20384 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 20385 | |
a5cd71ca | 20386 | #: builtin/worktree.c:18 |
5c57d762 JX |
20387 | msgid "git worktree list [<options>]" |
20388 | msgstr "git worktree list [<选项>]" | |
20389 | ||
a5cd71ca | 20390 | #: builtin/worktree.c:19 |
5c57d762 JX |
20391 | msgid "git worktree lock [<options>] <path>" |
20392 | msgstr "git worktree lock [<选项>] <路径>" | |
20393 | ||
a5cd71ca | 20394 | #: builtin/worktree.c:20 |
31e5e17b JX |
20395 | msgid "git worktree move <worktree> <new-path>" |
20396 | msgstr "git worktree move <工作区> <新路径>" | |
20397 | ||
a5cd71ca | 20398 | #: builtin/worktree.c:21 |
5bb01d4f JX |
20399 | msgid "git worktree prune [<options>]" |
20400 | msgstr "git worktree prune [<选项>]" | |
20401 | ||
a5cd71ca | 20402 | #: builtin/worktree.c:22 |
31e5e17b JX |
20403 | msgid "git worktree remove [<options>] <worktree>" |
20404 | msgstr "git worktree remove [<选项>] <工作区>" | |
20405 | ||
a5cd71ca | 20406 | #: builtin/worktree.c:23 |
5c57d762 JX |
20407 | msgid "git worktree unlock <path>" |
20408 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 20409 | |
a5cd71ca | 20410 | #: builtin/worktree.c:60 builtin/worktree.c:898 |
4c27fcb5 JX |
20411 | #, c-format |
20412 | msgid "failed to delete '%s'" | |
20413 | msgstr "删除 '%s' 失败" | |
20414 | ||
a5cd71ca | 20415 | #: builtin/worktree.c:79 |
5bb01d4f JX |
20416 | #, c-format |
20417 | msgid "Removing worktrees/%s: not a valid directory" | |
20418 | msgstr "删除工作区/%s:不是一个有效的目录" | |
20419 | ||
a5cd71ca | 20420 | #: builtin/worktree.c:85 |
5bb01d4f JX |
20421 | #, c-format |
20422 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
20423 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
20424 | ||
a5cd71ca | 20425 | #: builtin/worktree.c:90 builtin/worktree.c:99 |
5bb01d4f JX |
20426 | #, c-format |
20427 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
20428 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
20429 | ||
a5cd71ca | 20430 | #: builtin/worktree.c:109 |
6937cb4e JX |
20431 | #, c-format |
20432 | msgid "" | |
20433 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
20434 | "%<PRIuMAX>)" | |
20435 | msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
20436 | ||
a5cd71ca | 20437 | #: builtin/worktree.c:117 |
5bb01d4f JX |
20438 | #, c-format |
20439 | msgid "Removing worktrees/%s: invalid gitdir file" | |
20440 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
20441 | ||
a5cd71ca | 20442 | #: builtin/worktree.c:126 |
5bb01d4f JX |
20443 | #, c-format |
20444 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
20445 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
20446 | ||
a5cd71ca | 20447 | #: builtin/worktree.c:165 |
1a79b2f1 JX |
20448 | msgid "report pruned working trees" |
20449 | msgstr "报告清除的工作区" | |
20450 | ||
a5cd71ca | 20451 | #: builtin/worktree.c:167 |
1a79b2f1 | 20452 | msgid "expire working trees older than <time>" |
58b6f078 | 20453 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 20454 | |
a5cd71ca | 20455 | #: builtin/worktree.c:234 |
5bb01d4f JX |
20456 | #, c-format |
20457 | msgid "'%s' already exists" | |
20458 | msgstr "'%s' 已经存在" | |
20459 | ||
a5cd71ca | 20460 | #: builtin/worktree.c:251 |
4c27fcb5 JX |
20461 | #, c-format |
20462 | msgid "unable to re-add worktree '%s'" | |
20463 | msgstr "无法再次添加工作区 '%s'" | |
20464 | ||
a5cd71ca | 20465 | #: builtin/worktree.c:256 |
4c27fcb5 JX |
20466 | #, c-format |
20467 | msgid "" | |
20468 | "'%s' is a missing but locked worktree;\n" | |
20469 | "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" | |
20470 | msgstr "" | |
20471 | "'%s' 是一个丢失但锁定的工作区,使用\n" | |
20472 | "'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除" | |
20473 | ||
a5cd71ca | 20474 | #: builtin/worktree.c:258 |
4c27fcb5 JX |
20475 | #, c-format |
20476 | msgid "" | |
20477 | "'%s' is a missing but already registered worktree;\n" | |
20478 | "use 'add -f' to override, or 'prune' or 'remove' to clear" | |
20479 | msgstr "" | |
20480 | "'%s' 是一个丢失但已经注册的工作区,使用\n" | |
20481 | "'add -f' 覆盖,或 'prune' 或 'remove' 清除" | |
20482 | ||
a5cd71ca | 20483 | #: builtin/worktree.c:308 |
5bb01d4f JX |
20484 | #, c-format |
20485 | msgid "could not create directory of '%s'" | |
20486 | msgstr "不能创建目录 '%s'" | |
20487 | ||
a5cd71ca | 20488 | #: builtin/worktree.c:439 builtin/worktree.c:445 |
fd8cb379 JX |
20489 | #, c-format |
20490 | msgid "Preparing worktree (new branch '%s')" | |
20491 | msgstr "准备工作区(新分支 '%s')" | |
20492 | ||
a5cd71ca | 20493 | #: builtin/worktree.c:441 |
fd8cb379 JX |
20494 | #, c-format |
20495 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
20496 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
20497 | ||
a5cd71ca | 20498 | #: builtin/worktree.c:450 |
fd8cb379 JX |
20499 | #, c-format |
20500 | msgid "Preparing worktree (checking out '%s')" | |
20501 | msgstr "准备工作区(检出 '%s')" | |
20502 | ||
a5cd71ca | 20503 | #: builtin/worktree.c:456 |
5bb01d4f | 20504 | #, c-format |
fd8cb379 JX |
20505 | msgid "Preparing worktree (detached HEAD %s)" |
20506 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 20507 | |
a5cd71ca | 20508 | #: builtin/worktree.c:497 |
5bb01d4f | 20509 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 20510 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 20511 | |
a5cd71ca | 20512 | #: builtin/worktree.c:500 |
5bb01d4f JX |
20513 | msgid "create a new branch" |
20514 | msgstr "创建一个新分支" | |
20515 | ||
a5cd71ca | 20516 | #: builtin/worktree.c:502 |
5bb01d4f JX |
20517 | msgid "create or reset a branch" |
20518 | msgstr "创建或重置一个分支" | |
20519 | ||
a5cd71ca | 20520 | #: builtin/worktree.c:504 |
5b04ee3b JX |
20521 | msgid "populate the new working tree" |
20522 | msgstr "生成新的工作区" | |
20523 | ||
a5cd71ca | 20524 | #: builtin/worktree.c:505 |
60638e98 JX |
20525 | msgid "keep the new working tree locked" |
20526 | msgstr "锁定新工作区" | |
20527 | ||
a5cd71ca | 20528 | #: builtin/worktree.c:508 |
5809aa05 JX |
20529 | msgid "set up tracking mode (see git-branch(1))" |
20530 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
20531 | ||
a5cd71ca | 20532 | #: builtin/worktree.c:511 |
5809aa05 JX |
20533 | msgid "try to match the new branch name with a remote-tracking branch" |
20534 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
20535 | ||
a5cd71ca | 20536 | #: builtin/worktree.c:519 |
1b7f4a34 JX |
20537 | msgid "-b, -B, and --detach are mutually exclusive" |
20538 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 20539 | |
a5cd71ca | 20540 | #: builtin/worktree.c:580 |
5809aa05 JX |
20541 | msgid "--[no-]track can only be used if a new branch is created" |
20542 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
20543 | ||
a5cd71ca | 20544 | #: builtin/worktree.c:680 |
5c57d762 JX |
20545 | msgid "reason for locking" |
20546 | msgstr "锁定原因" | |
20547 | ||
a5cd71ca JX |
20548 | #: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 |
20549 | #: builtin/worktree.c:926 | |
5c57d762 JX |
20550 | #, c-format |
20551 | msgid "'%s' is not a working tree" | |
20552 | msgstr "'%s' 不是一个工作区" | |
20553 | ||
a5cd71ca | 20554 | #: builtin/worktree.c:694 builtin/worktree.c:727 |
5c57d762 JX |
20555 | msgid "The main working tree cannot be locked or unlocked" |
20556 | msgstr "主工作区无法被加锁或解锁" | |
20557 | ||
a5cd71ca | 20558 | #: builtin/worktree.c:699 |
5c57d762 JX |
20559 | #, c-format |
20560 | msgid "'%s' is already locked, reason: %s" | |
20561 | msgstr "'%s' 已被锁定,原因:%s" | |
20562 | ||
a5cd71ca | 20563 | #: builtin/worktree.c:701 |
5c57d762 JX |
20564 | #, c-format |
20565 | msgid "'%s' is already locked" | |
20566 | msgstr "'%s' 已被锁定" | |
20567 | ||
a5cd71ca | 20568 | #: builtin/worktree.c:729 |
5c57d762 JX |
20569 | #, c-format |
20570 | msgid "'%s' is not locked" | |
20571 | msgstr "'%s' 未被锁定" | |
20572 | ||
a5cd71ca | 20573 | #: builtin/worktree.c:770 |
31e5e17b | 20574 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 20575 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 20576 | |
a5cd71ca | 20577 | #: builtin/worktree.c:778 |
4c27fcb5 JX |
20578 | msgid "force move even if worktree is dirty or locked" |
20579 | msgstr "强制移动,即使工作区是脏的或已锁定" | |
20580 | ||
a5cd71ca | 20581 | #: builtin/worktree.c:801 builtin/worktree.c:928 |
31e5e17b JX |
20582 | #, c-format |
20583 | msgid "'%s' is a main working tree" | |
20584 | msgstr "'%s' 是一个主工作区" | |
20585 | ||
a5cd71ca | 20586 | #: builtin/worktree.c:806 |
31e5e17b JX |
20587 | #, c-format |
20588 | msgid "could not figure out destination name from '%s'" | |
20589 | msgstr "无法从 '%s' 算出目标名称" | |
20590 | ||
a5cd71ca | 20591 | #: builtin/worktree.c:812 |
31e5e17b JX |
20592 | #, c-format |
20593 | msgid "target '%s' already exists" | |
20594 | msgstr "目标 '%s' 已存在" | |
20595 | ||
a5cd71ca | 20596 | #: builtin/worktree.c:820 |
31e5e17b | 20597 | #, c-format |
4c27fcb5 JX |
20598 | msgid "" |
20599 | "cannot move a locked working tree, lock reason: %s\n" | |
20600 | "use 'move -f -f' to override or unlock first" | |
20601 | msgstr "" | |
20602 | "无法移动一个锁定的工作区,锁定原因:%s\n" | |
20603 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 20604 | |
a5cd71ca | 20605 | #: builtin/worktree.c:822 |
4c27fcb5 JX |
20606 | msgid "" |
20607 | "cannot move a locked working tree;\n" | |
20608 | "use 'move -f -f' to override or unlock first" | |
20609 | msgstr "" | |
20610 | "无法移动一个锁定的工作区,\n" | |
20611 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 20612 | |
a5cd71ca | 20613 | #: builtin/worktree.c:825 |
31e5e17b JX |
20614 | #, c-format |
20615 | msgid "validation failed, cannot move working tree: %s" | |
20616 | msgstr "验证失败,无法移动工作区:%s" | |
20617 | ||
a5cd71ca | 20618 | #: builtin/worktree.c:830 |
31e5e17b JX |
20619 | #, c-format |
20620 | msgid "failed to move '%s' to '%s'" | |
c1ac5258 | 20621 | msgstr "移动 '%s' 到 '%s' 失败" |
31e5e17b | 20622 | |
a5cd71ca | 20623 | #: builtin/worktree.c:878 |
31e5e17b JX |
20624 | #, c-format |
20625 | msgid "failed to run 'git status' on '%s'" | |
c1ac5258 | 20626 | msgstr "在 '%s' 中执行 'git status' 失败" |
31e5e17b | 20627 | |
a5cd71ca | 20628 | #: builtin/worktree.c:882 |
31e5e17b | 20629 | #, c-format |
a5cd71ca JX |
20630 | msgid "'%s' contains modified or untracked files, use --force to delete it" |
20631 | msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除" | |
31e5e17b | 20632 | |
a5cd71ca | 20633 | #: builtin/worktree.c:887 |
31e5e17b JX |
20634 | #, c-format |
20635 | msgid "failed to run 'git status' on '%s', code %d" | |
c1ac5258 | 20636 | msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" |
31e5e17b | 20637 | |
a5cd71ca | 20638 | #: builtin/worktree.c:910 |
4c27fcb5 JX |
20639 | msgid "force removal even if worktree is dirty or locked" |
20640 | msgstr "强制删除,即使工作区是脏的或已锁定" | |
31e5e17b | 20641 | |
a5cd71ca | 20642 | #: builtin/worktree.c:933 |
31e5e17b | 20643 | #, c-format |
4c27fcb5 JX |
20644 | msgid "" |
20645 | "cannot remove a locked working tree, lock reason: %s\n" | |
20646 | "use 'remove -f -f' to override or unlock first" | |
20647 | msgstr "" | |
20648 | "无法删除一个锁定的工作区,锁定原因:%s\n" | |
20649 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 20650 | |
a5cd71ca | 20651 | #: builtin/worktree.c:935 |
4c27fcb5 JX |
20652 | msgid "" |
20653 | "cannot remove a locked working tree;\n" | |
20654 | "use 'remove -f -f' to override or unlock first" | |
20655 | msgstr "" | |
20656 | "无法删除一个锁定的工作区,\n" | |
20657 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 20658 | |
a5cd71ca | 20659 | #: builtin/worktree.c:938 |
31e5e17b JX |
20660 | #, c-format |
20661 | msgid "validation failed, cannot remove working tree: %s" | |
20662 | msgstr "验证失败,无法删除工作区:%s" | |
20663 | ||
06991777 | 20664 | #: builtin/write-tree.c:15 |
ef317cd5 | 20665 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 20666 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 20667 | |
06991777 | 20668 | #: builtin/write-tree.c:28 |
ef317cd5 | 20669 | msgid "<prefix>/" |
07432cef | 20670 | msgstr "<前缀>/" |
ef317cd5 | 20671 | |
06991777 | 20672 | #: builtin/write-tree.c:29 |
ef317cd5 | 20673 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 20674 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 20675 | |
06991777 | 20676 | #: builtin/write-tree.c:31 |
ef317cd5 | 20677 | msgid "only useful for debugging" |
07432cef | 20678 | msgstr "只对调试有用" |
ef317cd5 | 20679 | |
a5cd71ca JX |
20680 | #: fast-import.c:3118 |
20681 | #, c-format | |
20682 | msgid "Expected 'mark' command, got %s" | |
20683 | msgstr "预期 'mark' 命令,得到 %s" | |
20684 | ||
20685 | #: fast-import.c:3123 | |
20686 | #, c-format | |
20687 | msgid "Expected 'to' command, got %s" | |
20688 | msgstr "预期 'to' 命令,得到 %s" | |
20689 | ||
06991777 | 20690 | #: credential-cache--daemon.c:223 |
a0b6b246 JX |
20691 | #, c-format |
20692 | msgid "" | |
20693 | "The permissions on your socket directory are too loose; other\n" | |
20694 | "users may be able to read your cached credentials. Consider running:\n" | |
20695 | "\n" | |
20696 | "\tchmod 0700 %s" | |
20697 | msgstr "" | |
1a79b2f1 JX |
20698 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
20699 | "行:\n" | |
a0b6b246 JX |
20700 | "\n" |
20701 | "\tchmod 0700 %s" | |
20702 | ||
06991777 | 20703 | #: credential-cache--daemon.c:272 |
220c313c JX |
20704 | msgid "print debugging messages to stderr" |
20705 | msgstr "调试信息输出到标准错误" | |
20706 | ||
4c27fcb5 JX |
20707 | #: t/helper/test-reach.c:152 |
20708 | #, c-format | |
20709 | msgid "commit %s is not marked reachable" | |
20710 | msgstr "提交 %s 没有标记为可达" | |
20711 | ||
20712 | #: t/helper/test-reach.c:162 | |
20713 | msgid "too many commits marked reachable" | |
20714 | msgstr "太多提交标记为可达" | |
20715 | ||
d46c5519 JX |
20716 | #: t/helper/test-serve-v2.c:7 |
20717 | msgid "test-tool serve-v2 [<options>]" | |
20718 | msgstr "test-tool serve-v2 [<选项>]" | |
20719 | ||
20720 | #: t/helper/test-serve-v2.c:19 | |
20721 | msgid "exit immediately after advertising capabilities" | |
20722 | msgstr "对能力广告之后立即退出" | |
20723 | ||
fd8cb379 | 20724 | #: git.c:27 |
31e5e17b JX |
20725 | msgid "" |
20726 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
20727 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
20728 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
20729 | "bare]\n" | |
31e5e17b JX |
20730 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
20731 | " <command> [<args>]" | |
20732 | msgstr "" | |
fd8cb379 | 20733 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 20734 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
fd8cb379 JX |
20735 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
20736 | "bare]\n" | |
31e5e17b JX |
20737 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
20738 | " <命令> [<参数>]" | |
20739 | ||
fd8cb379 | 20740 | #: git.c:34 |
4dcdc3d8 | 20741 | msgid "" |
220c313c | 20742 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 | 20743 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
a6cd2cc4 JX |
20744 | "to read about a specific subcommand or concept.\n" |
20745 | "See 'git help git' for an overview of the system." | |
4dcdc3d8 | 20746 | msgstr "" |
220c313c JX |
20747 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
20748 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
a6cd2cc4 JX |
20749 | "帮助。\n" |
20750 | "有关系统的概述,查看 'git help git'。" | |
8ada9598 | 20751 | |
a6cd2cc4 | 20752 | #: git.c:186 |
31e5e17b JX |
20753 | #, c-format |
20754 | msgid "no directory given for --git-dir\n" | |
20755 | msgstr "没有为 --git-dir 提供目录\n" | |
20756 | ||
a6cd2cc4 | 20757 | #: git.c:200 |
31e5e17b JX |
20758 | #, c-format |
20759 | msgid "no namespace given for --namespace\n" | |
20760 | msgstr "没有为 --namespace 提供命名空间\n" | |
20761 | ||
a6cd2cc4 | 20762 | #: git.c:214 |
31e5e17b JX |
20763 | #, c-format |
20764 | msgid "no directory given for --work-tree\n" | |
20765 | msgstr "没有为 --work-tree 提供目录\n" | |
20766 | ||
a6cd2cc4 | 20767 | #: git.c:228 |
31e5e17b JX |
20768 | #, c-format |
20769 | msgid "no prefix given for --super-prefix\n" | |
20770 | msgstr "没有为 --super-prefix 提供前缀\n" | |
20771 | ||
a6cd2cc4 | 20772 | #: git.c:250 |
31e5e17b JX |
20773 | #, c-format |
20774 | msgid "-c expects a configuration string\n" | |
20775 | msgstr "应为 -c 提供一个配置字符串\n" | |
20776 | ||
a6cd2cc4 | 20777 | #: git.c:288 |
31e5e17b JX |
20778 | #, c-format |
20779 | msgid "no directory given for -C\n" | |
20780 | msgstr "没有为 -C 提供目录\n" | |
20781 | ||
a6cd2cc4 | 20782 | #: git.c:314 |
31e5e17b JX |
20783 | #, c-format |
20784 | msgid "unknown option: %s\n" | |
20785 | msgstr "未知选项:%s\n" | |
20786 | ||
a6cd2cc4 | 20787 | #: git.c:360 |
06991777 JX |
20788 | #, c-format |
20789 | msgid "while expanding alias '%s': '%s'" | |
5b533632 | 20790 | msgstr "在扩展别名 '%s' 时:'%s'" |
06991777 | 20791 | |
a6cd2cc4 | 20792 | #: git.c:369 |
06991777 JX |
20793 | #, c-format |
20794 | msgid "" | |
20795 | "alias '%s' changes environment variables.\n" | |
20796 | "You can use '!git' in the alias to do this" | |
20797 | msgstr "" | |
20798 | "别名 '%s' 修改环境变量。您可以使用在别名中\n" | |
20799 | "使用 '!git'" | |
20800 | ||
a5cd71ca | 20801 | #: git.c:376 |
06991777 JX |
20802 | #, c-format |
20803 | msgid "empty alias for %s" | |
20804 | msgstr "%s 的空别名" | |
20805 | ||
a5cd71ca | 20806 | #: git.c:379 |
06991777 JX |
20807 | #, c-format |
20808 | msgid "recursive alias: %s" | |
5b533632 | 20809 | msgstr "递归的别名:%s" |
06991777 | 20810 | |
a5cd71ca | 20811 | #: git.c:459 |
06991777 JX |
20812 | msgid "write failure on standard output" |
20813 | msgstr "在标准输出写入失败" | |
20814 | ||
a5cd71ca | 20815 | #: git.c:461 |
06991777 JX |
20816 | msgid "unknown write failure on standard output" |
20817 | msgstr "到标准输出的未知写入错误" | |
20818 | ||
a5cd71ca | 20819 | #: git.c:463 |
06991777 JX |
20820 | msgid "close failed on standard output" |
20821 | msgstr "标准输出关闭失败" | |
20822 | ||
a5cd71ca | 20823 | #: git.c:792 |
4c27fcb5 JX |
20824 | #, c-format |
20825 | msgid "alias loop detected: expansion of '%s' does not terminate:%s" | |
20826 | msgstr "检测到别名循环:'%s'的扩展未终止:%s" | |
20827 | ||
a5cd71ca | 20828 | #: git.c:842 |
06991777 JX |
20829 | #, c-format |
20830 | msgid "cannot handle %s as a builtin" | |
20831 | msgstr "不能作为内置命令处理 %s" | |
20832 | ||
a5cd71ca | 20833 | #: git.c:855 |
06991777 JX |
20834 | #, c-format |
20835 | msgid "" | |
20836 | "usage: %s\n" | |
20837 | "\n" | |
20838 | msgstr "" | |
20839 | "用法:%s\n" | |
20840 | "\n" | |
20841 | ||
a5cd71ca | 20842 | #: git.c:875 |
31e5e17b JX |
20843 | #, c-format |
20844 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
20845 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
20846 | ||
a5cd71ca | 20847 | #: git.c:887 |
31e5e17b JX |
20848 | #, c-format |
20849 | msgid "failed to run command '%s': %s\n" | |
c1ac5258 | 20850 | msgstr "运行命令 '%s' 失败:%s\n" |
31e5e17b | 20851 | |
06991777 | 20852 | #: http.c:378 |
60638e98 JX |
20853 | #, c-format |
20854 | msgid "negative value for http.postbuffer; defaulting to %d" | |
20855 | msgstr "http.postbuffer 为负值,默认为 %d" | |
20856 | ||
06991777 | 20857 | #: http.c:399 |
a0b6b246 | 20858 | msgid "Delegation control is not supported with cURL < 7.22.0" |
4c27fcb5 | 20859 | msgstr "不支持委托控制,因为 cURL < 7.22.0" |
a0b6b246 | 20860 | |
06991777 | 20861 | #: http.c:408 |
276ceeaa JX |
20862 | msgid "Public key pinning not supported with cURL < 7.44.0" |
20863 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
20864 | ||
a5cd71ca | 20865 | #: http.c:878 |
4c27fcb5 JX |
20866 | msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" |
20867 | msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0" | |
20868 | ||
a5cd71ca | 20869 | #: http.c:951 |
4c27fcb5 JX |
20870 | msgid "Protocol restrictions not supported with cURL < 7.19.4" |
20871 | msgstr "不支持协议限制,因为 cURL < 7.19.4" | |
20872 | ||
a5cd71ca | 20873 | #: http.c:1088 |
4c27fcb5 JX |
20874 | #, c-format |
20875 | msgid "Unsupported SSL backend '%s'. Supported SSL backends:" | |
20876 | msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:" | |
20877 | ||
a5cd71ca | 20878 | #: http.c:1095 |
4c27fcb5 JX |
20879 | #, c-format |
20880 | msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" | |
20881 | msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建" | |
20882 | ||
a5cd71ca | 20883 | #: http.c:1099 |
4c27fcb5 JX |
20884 | #, c-format |
20885 | msgid "Could not set SSL backend to '%s': already set" | |
20886 | msgstr "无法将 SSL 后端设置为 '%s':已经设置" | |
20887 | ||
a5cd71ca | 20888 | #: http.c:1968 |
1a79b2f1 JX |
20889 | #, c-format |
20890 | msgid "" | |
20891 | "unable to update url base from redirection:\n" | |
20892 | " asked for: %s\n" | |
20893 | " redirect: %s" | |
20894 | msgstr "" | |
20895 | "不能更新重定向的 url base:\n" | |
20896 | " 请求:%s\n" | |
20897 | " 重定向:%s" | |
20898 | ||
a5cd71ca | 20899 | #: remote-curl.c:166 |
d46c5519 JX |
20900 | #, c-format |
20901 | msgid "invalid quoting in push-option value: '%s'" | |
5b533632 | 20902 | msgstr "在 push-option 取值中无效的引号:'%s'" |
d46c5519 | 20903 | |
a5cd71ca | 20904 | #: remote-curl.c:263 |
d46c5519 JX |
20905 | #, c-format |
20906 | msgid "%sinfo/refs not valid: is this a git repository?" | |
20907 | msgstr "%sinfo/refs 无效:这是一个 git 仓库么?" | |
20908 | ||
a5cd71ca | 20909 | #: remote-curl.c:364 |
d46c5519 JX |
20910 | msgid "invalid server response; expected service, got flush packet" |
20911 | msgstr "无效的服务端响应。预期服务,得到 flush 包" | |
20912 | ||
a5cd71ca | 20913 | #: remote-curl.c:395 |
d46c5519 JX |
20914 | #, c-format |
20915 | msgid "invalid server response; got '%s'" | |
20916 | msgstr "无效的服务端响应,得到 '%s'" | |
20917 | ||
a5cd71ca | 20918 | #: remote-curl.c:455 |
d46c5519 JX |
20919 | #, c-format |
20920 | msgid "repository '%s' not found" | |
20921 | msgstr "仓库 '%s' 未找到" | |
20922 | ||
a5cd71ca | 20923 | #: remote-curl.c:459 |
d46c5519 JX |
20924 | #, c-format |
20925 | msgid "Authentication failed for '%s'" | |
20926 | msgstr "'%s' 鉴权失败" | |
20927 | ||
a5cd71ca | 20928 | #: remote-curl.c:463 |
d46c5519 JX |
20929 | #, c-format |
20930 | msgid "unable to access '%s': %s" | |
20931 | msgstr "无法访问 '%s':%s" | |
20932 | ||
a5cd71ca | 20933 | #: remote-curl.c:469 |
1a79b2f1 JX |
20934 | #, c-format |
20935 | msgid "redirecting to %s" | |
20936 | msgstr "重定向到 %s" | |
20937 | ||
a5cd71ca | 20938 | #: remote-curl.c:593 |
d46c5519 | 20939 | msgid "shouldn't have EOF when not gentle on EOF" |
5b533632 | 20940 | msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符" |
d46c5519 | 20941 | |
a5cd71ca | 20942 | #: remote-curl.c:673 |
d46c5519 JX |
20943 | msgid "unable to rewind rpc post data - try increasing http.postBuffer" |
20944 | msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" | |
20945 | ||
a5cd71ca | 20946 | #: remote-curl.c:733 |
d46c5519 JX |
20947 | #, c-format |
20948 | msgid "RPC failed; %s" | |
20949 | msgstr "RPC 失败。%s" | |
20950 | ||
a5cd71ca | 20951 | #: remote-curl.c:773 |
d46c5519 JX |
20952 | msgid "cannot handle pushes this big" |
20953 | msgstr "不能处理这么大的推送" | |
20954 | ||
a5cd71ca | 20955 | #: remote-curl.c:888 |
d46c5519 JX |
20956 | #, c-format |
20957 | msgid "cannot deflate request; zlib deflate error %d" | |
20958 | msgstr "不能压缩请求,zlib 压缩错误 %d" | |
20959 | ||
a5cd71ca | 20960 | #: remote-curl.c:892 |
d46c5519 JX |
20961 | #, c-format |
20962 | msgid "cannot deflate request; zlib end error %d" | |
20963 | msgstr "不能压缩请求,zlib 结束错误 %d" | |
20964 | ||
a5cd71ca | 20965 | #: remote-curl.c:1023 |
d46c5519 JX |
20966 | msgid "dumb http transport does not support shallow capabilities" |
20967 | msgstr "哑 http 传输不支持 shalllow 能力" | |
20968 | ||
a5cd71ca | 20969 | #: remote-curl.c:1037 |
d46c5519 JX |
20970 | msgid "fetch failed." |
20971 | msgstr "获取失败。" | |
20972 | ||
a5cd71ca | 20973 | #: remote-curl.c:1085 |
d46c5519 JX |
20974 | msgid "cannot fetch by sha1 over smart http" |
20975 | msgstr "无法通过智能 HTTP 获取 sha1" | |
20976 | ||
a5cd71ca | 20977 | #: remote-curl.c:1129 remote-curl.c:1135 |
d46c5519 JX |
20978 | #, c-format |
20979 | msgid "protocol error: expected sha/ref, got '%s'" | |
20980 | msgstr "协议错误:期望 sha/ref,却得到 '%s'" | |
20981 | ||
a5cd71ca | 20982 | #: remote-curl.c:1147 remote-curl.c:1261 |
d46c5519 JX |
20983 | #, c-format |
20984 | msgid "http transport does not support %s" | |
20985 | msgstr "http 传输协议不支持 %s" | |
20986 | ||
a5cd71ca | 20987 | #: remote-curl.c:1183 |
d46c5519 JX |
20988 | msgid "git-http-push failed" |
20989 | msgstr "git-http-push 失败" | |
20990 | ||
a5cd71ca | 20991 | #: remote-curl.c:1367 |
d46c5519 JX |
20992 | msgid "remote-curl: usage: git remote-curl <remote> [<url>]" |
20993 | msgstr "remote-curl:用法:git remote-curl <远程> [<url>]" | |
20994 | ||
a5cd71ca | 20995 | #: remote-curl.c:1399 |
d46c5519 JX |
20996 | msgid "remote-curl: error reading command stream from git" |
20997 | msgstr "remote-curl:错误读取来自 git 的命令流" | |
20998 | ||
a5cd71ca | 20999 | #: remote-curl.c:1406 |
d46c5519 JX |
21000 | msgid "remote-curl: fetch attempted without a local repo" |
21001 | msgstr "remote-curl:尝试没有本地仓库下获取" | |
21002 | ||
a5cd71ca | 21003 | #: remote-curl.c:1446 |
d46c5519 JX |
21004 | #, c-format |
21005 | msgid "remote-curl: unknown command '%s' from git" | |
21006 | msgstr "remote-curl:未知的来自 git 的命令 '%s'" | |
21007 | ||
a5cd71ca | 21008 | #: list-objects-filter-options.h:85 |
d46c5519 JX |
21009 | msgid "args" |
21010 | msgstr "参数" | |
21011 | ||
a5cd71ca | 21012 | #: list-objects-filter-options.h:86 |
d46c5519 JX |
21013 | msgid "object filtering" |
21014 | msgstr "对象过滤" | |
21015 | ||
a5cd71ca | 21016 | #: parse-options.h:179 |
fd8cb379 JX |
21017 | msgid "expiry-date" |
21018 | msgstr "到期时间" | |
7aea43ff | 21019 | |
a5cd71ca | 21020 | #: parse-options.h:193 |
fd8cb379 JX |
21021 | msgid "no-op (backward compatibility)" |
21022 | msgstr "空操作(向后兼容)" | |
7aea43ff | 21023 | |
a6cd2cc4 | 21024 | #: parse-options.h:305 |
fd8cb379 JX |
21025 | msgid "be more verbose" |
21026 | msgstr "更加详细" | |
7aea43ff | 21027 | |
a6cd2cc4 | 21028 | #: parse-options.h:307 |
fd8cb379 JX |
21029 | msgid "be more quiet" |
21030 | msgstr "更加安静" | |
7aea43ff | 21031 | |
a6cd2cc4 | 21032 | #: parse-options.h:313 |
fd8cb379 JX |
21033 | msgid "use <n> digits to display SHA-1s" |
21034 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
7aea43ff | 21035 | |
a6cd2cc4 | 21036 | #: parse-options.h:332 |
d46c5519 JX |
21037 | msgid "how to strip spaces and #comments from message" |
21038 | msgstr "设置如何删除提交说明里的空格和#注释" | |
21039 | ||
21040 | #: ref-filter.h:101 | |
21041 | msgid "key" | |
21042 | msgstr "key" | |
21043 | ||
21044 | #: ref-filter.h:101 | |
21045 | msgid "field name to sort on" | |
21046 | msgstr "排序的字段名" | |
21047 | ||
21048 | #: rerere.h:44 | |
21049 | msgid "update the index with reused conflict resolution if possible" | |
21050 | msgstr "如果可能,重用冲突解决更新索引" | |
21051 | ||
a6cd2cc4 JX |
21052 | #: wt-status.h:67 |
21053 | msgid "HEAD detached at " | |
21054 | msgstr "头指针分离于 " | |
21055 | ||
21056 | #: wt-status.h:68 | |
21057 | msgid "HEAD detached from " | |
21058 | msgstr "头指针分离自 " | |
21059 | ||
fd8cb379 | 21060 | #: command-list.h:50 |
8ada9598 | 21061 | msgid "Add file contents to the index" |
81809b99 | 21062 | msgstr "添加文件内容至索引" |
8ada9598 | 21063 | |
fd8cb379 JX |
21064 | #: command-list.h:51 |
21065 | msgid "Apply a series of patches from a mailbox" | |
21066 | msgstr "应用邮箱格式的系列补丁" | |
21067 | ||
21068 | #: command-list.h:52 | |
21069 | msgid "Annotate file lines with commit information" | |
21070 | msgstr "使用提交信息注释文件行" | |
21071 | ||
21072 | #: command-list.h:53 | |
21073 | msgid "Apply a patch to files and/or to the index" | |
21074 | msgstr "应用一个补丁到文件和/或索引区" | |
21075 | ||
21076 | #: command-list.h:54 | |
4c27fcb5 JX |
21077 | msgid "Import a GNU Arch repository into Git" |
21078 | msgstr "将一个 GNU Arch 仓库导入到 Git" | |
fd8cb379 JX |
21079 | |
21080 | #: command-list.h:55 | |
21081 | msgid "Create an archive of files from a named tree" | |
21082 | msgstr "基于一个指定的树创建文件存档" | |
21083 | ||
21084 | #: command-list.h:56 | |
1b7f4a34 JX |
21085 | msgid "Use binary search to find the commit that introduced a bug" |
21086 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 21087 | |
fd8cb379 JX |
21088 | #: command-list.h:57 |
21089 | msgid "Show what revision and author last modified each line of a file" | |
21090 | msgstr "显示文件每一行最后修改的版本和修改者" | |
21091 | ||
21092 | #: command-list.h:58 | |
8ada9598 | 21093 | msgid "List, create, or delete branches" |
81809b99 | 21094 | msgstr "列出、创建或删除分支" |
8ada9598 | 21095 | |
fd8cb379 JX |
21096 | #: command-list.h:59 |
21097 | msgid "Move objects and refs by archive" | |
21098 | msgstr "通过归档移动对象和引用" | |
21099 | ||
21100 | #: command-list.h:60 | |
21101 | msgid "Provide content or type and size information for repository objects" | |
21102 | msgstr "提供仓库对象的内容、类型或大小" | |
21103 | ||
21104 | #: command-list.h:61 | |
21105 | msgid "Display gitattributes information" | |
21106 | msgstr "显示 gitattributes 信息" | |
21107 | ||
21108 | #: command-list.h:62 | |
21109 | msgid "Debug gitignore / exclude files" | |
21110 | msgstr "调试 gitignore / exclude 文件" | |
21111 | ||
21112 | #: command-list.h:63 | |
21113 | msgid "Show canonical names and email addresses of contacts" | |
21114 | msgstr "显示联系人的规范名称和电子邮件" | |
21115 | ||
21116 | #: command-list.h:64 | |
5bb01d4f JX |
21117 | msgid "Switch branches or restore working tree files" |
21118 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 21119 | |
fd8cb379 JX |
21120 | #: command-list.h:65 |
21121 | msgid "Copy files from the index to the working tree" | |
21122 | msgstr "从索引拷贝文件到工作区" | |
21123 | ||
21124 | #: command-list.h:66 | |
21125 | msgid "Ensures that a reference name is well formed" | |
21126 | msgstr "确保引用名称格式正确" | |
21127 | ||
21128 | #: command-list.h:67 | |
21129 | msgid "Find commits yet to be applied to upstream" | |
21130 | msgstr "查找尚未应用到上游的提交" | |
21131 | ||
21132 | #: command-list.h:68 | |
21133 | msgid "Apply the changes introduced by some existing commits" | |
21134 | msgstr "应用一些现存提交引入的修改" | |
21135 | ||
21136 | #: command-list.h:69 | |
21137 | msgid "Graphical alternative to git-commit" | |
21138 | msgstr "git-commit 的图形替代界面" | |
21139 | ||
21140 | #: command-list.h:70 | |
21141 | msgid "Remove untracked files from the working tree" | |
21142 | msgstr "从工作区中删除未跟踪文件" | |
21143 | ||
21144 | #: command-list.h:71 | |
8ada9598 | 21145 | msgid "Clone a repository into a new directory" |
06991777 | 21146 | msgstr "克隆仓库到一个新目录" |
8ada9598 | 21147 | |
fd8cb379 JX |
21148 | #: command-list.h:72 |
21149 | msgid "Display data in columns" | |
21150 | msgstr "以列的方式显示数据" | |
21151 | ||
21152 | #: command-list.h:73 | |
8ada9598 | 21153 | msgid "Record changes to the repository" |
160fb2b2 | 21154 | msgstr "记录变更到仓库" |
8ada9598 | 21155 | |
fd8cb379 | 21156 | #: command-list.h:74 |
4c27fcb5 JX |
21157 | msgid "Write and verify Git commit-graph files" |
21158 | msgstr "写入和校验 Git 提交图文件" | |
fd8cb379 JX |
21159 | |
21160 | #: command-list.h:75 | |
21161 | msgid "Create a new commit object" | |
21162 | msgstr "创建一个新的提交对象" | |
21163 | ||
21164 | #: command-list.h:76 | |
21165 | msgid "Get and set repository or global options" | |
21166 | msgstr "获取和设置仓库或者全局选项" | |
21167 | ||
21168 | #: command-list.h:77 | |
21169 | msgid "Count unpacked number of objects and their disk consumption" | |
21170 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
21171 | ||
21172 | #: command-list.h:78 | |
21173 | msgid "Retrieve and store user credentials" | |
21174 | msgstr "检索和存储用户密码" | |
21175 | ||
21176 | #: command-list.h:79 | |
21177 | msgid "Helper to temporarily store passwords in memory" | |
21178 | msgstr "在内存中临时存储密码的助手" | |
21179 | ||
21180 | #: command-list.h:80 | |
21181 | msgid "Helper to store credentials on disk" | |
21182 | msgstr "在磁盘存储密码的助手" | |
21183 | ||
21184 | #: command-list.h:81 | |
21185 | msgid "Export a single commit to a CVS checkout" | |
21186 | msgstr "将一个提交导出到 CVS 检出中" | |
21187 | ||
21188 | #: command-list.h:82 | |
21189 | msgid "Salvage your data out of another SCM people love to hate" | |
21190 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
21191 | ||
21192 | #: command-list.h:83 | |
21193 | msgid "A CVS server emulator for Git" | |
21194 | msgstr "Git 的一个 CVS 服务模拟器" | |
21195 | ||
21196 | #: command-list.h:84 | |
21197 | msgid "A really simple server for Git repositories" | |
21198 | msgstr "一个非常简单的 Git 仓库服务器" | |
21199 | ||
21200 | #: command-list.h:85 | |
21201 | msgid "Give an object a human readable name based on an available ref" | |
21202 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
21203 | ||
21204 | #: command-list.h:86 | |
8ada9598 | 21205 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 21206 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 21207 | |
fd8cb379 JX |
21208 | #: command-list.h:87 |
21209 | msgid "Compares files in the working tree and the index" | |
21210 | msgstr "比较工作区和索引区中的文件" | |
21211 | ||
21212 | #: command-list.h:88 | |
21213 | msgid "Compare a tree to the working tree or index" | |
21214 | msgstr "将一个树和工作区或索引做比较" | |
21215 | ||
21216 | #: command-list.h:89 | |
21217 | msgid "Compares the content and mode of blobs found via two tree objects" | |
21218 | msgstr "比较两个树对象的文件内容和模式" | |
21219 | ||
21220 | #: command-list.h:90 | |
21221 | msgid "Show changes using common diff tools" | |
21222 | msgstr "使用常见的差异工具显示更改" | |
21223 | ||
21224 | #: command-list.h:91 | |
21225 | msgid "Git data exporter" | |
21226 | msgstr "Git 数据导出器" | |
21227 | ||
21228 | #: command-list.h:92 | |
21229 | msgid "Backend for fast Git data importers" | |
21230 | msgstr "Git 快速数据导入器后端" | |
21231 | ||
21232 | #: command-list.h:93 | |
8ada9598 | 21233 | msgid "Download objects and refs from another repository" |
160fb2b2 | 21234 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 21235 | |
fd8cb379 JX |
21236 | #: command-list.h:94 |
21237 | msgid "Receive missing objects from another repository" | |
21238 | msgstr "从另一个仓库获取缺失的对象" | |
21239 | ||
21240 | #: command-list.h:95 | |
21241 | msgid "Rewrite branches" | |
21242 | msgstr "重写分支" | |
21243 | ||
21244 | #: command-list.h:96 | |
21245 | msgid "Produce a merge commit message" | |
21246 | msgstr "生成一个合并提交信息" | |
21247 | ||
21248 | #: command-list.h:97 | |
21249 | msgid "Output information on each ref" | |
21250 | msgstr "对每一个引用输出信息 " | |
21251 | ||
21252 | #: command-list.h:98 | |
21253 | msgid "Prepare patches for e-mail submission" | |
21254 | msgstr "准备电子邮件提交的补丁" | |
21255 | ||
21256 | #: command-list.h:99 | |
21257 | msgid "Verifies the connectivity and validity of the objects in the database" | |
21258 | msgstr "验证仓库中对象的连通性和有效性" | |
21259 | ||
21260 | #: command-list.h:100 | |
21261 | msgid "Cleanup unnecessary files and optimize the local repository" | |
21262 | msgstr "清除不必要的文件和优化本地仓库" | |
21263 | ||
21264 | #: command-list.h:101 | |
21265 | msgid "Extract commit ID from an archive created using git-archive" | |
5b533632 | 21266 | msgstr "从 git-archive 创建的归档文件中提取提交 ID" |
fd8cb379 JX |
21267 | |
21268 | #: command-list.h:102 | |
8ada9598 | 21269 | msgid "Print lines matching a pattern" |
81809b99 | 21270 | msgstr "输出和模式匹配的行" |
8ada9598 | 21271 | |
fd8cb379 JX |
21272 | #: command-list.h:103 |
21273 | msgid "A portable graphical interface to Git" | |
21274 | msgstr "一个便携的 Git 图形客户端" | |
21275 | ||
21276 | #: command-list.h:104 | |
21277 | msgid "Compute object ID and optionally creates a blob from a file" | |
5b533632 | 21278 | msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象" |
fd8cb379 JX |
21279 | |
21280 | #: command-list.h:105 | |
21281 | msgid "Display help information about Git" | |
21282 | msgstr "显示 Git 的帮助信息" | |
21283 | ||
21284 | #: command-list.h:106 | |
21285 | msgid "Server side implementation of Git over HTTP" | |
21286 | msgstr "Git HTTP 协议的服务端实现" | |
21287 | ||
21288 | #: command-list.h:107 | |
21289 | msgid "Download from a remote Git repository via HTTP" | |
21290 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
21291 | ||
21292 | #: command-list.h:108 | |
21293 | msgid "Push objects over HTTP/DAV to another repository" | |
21294 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
21295 | ||
21296 | #: command-list.h:109 | |
21297 | msgid "Send a collection of patches from stdin to an IMAP folder" | |
21298 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
21299 | ||
21300 | #: command-list.h:110 | |
21301 | msgid "Build pack index file for an existing packed archive" | |
21302 | msgstr "从一个现存的包存档文件创建包索引" | |
21303 | ||
21304 | #: command-list.h:111 | |
a77c07d9 | 21305 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 21306 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 21307 | |
fd8cb379 JX |
21308 | #: command-list.h:112 |
21309 | msgid "Instantly browse your working repository in gitweb" | |
21310 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
21311 | ||
21312 | #: command-list.h:113 | |
d46c5519 | 21313 | msgid "Add or parse structured information in commit messages" |
fd8cb379 JX |
21314 | msgstr "添加或解析提交说明中的结构化信息" |
21315 | ||
21316 | #: command-list.h:114 | |
21317 | msgid "The Git repository browser" | |
21318 | msgstr "Git 仓库浏览器" | |
21319 | ||
21320 | #: command-list.h:115 | |
8ada9598 | 21321 | msgid "Show commit logs" |
81809b99 | 21322 | msgstr "显示提交日志" |
8ada9598 | 21323 | |
fd8cb379 JX |
21324 | #: command-list.h:116 |
21325 | msgid "Show information about files in the index and the working tree" | |
21326 | msgstr "显示索引和工作区中文件的信息" | |
21327 | ||
21328 | #: command-list.h:117 | |
21329 | msgid "List references in a remote repository" | |
21330 | msgstr "显示一个远程仓库的引用" | |
21331 | ||
21332 | #: command-list.h:118 | |
21333 | msgid "List the contents of a tree object" | |
21334 | msgstr "显示一个树对象的内容" | |
21335 | ||
21336 | #: command-list.h:119 | |
21337 | msgid "Extracts patch and authorship from a single e-mail message" | |
21338 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
21339 | ||
21340 | #: command-list.h:120 | |
21341 | msgid "Simple UNIX mbox splitter program" | |
21342 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
21343 | ||
21344 | #: command-list.h:121 | |
8ada9598 | 21345 | msgid "Join two or more development histories together" |
81809b99 | 21346 | msgstr "合并两个或更多开发历史" |
8ada9598 | 21347 | |
fd8cb379 JX |
21348 | #: command-list.h:122 |
21349 | msgid "Find as good common ancestors as possible for a merge" | |
21350 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
21351 | ||
21352 | #: command-list.h:123 | |
21353 | msgid "Run a three-way file merge" | |
21354 | msgstr "运行一个三路文件合并" | |
21355 | ||
21356 | #: command-list.h:124 | |
21357 | msgid "Run a merge for files needing merging" | |
21358 | msgstr "对于需要合并的文件执行合并" | |
21359 | ||
21360 | #: command-list.h:125 | |
21361 | msgid "The standard helper program to use with git-merge-index" | |
21362 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
21363 | ||
21364 | #: command-list.h:126 | |
21365 | msgid "Run merge conflict resolution tools to resolve merge conflicts" | |
21366 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
21367 | ||
21368 | #: command-list.h:127 | |
21369 | msgid "Show three-way merge without touching index" | |
21370 | msgstr "显示三路合并而不动索引" | |
21371 | ||
21372 | #: command-list.h:128 | |
4c27fcb5 JX |
21373 | msgid "Write and verify multi-pack-indexes" |
21374 | msgstr "写入和校验多包索引" | |
21375 | ||
21376 | #: command-list.h:129 | |
fd8cb379 JX |
21377 | msgid "Creates a tag object" |
21378 | msgstr "创建一个标签对象" | |
21379 | ||
4c27fcb5 | 21380 | #: command-list.h:130 |
fd8cb379 JX |
21381 | msgid "Build a tree-object from ls-tree formatted text" |
21382 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
21383 | ||
4c27fcb5 | 21384 | #: command-list.h:131 |
8ada9598 | 21385 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 21386 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 21387 | |
fd8cb379 | 21388 | # 查找给定版本的符号名称 |
4c27fcb5 | 21389 | #: command-list.h:132 |
fd8cb379 JX |
21390 | msgid "Find symbolic names for given revs" |
21391 | msgstr "查找给定版本的符号名称" | |
21392 | ||
4c27fcb5 | 21393 | #: command-list.h:133 |
fd8cb379 JX |
21394 | msgid "Add or inspect object notes" |
21395 | msgstr "添加或检查对象注释" | |
21396 | ||
4c27fcb5 | 21397 | #: command-list.h:134 |
fd8cb379 JX |
21398 | msgid "Import from and submit to Perforce repositories" |
21399 | msgstr "导入和提交到 Perforce 仓库中" | |
21400 | ||
4c27fcb5 | 21401 | #: command-list.h:135 |
fd8cb379 JX |
21402 | msgid "Create a packed archive of objects" |
21403 | msgstr "创建对象的存档包" | |
21404 | ||
4c27fcb5 | 21405 | #: command-list.h:136 |
fd8cb379 JX |
21406 | msgid "Find redundant pack files" |
21407 | msgstr "查找冗余的包文件" | |
21408 | ||
4c27fcb5 | 21409 | #: command-list.h:137 |
fd8cb379 JX |
21410 | msgid "Pack heads and tags for efficient repository access" |
21411 | msgstr "打包头和标签以实现高效的仓库访问" | |
21412 | ||
4c27fcb5 | 21413 | #: command-list.h:138 |
fd8cb379 JX |
21414 | msgid "Routines to help parsing remote repository access parameters" |
21415 | msgstr "帮助解析远程仓库访问参数的例程" | |
21416 | ||
4c27fcb5 | 21417 | #: command-list.h:139 |
fd8cb379 | 21418 | msgid "Compute unique ID for a patch" |
5b533632 | 21419 | msgstr "计算一个补丁的唯一 ID" |
fd8cb379 | 21420 | |
4c27fcb5 | 21421 | #: command-list.h:140 |
fd8cb379 JX |
21422 | msgid "Prune all unreachable objects from the object database" |
21423 | msgstr "删除对象库中所有不可达对象" | |
21424 | ||
4c27fcb5 | 21425 | #: command-list.h:141 |
fd8cb379 JX |
21426 | msgid "Remove extra objects that are already in pack files" |
21427 | msgstr "删除已经在包文件中的多余对象" | |
21428 | ||
4c27fcb5 | 21429 | #: command-list.h:142 |
2e8451e8 | 21430 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 21431 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 21432 | |
4c27fcb5 | 21433 | #: command-list.h:143 |
8ada9598 | 21434 | msgid "Update remote refs along with associated objects" |
81809b99 | 21435 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 21436 | |
4c27fcb5 | 21437 | #: command-list.h:144 |
fd8cb379 JX |
21438 | msgid "Applies a quilt patchset onto the current branch" |
21439 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
21440 | ||
4c27fcb5 | 21441 | #: command-list.h:145 |
c1ac5258 JX |
21442 | msgid "Compare two commit ranges (e.g. two versions of a branch)" |
21443 | msgstr "比较两个提交范围(如一个分支的两个版本)" | |
21444 | ||
4c27fcb5 | 21445 | #: command-list.h:146 |
fd8cb379 JX |
21446 | msgid "Reads tree information into the index" |
21447 | msgstr "将树信息读取到索引" | |
21448 | ||
4c27fcb5 | 21449 | #: command-list.h:147 |
3495628d JX |
21450 | msgid "Reapply commits on top of another base tip" |
21451 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 21452 | |
4c27fcb5 | 21453 | #: command-list.h:148 |
fd8cb379 JX |
21454 | msgid "Receive what is pushed into the repository" |
21455 | msgstr "接收推送到仓库中的对象" | |
21456 | ||
4c27fcb5 | 21457 | #: command-list.h:149 |
fd8cb379 JX |
21458 | msgid "Manage reflog information" |
21459 | msgstr "管理 reflog 信息" | |
21460 | ||
4c27fcb5 | 21461 | #: command-list.h:150 |
fd8cb379 JX |
21462 | msgid "Manage set of tracked repositories" |
21463 | msgstr "管理已跟踪仓库" | |
21464 | ||
4c27fcb5 | 21465 | #: command-list.h:151 |
fd8cb379 JX |
21466 | msgid "Pack unpacked objects in a repository" |
21467 | msgstr "打包仓库中未打包对象" | |
21468 | ||
4c27fcb5 | 21469 | #: command-list.h:152 |
fd8cb379 JX |
21470 | msgid "Create, list, delete refs to replace objects" |
21471 | msgstr "创建、列出、删除对象替换引用" | |
21472 | ||
4c27fcb5 | 21473 | #: command-list.h:153 |
fd8cb379 JX |
21474 | msgid "Generates a summary of pending changes" |
21475 | msgstr "生成待定更改的摘要" | |
21476 | ||
4c27fcb5 | 21477 | #: command-list.h:154 |
fd8cb379 JX |
21478 | msgid "Reuse recorded resolution of conflicted merges" |
21479 | msgstr "重用冲突合并的解决方案记录" | |
21480 | ||
4c27fcb5 | 21481 | #: command-list.h:155 |
8ada9598 | 21482 | msgid "Reset current HEAD to the specified state" |
4375c10e | 21483 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 21484 | |
4c27fcb5 | 21485 | #: command-list.h:156 |
a6cd2cc4 JX |
21486 | msgid "Restore working tree files" |
21487 | msgstr "恢复工作区文件" | |
21488 | ||
21489 | #: command-list.h:157 | |
fd8cb379 JX |
21490 | msgid "Revert some existing commits" |
21491 | msgstr "回退一些现存提交" | |
21492 | ||
a6cd2cc4 | 21493 | #: command-list.h:158 |
fd8cb379 JX |
21494 | msgid "Lists commit objects in reverse chronological order" |
21495 | msgstr "按时间顺序列出提交对象" | |
21496 | ||
a6cd2cc4 | 21497 | #: command-list.h:159 |
fd8cb379 JX |
21498 | msgid "Pick out and massage parameters" |
21499 | msgstr "选出并处理参数" | |
21500 | ||
a6cd2cc4 | 21501 | #: command-list.h:160 |
8ada9598 | 21502 | msgid "Remove files from the working tree and from the index" |
81809b99 | 21503 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 21504 | |
a6cd2cc4 | 21505 | #: command-list.h:161 |
fd8cb379 JX |
21506 | msgid "Send a collection of patches as emails" |
21507 | msgstr "通过电子邮件发送一组补丁" | |
21508 | ||
a6cd2cc4 | 21509 | #: command-list.h:162 |
fd8cb379 JX |
21510 | msgid "Push objects over Git protocol to another repository" |
21511 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
21512 | ||
a6cd2cc4 | 21513 | #: command-list.h:163 |
fd8cb379 JX |
21514 | msgid "Restricted login shell for Git-only SSH access" |
21515 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
21516 | ||
a6cd2cc4 | 21517 | #: command-list.h:164 |
fd8cb379 JX |
21518 | msgid "Summarize 'git log' output" |
21519 | msgstr "'git log' 输出摘要" | |
21520 | ||
a6cd2cc4 | 21521 | #: command-list.h:165 |
8ada9598 | 21522 | msgid "Show various types of objects" |
81809b99 | 21523 | msgstr "显示各种类型的对象" |
8ada9598 | 21524 | |
a6cd2cc4 | 21525 | #: command-list.h:166 |
fd8cb379 JX |
21526 | msgid "Show branches and their commits" |
21527 | msgstr "显示分支和提交" | |
21528 | ||
a6cd2cc4 | 21529 | #: command-list.h:167 |
fd8cb379 JX |
21530 | msgid "Show packed archive index" |
21531 | msgstr "显示打包归档索引" | |
21532 | ||
a6cd2cc4 | 21533 | #: command-list.h:168 |
fd8cb379 JX |
21534 | msgid "List references in a local repository" |
21535 | msgstr "显示本地仓库中的引用" | |
21536 | ||
a6cd2cc4 | 21537 | #: command-list.h:169 |
fd8cb379 JX |
21538 | msgid "Git's i18n setup code for shell scripts" |
21539 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
21540 | ||
a6cd2cc4 | 21541 | #: command-list.h:170 |
fd8cb379 JX |
21542 | msgid "Common Git shell script setup code" |
21543 | msgstr "常用的 Git shell 脚本设置代码" | |
21544 | ||
a6cd2cc4 | 21545 | #: command-list.h:171 |
fd8cb379 JX |
21546 | msgid "Stash the changes in a dirty working directory away" |
21547 | msgstr "贮藏脏工作区中的修改" | |
21548 | ||
a6cd2cc4 | 21549 | #: command-list.h:172 |
fd8cb379 JX |
21550 | msgid "Add file contents to the staging area" |
21551 | msgstr "将文件内容添加到索引" | |
21552 | ||
a6cd2cc4 | 21553 | #: command-list.h:173 |
8ada9598 | 21554 | msgid "Show the working tree status" |
81809b99 | 21555 | msgstr "显示工作区状态" |
8ada9598 | 21556 | |
a6cd2cc4 | 21557 | #: command-list.h:174 |
fd8cb379 JX |
21558 | msgid "Remove unnecessary whitespace" |
21559 | msgstr "删除不必要的空白字符" | |
21560 | ||
a6cd2cc4 | 21561 | #: command-list.h:175 |
fd8cb379 JX |
21562 | msgid "Initialize, update or inspect submodules" |
21563 | msgstr "初始化、更新或检查子模组" | |
21564 | ||
a6cd2cc4 | 21565 | #: command-list.h:176 |
fd8cb379 JX |
21566 | msgid "Bidirectional operation between a Subversion repository and Git" |
21567 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
21568 | ||
a6cd2cc4 JX |
21569 | #: command-list.h:177 |
21570 | msgid "Switch branches" | |
21571 | msgstr "切换分支" | |
21572 | ||
21573 | #: command-list.h:178 | |
fd8cb379 JX |
21574 | msgid "Read, modify and delete symbolic refs" |
21575 | msgstr "读取、修改和删除符号引用" | |
21576 | ||
a6cd2cc4 | 21577 | #: command-list.h:179 |
8ada9598 | 21578 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 21579 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 21580 | |
a6cd2cc4 | 21581 | #: command-list.h:180 |
fd8cb379 JX |
21582 | msgid "Creates a temporary file with a blob's contents" |
21583 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 21584 | |
a6cd2cc4 | 21585 | #: command-list.h:181 |
fd8cb379 JX |
21586 | msgid "Unpack objects from a packed archive" |
21587 | msgstr "从打包文件中解压缩对象" | |
220c313c | 21588 | |
a6cd2cc4 | 21589 | #: command-list.h:182 |
fd8cb379 JX |
21590 | msgid "Register file contents in the working tree to the index" |
21591 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 21592 | |
a6cd2cc4 | 21593 | #: command-list.h:183 |
fd8cb379 JX |
21594 | msgid "Update the object name stored in a ref safely" |
21595 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 21596 | |
a6cd2cc4 | 21597 | #: command-list.h:184 |
fd8cb379 JX |
21598 | msgid "Update auxiliary info file to help dumb servers" |
21599 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
21600 | ||
a6cd2cc4 | 21601 | #: command-list.h:185 |
fd8cb379 JX |
21602 | msgid "Send archive back to git-archive" |
21603 | msgstr "将存档发送回 git-archive" | |
21604 | ||
a6cd2cc4 | 21605 | #: command-list.h:186 |
fd8cb379 JX |
21606 | msgid "Send objects packed back to git-fetch-pack" |
21607 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
21608 | ||
a6cd2cc4 | 21609 | #: command-list.h:187 |
fd8cb379 JX |
21610 | msgid "Show a Git logical variable" |
21611 | msgstr "显示一个Git逻辑变量" | |
21612 | ||
a6cd2cc4 | 21613 | #: command-list.h:188 |
fd8cb379 JX |
21614 | msgid "Check the GPG signature of commits" |
21615 | msgstr "检查 GPG 提交签名" | |
21616 | ||
a6cd2cc4 | 21617 | #: command-list.h:189 |
fd8cb379 JX |
21618 | msgid "Validate packed Git archive files" |
21619 | msgstr "校验打包的Git存仓文件" | |
21620 | ||
a6cd2cc4 | 21621 | #: command-list.h:190 |
fd8cb379 JX |
21622 | msgid "Check the GPG signature of tags" |
21623 | msgstr "检查标签的 GPG 签名" | |
21624 | ||
a6cd2cc4 | 21625 | #: command-list.h:191 |
fd8cb379 JX |
21626 | msgid "Git web interface (web frontend to Git repositories)" |
21627 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
21628 | ||
a6cd2cc4 | 21629 | #: command-list.h:192 |
fd8cb379 JX |
21630 | msgid "Show logs with difference each commit introduces" |
21631 | msgstr "显示每一个提交引入的差异日志" | |
21632 | ||
a6cd2cc4 | 21633 | #: command-list.h:193 |
fd8cb379 JX |
21634 | msgid "Manage multiple working trees" |
21635 | msgstr "管理多个工作区" | |
21636 | ||
a6cd2cc4 | 21637 | #: command-list.h:194 |
fd8cb379 JX |
21638 | msgid "Create a tree object from the current index" |
21639 | msgstr "从当前索引创建一个树对象" | |
21640 | ||
a6cd2cc4 | 21641 | #: command-list.h:195 |
fd8cb379 JX |
21642 | msgid "Defining attributes per path" |
21643 | msgstr "定义路径的属性" | |
21644 | ||
a6cd2cc4 | 21645 | #: command-list.h:196 |
fd8cb379 JX |
21646 | msgid "Git command-line interface and conventions" |
21647 | msgstr "Git 命令行界面和约定" | |
21648 | ||
a6cd2cc4 | 21649 | #: command-list.h:197 |
fd8cb379 JX |
21650 | msgid "A Git core tutorial for developers" |
21651 | msgstr "面向开发人员的 Git 核心教程" | |
21652 | ||
a6cd2cc4 | 21653 | #: command-list.h:198 |
fd8cb379 JX |
21654 | msgid "Git for CVS users" |
21655 | msgstr "适合 CVS 用户的 Git 帮助" | |
21656 | ||
a6cd2cc4 | 21657 | #: command-list.h:199 |
fd8cb379 JX |
21658 | msgid "Tweaking diff output" |
21659 | msgstr "调整差异输出" | |
21660 | ||
a6cd2cc4 | 21661 | #: command-list.h:200 |
fd8cb379 JX |
21662 | msgid "A useful minimum set of commands for Everyday Git" |
21663 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
21664 | ||
a6cd2cc4 | 21665 | #: command-list.h:201 |
fd8cb379 JX |
21666 | msgid "A Git Glossary" |
21667 | msgstr "Git 词汇表" | |
21668 | ||
a6cd2cc4 | 21669 | #: command-list.h:202 |
fd8cb379 JX |
21670 | msgid "Hooks used by Git" |
21671 | msgstr "Git 使用的钩子" | |
21672 | ||
a6cd2cc4 | 21673 | #: command-list.h:203 |
fd8cb379 JX |
21674 | msgid "Specifies intentionally untracked files to ignore" |
21675 | msgstr "忽略指定的未跟踪文件" | |
21676 | ||
a6cd2cc4 | 21677 | #: command-list.h:204 |
fd8cb379 JX |
21678 | msgid "Defining submodule properties" |
21679 | msgstr "定义子模组属性" | |
21680 | ||
a6cd2cc4 | 21681 | #: command-list.h:205 |
fd8cb379 JX |
21682 | msgid "Git namespaces" |
21683 | msgstr "Git 名字空间" | |
21684 | ||
a6cd2cc4 | 21685 | #: command-list.h:206 |
fd8cb379 JX |
21686 | msgid "Git Repository Layout" |
21687 | msgstr "Git 仓库布局" | |
21688 | ||
a6cd2cc4 | 21689 | #: command-list.h:207 |
fd8cb379 JX |
21690 | msgid "Specifying revisions and ranges for Git" |
21691 | msgstr "指定 Git 的版本和版本范围" | |
21692 | ||
a6cd2cc4 | 21693 | #: command-list.h:208 |
fd8cb379 JX |
21694 | msgid "A tutorial introduction to Git: part two" |
21695 | msgstr "一个 Git 教程:第二部分" | |
21696 | ||
a6cd2cc4 | 21697 | #: command-list.h:209 |
fd8cb379 JX |
21698 | msgid "A tutorial introduction to Git" |
21699 | msgstr "一个 Git 教程" | |
21700 | ||
a6cd2cc4 | 21701 | #: command-list.h:210 |
fd8cb379 JX |
21702 | msgid "An overview of recommended workflows with Git" |
21703 | msgstr "Git 推荐的工作流概览" | |
220c313c | 21704 | |
5c57d762 | 21705 | #: git-bisect.sh:54 |
b694fbb1 JX |
21706 | msgid "You need to start by \"git bisect start\"" |
21707 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
21708 | ||
90e6ef53 | 21709 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
21710 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
21711 | #. translation. The program will only accept English input | |
21712 | #. at this point. | |
5c57d762 | 21713 | #: git-bisect.sh:60 |
c04f5ac3 JX |
21714 | msgid "Do you want me to do it for you [Y/n]? " |
21715 | msgstr "您想让我为您这样做么[Y/n]? " | |
21716 | ||
06991777 | 21717 | #: git-bisect.sh:101 |
c04f5ac3 JX |
21718 | #, sh-format |
21719 | msgid "Bad rev input: $arg" | |
9a4b694c | 21720 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 21721 | |
06991777 | 21722 | #: git-bisect.sh:121 |
5c57d762 JX |
21723 | #, sh-format |
21724 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 21725 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 21726 | |
06991777 | 21727 | #: git-bisect.sh:130 |
c04f5ac3 JX |
21728 | #, sh-format |
21729 | msgid "Bad rev input: $rev" | |
9a4b694c | 21730 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 21731 | |
06991777 | 21732 | #: git-bisect.sh:139 |
1b7f4a34 JX |
21733 | #, sh-format |
21734 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
21735 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
21736 | ||
06991777 | 21737 | #: git-bisect.sh:209 |
c04f5ac3 JX |
21738 | msgid "No logfile given" |
21739 | msgstr "未提供日志文件" | |
21740 | ||
06991777 | 21741 | #: git-bisect.sh:210 |
c04f5ac3 JX |
21742 | #, sh-format |
21743 | msgid "cannot read $file for replaying" | |
21744 | msgstr "不能读取 $file 来重放" | |
21745 | ||
06991777 | 21746 | #: git-bisect.sh:232 |
c04f5ac3 JX |
21747 | msgid "?? what are you talking about?" |
21748 | msgstr "?? 您在说什么?" | |
21749 | ||
06991777 | 21750 | #: git-bisect.sh:241 |
5809aa05 JX |
21751 | msgid "bisect run failed: no command provided." |
21752 | msgstr "二分查找运行失败:没有提供命令。" | |
21753 | ||
06991777 | 21754 | #: git-bisect.sh:246 |
b694fbb1 JX |
21755 | #, sh-format |
21756 | msgid "running $command" | |
21757 | msgstr "运行 $command" | |
21758 | ||
06991777 | 21759 | #: git-bisect.sh:253 |
b694fbb1 JX |
21760 | #, sh-format |
21761 | msgid "" | |
21762 | "bisect run failed:\n" | |
21763 | "exit code $res from '$command' is < 0 or >= 128" | |
21764 | msgstr "" | |
21765 | "二分查找运行失败:\n" | |
07432cef | 21766 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 21767 | |
06991777 | 21768 | #: git-bisect.sh:279 |
b694fbb1 JX |
21769 | msgid "bisect run cannot continue any more" |
21770 | msgstr "二分查找不能继续运行" | |
21771 | ||
06991777 | 21772 | #: git-bisect.sh:285 |
b694fbb1 JX |
21773 | #, sh-format |
21774 | msgid "" | |
21775 | "bisect run failed:\n" | |
21776 | "'bisect_state $state' exited with error code $res" | |
21777 | msgstr "" | |
21778 | "二分查找运行失败:\n" | |
21779 | "'bisect_state $state' 退出码为 $res" | |
21780 | ||
06991777 | 21781 | #: git-bisect.sh:292 |
b694fbb1 JX |
21782 | msgid "bisect run success" |
21783 | msgstr "二分查找运行成功" | |
c04f5ac3 | 21784 | |
06991777 JX |
21785 | #: git-bisect.sh:300 |
21786 | msgid "We are not bisecting." | |
21787 | msgstr "我们没有在二分查找。" | |
94550ed3 | 21788 | |
5c57d762 JX |
21789 | #: git-merge-octopus.sh:46 |
21790 | msgid "" | |
21791 | "Error: Your local changes to the following files would be overwritten by " | |
21792 | "merge" | |
21793 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
21794 | ||
21795 | #: git-merge-octopus.sh:61 | |
21796 | msgid "Automated merge did not work." | |
9a4b694c | 21797 | msgstr "自动合并未生效。" |
5c57d762 JX |
21798 | |
21799 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 21800 | msgid "Should not be doing an octopus." |
5c57d762 JX |
21801 | msgstr "不应该执行章鱼式合并。" |
21802 | ||
21803 | #: git-merge-octopus.sh:73 | |
21804 | #, sh-format | |
21805 | msgid "Unable to find common commit with $pretty_name" | |
21806 | msgstr "无法找到和 $pretty_name 的基线提交" | |
21807 | ||
21808 | #: git-merge-octopus.sh:77 | |
21809 | #, sh-format | |
6937cb4e | 21810 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
21811 | msgstr "已经和 $pretty_name 保持一致" |
21812 | ||
21813 | #: git-merge-octopus.sh:89 | |
21814 | #, sh-format | |
21815 | msgid "Fast-forwarding to: $pretty_name" | |
21816 | msgstr "快进至:$pretty_name" | |
21817 | ||
21818 | #: git-merge-octopus.sh:97 | |
21819 | #, sh-format | |
21820 | msgid "Trying simple merge with $pretty_name" | |
21821 | msgstr "尝试和 $pretty_name 的简单合并" | |
21822 | ||
21823 | #: git-merge-octopus.sh:102 | |
21824 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 21825 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 21826 | |
d46c5519 | 21827 | #: git-legacy-stash.sh:220 |
c04f5ac3 | 21828 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 21829 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 21830 | |
d46c5519 | 21831 | #: git-legacy-stash.sh:271 |
2e8451e8 JX |
21832 | #, sh-format |
21833 | msgid "Cannot update $ref_stash with $w_commit" | |
21834 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
21835 | ||
d46c5519 | 21836 | #: git-legacy-stash.sh:323 |
b694fbb1 | 21837 | #, sh-format |
5809aa05 JX |
21838 | msgid "error: unknown option for 'stash push': $option" |
21839 | msgstr "错误:'stash push' 的未知选项:$option" | |
b694fbb1 | 21840 | |
d46c5519 | 21841 | #: git-legacy-stash.sh:355 |
5c57d762 JX |
21842 | #, sh-format |
21843 | msgid "Saved working directory and index state $stash_msg" | |
21844 | msgstr "保存工作目录和索引状态 $stash_msg" | |
21845 | ||
d46c5519 | 21846 | #: git-legacy-stash.sh:535 |
7aea43ff JX |
21847 | #, sh-format |
21848 | msgid "unknown option: $opt" | |
21849 | msgstr "未知选项: $opt" | |
21850 | ||
d46c5519 | 21851 | #: git-legacy-stash.sh:555 |
c04f5ac3 JX |
21852 | #, sh-format |
21853 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 21854 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 21855 | |
d46c5519 | 21856 | #: git-legacy-stash.sh:570 |
c04f5ac3 | 21857 | #, sh-format |
220c313c JX |
21858 | msgid "$reference is not a valid reference" |
21859 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 21860 | |
d46c5519 | 21861 | #: git-legacy-stash.sh:598 |
c04f5ac3 JX |
21862 | #, sh-format |
21863 | msgid "'$args' is not a stash-like commit" | |
a4f16749 | 21864 | msgstr "'$args' 不是贮藏式提交" |
c04f5ac3 | 21865 | |
d46c5519 | 21866 | #: git-legacy-stash.sh:609 |
c04f5ac3 JX |
21867 | #, sh-format |
21868 | msgid "'$args' is not a stash reference" | |
a4f16749 | 21869 | msgstr "'$args' 不是一个贮藏引用" |
c04f5ac3 | 21870 | |
d46c5519 | 21871 | #: git-legacy-stash.sh:617 |
c04f5ac3 | 21872 | msgid "unable to refresh index" |
90e6ef53 | 21873 | msgstr "无法刷新索引" |
c04f5ac3 | 21874 | |
d46c5519 | 21875 | #: git-legacy-stash.sh:621 |
c04f5ac3 | 21876 | msgid "Cannot apply a stash in the middle of a merge" |
a4f16749 | 21877 | msgstr "无法在合并过程应用贮藏" |
c04f5ac3 | 21878 | |
d46c5519 | 21879 | #: git-legacy-stash.sh:629 |
c04f5ac3 | 21880 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 21881 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 21882 | |
d46c5519 | 21883 | #: git-legacy-stash.sh:631 |
c04f5ac3 | 21884 | msgid "Could not save index tree" |
90e6ef53 | 21885 | msgstr "不能保存索引树" |
c04f5ac3 | 21886 | |
d46c5519 | 21887 | #: git-legacy-stash.sh:640 |
a4f16749 JX |
21888 | msgid "Could not restore untracked files from stash entry" |
21889 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
a0b6b246 | 21890 | |
d46c5519 | 21891 | #: git-legacy-stash.sh:665 |
c04f5ac3 | 21892 | msgid "Cannot unstage modified files" |
160fb2b2 | 21893 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 21894 | |
d46c5519 | 21895 | #: git-legacy-stash.sh:703 |
c04f5ac3 JX |
21896 | #, sh-format |
21897 | msgid "Dropped ${REV} ($s)" | |
21898 | msgstr "丢弃了 ${REV} ($s)" | |
21899 | ||
d46c5519 | 21900 | #: git-legacy-stash.sh:704 |
c04f5ac3 JX |
21901 | #, sh-format |
21902 | msgid "${REV}: Could not drop stash entry" | |
a4f16749 | 21903 | msgstr "${REV}:无法丢弃贮藏条目" |
c04f5ac3 | 21904 | |
d46c5519 | 21905 | #: git-legacy-stash.sh:791 |
c04f5ac3 JX |
21906 | msgid "(To restore them type \"git stash apply\")" |
21907 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
21908 | ||
d46c5519 | 21909 | #: git-submodule.sh:200 |
2e8451e8 JX |
21910 | msgid "Relative path can only be used from the toplevel of the working tree" |
21911 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
21912 | ||
d46c5519 | 21913 | #: git-submodule.sh:210 |
c04f5ac3 JX |
21914 | #, sh-format |
21915 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 21916 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 21917 | |
d46c5519 | 21918 | #: git-submodule.sh:229 |
c04f5ac3 | 21919 | #, sh-format |
170e9899 JX |
21920 | msgid "'$sm_path' already exists in the index" |
21921 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 21922 | |
d46c5519 | 21923 | #: git-submodule.sh:232 |
1a79b2f1 JX |
21924 | #, sh-format |
21925 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
21926 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
21927 | ||
d46c5519 JX |
21928 | #: git-submodule.sh:239 |
21929 | #, sh-format | |
21930 | msgid "'$sm_path' does not have a commit checked out" | |
5b533632 | 21931 | msgstr "'$sm_path' 没有检出的提交" |
d46c5519 JX |
21932 | |
21933 | #: git-submodule.sh:245 | |
b694fbb1 JX |
21934 | #, sh-format |
21935 | msgid "" | |
21936 | "The following path is ignored by one of your .gitignore files:\n" | |
21937 | "$sm_path\n" | |
21938 | "Use -f if you really want to add it." | |
21939 | msgstr "" | |
21940 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
21941 | "$sm_path\n" | |
21942 | "如果您确实想添加它,使用 -f 参数。" | |
21943 | ||
d46c5519 | 21944 | #: git-submodule.sh:268 |
b694fbb1 JX |
21945 | #, sh-format |
21946 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 21947 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 21948 | |
d46c5519 | 21949 | #: git-submodule.sh:270 |
c04f5ac3 | 21950 | #, sh-format |
170e9899 | 21951 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 21952 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 21953 | |
d46c5519 | 21954 | #: git-submodule.sh:278 |
07432cef WS |
21955 | #, sh-format |
21956 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 21957 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 21958 | |
d46c5519 | 21959 | #: git-submodule.sh:280 |
07432cef WS |
21960 | #, sh-format |
21961 | msgid "" | |
5c57d762 JX |
21962 | "If you want to reuse this local git directory instead of cloning again from\n" |
21963 | " $realrepo\n" | |
21964 | "use the '--force' option. If the local git directory is not the correct " | |
21965 | "repo\n" | |
07432cef WS |
21966 | "or you are unsure what this means choose another name with the '--name' " |
21967 | "option." | |
5c57d762 JX |
21968 | msgstr "" |
21969 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
21970 | " $realrepo\n" | |
21971 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
21972 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 21973 | |
d46c5519 | 21974 | #: git-submodule.sh:286 |
07432cef WS |
21975 | #, sh-format |
21976 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
21977 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
21978 | ||
d46c5519 | 21979 | #: git-submodule.sh:298 |
c04f5ac3 | 21980 | #, sh-format |
170e9899 JX |
21981 | msgid "Unable to checkout submodule '$sm_path'" |
21982 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 21983 | |
d46c5519 | 21984 | #: git-submodule.sh:303 |
c04f5ac3 | 21985 | #, sh-format |
170e9899 JX |
21986 | msgid "Failed to add submodule '$sm_path'" |
21987 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 21988 | |
d46c5519 | 21989 | #: git-submodule.sh:312 |
c04f5ac3 | 21990 | #, sh-format |
170e9899 JX |
21991 | msgid "Failed to register submodule '$sm_path'" |
21992 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 21993 | |
d46c5519 | 21994 | #: git-submodule.sh:573 |
c04f5ac3 | 21995 | #, sh-format |
2e8451e8 JX |
21996 | msgid "Unable to find current revision in submodule path '$displaypath'" |
21997 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 21998 | |
d46c5519 | 21999 | #: git-submodule.sh:583 |
c04f5ac3 | 22000 | #, sh-format |
170e9899 JX |
22001 | msgid "Unable to fetch in submodule path '$sm_path'" |
22002 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 22003 | |
d46c5519 | 22004 | #: git-submodule.sh:588 |
5c57d762 JX |
22005 | #, sh-format |
22006 | msgid "" | |
22007 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
22008 | "'$sm_path'" | |
9a4b694c | 22009 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 22010 | |
d46c5519 | 22011 | #: git-submodule.sh:606 |
2e8451e8 | 22012 | #, sh-format |
d46c5519 JX |
22013 | msgid "" |
22014 | "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " | |
22015 | "$sha1:" | |
22016 | msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:" | |
2e8451e8 | 22017 | |
d46c5519 | 22018 | #: git-submodule.sh:612 |
5c57d762 JX |
22019 | #, sh-format |
22020 | msgid "" | |
22021 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
22022 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
22023 | msgstr "" |
22024 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 22025 | |
d46c5519 | 22026 | #: git-submodule.sh:619 |
6c94aba5 JX |
22027 | #, sh-format |
22028 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
22029 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
22030 | ||
d46c5519 | 22031 | #: git-submodule.sh:620 |
c04f5ac3 | 22032 | #, sh-format |
6c94aba5 JX |
22033 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
22034 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
22035 | ||
d46c5519 | 22036 | #: git-submodule.sh:624 |
6c94aba5 | 22037 | #, sh-format |
2e8451e8 JX |
22038 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
22039 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 22040 | |
d46c5519 | 22041 | #: git-submodule.sh:625 |
c04f5ac3 | 22042 | #, sh-format |
2e8451e8 JX |
22043 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
22044 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 22045 | |
d46c5519 | 22046 | #: git-submodule.sh:630 |
c04f5ac3 | 22047 | #, sh-format |
2e8451e8 JX |
22048 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
22049 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 22050 | |
d46c5519 | 22051 | #: git-submodule.sh:631 |
c04f5ac3 | 22052 | #, sh-format |
2e8451e8 JX |
22053 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
22054 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 22055 | |
d46c5519 | 22056 | #: git-submodule.sh:636 |
c04f5ac3 | 22057 | #, sh-format |
5b04ee3b JX |
22058 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
22059 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 22060 | |
d46c5519 | 22061 | #: git-submodule.sh:637 |
c04f5ac3 | 22062 | #, sh-format |
5b04ee3b | 22063 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 22064 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 22065 | |
d46c5519 | 22066 | #: git-submodule.sh:668 |
2e8451e8 JX |
22067 | #, sh-format |
22068 | msgid "Failed to recurse into submodule path '$displaypath'" | |
22069 | msgstr "无法递归进子模组路径 '$displaypath'" | |
22070 | ||
d46c5519 | 22071 | #: git-submodule.sh:830 |
649900bc JX |
22072 | msgid "The --cached option cannot be used with the --files option" |
22073 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 22074 | |
d46c5519 | 22075 | #: git-submodule.sh:882 |
b694fbb1 JX |
22076 | #, sh-format |
22077 | msgid "unexpected mode $mod_dst" | |
22078 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 22079 | |
90e6ef53 | 22080 | # 译者:注意保持前导空格 |
d46c5519 | 22081 | #: git-submodule.sh:902 |
c04f5ac3 | 22082 | #, sh-format |
2e8451e8 JX |
22083 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
22084 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 22085 | |
90e6ef53 | 22086 | # 译者:注意保持前导空格 |
d46c5519 | 22087 | #: git-submodule.sh:905 |
c04f5ac3 | 22088 | #, sh-format |
2e8451e8 JX |
22089 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
22090 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 22091 | |
90e6ef53 | 22092 | # 译者:注意保持前导空格 |
d46c5519 | 22093 | #: git-submodule.sh:908 |
c04f5ac3 | 22094 | #, sh-format |
2e8451e8 JX |
22095 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
22096 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 22097 | |
5b04ee3b JX |
22098 | #: git-parse-remote.sh:89 |
22099 | #, sh-format | |
22100 | msgid "See git-${cmd}(1) for details." | |
22101 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 22102 | |
a6cd2cc4 JX |
22103 | #: git-rebase--preserve-merges.sh:109 |
22104 | msgid "Applied autostash." | |
22105 | msgstr "已应用 autostash。" | |
22106 | ||
22107 | #: git-rebase--preserve-merges.sh:112 | |
22108 | #, sh-format | |
22109 | msgid "Cannot store $stash_sha1" | |
22110 | msgstr "不能存储 $stash_sha1" | |
22111 | ||
22112 | #: git-rebase--preserve-merges.sh:191 | |
c1ac5258 JX |
22113 | #, sh-format |
22114 | msgid "Rebasing ($new_count/$total)" | |
22115 | msgstr "变基中($new_count/$total)" | |
22116 | ||
a6cd2cc4 | 22117 | #: git-rebase--preserve-merges.sh:207 |
c1ac5258 JX |
22118 | msgid "" |
22119 | "\n" | |
22120 | "Commands:\n" | |
22121 | "p, pick <commit> = use commit\n" | |
22122 | "r, reword <commit> = use commit, but edit the commit message\n" | |
22123 | "e, edit <commit> = use commit, but stop for amending\n" | |
22124 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
22125 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
22126 | "x, exec <commit> = run command (the rest of the line) using shell\n" | |
22127 | "d, drop <commit> = remove commit\n" | |
22128 | "l, label <label> = label current HEAD with a name\n" | |
22129 | "t, reset <label> = reset HEAD to a label\n" | |
22130 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
22131 | ". create a merge commit using the original merge commit's\n" | |
22132 | ". message (or the oneline, if no original merge commit was\n" | |
22133 | ". specified). Use -c <commit> to reword the commit message.\n" | |
22134 | "\n" | |
22135 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
22136 | msgstr "" | |
22137 | "\n" | |
22138 | "命令:\n" | |
22139 | "p, pick <提交> = 使用提交\n" | |
22140 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
22141 | "e, edit <提交> = 使用提交,但停下来修补\n" | |
22142 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
22143 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
22144 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
22145 | "d, drop <提交> = 删除提交\n" | |
22146 | "l, label <标签> = 为当前 HEAD 打上标签\n" | |
22147 | "t, reset <标签> = 重置 HEAD 到该标签\n" | |
22148 | "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" | |
22149 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
22150 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
22151 | ". -c <提交> 可以编辑提交说明。\n" | |
22152 | "\n" | |
22153 | "可以对这些行重新排序,将从上至下执行。\n" | |
22154 | ||
a6cd2cc4 | 22155 | #: git-rebase--preserve-merges.sh:270 |
5c57d762 JX |
22156 | #, sh-format |
22157 | msgid "" | |
22158 | "You can amend the commit now, with\n" | |
22159 | "\n" | |
22160 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
22161 | "\n" | |
22162 | "Once you are satisfied with your changes, run\n" | |
22163 | "\n" | |
22164 | "\tgit rebase --continue" | |
22165 | msgstr "" | |
22166 | "您现在可以修补这个提交,使用\n" | |
22167 | "\n" | |
22168 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
22169 | "\n" | |
9a4b694c | 22170 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
22171 | "\n" |
22172 | "\tgit rebase --continue" | |
22173 | ||
a6cd2cc4 | 22174 | #: git-rebase--preserve-merges.sh:295 |
5c57d762 JX |
22175 | #, sh-format |
22176 | msgid "$sha1: not a commit that can be picked" | |
22177 | msgstr "$sha1:不是一个可以被拣选的提交" | |
22178 | ||
a6cd2cc4 | 22179 | #: git-rebase--preserve-merges.sh:334 |
5c57d762 JX |
22180 | #, sh-format |
22181 | msgid "Invalid commit name: $sha1" | |
22182 | msgstr "无效的提交名:$sha1" | |
22183 | ||
a6cd2cc4 | 22184 | #: git-rebase--preserve-merges.sh:364 |
5c57d762 JX |
22185 | msgid "Cannot write current commit's replacement sha1" |
22186 | msgstr "不能写入当前提交的替代 sha1" | |
22187 | ||
a6cd2cc4 | 22188 | #: git-rebase--preserve-merges.sh:415 |
5c57d762 JX |
22189 | #, sh-format |
22190 | msgid "Fast-forward to $sha1" | |
22191 | msgstr "快进到 $sha1" | |
22192 | ||
a6cd2cc4 | 22193 | #: git-rebase--preserve-merges.sh:417 |
5c57d762 JX |
22194 | #, sh-format |
22195 | msgid "Cannot fast-forward to $sha1" | |
22196 | msgstr "不能快进到 $sha1" | |
22197 | ||
a6cd2cc4 | 22198 | #: git-rebase--preserve-merges.sh:426 |
5c57d762 JX |
22199 | #, sh-format |
22200 | msgid "Cannot move HEAD to $first_parent" | |
22201 | msgstr "不能移动 HEAD 到 $first_parent" | |
22202 | ||
a6cd2cc4 | 22203 | #: git-rebase--preserve-merges.sh:431 |
5c57d762 JX |
22204 | #, sh-format |
22205 | msgid "Refusing to squash a merge: $sha1" | |
22206 | msgstr "拒绝压缩一个合并:$sha1" | |
22207 | ||
a6cd2cc4 | 22208 | #: git-rebase--preserve-merges.sh:449 |
5c57d762 JX |
22209 | #, sh-format |
22210 | msgid "Error redoing merge $sha1" | |
22211 | msgstr "无法重做合并 $sha1" | |
22212 | ||
a6cd2cc4 | 22213 | #: git-rebase--preserve-merges.sh:458 |
5c57d762 JX |
22214 | #, sh-format |
22215 | msgid "Could not pick $sha1" | |
22216 | msgstr "不能拣选 $sha1" | |
22217 | ||
a6cd2cc4 | 22218 | #: git-rebase--preserve-merges.sh:467 |
5c57d762 JX |
22219 | #, sh-format |
22220 | msgid "This is the commit message #${n}:" | |
9a4b694c | 22221 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 22222 | |
a6cd2cc4 | 22223 | #: git-rebase--preserve-merges.sh:472 |
5c57d762 JX |
22224 | #, sh-format |
22225 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 22226 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 22227 | |
a6cd2cc4 | 22228 | #: git-rebase--preserve-merges.sh:483 |
5c57d762 JX |
22229 | #, sh-format |
22230 | msgid "This is a combination of $count commit." | |
22231 | msgid_plural "This is a combination of $count commits." | |
22232 | msgstr[0] "这是一个 $count 个提交的组合。" | |
22233 | msgstr[1] "这是一个 $count 个提交的组合。" | |
22234 | ||
a6cd2cc4 | 22235 | #: git-rebase--preserve-merges.sh:492 |
5c57d762 JX |
22236 | #, sh-format |
22237 | msgid "Cannot write $fixup_msg" | |
22238 | msgstr "不能写入 $fixup_msg" | |
22239 | ||
a6cd2cc4 | 22240 | #: git-rebase--preserve-merges.sh:495 |
5c57d762 JX |
22241 | msgid "This is a combination of 2 commits." |
22242 | msgstr "这是一个 2 个提交的组合。" | |
22243 | ||
a6cd2cc4 JX |
22244 | #: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 |
22245 | #: git-rebase--preserve-merges.sh:582 | |
5c57d762 JX |
22246 | #, sh-format |
22247 | msgid "Could not apply $sha1... $rest" | |
22248 | msgstr "不能应用 $sha1... $rest" | |
22249 | ||
a6cd2cc4 | 22250 | #: git-rebase--preserve-merges.sh:611 |
5c57d762 JX |
22251 | #, sh-format |
22252 | msgid "" | |
22253 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
22254 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
22255 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
22256 | "before\n" | |
22257 | "you are able to reword the commit." | |
22258 | msgstr "" | |
22259 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
22260 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
22261 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
22262 | ||
a6cd2cc4 | 22263 | #: git-rebase--preserve-merges.sh:626 |
5c57d762 JX |
22264 | #, sh-format |
22265 | msgid "Stopped at $sha1_abbrev... $rest" | |
22266 | msgstr "停止在 $sha1_abbrev... $rest" | |
22267 | ||
a6cd2cc4 | 22268 | #: git-rebase--preserve-merges.sh:641 |
5c57d762 JX |
22269 | #, sh-format |
22270 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 22271 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 22272 | |
a6cd2cc4 | 22273 | #: git-rebase--preserve-merges.sh:683 |
5c57d762 JX |
22274 | #, sh-format |
22275 | msgid "Executing: $rest" | |
22276 | msgstr "执行:$rest" | |
22277 | ||
a6cd2cc4 | 22278 | #: git-rebase--preserve-merges.sh:691 |
5c57d762 JX |
22279 | #, sh-format |
22280 | msgid "Execution failed: $rest" | |
22281 | msgstr "执行失败:$rest" | |
22282 | ||
a6cd2cc4 | 22283 | #: git-rebase--preserve-merges.sh:693 |
5c57d762 JX |
22284 | msgid "and made changes to the index and/or the working tree" |
22285 | msgstr "并且修改索引和/或工作区" | |
22286 | ||
22287 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 22288 | #: git-rebase--preserve-merges.sh:695 |
5c57d762 JX |
22289 | msgid "" |
22290 | "You can fix the problem, and then run\n" | |
22291 | "\n" | |
22292 | "\tgit rebase --continue" | |
22293 | msgstr "" | |
22294 | "您可以解决这个问题,然后运行\n" | |
22295 | "\n" | |
22296 | "\tgit rebase --continue" | |
22297 | ||
22298 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
a6cd2cc4 | 22299 | #: git-rebase--preserve-merges.sh:708 |
5c57d762 JX |
22300 | #, sh-format |
22301 | msgid "" | |
22302 | "Execution succeeded: $rest\n" | |
22303 | "but left changes to the index and/or the working tree\n" | |
22304 | "Commit or stash your changes, and then run\n" | |
22305 | "\n" | |
22306 | "\tgit rebase --continue" | |
22307 | msgstr "" | |
22308 | "执行成功:$rest\n" | |
a4f16749 | 22309 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
22310 | "\n" |
22311 | "\tgit rebase --continue" | |
22312 | ||
a6cd2cc4 | 22313 | #: git-rebase--preserve-merges.sh:719 |
5c57d762 JX |
22314 | #, sh-format |
22315 | msgid "Unknown command: $command $sha1 $rest" | |
22316 | msgstr "未知命令:$command $sha1 $rest" | |
22317 | ||
a6cd2cc4 | 22318 | #: git-rebase--preserve-merges.sh:720 |
5c57d762 JX |
22319 | msgid "Please fix this using 'git rebase --edit-todo'." |
22320 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
22321 | ||
a6cd2cc4 | 22322 | #: git-rebase--preserve-merges.sh:755 |
5c57d762 JX |
22323 | #, sh-format |
22324 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 22325 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 22326 | |
a6cd2cc4 | 22327 | #: git-rebase--preserve-merges.sh:812 |
5c57d762 JX |
22328 | msgid "Could not remove CHERRY_PICK_HEAD" |
22329 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
22330 | ||
a6cd2cc4 | 22331 | #: git-rebase--preserve-merges.sh:817 |
5c57d762 JX |
22332 | #, sh-format |
22333 | msgid "" | |
22334 | "You have staged changes in your working tree.\n" | |
22335 | "If these changes are meant to be\n" | |
22336 | "squashed into the previous commit, run:\n" | |
22337 | "\n" | |
22338 | " git commit --amend $gpg_sign_opt_quoted\n" | |
22339 | "\n" | |
22340 | "If they are meant to go into a new commit, run:\n" | |
22341 | "\n" | |
22342 | " git commit $gpg_sign_opt_quoted\n" | |
22343 | "\n" | |
a0b6b246 | 22344 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
22345 | "\n" |
22346 | " git rebase --continue\n" | |
22347 | msgstr "" | |
22348 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
22349 | "\n" | |
22350 | " git commit --amend $gpg_sign_opt_quoted\n" | |
22351 | "\n" | |
22352 | "如果这些变更要形成一个新提交,执行:\n" | |
22353 | "\n" | |
22354 | " git commit $gpg_sign_opt_quoted\n" | |
22355 | "\n" | |
9a4b694c | 22356 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
22357 | "\n" |
22358 | " git rebase --continue\n" | |
22359 | ||
a6cd2cc4 | 22360 | #: git-rebase--preserve-merges.sh:834 |
5c57d762 | 22361 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 22362 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 22363 | |
a6cd2cc4 | 22364 | #: git-rebase--preserve-merges.sh:839 |
5c57d762 JX |
22365 | msgid "" |
22366 | "You have uncommitted changes in your working tree. Please commit them\n" | |
22367 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
22368 | msgstr "" |
22369 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 22370 | |
a6cd2cc4 | 22371 | #: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 |
5c57d762 JX |
22372 | msgid "Could not commit staged changes." |
22373 | msgstr "不能提交暂存的修改。" | |
22374 | ||
a6cd2cc4 | 22375 | #: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 |
4c27fcb5 JX |
22376 | msgid "Could not execute editor" |
22377 | msgstr "无法运行编辑器" | |
22378 | ||
a6cd2cc4 | 22379 | #: git-rebase--preserve-merges.sh:900 |
4c27fcb5 JX |
22380 | #, sh-format |
22381 | msgid "Could not checkout $switch_to" | |
22382 | msgstr "不能检出 $switch_to" | |
22383 | ||
a6cd2cc4 | 22384 | #: git-rebase--preserve-merges.sh:907 |
4c27fcb5 JX |
22385 | msgid "No HEAD?" |
22386 | msgstr "没有 HEAD?" | |
22387 | ||
a6cd2cc4 | 22388 | #: git-rebase--preserve-merges.sh:908 |
4c27fcb5 JX |
22389 | #, sh-format |
22390 | msgid "Could not create temporary $state_dir" | |
22391 | msgstr "不能创建临时 $state_dir" | |
22392 | ||
a6cd2cc4 | 22393 | #: git-rebase--preserve-merges.sh:911 |
4c27fcb5 JX |
22394 | msgid "Could not mark as interactive" |
22395 | msgstr "不能标记为交互式" | |
22396 | ||
a6cd2cc4 | 22397 | #: git-rebase--preserve-merges.sh:943 |
4c27fcb5 JX |
22398 | #, sh-format |
22399 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
22400 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
22401 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
22402 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
5c57d762 | 22403 | |
a6cd2cc4 | 22404 | #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 |
fd8cb379 JX |
22405 | msgid "Could not init rewritten commits" |
22406 | msgstr "不能对重写提交进行初始化" | |
22407 | ||
5c57d762 JX |
22408 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
22409 | #, sh-format | |
22410 | msgid "usage: $dashless $USAGE" | |
22411 | msgstr "用法:$dashless $USAGE" | |
22412 | ||
d46c5519 | 22413 | #: git-sh-setup.sh:191 |
5c57d762 JX |
22414 | #, sh-format |
22415 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 22416 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 | 22417 | |
d46c5519 | 22418 | #: git-sh-setup.sh:200 git-sh-setup.sh:207 |
5c57d762 JX |
22419 | #, sh-format |
22420 | msgid "fatal: $program_name cannot be used without a working tree." | |
06991777 | 22421 | msgstr "致命错误:$program_name 不能在没有工作区的情况下使用" |
5c57d762 | 22422 | |
d46c5519 | 22423 | #: git-sh-setup.sh:221 |
5c57d762 JX |
22424 | msgid "Cannot rebase: You have unstaged changes." |
22425 | msgstr "不能变基:您有未暂存的变更。" | |
22426 | ||
d46c5519 | 22427 | #: git-sh-setup.sh:224 |
5c57d762 JX |
22428 | msgid "Cannot rewrite branches: You have unstaged changes." |
22429 | msgstr "不能重写分支:您有未暂存的变更。" | |
22430 | ||
d46c5519 | 22431 | #: git-sh-setup.sh:227 |
a0b6b246 JX |
22432 | msgid "Cannot pull with rebase: You have unstaged changes." |
22433 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
22434 | ||
d46c5519 | 22435 | #: git-sh-setup.sh:230 |
5c57d762 JX |
22436 | #, sh-format |
22437 | msgid "Cannot $action: You have unstaged changes." | |
22438 | msgstr "不能 $action:您有未暂存的变更。" | |
22439 | ||
d46c5519 | 22440 | #: git-sh-setup.sh:243 |
5c57d762 JX |
22441 | msgid "Cannot rebase: Your index contains uncommitted changes." |
22442 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
22443 | ||
d46c5519 | 22444 | #: git-sh-setup.sh:246 |
a0b6b246 JX |
22445 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
22446 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
22447 | ||
d46c5519 | 22448 | #: git-sh-setup.sh:249 |
5c57d762 JX |
22449 | #, sh-format |
22450 | msgid "Cannot $action: Your index contains uncommitted changes." | |
22451 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
22452 | ||
d46c5519 | 22453 | #: git-sh-setup.sh:253 |
a0b6b246 JX |
22454 | msgid "Additionally, your index contains uncommitted changes." |
22455 | msgstr "而且您的索引中包含未提交的变更。" | |
22456 | ||
d46c5519 | 22457 | #: git-sh-setup.sh:373 |
5c57d762 JX |
22458 | msgid "You need to run this command from the toplevel of the working tree." |
22459 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
22460 | ||
d46c5519 | 22461 | #: git-sh-setup.sh:378 |
5c57d762 JX |
22462 | msgid "Unable to determine absolute path of git directory" |
22463 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 22464 | |
1a79b2f1 | 22465 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
a6cd2cc4 | 22466 | #: git-add--interactive.perl:210 |
1a79b2f1 JX |
22467 | #, perl-format |
22468 | msgid "%12s %12s %s" | |
22469 | msgstr "%12s %12s %s" | |
22470 | ||
a6cd2cc4 | 22471 | #: git-add--interactive.perl:211 |
1a79b2f1 JX |
22472 | msgid "staged" |
22473 | msgstr "缓存" | |
22474 | ||
a6cd2cc4 | 22475 | #: git-add--interactive.perl:211 |
1a79b2f1 JX |
22476 | msgid "unstaged" |
22477 | msgstr "未缓存" | |
22478 | ||
a6cd2cc4 | 22479 | #: git-add--interactive.perl:267 git-add--interactive.perl:292 |
1a79b2f1 JX |
22480 | msgid "binary" |
22481 | msgstr "二进制" | |
22482 | ||
a6cd2cc4 | 22483 | #: git-add--interactive.perl:276 git-add--interactive.perl:330 |
1a79b2f1 JX |
22484 | msgid "nothing" |
22485 | msgstr "无" | |
22486 | ||
a6cd2cc4 | 22487 | #: git-add--interactive.perl:312 git-add--interactive.perl:327 |
1a79b2f1 JX |
22488 | msgid "unchanged" |
22489 | msgstr "没有修改" | |
22490 | ||
a6cd2cc4 | 22491 | #: git-add--interactive.perl:623 |
1a79b2f1 JX |
22492 | #, perl-format |
22493 | msgid "added %d path\n" | |
22494 | msgid_plural "added %d paths\n" | |
22495 | msgstr[0] "增加了 %d 个路径\n" | |
22496 | msgstr[1] "增加了 %d 个路径\n" | |
22497 | ||
a6cd2cc4 | 22498 | #: git-add--interactive.perl:626 |
1a79b2f1 JX |
22499 | #, perl-format |
22500 | msgid "updated %d path\n" | |
22501 | msgid_plural "updated %d paths\n" | |
22502 | msgstr[0] "更新了 %d 个路径\n" | |
22503 | msgstr[1] "更新了 %d 个路径\n" | |
22504 | ||
a6cd2cc4 | 22505 | #: git-add--interactive.perl:629 |
1a79b2f1 JX |
22506 | #, perl-format |
22507 | msgid "reverted %d path\n" | |
22508 | msgid_plural "reverted %d paths\n" | |
22509 | msgstr[0] "还原了 %d 个路径\n" | |
22510 | msgstr[1] "还原了 %d 个路径\n" | |
22511 | ||
a6cd2cc4 | 22512 | #: git-add--interactive.perl:632 |
1a79b2f1 JX |
22513 | #, perl-format |
22514 | msgid "touched %d path\n" | |
22515 | msgid_plural "touched %d paths\n" | |
22516 | msgstr[0] "触碰了 %d 个路径\n" | |
22517 | msgstr[1] "触碰了 %d 个路径\n" | |
22518 | ||
a6cd2cc4 | 22519 | #: git-add--interactive.perl:641 |
1a79b2f1 JX |
22520 | msgid "Update" |
22521 | msgstr "更新" | |
22522 | ||
a6cd2cc4 | 22523 | #: git-add--interactive.perl:653 |
1a79b2f1 JX |
22524 | msgid "Revert" |
22525 | msgstr "还原" | |
22526 | ||
a6cd2cc4 | 22527 | #: git-add--interactive.perl:676 |
1a79b2f1 JX |
22528 | #, perl-format |
22529 | msgid "note: %s is untracked now.\n" | |
22530 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
22531 | ||
a6cd2cc4 | 22532 | #: git-add--interactive.perl:687 |
1a79b2f1 JX |
22533 | msgid "Add untracked" |
22534 | msgstr "添加未跟踪的" | |
22535 | ||
a6cd2cc4 | 22536 | #: git-add--interactive.perl:693 |
1a79b2f1 JX |
22537 | msgid "No untracked files.\n" |
22538 | msgstr "没有未跟踪的文件。\n" | |
22539 | ||
a6cd2cc4 | 22540 | #: git-add--interactive.perl:1051 |
1a79b2f1 JX |
22541 | msgid "" |
22542 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22543 | "marked for staging." | |
22544 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
22545 | ||
a6cd2cc4 | 22546 | #: git-add--interactive.perl:1054 |
1a79b2f1 JX |
22547 | msgid "" |
22548 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22549 | "marked for stashing." | |
a4f16749 | 22550 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 22551 | |
a6cd2cc4 | 22552 | #: git-add--interactive.perl:1057 |
1a79b2f1 JX |
22553 | msgid "" |
22554 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22555 | "marked for unstaging." | |
22556 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
22557 | ||
a6cd2cc4 JX |
22558 | #: git-add--interactive.perl:1060 git-add--interactive.perl:1069 |
22559 | #: git-add--interactive.perl:1075 | |
1a79b2f1 JX |
22560 | msgid "" |
22561 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22562 | "marked for applying." | |
22563 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
22564 | ||
a6cd2cc4 JX |
22565 | #: git-add--interactive.perl:1063 git-add--interactive.perl:1066 |
22566 | #: git-add--interactive.perl:1072 | |
1a79b2f1 JX |
22567 | msgid "" |
22568 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22569 | "marked for discarding." | |
22570 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
22571 | ||
a6cd2cc4 | 22572 | #: git-add--interactive.perl:1109 |
1a79b2f1 JX |
22573 | #, perl-format |
22574 | msgid "failed to open hunk edit file for writing: %s" | |
c1ac5258 | 22575 | msgstr "为写入打开块编辑文件失败:%s" |
1a79b2f1 | 22576 | |
a6cd2cc4 | 22577 | #: git-add--interactive.perl:1110 |
1a79b2f1 JX |
22578 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
22579 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
22580 | ||
a6cd2cc4 | 22581 | #: git-add--interactive.perl:1116 |
1a79b2f1 JX |
22582 | #, perl-format |
22583 | msgid "" | |
22584 | "---\n" | |
22585 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
22586 | "To remove '%s' lines, delete them.\n" | |
22587 | "Lines starting with %s will be removed.\n" | |
22588 | msgstr "" | |
22589 | "---\n" | |
22590 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
22591 | "要删除 '%s' 开始的行,删除它们。\n" | |
22592 | "以 %s 开始的行将被删除。\n" | |
22593 | ||
22594 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
a6cd2cc4 | 22595 | #: git-add--interactive.perl:1124 |
1a79b2f1 JX |
22596 | msgid "" |
22597 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
22598 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
22599 | "aborted and the hunk is left unchanged.\n" | |
22600 | msgstr "" | |
22601 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
22602 | "此次编辑被终止,该块不会被修改。\n" | |
22603 | ||
a6cd2cc4 | 22604 | #: git-add--interactive.perl:1138 |
1a79b2f1 JX |
22605 | #, perl-format |
22606 | msgid "failed to open hunk edit file for reading: %s" | |
22607 | msgstr "无法读取块编辑文件:%s" | |
22608 | ||
22609 | #. TRANSLATORS: do not translate [y/n] | |
22610 | #. The program will only accept that input | |
22611 | #. at this point. | |
22612 | #. Consider translating (saying "no" discards!) as | |
22613 | #. (saying "n" for "no" discards!) if the translation | |
22614 | #. of the word "no" does not start with n. | |
a6cd2cc4 | 22615 | #: git-add--interactive.perl:1237 |
1a79b2f1 JX |
22616 | msgid "" |
22617 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
22618 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
22619 | ||
a6cd2cc4 | 22620 | #: git-add--interactive.perl:1246 |
1a79b2f1 JX |
22621 | msgid "" |
22622 | "y - stage this hunk\n" | |
22623 | "n - do not stage this hunk\n" | |
22624 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
22625 | "a - stage this hunk and all later hunks in the file\n" | |
22626 | "d - do not stage this hunk or any of the later hunks in the file" | |
22627 | msgstr "" | |
22628 | "y - 暂存该块\n" | |
22629 | "n - 不要暂存该块\n" | |
22630 | "q - 退出。不暂存该块及后面的全部块\n" | |
22631 | "a - 暂存该块和本文件中后面的全部块\n" | |
22632 | "d - 不暂存该块和本文件中后面的全部块" | |
22633 | ||
a6cd2cc4 | 22634 | #: git-add--interactive.perl:1252 |
1a79b2f1 JX |
22635 | msgid "" |
22636 | "y - stash this hunk\n" | |
22637 | "n - do not stash this hunk\n" | |
22638 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
22639 | "a - stash this hunk and all later hunks in the file\n" | |
22640 | "d - do not stash this hunk or any of the later hunks in the file" | |
22641 | msgstr "" | |
22642 | "y - 贮藏该块\n" | |
22643 | "n - 不要贮藏该块\n" | |
22644 | "q - 退出。不贮藏该块及后面的全部块\n" | |
22645 | "a - 贮藏该块和本文件中后面的全部块\n" | |
22646 | "d - 不贮藏该块和本文件中后面的全部块" | |
22647 | ||
a6cd2cc4 | 22648 | #: git-add--interactive.perl:1258 |
1a79b2f1 JX |
22649 | msgid "" |
22650 | "y - unstage this hunk\n" | |
22651 | "n - do not unstage this hunk\n" | |
22652 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
22653 | "a - unstage this hunk and all later hunks in the file\n" | |
22654 | "d - do not unstage this hunk or any of the later hunks in the file" | |
22655 | msgstr "" | |
22656 | "y - 不暂存该块\n" | |
22657 | "n - 不要不暂存该块\n" | |
22658 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
22659 | "a - 不暂存该块和本文件中后面的全部块\n" | |
22660 | "d - 不要不暂存该块和本文件中后面的全部块" | |
22661 | ||
a6cd2cc4 | 22662 | #: git-add--interactive.perl:1264 |
1a79b2f1 JX |
22663 | msgid "" |
22664 | "y - apply this hunk to index\n" | |
22665 | "n - do not apply this hunk to index\n" | |
22666 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
22667 | "a - apply this hunk and all later hunks in the file\n" | |
22668 | "d - do not apply this hunk or any of the later hunks in the file" | |
22669 | msgstr "" | |
22670 | "y - 在索引中应用该块\n" | |
22671 | "n - 不要在索引中应用该块\n" | |
22672 | "q - 退出。不要应用该块及后面的全部块\n" | |
22673 | "a - 应用该块和本文件中后面的全部块\n" | |
22674 | "d - 不要应用该块和本文件中后面的全部块" | |
22675 | ||
a6cd2cc4 | 22676 | #: git-add--interactive.perl:1270 git-add--interactive.perl:1288 |
1a79b2f1 JX |
22677 | msgid "" |
22678 | "y - discard this hunk from worktree\n" | |
22679 | "n - do not discard this hunk from worktree\n" | |
22680 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
22681 | "a - discard this hunk and all later hunks in the file\n" | |
22682 | "d - do not discard this hunk or any of the later hunks in the file" | |
22683 | msgstr "" | |
22684 | "y - 在工作区中丢弃该块\n" | |
22685 | "n - 不要在工作区中丢弃该块\n" | |
22686 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
22687 | "a - 丢弃该块和本文件中后面的全部块\n" | |
22688 | "d - 不要丢弃该块和本文件中后面的全部块" | |
22689 | ||
a6cd2cc4 | 22690 | #: git-add--interactive.perl:1276 |
1a79b2f1 JX |
22691 | msgid "" |
22692 | "y - discard this hunk from index and worktree\n" | |
22693 | "n - do not discard this hunk from index and worktree\n" | |
22694 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
22695 | "a - discard this hunk and all later hunks in the file\n" | |
22696 | "d - do not discard this hunk or any of the later hunks in the file" | |
22697 | msgstr "" | |
22698 | "y - 在索引和工作区中丢弃该块\n" | |
22699 | "n - 不要在索引和工作区中丢弃该块\n" | |
22700 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
22701 | "a - 丢弃该块和本文件中后面的全部块\n" | |
22702 | "d - 不要丢弃该块和本文件中后面的全部块" | |
22703 | ||
a6cd2cc4 | 22704 | #: git-add--interactive.perl:1282 |
1a79b2f1 JX |
22705 | msgid "" |
22706 | "y - apply this hunk to index and worktree\n" | |
22707 | "n - do not apply this hunk to index and worktree\n" | |
22708 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
22709 | "a - apply this hunk and all later hunks in the file\n" | |
22710 | "d - do not apply this hunk or any of the later hunks in the file" | |
22711 | msgstr "" | |
22712 | "y - 在索引和工作区中应用该块\n" | |
22713 | "n - 不要在索引和工作区中应用该块\n" | |
22714 | "q - 退出。不要应用该块及后面的全部块\n" | |
22715 | "a - 应用该块和本文件中后面的全部块\n" | |
22716 | "d - 不要应用该块和本文件中后面的全部块" | |
22717 | ||
a6cd2cc4 JX |
22718 | #: git-add--interactive.perl:1294 |
22719 | msgid "" | |
22720 | "y - apply this hunk to worktree\n" | |
22721 | "n - do not apply this hunk to worktree\n" | |
22722 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
22723 | "a - apply this hunk and all later hunks in the file\n" | |
22724 | "d - do not apply this hunk or any of the later hunks in the file" | |
22725 | msgstr "" | |
22726 | "y - 在工作区中应用该块\n" | |
22727 | "n - 不要在工作区中应用该块\n" | |
22728 | "q - 退出。不要应用该块及后面的全部块\n" | |
22729 | "a - 应用该块和本文件中后面的全部块\n" | |
22730 | "d - 不要应用该块和本文件中后面的全部块" | |
22731 | ||
22732 | #: git-add--interactive.perl:1309 | |
1a79b2f1 JX |
22733 | msgid "" |
22734 | "g - select a hunk to go to\n" | |
22735 | "/ - search for a hunk matching the given regex\n" | |
22736 | "j - leave this hunk undecided, see next undecided hunk\n" | |
22737 | "J - leave this hunk undecided, see next hunk\n" | |
22738 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
22739 | "K - leave this hunk undecided, see previous hunk\n" | |
22740 | "s - split the current hunk into smaller hunks\n" | |
22741 | "e - manually edit the current hunk\n" | |
22742 | "? - print help\n" | |
22743 | msgstr "" | |
22744 | "g - 选择跳转到一个块\n" | |
22745 | "/ - 查找和给定正则表达式匹配的块\n" | |
22746 | "j - 维持该块未决状态,查看下一个未决块\n" | |
22747 | "J - 维持该块未决状态,查看下一个块\n" | |
22748 | "k - 维持该块未决状态,查看上一个未决块\n" | |
22749 | "K - 维持该块未决状态,查看上一个块\n" | |
22750 | "s - 拆分当前块为更小的块\n" | |
22751 | "e - 手动编辑当前块\n" | |
22752 | "? - 显示帮助\n" | |
22753 | ||
a6cd2cc4 | 22754 | #: git-add--interactive.perl:1340 |
1a79b2f1 JX |
22755 | msgid "The selected hunks do not apply to the index!\n" |
22756 | msgstr "选中的块不能应用到索引!\n" | |
22757 | ||
a6cd2cc4 | 22758 | #: git-add--interactive.perl:1341 |
1a79b2f1 JX |
22759 | msgid "Apply them to the worktree anyway? " |
22760 | msgstr "无论如何都要应用到工作区么?" | |
22761 | ||
a6cd2cc4 | 22762 | #: git-add--interactive.perl:1344 |
1a79b2f1 JX |
22763 | msgid "Nothing was applied.\n" |
22764 | msgstr "未应用。\n" | |
22765 | ||
a6cd2cc4 | 22766 | #: git-add--interactive.perl:1355 |
1a79b2f1 JX |
22767 | #, perl-format |
22768 | msgid "ignoring unmerged: %s\n" | |
22769 | msgstr "忽略未合入的:%s\n" | |
22770 | ||
a6cd2cc4 | 22771 | #: git-add--interactive.perl:1364 |
1a79b2f1 JX |
22772 | msgid "Only binary files changed.\n" |
22773 | msgstr "只有二进制文件被修改。\n" | |
22774 | ||
a6cd2cc4 | 22775 | #: git-add--interactive.perl:1366 |
1a79b2f1 JX |
22776 | msgid "No changes.\n" |
22777 | msgstr "没有修改。\n" | |
22778 | ||
a6cd2cc4 | 22779 | #: git-add--interactive.perl:1374 |
1a79b2f1 JX |
22780 | msgid "Patch update" |
22781 | msgstr "补丁更新" | |
22782 | ||
a6cd2cc4 | 22783 | #: git-add--interactive.perl:1426 |
1a79b2f1 | 22784 | #, perl-format |
31e5e17b JX |
22785 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
22786 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22787 | |
a6cd2cc4 | 22788 | #: git-add--interactive.perl:1427 |
1a79b2f1 | 22789 | #, perl-format |
31e5e17b JX |
22790 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
22791 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22792 | |
a6cd2cc4 | 22793 | #: git-add--interactive.perl:1428 |
1a79b2f1 | 22794 | #, perl-format |
31e5e17b JX |
22795 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
22796 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22797 | |
a6cd2cc4 | 22798 | #: git-add--interactive.perl:1431 |
1a79b2f1 | 22799 | #, perl-format |
31e5e17b JX |
22800 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
22801 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22802 | |
a6cd2cc4 | 22803 | #: git-add--interactive.perl:1432 |
1a79b2f1 | 22804 | #, perl-format |
31e5e17b JX |
22805 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
22806 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22807 | |
a6cd2cc4 | 22808 | #: git-add--interactive.perl:1433 |
1a79b2f1 | 22809 | #, perl-format |
31e5e17b JX |
22810 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
22811 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22812 | |
a6cd2cc4 | 22813 | #: git-add--interactive.perl:1436 |
1a79b2f1 | 22814 | #, perl-format |
31e5e17b JX |
22815 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
22816 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22817 | |
a6cd2cc4 | 22818 | #: git-add--interactive.perl:1437 |
1a79b2f1 | 22819 | #, perl-format |
31e5e17b JX |
22820 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
22821 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22822 | |
a6cd2cc4 | 22823 | #: git-add--interactive.perl:1438 |
1a79b2f1 | 22824 | #, perl-format |
31e5e17b JX |
22825 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
22826 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22827 | |
a6cd2cc4 | 22828 | #: git-add--interactive.perl:1441 |
1a79b2f1 | 22829 | #, perl-format |
31e5e17b JX |
22830 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
22831 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22832 | |
a6cd2cc4 | 22833 | #: git-add--interactive.perl:1442 |
1a79b2f1 | 22834 | #, perl-format |
31e5e17b | 22835 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
a6cd2cc4 | 22836 | msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 22837 | |
a6cd2cc4 | 22838 | #: git-add--interactive.perl:1443 |
1a79b2f1 | 22839 | #, perl-format |
31e5e17b | 22840 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
610f8099 | 22841 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 22842 | |
a6cd2cc4 | 22843 | #: git-add--interactive.perl:1446 git-add--interactive.perl:1461 |
1a79b2f1 | 22844 | #, perl-format |
31e5e17b JX |
22845 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
22846 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22847 | |
a6cd2cc4 | 22848 | #: git-add--interactive.perl:1447 git-add--interactive.perl:1462 |
1a79b2f1 | 22849 | #, perl-format |
31e5e17b JX |
22850 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
22851 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22852 | |
a6cd2cc4 | 22853 | #: git-add--interactive.perl:1448 git-add--interactive.perl:1463 |
1a79b2f1 | 22854 | #, perl-format |
31e5e17b JX |
22855 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
22856 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22857 | |
a6cd2cc4 | 22858 | #: git-add--interactive.perl:1451 |
1a79b2f1 | 22859 | #, perl-format |
31e5e17b JX |
22860 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
22861 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22862 | |
a6cd2cc4 | 22863 | #: git-add--interactive.perl:1452 |
1a79b2f1 | 22864 | #, perl-format |
31e5e17b JX |
22865 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
22866 | msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22867 | |
a6cd2cc4 | 22868 | #: git-add--interactive.perl:1453 |
1a79b2f1 | 22869 | #, perl-format |
31e5e17b JX |
22870 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
22871 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22872 | |
a6cd2cc4 | 22873 | #: git-add--interactive.perl:1456 |
1a79b2f1 | 22874 | #, perl-format |
31e5e17b JX |
22875 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
22876 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22877 | |
a6cd2cc4 | 22878 | #: git-add--interactive.perl:1457 |
1a79b2f1 | 22879 | #, perl-format |
31e5e17b | 22880 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
a6cd2cc4 | 22881 | msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 22882 | |
a6cd2cc4 | 22883 | #: git-add--interactive.perl:1458 |
1a79b2f1 | 22884 | #, perl-format |
31e5e17b JX |
22885 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
22886 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
22887 | ||
a6cd2cc4 JX |
22888 | #: git-add--interactive.perl:1466 |
22889 | #, perl-format | |
22890 | msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " | |
22891 | msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " | |
22892 | ||
22893 | #: git-add--interactive.perl:1467 | |
22894 | #, perl-format | |
22895 | msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " | |
22896 | msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " | |
22897 | ||
22898 | #: git-add--interactive.perl:1468 | |
22899 | #, perl-format | |
22900 | msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " | |
22901 | msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " | |
22902 | ||
22903 | #: git-add--interactive.perl:1568 | |
31e5e17b JX |
22904 | msgid "No other hunks to goto\n" |
22905 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 22906 | |
a6cd2cc4 | 22907 | #: git-add--interactive.perl:1575 |
1a79b2f1 JX |
22908 | msgid "go to which hunk (<ret> to see more)? " |
22909 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
22910 | ||
a6cd2cc4 | 22911 | #: git-add--interactive.perl:1577 |
1a79b2f1 JX |
22912 | msgid "go to which hunk? " |
22913 | msgstr "跳转到哪个块?" | |
22914 | ||
a6cd2cc4 | 22915 | #: git-add--interactive.perl:1586 |
1a79b2f1 JX |
22916 | #, perl-format |
22917 | msgid "Invalid number: '%s'\n" | |
22918 | msgstr "无效数字:'%s'\n" | |
22919 | ||
a6cd2cc4 | 22920 | #: git-add--interactive.perl:1591 |
1a79b2f1 JX |
22921 | #, perl-format |
22922 | msgid "Sorry, only %d hunk available.\n" | |
22923 | msgid_plural "Sorry, only %d hunks available.\n" | |
22924 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
22925 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
22926 | ||
a6cd2cc4 | 22927 | #: git-add--interactive.perl:1617 |
31e5e17b JX |
22928 | msgid "No other hunks to search\n" |
22929 | msgstr "没有其它可供查找的块\n" | |
22930 | ||
a6cd2cc4 | 22931 | #: git-add--interactive.perl:1621 |
1a79b2f1 JX |
22932 | msgid "search for regex? " |
22933 | msgstr "使用正则表达式搜索?" | |
22934 | ||
a6cd2cc4 | 22935 | #: git-add--interactive.perl:1634 |
1a79b2f1 JX |
22936 | #, perl-format |
22937 | msgid "Malformed search regexp %s: %s\n" | |
22938 | msgstr "错误的正则表达式 %s:%s\n" | |
22939 | ||
a6cd2cc4 | 22940 | #: git-add--interactive.perl:1644 |
1a79b2f1 JX |
22941 | msgid "No hunk matches the given pattern\n" |
22942 | msgstr "没有和给定模式相匹配的快\n" | |
22943 | ||
a6cd2cc4 | 22944 | #: git-add--interactive.perl:1656 git-add--interactive.perl:1678 |
1a79b2f1 JX |
22945 | msgid "No previous hunk\n" |
22946 | msgstr "没有前一个块\n" | |
22947 | ||
a6cd2cc4 | 22948 | #: git-add--interactive.perl:1665 git-add--interactive.perl:1684 |
1a79b2f1 JX |
22949 | msgid "No next hunk\n" |
22950 | msgstr "没有下一个块\n" | |
22951 | ||
a6cd2cc4 | 22952 | #: git-add--interactive.perl:1690 |
31e5e17b JX |
22953 | msgid "Sorry, cannot split this hunk\n" |
22954 | msgstr "对不起,不能拆分这个块\n" | |
22955 | ||
a6cd2cc4 | 22956 | #: git-add--interactive.perl:1696 |
1a79b2f1 JX |
22957 | #, perl-format |
22958 | msgid "Split into %d hunk.\n" | |
22959 | msgid_plural "Split into %d hunks.\n" | |
22960 | msgstr[0] "拆分为 %d 块。\n" | |
22961 | msgstr[1] "拆分为 %d 块。\n" | |
22962 | ||
a6cd2cc4 | 22963 | #: git-add--interactive.perl:1706 |
31e5e17b JX |
22964 | msgid "Sorry, cannot edit this hunk\n" |
22965 | msgstr "对不起,不能编辑这个块\n" | |
22966 | ||
a6cd2cc4 | 22967 | #: git-add--interactive.perl:1752 |
1a79b2f1 JX |
22968 | msgid "Review diff" |
22969 | msgstr "检视 diff" | |
22970 | ||
22971 | #. TRANSLATORS: please do not translate the command names | |
22972 | #. 'status', 'update', 'revert', etc. | |
a6cd2cc4 | 22973 | #: git-add--interactive.perl:1771 |
1a79b2f1 JX |
22974 | msgid "" |
22975 | "status - show paths with changes\n" | |
22976 | "update - add working tree state to the staged set of changes\n" | |
22977 | "revert - revert staged set of changes back to the HEAD version\n" | |
22978 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 22979 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
22980 | "add untracked - add contents of untracked files to the staged set of " |
22981 | "changes\n" | |
22982 | msgstr "" | |
22983 | "status - 显示含变更的路径\n" | |
22984 | "update - 添加工作区状态至暂存列表\n" | |
22985 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
22986 | "patch - 挑选块并且有选择地更新\n" | |
22987 | "diff - 显示 HEAD 和索引间差异\n" | |
22988 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
22989 | ||
a6cd2cc4 JX |
22990 | #: git-add--interactive.perl:1788 git-add--interactive.perl:1793 |
22991 | #: git-add--interactive.perl:1796 git-add--interactive.perl:1803 | |
22992 | #: git-add--interactive.perl:1806 git-add--interactive.perl:1813 | |
22993 | #: git-add--interactive.perl:1817 git-add--interactive.perl:1823 | |
1a79b2f1 JX |
22994 | msgid "missing --" |
22995 | msgstr "缺失 --" | |
22996 | ||
a6cd2cc4 | 22997 | #: git-add--interactive.perl:1819 |
1a79b2f1 JX |
22998 | #, perl-format |
22999 | msgid "unknown --patch mode: %s" | |
23000 | msgstr "未知的 --patch 模式:%s" | |
23001 | ||
a6cd2cc4 | 23002 | #: git-add--interactive.perl:1825 git-add--interactive.perl:1831 |
1a79b2f1 JX |
23003 | #, perl-format |
23004 | msgid "invalid argument %s, expecting --" | |
23005 | msgstr "无效的参数 %s,期望是 --" | |
23006 | ||
4c27fcb5 | 23007 | #: git-send-email.perl:138 |
1a79b2f1 JX |
23008 | msgid "local zone differs from GMT by a non-minute interval\n" |
23009 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
23010 | ||
4c27fcb5 | 23011 | #: git-send-email.perl:145 git-send-email.perl:151 |
1a79b2f1 JX |
23012 | msgid "local time offset greater than or equal to 24 hours\n" |
23013 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
23014 | ||
a6cd2cc4 | 23015 | #: git-send-email.perl:223 git-send-email.perl:229 |
1a79b2f1 JX |
23016 | msgid "the editor exited uncleanly, aborting everything" |
23017 | msgstr "编辑器非正常退出,终止所有操作" | |
23018 | ||
a6cd2cc4 | 23019 | #: git-send-email.perl:310 |
1a79b2f1 JX |
23020 | #, perl-format |
23021 | msgid "" | |
23022 | "'%s' contains an intermediate version of the email you were composing.\n" | |
23023 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
23024 | ||
a6cd2cc4 | 23025 | #: git-send-email.perl:315 |
1a79b2f1 JX |
23026 | #, perl-format |
23027 | msgid "'%s.final' contains the composed email.\n" | |
23028 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
23029 | ||
a6cd2cc4 | 23030 | #: git-send-email.perl:408 |
1a79b2f1 JX |
23031 | msgid "--dump-aliases incompatible with other options\n" |
23032 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
23033 | ||
a6cd2cc4 | 23034 | #: git-send-email.perl:481 git-send-email.perl:683 |
1a79b2f1 JX |
23035 | msgid "Cannot run git format-patch from outside a repository\n" |
23036 | msgstr "不能在仓库之外运行 git format-patch\n" | |
23037 | ||
a6cd2cc4 | 23038 | #: git-send-email.perl:484 |
31e5e17b JX |
23039 | msgid "" |
23040 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
23041 | "configuration option)\n" | |
23042 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
23043 | ||
a6cd2cc4 | 23044 | #: git-send-email.perl:497 |
1a79b2f1 JX |
23045 | #, perl-format |
23046 | msgid "Unknown --suppress-cc field: '%s'\n" | |
23047 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
23048 | ||
a6cd2cc4 | 23049 | #: git-send-email.perl:528 |
1a79b2f1 JX |
23050 | #, perl-format |
23051 | msgid "Unknown --confirm setting: '%s'\n" | |
23052 | msgstr "未知的 --confirm 设置:'%s'\n" | |
23053 | ||
a6cd2cc4 | 23054 | #: git-send-email.perl:556 |
1a79b2f1 JX |
23055 | #, perl-format |
23056 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
23057 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
23058 | ||
a6cd2cc4 | 23059 | #: git-send-email.perl:558 |
1a79b2f1 JX |
23060 | #, perl-format |
23061 | msgid "warning: `:include:` not supported: %s\n" | |
23062 | msgstr "警告:不支持 `:include:`:%s\n" | |
23063 | ||
a6cd2cc4 | 23064 | #: git-send-email.perl:560 |
1a79b2f1 JX |
23065 | #, perl-format |
23066 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
23067 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
23068 | ||
a6cd2cc4 | 23069 | #: git-send-email.perl:565 |
1a79b2f1 JX |
23070 | #, perl-format |
23071 | msgid "warning: sendmail line is not recognized: %s\n" | |
23072 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
23073 | ||
a6cd2cc4 | 23074 | #: git-send-email.perl:649 |
1a79b2f1 JX |
23075 | #, perl-format |
23076 | msgid "" | |
23077 | "File '%s' exists but it could also be the range of commits\n" | |
23078 | "to produce patches for. Please disambiguate by...\n" | |
23079 | "\n" | |
23080 | " * Saying \"./%s\" if you mean a file; or\n" | |
23081 | " * Giving --format-patch option if you mean a range.\n" | |
23082 | msgstr "" | |
87cb7997 JX |
23083 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
23084 | "歧义:\n" | |
1a79b2f1 JX |
23085 | "\n" |
23086 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
23087 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
23088 | ||
a6cd2cc4 | 23089 | #: git-send-email.perl:670 |
1a79b2f1 JX |
23090 | #, perl-format |
23091 | msgid "Failed to opendir %s: %s" | |
23092 | msgstr "无法打开目录 %s: %s" | |
23093 | ||
a6cd2cc4 | 23094 | #: git-send-email.perl:694 |
1a79b2f1 JX |
23095 | #, perl-format |
23096 | msgid "" | |
23097 | "fatal: %s: %s\n" | |
23098 | "warning: no patches were sent\n" | |
23099 | msgstr "" | |
06991777 | 23100 | "致命错误:%s:%s\n" |
1a79b2f1 JX |
23101 | "警告:补丁未能发送\n" |
23102 | ||
a6cd2cc4 | 23103 | #: git-send-email.perl:705 |
1a79b2f1 JX |
23104 | msgid "" |
23105 | "\n" | |
23106 | "No patch files specified!\n" | |
23107 | "\n" | |
87cb7997 JX |
23108 | msgstr "" |
23109 | "\n" | |
23110 | "未指定补丁文件!\n" | |
23111 | "\n" | |
1a79b2f1 | 23112 | |
a6cd2cc4 | 23113 | #: git-send-email.perl:718 |
1a79b2f1 JX |
23114 | #, perl-format |
23115 | msgid "No subject line in %s?" | |
23116 | msgstr "在 %s 中没有标题行?" | |
23117 | ||
a6cd2cc4 | 23118 | #: git-send-email.perl:728 |
1a79b2f1 JX |
23119 | #, perl-format |
23120 | msgid "Failed to open for writing %s: %s" | |
c1ac5258 | 23121 | msgstr "为写入打开 %s 失败: %s" |
1a79b2f1 | 23122 | |
a6cd2cc4 | 23123 | #: git-send-email.perl:739 |
1a79b2f1 JX |
23124 | msgid "" |
23125 | "Lines beginning in \"GIT:\" will be removed.\n" | |
23126 | "Consider including an overall diffstat or table of contents\n" | |
23127 | "for the patch you are writing.\n" | |
23128 | "\n" | |
23129 | "Clear the body content if you don't wish to send a summary.\n" | |
23130 | msgstr "" | |
23131 | "以 \"GIT:\" 开头的行将被删除。\n" | |
5b533632 | 23132 | "考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n" |
1a79b2f1 JX |
23133 | "\n" |
23134 | "如果您不想发送摘要,清除内容。\n" | |
23135 | ||
a6cd2cc4 | 23136 | #: git-send-email.perl:763 |
1a79b2f1 JX |
23137 | #, perl-format |
23138 | msgid "Failed to open %s: %s" | |
23139 | msgstr "无法打开 %s: %s" | |
23140 | ||
a6cd2cc4 | 23141 | #: git-send-email.perl:780 |
31e5e17b JX |
23142 | #, perl-format |
23143 | msgid "Failed to open %s.final: %s" | |
23144 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 23145 | |
a6cd2cc4 | 23146 | #: git-send-email.perl:823 |
1a79b2f1 JX |
23147 | msgid "Summary email is empty, skipping it\n" |
23148 | msgstr "摘要邮件为空,跳过\n" | |
23149 | ||
23150 | #. TRANSLATORS: please keep [y/N] as is. | |
a6cd2cc4 | 23151 | #: git-send-email.perl:858 |
1a79b2f1 JX |
23152 | #, perl-format |
23153 | msgid "Are you sure you want to use <%s> [y/N]? " | |
23154 | msgstr "您确认要使用 <%s> [y/N]?" | |
23155 | ||
a6cd2cc4 | 23156 | #: git-send-email.perl:913 |
1a79b2f1 JX |
23157 | msgid "" |
23158 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
23159 | "Encoding.\n" | |
23160 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
23161 | ||
a6cd2cc4 | 23162 | #: git-send-email.perl:918 |
1a79b2f1 JX |
23163 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
23164 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
23165 | ||
a6cd2cc4 | 23166 | #: git-send-email.perl:926 |
1a79b2f1 JX |
23167 | #, perl-format |
23168 | msgid "" | |
23169 | "Refusing to send because the patch\n" | |
23170 | "\t%s\n" | |
23171 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
23172 | "want to send.\n" | |
23173 | msgstr "" | |
23174 | "拒绝发送,因为补丁\n" | |
23175 | "\t%s\n" | |
23176 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
23177 | ||
a6cd2cc4 | 23178 | #: git-send-email.perl:945 |
1a79b2f1 JX |
23179 | msgid "To whom should the emails be sent (if anyone)?" |
23180 | msgstr "邮件将要发送给谁?" | |
23181 | ||
a6cd2cc4 | 23182 | #: git-send-email.perl:963 |
1a79b2f1 JX |
23183 | #, perl-format |
23184 | msgid "fatal: alias '%s' expands to itself\n" | |
06991777 | 23185 | msgstr "致命错误:别名 '%s' 扩展为它自己\n" |
1a79b2f1 | 23186 | |
a6cd2cc4 | 23187 | #: git-send-email.perl:975 |
1a79b2f1 JX |
23188 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
23189 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
23190 | ||
a6cd2cc4 | 23191 | #: git-send-email.perl:1033 git-send-email.perl:1041 |
1a79b2f1 JX |
23192 | #, perl-format |
23193 | msgid "error: unable to extract a valid address from: %s\n" | |
23194 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
23195 | ||
23196 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
23197 | #. translation. The program will only accept English input | |
23198 | #. at this point. | |
a6cd2cc4 | 23199 | #: git-send-email.perl:1045 |
1a79b2f1 JX |
23200 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
23201 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
23202 | ||
a6cd2cc4 | 23203 | #: git-send-email.perl:1362 |
1a79b2f1 JX |
23204 | #, perl-format |
23205 | msgid "CA path \"%s\" does not exist" | |
23206 | msgstr "CA 路径 \"%s\" 不存在" | |
23207 | ||
a6cd2cc4 | 23208 | #: git-send-email.perl:1445 |
1a79b2f1 JX |
23209 | msgid "" |
23210 | " The Cc list above has been expanded by additional\n" | |
23211 | " addresses found in the patch commit message. By default\n" | |
23212 | " send-email prompts before sending whenever this occurs.\n" | |
23213 | " This behavior is controlled by the sendemail.confirm\n" | |
23214 | " configuration setting.\n" | |
23215 | "\n" | |
23216 | " For additional information, run 'git send-email --help'.\n" | |
23217 | " To retain the current behavior, but squelch this message,\n" | |
23218 | " run 'git config --global sendemail.confirm auto'.\n" | |
23219 | "\n" | |
23220 | msgstr "" | |
23221 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
23222 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
23223 | " sendemail.confirm 配置设置。\n" | |
23224 | "\n" | |
23225 | " 更多信息,执行 'git send-email --help'。\n" | |
23226 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
23227 | " sendemail.confirm auto'。\n" | |
23228 | "\n" | |
23229 | ||
fd8cb379 | 23230 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
23231 | #. translation. The program will only accept English input |
23232 | #. at this point. | |
a6cd2cc4 | 23233 | #: git-send-email.perl:1460 |
fd8cb379 JX |
23234 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " |
23235 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 23236 | |
a6cd2cc4 | 23237 | #: git-send-email.perl:1463 |
1a79b2f1 JX |
23238 | msgid "Send this email reply required" |
23239 | msgstr "发送要求的邮件回复" | |
23240 | ||
a6cd2cc4 | 23241 | #: git-send-email.perl:1491 |
1a79b2f1 JX |
23242 | msgid "The required SMTP server is not properly defined." |
23243 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
23244 | ||
a6cd2cc4 | 23245 | #: git-send-email.perl:1538 |
1a79b2f1 JX |
23246 | #, perl-format |
23247 | msgid "Server does not support STARTTLS! %s" | |
23248 | msgstr "服务器不支持 STARTTLS!%s" | |
23249 | ||
a6cd2cc4 | 23250 | #: git-send-email.perl:1543 git-send-email.perl:1547 |
a4f16749 JX |
23251 | #, perl-format |
23252 | msgid "STARTTLS failed! %s" | |
23253 | msgstr "STARTTLS 失败!%s" | |
23254 | ||
a6cd2cc4 | 23255 | #: git-send-email.perl:1556 |
1a79b2f1 JX |
23256 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
23257 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
23258 | ||
a6cd2cc4 | 23259 | #: git-send-email.perl:1574 |
1a79b2f1 JX |
23260 | #, perl-format |
23261 | msgid "Failed to send %s\n" | |
23262 | msgstr "无法发送 %s\n" | |
23263 | ||
a6cd2cc4 | 23264 | #: git-send-email.perl:1577 |
1a79b2f1 JX |
23265 | #, perl-format |
23266 | msgid "Dry-Sent %s\n" | |
23267 | msgstr "演习发送 %s\n" | |
23268 | ||
a6cd2cc4 | 23269 | #: git-send-email.perl:1577 |
1a79b2f1 JX |
23270 | #, perl-format |
23271 | msgid "Sent %s\n" | |
23272 | msgstr "正发送 %s\n" | |
23273 | ||
a6cd2cc4 | 23274 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
23275 | msgid "Dry-OK. Log says:\n" |
23276 | msgstr "演习成功。日志说:\n" | |
23277 | ||
a6cd2cc4 | 23278 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
23279 | msgid "OK. Log says:\n" |
23280 | msgstr "OK。日志说:\n" | |
23281 | ||
a6cd2cc4 | 23282 | #: git-send-email.perl:1591 |
1a79b2f1 JX |
23283 | msgid "Result: " |
23284 | msgstr "结果:" | |
23285 | ||
a6cd2cc4 | 23286 | #: git-send-email.perl:1594 |
1a79b2f1 JX |
23287 | msgid "Result: OK\n" |
23288 | msgstr "结果:OK\n" | |
23289 | ||
a6cd2cc4 | 23290 | #: git-send-email.perl:1612 |
1a79b2f1 JX |
23291 | #, perl-format |
23292 | msgid "can't open file %s" | |
23293 | msgstr "无法打开文件 %s" | |
23294 | ||
a6cd2cc4 | 23295 | #: git-send-email.perl:1659 git-send-email.perl:1679 |
1a79b2f1 JX |
23296 | #, perl-format |
23297 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
23298 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
23299 | ||
a6cd2cc4 | 23300 | #: git-send-email.perl:1665 |
1a79b2f1 JX |
23301 | #, perl-format |
23302 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
23303 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
23304 | ||
a6cd2cc4 | 23305 | #: git-send-email.perl:1718 |
1a79b2f1 JX |
23306 | #, perl-format |
23307 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
23308 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
23309 | ||
a6cd2cc4 | 23310 | #: git-send-email.perl:1753 |
1a79b2f1 JX |
23311 | #, perl-format |
23312 | msgid "(body) Adding cc: %s from line '%s'\n" | |
23313 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
23314 | ||
a6cd2cc4 | 23315 | #: git-send-email.perl:1864 |
1a79b2f1 JX |
23316 | #, perl-format |
23317 | msgid "(%s) Could not execute '%s'" | |
23318 | msgstr "(%s) 不能执行 '%s'" | |
23319 | ||
a6cd2cc4 | 23320 | #: git-send-email.perl:1871 |
1a79b2f1 JX |
23321 | #, perl-format |
23322 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
23323 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
23324 | ||
a6cd2cc4 | 23325 | #: git-send-email.perl:1875 |
1a79b2f1 JX |
23326 | #, perl-format |
23327 | msgid "(%s) failed to close pipe to '%s'" | |
23328 | msgstr "(%s) 无法关闭管道至 '%s'" | |
23329 | ||
a6cd2cc4 | 23330 | #: git-send-email.perl:1905 |
1a79b2f1 JX |
23331 | msgid "cannot send message as 7bit" |
23332 | msgstr "不能以 7bit 形式发送信息" | |
23333 | ||
a6cd2cc4 | 23334 | #: git-send-email.perl:1913 |
1a79b2f1 JX |
23335 | msgid "invalid transfer encoding" |
23336 | msgstr "无效的传送编码" | |
23337 | ||
a6cd2cc4 | 23338 | #: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 |
1a79b2f1 JX |
23339 | #, perl-format |
23340 | msgid "unable to open %s: %s\n" | |
23341 | msgstr "不能打开 %s:%s\n" | |
23342 | ||
a6cd2cc4 | 23343 | #: git-send-email.perl:1957 |
1a79b2f1 JX |
23344 | #, perl-format |
23345 | msgid "%s: patch contains a line longer than 998 characters" | |
23346 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
23347 | ||
a6cd2cc4 | 23348 | #: git-send-email.perl:1974 |
1a79b2f1 JX |
23349 | #, perl-format |
23350 | msgid "Skipping %s with backup suffix '%s'.\n" | |
23351 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
23352 | ||
23353 | #. TRANSLATORS: please keep "[y|N]" as is. | |
a6cd2cc4 | 23354 | #: git-send-email.perl:1978 |
1a79b2f1 JX |
23355 | #, perl-format |
23356 | msgid "Do you really want to send %s? [y|N]: " | |
23357 | msgstr "您真的要发送 %s?[y|N]:" |