]>
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" | |
a6cd2cc4 JX |
142 | "POT-Creation-Date: 2019-08-10 20:12+0800\n" |
143 | "PO-Revision-Date: 2019-08-13 21:16+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 | ||
a6cd2cc4 | 194 | #: advice.c:193 builtin/merge.c:1327 |
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 | ||
a6cd2cc4 | 328 | #: apply.c:1460 |
a0b6b246 JX |
329 | #, c-format |
330 | msgid "recount: unexpected line: %.*s" | |
331 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 332 | |
a6cd2cc4 | 333 | #: apply.c:1529 |
a0b6b246 JX |
334 | #, c-format |
335 | msgid "patch fragment without header at line %d: %.*s" | |
336 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 337 | |
a6cd2cc4 | 338 | #: apply.c:1551 |
a0b6b246 JX |
339 | #, c-format |
340 | msgid "" | |
341 | "git diff header lacks filename information when removing %d leading pathname " | |
342 | "component (line %d)" | |
343 | msgid_plural "" | |
344 | "git diff header lacks filename information when removing %d leading pathname " | |
345 | "components (line %d)" | |
346 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
347 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 348 | |
a6cd2cc4 | 349 | #: apply.c:1564 |
a0b6b246 JX |
350 | #, c-format |
351 | msgid "git diff header lacks filename information (line %d)" | |
352 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 353 | |
a6cd2cc4 | 354 | #: apply.c:1752 |
a0b6b246 JX |
355 | msgid "new file depends on old contents" |
356 | msgstr "新文件依赖旧内容" | |
5c57d762 | 357 | |
a6cd2cc4 | 358 | #: apply.c:1754 |
a0b6b246 JX |
359 | msgid "deleted file still has contents" |
360 | msgstr "删除的文件仍有内容" | |
5c57d762 | 361 | |
a6cd2cc4 | 362 | #: apply.c:1788 |
a0b6b246 JX |
363 | #, c-format |
364 | msgid "corrupt patch at line %d" | |
365 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 366 | |
a6cd2cc4 | 367 | #: apply.c:1825 |
5c57d762 | 368 | #, c-format |
a0b6b246 JX |
369 | msgid "new file %s depends on old contents" |
370 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 371 | |
a6cd2cc4 | 372 | #: apply.c:1827 |
5c57d762 | 373 | #, c-format |
a0b6b246 JX |
374 | msgid "deleted file %s still has contents" |
375 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 376 | |
a6cd2cc4 | 377 | #: apply.c:1830 |
a0b6b246 JX |
378 | #, c-format |
379 | msgid "** warning: file %s becomes empty but is not deleted" | |
380 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 381 | |
a6cd2cc4 | 382 | #: apply.c:1977 |
5c57d762 | 383 | #, c-format |
a0b6b246 JX |
384 | msgid "corrupt binary patch at line %d: %.*s" |
385 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 386 | |
a6cd2cc4 | 387 | #: apply.c:2014 |
5c57d762 | 388 | #, c-format |
a0b6b246 JX |
389 | msgid "unrecognized binary patch at line %d" |
390 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 391 | |
a6cd2cc4 | 392 | #: apply.c:2176 |
5c57d762 | 393 | #, c-format |
a0b6b246 JX |
394 | msgid "patch with only garbage at line %d" |
395 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 396 | |
a6cd2cc4 | 397 | #: apply.c:2262 |
5c57d762 | 398 | #, c-format |
a0b6b246 JX |
399 | msgid "unable to read symlink %s" |
400 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 401 | |
a6cd2cc4 | 402 | #: apply.c:2266 |
5c57d762 | 403 | #, c-format |
a0b6b246 JX |
404 | msgid "unable to open or read %s" |
405 | msgstr "不能打开或读取 %s" | |
5c57d762 | 406 | |
a6cd2cc4 | 407 | #: apply.c:2925 |
5c57d762 | 408 | #, c-format |
a0b6b246 JX |
409 | msgid "invalid start of line: '%c'" |
410 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 411 | |
a6cd2cc4 | 412 | #: apply.c:3046 |
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 | |
a6cd2cc4 | 419 | #: apply.c:3058 |
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 | |
a6cd2cc4 | 424 | #: apply.c:3064 |
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 | |
a6cd2cc4 | 433 | #: apply.c:3086 |
5c57d762 | 434 | #, c-format |
a0b6b246 JX |
435 | msgid "missing binary patch data for '%s'" |
436 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 437 | |
a6cd2cc4 | 438 | #: apply.c:3094 |
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 | |
a6cd2cc4 | 443 | #: apply.c:3141 |
5c57d762 | 444 | #, c-format |
a0b6b246 JX |
445 | msgid "cannot apply binary patch to '%s' without full index line" |
446 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 447 | |
a6cd2cc4 | 448 | #: apply.c:3151 |
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 | |
a6cd2cc4 | 454 | #: apply.c:3159 |
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 | |
a6cd2cc4 | 459 | #: apply.c:3177 |
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 | |
a6cd2cc4 | 464 | #: apply.c:3190 |
5c57d762 | 465 | #, c-format |
a0b6b246 JX |
466 | msgid "binary patch does not apply to '%s'" |
467 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 468 | |
a6cd2cc4 | 469 | #: apply.c:3196 |
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 | |
a6cd2cc4 | 474 | #: apply.c:3217 |
276ceeaa | 475 | #, c-format |
a0b6b246 JX |
476 | msgid "patch failed: %s:%ld" |
477 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 478 | |
a6cd2cc4 | 479 | #: apply.c:3340 |
4dcdc3d8 | 480 | #, c-format |
a0b6b246 JX |
481 | msgid "cannot checkout %s" |
482 | msgstr "不能检出 %s" | |
4dcdc3d8 | 483 | |
a6cd2cc4 | 484 | #: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 |
4dcdc3d8 | 485 | #, c-format |
a0b6b246 JX |
486 | msgid "failed to read %s" |
487 | msgstr "无法读取 %s" | |
4dcdc3d8 | 488 | |
a6cd2cc4 | 489 | #: apply.c:3400 |
4dcdc3d8 | 490 | #, c-format |
a0b6b246 JX |
491 | msgid "reading from '%s' beyond a symbolic link" |
492 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 493 | |
a6cd2cc4 | 494 | #: apply.c:3429 apply.c:3672 |
4dcdc3d8 | 495 | #, c-format |
a0b6b246 JX |
496 | msgid "path %s has been renamed/deleted" |
497 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 498 | |
a6cd2cc4 | 499 | #: apply.c:3515 apply.c:3687 |
4dcdc3d8 | 500 | #, c-format |
a0b6b246 JX |
501 | msgid "%s: does not exist in index" |
502 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 503 | |
a6cd2cc4 | 504 | #: apply.c:3524 apply.c:3695 |
4dcdc3d8 | 505 | #, c-format |
a0b6b246 JX |
506 | msgid "%s: does not match index" |
507 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 508 | |
a6cd2cc4 | 509 | #: apply.c:3559 |
a0b6b246 JX |
510 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
511 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 512 | |
a6cd2cc4 | 513 | #: apply.c:3562 |
4dcdc3d8 | 514 | #, c-format |
a0b6b246 JX |
515 | msgid "Falling back to three-way merge...\n" |
516 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 517 | |
a6cd2cc4 | 518 | #: apply.c:3578 apply.c:3582 |
4dcdc3d8 | 519 | #, c-format |
a0b6b246 JX |
520 | msgid "cannot read the current contents of '%s'" |
521 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 522 | |
a6cd2cc4 | 523 | #: apply.c:3594 |
4dcdc3d8 | 524 | #, c-format |
a0b6b246 JX |
525 | msgid "Failed to fall back on three-way merge...\n" |
526 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 527 | |
a6cd2cc4 | 528 | #: apply.c:3608 |
4dcdc3d8 | 529 | #, c-format |
a0b6b246 JX |
530 | msgid "Applied patch to '%s' with conflicts.\n" |
531 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 532 | |
a6cd2cc4 | 533 | #: apply.c:3613 |
4dcdc3d8 | 534 | #, c-format |
a0b6b246 JX |
535 | msgid "Applied patch to '%s' cleanly.\n" |
536 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 537 | |
a6cd2cc4 | 538 | #: apply.c:3639 |
a0b6b246 JX |
539 | msgid "removal patch leaves file contents" |
540 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 541 | |
a6cd2cc4 | 542 | #: apply.c:3712 |
1003b3a5 | 543 | #, c-format |
a0b6b246 JX |
544 | msgid "%s: wrong type" |
545 | msgstr "%s:错误类型" | |
1003b3a5 | 546 | |
a6cd2cc4 | 547 | #: apply.c:3714 |
1003b3a5 | 548 | #, c-format |
a0b6b246 JX |
549 | msgid "%s has type %o, expected %o" |
550 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 551 | |
a6cd2cc4 | 552 | #: apply.c:3865 apply.c:3867 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 | |
a6cd2cc4 | 558 | #: apply.c:3923 |
4dcdc3d8 | 559 | #, c-format |
a0b6b246 JX |
560 | msgid "%s: already exists in index" |
561 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 562 | |
a6cd2cc4 | 563 | #: apply.c:3926 |
4dcdc3d8 | 564 | #, c-format |
a0b6b246 JX |
565 | msgid "%s: already exists in working directory" |
566 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 567 | |
a6cd2cc4 | 568 | #: apply.c:3946 |
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 | |
a6cd2cc4 | 573 | #: apply.c:3951 |
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 | |
a6cd2cc4 | 578 | #: apply.c:3971 |
8ada9598 | 579 | #, c-format |
a0b6b246 JX |
580 | msgid "affected file '%s' is beyond a symbolic link" |
581 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 582 | |
a6cd2cc4 | 583 | #: apply.c:3975 |
81809b99 | 584 | #, c-format |
a0b6b246 JX |
585 | msgid "%s: patch does not apply" |
586 | msgstr "%s:补丁未应用" | |
8ada9598 | 587 | |
a6cd2cc4 | 588 | #: apply.c:3990 |
8ada9598 | 589 | #, c-format |
a0b6b246 | 590 | msgid "Checking patch %s..." |
06991777 | 591 | msgstr "正在检查补丁 %s..." |
8ada9598 | 592 | |
a6cd2cc4 | 593 | #: apply.c:4082 |
a0b6b246 JX |
594 | #, c-format |
595 | msgid "sha1 information is lacking or useless for submodule %s" | |
596 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 597 | |
a6cd2cc4 | 598 | #: apply.c:4089 |
8ada9598 | 599 | #, c-format |
a0b6b246 | 600 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 601 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 602 | |
a6cd2cc4 | 603 | #: apply.c:4092 |
a0b6b246 JX |
604 | #, c-format |
605 | msgid "sha1 information is lacking or useless (%s)." | |
606 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 607 | |
a6cd2cc4 | 608 | #: apply.c:4097 builtin/checkout.c:278 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 | |
a6cd2cc4 | 613 | #: apply.c:4101 |
a0b6b246 JX |
614 | #, c-format |
615 | msgid "could not add %s to temporary index" | |
616 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 617 | |
a6cd2cc4 | 618 | #: apply.c:4111 |
a0b6b246 JX |
619 | #, c-format |
620 | msgid "could not write temporary index to %s" | |
621 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 622 | |
a6cd2cc4 | 623 | #: apply.c:4249 |
a0b6b246 JX |
624 | #, c-format |
625 | msgid "unable to remove %s from index" | |
626 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 627 | |
a6cd2cc4 | 628 | #: apply.c:4283 |
8ada9598 | 629 | #, c-format |
a0b6b246 JX |
630 | msgid "corrupt patch for submodule %s" |
631 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 632 | |
a6cd2cc4 | 633 | #: apply.c:4289 |
9aeb4c2b | 634 | #, c-format |
a0b6b246 | 635 | msgid "unable to stat newly created file '%s'" |
65e2041e | 636 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 637 | |
a6cd2cc4 | 638 | #: apply.c:4297 |
a0b6b246 JX |
639 | #, c-format |
640 | msgid "unable to create backing store for newly created file %s" | |
641 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 642 | |
a6cd2cc4 | 643 | #: apply.c:4303 apply.c:4448 |
81809b99 | 644 | #, c-format |
a0b6b246 JX |
645 | msgid "unable to add cache entry for %s" |
646 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 647 | |
a6cd2cc4 | 648 | #: apply.c:4346 |
a0b6b246 JX |
649 | #, c-format |
650 | msgid "failed to write to '%s'" | |
c1ac5258 | 651 | msgstr "写入 '%s' 失败" |
8ada9598 | 652 | |
a6cd2cc4 | 653 | #: apply.c:4350 |
220c313c | 654 | #, c-format |
a0b6b246 JX |
655 | msgid "closing file '%s'" |
656 | msgstr "关闭文件 '%s'" | |
220c313c | 657 | |
a6cd2cc4 | 658 | #: apply.c:4420 |
c04f5ac3 | 659 | #, c-format |
a0b6b246 JX |
660 | msgid "unable to write file '%s' mode %o" |
661 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 662 | |
a6cd2cc4 | 663 | #: apply.c:4518 |
c04f5ac3 | 664 | #, c-format |
a0b6b246 JX |
665 | msgid "Applied patch %s cleanly." |
666 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 667 | |
a6cd2cc4 | 668 | #: apply.c:4526 |
a0b6b246 JX |
669 | msgid "internal error" |
670 | msgstr "内部错误" | |
c04f5ac3 | 671 | |
a6cd2cc4 | 672 | #: apply.c:4529 |
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 | |
a6cd2cc4 | 679 | #: apply.c:4540 |
5c57d762 | 680 | #, c-format |
a0b6b246 JX |
681 | msgid "truncating .rej filename to %.*s.rej" |
682 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 683 | |
a6cd2cc4 | 684 | #: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 |
220c313c | 685 | #, c-format |
a0b6b246 JX |
686 | msgid "cannot open %s" |
687 | msgstr "不能打开 %s" | |
220c313c | 688 | |
a6cd2cc4 | 689 | #: apply.c:4562 |
220c313c | 690 | #, c-format |
a0b6b246 JX |
691 | msgid "Hunk #%d applied cleanly." |
692 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 693 | |
a6cd2cc4 | 694 | #: apply.c:4566 |
5c57d762 | 695 | #, c-format |
a0b6b246 JX |
696 | msgid "Rejected hunk #%d." |
697 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 698 | |
a6cd2cc4 | 699 | #: apply.c:4676 |
5c57d762 | 700 | #, c-format |
a0b6b246 JX |
701 | msgid "Skipped patch '%s'." |
702 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 703 | |
a6cd2cc4 | 704 | #: apply.c:4684 |
a0b6b246 JX |
705 | msgid "unrecognized input" |
706 | msgstr "未能识别的输入" | |
5c57d762 | 707 | |
a6cd2cc4 | 708 | #: apply.c:4704 |
a0b6b246 JX |
709 | msgid "unable to read index file" |
710 | msgstr "无法读取索引文件" | |
5c57d762 | 711 | |
a6cd2cc4 | 712 | #: apply.c:4859 |
220c313c | 713 | #, c-format |
a0b6b246 JX |
714 | msgid "can't open patch '%s': %s" |
715 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 716 | |
a6cd2cc4 | 717 | #: apply.c:4886 |
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 | |
a6cd2cc4 | 724 | #: apply.c:4892 apply.c:4907 |
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 | |
a6cd2cc4 | 731 | #: apply.c:4900 |
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 | |
a6cd2cc4 | 738 | #: apply.c:4916 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 | |
a6cd2cc4 JX |
742 | #: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 |
743 | #: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 | |
744 | #: builtin/pull.c:208 builtin/submodule--helper.c:407 | |
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 | |
a6cd2cc4 | 751 | #: apply.c:4944 |
a0b6b246 JX |
752 | msgid "don't apply changes matching the given path" |
753 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 754 | |
a6cd2cc4 | 755 | #: apply.c:4947 |
a0b6b246 JX |
756 | msgid "apply changes matching the given path" |
757 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 758 | |
a6cd2cc4 | 759 | #: apply.c:4949 builtin/am.c:2217 |
a0b6b246 JX |
760 | msgid "num" |
761 | msgstr "数字" | |
220c313c | 762 | |
a6cd2cc4 | 763 | #: apply.c:4950 |
a0b6b246 JX |
764 | msgid "remove <num> leading slashes from traditional diff paths" |
765 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 766 | |
a6cd2cc4 | 767 | #: apply.c:4953 |
a0b6b246 JX |
768 | msgid "ignore additions made by the patch" |
769 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 770 | |
a6cd2cc4 | 771 | #: apply.c:4955 |
a0b6b246 JX |
772 | msgid "instead of applying the patch, output diffstat for the input" |
773 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 774 | |
a6cd2cc4 | 775 | #: apply.c:4959 |
a0b6b246 JX |
776 | msgid "show number of added and deleted lines in decimal notation" |
777 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 778 | |
a6cd2cc4 | 779 | #: apply.c:4961 |
a0b6b246 JX |
780 | msgid "instead of applying the patch, output a summary for the input" |
781 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 782 | |
a6cd2cc4 | 783 | #: apply.c:4963 |
a0b6b246 JX |
784 | msgid "instead of applying the patch, see if the patch is applicable" |
785 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 786 | |
a6cd2cc4 | 787 | #: apply.c:4965 |
a0b6b246 JX |
788 | msgid "make sure the patch is applicable to the current index" |
789 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 790 | |
a6cd2cc4 | 791 | #: apply.c:4967 |
c1ac5258 JX |
792 | msgid "mark new files with `git add --intent-to-add`" |
793 | msgstr "使用命令 `git add --intent-to-add` 标记新增文件" | |
794 | ||
a6cd2cc4 | 795 | #: apply.c:4969 |
a0b6b246 JX |
796 | msgid "apply a patch without touching the working tree" |
797 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 798 | |
a6cd2cc4 | 799 | #: apply.c:4971 |
a0b6b246 JX |
800 | msgid "accept a patch that touches outside the working area" |
801 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 802 | |
a6cd2cc4 | 803 | #: apply.c:4974 |
a0b6b246 JX |
804 | msgid "also apply the patch (use with --stat/--summary/--check)" |
805 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 806 | |
a6cd2cc4 | 807 | #: apply.c:4976 |
a0b6b246 JX |
808 | msgid "attempt three-way merge if a patch does not apply" |
809 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 810 | |
a6cd2cc4 | 811 | #: apply.c:4978 |
a0b6b246 JX |
812 | msgid "build a temporary index based on embedded index information" |
813 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 814 | |
a6cd2cc4 | 815 | #: apply.c:4981 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 | |
a6cd2cc4 | 819 | #: apply.c:4983 |
a0b6b246 JX |
820 | msgid "ensure at least <n> lines of context match" |
821 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 822 | |
a6cd2cc4 JX |
823 | #: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 |
824 | #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 | |
825 | #: builtin/pack-objects.c:3330 builtin/rebase.c:1421 | |
a0b6b246 JX |
826 | msgid "action" |
827 | msgstr "动作" | |
8ada9598 | 828 | |
a6cd2cc4 | 829 | #: apply.c:4985 |
a0b6b246 JX |
830 | msgid "detect new or modified lines that have whitespace errors" |
831 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 832 | |
a6cd2cc4 | 833 | #: apply.c:4988 apply.c:4991 |
a0b6b246 JX |
834 | msgid "ignore changes in whitespace when finding context" |
835 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 836 | |
a6cd2cc4 | 837 | #: apply.c:4994 |
a0b6b246 JX |
838 | msgid "apply the patch in reverse" |
839 | msgstr "反向应用补丁" | |
8ada9598 | 840 | |
a6cd2cc4 | 841 | #: apply.c:4996 |
a0b6b246 JX |
842 | msgid "don't expect at least one line of context" |
843 | msgstr "无需至少一行上下文" | |
8ada9598 | 844 | |
a6cd2cc4 | 845 | #: apply.c:4998 |
a0b6b246 JX |
846 | msgid "leave the rejected hunks in corresponding *.rej files" |
847 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 848 | |
a6cd2cc4 | 849 | #: apply.c:5000 |
a0b6b246 JX |
850 | msgid "allow overlapping hunks" |
851 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 852 | |
a6cd2cc4 JX |
853 | #: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 |
854 | #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 | |
855 | #: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 | |
a0b6b246 JX |
856 | msgid "be verbose" |
857 | msgstr "冗长输出" | |
8ada9598 | 858 | |
a6cd2cc4 | 859 | #: apply.c:5003 |
a0b6b246 JX |
860 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
861 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 862 | |
a6cd2cc4 | 863 | #: apply.c:5006 |
a0b6b246 JX |
864 | msgid "do not trust the line counts in the hunk headers" |
865 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 866 | |
a6cd2cc4 | 867 | #: apply.c:5008 builtin/am.c:2205 |
a0b6b246 JX |
868 | msgid "root" |
869 | msgstr "根目录" | |
c04f5ac3 | 870 | |
a6cd2cc4 | 871 | #: apply.c:5009 |
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 | |
a6cd2cc4 | 925 | #: archive.c:458 builtin/log.c:1580 |
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 | |
a6cd2cc4 JX |
933 | #: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 |
934 | #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 | |
935 | #: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 | |
d46c5519 JX |
936 | #: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 |
937 | #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 | |
a0b6b246 JX |
938 | msgid "file" |
939 | msgstr "文件" | |
a77c07d9 | 940 | |
a6cd2cc4 | 941 | #: archive.c:461 builtin/archive.c:90 |
a0b6b246 JX |
942 | msgid "write the archive to this file" |
943 | msgstr "归档写入此文件" | |
a77c07d9 | 944 | |
a6cd2cc4 | 945 | #: archive.c:463 |
a0b6b246 JX |
946 | msgid "read .gitattributes in working directory" |
947 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 948 | |
a6cd2cc4 | 949 | #: archive.c:464 |
a0b6b246 JX |
950 | msgid "report archived files on stderr" |
951 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 952 | |
a6cd2cc4 | 953 | #: archive.c:465 |
a0b6b246 JX |
954 | msgid "store only" |
955 | msgstr "只存储" | |
7ac1c0ad | 956 | |
a6cd2cc4 | 957 | #: archive.c:466 |
a0b6b246 JX |
958 | msgid "compress faster" |
959 | msgstr "压缩速度更快" | |
8ada9598 | 960 | |
a6cd2cc4 | 961 | #: archive.c:474 |
a0b6b246 JX |
962 | msgid "compress better" |
963 | msgstr "压缩效果更好" | |
8ada9598 | 964 | |
a6cd2cc4 | 965 | #: archive.c:477 |
a0b6b246 JX |
966 | msgid "list supported archive formats" |
967 | msgstr "列出支持的归档格式" | |
a77c07d9 | 968 | |
a6cd2cc4 JX |
969 | #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 |
970 | #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 | |
a0b6b246 JX |
971 | msgid "repo" |
972 | msgstr "仓库" | |
c04f5ac3 | 973 | |
a6cd2cc4 | 974 | #: archive.c:480 builtin/archive.c:92 |
a0b6b246 JX |
975 | msgid "retrieve the archive from remote repository <repo>" |
976 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 977 | |
a6cd2cc4 | 978 | #: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 |
06991777 | 979 | #: builtin/notes.c:498 |
a0b6b246 JX |
980 | msgid "command" |
981 | msgstr "命令" | |
982 | ||
a6cd2cc4 | 983 | #: archive.c:482 builtin/archive.c:94 |
a0b6b246 JX |
984 | msgid "path to the remote git-upload-archive command" |
985 | msgstr "远程 git-upload-archive 命令的路径" | |
986 | ||
a6cd2cc4 | 987 | #: archive.c:489 |
a0b6b246 JX |
988 | msgid "Unexpected option --remote" |
989 | msgstr "未知参数 --remote" | |
990 | ||
a6cd2cc4 | 991 | #: archive.c:491 |
a0b6b246 JX |
992 | msgid "Option --exec can only be used together with --remote" |
993 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
994 | ||
a6cd2cc4 | 995 | #: archive.c:493 |
a0b6b246 JX |
996 | msgid "Unexpected option --output" |
997 | msgstr "未知参数 --output" | |
998 | ||
a6cd2cc4 | 999 | #: archive.c:515 |
a0b6b246 JX |
1000 | #, c-format |
1001 | msgid "Unknown archive format '%s'" | |
1002 | msgstr "未知归档格式 '%s'" | |
1003 | ||
a6cd2cc4 | 1004 | #: archive.c:522 |
8ada9598 | 1005 | #, c-format |
a0b6b246 JX |
1006 | msgid "Argument not supported for format '%s': -%d" |
1007 | msgstr "参数不支持此格式 '%s':-%d" | |
1008 | ||
4c27fcb5 | 1009 | #: archive-tar.c:125 archive-zip.c:345 |
c1ac5258 JX |
1010 | #, c-format |
1011 | msgid "cannot stream blob %s" | |
e640d114 | 1012 | msgstr "不能打开数据对象 %s" |
c1ac5258 | 1013 | |
4c27fcb5 | 1014 | #: archive-tar.c:260 archive-zip.c:363 |
c1ac5258 JX |
1015 | #, c-format |
1016 | msgid "unsupported file mode: 0%o (SHA1: %s)" | |
e640d114 | 1017 | msgstr "不支持的文件模式:0%o (SHA1: %s)" |
c1ac5258 | 1018 | |
4c27fcb5 | 1019 | #: archive-tar.c:287 archive-zip.c:353 |
c1ac5258 JX |
1020 | #, c-format |
1021 | msgid "cannot read %s" | |
1022 | msgstr "不能读取 %s" | |
1023 | ||
d46c5519 | 1024 | #: archive-tar.c:459 |
c1ac5258 JX |
1025 | #, c-format |
1026 | msgid "unable to start '%s' filter" | |
1027 | msgstr "无法启动 '%s' 过滤器" | |
1028 | ||
d46c5519 | 1029 | #: archive-tar.c:462 |
c1ac5258 JX |
1030 | msgid "unable to redirect descriptor" |
1031 | msgstr "无法重定向描述符" | |
1032 | ||
d46c5519 | 1033 | #: archive-tar.c:469 |
c1ac5258 JX |
1034 | #, c-format |
1035 | msgid "'%s' filter reported error" | |
e640d114 | 1036 | msgstr "'%s' 过滤器报告了错误" |
c1ac5258 | 1037 | |
4c27fcb5 | 1038 | #: archive-zip.c:314 |
c1ac5258 JX |
1039 | #, c-format |
1040 | msgid "path is not valid UTF-8: %s" | |
1041 | msgstr "路径不是有效的 UTF-8:%s" | |
1042 | ||
4c27fcb5 | 1043 | #: archive-zip.c:318 |
c1ac5258 JX |
1044 | #, c-format |
1045 | msgid "path too long (%d chars, SHA1: %s): %s" | |
1046 | msgstr "路径太长(%d 字符,SHA1:%s):%s" | |
1047 | ||
a6cd2cc4 | 1048 | #: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 |
c1ac5258 JX |
1049 | #, c-format |
1050 | msgid "deflate error (%d)" | |
1051 | msgstr "压缩错误 (%d)" | |
1052 | ||
4c27fcb5 | 1053 | #: archive-zip.c:609 |
c1ac5258 JX |
1054 | #, c-format |
1055 | msgid "timestamp too large for this system: %<PRIuMAX>" | |
e640d114 | 1056 | msgstr "对于本系统时间戳太大:%<PRIuMAX>" |
c1ac5258 | 1057 | |
06991777 | 1058 | #: attr.c:211 |
87cb7997 JX |
1059 | #, c-format |
1060 | msgid "%.*s is not a valid attribute name" | |
1061 | msgstr "%.*s 不是一个有效的属性名" | |
1062 | ||
06991777 JX |
1063 | #: attr.c:368 |
1064 | #, c-format | |
1065 | msgid "%s not allowed: %s:%d" | |
5b533632 | 1066 | msgstr "不允许 %s:%s:%d" |
06991777 JX |
1067 | |
1068 | #: attr.c:408 | |
8ada9598 | 1069 | msgid "" |
a0b6b246 JX |
1070 | "Negative patterns are ignored in git attributes\n" |
1071 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 1072 | msgstr "" |
a0b6b246 JX |
1073 | "负值模版在 git attributes 中被忽略\n" |
1074 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 1075 | |
4c27fcb5 | 1076 | #: bisect.c:468 |
8ada9598 | 1077 | #, c-format |
a0b6b246 JX |
1078 | msgid "Badly quoted content in file '%s': %s" |
1079 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 1080 | |
06991777 | 1081 | #: bisect.c:678 |
a0b6b246 JX |
1082 | #, c-format |
1083 | msgid "We cannot bisect more!\n" | |
1084 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 1085 | |
06991777 | 1086 | #: bisect.c:733 |
2e8451e8 | 1087 | #, c-format |
a0b6b246 JX |
1088 | msgid "Not a valid commit name %s" |
1089 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 1090 | |
06991777 | 1091 | #: bisect.c:758 |
5b04ee3b JX |
1092 | #, c-format |
1093 | msgid "" | |
a0b6b246 JX |
1094 | "The merge base %s is bad.\n" |
1095 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 1096 | msgstr "" |
a0b6b246 JX |
1097 | "合并基线 %s 是坏的。\n" |
1098 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 1099 | |
06991777 | 1100 | #: bisect.c:763 |
5b04ee3b | 1101 | #, c-format |
a0b6b246 JX |
1102 | msgid "" |
1103 | "The merge base %s is new.\n" | |
1104 | "The property has changed between %s and [%s].\n" | |
1105 | msgstr "" | |
1106 | "合并基线 %s 是新的。\n" | |
1107 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1108 | |
06991777 | 1109 | #: bisect.c:768 |
a0b6b246 JX |
1110 | #, c-format |
1111 | msgid "" | |
1112 | "The merge base %s is %s.\n" | |
1113 | "This means the first '%s' commit is between %s and [%s].\n" | |
1114 | msgstr "" | |
1115 | "合并基线 %s 是 %s。\n" | |
1116 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1117 | |
06991777 | 1118 | #: bisect.c:776 |
a0b6b246 JX |
1119 | #, c-format |
1120 | msgid "" | |
1a79b2f1 | 1121 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1122 | "git bisect cannot work properly in this case.\n" |
1123 | "Maybe you mistook %s and %s revs?\n" | |
1124 | msgstr "" | |
1125 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1126 | "这种情况下 git 二分查找无法正常工作。\n" | |
1127 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1128 | |
06991777 | 1129 | #: bisect.c:789 |
a0b6b246 JX |
1130 | #, c-format |
1131 | msgid "" | |
1132 | "the merge base between %s and [%s] must be skipped.\n" | |
1133 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1134 | "We continue anyway." | |
1135 | msgstr "" | |
1136 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1137 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1138 | "我们仍旧继续。" | |
649900bc | 1139 | |
06991777 | 1140 | #: bisect.c:822 |
649900bc | 1141 | #, c-format |
a0b6b246 JX |
1142 | msgid "Bisecting: a merge base must be tested\n" |
1143 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1144 | |
06991777 | 1145 | #: bisect.c:865 |
a0b6b246 JX |
1146 | #, c-format |
1147 | msgid "a %s revision is needed" | |
1148 | msgstr "需要一个 %s 版本" | |
649900bc | 1149 | |
a6cd2cc4 | 1150 | #: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 |
649900bc | 1151 | #, c-format |
a0b6b246 JX |
1152 | msgid "could not create file '%s'" |
1153 | msgstr "不能创建文件 '%s'" | |
649900bc | 1154 | |
a6cd2cc4 | 1155 | #: bisect.c:928 builtin/merge.c:148 |
649900bc | 1156 | #, c-format |
a0b6b246 JX |
1157 | msgid "could not read file '%s'" |
1158 | msgstr "不能读取文件 '%s'" | |
649900bc | 1159 | |
d46c5519 | 1160 | #: bisect.c:958 |
a0b6b246 JX |
1161 | msgid "reading bisect refs failed" |
1162 | msgstr "读取二分查找引用失败" | |
649900bc | 1163 | |
d46c5519 | 1164 | #: bisect.c:977 |
649900bc | 1165 | #, c-format |
a0b6b246 JX |
1166 | msgid "%s was both %s and %s\n" |
1167 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1168 | |
d46c5519 | 1169 | #: bisect.c:985 |
649900bc | 1170 | #, c-format |
a0b6b246 JX |
1171 | msgid "" |
1172 | "No testable commit found.\n" | |
1173 | "Maybe you started with bad path parameters?\n" | |
1174 | msgstr "" | |
1175 | "没有发现可测试的提交。\n" | |
1176 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1177 | |
d46c5519 | 1178 | #: bisect.c:1004 |
649900bc | 1179 | #, c-format |
a0b6b246 JX |
1180 | msgid "(roughly %d step)" |
1181 | msgid_plural "(roughly %d steps)" | |
1182 | msgstr[0] "(大概 %d 步)" | |
1183 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1184 | |
a4f16749 JX |
1185 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1186 | #. steps)" translation. | |
1187 | #. | |
d46c5519 | 1188 | #: bisect.c:1010 |
649900bc | 1189 | #, c-format |
a0b6b246 JX |
1190 | msgid "Bisecting: %d revision left to test after this %s\n" |
1191 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1192 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1193 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1194 | |
a6cd2cc4 | 1195 | #: blame.c:2697 |
a4f16749 JX |
1196 | msgid "--contents and --reverse do not blend well." |
1197 | msgstr "--contents 和 --reverse 不能混用。" | |
1198 | ||
a6cd2cc4 | 1199 | #: blame.c:2711 |
a4f16749 JX |
1200 | msgid "cannot use --contents with final commit object name" |
1201 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1202 | ||
a6cd2cc4 | 1203 | #: blame.c:2732 |
a4f16749 JX |
1204 | msgid "--reverse and --first-parent together require specified latest commit" |
1205 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1206 | ||
a6cd2cc4 JX |
1207 | #: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 |
1208 | #: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 | |
1209 | #: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 | |
1210 | #: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 | |
fd8cb379 | 1211 | #: builtin/shortlog.c:192 |
a4f16749 JX |
1212 | msgid "revision walk setup failed" |
1213 | msgstr "版本遍历设置失败" | |
1214 | ||
a6cd2cc4 | 1215 | #: blame.c:2759 |
a4f16749 JX |
1216 | msgid "" |
1217 | "--reverse --first-parent together require range along first-parent chain" | |
1218 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1219 | ||
a6cd2cc4 | 1220 | #: blame.c:2770 |
a4f16749 JX |
1221 | #, c-format |
1222 | msgid "no such path %s in %s" | |
1223 | msgstr "在 %2$s 中无此路径 %1$s" | |
1224 | ||
a6cd2cc4 | 1225 | #: blame.c:2781 |
a4f16749 JX |
1226 | #, c-format |
1227 | msgid "cannot read blob %s for path %s" | |
1228 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1229 | ||
d46c5519 | 1230 | #: branch.c:53 |
649900bc | 1231 | #, c-format |
a0b6b246 JX |
1232 | msgid "" |
1233 | "\n" | |
1234 | "After fixing the error cause you may try to fix up\n" | |
1235 | "the remote tracking information by invoking\n" | |
1236 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1237 | msgstr "" | |
1238 | "\n" | |
1239 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1240 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1241 | |
d46c5519 | 1242 | #: branch.c:67 |
649900bc | 1243 | #, c-format |
a0b6b246 JX |
1244 | msgid "Not setting branch %s as its own upstream." |
1245 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1246 | |
d46c5519 | 1247 | #: branch.c:93 |
649900bc | 1248 | #, c-format |
6937cb4e JX |
1249 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1250 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1251 | |
d46c5519 | 1252 | #: branch.c:94 |
649900bc | 1253 | #, c-format |
6937cb4e JX |
1254 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1255 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1256 | |
d46c5519 | 1257 | #: branch.c:98 |
649900bc | 1258 | #, c-format |
6937cb4e JX |
1259 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1260 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1261 | |
d46c5519 | 1262 | #: branch.c:99 |
649900bc | 1263 | #, c-format |
6937cb4e | 1264 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1265 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1266 | |
d46c5519 | 1267 | #: branch.c:104 |
649900bc | 1268 | #, c-format |
6937cb4e JX |
1269 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1270 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1271 | |
d46c5519 | 1272 | #: branch.c:105 |
649900bc | 1273 | #, c-format |
6937cb4e JX |
1274 | msgid "Branch '%s' set up to track remote ref '%s'." |
1275 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1276 | |
d46c5519 | 1277 | #: branch.c:109 |
649900bc | 1278 | #, c-format |
6937cb4e JX |
1279 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1280 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1281 | |
d46c5519 | 1282 | #: branch.c:110 |
649900bc | 1283 | #, c-format |
6937cb4e JX |
1284 | msgid "Branch '%s' set up to track local ref '%s'." |
1285 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1286 | |
d46c5519 | 1287 | #: branch.c:119 |
a0b6b246 JX |
1288 | msgid "Unable to write upstream branch configuration" |
1289 | msgstr "无法写入上游分支配置" | |
649900bc | 1290 | |
d46c5519 | 1291 | #: branch.c:156 |
649900bc | 1292 | #, c-format |
a0b6b246 JX |
1293 | msgid "Not tracking: ambiguous information for ref %s" |
1294 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1295 | |
d46c5519 | 1296 | #: branch.c:189 |
649900bc | 1297 | #, c-format |
a0b6b246 JX |
1298 | msgid "'%s' is not a valid branch name." |
1299 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1300 | |
d46c5519 | 1301 | #: branch.c:208 |
649900bc | 1302 | #, c-format |
a0b6b246 JX |
1303 | msgid "A branch named '%s' already exists." |
1304 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1305 | |
d46c5519 | 1306 | #: branch.c:213 |
a0b6b246 JX |
1307 | msgid "Cannot force update the current branch." |
1308 | msgstr "无法强制更新当前分支。" | |
649900bc | 1309 | |
d46c5519 | 1310 | #: branch.c:233 |
649900bc | 1311 | #, c-format |
a0b6b246 JX |
1312 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1313 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1314 | |
d46c5519 | 1315 | #: branch.c:235 |
649900bc | 1316 | #, c-format |
a0b6b246 JX |
1317 | msgid "the requested upstream branch '%s' does not exist" |
1318 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1319 | |
d46c5519 | 1320 | #: branch.c:237 |
a0b6b246 JX |
1321 | msgid "" |
1322 | "\n" | |
1323 | "If you are planning on basing your work on an upstream\n" | |
1324 | "branch that already exists at the remote, you may need to\n" | |
1325 | "run \"git fetch\" to retrieve it.\n" | |
1326 | "\n" | |
1327 | "If you are planning to push out a new local branch that\n" | |
1328 | "will track its remote counterpart, you may want to use\n" | |
1329 | "\"git push -u\" to set the upstream config as you push." | |
1330 | msgstr "" | |
1331 | "\n" | |
1332 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1333 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1334 | "\n" | |
1335 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1336 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1337 | |
d46c5519 | 1338 | #: branch.c:281 |
649900bc | 1339 | #, c-format |
a0b6b246 JX |
1340 | msgid "Not a valid object name: '%s'." |
1341 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1342 | |
d46c5519 | 1343 | #: branch.c:301 |
649900bc | 1344 | #, c-format |
a0b6b246 JX |
1345 | msgid "Ambiguous object name: '%s'." |
1346 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1347 | |
d46c5519 | 1348 | #: branch.c:306 |
649900bc | 1349 | #, c-format |
a0b6b246 JX |
1350 | msgid "Not a valid branch point: '%s'." |
1351 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1352 | |
a6cd2cc4 | 1353 | #: branch.c:364 |
649900bc | 1354 | #, c-format |
a0b6b246 JX |
1355 | msgid "'%s' is already checked out at '%s'" |
1356 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1357 | |
a6cd2cc4 | 1358 | #: branch.c:387 |
a0b6b246 JX |
1359 | #, c-format |
1360 | msgid "HEAD of working tree %s is not updated" | |
1361 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1362 | |
c1ac5258 | 1363 | #: bundle.c:36 |
649900bc | 1364 | #, c-format |
a0b6b246 JX |
1365 | msgid "'%s' does not look like a v2 bundle file" |
1366 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1367 | |
c1ac5258 | 1368 | #: bundle.c:64 |
a0b6b246 JX |
1369 | #, c-format |
1370 | msgid "unrecognized header: %s%s (%d)" | |
1371 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1372 | |
a6cd2cc4 JX |
1373 | #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 |
1374 | #: builtin/commit.c:791 | |
649900bc | 1375 | #, c-format |
a0b6b246 JX |
1376 | msgid "could not open '%s'" |
1377 | msgstr "不能打开 '%s'" | |
649900bc | 1378 | |
06991777 | 1379 | #: bundle.c:143 |
a0b6b246 JX |
1380 | msgid "Repository lacks these prerequisite commits:" |
1381 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1382 | |
a6cd2cc4 JX |
1383 | #: bundle.c:146 |
1384 | msgid "need a repository to verify a bundle" | |
1385 | msgstr "需要一个仓库来校验一个包" | |
1386 | ||
1387 | #: bundle.c:197 | |
2e8451e8 | 1388 | #, c-format |
a0b6b246 JX |
1389 | msgid "The bundle contains this ref:" |
1390 | msgid_plural "The bundle contains these %d refs:" | |
1391 | msgstr[0] "这个包中含有这个引用:" | |
1392 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1393 | |
a6cd2cc4 | 1394 | #: bundle.c:204 |
a0b6b246 JX |
1395 | msgid "The bundle records a complete history." |
1396 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1397 | |
a6cd2cc4 | 1398 | #: bundle.c:206 |
2e8451e8 | 1399 | #, c-format |
a0b6b246 JX |
1400 | msgid "The bundle requires this ref:" |
1401 | msgid_plural "The bundle requires these %d refs:" | |
1402 | msgstr[0] "这个包需要这个引用:" | |
1403 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1404 | |
a6cd2cc4 | 1405 | #: bundle.c:272 |
4c27fcb5 JX |
1406 | msgid "unable to dup bundle descriptor" |
1407 | msgstr "无法复制 bundle 描述符" | |
1408 | ||
a6cd2cc4 | 1409 | #: bundle.c:279 |
a0b6b246 JX |
1410 | msgid "Could not spawn pack-objects" |
1411 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1412 | |
a6cd2cc4 | 1413 | #: bundle.c:290 |
a0b6b246 JX |
1414 | msgid "pack-objects died" |
1415 | msgstr "pack-objects 终止" | |
8ada9598 | 1416 | |
a6cd2cc4 | 1417 | #: bundle.c:332 |
a0b6b246 JX |
1418 | msgid "rev-list died" |
1419 | msgstr "rev-list 终止" | |
1420 | ||
a6cd2cc4 | 1421 | #: bundle.c:381 |
81809b99 | 1422 | #, c-format |
a0b6b246 JX |
1423 | msgid "ref '%s' is excluded by the rev-list options" |
1424 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1425 | |
a6cd2cc4 | 1426 | #: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 |
81809b99 | 1427 | #, c-format |
a0b6b246 JX |
1428 | msgid "unrecognized argument: %s" |
1429 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1430 | |
a6cd2cc4 | 1431 | #: bundle.c:468 |
a0b6b246 JX |
1432 | msgid "Refusing to create empty bundle." |
1433 | msgstr "不能创建空包。" | |
1434 | ||
a6cd2cc4 | 1435 | #: bundle.c:478 |
81809b99 | 1436 | #, c-format |
a0b6b246 JX |
1437 | msgid "cannot create '%s'" |
1438 | msgstr "不能创建 '%s'" | |
8ada9598 | 1439 | |
a6cd2cc4 | 1440 | #: bundle.c:503 |
a0b6b246 JX |
1441 | msgid "index-pack died" |
1442 | msgstr "index-pack 终止" | |
63af42fe | 1443 | |
31e5e17b | 1444 | #: color.c:296 |
94550ed3 | 1445 | #, c-format |
a0b6b246 JX |
1446 | msgid "invalid color value: %.*s" |
1447 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1448 | |
a6cd2cc4 JX |
1449 | #: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 |
1450 | #: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 | |
94550ed3 | 1451 | #, c-format |
a0b6b246 JX |
1452 | msgid "could not parse %s" |
1453 | msgstr "不能解析 %s" | |
94550ed3 | 1454 | |
4c27fcb5 | 1455 | #: commit.c:52 |
a0b6b246 JX |
1456 | #, c-format |
1457 | msgid "%s %s is not a commit!" | |
31e5e17b | 1458 | msgstr "%s %s 不是一个提交!" |
90314792 | 1459 | |
a6cd2cc4 | 1460 | #: commit.c:192 |
fd8cb379 JX |
1461 | msgid "" |
1462 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
1463 | "and will be removed in a future Git version.\n" | |
1464 | "\n" | |
1465 | "Please use \"git replace --convert-graft-file\"\n" | |
1466 | "to convert the grafts into replace refs.\n" | |
1467 | "\n" | |
1468 | "Turn this message off by running\n" | |
1469 | "\"git config advice.graftFileDeprecated false\"" | |
1470 | msgstr "" | |
1471 | "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n" | |
1472 | "未来的Git版本中被移除。\n" | |
1473 | "\n" | |
1474 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
1475 | "grafts 转换为替换引用。\n" | |
1476 | "\n" | |
1477 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
1478 | "可关闭本消息" | |
1479 | ||
a6cd2cc4 | 1480 | #: commit.c:1127 |
4c27fcb5 JX |
1481 | #, c-format |
1482 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
1483 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
1484 | ||
a6cd2cc4 | 1485 | #: commit.c:1130 |
4c27fcb5 JX |
1486 | #, c-format |
1487 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
1488 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
1489 | ||
a6cd2cc4 | 1490 | #: commit.c:1133 |
4c27fcb5 JX |
1491 | #, c-format |
1492 | msgid "Commit %s does not have a GPG signature." | |
1493 | msgstr "提交 %s 没有 GPG 签名。" | |
1494 | ||
a6cd2cc4 | 1495 | #: commit.c:1136 |
4c27fcb5 JX |
1496 | #, c-format |
1497 | msgid "Commit %s has a good GPG signature by %s\n" | |
1498 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
1499 | ||
a6cd2cc4 | 1500 | #: commit.c:1390 |
90314792 | 1501 | msgid "" |
a0b6b246 JX |
1502 | "Warning: commit message did not conform to UTF-8.\n" |
1503 | "You may want to amend it after fixing the message, or set the config\n" | |
1504 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1505 | msgstr "" | |
29004bbb | 1506 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1507 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1508 | "设置为您项目所用的字符编码。\n" |
90314792 | 1509 | |
a6cd2cc4 | 1510 | #: commit-graph.c:127 |
d46c5519 JX |
1511 | msgid "commit-graph file is too small" |
1512 | msgstr "提交图形文件太小" | |
c1ac5258 | 1513 | |
a6cd2cc4 | 1514 | #: commit-graph.c:192 |
c1ac5258 | 1515 | #, c-format |
d46c5519 JX |
1516 | msgid "commit-graph signature %X does not match signature %X" |
1517 | msgstr "提交图形签名 %X 和签名 %X 不匹配" | |
c1ac5258 | 1518 | |
a6cd2cc4 | 1519 | #: commit-graph.c:199 |
c1ac5258 | 1520 | #, c-format |
d46c5519 JX |
1521 | msgid "commit-graph version %X does not match version %X" |
1522 | msgstr "提交图形版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 1523 | |
a6cd2cc4 | 1524 | #: commit-graph.c:206 |
c1ac5258 | 1525 | #, c-format |
d46c5519 JX |
1526 | msgid "commit-graph hash version %X does not match version %X" |
1527 | msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 1528 | |
a6cd2cc4 | 1529 | #: commit-graph.c:229 |
d46c5519 JX |
1530 | msgid "commit-graph chunk lookup table entry missing; file may be incomplete" |
1531 | msgstr "提交图形块查找表条目丢失,文件可能不完整" | |
06991777 | 1532 | |
a6cd2cc4 | 1533 | #: commit-graph.c:240 |
c1ac5258 | 1534 | #, c-format |
d46c5519 JX |
1535 | msgid "commit-graph improper chunk offset %08x%08x" |
1536 | msgstr "提交图形不正确的块偏移 %08x%08x" | |
c1ac5258 | 1537 | |
a6cd2cc4 | 1538 | #: commit-graph.c:283 |
c1ac5258 | 1539 | #, c-format |
d46c5519 JX |
1540 | msgid "commit-graph chunk id %08x appears multiple times" |
1541 | msgstr "提交图形块 id %08x 出现了多次" | |
c1ac5258 | 1542 | |
a6cd2cc4 JX |
1543 | #: commit-graph.c:347 |
1544 | msgid "commit-graph has no base graphs chunk" | |
1545 | msgstr "提交图形没有基础图形块" | |
1546 | ||
1547 | #: commit-graph.c:357 | |
1548 | msgid "commit-graph chain does not match" | |
1549 | msgstr "提交图形链不匹配" | |
1550 | ||
1551 | #: commit-graph.c:404 | |
1552 | #, c-format | |
1553 | msgid "invalid commit-graph chain: line '%s' not a hash" | |
1554 | msgstr "无效的提交图形链:行 '%s' 不是一个哈希值" | |
1555 | ||
1556 | #: commit-graph.c:430 | |
1557 | msgid "unable to find all commit-graph files" | |
1558 | msgstr "无法找到所有提交图形文件" | |
1559 | ||
1560 | #: commit-graph.c:554 commit-graph.c:614 | |
1561 | msgid "invalid commit position. commit-graph is likely corrupt" | |
1562 | msgstr "无效的提交位置。提交图形可能已损坏" | |
1563 | ||
1564 | #: commit-graph.c:575 | |
c1ac5258 JX |
1565 | #, c-format |
1566 | msgid "could not find commit %s" | |
1567 | msgstr "无法找到提交 %s" | |
1568 | ||
a6cd2cc4 | 1569 | #: commit-graph.c:1002 builtin/pack-objects.c:2657 |
c1ac5258 JX |
1570 | #, c-format |
1571 | msgid "unable to get type of object %s" | |
1572 | msgstr "无法获得对象 %s 类型" | |
1573 | ||
a6cd2cc4 | 1574 | #: commit-graph.c:1034 |
06991777 JX |
1575 | msgid "Loading known commits in commit graph" |
1576 | msgstr "正在加载提交图中的已知提交" | |
1577 | ||
a6cd2cc4 | 1578 | #: commit-graph.c:1051 |
06991777 JX |
1579 | msgid "Expanding reachable commits in commit graph" |
1580 | msgstr "正在扩展提交图中的可达提交" | |
1581 | ||
a6cd2cc4 | 1582 | #: commit-graph.c:1070 |
06991777 JX |
1583 | msgid "Clearing commit marks in commit graph" |
1584 | msgstr "正在清除提交图中的提交标记" | |
4c27fcb5 | 1585 | |
a6cd2cc4 | 1586 | #: commit-graph.c:1089 |
4c27fcb5 JX |
1587 | msgid "Computing commit graph generation numbers" |
1588 | msgstr "正在计算提交图世代数字" | |
1589 | ||
a6cd2cc4 | 1590 | #: commit-graph.c:1163 |
06991777 JX |
1591 | #, c-format |
1592 | msgid "Finding commits for commit graph in %d pack" | |
1593 | msgid_plural "Finding commits for commit graph in %d packs" | |
1594 | msgstr[0] "正在 %d 个包中查找提交图的提交" | |
1595 | msgstr[1] "正在 %d 个包中查找提交图的提交" | |
4c27fcb5 | 1596 | |
a6cd2cc4 | 1597 | #: commit-graph.c:1176 |
c1ac5258 JX |
1598 | #, c-format |
1599 | msgid "error adding pack %s" | |
1600 | msgstr "添加包 %s 出错" | |
1601 | ||
a6cd2cc4 | 1602 | #: commit-graph.c:1180 |
c1ac5258 JX |
1603 | #, c-format |
1604 | msgid "error opening index for %s" | |
1605 | msgstr "为 %s 打开索引出错" | |
1606 | ||
a6cd2cc4 | 1607 | #: commit-graph.c:1204 |
06991777 JX |
1608 | #, c-format |
1609 | msgid "Finding commits for commit graph from %d ref" | |
1610 | msgid_plural "Finding commits for commit graph from %d refs" | |
1611 | msgstr[0] "正在从 %d 个引用中查找提交图的提交" | |
1612 | msgstr[1] "正在从 %d 个引用中查找提交图的提交" | |
1613 | ||
a6cd2cc4 | 1614 | #: commit-graph.c:1238 |
06991777 JX |
1615 | msgid "Finding commits for commit graph among packed objects" |
1616 | msgstr "正在打包对象中查找提交图的提交" | |
1617 | ||
a6cd2cc4 | 1618 | #: commit-graph.c:1253 |
06991777 | 1619 | msgid "Counting distinct commits in commit graph" |
8e4e0555 | 1620 | msgstr "正在计算提交图中不同的提交" |
06991777 | 1621 | |
a6cd2cc4 | 1622 | #: commit-graph.c:1284 |
06991777 | 1623 | msgid "Finding extra edges in commit graph" |
8e4e0555 | 1624 | msgstr "正在查找提交图中额外的边" |
06991777 | 1625 | |
a6cd2cc4 JX |
1626 | #: commit-graph.c:1332 |
1627 | msgid "failed to write correct number of base graph ids" | |
1628 | msgstr "无法写入正确数量的基础图形 ID" | |
fd8cb379 | 1629 | |
a6cd2cc4 | 1630 | #: commit-graph.c:1365 midx.c:811 |
fd8cb379 | 1631 | #, c-format |
c1ac5258 JX |
1632 | msgid "unable to create leading directories of %s" |
1633 | msgstr "不能为 %s 创建先导目录" | |
1634 | ||
a6cd2cc4 JX |
1635 | #: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 |
1636 | #, c-format | |
1637 | msgid "unable to create '%s'" | |
1638 | msgstr "不能创建 '%s'" | |
1639 | ||
1640 | #: commit-graph.c:1437 | |
06991777 JX |
1641 | #, c-format |
1642 | msgid "Writing out commit graph in %d pass" | |
1643 | msgid_plural "Writing out commit graph in %d passes" | |
8e4e0555 FZ |
1644 | msgstr[0] "正在用 %d 步写出提交图" |
1645 | msgstr[1] "正在用 %d 步写出提交图" | |
06991777 | 1646 | |
a6cd2cc4 JX |
1647 | #: commit-graph.c:1478 |
1648 | msgid "unable to open commit-graph chain file" | |
1649 | msgstr "无法打开提交图形链文件" | |
1650 | ||
1651 | #: commit-graph.c:1490 | |
1652 | msgid "failed to rename base commit-graph file" | |
1653 | msgstr "无法重命名基础提交图形文件" | |
1654 | ||
1655 | #: commit-graph.c:1510 | |
1656 | msgid "failed to rename temporary commit-graph file" | |
1657 | msgstr "无法重命名临时提交图形文件" | |
1658 | ||
1659 | #: commit-graph.c:1621 | |
1660 | msgid "Scanning merged commits" | |
1661 | msgstr "正在扫描合并提交" | |
1662 | ||
1663 | #: commit-graph.c:1632 | |
1664 | #, c-format | |
1665 | msgid "unexpected duplicate commit id %s" | |
1666 | msgstr "意外的重复提交 ID %s" | |
1667 | ||
1668 | #: commit-graph.c:1657 | |
1669 | msgid "Merging commit-graph" | |
1670 | msgstr "正在合并提交图形" | |
1671 | ||
1672 | #: commit-graph.c:1844 | |
1673 | #, c-format | |
1674 | msgid "the commit graph format cannot write %d commits" | |
1675 | msgstr "提交图格式不能写入 %d 个提交" | |
1676 | ||
1677 | #: commit-graph.c:1855 | |
1678 | msgid "too many commits to write graph" | |
1679 | msgstr "提交太多不能画图" | |
1680 | ||
1681 | #: commit-graph.c:1945 | |
c1ac5258 | 1682 | msgid "the commit-graph file has incorrect checksum and is likely corrupt" |
4c27fcb5 JX |
1683 | msgstr "提交图文件的校验码错误,可能已经损坏" |
1684 | ||
a6cd2cc4 | 1685 | #: commit-graph.c:1955 |
d46c5519 JX |
1686 | #, c-format |
1687 | msgid "commit-graph has incorrect OID order: %s then %s" | |
5b533632 | 1688 | msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" |
d46c5519 | 1689 | |
a6cd2cc4 | 1690 | #: commit-graph.c:1965 commit-graph.c:1980 |
d46c5519 JX |
1691 | #, c-format |
1692 | msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" | |
1693 | msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" | |
1694 | ||
a6cd2cc4 | 1695 | #: commit-graph.c:1972 |
d46c5519 JX |
1696 | #, c-format |
1697 | msgid "failed to parse commit %s from commit-graph" | |
1698 | msgstr "无法从提交图形中解析提交 %s" | |
1699 | ||
a6cd2cc4 | 1700 | #: commit-graph.c:1989 |
4c27fcb5 | 1701 | msgid "Verifying commits in commit graph" |
8e4e0555 | 1702 | msgstr "正在校验提交图中的提交" |
fd8cb379 | 1703 | |
a6cd2cc4 | 1704 | #: commit-graph.c:2002 |
d46c5519 JX |
1705 | #, c-format |
1706 | msgid "failed to parse commit %s from object database for commit-graph" | |
1707 | msgstr "无法从提交图形的对象库中解析提交 %s" | |
1708 | ||
a6cd2cc4 | 1709 | #: commit-graph.c:2009 |
d46c5519 JX |
1710 | #, c-format |
1711 | msgid "root tree OID for commit %s in commit-graph is %s != %s" | |
5b533632 | 1712 | msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" |
d46c5519 | 1713 | |
a6cd2cc4 | 1714 | #: commit-graph.c:2019 |
d46c5519 JX |
1715 | #, c-format |
1716 | msgid "commit-graph parent list for commit %s is too long" | |
1717 | msgstr "提交 %s 的提交图形父提交列表太长了" | |
1718 | ||
a6cd2cc4 | 1719 | #: commit-graph.c:2028 |
d46c5519 JX |
1720 | #, c-format |
1721 | msgid "commit-graph parent for %s is %s != %s" | |
1722 | msgstr "%s 的提交图形父提交是 %s != %s" | |
1723 | ||
a6cd2cc4 | 1724 | #: commit-graph.c:2041 |
d46c5519 JX |
1725 | #, c-format |
1726 | msgid "commit-graph parent list for commit %s terminates early" | |
1727 | msgstr "提交 %s 的提交图形父提交列表过早终止" | |
1728 | ||
a6cd2cc4 | 1729 | #: commit-graph.c:2046 |
d46c5519 JX |
1730 | #, c-format |
1731 | msgid "" | |
1732 | "commit-graph has generation number zero for commit %s, but non-zero elsewhere" | |
1733 | msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" | |
1734 | ||
a6cd2cc4 | 1735 | #: commit-graph.c:2050 |
d46c5519 JX |
1736 | #, c-format |
1737 | msgid "" | |
1738 | "commit-graph has non-zero generation number for commit %s, but zero elsewhere" | |
1739 | msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" | |
1740 | ||
a6cd2cc4 | 1741 | #: commit-graph.c:2065 |
d46c5519 JX |
1742 | #, c-format |
1743 | msgid "commit-graph generation for commit %s is %u != %u" | |
1744 | msgstr "提交图形中的提交 %s 的世代号是 %u != %u" | |
1745 | ||
a6cd2cc4 | 1746 | #: commit-graph.c:2071 |
d46c5519 JX |
1747 | #, c-format |
1748 | msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" | |
1749 | msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" | |
1750 | ||
06991777 | 1751 | #: compat/obstack.c:406 compat/obstack.c:408 |
a0b6b246 JX |
1752 | msgid "memory exhausted" |
1753 | msgstr "内存耗尽" | |
90314792 | 1754 | |
a6cd2cc4 | 1755 | #: config.c:124 |
c1ac5258 JX |
1756 | #, c-format |
1757 | msgid "" | |
1758 | "exceeded maximum include depth (%d) while including\n" | |
1759 | "\t%s\n" | |
1760 | "from\n" | |
1761 | "\t%s\n" | |
1762 | "This might be due to circular includes." | |
1763 | msgstr "" | |
e640d114 | 1764 | "超过了最大包含深度(%1$d),当从\n" |
c1ac5258 JX |
1765 | "\t%3$s\n" |
1766 | "包含\n" | |
1767 | "\t%2$s\n" | |
e640d114 | 1768 | "这可能是因为循环包含。" |
c1ac5258 | 1769 | |
a6cd2cc4 | 1770 | #: config.c:140 |
c1ac5258 JX |
1771 | #, c-format |
1772 | msgid "could not expand include path '%s'" | |
1773 | msgstr "无法扩展包含路径 '%s'" | |
1774 | ||
a6cd2cc4 | 1775 | #: config.c:151 |
c1ac5258 JX |
1776 | msgid "relative config includes must come from files" |
1777 | msgstr "相对路径的配置文件引用必须来自于文件" | |
1778 | ||
a6cd2cc4 | 1779 | #: config.c:197 |
87cb7997 | 1780 | msgid "relative config include conditionals must come from files" |
c1ac5258 JX |
1781 | msgstr "相对路径的配置文件条件引用必须来自于文件" |
1782 | ||
a6cd2cc4 | 1783 | #: config.c:376 |
c1ac5258 JX |
1784 | #, c-format |
1785 | msgid "key does not contain a section: %s" | |
1786 | msgstr "键名没有包含一个小节名称:%s" | |
87cb7997 | 1787 | |
a6cd2cc4 | 1788 | #: config.c:382 |
c1ac5258 JX |
1789 | #, c-format |
1790 | msgid "key does not contain variable name: %s" | |
1791 | msgstr "键名没有包含变量名:%s" | |
1792 | ||
a6cd2cc4 | 1793 | #: config.c:406 sequencer.c:2463 |
c1ac5258 JX |
1794 | #, c-format |
1795 | msgid "invalid key: %s" | |
1796 | msgstr "无效键名:%s" | |
1797 | ||
a6cd2cc4 | 1798 | #: config.c:412 |
c1ac5258 JX |
1799 | #, c-format |
1800 | msgid "invalid key (newline): %s" | |
1801 | msgstr "无效键名(有换行符):%s" | |
1802 | ||
a6cd2cc4 | 1803 | #: config.c:448 config.c:460 |
c1ac5258 JX |
1804 | #, c-format |
1805 | msgid "bogus config parameter: %s" | |
1806 | msgstr "伪配置参数:%s" | |
1807 | ||
a6cd2cc4 | 1808 | #: config.c:495 |
c1ac5258 JX |
1809 | #, c-format |
1810 | msgid "bogus format in %s" | |
1811 | msgstr "%s 中格式错误" | |
1812 | ||
a6cd2cc4 | 1813 | #: config.c:821 |
90314792 | 1814 | #, c-format |
a0b6b246 JX |
1815 | msgid "bad config line %d in blob %s" |
1816 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1817 | |
a6cd2cc4 | 1818 | #: config.c:825 |
a77c07d9 | 1819 | #, c-format |
a0b6b246 JX |
1820 | msgid "bad config line %d in file %s" |
1821 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1822 | |
a6cd2cc4 | 1823 | #: config.c:829 |
a77c07d9 | 1824 | #, c-format |
a0b6b246 JX |
1825 | msgid "bad config line %d in standard input" |
1826 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1827 | |
a6cd2cc4 | 1828 | #: config.c:833 |
90314792 | 1829 | #, c-format |
a0b6b246 JX |
1830 | msgid "bad config line %d in submodule-blob %s" |
1831 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1832 | |
a6cd2cc4 | 1833 | #: config.c:837 |
90314792 | 1834 | #, c-format |
a0b6b246 JX |
1835 | msgid "bad config line %d in command line %s" |
1836 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1837 | |
a6cd2cc4 | 1838 | #: config.c:841 |
90314792 | 1839 | #, c-format |
a0b6b246 JX |
1840 | msgid "bad config line %d in %s" |
1841 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1842 | |
a6cd2cc4 | 1843 | #: config.c:978 |
a0b6b246 JX |
1844 | msgid "out of range" |
1845 | msgstr "超出范围" | |
6c94aba5 | 1846 | |
a6cd2cc4 | 1847 | #: config.c:978 |
a0b6b246 JX |
1848 | msgid "invalid unit" |
1849 | msgstr "无效的单位" | |
6c94aba5 | 1850 | |
a6cd2cc4 | 1851 | #: config.c:979 |
6c94aba5 | 1852 | #, c-format |
a0b6b246 JX |
1853 | msgid "bad numeric config value '%s' for '%s': %s" |
1854 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1855 | |
a6cd2cc4 | 1856 | #: config.c:998 |
1b7f4a34 | 1857 | #, c-format |
a0b6b246 JX |
1858 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1859 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1860 | |
a6cd2cc4 | 1861 | #: config.c:1001 |
1b7f4a34 | 1862 | #, c-format |
a0b6b246 JX |
1863 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1864 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1865 | |
a6cd2cc4 | 1866 | #: config.c:1004 |
1b7f4a34 | 1867 | #, c-format |
a0b6b246 JX |
1868 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1869 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1870 | |
a6cd2cc4 | 1871 | #: config.c:1007 |
1b7f4a34 | 1872 | #, c-format |
a0b6b246 JX |
1873 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1874 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1875 | |
a6cd2cc4 | 1876 | #: config.c:1010 |
94550ed3 | 1877 | #, c-format |
a0b6b246 JX |
1878 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1879 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1880 | |
a6cd2cc4 | 1881 | #: config.c:1013 |
276ceeaa | 1882 | #, c-format |
a0b6b246 JX |
1883 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1884 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1885 | |
a6cd2cc4 | 1886 | #: config.c:1108 |
276ceeaa | 1887 | #, c-format |
a0b6b246 | 1888 | msgid "failed to expand user dir in: '%s'" |
c1ac5258 | 1889 | msgstr "无法扩展用户目录:'%s'" |
94550ed3 | 1890 | |
a6cd2cc4 | 1891 | #: config.c:1117 |
5809aa05 JX |
1892 | #, c-format |
1893 | msgid "'%s' for '%s' is not a valid timestamp" | |
1894 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
1895 | ||
a6cd2cc4 | 1896 | #: config.c:1208 |
c1ac5258 JX |
1897 | #, c-format |
1898 | msgid "abbrev length out of range: %d" | |
1899 | msgstr "缩写长度超出范围:%d" | |
1900 | ||
a6cd2cc4 | 1901 | #: config.c:1222 config.c:1233 |
3495628d | 1902 | #, c-format |
a0b6b246 JX |
1903 | msgid "bad zlib compression level %d" |
1904 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1905 | |
a6cd2cc4 | 1906 | #: config.c:1325 |
c1ac5258 JX |
1907 | msgid "core.commentChar should only be one character" |
1908 | msgstr "core.commentChar 应该是一个字符" | |
1909 | ||
a6cd2cc4 | 1910 | #: config.c:1358 |
3495628d | 1911 | #, c-format |
a0b6b246 JX |
1912 | msgid "invalid mode for object creation: %s" |
1913 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1914 | |
a6cd2cc4 | 1915 | #: config.c:1430 |
c1ac5258 JX |
1916 | #, c-format |
1917 | msgid "malformed value for %s" | |
1918 | msgstr "%s 的取值格式错误" | |
1919 | ||
a6cd2cc4 | 1920 | #: config.c:1456 |
c1ac5258 JX |
1921 | #, c-format |
1922 | msgid "malformed value for %s: %s" | |
1923 | msgstr "%s 的取值格式错误:%s" | |
1924 | ||
a6cd2cc4 | 1925 | #: config.c:1457 |
c1ac5258 JX |
1926 | msgid "must be one of nothing, matching, simple, upstream or current" |
1927 | msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" | |
1928 | ||
a6cd2cc4 | 1929 | #: config.c:1518 builtin/pack-objects.c:3410 |
1a79b2f1 JX |
1930 | #, c-format |
1931 | msgid "bad pack compression level %d" | |
1932 | msgstr "错误的打包压缩级别 %d" | |
1933 | ||
a6cd2cc4 | 1934 | #: config.c:1639 |
c1ac5258 JX |
1935 | #, c-format |
1936 | msgid "unable to load config blob object '%s'" | |
1937 | msgstr "无法从数据对象 '%s' 加载配置" | |
1938 | ||
a6cd2cc4 | 1939 | #: config.c:1642 |
c1ac5258 JX |
1940 | #, c-format |
1941 | msgid "reference '%s' does not point to a blob" | |
1942 | msgstr "引用 '%s' 没有指向一个数据对象" | |
1943 | ||
a6cd2cc4 | 1944 | #: config.c:1659 |
c1ac5258 JX |
1945 | #, c-format |
1946 | msgid "unable to resolve config blob '%s'" | |
1947 | msgstr "不能解析配置对象 '%s'" | |
1948 | ||
a6cd2cc4 | 1949 | #: config.c:1689 |
c1ac5258 JX |
1950 | #, c-format |
1951 | msgid "failed to parse %s" | |
1952 | msgstr "解析 %s 失败" | |
1953 | ||
a6cd2cc4 | 1954 | #: config.c:1745 |
a0b6b246 JX |
1955 | msgid "unable to parse command-line config" |
1956 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1957 | |
a6cd2cc4 | 1958 | #: config.c:2094 |
a0b6b246 JX |
1959 | msgid "unknown error occurred while reading the configuration files" |
1960 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1961 | |
a6cd2cc4 | 1962 | #: config.c:2264 |
87cb7997 JX |
1963 | #, c-format |
1964 | msgid "Invalid %s: '%s'" | |
1965 | msgstr "无效 %s:'%s'" | |
1966 | ||
a6cd2cc4 | 1967 | #: config.c:2307 |
87cb7997 JX |
1968 | #, c-format |
1969 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1970 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1971 | ||
a6cd2cc4 | 1972 | #: config.c:2333 |
87cb7997 JX |
1973 | #, c-format |
1974 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1975 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1976 | ||
a6cd2cc4 | 1977 | #: config.c:2379 |
276ceeaa | 1978 | #, c-format |
a0b6b246 JX |
1979 | msgid "unable to parse '%s' from command-line config" |
1980 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1981 | |
a6cd2cc4 | 1982 | #: config.c:2381 |
94550ed3 | 1983 | #, c-format |
a0b6b246 JX |
1984 | msgid "bad config variable '%s' in file '%s' at line %d" |
1985 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1986 | |
a6cd2cc4 | 1987 | #: config.c:2462 |
c1ac5258 JX |
1988 | #, c-format |
1989 | msgid "invalid section name '%s'" | |
1990 | msgstr "无效的小节名称 '%s'" | |
1991 | ||
a6cd2cc4 | 1992 | #: config.c:2494 |
276ceeaa | 1993 | #, c-format |
a0b6b246 JX |
1994 | msgid "%s has multiple values" |
1995 | msgstr "%s 有多个取值" | |
276ceeaa | 1996 | |
a6cd2cc4 | 1997 | #: config.c:2523 |
c1ac5258 JX |
1998 | #, c-format |
1999 | msgid "failed to write new configuration file %s" | |
2000 | msgstr "写入新的配置文件 %s 失败" | |
2001 | ||
a6cd2cc4 | 2002 | #: config.c:2775 config.c:3099 |
c1ac5258 JX |
2003 | #, c-format |
2004 | msgid "could not lock config file %s" | |
2005 | msgstr "不能锁定配置文件 %s" | |
2006 | ||
a6cd2cc4 | 2007 | #: config.c:2786 |
c1ac5258 JX |
2008 | #, c-format |
2009 | msgid "opening %s" | |
2010 | msgstr "打开 %s" | |
2011 | ||
a6cd2cc4 | 2012 | #: config.c:2821 builtin/config.c:328 |
c1ac5258 JX |
2013 | #, c-format |
2014 | msgid "invalid pattern: %s" | |
2015 | msgstr "无效模式:%s" | |
2016 | ||
a6cd2cc4 | 2017 | #: config.c:2846 |
c1ac5258 JX |
2018 | #, c-format |
2019 | msgid "invalid config file %s" | |
2020 | msgstr "无效的配置文件 %s" | |
2021 | ||
a6cd2cc4 | 2022 | #: config.c:2859 config.c:3112 |
1a79b2f1 JX |
2023 | #, c-format |
2024 | msgid "fstat on %s failed" | |
65e2041e | 2025 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 2026 | |
a6cd2cc4 | 2027 | #: config.c:2870 |
c1ac5258 JX |
2028 | #, c-format |
2029 | msgid "unable to mmap '%s'" | |
2030 | msgstr "不能 mmap '%s'" | |
2031 | ||
a6cd2cc4 | 2032 | #: config.c:2879 config.c:3117 |
c1ac5258 JX |
2033 | #, c-format |
2034 | msgid "chmod on %s failed" | |
2035 | msgstr "对 %s 调用 chmod 失败" | |
2036 | ||
a6cd2cc4 | 2037 | #: config.c:2964 config.c:3214 |
c1ac5258 JX |
2038 | #, c-format |
2039 | msgid "could not write config file %s" | |
2040 | msgstr "不能写入配置文件 %s" | |
2041 | ||
a6cd2cc4 | 2042 | #: config.c:2998 |
94550ed3 | 2043 | #, c-format |
a0b6b246 JX |
2044 | msgid "could not set '%s' to '%s'" |
2045 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 2046 | |
a6cd2cc4 | 2047 | #: config.c:3000 builtin/remote.c:782 |
276ceeaa | 2048 | #, c-format |
a0b6b246 JX |
2049 | msgid "could not unset '%s'" |
2050 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 2051 | |
a6cd2cc4 | 2052 | #: config.c:3090 |
c1ac5258 JX |
2053 | #, c-format |
2054 | msgid "invalid section name: %s" | |
2055 | msgstr "无效的小节名称:%s" | |
2056 | ||
a6cd2cc4 | 2057 | #: config.c:3257 |
c1ac5258 JX |
2058 | #, c-format |
2059 | msgid "missing value for '%s'" | |
2060 | msgstr "%s 的取值缺失" | |
2061 | ||
fd8cb379 | 2062 | #: connect.c:61 |
c1ac5258 JX |
2063 | msgid "the remote end hung up upon initial contact" |
2064 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 2065 | |
fd8cb379 | 2066 | #: connect.c:63 |
a0b6b246 JX |
2067 | msgid "" |
2068 | "Could not read from remote repository.\n" | |
2069 | "\n" | |
2070 | "Please make sure you have the correct access rights\n" | |
2071 | "and the repository exists." | |
2072 | msgstr "" | |
2073 | "无法读取远程仓库。\n" | |
2074 | "\n" | |
2075 | "请确认您有正确的访问权限并且仓库存在。" | |
2076 | ||
c1ac5258 JX |
2077 | #: connect.c:81 |
2078 | #, c-format | |
2079 | msgid "server doesn't support '%s'" | |
2080 | msgstr "服务器不支持 '%s'" | |
2081 | ||
2082 | #: connect.c:103 | |
2083 | #, c-format | |
2084 | msgid "server doesn't support feature '%s'" | |
2085 | msgstr "服务器不支持特性 '%s'" | |
2086 | ||
2087 | #: connect.c:114 | |
2088 | msgid "expected flush after capabilities" | |
2089 | msgstr "在能力之后应为一个 flush 包" | |
2090 | ||
2091 | #: connect.c:233 | |
2092 | #, c-format | |
2093 | msgid "ignoring capabilities after first line '%s'" | |
e640d114 | 2094 | msgstr "忽略第一行 '%s' 之后的能力字段" |
c1ac5258 JX |
2095 | |
2096 | #: connect.c:252 | |
2097 | msgid "protocol error: unexpected capabilities^{}" | |
2098 | msgstr "协议错误:意外的 capabilities^{}" | |
2099 | ||
2100 | #: connect.c:273 | |
2101 | #, c-format | |
2102 | msgid "protocol error: expected shallow sha-1, got '%s'" | |
2103 | msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" | |
2104 | ||
2105 | #: connect.c:275 | |
2106 | msgid "repository on the other end cannot be shallow" | |
2107 | msgstr "另一端的仓库不能是浅克隆仓库" | |
2108 | ||
06991777 | 2109 | #: connect.c:313 |
c1ac5258 JX |
2110 | msgid "invalid packet" |
2111 | msgstr "无效数据包" | |
2112 | ||
06991777 | 2113 | #: connect.c:333 |
c1ac5258 JX |
2114 | #, c-format |
2115 | msgid "protocol error: unexpected '%s'" | |
2116 | msgstr "协议错误:意外的 '%s'" | |
2117 | ||
06991777 | 2118 | #: connect.c:441 |
c1ac5258 JX |
2119 | #, c-format |
2120 | msgid "invalid ls-refs response: %s" | |
2121 | msgstr "无效的 ls-refs 响应:%s" | |
2122 | ||
06991777 | 2123 | #: connect.c:445 |
c1ac5258 JX |
2124 | msgid "expected flush after ref listing" |
2125 | msgstr "在引用列表之后应该有一个 flush 包" | |
2126 | ||
06991777 | 2127 | #: connect.c:544 |
c1ac5258 JX |
2128 | #, c-format |
2129 | msgid "protocol '%s' is not supported" | |
2130 | msgstr "不支持 '%s' 协议" | |
2131 | ||
06991777 | 2132 | #: connect.c:595 |
c1ac5258 JX |
2133 | msgid "unable to set SO_KEEPALIVE on socket" |
2134 | msgstr "无法为 socket 设置 SO_KEEPALIVE" | |
2135 | ||
06991777 | 2136 | #: connect.c:635 connect.c:698 |
c1ac5258 JX |
2137 | #, c-format |
2138 | msgid "Looking up %s ... " | |
2139 | msgstr "查找 %s ..." | |
2140 | ||
06991777 | 2141 | #: connect.c:639 |
c1ac5258 JX |
2142 | #, c-format |
2143 | msgid "unable to look up %s (port %s) (%s)" | |
2144 | msgstr "无法查找 %s(端口 %s)(%s)" | |
2145 | ||
2146 | #. TRANSLATORS: this is the end of "Looking up %s ... " | |
06991777 | 2147 | #: connect.c:643 connect.c:714 |
c1ac5258 JX |
2148 | #, c-format |
2149 | msgid "" | |
2150 | "done.\n" | |
2151 | "Connecting to %s (port %s) ... " | |
2152 | msgstr "" | |
2153 | "完成。\n" | |
2154 | "连接到 %s(端口 %s)... " | |
2155 | ||
06991777 | 2156 | #: connect.c:665 connect.c:742 |
c1ac5258 JX |
2157 | #, c-format |
2158 | msgid "" | |
2159 | "unable to connect to %s:\n" | |
2160 | "%s" | |
2161 | msgstr "" | |
2162 | "无法连接到 %s:\n" | |
2163 | "%s" | |
2164 | ||
2165 | #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " | |
06991777 | 2166 | #: connect.c:671 connect.c:748 |
c1ac5258 JX |
2167 | msgid "done." |
2168 | msgstr "完成。" | |
2169 | ||
06991777 | 2170 | #: connect.c:702 |
c1ac5258 JX |
2171 | #, c-format |
2172 | msgid "unable to look up %s (%s)" | |
2173 | msgstr "无法查找 %s(%s)" | |
2174 | ||
06991777 | 2175 | #: connect.c:708 |
c1ac5258 JX |
2176 | #, c-format |
2177 | msgid "unknown port %s" | |
2178 | msgstr "未知端口 %s" | |
2179 | ||
06991777 | 2180 | #: connect.c:845 connect.c:1171 |
c1ac5258 JX |
2181 | #, c-format |
2182 | msgid "strange hostname '%s' blocked" | |
2183 | msgstr "已阻止奇怪的主机名 '%s'" | |
2184 | ||
06991777 | 2185 | #: connect.c:847 |
c1ac5258 JX |
2186 | #, c-format |
2187 | msgid "strange port '%s' blocked" | |
2188 | msgstr "已阻止奇怪的端口号 '%s'" | |
2189 | ||
06991777 | 2190 | #: connect.c:857 |
c1ac5258 JX |
2191 | #, c-format |
2192 | msgid "cannot start proxy %s" | |
2193 | msgstr "不能启动代理 %s" | |
2194 | ||
06991777 | 2195 | #: connect.c:924 |
c1ac5258 JX |
2196 | msgid "no path specified; see 'git help pull' for valid url syntax" |
2197 | msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" | |
2198 | ||
06991777 | 2199 | #: connect.c:1119 |
c1ac5258 JX |
2200 | msgid "ssh variant 'simple' does not support -4" |
2201 | msgstr "ssh 变体 'simple' 不支持 -4" | |
2202 | ||
06991777 | 2203 | #: connect.c:1131 |
c1ac5258 JX |
2204 | msgid "ssh variant 'simple' does not support -6" |
2205 | msgstr "ssh 变体 'simple' 不支持 -6" | |
2206 | ||
06991777 | 2207 | #: connect.c:1148 |
c1ac5258 | 2208 | msgid "ssh variant 'simple' does not support setting port" |
e640d114 | 2209 | msgstr "ssh 变体 'simple' 不支持设置端口" |
c1ac5258 | 2210 | |
d46c5519 | 2211 | #: connect.c:1260 |
c1ac5258 JX |
2212 | #, c-format |
2213 | msgid "strange pathname '%s' blocked" | |
2214 | msgstr "已阻止奇怪的路径名 '%s'" | |
2215 | ||
d46c5519 | 2216 | #: connect.c:1307 |
c1ac5258 JX |
2217 | msgid "unable to fork" |
2218 | msgstr "无法 fork" | |
2219 | ||
a6cd2cc4 | 2220 | #: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 |
a0b6b246 | 2221 | msgid "Checking connectivity" |
06991777 | 2222 | msgstr "正在检查连通性" |
a0b6b246 | 2223 | |
a6cd2cc4 | 2224 | #: connected.c:98 |
a0b6b246 JX |
2225 | msgid "Could not run 'git rev-list'" |
2226 | msgstr "不能执行 'git rev-list'" | |
2227 | ||
a6cd2cc4 | 2228 | #: connected.c:118 |
a0b6b246 | 2229 | msgid "failed write to rev-list" |
c1ac5258 | 2230 | msgstr "写入 rev-list 失败" |
a0b6b246 | 2231 | |
a6cd2cc4 | 2232 | #: connected.c:125 |
a0b6b246 | 2233 | msgid "failed to close rev-list's stdin" |
c1ac5258 JX |
2234 | msgstr "关闭 rev-list 的标准输入失败" |
2235 | ||
06991777 | 2236 | #: convert.c:193 |
c1ac5258 JX |
2237 | #, c-format |
2238 | msgid "illegal crlf_action %d" | |
2239 | msgstr "非法的 crlf 动作 %d" | |
a0b6b246 | 2240 | |
06991777 | 2241 | #: convert.c:206 |
3495628d | 2242 | #, c-format |
c1ac5258 JX |
2243 | msgid "CRLF would be replaced by LF in %s" |
2244 | msgstr "%s 中的 CRLF 将被 LF 替换" | |
31e5e17b | 2245 | |
06991777 | 2246 | #: convert.c:208 |
31e5e17b | 2247 | #, c-format |
a0b6b246 JX |
2248 | msgid "" |
2249 | "CRLF will be replaced by LF in %s.\n" | |
c1ac5258 | 2250 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2251 | msgstr "" |
c1ac5258 | 2252 | "%s 中的 CRLF 将被 LF 替换。<\n" |
a0b6b246 | 2253 | "在工作区中该文件仍保持原有的换行符。" |
3495628d | 2254 | |
06991777 | 2255 | #: convert.c:216 |
3495628d | 2256 | #, c-format |
31e5e17b JX |
2257 | msgid "LF would be replaced by CRLF in %s" |
2258 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 2259 | |
06991777 | 2260 | #: convert.c:218 |
276ceeaa | 2261 | #, c-format |
a0b6b246 JX |
2262 | msgid "" |
2263 | "LF will be replaced by CRLF in %s.\n" | |
c1ac5258 | 2264 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2265 | msgstr "" |
c1ac5258 JX |
2266 | "%s 中的 LF 将被 CRLF 替换。\n" |
2267 | "在工作区中该文件仍保持原有的换行符" | |
276ceeaa | 2268 | |
06991777 | 2269 | #: convert.c:279 |
fd8cb379 JX |
2270 | #, c-format |
2271 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
2272 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
2273 | ||
06991777 | 2274 | #: convert.c:286 |
fd8cb379 JX |
2275 | #, c-format |
2276 | msgid "" | |
2277 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" | |
2278 | "tree-encoding." | |
2279 | msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。" | |
2280 | ||
06991777 | 2281 | #: convert.c:304 |
fd8cb379 JX |
2282 | #, c-format |
2283 | msgid "BOM is required in '%s' if encoded as %s" | |
2284 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
2285 | ||
06991777 | 2286 | #: convert.c:306 |
fd8cb379 JX |
2287 | #, c-format |
2288 | msgid "" | |
2289 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
2290 | "%sLE (depending on the byte order) as working-tree-encoding." | |
2291 | msgstr "" | |
2292 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
2293 | "节序)作为工作区编码。" | |
2294 | ||
06991777 | 2295 | #: convert.c:424 convert.c:495 |
fd8cb379 JX |
2296 | #, c-format |
2297 | msgid "failed to encode '%s' from %s to %s" | |
2298 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
2299 | ||
06991777 | 2300 | #: convert.c:467 |
fd8cb379 JX |
2301 | #, c-format |
2302 | msgid "encoding '%s' from %s to %s and back is not the same" | |
2303 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
2304 | ||
06991777 | 2305 | #: convert.c:673 |
c1ac5258 JX |
2306 | #, c-format |
2307 | msgid "cannot fork to run external filter '%s'" | |
e640d114 | 2308 | msgstr "不能 fork 以执行外部过滤器 '%s'" |
c1ac5258 | 2309 | |
06991777 | 2310 | #: convert.c:693 |
c1ac5258 JX |
2311 | #, c-format |
2312 | msgid "cannot feed the input to external filter '%s'" | |
e640d114 | 2313 | msgstr "不能将输入传递给外部过滤器 '%s'" |
c1ac5258 | 2314 | |
06991777 | 2315 | #: convert.c:700 |
c1ac5258 JX |
2316 | #, c-format |
2317 | msgid "external filter '%s' failed %d" | |
e640d114 | 2318 | msgstr "外部过滤器 '%s' 失败码 %d" |
c1ac5258 | 2319 | |
06991777 | 2320 | #: convert.c:735 convert.c:738 |
c1ac5258 JX |
2321 | #, c-format |
2322 | msgid "read from external filter '%s' failed" | |
2323 | msgstr "从外部过滤器 '%s' 读取失败" | |
2324 | ||
06991777 | 2325 | #: convert.c:741 convert.c:796 |
c1ac5258 JX |
2326 | #, c-format |
2327 | msgid "external filter '%s' failed" | |
2328 | msgstr "外部过滤器 '%s' 失败" | |
2329 | ||
2330 | #: convert.c:844 | |
2331 | msgid "unexpected filter type" | |
2332 | msgstr "意外的过滤类型" | |
2333 | ||
2334 | #: convert.c:855 | |
2335 | msgid "path name too long for external filter" | |
2336 | msgstr "外部过滤器的路径名太长" | |
2337 | ||
2338 | #: convert.c:929 | |
2339 | #, c-format | |
2340 | msgid "" | |
2341 | "external filter '%s' is not available anymore although not all paths have " | |
2342 | "been filtered" | |
2343 | msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" | |
2344 | ||
2345 | #: convert.c:1228 | |
fd8cb379 JX |
2346 | msgid "true/false are no valid working-tree-encodings" |
2347 | msgstr "true/false 不是有效的工作区编码" | |
2348 | ||
4c27fcb5 | 2349 | #: convert.c:1398 convert.c:1432 |
c1ac5258 JX |
2350 | #, c-format |
2351 | msgid "%s: clean filter '%s' failed" | |
2352 | msgstr "%s:clean 过滤器 '%s' 失败" | |
2353 | ||
4c27fcb5 | 2354 | #: convert.c:1476 |
c1ac5258 JX |
2355 | #, c-format |
2356 | msgid "%s: smudge filter %s failed" | |
2357 | msgstr "%s:smudge 过滤器 %s 失败" | |
2358 | ||
06991777 | 2359 | #: date.c:137 |
a0b6b246 JX |
2360 | msgid "in the future" |
2361 | msgstr "在将来" | |
3495628d | 2362 | |
06991777 | 2363 | #: date.c:143 |
3495628d | 2364 | #, c-format |
a4f16749 JX |
2365 | msgid "%<PRIuMAX> second ago" |
2366 | msgid_plural "%<PRIuMAX> seconds ago" | |
2367 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
2368 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 2369 | |
06991777 | 2370 | #: date.c:150 |
3495628d | 2371 | #, c-format |
a4f16749 JX |
2372 | msgid "%<PRIuMAX> minute ago" |
2373 | msgid_plural "%<PRIuMAX> minutes ago" | |
2374 | msgstr[0] "%<PRIuMAX> 分钟前" | |
2375 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 2376 | |
06991777 | 2377 | #: date.c:157 |
3495628d | 2378 | #, c-format |
a4f16749 JX |
2379 | msgid "%<PRIuMAX> hour ago" |
2380 | msgid_plural "%<PRIuMAX> hours ago" | |
2381 | msgstr[0] "%<PRIuMAX> 小时前" | |
2382 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 2383 | |
06991777 | 2384 | #: date.c:164 |
3495628d | 2385 | #, c-format |
a4f16749 JX |
2386 | msgid "%<PRIuMAX> day ago" |
2387 | msgid_plural "%<PRIuMAX> days ago" | |
2388 | msgstr[0] "%<PRIuMAX> 天前" | |
2389 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 2390 | |
06991777 | 2391 | #: date.c:170 |
94550ed3 | 2392 | #, c-format |
a4f16749 JX |
2393 | msgid "%<PRIuMAX> week ago" |
2394 | msgid_plural "%<PRIuMAX> weeks ago" | |
2395 | msgstr[0] "%<PRIuMAX> 周前" | |
2396 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 2397 | |
06991777 | 2398 | #: date.c:177 |
3495628d | 2399 | #, c-format |
a4f16749 JX |
2400 | msgid "%<PRIuMAX> month ago" |
2401 | msgid_plural "%<PRIuMAX> months ago" | |
2402 | msgstr[0] "%<PRIuMAX> 个月前" | |
2403 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 2404 | |
06991777 | 2405 | #: date.c:188 |
3495628d | 2406 | #, c-format |
a4f16749 JX |
2407 | msgid "%<PRIuMAX> year" |
2408 | msgid_plural "%<PRIuMAX> years" | |
2409 | msgstr[0] "%<PRIuMAX> 年" | |
2410 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 2411 | |
a0b6b246 | 2412 | #. TRANSLATORS: "%s" is "<n> years" |
06991777 | 2413 | #: date.c:191 |
94550ed3 | 2414 | #, c-format |
a4f16749 JX |
2415 | msgid "%s, %<PRIuMAX> month ago" |
2416 | msgid_plural "%s, %<PRIuMAX> months ago" | |
2417 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
2418 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 2419 | |
06991777 | 2420 | #: date.c:196 date.c:201 |
94550ed3 | 2421 | #, c-format |
a4f16749 JX |
2422 | msgid "%<PRIuMAX> year ago" |
2423 | msgid_plural "%<PRIuMAX> years ago" | |
2424 | msgstr[0] "%<PRIuMAX> 年前" | |
2425 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 2426 | |
06991777 | 2427 | #: delta-islands.c:272 |
4c27fcb5 JX |
2428 | msgid "Propagating island marks" |
2429 | msgstr "正在传播数据岛标记" | |
2430 | ||
06991777 | 2431 | #: delta-islands.c:290 |
4c27fcb5 JX |
2432 | #, c-format |
2433 | msgid "bad tree object %s" | |
2434 | msgstr "坏的树对象 %s" | |
2435 | ||
06991777 | 2436 | #: delta-islands.c:334 |
4c27fcb5 JX |
2437 | #, c-format |
2438 | msgid "failed to load island regex for '%s': %s" | |
2439 | msgstr "未能加载 '%s' 的数据岛正则表达式:%s" | |
2440 | ||
06991777 | 2441 | #: delta-islands.c:390 |
4c27fcb5 JX |
2442 | #, c-format |
2443 | msgid "island regex from config has too many capture groups (max=%d)" | |
2444 | msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)" | |
2445 | ||
a6cd2cc4 | 2446 | #: delta-islands.c:467 |
4c27fcb5 JX |
2447 | #, c-format |
2448 | msgid "Marked %d islands, done.\n" | |
2449 | msgstr "已标记 %d 个数据岛,结束。\n" | |
2450 | ||
a0b6b246 | 2451 | #: diffcore-order.c:24 |
cfff71a9 | 2452 | #, c-format |
a0b6b246 | 2453 | msgid "failed to read orderfile '%s'" |
c1ac5258 | 2454 | msgstr "读取排序文件 '%s' 失败" |
cfff71a9 | 2455 | |
4c27fcb5 | 2456 | #: diffcore-rename.c:544 |
a0b6b246 | 2457 | msgid "Performing inexact rename detection" |
87cb7997 | 2458 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 2459 | |
d46c5519 JX |
2460 | #: diff-no-index.c:238 |
2461 | msgid "git diff --no-index [<options>] <path> <path>" | |
2462 | msgstr "git diff --no-index [<选项>] <路径> <路径>" | |
2463 | ||
2464 | #: diff-no-index.c:263 | |
2465 | msgid "" | |
2466 | "Not a git repository. Use --no-index to compare two paths outside a working " | |
2467 | "tree" | |
2468 | msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" | |
cfff71a9 | 2469 | |
a0b6b246 | 2470 | # 译者:注意保持前导空格 |
d46c5519 | 2471 | #: diff.c:155 |
a0b6b246 JX |
2472 | #, c-format |
2473 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
2474 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 2475 | |
a0b6b246 | 2476 | # 译者:注意保持前导空格 |
d46c5519 | 2477 | #: diff.c:160 |
a0b6b246 JX |
2478 | #, c-format |
2479 | msgid " Unknown dirstat parameter '%s'\n" | |
2480 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 2481 | |
d46c5519 | 2482 | #: diff.c:296 |
6937cb4e | 2483 | msgid "" |
c1ac5258 JX |
2484 | "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " |
2485 | "'dimmed-zebra', 'plain'" | |
5809aa05 | 2486 | msgstr "" |
c1ac5258 JX |
2487 | "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " |
2488 | "'plain'" | |
2489 | ||
d46c5519 | 2490 | #: diff.c:324 |
c1ac5258 | 2491 | #, c-format |
06991777 JX |
2492 | msgid "" |
2493 | "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " | |
2494 | "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" | |
2495 | msgstr "" | |
2496 | "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-" | |
2497 | "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" | |
c1ac5258 | 2498 | |
d46c5519 | 2499 | #: diff.c:332 |
c1ac5258 | 2500 | msgid "" |
06991777 JX |
2501 | "color-moved-ws: allow-indentation-change cannot be combined with other " |
2502 | "whitespace modes" | |
c1ac5258 | 2503 | msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" |
6937cb4e | 2504 | |
d46c5519 | 2505 | #: diff.c:405 |
7aea43ff | 2506 | #, c-format |
a0b6b246 JX |
2507 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
2508 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 2509 | |
d46c5519 | 2510 | #: diff.c:465 |
7aea43ff | 2511 | #, c-format |
a0b6b246 JX |
2512 | msgid "" |
2513 | "Found errors in 'diff.dirstat' config variable:\n" | |
2514 | "%s" | |
2515 | msgstr "" | |
2516 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
2517 | "%s" | |
7aea43ff | 2518 | |
a6cd2cc4 | 2519 | #: diff.c:4215 |
7aea43ff | 2520 | #, c-format |
a0b6b246 JX |
2521 | msgid "external diff died, stopping at %s" |
2522 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 2523 | |
a6cd2cc4 | 2524 | #: diff.c:4560 |
a0b6b246 JX |
2525 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
2526 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
2527 | ||
a6cd2cc4 | 2528 | #: diff.c:4563 |
31e5e17b JX |
2529 | msgid "-G, -S and --find-object are mutually exclusive" |
2530 | msgstr "-G、-S 和 --find-object 是互斥的" | |
2531 | ||
a6cd2cc4 | 2532 | #: diff.c:4641 |
a0b6b246 JX |
2533 | msgid "--follow requires exactly one pathspec" |
2534 | msgstr "--follow 明确要求只跟一个路径规格" | |
2535 | ||
a6cd2cc4 | 2536 | #: diff.c:4689 |
d46c5519 JX |
2537 | #, c-format |
2538 | msgid "invalid --stat value: %s" | |
2539 | msgstr "无效的 --stat 值:%s" | |
2540 | ||
a6cd2cc4 | 2541 | #: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 |
d46c5519 JX |
2542 | #: parse-options.c:199 parse-options.c:203 |
2543 | #, c-format | |
2544 | msgid "%s expects a numerical value" | |
2545 | msgstr "%s 期望一个数字值" | |
2546 | ||
a6cd2cc4 | 2547 | #: diff.c:4726 |
7aea43ff | 2548 | #, c-format |
a0b6b246 JX |
2549 | msgid "" |
2550 | "Failed to parse --dirstat/-X option parameter:\n" | |
2551 | "%s" | |
2552 | msgstr "" | |
2553 | "无法解析 --dirstat/-X 选项的参数:\n" | |
2554 | "%s" | |
7aea43ff | 2555 | |
a6cd2cc4 | 2556 | #: diff.c:4811 |
d46c5519 JX |
2557 | #, c-format |
2558 | msgid "unknown change class '%c' in --diff-filter=%s" | |
2559 | msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" | |
2560 | ||
a6cd2cc4 | 2561 | #: diff.c:4835 |
d46c5519 JX |
2562 | #, c-format |
2563 | msgid "unknown value after ws-error-highlight=%.*s" | |
2564 | msgstr "ws-error-highlight=%.*s 之后未知的值" | |
2565 | ||
a6cd2cc4 | 2566 | #: diff.c:4849 |
7aea43ff | 2567 | #, c-format |
d46c5519 JX |
2568 | msgid "unable to resolve '%s'" |
2569 | msgstr "不能解析 '%s'" | |
2570 | ||
a6cd2cc4 | 2571 | #: diff.c:4899 diff.c:4905 |
d46c5519 JX |
2572 | #, c-format |
2573 | msgid "%s expects <n>/<m> form" | |
2574 | msgstr "%s 期望 <n>/<m> 格式" | |
2575 | ||
a6cd2cc4 | 2576 | #: diff.c:4917 |
d46c5519 JX |
2577 | #, c-format |
2578 | msgid "%s expects a character, got '%s'" | |
2579 | msgstr "%s 期望一个字符,得到 '%s'" | |
2580 | ||
a6cd2cc4 | 2581 | #: diff.c:4938 |
d46c5519 JX |
2582 | #, c-format |
2583 | msgid "bad --color-moved argument: %s" | |
2584 | msgstr "坏的 --color-moved 参数:%s" | |
2585 | ||
a6cd2cc4 | 2586 | #: diff.c:4957 |
d46c5519 JX |
2587 | #, c-format |
2588 | msgid "invalid mode '%s' in --color-moved-ws" | |
2589 | msgstr "--color-moved-ws 中的无效模式 '%s' " | |
2590 | ||
a6cd2cc4 | 2591 | #: diff.c:4997 |
d46c5519 JX |
2592 | msgid "" |
2593 | "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " | |
2594 | "\"histogram\"" | |
2595 | msgstr "" | |
2596 | "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" | |
2597 | ||
a6cd2cc4 | 2598 | #: diff.c:5033 diff.c:5053 |
d46c5519 JX |
2599 | #, c-format |
2600 | msgid "invalid argument to %s" | |
2601 | msgstr "%s 的参数无效" | |
2602 | ||
a6cd2cc4 | 2603 | #: diff.c:5191 |
d46c5519 JX |
2604 | #, c-format |
2605 | msgid "failed to parse --submodule option parameter: '%s'" | |
a0b6b246 | 2606 | msgstr "无法解析 --submodule 选项的参数:'%s'" |
7aea43ff | 2607 | |
a6cd2cc4 | 2608 | #: diff.c:5247 |
d46c5519 JX |
2609 | #, c-format |
2610 | msgid "bad --word-diff argument: %s" | |
2611 | msgstr "坏的 --word-diff 参数:%s" | |
2612 | ||
a6cd2cc4 | 2613 | #: diff.c:5270 |
d46c5519 JX |
2614 | msgid "Diff output format options" |
2615 | msgstr "差异输出格式化选项" | |
2616 | ||
a6cd2cc4 | 2617 | #: diff.c:5272 diff.c:5278 |
d46c5519 JX |
2618 | msgid "generate patch" |
2619 | msgstr "生成补丁" | |
2620 | ||
a6cd2cc4 | 2621 | #: diff.c:5275 builtin/log.c:172 |
d46c5519 JX |
2622 | msgid "suppress diff output" |
2623 | msgstr "不显示差异输出" | |
2624 | ||
a6cd2cc4 | 2625 | #: diff.c:5280 diff.c:5394 diff.c:5401 |
d46c5519 JX |
2626 | msgid "<n>" |
2627 | msgstr "<n>" | |
2628 | ||
a6cd2cc4 | 2629 | #: diff.c:5281 diff.c:5284 |
d46c5519 JX |
2630 | msgid "generate diffs with <n> lines context" |
2631 | msgstr "生成含 <n> 行上下文的差异" | |
2632 | ||
a6cd2cc4 | 2633 | #: diff.c:5286 |
d46c5519 JX |
2634 | msgid "generate the diff in raw format" |
2635 | msgstr "生成原始格式的差异" | |
2636 | ||
a6cd2cc4 | 2637 | #: diff.c:5289 |
d46c5519 JX |
2638 | msgid "synonym for '-p --raw'" |
2639 | msgstr "和 '-p --raw' 同义" | |
2640 | ||
a6cd2cc4 | 2641 | #: diff.c:5293 |
d46c5519 JX |
2642 | msgid "synonym for '-p --stat'" |
2643 | msgstr "和 '-p --stat' 同义" | |
2644 | ||
a6cd2cc4 | 2645 | #: diff.c:5297 |
d46c5519 JX |
2646 | msgid "machine friendly --stat" |
2647 | msgstr "机器友好的 --stat" | |
2648 | ||
a6cd2cc4 | 2649 | #: diff.c:5300 |
d46c5519 JX |
2650 | msgid "output only the last line of --stat" |
2651 | msgstr "只输出 --stat 的最后一行" | |
2652 | ||
a6cd2cc4 | 2653 | #: diff.c:5302 diff.c:5310 |
d46c5519 JX |
2654 | msgid "<param1,param2>..." |
2655 | msgstr "<参数1,参数2>..." | |
2656 | ||
a6cd2cc4 | 2657 | #: diff.c:5303 |
d46c5519 JX |
2658 | msgid "" |
2659 | "output the distribution of relative amount of changes for each sub-directory" | |
2660 | msgstr "输出每个子目录相对变更的分布" | |
2661 | ||
a6cd2cc4 | 2662 | #: diff.c:5307 |
d46c5519 JX |
2663 | msgid "synonym for --dirstat=cumulative" |
2664 | msgstr "和 --dirstat=cumulative 同义" | |
2665 | ||
a6cd2cc4 | 2666 | #: diff.c:5311 |
d46c5519 JX |
2667 | msgid "synonym for --dirstat=files,param1,param2..." |
2668 | msgstr "是 --dirstat=files,param1,param2... 的同义词" | |
2669 | ||
a6cd2cc4 | 2670 | #: diff.c:5315 |
d46c5519 JX |
2671 | msgid "warn if changes introduce conflict markers or whitespace errors" |
2672 | msgstr "如果变更中引入冲突定界符或空白错误,给出警告" | |
2673 | ||
a6cd2cc4 | 2674 | #: diff.c:5318 |
d46c5519 JX |
2675 | msgid "condensed summary such as creations, renames and mode changes" |
2676 | msgstr "精简摘要,例如创建、重命名和模式变更" | |
2677 | ||
a6cd2cc4 | 2678 | #: diff.c:5321 |
d46c5519 JX |
2679 | msgid "show only names of changed files" |
2680 | msgstr "只显示变更文件的文件名" | |
2681 | ||
a6cd2cc4 | 2682 | #: diff.c:5324 |
d46c5519 JX |
2683 | msgid "show only names and status of changed files" |
2684 | msgstr "只显示变更文件的文件名和状态" | |
2685 | ||
a6cd2cc4 | 2686 | #: diff.c:5326 |
d46c5519 JX |
2687 | msgid "<width>[,<name-width>[,<count>]]" |
2688 | msgstr "<宽度>[,<文件名宽度>[,<次数>]]" | |
2689 | ||
a6cd2cc4 | 2690 | #: diff.c:5327 |
d46c5519 | 2691 | msgid "generate diffstat" |
5b533632 | 2692 | msgstr "生成差异统计(diffstat)" |
d46c5519 | 2693 | |
a6cd2cc4 | 2694 | #: diff.c:5329 diff.c:5332 diff.c:5335 |
d46c5519 JX |
2695 | msgid "<width>" |
2696 | msgstr "<宽度>" | |
2697 | ||
a6cd2cc4 | 2698 | #: diff.c:5330 |
d46c5519 JX |
2699 | msgid "generate diffstat with a given width" |
2700 | msgstr "使用给定的长度生成差异统计" | |
2701 | ||
a6cd2cc4 | 2702 | #: diff.c:5333 |
d46c5519 JX |
2703 | msgid "generate diffstat with a given name width" |
2704 | msgstr "使用给定的文件名长度生成差异统计" | |
2705 | ||
a6cd2cc4 | 2706 | #: diff.c:5336 |
d46c5519 JX |
2707 | msgid "generate diffstat with a given graph width" |
2708 | msgstr "使用给定的图形长度生成差异统计" | |
2709 | ||
a6cd2cc4 | 2710 | #: diff.c:5338 |
d46c5519 JX |
2711 | msgid "<count>" |
2712 | msgstr "<次数>" | |
2713 | ||
a6cd2cc4 | 2714 | #: diff.c:5339 |
d46c5519 JX |
2715 | msgid "generate diffstat with limited lines" |
2716 | msgstr "生成有限行数的差异统计" | |
2717 | ||
a6cd2cc4 | 2718 | #: diff.c:5342 |
d46c5519 JX |
2719 | msgid "generate compact summary in diffstat" |
2720 | msgstr "生成差异统计的简洁摘要" | |
2721 | ||
a6cd2cc4 | 2722 | #: diff.c:5345 |
d46c5519 JX |
2723 | msgid "output a binary diff that can be applied" |
2724 | msgstr "输出一个可以应用的二进制差异" | |
2725 | ||
a6cd2cc4 | 2726 | #: diff.c:5348 |
d46c5519 JX |
2727 | msgid "show full pre- and post-image object names on the \"index\" lines" |
2728 | msgstr "在 \"index\" 行显示完整的前后对象名称" | |
2729 | ||
a6cd2cc4 | 2730 | #: diff.c:5350 |
d46c5519 JX |
2731 | msgid "show colored diff" |
2732 | msgstr "显示带颜色的差异" | |
2733 | ||
a6cd2cc4 | 2734 | #: diff.c:5351 |
d46c5519 JX |
2735 | msgid "<kind>" |
2736 | msgstr "<类型>" | |
2737 | ||
a6cd2cc4 | 2738 | #: diff.c:5352 |
d46c5519 JX |
2739 | msgid "" |
2740 | "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " | |
2741 | "diff" | |
2742 | msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符" | |
2743 | ||
a6cd2cc4 | 2744 | #: diff.c:5355 |
d46c5519 JX |
2745 | msgid "" |
2746 | "do not munge pathnames and use NULs as output field terminators in --raw or " | |
2747 | "--numstat" | |
2748 | msgstr "" | |
2749 | "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔" | |
2750 | "符" | |
2751 | ||
a6cd2cc4 | 2752 | #: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 |
d46c5519 JX |
2753 | msgid "<prefix>" |
2754 | msgstr "<前缀>" | |
2755 | ||
a6cd2cc4 | 2756 | #: diff.c:5359 |
d46c5519 JX |
2757 | msgid "show the given source prefix instead of \"a/\"" |
2758 | msgstr "显示给定的源前缀取代 \"a/\"" | |
2759 | ||
a6cd2cc4 | 2760 | #: diff.c:5362 |
d46c5519 JX |
2761 | msgid "show the given destination prefix instead of \"b/\"" |
2762 | msgstr "显示给定的目标前缀取代 \"b/\"" | |
2763 | ||
a6cd2cc4 | 2764 | #: diff.c:5365 |
d46c5519 JX |
2765 | msgid "prepend an additional prefix to every line of output" |
2766 | msgstr "输出的每一行附加前缀" | |
2767 | ||
a6cd2cc4 | 2768 | #: diff.c:5368 |
d46c5519 JX |
2769 | msgid "do not show any source or destination prefix" |
2770 | msgstr "不显示任何源和目标前缀" | |
2771 | ||
a6cd2cc4 | 2772 | #: diff.c:5371 |
d46c5519 JX |
2773 | msgid "show context between diff hunks up to the specified number of lines" |
2774 | msgstr "显示指定行数的差异块间的上下文" | |
2775 | ||
a6cd2cc4 | 2776 | #: diff.c:5375 diff.c:5380 diff.c:5385 |
d46c5519 JX |
2777 | msgid "<char>" |
2778 | msgstr "<字符>" | |
2779 | ||
a6cd2cc4 | 2780 | #: diff.c:5376 |
d46c5519 JX |
2781 | msgid "specify the character to indicate a new line instead of '+'" |
2782 | msgstr "指定一个字符取代 '+' 来表示新的一行" | |
2783 | ||
a6cd2cc4 | 2784 | #: diff.c:5381 |
d46c5519 JX |
2785 | msgid "specify the character to indicate an old line instead of '-'" |
2786 | msgstr "指定一个字符取代 '-' 来表示旧的一行" | |
2787 | ||
a6cd2cc4 | 2788 | #: diff.c:5386 |
d46c5519 JX |
2789 | msgid "specify the character to indicate a context instead of ' '" |
2790 | msgstr "指定一个字符取代 ' ' 来表示一行上下文" | |
2791 | ||
a6cd2cc4 | 2792 | #: diff.c:5389 |
d46c5519 JX |
2793 | msgid "Diff rename options" |
2794 | msgstr "差异重命名选项" | |
2795 | ||
a6cd2cc4 | 2796 | #: diff.c:5390 |
d46c5519 JX |
2797 | msgid "<n>[/<m>]" |
2798 | msgstr "<n>[/<m>]" | |
2799 | ||
a6cd2cc4 | 2800 | #: diff.c:5391 |
d46c5519 | 2801 | msgid "break complete rewrite changes into pairs of delete and create" |
5b533632 | 2802 | msgstr "将完全重写的变更打破为成对的删除和创建" |
d46c5519 | 2803 | |
a6cd2cc4 | 2804 | #: diff.c:5395 |
d46c5519 JX |
2805 | msgid "detect renames" |
2806 | msgstr "检测重命名" | |
2807 | ||
a6cd2cc4 | 2808 | #: diff.c:5399 |
d46c5519 JX |
2809 | msgid "omit the preimage for deletes" |
2810 | msgstr "省略删除操作的差异输出" | |
2811 | ||
a6cd2cc4 | 2812 | #: diff.c:5402 |
d46c5519 JX |
2813 | msgid "detect copies" |
2814 | msgstr "检测拷贝" | |
2815 | ||
a6cd2cc4 | 2816 | #: diff.c:5406 |
d46c5519 JX |
2817 | msgid "use unmodified files as source to find copies" |
2818 | msgstr "使用未修改的文件做为发现拷贝的源" | |
2819 | ||
a6cd2cc4 | 2820 | #: diff.c:5408 |
d46c5519 JX |
2821 | msgid "disable rename detection" |
2822 | msgstr "禁用重命名探测" | |
2823 | ||
a6cd2cc4 | 2824 | #: diff.c:5411 |
d46c5519 JX |
2825 | msgid "use empty blobs as rename source" |
2826 | msgstr "使用空的数据对象做为重命名的源" | |
2827 | ||
a6cd2cc4 | 2828 | #: diff.c:5413 |
d46c5519 JX |
2829 | msgid "continue listing the history of a file beyond renames" |
2830 | msgstr "继续列出文件重命名以外的历史记录" | |
2831 | ||
a6cd2cc4 | 2832 | #: diff.c:5416 |
d46c5519 JX |
2833 | msgid "" |
2834 | "prevent rename/copy detection if the number of rename/copy targets exceeds " | |
2835 | "given limit" | |
2836 | msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测" | |
2837 | ||
a6cd2cc4 | 2838 | #: diff.c:5418 |
d46c5519 JX |
2839 | msgid "Diff algorithm options" |
2840 | msgstr "差异算法选项" | |
2841 | ||
a6cd2cc4 | 2842 | #: diff.c:5420 |
d46c5519 JX |
2843 | msgid "produce the smallest possible diff" |
2844 | msgstr "生成尽可能小的差异" | |
2845 | ||
a6cd2cc4 | 2846 | #: diff.c:5423 |
d46c5519 JX |
2847 | msgid "ignore whitespace when comparing lines" |
2848 | msgstr "行比较时忽略空白字符" | |
2849 | ||
a6cd2cc4 | 2850 | #: diff.c:5426 |
d46c5519 JX |
2851 | msgid "ignore changes in amount of whitespace" |
2852 | msgstr "忽略空白字符的变更" | |
2853 | ||
a6cd2cc4 | 2854 | #: diff.c:5429 |
d46c5519 JX |
2855 | msgid "ignore changes in whitespace at EOL" |
2856 | msgstr "忽略行尾的空白字符变更" | |
2857 | ||
a6cd2cc4 | 2858 | #: diff.c:5432 |
d46c5519 JX |
2859 | msgid "ignore carrier-return at the end of line" |
2860 | msgstr "忽略行尾的回车符(CR)" | |
2861 | ||
a6cd2cc4 | 2862 | #: diff.c:5435 |
d46c5519 JX |
2863 | msgid "ignore changes whose lines are all blank" |
2864 | msgstr "忽略整行都是空白的变更" | |
2865 | ||
a6cd2cc4 | 2866 | #: diff.c:5438 |
d46c5519 JX |
2867 | msgid "heuristic to shift diff hunk boundaries for easy reading" |
2868 | msgstr "启发式转换差异边界以便阅读" | |
2869 | ||
a6cd2cc4 | 2870 | #: diff.c:5441 |
d46c5519 JX |
2871 | msgid "generate diff using the \"patience diff\" algorithm" |
2872 | msgstr "使用 \"patience diff\" 算法生成差异" | |
2873 | ||
a6cd2cc4 | 2874 | #: diff.c:5445 |
d46c5519 JX |
2875 | msgid "generate diff using the \"histogram diff\" algorithm" |
2876 | msgstr "使用 \"histogram diff\" 算法生成差异" | |
2877 | ||
a6cd2cc4 | 2878 | #: diff.c:5447 |
d46c5519 JX |
2879 | msgid "<algorithm>" |
2880 | msgstr "<算法>" | |
2881 | ||
a6cd2cc4 | 2882 | #: diff.c:5448 |
d46c5519 JX |
2883 | msgid "choose a diff algorithm" |
2884 | msgstr "选择一个差异算法" | |
2885 | ||
a6cd2cc4 | 2886 | #: diff.c:5450 |
d46c5519 JX |
2887 | msgid "<text>" |
2888 | msgstr "<文本>" | |
2889 | ||
a6cd2cc4 | 2890 | #: diff.c:5451 |
d46c5519 | 2891 | msgid "generate diff using the \"anchored diff\" algorithm" |
5b533632 | 2892 | msgstr "使用 \"anchored diff\" 算法生成差异" |
d46c5519 | 2893 | |
a6cd2cc4 | 2894 | #: diff.c:5453 diff.c:5462 diff.c:5465 |
d46c5519 JX |
2895 | msgid "<mode>" |
2896 | msgstr "<模式>" | |
2897 | ||
a6cd2cc4 | 2898 | #: diff.c:5454 |
d46c5519 JX |
2899 | msgid "show word diff, using <mode> to delimit changed words" |
2900 | msgstr "显示单词差异,使用 <模式> 分隔变更的单词" | |
2901 | ||
a6cd2cc4 | 2902 | #: diff.c:5456 diff.c:5459 diff.c:5504 |
d46c5519 JX |
2903 | msgid "<regex>" |
2904 | msgstr "<正则>" | |
2905 | ||
a6cd2cc4 | 2906 | #: diff.c:5457 |
d46c5519 JX |
2907 | msgid "use <regex> to decide what a word is" |
2908 | msgstr "使用 <正则表达式> 确定何为一个词" | |
2909 | ||
a6cd2cc4 | 2910 | #: diff.c:5460 |
d46c5519 JX |
2911 | msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" |
2912 | msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" | |
2913 | ||
a6cd2cc4 | 2914 | #: diff.c:5463 |
d46c5519 JX |
2915 | msgid "moved lines of code are colored differently" |
2916 | msgstr "移动的代码行用不同方式着色" | |
2917 | ||
a6cd2cc4 | 2918 | #: diff.c:5466 |
d46c5519 JX |
2919 | msgid "how white spaces are ignored in --color-moved" |
2920 | msgstr "在 --color-moved 下如何忽略空白字符" | |
2921 | ||
a6cd2cc4 | 2922 | #: diff.c:5469 |
d46c5519 JX |
2923 | msgid "Other diff options" |
2924 | msgstr "其它差异选项" | |
2925 | ||
a6cd2cc4 | 2926 | #: diff.c:5471 |
d46c5519 JX |
2927 | msgid "when run from subdir, exclude changes outside and show relative paths" |
2928 | msgstr "当从子目录运行,排除目录之外的变更并显示相对路径" | |
2929 | ||
a6cd2cc4 | 2930 | #: diff.c:5475 |
d46c5519 JX |
2931 | msgid "treat all files as text" |
2932 | msgstr "把所有文件当做文本处理" | |
2933 | ||
a6cd2cc4 | 2934 | #: diff.c:5477 |
d46c5519 JX |
2935 | msgid "swap two inputs, reverse the diff" |
2936 | msgstr "交换两个输入,反转差异" | |
2937 | ||
a6cd2cc4 | 2938 | #: diff.c:5479 |
d46c5519 JX |
2939 | msgid "exit with 1 if there were differences, 0 otherwise" |
2940 | msgstr "有差异时退出码为 1,否则为 0" | |
2941 | ||
a6cd2cc4 | 2942 | #: diff.c:5481 |
d46c5519 JX |
2943 | msgid "disable all output of the program" |
2944 | msgstr "禁用本程序的所有输出" | |
2945 | ||
a6cd2cc4 | 2946 | #: diff.c:5483 |
d46c5519 JX |
2947 | msgid "allow an external diff helper to be executed" |
2948 | msgstr "允许执行一个外置的差异助手" | |
2949 | ||
a6cd2cc4 | 2950 | #: diff.c:5485 |
d46c5519 JX |
2951 | msgid "run external text conversion filters when comparing binary files" |
2952 | msgstr "当比较二进制文件时,运行外部的文本转换过滤器" | |
2953 | ||
a6cd2cc4 | 2954 | #: diff.c:5487 |
d46c5519 JX |
2955 | msgid "<when>" |
2956 | msgstr "<何时>" | |
2957 | ||
a6cd2cc4 | 2958 | #: diff.c:5488 |
d46c5519 JX |
2959 | msgid "ignore changes to submodules in the diff generation" |
2960 | msgstr "在生成差异时,忽略子模组的更改" | |
2961 | ||
a6cd2cc4 | 2962 | #: diff.c:5491 |
d46c5519 JX |
2963 | msgid "<format>" |
2964 | msgstr "<格式>" | |
2965 | ||
a6cd2cc4 | 2966 | #: diff.c:5492 |
d46c5519 JX |
2967 | msgid "specify how differences in submodules are shown" |
2968 | msgstr "指定子模组的差异如何显示" | |
2969 | ||
a6cd2cc4 | 2970 | #: diff.c:5496 |
d46c5519 JX |
2971 | msgid "hide 'git add -N' entries from the index" |
2972 | msgstr "隐藏索引中 'git add -N' 条目" | |
2973 | ||
a6cd2cc4 | 2974 | #: diff.c:5499 |
d46c5519 JX |
2975 | msgid "treat 'git add -N' entries as real in the index" |
2976 | msgstr "将索引中 'git add -N' 条目当做真实的" | |
2977 | ||
a6cd2cc4 | 2978 | #: diff.c:5501 |
d46c5519 JX |
2979 | msgid "<string>" |
2980 | msgstr "<字符串>" | |
2981 | ||
a6cd2cc4 | 2982 | #: diff.c:5502 |
d46c5519 JX |
2983 | msgid "" |
2984 | "look for differences that change the number of occurrences of the specified " | |
2985 | "string" | |
2986 | msgstr "查找改变了指定字符串出现次数的差异" | |
2987 | ||
a6cd2cc4 | 2988 | #: diff.c:5505 |
d46c5519 JX |
2989 | msgid "" |
2990 | "look for differences that change the number of occurrences of the specified " | |
2991 | "regex" | |
2992 | msgstr "查找改变指定正则匹配出现次数的差异" | |
2993 | ||
a6cd2cc4 | 2994 | #: diff.c:5508 |
d46c5519 JX |
2995 | msgid "show all changes in the changeset with -S or -G" |
2996 | msgstr "显示使用 -S 或 -G 的变更集的所有变更" | |
2997 | ||
a6cd2cc4 | 2998 | #: diff.c:5511 |
d46c5519 JX |
2999 | msgid "treat <string> in -S as extended POSIX regular expression" |
3000 | msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" | |
3001 | ||
a6cd2cc4 | 3002 | #: diff.c:5514 |
d46c5519 JX |
3003 | msgid "control the order in which files appear in the output" |
3004 | msgstr "控制输出中的文件显示顺序" | |
3005 | ||
a6cd2cc4 | 3006 | #: diff.c:5515 |
d46c5519 | 3007 | msgid "<object-id>" |
5b533632 | 3008 | msgstr "<对象 ID>" |
d46c5519 | 3009 | |
a6cd2cc4 | 3010 | #: diff.c:5516 |
d46c5519 JX |
3011 | msgid "" |
3012 | "look for differences that change the number of occurrences of the specified " | |
3013 | "object" | |
3014 | msgstr "查找改变指定对象出现次数的差异" | |
3015 | ||
a6cd2cc4 | 3016 | #: diff.c:5518 |
d46c5519 JX |
3017 | msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" |
3018 | msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" | |
3019 | ||
a6cd2cc4 | 3020 | #: diff.c:5519 |
d46c5519 JX |
3021 | msgid "select files by diff type" |
3022 | msgstr "通过差异类型选择文件" | |
3023 | ||
a6cd2cc4 | 3024 | #: diff.c:5521 |
d46c5519 JX |
3025 | msgid "<file>" |
3026 | msgstr "<文件>" | |
3027 | ||
a6cd2cc4 | 3028 | #: diff.c:5522 |
d46c5519 JX |
3029 | msgid "Output to a specific file" |
3030 | msgstr "输出到一个指定的文件" | |
3031 | ||
a6cd2cc4 | 3032 | #: diff.c:6177 |
a0b6b246 JX |
3033 | msgid "inexact rename detection was skipped due to too many files." |
3034 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
3035 | ||
a6cd2cc4 | 3036 | #: diff.c:6180 |
a0b6b246 JX |
3037 | msgid "only found copies from modified paths due to too many files." |
3038 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
3039 | ||
a6cd2cc4 | 3040 | #: diff.c:6183 |
7aea43ff | 3041 | #, c-format |
a0b6b246 JX |
3042 | msgid "" |
3043 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 3044 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 3045 | |
d46c5519 | 3046 | #: dir.c:537 |
c1ac5258 JX |
3047 | #, c-format |
3048 | msgid "pathspec '%s' did not match any file(s) known to git" | |
3049 | msgstr "路径规格 '%s' 未匹配任何 git 已知文件" | |
3050 | ||
d46c5519 | 3051 | #: dir.c:926 |
c1ac5258 JX |
3052 | #, c-format |
3053 | msgid "cannot use %s as an exclude file" | |
3054 | msgstr "不能将 %s 用作排除文件" | |
3055 | ||
d46c5519 | 3056 | #: dir.c:1843 |
31e5e17b JX |
3057 | #, c-format |
3058 | msgid "could not open directory '%s'" | |
3059 | msgstr "不能打开目录 '%s'" | |
3060 | ||
d46c5519 | 3061 | #: dir.c:2085 |
a0b6b246 JX |
3062 | msgid "failed to get kernel name and information" |
3063 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 3064 | |
d46c5519 | 3065 | #: dir.c:2209 |
c1ac5258 JX |
3066 | msgid "untracked cache is disabled on this system or location" |
3067 | msgstr "缓存未跟踪文件在本系统或位置中被禁用" | |
3068 | ||
d46c5519 | 3069 | #: dir.c:3013 |
c1ac5258 JX |
3070 | #, c-format |
3071 | msgid "index file corrupt in repo %s" | |
3072 | msgstr "仓库 %s 中的索引文件损坏" | |
7aea43ff | 3073 | |
d46c5519 | 3074 | #: dir.c:3058 dir.c:3063 |
87cb7997 JX |
3075 | #, c-format |
3076 | msgid "could not create directories for %s" | |
3077 | msgstr "不能为 %s 创建目录" | |
3078 | ||
d46c5519 | 3079 | #: dir.c:3092 |
1a79b2f1 JX |
3080 | #, c-format |
3081 | msgid "could not migrate git directory from '%s' to '%s'" | |
3082 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
3083 | ||
4c27fcb5 | 3084 | #: editor.c:73 |
5809aa05 JX |
3085 | #, c-format |
3086 | msgid "hint: Waiting for your editor to close the file...%c" | |
3087 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
3088 | ||
c1ac5258 | 3089 | #: entry.c:178 |
6937cb4e JX |
3090 | msgid "Filtering content" |
3091 | msgstr "过滤内容" | |
3092 | ||
d46c5519 | 3093 | #: entry.c:476 |
87cb7997 JX |
3094 | #, c-format |
3095 | msgid "could not stat file '%s'" | |
65e2041e | 3096 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 3097 | |
c1ac5258 JX |
3098 | #: environment.c:150 |
3099 | #, c-format | |
3100 | msgid "bad git namespace path \"%s\"" | |
e640d114 | 3101 | msgstr "错误的 git 名字空间路径 \"%s\"" |
c1ac5258 JX |
3102 | |
3103 | #: environment.c:332 | |
3104 | #, c-format | |
3105 | msgid "could not set GIT_DIR to '%s'" | |
3106 | msgstr "不能设置 GIT_DIR 为 '%s'" | |
3107 | ||
d46c5519 | 3108 | #: exec-cmd.c:363 |
c1ac5258 JX |
3109 | #, c-format |
3110 | msgid "too many args to run %s" | |
3111 | msgstr "执行 %s 的参数太多" | |
3112 | ||
31e5e17b JX |
3113 | #: fetch-object.c:17 |
3114 | msgid "Remote with no URL" | |
3115 | msgstr "远程未设置 URL" | |
3116 | ||
4c27fcb5 | 3117 | #: fetch-pack.c:151 |
a0b6b246 JX |
3118 | msgid "git fetch-pack: expected shallow list" |
3119 | msgstr "git fetch-pack:应为 shallow 列表" | |
3120 | ||
06991777 JX |
3121 | #: fetch-pack.c:154 |
3122 | msgid "git fetch-pack: expected a flush packet after shallow list" | |
3123 | msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包" | |
3124 | ||
3125 | #: fetch-pack.c:165 | |
31e5e17b JX |
3126 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
3127 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 3128 | |
06991777 | 3129 | #: fetch-pack.c:185 |
90314792 | 3130 | #, c-format |
275588f9 | 3131 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 3132 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 3133 | |
d46c5519 JX |
3134 | #: fetch-pack.c:196 |
3135 | msgid "unable to write to remote" | |
3136 | msgstr "无法写到远程" | |
3137 | ||
3138 | #: fetch-pack.c:258 | |
a0b6b246 JX |
3139 | msgid "--stateless-rpc requires multi_ack_detailed" |
3140 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 3141 | |
a6cd2cc4 | 3142 | #: fetch-pack.c:360 fetch-pack.c:1284 |
90314792 | 3143 | #, c-format |
a0b6b246 JX |
3144 | msgid "invalid shallow line: %s" |
3145 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 3146 | |
a6cd2cc4 | 3147 | #: fetch-pack.c:366 fetch-pack.c:1290 |
c04f5ac3 | 3148 | #, c-format |
a0b6b246 JX |
3149 | msgid "invalid unshallow line: %s" |
3150 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 3151 | |
a6cd2cc4 | 3152 | #: fetch-pack.c:368 fetch-pack.c:1292 |
a0b6b246 JX |
3153 | #, c-format |
3154 | msgid "object not found: %s" | |
3155 | msgstr "对象未找到:%s" | |
07432cef | 3156 | |
a6cd2cc4 | 3157 | #: fetch-pack.c:371 fetch-pack.c:1295 |
c04f5ac3 | 3158 | #, c-format |
a0b6b246 JX |
3159 | msgid "error in object: %s" |
3160 | msgstr "对象中出错:%s" | |
07432cef | 3161 | |
a6cd2cc4 | 3162 | #: fetch-pack.c:373 fetch-pack.c:1297 |
c04f5ac3 | 3163 | #, c-format |
a0b6b246 JX |
3164 | msgid "no shallow found: %s" |
3165 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 3166 | |
a6cd2cc4 | 3167 | #: fetch-pack.c:376 fetch-pack.c:1301 |
a0b6b246 JX |
3168 | #, c-format |
3169 | msgid "expected shallow/unshallow, got %s" | |
3170 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 3171 | |
d46c5519 | 3172 | #: fetch-pack.c:417 |
a0b6b246 JX |
3173 | #, c-format |
3174 | msgid "got %s %d %s" | |
3175 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 3176 | |
d46c5519 | 3177 | #: fetch-pack.c:434 |
1b7f4a34 | 3178 | #, c-format |
a0b6b246 JX |
3179 | msgid "invalid commit %s" |
3180 | msgstr "无效提交 %s" | |
1b7f4a34 | 3181 | |
d46c5519 | 3182 | #: fetch-pack.c:465 |
a0b6b246 JX |
3183 | msgid "giving up" |
3184 | msgstr "放弃" | |
814ff314 | 3185 | |
a6cd2cc4 | 3186 | #: fetch-pack.c:477 progress.c:277 |
a0b6b246 JX |
3187 | msgid "done" |
3188 | msgstr "完成" | |
2e8451e8 | 3189 | |
d46c5519 | 3190 | #: fetch-pack.c:489 |
2e8451e8 | 3191 | #, c-format |
a0b6b246 JX |
3192 | msgid "got %s (%d) %s" |
3193 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 3194 | |
d46c5519 | 3195 | #: fetch-pack.c:535 |
a0b6b246 JX |
3196 | #, c-format |
3197 | msgid "Marking %s as complete" | |
3198 | msgstr "标记 %s 为完成" | |
220c313c | 3199 | |
d46c5519 | 3200 | #: fetch-pack.c:744 |
a0b6b246 JX |
3201 | #, c-format |
3202 | msgid "already have %s (%s)" | |
29004bbb | 3203 | msgstr "已经有 %s(%s)" |
220c313c | 3204 | |
d46c5519 | 3205 | #: fetch-pack.c:783 |
a0b6b246 JX |
3206 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
3207 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 3208 | |
d46c5519 | 3209 | #: fetch-pack.c:791 |
a0b6b246 JX |
3210 | msgid "protocol error: bad pack header" |
3211 | msgstr "协议错误:坏的包头" | |
814ff314 | 3212 | |
d46c5519 | 3213 | #: fetch-pack.c:859 |
a0b6b246 JX |
3214 | #, c-format |
3215 | msgid "fetch-pack: unable to fork off %s" | |
3216 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 3217 | |
d46c5519 | 3218 | #: fetch-pack.c:875 |
a0b6b246 JX |
3219 | #, c-format |
3220 | msgid "%s failed" | |
3221 | msgstr "%s 失败" | |
14c8bced | 3222 | |
d46c5519 | 3223 | #: fetch-pack.c:877 |
a0b6b246 JX |
3224 | msgid "error in sideband demultiplexer" |
3225 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 3226 | |
a6cd2cc4 | 3227 | #: fetch-pack.c:908 |
81809b99 | 3228 | #, c-format |
a0b6b246 JX |
3229 | msgid "Server version is %.*s" |
3230 | msgstr "服务器版本 %.*s" | |
8ada9598 | 3231 | |
a6cd2cc4 JX |
3232 | #: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 |
3233 | #: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 | |
3234 | #: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 | |
3235 | #: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 | |
3236 | #, c-format | |
3237 | msgid "Server supports %s" | |
3238 | msgstr "服务器支持 %s" | |
3239 | ||
3240 | #: fetch-pack.c:915 | |
3241 | msgid "Server does not support shallow clients" | |
3242 | msgstr "服务器不支持 shalllow 客户端" | |
3243 | ||
3244 | #: fetch-pack.c:975 | |
a0b6b246 JX |
3245 | msgid "Server does not support --shallow-since" |
3246 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 3247 | |
a6cd2cc4 | 3248 | #: fetch-pack.c:980 |
a0b6b246 JX |
3249 | msgid "Server does not support --shallow-exclude" |
3250 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 3251 | |
a6cd2cc4 | 3252 | #: fetch-pack.c:984 |
a0b6b246 JX |
3253 | msgid "Server does not support --deepen" |
3254 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 3255 | |
a6cd2cc4 | 3256 | #: fetch-pack.c:1001 |
a0b6b246 JX |
3257 | msgid "no common commits" |
3258 | msgstr "没有共同的提交" | |
c04f5ac3 | 3259 | |
a6cd2cc4 | 3260 | #: fetch-pack.c:1013 fetch-pack.c:1462 |
a0b6b246 JX |
3261 | msgid "git fetch-pack: fetch failed." |
3262 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 3263 | |
a6cd2cc4 | 3264 | #: fetch-pack.c:1151 |
fd8cb379 JX |
3265 | msgid "Server does not support shallow requests" |
3266 | msgstr "服务器不支持 shalllow 请求" | |
3267 | ||
a6cd2cc4 JX |
3268 | #: fetch-pack.c:1157 |
3269 | msgid "Server supports filter" | |
3270 | msgstr "服务器支持 filter" | |
3271 | ||
3272 | #: fetch-pack.c:1184 | |
d46c5519 JX |
3273 | msgid "unable to write request to remote" |
3274 | msgstr "无法将请求写到远程" | |
3275 | ||
a6cd2cc4 | 3276 | #: fetch-pack.c:1202 |
c1ac5258 JX |
3277 | #, c-format |
3278 | msgid "error reading section header '%s'" | |
3279 | msgstr "读取节标题 '%s' 出错" | |
3280 | ||
a6cd2cc4 | 3281 | #: fetch-pack.c:1208 |
c1ac5258 JX |
3282 | #, c-format |
3283 | msgid "expected '%s', received '%s'" | |
3284 | msgstr "预期 '%s',得到 '%s'" | |
3285 | ||
a6cd2cc4 | 3286 | #: fetch-pack.c:1247 |
c1ac5258 JX |
3287 | #, c-format |
3288 | msgid "unexpected acknowledgment line: '%s'" | |
3289 | msgstr "意外的确认行:'%s'" | |
3290 | ||
a6cd2cc4 | 3291 | #: fetch-pack.c:1252 |
c1ac5258 JX |
3292 | #, c-format |
3293 | msgid "error processing acks: %d" | |
3294 | msgstr "处理 ack 出错:%d" | |
3295 | ||
a6cd2cc4 | 3296 | #: fetch-pack.c:1262 |
4c27fcb5 JX |
3297 | msgid "expected packfile to be sent after 'ready'" |
3298 | msgstr "预期在 'ready' 之后发送 packfile" | |
3299 | ||
a6cd2cc4 | 3300 | #: fetch-pack.c:1264 |
4c27fcb5 JX |
3301 | msgid "expected no other sections to be sent after no 'ready'" |
3302 | msgstr "在没有 'ready' 不应该发送其它小节" | |
3303 | ||
a6cd2cc4 | 3304 | #: fetch-pack.c:1306 |
c1ac5258 JX |
3305 | #, c-format |
3306 | msgid "error processing shallow info: %d" | |
3307 | msgstr "处理浅克隆信息出错:%d" | |
3308 | ||
a6cd2cc4 | 3309 | #: fetch-pack.c:1353 |
c1ac5258 JX |
3310 | #, c-format |
3311 | msgid "expected wanted-ref, got '%s'" | |
3312 | msgstr "预期 wanted-ref,得到 '%s'" | |
3313 | ||
a6cd2cc4 | 3314 | #: fetch-pack.c:1358 |
c1ac5258 JX |
3315 | #, c-format |
3316 | msgid "unexpected wanted-ref: '%s'" | |
3317 | msgstr "意外的 wanted-ref:'%s'" | |
3318 | ||
a6cd2cc4 | 3319 | #: fetch-pack.c:1363 |
c1ac5258 JX |
3320 | #, c-format |
3321 | msgid "error processing wanted refs: %d" | |
3322 | msgstr "处理要获取的引用出错:%d" | |
3323 | ||
a6cd2cc4 | 3324 | #: fetch-pack.c:1689 |
a0b6b246 JX |
3325 | msgid "no matching remote head" |
3326 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 3327 | |
a6cd2cc4 | 3328 | #: fetch-pack.c:1712 builtin/clone.c:686 |
c1ac5258 | 3329 | msgid "remote did not send all necessary objects" |
e640d114 | 3330 | msgstr "远程没有发送所有必需的对象" |
c1ac5258 | 3331 | |
a6cd2cc4 | 3332 | #: fetch-pack.c:1739 |
87cb7997 JX |
3333 | #, c-format |
3334 | msgid "no such remote ref %s" | |
3335 | msgstr "没有这样的远程引用 %s" | |
3336 | ||
a6cd2cc4 | 3337 | #: fetch-pack.c:1742 |
87cb7997 JX |
3338 | #, c-format |
3339 | msgid "Server does not allow request for unadvertised object %s" | |
3340 | msgstr "服务器不允许请求未公开的对象 %s" | |
3341 | ||
a6cd2cc4 | 3342 | #: gpg-interface.c:321 |
a0b6b246 JX |
3343 | msgid "gpg failed to sign the data" |
3344 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 3345 | |
a6cd2cc4 | 3346 | #: gpg-interface.c:347 |
a0b6b246 JX |
3347 | msgid "could not create temporary file" |
3348 | msgstr "不能创建临时文件" | |
c04f5ac3 | 3349 | |
a6cd2cc4 | 3350 | #: gpg-interface.c:350 |
c04f5ac3 | 3351 | #, c-format |
a0b6b246 JX |
3352 | msgid "failed writing detached signature to '%s'" |
3353 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 3354 | |
a4f16749 | 3355 | #: graph.c:97 |
1a79b2f1 JX |
3356 | #, c-format |
3357 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
3358 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
3359 | ||
a6cd2cc4 | 3360 | #: grep.c:2117 |
c04f5ac3 | 3361 | #, c-format |
a0b6b246 JX |
3362 | msgid "'%s': unable to read %s" |
3363 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 3364 | |
a6cd2cc4 | 3365 | #: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 |
06991777 | 3366 | #: builtin/rm.c:135 |
c04f5ac3 | 3367 | #, c-format |
a0b6b246 | 3368 | msgid "failed to stat '%s'" |
65e2041e | 3369 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 3370 | |
a6cd2cc4 | 3371 | #: grep.c:2145 |
a0b6b246 JX |
3372 | #, c-format |
3373 | msgid "'%s': short read" | |
3374 | msgstr "'%s':读取不完整" | |
5c57d762 | 3375 | |
fd8cb379 JX |
3376 | #: help.c:23 |
3377 | msgid "start a working area (see also: git help tutorial)" | |
3378 | msgstr "开始一个工作区(参见:git help tutorial)" | |
3379 | ||
3380 | #: help.c:24 | |
3381 | msgid "work on the current change (see also: git help everyday)" | |
3382 | msgstr "在当前变更上工作(参见:git help everyday)" | |
3383 | ||
3384 | #: help.c:25 | |
3385 | msgid "examine the history and state (see also: git help revisions)" | |
3386 | msgstr "检查历史和状态(参见:git help revisions)" | |
3387 | ||
3388 | #: help.c:26 | |
3389 | msgid "grow, mark and tweak your common history" | |
3390 | msgstr "扩展、标记和调校您的历史记录" | |
3391 | ||
3392 | #: help.c:27 | |
3393 | msgid "collaborate (see also: git help workflows)" | |
3394 | msgstr "协同(参见:git help workflows)" | |
3395 | ||
3396 | #: help.c:31 | |
3397 | msgid "Main Porcelain Commands" | |
3398 | msgstr "主要的上层命令" | |
3399 | ||
3400 | #: help.c:32 | |
3401 | msgid "Ancillary Commands / Manipulators" | |
3402 | msgstr "辅助命令/操作者" | |
3403 | ||
3404 | #: help.c:33 | |
3405 | msgid "Ancillary Commands / Interrogators" | |
3406 | msgstr "辅助命令/询问者" | |
3407 | ||
3408 | #: help.c:34 | |
3409 | msgid "Interacting with Others" | |
3410 | msgstr "与其它系统交互" | |
3411 | ||
3412 | #: help.c:35 | |
3413 | msgid "Low-level Commands / Manipulators" | |
3414 | msgstr "低级命令/操作者" | |
3415 | ||
3416 | #: help.c:36 | |
3417 | msgid "Low-level Commands / Interrogators" | |
3418 | msgstr "低级命令/询问者" | |
3419 | ||
3420 | #: help.c:37 | |
3421 | msgid "Low-level Commands / Synching Repositories" | |
3422 | msgstr "低级命令/同步仓库" | |
3423 | ||
3424 | #: help.c:38 | |
3425 | msgid "Low-level Commands / Internal Helpers" | |
3426 | msgstr "低级命令/内部助手" | |
3427 | ||
06991777 | 3428 | #: help.c:298 |
a0b6b246 JX |
3429 | #, c-format |
3430 | msgid "available git commands in '%s'" | |
3431 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 3432 | |
06991777 | 3433 | #: help.c:305 |
a0b6b246 JX |
3434 | msgid "git commands available from elsewhere on your $PATH" |
3435 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 3436 | |
06991777 | 3437 | #: help.c:314 |
a0b6b246 JX |
3438 | msgid "These are common Git commands used in various situations:" |
3439 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 3440 | |
a6cd2cc4 | 3441 | #: help.c:363 git.c:98 |
fd8cb379 JX |
3442 | #, c-format |
3443 | msgid "unsupported command listing type '%s'" | |
3444 | msgstr "不支持的命令列表类型 '%s'" | |
3445 | ||
d46c5519 | 3446 | #: help.c:403 |
fd8cb379 JX |
3447 | msgid "The common Git guides are:" |
3448 | msgstr "最常用的 Git 向导有:" | |
3449 | ||
d46c5519 | 3450 | #: help.c:512 |
4c27fcb5 JX |
3451 | msgid "See 'git help <command>' to read about a specific subcommand" |
3452 | msgstr "执行 'git help <command>' 来查看特定子命令" | |
3453 | ||
d46c5519 | 3454 | #: help.c:517 |
4c27fcb5 JX |
3455 | msgid "External commands" |
3456 | msgstr "外部命令" | |
3457 | ||
d46c5519 | 3458 | #: help.c:532 |
4c27fcb5 JX |
3459 | msgid "Command aliases" |
3460 | msgstr "命令别名" | |
3461 | ||
d46c5519 | 3462 | #: help.c:596 |
c04f5ac3 | 3463 | #, c-format |
a0b6b246 JX |
3464 | msgid "" |
3465 | "'%s' appears to be a git command, but we were not\n" | |
3466 | "able to execute it. Maybe git-%s is broken?" | |
3467 | msgstr "" | |
3468 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
3469 | "可能是 git-%s 受损?" | |
c04f5ac3 | 3470 | |
d46c5519 | 3471 | #: help.c:655 |
a0b6b246 JX |
3472 | msgid "Uh oh. Your system reports no Git commands at all." |
3473 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 3474 | |
d46c5519 | 3475 | #: help.c:677 |
c04f5ac3 | 3476 | #, c-format |
a4f16749 | 3477 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 3478 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 3479 | |
d46c5519 | 3480 | #: help.c:682 |
a4f16749 JX |
3481 | #, c-format |
3482 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 3483 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 3484 | |
d46c5519 | 3485 | #: help.c:687 |
c04f5ac3 | 3486 | #, c-format |
a4f16749 | 3487 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 3488 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 3489 | |
d46c5519 | 3490 | #: help.c:695 |
c04f5ac3 | 3491 | #, c-format |
a0b6b246 JX |
3492 | msgid "git: '%s' is not a git command. See 'git --help'." |
3493 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 3494 | |
d46c5519 | 3495 | #: help.c:699 |
a4f16749 JX |
3496 | msgid "" |
3497 | "\n" | |
3498 | "The most similar command is" | |
3499 | msgid_plural "" | |
3500 | "\n" | |
3501 | "The most similar commands are" | |
6937cb4e JX |
3502 | msgstr[0] "" |
3503 | "\n" | |
3504 | "最相似的命令是" | |
3505 | msgstr[1] "" | |
3506 | "\n" | |
3507 | "最相似的命令是" | |
a4f16749 | 3508 | |
d46c5519 | 3509 | #: help.c:714 |
a4f16749 JX |
3510 | msgid "git version [<options>]" |
3511 | msgstr "git version [<选项>]" | |
3512 | ||
d46c5519 | 3513 | #: help.c:782 |
a4f16749 JX |
3514 | #, c-format |
3515 | msgid "%s: %s - %s" | |
3516 | msgstr "%s:%s - %s" | |
3517 | ||
d46c5519 | 3518 | #: help.c:786 |
a0b6b246 JX |
3519 | msgid "" |
3520 | "\n" | |
3521 | "Did you mean this?" | |
3522 | msgid_plural "" | |
3523 | "\n" | |
3524 | "Did you mean one of these?" | |
3525 | msgstr[0] "" | |
3526 | "\n" | |
3527 | "您指的是这个么?" | |
3528 | msgstr[1] "" | |
3529 | "\n" | |
3530 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 3531 | |
d46c5519 | 3532 | #: ident.c:349 |
a0b6b246 JX |
3533 | msgid "" |
3534 | "\n" | |
3535 | "*** Please tell me who you are.\n" | |
3536 | "\n" | |
3537 | "Run\n" | |
3538 | "\n" | |
3539 | " git config --global user.email \"you@example.com\"\n" | |
3540 | " git config --global user.name \"Your Name\"\n" | |
3541 | "\n" | |
3542 | "to set your account's default identity.\n" | |
3543 | "Omit --global to set the identity only in this repository.\n" | |
3544 | "\n" | |
3545 | msgstr "" | |
3546 | "\n" | |
3547 | "*** 请告诉我你是谁。\n" | |
3548 | "\n" | |
3549 | "运行\n" | |
3550 | "\n" | |
3551 | " git config --global user.email \"you@example.com\"\n" | |
3552 | " git config --global user.name \"Your Name\"\n" | |
3553 | "\n" | |
3554 | "来设置您账号的缺省身份标识。\n" | |
3555 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 3556 | |
d46c5519 | 3557 | #: ident.c:379 |
87cb7997 | 3558 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 3559 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 3560 | |
d46c5519 | 3561 | #: ident.c:384 |
87cb7997 JX |
3562 | #, c-format |
3563 | msgid "unable to auto-detect email address (got '%s')" | |
3564 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
3565 | ||
d46c5519 | 3566 | #: ident.c:401 |
87cb7997 JX |
3567 | msgid "no name was given and auto-detection is disabled" |
3568 | msgstr "未提供姓名且自动探测被禁用" | |
3569 | ||
d46c5519 | 3570 | #: ident.c:407 |
87cb7997 JX |
3571 | #, c-format |
3572 | msgid "unable to auto-detect name (got '%s')" | |
3573 | msgstr "无法自动探测姓名(得到 '%s')" | |
3574 | ||
d46c5519 | 3575 | #: ident.c:415 |
87cb7997 JX |
3576 | #, c-format |
3577 | msgid "empty ident name (for <%s>) not allowed" | |
3578 | msgstr "不允许空的姓名(对于 <%s>)" | |
3579 | ||
d46c5519 | 3580 | #: ident.c:421 |
87cb7997 JX |
3581 | #, c-format |
3582 | msgid "name consists only of disallowed characters: %s" | |
3583 | msgstr "姓名中仅包含禁用字符:%s" | |
3584 | ||
a6cd2cc4 | 3585 | #: ident.c:436 builtin/commit.c:611 |
87cb7997 JX |
3586 | #, c-format |
3587 | msgid "invalid date format: %s" | |
3588 | msgstr "无效的日期格式:%s" | |
3589 | ||
d46c5519 JX |
3590 | #: list-objects.c:129 |
3591 | #, c-format | |
3592 | msgid "entry '%s' in tree %s has tree mode, but is not a tree" | |
3593 | msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象" | |
3594 | ||
3595 | #: list-objects.c:142 | |
3596 | #, c-format | |
3597 | msgid "entry '%s' in tree %s has blob mode, but is not a blob" | |
3598 | msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象" | |
3599 | ||
3600 | #: list-objects.c:378 | |
3601 | #, c-format | |
3602 | msgid "unable to load root tree for commit %s" | |
3603 | msgstr "无法为提交 %s 加载根树" | |
3604 | ||
06991777 | 3605 | #: list-objects-filter-options.c:36 |
31e5e17b JX |
3606 | msgid "multiple filter-specs cannot be combined" |
3607 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 3608 | |
4c27fcb5 | 3609 | #: list-objects-filter-options.c:58 |
06991777 JX |
3610 | msgid "expected 'tree:<depth>'" |
3611 | msgstr "期望 'tree:<深度>'" | |
4c27fcb5 | 3612 | |
d46c5519 JX |
3613 | #: list-objects-filter-options.c:84 |
3614 | msgid "sparse:path filters support has been dropped" | |
3615 | msgstr "sparse:path 过滤器支持已被删除" | |
3616 | ||
a6cd2cc4 JX |
3617 | #: list-objects-filter-options.c:94 |
3618 | #, c-format | |
3619 | msgid "invalid filter-spec '%s'" | |
3620 | msgstr "无效的过滤器表达式 '%s'" | |
3621 | ||
d46c5519 | 3622 | #: list-objects-filter-options.c:158 |
31e5e17b JX |
3623 | msgid "cannot change partial clone promisor remote" |
3624 | msgstr "无法修改部分克隆的 promisor 远程仓库" | |
5809aa05 | 3625 | |
6937cb4e | 3626 | #: lockfile.c:151 |
c04f5ac3 | 3627 | #, c-format |
a0b6b246 JX |
3628 | msgid "" |
3629 | "Unable to create '%s.lock': %s.\n" | |
3630 | "\n" | |
3631 | "Another git process seems to be running in this repository, e.g.\n" | |
3632 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
3633 | "are terminated then try again. If it still fails, a git process\n" | |
3634 | "may have crashed in this repository earlier:\n" | |
3635 | "remove the file manually to continue." | |
3636 | msgstr "" | |
3637 | "无法创建 '%s.lock':%s。\n" | |
3638 | "\n" | |
3639 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
3640 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
3641 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
3642 | "手动删除这个文件再继续。" | |
c04f5ac3 | 3643 | |
6937cb4e | 3644 | #: lockfile.c:159 |
a0b6b246 JX |
3645 | #, c-format |
3646 | msgid "Unable to create '%s.lock': %s" | |
3647 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 3648 | |
4c27fcb5 | 3649 | #: merge.c:41 |
a0b6b246 | 3650 | msgid "failed to read the cache" |
c1ac5258 | 3651 | msgstr "读取缓存失败" |
c04f5ac3 | 3652 | |
a6cd2cc4 JX |
3653 | #: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 |
3654 | #: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 | |
d46c5519 | 3655 | #: builtin/stash.c:264 |
a0b6b246 JX |
3656 | msgid "unable to write new index file" |
3657 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 3658 | |
d46c5519 | 3659 | #: merge-recursive.c:322 |
a0b6b246 JX |
3660 | msgid "(bad commit)\n" |
3661 | msgstr "(坏提交)\n" | |
c04f5ac3 | 3662 | |
d46c5519 | 3663 | #: merge-recursive.c:345 |
a0b6b246 | 3664 | #, c-format |
fd8cb379 | 3665 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 3666 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 3667 | |
d46c5519 | 3668 | #: merge-recursive.c:354 |
fd8cb379 JX |
3669 | #, c-format |
3670 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 3671 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 | 3672 | |
d46c5519 | 3673 | #: merge-recursive.c:437 |
a0b6b246 | 3674 | msgid "error building trees" |
c1ac5258 | 3675 | msgstr "创建树出错" |
c04f5ac3 | 3676 | |
a6cd2cc4 | 3677 | #: merge-recursive.c:863 |
c04f5ac3 | 3678 | #, c-format |
a0b6b246 | 3679 | msgid "failed to create path '%s'%s" |
c1ac5258 | 3680 | msgstr "创建路径 '%s'%s 失败" |
c04f5ac3 | 3681 | |
a6cd2cc4 | 3682 | #: merge-recursive.c:874 |
c04f5ac3 | 3683 | #, c-format |
a0b6b246 JX |
3684 | msgid "Removing %s to make room for subdirectory\n" |
3685 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 3686 | |
a6cd2cc4 | 3687 | #: merge-recursive.c:888 merge-recursive.c:907 |
a0b6b246 JX |
3688 | msgid ": perhaps a D/F conflict?" |
3689 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 3690 | |
a6cd2cc4 | 3691 | #: merge-recursive.c:897 |
c04f5ac3 | 3692 | #, c-format |
a0b6b246 JX |
3693 | msgid "refusing to lose untracked file at '%s'" |
3694 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 3695 | |
a6cd2cc4 | 3696 | #: merge-recursive.c:938 builtin/cat-file.c:40 |
c04f5ac3 | 3697 | #, c-format |
a0b6b246 JX |
3698 | msgid "cannot read object %s '%s'" |
3699 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 3700 | |
a6cd2cc4 | 3701 | #: merge-recursive.c:941 |
4dcdc3d8 | 3702 | #, c-format |
a0b6b246 JX |
3703 | msgid "blob expected for %s '%s'" |
3704 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 3705 | |
a6cd2cc4 | 3706 | #: merge-recursive.c:965 |
4dcdc3d8 | 3707 | #, c-format |
a0b6b246 | 3708 | msgid "failed to open '%s': %s" |
c1ac5258 | 3709 | msgstr "打开 '%s' 失败:%s" |
4dcdc3d8 | 3710 | |
a6cd2cc4 | 3711 | #: merge-recursive.c:976 |
a0b6b246 JX |
3712 | #, c-format |
3713 | msgid "failed to symlink '%s': %s" | |
c1ac5258 | 3714 | msgstr "创建符号链接 '%s' 失败:%s" |
c04f5ac3 | 3715 | |
a6cd2cc4 | 3716 | #: merge-recursive.c:981 |
5c57d762 | 3717 | #, c-format |
a0b6b246 JX |
3718 | msgid "do not know what to do with %06o %s '%s'" |
3719 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 3720 | |
a6cd2cc4 | 3721 | #: merge-recursive.c:1177 |
fd8cb379 JX |
3722 | #, c-format |
3723 | msgid "Failed to merge submodule %s (not checked out)" | |
3724 | msgstr "无法合并子模组 %s (没有检出)" | |
3725 | ||
a6cd2cc4 | 3726 | #: merge-recursive.c:1184 |
fd8cb379 JX |
3727 | #, c-format |
3728 | msgid "Failed to merge submodule %s (commits not present)" | |
3729 | msgstr "无法合并子模组 %s(提交不存在)" | |
3730 | ||
a6cd2cc4 | 3731 | #: merge-recursive.c:1191 |
fd8cb379 JX |
3732 | #, c-format |
3733 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
3734 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
3735 | ||
a6cd2cc4 | 3736 | #: merge-recursive.c:1199 merge-recursive.c:1211 |
fd8cb379 JX |
3737 | #, c-format |
3738 | msgid "Fast-forwarding submodule %s to the following commit:" | |
3739 | msgstr "子模组 %s 快进到如下提交:" | |
3740 | ||
a6cd2cc4 | 3741 | #: merge-recursive.c:1202 merge-recursive.c:1214 |
fd8cb379 JX |
3742 | #, c-format |
3743 | msgid "Fast-forwarding submodule %s" | |
3744 | msgstr "快进子模组 %s" | |
3745 | ||
a6cd2cc4 | 3746 | #: merge-recursive.c:1237 |
fd8cb379 JX |
3747 | #, c-format |
3748 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
3749 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
3750 | ||
a6cd2cc4 | 3751 | #: merge-recursive.c:1241 |
fd8cb379 JX |
3752 | #, c-format |
3753 | msgid "Failed to merge submodule %s (not fast-forward)" | |
3754 | msgstr "无法合并子模组 %s(非快进)" | |
3755 | ||
a6cd2cc4 | 3756 | #: merge-recursive.c:1242 |
fd8cb379 JX |
3757 | msgid "Found a possible merge resolution for the submodule:\n" |
3758 | msgstr "找到子模组的一个可能的合并方案:\n" | |
3759 | ||
a6cd2cc4 | 3760 | #: merge-recursive.c:1245 |
fd8cb379 JX |
3761 | #, c-format |
3762 | msgid "" | |
3763 | "If this is correct simply add it to the index for example\n" | |
3764 | "by using:\n" | |
3765 | "\n" | |
3766 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
3767 | "\n" | |
3768 | "which will accept this suggestion.\n" | |
3769 | msgstr "" | |
3770 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
3771 | "\n" | |
3772 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
3773 | "\n" | |
3774 | "以接受此建议。\n" | |
3775 | ||
a6cd2cc4 | 3776 | #: merge-recursive.c:1254 |
fd8cb379 JX |
3777 | #, c-format |
3778 | msgid "Failed to merge submodule %s (multiple merges found)" | |
3779 | msgstr "无法合并子模组 %s (发现多个合并)" | |
3780 | ||
a6cd2cc4 | 3781 | #: merge-recursive.c:1327 |
a0b6b246 JX |
3782 | msgid "Failed to execute internal merge" |
3783 | msgstr "无法执行内部合并" | |
3784 | ||
a6cd2cc4 | 3785 | #: merge-recursive.c:1332 |
5c57d762 | 3786 | #, c-format |
a0b6b246 JX |
3787 | msgid "Unable to add %s to database" |
3788 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 3789 | |
a6cd2cc4 | 3790 | #: merge-recursive.c:1364 |
fd8cb379 JX |
3791 | #, c-format |
3792 | msgid "Auto-merging %s" | |
3793 | msgstr "自动合并 %s" | |
3794 | ||
a6cd2cc4 | 3795 | #: merge-recursive.c:1387 |
fd8cb379 JX |
3796 | #, c-format |
3797 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
3798 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
3799 | ||
a6cd2cc4 | 3800 | #: merge-recursive.c:1459 |
5c57d762 JX |
3801 | #, c-format |
3802 | msgid "" | |
a0b6b246 JX |
3803 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
3804 | "in tree." | |
5c57d762 | 3805 | msgstr "" |
87cb7997 JX |
3806 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3807 | "本被保留。" | |
3808 | ||
a6cd2cc4 | 3809 | #: merge-recursive.c:1464 |
87cb7997 JX |
3810 | #, c-format |
3811 | msgid "" | |
3812 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3813 | "left in tree." | |
3814 | msgstr "" | |
3815 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3816 | "%7$s 版本被保留。" | |
c04f5ac3 | 3817 | |
a6cd2cc4 | 3818 | #: merge-recursive.c:1471 |
7aea43ff | 3819 | #, c-format |
a0b6b246 JX |
3820 | msgid "" |
3821 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
3822 | "in tree at %s." | |
3823 | msgstr "" | |
87cb7997 JX |
3824 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3825 | "本保留在 %8$s 中。" | |
7aea43ff | 3826 | |
a6cd2cc4 | 3827 | #: merge-recursive.c:1476 |
87cb7997 JX |
3828 | #, c-format |
3829 | msgid "" | |
3830 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3831 | "left in tree at %s." | |
3832 | msgstr "" | |
3833 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3834 | "%7$s 版本保留在 %9$s 中。" | |
3835 | ||
a6cd2cc4 | 3836 | #: merge-recursive.c:1511 |
a0b6b246 JX |
3837 | msgid "rename" |
3838 | msgstr "重命名" | |
5b04ee3b | 3839 | |
a6cd2cc4 | 3840 | #: merge-recursive.c:1511 |
a0b6b246 JX |
3841 | msgid "renamed" |
3842 | msgstr "重命名" | |
5b04ee3b | 3843 | |
a6cd2cc4 | 3844 | #: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 |
fd8cb379 JX |
3845 | #, c-format |
3846 | msgid "Refusing to lose dirty file at %s" | |
3847 | msgstr "拒绝丢失脏文件 '%s'" | |
3848 | ||
a6cd2cc4 | 3849 | #: merge-recursive.c:1601 |
06991777 JX |
3850 | #, c-format |
3851 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
3852 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" | |
3853 | ||
a6cd2cc4 | 3854 | #: merge-recursive.c:1659 |
06991777 JX |
3855 | #, c-format |
3856 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" | |
3857 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
3858 | ||
a6cd2cc4 | 3859 | #: merge-recursive.c:1690 |
5c57d762 | 3860 | #, c-format |
a0b6b246 JX |
3861 | msgid "%s is a directory in %s adding as %s instead" |
3862 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 3863 | |
a6cd2cc4 | 3864 | #: merge-recursive.c:1695 |
fd8cb379 JX |
3865 | #, c-format |
3866 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
3867 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
3868 | ||
a6cd2cc4 | 3869 | #: merge-recursive.c:1714 |
5c57d762 JX |
3870 | #, c-format |
3871 | msgid "" | |
a0b6b246 JX |
3872 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
3873 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 3874 | msgstr "" |
a0b6b246 JX |
3875 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
3876 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 3877 | |
a6cd2cc4 | 3878 | #: merge-recursive.c:1719 |
a0b6b246 JX |
3879 | msgid " (left unresolved)" |
3880 | msgstr "(留下未解决)" | |
5c57d762 | 3881 | |
a6cd2cc4 | 3882 | #: merge-recursive.c:1828 |
5c57d762 | 3883 | #, c-format |
a0b6b246 | 3884 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 3885 | msgstr "" |
a0b6b246 JX |
3886 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
3887 | "%5$s" | |
3495628d | 3888 | |
a6cd2cc4 | 3889 | #: merge-recursive.c:2035 |
fd8cb379 JX |
3890 | #, c-format |
3891 | msgid "" | |
3892 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
3893 | "directory %s was renamed to multiple other directories, with no destination " | |
3894 | "getting a majority of the files." | |
c1ac5258 JX |
3895 | msgstr "" |
3896 | "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" | |
3897 | "其它目录,没有目录包含大部分文件。" | |
fd8cb379 | 3898 | |
a6cd2cc4 | 3899 | #: merge-recursive.c:2067 |
fd8cb379 JX |
3900 | #, c-format |
3901 | msgid "" | |
3902 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
3903 | "implicit directory rename(s) putting the following path(s) there: %s." | |
3904 | msgstr "" | |
3905 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
3906 | "在:%s。" | |
3907 | ||
a6cd2cc4 | 3908 | #: merge-recursive.c:2077 |
fd8cb379 JX |
3909 | #, c-format |
3910 | msgid "" | |
3911 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
3912 | "implicit directory renames tried to put these paths there: %s" | |
3913 | msgstr "" | |
3914 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
3915 | "径放置于此:%s" | |
3916 | ||
a6cd2cc4 | 3917 | #: merge-recursive.c:2169 |
fd8cb379 JX |
3918 | #, c-format |
3919 | msgid "" | |
3920 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
3921 | ">%s in %s" | |
3922 | msgstr "" | |
3923 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
3924 | "%4$s->%5$s" | |
3925 | ||
a6cd2cc4 | 3926 | #: merge-recursive.c:2413 |
fd8cb379 JX |
3927 | #, c-format |
3928 | msgid "" | |
3929 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
3930 | "renamed." | |
3931 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
3932 | ||
a6cd2cc4 | 3933 | #: merge-recursive.c:2938 |
90314792 | 3934 | #, c-format |
a0b6b246 JX |
3935 | msgid "cannot read object %s" |
3936 | msgstr "不能读取对象 %s" | |
90314792 | 3937 | |
a6cd2cc4 | 3938 | #: merge-recursive.c:2941 |
90314792 | 3939 | #, c-format |
a0b6b246 JX |
3940 | msgid "object %s is not a blob" |
3941 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 3942 | |
a6cd2cc4 | 3943 | #: merge-recursive.c:3005 |
a0b6b246 JX |
3944 | msgid "modify" |
3945 | msgstr "修改" | |
90314792 | 3946 | |
a6cd2cc4 | 3947 | #: merge-recursive.c:3005 |
a0b6b246 JX |
3948 | msgid "modified" |
3949 | msgstr "修改" | |
5b04ee3b | 3950 | |
a6cd2cc4 | 3951 | #: merge-recursive.c:3017 |
a0b6b246 JX |
3952 | msgid "content" |
3953 | msgstr "内容" | |
5b04ee3b | 3954 | |
a6cd2cc4 | 3955 | #: merge-recursive.c:3021 |
a0b6b246 JX |
3956 | msgid "add/add" |
3957 | msgstr "添加/添加" | |
3495628d | 3958 | |
a6cd2cc4 | 3959 | #: merge-recursive.c:3044 |
220c313c | 3960 | #, c-format |
a0b6b246 JX |
3961 | msgid "Skipped %s (merged same as existing)" |
3962 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 3963 | |
a6cd2cc4 | 3964 | #: merge-recursive.c:3066 git-submodule.sh:937 |
a0b6b246 JX |
3965 | msgid "submodule" |
3966 | msgstr "子模组" | |
3967 | ||
a6cd2cc4 | 3968 | #: merge-recursive.c:3067 |
220c313c | 3969 | #, c-format |
a0b6b246 JX |
3970 | msgid "CONFLICT (%s): Merge conflict in %s" |
3971 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 3972 | |
a6cd2cc4 | 3973 | #: merge-recursive.c:3097 |
220c313c | 3974 | #, c-format |
06991777 JX |
3975 | msgid "Adding as %s instead" |
3976 | msgstr "而是以 %s 为名添加" | |
3977 | ||
a6cd2cc4 | 3978 | #: merge-recursive.c:3179 |
06991777 | 3979 | #, c-format |
d46c5519 JX |
3980 | msgid "" |
3981 | "Path updated: %s added in %s inside a directory that was renamed in %s; " | |
3982 | "moving it to %s." | |
3983 | msgstr "" | |
5b533632 | 3984 | "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。" |
220c313c | 3985 | |
a6cd2cc4 | 3986 | #: merge-recursive.c:3182 |
d46c5519 JX |
3987 | #, c-format |
3988 | msgid "" | |
3989 | "CONFLICT (file location): %s added in %s inside a directory that was renamed " | |
3990 | "in %s, suggesting it should perhaps be moved to %s." | |
3991 | msgstr "" | |
3992 | "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动" | |
3993 | "到 %s。" | |
3994 | ||
a6cd2cc4 | 3995 | #: merge-recursive.c:3186 |
d46c5519 JX |
3996 | #, c-format |
3997 | msgid "" | |
3998 | "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " | |
3999 | "%s; moving it to %s." | |
4000 | msgstr "" | |
5b533632 FZ |
4001 | "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移" |
4002 | "动到 %5$s。" | |
d46c5519 | 4003 | |
a6cd2cc4 | 4004 | #: merge-recursive.c:3189 |
d46c5519 JX |
4005 | #, c-format |
4006 | msgid "" | |
4007 | "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " | |
4008 | "was renamed in %s, suggesting it should perhaps be moved to %s." | |
4009 | msgstr "" | |
5b533632 | 4010 | "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中," |
d46c5519 JX |
4011 | "建议将其移动到 %5$s。" |
4012 | ||
a6cd2cc4 | 4013 | #: merge-recursive.c:3303 |
d46c5519 JX |
4014 | #, c-format |
4015 | msgid "Removing %s" | |
4016 | msgstr "删除 %s" | |
4017 | ||
a6cd2cc4 | 4018 | #: merge-recursive.c:3326 |
d46c5519 JX |
4019 | msgid "file/directory" |
4020 | msgstr "文件/目录" | |
220c313c | 4021 | |
a6cd2cc4 | 4022 | #: merge-recursive.c:3331 |
a0b6b246 JX |
4023 | msgid "directory/file" |
4024 | msgstr "目录/文件" | |
276ceeaa | 4025 | |
a6cd2cc4 | 4026 | #: merge-recursive.c:3338 |
276ceeaa | 4027 | #, c-format |
a0b6b246 JX |
4028 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
4029 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 4030 | |
a6cd2cc4 | 4031 | #: merge-recursive.c:3347 |
276ceeaa | 4032 | #, c-format |
a0b6b246 JX |
4033 | msgid "Adding %s" |
4034 | msgstr "添加 %s" | |
276ceeaa | 4035 | |
a6cd2cc4 | 4036 | #: merge-recursive.c:3356 |
06991777 JX |
4037 | #, c-format |
4038 | msgid "CONFLICT (add/add): Merge conflict in %s" | |
4039 | msgstr "冲突(add/add):合并冲突于 %s" | |
4040 | ||
a6cd2cc4 | 4041 | #: merge-recursive.c:3394 |
5809aa05 | 4042 | #, c-format |
c1ac5258 JX |
4043 | msgid "" |
4044 | "Your local changes to the following files would be overwritten by merge:\n" | |
4045 | " %s" | |
4046 | msgstr "" | |
4047 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
4048 | " %s" | |
5809aa05 | 4049 | |
a6cd2cc4 | 4050 | #: merge-recursive.c:3405 |
6937cb4e | 4051 | msgid "Already up to date!" |
a0b6b246 | 4052 | msgstr "已经是最新的!" |
276ceeaa | 4053 | |
a6cd2cc4 | 4054 | #: merge-recursive.c:3414 |
276ceeaa | 4055 | #, c-format |
a0b6b246 JX |
4056 | msgid "merging of trees %s and %s failed" |
4057 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 4058 | |
a6cd2cc4 | 4059 | #: merge-recursive.c:3513 |
a0b6b246 JX |
4060 | msgid "Merging:" |
4061 | msgstr "合并:" | |
5c57d762 | 4062 | |
a6cd2cc4 | 4063 | #: merge-recursive.c:3526 |
5c57d762 | 4064 | #, c-format |
a0b6b246 JX |
4065 | msgid "found %u common ancestor:" |
4066 | msgid_plural "found %u common ancestors:" | |
4067 | msgstr[0] "发现 %u 个共同祖先:" | |
4068 | msgstr[1] "发现 %u 个共同祖先:" | |
4069 | ||
a6cd2cc4 | 4070 | #: merge-recursive.c:3565 |
a0b6b246 JX |
4071 | msgid "merge returned no commit" |
4072 | msgstr "合并未返回提交" | |
4073 | ||
a6cd2cc4 | 4074 | #: merge-recursive.c:3631 |
5c57d762 | 4075 | #, c-format |
a0b6b246 JX |
4076 | msgid "Could not parse object '%s'" |
4077 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 4078 | |
a6cd2cc4 | 4079 | #: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 |
a0b6b246 JX |
4080 | msgid "Unable to write index." |
4081 | msgstr "不能写入索引。" | |
4082 | ||
a6cd2cc4 | 4083 | #: midx.c:69 |
4c27fcb5 JX |
4084 | #, c-format |
4085 | msgid "multi-pack-index file %s is too small" | |
4086 | msgstr "多包索引文件 %s 太小" | |
4087 | ||
a6cd2cc4 | 4088 | #: midx.c:85 |
4c27fcb5 JX |
4089 | #, c-format |
4090 | msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" | |
4091 | msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" | |
4092 | ||
a6cd2cc4 | 4093 | #: midx.c:90 |
4c27fcb5 JX |
4094 | #, c-format |
4095 | msgid "multi-pack-index version %d not recognized" | |
4096 | msgstr "multi-pack-index 版本 %d 不能被识别" | |
4097 | ||
a6cd2cc4 | 4098 | #: midx.c:95 |
4c27fcb5 JX |
4099 | #, c-format |
4100 | msgid "hash version %u does not match" | |
4101 | msgstr "散列版本 %u 不匹配" | |
4102 | ||
a6cd2cc4 | 4103 | #: midx.c:109 |
4c27fcb5 JX |
4104 | msgid "invalid chunk offset (too large)" |
4105 | msgstr "无效的块偏移(太大)" | |
4106 | ||
a6cd2cc4 | 4107 | #: midx.c:133 |
4c27fcb5 JX |
4108 | msgid "terminating multi-pack-index chunk id appears earlier than expected" |
4109 | msgstr "终止多包索引块 id 出现时间早于预期" | |
4110 | ||
a6cd2cc4 | 4111 | #: midx.c:146 |
4c27fcb5 JX |
4112 | msgid "multi-pack-index missing required pack-name chunk" |
4113 | msgstr "多包索引缺少必需的包名块" | |
4114 | ||
a6cd2cc4 | 4115 | #: midx.c:148 |
4c27fcb5 | 4116 | msgid "multi-pack-index missing required OID fanout chunk" |
5b533632 | 4117 | msgstr "多包索引缺少必需的对象 ID 扇出块" |
4c27fcb5 | 4118 | |
a6cd2cc4 | 4119 | #: midx.c:150 |
4c27fcb5 | 4120 | msgid "multi-pack-index missing required OID lookup chunk" |
5b533632 | 4121 | msgstr "多包索引缺少必需的对象 ID 查询块" |
4c27fcb5 | 4122 | |
a6cd2cc4 | 4123 | #: midx.c:152 |
4c27fcb5 JX |
4124 | msgid "multi-pack-index missing required object offsets chunk" |
4125 | msgstr "多包索引缺少必需的对象偏移块" | |
4126 | ||
a6cd2cc4 | 4127 | #: midx.c:166 |
4c27fcb5 JX |
4128 | #, c-format |
4129 | msgid "multi-pack-index pack names out of order: '%s' before '%s'" | |
4130 | msgstr "多包索引包名无序:'%s' 在 '%s' 之前" | |
4131 | ||
a6cd2cc4 | 4132 | #: midx.c:211 |
4c27fcb5 JX |
4133 | #, c-format |
4134 | msgid "bad pack-int-id: %u (%u total packs)" | |
4135 | msgstr "错的 pack-int-id:%u(共有 %u 个包)" | |
4136 | ||
a6cd2cc4 | 4137 | #: midx.c:261 |
4c27fcb5 JX |
4138 | msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" |
4139 | msgstr "多包索引存储一个64位偏移,但是 off_t 太小" | |
4140 | ||
a6cd2cc4 | 4141 | #: midx.c:289 |
4c27fcb5 JX |
4142 | msgid "error preparing packfile from multi-pack-index" |
4143 | msgstr "从多包索引准备 packfile 出错" | |
4144 | ||
a6cd2cc4 | 4145 | #: midx.c:470 |
4c27fcb5 JX |
4146 | #, c-format |
4147 | msgid "failed to add packfile '%s'" | |
4148 | msgstr "添加包文件 '%s' 失败" | |
4149 | ||
a6cd2cc4 | 4150 | #: midx.c:476 |
4c27fcb5 JX |
4151 | #, c-format |
4152 | msgid "failed to open pack-index '%s'" | |
4153 | msgstr "打开包索引 '%s' 失败" | |
4154 | ||
a6cd2cc4 | 4155 | #: midx.c:536 |
4c27fcb5 JX |
4156 | #, c-format |
4157 | msgid "failed to locate object %d in packfile" | |
4158 | msgstr "在包文件中定位对象 %d 失败" | |
4159 | ||
a6cd2cc4 JX |
4160 | #: midx.c:865 |
4161 | #, c-format | |
4162 | msgid "did not see pack-file %s to drop" | |
4163 | msgstr "没有看到要丢弃的包文件 %s" | |
4164 | ||
4165 | #: midx.c:1036 | |
4c27fcb5 JX |
4166 | #, c-format |
4167 | msgid "failed to clear multi-pack-index at %s" | |
4168 | msgstr "清理位于 %s 的多包索引失败" | |
4169 | ||
a6cd2cc4 | 4170 | #: midx.c:1091 |
d46c5519 JX |
4171 | msgid "Looking for referenced packfiles" |
4172 | msgstr "正在查找引用的包文件" | |
4173 | ||
a6cd2cc4 | 4174 | #: midx.c:1106 |
4c27fcb5 JX |
4175 | #, c-format |
4176 | msgid "" | |
4177 | "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" | |
5b533632 | 4178 | msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" |
4c27fcb5 | 4179 | |
a6cd2cc4 | 4180 | #: midx.c:1110 |
d46c5519 | 4181 | msgid "Verifying OID order in MIDX" |
5b533632 | 4182 | msgstr "正在校验 MIDX 中的对象 ID 顺序" |
d46c5519 | 4183 | |
a6cd2cc4 | 4184 | #: midx.c:1119 |
4c27fcb5 JX |
4185 | #, c-format |
4186 | msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" | |
5b533632 | 4187 | msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]" |
4c27fcb5 | 4188 | |
a6cd2cc4 | 4189 | #: midx.c:1138 |
d46c5519 JX |
4190 | msgid "Sorting objects by packfile" |
4191 | msgstr "通过包文件为对象排序" | |
4192 | ||
a6cd2cc4 | 4193 | #: midx.c:1144 |
4c27fcb5 JX |
4194 | msgid "Verifying object offsets" |
4195 | msgstr "校验对象偏移" | |
4196 | ||
a6cd2cc4 | 4197 | #: midx.c:1160 |
4c27fcb5 JX |
4198 | #, c-format |
4199 | msgid "failed to load pack entry for oid[%d] = %s" | |
4200 | msgstr "为 oid[%d] = %s 加载包条目失败" | |
4201 | ||
a6cd2cc4 | 4202 | #: midx.c:1166 |
4c27fcb5 JX |
4203 | #, c-format |
4204 | msgid "failed to load pack-index for packfile %s" | |
4205 | msgstr "为包文件 %s 加载包索引失败" | |
4206 | ||
a6cd2cc4 | 4207 | #: midx.c:1175 |
4c27fcb5 JX |
4208 | #, c-format |
4209 | msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" | |
4210 | msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>" | |
4211 | ||
a6cd2cc4 JX |
4212 | #: midx.c:1350 |
4213 | msgid "could not start pack-objects" | |
4214 | msgstr "不能开始 pack-objects" | |
4215 | ||
4216 | #: midx.c:1369 | |
4217 | msgid "could not finish pack-objects" | |
4218 | msgstr "不能结束 pack-objects" | |
4219 | ||
4220 | #: name-hash.c:532 | |
4c27fcb5 JX |
4221 | #, c-format |
4222 | msgid "unable to create lazy_dir thread: %s" | |
4223 | msgstr "不能创建 lazy_dir 线程:%s" | |
4224 | ||
a6cd2cc4 | 4225 | #: name-hash.c:554 |
4c27fcb5 JX |
4226 | #, c-format |
4227 | msgid "unable to create lazy_name thread: %s" | |
4228 | msgstr "不能创建 lazy_name 线程:%s" | |
4229 | ||
a6cd2cc4 | 4230 | #: name-hash.c:560 |
4c27fcb5 JX |
4231 | #, c-format |
4232 | msgid "unable to join lazy_name thread: %s" | |
4233 | msgstr "不能加入 lasy_name 线程:%s" | |
4234 | ||
06991777 | 4235 | #: notes-merge.c:277 |
5c57d762 JX |
4236 | #, c-format |
4237 | msgid "" | |
a0b6b246 JX |
4238 | "You have not concluded your previous notes merge (%s exists).\n" |
4239 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
4240 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 4241 | msgstr "" |
29004bbb | 4242 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
4243 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
4244 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 4245 | |
06991777 | 4246 | #: notes-merge.c:284 |
a0b6b246 JX |
4247 | #, c-format |
4248 | msgid "You have not concluded your notes merge (%s exists)." | |
4249 | msgstr "您尚未结束注释合并(存在 %s)。" | |
4250 | ||
06991777 | 4251 | #: notes-utils.c:46 |
a0b6b246 JX |
4252 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
4253 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 4254 | |
06991777 | 4255 | #: notes-utils.c:105 |
1b7f4a34 | 4256 | #, c-format |
a0b6b246 JX |
4257 | msgid "Bad notes.rewriteMode value: '%s'" |
4258 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 4259 | |
06991777 | 4260 | #: notes-utils.c:115 |
5b04ee3b | 4261 | #, c-format |
a0b6b246 JX |
4262 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
4263 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 4264 | |
a4f16749 JX |
4265 | #. TRANSLATORS: The first %s is the name of |
4266 | #. the environment variable, the second %s is | |
4267 | #. its value. | |
4268 | #. | |
06991777 | 4269 | #: notes-utils.c:145 |
5b04ee3b | 4270 | #, c-format |
a0b6b246 JX |
4271 | msgid "Bad %s value: '%s'" |
4272 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 4273 | |
c1ac5258 JX |
4274 | #: object.c:54 |
4275 | #, c-format | |
4276 | msgid "invalid object type \"%s\"" | |
4277 | msgstr "无效的对象类型 \"%s\"" | |
4278 | ||
06991777 | 4279 | #: object.c:174 |
c1ac5258 JX |
4280 | #, c-format |
4281 | msgid "object %s is a %s, not a %s" | |
4282 | msgstr "对象 %s 是一个 %s,不是一个 %s" | |
4283 | ||
06991777 | 4284 | #: object.c:234 |
c1ac5258 JX |
4285 | #, c-format |
4286 | msgid "object %s has unknown type id %d" | |
4287 | msgstr "对象 %s 有未知的类型 id %d" | |
4288 | ||
06991777 | 4289 | #: object.c:247 |
5b04ee3b | 4290 | #, c-format |
a0b6b246 JX |
4291 | msgid "unable to parse object: %s" |
4292 | msgstr "不能解析对象:%s" | |
5b04ee3b | 4293 | |
06991777 | 4294 | #: object.c:267 object.c:278 |
c1ac5258 | 4295 | #, c-format |
06991777 JX |
4296 | msgid "hash mismatch %s" |
4297 | msgstr "哈希值与 %s 不匹配" | |
c1ac5258 | 4298 | |
a6cd2cc4 | 4299 | #: packfile.c:648 |
6937cb4e JX |
4300 | msgid "offset before end of packfile (broken .idx?)" |
4301 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
4302 | ||
a6cd2cc4 | 4303 | #: packfile.c:1899 |
6937cb4e JX |
4304 | #, c-format |
4305 | msgid "offset before start of pack index for %s (corrupt index?)" | |
4306 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
4307 | ||
a6cd2cc4 | 4308 | #: packfile.c:1903 |
6937cb4e JX |
4309 | #, c-format |
4310 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
4311 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
4312 | ||
d46c5519 | 4313 | #: parse-options.c:38 |
06991777 JX |
4314 | #, c-format |
4315 | msgid "%s requires a value" | |
8e4e0555 | 4316 | msgstr "%s 需要一个值" |
06991777 | 4317 | |
d46c5519 | 4318 | #: parse-options.c:73 |
06991777 JX |
4319 | #, c-format |
4320 | msgid "%s is incompatible with %s" | |
4321 | msgstr "%s 与 %s 不兼容" | |
4322 | ||
d46c5519 | 4323 | #: parse-options.c:78 |
06991777 JX |
4324 | #, c-format |
4325 | msgid "%s : incompatible with something else" | |
4326 | msgstr "%s:和其它的不兼容" | |
4327 | ||
d46c5519 | 4328 | #: parse-options.c:92 parse-options.c:96 parse-options.c:319 |
06991777 JX |
4329 | #, c-format |
4330 | msgid "%s takes no value" | |
8e4e0555 | 4331 | msgstr "%s 不取值" |
06991777 | 4332 | |
d46c5519 | 4333 | #: parse-options.c:94 |
06991777 JX |
4334 | #, c-format |
4335 | msgid "%s isn't available" | |
4336 | msgstr "%s 不可用" | |
4337 | ||
d46c5519 | 4338 | #: parse-options.c:219 |
06991777 JX |
4339 | #, c-format |
4340 | msgid "%s expects a non-negative integer value with an optional k/m/g suffix" | |
4341 | msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" | |
4342 | ||
d46c5519 | 4343 | #: parse-options.c:389 |
06991777 JX |
4344 | #, c-format |
4345 | msgid "ambiguous option: %s (could be --%s%s or --%s%s)" | |
8e4e0555 | 4346 | msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)" |
06991777 | 4347 | |
d46c5519 | 4348 | #: parse-options.c:423 parse-options.c:431 |
06991777 JX |
4349 | #, c-format |
4350 | msgid "did you mean `--%s` (with two dashes ?)" | |
4351 | msgstr "你的意思是 `--%s`(有两个短线?)" | |
4352 | ||
d46c5519 | 4353 | #: parse-options.c:859 |
06991777 JX |
4354 | #, c-format |
4355 | msgid "unknown option `%s'" | |
4356 | msgstr "未知选项 `%s'" | |
4357 | ||
d46c5519 | 4358 | #: parse-options.c:861 |
06991777 JX |
4359 | #, c-format |
4360 | msgid "unknown switch `%c'" | |
4361 | msgstr "未知开关 `%c'" | |
4362 | ||
d46c5519 | 4363 | #: parse-options.c:863 |
06991777 JX |
4364 | #, c-format |
4365 | msgid "unknown non-ascii option in string: `%s'" | |
5b533632 | 4366 | msgstr "字符串中未知的非 ascii 字符选项:`%s'" |
06991777 | 4367 | |
d46c5519 | 4368 | #: parse-options.c:887 |
a0b6b246 JX |
4369 | msgid "..." |
4370 | msgstr "..." | |
4371 | ||
d46c5519 | 4372 | #: parse-options.c:906 |
5b04ee3b | 4373 | #, c-format |
a0b6b246 JX |
4374 | msgid "usage: %s" |
4375 | msgstr "用法:%s" | |
5b04ee3b | 4376 | |
a0b6b246 | 4377 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
4378 | #. one in "usage: %s" translation. |
4379 | #. | |
d46c5519 | 4380 | #: parse-options.c:912 |
5b04ee3b | 4381 | #, c-format |
a0b6b246 JX |
4382 | msgid " or: %s" |
4383 | msgstr " 或:%s" | |
5b04ee3b | 4384 | |
a0b6b246 | 4385 | # 译者:为保证在输出中对齐,注意调整句中空格! |
d46c5519 | 4386 | #: parse-options.c:915 |
5b04ee3b | 4387 | #, c-format |
a0b6b246 JX |
4388 | msgid " %s" |
4389 | msgstr " %s" | |
5b04ee3b | 4390 | |
d46c5519 | 4391 | #: parse-options.c:954 |
a0b6b246 JX |
4392 | msgid "-NUM" |
4393 | msgstr "-数字" | |
4394 | ||
d46c5519 JX |
4395 | #: parse-options.c:968 |
4396 | #, c-format | |
4397 | msgid "alias of --%s" | |
4398 | msgstr "--%s 的别名" | |
4399 | ||
4400 | #: parse-options-cb.c:20 parse-options-cb.c:24 | |
06991777 JX |
4401 | #, c-format |
4402 | msgid "option `%s' expects a numerical value" | |
4403 | msgstr "选项 `%s' 期望一个数字值" | |
4404 | ||
d46c5519 | 4405 | #: parse-options-cb.c:41 |
fd8cb379 JX |
4406 | #, c-format |
4407 | msgid "malformed expiration date '%s'" | |
4408 | msgstr "格式错误的到期时间:'%s'" | |
4409 | ||
d46c5519 | 4410 | #: parse-options-cb.c:54 |
06991777 JX |
4411 | #, c-format |
4412 | msgid "option `%s' expects \"always\", \"auto\", or \"never\"" | |
4413 | msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" | |
4414 | ||
d46c5519 | 4415 | #: parse-options-cb.c:130 parse-options-cb.c:147 |
5b04ee3b | 4416 | #, c-format |
a0b6b246 | 4417 | msgid "malformed object name '%s'" |
fd8cb379 | 4418 | msgstr "格式错误的对象名 '%s'" |
5b04ee3b | 4419 | |
d46c5519 | 4420 | #: path.c:897 |
5b04ee3b | 4421 | #, c-format |
a0b6b246 JX |
4422 | msgid "Could not make %s writable by group" |
4423 | msgstr "不能设置 %s 为组可写" | |
4424 | ||
06991777 | 4425 | #: pathspec.c:128 |
87cb7997 JX |
4426 | msgid "Escape character '\\' not allowed as last character in attr value" |
4427 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
4428 | ||
06991777 | 4429 | #: pathspec.c:146 |
87cb7997 JX |
4430 | msgid "Only one 'attr:' specification is allowed." |
4431 | msgstr "只允许一个 'attr:' 规格。" | |
4432 | ||
06991777 | 4433 | #: pathspec.c:149 |
87cb7997 JX |
4434 | msgid "attr spec must not be empty" |
4435 | msgstr "属性规格不能为空" | |
4436 | ||
06991777 | 4437 | #: pathspec.c:192 |
87cb7997 JX |
4438 | #, c-format |
4439 | msgid "invalid attribute name %s" | |
4440 | msgstr "无效的属性名 %s" | |
4441 | ||
06991777 | 4442 | #: pathspec.c:257 |
a0b6b246 JX |
4443 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
4444 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
4445 | ||
06991777 | 4446 | #: pathspec.c:264 |
5b04ee3b | 4447 | msgid "" |
a0b6b246 JX |
4448 | "global 'literal' pathspec setting is incompatible with all other global " |
4449 | "pathspec settings" | |
4450 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 4451 | |
06991777 | 4452 | #: pathspec.c:304 |
a0b6b246 JX |
4453 | msgid "invalid parameter for pathspec magic 'prefix'" |
4454 | msgstr "路径规格包含无效的神奇前缀" | |
4455 | ||
06991777 | 4456 | #: pathspec.c:325 |
5b04ee3b | 4457 | #, c-format |
a0b6b246 JX |
4458 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
4459 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 4460 | |
06991777 | 4461 | #: pathspec.c:330 |
5b04ee3b | 4462 | #, c-format |
a0b6b246 JX |
4463 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
4464 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 4465 | |
06991777 | 4466 | #: pathspec.c:368 |
5b04ee3b | 4467 | #, c-format |
a0b6b246 JX |
4468 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
4469 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 4470 | |
06991777 | 4471 | #: pathspec.c:427 |
5b04ee3b | 4472 | #, c-format |
a0b6b246 JX |
4473 | msgid "%s: 'literal' and 'glob' are incompatible" |
4474 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 4475 | |
06991777 | 4476 | #: pathspec.c:440 |
5b04ee3b | 4477 | #, c-format |
a0b6b246 JX |
4478 | msgid "%s: '%s' is outside repository" |
4479 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 4480 | |
06991777 | 4481 | #: pathspec.c:514 |
5b04ee3b | 4482 | #, c-format |
1a79b2f1 JX |
4483 | msgid "'%s' (mnemonic: '%c')" |
4484 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 4485 | |
06991777 | 4486 | #: pathspec.c:524 |
5b04ee3b | 4487 | #, c-format |
a0b6b246 JX |
4488 | msgid "%s: pathspec magic not supported by this command: %s" |
4489 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
4490 | ||
06991777 | 4491 | #: pathspec.c:591 |
5b04ee3b | 4492 | #, c-format |
a0b6b246 JX |
4493 | msgid "pathspec '%s' is beyond a symbolic link" |
4494 | msgstr "路径规格 '%s' 位于符号链接中" | |
4495 | ||
d46c5519 JX |
4496 | #: pkt-line.c:92 |
4497 | msgid "unable to write flush packet" | |
4498 | msgstr "无法写 flush 包" | |
4499 | ||
4500 | #: pkt-line.c:99 | |
4501 | msgid "unable to write delim packet" | |
4502 | msgstr "无法写 delim 包" | |
4503 | ||
4504 | #: pkt-line.c:106 | |
c1ac5258 JX |
4505 | msgid "flush packet write failed" |
4506 | msgstr "flush 包写错误" | |
4507 | ||
d46c5519 | 4508 | #: pkt-line.c:146 pkt-line.c:232 |
c1ac5258 JX |
4509 | msgid "protocol error: impossibly long line" |
4510 | msgstr "协议错误:不可能的长行" | |
4511 | ||
d46c5519 | 4512 | #: pkt-line.c:162 pkt-line.c:164 |
c1ac5258 JX |
4513 | msgid "packet write with format failed" |
4514 | msgstr "格式化包写入错误" | |
4515 | ||
d46c5519 | 4516 | #: pkt-line.c:196 |
c1ac5258 JX |
4517 | msgid "packet write failed - data exceeds max packet size" |
4518 | msgstr "写数据包失败:数据超过了包的最大长度" | |
4519 | ||
d46c5519 | 4520 | #: pkt-line.c:203 pkt-line.c:210 |
c1ac5258 JX |
4521 | msgid "packet write failed" |
4522 | msgstr "数据包写入失败" | |
4523 | ||
d46c5519 | 4524 | #: pkt-line.c:295 |
c1ac5258 JX |
4525 | msgid "read error" |
4526 | msgstr "读取错误" | |
4527 | ||
d46c5519 | 4528 | #: pkt-line.c:303 |
c1ac5258 JX |
4529 | msgid "the remote end hung up unexpectedly" |
4530 | msgstr "远端意外挂断了" | |
4531 | ||
d46c5519 | 4532 | #: pkt-line.c:331 |
c1ac5258 JX |
4533 | #, c-format |
4534 | msgid "protocol error: bad line length character: %.4s" | |
4535 | msgstr "协议错误:错误的行长度字符串:%.4s" | |
4536 | ||
d46c5519 | 4537 | #: pkt-line.c:341 pkt-line.c:346 |
c1ac5258 JX |
4538 | #, c-format |
4539 | msgid "protocol error: bad line length %d" | |
4540 | msgstr "协议错误:错误的行长度 %d" | |
4541 | ||
d46c5519 | 4542 | #: pkt-line.c:362 |
06991777 JX |
4543 | #, c-format |
4544 | msgid "remote error: %s" | |
4545 | msgstr "远程错误:%s" | |
4546 | ||
4547 | #: preload-index.c:119 | |
4c27fcb5 JX |
4548 | msgid "Refreshing index" |
4549 | msgstr "正在刷新索引" | |
4550 | ||
06991777 | 4551 | #: preload-index.c:138 |
4c27fcb5 JX |
4552 | #, c-format |
4553 | msgid "unable to create threaded lstat: %s" | |
4554 | msgstr "无法创建线程 lstat:%s" | |
4555 | ||
d46c5519 | 4556 | #: pretty.c:966 |
a0b6b246 JX |
4557 | msgid "unable to parse --pretty format" |
4558 | msgstr "不能解析 --pretty 格式" | |
4559 | ||
a6cd2cc4 | 4560 | #: range-diff.c:70 |
c1ac5258 JX |
4561 | msgid "could not start `log`" |
4562 | msgstr "不能启动 `log`" | |
4563 | ||
a6cd2cc4 | 4564 | #: range-diff.c:72 |
c1ac5258 JX |
4565 | msgid "could not read `log` output" |
4566 | msgstr "不能读取 `log` 的输出" | |
4567 | ||
a6cd2cc4 | 4568 | #: range-diff.c:91 sequencer.c:5021 |
c1ac5258 JX |
4569 | #, c-format |
4570 | msgid "could not parse commit '%s'" | |
4571 | msgstr "不能解析提交 '%s'" | |
4572 | ||
a6cd2cc4 JX |
4573 | #: range-diff.c:117 |
4574 | #, c-format | |
4575 | msgid "could not parse git header '%.*s'" | |
4576 | msgstr "无法解析 git 头 '%.*s'" | |
4577 | ||
4578 | #: range-diff.c:274 | |
c1ac5258 JX |
4579 | msgid "failed to generate diff" |
4580 | msgstr "生成 diff 失败" | |
4581 | ||
a6cd2cc4 | 4582 | #: range-diff.c:506 range-diff.c:508 |
c1ac5258 JX |
4583 | #, c-format |
4584 | msgid "could not parse log for '%s'" | |
4585 | msgstr "不能解析 '%s' 的日志" | |
4586 | ||
d46c5519 | 4587 | #: read-cache.c:680 |
06991777 JX |
4588 | #, c-format |
4589 | msgid "will not add file alias '%s' ('%s' already exists in index)" | |
4590 | msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)" | |
4591 | ||
d46c5519 | 4592 | #: read-cache.c:696 |
06991777 JX |
4593 | msgid "cannot create an empty blob in the object database" |
4594 | msgstr "不能在对象数据库中创建空的数据对象" | |
4595 | ||
d46c5519 | 4596 | #: read-cache.c:718 |
06991777 JX |
4597 | #, c-format |
4598 | msgid "%s: can only add regular files, symbolic links or git-directories" | |
4599 | msgstr "%s:只能添加常规文件、符号链接或 git 目录" | |
4600 | ||
d46c5519 JX |
4601 | #: read-cache.c:723 |
4602 | #, c-format | |
4603 | msgid "'%s' does not have a commit checked out" | |
4604 | msgstr "'%s' 没有检出一个提交" | |
4605 | ||
4606 | #: read-cache.c:775 | |
06991777 JX |
4607 | #, c-format |
4608 | msgid "unable to index file '%s'" | |
4609 | msgstr "无法索引文件 '%s'" | |
4610 | ||
d46c5519 | 4611 | #: read-cache.c:794 |
06991777 JX |
4612 | #, c-format |
4613 | msgid "unable to add '%s' to index" | |
4614 | msgstr "无法在索引中添加 '%s'" | |
4615 | ||
d46c5519 | 4616 | #: read-cache.c:805 |
06991777 JX |
4617 | #, c-format |
4618 | msgid "unable to stat '%s'" | |
4619 | msgstr "无法对 %s 执行 stat" | |
4620 | ||
d46c5519 | 4621 | #: read-cache.c:1314 |
06991777 JX |
4622 | #, c-format |
4623 | msgid "'%s' appears as both a file and as a directory" | |
5b533632 | 4624 | msgstr "'%s' 看起来既是文件又是目录" |
06991777 | 4625 | |
d46c5519 | 4626 | #: read-cache.c:1499 |
4c27fcb5 JX |
4627 | msgid "Refresh index" |
4628 | msgstr "刷新索引" | |
4629 | ||
d46c5519 | 4630 | #: read-cache.c:1613 |
5b04ee3b JX |
4631 | #, c-format |
4632 | msgid "" | |
a0b6b246 JX |
4633 | "index.version set, but the value is invalid.\n" |
4634 | "Using version %i" | |
5b04ee3b | 4635 | msgstr "" |
a0b6b246 JX |
4636 | "设置了 index.version,但是取值无效。\n" |
4637 | "使用版本 %i" | |
5b04ee3b | 4638 | |
d46c5519 | 4639 | #: read-cache.c:1623 |
5b04ee3b JX |
4640 | #, c-format |
4641 | msgid "" | |
a0b6b246 JX |
4642 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
4643 | "Using version %i" | |
5b04ee3b | 4644 | msgstr "" |
a0b6b246 JX |
4645 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
4646 | "使用版本 %i" | |
5b04ee3b | 4647 | |
d46c5519 | 4648 | #: read-cache.c:1679 |
06991777 JX |
4649 | #, c-format |
4650 | msgid "bad signature 0x%08x" | |
4651 | msgstr "坏的签名 0x%08x" | |
4652 | ||
d46c5519 | 4653 | #: read-cache.c:1682 |
06991777 JX |
4654 | #, c-format |
4655 | msgid "bad index version %d" | |
4656 | msgstr "坏的索引版本 %d" | |
4657 | ||
d46c5519 | 4658 | #: read-cache.c:1691 |
06991777 | 4659 | msgid "bad index file sha1 signature" |
5b533632 | 4660 | msgstr "坏的索引文件 sha1 签名" |
06991777 | 4661 | |
d46c5519 | 4662 | #: read-cache.c:1721 |
06991777 JX |
4663 | #, c-format |
4664 | msgid "index uses %.4s extension, which we do not understand" | |
4665 | msgstr "索引使用不被支持的 %.4s 扩展" | |
4666 | ||
4667 | # | |
d46c5519 | 4668 | #: read-cache.c:1723 |
06991777 JX |
4669 | #, c-format |
4670 | msgid "ignoring %.4s extension" | |
4671 | msgstr "忽略 %.4s 扩展" | |
4672 | ||
d46c5519 | 4673 | #: read-cache.c:1760 |
06991777 JX |
4674 | #, c-format |
4675 | msgid "unknown index entry format 0x%08x" | |
4676 | msgstr "未知的索引条目格式 0x%08x" | |
4677 | ||
d46c5519 | 4678 | #: read-cache.c:1776 |
4c27fcb5 JX |
4679 | #, c-format |
4680 | msgid "malformed name field in the index, near path '%s'" | |
4681 | msgstr "索引中靠近路径 '%s' 有错误的名称字段" | |
4682 | ||
d46c5519 | 4683 | #: read-cache.c:1833 |
06991777 JX |
4684 | msgid "unordered stage entries in index" |
4685 | msgstr "索引中有未排序的暂存条目" | |
4686 | ||
d46c5519 | 4687 | #: read-cache.c:1836 |
06991777 JX |
4688 | #, c-format |
4689 | msgid "multiple stage entries for merged file '%s'" | |
4690 | msgstr "合并文件 '%s' 有多个暂存条目" | |
4691 | ||
d46c5519 | 4692 | #: read-cache.c:1839 |
06991777 JX |
4693 | #, c-format |
4694 | msgid "unordered stage entries for '%s'" | |
4695 | msgstr "'%s' 的未排序暂存条目" | |
4696 | ||
d46c5519 | 4697 | #: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 |
a6cd2cc4 JX |
4698 | #: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 |
4699 | #: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 | |
4700 | #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 | |
4701 | #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 | |
4c27fcb5 JX |
4702 | msgid "index file corrupt" |
4703 | msgstr "索引文件损坏" | |
4704 | ||
d46c5519 | 4705 | #: read-cache.c:2087 |
4c27fcb5 JX |
4706 | #, c-format |
4707 | msgid "unable to create load_cache_entries thread: %s" | |
4708 | msgstr "无法创建 load_cache_entries 线程:%s" | |
4709 | ||
d46c5519 | 4710 | #: read-cache.c:2100 |
4c27fcb5 JX |
4711 | #, c-format |
4712 | msgid "unable to join load_cache_entries thread: %s" | |
4713 | msgstr "无法加入 load_cache_entries 线程:%s" | |
4714 | ||
d46c5519 | 4715 | #: read-cache.c:2133 |
06991777 JX |
4716 | #, c-format |
4717 | msgid "%s: index file open failed" | |
4718 | msgstr "%s:打开索引文件失败" | |
4719 | ||
d46c5519 | 4720 | #: read-cache.c:2137 |
06991777 JX |
4721 | #, c-format |
4722 | msgid "%s: cannot stat the open index" | |
4723 | msgstr "%s:不能对打开的索引执行 stat 操作" | |
4724 | ||
d46c5519 | 4725 | #: read-cache.c:2141 |
06991777 JX |
4726 | #, c-format |
4727 | msgid "%s: index file smaller than expected" | |
4728 | msgstr "%s:索引文件比预期的小" | |
4729 | ||
d46c5519 | 4730 | #: read-cache.c:2145 |
06991777 JX |
4731 | #, c-format |
4732 | msgid "%s: unable to map index file" | |
4733 | msgstr "%s:无法对索引文件执行 map 操作" | |
4734 | ||
d46c5519 | 4735 | #: read-cache.c:2187 |
4c27fcb5 JX |
4736 | #, c-format |
4737 | msgid "unable to create load_index_extensions thread: %s" | |
4738 | msgstr "无法创建 load_index_extensions 线程:%s" | |
4739 | ||
d46c5519 | 4740 | #: read-cache.c:2214 |
4c27fcb5 JX |
4741 | #, c-format |
4742 | msgid "unable to join load_index_extensions thread: %s" | |
4743 | msgstr "无法加入 load_index_extensions 线程:%s" | |
4744 | ||
d46c5519 | 4745 | #: read-cache.c:2246 |
06991777 JX |
4746 | #, c-format |
4747 | msgid "could not freshen shared index '%s'" | |
4748 | msgstr "无法刷新共享索引 '%s'" | |
4749 | ||
d46c5519 | 4750 | #: read-cache.c:2293 |
06991777 JX |
4751 | #, c-format |
4752 | msgid "broken index, expect %s in %s, got %s" | |
4753 | msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s" | |
4754 | ||
a6cd2cc4 | 4755 | #: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 |
a4f16749 JX |
4756 | #, c-format |
4757 | msgid "could not close '%s'" | |
4758 | msgstr "不能关闭 '%s'" | |
4759 | ||
a6cd2cc4 | 4760 | #: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 |
87cb7997 | 4761 | #, c-format |
60638e98 | 4762 | msgid "could not stat '%s'" |
65e2041e | 4763 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 4764 | |
d46c5519 | 4765 | #: read-cache.c:3105 |
87cb7997 JX |
4766 | #, c-format |
4767 | msgid "unable to open git dir: %s" | |
4768 | msgstr "不能打开 git 目录:%s" | |
4769 | ||
d46c5519 | 4770 | #: read-cache.c:3117 |
87cb7997 JX |
4771 | #, c-format |
4772 | msgid "unable to unlink: %s" | |
4773 | msgstr "无法删除:%s" | |
4774 | ||
d46c5519 | 4775 | #: read-cache.c:3142 |
06991777 JX |
4776 | #, c-format |
4777 | msgid "cannot fix permission bits on '%s'" | |
4778 | msgstr "不能修复 '%s' 的权限位" | |
4779 | ||
d46c5519 | 4780 | #: read-cache.c:3291 |
06991777 JX |
4781 | #, c-format |
4782 | msgid "%s: cannot drop to stage #0" | |
4783 | msgstr "%s:不能落到暂存区 #0" | |
4784 | ||
d46c5519 JX |
4785 | #: rebase-interactive.c:26 |
4786 | #, c-format | |
4787 | msgid "" | |
4788 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
4789 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
4790 | ||
4791 | #: rebase-interactive.c:35 | |
4c27fcb5 JX |
4792 | msgid "" |
4793 | "\n" | |
4794 | "Commands:\n" | |
4795 | "p, pick <commit> = use commit\n" | |
4796 | "r, reword <commit> = use commit, but edit the commit message\n" | |
4797 | "e, edit <commit> = use commit, but stop for amending\n" | |
4798 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
4799 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
4800 | "x, exec <command> = run command (the rest of the line) using shell\n" | |
4801 | "b, break = stop here (continue rebase later with 'git rebase --continue')\n" | |
4802 | "d, drop <commit> = remove commit\n" | |
4803 | "l, label <label> = label current HEAD with a name\n" | |
4804 | "t, reset <label> = reset HEAD to a label\n" | |
4805 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
4806 | ". create a merge commit using the original merge commit's\n" | |
4807 | ". message (or the oneline, if no original merge commit was\n" | |
4808 | ". specified). Use -c <commit> to reword the commit message.\n" | |
4809 | "\n" | |
4810 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
4811 | msgstr "" | |
4812 | "\n" | |
4813 | "命令:\n" | |
4814 | "p, pick <提交> = 使用提交\n" | |
4815 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
4816 | "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n" | |
4817 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
4818 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
4819 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
4820 | "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n" | |
4821 | "d, drop <提交> = 删除提交\n" | |
4822 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
4823 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
4824 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
4825 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
4826 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
4827 | ". -c <提交> 可以编辑提交说明。\n" | |
4828 | "\n" | |
4829 | "可以对这些行重新排序,将从上至下执行。\n" | |
4830 | ||
d46c5519 JX |
4831 | #: rebase-interactive.c:56 |
4832 | #, c-format | |
4833 | msgid "Rebase %s onto %s (%d command)" | |
4834 | msgid_plural "Rebase %s onto %s (%d commands)" | |
4835 | msgstr[0] "变基 %s 到 %s(%d 个提交)" | |
4836 | msgstr[1] "变基 %s 到 %s(%d 个提交)" | |
4837 | ||
a6cd2cc4 | 4838 | #: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 |
4c27fcb5 JX |
4839 | msgid "" |
4840 | "\n" | |
4841 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
4842 | msgstr "" | |
4843 | "\n" | |
4844 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
4845 | ||
a6cd2cc4 | 4846 | #: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 |
4c27fcb5 JX |
4847 | msgid "" |
4848 | "\n" | |
4849 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
4850 | msgstr "" | |
4851 | "\n" | |
4852 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
4853 | ||
a6cd2cc4 | 4854 | #: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 |
4c27fcb5 JX |
4855 | msgid "" |
4856 | "\n" | |
4857 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
4858 | "To continue rebase after editing, run:\n" | |
4859 | " git rebase --continue\n" | |
4860 | "\n" | |
4861 | msgstr "" | |
4862 | "\n" | |
4863 | "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" | |
4864 | "请执行:\n" | |
4865 | " git rebase --continue\n" | |
4866 | "\n" | |
4867 | ||
a6cd2cc4 | 4868 | #: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 |
4c27fcb5 JX |
4869 | msgid "" |
4870 | "\n" | |
4871 | "However, if you remove everything, the rebase will be aborted.\n" | |
4872 | "\n" | |
4873 | msgstr "" | |
4874 | "\n" | |
4875 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
4876 | "\n" | |
4877 | ||
a6cd2cc4 | 4878 | #: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 |
4c27fcb5 JX |
4879 | msgid "Note that empty commits are commented out" |
4880 | msgstr "注意空提交已被注释掉" | |
4881 | ||
a6cd2cc4 JX |
4882 | #: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 |
4883 | #: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 | |
4c27fcb5 | 4884 | #, c-format |
d46c5519 JX |
4885 | msgid "could not write '%s'" |
4886 | msgstr "不能写入 '%s'" | |
4887 | ||
4888 | #: rebase-interactive.c:108 | |
4889 | #, c-format | |
4890 | msgid "could not copy '%s' to '%s'." | |
4891 | msgstr "不能拷贝 '%s' 至 '%s'。" | |
4892 | ||
4893 | #: rebase-interactive.c:173 | |
4894 | #, c-format | |
4895 | msgid "" | |
4896 | "Warning: some commits may have been dropped accidentally.\n" | |
4897 | "Dropped commits (newer to older):\n" | |
4898 | msgstr "" | |
4899 | "警告:一些提交可能被意外丢弃。\n" | |
4900 | "丢弃的提交(从新到旧):\n" | |
4901 | ||
4902 | #: rebase-interactive.c:180 | |
4903 | #, c-format | |
4904 | msgid "" | |
4905 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
4906 | "\n" | |
4907 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
4908 | "warnings.\n" | |
4909 | "The possible behaviours are: ignore, warn, error.\n" | |
4910 | "\n" | |
4911 | msgstr "" | |
4912 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
4913 | "\n" | |
4914 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
4915 | "可选值有:ignore、warn、error。\n" | |
4916 | "\n" | |
4c27fcb5 | 4917 | |
a6cd2cc4 | 4918 | #: refs.c:262 |
c1ac5258 JX |
4919 | #, c-format |
4920 | msgid "%s does not point to a valid object!" | |
4921 | msgstr "%s 没有指向一个有效的对象!" | |
4922 | ||
a6cd2cc4 | 4923 | #: refs.c:667 |
c1ac5258 JX |
4924 | #, c-format |
4925 | msgid "ignoring dangling symref %s" | |
e640d114 | 4926 | msgstr "忽略悬空符号引用 %s" |
c1ac5258 | 4927 | |
a6cd2cc4 | 4928 | #: refs.c:669 ref-filter.c:2092 |
c1ac5258 JX |
4929 | #, c-format |
4930 | msgid "ignoring broken ref %s" | |
4931 | msgstr "忽略损坏的引用 %s" | |
4932 | ||
a6cd2cc4 | 4933 | #: refs.c:804 |
c1ac5258 JX |
4934 | #, c-format |
4935 | msgid "could not open '%s' for writing: %s" | |
4936 | msgstr "无法为写入打开 '%s':%s" | |
4937 | ||
a6cd2cc4 | 4938 | #: refs.c:814 refs.c:865 |
c1ac5258 JX |
4939 | #, c-format |
4940 | msgid "could not read ref '%s'" | |
4941 | msgstr "无法读取引用 '%s'" | |
4942 | ||
a6cd2cc4 | 4943 | #: refs.c:820 |
c1ac5258 JX |
4944 | #, c-format |
4945 | msgid "ref '%s' already exists" | |
4946 | msgstr "引用 '%s' 已经存在" | |
4947 | ||
a6cd2cc4 | 4948 | #: refs.c:825 |
c1ac5258 JX |
4949 | #, c-format |
4950 | msgid "unexpected object ID when writing '%s'" | |
4951 | msgstr "写入 '%s' 时意外的对象 ID" | |
4952 | ||
a6cd2cc4 JX |
4953 | #: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 |
4954 | #: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 | |
c1ac5258 JX |
4955 | #, c-format |
4956 | msgid "could not write to '%s'" | |
4957 | msgstr "不能写入 '%s'" | |
4958 | ||
a6cd2cc4 JX |
4959 | #: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 |
4960 | #: builtin/rebase.c:1003 | |
5b04ee3b | 4961 | #, c-format |
fd8cb379 | 4962 | msgid "could not open '%s' for writing" |
a0b6b246 | 4963 | msgstr "无法打开 '%s' 进行写入" |
5b04ee3b | 4964 | |
a6cd2cc4 | 4965 | #: refs.c:867 |
c1ac5258 JX |
4966 | #, c-format |
4967 | msgid "unexpected object ID when deleting '%s'" | |
4968 | msgstr "删除 '%s' 时意外的对象 ID" | |
4969 | ||
a6cd2cc4 | 4970 | #: refs.c:998 |
c1ac5258 JX |
4971 | #, c-format |
4972 | msgid "log for ref %s has gap after %s" | |
4973 | msgstr "引用 %s 的日志在 %s 之后有缺口" | |
4974 | ||
a6cd2cc4 | 4975 | #: refs.c:1004 |
c1ac5258 JX |
4976 | #, c-format |
4977 | msgid "log for ref %s unexpectedly ended on %s" | |
4978 | msgstr "引用 %s 的日志意外终止于 %s " | |
4979 | ||
a6cd2cc4 | 4980 | #: refs.c:1063 |
c1ac5258 JX |
4981 | #, c-format |
4982 | msgid "log for %s is empty" | |
4983 | msgstr "%s 的日志为空" | |
4984 | ||
a6cd2cc4 | 4985 | #: refs.c:1155 |
c1ac5258 JX |
4986 | #, c-format |
4987 | msgid "refusing to update ref with bad name '%s'" | |
4988 | msgstr "拒绝更新有错误名称 '%s' 的引用" | |
4989 | ||
a6cd2cc4 | 4990 | #: refs.c:1231 |
c1ac5258 JX |
4991 | #, c-format |
4992 | msgid "update_ref failed for ref '%s': %s" | |
4993 | msgstr "对引用 '%s' 执行 update_ref 失败:%s" | |
4994 | ||
a6cd2cc4 | 4995 | #: refs.c:2012 |
c1ac5258 JX |
4996 | #, c-format |
4997 | msgid "multiple updates for ref '%s' not allowed" | |
4998 | msgstr "不允许对引用 '%s' 多次更新" | |
4999 | ||
a6cd2cc4 | 5000 | #: refs.c:2044 |
60638e98 JX |
5001 | msgid "ref updates forbidden inside quarantine environment" |
5002 | msgstr "在隔离环境中禁止更新引用" | |
5003 | ||
a6cd2cc4 | 5004 | #: refs.c:2140 refs.c:2170 |
c1ac5258 JX |
5005 | #, c-format |
5006 | msgid "'%s' exists; cannot create '%s'" | |
5007 | msgstr "'%s' 已存在,无法创建 '%s'" | |
5008 | ||
a6cd2cc4 | 5009 | #: refs.c:2146 refs.c:2181 |
c1ac5258 JX |
5010 | #, c-format |
5011 | msgid "cannot process '%s' and '%s' at the same time" | |
5012 | msgstr "无法同时处理 '%s' 和 '%s'" | |
5013 | ||
d46c5519 | 5014 | #: refs/files-backend.c:1234 |
6937cb4e JX |
5015 | #, c-format |
5016 | msgid "could not remove reference %s" | |
5017 | msgstr "无法删除引用 %s" | |
5018 | ||
d46c5519 | 5019 | #: refs/files-backend.c:1248 refs/packed-backend.c:1532 |
c1ac5258 | 5020 | #: refs/packed-backend.c:1542 |
5b04ee3b | 5021 | #, c-format |
a0b6b246 JX |
5022 | msgid "could not delete reference %s: %s" |
5023 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 5024 | |
d46c5519 | 5025 | #: refs/files-backend.c:1251 refs/packed-backend.c:1545 |
5b04ee3b | 5026 | #, c-format |
a0b6b246 JX |
5027 | msgid "could not delete references: %s" |
5028 | msgstr "无法删除引用:%s" | |
5b04ee3b | 5029 | |
c1ac5258 JX |
5030 | #: refspec.c:137 |
5031 | #, c-format | |
5032 | msgid "invalid refspec '%s'" | |
5033 | msgstr "无效的引用表达式:'%s'" | |
5034 | ||
a6cd2cc4 | 5035 | #: ref-filter.c:42 wt-status.c:1934 |
87cb7997 JX |
5036 | msgid "gone" |
5037 | msgstr "丢失" | |
5038 | ||
a6cd2cc4 | 5039 | #: ref-filter.c:43 |
87cb7997 JX |
5040 | #, c-format |
5041 | msgid "ahead %d" | |
5042 | msgstr "领先 %d" | |
5043 | ||
a6cd2cc4 | 5044 | #: ref-filter.c:44 |
87cb7997 JX |
5045 | #, c-format |
5046 | msgid "behind %d" | |
5047 | msgstr "落后 %d" | |
5048 | ||
a6cd2cc4 | 5049 | #: ref-filter.c:45 |
87cb7997 JX |
5050 | #, c-format |
5051 | msgid "ahead %d, behind %d" | |
5052 | msgstr "领先 %d,落后 %d" | |
5053 | ||
a6cd2cc4 | 5054 | #: ref-filter.c:162 |
5b04ee3b | 5055 | #, c-format |
a0b6b246 | 5056 | msgid "expected format: %%(color:<color>)" |
58b6f078 | 5057 | msgstr "期望的格式:%%(color:<颜色>)" |
5b04ee3b | 5058 | |
a6cd2cc4 | 5059 | #: ref-filter.c:164 |
5b04ee3b | 5060 | #, c-format |
a0b6b246 JX |
5061 | msgid "unrecognized color: %%(color:%s)" |
5062 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 5063 | |
a6cd2cc4 | 5064 | #: ref-filter.c:186 |
a0b6b246 | 5065 | #, c-format |
87cb7997 JX |
5066 | msgid "Integer value expected refname:lstrip=%s" |
5067 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 5068 | |
a6cd2cc4 | 5069 | #: ref-filter.c:190 |
87cb7997 JX |
5070 | #, c-format |
5071 | msgid "Integer value expected refname:rstrip=%s" | |
5072 | msgstr "期望整数值 refname:rstrip=%s" | |
5073 | ||
a6cd2cc4 | 5074 | #: ref-filter.c:192 |
87cb7997 JX |
5075 | #, c-format |
5076 | msgid "unrecognized %%(%s) argument: %s" | |
5077 | msgstr "未能识别的 %%(%s) 参数:%s" | |
5078 | ||
a6cd2cc4 | 5079 | #: ref-filter.c:247 |
c1ac5258 JX |
5080 | #, c-format |
5081 | msgid "%%(objecttype) does not take arguments" | |
5082 | msgstr "%%(objecttype) 不带参数" | |
5083 | ||
a6cd2cc4 | 5084 | #: ref-filter.c:269 |
06991777 JX |
5085 | #, c-format |
5086 | msgid "unrecognized %%(objectsize) argument: %s" | |
5087 | msgstr "未能识别的 %%(objectsize) 参数:%s" | |
5088 | ||
a6cd2cc4 | 5089 | #: ref-filter.c:277 |
c1ac5258 | 5090 | #, c-format |
06991777 JX |
5091 | msgid "%%(deltabase) does not take arguments" |
5092 | msgstr "%%(deltabase) 不带参数" | |
c1ac5258 | 5093 | |
a6cd2cc4 | 5094 | #: ref-filter.c:289 |
90314792 | 5095 | #, c-format |
a0b6b246 JX |
5096 | msgid "%%(body) does not take arguments" |
5097 | msgstr "%%(body) 不带参数" | |
90314792 | 5098 | |
a6cd2cc4 | 5099 | #: ref-filter.c:298 |
a0b6b246 JX |
5100 | #, c-format |
5101 | msgid "%%(subject) does not take arguments" | |
5102 | msgstr "%%(subject) 不带参数" | |
90314792 | 5103 | |
a6cd2cc4 | 5104 | #: ref-filter.c:320 |
1a79b2f1 | 5105 | #, c-format |
6937cb4e JX |
5106 | msgid "unknown %%(trailers) argument: %s" |
5107 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 5108 | |
a6cd2cc4 | 5109 | #: ref-filter.c:349 |
a0b6b246 JX |
5110 | #, c-format |
5111 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 5112 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 5113 | |
a6cd2cc4 | 5114 | #: ref-filter.c:351 |
a0b6b246 JX |
5115 | #, c-format |
5116 | msgid "unrecognized %%(contents) argument: %s" | |
5117 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 5118 | |
a6cd2cc4 | 5119 | #: ref-filter.c:366 |
87cb7997 JX |
5120 | #, c-format |
5121 | msgid "positive value expected objectname:short=%s" | |
5122 | msgstr "期望一个正数 objectname:short=%s" | |
5123 | ||
a6cd2cc4 | 5124 | #: ref-filter.c:370 |
a0b6b246 JX |
5125 | #, c-format |
5126 | msgid "unrecognized %%(objectname) argument: %s" | |
5127 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 5128 | |
a6cd2cc4 | 5129 | #: ref-filter.c:400 |
a0b6b246 JX |
5130 | #, c-format |
5131 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 5132 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 5133 | |
a6cd2cc4 | 5134 | #: ref-filter.c:412 |
5c57d762 | 5135 | #, c-format |
a0b6b246 JX |
5136 | msgid "unrecognized position:%s" |
5137 | msgstr "未能识别的位置:%s" | |
5c57d762 | 5138 | |
a6cd2cc4 | 5139 | #: ref-filter.c:419 |
1b7f4a34 | 5140 | #, c-format |
a0b6b246 JX |
5141 | msgid "unrecognized width:%s" |
5142 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 5143 | |
a6cd2cc4 | 5144 | #: ref-filter.c:428 |
1b7f4a34 | 5145 | #, c-format |
a0b6b246 JX |
5146 | msgid "unrecognized %%(align) argument: %s" |
5147 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 5148 | |
a6cd2cc4 | 5149 | #: ref-filter.c:436 |
1b7f4a34 | 5150 | #, c-format |
a0b6b246 JX |
5151 | msgid "positive width expected with the %%(align) atom" |
5152 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 5153 | |
a6cd2cc4 | 5154 | #: ref-filter.c:454 |
87cb7997 JX |
5155 | #, c-format |
5156 | msgid "unrecognized %%(if) argument: %s" | |
5157 | msgstr "未能识别的 %%(if) 参数:%s" | |
5158 | ||
a6cd2cc4 | 5159 | #: ref-filter.c:556 |
07432cef | 5160 | #, c-format |
a0b6b246 | 5161 | msgid "malformed field name: %.*s" |
fd8cb379 | 5162 | msgstr "格式错误的字段名:%.*s" |
ef317cd5 | 5163 | |
a6cd2cc4 | 5164 | #: ref-filter.c:583 |
a0b6b246 JX |
5165 | #, c-format |
5166 | msgid "unknown field name: %.*s" | |
5167 | msgstr "未知的字段名:%.*s" | |
220c313c | 5168 | |
a6cd2cc4 | 5169 | #: ref-filter.c:587 |
4c27fcb5 JX |
5170 | #, c-format |
5171 | msgid "" | |
5172 | "not a git repository, but the field '%.*s' requires access to object data" | |
5173 | msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据" | |
5174 | ||
a6cd2cc4 | 5175 | #: ref-filter.c:711 |
87cb7997 JX |
5176 | #, c-format |
5177 | msgid "format: %%(if) atom used without a %%(then) atom" | |
5178 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
5179 | ||
a6cd2cc4 | 5180 | #: ref-filter.c:774 |
87cb7997 JX |
5181 | #, c-format |
5182 | msgid "format: %%(then) atom used without an %%(if) atom" | |
5183 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
5184 | ||
a6cd2cc4 | 5185 | #: ref-filter.c:776 |
87cb7997 JX |
5186 | #, c-format |
5187 | msgid "format: %%(then) atom used more than once" | |
5188 | msgstr "格式:%%(then) 元素用了多次" | |
5189 | ||
a6cd2cc4 | 5190 | #: ref-filter.c:778 |
87cb7997 JX |
5191 | #, c-format |
5192 | msgid "format: %%(then) atom used after %%(else)" | |
5193 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
5194 | ||
a6cd2cc4 | 5195 | #: ref-filter.c:806 |
87cb7997 JX |
5196 | #, c-format |
5197 | msgid "format: %%(else) atom used without an %%(if) atom" | |
5198 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
5199 | ||
a6cd2cc4 | 5200 | #: ref-filter.c:808 |
87cb7997 JX |
5201 | #, c-format |
5202 | msgid "format: %%(else) atom used without a %%(then) atom" | |
5203 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
5204 | ||
a6cd2cc4 | 5205 | #: ref-filter.c:810 |
87cb7997 JX |
5206 | #, c-format |
5207 | msgid "format: %%(else) atom used more than once" | |
5208 | msgstr "格式:%%(else) 元素用了多次" | |
5209 | ||
a6cd2cc4 | 5210 | #: ref-filter.c:825 |
7aea43ff | 5211 | #, c-format |
a0b6b246 JX |
5212 | msgid "format: %%(end) atom used without corresponding atom" |
5213 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 5214 | |
a6cd2cc4 | 5215 | #: ref-filter.c:882 |
7aea43ff | 5216 | #, c-format |
a0b6b246 | 5217 | msgid "malformed format string %s" |
fd8cb379 | 5218 | msgstr "错误的格式化字符串 %s" |
7aea43ff | 5219 | |
a6cd2cc4 | 5220 | #: ref-filter.c:1485 |
87cb7997 | 5221 | #, c-format |
a6cd2cc4 JX |
5222 | msgid "no branch, rebasing %s" |
5223 | msgstr "非分支,正变基 %s" | |
c04f5ac3 | 5224 | |
a6cd2cc4 | 5225 | #: ref-filter.c:1488 |
c04f5ac3 | 5226 | #, c-format |
a6cd2cc4 JX |
5227 | msgid "no branch, rebasing detached HEAD %s" |
5228 | msgstr "非分支,正变基分离头指针 %s" | |
c04f5ac3 | 5229 | |
a6cd2cc4 | 5230 | #: ref-filter.c:1491 |
a0b6b246 | 5231 | #, c-format |
a6cd2cc4 JX |
5232 | msgid "no branch, bisect started on %s" |
5233 | msgstr "非分支,二分查找开始于 %s" | |
6792b93b | 5234 | |
a6cd2cc4 JX |
5235 | #: ref-filter.c:1501 |
5236 | msgid "no branch" | |
5237 | msgstr "非分支" | |
87cb7997 | 5238 | |
a6cd2cc4 | 5239 | #: ref-filter.c:1537 ref-filter.c:1743 |
a0b6b246 JX |
5240 | #, c-format |
5241 | msgid "missing object %s for %s" | |
5242 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 5243 | |
a6cd2cc4 | 5244 | #: ref-filter.c:1547 |
a0b6b246 JX |
5245 | #, c-format |
5246 | msgid "parse_object_buffer failed on %s for %s" | |
5247 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 5248 | |
a6cd2cc4 | 5249 | #: ref-filter.c:1998 |
a0b6b246 JX |
5250 | #, c-format |
5251 | msgid "malformed object at '%s'" | |
fd8cb379 | 5252 | msgstr "格式错误的对象 '%s'" |
c04f5ac3 | 5253 | |
a6cd2cc4 | 5254 | #: ref-filter.c:2087 |
a0b6b246 JX |
5255 | #, c-format |
5256 | msgid "ignoring ref with broken name %s" | |
5257 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 5258 | |
a6cd2cc4 | 5259 | #: ref-filter.c:2382 |
a0b6b246 JX |
5260 | #, c-format |
5261 | msgid "format: %%(end) atom missing" | |
5262 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 5263 | |
a6cd2cc4 | 5264 | #: ref-filter.c:2482 |
06991777 JX |
5265 | #, c-format |
5266 | msgid "option `%s' is incompatible with --merged" | |
5267 | msgstr "选项 `%s' 和 --merged 不兼容" | |
5268 | ||
a6cd2cc4 | 5269 | #: ref-filter.c:2485 |
06991777 JX |
5270 | #, c-format |
5271 | msgid "option `%s' is incompatible with --no-merged" | |
5272 | msgstr "选项 `%s' 和 --no-merged 不兼容" | |
5273 | ||
a6cd2cc4 | 5274 | #: ref-filter.c:2495 |
a0b6b246 JX |
5275 | #, c-format |
5276 | msgid "malformed object name %s" | |
fd8cb379 | 5277 | msgstr "格式错误的对象名 %s" |
c04f5ac3 | 5278 | |
a6cd2cc4 | 5279 | #: ref-filter.c:2500 |
06991777 JX |
5280 | #, c-format |
5281 | msgid "option `%s' must point to a commit" | |
5282 | msgstr "选项 `%s' 必须指向一个提交" | |
5283 | ||
5284 | #: remote.c:363 | |
5285 | #, c-format | |
5286 | msgid "config remote shorthand cannot begin with '/': %s" | |
5b533632 | 5287 | msgstr "配置的远程短名称不能以 '/' 开始:%s" |
06991777 JX |
5288 | |
5289 | #: remote.c:410 | |
5290 | msgid "more than one receivepack given, using the first" | |
5291 | msgstr "提供了一个以上的 receivepack,使用第一个" | |
5292 | ||
5293 | #: remote.c:418 | |
5294 | msgid "more than one uploadpack given, using the first" | |
5295 | msgstr "提供了一个以上的 uploadpack,使用第一个" | |
5296 | ||
5297 | #: remote.c:608 | |
a0b6b246 JX |
5298 | #, c-format |
5299 | msgid "Cannot fetch both %s and %s to %s" | |
5300 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 5301 | |
06991777 | 5302 | #: remote.c:612 |
c04f5ac3 | 5303 | #, c-format |
a0b6b246 JX |
5304 | msgid "%s usually tracks %s, not %s" |
5305 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 5306 | |
06991777 | 5307 | #: remote.c:616 |
a0b6b246 JX |
5308 | #, c-format |
5309 | msgid "%s tracks both %s and %s" | |
5310 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 5311 | |
06991777 JX |
5312 | #: remote.c:684 |
5313 | #, c-format | |
5314 | msgid "key '%s' of pattern had no '*'" | |
5315 | msgstr "模式的键 '%s' 没有 '*'" | |
5316 | ||
5317 | #: remote.c:694 | |
5318 | #, c-format | |
5319 | msgid "value '%s' of pattern has no '*'" | |
5320 | msgstr "模式的值 '%s' 没有 '*'" | |
5321 | ||
06991777 JX |
5322 | #: remote.c:1000 |
5323 | #, c-format | |
5324 | msgid "src refspec %s does not match any" | |
5325 | msgstr "源引用表达式 %s 没有匹配" | |
5326 | ||
5327 | #: remote.c:1005 | |
5328 | #, c-format | |
5329 | msgid "src refspec %s matches more than one" | |
5330 | msgstr "源引用表达式 %s 匹配超过一个" | |
5331 | ||
5332 | #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push | |
5333 | #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is | |
5334 | #. the <src>. | |
5335 | #. | |
5336 | #: remote.c:1020 | |
5337 | #, c-format | |
5338 | msgid "" | |
5339 | "The destination you provided is not a full refname (i.e.,\n" | |
5340 | "starting with \"refs/\"). We tried to guess what you meant by:\n" | |
5341 | "\n" | |
5342 | "- Looking for a ref that matches '%s' on the remote side.\n" | |
5343 | "- Checking if the <src> being pushed ('%s')\n" | |
5344 | " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" | |
5345 | " refs/{heads,tags}/ prefix on the remote side.\n" | |
5346 | "\n" | |
5347 | "Neither worked, so we gave up. You must fully qualify the ref." | |
5348 | msgstr "" | |
5349 | "您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n" | |
5350 | "试着猜测您的想法:\n" | |
5351 | "\n" | |
5352 | "- 在远端查询和 '%s' 匹配的引用。\n" | |
5353 | "- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n" | |
5354 | " 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n" | |
5355 | "\n" | |
5356 | "都不行,所以我们已放弃。您必须给出完整的引用。" | |
5357 | ||
5358 | #: remote.c:1040 | |
5359 | #, c-format | |
5360 | msgid "" | |
5361 | "The <src> part of the refspec is a commit object.\n" | |
5362 | "Did you mean to create a new branch by pushing to\n" | |
5363 | "'%s:refs/heads/%s'?" | |
5364 | msgstr "" | |
5365 | "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" | |
5366 | "'%s:refs/heads/%s' 推送么?" | |
5367 | ||
5368 | #: remote.c:1045 | |
5369 | #, c-format | |
5370 | msgid "" | |
5371 | "The <src> part of the refspec is a tag object.\n" | |
5372 | "Did you mean to create a new tag by pushing to\n" | |
5373 | "'%s:refs/tags/%s'?" | |
5374 | msgstr "" | |
5375 | "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" | |
5376 | "'%s:refs/tags/%s' 推送么?" | |
5377 | ||
5378 | #: remote.c:1050 | |
5379 | #, c-format | |
5380 | msgid "" | |
5381 | "The <src> part of the refspec is a tree object.\n" | |
5382 | "Did you mean to tag a new tree by pushing to\n" | |
5383 | "'%s:refs/tags/%s'?" | |
5384 | msgstr "" | |
5385 | "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" | |
5386 | "'%s:refs/tags/%s' 推送么?" | |
5387 | ||
5388 | #: remote.c:1055 | |
5389 | #, c-format | |
5390 | msgid "" | |
5391 | "The <src> part of the refspec is a blob object.\n" | |
5392 | "Did you mean to tag a new blob by pushing to\n" | |
5393 | "'%s:refs/tags/%s'?" | |
5394 | msgstr "" | |
5395 | "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" | |
5396 | "'%s:refs/tags/%s' 推送么?" | |
5397 | ||
5398 | #: remote.c:1091 | |
5399 | #, c-format | |
5400 | msgid "%s cannot be resolved to branch" | |
5401 | msgstr "%s 无法被解析为分支" | |
5402 | ||
5403 | #: remote.c:1102 | |
5404 | #, c-format | |
5405 | msgid "unable to delete '%s': remote ref does not exist" | |
8e4e0555 | 5406 | msgstr "无法删除 '%s':远程引用不存在" |
06991777 JX |
5407 | |
5408 | #: remote.c:1114 | |
5409 | #, c-format | |
5410 | msgid "dst refspec %s matches more than one" | |
5411 | msgstr "目标引用表达式 %s 匹配超过一个" | |
5412 | ||
5413 | #: remote.c:1121 | |
5414 | #, c-format | |
5415 | msgid "dst ref %s receives from more than one src" | |
5416 | msgstr "目标引用 %s 接收超过一个源" | |
c04f5ac3 | 5417 | |
06991777 | 5418 | #: remote.c:1624 remote.c:1725 |
a0b6b246 JX |
5419 | msgid "HEAD does not point to a branch" |
5420 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 5421 | |
06991777 | 5422 | #: remote.c:1633 |
a0b6b246 JX |
5423 | #, c-format |
5424 | msgid "no such branch: '%s'" | |
5425 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 5426 | |
06991777 | 5427 | #: remote.c:1636 |
a0b6b246 JX |
5428 | #, c-format |
5429 | msgid "no upstream configured for branch '%s'" | |
5430 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 5431 | |
06991777 | 5432 | #: remote.c:1642 |
a0b6b246 JX |
5433 | #, c-format |
5434 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
5435 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 5436 | |
06991777 | 5437 | #: remote.c:1657 |
a0b6b246 JX |
5438 | #, c-format |
5439 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
5440 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 5441 | |
06991777 | 5442 | #: remote.c:1669 |
a0b6b246 JX |
5443 | #, c-format |
5444 | msgid "branch '%s' has no remote for pushing" | |
5445 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 5446 | |
06991777 | 5447 | #: remote.c:1679 |
a0b6b246 JX |
5448 | #, c-format |
5449 | msgid "push refspecs for '%s' do not include '%s'" | |
5450 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 5451 | |
06991777 | 5452 | #: remote.c:1692 |
a0b6b246 JX |
5453 | msgid "push has no destination (push.default is 'nothing')" |
5454 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 5455 | |
06991777 | 5456 | #: remote.c:1714 |
a0b6b246 JX |
5457 | msgid "cannot resolve 'simple' push to a single destination" |
5458 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 5459 | |
06991777 JX |
5460 | #: remote.c:1840 |
5461 | #, c-format | |
5462 | msgid "couldn't find remote ref %s" | |
8e4e0555 | 5463 | msgstr "无法找到远程引用 %s" |
06991777 JX |
5464 | |
5465 | #: remote.c:1853 | |
5466 | #, c-format | |
5467 | msgid "* Ignoring funny ref '%s' locally" | |
5468 | msgstr "* 在本地忽略可笑的引用 '%s'" | |
5469 | ||
d46c5519 | 5470 | #: remote.c:2016 |
a0b6b246 JX |
5471 | #, c-format |
5472 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
5473 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 5474 | |
d46c5519 | 5475 | #: remote.c:2020 |
a0b6b246 JX |
5476 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
5477 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 5478 | |
d46c5519 | 5479 | #: remote.c:2023 |
a0b6b246 | 5480 | #, c-format |
6937cb4e | 5481 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 5482 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 5483 | |
d46c5519 | 5484 | #: remote.c:2027 |
31e5e17b JX |
5485 | #, c-format |
5486 | msgid "Your branch and '%s' refer to different commits.\n" | |
5487 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
5488 | ||
d46c5519 | 5489 | #: remote.c:2030 |
31e5e17b JX |
5490 | #, c-format |
5491 | msgid " (use \"%s\" for details)\n" | |
5492 | msgstr " (使用 \"%s\" 查看详情)\n" | |
5493 | ||
d46c5519 | 5494 | #: remote.c:2034 |
a0b6b246 JX |
5495 | #, c-format |
5496 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
5497 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
5498 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5499 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 5500 | |
d46c5519 | 5501 | #: remote.c:2040 |
a0b6b246 JX |
5502 | msgid " (use \"git push\" to publish your local commits)\n" |
5503 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 5504 | |
d46c5519 | 5505 | #: remote.c:2043 |
a0b6b246 JX |
5506 | #, c-format |
5507 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
5508 | msgid_plural "" | |
5509 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
5510 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
5511 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 5512 | |
a0b6b246 | 5513 | # 译者:注意保持前导空格 |
d46c5519 | 5514 | #: remote.c:2051 |
a0b6b246 JX |
5515 | msgid " (use \"git pull\" to update your local branch)\n" |
5516 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 5517 | |
d46c5519 | 5518 | #: remote.c:2054 |
a0b6b246 JX |
5519 | #, c-format |
5520 | msgid "" | |
5521 | "Your branch and '%s' have diverged,\n" | |
5522 | "and have %d and %d different commit each, respectively.\n" | |
5523 | msgid_plural "" | |
5524 | "Your branch and '%s' have diverged,\n" | |
5525 | "and have %d and %d different commits each, respectively.\n" | |
5526 | msgstr[0] "" | |
5527 | "您的分支和 '%s' 出现了偏离,\n" | |
5528 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
5529 | msgstr[1] "" | |
5530 | "您的分支和 '%s' 出现了偏离,\n" | |
5531 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 5532 | |
a0b6b246 | 5533 | # 译者:注意保持前导空格 |
d46c5519 | 5534 | #: remote.c:2064 |
a0b6b246 JX |
5535 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
5536 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 5537 | |
d46c5519 | 5538 | #: remote.c:2247 |
06991777 JX |
5539 | #, c-format |
5540 | msgid "cannot parse expected object name '%s'" | |
5541 | msgstr "无法解析期望的对象名 '%s'" | |
5542 | ||
4c27fcb5 | 5543 | #: replace-object.c:21 |
c1ac5258 JX |
5544 | #, c-format |
5545 | msgid "bad replace ref name: %s" | |
5546 | msgstr "错误的替换引用名称:%s" | |
5547 | ||
4c27fcb5 | 5548 | #: replace-object.c:30 |
c1ac5258 JX |
5549 | #, c-format |
5550 | msgid "duplicate replace ref: %s" | |
5551 | msgstr "重复的替换引用:%s" | |
5552 | ||
4c27fcb5 | 5553 | #: replace-object.c:73 |
c1ac5258 JX |
5554 | #, c-format |
5555 | msgid "replace depth too high for object %s" | |
5556 | msgstr "对象 %s 的替换层级太深" | |
5557 | ||
4c27fcb5 JX |
5558 | #: rerere.c:217 rerere.c:226 rerere.c:229 |
5559 | msgid "corrupt MERGE_RR" | |
5560 | msgstr "损坏的 MERGE_RR" | |
5561 | ||
5562 | #: rerere.c:264 rerere.c:269 | |
5563 | msgid "unable to write rerere record" | |
5564 | msgstr "无法写入 rerere 记录" | |
cfff71a9 | 5565 | |
4c27fcb5 JX |
5566 | #: rerere.c:495 |
5567 | #, c-format | |
5568 | msgid "there were errors while writing '%s' (%s)" | |
5569 | msgstr "写入 '%s' (%s) 时出错" | |
6792b93b | 5570 | |
4c27fcb5 JX |
5571 | #: rerere.c:498 |
5572 | #, c-format | |
5573 | msgid "failed to flush '%s'" | |
5574 | msgstr "刷新 '%s' 失败" | |
5c57d762 | 5575 | |
4c27fcb5 | 5576 | #: rerere.c:503 rerere.c:1039 |
5809aa05 | 5577 | #, c-format |
4c27fcb5 JX |
5578 | msgid "could not parse conflict hunks in '%s'" |
5579 | msgstr "不能解析 '%s' 中的冲突块" | |
5809aa05 | 5580 | |
4c27fcb5 JX |
5581 | #: rerere.c:684 |
5582 | #, c-format | |
5583 | msgid "failed utime() on '%s'" | |
5584 | msgstr "在 '%s' 上调用 utime() 失败" | |
31e5e17b | 5585 | |
4c27fcb5 | 5586 | #: rerere.c:694 |
87cb7997 | 5587 | #, c-format |
4c27fcb5 JX |
5588 | msgid "writing '%s' failed" |
5589 | msgstr "写入 '%s' 失败" | |
87cb7997 | 5590 | |
4c27fcb5 | 5591 | #: rerere.c:714 |
87cb7997 | 5592 | #, c-format |
4c27fcb5 JX |
5593 | msgid "Staged '%s' using previous resolution." |
5594 | msgstr "使用之前的解决方案暂存 '%s'。" | |
87cb7997 | 5595 | |
4c27fcb5 JX |
5596 | #: rerere.c:753 |
5597 | #, c-format | |
5598 | msgid "Recorded resolution for '%s'." | |
5599 | msgstr "已记录 '%s' 的解决方案。" | |
6792b93b | 5600 | |
4c27fcb5 JX |
5601 | #: rerere.c:788 |
5602 | #, c-format | |
5603 | msgid "Resolved '%s' using previous resolution." | |
5604 | msgstr "使用之前的解决方案解决 '%s'。" | |
5605 | ||
5606 | #: rerere.c:803 | |
5607 | #, c-format | |
5608 | msgid "cannot unlink stray '%s'" | |
5609 | msgstr "不能删除 stray '%s'" | |
5610 | ||
5611 | #: rerere.c:807 | |
5612 | #, c-format | |
5613 | msgid "Recorded preimage for '%s'" | |
5614 | msgstr "为 '%s' 记录 preimage" | |
5615 | ||
a6cd2cc4 JX |
5616 | #: rerere.c:881 submodule.c:2023 builtin/log.c:1773 |
5617 | #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 | |
4c27fcb5 JX |
5618 | #, c-format |
5619 | msgid "could not create directory '%s'" | |
5620 | msgstr "不能创建目录 '%s'" | |
5621 | ||
5622 | #: rerere.c:1057 | |
5623 | #, c-format | |
5624 | msgid "failed to update conflicted state in '%s'" | |
5625 | msgstr "更新 '%s' 中的冲突状态失败" | |
5626 | ||
5627 | #: rerere.c:1068 rerere.c:1075 | |
5628 | #, c-format | |
5629 | msgid "no remembered resolution for '%s'" | |
5630 | msgstr "没有为 '%s' 记忆的解决方案" | |
5631 | ||
5632 | #: rerere.c:1077 | |
5633 | #, c-format | |
5634 | msgid "cannot unlink '%s'" | |
5635 | msgstr "不能删除 '%s'" | |
5636 | ||
5637 | #: rerere.c:1087 | |
5638 | #, c-format | |
5639 | msgid "Updated preimage for '%s'" | |
5640 | msgstr "已为 '%s' 更新 preimage" | |
5641 | ||
5642 | #: rerere.c:1096 | |
5643 | #, c-format | |
5644 | msgid "Forgot resolution for '%s'\n" | |
5645 | msgstr "忘记 '%s' 的解决方案\n" | |
5646 | ||
5647 | #: rerere.c:1199 | |
5648 | msgid "unable to open rr-cache directory" | |
5649 | msgstr "不能打开 rr-cache 目录" | |
5650 | ||
a6cd2cc4 | 5651 | #: revision.c:2507 |
4c27fcb5 JX |
5652 | msgid "your current branch appears to be broken" |
5653 | msgstr "您的当前分支好像被损坏" | |
5654 | ||
a6cd2cc4 | 5655 | #: revision.c:2510 |
4c27fcb5 JX |
5656 | #, c-format |
5657 | msgid "your current branch '%s' does not have any commits yet" | |
5658 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
5659 | ||
a6cd2cc4 | 5660 | #: revision.c:2710 |
4c27fcb5 JX |
5661 | msgid "--first-parent is incompatible with --bisect" |
5662 | msgstr "--first-parent 与 --bisect 不兼容" | |
5663 | ||
a6cd2cc4 | 5664 | #: revision.c:2714 |
d46c5519 JX |
5665 | msgid "-L does not yet support diff formats besides -p and -s" |
5666 | msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" | |
5667 | ||
5668 | #: run-command.c:763 | |
4c27fcb5 JX |
5669 | msgid "open /dev/null failed" |
5670 | msgstr "不能打开 /dev/null" | |
5671 | ||
d46c5519 | 5672 | #: run-command.c:1269 |
4c27fcb5 JX |
5673 | #, c-format |
5674 | msgid "cannot create async thread: %s" | |
5675 | msgstr "不能创建 async 线程:%s" | |
5676 | ||
d46c5519 | 5677 | #: run-command.c:1333 |
4c27fcb5 JX |
5678 | #, c-format |
5679 | msgid "" | |
5680 | "The '%s' hook was ignored because it's not set as executable.\n" | |
5681 | "You can disable this warning with `git config advice.ignoredHook false`." | |
5682 | msgstr "" | |
5683 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
5684 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
5685 | ||
06991777 | 5686 | #: send-pack.c:141 |
4c27fcb5 JX |
5687 | msgid "unexpected flush packet while reading remote unpack status" |
5688 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
5689 | ||
06991777 | 5690 | #: send-pack.c:143 |
4c27fcb5 JX |
5691 | #, c-format |
5692 | msgid "unable to parse remote unpack status: %s" | |
5693 | msgstr "不能解析远程解包状态:%s" | |
5694 | ||
06991777 | 5695 | #: send-pack.c:145 |
4c27fcb5 JX |
5696 | #, c-format |
5697 | msgid "remote unpack failed: %s" | |
5698 | msgstr "远程解包失败:%s" | |
5699 | ||
06991777 | 5700 | #: send-pack.c:306 |
4c27fcb5 JX |
5701 | msgid "failed to sign the push certificate" |
5702 | msgstr "为推送证书签名失败" | |
5703 | ||
06991777 | 5704 | #: send-pack.c:420 |
a0b6b246 JX |
5705 | msgid "the receiving end does not support --signed push" |
5706 | msgstr "接收端不支持签名推送" | |
6792b93b | 5707 | |
06991777 | 5708 | #: send-pack.c:422 |
a0b6b246 JX |
5709 | msgid "" |
5710 | "not sending a push certificate since the receiving end does not support --" | |
5711 | "signed push" | |
5712 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 5713 | |
06991777 | 5714 | #: send-pack.c:434 |
a0b6b246 JX |
5715 | msgid "the receiving end does not support --atomic push" |
5716 | msgstr "接收端不支持原子推送" | |
6792b93b | 5717 | |
06991777 | 5718 | #: send-pack.c:439 |
a0b6b246 JX |
5719 | msgid "the receiving end does not support push options" |
5720 | msgstr "接收端不支持推送选项" | |
6792b93b | 5721 | |
d46c5519 | 5722 | #: sequencer.c:187 |
31e5e17b JX |
5723 | #, c-format |
5724 | msgid "invalid commit message cleanup mode '%s'" | |
5725 | msgstr "无效的提交信息清理模式 '%s'" | |
5726 | ||
d46c5519 | 5727 | #: sequencer.c:292 |
fd8cb379 JX |
5728 | #, c-format |
5729 | msgid "could not delete '%s'" | |
5730 | msgstr "无法删除 '%s'" | |
5731 | ||
a6cd2cc4 JX |
5732 | #: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 |
5733 | #, c-format | |
5734 | msgid "could not remove '%s'" | |
5735 | msgstr "无法删除 '%s'" | |
5736 | ||
5737 | #: sequencer.c:321 | |
a0b6b246 JX |
5738 | msgid "revert" |
5739 | msgstr "还原" | |
6792b93b | 5740 | |
a6cd2cc4 | 5741 | #: sequencer.c:323 |
a0b6b246 JX |
5742 | msgid "cherry-pick" |
5743 | msgstr "拣选" | |
5744 | ||
a6cd2cc4 | 5745 | #: sequencer.c:325 |
1a79b2f1 JX |
5746 | msgid "rebase -i" |
5747 | msgstr "rebase -i" | |
5748 | ||
a6cd2cc4 | 5749 | #: sequencer.c:327 |
1a79b2f1 | 5750 | #, c-format |
c1ac5258 | 5751 | msgid "unknown action: %d" |
1a79b2f1 JX |
5752 | msgstr "未知动作:%d" |
5753 | ||
a6cd2cc4 | 5754 | #: sequencer.c:385 |
a0b6b246 JX |
5755 | msgid "" |
5756 | "after resolving the conflicts, mark the corrected paths\n" | |
5757 | "with 'git add <paths>' or 'git rm <paths>'" | |
5758 | msgstr "" | |
5759 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
5760 | "命令标记修正后的文件" | |
5761 | ||
a6cd2cc4 | 5762 | #: sequencer.c:388 |
a0b6b246 JX |
5763 | msgid "" |
5764 | "after resolving the conflicts, mark the corrected paths\n" | |
5765 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
5766 | "and commit the result with 'git commit'" | |
5767 | msgstr "" | |
5768 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
5769 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 5770 | |
a6cd2cc4 | 5771 | #: sequencer.c:401 sequencer.c:2909 |
1b7f4a34 | 5772 | #, c-format |
a0b6b246 JX |
5773 | msgid "could not lock '%s'" |
5774 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 5775 | |
a6cd2cc4 | 5776 | #: sequencer.c:408 |
a0b6b246 | 5777 | #, c-format |
72351d7d | 5778 | msgid "could not write eol to '%s'" |
a0b6b246 | 5779 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 5780 | |
a6cd2cc4 JX |
5781 | #: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 |
5782 | #: sequencer.c:3192 | |
1b7f4a34 | 5783 | #, c-format |
31e5e17b JX |
5784 | msgid "failed to finalize '%s'" |
5785 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 5786 | |
a6cd2cc4 JX |
5787 | #: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 |
5788 | #: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 | |
5789 | #: builtin/merge.c:1112 builtin/rebase.c:567 | |
a0b6b246 JX |
5790 | #, c-format |
5791 | msgid "could not read '%s'" | |
5792 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 5793 | |
a6cd2cc4 | 5794 | #: sequencer.c:462 |
63af42fe | 5795 | #, c-format |
a0b6b246 JX |
5796 | msgid "your local changes would be overwritten by %s." |
5797 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 5798 | |
a6cd2cc4 | 5799 | #: sequencer.c:466 |
a0b6b246 | 5800 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 5801 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 5802 | |
a6cd2cc4 | 5803 | #: sequencer.c:498 |
a0b6b246 JX |
5804 | #, c-format |
5805 | msgid "%s: fast-forward" | |
5806 | msgstr "%s:快进" | |
6792b93b | 5807 | |
a6cd2cc4 | 5808 | #: sequencer.c:537 builtin/tag.c:565 |
d46c5519 JX |
5809 | #, c-format |
5810 | msgid "Invalid cleanup mode %s" | |
5811 | msgstr "无效的清理模式 %s" | |
5812 | ||
1a79b2f1 | 5813 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
a4f16749 | 5814 | #. "rebase -i". |
1a79b2f1 | 5815 | #. |
a6cd2cc4 | 5816 | #: sequencer.c:632 |
a0b6b246 JX |
5817 | #, c-format |
5818 | msgid "%s: Unable to write new index file" | |
5819 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 5820 | |
a6cd2cc4 | 5821 | #: sequencer.c:649 |
5809aa05 JX |
5822 | msgid "unable to update cache tree" |
5823 | msgstr "不能更新缓存树" | |
6792b93b | 5824 | |
a6cd2cc4 | 5825 | #: sequencer.c:663 |
fd8cb379 JX |
5826 | msgid "could not resolve HEAD commit" |
5827 | msgstr "不能解析 HEAD 提交" | |
5828 | ||
a6cd2cc4 | 5829 | #: sequencer.c:743 |
4c27fcb5 JX |
5830 | #, c-format |
5831 | msgid "no key present in '%.*s'" | |
5832 | msgstr "在 '%.*s' 中没有 key" | |
5833 | ||
a6cd2cc4 | 5834 | #: sequencer.c:754 |
c1ac5258 | 5835 | #, c-format |
4c27fcb5 JX |
5836 | msgid "unable to dequote value of '%s'" |
5837 | msgstr "无法为 '%s' 的值去引号" | |
c1ac5258 | 5838 | |
a6cd2cc4 JX |
5839 | #: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 |
5840 | #: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 | |
c1ac5258 | 5841 | #, c-format |
4c27fcb5 JX |
5842 | msgid "could not open '%s' for reading" |
5843 | msgstr "无法打开 '%s' 进行读取" | |
5844 | ||
a6cd2cc4 | 5845 | #: sequencer.c:801 |
4c27fcb5 JX |
5846 | msgid "'GIT_AUTHOR_NAME' already given" |
5847 | msgstr "已经给出 'GIT_AUTHOR_NAME'" | |
c1ac5258 | 5848 | |
a6cd2cc4 | 5849 | #: sequencer.c:806 |
4c27fcb5 JX |
5850 | msgid "'GIT_AUTHOR_EMAIL' already given" |
5851 | msgstr "已经给出 'GIT_AUTHOR_EMAIL'" | |
5852 | ||
a6cd2cc4 | 5853 | #: sequencer.c:811 |
4c27fcb5 JX |
5854 | msgid "'GIT_AUTHOR_DATE' already given" |
5855 | msgstr "已经给出 'GIT_AUTHOR_DATE'" | |
5856 | ||
a6cd2cc4 | 5857 | #: sequencer.c:815 |
4c27fcb5 JX |
5858 | #, c-format |
5859 | msgid "unknown variable '%s'" | |
5860 | msgstr "未知变量 '%s'" | |
5861 | ||
a6cd2cc4 | 5862 | #: sequencer.c:820 |
4c27fcb5 JX |
5863 | msgid "missing 'GIT_AUTHOR_NAME'" |
5864 | msgstr "缺少 'GIT_AUTHOR_NAME'" | |
5865 | ||
a6cd2cc4 | 5866 | #: sequencer.c:822 |
4c27fcb5 JX |
5867 | msgid "missing 'GIT_AUTHOR_EMAIL'" |
5868 | msgstr "缺少 'GIT_AUTHOR_EMAIL'" | |
5869 | ||
a6cd2cc4 | 5870 | #: sequencer.c:824 |
4c27fcb5 JX |
5871 | msgid "missing 'GIT_AUTHOR_DATE'" |
5872 | msgstr "缺少 'GIT_AUTHOR_DATE'" | |
5873 | ||
a6cd2cc4 | 5874 | #: sequencer.c:884 |
c1ac5258 JX |
5875 | #, c-format |
5876 | msgid "invalid date format '%s' in '%s'" | |
5877 | msgstr "'%2$s' 中无效的日期格式 '%1$s'" | |
5878 | ||
a6cd2cc4 | 5879 | #: sequencer.c:901 |
63af42fe JX |
5880 | #, c-format |
5881 | msgid "" | |
a0b6b246 JX |
5882 | "you have staged changes in your working tree\n" |
5883 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
5884 | "\n" | |
5885 | " git commit --amend %s\n" | |
5886 | "\n" | |
5887 | "If they are meant to go into a new commit, run:\n" | |
5888 | "\n" | |
5889 | " git commit %s\n" | |
5890 | "\n" | |
5891 | "In both cases, once you're done, continue with:\n" | |
5892 | "\n" | |
5893 | " git rebase --continue\n" | |
5894 | msgstr "" | |
1a79b2f1 JX |
5895 | "您的工作区中存在已暂存的修改\n" |
5896 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
5897 | "\n" |
5898 | " git commit --amend %s\n" | |
5899 | "\n" | |
29004bbb | 5900 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
5901 | "\n" |
5902 | " git commit %s\n" | |
5903 | "\n" | |
5904 | "无论哪种情况,当您完成提交,继续执行:\n" | |
5905 | "\n" | |
5906 | " git rebase --continue\n" | |
6792b93b | 5907 | |
a6cd2cc4 | 5908 | #: sequencer.c:995 |
fd8cb379 JX |
5909 | msgid "writing root commit" |
5910 | msgstr "写根提交" | |
5911 | ||
a6cd2cc4 | 5912 | #: sequencer.c:1216 |
31e5e17b JX |
5913 | msgid "'prepare-commit-msg' hook failed" |
5914 | msgstr "'prepare-commit-msg' 钩子失败" | |
5915 | ||
a6cd2cc4 | 5916 | #: sequencer.c:1223 |
31e5e17b JX |
5917 | msgid "" |
5918 | "Your name and email address were configured automatically based\n" | |
5919 | "on your username and hostname. Please check that they are accurate.\n" | |
5920 | "You can suppress this message by setting them explicitly. Run the\n" | |
5921 | "following command and follow the instructions in your editor to edit\n" | |
5922 | "your configuration file:\n" | |
5923 | "\n" | |
5924 | " git config --global --edit\n" | |
5925 | "\n" | |
5926 | "After doing this, you may fix the identity used for this commit with:\n" | |
5927 | "\n" | |
5928 | " git commit --amend --reset-author\n" | |
5929 | msgstr "" | |
5930 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
5931 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
5932 | "中编辑您的配置文件:\n" | |
5933 | "\n" | |
5934 | " git config --global --edit\n" | |
5935 | "\n" | |
5936 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
5937 | "\n" | |
5938 | " git commit --amend --reset-author\n" | |
5939 | ||
a6cd2cc4 | 5940 | #: sequencer.c:1236 |
31e5e17b JX |
5941 | msgid "" |
5942 | "Your name and email address were configured automatically based\n" | |
5943 | "on your username and hostname. Please check that they are accurate.\n" | |
5944 | "You can suppress this message by setting them explicitly:\n" | |
5945 | "\n" | |
5946 | " git config --global user.name \"Your Name\"\n" | |
5947 | " git config --global user.email you@example.com\n" | |
5948 | "\n" | |
5949 | "After doing this, you may fix the identity used for this commit with:\n" | |
5950 | "\n" | |
5951 | " git commit --amend --reset-author\n" | |
5952 | msgstr "" | |
5953 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
5954 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
5955 | "\n" | |
5956 | " git config --global user.name \"Your Name\"\n" | |
5957 | " git config --global user.email you@example.com\n" | |
5958 | "\n" | |
5959 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
5960 | "\n" | |
5961 | " git commit --amend --reset-author\n" | |
5962 | ||
a6cd2cc4 | 5963 | #: sequencer.c:1278 |
31e5e17b JX |
5964 | msgid "couldn't look up newly created commit" |
5965 | msgstr "无法找到新创建的提交" | |
5966 | ||
a6cd2cc4 | 5967 | #: sequencer.c:1280 |
31e5e17b JX |
5968 | msgid "could not parse newly created commit" |
5969 | msgstr "不能解析新创建的提交" | |
5970 | ||
a6cd2cc4 | 5971 | #: sequencer.c:1326 |
31e5e17b JX |
5972 | msgid "unable to resolve HEAD after creating commit" |
5973 | msgstr "创建提交后,不能解析 HEAD" | |
5974 | ||
a6cd2cc4 | 5975 | #: sequencer.c:1328 |
31e5e17b JX |
5976 | msgid "detached HEAD" |
5977 | msgstr "分离头指针" | |
5978 | ||
5979 | # 译者:中文字符串拼接,可删除前导空格 | |
a6cd2cc4 | 5980 | #: sequencer.c:1332 |
31e5e17b JX |
5981 | msgid " (root-commit)" |
5982 | msgstr "(根提交)" | |
5983 | ||
a6cd2cc4 | 5984 | #: sequencer.c:1353 |
31e5e17b JX |
5985 | msgid "could not parse HEAD" |
5986 | msgstr "不能解析 HEAD" | |
5987 | ||
a6cd2cc4 | 5988 | #: sequencer.c:1355 |
31e5e17b JX |
5989 | #, c-format |
5990 | msgid "HEAD %s is not a commit!" | |
5991 | msgstr "HEAD %s 不是一个提交!" | |
5992 | ||
a6cd2cc4 | 5993 | #: sequencer.c:1359 builtin/commit.c:1571 |
31e5e17b JX |
5994 | msgid "could not parse HEAD commit" |
5995 | msgstr "不能解析 HEAD 提交" | |
5996 | ||
a6cd2cc4 | 5997 | #: sequencer.c:1411 sequencer.c:2004 |
31e5e17b JX |
5998 | msgid "unable to parse commit author" |
5999 | msgstr "不能解析提交作者" | |
6000 | ||
a6cd2cc4 | 6001 | #: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 |
31e5e17b JX |
6002 | msgid "git write-tree failed to write a tree" |
6003 | msgstr "git write-tree 无法写入树对象" | |
6004 | ||
a6cd2cc4 | 6005 | #: sequencer.c:1438 sequencer.c:1499 |
31e5e17b JX |
6006 | #, c-format |
6007 | msgid "unable to read commit message from '%s'" | |
6008 | msgstr "不能从 '%s' 读取提交说明" | |
6009 | ||
a6cd2cc4 JX |
6010 | #: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 |
6011 | #: builtin/merge.c:903 | |
31e5e17b | 6012 | msgid "failed to write commit object" |
c1ac5258 | 6013 | msgstr "写提交对象失败" |
31e5e17b | 6014 | |
a6cd2cc4 | 6015 | #: sequencer.c:1526 |
a0b6b246 | 6016 | #, c-format |
5809aa05 JX |
6017 | msgid "could not parse commit %s" |
6018 | msgstr "不能解析提交 %s" | |
6792b93b | 6019 | |
a6cd2cc4 | 6020 | #: sequencer.c:1531 |
63af42fe | 6021 | #, c-format |
5809aa05 JX |
6022 | msgid "could not parse parent commit %s" |
6023 | msgstr "不能解析父提交 %s" | |
63af42fe | 6024 | |
a6cd2cc4 | 6025 | #: sequencer.c:1605 sequencer.c:1715 |
c1ac5258 JX |
6026 | #, c-format |
6027 | msgid "unknown command: %d" | |
6028 | msgstr "未知命令:%d" | |
6029 | ||
a6cd2cc4 | 6030 | #: sequencer.c:1662 sequencer.c:1687 |
1a79b2f1 JX |
6031 | #, c-format |
6032 | msgid "This is a combination of %d commits." | |
6033 | msgstr "这是一个 %d 个提交的组合。" | |
6034 | ||
a6cd2cc4 | 6035 | #: sequencer.c:1672 |
1a79b2f1 JX |
6036 | msgid "need a HEAD to fixup" |
6037 | msgstr "需要一个 HEAD 来修复" | |
6038 | ||
a6cd2cc4 | 6039 | #: sequencer.c:1674 sequencer.c:3219 |
1a79b2f1 JX |
6040 | msgid "could not read HEAD" |
6041 | msgstr "不能读取 HEAD" | |
6042 | ||
a6cd2cc4 | 6043 | #: sequencer.c:1676 |
1a79b2f1 JX |
6044 | msgid "could not read HEAD's commit message" |
6045 | msgstr "不能读取 HEAD 的提交说明" | |
6046 | ||
a6cd2cc4 | 6047 | #: sequencer.c:1682 |
1a79b2f1 JX |
6048 | #, c-format |
6049 | msgid "cannot write '%s'" | |
6050 | msgstr "不能写 '%s'" | |
6051 | ||
a6cd2cc4 | 6052 | #: sequencer.c:1689 git-rebase--preserve-merges.sh:496 |
1a79b2f1 JX |
6053 | msgid "This is the 1st commit message:" |
6054 | msgstr "这是第一个提交说明:" | |
6055 | ||
a6cd2cc4 | 6056 | #: sequencer.c:1697 |
1a79b2f1 JX |
6057 | #, c-format |
6058 | msgid "could not read commit message of %s" | |
6059 | msgstr "不能读取 %s 的提交说明" | |
6060 | ||
a6cd2cc4 | 6061 | #: sequencer.c:1704 |
1a79b2f1 JX |
6062 | #, c-format |
6063 | msgid "This is the commit message #%d:" | |
6064 | msgstr "这是提交说明 #%d:" | |
6065 | ||
a6cd2cc4 | 6066 | #: sequencer.c:1710 |
1a79b2f1 JX |
6067 | #, c-format |
6068 | msgid "The commit message #%d will be skipped:" | |
6069 | msgstr "提交说明 #%d 将被跳过:" | |
6070 | ||
a6cd2cc4 | 6071 | #: sequencer.c:1798 |
a0b6b246 JX |
6072 | msgid "your index file is unmerged." |
6073 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 6074 | |
a6cd2cc4 | 6075 | #: sequencer.c:1805 |
fd8cb379 JX |
6076 | msgid "cannot fixup root commit" |
6077 | msgstr "不能修复根提交" | |
6078 | ||
a6cd2cc4 | 6079 | #: sequencer.c:1824 |
a0b6b246 JX |
6080 | #, c-format |
6081 | msgid "commit %s is a merge but no -m option was given." | |
6082 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 6083 | |
a6cd2cc4 | 6084 | #: sequencer.c:1832 sequencer.c:1840 |
a0b6b246 JX |
6085 | #, c-format |
6086 | msgid "commit %s does not have parent %d" | |
6087 | msgstr "提交 %s 没有第 %d 个父提交" | |
6088 | ||
a6cd2cc4 | 6089 | #: sequencer.c:1846 |
1a79b2f1 JX |
6090 | #, c-format |
6091 | msgid "cannot get commit message for %s" | |
6092 | msgstr "不能得到 %s 的提交说明" | |
6093 | ||
a0b6b246 JX |
6094 | #. TRANSLATORS: The first %s will be a "todo" command like |
6095 | #. "revert" or "pick", the second %s a SHA1. | |
a6cd2cc4 | 6096 | #: sequencer.c:1865 |
a0b6b246 JX |
6097 | #, c-format |
6098 | msgid "%s: cannot parse parent commit %s" | |
6099 | msgstr "%s:不能解析父提交 %s" | |
6100 | ||
a6cd2cc4 | 6101 | #: sequencer.c:1930 |
a0b6b246 | 6102 | #, c-format |
1a79b2f1 JX |
6103 | msgid "could not rename '%s' to '%s'" |
6104 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 6105 | |
a6cd2cc4 | 6106 | #: sequencer.c:1985 |
a0b6b246 JX |
6107 | #, c-format |
6108 | msgid "could not revert %s... %s" | |
6109 | msgstr "不能还原 %s... %s" | |
6110 | ||
a6cd2cc4 | 6111 | #: sequencer.c:1986 |
a0b6b246 JX |
6112 | #, c-format |
6113 | msgid "could not apply %s... %s" | |
6114 | msgstr "不能应用 %s... %s" | |
6115 | ||
a6cd2cc4 | 6116 | #: sequencer.c:2045 |
a0b6b246 JX |
6117 | #, c-format |
6118 | msgid "git %s: failed to read the index" | |
6119 | msgstr "git %s:无法读取索引" | |
6120 | ||
a6cd2cc4 | 6121 | #: sequencer.c:2052 |
a0b6b246 JX |
6122 | #, c-format |
6123 | msgid "git %s: failed to refresh the index" | |
6124 | msgstr "git %s:无法刷新索引" | |
6125 | ||
a6cd2cc4 | 6126 | #: sequencer.c:2128 |
5809aa05 JX |
6127 | #, c-format |
6128 | msgid "%s does not accept arguments: '%s'" | |
6129 | msgstr "%s 不接受参数:'%s'" | |
6130 | ||
a6cd2cc4 | 6131 | #: sequencer.c:2137 |
5809aa05 JX |
6132 | #, c-format |
6133 | msgid "missing arguments for %s" | |
6134 | msgstr "缺少 %s 的参数" | |
6135 | ||
a6cd2cc4 | 6136 | #: sequencer.c:2174 |
d46c5519 JX |
6137 | #, c-format |
6138 | msgid "could not parse '%.*s'" | |
6139 | msgstr "无法解析 '%.*s'" | |
6140 | ||
a6cd2cc4 | 6141 | #: sequencer.c:2228 |
a0b6b246 JX |
6142 | #, c-format |
6143 | msgid "invalid line %d: %.*s" | |
6144 | msgstr "无效行 %d:%.*s" | |
6145 | ||
a6cd2cc4 | 6146 | #: sequencer.c:2239 |
1a79b2f1 JX |
6147 | #, c-format |
6148 | msgid "cannot '%s' without a previous commit" | |
6149 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 6150 | |
a6cd2cc4 | 6151 | #: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 |
d46c5519 JX |
6152 | #: builtin/rebase.c:204 builtin/rebase.c:229 |
6153 | #, c-format | |
6154 | msgid "could not read '%s'." | |
6155 | msgstr "不能读取 '%s'。" | |
6156 | ||
a6cd2cc4 JX |
6157 | #: sequencer.c:2323 |
6158 | msgid "cancelling a cherry picking in progress" | |
6159 | msgstr "正在取消一个进行中的拣选" | |
6160 | ||
6161 | #: sequencer.c:2330 | |
6162 | msgid "cancelling a revert in progress" | |
6163 | msgstr "正在取消一个进行中的还原" | |
6164 | ||
6165 | #: sequencer.c:2364 | |
1a79b2f1 JX |
6166 | msgid "please fix this using 'git rebase --edit-todo'." |
6167 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
6168 | ||
a6cd2cc4 | 6169 | #: sequencer.c:2366 |
a0b6b246 JX |
6170 | #, c-format |
6171 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 6172 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 6173 | |
a6cd2cc4 | 6174 | #: sequencer.c:2371 |
1a79b2f1 JX |
6175 | msgid "no commits parsed." |
6176 | msgstr "没有解析提交。" | |
6177 | ||
a6cd2cc4 | 6178 | #: sequencer.c:2382 |
a0b6b246 JX |
6179 | msgid "cannot cherry-pick during a revert." |
6180 | msgstr "不能在回退中执行拣选。" | |
6181 | ||
a6cd2cc4 | 6182 | #: sequencer.c:2384 |
a0b6b246 JX |
6183 | msgid "cannot revert during a cherry-pick." |
6184 | msgstr "不能在拣选中执行回退。" | |
6185 | ||
a6cd2cc4 | 6186 | #: sequencer.c:2466 |
a0b6b246 JX |
6187 | #, c-format |
6188 | msgid "invalid value for %s: %s" | |
6189 | msgstr "%s 的值无效:%s" | |
6190 | ||
a6cd2cc4 | 6191 | #: sequencer.c:2553 |
fd8cb379 JX |
6192 | msgid "unusable squash-onto" |
6193 | msgstr "不可用的 squash-onto" | |
6194 | ||
a6cd2cc4 | 6195 | #: sequencer.c:2569 |
a0b6b246 JX |
6196 | #, c-format |
6197 | msgid "malformed options sheet: '%s'" | |
fd8cb379 | 6198 | msgstr "格式错误的选项清单:'%s'" |
a0b6b246 | 6199 | |
a6cd2cc4 | 6200 | #: sequencer.c:2652 sequencer.c:4351 |
c1ac5258 JX |
6201 | msgid "empty commit set passed" |
6202 | msgstr "提供了空的提交集" | |
6203 | ||
a6cd2cc4 JX |
6204 | #: sequencer.c:2668 |
6205 | msgid "revert is already in progress" | |
6206 | msgstr "一个还原操作已在进行" | |
a0b6b246 | 6207 | |
a6cd2cc4 JX |
6208 | #: sequencer.c:2670 |
6209 | #, c-format | |
6210 | msgid "try \"git revert (--continue | %s--abort | --quit)\"" | |
6211 | msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" | |
6212 | ||
6213 | #: sequencer.c:2673 | |
6214 | msgid "cherry-pick is already in progress" | |
6215 | msgstr "拣选操作已在进行" | |
6216 | ||
6217 | #: sequencer.c:2675 | |
6218 | #, c-format | |
6219 | msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
6220 | msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
a0b6b246 | 6221 | |
a6cd2cc4 | 6222 | #: sequencer.c:2689 |
a0b6b246 JX |
6223 | #, c-format |
6224 | msgid "could not create sequencer directory '%s'" | |
6225 | msgstr "不能创建序列目录 '%s'" | |
6226 | ||
a6cd2cc4 | 6227 | #: sequencer.c:2704 |
a0b6b246 JX |
6228 | msgid "could not lock HEAD" |
6229 | msgstr "不能锁定 HEAD" | |
6230 | ||
a6cd2cc4 | 6231 | #: sequencer.c:2764 sequencer.c:4103 |
a0b6b246 JX |
6232 | msgid "no cherry-pick or revert in progress" |
6233 | msgstr "拣选或还原操作并未进行" | |
6234 | ||
a6cd2cc4 | 6235 | #: sequencer.c:2766 sequencer.c:2777 |
a0b6b246 JX |
6236 | msgid "cannot resolve HEAD" |
6237 | msgstr "不能解析 HEAD" | |
6238 | ||
a6cd2cc4 | 6239 | #: sequencer.c:2768 sequencer.c:2812 |
a0b6b246 JX |
6240 | msgid "cannot abort from a branch yet to be born" |
6241 | msgstr "不能从尚未建立的分支终止" | |
6242 | ||
a6cd2cc4 | 6243 | #: sequencer.c:2798 builtin/grep.c:734 |
a0b6b246 JX |
6244 | #, c-format |
6245 | msgid "cannot open '%s'" | |
6246 | msgstr "不能打开 '%s'" | |
6247 | ||
a6cd2cc4 | 6248 | #: sequencer.c:2800 |
a0b6b246 JX |
6249 | #, c-format |
6250 | msgid "cannot read '%s': %s" | |
6251 | msgstr "不能读取 '%s':%s" | |
6252 | ||
a6cd2cc4 | 6253 | #: sequencer.c:2801 |
a0b6b246 JX |
6254 | msgid "unexpected end of file" |
6255 | msgstr "意外的文件结束" | |
6256 | ||
a6cd2cc4 | 6257 | #: sequencer.c:2807 |
a0b6b246 JX |
6258 | #, c-format |
6259 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
6260 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
6261 | ||
a6cd2cc4 | 6262 | #: sequencer.c:2818 |
1a79b2f1 JX |
6263 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
6264 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
6265 | ||
a6cd2cc4 JX |
6266 | #: sequencer.c:2859 |
6267 | msgid "no revert in progress" | |
6268 | msgstr "没有正在进行的还原" | |
6269 | ||
6270 | #: sequencer.c:2867 | |
6271 | msgid "no cherry-pick in progress" | |
6272 | msgstr "没有正在进行的拣选" | |
6273 | ||
6274 | #: sequencer.c:2877 | |
6275 | msgid "failed to skip the commit" | |
6276 | msgstr "无法跳过这个提交" | |
6277 | ||
6278 | #: sequencer.c:2884 | |
6279 | msgid "there is nothing to skip" | |
6280 | msgstr "没有要跳过的" | |
6281 | ||
6282 | #: sequencer.c:2887 | |
6283 | #, c-format | |
6284 | msgid "" | |
6285 | "have you committed already?\n" | |
6286 | "try \"git %s --continue\"" | |
6287 | msgstr "" | |
6288 | "您已经提交了么?\n" | |
6289 | "试试 \"git %s --continue\"" | |
6290 | ||
6291 | #: sequencer.c:3011 sequencer.c:4015 | |
31e5e17b JX |
6292 | #, c-format |
6293 | msgid "could not update %s" | |
6294 | msgstr "不能更新 %s" | |
6295 | ||
a6cd2cc4 | 6296 | #: sequencer.c:3049 sequencer.c:3995 |
1a79b2f1 JX |
6297 | msgid "cannot read HEAD" |
6298 | msgstr "不能读取 HEAD" | |
6299 | ||
a6cd2cc4 | 6300 | #: sequencer.c:3066 |
c1ac5258 JX |
6301 | #, c-format |
6302 | msgid "unable to copy '%s' to '%s'" | |
6303 | msgstr "无法拷贝 '%s' 至 '%s'" | |
6304 | ||
a6cd2cc4 | 6305 | #: sequencer.c:3074 |
c1ac5258 JX |
6306 | #, c-format |
6307 | msgid "" | |
6308 | "You can amend the commit now, with\n" | |
6309 | "\n" | |
6310 | " git commit --amend %s\n" | |
6311 | "\n" | |
6312 | "Once you are satisfied with your changes, run\n" | |
6313 | "\n" | |
6314 | " git rebase --continue\n" | |
6315 | msgstr "" | |
6316 | "您现在可以修补这个提交,使用\n" | |
6317 | "\n" | |
6318 | " git commit --amend %s\n" | |
6319 | "\n" | |
6320 | "当您对变更感到满意,执行\n" | |
6321 | "\n" | |
6322 | " git rebase --continue\n" | |
6323 | ||
a6cd2cc4 | 6324 | #: sequencer.c:3084 |
c1ac5258 JX |
6325 | #, c-format |
6326 | msgid "Could not apply %s... %.*s" | |
6327 | msgstr "不能应用 %s... %.*s" | |
6328 | ||
a6cd2cc4 | 6329 | #: sequencer.c:3091 |
c1ac5258 JX |
6330 | #, c-format |
6331 | msgid "Could not merge %.*s" | |
6332 | msgstr "不能合并 %.*s" | |
6333 | ||
a6cd2cc4 | 6334 | #: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 |
1a79b2f1 JX |
6335 | #, c-format |
6336 | msgid "could not copy '%s' to '%s'" | |
6337 | msgstr "不能拷贝 '%s' 至 '%s'" | |
6338 | ||
a6cd2cc4 JX |
6339 | #: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 |
6340 | #: builtin/rebase.c:1953 builtin/rebase.c:2008 | |
1a79b2f1 JX |
6341 | msgid "could not read index" |
6342 | msgstr "不能读取索引" | |
6343 | ||
6344 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 6345 | #: sequencer.c:3136 |
1a79b2f1 JX |
6346 | #, c-format |
6347 | msgid "" | |
6348 | "execution failed: %s\n" | |
6349 | "%sYou can fix the problem, and then run\n" | |
6350 | "\n" | |
6351 | " git rebase --continue\n" | |
6352 | "\n" | |
6353 | msgstr "" | |
6354 | "执行失败:%s\n" | |
6355 | "%s您可以改正该问题,然后运行\n" | |
6356 | "\n" | |
6357 | " git rebase --continue\n" | |
6358 | "\n" | |
6359 | ||
a6cd2cc4 | 6360 | #: sequencer.c:3142 |
1a79b2f1 JX |
6361 | msgid "and made changes to the index and/or the working tree\n" |
6362 | msgstr "并且修改索引和/或工作区\n" | |
6363 | ||
a6cd2cc4 | 6364 | #: sequencer.c:3148 |
1a79b2f1 JX |
6365 | #, c-format |
6366 | msgid "" | |
6367 | "execution succeeded: %s\n" | |
6368 | "but left changes to the index and/or the working tree\n" | |
6369 | "Commit or stash your changes, and then run\n" | |
6370 | "\n" | |
6371 | " git rebase --continue\n" | |
6372 | "\n" | |
6373 | msgstr "" | |
6374 | "执行成功:%s\n" | |
6375 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 6376 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
6377 | "\n" |
6378 | " git rebase --continue\n" | |
6379 | "\n" | |
6380 | ||
a6cd2cc4 | 6381 | #: sequencer.c:3209 |
c1ac5258 JX |
6382 | #, c-format |
6383 | msgid "illegal label name: '%.*s'" | |
6384 | msgstr "非法的标签名称:'%.*s'" | |
6385 | ||
a6cd2cc4 | 6386 | #: sequencer.c:3263 |
fd8cb379 JX |
6387 | msgid "writing fake root commit" |
6388 | msgstr "写伪根提交" | |
6389 | ||
a6cd2cc4 | 6390 | #: sequencer.c:3268 |
fd8cb379 JX |
6391 | msgid "writing squash-onto" |
6392 | msgstr "写入 squash-onto" | |
6393 | ||
a6cd2cc4 | 6394 | #: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 |
fd8cb379 JX |
6395 | #, c-format |
6396 | msgid "failed to find tree of %s" | |
6397 | msgstr "无法找到 %s 指向的树。" | |
6398 | ||
a6cd2cc4 | 6399 | #: sequencer.c:3324 builtin/rebase.c:873 |
fd8cb379 JX |
6400 | msgid "could not write index" |
6401 | msgstr "不能写入索引" | |
6402 | ||
a6cd2cc4 | 6403 | #: sequencer.c:3351 |
c1ac5258 JX |
6404 | #, c-format |
6405 | msgid "could not resolve '%s'" | |
6406 | msgstr "无法解析 '%s'" | |
6407 | ||
a6cd2cc4 | 6408 | #: sequencer.c:3379 |
fd8cb379 JX |
6409 | msgid "cannot merge without a current revision" |
6410 | msgstr "没有当前版本不能合并" | |
6411 | ||
a6cd2cc4 | 6412 | #: sequencer.c:3401 |
fd8cb379 | 6413 | #, c-format |
c1ac5258 JX |
6414 | msgid "unable to parse '%.*s'" |
6415 | msgstr "无法解析 '%.*s'" | |
6416 | ||
a6cd2cc4 | 6417 | #: sequencer.c:3410 |
c1ac5258 JX |
6418 | #, c-format |
6419 | msgid "nothing to merge: '%.*s'" | |
6420 | msgstr "无可用合并:'%.*s'" | |
6421 | ||
a6cd2cc4 | 6422 | #: sequencer.c:3422 |
c1ac5258 JX |
6423 | msgid "octopus merge cannot be executed on top of a [new root]" |
6424 | msgstr "章鱼合并不能在一个新的根提交上执行" | |
fd8cb379 | 6425 | |
a6cd2cc4 | 6426 | #: sequencer.c:3437 |
fd8cb379 JX |
6427 | #, c-format |
6428 | msgid "could not get commit message of '%s'" | |
6429 | msgstr "不能获取 '%s' 的提交说明" | |
6430 | ||
a6cd2cc4 | 6431 | #: sequencer.c:3590 |
fd8cb379 JX |
6432 | #, c-format |
6433 | msgid "could not even attempt to merge '%.*s'" | |
6434 | msgstr "甚至不能尝试合并 '%.*s'" | |
6435 | ||
a6cd2cc4 | 6436 | #: sequencer.c:3606 |
fd8cb379 JX |
6437 | msgid "merge: Unable to write new index file" |
6438 | msgstr "合并:无法写入新索引文件" | |
6439 | ||
a6cd2cc4 | 6440 | #: sequencer.c:3675 builtin/rebase.c:711 |
1a79b2f1 | 6441 | #, c-format |
a4f16749 JX |
6442 | msgid "Applied autostash.\n" |
6443 | msgstr "已应用 autostash。\n" | |
1a79b2f1 | 6444 | |
a6cd2cc4 | 6445 | #: sequencer.c:3687 |
1a79b2f1 JX |
6446 | #, c-format |
6447 | msgid "cannot store %s" | |
6448 | msgstr "不能存储 %s" | |
6449 | ||
a6cd2cc4 | 6450 | #: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 |
1a79b2f1 JX |
6451 | #, c-format |
6452 | msgid "" | |
6453 | "Applying autostash resulted in conflicts.\n" | |
6454 | "Your changes are safe in the stash.\n" | |
6455 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
6456 | msgstr "" | |
6457 | "应用 autostash 导致冲突。\n" | |
a4f16749 | 6458 | "您的修改安全地保存在贮藏区中。\n" |
1a79b2f1 JX |
6459 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
6460 | ||
a6cd2cc4 | 6461 | #: sequencer.c:3751 |
4c27fcb5 JX |
6462 | #, c-format |
6463 | msgid "could not checkout %s" | |
6464 | msgstr "不能检出 %s" | |
6465 | ||
a6cd2cc4 | 6466 | #: sequencer.c:3765 |
4c27fcb5 JX |
6467 | #, c-format |
6468 | msgid "%s: not a valid OID" | |
5b533632 | 6469 | msgstr "%s:不是一个有效的对象 ID" |
4c27fcb5 | 6470 | |
a6cd2cc4 | 6471 | #: sequencer.c:3770 git-rebase--preserve-merges.sh:779 |
4c27fcb5 JX |
6472 | msgid "could not detach HEAD" |
6473 | msgstr "不能分离头指针" | |
6474 | ||
a6cd2cc4 | 6475 | #: sequencer.c:3785 |
4c27fcb5 JX |
6476 | #, c-format |
6477 | msgid "Stopped at HEAD\n" | |
6478 | msgstr "停止在 HEAD\n" | |
6479 | ||
a6cd2cc4 | 6480 | #: sequencer.c:3787 |
4c27fcb5 JX |
6481 | #, c-format |
6482 | msgid "Stopped at %s\n" | |
6483 | msgstr "停止在 %s\n" | |
6484 | ||
a6cd2cc4 | 6485 | #: sequencer.c:3795 |
fd8cb379 JX |
6486 | #, c-format |
6487 | msgid "" | |
6488 | "Could not execute the todo command\n" | |
6489 | "\n" | |
6490 | " %.*s\n" | |
6491 | "It has been rescheduled; To edit the command before continuing, please\n" | |
6492 | "edit the todo list first:\n" | |
6493 | "\n" | |
6494 | " git rebase --edit-todo\n" | |
6495 | " git rebase --continue\n" | |
6496 | msgstr "" | |
6497 | "无法执行待办命令\n" | |
6498 | "\n" | |
6499 | " %.*s\n" | |
6500 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
6501 | "\n" | |
6502 | " git rebase --edit-todo\n" | |
6503 | " git rebase --continue\n" | |
6504 | ||
a6cd2cc4 | 6505 | #: sequencer.c:3877 |
1a79b2f1 | 6506 | #, c-format |
87cb7997 JX |
6507 | msgid "Stopped at %s... %.*s\n" |
6508 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 6509 | |
a6cd2cc4 | 6510 | #: sequencer.c:3958 |
1a79b2f1 JX |
6511 | #, c-format |
6512 | msgid "unknown command %d" | |
6513 | msgstr "未知命令 %d" | |
6514 | ||
a6cd2cc4 | 6515 | #: sequencer.c:4003 |
1a79b2f1 JX |
6516 | msgid "could not read orig-head" |
6517 | msgstr "不能读取 orig-head" | |
6518 | ||
a6cd2cc4 | 6519 | #: sequencer.c:4008 |
1a79b2f1 JX |
6520 | msgid "could not read 'onto'" |
6521 | msgstr "不能读取 'onto'" | |
6522 | ||
a6cd2cc4 | 6523 | #: sequencer.c:4022 |
1a79b2f1 JX |
6524 | #, c-format |
6525 | msgid "could not update HEAD to %s" | |
6526 | msgstr "不能更新 HEAD 为 %s" | |
6527 | ||
a6cd2cc4 | 6528 | #: sequencer.c:4115 |
1a79b2f1 JX |
6529 | msgid "cannot rebase: You have unstaged changes." |
6530 | msgstr "不能变基:您有未暂存的变更。" | |
6531 | ||
a6cd2cc4 | 6532 | #: sequencer.c:4124 |
1a79b2f1 JX |
6533 | msgid "cannot amend non-existing commit" |
6534 | msgstr "不能修补不存在的提交" | |
6535 | ||
a6cd2cc4 | 6536 | #: sequencer.c:4126 |
1a79b2f1 JX |
6537 | #, c-format |
6538 | msgid "invalid file: '%s'" | |
6539 | msgstr "无效文件:'%s'" | |
6540 | ||
a6cd2cc4 | 6541 | #: sequencer.c:4128 |
1a79b2f1 JX |
6542 | #, c-format |
6543 | msgid "invalid contents: '%s'" | |
6544 | msgstr "无效内容:'%s'" | |
6545 | ||
a6cd2cc4 | 6546 | #: sequencer.c:4131 |
1a79b2f1 JX |
6547 | msgid "" |
6548 | "\n" | |
6549 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
6550 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
6551 | msgstr "" |
6552 | "\n" | |
6553 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 6554 | |
a6cd2cc4 | 6555 | #: sequencer.c:4167 sequencer.c:4205 |
fd8cb379 JX |
6556 | #, c-format |
6557 | msgid "could not write file: '%s'" | |
6558 | msgstr "不能写入文件:'%s'" | |
6559 | ||
a6cd2cc4 | 6560 | #: sequencer.c:4220 |
fd8cb379 JX |
6561 | msgid "could not remove CHERRY_PICK_HEAD" |
6562 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
6563 | ||
a6cd2cc4 | 6564 | #: sequencer.c:4227 |
1a79b2f1 JX |
6565 | msgid "could not commit staged changes." |
6566 | msgstr "不能提交暂存的修改。" | |
6567 | ||
a6cd2cc4 | 6568 | #: sequencer.c:4328 |
a0b6b246 JX |
6569 | #, c-format |
6570 | msgid "%s: can't cherry-pick a %s" | |
6571 | msgstr "%s:不能拣选一个%s" | |
6572 | ||
a6cd2cc4 | 6573 | #: sequencer.c:4332 |
a0b6b246 JX |
6574 | #, c-format |
6575 | msgid "%s: bad revision" | |
6576 | msgstr "%s:错误的版本" | |
6577 | ||
a6cd2cc4 | 6578 | #: sequencer.c:4367 |
a0b6b246 JX |
6579 | msgid "can't revert as initial commit" |
6580 | msgstr "不能作为初始提交回退" | |
6581 | ||
a6cd2cc4 | 6582 | #: sequencer.c:4810 |
6937cb4e JX |
6583 | msgid "make_script: unhandled options" |
6584 | msgstr "make_script:有未能处理的选项" | |
6585 | ||
a6cd2cc4 | 6586 | #: sequencer.c:4813 |
6937cb4e JX |
6587 | msgid "make_script: error preparing revisions" |
6588 | msgstr "make_script:准备版本时错误" | |
6589 | ||
a6cd2cc4 | 6590 | #: sequencer.c:4971 |
6937cb4e JX |
6591 | msgid "" |
6592 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
6593 | "continue'.\n" | |
6594 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
6595 | msgstr "" | |
6596 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
6597 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
6598 | ||
a6cd2cc4 | 6599 | #: sequencer.c:5083 sequencer.c:5100 |
4c27fcb5 JX |
6600 | msgid "nothing to do" |
6601 | msgstr "无事可做" | |
6602 | ||
a6cd2cc4 | 6603 | #: sequencer.c:5114 |
4c27fcb5 JX |
6604 | msgid "could not skip unnecessary pick commands" |
6605 | msgstr "无法跳过不必要的拣选" | |
6606 | ||
a6cd2cc4 | 6607 | #: sequencer.c:5197 |
6937cb4e JX |
6608 | msgid "the script was already rearranged." |
6609 | msgstr "脚本已经重新编排。" | |
6610 | ||
fd8cb379 | 6611 | #: setup.c:123 |
31e5e17b JX |
6612 | #, c-format |
6613 | msgid "'%s' is outside repository" | |
6614 | msgstr "'%s' 在仓库之外" | |
6615 | ||
d46c5519 | 6616 | #: setup.c:173 |
a0b6b246 | 6617 | #, c-format |
6792b93b | 6618 | msgid "" |
a0b6b246 JX |
6619 | "%s: no such path in the working tree.\n" |
6620 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
6621 | msgstr "" | |
6622 | "%s:工作区中无此路径。\n" | |
58b6f078 | 6623 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 6624 | |
d46c5519 | 6625 | #: setup.c:186 |
90314792 | 6626 | #, c-format |
a0b6b246 JX |
6627 | msgid "" |
6628 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
6629 | "Use '--' to separate paths from revisions, like this:\n" | |
6630 | "'git <command> [<revision>...] -- [<file>...]'" | |
6631 | msgstr "" | |
6632 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
6633 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 6634 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 6635 | |
d46c5519 | 6636 | #: setup.c:235 |
31e5e17b JX |
6637 | #, c-format |
6638 | msgid "option '%s' must come before non-option arguments" | |
6639 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
6640 | ||
d46c5519 | 6641 | #: setup.c:254 |
a0b6b246 JX |
6642 | #, c-format |
6643 | msgid "" | |
6644 | "ambiguous argument '%s': both revision and filename\n" | |
6645 | "Use '--' to separate paths from revisions, like this:\n" | |
6646 | "'git <command> [<revision>...] -- [<file>...]'" | |
6647 | msgstr "" | |
6648 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
6649 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 6650 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 6651 | |
d46c5519 | 6652 | #: setup.c:390 |
31e5e17b JX |
6653 | msgid "unable to set up work tree using invalid config" |
6654 | msgstr "无法使用无效配置来创建工作区" | |
6655 | ||
d46c5519 | 6656 | #: setup.c:394 |
31e5e17b | 6657 | msgid "this operation must be run in a work tree" |
610f8099 | 6658 | msgstr "该操作必须在一个工作区中运行" |
31e5e17b | 6659 | |
d46c5519 | 6660 | #: setup.c:540 |
a0b6b246 JX |
6661 | #, c-format |
6662 | msgid "Expected git repo version <= %d, found %d" | |
6663 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 6664 | |
d46c5519 | 6665 | #: setup.c:548 |
a0b6b246 JX |
6666 | msgid "unknown repository extensions found:" |
6667 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 6668 | |
d46c5519 | 6669 | #: setup.c:567 |
1003b3a5 | 6670 | #, c-format |
31e5e17b | 6671 | msgid "error opening '%s'" |
c1ac5258 | 6672 | msgstr "打开 '%s' 出错" |
1003b3a5 | 6673 | |
d46c5519 | 6674 | #: setup.c:569 |
31e5e17b JX |
6675 | #, c-format |
6676 | msgid "too large to be a .git file: '%s'" | |
610f8099 | 6677 | msgstr "文件太大,无法作为 .git 文件:'%s'" |
31e5e17b | 6678 | |
d46c5519 | 6679 | #: setup.c:571 |
31e5e17b JX |
6680 | #, c-format |
6681 | msgid "error reading %s" | |
c1ac5258 | 6682 | msgstr "读取 %s 出错" |
31e5e17b | 6683 | |
d46c5519 | 6684 | #: setup.c:573 |
31e5e17b JX |
6685 | #, c-format |
6686 | msgid "invalid gitfile format: %s" | |
6687 | msgstr "无效的 gitfile 格式:%s" | |
6688 | ||
d46c5519 | 6689 | #: setup.c:575 |
31e5e17b JX |
6690 | #, c-format |
6691 | msgid "no path in gitfile: %s" | |
6692 | msgstr "在 gitfile 中没有路径:%s" | |
6693 | ||
d46c5519 | 6694 | #: setup.c:577 |
31e5e17b JX |
6695 | #, c-format |
6696 | msgid "not a git repository: %s" | |
6697 | msgstr "不是一个 git 仓库:%s" | |
6698 | ||
d46c5519 | 6699 | #: setup.c:676 |
31e5e17b JX |
6700 | #, c-format |
6701 | msgid "'$%s' too big" | |
6702 | msgstr "'$%s' 太大" | |
6703 | ||
d46c5519 | 6704 | #: setup.c:690 |
31e5e17b JX |
6705 | #, c-format |
6706 | msgid "not a git repository: '%s'" | |
6707 | msgstr "不是一个 git 仓库:'%s'" | |
6708 | ||
d46c5519 | 6709 | #: setup.c:719 setup.c:721 setup.c:752 |
31e5e17b JX |
6710 | #, c-format |
6711 | msgid "cannot chdir to '%s'" | |
6712 | msgstr "不能切换目录到 '%s'" | |
6713 | ||
d46c5519 | 6714 | #: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 |
31e5e17b | 6715 | msgid "cannot come back to cwd" |
a0b6b246 | 6716 | msgstr "无法返回当前工作目录" |
1003b3a5 | 6717 | |
d46c5519 | 6718 | #: setup.c:851 |
31e5e17b JX |
6719 | #, c-format |
6720 | msgid "failed to stat '%*s%s%s'" | |
c1ac5258 | 6721 | msgstr "获取 '%*s%s%s' 状态(stat)失败" |
31e5e17b | 6722 | |
d46c5519 | 6723 | #: setup.c:1083 |
a0b6b246 JX |
6724 | msgid "Unable to read current working directory" |
6725 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 6726 | |
d46c5519 | 6727 | #: setup.c:1092 setup.c:1098 |
87cb7997 | 6728 | #, c-format |
31e5e17b | 6729 | msgid "cannot change to '%s'" |
87cb7997 JX |
6730 | msgstr "不能切换到 '%s'" |
6731 | ||
d46c5519 | 6732 | #: setup.c:1103 |
06991777 JX |
6733 | #, c-format |
6734 | msgid "not a git repository (or any of the parent directories): %s" | |
6735 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
6736 | ||
d46c5519 | 6737 | #: setup.c:1109 |
a0b6b246 JX |
6738 | #, c-format |
6739 | msgid "" | |
31e5e17b | 6740 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
6741 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
6742 | msgstr "" | |
31e5e17b | 6743 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 6744 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 6745 | |
d46c5519 | 6746 | #: setup.c:1220 |
a0b6b246 JX |
6747 | #, c-format |
6748 | msgid "" | |
31e5e17b | 6749 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
6750 | "The owner of files must always have read and write permissions." |
6751 | msgstr "" | |
31e5e17b | 6752 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 6753 | "文件属主必须始终拥有读写权限。" |
6792b93b | 6754 | |
d46c5519 | 6755 | #: setup.c:1264 |
31e5e17b JX |
6756 | msgid "open /dev/null or dup failed" |
6757 | msgstr "不能打开或者复制 /dev/null" | |
6758 | ||
d46c5519 | 6759 | #: setup.c:1279 |
31e5e17b JX |
6760 | msgid "fork failed" |
6761 | msgstr "fork 失败" | |
6762 | ||
d46c5519 | 6763 | #: setup.c:1284 |
31e5e17b JX |
6764 | msgid "setsid failed" |
6765 | msgstr "setsid 失败" | |
6766 | ||
d46c5519 | 6767 | #: sha1-file.c:453 |
c1ac5258 JX |
6768 | #, c-format |
6769 | msgid "object directory %s does not exist; check .git/objects/info/alternates" | |
6770 | msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" | |
6771 | ||
d46c5519 | 6772 | #: sha1-file.c:504 |
c1ac5258 JX |
6773 | #, c-format |
6774 | msgid "unable to normalize alternate object path: %s" | |
6775 | msgstr "无法规范化备用对象路径:%s" | |
6776 | ||
d46c5519 | 6777 | #: sha1-file.c:576 |
c1ac5258 JX |
6778 | #, c-format |
6779 | msgid "%s: ignoring alternate object stores, nesting too deep" | |
6780 | msgstr "%s:忽略备用对象库,嵌套太深" | |
6781 | ||
d46c5519 | 6782 | #: sha1-file.c:583 |
c1ac5258 JX |
6783 | #, c-format |
6784 | msgid "unable to normalize object directory: %s" | |
6785 | msgstr "无法规范化对象目录: %s" | |
6786 | ||
d46c5519 | 6787 | #: sha1-file.c:626 |
c1ac5258 JX |
6788 | msgid "unable to fdopen alternates lockfile" |
6789 | msgstr "无法 fdopen 替换锁文件" | |
6790 | ||
d46c5519 | 6791 | #: sha1-file.c:644 |
c1ac5258 JX |
6792 | msgid "unable to read alternates file" |
6793 | msgstr "无法读取替代文件" | |
6794 | ||
d46c5519 | 6795 | #: sha1-file.c:651 |
c1ac5258 JX |
6796 | msgid "unable to move new alternates file into place" |
6797 | msgstr "无法将新的替代文件移动到位" | |
6798 | ||
d46c5519 | 6799 | #: sha1-file.c:686 |
a0b6b246 JX |
6800 | #, c-format |
6801 | msgid "path '%s' does not exist" | |
6802 | msgstr "路径 '%s' 不存在" | |
6803 | ||
d46c5519 | 6804 | #: sha1-file.c:712 |
a0b6b246 JX |
6805 | #, c-format |
6806 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
6807 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
6808 | ||
d46c5519 | 6809 | #: sha1-file.c:718 |
a0b6b246 JX |
6810 | #, c-format |
6811 | msgid "reference repository '%s' is not a local repository." | |
6812 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
6813 | ||
d46c5519 | 6814 | #: sha1-file.c:724 |
a0b6b246 JX |
6815 | #, c-format |
6816 | msgid "reference repository '%s' is shallow" | |
6817 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
6818 | ||
d46c5519 | 6819 | #: sha1-file.c:732 |
a0b6b246 JX |
6820 | #, c-format |
6821 | msgid "reference repository '%s' is grafted" | |
fd8cb379 | 6822 | msgstr "参考仓库 '%s' 已被移植" |
a0b6b246 | 6823 | |
a6cd2cc4 JX |
6824 | #: sha1-file.c:792 |
6825 | #, c-format | |
6826 | msgid "invalid line while parsing alternate refs: %s" | |
6827 | msgstr "解析备用引用时无效的行:%s" | |
6828 | ||
6829 | #: sha1-file.c:944 | |
c1ac5258 JX |
6830 | #, c-format |
6831 | msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" | |
6832 | msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" | |
6833 | ||
a6cd2cc4 | 6834 | #: sha1-file.c:969 |
c1ac5258 JX |
6835 | msgid "mmap failed" |
6836 | msgstr "mmap 失败" | |
6837 | ||
a6cd2cc4 | 6838 | #: sha1-file.c:1133 |
c1ac5258 JX |
6839 | #, c-format |
6840 | msgid "object file %s is empty" | |
6841 | msgstr "对象文件 %s 为空" | |
6842 | ||
a6cd2cc4 | 6843 | #: sha1-file.c:1257 sha1-file.c:2396 |
c1ac5258 JX |
6844 | #, c-format |
6845 | msgid "corrupt loose object '%s'" | |
6846 | msgstr "损坏的松散对象 '%s'" | |
6847 | ||
a6cd2cc4 | 6848 | #: sha1-file.c:1259 sha1-file.c:2400 |
c1ac5258 JX |
6849 | #, c-format |
6850 | msgid "garbage at end of loose object '%s'" | |
6851 | msgstr "松散对象 '%s' 后面有垃圾数据" | |
6852 | ||
a6cd2cc4 | 6853 | #: sha1-file.c:1301 |
c1ac5258 JX |
6854 | msgid "invalid object type" |
6855 | msgstr "无效的对象类型" | |
6856 | ||
a6cd2cc4 | 6857 | #: sha1-file.c:1385 |
c1ac5258 JX |
6858 | #, c-format |
6859 | msgid "unable to unpack %s header with --allow-unknown-type" | |
6860 | msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" | |
6861 | ||
a6cd2cc4 | 6862 | #: sha1-file.c:1388 |
c1ac5258 JX |
6863 | #, c-format |
6864 | msgid "unable to unpack %s header" | |
6865 | msgstr "无法解开 %s 头部" | |
6866 | ||
a6cd2cc4 | 6867 | #: sha1-file.c:1394 |
c1ac5258 JX |
6868 | #, c-format |
6869 | msgid "unable to parse %s header with --allow-unknown-type" | |
6870 | msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" | |
6871 | ||
a6cd2cc4 | 6872 | #: sha1-file.c:1397 |
c1ac5258 JX |
6873 | #, c-format |
6874 | msgid "unable to parse %s header" | |
6875 | msgstr "无法解析 %s 头部" | |
6876 | ||
a6cd2cc4 | 6877 | #: sha1-file.c:1588 |
c1ac5258 JX |
6878 | #, c-format |
6879 | msgid "failed to read object %s" | |
6880 | msgstr "读取对象 %s 失败" | |
6881 | ||
a6cd2cc4 | 6882 | #: sha1-file.c:1592 |
c1ac5258 JX |
6883 | #, c-format |
6884 | msgid "replacement %s not found for %s" | |
6885 | msgstr "找不到 %2$s 的替代 %1$s" | |
6886 | ||
a6cd2cc4 | 6887 | #: sha1-file.c:1596 |
c1ac5258 JX |
6888 | #, c-format |
6889 | msgid "loose object %s (stored in %s) is corrupt" | |
6890 | msgstr "松散对象 %s(保存在 %s)已损坏" | |
6891 | ||
a6cd2cc4 | 6892 | #: sha1-file.c:1600 |
c1ac5258 JX |
6893 | #, c-format |
6894 | msgid "packed object %s (stored in %s) is corrupt" | |
6895 | msgstr "打包对象 %s(保存在 %s)已损坏" | |
6896 | ||
a6cd2cc4 | 6897 | #: sha1-file.c:1703 |
c1ac5258 | 6898 | #, c-format |
06991777 JX |
6899 | msgid "unable to write file %s" |
6900 | msgstr "无法写文件 %s" | |
c1ac5258 | 6901 | |
a6cd2cc4 | 6902 | #: sha1-file.c:1710 |
c1ac5258 JX |
6903 | #, c-format |
6904 | msgid "unable to set permission to '%s'" | |
6905 | msgstr "无法为 '%s' 设置权限" | |
6906 | ||
a6cd2cc4 | 6907 | #: sha1-file.c:1717 |
c1ac5258 JX |
6908 | msgid "file write error" |
6909 | msgstr "文件写错误" | |
6910 | ||
a6cd2cc4 | 6911 | #: sha1-file.c:1736 |
06991777 JX |
6912 | msgid "error when closing loose object file" |
6913 | msgstr "关闭松散对象文件时出错" | |
c1ac5258 | 6914 | |
a6cd2cc4 | 6915 | #: sha1-file.c:1801 |
c1ac5258 JX |
6916 | #, c-format |
6917 | msgid "insufficient permission for adding an object to repository database %s" | |
6918 | msgstr "权限不足,无法在仓库对象库 %s 中添加对象" | |
6919 | ||
a6cd2cc4 | 6920 | #: sha1-file.c:1803 |
c1ac5258 JX |
6921 | msgid "unable to create temporary file" |
6922 | msgstr "无法创建临时文件" | |
6923 | ||
a6cd2cc4 | 6924 | #: sha1-file.c:1827 |
06991777 JX |
6925 | msgid "unable to write loose object file" |
6926 | msgstr "不能写松散对象文件" | |
c1ac5258 | 6927 | |
a6cd2cc4 | 6928 | #: sha1-file.c:1833 |
c1ac5258 JX |
6929 | #, c-format |
6930 | msgid "unable to deflate new object %s (%d)" | |
6931 | msgstr "不能压缩新对象 %s(%d)" | |
6932 | ||
a6cd2cc4 | 6933 | #: sha1-file.c:1837 |
c1ac5258 JX |
6934 | #, c-format |
6935 | msgid "deflateEnd on object %s failed (%d)" | |
6936 | msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" | |
6937 | ||
a6cd2cc4 | 6938 | #: sha1-file.c:1841 |
c1ac5258 JX |
6939 | #, c-format |
6940 | msgid "confused by unstable object source data for %s" | |
6941 | msgstr "被 %s 的不稳定对象源数据搞糊涂了" | |
6942 | ||
a6cd2cc4 | 6943 | #: sha1-file.c:1851 builtin/pack-objects.c:925 |
c1ac5258 JX |
6944 | #, c-format |
6945 | msgid "failed utime() on %s" | |
6946 | msgstr "在 %s 上调用 utime() 失败" | |
6947 | ||
a6cd2cc4 | 6948 | #: sha1-file.c:1926 |
c1ac5258 | 6949 | #, c-format |
06991777 JX |
6950 | msgid "cannot read object for %s" |
6951 | msgstr "不能读取对象 %s" | |
c1ac5258 | 6952 | |
a6cd2cc4 | 6953 | #: sha1-file.c:1966 |
c1ac5258 JX |
6954 | msgid "corrupt commit" |
6955 | msgstr "损坏的提交" | |
6956 | ||
a6cd2cc4 | 6957 | #: sha1-file.c:1974 |
c1ac5258 JX |
6958 | msgid "corrupt tag" |
6959 | msgstr "损坏的标签" | |
6960 | ||
a6cd2cc4 | 6961 | #: sha1-file.c:2073 |
c1ac5258 JX |
6962 | #, c-format |
6963 | msgid "read error while indexing %s" | |
6964 | msgstr "索引 %s 时读取错误" | |
6965 | ||
a6cd2cc4 | 6966 | #: sha1-file.c:2076 |
c1ac5258 JX |
6967 | #, c-format |
6968 | msgid "short read while indexing %s" | |
6969 | msgstr "索引 %s 时读入不完整" | |
6970 | ||
a6cd2cc4 | 6971 | #: sha1-file.c:2149 sha1-file.c:2158 |
c1ac5258 JX |
6972 | #, c-format |
6973 | msgid "%s: failed to insert into database" | |
6974 | msgstr "%s:插入数据库失败" | |
6975 | ||
a6cd2cc4 | 6976 | #: sha1-file.c:2164 |
c1ac5258 JX |
6977 | #, c-format |
6978 | msgid "%s: unsupported file type" | |
6979 | msgstr "%s:不支持的文件类型" | |
6980 | ||
a6cd2cc4 | 6981 | #: sha1-file.c:2188 |
c1ac5258 JX |
6982 | #, c-format |
6983 | msgid "%s is not a valid object" | |
6984 | msgstr "%s 不是一个有效的对象" | |
6985 | ||
a6cd2cc4 | 6986 | #: sha1-file.c:2190 |
c1ac5258 JX |
6987 | #, c-format |
6988 | msgid "%s is not a valid '%s' object" | |
6989 | msgstr "%s 不是一个有效的 '%s' 对象" | |
6990 | ||
a6cd2cc4 | 6991 | #: sha1-file.c:2217 builtin/index-pack.c:155 |
c1ac5258 JX |
6992 | #, c-format |
6993 | msgid "unable to open %s" | |
6994 | msgstr "不能打开 %s" | |
6995 | ||
a6cd2cc4 | 6996 | #: sha1-file.c:2407 sha1-file.c:2459 |
c1ac5258 | 6997 | #, c-format |
06991777 JX |
6998 | msgid "hash mismatch for %s (expected %s)" |
6999 | msgstr "%s 的哈希值不匹配(预期 %s)" | |
c1ac5258 | 7000 | |
a6cd2cc4 | 7001 | #: sha1-file.c:2431 |
c1ac5258 JX |
7002 | #, c-format |
7003 | msgid "unable to mmap %s" | |
7004 | msgstr "不能 mmap %s" | |
7005 | ||
a6cd2cc4 | 7006 | #: sha1-file.c:2436 |
c1ac5258 JX |
7007 | #, c-format |
7008 | msgid "unable to unpack header of %s" | |
7009 | msgstr "无法解压缩 %s 的头部" | |
7010 | ||
a6cd2cc4 | 7011 | #: sha1-file.c:2442 |
c1ac5258 JX |
7012 | #, c-format |
7013 | msgid "unable to parse header of %s" | |
7014 | msgstr "无法解析 %s 的头部" | |
7015 | ||
a6cd2cc4 | 7016 | #: sha1-file.c:2453 |
c1ac5258 JX |
7017 | #, c-format |
7018 | msgid "unable to unpack contents of %s" | |
7019 | msgstr "无法解压缩 %s 的内容" | |
7020 | ||
d46c5519 | 7021 | #: sha1-name.c:490 |
a0b6b246 JX |
7022 | #, c-format |
7023 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 7024 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 7025 | |
d46c5519 | 7026 | #: sha1-name.c:501 |
a0b6b246 JX |
7027 | msgid "The candidates are:" |
7028 | msgstr "候选者有:" | |
7029 | ||
d46c5519 | 7030 | #: sha1-name.c:800 |
a0b6b246 JX |
7031 | msgid "" |
7032 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
7033 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
7034 | "may be created by mistake. For example,\n" | |
7035 | "\n" | |
a6cd2cc4 | 7036 | " git switch -c $br $(git rev-parse ...)\n" |
a0b6b246 JX |
7037 | "\n" |
7038 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
7039 | "examine these refs and maybe delete them. Turn this message off by\n" | |
7040 | "running \"git config advice.objectNameWarning false\"" | |
7041 | msgstr "" | |
a6cd2cc4 JX |
7042 | "Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n" |
7043 | "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n" | |
a0b6b246 | 7044 | "\n" |
a6cd2cc4 | 7045 | " git switch -c $br $(git rev-parse ...)\n" |
a0b6b246 | 7046 | "\n" |
a6cd2cc4 JX |
7047 | "当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n" |
7048 | "引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n" | |
7049 | "false\" 命令关闭本消息通知。" | |
7050 | ||
7051 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte | |
7052 | #: strbuf.c:821 | |
7053 | #, c-format | |
7054 | msgid "%u.%2.2u GiB" | |
7055 | msgstr "%u.%2.2u GiB" | |
7056 | ||
7057 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second | |
7058 | #: strbuf.c:823 | |
7059 | #, c-format | |
7060 | msgid "%u.%2.2u GiB/s" | |
7061 | msgstr "%u.%2.2u GiB/s" | |
7062 | ||
7063 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte | |
7064 | #: strbuf.c:831 | |
7065 | #, c-format | |
7066 | msgid "%u.%2.2u MiB" | |
7067 | msgstr "%u.%2.2u MiB" | |
7068 | ||
7069 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second | |
7070 | #: strbuf.c:833 | |
7071 | #, c-format | |
7072 | msgid "%u.%2.2u MiB/s" | |
7073 | msgstr "%u.%2.2u MiB/s" | |
7074 | ||
7075 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte | |
7076 | #: strbuf.c:840 | |
7077 | #, c-format | |
7078 | msgid "%u.%2.2u KiB" | |
7079 | msgstr "%u.%2.2u KiB" | |
7080 | ||
7081 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second | |
7082 | #: strbuf.c:842 | |
7083 | #, c-format | |
7084 | msgid "%u.%2.2u KiB/s" | |
7085 | msgstr "%u.%2.2u KiB/s" | |
7086 | ||
7087 | #. TRANSLATORS: IEC 80000-13:2008 byte | |
7088 | #: strbuf.c:848 | |
7089 | #, c-format | |
7090 | msgid "%u byte" | |
7091 | msgid_plural "%u bytes" | |
7092 | msgstr[0] "%u 字节" | |
7093 | msgstr[1] "%u 字节" | |
7094 | ||
7095 | #. TRANSLATORS: IEC 80000-13:2008 byte/second | |
7096 | #: strbuf.c:850 | |
7097 | #, c-format | |
7098 | msgid "%u byte/s" | |
7099 | msgid_plural "%u bytes/s" | |
7100 | msgstr[0] "%u 字节/秒" | |
7101 | msgstr[1] "%u 字节/秒" | |
a0b6b246 | 7102 | |
06991777 | 7103 | #: submodule.c:114 submodule.c:143 |
a0b6b246 JX |
7104 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
7105 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
7106 | ||
06991777 | 7107 | #: submodule.c:118 submodule.c:147 |
a0b6b246 JX |
7108 | #, c-format |
7109 | msgid "Could not find section in .gitmodules where path=%s" | |
7110 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
7111 | ||
06991777 | 7112 | #: submodule.c:154 |
a0b6b246 JX |
7113 | #, c-format |
7114 | msgid "Could not remove .gitmodules entry for %s" | |
7115 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
7116 | ||
06991777 | 7117 | #: submodule.c:165 |
a0b6b246 JX |
7118 | msgid "staging updated .gitmodules failed" |
7119 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
7120 | ||
06991777 | 7121 | #: submodule.c:327 |
a4f16749 JX |
7122 | #, c-format |
7123 | msgid "in unpopulated submodule '%s'" | |
7124 | msgstr "位于未检出的子模组 '%s'" | |
7125 | ||
06991777 | 7126 | #: submodule.c:358 |
a4f16749 JX |
7127 | #, c-format |
7128 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
7129 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
7130 | ||
d46c5519 | 7131 | #: submodule.c:910 |
6937cb4e JX |
7132 | #, c-format |
7133 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 7134 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 7135 | |
a6cd2cc4 | 7136 | #: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 |
6937cb4e JX |
7137 | msgid "Failed to resolve HEAD as a valid ref." |
7138 | msgstr "无法将 HEAD 解析为有效引用。" | |
7139 | ||
d46c5519 | 7140 | #: submodule.c:1481 |
06991777 JX |
7141 | #, c-format |
7142 | msgid "Could not access submodule '%s'" | |
7143 | msgstr "无法访问子模组 '%s'" | |
7144 | ||
d46c5519 | 7145 | #: submodule.c:1651 |
1a79b2f1 | 7146 | #, c-format |
87cb7997 | 7147 | msgid "'%s' not recognized as a git repository" |
65e2041e | 7148 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 7149 | |
d46c5519 | 7150 | #: submodule.c:1789 |
1a79b2f1 | 7151 | #, c-format |
87cb7997 JX |
7152 | msgid "could not start 'git status' in submodule '%s'" |
7153 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 7154 | |
d46c5519 | 7155 | #: submodule.c:1802 |
87cb7997 JX |
7156 | #, c-format |
7157 | msgid "could not run 'git status' in submodule '%s'" | |
7158 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
7159 | ||
d46c5519 | 7160 | #: submodule.c:1817 |
06991777 JX |
7161 | #, c-format |
7162 | msgid "Could not unset core.worktree setting in submodule '%s'" | |
7163 | msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" | |
7164 | ||
d46c5519 | 7165 | #: submodule.c:1907 |
87cb7997 JX |
7166 | #, c-format |
7167 | msgid "submodule '%s' has dirty index" | |
7168 | msgstr "子模组 '%s' 中有脏索引" | |
7169 | ||
d46c5519 | 7170 | #: submodule.c:1959 |
c1ac5258 JX |
7171 | #, c-format |
7172 | msgid "Submodule '%s' could not be updated." | |
7173 | msgstr "子模组 '%s' 无法被更新。" | |
7174 | ||
a6cd2cc4 | 7175 | #: submodule.c:2007 |
1a79b2f1 JX |
7176 | #, c-format |
7177 | msgid "" | |
7178 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
7179 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
7180 | ||
a6cd2cc4 | 7181 | #: submodule.c:2019 submodule.c:2074 |
1a79b2f1 JX |
7182 | #, c-format |
7183 | msgid "could not lookup name for submodule '%s'" | |
7184 | msgstr "不能查询子模组 '%s' 的名称" | |
7185 | ||
a6cd2cc4 | 7186 | #: submodule.c:2026 |
1a79b2f1 JX |
7187 | #, c-format |
7188 | msgid "" | |
7189 | "Migrating git directory of '%s%s' from\n" | |
7190 | "'%s' to\n" | |
7191 | "'%s'\n" | |
7192 | msgstr "" | |
7193 | "将 '%s%s' 的 git 目录从\n" | |
7194 | "'%s' 迁移至\n" | |
7195 | "'%s'\n" | |
7196 | ||
a6cd2cc4 | 7197 | #: submodule.c:2109 |
1a79b2f1 JX |
7198 | #, c-format |
7199 | msgid "could not recurse into submodule '%s'" | |
7200 | msgstr "无法递归进子模组路径 '%s'" | |
7201 | ||
a6cd2cc4 | 7202 | #: submodule.c:2153 |
87cb7997 JX |
7203 | msgid "could not start ls-files in .." |
7204 | msgstr "无法在 .. 中启动 ls-files" | |
7205 | ||
a6cd2cc4 | 7206 | #: submodule.c:2192 |
87cb7997 JX |
7207 | #, c-format |
7208 | msgid "ls-tree returned unexpected return code %d" | |
7209 | msgstr "ls-tree 返回未知返回值 %d" | |
7210 | ||
4c27fcb5 | 7211 | #: submodule-config.c:232 |
fd8cb379 JX |
7212 | #, c-format |
7213 | msgid "ignoring suspicious submodule name: %s" | |
7214 | msgstr "忽略可疑的子模组名称:%s" | |
7215 | ||
d46c5519 | 7216 | #: submodule-config.c:299 |
6937cb4e JX |
7217 | msgid "negative values not allowed for submodule.fetchjobs" |
7218 | msgstr "submodule.fetchjobs 不允许为负值" | |
7219 | ||
d46c5519 | 7220 | #: submodule-config.c:397 |
4c27fcb5 JX |
7221 | #, c-format |
7222 | msgid "ignoring '%s' which may be interpreted as a command-line option: %s" | |
7223 | msgstr "忽略可能被解析为命令行选项的 '%s':%s" | |
7224 | ||
d46c5519 | 7225 | #: submodule-config.c:486 |
a0b6b246 JX |
7226 | #, c-format |
7227 | msgid "invalid value for %s" | |
7228 | msgstr "%s 的值无效" | |
7229 | ||
d46c5519 | 7230 | #: submodule-config.c:755 |
4c27fcb5 JX |
7231 | #, c-format |
7232 | msgid "Could not update .gitmodules entry %s" | |
7233 | msgstr "不能更新 .gitmodules 条目 %s" | |
7234 | ||
6937cb4e | 7235 | #: trailer.c:238 |
a0b6b246 JX |
7236 | #, c-format |
7237 | msgid "running trailer command '%s' failed" | |
7238 | msgstr "执行 trailer 命令 '%s' 失败" | |
7239 | ||
6937cb4e JX |
7240 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
7241 | #: trailer.c:557 | |
a0b6b246 JX |
7242 | #, c-format |
7243 | msgid "unknown value '%s' for key '%s'" | |
7244 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
7245 | ||
4c27fcb5 | 7246 | #: trailer.c:539 trailer.c:544 builtin/remote.c:295 |
a0b6b246 JX |
7247 | #, c-format |
7248 | msgid "more than one %s" | |
7249 | msgstr "多于一个 %s" | |
7250 | ||
6937cb4e | 7251 | #: trailer.c:730 |
a0b6b246 JX |
7252 | #, c-format |
7253 | msgid "empty trailer token in trailer '%.*s'" | |
7254 | msgstr "签名 '%.*s' 的键为空" | |
7255 | ||
6937cb4e | 7256 | #: trailer.c:750 |
a0b6b246 JX |
7257 | #, c-format |
7258 | msgid "could not read input file '%s'" | |
7259 | msgstr "不能读取输入文件 '%s'" | |
7260 | ||
6937cb4e | 7261 | #: trailer.c:753 |
a0b6b246 JX |
7262 | msgid "could not read from stdin" |
7263 | msgstr "不能自标准输入读取" | |
7264 | ||
06991777 | 7265 | #: trailer.c:1011 wrapper.c:701 |
a0b6b246 JX |
7266 | #, c-format |
7267 | msgid "could not stat %s" | |
65e2041e | 7268 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 7269 | |
4c27fcb5 | 7270 | #: trailer.c:1013 |
a0b6b246 JX |
7271 | #, c-format |
7272 | msgid "file %s is not a regular file" | |
7273 | msgstr "文件 %s 不是一个正规文件" | |
7274 | ||
4c27fcb5 | 7275 | #: trailer.c:1015 |
a0b6b246 JX |
7276 | #, c-format |
7277 | msgid "file %s is not writable by user" | |
7278 | msgstr "文件 %s 用户不可写" | |
7279 | ||
4c27fcb5 | 7280 | #: trailer.c:1027 |
a0b6b246 JX |
7281 | msgid "could not open temporary file" |
7282 | msgstr "不能打开临时文件" | |
7283 | ||
4c27fcb5 | 7284 | #: trailer.c:1067 |
a0b6b246 JX |
7285 | #, c-format |
7286 | msgid "could not rename temporary file to %s" | |
7287 | msgstr "不能重命名临时文件为 %s" | |
7288 | ||
fd8cb379 | 7289 | #: transport.c:116 |
a0b6b246 JX |
7290 | #, c-format |
7291 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
7292 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
7293 | ||
c1ac5258 JX |
7294 | #: transport.c:142 |
7295 | #, c-format | |
7296 | msgid "could not read bundle '%s'" | |
7297 | msgstr "无法读取 bundle '%s'" | |
7298 | ||
fd8cb379 | 7299 | #: transport.c:208 |
a0b6b246 JX |
7300 | #, c-format |
7301 | msgid "transport: invalid depth option '%s'" | |
7302 | msgstr "传输:无效的深度选项 '%s'" | |
7303 | ||
d46c5519 JX |
7304 | #: transport.c:259 |
7305 | msgid "see protocol.version in 'git help config' for more details" | |
7306 | msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" | |
7307 | ||
7308 | #: transport.c:260 | |
7309 | msgid "server options require protocol version 2 or later" | |
7310 | msgstr "服务端选项需要版本 2 协议或更高" | |
7311 | ||
7312 | #: transport.c:625 | |
fd8cb379 JX |
7313 | msgid "could not parse transport.color.* config" |
7314 | msgstr "不能解析 transport.color.* 配置" | |
7315 | ||
d46c5519 | 7316 | #: transport.c:698 |
c1ac5258 JX |
7317 | msgid "support for protocol v2 not implemented yet" |
7318 | msgstr "协议 v2 的支持尚未实现" | |
7319 | ||
d46c5519 | 7320 | #: transport.c:825 |
c1ac5258 JX |
7321 | #, c-format |
7322 | msgid "unknown value for config '%s': %s" | |
7323 | msgstr "配置 '%s' 的取值未知:%s" | |
7324 | ||
d46c5519 | 7325 | #: transport.c:891 |
c1ac5258 JX |
7326 | #, c-format |
7327 | msgid "transport '%s' not allowed" | |
7328 | msgstr "传输 '%s' 不允许" | |
7329 | ||
d46c5519 | 7330 | #: transport.c:945 |
c1ac5258 JX |
7331 | msgid "git-over-rsync is no longer supported" |
7332 | msgstr "不再支持 git-over-rsync" | |
7333 | ||
d46c5519 | 7334 | #: transport.c:1040 |
a0b6b246 JX |
7335 | #, c-format |
7336 | msgid "" | |
7337 | "The following submodule paths contain changes that can\n" | |
7338 | "not be found on any remote:\n" | |
7339 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
7340 | ||
d46c5519 | 7341 | #: transport.c:1044 |
a0b6b246 JX |
7342 | #, c-format |
7343 | msgid "" | |
7344 | "\n" | |
7345 | "Please try\n" | |
7346 | "\n" | |
7347 | "\tgit push --recurse-submodules=on-demand\n" | |
7348 | "\n" | |
7349 | "or cd to the path and use\n" | |
7350 | "\n" | |
7351 | "\tgit push\n" | |
7352 | "\n" | |
7353 | "to push them to a remote.\n" | |
7354 | "\n" | |
7355 | msgstr "" | |
7356 | "\n" | |
7357 | "请尝试\n" | |
7358 | "\n" | |
7359 | "\tgit push --recurse-submodules=on-demand\n" | |
7360 | "\n" | |
7361 | "或者进入到子目录执行\n" | |
7362 | "\n" | |
7363 | "\tgit push\n" | |
7364 | "\n" | |
7365 | "以推送至远程。\n" | |
7366 | "\n" | |
7367 | ||
d46c5519 | 7368 | #: transport.c:1052 |
a0b6b246 JX |
7369 | msgid "Aborting." |
7370 | msgstr "正在终止。" | |
7371 | ||
d46c5519 | 7372 | #: transport.c:1193 |
c1ac5258 JX |
7373 | msgid "failed to push all needed submodules" |
7374 | msgstr "不能推送全部需要的子模组" | |
7375 | ||
a6cd2cc4 | 7376 | #: transport.c:1340 transport-helper.c:645 |
c1ac5258 JX |
7377 | msgid "operation not supported by protocol" |
7378 | msgstr "协议不支持该操作" | |
7379 | ||
c1ac5258 JX |
7380 | #: transport-helper.c:51 transport-helper.c:80 |
7381 | msgid "full write to remote helper failed" | |
7382 | msgstr "完整写入远程助手失败" | |
7383 | ||
d46c5519 | 7384 | #: transport-helper.c:134 |
c1ac5258 JX |
7385 | #, c-format |
7386 | msgid "unable to find remote helper for '%s'" | |
7387 | msgstr "无法为 '%s' 找到远程助手" | |
7388 | ||
d46c5519 | 7389 | #: transport-helper.c:150 transport-helper.c:559 |
c1ac5258 JX |
7390 | msgid "can't dup helper output fd" |
7391 | msgstr "无法复制助手输出文件句柄" | |
7392 | ||
d46c5519 | 7393 | #: transport-helper.c:201 |
c1ac5258 JX |
7394 | #, c-format |
7395 | msgid "" | |
7396 | "unknown mandatory capability %s; this remote helper probably needs newer " | |
7397 | "version of Git" | |
7398 | msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" | |
7399 | ||
d46c5519 | 7400 | #: transport-helper.c:207 |
c1ac5258 JX |
7401 | msgid "this remote helper should implement refspec capability" |
7402 | msgstr "远程助手需要实现 refspec 能力" | |
7403 | ||
d46c5519 | 7404 | #: transport-helper.c:274 transport-helper.c:414 |
c1ac5258 JX |
7405 | #, c-format |
7406 | msgid "%s unexpectedly said: '%s'" | |
7407 | msgstr "%s 意外地说:'%s'" | |
7408 | ||
d46c5519 | 7409 | #: transport-helper.c:403 |
c1ac5258 JX |
7410 | #, c-format |
7411 | msgid "%s also locked %s" | |
7412 | msgstr "%s 也锁定了 %s" | |
7413 | ||
d46c5519 | 7414 | #: transport-helper.c:481 |
c1ac5258 JX |
7415 | msgid "couldn't run fast-import" |
7416 | msgstr "不能执行 fast-import" | |
7417 | ||
d46c5519 | 7418 | #: transport-helper.c:504 |
c1ac5258 JX |
7419 | msgid "error while running fast-import" |
7420 | msgstr "执行 fast-import 出错" | |
7421 | ||
a6cd2cc4 | 7422 | #: transport-helper.c:533 transport-helper.c:1105 |
c1ac5258 JX |
7423 | #, c-format |
7424 | msgid "could not read ref %s" | |
7425 | msgstr "无法读取引用 %s" | |
7426 | ||
d46c5519 | 7427 | #: transport-helper.c:578 |
c1ac5258 JX |
7428 | #, c-format |
7429 | msgid "unknown response to connect: %s" | |
7430 | msgstr "连接时未知的响应:%s" | |
7431 | ||
d46c5519 | 7432 | #: transport-helper.c:600 |
c1ac5258 JX |
7433 | msgid "setting remote service path not supported by protocol" |
7434 | msgstr "协议不支持设置远程服务路径" | |
7435 | ||
d46c5519 | 7436 | #: transport-helper.c:602 |
c1ac5258 JX |
7437 | msgid "invalid remote service path" |
7438 | msgstr "无效的远程服务路径" | |
7439 | ||
d46c5519 | 7440 | #: transport-helper.c:648 |
c1ac5258 JX |
7441 | #, c-format |
7442 | msgid "can't connect to subservice %s" | |
7443 | msgstr "不能连接到子服务 %s" | |
7444 | ||
d46c5519 | 7445 | #: transport-helper.c:720 |
c1ac5258 JX |
7446 | #, c-format |
7447 | msgid "expected ok/error, helper said '%s'" | |
7448 | msgstr "预期 ok/error,助手说 '%s'" | |
7449 | ||
d46c5519 | 7450 | #: transport-helper.c:773 |
c1ac5258 JX |
7451 | #, c-format |
7452 | msgid "helper reported unexpected status of %s" | |
7453 | msgstr "助手报告 %s 的意外状态" | |
7454 | ||
d46c5519 | 7455 | #: transport-helper.c:834 |
a0b6b246 | 7456 | #, c-format |
c1ac5258 JX |
7457 | msgid "helper %s does not support dry-run" |
7458 | msgstr "助手 %s 不支持 dry-run" | |
a0b6b246 | 7459 | |
d46c5519 | 7460 | #: transport-helper.c:837 |
c1ac5258 JX |
7461 | #, c-format |
7462 | msgid "helper %s does not support --signed" | |
7463 | msgstr "助手 %s 不支持 --signed" | |
7464 | ||
d46c5519 | 7465 | #: transport-helper.c:840 |
c1ac5258 JX |
7466 | #, c-format |
7467 | msgid "helper %s does not support --signed=if-asked" | |
7468 | msgstr "助手 %s 不支持 --signed=if-asked" | |
7469 | ||
d46c5519 | 7470 | #: transport-helper.c:847 |
c1ac5258 JX |
7471 | #, c-format |
7472 | msgid "helper %s does not support 'push-option'" | |
7473 | msgstr "助手 %s 不支持 'push-option'" | |
7474 | ||
a6cd2cc4 | 7475 | #: transport-helper.c:945 |
c1ac5258 JX |
7476 | msgid "remote-helper doesn't support push; refspec needed" |
7477 | msgstr "remote-heper 不支持 push,需要引用表达式" | |
7478 | ||
a6cd2cc4 | 7479 | #: transport-helper.c:950 |
c1ac5258 JX |
7480 | #, c-format |
7481 | msgid "helper %s does not support 'force'" | |
7482 | msgstr "助手 %s 不支持 'force'" | |
7483 | ||
a6cd2cc4 | 7484 | #: transport-helper.c:997 |
c1ac5258 JX |
7485 | msgid "couldn't run fast-export" |
7486 | msgstr "无法执行 fast-export" | |
7487 | ||
a6cd2cc4 | 7488 | #: transport-helper.c:1002 |
c1ac5258 JX |
7489 | msgid "error while running fast-export" |
7490 | msgstr "执行 fast-export 时出错" | |
7491 | ||
a6cd2cc4 | 7492 | #: transport-helper.c:1027 |
c1ac5258 JX |
7493 | #, c-format |
7494 | msgid "" | |
7495 | "No refs in common and none specified; doing nothing.\n" | |
7496 | "Perhaps you should specify a branch such as 'master'.\n" | |
7497 | msgstr "" | |
7498 | "没有共同的引用并且也没有指定,什么也不会做。\n" | |
7499 | "可能您应该指定一个分支如 'master'。\n" | |
7500 | ||
a6cd2cc4 | 7501 | #: transport-helper.c:1091 |
c1ac5258 JX |
7502 | #, c-format |
7503 | msgid "malformed response in ref list: %s" | |
7504 | msgstr "引用列表中格式错误的响应:%s" | |
7505 | ||
a6cd2cc4 | 7506 | #: transport-helper.c:1244 |
c1ac5258 JX |
7507 | #, c-format |
7508 | msgid "read(%s) failed" | |
7509 | msgstr "读取(%s)失败" | |
7510 | ||
a6cd2cc4 | 7511 | #: transport-helper.c:1271 |
c1ac5258 JX |
7512 | #, c-format |
7513 | msgid "write(%s) failed" | |
7514 | msgstr "写(%s)失败" | |
7515 | ||
a6cd2cc4 | 7516 | #: transport-helper.c:1320 |
c1ac5258 JX |
7517 | #, c-format |
7518 | msgid "%s thread failed" | |
7519 | msgstr "%s 线程失败" | |
7520 | ||
a6cd2cc4 | 7521 | #: transport-helper.c:1324 |
c1ac5258 JX |
7522 | #, c-format |
7523 | msgid "%s thread failed to join: %s" | |
e640d114 | 7524 | msgstr "%s 线程等待失败:%s" |
c1ac5258 | 7525 | |
a6cd2cc4 | 7526 | #: transport-helper.c:1343 transport-helper.c:1347 |
c1ac5258 JX |
7527 | #, c-format |
7528 | msgid "can't start thread for copying data: %s" | |
7529 | msgstr "不能启动线程来拷贝数据:%s" | |
7530 | ||
a6cd2cc4 | 7531 | #: transport-helper.c:1384 |
c1ac5258 JX |
7532 | #, c-format |
7533 | msgid "%s process failed to wait" | |
7534 | msgstr "%s 进程等待失败" | |
7535 | ||
a6cd2cc4 | 7536 | #: transport-helper.c:1388 |
c1ac5258 JX |
7537 | #, c-format |
7538 | msgid "%s process failed" | |
7539 | msgstr "%s 进程失败" | |
7540 | ||
a6cd2cc4 | 7541 | #: transport-helper.c:1406 transport-helper.c:1415 |
c1ac5258 JX |
7542 | msgid "can't start thread for copying data" |
7543 | msgstr "不能启动线程来拷贝数据" | |
7544 | ||
7545 | #: tree-walk.c:33 | |
a0b6b246 JX |
7546 | msgid "too-short tree object" |
7547 | msgstr "太短的树对象" | |
7548 | ||
c1ac5258 | 7549 | #: tree-walk.c:39 |
a0b6b246 | 7550 | msgid "malformed mode in tree entry" |
29004bbb | 7551 | msgstr "树对象中的条目模式错误" |
a0b6b246 | 7552 | |
c1ac5258 | 7553 | #: tree-walk.c:43 |
a0b6b246 JX |
7554 | msgid "empty filename in tree entry" |
7555 | msgstr "树对象条目中空的文件名" | |
7556 | ||
a6cd2cc4 | 7557 | #: tree-walk.c:118 |
a0b6b246 JX |
7558 | msgid "too-short tree file" |
7559 | msgstr "太短的树文件" | |
7560 | ||
06991777 | 7561 | #: unpack-trees.c:111 |
a0b6b246 JX |
7562 | #, c-format |
7563 | msgid "" | |
7564 | "Your local changes to the following files would be overwritten by checkout:\n" | |
7565 | "%%sPlease commit your changes or stash them before you switch branches." | |
7566 | msgstr "" | |
7567 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 7568 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 7569 | |
06991777 | 7570 | #: unpack-trees.c:113 |
a0b6b246 JX |
7571 | #, c-format |
7572 | msgid "" | |
7573 | "Your local changes to the following files would be overwritten by checkout:\n" | |
7574 | "%%s" | |
7575 | msgstr "" | |
7576 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
7577 | "%%s" | |
7578 | ||
06991777 | 7579 | #: unpack-trees.c:116 |
a0b6b246 JX |
7580 | #, c-format |
7581 | msgid "" | |
7582 | "Your local changes to the following files would be overwritten by merge:\n" | |
7583 | "%%sPlease commit your changes or stash them before you merge." | |
7584 | msgstr "" | |
7585 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 7586 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 7587 | |
06991777 | 7588 | #: unpack-trees.c:118 |
a0b6b246 JX |
7589 | #, c-format |
7590 | msgid "" | |
7591 | "Your local changes to the following files would be overwritten by merge:\n" | |
7592 | "%%s" | |
7593 | msgstr "" | |
7594 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
7595 | "%%s" | |
7596 | ||
06991777 | 7597 | #: unpack-trees.c:121 |
a0b6b246 JX |
7598 | #, c-format |
7599 | msgid "" | |
7600 | "Your local changes to the following files would be overwritten by %s:\n" | |
7601 | "%%sPlease commit your changes or stash them before you %s." | |
7602 | msgstr "" | |
7603 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 7604 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 7605 | |
06991777 | 7606 | #: unpack-trees.c:123 |
a0b6b246 JX |
7607 | #, c-format |
7608 | msgid "" | |
7609 | "Your local changes to the following files would be overwritten by %s:\n" | |
7610 | "%%s" | |
7611 | msgstr "" | |
7612 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
7613 | "%%s" | |
c04f5ac3 | 7614 | |
06991777 | 7615 | #: unpack-trees.c:128 |
a0b6b246 JX |
7616 | #, c-format |
7617 | msgid "" | |
1a79b2f1 | 7618 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
7619 | "%s" |
7620 | msgstr "" | |
7621 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
7622 | "%s" | |
1b7f4a34 | 7623 | |
06991777 | 7624 | #: unpack-trees.c:132 |
a0b6b246 JX |
7625 | #, c-format |
7626 | msgid "" | |
7627 | "The following untracked working tree files would be removed by checkout:\n" | |
7628 | "%%sPlease move or remove them before you switch branches." | |
7629 | msgstr "" | |
7630 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
7631 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 7632 | |
06991777 | 7633 | #: unpack-trees.c:134 |
a0b6b246 JX |
7634 | #, c-format |
7635 | msgid "" | |
7636 | "The following untracked working tree files would be removed by checkout:\n" | |
7637 | "%%s" | |
7638 | msgstr "" | |
7639 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
7640 | "%%s" | |
1003b3a5 | 7641 | |
06991777 | 7642 | #: unpack-trees.c:137 |
a0b6b246 JX |
7643 | #, c-format |
7644 | msgid "" | |
7645 | "The following untracked working tree files would be removed by merge:\n" | |
7646 | "%%sPlease move or remove them before you merge." | |
7647 | msgstr "" | |
7648 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
7649 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 7650 | |
06991777 | 7651 | #: unpack-trees.c:139 |
a0b6b246 JX |
7652 | #, c-format |
7653 | msgid "" | |
7654 | "The following untracked working tree files would be removed by merge:\n" | |
7655 | "%%s" | |
7656 | msgstr "" | |
7657 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
7658 | "%%s" | |
c04f5ac3 | 7659 | |
06991777 | 7660 | #: unpack-trees.c:142 |
a0b6b246 JX |
7661 | #, c-format |
7662 | msgid "" | |
7663 | "The following untracked working tree files would be removed by %s:\n" | |
7664 | "%%sPlease move or remove them before you %s." | |
7665 | msgstr "" | |
7666 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
7667 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 7668 | |
06991777 | 7669 | #: unpack-trees.c:144 |
a0b6b246 JX |
7670 | #, c-format |
7671 | msgid "" | |
7672 | "The following untracked working tree files would be removed by %s:\n" | |
7673 | "%%s" | |
7674 | msgstr "" | |
7675 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
7676 | "%%s" | |
c04f5ac3 | 7677 | |
06991777 | 7678 | #: unpack-trees.c:150 |
a0b6b246 JX |
7679 | #, c-format |
7680 | msgid "" | |
7681 | "The following untracked working tree files would be overwritten by " | |
7682 | "checkout:\n" | |
7683 | "%%sPlease move or remove them before you switch branches." | |
7684 | msgstr "" | |
7685 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
7686 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 7687 | |
06991777 | 7688 | #: unpack-trees.c:152 |
1003b3a5 | 7689 | #, c-format |
4dcdc3d8 | 7690 | msgid "" |
a0b6b246 JX |
7691 | "The following untracked working tree files would be overwritten by " |
7692 | "checkout:\n" | |
7693 | "%%s" | |
4dcdc3d8 | 7694 | msgstr "" |
a0b6b246 JX |
7695 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
7696 | "%%s" | |
1003b3a5 | 7697 | |
06991777 | 7698 | #: unpack-trees.c:155 |
c04f5ac3 | 7699 | #, c-format |
a0b6b246 JX |
7700 | msgid "" |
7701 | "The following untracked working tree files would be overwritten by merge:\n" | |
7702 | "%%sPlease move or remove them before you merge." | |
7703 | msgstr "" | |
7704 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
7705 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 7706 | |
06991777 | 7707 | #: unpack-trees.c:157 |
a0b6b246 JX |
7708 | #, c-format |
7709 | msgid "" | |
7710 | "The following untracked working tree files would be overwritten by merge:\n" | |
7711 | "%%s" | |
7712 | msgstr "" | |
7713 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
7714 | "%%s" | |
c04f5ac3 | 7715 | |
06991777 | 7716 | #: unpack-trees.c:160 |
a0b6b246 JX |
7717 | #, c-format |
7718 | msgid "" | |
7719 | "The following untracked working tree files would be overwritten by %s:\n" | |
7720 | "%%sPlease move or remove them before you %s." | |
7721 | msgstr "" | |
7722 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
7723 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 7724 | |
06991777 | 7725 | #: unpack-trees.c:162 |
07432cef | 7726 | #, c-format |
a0b6b246 JX |
7727 | msgid "" |
7728 | "The following untracked working tree files would be overwritten by %s:\n" | |
7729 | "%%s" | |
7730 | msgstr "" | |
7731 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
7732 | "%%s" | |
c04f5ac3 | 7733 | |
06991777 | 7734 | #: unpack-trees.c:170 |
07432cef | 7735 | #, c-format |
a0b6b246 JX |
7736 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
7737 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 7738 | |
06991777 | 7739 | #: unpack-trees.c:173 |
07432cef | 7740 | #, c-format |
ef317cd5 | 7741 | msgid "" |
6937cb4e | 7742 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
a0b6b246 JX |
7743 | "%s" |
7744 | msgstr "" | |
7745 | "无法更新稀疏检出:如下条目不是最新:\n" | |
7746 | "%s" | |
c04f5ac3 | 7747 | |
06991777 | 7748 | #: unpack-trees.c:175 |
07432cef | 7749 | #, c-format |
a0b6b246 JX |
7750 | msgid "" |
7751 | "The following working tree files would be overwritten by sparse checkout " | |
7752 | "update:\n" | |
7753 | "%s" | |
7754 | msgstr "" | |
7755 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
7756 | "%s" | |
c04f5ac3 | 7757 | |
06991777 | 7758 | #: unpack-trees.c:177 |
07432cef | 7759 | #, c-format |
a0b6b246 JX |
7760 | msgid "" |
7761 | "The following working tree files would be removed by sparse checkout " | |
7762 | "update:\n" | |
7763 | "%s" | |
7764 | msgstr "" | |
7765 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
7766 | "%s" | |
c04f5ac3 | 7767 | |
06991777 | 7768 | #: unpack-trees.c:179 |
87cb7997 JX |
7769 | #, c-format |
7770 | msgid "" | |
7771 | "Cannot update submodule:\n" | |
7772 | "%s" | |
7773 | msgstr "" | |
7774 | "无法更新子模组:\n" | |
7775 | "%s" | |
7776 | ||
d46c5519 | 7777 | #: unpack-trees.c:256 |
07432cef | 7778 | #, c-format |
a0b6b246 | 7779 | msgid "Aborting\n" |
a6cd2cc4 | 7780 | msgstr "正在终止\n" |
ef317cd5 | 7781 | |
d46c5519 | 7782 | #: unpack-trees.c:318 |
a6cd2cc4 JX |
7783 | msgid "Updating files" |
7784 | msgstr "正在更新文件" | |
c04f5ac3 | 7785 | |
d46c5519 | 7786 | #: unpack-trees.c:350 |
4c27fcb5 JX |
7787 | msgid "" |
7788 | "the following paths have collided (e.g. case-sensitive paths\n" | |
7789 | "on a case-insensitive filesystem) and only one from the same\n" | |
7790 | "colliding group is in the working tree:\n" | |
7791 | msgstr "" | |
7792 | "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n" | |
7793 | "并且碰撞组中只有一个文件存在工作区中:\n" | |
7794 | ||
87cb7997 | 7795 | #: urlmatch.c:163 |
a0b6b246 JX |
7796 | msgid "invalid URL scheme name or missing '://' suffix" |
7797 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
7798 | ||
87cb7997 | 7799 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 7800 | #, c-format |
a0b6b246 JX |
7801 | msgid "invalid %XX escape sequence" |
7802 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 7803 | |
87cb7997 | 7804 | #: urlmatch.c:215 |
a0b6b246 JX |
7805 | msgid "missing host and scheme is not 'file:'" |
7806 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 7807 | |
87cb7997 | 7808 | #: urlmatch.c:232 |
a0b6b246 JX |
7809 | msgid "a 'file:' URL may not have a port number" |
7810 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 7811 | |
87cb7997 | 7812 | #: urlmatch.c:247 |
a0b6b246 JX |
7813 | msgid "invalid characters in host name" |
7814 | msgstr "主机名中包含无效的字符" | |
90314792 | 7815 | |
87cb7997 | 7816 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
7817 | msgid "invalid port number" |
7818 | msgstr "无效的端口号" | |
c04f5ac3 | 7819 | |
87cb7997 | 7820 | #: urlmatch.c:371 |
a0b6b246 JX |
7821 | msgid "invalid '..' path segment" |
7822 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 7823 | |
a6cd2cc4 | 7824 | #: worktree.c:258 builtin/am.c:2095 |
a77c07d9 | 7825 | #, c-format |
a0b6b246 | 7826 | msgid "failed to read '%s'" |
c1ac5258 | 7827 | msgstr "读取 '%s' 失败" |
ef317cd5 | 7828 | |
a6cd2cc4 | 7829 | #: worktree.c:304 |
31e5e17b JX |
7830 | #, c-format |
7831 | msgid "'%s' at main working tree is not the repository directory" | |
7832 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
7833 | ||
a6cd2cc4 | 7834 | #: worktree.c:315 |
31e5e17b JX |
7835 | #, c-format |
7836 | msgid "'%s' file does not contain absolute path to the working tree location" | |
7837 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
7838 | ||
a6cd2cc4 | 7839 | #: worktree.c:327 |
31e5e17b JX |
7840 | #, c-format |
7841 | msgid "'%s' does not exist" | |
7842 | msgstr "'%s' 不存在" | |
7843 | ||
a6cd2cc4 | 7844 | #: worktree.c:333 |
31e5e17b JX |
7845 | #, c-format |
7846 | msgid "'%s' is not a .git file, error code %d" | |
7847 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
7848 | ||
a6cd2cc4 | 7849 | #: worktree.c:341 |
31e5e17b JX |
7850 | #, c-format |
7851 | msgid "'%s' does not point back to '%s'" | |
7852 | msgstr "'%s' 没有指回到 '%s'" | |
7853 | ||
a4f16749 | 7854 | #: wrapper.c:223 wrapper.c:393 |
c04f5ac3 | 7855 | #, c-format |
a0b6b246 JX |
7856 | msgid "could not open '%s' for reading and writing" |
7857 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 7858 | |
a4f16749 | 7859 | #: wrapper.c:424 wrapper.c:624 |
a0b6b246 JX |
7860 | #, c-format |
7861 | msgid "unable to access '%s'" | |
7862 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 7863 | |
a4f16749 | 7864 | #: wrapper.c:632 |
a0b6b246 JX |
7865 | msgid "unable to get current working directory" |
7866 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 7867 | |
a6cd2cc4 | 7868 | #: wt-status.c:158 |
a0b6b246 JX |
7869 | msgid "Unmerged paths:" |
7870 | msgstr "未合并的路径:" | |
7aea43ff | 7871 | |
a0b6b246 | 7872 | # 译者:注意保持前导空格 |
a6cd2cc4 JX |
7873 | #: wt-status.c:187 wt-status.c:219 |
7874 | msgid " (use \"git restore --staged <file>...\" to unstage)" | |
7875 | msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)" | |
7876 | ||
7877 | # 译者:注意保持前导空格 | |
7878 | #: wt-status.c:190 wt-status.c:222 | |
c04f5ac3 | 7879 | #, c-format |
a6cd2cc4 JX |
7880 | msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" |
7881 | msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)" | |
c04f5ac3 | 7882 | |
a0b6b246 | 7883 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7884 | #: wt-status.c:193 wt-status.c:225 |
a0b6b246 JX |
7885 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
7886 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 7887 | |
a0b6b246 | 7888 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7889 | #: wt-status.c:197 |
a0b6b246 JX |
7890 | msgid " (use \"git add <file>...\" to mark resolution)" |
7891 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 7892 | |
a0b6b246 | 7893 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7894 | #: wt-status.c:199 wt-status.c:203 |
a0b6b246 JX |
7895 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
7896 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 7897 | |
a0b6b246 | 7898 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7899 | #: wt-status.c:201 |
a0b6b246 JX |
7900 | msgid " (use \"git rm <file>...\" to mark resolution)" |
7901 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 7902 | |
a6cd2cc4 | 7903 | #: wt-status.c:211 wt-status.c:1074 |
a0b6b246 JX |
7904 | msgid "Changes to be committed:" |
7905 | msgstr "要提交的变更:" | |
ef317cd5 | 7906 | |
a6cd2cc4 | 7907 | #: wt-status.c:234 wt-status.c:1083 |
a0b6b246 JX |
7908 | msgid "Changes not staged for commit:" |
7909 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 7910 | |
a0b6b246 | 7911 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7912 | #: wt-status.c:238 |
a0b6b246 JX |
7913 | msgid " (use \"git add <file>...\" to update what will be committed)" |
7914 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 7915 | |
a0b6b246 | 7916 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7917 | #: wt-status.c:240 |
a0b6b246 JX |
7918 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
7919 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 7920 | |
a0b6b246 | 7921 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7922 | #: wt-status.c:241 |
a0b6b246 | 7923 | msgid "" |
a6cd2cc4 JX |
7924 | " (use \"git restore <file>...\" to discard changes in working directory)" |
7925 | msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 7926 | |
a0b6b246 | 7927 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7928 | #: wt-status.c:243 |
a0b6b246 JX |
7929 | msgid " (commit or discard the untracked or modified content in submodules)" |
7930 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 7931 | |
a0b6b246 | 7932 | # 译者:注意保持前导空格 |
a6cd2cc4 | 7933 | #: wt-status.c:254 |
a0b6b246 JX |
7934 | #, c-format |
7935 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
7936 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 7937 | |
a6cd2cc4 | 7938 | #: wt-status.c:268 |
a0b6b246 JX |
7939 | msgid "both deleted:" |
7940 | msgstr "双方删除:" | |
ef317cd5 | 7941 | |
a6cd2cc4 | 7942 | #: wt-status.c:270 |
a0b6b246 JX |
7943 | msgid "added by us:" |
7944 | msgstr "由我们添加:" | |
4dcdc3d8 | 7945 | |
a6cd2cc4 | 7946 | #: wt-status.c:272 |
a0b6b246 JX |
7947 | msgid "deleted by them:" |
7948 | msgstr "由他们删除:" | |
ef317cd5 | 7949 | |
a6cd2cc4 | 7950 | #: wt-status.c:274 |
a0b6b246 JX |
7951 | msgid "added by them:" |
7952 | msgstr "由他们添加:" | |
ef317cd5 | 7953 | |
a6cd2cc4 | 7954 | #: wt-status.c:276 |
a0b6b246 JX |
7955 | msgid "deleted by us:" |
7956 | msgstr "由我们删除:" | |
ef317cd5 | 7957 | |
a6cd2cc4 | 7958 | #: wt-status.c:278 |
a0b6b246 JX |
7959 | msgid "both added:" |
7960 | msgstr "双方添加:" | |
5c57d762 | 7961 | |
a6cd2cc4 | 7962 | #: wt-status.c:280 |
a0b6b246 JX |
7963 | msgid "both modified:" |
7964 | msgstr "双方修改:" | |
5c57d762 | 7965 | |
a6cd2cc4 | 7966 | #: wt-status.c:290 |
a0b6b246 JX |
7967 | msgid "new file:" |
7968 | msgstr "新文件:" | |
8ada9598 | 7969 | |
a6cd2cc4 | 7970 | #: wt-status.c:292 |
a0b6b246 JX |
7971 | msgid "copied:" |
7972 | msgstr "拷贝:" | |
8ada9598 | 7973 | |
a6cd2cc4 | 7974 | #: wt-status.c:294 |
a0b6b246 JX |
7975 | msgid "deleted:" |
7976 | msgstr "删除:" | |
8ada9598 | 7977 | |
a6cd2cc4 | 7978 | #: wt-status.c:296 |
a0b6b246 JX |
7979 | msgid "modified:" |
7980 | msgstr "修改:" | |
8ada9598 | 7981 | |
a6cd2cc4 | 7982 | #: wt-status.c:298 |
a0b6b246 JX |
7983 | msgid "renamed:" |
7984 | msgstr "重命名:" | |
5c57d762 | 7985 | |
a6cd2cc4 | 7986 | #: wt-status.c:300 |
a0b6b246 JX |
7987 | msgid "typechange:" |
7988 | msgstr "类型变更:" | |
8ada9598 | 7989 | |
a6cd2cc4 | 7990 | #: wt-status.c:302 |
a0b6b246 JX |
7991 | msgid "unknown:" |
7992 | msgstr "未知:" | |
8ada9598 | 7993 | |
a6cd2cc4 | 7994 | #: wt-status.c:304 |
a0b6b246 JX |
7995 | msgid "unmerged:" |
7996 | msgstr "未合并:" | |
8ada9598 | 7997 | |
a0b6b246 | 7998 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 7999 | #: wt-status.c:384 |
a0b6b246 JX |
8000 | msgid "new commits, " |
8001 | msgstr "新提交, " | |
8ada9598 | 8002 | |
a0b6b246 | 8003 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 8004 | #: wt-status.c:386 |
a0b6b246 JX |
8005 | msgid "modified content, " |
8006 | msgstr "修改的内容, " | |
1b7f4a34 | 8007 | |
a0b6b246 | 8008 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 8009 | #: wt-status.c:388 |
a0b6b246 JX |
8010 | msgid "untracked content, " |
8011 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 8012 | |
a6cd2cc4 | 8013 | #: wt-status.c:906 |
a4f16749 JX |
8014 | #, c-format |
8015 | msgid "Your stash currently has %d entry" | |
8016 | msgid_plural "Your stash currently has %d entries" | |
8017 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
8018 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
8019 | ||
a6cd2cc4 | 8020 | #: wt-status.c:938 |
a0b6b246 JX |
8021 | msgid "Submodules changed but not updated:" |
8022 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 8023 | |
a6cd2cc4 | 8024 | #: wt-status.c:940 |
a0b6b246 JX |
8025 | msgid "Submodule changes to be committed:" |
8026 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 8027 | |
a6cd2cc4 | 8028 | #: wt-status.c:1022 |
a0b6b246 | 8029 | msgid "" |
6937cb4e JX |
8030 | "Do not modify or remove the line above.\n" |
8031 | "Everything below it will be ignored." | |
a0b6b246 | 8032 | msgstr "" |
6937cb4e JX |
8033 | "不要改动或删除上面的一行。\n" |
8034 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 8035 | |
a6cd2cc4 JX |
8036 | #: wt-status.c:1114 |
8037 | #, c-format | |
8038 | msgid "" | |
8039 | "\n" | |
8040 | "It took %.2f seconds to compute the branch ahead/behind values.\n" | |
8041 | "You can use '--no-ahead-behind' to avoid this.\n" | |
8042 | msgstr "" | |
8043 | "\n" | |
8044 | "花了 %.2f 秒才计算出分支的领先/落后范围。\n" | |
8045 | "为避免,您可以使用 '--no-ahead-behind'。\n" | |
8046 | ||
8047 | #: wt-status.c:1144 | |
a0b6b246 JX |
8048 | msgid "You have unmerged paths." |
8049 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 8050 | |
a0b6b246 | 8051 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8052 | #: wt-status.c:1147 |
a0b6b246 JX |
8053 | msgid " (fix conflicts and run \"git commit\")" |
8054 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 8055 | |
a0b6b246 | 8056 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8057 | #: wt-status.c:1149 |
a0b6b246 JX |
8058 | msgid " (use \"git merge --abort\" to abort the merge)" |
8059 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 8060 | |
a6cd2cc4 | 8061 | #: wt-status.c:1153 |
a0b6b246 JX |
8062 | msgid "All conflicts fixed but you are still merging." |
8063 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 8064 | |
a0b6b246 | 8065 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8066 | #: wt-status.c:1156 |
a0b6b246 JX |
8067 | msgid " (use \"git commit\" to conclude merge)" |
8068 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 8069 | |
a6cd2cc4 | 8070 | #: wt-status.c:1165 |
a0b6b246 JX |
8071 | msgid "You are in the middle of an am session." |
8072 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 8073 | |
a6cd2cc4 | 8074 | #: wt-status.c:1168 |
a0b6b246 JX |
8075 | msgid "The current patch is empty." |
8076 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 8077 | |
a0b6b246 | 8078 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8079 | #: wt-status.c:1172 |
a0b6b246 JX |
8080 | msgid " (fix conflicts and then run \"git am --continue\")" |
8081 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 8082 | |
a0b6b246 | 8083 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8084 | #: wt-status.c:1174 |
a0b6b246 JX |
8085 | msgid " (use \"git am --skip\" to skip this patch)" |
8086 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 8087 | |
a0b6b246 | 8088 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8089 | #: wt-status.c:1176 |
a0b6b246 JX |
8090 | msgid " (use \"git am --abort\" to restore the original branch)" |
8091 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 8092 | |
a6cd2cc4 | 8093 | #: wt-status.c:1309 |
1a79b2f1 JX |
8094 | msgid "git-rebase-todo is missing." |
8095 | msgstr "git-rebase-todo 丢失。" | |
8096 | ||
a6cd2cc4 | 8097 | #: wt-status.c:1311 |
a0b6b246 JX |
8098 | msgid "No commands done." |
8099 | msgstr "没有命令被执行。" | |
8100 | ||
a6cd2cc4 | 8101 | #: wt-status.c:1314 |
1b7f4a34 | 8102 | #, c-format |
a0b6b246 JX |
8103 | msgid "Last command done (%d command done):" |
8104 | msgid_plural "Last commands done (%d commands done):" | |
8105 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
8106 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 8107 | |
a6cd2cc4 | 8108 | #: wt-status.c:1325 |
1b7f4a34 | 8109 | #, c-format |
a0b6b246 JX |
8110 | msgid " (see more in file %s)" |
8111 | msgstr " (更多参见文件 %s)" | |
8112 | ||
a6cd2cc4 | 8113 | #: wt-status.c:1330 |
a0b6b246 JX |
8114 | msgid "No commands remaining." |
8115 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 8116 | |
a6cd2cc4 | 8117 | #: wt-status.c:1333 |
1b7f4a34 | 8118 | #, c-format |
a0b6b246 JX |
8119 | msgid "Next command to do (%d remaining command):" |
8120 | msgid_plural "Next commands to do (%d remaining commands):" | |
8121 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
8122 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 8123 | |
a0b6b246 | 8124 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8125 | #: wt-status.c:1341 |
a0b6b246 JX |
8126 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
8127 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 8128 | |
a6cd2cc4 | 8129 | #: wt-status.c:1353 |
1b7f4a34 | 8130 | #, c-format |
a0b6b246 JX |
8131 | msgid "You are currently rebasing branch '%s' on '%s'." |
8132 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 8133 | |
a6cd2cc4 | 8134 | #: wt-status.c:1358 |
a0b6b246 JX |
8135 | msgid "You are currently rebasing." |
8136 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 8137 | |
a0b6b246 | 8138 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8139 | #: wt-status.c:1371 |
a0b6b246 JX |
8140 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
8141 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 8142 | |
a0b6b246 | 8143 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8144 | #: wt-status.c:1373 |
a0b6b246 JX |
8145 | msgid " (use \"git rebase --skip\" to skip this patch)" |
8146 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
8147 | ||
8148 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8149 | #: wt-status.c:1375 |
a0b6b246 JX |
8150 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
8151 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
8152 | ||
8153 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8154 | #: wt-status.c:1382 |
a0b6b246 JX |
8155 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
8156 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 8157 | |
a6cd2cc4 | 8158 | #: wt-status.c:1386 |
a0b6b246 | 8159 | #, c-format |
1b7f4a34 | 8160 | msgid "" |
a0b6b246 JX |
8161 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
8162 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 8163 | |
a6cd2cc4 | 8164 | #: wt-status.c:1391 |
a0b6b246 JX |
8165 | msgid "You are currently splitting a commit during a rebase." |
8166 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 8167 | |
a0b6b246 | 8168 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8169 | #: wt-status.c:1394 |
a0b6b246 JX |
8170 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
8171 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 8172 | |
a6cd2cc4 | 8173 | #: wt-status.c:1398 |
a0b6b246 JX |
8174 | #, c-format |
8175 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
8176 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 8177 | |
a6cd2cc4 | 8178 | #: wt-status.c:1403 |
a0b6b246 JX |
8179 | msgid "You are currently editing a commit during a rebase." |
8180 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 8181 | |
a0b6b246 | 8182 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8183 | #: wt-status.c:1406 |
a0b6b246 JX |
8184 | msgid " (use \"git commit --amend\" to amend the current commit)" |
8185 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
8186 | ||
8187 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8188 | #: wt-status.c:1408 |
a0b6b246 JX |
8189 | msgid "" |
8190 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
8191 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 8192 | |
a6cd2cc4 | 8193 | #: wt-status.c:1419 |
d46c5519 JX |
8194 | msgid "Cherry-pick currently in progress." |
8195 | msgstr "拣选操作正在进行中。" | |
8196 | ||
a6cd2cc4 | 8197 | #: wt-status.c:1422 |
1b7f4a34 | 8198 | #, c-format |
a0b6b246 JX |
8199 | msgid "You are currently cherry-picking commit %s." |
8200 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 8201 | |
a0b6b246 | 8202 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8203 | #: wt-status.c:1429 |
a0b6b246 JX |
8204 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
8205 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 8206 | |
a0b6b246 | 8207 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8208 | #: wt-status.c:1432 |
d46c5519 JX |
8209 | msgid " (run \"git cherry-pick --continue\" to continue)" |
8210 | msgstr " (执行 \"git cherry-pick --continue\" 以继续)" | |
8211 | ||
8212 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8213 | #: wt-status.c:1435 |
a0b6b246 JX |
8214 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
8215 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 8216 | |
a0b6b246 | 8217 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8218 | #: wt-status.c:1437 |
a0b6b246 JX |
8219 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
8220 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 8221 | |
a6cd2cc4 | 8222 | #: wt-status.c:1447 |
d46c5519 JX |
8223 | msgid "Revert currently in progress." |
8224 | msgstr "还原操作正在行中。" | |
8225 | ||
a6cd2cc4 | 8226 | #: wt-status.c:1450 |
1b7f4a34 | 8227 | #, c-format |
a0b6b246 JX |
8228 | msgid "You are currently reverting commit %s." |
8229 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 8230 | |
a0b6b246 | 8231 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8232 | #: wt-status.c:1456 |
a0b6b246 | 8233 | msgid " (fix conflicts and run \"git revert --continue\")" |
5b533632 | 8234 | msgstr " (解决冲突并执行 \"git revert --continue\")" |
1b7f4a34 | 8235 | |
a0b6b246 | 8236 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8237 | #: wt-status.c:1459 |
d46c5519 | 8238 | msgid " (run \"git revert --continue\" to continue)" |
5b533632 | 8239 | msgstr " (执行 \"git revert --continue\" 以继续)" |
d46c5519 JX |
8240 | |
8241 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 8242 | #: wt-status.c:1462 |
a0b6b246 | 8243 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
5b533632 | 8244 | msgstr " (所有冲突已解决:执行 \"git revert --continue\")" |
1b7f4a34 | 8245 | |
a0b6b246 | 8246 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8247 | #: wt-status.c:1464 |
a0b6b246 JX |
8248 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
8249 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 8250 | |
a6cd2cc4 | 8251 | #: wt-status.c:1474 |
1b7f4a34 | 8252 | #, c-format |
a0b6b246 JX |
8253 | msgid "You are currently bisecting, started from branch '%s'." |
8254 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 8255 | |
a6cd2cc4 | 8256 | #: wt-status.c:1478 |
a0b6b246 JX |
8257 | msgid "You are currently bisecting." |
8258 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 8259 | |
a0b6b246 | 8260 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8261 | #: wt-status.c:1481 |
a0b6b246 JX |
8262 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
8263 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 8264 | |
a6cd2cc4 | 8265 | #: wt-status.c:1690 |
a0b6b246 JX |
8266 | msgid "On branch " |
8267 | msgstr "位于分支 " | |
1b7f4a34 | 8268 | |
a6cd2cc4 | 8269 | #: wt-status.c:1697 |
a0b6b246 JX |
8270 | msgid "interactive rebase in progress; onto " |
8271 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 8272 | |
a6cd2cc4 | 8273 | #: wt-status.c:1699 |
a0b6b246 JX |
8274 | msgid "rebase in progress; onto " |
8275 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 8276 | |
a6cd2cc4 | 8277 | #: wt-status.c:1709 |
a0b6b246 JX |
8278 | msgid "Not currently on any branch." |
8279 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 8280 | |
a6cd2cc4 | 8281 | #: wt-status.c:1726 |
a0b6b246 JX |
8282 | msgid "Initial commit" |
8283 | msgstr "初始提交" | |
1b7f4a34 | 8284 | |
a6cd2cc4 | 8285 | #: wt-status.c:1727 |
a4f16749 JX |
8286 | msgid "No commits yet" |
8287 | msgstr "尚无提交" | |
8288 | ||
a6cd2cc4 | 8289 | #: wt-status.c:1741 |
a0b6b246 JX |
8290 | msgid "Untracked files" |
8291 | msgstr "未跟踪的文件" | |
1b7f4a34 | 8292 | |
a6cd2cc4 | 8293 | #: wt-status.c:1743 |
a0b6b246 JX |
8294 | msgid "Ignored files" |
8295 | msgstr "忽略的文件" | |
1b7f4a34 | 8296 | |
a6cd2cc4 | 8297 | #: wt-status.c:1747 |
a0b6b246 JX |
8298 | #, c-format |
8299 | msgid "" | |
8300 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
8301 | "may speed it up, but you have to be careful not to forget to add\n" | |
8302 | "new files yourself (see 'git help status')." | |
8303 | msgstr "" | |
8304 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
8305 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 8306 | |
a6cd2cc4 | 8307 | #: wt-status.c:1753 |
a0b6b246 JX |
8308 | #, c-format |
8309 | msgid "Untracked files not listed%s" | |
8310 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 8311 | |
a0b6b246 | 8312 | # 译者:中文字符串拼接,可删除前导空格 |
a6cd2cc4 | 8313 | #: wt-status.c:1755 |
a0b6b246 JX |
8314 | msgid " (use -u option to show untracked files)" |
8315 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 8316 | |
a6cd2cc4 | 8317 | #: wt-status.c:1761 |
a0b6b246 JX |
8318 | msgid "No changes" |
8319 | msgstr "没有修改" | |
1b7f4a34 | 8320 | |
a6cd2cc4 | 8321 | #: wt-status.c:1766 |
a0b6b246 JX |
8322 | #, c-format |
8323 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
8324 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 8325 | |
a6cd2cc4 | 8326 | #: wt-status.c:1769 |
a0b6b246 JX |
8327 | #, c-format |
8328 | msgid "no changes added to commit\n" | |
8329 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 8330 | |
a6cd2cc4 | 8331 | #: wt-status.c:1772 |
a0b6b246 JX |
8332 | #, c-format |
8333 | msgid "" | |
8334 | "nothing added to commit but untracked files present (use \"git add\" to " | |
8335 | "track)\n" | |
8336 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 8337 | |
a6cd2cc4 | 8338 | #: wt-status.c:1775 |
a0b6b246 JX |
8339 | #, c-format |
8340 | msgid "nothing added to commit but untracked files present\n" | |
8341 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 8342 | |
a0b6b246 | 8343 | # 译者:中文字符串拼接,可删除前导空格 |
a6cd2cc4 | 8344 | #: wt-status.c:1778 |
a0b6b246 JX |
8345 | #, c-format |
8346 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
8347 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 8348 | |
a6cd2cc4 | 8349 | #: wt-status.c:1781 wt-status.c:1786 |
a0b6b246 JX |
8350 | #, c-format |
8351 | msgid "nothing to commit\n" | |
8352 | msgstr "无文件要提交\n" | |
1b7f4a34 | 8353 | |
a0b6b246 | 8354 | # 译者:中文字符串拼接,可删除前导空格 |
a6cd2cc4 | 8355 | #: wt-status.c:1784 |
a0b6b246 JX |
8356 | #, c-format |
8357 | msgid "nothing to commit (use -u to show untracked files)\n" | |
8358 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 8359 | |
a0b6b246 | 8360 | # 译者:中文字符串拼接,可删除前导空格 |
a6cd2cc4 | 8361 | #: wt-status.c:1788 |
a0b6b246 JX |
8362 | #, c-format |
8363 | msgid "nothing to commit, working tree clean\n" | |
8364 | msgstr "无文件要提交,干净的工作区\n" | |
8365 | ||
a6cd2cc4 | 8366 | #: wt-status.c:1901 |
a4f16749 JX |
8367 | msgid "No commits yet on " |
8368 | msgstr "尚无提交在 " | |
1b7f4a34 | 8369 | |
a6cd2cc4 | 8370 | #: wt-status.c:1905 |
a0b6b246 JX |
8371 | msgid "HEAD (no branch)" |
8372 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 8373 | |
a6cd2cc4 | 8374 | #: wt-status.c:1936 |
31e5e17b JX |
8375 | msgid "different" |
8376 | msgstr "不同" | |
8377 | ||
a0b6b246 | 8378 | # 译者:注意保持句尾空格 |
a6cd2cc4 | 8379 | #: wt-status.c:1938 wt-status.c:1946 |
a0b6b246 JX |
8380 | msgid "behind " |
8381 | msgstr "落后 " | |
1b7f4a34 | 8382 | |
a6cd2cc4 | 8383 | #: wt-status.c:1941 wt-status.c:1944 |
a0b6b246 JX |
8384 | msgid "ahead " |
8385 | msgstr "领先 " | |
1b7f4a34 | 8386 | |
a0b6b246 | 8387 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
a6cd2cc4 | 8388 | #: wt-status.c:2466 |
a0b6b246 JX |
8389 | #, c-format |
8390 | msgid "cannot %s: You have unstaged changes." | |
8391 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 8392 | |
a6cd2cc4 | 8393 | #: wt-status.c:2472 |
a0b6b246 | 8394 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 8395 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 8396 | |
a6cd2cc4 | 8397 | #: wt-status.c:2474 |
a0b6b246 JX |
8398 | #, c-format |
8399 | msgid "cannot %s: Your index contains uncommitted changes." | |
8400 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 8401 | |
06991777 | 8402 | #: builtin/add.c:25 |
a0b6b246 JX |
8403 | msgid "git add [<options>] [--] <pathspec>..." |
8404 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 8405 | |
06991777 | 8406 | #: builtin/add.c:84 |
a0b6b246 JX |
8407 | #, c-format |
8408 | msgid "unexpected diff status %c" | |
8409 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 8410 | |
a6cd2cc4 | 8411 | #: builtin/add.c:89 builtin/commit.c:288 |
a0b6b246 JX |
8412 | msgid "updating files failed" |
8413 | msgstr "更新文件失败" | |
1b7f4a34 | 8414 | |
06991777 | 8415 | #: builtin/add.c:99 |
a0b6b246 JX |
8416 | #, c-format |
8417 | msgid "remove '%s'\n" | |
8418 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 8419 | |
06991777 | 8420 | #: builtin/add.c:174 |
a0b6b246 JX |
8421 | msgid "Unstaged changes after refreshing the index:" |
8422 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 8423 | |
06991777 | 8424 | #: builtin/add.c:234 builtin/rev-parse.c:896 |
a0b6b246 JX |
8425 | msgid "Could not read the index" |
8426 | msgstr "不能读取索引" | |
1b7f4a34 | 8427 | |
06991777 | 8428 | #: builtin/add.c:245 |
a0b6b246 JX |
8429 | #, c-format |
8430 | msgid "Could not open '%s' for writing." | |
c1ac5258 | 8431 | msgstr "无法为写入打开 '%s'。" |
1b7f4a34 | 8432 | |
06991777 | 8433 | #: builtin/add.c:249 |
a0b6b246 JX |
8434 | msgid "Could not write patch" |
8435 | msgstr "不能生成补丁" | |
1b7f4a34 | 8436 | |
06991777 | 8437 | #: builtin/add.c:252 |
a0b6b246 JX |
8438 | msgid "editing patch failed" |
8439 | msgstr "编辑补丁失败" | |
1b7f4a34 | 8440 | |
06991777 | 8441 | #: builtin/add.c:255 |
1b7f4a34 | 8442 | #, c-format |
a0b6b246 | 8443 | msgid "Could not stat '%s'" |
65e2041e | 8444 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 8445 | |
06991777 | 8446 | #: builtin/add.c:257 |
a0b6b246 JX |
8447 | msgid "Empty patch. Aborted." |
8448 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 8449 | |
06991777 | 8450 | #: builtin/add.c:262 |
a0b6b246 JX |
8451 | #, c-format |
8452 | msgid "Could not apply '%s'" | |
8453 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 8454 | |
06991777 | 8455 | #: builtin/add.c:270 |
a0b6b246 JX |
8456 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
8457 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 8458 | |
a6cd2cc4 JX |
8459 | #: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 |
8460 | #: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 | |
06991777 | 8461 | #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 |
a0b6b246 JX |
8462 | msgid "dry run" |
8463 | msgstr "演习" | |
8ada9598 | 8464 | |
06991777 | 8465 | #: builtin/add.c:293 |
a0b6b246 JX |
8466 | msgid "interactive picking" |
8467 | msgstr "交互式拣选" | |
8ada9598 | 8468 | |
a6cd2cc4 | 8469 | #: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 |
a0b6b246 JX |
8470 | msgid "select hunks interactively" |
8471 | msgstr "交互式挑选数据块" | |
8ada9598 | 8472 | |
06991777 | 8473 | #: builtin/add.c:295 |
a0b6b246 JX |
8474 | msgid "edit current diff and apply" |
8475 | msgstr "编辑当前差异并应用" | |
8ada9598 | 8476 | |
06991777 | 8477 | #: builtin/add.c:296 |
a0b6b246 JX |
8478 | msgid "allow adding otherwise ignored files" |
8479 | msgstr "允许添加忽略的文件" | |
8ada9598 | 8480 | |
06991777 | 8481 | #: builtin/add.c:297 |
a0b6b246 JX |
8482 | msgid "update tracked files" |
8483 | msgstr "更新已跟踪的文件" | |
8ada9598 | 8484 | |
06991777 | 8485 | #: builtin/add.c:298 |
5809aa05 JX |
8486 | msgid "renormalize EOL of tracked files (implies -u)" |
8487 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
8488 | ||
06991777 | 8489 | #: builtin/add.c:299 |
a0b6b246 JX |
8490 | msgid "record only the fact that the path will be added later" |
8491 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 8492 | |
06991777 | 8493 | #: builtin/add.c:300 |
a0b6b246 JX |
8494 | msgid "add changes from all tracked and untracked files" |
8495 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 8496 | |
06991777 | 8497 | #: builtin/add.c:303 |
a0b6b246 JX |
8498 | msgid "ignore paths removed in the working tree (same as --no-all)" |
8499 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 8500 | |
06991777 | 8501 | #: builtin/add.c:305 |
a0b6b246 JX |
8502 | msgid "don't add, only refresh the index" |
8503 | msgstr "不添加,只刷新索引" | |
8ada9598 | 8504 | |
06991777 | 8505 | #: builtin/add.c:306 |
a0b6b246 JX |
8506 | msgid "just skip files which cannot be added because of errors" |
8507 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 8508 | |
06991777 | 8509 | #: builtin/add.c:307 |
a0b6b246 JX |
8510 | msgid "check if - even missing - files are ignored in dry run" |
8511 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 8512 | |
d46c5519 | 8513 | #: builtin/add.c:309 builtin/update-index.c:1001 |
a0b6b246 JX |
8514 | msgid "override the executable bit of the listed files" |
8515 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 8516 | |
06991777 | 8517 | #: builtin/add.c:311 |
a4f16749 JX |
8518 | msgid "warn when adding an embedded repository" |
8519 | msgstr "创建一个嵌入式仓库时给予警告" | |
8520 | ||
06991777 | 8521 | #: builtin/add.c:326 |
a4f16749 JX |
8522 | #, c-format |
8523 | msgid "" | |
8524 | "You've added another git repository inside your current repository.\n" | |
8525 | "Clones of the outer repository will not contain the contents of\n" | |
8526 | "the embedded repository and will not know how to obtain it.\n" | |
8527 | "If you meant to add a submodule, use:\n" | |
8528 | "\n" | |
8529 | "\tgit submodule add <url> %s\n" | |
8530 | "\n" | |
8531 | "If you added this path by mistake, you can remove it from the\n" | |
8532 | "index with:\n" | |
8533 | "\n" | |
8534 | "\tgit rm --cached %s\n" | |
8535 | "\n" | |
8536 | "See \"git help submodule\" for more information." | |
8537 | msgstr "" | |
6937cb4e JX |
8538 | "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并" |
8539 | "且不知道该如何获取它。\n" | |
a4f16749 JX |
8540 | "如果您要添加一个子模组,使用:\n" |
8541 | "\n" | |
8542 | "\tgit submodule add <url> %s\n" | |
8543 | "\n" | |
8544 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
8545 | "\n" | |
8546 | "\tgit rm --cached %s\n" | |
8547 | "\n" | |
8548 | "参见 \"git help submodule\" 获取更多信息。" | |
8549 | ||
06991777 | 8550 | #: builtin/add.c:354 |
a4f16749 JX |
8551 | #, c-format |
8552 | msgid "adding embedded git repository: %s" | |
8553 | msgstr "正在添加嵌入式 git 仓库:%s" | |
8554 | ||
06991777 | 8555 | #: builtin/add.c:372 |
8ada9598 | 8556 | #, c-format |
a0b6b246 JX |
8557 | msgid "Use -f if you really want to add them.\n" |
8558 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 8559 | |
d46c5519 | 8560 | #: builtin/add.c:379 |
a0b6b246 JX |
8561 | msgid "adding files failed" |
8562 | msgstr "添加文件失败" | |
8ada9598 | 8563 | |
d46c5519 | 8564 | #: builtin/add.c:419 |
a0b6b246 JX |
8565 | msgid "-A and -u are mutually incompatible" |
8566 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 8567 | |
d46c5519 | 8568 | #: builtin/add.c:426 |
a0b6b246 JX |
8569 | msgid "Option --ignore-missing can only be used together with --dry-run" |
8570 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 8571 | |
d46c5519 | 8572 | #: builtin/add.c:430 |
8ada9598 | 8573 | #, c-format |
a0b6b246 JX |
8574 | msgid "--chmod param '%s' must be either -x or +x" |
8575 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 8576 | |
d46c5519 | 8577 | #: builtin/add.c:445 |
8ada9598 | 8578 | #, c-format |
a0b6b246 JX |
8579 | msgid "Nothing specified, nothing added.\n" |
8580 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 8581 | |
d46c5519 | 8582 | #: builtin/add.c:446 |
8ada9598 | 8583 | #, c-format |
a0b6b246 JX |
8584 | msgid "Maybe you wanted to say 'git add .'?\n" |
8585 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 8586 | |
06991777 | 8587 | #: builtin/am.c:348 |
a0b6b246 JX |
8588 | msgid "could not parse author script" |
8589 | msgstr "不能解析作者脚本" | |
8ada9598 | 8590 | |
06991777 | 8591 | #: builtin/am.c:432 |
81809b99 | 8592 | #, c-format |
a0b6b246 JX |
8593 | msgid "'%s' was deleted by the applypatch-msg hook" |
8594 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 8595 | |
d46c5519 | 8596 | #: builtin/am.c:474 |
8ada9598 | 8597 | #, c-format |
a0b6b246 JX |
8598 | msgid "Malformed input line: '%s'." |
8599 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 8600 | |
d46c5519 | 8601 | #: builtin/am.c:512 |
8ada9598 | 8602 | #, c-format |
a0b6b246 JX |
8603 | msgid "Failed to copy notes from '%s' to '%s'" |
8604 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 8605 | |
d46c5519 | 8606 | #: builtin/am.c:538 |
a0b6b246 JX |
8607 | msgid "fseek failed" |
8608 | msgstr "fseek 失败" | |
8ada9598 | 8609 | |
d46c5519 | 8610 | #: builtin/am.c:726 |
8ada9598 | 8611 | #, c-format |
a0b6b246 JX |
8612 | msgid "could not parse patch '%s'" |
8613 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 8614 | |
d46c5519 | 8615 | #: builtin/am.c:791 |
a0b6b246 JX |
8616 | msgid "Only one StGIT patch series can be applied at once" |
8617 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
8618 | ||
d46c5519 | 8619 | #: builtin/am.c:839 |
a0b6b246 JX |
8620 | msgid "invalid timestamp" |
8621 | msgstr "无效的时间戳" | |
8622 | ||
d46c5519 | 8623 | #: builtin/am.c:844 builtin/am.c:856 |
a0b6b246 JX |
8624 | msgid "invalid Date line" |
8625 | msgstr "无效的日期行" | |
8ada9598 | 8626 | |
d46c5519 | 8627 | #: builtin/am.c:851 |
a0b6b246 JX |
8628 | msgid "invalid timezone offset" |
8629 | msgstr "无效的时区偏移值" | |
8ada9598 | 8630 | |
d46c5519 | 8631 | #: builtin/am.c:944 |
a0b6b246 | 8632 | msgid "Patch format detection failed." |
87cb7997 | 8633 | msgstr "补丁格式探测失败。" |
8ada9598 | 8634 | |
a6cd2cc4 | 8635 | #: builtin/am.c:949 builtin/clone.c:407 |
8ada9598 | 8636 | #, c-format |
a0b6b246 | 8637 | msgid "failed to create directory '%s'" |
c1ac5258 | 8638 | msgstr "创建目录 '%s' 失败" |
8ada9598 | 8639 | |
d46c5519 | 8640 | #: builtin/am.c:954 |
a0b6b246 | 8641 | msgid "Failed to split patches." |
c1ac5258 | 8642 | msgstr "拆分补丁失败。" |
814ff314 | 8643 | |
a6cd2cc4 | 8644 | #: builtin/am.c:1084 builtin/commit.c:374 |
a0b6b246 JX |
8645 | msgid "unable to write index file" |
8646 | msgstr "无法写入索引文件" | |
8ada9598 | 8647 | |
d46c5519 | 8648 | #: builtin/am.c:1098 |
8ada9598 | 8649 | #, c-format |
a0b6b246 JX |
8650 | msgid "When you have resolved this problem, run \"%s --continue\"." |
8651 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 8652 | |
d46c5519 | 8653 | #: builtin/am.c:1099 |
81809b99 | 8654 | #, c-format |
a0b6b246 JX |
8655 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
8656 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 8657 | |
d46c5519 | 8658 | #: builtin/am.c:1100 |
81809b99 | 8659 | #, c-format |
a0b6b246 JX |
8660 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
8661 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 8662 | |
d46c5519 | 8663 | #: builtin/am.c:1183 |
4c27fcb5 JX |
8664 | msgid "Patch sent with format=flowed; space at the end of lines might be lost." |
8665 | msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。" | |
8666 | ||
d46c5519 | 8667 | #: builtin/am.c:1211 |
a4f16749 JX |
8668 | msgid "Patch is empty." |
8669 | msgstr "补丁为空。" | |
23ff3338 | 8670 | |
d46c5519 | 8671 | #: builtin/am.c:1277 |
8ada9598 | 8672 | #, c-format |
a4f16749 JX |
8673 | msgid "invalid ident line: %.*s" |
8674 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 8675 | |
d46c5519 | 8676 | #: builtin/am.c:1299 |
8ada9598 | 8677 | #, c-format |
a0b6b246 JX |
8678 | msgid "unable to parse commit %s" |
8679 | msgstr "不能解析提交 %s" | |
8ada9598 | 8680 | |
a6cd2cc4 | 8681 | #: builtin/am.c:1496 |
a0b6b246 JX |
8682 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
8683 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 8684 | |
a6cd2cc4 | 8685 | #: builtin/am.c:1498 |
a0b6b246 JX |
8686 | msgid "Using index info to reconstruct a base tree..." |
8687 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 8688 | |
a6cd2cc4 | 8689 | #: builtin/am.c:1517 |
a0b6b246 JX |
8690 | msgid "" |
8691 | "Did you hand edit your patch?\n" | |
8692 | "It does not apply to blobs recorded in its index." | |
8693 | msgstr "" | |
8694 | "您是否曾手动编辑过您的补丁?\n" | |
8695 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 8696 | |
a6cd2cc4 | 8697 | #: builtin/am.c:1523 |
a0b6b246 JX |
8698 | msgid "Falling back to patching base and 3-way merge..." |
8699 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 8700 | |
a6cd2cc4 | 8701 | #: builtin/am.c:1549 |
a0b6b246 JX |
8702 | msgid "Failed to merge in the changes." |
8703 | msgstr "无法合并变更。" | |
d691f479 | 8704 | |
a6cd2cc4 | 8705 | #: builtin/am.c:1581 |
a0b6b246 JX |
8706 | msgid "applying to an empty history" |
8707 | msgstr "正应用到一个空历史上" | |
8ada9598 | 8708 | |
a6cd2cc4 | 8709 | #: builtin/am.c:1628 builtin/am.c:1632 |
8ada9598 | 8710 | #, c-format |
a0b6b246 JX |
8711 | msgid "cannot resume: %s does not exist." |
8712 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 8713 | |
a6cd2cc4 | 8714 | #: builtin/am.c:1650 |
a0b6b246 JX |
8715 | msgid "Commit Body is:" |
8716 | msgstr "提交内容为:" | |
8ada9598 | 8717 | |
a0b6b246 JX |
8718 | # 译者:注意保持句尾空格 |
8719 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
8720 | #. in your translation. The program will only accept English | |
8721 | #. input at this point. | |
8722 | #. | |
a6cd2cc4 JX |
8723 | #: builtin/am.c:1660 |
8724 | #, c-format | |
a0b6b246 JX |
8725 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
8726 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 8727 | |
a6cd2cc4 | 8728 | #: builtin/am.c:1710 |
8ada9598 | 8729 | #, c-format |
a0b6b246 JX |
8730 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
8731 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 8732 | |
a6cd2cc4 | 8733 | #: builtin/am.c:1750 builtin/am.c:1818 |
81809b99 | 8734 | #, c-format |
a0b6b246 JX |
8735 | msgid "Applying: %.*s" |
8736 | msgstr "应用:%.*s" | |
8ada9598 | 8737 | |
a6cd2cc4 | 8738 | #: builtin/am.c:1767 |
a0b6b246 JX |
8739 | msgid "No changes -- Patch already applied." |
8740 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 8741 | |
a6cd2cc4 | 8742 | #: builtin/am.c:1773 |
81809b99 | 8743 | #, c-format |
a0b6b246 JX |
8744 | msgid "Patch failed at %s %.*s" |
8745 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 8746 | |
a6cd2cc4 | 8747 | #: builtin/am.c:1777 |
31e5e17b JX |
8748 | msgid "Use 'git am --show-current-patch' to see the failed patch" |
8749 | msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" | |
8ada9598 | 8750 | |
a6cd2cc4 | 8751 | #: builtin/am.c:1821 |
a0b6b246 JX |
8752 | msgid "" |
8753 | "No changes - did you forget to use 'git add'?\n" | |
8754 | "If there is nothing left to stage, chances are that something else\n" | |
8755 | "already introduced the same changes; you might want to skip this patch." | |
8756 | msgstr "" | |
8757 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
8758 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
8759 | "您也许想要跳过这个补丁。" | |
8ada9598 | 8760 | |
a6cd2cc4 | 8761 | #: builtin/am.c:1828 |
a0b6b246 JX |
8762 | msgid "" |
8763 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
8764 | "You should 'git add' each file with resolved conflicts to mark them as " |
8765 | "such.\n" | |
8766 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 8767 | msgstr "" |
a4f16749 JX |
8768 | "在您的索引中仍存在未合并的路径。\n" |
8769 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
8770 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 8771 | |
a6cd2cc4 | 8772 | #: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 |
06991777 | 8773 | #: builtin/reset.c:337 |
8ada9598 | 8774 | #, c-format |
a0b6b246 JX |
8775 | msgid "Could not parse object '%s'." |
8776 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 8777 | |
a6cd2cc4 | 8778 | #: builtin/am.c:1987 |
a0b6b246 | 8779 | msgid "failed to clean index" |
c1ac5258 | 8780 | msgstr "清空索引失败" |
5b04ee3b | 8781 | |
a6cd2cc4 | 8782 | #: builtin/am.c:2031 |
a0b6b246 JX |
8783 | msgid "" |
8784 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
8785 | "Not rewinding to ORIG_HEAD" | |
8786 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 8787 | |
a6cd2cc4 | 8788 | #: builtin/am.c:2128 |
8ada9598 | 8789 | #, c-format |
a0b6b246 JX |
8790 | msgid "Invalid value for --patch-format: %s" |
8791 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 8792 | |
a6cd2cc4 | 8793 | #: builtin/am.c:2164 |
a0b6b246 JX |
8794 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
8795 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 8796 | |
a6cd2cc4 | 8797 | #: builtin/am.c:2165 |
a0b6b246 JX |
8798 | msgid "git am [<options>] (--continue | --skip | --abort)" |
8799 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 8800 | |
a6cd2cc4 | 8801 | #: builtin/am.c:2171 |
a0b6b246 JX |
8802 | msgid "run interactively" |
8803 | msgstr "以交互式方式运行" | |
8ada9598 | 8804 | |
a6cd2cc4 | 8805 | #: builtin/am.c:2173 |
a0b6b246 JX |
8806 | msgid "historical option -- no-op" |
8807 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 8808 | |
a6cd2cc4 | 8809 | #: builtin/am.c:2175 |
a0b6b246 JX |
8810 | msgid "allow fall back on 3way merging if needed" |
8811 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 8812 | |
a6cd2cc4 JX |
8813 | #: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 |
8814 | #: builtin/repack.c:296 builtin/stash.c:806 | |
a0b6b246 JX |
8815 | msgid "be quiet" |
8816 | msgstr "静默模式" | |
8ada9598 | 8817 | |
a6cd2cc4 | 8818 | #: builtin/am.c:2178 |
a0b6b246 JX |
8819 | msgid "add a Signed-off-by line to the commit message" |
8820 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 8821 | |
a6cd2cc4 | 8822 | #: builtin/am.c:2181 |
a0b6b246 JX |
8823 | msgid "recode into utf8 (default)" |
8824 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 8825 | |
a6cd2cc4 | 8826 | #: builtin/am.c:2183 |
a0b6b246 JX |
8827 | msgid "pass -k flag to git-mailinfo" |
8828 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 8829 | |
a6cd2cc4 | 8830 | #: builtin/am.c:2185 |
a0b6b246 JX |
8831 | msgid "pass -b flag to git-mailinfo" |
8832 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 8833 | |
a6cd2cc4 | 8834 | #: builtin/am.c:2187 |
a0b6b246 JX |
8835 | msgid "pass -m flag to git-mailinfo" |
8836 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 8837 | |
a6cd2cc4 | 8838 | #: builtin/am.c:2189 |
a0b6b246 JX |
8839 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
8840 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 8841 | |
a6cd2cc4 | 8842 | #: builtin/am.c:2192 |
a0b6b246 JX |
8843 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
8844 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 8845 | |
a6cd2cc4 | 8846 | #: builtin/am.c:2195 |
a0b6b246 JX |
8847 | msgid "strip everything before a scissors line" |
8848 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 8849 | |
a6cd2cc4 JX |
8850 | #: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 |
8851 | #: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 | |
8852 | #: builtin/am.c:2224 | |
a0b6b246 JX |
8853 | msgid "pass it through git-apply" |
8854 | msgstr "传递给 git-apply" | |
8ada9598 | 8855 | |
a6cd2cc4 JX |
8856 | #: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 |
8857 | #: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 | |
8858 | #: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 | |
8859 | #: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 | |
8860 | #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 | |
8861 | #: parse-options.h:141 parse-options.h:162 parse-options.h:312 | |
a0b6b246 JX |
8862 | msgid "n" |
8863 | msgstr "n" | |
8ada9598 | 8864 | |
a6cd2cc4 JX |
8865 | #: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 |
8866 | #: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 | |
a0b6b246 JX |
8867 | msgid "format" |
8868 | msgstr "格式" | |
8ada9598 | 8869 | |
a6cd2cc4 | 8870 | #: builtin/am.c:2221 |
a0b6b246 JX |
8871 | msgid "format the patch(es) are in" |
8872 | msgstr "补丁的格式" | |
8ada9598 | 8873 | |
a6cd2cc4 | 8874 | #: builtin/am.c:2227 |
a0b6b246 JX |
8875 | msgid "override error message when patch failure occurs" |
8876 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 8877 | |
a6cd2cc4 | 8878 | #: builtin/am.c:2229 |
a0b6b246 JX |
8879 | msgid "continue applying patches after resolving a conflict" |
8880 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 8881 | |
a6cd2cc4 | 8882 | #: builtin/am.c:2232 |
a0b6b246 JX |
8883 | msgid "synonyms for --continue" |
8884 | msgstr "和 --continue 同义" | |
8ada9598 | 8885 | |
a6cd2cc4 | 8886 | #: builtin/am.c:2235 |
a0b6b246 JX |
8887 | msgid "skip the current patch" |
8888 | msgstr "跳过当前补丁" | |
23ff3338 | 8889 | |
a6cd2cc4 | 8890 | #: builtin/am.c:2238 |
a0b6b246 JX |
8891 | msgid "restore the original branch and abort the patching operation." |
8892 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 8893 | |
a6cd2cc4 | 8894 | #: builtin/am.c:2241 |
31e5e17b JX |
8895 | msgid "abort the patching operation but keep HEAD where it is." |
8896 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
8897 | ||
a6cd2cc4 | 8898 | #: builtin/am.c:2244 |
31e5e17b JX |
8899 | msgid "show the patch being applied." |
8900 | msgstr "显示正在应用的补丁。" | |
8901 | ||
a6cd2cc4 | 8902 | #: builtin/am.c:2248 |
a0b6b246 JX |
8903 | msgid "lie about committer date" |
8904 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 8905 | |
a6cd2cc4 | 8906 | #: builtin/am.c:2250 |
a0b6b246 JX |
8907 | msgid "use current timestamp for author date" |
8908 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 8909 | |
a6cd2cc4 JX |
8910 | #: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 |
8911 | #: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 | |
8912 | #: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 | |
a0b6b246 JX |
8913 | msgid "key-id" |
8914 | msgstr "key-id" | |
8ada9598 | 8915 | |
a6cd2cc4 | 8916 | #: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 |
a0b6b246 JX |
8917 | msgid "GPG-sign commits" |
8918 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 8919 | |
a6cd2cc4 | 8920 | #: builtin/am.c:2256 |
a0b6b246 JX |
8921 | msgid "(internal use for git-rebase)" |
8922 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 8923 | |
a6cd2cc4 | 8924 | #: builtin/am.c:2274 |
a0b6b246 JX |
8925 | msgid "" |
8926 | "The -b/--binary option has been a no-op for long time, and\n" | |
8927 | "it will be removed. Please do not use it anymore." | |
8928 | msgstr "" | |
8929 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
8930 | "请不要再使用它了。" | |
8ada9598 | 8931 | |
a6cd2cc4 | 8932 | #: builtin/am.c:2281 |
a0b6b246 | 8933 | msgid "failed to read the index" |
c1ac5258 | 8934 | msgstr "读取索引失败" |
8ada9598 | 8935 | |
a6cd2cc4 | 8936 | #: builtin/am.c:2296 |
a0b6b246 JX |
8937 | #, c-format |
8938 | msgid "previous rebase directory %s still exists but mbox given." | |
8939 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 8940 | |
a6cd2cc4 | 8941 | #: builtin/am.c:2320 |
a0b6b246 JX |
8942 | #, c-format |
8943 | msgid "" | |
8944 | "Stray %s directory found.\n" | |
8945 | "Use \"git am --abort\" to remove it." | |
8946 | msgstr "" | |
8947 | "发现了错误的 %s 目录。\n" | |
8948 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 8949 | |
a6cd2cc4 | 8950 | #: builtin/am.c:2326 |
a0b6b246 JX |
8951 | msgid "Resolve operation not in progress, we are not resuming." |
8952 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 8953 | |
a6cd2cc4 JX |
8954 | #: builtin/am.c:2336 |
8955 | msgid "interactive mode requires patches on the command line" | |
8956 | msgstr "交互式模式需要命令行上提供补丁" | |
8957 | ||
a0b6b246 JX |
8958 | #: builtin/apply.c:8 |
8959 | msgid "git apply [<options>] [<patch>...]" | |
8960 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 8961 | |
c04f5ac3 JX |
8962 | #: builtin/archive.c:17 |
8963 | #, c-format | |
8964 | msgid "could not create archive file '%s'" | |
90e6ef53 | 8965 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
8966 | |
8967 | #: builtin/archive.c:20 | |
8968 | msgid "could not redirect output" | |
195febda | 8969 | msgstr "不能重定向输出" |
c04f5ac3 JX |
8970 | |
8971 | #: builtin/archive.c:37 | |
8972 | msgid "git archive: Remote with no URL" | |
4375c10e | 8973 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 | 8974 | |
06991777 | 8975 | #: builtin/archive.c:61 |
31e5e17b JX |
8976 | msgid "git archive: expected ACK/NAK, got a flush packet" |
8977 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 8978 | |
06991777 | 8979 | #: builtin/archive.c:64 |
c04f5ac3 JX |
8980 | #, c-format |
8981 | msgid "git archive: NACK %s" | |
90e6ef53 | 8982 | msgstr "git archive:NACK %s" |
c04f5ac3 | 8983 | |
06991777 | 8984 | #: builtin/archive.c:65 |
c04f5ac3 | 8985 | msgid "git archive: protocol error" |
90e6ef53 | 8986 | msgstr "git archive:协议错误" |
c04f5ac3 | 8987 | |
06991777 | 8988 | #: builtin/archive.c:69 |
c04f5ac3 | 8989 | msgid "git archive: expected a flush" |
31e5e17b | 8990 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 8991 | |
06991777 | 8992 | #: builtin/bisect--helper.c:22 |
ef317cd5 | 8993 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 8994 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 8995 | |
06991777 | 8996 | #: builtin/bisect--helper.c:23 |
5809aa05 JX |
8997 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" |
8998 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
8999 | ||
06991777 | 9000 | #: builtin/bisect--helper.c:24 |
5809aa05 JX |
9001 | msgid "git bisect--helper --bisect-clean-state" |
9002 | msgstr "git bisect--helper --bisect-clean-state" | |
9003 | ||
06991777 JX |
9004 | #: builtin/bisect--helper.c:25 |
9005 | msgid "git bisect--helper --bisect-reset [<commit>]" | |
9006 | msgstr "git bisect--helper --bisect-reset [<提交>]" | |
9007 | ||
9008 | #: builtin/bisect--helper.c:26 | |
9009 | msgid "" | |
9010 | "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " | |
9011 | "<bad_term>" | |
9012 | msgstr "" | |
9013 | "git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语" | |
9014 | ">" | |
9015 | ||
9016 | #: builtin/bisect--helper.c:27 | |
9017 | msgid "" | |
9018 | "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " | |
9019 | "<bad_term>" | |
9020 | msgstr "" | |
9021 | "git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>" | |
9022 | ||
9023 | #: builtin/bisect--helper.c:28 | |
9024 | msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" | |
9025 | msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" | |
9026 | ||
9027 | #: builtin/bisect--helper.c:29 | |
9028 | msgid "" | |
9029 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
9030 | "term-new]" | |
9031 | msgstr "" | |
9032 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
9033 | "term-new]" | |
9034 | ||
9035 | #: builtin/bisect--helper.c:30 | |
9036 | msgid "" | |
9037 | "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" | |
9038 | "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" | |
9039 | msgstr "" | |
9040 | "git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}" | |
9041 | "=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]" | |
9042 | ||
9043 | #: builtin/bisect--helper.c:86 | |
5809aa05 JX |
9044 | #, c-format |
9045 | msgid "'%s' is not a valid term" | |
9046 | msgstr "'%s' 不是一个有效的术语" | |
9047 | ||
06991777 | 9048 | #: builtin/bisect--helper.c:90 |
5809aa05 JX |
9049 | #, c-format |
9050 | msgid "can't use the builtin command '%s' as a term" | |
9051 | msgstr "不能使用内置命令 '%s' 作为术语" | |
9052 | ||
06991777 | 9053 | #: builtin/bisect--helper.c:100 |
5809aa05 JX |
9054 | #, c-format |
9055 | msgid "can't change the meaning of the term '%s'" | |
9056 | msgstr "不能修改术语 '%s' 的含义" | |
9057 | ||
06991777 | 9058 | #: builtin/bisect--helper.c:111 |
5809aa05 JX |
9059 | msgid "please use two different terms" |
9060 | msgstr "请使用两个不同的术语" | |
9061 | ||
06991777 | 9062 | #: builtin/bisect--helper.c:118 |
5809aa05 JX |
9063 | msgid "could not open the file BISECT_TERMS" |
9064 | msgstr "不能打开文件 BISECT_TERMS" | |
9065 | ||
06991777 JX |
9066 | #: builtin/bisect--helper.c:155 |
9067 | #, c-format | |
9068 | msgid "We are not bisecting.\n" | |
9069 | msgstr "我们没有在二分查找。\n" | |
9070 | ||
9071 | #: builtin/bisect--helper.c:163 | |
9072 | #, c-format | |
9073 | msgid "'%s' is not a valid commit" | |
9074 | msgstr "'%s' 不是一个有效的提交" | |
9075 | ||
9076 | #: builtin/bisect--helper.c:174 | |
9077 | #, c-format | |
9078 | msgid "" | |
9079 | "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." | |
9080 | msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" | |
9081 | ||
9082 | #: builtin/bisect--helper.c:215 | |
9083 | #, c-format | |
9084 | msgid "Bad bisect_write argument: %s" | |
9085 | msgstr "坏的 bisect_write 参数:%s" | |
9086 | ||
9087 | #: builtin/bisect--helper.c:220 | |
9088 | #, c-format | |
9089 | msgid "couldn't get the oid of the rev '%s'" | |
5b533632 | 9090 | msgstr "无法获取版本 '%s' 的对象 ID" |
06991777 JX |
9091 | |
9092 | #: builtin/bisect--helper.c:232 | |
9093 | #, c-format | |
9094 | msgid "couldn't open the file '%s'" | |
9095 | msgstr "无法打开文件 '%s'" | |
9096 | ||
9097 | #: builtin/bisect--helper.c:258 | |
9098 | #, c-format | |
9099 | msgid "Invalid command: you're currently in a %s/%s bisect" | |
9100 | msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中" | |
9101 | ||
9102 | #: builtin/bisect--helper.c:285 | |
9103 | #, c-format | |
9104 | msgid "" | |
9105 | "You need to give me at least one %s and %s revision.\n" | |
9106 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
9107 | msgstr "" | |
9108 | "您需要给我至少一个 %s 和一个 %s 版本。\n" | |
9109 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" | |
9110 | ||
9111 | #: builtin/bisect--helper.c:289 | |
9112 | #, c-format | |
9113 | msgid "" | |
9114 | "You need to start by \"git bisect start\".\n" | |
9115 | "You then need to give me at least one %s and %s revision.\n" | |
9116 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
9117 | msgstr "" | |
9118 | "您需要执行 \"git bisect start\" 来开始。\n" | |
9119 | "然后需要提供我至少一个 %s 和一个 %s 版本。\n" | |
9120 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" | |
9121 | ||
9122 | #: builtin/bisect--helper.c:321 | |
9123 | #, c-format | |
9124 | msgid "bisecting only with a %s commit" | |
5b533632 | 9125 | msgstr "在只有一个 %s 提交的情况下二分查找" |
06991777 JX |
9126 | |
9127 | # 译者:注意保持句尾空格 | |
9128 | #. TRANSLATORS: Make sure to include [Y] and [n] in your | |
9129 | #. translation. The program will only accept English input | |
9130 | #. at this point. | |
9131 | #. | |
9132 | #: builtin/bisect--helper.c:329 | |
9133 | msgid "Are you sure [Y/n]? " | |
9134 | msgstr "您确认么[Y/n]? " | |
9135 | ||
9136 | #: builtin/bisect--helper.c:376 | |
9137 | msgid "no terms defined" | |
9138 | msgstr "未定义术语" | |
9139 | ||
9140 | #: builtin/bisect--helper.c:379 | |
9141 | #, c-format | |
9142 | msgid "" | |
9143 | "Your current terms are %s for the old state\n" | |
9144 | "and %s for the new state.\n" | |
9145 | msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n" | |
9146 | ||
9147 | #: builtin/bisect--helper.c:389 | |
9148 | #, c-format | |
9149 | msgid "" | |
9150 | "invalid argument %s for 'git bisect terms'.\n" | |
9151 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
9152 | msgstr "" | |
9153 | "命令 'git bisect terms' 的参数 %s 无效。\n" | |
9154 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
9155 | ||
9156 | #: builtin/bisect--helper.c:475 | |
9157 | #, c-format | |
9158 | msgid "unrecognized option: '%s'" | |
9159 | msgstr "未识别的选项:'%s'" | |
9160 | ||
9161 | #: builtin/bisect--helper.c:479 | |
9162 | #, c-format | |
9163 | msgid "'%s' does not appear to be a valid revision" | |
8e4e0555 | 9164 | msgstr "'%s' 看起来不是一个有效的版本" |
06991777 JX |
9165 | |
9166 | #: builtin/bisect--helper.c:511 | |
9167 | msgid "bad HEAD - I need a HEAD" | |
9168 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
9169 | ||
9170 | #: builtin/bisect--helper.c:526 | |
9171 | #, c-format | |
9172 | msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." | |
9173 | msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" | |
9174 | ||
9175 | #: builtin/bisect--helper.c:547 | |
9176 | msgid "won't bisect on cg-seek'ed tree" | |
9177 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
9178 | ||
9179 | #: builtin/bisect--helper.c:550 | |
9180 | msgid "bad HEAD - strange symbolic ref" | |
9181 | msgstr "坏的 HEAD - 奇怪的符号引用" | |
9182 | ||
a6cd2cc4 JX |
9183 | #: builtin/bisect--helper.c:574 |
9184 | #, c-format | |
9185 | msgid "invalid ref: '%s'" | |
9186 | msgstr "无效的引用:'%s'" | |
9187 | ||
9188 | #: builtin/bisect--helper.c:630 | |
ef317cd5 | 9189 | msgid "perform 'git bisect next'" |
07432cef | 9190 | msgstr "执行 'git bisect next'" |
ef317cd5 | 9191 | |
a6cd2cc4 | 9192 | #: builtin/bisect--helper.c:632 |
5809aa05 JX |
9193 | msgid "write the terms to .git/BISECT_TERMS" |
9194 | msgstr "将术语写入 .git/BISECT_TERMS" | |
9195 | ||
a6cd2cc4 | 9196 | #: builtin/bisect--helper.c:634 |
5809aa05 JX |
9197 | msgid "cleanup the bisection state" |
9198 | msgstr "清除二分查找状态" | |
9199 | ||
a6cd2cc4 | 9200 | #: builtin/bisect--helper.c:636 |
5809aa05 JX |
9201 | msgid "check for expected revs" |
9202 | msgstr "检查预期的版本" | |
9203 | ||
a6cd2cc4 | 9204 | #: builtin/bisect--helper.c:638 |
06991777 JX |
9205 | msgid "reset the bisection state" |
9206 | msgstr "清除二分查找状态" | |
9207 | ||
a6cd2cc4 | 9208 | #: builtin/bisect--helper.c:640 |
06991777 JX |
9209 | msgid "write out the bisection state in BISECT_LOG" |
9210 | msgstr "将二分查找的状态写入 BISECT_LOG" | |
9211 | ||
a6cd2cc4 | 9212 | #: builtin/bisect--helper.c:642 |
06991777 JX |
9213 | msgid "check and set terms in a bisection state" |
9214 | msgstr "在一个二分查找状态中检查和设置术语" | |
9215 | ||
a6cd2cc4 | 9216 | #: builtin/bisect--helper.c:644 |
06991777 JX |
9217 | msgid "check whether bad or good terms exist" |
9218 | msgstr "检查坏的或好的术语是否存在" | |
9219 | ||
a6cd2cc4 | 9220 | #: builtin/bisect--helper.c:646 |
06991777 JX |
9221 | msgid "print out the bisect terms" |
9222 | msgstr "打印二分查找术语" | |
9223 | ||
a6cd2cc4 | 9224 | #: builtin/bisect--helper.c:648 |
06991777 | 9225 | msgid "start the bisect session" |
5b533632 | 9226 | msgstr "启动二分查找过程" |
06991777 | 9227 | |
a6cd2cc4 | 9228 | #: builtin/bisect--helper.c:650 |
ef317cd5 | 9229 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 9230 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 9231 | |
a6cd2cc4 | 9232 | #: builtin/bisect--helper.c:652 |
06991777 JX |
9233 | msgid "no log for BISECT_WRITE" |
9234 | msgstr "BISECT_WRITE 无日志" | |
9235 | ||
a6cd2cc4 | 9236 | #: builtin/bisect--helper.c:669 |
5809aa05 JX |
9237 | msgid "--write-terms requires two arguments" |
9238 | msgstr "--write-terms 需要两个参数" | |
9239 | ||
a6cd2cc4 | 9240 | #: builtin/bisect--helper.c:673 |
5809aa05 | 9241 | msgid "--bisect-clean-state requires no arguments" |
8e4e0555 | 9242 | msgstr "--bisect-clean-state 不带参数" |
5809aa05 | 9243 | |
a6cd2cc4 | 9244 | #: builtin/bisect--helper.c:680 |
06991777 JX |
9245 | msgid "--bisect-reset requires either no argument or a commit" |
9246 | msgstr "--bisect-reset 无需参数或者需要一个提交" | |
9247 | ||
a6cd2cc4 | 9248 | #: builtin/bisect--helper.c:684 |
06991777 JX |
9249 | msgid "--bisect-write requires either 4 or 5 arguments" |
9250 | msgstr "--bisect-write 需要 4 或 5 个参数" | |
9251 | ||
a6cd2cc4 | 9252 | #: builtin/bisect--helper.c:690 |
06991777 JX |
9253 | msgid "--check-and-set-terms requires 3 arguments" |
9254 | msgstr "--check-and-set-terms 需要 3 个参数" | |
9255 | ||
a6cd2cc4 | 9256 | #: builtin/bisect--helper.c:696 |
06991777 JX |
9257 | msgid "--bisect-next-check requires 2 or 3 arguments" |
9258 | msgstr "--bisect-next-check 需要 2 或 3 个参数" | |
9259 | ||
a6cd2cc4 | 9260 | #: builtin/bisect--helper.c:702 |
06991777 JX |
9261 | msgid "--bisect-terms requires 0 or 1 argument" |
9262 | msgstr "--bisect-terms 需要 0 或 1 个参数" | |
9263 | ||
d46c5519 | 9264 | #: builtin/blame.c:32 |
7aea43ff JX |
9265 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
9266 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 9267 | |
d46c5519 | 9268 | #: builtin/blame.c:37 |
814ff314 JX |
9269 | msgid "<rev-opts> are documented in git-rev-list(1)" |
9270 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 9271 | |
a6cd2cc4 | 9272 | #: builtin/blame.c:410 |
fd8cb379 JX |
9273 | #, c-format |
9274 | msgid "expecting a color: %s" | |
9275 | msgstr "期望一个颜色:%s" | |
9276 | ||
a6cd2cc4 | 9277 | #: builtin/blame.c:417 |
fd8cb379 JX |
9278 | msgid "must end with a color" |
9279 | msgstr "必须以一个颜色结尾" | |
9280 | ||
a6cd2cc4 | 9281 | #: builtin/blame.c:730 |
fd8cb379 JX |
9282 | #, c-format |
9283 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
9284 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
9285 | ||
a6cd2cc4 | 9286 | #: builtin/blame.c:748 |
fd8cb379 JX |
9287 | msgid "invalid value for blame.coloring" |
9288 | msgstr "设置 blame.coloring 中的无效取值" | |
9289 | ||
a6cd2cc4 JX |
9290 | #: builtin/blame.c:823 |
9291 | #, c-format | |
9292 | msgid "cannot find revision %s to ignore" | |
9293 | msgstr "不能找到要忽略的版本 %s" | |
9294 | ||
9295 | #: builtin/blame.c:845 | |
ef317cd5 | 9296 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 9297 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 9298 | |
a6cd2cc4 | 9299 | #: builtin/blame.c:846 |
ef317cd5 | 9300 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 9301 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 9302 | |
a6cd2cc4 | 9303 | #: builtin/blame.c:847 |
ef317cd5 | 9304 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 9305 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 9306 | |
a6cd2cc4 | 9307 | #: builtin/blame.c:848 |
ef317cd5 | 9308 | msgid "Show work cost statistics" |
07432cef | 9309 | msgstr "显示命令消耗统计" |
ef317cd5 | 9310 | |
a6cd2cc4 | 9311 | #: builtin/blame.c:849 |
276ceeaa JX |
9312 | msgid "Force progress reporting" |
9313 | msgstr "强制进度显示" | |
9314 | ||
a6cd2cc4 | 9315 | #: builtin/blame.c:850 |
ef317cd5 | 9316 | msgid "Show output score for blame entries" |
07432cef | 9317 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 9318 | |
a6cd2cc4 | 9319 | #: builtin/blame.c:851 |
ef317cd5 | 9320 | msgid "Show original filename (Default: auto)" |
07432cef | 9321 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 9322 | |
a6cd2cc4 | 9323 | #: builtin/blame.c:852 |
ef317cd5 | 9324 | msgid "Show original linenumber (Default: off)" |
07432cef | 9325 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 9326 | |
a6cd2cc4 | 9327 | #: builtin/blame.c:853 |
ef317cd5 | 9328 | msgid "Show in a format designed for machine consumption" |
07432cef | 9329 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 9330 | |
a6cd2cc4 | 9331 | #: builtin/blame.c:854 |
ef317cd5 | 9332 | msgid "Show porcelain format with per-line commit information" |
07432cef | 9333 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 9334 | |
a6cd2cc4 | 9335 | #: builtin/blame.c:855 |
ef317cd5 | 9336 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 9337 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 9338 | |
a6cd2cc4 | 9339 | #: builtin/blame.c:856 |
ef317cd5 | 9340 | msgid "Show raw timestamp (Default: off)" |
07432cef | 9341 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 9342 | |
a6cd2cc4 | 9343 | #: builtin/blame.c:857 |
ef317cd5 | 9344 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 9345 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 9346 | |
a6cd2cc4 | 9347 | #: builtin/blame.c:858 |
ef317cd5 | 9348 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 9349 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 9350 | |
a6cd2cc4 | 9351 | #: builtin/blame.c:859 |
ef317cd5 | 9352 | msgid "Show author email instead of name (Default: off)" |
07432cef | 9353 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 9354 | |
a6cd2cc4 | 9355 | #: builtin/blame.c:860 |
ef317cd5 | 9356 | msgid "Ignore whitespace differences" |
07432cef | 9357 | msgstr "忽略空白差异" |
ef317cd5 | 9358 | |
a6cd2cc4 JX |
9359 | #: builtin/blame.c:861 builtin/log.c:1629 |
9360 | msgid "rev" | |
9361 | msgstr "版本" | |
9362 | ||
9363 | #: builtin/blame.c:861 | |
9364 | msgid "Ignore <rev> when blaming" | |
9365 | msgstr "在执行 blame 操作时忽略 <版本>" | |
9366 | ||
9367 | #: builtin/blame.c:862 | |
9368 | msgid "Ignore revisions from <file>" | |
9369 | msgstr "忽略来自 <文件> 中的版本" | |
9370 | ||
9371 | #: builtin/blame.c:863 | |
fd8cb379 JX |
9372 | msgid "color redundant metadata from previous line differently" |
9373 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
9374 | ||
a6cd2cc4 | 9375 | #: builtin/blame.c:864 |
fd8cb379 JX |
9376 | msgid "color lines by age" |
9377 | msgstr "依据时间着色" | |
9378 | ||
a6cd2cc4 | 9379 | #: builtin/blame.c:871 |
1a79b2f1 JX |
9380 | msgid "Use an experimental heuristic to improve diffs" |
9381 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 9382 | |
a6cd2cc4 | 9383 | #: builtin/blame.c:873 |
ef317cd5 | 9384 | msgid "Spend extra cycles to find better match" |
07432cef | 9385 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 9386 | |
a6cd2cc4 | 9387 | #: builtin/blame.c:874 |
ef317cd5 | 9388 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 9389 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 9390 | |
a6cd2cc4 | 9391 | #: builtin/blame.c:875 |
ef317cd5 | 9392 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 9393 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 9394 | |
a6cd2cc4 | 9395 | #: builtin/blame.c:876 builtin/blame.c:877 |
ef317cd5 | 9396 | msgid "score" |
07432cef | 9397 | msgstr "得分" |
ef317cd5 | 9398 | |
a6cd2cc4 | 9399 | #: builtin/blame.c:876 |
ef317cd5 | 9400 | msgid "Find line copies within and across files" |
07432cef | 9401 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 9402 | |
a6cd2cc4 | 9403 | #: builtin/blame.c:877 |
ef317cd5 | 9404 | msgid "Find line movements within and across files" |
07432cef | 9405 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 9406 | |
a6cd2cc4 | 9407 | #: builtin/blame.c:878 |
ef317cd5 | 9408 | msgid "n,m" |
07432cef | 9409 | msgstr "n,m" |
ef317cd5 | 9410 | |
a6cd2cc4 | 9411 | #: builtin/blame.c:878 |
ef317cd5 | 9412 | msgid "Process only line range n,m, counting from 1" |
07432cef | 9413 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 9414 | |
a6cd2cc4 | 9415 | #: builtin/blame.c:929 |
a0b6b246 JX |
9416 | msgid "--progress can't be used with --incremental or porcelain formats" |
9417 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
9418 | ||
a4f16749 JX |
9419 | #. TRANSLATORS: This string is used to tell us the |
9420 | #. maximum display width for a relative timestamp in | |
9421 | #. "git blame" output. For C locale, "4 years, 11 | |
9422 | #. months ago", which takes 22 places, is the longest | |
9423 | #. among various forms of relative timestamps, but | |
9424 | #. your language may need more or fewer display | |
9425 | #. columns. | |
9426 | #. | |
a6cd2cc4 | 9427 | #: builtin/blame.c:980 |
6c94aba5 JX |
9428 | msgid "4 years, 11 months ago" |
9429 | msgstr "4 年 11 个月前" | |
9430 | ||
a6cd2cc4 | 9431 | #: builtin/blame.c:1087 |
a0b6b246 JX |
9432 | #, c-format |
9433 | msgid "file %s has only %lu line" | |
9434 | msgid_plural "file %s has only %lu lines" | |
9435 | msgstr[0] "文件 %s 只有 %lu 行" | |
9436 | msgstr[1] "文件 %s 只有 %lu 行" | |
9437 | ||
a6cd2cc4 | 9438 | #: builtin/blame.c:1133 |
a4f16749 JX |
9439 | msgid "Blaming lines" |
9440 | msgstr "追踪代码行" | |
9441 | ||
4c27fcb5 | 9442 | #: builtin/branch.c:29 |
814ff314 JX |
9443 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
9444 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 9445 | |
4c27fcb5 | 9446 | #: builtin/branch.c:30 |
814ff314 JX |
9447 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
9448 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 9449 | |
4c27fcb5 | 9450 | #: builtin/branch.c:31 |
814ff314 JX |
9451 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
9452 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 9453 | |
4c27fcb5 | 9454 | #: builtin/branch.c:32 |
814ff314 JX |
9455 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
9456 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 9457 | |
4c27fcb5 | 9458 | #: builtin/branch.c:33 |
6937cb4e JX |
9459 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
9460 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
9461 | ||
4c27fcb5 | 9462 | #: builtin/branch.c:34 |
94550ed3 JX |
9463 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
9464 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
9465 | ||
4c27fcb5 | 9466 | #: builtin/branch.c:35 |
87cb7997 JX |
9467 | msgid "git branch [<options>] [-r | -a] [--format]" |
9468 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
9469 | ||
90e6ef53 | 9470 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 9471 | #: builtin/branch.c:154 |
c04f5ac3 JX |
9472 | #, c-format |
9473 | msgid "" | |
9474 | "deleting branch '%s' that has been merged to\n" | |
9475 | " '%s', but not yet merged to HEAD." | |
9476 | msgstr "" | |
70fc47bf | 9477 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
9478 | " '%s',但未合并到 HEAD。" |
9479 | ||
90e6ef53 | 9480 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 9481 | #: builtin/branch.c:158 |
c04f5ac3 JX |
9482 | #, c-format |
9483 | msgid "" | |
9484 | "not deleting branch '%s' that is not yet merged to\n" | |
9485 | " '%s', even though it is merged to HEAD." | |
9486 | msgstr "" | |
70fc47bf T |
9487 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
9488 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 9489 | |
a6cd2cc4 | 9490 | #: builtin/branch.c:172 |
07432cef WS |
9491 | #, c-format |
9492 | msgid "Couldn't look up commit object for '%s'" | |
9493 | msgstr "无法查询 '%s' 指向的提交对象" | |
9494 | ||
a6cd2cc4 | 9495 | #: builtin/branch.c:176 |
07432cef WS |
9496 | #, c-format |
9497 | msgid "" | |
9498 | "The branch '%s' is not fully merged.\n" | |
9499 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
9500 | msgstr "" | |
9501 | "分支 '%s' 没有完全合并。\n" | |
9502 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
9503 | ||
a6cd2cc4 | 9504 | #: builtin/branch.c:189 |
07432cef | 9505 | msgid "Update of config-file failed" |
6937cb4e | 9506 | msgstr "更新配置文件失败" |
07432cef | 9507 | |
a6cd2cc4 | 9508 | #: builtin/branch.c:220 |
c04f5ac3 | 9509 | msgid "cannot use -a with -d" |
649900bc | 9510 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 9511 | |
a6cd2cc4 | 9512 | #: builtin/branch.c:226 |
c04f5ac3 JX |
9513 | msgid "Couldn't look up commit object for HEAD" |
9514 | msgstr "无法查询 HEAD 指向的提交对象" | |
9515 | ||
a6cd2cc4 | 9516 | #: builtin/branch.c:240 |
c04f5ac3 | 9517 | #, c-format |
5b04ee3b JX |
9518 | msgid "Cannot delete branch '%s' checked out at '%s'" |
9519 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 9520 | |
a6cd2cc4 | 9521 | #: builtin/branch.c:255 |
5ae481e0 | 9522 | #, c-format |
7aea43ff JX |
9523 | msgid "remote-tracking branch '%s' not found." |
9524 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 9525 | |
a6cd2cc4 | 9526 | #: builtin/branch.c:256 |
81809b99 | 9527 | #, c-format |
8ada9598 | 9528 | msgid "branch '%s' not found." |
81809b99 | 9529 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 9530 | |
a6cd2cc4 | 9531 | #: builtin/branch.c:271 |
81809b99 | 9532 | #, c-format |
7aea43ff JX |
9533 | msgid "Error deleting remote-tracking branch '%s'" |
9534 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 9535 | |
a6cd2cc4 | 9536 | #: builtin/branch.c:272 |
81809b99 | 9537 | #, c-format |
8ada9598 | 9538 | msgid "Error deleting branch '%s'" |
7aea43ff | 9539 | msgstr "无法删除分支 '%s'" |
8ada9598 | 9540 | |
a6cd2cc4 | 9541 | #: builtin/branch.c:279 |
81809b99 | 9542 | #, c-format |
7aea43ff JX |
9543 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
9544 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 9545 | |
a6cd2cc4 | 9546 | #: builtin/branch.c:280 |
81809b99 | 9547 | #, c-format |
8ada9598 | 9548 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 9549 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 9550 | |
a6cd2cc4 | 9551 | #: builtin/branch.c:429 builtin/tag.c:61 |
6937cb4e JX |
9552 | msgid "unable to parse format string" |
9553 | msgstr "不能解析格式化字符串" | |
9554 | ||
a6cd2cc4 | 9555 | #: builtin/branch.c:460 |
d46c5519 JX |
9556 | msgid "could not resolve HEAD" |
9557 | msgstr "不能解析 HEAD 提交" | |
9558 | ||
a6cd2cc4 | 9559 | #: builtin/branch.c:466 |
5b04ee3b | 9560 | #, c-format |
d46c5519 JX |
9561 | msgid "HEAD (%s) points outside of refs/heads/" |
9562 | msgstr "HEAD (%s) 指向 refs/heads/ 之外" | |
9563 | ||
a6cd2cc4 | 9564 | #: builtin/branch.c:481 |
d46c5519 | 9565 | #, c-format |
5b04ee3b JX |
9566 | msgid "Branch %s is being rebased at %s" |
9567 | msgstr "分支 %s 正被变基到 %s" | |
9568 | ||
a6cd2cc4 | 9569 | #: builtin/branch.c:485 |
5b04ee3b JX |
9570 | #, c-format |
9571 | msgid "Branch %s is being bisected at %s" | |
9572 | msgstr "分支 %s 正被二分查找于 %s" | |
9573 | ||
a6cd2cc4 | 9574 | #: builtin/branch.c:502 |
6937cb4e JX |
9575 | msgid "cannot copy the current branch while not on any." |
9576 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
9577 | ||
a6cd2cc4 | 9578 | #: builtin/branch.c:504 |
c04f5ac3 | 9579 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 9580 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 9581 | |
a6cd2cc4 | 9582 | #: builtin/branch.c:515 |
c04f5ac3 JX |
9583 | #, c-format |
9584 | msgid "Invalid branch name: '%s'" | |
9585 | msgstr "无效的分支名:'%s'" | |
9586 | ||
a6cd2cc4 | 9587 | #: builtin/branch.c:542 |
c04f5ac3 JX |
9588 | msgid "Branch rename failed" |
9589 | msgstr "分支重命名失败" | |
9590 | ||
a6cd2cc4 | 9591 | #: builtin/branch.c:544 |
6937cb4e JX |
9592 | msgid "Branch copy failed" |
9593 | msgstr "分支拷贝失败" | |
9594 | ||
a6cd2cc4 | 9595 | #: builtin/branch.c:548 |
6937cb4e | 9596 | #, c-format |
5809aa05 JX |
9597 | msgid "Created a copy of a misnamed branch '%s'" |
9598 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 9599 | |
a6cd2cc4 | 9600 | #: builtin/branch.c:551 |
c04f5ac3 JX |
9601 | #, c-format |
9602 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 9603 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 9604 | |
a6cd2cc4 | 9605 | #: builtin/branch.c:557 |
c04f5ac3 JX |
9606 | #, c-format |
9607 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
9608 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
9609 | ||
a6cd2cc4 | 9610 | #: builtin/branch.c:566 |
c04f5ac3 | 9611 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
9612 | msgstr "分支被重命名,但更新配置文件失败" |
9613 | ||
a6cd2cc4 | 9614 | #: builtin/branch.c:568 |
6937cb4e JX |
9615 | msgid "Branch is copied, but update of config-file failed" |
9616 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 9617 | |
a6cd2cc4 | 9618 | #: builtin/branch.c:584 |
5c57d762 JX |
9619 | #, c-format |
9620 | msgid "" | |
9621 | "Please edit the description for the branch\n" | |
9622 | " %s\n" | |
9623 | "Lines starting with '%c' will be stripped.\n" | |
9624 | msgstr "" | |
9625 | "请编辑分支的描述\n" | |
9626 | " %s\n" | |
9627 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 9628 | |
a6cd2cc4 | 9629 | #: builtin/branch.c:618 |
ef317cd5 | 9630 | msgid "Generic options" |
07432cef | 9631 | msgstr "通用选项" |
c04f5ac3 | 9632 | |
a6cd2cc4 | 9633 | #: builtin/branch.c:620 |
ef317cd5 | 9634 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 9635 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 9636 | |
a6cd2cc4 | 9637 | #: builtin/branch.c:621 |
ef317cd5 | 9638 | msgid "suppress informational messages" |
07432cef | 9639 | msgstr "不显示信息" |
8ada9598 | 9640 | |
a6cd2cc4 | 9641 | #: builtin/branch.c:622 |
ef317cd5 | 9642 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 9643 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 9644 | |
a6cd2cc4 | 9645 | #: builtin/branch.c:624 |
6937cb4e JX |
9646 | msgid "do not use" |
9647 | msgstr "不要使用" | |
c04f5ac3 | 9648 | |
a6cd2cc4 | 9649 | #: builtin/branch.c:626 builtin/rebase.c:485 |
5b04ee3b JX |
9650 | msgid "upstream" |
9651 | msgstr "上游" | |
9652 | ||
a6cd2cc4 | 9653 | #: builtin/branch.c:626 |
5b04ee3b JX |
9654 | msgid "change the upstream info" |
9655 | msgstr "改变上游信息" | |
9656 | ||
a6cd2cc4 | 9657 | #: builtin/branch.c:627 |
a0b6b246 JX |
9658 | msgid "Unset the upstream info" |
9659 | msgstr "取消上游信息的设置" | |
9660 | ||
a6cd2cc4 | 9661 | #: builtin/branch.c:628 |
ef317cd5 | 9662 | msgid "use colored output" |
07432cef | 9663 | msgstr "使用彩色输出" |
c04f5ac3 | 9664 | |
a6cd2cc4 | 9665 | #: builtin/branch.c:629 |
ef317cd5 | 9666 | msgid "act on remote-tracking branches" |
07432cef | 9667 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 9668 | |
a6cd2cc4 | 9669 | #: builtin/branch.c:631 builtin/branch.c:633 |
ef317cd5 | 9670 | msgid "print only branches that contain the commit" |
07432cef | 9671 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 9672 | |
a6cd2cc4 | 9673 | #: builtin/branch.c:632 builtin/branch.c:634 |
87cb7997 JX |
9674 | msgid "print only branches that don't contain the commit" |
9675 | msgstr "只打印不包含该提交的分支" | |
9676 | ||
a6cd2cc4 | 9677 | #: builtin/branch.c:637 |
ef317cd5 | 9678 | msgid "Specific git-branch actions:" |
07432cef | 9679 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 9680 | |
a6cd2cc4 | 9681 | #: builtin/branch.c:638 |
ef317cd5 | 9682 | msgid "list both remote-tracking and local branches" |
07432cef | 9683 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 9684 | |
a6cd2cc4 | 9685 | #: builtin/branch.c:640 |
ef317cd5 | 9686 | msgid "delete fully merged branch" |
07432cef | 9687 | msgstr "删除完全合并的分支" |
c04f5ac3 | 9688 | |
a6cd2cc4 | 9689 | #: builtin/branch.c:641 |
ef317cd5 | 9690 | msgid "delete branch (even if not merged)" |
07432cef | 9691 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 9692 | |
a6cd2cc4 | 9693 | #: builtin/branch.c:642 |
ef317cd5 | 9694 | msgid "move/rename a branch and its reflog" |
07432cef | 9695 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 9696 | |
a6cd2cc4 | 9697 | #: builtin/branch.c:643 |
ef317cd5 | 9698 | msgid "move/rename a branch, even if target exists" |
07432cef | 9699 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 9700 | |
a6cd2cc4 | 9701 | #: builtin/branch.c:644 |
6937cb4e JX |
9702 | msgid "copy a branch and its reflog" |
9703 | msgstr "拷贝一个分支和它的引用日志" | |
9704 | ||
a6cd2cc4 | 9705 | #: builtin/branch.c:645 |
6937cb4e JX |
9706 | msgid "copy a branch, even if target exists" |
9707 | msgstr "拷贝一个分支,即使目标已存在" | |
9708 | ||
a6cd2cc4 | 9709 | #: builtin/branch.c:646 |
ef317cd5 | 9710 | msgid "list branch names" |
07432cef | 9711 | msgstr "列出分支名" |
c04f5ac3 | 9712 | |
a6cd2cc4 | 9713 | #: builtin/branch.c:647 |
d46c5519 JX |
9714 | msgid "show current branch name" |
9715 | msgstr "显示当前分支名" | |
9716 | ||
a6cd2cc4 | 9717 | #: builtin/branch.c:648 |
ef317cd5 | 9718 | msgid "create the branch's reflog" |
07432cef | 9719 | msgstr "创建分支的引用日志" |
ef317cd5 | 9720 | |
a6cd2cc4 | 9721 | #: builtin/branch.c:650 |
ef317cd5 | 9722 | msgid "edit the description for the branch" |
07432cef | 9723 | msgstr "标记分支的描述" |
ef317cd5 | 9724 | |
a6cd2cc4 | 9725 | #: builtin/branch.c:651 |
04cb2f28 JX |
9726 | msgid "force creation, move/rename, deletion" |
9727 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 9728 | |
a6cd2cc4 | 9729 | #: builtin/branch.c:652 |
94550ed3 JX |
9730 | msgid "print only branches that are merged" |
9731 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 9732 | |
a6cd2cc4 | 9733 | #: builtin/branch.c:653 |
94550ed3 JX |
9734 | msgid "print only branches that are not merged" |
9735 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 9736 | |
a6cd2cc4 | 9737 | #: builtin/branch.c:654 |
ef317cd5 | 9738 | msgid "list branches in columns" |
07432cef | 9739 | msgstr "以列的方式显示分支" |
ef317cd5 | 9740 | |
a6cd2cc4 | 9741 | #: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 |
06991777 | 9742 | #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 |
a6cd2cc4 | 9743 | #: builtin/tag.c:433 |
94550ed3 JX |
9744 | msgid "object" |
9745 | msgstr "对象" | |
9746 | ||
a6cd2cc4 | 9747 | #: builtin/branch.c:658 |
94550ed3 JX |
9748 | msgid "print only branches of the object" |
9749 | msgstr "只打印指向该对象的分支" | |
9750 | ||
a6cd2cc4 | 9751 | #: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 |
1a79b2f1 JX |
9752 | msgid "sorting and filtering are case insensitive" |
9753 | msgstr "排序和过滤属于大小写不敏感" | |
9754 | ||
a6cd2cc4 JX |
9755 | #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 |
9756 | #: builtin/verify-tag.c:38 | |
87cb7997 JX |
9757 | msgid "format to use for the output" |
9758 | msgstr "输出格式" | |
9759 | ||
a6cd2cc4 | 9760 | #: builtin/branch.c:684 builtin/clone.c:761 |
c04f5ac3 | 9761 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 9762 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 9763 | |
a6cd2cc4 | 9764 | #: builtin/branch.c:708 |
8ada9598 | 9765 | msgid "--column and --verbose are incompatible" |
81809b99 | 9766 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 9767 | |
a6cd2cc4 | 9768 | #: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 |
a77c07d9 JX |
9769 | msgid "branch name required" |
9770 | msgstr "必须提供分支名" | |
9771 | ||
a6cd2cc4 | 9772 | #: builtin/branch.c:753 |
a77c07d9 JX |
9773 | msgid "Cannot give description to detached HEAD" |
9774 | msgstr "不能向分离头指针提供描述" | |
9775 | ||
a6cd2cc4 | 9776 | #: builtin/branch.c:758 |
a77c07d9 JX |
9777 | msgid "cannot edit description of more than one branch" |
9778 | msgstr "不能为一个以上的分支编辑描述" | |
9779 | ||
a6cd2cc4 | 9780 | #: builtin/branch.c:765 |
a77c07d9 JX |
9781 | #, c-format |
9782 | msgid "No commit on branch '%s' yet." | |
9783 | msgstr "分支 '%s' 尚无提交。" | |
9784 | ||
a6cd2cc4 | 9785 | #: builtin/branch.c:768 |
a77c07d9 JX |
9786 | #, c-format |
9787 | msgid "No branch named '%s'." | |
9788 | msgstr "没有分支 '%s'。" | |
9789 | ||
a6cd2cc4 | 9790 | #: builtin/branch.c:783 |
6937cb4e JX |
9791 | msgid "too many branches for a copy operation" |
9792 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 9793 | |
a6cd2cc4 | 9794 | #: builtin/branch.c:792 |
6937cb4e JX |
9795 | msgid "too many arguments for a rename operation" |
9796 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 9797 | |
a6cd2cc4 | 9798 | #: builtin/branch.c:797 |
6937cb4e JX |
9799 | msgid "too many arguments to set new upstream" |
9800 | msgstr "为设置新上游提供了太多的参数" | |
9801 | ||
a6cd2cc4 | 9802 | #: builtin/branch.c:801 |
1003b3a5 JX |
9803 | #, c-format |
9804 | msgid "" | |
9805 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
9806 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
9807 | ||
a6cd2cc4 | 9808 | #: builtin/branch.c:804 builtin/branch.c:827 |
1003b3a5 JX |
9809 | #, c-format |
9810 | msgid "no such branch '%s'" | |
9811 | msgstr "没有此分支 '%s'" | |
9812 | ||
a6cd2cc4 | 9813 | #: builtin/branch.c:808 |
07432cef | 9814 | #, c-format |
ef317cd5 | 9815 | msgid "branch '%s' does not exist" |
07432cef | 9816 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 9817 | |
a6cd2cc4 | 9818 | #: builtin/branch.c:821 |
6937cb4e JX |
9819 | msgid "too many arguments to unset upstream" |
9820 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 9821 | |
a6cd2cc4 | 9822 | #: builtin/branch.c:825 |
1003b3a5 JX |
9823 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
9824 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
9825 | ||
a6cd2cc4 | 9826 | #: builtin/branch.c:831 |
ef317cd5 JX |
9827 | #, c-format |
9828 | msgid "Branch '%s' has no upstream information" | |
07432cef | 9829 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 9830 | |
a6cd2cc4 JX |
9831 | #: builtin/branch.c:841 |
9832 | msgid "" | |
9833 | "The -a, and -r, options to 'git branch' do not take a branch name.\n" | |
9834 | "Did you mean to use: -a|-r --list <pattern>?" | |
9835 | msgstr "" | |
9836 | "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" | |
9837 | "您是否想要使用:-a|-r --list <模式>?" | |
c04f5ac3 | 9838 | |
a6cd2cc4 | 9839 | #: builtin/branch.c:845 |
ef317cd5 | 9840 | msgid "" |
6937cb4e JX |
9841 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
9842 | "'--set-upstream-to' instead." | |
ef317cd5 | 9843 | msgstr "" |
6937cb4e | 9844 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" |
ef317cd5 | 9845 | |
87cb7997 | 9846 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
9847 | #, c-format |
9848 | msgid "%s is okay\n" | |
9849 | msgstr "%s 可以\n" | |
9850 | ||
87cb7997 | 9851 | #: builtin/bundle.c:58 |
c04f5ac3 | 9852 | msgid "Need a repository to create a bundle." |
160fb2b2 | 9853 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 9854 | |
87cb7997 | 9855 | #: builtin/bundle.c:62 |
c04f5ac3 | 9856 | msgid "Need a repository to unbundle." |
160fb2b2 | 9857 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 9858 | |
a6cd2cc4 | 9859 | #: builtin/cat-file.c:594 |
7aea43ff | 9860 | msgid "" |
a0b6b246 JX |
9861 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
9862 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
9863 | msgstr "" |
9864 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
9865 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 9866 | |
a6cd2cc4 | 9867 | #: builtin/cat-file.c:595 |
a0b6b246 JX |
9868 | msgid "" |
9869 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
9870 | "filters]" | |
275588f9 JX |
9871 | msgstr "" |
9872 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
9873 | "filters]" | |
ef317cd5 | 9874 | |
a6cd2cc4 | 9875 | #: builtin/cat-file.c:616 |
4c27fcb5 JX |
9876 | msgid "only one batch option may be specified" |
9877 | msgstr "只能指定一个批处理选项" | |
9878 | ||
a6cd2cc4 | 9879 | #: builtin/cat-file.c:634 |
ef317cd5 | 9880 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 9881 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 9882 | |
a6cd2cc4 | 9883 | #: builtin/cat-file.c:635 |
ef317cd5 | 9884 | msgid "show object type" |
07432cef | 9885 | msgstr "显示对象类型" |
ef317cd5 | 9886 | |
a6cd2cc4 | 9887 | #: builtin/cat-file.c:636 |
ef317cd5 | 9888 | msgid "show object size" |
07432cef | 9889 | msgstr "显示对象大小" |
ef317cd5 | 9890 | |
a6cd2cc4 | 9891 | #: builtin/cat-file.c:638 |
ef317cd5 | 9892 | msgid "exit with zero when there's no error" |
07432cef | 9893 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 9894 | |
a6cd2cc4 | 9895 | #: builtin/cat-file.c:639 |
ef317cd5 | 9896 | msgid "pretty-print object's content" |
07432cef | 9897 | msgstr "美观地打印对象的内容" |
ef317cd5 | 9898 | |
a6cd2cc4 | 9899 | #: builtin/cat-file.c:641 |
ef317cd5 | 9900 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
9901 | msgstr "对于数据对象,对其内容做文本转换" |
9902 | ||
a6cd2cc4 | 9903 | #: builtin/cat-file.c:643 |
a0b6b246 JX |
9904 | msgid "for blob objects, run filters on object's content" |
9905 | msgstr "对于数据对象,对其内容做过滤" | |
9906 | ||
a6cd2cc4 | 9907 | #: builtin/cat-file.c:644 git-submodule.sh:936 |
a0b6b246 JX |
9908 | msgid "blob" |
9909 | msgstr "数据对象" | |
9910 | ||
a6cd2cc4 | 9911 | #: builtin/cat-file.c:645 |
a0b6b246 JX |
9912 | msgid "use a specific path for --textconv/--filters" |
9913 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 9914 | |
a6cd2cc4 | 9915 | #: builtin/cat-file.c:647 |
7aea43ff JX |
9916 | msgid "allow -s and -t to work with broken/corrupt objects" |
9917 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
9918 | ||
a6cd2cc4 | 9919 | #: builtin/cat-file.c:648 |
1b7f4a34 JX |
9920 | msgid "buffer --batch output" |
9921 | msgstr "缓冲 --batch 的输出" | |
9922 | ||
a6cd2cc4 | 9923 | #: builtin/cat-file.c:650 |
ef317cd5 | 9924 | msgid "show info and content of objects fed from the standard input" |
07432cef | 9925 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 9926 | |
a6cd2cc4 | 9927 | #: builtin/cat-file.c:654 |
ef317cd5 | 9928 | msgid "show info about objects fed from the standard input" |
07432cef | 9929 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 9930 | |
a6cd2cc4 | 9931 | #: builtin/cat-file.c:658 |
7aea43ff JX |
9932 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
9933 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
9934 | ||
a6cd2cc4 | 9935 | #: builtin/cat-file.c:660 |
1b7f4a34 JX |
9936 | msgid "show all objects with --batch or --batch-check" |
9937 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
9938 | ||
a6cd2cc4 | 9939 | #: builtin/cat-file.c:662 |
c1ac5258 JX |
9940 | msgid "do not order --batch-all-objects output" |
9941 | msgstr "不要对 --batch-all-objects 的输出排序" | |
9942 | ||
06991777 | 9943 | #: builtin/check-attr.c:13 |
814ff314 JX |
9944 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
9945 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 9946 | |
06991777 | 9947 | #: builtin/check-attr.c:14 |
94550ed3 JX |
9948 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
9949 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 9950 | |
06991777 | 9951 | #: builtin/check-attr.c:21 |
ef317cd5 | 9952 | msgid "report all attributes set on file" |
07432cef | 9953 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 9954 | |
06991777 | 9955 | #: builtin/check-attr.c:22 |
ef317cd5 | 9956 | msgid "use .gitattributes only from the index" |
07432cef | 9957 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 9958 | |
06991777 | 9959 | #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 |
ef317cd5 | 9960 | msgid "read file names from stdin" |
07432cef | 9961 | msgstr "从标准输入读出文件名" |
ef317cd5 | 9962 | |
06991777 | 9963 | #: builtin/check-attr.c:25 builtin/check-ignore.c:27 |
90314792 JX |
9964 | msgid "terminate input and output records by a NUL character" |
9965 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 9966 | |
a6cd2cc4 JX |
9967 | #: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 |
9968 | #: builtin/worktree.c:507 | |
a77c07d9 JX |
9969 | msgid "suppress progress reporting" |
9970 | msgstr "不显示进度报告" | |
9971 | ||
06991777 | 9972 | #: builtin/check-ignore.c:29 |
2e8451e8 JX |
9973 | msgid "show non-matching input paths" |
9974 | msgstr "显示未匹配的输入路径" | |
9975 | ||
06991777 | 9976 | #: builtin/check-ignore.c:31 |
90314792 JX |
9977 | msgid "ignore index when checking" |
9978 | msgstr "检查时忽略索引" | |
9979 | ||
06991777 | 9980 | #: builtin/check-ignore.c:160 |
a77c07d9 | 9981 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 9982 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 9983 | |
06991777 | 9984 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
9985 | msgid "-z only makes sense with --stdin" |
9986 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
9987 | ||
06991777 | 9988 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
9989 | msgid "no path specified" |
9990 | msgstr "未指定路径" | |
9991 | ||
06991777 | 9992 | #: builtin/check-ignore.c:169 |
a77c07d9 JX |
9993 | msgid "--quiet is only valid with a single pathname" |
9994 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
9995 | ||
06991777 | 9996 | #: builtin/check-ignore.c:171 |
a77c07d9 JX |
9997 | msgid "cannot have both --quiet and --verbose" |
9998 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
9999 | ||
06991777 | 10000 | #: builtin/check-ignore.c:174 |
2e8451e8 JX |
10001 | msgid "--non-matching is only valid with --verbose" |
10002 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
10003 | ||
a4f16749 | 10004 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
10005 | msgid "git check-mailmap [<options>] <contact>..." |
10006 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 10007 | |
a4f16749 | 10008 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
10009 | msgid "also read contacts from stdin" |
10010 | msgstr "还从标准输入读取联系地址" | |
10011 | ||
a4f16749 | 10012 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
10013 | #, c-format |
10014 | msgid "unable to parse contact: %s" | |
10015 | msgstr "不能解析联系地址:%s" | |
10016 | ||
a4f16749 | 10017 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
10018 | msgid "no contacts specified" |
10019 | msgstr "未指定联系地址" | |
10020 | ||
06991777 | 10021 | #: builtin/checkout-index.c:131 |
814ff314 JX |
10022 | msgid "git checkout-index [<options>] [--] [<file>...]" |
10023 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 10024 | |
06991777 | 10025 | #: builtin/checkout-index.c:148 |
276ceeaa JX |
10026 | msgid "stage should be between 1 and 3 or all" |
10027 | msgstr "索引值应该取值 1 到 3 或者 all" | |
10028 | ||
06991777 | 10029 | #: builtin/checkout-index.c:164 |
ef317cd5 | 10030 | msgid "check out all files in the index" |
07432cef | 10031 | msgstr "检出索引区的所有文件" |
ef317cd5 | 10032 | |
06991777 | 10033 | #: builtin/checkout-index.c:165 |
ef317cd5 | 10034 | msgid "force overwrite of existing files" |
07432cef | 10035 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 10036 | |
06991777 | 10037 | #: builtin/checkout-index.c:167 |
ef317cd5 | 10038 | msgid "no warning for existing files and files not in index" |
07432cef | 10039 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 10040 | |
06991777 | 10041 | #: builtin/checkout-index.c:169 |
ef317cd5 | 10042 | msgid "don't checkout new files" |
07432cef | 10043 | msgstr "不检出新文件" |
ef317cd5 | 10044 | |
06991777 | 10045 | #: builtin/checkout-index.c:171 |
ef317cd5 | 10046 | msgid "update stat information in the index file" |
07432cef | 10047 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 10048 | |
06991777 | 10049 | #: builtin/checkout-index.c:175 |
ef317cd5 | 10050 | msgid "read list of paths from the standard input" |
07432cef | 10051 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 10052 | |
06991777 | 10053 | #: builtin/checkout-index.c:177 |
ef317cd5 | 10054 | msgid "write the content to temporary files" |
07432cef | 10055 | msgstr "将内容写入临时文件" |
ef317cd5 | 10056 | |
06991777 | 10057 | #: builtin/checkout-index.c:178 builtin/column.c:31 |
a6cd2cc4 JX |
10058 | #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 |
10059 | #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 | |
10060 | #: builtin/worktree.c:680 | |
ef317cd5 | 10061 | msgid "string" |
07432cef | 10062 | msgstr "字符串" |
ef317cd5 | 10063 | |
06991777 | 10064 | #: builtin/checkout-index.c:179 |
ef317cd5 | 10065 | msgid "when creating files, prepend <string>" |
4375c10e | 10066 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 10067 | |
06991777 | 10068 | #: builtin/checkout-index.c:181 |
ef317cd5 | 10069 | msgid "copy out the files from named stage" |
07432cef | 10070 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 10071 | |
a6cd2cc4 | 10072 | #: builtin/checkout.c:31 |
814ff314 JX |
10073 | msgid "git checkout [<options>] <branch>" |
10074 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 10075 | |
a6cd2cc4 | 10076 | #: builtin/checkout.c:32 |
814ff314 JX |
10077 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
10078 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 10079 | |
a6cd2cc4 JX |
10080 | #: builtin/checkout.c:37 |
10081 | msgid "git switch [<options>] [<branch>]" | |
10082 | msgstr "git switch [<选项>] [<分支>]" | |
10083 | ||
10084 | #: builtin/checkout.c:42 | |
10085 | msgid "git restore [<options>] [--source=<branch>] <file>..." | |
10086 | msgstr "git restore [<选项>] [--source=<分支>] <文件>..." | |
10087 | ||
10088 | #: builtin/checkout.c:172 builtin/checkout.c:211 | |
c04f5ac3 JX |
10089 | #, c-format |
10090 | msgid "path '%s' does not have our version" | |
10091 | msgstr "路径 '%s' 没有我们的版本" | |
10092 | ||
a6cd2cc4 | 10093 | #: builtin/checkout.c:174 builtin/checkout.c:213 |
c04f5ac3 JX |
10094 | #, c-format |
10095 | msgid "path '%s' does not have their version" | |
10096 | msgstr "路径 '%s' 没有他们的版本" | |
10097 | ||
a6cd2cc4 | 10098 | #: builtin/checkout.c:190 |
c04f5ac3 JX |
10099 | #, c-format |
10100 | msgid "path '%s' does not have all necessary versions" | |
e640d114 | 10101 | msgstr "路径 '%s' 没有全部必需的版本" |
c04f5ac3 | 10102 | |
a6cd2cc4 | 10103 | #: builtin/checkout.c:240 |
c04f5ac3 JX |
10104 | #, c-format |
10105 | msgid "path '%s' does not have necessary versions" | |
e640d114 | 10106 | msgstr "路径 '%s' 没有必需的版本" |
c04f5ac3 | 10107 | |
a6cd2cc4 | 10108 | #: builtin/checkout.c:258 |
c04f5ac3 JX |
10109 | #, c-format |
10110 | msgid "path '%s': cannot merge" | |
90e6ef53 | 10111 | msgstr "path '%s':无法合并" |
c04f5ac3 | 10112 | |
a6cd2cc4 | 10113 | #: builtin/checkout.c:274 |
c04f5ac3 JX |
10114 | #, c-format |
10115 | msgid "Unable to add merge result for '%s'" | |
10116 | msgstr "无法为 '%s' 添加合并结果" | |
10117 | ||
a6cd2cc4 JX |
10118 | #: builtin/checkout.c:374 |
10119 | #, c-format | |
10120 | msgid "Recreated %d merge conflict" | |
10121 | msgid_plural "Recreated %d merge conflicts" | |
10122 | msgstr[0] "重新创建了 %d 个合并冲突" | |
10123 | msgstr[1] "重新创建了 %d 个合并冲突" | |
10124 | ||
10125 | #: builtin/checkout.c:379 | |
10126 | #, c-format | |
10127 | msgid "Updated %d path from %s" | |
10128 | msgid_plural "Updated %d paths from %s" | |
10129 | msgstr[0] "从 %2$s 更新了 %1$d 个路径" | |
10130 | msgstr[1] "从 %2$s 更新了 %1$d 个路径" | |
10131 | ||
10132 | #: builtin/checkout.c:386 | |
10133 | #, c-format | |
10134 | msgid "Updated %d path from the index" | |
10135 | msgid_plural "Updated %d paths from the index" | |
10136 | msgstr[0] "从索引区更新了 %d 个路径" | |
10137 | msgstr[1] "从索引区更新了 %d 个路径" | |
10138 | ||
10139 | #: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 | |
10140 | #: builtin/checkout.c:419 | |
07432cef | 10141 | #, c-format |
ef317cd5 | 10142 | msgid "'%s' cannot be used with updating paths" |
07432cef | 10143 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 10144 | |
a6cd2cc4 | 10145 | #: builtin/checkout.c:422 builtin/checkout.c:425 |
07432cef | 10146 | #, c-format |
ef317cd5 | 10147 | msgid "'%s' cannot be used with %s" |
07432cef | 10148 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 10149 | |
a6cd2cc4 | 10150 | #: builtin/checkout.c:429 |
ef317cd5 JX |
10151 | #, c-format |
10152 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 10153 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 10154 | |
a6cd2cc4 | 10155 | #: builtin/checkout.c:433 |
c04f5ac3 | 10156 | #, c-format |
a6cd2cc4 JX |
10157 | msgid "neither '%s' or '%s' is specified" |
10158 | msgstr "'%s' 或 '%s' 都没有指定" | |
c04f5ac3 | 10159 | |
a6cd2cc4 | 10160 | #: builtin/checkout.c:437 |
06991777 | 10161 | #, c-format |
a6cd2cc4 JX |
10162 | msgid "'%s' must be used when '%s' is not specified" |
10163 | msgstr "未指定 '%2$s' 时,必须使用 '%1$s'" | |
06991777 | 10164 | |
a6cd2cc4 | 10165 | #: builtin/checkout.c:442 builtin/checkout.c:447 |
06991777 | 10166 | #, c-format |
a6cd2cc4 JX |
10167 | msgid "'%s' or '%s' cannot be used with %s" |
10168 | msgstr "'%s' 或 '%s' 不能和 %s 一起使用" | |
06991777 | 10169 | |
a6cd2cc4 | 10170 | #: builtin/checkout.c:506 builtin/checkout.c:513 |
06991777 | 10171 | #, c-format |
a6cd2cc4 JX |
10172 | msgid "path '%s' is unmerged" |
10173 | msgstr "路径 '%s' 未合并" | |
06991777 | 10174 | |
a6cd2cc4 | 10175 | #: builtin/checkout.c:679 |
c04f5ac3 | 10176 | msgid "you need to resolve your current index first" |
90e6ef53 | 10177 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 10178 | |
a6cd2cc4 | 10179 | #: builtin/checkout.c:729 |
d46c5519 JX |
10180 | #, c-format |
10181 | msgid "" | |
10182 | "cannot continue with staged changes in the following files:\n" | |
10183 | "%s" | |
10184 | msgstr "" | |
10185 | "不能继续,下列文件有暂存的修改:\n" | |
10186 | "%s" | |
10187 | ||
a6cd2cc4 | 10188 | #: builtin/checkout.c:736 |
d46c5519 JX |
10189 | #, c-format |
10190 | msgid "staged changes in the following files may be lost: %s" | |
10191 | msgstr "下列文件暂存的修改可能会丢失:%s" | |
10192 | ||
a6cd2cc4 | 10193 | #: builtin/checkout.c:833 |
c04f5ac3 | 10194 | #, c-format |
1b7f4a34 JX |
10195 | msgid "Can not do reflog for '%s': %s\n" |
10196 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 10197 | |
a6cd2cc4 | 10198 | #: builtin/checkout.c:875 |
c04f5ac3 JX |
10199 | msgid "HEAD is now at" |
10200 | msgstr "HEAD 目前位于" | |
10201 | ||
a6cd2cc4 | 10202 | #: builtin/checkout.c:879 builtin/clone.c:714 |
3495628d JX |
10203 | msgid "unable to update HEAD" |
10204 | msgstr "不能更新 HEAD" | |
10205 | ||
a6cd2cc4 | 10206 | #: builtin/checkout.c:883 |
c04f5ac3 JX |
10207 | #, c-format |
10208 | msgid "Reset branch '%s'\n" | |
10209 | msgstr "重置分支 '%s'\n" | |
10210 | ||
a6cd2cc4 | 10211 | #: builtin/checkout.c:886 |
c04f5ac3 JX |
10212 | #, c-format |
10213 | msgid "Already on '%s'\n" | |
10214 | msgstr "已经位于 '%s'\n" | |
10215 | ||
a6cd2cc4 | 10216 | #: builtin/checkout.c:890 |
c04f5ac3 JX |
10217 | #, c-format |
10218 | msgid "Switched to and reset branch '%s'\n" | |
10219 | msgstr "切换并重置分支 '%s'\n" | |
10220 | ||
a6cd2cc4 | 10221 | #: builtin/checkout.c:892 builtin/checkout.c:1289 |
c04f5ac3 JX |
10222 | #, c-format |
10223 | msgid "Switched to a new branch '%s'\n" | |
10224 | msgstr "切换到一个新分支 '%s'\n" | |
10225 | ||
a6cd2cc4 | 10226 | #: builtin/checkout.c:894 |
c04f5ac3 JX |
10227 | #, c-format |
10228 | msgid "Switched to branch '%s'\n" | |
10229 | msgstr "切换到分支 '%s'\n" | |
10230 | ||
90e6ef53 | 10231 | # 译者:注意保持前导空格 |
a6cd2cc4 | 10232 | #: builtin/checkout.c:945 |
c04f5ac3 JX |
10233 | #, c-format |
10234 | msgid " ... and %d more.\n" | |
90e6ef53 | 10235 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 10236 | |
a6cd2cc4 | 10237 | #: builtin/checkout.c:951 |
c04f5ac3 JX |
10238 | #, c-format |
10239 | msgid "" | |
10240 | "Warning: you are leaving %d commit behind, not connected to\n" | |
10241 | "any of your branches:\n" | |
10242 | "\n" | |
10243 | "%s\n" | |
10244 | msgid_plural "" | |
10245 | "Warning: you are leaving %d commits behind, not connected to\n" | |
10246 | "any of your branches:\n" | |
10247 | "\n" | |
10248 | "%s\n" | |
10249 | msgstr[0] "" | |
10250 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
10251 | "\n" | |
10252 | "%s\n" | |
5ae481e0 JX |
10253 | msgstr[1] "" |
10254 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
10255 | "\n" | |
10256 | "%s\n" | |
c04f5ac3 | 10257 | |
a6cd2cc4 | 10258 | #: builtin/checkout.c:970 |
c04f5ac3 JX |
10259 | #, c-format |
10260 | msgid "" | |
7aea43ff JX |
10261 | "If you want to keep it by creating a new branch, this may be a good time\n" |
10262 | "to do so with:\n" | |
10263 | "\n" | |
10264 | " git branch <new-branch-name> %s\n" | |
10265 | "\n" | |
10266 | msgid_plural "" | |
c04f5ac3 JX |
10267 | "If you want to keep them by creating a new branch, this may be a good time\n" |
10268 | "to do so with:\n" | |
10269 | "\n" | |
814ff314 | 10270 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 10271 | "\n" |
7aea43ff JX |
10272 | msgstr[0] "" |
10273 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
10274 | "如下操作:\n" | |
10275 | "\n" | |
10276 | " git branch <新分支名> %s\n" | |
10277 | "\n" | |
10278 | msgstr[1] "" | |
10279 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
10280 | "如下操作:\n" |
10281 | "\n" | |
814ff314 | 10282 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
10283 | "\n" |
10284 | ||
a6cd2cc4 | 10285 | #: builtin/checkout.c:1005 |
c04f5ac3 JX |
10286 | msgid "internal error in revision walk" |
10287 | msgstr "在版本遍历时遇到内部错误" | |
10288 | ||
a6cd2cc4 | 10289 | #: builtin/checkout.c:1009 |
c04f5ac3 JX |
10290 | msgid "Previous HEAD position was" |
10291 | msgstr "之前的 HEAD 位置是" | |
10292 | ||
a6cd2cc4 | 10293 | #: builtin/checkout.c:1049 builtin/checkout.c:1284 |
c04f5ac3 | 10294 | msgid "You are on a branch yet to be born" |
90e6ef53 | 10295 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 10296 | |
a6cd2cc4 JX |
10297 | #: builtin/checkout.c:1176 |
10298 | msgid "only one reference expected" | |
10299 | msgstr "预期只有一个引用" | |
10300 | ||
10301 | #: builtin/checkout.c:1193 | |
90314792 JX |
10302 | #, c-format |
10303 | msgid "only one reference expected, %d given." | |
a0b6b246 | 10304 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 10305 | |
a6cd2cc4 | 10306 | #: builtin/checkout.c:1230 |
06991777 JX |
10307 | #, c-format |
10308 | msgid "" | |
10309 | "'%s' could be both a local file and a tracking branch.\n" | |
10310 | "Please use -- (and optionally --no-guess) to disambiguate" | |
10311 | msgstr "" | |
10312 | "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n" | |
10313 | "请使用 --(和可选的 --no-guess)来消除歧义" | |
10314 | ||
a6cd2cc4 | 10315 | #: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 |
c04f5ac3 JX |
10316 | #, c-format |
10317 | msgid "invalid reference: %s" | |
10318 | msgstr "无效引用:%s" | |
10319 | ||
a6cd2cc4 | 10320 | #: builtin/checkout.c:1256 builtin/checkout.c:1618 |
c04f5ac3 JX |
10321 | #, c-format |
10322 | msgid "reference is not a tree: %s" | |
10323 | msgstr "引用不是一个树:%s" | |
10324 | ||
a6cd2cc4 JX |
10325 | #: builtin/checkout.c:1303 |
10326 | #, c-format | |
10327 | msgid "a branch is expected, got tag '%s'" | |
10328 | msgstr "期望一个分支,得到标签 '%s'" | |
10329 | ||
10330 | #: builtin/checkout.c:1305 | |
10331 | #, c-format | |
10332 | msgid "a branch is expected, got remote branch '%s'" | |
10333 | msgstr "期望一个分支,得到远程分支 '%s'" | |
10334 | ||
10335 | #: builtin/checkout.c:1306 builtin/checkout.c:1314 | |
10336 | #, c-format | |
10337 | msgid "a branch is expected, got '%s'" | |
10338 | msgstr "期望一个分支,得到 '%s'" | |
10339 | ||
10340 | #: builtin/checkout.c:1309 | |
10341 | #, c-format | |
10342 | msgid "a branch is expected, got commit '%s'" | |
10343 | msgstr "期望一个分支,得到提交 '%s'" | |
10344 | ||
10345 | #: builtin/checkout.c:1325 | |
10346 | msgid "" | |
10347 | "cannot switch branch while merging\n" | |
10348 | "Consider \"git merge --quit\" or \"git worktree add\"." | |
10349 | msgstr "" | |
10350 | "不能在合并时切换分支\n" | |
10351 | "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" | |
10352 | ||
10353 | #: builtin/checkout.c:1329 | |
10354 | msgid "" | |
10355 | "cannot switch branch in the middle of an am session\n" | |
10356 | "Consider \"git am --quit\" or \"git worktree add\"." | |
10357 | msgstr "" | |
10358 | "不能在一个 am 会话期间切换分支\n" | |
10359 | "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" | |
10360 | ||
10361 | #: builtin/checkout.c:1333 | |
10362 | msgid "" | |
10363 | "cannot switch branch while rebasing\n" | |
10364 | "Consider \"git rebase --quit\" or \"git worktree add\"." | |
10365 | msgstr "" | |
10366 | "不能在变基时切换分支\n" | |
10367 | "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" | |
10368 | ||
10369 | #: builtin/checkout.c:1337 | |
10370 | msgid "" | |
10371 | "cannot switch branch while cherry-picking\n" | |
10372 | "Consider \"git cherry-pick --quit\" or \"git worktree add\"." | |
10373 | msgstr "" | |
10374 | "不能在拣选时切换分支\n" | |
10375 | "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" | |
10376 | ||
10377 | #: builtin/checkout.c:1341 | |
10378 | msgid "" | |
10379 | "cannot switch branch while reverting\n" | |
10380 | "Consider \"git revert --quit\" or \"git worktree add\"." | |
10381 | msgstr "" | |
10382 | "不能在还原时切换分支\n" | |
10383 | "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" | |
10384 | ||
10385 | #: builtin/checkout.c:1345 | |
10386 | msgid "you are switching branch while bisecting" | |
10387 | msgstr "您在执行二分查找时切换分支" | |
10388 | ||
10389 | #: builtin/checkout.c:1352 | |
ef317cd5 | 10390 | msgid "paths cannot be used with switching branches" |
07432cef | 10391 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 10392 | |
a6cd2cc4 | 10393 | #: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 |
07432cef | 10394 | #, c-format |
ef317cd5 | 10395 | msgid "'%s' cannot be used with switching branches" |
07432cef | 10396 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 10397 | |
a6cd2cc4 JX |
10398 | #: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 |
10399 | #: builtin/checkout.c:1378 builtin/checkout.c:1383 | |
07432cef | 10400 | #, c-format |
ef317cd5 | 10401 | msgid "'%s' cannot be used with '%s'" |
07432cef | 10402 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 10403 | |
a6cd2cc4 JX |
10404 | #: builtin/checkout.c:1380 |
10405 | #, c-format | |
10406 | msgid "'%s' cannot take <start-point>" | |
10407 | msgstr "'%s' 不带 <起始点>" | |
10408 | ||
10409 | #: builtin/checkout.c:1388 | |
07432cef | 10410 | #, c-format |
ef317cd5 | 10411 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 10412 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 10413 | |
a6cd2cc4 JX |
10414 | #: builtin/checkout.c:1395 |
10415 | msgid "missing branch or commit argument" | |
10416 | msgstr "缺少分支或提交参数" | |
c04f5ac3 | 10417 | |
a6cd2cc4 JX |
10418 | #: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 |
10419 | #: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 | |
10420 | #: builtin/send-pack.c:174 | |
10421 | msgid "force progress reporting" | |
10422 | msgstr "强制显示进度报告" | |
c04f5ac3 | 10423 | |
a6cd2cc4 JX |
10424 | #: builtin/checkout.c:1438 |
10425 | msgid "perform a 3-way merge with the new branch" | |
10426 | msgstr "和新的分支执行三方合并" | |
c04f5ac3 | 10427 | |
a6cd2cc4 JX |
10428 | #: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 |
10429 | msgid "style" | |
10430 | msgstr "风格" | |
ef317cd5 | 10431 | |
a6cd2cc4 JX |
10432 | #: builtin/checkout.c:1440 |
10433 | msgid "conflict style (merge or diff3)" | |
10434 | msgstr "冲突输出风格(merge 或 diff3)" | |
10435 | ||
10436 | #: builtin/checkout.c:1452 builtin/worktree.c:504 | |
5c57d762 JX |
10437 | msgid "detach HEAD at named commit" |
10438 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 10439 | |
a6cd2cc4 | 10440 | #: builtin/checkout.c:1453 |
ef317cd5 | 10441 | msgid "set upstream info for new branch" |
07432cef | 10442 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 10443 | |
a6cd2cc4 JX |
10444 | #: builtin/checkout.c:1455 |
10445 | msgid "force checkout (throw away local modifications)" | |
10446 | msgstr "强制检出(丢弃本地修改)" | |
10447 | ||
10448 | #: builtin/checkout.c:1457 | |
6c94aba5 | 10449 | msgid "new-branch" |
07432cef | 10450 | msgstr "新分支" |
ef317cd5 | 10451 | |
a6cd2cc4 | 10452 | #: builtin/checkout.c:1457 |
ef317cd5 | 10453 | msgid "new unparented branch" |
07432cef | 10454 | msgstr "新的没有父提交的分支" |
ef317cd5 | 10455 | |
a6cd2cc4 JX |
10456 | #: builtin/checkout.c:1459 builtin/merge.c:288 |
10457 | msgid "update ignored files (default)" | |
10458 | msgstr "更新忽略的文件(默认)" | |
10459 | ||
10460 | #: builtin/checkout.c:1462 | |
10461 | msgid "do not check if another worktree is holding the given ref" | |
10462 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
10463 | ||
10464 | #: builtin/checkout.c:1475 | |
ef317cd5 | 10465 | msgid "checkout our version for unmerged files" |
07432cef | 10466 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 10467 | |
a6cd2cc4 | 10468 | #: builtin/checkout.c:1478 |
ef317cd5 | 10469 | msgid "checkout their version for unmerged files" |
07432cef | 10470 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 10471 | |
a6cd2cc4 | 10472 | #: builtin/checkout.c:1482 |
4dcdc3d8 JX |
10473 | msgid "do not limit pathspecs to sparse entries only" |
10474 | msgstr "对路径不做稀疏检出的限制" | |
10475 | ||
a6cd2cc4 | 10476 | #: builtin/checkout.c:1533 |
ef317cd5 | 10477 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 10478 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 10479 | |
a6cd2cc4 | 10480 | #: builtin/checkout.c:1536 |
d46c5519 JX |
10481 | msgid "-p and --overlay are mutually exclusive" |
10482 | msgstr "-p 和 --overlay 互斥" | |
10483 | ||
a6cd2cc4 | 10484 | #: builtin/checkout.c:1573 |
ef317cd5 JX |
10485 | msgid "--track needs a branch name" |
10486 | msgstr "--track 需要一个分支名" | |
10487 | ||
a6cd2cc4 | 10488 | #: builtin/checkout.c:1578 |
c1ac5258 JX |
10489 | msgid "missing branch name; try -b" |
10490 | msgstr "缺少分支名,尝试 -b" | |
ef317cd5 | 10491 | |
a6cd2cc4 JX |
10492 | #: builtin/checkout.c:1611 |
10493 | #, c-format | |
10494 | msgid "could not resolve %s" | |
10495 | msgstr "无法解析 %s" | |
10496 | ||
10497 | #: builtin/checkout.c:1623 | |
10498 | msgid "you must specify path(s) to restore" | |
10499 | msgstr "您必须指定一个要恢复的路径" | |
10500 | ||
10501 | #: builtin/checkout.c:1631 | |
c04f5ac3 | 10502 | msgid "invalid path specification" |
90e6ef53 | 10503 | msgstr "无效的路径规格" |
c04f5ac3 | 10504 | |
a6cd2cc4 | 10505 | #: builtin/checkout.c:1638 |
07432cef | 10506 | #, c-format |
a4f16749 JX |
10507 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
10508 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 10509 | |
a6cd2cc4 | 10510 | #: builtin/checkout.c:1642 |
07432cef | 10511 | #, c-format |
ef317cd5 | 10512 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 10513 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 10514 | |
a6cd2cc4 | 10515 | #: builtin/checkout.c:1646 |
c04f5ac3 JX |
10516 | msgid "" |
10517 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
10518 | "checking out of the index." | |
10519 | msgstr "" | |
90e6ef53 | 10520 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 10521 | |
a6cd2cc4 | 10522 | #: builtin/checkout.c:1666 |
c1ac5258 JX |
10523 | #, c-format |
10524 | msgid "" | |
10525 | "'%s' matched more than one remote tracking branch.\n" | |
10526 | "We found %d remotes with a reference that matched. So we fell back\n" | |
10527 | "on trying to resolve the argument as a path, but failed there too!\n" | |
10528 | "\n" | |
10529 | "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" | |
10530 | "you can do so by fully qualifying the name with the --track option:\n" | |
10531 | "\n" | |
10532 | " git checkout --track origin/<name>\n" | |
10533 | "\n" | |
10534 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
10535 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
10536 | "checkout.defaultRemote=origin in your config." | |
10537 | msgstr "" | |
10538 | "'%s' 匹配了一个以上的远程跟踪分支。\n" | |
10539 | "我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n" | |
10540 | "路径,但是也失败了!\n" | |
10541 | "\n" | |
10542 | "如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n" | |
10543 | "使用分支全名和 --track 选项:\n" | |
10544 | "\n" | |
10545 | " git checkout --track origin/<name>\n" | |
10546 | "\n" | |
10547 | "如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n" | |
10548 | "仓库名,可以在配置中设置 checkout.defaultRemote=origin。" | |
10549 | ||
a6cd2cc4 JX |
10550 | #: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 |
10551 | #: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 | |
10552 | #: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 | |
10553 | msgid "branch" | |
10554 | msgstr "分支" | |
10555 | ||
10556 | #: builtin/checkout.c:1692 | |
10557 | msgid "create and checkout a new branch" | |
10558 | msgstr "创建并检出一个新的分支" | |
10559 | ||
10560 | #: builtin/checkout.c:1694 | |
10561 | msgid "create/reset and checkout a branch" | |
10562 | msgstr "创建/重置并检出一个分支" | |
10563 | ||
10564 | #: builtin/checkout.c:1695 | |
10565 | msgid "create reflog for new branch" | |
10566 | msgstr "为新的分支创建引用日志" | |
10567 | ||
10568 | #: builtin/checkout.c:1697 | |
10569 | msgid "second guess 'git checkout <no-such-branch>' (default)" | |
10570 | msgstr "二次猜测 'git checkout <无此分支>'(默认)" | |
10571 | ||
10572 | #: builtin/checkout.c:1698 | |
10573 | msgid "use overlay mode (default)" | |
10574 | msgstr "使用叠加模式(默认)" | |
10575 | ||
10576 | #: builtin/checkout.c:1734 | |
10577 | msgid "create and switch to a new branch" | |
10578 | msgstr "创建并切换一个新分支" | |
10579 | ||
10580 | #: builtin/checkout.c:1736 | |
10581 | msgid "create/reset and switch to a branch" | |
10582 | msgstr "创建/重置并切换一个分支" | |
10583 | ||
10584 | #: builtin/checkout.c:1738 | |
10585 | msgid "second guess 'git switch <no-such-branch>'" | |
10586 | msgstr "二次猜测 'git switch <无此分支>'" | |
10587 | ||
10588 | #: builtin/checkout.c:1740 | |
10589 | msgid "throw away local modifications" | |
10590 | msgstr "丢弃本地修改" | |
10591 | ||
10592 | #: builtin/checkout.c:1772 | |
10593 | msgid "which tree-ish to checkout from" | |
10594 | msgstr "要检出哪一个树" | |
10595 | ||
10596 | #: builtin/checkout.c:1774 | |
10597 | msgid "restore the index" | |
10598 | msgstr "恢复索引" | |
10599 | ||
10600 | #: builtin/checkout.c:1776 | |
10601 | msgid "restore the working tree (default)" | |
10602 | msgstr "恢复工作区(默认)" | |
10603 | ||
10604 | #: builtin/checkout.c:1778 | |
10605 | msgid "ignore unmerged entries" | |
10606 | msgstr "忽略未合并条目" | |
10607 | ||
10608 | #: builtin/checkout.c:1779 | |
10609 | msgid "use overlay mode" | |
10610 | msgstr "使用叠加模式" | |
10611 | ||
06991777 | 10612 | #: builtin/clean.c:28 |
2e8451e8 JX |
10613 | msgid "" |
10614 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
10615 | msgstr "" | |
10616 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 10617 | |
06991777 | 10618 | #: builtin/clean.c:32 |
07432cef WS |
10619 | #, c-format |
10620 | msgid "Removing %s\n" | |
10621 | msgstr "正删除 %s\n" | |
10622 | ||
06991777 | 10623 | #: builtin/clean.c:33 |
07432cef WS |
10624 | #, c-format |
10625 | msgid "Would remove %s\n" | |
10626 | msgstr "将删除 %s\n" | |
10627 | ||
06991777 | 10628 | #: builtin/clean.c:34 |
07432cef WS |
10629 | #, c-format |
10630 | msgid "Skipping repository %s\n" | |
160fb2b2 | 10631 | msgstr "忽略仓库 %s\n" |
07432cef | 10632 | |
06991777 | 10633 | #: builtin/clean.c:35 |
07432cef WS |
10634 | #, c-format |
10635 | msgid "Would skip repository %s\n" | |
160fb2b2 | 10636 | msgstr "将忽略仓库 %s\n" |
07432cef | 10637 | |
06991777 | 10638 | #: builtin/clean.c:36 |
07432cef WS |
10639 | #, c-format |
10640 | msgid "failed to remove %s" | |
c1ac5258 | 10641 | msgstr "删除 %s 失败" |
07432cef | 10642 | |
a6cd2cc4 JX |
10643 | #: builtin/clean.c:37 |
10644 | #, c-format | |
10645 | msgid "could not lstat %s\n" | |
10646 | msgstr "不能对 %s 调用 lstat\n" | |
10647 | ||
10648 | #: builtin/clean.c:300 git-add--interactive.perl:593 | |
1a79b2f1 | 10649 | #, c-format |
2e8451e8 JX |
10650 | msgid "" |
10651 | "Prompt help:\n" | |
10652 | "1 - select a numbered item\n" | |
10653 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 10654 | " - (empty) select nothing\n" |
2e8451e8 JX |
10655 | msgstr "" |
10656 | "帮助:\n" | |
10657 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
10658 | "foo - 通过唯一前缀选择一个选项\n" |
10659 | " - (空)什么也不选择\n" | |
2e8451e8 | 10660 | |
a6cd2cc4 | 10661 | #: builtin/clean.c:304 git-add--interactive.perl:602 |
1a79b2f1 | 10662 | #, c-format |
2e8451e8 JX |
10663 | msgid "" |
10664 | "Prompt help:\n" | |
10665 | "1 - select a single item\n" | |
10666 | "3-5 - select a range of items\n" | |
10667 | "2-3,6-9 - select multiple ranges\n" | |
10668 | "foo - select item based on unique prefix\n" | |
10669 | "-... - unselect specified items\n" | |
10670 | "* - choose all items\n" | |
1a79b2f1 | 10671 | " - (empty) finish selecting\n" |
2e8451e8 JX |
10672 | msgstr "" |
10673 | "帮助:\n" | |
10674 | "1 - 选择一个选项\n" | |
10675 | "3-5 - 选择一个范围内的所有选项\n" | |
10676 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 10677 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
10678 | "-... - 反选特定的选项\n" |
10679 | "* - 选择所有选项\n" | |
1a79b2f1 | 10680 | " - (空)结束选择\n" |
2e8451e8 | 10681 | |
a6cd2cc4 JX |
10682 | #: builtin/clean.c:520 git-add--interactive.perl:568 |
10683 | #: git-add--interactive.perl:573 | |
1a79b2f1 JX |
10684 | #, c-format, perl-format |
10685 | msgid "Huh (%s)?\n" | |
10686 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 10687 | |
a6cd2cc4 | 10688 | #: builtin/clean.c:662 |
2e8451e8 JX |
10689 | #, c-format |
10690 | msgid "Input ignore patterns>> " | |
10691 | msgstr "输入模版以排除条目>> " | |
10692 | ||
a6cd2cc4 | 10693 | #: builtin/clean.c:699 |
2e8451e8 JX |
10694 | #, c-format |
10695 | msgid "WARNING: Cannot find items matched by: %s" | |
10696 | msgstr "警告:无法找到和 %s 匹配的条目" | |
10697 | ||
a6cd2cc4 | 10698 | #: builtin/clean.c:720 |
2e8451e8 JX |
10699 | msgid "Select items to delete" |
10700 | msgstr "选择要删除的条目" | |
10701 | ||
814ff314 | 10702 | #. TRANSLATORS: Make sure to keep [y/N] as is |
a6cd2cc4 | 10703 | #: builtin/clean.c:761 |
2e8451e8 | 10704 | #, c-format |
814ff314 JX |
10705 | msgid "Remove %s [y/N]? " |
10706 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 10707 | |
a6cd2cc4 | 10708 | #: builtin/clean.c:786 git-add--interactive.perl:1763 |
1a79b2f1 JX |
10709 | #, c-format |
10710 | msgid "Bye.\n" | |
10711 | msgstr "再见。\n" | |
2e8451e8 | 10712 | |
a6cd2cc4 | 10713 | #: builtin/clean.c:794 |
2e8451e8 JX |
10714 | msgid "" |
10715 | "clean - start cleaning\n" | |
10716 | "filter by pattern - exclude items from deletion\n" | |
10717 | "select by numbers - select items to be deleted by numbers\n" | |
10718 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
10719 | "quit - stop cleaning\n" | |
10720 | "help - this screen\n" | |
10721 | "? - help for prompt selection" | |
10722 | msgstr "" | |
10723 | "clean - 开始清理\n" | |
10724 | "filter by pattern - 通过模版排除要删除的条目\n" | |
10725 | "select by numbers - 通过数字选择要删除的条目\n" | |
10726 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
10727 | "quit - 停止删除并退出\n" | |
10728 | "help - 显示本帮助\n" | |
10729 | "? - 显示如何在提示符下选择的帮助" | |
10730 | ||
a6cd2cc4 | 10731 | #: builtin/clean.c:821 git-add--interactive.perl:1849 |
2e8451e8 JX |
10732 | msgid "*** Commands ***" |
10733 | msgstr "*** 命令 ***" | |
10734 | ||
a6cd2cc4 | 10735 | #: builtin/clean.c:822 git-add--interactive.perl:1846 |
2e8451e8 JX |
10736 | msgid "What now" |
10737 | msgstr "请选择" | |
10738 | ||
a6cd2cc4 | 10739 | #: builtin/clean.c:830 |
2e8451e8 JX |
10740 | msgid "Would remove the following item:" |
10741 | msgid_plural "Would remove the following items:" | |
10742 | msgstr[0] "将删除如下条目:" | |
10743 | msgstr[1] "将删除如下条目:" | |
10744 | ||
a6cd2cc4 | 10745 | #: builtin/clean.c:846 |
2e8451e8 JX |
10746 | msgid "No more files to clean, exiting." |
10747 | msgstr "没有要清理的文件,退出。" | |
10748 | ||
a6cd2cc4 | 10749 | #: builtin/clean.c:908 |
ef317cd5 | 10750 | msgid "do not print names of files removed" |
07432cef | 10751 | msgstr "不打印删除文件的名称" |
ef317cd5 | 10752 | |
a6cd2cc4 | 10753 | #: builtin/clean.c:910 |
ef317cd5 | 10754 | msgid "force" |
07432cef | 10755 | msgstr "强制" |
ef317cd5 | 10756 | |
a6cd2cc4 | 10757 | #: builtin/clean.c:911 |
2e8451e8 JX |
10758 | msgid "interactive cleaning" |
10759 | msgstr "交互式清除" | |
10760 | ||
a6cd2cc4 | 10761 | #: builtin/clean.c:913 |
ef317cd5 | 10762 | msgid "remove whole directories" |
07432cef | 10763 | msgstr "删除整个目录" |
ef317cd5 | 10764 | |
a6cd2cc4 JX |
10765 | #: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 |
10766 | #: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 | |
10767 | #: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 | |
d46c5519 | 10768 | #: builtin/show-ref.c:179 |
ef317cd5 | 10769 | msgid "pattern" |
07432cef | 10770 | msgstr "模式" |
ef317cd5 | 10771 | |
a6cd2cc4 | 10772 | #: builtin/clean.c:915 |
ef317cd5 | 10773 | msgid "add <pattern> to ignore rules" |
4375c10e | 10774 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 10775 | |
a6cd2cc4 | 10776 | #: builtin/clean.c:916 |
ef317cd5 | 10777 | msgid "remove ignored files, too" |
07432cef | 10778 | msgstr "也删除忽略的文件" |
ef317cd5 | 10779 | |
a6cd2cc4 | 10780 | #: builtin/clean.c:918 |
ef317cd5 | 10781 | msgid "remove only ignored files" |
07432cef | 10782 | msgstr "只删除忽略的文件" |
c04f5ac3 | 10783 | |
a6cd2cc4 | 10784 | #: builtin/clean.c:936 |
c04f5ac3 | 10785 | msgid "-x and -X cannot be used together" |
649900bc | 10786 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 10787 | |
a6cd2cc4 | 10788 | #: builtin/clean.c:940 |
c04f5ac3 | 10789 | msgid "" |
6c94aba5 | 10790 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 10791 | "clean" |
c04f5ac3 | 10792 | msgstr "" |
2e8451e8 | 10793 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 10794 | |
a6cd2cc4 | 10795 | #: builtin/clean.c:943 |
c04f5ac3 | 10796 | msgid "" |
6c94aba5 | 10797 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 10798 | "refusing to clean" |
c04f5ac3 | 10799 | msgstr "" |
2e8451e8 | 10800 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 10801 | |
a6cd2cc4 | 10802 | #: builtin/clone.c:46 |
814ff314 | 10803 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 10804 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 10805 | |
a6cd2cc4 | 10806 | #: builtin/clone.c:93 |
ef317cd5 | 10807 | msgid "don't create a checkout" |
07432cef | 10808 | msgstr "不创建一个检出" |
ef317cd5 | 10809 | |
a6cd2cc4 | 10810 | #: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 |
ef317cd5 | 10811 | msgid "create a bare repository" |
160fb2b2 | 10812 | msgstr "创建一个纯仓库" |
ef317cd5 | 10813 | |
a6cd2cc4 | 10814 | #: builtin/clone.c:98 |
ef317cd5 | 10815 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 10816 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 10817 | |
a6cd2cc4 | 10818 | #: builtin/clone.c:100 |
ef317cd5 | 10819 | msgid "to clone from a local repository" |
160fb2b2 | 10820 | msgstr "从本地仓库克隆" |
ef317cd5 | 10821 | |
a6cd2cc4 | 10822 | #: builtin/clone.c:102 |
ef317cd5 | 10823 | msgid "don't use local hardlinks, always copy" |
07432cef | 10824 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 10825 | |
a6cd2cc4 | 10826 | #: builtin/clone.c:104 |
ef317cd5 | 10827 | msgid "setup as shared repository" |
160fb2b2 | 10828 | msgstr "设置为共享仓库" |
ef317cd5 | 10829 | |
a6cd2cc4 | 10830 | #: builtin/clone.c:107 |
87cb7997 | 10831 | msgid "pathspec" |
65e2041e | 10832 | msgstr "路径规格" |
87cb7997 | 10833 | |
a6cd2cc4 | 10834 | #: builtin/clone.c:107 |
ef317cd5 | 10835 | msgid "initialize submodules in the clone" |
07432cef | 10836 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 10837 | |
a6cd2cc4 | 10838 | #: builtin/clone.c:110 |
5b04ee3b JX |
10839 | msgid "number of submodules cloned in parallel" |
10840 | msgstr "并发克隆的子模组的数量" | |
10841 | ||
a6cd2cc4 | 10842 | #: builtin/clone.c:111 builtin/init-db.c:486 |
ef317cd5 | 10843 | msgid "template-directory" |
07432cef | 10844 | msgstr "模板目录" |
ef317cd5 | 10845 | |
a6cd2cc4 | 10846 | #: builtin/clone.c:112 builtin/init-db.c:487 |
ef317cd5 | 10847 | msgid "directory from which templates will be used" |
07432cef | 10848 | msgstr "模板目录将被使用" |
ef317cd5 | 10849 | |
a6cd2cc4 JX |
10850 | #: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 |
10851 | #: builtin/submodule--helper.c:1860 | |
ef317cd5 | 10852 | msgid "reference repository" |
160fb2b2 | 10853 | msgstr "参考仓库" |
ef317cd5 | 10854 | |
a6cd2cc4 JX |
10855 | #: builtin/clone.c:118 builtin/submodule--helper.c:1382 |
10856 | #: builtin/submodule--helper.c:1862 | |
7aea43ff | 10857 | msgid "use --reference only while cloning" |
160fb2b2 | 10858 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 10859 | |
a6cd2cc4 JX |
10860 | #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 |
10861 | #: builtin/pack-objects.c:3314 builtin/repack.c:319 | |
ef317cd5 | 10862 | msgid "name" |
07432cef | 10863 | msgstr "名称" |
ef317cd5 | 10864 | |
a6cd2cc4 | 10865 | #: builtin/clone.c:120 |
ef317cd5 | 10866 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 10867 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 10868 | |
a6cd2cc4 | 10869 | #: builtin/clone.c:122 |
ef317cd5 | 10870 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 10871 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 10872 | |
a6cd2cc4 | 10873 | #: builtin/clone.c:124 |
ef317cd5 | 10874 | msgid "path to git-upload-pack on the remote" |
07432cef | 10875 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 10876 | |
a6cd2cc4 JX |
10877 | #: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 |
10878 | #: builtin/pull.c:226 | |
ef317cd5 | 10879 | msgid "depth" |
07432cef | 10880 | msgstr "深度" |
ef317cd5 | 10881 | |
a6cd2cc4 | 10882 | #: builtin/clone.c:126 |
ef317cd5 | 10883 | msgid "create a shallow clone of that depth" |
07432cef | 10884 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 10885 | |
a6cd2cc4 | 10886 | #: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 |
a0b6b246 JX |
10887 | msgid "time" |
10888 | msgstr "时间" | |
10889 | ||
a6cd2cc4 | 10890 | #: builtin/clone.c:128 |
a0b6b246 JX |
10891 | msgid "create a shallow clone since a specific time" |
10892 | msgstr "从一个特定时间创建一个浅克隆" | |
10893 | ||
a6cd2cc4 JX |
10894 | #: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 |
10895 | #: builtin/rebase.c:1395 | |
a0b6b246 JX |
10896 | msgid "revision" |
10897 | msgstr "版本" | |
10898 | ||
a6cd2cc4 | 10899 | #: builtin/clone.c:130 builtin/fetch.c:157 |
1a79b2f1 JX |
10900 | msgid "deepen history of shallow clone, excluding rev" |
10901 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 10902 | |
a6cd2cc4 | 10903 | #: builtin/clone.c:132 |
ef317cd5 | 10904 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 10905 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 10906 | |
a6cd2cc4 | 10907 | #: builtin/clone.c:134 |
a4f16749 JX |
10908 | msgid "don't clone any tags, and make later fetches not to follow them" |
10909 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
10910 | ||
a6cd2cc4 | 10911 | #: builtin/clone.c:136 |
5b04ee3b JX |
10912 | msgid "any cloned submodules will be shallow" |
10913 | msgstr "子模组将以浅下载模式克隆" | |
10914 | ||
a6cd2cc4 | 10915 | #: builtin/clone.c:137 builtin/init-db.c:495 |
ef317cd5 | 10916 | msgid "gitdir" |
07432cef | 10917 | msgstr "git目录" |
ef317cd5 | 10918 | |
a6cd2cc4 | 10919 | #: builtin/clone.c:138 builtin/init-db.c:496 |
ef317cd5 | 10920 | msgid "separate git dir from working tree" |
07432cef | 10921 | msgstr "git目录和工作区分离" |
ef317cd5 | 10922 | |
a6cd2cc4 | 10923 | #: builtin/clone.c:139 |
ef317cd5 | 10924 | msgid "key=value" |
07432cef | 10925 | msgstr "key=value" |
ef317cd5 | 10926 | |
a6cd2cc4 | 10927 | #: builtin/clone.c:140 |
ef317cd5 | 10928 | msgid "set config inside the new repository" |
160fb2b2 | 10929 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 10930 | |
a6cd2cc4 | 10931 | #: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 |
d46c5519 JX |
10932 | #: builtin/push.c:585 builtin/send-pack.c:172 |
10933 | msgid "server-specific" | |
10934 | msgstr "server-specific" | |
10935 | ||
a6cd2cc4 | 10936 | #: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 |
d46c5519 JX |
10937 | #: builtin/push.c:585 builtin/send-pack.c:173 |
10938 | msgid "option to transmit" | |
10939 | msgstr "传输选项" | |
10940 | ||
a6cd2cc4 | 10941 | #: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 |
06991777 | 10942 | #: builtin/push.c:586 |
276ceeaa JX |
10943 | msgid "use IPv4 addresses only" |
10944 | msgstr "只使用 IPv4 地址" | |
10945 | ||
a6cd2cc4 | 10946 | #: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 |
06991777 | 10947 | #: builtin/push.c:588 |
276ceeaa JX |
10948 | msgid "use IPv6 addresses only" |
10949 | msgstr "只使用 IPv6 地址" | |
10950 | ||
a6cd2cc4 JX |
10951 | #: builtin/clone.c:149 |
10952 | msgid "any cloned submodules will use their remote-tracking branch" | |
10953 | msgstr "任何克隆的子模组将使用它们的远程跟踪分支" | |
10954 | ||
10955 | #: builtin/clone.c:285 | |
3495628d JX |
10956 | msgid "" |
10957 | "No directory name could be guessed.\n" | |
10958 | "Please specify a directory on the command line" | |
10959 | msgstr "" | |
10960 | "无法猜到目录名。\n" | |
26e4cbec | 10961 | "请在命令行指定一个目录" |
3495628d | 10962 | |
a6cd2cc4 | 10963 | #: builtin/clone.c:338 |
cfff71a9 | 10964 | #, c-format |
a0b6b246 JX |
10965 | msgid "info: Could not add alternate for '%s': %s\n" |
10966 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 10967 | |
a6cd2cc4 | 10968 | #: builtin/clone.c:411 |
c04f5ac3 JX |
10969 | #, c-format |
10970 | msgid "%s exists and is not a directory" | |
10971 | msgstr "%s 存在且不是一个目录" | |
10972 | ||
a6cd2cc4 | 10973 | #: builtin/clone.c:428 |
c04f5ac3 | 10974 | #, c-format |
a6cd2cc4 JX |
10975 | msgid "failed to start iterator over '%s'" |
10976 | msgstr "无法在 '%s' 上启动迭代器" | |
c04f5ac3 | 10977 | |
a6cd2cc4 | 10978 | #: builtin/clone.c:453 |
4c27fcb5 JX |
10979 | #, c-format |
10980 | msgid "failed to unlink '%s'" | |
10981 | msgstr "删除 '%s' 失败" | |
10982 | ||
a6cd2cc4 | 10983 | #: builtin/clone.c:458 |
c04f5ac3 JX |
10984 | #, c-format |
10985 | msgid "failed to create link '%s'" | |
c1ac5258 | 10986 | msgstr "创建链接 '%s' 失败" |
c04f5ac3 | 10987 | |
a6cd2cc4 | 10988 | #: builtin/clone.c:462 |
c04f5ac3 JX |
10989 | #, c-format |
10990 | msgid "failed to copy file to '%s'" | |
c1ac5258 | 10991 | msgstr "拷贝文件至 '%s' 失败" |
c04f5ac3 | 10992 | |
a6cd2cc4 JX |
10993 | #: builtin/clone.c:467 |
10994 | #, c-format | |
10995 | msgid "failed to iterate over '%s'" | |
10996 | msgstr "无法在 '%s' 上迭代" | |
10997 | ||
10998 | #: builtin/clone.c:492 | |
c04f5ac3 JX |
10999 | #, c-format |
11000 | msgid "done.\n" | |
11001 | msgstr "完成。\n" | |
11002 | ||
a6cd2cc4 | 11003 | #: builtin/clone.c:506 |
1003b3a5 JX |
11004 | msgid "" |
11005 | "Clone succeeded, but checkout failed.\n" | |
11006 | "You can inspect what was checked out with 'git status'\n" | |
a6cd2cc4 | 11007 | "and retry with 'git restore --source=HEAD :/'\n" |
1003b3a5 JX |
11008 | msgstr "" |
11009 | "克隆成功,但是检出失败。\n" | |
11010 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
a6cd2cc4 | 11011 | "'git restore --source=HEAD :/' 重试\n" |
1003b3a5 | 11012 | |
a6cd2cc4 | 11013 | #: builtin/clone.c:583 |
c04f5ac3 JX |
11014 | #, c-format |
11015 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 11016 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 11017 | |
a6cd2cc4 | 11018 | #: builtin/clone.c:702 |
3495628d JX |
11019 | #, c-format |
11020 | msgid "unable to update %s" | |
11021 | msgstr "不能更新 %s" | |
11022 | ||
a6cd2cc4 | 11023 | #: builtin/clone.c:752 |
c04f5ac3 JX |
11024 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
11025 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
11026 | ||
a6cd2cc4 | 11027 | #: builtin/clone.c:783 |
1003b3a5 JX |
11028 | msgid "unable to checkout working tree" |
11029 | msgstr "不能检出工作区" | |
11030 | ||
a6cd2cc4 | 11031 | #: builtin/clone.c:833 |
3495628d JX |
11032 | msgid "unable to write parameters to config file" |
11033 | msgstr "无法将参数写入配置文件" | |
11034 | ||
a6cd2cc4 | 11035 | #: builtin/clone.c:896 |
04cb2f28 JX |
11036 | msgid "cannot repack to clean up" |
11037 | msgstr "无法执行 repack 来清理" | |
11038 | ||
a6cd2cc4 | 11039 | #: builtin/clone.c:898 |
04cb2f28 JX |
11040 | msgid "cannot unlink temporary alternates file" |
11041 | msgstr "无法删除临时的 alternates 文件" | |
11042 | ||
a6cd2cc4 | 11043 | #: builtin/clone.c:938 builtin/receive-pack.c:1950 |
c04f5ac3 JX |
11044 | msgid "Too many arguments." |
11045 | msgstr "太多参数。" | |
11046 | ||
a6cd2cc4 | 11047 | #: builtin/clone.c:942 |
c04f5ac3 | 11048 | msgid "You must specify a repository to clone." |
160fb2b2 | 11049 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 11050 | |
a6cd2cc4 | 11051 | #: builtin/clone.c:955 |
c04f5ac3 JX |
11052 | #, c-format |
11053 | msgid "--bare and --origin %s options are incompatible." | |
11054 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
11055 | ||
a6cd2cc4 | 11056 | #: builtin/clone.c:958 |
07432cef WS |
11057 | msgid "--bare and --separate-git-dir are incompatible." |
11058 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
11059 | ||
a6cd2cc4 | 11060 | #: builtin/clone.c:971 |
c04f5ac3 JX |
11061 | #, c-format |
11062 | msgid "repository '%s' does not exist" | |
160fb2b2 | 11063 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 11064 | |
a6cd2cc4 | 11065 | #: builtin/clone.c:977 builtin/fetch.c:1660 |
cfff71a9 JX |
11066 | #, c-format |
11067 | msgid "depth %s is not a positive number" | |
11068 | msgstr "深度 %s 不是一个正数" | |
11069 | ||
a6cd2cc4 | 11070 | #: builtin/clone.c:987 |
c04f5ac3 JX |
11071 | #, c-format |
11072 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 11073 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 11074 | |
a6cd2cc4 | 11075 | #: builtin/clone.c:997 |
c04f5ac3 JX |
11076 | #, c-format |
11077 | msgid "working tree '%s' already exists." | |
11078 | msgstr "工作区 '%s' 已经存在。" | |
11079 | ||
a6cd2cc4 JX |
11080 | #: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 |
11081 | #: builtin/worktree.c:303 builtin/worktree.c:335 | |
5bb01d4f JX |
11082 | #, c-format |
11083 | msgid "could not create leading directories of '%s'" | |
11084 | msgstr "不能为 '%s' 创建先导目录" | |
11085 | ||
a6cd2cc4 | 11086 | #: builtin/clone.c:1017 |
c04f5ac3 | 11087 | #, c-format |
814ff314 JX |
11088 | msgid "could not create work tree dir '%s'" |
11089 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 11090 | |
a6cd2cc4 | 11091 | #: builtin/clone.c:1037 |
c04f5ac3 JX |
11092 | #, c-format |
11093 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 11094 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 11095 | |
a6cd2cc4 | 11096 | #: builtin/clone.c:1039 |
c04f5ac3 JX |
11097 | #, c-format |
11098 | msgid "Cloning into '%s'...\n" | |
11099 | msgstr "正克隆到 '%s'...\n" | |
11100 | ||
a6cd2cc4 | 11101 | #: builtin/clone.c:1063 |
a0b6b246 JX |
11102 | msgid "" |
11103 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
11104 | "able" | |
11105 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
11106 | ||
a6cd2cc4 | 11107 | #: builtin/clone.c:1124 |
6acbf033 | 11108 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
11109 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
11110 | ||
a6cd2cc4 | 11111 | #: builtin/clone.c:1126 |
a0b6b246 JX |
11112 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
11113 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 11114 | |
a6cd2cc4 | 11115 | #: builtin/clone.c:1128 |
a0b6b246 JX |
11116 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
11117 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
11118 | ||
a6cd2cc4 | 11119 | #: builtin/clone.c:1130 |
31e5e17b JX |
11120 | msgid "--filter is ignored in local clones; use file:// instead." |
11121 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
11122 | ||
a6cd2cc4 | 11123 | #: builtin/clone.c:1133 |
6acbf033 | 11124 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 11125 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 11126 | |
a6cd2cc4 | 11127 | #: builtin/clone.c:1138 |
6acbf033 JX |
11128 | msgid "--local is ignored" |
11129 | msgstr "--local 被忽略" | |
11130 | ||
a6cd2cc4 | 11131 | #: builtin/clone.c:1215 builtin/clone.c:1223 |
c04f5ac3 JX |
11132 | #, c-format |
11133 | msgid "Remote branch %s not found in upstream %s" | |
11134 | msgstr "远程分支 %s 在上游 %s 未发现" | |
11135 | ||
a6cd2cc4 | 11136 | #: builtin/clone.c:1226 |
c04f5ac3 | 11137 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 11138 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 11139 | |
a4f16749 | 11140 | #: builtin/column.c:10 |
814ff314 JX |
11141 | msgid "git column [<options>]" |
11142 | msgstr "git column [<选项>]" | |
ef317cd5 | 11143 | |
a4f16749 | 11144 | #: builtin/column.c:27 |
ef317cd5 | 11145 | msgid "lookup config vars" |
07432cef | 11146 | msgstr "查找配置变量" |
ef317cd5 | 11147 | |
a4f16749 | 11148 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 11149 | msgid "layout to use" |
07432cef | 11150 | msgstr "要使用的布局" |
ef317cd5 | 11151 | |
a4f16749 | 11152 | #: builtin/column.c:30 |
ef317cd5 | 11153 | msgid "Maximum width" |
07432cef | 11154 | msgstr "最大宽度" |
ef317cd5 | 11155 | |
a4f16749 | 11156 | #: builtin/column.c:31 |
ef317cd5 | 11157 | msgid "Padding space on left border" |
07432cef | 11158 | msgstr "左边框的填充空间" |
ef317cd5 | 11159 | |
a4f16749 | 11160 | #: builtin/column.c:32 |
ef317cd5 | 11161 | msgid "Padding space on right border" |
07432cef | 11162 | msgstr "右边框的填充空间" |
ef317cd5 | 11163 | |
a4f16749 | 11164 | #: builtin/column.c:33 |
ef317cd5 | 11165 | msgid "Padding space between columns" |
07432cef | 11166 | msgstr "两列之间的填充空间" |
ef317cd5 | 11167 | |
fd8cb379 | 11168 | #: builtin/column.c:51 |
8ada9598 | 11169 | msgid "--command must be the first argument" |
81809b99 | 11170 | msgstr "--command 必须是第一个参数" |
8ada9598 | 11171 | |
d46c5519 JX |
11172 | #: builtin/commit-tree.c:18 |
11173 | msgid "" | |
11174 | "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " | |
11175 | "<file>)...] <tree>" | |
11176 | msgstr "" | |
11177 | "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" | |
11178 | ">)...] <树>" | |
11179 | ||
11180 | #: builtin/commit-tree.c:31 | |
11181 | #, c-format | |
11182 | msgid "duplicate parent %s ignored" | |
11183 | msgstr "忽略重复的父提交 %s" | |
11184 | ||
a6cd2cc4 | 11185 | #: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 |
d46c5519 JX |
11186 | #, c-format |
11187 | msgid "not a valid object name %s" | |
11188 | msgstr "不是一个有效的对象名 %s" | |
11189 | ||
11190 | #: builtin/commit-tree.c:93 | |
11191 | #, c-format | |
11192 | msgid "git commit-tree: failed to open '%s'" | |
11193 | msgstr "git commit-tree:无法打开 '%s'" | |
11194 | ||
11195 | #: builtin/commit-tree.c:96 | |
11196 | #, c-format | |
11197 | msgid "git commit-tree: failed to read '%s'" | |
11198 | msgstr "git commit-tree:无法读取 '%s'" | |
11199 | ||
11200 | #: builtin/commit-tree.c:98 | |
11201 | #, c-format | |
11202 | msgid "git commit-tree: failed to close '%s'" | |
11203 | msgstr "git commit-tree:无法关闭 '%s'" | |
11204 | ||
11205 | #: builtin/commit-tree.c:111 | |
11206 | msgid "parent" | |
11207 | msgstr "父提交" | |
11208 | ||
11209 | #: builtin/commit-tree.c:112 | |
11210 | msgid "id of a parent commit object" | |
5b533632 | 11211 | msgstr "父提交对象 ID" |
d46c5519 | 11212 | |
a6cd2cc4 JX |
11213 | #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 |
11214 | #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 | |
11215 | #: builtin/tag.c:412 | |
d46c5519 JX |
11216 | msgid "message" |
11217 | msgstr "说明" | |
11218 | ||
a6cd2cc4 | 11219 | #: builtin/commit-tree.c:115 builtin/commit.c:1500 |
d46c5519 JX |
11220 | msgid "commit message" |
11221 | msgstr "提交说明" | |
11222 | ||
11223 | #: builtin/commit-tree.c:118 | |
11224 | msgid "read commit log message from file" | |
11225 | msgstr "从文件中读取提交说明" | |
11226 | ||
a6cd2cc4 JX |
11227 | #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 |
11228 | #: builtin/pull.c:194 builtin/revert.c:118 | |
d46c5519 JX |
11229 | msgid "GPG sign commit" |
11230 | msgstr "GPG 提交签名" | |
11231 | ||
11232 | #: builtin/commit-tree.c:133 | |
11233 | msgid "must give exactly one tree" | |
11234 | msgstr "必须精确地提供一个树" | |
11235 | ||
11236 | #: builtin/commit-tree.c:140 | |
11237 | msgid "git commit-tree: failed to read" | |
11238 | msgstr "git commit-tree:读取失败" | |
11239 | ||
06991777 | 11240 | #: builtin/commit.c:41 |
814ff314 | 11241 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 11242 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 11243 | |
06991777 | 11244 | #: builtin/commit.c:46 |
814ff314 | 11245 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 11246 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 11247 | |
06991777 | 11248 | #: builtin/commit.c:51 |
c04f5ac3 JX |
11249 | msgid "" |
11250 | "You asked to amend the most recent commit, but doing so would make\n" | |
11251 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
11252 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
11253 | msgstr "" | |
1b150dc9 T |
11254 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
11255 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 11256 | |
06991777 | 11257 | #: builtin/commit.c:56 |
c04f5ac3 JX |
11258 | msgid "" |
11259 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
11260 | "If you wish to commit it anyway, use:\n" | |
11261 | "\n" | |
11262 | " git commit --allow-empty\n" | |
11263 | "\n" | |
c04f5ac3 | 11264 | msgstr "" |
a9ce4543 T |
11265 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
11266 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
11267 | "\n" |
11268 | " git commit --allow-empty\n" | |
11269 | "\n" | |
c04f5ac3 | 11270 | |
06991777 | 11271 | #: builtin/commit.c:63 |
a6cd2cc4 JX |
11272 | msgid "Otherwise, please use 'git cherry-pick --skip'\n" |
11273 | msgstr "否则,请使用 'git cherry-pick --skip'\n" | |
b1894384 | 11274 | |
06991777 | 11275 | #: builtin/commit.c:66 |
b1894384 | 11276 | msgid "" |
a6cd2cc4 JX |
11277 | "and then use:\n" |
11278 | "\n" | |
11279 | " git cherry-pick --continue\n" | |
11280 | "\n" | |
11281 | "to resume cherry-picking the remaining commits.\n" | |
b1894384 JX |
11282 | "If you wish to skip this commit, use:\n" |
11283 | "\n" | |
a6cd2cc4 | 11284 | " git cherry-pick --skip\n" |
b1894384 | 11285 | "\n" |
b1894384 | 11286 | msgstr "" |
a6cd2cc4 JX |
11287 | "然后使用:\n" |
11288 | "\n" | |
11289 | " git cherry-pick --continue\n" | |
b1894384 | 11290 | "\n" |
a6cd2cc4 JX |
11291 | "来继续拣选剩余提交。如果您想跳过此提交,使用:\n" |
11292 | "\n" | |
11293 | " git cherry-pick --skip\n" | |
b1894384 | 11294 | "\n" |
b1894384 | 11295 | |
a6cd2cc4 | 11296 | #: builtin/commit.c:315 |
c04f5ac3 | 11297 | msgid "failed to unpack HEAD tree object" |
c1ac5258 | 11298 | msgstr "解包 HEAD 树对象失败" |
c04f5ac3 | 11299 | |
a6cd2cc4 | 11300 | #: builtin/commit.c:356 |
c04f5ac3 | 11301 | msgid "unable to create temporary index" |
90e6ef53 | 11302 | msgstr "不能创建临时索引" |
c04f5ac3 | 11303 | |
a6cd2cc4 | 11304 | #: builtin/commit.c:362 |
c04f5ac3 JX |
11305 | msgid "interactive add failed" |
11306 | msgstr "交互式添加失败" | |
11307 | ||
a6cd2cc4 | 11308 | #: builtin/commit.c:376 |
220c313c JX |
11309 | msgid "unable to update temporary index" |
11310 | msgstr "无法更新临时索引" | |
11311 | ||
a6cd2cc4 | 11312 | #: builtin/commit.c:378 |
220c313c JX |
11313 | msgid "Failed to update main cache tree" |
11314 | msgstr "不能更新树的主缓存" | |
11315 | ||
a6cd2cc4 | 11316 | #: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 |
c04f5ac3 | 11317 | msgid "unable to write new_index file" |
90e6ef53 | 11318 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 11319 | |
a6cd2cc4 | 11320 | #: builtin/commit.c:455 |
8ada9598 | 11321 | msgid "cannot do a partial commit during a merge." |
81809b99 | 11322 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 11323 | |
a6cd2cc4 | 11324 | #: builtin/commit.c:457 |
8ada9598 | 11325 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 11326 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 11327 | |
a6cd2cc4 | 11328 | #: builtin/commit.c:465 |
c04f5ac3 | 11329 | msgid "cannot read the index" |
90e6ef53 | 11330 | msgstr "无法读取索引" |
c04f5ac3 | 11331 | |
a6cd2cc4 | 11332 | #: builtin/commit.c:484 |
c04f5ac3 | 11333 | msgid "unable to write temporary index file" |
90e6ef53 | 11334 | msgstr "无法写临时索引文件" |
c04f5ac3 | 11335 | |
a6cd2cc4 | 11336 | #: builtin/commit.c:582 |
220c313c JX |
11337 | #, c-format |
11338 | msgid "commit '%s' lacks author header" | |
11339 | msgstr "提交 '%s' 缺少作者信息" | |
11340 | ||
a6cd2cc4 | 11341 | #: builtin/commit.c:584 |
c04f5ac3 | 11342 | #, c-format |
220c313c | 11343 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 11344 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 11345 | |
a6cd2cc4 | 11346 | #: builtin/commit.c:603 |
c04f5ac3 | 11347 | msgid "malformed --author parameter" |
fd8cb379 | 11348 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 11349 | |
a6cd2cc4 | 11350 | #: builtin/commit.c:656 |
6acbf033 JX |
11351 | msgid "" |
11352 | "unable to select a comment character that is not used\n" | |
11353 | "in the current commit message" | |
11354 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
11355 | ||
a6cd2cc4 | 11356 | #: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 |
c04f5ac3 JX |
11357 | #, c-format |
11358 | msgid "could not lookup commit %s" | |
11359 | msgstr "不能查询提交 %s" | |
11360 | ||
a6cd2cc4 | 11361 | #: builtin/commit.c:706 builtin/shortlog.c:319 |
c04f5ac3 JX |
11362 | #, c-format |
11363 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 11364 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 11365 | |
a6cd2cc4 | 11366 | #: builtin/commit.c:708 |
c04f5ac3 | 11367 | msgid "could not read log from standard input" |
90e6ef53 | 11368 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 11369 | |
a6cd2cc4 | 11370 | #: builtin/commit.c:712 |
c04f5ac3 JX |
11371 | #, c-format |
11372 | msgid "could not read log file '%s'" | |
90e6ef53 | 11373 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 11374 | |
a6cd2cc4 | 11375 | #: builtin/commit.c:743 builtin/commit.c:759 |
c04f5ac3 | 11376 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 11377 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 11378 | |
a6cd2cc4 | 11379 | #: builtin/commit.c:750 |
5b04ee3b JX |
11380 | msgid "could not read MERGE_MSG" |
11381 | msgstr "不能读取 MERGE_MSG" | |
11382 | ||
a6cd2cc4 | 11383 | #: builtin/commit.c:810 |
c04f5ac3 | 11384 | msgid "could not write commit template" |
90e6ef53 | 11385 | msgstr "不能写提交模版" |
c04f5ac3 | 11386 | |
a6cd2cc4 | 11387 | #: builtin/commit.c:829 |
81809b99 | 11388 | #, c-format |
c04f5ac3 JX |
11389 | msgid "" |
11390 | "\n" | |
8ada9598 | 11391 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
11392 | "If this is not correct, please remove the file\n" |
11393 | "\t%s\n" | |
11394 | "and try again.\n" | |
11395 | msgstr "" | |
11396 | "\n" | |
649900bc | 11397 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
11398 | "\t%s\n" |
11399 | "然后重试。\n" | |
11400 | ||
a6cd2cc4 | 11401 | #: builtin/commit.c:834 |
81809b99 | 11402 | #, c-format |
8ada9598 JX |
11403 | msgid "" |
11404 | "\n" | |
11405 | "It looks like you may be committing a cherry-pick.\n" | |
11406 | "If this is not correct, please remove the file\n" | |
11407 | "\t%s\n" | |
11408 | "and try again.\n" | |
11409 | msgstr "" | |
11410 | "\n" | |
649900bc | 11411 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
11412 | "\t%s\n" |
11413 | "然后重试。\n" | |
c04f5ac3 | 11414 | |
a6cd2cc4 | 11415 | #: builtin/commit.c:847 |
a77c07d9 | 11416 | #, c-format |
c04f5ac3 | 11417 | msgid "" |
8ada9598 | 11418 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 11419 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 11420 | msgstr "" |
a77c07d9 | 11421 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 11422 | "说明将会终止提交。\n" |
c04f5ac3 | 11423 | |
a6cd2cc4 | 11424 | #: builtin/commit.c:855 |
a77c07d9 | 11425 | #, c-format |
c04f5ac3 | 11426 | msgid "" |
8ada9598 | 11427 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 11428 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
11429 | "An empty message aborts the commit.\n" |
11430 | msgstr "" | |
a77c07d9 JX |
11431 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
11432 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 11433 | |
90e6ef53 | 11434 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a6cd2cc4 | 11435 | #: builtin/commit.c:872 |
6acbf033 JX |
11436 | #, c-format |
11437 | msgid "%sAuthor: %.*s <%.*s>" | |
11438 | msgstr "%s作者: %.*s <%.*s>" | |
11439 | ||
11440 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
a6cd2cc4 | 11441 | #: builtin/commit.c:880 |
c04f5ac3 | 11442 | #, c-format |
6acbf033 JX |
11443 | msgid "%sDate: %s" |
11444 | msgstr "%s日期: %s" | |
c04f5ac3 | 11445 | |
90e6ef53 | 11446 | # 译者:为保证在输出中对齐,注意调整句中空格! |
a6cd2cc4 | 11447 | #: builtin/commit.c:887 |
c04f5ac3 | 11448 | #, c-format |
6acbf033 JX |
11449 | msgid "%sCommitter: %.*s <%.*s>" |
11450 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 11451 | |
a6cd2cc4 | 11452 | #: builtin/commit.c:905 |
c04f5ac3 | 11453 | msgid "Cannot read index" |
90e6ef53 | 11454 | msgstr "无法读取索引" |
c04f5ac3 | 11455 | |
a6cd2cc4 | 11456 | #: builtin/commit.c:972 |
c04f5ac3 JX |
11457 | msgid "Error building trees" |
11458 | msgstr "无法创建树对象" | |
11459 | ||
a6cd2cc4 | 11460 | #: builtin/commit.c:986 builtin/tag.c:275 |
c04f5ac3 JX |
11461 | #, c-format |
11462 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 11463 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 11464 | |
a6cd2cc4 | 11465 | #: builtin/commit.c:1030 |
c04f5ac3 | 11466 | #, c-format |
814ff314 | 11467 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 11468 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 11469 | |
a6cd2cc4 | 11470 | #: builtin/commit.c:1044 |
5809aa05 JX |
11471 | #, c-format |
11472 | msgid "Invalid ignored mode '%s'" | |
11473 | msgstr "无效的忽略模式 '%s'" | |
11474 | ||
a6cd2cc4 | 11475 | #: builtin/commit.c:1062 builtin/commit.c:1304 |
c04f5ac3 JX |
11476 | #, c-format |
11477 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 11478 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 11479 | |
a6cd2cc4 | 11480 | #: builtin/commit.c:1102 |
2e8451e8 JX |
11481 | msgid "--long and -z are incompatible" |
11482 | msgstr "--long 和 -z 选项不兼容" | |
11483 | ||
a6cd2cc4 | 11484 | #: builtin/commit.c:1146 |
c04f5ac3 JX |
11485 | msgid "Using both --reset-author and --author does not make sense" |
11486 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
11487 | ||
a6cd2cc4 | 11488 | #: builtin/commit.c:1155 |
c04f5ac3 | 11489 | msgid "You have nothing to amend." |
90e6ef53 | 11490 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 11491 | |
a6cd2cc4 | 11492 | #: builtin/commit.c:1158 |
8ada9598 | 11493 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 11494 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 11495 | |
a6cd2cc4 | 11496 | #: builtin/commit.c:1160 |
8ada9598 | 11497 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 11498 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 11499 | |
a6cd2cc4 | 11500 | #: builtin/commit.c:1163 |
c04f5ac3 | 11501 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 11502 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 11503 | |
a6cd2cc4 | 11504 | #: builtin/commit.c:1173 |
c04f5ac3 JX |
11505 | msgid "Only one of -c/-C/-F/--fixup can be used." |
11506 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
11507 | ||
a6cd2cc4 | 11508 | #: builtin/commit.c:1175 |
31e5e17b JX |
11509 | msgid "Option -m cannot be combined with -c/-C/-F." |
11510 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 11511 | |
a6cd2cc4 | 11512 | #: builtin/commit.c:1183 |
c04f5ac3 | 11513 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 11514 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 11515 | |
a6cd2cc4 | 11516 | #: builtin/commit.c:1200 |
c04f5ac3 JX |
11517 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
11518 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
11519 | ||
a6cd2cc4 | 11520 | #: builtin/commit.c:1202 |
c04f5ac3 JX |
11521 | msgid "No paths with --include/--only does not make sense." |
11522 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
11523 | ||
a6cd2cc4 | 11524 | #: builtin/commit.c:1208 |
c04f5ac3 | 11525 | #, c-format |
d46c5519 JX |
11526 | msgid "paths '%s ...' with -a does not make sense" |
11527 | msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" | |
c04f5ac3 | 11528 | |
a6cd2cc4 | 11529 | #: builtin/commit.c:1339 builtin/commit.c:1523 |
ef317cd5 | 11530 | msgid "show status concisely" |
07432cef | 11531 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 11532 | |
a6cd2cc4 | 11533 | #: builtin/commit.c:1341 builtin/commit.c:1525 |
ef317cd5 | 11534 | msgid "show branch information" |
07432cef | 11535 | msgstr "显示分支信息" |
ef317cd5 | 11536 | |
a6cd2cc4 | 11537 | #: builtin/commit.c:1343 |
a4f16749 JX |
11538 | msgid "show stash information" |
11539 | msgstr "显示贮藏区信息" | |
11540 | ||
a6cd2cc4 | 11541 | #: builtin/commit.c:1345 builtin/commit.c:1527 |
31e5e17b JX |
11542 | msgid "compute full ahead/behind values" |
11543 | msgstr "计算完整的领先/落后值" | |
11544 | ||
a6cd2cc4 | 11545 | #: builtin/commit.c:1347 |
a0b6b246 JX |
11546 | msgid "version" |
11547 | msgstr "版本" | |
11548 | ||
a6cd2cc4 JX |
11549 | #: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 |
11550 | #: builtin/worktree.c:651 | |
ef317cd5 | 11551 | msgid "machine-readable output" |
07432cef WS |
11552 | msgstr "机器可读的输出" |
11553 | ||
a6cd2cc4 | 11554 | #: builtin/commit.c:1350 builtin/commit.c:1531 |
07432cef WS |
11555 | msgid "show status in long format (default)" |
11556 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 11557 | |
a6cd2cc4 | 11558 | #: builtin/commit.c:1353 builtin/commit.c:1534 |
ef317cd5 | 11559 | msgid "terminate entries with NUL" |
4375c10e | 11560 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 11561 | |
a6cd2cc4 JX |
11562 | #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 |
11563 | #: builtin/fast-export.c:1125 builtin/fast-export.c:1128 | |
11564 | #: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 | |
ef317cd5 | 11565 | msgid "mode" |
07432cef | 11566 | msgstr "模式" |
ef317cd5 | 11567 | |
a6cd2cc4 | 11568 | #: builtin/commit.c:1356 builtin/commit.c:1537 |
ef317cd5 | 11569 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 11570 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 11571 | |
a6cd2cc4 | 11572 | #: builtin/commit.c:1360 |
5809aa05 JX |
11573 | msgid "" |
11574 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
11575 | "traditional)" | |
31e5e17b JX |
11576 | msgstr "" |
11577 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 11578 | |
a6cd2cc4 | 11579 | #: builtin/commit.c:1362 parse-options.h:179 |
ef317cd5 JX |
11580 | msgid "when" |
11581 | msgstr "何时" | |
11582 | ||
a6cd2cc4 | 11583 | #: builtin/commit.c:1363 |
ef317cd5 JX |
11584 | msgid "" |
11585 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
11586 | "(Default: all)" | |
11587 | msgstr "" | |
07432cef | 11588 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 11589 | |
a6cd2cc4 | 11590 | #: builtin/commit.c:1365 |
ef317cd5 | 11591 | msgid "list untracked files in columns" |
07432cef | 11592 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 11593 | |
a6cd2cc4 | 11594 | #: builtin/commit.c:1366 |
fd8cb379 JX |
11595 | msgid "do not detect renames" |
11596 | msgstr "不检测重命名" | |
11597 | ||
a6cd2cc4 | 11598 | #: builtin/commit.c:1368 |
fd8cb379 JX |
11599 | msgid "detect renames, optionally set similarity index" |
11600 | msgstr "检测重命名,可以设置索引相似度" | |
11601 | ||
a6cd2cc4 | 11602 | #: builtin/commit.c:1388 |
5809aa05 JX |
11603 | msgid "Unsupported combination of ignored and untracked-files arguments" |
11604 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
11605 | ||
a6cd2cc4 | 11606 | #: builtin/commit.c:1493 |
ef317cd5 | 11607 | msgid "suppress summary after successful commit" |
07432cef | 11608 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 11609 | |
a6cd2cc4 | 11610 | #: builtin/commit.c:1494 |
ef317cd5 | 11611 | msgid "show diff in commit message template" |
07432cef | 11612 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 11613 | |
a6cd2cc4 | 11614 | #: builtin/commit.c:1496 |
ef317cd5 | 11615 | msgid "Commit message options" |
07432cef | 11616 | msgstr "提交说明选项" |
c04f5ac3 | 11617 | |
a6cd2cc4 | 11618 | #: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 |
ef317cd5 | 11619 | msgid "read message from file" |
07432cef | 11620 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 11621 | |
a6cd2cc4 | 11622 | #: builtin/commit.c:1498 |
ef317cd5 | 11623 | msgid "author" |
07432cef | 11624 | msgstr "作者" |
c04f5ac3 | 11625 | |
a6cd2cc4 | 11626 | #: builtin/commit.c:1498 |
ef317cd5 | 11627 | msgid "override author for commit" |
07432cef | 11628 | msgstr "提交时覆盖作者" |
73a60cd2 | 11629 | |
a6cd2cc4 | 11630 | #: builtin/commit.c:1499 builtin/gc.c:539 |
ef317cd5 | 11631 | msgid "date" |
07432cef | 11632 | msgstr "日期" |
c04f5ac3 | 11633 | |
a6cd2cc4 | 11634 | #: builtin/commit.c:1499 |
ef317cd5 | 11635 | msgid "override date for commit" |
07432cef | 11636 | msgstr "提交时覆盖日期" |
c04f5ac3 | 11637 | |
a6cd2cc4 JX |
11638 | #: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 |
11639 | #: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 | |
94550ed3 JX |
11640 | msgid "commit" |
11641 | msgstr "提交" | |
11642 | ||
a6cd2cc4 | 11643 | #: builtin/commit.c:1501 |
ef317cd5 | 11644 | msgid "reuse and edit message from specified commit" |
07432cef | 11645 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 11646 | |
a6cd2cc4 | 11647 | #: builtin/commit.c:1502 |
ef317cd5 | 11648 | msgid "reuse message from specified commit" |
07432cef | 11649 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 11650 | |
a6cd2cc4 | 11651 | #: builtin/commit.c:1503 |
ef317cd5 | 11652 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 11653 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 11654 | |
a6cd2cc4 | 11655 | #: builtin/commit.c:1504 |
ef317cd5 | 11656 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 11657 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 11658 | |
a6cd2cc4 | 11659 | #: builtin/commit.c:1505 |
ef317cd5 | 11660 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 11661 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 11662 | |
a6cd2cc4 JX |
11663 | #: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 |
11664 | #: builtin/pull.c:163 builtin/revert.c:110 | |
ef317cd5 | 11665 | msgid "add Signed-off-by:" |
07432cef | 11666 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 11667 | |
a6cd2cc4 | 11668 | #: builtin/commit.c:1507 |
ef317cd5 | 11669 | msgid "use specified template file" |
07432cef | 11670 | msgstr "使用指定的模板文件" |
ef317cd5 | 11671 | |
a6cd2cc4 | 11672 | #: builtin/commit.c:1508 |
ef317cd5 | 11673 | msgid "force edit of commit" |
07432cef | 11674 | msgstr "强制编辑提交" |
ef317cd5 | 11675 | |
a6cd2cc4 | 11676 | #: builtin/commit.c:1510 |
ef317cd5 | 11677 | msgid "include status in commit message template" |
07432cef | 11678 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 11679 | |
a6cd2cc4 | 11680 | #: builtin/commit.c:1515 |
ef317cd5 | 11681 | msgid "Commit contents options" |
07432cef | 11682 | msgstr "提交内容选项" |
ef317cd5 | 11683 | |
a6cd2cc4 | 11684 | #: builtin/commit.c:1516 |
ef317cd5 | 11685 | msgid "commit all changed files" |
07432cef | 11686 | msgstr "提交所有改动的文件" |
ef317cd5 | 11687 | |
a6cd2cc4 | 11688 | #: builtin/commit.c:1517 |
ef317cd5 | 11689 | msgid "add specified files to index for commit" |
07432cef | 11690 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 11691 | |
a6cd2cc4 | 11692 | #: builtin/commit.c:1518 |
ef317cd5 | 11693 | msgid "interactively add files" |
07432cef | 11694 | msgstr "交互式添加文件" |
ef317cd5 | 11695 | |
a6cd2cc4 | 11696 | #: builtin/commit.c:1519 |
ef317cd5 | 11697 | msgid "interactively add changes" |
07432cef | 11698 | msgstr "交互式添加变更" |
ef317cd5 | 11699 | |
a6cd2cc4 | 11700 | #: builtin/commit.c:1520 |
ef317cd5 | 11701 | msgid "commit only specified files" |
07432cef | 11702 | msgstr "只提交指定的文件" |
ef317cd5 | 11703 | |
a6cd2cc4 | 11704 | #: builtin/commit.c:1521 |
5c57d762 JX |
11705 | msgid "bypass pre-commit and commit-msg hooks" |
11706 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
11707 | ||
a6cd2cc4 | 11708 | #: builtin/commit.c:1522 |
ef317cd5 | 11709 | msgid "show what would be committed" |
07432cef | 11710 | msgstr "显示将要提交的内容" |
ef317cd5 | 11711 | |
a6cd2cc4 | 11712 | #: builtin/commit.c:1535 |
ef317cd5 | 11713 | msgid "amend previous commit" |
07432cef | 11714 | msgstr "修改先前的提交" |
ef317cd5 | 11715 | |
a6cd2cc4 | 11716 | #: builtin/commit.c:1536 |
ef317cd5 | 11717 | msgid "bypass post-rewrite hook" |
07432cef | 11718 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 11719 | |
a6cd2cc4 | 11720 | #: builtin/commit.c:1541 |
ef317cd5 | 11721 | msgid "ok to record an empty change" |
07432cef | 11722 | msgstr "允许一个空提交" |
ef317cd5 | 11723 | |
a6cd2cc4 | 11724 | #: builtin/commit.c:1543 |
ef317cd5 | 11725 | msgid "ok to record a change with an empty message" |
07432cef | 11726 | msgstr "允许空的提交说明" |
ef317cd5 | 11727 | |
a6cd2cc4 | 11728 | #: builtin/commit.c:1616 |
c04f5ac3 JX |
11729 | #, c-format |
11730 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 11731 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 11732 | |
a6cd2cc4 | 11733 | #: builtin/commit.c:1623 |
c04f5ac3 | 11734 | msgid "could not read MERGE_MODE" |
90e6ef53 | 11735 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 11736 | |
a6cd2cc4 | 11737 | #: builtin/commit.c:1642 |
c04f5ac3 JX |
11738 | #, c-format |
11739 | msgid "could not read commit message: %s" | |
90e6ef53 | 11740 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 11741 | |
a6cd2cc4 | 11742 | #: builtin/commit.c:1649 |
c04f5ac3 JX |
11743 | #, c-format |
11744 | msgid "Aborting commit due to empty commit message.\n" | |
11745 | msgstr "终止提交因为提交说明为空。\n" | |
11746 | ||
a6cd2cc4 | 11747 | #: builtin/commit.c:1654 |
6937cb4e JX |
11748 | #, c-format |
11749 | msgid "Aborting commit; you did not edit the message.\n" | |
11750 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
11751 | ||
a6cd2cc4 | 11752 | #: builtin/commit.c:1688 |
c04f5ac3 | 11753 | msgid "" |
c1ac5258 | 11754 | "repository has been updated, but unable to write\n" |
220c313c | 11755 | "new_index file. Check that disk is not full and quota is\n" |
a6cd2cc4 | 11756 | "not exceeded, and then \"git restore --staged :/\" to recover." |
c04f5ac3 | 11757 | msgstr "" |
a6cd2cc4 JX |
11758 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n" |
11759 | "磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。" | |
c04f5ac3 | 11760 | |
a6cd2cc4 | 11761 | #: builtin/commit-graph.c:11 |
fd8cb379 JX |
11762 | msgid "git commit-graph [--object-dir <objdir>]" |
11763 | msgstr "git commit-graph [--object-dir <对象目录>]" | |
11764 | ||
a6cd2cc4 | 11765 | #: builtin/commit-graph.c:12 builtin/commit-graph.c:24 |
fd8cb379 JX |
11766 | msgid "git commit-graph read [--object-dir <objdir>]" |
11767 | msgstr "git commit-graph read [--object-dir <对象目录>]" | |
11768 | ||
a6cd2cc4 JX |
11769 | #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 |
11770 | msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" | |
11771 | msgstr "git commit-graph verify [--object-dir <对象目录>] [--shallow]" | |
c1ac5258 | 11772 | |
a6cd2cc4 | 11773 | #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 |
fd8cb379 | 11774 | msgid "" |
a6cd2cc4 JX |
11775 | "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" |
11776 | "reachable|--stdin-packs|--stdin-commits] <split options>" | |
11777 | msgstr "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>" | |
fd8cb379 | 11778 | |
a6cd2cc4 JX |
11779 | #: builtin/commit-graph.c:54 builtin/commit-graph.c:100 |
11780 | #: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 | |
11781 | #: builtin/log.c:1584 | |
fd8cb379 JX |
11782 | msgid "dir" |
11783 | msgstr "目录" | |
11784 | ||
a6cd2cc4 JX |
11785 | #: builtin/commit-graph.c:55 builtin/commit-graph.c:101 |
11786 | #: builtin/commit-graph.c:162 builtin/commit-graph.c:238 | |
fd8cb379 JX |
11787 | msgid "The object directory to store the graph" |
11788 | msgstr "保存图形的对象目录" | |
11789 | ||
a6cd2cc4 JX |
11790 | #: builtin/commit-graph.c:57 |
11791 | msgid "if the commit-graph is split, only verify the tip file" | |
11792 | msgstr "如果提交图形被拆分,只验证头一个文件" | |
11793 | ||
11794 | #: builtin/commit-graph.c:73 builtin/commit-graph.c:116 | |
d46c5519 JX |
11795 | #, c-format |
11796 | msgid "Could not open commit-graph '%s'" | |
11797 | msgstr "无法打开提交图形 '%s'" | |
11798 | ||
a6cd2cc4 | 11799 | #: builtin/commit-graph.c:164 |
c1ac5258 JX |
11800 | msgid "start walk at all refs" |
11801 | msgstr "开始遍历所有引用" | |
11802 | ||
a6cd2cc4 | 11803 | #: builtin/commit-graph.c:166 |
fd8cb379 JX |
11804 | msgid "scan pack-indexes listed by stdin for commits" |
11805 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
11806 | ||
a6cd2cc4 | 11807 | #: builtin/commit-graph.c:168 |
fd8cb379 JX |
11808 | msgid "start walk at commits listed by stdin" |
11809 | msgstr "从标准输入中的提交开始扫描" | |
11810 | ||
a6cd2cc4 | 11811 | #: builtin/commit-graph.c:170 |
fd8cb379 JX |
11812 | msgid "include all commits already in the commit-graph file" |
11813 | msgstr "包含 commit-graph 文件中已有所有提交" | |
11814 | ||
a6cd2cc4 JX |
11815 | #: builtin/commit-graph.c:172 |
11816 | msgid "allow writing an incremental commit-graph file" | |
11817 | msgstr "允许写一个增量提交图形文件" | |
11818 | ||
11819 | #: builtin/commit-graph.c:174 builtin/commit-graph.c:178 | |
11820 | msgid "maximum number of commits in a non-base split commit-graph" | |
11821 | msgstr "在非基本拆分提交图形中的最大提交数" | |
11822 | ||
11823 | #: builtin/commit-graph.c:176 | |
11824 | msgid "maximum ratio between two levels of a split commit-graph" | |
11825 | msgstr "一个拆分提交图形的两个级别之间的最大比率" | |
11826 | ||
11827 | #: builtin/commit-graph.c:191 | |
c1ac5258 JX |
11828 | msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" |
11829 | msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" | |
fd8cb379 | 11830 | |
4c27fcb5 | 11831 | #: builtin/config.c:11 |
814ff314 JX |
11832 | msgid "git config [<options>]" |
11833 | msgstr "git config [<选项>]" | |
ef317cd5 | 11834 | |
a6cd2cc4 | 11835 | #: builtin/config.c:103 builtin/env--helper.c:23 |
fd8cb379 JX |
11836 | #, c-format |
11837 | msgid "unrecognized --type argument, %s" | |
11838 | msgstr "未能识别的 --type 参数,%s" | |
11839 | ||
4c27fcb5 | 11840 | #: builtin/config.c:115 |
c1ac5258 JX |
11841 | msgid "only one type at a time" |
11842 | msgstr "一次只能一个类型" | |
11843 | ||
4c27fcb5 | 11844 | #: builtin/config.c:124 |
ef317cd5 | 11845 | msgid "Config file location" |
07432cef | 11846 | msgstr "配置文件位置" |
ef317cd5 | 11847 | |
4c27fcb5 | 11848 | #: builtin/config.c:125 |
ef317cd5 | 11849 | msgid "use global config file" |
07432cef | 11850 | msgstr "使用全局配置文件" |
ef317cd5 | 11851 | |
4c27fcb5 | 11852 | #: builtin/config.c:126 |
ef317cd5 | 11853 | msgid "use system config file" |
07432cef | 11854 | msgstr "使用系统级配置文件" |
ef317cd5 | 11855 | |
4c27fcb5 | 11856 | #: builtin/config.c:127 |
ef317cd5 | 11857 | msgid "use repository config file" |
160fb2b2 | 11858 | msgstr "使用仓库级配置文件" |
ef317cd5 | 11859 | |
4c27fcb5 JX |
11860 | #: builtin/config.c:128 |
11861 | msgid "use per-worktree config file" | |
11862 | msgstr "使用工作区级别的配置文件" | |
11863 | ||
11864 | #: builtin/config.c:129 | |
ef317cd5 | 11865 | msgid "use given config file" |
07432cef | 11866 | msgstr "使用指定的配置文件" |
ef317cd5 | 11867 | |
4c27fcb5 | 11868 | #: builtin/config.c:130 |
2e8451e8 | 11869 | msgid "blob-id" |
4375c10e | 11870 | msgstr "数据对象 ID" |
2e8451e8 | 11871 | |
4c27fcb5 | 11872 | #: builtin/config.c:130 |
2e8451e8 JX |
11873 | msgid "read config from given blob object" |
11874 | msgstr "从给定的数据对象读取配置" | |
11875 | ||
4c27fcb5 | 11876 | #: builtin/config.c:131 |
ef317cd5 | 11877 | msgid "Action" |
07432cef | 11878 | msgstr "操作" |
ef317cd5 | 11879 | |
4c27fcb5 | 11880 | #: builtin/config.c:132 |
ef317cd5 | 11881 | msgid "get value: name [value-regex]" |
07432cef | 11882 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 11883 | |
4c27fcb5 | 11884 | #: builtin/config.c:133 |
ef317cd5 | 11885 | msgid "get all values: key [value-regex]" |
07432cef | 11886 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 11887 | |
4c27fcb5 | 11888 | #: builtin/config.c:134 |
ef317cd5 | 11889 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 11890 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 11891 | |
4c27fcb5 | 11892 | #: builtin/config.c:135 |
90314792 JX |
11893 | msgid "get value specific for the URL: section[.var] URL" |
11894 | msgstr "获得 URL 取值:section[.var] URL" | |
11895 | ||
4c27fcb5 | 11896 | #: builtin/config.c:136 |
ef317cd5 | 11897 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 11898 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 11899 | |
4c27fcb5 | 11900 | #: builtin/config.c:137 |
ef317cd5 | 11901 | msgid "add a new variable: name value" |
07432cef | 11902 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 11903 | |
4c27fcb5 | 11904 | #: builtin/config.c:138 |
ef317cd5 | 11905 | msgid "remove a variable: name [value-regex]" |
07432cef | 11906 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 11907 | |
4c27fcb5 | 11908 | #: builtin/config.c:139 |
ef317cd5 | 11909 | msgid "remove all matches: name [value-regex]" |
07432cef | 11910 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 11911 | |
4c27fcb5 | 11912 | #: builtin/config.c:140 |
ef317cd5 | 11913 | msgid "rename section: old-name new-name" |
07432cef | 11914 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 11915 | |
4c27fcb5 | 11916 | #: builtin/config.c:141 |
ef317cd5 | 11917 | msgid "remove a section: name" |
07432cef | 11918 | msgstr "删除一个小节:name" |
ef317cd5 | 11919 | |
4c27fcb5 | 11920 | #: builtin/config.c:142 |
ef317cd5 | 11921 | msgid "list all" |
07432cef | 11922 | msgstr "列出所有" |
ef317cd5 | 11923 | |
4c27fcb5 | 11924 | #: builtin/config.c:143 |
ef317cd5 | 11925 | msgid "open an editor" |
07432cef | 11926 | msgstr "打开一个编辑器" |
ef317cd5 | 11927 | |
4c27fcb5 | 11928 | #: builtin/config.c:144 |
04cb2f28 JX |
11929 | msgid "find the color configured: slot [default]" |
11930 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 11931 | |
4c27fcb5 | 11932 | #: builtin/config.c:145 |
04cb2f28 JX |
11933 | msgid "find the color setting: slot [stdout-is-tty]" |
11934 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 11935 | |
4c27fcb5 | 11936 | #: builtin/config.c:146 |
ef317cd5 | 11937 | msgid "Type" |
07432cef | 11938 | msgstr "类型" |
ef317cd5 | 11939 | |
a6cd2cc4 | 11940 | #: builtin/config.c:147 builtin/env--helper.c:38 |
fd8cb379 JX |
11941 | msgid "value is given this type" |
11942 | msgstr "取值为该类型" | |
11943 | ||
4c27fcb5 | 11944 | #: builtin/config.c:148 |
ef317cd5 | 11945 | msgid "value is \"true\" or \"false\"" |
07432cef | 11946 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 11947 | |
4c27fcb5 | 11948 | #: builtin/config.c:149 |
ef317cd5 | 11949 | msgid "value is decimal number" |
07432cef | 11950 | msgstr "值是十进制数" |
ef317cd5 | 11951 | |
4c27fcb5 | 11952 | #: builtin/config.c:150 |
ef317cd5 | 11953 | msgid "value is --bool or --int" |
07432cef | 11954 | msgstr "值是 --bool or --int" |
ef317cd5 | 11955 | |
4c27fcb5 | 11956 | #: builtin/config.c:151 |
ef317cd5 | 11957 | msgid "value is a path (file or directory name)" |
07432cef | 11958 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 11959 | |
4c27fcb5 | 11960 | #: builtin/config.c:152 |
5809aa05 JX |
11961 | msgid "value is an expiry date" |
11962 | msgstr "值是一个到期日期" | |
11963 | ||
4c27fcb5 | 11964 | #: builtin/config.c:153 |
ef317cd5 | 11965 | msgid "Other" |
07432cef | 11966 | msgstr "其它" |
ef317cd5 | 11967 | |
4c27fcb5 | 11968 | #: builtin/config.c:154 |
ef317cd5 | 11969 | msgid "terminate values with NUL byte" |
4375c10e | 11970 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 11971 | |
4c27fcb5 | 11972 | #: builtin/config.c:155 |
1b7f4a34 JX |
11973 | msgid "show variable names only" |
11974 | msgstr "只显示变量名" | |
11975 | ||
4c27fcb5 | 11976 | #: builtin/config.c:156 |
ef317cd5 | 11977 | msgid "respect include directives on lookup" |
07432cef | 11978 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 11979 | |
4c27fcb5 | 11980 | #: builtin/config.c:157 |
276ceeaa JX |
11981 | msgid "show origin of config (file, standard input, blob, command line)" |
11982 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
11983 | ||
a6cd2cc4 | 11984 | #: builtin/config.c:158 builtin/env--helper.c:40 |
fd8cb379 JX |
11985 | msgid "value" |
11986 | msgstr "取值" | |
11987 | ||
4c27fcb5 | 11988 | #: builtin/config.c:158 |
fd8cb379 JX |
11989 | msgid "with --get, use default value when missing entry" |
11990 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
11991 | ||
06991777 | 11992 | #: builtin/config.c:172 |
c1ac5258 JX |
11993 | #, c-format |
11994 | msgid "wrong number of arguments, should be %d" | |
11995 | msgstr "错误的参数个数,应该为 %d 个" | |
11996 | ||
06991777 | 11997 | #: builtin/config.c:174 |
c1ac5258 JX |
11998 | #, c-format |
11999 | msgid "wrong number of arguments, should be from %d to %d" | |
12000 | msgstr "错误的参数个数,应该为从 %d 个到 %d 个" | |
12001 | ||
06991777 | 12002 | #: builtin/config.c:308 |
c1ac5258 JX |
12003 | #, c-format |
12004 | msgid "invalid key pattern: %s" | |
12005 | msgstr "无效键名模式:%s" | |
12006 | ||
06991777 | 12007 | #: builtin/config.c:344 |
fd8cb379 JX |
12008 | #, c-format |
12009 | msgid "failed to format default config value: %s" | |
c1ac5258 JX |
12010 | msgstr "格式化默认配置值失败:%s" |
12011 | ||
06991777 | 12012 | #: builtin/config.c:401 |
c1ac5258 JX |
12013 | #, c-format |
12014 | msgid "cannot parse color '%s'" | |
12015 | msgstr "无法解析颜色 '%s'" | |
fd8cb379 | 12016 | |
06991777 | 12017 | #: builtin/config.c:443 |
220c313c | 12018 | msgid "unable to parse default color value" |
c1ac5258 JX |
12019 | msgstr "无法解析默认颜色值" |
12020 | ||
06991777 | 12021 | #: builtin/config.c:496 builtin/config.c:742 |
c1ac5258 JX |
12022 | msgid "not in a git directory" |
12023 | msgstr "不在 git 仓库中" | |
12024 | ||
06991777 | 12025 | #: builtin/config.c:499 |
c1ac5258 JX |
12026 | msgid "writing to stdin is not supported" |
12027 | msgstr "不支持写到标准输入" | |
12028 | ||
06991777 | 12029 | #: builtin/config.c:502 |
c1ac5258 JX |
12030 | msgid "writing config blobs is not supported" |
12031 | msgstr "不支持写到配置数据对象" | |
220c313c | 12032 | |
06991777 | 12033 | #: builtin/config.c:587 |
220c313c JX |
12034 | #, c-format |
12035 | msgid "" | |
12036 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 12037 | "[user]\n" |
220c313c | 12038 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 12039 | "#\tname = %s\n" |
220c313c JX |
12040 | "#\temail = %s\n" |
12041 | msgstr "" | |
12042 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 12043 | "[user]\n" |
220c313c | 12044 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 12045 | "#\tname = %s\n" |
220c313c JX |
12046 | "#\temail = %s\n" |
12047 | ||
06991777 | 12048 | #: builtin/config.c:611 |
c1ac5258 JX |
12049 | msgid "only one config file at a time" |
12050 | msgstr "一次只能有一个配置文件" | |
12051 | ||
06991777 | 12052 | #: builtin/config.c:616 |
a4f16749 JX |
12053 | msgid "--local can only be used inside a git repository" |
12054 | msgstr "--local 只能在一个仓库内使用" | |
12055 | ||
06991777 | 12056 | #: builtin/config.c:619 |
fd8cb379 JX |
12057 | msgid "--blob can only be used inside a git repository" |
12058 | msgstr "--blob 只能在一个仓库内使用" | |
12059 | ||
06991777 | 12060 | #: builtin/config.c:638 |
c1ac5258 JX |
12061 | msgid "$HOME not set" |
12062 | msgstr "$HOME 未设置" | |
12063 | ||
06991777 | 12064 | #: builtin/config.c:658 |
4c27fcb5 JX |
12065 | msgid "" |
12066 | "--worktree cannot be used with multiple working trees unless the config\n" | |
12067 | "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" | |
12068 | "section in \"git help worktree\" for details" | |
12069 | msgstr "" | |
12070 | "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n" | |
12071 | "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" | |
12072 | ||
06991777 | 12073 | #: builtin/config.c:688 |
c1ac5258 JX |
12074 | msgid "--get-color and variable type are incoherent" |
12075 | msgstr "--get-color 和变量类型不兼容" | |
12076 | ||
06991777 | 12077 | #: builtin/config.c:693 |
c1ac5258 JX |
12078 | msgid "only one action at a time" |
12079 | msgstr "一次只能有一个动作" | |
12080 | ||
06991777 | 12081 | #: builtin/config.c:706 |
c1ac5258 JX |
12082 | msgid "--name-only is only applicable to --list or --get-regexp" |
12083 | msgstr "--name-only 仅适用于 --list 或 --get-regexp" | |
12084 | ||
06991777 | 12085 | #: builtin/config.c:712 |
c1ac5258 JX |
12086 | msgid "" |
12087 | "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" | |
12088 | "list" | |
12089 | msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" | |
12090 | ||
06991777 | 12091 | #: builtin/config.c:718 |
c1ac5258 JX |
12092 | msgid "--default is only applicable to --get" |
12093 | msgstr "--default 仅适用于 --get" | |
12094 | ||
06991777 | 12095 | #: builtin/config.c:731 |
c1ac5258 JX |
12096 | #, c-format |
12097 | msgid "unable to read config file '%s'" | |
12098 | msgstr "无法读取配置文件 '%s'" | |
12099 | ||
06991777 | 12100 | #: builtin/config.c:734 |
c1ac5258 JX |
12101 | msgid "error processing config file(s)" |
12102 | msgstr "处理配置文件出错" | |
12103 | ||
06991777 | 12104 | #: builtin/config.c:744 |
c1ac5258 JX |
12105 | msgid "editing stdin is not supported" |
12106 | msgstr "不支持编辑标准输入" | |
12107 | ||
06991777 | 12108 | #: builtin/config.c:746 |
c1ac5258 JX |
12109 | msgid "editing blobs is not supported" |
12110 | msgstr "不支持编辑数据对象" | |
12111 | ||
06991777 | 12112 | #: builtin/config.c:760 |
220c313c JX |
12113 | #, c-format |
12114 | msgid "cannot create configuration file %s" | |
12115 | msgstr "不能创建配置文件 %s" | |
12116 | ||
06991777 | 12117 | #: builtin/config.c:773 |
a0b6b246 JX |
12118 | #, c-format |
12119 | msgid "" | |
12120 | "cannot overwrite multiple values with a single value\n" | |
12121 | " Use a regexp, --add or --replace-all to change %s." | |
12122 | msgstr "" | |
12123 | "无法用一个值覆盖多个值\n" | |
12124 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
12125 | ||
06991777 | 12126 | #: builtin/config.c:847 builtin/config.c:858 |
c1ac5258 JX |
12127 | #, c-format |
12128 | msgid "no such section: %s" | |
12129 | msgstr "无此小节:%s" | |
12130 | ||
fd8cb379 | 12131 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
12132 | msgid "git count-objects [-v] [-H | --human-readable]" |
12133 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
12134 | ||
fd8cb379 | 12135 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
12136 | msgid "print sizes in human readable format" |
12137 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 12138 | |
06991777 | 12139 | #: builtin/describe.c:27 |
814ff314 JX |
12140 | msgid "git describe [<options>] [<commit-ish>...]" |
12141 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 12142 | |
06991777 | 12143 | #: builtin/describe.c:28 |
814ff314 JX |
12144 | msgid "git describe [<options>] --dirty" |
12145 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 12146 | |
06991777 | 12147 | #: builtin/describe.c:63 |
87cb7997 JX |
12148 | msgid "head" |
12149 | msgstr "头" | |
12150 | ||
06991777 | 12151 | #: builtin/describe.c:63 |
87cb7997 JX |
12152 | msgid "lightweight" |
12153 | msgstr "轻量级的" | |
12154 | ||
06991777 | 12155 | #: builtin/describe.c:63 |
87cb7997 JX |
12156 | msgid "annotated" |
12157 | msgstr "附注的" | |
12158 | ||
06991777 | 12159 | #: builtin/describe.c:273 |
c04f5ac3 JX |
12160 | #, c-format |
12161 | msgid "annotated tag %s not available" | |
55a16ee4 | 12162 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 12163 | |
06991777 | 12164 | #: builtin/describe.c:277 |
c04f5ac3 JX |
12165 | #, c-format |
12166 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 12167 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 12168 | |
06991777 | 12169 | #: builtin/describe.c:279 |
c04f5ac3 JX |
12170 | #, c-format |
12171 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 12172 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 12173 | |
06991777 | 12174 | #: builtin/describe.c:323 |
c04f5ac3 JX |
12175 | #, c-format |
12176 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 12177 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 12178 | |
06991777 | 12179 | #: builtin/describe.c:325 |
c04f5ac3 | 12180 | #, c-format |
5809aa05 JX |
12181 | msgid "No exact match on refs or tags, searching to describe\n" |
12182 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 12183 | |
06991777 | 12184 | #: builtin/describe.c:379 |
c04f5ac3 JX |
12185 | #, c-format |
12186 | msgid "finished search at %s\n" | |
12187 | msgstr "完成搜索 %s\n" | |
12188 | ||
06991777 | 12189 | #: builtin/describe.c:405 |
c04f5ac3 JX |
12190 | #, c-format |
12191 | msgid "" | |
12192 | "No annotated tags can describe '%s'.\n" | |
12193 | "However, there were unannotated tags: try --tags." | |
12194 | msgstr "" | |
55a16ee4 RC |
12195 | "没有附注标签能描述 '%s'。\n" |
12196 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 12197 | |
06991777 | 12198 | #: builtin/describe.c:409 |
c04f5ac3 JX |
12199 | #, c-format |
12200 | msgid "" | |
12201 | "No tags can describe '%s'.\n" | |
12202 | "Try --always, or create some tags." | |
12203 | msgstr "" | |
55a16ee4 RC |
12204 | "没有标签能描述 '%s'。\n" |
12205 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 12206 | |
06991777 | 12207 | #: builtin/describe.c:439 |
c04f5ac3 JX |
12208 | #, c-format |
12209 | msgid "traversed %lu commits\n" | |
12210 | msgstr "已遍历 %lu 个提交\n" | |
12211 | ||
06991777 | 12212 | #: builtin/describe.c:442 |
c04f5ac3 JX |
12213 | #, c-format |
12214 | msgid "" | |
12215 | "more than %i tags found; listed %i most recent\n" | |
12216 | "gave up search at %s\n" | |
12217 | msgstr "" | |
55a16ee4 | 12218 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 12219 | "在 %s 放弃搜索\n" |
c04f5ac3 | 12220 | |
06991777 | 12221 | #: builtin/describe.c:510 |
5809aa05 JX |
12222 | #, c-format |
12223 | msgid "describe %s\n" | |
12224 | msgstr "描述 %s\n" | |
12225 | ||
d46c5519 | 12226 | #: builtin/describe.c:513 |
5809aa05 JX |
12227 | #, c-format |
12228 | msgid "Not a valid object name %s" | |
12229 | msgstr "不是一个有效的对象名 %s" | |
12230 | ||
06991777 | 12231 | #: builtin/describe.c:521 |
5809aa05 JX |
12232 | #, c-format |
12233 | msgid "%s is neither a commit nor blob" | |
12234 | msgstr "%s 既不是提交也不是数据对象" | |
12235 | ||
06991777 | 12236 | #: builtin/describe.c:535 |
ef317cd5 | 12237 | msgid "find the tag that comes after the commit" |
55a16ee4 | 12238 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 12239 | |
06991777 | 12240 | #: builtin/describe.c:536 |
ef317cd5 | 12241 | msgid "debug search strategy on stderr" |
07432cef | 12242 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 12243 | |
06991777 | 12244 | #: builtin/describe.c:537 |
1003b3a5 JX |
12245 | msgid "use any ref" |
12246 | msgstr "使用任意引用" | |
12247 | ||
06991777 | 12248 | #: builtin/describe.c:538 |
1003b3a5 | 12249 | msgid "use any tag, even unannotated" |
55a16ee4 | 12250 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 12251 | |
06991777 | 12252 | #: builtin/describe.c:539 |
ef317cd5 | 12253 | msgid "always use long format" |
07432cef | 12254 | msgstr "始终使用长提交号格式" |
ef317cd5 | 12255 | |
06991777 | 12256 | #: builtin/describe.c:540 |
2e8451e8 JX |
12257 | msgid "only follow first parent" |
12258 | msgstr "只跟随第一个父提交" | |
12259 | ||
06991777 | 12260 | #: builtin/describe.c:543 |
ef317cd5 | 12261 | msgid "only output exact matches" |
07432cef | 12262 | msgstr "只输出精确匹配" |
ef317cd5 | 12263 | |
06991777 | 12264 | #: builtin/describe.c:545 |
ef317cd5 | 12265 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 12266 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 12267 | |
06991777 | 12268 | #: builtin/describe.c:547 |
ef317cd5 | 12269 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 12270 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 12271 | |
06991777 | 12272 | #: builtin/describe.c:549 |
87cb7997 JX |
12273 | msgid "do not consider tags matching <pattern>" |
12274 | msgstr "不考虑匹配 <模式> 的标签" | |
12275 | ||
a6cd2cc4 | 12276 | #: builtin/describe.c:551 builtin/name-rev.c:422 |
ef317cd5 | 12277 | msgid "show abbreviated commit object as fallback" |
07432cef | 12278 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 12279 | |
06991777 | 12280 | #: builtin/describe.c:552 builtin/describe.c:555 |
ef317cd5 | 12281 | msgid "mark" |
07432cef | 12282 | msgstr "标记" |
ef317cd5 | 12283 | |
06991777 | 12284 | #: builtin/describe.c:553 |
ef317cd5 | 12285 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 12286 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 12287 | |
06991777 | 12288 | #: builtin/describe.c:556 |
87cb7997 JX |
12289 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
12290 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
12291 | ||
06991777 | 12292 | #: builtin/describe.c:574 |
c04f5ac3 JX |
12293 | msgid "--long is incompatible with --abbrev=0" |
12294 | msgstr "--long 与 --abbrev=0 不兼容" | |
12295 | ||
06991777 | 12296 | #: builtin/describe.c:603 |
c04f5ac3 | 12297 | msgid "No names found, cannot describe anything." |
90e6ef53 | 12298 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 12299 | |
06991777 | 12300 | #: builtin/describe.c:654 |
a8a5406a | 12301 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
12302 | msgstr "--dirty 与提交号不兼容" |
12303 | ||
06991777 | 12304 | #: builtin/describe.c:656 |
87cb7997 JX |
12305 | msgid "--broken is incompatible with commit-ishes" |
12306 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 12307 | |
06991777 | 12308 | #: builtin/diff.c:84 |
c04f5ac3 JX |
12309 | #, c-format |
12310 | msgid "'%s': not a regular file or symlink" | |
12311 | msgstr "'%s':不是一个正规文件或符号链接" | |
12312 | ||
06991777 | 12313 | #: builtin/diff.c:235 |
c04f5ac3 JX |
12314 | #, c-format |
12315 | msgid "invalid option: %s" | |
12316 | msgstr "无效选项:%s" | |
12317 | ||
d46c5519 | 12318 | #: builtin/diff.c:350 |
c04f5ac3 | 12319 | msgid "Not a git repository" |
160fb2b2 | 12320 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 12321 | |
d46c5519 | 12322 | #: builtin/diff.c:394 |
c04f5ac3 JX |
12323 | #, c-format |
12324 | msgid "invalid object '%s' given." | |
12325 | msgstr "提供了无效对象 '%s'。" | |
12326 | ||
d46c5519 | 12327 | #: builtin/diff.c:403 |
c04f5ac3 JX |
12328 | #, c-format |
12329 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 12330 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 12331 | |
d46c5519 | 12332 | #: builtin/diff.c:408 |
c04f5ac3 JX |
12333 | #, c-format |
12334 | msgid "unhandled object '%s' given." | |
6c94aba5 | 12335 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 12336 | |
d46c5519 | 12337 | #: builtin/difftool.c:30 |
1a79b2f1 JX |
12338 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
12339 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
12340 | ||
d46c5519 | 12341 | #: builtin/difftool.c:253 |
1a79b2f1 JX |
12342 | #, c-format |
12343 | msgid "failed: %d" | |
12344 | msgstr "失败:%d" | |
12345 | ||
d46c5519 | 12346 | #: builtin/difftool.c:295 |
87cb7997 JX |
12347 | #, c-format |
12348 | msgid "could not read symlink %s" | |
12349 | msgstr "无法读取符号链接 %s" | |
12350 | ||
d46c5519 | 12351 | #: builtin/difftool.c:297 |
87cb7997 JX |
12352 | #, c-format |
12353 | msgid "could not read symlink file %s" | |
12354 | msgstr "无法读取符号链接文件 %s" | |
12355 | ||
d46c5519 | 12356 | #: builtin/difftool.c:305 |
87cb7997 JX |
12357 | #, c-format |
12358 | msgid "could not read object %s for symlink %s" | |
12359 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
12360 | ||
d46c5519 | 12361 | #: builtin/difftool.c:406 |
1a79b2f1 JX |
12362 | msgid "" |
12363 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
12364 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
12365 | msgstr "" |
12366 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
12367 | "cc')。" | |
1a79b2f1 | 12368 | |
d46c5519 | 12369 | #: builtin/difftool.c:626 |
1a79b2f1 JX |
12370 | #, c-format |
12371 | msgid "both files modified: '%s' and '%s'." | |
12372 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
12373 | ||
d46c5519 | 12374 | #: builtin/difftool.c:628 |
1a79b2f1 JX |
12375 | msgid "working tree file has been left." |
12376 | msgstr "工作区文件被留了下来。" | |
12377 | ||
d46c5519 | 12378 | #: builtin/difftool.c:639 |
1a79b2f1 JX |
12379 | #, c-format |
12380 | msgid "temporary files exist in '%s'." | |
12381 | msgstr "临时文件存在于 '%s'。" | |
12382 | ||
d46c5519 | 12383 | #: builtin/difftool.c:640 |
1a79b2f1 JX |
12384 | msgid "you may want to cleanup or recover these." |
12385 | msgstr "您可能想要清理或者恢复它们。" | |
12386 | ||
d46c5519 | 12387 | #: builtin/difftool.c:689 |
1a79b2f1 JX |
12388 | msgid "use `diff.guitool` instead of `diff.tool`" |
12389 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
12390 | ||
d46c5519 | 12391 | #: builtin/difftool.c:691 |
1a79b2f1 JX |
12392 | msgid "perform a full-directory diff" |
12393 | msgstr "执行一个全目录差异比较" | |
12394 | ||
d46c5519 | 12395 | #: builtin/difftool.c:693 |
1a79b2f1 JX |
12396 | msgid "do not prompt before launching a diff tool" |
12397 | msgstr "启动差异比较工具之前不提示" | |
12398 | ||
d46c5519 | 12399 | #: builtin/difftool.c:698 |
1a79b2f1 JX |
12400 | msgid "use symlinks in dir-diff mode" |
12401 | msgstr "在 dir-diff 模式中使用符号链接" | |
12402 | ||
d46c5519 | 12403 | #: builtin/difftool.c:699 |
c1ac5258 JX |
12404 | msgid "tool" |
12405 | msgstr "工具" | |
12406 | ||
d46c5519 | 12407 | #: builtin/difftool.c:700 |
1a79b2f1 JX |
12408 | msgid "use the specified diff tool" |
12409 | msgstr "使用指定的差异比较工具" | |
12410 | ||
d46c5519 | 12411 | #: builtin/difftool.c:702 |
1a79b2f1 JX |
12412 | msgid "print a list of diff tools that may be used with `--tool`" |
12413 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
12414 | ||
d46c5519 | 12415 | #: builtin/difftool.c:705 |
1a79b2f1 JX |
12416 | msgid "" |
12417 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
12418 | "code" | |
12419 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
12420 | ||
d46c5519 | 12421 | #: builtin/difftool.c:708 |
1a79b2f1 JX |
12422 | msgid "specify a custom command for viewing diffs" |
12423 | msgstr "指定一个用于查看差异的自定义命令" | |
12424 | ||
d46c5519 JX |
12425 | #: builtin/difftool.c:709 |
12426 | msgid "passed to `diff`" | |
12427 | msgstr "传递给 `diff`" | |
12428 | ||
12429 | #: builtin/difftool.c:724 | |
12430 | msgid "difftool requires worktree or --no-index" | |
12431 | msgstr "difftool 要求工作区或者 --no-index" | |
12432 | ||
12433 | #: builtin/difftool.c:731 | |
12434 | msgid "--dir-diff is incompatible with --no-index" | |
12435 | msgstr "--dir-diff 和 --no-index 不兼容" | |
12436 | ||
12437 | #: builtin/difftool.c:734 | |
12438 | msgid "--gui, --tool and --extcmd are mutually exclusive" | |
12439 | msgstr "--gui、--tool 和 --extcmd 互斥" | |
12440 | ||
12441 | #: builtin/difftool.c:742 | |
1a79b2f1 JX |
12442 | msgid "no <tool> given for --tool=<tool>" |
12443 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
12444 | ||
d46c5519 | 12445 | #: builtin/difftool.c:749 |
1a79b2f1 JX |
12446 | msgid "no <cmd> given for --extcmd=<cmd>" |
12447 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
12448 | ||
a6cd2cc4 JX |
12449 | #: builtin/env--helper.c:6 |
12450 | msgid "git env--helper --type=[bool|ulong] <options> <env-var>" | |
12451 | msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" | |
12452 | ||
12453 | #: builtin/env--helper.c:37 builtin/hash-object.c:98 | |
12454 | msgid "type" | |
12455 | msgstr "类型" | |
12456 | ||
12457 | #: builtin/env--helper.c:41 | |
12458 | msgid "default for git_env_*(...) to fall back on" | |
12459 | msgstr "git_env_*(...) 的默认值" | |
12460 | ||
12461 | #: builtin/env--helper.c:43 | |
12462 | msgid "be quiet only use git_env_*() value as exit code" | |
12463 | msgstr "安静模式,只使用 git_env_*() 的值作为退出码" | |
12464 | ||
12465 | #: builtin/env--helper.c:62 | |
12466 | #, c-format | |
12467 | msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" | |
12468 | msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`" | |
12469 | ||
12470 | #: builtin/env--helper.c:77 | |
12471 | #, c-format | |
12472 | msgid "" | |
12473 | "option `--default' expects an unsigned long value with `--type=ulong`, not `" | |
12474 | "%s`" | |
12475 | msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`" | |
12476 | ||
c1ac5258 | 12477 | #: builtin/fast-export.c:29 |
ef317cd5 | 12478 | msgid "git fast-export [rev-list-opts]" |
07432cef | 12479 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 12480 | |
a6cd2cc4 | 12481 | #: builtin/fast-export.c:1124 |
ef317cd5 | 12482 | msgid "show progress after <n> objects" |
07432cef | 12483 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 12484 | |
a6cd2cc4 | 12485 | #: builtin/fast-export.c:1126 |
ef317cd5 | 12486 | msgid "select handling of signed tags" |
55a16ee4 | 12487 | msgstr "选择如何处理签名标签" |
ef317cd5 | 12488 | |
a6cd2cc4 | 12489 | #: builtin/fast-export.c:1129 |
ef317cd5 | 12490 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 12491 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 12492 | |
a6cd2cc4 JX |
12493 | #: builtin/fast-export.c:1132 |
12494 | msgid "select handling of commit messages in an alternate encoding" | |
12495 | msgstr "选择使用备用编码处理提交说明" | |
12496 | ||
12497 | #: builtin/fast-export.c:1135 | |
ef317cd5 | 12498 | msgid "Dump marks to this file" |
07432cef | 12499 | msgstr "把标记存储到这个文件" |
ef317cd5 | 12500 | |
a6cd2cc4 | 12501 | #: builtin/fast-export.c:1137 |
ef317cd5 | 12502 | msgid "Import marks from this file" |
07432cef | 12503 | msgstr "从这个文件导入标记" |
ef317cd5 | 12504 | |
a6cd2cc4 | 12505 | #: builtin/fast-export.c:1139 |
ef317cd5 | 12506 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 12507 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 12508 | |
a6cd2cc4 | 12509 | #: builtin/fast-export.c:1141 |
ef317cd5 | 12510 | msgid "Output full tree for each commit" |
07432cef | 12511 | msgstr "每次提交都输出整个树" |
ef317cd5 | 12512 | |
a6cd2cc4 | 12513 | #: builtin/fast-export.c:1143 |
ef317cd5 | 12514 | msgid "Use the done feature to terminate the stream" |
07432cef | 12515 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 12516 | |
a6cd2cc4 | 12517 | #: builtin/fast-export.c:1144 |
ef317cd5 | 12518 | msgid "Skip output of blob data" |
07432cef | 12519 | msgstr "跳过数据对象的输出" |
ef317cd5 | 12520 | |
a6cd2cc4 | 12521 | #: builtin/fast-export.c:1145 builtin/log.c:1632 |
6acbf033 | 12522 | msgid "refspec" |
160fb2b2 | 12523 | msgstr "引用规格" |
6acbf033 | 12524 | |
a6cd2cc4 | 12525 | #: builtin/fast-export.c:1146 |
6acbf033 | 12526 | msgid "Apply refspec to exported refs" |
160fb2b2 | 12527 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 12528 | |
a6cd2cc4 | 12529 | #: builtin/fast-export.c:1147 |
220c313c JX |
12530 | msgid "anonymize output" |
12531 | msgstr "匿名输出" | |
12532 | ||
a6cd2cc4 | 12533 | #: builtin/fast-export.c:1149 |
06991777 | 12534 | msgid "Reference parents which are not in fast-export stream by object id" |
5b533632 | 12535 | msgstr "引用父对象 ID 不在 fast-export 流中" |
06991777 | 12536 | |
a6cd2cc4 | 12537 | #: builtin/fast-export.c:1151 |
06991777 | 12538 | msgid "Show original object ids of blobs/commits" |
5b533632 | 12539 | msgstr "显示数据对象/提交的原始对象 ID" |
06991777 | 12540 | |
a6cd2cc4 | 12541 | #: builtin/fetch.c:30 |
ef317cd5 | 12542 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 12543 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 12544 | |
a6cd2cc4 | 12545 | #: builtin/fetch.c:31 |
ef317cd5 | 12546 | msgid "git fetch [<options>] <group>" |
07432cef | 12547 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 12548 | |
a6cd2cc4 | 12549 | #: builtin/fetch.c:32 |
ef317cd5 | 12550 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 12551 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 12552 | |
a6cd2cc4 | 12553 | #: builtin/fetch.c:33 |
ef317cd5 | 12554 | msgid "git fetch --all [<options>]" |
07432cef | 12555 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 12556 | |
a6cd2cc4 | 12557 | #: builtin/fetch.c:125 builtin/pull.c:203 |
ef317cd5 | 12558 | msgid "fetch from all remotes" |
07432cef | 12559 | msgstr "从所有的远程抓取" |
ef317cd5 | 12560 | |
a6cd2cc4 | 12561 | #: builtin/fetch.c:127 builtin/pull.c:206 |
ef317cd5 | 12562 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 12563 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 12564 | |
a6cd2cc4 | 12565 | #: builtin/fetch.c:129 builtin/pull.c:209 |
ef317cd5 | 12566 | msgid "path to upload pack on remote end" |
07432cef | 12567 | msgstr "上传包到远程的路径" |
ef317cd5 | 12568 | |
a6cd2cc4 | 12569 | #: builtin/fetch.c:130 |
4c27fcb5 JX |
12570 | msgid "force overwrite of local reference" |
12571 | msgstr "强制覆盖本地引用" | |
ef317cd5 | 12572 | |
a6cd2cc4 | 12573 | #: builtin/fetch.c:132 |
ef317cd5 | 12574 | msgid "fetch from multiple remotes" |
07432cef | 12575 | msgstr "从多个远程抓取" |
ef317cd5 | 12576 | |
a6cd2cc4 | 12577 | #: builtin/fetch.c:134 builtin/pull.c:213 |
ef317cd5 | 12578 | msgid "fetch all tags and associated objects" |
55a16ee4 | 12579 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 12580 | |
a6cd2cc4 | 12581 | #: builtin/fetch.c:136 |
ef317cd5 | 12582 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 12583 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 12584 | |
a6cd2cc4 | 12585 | #: builtin/fetch.c:138 |
276ceeaa JX |
12586 | msgid "number of submodules fetched in parallel" |
12587 | msgstr "子模组获取的并发数" | |
12588 | ||
a6cd2cc4 | 12589 | #: builtin/fetch.c:140 builtin/pull.c:216 |
ef317cd5 | 12590 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 12591 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 12592 | |
a6cd2cc4 | 12593 | #: builtin/fetch.c:142 |
31e5e17b JX |
12594 | msgid "prune local tags no longer on remote and clobber changed tags" |
12595 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
12596 | ||
07432cef | 12597 | # 译者:可选值,不能翻译 |
a6cd2cc4 | 12598 | #: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 |
ef317cd5 | 12599 | msgid "on-demand" |
07432cef | 12600 | msgstr "on-demand" |
ef317cd5 | 12601 | |
a6cd2cc4 | 12602 | #: builtin/fetch.c:144 |
ef317cd5 | 12603 | msgid "control recursive fetching of submodules" |
07432cef | 12604 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 12605 | |
a6cd2cc4 | 12606 | #: builtin/fetch.c:148 builtin/pull.c:224 |
ef317cd5 | 12607 | msgid "keep downloaded pack" |
07432cef | 12608 | msgstr "保持下载包" |
ef317cd5 | 12609 | |
a6cd2cc4 | 12610 | #: builtin/fetch.c:150 |
ef317cd5 | 12611 | msgid "allow updating of HEAD ref" |
07432cef | 12612 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 12613 | |
a6cd2cc4 | 12614 | #: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 |
ef317cd5 | 12615 | msgid "deepen history of shallow clone" |
07432cef | 12616 | msgstr "深化浅克隆的历史" |
ef317cd5 | 12617 | |
a6cd2cc4 | 12618 | #: builtin/fetch.c:155 |
a0b6b246 JX |
12619 | msgid "deepen history of shallow repository based on time" |
12620 | msgstr "基于时间来深化浅克隆的历史" | |
12621 | ||
a6cd2cc4 | 12622 | #: builtin/fetch.c:161 builtin/pull.c:230 |
a77c07d9 | 12623 | msgid "convert to a complete repository" |
160fb2b2 | 12624 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 12625 | |
a6cd2cc4 | 12626 | #: builtin/fetch.c:164 |
ef317cd5 | 12627 | msgid "prepend this to submodule path output" |
07432cef | 12628 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 12629 | |
a6cd2cc4 | 12630 | #: builtin/fetch.c:167 |
a4f16749 JX |
12631 | msgid "" |
12632 | "default for recursive fetching of submodules (lower priority than config " | |
12633 | "files)" | |
12634 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 12635 | |
a6cd2cc4 | 12636 | #: builtin/fetch.c:171 builtin/pull.c:233 |
cfff71a9 JX |
12637 | msgid "accept refs that update .git/shallow" |
12638 | msgstr "接受更新 .git/shallow 的引用" | |
12639 | ||
a6cd2cc4 | 12640 | #: builtin/fetch.c:172 builtin/pull.c:235 |
6acbf033 JX |
12641 | msgid "refmap" |
12642 | msgstr "引用映射" | |
12643 | ||
a6cd2cc4 | 12644 | #: builtin/fetch.c:173 builtin/pull.c:236 |
6acbf033 JX |
12645 | msgid "specify fetch refmap" |
12646 | msgstr "指定获取操作的引用映射" | |
12647 | ||
a6cd2cc4 | 12648 | #: builtin/fetch.c:180 |
c1ac5258 JX |
12649 | msgid "report that we have only objects reachable from this object" |
12650 | msgstr "报告我们只拥有从该对象开始可达的对象" | |
12651 | ||
a6cd2cc4 JX |
12652 | #: builtin/fetch.c:183 |
12653 | msgid "run 'gc --auto' after fetching" | |
12654 | msgstr "获取后执行 'gc --auto'" | |
12655 | ||
12656 | #: builtin/fetch.c:185 builtin/pull.c:245 | |
12657 | msgid "check for forced-updates on all updated branches" | |
12658 | msgstr "在所有更新分支上检查强制更新" | |
12659 | ||
12660 | #: builtin/fetch.c:491 | |
c04f5ac3 JX |
12661 | msgid "Couldn't find remote ref HEAD" |
12662 | msgstr "无法发现远程 HEAD 引用" | |
12663 | ||
a6cd2cc4 | 12664 | #: builtin/fetch.c:630 |
5c57d762 JX |
12665 | #, c-format |
12666 | msgid "configuration fetch.output contains invalid value %s" | |
12667 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
12668 | ||
a6cd2cc4 | 12669 | #: builtin/fetch.c:728 |
c04f5ac3 JX |
12670 | #, c-format |
12671 | msgid "object %s not found" | |
12672 | msgstr "对象 %s 未发现" | |
12673 | ||
a6cd2cc4 | 12674 | #: builtin/fetch.c:732 |
c04f5ac3 JX |
12675 | msgid "[up to date]" |
12676 | msgstr "[最新]" | |
12677 | ||
a6cd2cc4 | 12678 | #: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 |
c04f5ac3 JX |
12679 | msgid "[rejected]" |
12680 | msgstr "[已拒绝]" | |
12681 | ||
a6cd2cc4 | 12682 | #: builtin/fetch.c:746 |
5c57d762 | 12683 | msgid "can't fetch in current branch" |
9a4b694c | 12684 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 12685 | |
a6cd2cc4 | 12686 | #: builtin/fetch.c:756 |
c04f5ac3 | 12687 | msgid "[tag update]" |
55a16ee4 | 12688 | msgstr "[标签更新]" |
c04f5ac3 | 12689 | |
a6cd2cc4 JX |
12690 | #: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 |
12691 | #: builtin/fetch.c:828 | |
5c57d762 JX |
12692 | msgid "unable to update local ref" |
12693 | msgstr "不能更新本地引用" | |
c04f5ac3 | 12694 | |
a6cd2cc4 | 12695 | #: builtin/fetch.c:761 |
4c27fcb5 JX |
12696 | msgid "would clobber existing tag" |
12697 | msgstr "会破坏现有的标签" | |
12698 | ||
a6cd2cc4 | 12699 | #: builtin/fetch.c:783 |
c04f5ac3 | 12700 | msgid "[new tag]" |
55a16ee4 | 12701 | msgstr "[新标签]" |
c04f5ac3 | 12702 | |
a6cd2cc4 | 12703 | #: builtin/fetch.c:786 |
c04f5ac3 JX |
12704 | msgid "[new branch]" |
12705 | msgstr "[新分支]" | |
12706 | ||
a6cd2cc4 | 12707 | #: builtin/fetch.c:789 |
170e9899 JX |
12708 | msgid "[new ref]" |
12709 | msgstr "[新引用]" | |
12710 | ||
a6cd2cc4 | 12711 | #: builtin/fetch.c:828 |
c04f5ac3 JX |
12712 | msgid "forced update" |
12713 | msgstr "强制更新" | |
12714 | ||
a6cd2cc4 | 12715 | #: builtin/fetch.c:833 |
5c57d762 JX |
12716 | msgid "non-fast-forward" |
12717 | msgstr "非快进" | |
c04f5ac3 | 12718 | |
a6cd2cc4 JX |
12719 | #: builtin/fetch.c:854 |
12720 | msgid "" | |
12721 | "Fetch normally indicates which branches had a forced update,\n" | |
12722 | "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" | |
12723 | "flag or run 'git config fetch.showForcedUpdates true'." | |
12724 | msgstr "" | |
12725 | "获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n" | |
12726 | "要重新启用,请使用 '--show-forced-updates' 选项或运行\n" | |
12727 | "'git config fetch.showForcedUpdates true'。" | |
12728 | ||
12729 | #: builtin/fetch.c:858 | |
12730 | #, c-format | |
12731 | msgid "" | |
12732 | "It took %.2f seconds to check forced updates. You can use\n" | |
12733 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " | |
12734 | "false'\n" | |
12735 | " to avoid this check.\n" | |
12736 | msgstr "" | |
12737 | "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" | |
12738 | "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" | |
12739 | ||
12740 | #: builtin/fetch.c:888 | |
c04f5ac3 JX |
12741 | #, c-format |
12742 | msgid "%s did not send all necessary objects\n" | |
e640d114 | 12743 | msgstr "%s 未发送所有必需的对象\n" |
c04f5ac3 | 12744 | |
a6cd2cc4 | 12745 | #: builtin/fetch.c:909 |
cfff71a9 JX |
12746 | #, c-format |
12747 | msgid "reject %s because shallow roots are not allowed to be updated" | |
12748 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
12749 | ||
a6cd2cc4 | 12750 | #: builtin/fetch.c:1000 builtin/fetch.c:1131 |
c04f5ac3 JX |
12751 | #, c-format |
12752 | msgid "From %.*s\n" | |
12753 | msgstr "来自 %.*s\n" | |
12754 | ||
a6cd2cc4 | 12755 | #: builtin/fetch.c:1011 |
c04f5ac3 JX |
12756 | #, c-format |
12757 | msgid "" | |
12758 | "some local refs could not be updated; try running\n" | |
12759 | " 'git remote prune %s' to remove any old, conflicting branches" | |
12760 | msgstr "" | |
12761 | "一些本地引用不能被更新;尝试运行\n" | |
12762 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
12763 | ||
90e6ef53 | 12764 | # 译者:注意保持前导空格 |
a6cd2cc4 | 12765 | #: builtin/fetch.c:1101 |
81809b99 | 12766 | #, c-format |
8ada9598 | 12767 | msgid " (%s will become dangling)" |
e640d114 | 12768 | msgstr " (%s 将成为悬空状态)" |
c04f5ac3 | 12769 | |
90e6ef53 | 12770 | # 译者:注意保持前导空格 |
a6cd2cc4 | 12771 | #: builtin/fetch.c:1102 |
81809b99 | 12772 | #, c-format |
8ada9598 | 12773 | msgid " (%s has become dangling)" |
e640d114 | 12774 | msgstr " (%s 已成为悬空状态)" |
c04f5ac3 | 12775 | |
a6cd2cc4 | 12776 | #: builtin/fetch.c:1134 |
c04f5ac3 JX |
12777 | msgid "[deleted]" |
12778 | msgstr "[已删除]" | |
12779 | ||
a6cd2cc4 | 12780 | #: builtin/fetch.c:1135 builtin/remote.c:1036 |
c04f5ac3 JX |
12781 | msgid "(none)" |
12782 | msgstr "(无)" | |
12783 | ||
a6cd2cc4 | 12784 | #: builtin/fetch.c:1158 |
c04f5ac3 JX |
12785 | #, c-format |
12786 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 12787 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 12788 | |
a6cd2cc4 | 12789 | #: builtin/fetch.c:1177 |
c04f5ac3 JX |
12790 | #, c-format |
12791 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
12792 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
12793 | ||
a6cd2cc4 | 12794 | #: builtin/fetch.c:1180 |
c04f5ac3 JX |
12795 | #, c-format |
12796 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 12797 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 12798 | |
a6cd2cc4 | 12799 | #: builtin/fetch.c:1484 |
c04f5ac3 JX |
12800 | #, c-format |
12801 | msgid "Fetching %s\n" | |
d4a8e00b | 12802 | msgstr "正在获取 %s\n" |
c04f5ac3 | 12803 | |
a6cd2cc4 | 12804 | #: builtin/fetch.c:1486 builtin/remote.c:100 |
c04f5ac3 JX |
12805 | #, c-format |
12806 | msgid "Could not fetch %s" | |
12807 | msgstr "不能获取 %s" | |
12808 | ||
a6cd2cc4 | 12809 | #: builtin/fetch.c:1532 |
31e5e17b | 12810 | msgid "" |
06991777 JX |
12811 | "--filter can only be used with the remote configured in extensions." |
12812 | "partialClone" | |
12813 | msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" | |
31e5e17b | 12814 | |
a6cd2cc4 | 12815 | #: builtin/fetch.c:1556 |
c04f5ac3 JX |
12816 | msgid "" |
12817 | "No remote repository specified. Please, specify either a URL or a\n" | |
12818 | "remote name from which new revisions should be fetched." | |
4375c10e | 12819 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 12820 | |
a6cd2cc4 | 12821 | #: builtin/fetch.c:1593 |
c04f5ac3 | 12822 | msgid "You need to specify a tag name." |
55a16ee4 | 12823 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 12824 | |
a6cd2cc4 | 12825 | #: builtin/fetch.c:1644 |
a0b6b246 JX |
12826 | msgid "Negative depth in --deepen is not supported" |
12827 | msgstr "--deepen 不支持负数深度" | |
12828 | ||
a6cd2cc4 | 12829 | #: builtin/fetch.c:1646 |
a0b6b246 JX |
12830 | msgid "--deepen and --depth are mutually exclusive" |
12831 | msgstr "--deepen 和 --depth 是互斥的" | |
12832 | ||
a6cd2cc4 | 12833 | #: builtin/fetch.c:1651 |
a77c07d9 JX |
12834 | msgid "--depth and --unshallow cannot be used together" |
12835 | msgstr "--depth 和 --unshallow 不能同时使用" | |
12836 | ||
a6cd2cc4 | 12837 | #: builtin/fetch.c:1653 |
a77c07d9 | 12838 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 12839 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 12840 | |
a6cd2cc4 | 12841 | #: builtin/fetch.c:1669 |
c04f5ac3 | 12842 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 12843 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 12844 | |
a6cd2cc4 | 12845 | #: builtin/fetch.c:1671 |
c04f5ac3 | 12846 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 12847 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 12848 | |
a6cd2cc4 | 12849 | #: builtin/fetch.c:1680 |
c04f5ac3 JX |
12850 | #, c-format |
12851 | msgid "No such remote or remote group: %s" | |
12852 | msgstr "没有这样的远程或远程组:%s" | |
12853 | ||
a6cd2cc4 | 12854 | #: builtin/fetch.c:1687 |
c04f5ac3 | 12855 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 12856 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 12857 | |
a6cd2cc4 | 12858 | #: builtin/fetch.c:1703 |
06991777 JX |
12859 | msgid "" |
12860 | "--filter can only be used with the remote configured in extensions." | |
12861 | "partialclone" | |
12862 | msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" | |
12863 | ||
4c27fcb5 | 12864 | #: builtin/fmt-merge-msg.c:18 |
814ff314 JX |
12865 | msgid "" |
12866 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
12867 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 12868 | |
4c27fcb5 | 12869 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 12870 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 12871 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 12872 | |
4c27fcb5 | 12873 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 12874 | msgid "alias for --log (deprecated)" |
07432cef | 12875 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 12876 | |
4c27fcb5 | 12877 | #: builtin/fmt-merge-msg.c:678 |
ef317cd5 | 12878 | msgid "text" |
07432cef | 12879 | msgstr "文本" |
ef317cd5 | 12880 | |
4c27fcb5 | 12881 | #: builtin/fmt-merge-msg.c:679 |
ef317cd5 | 12882 | msgid "use <text> as start of message" |
07432cef | 12883 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 12884 | |
4c27fcb5 | 12885 | #: builtin/fmt-merge-msg.c:680 |
ef317cd5 | 12886 | msgid "file to read from" |
07432cef | 12887 | msgstr "从文件中读取" |
ef317cd5 | 12888 | |
a4f16749 | 12889 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
12890 | msgid "git for-each-ref [<options>] [<pattern>]" |
12891 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 12892 | |
a4f16749 | 12893 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
12894 | msgid "git for-each-ref [--points-at <object>]" |
12895 | msgstr "git for-each-ref [--points-at <对象>]" | |
12896 | ||
a4f16749 | 12897 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
12898 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
12899 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 12900 | |
a4f16749 | 12901 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
12902 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
12903 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 12904 | |
a4f16749 | 12905 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 12906 | msgid "quote placeholders suitably for shells" |
07432cef | 12907 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 12908 | |
a4f16749 | 12909 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 12910 | msgid "quote placeholders suitably for perl" |
07432cef | 12911 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 12912 | |
a4f16749 | 12913 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 12914 | msgid "quote placeholders suitably for python" |
07432cef | 12915 | msgstr "引用占位符适用于 python" |
ef317cd5 | 12916 | |
a4f16749 | 12917 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
12918 | msgid "quote placeholders suitably for Tcl" |
12919 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 12920 | |
a4f16749 | 12921 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 12922 | msgid "show only <n> matched refs" |
07432cef | 12923 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 12924 | |
a6cd2cc4 | 12925 | #: builtin/for-each-ref.c:39 builtin/tag.c:439 |
6937cb4e JX |
12926 | msgid "respect format colors" |
12927 | msgstr "遵照格式中的颜色输出" | |
12928 | ||
d46c5519 | 12929 | #: builtin/for-each-ref.c:42 |
94550ed3 JX |
12930 | msgid "print only refs which points at the given object" |
12931 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 12932 | |
d46c5519 | 12933 | #: builtin/for-each-ref.c:44 |
94550ed3 JX |
12934 | msgid "print only refs that are merged" |
12935 | msgstr "只打印已经合并的引用" | |
12936 | ||
d46c5519 | 12937 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
12938 | msgid "print only refs that are not merged" |
12939 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 12940 | |
d46c5519 | 12941 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
12942 | msgid "print only refs which contain the commit" |
12943 | msgstr "只打印包含该提交的引用" | |
12944 | ||
d46c5519 | 12945 | #: builtin/for-each-ref.c:47 |
87cb7997 JX |
12946 | msgid "print only refs which don't contain the commit" |
12947 | msgstr "只打印不包含该提交的引用" | |
12948 | ||
06991777 JX |
12949 | #: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 |
12950 | msgid "unknown" | |
12951 | msgstr "未知" | |
12952 | ||
12953 | #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> | |
12954 | #: builtin/fsck.c:120 builtin/fsck.c:136 | |
12955 | #, c-format | |
12956 | msgid "error in %s %s: %s" | |
12957 | msgstr "%s %s 错误:%s" | |
12958 | ||
12959 | #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> | |
12960 | #: builtin/fsck.c:131 | |
12961 | #, c-format | |
12962 | msgid "warning in %s %s: %s" | |
12963 | msgstr "%s %s 警告:%s" | |
12964 | ||
12965 | #: builtin/fsck.c:157 builtin/fsck.c:159 | |
12966 | #, c-format | |
12967 | msgid "broken link from %7s %s" | |
12968 | msgstr "来自 %7s %s 的损坏的链接" | |
12969 | ||
12970 | #: builtin/fsck.c:168 | |
12971 | msgid "wrong object type in link" | |
12972 | msgstr "链接中错误的对象类型" | |
12973 | ||
12974 | #: builtin/fsck.c:184 | |
12975 | #, c-format | |
12976 | msgid "" | |
12977 | "broken link from %7s %s\n" | |
12978 | " to %7s %s" | |
12979 | msgstr "" | |
12980 | "损坏的链接来自于 %7s %s\n" | |
12981 | " 到 %7s %s" | |
12982 | ||
d46c5519 | 12983 | #: builtin/fsck.c:295 |
06991777 JX |
12984 | #, c-format |
12985 | msgid "missing %s %s" | |
12986 | msgstr "缺失 %s %s" | |
12987 | ||
d46c5519 | 12988 | #: builtin/fsck.c:321 |
06991777 JX |
12989 | #, c-format |
12990 | msgid "unreachable %s %s" | |
5b533632 | 12991 | msgstr "不可达 %s %s" |
06991777 | 12992 | |
d46c5519 | 12993 | #: builtin/fsck.c:340 |
06991777 JX |
12994 | #, c-format |
12995 | msgid "dangling %s %s" | |
12996 | msgstr "悬空 %s %s" | |
12997 | ||
d46c5519 | 12998 | #: builtin/fsck.c:349 |
06991777 JX |
12999 | msgid "could not create lost-found" |
13000 | msgstr "不能创建 lost-found" | |
13001 | ||
d46c5519 | 13002 | #: builtin/fsck.c:360 |
06991777 JX |
13003 | #, c-format |
13004 | msgid "could not finish '%s'" | |
13005 | msgstr "不能完成 '%s'" | |
13006 | ||
d46c5519 | 13007 | #: builtin/fsck.c:377 |
06991777 JX |
13008 | #, c-format |
13009 | msgid "Checking %s" | |
13010 | msgstr "正在检查 %s" | |
13011 | ||
d46c5519 | 13012 | #: builtin/fsck.c:415 |
06991777 JX |
13013 | #, c-format |
13014 | msgid "Checking connectivity (%d objects)" | |
13015 | msgstr "正在检查连通性(%d 个对象)" | |
13016 | ||
d46c5519 | 13017 | #: builtin/fsck.c:434 |
06991777 JX |
13018 | #, c-format |
13019 | msgid "Checking %s %s" | |
13020 | msgstr "正在检查 %s %s" | |
13021 | ||
d46c5519 | 13022 | #: builtin/fsck.c:438 |
06991777 JX |
13023 | msgid "broken links" |
13024 | msgstr "损坏的链接" | |
13025 | ||
d46c5519 | 13026 | #: builtin/fsck.c:447 |
06991777 JX |
13027 | #, c-format |
13028 | msgid "root %s" | |
13029 | msgstr "根 %s" | |
13030 | ||
d46c5519 | 13031 | #: builtin/fsck.c:455 |
06991777 JX |
13032 | #, c-format |
13033 | msgid "tagged %s %s (%s) in %s" | |
13034 | msgstr "标记 %s %s (%s) 于 %s" | |
13035 | ||
d46c5519 | 13036 | #: builtin/fsck.c:484 |
06991777 JX |
13037 | #, c-format |
13038 | msgid "%s: object corrupt or missing" | |
13039 | msgstr "%s:对象损坏或丢失" | |
13040 | ||
d46c5519 | 13041 | #: builtin/fsck.c:509 |
06991777 JX |
13042 | #, c-format |
13043 | msgid "%s: invalid reflog entry %s" | |
13044 | msgstr "%s:无效的引用日志条目 %s" | |
13045 | ||
d46c5519 | 13046 | #: builtin/fsck.c:523 |
06991777 JX |
13047 | #, c-format |
13048 | msgid "Checking reflog %s->%s" | |
13049 | msgstr "正在检查引用日志 %s->%s" | |
13050 | ||
d46c5519 | 13051 | #: builtin/fsck.c:557 |
06991777 JX |
13052 | #, c-format |
13053 | msgid "%s: invalid sha1 pointer %s" | |
13054 | msgstr "%s:无效的 sha1 指针 %s" | |
13055 | ||
d46c5519 | 13056 | #: builtin/fsck.c:564 |
06991777 JX |
13057 | #, c-format |
13058 | msgid "%s: not a commit" | |
13059 | msgstr "%s:不是一个提交" | |
13060 | ||
d46c5519 | 13061 | #: builtin/fsck.c:619 |
06991777 JX |
13062 | msgid "notice: No default references" |
13063 | msgstr "注意:无默认引用" | |
13064 | ||
d46c5519 | 13065 | #: builtin/fsck.c:634 |
06991777 JX |
13066 | #, c-format |
13067 | msgid "%s: object corrupt or missing: %s" | |
13068 | msgstr "%s:对象损坏或丢失:%s" | |
13069 | ||
d46c5519 | 13070 | #: builtin/fsck.c:647 |
06991777 JX |
13071 | #, c-format |
13072 | msgid "%s: object could not be parsed: %s" | |
13073 | msgstr "%s:不能解析对象:%s" | |
13074 | ||
d46c5519 | 13075 | #: builtin/fsck.c:667 |
06991777 JX |
13076 | #, c-format |
13077 | msgid "bad sha1 file: %s" | |
13078 | msgstr "坏的 sha1 文件:%s" | |
13079 | ||
d46c5519 | 13080 | #: builtin/fsck.c:682 |
06991777 JX |
13081 | msgid "Checking object directory" |
13082 | msgstr "正在检查对象目录" | |
13083 | ||
d46c5519 | 13084 | #: builtin/fsck.c:685 |
6c94aba5 | 13085 | msgid "Checking object directories" |
06991777 JX |
13086 | msgstr "正在检查对象目录" |
13087 | ||
d46c5519 | 13088 | #: builtin/fsck.c:700 |
06991777 JX |
13089 | #, c-format |
13090 | msgid "Checking %s link" | |
13091 | msgstr "正在检查 %s 链接" | |
13092 | ||
a6cd2cc4 | 13093 | #: builtin/fsck.c:705 builtin/index-pack.c:842 |
06991777 JX |
13094 | #, c-format |
13095 | msgid "invalid %s" | |
13096 | msgstr "无效的 %s" | |
13097 | ||
d46c5519 | 13098 | #: builtin/fsck.c:712 |
06991777 JX |
13099 | #, c-format |
13100 | msgid "%s points to something strange (%s)" | |
13101 | msgstr "%s 指向奇怪的东西(%s)" | |
13102 | ||
d46c5519 | 13103 | #: builtin/fsck.c:718 |
06991777 JX |
13104 | #, c-format |
13105 | msgid "%s: detached HEAD points at nothing" | |
13106 | msgstr "%s:分离头指针的指向不存在" | |
13107 | ||
d46c5519 | 13108 | #: builtin/fsck.c:722 |
06991777 JX |
13109 | #, c-format |
13110 | msgid "notice: %s points to an unborn branch (%s)" | |
13111 | msgstr "注意:%s 指向一个尚未诞生的分支(%s)" | |
13112 | ||
d46c5519 | 13113 | #: builtin/fsck.c:734 |
06991777 JX |
13114 | msgid "Checking cache tree" |
13115 | msgstr "正在检查缓存树" | |
13116 | ||
d46c5519 | 13117 | #: builtin/fsck.c:739 |
06991777 JX |
13118 | #, c-format |
13119 | msgid "%s: invalid sha1 pointer in cache-tree" | |
13120 | msgstr "%s:cache-tree 中无效的 sha1 指针" | |
6c94aba5 | 13121 | |
d46c5519 | 13122 | #: builtin/fsck.c:750 |
06991777 JX |
13123 | msgid "non-tree in cache-tree" |
13124 | msgstr "cache-tree 中非树对象" | |
13125 | ||
d46c5519 | 13126 | #: builtin/fsck.c:781 |
814ff314 JX |
13127 | msgid "git fsck [<options>] [<object>...]" |
13128 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 13129 | |
d46c5519 | 13130 | #: builtin/fsck.c:787 |
ef317cd5 | 13131 | msgid "show unreachable objects" |
07432cef | 13132 | msgstr "显示不可达的对象" |
ef317cd5 | 13133 | |
d46c5519 | 13134 | #: builtin/fsck.c:788 |
ef317cd5 | 13135 | msgid "show dangling objects" |
e640d114 | 13136 | msgstr "显示悬空的对象" |
ef317cd5 | 13137 | |
d46c5519 | 13138 | #: builtin/fsck.c:789 |
ef317cd5 | 13139 | msgid "report tags" |
55a16ee4 | 13140 | msgstr "报告标签" |
ef317cd5 | 13141 | |
d46c5519 | 13142 | #: builtin/fsck.c:790 |
ef317cd5 | 13143 | msgid "report root nodes" |
07432cef | 13144 | msgstr "报告根节点" |
ef317cd5 | 13145 | |
d46c5519 | 13146 | #: builtin/fsck.c:791 |
ef317cd5 | 13147 | msgid "make index objects head nodes" |
07432cef | 13148 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 13149 | |
d46c5519 | 13150 | #: builtin/fsck.c:792 |
ef317cd5 | 13151 | msgid "make reflogs head nodes (default)" |
07432cef | 13152 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 13153 | |
d46c5519 | 13154 | #: builtin/fsck.c:793 |
ef317cd5 | 13155 | msgid "also consider packs and alternate objects" |
07432cef | 13156 | msgstr "也考虑包和备用对象" |
ef317cd5 | 13157 | |
d46c5519 | 13158 | #: builtin/fsck.c:794 |
1b7f4a34 JX |
13159 | msgid "check only connectivity" |
13160 | msgstr "仅检查连通性" | |
13161 | ||
d46c5519 | 13162 | #: builtin/fsck.c:795 |
ef317cd5 | 13163 | msgid "enable more strict checking" |
07432cef | 13164 | msgstr "启用更严格的检查" |
ef317cd5 | 13165 | |
d46c5519 | 13166 | #: builtin/fsck.c:797 |
ef317cd5 | 13167 | msgid "write dangling objects in .git/lost-found" |
e640d114 | 13168 | msgstr "将悬空对象写入 .git/lost-found 中" |
ef317cd5 | 13169 | |
d46c5519 | 13170 | #: builtin/fsck.c:798 builtin/prune.c:132 |
ef317cd5 | 13171 | msgid "show progress" |
07432cef | 13172 | msgstr "显示进度" |
ef317cd5 | 13173 | |
d46c5519 | 13174 | #: builtin/fsck.c:799 |
5c57d762 JX |
13175 | msgid "show verbose names for reachable objects" |
13176 | msgstr "显示可达对象的详细名称" | |
13177 | ||
a6cd2cc4 | 13178 | #: builtin/fsck.c:859 builtin/index-pack.c:225 |
6c94aba5 | 13179 | msgid "Checking objects" |
06991777 JX |
13180 | msgstr "正在检查对象" |
13181 | ||
d46c5519 | 13182 | #: builtin/fsck.c:887 |
06991777 JX |
13183 | #, c-format |
13184 | msgid "%s: object missing" | |
13185 | msgstr "%s:对象缺失" | |
13186 | ||
d46c5519 | 13187 | #: builtin/fsck.c:899 |
06991777 JX |
13188 | #, c-format |
13189 | msgid "invalid parameter: expected sha1, got '%s'" | |
13190 | msgstr "无效的参数:期望 sha1,得到 '%s'" | |
6c94aba5 | 13191 | |
c1ac5258 | 13192 | #: builtin/gc.c:34 |
814ff314 JX |
13193 | msgid "git gc [<options>]" |
13194 | msgstr "git gc [<选项>]" | |
ef317cd5 | 13195 | |
c1ac5258 | 13196 | #: builtin/gc.c:90 |
c04f5ac3 | 13197 | #, c-format |
87cb7997 | 13198 | msgid "Failed to fstat %s: %s" |
65e2041e | 13199 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 13200 | |
d46c5519 JX |
13201 | #: builtin/gc.c:126 |
13202 | #, c-format | |
13203 | msgid "failed to parse '%s' value '%s'" | |
13204 | msgstr "无法解析 '%s' 值 '%s'" | |
13205 | ||
13206 | #: builtin/gc.c:476 builtin/init-db.c:55 | |
c04f5ac3 | 13207 | #, c-format |
4c27fcb5 JX |
13208 | msgid "cannot stat '%s'" |
13209 | msgstr "不能对 '%s' 调用 stat" | |
13210 | ||
a6cd2cc4 | 13211 | #: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 |
4c27fcb5 JX |
13212 | #, c-format |
13213 | msgid "cannot read '%s'" | |
13214 | msgstr "不能读取 '%s'" | |
c04f5ac3 | 13215 | |
d46c5519 | 13216 | #: builtin/gc.c:492 |
94550ed3 JX |
13217 | #, c-format |
13218 | msgid "" | |
13219 | "The last gc run reported the following. Please correct the root cause\n" | |
13220 | "and remove %s.\n" | |
13221 | "Automatic cleanup will not be performed until the file is removed.\n" | |
13222 | "\n" | |
13223 | "%s" | |
13224 | msgstr "" | |
13225 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
13226 | "在该文件被删除之前,自动清理将不会执行。\n" | |
13227 | "\n" | |
13228 | "%s" | |
13229 | ||
d46c5519 | 13230 | #: builtin/gc.c:540 |
ef317cd5 | 13231 | msgid "prune unreferenced objects" |
07432cef | 13232 | msgstr "清除未引用的对象" |
ef317cd5 | 13233 | |
d46c5519 | 13234 | #: builtin/gc.c:542 |
ef317cd5 | 13235 | msgid "be more thorough (increased runtime)" |
07432cef | 13236 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 13237 | |
d46c5519 | 13238 | #: builtin/gc.c:543 |
ef317cd5 | 13239 | msgid "enable auto-gc mode" |
07432cef | 13240 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 13241 | |
d46c5519 | 13242 | #: builtin/gc.c:546 |
90314792 JX |
13243 | msgid "force running gc even if there may be another gc running" |
13244 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
13245 | ||
d46c5519 | 13246 | #: builtin/gc.c:549 |
fd8cb379 JX |
13247 | msgid "repack all other packs except the largest pack" |
13248 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
13249 | ||
d46c5519 | 13250 | #: builtin/gc.c:566 |
fd8cb379 JX |
13251 | #, c-format |
13252 | msgid "failed to parse gc.logexpiry value %s" | |
c1ac5258 | 13253 | msgstr "解析 gc.logexpiry 的值 %s 失败" |
fd8cb379 | 13254 | |
d46c5519 | 13255 | #: builtin/gc.c:577 |
87cb7997 | 13256 | #, c-format |
fd8cb379 | 13257 | msgid "failed to parse prune expiry value %s" |
c1ac5258 | 13258 | msgstr "解析清除期限值 %s 失败" |
87cb7997 | 13259 | |
d46c5519 | 13260 | #: builtin/gc.c:597 |
c04f5ac3 | 13261 | #, c-format |
6c94aba5 | 13262 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 13263 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 13264 | |
d46c5519 | 13265 | #: builtin/gc.c:599 |
6c94aba5 JX |
13266 | #, c-format |
13267 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 13268 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 13269 | |
d46c5519 | 13270 | #: builtin/gc.c:600 |
6c94aba5 JX |
13271 | #, c-format |
13272 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
13273 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 13274 | |
d46c5519 | 13275 | #: builtin/gc.c:640 |
90314792 JX |
13276 | #, c-format |
13277 | msgid "" | |
13278 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
13279 | msgstr "" | |
29004bbb | 13280 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 13281 | |
a6cd2cc4 | 13282 | #: builtin/gc.c:695 |
c04f5ac3 JX |
13283 | msgid "" |
13284 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 13285 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 13286 | |
06991777 | 13287 | #: builtin/grep.c:29 |
814ff314 JX |
13288 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
13289 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 13290 | |
06991777 | 13291 | #: builtin/grep.c:225 |
c04f5ac3 JX |
13292 | #, c-format |
13293 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 13294 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 13295 | |
06991777 | 13296 | #: builtin/grep.c:279 |
276ceeaa JX |
13297 | #, c-format |
13298 | msgid "invalid number of threads specified (%d) for %s" | |
13299 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
13300 | ||
a4f16749 JX |
13301 | #. TRANSLATORS: %s is the configuration |
13302 | #. variable for tweaking threads, currently | |
13303 | #. grep.threads | |
13304 | #. | |
a6cd2cc4 JX |
13305 | #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 |
13306 | #: builtin/pack-objects.c:2728 | |
a4f16749 JX |
13307 | #, c-format |
13308 | msgid "no threads support, ignoring %s" | |
13309 | msgstr "没有线程支持,忽略 %s" | |
13310 | ||
a6cd2cc4 | 13311 | #: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 |
c04f5ac3 JX |
13312 | #, c-format |
13313 | msgid "unable to read tree (%s)" | |
90e6ef53 | 13314 | msgstr "无法读取树(%s)" |
c04f5ac3 | 13315 | |
a6cd2cc4 | 13316 | #: builtin/grep.c:648 |
c04f5ac3 JX |
13317 | #, c-format |
13318 | msgid "unable to grep from object of type %s" | |
13319 | msgstr "无法抓取来自于 %s 类型的对象" | |
13320 | ||
a6cd2cc4 | 13321 | #: builtin/grep.c:714 |
c04f5ac3 JX |
13322 | #, c-format |
13323 | msgid "switch `%c' expects a numerical value" | |
13324 | msgstr "开关 `%c' 期望一个数字值" | |
13325 | ||
a6cd2cc4 | 13326 | #: builtin/grep.c:813 |
ef317cd5 | 13327 | msgid "search in index instead of in the work tree" |
07432cef | 13328 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 13329 | |
a6cd2cc4 | 13330 | #: builtin/grep.c:815 |
ef317cd5 | 13331 | msgid "find in contents not managed by git" |
07432cef | 13332 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
13333 | |
13334 | # 译者:中文字符串拼接,可删除前导空格 | |
a6cd2cc4 | 13335 | #: builtin/grep.c:817 |
ef317cd5 | 13336 | msgid "search in both tracked and untracked files" |
07432cef | 13337 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 13338 | |
a6cd2cc4 | 13339 | #: builtin/grep.c:819 |
814ff314 JX |
13340 | msgid "ignore files specified via '.gitignore'" |
13341 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 13342 | |
a6cd2cc4 | 13343 | #: builtin/grep.c:821 |
87cb7997 | 13344 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
13345 | msgstr "在每一个子模组中递归搜索" |
13346 | ||
a6cd2cc4 | 13347 | #: builtin/grep.c:824 |
ef317cd5 | 13348 | msgid "show non-matching lines" |
07432cef | 13349 | msgstr "显示未匹配的行" |
ef317cd5 | 13350 | |
a6cd2cc4 | 13351 | #: builtin/grep.c:826 |
ef317cd5 | 13352 | msgid "case insensitive matching" |
07432cef | 13353 | msgstr "不区分大小写匹配" |
ef317cd5 | 13354 | |
a6cd2cc4 | 13355 | #: builtin/grep.c:828 |
ef317cd5 | 13356 | msgid "match patterns only at word boundaries" |
07432cef | 13357 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 13358 | |
a6cd2cc4 | 13359 | #: builtin/grep.c:830 |
ef317cd5 | 13360 | msgid "process binary files as text" |
07432cef | 13361 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 13362 | |
a6cd2cc4 | 13363 | #: builtin/grep.c:832 |
ef317cd5 | 13364 | msgid "don't match patterns in binary files" |
07432cef | 13365 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 13366 | |
a6cd2cc4 | 13367 | #: builtin/grep.c:835 |
90314792 JX |
13368 | msgid "process binary files with textconv filters" |
13369 | msgstr "用 textconv 过滤器处理二进制文件" | |
13370 | ||
a6cd2cc4 | 13371 | #: builtin/grep.c:837 |
4c27fcb5 JX |
13372 | msgid "search in subdirectories (default)" |
13373 | msgstr "在子目录中寻找(默认)" | |
13374 | ||
a6cd2cc4 | 13375 | #: builtin/grep.c:839 |
ef317cd5 | 13376 | msgid "descend at most <depth> levels" |
07432cef | 13377 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 13378 | |
a6cd2cc4 | 13379 | #: builtin/grep.c:843 |
ef317cd5 | 13380 | msgid "use extended POSIX regular expressions" |
07432cef | 13381 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 13382 | |
a6cd2cc4 | 13383 | #: builtin/grep.c:846 |
ef317cd5 | 13384 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 13385 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 13386 | |
a6cd2cc4 | 13387 | #: builtin/grep.c:849 |
ef317cd5 | 13388 | msgid "interpret patterns as fixed strings" |
07432cef | 13389 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 13390 | |
a6cd2cc4 | 13391 | #: builtin/grep.c:852 |
ef317cd5 | 13392 | msgid "use Perl-compatible regular expressions" |
07432cef | 13393 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 13394 | |
a6cd2cc4 | 13395 | #: builtin/grep.c:855 |
ef317cd5 | 13396 | msgid "show line numbers" |
07432cef | 13397 | msgstr "显示行号" |
ef317cd5 | 13398 | |
a6cd2cc4 | 13399 | #: builtin/grep.c:856 |
c1ac5258 JX |
13400 | msgid "show column number of first match" |
13401 | msgstr "显示第一个匹配的列号" | |
13402 | ||
a6cd2cc4 | 13403 | #: builtin/grep.c:857 |
ef317cd5 | 13404 | msgid "don't show filenames" |
07432cef | 13405 | msgstr "不显示文件名" |
ef317cd5 | 13406 | |
a6cd2cc4 | 13407 | #: builtin/grep.c:858 |
ef317cd5 | 13408 | msgid "show filenames" |
07432cef | 13409 | msgstr "显示文件名" |
ef317cd5 | 13410 | |
a6cd2cc4 | 13411 | #: builtin/grep.c:860 |
ef317cd5 | 13412 | msgid "show filenames relative to top directory" |
07432cef | 13413 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 13414 | |
a6cd2cc4 | 13415 | #: builtin/grep.c:862 |
ef317cd5 | 13416 | msgid "show only filenames instead of matching lines" |
07432cef | 13417 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 13418 | |
a6cd2cc4 | 13419 | #: builtin/grep.c:864 |
ef317cd5 | 13420 | msgid "synonym for --files-with-matches" |
07432cef | 13421 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 13422 | |
a6cd2cc4 | 13423 | #: builtin/grep.c:867 |
ef317cd5 | 13424 | msgid "show only the names of files without match" |
07432cef | 13425 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 13426 | |
a6cd2cc4 | 13427 | #: builtin/grep.c:869 |
ef317cd5 | 13428 | msgid "print NUL after filenames" |
07432cef | 13429 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 13430 | |
a6cd2cc4 | 13431 | #: builtin/grep.c:872 |
c1ac5258 JX |
13432 | msgid "show only matching parts of a line" |
13433 | msgstr "只显示行中的匹配的部分" | |
13434 | ||
a6cd2cc4 | 13435 | #: builtin/grep.c:874 |
ef317cd5 | 13436 | msgid "show the number of matches instead of matching lines" |
07432cef | 13437 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 13438 | |
a6cd2cc4 | 13439 | #: builtin/grep.c:875 |
ef317cd5 | 13440 | msgid "highlight matches" |
07432cef | 13441 | msgstr "高亮显示匹配项" |
ef317cd5 | 13442 | |
a6cd2cc4 | 13443 | #: builtin/grep.c:877 |
ef317cd5 | 13444 | msgid "print empty line between matches from different files" |
07432cef | 13445 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 13446 | |
a6cd2cc4 | 13447 | #: builtin/grep.c:879 |
ef317cd5 | 13448 | msgid "show filename only once above matches from same file" |
07432cef | 13449 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 13450 | |
a6cd2cc4 | 13451 | #: builtin/grep.c:882 |
ef317cd5 | 13452 | msgid "show <n> context lines before and after matches" |
07432cef | 13453 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 13454 | |
a6cd2cc4 | 13455 | #: builtin/grep.c:885 |
ef317cd5 | 13456 | msgid "show <n> context lines before matches" |
07432cef | 13457 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 13458 | |
a6cd2cc4 | 13459 | #: builtin/grep.c:887 |
ef317cd5 | 13460 | msgid "show <n> context lines after matches" |
07432cef | 13461 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 13462 | |
a6cd2cc4 | 13463 | #: builtin/grep.c:889 |
276ceeaa JX |
13464 | msgid "use <n> worker threads" |
13465 | msgstr "使用 <n> 个工作线程" | |
13466 | ||
a6cd2cc4 | 13467 | #: builtin/grep.c:890 |
ef317cd5 | 13468 | msgid "shortcut for -C NUM" |
07432cef | 13469 | msgstr "快捷键 -C 数字" |
ef317cd5 | 13470 | |
a6cd2cc4 | 13471 | #: builtin/grep.c:893 |
ef317cd5 | 13472 | msgid "show a line with the function name before matches" |
07432cef | 13473 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 13474 | |
a6cd2cc4 | 13475 | #: builtin/grep.c:895 |
ef317cd5 | 13476 | msgid "show the surrounding function" |
07432cef | 13477 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 13478 | |
a6cd2cc4 | 13479 | #: builtin/grep.c:898 |
ef317cd5 | 13480 | msgid "read patterns from file" |
07432cef | 13481 | msgstr "从文件读取模式" |
ef317cd5 | 13482 | |
a6cd2cc4 | 13483 | #: builtin/grep.c:900 |
ef317cd5 | 13484 | msgid "match <pattern>" |
07432cef | 13485 | msgstr "匹配 <模式>" |
ef317cd5 | 13486 | |
a6cd2cc4 | 13487 | #: builtin/grep.c:902 |
ef317cd5 | 13488 | msgid "combine patterns specified with -e" |
07432cef | 13489 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 13490 | |
a6cd2cc4 | 13491 | #: builtin/grep.c:914 |
ef317cd5 | 13492 | msgid "indicate hit with exit status without output" |
07432cef | 13493 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 13494 | |
a6cd2cc4 | 13495 | #: builtin/grep.c:916 |
ef317cd5 | 13496 | msgid "show only matches from files that match all patterns" |
07432cef | 13497 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 13498 | |
a6cd2cc4 | 13499 | #: builtin/grep.c:918 |
07432cef WS |
13500 | msgid "show parse tree for grep expression" |
13501 | msgstr "显示 grep 表达式的解析树" | |
13502 | ||
a6cd2cc4 | 13503 | #: builtin/grep.c:922 |
ef317cd5 | 13504 | msgid "pager" |
07432cef | 13505 | msgstr "分页" |
ef317cd5 | 13506 | |
a6cd2cc4 | 13507 | #: builtin/grep.c:922 |
ef317cd5 | 13508 | msgid "show matching files in the pager" |
07432cef | 13509 | msgstr "分页显示匹配的文件" |
ef317cd5 | 13510 | |
a6cd2cc4 | 13511 | #: builtin/grep.c:926 |
ef317cd5 | 13512 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 13513 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 13514 | |
a6cd2cc4 | 13515 | #: builtin/grep.c:990 |
c1ac5258 JX |
13516 | msgid "no pattern given" |
13517 | msgstr "未提供匹配模式" | |
c04f5ac3 | 13518 | |
a6cd2cc4 | 13519 | #: builtin/grep.c:1026 |
87cb7997 JX |
13520 | msgid "--no-index or --untracked cannot be used with revs" |
13521 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
13522 | ||
a6cd2cc4 | 13523 | #: builtin/grep.c:1034 |
87cb7997 JX |
13524 | #, c-format |
13525 | msgid "unable to resolve revision: %s" | |
13526 | msgstr "不能解析版本:%s" | |
13527 | ||
a6cd2cc4 | 13528 | #: builtin/grep.c:1065 |
4c27fcb5 JX |
13529 | msgid "invalid option combination, ignoring --threads" |
13530 | msgstr "无效的选项组合,忽略 --threads" | |
276ceeaa | 13531 | |
a6cd2cc4 | 13532 | #: builtin/grep.c:1068 builtin/pack-objects.c:3416 |
a4f16749 JX |
13533 | msgid "no threads support, ignoring --threads" |
13534 | msgstr "没有线程支持,忽略 --threads" | |
13535 | ||
a6cd2cc4 | 13536 | #: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 |
4c27fcb5 JX |
13537 | #, c-format |
13538 | msgid "invalid number of threads specified (%d)" | |
13539 | msgstr "指定的线程数无效(%d)" | |
13540 | ||
a6cd2cc4 | 13541 | #: builtin/grep.c:1094 |
c04f5ac3 JX |
13542 | msgid "--open-files-in-pager only works on the worktree" |
13543 | msgstr "--open-files-in-pager 仅用于工作区" | |
13544 | ||
a6cd2cc4 | 13545 | #: builtin/grep.c:1117 |
c1ac5258 JX |
13546 | msgid "option not supported with --recurse-submodules" |
13547 | msgstr "选项不支持和 --recurse-submodules 共用" | |
c04f5ac3 | 13548 | |
a6cd2cc4 | 13549 | #: builtin/grep.c:1123 |
c1ac5258 JX |
13550 | msgid "--cached or --untracked cannot be used with --no-index" |
13551 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" | |
c04f5ac3 | 13552 | |
a6cd2cc4 | 13553 | #: builtin/grep.c:1129 |
c1ac5258 JX |
13554 | msgid "--[no-]exclude-standard cannot be used for tracked contents" |
13555 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容" | |
c04f5ac3 | 13556 | |
a6cd2cc4 | 13557 | #: builtin/grep.c:1137 |
c1ac5258 JX |
13558 | msgid "both --cached and trees are given" |
13559 | msgstr "同时给出了 --cached 和树对象" | |
13560 | ||
06991777 | 13561 | #: builtin/hash-object.c:85 |
ef317cd5 | 13562 | msgid "" |
814ff314 JX |
13563 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
13564 | "[--] <file>..." | |
ef317cd5 | 13565 | msgstr "" |
814ff314 JX |
13566 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
13567 | "[--] <文件>..." | |
ef317cd5 | 13568 | |
06991777 | 13569 | #: builtin/hash-object.c:86 |
94550ed3 JX |
13570 | msgid "git hash-object --stdin-paths" |
13571 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 13572 | |
06991777 | 13573 | #: builtin/hash-object.c:98 |
ef317cd5 | 13574 | msgid "object type" |
07432cef | 13575 | msgstr "对象类型" |
ef317cd5 | 13576 | |
06991777 | 13577 | #: builtin/hash-object.c:99 |
ef317cd5 | 13578 | msgid "write the object into the object database" |
07432cef | 13579 | msgstr "将对象写入对象数据库" |
ef317cd5 | 13580 | |
06991777 | 13581 | #: builtin/hash-object.c:101 |
ef317cd5 | 13582 | msgid "read the object from stdin" |
07432cef | 13583 | msgstr "从标准输入读取对象" |
ef317cd5 | 13584 | |
06991777 | 13585 | #: builtin/hash-object.c:103 |
ef317cd5 | 13586 | msgid "store file as is without filters" |
07432cef | 13587 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 13588 | |
06991777 | 13589 | #: builtin/hash-object.c:104 |
220c313c JX |
13590 | msgid "" |
13591 | "just hash any random garbage to create corrupt objects for debugging Git" | |
13592 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
13593 | ||
06991777 | 13594 | #: builtin/hash-object.c:105 |
ef317cd5 | 13595 | msgid "process file as it were from this path" |
07432cef | 13596 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 13597 | |
c1ac5258 | 13598 | #: builtin/help.c:46 |
ef317cd5 | 13599 | msgid "print all available commands" |
07432cef | 13600 | msgstr "打印所有可用的命令" |
ef317cd5 | 13601 | |
c1ac5258 | 13602 | #: builtin/help.c:47 |
a0b6b246 JX |
13603 | msgid "exclude guides" |
13604 | msgstr "排除向导" | |
13605 | ||
c1ac5258 | 13606 | #: builtin/help.c:48 |
4dcdc3d8 JX |
13607 | msgid "print list of useful guides" |
13608 | msgstr "显示有用的指南列表" | |
13609 | ||
c1ac5258 JX |
13610 | #: builtin/help.c:49 |
13611 | msgid "print all configuration variable names" | |
13612 | msgstr "打印所有配置变量名称" | |
13613 | ||
13614 | #: builtin/help.c:51 | |
ef317cd5 | 13615 | msgid "show man page" |
07432cef | 13616 | msgstr "显示 man 手册" |
ef317cd5 | 13617 | |
c1ac5258 | 13618 | #: builtin/help.c:52 |
ef317cd5 | 13619 | msgid "show manual in web browser" |
07432cef | 13620 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 13621 | |
c1ac5258 | 13622 | #: builtin/help.c:54 |
ef317cd5 | 13623 | msgid "show info page" |
07432cef | 13624 | msgstr "显示 info 手册" |
ef317cd5 | 13625 | |
c1ac5258 | 13626 | #: builtin/help.c:56 |
fd8cb379 JX |
13627 | msgid "print command description" |
13628 | msgstr "打印命令描述" | |
13629 | ||
c1ac5258 | 13630 | #: builtin/help.c:61 |
814ff314 JX |
13631 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
13632 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 13633 | |
d46c5519 | 13634 | #: builtin/help.c:77 |
81809b99 | 13635 | #, c-format |
8ada9598 | 13636 | msgid "unrecognized help format '%s'" |
81809b99 | 13637 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 13638 | |
d46c5519 | 13639 | #: builtin/help.c:104 |
8ada9598 | 13640 | msgid "Failed to start emacsclient." |
81809b99 | 13641 | msgstr "无法启动 emacsclient。" |
8ada9598 | 13642 | |
d46c5519 | 13643 | #: builtin/help.c:117 |
8ada9598 | 13644 | msgid "Failed to parse emacsclient version." |
81809b99 | 13645 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 13646 | |
d46c5519 | 13647 | #: builtin/help.c:125 |
8ada9598 JX |
13648 | #, c-format |
13649 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 13650 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 13651 | |
d46c5519 | 13652 | #: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 |
81809b99 | 13653 | #, c-format |
5b04ee3b | 13654 | msgid "failed to exec '%s'" |
c1ac5258 | 13655 | msgstr "执行 '%s' 失败" |
8ada9598 | 13656 | |
d46c5519 | 13657 | #: builtin/help.c:221 |
8ada9598 JX |
13658 | #, c-format |
13659 | msgid "" | |
13660 | "'%s': path for unsupported man viewer.\n" | |
13661 | "Please consider using 'man.<tool>.cmd' instead." | |
13662 | msgstr "" | |
81809b99 | 13663 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 13664 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 13665 | |
d46c5519 | 13666 | #: builtin/help.c:233 |
8ada9598 JX |
13667 | #, c-format |
13668 | msgid "" | |
13669 | "'%s': cmd for supported man viewer.\n" | |
13670 | "Please consider using 'man.<tool>.path' instead." | |
13671 | msgstr "" | |
81809b99 | 13672 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 13673 | "请使用 'man.<工具>.path'。" |
8ada9598 | 13674 | |
d46c5519 | 13675 | #: builtin/help.c:350 |
8ada9598 JX |
13676 | #, c-format |
13677 | msgid "'%s': unknown man viewer." | |
81809b99 | 13678 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 13679 | |
d46c5519 | 13680 | #: builtin/help.c:367 |
8ada9598 | 13681 | msgid "no man viewer handled the request" |
81809b99 | 13682 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 13683 | |
d46c5519 | 13684 | #: builtin/help.c:375 |
8ada9598 | 13685 | msgid "no info viewer handled the request" |
81809b99 | 13686 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 13687 | |
a6cd2cc4 | 13688 | #: builtin/help.c:434 builtin/help.c:445 git.c:336 |
fd8cb379 JX |
13689 | #, c-format |
13690 | msgid "'%s' is aliased to '%s'" | |
13691 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 13692 | |
a6cd2cc4 | 13693 | #: builtin/help.c:448 git.c:365 |
4c27fcb5 JX |
13694 | #, c-format |
13695 | msgid "bad alias.%s string: %s" | |
13696 | msgstr "坏的 alias.%s 字符串:%s" | |
13697 | ||
d46c5519 | 13698 | #: builtin/help.c:477 builtin/help.c:507 |
fd8cb379 JX |
13699 | #, c-format |
13700 | msgid "usage: %s%s" | |
13701 | msgstr "用法:%s%s" | |
4dcdc3d8 | 13702 | |
d46c5519 | 13703 | #: builtin/help.c:491 |
c1ac5258 JX |
13704 | msgid "'git help config' for more information" |
13705 | msgstr "'git help config' 获取更多信息" | |
4dcdc3d8 | 13706 | |
a6cd2cc4 | 13707 | #: builtin/index-pack.c:185 |
8ada9598 JX |
13708 | #, c-format |
13709 | msgid "object type mismatch at %s" | |
81809b99 | 13710 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 13711 | |
a6cd2cc4 | 13712 | #: builtin/index-pack.c:205 |
6acbf033 JX |
13713 | #, c-format |
13714 | msgid "did not receive expected object %s" | |
a0b6b246 | 13715 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 13716 | |
a6cd2cc4 | 13717 | #: builtin/index-pack.c:208 |
6acbf033 JX |
13718 | #, c-format |
13719 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 13720 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 13721 | |
a6cd2cc4 | 13722 | #: builtin/index-pack.c:258 |
81809b99 | 13723 | #, c-format |
8ada9598 JX |
13724 | msgid "cannot fill %d byte" |
13725 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 13726 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 13727 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 13728 | |
a6cd2cc4 | 13729 | #: builtin/index-pack.c:268 |
8ada9598 | 13730 | msgid "early EOF" |
81809b99 | 13731 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 13732 | |
a6cd2cc4 | 13733 | #: builtin/index-pack.c:269 |
8ada9598 | 13734 | msgid "read error on input" |
81809b99 | 13735 | msgstr "输入上的读错误" |
8ada9598 | 13736 | |
a6cd2cc4 | 13737 | #: builtin/index-pack.c:281 |
8ada9598 | 13738 | msgid "used more bytes than were available" |
81809b99 | 13739 | msgstr "用掉了超过可用的字节" |
8ada9598 | 13740 | |
a6cd2cc4 | 13741 | #: builtin/index-pack.c:288 builtin/pack-objects.c:604 |
8ada9598 | 13742 | msgid "pack too large for current definition of off_t" |
81809b99 | 13743 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 13744 | |
a6cd2cc4 | 13745 | #: builtin/index-pack.c:291 builtin/unpack-objects.c:94 |
a0b6b246 JX |
13746 | msgid "pack exceeds maximum allowed size" |
13747 | msgstr "包超过了最大允许值" | |
13748 | ||
a6cd2cc4 | 13749 | #: builtin/index-pack.c:312 |
81809b99 | 13750 | #, c-format |
8ada9598 | 13751 | msgid "cannot open packfile '%s'" |
81809b99 | 13752 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 13753 | |
a6cd2cc4 | 13754 | #: builtin/index-pack.c:326 |
8ada9598 | 13755 | msgid "pack signature mismatch" |
81809b99 | 13756 | msgstr "包签名不匹配" |
8ada9598 | 13757 | |
a6cd2cc4 | 13758 | #: builtin/index-pack.c:328 |
ef317cd5 JX |
13759 | #, c-format |
13760 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 13761 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 13762 | |
a6cd2cc4 | 13763 | #: builtin/index-pack.c:346 |
8ada9598 | 13764 | #, c-format |
5c57d762 JX |
13765 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
13766 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 13767 | |
a6cd2cc4 | 13768 | #: builtin/index-pack.c:466 |
8ada9598 JX |
13769 | #, c-format |
13770 | msgid "inflate returned %d" | |
81809b99 | 13771 | msgstr "解压缩返回 %d" |
8ada9598 | 13772 | |
a6cd2cc4 | 13773 | #: builtin/index-pack.c:515 |
8ada9598 | 13774 | msgid "offset value overflow for delta base object" |
81809b99 | 13775 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 13776 | |
a6cd2cc4 | 13777 | #: builtin/index-pack.c:523 |
8ada9598 | 13778 | msgid "delta base offset is out of bound" |
81809b99 | 13779 | msgstr "delta 基准偏移越界" |
8ada9598 | 13780 | |
a6cd2cc4 | 13781 | #: builtin/index-pack.c:531 |
81809b99 | 13782 | #, c-format |
8ada9598 | 13783 | msgid "unknown object type %d" |
81809b99 | 13784 | msgstr "未知对象类型 %d" |
8ada9598 | 13785 | |
a6cd2cc4 | 13786 | #: builtin/index-pack.c:562 |
8ada9598 | 13787 | msgid "cannot pread pack file" |
81809b99 | 13788 | msgstr "无法读取包文件" |
8ada9598 | 13789 | |
a6cd2cc4 | 13790 | #: builtin/index-pack.c:564 |
8ada9598 | 13791 | #, c-format |
5c57d762 JX |
13792 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
13793 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
13794 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
13795 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 13796 | |
a6cd2cc4 | 13797 | #: builtin/index-pack.c:590 |
8ada9598 | 13798 | msgid "serious inflate inconsistency" |
81809b99 | 13799 | msgstr "解压缩严重的不一致" |
8ada9598 | 13800 | |
a6cd2cc4 JX |
13801 | #: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 |
13802 | #: builtin/index-pack.c:803 builtin/index-pack.c:812 | |
8ada9598 JX |
13803 | #, c-format |
13804 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 13805 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 13806 | |
a6cd2cc4 JX |
13807 | #: builtin/index-pack.c:738 builtin/pack-objects.c:157 |
13808 | #: builtin/pack-objects.c:217 builtin/pack-objects.c:311 | |
6792b93b JX |
13809 | #, c-format |
13810 | msgid "unable to read %s" | |
13811 | msgstr "不能读 %s" | |
13812 | ||
a6cd2cc4 | 13813 | #: builtin/index-pack.c:801 |
87cb7997 JX |
13814 | #, c-format |
13815 | msgid "cannot read existing object info %s" | |
13816 | msgstr "不能读取现存对象信息 %s" | |
13817 | ||
a6cd2cc4 | 13818 | #: builtin/index-pack.c:809 |
6792b93b JX |
13819 | #, c-format |
13820 | msgid "cannot read existing object %s" | |
13821 | msgstr "不能读取现存对象 %s" | |
13822 | ||
a6cd2cc4 | 13823 | #: builtin/index-pack.c:823 |
81809b99 | 13824 | #, c-format |
8ada9598 | 13825 | msgid "invalid blob object %s" |
160fb2b2 | 13826 | msgstr "无效的数据对象 %s" |
8ada9598 | 13827 | |
a6cd2cc4 | 13828 | #: builtin/index-pack.c:826 builtin/index-pack.c:845 |
fd8cb379 JX |
13829 | msgid "fsck error in packed object" |
13830 | msgstr "对打包对象 fsck 检查出错" | |
13831 | ||
a6cd2cc4 | 13832 | #: builtin/index-pack.c:847 |
8ada9598 JX |
13833 | #, c-format |
13834 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 13835 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 13836 | |
a6cd2cc4 | 13837 | #: builtin/index-pack.c:919 builtin/index-pack.c:950 |
8ada9598 | 13838 | msgid "failed to apply delta" |
c1ac5258 | 13839 | msgstr "应用 delta 失败" |
8ada9598 | 13840 | |
a6cd2cc4 | 13841 | #: builtin/index-pack.c:1118 |
8ada9598 | 13842 | msgid "Receiving objects" |
81809b99 | 13843 | msgstr "接收对象中" |
8ada9598 | 13844 | |
a6cd2cc4 | 13845 | #: builtin/index-pack.c:1118 |
8ada9598 | 13846 | msgid "Indexing objects" |
81809b99 | 13847 | msgstr "索引对象中" |
8ada9598 | 13848 | |
a6cd2cc4 | 13849 | #: builtin/index-pack.c:1152 |
8ada9598 | 13850 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 13851 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 13852 | |
a6cd2cc4 | 13853 | #: builtin/index-pack.c:1157 |
8ada9598 | 13854 | msgid "cannot fstat packfile" |
65e2041e | 13855 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 13856 | |
a6cd2cc4 | 13857 | #: builtin/index-pack.c:1160 |
8ada9598 | 13858 | msgid "pack has junk at the end" |
81809b99 | 13859 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 13860 | |
a6cd2cc4 | 13861 | #: builtin/index-pack.c:1172 |
6792b93b JX |
13862 | msgid "confusion beyond insanity in parse_pack_objects()" |
13863 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
13864 | ||
a6cd2cc4 | 13865 | #: builtin/index-pack.c:1195 |
8ada9598 | 13866 | msgid "Resolving deltas" |
81809b99 | 13867 | msgstr "处理 delta 中" |
8ada9598 | 13868 | |
a6cd2cc4 | 13869 | #: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 |
07432cef | 13870 | #, c-format |
ef317cd5 | 13871 | msgid "unable to create thread: %s" |
07432cef | 13872 | msgstr "不能创建线程:%s" |
ef317cd5 | 13873 | |
a6cd2cc4 | 13874 | #: builtin/index-pack.c:1246 |
8ada9598 | 13875 | msgid "confusion beyond insanity" |
81809b99 | 13876 | msgstr "不可理喻" |
8ada9598 | 13877 | |
a6cd2cc4 | 13878 | #: builtin/index-pack.c:1252 |
ef317cd5 | 13879 | #, c-format |
5b04ee3b JX |
13880 | msgid "completed with %d local object" |
13881 | msgid_plural "completed with %d local objects" | |
13882 | msgstr[0] "完成 %d 个本地对象" | |
13883 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 13884 | |
a6cd2cc4 | 13885 | #: builtin/index-pack.c:1264 |
ef317cd5 JX |
13886 | #, c-format |
13887 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 13888 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 13889 | |
a6cd2cc4 | 13890 | #: builtin/index-pack.c:1268 |
8ada9598 JX |
13891 | #, c-format |
13892 | msgid "pack has %d unresolved delta" | |
13893 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 13894 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 13895 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 13896 | |
a6cd2cc4 | 13897 | #: builtin/index-pack.c:1292 |
81809b99 | 13898 | #, c-format |
8ada9598 | 13899 | msgid "unable to deflate appended object (%d)" |
07432cef | 13900 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 13901 | |
a6cd2cc4 | 13902 | #: builtin/index-pack.c:1388 |
8ada9598 JX |
13903 | #, c-format |
13904 | msgid "local object %s is corrupt" | |
81809b99 | 13905 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 13906 | |
a6cd2cc4 | 13907 | #: builtin/index-pack.c:1402 |
31e5e17b JX |
13908 | #, c-format |
13909 | msgid "packfile name '%s' does not end with '.pack'" | |
13910 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 13911 | |
a6cd2cc4 | 13912 | #: builtin/index-pack.c:1427 |
81809b99 | 13913 | #, c-format |
31e5e17b JX |
13914 | msgid "cannot write %s file '%s'" |
13915 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 13916 | |
a6cd2cc4 | 13917 | #: builtin/index-pack.c:1435 |
81809b99 | 13918 | #, c-format |
31e5e17b JX |
13919 | msgid "cannot close written %s file '%s'" |
13920 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
13921 | ||
a6cd2cc4 | 13922 | #: builtin/index-pack.c:1459 |
31e5e17b JX |
13923 | msgid "error while closing pack file" |
13924 | msgstr "关闭包文件时出错" | |
8ada9598 | 13925 | |
a6cd2cc4 | 13926 | #: builtin/index-pack.c:1473 |
8ada9598 | 13927 | msgid "cannot store pack file" |
81809b99 | 13928 | msgstr "无法存储包文件" |
8ada9598 | 13929 | |
a6cd2cc4 | 13930 | #: builtin/index-pack.c:1481 |
8ada9598 | 13931 | msgid "cannot store index file" |
81809b99 | 13932 | msgstr "无法存储索引文件" |
8ada9598 | 13933 | |
a6cd2cc4 | 13934 | #: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 |
07432cef | 13935 | #, c-format |
ef317cd5 | 13936 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 13937 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 13938 | |
a6cd2cc4 | 13939 | #: builtin/index-pack.c:1593 |
81809b99 | 13940 | #, c-format |
8ada9598 | 13941 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 13942 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 13943 | |
a6cd2cc4 | 13944 | #: builtin/index-pack.c:1595 |
81809b99 | 13945 | #, c-format |
8ada9598 | 13946 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 13947 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 13948 | |
a6cd2cc4 | 13949 | #: builtin/index-pack.c:1643 |
81809b99 | 13950 | #, c-format |
8ada9598 JX |
13951 | msgid "non delta: %d object" |
13952 | msgid_plural "non delta: %d objects" | |
81809b99 | 13953 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 13954 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 13955 | |
a6cd2cc4 | 13956 | #: builtin/index-pack.c:1650 |
8ada9598 JX |
13957 | #, c-format |
13958 | msgid "chain length = %d: %lu object" | |
13959 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 13960 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 13961 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 13962 | |
a6cd2cc4 | 13963 | #: builtin/index-pack.c:1689 |
31e5e17b JX |
13964 | msgid "Cannot come back to cwd" |
13965 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 13966 | |
a6cd2cc4 JX |
13967 | #: builtin/index-pack.c:1738 builtin/index-pack.c:1741 |
13968 | #: builtin/index-pack.c:1757 builtin/index-pack.c:1761 | |
81809b99 | 13969 | #, c-format |
8ada9598 | 13970 | msgid "bad %s" |
81809b99 | 13971 | msgstr "错误选项 %s" |
8ada9598 | 13972 | |
a6cd2cc4 | 13973 | #: builtin/index-pack.c:1777 |
8ada9598 | 13974 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 13975 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 13976 | |
a6cd2cc4 | 13977 | #: builtin/index-pack.c:1779 |
1a79b2f1 JX |
13978 | msgid "--stdin requires a git repository" |
13979 | msgstr "--stdin 需要一个 git 仓库" | |
13980 | ||
a6cd2cc4 | 13981 | #: builtin/index-pack.c:1785 |
8ada9598 | 13982 | msgid "--verify with no packfile name given" |
dbd6cced | 13983 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 13984 | |
a6cd2cc4 | 13985 | #: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 |
fd8cb379 JX |
13986 | msgid "fsck error in pack objects" |
13987 | msgstr "在打包对象中 fsck 检查出错" | |
13988 | ||
a4f16749 | 13989 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
13990 | #, c-format |
13991 | msgid "cannot stat template '%s'" | |
65e2041e | 13992 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 13993 | |
a4f16749 | 13994 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
13995 | #, c-format |
13996 | msgid "cannot opendir '%s'" | |
13997 | msgstr "不能打开目录 '%s'" | |
13998 | ||
c1ac5258 | 13999 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
14000 | #, c-format |
14001 | msgid "cannot readlink '%s'" | |
14002 | msgstr "不能读取链接 '%s'" | |
14003 | ||
c1ac5258 | 14004 | #: builtin/init-db.c:80 |
c04f5ac3 JX |
14005 | #, c-format |
14006 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 14007 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 14008 | |
c1ac5258 | 14009 | #: builtin/init-db.c:86 |
c04f5ac3 JX |
14010 | #, c-format |
14011 | msgid "cannot copy '%s' to '%s'" | |
14012 | msgstr "不能拷贝 '%s' 至 '%s'" | |
14013 | ||
c1ac5258 | 14014 | #: builtin/init-db.c:90 |
c04f5ac3 JX |
14015 | #, c-format |
14016 | msgid "ignoring template %s" | |
14017 | msgstr "忽略模版 %s" | |
14018 | ||
c1ac5258 | 14019 | #: builtin/init-db.c:121 |
c04f5ac3 | 14020 | #, c-format |
fd8cb379 JX |
14021 | msgid "templates not found in %s" |
14022 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 14023 | |
c1ac5258 | 14024 | #: builtin/init-db.c:136 |
c04f5ac3 | 14025 | #, c-format |
5b04ee3b JX |
14026 | msgid "not copying templates from '%s': %s" |
14027 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 14028 | |
d46c5519 | 14029 | #: builtin/init-db.c:334 |
c04f5ac3 JX |
14030 | #, c-format |
14031 | msgid "unable to handle file type %d" | |
14032 | msgstr "不能处理 %d 类型的文件" | |
14033 | ||
d46c5519 | 14034 | #: builtin/init-db.c:337 |
c04f5ac3 JX |
14035 | #, c-format |
14036 | msgid "unable to move %s to %s" | |
14037 | msgstr "不能移动 %s 至 %s" | |
14038 | ||
d46c5519 | 14039 | #: builtin/init-db.c:354 builtin/init-db.c:357 |
a0b6b246 JX |
14040 | #, c-format |
14041 | msgid "%s already exists" | |
14042 | msgstr "%s 已经存在" | |
14043 | ||
d46c5519 | 14044 | #: builtin/init-db.c:413 |
c04f5ac3 | 14045 | #, c-format |
5c57d762 JX |
14046 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
14047 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 14048 | |
d46c5519 | 14049 | #: builtin/init-db.c:414 |
5c57d762 JX |
14050 | #, c-format |
14051 | msgid "Reinitialized existing Git repository in %s%s\n" | |
14052 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 14053 | |
d46c5519 | 14054 | #: builtin/init-db.c:418 |
5c57d762 JX |
14055 | #, c-format |
14056 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 14057 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 14058 | |
d46c5519 | 14059 | #: builtin/init-db.c:419 |
5c57d762 JX |
14060 | #, c-format |
14061 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 14062 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 14063 | |
d46c5519 | 14064 | #: builtin/init-db.c:468 |
ef317cd5 | 14065 | msgid "" |
a77c07d9 | 14066 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 14067 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 14068 | msgstr "" |
07432cef | 14069 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 14070 | "[<目录>]" |
ef317cd5 | 14071 | |
d46c5519 | 14072 | #: builtin/init-db.c:491 |
ef317cd5 | 14073 | msgid "permissions" |
07432cef | 14074 | msgstr "权限" |
ef317cd5 | 14075 | |
d46c5519 | 14076 | #: builtin/init-db.c:492 |
ef317cd5 | 14077 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 14078 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 14079 | |
a6cd2cc4 | 14080 | #: builtin/init-db.c:529 builtin/init-db.c:534 |
c1ac5258 JX |
14081 | #, c-format |
14082 | msgid "cannot mkdir %s" | |
14083 | msgstr "不能创建目录 %s" | |
14084 | ||
a6cd2cc4 | 14085 | #: builtin/init-db.c:538 |
c04f5ac3 JX |
14086 | #, c-format |
14087 | msgid "cannot chdir to %s" | |
14088 | msgstr "不能切换目录到 %s" | |
14089 | ||
a6cd2cc4 | 14090 | #: builtin/init-db.c:559 |
c04f5ac3 JX |
14091 | #, c-format |
14092 | msgid "" | |
14093 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
14094 | "dir=<directory>)" | |
1e607449 | 14095 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 14096 | |
a6cd2cc4 | 14097 | #: builtin/init-db.c:587 |
c04f5ac3 JX |
14098 | #, c-format |
14099 | msgid "Cannot access work tree '%s'" | |
14100 | msgstr "不能访问工作区 '%s'" | |
14101 | ||
a6cd2cc4 | 14102 | #: builtin/interpret-trailers.c:16 |
220c313c | 14103 | msgid "" |
276ceeaa JX |
14104 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
14105 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
14106 | msgstr "" |
14107 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
14108 | ">])...] [<文件>...]" | |
276ceeaa | 14109 | |
a6cd2cc4 | 14110 | #: builtin/interpret-trailers.c:95 |
276ceeaa JX |
14111 | msgid "edit files in place" |
14112 | msgstr "在原位编辑文件" | |
220c313c | 14113 | |
a6cd2cc4 | 14114 | #: builtin/interpret-trailers.c:96 |
220c313c | 14115 | msgid "trim empty trailers" |
6937cb4e JX |
14116 | msgstr "删除空的尾部署名" |
14117 | ||
a6cd2cc4 | 14118 | #: builtin/interpret-trailers.c:99 |
6937cb4e JX |
14119 | msgid "where to place the new trailer" |
14120 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 14121 | |
a6cd2cc4 | 14122 | #: builtin/interpret-trailers.c:101 |
6937cb4e JX |
14123 | msgid "action if trailer already exists" |
14124 | msgstr "当尾部署名已经存在时所采取的动作" | |
14125 | ||
a6cd2cc4 | 14126 | #: builtin/interpret-trailers.c:103 |
6937cb4e JX |
14127 | msgid "action if trailer is missing" |
14128 | msgstr "当尾部署名缺失时所采取的动作" | |
14129 | ||
a6cd2cc4 | 14130 | #: builtin/interpret-trailers.c:105 |
6937cb4e JX |
14131 | msgid "output only the trailers" |
14132 | msgstr "只输出尾部署名" | |
14133 | ||
a6cd2cc4 | 14134 | #: builtin/interpret-trailers.c:106 |
6937cb4e JX |
14135 | msgid "do not apply config rules" |
14136 | msgstr "不要应用配置规则" | |
14137 | ||
a6cd2cc4 | 14138 | #: builtin/interpret-trailers.c:107 |
6937cb4e JX |
14139 | msgid "join whitespace-continued values" |
14140 | msgstr "连接空白折行的值" | |
14141 | ||
a6cd2cc4 | 14142 | #: builtin/interpret-trailers.c:108 |
6937cb4e JX |
14143 | msgid "set parsing options" |
14144 | msgstr "设置解析选项" | |
14145 | ||
a6cd2cc4 | 14146 | #: builtin/interpret-trailers.c:110 |
4c27fcb5 JX |
14147 | msgid "do not treat --- specially" |
14148 | msgstr "不要对 --- 特殊处理" | |
14149 | ||
a6cd2cc4 | 14150 | #: builtin/interpret-trailers.c:111 |
220c313c | 14151 | msgid "trailer" |
6937cb4e | 14152 | msgstr "尾部署名" |
220c313c | 14153 | |
a6cd2cc4 | 14154 | #: builtin/interpret-trailers.c:112 |
220c313c | 14155 | msgid "trailer(s) to add" |
6937cb4e | 14156 | msgstr "要添加的尾部署名" |
220c313c | 14157 | |
a6cd2cc4 | 14158 | #: builtin/interpret-trailers.c:123 |
6937cb4e JX |
14159 | msgid "--trailer with --only-input does not make sense" |
14160 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
14161 | ||
a6cd2cc4 | 14162 | #: builtin/interpret-trailers.c:133 |
276ceeaa JX |
14163 | msgid "no input file given for in-place editing" |
14164 | msgstr "没有给出要原位编辑的文件" | |
14165 | ||
06991777 | 14166 | #: builtin/log.c:55 |
7aea43ff | 14167 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 14168 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 14169 | |
06991777 | 14170 | #: builtin/log.c:56 |
814ff314 JX |
14171 | msgid "git show [<options>] <object>..." |
14172 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 14173 | |
a6cd2cc4 | 14174 | #: builtin/log.c:109 |
220c313c JX |
14175 | #, c-format |
14176 | msgid "invalid --decorate option: %s" | |
14177 | msgstr "无效的 --decorate 选项:%s" | |
14178 | ||
a6cd2cc4 | 14179 | #: builtin/log.c:173 |
ef317cd5 | 14180 | msgid "show source" |
07432cef | 14181 | msgstr "显示源" |
ef317cd5 | 14182 | |
a6cd2cc4 | 14183 | #: builtin/log.c:174 |
07432cef WS |
14184 | msgid "Use mail map file" |
14185 | msgstr "使用邮件映射文件" | |
14186 | ||
a6cd2cc4 | 14187 | #: builtin/log.c:176 |
5809aa05 JX |
14188 | msgid "only decorate refs that match <pattern>" |
14189 | msgstr "只修饰与 <模式> 匹配的引用" | |
14190 | ||
a6cd2cc4 | 14191 | #: builtin/log.c:178 |
5809aa05 JX |
14192 | msgid "do not decorate refs that match <pattern>" |
14193 | msgstr "不修饰和 <模式> 匹配的引用" | |
14194 | ||
a6cd2cc4 | 14195 | #: builtin/log.c:179 |
ef317cd5 | 14196 | msgid "decorate options" |
07432cef | 14197 | msgstr "修饰选项" |
ef317cd5 | 14198 | |
a6cd2cc4 | 14199 | #: builtin/log.c:182 |
220c313c JX |
14200 | msgid "Process line range n,m in file, counting from 1" |
14201 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
14202 | ||
a6cd2cc4 | 14203 | #: builtin/log.c:280 |
c04f5ac3 JX |
14204 | #, c-format |
14205 | msgid "Final output: %d %s\n" | |
14206 | msgstr "最终输出:%d %s\n" | |
14207 | ||
a6cd2cc4 | 14208 | #: builtin/log.c:534 |
220c313c JX |
14209 | #, c-format |
14210 | msgid "git show %s: bad file" | |
14211 | msgstr "git show %s: 损坏的文件" | |
14212 | ||
a6cd2cc4 | 14213 | #: builtin/log.c:549 builtin/log.c:643 |
c04f5ac3 | 14214 | #, c-format |
d46c5519 | 14215 | msgid "could not read object %s" |
90e6ef53 | 14216 | msgstr "不能读取对象 %s" |
c04f5ac3 | 14217 | |
a6cd2cc4 | 14218 | #: builtin/log.c:668 |
c04f5ac3 | 14219 | #, c-format |
d46c5519 | 14220 | msgid "unknown type: %d" |
c04f5ac3 JX |
14221 | msgstr "未知类型:%d" |
14222 | ||
a6cd2cc4 | 14223 | #: builtin/log.c:791 |
c04f5ac3 JX |
14224 | msgid "format.headers without value" |
14225 | msgstr "format.headers 没有值" | |
14226 | ||
a6cd2cc4 | 14227 | #: builtin/log.c:908 |
c04f5ac3 JX |
14228 | msgid "name of output directory is too long" |
14229 | msgstr "输出目录名太长" | |
14230 | ||
a6cd2cc4 | 14231 | #: builtin/log.c:924 |
c04f5ac3 | 14232 | #, c-format |
d46c5519 | 14233 | msgid "cannot open patch file %s" |
c04f5ac3 JX |
14234 | msgstr "无法打开补丁文件 %s" |
14235 | ||
a6cd2cc4 | 14236 | #: builtin/log.c:941 |
d46c5519 JX |
14237 | msgid "need exactly one range" |
14238 | msgstr "只需要一个范围" | |
c04f5ac3 | 14239 | |
a6cd2cc4 | 14240 | #: builtin/log.c:951 |
d46c5519 JX |
14241 | msgid "not a range" |
14242 | msgstr "不是一个范围" | |
c04f5ac3 | 14243 | |
a6cd2cc4 | 14244 | #: builtin/log.c:1074 |
d46c5519 JX |
14245 | msgid "cover letter needs email format" |
14246 | msgstr "附函需要邮件地址格式" | |
c04f5ac3 | 14247 | |
a6cd2cc4 | 14248 | #: builtin/log.c:1080 |
d46c5519 JX |
14249 | msgid "failed to create cover-letter file" |
14250 | msgstr "无法创建附函文件" | |
14251 | ||
a6cd2cc4 | 14252 | #: builtin/log.c:1159 |
c04f5ac3 JX |
14253 | #, c-format |
14254 | msgid "insane in-reply-to: %s" | |
14255 | msgstr "不正常的 in-reply-to:%s" | |
14256 | ||
a6cd2cc4 | 14257 | #: builtin/log.c:1186 |
814ff314 JX |
14258 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
14259 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 14260 | |
a6cd2cc4 | 14261 | #: builtin/log.c:1244 |
d46c5519 | 14262 | msgid "two output directories?" |
c04f5ac3 JX |
14263 | msgstr "两个输出目录?" |
14264 | ||
a6cd2cc4 | 14265 | #: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 |
5b04ee3b | 14266 | #, c-format |
d46c5519 | 14267 | msgid "unknown commit %s" |
5b04ee3b JX |
14268 | msgstr "未知提交 %s" |
14269 | ||
a6cd2cc4 | 14270 | #: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 |
d46c5519 | 14271 | #: builtin/replace.c:210 |
5b04ee3b | 14272 | #, c-format |
d46c5519 JX |
14273 | msgid "failed to resolve '%s' as a valid ref" |
14274 | msgstr "无法将 '%s' 解析为一个有效引用" | |
5b04ee3b | 14275 | |
a6cd2cc4 | 14276 | #: builtin/log.c:1370 |
d46c5519 JX |
14277 | msgid "could not find exact merge base" |
14278 | msgstr "不能找到准确的合并基线" | |
5b04ee3b | 14279 | |
a6cd2cc4 | 14280 | #: builtin/log.c:1374 |
5b04ee3b | 14281 | msgid "" |
d46c5519 | 14282 | "failed to get upstream, if you want to record base commit automatically,\n" |
5b04ee3b | 14283 | "please use git branch --set-upstream-to to track a remote branch.\n" |
d46c5519 | 14284 | "Or you could specify base commit by --base=<base-commit-id> manually" |
5b04ee3b JX |
14285 | msgstr "" |
14286 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 14287 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
d46c5519 | 14288 | "参数 --base=<基线提交> 手动指定一个基线提交" |
5b04ee3b | 14289 | |
a6cd2cc4 | 14290 | #: builtin/log.c:1394 |
d46c5519 | 14291 | msgid "failed to find exact merge base" |
5b04ee3b JX |
14292 | msgstr "无法找到准确的合并基线" |
14293 | ||
a6cd2cc4 | 14294 | #: builtin/log.c:1405 |
5b04ee3b JX |
14295 | msgid "base commit should be the ancestor of revision list" |
14296 | msgstr "基线提交应该是版本列表的祖先" | |
14297 | ||
a6cd2cc4 | 14298 | #: builtin/log.c:1409 |
5b04ee3b JX |
14299 | msgid "base commit shouldn't be in revision list" |
14300 | msgstr "基线提交不应该出现在版本列表中" | |
14301 | ||
a6cd2cc4 | 14302 | #: builtin/log.c:1462 |
5b04ee3b | 14303 | msgid "cannot get patch id" |
aef18cc6 | 14304 | msgstr "无法得到补丁 id" |
5b04ee3b | 14305 | |
a6cd2cc4 | 14306 | #: builtin/log.c:1514 |
4c27fcb5 JX |
14307 | msgid "failed to infer range-diff ranges" |
14308 | msgstr "无法推断 range-diff 范围" | |
14309 | ||
a6cd2cc4 | 14310 | #: builtin/log.c:1559 |
ef317cd5 | 14311 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 14312 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 14313 | |
a6cd2cc4 | 14314 | #: builtin/log.c:1562 |
ef317cd5 | 14315 | msgid "use [PATCH] even with multiple patches" |
07432cef | 14316 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 14317 | |
a6cd2cc4 | 14318 | #: builtin/log.c:1566 |
ef317cd5 | 14319 | msgid "print patches to standard out" |
07432cef | 14320 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 14321 | |
a6cd2cc4 | 14322 | #: builtin/log.c:1568 |
ef317cd5 | 14323 | msgid "generate a cover letter" |
d46c5519 | 14324 | msgstr "生成一封附函" |
c04f5ac3 | 14325 | |
a6cd2cc4 | 14326 | #: builtin/log.c:1570 |
ef317cd5 | 14327 | msgid "use simple number sequence for output file names" |
07432cef | 14328 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 14329 | |
a6cd2cc4 | 14330 | #: builtin/log.c:1571 |
ef317cd5 | 14331 | msgid "sfx" |
07432cef | 14332 | msgstr "后缀" |
ef317cd5 | 14333 | |
a6cd2cc4 | 14334 | #: builtin/log.c:1572 |
ef317cd5 | 14335 | msgid "use <sfx> instead of '.patch'" |
07432cef | 14336 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 14337 | |
a6cd2cc4 | 14338 | #: builtin/log.c:1574 |
ef317cd5 | 14339 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
14340 | msgstr "补丁以 <n> 开始编号,而不是1" |
14341 | ||
a6cd2cc4 | 14342 | #: builtin/log.c:1576 |
07432cef WS |
14343 | msgid "mark the series as Nth re-roll" |
14344 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 14345 | |
a6cd2cc4 | 14346 | #: builtin/log.c:1578 |
a0b6b246 JX |
14347 | msgid "Use [RFC PATCH] instead of [PATCH]" |
14348 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
14349 | ||
a6cd2cc4 | 14350 | #: builtin/log.c:1581 |
ef317cd5 | 14351 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 14352 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 14353 | |
a6cd2cc4 | 14354 | #: builtin/log.c:1584 |
ef317cd5 | 14355 | msgid "store resulting files in <dir>" |
d9d56b23 | 14356 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 14357 | |
a6cd2cc4 | 14358 | #: builtin/log.c:1587 |
ef317cd5 | 14359 | msgid "don't strip/add [PATCH]" |
07432cef | 14360 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 14361 | |
a6cd2cc4 | 14362 | #: builtin/log.c:1590 |
ef317cd5 | 14363 | msgid "don't output binary diffs" |
07432cef | 14364 | msgstr "不输出二进制差异" |
ef317cd5 | 14365 | |
a6cd2cc4 | 14366 | #: builtin/log.c:1592 |
89f80d72 JX |
14367 | msgid "output all-zero hash in From header" |
14368 | msgstr "在 From 头信息中输出全为零的哈希值" | |
14369 | ||
a6cd2cc4 | 14370 | #: builtin/log.c:1594 |
ef317cd5 | 14371 | msgid "don't include a patch matching a commit upstream" |
07432cef | 14372 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 14373 | |
a6cd2cc4 | 14374 | #: builtin/log.c:1596 |
ef317cd5 | 14375 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 14376 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 14377 | |
a6cd2cc4 | 14378 | #: builtin/log.c:1598 |
ef317cd5 | 14379 | msgid "Messaging" |
07432cef | 14380 | msgstr "邮件发送" |
ef317cd5 | 14381 | |
a6cd2cc4 | 14382 | #: builtin/log.c:1599 |
ef317cd5 | 14383 | msgid "header" |
07432cef | 14384 | msgstr "header" |
ef317cd5 | 14385 | |
a6cd2cc4 | 14386 | #: builtin/log.c:1600 |
ef317cd5 | 14387 | msgid "add email header" |
07432cef | 14388 | msgstr "添加邮件头" |
ef317cd5 | 14389 | |
a6cd2cc4 | 14390 | #: builtin/log.c:1601 builtin/log.c:1603 |
ef317cd5 | 14391 | msgid "email" |
07432cef | 14392 | msgstr "邮件地址" |
ef317cd5 | 14393 | |
a6cd2cc4 | 14394 | #: builtin/log.c:1601 |
ef317cd5 | 14395 | msgid "add To: header" |
07432cef | 14396 | msgstr "添加收件人" |
ef317cd5 | 14397 | |
a6cd2cc4 | 14398 | #: builtin/log.c:1603 |
ef317cd5 | 14399 | msgid "add Cc: header" |
07432cef | 14400 | msgstr "添加抄送" |
ef317cd5 | 14401 | |
a6cd2cc4 | 14402 | #: builtin/log.c:1605 |
2e8451e8 | 14403 | msgid "ident" |
d9d56b23 | 14404 | msgstr "标识" |
2e8451e8 | 14405 | |
a6cd2cc4 | 14406 | #: builtin/log.c:1606 |
2e8451e8 | 14407 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 14408 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 14409 | |
a6cd2cc4 | 14410 | #: builtin/log.c:1608 |
ef317cd5 | 14411 | msgid "message-id" |
d9d56b23 | 14412 | msgstr "邮件标识" |
ef317cd5 | 14413 | |
a6cd2cc4 | 14414 | #: builtin/log.c:1609 |
ef317cd5 | 14415 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 14416 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 14417 | |
a6cd2cc4 | 14418 | #: builtin/log.c:1610 builtin/log.c:1613 |
ef317cd5 | 14419 | msgid "boundary" |
07432cef | 14420 | msgstr "边界" |
ef317cd5 | 14421 | |
a6cd2cc4 | 14422 | #: builtin/log.c:1611 |
ef317cd5 | 14423 | msgid "attach the patch" |
07432cef | 14424 | msgstr "附件方式添加补丁" |
ef317cd5 | 14425 | |
a6cd2cc4 | 14426 | #: builtin/log.c:1614 |
ef317cd5 | 14427 | msgid "inline the patch" |
07432cef | 14428 | msgstr "内联显示补丁" |
ef317cd5 | 14429 | |
a6cd2cc4 | 14430 | #: builtin/log.c:1618 |
ef317cd5 | 14431 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 14432 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 14433 | |
a6cd2cc4 | 14434 | #: builtin/log.c:1620 |
ef317cd5 | 14435 | msgid "signature" |
07432cef | 14436 | msgstr "签名" |
ef317cd5 | 14437 | |
a6cd2cc4 | 14438 | #: builtin/log.c:1621 |
ef317cd5 | 14439 | msgid "add a signature" |
07432cef | 14440 | msgstr "添加一个签名" |
ef317cd5 | 14441 | |
a6cd2cc4 | 14442 | #: builtin/log.c:1622 |
5b04ee3b JX |
14443 | msgid "base-commit" |
14444 | msgstr "基线提交" | |
14445 | ||
a6cd2cc4 | 14446 | #: builtin/log.c:1623 |
5b04ee3b JX |
14447 | msgid "add prerequisite tree info to the patch series" |
14448 | msgstr "为补丁列表添加前置树信息" | |
14449 | ||
a6cd2cc4 | 14450 | #: builtin/log.c:1625 |
6acbf033 JX |
14451 | msgid "add a signature from a file" |
14452 | msgstr "从文件添加一个签名" | |
14453 | ||
a6cd2cc4 | 14454 | #: builtin/log.c:1626 |
ef317cd5 | 14455 | msgid "don't print the patch filenames" |
07432cef | 14456 | msgstr "不要打印补丁文件名" |
ef317cd5 | 14457 | |
a6cd2cc4 | 14458 | #: builtin/log.c:1628 |
6937cb4e JX |
14459 | msgid "show progress while generating patches" |
14460 | msgstr "在生成补丁时显示进度" | |
14461 | ||
a6cd2cc4 | 14462 | #: builtin/log.c:1630 |
4c27fcb5 JX |
14463 | msgid "show changes against <rev> in cover letter or single patch" |
14464 | msgstr "在附函或单个补丁中显示和 <rev> 的差异" | |
14465 | ||
a6cd2cc4 | 14466 | #: builtin/log.c:1633 |
4c27fcb5 JX |
14467 | msgid "show changes against <refspec> in cover letter or single patch" |
14468 | msgstr "在附函或单个补丁中显示和 <refspec> 的差异" | |
14469 | ||
a6cd2cc4 | 14470 | #: builtin/log.c:1635 |
4c27fcb5 JX |
14471 | msgid "percentage by which creation is weighted" |
14472 | msgstr "创建权重的百分比" | |
14473 | ||
a6cd2cc4 | 14474 | #: builtin/log.c:1710 |
a4f16749 JX |
14475 | #, c-format |
14476 | msgid "invalid ident line: %s" | |
14477 | msgstr "包含无效的身份标识:%s" | |
14478 | ||
a6cd2cc4 | 14479 | #: builtin/log.c:1725 |
c1ac5258 JX |
14480 | msgid "-n and -k are mutually exclusive" |
14481 | msgstr "-n 和 -k 互斥" | |
c04f5ac3 | 14482 | |
a6cd2cc4 | 14483 | #: builtin/log.c:1727 |
c1ac5258 JX |
14484 | msgid "--subject-prefix/--rfc and -k are mutually exclusive" |
14485 | msgstr "--subject-prefix/--rfc 和 -k 互斥" | |
c04f5ac3 | 14486 | |
a6cd2cc4 | 14487 | #: builtin/log.c:1735 |
c04f5ac3 JX |
14488 | msgid "--name-only does not make sense" |
14489 | msgstr "--name-only 无意义" | |
14490 | ||
a6cd2cc4 | 14491 | #: builtin/log.c:1737 |
c04f5ac3 JX |
14492 | msgid "--name-status does not make sense" |
14493 | msgstr "--name-status 无意义" | |
14494 | ||
a6cd2cc4 | 14495 | #: builtin/log.c:1739 |
c04f5ac3 JX |
14496 | msgid "--check does not make sense" |
14497 | msgstr "--check 无意义" | |
14498 | ||
a6cd2cc4 | 14499 | #: builtin/log.c:1771 |
c04f5ac3 JX |
14500 | msgid "standard output, or directory, which one?" |
14501 | msgstr "标准输出或目录,哪一个?" | |
14502 | ||
a6cd2cc4 | 14503 | #: builtin/log.c:1860 |
4c27fcb5 JX |
14504 | msgid "--interdiff requires --cover-letter or single patch" |
14505 | msgstr "--interdiff 需要 --cover-letter 或单一补丁" | |
14506 | ||
a6cd2cc4 | 14507 | #: builtin/log.c:1864 |
4c27fcb5 JX |
14508 | msgid "Interdiff:" |
14509 | msgstr "版本间差异:" | |
14510 | ||
a6cd2cc4 | 14511 | #: builtin/log.c:1865 |
4c27fcb5 JX |
14512 | #, c-format |
14513 | msgid "Interdiff against v%d:" | |
14514 | msgstr "对 v%d 的版本差异:" | |
14515 | ||
a6cd2cc4 | 14516 | #: builtin/log.c:1871 |
4c27fcb5 JX |
14517 | msgid "--creation-factor requires --range-diff" |
14518 | msgstr "--creation-factor 需要 --range-diff" | |
14519 | ||
a6cd2cc4 | 14520 | #: builtin/log.c:1875 |
4c27fcb5 JX |
14521 | msgid "--range-diff requires --cover-letter or single patch" |
14522 | msgstr "--range-diff 需要 --cover-letter 或单一补丁" | |
14523 | ||
a6cd2cc4 | 14524 | #: builtin/log.c:1883 |
4c27fcb5 JX |
14525 | msgid "Range-diff:" |
14526 | msgstr "范围差异:" | |
14527 | ||
a6cd2cc4 | 14528 | #: builtin/log.c:1884 |
4c27fcb5 JX |
14529 | #, c-format |
14530 | msgid "Range-diff against v%d:" | |
14531 | msgstr "对 v%d 的范围差异:" | |
14532 | ||
a6cd2cc4 | 14533 | #: builtin/log.c:1895 |
6acbf033 JX |
14534 | #, c-format |
14535 | msgid "unable to read signature file '%s'" | |
14536 | msgstr "无法读取签名文件 '%s'" | |
14537 | ||
a6cd2cc4 | 14538 | #: builtin/log.c:1931 |
6937cb4e JX |
14539 | msgid "Generating patches" |
14540 | msgstr "生成补丁" | |
14541 | ||
a6cd2cc4 | 14542 | #: builtin/log.c:1975 |
d46c5519 | 14543 | msgid "failed to create output files" |
c04f5ac3 JX |
14544 | msgstr "无法创建输出文件" |
14545 | ||
a6cd2cc4 | 14546 | #: builtin/log.c:2034 |
ef317cd5 | 14547 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 14548 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 14549 | |
a6cd2cc4 | 14550 | #: builtin/log.c:2088 |
c04f5ac3 JX |
14551 | #, c-format |
14552 | msgid "" | |
14553 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 14554 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 14555 | |
06991777 | 14556 | #: builtin/ls-files.c:470 |
814ff314 JX |
14557 | msgid "git ls-files [<options>] [<file>...]" |
14558 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 14559 | |
06991777 | 14560 | #: builtin/ls-files.c:526 |
ef317cd5 | 14561 | msgid "identify the file status with tags" |
07432cef | 14562 | msgstr "用标签标识文件的状态" |
ef317cd5 | 14563 | |
06991777 | 14564 | #: builtin/ls-files.c:528 |
ef317cd5 | 14565 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 14566 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 14567 | |
06991777 | 14568 | #: builtin/ls-files.c:530 |
5809aa05 JX |
14569 | msgid "use lowercase letters for 'fsmonitor clean' files" |
14570 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
14571 | ||
06991777 | 14572 | #: builtin/ls-files.c:532 |
ef317cd5 | 14573 | msgid "show cached files in the output (default)" |
07432cef | 14574 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 14575 | |
06991777 | 14576 | #: builtin/ls-files.c:534 |
ef317cd5 | 14577 | msgid "show deleted files in the output" |
07432cef | 14578 | msgstr "显示已删除的文件" |
ef317cd5 | 14579 | |
06991777 | 14580 | #: builtin/ls-files.c:536 |
ef317cd5 | 14581 | msgid "show modified files in the output" |
07432cef | 14582 | msgstr "显示已修改的文件" |
ef317cd5 | 14583 | |
06991777 | 14584 | #: builtin/ls-files.c:538 |
ef317cd5 | 14585 | msgid "show other files in the output" |
07432cef | 14586 | msgstr "显示其它文件" |
ef317cd5 | 14587 | |
06991777 | 14588 | #: builtin/ls-files.c:540 |
ef317cd5 | 14589 | msgid "show ignored files in the output" |
07432cef | 14590 | msgstr "显示忽略的文件" |
ef317cd5 | 14591 | |
06991777 | 14592 | #: builtin/ls-files.c:543 |
ef317cd5 | 14593 | msgid "show staged contents' object name in the output" |
07432cef | 14594 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 14595 | |
06991777 | 14596 | #: builtin/ls-files.c:545 |
ef317cd5 | 14597 | msgid "show files on the filesystem that need to be removed" |
07432cef | 14598 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 14599 | |
06991777 | 14600 | #: builtin/ls-files.c:547 |
220c313c | 14601 | msgid "show 'other' directories' names only" |
07432cef | 14602 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 14603 | |
06991777 | 14604 | #: builtin/ls-files.c:549 |
276ceeaa JX |
14605 | msgid "show line endings of files" |
14606 | msgstr "显示文件换行符格式" | |
14607 | ||
06991777 | 14608 | #: builtin/ls-files.c:551 |
ef317cd5 | 14609 | msgid "don't show empty directories" |
07432cef | 14610 | msgstr "不显示空目录" |
ef317cd5 | 14611 | |
06991777 | 14612 | #: builtin/ls-files.c:554 |
ef317cd5 | 14613 | msgid "show unmerged files in the output" |
07432cef | 14614 | msgstr "显示未合并的文件" |
ef317cd5 | 14615 | |
06991777 | 14616 | #: builtin/ls-files.c:556 |
ef317cd5 | 14617 | msgid "show resolve-undo information" |
07432cef | 14618 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 14619 | |
06991777 | 14620 | #: builtin/ls-files.c:558 |
ef317cd5 | 14621 | msgid "skip files matching pattern" |
07432cef | 14622 | msgstr "匹配排除文件的模式" |
ef317cd5 | 14623 | |
06991777 | 14624 | #: builtin/ls-files.c:561 |
ef317cd5 | 14625 | msgid "exclude patterns are read from <file>" |
07432cef | 14626 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 14627 | |
06991777 | 14628 | #: builtin/ls-files.c:564 |
ef317cd5 | 14629 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 14630 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 14631 | |
06991777 | 14632 | #: builtin/ls-files.c:566 |
ef317cd5 | 14633 | msgid "add the standard git exclusions" |
07432cef | 14634 | msgstr "添加标准的 git 排除" |
ef317cd5 | 14635 | |
06991777 | 14636 | #: builtin/ls-files.c:570 |
ef317cd5 | 14637 | msgid "make the output relative to the project top directory" |
07432cef | 14638 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 14639 | |
06991777 | 14640 | #: builtin/ls-files.c:573 |
a0b6b246 JX |
14641 | msgid "recurse through submodules" |
14642 | msgstr "在子模组中递归" | |
14643 | ||
06991777 | 14644 | #: builtin/ls-files.c:575 |
ef317cd5 | 14645 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 14646 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 14647 | |
06991777 | 14648 | #: builtin/ls-files.c:576 |
ef317cd5 | 14649 | msgid "tree-ish" |
07432cef | 14650 | msgstr "树或提交" |
ef317cd5 | 14651 | |
06991777 | 14652 | #: builtin/ls-files.c:577 |
ef317cd5 | 14653 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 14654 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 14655 | |
06991777 | 14656 | #: builtin/ls-files.c:579 |
ef317cd5 | 14657 | msgid "show debugging data" |
07432cef | 14658 | msgstr "显示调试数据" |
ef317cd5 | 14659 | |
fd8cb379 | 14660 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
14661 | msgid "" |
14662 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
14663 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
14664 | " [--symref] [<repository> [<refs>...]]" | |
14665 | msgstr "" | |
14666 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
14667 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
14668 | " [--symref] [<仓库> [<引用>...]]" | |
14669 | ||
fd8cb379 | 14670 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
14671 | msgid "do not print remote URL" |
14672 | msgstr "不打印远程 URL" | |
14673 | ||
a6cd2cc4 | 14674 | #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 |
276ceeaa JX |
14675 | msgid "exec" |
14676 | msgstr "exec" | |
14677 | ||
fd8cb379 | 14678 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 |
276ceeaa JX |
14679 | msgid "path of git-upload-pack on the remote host" |
14680 | msgstr "远程主机上的 git-upload-pack 路径" | |
14681 | ||
fd8cb379 | 14682 | #: builtin/ls-remote.c:65 |
276ceeaa JX |
14683 | msgid "limit to tags" |
14684 | msgstr "仅限于标签" | |
14685 | ||
fd8cb379 | 14686 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
14687 | msgid "limit to heads" |
14688 | msgstr "仅限于分支" | |
14689 | ||
fd8cb379 | 14690 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
14691 | msgid "do not show peeled tags" |
14692 | msgstr "不显示已解析的标签" | |
14693 | ||
fd8cb379 | 14694 | #: builtin/ls-remote.c:69 |
276ceeaa JX |
14695 | msgid "take url.<base>.insteadOf into account" |
14696 | msgstr "参考 url.<base>.insteadOf 设置" | |
14697 | ||
d46c5519 | 14698 | #: builtin/ls-remote.c:72 |
276ceeaa JX |
14699 | msgid "exit with exit code 2 if no matching refs are found" |
14700 | msgstr "若未找到匹配的引用则以退出码2退出" | |
14701 | ||
d46c5519 | 14702 | #: builtin/ls-remote.c:75 |
276ceeaa JX |
14703 | msgid "show underlying ref in addition to the object pointed by it" |
14704 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
14705 | ||
c1ac5258 | 14706 | #: builtin/ls-tree.c:30 |
ef317cd5 | 14707 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 14708 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 14709 | |
c1ac5258 | 14710 | #: builtin/ls-tree.c:128 |
ef317cd5 | 14711 | msgid "only show trees" |
07432cef | 14712 | msgstr "只显示树" |
ef317cd5 | 14713 | |
c1ac5258 | 14714 | #: builtin/ls-tree.c:130 |
ef317cd5 | 14715 | msgid "recurse into subtrees" |
07432cef | 14716 | msgstr "递归到子树" |
ef317cd5 | 14717 | |
c1ac5258 | 14718 | #: builtin/ls-tree.c:132 |
ef317cd5 | 14719 | msgid "show trees when recursing" |
07432cef | 14720 | msgstr "当递归时显示树" |
ef317cd5 | 14721 | |
c1ac5258 | 14722 | #: builtin/ls-tree.c:135 |
ef317cd5 | 14723 | msgid "terminate entries with NUL byte" |
4375c10e | 14724 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 14725 | |
c1ac5258 | 14726 | #: builtin/ls-tree.c:136 |
ef317cd5 | 14727 | msgid "include object size" |
07432cef | 14728 | msgstr "包括对象大小" |
ef317cd5 | 14729 | |
c1ac5258 | 14730 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 14731 | msgid "list only filenames" |
07432cef | 14732 | msgstr "只列出文件名" |
ef317cd5 | 14733 | |
c1ac5258 | 14734 | #: builtin/ls-tree.c:143 |
ef317cd5 | 14735 | msgid "use full path names" |
07432cef | 14736 | msgstr "使用文件的全路径" |
ef317cd5 | 14737 | |
c1ac5258 | 14738 | #: builtin/ls-tree.c:145 |
ef317cd5 | 14739 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 14740 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 14741 | |
a4f16749 JX |
14742 | #: builtin/mailsplit.c:241 |
14743 | #, c-format | |
14744 | msgid "empty mbox: '%s'" | |
14745 | msgstr "空的 mbox:'%s'" | |
14746 | ||
a6cd2cc4 | 14747 | #: builtin/merge.c:55 |
814ff314 JX |
14748 | msgid "git merge [<options>] [<commit>...]" |
14749 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 14750 | |
a6cd2cc4 | 14751 | #: builtin/merge.c:56 |
ef317cd5 | 14752 | msgid "git merge --abort" |
07432cef | 14753 | msgstr "git merge --abort" |
ef317cd5 | 14754 | |
a6cd2cc4 | 14755 | #: builtin/merge.c:57 |
1a79b2f1 JX |
14756 | msgid "git merge --continue" |
14757 | msgstr "git merge --continue" | |
14758 | ||
a6cd2cc4 | 14759 | #: builtin/merge.c:118 |
c04f5ac3 JX |
14760 | msgid "switch `m' requires a value" |
14761 | msgstr "开关 `m' 需要一个值" | |
14762 | ||
a6cd2cc4 | 14763 | #: builtin/merge.c:141 |
06991777 JX |
14764 | #, c-format |
14765 | msgid "option `%s' requires a value" | |
14766 | msgstr "选项 `%s' 需要一个值" | |
14767 | ||
a6cd2cc4 | 14768 | #: builtin/merge.c:187 |
c04f5ac3 JX |
14769 | #, c-format |
14770 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 14771 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 14772 | |
a6cd2cc4 | 14773 | #: builtin/merge.c:188 |
c04f5ac3 JX |
14774 | #, c-format |
14775 | msgid "Available strategies are:" | |
14776 | msgstr "可用的策略有:" | |
14777 | ||
a6cd2cc4 | 14778 | #: builtin/merge.c:193 |
c04f5ac3 JX |
14779 | #, c-format |
14780 | msgid "Available custom strategies are:" | |
14781 | msgstr "可用的自定义策略有:" | |
14782 | ||
a6cd2cc4 | 14783 | #: builtin/merge.c:244 builtin/pull.c:151 |
ef317cd5 | 14784 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 14785 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 14786 | |
a6cd2cc4 | 14787 | #: builtin/merge.c:247 builtin/pull.c:154 |
ef317cd5 | 14788 | msgid "show a diffstat at the end of the merge" |
07432cef | 14789 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 14790 | |
a6cd2cc4 | 14791 | #: builtin/merge.c:248 builtin/pull.c:157 |
ef317cd5 | 14792 | msgid "(synonym to --stat)" |
07432cef | 14793 | msgstr "(和 --stat 同义)" |
ef317cd5 | 14794 | |
a6cd2cc4 | 14795 | #: builtin/merge.c:250 builtin/pull.c:160 |
ef317cd5 | 14796 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 14797 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 14798 | |
a6cd2cc4 | 14799 | #: builtin/merge.c:253 builtin/pull.c:166 |
ef317cd5 | 14800 | msgid "create a single commit instead of doing a merge" |
07432cef | 14801 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 14802 | |
a6cd2cc4 | 14803 | #: builtin/merge.c:255 builtin/pull.c:169 |
ef317cd5 | 14804 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 14805 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 14806 | |
a6cd2cc4 | 14807 | #: builtin/merge.c:257 builtin/pull.c:172 |
ef317cd5 | 14808 | msgid "edit message before committing" |
07432cef | 14809 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 14810 | |
a6cd2cc4 | 14811 | #: builtin/merge.c:259 |
ef317cd5 | 14812 | msgid "allow fast-forward (default)" |
07432cef | 14813 | msgstr "允许快进(默认)" |
ef317cd5 | 14814 | |
a6cd2cc4 | 14815 | #: builtin/merge.c:261 builtin/pull.c:179 |
ef317cd5 | 14816 | msgid "abort if fast-forward is not possible" |
07432cef | 14817 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 14818 | |
a6cd2cc4 | 14819 | #: builtin/merge.c:265 builtin/pull.c:182 |
5c57d762 | 14820 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
14821 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
14822 | ||
a6cd2cc4 JX |
14823 | #: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 |
14824 | #: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 | |
ef317cd5 | 14825 | msgid "strategy" |
07432cef | 14826 | msgstr "策略" |
ef317cd5 | 14827 | |
a6cd2cc4 | 14828 | #: builtin/merge.c:267 builtin/pull.c:187 |
ef317cd5 | 14829 | msgid "merge strategy to use" |
07432cef | 14830 | msgstr "要使用的合并策略" |
ef317cd5 | 14831 | |
a6cd2cc4 | 14832 | #: builtin/merge.c:268 builtin/pull.c:190 |
ef317cd5 | 14833 | msgid "option=value" |
07432cef | 14834 | msgstr "option=value" |
ef317cd5 | 14835 | |
a6cd2cc4 | 14836 | #: builtin/merge.c:269 builtin/pull.c:191 |
ef317cd5 | 14837 | msgid "option for selected merge strategy" |
07432cef | 14838 | msgstr "所选的合并策略的选项" |
ef317cd5 | 14839 | |
a6cd2cc4 | 14840 | #: builtin/merge.c:271 |
ef317cd5 | 14841 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 14842 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 14843 | |
a6cd2cc4 | 14844 | #: builtin/merge.c:278 |
ef317cd5 | 14845 | msgid "abort the current in-progress merge" |
07432cef | 14846 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 14847 | |
a6cd2cc4 JX |
14848 | # |
14849 | #: builtin/merge.c:280 | |
14850 | msgid "--abort but leave index and working tree alone" | |
14851 | msgstr "--abort,但是保留索引和工作区" | |
14852 | ||
14853 | #: builtin/merge.c:282 | |
1a79b2f1 JX |
14854 | msgid "continue the current in-progress merge" |
14855 | msgstr "继续当前正在进行的合并" | |
14856 | ||
a6cd2cc4 | 14857 | #: builtin/merge.c:284 builtin/pull.c:198 |
5b04ee3b JX |
14858 | msgid "allow merging unrelated histories" |
14859 | msgstr "允许合并不相关的历史" | |
14860 | ||
a6cd2cc4 | 14861 | #: builtin/merge.c:290 |
6937cb4e JX |
14862 | msgid "verify commit-msg hook" |
14863 | msgstr "校验 commit-msg 钩子" | |
14864 | ||
a6cd2cc4 | 14865 | #: builtin/merge.c:307 |
c04f5ac3 | 14866 | msgid "could not run stash." |
a4f16749 | 14867 | msgstr "不能运行贮藏。" |
c04f5ac3 | 14868 | |
a6cd2cc4 | 14869 | #: builtin/merge.c:312 |
c04f5ac3 | 14870 | msgid "stash failed" |
a4f16749 | 14871 | msgstr "贮藏失败" |
c04f5ac3 | 14872 | |
a6cd2cc4 | 14873 | #: builtin/merge.c:317 |
c04f5ac3 JX |
14874 | #, c-format |
14875 | msgid "not a valid object: %s" | |
14876 | msgstr "不是一个有效对象:%s" | |
14877 | ||
a6cd2cc4 | 14878 | #: builtin/merge.c:339 builtin/merge.c:356 |
c04f5ac3 JX |
14879 | msgid "read-tree failed" |
14880 | msgstr "读取树失败" | |
14881 | ||
90e6ef53 | 14882 | # 译者:注意保持前导空格 |
a6cd2cc4 | 14883 | #: builtin/merge.c:386 |
c04f5ac3 JX |
14884 | msgid " (nothing to squash)" |
14885 | msgstr " (无可压缩)" | |
14886 | ||
a6cd2cc4 | 14887 | #: builtin/merge.c:397 |
c04f5ac3 JX |
14888 | #, c-format |
14889 | msgid "Squash commit -- not updating HEAD\n" | |
14890 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
14891 | ||
a6cd2cc4 | 14892 | #: builtin/merge.c:447 |
c04f5ac3 JX |
14893 | #, c-format |
14894 | msgid "No merge message -- not updating HEAD\n" | |
14895 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
14896 | ||
a6cd2cc4 | 14897 | #: builtin/merge.c:498 |
c04f5ac3 JX |
14898 | #, c-format |
14899 | msgid "'%s' does not point to a commit" | |
14900 | msgstr "'%s' 没有指向一个提交" | |
14901 | ||
a6cd2cc4 | 14902 | #: builtin/merge.c:585 |
c04f5ac3 JX |
14903 | #, c-format |
14904 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 14905 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 14906 | |
a6cd2cc4 | 14907 | #: builtin/merge.c:708 |
c04f5ac3 | 14908 | msgid "Not handling anything other than two heads merge." |
29004bbb | 14909 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 14910 | |
a6cd2cc4 | 14911 | #: builtin/merge.c:722 |
c04f5ac3 JX |
14912 | #, c-format |
14913 | msgid "Unknown option for merge-recursive: -X%s" | |
14914 | msgstr "merge-recursive 的未知选项:-X%s" | |
14915 | ||
a6cd2cc4 | 14916 | #: builtin/merge.c:737 |
c04f5ac3 JX |
14917 | #, c-format |
14918 | msgid "unable to write %s" | |
14919 | msgstr "不能写 %s" | |
14920 | ||
a6cd2cc4 | 14921 | #: builtin/merge.c:789 |
c04f5ac3 JX |
14922 | #, c-format |
14923 | msgid "Could not read from '%s'" | |
14924 | msgstr "不能从 '%s' 读取" | |
14925 | ||
a6cd2cc4 | 14926 | #: builtin/merge.c:798 |
c04f5ac3 JX |
14927 | #, c-format |
14928 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
14929 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
14930 | ||
a6cd2cc4 | 14931 | #: builtin/merge.c:804 |
c04f5ac3 JX |
14932 | msgid "" |
14933 | "Please enter a commit message to explain why this merge is necessary,\n" | |
14934 | "especially if it merges an updated upstream into a topic branch.\n" | |
14935 | "\n" | |
c04f5ac3 JX |
14936 | msgstr "" |
14937 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
14938 | "合并到主题分支。\n" | |
14939 | "\n" | |
c04f5ac3 | 14940 | |
a6cd2cc4 | 14941 | #: builtin/merge.c:809 |
d46c5519 | 14942 | msgid "An empty message aborts the commit.\n" |
5b533632 | 14943 | msgstr "空的提交说明会终止提交。\n" |
d46c5519 | 14944 | |
a6cd2cc4 | 14945 | #: builtin/merge.c:812 |
d46c5519 JX |
14946 | #, c-format |
14947 | msgid "" | |
14948 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" | |
14949 | "the commit.\n" | |
5b533632 | 14950 | msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n" |
d46c5519 | 14951 | |
a6cd2cc4 | 14952 | #: builtin/merge.c:853 |
c04f5ac3 JX |
14953 | msgid "Empty commit message." |
14954 | msgstr "空提交信息。" | |
14955 | ||
a6cd2cc4 | 14956 | #: builtin/merge.c:872 |
c04f5ac3 JX |
14957 | #, c-format |
14958 | msgid "Wonderful.\n" | |
14959 | msgstr "太棒了。\n" | |
14960 | ||
a6cd2cc4 | 14961 | #: builtin/merge.c:933 |
c04f5ac3 JX |
14962 | #, c-format |
14963 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
14964 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
14965 | ||
a6cd2cc4 | 14966 | #: builtin/merge.c:972 |
c04f5ac3 | 14967 | msgid "No current branch." |
90e6ef53 | 14968 | msgstr "没有当前分支。" |
c04f5ac3 | 14969 | |
a6cd2cc4 | 14970 | #: builtin/merge.c:974 |
c04f5ac3 | 14971 | msgid "No remote for the current branch." |
160fb2b2 | 14972 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 14973 | |
a6cd2cc4 | 14974 | #: builtin/merge.c:976 |
c04f5ac3 | 14975 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 14976 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 14977 | |
a6cd2cc4 | 14978 | #: builtin/merge.c:981 |
170e9899 | 14979 | #, c-format |
2e8451e8 JX |
14980 | msgid "No remote-tracking branch for %s from %s" |
14981 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 14982 | |
a6cd2cc4 | 14983 | #: builtin/merge.c:1038 |
5c57d762 JX |
14984 | #, c-format |
14985 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 14986 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 14987 | |
a6cd2cc4 | 14988 | #: builtin/merge.c:1141 |
5c57d762 JX |
14989 | #, c-format |
14990 | msgid "not something we can merge in %s: %s" | |
14991 | msgstr "不能在 %s 中合并:%s" | |
14992 | ||
a6cd2cc4 | 14993 | #: builtin/merge.c:1175 |
5c57d762 JX |
14994 | msgid "not something we can merge" |
14995 | msgstr "不能合并" | |
14996 | ||
a6cd2cc4 | 14997 | #: builtin/merge.c:1278 |
1a79b2f1 JX |
14998 | msgid "--abort expects no arguments" |
14999 | msgstr "--abort 不带参数" | |
15000 | ||
a6cd2cc4 | 15001 | #: builtin/merge.c:1282 |
c04f5ac3 | 15002 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 15003 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 15004 | |
a6cd2cc4 JX |
15005 | #: builtin/merge.c:1291 |
15006 | msgid "--quit expects no arguments" | |
15007 | msgstr "--quit 不带参数" | |
15008 | ||
15009 | #: builtin/merge.c:1304 | |
1a79b2f1 JX |
15010 | msgid "--continue expects no arguments" |
15011 | msgstr "--continue 不带参数" | |
15012 | ||
a6cd2cc4 | 15013 | #: builtin/merge.c:1308 |
1a79b2f1 JX |
15014 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
15015 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
15016 | ||
a6cd2cc4 | 15017 | #: builtin/merge.c:1324 |
c04f5ac3 JX |
15018 | msgid "" |
15019 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 15020 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
15021 | msgstr "" |
15022 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 15023 | "请在合并前先提交您的修改。" |
c04f5ac3 | 15024 | |
a6cd2cc4 | 15025 | #: builtin/merge.c:1331 |
c04f5ac3 JX |
15026 | msgid "" |
15027 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 15028 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
15029 | msgstr "" |
15030 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 15031 | "请在合并前先提交您的修改。" |
c04f5ac3 | 15032 | |
a6cd2cc4 | 15033 | #: builtin/merge.c:1334 |
c04f5ac3 JX |
15034 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
15035 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
15036 | ||
a6cd2cc4 | 15037 | #: builtin/merge.c:1348 |
c04f5ac3 | 15038 | msgid "You cannot combine --squash with --no-ff." |
a6cd2cc4 | 15039 | msgstr "您不能将 --squash 和 --no-ff 组合使用。" |
c04f5ac3 | 15040 | |
a6cd2cc4 JX |
15041 | #: builtin/merge.c:1350 |
15042 | msgid "You cannot combine --squash with --commit." | |
15043 | msgstr "您不能将 --squash 和 --commit 组合使用。" | |
15044 | ||
15045 | #: builtin/merge.c:1366 | |
c04f5ac3 | 15046 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 15047 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 15048 | |
a6cd2cc4 | 15049 | #: builtin/merge.c:1383 |
c04f5ac3 JX |
15050 | msgid "Squash commit into empty head not supported yet" |
15051 | msgstr "尚不支持到空分支的压缩提交" | |
15052 | ||
a6cd2cc4 | 15053 | #: builtin/merge.c:1385 |
c04f5ac3 JX |
15054 | msgid "Non-fast-forward commit does not make sense into an empty head" |
15055 | msgstr "到空分支的非快进式提交没有意义" | |
15056 | ||
a6cd2cc4 | 15057 | #: builtin/merge.c:1390 |
2e8451e8 JX |
15058 | #, c-format |
15059 | msgid "%s - not something we can merge" | |
15060 | msgstr "%s - 不能被合并" | |
15061 | ||
a6cd2cc4 | 15062 | #: builtin/merge.c:1392 |
7aea43ff JX |
15063 | msgid "Can merge only exactly one commit into empty head" |
15064 | msgstr "只能将一个提交合并到空分支上" | |
15065 | ||
a6cd2cc4 | 15066 | #: builtin/merge.c:1471 |
5b04ee3b JX |
15067 | msgid "refusing to merge unrelated histories" |
15068 | msgstr "拒绝合并无关的历史" | |
15069 | ||
a6cd2cc4 | 15070 | #: builtin/merge.c:1480 |
6937cb4e | 15071 | msgid "Already up to date." |
5c57d762 JX |
15072 | msgstr "已经是最新的。" |
15073 | ||
a6cd2cc4 | 15074 | #: builtin/merge.c:1490 |
c04f5ac3 JX |
15075 | #, c-format |
15076 | msgid "Updating %s..%s\n" | |
15077 | msgstr "更新 %s..%s\n" | |
15078 | ||
a6cd2cc4 | 15079 | #: builtin/merge.c:1532 |
c04f5ac3 JX |
15080 | #, c-format |
15081 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 15082 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 15083 | |
a6cd2cc4 | 15084 | #: builtin/merge.c:1539 |
c04f5ac3 JX |
15085 | #, c-format |
15086 | msgid "Nope.\n" | |
15087 | msgstr "无。\n" | |
15088 | ||
a6cd2cc4 | 15089 | #: builtin/merge.c:1564 |
6937cb4e | 15090 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
15091 | msgstr "已经是最新的。耶!" |
15092 | ||
a6cd2cc4 | 15093 | #: builtin/merge.c:1570 |
c04f5ac3 | 15094 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 15095 | msgstr "无法快进,终止。" |
c04f5ac3 | 15096 | |
a6cd2cc4 | 15097 | #: builtin/merge.c:1593 builtin/merge.c:1658 |
c04f5ac3 JX |
15098 | #, c-format |
15099 | msgid "Rewinding the tree to pristine...\n" | |
15100 | msgstr "将树回滚至原始状态...\n" | |
15101 | ||
a6cd2cc4 | 15102 | #: builtin/merge.c:1597 |
c04f5ac3 JX |
15103 | #, c-format |
15104 | msgid "Trying merge strategy %s...\n" | |
15105 | msgstr "尝试合并策略 %s...\n" | |
15106 | ||
a6cd2cc4 | 15107 | #: builtin/merge.c:1649 |
c04f5ac3 JX |
15108 | #, c-format |
15109 | msgid "No merge strategy handled the merge.\n" | |
15110 | msgstr "没有合并策略处理此合并。\n" | |
15111 | ||
a6cd2cc4 | 15112 | #: builtin/merge.c:1651 |
c04f5ac3 JX |
15113 | #, c-format |
15114 | msgid "Merge with strategy %s failed.\n" | |
15115 | msgstr "使用策略 %s 合并失败。\n" | |
15116 | ||
a6cd2cc4 | 15117 | #: builtin/merge.c:1660 |
c04f5ac3 JX |
15118 | #, c-format |
15119 | msgid "Using the %s to prepare resolving by hand.\n" | |
15120 | msgstr "使用 %s 以准备手工解决。\n" | |
15121 | ||
a6cd2cc4 | 15122 | #: builtin/merge.c:1672 |
c04f5ac3 JX |
15123 | #, c-format |
15124 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
15125 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
15126 | ||
4c27fcb5 | 15127 | #: builtin/merge-base.c:32 |
814ff314 JX |
15128 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
15129 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 15130 | |
4c27fcb5 | 15131 | #: builtin/merge-base.c:33 |
814ff314 JX |
15132 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
15133 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 15134 | |
4c27fcb5 | 15135 | #: builtin/merge-base.c:34 |
ef317cd5 | 15136 | msgid "git merge-base --independent <commit>..." |
07432cef | 15137 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 15138 | |
4c27fcb5 | 15139 | #: builtin/merge-base.c:35 |
ef317cd5 | 15140 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 15141 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 15142 | |
4c27fcb5 | 15143 | #: builtin/merge-base.c:36 |
cfff71a9 | 15144 | msgid "git merge-base --fork-point <ref> [<commit>]" |
d9d56b23 | 15145 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 15146 | |
4c27fcb5 | 15147 | #: builtin/merge-base.c:153 |
ef317cd5 | 15148 | msgid "output all common ancestors" |
07432cef | 15149 | msgstr "输出所有共同的祖先" |
ef317cd5 | 15150 | |
4c27fcb5 | 15151 | #: builtin/merge-base.c:155 |
ef317cd5 | 15152 | msgid "find ancestors for a single n-way merge" |
07432cef | 15153 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 15154 | |
4c27fcb5 | 15155 | #: builtin/merge-base.c:157 |
ef317cd5 | 15156 | msgid "list revs not reachable from others" |
07432cef | 15157 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 15158 | |
4c27fcb5 | 15159 | #: builtin/merge-base.c:159 |
ef317cd5 | 15160 | msgid "is the first one ancestor of the other?" |
07432cef | 15161 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 15162 | |
4c27fcb5 | 15163 | #: builtin/merge-base.c:161 |
cfff71a9 | 15164 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 15165 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 15166 | |
a4f16749 | 15167 | #: builtin/merge-file.c:9 |
ef317cd5 | 15168 | msgid "" |
814ff314 JX |
15169 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
15170 | "<orig-file> <file2>" | |
ef317cd5 | 15171 | msgstr "" |
814ff314 JX |
15172 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
15173 | "件> <文件2>" | |
ef317cd5 | 15174 | |
4c27fcb5 | 15175 | #: builtin/merge-file.c:35 |
ef317cd5 | 15176 | msgid "send results to standard output" |
07432cef | 15177 | msgstr "将结果发送到标准输出" |
ef317cd5 | 15178 | |
4c27fcb5 | 15179 | #: builtin/merge-file.c:36 |
ef317cd5 | 15180 | msgid "use a diff3 based merge" |
07432cef | 15181 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 15182 | |
4c27fcb5 | 15183 | #: builtin/merge-file.c:37 |
ef317cd5 | 15184 | msgid "for conflicts, use our version" |
07432cef | 15185 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 15186 | |
4c27fcb5 | 15187 | #: builtin/merge-file.c:39 |
ef317cd5 | 15188 | msgid "for conflicts, use their version" |
07432cef | 15189 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 15190 | |
4c27fcb5 | 15191 | #: builtin/merge-file.c:41 |
ef317cd5 | 15192 | msgid "for conflicts, use a union version" |
07432cef | 15193 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 15194 | |
4c27fcb5 | 15195 | #: builtin/merge-file.c:44 |
ef317cd5 | 15196 | msgid "for conflicts, use this marker size" |
07432cef | 15197 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 15198 | |
4c27fcb5 | 15199 | #: builtin/merge-file.c:45 |
ef317cd5 | 15200 | msgid "do not warn about conflicts" |
07432cef | 15201 | msgstr "不要警告冲突" |
ef317cd5 | 15202 | |
4c27fcb5 | 15203 | #: builtin/merge-file.c:47 |
814ff314 JX |
15204 | msgid "set labels for file1/orig-file/file2" |
15205 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 15206 | |
06991777 | 15207 | #: builtin/merge-recursive.c:46 |
a0b6b246 JX |
15208 | #, c-format |
15209 | msgid "unknown option %s" | |
15210 | msgstr "未知选项 %s" | |
15211 | ||
06991777 | 15212 | #: builtin/merge-recursive.c:52 |
a0b6b246 JX |
15213 | #, c-format |
15214 | msgid "could not parse object '%s'" | |
15215 | msgstr "不能解析对象 '%s'" | |
15216 | ||
06991777 | 15217 | #: builtin/merge-recursive.c:56 |
a0b6b246 JX |
15218 | #, c-format |
15219 | msgid "cannot handle more than %d base. Ignoring %s." | |
15220 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
15221 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
15222 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
15223 | ||
06991777 | 15224 | #: builtin/merge-recursive.c:64 |
a0b6b246 JX |
15225 | msgid "not handling anything other than two heads merge." |
15226 | msgstr "不能处理两个头合并之外的任何操作。" | |
15227 | ||
06991777 | 15228 | #: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 |
a0b6b246 JX |
15229 | #, c-format |
15230 | msgid "could not resolve ref '%s'" | |
15231 | msgstr "无法解析引用 '%s'" | |
15232 | ||
06991777 | 15233 | #: builtin/merge-recursive.c:78 |
a0b6b246 JX |
15234 | #, c-format |
15235 | msgid "Merging %s with %s\n" | |
15236 | msgstr "合并 %s 和 %s\n" | |
15237 | ||
c1ac5258 | 15238 | #: builtin/mktree.c:66 |
ef317cd5 | 15239 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 15240 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 15241 | |
c1ac5258 | 15242 | #: builtin/mktree.c:154 |
ef317cd5 | 15243 | msgid "input is NUL terminated" |
07432cef | 15244 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 15245 | |
06991777 | 15246 | #: builtin/mktree.c:155 builtin/write-tree.c:26 |
ef317cd5 | 15247 | msgid "allow missing objects" |
07432cef | 15248 | msgstr "允许丢失的对象" |
c04f5ac3 | 15249 | |
c1ac5258 | 15250 | #: builtin/mktree.c:156 |
ef317cd5 | 15251 | msgid "allow creation of more than one tree" |
07432cef | 15252 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 15253 | |
d46c5519 | 15254 | #: builtin/multi-pack-index.c:9 |
a6cd2cc4 JX |
15255 | msgid "" |
15256 | "git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" | |
15257 | "batch-size=<size>)" | |
15258 | msgstr "" | |
15259 | "git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --" | |
15260 | "batch-size=<大小>)" | |
4c27fcb5 | 15261 | |
a6cd2cc4 | 15262 | #: builtin/multi-pack-index.c:23 |
4c27fcb5 JX |
15263 | msgid "object directory containing set of packfile and pack-index pairs" |
15264 | msgstr "包含成对包文件和包索引的对象目录" | |
15265 | ||
a6cd2cc4 JX |
15266 | #: builtin/multi-pack-index.c:25 |
15267 | msgid "" | |
15268 | "during repack, collect pack-files of smaller size into a batch that is " | |
15269 | "larger than this size" | |
15270 | msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中" | |
15271 | ||
15272 | #: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 | |
4c27fcb5 JX |
15273 | msgid "too many arguments" |
15274 | msgstr "太多参数" | |
15275 | ||
a6cd2cc4 JX |
15276 | #: builtin/multi-pack-index.c:52 |
15277 | msgid "--batch-size option is only for 'repack' subcommand" | |
15278 | msgstr "--batch-size 选项仅用于 'repack' 子命令" | |
15279 | ||
15280 | #: builtin/multi-pack-index.c:61 | |
4c27fcb5 | 15281 | #, c-format |
a6cd2cc4 JX |
15282 | msgid "unrecognized subcommand: %s" |
15283 | msgstr "未识别的子命令:%s" | |
4c27fcb5 | 15284 | |
06991777 | 15285 | #: builtin/mv.c:18 |
814ff314 JX |
15286 | msgid "git mv [<options>] <source>... <destination>" |
15287 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 15288 | |
06991777 | 15289 | #: builtin/mv.c:83 |
220c313c JX |
15290 | #, c-format |
15291 | msgid "Directory %s is in index and no submodule?" | |
15292 | msgstr "目录 %s 在索引中并且不是子模组?" | |
15293 | ||
06991777 | 15294 | #: builtin/mv.c:85 |
220c313c | 15295 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 15296 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 15297 | |
06991777 | 15298 | #: builtin/mv.c:103 |
220c313c JX |
15299 | #, c-format |
15300 | msgid "%.*s is in index" | |
15301 | msgstr "%.*s 在索引中" | |
15302 | ||
06991777 | 15303 | #: builtin/mv.c:125 |
ef317cd5 | 15304 | msgid "force move/rename even if target exists" |
07432cef | 15305 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 15306 | |
06991777 | 15307 | #: builtin/mv.c:127 |
ef317cd5 | 15308 | msgid "skip move/rename errors" |
07432cef | 15309 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 15310 | |
06991777 | 15311 | #: builtin/mv.c:169 |
220c313c JX |
15312 | #, c-format |
15313 | msgid "destination '%s' is not a directory" | |
15314 | msgstr "目标 '%s' 不是一个目录" | |
15315 | ||
06991777 | 15316 | #: builtin/mv.c:180 |
c04f5ac3 JX |
15317 | #, c-format |
15318 | msgid "Checking rename of '%s' to '%s'\n" | |
15319 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
15320 | ||
06991777 | 15321 | #: builtin/mv.c:184 |
c04f5ac3 JX |
15322 | msgid "bad source" |
15323 | msgstr "坏的源" | |
15324 | ||
06991777 | 15325 | #: builtin/mv.c:187 |
c04f5ac3 JX |
15326 | msgid "can not move directory into itself" |
15327 | msgstr "不能将目录移动到自身" | |
15328 | ||
06991777 | 15329 | #: builtin/mv.c:190 |
c04f5ac3 JX |
15330 | msgid "cannot move directory over file" |
15331 | msgstr "不能将目录移动到文件" | |
15332 | ||
06991777 | 15333 | #: builtin/mv.c:199 |
c04f5ac3 JX |
15334 | msgid "source directory is empty" |
15335 | msgstr "源目录为空" | |
15336 | ||
06991777 | 15337 | #: builtin/mv.c:224 |
c04f5ac3 JX |
15338 | msgid "not under version control" |
15339 | msgstr "不在版本控制之下" | |
15340 | ||
06991777 | 15341 | #: builtin/mv.c:227 |
c04f5ac3 JX |
15342 | msgid "destination exists" |
15343 | msgstr "目标已存在" | |
15344 | ||
06991777 | 15345 | #: builtin/mv.c:235 |
c04f5ac3 JX |
15346 | #, c-format |
15347 | msgid "overwriting '%s'" | |
15348 | msgstr "覆盖 '%s'" | |
15349 | ||
06991777 | 15350 | #: builtin/mv.c:238 |
c04f5ac3 JX |
15351 | msgid "Cannot overwrite" |
15352 | msgstr "不能覆盖" | |
15353 | ||
06991777 | 15354 | #: builtin/mv.c:241 |
c04f5ac3 JX |
15355 | msgid "multiple sources for the same target" |
15356 | msgstr "同一目标具有多个源" | |
15357 | ||
06991777 | 15358 | #: builtin/mv.c:243 |
cfff71a9 JX |
15359 | msgid "destination directory does not exist" |
15360 | msgstr "目标目录不存在" | |
15361 | ||
06991777 | 15362 | #: builtin/mv.c:250 |
c04f5ac3 JX |
15363 | #, c-format |
15364 | msgid "%s, source=%s, destination=%s" | |
15365 | msgstr "%s,源=%s,目标=%s" | |
15366 | ||
06991777 | 15367 | #: builtin/mv.c:271 |
c04f5ac3 JX |
15368 | #, c-format |
15369 | msgid "Renaming %s to %s\n" | |
15370 | msgstr "重命名 %s 至 %s\n" | |
15371 | ||
a6cd2cc4 | 15372 | #: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 |
c04f5ac3 JX |
15373 | #, c-format |
15374 | msgid "renaming '%s' failed" | |
15375 | msgstr "重命名 '%s' 失败" | |
15376 | ||
a6cd2cc4 | 15377 | #: builtin/name-rev.c:352 |
814ff314 JX |
15378 | msgid "git name-rev [<options>] <commit>..." |
15379 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 15380 | |
a6cd2cc4 | 15381 | #: builtin/name-rev.c:353 |
814ff314 JX |
15382 | msgid "git name-rev [<options>] --all" |
15383 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 15384 | |
a6cd2cc4 | 15385 | #: builtin/name-rev.c:354 |
814ff314 JX |
15386 | msgid "git name-rev [<options>] --stdin" |
15387 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 15388 | |
a6cd2cc4 | 15389 | #: builtin/name-rev.c:411 |
ef317cd5 | 15390 | msgid "print only names (no SHA-1)" |
07432cef | 15391 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 15392 | |
a6cd2cc4 | 15393 | #: builtin/name-rev.c:412 |
ef317cd5 | 15394 | msgid "only use tags to name the commits" |
55a16ee4 | 15395 | msgstr "只使用标签来命名提交" |
ef317cd5 | 15396 | |
a6cd2cc4 | 15397 | #: builtin/name-rev.c:414 |
ef317cd5 | 15398 | msgid "only use refs matching <pattern>" |
07432cef | 15399 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 15400 | |
a6cd2cc4 | 15401 | #: builtin/name-rev.c:416 |
87cb7997 JX |
15402 | msgid "ignore refs matching <pattern>" |
15403 | msgstr "忽略和 <模式> 相匹配的引用" | |
15404 | ||
a6cd2cc4 | 15405 | #: builtin/name-rev.c:418 |
ef317cd5 | 15406 | msgid "list all commits reachable from all refs" |
07432cef | 15407 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 15408 | |
a6cd2cc4 | 15409 | #: builtin/name-rev.c:419 |
ef317cd5 | 15410 | msgid "read from stdin" |
07432cef | 15411 | msgstr "从标准输入读取" |
ef317cd5 | 15412 | |
a6cd2cc4 | 15413 | #: builtin/name-rev.c:420 |
90314792 JX |
15414 | msgid "allow to print `undefined` names (default)" |
15415 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 15416 | |
a6cd2cc4 | 15417 | #: builtin/name-rev.c:426 |
2e8451e8 | 15418 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 15419 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 15420 | |
c1ac5258 | 15421 | #: builtin/notes.c:28 |
814ff314 | 15422 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 15423 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 15424 | |
c1ac5258 | 15425 | #: builtin/notes.c:29 |
ef317cd5 | 15426 | msgid "" |
814ff314 | 15427 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 15428 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 15429 | msgstr "" |
04cb2f28 JX |
15430 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
15431 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 15432 | |
c1ac5258 | 15433 | #: builtin/notes.c:30 |
814ff314 | 15434 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 15435 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 15436 | |
c1ac5258 | 15437 | #: builtin/notes.c:31 |
ef317cd5 | 15438 | msgid "" |
814ff314 | 15439 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 15440 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 15441 | msgstr "" |
04cb2f28 JX |
15442 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
15443 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 15444 | |
c1ac5258 | 15445 | #: builtin/notes.c:32 |
814ff314 | 15446 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 15447 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 15448 | |
c1ac5258 | 15449 | #: builtin/notes.c:33 |
814ff314 | 15450 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 15451 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 15452 | |
c1ac5258 | 15453 | #: builtin/notes.c:34 |
ef317cd5 | 15454 | msgid "" |
814ff314 | 15455 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 15456 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 15457 | |
c1ac5258 | 15458 | #: builtin/notes.c:35 |
ef317cd5 | 15459 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 15460 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 15461 | |
c1ac5258 | 15462 | #: builtin/notes.c:36 |
ef317cd5 | 15463 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 15464 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 15465 | |
c1ac5258 | 15466 | #: builtin/notes.c:37 |
814ff314 | 15467 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 15468 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 15469 | |
c1ac5258 | 15470 | #: builtin/notes.c:38 |
5809aa05 JX |
15471 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
15472 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 15473 | |
c1ac5258 | 15474 | #: builtin/notes.c:39 |
814ff314 | 15475 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 15476 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 15477 | |
c1ac5258 | 15478 | #: builtin/notes.c:44 |
ef317cd5 | 15479 | msgid "git notes [list [<object>]]" |
07432cef | 15480 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 15481 | |
c1ac5258 | 15482 | #: builtin/notes.c:49 |
ef317cd5 | 15483 | msgid "git notes add [<options>] [<object>]" |
07432cef | 15484 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 15485 | |
c1ac5258 | 15486 | #: builtin/notes.c:54 |
ef317cd5 | 15487 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 15488 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 15489 | |
c1ac5258 | 15490 | #: builtin/notes.c:55 |
ef317cd5 | 15491 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 15492 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 15493 | |
c1ac5258 | 15494 | #: builtin/notes.c:60 |
ef317cd5 | 15495 | msgid "git notes append [<options>] [<object>]" |
07432cef | 15496 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 15497 | |
c1ac5258 | 15498 | #: builtin/notes.c:65 |
ef317cd5 | 15499 | msgid "git notes edit [<object>]" |
07432cef | 15500 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 15501 | |
c1ac5258 | 15502 | #: builtin/notes.c:70 |
ef317cd5 | 15503 | msgid "git notes show [<object>]" |
07432cef | 15504 | msgstr "git notes show [<对象>]" |
ef317cd5 | 15505 | |
c1ac5258 | 15506 | #: builtin/notes.c:75 |
814ff314 | 15507 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 15508 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 15509 | |
c1ac5258 | 15510 | #: builtin/notes.c:76 |
ef317cd5 | 15511 | msgid "git notes merge --commit [<options>]" |
07432cef | 15512 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 15513 | |
c1ac5258 | 15514 | #: builtin/notes.c:77 |
ef317cd5 | 15515 | msgid "git notes merge --abort [<options>]" |
07432cef | 15516 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 15517 | |
c1ac5258 | 15518 | #: builtin/notes.c:82 |
ef317cd5 | 15519 | msgid "git notes remove [<object>]" |
07432cef | 15520 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 15521 | |
c1ac5258 | 15522 | #: builtin/notes.c:87 |
ef317cd5 | 15523 | msgid "git notes prune [<options>]" |
07432cef | 15524 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 15525 | |
c1ac5258 | 15526 | #: builtin/notes.c:92 |
ef317cd5 | 15527 | msgid "git notes get-ref" |
07432cef | 15528 | msgstr "git notes get-ref" |
ef317cd5 | 15529 | |
c1ac5258 | 15530 | #: builtin/notes.c:97 |
5c57d762 JX |
15531 | msgid "Write/edit the notes for the following object:" |
15532 | msgstr "为下面的对象写/编辑说明:" | |
15533 | ||
c1ac5258 | 15534 | #: builtin/notes.c:150 |
c04f5ac3 JX |
15535 | #, c-format |
15536 | msgid "unable to start 'show' for object '%s'" | |
15537 | msgstr "不能为对象 '%s' 开始 'show'" | |
15538 | ||
c1ac5258 | 15539 | #: builtin/notes.c:154 |
a77c07d9 JX |
15540 | msgid "could not read 'show' output" |
15541 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 15542 | |
c1ac5258 | 15543 | #: builtin/notes.c:162 |
c04f5ac3 JX |
15544 | #, c-format |
15545 | msgid "failed to finish 'show' for object '%s'" | |
15546 | msgstr "无法为对象 '%s' 完成 'show'" | |
15547 | ||
c1ac5258 | 15548 | #: builtin/notes.c:197 |
a0b6b246 | 15549 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
15550 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
15551 | ||
c1ac5258 | 15552 | #: builtin/notes.c:206 |
c04f5ac3 JX |
15553 | msgid "unable to write note object" |
15554 | msgstr "不能写注解对象" | |
15555 | ||
c1ac5258 | 15556 | #: builtin/notes.c:208 |
c04f5ac3 | 15557 | #, c-format |
a0b6b246 | 15558 | msgid "the note contents have been left in %s" |
220c313c | 15559 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 15560 | |
a6cd2cc4 | 15561 | #: builtin/notes.c:242 builtin/tag.c:532 |
c04f5ac3 JX |
15562 | #, c-format |
15563 | msgid "could not open or read '%s'" | |
15564 | msgstr "不能打开或读取 '%s'" | |
15565 | ||
4c27fcb5 | 15566 | #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 |
06991777 JX |
15567 | #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 |
15568 | #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 | |
a0b6b246 JX |
15569 | #, c-format |
15570 | msgid "failed to resolve '%s' as a valid ref." | |
15571 | msgstr "无法解析 '%s' 为一个有效引用。" | |
15572 | ||
4c27fcb5 | 15573 | #: builtin/notes.c:265 |
c04f5ac3 | 15574 | #, c-format |
a0b6b246 | 15575 | msgid "failed to read object '%s'." |
c1ac5258 | 15576 | msgstr "读取对象 '%s' 失败。" |
c04f5ac3 | 15577 | |
4c27fcb5 | 15578 | #: builtin/notes.c:268 |
6c94aba5 | 15579 | #, c-format |
a0b6b246 JX |
15580 | msgid "cannot read note data from non-blob object '%s'." |
15581 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
15582 | ||
4c27fcb5 | 15583 | #: builtin/notes.c:309 |
a0b6b246 JX |
15584 | #, c-format |
15585 | msgid "malformed input line: '%s'." | |
fd8cb379 | 15586 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 15587 | |
4c27fcb5 | 15588 | #: builtin/notes.c:324 |
a0b6b246 JX |
15589 | #, c-format |
15590 | msgid "failed to copy notes from '%s' to '%s'" | |
15591 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 15592 | |
a4f16749 JX |
15593 | #. TRANSLATORS: the first %s will be replaced by a git |
15594 | #. notes command: 'add', 'merge', 'remove', etc. | |
15595 | #. | |
4c27fcb5 | 15596 | #: builtin/notes.c:356 |
a0b6b246 JX |
15597 | #, c-format |
15598 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
15599 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
15600 | ||
06991777 JX |
15601 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 |
15602 | #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 | |
15603 | #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 | |
c04f5ac3 JX |
15604 | msgid "too many parameters" |
15605 | msgstr "参数太多" | |
15606 | ||
06991777 | 15607 | #: builtin/notes.c:389 builtin/notes.c:678 |
c04f5ac3 | 15608 | #, c-format |
a0b6b246 | 15609 | msgid "no note found for object %s." |
c04f5ac3 JX |
15610 | msgstr "未发现对象 %s 的注解。" |
15611 | ||
06991777 | 15612 | #: builtin/notes.c:410 builtin/notes.c:576 |
ef317cd5 | 15613 | msgid "note contents as a string" |
07432cef | 15614 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 15615 | |
06991777 | 15616 | #: builtin/notes.c:413 builtin/notes.c:579 |
ef317cd5 | 15617 | msgid "note contents in a file" |
07432cef | 15618 | msgstr "注解内容到一个文件中" |
ef317cd5 | 15619 | |
06991777 | 15620 | #: builtin/notes.c:416 builtin/notes.c:582 |
ef317cd5 | 15621 | msgid "reuse and edit specified note object" |
07432cef | 15622 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 15623 | |
06991777 | 15624 | #: builtin/notes.c:419 builtin/notes.c:585 |
ef317cd5 | 15625 | msgid "reuse specified note object" |
07432cef | 15626 | msgstr "重用指定的注解对象" |
ef317cd5 | 15627 | |
06991777 | 15628 | #: builtin/notes.c:422 builtin/notes.c:588 |
04cb2f28 JX |
15629 | msgid "allow storing empty note" |
15630 | msgstr "允许保存空白注释" | |
15631 | ||
06991777 | 15632 | #: builtin/notes.c:423 builtin/notes.c:496 |
ef317cd5 | 15633 | msgid "replace existing notes" |
07432cef | 15634 | msgstr "替换已存在的注解" |
ef317cd5 | 15635 | |
4c27fcb5 | 15636 | #: builtin/notes.c:448 |
c04f5ac3 JX |
15637 | #, c-format |
15638 | msgid "" | |
15639 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
15640 | "existing notes" | |
15641 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
15642 | ||
06991777 | 15643 | #: builtin/notes.c:463 builtin/notes.c:544 |
c04f5ac3 JX |
15644 | #, c-format |
15645 | msgid "Overwriting existing notes for object %s\n" | |
15646 | msgstr "覆盖对象 %s 现存注解\n" | |
15647 | ||
06991777 | 15648 | #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 |
04cb2f28 JX |
15649 | #, c-format |
15650 | msgid "Removing note for object %s\n" | |
15651 | msgstr "删除对象 %s 的注解\n" | |
15652 | ||
06991777 | 15653 | #: builtin/notes.c:497 |
ef317cd5 | 15654 | msgid "read objects from stdin" |
07432cef | 15655 | msgstr "从标准输入读取对象" |
ef317cd5 | 15656 | |
06991777 | 15657 | #: builtin/notes.c:499 |
ef317cd5 | 15658 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 15659 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 15660 | |
06991777 | 15661 | #: builtin/notes.c:517 |
c04f5ac3 JX |
15662 | msgid "too few parameters" |
15663 | msgstr "参数太少" | |
15664 | ||
06991777 | 15665 | #: builtin/notes.c:538 |
c04f5ac3 JX |
15666 | #, c-format |
15667 | msgid "" | |
15668 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
15669 | "existing notes" | |
15670 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
15671 | ||
06991777 | 15672 | #: builtin/notes.c:550 |
c04f5ac3 | 15673 | #, c-format |
a0b6b246 | 15674 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
15675 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
15676 | ||
06991777 | 15677 | #: builtin/notes.c:603 |
ef317cd5 JX |
15678 | #, c-format |
15679 | msgid "" | |
15680 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
15681 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
15682 | msgstr "" | |
15683 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
15684 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
15685 | ||
06991777 | 15686 | #: builtin/notes.c:698 |
a0b6b246 | 15687 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 15688 | msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 15689 | |
06991777 | 15690 | #: builtin/notes.c:700 |
a0b6b246 | 15691 | msgid "failed to delete ref NOTES_MERGE_REF" |
c1ac5258 | 15692 | msgstr "删除引用 NOTES_MERGE_REF 失败" |
a0b6b246 | 15693 | |
06991777 | 15694 | #: builtin/notes.c:702 |
a0b6b246 | 15695 | msgid "failed to remove 'git notes merge' worktree" |
c1ac5258 | 15696 | msgstr "删除 'git notes merge' 工作区失败" |
a0b6b246 | 15697 | |
06991777 | 15698 | #: builtin/notes.c:722 |
a0b6b246 | 15699 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 15700 | msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 15701 | |
06991777 | 15702 | #: builtin/notes.c:724 |
a0b6b246 JX |
15703 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
15704 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
15705 | ||
06991777 | 15706 | #: builtin/notes.c:726 |
a0b6b246 JX |
15707 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
15708 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
15709 | ||
06991777 | 15710 | #: builtin/notes.c:739 |
a0b6b246 | 15711 | msgid "failed to resolve NOTES_MERGE_REF" |
c1ac5258 | 15712 | msgstr "解析 NOTES_MERGE_REF 失败" |
a0b6b246 | 15713 | |
06991777 | 15714 | #: builtin/notes.c:742 |
a0b6b246 JX |
15715 | msgid "failed to finalize notes merge" |
15716 | msgstr "无法完成注解合并" | |
15717 | ||
06991777 | 15718 | #: builtin/notes.c:768 |
5c57d762 JX |
15719 | #, c-format |
15720 | msgid "unknown notes merge strategy %s" | |
15721 | msgstr "未知的注解合并策略 %s" | |
15722 | ||
06991777 | 15723 | #: builtin/notes.c:784 |
ef317cd5 | 15724 | msgid "General options" |
07432cef | 15725 | msgstr "通用选项" |
ef317cd5 | 15726 | |
06991777 | 15727 | #: builtin/notes.c:786 |
ef317cd5 | 15728 | msgid "Merge options" |
07432cef | 15729 | msgstr "合并选项" |
ef317cd5 | 15730 | |
06991777 | 15731 | #: builtin/notes.c:788 |
ef317cd5 JX |
15732 | msgid "" |
15733 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
15734 | "cat_sort_uniq)" | |
07432cef | 15735 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 15736 | |
06991777 | 15737 | #: builtin/notes.c:790 |
ef317cd5 | 15738 | msgid "Committing unmerged notes" |
07432cef | 15739 | msgstr "提交未合并的注解" |
ef317cd5 | 15740 | |
06991777 | 15741 | #: builtin/notes.c:792 |
ef317cd5 | 15742 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 15743 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 15744 | |
06991777 | 15745 | #: builtin/notes.c:794 |
ef317cd5 | 15746 | msgid "Aborting notes merge resolution" |
07432cef | 15747 | msgstr "中止注解合并的方案" |
ef317cd5 | 15748 | |
06991777 | 15749 | #: builtin/notes.c:796 |
ef317cd5 | 15750 | msgid "abort notes merge" |
07432cef | 15751 | msgstr "中止注解合并" |
ef317cd5 | 15752 | |
06991777 | 15753 | #: builtin/notes.c:807 |
5c57d762 JX |
15754 | msgid "cannot mix --commit, --abort or -s/--strategy" |
15755 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
15756 | ||
06991777 | 15757 | #: builtin/notes.c:812 |
a0b6b246 | 15758 | msgid "must specify a notes ref to merge" |
9a4b694c | 15759 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 15760 | |
06991777 | 15761 | #: builtin/notes.c:836 |
5c57d762 | 15762 | #, c-format |
a0b6b246 | 15763 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
15764 | msgstr "未知的 -s/--strategy:%s" |
15765 | ||
06991777 | 15766 | #: builtin/notes.c:873 |
1b7f4a34 | 15767 | #, c-format |
a0b6b246 JX |
15768 | msgid "a notes merge into %s is already in-progress at %s" |
15769 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 15770 | |
06991777 | 15771 | #: builtin/notes.c:876 |
5c57d762 | 15772 | #, c-format |
a0b6b246 JX |
15773 | msgid "failed to store link to current notes ref (%s)" |
15774 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 15775 | |
06991777 | 15776 | #: builtin/notes.c:878 |
5c57d762 JX |
15777 | #, c-format |
15778 | msgid "" | |
15779 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
15780 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
15781 | "abort'.\n" | |
a0b6b246 JX |
15782 | msgstr "" |
15783 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
15784 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 15785 | |
a6cd2cc4 | 15786 | #: builtin/notes.c:897 builtin/tag.c:545 |
d46c5519 JX |
15787 | #, c-format |
15788 | msgid "Failed to resolve '%s' as a valid ref." | |
15789 | msgstr "无法解析 '%s' 为一个有效引用。" | |
15790 | ||
06991777 | 15791 | #: builtin/notes.c:900 |
ef317cd5 JX |
15792 | #, c-format |
15793 | msgid "Object %s has no note\n" | |
15794 | msgstr "对象 %s 没有注解\n" | |
15795 | ||
06991777 | 15796 | #: builtin/notes.c:912 |
ef317cd5 | 15797 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 15798 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 15799 | |
06991777 | 15800 | #: builtin/notes.c:915 |
ef317cd5 | 15801 | msgid "read object names from the standard input" |
07432cef | 15802 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 15803 | |
d46c5519 | 15804 | #: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 |
5c57d762 JX |
15805 | msgid "do not remove, show only" |
15806 | msgstr "不删除,只显示" | |
15807 | ||
06991777 | 15808 | #: builtin/notes.c:955 |
5c57d762 JX |
15809 | msgid "report pruned notes" |
15810 | msgstr "报告清除的注解" | |
15811 | ||
06991777 | 15812 | #: builtin/notes.c:998 |
6c94aba5 | 15813 | msgid "notes-ref" |
07432cef | 15814 | msgstr "注解引用" |
ef317cd5 | 15815 | |
06991777 | 15816 | #: builtin/notes.c:999 |
814ff314 | 15817 | msgid "use notes from <notes-ref>" |
07432cef | 15818 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 15819 | |
a6cd2cc4 | 15820 | #: builtin/notes.c:1034 builtin/stash.c:1598 |
ef317cd5 | 15821 | #, c-format |
a0b6b246 | 15822 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
15823 | msgstr "未知子命令:%s" |
15824 | ||
d46c5519 | 15825 | #: builtin/pack-objects.c:52 |
1b7f4a34 JX |
15826 | msgid "" |
15827 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
15828 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 15829 | |
d46c5519 | 15830 | #: builtin/pack-objects.c:53 |
1b7f4a34 JX |
15831 | msgid "" |
15832 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 15833 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 15834 | |
a6cd2cc4 | 15835 | #: builtin/pack-objects.c:428 |
ef317cd5 | 15836 | #, c-format |
c1ac5258 JX |
15837 | msgid "bad packed object CRC for %s" |
15838 | msgstr "%s 错的包对象 CRC" | |
15839 | ||
a6cd2cc4 | 15840 | #: builtin/pack-objects.c:439 |
c1ac5258 JX |
15841 | #, c-format |
15842 | msgid "corrupt packed object for %s" | |
15843 | msgstr "%s 损坏的包对象" | |
15844 | ||
a6cd2cc4 | 15845 | #: builtin/pack-objects.c:570 |
c1ac5258 JX |
15846 | #, c-format |
15847 | msgid "recursive delta detected for object %s" | |
15848 | msgstr "发现对象 %s 递归 delta" | |
15849 | ||
a6cd2cc4 | 15850 | #: builtin/pack-objects.c:781 |
c1ac5258 JX |
15851 | #, c-format |
15852 | msgid "ordered %u objects, expected %<PRIu32>" | |
15853 | msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" | |
15854 | ||
a6cd2cc4 | 15855 | #: builtin/pack-objects.c:794 |
c1ac5258 JX |
15856 | #, c-format |
15857 | msgid "packfile is invalid: %s" | |
15858 | msgstr "无效的包文件:%s" | |
15859 | ||
a6cd2cc4 | 15860 | #: builtin/pack-objects.c:798 |
c1ac5258 JX |
15861 | #, c-format |
15862 | msgid "unable to open packfile for reuse: %s" | |
15863 | msgstr "无法为重用打开包文件:%s" | |
15864 | ||
a6cd2cc4 | 15865 | #: builtin/pack-objects.c:802 |
c1ac5258 JX |
15866 | msgid "unable to seek in reused packfile" |
15867 | msgstr "无法在重用的包文件中查找" | |
ef317cd5 | 15868 | |
a6cd2cc4 | 15869 | #: builtin/pack-objects.c:813 |
c1ac5258 JX |
15870 | msgid "unable to read from reused packfile" |
15871 | msgstr "无法读取索引文件" | |
15872 | ||
a6cd2cc4 | 15873 | #: builtin/pack-objects.c:841 |
5b04ee3b JX |
15874 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
15875 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
15876 | ||
a6cd2cc4 | 15877 | #: builtin/pack-objects.c:854 |
6c94aba5 JX |
15878 | msgid "Writing objects" |
15879 | msgstr "写入对象中" | |
15880 | ||
a6cd2cc4 | 15881 | #: builtin/pack-objects.c:917 builtin/update-index.c:89 |
c1ac5258 JX |
15882 | #, c-format |
15883 | msgid "failed to stat %s" | |
15884 | msgstr "对 %s 调用 stat 失败" | |
15885 | ||
a6cd2cc4 | 15886 | #: builtin/pack-objects.c:970 |
c1ac5258 JX |
15887 | #, c-format |
15888 | msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" | |
15889 | msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" | |
15890 | ||
a6cd2cc4 | 15891 | #: builtin/pack-objects.c:1166 |
6c94aba5 JX |
15892 | msgid "disabling bitmap writing, as some objects are not being packed" |
15893 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
15894 | ||
a6cd2cc4 | 15895 | #: builtin/pack-objects.c:1597 |
c1ac5258 JX |
15896 | #, c-format |
15897 | msgid "delta base offset overflow in pack for %s" | |
15898 | msgstr "%s 压缩中 delta 基准偏移越界" | |
15899 | ||
a6cd2cc4 | 15900 | #: builtin/pack-objects.c:1606 |
c1ac5258 JX |
15901 | #, c-format |
15902 | msgid "delta base offset out of bound for %s" | |
15903 | msgstr "%s 的 delta 基准偏移越界" | |
15904 | ||
a6cd2cc4 | 15905 | #: builtin/pack-objects.c:1875 |
fd8cb379 JX |
15906 | msgid "Counting objects" |
15907 | msgstr "对象计数中" | |
15908 | ||
a6cd2cc4 | 15909 | #: builtin/pack-objects.c:2005 |
fd8cb379 JX |
15910 | #, c-format |
15911 | msgid "unable to get size of %s" | |
15912 | msgstr "不能得到 %s 的大小" | |
15913 | ||
a6cd2cc4 | 15914 | #: builtin/pack-objects.c:2020 |
fd8cb379 JX |
15915 | #, c-format |
15916 | msgid "unable to parse object header of %s" | |
15917 | msgstr "无法解析对象 %s 头信息" | |
15918 | ||
a6cd2cc4 JX |
15919 | #: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 |
15920 | #: builtin/pack-objects.c:2116 | |
c1ac5258 JX |
15921 | #, c-format |
15922 | msgid "object %s cannot be read" | |
15923 | msgstr "对象 %s 无法读取" | |
15924 | ||
a6cd2cc4 | 15925 | #: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 |
c1ac5258 | 15926 | #, c-format |
4c27fcb5 JX |
15927 | msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" |
15928 | msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)" | |
c1ac5258 | 15929 | |
a6cd2cc4 | 15930 | #: builtin/pack-objects.c:2130 |
c1ac5258 JX |
15931 | msgid "suboptimal pack - out of memory" |
15932 | msgstr "次优(suboptimal)打包 - 内存不足" | |
15933 | ||
a6cd2cc4 | 15934 | #: builtin/pack-objects.c:2456 |
c1ac5258 JX |
15935 | #, c-format |
15936 | msgid "Delta compression using up to %d threads" | |
15937 | msgstr "使用 %d 个线程进行压缩" | |
15938 | ||
a6cd2cc4 | 15939 | #: builtin/pack-objects.c:2588 |
c1ac5258 JX |
15940 | #, c-format |
15941 | msgid "unable to pack objects reachable from tag %s" | |
15942 | msgstr "无法为标签 %s 压缩对象" | |
15943 | ||
a6cd2cc4 | 15944 | #: builtin/pack-objects.c:2675 |
6c94aba5 JX |
15945 | msgid "Compressing objects" |
15946 | msgstr "压缩对象中" | |
15947 | ||
a6cd2cc4 | 15948 | #: builtin/pack-objects.c:2681 |
c1ac5258 JX |
15949 | msgid "inconsistency with delta count" |
15950 | msgstr "不一致的差异计数" | |
15951 | ||
a6cd2cc4 | 15952 | #: builtin/pack-objects.c:2762 |
c1ac5258 JX |
15953 | #, c-format |
15954 | msgid "" | |
15955 | "expected edge object ID, got garbage:\n" | |
15956 | " %s" | |
15957 | msgstr "" | |
15958 | "预期边界对象(edge object)ID,却得到垃圾数据:\n" | |
15959 | " %s" | |
15960 | ||
a6cd2cc4 | 15961 | #: builtin/pack-objects.c:2768 |
c1ac5258 JX |
15962 | #, c-format |
15963 | msgid "" | |
15964 | "expected object ID, got garbage:\n" | |
15965 | " %s" | |
15966 | msgstr "" | |
15967 | "预期对象 ID,却得到垃圾数据:\n" | |
15968 | " %s" | |
15969 | ||
a6cd2cc4 | 15970 | #: builtin/pack-objects.c:2866 |
5809aa05 JX |
15971 | msgid "invalid value for --missing" |
15972 | msgstr "选项 --missing 的值无效" | |
15973 | ||
a6cd2cc4 | 15974 | #: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 |
c1ac5258 JX |
15975 | msgid "cannot open pack index" |
15976 | msgstr "无法打开包文件索引" | |
15977 | ||
a6cd2cc4 | 15978 | #: builtin/pack-objects.c:2956 |
c1ac5258 JX |
15979 | #, c-format |
15980 | msgid "loose object at %s could not be examined" | |
15981 | msgstr "无法检查 %s 处的松散对象" | |
15982 | ||
a6cd2cc4 | 15983 | #: builtin/pack-objects.c:3041 |
c1ac5258 JX |
15984 | msgid "unable to force loose object" |
15985 | msgstr "无法强制松散对象" | |
15986 | ||
a6cd2cc4 | 15987 | #: builtin/pack-objects.c:3133 |
c1ac5258 JX |
15988 | #, c-format |
15989 | msgid "not a rev '%s'" | |
15990 | msgstr "不是一个版本 '%s'" | |
15991 | ||
a6cd2cc4 | 15992 | #: builtin/pack-objects.c:3136 |
c1ac5258 JX |
15993 | #, c-format |
15994 | msgid "bad revision '%s'" | |
15995 | msgstr "坏的版本 '%s'" | |
15996 | ||
a6cd2cc4 | 15997 | #: builtin/pack-objects.c:3161 |
c1ac5258 JX |
15998 | msgid "unable to add recent objects" |
15999 | msgstr "无法添加最近的对象" | |
16000 | ||
a6cd2cc4 | 16001 | #: builtin/pack-objects.c:3214 |
ef317cd5 JX |
16002 | #, c-format |
16003 | msgid "unsupported index version %s" | |
16004 | msgstr "不支持的索引版本 %s" | |
16005 | ||
a6cd2cc4 | 16006 | #: builtin/pack-objects.c:3218 |
ef317cd5 JX |
16007 | #, c-format |
16008 | msgid "bad index version '%s'" | |
16009 | msgstr "坏的索引版本 '%s'" | |
16010 | ||
a6cd2cc4 | 16011 | #: builtin/pack-objects.c:3248 |
ef317cd5 | 16012 | msgid "do not show progress meter" |
07432cef | 16013 | msgstr "不显示进度表" |
ef317cd5 | 16014 | |
a6cd2cc4 | 16015 | #: builtin/pack-objects.c:3250 |
ef317cd5 | 16016 | msgid "show progress meter" |
07432cef | 16017 | msgstr "显示进度表" |
ef317cd5 | 16018 | |
a6cd2cc4 | 16019 | #: builtin/pack-objects.c:3252 |
ef317cd5 | 16020 | msgid "show progress meter during object writing phase" |
07432cef | 16021 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 16022 | |
a6cd2cc4 | 16023 | #: builtin/pack-objects.c:3255 |
ef317cd5 | 16024 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 16025 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 16026 | |
a6cd2cc4 | 16027 | #: builtin/pack-objects.c:3256 |
c1ac5258 JX |
16028 | msgid "<version>[,<offset>]" |
16029 | msgstr "<版本>[,<偏移>]" | |
ef317cd5 | 16030 | |
a6cd2cc4 | 16031 | #: builtin/pack-objects.c:3257 |
ef317cd5 | 16032 | msgid "write the pack index file in the specified idx format version" |
07432cef | 16033 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 16034 | |
a6cd2cc4 | 16035 | #: builtin/pack-objects.c:3260 |
ef317cd5 | 16036 | msgid "maximum size of each output pack file" |
07432cef | 16037 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 16038 | |
a6cd2cc4 | 16039 | #: builtin/pack-objects.c:3262 |
ef317cd5 | 16040 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 16041 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 16042 | |
a6cd2cc4 | 16043 | #: builtin/pack-objects.c:3264 |
ef317cd5 | 16044 | msgid "ignore packed objects" |
07432cef | 16045 | msgstr "忽略包对象" |
ef317cd5 | 16046 | |
a6cd2cc4 | 16047 | #: builtin/pack-objects.c:3266 |
ef317cd5 | 16048 | msgid "limit pack window by objects" |
07432cef | 16049 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 16050 | |
a6cd2cc4 | 16051 | #: builtin/pack-objects.c:3268 |
ef317cd5 | 16052 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 16053 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 16054 | |
a6cd2cc4 | 16055 | #: builtin/pack-objects.c:3270 |
ef317cd5 | 16056 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 16057 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 16058 | |
a6cd2cc4 | 16059 | #: builtin/pack-objects.c:3272 |
ef317cd5 | 16060 | msgid "reuse existing deltas" |
07432cef | 16061 | msgstr "重用已存在的 deltas" |
ef317cd5 | 16062 | |
a6cd2cc4 | 16063 | #: builtin/pack-objects.c:3274 |
ef317cd5 | 16064 | msgid "reuse existing objects" |
07432cef | 16065 | msgstr "重用已存在的对象" |
ef317cd5 | 16066 | |
a6cd2cc4 | 16067 | #: builtin/pack-objects.c:3276 |
ef317cd5 | 16068 | msgid "use OFS_DELTA objects" |
07432cef | 16069 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 16070 | |
a6cd2cc4 | 16071 | #: builtin/pack-objects.c:3278 |
ef317cd5 | 16072 | msgid "use threads when searching for best delta matches" |
07432cef | 16073 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 16074 | |
a6cd2cc4 | 16075 | #: builtin/pack-objects.c:3280 |
ef317cd5 | 16076 | msgid "do not create an empty pack output" |
07432cef | 16077 | msgstr "不创建空的包输出" |
ef317cd5 | 16078 | |
a6cd2cc4 | 16079 | #: builtin/pack-objects.c:3282 |
ef317cd5 | 16080 | msgid "read revision arguments from standard input" |
d9d56b23 | 16081 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 16082 | |
a6cd2cc4 | 16083 | #: builtin/pack-objects.c:3284 |
ef317cd5 | 16084 | msgid "limit the objects to those that are not yet packed" |
07432cef | 16085 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 16086 | |
a6cd2cc4 | 16087 | #: builtin/pack-objects.c:3287 |
ef317cd5 | 16088 | msgid "include objects reachable from any reference" |
07432cef | 16089 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 16090 | |
a6cd2cc4 | 16091 | #: builtin/pack-objects.c:3290 |
ef317cd5 | 16092 | msgid "include objects referred by reflog entries" |
07432cef | 16093 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 16094 | |
a6cd2cc4 | 16095 | #: builtin/pack-objects.c:3293 |
220c313c JX |
16096 | msgid "include objects referred to by the index" |
16097 | msgstr "包括被索引引用到的对象" | |
16098 | ||
a6cd2cc4 | 16099 | #: builtin/pack-objects.c:3296 |
ef317cd5 | 16100 | msgid "output pack to stdout" |
07432cef | 16101 | msgstr "输出包到标准输出" |
ef317cd5 | 16102 | |
a6cd2cc4 | 16103 | #: builtin/pack-objects.c:3298 |
ef317cd5 | 16104 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 16105 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 16106 | |
a6cd2cc4 | 16107 | #: builtin/pack-objects.c:3300 |
ef317cd5 | 16108 | msgid "keep unreachable objects" |
07432cef | 16109 | msgstr "维持不可达的对象" |
ef317cd5 | 16110 | |
a6cd2cc4 | 16111 | #: builtin/pack-objects.c:3302 |
5c57d762 JX |
16112 | msgid "pack loose unreachable objects" |
16113 | msgstr "打包松散的不可达对象" | |
16114 | ||
a6cd2cc4 | 16115 | #: builtin/pack-objects.c:3304 |
ef317cd5 | 16116 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 16117 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 16118 | |
a6cd2cc4 | 16119 | #: builtin/pack-objects.c:3307 |
06991777 JX |
16120 | msgid "use the sparse reachability algorithm" |
16121 | msgstr "使用稀疏可达性算法" | |
16122 | ||
a6cd2cc4 | 16123 | #: builtin/pack-objects.c:3309 |
ef317cd5 | 16124 | msgid "create thin packs" |
07432cef | 16125 | msgstr "创建精简包" |
ef317cd5 | 16126 | |
a6cd2cc4 | 16127 | #: builtin/pack-objects.c:3311 |
04cb2f28 | 16128 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 16129 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 16130 | |
a6cd2cc4 | 16131 | #: builtin/pack-objects.c:3313 |
ef317cd5 | 16132 | msgid "ignore packs that have companion .keep file" |
07432cef | 16133 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 16134 | |
a6cd2cc4 | 16135 | #: builtin/pack-objects.c:3315 |
fd8cb379 JX |
16136 | msgid "ignore this pack" |
16137 | msgstr "忽略该 pack" | |
16138 | ||
a6cd2cc4 | 16139 | #: builtin/pack-objects.c:3317 |
ef317cd5 | 16140 | msgid "pack compression level" |
07432cef | 16141 | msgstr "打包压缩级别" |
ef317cd5 | 16142 | |
a6cd2cc4 | 16143 | #: builtin/pack-objects.c:3319 |
ef317cd5 | 16144 | msgid "do not hide commits by grafts" |
fd8cb379 | 16145 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 16146 | |
a6cd2cc4 | 16147 | #: builtin/pack-objects.c:3321 |
6c94aba5 JX |
16148 | msgid "use a bitmap index if available to speed up counting objects" |
16149 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
16150 | ||
a6cd2cc4 | 16151 | #: builtin/pack-objects.c:3323 |
6c94aba5 JX |
16152 | msgid "write a bitmap index together with the pack index" |
16153 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
16154 | ||
a6cd2cc4 JX |
16155 | #: builtin/pack-objects.c:3327 |
16156 | msgid "write a bitmap index if possible" | |
16157 | msgstr "如果可能,写 bitmap 索引" | |
16158 | ||
16159 | #: builtin/pack-objects.c:3331 | |
5809aa05 JX |
16160 | msgid "handling for missing objects" |
16161 | msgstr "处理丢失的对象" | |
16162 | ||
a6cd2cc4 | 16163 | #: builtin/pack-objects.c:3334 |
31e5e17b JX |
16164 | msgid "do not pack objects in promisor packfiles" |
16165 | msgstr "不要打包 promisor 包文件中的对象" | |
16166 | ||
a6cd2cc4 | 16167 | #: builtin/pack-objects.c:3336 |
4c27fcb5 JX |
16168 | msgid "respect islands during delta compression" |
16169 | msgstr "在增量压缩时参考数据岛" | |
16170 | ||
a6cd2cc4 | 16171 | #: builtin/pack-objects.c:3361 |
fd8cb379 JX |
16172 | #, c-format |
16173 | msgid "delta chain depth %d is too deep, forcing %d" | |
16174 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
16175 | ||
a6cd2cc4 | 16176 | #: builtin/pack-objects.c:3366 |
fd8cb379 JX |
16177 | #, c-format |
16178 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
16179 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 16180 | |
a6cd2cc4 | 16181 | #: builtin/pack-objects.c:3420 |
c1ac5258 JX |
16182 | msgid "--max-pack-size cannot be used to build a pack for transfer" |
16183 | msgstr "不能使用 --max-pack-size 来构建传输用的包文件" | |
16184 | ||
a6cd2cc4 | 16185 | #: builtin/pack-objects.c:3422 |
c1ac5258 | 16186 | msgid "minimum pack size limit is 1 MiB" |
e640d114 | 16187 | msgstr "最小的包文件大小是 1 MiB" |
c1ac5258 | 16188 | |
a6cd2cc4 | 16189 | #: builtin/pack-objects.c:3427 |
c1ac5258 JX |
16190 | msgid "--thin cannot be used to build an indexable pack" |
16191 | msgstr "--thin 不能用于创建一个可索引包" | |
16192 | ||
a6cd2cc4 | 16193 | #: builtin/pack-objects.c:3430 |
c1ac5258 JX |
16194 | msgid "--keep-unreachable and --unpack-unreachable are incompatible" |
16195 | msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" | |
16196 | ||
a6cd2cc4 | 16197 | #: builtin/pack-objects.c:3436 |
c1ac5258 | 16198 | msgid "cannot use --filter without --stdout" |
e640d114 | 16199 | msgstr "不能在没有 --stdout 的情况下使用 --filter" |
c1ac5258 | 16200 | |
a6cd2cc4 | 16201 | #: builtin/pack-objects.c:3497 |
fd8cb379 JX |
16202 | msgid "Enumerating objects" |
16203 | msgstr "枚举对象" | |
16204 | ||
a6cd2cc4 | 16205 | #: builtin/pack-objects.c:3527 |
c1ac5258 JX |
16206 | #, c-format |
16207 | msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" | |
16208 | msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)" | |
16209 | ||
d46c5519 | 16210 | #: builtin/pack-refs.c:8 |
814ff314 JX |
16211 | msgid "git pack-refs [<options>]" |
16212 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 16213 | |
d46c5519 | 16214 | #: builtin/pack-refs.c:16 |
ef317cd5 | 16215 | msgid "pack everything" |
07432cef | 16216 | msgstr "打包一切" |
c04f5ac3 | 16217 | |
d46c5519 | 16218 | #: builtin/pack-refs.c:17 |
ef317cd5 | 16219 | msgid "prune loose refs (default)" |
07432cef | 16220 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 16221 | |
c1ac5258 | 16222 | #: builtin/prune-packed.c:9 |
814ff314 JX |
16223 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
16224 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 16225 | |
c1ac5258 | 16226 | #: builtin/prune-packed.c:42 |
6c94aba5 JX |
16227 | msgid "Removing duplicate objects" |
16228 | msgstr "正在删除重复对象" | |
16229 | ||
c1ac5258 | 16230 | #: builtin/prune.c:12 |
5809aa05 JX |
16231 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
16232 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 16233 | |
d46c5519 | 16234 | #: builtin/prune.c:131 |
1b7f4a34 JX |
16235 | msgid "report pruned objects" |
16236 | msgstr "报告清除的对象" | |
16237 | ||
d46c5519 | 16238 | #: builtin/prune.c:134 |
1b7f4a34 JX |
16239 | msgid "expire objects older than <time>" |
16240 | msgstr "使早于给定时间的对象过期" | |
16241 | ||
d46c5519 | 16242 | #: builtin/prune.c:136 |
31e5e17b JX |
16243 | msgid "limit traversal to objects outside promisor packfiles" |
16244 | msgstr "限制遍历 promisor 包以外的对象" | |
16245 | ||
d46c5519 | 16246 | #: builtin/prune.c:150 |
94550ed3 JX |
16247 | msgid "cannot prune in a precious-objects repo" |
16248 | msgstr "不能在珍品仓库中执行清理操作" | |
16249 | ||
d46c5519 | 16250 | #: builtin/pull.c:66 builtin/pull.c:68 |
a0b6b246 JX |
16251 | #, c-format |
16252 | msgid "Invalid value for %s: %s" | |
16253 | msgstr "%s 的值无效:%s" | |
16254 | ||
d46c5519 | 16255 | #: builtin/pull.c:88 |
94550ed3 | 16256 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
16257 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
16258 | ||
a6cd2cc4 | 16259 | #: builtin/pull.c:141 |
a4f16749 JX |
16260 | msgid "control for recursive fetching of submodules" |
16261 | msgstr "控制子模组的递归获取" | |
16262 | ||
a6cd2cc4 | 16263 | #: builtin/pull.c:145 |
1b7f4a34 JX |
16264 | msgid "Options related to merging" |
16265 | msgstr "和合并相关的选项" | |
16266 | ||
a6cd2cc4 | 16267 | #: builtin/pull.c:148 |
1b7f4a34 JX |
16268 | msgid "incorporate changes by rebasing rather than merging" |
16269 | msgstr "使用变基操作取代合并操作以合入修改" | |
16270 | ||
a6cd2cc4 | 16271 | #: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 |
1b7f4a34 JX |
16272 | msgid "allow fast-forward" |
16273 | msgstr "允许快进式" | |
16274 | ||
a6cd2cc4 | 16275 | #: builtin/pull.c:185 |
5b04ee3b | 16276 | msgid "automatically stash/stash pop before and after rebase" |
554e8501 | 16277 | msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
5b04ee3b | 16278 | |
a6cd2cc4 | 16279 | #: builtin/pull.c:201 |
1b7f4a34 JX |
16280 | msgid "Options related to fetching" |
16281 | msgstr "和获取相关的参数" | |
16282 | ||
a6cd2cc4 | 16283 | #: builtin/pull.c:211 |
4c27fcb5 JX |
16284 | msgid "force overwrite of local branch" |
16285 | msgstr "强制覆盖本地分支" | |
16286 | ||
a6cd2cc4 | 16287 | #: builtin/pull.c:219 |
276ceeaa JX |
16288 | msgid "number of submodules pulled in parallel" |
16289 | msgstr "并发拉取的子模组的数量" | |
16290 | ||
a6cd2cc4 | 16291 | #: builtin/pull.c:316 |
1b7f4a34 JX |
16292 | #, c-format |
16293 | msgid "Invalid value for pull.ff: %s" | |
16294 | msgstr "pull.ff 的取值无效:%s" | |
16295 | ||
a6cd2cc4 | 16296 | #: builtin/pull.c:433 |
1b7f4a34 JX |
16297 | msgid "" |
16298 | "There is no candidate for rebasing against among the refs that you just " | |
16299 | "fetched." | |
16300 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
16301 | ||
a6cd2cc4 | 16302 | #: builtin/pull.c:435 |
1b7f4a34 JX |
16303 | msgid "" |
16304 | "There are no candidates for merging among the refs that you just fetched." | |
16305 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
16306 | ||
a6cd2cc4 | 16307 | #: builtin/pull.c:436 |
1b7f4a34 JX |
16308 | msgid "" |
16309 | "Generally this means that you provided a wildcard refspec which had no\n" | |
16310 | "matches on the remote end." | |
16311 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
16312 | ||
a6cd2cc4 | 16313 | #: builtin/pull.c:439 |
1b7f4a34 JX |
16314 | #, c-format |
16315 | msgid "" | |
16316 | "You asked to pull from the remote '%s', but did not specify\n" | |
16317 | "a branch. Because this is not the default configured remote\n" | |
16318 | "for your current branch, you must specify a branch on the command line." | |
16319 | msgstr "" | |
16320 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
16321 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
16322 | ||
a6cd2cc4 | 16323 | #: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 |
1b7f4a34 JX |
16324 | msgid "You are not currently on a branch." |
16325 | msgstr "您当前不在一个分支上。" | |
16326 | ||
a6cd2cc4 | 16327 | #: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 |
1b7f4a34 JX |
16328 | msgid "Please specify which branch you want to rebase against." |
16329 | msgstr "请指定您要变基到哪一个分支。" | |
16330 | ||
a6cd2cc4 | 16331 | #: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 |
1b7f4a34 JX |
16332 | msgid "Please specify which branch you want to merge with." |
16333 | msgstr "请指定您要合并哪一个分支。" | |
16334 | ||
a6cd2cc4 | 16335 | #: builtin/pull.c:449 builtin/pull.c:464 |
1b7f4a34 JX |
16336 | msgid "See git-pull(1) for details." |
16337 | msgstr "详见 git-pull(1)。" | |
16338 | ||
a6cd2cc4 JX |
16339 | #: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 |
16340 | #: builtin/rebase.c:1332 git-parse-remote.sh:64 | |
5b04ee3b JX |
16341 | msgid "<remote>" |
16342 | msgstr "<远程>" | |
16343 | ||
a6cd2cc4 | 16344 | #: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 |
d46c5519 | 16345 | #: git-parse-remote.sh:65 |
5b04ee3b JX |
16346 | msgid "<branch>" |
16347 | msgstr "<分支>" | |
16348 | ||
a6cd2cc4 | 16349 | #: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 |
1b7f4a34 JX |
16350 | msgid "There is no tracking information for the current branch." |
16351 | msgstr "当前分支没有跟踪信息。" | |
16352 | ||
a6cd2cc4 | 16353 | #: builtin/pull.c:468 git-parse-remote.sh:95 |
1b7f4a34 | 16354 | msgid "" |
5b04ee3b JX |
16355 | "If you wish to set tracking information for this branch you can do so with:" |
16356 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 16357 | |
a6cd2cc4 | 16358 | #: builtin/pull.c:473 |
1b7f4a34 JX |
16359 | #, c-format |
16360 | msgid "" | |
16361 | "Your configuration specifies to merge with the ref '%s'\n" | |
16362 | "from the remote, but no such ref was fetched." | |
16363 | msgstr "" | |
16364 | "您的配置中指定要合并远程的引用 '%s',\n" | |
16365 | "但是没有获取到这个引用。" | |
7ac1c0ad | 16366 | |
a6cd2cc4 | 16367 | #: builtin/pull.c:581 |
4c27fcb5 JX |
16368 | #, c-format |
16369 | msgid "unable to access commit %s" | |
16370 | msgstr "无法访问提交 %s" | |
16371 | ||
a6cd2cc4 | 16372 | #: builtin/pull.c:861 |
5c57d762 JX |
16373 | msgid "ignoring --verify-signatures for rebase" |
16374 | msgstr "为变基操作忽略 --verify-signatures" | |
16375 | ||
a6cd2cc4 | 16376 | #: builtin/pull.c:916 |
5b04ee3b JX |
16377 | msgid "--[no-]autostash option is only valid with --rebase." |
16378 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
16379 | ||
a6cd2cc4 | 16380 | #: builtin/pull.c:924 |
1b7f4a34 JX |
16381 | msgid "Updating an unborn branch with changes added to the index." |
16382 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
16383 | ||
a6cd2cc4 | 16384 | #: builtin/pull.c:928 |
a0b6b246 JX |
16385 | msgid "pull with rebase" |
16386 | msgstr "变基式拉取" | |
16387 | ||
a6cd2cc4 | 16388 | #: builtin/pull.c:929 |
a0b6b246 | 16389 | msgid "please commit or stash them." |
554e8501 | 16390 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 16391 | |
a6cd2cc4 | 16392 | #: builtin/pull.c:954 |
1b7f4a34 JX |
16393 | #, c-format |
16394 | msgid "" | |
16395 | "fetch updated the current branch head.\n" | |
16396 | "fast-forwarding your working tree from\n" | |
16397 | "commit %s." | |
16398 | msgstr "" | |
16399 | "fetch 更新了当前的分支。快进您的工作区\n" | |
16400 | "至提交 %s。" | |
ef317cd5 | 16401 | |
a6cd2cc4 | 16402 | #: builtin/pull.c:960 |
1b7f4a34 JX |
16403 | #, c-format |
16404 | msgid "" | |
16405 | "Cannot fast-forward your working tree.\n" | |
16406 | "After making sure that you saved anything precious from\n" | |
16407 | "$ git diff %s\n" | |
16408 | "output, run\n" | |
16409 | "$ git reset --hard\n" | |
16410 | "to recover." | |
16411 | msgstr "" | |
16412 | "您当前的工作区无法执行快进操作。\n" | |
16413 | "首先执行如下命令:\n" | |
16414 | "$ git diff %s\n" | |
16415 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
16416 | "$ git reset --hard\n" | |
16417 | "恢复之前的状态。" | |
16418 | ||
a6cd2cc4 | 16419 | #: builtin/pull.c:975 |
1b7f4a34 JX |
16420 | msgid "Cannot merge multiple branches into empty head." |
16421 | msgstr "无法将多个分支合并到空分支。" | |
16422 | ||
a6cd2cc4 | 16423 | #: builtin/pull.c:979 |
1b7f4a34 JX |
16424 | msgid "Cannot rebase onto multiple branches." |
16425 | msgstr "无法变基到多个分支。" | |
16426 | ||
a6cd2cc4 | 16427 | #: builtin/pull.c:986 |
a4f16749 JX |
16428 | msgid "cannot rebase with locally recorded submodule modifications" |
16429 | msgstr "本地子模组中有修改,无法变基" | |
16430 | ||
fd8cb379 | 16431 | #: builtin/push.c:19 |
ef317cd5 | 16432 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 16433 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 16434 | |
fd8cb379 | 16435 | #: builtin/push.c:111 |
c04f5ac3 | 16436 | msgid "tag shorthand without <tag>" |
55a16ee4 | 16437 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 16438 | |
fd8cb379 | 16439 | #: builtin/push.c:121 |
c04f5ac3 | 16440 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 16441 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 16442 | |
06991777 | 16443 | #: builtin/push.c:167 |
8ada9598 JX |
16444 | msgid "" |
16445 | "\n" | |
16446 | "To choose either option permanently, see push.default in 'git help config'." | |
16447 | msgstr "" | |
81809b99 JX |
16448 | "\n" |
16449 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 16450 | |
06991777 | 16451 | #: builtin/push.c:170 |
8ada9598 JX |
16452 | #, c-format |
16453 | msgid "" | |
16454 | "The upstream branch of your current branch does not match\n" | |
16455 | "the name of your current branch. To push to the upstream branch\n" | |
16456 | "on the remote, use\n" | |
16457 | "\n" | |
16458 | " git push %s HEAD:%s\n" | |
16459 | "\n" | |
16460 | "To push to the branch of the same name on the remote, use\n" | |
16461 | "\n" | |
4c27fcb5 | 16462 | " git push %s HEAD\n" |
8ada9598 JX |
16463 | "%s" |
16464 | msgstr "" | |
4c27fcb5 JX |
16465 | "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n" |
16466 | "使用\n" | |
81809b99 JX |
16467 | "\n" |
16468 | " git push %s HEAD:%s\n" | |
16469 | "\n" | |
16470 | "为推送至远程同名分支,使用\n" | |
16471 | "\n" | |
4c27fcb5 | 16472 | " git push %s HEAD\n" |
81809b99 | 16473 | "%s" |
8ada9598 | 16474 | |
06991777 | 16475 | #: builtin/push.c:185 |
c04f5ac3 JX |
16476 | #, c-format |
16477 | msgid "" | |
16478 | "You are not currently on a branch.\n" | |
16479 | "To push the history leading to the current (detached HEAD)\n" | |
16480 | "state now, use\n" | |
16481 | "\n" | |
16482 | " git push %s HEAD:<name-of-remote-branch>\n" | |
16483 | msgstr "" | |
16484 | "您当前不在一个分支上。\n" | |
90e6ef53 | 16485 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 16486 | "\n" |
d9d56b23 | 16487 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 16488 | |
06991777 | 16489 | #: builtin/push.c:199 |
c04f5ac3 JX |
16490 | #, c-format |
16491 | msgid "" | |
16492 | "The current branch %s has no upstream branch.\n" | |
16493 | "To push the current branch and set the remote as upstream, use\n" | |
16494 | "\n" | |
16495 | " git push --set-upstream %s %s\n" | |
16496 | msgstr "" | |
16497 | "当前分支 %s 没有对应的上游分支。\n" | |
16498 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
16499 | "\n" | |
16500 | " git push --set-upstream %s %s\n" | |
16501 | ||
06991777 | 16502 | #: builtin/push.c:207 |
c04f5ac3 JX |
16503 | #, c-format |
16504 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
16505 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
16506 | ||
06991777 | 16507 | #: builtin/push.c:210 |
73a60cd2 JX |
16508 | #, c-format |
16509 | msgid "" | |
16510 | "You are pushing to remote '%s', which is not the upstream of\n" | |
16511 | "your current branch '%s', without telling me what to push\n" | |
16512 | "to update which remote branch." | |
16513 | msgstr "" | |
16514 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
16515 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
16516 | ||
06991777 | 16517 | #: builtin/push.c:269 |
c04f5ac3 JX |
16518 | msgid "" |
16519 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 16520 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 16521 | |
06991777 | 16522 | #: builtin/push.c:276 |
170e9899 JX |
16523 | msgid "" |
16524 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
16525 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
16526 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
16527 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
16528 | msgstr "" | |
eff6d3a9 | 16529 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 16530 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 16531 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 16532 | |
06991777 | 16533 | #: builtin/push.c:282 |
170e9899 JX |
16534 | msgid "" |
16535 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
16536 | "counterpart. Check out this branch and integrate the remote changes\n" |
16537 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
16538 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
16539 | msgstr "" | |
eff6d3a9 | 16540 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 16541 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 16542 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 16543 | |
06991777 | 16544 | #: builtin/push.c:288 |
07432cef | 16545 | msgid "" |
a77c07d9 JX |
16546 | "Updates were rejected because the remote contains work that you do\n" |
16547 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
16548 | "to the same ref. You may want to first integrate the remote changes\n" |
16549 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
16550 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
16551 | msgstr "" | |
160fb2b2 JX |
16552 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
16553 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 16554 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
16555 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
16556 | ||
06991777 | 16557 | #: builtin/push.c:295 |
a77c07d9 | 16558 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 16559 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 16560 | |
06991777 | 16561 | #: builtin/push.c:298 |
a77c07d9 JX |
16562 | msgid "" |
16563 | "You cannot update a remote ref that points at a non-commit object,\n" | |
16564 | "or update a remote ref to make it point at a non-commit object,\n" | |
16565 | "without using the '--force' option.\n" | |
16566 | msgstr "" | |
16567 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
16568 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 16569 | |
06991777 | 16570 | #: builtin/push.c:359 |
c04f5ac3 JX |
16571 | #, c-format |
16572 | msgid "Pushing to %s\n" | |
16573 | msgstr "推送到 %s\n" | |
16574 | ||
06991777 | 16575 | #: builtin/push.c:364 |
c04f5ac3 JX |
16576 | #, c-format |
16577 | msgid "failed to push some refs to '%s'" | |
c1ac5258 | 16578 | msgstr "推送一些引用到 '%s' 失败" |
c04f5ac3 | 16579 | |
06991777 | 16580 | #: builtin/push.c:398 |
c04f5ac3 JX |
16581 | #, c-format |
16582 | msgid "bad repository '%s'" | |
160fb2b2 | 16583 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 16584 | |
06991777 | 16585 | #: builtin/push.c:399 |
c04f5ac3 JX |
16586 | msgid "" |
16587 | "No configured push destination.\n" | |
16588 | "Either specify the URL from the command-line or configure a remote " | |
16589 | "repository using\n" | |
16590 | "\n" | |
16591 | " git remote add <name> <url>\n" | |
16592 | "\n" | |
16593 | "and then push using the remote name\n" | |
16594 | "\n" | |
16595 | " git push <name>\n" | |
16596 | msgstr "" | |
90e6ef53 | 16597 | "没有配置推送目标。\n" |
4375c10e | 16598 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 16599 | "\n" |
d9d56b23 | 16600 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 16601 | "\n" |
160fb2b2 | 16602 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 16603 | "\n" |
d9d56b23 | 16604 | " git push <名称>\n" |
c04f5ac3 | 16605 | |
06991777 | 16606 | #: builtin/push.c:554 |
ef317cd5 | 16607 | msgid "repository" |
160fb2b2 | 16608 | msgstr "仓库" |
ef317cd5 | 16609 | |
06991777 | 16610 | #: builtin/push.c:555 builtin/send-pack.c:164 |
ef317cd5 | 16611 | msgid "push all refs" |
07432cef | 16612 | msgstr "推送所有引用" |
ef317cd5 | 16613 | |
06991777 | 16614 | #: builtin/push.c:556 builtin/send-pack.c:166 |
ef317cd5 | 16615 | msgid "mirror all refs" |
07432cef | 16616 | msgstr "镜像所有引用" |
ef317cd5 | 16617 | |
06991777 | 16618 | #: builtin/push.c:558 |
ef317cd5 | 16619 | msgid "delete refs" |
07432cef | 16620 | msgstr "删除引用" |
ef317cd5 | 16621 | |
06991777 | 16622 | #: builtin/push.c:559 |
ef317cd5 | 16623 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 16624 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 16625 | |
06991777 | 16626 | #: builtin/push.c:562 builtin/send-pack.c:167 |
ef317cd5 JX |
16627 | msgid "force updates" |
16628 | msgstr "强制更新" | |
16629 | ||
06991777 | 16630 | #: builtin/push.c:564 builtin/send-pack.c:181 |
c1ac5258 JX |
16631 | msgid "<refname>:<expect>" |
16632 | msgstr "<引用名>:<期望值>" | |
90314792 | 16633 | |
06991777 | 16634 | #: builtin/push.c:565 builtin/send-pack.c:182 |
90314792 JX |
16635 | msgid "require old value of ref to be at this value" |
16636 | msgstr "要求引用旧的取值为设定值" | |
16637 | ||
06991777 | 16638 | #: builtin/push.c:568 |
ef317cd5 | 16639 | msgid "control recursive pushing of submodules" |
07432cef | 16640 | msgstr "控制子模组的递归推送" |
ef317cd5 | 16641 | |
06991777 | 16642 | #: builtin/push.c:570 builtin/send-pack.c:175 |
ef317cd5 | 16643 | msgid "use thin pack" |
07432cef | 16644 | msgstr "使用精简打包" |
ef317cd5 | 16645 | |
06991777 | 16646 | #: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 |
fd8cb379 | 16647 | #: builtin/send-pack.c:162 |
ef317cd5 | 16648 | msgid "receive pack program" |
07432cef | 16649 | msgstr "接收包程序" |
ef317cd5 | 16650 | |
06991777 | 16651 | #: builtin/push.c:573 |
ef317cd5 | 16652 | msgid "set upstream for git pull/status" |
07432cef | 16653 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 16654 | |
06991777 | 16655 | #: builtin/push.c:576 |
ef317cd5 | 16656 | msgid "prune locally removed refs" |
07432cef | 16657 | msgstr "清除本地删除的引用" |
ef317cd5 | 16658 | |
06991777 | 16659 | #: builtin/push.c:578 |
a77c07d9 JX |
16660 | msgid "bypass pre-push hook" |
16661 | msgstr "绕过 pre-push 钩子" | |
16662 | ||
06991777 | 16663 | #: builtin/push.c:579 |
1003b3a5 | 16664 | msgid "push missing but relevant tags" |
55a16ee4 | 16665 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 16666 | |
06991777 | 16667 | #: builtin/push.c:582 builtin/send-pack.c:169 |
220c313c JX |
16668 | msgid "GPG sign the push" |
16669 | msgstr "用 GPG 为推送签名" | |
16670 | ||
06991777 | 16671 | #: builtin/push.c:584 builtin/send-pack.c:176 |
814ff314 JX |
16672 | msgid "request atomic transaction on remote side" |
16673 | msgstr "需要远端支持原子事务" | |
16674 | ||
06991777 | 16675 | #: builtin/push.c:602 |
c04f5ac3 JX |
16676 | msgid "--delete is incompatible with --all, --mirror and --tags" |
16677 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
16678 | ||
06991777 | 16679 | #: builtin/push.c:604 |
c04f5ac3 JX |
16680 | msgid "--delete doesn't make sense without any refs" |
16681 | msgstr "--delete 未接任何引用没有意义" | |
16682 | ||
06991777 | 16683 | #: builtin/push.c:607 |
fd8cb379 JX |
16684 | msgid "--all and --tags are incompatible" |
16685 | msgstr "--all 和 --tags 不兼容" | |
16686 | ||
06991777 | 16687 | #: builtin/push.c:609 |
fd8cb379 JX |
16688 | msgid "--all can't be combined with refspecs" |
16689 | msgstr "--all 不能和引用规格同时使用" | |
16690 | ||
06991777 | 16691 | #: builtin/push.c:613 |
fd8cb379 JX |
16692 | msgid "--mirror and --tags are incompatible" |
16693 | msgstr "--mirror 和 --tags 不兼容" | |
16694 | ||
06991777 | 16695 | #: builtin/push.c:615 |
fd8cb379 JX |
16696 | msgid "--mirror can't be combined with refspecs" |
16697 | msgstr "--mirror 不能和引用规格同时使用" | |
16698 | ||
06991777 | 16699 | #: builtin/push.c:618 |
fd8cb379 JX |
16700 | msgid "--all and --mirror are incompatible" |
16701 | msgstr "--all 和 --mirror 不兼容" | |
16702 | ||
06991777 | 16703 | #: builtin/push.c:637 |
5c57d762 JX |
16704 | msgid "push options must not have new line characters" |
16705 | msgstr "推送选项不能有换行符" | |
16706 | ||
c1ac5258 JX |
16707 | #: builtin/range-diff.c:8 |
16708 | msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
16709 | msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
16710 | ||
16711 | #: builtin/range-diff.c:9 | |
16712 | msgid "git range-diff [<options>] <old-tip>...<new-tip>" | |
16713 | msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" | |
16714 | ||
16715 | #: builtin/range-diff.c:10 | |
16716 | msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" | |
16717 | msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" | |
16718 | ||
4c27fcb5 | 16719 | #: builtin/range-diff.c:21 |
c1ac5258 JX |
16720 | msgid "Percentage by which creation is weighted" |
16721 | msgstr "创建权重的百分比" | |
16722 | ||
4c27fcb5 | 16723 | #: builtin/range-diff.c:23 |
c1ac5258 JX |
16724 | msgid "use simple diff colors" |
16725 | msgstr "使用简单差异颜色" | |
16726 | ||
d46c5519 | 16727 | #: builtin/range-diff.c:46 builtin/range-diff.c:50 |
c1ac5258 JX |
16728 | #, c-format |
16729 | msgid "no .. in range: '%s'" | |
16730 | msgstr "没有在范围中使用 ..:'%s'" | |
16731 | ||
d46c5519 | 16732 | #: builtin/range-diff.c:60 |
c1ac5258 JX |
16733 | msgid "single arg format must be symmetric range" |
16734 | msgstr "单个参数格式必须是对称范围(即包含...)" | |
16735 | ||
d46c5519 | 16736 | #: builtin/range-diff.c:75 |
c1ac5258 JX |
16737 | msgid "need two commit ranges" |
16738 | msgstr "需要两个提交范围" | |
16739 | ||
06991777 | 16740 | #: builtin/read-tree.c:41 |
ef317cd5 | 16741 | msgid "" |
1b7f4a34 | 16742 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
16743 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
16744 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
16745 | msgstr "" | |
1b7f4a34 | 16746 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 16747 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 16748 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 16749 | |
06991777 | 16750 | #: builtin/read-tree.c:124 |
ef317cd5 | 16751 | msgid "write resulting index to <file>" |
d9d56b23 | 16752 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 16753 | |
06991777 | 16754 | #: builtin/read-tree.c:127 |
ef317cd5 | 16755 | msgid "only empty the index" |
07432cef | 16756 | msgstr "只是清空索引" |
ef317cd5 | 16757 | |
06991777 | 16758 | #: builtin/read-tree.c:129 |
ef317cd5 | 16759 | msgid "Merging" |
07432cef | 16760 | msgstr "合并" |
ef317cd5 | 16761 | |
06991777 | 16762 | #: builtin/read-tree.c:131 |
ef317cd5 | 16763 | msgid "perform a merge in addition to a read" |
07432cef | 16764 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 16765 | |
06991777 | 16766 | #: builtin/read-tree.c:133 |
ef317cd5 | 16767 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 16768 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 16769 | |
06991777 | 16770 | #: builtin/read-tree.c:135 |
ef317cd5 | 16771 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 16772 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 16773 | |
06991777 | 16774 | #: builtin/read-tree.c:137 |
ef317cd5 | 16775 | msgid "same as -m, but discard unmerged entries" |
07432cef | 16776 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 16777 | |
06991777 | 16778 | #: builtin/read-tree.c:138 |
ef317cd5 | 16779 | msgid "<subdirectory>/" |
07432cef | 16780 | msgstr "<子目录>/" |
ef317cd5 | 16781 | |
06991777 | 16782 | #: builtin/read-tree.c:139 |
ef317cd5 | 16783 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 16784 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 16785 | |
06991777 | 16786 | #: builtin/read-tree.c:142 |
ef317cd5 | 16787 | msgid "update working tree with merge result" |
07432cef | 16788 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 16789 | |
06991777 | 16790 | #: builtin/read-tree.c:144 |
ef317cd5 | 16791 | msgid "gitignore" |
07432cef | 16792 | msgstr "gitignore" |
ef317cd5 | 16793 | |
06991777 | 16794 | #: builtin/read-tree.c:145 |
ef317cd5 | 16795 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 16796 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 16797 | |
06991777 | 16798 | #: builtin/read-tree.c:148 |
ef317cd5 | 16799 | msgid "don't check the working tree after merging" |
07432cef | 16800 | msgstr "合并后不检查工作区" |
ef317cd5 | 16801 | |
06991777 | 16802 | #: builtin/read-tree.c:149 |
ef317cd5 | 16803 | msgid "don't update the index or the work tree" |
07432cef | 16804 | msgstr "不更新索引区和工作区" |
ef317cd5 | 16805 | |
06991777 | 16806 | #: builtin/read-tree.c:151 |
ef317cd5 | 16807 | msgid "skip applying sparse checkout filter" |
07432cef | 16808 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 16809 | |
06991777 | 16810 | #: builtin/read-tree.c:153 |
ef317cd5 | 16811 | msgid "debug unpack-trees" |
07432cef | 16812 | msgstr "调试 unpack-trees" |
ef317cd5 | 16813 | |
d46c5519 JX |
16814 | #: builtin/read-tree.c:157 |
16815 | msgid "suppress feedback messages" | |
16816 | msgstr "抑制反馈信息" | |
16817 | ||
16818 | #: builtin/rebase.c:32 | |
4c27fcb5 JX |
16819 | msgid "" |
16820 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " | |
16821 | "[<branch>]" | |
16822 | msgstr "" | |
16823 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]" | |
16824 | ||
d46c5519 | 16825 | #: builtin/rebase.c:34 |
4c27fcb5 JX |
16826 | msgid "" |
16827 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" | |
16828 | msgstr "" | |
16829 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" | |
16830 | ||
d46c5519 | 16831 | #: builtin/rebase.c:36 |
4c27fcb5 JX |
16832 | msgid "git rebase --continue | --abort | --skip | --edit-todo" |
16833 | msgstr "git rebase --continue | --abort | --skip | --edit-todo" | |
16834 | ||
d46c5519 JX |
16835 | #: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 |
16836 | #, c-format | |
16837 | msgid "unusable todo list: '%s'" | |
16838 | msgstr "不可用的待办列表:'%s'" | |
16839 | ||
16840 | #: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 | |
16841 | #, c-format | |
16842 | msgid "could not write '%s'." | |
16843 | msgstr "不能写入 '%s'。" | |
16844 | ||
16845 | #: builtin/rebase.c:252 | |
16846 | msgid "no HEAD?" | |
16847 | msgstr "没有 HEAD?" | |
16848 | ||
16849 | #: builtin/rebase.c:279 | |
16850 | #, c-format | |
16851 | msgid "could not create temporary %s" | |
16852 | msgstr "无法创建临时的 %s" | |
16853 | ||
16854 | #: builtin/rebase.c:285 | |
16855 | msgid "could not mark as interactive" | |
16856 | msgstr "无法标记为交互式" | |
16857 | ||
16858 | #: builtin/rebase.c:343 | |
16859 | msgid "could not generate todo list" | |
16860 | msgstr "无法生成待办列表" | |
16861 | ||
16862 | #: builtin/rebase.c:382 | |
16863 | msgid "a base commit must be provided with --upstream or --onto" | |
16864 | msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" | |
16865 | ||
16866 | #: builtin/rebase.c:437 | |
16867 | msgid "git rebase--interactive [<options>]" | |
16868 | msgstr "git rebase--interactive [<选项>]" | |
16869 | ||
16870 | #: builtin/rebase.c:449 | |
16871 | msgid "keep empty commits" | |
16872 | msgstr "保持空提交" | |
16873 | ||
a6cd2cc4 | 16874 | #: builtin/rebase.c:451 builtin/revert.c:128 |
d46c5519 JX |
16875 | msgid "allow commits with empty messages" |
16876 | msgstr "允许提交说明为空" | |
16877 | ||
16878 | #: builtin/rebase.c:452 | |
16879 | msgid "rebase merge commits" | |
16880 | msgstr "对合并提交变基" | |
16881 | ||
16882 | #: builtin/rebase.c:454 | |
16883 | msgid "keep original branch points of cousins" | |
16884 | msgstr "保持兄弟提交的原始分支点" | |
16885 | ||
16886 | #: builtin/rebase.c:456 | |
16887 | msgid "move commits that begin with squash!/fixup!" | |
16888 | msgstr "移动以 squash!/fixup! 开头的提交" | |
16889 | ||
16890 | #: builtin/rebase.c:457 | |
16891 | msgid "sign commits" | |
16892 | msgstr "签名提交" | |
16893 | ||
a6cd2cc4 | 16894 | #: builtin/rebase.c:459 builtin/rebase.c:1403 |
d46c5519 | 16895 | msgid "display a diffstat of what changed upstream" |
5b533632 | 16896 | msgstr "显示上游变化的差异统计" |
d46c5519 JX |
16897 | |
16898 | #: builtin/rebase.c:461 | |
16899 | msgid "continue rebase" | |
16900 | msgstr "继续变基" | |
16901 | ||
16902 | #: builtin/rebase.c:463 | |
16903 | msgid "skip commit" | |
16904 | msgstr "跳过提交" | |
16905 | ||
16906 | #: builtin/rebase.c:464 | |
16907 | msgid "edit the todo list" | |
16908 | msgstr "变基待办列表" | |
16909 | ||
16910 | #: builtin/rebase.c:466 | |
16911 | msgid "show the current patch" | |
16912 | msgstr "显示当前补丁" | |
16913 | ||
16914 | #: builtin/rebase.c:469 | |
16915 | msgid "shorten commit ids in the todo list" | |
16916 | msgstr "缩短待办列表中的提交号" | |
16917 | ||
16918 | #: builtin/rebase.c:471 | |
16919 | msgid "expand commit ids in the todo list" | |
16920 | msgstr "扩展待办列表中的提交号" | |
16921 | ||
16922 | #: builtin/rebase.c:473 | |
16923 | msgid "check the todo list" | |
16924 | msgstr "检查待办列表" | |
16925 | ||
16926 | #: builtin/rebase.c:475 | |
16927 | msgid "rearrange fixup/squash lines" | |
16928 | msgstr "重新排列 fixup/squash 行" | |
16929 | ||
16930 | #: builtin/rebase.c:477 | |
16931 | msgid "insert exec commands in todo list" | |
16932 | msgstr "在待办列表中插入 exec 执行命令" | |
16933 | ||
16934 | #: builtin/rebase.c:478 | |
16935 | msgid "onto" | |
16936 | msgstr "onto" | |
16937 | ||
16938 | #: builtin/rebase.c:481 | |
16939 | msgid "restrict-revision" | |
16940 | msgstr "restrict-revision" | |
16941 | ||
16942 | #: builtin/rebase.c:481 | |
16943 | msgid "restrict revision" | |
16944 | msgstr "限制版本" | |
16945 | ||
16946 | #: builtin/rebase.c:483 | |
16947 | msgid "squash-onto" | |
16948 | msgstr "squash-onto" | |
16949 | ||
16950 | #: builtin/rebase.c:484 | |
16951 | msgid "squash onto" | |
16952 | msgstr "squash onto" | |
16953 | ||
16954 | #: builtin/rebase.c:486 | |
16955 | msgid "the upstream commit" | |
16956 | msgstr "上游提交" | |
16957 | ||
16958 | #: builtin/rebase.c:488 | |
16959 | msgid "head-name" | |
16960 | msgstr "head-name" | |
16961 | ||
16962 | #: builtin/rebase.c:488 | |
16963 | msgid "head name" | |
16964 | msgstr "head 名称" | |
16965 | ||
16966 | #: builtin/rebase.c:493 | |
16967 | msgid "rebase strategy" | |
16968 | msgstr "变基策略" | |
16969 | ||
16970 | #: builtin/rebase.c:494 | |
16971 | msgid "strategy-opts" | |
16972 | msgstr "strategy-opts" | |
16973 | ||
16974 | #: builtin/rebase.c:495 | |
16975 | msgid "strategy options" | |
16976 | msgstr "策略选项" | |
16977 | ||
16978 | #: builtin/rebase.c:496 | |
16979 | msgid "switch-to" | |
16980 | msgstr "切换到" | |
16981 | ||
16982 | #: builtin/rebase.c:497 | |
16983 | msgid "the branch or commit to checkout" | |
16984 | msgstr "要检出的分支或提交" | |
16985 | ||
16986 | #: builtin/rebase.c:498 | |
16987 | msgid "onto-name" | |
16988 | msgstr "onto-name" | |
16989 | ||
16990 | #: builtin/rebase.c:498 | |
16991 | msgid "onto name" | |
16992 | msgstr "onto name" | |
16993 | ||
16994 | #: builtin/rebase.c:499 | |
16995 | msgid "cmd" | |
16996 | msgstr "cmd" | |
16997 | ||
16998 | #: builtin/rebase.c:499 | |
16999 | msgid "the command to run" | |
17000 | msgstr "要执行的命令" | |
17001 | ||
a6cd2cc4 | 17002 | #: builtin/rebase.c:502 builtin/rebase.c:1486 |
d46c5519 JX |
17003 | msgid "automatically re-schedule any `exec` that fails" |
17004 | msgstr "自动重新安排任何失败的 `exec`" | |
17005 | ||
17006 | #: builtin/rebase.c:518 | |
17007 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" | |
17008 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
17009 | ||
a6cd2cc4 | 17010 | #: builtin/rebase.c:534 |
4c27fcb5 JX |
17011 | #, c-format |
17012 | msgid "%s requires an interactive rebase" | |
17013 | msgstr "%s 需要交互式变基" | |
17014 | ||
d46c5519 | 17015 | #: builtin/rebase.c:586 |
4c27fcb5 JX |
17016 | #, c-format |
17017 | msgid "could not get 'onto': '%s'" | |
17018 | msgstr "无法获取 'onto':'%s'" | |
17019 | ||
d46c5519 | 17020 | #: builtin/rebase.c:601 |
4c27fcb5 JX |
17021 | #, c-format |
17022 | msgid "invalid orig-head: '%s'" | |
17023 | msgstr "无效的原始 head:'%s'" | |
17024 | ||
d46c5519 | 17025 | #: builtin/rebase.c:626 |
4c27fcb5 JX |
17026 | #, c-format |
17027 | msgid "ignoring invalid allow_rerere_autoupdate: '%s'" | |
17028 | msgstr "忽略无效的 allow_rerere_autoupdate:'%s'" | |
17029 | ||
d46c5519 | 17030 | #: builtin/rebase.c:702 |
4c27fcb5 JX |
17031 | #, c-format |
17032 | msgid "Could not read '%s'" | |
17033 | msgstr "不能读取 '%s'" | |
17034 | ||
d46c5519 | 17035 | #: builtin/rebase.c:720 |
4c27fcb5 JX |
17036 | #, c-format |
17037 | msgid "Cannot store %s" | |
17038 | msgstr "不能存储 %s" | |
17039 | ||
a6cd2cc4 | 17040 | #: builtin/rebase.c:827 |
06991777 JX |
17041 | msgid "could not determine HEAD revision" |
17042 | msgstr "不能确定 HEAD 版本" | |
17043 | ||
a6cd2cc4 | 17044 | #: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 |
4c27fcb5 JX |
17045 | msgid "" |
17046 | "Resolve all conflicts manually, mark them as resolved with\n" | |
17047 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
17048 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
17049 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
17050 | "abort\"." | |
17051 | msgstr "" | |
17052 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" | |
17053 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" | |
17054 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
17055 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
17056 | ||
a6cd2cc4 | 17057 | #: builtin/rebase.c:1031 |
06991777 JX |
17058 | #, c-format |
17059 | msgid "" | |
17060 | "\n" | |
17061 | "git encountered an error while preparing the patches to replay\n" | |
17062 | "these revisions:\n" | |
17063 | "\n" | |
17064 | " %s\n" | |
17065 | "\n" | |
17066 | "As a result, git cannot rebase them." | |
17067 | msgstr "" | |
17068 | "\n" | |
17069 | "在为重放这些版本而准备补丁时,git 遇到了一个错误:\n" | |
17070 | "\n" | |
17071 | " %s\n" | |
17072 | "\n" | |
17073 | "因此 git 无法对其变基。" | |
4c27fcb5 | 17074 | |
a6cd2cc4 | 17075 | #: builtin/rebase.c:1318 |
4c27fcb5 JX |
17076 | #, c-format |
17077 | msgid "" | |
17078 | "%s\n" | |
17079 | "Please specify which branch you want to rebase against.\n" | |
17080 | "See git-rebase(1) for details.\n" | |
17081 | "\n" | |
17082 | " git rebase '<branch>'\n" | |
17083 | "\n" | |
17084 | msgstr "" | |
17085 | "%s\n" | |
17086 | "请指定您要变基到哪个分支。\n" | |
17087 | "详见 git-rebase(1)。\n" | |
17088 | "\n" | |
17089 | " git rebase '<branch>'\n" | |
17090 | "\n" | |
17091 | ||
a6cd2cc4 | 17092 | #: builtin/rebase.c:1334 |
4c27fcb5 JX |
17093 | #, c-format |
17094 | msgid "" | |
17095 | "If you wish to set tracking information for this branch you can do so with:\n" | |
17096 | "\n" | |
17097 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
17098 | "\n" | |
17099 | msgstr "" | |
17100 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
17101 | "\n" | |
17102 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
17103 | "\n" | |
17104 | ||
a6cd2cc4 | 17105 | #: builtin/rebase.c:1364 |
06991777 JX |
17106 | msgid "exec commands cannot contain newlines" |
17107 | msgstr "exec 命令不能包含换行符" | |
17108 | ||
a6cd2cc4 | 17109 | #: builtin/rebase.c:1368 |
06991777 JX |
17110 | msgid "empty exec command" |
17111 | msgstr "空的 exec 命令" | |
17112 | ||
a6cd2cc4 | 17113 | #: builtin/rebase.c:1396 |
4c27fcb5 JX |
17114 | msgid "rebase onto given branch instead of upstream" |
17115 | msgstr "变基到给定的分支而非上游" | |
17116 | ||
a6cd2cc4 | 17117 | #: builtin/rebase.c:1398 |
4c27fcb5 JX |
17118 | msgid "allow pre-rebase hook to run" |
17119 | msgstr "允许执行 pre-rebase 钩子" | |
17120 | ||
a6cd2cc4 | 17121 | #: builtin/rebase.c:1400 |
4c27fcb5 JX |
17122 | msgid "be quiet. implies --no-stat" |
17123 | msgstr "安静。暗示 --no-stat" | |
17124 | ||
a6cd2cc4 | 17125 | #: builtin/rebase.c:1406 |
4c27fcb5 | 17126 | msgid "do not show diffstat of what changed upstream" |
5b533632 | 17127 | msgstr "不显示上游变化的差异统计" |
4c27fcb5 | 17128 | |
a6cd2cc4 | 17129 | #: builtin/rebase.c:1409 |
4c27fcb5 JX |
17130 | msgid "add a Signed-off-by: line to each commit" |
17131 | msgstr "为每一个提交添加一个 Signed-off-by: 签名" | |
17132 | ||
a6cd2cc4 | 17133 | #: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 |
4c27fcb5 JX |
17134 | msgid "passed to 'git am'" |
17135 | msgstr "传递给 'git am'" | |
17136 | ||
a6cd2cc4 | 17137 | #: builtin/rebase.c:1419 builtin/rebase.c:1421 |
4c27fcb5 JX |
17138 | msgid "passed to 'git apply'" |
17139 | msgstr "传递给 'git apply'" | |
17140 | ||
a6cd2cc4 | 17141 | #: builtin/rebase.c:1423 builtin/rebase.c:1426 |
4c27fcb5 JX |
17142 | msgid "cherry-pick all commits, even if unchanged" |
17143 | msgstr "拣选所有提交,即使未修改" | |
17144 | ||
a6cd2cc4 | 17145 | #: builtin/rebase.c:1428 |
4c27fcb5 JX |
17146 | msgid "continue" |
17147 | msgstr "继续" | |
17148 | ||
a6cd2cc4 | 17149 | #: builtin/rebase.c:1431 |
4c27fcb5 JX |
17150 | msgid "skip current patch and continue" |
17151 | msgstr "跳过当前补丁并继续" | |
17152 | ||
17153 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 17154 | #: builtin/rebase.c:1433 |
4c27fcb5 JX |
17155 | msgid "abort and check out the original branch" |
17156 | msgstr "终止并检出原有分支" | |
17157 | ||
a6cd2cc4 | 17158 | #: builtin/rebase.c:1436 |
4c27fcb5 JX |
17159 | msgid "abort but keep HEAD where it is" |
17160 | msgstr "终止但保持 HEAD 不变" | |
17161 | ||
a6cd2cc4 | 17162 | #: builtin/rebase.c:1437 |
4c27fcb5 JX |
17163 | msgid "edit the todo list during an interactive rebase" |
17164 | msgstr "在交互式变基中编辑待办列表" | |
17165 | ||
a6cd2cc4 | 17166 | #: builtin/rebase.c:1440 |
4c27fcb5 JX |
17167 | msgid "show the patch file being applied or merged" |
17168 | msgstr "显示正在应用或合并的补丁文件" | |
17169 | ||
a6cd2cc4 | 17170 | #: builtin/rebase.c:1443 |
4c27fcb5 JX |
17171 | msgid "use merging strategies to rebase" |
17172 | msgstr "使用合并策略进行变基" | |
17173 | ||
a6cd2cc4 | 17174 | #: builtin/rebase.c:1447 |
4c27fcb5 JX |
17175 | msgid "let the user edit the list of commits to rebase" |
17176 | msgstr "让用户编辑要变基的提交列表" | |
17177 | ||
a6cd2cc4 | 17178 | #: builtin/rebase.c:1451 |
d46c5519 JX |
17179 | msgid "(DEPRECATED) try to recreate merges instead of ignoring them" |
17180 | msgstr "(已弃用)尝试重建合并提交而非忽略它们" | |
4c27fcb5 | 17181 | |
a6cd2cc4 | 17182 | #: builtin/rebase.c:1455 |
4c27fcb5 JX |
17183 | msgid "preserve empty commits during rebase" |
17184 | msgstr "变基时保留空提交" | |
17185 | ||
a6cd2cc4 | 17186 | #: builtin/rebase.c:1457 |
4c27fcb5 JX |
17187 | msgid "move commits that begin with squash!/fixup! under -i" |
17188 | msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交" | |
17189 | ||
a6cd2cc4 | 17190 | #: builtin/rebase.c:1463 |
4c27fcb5 JX |
17191 | msgid "automatically stash/stash pop before and after" |
17192 | msgstr "在操作前后执行自动贮藏和弹出贮藏" | |
17193 | ||
a6cd2cc4 | 17194 | #: builtin/rebase.c:1465 |
4c27fcb5 JX |
17195 | msgid "add exec lines after each commit of the editable list" |
17196 | msgstr "可编辑列表的每一个提交下面增加一行 exec" | |
17197 | ||
a6cd2cc4 | 17198 | #: builtin/rebase.c:1469 |
4c27fcb5 JX |
17199 | msgid "allow rebasing commits with empty messages" |
17200 | msgstr "允许针对空提交说明的提交变基" | |
17201 | ||
a6cd2cc4 | 17202 | #: builtin/rebase.c:1472 |
4c27fcb5 JX |
17203 | msgid "try to rebase merges instead of skipping them" |
17204 | msgstr "尝试对合并提交变基而不是忽略它们" | |
17205 | ||
a6cd2cc4 | 17206 | #: builtin/rebase.c:1475 |
4c27fcb5 JX |
17207 | msgid "use 'merge-base --fork-point' to refine upstream" |
17208 | msgstr "使用 'merge-base --fork-point' 来优化上游" | |
17209 | ||
a6cd2cc4 | 17210 | #: builtin/rebase.c:1477 |
4c27fcb5 JX |
17211 | msgid "use the given merge strategy" |
17212 | msgstr "使用给定的合并策略" | |
17213 | ||
a6cd2cc4 | 17214 | #: builtin/rebase.c:1479 builtin/revert.c:115 |
4c27fcb5 JX |
17215 | msgid "option" |
17216 | msgstr "选项" | |
17217 | ||
a6cd2cc4 | 17218 | #: builtin/rebase.c:1480 |
4c27fcb5 JX |
17219 | msgid "pass the argument through to the merge strategy" |
17220 | msgstr "将参数传递给合并策略" | |
17221 | ||
a6cd2cc4 | 17222 | #: builtin/rebase.c:1483 |
4c27fcb5 JX |
17223 | msgid "rebase all reachable commits up to the root(s)" |
17224 | msgstr "将所有可达的提交变基到根提交" | |
17225 | ||
a6cd2cc4 | 17226 | #: builtin/rebase.c:1500 |
d46c5519 JX |
17227 | msgid "" |
17228 | "the rebase.useBuiltin support has been removed!\n" | |
17229 | "See its entry in 'git help config' for details." | |
17230 | msgstr "" | |
17231 | "对 rebase.useBuiltin 的支持已被删除!\n" | |
17232 | "详见 'git help config' 中的条目。" | |
4c27fcb5 | 17233 | |
a6cd2cc4 | 17234 | #: builtin/rebase.c:1506 |
4c27fcb5 JX |
17235 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
17236 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
17237 | ||
a6cd2cc4 | 17238 | #: builtin/rebase.c:1547 |
d46c5519 JX |
17239 | msgid "" |
17240 | "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." | |
17241 | msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" | |
17242 | ||
a6cd2cc4 | 17243 | #: builtin/rebase.c:1551 |
4c27fcb5 JX |
17244 | msgid "No rebase in progress?" |
17245 | msgstr "没有正在进行的变基?" | |
17246 | ||
a6cd2cc4 | 17247 | #: builtin/rebase.c:1555 |
4c27fcb5 JX |
17248 | msgid "The --edit-todo action can only be used during interactive rebase." |
17249 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
17250 | ||
a6cd2cc4 | 17251 | #: builtin/rebase.c:1578 |
4c27fcb5 JX |
17252 | msgid "Cannot read HEAD" |
17253 | msgstr "不能读取 HEAD" | |
17254 | ||
a6cd2cc4 | 17255 | #: builtin/rebase.c:1590 |
4c27fcb5 JX |
17256 | msgid "" |
17257 | "You must edit all merge conflicts and then\n" | |
17258 | "mark them as resolved using git add" | |
17259 | msgstr "" | |
17260 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
17261 | "命令将它们标记为已解决" | |
17262 | ||
a6cd2cc4 | 17263 | #: builtin/rebase.c:1609 |
4c27fcb5 JX |
17264 | msgid "could not discard worktree changes" |
17265 | msgstr "无法丢弃工作区变更" | |
17266 | ||
a6cd2cc4 | 17267 | #: builtin/rebase.c:1628 |
4c27fcb5 JX |
17268 | #, c-format |
17269 | msgid "could not move back to %s" | |
17270 | msgstr "无法移回 %s" | |
17271 | ||
a6cd2cc4 | 17272 | #: builtin/rebase.c:1673 |
4c27fcb5 JX |
17273 | #, c-format |
17274 | msgid "" | |
17275 | "It seems that there is already a %s directory, and\n" | |
17276 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
17277 | "case, please try\n" | |
17278 | "\t%s\n" | |
17279 | "If that is not the case, please\n" | |
17280 | "\t%s\n" | |
17281 | "and run me again. I am stopping in case you still have something\n" | |
17282 | "valuable there.\n" | |
17283 | msgstr "" | |
17284 | "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n" | |
17285 | "如果是这样,请执行\n" | |
17286 | "\t%s\n" | |
17287 | "如果不是这样,请执行\n" | |
17288 | "\t%s\n" | |
17289 | "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n" | |
17290 | ||
a6cd2cc4 | 17291 | #: builtin/rebase.c:1694 |
4c27fcb5 JX |
17292 | msgid "switch `C' expects a numerical value" |
17293 | msgstr "开关 `C' 期望一个数字值" | |
17294 | ||
a6cd2cc4 | 17295 | #: builtin/rebase.c:1735 |
4c27fcb5 JX |
17296 | #, c-format |
17297 | msgid "Unknown mode: %s" | |
17298 | msgstr "未知模式:%s" | |
17299 | ||
a6cd2cc4 | 17300 | #: builtin/rebase.c:1757 |
4c27fcb5 JX |
17301 | msgid "--strategy requires --merge or --interactive" |
17302 | msgstr "--strategy 需要 --merge 或 --interactive" | |
17303 | ||
a6cd2cc4 JX |
17304 | #: builtin/rebase.c:1797 |
17305 | msgid "--reschedule-failed-exec requires --exec or --interactive" | |
17306 | msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" | |
17307 | ||
17308 | #: builtin/rebase.c:1809 | |
06991777 | 17309 | msgid "cannot combine am options with either interactive or merge options" |
5b533632 | 17310 | msgstr "不能将 am 选项与交互或合并选项同时使用" |
4c27fcb5 | 17311 | |
a6cd2cc4 | 17312 | #: builtin/rebase.c:1828 |
06991777 | 17313 | msgid "cannot combine '--preserve-merges' with '--rebase-merges'" |
5b533632 | 17314 | msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" |
4c27fcb5 | 17315 | |
a6cd2cc4 | 17316 | #: builtin/rebase.c:1832 |
06991777 JX |
17317 | msgid "" |
17318 | "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" | |
17319 | msgstr "" | |
5b533632 | 17320 | "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" |
4c27fcb5 | 17321 | |
a6cd2cc4 | 17322 | #: builtin/rebase.c:1838 |
06991777 | 17323 | msgid "cannot combine '--rebase-merges' with '--strategy-option'" |
5b533632 | 17324 | msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用" |
4c27fcb5 | 17325 | |
a6cd2cc4 | 17326 | #: builtin/rebase.c:1841 |
06991777 | 17327 | msgid "cannot combine '--rebase-merges' with '--strategy'" |
5b533632 | 17328 | msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用" |
4c27fcb5 | 17329 | |
a6cd2cc4 | 17330 | #: builtin/rebase.c:1865 |
4c27fcb5 JX |
17331 | #, c-format |
17332 | msgid "invalid upstream '%s'" | |
17333 | msgstr "无效的上游 '%s'" | |
17334 | ||
a6cd2cc4 | 17335 | #: builtin/rebase.c:1871 |
4c27fcb5 JX |
17336 | msgid "Could not create new root commit" |
17337 | msgstr "不能创建新的根提交" | |
17338 | ||
a6cd2cc4 | 17339 | #: builtin/rebase.c:1889 |
4c27fcb5 JX |
17340 | #, c-format |
17341 | msgid "'%s': need exactly one merge base" | |
17342 | msgstr "'%s':只需要一个合并基线" | |
17343 | ||
a6cd2cc4 | 17344 | #: builtin/rebase.c:1896 |
4c27fcb5 JX |
17345 | #, c-format |
17346 | msgid "Does not point to a valid commit '%s'" | |
17347 | msgstr "没有指向一个有效的提交 '%s'" | |
17348 | ||
a6cd2cc4 | 17349 | #: builtin/rebase.c:1921 |
4c27fcb5 JX |
17350 | #, c-format |
17351 | msgid "fatal: no such branch/commit '%s'" | |
06991777 | 17352 | msgstr "致命错误:无此分支/提交 '%s'" |
4c27fcb5 | 17353 | |
a6cd2cc4 JX |
17354 | #: builtin/rebase.c:1929 builtin/submodule--helper.c:38 |
17355 | #: builtin/submodule--helper.c:1934 | |
4c27fcb5 JX |
17356 | #, c-format |
17357 | msgid "No such ref: %s" | |
17358 | msgstr "没有这样的引用:%s" | |
17359 | ||
a6cd2cc4 | 17360 | #: builtin/rebase.c:1940 |
4c27fcb5 JX |
17361 | msgid "Could not resolve HEAD to a revision" |
17362 | msgstr "无法将 HEAD 解析为一个版本" | |
17363 | ||
a6cd2cc4 | 17364 | #: builtin/rebase.c:1981 |
4c27fcb5 JX |
17365 | msgid "Cannot autostash" |
17366 | msgstr "无法 autostash" | |
17367 | ||
a6cd2cc4 | 17368 | #: builtin/rebase.c:1984 |
4c27fcb5 JX |
17369 | #, c-format |
17370 | msgid "Unexpected stash response: '%s'" | |
17371 | msgstr "意外的 stash 响应:'%s'" | |
17372 | ||
a6cd2cc4 | 17373 | #: builtin/rebase.c:1990 |
4c27fcb5 JX |
17374 | #, c-format |
17375 | msgid "Could not create directory for '%s'" | |
17376 | msgstr "不能为 '%s' 创建目录" | |
17377 | ||
a6cd2cc4 | 17378 | #: builtin/rebase.c:1993 |
4c27fcb5 JX |
17379 | #, c-format |
17380 | msgid "Created autostash: %s\n" | |
17381 | msgstr "创建了 autostash:%s\n" | |
17382 | ||
a6cd2cc4 | 17383 | #: builtin/rebase.c:1996 |
4c27fcb5 JX |
17384 | msgid "could not reset --hard" |
17385 | msgstr "无法 reset --hard" | |
17386 | ||
a6cd2cc4 | 17387 | #: builtin/rebase.c:1997 builtin/reset.c:114 |
4c27fcb5 JX |
17388 | #, c-format |
17389 | msgid "HEAD is now at %s" | |
17390 | msgstr "HEAD 现在位于 %s" | |
17391 | ||
a6cd2cc4 | 17392 | #: builtin/rebase.c:2013 |
4c27fcb5 JX |
17393 | msgid "Please commit or stash them." |
17394 | msgstr "请提交或贮藏修改。" | |
17395 | ||
a6cd2cc4 | 17396 | #: builtin/rebase.c:2040 |
4c27fcb5 JX |
17397 | #, c-format |
17398 | msgid "could not parse '%s'" | |
17399 | msgstr "无法解析 '%s'" | |
17400 | ||
a6cd2cc4 | 17401 | #: builtin/rebase.c:2053 |
4c27fcb5 JX |
17402 | #, c-format |
17403 | msgid "could not switch to %s" | |
17404 | msgstr "无法切换到 %s" | |
17405 | ||
a6cd2cc4 | 17406 | #: builtin/rebase.c:2064 |
4c27fcb5 JX |
17407 | msgid "HEAD is up to date." |
17408 | msgstr "HEAD 是最新的。" | |
17409 | ||
a6cd2cc4 | 17410 | #: builtin/rebase.c:2066 |
4c27fcb5 JX |
17411 | #, c-format |
17412 | msgid "Current branch %s is up to date.\n" | |
17413 | msgstr "当前分支 %s 是最新的。\n" | |
17414 | ||
a6cd2cc4 | 17415 | #: builtin/rebase.c:2074 |
4c27fcb5 JX |
17416 | msgid "HEAD is up to date, rebase forced." |
17417 | msgstr "HEAD 是最新的,强制变基。" | |
17418 | ||
a6cd2cc4 | 17419 | #: builtin/rebase.c:2076 |
4c27fcb5 JX |
17420 | #, c-format |
17421 | msgid "Current branch %s is up to date, rebase forced.\n" | |
17422 | msgstr "当前分支 %s 是最新的,强制变基。\n" | |
17423 | ||
a6cd2cc4 | 17424 | #: builtin/rebase.c:2084 |
4c27fcb5 JX |
17425 | msgid "The pre-rebase hook refused to rebase." |
17426 | msgstr "pre-rebase 钩子拒绝了变基操作。" | |
17427 | ||
a6cd2cc4 | 17428 | #: builtin/rebase.c:2091 |
4c27fcb5 JX |
17429 | #, c-format |
17430 | msgid "Changes to %s:\n" | |
17431 | msgstr "到 %s 的变更:\n" | |
17432 | ||
a6cd2cc4 | 17433 | #: builtin/rebase.c:2094 |
4c27fcb5 JX |
17434 | #, c-format |
17435 | msgid "Changes from %s to %s:\n" | |
17436 | msgstr "从 %s 到 %s 的变更:\n" | |
17437 | ||
a6cd2cc4 | 17438 | #: builtin/rebase.c:2119 |
4c27fcb5 JX |
17439 | #, c-format |
17440 | msgid "First, rewinding head to replay your work on top of it...\n" | |
17441 | msgstr "首先,回退头指针以便在其上重放您的工作...\n" | |
17442 | ||
a6cd2cc4 | 17443 | #: builtin/rebase.c:2128 |
4c27fcb5 JX |
17444 | msgid "Could not detach HEAD" |
17445 | msgstr "无法分离头指针" | |
17446 | ||
a6cd2cc4 | 17447 | #: builtin/rebase.c:2137 |
4c27fcb5 JX |
17448 | #, c-format |
17449 | msgid "Fast-forwarded %s to %s.\n" | |
17450 | msgstr "快进 %s 到 %s。\n" | |
17451 | ||
a6cd2cc4 | 17452 | #: builtin/receive-pack.c:32 |
5b04ee3b | 17453 | msgid "git receive-pack <git-dir>" |
58b6f078 | 17454 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 17455 | |
a6cd2cc4 | 17456 | #: builtin/receive-pack.c:832 |
a0b6b246 JX |
17457 | msgid "" |
17458 | "By default, updating the current branch in a non-bare repository\n" | |
17459 | "is denied, because it will make the index and work tree inconsistent\n" | |
17460 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
17461 | "the work tree to HEAD.\n" | |
17462 | "\n" | |
1a79b2f1 JX |
17463 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
17464 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
17465 | "its current branch; however, this is not recommended unless you\n" |
17466 | "arranged to update its work tree to match what you pushed in some\n" | |
17467 | "other way.\n" | |
17468 | "\n" | |
17469 | "To squelch this message and still keep the default behaviour, set\n" | |
17470 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
17471 | msgstr "" | |
17472 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
17473 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
17474 | "\n" | |
17475 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
17476 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
17477 | "用某种方式将其工作区更新至您推送的状态。\n" | |
17478 | "\n" | |
17479 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
17480 | "配置变量为 'refuse'。" | |
17481 | ||
a6cd2cc4 | 17482 | #: builtin/receive-pack.c:852 |
a0b6b246 JX |
17483 | msgid "" |
17484 | "By default, deleting the current branch is denied, because the next\n" | |
17485 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
17486 | "\n" | |
17487 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
17488 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
17489 | "current branch, with or without a warning message.\n" | |
17490 | "\n" | |
17491 | "To squelch this message, you can set it to 'refuse'." | |
17492 | msgstr "" | |
17493 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 17494 | "导致困惑。\n" |
a0b6b246 JX |
17495 | "\n" |
17496 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 17497 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
17498 | "\n" |
17499 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
17500 | ||
a6cd2cc4 | 17501 | #: builtin/receive-pack.c:1938 |
5b04ee3b JX |
17502 | msgid "quiet" |
17503 | msgstr "静默模式" | |
17504 | ||
a6cd2cc4 | 17505 | #: builtin/receive-pack.c:1952 |
5b04ee3b JX |
17506 | msgid "You must specify a directory." |
17507 | msgstr "您必须指定一个目录。" | |
17508 | ||
06991777 JX |
17509 | #: builtin/reflog.c:17 |
17510 | msgid "" | |
17511 | "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" | |
17512 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " | |
17513 | "<refs>..." | |
17514 | msgstr "" | |
17515 | "git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--" | |
17516 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引" | |
17517 | "用>..." | |
17518 | ||
17519 | #: builtin/reflog.c:22 | |
17520 | msgid "" | |
17521 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " | |
17522 | "<refs>..." | |
17523 | msgstr "" | |
17524 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引" | |
17525 | "用>..." | |
17526 | ||
17527 | #: builtin/reflog.c:25 | |
17528 | msgid "git reflog exists <ref>" | |
17529 | msgstr "git reflog exists <引用>" | |
17530 | ||
17531 | #: builtin/reflog.c:567 builtin/reflog.c:572 | |
2e8451e8 JX |
17532 | #, c-format |
17533 | msgid "'%s' is not a valid timestamp" | |
17534 | msgstr "'%s' 不是一个有效的时间戳" | |
17535 | ||
06991777 JX |
17536 | #: builtin/reflog.c:605 |
17537 | #, c-format | |
17538 | msgid "Marking reachable objects..." | |
17539 | msgstr "正在标记可达对象..." | |
17540 | ||
17541 | #: builtin/reflog.c:643 | |
17542 | #, c-format | |
17543 | msgid "%s points nowhere!" | |
17544 | msgstr "%s 指向不存在!" | |
17545 | ||
17546 | #: builtin/reflog.c:695 | |
17547 | msgid "no reflog specified to delete" | |
17548 | msgstr "未指定要删除的引用日志" | |
17549 | ||
17550 | #: builtin/reflog.c:704 | |
17551 | #, c-format | |
17552 | msgid "not a reflog: %s" | |
17553 | msgstr "不是一个引用日志:%s" | |
17554 | ||
17555 | #: builtin/reflog.c:709 | |
17556 | #, c-format | |
17557 | msgid "no reflog for '%s'" | |
17558 | msgstr "没有 '%s' 的引用日志" | |
17559 | ||
17560 | #: builtin/reflog.c:755 | |
17561 | #, c-format | |
17562 | msgid "invalid ref format: %s" | |
17563 | msgstr "无效的引用格式:%s" | |
17564 | ||
17565 | #: builtin/reflog.c:764 | |
17566 | msgid "git reflog [ show | expire | delete | exists ]" | |
17567 | msgstr "git reflog [ show | expire | delete | exists ]" | |
17568 | ||
4c27fcb5 | 17569 | #: builtin/remote.c:16 |
ef317cd5 | 17570 | msgid "git remote [-v | --verbose]" |
07432cef | 17571 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 17572 | |
4c27fcb5 | 17573 | #: builtin/remote.c:17 |
ef317cd5 | 17574 | msgid "" |
814ff314 | 17575 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
17576 | "mirror=<fetch|push>] <name> <url>" |
17577 | msgstr "" | |
814ff314 | 17578 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 17579 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 17580 | |
4c27fcb5 | 17581 | #: builtin/remote.c:18 builtin/remote.c:38 |
ef317cd5 | 17582 | msgid "git remote rename <old> <new>" |
07432cef | 17583 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 17584 | |
4c27fcb5 | 17585 | #: builtin/remote.c:19 builtin/remote.c:43 |
ef317cd5 | 17586 | msgid "git remote remove <name>" |
07432cef | 17587 | msgstr "git remote remove <名称>" |
ef317cd5 | 17588 | |
4c27fcb5 | 17589 | #: builtin/remote.c:20 builtin/remote.c:48 |
814ff314 JX |
17590 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
17591 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 17592 | |
4c27fcb5 | 17593 | #: builtin/remote.c:21 |
ef317cd5 | 17594 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 17595 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 17596 | |
4c27fcb5 | 17597 | #: builtin/remote.c:22 |
ef317cd5 | 17598 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 17599 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 17600 | |
4c27fcb5 | 17601 | #: builtin/remote.c:23 |
ef317cd5 JX |
17602 | msgid "" |
17603 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 17604 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 17605 | |
4c27fcb5 | 17606 | #: builtin/remote.c:24 |
ef317cd5 | 17607 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 17608 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 17609 | |
4c27fcb5 | 17610 | #: builtin/remote.c:25 builtin/remote.c:74 |
94550ed3 JX |
17611 | msgid "git remote get-url [--push] [--all] <name>" |
17612 | msgstr "git remote get-url [--push] [--all] <名称>" | |
17613 | ||
4c27fcb5 | 17614 | #: builtin/remote.c:26 builtin/remote.c:79 |
ef317cd5 | 17615 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 17616 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 17617 | |
4c27fcb5 | 17618 | #: builtin/remote.c:27 builtin/remote.c:80 |
ef317cd5 | 17619 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 17620 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 17621 | |
4c27fcb5 | 17622 | #: builtin/remote.c:28 builtin/remote.c:81 |
ef317cd5 | 17623 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 17624 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 17625 | |
4c27fcb5 | 17626 | #: builtin/remote.c:33 |
ef317cd5 | 17627 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 17628 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 17629 | |
4c27fcb5 | 17630 | #: builtin/remote.c:53 |
ef317cd5 | 17631 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 17632 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 17633 | |
4c27fcb5 | 17634 | #: builtin/remote.c:54 |
ef317cd5 | 17635 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 17636 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 17637 | |
4c27fcb5 | 17638 | #: builtin/remote.c:59 |
ef317cd5 | 17639 | msgid "git remote show [<options>] <name>" |
07432cef | 17640 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 17641 | |
4c27fcb5 | 17642 | #: builtin/remote.c:64 |
ef317cd5 | 17643 | msgid "git remote prune [<options>] <name>" |
07432cef | 17644 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 17645 | |
4c27fcb5 | 17646 | #: builtin/remote.c:69 |
ef317cd5 | 17647 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 17648 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 17649 | |
4c27fcb5 | 17650 | #: builtin/remote.c:98 |
81809b99 | 17651 | #, c-format |
8ada9598 | 17652 | msgid "Updating %s" |
81809b99 | 17653 | msgstr "更新 %s 中" |
8ada9598 | 17654 | |
4c27fcb5 | 17655 | #: builtin/remote.c:130 |
8ada9598 JX |
17656 | msgid "" |
17657 | "--mirror is dangerous and deprecated; please\n" | |
17658 | "\t use --mirror=fetch or --mirror=push instead" | |
17659 | msgstr "" | |
81809b99 JX |
17660 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
17661 | "\t 或 --mirror=push" | |
8ada9598 | 17662 | |
4c27fcb5 | 17663 | #: builtin/remote.c:147 |
81809b99 | 17664 | #, c-format |
8ada9598 | 17665 | msgid "unknown mirror argument: %s" |
81809b99 | 17666 | msgstr "未知的镜像参数:%s" |
8ada9598 | 17667 | |
4c27fcb5 | 17668 | #: builtin/remote.c:163 |
ef317cd5 | 17669 | msgid "fetch the remote branches" |
07432cef | 17670 | msgstr "抓取远程的分支" |
ef317cd5 | 17671 | |
4c27fcb5 | 17672 | #: builtin/remote.c:165 |
ef317cd5 | 17673 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 17674 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 17675 | |
4c27fcb5 | 17676 | #: builtin/remote.c:168 |
ef317cd5 | 17677 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 17678 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 17679 | |
4c27fcb5 | 17680 | #: builtin/remote.c:170 |
ef317cd5 | 17681 | msgid "branch(es) to track" |
07432cef | 17682 | msgstr "跟踪的分支" |
ef317cd5 | 17683 | |
4c27fcb5 | 17684 | #: builtin/remote.c:171 |
ef317cd5 | 17685 | msgid "master branch" |
07432cef | 17686 | msgstr "主线分支" |
ef317cd5 | 17687 | |
4c27fcb5 | 17688 | #: builtin/remote.c:173 |
ef317cd5 | 17689 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 17690 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 17691 | |
4c27fcb5 | 17692 | #: builtin/remote.c:185 |
8ada9598 | 17693 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 17694 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 17695 | |
4c27fcb5 | 17696 | #: builtin/remote.c:187 |
8ada9598 | 17697 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 17698 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 17699 | |
4c27fcb5 | 17700 | #: builtin/remote.c:194 builtin/remote.c:636 |
81809b99 | 17701 | #, c-format |
8ada9598 | 17702 | msgid "remote %s already exists." |
81809b99 | 17703 | msgstr "远程 %s 已经存在。" |
8ada9598 | 17704 | |
4c27fcb5 | 17705 | #: builtin/remote.c:198 builtin/remote.c:640 |
81809b99 | 17706 | #, c-format |
8ada9598 | 17707 | msgid "'%s' is not a valid remote name" |
81809b99 | 17708 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 17709 | |
4c27fcb5 | 17710 | #: builtin/remote.c:238 |
81809b99 | 17711 | #, c-format |
8ada9598 | 17712 | msgid "Could not setup master '%s'" |
81809b99 | 17713 | msgstr "无法设置 master '%s'" |
8ada9598 | 17714 | |
4c27fcb5 | 17715 | #: builtin/remote.c:344 |
81809b99 | 17716 | #, c-format |
8ada9598 | 17717 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 17718 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 17719 | |
4c27fcb5 | 17720 | #: builtin/remote.c:443 builtin/remote.c:451 |
8ada9598 | 17721 | msgid "(matching)" |
81809b99 | 17722 | msgstr "(匹配)" |
8ada9598 | 17723 | |
4c27fcb5 | 17724 | #: builtin/remote.c:455 |
8ada9598 | 17725 | msgid "(delete)" |
81809b99 | 17726 | msgstr "(删除)" |
8ada9598 | 17727 | |
4c27fcb5 | 17728 | #: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 |
81809b99 | 17729 | #, c-format |
4c27fcb5 JX |
17730 | msgid "No such remote: '%s'" |
17731 | msgstr "没有此远程仓库:'%s'" | |
8ada9598 | 17732 | |
4c27fcb5 | 17733 | #: builtin/remote.c:646 |
81809b99 | 17734 | #, c-format |
8ada9598 | 17735 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 17736 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 17737 | |
4c27fcb5 | 17738 | #: builtin/remote.c:666 |
8ada9598 JX |
17739 | #, c-format |
17740 | msgid "" | |
d691f479 | 17741 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
17742 | "\t%s\n" |
17743 | "\tPlease update the configuration manually if necessary." | |
17744 | msgstr "" | |
160fb2b2 | 17745 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
17746 | "\t%s\n" |
17747 | "\t如果必要请手动更新配置。" | |
8ada9598 | 17748 | |
4c27fcb5 | 17749 | #: builtin/remote.c:702 |
81809b99 | 17750 | #, c-format |
8ada9598 | 17751 | msgid "deleting '%s' failed" |
81809b99 | 17752 | msgstr "删除 '%s' 失败" |
8ada9598 | 17753 | |
4c27fcb5 | 17754 | #: builtin/remote.c:736 |
81809b99 | 17755 | #, c-format |
8ada9598 | 17756 | msgid "creating '%s' failed" |
81809b99 | 17757 | msgstr "创建 '%s' 失败" |
8ada9598 | 17758 | |
4c27fcb5 | 17759 | #: builtin/remote.c:802 |
8ada9598 JX |
17760 | msgid "" |
17761 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
17762 | "to delete it, use:" | |
17763 | msgid_plural "" | |
17764 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
17765 | "to delete them, use:" | |
5ae481e0 JX |
17766 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
17767 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 17768 | |
4c27fcb5 | 17769 | #: builtin/remote.c:816 |
276ceeaa JX |
17770 | #, c-format |
17771 | msgid "Could not remove config section '%s'" | |
17772 | msgstr "不能移除配置小节 '%s'" | |
17773 | ||
4c27fcb5 | 17774 | #: builtin/remote.c:917 |
8ada9598 JX |
17775 | #, c-format |
17776 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 17777 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 17778 | |
4c27fcb5 | 17779 | #: builtin/remote.c:920 |
8ada9598 | 17780 | msgid " tracked" |
81809b99 | 17781 | msgstr " 已跟踪" |
8ada9598 | 17782 | |
4c27fcb5 | 17783 | #: builtin/remote.c:922 |
8ada9598 | 17784 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 17785 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 17786 | |
4c27fcb5 | 17787 | #: builtin/remote.c:924 |
8ada9598 | 17788 | msgid " ???" |
81809b99 | 17789 | msgstr " ???" |
8ada9598 | 17790 | |
4c27fcb5 | 17791 | #: builtin/remote.c:965 |
8ada9598 JX |
17792 | #, c-format |
17793 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 17794 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 17795 | |
4c27fcb5 | 17796 | #: builtin/remote.c:974 |
81809b99 | 17797 | #, c-format |
276ceeaa JX |
17798 | msgid "rebases interactively onto remote %s" |
17799 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 17800 | |
4c27fcb5 | 17801 | #: builtin/remote.c:976 |
fd8cb379 JX |
17802 | #, c-format |
17803 | msgid "rebases interactively (with merges) onto remote %s" | |
17804 | msgstr "交互式变基(含合并提交)到远程 %s" | |
17805 | ||
4c27fcb5 | 17806 | #: builtin/remote.c:979 |
5c57d762 JX |
17807 | #, c-format |
17808 | msgid "rebases onto remote %s" | |
17809 | msgstr "变基到远程 %s" | |
17810 | ||
4c27fcb5 | 17811 | #: builtin/remote.c:983 |
81809b99 | 17812 | #, c-format |
8ada9598 | 17813 | msgid " merges with remote %s" |
81809b99 | 17814 | msgstr " 与远程 %s 合并" |
8ada9598 | 17815 | |
4c27fcb5 | 17816 | #: builtin/remote.c:986 |
81809b99 | 17817 | #, c-format |
8ada9598 | 17818 | msgid "merges with remote %s" |
81809b99 | 17819 | msgstr "与远程 %s 合并" |
8ada9598 | 17820 | |
4c27fcb5 | 17821 | #: builtin/remote.c:989 |
5c57d762 JX |
17822 | #, c-format |
17823 | msgid "%-*s and with remote %s\n" | |
17824 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 17825 | |
4c27fcb5 | 17826 | #: builtin/remote.c:1032 |
8ada9598 | 17827 | msgid "create" |
81809b99 | 17828 | msgstr "创建" |
8ada9598 | 17829 | |
4c27fcb5 | 17830 | #: builtin/remote.c:1035 |
8ada9598 | 17831 | msgid "delete" |
81809b99 | 17832 | msgstr "删除" |
8ada9598 | 17833 | |
4c27fcb5 | 17834 | #: builtin/remote.c:1039 |
8ada9598 | 17835 | msgid "up to date" |
81809b99 | 17836 | msgstr "最新" |
8ada9598 | 17837 | |
4c27fcb5 | 17838 | #: builtin/remote.c:1042 |
8ada9598 | 17839 | msgid "fast-forwardable" |
81809b99 | 17840 | msgstr "可快进" |
8ada9598 | 17841 | |
4c27fcb5 | 17842 | #: builtin/remote.c:1045 |
8ada9598 | 17843 | msgid "local out of date" |
81809b99 | 17844 | msgstr "本地已过时" |
8ada9598 | 17845 | |
4c27fcb5 | 17846 | #: builtin/remote.c:1052 |
8ada9598 JX |
17847 | #, c-format |
17848 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 17849 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 17850 | |
4c27fcb5 | 17851 | #: builtin/remote.c:1055 |
8ada9598 JX |
17852 | #, c-format |
17853 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 17854 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 17855 | |
4c27fcb5 | 17856 | #: builtin/remote.c:1059 |
8ada9598 JX |
17857 | #, c-format |
17858 | msgid " %-*s forces to %s" | |
81809b99 | 17859 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 17860 | |
4c27fcb5 | 17861 | #: builtin/remote.c:1062 |
8ada9598 JX |
17862 | #, c-format |
17863 | msgid " %-*s pushes to %s" | |
81809b99 | 17864 | msgstr " %-*s 推送至 %s" |
8ada9598 | 17865 | |
4c27fcb5 | 17866 | #: builtin/remote.c:1130 |
ef317cd5 | 17867 | msgid "do not query remotes" |
07432cef | 17868 | msgstr "不查询远程" |
ef317cd5 | 17869 | |
4c27fcb5 | 17870 | #: builtin/remote.c:1157 |
81809b99 | 17871 | #, c-format |
8ada9598 | 17872 | msgid "* remote %s" |
81809b99 | 17873 | msgstr "* 远程 %s" |
8ada9598 | 17874 | |
4c27fcb5 | 17875 | #: builtin/remote.c:1158 |
8ada9598 JX |
17876 | #, c-format |
17877 | msgid " Fetch URL: %s" | |
81809b99 | 17878 | msgstr " 获取地址:%s" |
8ada9598 | 17879 | |
4c27fcb5 | 17880 | #: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 |
8ada9598 | 17881 | msgid "(no URL)" |
81809b99 | 17882 | msgstr "(无 URL)" |
8ada9598 | 17883 | |
a4f16749 JX |
17884 | #. TRANSLATORS: the colon ':' should align |
17885 | #. with the one in " Fetch URL: %s" | |
17886 | #. translation. | |
17887 | #. | |
4c27fcb5 | 17888 | #: builtin/remote.c:1173 builtin/remote.c:1175 |
8ada9598 JX |
17889 | #, c-format |
17890 | msgid " Push URL: %s" | |
81809b99 | 17891 | msgstr " 推送地址:%s" |
8ada9598 | 17892 | |
4c27fcb5 | 17893 | #: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 |
81809b99 | 17894 | #, c-format |
8ada9598 | 17895 | msgid " HEAD branch: %s" |
4375c10e | 17896 | msgstr " HEAD 分支:%s" |
8ada9598 | 17897 | |
5c57d762 | 17898 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 17899 | #: builtin/remote.c:1177 |
5c57d762 JX |
17900 | msgid "(not queried)" |
17901 | msgstr "(未查询)" | |
17902 | ||
4c27fcb5 | 17903 | #: builtin/remote.c:1179 |
5c57d762 JX |
17904 | msgid "(unknown)" |
17905 | msgstr "(未知)" | |
17906 | ||
4c27fcb5 | 17907 | #: builtin/remote.c:1183 |
8ada9598 JX |
17908 | #, c-format |
17909 | msgid "" | |
17910 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 17911 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 17912 | |
4c27fcb5 | 17913 | #: builtin/remote.c:1195 |
81809b99 | 17914 | #, c-format |
8ada9598 JX |
17915 | msgid " Remote branch:%s" |
17916 | msgid_plural " Remote branches:%s" | |
81809b99 | 17917 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 17918 | msgstr[1] " 远程分支:%s" |
8ada9598 | 17919 | |
81809b99 | 17920 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 17921 | #: builtin/remote.c:1198 builtin/remote.c:1224 |
8ada9598 | 17922 | msgid " (status not queried)" |
81809b99 | 17923 | msgstr "(状态未查询)" |
8ada9598 | 17924 | |
4c27fcb5 | 17925 | #: builtin/remote.c:1207 |
8ada9598 JX |
17926 | msgid " Local branch configured for 'git pull':" |
17927 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 17928 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 17929 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 17930 | |
4c27fcb5 | 17931 | #: builtin/remote.c:1215 |
8ada9598 | 17932 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 17933 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 17934 | |
4c27fcb5 | 17935 | #: builtin/remote.c:1221 |
81809b99 | 17936 | #, c-format |
8ada9598 JX |
17937 | msgid " Local ref configured for 'git push'%s:" |
17938 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 17939 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 17940 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 17941 | |
4c27fcb5 | 17942 | #: builtin/remote.c:1242 |
ef317cd5 | 17943 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 17944 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 17945 | |
4c27fcb5 | 17946 | #: builtin/remote.c:1244 |
ef317cd5 | 17947 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 17948 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 17949 | |
4c27fcb5 | 17950 | #: builtin/remote.c:1259 |
8ada9598 | 17951 | msgid "Cannot determine remote HEAD" |
81809b99 | 17952 | msgstr "无法确定远程 HEAD" |
8ada9598 | 17953 | |
4c27fcb5 | 17954 | #: builtin/remote.c:1261 |
8ada9598 | 17955 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 17956 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 17957 | |
4c27fcb5 | 17958 | #: builtin/remote.c:1271 |
81809b99 | 17959 | #, c-format |
8ada9598 | 17960 | msgid "Could not delete %s" |
81809b99 | 17961 | msgstr "无法删除 %s" |
8ada9598 | 17962 | |
4c27fcb5 | 17963 | #: builtin/remote.c:1279 |
81809b99 | 17964 | #, c-format |
8ada9598 | 17965 | msgid "Not a valid ref: %s" |
81809b99 | 17966 | msgstr "不是一个有效引用:%s" |
8ada9598 | 17967 | |
4c27fcb5 | 17968 | #: builtin/remote.c:1281 |
81809b99 | 17969 | #, c-format |
8ada9598 | 17970 | msgid "Could not setup %s" |
81809b99 | 17971 | msgstr "不能设置 %s" |
8ada9598 JX |
17972 | |
17973 | # 译者:注意保持前导空格 | |
4c27fcb5 | 17974 | #: builtin/remote.c:1299 |
81809b99 | 17975 | #, c-format |
8ada9598 | 17976 | msgid " %s will become dangling!" |
e640d114 | 17977 | msgstr " %s 将成为悬空状态!" |
8ada9598 JX |
17978 | |
17979 | # 译者:注意保持前导空格 | |
4c27fcb5 | 17980 | #: builtin/remote.c:1300 |
81809b99 | 17981 | #, c-format |
8ada9598 | 17982 | msgid " %s has become dangling!" |
e640d114 | 17983 | msgstr " %s 已成为悬空状态!" |
8ada9598 | 17984 | |
4c27fcb5 | 17985 | #: builtin/remote.c:1310 |
81809b99 | 17986 | #, c-format |
8ada9598 | 17987 | msgid "Pruning %s" |
81809b99 | 17988 | msgstr "修剪 %s" |
8ada9598 | 17989 | |
4c27fcb5 | 17990 | #: builtin/remote.c:1311 |
8ada9598 JX |
17991 | #, c-format |
17992 | msgid "URL: %s" | |
81809b99 | 17993 | msgstr "URL:%s" |
8ada9598 | 17994 | |
4c27fcb5 | 17995 | #: builtin/remote.c:1327 |
8ada9598 JX |
17996 | #, c-format |
17997 | msgid " * [would prune] %s" | |
81809b99 | 17998 | msgstr " * [将删除] %s" |
8ada9598 | 17999 | |
4c27fcb5 | 18000 | #: builtin/remote.c:1330 |
8ada9598 JX |
18001 | #, c-format |
18002 | msgid " * [pruned] %s" | |
81809b99 | 18003 | msgstr " * [已删除] %s" |
8ada9598 | 18004 | |
4c27fcb5 | 18005 | #: builtin/remote.c:1375 |
ef317cd5 | 18006 | msgid "prune remotes after fetching" |
07432cef | 18007 | msgstr "抓取后清除远程" |
ef317cd5 | 18008 | |
4c27fcb5 | 18009 | #: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 |
81809b99 | 18010 | #, c-format |
8ada9598 | 18011 | msgid "No such remote '%s'" |
81809b99 | 18012 | msgstr "没有此远程 '%s'" |
8ada9598 | 18013 | |
4c27fcb5 | 18014 | #: builtin/remote.c:1454 |
ef317cd5 | 18015 | msgid "add branch" |
07432cef | 18016 | msgstr "添加分支" |
ef317cd5 | 18017 | |
4c27fcb5 | 18018 | #: builtin/remote.c:1461 |
8ada9598 | 18019 | msgid "no remote specified" |
81809b99 | 18020 | msgstr "未指定远程" |
8ada9598 | 18021 | |
4c27fcb5 | 18022 | #: builtin/remote.c:1478 |
94550ed3 JX |
18023 | msgid "query push URLs rather than fetch URLs" |
18024 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
18025 | ||
4c27fcb5 | 18026 | #: builtin/remote.c:1480 |
94550ed3 JX |
18027 | msgid "return all URLs" |
18028 | msgstr "返回所有 URL 地址" | |
18029 | ||
4c27fcb5 | 18030 | #: builtin/remote.c:1508 |
94550ed3 JX |
18031 | #, c-format |
18032 | msgid "no URLs configured for remote '%s'" | |
18033 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
18034 | ||
4c27fcb5 | 18035 | #: builtin/remote.c:1534 |
ef317cd5 | 18036 | msgid "manipulate push URLs" |
07432cef | 18037 | msgstr "操作推送 URLS" |
ef317cd5 | 18038 | |
4c27fcb5 | 18039 | #: builtin/remote.c:1536 |
ef317cd5 | 18040 | msgid "add URL" |
07432cef | 18041 | msgstr "添加 URL" |
ef317cd5 | 18042 | |
4c27fcb5 | 18043 | #: builtin/remote.c:1538 |
ef317cd5 | 18044 | msgid "delete URLs" |
07432cef | 18045 | msgstr "删除 URLS" |
ef317cd5 | 18046 | |
4c27fcb5 | 18047 | #: builtin/remote.c:1545 |
8ada9598 | 18048 | msgid "--add --delete doesn't make sense" |
81809b99 | 18049 | msgstr "--add --delete 无意义" |
8ada9598 | 18050 | |
4c27fcb5 | 18051 | #: builtin/remote.c:1584 |
81809b99 | 18052 | #, c-format |
8ada9598 | 18053 | msgid "Invalid old URL pattern: %s" |
4375c10e | 18054 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 18055 | |
4c27fcb5 | 18056 | #: builtin/remote.c:1592 |
81809b99 | 18057 | #, c-format |
8ada9598 | 18058 | msgid "No such URL found: %s" |
4375c10e | 18059 | msgstr "未找到此 URL:%s" |
8ada9598 | 18060 | |
4c27fcb5 | 18061 | #: builtin/remote.c:1594 |
8ada9598 | 18062 | msgid "Will not delete all non-push URLs" |
4375c10e | 18063 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 18064 | |
4c27fcb5 | 18065 | #: builtin/remote.c:1610 |
ef317cd5 | 18066 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 18067 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 18068 | |
4c27fcb5 | 18069 | #: builtin/remote.c:1641 |
a0b6b246 JX |
18070 | #, c-format |
18071 | msgid "Unknown subcommand: %s" | |
18072 | msgstr "未知子命令:%s" | |
18073 | ||
4c27fcb5 | 18074 | #: builtin/repack.c:22 |
814ff314 JX |
18075 | msgid "git repack [<options>]" |
18076 | msgstr "git repack [<选项>]" | |
90314792 | 18077 | |
4c27fcb5 | 18078 | #: builtin/repack.c:27 |
1a79b2f1 JX |
18079 | msgid "" |
18080 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
18081 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
18082 | msgstr "" | |
18083 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
18084 | "或禁用 pack.writebitmaps 配置。" | |
18085 | ||
a6cd2cc4 | 18086 | #: builtin/repack.c:190 |
06991777 | 18087 | msgid "could not start pack-objects to repack promisor objects" |
5b533632 | 18088 | msgstr "无法开始 pack-objects 来重新打包 promisor 对象" |
06991777 | 18089 | |
a6cd2cc4 | 18090 | #: builtin/repack.c:229 builtin/repack.c:408 |
06991777 | 18091 | msgid "repack: Expecting full hex object ID lines only from pack-objects." |
5b533632 | 18092 | msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。" |
06991777 | 18093 | |
a6cd2cc4 | 18094 | #: builtin/repack.c:246 |
06991777 | 18095 | msgid "could not finish pack-objects to repack promisor objects" |
5b533632 | 18096 | msgstr "无法完成 pack-objects 来重新打包 promisor 对象" |
06991777 | 18097 | |
a6cd2cc4 | 18098 | #: builtin/repack.c:284 |
90314792 JX |
18099 | msgid "pack everything in a single pack" |
18100 | msgstr "所有内容打包到一个包文件中" | |
18101 | ||
a6cd2cc4 | 18102 | #: builtin/repack.c:286 |
90314792 JX |
18103 | msgid "same as -a, and turn unreachable objects loose" |
18104 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
18105 | ||
a6cd2cc4 | 18106 | #: builtin/repack.c:289 |
90314792 JX |
18107 | msgid "remove redundant packs, and run git-prune-packed" |
18108 | msgstr "删除多余的包,运行 git-prune-packed" | |
18109 | ||
a6cd2cc4 | 18110 | #: builtin/repack.c:291 |
90314792 JX |
18111 | msgid "pass --no-reuse-delta to git-pack-objects" |
18112 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
18113 | ||
a6cd2cc4 | 18114 | #: builtin/repack.c:293 |
90314792 JX |
18115 | msgid "pass --no-reuse-object to git-pack-objects" |
18116 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
18117 | ||
a6cd2cc4 | 18118 | #: builtin/repack.c:295 |
90314792 JX |
18119 | msgid "do not run git-update-server-info" |
18120 | msgstr "不运行 git-update-server-info" | |
18121 | ||
a6cd2cc4 | 18122 | #: builtin/repack.c:298 |
90314792 JX |
18123 | msgid "pass --local to git-pack-objects" |
18124 | msgstr "向 git-pack-objects 传递参数 --local" | |
18125 | ||
a6cd2cc4 | 18126 | #: builtin/repack.c:300 |
6c94aba5 JX |
18127 | msgid "write bitmap index" |
18128 | msgstr "写 bitmap 索引" | |
18129 | ||
a6cd2cc4 | 18130 | #: builtin/repack.c:302 |
4c27fcb5 JX |
18131 | msgid "pass --delta-islands to git-pack-objects" |
18132 | msgstr "向 git-pack-objects 传递参数 --delta-islands" | |
18133 | ||
a6cd2cc4 | 18134 | #: builtin/repack.c:303 |
90314792 JX |
18135 | msgid "approxidate" |
18136 | msgstr "近似日期" | |
18137 | ||
a6cd2cc4 | 18138 | #: builtin/repack.c:304 |
90314792 JX |
18139 | msgid "with -A, do not loosen objects older than this" |
18140 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
18141 | ||
a6cd2cc4 | 18142 | #: builtin/repack.c:306 |
5c57d762 JX |
18143 | msgid "with -a, repack unreachable objects" |
18144 | msgstr "使用 -a ,重新对不可达对象打包" | |
18145 | ||
a6cd2cc4 | 18146 | #: builtin/repack.c:308 |
90314792 JX |
18147 | msgid "size of the window used for delta compression" |
18148 | msgstr "用于增量压缩的窗口值" | |
18149 | ||
a6cd2cc4 | 18150 | #: builtin/repack.c:309 builtin/repack.c:315 |
8376b58d JX |
18151 | msgid "bytes" |
18152 | msgstr "字节" | |
18153 | ||
a6cd2cc4 | 18154 | #: builtin/repack.c:310 |
90314792 JX |
18155 | msgid "same as the above, but limit memory size instead of entries count" |
18156 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
18157 | ||
a6cd2cc4 | 18158 | #: builtin/repack.c:312 |
90314792 JX |
18159 | msgid "limits the maximum delta depth" |
18160 | msgstr "限制最大增量深度" | |
18161 | ||
a6cd2cc4 | 18162 | #: builtin/repack.c:314 |
a4f16749 JX |
18163 | msgid "limits the maximum number of threads" |
18164 | msgstr "限制最大线程数" | |
18165 | ||
a6cd2cc4 | 18166 | #: builtin/repack.c:316 |
90314792 | 18167 | msgid "maximum size of each packfile" |
dbd6cced | 18168 | msgstr "每个包文件的最大尺寸" |
90314792 | 18169 | |
a6cd2cc4 | 18170 | #: builtin/repack.c:318 |
6c94aba5 JX |
18171 | msgid "repack objects in packs marked with .keep" |
18172 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
18173 | ||
a6cd2cc4 | 18174 | #: builtin/repack.c:320 |
fd8cb379 JX |
18175 | msgid "do not repack this pack" |
18176 | msgstr "不要对该包文件重新打包" | |
18177 | ||
a6cd2cc4 | 18178 | #: builtin/repack.c:330 |
94550ed3 JX |
18179 | msgid "cannot delete packs in a precious-objects repo" |
18180 | msgstr "不能删除珍品仓库中的打包文件" | |
18181 | ||
a6cd2cc4 | 18182 | #: builtin/repack.c:334 |
5c57d762 JX |
18183 | msgid "--keep-unreachable and -A are incompatible" |
18184 | msgstr "--keep-unreachable 和 -A 不兼容" | |
18185 | ||
a6cd2cc4 | 18186 | #: builtin/repack.c:417 |
06991777 JX |
18187 | msgid "Nothing new to pack." |
18188 | msgstr "没有新的要打包。" | |
18189 | ||
a6cd2cc4 | 18190 | #: builtin/repack.c:478 |
06991777 JX |
18191 | #, c-format |
18192 | msgid "" | |
18193 | "WARNING: Some packs in use have been renamed by\n" | |
18194 | "WARNING: prefixing old- to their name, in order to\n" | |
18195 | "WARNING: replace them with the new version of the\n" | |
18196 | "WARNING: file. But the operation failed, and the\n" | |
18197 | "WARNING: attempt to rename them back to their\n" | |
18198 | "WARNING: original names also failed.\n" | |
18199 | "WARNING: Please rename them in %s manually:\n" | |
18200 | msgstr "" | |
18201 | "警告:为了将包文件替换为新版本,一些使用中的包已经\n" | |
18202 | "警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n" | |
18203 | "警告:并且尝试重命名改回原有文件名的操作也失败。\n" | |
18204 | "警告:请手动将 %s 下的这些文件重命名:\n" | |
18205 | ||
a6cd2cc4 | 18206 | #: builtin/repack.c:526 |
90314792 | 18207 | #, c-format |
5c57d762 | 18208 | msgid "failed to remove '%s'" |
c1ac5258 | 18209 | msgstr "删除 '%s' 失败" |
90314792 | 18210 | |
fd8cb379 | 18211 | #: builtin/replace.c:22 |
ef317cd5 | 18212 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 18213 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 18214 | |
fd8cb379 | 18215 | #: builtin/replace.c:23 |
6acbf033 JX |
18216 | msgid "git replace [-f] --edit <object>" |
18217 | msgstr "git replace [-f] --edit <对象>" | |
18218 | ||
fd8cb379 | 18219 | #: builtin/replace.c:24 |
6acbf033 JX |
18220 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
18221 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
18222 | ||
fd8cb379 JX |
18223 | #: builtin/replace.c:25 |
18224 | msgid "git replace [-f] --convert-graft-file" | |
18225 | msgstr "git replace [-f] --convert-graft-file" | |
18226 | ||
18227 | #: builtin/replace.c:26 | |
ef317cd5 | 18228 | msgid "git replace -d <object>..." |
07432cef | 18229 | msgstr "git replace -d <对象>..." |
ef317cd5 | 18230 | |
fd8cb379 | 18231 | #: builtin/replace.c:27 |
cfff71a9 JX |
18232 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
18233 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 18234 | |
d46c5519 | 18235 | #: builtin/replace.c:90 |
c1ac5258 JX |
18236 | #, c-format |
18237 | msgid "" | |
18238 | "invalid replace format '%s'\n" | |
18239 | "valid formats are 'short', 'medium' and 'long'" | |
18240 | msgstr "" | |
18241 | "无效的替换格式 '%s'\n" | |
18242 | "有效的格式有 'short'、'medium' 和 'long'" | |
18243 | ||
d46c5519 | 18244 | #: builtin/replace.c:125 |
c1ac5258 JX |
18245 | #, c-format |
18246 | msgid "replace ref '%s' not found" | |
18247 | msgstr "未发现替换引用 '%s'" | |
18248 | ||
d46c5519 | 18249 | #: builtin/replace.c:141 |
c1ac5258 JX |
18250 | #, c-format |
18251 | msgid "Deleted replace ref '%s'" | |
e640d114 | 18252 | msgstr "已删除替换引用 '%s'" |
c1ac5258 | 18253 | |
d46c5519 | 18254 | #: builtin/replace.c:153 |
c1ac5258 JX |
18255 | #, c-format |
18256 | msgid "'%s' is not a valid ref name" | |
18257 | msgstr "'%s' 不是一个有效的引用名" | |
18258 | ||
d46c5519 | 18259 | #: builtin/replace.c:158 |
c1ac5258 JX |
18260 | #, c-format |
18261 | msgid "replace ref '%s' already exists" | |
18262 | msgstr "替换引用 '%s' 已经存在" | |
18263 | ||
d46c5519 | 18264 | #: builtin/replace.c:178 |
c1ac5258 JX |
18265 | #, c-format |
18266 | msgid "" | |
18267 | "Objects must be of the same type.\n" | |
18268 | "'%s' points to a replaced object of type '%s'\n" | |
18269 | "while '%s' points to a replacement object of type '%s'." | |
18270 | msgstr "" | |
18271 | "对象必须属于同一类型。\n" | |
18272 | "'%s' 指向 '%s' 类型的替换对象\n" | |
18273 | "而 '%s' 指向 '%s' 类型的替换对象。" | |
18274 | ||
d46c5519 | 18275 | #: builtin/replace.c:229 |
c1ac5258 JX |
18276 | #, c-format |
18277 | msgid "unable to open %s for writing" | |
18278 | msgstr "无法为写入打开 %s" | |
18279 | ||
d46c5519 | 18280 | #: builtin/replace.c:242 |
c1ac5258 JX |
18281 | msgid "cat-file reported failure" |
18282 | msgstr "cat-file 报告失败" | |
18283 | ||
d46c5519 | 18284 | #: builtin/replace.c:258 |
c1ac5258 JX |
18285 | #, c-format |
18286 | msgid "unable to open %s for reading" | |
18287 | msgstr "无法为读取打开 %s" | |
18288 | ||
d46c5519 | 18289 | #: builtin/replace.c:272 |
c1ac5258 JX |
18290 | msgid "unable to spawn mktree" |
18291 | msgstr "无法启动 mktree" | |
18292 | ||
d46c5519 | 18293 | #: builtin/replace.c:276 |
c1ac5258 JX |
18294 | msgid "unable to read from mktree" |
18295 | msgstr "无法从 mktree 读取" | |
18296 | ||
d46c5519 | 18297 | #: builtin/replace.c:285 |
c1ac5258 JX |
18298 | msgid "mktree reported failure" |
18299 | msgstr "mktree 报告失败" | |
18300 | ||
d46c5519 | 18301 | #: builtin/replace.c:289 |
c1ac5258 JX |
18302 | msgid "mktree did not return an object name" |
18303 | msgstr "mktree 没有返回一个对象名" | |
18304 | ||
d46c5519 | 18305 | #: builtin/replace.c:298 |
c1ac5258 JX |
18306 | #, c-format |
18307 | msgid "unable to fstat %s" | |
18308 | msgstr "无法对 %s 执行 fstat" | |
18309 | ||
d46c5519 | 18310 | #: builtin/replace.c:303 |
c1ac5258 JX |
18311 | msgid "unable to write object to database" |
18312 | msgstr "无法向数据库写入对象" | |
18313 | ||
d46c5519 JX |
18314 | #: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 |
18315 | #: builtin/replace.c:452 | |
c1ac5258 JX |
18316 | #, c-format |
18317 | msgid "not a valid object name: '%s'" | |
6acbf033 JX |
18318 | msgstr "不是一个有效的对象名:'%s'" |
18319 | ||
d46c5519 | 18320 | #: builtin/replace.c:326 |
c1ac5258 JX |
18321 | #, c-format |
18322 | msgid "unable to get object type for %s" | |
18323 | msgstr "无法得到 %s 的对象类型" | |
18324 | ||
d46c5519 | 18325 | #: builtin/replace.c:342 |
c1ac5258 JX |
18326 | msgid "editing object file failed" |
18327 | msgstr "编辑对象文件失败" | |
18328 | ||
d46c5519 | 18329 | #: builtin/replace.c:351 |
c1ac5258 JX |
18330 | #, c-format |
18331 | msgid "new object is the same as the old one: '%s'" | |
18332 | msgstr "新对象和旧对象相同:'%s'" | |
18333 | ||
d46c5519 JX |
18334 | #: builtin/replace.c:383 |
18335 | #, c-format | |
18336 | msgid "could not parse %s as a commit" | |
18337 | msgstr "无法将 %s 解析为一个提交" | |
18338 | ||
18339 | #: builtin/replace.c:414 | |
6acbf033 JX |
18340 | #, c-format |
18341 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 18342 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 18343 | |
d46c5519 | 18344 | #: builtin/replace.c:416 |
6acbf033 JX |
18345 | #, c-format |
18346 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 18347 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 18348 | |
d46c5519 | 18349 | #: builtin/replace.c:428 |
6acbf033 JX |
18350 | #, c-format |
18351 | msgid "" | |
18352 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
18353 | "instead of --graft" | |
55a16ee4 | 18354 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 18355 | |
d46c5519 | 18356 | #: builtin/replace.c:467 |
6acbf033 | 18357 | #, c-format |
c1ac5258 JX |
18358 | msgid "the original commit '%s' has a gpg signature" |
18359 | msgstr "原始提交 '%s' 中有一个 gpg 签名" | |
6acbf033 | 18360 | |
d46c5519 | 18361 | #: builtin/replace.c:468 |
6acbf033 JX |
18362 | msgid "the signature will be removed in the replacement commit!" |
18363 | msgstr "在替换的提交中签名将被移除!" | |
18364 | ||
d46c5519 | 18365 | #: builtin/replace.c:478 |
6acbf033 JX |
18366 | #, c-format |
18367 | msgid "could not write replacement commit for: '%s'" | |
18368 | msgstr "不能为 '%s' 写替换提交" | |
18369 | ||
d46c5519 | 18370 | #: builtin/replace.c:486 |
c1ac5258 JX |
18371 | #, c-format |
18372 | msgid "graft for '%s' unnecessary" | |
18373 | msgstr "对 '%s' 移植没有必要" | |
18374 | ||
d46c5519 | 18375 | #: builtin/replace.c:490 |
c1ac5258 JX |
18376 | #, c-format |
18377 | msgid "new commit is the same as the old one: '%s'" | |
18378 | msgstr "新提交和旧的一样:'%s'" | |
18379 | ||
d46c5519 | 18380 | #: builtin/replace.c:525 |
fd8cb379 JX |
18381 | #, c-format |
18382 | msgid "" | |
18383 | "could not convert the following graft(s):\n" | |
18384 | "%s" | |
18385 | msgstr "" | |
18386 | "不能转换下列移植:\n" | |
18387 | "%s" | |
18388 | ||
d46c5519 | 18389 | #: builtin/replace.c:546 |
ef317cd5 | 18390 | msgid "list replace refs" |
07432cef | 18391 | msgstr "列出替换的引用" |
ef317cd5 | 18392 | |
d46c5519 | 18393 | #: builtin/replace.c:547 |
ef317cd5 | 18394 | msgid "delete replace refs" |
07432cef | 18395 | msgstr "删除替换的引用" |
ef317cd5 | 18396 | |
d46c5519 | 18397 | #: builtin/replace.c:548 |
6acbf033 JX |
18398 | msgid "edit existing object" |
18399 | msgstr "编辑现存的对象" | |
18400 | ||
d46c5519 | 18401 | #: builtin/replace.c:549 |
6acbf033 JX |
18402 | msgid "change a commit's parents" |
18403 | msgstr "修改一个提交的父提交" | |
18404 | ||
d46c5519 | 18405 | #: builtin/replace.c:550 |
fd8cb379 JX |
18406 | msgid "convert existing graft file" |
18407 | msgstr "转换现存的移植文件" | |
18408 | ||
d46c5519 | 18409 | #: builtin/replace.c:551 |
ef317cd5 | 18410 | msgid "replace the ref if it exists" |
07432cef | 18411 | msgstr "如果存在则替换引用" |
ef317cd5 | 18412 | |
d46c5519 | 18413 | #: builtin/replace.c:553 |
6acbf033 JX |
18414 | msgid "do not pretty-print contents for --edit" |
18415 | msgstr "不要为 --edit 操作美观显示内容" | |
18416 | ||
d46c5519 | 18417 | #: builtin/replace.c:554 |
cfff71a9 JX |
18418 | msgid "use this format" |
18419 | msgstr "使用此格式" | |
18420 | ||
d46c5519 | 18421 | #: builtin/replace.c:567 |
c1ac5258 | 18422 | msgid "--format cannot be used when not listing" |
e640d114 | 18423 | msgstr "不列出时不能使用 --format" |
c1ac5258 | 18424 | |
d46c5519 | 18425 | #: builtin/replace.c:575 |
c1ac5258 JX |
18426 | msgid "-f only makes sense when writing a replacement" |
18427 | msgstr "只有写一个替换时 -f 才有意义" | |
18428 | ||
d46c5519 | 18429 | #: builtin/replace.c:579 |
c1ac5258 JX |
18430 | msgid "--raw only makes sense with --edit" |
18431 | msgstr "--raw 只有和 --edit 共用才有意义" | |
18432 | ||
d46c5519 | 18433 | #: builtin/replace.c:585 |
c1ac5258 JX |
18434 | msgid "-d needs at least one argument" |
18435 | msgstr "-d 需要至少一个参数" | |
18436 | ||
d46c5519 | 18437 | #: builtin/replace.c:591 |
c1ac5258 JX |
18438 | msgid "bad number of arguments" |
18439 | msgstr "错误的参数个数" | |
18440 | ||
d46c5519 | 18441 | #: builtin/replace.c:597 |
c1ac5258 | 18442 | msgid "-e needs exactly one argument" |
e640d114 | 18443 | msgstr "-e 需要且仅需要一个参数" |
c1ac5258 | 18444 | |
d46c5519 | 18445 | #: builtin/replace.c:603 |
c1ac5258 JX |
18446 | msgid "-g needs at least one argument" |
18447 | msgstr "-g 需要至少一个参数" | |
18448 | ||
d46c5519 | 18449 | #: builtin/replace.c:609 |
c1ac5258 JX |
18450 | msgid "--convert-graft-file takes no argument" |
18451 | msgstr "--convert-graft-file 不带参数" | |
18452 | ||
d46c5519 | 18453 | #: builtin/replace.c:615 |
c1ac5258 JX |
18454 | msgid "only one pattern can be given with -l" |
18455 | msgstr "只能为 -l 提供一个模式" | |
18456 | ||
a4f16749 | 18457 | #: builtin/rerere.c:13 |
814ff314 JX |
18458 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
18459 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 18460 | |
4c27fcb5 | 18461 | #: builtin/rerere.c:60 |
ef317cd5 | 18462 | msgid "register clean resolutions in index" |
07432cef | 18463 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 18464 | |
4c27fcb5 JX |
18465 | #: builtin/rerere.c:79 |
18466 | msgid "'git rerere forget' without paths is deprecated" | |
18467 | msgstr "没有路径的 'git rerere forget' 已经过时" | |
18468 | ||
06991777 | 18469 | #: builtin/rerere.c:113 |
4c27fcb5 JX |
18470 | #, c-format |
18471 | msgid "unable to generate diff for '%s'" | |
18472 | msgstr "无法为 '%s' 生成差异" | |
18473 | ||
06991777 | 18474 | #: builtin/reset.c:32 |
ef317cd5 JX |
18475 | msgid "" |
18476 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 18477 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 18478 | |
06991777 | 18479 | #: builtin/reset.c:33 |
a0b6b246 JX |
18480 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
18481 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 18482 | |
06991777 | 18483 | #: builtin/reset.c:34 |
07432cef WS |
18484 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
18485 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 18486 | |
06991777 | 18487 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18488 | msgid "mixed" |
18489 | msgstr "混杂" | |
18490 | ||
06991777 | 18491 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18492 | msgid "soft" |
18493 | msgstr "软性" | |
18494 | ||
06991777 | 18495 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18496 | msgid "hard" |
18497 | msgstr "硬性" | |
18498 | ||
06991777 | 18499 | #: builtin/reset.c:40 |
8ada9598 JX |
18500 | msgid "merge" |
18501 | msgstr "合并" | |
18502 | ||
06991777 | 18503 | #: builtin/reset.c:40 |
c04f5ac3 JX |
18504 | msgid "keep" |
18505 | msgstr "保持" | |
18506 | ||
06991777 | 18507 | #: builtin/reset.c:81 |
c04f5ac3 JX |
18508 | msgid "You do not have a valid HEAD." |
18509 | msgstr "您没有一个有效的 HEAD。" | |
18510 | ||
06991777 | 18511 | #: builtin/reset.c:83 |
c04f5ac3 JX |
18512 | msgid "Failed to find tree of HEAD." |
18513 | msgstr "无法找到 HEAD 指向的树。" | |
18514 | ||
06991777 | 18515 | #: builtin/reset.c:89 |
c04f5ac3 JX |
18516 | #, c-format |
18517 | msgid "Failed to find tree of %s." | |
18518 | msgstr "无法找到 %s 指向的树。" | |
18519 | ||
90e6ef53 | 18520 | # 译者:汉字之间无空格,故删除%s前后空格 |
06991777 | 18521 | #: builtin/reset.c:193 |
c04f5ac3 JX |
18522 | #, c-format |
18523 | msgid "Cannot do a %s reset in the middle of a merge." | |
18524 | msgstr "在合并过程中不能做%s重置操作。" | |
18525 | ||
d46c5519 JX |
18526 | #: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 |
18527 | #: builtin/stash.c:613 | |
ef317cd5 | 18528 | msgid "be quiet, only report errors" |
07432cef | 18529 | msgstr "安静模式,只报告错误" |
ef317cd5 | 18530 | |
06991777 | 18531 | #: builtin/reset.c:295 |
ef317cd5 | 18532 | msgid "reset HEAD and index" |
07432cef | 18533 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 18534 | |
06991777 | 18535 | #: builtin/reset.c:296 |
ef317cd5 | 18536 | msgid "reset only HEAD" |
07432cef | 18537 | msgstr "只重置 HEAD" |
ef317cd5 | 18538 | |
06991777 | 18539 | #: builtin/reset.c:298 builtin/reset.c:300 |
ef317cd5 | 18540 | msgid "reset HEAD, index and working tree" |
07432cef | 18541 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 18542 | |
06991777 | 18543 | #: builtin/reset.c:302 |
ef317cd5 | 18544 | msgid "reset HEAD but keep local changes" |
07432cef | 18545 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 18546 | |
06991777 | 18547 | #: builtin/reset.c:308 |
6c94aba5 JX |
18548 | msgid "record only the fact that removed paths will be added later" |
18549 | msgstr "将删除的路径标记为稍后添加" | |
18550 | ||
06991777 | 18551 | #: builtin/reset.c:326 |
07432cef WS |
18552 | #, c-format |
18553 | msgid "Failed to resolve '%s' as a valid revision." | |
18554 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
18555 | ||
06991777 | 18556 | #: builtin/reset.c:334 |
07432cef WS |
18557 | #, c-format |
18558 | msgid "Failed to resolve '%s' as a valid tree." | |
18559 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
18560 | ||
06991777 | 18561 | #: builtin/reset.c:343 |
c04f5ac3 | 18562 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 18563 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 18564 | |
d46c5519 | 18565 | #: builtin/reset.c:353 |
c04f5ac3 | 18566 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 18567 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 18568 | |
90e6ef53 | 18569 | # 译者:汉字之间无空格,故删除%s前后空格 |
d46c5519 | 18570 | #: builtin/reset.c:355 |
c04f5ac3 JX |
18571 | #, c-format |
18572 | msgid "Cannot do %s reset with paths." | |
18573 | msgstr "不能带路径进行%s重置。" | |
18574 | ||
90e6ef53 | 18575 | # 译者:汉字之间无空格,故删除%s前后空格 |
d46c5519 | 18576 | #: builtin/reset.c:370 |
c04f5ac3 JX |
18577 | #, c-format |
18578 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 18579 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 18580 | |
d46c5519 | 18581 | #: builtin/reset.c:374 |
6c94aba5 JX |
18582 | msgid "-N can only be used with --mixed" |
18583 | msgstr "-N 只能和 --mixed 同时使用" | |
18584 | ||
d46c5519 | 18585 | #: builtin/reset.c:395 |
90314792 | 18586 | msgid "Unstaged changes after reset:" |
160fb2b2 | 18587 | msgstr "重置后取消暂存的变更:" |
90314792 | 18588 | |
d46c5519 | 18589 | #: builtin/reset.c:398 |
4c27fcb5 JX |
18590 | #, c-format |
18591 | msgid "" | |
18592 | "\n" | |
18593 | "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" | |
18594 | "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" | |
18595 | "to make this the default.\n" | |
18596 | msgstr "" | |
18597 | "\n" | |
18598 | "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" | |
18599 | "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" | |
18600 | ||
d46c5519 | 18601 | #: builtin/reset.c:408 |
ef317cd5 JX |
18602 | #, c-format |
18603 | msgid "Could not reset index file to revision '%s'." | |
18604 | msgstr "不能重置索引文件至版本 '%s'。" | |
18605 | ||
d46c5519 | 18606 | #: builtin/reset.c:412 |
07432cef WS |
18607 | msgid "Could not write new index file." |
18608 | msgstr "不能写入新的索引文件。" | |
18609 | ||
a6cd2cc4 | 18610 | #: builtin/rev-list.c:412 |
31e5e17b JX |
18611 | msgid "cannot combine --exclude-promisor-objects and --missing" |
18612 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
18613 | ||
a6cd2cc4 | 18614 | #: builtin/rev-list.c:473 |
5809aa05 JX |
18615 | msgid "object filtering requires --objects" |
18616 | msgstr "对象过滤需要 --objects" | |
18617 | ||
a6cd2cc4 | 18618 | #: builtin/rev-list.c:476 |
5809aa05 JX |
18619 | #, c-format |
18620 | msgid "invalid sparse value '%s'" | |
18621 | msgstr "无效的稀疏值 '%s'" | |
18622 | ||
a6cd2cc4 | 18623 | #: builtin/rev-list.c:527 |
1b7f4a34 JX |
18624 | msgid "rev-list does not support display of notes" |
18625 | msgstr "rev-list 不支持显示注解" | |
18626 | ||
a6cd2cc4 | 18627 | #: builtin/rev-list.c:530 |
5809aa05 JX |
18628 | msgid "cannot combine --use-bitmap-index with object filtering" |
18629 | msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" | |
18630 | ||
06991777 | 18631 | #: builtin/rev-parse.c:408 |
814ff314 JX |
18632 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
18633 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 18634 | |
06991777 | 18635 | #: builtin/rev-parse.c:413 |
ef317cd5 | 18636 | msgid "keep the `--` passed as an arg" |
07432cef | 18637 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 18638 | |
06991777 | 18639 | #: builtin/rev-parse.c:415 |
ef317cd5 | 18640 | msgid "stop parsing after the first non-option argument" |
07432cef | 18641 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 18642 | |
06991777 | 18643 | #: builtin/rev-parse.c:418 |
cfff71a9 JX |
18644 | msgid "output in stuck long form" |
18645 | msgstr "以固定长格式输出" | |
18646 | ||
06991777 | 18647 | #: builtin/rev-parse.c:551 |
ef317cd5 | 18648 | msgid "" |
814ff314 | 18649 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 18650 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 18651 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
18652 | "\n" |
18653 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
18654 | msgstr "" | |
814ff314 | 18655 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 18656 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 18657 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
18658 | "\n" |
18659 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 18660 | |
c1ac5258 | 18661 | #: builtin/revert.c:24 |
814ff314 JX |
18662 | msgid "git revert [<options>] <commit-ish>..." |
18663 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 18664 | |
c1ac5258 | 18665 | #: builtin/revert.c:25 |
ef317cd5 | 18666 | msgid "git revert <subcommand>" |
07432cef | 18667 | msgstr "git revert <子命令>" |
ef317cd5 | 18668 | |
c1ac5258 | 18669 | #: builtin/revert.c:30 |
814ff314 JX |
18670 | msgid "git cherry-pick [<options>] <commit-ish>..." |
18671 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 18672 | |
c1ac5258 | 18673 | #: builtin/revert.c:31 |
ef317cd5 | 18674 | msgid "git cherry-pick <subcommand>" |
07432cef | 18675 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 18676 | |
06991777 JX |
18677 | #: builtin/revert.c:72 |
18678 | #, c-format | |
18679 | msgid "option `%s' expects a number greater than zero" | |
18680 | msgstr "选项 `%s' 期望一个大于零的数字" | |
18681 | ||
18682 | #: builtin/revert.c:92 | |
ef317cd5 JX |
18683 | #, c-format |
18684 | msgid "%s: %s cannot be used with %s" | |
18685 | msgstr "%s:%s 不能和 %s 同时使用" | |
18686 | ||
d46c5519 | 18687 | #: builtin/revert.c:102 |
ef317cd5 | 18688 | msgid "end revert or cherry-pick sequence" |
07432cef | 18689 | msgstr "终止反转或拣选操作" |
ef317cd5 | 18690 | |
d46c5519 | 18691 | #: builtin/revert.c:103 |
ef317cd5 | 18692 | msgid "resume revert or cherry-pick sequence" |
07432cef | 18693 | msgstr "继续反转或拣选操作" |
ef317cd5 | 18694 | |
d46c5519 | 18695 | #: builtin/revert.c:104 |
ef317cd5 | 18696 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 18697 | msgstr "取消反转或拣选操作" |
ef317cd5 | 18698 | |
a6cd2cc4 JX |
18699 | #: builtin/revert.c:105 |
18700 | msgid "skip current commit and continue" | |
18701 | msgstr "跳过当前提交并继续" | |
18702 | ||
18703 | #: builtin/revert.c:107 | |
ef317cd5 | 18704 | msgid "don't automatically commit" |
07432cef | 18705 | msgstr "不要自动提交" |
ef317cd5 | 18706 | |
a6cd2cc4 | 18707 | #: builtin/revert.c:108 |
ef317cd5 | 18708 | msgid "edit the commit message" |
07432cef | 18709 | msgstr "编辑提交说明" |
ef317cd5 | 18710 | |
a6cd2cc4 | 18711 | #: builtin/revert.c:111 |
87cb7997 | 18712 | msgid "parent-number" |
07432cef | 18713 | msgstr "父编号" |
ef317cd5 | 18714 | |
a6cd2cc4 | 18715 | #: builtin/revert.c:112 |
87cb7997 JX |
18716 | msgid "select mainline parent" |
18717 | msgstr "选择主干父提交编号" | |
18718 | ||
a6cd2cc4 | 18719 | #: builtin/revert.c:114 |
ef317cd5 | 18720 | msgid "merge strategy" |
07432cef | 18721 | msgstr "合并策略" |
ef317cd5 | 18722 | |
a6cd2cc4 | 18723 | #: builtin/revert.c:116 |
ef317cd5 | 18724 | msgid "option for merge strategy" |
07432cef | 18725 | msgstr "合并策略的选项" |
ef317cd5 | 18726 | |
a6cd2cc4 | 18727 | #: builtin/revert.c:125 |
ef317cd5 | 18728 | msgid "append commit name" |
07432cef | 18729 | msgstr "追加提交名称" |
ef317cd5 | 18730 | |
a6cd2cc4 | 18731 | #: builtin/revert.c:127 |
ef317cd5 | 18732 | msgid "preserve initially empty commits" |
07432cef | 18733 | msgstr "保留初始化的空提交" |
ef317cd5 | 18734 | |
a6cd2cc4 | 18735 | #: builtin/revert.c:129 |
ef317cd5 | 18736 | msgid "keep redundant, empty commits" |
07432cef | 18737 | msgstr "保持多余的、空的提交" |
ef317cd5 | 18738 | |
a6cd2cc4 | 18739 | #: builtin/revert.c:232 |
c04f5ac3 JX |
18740 | msgid "revert failed" |
18741 | msgstr "还原失败" | |
18742 | ||
a6cd2cc4 | 18743 | #: builtin/revert.c:245 |
c04f5ac3 JX |
18744 | msgid "cherry-pick failed" |
18745 | msgstr "拣选失败" | |
18746 | ||
06991777 | 18747 | #: builtin/rm.c:19 |
814ff314 JX |
18748 | msgid "git rm [<options>] [--] <file>..." |
18749 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 18750 | |
06991777 | 18751 | #: builtin/rm.c:207 |
c04f5ac3 | 18752 | msgid "" |
2e8451e8 JX |
18753 | "the following file has staged content different from both the\n" |
18754 | "file and the HEAD:" | |
18755 | msgid_plural "" | |
18756 | "the following files have staged content different from both the\n" | |
18757 | "file and the HEAD:" | |
18758 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
18759 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
18760 | ||
06991777 | 18761 | #: builtin/rm.c:212 |
2e8451e8 JX |
18762 | msgid "" |
18763 | "\n" | |
c04f5ac3 JX |
18764 | "(use -f to force removal)" |
18765 | msgstr "" | |
2e8451e8 | 18766 | "\n" |
c04f5ac3 JX |
18767 | "(使用 -f 强制删除)" |
18768 | ||
06991777 | 18769 | #: builtin/rm.c:216 |
2e8451e8 JX |
18770 | msgid "the following file has changes staged in the index:" |
18771 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
18772 | msgstr[0] "下列文件索引中有变更" |
18773 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 18774 | |
06991777 | 18775 | #: builtin/rm.c:220 builtin/rm.c:229 |
c04f5ac3 | 18776 | msgid "" |
2e8451e8 | 18777 | "\n" |
c04f5ac3 JX |
18778 | "(use --cached to keep the file, or -f to force removal)" |
18779 | msgstr "" | |
2e8451e8 JX |
18780 | "\n" |
18781 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
18782 | ||
06991777 | 18783 | #: builtin/rm.c:226 |
2e8451e8 JX |
18784 | msgid "the following file has local modifications:" |
18785 | msgid_plural "the following files have local modifications:" | |
18786 | msgstr[0] "如下文件有本地修改:" | |
18787 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 18788 | |
06991777 | 18789 | #: builtin/rm.c:242 |
ef317cd5 | 18790 | msgid "do not list removed files" |
07432cef | 18791 | msgstr "不列出删除的文件" |
ef317cd5 | 18792 | |
06991777 | 18793 | #: builtin/rm.c:243 |
ef317cd5 | 18794 | msgid "only remove from the index" |
07432cef | 18795 | msgstr "只从索引区删除" |
ef317cd5 | 18796 | |
06991777 | 18797 | #: builtin/rm.c:244 |
ef317cd5 | 18798 | msgid "override the up-to-date check" |
07432cef | 18799 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 18800 | |
06991777 | 18801 | #: builtin/rm.c:245 |
ef317cd5 | 18802 | msgid "allow recursive removal" |
07432cef | 18803 | msgstr "允许递归删除" |
ef317cd5 | 18804 | |
06991777 | 18805 | #: builtin/rm.c:247 |
ef317cd5 | 18806 | msgid "exit with a zero status even if nothing matched" |
07432cef | 18807 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 18808 | |
06991777 | 18809 | #: builtin/rm.c:289 |
c1ac5258 JX |
18810 | msgid "please stage your changes to .gitmodules or stash them to proceed" |
18811 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" | |
18812 | ||
06991777 | 18813 | #: builtin/rm.c:307 |
c04f5ac3 JX |
18814 | #, c-format |
18815 | msgid "not removing '%s' recursively without -r" | |
18816 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
18817 | ||
06991777 | 18818 | #: builtin/rm.c:346 |
c04f5ac3 JX |
18819 | #, c-format |
18820 | msgid "git rm: unable to remove %s" | |
18821 | msgstr "git rm:不能删除 %s" | |
18822 | ||
fd8cb379 | 18823 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
18824 | msgid "" |
18825 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
18826 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
18827 | "[<ref>...]\n" | |
18828 | " --all and explicit <ref> specification are mutually exclusive." | |
18829 | msgstr "" | |
18830 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
18831 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
18832 | " --all 和明确的 <引用> 互斥。" | |
18833 | ||
fd8cb379 | 18834 | #: builtin/send-pack.c:163 |
1b7f4a34 JX |
18835 | msgid "remote name" |
18836 | msgstr "远程名称" | |
18837 | ||
fd8cb379 | 18838 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
18839 | msgid "use stateless RPC protocol" |
18840 | msgstr "使用无状态的 RPC 协议" | |
18841 | ||
fd8cb379 | 18842 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
18843 | msgid "read refs from stdin" |
18844 | msgstr "从标准输入读取引用" | |
18845 | ||
fd8cb379 | 18846 | #: builtin/send-pack.c:179 |
1b7f4a34 JX |
18847 | msgid "print status from remote helper" |
18848 | msgstr "打印来自远程 helper 的状态" | |
18849 | ||
a4f16749 | 18850 | #: builtin/shortlog.c:14 |
fd8cb379 JX |
18851 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
18852 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
18853 | ||
18854 | #: builtin/shortlog.c:15 | |
18855 | msgid "git log --pretty=short | git shortlog [<options>]" | |
18856 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 18857 | |
fd8cb379 | 18858 | #: builtin/shortlog.c:264 |
1a79b2f1 JX |
18859 | msgid "Group by committer rather than author" |
18860 | msgstr "按照提交者分组而不是作者" | |
18861 | ||
fd8cb379 | 18862 | #: builtin/shortlog.c:266 |
ef317cd5 | 18863 | msgid "sort output according to the number of commits per author" |
07432cef | 18864 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 18865 | |
fd8cb379 | 18866 | #: builtin/shortlog.c:268 |
ef317cd5 | 18867 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 18868 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 18869 | |
fd8cb379 | 18870 | #: builtin/shortlog.c:270 |
ef317cd5 | 18871 | msgid "Show the email address of each author" |
07432cef | 18872 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 18873 | |
fd8cb379 | 18874 | #: builtin/shortlog.c:271 |
c1ac5258 JX |
18875 | msgid "<w>[,<i1>[,<i2>]]" |
18876 | msgstr "<w>[,<i1>[,<i2>]]" | |
ef317cd5 | 18877 | |
fd8cb379 | 18878 | #: builtin/shortlog.c:272 |
ef317cd5 | 18879 | msgid "Linewrap output" |
07432cef | 18880 | msgstr "折行输出" |
ef317cd5 | 18881 | |
06991777 | 18882 | #: builtin/shortlog.c:301 |
fd8cb379 JX |
18883 | msgid "too many arguments given outside repository" |
18884 | msgstr "仓库外执行提供了太多的参数" | |
18885 | ||
c1ac5258 | 18886 | #: builtin/show-branch.c:13 |
ef317cd5 | 18887 | msgid "" |
814ff314 | 18888 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
18889 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
18890 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
18891 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 18892 | msgstr "" |
814ff314 | 18893 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
18894 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
18895 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
18896 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 18897 | |
c1ac5258 | 18898 | #: builtin/show-branch.c:17 |
814ff314 | 18899 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 18900 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 18901 | |
c1ac5258 | 18902 | #: builtin/show-branch.c:395 |
a0b6b246 JX |
18903 | #, c-format |
18904 | msgid "ignoring %s; cannot handle more than %d ref" | |
18905 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
18906 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
18907 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
18908 | ||
a6cd2cc4 | 18909 | #: builtin/show-branch.c:548 |
a0b6b246 JX |
18910 | #, c-format |
18911 | msgid "no matching refs with %s" | |
18912 | msgstr "没有和 %s 匹配的引用" | |
18913 | ||
a6cd2cc4 | 18914 | #: builtin/show-branch.c:645 |
ef317cd5 | 18915 | msgid "show remote-tracking and local branches" |
07432cef | 18916 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 18917 | |
a6cd2cc4 | 18918 | #: builtin/show-branch.c:647 |
ef317cd5 | 18919 | msgid "show remote-tracking branches" |
07432cef | 18920 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 18921 | |
a6cd2cc4 | 18922 | #: builtin/show-branch.c:649 |
ef317cd5 | 18923 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 18924 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 18925 | |
a6cd2cc4 | 18926 | #: builtin/show-branch.c:651 |
ef317cd5 | 18927 | msgid "show <n> more commits after the common ancestor" |
07432cef | 18928 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 18929 | |
a6cd2cc4 | 18930 | #: builtin/show-branch.c:653 |
ef317cd5 | 18931 | msgid "synonym to more=-1" |
07432cef | 18932 | msgstr "和 more=-1 同义" |
ef317cd5 | 18933 | |
a6cd2cc4 | 18934 | #: builtin/show-branch.c:654 |
ef317cd5 | 18935 | msgid "suppress naming strings" |
07432cef | 18936 | msgstr "不显示字符串命名" |
ef317cd5 | 18937 | |
a6cd2cc4 | 18938 | #: builtin/show-branch.c:656 |
ef317cd5 | 18939 | msgid "include the current branch" |
07432cef | 18940 | msgstr "包括当前分支" |
ef317cd5 | 18941 | |
a6cd2cc4 | 18942 | #: builtin/show-branch.c:658 |
ef317cd5 | 18943 | msgid "name commits with their object names" |
07432cef | 18944 | msgstr "以对象名字命名提交" |
ef317cd5 | 18945 | |
a6cd2cc4 | 18946 | #: builtin/show-branch.c:660 |
ef317cd5 | 18947 | msgid "show possible merge bases" |
07432cef | 18948 | msgstr "显示可能合并的基线" |
ef317cd5 | 18949 | |
a6cd2cc4 | 18950 | #: builtin/show-branch.c:662 |
ef317cd5 | 18951 | msgid "show refs unreachable from any other ref" |
07432cef | 18952 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 18953 | |
a6cd2cc4 | 18954 | #: builtin/show-branch.c:664 |
ef317cd5 | 18955 | msgid "show commits in topological order" |
07432cef | 18956 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 18957 | |
a6cd2cc4 | 18958 | #: builtin/show-branch.c:667 |
ef317cd5 | 18959 | msgid "show only commits not on the first branch" |
07432cef | 18960 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 18961 | |
a6cd2cc4 | 18962 | #: builtin/show-branch.c:669 |
ef317cd5 | 18963 | msgid "show merges reachable from only one tip" |
07432cef | 18964 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 18965 | |
a6cd2cc4 | 18966 | #: builtin/show-branch.c:671 |
2e8451e8 JX |
18967 | msgid "topologically sort, maintaining date order where possible" |
18968 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 18969 | |
a6cd2cc4 | 18970 | #: builtin/show-branch.c:674 |
ef317cd5 | 18971 | msgid "<n>[,<base>]" |
07432cef | 18972 | msgstr "<n>[,<base>]" |
ef317cd5 | 18973 | |
a6cd2cc4 | 18974 | #: builtin/show-branch.c:675 |
ef317cd5 | 18975 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 18976 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 18977 | |
a6cd2cc4 | 18978 | #: builtin/show-branch.c:711 |
a0b6b246 JX |
18979 | msgid "" |
18980 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
18981 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
18982 | ||
a6cd2cc4 | 18983 | #: builtin/show-branch.c:735 |
a0b6b246 JX |
18984 | msgid "no branches given, and HEAD is not valid" |
18985 | msgstr "未提供分支,且 HEAD 无效" | |
18986 | ||
a6cd2cc4 | 18987 | #: builtin/show-branch.c:738 |
a0b6b246 JX |
18988 | msgid "--reflog option needs one branch name" |
18989 | msgstr "选项 --reflog 需要一个分支名" | |
18990 | ||
a6cd2cc4 | 18991 | #: builtin/show-branch.c:741 |
a0b6b246 JX |
18992 | #, c-format |
18993 | msgid "only %d entry can be shown at one time." | |
18994 | msgid_plural "only %d entries can be shown at one time." | |
18995 | msgstr[0] "一次只能显示 %d 个条目。" | |
18996 | msgstr[1] "一次只能显示 %d 个条目。" | |
18997 | ||
a6cd2cc4 | 18998 | #: builtin/show-branch.c:745 |
a0b6b246 JX |
18999 | #, c-format |
19000 | msgid "no such ref %s" | |
19001 | msgstr "无此引用 %s" | |
19002 | ||
a6cd2cc4 | 19003 | #: builtin/show-branch.c:831 |
a0b6b246 JX |
19004 | #, c-format |
19005 | msgid "cannot handle more than %d rev." | |
19006 | msgid_plural "cannot handle more than %d revs." | |
19007 | msgstr[0] "不能处理 %d 个以上的版本。" | |
19008 | msgstr[1] "不能处理 %d 个以上的版本。" | |
19009 | ||
a6cd2cc4 | 19010 | #: builtin/show-branch.c:835 |
a0b6b246 JX |
19011 | #, c-format |
19012 | msgid "'%s' is not a valid ref." | |
19013 | msgstr "'%s' 不是一个有效的引用。" | |
19014 | ||
a6cd2cc4 | 19015 | #: builtin/show-branch.c:838 |
a0b6b246 JX |
19016 | #, c-format |
19017 | msgid "cannot find commit %s (%s)" | |
29004bbb | 19018 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 19019 | |
d46c5519 | 19020 | #: builtin/show-ref.c:12 |
ef317cd5 | 19021 | msgid "" |
814ff314 JX |
19022 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
19023 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 19024 | msgstr "" |
814ff314 JX |
19025 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
19026 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 | 19027 | |
d46c5519 | 19028 | #: builtin/show-ref.c:13 |
94550ed3 JX |
19029 | msgid "git show-ref --exclude-existing[=<pattern>]" |
19030 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 19031 | |
d46c5519 | 19032 | #: builtin/show-ref.c:162 |
ef317cd5 | 19033 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 19034 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 19035 | |
d46c5519 | 19036 | #: builtin/show-ref.c:163 |
ef317cd5 | 19037 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 19038 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 19039 | |
d46c5519 | 19040 | #: builtin/show-ref.c:164 |
ef317cd5 | 19041 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 19042 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 19043 | |
d46c5519 | 19044 | #: builtin/show-ref.c:167 builtin/show-ref.c:169 |
2e8451e8 JX |
19045 | msgid "show the HEAD reference, even if it would be filtered out" |
19046 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 19047 | |
d46c5519 | 19048 | #: builtin/show-ref.c:171 |
ef317cd5 | 19049 | msgid "dereference tags into object IDs" |
4375c10e | 19050 | msgstr "转换标签到对象 ID" |
ef317cd5 | 19051 | |
d46c5519 JX |
19052 | #: builtin/show-ref.c:173 |
19053 | msgid "only show SHA1 hash using <n> digits" | |
19054 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" | |
19055 | ||
19056 | #: builtin/show-ref.c:177 | |
19057 | msgid "do not print results to stdout (useful with --verify)" | |
19058 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" | |
19059 | ||
19060 | #: builtin/show-ref.c:179 | |
19061 | msgid "show refs from stdin that aren't in local repository" | |
19062 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" | |
19063 | ||
19064 | #: builtin/stash.c:22 builtin/stash.c:37 | |
19065 | msgid "git stash list [<options>]" | |
19066 | msgstr "git stash list [<选项>]" | |
19067 | ||
19068 | #: builtin/stash.c:23 builtin/stash.c:42 | |
19069 | msgid "git stash show [<options>] [<stash>]" | |
19070 | msgstr "git stash show [<选项>] [<stash>]" | |
19071 | ||
19072 | #: builtin/stash.c:24 builtin/stash.c:47 | |
19073 | msgid "git stash drop [-q|--quiet] [<stash>]" | |
19074 | msgstr "git stash drop [-q|--quiet] [<stash>]" | |
19075 | ||
19076 | #: builtin/stash.c:25 | |
19077 | msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
19078 | msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
19079 | ||
19080 | #: builtin/stash.c:26 builtin/stash.c:62 | |
19081 | msgid "git stash branch <branchname> [<stash>]" | |
19082 | msgstr "git stash branch <分支名> [<stash>]" | |
19083 | ||
19084 | #: builtin/stash.c:27 builtin/stash.c:67 | |
19085 | msgid "git stash clear" | |
19086 | msgstr "git stash clear" | |
19087 | ||
19088 | #: builtin/stash.c:28 builtin/stash.c:77 | |
19089 | msgid "" | |
19090 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19091 | " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" | |
19092 | " [--] [<pathspec>...]]" | |
19093 | msgstr "" | |
19094 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19095 | " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" | |
19096 | " [--] [<路径规格>...]]" | |
19097 | ||
19098 | #: builtin/stash.c:31 builtin/stash.c:84 | |
19099 | msgid "" | |
19100 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19101 | " [-u|--include-untracked] [-a|--all] [<message>]" | |
19102 | msgstr "" | |
19103 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
19104 | " [-u|--include-untracked] [-a|--all] [<消息>]" | |
19105 | ||
19106 | #: builtin/stash.c:52 | |
19107 | msgid "git stash pop [--index] [-q|--quiet] [<stash>]" | |
19108 | msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" | |
19109 | ||
19110 | #: builtin/stash.c:57 | |
19111 | msgid "git stash apply [--index] [-q|--quiet] [<stash>]" | |
19112 | msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" | |
19113 | ||
19114 | #: builtin/stash.c:72 | |
19115 | msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" | |
19116 | msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" | |
19117 | ||
19118 | #: builtin/stash.c:127 | |
19119 | #, c-format | |
19120 | msgid "'%s' is not a stash-like commit" | |
19121 | msgstr "'%s' 不像是一个贮藏提交" | |
19122 | ||
19123 | #: builtin/stash.c:147 | |
19124 | #, c-format | |
19125 | msgid "Too many revisions specified:%s" | |
19126 | msgstr "指定了太多的版本:%s" | |
19127 | ||
19128 | #: builtin/stash.c:161 git-legacy-stash.sh:548 | |
19129 | msgid "No stash entries found." | |
19130 | msgstr "未发现贮藏条目。" | |
19131 | ||
19132 | #: builtin/stash.c:175 | |
19133 | #, c-format | |
19134 | msgid "%s is not a valid reference" | |
19135 | msgstr "%s 不是一个有效的引用名" | |
19136 | ||
19137 | #: builtin/stash.c:224 git-legacy-stash.sh:75 | |
19138 | msgid "git stash clear with parameters is unimplemented" | |
19139 | msgstr "git stash clear 不支持参数" | |
19140 | ||
19141 | #: builtin/stash.c:403 | |
19142 | msgid "cannot apply a stash in the middle of a merge" | |
19143 | msgstr "无法在合并过程应用贮藏" | |
19144 | ||
19145 | #: builtin/stash.c:414 | |
19146 | #, c-format | |
19147 | msgid "could not generate diff %s^!." | |
19148 | msgstr "无法生成差异 %s^!." | |
19149 | ||
19150 | #: builtin/stash.c:421 | |
19151 | msgid "conflicts in index.Try without --index." | |
19152 | msgstr "索引中有冲突。尝试不用 --index。" | |
19153 | ||
19154 | #: builtin/stash.c:427 | |
19155 | msgid "could not save index tree" | |
19156 | msgstr "不能保存索引树" | |
19157 | ||
19158 | #: builtin/stash.c:434 | |
19159 | msgid "could not restore untracked files from stash" | |
19160 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
19161 | ||
19162 | #: builtin/stash.c:448 | |
19163 | #, c-format | |
19164 | msgid "Merging %s with %s" | |
19165 | msgstr "正在合并 %s 和 %s" | |
19166 | ||
19167 | #: builtin/stash.c:458 git-legacy-stash.sh:680 | |
19168 | msgid "Index was not unstashed." | |
19169 | msgstr "索引未从贮藏中恢复。" | |
19170 | ||
19171 | #: builtin/stash.c:516 builtin/stash.c:615 | |
19172 | msgid "attempt to recreate the index" | |
19173 | msgstr "尝试重建索引" | |
19174 | ||
19175 | #: builtin/stash.c:549 | |
19176 | #, c-format | |
19177 | msgid "Dropped %s (%s)" | |
19178 | msgstr "丢弃了 %s(%s)" | |
19179 | ||
19180 | #: builtin/stash.c:552 | |
19181 | #, c-format | |
19182 | msgid "%s: Could not drop stash entry" | |
19183 | msgstr "%s:无法丢弃贮藏条目" | |
19184 | ||
19185 | #: builtin/stash.c:577 | |
19186 | #, c-format | |
19187 | msgid "'%s' is not a stash reference" | |
19188 | msgstr "'%s' 不是一个贮藏引用" | |
19189 | ||
19190 | #: builtin/stash.c:627 git-legacy-stash.sh:694 | |
19191 | msgid "The stash entry is kept in case you need it again." | |
19192 | msgstr "贮藏条目被保留以备您再次需要。" | |
19193 | ||
19194 | #: builtin/stash.c:650 git-legacy-stash.sh:712 | |
19195 | msgid "No branch name specified" | |
19196 | msgstr "未指定分支名" | |
19197 | ||
a6cd2cc4 | 19198 | #: builtin/stash.c:790 builtin/stash.c:827 |
d46c5519 JX |
19199 | #, c-format |
19200 | msgid "Cannot update %s with %s" | |
19201 | msgstr "无法用 %2$s 更新 %1$s" | |
19202 | ||
a6cd2cc4 | 19203 | #: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 |
d46c5519 JX |
19204 | msgid "stash message" |
19205 | msgstr "贮藏说明" | |
19206 | ||
a6cd2cc4 | 19207 | #: builtin/stash.c:818 |
d46c5519 JX |
19208 | msgid "\"git stash store\" requires one <commit> argument" |
19209 | msgstr "\"git stash store\" 需要一个 <提交> 参数" | |
19210 | ||
a6cd2cc4 | 19211 | #: builtin/stash.c:1040 git-legacy-stash.sh:217 |
d46c5519 JX |
19212 | msgid "No changes selected" |
19213 | msgstr "没有选择变更" | |
19214 | ||
a6cd2cc4 | 19215 | #: builtin/stash.c:1136 git-legacy-stash.sh:150 |
d46c5519 JX |
19216 | msgid "You do not have the initial commit yet" |
19217 | msgstr "您尚未建立初始提交" | |
19218 | ||
a6cd2cc4 | 19219 | #: builtin/stash.c:1163 git-legacy-stash.sh:165 |
d46c5519 JX |
19220 | msgid "Cannot save the current index state" |
19221 | msgstr "无法保存当前索引状态" | |
19222 | ||
a6cd2cc4 | 19223 | #: builtin/stash.c:1172 git-legacy-stash.sh:180 |
d46c5519 JX |
19224 | msgid "Cannot save the untracked files" |
19225 | msgstr "无法保存未跟踪文件" | |
19226 | ||
a6cd2cc4 | 19227 | #: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 |
d46c5519 JX |
19228 | #: git-legacy-stash.sh:213 |
19229 | msgid "Cannot save the current worktree state" | |
19230 | msgstr "无法保存当前工作区状态" | |
19231 | ||
a6cd2cc4 | 19232 | #: builtin/stash.c:1220 git-legacy-stash.sh:233 |
d46c5519 JX |
19233 | msgid "Cannot record working tree state" |
19234 | msgstr "不能记录工作区状态" | |
19235 | ||
a6cd2cc4 | 19236 | #: builtin/stash.c:1269 git-legacy-stash.sh:337 |
d46c5519 JX |
19237 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
19238 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
19239 | ||
a6cd2cc4 | 19240 | #: builtin/stash.c:1285 |
d46c5519 JX |
19241 | msgid "Did you forget to 'git add'?" |
19242 | msgstr "您是否忘了执行 'git add'?" | |
19243 | ||
a6cd2cc4 | 19244 | #: builtin/stash.c:1300 git-legacy-stash.sh:345 |
d46c5519 JX |
19245 | msgid "No local changes to save" |
19246 | msgstr "没有要保存的本地修改" | |
19247 | ||
a6cd2cc4 | 19248 | #: builtin/stash.c:1307 git-legacy-stash.sh:350 |
d46c5519 JX |
19249 | msgid "Cannot initialize stash" |
19250 | msgstr "无法初始化贮藏" | |
19251 | ||
a6cd2cc4 | 19252 | #: builtin/stash.c:1322 git-legacy-stash.sh:354 |
d46c5519 JX |
19253 | msgid "Cannot save the current status" |
19254 | msgstr "无法保存当前状态" | |
19255 | ||
a6cd2cc4 | 19256 | #: builtin/stash.c:1327 |
d46c5519 JX |
19257 | #, c-format |
19258 | msgid "Saved working directory and index state %s" | |
19259 | msgstr "保存工作目录和索引状态 %s" | |
19260 | ||
a6cd2cc4 | 19261 | #: builtin/stash.c:1417 git-legacy-stash.sh:384 |
d46c5519 JX |
19262 | msgid "Cannot remove worktree changes" |
19263 | msgstr "无法删除工作区变更" | |
19264 | ||
a6cd2cc4 | 19265 | #: builtin/stash.c:1452 builtin/stash.c:1488 |
d46c5519 JX |
19266 | msgid "keep index" |
19267 | msgstr "保持索引" | |
19268 | ||
a6cd2cc4 | 19269 | #: builtin/stash.c:1454 builtin/stash.c:1490 |
d46c5519 JX |
19270 | msgid "stash in patch mode" |
19271 | msgstr "以补丁模式贮藏" | |
19272 | ||
a6cd2cc4 | 19273 | #: builtin/stash.c:1455 builtin/stash.c:1491 |
d46c5519 JX |
19274 | msgid "quiet mode" |
19275 | msgstr "静默模式" | |
19276 | ||
a6cd2cc4 | 19277 | #: builtin/stash.c:1457 builtin/stash.c:1493 |
d46c5519 JX |
19278 | msgid "include untracked files in stash" |
19279 | msgstr "贮藏中包含未跟踪文件" | |
ef317cd5 | 19280 | |
a6cd2cc4 | 19281 | #: builtin/stash.c:1459 builtin/stash.c:1495 |
d46c5519 JX |
19282 | msgid "include ignore files" |
19283 | msgstr "包含忽略的文件" | |
ef317cd5 | 19284 | |
a6cd2cc4 | 19285 | #: builtin/stash.c:1555 |
d46c5519 JX |
19286 | #, c-format |
19287 | msgid "could not exec %s" | |
19288 | msgstr "不能执行 %s" | |
ef317cd5 | 19289 | |
a4f16749 | 19290 | #: builtin/stripspace.c:18 |
94550ed3 JX |
19291 | msgid "git stripspace [-s | --strip-comments]" |
19292 | msgstr "git stripspace [-s | --strip-comments]" | |
19293 | ||
a4f16749 | 19294 | #: builtin/stripspace.c:19 |
94550ed3 JX |
19295 | msgid "git stripspace [-c | --comment-lines]" |
19296 | msgstr "git stripspace [-c | --comment-lines]" | |
19297 | ||
06991777 | 19298 | #: builtin/stripspace.c:37 |
94550ed3 JX |
19299 | msgid "skip and remove all lines starting with comment character" |
19300 | msgstr "跳过和移除所有的注释行" | |
19301 | ||
06991777 | 19302 | #: builtin/stripspace.c:40 |
276ceeaa | 19303 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
19304 | msgstr "为每一行的行首添加注释符和空格" |
19305 | ||
a6cd2cc4 | 19306 | #: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 |
5b04ee3b JX |
19307 | #, c-format |
19308 | msgid "Expecting a full ref name, got %s" | |
19309 | msgstr "期望一个完整的引用名称,却得到 %s" | |
19310 | ||
06991777 | 19311 | #: builtin/submodule--helper.c:62 |
31e5e17b JX |
19312 | msgid "submodule--helper print-default-remote takes no arguments" |
19313 | msgstr "submodule--helper print-default-remote 不带参数" | |
19314 | ||
06991777 | 19315 | #: builtin/submodule--helper.c:100 |
5b04ee3b JX |
19316 | #, c-format |
19317 | msgid "cannot strip one component off url '%s'" | |
19318 | msgstr "无法从 url '%s' 剥离一个组件" | |
19319 | ||
a6cd2cc4 | 19320 | #: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 |
94550ed3 JX |
19321 | msgid "alternative anchor for relative paths" |
19322 | msgstr "相对路径的替代锚记(anchor)" | |
19323 | ||
06991777 | 19324 | #: builtin/submodule--helper.c:413 |
94550ed3 JX |
19325 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
19326 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
19327 | ||
a6cd2cc4 JX |
19328 | #: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 |
19329 | #: builtin/submodule--helper.c:651 | |
5b04ee3b JX |
19330 | #, c-format |
19331 | msgid "No url found for submodule path '%s' in .gitmodules" | |
19332 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
19333 | ||
06991777 | 19334 | #: builtin/submodule--helper.c:522 |
c1ac5258 JX |
19335 | #, c-format |
19336 | msgid "Entering '%s'\n" | |
19337 | msgstr "进入 '%s'\n" | |
19338 | ||
06991777 | 19339 | #: builtin/submodule--helper.c:525 |
c1ac5258 JX |
19340 | #, c-format |
19341 | msgid "" | |
19342 | "run_command returned non-zero status for %s\n" | |
19343 | "." | |
4c27fcb5 JX |
19344 | msgstr "" |
19345 | "对 %s 执行 run_command 返回非零值。\n" | |
19346 | "." | |
c1ac5258 | 19347 | |
a6cd2cc4 | 19348 | #: builtin/submodule--helper.c:547 |
c1ac5258 JX |
19349 | #, c-format |
19350 | msgid "" | |
19351 | "run_command returned non-zero status while recursing in the nested " | |
19352 | "submodules of %s\n" | |
19353 | "." | |
4c27fcb5 JX |
19354 | msgstr "" |
19355 | "在递归 %s 的子模组执行 run_command 时返回非零值。\n" | |
19356 | "." | |
c1ac5258 | 19357 | |
a6cd2cc4 | 19358 | #: builtin/submodule--helper.c:563 |
c1ac5258 JX |
19359 | msgid "Suppress output of entering each submodule command" |
19360 | msgstr "阻止进入每一个子模组命令的输出" | |
19361 | ||
a6cd2cc4 | 19362 | #: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 |
c1ac5258 JX |
19363 | msgid "Recurse into nested submodules" |
19364 | msgstr "递归进入嵌套子模组中" | |
19365 | ||
a6cd2cc4 | 19366 | #: builtin/submodule--helper.c:570 |
d46c5519 JX |
19367 | msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" |
19368 | msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" | |
c1ac5258 | 19369 | |
a6cd2cc4 | 19370 | #: builtin/submodule--helper.c:597 |
87cb7997 JX |
19371 | #, c-format |
19372 | msgid "" | |
4c27fcb5 | 19373 | "could not look up configuration '%s'. Assuming this repository is its own " |
87cb7997 JX |
19374 | "authoritative upstream." |
19375 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
19376 | ||
a6cd2cc4 | 19377 | #: builtin/submodule--helper.c:665 |
5b04ee3b JX |
19378 | #, c-format |
19379 | msgid "Failed to register url for submodule path '%s'" | |
19380 | msgstr "无法为子模组 '%s' 注册 url" | |
19381 | ||
a6cd2cc4 | 19382 | #: builtin/submodule--helper.c:669 |
5b04ee3b JX |
19383 | #, c-format |
19384 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
25c75902 | 19385 | msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n" |
5b04ee3b | 19386 | |
a6cd2cc4 | 19387 | #: builtin/submodule--helper.c:679 |
aef18cc6 | 19388 | #, c-format |
5b04ee3b | 19389 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 19390 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 19391 | |
a6cd2cc4 | 19392 | #: builtin/submodule--helper.c:686 |
5b04ee3b JX |
19393 | #, c-format |
19394 | msgid "Failed to register update mode for submodule path '%s'" | |
19395 | msgstr "无法为子模组 '%s' 注册更新模式" | |
19396 | ||
a6cd2cc4 | 19397 | #: builtin/submodule--helper.c:708 |
5b04ee3b | 19398 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 19399 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 19400 | |
a6cd2cc4 | 19401 | #: builtin/submodule--helper.c:713 |
d46c5519 JX |
19402 | msgid "git submodule--helper init [<options>] [<path>]" |
19403 | msgstr "git submodule--helper init [<选项>] [<路径>]" | |
5b04ee3b | 19404 | |
a6cd2cc4 | 19405 | #: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 |
94550ed3 JX |
19406 | #, c-format |
19407 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
19408 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
19409 | ||
a6cd2cc4 | 19410 | #: builtin/submodule--helper.c:824 |
5809aa05 JX |
19411 | #, c-format |
19412 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
19413 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
19414 | ||
a6cd2cc4 | 19415 | #: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 |
5809aa05 JX |
19416 | #, c-format |
19417 | msgid "failed to recurse into submodule '%s'" | |
c1ac5258 | 19418 | msgstr "递归子模组 '%s' 失败" |
5809aa05 | 19419 | |
a6cd2cc4 | 19420 | #: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 |
5809aa05 | 19421 | msgid "Suppress submodule status output" |
31e5e17b | 19422 | msgstr "阻止子模组状态输出" |
5809aa05 | 19423 | |
a6cd2cc4 | 19424 | #: builtin/submodule--helper.c:876 |
5809aa05 JX |
19425 | msgid "" |
19426 | "Use commit stored in the index instead of the one stored in the submodule " | |
19427 | "HEAD" | |
19428 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
19429 | ||
a6cd2cc4 | 19430 | #: builtin/submodule--helper.c:877 |
5809aa05 | 19431 | msgid "recurse into nested submodules" |
31e5e17b | 19432 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 19433 | |
a6cd2cc4 | 19434 | #: builtin/submodule--helper.c:882 |
5809aa05 JX |
19435 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
19436 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
19437 | ||
a6cd2cc4 | 19438 | #: builtin/submodule--helper.c:906 |
5809aa05 JX |
19439 | msgid "git submodule--helper name <path>" |
19440 | msgstr "git submodule--helper name <路径>" | |
19441 | ||
a6cd2cc4 | 19442 | #: builtin/submodule--helper.c:970 |
31e5e17b JX |
19443 | #, c-format |
19444 | msgid "Synchronizing submodule url for '%s'\n" | |
19445 | msgstr "为 '%s' 同步子模组 url\n" | |
19446 | ||
a6cd2cc4 | 19447 | #: builtin/submodule--helper.c:976 |
31e5e17b JX |
19448 | #, c-format |
19449 | msgid "failed to register url for submodule path '%s'" | |
19450 | msgstr "无法为子模组路径 '%s' 注册 url" | |
19451 | ||
a6cd2cc4 | 19452 | #: builtin/submodule--helper.c:990 |
31e5e17b JX |
19453 | #, c-format |
19454 | msgid "failed to get the default remote for submodule '%s'" | |
19455 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
19456 | ||
a6cd2cc4 | 19457 | #: builtin/submodule--helper.c:1001 |
31e5e17b JX |
19458 | #, c-format |
19459 | msgid "failed to update remote for submodule '%s'" | |
19460 | msgstr "无法为子模组 '%s' 更新远程关联" | |
19461 | ||
a6cd2cc4 | 19462 | #: builtin/submodule--helper.c:1048 |
31e5e17b JX |
19463 | msgid "Suppress output of synchronizing submodule url" |
19464 | msgstr "阻止子模组 url 同步的输出" | |
19465 | ||
a6cd2cc4 | 19466 | #: builtin/submodule--helper.c:1055 |
31e5e17b JX |
19467 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
19468 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
19469 | ||
a6cd2cc4 | 19470 | #: builtin/submodule--helper.c:1109 |
31e5e17b JX |
19471 | #, c-format |
19472 | msgid "" | |
19473 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
19474 | "really want to remove it including all of its history)" | |
19475 | msgstr "" | |
fd8cb379 JX |
19476 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
19477 | "-rf' 命令)" | |
31e5e17b | 19478 | |
a6cd2cc4 | 19479 | #: builtin/submodule--helper.c:1121 |
31e5e17b JX |
19480 | #, c-format |
19481 | msgid "" | |
19482 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
19483 | "them" | |
19484 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
19485 | ||
a6cd2cc4 | 19486 | #: builtin/submodule--helper.c:1129 |
31e5e17b JX |
19487 | #, c-format |
19488 | msgid "Cleared directory '%s'\n" | |
19489 | msgstr "已清除目录 '%s'\n" | |
19490 | ||
a6cd2cc4 | 19491 | #: builtin/submodule--helper.c:1131 |
31e5e17b JX |
19492 | #, c-format |
19493 | msgid "Could not remove submodule work tree '%s'\n" | |
19494 | msgstr "无法移除子模组工作区 '%s'\n" | |
19495 | ||
a6cd2cc4 | 19496 | #: builtin/submodule--helper.c:1142 |
31e5e17b JX |
19497 | #, c-format |
19498 | msgid "could not create empty submodule directory %s" | |
19499 | msgstr "不能创建空的子模组目录 %s" | |
19500 | ||
a6cd2cc4 | 19501 | #: builtin/submodule--helper.c:1158 |
31e5e17b JX |
19502 | #, c-format |
19503 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
19504 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
19505 | ||
a6cd2cc4 | 19506 | #: builtin/submodule--helper.c:1187 |
31e5e17b JX |
19507 | msgid "Remove submodule working trees even if they contain local changes" |
19508 | msgstr "删除子模组工作区,即使包含本地修改" | |
19509 | ||
a6cd2cc4 | 19510 | #: builtin/submodule--helper.c:1188 |
31e5e17b JX |
19511 | msgid "Unregister all submodules" |
19512 | msgstr "将所有子模组取消注册" | |
19513 | ||
a6cd2cc4 | 19514 | #: builtin/submodule--helper.c:1193 |
31e5e17b JX |
19515 | msgid "" |
19516 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
19517 | msgstr "" | |
19518 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
19519 | ||
a6cd2cc4 | 19520 | #: builtin/submodule--helper.c:1207 |
31e5e17b JX |
19521 | msgid "Use '--all' if you really want to deinitialize all submodules" |
19522 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
19523 | ||
a6cd2cc4 | 19524 | #: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 |
a0b6b246 JX |
19525 | #, c-format |
19526 | msgid "submodule '%s' cannot add alternate: %s" | |
19527 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
19528 | ||
a6cd2cc4 | 19529 | #: builtin/submodule--helper.c:1341 |
a0b6b246 JX |
19530 | #, c-format |
19531 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
19532 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
19533 | ||
a6cd2cc4 | 19534 | #: builtin/submodule--helper.c:1348 |
a0b6b246 JX |
19535 | #, c-format |
19536 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
19537 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
19538 | ||
a6cd2cc4 | 19539 | #: builtin/submodule--helper.c:1371 |
94550ed3 JX |
19540 | msgid "where the new submodule will be cloned to" |
19541 | msgstr "新的子模组将要克隆的路径" | |
19542 | ||
a6cd2cc4 | 19543 | #: builtin/submodule--helper.c:1374 |
94550ed3 JX |
19544 | msgid "name of the new submodule" |
19545 | msgstr "新子模组的名称" | |
19546 | ||
a6cd2cc4 | 19547 | #: builtin/submodule--helper.c:1377 |
94550ed3 JX |
19548 | msgid "url where to clone the submodule from" |
19549 | msgstr "克隆子模组的 url 地址" | |
19550 | ||
a6cd2cc4 | 19551 | #: builtin/submodule--helper.c:1385 |
94550ed3 JX |
19552 | msgid "depth for shallow clones" |
19553 | msgstr "浅克隆的深度" | |
19554 | ||
a6cd2cc4 | 19555 | #: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 |
a0b6b246 | 19556 | msgid "force cloning progress" |
29004bbb | 19557 | msgstr "强制显示克隆进度" |
a0b6b246 | 19558 | |
a6cd2cc4 | 19559 | #: builtin/submodule--helper.c:1393 |
94550ed3 JX |
19560 | msgid "" |
19561 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 19562 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
19563 | msgstr "" |
19564 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
19565 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 19566 | |
a6cd2cc4 | 19567 | #: builtin/submodule--helper.c:1424 |
94550ed3 JX |
19568 | #, c-format |
19569 | msgid "clone of '%s' into submodule path '%s' failed" | |
19570 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
19571 | ||
a6cd2cc4 | 19572 | #: builtin/submodule--helper.c:1438 |
94550ed3 JX |
19573 | #, c-format |
19574 | msgid "could not get submodule directory for '%s'" | |
19575 | msgstr "无法得到 '%s' 的子模组目录" | |
19576 | ||
a6cd2cc4 | 19577 | #: builtin/submodule--helper.c:1474 |
4c27fcb5 JX |
19578 | #, c-format |
19579 | msgid "Invalid update mode '%s' for submodule path '%s'" | |
19580 | msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" | |
19581 | ||
a6cd2cc4 | 19582 | #: builtin/submodule--helper.c:1478 |
4c27fcb5 JX |
19583 | #, c-format |
19584 | msgid "Invalid update mode '%s' configured for submodule path '%s'" | |
19585 | msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" | |
19586 | ||
a6cd2cc4 | 19587 | #: builtin/submodule--helper.c:1571 |
5b04ee3b JX |
19588 | #, c-format |
19589 | msgid "Submodule path '%s' not initialized" | |
19590 | msgstr "子模组 '%s' 尚未初始化" | |
19591 | ||
a6cd2cc4 | 19592 | #: builtin/submodule--helper.c:1575 |
5b04ee3b JX |
19593 | msgid "Maybe you want to use 'update --init'?" |
19594 | msgstr "也许您想要执行 'update --init'?" | |
19595 | ||
a6cd2cc4 | 19596 | #: builtin/submodule--helper.c:1605 |
5b04ee3b JX |
19597 | #, c-format |
19598 | msgid "Skipping unmerged submodule %s" | |
19599 | msgstr "略过未合并的子模组 %s" | |
19600 | ||
a6cd2cc4 | 19601 | #: builtin/submodule--helper.c:1634 |
5b04ee3b JX |
19602 | #, c-format |
19603 | msgid "Skipping submodule '%s'" | |
19604 | msgstr "略过子模组 '%s'" | |
19605 | ||
a6cd2cc4 | 19606 | #: builtin/submodule--helper.c:1778 |
5c57d762 JX |
19607 | #, c-format |
19608 | msgid "Failed to clone '%s'. Retry scheduled" | |
19609 | msgstr "克隆 '%s' 失败。按计划重试" | |
19610 | ||
a6cd2cc4 | 19611 | #: builtin/submodule--helper.c:1789 |
5c57d762 JX |
19612 | #, c-format |
19613 | msgid "Failed to clone '%s' a second time, aborting" | |
19614 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
19615 | ||
a6cd2cc4 | 19616 | #: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 |
5b04ee3b JX |
19617 | msgid "path into the working tree" |
19618 | msgstr "到工作区的路径" | |
19619 | ||
a6cd2cc4 | 19620 | #: builtin/submodule--helper.c:1854 |
5b04ee3b JX |
19621 | msgid "path into the working tree, across nested submodule boundaries" |
19622 | msgstr "工作区中的路径,递归嵌套子模组" | |
19623 | ||
a6cd2cc4 | 19624 | #: builtin/submodule--helper.c:1858 |
5b04ee3b JX |
19625 | msgid "rebase, merge, checkout or none" |
19626 | msgstr "rebase、merge、checkout 或 none" | |
19627 | ||
a6cd2cc4 | 19628 | #: builtin/submodule--helper.c:1864 |
5b04ee3b JX |
19629 | msgid "Create a shallow clone truncated to the specified number of revisions" |
19630 | msgstr "创建一个指定深度的浅克隆" | |
19631 | ||
a6cd2cc4 | 19632 | #: builtin/submodule--helper.c:1867 |
5b04ee3b JX |
19633 | msgid "parallel jobs" |
19634 | msgstr "并发任务" | |
19635 | ||
a6cd2cc4 | 19636 | #: builtin/submodule--helper.c:1869 |
5c57d762 | 19637 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 19638 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 19639 | |
a6cd2cc4 | 19640 | #: builtin/submodule--helper.c:1870 |
5b04ee3b JX |
19641 | msgid "don't print cloning progress" |
19642 | msgstr "不要输出克隆进度" | |
94550ed3 | 19643 | |
a6cd2cc4 | 19644 | #: builtin/submodule--helper.c:1877 |
5b04ee3b JX |
19645 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
19646 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
19647 | ||
a6cd2cc4 | 19648 | #: builtin/submodule--helper.c:1890 |
5b04ee3b JX |
19649 | msgid "bad value for update parameter" |
19650 | msgstr "update 参数取值错误" | |
19651 | ||
a6cd2cc4 | 19652 | #: builtin/submodule--helper.c:1938 |
5c57d762 JX |
19653 | #, c-format |
19654 | msgid "" | |
19655 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
19656 | "the superproject is not on any branch" | |
19657 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
19658 | ||
a6cd2cc4 | 19659 | #: builtin/submodule--helper.c:2061 |
4c27fcb5 JX |
19660 | #, c-format |
19661 | msgid "could not get a repository handle for submodule '%s'" | |
19662 | msgstr "无法获得子模组 '%s' 的仓库句柄" | |
19663 | ||
a6cd2cc4 | 19664 | #: builtin/submodule--helper.c:2094 |
1a79b2f1 JX |
19665 | msgid "recurse into submodules" |
19666 | msgstr "在子模组中递归" | |
19667 | ||
a6cd2cc4 | 19668 | #: builtin/submodule--helper.c:2100 |
d46c5519 JX |
19669 | msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" |
19670 | msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" | |
1a79b2f1 | 19671 | |
06991777 | 19672 | #: builtin/submodule--helper.c:2156 |
4c27fcb5 JX |
19673 | msgid "check if it is safe to write to the .gitmodules file" |
19674 | msgstr "检查写入 .gitmodules 文件是否安全" | |
19675 | ||
d46c5519 JX |
19676 | #: builtin/submodule--helper.c:2159 |
19677 | msgid "unset the config in the .gitmodules file" | |
19678 | msgstr "取消 .gitmodules 文件中的设置" | |
19679 | ||
19680 | #: builtin/submodule--helper.c:2164 | |
19681 | msgid "git submodule--helper config <name> [<value>]" | |
19682 | msgstr "git submodule--helper config <名称> [<值>]" | |
4c27fcb5 | 19683 | |
d46c5519 JX |
19684 | #: builtin/submodule--helper.c:2165 |
19685 | msgid "git submodule--helper config --unset <name>" | |
19686 | msgstr "git submodule--helper config --unset <名称>" | |
19687 | ||
19688 | #: builtin/submodule--helper.c:2166 | |
4c27fcb5 JX |
19689 | msgid "git submodule--helper config --check-writeable" |
19690 | msgstr "git submodule--helper config --check-writeable" | |
19691 | ||
d46c5519 | 19692 | #: builtin/submodule--helper.c:2185 git-submodule.sh:171 |
4c27fcb5 JX |
19693 | #, sh-format |
19694 | msgid "please make sure that the .gitmodules file is in the working tree" | |
19695 | msgstr "请确认 .gitmodules 文件在工作区里" | |
19696 | ||
a6cd2cc4 | 19697 | #: builtin/submodule--helper.c:2235 git.c:434 git.c:684 |
1a79b2f1 JX |
19698 | #, c-format |
19699 | msgid "%s doesn't support --super-prefix" | |
19700 | msgstr "%s 不支持 --super-prefix" | |
19701 | ||
d46c5519 | 19702 | #: builtin/submodule--helper.c:2241 |
94550ed3 | 19703 | #, c-format |
5b04ee3b JX |
19704 | msgid "'%s' is not a valid submodule--helper subcommand" |
19705 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 19706 | |
a4f16749 | 19707 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
19708 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
19709 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 19710 | |
a4f16749 | 19711 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
19712 | msgid "git symbolic-ref -d [-q] <name>" |
19713 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 19714 | |
6937cb4e | 19715 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 19716 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
19717 | msgstr "不显示非符号(分离的)引用的错误信息" |
19718 | ||
6937cb4e | 19719 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
19720 | msgid "delete symbolic ref" |
19721 | msgstr "删除符号引用" | |
ef317cd5 | 19722 | |
6937cb4e | 19723 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 19724 | msgid "shorten ref output" |
6937cb4e | 19725 | msgstr "缩短引用输出" |
ef317cd5 | 19726 | |
c1ac5258 | 19727 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 19728 | msgid "reason" |
07432cef | 19729 | msgstr "原因" |
ef317cd5 | 19730 | |
c1ac5258 | 19731 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 19732 | msgid "reason of the update" |
07432cef | 19733 | msgstr "更新的原因" |
ef317cd5 | 19734 | |
c1ac5258 | 19735 | #: builtin/tag.c:25 |
ef317cd5 | 19736 | msgid "" |
d46c5519 JX |
19737 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" |
19738 | "\t\t<tagname> [<head>]" | |
814ff314 | 19739 | msgstr "" |
d46c5519 JX |
19740 | "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" |
19741 | "\t\t<标签名> [<头>]" | |
ef317cd5 | 19742 | |
d46c5519 | 19743 | #: builtin/tag.c:27 |
ef317cd5 | 19744 | msgid "git tag -d <tagname>..." |
07432cef | 19745 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 19746 | |
d46c5519 | 19747 | #: builtin/tag.c:28 |
ef317cd5 | 19748 | msgid "" |
87cb7997 JX |
19749 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
19750 | "points-at <object>]\n" | |
94550ed3 | 19751 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 19752 | msgstr "" |
87cb7997 JX |
19753 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
19754 | "at <对象>]\n" | |
94550ed3 | 19755 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 19756 | |
d46c5519 | 19757 | #: builtin/tag.c:30 |
1a79b2f1 JX |
19758 | msgid "git tag -v [--format=<format>] <tagname>..." |
19759 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 19760 | |
a6cd2cc4 | 19761 | #: builtin/tag.c:89 |
c04f5ac3 JX |
19762 | #, c-format |
19763 | msgid "tag '%s' not found." | |
55a16ee4 | 19764 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 19765 | |
a6cd2cc4 | 19766 | #: builtin/tag.c:105 |
c04f5ac3 JX |
19767 | #, c-format |
19768 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 19769 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 19770 | |
a6cd2cc4 | 19771 | #: builtin/tag.c:135 |
a77c07d9 | 19772 | #, c-format |
c04f5ac3 JX |
19773 | msgid "" |
19774 | "\n" | |
6acbf033 JX |
19775 | "Write a message for tag:\n" |
19776 | " %s\n" | |
a77c07d9 | 19777 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
19778 | msgstr "" |
19779 | "\n" | |
55a16ee4 | 19780 | "输入一个标签说明:\n" |
6acbf033 | 19781 | " %s\n" |
a77c07d9 | 19782 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 19783 | |
a6cd2cc4 | 19784 | #: builtin/tag.c:139 |
a77c07d9 | 19785 | #, c-format |
c04f5ac3 JX |
19786 | msgid "" |
19787 | "\n" | |
6acbf033 JX |
19788 | "Write a message for tag:\n" |
19789 | " %s\n" | |
a77c07d9 | 19790 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 19791 | "want to.\n" |
c04f5ac3 JX |
19792 | msgstr "" |
19793 | "\n" | |
55a16ee4 | 19794 | "输入一个标签说明:\n" |
6acbf033 | 19795 | " %s\n" |
a77c07d9 | 19796 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 19797 | |
a6cd2cc4 | 19798 | #: builtin/tag.c:198 |
c04f5ac3 | 19799 | msgid "unable to sign the tag" |
55a16ee4 | 19800 | msgstr "无法签署标签" |
c04f5ac3 | 19801 | |
a6cd2cc4 | 19802 | #: builtin/tag.c:200 |
c04f5ac3 | 19803 | msgid "unable to write tag file" |
55a16ee4 | 19804 | msgstr "无法写标签文件" |
c04f5ac3 | 19805 | |
a6cd2cc4 | 19806 | #: builtin/tag.c:216 |
d46c5519 JX |
19807 | #, c-format |
19808 | msgid "" | |
19809 | "You have created a nested tag. The object referred to by your new tag is\n" | |
19810 | "already a tag. If you meant to tag the object that it points to, use:\n" | |
19811 | "\n" | |
19812 | "\tgit tag -f %s %s^{}" | |
19813 | msgstr "" | |
19814 | "您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n" | |
19815 | "对其指向的目标创建标签,使用:\n" | |
19816 | "\n" | |
19817 | "\tgit tag -f %s %s^{}" | |
19818 | ||
a6cd2cc4 | 19819 | #: builtin/tag.c:232 |
c04f5ac3 | 19820 | msgid "bad object type." |
90e6ef53 | 19821 | msgstr "坏的对象类型。" |
c04f5ac3 | 19822 | |
a6cd2cc4 | 19823 | #: builtin/tag.c:284 |
c04f5ac3 | 19824 | msgid "no tag message?" |
55a16ee4 | 19825 | msgstr "无标签说明?" |
c04f5ac3 | 19826 | |
a6cd2cc4 | 19827 | #: builtin/tag.c:291 |
c04f5ac3 JX |
19828 | #, c-format |
19829 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 19830 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 19831 | |
a6cd2cc4 | 19832 | #: builtin/tag.c:402 |
ef317cd5 | 19833 | msgid "list tag names" |
55a16ee4 | 19834 | msgstr "列出标签名称" |
ef317cd5 | 19835 | |
a6cd2cc4 | 19836 | #: builtin/tag.c:404 |
ef317cd5 | 19837 | msgid "print <n> lines of each tag message" |
55a16ee4 | 19838 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 19839 | |
a6cd2cc4 | 19840 | #: builtin/tag.c:406 |
ef317cd5 | 19841 | msgid "delete tags" |
55a16ee4 | 19842 | msgstr "删除标签" |
ef317cd5 | 19843 | |
a6cd2cc4 | 19844 | #: builtin/tag.c:407 |
ef317cd5 | 19845 | msgid "verify tags" |
55a16ee4 | 19846 | msgstr "验证标签" |
ef317cd5 | 19847 | |
a6cd2cc4 | 19848 | #: builtin/tag.c:409 |
ef317cd5 | 19849 | msgid "Tag creation options" |
55a16ee4 | 19850 | msgstr "标签创建选项" |
ef317cd5 | 19851 | |
a6cd2cc4 | 19852 | #: builtin/tag.c:411 |
ef317cd5 | 19853 | msgid "annotated tag, needs a message" |
55a16ee4 | 19854 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 19855 | |
a6cd2cc4 | 19856 | #: builtin/tag.c:413 |
ef317cd5 | 19857 | msgid "tag message" |
55a16ee4 | 19858 | msgstr "标签说明" |
ef317cd5 | 19859 | |
a6cd2cc4 | 19860 | #: builtin/tag.c:415 |
31e5e17b JX |
19861 | msgid "force edit of tag message" |
19862 | msgstr "强制编辑标签说明" | |
19863 | ||
a6cd2cc4 | 19864 | #: builtin/tag.c:416 |
ef317cd5 | 19865 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 19866 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 19867 | |
a6cd2cc4 | 19868 | #: builtin/tag.c:419 |
ef317cd5 | 19869 | msgid "use another key to sign the tag" |
55a16ee4 | 19870 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 19871 | |
a6cd2cc4 | 19872 | #: builtin/tag.c:420 |
ef317cd5 | 19873 | msgid "replace the tag if exists" |
55a16ee4 | 19874 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 19875 | |
a6cd2cc4 | 19876 | #: builtin/tag.c:421 builtin/update-ref.c:369 |
03ea3327 | 19877 | msgid "create a reflog" |
1b7f4a34 JX |
19878 | msgstr "创建引用日志" |
19879 | ||
a6cd2cc4 | 19880 | #: builtin/tag.c:423 |
814ff314 | 19881 | msgid "Tag listing options" |
55a16ee4 | 19882 | msgstr "标签列表选项" |
814ff314 | 19883 | |
a6cd2cc4 | 19884 | #: builtin/tag.c:424 |
ef317cd5 | 19885 | msgid "show tag list in columns" |
55a16ee4 | 19886 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 19887 | |
a6cd2cc4 | 19888 | #: builtin/tag.c:425 builtin/tag.c:427 |
ef317cd5 | 19889 | msgid "print only tags that contain the commit" |
87cb7997 | 19890 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 19891 | |
a6cd2cc4 | 19892 | #: builtin/tag.c:426 builtin/tag.c:428 |
87cb7997 JX |
19893 | msgid "print only tags that don't contain the commit" |
19894 | msgstr "只打印不包含该提交的标签" | |
19895 | ||
a6cd2cc4 | 19896 | #: builtin/tag.c:429 |
94550ed3 JX |
19897 | msgid "print only tags that are merged" |
19898 | msgstr "只打印已经合并的标签" | |
19899 | ||
a6cd2cc4 | 19900 | #: builtin/tag.c:430 |
94550ed3 JX |
19901 | msgid "print only tags that are not merged" |
19902 | msgstr "只打印尚未合并的标签" | |
19903 | ||
a6cd2cc4 | 19904 | #: builtin/tag.c:434 |
ef317cd5 | 19905 | msgid "print only tags of the object" |
87cb7997 | 19906 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 19907 | |
a6cd2cc4 | 19908 | #: builtin/tag.c:482 |
8ada9598 | 19909 | msgid "--column and -n are incompatible" |
81809b99 | 19910 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 19911 | |
a6cd2cc4 | 19912 | #: builtin/tag.c:504 |
87cb7997 JX |
19913 | msgid "-n option is only allowed in list mode" |
19914 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 19915 | |
a6cd2cc4 | 19916 | #: builtin/tag.c:506 |
87cb7997 JX |
19917 | msgid "--contains option is only allowed in list mode" |
19918 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 19919 | |
a6cd2cc4 | 19920 | #: builtin/tag.c:508 |
87cb7997 JX |
19921 | msgid "--no-contains option is only allowed in list mode" |
19922 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 19923 | |
a6cd2cc4 | 19924 | #: builtin/tag.c:510 |
87cb7997 JX |
19925 | msgid "--points-at option is only allowed in list mode" |
19926 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 19927 | |
a6cd2cc4 | 19928 | #: builtin/tag.c:512 |
87cb7997 JX |
19929 | msgid "--merged and --no-merged options are only allowed in list mode" |
19930 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
19931 | ||
a6cd2cc4 | 19932 | #: builtin/tag.c:523 |
c04f5ac3 JX |
19933 | msgid "only one -F or -m option is allowed." |
19934 | msgstr "只允许一个 -F 或 -m 选项。" | |
19935 | ||
a6cd2cc4 | 19936 | #: builtin/tag.c:542 |
c04f5ac3 JX |
19937 | msgid "too many params" |
19938 | msgstr "太多参数" | |
19939 | ||
a6cd2cc4 | 19940 | #: builtin/tag.c:548 |
c04f5ac3 JX |
19941 | #, c-format |
19942 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 19943 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 19944 | |
a6cd2cc4 | 19945 | #: builtin/tag.c:553 |
c04f5ac3 JX |
19946 | #, c-format |
19947 | msgid "tag '%s' already exists" | |
55a16ee4 | 19948 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 19949 | |
a6cd2cc4 | 19950 | #: builtin/tag.c:584 |
c04f5ac3 JX |
19951 | #, c-format |
19952 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 19953 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 19954 | |
c1ac5258 | 19955 | #: builtin/unpack-objects.c:500 |
6c94aba5 JX |
19956 | msgid "Unpacking objects" |
19957 | msgstr "展开对象中" | |
19958 | ||
06991777 | 19959 | #: builtin/update-index.c:83 |
7aea43ff JX |
19960 | #, c-format |
19961 | msgid "failed to create directory %s" | |
c1ac5258 | 19962 | msgstr "创建目录 %s 失败" |
7aea43ff | 19963 | |
06991777 | 19964 | #: builtin/update-index.c:99 |
7aea43ff JX |
19965 | #, c-format |
19966 | msgid "failed to create file %s" | |
c1ac5258 | 19967 | msgstr "创建文件 %s 失败" |
7aea43ff | 19968 | |
06991777 | 19969 | #: builtin/update-index.c:107 |
7aea43ff JX |
19970 | #, c-format |
19971 | msgid "failed to delete file %s" | |
c1ac5258 | 19972 | msgstr "删除文件 %s 失败" |
7aea43ff | 19973 | |
06991777 | 19974 | #: builtin/update-index.c:114 builtin/update-index.c:220 |
7aea43ff JX |
19975 | #, c-format |
19976 | msgid "failed to delete directory %s" | |
c1ac5258 | 19977 | msgstr "删除目录 %s 失败" |
7aea43ff | 19978 | |
06991777 | 19979 | #: builtin/update-index.c:139 |
7aea43ff | 19980 | #, c-format |
276ceeaa JX |
19981 | msgid "Testing mtime in '%s' " |
19982 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 19983 | |
06991777 | 19984 | #: builtin/update-index.c:153 |
7aea43ff JX |
19985 | msgid "directory stat info does not change after adding a new file" |
19986 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
19987 | ||
06991777 | 19988 | #: builtin/update-index.c:166 |
7aea43ff JX |
19989 | msgid "directory stat info does not change after adding a new directory" |
19990 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
19991 | ||
06991777 | 19992 | #: builtin/update-index.c:179 |
7aea43ff JX |
19993 | msgid "directory stat info changes after updating a file" |
19994 | msgstr "更新一个文件后,目录的状态信息被修改" | |
19995 | ||
06991777 | 19996 | #: builtin/update-index.c:190 |
7aea43ff JX |
19997 | msgid "directory stat info changes after adding a file inside subdirectory" |
19998 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
19999 | ||
06991777 | 20000 | #: builtin/update-index.c:201 |
7aea43ff JX |
20001 | msgid "directory stat info does not change after deleting a file" |
20002 | msgstr "删除一个文件后,目录的状态信息未改变" | |
20003 | ||
06991777 | 20004 | #: builtin/update-index.c:214 |
7aea43ff JX |
20005 | msgid "directory stat info does not change after deleting a directory" |
20006 | msgstr "删除一个目录后,目录的状态信息未改变" | |
20007 | ||
06991777 | 20008 | #: builtin/update-index.c:221 |
7aea43ff JX |
20009 | msgid " OK" |
20010 | msgstr " OK" | |
20011 | ||
06991777 | 20012 | #: builtin/update-index.c:589 |
814ff314 JX |
20013 | msgid "git update-index [<options>] [--] [<file>...]" |
20014 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 20015 | |
d46c5519 | 20016 | #: builtin/update-index.c:971 |
ef317cd5 | 20017 | msgid "continue refresh even when index needs update" |
07432cef | 20018 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 20019 | |
d46c5519 | 20020 | #: builtin/update-index.c:974 |
ef317cd5 | 20021 | msgid "refresh: ignore submodules" |
07432cef | 20022 | msgstr "刷新:忽略子模组" |
8ada9598 | 20023 | |
d46c5519 | 20024 | #: builtin/update-index.c:977 |
ef317cd5 | 20025 | msgid "do not ignore new files" |
07432cef | 20026 | msgstr "不忽略新的文件" |
8ada9598 | 20027 | |
d46c5519 | 20028 | #: builtin/update-index.c:979 |
ef317cd5 | 20029 | msgid "let files replace directories and vice-versa" |
07432cef | 20030 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 20031 | |
d46c5519 | 20032 | #: builtin/update-index.c:981 |
ef317cd5 | 20033 | msgid "notice files missing from worktree" |
07432cef | 20034 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 20035 | |
d46c5519 | 20036 | #: builtin/update-index.c:983 |
ef317cd5 | 20037 | msgid "refresh even if index contains unmerged entries" |
07432cef | 20038 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 20039 | |
d46c5519 | 20040 | #: builtin/update-index.c:986 |
ef317cd5 | 20041 | msgid "refresh stat information" |
07432cef | 20042 | msgstr "刷新统计信息" |
ef317cd5 | 20043 | |
d46c5519 | 20044 | #: builtin/update-index.c:990 |
ef317cd5 | 20045 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 20046 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 20047 | |
d46c5519 | 20048 | #: builtin/update-index.c:994 |
6c94aba5 | 20049 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 20050 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 20051 | |
d46c5519 | 20052 | #: builtin/update-index.c:995 |
ef317cd5 | 20053 | msgid "add the specified entry to the index" |
07432cef | 20054 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 20055 | |
d46c5519 | 20056 | #: builtin/update-index.c:1005 |
ef317cd5 | 20057 | msgid "mark files as \"not changing\"" |
07432cef | 20058 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 20059 | |
d46c5519 | 20060 | #: builtin/update-index.c:1008 |
ef317cd5 | 20061 | msgid "clear assumed-unchanged bit" |
07432cef | 20062 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 20063 | |
d46c5519 | 20064 | #: builtin/update-index.c:1011 |
ef317cd5 | 20065 | msgid "mark files as \"index-only\"" |
07432cef | 20066 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 20067 | |
d46c5519 | 20068 | #: builtin/update-index.c:1014 |
ef317cd5 | 20069 | msgid "clear skip-worktree bit" |
07432cef | 20070 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 20071 | |
d46c5519 | 20072 | #: builtin/update-index.c:1017 |
ef317cd5 | 20073 | msgid "add to index only; do not add content to object database" |
07432cef | 20074 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 20075 | |
d46c5519 | 20076 | #: builtin/update-index.c:1019 |
ef317cd5 | 20077 | msgid "remove named paths even if present in worktree" |
07432cef | 20078 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 20079 | |
d46c5519 | 20080 | #: builtin/update-index.c:1021 |
ef317cd5 | 20081 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 20082 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 20083 | |
d46c5519 | 20084 | #: builtin/update-index.c:1023 |
ef317cd5 | 20085 | msgid "read list of paths to be updated from standard input" |
07432cef | 20086 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 20087 | |
d46c5519 | 20088 | #: builtin/update-index.c:1027 |
ef317cd5 | 20089 | msgid "add entries from standard input to the index" |
07432cef | 20090 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 20091 | |
d46c5519 | 20092 | #: builtin/update-index.c:1031 |
ef317cd5 | 20093 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 20094 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 20095 | |
d46c5519 | 20096 | #: builtin/update-index.c:1035 |
ef317cd5 | 20097 | msgid "only update entries that differ from HEAD" |
07432cef | 20098 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 20099 | |
d46c5519 | 20100 | #: builtin/update-index.c:1039 |
ef317cd5 | 20101 | msgid "ignore files missing from worktree" |
07432cef | 20102 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 20103 | |
d46c5519 | 20104 | #: builtin/update-index.c:1042 |
ef317cd5 | 20105 | msgid "report actions to standard output" |
07432cef | 20106 | msgstr "在标准输出显示操作" |
ef317cd5 | 20107 | |
d46c5519 | 20108 | #: builtin/update-index.c:1044 |
ef317cd5 | 20109 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 20110 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 20111 | |
d46c5519 | 20112 | #: builtin/update-index.c:1048 |
ef317cd5 | 20113 | msgid "write index in this format" |
07432cef | 20114 | msgstr "以这种格式写入索引区" |
ef317cd5 | 20115 | |
d46c5519 | 20116 | #: builtin/update-index.c:1050 |
6acbf033 JX |
20117 | msgid "enable or disable split index" |
20118 | msgstr "启用或禁用索引拆分" | |
20119 | ||
d46c5519 | 20120 | #: builtin/update-index.c:1052 |
7aea43ff JX |
20121 | msgid "enable/disable untracked cache" |
20122 | msgstr "启用/禁用对未跟踪文件的缓存" | |
20123 | ||
d46c5519 | 20124 | #: builtin/update-index.c:1054 |
276ceeaa JX |
20125 | msgid "test if the filesystem supports untracked cache" |
20126 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
20127 | ||
d46c5519 | 20128 | #: builtin/update-index.c:1056 |
7aea43ff JX |
20129 | msgid "enable untracked cache without testing the filesystem" |
20130 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
20131 | ||
d46c5519 | 20132 | #: builtin/update-index.c:1058 |
5809aa05 JX |
20133 | msgid "write out the index even if is not flagged as changed" |
20134 | msgstr "即使没有被标记为已更改,也要写出索引" | |
20135 | ||
d46c5519 | 20136 | #: builtin/update-index.c:1060 |
5809aa05 JX |
20137 | msgid "enable or disable file system monitor" |
20138 | msgstr "启用或禁用文件系统监控" | |
20139 | ||
d46c5519 | 20140 | #: builtin/update-index.c:1062 |
5809aa05 JX |
20141 | msgid "mark files as fsmonitor valid" |
20142 | msgstr "标记文件为 fsmonitor 有效" | |
20143 | ||
d46c5519 | 20144 | #: builtin/update-index.c:1065 |
5809aa05 JX |
20145 | msgid "clear fsmonitor valid bit" |
20146 | msgstr "清除 fsmonitor 有效位" | |
20147 | ||
d46c5519 | 20148 | #: builtin/update-index.c:1168 |
87cb7997 JX |
20149 | msgid "" |
20150 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
20151 | "enable split index" | |
20152 | msgstr "" | |
20153 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
20154 | ||
d46c5519 | 20155 | #: builtin/update-index.c:1177 |
87cb7997 JX |
20156 | msgid "" |
20157 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
20158 | "disable split index" | |
20159 | msgstr "" | |
20160 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
20161 | ||
d46c5519 | 20162 | #: builtin/update-index.c:1188 |
a0b6b246 JX |
20163 | msgid "" |
20164 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
20165 | "to disable the untracked cache" | |
275588f9 JX |
20166 | msgstr "" |
20167 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
20168 | "改它。" | |
a0b6b246 | 20169 | |
d46c5519 | 20170 | #: builtin/update-index.c:1192 |
276ceeaa JX |
20171 | msgid "Untracked cache disabled" |
20172 | msgstr "缓存未跟踪文件被禁用" | |
20173 | ||
d46c5519 | 20174 | #: builtin/update-index.c:1200 |
a0b6b246 JX |
20175 | msgid "" |
20176 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
20177 | "to enable the untracked cache" | |
275588f9 JX |
20178 | msgstr "" |
20179 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
20180 | "修改它。" | |
a0b6b246 | 20181 | |
d46c5519 | 20182 | #: builtin/update-index.c:1204 |
276ceeaa JX |
20183 | #, c-format |
20184 | msgid "Untracked cache enabled for '%s'" | |
20185 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
20186 | ||
d46c5519 | 20187 | #: builtin/update-index.c:1212 |
5809aa05 | 20188 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 20189 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 20190 | |
d46c5519 | 20191 | #: builtin/update-index.c:1216 |
5809aa05 JX |
20192 | msgid "fsmonitor enabled" |
20193 | msgstr "fsmonitor 被启用" | |
20194 | ||
d46c5519 | 20195 | #: builtin/update-index.c:1219 |
5809aa05 JX |
20196 | msgid "" |
20197 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 20198 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 20199 | |
d46c5519 | 20200 | #: builtin/update-index.c:1223 |
5809aa05 JX |
20201 | msgid "fsmonitor disabled" |
20202 | msgstr "fsmonitor 被禁用" | |
20203 | ||
a4f16749 | 20204 | #: builtin/update-ref.c:10 |
814ff314 JX |
20205 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
20206 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 20207 | |
a4f16749 | 20208 | #: builtin/update-ref.c:11 |
814ff314 JX |
20209 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
20210 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 20211 | |
a4f16749 | 20212 | #: builtin/update-ref.c:12 |
814ff314 JX |
20213 | msgid "git update-ref [<options>] --stdin [-z]" |
20214 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 20215 | |
c1ac5258 | 20216 | #: builtin/update-ref.c:364 |
ef317cd5 | 20217 | msgid "delete the reference" |
07432cef | 20218 | msgstr "删除引用" |
ef317cd5 | 20219 | |
c1ac5258 | 20220 | #: builtin/update-ref.c:366 |
ef317cd5 | 20221 | msgid "update <refname> not the one it points to" |
07432cef | 20222 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 20223 | |
c1ac5258 | 20224 | #: builtin/update-ref.c:367 |
90314792 JX |
20225 | msgid "stdin has NUL-terminated arguments" |
20226 | msgstr "标准输入有以 NUL 字符终止的参数" | |
20227 | ||
c1ac5258 | 20228 | #: builtin/update-ref.c:368 |
90314792 JX |
20229 | msgid "read updates from stdin" |
20230 | msgstr "从标准输入读取更新" | |
20231 | ||
a4f16749 | 20232 | #: builtin/update-server-info.c:7 |
ef317cd5 | 20233 | msgid "git update-server-info [--force]" |
07432cef | 20234 | msgstr "git update-server-info [--force]" |
ef317cd5 | 20235 | |
a4f16749 | 20236 | #: builtin/update-server-info.c:15 |
ef317cd5 | 20237 | msgid "update the info files from scratch" |
07432cef | 20238 | msgstr "从头开始更新文件信息" |
ef317cd5 | 20239 | |
fd8cb379 JX |
20240 | #: builtin/upload-pack.c:11 |
20241 | msgid "git upload-pack [<options>] <dir>" | |
20242 | msgstr "git upload-pack [<选项>] <目录>" | |
20243 | ||
d46c5519 JX |
20244 | #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 |
20245 | msgid "quit after a single request/response exchange" | |
20246 | msgstr "在一次单独的请求/响应之后退出" | |
20247 | ||
fd8cb379 JX |
20248 | #: builtin/upload-pack.c:25 |
20249 | msgid "exit immediately after initial ref advertisement" | |
20250 | msgstr "在初始的引用广告后立即退出" | |
20251 | ||
20252 | #: builtin/upload-pack.c:27 | |
20253 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
20254 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
20255 | ||
20256 | #: builtin/upload-pack.c:29 | |
20257 | msgid "interrupt transfer after <n> seconds of inactivity" | |
20258 | msgstr "不活动 <n> 秒钟后终止传输" | |
20259 | ||
a6cd2cc4 | 20260 | #: builtin/verify-commit.c:19 |
814ff314 JX |
20261 | msgid "git verify-commit [-v | --verbose] <commit>..." |
20262 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 20263 | |
a6cd2cc4 | 20264 | #: builtin/verify-commit.c:68 |
6acbf033 JX |
20265 | msgid "print commit contents" |
20266 | msgstr "打印提交内容" | |
20267 | ||
a6cd2cc4 | 20268 | #: builtin/verify-commit.c:69 builtin/verify-tag.c:37 |
1b7f4a34 JX |
20269 | msgid "print raw gpg status output" |
20270 | msgstr "打印原始 gpg 状态输出" | |
20271 | ||
a4f16749 | 20272 | #: builtin/verify-pack.c:55 |
814ff314 JX |
20273 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
20274 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 20275 | |
a4f16749 | 20276 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
20277 | msgid "verbose" |
20278 | msgstr "冗长输出" | |
20279 | ||
a4f16749 | 20280 | #: builtin/verify-pack.c:67 |
ef317cd5 | 20281 | msgid "show statistics only" |
07432cef | 20282 | msgstr "只显示统计" |
ef317cd5 | 20283 | |
a6cd2cc4 | 20284 | #: builtin/verify-tag.c:18 |
1a79b2f1 JX |
20285 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
20286 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 20287 | |
a6cd2cc4 | 20288 | #: builtin/verify-tag.c:36 |
ef317cd5 | 20289 | msgid "print tag contents" |
55a16ee4 | 20290 | msgstr "打印标签内容" |
ef317cd5 | 20291 | |
06991777 | 20292 | #: builtin/worktree.c:18 |
31e5e17b JX |
20293 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
20294 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 20295 | |
06991777 | 20296 | #: builtin/worktree.c:19 |
5c57d762 JX |
20297 | msgid "git worktree list [<options>]" |
20298 | msgstr "git worktree list [<选项>]" | |
20299 | ||
06991777 | 20300 | #: builtin/worktree.c:20 |
5c57d762 JX |
20301 | msgid "git worktree lock [<options>] <path>" |
20302 | msgstr "git worktree lock [<选项>] <路径>" | |
20303 | ||
06991777 | 20304 | #: builtin/worktree.c:21 |
31e5e17b JX |
20305 | msgid "git worktree move <worktree> <new-path>" |
20306 | msgstr "git worktree move <工作区> <新路径>" | |
20307 | ||
06991777 | 20308 | #: builtin/worktree.c:22 |
5bb01d4f JX |
20309 | msgid "git worktree prune [<options>]" |
20310 | msgstr "git worktree prune [<选项>]" | |
20311 | ||
06991777 | 20312 | #: builtin/worktree.c:23 |
31e5e17b JX |
20313 | msgid "git worktree remove [<options>] <worktree>" |
20314 | msgstr "git worktree remove [<选项>] <工作区>" | |
20315 | ||
06991777 | 20316 | #: builtin/worktree.c:24 |
5c57d762 JX |
20317 | msgid "git worktree unlock <path>" |
20318 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 20319 | |
a6cd2cc4 | 20320 | #: builtin/worktree.c:61 builtin/worktree.c:899 |
4c27fcb5 JX |
20321 | #, c-format |
20322 | msgid "failed to delete '%s'" | |
20323 | msgstr "删除 '%s' 失败" | |
20324 | ||
06991777 | 20325 | #: builtin/worktree.c:80 |
5bb01d4f JX |
20326 | #, c-format |
20327 | msgid "Removing worktrees/%s: not a valid directory" | |
20328 | msgstr "删除工作区/%s:不是一个有效的目录" | |
20329 | ||
06991777 | 20330 | #: builtin/worktree.c:86 |
5bb01d4f JX |
20331 | #, c-format |
20332 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
20333 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
20334 | ||
06991777 | 20335 | #: builtin/worktree.c:91 builtin/worktree.c:100 |
5bb01d4f JX |
20336 | #, c-format |
20337 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
20338 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
20339 | ||
06991777 | 20340 | #: builtin/worktree.c:110 |
6937cb4e JX |
20341 | #, c-format |
20342 | msgid "" | |
20343 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
20344 | "%<PRIuMAX>)" | |
20345 | msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
20346 | ||
06991777 | 20347 | #: builtin/worktree.c:118 |
5bb01d4f JX |
20348 | #, c-format |
20349 | msgid "Removing worktrees/%s: invalid gitdir file" | |
20350 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
20351 | ||
06991777 | 20352 | #: builtin/worktree.c:127 |
5bb01d4f JX |
20353 | #, c-format |
20354 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
20355 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
20356 | ||
06991777 | 20357 | #: builtin/worktree.c:166 |
1a79b2f1 JX |
20358 | msgid "report pruned working trees" |
20359 | msgstr "报告清除的工作区" | |
20360 | ||
06991777 | 20361 | #: builtin/worktree.c:168 |
1a79b2f1 | 20362 | msgid "expire working trees older than <time>" |
58b6f078 | 20363 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 20364 | |
06991777 | 20365 | #: builtin/worktree.c:235 |
5bb01d4f JX |
20366 | #, c-format |
20367 | msgid "'%s' already exists" | |
20368 | msgstr "'%s' 已经存在" | |
20369 | ||
06991777 | 20370 | #: builtin/worktree.c:252 |
4c27fcb5 JX |
20371 | #, c-format |
20372 | msgid "unable to re-add worktree '%s'" | |
20373 | msgstr "无法再次添加工作区 '%s'" | |
20374 | ||
06991777 | 20375 | #: builtin/worktree.c:257 |
4c27fcb5 JX |
20376 | #, c-format |
20377 | msgid "" | |
20378 | "'%s' is a missing but locked worktree;\n" | |
20379 | "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" | |
20380 | msgstr "" | |
20381 | "'%s' 是一个丢失但锁定的工作区,使用\n" | |
20382 | "'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除" | |
20383 | ||
06991777 | 20384 | #: builtin/worktree.c:259 |
4c27fcb5 JX |
20385 | #, c-format |
20386 | msgid "" | |
20387 | "'%s' is a missing but already registered worktree;\n" | |
20388 | "use 'add -f' to override, or 'prune' or 'remove' to clear" | |
20389 | msgstr "" | |
20390 | "'%s' 是一个丢失但已经注册的工作区,使用\n" | |
20391 | "'add -f' 覆盖,或 'prune' 或 'remove' 清除" | |
20392 | ||
a6cd2cc4 | 20393 | #: builtin/worktree.c:309 |
5bb01d4f JX |
20394 | #, c-format |
20395 | msgid "could not create directory of '%s'" | |
20396 | msgstr "不能创建目录 '%s'" | |
20397 | ||
a6cd2cc4 | 20398 | #: builtin/worktree.c:440 builtin/worktree.c:446 |
fd8cb379 JX |
20399 | #, c-format |
20400 | msgid "Preparing worktree (new branch '%s')" | |
20401 | msgstr "准备工作区(新分支 '%s')" | |
20402 | ||
a6cd2cc4 | 20403 | #: builtin/worktree.c:442 |
fd8cb379 JX |
20404 | #, c-format |
20405 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
20406 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
20407 | ||
a6cd2cc4 | 20408 | #: builtin/worktree.c:451 |
fd8cb379 JX |
20409 | #, c-format |
20410 | msgid "Preparing worktree (checking out '%s')" | |
20411 | msgstr "准备工作区(检出 '%s')" | |
20412 | ||
a6cd2cc4 | 20413 | #: builtin/worktree.c:457 |
5bb01d4f | 20414 | #, c-format |
fd8cb379 JX |
20415 | msgid "Preparing worktree (detached HEAD %s)" |
20416 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 20417 | |
a6cd2cc4 | 20418 | #: builtin/worktree.c:498 |
5bb01d4f | 20419 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 20420 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 20421 | |
a6cd2cc4 | 20422 | #: builtin/worktree.c:501 |
5bb01d4f JX |
20423 | msgid "create a new branch" |
20424 | msgstr "创建一个新分支" | |
20425 | ||
a6cd2cc4 | 20426 | #: builtin/worktree.c:503 |
5bb01d4f JX |
20427 | msgid "create or reset a branch" |
20428 | msgstr "创建或重置一个分支" | |
20429 | ||
a6cd2cc4 | 20430 | #: builtin/worktree.c:505 |
5b04ee3b JX |
20431 | msgid "populate the new working tree" |
20432 | msgstr "生成新的工作区" | |
20433 | ||
a6cd2cc4 | 20434 | #: builtin/worktree.c:506 |
60638e98 JX |
20435 | msgid "keep the new working tree locked" |
20436 | msgstr "锁定新工作区" | |
20437 | ||
a6cd2cc4 | 20438 | #: builtin/worktree.c:509 |
5809aa05 JX |
20439 | msgid "set up tracking mode (see git-branch(1))" |
20440 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
20441 | ||
a6cd2cc4 | 20442 | #: builtin/worktree.c:512 |
5809aa05 JX |
20443 | msgid "try to match the new branch name with a remote-tracking branch" |
20444 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
20445 | ||
a6cd2cc4 | 20446 | #: builtin/worktree.c:520 |
1b7f4a34 JX |
20447 | msgid "-b, -B, and --detach are mutually exclusive" |
20448 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 20449 | |
a6cd2cc4 | 20450 | #: builtin/worktree.c:581 |
5809aa05 JX |
20451 | msgid "--[no-]track can only be used if a new branch is created" |
20452 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
20453 | ||
a6cd2cc4 | 20454 | #: builtin/worktree.c:681 |
5c57d762 JX |
20455 | msgid "reason for locking" |
20456 | msgstr "锁定原因" | |
20457 | ||
a6cd2cc4 JX |
20458 | #: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 |
20459 | #: builtin/worktree.c:927 | |
5c57d762 JX |
20460 | #, c-format |
20461 | msgid "'%s' is not a working tree" | |
20462 | msgstr "'%s' 不是一个工作区" | |
20463 | ||
a6cd2cc4 | 20464 | #: builtin/worktree.c:695 builtin/worktree.c:728 |
5c57d762 JX |
20465 | msgid "The main working tree cannot be locked or unlocked" |
20466 | msgstr "主工作区无法被加锁或解锁" | |
20467 | ||
a6cd2cc4 | 20468 | #: builtin/worktree.c:700 |
5c57d762 JX |
20469 | #, c-format |
20470 | msgid "'%s' is already locked, reason: %s" | |
20471 | msgstr "'%s' 已被锁定,原因:%s" | |
20472 | ||
a6cd2cc4 | 20473 | #: builtin/worktree.c:702 |
5c57d762 JX |
20474 | #, c-format |
20475 | msgid "'%s' is already locked" | |
20476 | msgstr "'%s' 已被锁定" | |
20477 | ||
a6cd2cc4 | 20478 | #: builtin/worktree.c:730 |
5c57d762 JX |
20479 | #, c-format |
20480 | msgid "'%s' is not locked" | |
20481 | msgstr "'%s' 未被锁定" | |
20482 | ||
a6cd2cc4 | 20483 | #: builtin/worktree.c:771 |
31e5e17b | 20484 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 20485 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 20486 | |
a6cd2cc4 | 20487 | #: builtin/worktree.c:779 |
4c27fcb5 JX |
20488 | msgid "force move even if worktree is dirty or locked" |
20489 | msgstr "强制移动,即使工作区是脏的或已锁定" | |
20490 | ||
a6cd2cc4 | 20491 | #: builtin/worktree.c:802 builtin/worktree.c:929 |
31e5e17b JX |
20492 | #, c-format |
20493 | msgid "'%s' is a main working tree" | |
20494 | msgstr "'%s' 是一个主工作区" | |
20495 | ||
a6cd2cc4 | 20496 | #: builtin/worktree.c:807 |
31e5e17b JX |
20497 | #, c-format |
20498 | msgid "could not figure out destination name from '%s'" | |
20499 | msgstr "无法从 '%s' 算出目标名称" | |
20500 | ||
a6cd2cc4 | 20501 | #: builtin/worktree.c:813 |
31e5e17b JX |
20502 | #, c-format |
20503 | msgid "target '%s' already exists" | |
20504 | msgstr "目标 '%s' 已存在" | |
20505 | ||
a6cd2cc4 | 20506 | #: builtin/worktree.c:821 |
31e5e17b | 20507 | #, c-format |
4c27fcb5 JX |
20508 | msgid "" |
20509 | "cannot move a locked working tree, lock reason: %s\n" | |
20510 | "use 'move -f -f' to override or unlock first" | |
20511 | msgstr "" | |
20512 | "无法移动一个锁定的工作区,锁定原因:%s\n" | |
20513 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 20514 | |
a6cd2cc4 | 20515 | #: builtin/worktree.c:823 |
4c27fcb5 JX |
20516 | msgid "" |
20517 | "cannot move a locked working tree;\n" | |
20518 | "use 'move -f -f' to override or unlock first" | |
20519 | msgstr "" | |
20520 | "无法移动一个锁定的工作区,\n" | |
20521 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 20522 | |
a6cd2cc4 | 20523 | #: builtin/worktree.c:826 |
31e5e17b JX |
20524 | #, c-format |
20525 | msgid "validation failed, cannot move working tree: %s" | |
20526 | msgstr "验证失败,无法移动工作区:%s" | |
20527 | ||
a6cd2cc4 | 20528 | #: builtin/worktree.c:831 |
31e5e17b JX |
20529 | #, c-format |
20530 | msgid "failed to move '%s' to '%s'" | |
c1ac5258 | 20531 | msgstr "移动 '%s' 到 '%s' 失败" |
31e5e17b | 20532 | |
a6cd2cc4 | 20533 | #: builtin/worktree.c:879 |
31e5e17b JX |
20534 | #, c-format |
20535 | msgid "failed to run 'git status' on '%s'" | |
c1ac5258 | 20536 | msgstr "在 '%s' 中执行 'git status' 失败" |
31e5e17b | 20537 | |
a6cd2cc4 | 20538 | #: builtin/worktree.c:883 |
31e5e17b JX |
20539 | #, c-format |
20540 | msgid "'%s' is dirty, use --force to delete it" | |
20541 | msgstr "'%s' 是脏的,使用 --force 删除" | |
20542 | ||
a6cd2cc4 | 20543 | #: builtin/worktree.c:888 |
31e5e17b JX |
20544 | #, c-format |
20545 | msgid "failed to run 'git status' on '%s', code %d" | |
c1ac5258 | 20546 | msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" |
31e5e17b | 20547 | |
a6cd2cc4 | 20548 | #: builtin/worktree.c:911 |
4c27fcb5 JX |
20549 | msgid "force removal even if worktree is dirty or locked" |
20550 | msgstr "强制删除,即使工作区是脏的或已锁定" | |
31e5e17b | 20551 | |
a6cd2cc4 | 20552 | #: builtin/worktree.c:934 |
31e5e17b | 20553 | #, c-format |
4c27fcb5 JX |
20554 | msgid "" |
20555 | "cannot remove a locked working tree, lock reason: %s\n" | |
20556 | "use 'remove -f -f' to override or unlock first" | |
20557 | msgstr "" | |
20558 | "无法删除一个锁定的工作区,锁定原因:%s\n" | |
20559 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 20560 | |
a6cd2cc4 | 20561 | #: builtin/worktree.c:936 |
4c27fcb5 JX |
20562 | msgid "" |
20563 | "cannot remove a locked working tree;\n" | |
20564 | "use 'remove -f -f' to override or unlock first" | |
20565 | msgstr "" | |
20566 | "无法删除一个锁定的工作区,\n" | |
20567 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 20568 | |
a6cd2cc4 | 20569 | #: builtin/worktree.c:939 |
31e5e17b JX |
20570 | #, c-format |
20571 | msgid "validation failed, cannot remove working tree: %s" | |
20572 | msgstr "验证失败,无法删除工作区:%s" | |
20573 | ||
06991777 | 20574 | #: builtin/write-tree.c:15 |
ef317cd5 | 20575 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 20576 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 20577 | |
06991777 | 20578 | #: builtin/write-tree.c:28 |
ef317cd5 | 20579 | msgid "<prefix>/" |
07432cef | 20580 | msgstr "<前缀>/" |
ef317cd5 | 20581 | |
06991777 | 20582 | #: builtin/write-tree.c:29 |
ef317cd5 | 20583 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 20584 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 20585 | |
06991777 | 20586 | #: builtin/write-tree.c:31 |
ef317cd5 | 20587 | msgid "only useful for debugging" |
07432cef | 20588 | msgstr "只对调试有用" |
ef317cd5 | 20589 | |
06991777 | 20590 | #: credential-cache--daemon.c:223 |
a0b6b246 JX |
20591 | #, c-format |
20592 | msgid "" | |
20593 | "The permissions on your socket directory are too loose; other\n" | |
20594 | "users may be able to read your cached credentials. Consider running:\n" | |
20595 | "\n" | |
20596 | "\tchmod 0700 %s" | |
20597 | msgstr "" | |
1a79b2f1 JX |
20598 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
20599 | "行:\n" | |
a0b6b246 JX |
20600 | "\n" |
20601 | "\tchmod 0700 %s" | |
20602 | ||
06991777 | 20603 | #: credential-cache--daemon.c:272 |
220c313c JX |
20604 | msgid "print debugging messages to stderr" |
20605 | msgstr "调试信息输出到标准错误" | |
20606 | ||
4c27fcb5 JX |
20607 | #: t/helper/test-reach.c:152 |
20608 | #, c-format | |
20609 | msgid "commit %s is not marked reachable" | |
20610 | msgstr "提交 %s 没有标记为可达" | |
20611 | ||
20612 | #: t/helper/test-reach.c:162 | |
20613 | msgid "too many commits marked reachable" | |
20614 | msgstr "太多提交标记为可达" | |
20615 | ||
d46c5519 JX |
20616 | #: t/helper/test-serve-v2.c:7 |
20617 | msgid "test-tool serve-v2 [<options>]" | |
20618 | msgstr "test-tool serve-v2 [<选项>]" | |
20619 | ||
20620 | #: t/helper/test-serve-v2.c:19 | |
20621 | msgid "exit immediately after advertising capabilities" | |
20622 | msgstr "对能力广告之后立即退出" | |
20623 | ||
fd8cb379 | 20624 | #: git.c:27 |
31e5e17b JX |
20625 | msgid "" |
20626 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
20627 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
20628 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
20629 | "bare]\n" | |
31e5e17b JX |
20630 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
20631 | " <command> [<args>]" | |
20632 | msgstr "" | |
fd8cb379 | 20633 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 20634 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
fd8cb379 JX |
20635 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
20636 | "bare]\n" | |
31e5e17b JX |
20637 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
20638 | " <命令> [<参数>]" | |
20639 | ||
fd8cb379 | 20640 | #: git.c:34 |
4dcdc3d8 | 20641 | msgid "" |
220c313c | 20642 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 | 20643 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
a6cd2cc4 JX |
20644 | "to read about a specific subcommand or concept.\n" |
20645 | "See 'git help git' for an overview of the system." | |
4dcdc3d8 | 20646 | msgstr "" |
220c313c JX |
20647 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
20648 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
a6cd2cc4 JX |
20649 | "帮助。\n" |
20650 | "有关系统的概述,查看 'git help git'。" | |
8ada9598 | 20651 | |
a6cd2cc4 | 20652 | #: git.c:186 |
31e5e17b JX |
20653 | #, c-format |
20654 | msgid "no directory given for --git-dir\n" | |
20655 | msgstr "没有为 --git-dir 提供目录\n" | |
20656 | ||
a6cd2cc4 | 20657 | #: git.c:200 |
31e5e17b JX |
20658 | #, c-format |
20659 | msgid "no namespace given for --namespace\n" | |
20660 | msgstr "没有为 --namespace 提供命名空间\n" | |
20661 | ||
a6cd2cc4 | 20662 | #: git.c:214 |
31e5e17b JX |
20663 | #, c-format |
20664 | msgid "no directory given for --work-tree\n" | |
20665 | msgstr "没有为 --work-tree 提供目录\n" | |
20666 | ||
a6cd2cc4 | 20667 | #: git.c:228 |
31e5e17b JX |
20668 | #, c-format |
20669 | msgid "no prefix given for --super-prefix\n" | |
20670 | msgstr "没有为 --super-prefix 提供前缀\n" | |
20671 | ||
a6cd2cc4 | 20672 | #: git.c:250 |
31e5e17b JX |
20673 | #, c-format |
20674 | msgid "-c expects a configuration string\n" | |
20675 | msgstr "应为 -c 提供一个配置字符串\n" | |
20676 | ||
a6cd2cc4 | 20677 | #: git.c:288 |
31e5e17b JX |
20678 | #, c-format |
20679 | msgid "no directory given for -C\n" | |
20680 | msgstr "没有为 -C 提供目录\n" | |
20681 | ||
a6cd2cc4 | 20682 | #: git.c:314 |
31e5e17b JX |
20683 | #, c-format |
20684 | msgid "unknown option: %s\n" | |
20685 | msgstr "未知选项:%s\n" | |
20686 | ||
a6cd2cc4 | 20687 | #: git.c:360 |
06991777 JX |
20688 | #, c-format |
20689 | msgid "while expanding alias '%s': '%s'" | |
5b533632 | 20690 | msgstr "在扩展别名 '%s' 时:'%s'" |
06991777 | 20691 | |
a6cd2cc4 | 20692 | #: git.c:369 |
06991777 JX |
20693 | #, c-format |
20694 | msgid "" | |
20695 | "alias '%s' changes environment variables.\n" | |
20696 | "You can use '!git' in the alias to do this" | |
20697 | msgstr "" | |
20698 | "别名 '%s' 修改环境变量。您可以使用在别名中\n" | |
20699 | "使用 '!git'" | |
20700 | ||
a6cd2cc4 | 20701 | #: git.c:377 |
06991777 JX |
20702 | #, c-format |
20703 | msgid "empty alias for %s" | |
20704 | msgstr "%s 的空别名" | |
20705 | ||
a6cd2cc4 | 20706 | #: git.c:380 |
06991777 JX |
20707 | #, c-format |
20708 | msgid "recursive alias: %s" | |
5b533632 | 20709 | msgstr "递归的别名:%s" |
06991777 | 20710 | |
a6cd2cc4 | 20711 | #: git.c:460 |
06991777 JX |
20712 | msgid "write failure on standard output" |
20713 | msgstr "在标准输出写入失败" | |
20714 | ||
a6cd2cc4 | 20715 | #: git.c:462 |
06991777 JX |
20716 | msgid "unknown write failure on standard output" |
20717 | msgstr "到标准输出的未知写入错误" | |
20718 | ||
a6cd2cc4 | 20719 | #: git.c:464 |
06991777 JX |
20720 | msgid "close failed on standard output" |
20721 | msgstr "标准输出关闭失败" | |
20722 | ||
a6cd2cc4 | 20723 | #: git.c:793 |
4c27fcb5 JX |
20724 | #, c-format |
20725 | msgid "alias loop detected: expansion of '%s' does not terminate:%s" | |
20726 | msgstr "检测到别名循环:'%s'的扩展未终止:%s" | |
20727 | ||
a6cd2cc4 | 20728 | #: git.c:843 |
06991777 JX |
20729 | #, c-format |
20730 | msgid "cannot handle %s as a builtin" | |
20731 | msgstr "不能作为内置命令处理 %s" | |
20732 | ||
a6cd2cc4 | 20733 | #: git.c:856 |
06991777 JX |
20734 | #, c-format |
20735 | msgid "" | |
20736 | "usage: %s\n" | |
20737 | "\n" | |
20738 | msgstr "" | |
20739 | "用法:%s\n" | |
20740 | "\n" | |
20741 | ||
a6cd2cc4 | 20742 | #: git.c:876 |
31e5e17b JX |
20743 | #, c-format |
20744 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
20745 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
20746 | ||
a6cd2cc4 | 20747 | #: git.c:888 |
31e5e17b JX |
20748 | #, c-format |
20749 | msgid "failed to run command '%s': %s\n" | |
c1ac5258 | 20750 | msgstr "运行命令 '%s' 失败:%s\n" |
31e5e17b | 20751 | |
06991777 | 20752 | #: http.c:378 |
60638e98 JX |
20753 | #, c-format |
20754 | msgid "negative value for http.postbuffer; defaulting to %d" | |
20755 | msgstr "http.postbuffer 为负值,默认为 %d" | |
20756 | ||
06991777 | 20757 | #: http.c:399 |
a0b6b246 | 20758 | msgid "Delegation control is not supported with cURL < 7.22.0" |
4c27fcb5 | 20759 | msgstr "不支持委托控制,因为 cURL < 7.22.0" |
a0b6b246 | 20760 | |
06991777 | 20761 | #: http.c:408 |
276ceeaa JX |
20762 | msgid "Public key pinning not supported with cURL < 7.44.0" |
20763 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
20764 | ||
06991777 | 20765 | #: http.c:876 |
4c27fcb5 JX |
20766 | msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" |
20767 | msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0" | |
20768 | ||
06991777 | 20769 | #: http.c:949 |
4c27fcb5 JX |
20770 | msgid "Protocol restrictions not supported with cURL < 7.19.4" |
20771 | msgstr "不支持协议限制,因为 cURL < 7.19.4" | |
20772 | ||
06991777 | 20773 | #: http.c:1085 |
4c27fcb5 JX |
20774 | #, c-format |
20775 | msgid "Unsupported SSL backend '%s'. Supported SSL backends:" | |
20776 | msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:" | |
20777 | ||
06991777 | 20778 | #: http.c:1092 |
4c27fcb5 JX |
20779 | #, c-format |
20780 | msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" | |
20781 | msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建" | |
20782 | ||
06991777 | 20783 | #: http.c:1096 |
4c27fcb5 JX |
20784 | #, c-format |
20785 | msgid "Could not set SSL backend to '%s': already set" | |
20786 | msgstr "无法将 SSL 后端设置为 '%s':已经设置" | |
20787 | ||
d46c5519 | 20788 | #: http.c:1965 |
1a79b2f1 JX |
20789 | #, c-format |
20790 | msgid "" | |
20791 | "unable to update url base from redirection:\n" | |
20792 | " asked for: %s\n" | |
20793 | " redirect: %s" | |
20794 | msgstr "" | |
20795 | "不能更新重定向的 url base:\n" | |
20796 | " 请求:%s\n" | |
20797 | " 重定向:%s" | |
20798 | ||
d46c5519 JX |
20799 | #: remote-curl.c:157 |
20800 | #, c-format | |
20801 | msgid "invalid quoting in push-option value: '%s'" | |
5b533632 | 20802 | msgstr "在 push-option 取值中无效的引号:'%s'" |
d46c5519 JX |
20803 | |
20804 | #: remote-curl.c:254 | |
20805 | #, c-format | |
20806 | msgid "%sinfo/refs not valid: is this a git repository?" | |
20807 | msgstr "%sinfo/refs 无效:这是一个 git 仓库么?" | |
20808 | ||
20809 | #: remote-curl.c:355 | |
20810 | msgid "invalid server response; expected service, got flush packet" | |
20811 | msgstr "无效的服务端响应。预期服务,得到 flush 包" | |
20812 | ||
20813 | #: remote-curl.c:386 | |
20814 | #, c-format | |
20815 | msgid "invalid server response; got '%s'" | |
20816 | msgstr "无效的服务端响应,得到 '%s'" | |
20817 | ||
20818 | #: remote-curl.c:446 | |
20819 | #, c-format | |
20820 | msgid "repository '%s' not found" | |
20821 | msgstr "仓库 '%s' 未找到" | |
20822 | ||
20823 | #: remote-curl.c:450 | |
20824 | #, c-format | |
20825 | msgid "Authentication failed for '%s'" | |
20826 | msgstr "'%s' 鉴权失败" | |
20827 | ||
20828 | #: remote-curl.c:454 | |
20829 | #, c-format | |
20830 | msgid "unable to access '%s': %s" | |
20831 | msgstr "无法访问 '%s':%s" | |
20832 | ||
20833 | #: remote-curl.c:460 | |
1a79b2f1 JX |
20834 | #, c-format |
20835 | msgid "redirecting to %s" | |
20836 | msgstr "重定向到 %s" | |
20837 | ||
d46c5519 JX |
20838 | #: remote-curl.c:584 |
20839 | msgid "shouldn't have EOF when not gentle on EOF" | |
5b533632 | 20840 | msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符" |
d46c5519 JX |
20841 | |
20842 | #: remote-curl.c:664 | |
20843 | msgid "unable to rewind rpc post data - try increasing http.postBuffer" | |
20844 | msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" | |
20845 | ||
20846 | #: remote-curl.c:724 | |
20847 | #, c-format | |
20848 | msgid "RPC failed; %s" | |
20849 | msgstr "RPC 失败。%s" | |
20850 | ||
20851 | #: remote-curl.c:764 | |
20852 | msgid "cannot handle pushes this big" | |
20853 | msgstr "不能处理这么大的推送" | |
20854 | ||
20855 | #: remote-curl.c:879 | |
20856 | #, c-format | |
20857 | msgid "cannot deflate request; zlib deflate error %d" | |
20858 | msgstr "不能压缩请求,zlib 压缩错误 %d" | |
20859 | ||
20860 | #: remote-curl.c:883 | |
20861 | #, c-format | |
20862 | msgid "cannot deflate request; zlib end error %d" | |
20863 | msgstr "不能压缩请求,zlib 结束错误 %d" | |
20864 | ||
20865 | #: remote-curl.c:1014 | |
20866 | msgid "dumb http transport does not support shallow capabilities" | |
20867 | msgstr "哑 http 传输不支持 shalllow 能力" | |
20868 | ||
20869 | #: remote-curl.c:1028 | |
20870 | msgid "fetch failed." | |
20871 | msgstr "获取失败。" | |
20872 | ||
20873 | #: remote-curl.c:1076 | |
20874 | msgid "cannot fetch by sha1 over smart http" | |
20875 | msgstr "无法通过智能 HTTP 获取 sha1" | |
20876 | ||
20877 | #: remote-curl.c:1120 remote-curl.c:1126 | |
20878 | #, c-format | |
20879 | msgid "protocol error: expected sha/ref, got '%s'" | |
20880 | msgstr "协议错误:期望 sha/ref,却得到 '%s'" | |
20881 | ||
20882 | #: remote-curl.c:1138 remote-curl.c:1252 | |
20883 | #, c-format | |
20884 | msgid "http transport does not support %s" | |
20885 | msgstr "http 传输协议不支持 %s" | |
20886 | ||
20887 | #: remote-curl.c:1174 | |
20888 | msgid "git-http-push failed" | |
20889 | msgstr "git-http-push 失败" | |
20890 | ||
20891 | #: remote-curl.c:1360 | |
20892 | msgid "remote-curl: usage: git remote-curl <remote> [<url>]" | |
20893 | msgstr "remote-curl:用法:git remote-curl <远程> [<url>]" | |
20894 | ||
20895 | #: remote-curl.c:1392 | |
20896 | msgid "remote-curl: error reading command stream from git" | |
20897 | msgstr "remote-curl:错误读取来自 git 的命令流" | |
20898 | ||
20899 | #: remote-curl.c:1399 | |
20900 | msgid "remote-curl: fetch attempted without a local repo" | |
20901 | msgstr "remote-curl:尝试没有本地仓库下获取" | |
20902 | ||
20903 | #: remote-curl.c:1439 | |
20904 | #, c-format | |
20905 | msgid "remote-curl: unknown command '%s' from git" | |
20906 | msgstr "remote-curl:未知的来自 git 的命令 '%s'" | |
20907 | ||
20908 | #: list-objects-filter-options.h:61 | |
20909 | msgid "args" | |
20910 | msgstr "参数" | |
20911 | ||
20912 | #: list-objects-filter-options.h:62 | |
20913 | msgid "object filtering" | |
20914 | msgstr "对象过滤" | |
20915 | ||
20916 | #: parse-options.h:170 | |
fd8cb379 JX |
20917 | msgid "expiry-date" |
20918 | msgstr "到期时间" | |
7aea43ff | 20919 | |
d46c5519 | 20920 | #: parse-options.h:184 |
fd8cb379 JX |
20921 | msgid "no-op (backward compatibility)" |
20922 | msgstr "空操作(向后兼容)" | |
7aea43ff | 20923 | |
a6cd2cc4 | 20924 | #: parse-options.h:305 |
fd8cb379 JX |
20925 | msgid "be more verbose" |
20926 | msgstr "更加详细" | |
7aea43ff | 20927 | |
a6cd2cc4 | 20928 | #: parse-options.h:307 |
fd8cb379 JX |
20929 | msgid "be more quiet" |
20930 | msgstr "更加安静" | |
7aea43ff | 20931 | |
a6cd2cc4 | 20932 | #: parse-options.h:313 |
fd8cb379 JX |
20933 | msgid "use <n> digits to display SHA-1s" |
20934 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
7aea43ff | 20935 | |
a6cd2cc4 | 20936 | #: parse-options.h:332 |
d46c5519 JX |
20937 | msgid "how to strip spaces and #comments from message" |
20938 | msgstr "设置如何删除提交说明里的空格和#注释" | |
20939 | ||
20940 | #: ref-filter.h:101 | |
20941 | msgid "key" | |
20942 | msgstr "key" | |
20943 | ||
20944 | #: ref-filter.h:101 | |
20945 | msgid "field name to sort on" | |
20946 | msgstr "排序的字段名" | |
20947 | ||
20948 | #: rerere.h:44 | |
20949 | msgid "update the index with reused conflict resolution if possible" | |
20950 | msgstr "如果可能,重用冲突解决更新索引" | |
20951 | ||
a6cd2cc4 JX |
20952 | #: wt-status.h:67 |
20953 | msgid "HEAD detached at " | |
20954 | msgstr "头指针分离于 " | |
20955 | ||
20956 | #: wt-status.h:68 | |
20957 | msgid "HEAD detached from " | |
20958 | msgstr "头指针分离自 " | |
20959 | ||
fd8cb379 | 20960 | #: command-list.h:50 |
8ada9598 | 20961 | msgid "Add file contents to the index" |
81809b99 | 20962 | msgstr "添加文件内容至索引" |
8ada9598 | 20963 | |
fd8cb379 JX |
20964 | #: command-list.h:51 |
20965 | msgid "Apply a series of patches from a mailbox" | |
20966 | msgstr "应用邮箱格式的系列补丁" | |
20967 | ||
20968 | #: command-list.h:52 | |
20969 | msgid "Annotate file lines with commit information" | |
20970 | msgstr "使用提交信息注释文件行" | |
20971 | ||
20972 | #: command-list.h:53 | |
20973 | msgid "Apply a patch to files and/or to the index" | |
20974 | msgstr "应用一个补丁到文件和/或索引区" | |
20975 | ||
20976 | #: command-list.h:54 | |
4c27fcb5 JX |
20977 | msgid "Import a GNU Arch repository into Git" |
20978 | msgstr "将一个 GNU Arch 仓库导入到 Git" | |
fd8cb379 JX |
20979 | |
20980 | #: command-list.h:55 | |
20981 | msgid "Create an archive of files from a named tree" | |
20982 | msgstr "基于一个指定的树创建文件存档" | |
20983 | ||
20984 | #: command-list.h:56 | |
1b7f4a34 JX |
20985 | msgid "Use binary search to find the commit that introduced a bug" |
20986 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 20987 | |
fd8cb379 JX |
20988 | #: command-list.h:57 |
20989 | msgid "Show what revision and author last modified each line of a file" | |
20990 | msgstr "显示文件每一行最后修改的版本和修改者" | |
20991 | ||
20992 | #: command-list.h:58 | |
8ada9598 | 20993 | msgid "List, create, or delete branches" |
81809b99 | 20994 | msgstr "列出、创建或删除分支" |
8ada9598 | 20995 | |
fd8cb379 JX |
20996 | #: command-list.h:59 |
20997 | msgid "Move objects and refs by archive" | |
20998 | msgstr "通过归档移动对象和引用" | |
20999 | ||
21000 | #: command-list.h:60 | |
21001 | msgid "Provide content or type and size information for repository objects" | |
21002 | msgstr "提供仓库对象的内容、类型或大小" | |
21003 | ||
21004 | #: command-list.h:61 | |
21005 | msgid "Display gitattributes information" | |
21006 | msgstr "显示 gitattributes 信息" | |
21007 | ||
21008 | #: command-list.h:62 | |
21009 | msgid "Debug gitignore / exclude files" | |
21010 | msgstr "调试 gitignore / exclude 文件" | |
21011 | ||
21012 | #: command-list.h:63 | |
21013 | msgid "Show canonical names and email addresses of contacts" | |
21014 | msgstr "显示联系人的规范名称和电子邮件" | |
21015 | ||
21016 | #: command-list.h:64 | |
5bb01d4f JX |
21017 | msgid "Switch branches or restore working tree files" |
21018 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 21019 | |
fd8cb379 JX |
21020 | #: command-list.h:65 |
21021 | msgid "Copy files from the index to the working tree" | |
21022 | msgstr "从索引拷贝文件到工作区" | |
21023 | ||
21024 | #: command-list.h:66 | |
21025 | msgid "Ensures that a reference name is well formed" | |
21026 | msgstr "确保引用名称格式正确" | |
21027 | ||
21028 | #: command-list.h:67 | |
21029 | msgid "Find commits yet to be applied to upstream" | |
21030 | msgstr "查找尚未应用到上游的提交" | |
21031 | ||
21032 | #: command-list.h:68 | |
21033 | msgid "Apply the changes introduced by some existing commits" | |
21034 | msgstr "应用一些现存提交引入的修改" | |
21035 | ||
21036 | #: command-list.h:69 | |
21037 | msgid "Graphical alternative to git-commit" | |
21038 | msgstr "git-commit 的图形替代界面" | |
21039 | ||
21040 | #: command-list.h:70 | |
21041 | msgid "Remove untracked files from the working tree" | |
21042 | msgstr "从工作区中删除未跟踪文件" | |
21043 | ||
21044 | #: command-list.h:71 | |
8ada9598 | 21045 | msgid "Clone a repository into a new directory" |
06991777 | 21046 | msgstr "克隆仓库到一个新目录" |
8ada9598 | 21047 | |
fd8cb379 JX |
21048 | #: command-list.h:72 |
21049 | msgid "Display data in columns" | |
21050 | msgstr "以列的方式显示数据" | |
21051 | ||
21052 | #: command-list.h:73 | |
8ada9598 | 21053 | msgid "Record changes to the repository" |
160fb2b2 | 21054 | msgstr "记录变更到仓库" |
8ada9598 | 21055 | |
fd8cb379 | 21056 | #: command-list.h:74 |
4c27fcb5 JX |
21057 | msgid "Write and verify Git commit-graph files" |
21058 | msgstr "写入和校验 Git 提交图文件" | |
fd8cb379 JX |
21059 | |
21060 | #: command-list.h:75 | |
21061 | msgid "Create a new commit object" | |
21062 | msgstr "创建一个新的提交对象" | |
21063 | ||
21064 | #: command-list.h:76 | |
21065 | msgid "Get and set repository or global options" | |
21066 | msgstr "获取和设置仓库或者全局选项" | |
21067 | ||
21068 | #: command-list.h:77 | |
21069 | msgid "Count unpacked number of objects and their disk consumption" | |
21070 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
21071 | ||
21072 | #: command-list.h:78 | |
21073 | msgid "Retrieve and store user credentials" | |
21074 | msgstr "检索和存储用户密码" | |
21075 | ||
21076 | #: command-list.h:79 | |
21077 | msgid "Helper to temporarily store passwords in memory" | |
21078 | msgstr "在内存中临时存储密码的助手" | |
21079 | ||
21080 | #: command-list.h:80 | |
21081 | msgid "Helper to store credentials on disk" | |
21082 | msgstr "在磁盘存储密码的助手" | |
21083 | ||
21084 | #: command-list.h:81 | |
21085 | msgid "Export a single commit to a CVS checkout" | |
21086 | msgstr "将一个提交导出到 CVS 检出中" | |
21087 | ||
21088 | #: command-list.h:82 | |
21089 | msgid "Salvage your data out of another SCM people love to hate" | |
21090 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
21091 | ||
21092 | #: command-list.h:83 | |
21093 | msgid "A CVS server emulator for Git" | |
21094 | msgstr "Git 的一个 CVS 服务模拟器" | |
21095 | ||
21096 | #: command-list.h:84 | |
21097 | msgid "A really simple server for Git repositories" | |
21098 | msgstr "一个非常简单的 Git 仓库服务器" | |
21099 | ||
21100 | #: command-list.h:85 | |
21101 | msgid "Give an object a human readable name based on an available ref" | |
21102 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
21103 | ||
21104 | #: command-list.h:86 | |
8ada9598 | 21105 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 21106 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 21107 | |
fd8cb379 JX |
21108 | #: command-list.h:87 |
21109 | msgid "Compares files in the working tree and the index" | |
21110 | msgstr "比较工作区和索引区中的文件" | |
21111 | ||
21112 | #: command-list.h:88 | |
21113 | msgid "Compare a tree to the working tree or index" | |
21114 | msgstr "将一个树和工作区或索引做比较" | |
21115 | ||
21116 | #: command-list.h:89 | |
21117 | msgid "Compares the content and mode of blobs found via two tree objects" | |
21118 | msgstr "比较两个树对象的文件内容和模式" | |
21119 | ||
21120 | #: command-list.h:90 | |
21121 | msgid "Show changes using common diff tools" | |
21122 | msgstr "使用常见的差异工具显示更改" | |
21123 | ||
21124 | #: command-list.h:91 | |
21125 | msgid "Git data exporter" | |
21126 | msgstr "Git 数据导出器" | |
21127 | ||
21128 | #: command-list.h:92 | |
21129 | msgid "Backend for fast Git data importers" | |
21130 | msgstr "Git 快速数据导入器后端" | |
21131 | ||
21132 | #: command-list.h:93 | |
8ada9598 | 21133 | msgid "Download objects and refs from another repository" |
160fb2b2 | 21134 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 21135 | |
fd8cb379 JX |
21136 | #: command-list.h:94 |
21137 | msgid "Receive missing objects from another repository" | |
21138 | msgstr "从另一个仓库获取缺失的对象" | |
21139 | ||
21140 | #: command-list.h:95 | |
21141 | msgid "Rewrite branches" | |
21142 | msgstr "重写分支" | |
21143 | ||
21144 | #: command-list.h:96 | |
21145 | msgid "Produce a merge commit message" | |
21146 | msgstr "生成一个合并提交信息" | |
21147 | ||
21148 | #: command-list.h:97 | |
21149 | msgid "Output information on each ref" | |
21150 | msgstr "对每一个引用输出信息 " | |
21151 | ||
21152 | #: command-list.h:98 | |
21153 | msgid "Prepare patches for e-mail submission" | |
21154 | msgstr "准备电子邮件提交的补丁" | |
21155 | ||
21156 | #: command-list.h:99 | |
21157 | msgid "Verifies the connectivity and validity of the objects in the database" | |
21158 | msgstr "验证仓库中对象的连通性和有效性" | |
21159 | ||
21160 | #: command-list.h:100 | |
21161 | msgid "Cleanup unnecessary files and optimize the local repository" | |
21162 | msgstr "清除不必要的文件和优化本地仓库" | |
21163 | ||
21164 | #: command-list.h:101 | |
21165 | msgid "Extract commit ID from an archive created using git-archive" | |
5b533632 | 21166 | msgstr "从 git-archive 创建的归档文件中提取提交 ID" |
fd8cb379 JX |
21167 | |
21168 | #: command-list.h:102 | |
8ada9598 | 21169 | msgid "Print lines matching a pattern" |
81809b99 | 21170 | msgstr "输出和模式匹配的行" |
8ada9598 | 21171 | |
fd8cb379 JX |
21172 | #: command-list.h:103 |
21173 | msgid "A portable graphical interface to Git" | |
21174 | msgstr "一个便携的 Git 图形客户端" | |
21175 | ||
21176 | #: command-list.h:104 | |
21177 | msgid "Compute object ID and optionally creates a blob from a file" | |
5b533632 | 21178 | msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象" |
fd8cb379 JX |
21179 | |
21180 | #: command-list.h:105 | |
21181 | msgid "Display help information about Git" | |
21182 | msgstr "显示 Git 的帮助信息" | |
21183 | ||
21184 | #: command-list.h:106 | |
21185 | msgid "Server side implementation of Git over HTTP" | |
21186 | msgstr "Git HTTP 协议的服务端实现" | |
21187 | ||
21188 | #: command-list.h:107 | |
21189 | msgid "Download from a remote Git repository via HTTP" | |
21190 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
21191 | ||
21192 | #: command-list.h:108 | |
21193 | msgid "Push objects over HTTP/DAV to another repository" | |
21194 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
21195 | ||
21196 | #: command-list.h:109 | |
21197 | msgid "Send a collection of patches from stdin to an IMAP folder" | |
21198 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
21199 | ||
21200 | #: command-list.h:110 | |
21201 | msgid "Build pack index file for an existing packed archive" | |
21202 | msgstr "从一个现存的包存档文件创建包索引" | |
21203 | ||
21204 | #: command-list.h:111 | |
a77c07d9 | 21205 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 21206 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 21207 | |
fd8cb379 JX |
21208 | #: command-list.h:112 |
21209 | msgid "Instantly browse your working repository in gitweb" | |
21210 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
21211 | ||
21212 | #: command-list.h:113 | |
d46c5519 | 21213 | msgid "Add or parse structured information in commit messages" |
fd8cb379 JX |
21214 | msgstr "添加或解析提交说明中的结构化信息" |
21215 | ||
21216 | #: command-list.h:114 | |
21217 | msgid "The Git repository browser" | |
21218 | msgstr "Git 仓库浏览器" | |
21219 | ||
21220 | #: command-list.h:115 | |
8ada9598 | 21221 | msgid "Show commit logs" |
81809b99 | 21222 | msgstr "显示提交日志" |
8ada9598 | 21223 | |
fd8cb379 JX |
21224 | #: command-list.h:116 |
21225 | msgid "Show information about files in the index and the working tree" | |
21226 | msgstr "显示索引和工作区中文件的信息" | |
21227 | ||
21228 | #: command-list.h:117 | |
21229 | msgid "List references in a remote repository" | |
21230 | msgstr "显示一个远程仓库的引用" | |
21231 | ||
21232 | #: command-list.h:118 | |
21233 | msgid "List the contents of a tree object" | |
21234 | msgstr "显示一个树对象的内容" | |
21235 | ||
21236 | #: command-list.h:119 | |
21237 | msgid "Extracts patch and authorship from a single e-mail message" | |
21238 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
21239 | ||
21240 | #: command-list.h:120 | |
21241 | msgid "Simple UNIX mbox splitter program" | |
21242 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
21243 | ||
21244 | #: command-list.h:121 | |
8ada9598 | 21245 | msgid "Join two or more development histories together" |
81809b99 | 21246 | msgstr "合并两个或更多开发历史" |
8ada9598 | 21247 | |
fd8cb379 JX |
21248 | #: command-list.h:122 |
21249 | msgid "Find as good common ancestors as possible for a merge" | |
21250 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
21251 | ||
21252 | #: command-list.h:123 | |
21253 | msgid "Run a three-way file merge" | |
21254 | msgstr "运行一个三路文件合并" | |
21255 | ||
21256 | #: command-list.h:124 | |
21257 | msgid "Run a merge for files needing merging" | |
21258 | msgstr "对于需要合并的文件执行合并" | |
21259 | ||
21260 | #: command-list.h:125 | |
21261 | msgid "The standard helper program to use with git-merge-index" | |
21262 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
21263 | ||
21264 | #: command-list.h:126 | |
21265 | msgid "Run merge conflict resolution tools to resolve merge conflicts" | |
21266 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
21267 | ||
21268 | #: command-list.h:127 | |
21269 | msgid "Show three-way merge without touching index" | |
21270 | msgstr "显示三路合并而不动索引" | |
21271 | ||
21272 | #: command-list.h:128 | |
4c27fcb5 JX |
21273 | msgid "Write and verify multi-pack-indexes" |
21274 | msgstr "写入和校验多包索引" | |
21275 | ||
21276 | #: command-list.h:129 | |
fd8cb379 JX |
21277 | msgid "Creates a tag object" |
21278 | msgstr "创建一个标签对象" | |
21279 | ||
4c27fcb5 | 21280 | #: command-list.h:130 |
fd8cb379 JX |
21281 | msgid "Build a tree-object from ls-tree formatted text" |
21282 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
21283 | ||
4c27fcb5 | 21284 | #: command-list.h:131 |
8ada9598 | 21285 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 21286 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 21287 | |
fd8cb379 | 21288 | # 查找给定版本的符号名称 |
4c27fcb5 | 21289 | #: command-list.h:132 |
fd8cb379 JX |
21290 | msgid "Find symbolic names for given revs" |
21291 | msgstr "查找给定版本的符号名称" | |
21292 | ||
4c27fcb5 | 21293 | #: command-list.h:133 |
fd8cb379 JX |
21294 | msgid "Add or inspect object notes" |
21295 | msgstr "添加或检查对象注释" | |
21296 | ||
4c27fcb5 | 21297 | #: command-list.h:134 |
fd8cb379 JX |
21298 | msgid "Import from and submit to Perforce repositories" |
21299 | msgstr "导入和提交到 Perforce 仓库中" | |
21300 | ||
4c27fcb5 | 21301 | #: command-list.h:135 |
fd8cb379 JX |
21302 | msgid "Create a packed archive of objects" |
21303 | msgstr "创建对象的存档包" | |
21304 | ||
4c27fcb5 | 21305 | #: command-list.h:136 |
fd8cb379 JX |
21306 | msgid "Find redundant pack files" |
21307 | msgstr "查找冗余的包文件" | |
21308 | ||
4c27fcb5 | 21309 | #: command-list.h:137 |
fd8cb379 JX |
21310 | msgid "Pack heads and tags for efficient repository access" |
21311 | msgstr "打包头和标签以实现高效的仓库访问" | |
21312 | ||
4c27fcb5 | 21313 | #: command-list.h:138 |
fd8cb379 JX |
21314 | msgid "Routines to help parsing remote repository access parameters" |
21315 | msgstr "帮助解析远程仓库访问参数的例程" | |
21316 | ||
4c27fcb5 | 21317 | #: command-list.h:139 |
fd8cb379 | 21318 | msgid "Compute unique ID for a patch" |
5b533632 | 21319 | msgstr "计算一个补丁的唯一 ID" |
fd8cb379 | 21320 | |
4c27fcb5 | 21321 | #: command-list.h:140 |
fd8cb379 JX |
21322 | msgid "Prune all unreachable objects from the object database" |
21323 | msgstr "删除对象库中所有不可达对象" | |
21324 | ||
4c27fcb5 | 21325 | #: command-list.h:141 |
fd8cb379 JX |
21326 | msgid "Remove extra objects that are already in pack files" |
21327 | msgstr "删除已经在包文件中的多余对象" | |
21328 | ||
4c27fcb5 | 21329 | #: command-list.h:142 |
2e8451e8 | 21330 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 21331 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 21332 | |
4c27fcb5 | 21333 | #: command-list.h:143 |
8ada9598 | 21334 | msgid "Update remote refs along with associated objects" |
81809b99 | 21335 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 21336 | |
4c27fcb5 | 21337 | #: command-list.h:144 |
fd8cb379 JX |
21338 | msgid "Applies a quilt patchset onto the current branch" |
21339 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
21340 | ||
4c27fcb5 | 21341 | #: command-list.h:145 |
c1ac5258 JX |
21342 | msgid "Compare two commit ranges (e.g. two versions of a branch)" |
21343 | msgstr "比较两个提交范围(如一个分支的两个版本)" | |
21344 | ||
4c27fcb5 | 21345 | #: command-list.h:146 |
fd8cb379 JX |
21346 | msgid "Reads tree information into the index" |
21347 | msgstr "将树信息读取到索引" | |
21348 | ||
4c27fcb5 | 21349 | #: command-list.h:147 |
3495628d JX |
21350 | msgid "Reapply commits on top of another base tip" |
21351 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 21352 | |
4c27fcb5 | 21353 | #: command-list.h:148 |
fd8cb379 JX |
21354 | msgid "Receive what is pushed into the repository" |
21355 | msgstr "接收推送到仓库中的对象" | |
21356 | ||
4c27fcb5 | 21357 | #: command-list.h:149 |
fd8cb379 JX |
21358 | msgid "Manage reflog information" |
21359 | msgstr "管理 reflog 信息" | |
21360 | ||
4c27fcb5 | 21361 | #: command-list.h:150 |
fd8cb379 JX |
21362 | msgid "Manage set of tracked repositories" |
21363 | msgstr "管理已跟踪仓库" | |
21364 | ||
4c27fcb5 | 21365 | #: command-list.h:151 |
fd8cb379 JX |
21366 | msgid "Pack unpacked objects in a repository" |
21367 | msgstr "打包仓库中未打包对象" | |
21368 | ||
4c27fcb5 | 21369 | #: command-list.h:152 |
fd8cb379 JX |
21370 | msgid "Create, list, delete refs to replace objects" |
21371 | msgstr "创建、列出、删除对象替换引用" | |
21372 | ||
4c27fcb5 | 21373 | #: command-list.h:153 |
fd8cb379 JX |
21374 | msgid "Generates a summary of pending changes" |
21375 | msgstr "生成待定更改的摘要" | |
21376 | ||
4c27fcb5 | 21377 | #: command-list.h:154 |
fd8cb379 JX |
21378 | msgid "Reuse recorded resolution of conflicted merges" |
21379 | msgstr "重用冲突合并的解决方案记录" | |
21380 | ||
4c27fcb5 | 21381 | #: command-list.h:155 |
8ada9598 | 21382 | msgid "Reset current HEAD to the specified state" |
4375c10e | 21383 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 21384 | |
4c27fcb5 | 21385 | #: command-list.h:156 |
a6cd2cc4 JX |
21386 | msgid "Restore working tree files" |
21387 | msgstr "恢复工作区文件" | |
21388 | ||
21389 | #: command-list.h:157 | |
fd8cb379 JX |
21390 | msgid "Revert some existing commits" |
21391 | msgstr "回退一些现存提交" | |
21392 | ||
a6cd2cc4 | 21393 | #: command-list.h:158 |
fd8cb379 JX |
21394 | msgid "Lists commit objects in reverse chronological order" |
21395 | msgstr "按时间顺序列出提交对象" | |
21396 | ||
a6cd2cc4 | 21397 | #: command-list.h:159 |
fd8cb379 JX |
21398 | msgid "Pick out and massage parameters" |
21399 | msgstr "选出并处理参数" | |
21400 | ||
a6cd2cc4 | 21401 | #: command-list.h:160 |
8ada9598 | 21402 | msgid "Remove files from the working tree and from the index" |
81809b99 | 21403 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 21404 | |
a6cd2cc4 | 21405 | #: command-list.h:161 |
fd8cb379 JX |
21406 | msgid "Send a collection of patches as emails" |
21407 | msgstr "通过电子邮件发送一组补丁" | |
21408 | ||
a6cd2cc4 | 21409 | #: command-list.h:162 |
fd8cb379 JX |
21410 | msgid "Push objects over Git protocol to another repository" |
21411 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
21412 | ||
a6cd2cc4 | 21413 | #: command-list.h:163 |
fd8cb379 JX |
21414 | msgid "Restricted login shell for Git-only SSH access" |
21415 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
21416 | ||
a6cd2cc4 | 21417 | #: command-list.h:164 |
fd8cb379 JX |
21418 | msgid "Summarize 'git log' output" |
21419 | msgstr "'git log' 输出摘要" | |
21420 | ||
a6cd2cc4 | 21421 | #: command-list.h:165 |
8ada9598 | 21422 | msgid "Show various types of objects" |
81809b99 | 21423 | msgstr "显示各种类型的对象" |
8ada9598 | 21424 | |
a6cd2cc4 | 21425 | #: command-list.h:166 |
fd8cb379 JX |
21426 | msgid "Show branches and their commits" |
21427 | msgstr "显示分支和提交" | |
21428 | ||
a6cd2cc4 | 21429 | #: command-list.h:167 |
fd8cb379 JX |
21430 | msgid "Show packed archive index" |
21431 | msgstr "显示打包归档索引" | |
21432 | ||
a6cd2cc4 | 21433 | #: command-list.h:168 |
fd8cb379 JX |
21434 | msgid "List references in a local repository" |
21435 | msgstr "显示本地仓库中的引用" | |
21436 | ||
a6cd2cc4 | 21437 | #: command-list.h:169 |
fd8cb379 JX |
21438 | msgid "Git's i18n setup code for shell scripts" |
21439 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
21440 | ||
a6cd2cc4 | 21441 | #: command-list.h:170 |
fd8cb379 JX |
21442 | msgid "Common Git shell script setup code" |
21443 | msgstr "常用的 Git shell 脚本设置代码" | |
21444 | ||
a6cd2cc4 | 21445 | #: command-list.h:171 |
fd8cb379 JX |
21446 | msgid "Stash the changes in a dirty working directory away" |
21447 | msgstr "贮藏脏工作区中的修改" | |
21448 | ||
a6cd2cc4 | 21449 | #: command-list.h:172 |
fd8cb379 JX |
21450 | msgid "Add file contents to the staging area" |
21451 | msgstr "将文件内容添加到索引" | |
21452 | ||
a6cd2cc4 | 21453 | #: command-list.h:173 |
8ada9598 | 21454 | msgid "Show the working tree status" |
81809b99 | 21455 | msgstr "显示工作区状态" |
8ada9598 | 21456 | |
a6cd2cc4 | 21457 | #: command-list.h:174 |
fd8cb379 JX |
21458 | msgid "Remove unnecessary whitespace" |
21459 | msgstr "删除不必要的空白字符" | |
21460 | ||
a6cd2cc4 | 21461 | #: command-list.h:175 |
fd8cb379 JX |
21462 | msgid "Initialize, update or inspect submodules" |
21463 | msgstr "初始化、更新或检查子模组" | |
21464 | ||
a6cd2cc4 | 21465 | #: command-list.h:176 |
fd8cb379 JX |
21466 | msgid "Bidirectional operation between a Subversion repository and Git" |
21467 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
21468 | ||
a6cd2cc4 JX |
21469 | #: command-list.h:177 |
21470 | msgid "Switch branches" | |
21471 | msgstr "切换分支" | |
21472 | ||
21473 | #: command-list.h:178 | |
fd8cb379 JX |
21474 | msgid "Read, modify and delete symbolic refs" |
21475 | msgstr "读取、修改和删除符号引用" | |
21476 | ||
a6cd2cc4 | 21477 | #: command-list.h:179 |
8ada9598 | 21478 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 21479 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 21480 | |
a6cd2cc4 | 21481 | #: command-list.h:180 |
fd8cb379 JX |
21482 | msgid "Creates a temporary file with a blob's contents" |
21483 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 21484 | |
a6cd2cc4 | 21485 | #: command-list.h:181 |
fd8cb379 JX |
21486 | msgid "Unpack objects from a packed archive" |
21487 | msgstr "从打包文件中解压缩对象" | |
220c313c | 21488 | |
a6cd2cc4 | 21489 | #: command-list.h:182 |
fd8cb379 JX |
21490 | msgid "Register file contents in the working tree to the index" |
21491 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 21492 | |
a6cd2cc4 | 21493 | #: command-list.h:183 |
fd8cb379 JX |
21494 | msgid "Update the object name stored in a ref safely" |
21495 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 21496 | |
a6cd2cc4 | 21497 | #: command-list.h:184 |
fd8cb379 JX |
21498 | msgid "Update auxiliary info file to help dumb servers" |
21499 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
21500 | ||
a6cd2cc4 | 21501 | #: command-list.h:185 |
fd8cb379 JX |
21502 | msgid "Send archive back to git-archive" |
21503 | msgstr "将存档发送回 git-archive" | |
21504 | ||
a6cd2cc4 | 21505 | #: command-list.h:186 |
fd8cb379 JX |
21506 | msgid "Send objects packed back to git-fetch-pack" |
21507 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
21508 | ||
a6cd2cc4 | 21509 | #: command-list.h:187 |
fd8cb379 JX |
21510 | msgid "Show a Git logical variable" |
21511 | msgstr "显示一个Git逻辑变量" | |
21512 | ||
a6cd2cc4 | 21513 | #: command-list.h:188 |
fd8cb379 JX |
21514 | msgid "Check the GPG signature of commits" |
21515 | msgstr "检查 GPG 提交签名" | |
21516 | ||
a6cd2cc4 | 21517 | #: command-list.h:189 |
fd8cb379 JX |
21518 | msgid "Validate packed Git archive files" |
21519 | msgstr "校验打包的Git存仓文件" | |
21520 | ||
a6cd2cc4 | 21521 | #: command-list.h:190 |
fd8cb379 JX |
21522 | msgid "Check the GPG signature of tags" |
21523 | msgstr "检查标签的 GPG 签名" | |
21524 | ||
a6cd2cc4 | 21525 | #: command-list.h:191 |
fd8cb379 JX |
21526 | msgid "Git web interface (web frontend to Git repositories)" |
21527 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
21528 | ||
a6cd2cc4 | 21529 | #: command-list.h:192 |
fd8cb379 JX |
21530 | msgid "Show logs with difference each commit introduces" |
21531 | msgstr "显示每一个提交引入的差异日志" | |
21532 | ||
a6cd2cc4 | 21533 | #: command-list.h:193 |
fd8cb379 JX |
21534 | msgid "Manage multiple working trees" |
21535 | msgstr "管理多个工作区" | |
21536 | ||
a6cd2cc4 | 21537 | #: command-list.h:194 |
fd8cb379 JX |
21538 | msgid "Create a tree object from the current index" |
21539 | msgstr "从当前索引创建一个树对象" | |
21540 | ||
a6cd2cc4 | 21541 | #: command-list.h:195 |
fd8cb379 JX |
21542 | msgid "Defining attributes per path" |
21543 | msgstr "定义路径的属性" | |
21544 | ||
a6cd2cc4 | 21545 | #: command-list.h:196 |
fd8cb379 JX |
21546 | msgid "Git command-line interface and conventions" |
21547 | msgstr "Git 命令行界面和约定" | |
21548 | ||
a6cd2cc4 | 21549 | #: command-list.h:197 |
fd8cb379 JX |
21550 | msgid "A Git core tutorial for developers" |
21551 | msgstr "面向开发人员的 Git 核心教程" | |
21552 | ||
a6cd2cc4 | 21553 | #: command-list.h:198 |
fd8cb379 JX |
21554 | msgid "Git for CVS users" |
21555 | msgstr "适合 CVS 用户的 Git 帮助" | |
21556 | ||
a6cd2cc4 | 21557 | #: command-list.h:199 |
fd8cb379 JX |
21558 | msgid "Tweaking diff output" |
21559 | msgstr "调整差异输出" | |
21560 | ||
a6cd2cc4 | 21561 | #: command-list.h:200 |
fd8cb379 JX |
21562 | msgid "A useful minimum set of commands for Everyday Git" |
21563 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
21564 | ||
a6cd2cc4 | 21565 | #: command-list.h:201 |
fd8cb379 JX |
21566 | msgid "A Git Glossary" |
21567 | msgstr "Git 词汇表" | |
21568 | ||
a6cd2cc4 | 21569 | #: command-list.h:202 |
fd8cb379 JX |
21570 | msgid "Hooks used by Git" |
21571 | msgstr "Git 使用的钩子" | |
21572 | ||
a6cd2cc4 | 21573 | #: command-list.h:203 |
fd8cb379 JX |
21574 | msgid "Specifies intentionally untracked files to ignore" |
21575 | msgstr "忽略指定的未跟踪文件" | |
21576 | ||
a6cd2cc4 | 21577 | #: command-list.h:204 |
fd8cb379 JX |
21578 | msgid "Defining submodule properties" |
21579 | msgstr "定义子模组属性" | |
21580 | ||
a6cd2cc4 | 21581 | #: command-list.h:205 |
fd8cb379 JX |
21582 | msgid "Git namespaces" |
21583 | msgstr "Git 名字空间" | |
21584 | ||
a6cd2cc4 | 21585 | #: command-list.h:206 |
fd8cb379 JX |
21586 | msgid "Git Repository Layout" |
21587 | msgstr "Git 仓库布局" | |
21588 | ||
a6cd2cc4 | 21589 | #: command-list.h:207 |
fd8cb379 JX |
21590 | msgid "Specifying revisions and ranges for Git" |
21591 | msgstr "指定 Git 的版本和版本范围" | |
21592 | ||
a6cd2cc4 | 21593 | #: command-list.h:208 |
fd8cb379 JX |
21594 | msgid "A tutorial introduction to Git: part two" |
21595 | msgstr "一个 Git 教程:第二部分" | |
21596 | ||
a6cd2cc4 | 21597 | #: command-list.h:209 |
fd8cb379 JX |
21598 | msgid "A tutorial introduction to Git" |
21599 | msgstr "一个 Git 教程" | |
21600 | ||
a6cd2cc4 | 21601 | #: command-list.h:210 |
fd8cb379 JX |
21602 | msgid "An overview of recommended workflows with Git" |
21603 | msgstr "Git 推荐的工作流概览" | |
220c313c | 21604 | |
5c57d762 | 21605 | #: git-bisect.sh:54 |
b694fbb1 JX |
21606 | msgid "You need to start by \"git bisect start\"" |
21607 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
21608 | ||
90e6ef53 | 21609 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
21610 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
21611 | #. translation. The program will only accept English input | |
21612 | #. at this point. | |
5c57d762 | 21613 | #: git-bisect.sh:60 |
c04f5ac3 JX |
21614 | msgid "Do you want me to do it for you [Y/n]? " |
21615 | msgstr "您想让我为您这样做么[Y/n]? " | |
21616 | ||
06991777 | 21617 | #: git-bisect.sh:101 |
c04f5ac3 JX |
21618 | #, sh-format |
21619 | msgid "Bad rev input: $arg" | |
9a4b694c | 21620 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 21621 | |
06991777 | 21622 | #: git-bisect.sh:121 |
5c57d762 JX |
21623 | #, sh-format |
21624 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 21625 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 21626 | |
06991777 | 21627 | #: git-bisect.sh:130 |
c04f5ac3 JX |
21628 | #, sh-format |
21629 | msgid "Bad rev input: $rev" | |
9a4b694c | 21630 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 21631 | |
06991777 | 21632 | #: git-bisect.sh:139 |
1b7f4a34 JX |
21633 | #, sh-format |
21634 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
21635 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
21636 | ||
06991777 | 21637 | #: git-bisect.sh:209 |
c04f5ac3 JX |
21638 | msgid "No logfile given" |
21639 | msgstr "未提供日志文件" | |
21640 | ||
06991777 | 21641 | #: git-bisect.sh:210 |
c04f5ac3 JX |
21642 | #, sh-format |
21643 | msgid "cannot read $file for replaying" | |
21644 | msgstr "不能读取 $file 来重放" | |
21645 | ||
06991777 | 21646 | #: git-bisect.sh:232 |
c04f5ac3 JX |
21647 | msgid "?? what are you talking about?" |
21648 | msgstr "?? 您在说什么?" | |
21649 | ||
06991777 | 21650 | #: git-bisect.sh:241 |
5809aa05 JX |
21651 | msgid "bisect run failed: no command provided." |
21652 | msgstr "二分查找运行失败:没有提供命令。" | |
21653 | ||
06991777 | 21654 | #: git-bisect.sh:246 |
b694fbb1 JX |
21655 | #, sh-format |
21656 | msgid "running $command" | |
21657 | msgstr "运行 $command" | |
21658 | ||
06991777 | 21659 | #: git-bisect.sh:253 |
b694fbb1 JX |
21660 | #, sh-format |
21661 | msgid "" | |
21662 | "bisect run failed:\n" | |
21663 | "exit code $res from '$command' is < 0 or >= 128" | |
21664 | msgstr "" | |
21665 | "二分查找运行失败:\n" | |
07432cef | 21666 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 21667 | |
06991777 | 21668 | #: git-bisect.sh:279 |
b694fbb1 JX |
21669 | msgid "bisect run cannot continue any more" |
21670 | msgstr "二分查找不能继续运行" | |
21671 | ||
06991777 | 21672 | #: git-bisect.sh:285 |
b694fbb1 JX |
21673 | #, sh-format |
21674 | msgid "" | |
21675 | "bisect run failed:\n" | |
21676 | "'bisect_state $state' exited with error code $res" | |
21677 | msgstr "" | |
21678 | "二分查找运行失败:\n" | |
21679 | "'bisect_state $state' 退出码为 $res" | |
21680 | ||
06991777 | 21681 | #: git-bisect.sh:292 |
b694fbb1 JX |
21682 | msgid "bisect run success" |
21683 | msgstr "二分查找运行成功" | |
c04f5ac3 | 21684 | |
06991777 JX |
21685 | #: git-bisect.sh:300 |
21686 | msgid "We are not bisecting." | |
21687 | msgstr "我们没有在二分查找。" | |
94550ed3 | 21688 | |
5c57d762 JX |
21689 | #: git-merge-octopus.sh:46 |
21690 | msgid "" | |
21691 | "Error: Your local changes to the following files would be overwritten by " | |
21692 | "merge" | |
21693 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
21694 | ||
21695 | #: git-merge-octopus.sh:61 | |
21696 | msgid "Automated merge did not work." | |
9a4b694c | 21697 | msgstr "自动合并未生效。" |
5c57d762 JX |
21698 | |
21699 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 21700 | msgid "Should not be doing an octopus." |
5c57d762 JX |
21701 | msgstr "不应该执行章鱼式合并。" |
21702 | ||
21703 | #: git-merge-octopus.sh:73 | |
21704 | #, sh-format | |
21705 | msgid "Unable to find common commit with $pretty_name" | |
21706 | msgstr "无法找到和 $pretty_name 的基线提交" | |
21707 | ||
21708 | #: git-merge-octopus.sh:77 | |
21709 | #, sh-format | |
6937cb4e | 21710 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
21711 | msgstr "已经和 $pretty_name 保持一致" |
21712 | ||
21713 | #: git-merge-octopus.sh:89 | |
21714 | #, sh-format | |
21715 | msgid "Fast-forwarding to: $pretty_name" | |
21716 | msgstr "快进至:$pretty_name" | |
21717 | ||
21718 | #: git-merge-octopus.sh:97 | |
21719 | #, sh-format | |
21720 | msgid "Trying simple merge with $pretty_name" | |
21721 | msgstr "尝试和 $pretty_name 的简单合并" | |
21722 | ||
21723 | #: git-merge-octopus.sh:102 | |
21724 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 21725 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 21726 | |
d46c5519 | 21727 | #: git-legacy-stash.sh:220 |
c04f5ac3 | 21728 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 21729 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 21730 | |
d46c5519 | 21731 | #: git-legacy-stash.sh:271 |
2e8451e8 JX |
21732 | #, sh-format |
21733 | msgid "Cannot update $ref_stash with $w_commit" | |
21734 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
21735 | ||
d46c5519 | 21736 | #: git-legacy-stash.sh:323 |
b694fbb1 | 21737 | #, sh-format |
5809aa05 JX |
21738 | msgid "error: unknown option for 'stash push': $option" |
21739 | msgstr "错误:'stash push' 的未知选项:$option" | |
b694fbb1 | 21740 | |
d46c5519 | 21741 | #: git-legacy-stash.sh:355 |
5c57d762 JX |
21742 | #, sh-format |
21743 | msgid "Saved working directory and index state $stash_msg" | |
21744 | msgstr "保存工作目录和索引状态 $stash_msg" | |
21745 | ||
d46c5519 | 21746 | #: git-legacy-stash.sh:535 |
7aea43ff JX |
21747 | #, sh-format |
21748 | msgid "unknown option: $opt" | |
21749 | msgstr "未知选项: $opt" | |
21750 | ||
d46c5519 | 21751 | #: git-legacy-stash.sh:555 |
c04f5ac3 JX |
21752 | #, sh-format |
21753 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 21754 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 21755 | |
d46c5519 | 21756 | #: git-legacy-stash.sh:570 |
c04f5ac3 | 21757 | #, sh-format |
220c313c JX |
21758 | msgid "$reference is not a valid reference" |
21759 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 21760 | |
d46c5519 | 21761 | #: git-legacy-stash.sh:598 |
c04f5ac3 JX |
21762 | #, sh-format |
21763 | msgid "'$args' is not a stash-like commit" | |
a4f16749 | 21764 | msgstr "'$args' 不是贮藏式提交" |
c04f5ac3 | 21765 | |
d46c5519 | 21766 | #: git-legacy-stash.sh:609 |
c04f5ac3 JX |
21767 | #, sh-format |
21768 | msgid "'$args' is not a stash reference" | |
a4f16749 | 21769 | msgstr "'$args' 不是一个贮藏引用" |
c04f5ac3 | 21770 | |
d46c5519 | 21771 | #: git-legacy-stash.sh:617 |
c04f5ac3 | 21772 | msgid "unable to refresh index" |
90e6ef53 | 21773 | msgstr "无法刷新索引" |
c04f5ac3 | 21774 | |
d46c5519 | 21775 | #: git-legacy-stash.sh:621 |
c04f5ac3 | 21776 | msgid "Cannot apply a stash in the middle of a merge" |
a4f16749 | 21777 | msgstr "无法在合并过程应用贮藏" |
c04f5ac3 | 21778 | |
d46c5519 | 21779 | #: git-legacy-stash.sh:629 |
c04f5ac3 | 21780 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 21781 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 21782 | |
d46c5519 | 21783 | #: git-legacy-stash.sh:631 |
c04f5ac3 | 21784 | msgid "Could not save index tree" |
90e6ef53 | 21785 | msgstr "不能保存索引树" |
c04f5ac3 | 21786 | |
d46c5519 | 21787 | #: git-legacy-stash.sh:640 |
a4f16749 JX |
21788 | msgid "Could not restore untracked files from stash entry" |
21789 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
a0b6b246 | 21790 | |
d46c5519 | 21791 | #: git-legacy-stash.sh:665 |
c04f5ac3 | 21792 | msgid "Cannot unstage modified files" |
160fb2b2 | 21793 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 21794 | |
d46c5519 | 21795 | #: git-legacy-stash.sh:703 |
c04f5ac3 JX |
21796 | #, sh-format |
21797 | msgid "Dropped ${REV} ($s)" | |
21798 | msgstr "丢弃了 ${REV} ($s)" | |
21799 | ||
d46c5519 | 21800 | #: git-legacy-stash.sh:704 |
c04f5ac3 JX |
21801 | #, sh-format |
21802 | msgid "${REV}: Could not drop stash entry" | |
a4f16749 | 21803 | msgstr "${REV}:无法丢弃贮藏条目" |
c04f5ac3 | 21804 | |
d46c5519 | 21805 | #: git-legacy-stash.sh:791 |
c04f5ac3 JX |
21806 | msgid "(To restore them type \"git stash apply\")" |
21807 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
21808 | ||
d46c5519 | 21809 | #: git-submodule.sh:200 |
2e8451e8 JX |
21810 | msgid "Relative path can only be used from the toplevel of the working tree" |
21811 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
21812 | ||
d46c5519 | 21813 | #: git-submodule.sh:210 |
c04f5ac3 JX |
21814 | #, sh-format |
21815 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 21816 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 21817 | |
d46c5519 | 21818 | #: git-submodule.sh:229 |
c04f5ac3 | 21819 | #, sh-format |
170e9899 JX |
21820 | msgid "'$sm_path' already exists in the index" |
21821 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 21822 | |
d46c5519 | 21823 | #: git-submodule.sh:232 |
1a79b2f1 JX |
21824 | #, sh-format |
21825 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
21826 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
21827 | ||
d46c5519 JX |
21828 | #: git-submodule.sh:239 |
21829 | #, sh-format | |
21830 | msgid "'$sm_path' does not have a commit checked out" | |
5b533632 | 21831 | msgstr "'$sm_path' 没有检出的提交" |
d46c5519 JX |
21832 | |
21833 | #: git-submodule.sh:245 | |
b694fbb1 JX |
21834 | #, sh-format |
21835 | msgid "" | |
21836 | "The following path is ignored by one of your .gitignore files:\n" | |
21837 | "$sm_path\n" | |
21838 | "Use -f if you really want to add it." | |
21839 | msgstr "" | |
21840 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
21841 | "$sm_path\n" | |
21842 | "如果您确实想添加它,使用 -f 参数。" | |
21843 | ||
d46c5519 | 21844 | #: git-submodule.sh:268 |
b694fbb1 JX |
21845 | #, sh-format |
21846 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 21847 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 21848 | |
d46c5519 | 21849 | #: git-submodule.sh:270 |
c04f5ac3 | 21850 | #, sh-format |
170e9899 | 21851 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 21852 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 21853 | |
d46c5519 | 21854 | #: git-submodule.sh:278 |
07432cef WS |
21855 | #, sh-format |
21856 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 21857 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 21858 | |
d46c5519 | 21859 | #: git-submodule.sh:280 |
07432cef WS |
21860 | #, sh-format |
21861 | msgid "" | |
5c57d762 JX |
21862 | "If you want to reuse this local git directory instead of cloning again from\n" |
21863 | " $realrepo\n" | |
21864 | "use the '--force' option. If the local git directory is not the correct " | |
21865 | "repo\n" | |
07432cef WS |
21866 | "or you are unsure what this means choose another name with the '--name' " |
21867 | "option." | |
5c57d762 JX |
21868 | msgstr "" |
21869 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
21870 | " $realrepo\n" | |
21871 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
21872 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 21873 | |
d46c5519 | 21874 | #: git-submodule.sh:286 |
07432cef WS |
21875 | #, sh-format |
21876 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
21877 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
21878 | ||
d46c5519 | 21879 | #: git-submodule.sh:298 |
c04f5ac3 | 21880 | #, sh-format |
170e9899 JX |
21881 | msgid "Unable to checkout submodule '$sm_path'" |
21882 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 21883 | |
d46c5519 | 21884 | #: git-submodule.sh:303 |
c04f5ac3 | 21885 | #, sh-format |
170e9899 JX |
21886 | msgid "Failed to add submodule '$sm_path'" |
21887 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 21888 | |
d46c5519 | 21889 | #: git-submodule.sh:312 |
c04f5ac3 | 21890 | #, sh-format |
170e9899 JX |
21891 | msgid "Failed to register submodule '$sm_path'" |
21892 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 21893 | |
d46c5519 | 21894 | #: git-submodule.sh:573 |
c04f5ac3 | 21895 | #, sh-format |
2e8451e8 JX |
21896 | msgid "Unable to find current revision in submodule path '$displaypath'" |
21897 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 21898 | |
d46c5519 | 21899 | #: git-submodule.sh:583 |
c04f5ac3 | 21900 | #, sh-format |
170e9899 JX |
21901 | msgid "Unable to fetch in submodule path '$sm_path'" |
21902 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 21903 | |
d46c5519 | 21904 | #: git-submodule.sh:588 |
5c57d762 JX |
21905 | #, sh-format |
21906 | msgid "" | |
21907 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
21908 | "'$sm_path'" | |
9a4b694c | 21909 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 21910 | |
d46c5519 | 21911 | #: git-submodule.sh:606 |
2e8451e8 | 21912 | #, sh-format |
d46c5519 JX |
21913 | msgid "" |
21914 | "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " | |
21915 | "$sha1:" | |
21916 | msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:" | |
2e8451e8 | 21917 | |
d46c5519 | 21918 | #: git-submodule.sh:612 |
5c57d762 JX |
21919 | #, sh-format |
21920 | msgid "" | |
21921 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
21922 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
21923 | msgstr "" |
21924 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 21925 | |
d46c5519 | 21926 | #: git-submodule.sh:619 |
6c94aba5 JX |
21927 | #, sh-format |
21928 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
21929 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
21930 | ||
d46c5519 | 21931 | #: git-submodule.sh:620 |
c04f5ac3 | 21932 | #, sh-format |
6c94aba5 JX |
21933 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
21934 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
21935 | ||
d46c5519 | 21936 | #: git-submodule.sh:624 |
6c94aba5 | 21937 | #, sh-format |
2e8451e8 JX |
21938 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
21939 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 21940 | |
d46c5519 | 21941 | #: git-submodule.sh:625 |
c04f5ac3 | 21942 | #, sh-format |
2e8451e8 JX |
21943 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
21944 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 21945 | |
d46c5519 | 21946 | #: git-submodule.sh:630 |
c04f5ac3 | 21947 | #, sh-format |
2e8451e8 JX |
21948 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
21949 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 21950 | |
d46c5519 | 21951 | #: git-submodule.sh:631 |
c04f5ac3 | 21952 | #, sh-format |
2e8451e8 JX |
21953 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
21954 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 21955 | |
d46c5519 | 21956 | #: git-submodule.sh:636 |
c04f5ac3 | 21957 | #, sh-format |
5b04ee3b JX |
21958 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
21959 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 21960 | |
d46c5519 | 21961 | #: git-submodule.sh:637 |
c04f5ac3 | 21962 | #, sh-format |
5b04ee3b | 21963 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 21964 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 21965 | |
d46c5519 | 21966 | #: git-submodule.sh:668 |
2e8451e8 JX |
21967 | #, sh-format |
21968 | msgid "Failed to recurse into submodule path '$displaypath'" | |
21969 | msgstr "无法递归进子模组路径 '$displaypath'" | |
21970 | ||
d46c5519 | 21971 | #: git-submodule.sh:830 |
649900bc JX |
21972 | msgid "The --cached option cannot be used with the --files option" |
21973 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 21974 | |
d46c5519 | 21975 | #: git-submodule.sh:882 |
b694fbb1 JX |
21976 | #, sh-format |
21977 | msgid "unexpected mode $mod_dst" | |
21978 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 21979 | |
90e6ef53 | 21980 | # 译者:注意保持前导空格 |
d46c5519 | 21981 | #: git-submodule.sh:902 |
c04f5ac3 | 21982 | #, sh-format |
2e8451e8 JX |
21983 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
21984 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 21985 | |
90e6ef53 | 21986 | # 译者:注意保持前导空格 |
d46c5519 | 21987 | #: git-submodule.sh:905 |
c04f5ac3 | 21988 | #, sh-format |
2e8451e8 JX |
21989 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
21990 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 21991 | |
90e6ef53 | 21992 | # 译者:注意保持前导空格 |
d46c5519 | 21993 | #: git-submodule.sh:908 |
c04f5ac3 | 21994 | #, sh-format |
2e8451e8 JX |
21995 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
21996 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 21997 | |
5b04ee3b JX |
21998 | #: git-parse-remote.sh:89 |
21999 | #, sh-format | |
22000 | msgid "See git-${cmd}(1) for details." | |
22001 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 22002 | |
a6cd2cc4 JX |
22003 | #: git-rebase--preserve-merges.sh:109 |
22004 | msgid "Applied autostash." | |
22005 | msgstr "已应用 autostash。" | |
22006 | ||
22007 | #: git-rebase--preserve-merges.sh:112 | |
22008 | #, sh-format | |
22009 | msgid "Cannot store $stash_sha1" | |
22010 | msgstr "不能存储 $stash_sha1" | |
22011 | ||
22012 | #: git-rebase--preserve-merges.sh:191 | |
c1ac5258 JX |
22013 | #, sh-format |
22014 | msgid "Rebasing ($new_count/$total)" | |
22015 | msgstr "变基中($new_count/$total)" | |
22016 | ||
a6cd2cc4 | 22017 | #: git-rebase--preserve-merges.sh:207 |
c1ac5258 JX |
22018 | msgid "" |
22019 | "\n" | |
22020 | "Commands:\n" | |
22021 | "p, pick <commit> = use commit\n" | |
22022 | "r, reword <commit> = use commit, but edit the commit message\n" | |
22023 | "e, edit <commit> = use commit, but stop for amending\n" | |
22024 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
22025 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
22026 | "x, exec <commit> = run command (the rest of the line) using shell\n" | |
22027 | "d, drop <commit> = remove commit\n" | |
22028 | "l, label <label> = label current HEAD with a name\n" | |
22029 | "t, reset <label> = reset HEAD to a label\n" | |
22030 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
22031 | ". create a merge commit using the original merge commit's\n" | |
22032 | ". message (or the oneline, if no original merge commit was\n" | |
22033 | ". specified). Use -c <commit> to reword the commit message.\n" | |
22034 | "\n" | |
22035 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
22036 | msgstr "" | |
22037 | "\n" | |
22038 | "命令:\n" | |
22039 | "p, pick <提交> = 使用提交\n" | |
22040 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
22041 | "e, edit <提交> = 使用提交,但停下来修补\n" | |
22042 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
22043 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
22044 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
22045 | "d, drop <提交> = 删除提交\n" | |
22046 | "l, label <标签> = 为当前 HEAD 打上标签\n" | |
22047 | "t, reset <标签> = 重置 HEAD 到该标签\n" | |
22048 | "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" | |
22049 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
22050 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
22051 | ". -c <提交> 可以编辑提交说明。\n" | |
22052 | "\n" | |
22053 | "可以对这些行重新排序,将从上至下执行。\n" | |
22054 | ||
a6cd2cc4 | 22055 | #: git-rebase--preserve-merges.sh:270 |
5c57d762 JX |
22056 | #, sh-format |
22057 | msgid "" | |
22058 | "You can amend the commit now, with\n" | |
22059 | "\n" | |
22060 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
22061 | "\n" | |
22062 | "Once you are satisfied with your changes, run\n" | |
22063 | "\n" | |
22064 | "\tgit rebase --continue" | |
22065 | msgstr "" | |
22066 | "您现在可以修补这个提交,使用\n" | |
22067 | "\n" | |
22068 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
22069 | "\n" | |
9a4b694c | 22070 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
22071 | "\n" |
22072 | "\tgit rebase --continue" | |
22073 | ||
a6cd2cc4 | 22074 | #: git-rebase--preserve-merges.sh:295 |
5c57d762 JX |
22075 | #, sh-format |
22076 | msgid "$sha1: not a commit that can be picked" | |
22077 | msgstr "$sha1:不是一个可以被拣选的提交" | |
22078 | ||
a6cd2cc4 | 22079 | #: git-rebase--preserve-merges.sh:334 |
5c57d762 JX |
22080 | #, sh-format |
22081 | msgid "Invalid commit name: $sha1" | |
22082 | msgstr "无效的提交名:$sha1" | |
22083 | ||
a6cd2cc4 | 22084 | #: git-rebase--preserve-merges.sh:364 |
5c57d762 JX |
22085 | msgid "Cannot write current commit's replacement sha1" |
22086 | msgstr "不能写入当前提交的替代 sha1" | |
22087 | ||
a6cd2cc4 | 22088 | #: git-rebase--preserve-merges.sh:415 |
5c57d762 JX |
22089 | #, sh-format |
22090 | msgid "Fast-forward to $sha1" | |
22091 | msgstr "快进到 $sha1" | |
22092 | ||
a6cd2cc4 | 22093 | #: git-rebase--preserve-merges.sh:417 |
5c57d762 JX |
22094 | #, sh-format |
22095 | msgid "Cannot fast-forward to $sha1" | |
22096 | msgstr "不能快进到 $sha1" | |
22097 | ||
a6cd2cc4 | 22098 | #: git-rebase--preserve-merges.sh:426 |
5c57d762 JX |
22099 | #, sh-format |
22100 | msgid "Cannot move HEAD to $first_parent" | |
22101 | msgstr "不能移动 HEAD 到 $first_parent" | |
22102 | ||
a6cd2cc4 | 22103 | #: git-rebase--preserve-merges.sh:431 |
5c57d762 JX |
22104 | #, sh-format |
22105 | msgid "Refusing to squash a merge: $sha1" | |
22106 | msgstr "拒绝压缩一个合并:$sha1" | |
22107 | ||
a6cd2cc4 | 22108 | #: git-rebase--preserve-merges.sh:449 |
5c57d762 JX |
22109 | #, sh-format |
22110 | msgid "Error redoing merge $sha1" | |
22111 | msgstr "无法重做合并 $sha1" | |
22112 | ||
a6cd2cc4 | 22113 | #: git-rebase--preserve-merges.sh:458 |
5c57d762 JX |
22114 | #, sh-format |
22115 | msgid "Could not pick $sha1" | |
22116 | msgstr "不能拣选 $sha1" | |
22117 | ||
a6cd2cc4 | 22118 | #: git-rebase--preserve-merges.sh:467 |
5c57d762 JX |
22119 | #, sh-format |
22120 | msgid "This is the commit message #${n}:" | |
9a4b694c | 22121 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 22122 | |
a6cd2cc4 | 22123 | #: git-rebase--preserve-merges.sh:472 |
5c57d762 JX |
22124 | #, sh-format |
22125 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 22126 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 22127 | |
a6cd2cc4 | 22128 | #: git-rebase--preserve-merges.sh:483 |
5c57d762 JX |
22129 | #, sh-format |
22130 | msgid "This is a combination of $count commit." | |
22131 | msgid_plural "This is a combination of $count commits." | |
22132 | msgstr[0] "这是一个 $count 个提交的组合。" | |
22133 | msgstr[1] "这是一个 $count 个提交的组合。" | |
22134 | ||
a6cd2cc4 | 22135 | #: git-rebase--preserve-merges.sh:492 |
5c57d762 JX |
22136 | #, sh-format |
22137 | msgid "Cannot write $fixup_msg" | |
22138 | msgstr "不能写入 $fixup_msg" | |
22139 | ||
a6cd2cc4 | 22140 | #: git-rebase--preserve-merges.sh:495 |
5c57d762 JX |
22141 | msgid "This is a combination of 2 commits." |
22142 | msgstr "这是一个 2 个提交的组合。" | |
22143 | ||
a6cd2cc4 JX |
22144 | #: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 |
22145 | #: git-rebase--preserve-merges.sh:582 | |
5c57d762 JX |
22146 | #, sh-format |
22147 | msgid "Could not apply $sha1... $rest" | |
22148 | msgstr "不能应用 $sha1... $rest" | |
22149 | ||
a6cd2cc4 | 22150 | #: git-rebase--preserve-merges.sh:611 |
5c57d762 JX |
22151 | #, sh-format |
22152 | msgid "" | |
22153 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
22154 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
22155 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
22156 | "before\n" | |
22157 | "you are able to reword the commit." | |
22158 | msgstr "" | |
22159 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
22160 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
22161 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
22162 | ||
a6cd2cc4 | 22163 | #: git-rebase--preserve-merges.sh:626 |
5c57d762 JX |
22164 | #, sh-format |
22165 | msgid "Stopped at $sha1_abbrev... $rest" | |
22166 | msgstr "停止在 $sha1_abbrev... $rest" | |
22167 | ||
a6cd2cc4 | 22168 | #: git-rebase--preserve-merges.sh:641 |
5c57d762 JX |
22169 | #, sh-format |
22170 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 22171 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 22172 | |
a6cd2cc4 | 22173 | #: git-rebase--preserve-merges.sh:683 |
5c57d762 JX |
22174 | #, sh-format |
22175 | msgid "Executing: $rest" | |
22176 | msgstr "执行:$rest" | |
22177 | ||
a6cd2cc4 | 22178 | #: git-rebase--preserve-merges.sh:691 |
5c57d762 JX |
22179 | #, sh-format |
22180 | msgid "Execution failed: $rest" | |
22181 | msgstr "执行失败:$rest" | |
22182 | ||
a6cd2cc4 | 22183 | #: git-rebase--preserve-merges.sh:693 |
5c57d762 JX |
22184 | msgid "and made changes to the index and/or the working tree" |
22185 | msgstr "并且修改索引和/或工作区" | |
22186 | ||
22187 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 22188 | #: git-rebase--preserve-merges.sh:695 |
5c57d762 JX |
22189 | msgid "" |
22190 | "You can fix the problem, and then run\n" | |
22191 | "\n" | |
22192 | "\tgit rebase --continue" | |
22193 | msgstr "" | |
22194 | "您可以解决这个问题,然后运行\n" | |
22195 | "\n" | |
22196 | "\tgit rebase --continue" | |
22197 | ||
22198 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
a6cd2cc4 | 22199 | #: git-rebase--preserve-merges.sh:708 |
5c57d762 JX |
22200 | #, sh-format |
22201 | msgid "" | |
22202 | "Execution succeeded: $rest\n" | |
22203 | "but left changes to the index and/or the working tree\n" | |
22204 | "Commit or stash your changes, and then run\n" | |
22205 | "\n" | |
22206 | "\tgit rebase --continue" | |
22207 | msgstr "" | |
22208 | "执行成功:$rest\n" | |
a4f16749 | 22209 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
22210 | "\n" |
22211 | "\tgit rebase --continue" | |
22212 | ||
a6cd2cc4 | 22213 | #: git-rebase--preserve-merges.sh:719 |
5c57d762 JX |
22214 | #, sh-format |
22215 | msgid "Unknown command: $command $sha1 $rest" | |
22216 | msgstr "未知命令:$command $sha1 $rest" | |
22217 | ||
a6cd2cc4 | 22218 | #: git-rebase--preserve-merges.sh:720 |
5c57d762 JX |
22219 | msgid "Please fix this using 'git rebase --edit-todo'." |
22220 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
22221 | ||
a6cd2cc4 | 22222 | #: git-rebase--preserve-merges.sh:755 |
5c57d762 JX |
22223 | #, sh-format |
22224 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 22225 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 22226 | |
a6cd2cc4 | 22227 | #: git-rebase--preserve-merges.sh:812 |
5c57d762 JX |
22228 | msgid "Could not remove CHERRY_PICK_HEAD" |
22229 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
22230 | ||
a6cd2cc4 | 22231 | #: git-rebase--preserve-merges.sh:817 |
5c57d762 JX |
22232 | #, sh-format |
22233 | msgid "" | |
22234 | "You have staged changes in your working tree.\n" | |
22235 | "If these changes are meant to be\n" | |
22236 | "squashed into the previous commit, run:\n" | |
22237 | "\n" | |
22238 | " git commit --amend $gpg_sign_opt_quoted\n" | |
22239 | "\n" | |
22240 | "If they are meant to go into a new commit, run:\n" | |
22241 | "\n" | |
22242 | " git commit $gpg_sign_opt_quoted\n" | |
22243 | "\n" | |
a0b6b246 | 22244 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
22245 | "\n" |
22246 | " git rebase --continue\n" | |
22247 | msgstr "" | |
22248 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
22249 | "\n" | |
22250 | " git commit --amend $gpg_sign_opt_quoted\n" | |
22251 | "\n" | |
22252 | "如果这些变更要形成一个新提交,执行:\n" | |
22253 | "\n" | |
22254 | " git commit $gpg_sign_opt_quoted\n" | |
22255 | "\n" | |
9a4b694c | 22256 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
22257 | "\n" |
22258 | " git rebase --continue\n" | |
22259 | ||
a6cd2cc4 | 22260 | #: git-rebase--preserve-merges.sh:834 |
5c57d762 | 22261 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 22262 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 22263 | |
a6cd2cc4 | 22264 | #: git-rebase--preserve-merges.sh:839 |
5c57d762 JX |
22265 | msgid "" |
22266 | "You have uncommitted changes in your working tree. Please commit them\n" | |
22267 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
22268 | msgstr "" |
22269 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 22270 | |
a6cd2cc4 | 22271 | #: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 |
5c57d762 JX |
22272 | msgid "Could not commit staged changes." |
22273 | msgstr "不能提交暂存的修改。" | |
22274 | ||
a6cd2cc4 | 22275 | #: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 |
4c27fcb5 JX |
22276 | msgid "Could not execute editor" |
22277 | msgstr "无法运行编辑器" | |
22278 | ||
a6cd2cc4 | 22279 | #: git-rebase--preserve-merges.sh:900 |
4c27fcb5 JX |
22280 | #, sh-format |
22281 | msgid "Could not checkout $switch_to" | |
22282 | msgstr "不能检出 $switch_to" | |
22283 | ||
a6cd2cc4 | 22284 | #: git-rebase--preserve-merges.sh:907 |
4c27fcb5 JX |
22285 | msgid "No HEAD?" |
22286 | msgstr "没有 HEAD?" | |
22287 | ||
a6cd2cc4 | 22288 | #: git-rebase--preserve-merges.sh:908 |
4c27fcb5 JX |
22289 | #, sh-format |
22290 | msgid "Could not create temporary $state_dir" | |
22291 | msgstr "不能创建临时 $state_dir" | |
22292 | ||
a6cd2cc4 | 22293 | #: git-rebase--preserve-merges.sh:911 |
4c27fcb5 JX |
22294 | msgid "Could not mark as interactive" |
22295 | msgstr "不能标记为交互式" | |
22296 | ||
a6cd2cc4 | 22297 | #: git-rebase--preserve-merges.sh:943 |
4c27fcb5 JX |
22298 | #, sh-format |
22299 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
22300 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
22301 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
22302 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
5c57d762 | 22303 | |
a6cd2cc4 | 22304 | #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 |
fd8cb379 JX |
22305 | msgid "Could not init rewritten commits" |
22306 | msgstr "不能对重写提交进行初始化" | |
22307 | ||
5c57d762 JX |
22308 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
22309 | #, sh-format | |
22310 | msgid "usage: $dashless $USAGE" | |
22311 | msgstr "用法:$dashless $USAGE" | |
22312 | ||
d46c5519 | 22313 | #: git-sh-setup.sh:191 |
5c57d762 JX |
22314 | #, sh-format |
22315 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 22316 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 | 22317 | |
d46c5519 | 22318 | #: git-sh-setup.sh:200 git-sh-setup.sh:207 |
5c57d762 JX |
22319 | #, sh-format |
22320 | msgid "fatal: $program_name cannot be used without a working tree." | |
06991777 | 22321 | msgstr "致命错误:$program_name 不能在没有工作区的情况下使用" |
5c57d762 | 22322 | |
d46c5519 | 22323 | #: git-sh-setup.sh:221 |
5c57d762 JX |
22324 | msgid "Cannot rebase: You have unstaged changes." |
22325 | msgstr "不能变基:您有未暂存的变更。" | |
22326 | ||
d46c5519 | 22327 | #: git-sh-setup.sh:224 |
5c57d762 JX |
22328 | msgid "Cannot rewrite branches: You have unstaged changes." |
22329 | msgstr "不能重写分支:您有未暂存的变更。" | |
22330 | ||
d46c5519 | 22331 | #: git-sh-setup.sh:227 |
a0b6b246 JX |
22332 | msgid "Cannot pull with rebase: You have unstaged changes." |
22333 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
22334 | ||
d46c5519 | 22335 | #: git-sh-setup.sh:230 |
5c57d762 JX |
22336 | #, sh-format |
22337 | msgid "Cannot $action: You have unstaged changes." | |
22338 | msgstr "不能 $action:您有未暂存的变更。" | |
22339 | ||
d46c5519 | 22340 | #: git-sh-setup.sh:243 |
5c57d762 JX |
22341 | msgid "Cannot rebase: Your index contains uncommitted changes." |
22342 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
22343 | ||
d46c5519 | 22344 | #: git-sh-setup.sh:246 |
a0b6b246 JX |
22345 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
22346 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
22347 | ||
d46c5519 | 22348 | #: git-sh-setup.sh:249 |
5c57d762 JX |
22349 | #, sh-format |
22350 | msgid "Cannot $action: Your index contains uncommitted changes." | |
22351 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
22352 | ||
d46c5519 | 22353 | #: git-sh-setup.sh:253 |
a0b6b246 JX |
22354 | msgid "Additionally, your index contains uncommitted changes." |
22355 | msgstr "而且您的索引中包含未提交的变更。" | |
22356 | ||
d46c5519 | 22357 | #: git-sh-setup.sh:373 |
5c57d762 JX |
22358 | msgid "You need to run this command from the toplevel of the working tree." |
22359 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
22360 | ||
d46c5519 | 22361 | #: git-sh-setup.sh:378 |
5c57d762 JX |
22362 | msgid "Unable to determine absolute path of git directory" |
22363 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 22364 | |
1a79b2f1 | 22365 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
a6cd2cc4 | 22366 | #: git-add--interactive.perl:210 |
1a79b2f1 JX |
22367 | #, perl-format |
22368 | msgid "%12s %12s %s" | |
22369 | msgstr "%12s %12s %s" | |
22370 | ||
a6cd2cc4 | 22371 | #: git-add--interactive.perl:211 |
1a79b2f1 JX |
22372 | msgid "staged" |
22373 | msgstr "缓存" | |
22374 | ||
a6cd2cc4 | 22375 | #: git-add--interactive.perl:211 |
1a79b2f1 JX |
22376 | msgid "unstaged" |
22377 | msgstr "未缓存" | |
22378 | ||
a6cd2cc4 | 22379 | #: git-add--interactive.perl:267 git-add--interactive.perl:292 |
1a79b2f1 JX |
22380 | msgid "binary" |
22381 | msgstr "二进制" | |
22382 | ||
a6cd2cc4 | 22383 | #: git-add--interactive.perl:276 git-add--interactive.perl:330 |
1a79b2f1 JX |
22384 | msgid "nothing" |
22385 | msgstr "无" | |
22386 | ||
a6cd2cc4 | 22387 | #: git-add--interactive.perl:312 git-add--interactive.perl:327 |
1a79b2f1 JX |
22388 | msgid "unchanged" |
22389 | msgstr "没有修改" | |
22390 | ||
a6cd2cc4 | 22391 | #: git-add--interactive.perl:623 |
1a79b2f1 JX |
22392 | #, perl-format |
22393 | msgid "added %d path\n" | |
22394 | msgid_plural "added %d paths\n" | |
22395 | msgstr[0] "增加了 %d 个路径\n" | |
22396 | msgstr[1] "增加了 %d 个路径\n" | |
22397 | ||
a6cd2cc4 | 22398 | #: git-add--interactive.perl:626 |
1a79b2f1 JX |
22399 | #, perl-format |
22400 | msgid "updated %d path\n" | |
22401 | msgid_plural "updated %d paths\n" | |
22402 | msgstr[0] "更新了 %d 个路径\n" | |
22403 | msgstr[1] "更新了 %d 个路径\n" | |
22404 | ||
a6cd2cc4 | 22405 | #: git-add--interactive.perl:629 |
1a79b2f1 JX |
22406 | #, perl-format |
22407 | msgid "reverted %d path\n" | |
22408 | msgid_plural "reverted %d paths\n" | |
22409 | msgstr[0] "还原了 %d 个路径\n" | |
22410 | msgstr[1] "还原了 %d 个路径\n" | |
22411 | ||
a6cd2cc4 | 22412 | #: git-add--interactive.perl:632 |
1a79b2f1 JX |
22413 | #, perl-format |
22414 | msgid "touched %d path\n" | |
22415 | msgid_plural "touched %d paths\n" | |
22416 | msgstr[0] "触碰了 %d 个路径\n" | |
22417 | msgstr[1] "触碰了 %d 个路径\n" | |
22418 | ||
a6cd2cc4 | 22419 | #: git-add--interactive.perl:641 |
1a79b2f1 JX |
22420 | msgid "Update" |
22421 | msgstr "更新" | |
22422 | ||
a6cd2cc4 | 22423 | #: git-add--interactive.perl:653 |
1a79b2f1 JX |
22424 | msgid "Revert" |
22425 | msgstr "还原" | |
22426 | ||
a6cd2cc4 | 22427 | #: git-add--interactive.perl:676 |
1a79b2f1 JX |
22428 | #, perl-format |
22429 | msgid "note: %s is untracked now.\n" | |
22430 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
22431 | ||
a6cd2cc4 | 22432 | #: git-add--interactive.perl:687 |
1a79b2f1 JX |
22433 | msgid "Add untracked" |
22434 | msgstr "添加未跟踪的" | |
22435 | ||
a6cd2cc4 | 22436 | #: git-add--interactive.perl:693 |
1a79b2f1 JX |
22437 | msgid "No untracked files.\n" |
22438 | msgstr "没有未跟踪的文件。\n" | |
22439 | ||
a6cd2cc4 | 22440 | #: git-add--interactive.perl:1051 |
1a79b2f1 JX |
22441 | msgid "" |
22442 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22443 | "marked for staging." | |
22444 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
22445 | ||
a6cd2cc4 | 22446 | #: git-add--interactive.perl:1054 |
1a79b2f1 JX |
22447 | msgid "" |
22448 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22449 | "marked for stashing." | |
a4f16749 | 22450 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 22451 | |
a6cd2cc4 | 22452 | #: git-add--interactive.perl:1057 |
1a79b2f1 JX |
22453 | msgid "" |
22454 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22455 | "marked for unstaging." | |
22456 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
22457 | ||
a6cd2cc4 JX |
22458 | #: git-add--interactive.perl:1060 git-add--interactive.perl:1069 |
22459 | #: git-add--interactive.perl:1075 | |
1a79b2f1 JX |
22460 | msgid "" |
22461 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22462 | "marked for applying." | |
22463 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
22464 | ||
a6cd2cc4 JX |
22465 | #: git-add--interactive.perl:1063 git-add--interactive.perl:1066 |
22466 | #: git-add--interactive.perl:1072 | |
1a79b2f1 JX |
22467 | msgid "" |
22468 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
22469 | "marked for discarding." | |
22470 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
22471 | ||
a6cd2cc4 | 22472 | #: git-add--interactive.perl:1109 |
1a79b2f1 JX |
22473 | #, perl-format |
22474 | msgid "failed to open hunk edit file for writing: %s" | |
c1ac5258 | 22475 | msgstr "为写入打开块编辑文件失败:%s" |
1a79b2f1 | 22476 | |
a6cd2cc4 | 22477 | #: git-add--interactive.perl:1110 |
1a79b2f1 JX |
22478 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
22479 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
22480 | ||
a6cd2cc4 | 22481 | #: git-add--interactive.perl:1116 |
1a79b2f1 JX |
22482 | #, perl-format |
22483 | msgid "" | |
22484 | "---\n" | |
22485 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
22486 | "To remove '%s' lines, delete them.\n" | |
22487 | "Lines starting with %s will be removed.\n" | |
22488 | msgstr "" | |
22489 | "---\n" | |
22490 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
22491 | "要删除 '%s' 开始的行,删除它们。\n" | |
22492 | "以 %s 开始的行将被删除。\n" | |
22493 | ||
22494 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
a6cd2cc4 | 22495 | #: git-add--interactive.perl:1124 |
1a79b2f1 JX |
22496 | msgid "" |
22497 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
22498 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
22499 | "aborted and the hunk is left unchanged.\n" | |
22500 | msgstr "" | |
22501 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
22502 | "此次编辑被终止,该块不会被修改。\n" | |
22503 | ||
a6cd2cc4 | 22504 | #: git-add--interactive.perl:1138 |
1a79b2f1 JX |
22505 | #, perl-format |
22506 | msgid "failed to open hunk edit file for reading: %s" | |
22507 | msgstr "无法读取块编辑文件:%s" | |
22508 | ||
22509 | #. TRANSLATORS: do not translate [y/n] | |
22510 | #. The program will only accept that input | |
22511 | #. at this point. | |
22512 | #. Consider translating (saying "no" discards!) as | |
22513 | #. (saying "n" for "no" discards!) if the translation | |
22514 | #. of the word "no" does not start with n. | |
a6cd2cc4 | 22515 | #: git-add--interactive.perl:1237 |
1a79b2f1 JX |
22516 | msgid "" |
22517 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
22518 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
22519 | ||
a6cd2cc4 | 22520 | #: git-add--interactive.perl:1246 |
1a79b2f1 JX |
22521 | msgid "" |
22522 | "y - stage this hunk\n" | |
22523 | "n - do not stage this hunk\n" | |
22524 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
22525 | "a - stage this hunk and all later hunks in the file\n" | |
22526 | "d - do not stage this hunk or any of the later hunks in the file" | |
22527 | msgstr "" | |
22528 | "y - 暂存该块\n" | |
22529 | "n - 不要暂存该块\n" | |
22530 | "q - 退出。不暂存该块及后面的全部块\n" | |
22531 | "a - 暂存该块和本文件中后面的全部块\n" | |
22532 | "d - 不暂存该块和本文件中后面的全部块" | |
22533 | ||
a6cd2cc4 | 22534 | #: git-add--interactive.perl:1252 |
1a79b2f1 JX |
22535 | msgid "" |
22536 | "y - stash this hunk\n" | |
22537 | "n - do not stash this hunk\n" | |
22538 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
22539 | "a - stash this hunk and all later hunks in the file\n" | |
22540 | "d - do not stash this hunk or any of the later hunks in the file" | |
22541 | msgstr "" | |
22542 | "y - 贮藏该块\n" | |
22543 | "n - 不要贮藏该块\n" | |
22544 | "q - 退出。不贮藏该块及后面的全部块\n" | |
22545 | "a - 贮藏该块和本文件中后面的全部块\n" | |
22546 | "d - 不贮藏该块和本文件中后面的全部块" | |
22547 | ||
a6cd2cc4 | 22548 | #: git-add--interactive.perl:1258 |
1a79b2f1 JX |
22549 | msgid "" |
22550 | "y - unstage this hunk\n" | |
22551 | "n - do not unstage this hunk\n" | |
22552 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
22553 | "a - unstage this hunk and all later hunks in the file\n" | |
22554 | "d - do not unstage this hunk or any of the later hunks in the file" | |
22555 | msgstr "" | |
22556 | "y - 不暂存该块\n" | |
22557 | "n - 不要不暂存该块\n" | |
22558 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
22559 | "a - 不暂存该块和本文件中后面的全部块\n" | |
22560 | "d - 不要不暂存该块和本文件中后面的全部块" | |
22561 | ||
a6cd2cc4 | 22562 | #: git-add--interactive.perl:1264 |
1a79b2f1 JX |
22563 | msgid "" |
22564 | "y - apply this hunk to index\n" | |
22565 | "n - do not apply this hunk to index\n" | |
22566 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
22567 | "a - apply this hunk and all later hunks in the file\n" | |
22568 | "d - do not apply this hunk or any of the later hunks in the file" | |
22569 | msgstr "" | |
22570 | "y - 在索引中应用该块\n" | |
22571 | "n - 不要在索引中应用该块\n" | |
22572 | "q - 退出。不要应用该块及后面的全部块\n" | |
22573 | "a - 应用该块和本文件中后面的全部块\n" | |
22574 | "d - 不要应用该块和本文件中后面的全部块" | |
22575 | ||
a6cd2cc4 | 22576 | #: git-add--interactive.perl:1270 git-add--interactive.perl:1288 |
1a79b2f1 JX |
22577 | msgid "" |
22578 | "y - discard this hunk from worktree\n" | |
22579 | "n - do not discard this hunk from worktree\n" | |
22580 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
22581 | "a - discard this hunk and all later hunks in the file\n" | |
22582 | "d - do not discard this hunk or any of the later hunks in the file" | |
22583 | msgstr "" | |
22584 | "y - 在工作区中丢弃该块\n" | |
22585 | "n - 不要在工作区中丢弃该块\n" | |
22586 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
22587 | "a - 丢弃该块和本文件中后面的全部块\n" | |
22588 | "d - 不要丢弃该块和本文件中后面的全部块" | |
22589 | ||
a6cd2cc4 | 22590 | #: git-add--interactive.perl:1276 |
1a79b2f1 JX |
22591 | msgid "" |
22592 | "y - discard this hunk from index and worktree\n" | |
22593 | "n - do not discard this hunk from index and worktree\n" | |
22594 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
22595 | "a - discard this hunk and all later hunks in the file\n" | |
22596 | "d - do not discard this hunk or any of the later hunks in the file" | |
22597 | msgstr "" | |
22598 | "y - 在索引和工作区中丢弃该块\n" | |
22599 | "n - 不要在索引和工作区中丢弃该块\n" | |
22600 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
22601 | "a - 丢弃该块和本文件中后面的全部块\n" | |
22602 | "d - 不要丢弃该块和本文件中后面的全部块" | |
22603 | ||
a6cd2cc4 | 22604 | #: git-add--interactive.perl:1282 |
1a79b2f1 JX |
22605 | msgid "" |
22606 | "y - apply this hunk to index and worktree\n" | |
22607 | "n - do not apply this hunk to index and worktree\n" | |
22608 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
22609 | "a - apply this hunk and all later hunks in the file\n" | |
22610 | "d - do not apply this hunk or any of the later hunks in the file" | |
22611 | msgstr "" | |
22612 | "y - 在索引和工作区中应用该块\n" | |
22613 | "n - 不要在索引和工作区中应用该块\n" | |
22614 | "q - 退出。不要应用该块及后面的全部块\n" | |
22615 | "a - 应用该块和本文件中后面的全部块\n" | |
22616 | "d - 不要应用该块和本文件中后面的全部块" | |
22617 | ||
a6cd2cc4 JX |
22618 | #: git-add--interactive.perl:1294 |
22619 | msgid "" | |
22620 | "y - apply this hunk to worktree\n" | |
22621 | "n - do not apply this hunk to worktree\n" | |
22622 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
22623 | "a - apply this hunk and all later hunks in the file\n" | |
22624 | "d - do not apply this hunk or any of the later hunks in the file" | |
22625 | msgstr "" | |
22626 | "y - 在工作区中应用该块\n" | |
22627 | "n - 不要在工作区中应用该块\n" | |
22628 | "q - 退出。不要应用该块及后面的全部块\n" | |
22629 | "a - 应用该块和本文件中后面的全部块\n" | |
22630 | "d - 不要应用该块和本文件中后面的全部块" | |
22631 | ||
22632 | #: git-add--interactive.perl:1309 | |
1a79b2f1 JX |
22633 | msgid "" |
22634 | "g - select a hunk to go to\n" | |
22635 | "/ - search for a hunk matching the given regex\n" | |
22636 | "j - leave this hunk undecided, see next undecided hunk\n" | |
22637 | "J - leave this hunk undecided, see next hunk\n" | |
22638 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
22639 | "K - leave this hunk undecided, see previous hunk\n" | |
22640 | "s - split the current hunk into smaller hunks\n" | |
22641 | "e - manually edit the current hunk\n" | |
22642 | "? - print help\n" | |
22643 | msgstr "" | |
22644 | "g - 选择跳转到一个块\n" | |
22645 | "/ - 查找和给定正则表达式匹配的块\n" | |
22646 | "j - 维持该块未决状态,查看下一个未决块\n" | |
22647 | "J - 维持该块未决状态,查看下一个块\n" | |
22648 | "k - 维持该块未决状态,查看上一个未决块\n" | |
22649 | "K - 维持该块未决状态,查看上一个块\n" | |
22650 | "s - 拆分当前块为更小的块\n" | |
22651 | "e - 手动编辑当前块\n" | |
22652 | "? - 显示帮助\n" | |
22653 | ||
a6cd2cc4 | 22654 | #: git-add--interactive.perl:1340 |
1a79b2f1 JX |
22655 | msgid "The selected hunks do not apply to the index!\n" |
22656 | msgstr "选中的块不能应用到索引!\n" | |
22657 | ||
a6cd2cc4 | 22658 | #: git-add--interactive.perl:1341 |
1a79b2f1 JX |
22659 | msgid "Apply them to the worktree anyway? " |
22660 | msgstr "无论如何都要应用到工作区么?" | |
22661 | ||
a6cd2cc4 | 22662 | #: git-add--interactive.perl:1344 |
1a79b2f1 JX |
22663 | msgid "Nothing was applied.\n" |
22664 | msgstr "未应用。\n" | |
22665 | ||
a6cd2cc4 | 22666 | #: git-add--interactive.perl:1355 |
1a79b2f1 JX |
22667 | #, perl-format |
22668 | msgid "ignoring unmerged: %s\n" | |
22669 | msgstr "忽略未合入的:%s\n" | |
22670 | ||
a6cd2cc4 | 22671 | #: git-add--interactive.perl:1364 |
1a79b2f1 JX |
22672 | msgid "Only binary files changed.\n" |
22673 | msgstr "只有二进制文件被修改。\n" | |
22674 | ||
a6cd2cc4 | 22675 | #: git-add--interactive.perl:1366 |
1a79b2f1 JX |
22676 | msgid "No changes.\n" |
22677 | msgstr "没有修改。\n" | |
22678 | ||
a6cd2cc4 | 22679 | #: git-add--interactive.perl:1374 |
1a79b2f1 JX |
22680 | msgid "Patch update" |
22681 | msgstr "补丁更新" | |
22682 | ||
a6cd2cc4 | 22683 | #: git-add--interactive.perl:1426 |
1a79b2f1 | 22684 | #, perl-format |
31e5e17b JX |
22685 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
22686 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22687 | |
a6cd2cc4 | 22688 | #: git-add--interactive.perl:1427 |
1a79b2f1 | 22689 | #, perl-format |
31e5e17b JX |
22690 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
22691 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22692 | |
a6cd2cc4 | 22693 | #: git-add--interactive.perl:1428 |
1a79b2f1 | 22694 | #, perl-format |
31e5e17b JX |
22695 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
22696 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22697 | |
a6cd2cc4 | 22698 | #: git-add--interactive.perl:1431 |
1a79b2f1 | 22699 | #, perl-format |
31e5e17b JX |
22700 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
22701 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22702 | |
a6cd2cc4 | 22703 | #: git-add--interactive.perl:1432 |
1a79b2f1 | 22704 | #, perl-format |
31e5e17b JX |
22705 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
22706 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22707 | |
a6cd2cc4 | 22708 | #: git-add--interactive.perl:1433 |
1a79b2f1 | 22709 | #, perl-format |
31e5e17b JX |
22710 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
22711 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22712 | |
a6cd2cc4 | 22713 | #: git-add--interactive.perl:1436 |
1a79b2f1 | 22714 | #, perl-format |
31e5e17b JX |
22715 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
22716 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22717 | |
a6cd2cc4 | 22718 | #: git-add--interactive.perl:1437 |
1a79b2f1 | 22719 | #, perl-format |
31e5e17b JX |
22720 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
22721 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22722 | |
a6cd2cc4 | 22723 | #: git-add--interactive.perl:1438 |
1a79b2f1 | 22724 | #, perl-format |
31e5e17b JX |
22725 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
22726 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22727 | |
a6cd2cc4 | 22728 | #: git-add--interactive.perl:1441 |
1a79b2f1 | 22729 | #, perl-format |
31e5e17b JX |
22730 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
22731 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22732 | |
a6cd2cc4 | 22733 | #: git-add--interactive.perl:1442 |
1a79b2f1 | 22734 | #, perl-format |
31e5e17b | 22735 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
a6cd2cc4 | 22736 | msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 22737 | |
a6cd2cc4 | 22738 | #: git-add--interactive.perl:1443 |
1a79b2f1 | 22739 | #, perl-format |
31e5e17b | 22740 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
610f8099 | 22741 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 22742 | |
a6cd2cc4 | 22743 | #: git-add--interactive.perl:1446 git-add--interactive.perl:1461 |
1a79b2f1 | 22744 | #, perl-format |
31e5e17b JX |
22745 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
22746 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22747 | |
a6cd2cc4 | 22748 | #: git-add--interactive.perl:1447 git-add--interactive.perl:1462 |
1a79b2f1 | 22749 | #, perl-format |
31e5e17b JX |
22750 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
22751 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22752 | |
a6cd2cc4 | 22753 | #: git-add--interactive.perl:1448 git-add--interactive.perl:1463 |
1a79b2f1 | 22754 | #, perl-format |
31e5e17b JX |
22755 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
22756 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22757 | |
a6cd2cc4 | 22758 | #: git-add--interactive.perl:1451 |
1a79b2f1 | 22759 | #, perl-format |
31e5e17b JX |
22760 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
22761 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22762 | |
a6cd2cc4 | 22763 | #: git-add--interactive.perl:1452 |
1a79b2f1 | 22764 | #, perl-format |
31e5e17b JX |
22765 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
22766 | msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22767 | |
a6cd2cc4 | 22768 | #: git-add--interactive.perl:1453 |
1a79b2f1 | 22769 | #, perl-format |
31e5e17b JX |
22770 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
22771 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22772 | |
a6cd2cc4 | 22773 | #: git-add--interactive.perl:1456 |
1a79b2f1 | 22774 | #, perl-format |
31e5e17b JX |
22775 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
22776 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 22777 | |
a6cd2cc4 | 22778 | #: git-add--interactive.perl:1457 |
1a79b2f1 | 22779 | #, perl-format |
31e5e17b | 22780 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
a6cd2cc4 | 22781 | msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 22782 | |
a6cd2cc4 | 22783 | #: git-add--interactive.perl:1458 |
1a79b2f1 | 22784 | #, perl-format |
31e5e17b JX |
22785 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
22786 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
22787 | ||
a6cd2cc4 JX |
22788 | #: git-add--interactive.perl:1466 |
22789 | #, perl-format | |
22790 | msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " | |
22791 | msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " | |
22792 | ||
22793 | #: git-add--interactive.perl:1467 | |
22794 | #, perl-format | |
22795 | msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " | |
22796 | msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " | |
22797 | ||
22798 | #: git-add--interactive.perl:1468 | |
22799 | #, perl-format | |
22800 | msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " | |
22801 | msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " | |
22802 | ||
22803 | #: git-add--interactive.perl:1568 | |
31e5e17b JX |
22804 | msgid "No other hunks to goto\n" |
22805 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 22806 | |
a6cd2cc4 | 22807 | #: git-add--interactive.perl:1575 |
1a79b2f1 JX |
22808 | msgid "go to which hunk (<ret> to see more)? " |
22809 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
22810 | ||
a6cd2cc4 | 22811 | #: git-add--interactive.perl:1577 |
1a79b2f1 JX |
22812 | msgid "go to which hunk? " |
22813 | msgstr "跳转到哪个块?" | |
22814 | ||
a6cd2cc4 | 22815 | #: git-add--interactive.perl:1586 |
1a79b2f1 JX |
22816 | #, perl-format |
22817 | msgid "Invalid number: '%s'\n" | |
22818 | msgstr "无效数字:'%s'\n" | |
22819 | ||
a6cd2cc4 | 22820 | #: git-add--interactive.perl:1591 |
1a79b2f1 JX |
22821 | #, perl-format |
22822 | msgid "Sorry, only %d hunk available.\n" | |
22823 | msgid_plural "Sorry, only %d hunks available.\n" | |
22824 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
22825 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
22826 | ||
a6cd2cc4 | 22827 | #: git-add--interactive.perl:1617 |
31e5e17b JX |
22828 | msgid "No other hunks to search\n" |
22829 | msgstr "没有其它可供查找的块\n" | |
22830 | ||
a6cd2cc4 | 22831 | #: git-add--interactive.perl:1621 |
1a79b2f1 JX |
22832 | msgid "search for regex? " |
22833 | msgstr "使用正则表达式搜索?" | |
22834 | ||
a6cd2cc4 | 22835 | #: git-add--interactive.perl:1634 |
1a79b2f1 JX |
22836 | #, perl-format |
22837 | msgid "Malformed search regexp %s: %s\n" | |
22838 | msgstr "错误的正则表达式 %s:%s\n" | |
22839 | ||
a6cd2cc4 | 22840 | #: git-add--interactive.perl:1644 |
1a79b2f1 JX |
22841 | msgid "No hunk matches the given pattern\n" |
22842 | msgstr "没有和给定模式相匹配的快\n" | |
22843 | ||
a6cd2cc4 | 22844 | #: git-add--interactive.perl:1656 git-add--interactive.perl:1678 |
1a79b2f1 JX |
22845 | msgid "No previous hunk\n" |
22846 | msgstr "没有前一个块\n" | |
22847 | ||
a6cd2cc4 | 22848 | #: git-add--interactive.perl:1665 git-add--interactive.perl:1684 |
1a79b2f1 JX |
22849 | msgid "No next hunk\n" |
22850 | msgstr "没有下一个块\n" | |
22851 | ||
a6cd2cc4 | 22852 | #: git-add--interactive.perl:1690 |
31e5e17b JX |
22853 | msgid "Sorry, cannot split this hunk\n" |
22854 | msgstr "对不起,不能拆分这个块\n" | |
22855 | ||
a6cd2cc4 | 22856 | #: git-add--interactive.perl:1696 |
1a79b2f1 JX |
22857 | #, perl-format |
22858 | msgid "Split into %d hunk.\n" | |
22859 | msgid_plural "Split into %d hunks.\n" | |
22860 | msgstr[0] "拆分为 %d 块。\n" | |
22861 | msgstr[1] "拆分为 %d 块。\n" | |
22862 | ||
a6cd2cc4 | 22863 | #: git-add--interactive.perl:1706 |
31e5e17b JX |
22864 | msgid "Sorry, cannot edit this hunk\n" |
22865 | msgstr "对不起,不能编辑这个块\n" | |
22866 | ||
a6cd2cc4 | 22867 | #: git-add--interactive.perl:1752 |
1a79b2f1 JX |
22868 | msgid "Review diff" |
22869 | msgstr "检视 diff" | |
22870 | ||
22871 | #. TRANSLATORS: please do not translate the command names | |
22872 | #. 'status', 'update', 'revert', etc. | |
a6cd2cc4 | 22873 | #: git-add--interactive.perl:1771 |
1a79b2f1 JX |
22874 | msgid "" |
22875 | "status - show paths with changes\n" | |
22876 | "update - add working tree state to the staged set of changes\n" | |
22877 | "revert - revert staged set of changes back to the HEAD version\n" | |
22878 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 22879 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
22880 | "add untracked - add contents of untracked files to the staged set of " |
22881 | "changes\n" | |
22882 | msgstr "" | |
22883 | "status - 显示含变更的路径\n" | |
22884 | "update - 添加工作区状态至暂存列表\n" | |
22885 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
22886 | "patch - 挑选块并且有选择地更新\n" | |
22887 | "diff - 显示 HEAD 和索引间差异\n" | |
22888 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
22889 | ||
a6cd2cc4 JX |
22890 | #: git-add--interactive.perl:1788 git-add--interactive.perl:1793 |
22891 | #: git-add--interactive.perl:1796 git-add--interactive.perl:1803 | |
22892 | #: git-add--interactive.perl:1806 git-add--interactive.perl:1813 | |
22893 | #: git-add--interactive.perl:1817 git-add--interactive.perl:1823 | |
1a79b2f1 JX |
22894 | msgid "missing --" |
22895 | msgstr "缺失 --" | |
22896 | ||
a6cd2cc4 | 22897 | #: git-add--interactive.perl:1819 |
1a79b2f1 JX |
22898 | #, perl-format |
22899 | msgid "unknown --patch mode: %s" | |
22900 | msgstr "未知的 --patch 模式:%s" | |
22901 | ||
a6cd2cc4 | 22902 | #: git-add--interactive.perl:1825 git-add--interactive.perl:1831 |
1a79b2f1 JX |
22903 | #, perl-format |
22904 | msgid "invalid argument %s, expecting --" | |
22905 | msgstr "无效的参数 %s,期望是 --" | |
22906 | ||
4c27fcb5 | 22907 | #: git-send-email.perl:138 |
1a79b2f1 JX |
22908 | msgid "local zone differs from GMT by a non-minute interval\n" |
22909 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
22910 | ||
4c27fcb5 | 22911 | #: git-send-email.perl:145 git-send-email.perl:151 |
1a79b2f1 JX |
22912 | msgid "local time offset greater than or equal to 24 hours\n" |
22913 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
22914 | ||
a6cd2cc4 | 22915 | #: git-send-email.perl:223 git-send-email.perl:229 |
1a79b2f1 JX |
22916 | msgid "the editor exited uncleanly, aborting everything" |
22917 | msgstr "编辑器非正常退出,终止所有操作" | |
22918 | ||
a6cd2cc4 | 22919 | #: git-send-email.perl:310 |
1a79b2f1 JX |
22920 | #, perl-format |
22921 | msgid "" | |
22922 | "'%s' contains an intermediate version of the email you were composing.\n" | |
22923 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
22924 | ||
a6cd2cc4 | 22925 | #: git-send-email.perl:315 |
1a79b2f1 JX |
22926 | #, perl-format |
22927 | msgid "'%s.final' contains the composed email.\n" | |
22928 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
22929 | ||
a6cd2cc4 | 22930 | #: git-send-email.perl:408 |
1a79b2f1 JX |
22931 | msgid "--dump-aliases incompatible with other options\n" |
22932 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
22933 | ||
a6cd2cc4 | 22934 | #: git-send-email.perl:481 git-send-email.perl:683 |
1a79b2f1 JX |
22935 | msgid "Cannot run git format-patch from outside a repository\n" |
22936 | msgstr "不能在仓库之外运行 git format-patch\n" | |
22937 | ||
a6cd2cc4 | 22938 | #: git-send-email.perl:484 |
31e5e17b JX |
22939 | msgid "" |
22940 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
22941 | "configuration option)\n" | |
22942 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
22943 | ||
a6cd2cc4 | 22944 | #: git-send-email.perl:497 |
1a79b2f1 JX |
22945 | #, perl-format |
22946 | msgid "Unknown --suppress-cc field: '%s'\n" | |
22947 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
22948 | ||
a6cd2cc4 | 22949 | #: git-send-email.perl:528 |
1a79b2f1 JX |
22950 | #, perl-format |
22951 | msgid "Unknown --confirm setting: '%s'\n" | |
22952 | msgstr "未知的 --confirm 设置:'%s'\n" | |
22953 | ||
a6cd2cc4 | 22954 | #: git-send-email.perl:556 |
1a79b2f1 JX |
22955 | #, perl-format |
22956 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
22957 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
22958 | ||
a6cd2cc4 | 22959 | #: git-send-email.perl:558 |
1a79b2f1 JX |
22960 | #, perl-format |
22961 | msgid "warning: `:include:` not supported: %s\n" | |
22962 | msgstr "警告:不支持 `:include:`:%s\n" | |
22963 | ||
a6cd2cc4 | 22964 | #: git-send-email.perl:560 |
1a79b2f1 JX |
22965 | #, perl-format |
22966 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
22967 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
22968 | ||
a6cd2cc4 | 22969 | #: git-send-email.perl:565 |
1a79b2f1 JX |
22970 | #, perl-format |
22971 | msgid "warning: sendmail line is not recognized: %s\n" | |
22972 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
22973 | ||
a6cd2cc4 | 22974 | #: git-send-email.perl:649 |
1a79b2f1 JX |
22975 | #, perl-format |
22976 | msgid "" | |
22977 | "File '%s' exists but it could also be the range of commits\n" | |
22978 | "to produce patches for. Please disambiguate by...\n" | |
22979 | "\n" | |
22980 | " * Saying \"./%s\" if you mean a file; or\n" | |
22981 | " * Giving --format-patch option if you mean a range.\n" | |
22982 | msgstr "" | |
87cb7997 JX |
22983 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
22984 | "歧义:\n" | |
1a79b2f1 JX |
22985 | "\n" |
22986 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
22987 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
22988 | ||
a6cd2cc4 | 22989 | #: git-send-email.perl:670 |
1a79b2f1 JX |
22990 | #, perl-format |
22991 | msgid "Failed to opendir %s: %s" | |
22992 | msgstr "无法打开目录 %s: %s" | |
22993 | ||
a6cd2cc4 | 22994 | #: git-send-email.perl:694 |
1a79b2f1 JX |
22995 | #, perl-format |
22996 | msgid "" | |
22997 | "fatal: %s: %s\n" | |
22998 | "warning: no patches were sent\n" | |
22999 | msgstr "" | |
06991777 | 23000 | "致命错误:%s:%s\n" |
1a79b2f1 JX |
23001 | "警告:补丁未能发送\n" |
23002 | ||
a6cd2cc4 | 23003 | #: git-send-email.perl:705 |
1a79b2f1 JX |
23004 | msgid "" |
23005 | "\n" | |
23006 | "No patch files specified!\n" | |
23007 | "\n" | |
87cb7997 JX |
23008 | msgstr "" |
23009 | "\n" | |
23010 | "未指定补丁文件!\n" | |
23011 | "\n" | |
1a79b2f1 | 23012 | |
a6cd2cc4 | 23013 | #: git-send-email.perl:718 |
1a79b2f1 JX |
23014 | #, perl-format |
23015 | msgid "No subject line in %s?" | |
23016 | msgstr "在 %s 中没有标题行?" | |
23017 | ||
a6cd2cc4 | 23018 | #: git-send-email.perl:728 |
1a79b2f1 JX |
23019 | #, perl-format |
23020 | msgid "Failed to open for writing %s: %s" | |
c1ac5258 | 23021 | msgstr "为写入打开 %s 失败: %s" |
1a79b2f1 | 23022 | |
a6cd2cc4 | 23023 | #: git-send-email.perl:739 |
1a79b2f1 JX |
23024 | msgid "" |
23025 | "Lines beginning in \"GIT:\" will be removed.\n" | |
23026 | "Consider including an overall diffstat or table of contents\n" | |
23027 | "for the patch you are writing.\n" | |
23028 | "\n" | |
23029 | "Clear the body content if you don't wish to send a summary.\n" | |
23030 | msgstr "" | |
23031 | "以 \"GIT:\" 开头的行将被删除。\n" | |
5b533632 | 23032 | "考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n" |
1a79b2f1 JX |
23033 | "\n" |
23034 | "如果您不想发送摘要,清除内容。\n" | |
23035 | ||
a6cd2cc4 | 23036 | #: git-send-email.perl:763 |
1a79b2f1 JX |
23037 | #, perl-format |
23038 | msgid "Failed to open %s: %s" | |
23039 | msgstr "无法打开 %s: %s" | |
23040 | ||
a6cd2cc4 | 23041 | #: git-send-email.perl:780 |
31e5e17b JX |
23042 | #, perl-format |
23043 | msgid "Failed to open %s.final: %s" | |
23044 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 23045 | |
a6cd2cc4 | 23046 | #: git-send-email.perl:823 |
1a79b2f1 JX |
23047 | msgid "Summary email is empty, skipping it\n" |
23048 | msgstr "摘要邮件为空,跳过\n" | |
23049 | ||
23050 | #. TRANSLATORS: please keep [y/N] as is. | |
a6cd2cc4 | 23051 | #: git-send-email.perl:858 |
1a79b2f1 JX |
23052 | #, perl-format |
23053 | msgid "Are you sure you want to use <%s> [y/N]? " | |
23054 | msgstr "您确认要使用 <%s> [y/N]?" | |
23055 | ||
a6cd2cc4 | 23056 | #: git-send-email.perl:913 |
1a79b2f1 JX |
23057 | msgid "" |
23058 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
23059 | "Encoding.\n" | |
23060 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
23061 | ||
a6cd2cc4 | 23062 | #: git-send-email.perl:918 |
1a79b2f1 JX |
23063 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
23064 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
23065 | ||
a6cd2cc4 | 23066 | #: git-send-email.perl:926 |
1a79b2f1 JX |
23067 | #, perl-format |
23068 | msgid "" | |
23069 | "Refusing to send because the patch\n" | |
23070 | "\t%s\n" | |
23071 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
23072 | "want to send.\n" | |
23073 | msgstr "" | |
23074 | "拒绝发送,因为补丁\n" | |
23075 | "\t%s\n" | |
23076 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
23077 | ||
a6cd2cc4 | 23078 | #: git-send-email.perl:945 |
1a79b2f1 JX |
23079 | msgid "To whom should the emails be sent (if anyone)?" |
23080 | msgstr "邮件将要发送给谁?" | |
23081 | ||
a6cd2cc4 | 23082 | #: git-send-email.perl:963 |
1a79b2f1 JX |
23083 | #, perl-format |
23084 | msgid "fatal: alias '%s' expands to itself\n" | |
06991777 | 23085 | msgstr "致命错误:别名 '%s' 扩展为它自己\n" |
1a79b2f1 | 23086 | |
a6cd2cc4 | 23087 | #: git-send-email.perl:975 |
1a79b2f1 JX |
23088 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
23089 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
23090 | ||
a6cd2cc4 | 23091 | #: git-send-email.perl:1033 git-send-email.perl:1041 |
1a79b2f1 JX |
23092 | #, perl-format |
23093 | msgid "error: unable to extract a valid address from: %s\n" | |
23094 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
23095 | ||
23096 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
23097 | #. translation. The program will only accept English input | |
23098 | #. at this point. | |
a6cd2cc4 | 23099 | #: git-send-email.perl:1045 |
1a79b2f1 JX |
23100 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
23101 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
23102 | ||
a6cd2cc4 | 23103 | #: git-send-email.perl:1362 |
1a79b2f1 JX |
23104 | #, perl-format |
23105 | msgid "CA path \"%s\" does not exist" | |
23106 | msgstr "CA 路径 \"%s\" 不存在" | |
23107 | ||
a6cd2cc4 | 23108 | #: git-send-email.perl:1445 |
1a79b2f1 JX |
23109 | msgid "" |
23110 | " The Cc list above has been expanded by additional\n" | |
23111 | " addresses found in the patch commit message. By default\n" | |
23112 | " send-email prompts before sending whenever this occurs.\n" | |
23113 | " This behavior is controlled by the sendemail.confirm\n" | |
23114 | " configuration setting.\n" | |
23115 | "\n" | |
23116 | " For additional information, run 'git send-email --help'.\n" | |
23117 | " To retain the current behavior, but squelch this message,\n" | |
23118 | " run 'git config --global sendemail.confirm auto'.\n" | |
23119 | "\n" | |
23120 | msgstr "" | |
23121 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
23122 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
23123 | " sendemail.confirm 配置设置。\n" | |
23124 | "\n" | |
23125 | " 更多信息,执行 'git send-email --help'。\n" | |
23126 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
23127 | " sendemail.confirm auto'。\n" | |
23128 | "\n" | |
23129 | ||
fd8cb379 | 23130 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
23131 | #. translation. The program will only accept English input |
23132 | #. at this point. | |
a6cd2cc4 | 23133 | #: git-send-email.perl:1460 |
fd8cb379 JX |
23134 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " |
23135 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 23136 | |
a6cd2cc4 | 23137 | #: git-send-email.perl:1463 |
1a79b2f1 JX |
23138 | msgid "Send this email reply required" |
23139 | msgstr "发送要求的邮件回复" | |
23140 | ||
a6cd2cc4 | 23141 | #: git-send-email.perl:1491 |
1a79b2f1 JX |
23142 | msgid "The required SMTP server is not properly defined." |
23143 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
23144 | ||
a6cd2cc4 | 23145 | #: git-send-email.perl:1538 |
1a79b2f1 JX |
23146 | #, perl-format |
23147 | msgid "Server does not support STARTTLS! %s" | |
23148 | msgstr "服务器不支持 STARTTLS!%s" | |
23149 | ||
a6cd2cc4 | 23150 | #: git-send-email.perl:1543 git-send-email.perl:1547 |
a4f16749 JX |
23151 | #, perl-format |
23152 | msgid "STARTTLS failed! %s" | |
23153 | msgstr "STARTTLS 失败!%s" | |
23154 | ||
a6cd2cc4 | 23155 | #: git-send-email.perl:1556 |
1a79b2f1 JX |
23156 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
23157 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
23158 | ||
a6cd2cc4 | 23159 | #: git-send-email.perl:1574 |
1a79b2f1 JX |
23160 | #, perl-format |
23161 | msgid "Failed to send %s\n" | |
23162 | msgstr "无法发送 %s\n" | |
23163 | ||
a6cd2cc4 | 23164 | #: git-send-email.perl:1577 |
1a79b2f1 JX |
23165 | #, perl-format |
23166 | msgid "Dry-Sent %s\n" | |
23167 | msgstr "演习发送 %s\n" | |
23168 | ||
a6cd2cc4 | 23169 | #: git-send-email.perl:1577 |
1a79b2f1 JX |
23170 | #, perl-format |
23171 | msgid "Sent %s\n" | |
23172 | msgstr "正发送 %s\n" | |
23173 | ||
a6cd2cc4 | 23174 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
23175 | msgid "Dry-OK. Log says:\n" |
23176 | msgstr "演习成功。日志说:\n" | |
23177 | ||
a6cd2cc4 | 23178 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
23179 | msgid "OK. Log says:\n" |
23180 | msgstr "OK。日志说:\n" | |
23181 | ||
a6cd2cc4 | 23182 | #: git-send-email.perl:1591 |
1a79b2f1 JX |
23183 | msgid "Result: " |
23184 | msgstr "结果:" | |
23185 | ||
a6cd2cc4 | 23186 | #: git-send-email.perl:1594 |
1a79b2f1 JX |
23187 | msgid "Result: OK\n" |
23188 | msgstr "结果:OK\n" | |
23189 | ||
a6cd2cc4 | 23190 | #: git-send-email.perl:1612 |
1a79b2f1 JX |
23191 | #, perl-format |
23192 | msgid "can't open file %s" | |
23193 | msgstr "无法打开文件 %s" | |
23194 | ||
a6cd2cc4 | 23195 | #: git-send-email.perl:1659 git-send-email.perl:1679 |
1a79b2f1 JX |
23196 | #, perl-format |
23197 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
23198 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
23199 | ||
a6cd2cc4 | 23200 | #: git-send-email.perl:1665 |
1a79b2f1 JX |
23201 | #, perl-format |
23202 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
23203 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
23204 | ||
a6cd2cc4 | 23205 | #: git-send-email.perl:1718 |
1a79b2f1 JX |
23206 | #, perl-format |
23207 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
23208 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
23209 | ||
a6cd2cc4 | 23210 | #: git-send-email.perl:1753 |
1a79b2f1 JX |
23211 | #, perl-format |
23212 | msgid "(body) Adding cc: %s from line '%s'\n" | |
23213 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
23214 | ||
a6cd2cc4 | 23215 | #: git-send-email.perl:1864 |
1a79b2f1 JX |
23216 | #, perl-format |
23217 | msgid "(%s) Could not execute '%s'" | |
23218 | msgstr "(%s) 不能执行 '%s'" | |
23219 | ||
a6cd2cc4 | 23220 | #: git-send-email.perl:1871 |
1a79b2f1 JX |
23221 | #, perl-format |
23222 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
23223 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
23224 | ||
a6cd2cc4 | 23225 | #: git-send-email.perl:1875 |
1a79b2f1 JX |
23226 | #, perl-format |
23227 | msgid "(%s) failed to close pipe to '%s'" | |
23228 | msgstr "(%s) 无法关闭管道至 '%s'" | |
23229 | ||
a6cd2cc4 | 23230 | #: git-send-email.perl:1905 |
1a79b2f1 JX |
23231 | msgid "cannot send message as 7bit" |
23232 | msgstr "不能以 7bit 形式发送信息" | |
23233 | ||
a6cd2cc4 | 23234 | #: git-send-email.perl:1913 |
1a79b2f1 JX |
23235 | msgid "invalid transfer encoding" |
23236 | msgstr "无效的传送编码" | |
23237 | ||
a6cd2cc4 | 23238 | #: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 |
1a79b2f1 JX |
23239 | #, perl-format |
23240 | msgid "unable to open %s: %s\n" | |
23241 | msgstr "不能打开 %s:%s\n" | |
23242 | ||
a6cd2cc4 | 23243 | #: git-send-email.perl:1957 |
1a79b2f1 JX |
23244 | #, perl-format |
23245 | msgid "%s: patch contains a line longer than 998 characters" | |
23246 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
23247 | ||
a6cd2cc4 | 23248 | #: git-send-email.perl:1974 |
1a79b2f1 JX |
23249 | #, perl-format |
23250 | msgid "Skipping %s with backup suffix '%s'.\n" | |
23251 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
23252 | ||
23253 | #. TRANSLATORS: please keep "[y|N]" as is. | |
a6cd2cc4 | 23254 | #: git-send-email.perl:1978 |
1a79b2f1 JX |
23255 | #, perl-format |
23256 | msgid "Do you really want to send %s? [y|N]: " | |
23257 | msgstr "您真的要发送 %s?[y|N]:" |