]>
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: |
31e5e17b | 6 | # - Fangyi Zhou <fangyi.zhou AT yuriko.moe> |
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 工具 | |
48 | # DAG | 有向无环图 | |
49 | # dangling object | 摇摆对象 | |
50 | # detached HEAD | 分离头指针 | |
51 | # directory | 目录 | |
52 | # dirty | 脏(的工作区) | |
755c831b | 53 | # dumb HTTP protocol | 哑 HTTP 协议 |
160fb2b2 JX |
54 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
55 | # fast-forward | 快进 | |
56 | # fetch | 获取 | |
57 | # file system | 文件系统 | |
e397e7e3 | 58 | # fork | 派生 |
160fb2b2 JX |
59 | # Git archive | 仓库(对于 arch 用户) |
60 | # gitfile | gitfile(仓库链接文件) | |
61 | # grafts | (提交)嫁接 | |
62 | # hash | 哈希值 | |
63 | # HEAD | HEAD(头指针,亦即当前分支) | |
64 | # head | 头、分支 | |
65 | # head ref | 分支 | |
66 | # header | 头信息 | |
67 | # hook | 钩子 | |
68 | # hunk | 补丁片段 | |
69 | # index | 索引 | |
70 | # index entry | 索引条目 | |
71 | # loose object | 松散对象 | |
72 | # loose refs | 松散引用 | |
73 | # master | master(默认分支名) | |
74 | # merge | 合并 | |
75 | # object | 对象 | |
76 | # object database | 对象库 | |
77 | # object identifier | 对象标识符 | |
78 | # object name | 对象名称 | |
79 | # object type | 对象类型 | |
80 | # octopus | 章鱼式合并(两分支以上的合并) | |
81 | # origin | origin(默认的远程名称) | |
82 | # pack | 包 | |
83 | # pack index | 包索引 | |
84 | # packfile | 包文件 | |
85 | # parent | 父提交 | |
86 | # patch | 补丁 | |
87 | # pathspec | 路径规格 | |
88 | # pattern | 模式 | |
12e59059 | 89 | # pickaxe | 挖掘 |
160fb2b2 JX |
90 | # plumbing | 管件(Git 底层核心命令的别称) |
91 | # porcelain | 瓷件(Git 上层封装命令的别称) | |
94550ed3 | 92 | # precious-objects repo | 珍品仓库 |
160fb2b2 JX |
93 | # prune | 清除 |
94 | # pull | 拉,拉取 | |
95 | # push | 推,推送 | |
96 | # reachable | 可达 | |
97 | # rebase | 变基 | |
98 | # ref | 引用 | |
99 | # reflog | 引用日志 | |
100 | # refspec | 引用规格 | |
101 | # remote | 远程,远程仓库 | |
102 | # remote-tracking branch | 远程跟踪分支 | |
103 | # replay | 重放 | |
104 | # repo | 仓库 | |
105 | # repository | 仓库 | |
106 | # resolve | (冲突)解决 | |
107 | # revert | 还原 | |
108 | # revision | 版本 | |
109 | # rewind | 回退 | |
110 | # SCM | 源代码管理(工具) | |
ee7589bb | 111 | # SHA-1 | SHA-1(安全哈希算法1) |
160fb2b2 JX |
112 | # shallow repository | 浅(克隆)仓库 |
113 | # signed tag | 签名标签 | |
755c831b | 114 | # smart HTTP protocol | 智能 HTTP 协议 |
160fb2b2 JX |
115 | # squash | 压缩 |
116 | # stage | n. 暂存区(即索引); v. 暂存 | |
a4f16749 | 117 | # stash | n. 贮藏区; v. 贮藏 |
160fb2b2 JX |
118 | # submodule | 子模组 |
119 | # symref | 符号引用 | |
933c015e | 120 | # tag | n. 标签; v. 打标签 |
160fb2b2 JX |
121 | # tag object | 标签对象 |
122 | # tagger | 打标签者 | |
123 | # topic branch | 主题分支 | |
124 | # track | 跟踪 | |
6937cb4e | 125 | # trailer | 尾部署名 |
160fb2b2 JX |
126 | # tree | 树(工作区或树对象) |
127 | # tree object | 树对象 | |
128 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) | |
129 | # unmerged index | 未合并索引 | |
130 | # unpack | 解包 | |
131 | # unreachable object | 不可达对象 | |
132 | # unstage | 取消暂存 | |
133 | # upstream | 上游 | |
134 | # upstream branch | 上游分支 | |
135 | # working tree | 工作区 | |
136 | # | |
c04f5ac3 JX |
137 | msgid "" |
138 | msgstr "" | |
139 | "Project-Id-Version: Git\n" | |
140 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
31e5e17b JX |
141 | "POT-Creation-Date: 2018-03-16 07:29+0800\n" |
142 | "PO-Revision-Date: 2018-03-25 22:20+0800\n" | |
c04f5ac3 | 143 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 144 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
145 | "Language: zh_CN\n" |
146 | "MIME-Version: 1.0\n" | |
147 | "Content-Type: text/plain; charset=UTF-8\n" | |
148 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 149 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 150 | |
5809aa05 | 151 | #: advice.c:62 |
c04f5ac3 JX |
152 | #, c-format |
153 | msgid "hint: %.*s\n" | |
154 | msgstr "提示:%.*s\n" | |
155 | ||
5809aa05 | 156 | #: advice.c:90 |
5c57d762 JX |
157 | msgid "Cherry-picking is not possible because you have unmerged files." |
158 | msgstr "无法拣选,因为您有未合并的文件。" | |
159 | ||
5809aa05 | 160 | #: advice.c:92 |
5c57d762 JX |
161 | msgid "Committing is not possible because you have unmerged files." |
162 | msgstr "无法提交,因为您有未合并的文件。" | |
163 | ||
5809aa05 | 164 | #: advice.c:94 |
5c57d762 JX |
165 | msgid "Merging is not possible because you have unmerged files." |
166 | msgstr "无法合并,因为您有未合并的文件。" | |
167 | ||
5809aa05 | 168 | #: advice.c:96 |
5c57d762 JX |
169 | msgid "Pulling is not possible because you have unmerged files." |
170 | msgstr "无法拉取,因为您有未合并的文件。" | |
171 | ||
5809aa05 | 172 | #: advice.c:98 |
5c57d762 JX |
173 | msgid "Reverting is not possible because you have unmerged files." |
174 | msgstr "无法回退,因为您有未合并的文件。" | |
175 | ||
5809aa05 | 176 | #: advice.c:100 |
5c57d762 JX |
177 | #, c-format |
178 | msgid "It is not possible to %s because you have unmerged files." | |
179 | msgstr "无法 %s,因为您有未合并的文件。" | |
180 | ||
5809aa05 | 181 | #: advice.c:108 |
c04f5ac3 | 182 | msgid "" |
6acbf033 | 183 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 184 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 185 | msgstr "" |
d9d56b23 | 186 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 187 | "解决方案并提交。" |
c04f5ac3 | 188 | |
5809aa05 | 189 | #: advice.c:116 |
5c57d762 JX |
190 | msgid "Exiting because of an unresolved conflict." |
191 | msgstr "因为存在未解决的冲突而退出。" | |
192 | ||
31e5e17b | 193 | #: advice.c:121 builtin/merge.c:1251 |
1b7f4a34 JX |
194 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
195 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
196 | ||
5809aa05 | 197 | #: advice.c:123 |
94550ed3 | 198 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
199 | msgstr "请在合并前先提交您的修改。" |
200 | ||
5809aa05 | 201 | #: advice.c:124 |
1b7f4a34 JX |
202 | msgid "Exiting because of unfinished merge." |
203 | msgstr "因为存在未完成的合并而退出。" | |
204 | ||
5809aa05 | 205 | #: advice.c:130 |
5c57d762 JX |
206 | #, c-format |
207 | msgid "" | |
208 | "Note: checking out '%s'.\n" | |
209 | "\n" | |
210 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
211 | "changes and commit them, and you can discard any commits you make in this\n" | |
212 | "state without impacting any branches by performing another checkout.\n" | |
213 | "\n" | |
214 | "If you want to create a new branch to retain commits you create, you may\n" | |
215 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
216 | "\n" | |
217 | " git checkout -b <new-branch-name>\n" | |
218 | "\n" | |
219 | msgstr "" | |
220 | "注意:正在检出 '%s'。\n" | |
221 | "\n" | |
a0b6b246 JX |
222 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" |
223 | "外\n" | |
5c57d762 JX |
224 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" |
225 | "\n" | |
226 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" | |
227 | "参数 -b 来实现(现在或稍后)。例如:\n" | |
228 | "\n" | |
58b6f078 | 229 | " git checkout -b <新分支名>\n" |
5c57d762 JX |
230 | "\n" |
231 | ||
a4f16749 | 232 | #: apply.c:58 |
a0b6b246 JX |
233 | #, c-format |
234 | msgid "unrecognized whitespace option '%s'" | |
235 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 236 | |
a4f16749 | 237 | #: apply.c:74 |
90314792 | 238 | #, c-format |
a0b6b246 JX |
239 | msgid "unrecognized whitespace ignore option '%s'" |
240 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 241 | |
5809aa05 | 242 | #: apply.c:122 |
a0b6b246 | 243 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 244 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 245 | |
5809aa05 | 246 | #: apply.c:124 |
a0b6b246 JX |
247 | msgid "--cached and --3way cannot be used together." |
248 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 249 | |
5809aa05 | 250 | #: apply.c:127 |
a0b6b246 JX |
251 | msgid "--3way outside a repository" |
252 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 253 | |
5809aa05 | 254 | #: apply.c:138 |
a0b6b246 JX |
255 | msgid "--index outside a repository" |
256 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 257 | |
5809aa05 | 258 | #: apply.c:141 |
a0b6b246 JX |
259 | msgid "--cached outside a repository" |
260 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 261 | |
5809aa05 | 262 | #: apply.c:821 |
a0b6b246 JX |
263 | #, c-format |
264 | msgid "Cannot prepare timestamp regexp %s" | |
265 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 266 | |
5809aa05 | 267 | #: apply.c:830 |
a0b6b246 JX |
268 | #, c-format |
269 | msgid "regexec returned %d for input: %s" | |
270 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 271 | |
5809aa05 | 272 | #: apply.c:904 |
a0b6b246 JX |
273 | #, c-format |
274 | msgid "unable to find filename in patch at line %d" | |
275 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 276 | |
5809aa05 | 277 | #: apply.c:942 |
a0b6b246 JX |
278 | #, c-format |
279 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
280 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 281 | |
5809aa05 | 282 | #: apply.c:948 |
a0b6b246 JX |
283 | #, c-format |
284 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
285 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 286 | |
5809aa05 | 287 | #: apply.c:949 |
a0b6b246 JX |
288 | #, c-format |
289 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
290 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 291 | |
5809aa05 | 292 | #: apply.c:954 |
a0b6b246 JX |
293 | #, c-format |
294 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
295 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 296 | |
5809aa05 | 297 | #: apply.c:983 |
a4f16749 JX |
298 | #, c-format |
299 | msgid "invalid mode on line %d: %s" | |
300 | msgstr "第 %d 行包含无效文件模式:%s" | |
301 | ||
5809aa05 | 302 | #: apply.c:1301 |
a4f16749 JX |
303 | #, c-format |
304 | msgid "inconsistent header lines %d and %d" | |
305 | msgstr "不一致的文件头,%d 行和 %d 行" | |
306 | ||
5809aa05 | 307 | #: apply.c:1473 |
a0b6b246 JX |
308 | #, c-format |
309 | msgid "recount: unexpected line: %.*s" | |
310 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 311 | |
5809aa05 | 312 | #: apply.c:1542 |
a0b6b246 JX |
313 | #, c-format |
314 | msgid "patch fragment without header at line %d: %.*s" | |
315 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 316 | |
5809aa05 | 317 | #: apply.c:1562 |
a0b6b246 JX |
318 | #, c-format |
319 | msgid "" | |
320 | "git diff header lacks filename information when removing %d leading pathname " | |
321 | "component (line %d)" | |
322 | msgid_plural "" | |
323 | "git diff header lacks filename information when removing %d leading pathname " | |
324 | "components (line %d)" | |
325 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
326 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 327 | |
5809aa05 | 328 | #: apply.c:1575 |
a0b6b246 JX |
329 | #, c-format |
330 | msgid "git diff header lacks filename information (line %d)" | |
331 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 332 | |
5809aa05 | 333 | #: apply.c:1763 |
a0b6b246 JX |
334 | msgid "new file depends on old contents" |
335 | msgstr "新文件依赖旧内容" | |
5c57d762 | 336 | |
5809aa05 | 337 | #: apply.c:1765 |
a0b6b246 JX |
338 | msgid "deleted file still has contents" |
339 | msgstr "删除的文件仍有内容" | |
5c57d762 | 340 | |
5809aa05 | 341 | #: apply.c:1799 |
a0b6b246 JX |
342 | #, c-format |
343 | msgid "corrupt patch at line %d" | |
344 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 345 | |
5809aa05 | 346 | #: apply.c:1836 |
5c57d762 | 347 | #, c-format |
a0b6b246 JX |
348 | msgid "new file %s depends on old contents" |
349 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 350 | |
5809aa05 | 351 | #: apply.c:1838 |
5c57d762 | 352 | #, c-format |
a0b6b246 JX |
353 | msgid "deleted file %s still has contents" |
354 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 355 | |
5809aa05 | 356 | #: apply.c:1841 |
a0b6b246 JX |
357 | #, c-format |
358 | msgid "** warning: file %s becomes empty but is not deleted" | |
359 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 360 | |
5809aa05 | 361 | #: apply.c:1988 |
5c57d762 | 362 | #, c-format |
a0b6b246 JX |
363 | msgid "corrupt binary patch at line %d: %.*s" |
364 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 365 | |
5809aa05 | 366 | #: apply.c:2025 |
5c57d762 | 367 | #, c-format |
a0b6b246 JX |
368 | msgid "unrecognized binary patch at line %d" |
369 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 370 | |
5809aa05 | 371 | #: apply.c:2185 |
5c57d762 | 372 | #, c-format |
a0b6b246 JX |
373 | msgid "patch with only garbage at line %d" |
374 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 375 | |
5809aa05 | 376 | #: apply.c:2271 |
5c57d762 | 377 | #, c-format |
a0b6b246 JX |
378 | msgid "unable to read symlink %s" |
379 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 380 | |
5809aa05 | 381 | #: apply.c:2275 |
5c57d762 | 382 | #, c-format |
a0b6b246 JX |
383 | msgid "unable to open or read %s" |
384 | msgstr "不能打开或读取 %s" | |
5c57d762 | 385 | |
5809aa05 | 386 | #: apply.c:2934 |
5c57d762 | 387 | #, c-format |
a0b6b246 JX |
388 | msgid "invalid start of line: '%c'" |
389 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 390 | |
5809aa05 | 391 | #: apply.c:3055 |
5c57d762 | 392 | #, c-format |
a0b6b246 JX |
393 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
394 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
395 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
396 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 397 | |
5809aa05 | 398 | #: apply.c:3067 |
5c57d762 | 399 | #, c-format |
a0b6b246 JX |
400 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
401 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 402 | |
5809aa05 | 403 | #: apply.c:3073 |
5c57d762 JX |
404 | #, c-format |
405 | msgid "" | |
a0b6b246 JX |
406 | "while searching for:\n" |
407 | "%.*s" | |
5c57d762 | 408 | msgstr "" |
a0b6b246 JX |
409 | "当查询:\n" |
410 | "%.*s" | |
5c57d762 | 411 | |
5809aa05 | 412 | #: apply.c:3095 |
5c57d762 | 413 | #, c-format |
a0b6b246 JX |
414 | msgid "missing binary patch data for '%s'" |
415 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 416 | |
5809aa05 | 417 | #: apply.c:3103 |
5c57d762 | 418 | #, c-format |
a0b6b246 | 419 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 420 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 421 | |
5809aa05 | 422 | #: apply.c:3149 |
5c57d762 | 423 | #, c-format |
a0b6b246 JX |
424 | msgid "cannot apply binary patch to '%s' without full index line" |
425 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 426 | |
5809aa05 | 427 | #: apply.c:3159 |
5c57d762 | 428 | #, c-format |
a0b6b246 JX |
429 | msgid "" |
430 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 431 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 432 | |
5809aa05 | 433 | #: apply.c:3167 |
a0b6b246 JX |
434 | #, c-format |
435 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 436 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 437 | |
5809aa05 | 438 | #: apply.c:3185 |
5c57d762 | 439 | #, c-format |
a0b6b246 JX |
440 | msgid "the necessary postimage %s for '%s' cannot be read" |
441 | msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" | |
5c57d762 | 442 | |
5809aa05 | 443 | #: apply.c:3198 |
5c57d762 | 444 | #, c-format |
a0b6b246 JX |
445 | msgid "binary patch does not apply to '%s'" |
446 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 447 | |
5809aa05 | 448 | #: apply.c:3204 |
5c57d762 | 449 | #, c-format |
a0b6b246 JX |
450 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
451 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 452 | |
5809aa05 | 453 | #: apply.c:3225 |
276ceeaa | 454 | #, c-format |
a0b6b246 JX |
455 | msgid "patch failed: %s:%ld" |
456 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 457 | |
5809aa05 | 458 | #: apply.c:3347 |
4dcdc3d8 | 459 | #, c-format |
a0b6b246 JX |
460 | msgid "cannot checkout %s" |
461 | msgstr "不能检出 %s" | |
4dcdc3d8 | 462 | |
5809aa05 | 463 | #: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 |
4dcdc3d8 | 464 | #, c-format |
a0b6b246 JX |
465 | msgid "failed to read %s" |
466 | msgstr "无法读取 %s" | |
4dcdc3d8 | 467 | |
5809aa05 | 468 | #: apply.c:3404 |
4dcdc3d8 | 469 | #, c-format |
a0b6b246 JX |
470 | msgid "reading from '%s' beyond a symbolic link" |
471 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 472 | |
5809aa05 | 473 | #: apply.c:3433 apply.c:3673 |
4dcdc3d8 | 474 | #, c-format |
a0b6b246 JX |
475 | msgid "path %s has been renamed/deleted" |
476 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 477 | |
5809aa05 | 478 | #: apply.c:3516 apply.c:3687 |
4dcdc3d8 | 479 | #, c-format |
a0b6b246 JX |
480 | msgid "%s: does not exist in index" |
481 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 482 | |
5809aa05 | 483 | #: apply.c:3525 apply.c:3695 |
4dcdc3d8 | 484 | #, c-format |
a0b6b246 JX |
485 | msgid "%s: does not match index" |
486 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 487 | |
5809aa05 | 488 | #: apply.c:3560 |
a0b6b246 JX |
489 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
490 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 491 | |
5809aa05 | 492 | #: apply.c:3563 |
4dcdc3d8 | 493 | #, c-format |
a0b6b246 JX |
494 | msgid "Falling back to three-way merge...\n" |
495 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 496 | |
5809aa05 | 497 | #: apply.c:3579 apply.c:3583 |
4dcdc3d8 | 498 | #, c-format |
a0b6b246 JX |
499 | msgid "cannot read the current contents of '%s'" |
500 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 501 | |
5809aa05 | 502 | #: apply.c:3595 |
4dcdc3d8 | 503 | #, c-format |
a0b6b246 JX |
504 | msgid "Failed to fall back on three-way merge...\n" |
505 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 506 | |
5809aa05 | 507 | #: apply.c:3609 |
4dcdc3d8 | 508 | #, c-format |
a0b6b246 JX |
509 | msgid "Applied patch to '%s' with conflicts.\n" |
510 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 511 | |
5809aa05 | 512 | #: apply.c:3614 |
4dcdc3d8 | 513 | #, c-format |
a0b6b246 JX |
514 | msgid "Applied patch to '%s' cleanly.\n" |
515 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 516 | |
5809aa05 | 517 | #: apply.c:3640 |
a0b6b246 JX |
518 | msgid "removal patch leaves file contents" |
519 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 520 | |
5809aa05 | 521 | #: apply.c:3712 |
1003b3a5 | 522 | #, c-format |
a0b6b246 JX |
523 | msgid "%s: wrong type" |
524 | msgstr "%s:错误类型" | |
1003b3a5 | 525 | |
5809aa05 | 526 | #: apply.c:3714 |
1003b3a5 | 527 | #, c-format |
a0b6b246 JX |
528 | msgid "%s has type %o, expected %o" |
529 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 530 | |
5809aa05 | 531 | #: apply.c:3864 apply.c:3866 |
4dcdc3d8 | 532 | #, c-format |
a0b6b246 JX |
533 | msgid "invalid path '%s'" |
534 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 535 | |
5809aa05 | 536 | #: apply.c:3922 |
4dcdc3d8 | 537 | #, c-format |
a0b6b246 JX |
538 | msgid "%s: already exists in index" |
539 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 540 | |
5809aa05 | 541 | #: apply.c:3925 |
4dcdc3d8 | 542 | #, c-format |
a0b6b246 JX |
543 | msgid "%s: already exists in working directory" |
544 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 545 | |
5809aa05 | 546 | #: apply.c:3945 |
1b7f4a34 | 547 | #, c-format |
a0b6b246 JX |
548 | msgid "new mode (%o) of %s does not match old mode (%o)" |
549 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 550 | |
5809aa05 | 551 | #: apply.c:3950 |
5b04ee3b | 552 | #, c-format |
a0b6b246 JX |
553 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
554 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 555 | |
5809aa05 | 556 | #: apply.c:3970 |
8ada9598 | 557 | #, c-format |
a0b6b246 JX |
558 | msgid "affected file '%s' is beyond a symbolic link" |
559 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 560 | |
5809aa05 | 561 | #: apply.c:3974 |
81809b99 | 562 | #, c-format |
a0b6b246 JX |
563 | msgid "%s: patch does not apply" |
564 | msgstr "%s:补丁未应用" | |
8ada9598 | 565 | |
5809aa05 | 566 | #: apply.c:3989 |
8ada9598 | 567 | #, c-format |
a0b6b246 JX |
568 | msgid "Checking patch %s..." |
569 | msgstr "检查补丁 %s..." | |
8ada9598 | 570 | |
5809aa05 | 571 | #: apply.c:4080 |
a0b6b246 JX |
572 | #, c-format |
573 | msgid "sha1 information is lacking or useless for submodule %s" | |
574 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 575 | |
5809aa05 | 576 | #: apply.c:4087 |
8ada9598 | 577 | #, c-format |
a0b6b246 | 578 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 579 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 580 | |
5809aa05 | 581 | #: apply.c:4090 |
a0b6b246 JX |
582 | #, c-format |
583 | msgid "sha1 information is lacking or useless (%s)." | |
584 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 585 | |
31e5e17b | 586 | #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 |
8ada9598 | 587 | #, c-format |
a0b6b246 JX |
588 | msgid "make_cache_entry failed for path '%s'" |
589 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
8ada9598 | 590 | |
5809aa05 | 591 | #: apply.c:4099 |
a0b6b246 JX |
592 | #, c-format |
593 | msgid "could not add %s to temporary index" | |
594 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 595 | |
5809aa05 | 596 | #: apply.c:4109 |
a0b6b246 JX |
597 | #, c-format |
598 | msgid "could not write temporary index to %s" | |
599 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 600 | |
5809aa05 | 601 | #: apply.c:4247 |
a0b6b246 JX |
602 | #, c-format |
603 | msgid "unable to remove %s from index" | |
604 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 605 | |
5809aa05 | 606 | #: apply.c:4282 |
8ada9598 | 607 | #, c-format |
a0b6b246 JX |
608 | msgid "corrupt patch for submodule %s" |
609 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 610 | |
5809aa05 | 611 | #: apply.c:4288 |
9aeb4c2b | 612 | #, c-format |
a0b6b246 | 613 | msgid "unable to stat newly created file '%s'" |
65e2041e | 614 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 615 | |
5809aa05 | 616 | #: apply.c:4296 |
a0b6b246 JX |
617 | #, c-format |
618 | msgid "unable to create backing store for newly created file %s" | |
619 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 620 | |
5809aa05 | 621 | #: apply.c:4302 apply.c:4446 |
81809b99 | 622 | #, c-format |
a0b6b246 JX |
623 | msgid "unable to add cache entry for %s" |
624 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 625 | |
5809aa05 | 626 | #: apply.c:4343 |
a0b6b246 JX |
627 | #, c-format |
628 | msgid "failed to write to '%s'" | |
629 | msgstr "无法写入 '%s'" | |
8ada9598 | 630 | |
5809aa05 | 631 | #: apply.c:4347 |
220c313c | 632 | #, c-format |
a0b6b246 JX |
633 | msgid "closing file '%s'" |
634 | msgstr "关闭文件 '%s'" | |
220c313c | 635 | |
5809aa05 | 636 | #: apply.c:4417 |
c04f5ac3 | 637 | #, c-format |
a0b6b246 JX |
638 | msgid "unable to write file '%s' mode %o" |
639 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 640 | |
5809aa05 | 641 | #: apply.c:4515 |
c04f5ac3 | 642 | #, c-format |
a0b6b246 JX |
643 | msgid "Applied patch %s cleanly." |
644 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 645 | |
5809aa05 | 646 | #: apply.c:4523 |
a0b6b246 JX |
647 | msgid "internal error" |
648 | msgstr "内部错误" | |
c04f5ac3 | 649 | |
5809aa05 | 650 | #: apply.c:4526 |
5c57d762 | 651 | #, c-format |
a0b6b246 JX |
652 | msgid "Applying patch %%s with %d reject..." |
653 | msgid_plural "Applying patch %%s with %d rejects..." | |
654 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
655 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 656 | |
5809aa05 | 657 | #: apply.c:4537 |
5c57d762 | 658 | #, c-format |
a0b6b246 JX |
659 | msgid "truncating .rej filename to %.*s.rej" |
660 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 661 | |
31e5e17b | 662 | #: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 |
220c313c | 663 | #, c-format |
a0b6b246 JX |
664 | msgid "cannot open %s" |
665 | msgstr "不能打开 %s" | |
220c313c | 666 | |
5809aa05 | 667 | #: apply.c:4559 |
220c313c | 668 | #, c-format |
a0b6b246 JX |
669 | msgid "Hunk #%d applied cleanly." |
670 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 671 | |
5809aa05 | 672 | #: apply.c:4563 |
5c57d762 | 673 | #, c-format |
a0b6b246 JX |
674 | msgid "Rejected hunk #%d." |
675 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 676 | |
5809aa05 | 677 | #: apply.c:4673 |
5c57d762 | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "Skipped patch '%s'." |
680 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 681 | |
5809aa05 | 682 | #: apply.c:4681 |
a0b6b246 JX |
683 | msgid "unrecognized input" |
684 | msgstr "未能识别的输入" | |
5c57d762 | 685 | |
5809aa05 | 686 | #: apply.c:4700 |
a0b6b246 JX |
687 | msgid "unable to read index file" |
688 | msgstr "无法读取索引文件" | |
5c57d762 | 689 | |
5809aa05 | 690 | #: apply.c:4837 |
220c313c | 691 | #, c-format |
a0b6b246 JX |
692 | msgid "can't open patch '%s': %s" |
693 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 694 | |
5809aa05 | 695 | #: apply.c:4864 |
5c57d762 | 696 | #, c-format |
a0b6b246 JX |
697 | msgid "squelched %d whitespace error" |
698 | msgid_plural "squelched %d whitespace errors" | |
699 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
700 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 701 | |
5809aa05 | 702 | #: apply.c:4870 apply.c:4885 |
5c57d762 | 703 | #, c-format |
a0b6b246 JX |
704 | msgid "%d line adds whitespace errors." |
705 | msgid_plural "%d lines add whitespace errors." | |
a4f16749 JX |
706 | msgstr[0] "%d 行新增了空白字符误用。" |
707 | msgstr[1] "%d 行新增了空白字符误用。" | |
5c57d762 | 708 | |
5809aa05 | 709 | #: apply.c:4878 |
5c57d762 | 710 | #, c-format |
a0b6b246 JX |
711 | msgid "%d line applied after fixing whitespace errors." |
712 | msgid_plural "%d lines applied after fixing whitespace errors." | |
713 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
714 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 715 | |
5809aa05 | 716 | #: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 |
a0b6b246 JX |
717 | msgid "Unable to write new index file" |
718 | msgstr "无法写入新索引文件" | |
5c57d762 | 719 | |
31e5e17b JX |
720 | #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 |
721 | #: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 | |
722 | #: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 | |
723 | #: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 | |
724 | #: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 | |
a4f16749 | 725 | #: git-add--interactive.perl:197 |
a0b6b246 JX |
726 | msgid "path" |
727 | msgstr "路径" | |
5c57d762 | 728 | |
5809aa05 | 729 | #: apply.c:4922 |
a0b6b246 JX |
730 | msgid "don't apply changes matching the given path" |
731 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 732 | |
5809aa05 | 733 | #: apply.c:4925 |
a0b6b246 JX |
734 | msgid "apply changes matching the given path" |
735 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 736 | |
31e5e17b | 737 | #: apply.c:4927 builtin/am.c:2263 |
a0b6b246 JX |
738 | msgid "num" |
739 | msgstr "数字" | |
220c313c | 740 | |
5809aa05 | 741 | #: apply.c:4928 |
a0b6b246 JX |
742 | msgid "remove <num> leading slashes from traditional diff paths" |
743 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 744 | |
5809aa05 | 745 | #: apply.c:4931 |
a0b6b246 JX |
746 | msgid "ignore additions made by the patch" |
747 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 748 | |
5809aa05 | 749 | #: apply.c:4933 |
a0b6b246 JX |
750 | msgid "instead of applying the patch, output diffstat for the input" |
751 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 752 | |
5809aa05 | 753 | #: apply.c:4937 |
a0b6b246 JX |
754 | msgid "show number of added and deleted lines in decimal notation" |
755 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 756 | |
5809aa05 | 757 | #: apply.c:4939 |
a0b6b246 JX |
758 | msgid "instead of applying the patch, output a summary for the input" |
759 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 760 | |
5809aa05 | 761 | #: apply.c:4941 |
a0b6b246 JX |
762 | msgid "instead of applying the patch, see if the patch is applicable" |
763 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 764 | |
5809aa05 | 765 | #: apply.c:4943 |
a0b6b246 JX |
766 | msgid "make sure the patch is applicable to the current index" |
767 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 768 | |
5809aa05 | 769 | #: apply.c:4945 |
a0b6b246 JX |
770 | msgid "apply a patch without touching the working tree" |
771 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 772 | |
5809aa05 | 773 | #: apply.c:4947 |
a0b6b246 JX |
774 | msgid "accept a patch that touches outside the working area" |
775 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 776 | |
31e5e17b | 777 | #: apply.c:4950 |
a0b6b246 JX |
778 | msgid "also apply the patch (use with --stat/--summary/--check)" |
779 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 780 | |
31e5e17b | 781 | #: apply.c:4952 |
a0b6b246 JX |
782 | msgid "attempt three-way merge if a patch does not apply" |
783 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 784 | |
31e5e17b | 785 | #: apply.c:4954 |
a0b6b246 JX |
786 | msgid "build a temporary index based on embedded index information" |
787 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 788 | |
31e5e17b | 789 | #: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 |
a0b6b246 JX |
790 | msgid "paths are separated with NUL character" |
791 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 792 | |
31e5e17b | 793 | #: apply.c:4959 |
a0b6b246 JX |
794 | msgid "ensure at least <n> lines of context match" |
795 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 796 | |
31e5e17b | 797 | #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 |
6937cb4e | 798 | #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 |
31e5e17b | 799 | #: builtin/pack-objects.c:3035 |
a0b6b246 JX |
800 | msgid "action" |
801 | msgstr "动作" | |
8ada9598 | 802 | |
31e5e17b | 803 | #: apply.c:4961 |
a0b6b246 JX |
804 | msgid "detect new or modified lines that have whitespace errors" |
805 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 806 | |
31e5e17b | 807 | #: apply.c:4964 apply.c:4967 |
a0b6b246 JX |
808 | msgid "ignore changes in whitespace when finding context" |
809 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 810 | |
31e5e17b | 811 | #: apply.c:4970 |
a0b6b246 JX |
812 | msgid "apply the patch in reverse" |
813 | msgstr "反向应用补丁" | |
8ada9598 | 814 | |
31e5e17b | 815 | #: apply.c:4972 |
a0b6b246 JX |
816 | msgid "don't expect at least one line of context" |
817 | msgstr "无需至少一行上下文" | |
8ada9598 | 818 | |
31e5e17b | 819 | #: apply.c:4974 |
a0b6b246 JX |
820 | msgid "leave the rejected hunks in corresponding *.rej files" |
821 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 822 | |
31e5e17b | 823 | #: apply.c:4976 |
a0b6b246 JX |
824 | msgid "allow overlapping hunks" |
825 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 826 | |
31e5e17b JX |
827 | #: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 |
828 | #: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 | |
829 | #: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 | |
a0b6b246 JX |
830 | msgid "be verbose" |
831 | msgstr "冗长输出" | |
8ada9598 | 832 | |
31e5e17b | 833 | #: apply.c:4979 |
a0b6b246 JX |
834 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
835 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 836 | |
31e5e17b | 837 | #: apply.c:4982 |
a0b6b246 JX |
838 | msgid "do not trust the line counts in the hunk headers" |
839 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 840 | |
31e5e17b | 841 | #: apply.c:4984 builtin/am.c:2251 |
a0b6b246 JX |
842 | msgid "root" |
843 | msgstr "根目录" | |
c04f5ac3 | 844 | |
31e5e17b | 845 | #: apply.c:4985 |
a0b6b246 JX |
846 | msgid "prepend <root> to all filenames" |
847 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 848 | |
a4f16749 | 849 | #: archive.c:13 |
a0b6b246 JX |
850 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
851 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 852 | |
a4f16749 | 853 | #: archive.c:14 |
a0b6b246 JX |
854 | msgid "git archive --list" |
855 | msgstr "git archive --list" | |
856 | ||
a4f16749 | 857 | #: archive.c:15 |
c04f5ac3 | 858 | msgid "" |
a0b6b246 | 859 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 860 | msgstr "" |
a0b6b246 | 861 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 862 | |
a4f16749 | 863 | #: archive.c:16 |
a0b6b246 JX |
864 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
865 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 866 | |
5809aa05 | 867 | #: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 |
c04f5ac3 | 868 | #, c-format |
a0b6b246 JX |
869 | msgid "pathspec '%s' did not match any files" |
870 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 871 | |
6937cb4e | 872 | #: archive.c:436 |
a0b6b246 JX |
873 | msgid "fmt" |
874 | msgstr "格式" | |
07432cef | 875 | |
6937cb4e | 876 | #: archive.c:436 |
a0b6b246 JX |
877 | msgid "archive format" |
878 | msgstr "归档格式" | |
7aea43ff | 879 | |
31e5e17b | 880 | #: archive.c:437 builtin/log.c:1462 |
a0b6b246 JX |
881 | msgid "prefix" |
882 | msgstr "前缀" | |
7aea43ff | 883 | |
6937cb4e | 884 | #: archive.c:438 |
a0b6b246 JX |
885 | msgid "prepend prefix to each pathname in the archive" |
886 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 887 | |
31e5e17b JX |
888 | #: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 |
889 | #: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 | |
890 | #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 | |
6937cb4e | 891 | #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 |
31e5e17b | 892 | #: parse-options.h:165 |
a0b6b246 JX |
893 | msgid "file" |
894 | msgstr "文件" | |
a77c07d9 | 895 | |
6937cb4e | 896 | #: archive.c:440 builtin/archive.c:89 |
a0b6b246 JX |
897 | msgid "write the archive to this file" |
898 | msgstr "归档写入此文件" | |
a77c07d9 | 899 | |
6937cb4e | 900 | #: archive.c:442 |
a0b6b246 JX |
901 | msgid "read .gitattributes in working directory" |
902 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 903 | |
6937cb4e | 904 | #: archive.c:443 |
a0b6b246 JX |
905 | msgid "report archived files on stderr" |
906 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 907 | |
6937cb4e | 908 | #: archive.c:444 |
a0b6b246 JX |
909 | msgid "store only" |
910 | msgstr "只存储" | |
7ac1c0ad | 911 | |
6937cb4e | 912 | #: archive.c:445 |
a0b6b246 JX |
913 | msgid "compress faster" |
914 | msgstr "压缩速度更快" | |
8ada9598 | 915 | |
6937cb4e | 916 | #: archive.c:453 |
a0b6b246 JX |
917 | msgid "compress better" |
918 | msgstr "压缩效果更好" | |
8ada9598 | 919 | |
6937cb4e | 920 | #: archive.c:456 |
a0b6b246 JX |
921 | msgid "list supported archive formats" |
922 | msgstr "列出支持的归档格式" | |
a77c07d9 | 923 | |
31e5e17b JX |
924 | #: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 |
925 | #: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 | |
a0b6b246 JX |
926 | msgid "repo" |
927 | msgstr "仓库" | |
c04f5ac3 | 928 | |
6937cb4e | 929 | #: archive.c:459 builtin/archive.c:91 |
a0b6b246 JX |
930 | msgid "retrieve the archive from remote repository <repo>" |
931 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 932 | |
6937cb4e | 933 | #: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 |
a0b6b246 JX |
934 | msgid "command" |
935 | msgstr "命令" | |
936 | ||
6937cb4e | 937 | #: archive.c:461 builtin/archive.c:93 |
a0b6b246 JX |
938 | msgid "path to the remote git-upload-archive command" |
939 | msgstr "远程 git-upload-archive 命令的路径" | |
940 | ||
6937cb4e | 941 | #: archive.c:468 |
a0b6b246 JX |
942 | msgid "Unexpected option --remote" |
943 | msgstr "未知参数 --remote" | |
944 | ||
6937cb4e | 945 | #: archive.c:470 |
a0b6b246 JX |
946 | msgid "Option --exec can only be used together with --remote" |
947 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
948 | ||
6937cb4e | 949 | #: archive.c:472 |
a0b6b246 JX |
950 | msgid "Unexpected option --output" |
951 | msgstr "未知参数 --output" | |
952 | ||
6937cb4e | 953 | #: archive.c:494 |
a0b6b246 JX |
954 | #, c-format |
955 | msgid "Unknown archive format '%s'" | |
956 | msgstr "未知归档格式 '%s'" | |
957 | ||
6937cb4e | 958 | #: archive.c:501 |
8ada9598 | 959 | #, c-format |
a0b6b246 JX |
960 | msgid "Argument not supported for format '%s': -%d" |
961 | msgstr "参数不支持此格式 '%s':-%d" | |
962 | ||
6937cb4e | 963 | #: attr.c:218 |
87cb7997 JX |
964 | #, c-format |
965 | msgid "%.*s is not a valid attribute name" | |
966 | msgstr "%.*s 不是一个有效的属性名" | |
967 | ||
6937cb4e | 968 | #: attr.c:415 |
8ada9598 | 969 | msgid "" |
a0b6b246 JX |
970 | "Negative patterns are ignored in git attributes\n" |
971 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 972 | msgstr "" |
a0b6b246 JX |
973 | "负值模版在 git attributes 中被忽略\n" |
974 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 975 | |
31e5e17b | 976 | #: bisect.c:460 |
8ada9598 | 977 | #, c-format |
a0b6b246 JX |
978 | msgid "Badly quoted content in file '%s': %s" |
979 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 980 | |
31e5e17b | 981 | #: bisect.c:668 |
a0b6b246 JX |
982 | #, c-format |
983 | msgid "We cannot bisect more!\n" | |
984 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 985 | |
31e5e17b | 986 | #: bisect.c:722 |
2e8451e8 | 987 | #, c-format |
a0b6b246 JX |
988 | msgid "Not a valid commit name %s" |
989 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 990 | |
31e5e17b | 991 | #: bisect.c:746 |
5b04ee3b JX |
992 | #, c-format |
993 | msgid "" | |
a0b6b246 JX |
994 | "The merge base %s is bad.\n" |
995 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 996 | msgstr "" |
a0b6b246 JX |
997 | "合并基线 %s 是坏的。\n" |
998 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 999 | |
31e5e17b | 1000 | #: bisect.c:751 |
5b04ee3b | 1001 | #, c-format |
a0b6b246 JX |
1002 | msgid "" |
1003 | "The merge base %s is new.\n" | |
1004 | "The property has changed between %s and [%s].\n" | |
1005 | msgstr "" | |
1006 | "合并基线 %s 是新的。\n" | |
1007 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1008 | |
31e5e17b | 1009 | #: bisect.c:756 |
a0b6b246 JX |
1010 | #, c-format |
1011 | msgid "" | |
1012 | "The merge base %s is %s.\n" | |
1013 | "This means the first '%s' commit is between %s and [%s].\n" | |
1014 | msgstr "" | |
1015 | "合并基线 %s 是 %s。\n" | |
1016 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1017 | |
31e5e17b | 1018 | #: bisect.c:764 |
a0b6b246 JX |
1019 | #, c-format |
1020 | msgid "" | |
1a79b2f1 | 1021 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1022 | "git bisect cannot work properly in this case.\n" |
1023 | "Maybe you mistook %s and %s revs?\n" | |
1024 | msgstr "" | |
1025 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1026 | "这种情况下 git 二分查找无法正常工作。\n" | |
1027 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1028 | |
31e5e17b | 1029 | #: bisect.c:777 |
a0b6b246 JX |
1030 | #, c-format |
1031 | msgid "" | |
1032 | "the merge base between %s and [%s] must be skipped.\n" | |
1033 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1034 | "We continue anyway." | |
1035 | msgstr "" | |
1036 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1037 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1038 | "我们仍旧继续。" | |
649900bc | 1039 | |
5809aa05 | 1040 | #: bisect.c:810 |
649900bc | 1041 | #, c-format |
a0b6b246 JX |
1042 | msgid "Bisecting: a merge base must be tested\n" |
1043 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1044 | |
31e5e17b | 1045 | #: bisect.c:850 |
a0b6b246 JX |
1046 | #, c-format |
1047 | msgid "a %s revision is needed" | |
1048 | msgstr "需要一个 %s 版本" | |
649900bc | 1049 | |
31e5e17b | 1050 | #: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 |
649900bc | 1051 | #, c-format |
a0b6b246 JX |
1052 | msgid "could not create file '%s'" |
1053 | msgstr "不能创建文件 '%s'" | |
649900bc | 1054 | |
31e5e17b | 1055 | #: bisect.c:920 |
649900bc | 1056 | #, c-format |
a0b6b246 JX |
1057 | msgid "could not read file '%s'" |
1058 | msgstr "不能读取文件 '%s'" | |
649900bc | 1059 | |
31e5e17b | 1060 | #: bisect.c:950 |
a0b6b246 JX |
1061 | msgid "reading bisect refs failed" |
1062 | msgstr "读取二分查找引用失败" | |
649900bc | 1063 | |
31e5e17b | 1064 | #: bisect.c:969 |
649900bc | 1065 | #, c-format |
a0b6b246 JX |
1066 | msgid "%s was both %s and %s\n" |
1067 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1068 | |
31e5e17b | 1069 | #: bisect.c:977 |
649900bc | 1070 | #, c-format |
a0b6b246 JX |
1071 | msgid "" |
1072 | "No testable commit found.\n" | |
1073 | "Maybe you started with bad path parameters?\n" | |
1074 | msgstr "" | |
1075 | "没有发现可测试的提交。\n" | |
1076 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1077 | |
31e5e17b | 1078 | #: bisect.c:996 |
649900bc | 1079 | #, c-format |
a0b6b246 JX |
1080 | msgid "(roughly %d step)" |
1081 | msgid_plural "(roughly %d steps)" | |
1082 | msgstr[0] "(大概 %d 步)" | |
1083 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1084 | |
a4f16749 JX |
1085 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1086 | #. steps)" translation. | |
1087 | #. | |
31e5e17b | 1088 | #: bisect.c:1002 |
649900bc | 1089 | #, c-format |
a0b6b246 JX |
1090 | msgid "Bisecting: %d revision left to test after this %s\n" |
1091 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1092 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1093 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1094 | |
31e5e17b | 1095 | #: blame.c:1758 |
a4f16749 JX |
1096 | msgid "--contents and --reverse do not blend well." |
1097 | msgstr "--contents 和 --reverse 不能混用。" | |
1098 | ||
31e5e17b | 1099 | #: blame.c:1769 |
a4f16749 JX |
1100 | msgid "cannot use --contents with final commit object name" |
1101 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1102 | ||
31e5e17b | 1103 | #: blame.c:1789 |
a4f16749 JX |
1104 | msgid "--reverse and --first-parent together require specified latest commit" |
1105 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1106 | ||
31e5e17b JX |
1107 | #: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 |
1108 | #: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 | |
1109 | #: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 | |
6937cb4e | 1110 | #: builtin/shortlog.c:191 |
a4f16749 JX |
1111 | msgid "revision walk setup failed" |
1112 | msgstr "版本遍历设置失败" | |
1113 | ||
31e5e17b | 1114 | #: blame.c:1816 |
a4f16749 JX |
1115 | msgid "" |
1116 | "--reverse --first-parent together require range along first-parent chain" | |
1117 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1118 | ||
31e5e17b | 1119 | #: blame.c:1827 |
a4f16749 JX |
1120 | #, c-format |
1121 | msgid "no such path %s in %s" | |
1122 | msgstr "在 %2$s 中无此路径 %1$s" | |
1123 | ||
31e5e17b | 1124 | #: blame.c:1838 |
a4f16749 JX |
1125 | #, c-format |
1126 | msgid "cannot read blob %s for path %s" | |
1127 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1128 | ||
a0b6b246 | 1129 | #: branch.c:53 |
649900bc | 1130 | #, c-format |
a0b6b246 JX |
1131 | msgid "" |
1132 | "\n" | |
1133 | "After fixing the error cause you may try to fix up\n" | |
1134 | "the remote tracking information by invoking\n" | |
1135 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1136 | msgstr "" | |
1137 | "\n" | |
1138 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1139 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1140 | |
a0b6b246 | 1141 | #: branch.c:67 |
649900bc | 1142 | #, c-format |
a0b6b246 JX |
1143 | msgid "Not setting branch %s as its own upstream." |
1144 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1145 | |
a0b6b246 | 1146 | #: branch.c:93 |
649900bc | 1147 | #, c-format |
6937cb4e JX |
1148 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1149 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1150 | |
a0b6b246 | 1151 | #: branch.c:94 |
649900bc | 1152 | #, c-format |
6937cb4e JX |
1153 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1154 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1155 | |
a0b6b246 | 1156 | #: branch.c:98 |
649900bc | 1157 | #, c-format |
6937cb4e JX |
1158 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1159 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1160 | |
a0b6b246 | 1161 | #: branch.c:99 |
649900bc | 1162 | #, c-format |
6937cb4e | 1163 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1164 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1165 | |
a0b6b246 | 1166 | #: branch.c:104 |
649900bc | 1167 | #, c-format |
6937cb4e JX |
1168 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1169 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1170 | |
a0b6b246 | 1171 | #: branch.c:105 |
649900bc | 1172 | #, c-format |
6937cb4e JX |
1173 | msgid "Branch '%s' set up to track remote ref '%s'." |
1174 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1175 | |
a0b6b246 | 1176 | #: branch.c:109 |
649900bc | 1177 | #, c-format |
6937cb4e JX |
1178 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1179 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1180 | |
a0b6b246 | 1181 | #: branch.c:110 |
649900bc | 1182 | #, c-format |
6937cb4e JX |
1183 | msgid "Branch '%s' set up to track local ref '%s'." |
1184 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1185 | |
a0b6b246 JX |
1186 | #: branch.c:119 |
1187 | msgid "Unable to write upstream branch configuration" | |
1188 | msgstr "无法写入上游分支配置" | |
649900bc | 1189 | |
a0b6b246 | 1190 | #: branch.c:156 |
649900bc | 1191 | #, c-format |
a0b6b246 JX |
1192 | msgid "Not tracking: ambiguous information for ref %s" |
1193 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1194 | |
5809aa05 | 1195 | #: branch.c:189 |
649900bc | 1196 | #, c-format |
a0b6b246 JX |
1197 | msgid "'%s' is not a valid branch name." |
1198 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1199 | |
5809aa05 | 1200 | #: branch.c:208 |
649900bc | 1201 | #, c-format |
a0b6b246 JX |
1202 | msgid "A branch named '%s' already exists." |
1203 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1204 | |
5809aa05 | 1205 | #: branch.c:213 |
a0b6b246 JX |
1206 | msgid "Cannot force update the current branch." |
1207 | msgstr "无法强制更新当前分支。" | |
649900bc | 1208 | |
5809aa05 | 1209 | #: branch.c:233 |
649900bc | 1210 | #, c-format |
a0b6b246 JX |
1211 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1212 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1213 | |
5809aa05 | 1214 | #: branch.c:235 |
649900bc | 1215 | #, c-format |
a0b6b246 JX |
1216 | msgid "the requested upstream branch '%s' does not exist" |
1217 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1218 | |
5809aa05 | 1219 | #: branch.c:237 |
a0b6b246 JX |
1220 | msgid "" |
1221 | "\n" | |
1222 | "If you are planning on basing your work on an upstream\n" | |
1223 | "branch that already exists at the remote, you may need to\n" | |
1224 | "run \"git fetch\" to retrieve it.\n" | |
1225 | "\n" | |
1226 | "If you are planning to push out a new local branch that\n" | |
1227 | "will track its remote counterpart, you may want to use\n" | |
1228 | "\"git push -u\" to set the upstream config as you push." | |
1229 | msgstr "" | |
1230 | "\n" | |
1231 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1232 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1233 | "\n" | |
1234 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1235 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1236 | |
5809aa05 | 1237 | #: branch.c:280 |
649900bc | 1238 | #, c-format |
a0b6b246 JX |
1239 | msgid "Not a valid object name: '%s'." |
1240 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1241 | |
5809aa05 | 1242 | #: branch.c:300 |
649900bc | 1243 | #, c-format |
a0b6b246 JX |
1244 | msgid "Ambiguous object name: '%s'." |
1245 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1246 | |
5809aa05 | 1247 | #: branch.c:305 |
649900bc | 1248 | #, c-format |
a0b6b246 JX |
1249 | msgid "Not a valid branch point: '%s'." |
1250 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1251 | |
5809aa05 | 1252 | #: branch.c:359 |
649900bc | 1253 | #, c-format |
a0b6b246 JX |
1254 | msgid "'%s' is already checked out at '%s'" |
1255 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1256 | |
5809aa05 | 1257 | #: branch.c:382 |
a0b6b246 JX |
1258 | #, c-format |
1259 | msgid "HEAD of working tree %s is not updated" | |
1260 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1261 | |
a0b6b246 | 1262 | #: bundle.c:34 |
649900bc | 1263 | #, c-format |
a0b6b246 JX |
1264 | msgid "'%s' does not look like a v2 bundle file" |
1265 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1266 | |
a4f16749 | 1267 | #: bundle.c:62 |
a0b6b246 JX |
1268 | #, c-format |
1269 | msgid "unrecognized header: %s%s (%d)" | |
1270 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1271 | |
31e5e17b | 1272 | #: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 |
649900bc | 1273 | #, c-format |
a0b6b246 JX |
1274 | msgid "could not open '%s'" |
1275 | msgstr "不能打开 '%s'" | |
649900bc | 1276 | |
31e5e17b | 1277 | #: bundle.c:139 |
a0b6b246 JX |
1278 | msgid "Repository lacks these prerequisite commits:" |
1279 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1280 | |
31e5e17b | 1281 | #: bundle.c:190 |
2e8451e8 | 1282 | #, c-format |
a0b6b246 JX |
1283 | msgid "The bundle contains this ref:" |
1284 | msgid_plural "The bundle contains these %d refs:" | |
1285 | msgstr[0] "这个包中含有这个引用:" | |
1286 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1287 | |
31e5e17b | 1288 | #: bundle.c:197 |
a0b6b246 JX |
1289 | msgid "The bundle records a complete history." |
1290 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1291 | |
31e5e17b | 1292 | #: bundle.c:199 |
2e8451e8 | 1293 | #, c-format |
a0b6b246 JX |
1294 | msgid "The bundle requires this ref:" |
1295 | msgid_plural "The bundle requires these %d refs:" | |
1296 | msgstr[0] "这个包需要这个引用:" | |
1297 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1298 | |
31e5e17b | 1299 | #: bundle.c:258 |
a0b6b246 JX |
1300 | msgid "Could not spawn pack-objects" |
1301 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1302 | |
31e5e17b | 1303 | #: bundle.c:269 |
a0b6b246 JX |
1304 | msgid "pack-objects died" |
1305 | msgstr "pack-objects 终止" | |
8ada9598 | 1306 | |
31e5e17b | 1307 | #: bundle.c:311 |
a0b6b246 JX |
1308 | msgid "rev-list died" |
1309 | msgstr "rev-list 终止" | |
1310 | ||
31e5e17b | 1311 | #: bundle.c:360 |
81809b99 | 1312 | #, c-format |
a0b6b246 JX |
1313 | msgid "ref '%s' is excluded by the rev-list options" |
1314 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1315 | |
31e5e17b | 1316 | #: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 |
81809b99 | 1317 | #, c-format |
a0b6b246 JX |
1318 | msgid "unrecognized argument: %s" |
1319 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1320 | |
31e5e17b | 1321 | #: bundle.c:458 |
a0b6b246 JX |
1322 | msgid "Refusing to create empty bundle." |
1323 | msgstr "不能创建空包。" | |
1324 | ||
31e5e17b | 1325 | #: bundle.c:470 |
81809b99 | 1326 | #, c-format |
a0b6b246 JX |
1327 | msgid "cannot create '%s'" |
1328 | msgstr "不能创建 '%s'" | |
8ada9598 | 1329 | |
31e5e17b | 1330 | #: bundle.c:498 |
a0b6b246 JX |
1331 | msgid "index-pack died" |
1332 | msgstr "index-pack 终止" | |
63af42fe | 1333 | |
31e5e17b | 1334 | #: color.c:296 |
94550ed3 | 1335 | #, c-format |
a0b6b246 JX |
1336 | msgid "invalid color value: %.*s" |
1337 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1338 | |
31e5e17b JX |
1339 | #: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 |
1340 | #: builtin/am.c:1436 builtin/am.c:2072 | |
94550ed3 | 1341 | #, c-format |
a0b6b246 JX |
1342 | msgid "could not parse %s" |
1343 | msgstr "不能解析 %s" | |
94550ed3 | 1344 | |
a4f16749 | 1345 | #: commit.c:43 |
a0b6b246 JX |
1346 | #, c-format |
1347 | msgid "%s %s is not a commit!" | |
31e5e17b | 1348 | msgstr "%s %s 不是一个提交!" |
90314792 | 1349 | |
31e5e17b | 1350 | #: commit.c:1506 |
90314792 | 1351 | msgid "" |
a0b6b246 JX |
1352 | "Warning: commit message did not conform to UTF-8.\n" |
1353 | "You may want to amend it after fixing the message, or set the config\n" | |
1354 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1355 | msgstr "" | |
29004bbb | 1356 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1357 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1358 | "设置为您项目所用的字符编码。\n" |
90314792 | 1359 | |
5809aa05 | 1360 | #: compat/obstack.c:405 compat/obstack.c:407 |
a0b6b246 JX |
1361 | msgid "memory exhausted" |
1362 | msgstr "内存耗尽" | |
90314792 | 1363 | |
5809aa05 | 1364 | #: config.c:186 |
87cb7997 JX |
1365 | msgid "relative config include conditionals must come from files" |
1366 | msgstr "包含相对路径的条件引用必须来自于文件" | |
1367 | ||
5809aa05 | 1368 | #: config.c:720 |
90314792 | 1369 | #, c-format |
a0b6b246 JX |
1370 | msgid "bad config line %d in blob %s" |
1371 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1372 | |
5809aa05 | 1373 | #: config.c:724 |
a77c07d9 | 1374 | #, c-format |
a0b6b246 JX |
1375 | msgid "bad config line %d in file %s" |
1376 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1377 | |
5809aa05 | 1378 | #: config.c:728 |
a77c07d9 | 1379 | #, c-format |
a0b6b246 JX |
1380 | msgid "bad config line %d in standard input" |
1381 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1382 | |
5809aa05 | 1383 | #: config.c:732 |
90314792 | 1384 | #, c-format |
a0b6b246 JX |
1385 | msgid "bad config line %d in submodule-blob %s" |
1386 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1387 | |
5809aa05 | 1388 | #: config.c:736 |
90314792 | 1389 | #, c-format |
a0b6b246 JX |
1390 | msgid "bad config line %d in command line %s" |
1391 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1392 | |
5809aa05 | 1393 | #: config.c:740 |
90314792 | 1394 | #, c-format |
a0b6b246 JX |
1395 | msgid "bad config line %d in %s" |
1396 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1397 | |
5809aa05 | 1398 | #: config.c:868 |
a0b6b246 JX |
1399 | msgid "out of range" |
1400 | msgstr "超出范围" | |
6c94aba5 | 1401 | |
5809aa05 | 1402 | #: config.c:868 |
a0b6b246 JX |
1403 | msgid "invalid unit" |
1404 | msgstr "无效的单位" | |
6c94aba5 | 1405 | |
5809aa05 | 1406 | #: config.c:874 |
6c94aba5 | 1407 | #, c-format |
a0b6b246 JX |
1408 | msgid "bad numeric config value '%s' for '%s': %s" |
1409 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1410 | |
5809aa05 | 1411 | #: config.c:879 |
1b7f4a34 | 1412 | #, c-format |
a0b6b246 JX |
1413 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1414 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1415 | |
5809aa05 | 1416 | #: config.c:882 |
1b7f4a34 | 1417 | #, c-format |
a0b6b246 JX |
1418 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1419 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1420 | |
5809aa05 | 1421 | #: config.c:885 |
1b7f4a34 | 1422 | #, c-format |
a0b6b246 JX |
1423 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1424 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1425 | |
5809aa05 | 1426 | #: config.c:888 |
1b7f4a34 | 1427 | #, c-format |
a0b6b246 JX |
1428 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1429 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1430 | |
5809aa05 | 1431 | #: config.c:891 |
94550ed3 | 1432 | #, c-format |
a0b6b246 JX |
1433 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1434 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1435 | |
5809aa05 | 1436 | #: config.c:894 |
276ceeaa | 1437 | #, c-format |
a0b6b246 JX |
1438 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1439 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1440 | |
5809aa05 | 1441 | #: config.c:989 |
276ceeaa | 1442 | #, c-format |
a0b6b246 JX |
1443 | msgid "failed to expand user dir in: '%s'" |
1444 | msgstr "无法扩展 '%s' 中的用户目录" | |
94550ed3 | 1445 | |
5809aa05 JX |
1446 | #: config.c:998 |
1447 | #, c-format | |
1448 | msgid "'%s' for '%s' is not a valid timestamp" | |
1449 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
1450 | ||
1451 | #: config.c:1094 config.c:1105 | |
3495628d | 1452 | #, c-format |
a0b6b246 JX |
1453 | msgid "bad zlib compression level %d" |
1454 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1455 | |
31e5e17b | 1456 | #: config.c:1225 |
3495628d | 1457 | #, c-format |
a0b6b246 JX |
1458 | msgid "invalid mode for object creation: %s" |
1459 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1460 | |
31e5e17b | 1461 | #: config.c:1386 |
1a79b2f1 JX |
1462 | #, c-format |
1463 | msgid "bad pack compression level %d" | |
1464 | msgstr "错误的打包压缩级别 %d" | |
1465 | ||
31e5e17b | 1466 | #: config.c:1582 |
a0b6b246 JX |
1467 | msgid "unable to parse command-line config" |
1468 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1469 | |
31e5e17b | 1470 | #: config.c:1914 |
a0b6b246 JX |
1471 | msgid "unknown error occurred while reading the configuration files" |
1472 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1473 | |
31e5e17b | 1474 | #: config.c:2101 |
87cb7997 JX |
1475 | #, c-format |
1476 | msgid "Invalid %s: '%s'" | |
1477 | msgstr "无效 %s:'%s'" | |
1478 | ||
31e5e17b | 1479 | #: config.c:2144 |
87cb7997 JX |
1480 | #, c-format |
1481 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1482 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1483 | ||
31e5e17b | 1484 | #: config.c:2170 |
87cb7997 JX |
1485 | #, c-format |
1486 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1487 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1488 | ||
31e5e17b | 1489 | #: config.c:2195 |
276ceeaa | 1490 | #, c-format |
a0b6b246 JX |
1491 | msgid "unable to parse '%s' from command-line config" |
1492 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1493 | |
31e5e17b | 1494 | #: config.c:2197 |
94550ed3 | 1495 | #, c-format |
a0b6b246 JX |
1496 | msgid "bad config variable '%s' in file '%s' at line %d" |
1497 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1498 | |
31e5e17b | 1499 | #: config.c:2256 |
276ceeaa | 1500 | #, c-format |
a0b6b246 JX |
1501 | msgid "%s has multiple values" |
1502 | msgstr "%s 有多个取值" | |
276ceeaa | 1503 | |
31e5e17b | 1504 | #: config.c:2599 config.c:2816 |
1a79b2f1 JX |
1505 | #, c-format |
1506 | msgid "fstat on %s failed" | |
65e2041e | 1507 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 1508 | |
31e5e17b | 1509 | #: config.c:2706 |
94550ed3 | 1510 | #, c-format |
a0b6b246 JX |
1511 | msgid "could not set '%s' to '%s'" |
1512 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1513 | |
31e5e17b | 1514 | #: config.c:2708 builtin/remote.c:776 |
276ceeaa | 1515 | #, c-format |
a0b6b246 JX |
1516 | msgid "could not unset '%s'" |
1517 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1518 | |
5809aa05 | 1519 | #: connect.c:52 |
a0b6b246 | 1520 | msgid "The remote end hung up upon initial contact" |
29004bbb | 1521 | msgstr "远端在连接发起时即挂断" |
94550ed3 | 1522 | |
5809aa05 | 1523 | #: connect.c:54 |
a0b6b246 JX |
1524 | msgid "" |
1525 | "Could not read from remote repository.\n" | |
1526 | "\n" | |
1527 | "Please make sure you have the correct access rights\n" | |
1528 | "and the repository exists." | |
1529 | msgstr "" | |
1530 | "无法读取远程仓库。\n" | |
1531 | "\n" | |
1532 | "请确认您有正确的访问权限并且仓库存在。" | |
1533 | ||
31e5e17b | 1534 | #: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 |
a0b6b246 JX |
1535 | msgid "Checking connectivity" |
1536 | msgstr "检查连接中" | |
1537 | ||
31e5e17b | 1538 | #: connected.c:78 |
a0b6b246 JX |
1539 | msgid "Could not run 'git rev-list'" |
1540 | msgstr "不能执行 'git rev-list'" | |
1541 | ||
31e5e17b | 1542 | #: connected.c:98 |
a0b6b246 JX |
1543 | msgid "failed write to rev-list" |
1544 | msgstr "无法写入 rev-list" | |
1545 | ||
31e5e17b | 1546 | #: connected.c:105 |
a0b6b246 JX |
1547 | msgid "failed to close rev-list's stdin" |
1548 | msgstr "无法关闭 rev-list 的标准输入" | |
1549 | ||
a4f16749 | 1550 | #: convert.c:205 |
3495628d | 1551 | #, c-format |
31e5e17b JX |
1552 | msgid "CRLF would be replaced by LF in %s." |
1553 | msgstr "文件 %s 中的 CRLF 将被 LF 替换。" | |
1554 | ||
1555 | #: convert.c:207 | |
1556 | #, c-format | |
a0b6b246 JX |
1557 | msgid "" |
1558 | "CRLF will be replaced by LF in %s.\n" | |
1559 | "The file will have its original line endings in your working directory." | |
1560 | msgstr "" | |
1561 | "文件 %s 中的 CRLF 将被 LF 替换。\n" | |
1562 | "在工作区中该文件仍保持原有的换行符。" | |
3495628d | 1563 | |
31e5e17b | 1564 | #: convert.c:215 |
3495628d | 1565 | #, c-format |
31e5e17b JX |
1566 | msgid "LF would be replaced by CRLF in %s" |
1567 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 1568 | |
31e5e17b | 1569 | #: convert.c:217 |
276ceeaa | 1570 | #, c-format |
a0b6b246 JX |
1571 | msgid "" |
1572 | "LF will be replaced by CRLF in %s.\n" | |
1573 | "The file will have its original line endings in your working directory." | |
1574 | msgstr "" | |
1575 | "文件 %s 中的 LF 将被 CRLF 替换。\n" | |
1576 | "在工作区中该文件仍保持原有的换行符。" | |
276ceeaa | 1577 | |
a4f16749 | 1578 | #: date.c:116 |
a0b6b246 JX |
1579 | msgid "in the future" |
1580 | msgstr "在将来" | |
3495628d | 1581 | |
a4f16749 | 1582 | #: date.c:122 |
3495628d | 1583 | #, c-format |
a4f16749 JX |
1584 | msgid "%<PRIuMAX> second ago" |
1585 | msgid_plural "%<PRIuMAX> seconds ago" | |
1586 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
1587 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 1588 | |
a4f16749 | 1589 | #: date.c:129 |
3495628d | 1590 | #, c-format |
a4f16749 JX |
1591 | msgid "%<PRIuMAX> minute ago" |
1592 | msgid_plural "%<PRIuMAX> minutes ago" | |
1593 | msgstr[0] "%<PRIuMAX> 分钟前" | |
1594 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 1595 | |
a4f16749 | 1596 | #: date.c:136 |
3495628d | 1597 | #, c-format |
a4f16749 JX |
1598 | msgid "%<PRIuMAX> hour ago" |
1599 | msgid_plural "%<PRIuMAX> hours ago" | |
1600 | msgstr[0] "%<PRIuMAX> 小时前" | |
1601 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 1602 | |
a4f16749 | 1603 | #: date.c:143 |
3495628d | 1604 | #, c-format |
a4f16749 JX |
1605 | msgid "%<PRIuMAX> day ago" |
1606 | msgid_plural "%<PRIuMAX> days ago" | |
1607 | msgstr[0] "%<PRIuMAX> 天前" | |
1608 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 1609 | |
a4f16749 | 1610 | #: date.c:149 |
94550ed3 | 1611 | #, c-format |
a4f16749 JX |
1612 | msgid "%<PRIuMAX> week ago" |
1613 | msgid_plural "%<PRIuMAX> weeks ago" | |
1614 | msgstr[0] "%<PRIuMAX> 周前" | |
1615 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 1616 | |
a4f16749 | 1617 | #: date.c:156 |
3495628d | 1618 | #, c-format |
a4f16749 JX |
1619 | msgid "%<PRIuMAX> month ago" |
1620 | msgid_plural "%<PRIuMAX> months ago" | |
1621 | msgstr[0] "%<PRIuMAX> 个月前" | |
1622 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 1623 | |
a4f16749 | 1624 | #: date.c:167 |
3495628d | 1625 | #, c-format |
a4f16749 JX |
1626 | msgid "%<PRIuMAX> year" |
1627 | msgid_plural "%<PRIuMAX> years" | |
1628 | msgstr[0] "%<PRIuMAX> 年" | |
1629 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 1630 | |
a0b6b246 | 1631 | #. TRANSLATORS: "%s" is "<n> years" |
a4f16749 | 1632 | #: date.c:170 |
94550ed3 | 1633 | #, c-format |
a4f16749 JX |
1634 | msgid "%s, %<PRIuMAX> month ago" |
1635 | msgid_plural "%s, %<PRIuMAX> months ago" | |
1636 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
1637 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 1638 | |
a4f16749 | 1639 | #: date.c:175 date.c:180 |
94550ed3 | 1640 | #, c-format |
a4f16749 JX |
1641 | msgid "%<PRIuMAX> year ago" |
1642 | msgid_plural "%<PRIuMAX> years ago" | |
1643 | msgstr[0] "%<PRIuMAX> 年前" | |
1644 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 1645 | |
a0b6b246 | 1646 | #: diffcore-order.c:24 |
cfff71a9 | 1647 | #, c-format |
a0b6b246 JX |
1648 | msgid "failed to read orderfile '%s'" |
1649 | msgstr "无法读取排序文件 '%s'" | |
cfff71a9 | 1650 | |
5809aa05 | 1651 | #: diffcore-rename.c:535 |
a0b6b246 | 1652 | msgid "Performing inexact rename detection" |
87cb7997 | 1653 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 1654 | |
6937cb4e | 1655 | #: diff.c:74 |
cfff71a9 | 1656 | #, c-format |
a0b6b246 JX |
1657 | msgid "option '%s' requires a value" |
1658 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 1659 | |
a0b6b246 | 1660 | # 译者:注意保持前导空格 |
6937cb4e | 1661 | #: diff.c:152 |
a0b6b246 JX |
1662 | #, c-format |
1663 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
1664 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 1665 | |
a0b6b246 | 1666 | # 译者:注意保持前导空格 |
6937cb4e | 1667 | #: diff.c:157 |
a0b6b246 JX |
1668 | #, c-format |
1669 | msgid " Unknown dirstat parameter '%s'\n" | |
1670 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 1671 | |
6937cb4e JX |
1672 | #: diff.c:281 |
1673 | msgid "" | |
1674 | "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " | |
1675 | "'plain'" | |
5809aa05 JX |
1676 | msgstr "" |
1677 | "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'" | |
6937cb4e JX |
1678 | |
1679 | #: diff.c:341 | |
7aea43ff | 1680 | #, c-format |
a0b6b246 JX |
1681 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
1682 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 1683 | |
5809aa05 | 1684 | #: diff.c:401 |
7aea43ff | 1685 | #, c-format |
a0b6b246 JX |
1686 | msgid "" |
1687 | "Found errors in 'diff.dirstat' config variable:\n" | |
1688 | "%s" | |
1689 | msgstr "" | |
1690 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
1691 | "%s" | |
7aea43ff | 1692 | |
31e5e17b | 1693 | #: diff.c:3822 |
7aea43ff | 1694 | #, c-format |
a0b6b246 JX |
1695 | msgid "external diff died, stopping at %s" |
1696 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 1697 | |
31e5e17b | 1698 | #: diff.c:4146 |
a0b6b246 JX |
1699 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
1700 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
1701 | ||
31e5e17b JX |
1702 | #: diff.c:4149 |
1703 | msgid "-G, -S and --find-object are mutually exclusive" | |
1704 | msgstr "-G、-S 和 --find-object 是互斥的" | |
1705 | ||
1706 | #: diff.c:4237 | |
a0b6b246 JX |
1707 | msgid "--follow requires exactly one pathspec" |
1708 | msgstr "--follow 明确要求只跟一个路径规格" | |
1709 | ||
31e5e17b | 1710 | #: diff.c:4403 |
7aea43ff | 1711 | #, c-format |
a0b6b246 JX |
1712 | msgid "" |
1713 | "Failed to parse --dirstat/-X option parameter:\n" | |
1714 | "%s" | |
1715 | msgstr "" | |
1716 | "无法解析 --dirstat/-X 选项的参数:\n" | |
1717 | "%s" | |
7aea43ff | 1718 | |
31e5e17b | 1719 | #: diff.c:4417 |
7aea43ff | 1720 | #, c-format |
a0b6b246 JX |
1721 | msgid "Failed to parse --submodule option parameter: '%s'" |
1722 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 1723 | |
31e5e17b | 1724 | #: diff.c:5493 |
a0b6b246 JX |
1725 | msgid "inexact rename detection was skipped due to too many files." |
1726 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
1727 | ||
31e5e17b | 1728 | #: diff.c:5496 |
a0b6b246 JX |
1729 | msgid "only found copies from modified paths due to too many files." |
1730 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
1731 | ||
31e5e17b | 1732 | #: diff.c:5499 |
7aea43ff | 1733 | #, c-format |
a0b6b246 JX |
1734 | msgid "" |
1735 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 1736 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 1737 | |
31e5e17b JX |
1738 | #: dir.c:1866 |
1739 | #, c-format | |
1740 | msgid "could not open directory '%s'" | |
1741 | msgstr "不能打开目录 '%s'" | |
1742 | ||
1743 | #: dir.c:2108 | |
a0b6b246 JX |
1744 | msgid "failed to get kernel name and information" |
1745 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 1746 | |
31e5e17b | 1747 | #: dir.c:2232 |
a0b6b246 JX |
1748 | msgid "Untracked cache is disabled on this system or location." |
1749 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 1750 | |
31e5e17b | 1751 | #: dir.c:3024 dir.c:3029 |
87cb7997 JX |
1752 | #, c-format |
1753 | msgid "could not create directories for %s" | |
1754 | msgstr "不能为 %s 创建目录" | |
1755 | ||
31e5e17b | 1756 | #: dir.c:3054 |
1a79b2f1 JX |
1757 | #, c-format |
1758 | msgid "could not migrate git directory from '%s' to '%s'" | |
1759 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
1760 | ||
5809aa05 JX |
1761 | #: editor.c:61 |
1762 | #, c-format | |
1763 | msgid "hint: Waiting for your editor to close the file...%c" | |
1764 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
1765 | ||
1766 | #: entry.c:177 | |
6937cb4e JX |
1767 | msgid "Filtering content" |
1768 | msgstr "过滤内容" | |
1769 | ||
5809aa05 | 1770 | #: entry.c:435 |
87cb7997 JX |
1771 | #, c-format |
1772 | msgid "could not stat file '%s'" | |
65e2041e | 1773 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 1774 | |
31e5e17b JX |
1775 | #: fetch-object.c:17 |
1776 | msgid "Remote with no URL" | |
1777 | msgstr "远程未设置 URL" | |
1778 | ||
1779 | #: fetch-pack.c:253 | |
a0b6b246 JX |
1780 | msgid "git fetch-pack: expected shallow list" |
1781 | msgstr "git fetch-pack:应为 shallow 列表" | |
1782 | ||
31e5e17b JX |
1783 | #: fetch-pack.c:265 |
1784 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" | |
1785 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 1786 | |
31e5e17b | 1787 | #: fetch-pack.c:284 builtin/archive.c:63 |
60638e98 JX |
1788 | #, c-format |
1789 | msgid "remote error: %s" | |
1790 | msgstr "远程错误:%s" | |
1791 | ||
31e5e17b | 1792 | #: fetch-pack.c:285 |
90314792 | 1793 | #, c-format |
275588f9 | 1794 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 1795 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 1796 | |
31e5e17b | 1797 | #: fetch-pack.c:337 |
a0b6b246 JX |
1798 | msgid "--stateless-rpc requires multi_ack_detailed" |
1799 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 1800 | |
31e5e17b | 1801 | #: fetch-pack.c:428 |
90314792 | 1802 | #, c-format |
a0b6b246 JX |
1803 | msgid "invalid shallow line: %s" |
1804 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 1805 | |
31e5e17b | 1806 | #: fetch-pack.c:434 |
c04f5ac3 | 1807 | #, c-format |
a0b6b246 JX |
1808 | msgid "invalid unshallow line: %s" |
1809 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 1810 | |
31e5e17b | 1811 | #: fetch-pack.c:436 |
a0b6b246 JX |
1812 | #, c-format |
1813 | msgid "object not found: %s" | |
1814 | msgstr "对象未找到:%s" | |
07432cef | 1815 | |
31e5e17b | 1816 | #: fetch-pack.c:439 |
c04f5ac3 | 1817 | #, c-format |
a0b6b246 JX |
1818 | msgid "error in object: %s" |
1819 | msgstr "对象中出错:%s" | |
07432cef | 1820 | |
31e5e17b | 1821 | #: fetch-pack.c:441 |
c04f5ac3 | 1822 | #, c-format |
a0b6b246 JX |
1823 | msgid "no shallow found: %s" |
1824 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 1825 | |
31e5e17b | 1826 | #: fetch-pack.c:444 |
a0b6b246 JX |
1827 | #, c-format |
1828 | msgid "expected shallow/unshallow, got %s" | |
1829 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 1830 | |
31e5e17b | 1831 | #: fetch-pack.c:485 |
a0b6b246 JX |
1832 | #, c-format |
1833 | msgid "got %s %d %s" | |
1834 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 1835 | |
31e5e17b | 1836 | #: fetch-pack.c:499 |
1b7f4a34 | 1837 | #, c-format |
a0b6b246 JX |
1838 | msgid "invalid commit %s" |
1839 | msgstr "无效提交 %s" | |
1b7f4a34 | 1840 | |
31e5e17b | 1841 | #: fetch-pack.c:532 |
a0b6b246 JX |
1842 | msgid "giving up" |
1843 | msgstr "放弃" | |
814ff314 | 1844 | |
31e5e17b | 1845 | #: fetch-pack.c:542 progress.c:229 |
a0b6b246 JX |
1846 | msgid "done" |
1847 | msgstr "完成" | |
2e8451e8 | 1848 | |
31e5e17b | 1849 | #: fetch-pack.c:554 |
2e8451e8 | 1850 | #, c-format |
a0b6b246 JX |
1851 | msgid "got %s (%d) %s" |
1852 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 1853 | |
31e5e17b | 1854 | #: fetch-pack.c:600 |
a0b6b246 JX |
1855 | #, c-format |
1856 | msgid "Marking %s as complete" | |
1857 | msgstr "标记 %s 为完成" | |
220c313c | 1858 | |
31e5e17b | 1859 | #: fetch-pack.c:788 |
a0b6b246 JX |
1860 | #, c-format |
1861 | msgid "already have %s (%s)" | |
29004bbb | 1862 | msgstr "已经有 %s(%s)" |
220c313c | 1863 | |
31e5e17b | 1864 | #: fetch-pack.c:829 |
a0b6b246 JX |
1865 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
1866 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 1867 | |
31e5e17b | 1868 | #: fetch-pack.c:837 |
a0b6b246 JX |
1869 | msgid "protocol error: bad pack header" |
1870 | msgstr "协议错误:坏的包头" | |
814ff314 | 1871 | |
31e5e17b | 1872 | #: fetch-pack.c:895 |
a0b6b246 JX |
1873 | #, c-format |
1874 | msgid "fetch-pack: unable to fork off %s" | |
1875 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 1876 | |
31e5e17b | 1877 | #: fetch-pack.c:911 |
a0b6b246 JX |
1878 | #, c-format |
1879 | msgid "%s failed" | |
1880 | msgstr "%s 失败" | |
14c8bced | 1881 | |
31e5e17b | 1882 | #: fetch-pack.c:913 |
a0b6b246 JX |
1883 | msgid "error in sideband demultiplexer" |
1884 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 1885 | |
31e5e17b | 1886 | #: fetch-pack.c:940 |
a0b6b246 JX |
1887 | msgid "Server does not support shallow clients" |
1888 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 1889 | |
31e5e17b | 1890 | #: fetch-pack.c:944 |
a0b6b246 JX |
1891 | msgid "Server supports multi_ack_detailed" |
1892 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 1893 | |
31e5e17b | 1894 | #: fetch-pack.c:947 |
a0b6b246 JX |
1895 | msgid "Server supports no-done" |
1896 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 1897 | |
31e5e17b | 1898 | #: fetch-pack.c:953 |
a0b6b246 JX |
1899 | msgid "Server supports multi_ack" |
1900 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 1901 | |
31e5e17b | 1902 | #: fetch-pack.c:957 |
a0b6b246 JX |
1903 | msgid "Server supports side-band-64k" |
1904 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 1905 | |
31e5e17b | 1906 | #: fetch-pack.c:961 |
a0b6b246 JX |
1907 | msgid "Server supports side-band" |
1908 | msgstr "服务器支持 side-band" | |
5c57d762 | 1909 | |
31e5e17b | 1910 | #: fetch-pack.c:965 |
a0b6b246 JX |
1911 | msgid "Server supports allow-tip-sha1-in-want" |
1912 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 1913 | |
31e5e17b | 1914 | #: fetch-pack.c:969 |
a0b6b246 JX |
1915 | msgid "Server supports allow-reachable-sha1-in-want" |
1916 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 1917 | |
31e5e17b | 1918 | #: fetch-pack.c:979 |
a0b6b246 JX |
1919 | msgid "Server supports ofs-delta" |
1920 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 1921 | |
31e5e17b JX |
1922 | #: fetch-pack.c:985 |
1923 | msgid "Server supports filter" | |
1924 | msgstr "服务器支持 filter" | |
1925 | ||
1926 | #: fetch-pack.c:993 | |
81809b99 | 1927 | #, c-format |
a0b6b246 JX |
1928 | msgid "Server version is %.*s" |
1929 | msgstr "服务器版本 %.*s" | |
8ada9598 | 1930 | |
31e5e17b | 1931 | #: fetch-pack.c:999 |
a0b6b246 JX |
1932 | msgid "Server does not support --shallow-since" |
1933 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 1934 | |
31e5e17b | 1935 | #: fetch-pack.c:1003 |
a0b6b246 JX |
1936 | msgid "Server does not support --shallow-exclude" |
1937 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 1938 | |
31e5e17b | 1939 | #: fetch-pack.c:1005 |
a0b6b246 JX |
1940 | msgid "Server does not support --deepen" |
1941 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 1942 | |
31e5e17b | 1943 | #: fetch-pack.c:1016 |
a0b6b246 JX |
1944 | msgid "no common commits" |
1945 | msgstr "没有共同的提交" | |
c04f5ac3 | 1946 | |
31e5e17b | 1947 | #: fetch-pack.c:1028 |
a0b6b246 JX |
1948 | msgid "git fetch-pack: fetch failed." |
1949 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 1950 | |
31e5e17b | 1951 | #: fetch-pack.c:1190 |
a0b6b246 JX |
1952 | msgid "no matching remote head" |
1953 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 1954 | |
31e5e17b | 1955 | #: fetch-pack.c:1212 |
87cb7997 JX |
1956 | #, c-format |
1957 | msgid "no such remote ref %s" | |
1958 | msgstr "没有这样的远程引用 %s" | |
1959 | ||
31e5e17b | 1960 | #: fetch-pack.c:1215 |
87cb7997 JX |
1961 | #, c-format |
1962 | msgid "Server does not allow request for unadvertised object %s" | |
1963 | msgstr "服务器不允许请求未公开的对象 %s" | |
1964 | ||
a4f16749 | 1965 | #: gpg-interface.c:181 |
a0b6b246 JX |
1966 | msgid "gpg failed to sign the data" |
1967 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 1968 | |
a4f16749 | 1969 | #: gpg-interface.c:211 |
a0b6b246 JX |
1970 | msgid "could not create temporary file" |
1971 | msgstr "不能创建临时文件" | |
c04f5ac3 | 1972 | |
6937cb4e | 1973 | #: gpg-interface.c:214 |
c04f5ac3 | 1974 | #, c-format |
a0b6b246 JX |
1975 | msgid "failed writing detached signature to '%s'" |
1976 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 1977 | |
a4f16749 | 1978 | #: graph.c:97 |
1a79b2f1 JX |
1979 | #, c-format |
1980 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
1981 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
1982 | ||
31e5e17b | 1983 | #: grep.c:2022 |
c04f5ac3 | 1984 | #, c-format |
a0b6b246 JX |
1985 | msgid "'%s': unable to read %s" |
1986 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 1987 | |
31e5e17b JX |
1988 | #: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 |
1989 | #: builtin/rm.c:134 | |
c04f5ac3 | 1990 | #, c-format |
a0b6b246 | 1991 | msgid "failed to stat '%s'" |
65e2041e | 1992 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 1993 | |
31e5e17b | 1994 | #: grep.c:2050 |
a0b6b246 JX |
1995 | #, c-format |
1996 | msgid "'%s': short read" | |
1997 | msgstr "'%s':读取不完整" | |
5c57d762 | 1998 | |
a4f16749 | 1999 | #: help.c:179 |
a0b6b246 JX |
2000 | #, c-format |
2001 | msgid "available git commands in '%s'" | |
2002 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 2003 | |
a4f16749 | 2004 | #: help.c:186 |
a0b6b246 JX |
2005 | msgid "git commands available from elsewhere on your $PATH" |
2006 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 2007 | |
a4f16749 | 2008 | #: help.c:217 |
a0b6b246 JX |
2009 | msgid "These are common Git commands used in various situations:" |
2010 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 2011 | |
a4f16749 | 2012 | #: help.c:281 |
c04f5ac3 | 2013 | #, c-format |
a0b6b246 JX |
2014 | msgid "" |
2015 | "'%s' appears to be a git command, but we were not\n" | |
2016 | "able to execute it. Maybe git-%s is broken?" | |
2017 | msgstr "" | |
2018 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
2019 | "可能是 git-%s 受损?" | |
c04f5ac3 | 2020 | |
a4f16749 | 2021 | #: help.c:336 |
a0b6b246 JX |
2022 | msgid "Uh oh. Your system reports no Git commands at all." |
2023 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 2024 | |
a4f16749 | 2025 | #: help.c:358 |
c04f5ac3 | 2026 | #, c-format |
a4f16749 | 2027 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 2028 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 JX |
2029 | |
2030 | #: help.c:363 | |
2031 | #, c-format | |
2032 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 2033 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 2034 | |
a4f16749 | 2035 | #: help.c:368 |
c04f5ac3 | 2036 | #, c-format |
a4f16749 | 2037 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 2038 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 2039 | |
a4f16749 | 2040 | #: help.c:376 |
c04f5ac3 | 2041 | #, c-format |
a0b6b246 JX |
2042 | msgid "git: '%s' is not a git command. See 'git --help'." |
2043 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 2044 | |
a4f16749 JX |
2045 | #: help.c:380 |
2046 | msgid "" | |
2047 | "\n" | |
2048 | "The most similar command is" | |
2049 | msgid_plural "" | |
2050 | "\n" | |
2051 | "The most similar commands are" | |
6937cb4e JX |
2052 | msgstr[0] "" |
2053 | "\n" | |
2054 | "最相似的命令是" | |
2055 | msgstr[1] "" | |
2056 | "\n" | |
2057 | "最相似的命令是" | |
a4f16749 JX |
2058 | |
2059 | #: help.c:395 | |
2060 | msgid "git version [<options>]" | |
2061 | msgstr "git version [<选项>]" | |
2062 | ||
5809aa05 | 2063 | #: help.c:462 |
a4f16749 JX |
2064 | #, c-format |
2065 | msgid "%s: %s - %s" | |
2066 | msgstr "%s:%s - %s" | |
2067 | ||
5809aa05 | 2068 | #: help.c:466 |
a0b6b246 JX |
2069 | msgid "" |
2070 | "\n" | |
2071 | "Did you mean this?" | |
2072 | msgid_plural "" | |
2073 | "\n" | |
2074 | "Did you mean one of these?" | |
2075 | msgstr[0] "" | |
2076 | "\n" | |
2077 | "您指的是这个么?" | |
2078 | msgstr[1] "" | |
2079 | "\n" | |
2080 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 2081 | |
a4f16749 | 2082 | #: ident.c:342 |
a0b6b246 JX |
2083 | msgid "" |
2084 | "\n" | |
2085 | "*** Please tell me who you are.\n" | |
2086 | "\n" | |
2087 | "Run\n" | |
2088 | "\n" | |
2089 | " git config --global user.email \"you@example.com\"\n" | |
2090 | " git config --global user.name \"Your Name\"\n" | |
2091 | "\n" | |
2092 | "to set your account's default identity.\n" | |
2093 | "Omit --global to set the identity only in this repository.\n" | |
2094 | "\n" | |
2095 | msgstr "" | |
2096 | "\n" | |
2097 | "*** 请告诉我你是谁。\n" | |
2098 | "\n" | |
2099 | "运行\n" | |
2100 | "\n" | |
2101 | " git config --global user.email \"you@example.com\"\n" | |
2102 | " git config --global user.name \"Your Name\"\n" | |
2103 | "\n" | |
2104 | "来设置您账号的缺省身份标识。\n" | |
2105 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 2106 | |
a4f16749 | 2107 | #: ident.c:366 |
87cb7997 | 2108 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 2109 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 2110 | |
a4f16749 | 2111 | #: ident.c:371 |
87cb7997 JX |
2112 | #, c-format |
2113 | msgid "unable to auto-detect email address (got '%s')" | |
2114 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
2115 | ||
a4f16749 | 2116 | #: ident.c:381 |
87cb7997 JX |
2117 | msgid "no name was given and auto-detection is disabled" |
2118 | msgstr "未提供姓名且自动探测被禁用" | |
2119 | ||
a4f16749 | 2120 | #: ident.c:387 |
87cb7997 JX |
2121 | #, c-format |
2122 | msgid "unable to auto-detect name (got '%s')" | |
2123 | msgstr "无法自动探测姓名(得到 '%s')" | |
2124 | ||
a4f16749 | 2125 | #: ident.c:395 |
87cb7997 JX |
2126 | #, c-format |
2127 | msgid "empty ident name (for <%s>) not allowed" | |
2128 | msgstr "不允许空的姓名(对于 <%s>)" | |
2129 | ||
a4f16749 | 2130 | #: ident.c:401 |
87cb7997 JX |
2131 | #, c-format |
2132 | msgid "name consists only of disallowed characters: %s" | |
2133 | msgstr "姓名中仅包含禁用字符:%s" | |
2134 | ||
31e5e17b | 2135 | #: ident.c:416 builtin/commit.c:582 |
87cb7997 JX |
2136 | #, c-format |
2137 | msgid "invalid date format: %s" | |
2138 | msgstr "无效的日期格式:%s" | |
2139 | ||
31e5e17b JX |
2140 | #: list-objects-filter-options.c:36 |
2141 | msgid "multiple filter-specs cannot be combined" | |
2142 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 2143 | |
31e5e17b JX |
2144 | #: list-objects-filter-options.c:126 |
2145 | msgid "cannot change partial clone promisor remote" | |
2146 | msgstr "无法修改部分克隆的 promisor 远程仓库" | |
5809aa05 | 2147 | |
6937cb4e | 2148 | #: lockfile.c:151 |
c04f5ac3 | 2149 | #, c-format |
a0b6b246 JX |
2150 | msgid "" |
2151 | "Unable to create '%s.lock': %s.\n" | |
2152 | "\n" | |
2153 | "Another git process seems to be running in this repository, e.g.\n" | |
2154 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2155 | "are terminated then try again. If it still fails, a git process\n" | |
2156 | "may have crashed in this repository earlier:\n" | |
2157 | "remove the file manually to continue." | |
2158 | msgstr "" | |
2159 | "无法创建 '%s.lock':%s。\n" | |
2160 | "\n" | |
2161 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
2162 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
2163 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
2164 | "手动删除这个文件再继续。" | |
c04f5ac3 | 2165 | |
6937cb4e | 2166 | #: lockfile.c:159 |
a0b6b246 JX |
2167 | #, c-format |
2168 | msgid "Unable to create '%s.lock': %s" | |
2169 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 2170 | |
5809aa05 | 2171 | #: merge.c:74 |
a0b6b246 JX |
2172 | msgid "failed to read the cache" |
2173 | msgstr "无法读取缓存" | |
c04f5ac3 | 2174 | |
31e5e17b JX |
2175 | #: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 |
2176 | #: builtin/checkout.c:599 builtin/clone.c:759 | |
a0b6b246 JX |
2177 | msgid "unable to write new index file" |
2178 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 2179 | |
6937cb4e | 2180 | #: merge-recursive.c:235 |
a0b6b246 JX |
2181 | msgid "(bad commit)\n" |
2182 | msgstr "(坏提交)\n" | |
c04f5ac3 | 2183 | |
6937cb4e | 2184 | #: merge-recursive.c:257 merge-recursive.c:265 |
a0b6b246 JX |
2185 | #, c-format |
2186 | msgid "addinfo_cache failed for path '%s'" | |
2187 | msgstr "为路径 '%s' addinfo_cache 失败" | |
c04f5ac3 | 2188 | |
6937cb4e | 2189 | #: merge-recursive.c:329 |
a0b6b246 JX |
2190 | msgid "error building trees" |
2191 | msgstr "无法创建树" | |
c04f5ac3 | 2192 | |
31e5e17b | 2193 | #: merge-recursive.c:771 |
c04f5ac3 | 2194 | #, c-format |
a0b6b246 JX |
2195 | msgid "failed to create path '%s'%s" |
2196 | msgstr "无法创建路径 '%s'%s" | |
c04f5ac3 | 2197 | |
31e5e17b | 2198 | #: merge-recursive.c:782 |
c04f5ac3 | 2199 | #, c-format |
a0b6b246 JX |
2200 | msgid "Removing %s to make room for subdirectory\n" |
2201 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 2202 | |
31e5e17b | 2203 | #: merge-recursive.c:796 merge-recursive.c:815 |
a0b6b246 JX |
2204 | msgid ": perhaps a D/F conflict?" |
2205 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 2206 | |
31e5e17b | 2207 | #: merge-recursive.c:805 |
c04f5ac3 | 2208 | #, c-format |
a0b6b246 JX |
2209 | msgid "refusing to lose untracked file at '%s'" |
2210 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2211 | |
31e5e17b | 2212 | #: merge-recursive.c:847 builtin/cat-file.c:37 |
c04f5ac3 | 2213 | #, c-format |
a0b6b246 JX |
2214 | msgid "cannot read object %s '%s'" |
2215 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2216 | |
31e5e17b | 2217 | #: merge-recursive.c:849 |
4dcdc3d8 | 2218 | #, c-format |
a0b6b246 JX |
2219 | msgid "blob expected for %s '%s'" |
2220 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 2221 | |
31e5e17b | 2222 | #: merge-recursive.c:873 |
4dcdc3d8 | 2223 | #, c-format |
a0b6b246 JX |
2224 | msgid "failed to open '%s': %s" |
2225 | msgstr "无法打开 '%s':%s" | |
4dcdc3d8 | 2226 | |
31e5e17b | 2227 | #: merge-recursive.c:884 |
a0b6b246 JX |
2228 | #, c-format |
2229 | msgid "failed to symlink '%s': %s" | |
2230 | msgstr "无法创建符号链接 '%s':%s" | |
c04f5ac3 | 2231 | |
31e5e17b | 2232 | #: merge-recursive.c:889 |
5c57d762 | 2233 | #, c-format |
a0b6b246 JX |
2234 | msgid "do not know what to do with %06o %s '%s'" |
2235 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 2236 | |
31e5e17b | 2237 | #: merge-recursive.c:1029 |
a0b6b246 JX |
2238 | msgid "Failed to execute internal merge" |
2239 | msgstr "无法执行内部合并" | |
2240 | ||
31e5e17b | 2241 | #: merge-recursive.c:1034 |
5c57d762 | 2242 | #, c-format |
a0b6b246 JX |
2243 | msgid "Unable to add %s to database" |
2244 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 2245 | |
31e5e17b | 2246 | #: merge-recursive.c:1146 |
5c57d762 JX |
2247 | #, c-format |
2248 | msgid "" | |
a0b6b246 JX |
2249 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
2250 | "in tree." | |
5c57d762 | 2251 | msgstr "" |
87cb7997 JX |
2252 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2253 | "本被保留。" | |
2254 | ||
31e5e17b | 2255 | #: merge-recursive.c:1151 |
87cb7997 JX |
2256 | #, c-format |
2257 | msgid "" | |
2258 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2259 | "left in tree." | |
2260 | msgstr "" | |
2261 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2262 | "%7$s 版本被保留。" | |
c04f5ac3 | 2263 | |
31e5e17b | 2264 | #: merge-recursive.c:1158 |
7aea43ff | 2265 | #, c-format |
a0b6b246 JX |
2266 | msgid "" |
2267 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2268 | "in tree at %s." | |
2269 | msgstr "" | |
87cb7997 JX |
2270 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2271 | "本保留在 %8$s 中。" | |
7aea43ff | 2272 | |
31e5e17b | 2273 | #: merge-recursive.c:1163 |
87cb7997 JX |
2274 | #, c-format |
2275 | msgid "" | |
2276 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2277 | "left in tree at %s." | |
2278 | msgstr "" | |
2279 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2280 | "%7$s 版本保留在 %9$s 中。" | |
2281 | ||
31e5e17b | 2282 | #: merge-recursive.c:1197 |
a0b6b246 JX |
2283 | msgid "rename" |
2284 | msgstr "重命名" | |
5b04ee3b | 2285 | |
31e5e17b | 2286 | #: merge-recursive.c:1197 |
a0b6b246 JX |
2287 | msgid "renamed" |
2288 | msgstr "重命名" | |
5b04ee3b | 2289 | |
31e5e17b | 2290 | #: merge-recursive.c:1254 |
5c57d762 | 2291 | #, c-format |
a0b6b246 JX |
2292 | msgid "%s is a directory in %s adding as %s instead" |
2293 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 2294 | |
31e5e17b | 2295 | #: merge-recursive.c:1279 |
5c57d762 JX |
2296 | #, c-format |
2297 | msgid "" | |
a0b6b246 JX |
2298 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
2299 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 2300 | msgstr "" |
a0b6b246 JX |
2301 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
2302 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 2303 | |
31e5e17b | 2304 | #: merge-recursive.c:1284 |
a0b6b246 JX |
2305 | msgid " (left unresolved)" |
2306 | msgstr "(留下未解决)" | |
5c57d762 | 2307 | |
31e5e17b | 2308 | #: merge-recursive.c:1346 |
5c57d762 | 2309 | #, c-format |
a0b6b246 | 2310 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 2311 | msgstr "" |
a0b6b246 JX |
2312 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
2313 | "%5$s" | |
3495628d | 2314 | |
31e5e17b | 2315 | #: merge-recursive.c:1379 |
3495628d | 2316 | #, c-format |
a0b6b246 JX |
2317 | msgid "Renaming %s to %s and %s to %s instead" |
2318 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" | |
3495628d | 2319 | |
31e5e17b | 2320 | #: merge-recursive.c:1582 |
3495628d | 2321 | #, c-format |
a0b6b246 JX |
2322 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
2323 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 2324 | |
31e5e17b | 2325 | #: merge-recursive.c:1597 |
a0b6b246 JX |
2326 | #, c-format |
2327 | msgid "Adding merged %s" | |
2328 | msgstr "添加合并后的 %s" | |
90314792 | 2329 | |
31e5e17b | 2330 | #: merge-recursive.c:1604 merge-recursive.c:1834 |
90314792 | 2331 | #, c-format |
a0b6b246 JX |
2332 | msgid "Adding as %s instead" |
2333 | msgstr "而是以 %s 为名添加" | |
90314792 | 2334 | |
31e5e17b | 2335 | #: merge-recursive.c:1661 |
90314792 | 2336 | #, c-format |
a0b6b246 JX |
2337 | msgid "cannot read object %s" |
2338 | msgstr "不能读取对象 %s" | |
90314792 | 2339 | |
31e5e17b | 2340 | #: merge-recursive.c:1664 |
90314792 | 2341 | #, c-format |
a0b6b246 JX |
2342 | msgid "object %s is not a blob" |
2343 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 2344 | |
31e5e17b | 2345 | #: merge-recursive.c:1733 |
a0b6b246 JX |
2346 | msgid "modify" |
2347 | msgstr "修改" | |
90314792 | 2348 | |
31e5e17b | 2349 | #: merge-recursive.c:1733 |
a0b6b246 JX |
2350 | msgid "modified" |
2351 | msgstr "修改" | |
5b04ee3b | 2352 | |
31e5e17b | 2353 | #: merge-recursive.c:1743 |
a0b6b246 JX |
2354 | msgid "content" |
2355 | msgstr "内容" | |
5b04ee3b | 2356 | |
31e5e17b | 2357 | #: merge-recursive.c:1750 |
a0b6b246 JX |
2358 | msgid "add/add" |
2359 | msgstr "添加/添加" | |
3495628d | 2360 | |
31e5e17b | 2361 | #: merge-recursive.c:1786 |
220c313c | 2362 | #, c-format |
a0b6b246 JX |
2363 | msgid "Skipped %s (merged same as existing)" |
2364 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 2365 | |
31e5e17b | 2366 | #: merge-recursive.c:1800 |
220c313c | 2367 | #, c-format |
a0b6b246 JX |
2368 | msgid "Auto-merging %s" |
2369 | msgstr "自动合并 %s" | |
220c313c | 2370 | |
31e5e17b | 2371 | #: merge-recursive.c:1804 git-submodule.sh:879 |
a0b6b246 JX |
2372 | msgid "submodule" |
2373 | msgstr "子模组" | |
2374 | ||
31e5e17b | 2375 | #: merge-recursive.c:1805 |
220c313c | 2376 | #, c-format |
a0b6b246 JX |
2377 | msgid "CONFLICT (%s): Merge conflict in %s" |
2378 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 2379 | |
31e5e17b | 2380 | #: merge-recursive.c:1899 |
220c313c | 2381 | #, c-format |
a0b6b246 JX |
2382 | msgid "Removing %s" |
2383 | msgstr "删除 %s" | |
220c313c | 2384 | |
31e5e17b | 2385 | #: merge-recursive.c:1925 |
a0b6b246 JX |
2386 | msgid "file/directory" |
2387 | msgstr "文件/目录" | |
220c313c | 2388 | |
31e5e17b | 2389 | #: merge-recursive.c:1931 |
a0b6b246 JX |
2390 | msgid "directory/file" |
2391 | msgstr "目录/文件" | |
276ceeaa | 2392 | |
31e5e17b | 2393 | #: merge-recursive.c:1938 |
276ceeaa | 2394 | #, c-format |
a0b6b246 JX |
2395 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
2396 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 2397 | |
31e5e17b | 2398 | #: merge-recursive.c:1947 |
276ceeaa | 2399 | #, c-format |
a0b6b246 JX |
2400 | msgid "Adding %s" |
2401 | msgstr "添加 %s" | |
276ceeaa | 2402 | |
31e5e17b | 2403 | #: merge-recursive.c:1987 |
5809aa05 JX |
2404 | #, c-format |
2405 | msgid "Dirty index: cannot merge (dirty: %s)" | |
2406 | msgstr "脏索引:不能合并(脏文件:%s)" | |
2407 | ||
31e5e17b | 2408 | #: merge-recursive.c:1991 |
6937cb4e | 2409 | msgid "Already up to date!" |
a0b6b246 | 2410 | msgstr "已经是最新的!" |
276ceeaa | 2411 | |
31e5e17b | 2412 | #: merge-recursive.c:2000 |
276ceeaa | 2413 | #, c-format |
a0b6b246 JX |
2414 | msgid "merging of trees %s and %s failed" |
2415 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 2416 | |
31e5e17b | 2417 | #: merge-recursive.c:2097 |
a0b6b246 JX |
2418 | msgid "Merging:" |
2419 | msgstr "合并:" | |
5c57d762 | 2420 | |
31e5e17b | 2421 | #: merge-recursive.c:2110 |
5c57d762 | 2422 | #, c-format |
a0b6b246 JX |
2423 | msgid "found %u common ancestor:" |
2424 | msgid_plural "found %u common ancestors:" | |
2425 | msgstr[0] "发现 %u 个共同祖先:" | |
2426 | msgstr[1] "发现 %u 个共同祖先:" | |
2427 | ||
31e5e17b | 2428 | #: merge-recursive.c:2149 |
a0b6b246 JX |
2429 | msgid "merge returned no commit" |
2430 | msgstr "合并未返回提交" | |
2431 | ||
31e5e17b | 2432 | #: merge-recursive.c:2212 |
5c57d762 | 2433 | #, c-format |
a0b6b246 JX |
2434 | msgid "Could not parse object '%s'" |
2435 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 2436 | |
31e5e17b | 2437 | #: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 |
a0b6b246 JX |
2438 | msgid "Unable to write index." |
2439 | msgstr "不能写入索引。" | |
2440 | ||
6937cb4e | 2441 | #: notes-merge.c:272 |
5c57d762 JX |
2442 | #, c-format |
2443 | msgid "" | |
a0b6b246 JX |
2444 | "You have not concluded your previous notes merge (%s exists).\n" |
2445 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
2446 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 2447 | msgstr "" |
29004bbb | 2448 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
2449 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
2450 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 2451 | |
6937cb4e | 2452 | #: notes-merge.c:279 |
a0b6b246 JX |
2453 | #, c-format |
2454 | msgid "You have not concluded your notes merge (%s exists)." | |
2455 | msgstr "您尚未结束注释合并(存在 %s)。" | |
2456 | ||
31e5e17b | 2457 | #: notes-utils.c:43 |
a0b6b246 JX |
2458 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
2459 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 2460 | |
31e5e17b | 2461 | #: notes-utils.c:102 |
1b7f4a34 | 2462 | #, c-format |
a0b6b246 JX |
2463 | msgid "Bad notes.rewriteMode value: '%s'" |
2464 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 2465 | |
31e5e17b | 2466 | #: notes-utils.c:112 |
5b04ee3b | 2467 | #, c-format |
a0b6b246 JX |
2468 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
2469 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 2470 | |
a4f16749 JX |
2471 | #. TRANSLATORS: The first %s is the name of |
2472 | #. the environment variable, the second %s is | |
2473 | #. its value. | |
2474 | #. | |
31e5e17b | 2475 | #: notes-utils.c:142 |
5b04ee3b | 2476 | #, c-format |
a0b6b246 JX |
2477 | msgid "Bad %s value: '%s'" |
2478 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 2479 | |
6937cb4e | 2480 | #: object.c:239 |
5b04ee3b | 2481 | #, c-format |
a0b6b246 JX |
2482 | msgid "unable to parse object: %s" |
2483 | msgstr "不能解析对象:%s" | |
5b04ee3b | 2484 | |
31e5e17b | 2485 | #: packfile.c:561 |
6937cb4e JX |
2486 | msgid "offset before end of packfile (broken .idx?)" |
2487 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
2488 | ||
31e5e17b | 2489 | #: packfile.c:1694 |
6937cb4e JX |
2490 | #, c-format |
2491 | msgid "offset before start of pack index for %s (corrupt index?)" | |
2492 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
2493 | ||
31e5e17b | 2494 | #: packfile.c:1698 |
6937cb4e JX |
2495 | #, c-format |
2496 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
2497 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
2498 | ||
31e5e17b | 2499 | #: parse-options.c:619 |
a0b6b246 JX |
2500 | msgid "..." |
2501 | msgstr "..." | |
2502 | ||
31e5e17b | 2503 | #: parse-options.c:638 |
5b04ee3b | 2504 | #, c-format |
a0b6b246 JX |
2505 | msgid "usage: %s" |
2506 | msgstr "用法:%s" | |
5b04ee3b | 2507 | |
a0b6b246 | 2508 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
2509 | #. one in "usage: %s" translation. |
2510 | #. | |
31e5e17b | 2511 | #: parse-options.c:644 |
5b04ee3b | 2512 | #, c-format |
a0b6b246 JX |
2513 | msgid " or: %s" |
2514 | msgstr " 或:%s" | |
5b04ee3b | 2515 | |
a0b6b246 | 2516 | # 译者:为保证在输出中对齐,注意调整句中空格! |
31e5e17b | 2517 | #: parse-options.c:647 |
5b04ee3b | 2518 | #, c-format |
a0b6b246 JX |
2519 | msgid " %s" |
2520 | msgstr " %s" | |
5b04ee3b | 2521 | |
31e5e17b | 2522 | #: parse-options.c:686 |
a0b6b246 JX |
2523 | msgid "-NUM" |
2524 | msgstr "-数字" | |
2525 | ||
2526 | #: parse-options-cb.c:108 | |
5b04ee3b | 2527 | #, c-format |
a0b6b246 JX |
2528 | msgid "malformed object name '%s'" |
2529 | msgstr "非法的对象名 '%s'" | |
5b04ee3b | 2530 | |
6937cb4e | 2531 | #: path.c:891 |
5b04ee3b | 2532 | #, c-format |
a0b6b246 JX |
2533 | msgid "Could not make %s writable by group" |
2534 | msgstr "不能设置 %s 为组可写" | |
2535 | ||
a4f16749 | 2536 | #: pathspec.c:129 |
87cb7997 JX |
2537 | msgid "Escape character '\\' not allowed as last character in attr value" |
2538 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
2539 | ||
a4f16749 | 2540 | #: pathspec.c:147 |
87cb7997 JX |
2541 | msgid "Only one 'attr:' specification is allowed." |
2542 | msgstr "只允许一个 'attr:' 规格。" | |
2543 | ||
a4f16749 | 2544 | #: pathspec.c:150 |
87cb7997 JX |
2545 | msgid "attr spec must not be empty" |
2546 | msgstr "属性规格不能为空" | |
2547 | ||
a4f16749 | 2548 | #: pathspec.c:193 |
87cb7997 JX |
2549 | #, c-format |
2550 | msgid "invalid attribute name %s" | |
2551 | msgstr "无效的属性名 %s" | |
2552 | ||
a4f16749 | 2553 | #: pathspec.c:258 |
a0b6b246 JX |
2554 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
2555 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
2556 | ||
a4f16749 | 2557 | #: pathspec.c:265 |
5b04ee3b | 2558 | msgid "" |
a0b6b246 JX |
2559 | "global 'literal' pathspec setting is incompatible with all other global " |
2560 | "pathspec settings" | |
2561 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 2562 | |
a4f16749 | 2563 | #: pathspec.c:305 |
a0b6b246 JX |
2564 | msgid "invalid parameter for pathspec magic 'prefix'" |
2565 | msgstr "路径规格包含无效的神奇前缀" | |
2566 | ||
a4f16749 | 2567 | #: pathspec.c:326 |
5b04ee3b | 2568 | #, c-format |
a0b6b246 JX |
2569 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
2570 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 2571 | |
a4f16749 | 2572 | #: pathspec.c:331 |
5b04ee3b | 2573 | #, c-format |
a0b6b246 JX |
2574 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
2575 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 2576 | |
a4f16749 | 2577 | #: pathspec.c:369 |
5b04ee3b | 2578 | #, c-format |
a0b6b246 JX |
2579 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
2580 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 2581 | |
a4f16749 | 2582 | #: pathspec.c:428 |
5b04ee3b | 2583 | #, c-format |
a0b6b246 JX |
2584 | msgid "%s: 'literal' and 'glob' are incompatible" |
2585 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 2586 | |
a4f16749 | 2587 | #: pathspec.c:441 |
5b04ee3b | 2588 | #, c-format |
a0b6b246 JX |
2589 | msgid "%s: '%s' is outside repository" |
2590 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 2591 | |
a4f16749 | 2592 | #: pathspec.c:515 |
5b04ee3b | 2593 | #, c-format |
1a79b2f1 JX |
2594 | msgid "'%s' (mnemonic: '%c')" |
2595 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 2596 | |
a4f16749 | 2597 | #: pathspec.c:525 |
5b04ee3b | 2598 | #, c-format |
a0b6b246 JX |
2599 | msgid "%s: pathspec magic not supported by this command: %s" |
2600 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
2601 | ||
5809aa05 | 2602 | #: pathspec.c:592 |
5b04ee3b | 2603 | #, c-format |
a0b6b246 JX |
2604 | msgid "pathspec '%s' is beyond a symbolic link" |
2605 | msgstr "路径规格 '%s' 位于符号链接中" | |
2606 | ||
6937cb4e | 2607 | #: pretty.c:962 |
a0b6b246 JX |
2608 | msgid "unable to parse --pretty format" |
2609 | msgstr "不能解析 --pretty 格式" | |
2610 | ||
31e5e17b | 2611 | #: read-cache.c:1473 |
5b04ee3b JX |
2612 | #, c-format |
2613 | msgid "" | |
a0b6b246 JX |
2614 | "index.version set, but the value is invalid.\n" |
2615 | "Using version %i" | |
5b04ee3b | 2616 | msgstr "" |
a0b6b246 JX |
2617 | "设置了 index.version,但是取值无效。\n" |
2618 | "使用版本 %i" | |
5b04ee3b | 2619 | |
31e5e17b | 2620 | #: read-cache.c:1483 |
5b04ee3b JX |
2621 | #, c-format |
2622 | msgid "" | |
a0b6b246 JX |
2623 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
2624 | "Using version %i" | |
5b04ee3b | 2625 | msgstr "" |
a0b6b246 JX |
2626 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
2627 | "使用版本 %i" | |
5b04ee3b | 2628 | |
31e5e17b | 2629 | #: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 |
a4f16749 JX |
2630 | #, c-format |
2631 | msgid "could not close '%s'" | |
2632 | msgstr "不能关闭 '%s'" | |
2633 | ||
31e5e17b | 2634 | #: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 |
87cb7997 | 2635 | #, c-format |
60638e98 | 2636 | msgid "could not stat '%s'" |
65e2041e | 2637 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 2638 | |
31e5e17b | 2639 | #: read-cache.c:2461 |
87cb7997 JX |
2640 | #, c-format |
2641 | msgid "unable to open git dir: %s" | |
2642 | msgstr "不能打开 git 目录:%s" | |
2643 | ||
31e5e17b | 2644 | #: read-cache.c:2473 |
87cb7997 JX |
2645 | #, c-format |
2646 | msgid "unable to unlink: %s" | |
2647 | msgstr "无法删除:%s" | |
2648 | ||
5809aa05 | 2649 | #: refs.c:706 |
5b04ee3b | 2650 | #, c-format |
a0b6b246 JX |
2651 | msgid "Could not open '%s' for writing" |
2652 | msgstr "无法打开 '%s' 进行写入" | |
5b04ee3b | 2653 | |
5809aa05 | 2654 | #: refs.c:1850 |
60638e98 JX |
2655 | msgid "ref updates forbidden inside quarantine environment" |
2656 | msgstr "在隔离环境中禁止更新引用" | |
2657 | ||
5809aa05 | 2658 | #: refs/files-backend.c:1189 |
6937cb4e JX |
2659 | #, c-format |
2660 | msgid "could not remove reference %s" | |
2661 | msgstr "无法删除引用 %s" | |
2662 | ||
31e5e17b JX |
2663 | #: refs/files-backend.c:1203 refs/packed-backend.c:1528 |
2664 | #: refs/packed-backend.c:1538 | |
5b04ee3b | 2665 | #, c-format |
a0b6b246 JX |
2666 | msgid "could not delete reference %s: %s" |
2667 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 2668 | |
31e5e17b | 2669 | #: refs/files-backend.c:1206 refs/packed-backend.c:1541 |
5b04ee3b | 2670 | #, c-format |
a0b6b246 JX |
2671 | msgid "could not delete references: %s" |
2672 | msgstr "无法删除引用:%s" | |
5b04ee3b | 2673 | |
31e5e17b | 2674 | #: ref-filter.c:35 wt-status.c:1842 |
87cb7997 JX |
2675 | msgid "gone" |
2676 | msgstr "丢失" | |
2677 | ||
2678 | #: ref-filter.c:36 | |
2679 | #, c-format | |
2680 | msgid "ahead %d" | |
2681 | msgstr "领先 %d" | |
2682 | ||
2683 | #: ref-filter.c:37 | |
2684 | #, c-format | |
2685 | msgid "behind %d" | |
2686 | msgstr "落后 %d" | |
2687 | ||
2688 | #: ref-filter.c:38 | |
2689 | #, c-format | |
2690 | msgid "ahead %d, behind %d" | |
2691 | msgstr "领先 %d,落后 %d" | |
2692 | ||
5809aa05 | 2693 | #: ref-filter.c:107 |
5b04ee3b | 2694 | #, c-format |
a0b6b246 | 2695 | msgid "expected format: %%(color:<color>)" |
58b6f078 | 2696 | msgstr "期望的格式:%%(color:<颜色>)" |
5b04ee3b | 2697 | |
5809aa05 | 2698 | #: ref-filter.c:109 |
5b04ee3b | 2699 | #, c-format |
a0b6b246 JX |
2700 | msgid "unrecognized color: %%(color:%s)" |
2701 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 2702 | |
5809aa05 | 2703 | #: ref-filter.c:129 |
a0b6b246 | 2704 | #, c-format |
87cb7997 JX |
2705 | msgid "Integer value expected refname:lstrip=%s" |
2706 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 2707 | |
5809aa05 | 2708 | #: ref-filter.c:133 |
87cb7997 JX |
2709 | #, c-format |
2710 | msgid "Integer value expected refname:rstrip=%s" | |
2711 | msgstr "期望整数值 refname:rstrip=%s" | |
2712 | ||
5809aa05 | 2713 | #: ref-filter.c:135 |
87cb7997 JX |
2714 | #, c-format |
2715 | msgid "unrecognized %%(%s) argument: %s" | |
2716 | msgstr "未能识别的 %%(%s) 参数:%s" | |
2717 | ||
5809aa05 | 2718 | #: ref-filter.c:184 |
90314792 | 2719 | #, c-format |
a0b6b246 JX |
2720 | msgid "%%(body) does not take arguments" |
2721 | msgstr "%%(body) 不带参数" | |
90314792 | 2722 | |
5809aa05 | 2723 | #: ref-filter.c:191 |
a0b6b246 JX |
2724 | #, c-format |
2725 | msgid "%%(subject) does not take arguments" | |
2726 | msgstr "%%(subject) 不带参数" | |
90314792 | 2727 | |
5809aa05 | 2728 | #: ref-filter.c:209 |
1a79b2f1 | 2729 | #, c-format |
6937cb4e JX |
2730 | msgid "unknown %%(trailers) argument: %s" |
2731 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 2732 | |
5809aa05 | 2733 | #: ref-filter.c:232 |
a0b6b246 JX |
2734 | #, c-format |
2735 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 2736 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 2737 | |
5809aa05 | 2738 | #: ref-filter.c:234 |
a0b6b246 JX |
2739 | #, c-format |
2740 | msgid "unrecognized %%(contents) argument: %s" | |
2741 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 2742 | |
5809aa05 | 2743 | #: ref-filter.c:247 |
87cb7997 JX |
2744 | #, c-format |
2745 | msgid "positive value expected objectname:short=%s" | |
2746 | msgstr "期望一个正数 objectname:short=%s" | |
2747 | ||
5809aa05 | 2748 | #: ref-filter.c:251 |
a0b6b246 JX |
2749 | #, c-format |
2750 | msgid "unrecognized %%(objectname) argument: %s" | |
2751 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 2752 | |
5809aa05 | 2753 | #: ref-filter.c:278 |
a0b6b246 JX |
2754 | #, c-format |
2755 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 2756 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 2757 | |
5809aa05 | 2758 | #: ref-filter.c:290 |
5c57d762 | 2759 | #, c-format |
a0b6b246 JX |
2760 | msgid "unrecognized position:%s" |
2761 | msgstr "未能识别的位置:%s" | |
5c57d762 | 2762 | |
5809aa05 | 2763 | #: ref-filter.c:294 |
1b7f4a34 | 2764 | #, c-format |
a0b6b246 JX |
2765 | msgid "unrecognized width:%s" |
2766 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 2767 | |
5809aa05 | 2768 | #: ref-filter.c:300 |
1b7f4a34 | 2769 | #, c-format |
a0b6b246 JX |
2770 | msgid "unrecognized %%(align) argument: %s" |
2771 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 2772 | |
5809aa05 | 2773 | #: ref-filter.c:304 |
1b7f4a34 | 2774 | #, c-format |
a0b6b246 JX |
2775 | msgid "positive width expected with the %%(align) atom" |
2776 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 2777 | |
5809aa05 | 2778 | #: ref-filter.c:319 |
87cb7997 JX |
2779 | #, c-format |
2780 | msgid "unrecognized %%(if) argument: %s" | |
2781 | msgstr "未能识别的 %%(if) 参数:%s" | |
2782 | ||
5809aa05 | 2783 | #: ref-filter.c:409 |
07432cef | 2784 | #, c-format |
a0b6b246 JX |
2785 | msgid "malformed field name: %.*s" |
2786 | msgstr "非法的字段名:%.*s" | |
ef317cd5 | 2787 | |
5809aa05 | 2788 | #: ref-filter.c:435 |
a0b6b246 JX |
2789 | #, c-format |
2790 | msgid "unknown field name: %.*s" | |
2791 | msgstr "未知的字段名:%.*s" | |
220c313c | 2792 | |
5809aa05 | 2793 | #: ref-filter.c:547 |
87cb7997 JX |
2794 | #, c-format |
2795 | msgid "format: %%(if) atom used without a %%(then) atom" | |
2796 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
2797 | ||
5809aa05 | 2798 | #: ref-filter.c:607 |
87cb7997 JX |
2799 | #, c-format |
2800 | msgid "format: %%(then) atom used without an %%(if) atom" | |
2801 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
2802 | ||
5809aa05 | 2803 | #: ref-filter.c:609 |
87cb7997 JX |
2804 | #, c-format |
2805 | msgid "format: %%(then) atom used more than once" | |
2806 | msgstr "格式:%%(then) 元素用了多次" | |
2807 | ||
5809aa05 | 2808 | #: ref-filter.c:611 |
87cb7997 JX |
2809 | #, c-format |
2810 | msgid "format: %%(then) atom used after %%(else)" | |
2811 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
2812 | ||
5809aa05 | 2813 | #: ref-filter.c:637 |
87cb7997 JX |
2814 | #, c-format |
2815 | msgid "format: %%(else) atom used without an %%(if) atom" | |
2816 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
2817 | ||
5809aa05 | 2818 | #: ref-filter.c:639 |
87cb7997 JX |
2819 | #, c-format |
2820 | msgid "format: %%(else) atom used without a %%(then) atom" | |
2821 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
2822 | ||
5809aa05 | 2823 | #: ref-filter.c:641 |
87cb7997 JX |
2824 | #, c-format |
2825 | msgid "format: %%(else) atom used more than once" | |
2826 | msgstr "格式:%%(else) 元素用了多次" | |
2827 | ||
5809aa05 | 2828 | #: ref-filter.c:654 |
7aea43ff | 2829 | #, c-format |
a0b6b246 JX |
2830 | msgid "format: %%(end) atom used without corresponding atom" |
2831 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 2832 | |
5809aa05 | 2833 | #: ref-filter.c:709 |
7aea43ff | 2834 | #, c-format |
a0b6b246 JX |
2835 | msgid "malformed format string %s" |
2836 | msgstr "非法的格式化字符串 %s" | |
7aea43ff | 2837 | |
5809aa05 | 2838 | #: ref-filter.c:1313 |
87cb7997 JX |
2839 | #, c-format |
2840 | msgid "(no branch, rebasing %s)" | |
2841 | msgstr "(非分支,正变基 %s)" | |
2842 | ||
5809aa05 | 2843 | #: ref-filter.c:1316 |
87cb7997 JX |
2844 | #, c-format |
2845 | msgid "(no branch, bisect started on %s)" | |
2846 | msgstr "(非分支,二分查找开始于 %s)" | |
c04f5ac3 | 2847 | |
a4f16749 JX |
2848 | #. TRANSLATORS: make sure this matches "HEAD |
2849 | #. detached at " in wt-status.c | |
2850 | #. | |
5809aa05 | 2851 | #: ref-filter.c:1324 |
c04f5ac3 | 2852 | #, c-format |
87cb7997 JX |
2853 | msgid "(HEAD detached at %s)" |
2854 | msgstr "(头指针分离于 %s)" | |
c04f5ac3 | 2855 | |
a4f16749 JX |
2856 | #. TRANSLATORS: make sure this matches "HEAD |
2857 | #. detached from " in wt-status.c | |
2858 | #. | |
5809aa05 | 2859 | #: ref-filter.c:1331 |
a0b6b246 | 2860 | #, c-format |
87cb7997 JX |
2861 | msgid "(HEAD detached from %s)" |
2862 | msgstr "(头指针分离自 %s)" | |
6792b93b | 2863 | |
5809aa05 | 2864 | #: ref-filter.c:1335 |
87cb7997 JX |
2865 | msgid "(no branch)" |
2866 | msgstr "(非分支)" | |
2867 | ||
31e5e17b | 2868 | #: ref-filter.c:1364 |
a0b6b246 JX |
2869 | #, c-format |
2870 | msgid "missing object %s for %s" | |
2871 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 2872 | |
31e5e17b | 2873 | #: ref-filter.c:1367 |
a0b6b246 JX |
2874 | #, c-format |
2875 | msgid "parse_object_buffer failed on %s for %s" | |
2876 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 2877 | |
31e5e17b | 2878 | #: ref-filter.c:1819 |
a0b6b246 JX |
2879 | #, c-format |
2880 | msgid "malformed object at '%s'" | |
2881 | msgstr "非法的对象于 '%s'" | |
c04f5ac3 | 2882 | |
31e5e17b | 2883 | #: ref-filter.c:1886 |
a0b6b246 JX |
2884 | #, c-format |
2885 | msgid "ignoring ref with broken name %s" | |
2886 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 2887 | |
31e5e17b | 2888 | #: ref-filter.c:1891 |
a0b6b246 JX |
2889 | #, c-format |
2890 | msgid "ignoring broken ref %s" | |
2891 | msgstr "忽略损坏的引用 %s" | |
c04f5ac3 | 2892 | |
31e5e17b | 2893 | #: ref-filter.c:2152 |
a0b6b246 JX |
2894 | #, c-format |
2895 | msgid "format: %%(end) atom missing" | |
2896 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 2897 | |
31e5e17b | 2898 | #: ref-filter.c:2246 |
a0b6b246 JX |
2899 | #, c-format |
2900 | msgid "malformed object name %s" | |
2901 | msgstr "非法的对象名 %s" | |
c04f5ac3 | 2902 | |
31e5e17b | 2903 | #: remote.c:795 |
a0b6b246 JX |
2904 | #, c-format |
2905 | msgid "Cannot fetch both %s and %s to %s" | |
2906 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 2907 | |
31e5e17b | 2908 | #: remote.c:799 |
c04f5ac3 | 2909 | #, c-format |
a0b6b246 JX |
2910 | msgid "%s usually tracks %s, not %s" |
2911 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 2912 | |
31e5e17b | 2913 | #: remote.c:803 |
a0b6b246 JX |
2914 | #, c-format |
2915 | msgid "%s tracks both %s and %s" | |
2916 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 2917 | |
31e5e17b | 2918 | #: remote.c:811 |
a0b6b246 JX |
2919 | msgid "Internal error" |
2920 | msgstr "内部错误" | |
c04f5ac3 | 2921 | |
31e5e17b | 2922 | #: remote.c:1726 remote.c:1828 |
a0b6b246 JX |
2923 | msgid "HEAD does not point to a branch" |
2924 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 2925 | |
31e5e17b | 2926 | #: remote.c:1735 |
a0b6b246 JX |
2927 | #, c-format |
2928 | msgid "no such branch: '%s'" | |
2929 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 2930 | |
31e5e17b | 2931 | #: remote.c:1738 |
a0b6b246 JX |
2932 | #, c-format |
2933 | msgid "no upstream configured for branch '%s'" | |
2934 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 2935 | |
31e5e17b | 2936 | #: remote.c:1744 |
a0b6b246 JX |
2937 | #, c-format |
2938 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
2939 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 2940 | |
31e5e17b | 2941 | #: remote.c:1759 |
a0b6b246 JX |
2942 | #, c-format |
2943 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
2944 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 2945 | |
31e5e17b | 2946 | #: remote.c:1771 |
a0b6b246 JX |
2947 | #, c-format |
2948 | msgid "branch '%s' has no remote for pushing" | |
2949 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 2950 | |
31e5e17b | 2951 | #: remote.c:1782 |
a0b6b246 JX |
2952 | #, c-format |
2953 | msgid "push refspecs for '%s' do not include '%s'" | |
2954 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 2955 | |
31e5e17b | 2956 | #: remote.c:1795 |
a0b6b246 JX |
2957 | msgid "push has no destination (push.default is 'nothing')" |
2958 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 2959 | |
31e5e17b | 2960 | #: remote.c:1817 |
a0b6b246 JX |
2961 | msgid "cannot resolve 'simple' push to a single destination" |
2962 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 2963 | |
31e5e17b | 2964 | #: remote.c:2132 |
a0b6b246 JX |
2965 | #, c-format |
2966 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
2967 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 2968 | |
31e5e17b | 2969 | #: remote.c:2136 |
a0b6b246 JX |
2970 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
2971 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 2972 | |
31e5e17b | 2973 | #: remote.c:2139 |
a0b6b246 | 2974 | #, c-format |
6937cb4e | 2975 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 2976 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 2977 | |
31e5e17b JX |
2978 | #: remote.c:2143 |
2979 | #, c-format | |
2980 | msgid "Your branch and '%s' refer to different commits.\n" | |
2981 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
2982 | ||
2983 | #: remote.c:2146 | |
2984 | #, c-format | |
2985 | msgid " (use \"%s\" for details)\n" | |
2986 | msgstr " (使用 \"%s\" 查看详情)\n" | |
2987 | ||
2988 | #: remote.c:2150 | |
a0b6b246 JX |
2989 | #, c-format |
2990 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
2991 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
2992 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
2993 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 2994 | |
31e5e17b | 2995 | #: remote.c:2156 |
a0b6b246 JX |
2996 | msgid " (use \"git push\" to publish your local commits)\n" |
2997 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 2998 | |
31e5e17b | 2999 | #: remote.c:2159 |
a0b6b246 JX |
3000 | #, c-format |
3001 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
3002 | msgid_plural "" | |
3003 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
3004 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
3005 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 3006 | |
a0b6b246 | 3007 | # 译者:注意保持前导空格 |
31e5e17b | 3008 | #: remote.c:2167 |
a0b6b246 JX |
3009 | msgid " (use \"git pull\" to update your local branch)\n" |
3010 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 3011 | |
31e5e17b | 3012 | #: remote.c:2170 |
a0b6b246 JX |
3013 | #, c-format |
3014 | msgid "" | |
3015 | "Your branch and '%s' have diverged,\n" | |
3016 | "and have %d and %d different commit each, respectively.\n" | |
3017 | msgid_plural "" | |
3018 | "Your branch and '%s' have diverged,\n" | |
3019 | "and have %d and %d different commits each, respectively.\n" | |
3020 | msgstr[0] "" | |
3021 | "您的分支和 '%s' 出现了偏离,\n" | |
3022 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
3023 | msgstr[1] "" | |
3024 | "您的分支和 '%s' 出现了偏离,\n" | |
3025 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 3026 | |
a0b6b246 | 3027 | # 译者:注意保持前导空格 |
31e5e17b | 3028 | #: remote.c:2180 |
a0b6b246 JX |
3029 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
3030 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 3031 | |
31e5e17b | 3032 | #: revision.c:2277 |
a0b6b246 JX |
3033 | msgid "your current branch appears to be broken" |
3034 | msgstr "您的当前分支好像被损坏" | |
cfff71a9 | 3035 | |
31e5e17b | 3036 | #: revision.c:2280 |
a0b6b246 JX |
3037 | #, c-format |
3038 | msgid "your current branch '%s' does not have any commits yet" | |
3039 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6792b93b | 3040 | |
31e5e17b | 3041 | #: revision.c:2477 |
a0b6b246 JX |
3042 | msgid "--first-parent is incompatible with --bisect" |
3043 | msgstr "--first-parent 与 --bisect 不兼容" | |
6792b93b | 3044 | |
31e5e17b | 3045 | #: run-command.c:731 |
a0b6b246 JX |
3046 | msgid "open /dev/null failed" |
3047 | msgstr "不能打开 /dev/null" | |
5c57d762 | 3048 | |
31e5e17b | 3049 | #: run-command.c:1274 |
5809aa05 JX |
3050 | #, c-format |
3051 | msgid "" | |
3052 | "The '%s' hook was ignored because it's not set as executable.\n" | |
3053 | "You can disable this warning with `git config advice.ignoredHook false`." | |
3054 | msgstr "" | |
3055 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
3056 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
3057 | ||
3058 | #: send-pack.c:141 | |
31e5e17b JX |
3059 | msgid "unexpected flush packet while reading remote unpack status" |
3060 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
3061 | ||
3062 | #: send-pack.c:143 | |
87cb7997 JX |
3063 | #, c-format |
3064 | msgid "unable to parse remote unpack status: %s" | |
3065 | msgstr "不能解析远程解包状态:%s" | |
3066 | ||
31e5e17b | 3067 | #: send-pack.c:145 |
87cb7997 JX |
3068 | #, c-format |
3069 | msgid "remote unpack failed: %s" | |
3070 | msgstr "远程解包失败:%s" | |
3071 | ||
31e5e17b | 3072 | #: send-pack.c:308 |
a0b6b246 JX |
3073 | msgid "failed to sign the push certificate" |
3074 | msgstr "无法为推送证书签名" | |
6792b93b | 3075 | |
31e5e17b | 3076 | #: send-pack.c:421 |
a0b6b246 JX |
3077 | msgid "the receiving end does not support --signed push" |
3078 | msgstr "接收端不支持签名推送" | |
6792b93b | 3079 | |
31e5e17b | 3080 | #: send-pack.c:423 |
a0b6b246 JX |
3081 | msgid "" |
3082 | "not sending a push certificate since the receiving end does not support --" | |
3083 | "signed push" | |
3084 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 3085 | |
31e5e17b | 3086 | #: send-pack.c:435 |
a0b6b246 JX |
3087 | msgid "the receiving end does not support --atomic push" |
3088 | msgstr "接收端不支持原子推送" | |
6792b93b | 3089 | |
31e5e17b | 3090 | #: send-pack.c:440 |
a0b6b246 JX |
3091 | msgid "the receiving end does not support push options" |
3092 | msgstr "接收端不支持推送选项" | |
6792b93b | 3093 | |
31e5e17b JX |
3094 | #: sequencer.c:158 |
3095 | #, c-format | |
3096 | msgid "invalid commit message cleanup mode '%s'" | |
3097 | msgstr "无效的提交信息清理模式 '%s'" | |
3098 | ||
3099 | #: sequencer.c:267 | |
a0b6b246 JX |
3100 | msgid "revert" |
3101 | msgstr "还原" | |
6792b93b | 3102 | |
31e5e17b | 3103 | #: sequencer.c:269 |
a0b6b246 JX |
3104 | msgid "cherry-pick" |
3105 | msgstr "拣选" | |
3106 | ||
31e5e17b | 3107 | #: sequencer.c:271 |
1a79b2f1 JX |
3108 | msgid "rebase -i" |
3109 | msgstr "rebase -i" | |
3110 | ||
31e5e17b | 3111 | #: sequencer.c:273 |
1a79b2f1 JX |
3112 | #, c-format |
3113 | msgid "Unknown action: %d" | |
3114 | msgstr "未知动作:%d" | |
3115 | ||
31e5e17b | 3116 | #: sequencer.c:330 |
a0b6b246 JX |
3117 | msgid "" |
3118 | "after resolving the conflicts, mark the corrected paths\n" | |
3119 | "with 'git add <paths>' or 'git rm <paths>'" | |
3120 | msgstr "" | |
3121 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
3122 | "命令标记修正后的文件" | |
3123 | ||
31e5e17b | 3124 | #: sequencer.c:333 |
a0b6b246 JX |
3125 | msgid "" |
3126 | "after resolving the conflicts, mark the corrected paths\n" | |
3127 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
3128 | "and commit the result with 'git commit'" | |
3129 | msgstr "" | |
3130 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
3131 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 3132 | |
31e5e17b | 3133 | #: sequencer.c:346 sequencer.c:2245 |
1b7f4a34 | 3134 | #, c-format |
a0b6b246 JX |
3135 | msgid "could not lock '%s'" |
3136 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 3137 | |
31e5e17b JX |
3138 | #: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 |
3139 | #: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 | |
1b7f4a34 | 3140 | #, c-format |
a0b6b246 JX |
3141 | msgid "could not write to '%s'" |
3142 | msgstr "不能写入 '%s'" | |
1b7f4a34 | 3143 | |
31e5e17b | 3144 | #: sequencer.c:353 |
a0b6b246 | 3145 | #, c-format |
72351d7d | 3146 | msgid "could not write eol to '%s'" |
a0b6b246 | 3147 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 3148 | |
31e5e17b | 3149 | #: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 |
1b7f4a34 | 3150 | #, c-format |
31e5e17b JX |
3151 | msgid "failed to finalize '%s'" |
3152 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 3153 | |
31e5e17b JX |
3154 | #: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 |
3155 | #: builtin/commit.c:722 builtin/merge.c:1047 | |
a0b6b246 JX |
3156 | #, c-format |
3157 | msgid "could not read '%s'" | |
3158 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 3159 | |
31e5e17b | 3160 | #: sequencer.c:405 |
63af42fe | 3161 | #, c-format |
a0b6b246 JX |
3162 | msgid "your local changes would be overwritten by %s." |
3163 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 3164 | |
31e5e17b | 3165 | #: sequencer.c:409 |
a0b6b246 | 3166 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 3167 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 3168 | |
31e5e17b | 3169 | #: sequencer.c:438 |
a0b6b246 JX |
3170 | #, c-format |
3171 | msgid "%s: fast-forward" | |
3172 | msgstr "%s:快进" | |
6792b93b | 3173 | |
1a79b2f1 | 3174 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
a4f16749 | 3175 | #. "rebase -i". |
1a79b2f1 | 3176 | #. |
31e5e17b | 3177 | #: sequencer.c:526 |
a0b6b246 JX |
3178 | #, c-format |
3179 | msgid "%s: Unable to write new index file" | |
3180 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 3181 | |
31e5e17b | 3182 | #: sequencer.c:542 |
5809aa05 JX |
3183 | msgid "could not resolve HEAD commit" |
3184 | msgstr "不能解析 HEAD 提交" | |
6792b93b | 3185 | |
31e5e17b | 3186 | #: sequencer.c:562 |
5809aa05 JX |
3187 | msgid "unable to update cache tree" |
3188 | msgstr "不能更新缓存树" | |
6792b93b | 3189 | |
31e5e17b | 3190 | #: sequencer.c:658 |
63af42fe JX |
3191 | #, c-format |
3192 | msgid "" | |
a0b6b246 JX |
3193 | "you have staged changes in your working tree\n" |
3194 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
3195 | "\n" | |
3196 | " git commit --amend %s\n" | |
3197 | "\n" | |
3198 | "If they are meant to go into a new commit, run:\n" | |
3199 | "\n" | |
3200 | " git commit %s\n" | |
3201 | "\n" | |
3202 | "In both cases, once you're done, continue with:\n" | |
3203 | "\n" | |
3204 | " git rebase --continue\n" | |
3205 | msgstr "" | |
1a79b2f1 JX |
3206 | "您的工作区中存在已暂存的修改\n" |
3207 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
3208 | "\n" |
3209 | " git commit --amend %s\n" | |
3210 | "\n" | |
29004bbb | 3211 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
3212 | "\n" |
3213 | " git commit %s\n" | |
3214 | "\n" | |
3215 | "无论哪种情况,当您完成提交,继续执行:\n" | |
3216 | "\n" | |
3217 | " git rebase --continue\n" | |
6792b93b | 3218 | |
31e5e17b JX |
3219 | #: sequencer.c:915 |
3220 | msgid "'prepare-commit-msg' hook failed" | |
3221 | msgstr "'prepare-commit-msg' 钩子失败" | |
3222 | ||
3223 | #: sequencer.c:922 | |
3224 | msgid "" | |
3225 | "Your name and email address were configured automatically based\n" | |
3226 | "on your username and hostname. Please check that they are accurate.\n" | |
3227 | "You can suppress this message by setting them explicitly. Run the\n" | |
3228 | "following command and follow the instructions in your editor to edit\n" | |
3229 | "your configuration file:\n" | |
3230 | "\n" | |
3231 | " git config --global --edit\n" | |
3232 | "\n" | |
3233 | "After doing this, you may fix the identity used for this commit with:\n" | |
3234 | "\n" | |
3235 | " git commit --amend --reset-author\n" | |
3236 | msgstr "" | |
3237 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
3238 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
3239 | "中编辑您的配置文件:\n" | |
3240 | "\n" | |
3241 | " git config --global --edit\n" | |
3242 | "\n" | |
3243 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
3244 | "\n" | |
3245 | " git commit --amend --reset-author\n" | |
3246 | ||
3247 | #: sequencer.c:935 | |
3248 | msgid "" | |
3249 | "Your name and email address were configured automatically based\n" | |
3250 | "on your username and hostname. Please check that they are accurate.\n" | |
3251 | "You can suppress this message by setting them explicitly:\n" | |
3252 | "\n" | |
3253 | " git config --global user.name \"Your Name\"\n" | |
3254 | " git config --global user.email you@example.com\n" | |
3255 | "\n" | |
3256 | "After doing this, you may fix the identity used for this commit with:\n" | |
3257 | "\n" | |
3258 | " git commit --amend --reset-author\n" | |
3259 | msgstr "" | |
3260 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
3261 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
3262 | "\n" | |
3263 | " git config --global user.name \"Your Name\"\n" | |
3264 | " git config --global user.email you@example.com\n" | |
3265 | "\n" | |
3266 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
3267 | "\n" | |
3268 | " git commit --amend --reset-author\n" | |
3269 | ||
3270 | #: sequencer.c:975 | |
3271 | msgid "couldn't look up newly created commit" | |
3272 | msgstr "无法找到新创建的提交" | |
3273 | ||
3274 | #: sequencer.c:977 | |
3275 | msgid "could not parse newly created commit" | |
3276 | msgstr "不能解析新创建的提交" | |
3277 | ||
3278 | #: sequencer.c:1023 | |
3279 | msgid "unable to resolve HEAD after creating commit" | |
3280 | msgstr "创建提交后,不能解析 HEAD" | |
3281 | ||
3282 | #: sequencer.c:1025 | |
3283 | msgid "detached HEAD" | |
3284 | msgstr "分离头指针" | |
3285 | ||
3286 | # 译者:中文字符串拼接,可删除前导空格 | |
3287 | #: sequencer.c:1029 | |
3288 | msgid " (root-commit)" | |
3289 | msgstr "(根提交)" | |
3290 | ||
3291 | #: sequencer.c:1050 | |
3292 | msgid "could not parse HEAD" | |
3293 | msgstr "不能解析 HEAD" | |
3294 | ||
3295 | #: sequencer.c:1052 | |
3296 | #, c-format | |
3297 | msgid "HEAD %s is not a commit!" | |
3298 | msgstr "HEAD %s 不是一个提交!" | |
3299 | ||
3300 | #: sequencer.c:1056 builtin/commit.c:1491 | |
3301 | msgid "could not parse HEAD commit" | |
3302 | msgstr "不能解析 HEAD 提交" | |
3303 | ||
3304 | #: sequencer.c:1107 sequencer.c:1673 | |
3305 | msgid "unable to parse commit author" | |
3306 | msgstr "不能解析提交作者" | |
3307 | ||
3308 | #: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 | |
3309 | msgid "git write-tree failed to write a tree" | |
3310 | msgstr "git write-tree 无法写入树对象" | |
3311 | ||
3312 | #: sequencer.c:1134 sequencer.c:1186 | |
3313 | #, c-format | |
3314 | msgid "unable to read commit message from '%s'" | |
3315 | msgstr "不能从 '%s' 读取提交说明" | |
3316 | ||
3317 | #: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 | |
3318 | #: builtin/merge.c:851 | |
3319 | msgid "failed to write commit object" | |
3320 | msgstr "无法写提交对象" | |
3321 | ||
3322 | #: sequencer.c:1213 | |
a0b6b246 | 3323 | #, c-format |
5809aa05 JX |
3324 | msgid "could not parse commit %s" |
3325 | msgstr "不能解析提交 %s" | |
6792b93b | 3326 | |
31e5e17b | 3327 | #: sequencer.c:1218 |
63af42fe | 3328 | #, c-format |
5809aa05 JX |
3329 | msgid "could not parse parent commit %s" |
3330 | msgstr "不能解析父提交 %s" | |
63af42fe | 3331 | |
31e5e17b | 3332 | #: sequencer.c:1347 |
1a79b2f1 JX |
3333 | #, c-format |
3334 | msgid "" | |
3335 | "unexpected 1st line of squash message:\n" | |
3336 | "\n" | |
3337 | "\t%.*s" | |
3338 | msgstr "" | |
3339 | "意外的压缩提交首行提交信息:\n" | |
3340 | "\n" | |
3341 | "\t%.*s" | |
3342 | ||
31e5e17b | 3343 | #: sequencer.c:1353 |
1a79b2f1 JX |
3344 | #, c-format |
3345 | msgid "" | |
3346 | "invalid 1st line of squash message:\n" | |
3347 | "\n" | |
3348 | "\t%.*s" | |
3349 | msgstr "" | |
3350 | "压缩提交的首行提交信息无效:\n" | |
3351 | "\n" | |
3352 | "\t%.*s" | |
3353 | ||
31e5e17b | 3354 | #: sequencer.c:1359 sequencer.c:1384 |
1a79b2f1 JX |
3355 | #, c-format |
3356 | msgid "This is a combination of %d commits." | |
3357 | msgstr "这是一个 %d 个提交的组合。" | |
3358 | ||
31e5e17b | 3359 | #: sequencer.c:1368 sequencer.c:3265 |
1a79b2f1 JX |
3360 | msgid "need a HEAD to fixup" |
3361 | msgstr "需要一个 HEAD 来修复" | |
3362 | ||
31e5e17b | 3363 | #: sequencer.c:1370 |
1a79b2f1 JX |
3364 | msgid "could not read HEAD" |
3365 | msgstr "不能读取 HEAD" | |
3366 | ||
31e5e17b | 3367 | #: sequencer.c:1372 |
1a79b2f1 JX |
3368 | msgid "could not read HEAD's commit message" |
3369 | msgstr "不能读取 HEAD 的提交说明" | |
3370 | ||
31e5e17b | 3371 | #: sequencer.c:1378 |
1a79b2f1 JX |
3372 | #, c-format |
3373 | msgid "cannot write '%s'" | |
3374 | msgstr "不能写 '%s'" | |
3375 | ||
31e5e17b | 3376 | #: sequencer.c:1387 git-rebase--interactive.sh:452 |
1a79b2f1 JX |
3377 | msgid "This is the 1st commit message:" |
3378 | msgstr "这是第一个提交说明:" | |
3379 | ||
31e5e17b | 3380 | #: sequencer.c:1395 |
1a79b2f1 JX |
3381 | #, c-format |
3382 | msgid "could not read commit message of %s" | |
3383 | msgstr "不能读取 %s 的提交说明" | |
3384 | ||
31e5e17b | 3385 | #: sequencer.c:1402 |
1a79b2f1 JX |
3386 | #, c-format |
3387 | msgid "This is the commit message #%d:" | |
3388 | msgstr "这是提交说明 #%d:" | |
3389 | ||
31e5e17b | 3390 | #: sequencer.c:1407 |
1a79b2f1 JX |
3391 | #, c-format |
3392 | msgid "The commit message #%d will be skipped:" | |
3393 | msgstr "提交说明 #%d 将被跳过:" | |
3394 | ||
31e5e17b | 3395 | #: sequencer.c:1412 |
1a79b2f1 JX |
3396 | #, c-format |
3397 | msgid "unknown command: %d" | |
3398 | msgstr "未知命令:%d" | |
3399 | ||
31e5e17b | 3400 | #: sequencer.c:1479 |
a0b6b246 JX |
3401 | msgid "your index file is unmerged." |
3402 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 3403 | |
31e5e17b | 3404 | #: sequencer.c:1498 |
a0b6b246 JX |
3405 | #, c-format |
3406 | msgid "commit %s is a merge but no -m option was given." | |
3407 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 3408 | |
31e5e17b | 3409 | #: sequencer.c:1506 |
a0b6b246 JX |
3410 | #, c-format |
3411 | msgid "commit %s does not have parent %d" | |
3412 | msgstr "提交 %s 没有第 %d 个父提交" | |
3413 | ||
31e5e17b | 3414 | #: sequencer.c:1510 |
a0b6b246 JX |
3415 | #, c-format |
3416 | msgid "mainline was specified but commit %s is not a merge." | |
3417 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
3418 | ||
31e5e17b | 3419 | #: sequencer.c:1516 |
1a79b2f1 JX |
3420 | #, c-format |
3421 | msgid "cannot get commit message for %s" | |
3422 | msgstr "不能得到 %s 的提交说明" | |
3423 | ||
a0b6b246 JX |
3424 | #. TRANSLATORS: The first %s will be a "todo" command like |
3425 | #. "revert" or "pick", the second %s a SHA1. | |
31e5e17b | 3426 | #: sequencer.c:1535 |
a0b6b246 JX |
3427 | #, c-format |
3428 | msgid "%s: cannot parse parent commit %s" | |
3429 | msgstr "%s:不能解析父提交 %s" | |
3430 | ||
31e5e17b | 3431 | #: sequencer.c:1600 sequencer.c:2397 |
a0b6b246 | 3432 | #, c-format |
1a79b2f1 JX |
3433 | msgid "could not rename '%s' to '%s'" |
3434 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 3435 | |
31e5e17b | 3436 | #: sequencer.c:1654 |
a0b6b246 JX |
3437 | #, c-format |
3438 | msgid "could not revert %s... %s" | |
3439 | msgstr "不能还原 %s... %s" | |
3440 | ||
31e5e17b | 3441 | #: sequencer.c:1655 |
a0b6b246 JX |
3442 | #, c-format |
3443 | msgid "could not apply %s... %s" | |
3444 | msgstr "不能应用 %s... %s" | |
3445 | ||
31e5e17b | 3446 | #: sequencer.c:1702 |
a0b6b246 JX |
3447 | msgid "empty commit set passed" |
3448 | msgstr "提供了空的提交集" | |
3449 | ||
31e5e17b | 3450 | #: sequencer.c:1712 |
a0b6b246 JX |
3451 | #, c-format |
3452 | msgid "git %s: failed to read the index" | |
3453 | msgstr "git %s:无法读取索引" | |
3454 | ||
31e5e17b | 3455 | #: sequencer.c:1718 |
a0b6b246 JX |
3456 | #, c-format |
3457 | msgid "git %s: failed to refresh the index" | |
3458 | msgstr "git %s:无法刷新索引" | |
3459 | ||
31e5e17b | 3460 | #: sequencer.c:1792 |
5809aa05 JX |
3461 | #, c-format |
3462 | msgid "%s does not accept arguments: '%s'" | |
3463 | msgstr "%s 不接受参数:'%s'" | |
3464 | ||
31e5e17b | 3465 | #: sequencer.c:1801 |
5809aa05 JX |
3466 | #, c-format |
3467 | msgid "missing arguments for %s" | |
3468 | msgstr "缺少 %s 的参数" | |
3469 | ||
31e5e17b | 3470 | #: sequencer.c:1844 |
a0b6b246 JX |
3471 | #, c-format |
3472 | msgid "invalid line %d: %.*s" | |
3473 | msgstr "无效行 %d:%.*s" | |
3474 | ||
31e5e17b | 3475 | #: sequencer.c:1852 |
1a79b2f1 JX |
3476 | #, c-format |
3477 | msgid "cannot '%s' without a previous commit" | |
3478 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 3479 | |
31e5e17b | 3480 | #: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 |
a0b6b246 JX |
3481 | #, c-format |
3482 | msgid "could not read '%s'." | |
3483 | msgstr "不能读取 '%s'。" | |
3484 | ||
31e5e17b | 3485 | #: sequencer.c:1906 |
1a79b2f1 JX |
3486 | msgid "please fix this using 'git rebase --edit-todo'." |
3487 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
3488 | ||
31e5e17b | 3489 | #: sequencer.c:1908 |
a0b6b246 JX |
3490 | #, c-format |
3491 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 3492 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 3493 | |
31e5e17b | 3494 | #: sequencer.c:1913 |
1a79b2f1 JX |
3495 | msgid "no commits parsed." |
3496 | msgstr "没有解析提交。" | |
3497 | ||
31e5e17b | 3498 | #: sequencer.c:1924 |
a0b6b246 JX |
3499 | msgid "cannot cherry-pick during a revert." |
3500 | msgstr "不能在回退中执行拣选。" | |
3501 | ||
31e5e17b | 3502 | #: sequencer.c:1926 |
a0b6b246 JX |
3503 | msgid "cannot revert during a cherry-pick." |
3504 | msgstr "不能在拣选中执行回退。" | |
3505 | ||
31e5e17b | 3506 | #: sequencer.c:1993 |
a0b6b246 JX |
3507 | #, c-format |
3508 | msgid "invalid key: %s" | |
3509 | msgstr "无效键名:%s" | |
3510 | ||
31e5e17b | 3511 | #: sequencer.c:1996 |
a0b6b246 JX |
3512 | #, c-format |
3513 | msgid "invalid value for %s: %s" | |
3514 | msgstr "%s 的值无效:%s" | |
3515 | ||
31e5e17b | 3516 | #: sequencer.c:2062 |
a0b6b246 JX |
3517 | #, c-format |
3518 | msgid "malformed options sheet: '%s'" | |
3519 | msgstr "非法的选项清单:'%s'" | |
3520 | ||
31e5e17b | 3521 | #: sequencer.c:2100 |
a0b6b246 JX |
3522 | msgid "a cherry-pick or revert is already in progress" |
3523 | msgstr "一个拣选或还原操作已在进行" | |
3524 | ||
31e5e17b | 3525 | #: sequencer.c:2101 |
a0b6b246 JX |
3526 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
3527 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
3528 | ||
31e5e17b | 3529 | #: sequencer.c:2104 |
a0b6b246 JX |
3530 | #, c-format |
3531 | msgid "could not create sequencer directory '%s'" | |
3532 | msgstr "不能创建序列目录 '%s'" | |
3533 | ||
31e5e17b | 3534 | #: sequencer.c:2118 |
a0b6b246 JX |
3535 | msgid "could not lock HEAD" |
3536 | msgstr "不能锁定 HEAD" | |
3537 | ||
31e5e17b | 3538 | #: sequencer.c:2173 sequencer.c:2761 |
a0b6b246 JX |
3539 | msgid "no cherry-pick or revert in progress" |
3540 | msgstr "拣选或还原操作并未进行" | |
3541 | ||
31e5e17b | 3542 | #: sequencer.c:2175 |
a0b6b246 JX |
3543 | msgid "cannot resolve HEAD" |
3544 | msgstr "不能解析 HEAD" | |
3545 | ||
31e5e17b | 3546 | #: sequencer.c:2177 sequencer.c:2212 |
a0b6b246 JX |
3547 | msgid "cannot abort from a branch yet to be born" |
3548 | msgstr "不能从尚未建立的分支终止" | |
3549 | ||
31e5e17b | 3550 | #: sequencer.c:2198 builtin/grep.c:720 |
a0b6b246 JX |
3551 | #, c-format |
3552 | msgid "cannot open '%s'" | |
3553 | msgstr "不能打开 '%s'" | |
3554 | ||
31e5e17b | 3555 | #: sequencer.c:2200 |
a0b6b246 JX |
3556 | #, c-format |
3557 | msgid "cannot read '%s': %s" | |
3558 | msgstr "不能读取 '%s':%s" | |
3559 | ||
31e5e17b | 3560 | #: sequencer.c:2201 |
a0b6b246 JX |
3561 | msgid "unexpected end of file" |
3562 | msgstr "意外的文件结束" | |
3563 | ||
31e5e17b | 3564 | #: sequencer.c:2207 |
a0b6b246 JX |
3565 | #, c-format |
3566 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
3567 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
3568 | ||
31e5e17b | 3569 | #: sequencer.c:2218 |
1a79b2f1 JX |
3570 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
3571 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
3572 | ||
31e5e17b JX |
3573 | #: sequencer.c:2324 sequencer.c:2679 |
3574 | #, c-format | |
3575 | msgid "could not update %s" | |
3576 | msgstr "不能更新 %s" | |
3577 | ||
3578 | #: sequencer.c:2362 sequencer.c:2659 | |
1a79b2f1 JX |
3579 | msgid "cannot read HEAD" |
3580 | msgstr "不能读取 HEAD" | |
3581 | ||
31e5e17b | 3582 | #: sequencer.c:2402 builtin/difftool.c:639 |
1a79b2f1 JX |
3583 | #, c-format |
3584 | msgid "could not copy '%s' to '%s'" | |
3585 | msgstr "不能拷贝 '%s' 至 '%s'" | |
3586 | ||
31e5e17b | 3587 | #: sequencer.c:2421 |
1a79b2f1 JX |
3588 | msgid "could not read index" |
3589 | msgstr "不能读取索引" | |
3590 | ||
3591 | # 译者:注意保持前导空格 | |
31e5e17b | 3592 | #: sequencer.c:2426 |
1a79b2f1 JX |
3593 | #, c-format |
3594 | msgid "" | |
3595 | "execution failed: %s\n" | |
3596 | "%sYou can fix the problem, and then run\n" | |
3597 | "\n" | |
3598 | " git rebase --continue\n" | |
3599 | "\n" | |
3600 | msgstr "" | |
3601 | "执行失败:%s\n" | |
3602 | "%s您可以改正该问题,然后运行\n" | |
3603 | "\n" | |
3604 | " git rebase --continue\n" | |
3605 | "\n" | |
3606 | ||
31e5e17b | 3607 | #: sequencer.c:2432 |
1a79b2f1 JX |
3608 | msgid "and made changes to the index and/or the working tree\n" |
3609 | msgstr "并且修改索引和/或工作区\n" | |
3610 | ||
31e5e17b | 3611 | #: sequencer.c:2438 |
1a79b2f1 JX |
3612 | #, c-format |
3613 | msgid "" | |
3614 | "execution succeeded: %s\n" | |
3615 | "but left changes to the index and/or the working tree\n" | |
3616 | "Commit or stash your changes, and then run\n" | |
3617 | "\n" | |
3618 | " git rebase --continue\n" | |
3619 | "\n" | |
3620 | msgstr "" | |
3621 | "执行成功:%s\n" | |
3622 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 3623 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
3624 | "\n" |
3625 | " git rebase --continue\n" | |
3626 | "\n" | |
3627 | ||
31e5e17b | 3628 | #: sequencer.c:2497 |
1a79b2f1 | 3629 | #, c-format |
a4f16749 JX |
3630 | msgid "Applied autostash.\n" |
3631 | msgstr "已应用 autostash。\n" | |
1a79b2f1 | 3632 | |
31e5e17b | 3633 | #: sequencer.c:2509 |
1a79b2f1 JX |
3634 | #, c-format |
3635 | msgid "cannot store %s" | |
3636 | msgstr "不能存储 %s" | |
3637 | ||
31e5e17b | 3638 | #: sequencer.c:2512 git-rebase.sh:178 |
1a79b2f1 JX |
3639 | #, c-format |
3640 | msgid "" | |
3641 | "Applying autostash resulted in conflicts.\n" | |
3642 | "Your changes are safe in the stash.\n" | |
3643 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
3644 | msgstr "" | |
3645 | "应用 autostash 导致冲突。\n" | |
a4f16749 | 3646 | "您的修改安全地保存在贮藏区中。\n" |
1a79b2f1 JX |
3647 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
3648 | ||
31e5e17b | 3649 | #: sequencer.c:2595 |
1a79b2f1 | 3650 | #, c-format |
87cb7997 JX |
3651 | msgid "Stopped at %s... %.*s\n" |
3652 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 3653 | |
31e5e17b | 3654 | #: sequencer.c:2637 |
1a79b2f1 JX |
3655 | #, c-format |
3656 | msgid "unknown command %d" | |
3657 | msgstr "未知命令 %d" | |
3658 | ||
31e5e17b | 3659 | #: sequencer.c:2667 |
1a79b2f1 JX |
3660 | msgid "could not read orig-head" |
3661 | msgstr "不能读取 orig-head" | |
3662 | ||
31e5e17b | 3663 | #: sequencer.c:2672 sequencer.c:3262 |
1a79b2f1 JX |
3664 | msgid "could not read 'onto'" |
3665 | msgstr "不能读取 'onto'" | |
3666 | ||
31e5e17b | 3667 | #: sequencer.c:2686 |
1a79b2f1 JX |
3668 | #, c-format |
3669 | msgid "could not update HEAD to %s" | |
3670 | msgstr "不能更新 HEAD 为 %s" | |
3671 | ||
31e5e17b | 3672 | #: sequencer.c:2770 |
1a79b2f1 JX |
3673 | msgid "cannot rebase: You have unstaged changes." |
3674 | msgstr "不能变基:您有未暂存的变更。" | |
3675 | ||
31e5e17b | 3676 | #: sequencer.c:2775 |
1a79b2f1 JX |
3677 | msgid "could not remove CHERRY_PICK_HEAD" |
3678 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
3679 | ||
31e5e17b | 3680 | #: sequencer.c:2784 |
1a79b2f1 JX |
3681 | msgid "cannot amend non-existing commit" |
3682 | msgstr "不能修补不存在的提交" | |
3683 | ||
31e5e17b | 3684 | #: sequencer.c:2786 |
1a79b2f1 JX |
3685 | #, c-format |
3686 | msgid "invalid file: '%s'" | |
3687 | msgstr "无效文件:'%s'" | |
3688 | ||
31e5e17b | 3689 | #: sequencer.c:2788 |
1a79b2f1 JX |
3690 | #, c-format |
3691 | msgid "invalid contents: '%s'" | |
3692 | msgstr "无效内容:'%s'" | |
3693 | ||
31e5e17b | 3694 | #: sequencer.c:2791 |
1a79b2f1 JX |
3695 | msgid "" |
3696 | "\n" | |
3697 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
3698 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
3699 | msgstr "" |
3700 | "\n" | |
3701 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 3702 | |
31e5e17b | 3703 | #: sequencer.c:2801 |
1a79b2f1 JX |
3704 | msgid "could not commit staged changes." |
3705 | msgstr "不能提交暂存的修改。" | |
3706 | ||
31e5e17b | 3707 | #: sequencer.c:2881 |
a0b6b246 JX |
3708 | #, c-format |
3709 | msgid "%s: can't cherry-pick a %s" | |
3710 | msgstr "%s:不能拣选一个%s" | |
3711 | ||
31e5e17b | 3712 | #: sequencer.c:2885 |
a0b6b246 JX |
3713 | #, c-format |
3714 | msgid "%s: bad revision" | |
3715 | msgstr "%s:错误的版本" | |
3716 | ||
31e5e17b | 3717 | #: sequencer.c:2918 |
a0b6b246 JX |
3718 | msgid "can't revert as initial commit" |
3719 | msgstr "不能作为初始提交回退" | |
3720 | ||
31e5e17b | 3721 | #: sequencer.c:3023 |
6937cb4e JX |
3722 | msgid "make_script: unhandled options" |
3723 | msgstr "make_script:有未能处理的选项" | |
3724 | ||
31e5e17b | 3725 | #: sequencer.c:3026 |
6937cb4e JX |
3726 | msgid "make_script: error preparing revisions" |
3727 | msgstr "make_script:准备版本时错误" | |
3728 | ||
31e5e17b | 3729 | #: sequencer.c:3060 sequencer.c:3095 |
6937cb4e JX |
3730 | #, c-format |
3731 | msgid "unusable todo list: '%s'" | |
3732 | msgstr "不可用的待办列表:'%s'" | |
3733 | ||
31e5e17b | 3734 | #: sequencer.c:3146 |
6937cb4e JX |
3735 | #, c-format |
3736 | msgid "" | |
3737 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
3738 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
3739 | ||
31e5e17b | 3740 | #: sequencer.c:3212 |
6937cb4e JX |
3741 | #, c-format |
3742 | msgid "" | |
3743 | "Warning: some commits may have been dropped accidentally.\n" | |
3744 | "Dropped commits (newer to older):\n" | |
3745 | msgstr "" | |
3746 | "警告:一些提交可能被意外丢弃。\n" | |
3747 | "丢弃的提交(从新到旧):\n" | |
3748 | ||
31e5e17b | 3749 | #: sequencer.c:3219 |
6937cb4e JX |
3750 | #, c-format |
3751 | msgid "" | |
3752 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
3753 | "\n" | |
3754 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
3755 | "warnings.\n" | |
3756 | "The possible behaviours are: ignore, warn, error.\n" | |
3757 | "\n" | |
3758 | msgstr "" | |
3759 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
3760 | "\n" | |
3761 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
3762 | "可选值有:ignore、warn、error。\n" | |
3763 | "\n" | |
3764 | ||
31e5e17b | 3765 | #: sequencer.c:3231 |
6937cb4e JX |
3766 | #, c-format |
3767 | msgid "" | |
3768 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
3769 | "continue'.\n" | |
3770 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
3771 | msgstr "" | |
3772 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
3773 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
3774 | ||
31e5e17b | 3775 | #: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 |
5809aa05 | 3776 | #: builtin/am.c:779 |
6937cb4e JX |
3777 | #, c-format |
3778 | msgid "could not open '%s' for writing" | |
3779 | msgstr "无法打开 '%s' 进行写入" | |
3780 | ||
31e5e17b | 3781 | #: sequencer.c:3285 |
6937cb4e | 3782 | #, c-format |
5809aa05 JX |
3783 | msgid "could not parse commit '%s'" |
3784 | msgstr "不能解析提交 '%s'" | |
6937cb4e | 3785 | |
31e5e17b | 3786 | #: sequencer.c:3401 |
6937cb4e JX |
3787 | msgid "the script was already rearranged." |
3788 | msgstr "脚本已经重新编排。" | |
3789 | ||
31e5e17b JX |
3790 | #: setup.c:122 |
3791 | #, c-format | |
3792 | msgid "'%s' is outside repository" | |
3793 | msgstr "'%s' 在仓库之外" | |
3794 | ||
a4f16749 | 3795 | #: setup.c:171 |
a0b6b246 | 3796 | #, c-format |
6792b93b | 3797 | msgid "" |
a0b6b246 JX |
3798 | "%s: no such path in the working tree.\n" |
3799 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
3800 | msgstr "" | |
3801 | "%s:工作区中无此路径。\n" | |
58b6f078 | 3802 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 3803 | |
a4f16749 | 3804 | #: setup.c:184 |
90314792 | 3805 | #, c-format |
a0b6b246 JX |
3806 | msgid "" |
3807 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
3808 | "Use '--' to separate paths from revisions, like this:\n" | |
3809 | "'git <command> [<revision>...] -- [<file>...]'" | |
3810 | msgstr "" | |
3811 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
3812 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 3813 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 3814 | |
31e5e17b JX |
3815 | #: setup.c:233 |
3816 | #, c-format | |
3817 | msgid "option '%s' must come before non-option arguments" | |
3818 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
3819 | ||
a4f16749 | 3820 | #: setup.c:252 |
a0b6b246 JX |
3821 | #, c-format |
3822 | msgid "" | |
3823 | "ambiguous argument '%s': both revision and filename\n" | |
3824 | "Use '--' to separate paths from revisions, like this:\n" | |
3825 | "'git <command> [<revision>...] -- [<file>...]'" | |
3826 | msgstr "" | |
3827 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
3828 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 3829 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 3830 | |
31e5e17b JX |
3831 | #: setup.c:388 |
3832 | msgid "unable to set up work tree using invalid config" | |
3833 | msgstr "无法使用无效配置来创建工作区" | |
3834 | ||
3835 | #: setup.c:395 | |
3836 | msgid "this operation must be run in a work tree" | |
3837 | msgstr "本操作必须在一个工作区中运行" | |
3838 | ||
3839 | #: setup.c:506 | |
a0b6b246 JX |
3840 | #, c-format |
3841 | msgid "Expected git repo version <= %d, found %d" | |
3842 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 3843 | |
31e5e17b | 3844 | #: setup.c:514 |
a0b6b246 JX |
3845 | msgid "unknown repository extensions found:" |
3846 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 3847 | |
31e5e17b | 3848 | #: setup.c:533 |
1003b3a5 | 3849 | #, c-format |
31e5e17b JX |
3850 | msgid "error opening '%s'" |
3851 | msgstr "无法打开 '%s'" | |
1003b3a5 | 3852 | |
31e5e17b JX |
3853 | #: setup.c:535 |
3854 | #, c-format | |
3855 | msgid "too large to be a .git file: '%s'" | |
3856 | msgstr "文件 .git 太大:'%s'" | |
3857 | ||
3858 | #: setup.c:537 | |
3859 | #, c-format | |
3860 | msgid "error reading %s" | |
3861 | msgstr "无法读取 %s" | |
3862 | ||
3863 | #: setup.c:539 | |
3864 | #, c-format | |
3865 | msgid "invalid gitfile format: %s" | |
3866 | msgstr "无效的 gitfile 格式:%s" | |
3867 | ||
3868 | #: setup.c:541 | |
3869 | #, c-format | |
3870 | msgid "no path in gitfile: %s" | |
3871 | msgstr "在 gitfile 中没有路径:%s" | |
3872 | ||
3873 | #: setup.c:543 | |
3874 | #, c-format | |
3875 | msgid "not a git repository: %s" | |
3876 | msgstr "不是一个 git 仓库:%s" | |
3877 | ||
3878 | #: setup.c:642 | |
3879 | #, c-format | |
3880 | msgid "'$%s' too big" | |
3881 | msgstr "'$%s' 太大" | |
3882 | ||
3883 | #: setup.c:656 | |
3884 | #, c-format | |
3885 | msgid "not a git repository: '%s'" | |
3886 | msgstr "不是一个 git 仓库:'%s'" | |
3887 | ||
3888 | #: setup.c:685 setup.c:687 setup.c:718 | |
3889 | #, c-format | |
3890 | msgid "cannot chdir to '%s'" | |
3891 | msgstr "不能切换目录到 '%s'" | |
3892 | ||
3893 | #: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 | |
3894 | msgid "cannot come back to cwd" | |
a0b6b246 | 3895 | msgstr "无法返回当前工作目录" |
1003b3a5 | 3896 | |
31e5e17b JX |
3897 | #: setup.c:816 |
3898 | #, c-format | |
3899 | msgid "not a git repository (or any of the parent directories): %s" | |
3900 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
3901 | ||
3902 | #: setup.c:827 | |
3903 | #, c-format | |
3904 | msgid "failed to stat '%*s%s%s'" | |
3905 | msgstr "无法获取 '%*s%s%s' 状态(stat)" | |
3906 | ||
3907 | #: setup.c:1057 | |
a0b6b246 JX |
3908 | msgid "Unable to read current working directory" |
3909 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 3910 | |
31e5e17b | 3911 | #: setup.c:1069 setup.c:1075 |
87cb7997 | 3912 | #, c-format |
31e5e17b | 3913 | msgid "cannot change to '%s'" |
87cb7997 JX |
3914 | msgstr "不能切换到 '%s'" |
3915 | ||
31e5e17b | 3916 | #: setup.c:1088 |
a0b6b246 JX |
3917 | #, c-format |
3918 | msgid "" | |
31e5e17b | 3919 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
3920 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
3921 | msgstr "" | |
31e5e17b | 3922 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 3923 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 3924 | |
31e5e17b | 3925 | #: setup.c:1172 |
a0b6b246 JX |
3926 | #, c-format |
3927 | msgid "" | |
31e5e17b | 3928 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
3929 | "The owner of files must always have read and write permissions." |
3930 | msgstr "" | |
31e5e17b | 3931 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 3932 | "文件属主必须始终拥有读写权限。" |
6792b93b | 3933 | |
31e5e17b JX |
3934 | #: setup.c:1215 |
3935 | msgid "open /dev/null or dup failed" | |
3936 | msgstr "不能打开或者复制 /dev/null" | |
3937 | ||
3938 | #: setup.c:1230 | |
3939 | msgid "fork failed" | |
3940 | msgstr "fork 失败" | |
3941 | ||
3942 | #: setup.c:1235 | |
3943 | msgid "setsid failed" | |
3944 | msgstr "setsid 失败" | |
3945 | ||
3946 | #: sha1_file.c:592 | |
a0b6b246 JX |
3947 | #, c-format |
3948 | msgid "path '%s' does not exist" | |
3949 | msgstr "路径 '%s' 不存在" | |
3950 | ||
31e5e17b | 3951 | #: sha1_file.c:618 |
a0b6b246 JX |
3952 | #, c-format |
3953 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
3954 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
3955 | ||
31e5e17b | 3956 | #: sha1_file.c:624 |
a0b6b246 JX |
3957 | #, c-format |
3958 | msgid "reference repository '%s' is not a local repository." | |
3959 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
3960 | ||
31e5e17b | 3961 | #: sha1_file.c:630 |
a0b6b246 JX |
3962 | #, c-format |
3963 | msgid "reference repository '%s' is shallow" | |
3964 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
3965 | ||
31e5e17b | 3966 | #: sha1_file.c:638 |
a0b6b246 JX |
3967 | #, c-format |
3968 | msgid "reference repository '%s' is grafted" | |
3969 | msgstr "参考仓库 '%s' 已被嫁接" | |
3970 | ||
5809aa05 | 3971 | #: sha1_name.c:422 |
a0b6b246 JX |
3972 | #, c-format |
3973 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 3974 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 3975 | |
5809aa05 | 3976 | #: sha1_name.c:433 |
a0b6b246 JX |
3977 | msgid "The candidates are:" |
3978 | msgstr "候选者有:" | |
3979 | ||
5809aa05 | 3980 | #: sha1_name.c:693 |
a0b6b246 JX |
3981 | msgid "" |
3982 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
3983 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
3984 | "may be created by mistake. For example,\n" | |
3985 | "\n" | |
3986 | " git checkout -b $br $(git rev-parse ...)\n" | |
3987 | "\n" | |
3988 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
3989 | "examine these refs and maybe delete them. Turn this message off by\n" | |
3990 | "running \"git config advice.objectNameWarning false\"" | |
3991 | msgstr "" | |
3992 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
3993 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
3994 | "\n" | |
3995 | " git checkout -b $br $(git rev-parse ...)\n" | |
3996 | "\n" | |
3997 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
3998 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
3999 | "命令关闭本消息通知。" | |
4000 | ||
5809aa05 | 4001 | #: submodule.c:96 submodule.c:130 |
a0b6b246 JX |
4002 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
4003 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
4004 | ||
5809aa05 | 4005 | #: submodule.c:100 submodule.c:134 |
a0b6b246 JX |
4006 | #, c-format |
4007 | msgid "Could not find section in .gitmodules where path=%s" | |
4008 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
4009 | ||
5809aa05 | 4010 | #: submodule.c:108 |
a0b6b246 JX |
4011 | #, c-format |
4012 | msgid "Could not update .gitmodules entry %s" | |
4013 | msgstr "不能更新 .gitmodules 条目 %s" | |
4014 | ||
5809aa05 | 4015 | #: submodule.c:141 |
a0b6b246 JX |
4016 | #, c-format |
4017 | msgid "Could not remove .gitmodules entry for %s" | |
4018 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
4019 | ||
5809aa05 | 4020 | #: submodule.c:152 |
a0b6b246 JX |
4021 | msgid "staging updated .gitmodules failed" |
4022 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
4023 | ||
5809aa05 | 4024 | #: submodule.c:312 |
a4f16749 JX |
4025 | #, c-format |
4026 | msgid "in unpopulated submodule '%s'" | |
4027 | msgstr "位于未检出的子模组 '%s'" | |
4028 | ||
5809aa05 | 4029 | #: submodule.c:343 |
a4f16749 JX |
4030 | #, c-format |
4031 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
4032 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
4033 | ||
5809aa05 | 4034 | #: submodule.c:833 |
6937cb4e JX |
4035 | #, c-format |
4036 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 4037 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 4038 | |
31e5e17b | 4039 | #: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 |
6937cb4e JX |
4040 | msgid "Failed to resolve HEAD as a valid ref." |
4041 | msgstr "无法将 HEAD 解析为有效引用。" | |
4042 | ||
5809aa05 | 4043 | #: submodule.c:1370 |
1a79b2f1 | 4044 | #, c-format |
87cb7997 | 4045 | msgid "'%s' not recognized as a git repository" |
65e2041e | 4046 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 4047 | |
5809aa05 | 4048 | #: submodule.c:1508 |
1a79b2f1 | 4049 | #, c-format |
87cb7997 JX |
4050 | msgid "could not start 'git status' in submodule '%s'" |
4051 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 4052 | |
5809aa05 | 4053 | #: submodule.c:1521 |
87cb7997 JX |
4054 | #, c-format |
4055 | msgid "could not run 'git status' in submodule '%s'" | |
4056 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
4057 | ||
5809aa05 | 4058 | #: submodule.c:1614 |
87cb7997 JX |
4059 | #, c-format |
4060 | msgid "submodule '%s' has dirty index" | |
4061 | msgstr "子模组 '%s' 中有脏索引" | |
4062 | ||
31e5e17b | 4063 | #: submodule.c:1878 |
1a79b2f1 JX |
4064 | #, c-format |
4065 | msgid "" | |
4066 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
4067 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
4068 | ||
31e5e17b | 4069 | #: submodule.c:1890 submodule.c:1946 |
1a79b2f1 JX |
4070 | #, c-format |
4071 | msgid "could not lookup name for submodule '%s'" | |
4072 | msgstr "不能查询子模组 '%s' 的名称" | |
4073 | ||
31e5e17b JX |
4074 | #: submodule.c:1894 builtin/submodule--helper.c:1246 |
4075 | #: builtin/submodule--helper.c:1256 | |
1a79b2f1 JX |
4076 | #, c-format |
4077 | msgid "could not create directory '%s'" | |
4078 | msgstr "不能创建目录 '%s'" | |
4079 | ||
31e5e17b | 4080 | #: submodule.c:1897 |
1a79b2f1 JX |
4081 | #, c-format |
4082 | msgid "" | |
4083 | "Migrating git directory of '%s%s' from\n" | |
4084 | "'%s' to\n" | |
4085 | "'%s'\n" | |
4086 | msgstr "" | |
4087 | "将 '%s%s' 的 git 目录从\n" | |
4088 | "'%s' 迁移至\n" | |
4089 | "'%s'\n" | |
4090 | ||
31e5e17b | 4091 | #: submodule.c:1981 |
1a79b2f1 JX |
4092 | #, c-format |
4093 | msgid "could not recurse into submodule '%s'" | |
4094 | msgstr "无法递归进子模组路径 '%s'" | |
4095 | ||
31e5e17b | 4096 | #: submodule.c:2025 |
87cb7997 JX |
4097 | msgid "could not start ls-files in .." |
4098 | msgstr "无法在 .. 中启动 ls-files" | |
4099 | ||
31e5e17b | 4100 | #: submodule.c:2045 |
87cb7997 JX |
4101 | msgid "BUG: returned path string doesn't match cwd?" |
4102 | msgstr "BUG:返回的路径和当前路径不匹配?" | |
4103 | ||
31e5e17b | 4104 | #: submodule.c:2064 |
87cb7997 JX |
4105 | #, c-format |
4106 | msgid "ls-tree returned unexpected return code %d" | |
4107 | msgstr "ls-tree 返回未知返回值 %d" | |
4108 | ||
6937cb4e JX |
4109 | #: submodule-config.c:263 |
4110 | msgid "negative values not allowed for submodule.fetchjobs" | |
4111 | msgstr "submodule.fetchjobs 不允许为负值" | |
4112 | ||
4113 | #: submodule-config.c:436 | |
a0b6b246 JX |
4114 | #, c-format |
4115 | msgid "invalid value for %s" | |
4116 | msgstr "%s 的值无效" | |
4117 | ||
6937cb4e | 4118 | #: trailer.c:238 |
a0b6b246 JX |
4119 | #, c-format |
4120 | msgid "running trailer command '%s' failed" | |
4121 | msgstr "执行 trailer 命令 '%s' 失败" | |
4122 | ||
6937cb4e JX |
4123 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
4124 | #: trailer.c:557 | |
a0b6b246 JX |
4125 | #, c-format |
4126 | msgid "unknown value '%s' for key '%s'" | |
4127 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
4128 | ||
6937cb4e | 4129 | #: trailer.c:539 trailer.c:544 builtin/remote.c:290 |
a0b6b246 JX |
4130 | #, c-format |
4131 | msgid "more than one %s" | |
4132 | msgstr "多于一个 %s" | |
4133 | ||
6937cb4e | 4134 | #: trailer.c:730 |
a0b6b246 JX |
4135 | #, c-format |
4136 | msgid "empty trailer token in trailer '%.*s'" | |
4137 | msgstr "签名 '%.*s' 的键为空" | |
4138 | ||
6937cb4e | 4139 | #: trailer.c:750 |
a0b6b246 JX |
4140 | #, c-format |
4141 | msgid "could not read input file '%s'" | |
4142 | msgstr "不能读取输入文件 '%s'" | |
4143 | ||
6937cb4e | 4144 | #: trailer.c:753 |
a0b6b246 JX |
4145 | msgid "could not read from stdin" |
4146 | msgstr "不能自标准输入读取" | |
4147 | ||
6937cb4e | 4148 | #: trailer.c:1008 builtin/am.c:46 |
a0b6b246 JX |
4149 | #, c-format |
4150 | msgid "could not stat %s" | |
65e2041e | 4151 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 4152 | |
6937cb4e | 4153 | #: trailer.c:1010 |
a0b6b246 JX |
4154 | #, c-format |
4155 | msgid "file %s is not a regular file" | |
4156 | msgstr "文件 %s 不是一个正规文件" | |
4157 | ||
6937cb4e | 4158 | #: trailer.c:1012 |
a0b6b246 JX |
4159 | #, c-format |
4160 | msgid "file %s is not writable by user" | |
4161 | msgstr "文件 %s 用户不可写" | |
4162 | ||
6937cb4e | 4163 | #: trailer.c:1024 |
a0b6b246 JX |
4164 | msgid "could not open temporary file" |
4165 | msgstr "不能打开临时文件" | |
4166 | ||
6937cb4e | 4167 | #: trailer.c:1064 |
a0b6b246 JX |
4168 | #, c-format |
4169 | msgid "could not rename temporary file to %s" | |
4170 | msgstr "不能重命名临时文件为 %s" | |
4171 | ||
5809aa05 | 4172 | #: transport.c:63 |
a0b6b246 JX |
4173 | #, c-format |
4174 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
4175 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
4176 | ||
5809aa05 | 4177 | #: transport.c:152 |
a0b6b246 JX |
4178 | #, c-format |
4179 | msgid "transport: invalid depth option '%s'" | |
4180 | msgstr "传输:无效的深度选项 '%s'" | |
4181 | ||
31e5e17b | 4182 | #: transport.c:916 |
a0b6b246 JX |
4183 | #, c-format |
4184 | msgid "" | |
4185 | "The following submodule paths contain changes that can\n" | |
4186 | "not be found on any remote:\n" | |
4187 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
4188 | ||
31e5e17b | 4189 | #: transport.c:920 |
a0b6b246 JX |
4190 | #, c-format |
4191 | msgid "" | |
4192 | "\n" | |
4193 | "Please try\n" | |
4194 | "\n" | |
4195 | "\tgit push --recurse-submodules=on-demand\n" | |
4196 | "\n" | |
4197 | "or cd to the path and use\n" | |
4198 | "\n" | |
4199 | "\tgit push\n" | |
4200 | "\n" | |
4201 | "to push them to a remote.\n" | |
4202 | "\n" | |
4203 | msgstr "" | |
4204 | "\n" | |
4205 | "请尝试\n" | |
4206 | "\n" | |
4207 | "\tgit push --recurse-submodules=on-demand\n" | |
4208 | "\n" | |
4209 | "或者进入到子目录执行\n" | |
4210 | "\n" | |
4211 | "\tgit push\n" | |
4212 | "\n" | |
4213 | "以推送至远程。\n" | |
4214 | "\n" | |
4215 | ||
31e5e17b | 4216 | #: transport.c:928 |
a0b6b246 JX |
4217 | msgid "Aborting." |
4218 | msgstr "正在终止。" | |
4219 | ||
31e5e17b | 4220 | #: transport-helper.c:1079 |
a0b6b246 JX |
4221 | #, c-format |
4222 | msgid "Could not read ref %s" | |
4223 | msgstr "不能读取引用 %s" | |
4224 | ||
4225 | #: tree-walk.c:31 | |
4226 | msgid "too-short tree object" | |
4227 | msgstr "太短的树对象" | |
4228 | ||
4229 | #: tree-walk.c:37 | |
4230 | msgid "malformed mode in tree entry" | |
29004bbb | 4231 | msgstr "树对象中的条目模式错误" |
a0b6b246 JX |
4232 | |
4233 | #: tree-walk.c:41 | |
4234 | msgid "empty filename in tree entry" | |
4235 | msgstr "树对象条目中空的文件名" | |
4236 | ||
6937cb4e | 4237 | #: tree-walk.c:114 |
a0b6b246 JX |
4238 | msgid "too-short tree file" |
4239 | msgstr "太短的树文件" | |
4240 | ||
31e5e17b | 4241 | #: unpack-trees.c:108 |
a0b6b246 JX |
4242 | #, c-format |
4243 | msgid "" | |
4244 | "Your local changes to the following files would be overwritten by checkout:\n" | |
4245 | "%%sPlease commit your changes or stash them before you switch branches." | |
4246 | msgstr "" | |
4247 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 4248 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 4249 | |
31e5e17b | 4250 | #: unpack-trees.c:110 |
a0b6b246 JX |
4251 | #, c-format |
4252 | msgid "" | |
4253 | "Your local changes to the following files would be overwritten by checkout:\n" | |
4254 | "%%s" | |
4255 | msgstr "" | |
4256 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
4257 | "%%s" | |
4258 | ||
31e5e17b | 4259 | #: unpack-trees.c:113 |
a0b6b246 JX |
4260 | #, c-format |
4261 | msgid "" | |
4262 | "Your local changes to the following files would be overwritten by merge:\n" | |
4263 | "%%sPlease commit your changes or stash them before you merge." | |
4264 | msgstr "" | |
4265 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 4266 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 4267 | |
31e5e17b | 4268 | #: unpack-trees.c:115 |
a0b6b246 JX |
4269 | #, c-format |
4270 | msgid "" | |
4271 | "Your local changes to the following files would be overwritten by merge:\n" | |
4272 | "%%s" | |
4273 | msgstr "" | |
4274 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
4275 | "%%s" | |
4276 | ||
31e5e17b | 4277 | #: unpack-trees.c:118 |
a0b6b246 JX |
4278 | #, c-format |
4279 | msgid "" | |
4280 | "Your local changes to the following files would be overwritten by %s:\n" | |
4281 | "%%sPlease commit your changes or stash them before you %s." | |
4282 | msgstr "" | |
4283 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 4284 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 4285 | |
31e5e17b | 4286 | #: unpack-trees.c:120 |
a0b6b246 JX |
4287 | #, c-format |
4288 | msgid "" | |
4289 | "Your local changes to the following files would be overwritten by %s:\n" | |
4290 | "%%s" | |
4291 | msgstr "" | |
4292 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
4293 | "%%s" | |
c04f5ac3 | 4294 | |
31e5e17b | 4295 | #: unpack-trees.c:125 |
a0b6b246 JX |
4296 | #, c-format |
4297 | msgid "" | |
1a79b2f1 | 4298 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
4299 | "%s" |
4300 | msgstr "" | |
4301 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
4302 | "%s" | |
1b7f4a34 | 4303 | |
31e5e17b | 4304 | #: unpack-trees.c:129 |
a0b6b246 JX |
4305 | #, c-format |
4306 | msgid "" | |
4307 | "The following untracked working tree files would be removed by checkout:\n" | |
4308 | "%%sPlease move or remove them before you switch branches." | |
4309 | msgstr "" | |
4310 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
4311 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 4312 | |
31e5e17b | 4313 | #: unpack-trees.c:131 |
a0b6b246 JX |
4314 | #, c-format |
4315 | msgid "" | |
4316 | "The following untracked working tree files would be removed by checkout:\n" | |
4317 | "%%s" | |
4318 | msgstr "" | |
4319 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
4320 | "%%s" | |
1003b3a5 | 4321 | |
31e5e17b | 4322 | #: unpack-trees.c:134 |
a0b6b246 JX |
4323 | #, c-format |
4324 | msgid "" | |
4325 | "The following untracked working tree files would be removed by merge:\n" | |
4326 | "%%sPlease move or remove them before you merge." | |
4327 | msgstr "" | |
4328 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
4329 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 4330 | |
31e5e17b | 4331 | #: unpack-trees.c:136 |
a0b6b246 JX |
4332 | #, c-format |
4333 | msgid "" | |
4334 | "The following untracked working tree files would be removed by merge:\n" | |
4335 | "%%s" | |
4336 | msgstr "" | |
4337 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
4338 | "%%s" | |
c04f5ac3 | 4339 | |
31e5e17b | 4340 | #: unpack-trees.c:139 |
a0b6b246 JX |
4341 | #, c-format |
4342 | msgid "" | |
4343 | "The following untracked working tree files would be removed by %s:\n" | |
4344 | "%%sPlease move or remove them before you %s." | |
4345 | msgstr "" | |
4346 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
4347 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 4348 | |
31e5e17b | 4349 | #: unpack-trees.c:141 |
a0b6b246 JX |
4350 | #, c-format |
4351 | msgid "" | |
4352 | "The following untracked working tree files would be removed by %s:\n" | |
4353 | "%%s" | |
4354 | msgstr "" | |
4355 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
4356 | "%%s" | |
c04f5ac3 | 4357 | |
31e5e17b | 4358 | #: unpack-trees.c:146 |
a0b6b246 JX |
4359 | #, c-format |
4360 | msgid "" | |
4361 | "The following untracked working tree files would be overwritten by " | |
4362 | "checkout:\n" | |
4363 | "%%sPlease move or remove them before you switch branches." | |
4364 | msgstr "" | |
4365 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
4366 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 4367 | |
31e5e17b | 4368 | #: unpack-trees.c:148 |
1003b3a5 | 4369 | #, c-format |
4dcdc3d8 | 4370 | msgid "" |
a0b6b246 JX |
4371 | "The following untracked working tree files would be overwritten by " |
4372 | "checkout:\n" | |
4373 | "%%s" | |
4dcdc3d8 | 4374 | msgstr "" |
a0b6b246 JX |
4375 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
4376 | "%%s" | |
1003b3a5 | 4377 | |
31e5e17b | 4378 | #: unpack-trees.c:151 |
c04f5ac3 | 4379 | #, c-format |
a0b6b246 JX |
4380 | msgid "" |
4381 | "The following untracked working tree files would be overwritten by merge:\n" | |
4382 | "%%sPlease move or remove them before you merge." | |
4383 | msgstr "" | |
4384 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
4385 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 4386 | |
31e5e17b | 4387 | #: unpack-trees.c:153 |
a0b6b246 JX |
4388 | #, c-format |
4389 | msgid "" | |
4390 | "The following untracked working tree files would be overwritten by merge:\n" | |
4391 | "%%s" | |
4392 | msgstr "" | |
4393 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
4394 | "%%s" | |
c04f5ac3 | 4395 | |
31e5e17b | 4396 | #: unpack-trees.c:156 |
a0b6b246 JX |
4397 | #, c-format |
4398 | msgid "" | |
4399 | "The following untracked working tree files would be overwritten by %s:\n" | |
4400 | "%%sPlease move or remove them before you %s." | |
4401 | msgstr "" | |
4402 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
4403 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 4404 | |
31e5e17b | 4405 | #: unpack-trees.c:158 |
07432cef | 4406 | #, c-format |
a0b6b246 JX |
4407 | msgid "" |
4408 | "The following untracked working tree files would be overwritten by %s:\n" | |
4409 | "%%s" | |
4410 | msgstr "" | |
4411 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
4412 | "%%s" | |
c04f5ac3 | 4413 | |
31e5e17b | 4414 | #: unpack-trees.c:165 |
07432cef | 4415 | #, c-format |
a0b6b246 JX |
4416 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
4417 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 4418 | |
31e5e17b | 4419 | #: unpack-trees.c:168 |
07432cef | 4420 | #, c-format |
ef317cd5 | 4421 | msgid "" |
6937cb4e | 4422 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
a0b6b246 JX |
4423 | "%s" |
4424 | msgstr "" | |
4425 | "无法更新稀疏检出:如下条目不是最新:\n" | |
4426 | "%s" | |
c04f5ac3 | 4427 | |
31e5e17b | 4428 | #: unpack-trees.c:170 |
07432cef | 4429 | #, c-format |
a0b6b246 JX |
4430 | msgid "" |
4431 | "The following working tree files would be overwritten by sparse checkout " | |
4432 | "update:\n" | |
4433 | "%s" | |
4434 | msgstr "" | |
4435 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
4436 | "%s" | |
c04f5ac3 | 4437 | |
31e5e17b | 4438 | #: unpack-trees.c:172 |
07432cef | 4439 | #, c-format |
a0b6b246 JX |
4440 | msgid "" |
4441 | "The following working tree files would be removed by sparse checkout " | |
4442 | "update:\n" | |
4443 | "%s" | |
4444 | msgstr "" | |
4445 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
4446 | "%s" | |
c04f5ac3 | 4447 | |
31e5e17b | 4448 | #: unpack-trees.c:174 |
87cb7997 JX |
4449 | #, c-format |
4450 | msgid "" | |
4451 | "Cannot update submodule:\n" | |
4452 | "%s" | |
4453 | msgstr "" | |
4454 | "无法更新子模组:\n" | |
4455 | "%s" | |
4456 | ||
31e5e17b | 4457 | #: unpack-trees.c:251 |
07432cef | 4458 | #, c-format |
a0b6b246 JX |
4459 | msgid "Aborting\n" |
4460 | msgstr "终止中\n" | |
ef317cd5 | 4461 | |
31e5e17b | 4462 | #: unpack-trees.c:333 |
a0b6b246 JX |
4463 | msgid "Checking out files" |
4464 | msgstr "正在检出文件" | |
c04f5ac3 | 4465 | |
87cb7997 | 4466 | #: urlmatch.c:163 |
a0b6b246 JX |
4467 | msgid "invalid URL scheme name or missing '://' suffix" |
4468 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
4469 | ||
87cb7997 | 4470 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 4471 | #, c-format |
a0b6b246 JX |
4472 | msgid "invalid %XX escape sequence" |
4473 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 4474 | |
87cb7997 | 4475 | #: urlmatch.c:215 |
a0b6b246 JX |
4476 | msgid "missing host and scheme is not 'file:'" |
4477 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 4478 | |
87cb7997 | 4479 | #: urlmatch.c:232 |
a0b6b246 JX |
4480 | msgid "a 'file:' URL may not have a port number" |
4481 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 4482 | |
87cb7997 | 4483 | #: urlmatch.c:247 |
a0b6b246 JX |
4484 | msgid "invalid characters in host name" |
4485 | msgstr "主机名中包含无效的字符" | |
90314792 | 4486 | |
87cb7997 | 4487 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
4488 | msgid "invalid port number" |
4489 | msgstr "无效的端口号" | |
c04f5ac3 | 4490 | |
87cb7997 | 4491 | #: urlmatch.c:371 |
a0b6b246 JX |
4492 | msgid "invalid '..' path segment" |
4493 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 4494 | |
31e5e17b | 4495 | #: worktree.c:245 builtin/am.c:2147 |
a77c07d9 | 4496 | #, c-format |
a0b6b246 JX |
4497 | msgid "failed to read '%s'" |
4498 | msgstr "无法读取 '%s'" | |
ef317cd5 | 4499 | |
31e5e17b JX |
4500 | #: worktree.c:291 |
4501 | #, c-format | |
4502 | msgid "'%s' at main working tree is not the repository directory" | |
4503 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
4504 | ||
4505 | #: worktree.c:302 | |
4506 | #, c-format | |
4507 | msgid "'%s' file does not contain absolute path to the working tree location" | |
4508 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
4509 | ||
4510 | #: worktree.c:314 | |
4511 | #, c-format | |
4512 | msgid "'%s' does not exist" | |
4513 | msgstr "'%s' 不存在" | |
4514 | ||
4515 | #: worktree.c:320 | |
4516 | #, c-format | |
4517 | msgid "'%s' is not a .git file, error code %d" | |
4518 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
4519 | ||
4520 | #: worktree.c:328 | |
4521 | #, c-format | |
4522 | msgid "'%s' does not point back to '%s'" | |
4523 | msgstr "'%s' 没有指回到 '%s'" | |
4524 | ||
a4f16749 | 4525 | #: wrapper.c:223 wrapper.c:393 |
c04f5ac3 | 4526 | #, c-format |
a0b6b246 JX |
4527 | msgid "could not open '%s' for reading and writing" |
4528 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 4529 | |
5809aa05 | 4530 | #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 |
31e5e17b | 4531 | #: builtin/am.c:862 builtin/merge.c:1044 |
c04f5ac3 | 4532 | #, c-format |
a0b6b246 JX |
4533 | msgid "could not open '%s' for reading" |
4534 | msgstr "无法打开 '%s' 进行读取" | |
c04f5ac3 | 4535 | |
a4f16749 | 4536 | #: wrapper.c:424 wrapper.c:624 |
a0b6b246 JX |
4537 | #, c-format |
4538 | msgid "unable to access '%s'" | |
4539 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 4540 | |
a4f16749 | 4541 | #: wrapper.c:632 |
a0b6b246 JX |
4542 | msgid "unable to get current working directory" |
4543 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 4544 | |
31e5e17b | 4545 | #: wt-status.c:151 |
a0b6b246 JX |
4546 | msgid "Unmerged paths:" |
4547 | msgstr "未合并的路径:" | |
7aea43ff | 4548 | |
a0b6b246 | 4549 | # 译者:注意保持前导空格 |
31e5e17b | 4550 | #: wt-status.c:178 wt-status.c:205 |
c04f5ac3 | 4551 | #, c-format |
a0b6b246 JX |
4552 | msgid " (use \"git reset %s <file>...\" to unstage)" |
4553 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4554 | |
a0b6b246 | 4555 | # 译者:注意保持前导空格 |
31e5e17b | 4556 | #: wt-status.c:180 wt-status.c:207 |
a0b6b246 JX |
4557 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
4558 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4559 | |
a0b6b246 | 4560 | # 译者:注意保持前导空格 |
31e5e17b | 4561 | #: wt-status.c:184 |
a0b6b246 JX |
4562 | msgid " (use \"git add <file>...\" to mark resolution)" |
4563 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 4564 | |
a0b6b246 | 4565 | # 译者:注意保持前导空格 |
31e5e17b | 4566 | #: wt-status.c:186 wt-status.c:190 |
a0b6b246 JX |
4567 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
4568 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 4569 | |
a0b6b246 | 4570 | # 译者:注意保持前导空格 |
31e5e17b | 4571 | #: wt-status.c:188 |
a0b6b246 JX |
4572 | msgid " (use \"git rm <file>...\" to mark resolution)" |
4573 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 4574 | |
31e5e17b | 4575 | #: wt-status.c:199 wt-status.c:1007 |
a0b6b246 JX |
4576 | msgid "Changes to be committed:" |
4577 | msgstr "要提交的变更:" | |
ef317cd5 | 4578 | |
31e5e17b | 4579 | #: wt-status.c:217 wt-status.c:1016 |
a0b6b246 JX |
4580 | msgid "Changes not staged for commit:" |
4581 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 4582 | |
a0b6b246 | 4583 | # 译者:注意保持前导空格 |
31e5e17b | 4584 | #: wt-status.c:221 |
a0b6b246 JX |
4585 | msgid " (use \"git add <file>...\" to update what will be committed)" |
4586 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4587 | |
a0b6b246 | 4588 | # 译者:注意保持前导空格 |
31e5e17b | 4589 | #: wt-status.c:223 |
a0b6b246 JX |
4590 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
4591 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4592 | |
a0b6b246 | 4593 | # 译者:注意保持前导空格 |
31e5e17b | 4594 | #: wt-status.c:224 |
a0b6b246 JX |
4595 | msgid "" |
4596 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
4597 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 4598 | |
a0b6b246 | 4599 | # 译者:注意保持前导空格 |
31e5e17b | 4600 | #: wt-status.c:226 |
a0b6b246 JX |
4601 | msgid " (commit or discard the untracked or modified content in submodules)" |
4602 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 4603 | |
a0b6b246 | 4604 | # 译者:注意保持前导空格 |
31e5e17b | 4605 | #: wt-status.c:238 |
a0b6b246 JX |
4606 | #, c-format |
4607 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
4608 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 4609 | |
31e5e17b | 4610 | #: wt-status.c:253 |
a0b6b246 JX |
4611 | msgid "both deleted:" |
4612 | msgstr "双方删除:" | |
ef317cd5 | 4613 | |
31e5e17b | 4614 | #: wt-status.c:255 |
a0b6b246 JX |
4615 | msgid "added by us:" |
4616 | msgstr "由我们添加:" | |
4dcdc3d8 | 4617 | |
31e5e17b | 4618 | #: wt-status.c:257 |
a0b6b246 JX |
4619 | msgid "deleted by them:" |
4620 | msgstr "由他们删除:" | |
ef317cd5 | 4621 | |
31e5e17b | 4622 | #: wt-status.c:259 |
a0b6b246 JX |
4623 | msgid "added by them:" |
4624 | msgstr "由他们添加:" | |
ef317cd5 | 4625 | |
31e5e17b | 4626 | #: wt-status.c:261 |
a0b6b246 JX |
4627 | msgid "deleted by us:" |
4628 | msgstr "由我们删除:" | |
ef317cd5 | 4629 | |
31e5e17b | 4630 | #: wt-status.c:263 |
a0b6b246 JX |
4631 | msgid "both added:" |
4632 | msgstr "双方添加:" | |
5c57d762 | 4633 | |
31e5e17b | 4634 | #: wt-status.c:265 |
a0b6b246 JX |
4635 | msgid "both modified:" |
4636 | msgstr "双方修改:" | |
5c57d762 | 4637 | |
31e5e17b | 4638 | #: wt-status.c:275 |
a0b6b246 JX |
4639 | msgid "new file:" |
4640 | msgstr "新文件:" | |
8ada9598 | 4641 | |
31e5e17b | 4642 | #: wt-status.c:277 |
a0b6b246 JX |
4643 | msgid "copied:" |
4644 | msgstr "拷贝:" | |
8ada9598 | 4645 | |
31e5e17b | 4646 | #: wt-status.c:279 |
a0b6b246 JX |
4647 | msgid "deleted:" |
4648 | msgstr "删除:" | |
8ada9598 | 4649 | |
31e5e17b | 4650 | #: wt-status.c:281 |
a0b6b246 JX |
4651 | msgid "modified:" |
4652 | msgstr "修改:" | |
8ada9598 | 4653 | |
31e5e17b | 4654 | #: wt-status.c:283 |
a0b6b246 JX |
4655 | msgid "renamed:" |
4656 | msgstr "重命名:" | |
5c57d762 | 4657 | |
31e5e17b | 4658 | #: wt-status.c:285 |
a0b6b246 JX |
4659 | msgid "typechange:" |
4660 | msgstr "类型变更:" | |
8ada9598 | 4661 | |
31e5e17b | 4662 | #: wt-status.c:287 |
a0b6b246 JX |
4663 | msgid "unknown:" |
4664 | msgstr "未知:" | |
8ada9598 | 4665 | |
31e5e17b | 4666 | #: wt-status.c:289 |
a0b6b246 JX |
4667 | msgid "unmerged:" |
4668 | msgstr "未合并:" | |
8ada9598 | 4669 | |
a0b6b246 | 4670 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
31e5e17b | 4671 | #: wt-status.c:369 |
a0b6b246 JX |
4672 | msgid "new commits, " |
4673 | msgstr "新提交, " | |
8ada9598 | 4674 | |
a0b6b246 | 4675 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
31e5e17b | 4676 | #: wt-status.c:371 |
a0b6b246 JX |
4677 | msgid "modified content, " |
4678 | msgstr "修改的内容, " | |
1b7f4a34 | 4679 | |
a0b6b246 | 4680 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
31e5e17b | 4681 | #: wt-status.c:373 |
a0b6b246 JX |
4682 | msgid "untracked content, " |
4683 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 4684 | |
31e5e17b | 4685 | #: wt-status.c:847 |
a4f16749 JX |
4686 | #, c-format |
4687 | msgid "Your stash currently has %d entry" | |
4688 | msgid_plural "Your stash currently has %d entries" | |
4689 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
4690 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
4691 | ||
31e5e17b | 4692 | #: wt-status.c:879 |
a0b6b246 JX |
4693 | msgid "Submodules changed but not updated:" |
4694 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 4695 | |
31e5e17b | 4696 | #: wt-status.c:881 |
a0b6b246 JX |
4697 | msgid "Submodule changes to be committed:" |
4698 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 4699 | |
31e5e17b | 4700 | #: wt-status.c:963 |
a0b6b246 | 4701 | msgid "" |
6937cb4e JX |
4702 | "Do not modify or remove the line above.\n" |
4703 | "Everything below it will be ignored." | |
a0b6b246 | 4704 | msgstr "" |
6937cb4e JX |
4705 | "不要改动或删除上面的一行。\n" |
4706 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 4707 | |
31e5e17b | 4708 | #: wt-status.c:1076 |
a0b6b246 JX |
4709 | msgid "You have unmerged paths." |
4710 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 4711 | |
a0b6b246 | 4712 | # 译者:注意保持前导空格 |
31e5e17b | 4713 | #: wt-status.c:1079 |
a0b6b246 JX |
4714 | msgid " (fix conflicts and run \"git commit\")" |
4715 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 4716 | |
a0b6b246 | 4717 | # 译者:注意保持前导空格 |
31e5e17b | 4718 | #: wt-status.c:1081 |
a0b6b246 JX |
4719 | msgid " (use \"git merge --abort\" to abort the merge)" |
4720 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 4721 | |
31e5e17b | 4722 | #: wt-status.c:1086 |
a0b6b246 JX |
4723 | msgid "All conflicts fixed but you are still merging." |
4724 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 4725 | |
a0b6b246 | 4726 | # 译者:注意保持前导空格 |
31e5e17b | 4727 | #: wt-status.c:1089 |
a0b6b246 JX |
4728 | msgid " (use \"git commit\" to conclude merge)" |
4729 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 4730 | |
31e5e17b | 4731 | #: wt-status.c:1099 |
a0b6b246 JX |
4732 | msgid "You are in the middle of an am session." |
4733 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 4734 | |
31e5e17b | 4735 | #: wt-status.c:1102 |
a0b6b246 JX |
4736 | msgid "The current patch is empty." |
4737 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 4738 | |
a0b6b246 | 4739 | # 译者:注意保持前导空格 |
31e5e17b | 4740 | #: wt-status.c:1106 |
a0b6b246 JX |
4741 | msgid " (fix conflicts and then run \"git am --continue\")" |
4742 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 4743 | |
a0b6b246 | 4744 | # 译者:注意保持前导空格 |
31e5e17b | 4745 | #: wt-status.c:1108 |
a0b6b246 JX |
4746 | msgid " (use \"git am --skip\" to skip this patch)" |
4747 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 4748 | |
a0b6b246 | 4749 | # 译者:注意保持前导空格 |
31e5e17b | 4750 | #: wt-status.c:1110 |
a0b6b246 JX |
4751 | msgid " (use \"git am --abort\" to restore the original branch)" |
4752 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 4753 | |
31e5e17b | 4754 | #: wt-status.c:1242 |
1a79b2f1 JX |
4755 | msgid "git-rebase-todo is missing." |
4756 | msgstr "git-rebase-todo 丢失。" | |
4757 | ||
31e5e17b | 4758 | #: wt-status.c:1244 |
a0b6b246 JX |
4759 | msgid "No commands done." |
4760 | msgstr "没有命令被执行。" | |
4761 | ||
31e5e17b | 4762 | #: wt-status.c:1247 |
1b7f4a34 | 4763 | #, c-format |
a0b6b246 JX |
4764 | msgid "Last command done (%d command done):" |
4765 | msgid_plural "Last commands done (%d commands done):" | |
4766 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
4767 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 4768 | |
31e5e17b | 4769 | #: wt-status.c:1258 |
1b7f4a34 | 4770 | #, c-format |
a0b6b246 JX |
4771 | msgid " (see more in file %s)" |
4772 | msgstr " (更多参见文件 %s)" | |
4773 | ||
31e5e17b | 4774 | #: wt-status.c:1263 |
a0b6b246 JX |
4775 | msgid "No commands remaining." |
4776 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 4777 | |
31e5e17b | 4778 | #: wt-status.c:1266 |
1b7f4a34 | 4779 | #, c-format |
a0b6b246 JX |
4780 | msgid "Next command to do (%d remaining command):" |
4781 | msgid_plural "Next commands to do (%d remaining commands):" | |
4782 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
4783 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 4784 | |
a0b6b246 | 4785 | # 译者:注意保持前导空格 |
31e5e17b | 4786 | #: wt-status.c:1274 |
a0b6b246 JX |
4787 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
4788 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 4789 | |
31e5e17b | 4790 | #: wt-status.c:1287 |
1b7f4a34 | 4791 | #, c-format |
a0b6b246 JX |
4792 | msgid "You are currently rebasing branch '%s' on '%s'." |
4793 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 4794 | |
31e5e17b | 4795 | #: wt-status.c:1292 |
a0b6b246 JX |
4796 | msgid "You are currently rebasing." |
4797 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 4798 | |
a0b6b246 | 4799 | # 译者:注意保持前导空格 |
31e5e17b | 4800 | #: wt-status.c:1306 |
a0b6b246 JX |
4801 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
4802 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 4803 | |
a0b6b246 | 4804 | # 译者:注意保持前导空格 |
31e5e17b | 4805 | #: wt-status.c:1308 |
a0b6b246 JX |
4806 | msgid " (use \"git rebase --skip\" to skip this patch)" |
4807 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
4808 | ||
4809 | # 译者:注意保持前导空格 | |
31e5e17b | 4810 | #: wt-status.c:1310 |
a0b6b246 JX |
4811 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
4812 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
4813 | ||
4814 | # 译者:注意保持前导空格 | |
31e5e17b | 4815 | #: wt-status.c:1316 |
a0b6b246 JX |
4816 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
4817 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 4818 | |
31e5e17b | 4819 | #: wt-status.c:1320 |
a0b6b246 | 4820 | #, c-format |
1b7f4a34 | 4821 | msgid "" |
a0b6b246 JX |
4822 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
4823 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 4824 | |
31e5e17b | 4825 | #: wt-status.c:1325 |
a0b6b246 JX |
4826 | msgid "You are currently splitting a commit during a rebase." |
4827 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 4828 | |
a0b6b246 | 4829 | # 译者:注意保持前导空格 |
31e5e17b | 4830 | #: wt-status.c:1328 |
a0b6b246 JX |
4831 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
4832 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 4833 | |
31e5e17b | 4834 | #: wt-status.c:1332 |
a0b6b246 JX |
4835 | #, c-format |
4836 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
4837 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 4838 | |
31e5e17b | 4839 | #: wt-status.c:1337 |
a0b6b246 JX |
4840 | msgid "You are currently editing a commit during a rebase." |
4841 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 4842 | |
a0b6b246 | 4843 | # 译者:注意保持前导空格 |
31e5e17b | 4844 | #: wt-status.c:1340 |
a0b6b246 JX |
4845 | msgid " (use \"git commit --amend\" to amend the current commit)" |
4846 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
4847 | ||
4848 | # 译者:注意保持前导空格 | |
31e5e17b | 4849 | #: wt-status.c:1342 |
a0b6b246 JX |
4850 | msgid "" |
4851 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
4852 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 4853 | |
31e5e17b | 4854 | #: wt-status.c:1352 |
1b7f4a34 | 4855 | #, c-format |
a0b6b246 JX |
4856 | msgid "You are currently cherry-picking commit %s." |
4857 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 4858 | |
a0b6b246 | 4859 | # 译者:注意保持前导空格 |
31e5e17b | 4860 | #: wt-status.c:1357 |
a0b6b246 JX |
4861 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
4862 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 4863 | |
a0b6b246 | 4864 | # 译者:注意保持前导空格 |
31e5e17b | 4865 | #: wt-status.c:1360 |
a0b6b246 JX |
4866 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
4867 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 4868 | |
a0b6b246 | 4869 | # 译者:注意保持前导空格 |
31e5e17b | 4870 | #: wt-status.c:1362 |
a0b6b246 JX |
4871 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
4872 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 4873 | |
31e5e17b | 4874 | #: wt-status.c:1371 |
1b7f4a34 | 4875 | #, c-format |
a0b6b246 JX |
4876 | msgid "You are currently reverting commit %s." |
4877 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 4878 | |
a0b6b246 | 4879 | # 译者:注意保持前导空格 |
31e5e17b | 4880 | #: wt-status.c:1376 |
a0b6b246 JX |
4881 | msgid " (fix conflicts and run \"git revert --continue\")" |
4882 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 4883 | |
a0b6b246 | 4884 | # 译者:注意保持前导空格 |
31e5e17b | 4885 | #: wt-status.c:1379 |
a0b6b246 JX |
4886 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
4887 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 4888 | |
a0b6b246 | 4889 | # 译者:注意保持前导空格 |
31e5e17b | 4890 | #: wt-status.c:1381 |
a0b6b246 JX |
4891 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
4892 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 4893 | |
31e5e17b | 4894 | #: wt-status.c:1392 |
1b7f4a34 | 4895 | #, c-format |
a0b6b246 JX |
4896 | msgid "You are currently bisecting, started from branch '%s'." |
4897 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 4898 | |
31e5e17b | 4899 | #: wt-status.c:1396 |
a0b6b246 JX |
4900 | msgid "You are currently bisecting." |
4901 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 4902 | |
a0b6b246 | 4903 | # 译者:注意保持前导空格 |
31e5e17b | 4904 | #: wt-status.c:1399 |
a0b6b246 JX |
4905 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
4906 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 4907 | |
31e5e17b | 4908 | #: wt-status.c:1596 |
a0b6b246 JX |
4909 | msgid "On branch " |
4910 | msgstr "位于分支 " | |
1b7f4a34 | 4911 | |
31e5e17b | 4912 | #: wt-status.c:1602 |
a0b6b246 JX |
4913 | msgid "interactive rebase in progress; onto " |
4914 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 4915 | |
31e5e17b | 4916 | #: wt-status.c:1604 |
a0b6b246 JX |
4917 | msgid "rebase in progress; onto " |
4918 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 4919 | |
31e5e17b | 4920 | #: wt-status.c:1609 |
a0b6b246 JX |
4921 | msgid "HEAD detached at " |
4922 | msgstr "头指针分离于 " | |
1b7f4a34 | 4923 | |
31e5e17b | 4924 | #: wt-status.c:1611 |
a0b6b246 JX |
4925 | msgid "HEAD detached from " |
4926 | msgstr "头指针分离自 " | |
1b7f4a34 | 4927 | |
31e5e17b | 4928 | #: wt-status.c:1614 |
a0b6b246 JX |
4929 | msgid "Not currently on any branch." |
4930 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 4931 | |
31e5e17b | 4932 | #: wt-status.c:1634 |
a0b6b246 JX |
4933 | msgid "Initial commit" |
4934 | msgstr "初始提交" | |
1b7f4a34 | 4935 | |
31e5e17b | 4936 | #: wt-status.c:1635 |
a4f16749 JX |
4937 | msgid "No commits yet" |
4938 | msgstr "尚无提交" | |
4939 | ||
31e5e17b | 4940 | #: wt-status.c:1649 |
a0b6b246 JX |
4941 | msgid "Untracked files" |
4942 | msgstr "未跟踪的文件" | |
1b7f4a34 | 4943 | |
31e5e17b | 4944 | #: wt-status.c:1651 |
a0b6b246 JX |
4945 | msgid "Ignored files" |
4946 | msgstr "忽略的文件" | |
1b7f4a34 | 4947 | |
31e5e17b | 4948 | #: wt-status.c:1655 |
a0b6b246 JX |
4949 | #, c-format |
4950 | msgid "" | |
4951 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
4952 | "may speed it up, but you have to be careful not to forget to add\n" | |
4953 | "new files yourself (see 'git help status')." | |
4954 | msgstr "" | |
4955 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
4956 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 4957 | |
31e5e17b | 4958 | #: wt-status.c:1661 |
a0b6b246 JX |
4959 | #, c-format |
4960 | msgid "Untracked files not listed%s" | |
4961 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 4962 | |
a0b6b246 | 4963 | # 译者:中文字符串拼接,可删除前导空格 |
31e5e17b | 4964 | #: wt-status.c:1663 |
a0b6b246 JX |
4965 | msgid " (use -u option to show untracked files)" |
4966 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 4967 | |
31e5e17b | 4968 | #: wt-status.c:1669 |
a0b6b246 JX |
4969 | msgid "No changes" |
4970 | msgstr "没有修改" | |
1b7f4a34 | 4971 | |
31e5e17b | 4972 | #: wt-status.c:1674 |
a0b6b246 JX |
4973 | #, c-format |
4974 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
4975 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 4976 | |
31e5e17b | 4977 | #: wt-status.c:1677 |
a0b6b246 JX |
4978 | #, c-format |
4979 | msgid "no changes added to commit\n" | |
4980 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 4981 | |
31e5e17b | 4982 | #: wt-status.c:1680 |
a0b6b246 JX |
4983 | #, c-format |
4984 | msgid "" | |
4985 | "nothing added to commit but untracked files present (use \"git add\" to " | |
4986 | "track)\n" | |
4987 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 4988 | |
31e5e17b | 4989 | #: wt-status.c:1683 |
a0b6b246 JX |
4990 | #, c-format |
4991 | msgid "nothing added to commit but untracked files present\n" | |
4992 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 4993 | |
a0b6b246 | 4994 | # 译者:中文字符串拼接,可删除前导空格 |
31e5e17b | 4995 | #: wt-status.c:1686 |
a0b6b246 JX |
4996 | #, c-format |
4997 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
4998 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 4999 | |
31e5e17b | 5000 | #: wt-status.c:1689 wt-status.c:1694 |
a0b6b246 JX |
5001 | #, c-format |
5002 | msgid "nothing to commit\n" | |
5003 | msgstr "无文件要提交\n" | |
1b7f4a34 | 5004 | |
a0b6b246 | 5005 | # 译者:中文字符串拼接,可删除前导空格 |
31e5e17b | 5006 | #: wt-status.c:1692 |
a0b6b246 JX |
5007 | #, c-format |
5008 | msgid "nothing to commit (use -u to show untracked files)\n" | |
5009 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 5010 | |
a0b6b246 | 5011 | # 译者:中文字符串拼接,可删除前导空格 |
31e5e17b | 5012 | #: wt-status.c:1696 |
a0b6b246 JX |
5013 | #, c-format |
5014 | msgid "nothing to commit, working tree clean\n" | |
5015 | msgstr "无文件要提交,干净的工作区\n" | |
5016 | ||
31e5e17b | 5017 | #: wt-status.c:1809 |
a4f16749 JX |
5018 | msgid "No commits yet on " |
5019 | msgstr "尚无提交在 " | |
1b7f4a34 | 5020 | |
31e5e17b | 5021 | #: wt-status.c:1813 |
a0b6b246 JX |
5022 | msgid "HEAD (no branch)" |
5023 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 5024 | |
31e5e17b JX |
5025 | #: wt-status.c:1844 |
5026 | msgid "different" | |
5027 | msgstr "不同" | |
5028 | ||
a0b6b246 | 5029 | # 译者:注意保持句尾空格 |
31e5e17b | 5030 | #: wt-status.c:1846 wt-status.c:1854 |
a0b6b246 JX |
5031 | msgid "behind " |
5032 | msgstr "落后 " | |
1b7f4a34 | 5033 | |
31e5e17b | 5034 | #: wt-status.c:1849 wt-status.c:1852 |
a0b6b246 JX |
5035 | msgid "ahead " |
5036 | msgstr "领先 " | |
1b7f4a34 | 5037 | |
a0b6b246 | 5038 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
31e5e17b | 5039 | #: wt-status.c:2358 |
a0b6b246 JX |
5040 | #, c-format |
5041 | msgid "cannot %s: You have unstaged changes." | |
5042 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 5043 | |
31e5e17b | 5044 | #: wt-status.c:2364 |
a0b6b246 | 5045 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 5046 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 5047 | |
31e5e17b | 5048 | #: wt-status.c:2366 |
a0b6b246 JX |
5049 | #, c-format |
5050 | msgid "cannot %s: Your index contains uncommitted changes." | |
5051 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 5052 | |
31e5e17b | 5053 | #: compat/precompose_utf8.c:58 builtin/clone.c:440 |
a0b6b246 JX |
5054 | #, c-format |
5055 | msgid "failed to unlink '%s'" | |
5056 | msgstr "无法删除 '%s'" | |
1b7f4a34 | 5057 | |
a4f16749 | 5058 | #: builtin/add.c:24 |
a0b6b246 JX |
5059 | msgid "git add [<options>] [--] <pathspec>..." |
5060 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 5061 | |
5809aa05 | 5062 | #: builtin/add.c:83 |
a0b6b246 JX |
5063 | #, c-format |
5064 | msgid "unexpected diff status %c" | |
5065 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 5066 | |
31e5e17b | 5067 | #: builtin/add.c:88 builtin/commit.c:257 |
a0b6b246 JX |
5068 | msgid "updating files failed" |
5069 | msgstr "更新文件失败" | |
1b7f4a34 | 5070 | |
5809aa05 | 5071 | #: builtin/add.c:98 |
a0b6b246 JX |
5072 | #, c-format |
5073 | msgid "remove '%s'\n" | |
5074 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 5075 | |
5809aa05 | 5076 | #: builtin/add.c:173 |
a0b6b246 JX |
5077 | msgid "Unstaged changes after refreshing the index:" |
5078 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 5079 | |
5809aa05 | 5080 | #: builtin/add.c:233 builtin/rev-parse.c:888 |
a0b6b246 JX |
5081 | msgid "Could not read the index" |
5082 | msgstr "不能读取索引" | |
1b7f4a34 | 5083 | |
5809aa05 | 5084 | #: builtin/add.c:244 |
a0b6b246 JX |
5085 | #, c-format |
5086 | msgid "Could not open '%s' for writing." | |
5087 | msgstr "无法打开 '%s' 进行写入。" | |
1b7f4a34 | 5088 | |
5809aa05 | 5089 | #: builtin/add.c:248 |
a0b6b246 JX |
5090 | msgid "Could not write patch" |
5091 | msgstr "不能生成补丁" | |
1b7f4a34 | 5092 | |
5809aa05 | 5093 | #: builtin/add.c:251 |
a0b6b246 JX |
5094 | msgid "editing patch failed" |
5095 | msgstr "编辑补丁失败" | |
1b7f4a34 | 5096 | |
5809aa05 | 5097 | #: builtin/add.c:254 |
1b7f4a34 | 5098 | #, c-format |
a0b6b246 | 5099 | msgid "Could not stat '%s'" |
65e2041e | 5100 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 5101 | |
5809aa05 | 5102 | #: builtin/add.c:256 |
a0b6b246 JX |
5103 | msgid "Empty patch. Aborted." |
5104 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 5105 | |
5809aa05 | 5106 | #: builtin/add.c:261 |
a0b6b246 JX |
5107 | #, c-format |
5108 | msgid "Could not apply '%s'" | |
5109 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 5110 | |
5809aa05 | 5111 | #: builtin/add.c:271 |
a0b6b246 JX |
5112 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
5113 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 5114 | |
31e5e17b | 5115 | #: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 |
5809aa05 | 5116 | #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 |
6937cb4e | 5117 | #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 |
a0b6b246 JX |
5118 | msgid "dry run" |
5119 | msgstr "演习" | |
8ada9598 | 5120 | |
5809aa05 | 5121 | #: builtin/add.c:294 |
a0b6b246 JX |
5122 | msgid "interactive picking" |
5123 | msgstr "交互式拣选" | |
8ada9598 | 5124 | |
31e5e17b | 5125 | #: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 |
a0b6b246 JX |
5126 | msgid "select hunks interactively" |
5127 | msgstr "交互式挑选数据块" | |
8ada9598 | 5128 | |
5809aa05 | 5129 | #: builtin/add.c:296 |
a0b6b246 JX |
5130 | msgid "edit current diff and apply" |
5131 | msgstr "编辑当前差异并应用" | |
8ada9598 | 5132 | |
5809aa05 | 5133 | #: builtin/add.c:297 |
a0b6b246 JX |
5134 | msgid "allow adding otherwise ignored files" |
5135 | msgstr "允许添加忽略的文件" | |
8ada9598 | 5136 | |
5809aa05 | 5137 | #: builtin/add.c:298 |
a0b6b246 JX |
5138 | msgid "update tracked files" |
5139 | msgstr "更新已跟踪的文件" | |
8ada9598 | 5140 | |
5809aa05 JX |
5141 | #: builtin/add.c:299 |
5142 | msgid "renormalize EOL of tracked files (implies -u)" | |
5143 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
5144 | ||
5145 | #: builtin/add.c:300 | |
a0b6b246 JX |
5146 | msgid "record only the fact that the path will be added later" |
5147 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 5148 | |
5809aa05 | 5149 | #: builtin/add.c:301 |
a0b6b246 JX |
5150 | msgid "add changes from all tracked and untracked files" |
5151 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 5152 | |
5809aa05 | 5153 | #: builtin/add.c:304 |
a0b6b246 JX |
5154 | msgid "ignore paths removed in the working tree (same as --no-all)" |
5155 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 5156 | |
5809aa05 | 5157 | #: builtin/add.c:306 |
a0b6b246 JX |
5158 | msgid "don't add, only refresh the index" |
5159 | msgstr "不添加,只刷新索引" | |
8ada9598 | 5160 | |
5809aa05 | 5161 | #: builtin/add.c:307 |
a0b6b246 JX |
5162 | msgid "just skip files which cannot be added because of errors" |
5163 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 5164 | |
5809aa05 | 5165 | #: builtin/add.c:308 |
a0b6b246 JX |
5166 | msgid "check if - even missing - files are ignored in dry run" |
5167 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 5168 | |
5809aa05 | 5169 | #: builtin/add.c:309 builtin/update-index.c:964 |
a0b6b246 JX |
5170 | msgid "(+/-)x" |
5171 | msgstr "(+/-)x" | |
8ada9598 | 5172 | |
5809aa05 | 5173 | #: builtin/add.c:309 builtin/update-index.c:965 |
a0b6b246 JX |
5174 | msgid "override the executable bit of the listed files" |
5175 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 5176 | |
5809aa05 | 5177 | #: builtin/add.c:311 |
a4f16749 JX |
5178 | msgid "warn when adding an embedded repository" |
5179 | msgstr "创建一个嵌入式仓库时给予警告" | |
5180 | ||
5809aa05 | 5181 | #: builtin/add.c:326 |
a4f16749 JX |
5182 | #, c-format |
5183 | msgid "" | |
5184 | "You've added another git repository inside your current repository.\n" | |
5185 | "Clones of the outer repository will not contain the contents of\n" | |
5186 | "the embedded repository and will not know how to obtain it.\n" | |
5187 | "If you meant to add a submodule, use:\n" | |
5188 | "\n" | |
5189 | "\tgit submodule add <url> %s\n" | |
5190 | "\n" | |
5191 | "If you added this path by mistake, you can remove it from the\n" | |
5192 | "index with:\n" | |
5193 | "\n" | |
5194 | "\tgit rm --cached %s\n" | |
5195 | "\n" | |
5196 | "See \"git help submodule\" for more information." | |
5197 | msgstr "" | |
6937cb4e JX |
5198 | "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并" |
5199 | "且不知道该如何获取它。\n" | |
a4f16749 JX |
5200 | "如果您要添加一个子模组,使用:\n" |
5201 | "\n" | |
5202 | "\tgit submodule add <url> %s\n" | |
5203 | "\n" | |
5204 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
5205 | "\n" | |
5206 | "\tgit rm --cached %s\n" | |
5207 | "\n" | |
5208 | "参见 \"git help submodule\" 获取更多信息。" | |
5209 | ||
5809aa05 | 5210 | #: builtin/add.c:354 |
a4f16749 JX |
5211 | #, c-format |
5212 | msgid "adding embedded git repository: %s" | |
5213 | msgstr "正在添加嵌入式 git 仓库:%s" | |
5214 | ||
5809aa05 | 5215 | #: builtin/add.c:372 |
8ada9598 | 5216 | #, c-format |
a0b6b246 JX |
5217 | msgid "Use -f if you really want to add them.\n" |
5218 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 5219 | |
5809aa05 | 5220 | #: builtin/add.c:380 |
a0b6b246 JX |
5221 | msgid "adding files failed" |
5222 | msgstr "添加文件失败" | |
8ada9598 | 5223 | |
5809aa05 | 5224 | #: builtin/add.c:417 |
a0b6b246 JX |
5225 | msgid "-A and -u are mutually incompatible" |
5226 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 5227 | |
5809aa05 | 5228 | #: builtin/add.c:424 |
a0b6b246 JX |
5229 | msgid "Option --ignore-missing can only be used together with --dry-run" |
5230 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 5231 | |
5809aa05 | 5232 | #: builtin/add.c:428 |
8ada9598 | 5233 | #, c-format |
a0b6b246 JX |
5234 | msgid "--chmod param '%s' must be either -x or +x" |
5235 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 5236 | |
5809aa05 | 5237 | #: builtin/add.c:443 |
8ada9598 | 5238 | #, c-format |
a0b6b246 JX |
5239 | msgid "Nothing specified, nothing added.\n" |
5240 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 5241 | |
5809aa05 | 5242 | #: builtin/add.c:444 |
8ada9598 | 5243 | #, c-format |
a0b6b246 JX |
5244 | msgid "Maybe you wanted to say 'git add .'?\n" |
5245 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 5246 | |
31e5e17b JX |
5247 | #: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 |
5248 | #: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 | |
5249 | #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 | |
5250 | #: builtin/rm.c:271 builtin/submodule--helper.c:326 | |
a0b6b246 JX |
5251 | msgid "index file corrupt" |
5252 | msgstr "索引文件损坏" | |
8ada9598 | 5253 | |
6937cb4e | 5254 | #: builtin/am.c:414 |
a0b6b246 JX |
5255 | msgid "could not parse author script" |
5256 | msgstr "不能解析作者脚本" | |
8ada9598 | 5257 | |
6937cb4e | 5258 | #: builtin/am.c:498 |
81809b99 | 5259 | #, c-format |
a0b6b246 JX |
5260 | msgid "'%s' was deleted by the applypatch-msg hook" |
5261 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 5262 | |
6937cb4e | 5263 | #: builtin/am.c:539 |
8ada9598 | 5264 | #, c-format |
a0b6b246 JX |
5265 | msgid "Malformed input line: '%s'." |
5266 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 5267 | |
6937cb4e | 5268 | #: builtin/am.c:576 |
8ada9598 | 5269 | #, c-format |
a0b6b246 JX |
5270 | msgid "Failed to copy notes from '%s' to '%s'" |
5271 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 5272 | |
6937cb4e | 5273 | #: builtin/am.c:602 |
a0b6b246 JX |
5274 | msgid "fseek failed" |
5275 | msgstr "fseek 失败" | |
8ada9598 | 5276 | |
5809aa05 | 5277 | #: builtin/am.c:790 |
8ada9598 | 5278 | #, c-format |
a0b6b246 JX |
5279 | msgid "could not parse patch '%s'" |
5280 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 5281 | |
5809aa05 | 5282 | #: builtin/am.c:855 |
a0b6b246 JX |
5283 | msgid "Only one StGIT patch series can be applied at once" |
5284 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
5285 | ||
5809aa05 | 5286 | #: builtin/am.c:903 |
a0b6b246 JX |
5287 | msgid "invalid timestamp" |
5288 | msgstr "无效的时间戳" | |
5289 | ||
5809aa05 | 5290 | #: builtin/am.c:908 builtin/am.c:920 |
a0b6b246 JX |
5291 | msgid "invalid Date line" |
5292 | msgstr "无效的日期行" | |
8ada9598 | 5293 | |
5809aa05 | 5294 | #: builtin/am.c:915 |
a0b6b246 JX |
5295 | msgid "invalid timezone offset" |
5296 | msgstr "无效的时区偏移值" | |
8ada9598 | 5297 | |
5809aa05 | 5298 | #: builtin/am.c:1008 |
a0b6b246 | 5299 | msgid "Patch format detection failed." |
87cb7997 | 5300 | msgstr "补丁格式探测失败。" |
8ada9598 | 5301 | |
31e5e17b | 5302 | #: builtin/am.c:1013 builtin/clone.c:405 |
8ada9598 | 5303 | #, c-format |
a0b6b246 JX |
5304 | msgid "failed to create directory '%s'" |
5305 | msgstr "无法创建目录 '%s'" | |
8ada9598 | 5306 | |
31e5e17b | 5307 | #: builtin/am.c:1018 |
a0b6b246 JX |
5308 | msgid "Failed to split patches." |
5309 | msgstr "无法拆分补丁。" | |
814ff314 | 5310 | |
31e5e17b | 5311 | #: builtin/am.c:1148 builtin/commit.c:342 |
a0b6b246 JX |
5312 | msgid "unable to write index file" |
5313 | msgstr "无法写入索引文件" | |
8ada9598 | 5314 | |
31e5e17b | 5315 | #: builtin/am.c:1162 |
8ada9598 | 5316 | #, c-format |
a0b6b246 JX |
5317 | msgid "When you have resolved this problem, run \"%s --continue\"." |
5318 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 5319 | |
31e5e17b | 5320 | #: builtin/am.c:1163 |
81809b99 | 5321 | #, c-format |
a0b6b246 JX |
5322 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
5323 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 5324 | |
31e5e17b | 5325 | #: builtin/am.c:1164 |
81809b99 | 5326 | #, c-format |
a0b6b246 JX |
5327 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
5328 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 5329 | |
31e5e17b | 5330 | #: builtin/am.c:1271 |
a4f16749 JX |
5331 | msgid "Patch is empty." |
5332 | msgstr "补丁为空。" | |
23ff3338 | 5333 | |
31e5e17b | 5334 | #: builtin/am.c:1337 |
8ada9598 | 5335 | #, c-format |
a4f16749 JX |
5336 | msgid "invalid ident line: %.*s" |
5337 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 5338 | |
31e5e17b | 5339 | #: builtin/am.c:1359 |
8ada9598 | 5340 | #, c-format |
a0b6b246 JX |
5341 | msgid "unable to parse commit %s" |
5342 | msgstr "不能解析提交 %s" | |
8ada9598 | 5343 | |
31e5e17b | 5344 | #: builtin/am.c:1554 |
a0b6b246 JX |
5345 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
5346 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 5347 | |
31e5e17b | 5348 | #: builtin/am.c:1556 |
a0b6b246 JX |
5349 | msgid "Using index info to reconstruct a base tree..." |
5350 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 5351 | |
31e5e17b | 5352 | #: builtin/am.c:1575 |
a0b6b246 JX |
5353 | msgid "" |
5354 | "Did you hand edit your patch?\n" | |
5355 | "It does not apply to blobs recorded in its index." | |
5356 | msgstr "" | |
5357 | "您是否曾手动编辑过您的补丁?\n" | |
5358 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 5359 | |
31e5e17b | 5360 | #: builtin/am.c:1581 |
a0b6b246 JX |
5361 | msgid "Falling back to patching base and 3-way merge..." |
5362 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 5363 | |
31e5e17b | 5364 | #: builtin/am.c:1606 |
a0b6b246 JX |
5365 | msgid "Failed to merge in the changes." |
5366 | msgstr "无法合并变更。" | |
d691f479 | 5367 | |
31e5e17b | 5368 | #: builtin/am.c:1637 |
a0b6b246 JX |
5369 | msgid "applying to an empty history" |
5370 | msgstr "正应用到一个空历史上" | |
8ada9598 | 5371 | |
31e5e17b | 5372 | #: builtin/am.c:1683 builtin/am.c:1687 |
8ada9598 | 5373 | #, c-format |
a0b6b246 JX |
5374 | msgid "cannot resume: %s does not exist." |
5375 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 5376 | |
31e5e17b | 5377 | #: builtin/am.c:1703 |
a0b6b246 JX |
5378 | msgid "cannot be interactive without stdin connected to a terminal." |
5379 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 5380 | |
31e5e17b | 5381 | #: builtin/am.c:1708 |
a0b6b246 JX |
5382 | msgid "Commit Body is:" |
5383 | msgstr "提交内容为:" | |
8ada9598 | 5384 | |
a0b6b246 JX |
5385 | # 译者:注意保持句尾空格 |
5386 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
5387 | #. in your translation. The program will only accept English | |
5388 | #. input at this point. | |
5389 | #. | |
31e5e17b | 5390 | #: builtin/am.c:1718 |
a0b6b246 JX |
5391 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
5392 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 5393 | |
31e5e17b | 5394 | #: builtin/am.c:1768 |
8ada9598 | 5395 | #, c-format |
a0b6b246 JX |
5396 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
5397 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 5398 | |
31e5e17b | 5399 | #: builtin/am.c:1808 builtin/am.c:1879 |
81809b99 | 5400 | #, c-format |
a0b6b246 JX |
5401 | msgid "Applying: %.*s" |
5402 | msgstr "应用:%.*s" | |
8ada9598 | 5403 | |
31e5e17b | 5404 | #: builtin/am.c:1824 |
a0b6b246 JX |
5405 | msgid "No changes -- Patch already applied." |
5406 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 5407 | |
31e5e17b | 5408 | #: builtin/am.c:1832 |
81809b99 | 5409 | #, c-format |
a0b6b246 JX |
5410 | msgid "Patch failed at %s %.*s" |
5411 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 5412 | |
31e5e17b JX |
5413 | #: builtin/am.c:1838 |
5414 | msgid "Use 'git am --show-current-patch' to see the failed patch" | |
5415 | msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" | |
8ada9598 | 5416 | |
31e5e17b | 5417 | #: builtin/am.c:1882 |
a0b6b246 JX |
5418 | msgid "" |
5419 | "No changes - did you forget to use 'git add'?\n" | |
5420 | "If there is nothing left to stage, chances are that something else\n" | |
5421 | "already introduced the same changes; you might want to skip this patch." | |
5422 | msgstr "" | |
5423 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
5424 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
5425 | "您也许想要跳过这个补丁。" | |
8ada9598 | 5426 | |
31e5e17b | 5427 | #: builtin/am.c:1889 |
a0b6b246 JX |
5428 | msgid "" |
5429 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
5430 | "You should 'git add' each file with resolved conflicts to mark them as " |
5431 | "such.\n" | |
5432 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 5433 | msgstr "" |
a4f16749 JX |
5434 | "在您的索引中仍存在未合并的路径。\n" |
5435 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
5436 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 5437 | |
31e5e17b JX |
5438 | #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 |
5439 | #: builtin/reset.c:332 | |
8ada9598 | 5440 | #, c-format |
a0b6b246 JX |
5441 | msgid "Could not parse object '%s'." |
5442 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 5443 | |
31e5e17b | 5444 | #: builtin/am.c:2048 |
a0b6b246 JX |
5445 | msgid "failed to clean index" |
5446 | msgstr "无法清空索引" | |
5b04ee3b | 5447 | |
31e5e17b | 5448 | #: builtin/am.c:2083 |
a0b6b246 JX |
5449 | msgid "" |
5450 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
5451 | "Not rewinding to ORIG_HEAD" | |
5452 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 5453 | |
31e5e17b | 5454 | #: builtin/am.c:2174 |
8ada9598 | 5455 | #, c-format |
a0b6b246 JX |
5456 | msgid "Invalid value for --patch-format: %s" |
5457 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 5458 | |
31e5e17b | 5459 | #: builtin/am.c:2210 |
a0b6b246 JX |
5460 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
5461 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 5462 | |
31e5e17b | 5463 | #: builtin/am.c:2211 |
a0b6b246 JX |
5464 | msgid "git am [<options>] (--continue | --skip | --abort)" |
5465 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 5466 | |
31e5e17b | 5467 | #: builtin/am.c:2217 |
a0b6b246 JX |
5468 | msgid "run interactively" |
5469 | msgstr "以交互式方式运行" | |
8ada9598 | 5470 | |
31e5e17b | 5471 | #: builtin/am.c:2219 |
a0b6b246 JX |
5472 | msgid "historical option -- no-op" |
5473 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 5474 | |
31e5e17b | 5475 | #: builtin/am.c:2221 |
a0b6b246 JX |
5476 | msgid "allow fall back on 3way merging if needed" |
5477 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 5478 | |
31e5e17b JX |
5479 | #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 |
5480 | #: builtin/repack.c:182 | |
a0b6b246 JX |
5481 | msgid "be quiet" |
5482 | msgstr "静默模式" | |
8ada9598 | 5483 | |
31e5e17b | 5484 | #: builtin/am.c:2224 |
a0b6b246 JX |
5485 | msgid "add a Signed-off-by line to the commit message" |
5486 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 5487 | |
31e5e17b | 5488 | #: builtin/am.c:2227 |
a0b6b246 JX |
5489 | msgid "recode into utf8 (default)" |
5490 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 5491 | |
31e5e17b | 5492 | #: builtin/am.c:2229 |
a0b6b246 JX |
5493 | msgid "pass -k flag to git-mailinfo" |
5494 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 5495 | |
31e5e17b | 5496 | #: builtin/am.c:2231 |
a0b6b246 JX |
5497 | msgid "pass -b flag to git-mailinfo" |
5498 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 5499 | |
31e5e17b | 5500 | #: builtin/am.c:2233 |
a0b6b246 JX |
5501 | msgid "pass -m flag to git-mailinfo" |
5502 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 5503 | |
31e5e17b | 5504 | #: builtin/am.c:2235 |
a0b6b246 JX |
5505 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
5506 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 5507 | |
31e5e17b | 5508 | #: builtin/am.c:2238 |
a0b6b246 JX |
5509 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
5510 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 5511 | |
31e5e17b | 5512 | #: builtin/am.c:2241 |
a0b6b246 JX |
5513 | msgid "strip everything before a scissors line" |
5514 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 5515 | |
31e5e17b JX |
5516 | #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 |
5517 | #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 | |
5518 | #: builtin/am.c:2270 | |
a0b6b246 JX |
5519 | msgid "pass it through git-apply" |
5520 | msgstr "传递给 git-apply" | |
8ada9598 | 5521 | |
31e5e17b JX |
5522 | #: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 |
5523 | #: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 | |
5524 | #: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 | |
5525 | #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 | |
5526 | #: parse-options.h:144 parse-options.h:146 parse-options.h:257 | |
a0b6b246 JX |
5527 | msgid "n" |
5528 | msgstr "n" | |
8ada9598 | 5529 | |
31e5e17b JX |
5530 | #: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 |
5531 | #: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 | |
a0b6b246 JX |
5532 | msgid "format" |
5533 | msgstr "格式" | |
8ada9598 | 5534 | |
31e5e17b | 5535 | #: builtin/am.c:2267 |
a0b6b246 JX |
5536 | msgid "format the patch(es) are in" |
5537 | msgstr "补丁的格式" | |
8ada9598 | 5538 | |
31e5e17b | 5539 | #: builtin/am.c:2273 |
a0b6b246 JX |
5540 | msgid "override error message when patch failure occurs" |
5541 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 5542 | |
31e5e17b | 5543 | #: builtin/am.c:2275 |
a0b6b246 JX |
5544 | msgid "continue applying patches after resolving a conflict" |
5545 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 5546 | |
31e5e17b | 5547 | #: builtin/am.c:2278 |
a0b6b246 JX |
5548 | msgid "synonyms for --continue" |
5549 | msgstr "和 --continue 同义" | |
8ada9598 | 5550 | |
31e5e17b | 5551 | #: builtin/am.c:2281 |
a0b6b246 JX |
5552 | msgid "skip the current patch" |
5553 | msgstr "跳过当前补丁" | |
23ff3338 | 5554 | |
31e5e17b | 5555 | #: builtin/am.c:2284 |
a0b6b246 JX |
5556 | msgid "restore the original branch and abort the patching operation." |
5557 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 5558 | |
31e5e17b JX |
5559 | #: builtin/am.c:2287 |
5560 | msgid "abort the patching operation but keep HEAD where it is." | |
5561 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
5562 | ||
5563 | #: builtin/am.c:2290 | |
5564 | msgid "show the patch being applied." | |
5565 | msgstr "显示正在应用的补丁。" | |
5566 | ||
5567 | #: builtin/am.c:2294 | |
a0b6b246 JX |
5568 | msgid "lie about committer date" |
5569 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 5570 | |
31e5e17b | 5571 | #: builtin/am.c:2296 |
a0b6b246 JX |
5572 | msgid "use current timestamp for author date" |
5573 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 5574 | |
31e5e17b JX |
5575 | #: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 |
5576 | #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 | |
a0b6b246 JX |
5577 | msgid "key-id" |
5578 | msgstr "key-id" | |
8ada9598 | 5579 | |
31e5e17b | 5580 | #: builtin/am.c:2299 |
a0b6b246 JX |
5581 | msgid "GPG-sign commits" |
5582 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 5583 | |
31e5e17b | 5584 | #: builtin/am.c:2302 |
a0b6b246 JX |
5585 | msgid "(internal use for git-rebase)" |
5586 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 5587 | |
31e5e17b | 5588 | #: builtin/am.c:2320 |
a0b6b246 JX |
5589 | msgid "" |
5590 | "The -b/--binary option has been a no-op for long time, and\n" | |
5591 | "it will be removed. Please do not use it anymore." | |
5592 | msgstr "" | |
5593 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
5594 | "请不要再使用它了。" | |
8ada9598 | 5595 | |
31e5e17b | 5596 | #: builtin/am.c:2327 |
a0b6b246 JX |
5597 | msgid "failed to read the index" |
5598 | msgstr "无法读取索引" | |
8ada9598 | 5599 | |
31e5e17b | 5600 | #: builtin/am.c:2342 |
a0b6b246 JX |
5601 | #, c-format |
5602 | msgid "previous rebase directory %s still exists but mbox given." | |
5603 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 5604 | |
31e5e17b | 5605 | #: builtin/am.c:2366 |
a0b6b246 JX |
5606 | #, c-format |
5607 | msgid "" | |
5608 | "Stray %s directory found.\n" | |
5609 | "Use \"git am --abort\" to remove it." | |
5610 | msgstr "" | |
5611 | "发现了错误的 %s 目录。\n" | |
5612 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 5613 | |
31e5e17b | 5614 | #: builtin/am.c:2372 |
a0b6b246 JX |
5615 | msgid "Resolve operation not in progress, we are not resuming." |
5616 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 5617 | |
a0b6b246 JX |
5618 | #: builtin/apply.c:8 |
5619 | msgid "git apply [<options>] [<patch>...]" | |
5620 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 5621 | |
c04f5ac3 JX |
5622 | #: builtin/archive.c:17 |
5623 | #, c-format | |
5624 | msgid "could not create archive file '%s'" | |
90e6ef53 | 5625 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
5626 | |
5627 | #: builtin/archive.c:20 | |
5628 | msgid "could not redirect output" | |
195febda | 5629 | msgstr "不能重定向输出" |
c04f5ac3 JX |
5630 | |
5631 | #: builtin/archive.c:37 | |
5632 | msgid "git archive: Remote with no URL" | |
4375c10e | 5633 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
5634 | |
5635 | #: builtin/archive.c:58 | |
31e5e17b JX |
5636 | msgid "git archive: expected ACK/NAK, got a flush packet" |
5637 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 5638 | |
1003b3a5 | 5639 | #: builtin/archive.c:61 |
c04f5ac3 JX |
5640 | #, c-format |
5641 | msgid "git archive: NACK %s" | |
90e6ef53 | 5642 | msgstr "git archive:NACK %s" |
c04f5ac3 | 5643 | |
1003b3a5 | 5644 | #: builtin/archive.c:64 |
c04f5ac3 | 5645 | msgid "git archive: protocol error" |
90e6ef53 | 5646 | msgstr "git archive:协议错误" |
c04f5ac3 | 5647 | |
1003b3a5 | 5648 | #: builtin/archive.c:68 |
c04f5ac3 | 5649 | msgid "git archive: expected a flush" |
31e5e17b | 5650 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 5651 | |
5809aa05 | 5652 | #: builtin/bisect--helper.c:12 |
ef317cd5 | 5653 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 5654 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 5655 | |
5809aa05 JX |
5656 | #: builtin/bisect--helper.c:13 |
5657 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" | |
5658 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
5659 | ||
5660 | #: builtin/bisect--helper.c:14 | |
5661 | msgid "git bisect--helper --bisect-clean-state" | |
5662 | msgstr "git bisect--helper --bisect-clean-state" | |
5663 | ||
5664 | #: builtin/bisect--helper.c:46 | |
5665 | #, c-format | |
5666 | msgid "'%s' is not a valid term" | |
5667 | msgstr "'%s' 不是一个有效的术语" | |
5668 | ||
5669 | #: builtin/bisect--helper.c:50 | |
5670 | #, c-format | |
5671 | msgid "can't use the builtin command '%s' as a term" | |
5672 | msgstr "不能使用内置命令 '%s' 作为术语" | |
5673 | ||
5674 | #: builtin/bisect--helper.c:60 | |
5675 | #, c-format | |
5676 | msgid "can't change the meaning of the term '%s'" | |
5677 | msgstr "不能修改术语 '%s' 的含义" | |
5678 | ||
5679 | #: builtin/bisect--helper.c:71 | |
5680 | msgid "please use two different terms" | |
5681 | msgstr "请使用两个不同的术语" | |
5682 | ||
5683 | #: builtin/bisect--helper.c:78 | |
5684 | msgid "could not open the file BISECT_TERMS" | |
5685 | msgstr "不能打开文件 BISECT_TERMS" | |
5686 | ||
5687 | #: builtin/bisect--helper.c:120 | |
ef317cd5 | 5688 | msgid "perform 'git bisect next'" |
07432cef | 5689 | msgstr "执行 'git bisect next'" |
ef317cd5 | 5690 | |
5809aa05 JX |
5691 | #: builtin/bisect--helper.c:122 |
5692 | msgid "write the terms to .git/BISECT_TERMS" | |
5693 | msgstr "将术语写入 .git/BISECT_TERMS" | |
5694 | ||
5695 | #: builtin/bisect--helper.c:124 | |
5696 | msgid "cleanup the bisection state" | |
5697 | msgstr "清除二分查找状态" | |
5698 | ||
5699 | #: builtin/bisect--helper.c:126 | |
5700 | msgid "check for expected revs" | |
5701 | msgstr "检查预期的版本" | |
5702 | ||
5703 | #: builtin/bisect--helper.c:128 | |
ef317cd5 | 5704 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 5705 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 5706 | |
5809aa05 JX |
5707 | #: builtin/bisect--helper.c:143 |
5708 | msgid "--write-terms requires two arguments" | |
5709 | msgstr "--write-terms 需要两个参数" | |
5710 | ||
5711 | #: builtin/bisect--helper.c:147 | |
5712 | msgid "--bisect-clean-state requires no arguments" | |
5713 | msgstr "--bisect-clean-state 不需要参数" | |
5714 | ||
a4f16749 | 5715 | #: builtin/blame.c:27 |
7aea43ff JX |
5716 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
5717 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 5718 | |
a4f16749 | 5719 | #: builtin/blame.c:32 |
814ff314 JX |
5720 | msgid "<rev-opts> are documented in git-rev-list(1)" |
5721 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 5722 | |
31e5e17b | 5723 | #: builtin/blame.c:677 |
ef317cd5 | 5724 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 5725 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 5726 | |
31e5e17b | 5727 | #: builtin/blame.c:678 |
ef317cd5 | 5728 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 5729 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 5730 | |
31e5e17b | 5731 | #: builtin/blame.c:679 |
ef317cd5 | 5732 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 5733 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 5734 | |
31e5e17b | 5735 | #: builtin/blame.c:680 |
ef317cd5 | 5736 | msgid "Show work cost statistics" |
07432cef | 5737 | msgstr "显示命令消耗统计" |
ef317cd5 | 5738 | |
31e5e17b | 5739 | #: builtin/blame.c:681 |
276ceeaa JX |
5740 | msgid "Force progress reporting" |
5741 | msgstr "强制进度显示" | |
5742 | ||
31e5e17b | 5743 | #: builtin/blame.c:682 |
ef317cd5 | 5744 | msgid "Show output score for blame entries" |
07432cef | 5745 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 5746 | |
31e5e17b | 5747 | #: builtin/blame.c:683 |
ef317cd5 | 5748 | msgid "Show original filename (Default: auto)" |
07432cef | 5749 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 5750 | |
31e5e17b | 5751 | #: builtin/blame.c:684 |
ef317cd5 | 5752 | msgid "Show original linenumber (Default: off)" |
07432cef | 5753 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 5754 | |
31e5e17b | 5755 | #: builtin/blame.c:685 |
ef317cd5 | 5756 | msgid "Show in a format designed for machine consumption" |
07432cef | 5757 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 5758 | |
31e5e17b | 5759 | #: builtin/blame.c:686 |
ef317cd5 | 5760 | msgid "Show porcelain format with per-line commit information" |
07432cef | 5761 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 5762 | |
31e5e17b | 5763 | #: builtin/blame.c:687 |
ef317cd5 | 5764 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 5765 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 5766 | |
31e5e17b | 5767 | #: builtin/blame.c:688 |
ef317cd5 | 5768 | msgid "Show raw timestamp (Default: off)" |
07432cef | 5769 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 5770 | |
31e5e17b | 5771 | #: builtin/blame.c:689 |
ef317cd5 | 5772 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 5773 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 5774 | |
31e5e17b | 5775 | #: builtin/blame.c:690 |
ef317cd5 | 5776 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 5777 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 5778 | |
31e5e17b | 5779 | #: builtin/blame.c:691 |
ef317cd5 | 5780 | msgid "Show author email instead of name (Default: off)" |
07432cef | 5781 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 5782 | |
31e5e17b | 5783 | #: builtin/blame.c:692 |
ef317cd5 | 5784 | msgid "Ignore whitespace differences" |
07432cef | 5785 | msgstr "忽略空白差异" |
ef317cd5 | 5786 | |
31e5e17b | 5787 | #: builtin/blame.c:699 |
1a79b2f1 JX |
5788 | msgid "Use an experimental heuristic to improve diffs" |
5789 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 5790 | |
31e5e17b | 5791 | #: builtin/blame.c:701 |
ef317cd5 | 5792 | msgid "Spend extra cycles to find better match" |
07432cef | 5793 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 5794 | |
31e5e17b | 5795 | #: builtin/blame.c:702 |
ef317cd5 | 5796 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 5797 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 5798 | |
31e5e17b | 5799 | #: builtin/blame.c:703 |
ef317cd5 | 5800 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 5801 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 5802 | |
31e5e17b | 5803 | #: builtin/blame.c:704 builtin/blame.c:705 |
ef317cd5 | 5804 | msgid "score" |
07432cef | 5805 | msgstr "得分" |
ef317cd5 | 5806 | |
31e5e17b | 5807 | #: builtin/blame.c:704 |
ef317cd5 | 5808 | msgid "Find line copies within and across files" |
07432cef | 5809 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 5810 | |
31e5e17b | 5811 | #: builtin/blame.c:705 |
ef317cd5 | 5812 | msgid "Find line movements within and across files" |
07432cef | 5813 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 5814 | |
31e5e17b | 5815 | #: builtin/blame.c:706 |
ef317cd5 | 5816 | msgid "n,m" |
07432cef | 5817 | msgstr "n,m" |
ef317cd5 | 5818 | |
31e5e17b | 5819 | #: builtin/blame.c:706 |
ef317cd5 | 5820 | msgid "Process only line range n,m, counting from 1" |
07432cef | 5821 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 5822 | |
31e5e17b | 5823 | #: builtin/blame.c:753 |
a0b6b246 JX |
5824 | msgid "--progress can't be used with --incremental or porcelain formats" |
5825 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
5826 | ||
a4f16749 JX |
5827 | #. TRANSLATORS: This string is used to tell us the |
5828 | #. maximum display width for a relative timestamp in | |
5829 | #. "git blame" output. For C locale, "4 years, 11 | |
5830 | #. months ago", which takes 22 places, is the longest | |
5831 | #. among various forms of relative timestamps, but | |
5832 | #. your language may need more or fewer display | |
5833 | #. columns. | |
5834 | #. | |
31e5e17b | 5835 | #: builtin/blame.c:804 |
6c94aba5 JX |
5836 | msgid "4 years, 11 months ago" |
5837 | msgstr "4 年 11 个月前" | |
5838 | ||
31e5e17b | 5839 | #: builtin/blame.c:890 |
a0b6b246 JX |
5840 | #, c-format |
5841 | msgid "file %s has only %lu line" | |
5842 | msgid_plural "file %s has only %lu lines" | |
5843 | msgstr[0] "文件 %s 只有 %lu 行" | |
5844 | msgstr[1] "文件 %s 只有 %lu 行" | |
5845 | ||
31e5e17b | 5846 | #: builtin/blame.c:936 |
a4f16749 JX |
5847 | msgid "Blaming lines" |
5848 | msgstr "追踪代码行" | |
5849 | ||
5850 | #: builtin/branch.c:27 | |
814ff314 JX |
5851 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
5852 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 5853 | |
a4f16749 | 5854 | #: builtin/branch.c:28 |
814ff314 JX |
5855 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
5856 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 5857 | |
a4f16749 | 5858 | #: builtin/branch.c:29 |
814ff314 JX |
5859 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
5860 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 5861 | |
a4f16749 | 5862 | #: builtin/branch.c:30 |
814ff314 JX |
5863 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
5864 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 5865 | |
a4f16749 | 5866 | #: builtin/branch.c:31 |
6937cb4e JX |
5867 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
5868 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
5869 | ||
5870 | #: builtin/branch.c:32 | |
94550ed3 JX |
5871 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
5872 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
5873 | ||
6937cb4e | 5874 | #: builtin/branch.c:33 |
87cb7997 JX |
5875 | msgid "git branch [<options>] [-r | -a] [--format]" |
5876 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
5877 | ||
90e6ef53 | 5878 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
6937cb4e | 5879 | #: builtin/branch.c:146 |
c04f5ac3 JX |
5880 | #, c-format |
5881 | msgid "" | |
5882 | "deleting branch '%s' that has been merged to\n" | |
5883 | " '%s', but not yet merged to HEAD." | |
5884 | msgstr "" | |
70fc47bf | 5885 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
5886 | " '%s',但未合并到 HEAD。" |
5887 | ||
90e6ef53 | 5888 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
6937cb4e | 5889 | #: builtin/branch.c:150 |
c04f5ac3 JX |
5890 | #, c-format |
5891 | msgid "" | |
5892 | "not deleting branch '%s' that is not yet merged to\n" | |
5893 | " '%s', even though it is merged to HEAD." | |
5894 | msgstr "" | |
70fc47bf T |
5895 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
5896 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 5897 | |
6937cb4e | 5898 | #: builtin/branch.c:164 |
07432cef WS |
5899 | #, c-format |
5900 | msgid "Couldn't look up commit object for '%s'" | |
5901 | msgstr "无法查询 '%s' 指向的提交对象" | |
5902 | ||
6937cb4e | 5903 | #: builtin/branch.c:168 |
07432cef WS |
5904 | #, c-format |
5905 | msgid "" | |
5906 | "The branch '%s' is not fully merged.\n" | |
5907 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
5908 | msgstr "" | |
5909 | "分支 '%s' 没有完全合并。\n" | |
5910 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
5911 | ||
6937cb4e | 5912 | #: builtin/branch.c:181 |
07432cef | 5913 | msgid "Update of config-file failed" |
6937cb4e | 5914 | msgstr "更新配置文件失败" |
07432cef | 5915 | |
6937cb4e | 5916 | #: builtin/branch.c:212 |
c04f5ac3 | 5917 | msgid "cannot use -a with -d" |
649900bc | 5918 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 5919 | |
6937cb4e | 5920 | #: builtin/branch.c:218 |
c04f5ac3 JX |
5921 | msgid "Couldn't look up commit object for HEAD" |
5922 | msgstr "无法查询 HEAD 指向的提交对象" | |
5923 | ||
6937cb4e | 5924 | #: builtin/branch.c:232 |
c04f5ac3 | 5925 | #, c-format |
5b04ee3b JX |
5926 | msgid "Cannot delete branch '%s' checked out at '%s'" |
5927 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 5928 | |
6937cb4e | 5929 | #: builtin/branch.c:247 |
5ae481e0 | 5930 | #, c-format |
7aea43ff JX |
5931 | msgid "remote-tracking branch '%s' not found." |
5932 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 5933 | |
6937cb4e | 5934 | #: builtin/branch.c:248 |
81809b99 | 5935 | #, c-format |
8ada9598 | 5936 | msgid "branch '%s' not found." |
81809b99 | 5937 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 5938 | |
6937cb4e | 5939 | #: builtin/branch.c:263 |
81809b99 | 5940 | #, c-format |
7aea43ff JX |
5941 | msgid "Error deleting remote-tracking branch '%s'" |
5942 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 5943 | |
6937cb4e | 5944 | #: builtin/branch.c:264 |
81809b99 | 5945 | #, c-format |
8ada9598 | 5946 | msgid "Error deleting branch '%s'" |
7aea43ff | 5947 | msgstr "无法删除分支 '%s'" |
8ada9598 | 5948 | |
6937cb4e | 5949 | #: builtin/branch.c:271 |
81809b99 | 5950 | #, c-format |
7aea43ff JX |
5951 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
5952 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 5953 | |
6937cb4e | 5954 | #: builtin/branch.c:272 |
81809b99 | 5955 | #, c-format |
8ada9598 | 5956 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 5957 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 5958 | |
6937cb4e JX |
5959 | #: builtin/branch.c:417 builtin/tag.c:58 |
5960 | msgid "unable to parse format string" | |
5961 | msgstr "不能解析格式化字符串" | |
5962 | ||
5963 | #: builtin/branch.c:450 | |
5b04ee3b JX |
5964 | #, c-format |
5965 | msgid "Branch %s is being rebased at %s" | |
5966 | msgstr "分支 %s 正被变基到 %s" | |
5967 | ||
6937cb4e | 5968 | #: builtin/branch.c:454 |
5b04ee3b JX |
5969 | #, c-format |
5970 | msgid "Branch %s is being bisected at %s" | |
5971 | msgstr "分支 %s 正被二分查找于 %s" | |
5972 | ||
5809aa05 | 5973 | #: builtin/branch.c:471 |
6937cb4e JX |
5974 | msgid "cannot copy the current branch while not on any." |
5975 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
5976 | ||
5809aa05 | 5977 | #: builtin/branch.c:473 |
c04f5ac3 | 5978 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 5979 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 5980 | |
5809aa05 | 5981 | #: builtin/branch.c:484 |
c04f5ac3 JX |
5982 | #, c-format |
5983 | msgid "Invalid branch name: '%s'" | |
5984 | msgstr "无效的分支名:'%s'" | |
5985 | ||
5809aa05 | 5986 | #: builtin/branch.c:511 |
c04f5ac3 JX |
5987 | msgid "Branch rename failed" |
5988 | msgstr "分支重命名失败" | |
5989 | ||
5809aa05 | 5990 | #: builtin/branch.c:513 |
6937cb4e JX |
5991 | msgid "Branch copy failed" |
5992 | msgstr "分支拷贝失败" | |
5993 | ||
5809aa05 | 5994 | #: builtin/branch.c:517 |
6937cb4e | 5995 | #, c-format |
5809aa05 JX |
5996 | msgid "Created a copy of a misnamed branch '%s'" |
5997 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 5998 | |
5809aa05 | 5999 | #: builtin/branch.c:520 |
c04f5ac3 JX |
6000 | #, c-format |
6001 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 6002 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 6003 | |
5809aa05 | 6004 | #: builtin/branch.c:526 |
c04f5ac3 JX |
6005 | #, c-format |
6006 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
6007 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
6008 | ||
5809aa05 | 6009 | #: builtin/branch.c:535 |
c04f5ac3 | 6010 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
6011 | msgstr "分支被重命名,但更新配置文件失败" |
6012 | ||
5809aa05 | 6013 | #: builtin/branch.c:537 |
6937cb4e JX |
6014 | msgid "Branch is copied, but update of config-file failed" |
6015 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 6016 | |
5809aa05 | 6017 | #: builtin/branch.c:553 |
5c57d762 JX |
6018 | #, c-format |
6019 | msgid "" | |
6020 | "Please edit the description for the branch\n" | |
6021 | " %s\n" | |
6022 | "Lines starting with '%c' will be stripped.\n" | |
6023 | msgstr "" | |
6024 | "请编辑分支的描述\n" | |
6025 | " %s\n" | |
6026 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 6027 | |
5809aa05 | 6028 | #: builtin/branch.c:586 |
ef317cd5 | 6029 | msgid "Generic options" |
07432cef | 6030 | msgstr "通用选项" |
c04f5ac3 | 6031 | |
5809aa05 | 6032 | #: builtin/branch.c:588 |
ef317cd5 | 6033 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 6034 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 6035 | |
5809aa05 | 6036 | #: builtin/branch.c:589 |
ef317cd5 | 6037 | msgid "suppress informational messages" |
07432cef | 6038 | msgstr "不显示信息" |
8ada9598 | 6039 | |
5809aa05 | 6040 | #: builtin/branch.c:590 |
ef317cd5 | 6041 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 6042 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 6043 | |
5809aa05 | 6044 | #: builtin/branch.c:592 |
6937cb4e JX |
6045 | msgid "do not use" |
6046 | msgstr "不要使用" | |
c04f5ac3 | 6047 | |
5809aa05 | 6048 | #: builtin/branch.c:594 |
5b04ee3b JX |
6049 | msgid "upstream" |
6050 | msgstr "上游" | |
6051 | ||
5809aa05 | 6052 | #: builtin/branch.c:594 |
5b04ee3b JX |
6053 | msgid "change the upstream info" |
6054 | msgstr "改变上游信息" | |
6055 | ||
5809aa05 | 6056 | #: builtin/branch.c:595 |
a0b6b246 JX |
6057 | msgid "Unset the upstream info" |
6058 | msgstr "取消上游信息的设置" | |
6059 | ||
5809aa05 | 6060 | #: builtin/branch.c:596 |
ef317cd5 | 6061 | msgid "use colored output" |
07432cef | 6062 | msgstr "使用彩色输出" |
c04f5ac3 | 6063 | |
5809aa05 | 6064 | #: builtin/branch.c:597 |
ef317cd5 | 6065 | msgid "act on remote-tracking branches" |
07432cef | 6066 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 6067 | |
5809aa05 | 6068 | #: builtin/branch.c:599 builtin/branch.c:601 |
ef317cd5 | 6069 | msgid "print only branches that contain the commit" |
07432cef | 6070 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 6071 | |
5809aa05 | 6072 | #: builtin/branch.c:600 builtin/branch.c:602 |
87cb7997 JX |
6073 | msgid "print only branches that don't contain the commit" |
6074 | msgstr "只打印不包含该提交的分支" | |
6075 | ||
5809aa05 | 6076 | #: builtin/branch.c:605 |
ef317cd5 | 6077 | msgid "Specific git-branch actions:" |
07432cef | 6078 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 6079 | |
5809aa05 | 6080 | #: builtin/branch.c:606 |
ef317cd5 | 6081 | msgid "list both remote-tracking and local branches" |
07432cef | 6082 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 6083 | |
5809aa05 | 6084 | #: builtin/branch.c:608 |
ef317cd5 | 6085 | msgid "delete fully merged branch" |
07432cef | 6086 | msgstr "删除完全合并的分支" |
c04f5ac3 | 6087 | |
5809aa05 | 6088 | #: builtin/branch.c:609 |
ef317cd5 | 6089 | msgid "delete branch (even if not merged)" |
07432cef | 6090 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 6091 | |
5809aa05 | 6092 | #: builtin/branch.c:610 |
ef317cd5 | 6093 | msgid "move/rename a branch and its reflog" |
07432cef | 6094 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 6095 | |
5809aa05 | 6096 | #: builtin/branch.c:611 |
ef317cd5 | 6097 | msgid "move/rename a branch, even if target exists" |
07432cef | 6098 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 6099 | |
5809aa05 | 6100 | #: builtin/branch.c:612 |
6937cb4e JX |
6101 | msgid "copy a branch and its reflog" |
6102 | msgstr "拷贝一个分支和它的引用日志" | |
6103 | ||
5809aa05 | 6104 | #: builtin/branch.c:613 |
6937cb4e JX |
6105 | msgid "copy a branch, even if target exists" |
6106 | msgstr "拷贝一个分支,即使目标已存在" | |
6107 | ||
5809aa05 | 6108 | #: builtin/branch.c:614 |
ef317cd5 | 6109 | msgid "list branch names" |
07432cef | 6110 | msgstr "列出分支名" |
c04f5ac3 | 6111 | |
5809aa05 | 6112 | #: builtin/branch.c:615 |
ef317cd5 | 6113 | msgid "create the branch's reflog" |
07432cef | 6114 | msgstr "创建分支的引用日志" |
ef317cd5 | 6115 | |
5809aa05 | 6116 | #: builtin/branch.c:617 |
ef317cd5 | 6117 | msgid "edit the description for the branch" |
07432cef | 6118 | msgstr "标记分支的描述" |
ef317cd5 | 6119 | |
5809aa05 | 6120 | #: builtin/branch.c:618 |
04cb2f28 JX |
6121 | msgid "force creation, move/rename, deletion" |
6122 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 6123 | |
5809aa05 | 6124 | #: builtin/branch.c:619 |
94550ed3 JX |
6125 | msgid "print only branches that are merged" |
6126 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 6127 | |
5809aa05 | 6128 | #: builtin/branch.c:620 |
94550ed3 JX |
6129 | msgid "print only branches that are not merged" |
6130 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 6131 | |
5809aa05 | 6132 | #: builtin/branch.c:621 |
ef317cd5 | 6133 | msgid "list branches in columns" |
07432cef | 6134 | msgstr "以列的方式显示分支" |
ef317cd5 | 6135 | |
31e5e17b | 6136 | #: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 |
94550ed3 JX |
6137 | msgid "key" |
6138 | msgstr "key" | |
6139 | ||
31e5e17b | 6140 | #: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 |
94550ed3 JX |
6141 | msgid "field name to sort on" |
6142 | msgstr "排序的字段名" | |
6143 | ||
5809aa05 | 6144 | #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 |
6937cb4e | 6145 | #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 |
31e5e17b | 6146 | #: builtin/tag.c:414 |
94550ed3 JX |
6147 | msgid "object" |
6148 | msgstr "对象" | |
6149 | ||
5809aa05 | 6150 | #: builtin/branch.c:626 |
94550ed3 JX |
6151 | msgid "print only branches of the object" |
6152 | msgstr "只打印指向该对象的分支" | |
6153 | ||
31e5e17b | 6154 | #: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 |
1a79b2f1 JX |
6155 | msgid "sorting and filtering are case insensitive" |
6156 | msgstr "排序和过滤属于大小写不敏感" | |
6157 | ||
31e5e17b | 6158 | #: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 |
a4f16749 | 6159 | #: builtin/verify-tag.c:39 |
87cb7997 JX |
6160 | msgid "format to use for the output" |
6161 | msgstr "输出格式" | |
6162 | ||
31e5e17b | 6163 | #: builtin/branch.c:652 builtin/clone.c:735 |
c04f5ac3 | 6164 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 6165 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 6166 | |
5809aa05 | 6167 | #: builtin/branch.c:675 |
8ada9598 | 6168 | msgid "--column and --verbose are incompatible" |
81809b99 | 6169 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 6170 | |
5809aa05 | 6171 | #: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 |
a77c07d9 JX |
6172 | msgid "branch name required" |
6173 | msgstr "必须提供分支名" | |
6174 | ||
5809aa05 | 6175 | #: builtin/branch.c:718 |
a77c07d9 JX |
6176 | msgid "Cannot give description to detached HEAD" |
6177 | msgstr "不能向分离头指针提供描述" | |
6178 | ||
5809aa05 | 6179 | #: builtin/branch.c:723 |
a77c07d9 JX |
6180 | msgid "cannot edit description of more than one branch" |
6181 | msgstr "不能为一个以上的分支编辑描述" | |
6182 | ||
5809aa05 | 6183 | #: builtin/branch.c:730 |
a77c07d9 JX |
6184 | #, c-format |
6185 | msgid "No commit on branch '%s' yet." | |
6186 | msgstr "分支 '%s' 尚无提交。" | |
6187 | ||
5809aa05 | 6188 | #: builtin/branch.c:733 |
a77c07d9 JX |
6189 | #, c-format |
6190 | msgid "No branch named '%s'." | |
6191 | msgstr "没有分支 '%s'。" | |
6192 | ||
5809aa05 | 6193 | #: builtin/branch.c:748 |
6937cb4e JX |
6194 | msgid "too many branches for a copy operation" |
6195 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 6196 | |
5809aa05 | 6197 | #: builtin/branch.c:757 |
6937cb4e JX |
6198 | msgid "too many arguments for a rename operation" |
6199 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 6200 | |
5809aa05 | 6201 | #: builtin/branch.c:762 |
6937cb4e JX |
6202 | msgid "too many arguments to set new upstream" |
6203 | msgstr "为设置新上游提供了太多的参数" | |
6204 | ||
5809aa05 | 6205 | #: builtin/branch.c:766 |
1003b3a5 JX |
6206 | #, c-format |
6207 | msgid "" | |
6208 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
6209 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
6210 | ||
5809aa05 | 6211 | #: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 |
1003b3a5 JX |
6212 | #, c-format |
6213 | msgid "no such branch '%s'" | |
6214 | msgstr "没有此分支 '%s'" | |
6215 | ||
5809aa05 | 6216 | #: builtin/branch.c:773 |
07432cef | 6217 | #, c-format |
ef317cd5 | 6218 | msgid "branch '%s' does not exist" |
07432cef | 6219 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 6220 | |
5809aa05 | 6221 | #: builtin/branch.c:785 |
6937cb4e JX |
6222 | msgid "too many arguments to unset upstream" |
6223 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 6224 | |
5809aa05 | 6225 | #: builtin/branch.c:789 |
1003b3a5 JX |
6226 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
6227 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
6228 | ||
5809aa05 | 6229 | #: builtin/branch.c:795 |
ef317cd5 JX |
6230 | #, c-format |
6231 | msgid "Branch '%s' has no upstream information" | |
07432cef | 6232 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 6233 | |
5809aa05 | 6234 | #: builtin/branch.c:810 |
c04f5ac3 JX |
6235 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
6236 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
6237 | ||
5809aa05 | 6238 | #: builtin/branch.c:813 |
ef317cd5 | 6239 | msgid "" |
6937cb4e JX |
6240 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
6241 | "'--set-upstream-to' instead." | |
ef317cd5 | 6242 | msgstr "" |
6937cb4e | 6243 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" |
ef317cd5 | 6244 | |
87cb7997 | 6245 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
6246 | #, c-format |
6247 | msgid "%s is okay\n" | |
6248 | msgstr "%s 可以\n" | |
6249 | ||
87cb7997 | 6250 | #: builtin/bundle.c:58 |
c04f5ac3 | 6251 | msgid "Need a repository to create a bundle." |
160fb2b2 | 6252 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 6253 | |
87cb7997 | 6254 | #: builtin/bundle.c:62 |
c04f5ac3 | 6255 | msgid "Need a repository to unbundle." |
160fb2b2 | 6256 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 6257 | |
31e5e17b | 6258 | #: builtin/cat-file.c:523 |
7aea43ff | 6259 | msgid "" |
a0b6b246 JX |
6260 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
6261 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
6262 | msgstr "" |
6263 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
6264 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 6265 | |
31e5e17b | 6266 | #: builtin/cat-file.c:524 |
a0b6b246 JX |
6267 | msgid "" |
6268 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
6269 | "filters]" | |
275588f9 JX |
6270 | msgstr "" |
6271 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
6272 | "filters]" | |
ef317cd5 | 6273 | |
31e5e17b | 6274 | #: builtin/cat-file.c:561 |
ef317cd5 | 6275 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 6276 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 6277 | |
31e5e17b | 6278 | #: builtin/cat-file.c:562 |
ef317cd5 | 6279 | msgid "show object type" |
07432cef | 6280 | msgstr "显示对象类型" |
ef317cd5 | 6281 | |
31e5e17b | 6282 | #: builtin/cat-file.c:563 |
ef317cd5 | 6283 | msgid "show object size" |
07432cef | 6284 | msgstr "显示对象大小" |
ef317cd5 | 6285 | |
31e5e17b | 6286 | #: builtin/cat-file.c:565 |
ef317cd5 | 6287 | msgid "exit with zero when there's no error" |
07432cef | 6288 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 6289 | |
31e5e17b | 6290 | #: builtin/cat-file.c:566 |
ef317cd5 | 6291 | msgid "pretty-print object's content" |
07432cef | 6292 | msgstr "美观地打印对象的内容" |
ef317cd5 | 6293 | |
31e5e17b | 6294 | #: builtin/cat-file.c:568 |
ef317cd5 | 6295 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
6296 | msgstr "对于数据对象,对其内容做文本转换" |
6297 | ||
31e5e17b | 6298 | #: builtin/cat-file.c:570 |
a0b6b246 JX |
6299 | msgid "for blob objects, run filters on object's content" |
6300 | msgstr "对于数据对象,对其内容做过滤" | |
6301 | ||
31e5e17b | 6302 | #: builtin/cat-file.c:571 git-submodule.sh:878 |
a0b6b246 JX |
6303 | msgid "blob" |
6304 | msgstr "数据对象" | |
6305 | ||
31e5e17b | 6306 | #: builtin/cat-file.c:572 |
a0b6b246 JX |
6307 | msgid "use a specific path for --textconv/--filters" |
6308 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 6309 | |
31e5e17b | 6310 | #: builtin/cat-file.c:574 |
7aea43ff JX |
6311 | msgid "allow -s and -t to work with broken/corrupt objects" |
6312 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
6313 | ||
31e5e17b | 6314 | #: builtin/cat-file.c:575 |
1b7f4a34 JX |
6315 | msgid "buffer --batch output" |
6316 | msgstr "缓冲 --batch 的输出" | |
6317 | ||
31e5e17b | 6318 | #: builtin/cat-file.c:577 |
ef317cd5 | 6319 | msgid "show info and content of objects fed from the standard input" |
07432cef | 6320 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 6321 | |
31e5e17b | 6322 | #: builtin/cat-file.c:580 |
ef317cd5 | 6323 | msgid "show info about objects fed from the standard input" |
07432cef | 6324 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 6325 | |
31e5e17b | 6326 | #: builtin/cat-file.c:583 |
7aea43ff JX |
6327 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
6328 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
6329 | ||
31e5e17b | 6330 | #: builtin/cat-file.c:585 |
1b7f4a34 JX |
6331 | msgid "show all objects with --batch or --batch-check" |
6332 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
6333 | ||
a4f16749 | 6334 | #: builtin/check-attr.c:12 |
814ff314 JX |
6335 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
6336 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 6337 | |
a4f16749 | 6338 | #: builtin/check-attr.c:13 |
94550ed3 JX |
6339 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
6340 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 6341 | |
a4f16749 | 6342 | #: builtin/check-attr.c:20 |
ef317cd5 | 6343 | msgid "report all attributes set on file" |
07432cef | 6344 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 6345 | |
a4f16749 | 6346 | #: builtin/check-attr.c:21 |
ef317cd5 | 6347 | msgid "use .gitattributes only from the index" |
07432cef | 6348 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 6349 | |
31e5e17b | 6350 | #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 |
ef317cd5 | 6351 | msgid "read file names from stdin" |
07432cef | 6352 | msgstr "从标准输入读出文件名" |
ef317cd5 | 6353 | |
a4f16749 | 6354 | #: builtin/check-attr.c:24 builtin/check-ignore.c:26 |
90314792 JX |
6355 | msgid "terminate input and output records by a NUL character" |
6356 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 6357 | |
31e5e17b | 6358 | #: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 |
a77c07d9 JX |
6359 | msgid "suppress progress reporting" |
6360 | msgstr "不显示进度报告" | |
6361 | ||
a4f16749 | 6362 | #: builtin/check-ignore.c:28 |
2e8451e8 JX |
6363 | msgid "show non-matching input paths" |
6364 | msgstr "显示未匹配的输入路径" | |
6365 | ||
a4f16749 | 6366 | #: builtin/check-ignore.c:30 |
90314792 JX |
6367 | msgid "ignore index when checking" |
6368 | msgstr "检查时忽略索引" | |
6369 | ||
31e5e17b | 6370 | #: builtin/check-ignore.c:159 |
a77c07d9 | 6371 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 6372 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 6373 | |
31e5e17b | 6374 | #: builtin/check-ignore.c:162 |
a77c07d9 JX |
6375 | msgid "-z only makes sense with --stdin" |
6376 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
6377 | ||
31e5e17b | 6378 | #: builtin/check-ignore.c:164 |
a77c07d9 JX |
6379 | msgid "no path specified" |
6380 | msgstr "未指定路径" | |
6381 | ||
31e5e17b | 6382 | #: builtin/check-ignore.c:168 |
a77c07d9 JX |
6383 | msgid "--quiet is only valid with a single pathname" |
6384 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
6385 | ||
31e5e17b | 6386 | #: builtin/check-ignore.c:170 |
a77c07d9 JX |
6387 | msgid "cannot have both --quiet and --verbose" |
6388 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
6389 | ||
31e5e17b | 6390 | #: builtin/check-ignore.c:173 |
2e8451e8 JX |
6391 | msgid "--non-matching is only valid with --verbose" |
6392 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
6393 | ||
a4f16749 | 6394 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
6395 | msgid "git check-mailmap [<options>] <contact>..." |
6396 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 6397 | |
a4f16749 | 6398 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
6399 | msgid "also read contacts from stdin" |
6400 | msgstr "还从标准输入读取联系地址" | |
6401 | ||
a4f16749 | 6402 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
6403 | #, c-format |
6404 | msgid "unable to parse contact: %s" | |
6405 | msgstr "不能解析联系地址:%s" | |
6406 | ||
a4f16749 | 6407 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
6408 | msgid "no contacts specified" |
6409 | msgstr "未指定联系地址" | |
6410 | ||
a4f16749 | 6411 | #: builtin/checkout-index.c:128 |
814ff314 JX |
6412 | msgid "git checkout-index [<options>] [--] [<file>...]" |
6413 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 6414 | |
5809aa05 | 6415 | #: builtin/checkout-index.c:143 |
276ceeaa JX |
6416 | msgid "stage should be between 1 and 3 or all" |
6417 | msgstr "索引值应该取值 1 到 3 或者 all" | |
6418 | ||
5809aa05 | 6419 | #: builtin/checkout-index.c:159 |
ef317cd5 | 6420 | msgid "check out all files in the index" |
07432cef | 6421 | msgstr "检出索引区的所有文件" |
ef317cd5 | 6422 | |
5809aa05 | 6423 | #: builtin/checkout-index.c:160 |
ef317cd5 | 6424 | msgid "force overwrite of existing files" |
07432cef | 6425 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 6426 | |
5809aa05 | 6427 | #: builtin/checkout-index.c:162 |
ef317cd5 | 6428 | msgid "no warning for existing files and files not in index" |
07432cef | 6429 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 6430 | |
5809aa05 | 6431 | #: builtin/checkout-index.c:164 |
ef317cd5 | 6432 | msgid "don't checkout new files" |
07432cef | 6433 | msgstr "不检出新文件" |
ef317cd5 | 6434 | |
5809aa05 | 6435 | #: builtin/checkout-index.c:166 |
ef317cd5 | 6436 | msgid "update stat information in the index file" |
07432cef | 6437 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 6438 | |
5809aa05 | 6439 | #: builtin/checkout-index.c:170 |
ef317cd5 | 6440 | msgid "read list of paths from the standard input" |
07432cef | 6441 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 6442 | |
5809aa05 | 6443 | #: builtin/checkout-index.c:172 |
ef317cd5 | 6444 | msgid "write the content to temporary files" |
07432cef | 6445 | msgstr "将内容写入临时文件" |
ef317cd5 | 6446 | |
5809aa05 | 6447 | #: builtin/checkout-index.c:173 builtin/column.c:31 |
31e5e17b JX |
6448 | #: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 |
6449 | #: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 | |
6450 | #: builtin/worktree.c:570 | |
ef317cd5 | 6451 | msgid "string" |
07432cef | 6452 | msgstr "字符串" |
ef317cd5 | 6453 | |
5809aa05 | 6454 | #: builtin/checkout-index.c:174 |
ef317cd5 | 6455 | msgid "when creating files, prepend <string>" |
4375c10e | 6456 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 6457 | |
5809aa05 | 6458 | #: builtin/checkout-index.c:176 |
ef317cd5 | 6459 | msgid "copy out the files from named stage" |
07432cef | 6460 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 6461 | |
5809aa05 | 6462 | #: builtin/checkout.c:27 |
814ff314 JX |
6463 | msgid "git checkout [<options>] <branch>" |
6464 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 6465 | |
5809aa05 | 6466 | #: builtin/checkout.c:28 |
814ff314 JX |
6467 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
6468 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 6469 | |
5809aa05 | 6470 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
6471 | #, c-format |
6472 | msgid "path '%s' does not have our version" | |
6473 | msgstr "路径 '%s' 没有我们的版本" | |
6474 | ||
5809aa05 | 6475 | #: builtin/checkout.c:138 builtin/checkout.c:171 |
c04f5ac3 JX |
6476 | #, c-format |
6477 | msgid "path '%s' does not have their version" | |
6478 | msgstr "路径 '%s' 没有他们的版本" | |
6479 | ||
5809aa05 | 6480 | #: builtin/checkout.c:154 |
c04f5ac3 JX |
6481 | #, c-format |
6482 | msgid "path '%s' does not have all necessary versions" | |
6483 | msgstr "路径 '%s' 没有全部必须的版本" | |
6484 | ||
5809aa05 | 6485 | #: builtin/checkout.c:198 |
c04f5ac3 JX |
6486 | #, c-format |
6487 | msgid "path '%s' does not have necessary versions" | |
6488 | msgstr "路径 '%s' 没有必须的版本" | |
6489 | ||
5809aa05 | 6490 | #: builtin/checkout.c:215 |
c04f5ac3 JX |
6491 | #, c-format |
6492 | msgid "path '%s': cannot merge" | |
90e6ef53 | 6493 | msgstr "path '%s':无法合并" |
c04f5ac3 | 6494 | |
31e5e17b | 6495 | #: builtin/checkout.c:231 |
c04f5ac3 JX |
6496 | #, c-format |
6497 | msgid "Unable to add merge result for '%s'" | |
6498 | msgstr "无法为 '%s' 添加合并结果" | |
6499 | ||
31e5e17b JX |
6500 | #: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 |
6501 | #: builtin/checkout.c:262 | |
07432cef | 6502 | #, c-format |
ef317cd5 | 6503 | msgid "'%s' cannot be used with updating paths" |
07432cef | 6504 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 6505 | |
31e5e17b | 6506 | #: builtin/checkout.c:265 builtin/checkout.c:268 |
07432cef | 6507 | #, c-format |
ef317cd5 | 6508 | msgid "'%s' cannot be used with %s" |
07432cef | 6509 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 6510 | |
31e5e17b | 6511 | #: builtin/checkout.c:271 |
ef317cd5 JX |
6512 | #, c-format |
6513 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 6514 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 6515 | |
31e5e17b | 6516 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
c04f5ac3 JX |
6517 | #, c-format |
6518 | msgid "path '%s' is unmerged" | |
6519 | msgstr "路径 '%s' 未合并" | |
6520 | ||
31e5e17b | 6521 | #: builtin/checkout.c:505 |
c04f5ac3 | 6522 | msgid "you need to resolve your current index first" |
90e6ef53 | 6523 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 6524 | |
31e5e17b | 6525 | #: builtin/checkout.c:636 |
c04f5ac3 | 6526 | #, c-format |
1b7f4a34 JX |
6527 | msgid "Can not do reflog for '%s': %s\n" |
6528 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 6529 | |
31e5e17b | 6530 | #: builtin/checkout.c:677 |
c04f5ac3 JX |
6531 | msgid "HEAD is now at" |
6532 | msgstr "HEAD 目前位于" | |
6533 | ||
31e5e17b | 6534 | #: builtin/checkout.c:681 builtin/clone.c:689 |
3495628d JX |
6535 | msgid "unable to update HEAD" |
6536 | msgstr "不能更新 HEAD" | |
6537 | ||
31e5e17b | 6538 | #: builtin/checkout.c:685 |
c04f5ac3 JX |
6539 | #, c-format |
6540 | msgid "Reset branch '%s'\n" | |
6541 | msgstr "重置分支 '%s'\n" | |
6542 | ||
31e5e17b | 6543 | #: builtin/checkout.c:688 |
c04f5ac3 JX |
6544 | #, c-format |
6545 | msgid "Already on '%s'\n" | |
6546 | msgstr "已经位于 '%s'\n" | |
6547 | ||
31e5e17b | 6548 | #: builtin/checkout.c:692 |
c04f5ac3 JX |
6549 | #, c-format |
6550 | msgid "Switched to and reset branch '%s'\n" | |
6551 | msgstr "切换并重置分支 '%s'\n" | |
6552 | ||
31e5e17b | 6553 | #: builtin/checkout.c:694 builtin/checkout.c:1039 |
c04f5ac3 JX |
6554 | #, c-format |
6555 | msgid "Switched to a new branch '%s'\n" | |
6556 | msgstr "切换到一个新分支 '%s'\n" | |
6557 | ||
31e5e17b | 6558 | #: builtin/checkout.c:696 |
c04f5ac3 JX |
6559 | #, c-format |
6560 | msgid "Switched to branch '%s'\n" | |
6561 | msgstr "切换到分支 '%s'\n" | |
6562 | ||
90e6ef53 | 6563 | # 译者:注意保持前导空格 |
31e5e17b | 6564 | #: builtin/checkout.c:747 |
c04f5ac3 JX |
6565 | #, c-format |
6566 | msgid " ... and %d more.\n" | |
90e6ef53 | 6567 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 6568 | |
31e5e17b | 6569 | #: builtin/checkout.c:753 |
c04f5ac3 JX |
6570 | #, c-format |
6571 | msgid "" | |
6572 | "Warning: you are leaving %d commit behind, not connected to\n" | |
6573 | "any of your branches:\n" | |
6574 | "\n" | |
6575 | "%s\n" | |
6576 | msgid_plural "" | |
6577 | "Warning: you are leaving %d commits behind, not connected to\n" | |
6578 | "any of your branches:\n" | |
6579 | "\n" | |
6580 | "%s\n" | |
6581 | msgstr[0] "" | |
6582 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6583 | "\n" | |
6584 | "%s\n" | |
5ae481e0 JX |
6585 | msgstr[1] "" |
6586 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6587 | "\n" | |
6588 | "%s\n" | |
c04f5ac3 | 6589 | |
31e5e17b | 6590 | #: builtin/checkout.c:772 |
c04f5ac3 JX |
6591 | #, c-format |
6592 | msgid "" | |
7aea43ff JX |
6593 | "If you want to keep it by creating a new branch, this may be a good time\n" |
6594 | "to do so with:\n" | |
6595 | "\n" | |
6596 | " git branch <new-branch-name> %s\n" | |
6597 | "\n" | |
6598 | msgid_plural "" | |
c04f5ac3 JX |
6599 | "If you want to keep them by creating a new branch, this may be a good time\n" |
6600 | "to do so with:\n" | |
6601 | "\n" | |
814ff314 | 6602 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 6603 | "\n" |
7aea43ff JX |
6604 | msgstr[0] "" |
6605 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
6606 | "如下操作:\n" | |
6607 | "\n" | |
6608 | " git branch <新分支名> %s\n" | |
6609 | "\n" | |
6610 | msgstr[1] "" | |
6611 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
6612 | "如下操作:\n" |
6613 | "\n" | |
814ff314 | 6614 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
6615 | "\n" |
6616 | ||
31e5e17b | 6617 | #: builtin/checkout.c:804 |
c04f5ac3 JX |
6618 | msgid "internal error in revision walk" |
6619 | msgstr "在版本遍历时遇到内部错误" | |
6620 | ||
31e5e17b | 6621 | #: builtin/checkout.c:808 |
c04f5ac3 JX |
6622 | msgid "Previous HEAD position was" |
6623 | msgstr "之前的 HEAD 位置是" | |
6624 | ||
31e5e17b | 6625 | #: builtin/checkout.c:836 builtin/checkout.c:1034 |
c04f5ac3 | 6626 | msgid "You are on a branch yet to be born" |
90e6ef53 | 6627 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 6628 | |
31e5e17b | 6629 | #: builtin/checkout.c:940 |
90314792 JX |
6630 | #, c-format |
6631 | msgid "only one reference expected, %d given." | |
a0b6b246 | 6632 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 6633 | |
31e5e17b | 6634 | #: builtin/checkout.c:980 builtin/worktree.c:249 |
c04f5ac3 JX |
6635 | #, c-format |
6636 | msgid "invalid reference: %s" | |
6637 | msgstr "无效引用:%s" | |
6638 | ||
31e5e17b | 6639 | #: builtin/checkout.c:1009 |
c04f5ac3 JX |
6640 | #, c-format |
6641 | msgid "reference is not a tree: %s" | |
6642 | msgstr "引用不是一个树:%s" | |
6643 | ||
31e5e17b | 6644 | #: builtin/checkout.c:1048 |
ef317cd5 | 6645 | msgid "paths cannot be used with switching branches" |
07432cef | 6646 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 6647 | |
31e5e17b | 6648 | #: builtin/checkout.c:1051 builtin/checkout.c:1055 |
07432cef | 6649 | #, c-format |
ef317cd5 | 6650 | msgid "'%s' cannot be used with switching branches" |
07432cef | 6651 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 6652 | |
31e5e17b JX |
6653 | #: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 |
6654 | #: builtin/checkout.c:1070 | |
07432cef | 6655 | #, c-format |
ef317cd5 | 6656 | msgid "'%s' cannot be used with '%s'" |
07432cef | 6657 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 6658 | |
31e5e17b | 6659 | #: builtin/checkout.c:1075 |
07432cef | 6660 | #, c-format |
ef317cd5 | 6661 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 6662 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 6663 | |
31e5e17b JX |
6664 | #: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 |
6665 | #: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 | |
6666 | #: builtin/worktree.c:389 | |
ef317cd5 | 6667 | msgid "branch" |
07432cef | 6668 | msgstr "分支" |
c04f5ac3 | 6669 | |
31e5e17b | 6670 | #: builtin/checkout.c:1108 |
ef317cd5 | 6671 | msgid "create and checkout a new branch" |
07432cef | 6672 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 6673 | |
31e5e17b | 6674 | #: builtin/checkout.c:1110 |
ef317cd5 | 6675 | msgid "create/reset and checkout a branch" |
07432cef | 6676 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 6677 | |
31e5e17b | 6678 | #: builtin/checkout.c:1111 |
ef317cd5 | 6679 | msgid "create reflog for new branch" |
07432cef | 6680 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 6681 | |
31e5e17b | 6682 | #: builtin/checkout.c:1112 builtin/worktree.c:391 |
5c57d762 JX |
6683 | msgid "detach HEAD at named commit" |
6684 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 6685 | |
31e5e17b | 6686 | #: builtin/checkout.c:1113 |
ef317cd5 | 6687 | msgid "set upstream info for new branch" |
07432cef | 6688 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 6689 | |
31e5e17b | 6690 | #: builtin/checkout.c:1115 |
6c94aba5 | 6691 | msgid "new-branch" |
07432cef | 6692 | msgstr "新分支" |
ef317cd5 | 6693 | |
31e5e17b | 6694 | #: builtin/checkout.c:1115 |
ef317cd5 | 6695 | msgid "new unparented branch" |
07432cef | 6696 | msgstr "新的没有父提交的分支" |
ef317cd5 | 6697 | |
31e5e17b | 6698 | #: builtin/checkout.c:1116 |
ef317cd5 | 6699 | msgid "checkout our version for unmerged files" |
07432cef | 6700 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 6701 | |
31e5e17b | 6702 | #: builtin/checkout.c:1118 |
ef317cd5 | 6703 | msgid "checkout their version for unmerged files" |
07432cef | 6704 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 6705 | |
31e5e17b | 6706 | #: builtin/checkout.c:1120 |
ef317cd5 | 6707 | msgid "force checkout (throw away local modifications)" |
07432cef | 6708 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 6709 | |
31e5e17b | 6710 | #: builtin/checkout.c:1122 |
ef317cd5 | 6711 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 6712 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 6713 | |
31e5e17b | 6714 | #: builtin/checkout.c:1124 builtin/merge.c:239 |
ef317cd5 | 6715 | msgid "update ignored files (default)" |
07432cef | 6716 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 6717 | |
31e5e17b | 6718 | #: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 |
ef317cd5 | 6719 | msgid "style" |
07432cef | 6720 | msgstr "风格" |
ef317cd5 | 6721 | |
31e5e17b | 6722 | #: builtin/checkout.c:1127 |
ef317cd5 | 6723 | msgid "conflict style (merge or diff3)" |
07432cef | 6724 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 6725 | |
31e5e17b | 6726 | #: builtin/checkout.c:1130 |
4dcdc3d8 JX |
6727 | msgid "do not limit pathspecs to sparse entries only" |
6728 | msgstr "对路径不做稀疏检出的限制" | |
6729 | ||
31e5e17b | 6730 | #: builtin/checkout.c:1132 |
814ff314 JX |
6731 | msgid "second guess 'git checkout <no-such-branch>'" |
6732 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 6733 | |
31e5e17b | 6734 | #: builtin/checkout.c:1134 |
7aea43ff JX |
6735 | msgid "do not check if another worktree is holding the given ref" |
6736 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
6737 | ||
31e5e17b JX |
6738 | #: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 |
6739 | #: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 | |
a4f16749 | 6740 | #: builtin/send-pack.c:173 |
94550ed3 JX |
6741 | msgid "force progress reporting" |
6742 | msgstr "强制显示进度报告" | |
6743 | ||
31e5e17b | 6744 | #: builtin/checkout.c:1168 |
ef317cd5 | 6745 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 6746 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 6747 | |
31e5e17b | 6748 | #: builtin/checkout.c:1185 |
ef317cd5 JX |
6749 | msgid "--track needs a branch name" |
6750 | msgstr "--track 需要一个分支名" | |
6751 | ||
31e5e17b | 6752 | #: builtin/checkout.c:1190 |
ef317cd5 JX |
6753 | msgid "Missing branch name; try -b" |
6754 | msgstr "缺少分支名;尝试 -b" | |
6755 | ||
31e5e17b | 6756 | #: builtin/checkout.c:1226 |
c04f5ac3 | 6757 | msgid "invalid path specification" |
90e6ef53 | 6758 | msgstr "无效的路径规格" |
c04f5ac3 | 6759 | |
31e5e17b | 6760 | #: builtin/checkout.c:1233 |
07432cef | 6761 | #, c-format |
a4f16749 JX |
6762 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
6763 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 6764 | |
31e5e17b | 6765 | #: builtin/checkout.c:1237 |
07432cef | 6766 | #, c-format |
ef317cd5 | 6767 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 6768 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 6769 | |
31e5e17b | 6770 | #: builtin/checkout.c:1241 |
c04f5ac3 JX |
6771 | msgid "" |
6772 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
6773 | "checking out of the index." | |
6774 | msgstr "" | |
90e6ef53 | 6775 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 6776 | |
a4f16749 | 6777 | #: builtin/clean.c:26 |
2e8451e8 JX |
6778 | msgid "" |
6779 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
6780 | msgstr "" | |
6781 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 6782 | |
a4f16749 | 6783 | #: builtin/clean.c:30 |
07432cef WS |
6784 | #, c-format |
6785 | msgid "Removing %s\n" | |
6786 | msgstr "正删除 %s\n" | |
6787 | ||
a4f16749 | 6788 | #: builtin/clean.c:31 |
07432cef WS |
6789 | #, c-format |
6790 | msgid "Would remove %s\n" | |
6791 | msgstr "将删除 %s\n" | |
6792 | ||
a4f16749 | 6793 | #: builtin/clean.c:32 |
07432cef WS |
6794 | #, c-format |
6795 | msgid "Skipping repository %s\n" | |
160fb2b2 | 6796 | msgstr "忽略仓库 %s\n" |
07432cef | 6797 | |
a4f16749 | 6798 | #: builtin/clean.c:33 |
07432cef WS |
6799 | #, c-format |
6800 | msgid "Would skip repository %s\n" | |
160fb2b2 | 6801 | msgstr "将忽略仓库 %s\n" |
07432cef | 6802 | |
a4f16749 | 6803 | #: builtin/clean.c:34 |
07432cef WS |
6804 | #, c-format |
6805 | msgid "failed to remove %s" | |
6806 | msgstr "无法删除 %s" | |
6807 | ||
5809aa05 | 6808 | #: builtin/clean.c:302 git-add--interactive.perl:572 |
1a79b2f1 | 6809 | #, c-format |
2e8451e8 JX |
6810 | msgid "" |
6811 | "Prompt help:\n" | |
6812 | "1 - select a numbered item\n" | |
6813 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 6814 | " - (empty) select nothing\n" |
2e8451e8 JX |
6815 | msgstr "" |
6816 | "帮助:\n" | |
6817 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
6818 | "foo - 通过唯一前缀选择一个选项\n" |
6819 | " - (空)什么也不选择\n" | |
2e8451e8 | 6820 | |
5809aa05 | 6821 | #: builtin/clean.c:306 git-add--interactive.perl:581 |
1a79b2f1 | 6822 | #, c-format |
2e8451e8 JX |
6823 | msgid "" |
6824 | "Prompt help:\n" | |
6825 | "1 - select a single item\n" | |
6826 | "3-5 - select a range of items\n" | |
6827 | "2-3,6-9 - select multiple ranges\n" | |
6828 | "foo - select item based on unique prefix\n" | |
6829 | "-... - unselect specified items\n" | |
6830 | "* - choose all items\n" | |
1a79b2f1 | 6831 | " - (empty) finish selecting\n" |
2e8451e8 JX |
6832 | msgstr "" |
6833 | "帮助:\n" | |
6834 | "1 - 选择一个选项\n" | |
6835 | "3-5 - 选择一个范围内的所有选项\n" | |
6836 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 6837 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
6838 | "-... - 反选特定的选项\n" |
6839 | "* - 选择所有选项\n" | |
1a79b2f1 | 6840 | " - (空)结束选择\n" |
2e8451e8 | 6841 | |
5809aa05 | 6842 | #: builtin/clean.c:522 git-add--interactive.perl:547 |
a4f16749 | 6843 | #: git-add--interactive.perl:552 |
1a79b2f1 JX |
6844 | #, c-format, perl-format |
6845 | msgid "Huh (%s)?\n" | |
6846 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 6847 | |
5809aa05 | 6848 | #: builtin/clean.c:664 |
2e8451e8 JX |
6849 | #, c-format |
6850 | msgid "Input ignore patterns>> " | |
6851 | msgstr "输入模版以排除条目>> " | |
6852 | ||
5809aa05 | 6853 | #: builtin/clean.c:701 |
2e8451e8 JX |
6854 | #, c-format |
6855 | msgid "WARNING: Cannot find items matched by: %s" | |
6856 | msgstr "警告:无法找到和 %s 匹配的条目" | |
6857 | ||
5809aa05 | 6858 | #: builtin/clean.c:722 |
2e8451e8 JX |
6859 | msgid "Select items to delete" |
6860 | msgstr "选择要删除的条目" | |
6861 | ||
814ff314 | 6862 | #. TRANSLATORS: Make sure to keep [y/N] as is |
5809aa05 | 6863 | #: builtin/clean.c:763 |
2e8451e8 | 6864 | #, c-format |
814ff314 JX |
6865 | msgid "Remove %s [y/N]? " |
6866 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 6867 | |
31e5e17b | 6868 | #: builtin/clean.c:788 git-add--interactive.perl:1710 |
1a79b2f1 JX |
6869 | #, c-format |
6870 | msgid "Bye.\n" | |
6871 | msgstr "再见。\n" | |
2e8451e8 | 6872 | |
5809aa05 | 6873 | #: builtin/clean.c:796 |
2e8451e8 JX |
6874 | msgid "" |
6875 | "clean - start cleaning\n" | |
6876 | "filter by pattern - exclude items from deletion\n" | |
6877 | "select by numbers - select items to be deleted by numbers\n" | |
6878 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
6879 | "quit - stop cleaning\n" | |
6880 | "help - this screen\n" | |
6881 | "? - help for prompt selection" | |
6882 | msgstr "" | |
6883 | "clean - 开始清理\n" | |
6884 | "filter by pattern - 通过模版排除要删除的条目\n" | |
6885 | "select by numbers - 通过数字选择要删除的条目\n" | |
6886 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
6887 | "quit - 停止删除并退出\n" | |
6888 | "help - 显示本帮助\n" | |
6889 | "? - 显示如何在提示符下选择的帮助" | |
6890 | ||
31e5e17b | 6891 | #: builtin/clean.c:823 git-add--interactive.perl:1786 |
2e8451e8 JX |
6892 | msgid "*** Commands ***" |
6893 | msgstr "*** 命令 ***" | |
6894 | ||
31e5e17b | 6895 | #: builtin/clean.c:824 git-add--interactive.perl:1783 |
2e8451e8 JX |
6896 | msgid "What now" |
6897 | msgstr "请选择" | |
6898 | ||
5809aa05 | 6899 | #: builtin/clean.c:832 |
2e8451e8 JX |
6900 | msgid "Would remove the following item:" |
6901 | msgid_plural "Would remove the following items:" | |
6902 | msgstr[0] "将删除如下条目:" | |
6903 | msgstr[1] "将删除如下条目:" | |
6904 | ||
5809aa05 | 6905 | #: builtin/clean.c:848 |
2e8451e8 JX |
6906 | msgid "No more files to clean, exiting." |
6907 | msgstr "没有要清理的文件,退出。" | |
6908 | ||
5809aa05 | 6909 | #: builtin/clean.c:910 |
ef317cd5 | 6910 | msgid "do not print names of files removed" |
07432cef | 6911 | msgstr "不打印删除文件的名称" |
ef317cd5 | 6912 | |
5809aa05 | 6913 | #: builtin/clean.c:912 |
ef317cd5 | 6914 | msgid "force" |
07432cef | 6915 | msgstr "强制" |
ef317cd5 | 6916 | |
5809aa05 | 6917 | #: builtin/clean.c:913 |
2e8451e8 JX |
6918 | msgid "interactive cleaning" |
6919 | msgstr "交互式清除" | |
6920 | ||
5809aa05 | 6921 | #: builtin/clean.c:915 |
ef317cd5 | 6922 | msgid "remove whole directories" |
07432cef | 6923 | msgstr "删除整个目录" |
ef317cd5 | 6924 | |
31e5e17b JX |
6925 | #: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 |
6926 | #: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 | |
5809aa05 JX |
6927 | #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 |
6928 | #: builtin/show-ref.c:176 | |
ef317cd5 | 6929 | msgid "pattern" |
07432cef | 6930 | msgstr "模式" |
ef317cd5 | 6931 | |
5809aa05 | 6932 | #: builtin/clean.c:917 |
ef317cd5 | 6933 | msgid "add <pattern> to ignore rules" |
4375c10e | 6934 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 6935 | |
5809aa05 | 6936 | #: builtin/clean.c:918 |
ef317cd5 | 6937 | msgid "remove ignored files, too" |
07432cef | 6938 | msgstr "也删除忽略的文件" |
ef317cd5 | 6939 | |
5809aa05 | 6940 | #: builtin/clean.c:920 |
ef317cd5 | 6941 | msgid "remove only ignored files" |
07432cef | 6942 | msgstr "只删除忽略的文件" |
c04f5ac3 | 6943 | |
5809aa05 | 6944 | #: builtin/clean.c:938 |
c04f5ac3 | 6945 | msgid "-x and -X cannot be used together" |
649900bc | 6946 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 6947 | |
5809aa05 | 6948 | #: builtin/clean.c:942 |
c04f5ac3 | 6949 | msgid "" |
6c94aba5 | 6950 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 6951 | "clean" |
c04f5ac3 | 6952 | msgstr "" |
2e8451e8 | 6953 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 6954 | |
5809aa05 | 6955 | #: builtin/clean.c:945 |
c04f5ac3 | 6956 | msgid "" |
6c94aba5 | 6957 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 6958 | "refusing to clean" |
c04f5ac3 | 6959 | msgstr "" |
2e8451e8 | 6960 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 6961 | |
31e5e17b | 6962 | #: builtin/clone.c:40 |
814ff314 | 6963 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 6964 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 6965 | |
31e5e17b | 6966 | #: builtin/clone.c:85 |
ef317cd5 | 6967 | msgid "don't create a checkout" |
07432cef | 6968 | msgstr "不创建一个检出" |
ef317cd5 | 6969 | |
31e5e17b | 6970 | #: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 |
ef317cd5 | 6971 | msgid "create a bare repository" |
160fb2b2 | 6972 | msgstr "创建一个纯仓库" |
ef317cd5 | 6973 | |
31e5e17b | 6974 | #: builtin/clone.c:90 |
ef317cd5 | 6975 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 6976 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 6977 | |
31e5e17b | 6978 | #: builtin/clone.c:92 |
ef317cd5 | 6979 | msgid "to clone from a local repository" |
160fb2b2 | 6980 | msgstr "从本地仓库克隆" |
ef317cd5 | 6981 | |
31e5e17b | 6982 | #: builtin/clone.c:94 |
ef317cd5 | 6983 | msgid "don't use local hardlinks, always copy" |
07432cef | 6984 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 6985 | |
31e5e17b | 6986 | #: builtin/clone.c:96 |
ef317cd5 | 6987 | msgid "setup as shared repository" |
160fb2b2 | 6988 | msgstr "设置为共享仓库" |
ef317cd5 | 6989 | |
31e5e17b | 6990 | #: builtin/clone.c:98 builtin/clone.c:102 |
87cb7997 | 6991 | msgid "pathspec" |
65e2041e | 6992 | msgstr "路径规格" |
87cb7997 | 6993 | |
31e5e17b | 6994 | #: builtin/clone.c:98 builtin/clone.c:102 |
ef317cd5 | 6995 | msgid "initialize submodules in the clone" |
07432cef | 6996 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 6997 | |
31e5e17b | 6998 | #: builtin/clone.c:105 |
5b04ee3b JX |
6999 | msgid "number of submodules cloned in parallel" |
7000 | msgstr "并发克隆的子模组的数量" | |
7001 | ||
31e5e17b | 7002 | #: builtin/clone.c:106 builtin/init-db.c:476 |
ef317cd5 | 7003 | msgid "template-directory" |
07432cef | 7004 | msgstr "模板目录" |
ef317cd5 | 7005 | |
31e5e17b | 7006 | #: builtin/clone.c:107 builtin/init-db.c:477 |
ef317cd5 | 7007 | msgid "directory from which templates will be used" |
07432cef | 7008 | msgstr "模板目录将被使用" |
ef317cd5 | 7009 | |
31e5e17b JX |
7010 | #: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 |
7011 | #: builtin/submodule--helper.c:1577 | |
ef317cd5 | 7012 | msgid "reference repository" |
160fb2b2 | 7013 | msgstr "参考仓库" |
ef317cd5 | 7014 | |
31e5e17b | 7015 | #: builtin/clone.c:113 |
7aea43ff | 7016 | msgid "use --reference only while cloning" |
160fb2b2 | 7017 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 7018 | |
31e5e17b | 7019 | #: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 |
ef317cd5 | 7020 | msgid "name" |
07432cef | 7021 | msgstr "名称" |
ef317cd5 | 7022 | |
31e5e17b | 7023 | #: builtin/clone.c:115 |
ef317cd5 | 7024 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 7025 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 7026 | |
31e5e17b | 7027 | #: builtin/clone.c:117 |
ef317cd5 | 7028 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 7029 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 7030 | |
31e5e17b | 7031 | #: builtin/clone.c:119 |
ef317cd5 | 7032 | msgid "path to git-upload-pack on the remote" |
07432cef | 7033 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 7034 | |
31e5e17b | 7035 | #: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 |
5809aa05 | 7036 | #: builtin/pull.c:211 |
ef317cd5 | 7037 | msgid "depth" |
07432cef | 7038 | msgstr "深度" |
ef317cd5 | 7039 | |
31e5e17b | 7040 | #: builtin/clone.c:121 |
ef317cd5 | 7041 | msgid "create a shallow clone of that depth" |
07432cef | 7042 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 7043 | |
31e5e17b JX |
7044 | #: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 |
7045 | #: parse-options.h:154 | |
a0b6b246 JX |
7046 | msgid "time" |
7047 | msgstr "时间" | |
7048 | ||
31e5e17b | 7049 | #: builtin/clone.c:123 |
a0b6b246 JX |
7050 | msgid "create a shallow clone since a specific time" |
7051 | msgstr "从一个特定时间创建一个浅克隆" | |
7052 | ||
31e5e17b | 7053 | #: builtin/clone.c:124 builtin/fetch.c:155 |
a0b6b246 JX |
7054 | msgid "revision" |
7055 | msgstr "版本" | |
7056 | ||
31e5e17b | 7057 | #: builtin/clone.c:125 builtin/fetch.c:156 |
1a79b2f1 JX |
7058 | msgid "deepen history of shallow clone, excluding rev" |
7059 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 7060 | |
31e5e17b | 7061 | #: builtin/clone.c:127 |
ef317cd5 | 7062 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 7063 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 7064 | |
31e5e17b | 7065 | #: builtin/clone.c:129 |
a4f16749 JX |
7066 | msgid "don't clone any tags, and make later fetches not to follow them" |
7067 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
7068 | ||
31e5e17b | 7069 | #: builtin/clone.c:131 |
5b04ee3b JX |
7070 | msgid "any cloned submodules will be shallow" |
7071 | msgstr "子模组将以浅下载模式克隆" | |
7072 | ||
31e5e17b | 7073 | #: builtin/clone.c:132 builtin/init-db.c:485 |
ef317cd5 | 7074 | msgid "gitdir" |
07432cef | 7075 | msgstr "git目录" |
ef317cd5 | 7076 | |
31e5e17b | 7077 | #: builtin/clone.c:133 builtin/init-db.c:486 |
ef317cd5 | 7078 | msgid "separate git dir from working tree" |
07432cef | 7079 | msgstr "git目录和工作区分离" |
ef317cd5 | 7080 | |
31e5e17b | 7081 | #: builtin/clone.c:134 |
ef317cd5 | 7082 | msgid "key=value" |
07432cef | 7083 | msgstr "key=value" |
ef317cd5 | 7084 | |
31e5e17b | 7085 | #: builtin/clone.c:135 |
ef317cd5 | 7086 | msgid "set config inside the new repository" |
160fb2b2 | 7087 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 7088 | |
31e5e17b | 7089 | #: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 |
5809aa05 | 7090 | #: builtin/push.c:567 |
276ceeaa JX |
7091 | msgid "use IPv4 addresses only" |
7092 | msgstr "只使用 IPv4 地址" | |
7093 | ||
31e5e17b | 7094 | #: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 |
5809aa05 | 7095 | #: builtin/push.c:569 |
276ceeaa JX |
7096 | msgid "use IPv6 addresses only" |
7097 | msgstr "只使用 IPv6 地址" | |
7098 | ||
31e5e17b | 7099 | #: builtin/clone.c:276 |
3495628d JX |
7100 | msgid "" |
7101 | "No directory name could be guessed.\n" | |
7102 | "Please specify a directory on the command line" | |
7103 | msgstr "" | |
7104 | "无法猜到目录名。\n" | |
26e4cbec | 7105 | "请在命令行指定一个目录" |
3495628d | 7106 | |
31e5e17b | 7107 | #: builtin/clone.c:329 |
cfff71a9 | 7108 | #, c-format |
a0b6b246 JX |
7109 | msgid "info: Could not add alternate for '%s': %s\n" |
7110 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 7111 | |
31e5e17b | 7112 | #: builtin/clone.c:401 |
5c57d762 JX |
7113 | #, c-format |
7114 | msgid "failed to open '%s'" | |
7115 | msgstr "无法打开 '%s'" | |
7116 | ||
31e5e17b | 7117 | #: builtin/clone.c:409 |
c04f5ac3 JX |
7118 | #, c-format |
7119 | msgid "%s exists and is not a directory" | |
7120 | msgstr "%s 存在且不是一个目录" | |
7121 | ||
31e5e17b | 7122 | #: builtin/clone.c:423 |
c04f5ac3 JX |
7123 | #, c-format |
7124 | msgid "failed to stat %s\n" | |
65e2041e | 7125 | msgstr "对 %s 调用 stat 失败\n" |
c04f5ac3 | 7126 | |
31e5e17b | 7127 | #: builtin/clone.c:445 |
c04f5ac3 JX |
7128 | #, c-format |
7129 | msgid "failed to create link '%s'" | |
90e6ef53 | 7130 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 7131 | |
31e5e17b | 7132 | #: builtin/clone.c:449 |
c04f5ac3 JX |
7133 | #, c-format |
7134 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 7135 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 7136 | |
31e5e17b | 7137 | #: builtin/clone.c:475 |
c04f5ac3 JX |
7138 | #, c-format |
7139 | msgid "done.\n" | |
7140 | msgstr "完成。\n" | |
7141 | ||
31e5e17b | 7142 | #: builtin/clone.c:489 |
1003b3a5 JX |
7143 | msgid "" |
7144 | "Clone succeeded, but checkout failed.\n" | |
7145 | "You can inspect what was checked out with 'git status'\n" | |
7146 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
7147 | msgstr "" | |
7148 | "克隆成功,但是检出失败。\n" | |
7149 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
7150 | "'git checkout -f HEAD' 重试\n" | |
7151 | ||
31e5e17b | 7152 | #: builtin/clone.c:566 |
c04f5ac3 JX |
7153 | #, c-format |
7154 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 7155 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 7156 | |
31e5e17b | 7157 | #: builtin/clone.c:661 |
1003b3a5 JX |
7158 | msgid "remote did not send all necessary objects" |
7159 | msgstr "远程没有发送所有必须的对象" | |
7160 | ||
31e5e17b | 7161 | #: builtin/clone.c:677 |
3495628d JX |
7162 | #, c-format |
7163 | msgid "unable to update %s" | |
7164 | msgstr "不能更新 %s" | |
7165 | ||
31e5e17b | 7166 | #: builtin/clone.c:726 |
c04f5ac3 JX |
7167 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
7168 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
7169 | ||
31e5e17b | 7170 | #: builtin/clone.c:756 |
1003b3a5 JX |
7171 | msgid "unable to checkout working tree" |
7172 | msgstr "不能检出工作区" | |
7173 | ||
31e5e17b | 7174 | #: builtin/clone.c:801 |
3495628d JX |
7175 | msgid "unable to write parameters to config file" |
7176 | msgstr "无法将参数写入配置文件" | |
7177 | ||
31e5e17b | 7178 | #: builtin/clone.c:864 |
04cb2f28 JX |
7179 | msgid "cannot repack to clean up" |
7180 | msgstr "无法执行 repack 来清理" | |
7181 | ||
31e5e17b | 7182 | #: builtin/clone.c:866 |
04cb2f28 JX |
7183 | msgid "cannot unlink temporary alternates file" |
7184 | msgstr "无法删除临时的 alternates 文件" | |
7185 | ||
31e5e17b | 7186 | #: builtin/clone.c:906 builtin/receive-pack.c:1946 |
c04f5ac3 JX |
7187 | msgid "Too many arguments." |
7188 | msgstr "太多参数。" | |
7189 | ||
31e5e17b | 7190 | #: builtin/clone.c:910 |
c04f5ac3 | 7191 | msgid "You must specify a repository to clone." |
160fb2b2 | 7192 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 7193 | |
31e5e17b | 7194 | #: builtin/clone.c:923 |
c04f5ac3 JX |
7195 | #, c-format |
7196 | msgid "--bare and --origin %s options are incompatible." | |
7197 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
7198 | ||
31e5e17b | 7199 | #: builtin/clone.c:926 |
07432cef WS |
7200 | msgid "--bare and --separate-git-dir are incompatible." |
7201 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
7202 | ||
31e5e17b | 7203 | #: builtin/clone.c:939 |
c04f5ac3 JX |
7204 | #, c-format |
7205 | msgid "repository '%s' does not exist" | |
160fb2b2 | 7206 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 7207 | |
31e5e17b | 7208 | #: builtin/clone.c:945 builtin/fetch.c:1455 |
cfff71a9 JX |
7209 | #, c-format |
7210 | msgid "depth %s is not a positive number" | |
7211 | msgstr "深度 %s 不是一个正数" | |
7212 | ||
31e5e17b | 7213 | #: builtin/clone.c:955 |
c04f5ac3 JX |
7214 | #, c-format |
7215 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 7216 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 7217 | |
31e5e17b | 7218 | #: builtin/clone.c:965 |
c04f5ac3 JX |
7219 | #, c-format |
7220 | msgid "working tree '%s' already exists." | |
7221 | msgstr "工作区 '%s' 已经存在。" | |
7222 | ||
31e5e17b JX |
7223 | #: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 |
7224 | #: builtin/worktree.c:255 builtin/worktree.c:285 | |
5bb01d4f JX |
7225 | #, c-format |
7226 | msgid "could not create leading directories of '%s'" | |
7227 | msgstr "不能为 '%s' 创建先导目录" | |
7228 | ||
31e5e17b | 7229 | #: builtin/clone.c:985 |
c04f5ac3 | 7230 | #, c-format |
814ff314 JX |
7231 | msgid "could not create work tree dir '%s'" |
7232 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 7233 | |
31e5e17b | 7234 | #: builtin/clone.c:1005 |
c04f5ac3 JX |
7235 | #, c-format |
7236 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 7237 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 7238 | |
31e5e17b | 7239 | #: builtin/clone.c:1007 |
c04f5ac3 JX |
7240 | #, c-format |
7241 | msgid "Cloning into '%s'...\n" | |
7242 | msgstr "正克隆到 '%s'...\n" | |
7243 | ||
31e5e17b | 7244 | #: builtin/clone.c:1031 |
a0b6b246 JX |
7245 | msgid "" |
7246 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
7247 | "able" | |
7248 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
7249 | ||
31e5e17b | 7250 | #: builtin/clone.c:1093 |
6acbf033 | 7251 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
7252 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
7253 | ||
31e5e17b | 7254 | #: builtin/clone.c:1095 |
a0b6b246 JX |
7255 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
7256 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 7257 | |
31e5e17b | 7258 | #: builtin/clone.c:1097 |
a0b6b246 JX |
7259 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
7260 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
7261 | ||
31e5e17b JX |
7262 | #: builtin/clone.c:1099 |
7263 | msgid "--filter is ignored in local clones; use file:// instead." | |
7264 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
7265 | ||
7266 | #: builtin/clone.c:1102 | |
6acbf033 | 7267 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 7268 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 7269 | |
31e5e17b | 7270 | #: builtin/clone.c:1107 |
6acbf033 JX |
7271 | msgid "--local is ignored" |
7272 | msgstr "--local 被忽略" | |
7273 | ||
31e5e17b | 7274 | #: builtin/clone.c:1169 builtin/clone.c:1177 |
c04f5ac3 JX |
7275 | #, c-format |
7276 | msgid "Remote branch %s not found in upstream %s" | |
7277 | msgstr "远程分支 %s 在上游 %s 未发现" | |
7278 | ||
31e5e17b | 7279 | #: builtin/clone.c:1180 |
c04f5ac3 | 7280 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 7281 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 7282 | |
a4f16749 | 7283 | #: builtin/column.c:10 |
814ff314 JX |
7284 | msgid "git column [<options>]" |
7285 | msgstr "git column [<选项>]" | |
ef317cd5 | 7286 | |
a4f16749 | 7287 | #: builtin/column.c:27 |
ef317cd5 | 7288 | msgid "lookup config vars" |
07432cef | 7289 | msgstr "查找配置变量" |
ef317cd5 | 7290 | |
a4f16749 | 7291 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 7292 | msgid "layout to use" |
07432cef | 7293 | msgstr "要使用的布局" |
ef317cd5 | 7294 | |
a4f16749 | 7295 | #: builtin/column.c:30 |
ef317cd5 | 7296 | msgid "Maximum width" |
07432cef | 7297 | msgstr "最大宽度" |
ef317cd5 | 7298 | |
a4f16749 | 7299 | #: builtin/column.c:31 |
ef317cd5 | 7300 | msgid "Padding space on left border" |
07432cef | 7301 | msgstr "左边框的填充空间" |
ef317cd5 | 7302 | |
a4f16749 | 7303 | #: builtin/column.c:32 |
ef317cd5 | 7304 | msgid "Padding space on right border" |
07432cef | 7305 | msgstr "右边框的填充空间" |
ef317cd5 | 7306 | |
a4f16749 | 7307 | #: builtin/column.c:33 |
ef317cd5 | 7308 | msgid "Padding space between columns" |
07432cef | 7309 | msgstr "两列之间的填充空间" |
ef317cd5 | 7310 | |
a4f16749 | 7311 | #: builtin/column.c:52 |
8ada9598 | 7312 | msgid "--command must be the first argument" |
81809b99 | 7313 | msgstr "--command 必须是第一个参数" |
8ada9598 | 7314 | |
31e5e17b | 7315 | #: builtin/commit.c:37 |
814ff314 | 7316 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 7317 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 7318 | |
31e5e17b | 7319 | #: builtin/commit.c:42 |
814ff314 | 7320 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 7321 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 7322 | |
31e5e17b | 7323 | #: builtin/commit.c:47 |
c04f5ac3 JX |
7324 | msgid "" |
7325 | "You asked to amend the most recent commit, but doing so would make\n" | |
7326 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
7327 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
7328 | msgstr "" | |
1b150dc9 T |
7329 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
7330 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 7331 | |
31e5e17b | 7332 | #: builtin/commit.c:52 |
c04f5ac3 JX |
7333 | msgid "" |
7334 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
7335 | "If you wish to commit it anyway, use:\n" | |
7336 | "\n" | |
7337 | " git commit --allow-empty\n" | |
7338 | "\n" | |
c04f5ac3 | 7339 | msgstr "" |
a9ce4543 T |
7340 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
7341 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
7342 | "\n" |
7343 | " git commit --allow-empty\n" | |
7344 | "\n" | |
c04f5ac3 | 7345 | |
31e5e17b | 7346 | #: builtin/commit.c:59 |
b1894384 JX |
7347 | msgid "Otherwise, please use 'git reset'\n" |
7348 | msgstr "否则,请使用命令 'git reset'\n" | |
7349 | ||
31e5e17b | 7350 | #: builtin/commit.c:62 |
b1894384 JX |
7351 | msgid "" |
7352 | "If you wish to skip this commit, use:\n" | |
7353 | "\n" | |
7354 | " git reset\n" | |
7355 | "\n" | |
7356 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
7357 | "the remaining commits.\n" | |
7358 | msgstr "" | |
7359 | "如果您想跳过这个提交,使用命令:\n" | |
7360 | "\n" | |
7361 | " git reset\n" | |
7362 | "\n" | |
7363 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
7364 | "操作。\n" | |
7365 | ||
31e5e17b | 7366 | #: builtin/commit.c:284 |
c04f5ac3 | 7367 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 7368 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 7369 | |
31e5e17b | 7370 | #: builtin/commit.c:325 |
c04f5ac3 | 7371 | msgid "unable to create temporary index" |
90e6ef53 | 7372 | msgstr "不能创建临时索引" |
c04f5ac3 | 7373 | |
31e5e17b | 7374 | #: builtin/commit.c:331 |
c04f5ac3 JX |
7375 | msgid "interactive add failed" |
7376 | msgstr "交互式添加失败" | |
7377 | ||
31e5e17b | 7378 | #: builtin/commit.c:344 |
220c313c JX |
7379 | msgid "unable to update temporary index" |
7380 | msgstr "无法更新临时索引" | |
7381 | ||
31e5e17b | 7382 | #: builtin/commit.c:346 |
220c313c JX |
7383 | msgid "Failed to update main cache tree" |
7384 | msgstr "不能更新树的主缓存" | |
7385 | ||
31e5e17b | 7386 | #: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 |
c04f5ac3 | 7387 | msgid "unable to write new_index file" |
90e6ef53 | 7388 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 7389 | |
31e5e17b | 7390 | #: builtin/commit.c:427 |
8ada9598 | 7391 | msgid "cannot do a partial commit during a merge." |
81809b99 | 7392 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 7393 | |
31e5e17b | 7394 | #: builtin/commit.c:429 |
8ada9598 | 7395 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 7396 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 7397 | |
31e5e17b | 7398 | #: builtin/commit.c:437 |
c04f5ac3 | 7399 | msgid "cannot read the index" |
90e6ef53 | 7400 | msgstr "无法读取索引" |
c04f5ac3 | 7401 | |
31e5e17b | 7402 | #: builtin/commit.c:456 |
c04f5ac3 | 7403 | msgid "unable to write temporary index file" |
90e6ef53 | 7404 | msgstr "无法写临时索引文件" |
c04f5ac3 | 7405 | |
31e5e17b | 7406 | #: builtin/commit.c:553 |
220c313c JX |
7407 | #, c-format |
7408 | msgid "commit '%s' lacks author header" | |
7409 | msgstr "提交 '%s' 缺少作者信息" | |
7410 | ||
31e5e17b | 7411 | #: builtin/commit.c:555 |
c04f5ac3 | 7412 | #, c-format |
220c313c JX |
7413 | msgid "commit '%s' has malformed author line" |
7414 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 7415 | |
31e5e17b | 7416 | #: builtin/commit.c:574 |
c04f5ac3 JX |
7417 | msgid "malformed --author parameter" |
7418 | msgstr "非法的 --author 参数" | |
7419 | ||
31e5e17b | 7420 | #: builtin/commit.c:626 |
6acbf033 JX |
7421 | msgid "" |
7422 | "unable to select a comment character that is not used\n" | |
7423 | "in the current commit message" | |
7424 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
7425 | ||
31e5e17b | 7426 | #: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 |
c04f5ac3 JX |
7427 | #, c-format |
7428 | msgid "could not lookup commit %s" | |
7429 | msgstr "不能查询提交 %s" | |
7430 | ||
31e5e17b | 7431 | #: builtin/commit.c:675 builtin/shortlog.c:309 |
c04f5ac3 JX |
7432 | #, c-format |
7433 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 7434 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 7435 | |
31e5e17b | 7436 | #: builtin/commit.c:677 |
c04f5ac3 | 7437 | msgid "could not read log from standard input" |
90e6ef53 | 7438 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 7439 | |
31e5e17b | 7440 | #: builtin/commit.c:681 |
c04f5ac3 JX |
7441 | #, c-format |
7442 | msgid "could not read log file '%s'" | |
90e6ef53 | 7443 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 7444 | |
31e5e17b | 7445 | #: builtin/commit.c:710 builtin/commit.c:718 |
c04f5ac3 | 7446 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 7447 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 7448 | |
31e5e17b | 7449 | #: builtin/commit.c:715 |
5b04ee3b JX |
7450 | msgid "could not read MERGE_MSG" |
7451 | msgstr "不能读取 MERGE_MSG" | |
7452 | ||
31e5e17b | 7453 | #: builtin/commit.c:769 |
c04f5ac3 | 7454 | msgid "could not write commit template" |
90e6ef53 | 7455 | msgstr "不能写提交模版" |
c04f5ac3 | 7456 | |
31e5e17b | 7457 | #: builtin/commit.c:787 |
81809b99 | 7458 | #, c-format |
c04f5ac3 JX |
7459 | msgid "" |
7460 | "\n" | |
8ada9598 | 7461 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
7462 | "If this is not correct, please remove the file\n" |
7463 | "\t%s\n" | |
7464 | "and try again.\n" | |
7465 | msgstr "" | |
7466 | "\n" | |
649900bc | 7467 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
7468 | "\t%s\n" |
7469 | "然后重试。\n" | |
7470 | ||
31e5e17b | 7471 | #: builtin/commit.c:792 |
81809b99 | 7472 | #, c-format |
8ada9598 JX |
7473 | msgid "" |
7474 | "\n" | |
7475 | "It looks like you may be committing a cherry-pick.\n" | |
7476 | "If this is not correct, please remove the file\n" | |
7477 | "\t%s\n" | |
7478 | "and try again.\n" | |
7479 | msgstr "" | |
7480 | "\n" | |
649900bc | 7481 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
7482 | "\t%s\n" |
7483 | "然后重试。\n" | |
c04f5ac3 | 7484 | |
31e5e17b | 7485 | #: builtin/commit.c:805 |
a77c07d9 | 7486 | #, c-format |
c04f5ac3 | 7487 | msgid "" |
8ada9598 | 7488 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7489 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 7490 | msgstr "" |
a77c07d9 | 7491 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 7492 | "说明将会终止提交。\n" |
c04f5ac3 | 7493 | |
31e5e17b | 7494 | #: builtin/commit.c:813 |
a77c07d9 | 7495 | #, c-format |
c04f5ac3 | 7496 | msgid "" |
8ada9598 | 7497 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7498 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
7499 | "An empty message aborts the commit.\n" |
7500 | msgstr "" | |
a77c07d9 JX |
7501 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
7502 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 7503 | |
90e6ef53 | 7504 | # 译者:为保证在输出中对齐,注意调整句中空格! |
31e5e17b | 7505 | #: builtin/commit.c:830 |
6acbf033 JX |
7506 | #, c-format |
7507 | msgid "%sAuthor: %.*s <%.*s>" | |
7508 | msgstr "%s作者: %.*s <%.*s>" | |
7509 | ||
7510 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
31e5e17b | 7511 | #: builtin/commit.c:838 |
c04f5ac3 | 7512 | #, c-format |
6acbf033 JX |
7513 | msgid "%sDate: %s" |
7514 | msgstr "%s日期: %s" | |
c04f5ac3 | 7515 | |
90e6ef53 | 7516 | # 译者:为保证在输出中对齐,注意调整句中空格! |
31e5e17b | 7517 | #: builtin/commit.c:845 |
c04f5ac3 | 7518 | #, c-format |
6acbf033 JX |
7519 | msgid "%sCommitter: %.*s <%.*s>" |
7520 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 7521 | |
31e5e17b | 7522 | #: builtin/commit.c:862 |
c04f5ac3 | 7523 | msgid "Cannot read index" |
90e6ef53 | 7524 | msgstr "无法读取索引" |
c04f5ac3 | 7525 | |
31e5e17b | 7526 | #: builtin/commit.c:928 |
c04f5ac3 JX |
7527 | msgid "Error building trees" |
7528 | msgstr "无法创建树对象" | |
7529 | ||
31e5e17b | 7530 | #: builtin/commit.c:942 builtin/tag.c:256 |
c04f5ac3 JX |
7531 | #, c-format |
7532 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 7533 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 7534 | |
31e5e17b | 7535 | #: builtin/commit.c:986 |
c04f5ac3 | 7536 | #, c-format |
814ff314 | 7537 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 7538 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 7539 | |
31e5e17b | 7540 | #: builtin/commit.c:1000 |
5809aa05 JX |
7541 | #, c-format |
7542 | msgid "Invalid ignored mode '%s'" | |
7543 | msgstr "无效的忽略模式 '%s'" | |
7544 | ||
31e5e17b | 7545 | #: builtin/commit.c:1014 builtin/commit.c:1264 |
c04f5ac3 JX |
7546 | #, c-format |
7547 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 7548 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 7549 | |
31e5e17b | 7550 | #: builtin/commit.c:1052 |
2e8451e8 JX |
7551 | msgid "--long and -z are incompatible" |
7552 | msgstr "--long 和 -z 选项不兼容" | |
7553 | ||
31e5e17b | 7554 | #: builtin/commit.c:1085 |
c04f5ac3 JX |
7555 | msgid "Using both --reset-author and --author does not make sense" |
7556 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
7557 | ||
31e5e17b | 7558 | #: builtin/commit.c:1094 |
c04f5ac3 | 7559 | msgid "You have nothing to amend." |
90e6ef53 | 7560 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 7561 | |
31e5e17b | 7562 | #: builtin/commit.c:1097 |
8ada9598 | 7563 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 7564 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 7565 | |
31e5e17b | 7566 | #: builtin/commit.c:1099 |
8ada9598 | 7567 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 7568 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 7569 | |
31e5e17b | 7570 | #: builtin/commit.c:1102 |
c04f5ac3 | 7571 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 7572 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 7573 | |
31e5e17b | 7574 | #: builtin/commit.c:1112 |
c04f5ac3 JX |
7575 | msgid "Only one of -c/-C/-F/--fixup can be used." |
7576 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
7577 | ||
31e5e17b JX |
7578 | #: builtin/commit.c:1114 |
7579 | msgid "Option -m cannot be combined with -c/-C/-F." | |
7580 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 7581 | |
31e5e17b | 7582 | #: builtin/commit.c:1122 |
c04f5ac3 | 7583 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 7584 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 7585 | |
31e5e17b | 7586 | #: builtin/commit.c:1139 |
c04f5ac3 JX |
7587 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
7588 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
7589 | ||
31e5e17b | 7590 | #: builtin/commit.c:1141 |
c04f5ac3 JX |
7591 | msgid "No paths with --include/--only does not make sense." |
7592 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
7593 | ||
31e5e17b | 7594 | #: builtin/commit.c:1155 builtin/tag.c:542 |
c04f5ac3 JX |
7595 | #, c-format |
7596 | msgid "Invalid cleanup mode %s" | |
7597 | msgstr "无效的清理模式 %s" | |
7598 | ||
31e5e17b | 7599 | #: builtin/commit.c:1160 |
c04f5ac3 | 7600 | msgid "Paths with -a does not make sense." |
649900bc | 7601 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 7602 | |
31e5e17b | 7603 | #: builtin/commit.c:1278 builtin/commit.c:1443 |
ef317cd5 | 7604 | msgid "show status concisely" |
07432cef | 7605 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 7606 | |
31e5e17b | 7607 | #: builtin/commit.c:1280 builtin/commit.c:1445 |
ef317cd5 | 7608 | msgid "show branch information" |
07432cef | 7609 | msgstr "显示分支信息" |
ef317cd5 | 7610 | |
31e5e17b | 7611 | #: builtin/commit.c:1282 |
a4f16749 JX |
7612 | msgid "show stash information" |
7613 | msgstr "显示贮藏区信息" | |
7614 | ||
31e5e17b JX |
7615 | #: builtin/commit.c:1284 builtin/commit.c:1447 |
7616 | msgid "compute full ahead/behind values" | |
7617 | msgstr "计算完整的领先/落后值" | |
7618 | ||
7619 | #: builtin/commit.c:1286 | |
a0b6b246 JX |
7620 | msgid "version" |
7621 | msgstr "版本" | |
7622 | ||
31e5e17b JX |
7623 | #: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 |
7624 | #: builtin/worktree.c:541 | |
ef317cd5 | 7625 | msgid "machine-readable output" |
07432cef WS |
7626 | msgstr "机器可读的输出" |
7627 | ||
31e5e17b | 7628 | #: builtin/commit.c:1289 builtin/commit.c:1451 |
07432cef WS |
7629 | msgid "show status in long format (default)" |
7630 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 7631 | |
31e5e17b | 7632 | #: builtin/commit.c:1292 builtin/commit.c:1454 |
ef317cd5 | 7633 | msgid "terminate entries with NUL" |
4375c10e | 7634 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 7635 | |
31e5e17b JX |
7636 | #: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 |
7637 | #: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 | |
ef317cd5 | 7638 | msgid "mode" |
07432cef | 7639 | msgstr "模式" |
ef317cd5 | 7640 | |
31e5e17b | 7641 | #: builtin/commit.c:1295 builtin/commit.c:1457 |
ef317cd5 | 7642 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 7643 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 7644 | |
31e5e17b | 7645 | #: builtin/commit.c:1299 |
5809aa05 JX |
7646 | msgid "" |
7647 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
7648 | "traditional)" | |
31e5e17b JX |
7649 | msgstr "" |
7650 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 7651 | |
31e5e17b | 7652 | #: builtin/commit.c:1301 parse-options.h:167 |
ef317cd5 JX |
7653 | msgid "when" |
7654 | msgstr "何时" | |
7655 | ||
31e5e17b | 7656 | #: builtin/commit.c:1302 |
ef317cd5 JX |
7657 | msgid "" |
7658 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
7659 | "(Default: all)" | |
7660 | msgstr "" | |
07432cef | 7661 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 7662 | |
31e5e17b | 7663 | #: builtin/commit.c:1304 |
ef317cd5 | 7664 | msgid "list untracked files in columns" |
07432cef | 7665 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 7666 | |
31e5e17b | 7667 | #: builtin/commit.c:1323 |
5809aa05 JX |
7668 | msgid "Unsupported combination of ignored and untracked-files arguments" |
7669 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
7670 | ||
31e5e17b | 7671 | #: builtin/commit.c:1413 |
ef317cd5 | 7672 | msgid "suppress summary after successful commit" |
07432cef | 7673 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 7674 | |
31e5e17b | 7675 | #: builtin/commit.c:1414 |
ef317cd5 | 7676 | msgid "show diff in commit message template" |
07432cef | 7677 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 7678 | |
31e5e17b | 7679 | #: builtin/commit.c:1416 |
ef317cd5 | 7680 | msgid "Commit message options" |
07432cef | 7681 | msgstr "提交说明选项" |
c04f5ac3 | 7682 | |
31e5e17b | 7683 | #: builtin/commit.c:1417 builtin/tag.c:393 |
ef317cd5 | 7684 | msgid "read message from file" |
07432cef | 7685 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 7686 | |
31e5e17b | 7687 | #: builtin/commit.c:1418 |
ef317cd5 | 7688 | msgid "author" |
07432cef | 7689 | msgstr "作者" |
c04f5ac3 | 7690 | |
31e5e17b | 7691 | #: builtin/commit.c:1418 |
ef317cd5 | 7692 | msgid "override author for commit" |
07432cef | 7693 | msgstr "提交时覆盖作者" |
73a60cd2 | 7694 | |
31e5e17b | 7695 | #: builtin/commit.c:1419 builtin/gc.c:359 |
ef317cd5 | 7696 | msgid "date" |
07432cef | 7697 | msgstr "日期" |
c04f5ac3 | 7698 | |
31e5e17b | 7699 | #: builtin/commit.c:1419 |
ef317cd5 | 7700 | msgid "override date for commit" |
07432cef | 7701 | msgstr "提交时覆盖日期" |
c04f5ac3 | 7702 | |
31e5e17b JX |
7703 | #: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 |
7704 | #: builtin/notes.c:565 builtin/tag.c:391 | |
ef317cd5 | 7705 | msgid "message" |
07432cef | 7706 | msgstr "说明" |
c04f5ac3 | 7707 | |
31e5e17b | 7708 | #: builtin/commit.c:1420 |
ef317cd5 | 7709 | msgid "commit message" |
07432cef | 7710 | msgstr "提交说明" |
ef317cd5 | 7711 | |
31e5e17b JX |
7712 | #: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 |
7713 | #: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 | |
94550ed3 JX |
7714 | msgid "commit" |
7715 | msgstr "提交" | |
7716 | ||
31e5e17b | 7717 | #: builtin/commit.c:1421 |
ef317cd5 | 7718 | msgid "reuse and edit message from specified commit" |
07432cef | 7719 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 7720 | |
31e5e17b | 7721 | #: builtin/commit.c:1422 |
ef317cd5 | 7722 | msgid "reuse message from specified commit" |
07432cef | 7723 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 7724 | |
31e5e17b | 7725 | #: builtin/commit.c:1423 |
ef317cd5 | 7726 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 7727 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 7728 | |
31e5e17b | 7729 | #: builtin/commit.c:1424 |
ef317cd5 | 7730 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 7731 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 7732 | |
31e5e17b | 7733 | #: builtin/commit.c:1425 |
ef317cd5 | 7734 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 7735 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 7736 | |
31e5e17b | 7737 | #: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 |
5809aa05 | 7738 | #: builtin/pull.c:149 builtin/revert.c:105 |
ef317cd5 | 7739 | msgid "add Signed-off-by:" |
07432cef | 7740 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 7741 | |
31e5e17b | 7742 | #: builtin/commit.c:1427 |
ef317cd5 | 7743 | msgid "use specified template file" |
07432cef | 7744 | msgstr "使用指定的模板文件" |
ef317cd5 | 7745 | |
31e5e17b | 7746 | #: builtin/commit.c:1428 |
ef317cd5 | 7747 | msgid "force edit of commit" |
07432cef | 7748 | msgstr "强制编辑提交" |
ef317cd5 | 7749 | |
07432cef | 7750 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
31e5e17b | 7751 | #: builtin/commit.c:1429 |
ef317cd5 | 7752 | msgid "default" |
07432cef | 7753 | msgstr "default" |
ef317cd5 | 7754 | |
31e5e17b | 7755 | #: builtin/commit.c:1429 builtin/tag.c:397 |
ef317cd5 | 7756 | msgid "how to strip spaces and #comments from message" |
07432cef | 7757 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 7758 | |
31e5e17b | 7759 | #: builtin/commit.c:1430 |
ef317cd5 | 7760 | msgid "include status in commit message template" |
07432cef | 7761 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 7762 | |
31e5e17b | 7763 | #: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 |
a4f16749 | 7764 | #: builtin/revert.c:113 |
ef317cd5 | 7765 | msgid "GPG sign commit" |
07432cef | 7766 | msgstr "GPG 提交签名" |
ef317cd5 | 7767 | |
31e5e17b | 7768 | #: builtin/commit.c:1435 |
ef317cd5 | 7769 | msgid "Commit contents options" |
07432cef | 7770 | msgstr "提交内容选项" |
ef317cd5 | 7771 | |
31e5e17b | 7772 | #: builtin/commit.c:1436 |
ef317cd5 | 7773 | msgid "commit all changed files" |
07432cef | 7774 | msgstr "提交所有改动的文件" |
ef317cd5 | 7775 | |
31e5e17b | 7776 | #: builtin/commit.c:1437 |
ef317cd5 | 7777 | msgid "add specified files to index for commit" |
07432cef | 7778 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 7779 | |
31e5e17b | 7780 | #: builtin/commit.c:1438 |
ef317cd5 | 7781 | msgid "interactively add files" |
07432cef | 7782 | msgstr "交互式添加文件" |
ef317cd5 | 7783 | |
31e5e17b | 7784 | #: builtin/commit.c:1439 |
ef317cd5 | 7785 | msgid "interactively add changes" |
07432cef | 7786 | msgstr "交互式添加变更" |
ef317cd5 | 7787 | |
31e5e17b | 7788 | #: builtin/commit.c:1440 |
ef317cd5 | 7789 | msgid "commit only specified files" |
07432cef | 7790 | msgstr "只提交指定的文件" |
ef317cd5 | 7791 | |
31e5e17b | 7792 | #: builtin/commit.c:1441 |
5c57d762 JX |
7793 | msgid "bypass pre-commit and commit-msg hooks" |
7794 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
7795 | ||
31e5e17b | 7796 | #: builtin/commit.c:1442 |
ef317cd5 | 7797 | msgid "show what would be committed" |
07432cef | 7798 | msgstr "显示将要提交的内容" |
ef317cd5 | 7799 | |
31e5e17b | 7800 | #: builtin/commit.c:1455 |
ef317cd5 | 7801 | msgid "amend previous commit" |
07432cef | 7802 | msgstr "修改先前的提交" |
ef317cd5 | 7803 | |
31e5e17b | 7804 | #: builtin/commit.c:1456 |
ef317cd5 | 7805 | msgid "bypass post-rewrite hook" |
07432cef | 7806 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 7807 | |
31e5e17b | 7808 | #: builtin/commit.c:1461 |
ef317cd5 | 7809 | msgid "ok to record an empty change" |
07432cef | 7810 | msgstr "允许一个空提交" |
ef317cd5 | 7811 | |
31e5e17b | 7812 | #: builtin/commit.c:1463 |
ef317cd5 | 7813 | msgid "ok to record a change with an empty message" |
07432cef | 7814 | msgstr "允许空的提交说明" |
ef317cd5 | 7815 | |
31e5e17b | 7816 | #: builtin/commit.c:1536 |
c04f5ac3 JX |
7817 | #, c-format |
7818 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 7819 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 7820 | |
31e5e17b | 7821 | #: builtin/commit.c:1543 |
c04f5ac3 | 7822 | msgid "could not read MERGE_MODE" |
90e6ef53 | 7823 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 7824 | |
31e5e17b | 7825 | #: builtin/commit.c:1562 |
c04f5ac3 JX |
7826 | #, c-format |
7827 | msgid "could not read commit message: %s" | |
90e6ef53 | 7828 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 7829 | |
31e5e17b | 7830 | #: builtin/commit.c:1573 |
c04f5ac3 JX |
7831 | #, c-format |
7832 | msgid "Aborting commit due to empty commit message.\n" | |
7833 | msgstr "终止提交因为提交说明为空。\n" | |
7834 | ||
31e5e17b | 7835 | #: builtin/commit.c:1578 |
6937cb4e JX |
7836 | #, c-format |
7837 | msgid "Aborting commit; you did not edit the message.\n" | |
7838 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
7839 | ||
31e5e17b | 7840 | #: builtin/commit.c:1613 |
c04f5ac3 JX |
7841 | msgid "" |
7842 | "Repository has been updated, but unable to write\n" | |
220c313c | 7843 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
7844 | "not exceeded, and then \"git reset HEAD\" to recover." |
7845 | msgstr "" | |
160fb2b2 | 7846 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 7847 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 7848 | |
a4f16749 | 7849 | #: builtin/config.c:10 |
814ff314 JX |
7850 | msgid "git config [<options>]" |
7851 | msgstr "git config [<选项>]" | |
ef317cd5 | 7852 | |
5809aa05 | 7853 | #: builtin/config.c:58 |
ef317cd5 | 7854 | msgid "Config file location" |
07432cef | 7855 | msgstr "配置文件位置" |
ef317cd5 | 7856 | |
5809aa05 | 7857 | #: builtin/config.c:59 |
ef317cd5 | 7858 | msgid "use global config file" |
07432cef | 7859 | msgstr "使用全局配置文件" |
ef317cd5 | 7860 | |
5809aa05 | 7861 | #: builtin/config.c:60 |
ef317cd5 | 7862 | msgid "use system config file" |
07432cef | 7863 | msgstr "使用系统级配置文件" |
ef317cd5 | 7864 | |
5809aa05 | 7865 | #: builtin/config.c:61 |
ef317cd5 | 7866 | msgid "use repository config file" |
160fb2b2 | 7867 | msgstr "使用仓库级配置文件" |
ef317cd5 | 7868 | |
5809aa05 | 7869 | #: builtin/config.c:62 |
ef317cd5 | 7870 | msgid "use given config file" |
07432cef | 7871 | msgstr "使用指定的配置文件" |
ef317cd5 | 7872 | |
5809aa05 | 7873 | #: builtin/config.c:63 |
2e8451e8 | 7874 | msgid "blob-id" |
4375c10e | 7875 | msgstr "数据对象 ID" |
2e8451e8 | 7876 | |
5809aa05 | 7877 | #: builtin/config.c:63 |
2e8451e8 JX |
7878 | msgid "read config from given blob object" |
7879 | msgstr "从给定的数据对象读取配置" | |
7880 | ||
5809aa05 | 7881 | #: builtin/config.c:64 |
ef317cd5 | 7882 | msgid "Action" |
07432cef | 7883 | msgstr "操作" |
ef317cd5 | 7884 | |
5809aa05 | 7885 | #: builtin/config.c:65 |
ef317cd5 | 7886 | msgid "get value: name [value-regex]" |
07432cef | 7887 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 7888 | |
5809aa05 | 7889 | #: builtin/config.c:66 |
ef317cd5 | 7890 | msgid "get all values: key [value-regex]" |
07432cef | 7891 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 7892 | |
5809aa05 | 7893 | #: builtin/config.c:67 |
ef317cd5 | 7894 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 7895 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 7896 | |
5809aa05 | 7897 | #: builtin/config.c:68 |
90314792 JX |
7898 | msgid "get value specific for the URL: section[.var] URL" |
7899 | msgstr "获得 URL 取值:section[.var] URL" | |
7900 | ||
5809aa05 | 7901 | #: builtin/config.c:69 |
ef317cd5 | 7902 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 7903 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 7904 | |
5809aa05 | 7905 | #: builtin/config.c:70 |
ef317cd5 | 7906 | msgid "add a new variable: name value" |
07432cef | 7907 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 7908 | |
5809aa05 | 7909 | #: builtin/config.c:71 |
ef317cd5 | 7910 | msgid "remove a variable: name [value-regex]" |
07432cef | 7911 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 7912 | |
5809aa05 | 7913 | #: builtin/config.c:72 |
ef317cd5 | 7914 | msgid "remove all matches: name [value-regex]" |
07432cef | 7915 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 7916 | |
5809aa05 | 7917 | #: builtin/config.c:73 |
ef317cd5 | 7918 | msgid "rename section: old-name new-name" |
07432cef | 7919 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 7920 | |
5809aa05 | 7921 | #: builtin/config.c:74 |
ef317cd5 | 7922 | msgid "remove a section: name" |
07432cef | 7923 | msgstr "删除一个小节:name" |
ef317cd5 | 7924 | |
5809aa05 | 7925 | #: builtin/config.c:75 |
ef317cd5 | 7926 | msgid "list all" |
07432cef | 7927 | msgstr "列出所有" |
ef317cd5 | 7928 | |
5809aa05 | 7929 | #: builtin/config.c:76 |
ef317cd5 | 7930 | msgid "open an editor" |
07432cef | 7931 | msgstr "打开一个编辑器" |
ef317cd5 | 7932 | |
5809aa05 | 7933 | #: builtin/config.c:77 |
04cb2f28 JX |
7934 | msgid "find the color configured: slot [default]" |
7935 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 7936 | |
5809aa05 | 7937 | #: builtin/config.c:78 |
04cb2f28 JX |
7938 | msgid "find the color setting: slot [stdout-is-tty]" |
7939 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 7940 | |
5809aa05 | 7941 | #: builtin/config.c:79 |
ef317cd5 | 7942 | msgid "Type" |
07432cef | 7943 | msgstr "类型" |
ef317cd5 | 7944 | |
5809aa05 | 7945 | #: builtin/config.c:80 |
ef317cd5 | 7946 | msgid "value is \"true\" or \"false\"" |
07432cef | 7947 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 7948 | |
5809aa05 | 7949 | #: builtin/config.c:81 |
ef317cd5 | 7950 | msgid "value is decimal number" |
07432cef | 7951 | msgstr "值是十进制数" |
ef317cd5 | 7952 | |
5809aa05 | 7953 | #: builtin/config.c:82 |
ef317cd5 | 7954 | msgid "value is --bool or --int" |
07432cef | 7955 | msgstr "值是 --bool or --int" |
ef317cd5 | 7956 | |
5809aa05 | 7957 | #: builtin/config.c:83 |
ef317cd5 | 7958 | msgid "value is a path (file or directory name)" |
07432cef | 7959 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 7960 | |
5809aa05 JX |
7961 | #: builtin/config.c:84 |
7962 | msgid "value is an expiry date" | |
7963 | msgstr "值是一个到期日期" | |
7964 | ||
7965 | #: builtin/config.c:85 | |
ef317cd5 | 7966 | msgid "Other" |
07432cef | 7967 | msgstr "其它" |
ef317cd5 | 7968 | |
5809aa05 | 7969 | #: builtin/config.c:86 |
ef317cd5 | 7970 | msgid "terminate values with NUL byte" |
4375c10e | 7971 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 7972 | |
5809aa05 | 7973 | #: builtin/config.c:87 |
1b7f4a34 JX |
7974 | msgid "show variable names only" |
7975 | msgstr "只显示变量名" | |
7976 | ||
5809aa05 | 7977 | #: builtin/config.c:88 |
ef317cd5 | 7978 | msgid "respect include directives on lookup" |
07432cef | 7979 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 7980 | |
5809aa05 | 7981 | #: builtin/config.c:89 |
276ceeaa JX |
7982 | msgid "show origin of config (file, standard input, blob, command line)" |
7983 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
7984 | ||
5809aa05 | 7985 | #: builtin/config.c:335 |
220c313c | 7986 | msgid "unable to parse default color value" |
160fb2b2 | 7987 | msgstr "不能解析默认颜色值" |
220c313c | 7988 | |
5809aa05 | 7989 | #: builtin/config.c:479 |
220c313c JX |
7990 | #, c-format |
7991 | msgid "" | |
7992 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7993 | "[user]\n" |
220c313c | 7994 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 7995 | "#\tname = %s\n" |
220c313c JX |
7996 | "#\temail = %s\n" |
7997 | msgstr "" | |
7998 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 7999 | "[user]\n" |
220c313c | 8000 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 8001 | "#\tname = %s\n" |
220c313c JX |
8002 | "#\temail = %s\n" |
8003 | ||
5809aa05 | 8004 | #: builtin/config.c:507 |
a4f16749 JX |
8005 | msgid "--local can only be used inside a git repository" |
8006 | msgstr "--local 只能在一个仓库内使用" | |
8007 | ||
5809aa05 | 8008 | #: builtin/config.c:632 |
220c313c JX |
8009 | #, c-format |
8010 | msgid "cannot create configuration file %s" | |
8011 | msgstr "不能创建配置文件 %s" | |
8012 | ||
5809aa05 | 8013 | #: builtin/config.c:645 |
a0b6b246 JX |
8014 | #, c-format |
8015 | msgid "" | |
8016 | "cannot overwrite multiple values with a single value\n" | |
8017 | " Use a regexp, --add or --replace-all to change %s." | |
8018 | msgstr "" | |
8019 | "无法用一个值覆盖多个值\n" | |
8020 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
8021 | ||
6937cb4e | 8022 | #: builtin/count-objects.c:88 |
4dcdc3d8 JX |
8023 | msgid "git count-objects [-v] [-H | --human-readable]" |
8024 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
8025 | ||
6937cb4e | 8026 | #: builtin/count-objects.c:98 |
4dcdc3d8 JX |
8027 | msgid "print sizes in human readable format" |
8028 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 8029 | |
5809aa05 | 8030 | #: builtin/describe.c:22 |
814ff314 JX |
8031 | msgid "git describe [<options>] [<commit-ish>...]" |
8032 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 8033 | |
5809aa05 | 8034 | #: builtin/describe.c:23 |
814ff314 JX |
8035 | msgid "git describe [<options>] --dirty" |
8036 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 8037 | |
5809aa05 | 8038 | #: builtin/describe.c:57 |
87cb7997 JX |
8039 | msgid "head" |
8040 | msgstr "头" | |
8041 | ||
5809aa05 | 8042 | #: builtin/describe.c:57 |
87cb7997 JX |
8043 | msgid "lightweight" |
8044 | msgstr "轻量级的" | |
8045 | ||
5809aa05 | 8046 | #: builtin/describe.c:57 |
87cb7997 JX |
8047 | msgid "annotated" |
8048 | msgstr "附注的" | |
8049 | ||
5809aa05 | 8050 | #: builtin/describe.c:267 |
c04f5ac3 JX |
8051 | #, c-format |
8052 | msgid "annotated tag %s not available" | |
55a16ee4 | 8053 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 8054 | |
5809aa05 | 8055 | #: builtin/describe.c:271 |
c04f5ac3 JX |
8056 | #, c-format |
8057 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 8058 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 8059 | |
5809aa05 | 8060 | #: builtin/describe.c:273 |
c04f5ac3 JX |
8061 | #, c-format |
8062 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 8063 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 8064 | |
31e5e17b | 8065 | #: builtin/describe.c:317 |
c04f5ac3 JX |
8066 | #, c-format |
8067 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 8068 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 8069 | |
31e5e17b | 8070 | #: builtin/describe.c:319 |
c04f5ac3 | 8071 | #, c-format |
5809aa05 JX |
8072 | msgid "No exact match on refs or tags, searching to describe\n" |
8073 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 8074 | |
31e5e17b | 8075 | #: builtin/describe.c:366 |
c04f5ac3 JX |
8076 | #, c-format |
8077 | msgid "finished search at %s\n" | |
8078 | msgstr "完成搜索 %s\n" | |
8079 | ||
31e5e17b | 8080 | #: builtin/describe.c:392 |
c04f5ac3 JX |
8081 | #, c-format |
8082 | msgid "" | |
8083 | "No annotated tags can describe '%s'.\n" | |
8084 | "However, there were unannotated tags: try --tags." | |
8085 | msgstr "" | |
55a16ee4 RC |
8086 | "没有附注标签能描述 '%s'。\n" |
8087 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 8088 | |
31e5e17b | 8089 | #: builtin/describe.c:396 |
c04f5ac3 JX |
8090 | #, c-format |
8091 | msgid "" | |
8092 | "No tags can describe '%s'.\n" | |
8093 | "Try --always, or create some tags." | |
8094 | msgstr "" | |
55a16ee4 RC |
8095 | "没有标签能描述 '%s'。\n" |
8096 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 8097 | |
31e5e17b | 8098 | #: builtin/describe.c:426 |
c04f5ac3 JX |
8099 | #, c-format |
8100 | msgid "traversed %lu commits\n" | |
8101 | msgstr "已遍历 %lu 个提交\n" | |
8102 | ||
31e5e17b | 8103 | #: builtin/describe.c:429 |
c04f5ac3 JX |
8104 | #, c-format |
8105 | msgid "" | |
8106 | "more than %i tags found; listed %i most recent\n" | |
8107 | "gave up search at %s\n" | |
8108 | msgstr "" | |
55a16ee4 | 8109 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 8110 | "在 %s 放弃搜索\n" |
c04f5ac3 | 8111 | |
31e5e17b | 8112 | #: builtin/describe.c:497 |
5809aa05 JX |
8113 | #, c-format |
8114 | msgid "describe %s\n" | |
8115 | msgstr "描述 %s\n" | |
8116 | ||
31e5e17b | 8117 | #: builtin/describe.c:500 builtin/log.c:502 |
5809aa05 JX |
8118 | #, c-format |
8119 | msgid "Not a valid object name %s" | |
8120 | msgstr "不是一个有效的对象名 %s" | |
8121 | ||
31e5e17b | 8122 | #: builtin/describe.c:508 |
5809aa05 JX |
8123 | #, c-format |
8124 | msgid "%s is neither a commit nor blob" | |
8125 | msgstr "%s 既不是提交也不是数据对象" | |
8126 | ||
31e5e17b | 8127 | #: builtin/describe.c:522 |
ef317cd5 | 8128 | msgid "find the tag that comes after the commit" |
55a16ee4 | 8129 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 8130 | |
31e5e17b | 8131 | #: builtin/describe.c:523 |
ef317cd5 | 8132 | msgid "debug search strategy on stderr" |
07432cef | 8133 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 8134 | |
31e5e17b | 8135 | #: builtin/describe.c:524 |
1003b3a5 JX |
8136 | msgid "use any ref" |
8137 | msgstr "使用任意引用" | |
8138 | ||
31e5e17b | 8139 | #: builtin/describe.c:525 |
1003b3a5 | 8140 | msgid "use any tag, even unannotated" |
55a16ee4 | 8141 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 8142 | |
31e5e17b | 8143 | #: builtin/describe.c:526 |
ef317cd5 | 8144 | msgid "always use long format" |
07432cef | 8145 | msgstr "始终使用长提交号格式" |
ef317cd5 | 8146 | |
31e5e17b | 8147 | #: builtin/describe.c:527 |
2e8451e8 JX |
8148 | msgid "only follow first parent" |
8149 | msgstr "只跟随第一个父提交" | |
8150 | ||
31e5e17b | 8151 | #: builtin/describe.c:530 |
ef317cd5 | 8152 | msgid "only output exact matches" |
07432cef | 8153 | msgstr "只输出精确匹配" |
ef317cd5 | 8154 | |
31e5e17b | 8155 | #: builtin/describe.c:532 |
ef317cd5 | 8156 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 8157 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 8158 | |
31e5e17b | 8159 | #: builtin/describe.c:534 |
ef317cd5 | 8160 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 8161 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 8162 | |
31e5e17b | 8163 | #: builtin/describe.c:536 |
87cb7997 JX |
8164 | msgid "do not consider tags matching <pattern>" |
8165 | msgstr "不考虑匹配 <模式> 的标签" | |
8166 | ||
31e5e17b | 8167 | #: builtin/describe.c:538 builtin/name-rev.c:406 |
ef317cd5 | 8168 | msgid "show abbreviated commit object as fallback" |
07432cef | 8169 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 8170 | |
31e5e17b | 8171 | #: builtin/describe.c:539 builtin/describe.c:542 |
ef317cd5 | 8172 | msgid "mark" |
07432cef | 8173 | msgstr "标记" |
ef317cd5 | 8174 | |
31e5e17b | 8175 | #: builtin/describe.c:540 |
ef317cd5 | 8176 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 8177 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 8178 | |
31e5e17b | 8179 | #: builtin/describe.c:543 |
87cb7997 JX |
8180 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
8181 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
8182 | ||
31e5e17b | 8183 | #: builtin/describe.c:561 |
c04f5ac3 JX |
8184 | msgid "--long is incompatible with --abbrev=0" |
8185 | msgstr "--long 与 --abbrev=0 不兼容" | |
8186 | ||
31e5e17b | 8187 | #: builtin/describe.c:590 |
c04f5ac3 | 8188 | msgid "No names found, cannot describe anything." |
90e6ef53 | 8189 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 8190 | |
31e5e17b | 8191 | #: builtin/describe.c:640 |
a8a5406a | 8192 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
8193 | msgstr "--dirty 与提交号不兼容" |
8194 | ||
31e5e17b | 8195 | #: builtin/describe.c:642 |
87cb7997 JX |
8196 | msgid "--broken is incompatible with commit-ishes" |
8197 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 8198 | |
1a79b2f1 | 8199 | #: builtin/diff.c:83 |
c04f5ac3 JX |
8200 | #, c-format |
8201 | msgid "'%s': not a regular file or symlink" | |
8202 | msgstr "'%s':不是一个正规文件或符号链接" | |
8203 | ||
5809aa05 | 8204 | #: builtin/diff.c:234 |
c04f5ac3 JX |
8205 | #, c-format |
8206 | msgid "invalid option: %s" | |
8207 | msgstr "无效选项:%s" | |
8208 | ||
5809aa05 | 8209 | #: builtin/diff.c:356 |
c04f5ac3 | 8210 | msgid "Not a git repository" |
160fb2b2 | 8211 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 8212 | |
5809aa05 | 8213 | #: builtin/diff.c:399 |
c04f5ac3 JX |
8214 | #, c-format |
8215 | msgid "invalid object '%s' given." | |
8216 | msgstr "提供了无效对象 '%s'。" | |
8217 | ||
5809aa05 | 8218 | #: builtin/diff.c:408 |
c04f5ac3 JX |
8219 | #, c-format |
8220 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 8221 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 8222 | |
5809aa05 | 8223 | #: builtin/diff.c:413 |
c04f5ac3 JX |
8224 | #, c-format |
8225 | msgid "unhandled object '%s' given." | |
6c94aba5 | 8226 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 8227 | |
a4f16749 | 8228 | #: builtin/difftool.c:29 |
1a79b2f1 JX |
8229 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
8230 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
8231 | ||
6937cb4e | 8232 | #: builtin/difftool.c:259 |
1a79b2f1 JX |
8233 | #, c-format |
8234 | msgid "failed: %d" | |
8235 | msgstr "失败:%d" | |
8236 | ||
6937cb4e | 8237 | #: builtin/difftool.c:301 |
87cb7997 JX |
8238 | #, c-format |
8239 | msgid "could not read symlink %s" | |
8240 | msgstr "无法读取符号链接 %s" | |
8241 | ||
6937cb4e | 8242 | #: builtin/difftool.c:303 |
87cb7997 JX |
8243 | #, c-format |
8244 | msgid "could not read symlink file %s" | |
8245 | msgstr "无法读取符号链接文件 %s" | |
8246 | ||
6937cb4e | 8247 | #: builtin/difftool.c:311 |
87cb7997 JX |
8248 | #, c-format |
8249 | msgid "could not read object %s for symlink %s" | |
8250 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
8251 | ||
6937cb4e | 8252 | #: builtin/difftool.c:412 |
1a79b2f1 JX |
8253 | msgid "" |
8254 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
8255 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
8256 | msgstr "" |
8257 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
8258 | "cc')。" | |
1a79b2f1 | 8259 | |
5809aa05 | 8260 | #: builtin/difftool.c:632 |
1a79b2f1 JX |
8261 | #, c-format |
8262 | msgid "both files modified: '%s' and '%s'." | |
8263 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
8264 | ||
5809aa05 | 8265 | #: builtin/difftool.c:634 |
1a79b2f1 JX |
8266 | msgid "working tree file has been left." |
8267 | msgstr "工作区文件被留了下来。" | |
8268 | ||
5809aa05 | 8269 | #: builtin/difftool.c:645 |
1a79b2f1 JX |
8270 | #, c-format |
8271 | msgid "temporary files exist in '%s'." | |
8272 | msgstr "临时文件存在于 '%s'。" | |
8273 | ||
5809aa05 | 8274 | #: builtin/difftool.c:646 |
1a79b2f1 JX |
8275 | msgid "you may want to cleanup or recover these." |
8276 | msgstr "您可能想要清理或者恢复它们。" | |
8277 | ||
5809aa05 | 8278 | #: builtin/difftool.c:695 |
1a79b2f1 JX |
8279 | msgid "use `diff.guitool` instead of `diff.tool`" |
8280 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
8281 | ||
5809aa05 | 8282 | #: builtin/difftool.c:697 |
1a79b2f1 JX |
8283 | msgid "perform a full-directory diff" |
8284 | msgstr "执行一个全目录差异比较" | |
8285 | ||
5809aa05 | 8286 | #: builtin/difftool.c:699 |
1a79b2f1 JX |
8287 | msgid "do not prompt before launching a diff tool" |
8288 | msgstr "启动差异比较工具之前不提示" | |
8289 | ||
5809aa05 | 8290 | #: builtin/difftool.c:705 |
1a79b2f1 JX |
8291 | msgid "use symlinks in dir-diff mode" |
8292 | msgstr "在 dir-diff 模式中使用符号链接" | |
8293 | ||
5809aa05 | 8294 | #: builtin/difftool.c:706 |
1a79b2f1 JX |
8295 | msgid "<tool>" |
8296 | msgstr "<工具>" | |
8297 | ||
5809aa05 | 8298 | #: builtin/difftool.c:707 |
1a79b2f1 JX |
8299 | msgid "use the specified diff tool" |
8300 | msgstr "使用指定的差异比较工具" | |
8301 | ||
5809aa05 | 8302 | #: builtin/difftool.c:709 |
1a79b2f1 JX |
8303 | msgid "print a list of diff tools that may be used with `--tool`" |
8304 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
8305 | ||
5809aa05 | 8306 | #: builtin/difftool.c:712 |
1a79b2f1 JX |
8307 | msgid "" |
8308 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
8309 | "code" | |
8310 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
8311 | ||
5809aa05 | 8312 | #: builtin/difftool.c:714 |
1a79b2f1 JX |
8313 | msgid "<command>" |
8314 | msgstr "<命令>" | |
8315 | ||
5809aa05 | 8316 | #: builtin/difftool.c:715 |
1a79b2f1 JX |
8317 | msgid "specify a custom command for viewing diffs" |
8318 | msgstr "指定一个用于查看差异的自定义命令" | |
8319 | ||
5809aa05 | 8320 | #: builtin/difftool.c:739 |
1a79b2f1 JX |
8321 | msgid "no <tool> given for --tool=<tool>" |
8322 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
8323 | ||
5809aa05 | 8324 | #: builtin/difftool.c:746 |
1a79b2f1 JX |
8325 | msgid "no <cmd> given for --extcmd=<cmd>" |
8326 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
8327 | ||
a4f16749 | 8328 | #: builtin/fast-export.c:26 |
ef317cd5 | 8329 | msgid "git fast-export [rev-list-opts]" |
07432cef | 8330 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 8331 | |
6937cb4e | 8332 | #: builtin/fast-export.c:998 |
ef317cd5 | 8333 | msgid "show progress after <n> objects" |
07432cef | 8334 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 8335 | |
6937cb4e | 8336 | #: builtin/fast-export.c:1000 |
ef317cd5 | 8337 | msgid "select handling of signed tags" |
55a16ee4 | 8338 | msgstr "选择如何处理签名标签" |
ef317cd5 | 8339 | |
6937cb4e | 8340 | #: builtin/fast-export.c:1003 |
ef317cd5 | 8341 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 8342 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 8343 | |
6937cb4e | 8344 | #: builtin/fast-export.c:1006 |
ef317cd5 | 8345 | msgid "Dump marks to this file" |
07432cef | 8346 | msgstr "把标记存储到这个文件" |
ef317cd5 | 8347 | |
6937cb4e | 8348 | #: builtin/fast-export.c:1008 |
ef317cd5 | 8349 | msgid "Import marks from this file" |
07432cef | 8350 | msgstr "从这个文件导入标记" |
ef317cd5 | 8351 | |
6937cb4e | 8352 | #: builtin/fast-export.c:1010 |
ef317cd5 | 8353 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 8354 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 8355 | |
6937cb4e | 8356 | #: builtin/fast-export.c:1012 |
ef317cd5 | 8357 | msgid "Output full tree for each commit" |
07432cef | 8358 | msgstr "每次提交都输出整个树" |
ef317cd5 | 8359 | |
6937cb4e | 8360 | #: builtin/fast-export.c:1014 |
ef317cd5 | 8361 | msgid "Use the done feature to terminate the stream" |
07432cef | 8362 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 8363 | |
6937cb4e | 8364 | #: builtin/fast-export.c:1015 |
ef317cd5 | 8365 | msgid "Skip output of blob data" |
07432cef | 8366 | msgstr "跳过数据对象的输出" |
ef317cd5 | 8367 | |
6937cb4e | 8368 | #: builtin/fast-export.c:1016 |
6acbf033 | 8369 | msgid "refspec" |
160fb2b2 | 8370 | msgstr "引用规格" |
6acbf033 | 8371 | |
6937cb4e | 8372 | #: builtin/fast-export.c:1017 |
6acbf033 | 8373 | msgid "Apply refspec to exported refs" |
160fb2b2 | 8374 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 8375 | |
6937cb4e | 8376 | #: builtin/fast-export.c:1018 |
220c313c JX |
8377 | msgid "anonymize output" |
8378 | msgstr "匿名输出" | |
8379 | ||
31e5e17b | 8380 | #: builtin/fetch.c:25 |
ef317cd5 | 8381 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 8382 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 8383 | |
31e5e17b | 8384 | #: builtin/fetch.c:26 |
ef317cd5 | 8385 | msgid "git fetch [<options>] <group>" |
07432cef | 8386 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 8387 | |
31e5e17b | 8388 | #: builtin/fetch.c:27 |
ef317cd5 | 8389 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 8390 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 8391 | |
31e5e17b | 8392 | #: builtin/fetch.c:28 |
ef317cd5 | 8393 | msgid "git fetch --all [<options>]" |
07432cef | 8394 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 8395 | |
31e5e17b | 8396 | #: builtin/fetch.c:124 builtin/pull.c:188 |
ef317cd5 | 8397 | msgid "fetch from all remotes" |
07432cef | 8398 | msgstr "从所有的远程抓取" |
ef317cd5 | 8399 | |
31e5e17b | 8400 | #: builtin/fetch.c:126 builtin/pull.c:191 |
ef317cd5 | 8401 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 8402 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 8403 | |
31e5e17b | 8404 | #: builtin/fetch.c:128 builtin/pull.c:194 |
ef317cd5 | 8405 | msgid "path to upload pack on remote end" |
07432cef | 8406 | msgstr "上传包到远程的路径" |
ef317cd5 | 8407 | |
31e5e17b | 8408 | #: builtin/fetch.c:129 builtin/pull.c:196 |
ef317cd5 | 8409 | msgid "force overwrite of local branch" |
07432cef | 8410 | msgstr "强制覆盖本地分支" |
ef317cd5 | 8411 | |
31e5e17b | 8412 | #: builtin/fetch.c:131 |
ef317cd5 | 8413 | msgid "fetch from multiple remotes" |
07432cef | 8414 | msgstr "从多个远程抓取" |
ef317cd5 | 8415 | |
31e5e17b | 8416 | #: builtin/fetch.c:133 builtin/pull.c:198 |
ef317cd5 | 8417 | msgid "fetch all tags and associated objects" |
55a16ee4 | 8418 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 8419 | |
31e5e17b | 8420 | #: builtin/fetch.c:135 |
ef317cd5 | 8421 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 8422 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 8423 | |
31e5e17b | 8424 | #: builtin/fetch.c:137 |
276ceeaa JX |
8425 | msgid "number of submodules fetched in parallel" |
8426 | msgstr "子模组获取的并发数" | |
8427 | ||
31e5e17b | 8428 | #: builtin/fetch.c:139 builtin/pull.c:201 |
ef317cd5 | 8429 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 8430 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 8431 | |
31e5e17b JX |
8432 | #: builtin/fetch.c:141 |
8433 | msgid "prune local tags no longer on remote and clobber changed tags" | |
8434 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
8435 | ||
07432cef | 8436 | # 译者:可选值,不能翻译 |
31e5e17b | 8437 | #: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 |
ef317cd5 | 8438 | msgid "on-demand" |
07432cef | 8439 | msgstr "on-demand" |
ef317cd5 | 8440 | |
31e5e17b | 8441 | #: builtin/fetch.c:143 |
ef317cd5 | 8442 | msgid "control recursive fetching of submodules" |
07432cef | 8443 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 8444 | |
31e5e17b | 8445 | #: builtin/fetch.c:147 builtin/pull.c:209 |
ef317cd5 | 8446 | msgid "keep downloaded pack" |
07432cef | 8447 | msgstr "保持下载包" |
ef317cd5 | 8448 | |
31e5e17b | 8449 | #: builtin/fetch.c:149 |
ef317cd5 | 8450 | msgid "allow updating of HEAD ref" |
07432cef | 8451 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 8452 | |
31e5e17b | 8453 | #: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 |
ef317cd5 | 8454 | msgid "deepen history of shallow clone" |
07432cef | 8455 | msgstr "深化浅克隆的历史" |
ef317cd5 | 8456 | |
31e5e17b | 8457 | #: builtin/fetch.c:154 |
a0b6b246 JX |
8458 | msgid "deepen history of shallow repository based on time" |
8459 | msgstr "基于时间来深化浅克隆的历史" | |
8460 | ||
31e5e17b | 8461 | #: builtin/fetch.c:160 builtin/pull.c:215 |
a77c07d9 | 8462 | msgid "convert to a complete repository" |
160fb2b2 | 8463 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 8464 | |
31e5e17b | 8465 | #: builtin/fetch.c:162 builtin/log.c:1466 |
ef317cd5 | 8466 | msgid "dir" |
07432cef | 8467 | msgstr "目录" |
ef317cd5 | 8468 | |
31e5e17b | 8469 | #: builtin/fetch.c:163 |
ef317cd5 | 8470 | msgid "prepend this to submodule path output" |
07432cef | 8471 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 8472 | |
31e5e17b | 8473 | #: builtin/fetch.c:166 |
a4f16749 JX |
8474 | msgid "" |
8475 | "default for recursive fetching of submodules (lower priority than config " | |
8476 | "files)" | |
8477 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 8478 | |
31e5e17b | 8479 | #: builtin/fetch.c:170 builtin/pull.c:218 |
cfff71a9 JX |
8480 | msgid "accept refs that update .git/shallow" |
8481 | msgstr "接受更新 .git/shallow 的引用" | |
8482 | ||
31e5e17b | 8483 | #: builtin/fetch.c:171 builtin/pull.c:220 |
6acbf033 JX |
8484 | msgid "refmap" |
8485 | msgstr "引用映射" | |
8486 | ||
31e5e17b | 8487 | #: builtin/fetch.c:172 builtin/pull.c:221 |
6acbf033 JX |
8488 | msgid "specify fetch refmap" |
8489 | msgstr "指定获取操作的引用映射" | |
8490 | ||
31e5e17b | 8491 | #: builtin/fetch.c:431 |
c04f5ac3 JX |
8492 | msgid "Couldn't find remote ref HEAD" |
8493 | msgstr "无法发现远程 HEAD 引用" | |
8494 | ||
31e5e17b | 8495 | #: builtin/fetch.c:549 |
5c57d762 JX |
8496 | #, c-format |
8497 | msgid "configuration fetch.output contains invalid value %s" | |
8498 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
8499 | ||
31e5e17b | 8500 | #: builtin/fetch.c:642 |
c04f5ac3 JX |
8501 | #, c-format |
8502 | msgid "object %s not found" | |
8503 | msgstr "对象 %s 未发现" | |
8504 | ||
31e5e17b | 8505 | #: builtin/fetch.c:646 |
c04f5ac3 JX |
8506 | msgid "[up to date]" |
8507 | msgstr "[最新]" | |
8508 | ||
31e5e17b | 8509 | #: builtin/fetch.c:659 builtin/fetch.c:739 |
c04f5ac3 JX |
8510 | msgid "[rejected]" |
8511 | msgstr "[已拒绝]" | |
8512 | ||
31e5e17b | 8513 | #: builtin/fetch.c:660 |
5c57d762 | 8514 | msgid "can't fetch in current branch" |
9a4b694c | 8515 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 8516 | |
31e5e17b | 8517 | #: builtin/fetch.c:669 |
c04f5ac3 | 8518 | msgid "[tag update]" |
55a16ee4 | 8519 | msgstr "[标签更新]" |
c04f5ac3 | 8520 | |
31e5e17b JX |
8521 | #: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 |
8522 | #: builtin/fetch.c:734 | |
5c57d762 JX |
8523 | msgid "unable to update local ref" |
8524 | msgstr "不能更新本地引用" | |
c04f5ac3 | 8525 | |
31e5e17b | 8526 | #: builtin/fetch.c:689 |
c04f5ac3 | 8527 | msgid "[new tag]" |
55a16ee4 | 8528 | msgstr "[新标签]" |
c04f5ac3 | 8529 | |
31e5e17b | 8530 | #: builtin/fetch.c:692 |
c04f5ac3 JX |
8531 | msgid "[new branch]" |
8532 | msgstr "[新分支]" | |
8533 | ||
31e5e17b | 8534 | #: builtin/fetch.c:695 |
170e9899 JX |
8535 | msgid "[new ref]" |
8536 | msgstr "[新引用]" | |
8537 | ||
31e5e17b | 8538 | #: builtin/fetch.c:734 |
c04f5ac3 JX |
8539 | msgid "forced update" |
8540 | msgstr "强制更新" | |
8541 | ||
31e5e17b | 8542 | #: builtin/fetch.c:739 |
5c57d762 JX |
8543 | msgid "non-fast-forward" |
8544 | msgstr "非快进" | |
c04f5ac3 | 8545 | |
31e5e17b | 8546 | #: builtin/fetch.c:784 |
c04f5ac3 JX |
8547 | #, c-format |
8548 | msgid "%s did not send all necessary objects\n" | |
8549 | msgstr "%s 未发送所有必须的对象\n" | |
8550 | ||
31e5e17b | 8551 | #: builtin/fetch.c:804 |
cfff71a9 JX |
8552 | #, c-format |
8553 | msgid "reject %s because shallow roots are not allowed to be updated" | |
8554 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
8555 | ||
31e5e17b | 8556 | #: builtin/fetch.c:892 builtin/fetch.c:988 |
c04f5ac3 JX |
8557 | #, c-format |
8558 | msgid "From %.*s\n" | |
8559 | msgstr "来自 %.*s\n" | |
8560 | ||
31e5e17b | 8561 | #: builtin/fetch.c:903 |
c04f5ac3 JX |
8562 | #, c-format |
8563 | msgid "" | |
8564 | "some local refs could not be updated; try running\n" | |
8565 | " 'git remote prune %s' to remove any old, conflicting branches" | |
8566 | msgstr "" | |
8567 | "一些本地引用不能被更新;尝试运行\n" | |
8568 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
8569 | ||
90e6ef53 | 8570 | # 译者:注意保持前导空格 |
31e5e17b | 8571 | #: builtin/fetch.c:958 |
81809b99 | 8572 | #, c-format |
8ada9598 | 8573 | msgid " (%s will become dangling)" |
07432cef | 8574 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 8575 | |
90e6ef53 | 8576 | # 译者:注意保持前导空格 |
31e5e17b | 8577 | #: builtin/fetch.c:959 |
81809b99 | 8578 | #, c-format |
8ada9598 | 8579 | msgid " (%s has become dangling)" |
07432cef | 8580 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 8581 | |
31e5e17b | 8582 | #: builtin/fetch.c:991 |
c04f5ac3 JX |
8583 | msgid "[deleted]" |
8584 | msgstr "[已删除]" | |
8585 | ||
31e5e17b | 8586 | #: builtin/fetch.c:992 builtin/remote.c:1024 |
c04f5ac3 JX |
8587 | msgid "(none)" |
8588 | msgstr "(无)" | |
8589 | ||
31e5e17b | 8590 | #: builtin/fetch.c:1015 |
c04f5ac3 JX |
8591 | #, c-format |
8592 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 8593 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 8594 | |
31e5e17b | 8595 | #: builtin/fetch.c:1034 |
c04f5ac3 JX |
8596 | #, c-format |
8597 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
8598 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
8599 | ||
31e5e17b | 8600 | #: builtin/fetch.c:1037 |
c04f5ac3 JX |
8601 | #, c-format |
8602 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 8603 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 8604 | |
31e5e17b | 8605 | #: builtin/fetch.c:1277 |
c04f5ac3 JX |
8606 | #, c-format |
8607 | msgid "Fetching %s\n" | |
d4a8e00b | 8608 | msgstr "正在获取 %s\n" |
c04f5ac3 | 8609 | |
31e5e17b | 8610 | #: builtin/fetch.c:1279 builtin/remote.c:97 |
c04f5ac3 JX |
8611 | #, c-format |
8612 | msgid "Could not fetch %s" | |
8613 | msgstr "不能获取 %s" | |
8614 | ||
31e5e17b JX |
8615 | #: builtin/fetch.c:1325 builtin/fetch.c:1498 |
8616 | msgid "" | |
8617 | "--filter can only be used with the remote configured in core.partialClone" | |
8618 | msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库" | |
8619 | ||
8620 | #: builtin/fetch.c:1350 | |
c04f5ac3 JX |
8621 | msgid "" |
8622 | "No remote repository specified. Please, specify either a URL or a\n" | |
8623 | "remote name from which new revisions should be fetched." | |
4375c10e | 8624 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 8625 | |
31e5e17b | 8626 | #: builtin/fetch.c:1394 |
c04f5ac3 | 8627 | msgid "You need to specify a tag name." |
55a16ee4 | 8628 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 8629 | |
31e5e17b | 8630 | #: builtin/fetch.c:1439 |
a0b6b246 JX |
8631 | msgid "Negative depth in --deepen is not supported" |
8632 | msgstr "--deepen 不支持负数深度" | |
8633 | ||
31e5e17b | 8634 | #: builtin/fetch.c:1441 |
a0b6b246 JX |
8635 | msgid "--deepen and --depth are mutually exclusive" |
8636 | msgstr "--deepen 和 --depth 是互斥的" | |
8637 | ||
31e5e17b | 8638 | #: builtin/fetch.c:1446 |
a77c07d9 JX |
8639 | msgid "--depth and --unshallow cannot be used together" |
8640 | msgstr "--depth 和 --unshallow 不能同时使用" | |
8641 | ||
31e5e17b | 8642 | #: builtin/fetch.c:1448 |
a77c07d9 | 8643 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 8644 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 8645 | |
31e5e17b | 8646 | #: builtin/fetch.c:1464 |
c04f5ac3 | 8647 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 8648 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 8649 | |
31e5e17b | 8650 | #: builtin/fetch.c:1466 |
c04f5ac3 | 8651 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 8652 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 8653 | |
31e5e17b | 8654 | #: builtin/fetch.c:1475 |
c04f5ac3 JX |
8655 | #, c-format |
8656 | msgid "No such remote or remote group: %s" | |
8657 | msgstr "没有这样的远程或远程组:%s" | |
8658 | ||
31e5e17b | 8659 | #: builtin/fetch.c:1482 |
c04f5ac3 | 8660 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 8661 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 8662 | |
a4f16749 | 8663 | #: builtin/fmt-merge-msg.c:15 |
814ff314 JX |
8664 | msgid "" |
8665 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
8666 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 8667 | |
5809aa05 | 8668 | #: builtin/fmt-merge-msg.c:666 |
ef317cd5 | 8669 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 8670 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 8671 | |
5809aa05 | 8672 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 8673 | msgid "alias for --log (deprecated)" |
07432cef | 8674 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 8675 | |
5809aa05 | 8676 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 8677 | msgid "text" |
07432cef | 8678 | msgstr "文本" |
ef317cd5 | 8679 | |
5809aa05 | 8680 | #: builtin/fmt-merge-msg.c:673 |
ef317cd5 | 8681 | msgid "use <text> as start of message" |
07432cef | 8682 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 8683 | |
5809aa05 | 8684 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 8685 | msgid "file to read from" |
07432cef | 8686 | msgstr "从文件中读取" |
ef317cd5 | 8687 | |
a4f16749 | 8688 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
8689 | msgid "git for-each-ref [<options>] [<pattern>]" |
8690 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 8691 | |
a4f16749 | 8692 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
8693 | msgid "git for-each-ref [--points-at <object>]" |
8694 | msgstr "git for-each-ref [--points-at <对象>]" | |
8695 | ||
a4f16749 | 8696 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
8697 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
8698 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 8699 | |
a4f16749 | 8700 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
8701 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
8702 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 8703 | |
a4f16749 | 8704 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 8705 | msgid "quote placeholders suitably for shells" |
07432cef | 8706 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 8707 | |
a4f16749 | 8708 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 8709 | msgid "quote placeholders suitably for perl" |
07432cef | 8710 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 8711 | |
a4f16749 | 8712 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 8713 | msgid "quote placeholders suitably for python" |
07432cef | 8714 | msgstr "引用占位符适用于 python" |
ef317cd5 | 8715 | |
a4f16749 | 8716 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
8717 | msgid "quote placeholders suitably for Tcl" |
8718 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 8719 | |
a4f16749 | 8720 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 8721 | msgid "show only <n> matched refs" |
07432cef | 8722 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 8723 | |
31e5e17b | 8724 | #: builtin/for-each-ref.c:39 builtin/tag.c:420 |
6937cb4e JX |
8725 | msgid "respect format colors" |
8726 | msgstr "遵照格式中的颜色输出" | |
8727 | ||
8728 | #: builtin/for-each-ref.c:43 | |
94550ed3 JX |
8729 | msgid "print only refs which points at the given object" |
8730 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 8731 | |
6937cb4e | 8732 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
8733 | msgid "print only refs that are merged" |
8734 | msgstr "只打印已经合并的引用" | |
8735 | ||
6937cb4e | 8736 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
8737 | msgid "print only refs that are not merged" |
8738 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 8739 | |
6937cb4e | 8740 | #: builtin/for-each-ref.c:47 |
94550ed3 JX |
8741 | msgid "print only refs which contain the commit" |
8742 | msgstr "只打印包含该提交的引用" | |
8743 | ||
6937cb4e | 8744 | #: builtin/for-each-ref.c:48 |
87cb7997 JX |
8745 | msgid "print only refs which don't contain the commit" |
8746 | msgstr "只打印不包含该提交的引用" | |
8747 | ||
31e5e17b | 8748 | #: builtin/fsck.c:568 |
6c94aba5 JX |
8749 | msgid "Checking object directories" |
8750 | msgstr "检查对象目录中" | |
8751 | ||
31e5e17b | 8752 | #: builtin/fsck.c:660 |
814ff314 JX |
8753 | msgid "git fsck [<options>] [<object>...]" |
8754 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 8755 | |
31e5e17b | 8756 | #: builtin/fsck.c:666 |
ef317cd5 | 8757 | msgid "show unreachable objects" |
07432cef | 8758 | msgstr "显示不可达的对象" |
ef317cd5 | 8759 | |
31e5e17b | 8760 | #: builtin/fsck.c:667 |
ef317cd5 | 8761 | msgid "show dangling objects" |
07432cef | 8762 | msgstr "显示摇摆的对象" |
ef317cd5 | 8763 | |
31e5e17b | 8764 | #: builtin/fsck.c:668 |
ef317cd5 | 8765 | msgid "report tags" |
55a16ee4 | 8766 | msgstr "报告标签" |
ef317cd5 | 8767 | |
31e5e17b | 8768 | #: builtin/fsck.c:669 |
ef317cd5 | 8769 | msgid "report root nodes" |
07432cef | 8770 | msgstr "报告根节点" |
ef317cd5 | 8771 | |
31e5e17b | 8772 | #: builtin/fsck.c:670 |
ef317cd5 | 8773 | msgid "make index objects head nodes" |
07432cef | 8774 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 8775 | |
31e5e17b | 8776 | #: builtin/fsck.c:671 |
ef317cd5 | 8777 | msgid "make reflogs head nodes (default)" |
07432cef | 8778 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 8779 | |
31e5e17b | 8780 | #: builtin/fsck.c:672 |
ef317cd5 | 8781 | msgid "also consider packs and alternate objects" |
07432cef | 8782 | msgstr "也考虑包和备用对象" |
ef317cd5 | 8783 | |
31e5e17b | 8784 | #: builtin/fsck.c:673 |
1b7f4a34 JX |
8785 | msgid "check only connectivity" |
8786 | msgstr "仅检查连通性" | |
8787 | ||
31e5e17b | 8788 | #: builtin/fsck.c:674 |
ef317cd5 | 8789 | msgid "enable more strict checking" |
07432cef | 8790 | msgstr "启用更严格的检查" |
ef317cd5 | 8791 | |
31e5e17b | 8792 | #: builtin/fsck.c:676 |
ef317cd5 | 8793 | msgid "write dangling objects in .git/lost-found" |
07432cef | 8794 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 8795 | |
31e5e17b | 8796 | #: builtin/fsck.c:677 builtin/prune.c:108 |
ef317cd5 | 8797 | msgid "show progress" |
07432cef | 8798 | msgstr "显示进度" |
ef317cd5 | 8799 | |
31e5e17b | 8800 | #: builtin/fsck.c:678 |
5c57d762 JX |
8801 | msgid "show verbose names for reachable objects" |
8802 | msgstr "显示可达对象的详细名称" | |
8803 | ||
31e5e17b | 8804 | #: builtin/fsck.c:742 |
6c94aba5 JX |
8805 | msgid "Checking objects" |
8806 | msgstr "检查对象中" | |
8807 | ||
6937cb4e | 8808 | #: builtin/gc.c:27 |
814ff314 JX |
8809 | msgid "git gc [<options>]" |
8810 | msgstr "git gc [<选项>]" | |
ef317cd5 | 8811 | |
6937cb4e | 8812 | #: builtin/gc.c:80 |
c04f5ac3 | 8813 | #, c-format |
87cb7997 | 8814 | msgid "Failed to fstat %s: %s" |
65e2041e | 8815 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 8816 | |
6937cb4e | 8817 | #: builtin/gc.c:312 |
c04f5ac3 | 8818 | #, c-format |
87cb7997 | 8819 | msgid "Can't stat %s" |
65e2041e | 8820 | msgstr "不能对 %s 调用 stat" |
c04f5ac3 | 8821 | |
6937cb4e | 8822 | #: builtin/gc.c:321 |
94550ed3 JX |
8823 | #, c-format |
8824 | msgid "" | |
8825 | "The last gc run reported the following. Please correct the root cause\n" | |
8826 | "and remove %s.\n" | |
8827 | "Automatic cleanup will not be performed until the file is removed.\n" | |
8828 | "\n" | |
8829 | "%s" | |
8830 | msgstr "" | |
8831 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
8832 | "在该文件被删除之前,自动清理将不会执行。\n" | |
8833 | "\n" | |
8834 | "%s" | |
8835 | ||
6937cb4e | 8836 | #: builtin/gc.c:360 |
ef317cd5 | 8837 | msgid "prune unreferenced objects" |
07432cef | 8838 | msgstr "清除未引用的对象" |
ef317cd5 | 8839 | |
6937cb4e | 8840 | #: builtin/gc.c:362 |
ef317cd5 | 8841 | msgid "be more thorough (increased runtime)" |
07432cef | 8842 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 8843 | |
6937cb4e | 8844 | #: builtin/gc.c:363 |
ef317cd5 | 8845 | msgid "enable auto-gc mode" |
07432cef | 8846 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 8847 | |
31e5e17b | 8848 | #: builtin/gc.c:366 |
90314792 JX |
8849 | msgid "force running gc even if there may be another gc running" |
8850 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
8851 | ||
31e5e17b | 8852 | #: builtin/gc.c:384 |
87cb7997 JX |
8853 | #, c-format |
8854 | msgid "Failed to parse gc.logexpiry value %s" | |
8855 | msgstr "无法解析 gc.logexpiry 的值 %s" | |
8856 | ||
31e5e17b | 8857 | #: builtin/gc.c:412 |
c04f5ac3 | 8858 | #, c-format |
6c94aba5 | 8859 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 8860 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 8861 | |
31e5e17b | 8862 | #: builtin/gc.c:414 |
6c94aba5 JX |
8863 | #, c-format |
8864 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 8865 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 8866 | |
31e5e17b | 8867 | #: builtin/gc.c:415 |
6c94aba5 JX |
8868 | #, c-format |
8869 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
8870 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 8871 | |
31e5e17b | 8872 | #: builtin/gc.c:440 |
90314792 JX |
8873 | #, c-format |
8874 | msgid "" | |
8875 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
8876 | msgstr "" | |
29004bbb | 8877 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 8878 | |
31e5e17b | 8879 | #: builtin/gc.c:487 |
c04f5ac3 JX |
8880 | msgid "" |
8881 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 8882 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 8883 | |
a4f16749 | 8884 | #: builtin/grep.c:27 |
814ff314 JX |
8885 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
8886 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 8887 | |
31e5e17b | 8888 | #: builtin/grep.c:225 |
c04f5ac3 JX |
8889 | #, c-format |
8890 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 8891 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 8892 | |
31e5e17b | 8893 | #: builtin/grep.c:283 |
276ceeaa JX |
8894 | #, c-format |
8895 | msgid "invalid number of threads specified (%d) for %s" | |
8896 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
8897 | ||
a4f16749 JX |
8898 | #. TRANSLATORS: %s is the configuration |
8899 | #. variable for tweaking threads, currently | |
8900 | #. grep.threads | |
8901 | #. | |
31e5e17b | 8902 | #: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 |
a4f16749 JX |
8903 | #, c-format |
8904 | msgid "no threads support, ignoring %s" | |
8905 | msgstr "没有线程支持,忽略 %s" | |
8906 | ||
31e5e17b | 8907 | #: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 |
c04f5ac3 JX |
8908 | #, c-format |
8909 | msgid "unable to read tree (%s)" | |
90e6ef53 | 8910 | msgstr "无法读取树(%s)" |
c04f5ac3 | 8911 | |
31e5e17b | 8912 | #: builtin/grep.c:637 |
c04f5ac3 JX |
8913 | #, c-format |
8914 | msgid "unable to grep from object of type %s" | |
8915 | msgstr "无法抓取来自于 %s 类型的对象" | |
8916 | ||
31e5e17b | 8917 | #: builtin/grep.c:703 |
c04f5ac3 JX |
8918 | #, c-format |
8919 | msgid "switch `%c' expects a numerical value" | |
8920 | msgstr "开关 `%c' 期望一个数字值" | |
8921 | ||
31e5e17b | 8922 | #: builtin/grep.c:790 |
ef317cd5 | 8923 | msgid "search in index instead of in the work tree" |
07432cef | 8924 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 8925 | |
31e5e17b | 8926 | #: builtin/grep.c:792 |
ef317cd5 | 8927 | msgid "find in contents not managed by git" |
07432cef | 8928 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
8929 | |
8930 | # 译者:中文字符串拼接,可删除前导空格 | |
31e5e17b | 8931 | #: builtin/grep.c:794 |
ef317cd5 | 8932 | msgid "search in both tracked and untracked files" |
07432cef | 8933 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 8934 | |
31e5e17b | 8935 | #: builtin/grep.c:796 |
814ff314 JX |
8936 | msgid "ignore files specified via '.gitignore'" |
8937 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 8938 | |
31e5e17b | 8939 | #: builtin/grep.c:798 |
87cb7997 | 8940 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
8941 | msgstr "在每一个子模组中递归搜索" |
8942 | ||
31e5e17b | 8943 | #: builtin/grep.c:801 |
ef317cd5 | 8944 | msgid "show non-matching lines" |
07432cef | 8945 | msgstr "显示未匹配的行" |
ef317cd5 | 8946 | |
31e5e17b | 8947 | #: builtin/grep.c:803 |
ef317cd5 | 8948 | msgid "case insensitive matching" |
07432cef | 8949 | msgstr "不区分大小写匹配" |
ef317cd5 | 8950 | |
31e5e17b | 8951 | #: builtin/grep.c:805 |
ef317cd5 | 8952 | msgid "match patterns only at word boundaries" |
07432cef | 8953 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 8954 | |
31e5e17b | 8955 | #: builtin/grep.c:807 |
ef317cd5 | 8956 | msgid "process binary files as text" |
07432cef | 8957 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 8958 | |
31e5e17b | 8959 | #: builtin/grep.c:809 |
ef317cd5 | 8960 | msgid "don't match patterns in binary files" |
07432cef | 8961 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 8962 | |
31e5e17b | 8963 | #: builtin/grep.c:812 |
90314792 JX |
8964 | msgid "process binary files with textconv filters" |
8965 | msgstr "用 textconv 过滤器处理二进制文件" | |
8966 | ||
31e5e17b | 8967 | #: builtin/grep.c:814 |
ef317cd5 | 8968 | msgid "descend at most <depth> levels" |
07432cef | 8969 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 8970 | |
31e5e17b | 8971 | #: builtin/grep.c:818 |
ef317cd5 | 8972 | msgid "use extended POSIX regular expressions" |
07432cef | 8973 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 8974 | |
31e5e17b | 8975 | #: builtin/grep.c:821 |
ef317cd5 | 8976 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 8977 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 8978 | |
31e5e17b | 8979 | #: builtin/grep.c:824 |
ef317cd5 | 8980 | msgid "interpret patterns as fixed strings" |
07432cef | 8981 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 8982 | |
31e5e17b | 8983 | #: builtin/grep.c:827 |
ef317cd5 | 8984 | msgid "use Perl-compatible regular expressions" |
07432cef | 8985 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 8986 | |
31e5e17b | 8987 | #: builtin/grep.c:830 |
ef317cd5 | 8988 | msgid "show line numbers" |
07432cef | 8989 | msgstr "显示行号" |
ef317cd5 | 8990 | |
31e5e17b | 8991 | #: builtin/grep.c:831 |
ef317cd5 | 8992 | msgid "don't show filenames" |
07432cef | 8993 | msgstr "不显示文件名" |
ef317cd5 | 8994 | |
31e5e17b | 8995 | #: builtin/grep.c:832 |
ef317cd5 | 8996 | msgid "show filenames" |
07432cef | 8997 | msgstr "显示文件名" |
ef317cd5 | 8998 | |
31e5e17b | 8999 | #: builtin/grep.c:834 |
ef317cd5 | 9000 | msgid "show filenames relative to top directory" |
07432cef | 9001 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 9002 | |
31e5e17b | 9003 | #: builtin/grep.c:836 |
ef317cd5 | 9004 | msgid "show only filenames instead of matching lines" |
07432cef | 9005 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 9006 | |
31e5e17b | 9007 | #: builtin/grep.c:838 |
ef317cd5 | 9008 | msgid "synonym for --files-with-matches" |
07432cef | 9009 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 9010 | |
31e5e17b | 9011 | #: builtin/grep.c:841 |
ef317cd5 | 9012 | msgid "show only the names of files without match" |
07432cef | 9013 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 9014 | |
31e5e17b | 9015 | #: builtin/grep.c:843 |
ef317cd5 | 9016 | msgid "print NUL after filenames" |
07432cef | 9017 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 9018 | |
31e5e17b | 9019 | #: builtin/grep.c:846 |
ef317cd5 | 9020 | msgid "show the number of matches instead of matching lines" |
07432cef | 9021 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 9022 | |
31e5e17b | 9023 | #: builtin/grep.c:847 |
ef317cd5 | 9024 | msgid "highlight matches" |
07432cef | 9025 | msgstr "高亮显示匹配项" |
ef317cd5 | 9026 | |
31e5e17b | 9027 | #: builtin/grep.c:849 |
ef317cd5 | 9028 | msgid "print empty line between matches from different files" |
07432cef | 9029 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 9030 | |
31e5e17b | 9031 | #: builtin/grep.c:851 |
ef317cd5 | 9032 | msgid "show filename only once above matches from same file" |
07432cef | 9033 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 9034 | |
31e5e17b | 9035 | #: builtin/grep.c:854 |
ef317cd5 | 9036 | msgid "show <n> context lines before and after matches" |
07432cef | 9037 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 9038 | |
31e5e17b | 9039 | #: builtin/grep.c:857 |
ef317cd5 | 9040 | msgid "show <n> context lines before matches" |
07432cef | 9041 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 9042 | |
31e5e17b | 9043 | #: builtin/grep.c:859 |
ef317cd5 | 9044 | msgid "show <n> context lines after matches" |
07432cef | 9045 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 9046 | |
31e5e17b | 9047 | #: builtin/grep.c:861 |
276ceeaa JX |
9048 | msgid "use <n> worker threads" |
9049 | msgstr "使用 <n> 个工作线程" | |
9050 | ||
31e5e17b | 9051 | #: builtin/grep.c:862 |
ef317cd5 | 9052 | msgid "shortcut for -C NUM" |
07432cef | 9053 | msgstr "快捷键 -C 数字" |
ef317cd5 | 9054 | |
31e5e17b | 9055 | #: builtin/grep.c:865 |
ef317cd5 | 9056 | msgid "show a line with the function name before matches" |
07432cef | 9057 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 9058 | |
31e5e17b | 9059 | #: builtin/grep.c:867 |
ef317cd5 | 9060 | msgid "show the surrounding function" |
07432cef | 9061 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 9062 | |
31e5e17b | 9063 | #: builtin/grep.c:870 |
ef317cd5 | 9064 | msgid "read patterns from file" |
07432cef | 9065 | msgstr "从文件读取模式" |
ef317cd5 | 9066 | |
31e5e17b | 9067 | #: builtin/grep.c:872 |
ef317cd5 | 9068 | msgid "match <pattern>" |
07432cef | 9069 | msgstr "匹配 <模式>" |
ef317cd5 | 9070 | |
31e5e17b | 9071 | #: builtin/grep.c:874 |
ef317cd5 | 9072 | msgid "combine patterns specified with -e" |
07432cef | 9073 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 9074 | |
31e5e17b | 9075 | #: builtin/grep.c:886 |
ef317cd5 | 9076 | msgid "indicate hit with exit status without output" |
07432cef | 9077 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 9078 | |
31e5e17b | 9079 | #: builtin/grep.c:888 |
ef317cd5 | 9080 | msgid "show only matches from files that match all patterns" |
07432cef | 9081 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 9082 | |
31e5e17b | 9083 | #: builtin/grep.c:890 |
07432cef WS |
9084 | msgid "show parse tree for grep expression" |
9085 | msgstr "显示 grep 表达式的解析树" | |
9086 | ||
31e5e17b | 9087 | #: builtin/grep.c:894 |
ef317cd5 | 9088 | msgid "pager" |
07432cef | 9089 | msgstr "分页" |
ef317cd5 | 9090 | |
31e5e17b | 9091 | #: builtin/grep.c:894 |
ef317cd5 | 9092 | msgid "show matching files in the pager" |
07432cef | 9093 | msgstr "分页显示匹配的文件" |
ef317cd5 | 9094 | |
31e5e17b | 9095 | #: builtin/grep.c:898 |
ef317cd5 | 9096 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 9097 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 9098 | |
31e5e17b | 9099 | #: builtin/grep.c:962 |
c04f5ac3 JX |
9100 | msgid "no pattern given." |
9101 | msgstr "未提供模式匹配。" | |
9102 | ||
31e5e17b | 9103 | #: builtin/grep.c:994 |
87cb7997 JX |
9104 | msgid "--no-index or --untracked cannot be used with revs" |
9105 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
9106 | ||
31e5e17b | 9107 | #: builtin/grep.c:1001 |
87cb7997 JX |
9108 | #, c-format |
9109 | msgid "unable to resolve revision: %s" | |
9110 | msgstr "不能解析版本:%s" | |
9111 | ||
31e5e17b | 9112 | #: builtin/grep.c:1036 builtin/index-pack.c:1519 |
276ceeaa JX |
9113 | #, c-format |
9114 | msgid "invalid number of threads specified (%d)" | |
9115 | msgstr "指定的线程数无效(%d)" | |
9116 | ||
31e5e17b | 9117 | #: builtin/grep.c:1041 |
a4f16749 JX |
9118 | msgid "no threads support, ignoring --threads" |
9119 | msgstr "没有线程支持,忽略 --threads" | |
9120 | ||
31e5e17b | 9121 | #: builtin/grep.c:1065 |
c04f5ac3 JX |
9122 | msgid "--open-files-in-pager only works on the worktree" |
9123 | msgstr "--open-files-in-pager 仅用于工作区" | |
9124 | ||
31e5e17b | 9125 | #: builtin/grep.c:1088 |
1a79b2f1 JX |
9126 | msgid "option not supported with --recurse-submodules." |
9127 | msgstr "选项不支持和 --recurse-submodules 共用。" | |
9128 | ||
31e5e17b | 9129 | #: builtin/grep.c:1094 |
c04f5ac3 | 9130 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 9131 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 9132 | |
31e5e17b | 9133 | #: builtin/grep.c:1100 |
c04f5ac3 | 9134 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 9135 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 9136 | |
31e5e17b | 9137 | #: builtin/grep.c:1108 |
c04f5ac3 JX |
9138 | msgid "both --cached and trees are given." |
9139 | msgstr "同时给出了 --cached 和树对象。" | |
9140 | ||
31e5e17b | 9141 | #: builtin/hash-object.c:83 |
ef317cd5 | 9142 | msgid "" |
814ff314 JX |
9143 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
9144 | "[--] <file>..." | |
ef317cd5 | 9145 | msgstr "" |
814ff314 JX |
9146 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
9147 | "[--] <文件>..." | |
ef317cd5 | 9148 | |
31e5e17b | 9149 | #: builtin/hash-object.c:84 |
94550ed3 JX |
9150 | msgid "git hash-object --stdin-paths" |
9151 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 9152 | |
31e5e17b | 9153 | #: builtin/hash-object.c:96 |
ef317cd5 | 9154 | msgid "type" |
07432cef | 9155 | msgstr "类型" |
ef317cd5 | 9156 | |
31e5e17b | 9157 | #: builtin/hash-object.c:96 |
ef317cd5 | 9158 | msgid "object type" |
07432cef | 9159 | msgstr "对象类型" |
ef317cd5 | 9160 | |
31e5e17b | 9161 | #: builtin/hash-object.c:97 |
ef317cd5 | 9162 | msgid "write the object into the object database" |
07432cef | 9163 | msgstr "将对象写入对象数据库" |
ef317cd5 | 9164 | |
31e5e17b | 9165 | #: builtin/hash-object.c:99 |
ef317cd5 | 9166 | msgid "read the object from stdin" |
07432cef | 9167 | msgstr "从标准输入读取对象" |
ef317cd5 | 9168 | |
31e5e17b | 9169 | #: builtin/hash-object.c:101 |
ef317cd5 | 9170 | msgid "store file as is without filters" |
07432cef | 9171 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 9172 | |
31e5e17b | 9173 | #: builtin/hash-object.c:102 |
220c313c JX |
9174 | msgid "" |
9175 | "just hash any random garbage to create corrupt objects for debugging Git" | |
9176 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
9177 | ||
31e5e17b | 9178 | #: builtin/hash-object.c:103 |
ef317cd5 | 9179 | msgid "process file as it were from this path" |
07432cef | 9180 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 9181 | |
a4f16749 | 9182 | #: builtin/help.c:43 |
ef317cd5 | 9183 | msgid "print all available commands" |
07432cef | 9184 | msgstr "打印所有可用的命令" |
ef317cd5 | 9185 | |
a4f16749 | 9186 | #: builtin/help.c:44 |
a0b6b246 JX |
9187 | msgid "exclude guides" |
9188 | msgstr "排除向导" | |
9189 | ||
a4f16749 | 9190 | #: builtin/help.c:45 |
4dcdc3d8 JX |
9191 | msgid "print list of useful guides" |
9192 | msgstr "显示有用的指南列表" | |
9193 | ||
a4f16749 | 9194 | #: builtin/help.c:46 |
ef317cd5 | 9195 | msgid "show man page" |
07432cef | 9196 | msgstr "显示 man 手册" |
ef317cd5 | 9197 | |
a4f16749 | 9198 | #: builtin/help.c:47 |
ef317cd5 | 9199 | msgid "show manual in web browser" |
07432cef | 9200 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 9201 | |
a4f16749 | 9202 | #: builtin/help.c:49 |
ef317cd5 | 9203 | msgid "show info page" |
07432cef | 9204 | msgstr "显示 info 手册" |
ef317cd5 | 9205 | |
a4f16749 | 9206 | #: builtin/help.c:55 |
814ff314 JX |
9207 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
9208 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 9209 | |
a4f16749 | 9210 | #: builtin/help.c:67 |
81809b99 | 9211 | #, c-format |
8ada9598 | 9212 | msgid "unrecognized help format '%s'" |
81809b99 | 9213 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 9214 | |
a4f16749 | 9215 | #: builtin/help.c:94 |
8ada9598 | 9216 | msgid "Failed to start emacsclient." |
81809b99 | 9217 | msgstr "无法启动 emacsclient。" |
8ada9598 | 9218 | |
a4f16749 | 9219 | #: builtin/help.c:107 |
8ada9598 | 9220 | msgid "Failed to parse emacsclient version." |
81809b99 | 9221 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 9222 | |
a4f16749 | 9223 | #: builtin/help.c:115 |
8ada9598 JX |
9224 | #, c-format |
9225 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 9226 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 9227 | |
6937cb4e | 9228 | #: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 |
81809b99 | 9229 | #, c-format |
5b04ee3b JX |
9230 | msgid "failed to exec '%s'" |
9231 | msgstr "无法执行 '%s'" | |
8ada9598 | 9232 | |
6937cb4e | 9233 | #: builtin/help.c:211 |
8ada9598 JX |
9234 | #, c-format |
9235 | msgid "" | |
9236 | "'%s': path for unsupported man viewer.\n" | |
9237 | "Please consider using 'man.<tool>.cmd' instead." | |
9238 | msgstr "" | |
81809b99 | 9239 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 9240 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 9241 | |
6937cb4e | 9242 | #: builtin/help.c:223 |
8ada9598 JX |
9243 | #, c-format |
9244 | msgid "" | |
9245 | "'%s': cmd for supported man viewer.\n" | |
9246 | "Please consider using 'man.<tool>.path' instead." | |
9247 | msgstr "" | |
81809b99 | 9248 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 9249 | "请使用 'man.<工具>.path'。" |
8ada9598 | 9250 | |
6937cb4e | 9251 | #: builtin/help.c:340 |
8ada9598 JX |
9252 | #, c-format |
9253 | msgid "'%s': unknown man viewer." | |
81809b99 | 9254 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 9255 | |
6937cb4e | 9256 | #: builtin/help.c:357 |
8ada9598 | 9257 | msgid "no man viewer handled the request" |
81809b99 | 9258 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 9259 | |
6937cb4e | 9260 | #: builtin/help.c:365 |
8ada9598 | 9261 | msgid "no info viewer handled the request" |
81809b99 | 9262 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 9263 | |
6937cb4e | 9264 | #: builtin/help.c:407 |
4dcdc3d8 JX |
9265 | msgid "Defining attributes per path" |
9266 | msgstr "定义路径的属性" | |
9267 | ||
6937cb4e | 9268 | #: builtin/help.c:408 |
220c313c JX |
9269 | msgid "Everyday Git With 20 Commands Or So" |
9270 | msgstr "每一天 Git 常用的约 20 条命令" | |
9271 | ||
6937cb4e | 9272 | #: builtin/help.c:409 |
4dcdc3d8 JX |
9273 | msgid "A Git glossary" |
9274 | msgstr "Git 词汇表" | |
9275 | ||
6937cb4e | 9276 | #: builtin/help.c:410 |
4dcdc3d8 JX |
9277 | msgid "Specifies intentionally untracked files to ignore" |
9278 | msgstr "忽略指定的未跟踪文件" | |
9279 | ||
6937cb4e | 9280 | #: builtin/help.c:411 |
4dcdc3d8 JX |
9281 | msgid "Defining submodule properties" |
9282 | msgstr "定义子模组属性" | |
9283 | ||
6937cb4e | 9284 | #: builtin/help.c:412 |
4dcdc3d8 JX |
9285 | msgid "Specifying revisions and ranges for Git" |
9286 | msgstr "指定 Git 的版本和版本范围" | |
9287 | ||
6937cb4e | 9288 | #: builtin/help.c:413 |
4dcdc3d8 JX |
9289 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
9290 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
9291 | ||
6937cb4e | 9292 | #: builtin/help.c:414 |
4dcdc3d8 JX |
9293 | msgid "An overview of recommended workflows with Git" |
9294 | msgstr "Git 推荐的工作流概览" | |
9295 | ||
6937cb4e | 9296 | #: builtin/help.c:426 |
4dcdc3d8 JX |
9297 | msgid "The common Git guides are:\n" |
9298 | msgstr "最常用的 Git 向导有:\n" | |
9299 | ||
6937cb4e | 9300 | #: builtin/help.c:444 |
8ada9598 | 9301 | #, c-format |
6937cb4e JX |
9302 | msgid "'%s' is aliased to '%s'" |
9303 | msgstr "'%s' 是 '%s' 的别名" | |
8ada9598 | 9304 | |
6937cb4e | 9305 | #: builtin/help.c:466 builtin/help.c:483 |
a0b6b246 JX |
9306 | #, c-format |
9307 | msgid "usage: %s%s" | |
9308 | msgstr "用法:%s%s" | |
9309 | ||
31e5e17b | 9310 | #: builtin/index-pack.c:157 |
6acbf033 JX |
9311 | #, c-format |
9312 | msgid "unable to open %s" | |
9313 | msgstr "不能打开 %s" | |
9314 | ||
31e5e17b | 9315 | #: builtin/index-pack.c:207 |
8ada9598 JX |
9316 | #, c-format |
9317 | msgid "object type mismatch at %s" | |
81809b99 | 9318 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 9319 | |
31e5e17b | 9320 | #: builtin/index-pack.c:227 |
6acbf033 JX |
9321 | #, c-format |
9322 | msgid "did not receive expected object %s" | |
a0b6b246 | 9323 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 9324 | |
31e5e17b | 9325 | #: builtin/index-pack.c:230 |
6acbf033 JX |
9326 | #, c-format |
9327 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 9328 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 9329 | |
31e5e17b | 9330 | #: builtin/index-pack.c:272 |
81809b99 | 9331 | #, c-format |
8ada9598 JX |
9332 | msgid "cannot fill %d byte" |
9333 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 9334 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 9335 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 9336 | |
31e5e17b | 9337 | #: builtin/index-pack.c:282 |
8ada9598 | 9338 | msgid "early EOF" |
81809b99 | 9339 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 9340 | |
31e5e17b | 9341 | #: builtin/index-pack.c:283 |
8ada9598 | 9342 | msgid "read error on input" |
81809b99 | 9343 | msgstr "输入上的读错误" |
8ada9598 | 9344 | |
31e5e17b | 9345 | #: builtin/index-pack.c:295 |
8ada9598 | 9346 | msgid "used more bytes than were available" |
81809b99 | 9347 | msgstr "用掉了超过可用的字节" |
8ada9598 | 9348 | |
31e5e17b | 9349 | #: builtin/index-pack.c:302 |
8ada9598 | 9350 | msgid "pack too large for current definition of off_t" |
81809b99 | 9351 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 9352 | |
31e5e17b | 9353 | #: builtin/index-pack.c:305 builtin/unpack-objects.c:93 |
a0b6b246 JX |
9354 | msgid "pack exceeds maximum allowed size" |
9355 | msgstr "包超过了最大允许值" | |
9356 | ||
31e5e17b | 9357 | #: builtin/index-pack.c:320 |
81809b99 | 9358 | #, c-format |
8ada9598 | 9359 | msgid "unable to create '%s'" |
81809b99 | 9360 | msgstr "不能创建 '%s'" |
8ada9598 | 9361 | |
31e5e17b | 9362 | #: builtin/index-pack.c:326 |
81809b99 | 9363 | #, c-format |
8ada9598 | 9364 | msgid "cannot open packfile '%s'" |
81809b99 | 9365 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 9366 | |
31e5e17b | 9367 | #: builtin/index-pack.c:340 |
8ada9598 | 9368 | msgid "pack signature mismatch" |
81809b99 | 9369 | msgstr "包签名不匹配" |
8ada9598 | 9370 | |
31e5e17b | 9371 | #: builtin/index-pack.c:342 |
ef317cd5 JX |
9372 | #, c-format |
9373 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 9374 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 9375 | |
31e5e17b | 9376 | #: builtin/index-pack.c:360 |
8ada9598 | 9377 | #, c-format |
5c57d762 JX |
9378 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
9379 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 9380 | |
31e5e17b | 9381 | #: builtin/index-pack.c:481 |
8ada9598 JX |
9382 | #, c-format |
9383 | msgid "inflate returned %d" | |
81809b99 | 9384 | msgstr "解压缩返回 %d" |
8ada9598 | 9385 | |
31e5e17b | 9386 | #: builtin/index-pack.c:530 |
8ada9598 | 9387 | msgid "offset value overflow for delta base object" |
81809b99 | 9388 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 9389 | |
31e5e17b | 9390 | #: builtin/index-pack.c:538 |
8ada9598 | 9391 | msgid "delta base offset is out of bound" |
81809b99 | 9392 | msgstr "delta 基准偏移越界" |
8ada9598 | 9393 | |
31e5e17b | 9394 | #: builtin/index-pack.c:546 |
81809b99 | 9395 | #, c-format |
8ada9598 | 9396 | msgid "unknown object type %d" |
81809b99 | 9397 | msgstr "未知对象类型 %d" |
8ada9598 | 9398 | |
31e5e17b | 9399 | #: builtin/index-pack.c:577 |
8ada9598 | 9400 | msgid "cannot pread pack file" |
81809b99 | 9401 | msgstr "无法读取包文件" |
8ada9598 | 9402 | |
31e5e17b | 9403 | #: builtin/index-pack.c:579 |
8ada9598 | 9404 | #, c-format |
5c57d762 JX |
9405 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
9406 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
9407 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
9408 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 9409 | |
31e5e17b | 9410 | #: builtin/index-pack.c:605 |
8ada9598 | 9411 | msgid "serious inflate inconsistency" |
81809b99 | 9412 | msgstr "解压缩严重的不一致" |
8ada9598 | 9413 | |
31e5e17b JX |
9414 | #: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 |
9415 | #: builtin/index-pack.c:818 builtin/index-pack.c:827 | |
8ada9598 JX |
9416 | #, c-format |
9417 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 9418 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 9419 | |
31e5e17b JX |
9420 | #: builtin/index-pack.c:753 builtin/pack-objects.c:182 |
9421 | #: builtin/pack-objects.c:276 | |
6792b93b JX |
9422 | #, c-format |
9423 | msgid "unable to read %s" | |
9424 | msgstr "不能读 %s" | |
9425 | ||
31e5e17b | 9426 | #: builtin/index-pack.c:816 |
87cb7997 JX |
9427 | #, c-format |
9428 | msgid "cannot read existing object info %s" | |
9429 | msgstr "不能读取现存对象信息 %s" | |
9430 | ||
31e5e17b | 9431 | #: builtin/index-pack.c:824 |
6792b93b JX |
9432 | #, c-format |
9433 | msgid "cannot read existing object %s" | |
9434 | msgstr "不能读取现存对象 %s" | |
9435 | ||
31e5e17b | 9436 | #: builtin/index-pack.c:838 |
81809b99 | 9437 | #, c-format |
8ada9598 | 9438 | msgid "invalid blob object %s" |
160fb2b2 | 9439 | msgstr "无效的数据对象 %s" |
8ada9598 | 9440 | |
31e5e17b | 9441 | #: builtin/index-pack.c:853 |
81809b99 | 9442 | #, c-format |
8ada9598 | 9443 | msgid "invalid %s" |
81809b99 | 9444 | msgstr "无效的 %s" |
8ada9598 | 9445 | |
31e5e17b | 9446 | #: builtin/index-pack.c:856 |
8ada9598 | 9447 | msgid "Error in object" |
81809b99 | 9448 | msgstr "对象中出错" |
8ada9598 | 9449 | |
31e5e17b | 9450 | #: builtin/index-pack.c:858 |
8ada9598 JX |
9451 | #, c-format |
9452 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 9453 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 9454 | |
31e5e17b | 9455 | #: builtin/index-pack.c:930 builtin/index-pack.c:961 |
8ada9598 | 9456 | msgid "failed to apply delta" |
81809b99 | 9457 | msgstr "无法应用 delta" |
8ada9598 | 9458 | |
6937cb4e | 9459 | #: builtin/index-pack.c:1131 |
8ada9598 | 9460 | msgid "Receiving objects" |
81809b99 | 9461 | msgstr "接收对象中" |
8ada9598 | 9462 | |
6937cb4e | 9463 | #: builtin/index-pack.c:1131 |
8ada9598 | 9464 | msgid "Indexing objects" |
81809b99 | 9465 | msgstr "索引对象中" |
8ada9598 | 9466 | |
6937cb4e | 9467 | #: builtin/index-pack.c:1165 |
8ada9598 | 9468 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 9469 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 9470 | |
6937cb4e | 9471 | #: builtin/index-pack.c:1170 |
8ada9598 | 9472 | msgid "cannot fstat packfile" |
65e2041e | 9473 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 9474 | |
6937cb4e | 9475 | #: builtin/index-pack.c:1173 |
8ada9598 | 9476 | msgid "pack has junk at the end" |
81809b99 | 9477 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 9478 | |
6937cb4e | 9479 | #: builtin/index-pack.c:1185 |
6792b93b JX |
9480 | msgid "confusion beyond insanity in parse_pack_objects()" |
9481 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
9482 | ||
6937cb4e | 9483 | #: builtin/index-pack.c:1208 |
8ada9598 | 9484 | msgid "Resolving deltas" |
81809b99 | 9485 | msgstr "处理 delta 中" |
8ada9598 | 9486 | |
6937cb4e | 9487 | #: builtin/index-pack.c:1219 |
07432cef | 9488 | #, c-format |
ef317cd5 | 9489 | msgid "unable to create thread: %s" |
07432cef | 9490 | msgstr "不能创建线程:%s" |
ef317cd5 | 9491 | |
6937cb4e | 9492 | #: builtin/index-pack.c:1261 |
8ada9598 | 9493 | msgid "confusion beyond insanity" |
81809b99 | 9494 | msgstr "不可理喻" |
8ada9598 | 9495 | |
6937cb4e | 9496 | #: builtin/index-pack.c:1267 |
ef317cd5 | 9497 | #, c-format |
5b04ee3b JX |
9498 | msgid "completed with %d local object" |
9499 | msgid_plural "completed with %d local objects" | |
9500 | msgstr[0] "完成 %d 个本地对象" | |
9501 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 9502 | |
6937cb4e | 9503 | #: builtin/index-pack.c:1279 |
ef317cd5 JX |
9504 | #, c-format |
9505 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 9506 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 9507 | |
6937cb4e | 9508 | #: builtin/index-pack.c:1283 |
8ada9598 JX |
9509 | #, c-format |
9510 | msgid "pack has %d unresolved delta" | |
9511 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 9512 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 9513 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 9514 | |
6937cb4e | 9515 | #: builtin/index-pack.c:1307 |
81809b99 | 9516 | #, c-format |
8ada9598 | 9517 | msgid "unable to deflate appended object (%d)" |
07432cef | 9518 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 9519 | |
6937cb4e | 9520 | #: builtin/index-pack.c:1383 |
8ada9598 JX |
9521 | #, c-format |
9522 | msgid "local object %s is corrupt" | |
81809b99 | 9523 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 9524 | |
31e5e17b JX |
9525 | #: builtin/index-pack.c:1397 |
9526 | #, c-format | |
9527 | msgid "packfile name '%s' does not end with '.pack'" | |
9528 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 9529 | |
31e5e17b | 9530 | #: builtin/index-pack.c:1422 |
81809b99 | 9531 | #, c-format |
31e5e17b JX |
9532 | msgid "cannot write %s file '%s'" |
9533 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 9534 | |
31e5e17b | 9535 | #: builtin/index-pack.c:1430 |
81809b99 | 9536 | #, c-format |
31e5e17b JX |
9537 | msgid "cannot close written %s file '%s'" |
9538 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
9539 | ||
9540 | #: builtin/index-pack.c:1454 | |
9541 | msgid "error while closing pack file" | |
9542 | msgstr "关闭包文件时出错" | |
8ada9598 | 9543 | |
31e5e17b | 9544 | #: builtin/index-pack.c:1468 |
8ada9598 | 9545 | msgid "cannot store pack file" |
81809b99 | 9546 | msgstr "无法存储包文件" |
8ada9598 | 9547 | |
31e5e17b | 9548 | #: builtin/index-pack.c:1476 |
8ada9598 | 9549 | msgid "cannot store index file" |
81809b99 | 9550 | msgstr "无法存储索引文件" |
8ada9598 | 9551 | |
31e5e17b | 9552 | #: builtin/index-pack.c:1513 |
07432cef | 9553 | #, c-format |
ef317cd5 | 9554 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 9555 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 9556 | |
31e5e17b | 9557 | #: builtin/index-pack.c:1581 |
81809b99 | 9558 | #, c-format |
8ada9598 | 9559 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 9560 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 9561 | |
31e5e17b | 9562 | #: builtin/index-pack.c:1583 |
81809b99 | 9563 | #, c-format |
8ada9598 | 9564 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 9565 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 9566 | |
31e5e17b | 9567 | #: builtin/index-pack.c:1631 |
81809b99 | 9568 | #, c-format |
8ada9598 JX |
9569 | msgid "non delta: %d object" |
9570 | msgid_plural "non delta: %d objects" | |
81809b99 | 9571 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 9572 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 9573 | |
31e5e17b | 9574 | #: builtin/index-pack.c:1638 |
8ada9598 JX |
9575 | #, c-format |
9576 | msgid "chain length = %d: %lu object" | |
9577 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 9578 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 9579 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 9580 | |
31e5e17b JX |
9581 | #: builtin/index-pack.c:1675 |
9582 | msgid "Cannot come back to cwd" | |
9583 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 9584 | |
31e5e17b JX |
9585 | #: builtin/index-pack.c:1724 builtin/index-pack.c:1727 |
9586 | #: builtin/index-pack.c:1743 builtin/index-pack.c:1747 | |
81809b99 | 9587 | #, c-format |
8ada9598 | 9588 | msgid "bad %s" |
81809b99 | 9589 | msgstr "错误选项 %s" |
8ada9598 | 9590 | |
31e5e17b | 9591 | #: builtin/index-pack.c:1763 |
8ada9598 | 9592 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 9593 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 9594 | |
31e5e17b | 9595 | #: builtin/index-pack.c:1765 |
1a79b2f1 JX |
9596 | msgid "--stdin requires a git repository" |
9597 | msgstr "--stdin 需要一个 git 仓库" | |
9598 | ||
31e5e17b | 9599 | #: builtin/index-pack.c:1771 |
8ada9598 | 9600 | msgid "--verify with no packfile name given" |
dbd6cced | 9601 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 9602 | |
a4f16749 | 9603 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
9604 | #, c-format |
9605 | msgid "cannot stat '%s'" | |
65e2041e | 9606 | msgstr "不能对 '%s' 调用 stat" |
c04f5ac3 | 9607 | |
a4f16749 | 9608 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
9609 | #, c-format |
9610 | msgid "cannot stat template '%s'" | |
65e2041e | 9611 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 9612 | |
a4f16749 | 9613 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
9614 | #, c-format |
9615 | msgid "cannot opendir '%s'" | |
9616 | msgstr "不能打开目录 '%s'" | |
9617 | ||
a4f16749 | 9618 | #: builtin/init-db.c:77 |
c04f5ac3 JX |
9619 | #, c-format |
9620 | msgid "cannot readlink '%s'" | |
9621 | msgstr "不能读取链接 '%s'" | |
9622 | ||
a4f16749 | 9623 | #: builtin/init-db.c:79 |
c04f5ac3 JX |
9624 | #, c-format |
9625 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 9626 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 9627 | |
a4f16749 | 9628 | #: builtin/init-db.c:85 |
c04f5ac3 JX |
9629 | #, c-format |
9630 | msgid "cannot copy '%s' to '%s'" | |
9631 | msgstr "不能拷贝 '%s' 至 '%s'" | |
9632 | ||
a4f16749 | 9633 | #: builtin/init-db.c:89 |
c04f5ac3 JX |
9634 | #, c-format |
9635 | msgid "ignoring template %s" | |
9636 | msgstr "忽略模版 %s" | |
9637 | ||
a4f16749 | 9638 | #: builtin/init-db.c:120 |
c04f5ac3 JX |
9639 | #, c-format |
9640 | msgid "templates not found %s" | |
9641 | msgstr "模版未找到 %s" | |
9642 | ||
a4f16749 | 9643 | #: builtin/init-db.c:135 |
c04f5ac3 | 9644 | #, c-format |
5b04ee3b JX |
9645 | msgid "not copying templates from '%s': %s" |
9646 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 9647 | |
a4f16749 | 9648 | #: builtin/init-db.c:328 |
c04f5ac3 JX |
9649 | #, c-format |
9650 | msgid "unable to handle file type %d" | |
9651 | msgstr "不能处理 %d 类型的文件" | |
9652 | ||
a4f16749 | 9653 | #: builtin/init-db.c:331 |
c04f5ac3 JX |
9654 | #, c-format |
9655 | msgid "unable to move %s to %s" | |
9656 | msgstr "不能移动 %s 至 %s" | |
9657 | ||
a4f16749 | 9658 | #: builtin/init-db.c:348 builtin/init-db.c:351 |
a0b6b246 JX |
9659 | #, c-format |
9660 | msgid "%s already exists" | |
9661 | msgstr "%s 已经存在" | |
9662 | ||
a4f16749 | 9663 | #: builtin/init-db.c:404 |
c04f5ac3 | 9664 | #, c-format |
5c57d762 JX |
9665 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
9666 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 9667 | |
a4f16749 | 9668 | #: builtin/init-db.c:405 |
5c57d762 JX |
9669 | #, c-format |
9670 | msgid "Reinitialized existing Git repository in %s%s\n" | |
9671 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 9672 | |
a4f16749 | 9673 | #: builtin/init-db.c:409 |
5c57d762 JX |
9674 | #, c-format |
9675 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 9676 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 9677 | |
a4f16749 | 9678 | #: builtin/init-db.c:410 |
5c57d762 JX |
9679 | #, c-format |
9680 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 9681 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 9682 | |
a4f16749 | 9683 | #: builtin/init-db.c:458 |
ef317cd5 | 9684 | msgid "" |
a77c07d9 | 9685 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 9686 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 9687 | msgstr "" |
07432cef | 9688 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 9689 | "[<目录>]" |
ef317cd5 | 9690 | |
a4f16749 | 9691 | #: builtin/init-db.c:481 |
ef317cd5 | 9692 | msgid "permissions" |
07432cef | 9693 | msgstr "权限" |
ef317cd5 | 9694 | |
a4f16749 | 9695 | #: builtin/init-db.c:482 |
ef317cd5 | 9696 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 9697 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 9698 | |
a4f16749 | 9699 | #: builtin/init-db.c:516 builtin/init-db.c:521 |
c04f5ac3 JX |
9700 | #, c-format |
9701 | msgid "cannot mkdir %s" | |
9702 | msgstr "不能创建目录 %s" | |
9703 | ||
a4f16749 | 9704 | #: builtin/init-db.c:525 |
c04f5ac3 JX |
9705 | #, c-format |
9706 | msgid "cannot chdir to %s" | |
9707 | msgstr "不能切换目录到 %s" | |
9708 | ||
a4f16749 | 9709 | #: builtin/init-db.c:546 |
c04f5ac3 JX |
9710 | #, c-format |
9711 | msgid "" | |
9712 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
9713 | "dir=<directory>)" | |
1e607449 | 9714 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 9715 | |
a4f16749 | 9716 | #: builtin/init-db.c:574 |
c04f5ac3 JX |
9717 | #, c-format |
9718 | msgid "Cannot access work tree '%s'" | |
9719 | msgstr "不能访问工作区 '%s'" | |
9720 | ||
220c313c JX |
9721 | #: builtin/interpret-trailers.c:15 |
9722 | msgid "" | |
276ceeaa JX |
9723 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
9724 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
9725 | msgstr "" |
9726 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
9727 | ">])...] [<文件>...]" | |
276ceeaa | 9728 | |
6937cb4e | 9729 | #: builtin/interpret-trailers.c:92 |
276ceeaa JX |
9730 | msgid "edit files in place" |
9731 | msgstr "在原位编辑文件" | |
220c313c | 9732 | |
6937cb4e | 9733 | #: builtin/interpret-trailers.c:93 |
220c313c | 9734 | msgid "trim empty trailers" |
6937cb4e JX |
9735 | msgstr "删除空的尾部署名" |
9736 | ||
9737 | #: builtin/interpret-trailers.c:96 | |
9738 | msgid "where to place the new trailer" | |
9739 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 9740 | |
6937cb4e JX |
9741 | #: builtin/interpret-trailers.c:98 |
9742 | msgid "action if trailer already exists" | |
9743 | msgstr "当尾部署名已经存在时所采取的动作" | |
9744 | ||
9745 | #: builtin/interpret-trailers.c:100 | |
9746 | msgid "action if trailer is missing" | |
9747 | msgstr "当尾部署名缺失时所采取的动作" | |
9748 | ||
9749 | #: builtin/interpret-trailers.c:102 | |
9750 | msgid "output only the trailers" | |
9751 | msgstr "只输出尾部署名" | |
9752 | ||
9753 | #: builtin/interpret-trailers.c:103 | |
9754 | msgid "do not apply config rules" | |
9755 | msgstr "不要应用配置规则" | |
9756 | ||
9757 | #: builtin/interpret-trailers.c:104 | |
9758 | msgid "join whitespace-continued values" | |
9759 | msgstr "连接空白折行的值" | |
9760 | ||
9761 | #: builtin/interpret-trailers.c:105 | |
9762 | msgid "set parsing options" | |
9763 | msgstr "设置解析选项" | |
9764 | ||
9765 | #: builtin/interpret-trailers.c:107 | |
220c313c | 9766 | msgid "trailer" |
6937cb4e | 9767 | msgstr "尾部署名" |
220c313c | 9768 | |
6937cb4e | 9769 | #: builtin/interpret-trailers.c:108 |
220c313c | 9770 | msgid "trailer(s) to add" |
6937cb4e | 9771 | msgstr "要添加的尾部署名" |
220c313c | 9772 | |
6937cb4e JX |
9773 | #: builtin/interpret-trailers.c:117 |
9774 | msgid "--trailer with --only-input does not make sense" | |
9775 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
9776 | ||
9777 | #: builtin/interpret-trailers.c:127 | |
276ceeaa JX |
9778 | msgid "no input file given for in-place editing" |
9779 | msgstr "没有给出要原位编辑的文件" | |
9780 | ||
31e5e17b | 9781 | #: builtin/log.c:48 |
7aea43ff | 9782 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 9783 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 9784 | |
31e5e17b | 9785 | #: builtin/log.c:49 |
814ff314 JX |
9786 | msgid "git show [<options>] <object>..." |
9787 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 9788 | |
31e5e17b | 9789 | #: builtin/log.c:93 |
220c313c JX |
9790 | #, c-format |
9791 | msgid "invalid --decorate option: %s" | |
9792 | msgstr "无效的 --decorate 选项:%s" | |
9793 | ||
31e5e17b | 9794 | #: builtin/log.c:153 |
ef317cd5 | 9795 | msgid "suppress diff output" |
07432cef | 9796 | msgstr "不显示差异输出" |
ef317cd5 | 9797 | |
31e5e17b | 9798 | #: builtin/log.c:154 |
ef317cd5 | 9799 | msgid "show source" |
07432cef | 9800 | msgstr "显示源" |
ef317cd5 | 9801 | |
31e5e17b | 9802 | #: builtin/log.c:155 |
07432cef WS |
9803 | msgid "Use mail map file" |
9804 | msgstr "使用邮件映射文件" | |
9805 | ||
31e5e17b | 9806 | #: builtin/log.c:157 |
5809aa05 JX |
9807 | msgid "only decorate refs that match <pattern>" |
9808 | msgstr "只修饰与 <模式> 匹配的引用" | |
9809 | ||
31e5e17b | 9810 | #: builtin/log.c:159 |
5809aa05 JX |
9811 | msgid "do not decorate refs that match <pattern>" |
9812 | msgstr "不修饰和 <模式> 匹配的引用" | |
9813 | ||
31e5e17b | 9814 | #: builtin/log.c:160 |
ef317cd5 | 9815 | msgid "decorate options" |
07432cef | 9816 | msgstr "修饰选项" |
ef317cd5 | 9817 | |
31e5e17b | 9818 | #: builtin/log.c:163 |
220c313c JX |
9819 | msgid "Process line range n,m in file, counting from 1" |
9820 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
9821 | ||
31e5e17b | 9822 | #: builtin/log.c:259 |
c04f5ac3 JX |
9823 | #, c-format |
9824 | msgid "Final output: %d %s\n" | |
9825 | msgstr "最终输出:%d %s\n" | |
9826 | ||
31e5e17b | 9827 | #: builtin/log.c:510 |
220c313c JX |
9828 | #, c-format |
9829 | msgid "git show %s: bad file" | |
9830 | msgstr "git show %s: 损坏的文件" | |
9831 | ||
31e5e17b | 9832 | #: builtin/log.c:525 builtin/log.c:619 |
c04f5ac3 JX |
9833 | #, c-format |
9834 | msgid "Could not read object %s" | |
90e6ef53 | 9835 | msgstr "不能读取对象 %s" |
c04f5ac3 | 9836 | |
31e5e17b | 9837 | #: builtin/log.c:643 |
c04f5ac3 JX |
9838 | #, c-format |
9839 | msgid "Unknown type: %d" | |
9840 | msgstr "未知类型:%d" | |
9841 | ||
31e5e17b | 9842 | #: builtin/log.c:764 |
c04f5ac3 JX |
9843 | msgid "format.headers without value" |
9844 | msgstr "format.headers 没有值" | |
9845 | ||
31e5e17b | 9846 | #: builtin/log.c:865 |
c04f5ac3 JX |
9847 | msgid "name of output directory is too long" |
9848 | msgstr "输出目录名太长" | |
9849 | ||
31e5e17b | 9850 | #: builtin/log.c:881 |
c04f5ac3 JX |
9851 | #, c-format |
9852 | msgid "Cannot open patch file %s" | |
9853 | msgstr "无法打开补丁文件 %s" | |
9854 | ||
31e5e17b | 9855 | #: builtin/log.c:898 |
c04f5ac3 JX |
9856 | msgid "Need exactly one range." |
9857 | msgstr "只需要一个范围。" | |
9858 | ||
31e5e17b | 9859 | #: builtin/log.c:908 |
c04f5ac3 JX |
9860 | msgid "Not a range." |
9861 | msgstr "不是一个范围。" | |
9862 | ||
31e5e17b | 9863 | #: builtin/log.c:1014 |
c04f5ac3 JX |
9864 | msgid "Cover letter needs email format" |
9865 | msgstr "信封需要邮件地址格式" | |
9866 | ||
31e5e17b | 9867 | #: builtin/log.c:1095 |
c04f5ac3 JX |
9868 | #, c-format |
9869 | msgid "insane in-reply-to: %s" | |
9870 | msgstr "不正常的 in-reply-to:%s" | |
9871 | ||
31e5e17b | 9872 | #: builtin/log.c:1122 |
814ff314 JX |
9873 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
9874 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 9875 | |
31e5e17b | 9876 | #: builtin/log.c:1172 |
c04f5ac3 JX |
9877 | msgid "Two output directories?" |
9878 | msgstr "两个输出目录?" | |
9879 | ||
31e5e17b | 9880 | #: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 |
5b04ee3b JX |
9881 | #, c-format |
9882 | msgid "Unknown commit %s" | |
9883 | msgstr "未知提交 %s" | |
9884 | ||
31e5e17b | 9885 | #: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 |
5b04ee3b JX |
9886 | #, c-format |
9887 | msgid "Failed to resolve '%s' as a valid ref." | |
9888 | msgstr "无法解析 '%s' 为一个有效引用。" | |
9889 | ||
31e5e17b | 9890 | #: builtin/log.c:1294 |
5b04ee3b JX |
9891 | msgid "Could not find exact merge base." |
9892 | msgstr "不能找到准确的合并基线。" | |
9893 | ||
31e5e17b | 9894 | #: builtin/log.c:1298 |
5b04ee3b JX |
9895 | msgid "" |
9896 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
9897 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
9898 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
9899 | msgstr "" | |
9900 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 9901 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
58b6f078 | 9902 | "参数 --base=<基线提交> 手动指定一个基线提交。" |
5b04ee3b | 9903 | |
31e5e17b | 9904 | #: builtin/log.c:1318 |
5b04ee3b JX |
9905 | msgid "Failed to find exact merge base" |
9906 | msgstr "无法找到准确的合并基线" | |
9907 | ||
31e5e17b | 9908 | #: builtin/log.c:1329 |
5b04ee3b JX |
9909 | msgid "base commit should be the ancestor of revision list" |
9910 | msgstr "基线提交应该是版本列表的祖先" | |
9911 | ||
31e5e17b | 9912 | #: builtin/log.c:1333 |
5b04ee3b JX |
9913 | msgid "base commit shouldn't be in revision list" |
9914 | msgstr "基线提交不应该出现在版本列表中" | |
9915 | ||
31e5e17b | 9916 | #: builtin/log.c:1382 |
5b04ee3b | 9917 | msgid "cannot get patch id" |
aef18cc6 | 9918 | msgstr "无法得到补丁 id" |
5b04ee3b | 9919 | |
31e5e17b | 9920 | #: builtin/log.c:1441 |
ef317cd5 | 9921 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 9922 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 9923 | |
31e5e17b | 9924 | #: builtin/log.c:1444 |
ef317cd5 | 9925 | msgid "use [PATCH] even with multiple patches" |
07432cef | 9926 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 9927 | |
31e5e17b | 9928 | #: builtin/log.c:1448 |
ef317cd5 | 9929 | msgid "print patches to standard out" |
07432cef | 9930 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 9931 | |
31e5e17b | 9932 | #: builtin/log.c:1450 |
ef317cd5 | 9933 | msgid "generate a cover letter" |
07432cef | 9934 | msgstr "生成一封附信" |
c04f5ac3 | 9935 | |
31e5e17b | 9936 | #: builtin/log.c:1452 |
ef317cd5 | 9937 | msgid "use simple number sequence for output file names" |
07432cef | 9938 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 9939 | |
31e5e17b | 9940 | #: builtin/log.c:1453 |
ef317cd5 | 9941 | msgid "sfx" |
07432cef | 9942 | msgstr "后缀" |
ef317cd5 | 9943 | |
31e5e17b | 9944 | #: builtin/log.c:1454 |
ef317cd5 | 9945 | msgid "use <sfx> instead of '.patch'" |
07432cef | 9946 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 9947 | |
31e5e17b | 9948 | #: builtin/log.c:1456 |
ef317cd5 | 9949 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
9950 | msgstr "补丁以 <n> 开始编号,而不是1" |
9951 | ||
31e5e17b | 9952 | #: builtin/log.c:1458 |
07432cef WS |
9953 | msgid "mark the series as Nth re-roll" |
9954 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 9955 | |
31e5e17b | 9956 | #: builtin/log.c:1460 |
a0b6b246 JX |
9957 | msgid "Use [RFC PATCH] instead of [PATCH]" |
9958 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
9959 | ||
31e5e17b | 9960 | #: builtin/log.c:1463 |
ef317cd5 | 9961 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 9962 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 9963 | |
31e5e17b | 9964 | #: builtin/log.c:1466 |
ef317cd5 | 9965 | msgid "store resulting files in <dir>" |
d9d56b23 | 9966 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 9967 | |
31e5e17b | 9968 | #: builtin/log.c:1469 |
ef317cd5 | 9969 | msgid "don't strip/add [PATCH]" |
07432cef | 9970 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 9971 | |
31e5e17b | 9972 | #: builtin/log.c:1472 |
ef317cd5 | 9973 | msgid "don't output binary diffs" |
07432cef | 9974 | msgstr "不输出二进制差异" |
ef317cd5 | 9975 | |
31e5e17b | 9976 | #: builtin/log.c:1474 |
89f80d72 JX |
9977 | msgid "output all-zero hash in From header" |
9978 | msgstr "在 From 头信息中输出全为零的哈希值" | |
9979 | ||
31e5e17b | 9980 | #: builtin/log.c:1476 |
ef317cd5 | 9981 | msgid "don't include a patch matching a commit upstream" |
07432cef | 9982 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 9983 | |
31e5e17b | 9984 | #: builtin/log.c:1478 |
ef317cd5 | 9985 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 9986 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 9987 | |
31e5e17b | 9988 | #: builtin/log.c:1480 |
ef317cd5 | 9989 | msgid "Messaging" |
07432cef | 9990 | msgstr "邮件发送" |
ef317cd5 | 9991 | |
31e5e17b | 9992 | #: builtin/log.c:1481 |
ef317cd5 | 9993 | msgid "header" |
07432cef | 9994 | msgstr "header" |
ef317cd5 | 9995 | |
31e5e17b | 9996 | #: builtin/log.c:1482 |
ef317cd5 | 9997 | msgid "add email header" |
07432cef | 9998 | msgstr "添加邮件头" |
ef317cd5 | 9999 | |
31e5e17b | 10000 | #: builtin/log.c:1483 builtin/log.c:1485 |
ef317cd5 | 10001 | msgid "email" |
07432cef | 10002 | msgstr "邮件地址" |
ef317cd5 | 10003 | |
31e5e17b | 10004 | #: builtin/log.c:1483 |
ef317cd5 | 10005 | msgid "add To: header" |
07432cef | 10006 | msgstr "添加收件人" |
ef317cd5 | 10007 | |
31e5e17b | 10008 | #: builtin/log.c:1485 |
ef317cd5 | 10009 | msgid "add Cc: header" |
07432cef | 10010 | msgstr "添加抄送" |
ef317cd5 | 10011 | |
31e5e17b | 10012 | #: builtin/log.c:1487 |
2e8451e8 | 10013 | msgid "ident" |
d9d56b23 | 10014 | msgstr "标识" |
2e8451e8 | 10015 | |
31e5e17b | 10016 | #: builtin/log.c:1488 |
2e8451e8 | 10017 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 10018 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 10019 | |
31e5e17b | 10020 | #: builtin/log.c:1490 |
ef317cd5 | 10021 | msgid "message-id" |
d9d56b23 | 10022 | msgstr "邮件标识" |
ef317cd5 | 10023 | |
31e5e17b | 10024 | #: builtin/log.c:1491 |
ef317cd5 | 10025 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 10026 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 10027 | |
31e5e17b | 10028 | #: builtin/log.c:1492 builtin/log.c:1495 |
ef317cd5 | 10029 | msgid "boundary" |
07432cef | 10030 | msgstr "边界" |
ef317cd5 | 10031 | |
31e5e17b | 10032 | #: builtin/log.c:1493 |
ef317cd5 | 10033 | msgid "attach the patch" |
07432cef | 10034 | msgstr "附件方式添加补丁" |
ef317cd5 | 10035 | |
31e5e17b | 10036 | #: builtin/log.c:1496 |
ef317cd5 | 10037 | msgid "inline the patch" |
07432cef | 10038 | msgstr "内联显示补丁" |
ef317cd5 | 10039 | |
31e5e17b | 10040 | #: builtin/log.c:1500 |
ef317cd5 | 10041 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 10042 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 10043 | |
31e5e17b | 10044 | #: builtin/log.c:1502 |
ef317cd5 | 10045 | msgid "signature" |
07432cef | 10046 | msgstr "签名" |
ef317cd5 | 10047 | |
31e5e17b | 10048 | #: builtin/log.c:1503 |
ef317cd5 | 10049 | msgid "add a signature" |
07432cef | 10050 | msgstr "添加一个签名" |
ef317cd5 | 10051 | |
31e5e17b | 10052 | #: builtin/log.c:1504 |
5b04ee3b JX |
10053 | msgid "base-commit" |
10054 | msgstr "基线提交" | |
10055 | ||
31e5e17b | 10056 | #: builtin/log.c:1505 |
5b04ee3b JX |
10057 | msgid "add prerequisite tree info to the patch series" |
10058 | msgstr "为补丁列表添加前置树信息" | |
10059 | ||
31e5e17b | 10060 | #: builtin/log.c:1507 |
6acbf033 JX |
10061 | msgid "add a signature from a file" |
10062 | msgstr "从文件添加一个签名" | |
10063 | ||
31e5e17b | 10064 | #: builtin/log.c:1508 |
ef317cd5 | 10065 | msgid "don't print the patch filenames" |
07432cef | 10066 | msgstr "不要打印补丁文件名" |
ef317cd5 | 10067 | |
31e5e17b | 10068 | #: builtin/log.c:1510 |
6937cb4e JX |
10069 | msgid "show progress while generating patches" |
10070 | msgstr "在生成补丁时显示进度" | |
10071 | ||
31e5e17b | 10072 | #: builtin/log.c:1585 |
a4f16749 JX |
10073 | #, c-format |
10074 | msgid "invalid ident line: %s" | |
10075 | msgstr "包含无效的身份标识:%s" | |
10076 | ||
31e5e17b | 10077 | #: builtin/log.c:1600 |
c04f5ac3 JX |
10078 | msgid "-n and -k are mutually exclusive." |
10079 | msgstr "-n 和 -k 互斥。" | |
10080 | ||
31e5e17b | 10081 | #: builtin/log.c:1602 |
a0b6b246 JX |
10082 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." |
10083 | msgstr "--subject-prefix/--rfc 和 -k 互斥。" | |
c04f5ac3 | 10084 | |
31e5e17b | 10085 | #: builtin/log.c:1610 |
c04f5ac3 JX |
10086 | msgid "--name-only does not make sense" |
10087 | msgstr "--name-only 无意义" | |
10088 | ||
31e5e17b | 10089 | #: builtin/log.c:1612 |
c04f5ac3 JX |
10090 | msgid "--name-status does not make sense" |
10091 | msgstr "--name-status 无意义" | |
10092 | ||
31e5e17b | 10093 | #: builtin/log.c:1614 |
c04f5ac3 JX |
10094 | msgid "--check does not make sense" |
10095 | msgstr "--check 无意义" | |
10096 | ||
31e5e17b | 10097 | #: builtin/log.c:1646 |
c04f5ac3 JX |
10098 | msgid "standard output, or directory, which one?" |
10099 | msgstr "标准输出或目录,哪一个?" | |
10100 | ||
31e5e17b | 10101 | #: builtin/log.c:1648 |
c04f5ac3 JX |
10102 | #, c-format |
10103 | msgid "Could not create directory '%s'" | |
90e6ef53 | 10104 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 10105 | |
31e5e17b | 10106 | #: builtin/log.c:1741 |
6acbf033 JX |
10107 | #, c-format |
10108 | msgid "unable to read signature file '%s'" | |
10109 | msgstr "无法读取签名文件 '%s'" | |
10110 | ||
31e5e17b | 10111 | #: builtin/log.c:1773 |
6937cb4e JX |
10112 | msgid "Generating patches" |
10113 | msgstr "生成补丁" | |
10114 | ||
31e5e17b | 10115 | #: builtin/log.c:1817 |
c04f5ac3 JX |
10116 | msgid "Failed to create output files" |
10117 | msgstr "无法创建输出文件" | |
10118 | ||
31e5e17b | 10119 | #: builtin/log.c:1867 |
ef317cd5 | 10120 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 10121 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 10122 | |
31e5e17b | 10123 | #: builtin/log.c:1921 |
c04f5ac3 JX |
10124 | #, c-format |
10125 | msgid "" | |
10126 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 10127 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 10128 | |
5809aa05 | 10129 | #: builtin/ls-files.c:468 |
814ff314 JX |
10130 | msgid "git ls-files [<options>] [<file>...]" |
10131 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 10132 | |
5809aa05 | 10133 | #: builtin/ls-files.c:517 |
ef317cd5 | 10134 | msgid "identify the file status with tags" |
07432cef | 10135 | msgstr "用标签标识文件的状态" |
ef317cd5 | 10136 | |
5809aa05 | 10137 | #: builtin/ls-files.c:519 |
ef317cd5 | 10138 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 10139 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 10140 | |
5809aa05 JX |
10141 | #: builtin/ls-files.c:521 |
10142 | msgid "use lowercase letters for 'fsmonitor clean' files" | |
10143 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
10144 | ||
10145 | #: builtin/ls-files.c:523 | |
ef317cd5 | 10146 | msgid "show cached files in the output (default)" |
07432cef | 10147 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 10148 | |
5809aa05 | 10149 | #: builtin/ls-files.c:525 |
ef317cd5 | 10150 | msgid "show deleted files in the output" |
07432cef | 10151 | msgstr "显示已删除的文件" |
ef317cd5 | 10152 | |
5809aa05 | 10153 | #: builtin/ls-files.c:527 |
ef317cd5 | 10154 | msgid "show modified files in the output" |
07432cef | 10155 | msgstr "显示已修改的文件" |
ef317cd5 | 10156 | |
5809aa05 | 10157 | #: builtin/ls-files.c:529 |
ef317cd5 | 10158 | msgid "show other files in the output" |
07432cef | 10159 | msgstr "显示其它文件" |
ef317cd5 | 10160 | |
5809aa05 | 10161 | #: builtin/ls-files.c:531 |
ef317cd5 | 10162 | msgid "show ignored files in the output" |
07432cef | 10163 | msgstr "显示忽略的文件" |
ef317cd5 | 10164 | |
5809aa05 | 10165 | #: builtin/ls-files.c:534 |
ef317cd5 | 10166 | msgid "show staged contents' object name in the output" |
07432cef | 10167 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 10168 | |
5809aa05 | 10169 | #: builtin/ls-files.c:536 |
ef317cd5 | 10170 | msgid "show files on the filesystem that need to be removed" |
07432cef | 10171 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 10172 | |
5809aa05 | 10173 | #: builtin/ls-files.c:538 |
220c313c | 10174 | msgid "show 'other' directories' names only" |
07432cef | 10175 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 10176 | |
5809aa05 | 10177 | #: builtin/ls-files.c:540 |
276ceeaa JX |
10178 | msgid "show line endings of files" |
10179 | msgstr "显示文件换行符格式" | |
10180 | ||
5809aa05 | 10181 | #: builtin/ls-files.c:542 |
ef317cd5 | 10182 | msgid "don't show empty directories" |
07432cef | 10183 | msgstr "不显示空目录" |
ef317cd5 | 10184 | |
5809aa05 | 10185 | #: builtin/ls-files.c:545 |
ef317cd5 | 10186 | msgid "show unmerged files in the output" |
07432cef | 10187 | msgstr "显示未合并的文件" |
ef317cd5 | 10188 | |
5809aa05 | 10189 | #: builtin/ls-files.c:547 |
ef317cd5 | 10190 | msgid "show resolve-undo information" |
07432cef | 10191 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 10192 | |
5809aa05 | 10193 | #: builtin/ls-files.c:549 |
ef317cd5 | 10194 | msgid "skip files matching pattern" |
07432cef | 10195 | msgstr "匹配排除文件的模式" |
ef317cd5 | 10196 | |
5809aa05 | 10197 | #: builtin/ls-files.c:552 |
ef317cd5 | 10198 | msgid "exclude patterns are read from <file>" |
07432cef | 10199 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 10200 | |
5809aa05 | 10201 | #: builtin/ls-files.c:555 |
ef317cd5 | 10202 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 10203 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 10204 | |
5809aa05 | 10205 | #: builtin/ls-files.c:557 |
ef317cd5 | 10206 | msgid "add the standard git exclusions" |
07432cef | 10207 | msgstr "添加标准的 git 排除" |
ef317cd5 | 10208 | |
5809aa05 | 10209 | #: builtin/ls-files.c:560 |
ef317cd5 | 10210 | msgid "make the output relative to the project top directory" |
07432cef | 10211 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 10212 | |
5809aa05 | 10213 | #: builtin/ls-files.c:563 |
a0b6b246 JX |
10214 | msgid "recurse through submodules" |
10215 | msgstr "在子模组中递归" | |
10216 | ||
5809aa05 | 10217 | #: builtin/ls-files.c:565 |
ef317cd5 | 10218 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 10219 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 10220 | |
5809aa05 | 10221 | #: builtin/ls-files.c:566 |
ef317cd5 | 10222 | msgid "tree-ish" |
07432cef | 10223 | msgstr "树或提交" |
ef317cd5 | 10224 | |
5809aa05 | 10225 | #: builtin/ls-files.c:567 |
ef317cd5 | 10226 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 10227 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 10228 | |
5809aa05 | 10229 | #: builtin/ls-files.c:569 |
ef317cd5 | 10230 | msgid "show debugging data" |
07432cef | 10231 | msgstr "显示调试数据" |
ef317cd5 | 10232 | |
276ceeaa JX |
10233 | #: builtin/ls-remote.c:7 |
10234 | msgid "" | |
10235 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
10236 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
10237 | " [--symref] [<repository> [<refs>...]]" | |
10238 | msgstr "" | |
10239 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
10240 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
10241 | " [--symref] [<仓库> [<引用>...]]" | |
10242 | ||
87cb7997 | 10243 | #: builtin/ls-remote.c:52 |
276ceeaa JX |
10244 | msgid "do not print remote URL" |
10245 | msgstr "不打印远程 URL" | |
10246 | ||
87cb7997 | 10247 | #: builtin/ls-remote.c:53 builtin/ls-remote.c:55 |
276ceeaa JX |
10248 | msgid "exec" |
10249 | msgstr "exec" | |
10250 | ||
87cb7997 | 10251 | #: builtin/ls-remote.c:54 builtin/ls-remote.c:56 |
276ceeaa JX |
10252 | msgid "path of git-upload-pack on the remote host" |
10253 | msgstr "远程主机上的 git-upload-pack 路径" | |
10254 | ||
87cb7997 | 10255 | #: builtin/ls-remote.c:58 |
276ceeaa JX |
10256 | msgid "limit to tags" |
10257 | msgstr "仅限于标签" | |
10258 | ||
87cb7997 | 10259 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
10260 | msgid "limit to heads" |
10261 | msgstr "仅限于分支" | |
10262 | ||
87cb7997 | 10263 | #: builtin/ls-remote.c:60 |
276ceeaa JX |
10264 | msgid "do not show peeled tags" |
10265 | msgstr "不显示已解析的标签" | |
10266 | ||
87cb7997 | 10267 | #: builtin/ls-remote.c:62 |
276ceeaa JX |
10268 | msgid "take url.<base>.insteadOf into account" |
10269 | msgstr "参考 url.<base>.insteadOf 设置" | |
10270 | ||
87cb7997 | 10271 | #: builtin/ls-remote.c:64 |
276ceeaa JX |
10272 | msgid "exit with exit code 2 if no matching refs are found" |
10273 | msgstr "若未找到匹配的引用则以退出码2退出" | |
10274 | ||
31e5e17b | 10275 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
10276 | msgid "show underlying ref in addition to the object pointed by it" |
10277 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
10278 | ||
a4f16749 | 10279 | #: builtin/ls-tree.c:29 |
ef317cd5 | 10280 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 10281 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 10282 | |
a4f16749 | 10283 | #: builtin/ls-tree.c:127 |
ef317cd5 | 10284 | msgid "only show trees" |
07432cef | 10285 | msgstr "只显示树" |
ef317cd5 | 10286 | |
a4f16749 | 10287 | #: builtin/ls-tree.c:129 |
ef317cd5 | 10288 | msgid "recurse into subtrees" |
07432cef | 10289 | msgstr "递归到子树" |
ef317cd5 | 10290 | |
a4f16749 | 10291 | #: builtin/ls-tree.c:131 |
ef317cd5 | 10292 | msgid "show trees when recursing" |
07432cef | 10293 | msgstr "当递归时显示树" |
ef317cd5 | 10294 | |
a4f16749 | 10295 | #: builtin/ls-tree.c:134 |
ef317cd5 | 10296 | msgid "terminate entries with NUL byte" |
4375c10e | 10297 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 10298 | |
a4f16749 | 10299 | #: builtin/ls-tree.c:135 |
ef317cd5 | 10300 | msgid "include object size" |
07432cef | 10301 | msgstr "包括对象大小" |
ef317cd5 | 10302 | |
a4f16749 | 10303 | #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 |
ef317cd5 | 10304 | msgid "list only filenames" |
07432cef | 10305 | msgstr "只列出文件名" |
ef317cd5 | 10306 | |
a4f16749 | 10307 | #: builtin/ls-tree.c:142 |
ef317cd5 | 10308 | msgid "use full path names" |
07432cef | 10309 | msgstr "使用文件的全路径" |
ef317cd5 | 10310 | |
a4f16749 | 10311 | #: builtin/ls-tree.c:144 |
ef317cd5 | 10312 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 10313 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 10314 | |
a4f16749 JX |
10315 | #: builtin/mailsplit.c:241 |
10316 | #, c-format | |
10317 | msgid "empty mbox: '%s'" | |
10318 | msgstr "空的 mbox:'%s'" | |
10319 | ||
31e5e17b | 10320 | #: builtin/merge.c:49 |
814ff314 JX |
10321 | msgid "git merge [<options>] [<commit>...]" |
10322 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 10323 | |
31e5e17b | 10324 | #: builtin/merge.c:50 |
ef317cd5 | 10325 | msgid "git merge --abort" |
07432cef | 10326 | msgstr "git merge --abort" |
ef317cd5 | 10327 | |
31e5e17b | 10328 | #: builtin/merge.c:51 |
1a79b2f1 JX |
10329 | msgid "git merge --continue" |
10330 | msgstr "git merge --continue" | |
10331 | ||
31e5e17b | 10332 | #: builtin/merge.c:108 |
c04f5ac3 JX |
10333 | msgid "switch `m' requires a value" |
10334 | msgstr "开关 `m' 需要一个值" | |
10335 | ||
31e5e17b | 10336 | #: builtin/merge.c:145 |
c04f5ac3 JX |
10337 | #, c-format |
10338 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 10339 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 10340 | |
31e5e17b | 10341 | #: builtin/merge.c:146 |
c04f5ac3 JX |
10342 | #, c-format |
10343 | msgid "Available strategies are:" | |
10344 | msgstr "可用的策略有:" | |
10345 | ||
31e5e17b | 10346 | #: builtin/merge.c:151 |
c04f5ac3 JX |
10347 | #, c-format |
10348 | msgid "Available custom strategies are:" | |
10349 | msgstr "可用的自定义策略有:" | |
10350 | ||
31e5e17b | 10351 | #: builtin/merge.c:201 builtin/pull.c:137 |
ef317cd5 | 10352 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 10353 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 10354 | |
31e5e17b | 10355 | #: builtin/merge.c:204 builtin/pull.c:140 |
ef317cd5 | 10356 | msgid "show a diffstat at the end of the merge" |
07432cef | 10357 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 10358 | |
31e5e17b | 10359 | #: builtin/merge.c:205 builtin/pull.c:143 |
ef317cd5 | 10360 | msgid "(synonym to --stat)" |
07432cef | 10361 | msgstr "(和 --stat 同义)" |
ef317cd5 | 10362 | |
31e5e17b | 10363 | #: builtin/merge.c:207 builtin/pull.c:146 |
ef317cd5 | 10364 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 10365 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 10366 | |
31e5e17b | 10367 | #: builtin/merge.c:210 builtin/pull.c:152 |
ef317cd5 | 10368 | msgid "create a single commit instead of doing a merge" |
07432cef | 10369 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 10370 | |
31e5e17b | 10371 | #: builtin/merge.c:212 builtin/pull.c:155 |
ef317cd5 | 10372 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 10373 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 10374 | |
31e5e17b | 10375 | #: builtin/merge.c:214 builtin/pull.c:158 |
ef317cd5 | 10376 | msgid "edit message before committing" |
07432cef | 10377 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 10378 | |
31e5e17b | 10379 | #: builtin/merge.c:215 |
ef317cd5 | 10380 | msgid "allow fast-forward (default)" |
07432cef | 10381 | msgstr "允许快进(默认)" |
ef317cd5 | 10382 | |
31e5e17b | 10383 | #: builtin/merge.c:217 builtin/pull.c:164 |
ef317cd5 | 10384 | msgid "abort if fast-forward is not possible" |
07432cef | 10385 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 10386 | |
31e5e17b | 10387 | #: builtin/merge.c:221 builtin/pull.c:167 |
5c57d762 | 10388 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
10389 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
10390 | ||
31e5e17b | 10391 | #: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 |
a4f16749 | 10392 | #: builtin/revert.c:109 |
ef317cd5 | 10393 | msgid "strategy" |
07432cef | 10394 | msgstr "策略" |
ef317cd5 | 10395 | |
31e5e17b | 10396 | #: builtin/merge.c:223 builtin/pull.c:172 |
ef317cd5 | 10397 | msgid "merge strategy to use" |
07432cef | 10398 | msgstr "要使用的合并策略" |
ef317cd5 | 10399 | |
31e5e17b | 10400 | #: builtin/merge.c:224 builtin/pull.c:175 |
ef317cd5 | 10401 | msgid "option=value" |
07432cef | 10402 | msgstr "option=value" |
ef317cd5 | 10403 | |
31e5e17b | 10404 | #: builtin/merge.c:225 builtin/pull.c:176 |
ef317cd5 | 10405 | msgid "option for selected merge strategy" |
07432cef | 10406 | msgstr "所选的合并策略的选项" |
ef317cd5 | 10407 | |
31e5e17b | 10408 | #: builtin/merge.c:227 |
ef317cd5 | 10409 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 10410 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 10411 | |
31e5e17b | 10412 | #: builtin/merge.c:231 |
ef317cd5 | 10413 | msgid "abort the current in-progress merge" |
07432cef | 10414 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 10415 | |
31e5e17b | 10416 | #: builtin/merge.c:233 |
1a79b2f1 JX |
10417 | msgid "continue the current in-progress merge" |
10418 | msgstr "继续当前正在进行的合并" | |
10419 | ||
31e5e17b | 10420 | #: builtin/merge.c:235 builtin/pull.c:183 |
5b04ee3b JX |
10421 | msgid "allow merging unrelated histories" |
10422 | msgstr "允许合并不相关的历史" | |
10423 | ||
31e5e17b | 10424 | #: builtin/merge.c:241 |
6937cb4e JX |
10425 | msgid "verify commit-msg hook" |
10426 | msgstr "校验 commit-msg 钩子" | |
10427 | ||
31e5e17b | 10428 | #: builtin/merge.c:266 |
c04f5ac3 | 10429 | msgid "could not run stash." |
a4f16749 | 10430 | msgstr "不能运行贮藏。" |
c04f5ac3 | 10431 | |
31e5e17b | 10432 | #: builtin/merge.c:271 |
c04f5ac3 | 10433 | msgid "stash failed" |
a4f16749 | 10434 | msgstr "贮藏失败" |
c04f5ac3 | 10435 | |
31e5e17b | 10436 | #: builtin/merge.c:276 |
c04f5ac3 JX |
10437 | #, c-format |
10438 | msgid "not a valid object: %s" | |
10439 | msgstr "不是一个有效对象:%s" | |
10440 | ||
31e5e17b | 10441 | #: builtin/merge.c:298 builtin/merge.c:315 |
c04f5ac3 JX |
10442 | msgid "read-tree failed" |
10443 | msgstr "读取树失败" | |
10444 | ||
90e6ef53 | 10445 | # 译者:注意保持前导空格 |
31e5e17b | 10446 | #: builtin/merge.c:345 |
c04f5ac3 JX |
10447 | msgid " (nothing to squash)" |
10448 | msgstr " (无可压缩)" | |
10449 | ||
31e5e17b | 10450 | #: builtin/merge.c:356 |
c04f5ac3 JX |
10451 | #, c-format |
10452 | msgid "Squash commit -- not updating HEAD\n" | |
10453 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
10454 | ||
31e5e17b | 10455 | #: builtin/merge.c:406 |
c04f5ac3 JX |
10456 | #, c-format |
10457 | msgid "No merge message -- not updating HEAD\n" | |
10458 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
10459 | ||
31e5e17b | 10460 | #: builtin/merge.c:456 |
c04f5ac3 JX |
10461 | #, c-format |
10462 | msgid "'%s' does not point to a commit" | |
10463 | msgstr "'%s' 没有指向一个提交" | |
10464 | ||
31e5e17b | 10465 | #: builtin/merge.c:546 |
c04f5ac3 JX |
10466 | #, c-format |
10467 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 10468 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 10469 | |
31e5e17b | 10470 | #: builtin/merge.c:668 |
c04f5ac3 | 10471 | msgid "Not handling anything other than two heads merge." |
29004bbb | 10472 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 10473 | |
31e5e17b | 10474 | #: builtin/merge.c:682 |
c04f5ac3 JX |
10475 | #, c-format |
10476 | msgid "Unknown option for merge-recursive: -X%s" | |
10477 | msgstr "merge-recursive 的未知选项:-X%s" | |
10478 | ||
31e5e17b | 10479 | #: builtin/merge.c:697 |
c04f5ac3 JX |
10480 | #, c-format |
10481 | msgid "unable to write %s" | |
10482 | msgstr "不能写 %s" | |
10483 | ||
31e5e17b | 10484 | #: builtin/merge.c:749 |
c04f5ac3 JX |
10485 | #, c-format |
10486 | msgid "Could not read from '%s'" | |
10487 | msgstr "不能从 '%s' 读取" | |
10488 | ||
31e5e17b | 10489 | #: builtin/merge.c:758 |
c04f5ac3 JX |
10490 | #, c-format |
10491 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
10492 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
10493 | ||
31e5e17b | 10494 | #: builtin/merge.c:764 |
a77c07d9 | 10495 | #, c-format |
c04f5ac3 JX |
10496 | msgid "" |
10497 | "Please enter a commit message to explain why this merge is necessary,\n" | |
10498 | "especially if it merges an updated upstream into a topic branch.\n" | |
10499 | "\n" | |
a77c07d9 | 10500 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
10501 | "the commit.\n" |
10502 | msgstr "" | |
10503 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
10504 | "合并到主题分支。\n" | |
10505 | "\n" | |
a77c07d9 | 10506 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 10507 | |
31e5e17b | 10508 | #: builtin/merge.c:800 |
c04f5ac3 JX |
10509 | msgid "Empty commit message." |
10510 | msgstr "空提交信息。" | |
10511 | ||
31e5e17b | 10512 | #: builtin/merge.c:820 |
c04f5ac3 JX |
10513 | #, c-format |
10514 | msgid "Wonderful.\n" | |
10515 | msgstr "太棒了。\n" | |
10516 | ||
31e5e17b | 10517 | #: builtin/merge.c:873 |
c04f5ac3 JX |
10518 | #, c-format |
10519 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
10520 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
10521 | ||
31e5e17b | 10522 | #: builtin/merge.c:912 |
c04f5ac3 | 10523 | msgid "No current branch." |
90e6ef53 | 10524 | msgstr "没有当前分支。" |
c04f5ac3 | 10525 | |
31e5e17b | 10526 | #: builtin/merge.c:914 |
c04f5ac3 | 10527 | msgid "No remote for the current branch." |
160fb2b2 | 10528 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 10529 | |
31e5e17b | 10530 | #: builtin/merge.c:916 |
c04f5ac3 | 10531 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 10532 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 10533 | |
31e5e17b | 10534 | #: builtin/merge.c:921 |
170e9899 | 10535 | #, c-format |
2e8451e8 JX |
10536 | msgid "No remote-tracking branch for %s from %s" |
10537 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 10538 | |
31e5e17b | 10539 | #: builtin/merge.c:974 |
5c57d762 JX |
10540 | #, c-format |
10541 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 10542 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 10543 | |
31e5e17b | 10544 | #: builtin/merge.c:1076 |
5c57d762 JX |
10545 | #, c-format |
10546 | msgid "not something we can merge in %s: %s" | |
10547 | msgstr "不能在 %s 中合并:%s" | |
10548 | ||
31e5e17b | 10549 | #: builtin/merge.c:1110 |
5c57d762 JX |
10550 | msgid "not something we can merge" |
10551 | msgstr "不能合并" | |
10552 | ||
31e5e17b | 10553 | #: builtin/merge.c:1212 |
1a79b2f1 JX |
10554 | msgid "--abort expects no arguments" |
10555 | msgstr "--abort 不带参数" | |
10556 | ||
31e5e17b | 10557 | #: builtin/merge.c:1216 |
c04f5ac3 | 10558 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 10559 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 10560 | |
31e5e17b | 10561 | #: builtin/merge.c:1228 |
1a79b2f1 JX |
10562 | msgid "--continue expects no arguments" |
10563 | msgstr "--continue 不带参数" | |
10564 | ||
31e5e17b | 10565 | #: builtin/merge.c:1232 |
1a79b2f1 JX |
10566 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
10567 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
10568 | ||
31e5e17b | 10569 | #: builtin/merge.c:1248 |
c04f5ac3 JX |
10570 | msgid "" |
10571 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 10572 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
10573 | msgstr "" |
10574 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 10575 | "请在合并前先提交您的修改。" |
c04f5ac3 | 10576 | |
31e5e17b | 10577 | #: builtin/merge.c:1255 |
c04f5ac3 JX |
10578 | msgid "" |
10579 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 10580 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
10581 | msgstr "" |
10582 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 10583 | "请在合并前先提交您的修改。" |
c04f5ac3 | 10584 | |
31e5e17b | 10585 | #: builtin/merge.c:1258 |
c04f5ac3 JX |
10586 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
10587 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
10588 | ||
31e5e17b | 10589 | #: builtin/merge.c:1267 |
c04f5ac3 | 10590 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 10591 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 10592 | |
31e5e17b | 10593 | #: builtin/merge.c:1275 |
c04f5ac3 | 10594 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 10595 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 10596 | |
31e5e17b | 10597 | #: builtin/merge.c:1292 |
c04f5ac3 JX |
10598 | msgid "Squash commit into empty head not supported yet" |
10599 | msgstr "尚不支持到空分支的压缩提交" | |
10600 | ||
31e5e17b | 10601 | #: builtin/merge.c:1294 |
c04f5ac3 JX |
10602 | msgid "Non-fast-forward commit does not make sense into an empty head" |
10603 | msgstr "到空分支的非快进式提交没有意义" | |
10604 | ||
31e5e17b | 10605 | #: builtin/merge.c:1299 |
2e8451e8 JX |
10606 | #, c-format |
10607 | msgid "%s - not something we can merge" | |
10608 | msgstr "%s - 不能被合并" | |
10609 | ||
31e5e17b | 10610 | #: builtin/merge.c:1301 |
7aea43ff JX |
10611 | msgid "Can merge only exactly one commit into empty head" |
10612 | msgstr "只能将一个提交合并到空分支上" | |
10613 | ||
31e5e17b | 10614 | #: builtin/merge.c:1335 |
1003b3a5 JX |
10615 | #, c-format |
10616 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
10617 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
10618 | ||
31e5e17b | 10619 | #: builtin/merge.c:1338 |
1003b3a5 JX |
10620 | #, c-format |
10621 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
10622 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
10623 | ||
31e5e17b | 10624 | #: builtin/merge.c:1341 |
1003b3a5 JX |
10625 | #, c-format |
10626 | msgid "Commit %s does not have a GPG signature." | |
10627 | msgstr "提交 %s 没有一个 GPG 签名。" | |
10628 | ||
31e5e17b | 10629 | #: builtin/merge.c:1344 |
1003b3a5 JX |
10630 | #, c-format |
10631 | msgid "Commit %s has a good GPG signature by %s\n" | |
10632 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
10633 | ||
31e5e17b | 10634 | #: builtin/merge.c:1403 |
5b04ee3b JX |
10635 | msgid "refusing to merge unrelated histories" |
10636 | msgstr "拒绝合并无关的历史" | |
10637 | ||
31e5e17b | 10638 | #: builtin/merge.c:1412 |
6937cb4e | 10639 | msgid "Already up to date." |
5c57d762 JX |
10640 | msgstr "已经是最新的。" |
10641 | ||
31e5e17b | 10642 | #: builtin/merge.c:1422 |
c04f5ac3 JX |
10643 | #, c-format |
10644 | msgid "Updating %s..%s\n" | |
10645 | msgstr "更新 %s..%s\n" | |
10646 | ||
31e5e17b | 10647 | #: builtin/merge.c:1463 |
c04f5ac3 JX |
10648 | #, c-format |
10649 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 10650 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 10651 | |
31e5e17b | 10652 | #: builtin/merge.c:1470 |
c04f5ac3 JX |
10653 | #, c-format |
10654 | msgid "Nope.\n" | |
10655 | msgstr "无。\n" | |
10656 | ||
31e5e17b | 10657 | #: builtin/merge.c:1495 |
6937cb4e | 10658 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
10659 | msgstr "已经是最新的。耶!" |
10660 | ||
31e5e17b | 10661 | #: builtin/merge.c:1501 |
c04f5ac3 | 10662 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 10663 | msgstr "无法快进,终止。" |
c04f5ac3 | 10664 | |
31e5e17b | 10665 | #: builtin/merge.c:1524 builtin/merge.c:1603 |
c04f5ac3 JX |
10666 | #, c-format |
10667 | msgid "Rewinding the tree to pristine...\n" | |
10668 | msgstr "将树回滚至原始状态...\n" | |
10669 | ||
31e5e17b | 10670 | #: builtin/merge.c:1528 |
c04f5ac3 JX |
10671 | #, c-format |
10672 | msgid "Trying merge strategy %s...\n" | |
10673 | msgstr "尝试合并策略 %s...\n" | |
10674 | ||
31e5e17b | 10675 | #: builtin/merge.c:1594 |
c04f5ac3 JX |
10676 | #, c-format |
10677 | msgid "No merge strategy handled the merge.\n" | |
10678 | msgstr "没有合并策略处理此合并。\n" | |
10679 | ||
31e5e17b | 10680 | #: builtin/merge.c:1596 |
c04f5ac3 JX |
10681 | #, c-format |
10682 | msgid "Merge with strategy %s failed.\n" | |
10683 | msgstr "使用策略 %s 合并失败。\n" | |
10684 | ||
31e5e17b | 10685 | #: builtin/merge.c:1605 |
c04f5ac3 JX |
10686 | #, c-format |
10687 | msgid "Using the %s to prepare resolving by hand.\n" | |
10688 | msgstr "使用 %s 以准备手工解决。\n" | |
10689 | ||
31e5e17b | 10690 | #: builtin/merge.c:1617 |
c04f5ac3 JX |
10691 | #, c-format |
10692 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
10693 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
10694 | ||
a4f16749 | 10695 | #: builtin/merge-base.c:30 |
814ff314 JX |
10696 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
10697 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 10698 | |
a4f16749 | 10699 | #: builtin/merge-base.c:31 |
814ff314 JX |
10700 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
10701 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 10702 | |
a4f16749 | 10703 | #: builtin/merge-base.c:32 |
ef317cd5 | 10704 | msgid "git merge-base --independent <commit>..." |
07432cef | 10705 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 10706 | |
a4f16749 | 10707 | #: builtin/merge-base.c:33 |
ef317cd5 | 10708 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 10709 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 10710 | |
a4f16749 | 10711 | #: builtin/merge-base.c:34 |
cfff71a9 | 10712 | msgid "git merge-base --fork-point <ref> [<commit>]" |
d9d56b23 | 10713 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 10714 | |
5809aa05 | 10715 | #: builtin/merge-base.c:220 |
ef317cd5 | 10716 | msgid "output all common ancestors" |
07432cef | 10717 | msgstr "输出所有共同的祖先" |
ef317cd5 | 10718 | |
5809aa05 | 10719 | #: builtin/merge-base.c:222 |
ef317cd5 | 10720 | msgid "find ancestors for a single n-way merge" |
07432cef | 10721 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 10722 | |
5809aa05 | 10723 | #: builtin/merge-base.c:224 |
ef317cd5 | 10724 | msgid "list revs not reachable from others" |
07432cef | 10725 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 10726 | |
5809aa05 | 10727 | #: builtin/merge-base.c:226 |
ef317cd5 | 10728 | msgid "is the first one ancestor of the other?" |
07432cef | 10729 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 10730 | |
5809aa05 | 10731 | #: builtin/merge-base.c:228 |
cfff71a9 | 10732 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 10733 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 10734 | |
a4f16749 | 10735 | #: builtin/merge-file.c:9 |
ef317cd5 | 10736 | msgid "" |
814ff314 JX |
10737 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
10738 | "<orig-file> <file2>" | |
ef317cd5 | 10739 | msgstr "" |
814ff314 JX |
10740 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
10741 | "件> <文件2>" | |
ef317cd5 | 10742 | |
a4f16749 | 10743 | #: builtin/merge-file.c:33 |
ef317cd5 | 10744 | msgid "send results to standard output" |
07432cef | 10745 | msgstr "将结果发送到标准输出" |
ef317cd5 | 10746 | |
a4f16749 | 10747 | #: builtin/merge-file.c:34 |
ef317cd5 | 10748 | msgid "use a diff3 based merge" |
07432cef | 10749 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 10750 | |
a4f16749 | 10751 | #: builtin/merge-file.c:35 |
ef317cd5 | 10752 | msgid "for conflicts, use our version" |
07432cef | 10753 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 10754 | |
a4f16749 | 10755 | #: builtin/merge-file.c:37 |
ef317cd5 | 10756 | msgid "for conflicts, use their version" |
07432cef | 10757 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 10758 | |
a4f16749 | 10759 | #: builtin/merge-file.c:39 |
ef317cd5 | 10760 | msgid "for conflicts, use a union version" |
07432cef | 10761 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 10762 | |
a4f16749 | 10763 | #: builtin/merge-file.c:42 |
ef317cd5 | 10764 | msgid "for conflicts, use this marker size" |
07432cef | 10765 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 10766 | |
a4f16749 | 10767 | #: builtin/merge-file.c:43 |
ef317cd5 | 10768 | msgid "do not warn about conflicts" |
07432cef | 10769 | msgstr "不要警告冲突" |
ef317cd5 | 10770 | |
a4f16749 | 10771 | #: builtin/merge-file.c:45 |
814ff314 JX |
10772 | msgid "set labels for file1/orig-file/file2" |
10773 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 10774 | |
a0b6b246 JX |
10775 | #: builtin/merge-recursive.c:45 |
10776 | #, c-format | |
10777 | msgid "unknown option %s" | |
10778 | msgstr "未知选项 %s" | |
10779 | ||
10780 | #: builtin/merge-recursive.c:51 | |
10781 | #, c-format | |
10782 | msgid "could not parse object '%s'" | |
10783 | msgstr "不能解析对象 '%s'" | |
10784 | ||
10785 | #: builtin/merge-recursive.c:55 | |
10786 | #, c-format | |
10787 | msgid "cannot handle more than %d base. Ignoring %s." | |
10788 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
10789 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
10790 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
10791 | ||
10792 | #: builtin/merge-recursive.c:63 | |
10793 | msgid "not handling anything other than two heads merge." | |
10794 | msgstr "不能处理两个头合并之外的任何操作。" | |
10795 | ||
10796 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
10797 | #, c-format | |
10798 | msgid "could not resolve ref '%s'" | |
10799 | msgstr "无法解析引用 '%s'" | |
10800 | ||
10801 | #: builtin/merge-recursive.c:77 | |
10802 | #, c-format | |
10803 | msgid "Merging %s with %s\n" | |
10804 | msgstr "合并 %s 和 %s\n" | |
10805 | ||
276ceeaa | 10806 | #: builtin/mktree.c:65 |
ef317cd5 | 10807 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 10808 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 10809 | |
a4f16749 | 10810 | #: builtin/mktree.c:153 |
ef317cd5 | 10811 | msgid "input is NUL terminated" |
07432cef | 10812 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 10813 | |
a4f16749 | 10814 | #: builtin/mktree.c:154 builtin/write-tree.c:25 |
ef317cd5 | 10815 | msgid "allow missing objects" |
07432cef | 10816 | msgstr "允许丢失的对象" |
c04f5ac3 | 10817 | |
a4f16749 | 10818 | #: builtin/mktree.c:155 |
ef317cd5 | 10819 | msgid "allow creation of more than one tree" |
07432cef | 10820 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 10821 | |
a4f16749 | 10822 | #: builtin/mv.c:17 |
814ff314 JX |
10823 | msgid "git mv [<options>] <source>... <destination>" |
10824 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 10825 | |
a4f16749 | 10826 | #: builtin/mv.c:83 |
220c313c JX |
10827 | #, c-format |
10828 | msgid "Directory %s is in index and no submodule?" | |
10829 | msgstr "目录 %s 在索引中并且不是子模组?" | |
10830 | ||
6937cb4e | 10831 | #: builtin/mv.c:85 builtin/rm.c:289 |
220c313c | 10832 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 10833 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 10834 | |
a4f16749 | 10835 | #: builtin/mv.c:103 |
220c313c JX |
10836 | #, c-format |
10837 | msgid "%.*s is in index" | |
10838 | msgstr "%.*s 在索引中" | |
10839 | ||
a4f16749 | 10840 | #: builtin/mv.c:125 |
ef317cd5 | 10841 | msgid "force move/rename even if target exists" |
07432cef | 10842 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 10843 | |
31e5e17b | 10844 | #: builtin/mv.c:127 |
ef317cd5 | 10845 | msgid "skip move/rename errors" |
07432cef | 10846 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 10847 | |
31e5e17b | 10848 | #: builtin/mv.c:168 |
220c313c JX |
10849 | #, c-format |
10850 | msgid "destination '%s' is not a directory" | |
10851 | msgstr "目标 '%s' 不是一个目录" | |
10852 | ||
31e5e17b | 10853 | #: builtin/mv.c:179 |
c04f5ac3 JX |
10854 | #, c-format |
10855 | msgid "Checking rename of '%s' to '%s'\n" | |
10856 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
10857 | ||
31e5e17b | 10858 | #: builtin/mv.c:183 |
c04f5ac3 JX |
10859 | msgid "bad source" |
10860 | msgstr "坏的源" | |
10861 | ||
31e5e17b | 10862 | #: builtin/mv.c:186 |
c04f5ac3 JX |
10863 | msgid "can not move directory into itself" |
10864 | msgstr "不能将目录移动到自身" | |
10865 | ||
31e5e17b | 10866 | #: builtin/mv.c:189 |
c04f5ac3 JX |
10867 | msgid "cannot move directory over file" |
10868 | msgstr "不能将目录移动到文件" | |
10869 | ||
31e5e17b | 10870 | #: builtin/mv.c:198 |
c04f5ac3 JX |
10871 | msgid "source directory is empty" |
10872 | msgstr "源目录为空" | |
10873 | ||
31e5e17b | 10874 | #: builtin/mv.c:223 |
c04f5ac3 JX |
10875 | msgid "not under version control" |
10876 | msgstr "不在版本控制之下" | |
10877 | ||
31e5e17b | 10878 | #: builtin/mv.c:226 |
c04f5ac3 JX |
10879 | msgid "destination exists" |
10880 | msgstr "目标已存在" | |
10881 | ||
31e5e17b | 10882 | #: builtin/mv.c:234 |
c04f5ac3 JX |
10883 | #, c-format |
10884 | msgid "overwriting '%s'" | |
10885 | msgstr "覆盖 '%s'" | |
10886 | ||
31e5e17b | 10887 | #: builtin/mv.c:237 |
c04f5ac3 JX |
10888 | msgid "Cannot overwrite" |
10889 | msgstr "不能覆盖" | |
10890 | ||
31e5e17b | 10891 | #: builtin/mv.c:240 |
c04f5ac3 JX |
10892 | msgid "multiple sources for the same target" |
10893 | msgstr "同一目标具有多个源" | |
10894 | ||
31e5e17b | 10895 | #: builtin/mv.c:242 |
cfff71a9 JX |
10896 | msgid "destination directory does not exist" |
10897 | msgstr "目标目录不存在" | |
10898 | ||
31e5e17b | 10899 | #: builtin/mv.c:249 |
c04f5ac3 JX |
10900 | #, c-format |
10901 | msgid "%s, source=%s, destination=%s" | |
10902 | msgstr "%s,源=%s,目标=%s" | |
10903 | ||
31e5e17b | 10904 | #: builtin/mv.c:270 |
c04f5ac3 JX |
10905 | #, c-format |
10906 | msgid "Renaming %s to %s\n" | |
10907 | msgstr "重命名 %s 至 %s\n" | |
10908 | ||
31e5e17b | 10909 | #: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 |
c04f5ac3 JX |
10910 | #, c-format |
10911 | msgid "renaming '%s' failed" | |
10912 | msgstr "重命名 '%s' 失败" | |
10913 | ||
a4f16749 | 10914 | #: builtin/name-rev.c:338 |
814ff314 JX |
10915 | msgid "git name-rev [<options>] <commit>..." |
10916 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 10917 | |
a4f16749 | 10918 | #: builtin/name-rev.c:339 |
814ff314 JX |
10919 | msgid "git name-rev [<options>] --all" |
10920 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 10921 | |
a4f16749 | 10922 | #: builtin/name-rev.c:340 |
814ff314 JX |
10923 | msgid "git name-rev [<options>] --stdin" |
10924 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 10925 | |
a4f16749 | 10926 | #: builtin/name-rev.c:395 |
ef317cd5 | 10927 | msgid "print only names (no SHA-1)" |
07432cef | 10928 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 10929 | |
a4f16749 | 10930 | #: builtin/name-rev.c:396 |
ef317cd5 | 10931 | msgid "only use tags to name the commits" |
55a16ee4 | 10932 | msgstr "只使用标签来命名提交" |
ef317cd5 | 10933 | |
a4f16749 | 10934 | #: builtin/name-rev.c:398 |
ef317cd5 | 10935 | msgid "only use refs matching <pattern>" |
07432cef | 10936 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 10937 | |
a4f16749 | 10938 | #: builtin/name-rev.c:400 |
87cb7997 JX |
10939 | msgid "ignore refs matching <pattern>" |
10940 | msgstr "忽略和 <模式> 相匹配的引用" | |
10941 | ||
a4f16749 | 10942 | #: builtin/name-rev.c:402 |
ef317cd5 | 10943 | msgid "list all commits reachable from all refs" |
07432cef | 10944 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 10945 | |
a4f16749 | 10946 | #: builtin/name-rev.c:403 |
ef317cd5 | 10947 | msgid "read from stdin" |
07432cef | 10948 | msgstr "从标准输入读取" |
ef317cd5 | 10949 | |
a4f16749 | 10950 | #: builtin/name-rev.c:404 |
90314792 JX |
10951 | msgid "allow to print `undefined` names (default)" |
10952 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 10953 | |
a4f16749 | 10954 | #: builtin/name-rev.c:410 |
2e8451e8 | 10955 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 10956 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 10957 | |
a4f16749 | 10958 | #: builtin/notes.c:26 |
814ff314 | 10959 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 10960 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 10961 | |
a4f16749 | 10962 | #: builtin/notes.c:27 |
ef317cd5 | 10963 | msgid "" |
814ff314 | 10964 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 10965 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 10966 | msgstr "" |
04cb2f28 JX |
10967 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
10968 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 10969 | |
a4f16749 | 10970 | #: builtin/notes.c:28 |
814ff314 | 10971 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 10972 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 10973 | |
a4f16749 | 10974 | #: builtin/notes.c:29 |
ef317cd5 | 10975 | msgid "" |
814ff314 | 10976 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 10977 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 10978 | msgstr "" |
04cb2f28 JX |
10979 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
10980 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 10981 | |
a4f16749 | 10982 | #: builtin/notes.c:30 |
814ff314 | 10983 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 10984 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 10985 | |
a4f16749 | 10986 | #: builtin/notes.c:31 |
814ff314 | 10987 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 10988 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 10989 | |
a4f16749 | 10990 | #: builtin/notes.c:32 |
ef317cd5 | 10991 | msgid "" |
814ff314 | 10992 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 10993 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 10994 | |
a4f16749 | 10995 | #: builtin/notes.c:33 |
ef317cd5 | 10996 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 10997 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 10998 | |
a4f16749 | 10999 | #: builtin/notes.c:34 |
ef317cd5 | 11000 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 11001 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 11002 | |
a4f16749 | 11003 | #: builtin/notes.c:35 |
814ff314 | 11004 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 11005 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 11006 | |
a4f16749 | 11007 | #: builtin/notes.c:36 |
5809aa05 JX |
11008 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
11009 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 11010 | |
a4f16749 | 11011 | #: builtin/notes.c:37 |
814ff314 | 11012 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 11013 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 11014 | |
a4f16749 | 11015 | #: builtin/notes.c:42 |
ef317cd5 | 11016 | msgid "git notes [list [<object>]]" |
07432cef | 11017 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 11018 | |
a4f16749 | 11019 | #: builtin/notes.c:47 |
ef317cd5 | 11020 | msgid "git notes add [<options>] [<object>]" |
07432cef | 11021 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 11022 | |
a4f16749 | 11023 | #: builtin/notes.c:52 |
ef317cd5 | 11024 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 11025 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 11026 | |
a4f16749 | 11027 | #: builtin/notes.c:53 |
ef317cd5 | 11028 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 11029 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 11030 | |
a4f16749 | 11031 | #: builtin/notes.c:58 |
ef317cd5 | 11032 | msgid "git notes append [<options>] [<object>]" |
07432cef | 11033 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 11034 | |
a4f16749 | 11035 | #: builtin/notes.c:63 |
ef317cd5 | 11036 | msgid "git notes edit [<object>]" |
07432cef | 11037 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 11038 | |
a4f16749 | 11039 | #: builtin/notes.c:68 |
ef317cd5 | 11040 | msgid "git notes show [<object>]" |
07432cef | 11041 | msgstr "git notes show [<对象>]" |
ef317cd5 | 11042 | |
a4f16749 | 11043 | #: builtin/notes.c:73 |
814ff314 | 11044 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 11045 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 11046 | |
a4f16749 | 11047 | #: builtin/notes.c:74 |
ef317cd5 | 11048 | msgid "git notes merge --commit [<options>]" |
07432cef | 11049 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 11050 | |
a4f16749 | 11051 | #: builtin/notes.c:75 |
ef317cd5 | 11052 | msgid "git notes merge --abort [<options>]" |
07432cef | 11053 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 11054 | |
a4f16749 | 11055 | #: builtin/notes.c:80 |
ef317cd5 | 11056 | msgid "git notes remove [<object>]" |
07432cef | 11057 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 11058 | |
a4f16749 | 11059 | #: builtin/notes.c:85 |
ef317cd5 | 11060 | msgid "git notes prune [<options>]" |
07432cef | 11061 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 11062 | |
a4f16749 | 11063 | #: builtin/notes.c:90 |
ef317cd5 | 11064 | msgid "git notes get-ref" |
07432cef | 11065 | msgstr "git notes get-ref" |
ef317cd5 | 11066 | |
a4f16749 | 11067 | #: builtin/notes.c:95 |
5c57d762 JX |
11068 | msgid "Write/edit the notes for the following object:" |
11069 | msgstr "为下面的对象写/编辑说明:" | |
11070 | ||
a4f16749 | 11071 | #: builtin/notes.c:148 |
c04f5ac3 JX |
11072 | #, c-format |
11073 | msgid "unable to start 'show' for object '%s'" | |
11074 | msgstr "不能为对象 '%s' 开始 'show'" | |
11075 | ||
a4f16749 | 11076 | #: builtin/notes.c:152 |
a77c07d9 JX |
11077 | msgid "could not read 'show' output" |
11078 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 11079 | |
a4f16749 | 11080 | #: builtin/notes.c:160 |
c04f5ac3 JX |
11081 | #, c-format |
11082 | msgid "failed to finish 'show' for object '%s'" | |
11083 | msgstr "无法为对象 '%s' 完成 'show'" | |
11084 | ||
a4f16749 | 11085 | #: builtin/notes.c:195 |
a0b6b246 | 11086 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
11087 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
11088 | ||
a4f16749 | 11089 | #: builtin/notes.c:204 |
c04f5ac3 JX |
11090 | msgid "unable to write note object" |
11091 | msgstr "不能写注解对象" | |
11092 | ||
a4f16749 | 11093 | #: builtin/notes.c:206 |
c04f5ac3 | 11094 | #, c-format |
a0b6b246 | 11095 | msgid "the note contents have been left in %s" |
220c313c | 11096 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 11097 | |
31e5e17b | 11098 | #: builtin/notes.c:234 builtin/tag.c:506 |
c04f5ac3 JX |
11099 | #, c-format |
11100 | msgid "cannot read '%s'" | |
11101 | msgstr "不能读取 '%s'" | |
11102 | ||
31e5e17b | 11103 | #: builtin/notes.c:236 builtin/tag.c:509 |
c04f5ac3 JX |
11104 | #, c-format |
11105 | msgid "could not open or read '%s'" | |
11106 | msgstr "不能打开或读取 '%s'" | |
11107 | ||
a4f16749 | 11108 | #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 |
6937cb4e JX |
11109 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 |
11110 | #: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 | |
a0b6b246 JX |
11111 | #, c-format |
11112 | msgid "failed to resolve '%s' as a valid ref." | |
11113 | msgstr "无法解析 '%s' 为一个有效引用。" | |
11114 | ||
a4f16749 | 11115 | #: builtin/notes.c:258 |
c04f5ac3 | 11116 | #, c-format |
a0b6b246 | 11117 | msgid "failed to read object '%s'." |
c04f5ac3 JX |
11118 | msgstr "无法读取对象 '%s'。" |
11119 | ||
a4f16749 | 11120 | #: builtin/notes.c:262 |
6c94aba5 | 11121 | #, c-format |
a0b6b246 JX |
11122 | msgid "cannot read note data from non-blob object '%s'." |
11123 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
11124 | ||
a4f16749 | 11125 | #: builtin/notes.c:302 |
a0b6b246 JX |
11126 | #, c-format |
11127 | msgid "malformed input line: '%s'." | |
11128 | msgstr "非法的输入行:'%s'。" | |
11129 | ||
a4f16749 | 11130 | #: builtin/notes.c:317 |
a0b6b246 JX |
11131 | #, c-format |
11132 | msgid "failed to copy notes from '%s' to '%s'" | |
11133 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 11134 | |
a4f16749 JX |
11135 | #. TRANSLATORS: the first %s will be replaced by a git |
11136 | #. notes command: 'add', 'merge', 'remove', etc. | |
11137 | #. | |
6937cb4e | 11138 | #: builtin/notes.c:349 |
a0b6b246 JX |
11139 | #, c-format |
11140 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
11141 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
11142 | ||
6937cb4e JX |
11143 | #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 |
11144 | #: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 | |
11145 | #: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 | |
c04f5ac3 JX |
11146 | msgid "too many parameters" |
11147 | msgstr "参数太多" | |
11148 | ||
6937cb4e | 11149 | #: builtin/notes.c:382 builtin/notes.c:668 |
c04f5ac3 | 11150 | #, c-format |
a0b6b246 | 11151 | msgid "no note found for object %s." |
c04f5ac3 JX |
11152 | msgstr "未发现对象 %s 的注解。" |
11153 | ||
6937cb4e | 11154 | #: builtin/notes.c:403 builtin/notes.c:566 |
ef317cd5 | 11155 | msgid "note contents as a string" |
07432cef | 11156 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 11157 | |
6937cb4e | 11158 | #: builtin/notes.c:406 builtin/notes.c:569 |
ef317cd5 | 11159 | msgid "note contents in a file" |
07432cef | 11160 | msgstr "注解内容到一个文件中" |
ef317cd5 | 11161 | |
6937cb4e | 11162 | #: builtin/notes.c:409 builtin/notes.c:572 |
ef317cd5 | 11163 | msgid "reuse and edit specified note object" |
07432cef | 11164 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 11165 | |
6937cb4e | 11166 | #: builtin/notes.c:412 builtin/notes.c:575 |
ef317cd5 | 11167 | msgid "reuse specified note object" |
07432cef | 11168 | msgstr "重用指定的注解对象" |
ef317cd5 | 11169 | |
6937cb4e | 11170 | #: builtin/notes.c:415 builtin/notes.c:578 |
04cb2f28 JX |
11171 | msgid "allow storing empty note" |
11172 | msgstr "允许保存空白注释" | |
11173 | ||
6937cb4e | 11174 | #: builtin/notes.c:416 builtin/notes.c:487 |
ef317cd5 | 11175 | msgid "replace existing notes" |
07432cef | 11176 | msgstr "替换已存在的注解" |
ef317cd5 | 11177 | |
6937cb4e | 11178 | #: builtin/notes.c:441 |
c04f5ac3 JX |
11179 | #, c-format |
11180 | msgid "" | |
11181 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
11182 | "existing notes" | |
11183 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
11184 | ||
6937cb4e | 11185 | #: builtin/notes.c:456 builtin/notes.c:535 |
c04f5ac3 JX |
11186 | #, c-format |
11187 | msgid "Overwriting existing notes for object %s\n" | |
11188 | msgstr "覆盖对象 %s 现存注解\n" | |
11189 | ||
6937cb4e | 11190 | #: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 |
04cb2f28 JX |
11191 | #, c-format |
11192 | msgid "Removing note for object %s\n" | |
11193 | msgstr "删除对象 %s 的注解\n" | |
11194 | ||
6937cb4e | 11195 | #: builtin/notes.c:488 |
ef317cd5 | 11196 | msgid "read objects from stdin" |
07432cef | 11197 | msgstr "从标准输入读取对象" |
ef317cd5 | 11198 | |
6937cb4e | 11199 | #: builtin/notes.c:490 |
ef317cd5 | 11200 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 11201 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 11202 | |
6937cb4e | 11203 | #: builtin/notes.c:508 |
c04f5ac3 JX |
11204 | msgid "too few parameters" |
11205 | msgstr "参数太少" | |
11206 | ||
6937cb4e | 11207 | #: builtin/notes.c:529 |
c04f5ac3 JX |
11208 | #, c-format |
11209 | msgid "" | |
11210 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
11211 | "existing notes" | |
11212 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
11213 | ||
6937cb4e | 11214 | #: builtin/notes.c:541 |
c04f5ac3 | 11215 | #, c-format |
a0b6b246 | 11216 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
11217 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
11218 | ||
6937cb4e | 11219 | #: builtin/notes.c:593 |
ef317cd5 JX |
11220 | #, c-format |
11221 | msgid "" | |
11222 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
11223 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
11224 | msgstr "" | |
11225 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
11226 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
11227 | ||
6937cb4e | 11228 | #: builtin/notes.c:688 |
a0b6b246 JX |
11229 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
11230 | msgstr "无法删除引用 NOTES_MERGE_PARTIAL" | |
11231 | ||
6937cb4e | 11232 | #: builtin/notes.c:690 |
a0b6b246 JX |
11233 | msgid "failed to delete ref NOTES_MERGE_REF" |
11234 | msgstr "无法删除引用 NOTES_MERGE_REF" | |
11235 | ||
6937cb4e | 11236 | #: builtin/notes.c:692 |
a0b6b246 JX |
11237 | msgid "failed to remove 'git notes merge' worktree" |
11238 | msgstr "无法删除 'git notes merge' 工作区" | |
11239 | ||
6937cb4e | 11240 | #: builtin/notes.c:712 |
a0b6b246 JX |
11241 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
11242 | msgstr "无法读取引用 NOTES_MERGE_PARTIAL" | |
11243 | ||
6937cb4e | 11244 | #: builtin/notes.c:714 |
a0b6b246 JX |
11245 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
11246 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
11247 | ||
6937cb4e | 11248 | #: builtin/notes.c:716 |
a0b6b246 JX |
11249 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
11250 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
11251 | ||
6937cb4e | 11252 | #: builtin/notes.c:729 |
a0b6b246 JX |
11253 | msgid "failed to resolve NOTES_MERGE_REF" |
11254 | msgstr "无法解析 NOTES_MERGE_REF" | |
11255 | ||
6937cb4e | 11256 | #: builtin/notes.c:732 |
a0b6b246 JX |
11257 | msgid "failed to finalize notes merge" |
11258 | msgstr "无法完成注解合并" | |
11259 | ||
6937cb4e | 11260 | #: builtin/notes.c:758 |
5c57d762 JX |
11261 | #, c-format |
11262 | msgid "unknown notes merge strategy %s" | |
11263 | msgstr "未知的注解合并策略 %s" | |
11264 | ||
6937cb4e | 11265 | #: builtin/notes.c:774 |
ef317cd5 | 11266 | msgid "General options" |
07432cef | 11267 | msgstr "通用选项" |
ef317cd5 | 11268 | |
6937cb4e | 11269 | #: builtin/notes.c:776 |
ef317cd5 | 11270 | msgid "Merge options" |
07432cef | 11271 | msgstr "合并选项" |
ef317cd5 | 11272 | |
6937cb4e | 11273 | #: builtin/notes.c:778 |
ef317cd5 JX |
11274 | msgid "" |
11275 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
11276 | "cat_sort_uniq)" | |
07432cef | 11277 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 11278 | |
6937cb4e | 11279 | #: builtin/notes.c:780 |
ef317cd5 | 11280 | msgid "Committing unmerged notes" |
07432cef | 11281 | msgstr "提交未合并的注解" |
ef317cd5 | 11282 | |
6937cb4e | 11283 | #: builtin/notes.c:782 |
ef317cd5 | 11284 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 11285 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 11286 | |
6937cb4e | 11287 | #: builtin/notes.c:784 |
ef317cd5 | 11288 | msgid "Aborting notes merge resolution" |
07432cef | 11289 | msgstr "中止注解合并的方案" |
ef317cd5 | 11290 | |
6937cb4e | 11291 | #: builtin/notes.c:786 |
ef317cd5 | 11292 | msgid "abort notes merge" |
07432cef | 11293 | msgstr "中止注解合并" |
ef317cd5 | 11294 | |
6937cb4e | 11295 | #: builtin/notes.c:797 |
5c57d762 JX |
11296 | msgid "cannot mix --commit, --abort or -s/--strategy" |
11297 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
11298 | ||
6937cb4e | 11299 | #: builtin/notes.c:802 |
a0b6b246 | 11300 | msgid "must specify a notes ref to merge" |
9a4b694c | 11301 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 11302 | |
6937cb4e | 11303 | #: builtin/notes.c:826 |
5c57d762 | 11304 | #, c-format |
a0b6b246 | 11305 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
11306 | msgstr "未知的 -s/--strategy:%s" |
11307 | ||
6937cb4e | 11308 | #: builtin/notes.c:863 |
1b7f4a34 | 11309 | #, c-format |
a0b6b246 JX |
11310 | msgid "a notes merge into %s is already in-progress at %s" |
11311 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 11312 | |
6937cb4e | 11313 | #: builtin/notes.c:866 |
5c57d762 | 11314 | #, c-format |
a0b6b246 JX |
11315 | msgid "failed to store link to current notes ref (%s)" |
11316 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 11317 | |
6937cb4e | 11318 | #: builtin/notes.c:868 |
5c57d762 JX |
11319 | #, c-format |
11320 | msgid "" | |
11321 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
11322 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
11323 | "abort'.\n" | |
a0b6b246 JX |
11324 | msgstr "" |
11325 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
11326 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 11327 | |
6937cb4e | 11328 | #: builtin/notes.c:890 |
ef317cd5 JX |
11329 | #, c-format |
11330 | msgid "Object %s has no note\n" | |
11331 | msgstr "对象 %s 没有注解\n" | |
11332 | ||
6937cb4e | 11333 | #: builtin/notes.c:902 |
ef317cd5 | 11334 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 11335 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 11336 | |
6937cb4e | 11337 | #: builtin/notes.c:905 |
ef317cd5 | 11338 | msgid "read object names from the standard input" |
07432cef | 11339 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 11340 | |
31e5e17b | 11341 | #: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 |
5c57d762 JX |
11342 | msgid "do not remove, show only" |
11343 | msgstr "不删除,只显示" | |
11344 | ||
6937cb4e | 11345 | #: builtin/notes.c:944 |
5c57d762 JX |
11346 | msgid "report pruned notes" |
11347 | msgstr "报告清除的注解" | |
11348 | ||
6937cb4e | 11349 | #: builtin/notes.c:986 |
6c94aba5 | 11350 | msgid "notes-ref" |
07432cef | 11351 | msgstr "注解引用" |
ef317cd5 | 11352 | |
6937cb4e | 11353 | #: builtin/notes.c:987 |
814ff314 | 11354 | msgid "use notes from <notes-ref>" |
07432cef | 11355 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 11356 | |
6937cb4e | 11357 | #: builtin/notes.c:1022 |
ef317cd5 | 11358 | #, c-format |
a0b6b246 | 11359 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
11360 | msgstr "未知子命令:%s" |
11361 | ||
5809aa05 | 11362 | #: builtin/pack-objects.c:33 |
1b7f4a34 JX |
11363 | msgid "" |
11364 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
11365 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 11366 | |
5809aa05 | 11367 | #: builtin/pack-objects.c:34 |
1b7f4a34 JX |
11368 | msgid "" |
11369 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 11370 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 11371 | |
31e5e17b | 11372 | #: builtin/pack-objects.c:195 builtin/pack-objects.c:198 |
ef317cd5 JX |
11373 | #, c-format |
11374 | msgid "deflate error (%d)" | |
11375 | msgstr "压缩错误 (%d)" | |
11376 | ||
31e5e17b | 11377 | #: builtin/pack-objects.c:791 |
5b04ee3b JX |
11378 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
11379 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
11380 | ||
31e5e17b | 11381 | #: builtin/pack-objects.c:804 |
6c94aba5 JX |
11382 | msgid "Writing objects" |
11383 | msgstr "写入对象中" | |
11384 | ||
31e5e17b | 11385 | #: builtin/pack-objects.c:1084 |
6c94aba5 JX |
11386 | msgid "disabling bitmap writing, as some objects are not being packed" |
11387 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
11388 | ||
31e5e17b | 11389 | #: builtin/pack-objects.c:2454 |
6c94aba5 JX |
11390 | msgid "Compressing objects" |
11391 | msgstr "压缩对象中" | |
11392 | ||
31e5e17b | 11393 | #: builtin/pack-objects.c:2625 |
5809aa05 JX |
11394 | msgid "invalid value for --missing" |
11395 | msgstr "选项 --missing 的值无效" | |
11396 | ||
31e5e17b | 11397 | #: builtin/pack-objects.c:2928 |
ef317cd5 JX |
11398 | #, c-format |
11399 | msgid "unsupported index version %s" | |
11400 | msgstr "不支持的索引版本 %s" | |
11401 | ||
31e5e17b | 11402 | #: builtin/pack-objects.c:2932 |
ef317cd5 JX |
11403 | #, c-format |
11404 | msgid "bad index version '%s'" | |
11405 | msgstr "坏的索引版本 '%s'" | |
11406 | ||
31e5e17b | 11407 | #: builtin/pack-objects.c:2962 |
ef317cd5 | 11408 | msgid "do not show progress meter" |
07432cef | 11409 | msgstr "不显示进度表" |
ef317cd5 | 11410 | |
31e5e17b | 11411 | #: builtin/pack-objects.c:2964 |
ef317cd5 | 11412 | msgid "show progress meter" |
07432cef | 11413 | msgstr "显示进度表" |
ef317cd5 | 11414 | |
31e5e17b | 11415 | #: builtin/pack-objects.c:2966 |
ef317cd5 | 11416 | msgid "show progress meter during object writing phase" |
07432cef | 11417 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 11418 | |
31e5e17b | 11419 | #: builtin/pack-objects.c:2969 |
ef317cd5 | 11420 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 11421 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 11422 | |
31e5e17b | 11423 | #: builtin/pack-objects.c:2970 |
ef317cd5 | 11424 | msgid "version[,offset]" |
07432cef | 11425 | msgstr "版本[,偏移]" |
ef317cd5 | 11426 | |
31e5e17b | 11427 | #: builtin/pack-objects.c:2971 |
ef317cd5 | 11428 | msgid "write the pack index file in the specified idx format version" |
07432cef | 11429 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 11430 | |
31e5e17b | 11431 | #: builtin/pack-objects.c:2974 |
ef317cd5 | 11432 | msgid "maximum size of each output pack file" |
07432cef | 11433 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 11434 | |
31e5e17b | 11435 | #: builtin/pack-objects.c:2976 |
ef317cd5 | 11436 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 11437 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 11438 | |
31e5e17b | 11439 | #: builtin/pack-objects.c:2978 |
ef317cd5 | 11440 | msgid "ignore packed objects" |
07432cef | 11441 | msgstr "忽略包对象" |
ef317cd5 | 11442 | |
31e5e17b | 11443 | #: builtin/pack-objects.c:2980 |
ef317cd5 | 11444 | msgid "limit pack window by objects" |
07432cef | 11445 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 11446 | |
31e5e17b | 11447 | #: builtin/pack-objects.c:2982 |
ef317cd5 | 11448 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 11449 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 11450 | |
31e5e17b | 11451 | #: builtin/pack-objects.c:2984 |
ef317cd5 | 11452 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 11453 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 11454 | |
31e5e17b | 11455 | #: builtin/pack-objects.c:2986 |
ef317cd5 | 11456 | msgid "reuse existing deltas" |
07432cef | 11457 | msgstr "重用已存在的 deltas" |
ef317cd5 | 11458 | |
31e5e17b | 11459 | #: builtin/pack-objects.c:2988 |
ef317cd5 | 11460 | msgid "reuse existing objects" |
07432cef | 11461 | msgstr "重用已存在的对象" |
ef317cd5 | 11462 | |
31e5e17b | 11463 | #: builtin/pack-objects.c:2990 |
ef317cd5 | 11464 | msgid "use OFS_DELTA objects" |
07432cef | 11465 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 11466 | |
31e5e17b | 11467 | #: builtin/pack-objects.c:2992 |
ef317cd5 | 11468 | msgid "use threads when searching for best delta matches" |
07432cef | 11469 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 11470 | |
31e5e17b | 11471 | #: builtin/pack-objects.c:2994 |
ef317cd5 | 11472 | msgid "do not create an empty pack output" |
07432cef | 11473 | msgstr "不创建空的包输出" |
ef317cd5 | 11474 | |
31e5e17b | 11475 | #: builtin/pack-objects.c:2996 |
ef317cd5 | 11476 | msgid "read revision arguments from standard input" |
d9d56b23 | 11477 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 11478 | |
31e5e17b | 11479 | #: builtin/pack-objects.c:2998 |
ef317cd5 | 11480 | msgid "limit the objects to those that are not yet packed" |
07432cef | 11481 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 11482 | |
31e5e17b | 11483 | #: builtin/pack-objects.c:3001 |
ef317cd5 | 11484 | msgid "include objects reachable from any reference" |
07432cef | 11485 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 11486 | |
31e5e17b | 11487 | #: builtin/pack-objects.c:3004 |
ef317cd5 | 11488 | msgid "include objects referred by reflog entries" |
07432cef | 11489 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 11490 | |
31e5e17b | 11491 | #: builtin/pack-objects.c:3007 |
220c313c JX |
11492 | msgid "include objects referred to by the index" |
11493 | msgstr "包括被索引引用到的对象" | |
11494 | ||
31e5e17b | 11495 | #: builtin/pack-objects.c:3010 |
ef317cd5 | 11496 | msgid "output pack to stdout" |
07432cef | 11497 | msgstr "输出包到标准输出" |
ef317cd5 | 11498 | |
31e5e17b | 11499 | #: builtin/pack-objects.c:3012 |
ef317cd5 | 11500 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 11501 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 11502 | |
31e5e17b | 11503 | #: builtin/pack-objects.c:3014 |
ef317cd5 | 11504 | msgid "keep unreachable objects" |
07432cef | 11505 | msgstr "维持不可达的对象" |
ef317cd5 | 11506 | |
31e5e17b | 11507 | #: builtin/pack-objects.c:3016 |
5c57d762 JX |
11508 | msgid "pack loose unreachable objects" |
11509 | msgstr "打包松散的不可达对象" | |
11510 | ||
31e5e17b | 11511 | #: builtin/pack-objects.c:3018 |
ef317cd5 | 11512 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 11513 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 11514 | |
31e5e17b | 11515 | #: builtin/pack-objects.c:3021 |
ef317cd5 | 11516 | msgid "create thin packs" |
07432cef | 11517 | msgstr "创建精简包" |
ef317cd5 | 11518 | |
31e5e17b | 11519 | #: builtin/pack-objects.c:3023 |
04cb2f28 | 11520 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 11521 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 11522 | |
31e5e17b | 11523 | #: builtin/pack-objects.c:3025 |
ef317cd5 | 11524 | msgid "ignore packs that have companion .keep file" |
07432cef | 11525 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 11526 | |
31e5e17b | 11527 | #: builtin/pack-objects.c:3027 |
ef317cd5 | 11528 | msgid "pack compression level" |
07432cef | 11529 | msgstr "打包压缩级别" |
ef317cd5 | 11530 | |
31e5e17b | 11531 | #: builtin/pack-objects.c:3029 |
ef317cd5 | 11532 | msgid "do not hide commits by grafts" |
cfff71a9 | 11533 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 11534 | |
31e5e17b | 11535 | #: builtin/pack-objects.c:3031 |
6c94aba5 JX |
11536 | msgid "use a bitmap index if available to speed up counting objects" |
11537 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
11538 | ||
31e5e17b | 11539 | #: builtin/pack-objects.c:3033 |
6c94aba5 JX |
11540 | msgid "write a bitmap index together with the pack index" |
11541 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
11542 | ||
31e5e17b | 11543 | #: builtin/pack-objects.c:3036 |
5809aa05 JX |
11544 | msgid "handling for missing objects" |
11545 | msgstr "处理丢失的对象" | |
11546 | ||
31e5e17b JX |
11547 | #: builtin/pack-objects.c:3039 |
11548 | msgid "do not pack objects in promisor packfiles" | |
11549 | msgstr "不要打包 promisor 包文件中的对象" | |
11550 | ||
11551 | #: builtin/pack-objects.c:3178 | |
6c94aba5 JX |
11552 | msgid "Counting objects" |
11553 | msgstr "对象计数中" | |
11554 | ||
ef317cd5 | 11555 | #: builtin/pack-refs.c:6 |
814ff314 JX |
11556 | msgid "git pack-refs [<options>]" |
11557 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 11558 | |
ef317cd5 JX |
11559 | #: builtin/pack-refs.c:14 |
11560 | msgid "pack everything" | |
07432cef | 11561 | msgstr "打包一切" |
c04f5ac3 | 11562 | |
ef317cd5 JX |
11563 | #: builtin/pack-refs.c:15 |
11564 | msgid "prune loose refs (default)" | |
07432cef | 11565 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 11566 | |
6937cb4e | 11567 | #: builtin/prune-packed.c:8 |
814ff314 JX |
11568 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
11569 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 11570 | |
6937cb4e | 11571 | #: builtin/prune-packed.c:41 |
6c94aba5 JX |
11572 | msgid "Removing duplicate objects" |
11573 | msgstr "正在删除重复对象" | |
11574 | ||
5bb01d4f | 11575 | #: builtin/prune.c:11 |
5809aa05 JX |
11576 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
11577 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 11578 | |
31e5e17b | 11579 | #: builtin/prune.c:107 |
1b7f4a34 JX |
11580 | msgid "report pruned objects" |
11581 | msgstr "报告清除的对象" | |
11582 | ||
31e5e17b | 11583 | #: builtin/prune.c:110 |
1b7f4a34 JX |
11584 | msgid "expire objects older than <time>" |
11585 | msgstr "使早于给定时间的对象过期" | |
11586 | ||
31e5e17b JX |
11587 | #: builtin/prune.c:112 |
11588 | msgid "limit traversal to objects outside promisor packfiles" | |
11589 | msgstr "限制遍历 promisor 包以外的对象" | |
11590 | ||
11591 | #: builtin/prune.c:126 | |
94550ed3 JX |
11592 | msgid "cannot prune in a precious-objects repo" |
11593 | msgstr "不能在珍品仓库中执行清理操作" | |
11594 | ||
a4f16749 | 11595 | #: builtin/pull.c:54 builtin/pull.c:56 |
a0b6b246 JX |
11596 | #, c-format |
11597 | msgid "Invalid value for %s: %s" | |
11598 | msgstr "%s 的值无效:%s" | |
11599 | ||
a4f16749 | 11600 | #: builtin/pull.c:76 |
94550ed3 | 11601 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
11602 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
11603 | ||
5809aa05 | 11604 | #: builtin/pull.c:127 |
a4f16749 JX |
11605 | msgid "control for recursive fetching of submodules" |
11606 | msgstr "控制子模组的递归获取" | |
11607 | ||
5809aa05 | 11608 | #: builtin/pull.c:131 |
1b7f4a34 JX |
11609 | msgid "Options related to merging" |
11610 | msgstr "和合并相关的选项" | |
11611 | ||
5809aa05 | 11612 | #: builtin/pull.c:134 |
1b7f4a34 JX |
11613 | msgid "incorporate changes by rebasing rather than merging" |
11614 | msgstr "使用变基操作取代合并操作以合入修改" | |
11615 | ||
5809aa05 | 11616 | #: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 |
1b7f4a34 JX |
11617 | msgid "allow fast-forward" |
11618 | msgstr "允许快进式" | |
11619 | ||
5809aa05 | 11620 | #: builtin/pull.c:170 |
5b04ee3b | 11621 | msgid "automatically stash/stash pop before and after rebase" |
554e8501 | 11622 | msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
5b04ee3b | 11623 | |
5809aa05 | 11624 | #: builtin/pull.c:186 |
1b7f4a34 JX |
11625 | msgid "Options related to fetching" |
11626 | msgstr "和获取相关的参数" | |
11627 | ||
5809aa05 | 11628 | #: builtin/pull.c:204 |
276ceeaa JX |
11629 | msgid "number of submodules pulled in parallel" |
11630 | msgstr "并发拉取的子模组的数量" | |
11631 | ||
5809aa05 | 11632 | #: builtin/pull.c:299 |
1b7f4a34 JX |
11633 | #, c-format |
11634 | msgid "Invalid value for pull.ff: %s" | |
11635 | msgstr "pull.ff 的取值无效:%s" | |
11636 | ||
5809aa05 | 11637 | #: builtin/pull.c:415 |
1b7f4a34 JX |
11638 | msgid "" |
11639 | "There is no candidate for rebasing against among the refs that you just " | |
11640 | "fetched." | |
11641 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
11642 | ||
5809aa05 | 11643 | #: builtin/pull.c:417 |
1b7f4a34 JX |
11644 | msgid "" |
11645 | "There are no candidates for merging among the refs that you just fetched." | |
11646 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
11647 | ||
5809aa05 | 11648 | #: builtin/pull.c:418 |
1b7f4a34 JX |
11649 | msgid "" |
11650 | "Generally this means that you provided a wildcard refspec which had no\n" | |
11651 | "matches on the remote end." | |
11652 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
11653 | ||
5809aa05 | 11654 | #: builtin/pull.c:421 |
1b7f4a34 JX |
11655 | #, c-format |
11656 | msgid "" | |
11657 | "You asked to pull from the remote '%s', but did not specify\n" | |
11658 | "a branch. Because this is not the default configured remote\n" | |
11659 | "for your current branch, you must specify a branch on the command line." | |
11660 | msgstr "" | |
11661 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
11662 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
11663 | ||
5809aa05 | 11664 | #: builtin/pull.c:426 git-parse-remote.sh:73 |
1b7f4a34 JX |
11665 | msgid "You are not currently on a branch." |
11666 | msgstr "您当前不在一个分支上。" | |
11667 | ||
5809aa05 | 11668 | #: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 |
1b7f4a34 JX |
11669 | msgid "Please specify which branch you want to rebase against." |
11670 | msgstr "请指定您要变基到哪一个分支。" | |
11671 | ||
5809aa05 | 11672 | #: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 |
1b7f4a34 JX |
11673 | msgid "Please specify which branch you want to merge with." |
11674 | msgstr "请指定您要合并哪一个分支。" | |
11675 | ||
5809aa05 | 11676 | #: builtin/pull.c:431 builtin/pull.c:446 |
1b7f4a34 JX |
11677 | msgid "See git-pull(1) for details." |
11678 | msgstr "详见 git-pull(1)。" | |
11679 | ||
5809aa05 | 11680 | #: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 |
5b04ee3b JX |
11681 | #: git-parse-remote.sh:64 |
11682 | msgid "<remote>" | |
11683 | msgstr "<远程>" | |
11684 | ||
31e5e17b | 11685 | #: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 |
5b04ee3b JX |
11686 | #: git-parse-remote.sh:65 |
11687 | msgid "<branch>" | |
11688 | msgstr "<分支>" | |
11689 | ||
5809aa05 | 11690 | #: builtin/pull.c:441 git-parse-remote.sh:75 |
1b7f4a34 JX |
11691 | msgid "There is no tracking information for the current branch." |
11692 | msgstr "当前分支没有跟踪信息。" | |
11693 | ||
5809aa05 | 11694 | #: builtin/pull.c:450 git-parse-remote.sh:95 |
1b7f4a34 | 11695 | msgid "" |
5b04ee3b JX |
11696 | "If you wish to set tracking information for this branch you can do so with:" |
11697 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 11698 | |
5809aa05 | 11699 | #: builtin/pull.c:455 |
1b7f4a34 JX |
11700 | #, c-format |
11701 | msgid "" | |
11702 | "Your configuration specifies to merge with the ref '%s'\n" | |
11703 | "from the remote, but no such ref was fetched." | |
11704 | msgstr "" | |
11705 | "您的配置中指定要合并远程的引用 '%s',\n" | |
11706 | "但是没有获取到这个引用。" | |
7ac1c0ad | 11707 | |
31e5e17b | 11708 | #: builtin/pull.c:819 |
5c57d762 JX |
11709 | msgid "ignoring --verify-signatures for rebase" |
11710 | msgstr "为变基操作忽略 --verify-signatures" | |
11711 | ||
31e5e17b | 11712 | #: builtin/pull.c:867 |
5b04ee3b JX |
11713 | msgid "--[no-]autostash option is only valid with --rebase." |
11714 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
11715 | ||
31e5e17b | 11716 | #: builtin/pull.c:875 |
1b7f4a34 JX |
11717 | msgid "Updating an unborn branch with changes added to the index." |
11718 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
11719 | ||
31e5e17b | 11720 | #: builtin/pull.c:878 |
a0b6b246 JX |
11721 | msgid "pull with rebase" |
11722 | msgstr "变基式拉取" | |
11723 | ||
31e5e17b | 11724 | #: builtin/pull.c:879 |
a0b6b246 | 11725 | msgid "please commit or stash them." |
554e8501 | 11726 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 11727 | |
31e5e17b | 11728 | #: builtin/pull.c:904 |
1b7f4a34 JX |
11729 | #, c-format |
11730 | msgid "" | |
11731 | "fetch updated the current branch head.\n" | |
11732 | "fast-forwarding your working tree from\n" | |
11733 | "commit %s." | |
11734 | msgstr "" | |
11735 | "fetch 更新了当前的分支。快进您的工作区\n" | |
11736 | "至提交 %s。" | |
ef317cd5 | 11737 | |
31e5e17b | 11738 | #: builtin/pull.c:909 |
1b7f4a34 JX |
11739 | #, c-format |
11740 | msgid "" | |
11741 | "Cannot fast-forward your working tree.\n" | |
11742 | "After making sure that you saved anything precious from\n" | |
11743 | "$ git diff %s\n" | |
11744 | "output, run\n" | |
11745 | "$ git reset --hard\n" | |
11746 | "to recover." | |
11747 | msgstr "" | |
11748 | "您当前的工作区无法执行快进操作。\n" | |
11749 | "首先执行如下命令:\n" | |
11750 | "$ git diff %s\n" | |
11751 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
11752 | "$ git reset --hard\n" | |
11753 | "恢复之前的状态。" | |
11754 | ||
31e5e17b | 11755 | #: builtin/pull.c:924 |
1b7f4a34 JX |
11756 | msgid "Cannot merge multiple branches into empty head." |
11757 | msgstr "无法将多个分支合并到空分支。" | |
11758 | ||
31e5e17b | 11759 | #: builtin/pull.c:928 |
1b7f4a34 JX |
11760 | msgid "Cannot rebase onto multiple branches." |
11761 | msgstr "无法变基到多个分支。" | |
11762 | ||
31e5e17b | 11763 | #: builtin/pull.c:935 |
a4f16749 JX |
11764 | msgid "cannot rebase with locally recorded submodule modifications" |
11765 | msgstr "本地子模组中有修改,无法变基" | |
11766 | ||
11767 | #: builtin/push.c:17 | |
ef317cd5 | 11768 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 11769 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 11770 | |
5809aa05 | 11771 | #: builtin/push.c:92 |
c04f5ac3 | 11772 | msgid "tag shorthand without <tag>" |
55a16ee4 | 11773 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 11774 | |
5809aa05 | 11775 | #: builtin/push.c:102 |
c04f5ac3 | 11776 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 11777 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 11778 | |
5809aa05 | 11779 | #: builtin/push.c:146 |
8ada9598 JX |
11780 | msgid "" |
11781 | "\n" | |
11782 | "To choose either option permanently, see push.default in 'git help config'." | |
11783 | msgstr "" | |
81809b99 JX |
11784 | "\n" |
11785 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 11786 | |
5809aa05 | 11787 | #: builtin/push.c:149 |
8ada9598 JX |
11788 | #, c-format |
11789 | msgid "" | |
11790 | "The upstream branch of your current branch does not match\n" | |
11791 | "the name of your current branch. To push to the upstream branch\n" | |
11792 | "on the remote, use\n" | |
11793 | "\n" | |
11794 | " git push %s HEAD:%s\n" | |
11795 | "\n" | |
11796 | "To push to the branch of the same name on the remote, use\n" | |
11797 | "\n" | |
11798 | " git push %s %s\n" | |
11799 | "%s" | |
11800 | msgstr "" | |
81809b99 JX |
11801 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
11802 | "上游分支,使用\n" | |
11803 | "\n" | |
11804 | " git push %s HEAD:%s\n" | |
11805 | "\n" | |
11806 | "为推送至远程同名分支,使用\n" | |
11807 | "\n" | |
11808 | " git push %s %s\n" | |
11809 | "%s" | |
8ada9598 | 11810 | |
5809aa05 | 11811 | #: builtin/push.c:164 |
c04f5ac3 JX |
11812 | #, c-format |
11813 | msgid "" | |
11814 | "You are not currently on a branch.\n" | |
11815 | "To push the history leading to the current (detached HEAD)\n" | |
11816 | "state now, use\n" | |
11817 | "\n" | |
11818 | " git push %s HEAD:<name-of-remote-branch>\n" | |
11819 | msgstr "" | |
11820 | "您当前不在一个分支上。\n" | |
90e6ef53 | 11821 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 11822 | "\n" |
d9d56b23 | 11823 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 11824 | |
5809aa05 | 11825 | #: builtin/push.c:178 |
c04f5ac3 JX |
11826 | #, c-format |
11827 | msgid "" | |
11828 | "The current branch %s has no upstream branch.\n" | |
11829 | "To push the current branch and set the remote as upstream, use\n" | |
11830 | "\n" | |
11831 | " git push --set-upstream %s %s\n" | |
11832 | msgstr "" | |
11833 | "当前分支 %s 没有对应的上游分支。\n" | |
11834 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
11835 | "\n" | |
11836 | " git push --set-upstream %s %s\n" | |
11837 | ||
5809aa05 | 11838 | #: builtin/push.c:186 |
c04f5ac3 JX |
11839 | #, c-format |
11840 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
11841 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
11842 | ||
5809aa05 | 11843 | #: builtin/push.c:189 |
73a60cd2 JX |
11844 | #, c-format |
11845 | msgid "" | |
11846 | "You are pushing to remote '%s', which is not the upstream of\n" | |
11847 | "your current branch '%s', without telling me what to push\n" | |
11848 | "to update which remote branch." | |
11849 | msgstr "" | |
11850 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
11851 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
11852 | ||
5809aa05 | 11853 | #: builtin/push.c:248 |
c04f5ac3 JX |
11854 | msgid "" |
11855 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 11856 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 11857 | |
5809aa05 | 11858 | #: builtin/push.c:255 |
170e9899 JX |
11859 | msgid "" |
11860 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
11861 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
11862 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
11863 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11864 | msgstr "" | |
eff6d3a9 | 11865 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 11866 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 11867 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 11868 | |
5809aa05 | 11869 | #: builtin/push.c:261 |
170e9899 JX |
11870 | msgid "" |
11871 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
11872 | "counterpart. Check out this branch and integrate the remote changes\n" |
11873 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
11874 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11875 | msgstr "" | |
eff6d3a9 | 11876 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 11877 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 11878 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 11879 | |
5809aa05 | 11880 | #: builtin/push.c:267 |
07432cef | 11881 | msgid "" |
a77c07d9 JX |
11882 | "Updates were rejected because the remote contains work that you do\n" |
11883 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
11884 | "to the same ref. You may want to first integrate the remote changes\n" |
11885 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
11886 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
11887 | msgstr "" | |
160fb2b2 JX |
11888 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
11889 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 11890 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
11891 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
11892 | ||
5809aa05 | 11893 | #: builtin/push.c:274 |
a77c07d9 | 11894 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 11895 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 11896 | |
5809aa05 | 11897 | #: builtin/push.c:277 |
a77c07d9 JX |
11898 | msgid "" |
11899 | "You cannot update a remote ref that points at a non-commit object,\n" | |
11900 | "or update a remote ref to make it point at a non-commit object,\n" | |
11901 | "without using the '--force' option.\n" | |
11902 | msgstr "" | |
11903 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
11904 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 11905 | |
5809aa05 | 11906 | #: builtin/push.c:337 |
c04f5ac3 JX |
11907 | #, c-format |
11908 | msgid "Pushing to %s\n" | |
11909 | msgstr "推送到 %s\n" | |
11910 | ||
5809aa05 | 11911 | #: builtin/push.c:341 |
c04f5ac3 JX |
11912 | #, c-format |
11913 | msgid "failed to push some refs to '%s'" | |
11914 | msgstr "无法推送一些引用到 '%s'" | |
11915 | ||
5809aa05 | 11916 | #: builtin/push.c:372 |
c04f5ac3 JX |
11917 | #, c-format |
11918 | msgid "bad repository '%s'" | |
160fb2b2 | 11919 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 11920 | |
5809aa05 | 11921 | #: builtin/push.c:373 |
c04f5ac3 JX |
11922 | msgid "" |
11923 | "No configured push destination.\n" | |
11924 | "Either specify the URL from the command-line or configure a remote " | |
11925 | "repository using\n" | |
11926 | "\n" | |
11927 | " git remote add <name> <url>\n" | |
11928 | "\n" | |
11929 | "and then push using the remote name\n" | |
11930 | "\n" | |
11931 | " git push <name>\n" | |
11932 | msgstr "" | |
90e6ef53 | 11933 | "没有配置推送目标。\n" |
4375c10e | 11934 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 11935 | "\n" |
d9d56b23 | 11936 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 11937 | "\n" |
160fb2b2 | 11938 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 11939 | "\n" |
d9d56b23 | 11940 | " git push <名称>\n" |
c04f5ac3 | 11941 | |
5809aa05 | 11942 | #: builtin/push.c:391 |
c04f5ac3 JX |
11943 | msgid "--all and --tags are incompatible" |
11944 | msgstr "--all 和 --tags 不兼容" | |
11945 | ||
5809aa05 | 11946 | #: builtin/push.c:392 |
c04f5ac3 | 11947 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 11948 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 11949 | |
5809aa05 | 11950 | #: builtin/push.c:397 |
c04f5ac3 JX |
11951 | msgid "--mirror and --tags are incompatible" |
11952 | msgstr "--mirror 和 --tags 不兼容" | |
11953 | ||
5809aa05 | 11954 | #: builtin/push.c:398 |
c04f5ac3 | 11955 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 11956 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 11957 | |
5809aa05 | 11958 | #: builtin/push.c:403 |
c04f5ac3 JX |
11959 | msgid "--all and --mirror are incompatible" |
11960 | msgstr "--all 和 --mirror 不兼容" | |
11961 | ||
5809aa05 | 11962 | #: builtin/push.c:535 |
ef317cd5 | 11963 | msgid "repository" |
160fb2b2 | 11964 | msgstr "仓库" |
ef317cd5 | 11965 | |
5809aa05 | 11966 | #: builtin/push.c:536 builtin/send-pack.c:163 |
ef317cd5 | 11967 | msgid "push all refs" |
07432cef | 11968 | msgstr "推送所有引用" |
ef317cd5 | 11969 | |
5809aa05 | 11970 | #: builtin/push.c:537 builtin/send-pack.c:165 |
ef317cd5 | 11971 | msgid "mirror all refs" |
07432cef | 11972 | msgstr "镜像所有引用" |
ef317cd5 | 11973 | |
5809aa05 | 11974 | #: builtin/push.c:539 |
ef317cd5 | 11975 | msgid "delete refs" |
07432cef | 11976 | msgstr "删除引用" |
ef317cd5 | 11977 | |
5809aa05 | 11978 | #: builtin/push.c:540 |
ef317cd5 | 11979 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 11980 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 11981 | |
5809aa05 | 11982 | #: builtin/push.c:543 builtin/send-pack.c:166 |
ef317cd5 JX |
11983 | msgid "force updates" |
11984 | msgstr "强制更新" | |
11985 | ||
5809aa05 | 11986 | #: builtin/push.c:545 builtin/send-pack.c:180 |
90314792 JX |
11987 | msgid "refname>:<expect" |
11988 | msgstr "引用名>:<期望值" | |
11989 | ||
5809aa05 | 11990 | #: builtin/push.c:546 builtin/send-pack.c:181 |
90314792 JX |
11991 | msgid "require old value of ref to be at this value" |
11992 | msgstr "要求引用旧的取值为设定值" | |
11993 | ||
5809aa05 | 11994 | #: builtin/push.c:549 |
ef317cd5 | 11995 | msgid "control recursive pushing of submodules" |
07432cef | 11996 | msgstr "控制子模组的递归推送" |
ef317cd5 | 11997 | |
5809aa05 | 11998 | #: builtin/push.c:551 builtin/send-pack.c:174 |
ef317cd5 | 11999 | msgid "use thin pack" |
07432cef | 12000 | msgstr "使用精简打包" |
ef317cd5 | 12001 | |
5809aa05 | 12002 | #: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 |
a4f16749 | 12003 | #: builtin/send-pack.c:161 |
ef317cd5 | 12004 | msgid "receive pack program" |
07432cef | 12005 | msgstr "接收包程序" |
ef317cd5 | 12006 | |
5809aa05 | 12007 | #: builtin/push.c:554 |
ef317cd5 | 12008 | msgid "set upstream for git pull/status" |
07432cef | 12009 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 12010 | |
5809aa05 | 12011 | #: builtin/push.c:557 |
ef317cd5 | 12012 | msgid "prune locally removed refs" |
07432cef | 12013 | msgstr "清除本地删除的引用" |
ef317cd5 | 12014 | |
5809aa05 | 12015 | #: builtin/push.c:559 |
a77c07d9 JX |
12016 | msgid "bypass pre-push hook" |
12017 | msgstr "绕过 pre-push 钩子" | |
12018 | ||
5809aa05 | 12019 | #: builtin/push.c:560 |
1003b3a5 | 12020 | msgid "push missing but relevant tags" |
55a16ee4 | 12021 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 12022 | |
5809aa05 | 12023 | #: builtin/push.c:563 builtin/send-pack.c:168 |
220c313c JX |
12024 | msgid "GPG sign the push" |
12025 | msgstr "用 GPG 为推送签名" | |
12026 | ||
5809aa05 | 12027 | #: builtin/push.c:565 builtin/send-pack.c:175 |
814ff314 JX |
12028 | msgid "request atomic transaction on remote side" |
12029 | msgstr "需要远端支持原子事务" | |
12030 | ||
5809aa05 | 12031 | #: builtin/push.c:566 builtin/send-pack.c:171 |
5c57d762 JX |
12032 | msgid "server-specific" |
12033 | msgstr "server-specific" | |
12034 | ||
5809aa05 | 12035 | #: builtin/push.c:566 builtin/send-pack.c:172 |
5c57d762 | 12036 | msgid "option to transmit" |
9a4b694c | 12037 | msgstr "传输选项" |
5c57d762 | 12038 | |
5809aa05 | 12039 | #: builtin/push.c:583 |
c04f5ac3 JX |
12040 | msgid "--delete is incompatible with --all, --mirror and --tags" |
12041 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
12042 | ||
5809aa05 | 12043 | #: builtin/push.c:585 |
c04f5ac3 JX |
12044 | msgid "--delete doesn't make sense without any refs" |
12045 | msgstr "--delete 未接任何引用没有意义" | |
12046 | ||
5809aa05 | 12047 | #: builtin/push.c:604 |
5c57d762 JX |
12048 | msgid "push options must not have new line characters" |
12049 | msgstr "推送选项不能有换行符" | |
12050 | ||
87cb7997 | 12051 | #: builtin/read-tree.c:40 |
ef317cd5 | 12052 | msgid "" |
1b7f4a34 | 12053 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
12054 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
12055 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
12056 | msgstr "" | |
1b7f4a34 | 12057 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 12058 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 12059 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 12060 | |
a4f16749 | 12061 | #: builtin/read-tree.c:121 |
ef317cd5 | 12062 | msgid "write resulting index to <file>" |
d9d56b23 | 12063 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 12064 | |
a4f16749 | 12065 | #: builtin/read-tree.c:124 |
ef317cd5 | 12066 | msgid "only empty the index" |
07432cef | 12067 | msgstr "只是清空索引" |
ef317cd5 | 12068 | |
a4f16749 | 12069 | #: builtin/read-tree.c:126 |
ef317cd5 | 12070 | msgid "Merging" |
07432cef | 12071 | msgstr "合并" |
ef317cd5 | 12072 | |
a4f16749 | 12073 | #: builtin/read-tree.c:128 |
ef317cd5 | 12074 | msgid "perform a merge in addition to a read" |
07432cef | 12075 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 12076 | |
a4f16749 | 12077 | #: builtin/read-tree.c:130 |
ef317cd5 | 12078 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 12079 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 12080 | |
a4f16749 | 12081 | #: builtin/read-tree.c:132 |
ef317cd5 | 12082 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 12083 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 12084 | |
a4f16749 | 12085 | #: builtin/read-tree.c:134 |
ef317cd5 | 12086 | msgid "same as -m, but discard unmerged entries" |
07432cef | 12087 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 12088 | |
a4f16749 | 12089 | #: builtin/read-tree.c:135 |
ef317cd5 | 12090 | msgid "<subdirectory>/" |
07432cef | 12091 | msgstr "<子目录>/" |
ef317cd5 | 12092 | |
a4f16749 | 12093 | #: builtin/read-tree.c:136 |
ef317cd5 | 12094 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 12095 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 12096 | |
a4f16749 | 12097 | #: builtin/read-tree.c:139 |
ef317cd5 | 12098 | msgid "update working tree with merge result" |
07432cef | 12099 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 12100 | |
a4f16749 | 12101 | #: builtin/read-tree.c:141 |
ef317cd5 | 12102 | msgid "gitignore" |
07432cef | 12103 | msgstr "gitignore" |
ef317cd5 | 12104 | |
a4f16749 | 12105 | #: builtin/read-tree.c:142 |
ef317cd5 | 12106 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 12107 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 12108 | |
a4f16749 | 12109 | #: builtin/read-tree.c:145 |
ef317cd5 | 12110 | msgid "don't check the working tree after merging" |
07432cef | 12111 | msgstr "合并后不检查工作区" |
ef317cd5 | 12112 | |
a4f16749 | 12113 | #: builtin/read-tree.c:146 |
ef317cd5 | 12114 | msgid "don't update the index or the work tree" |
07432cef | 12115 | msgstr "不更新索引区和工作区" |
ef317cd5 | 12116 | |
a4f16749 | 12117 | #: builtin/read-tree.c:148 |
ef317cd5 | 12118 | msgid "skip applying sparse checkout filter" |
07432cef | 12119 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 12120 | |
a4f16749 | 12121 | #: builtin/read-tree.c:150 |
ef317cd5 | 12122 | msgid "debug unpack-trees" |
07432cef | 12123 | msgstr "调试 unpack-trees" |
ef317cd5 | 12124 | |
a4f16749 | 12125 | #: builtin/rebase--helper.c:8 |
87cb7997 JX |
12126 | msgid "git rebase--helper [<options>]" |
12127 | msgstr "git rebase--helper [<选项>]" | |
12128 | ||
5809aa05 | 12129 | #: builtin/rebase--helper.c:24 |
6937cb4e JX |
12130 | msgid "keep empty commits" |
12131 | msgstr "保持空提交" | |
12132 | ||
31e5e17b JX |
12133 | #: builtin/rebase--helper.c:26 builtin/revert.c:123 |
12134 | msgid "allow commits with empty messages" | |
12135 | msgstr "允许提交说明为空" | |
12136 | ||
12137 | #: builtin/rebase--helper.c:27 | |
87cb7997 JX |
12138 | msgid "continue rebase" |
12139 | msgstr "继续变基" | |
12140 | ||
31e5e17b | 12141 | #: builtin/rebase--helper.c:29 |
87cb7997 JX |
12142 | msgid "abort rebase" |
12143 | msgstr "中止变基" | |
12144 | ||
31e5e17b | 12145 | #: builtin/rebase--helper.c:32 |
6937cb4e JX |
12146 | msgid "make rebase script" |
12147 | msgstr "制作变基脚本" | |
12148 | ||
31e5e17b | 12149 | #: builtin/rebase--helper.c:34 |
5809aa05 JX |
12150 | msgid "shorten commit ids in the todo list" |
12151 | msgstr "缩短待办列表中的提交号" | |
6937cb4e | 12152 | |
31e5e17b | 12153 | #: builtin/rebase--helper.c:36 |
5809aa05 JX |
12154 | msgid "expand commit ids in the todo list" |
12155 | msgstr "扩展待办列表中的提交号" | |
12156 | ||
31e5e17b | 12157 | #: builtin/rebase--helper.c:38 |
6937cb4e JX |
12158 | msgid "check the todo list" |
12159 | msgstr "检查待办列表" | |
12160 | ||
31e5e17b | 12161 | #: builtin/rebase--helper.c:40 |
6937cb4e JX |
12162 | msgid "skip unnecessary picks" |
12163 | msgstr "跳过不必要的拣选" | |
12164 | ||
31e5e17b | 12165 | #: builtin/rebase--helper.c:42 |
6937cb4e JX |
12166 | msgid "rearrange fixup/squash lines" |
12167 | msgstr "重新排列 fixup/squash 行" | |
12168 | ||
31e5e17b | 12169 | #: builtin/rebase--helper.c:44 |
5809aa05 JX |
12170 | msgid "insert exec commands in todo list" |
12171 | msgstr "在待办列表中插入 exec 执行命令" | |
12172 | ||
12173 | #: builtin/receive-pack.c:30 | |
5b04ee3b | 12174 | msgid "git receive-pack <git-dir>" |
58b6f078 | 12175 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 12176 | |
31e5e17b | 12177 | #: builtin/receive-pack.c:841 |
a0b6b246 JX |
12178 | msgid "" |
12179 | "By default, updating the current branch in a non-bare repository\n" | |
12180 | "is denied, because it will make the index and work tree inconsistent\n" | |
12181 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
12182 | "the work tree to HEAD.\n" | |
12183 | "\n" | |
1a79b2f1 JX |
12184 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
12185 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
12186 | "its current branch; however, this is not recommended unless you\n" |
12187 | "arranged to update its work tree to match what you pushed in some\n" | |
12188 | "other way.\n" | |
12189 | "\n" | |
12190 | "To squelch this message and still keep the default behaviour, set\n" | |
12191 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
12192 | msgstr "" | |
12193 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
12194 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
12195 | "\n" | |
12196 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
12197 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
12198 | "用某种方式将其工作区更新至您推送的状态。\n" | |
12199 | "\n" | |
12200 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
12201 | "配置变量为 'refuse'。" | |
12202 | ||
31e5e17b | 12203 | #: builtin/receive-pack.c:861 |
a0b6b246 JX |
12204 | msgid "" |
12205 | "By default, deleting the current branch is denied, because the next\n" | |
12206 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
12207 | "\n" | |
12208 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
12209 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
12210 | "current branch, with or without a warning message.\n" | |
12211 | "\n" | |
12212 | "To squelch this message, you can set it to 'refuse'." | |
12213 | msgstr "" | |
12214 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 12215 | "导致困惑。\n" |
a0b6b246 JX |
12216 | "\n" |
12217 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 12218 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
12219 | "\n" |
12220 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
12221 | ||
31e5e17b | 12222 | #: builtin/receive-pack.c:1934 |
5b04ee3b JX |
12223 | msgid "quiet" |
12224 | msgstr "静默模式" | |
12225 | ||
31e5e17b | 12226 | #: builtin/receive-pack.c:1948 |
5b04ee3b JX |
12227 | msgid "You must specify a directory." |
12228 | msgstr "您必须指定一个目录。" | |
12229 | ||
31e5e17b | 12230 | #: builtin/reflog.c:532 builtin/reflog.c:537 |
2e8451e8 JX |
12231 | #, c-format |
12232 | msgid "'%s' is not a valid timestamp" | |
12233 | msgstr "'%s' 不是一个有效的时间戳" | |
12234 | ||
a4f16749 | 12235 | #: builtin/remote.c:13 |
ef317cd5 | 12236 | msgid "git remote [-v | --verbose]" |
07432cef | 12237 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 12238 | |
a4f16749 | 12239 | #: builtin/remote.c:14 |
ef317cd5 | 12240 | msgid "" |
814ff314 | 12241 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
12242 | "mirror=<fetch|push>] <name> <url>" |
12243 | msgstr "" | |
814ff314 | 12244 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 12245 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 12246 | |
a4f16749 | 12247 | #: builtin/remote.c:15 builtin/remote.c:35 |
ef317cd5 | 12248 | msgid "git remote rename <old> <new>" |
07432cef | 12249 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 12250 | |
a4f16749 | 12251 | #: builtin/remote.c:16 builtin/remote.c:40 |
ef317cd5 | 12252 | msgid "git remote remove <name>" |
07432cef | 12253 | msgstr "git remote remove <名称>" |
ef317cd5 | 12254 | |
a4f16749 | 12255 | #: builtin/remote.c:17 builtin/remote.c:45 |
814ff314 JX |
12256 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
12257 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 12258 | |
a4f16749 | 12259 | #: builtin/remote.c:18 |
ef317cd5 | 12260 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 12261 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 12262 | |
a4f16749 | 12263 | #: builtin/remote.c:19 |
ef317cd5 | 12264 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 12265 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 12266 | |
a4f16749 | 12267 | #: builtin/remote.c:20 |
ef317cd5 JX |
12268 | msgid "" |
12269 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 12270 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 12271 | |
a4f16749 | 12272 | #: builtin/remote.c:21 |
ef317cd5 | 12273 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 12274 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 12275 | |
a4f16749 | 12276 | #: builtin/remote.c:22 builtin/remote.c:71 |
94550ed3 JX |
12277 | msgid "git remote get-url [--push] [--all] <name>" |
12278 | msgstr "git remote get-url [--push] [--all] <名称>" | |
12279 | ||
a4f16749 | 12280 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 12281 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 12282 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 12283 | |
a4f16749 | 12284 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 12285 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 12286 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 12287 | |
a4f16749 | 12288 | #: builtin/remote.c:25 builtin/remote.c:78 |
ef317cd5 | 12289 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 12290 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 12291 | |
a4f16749 | 12292 | #: builtin/remote.c:30 |
ef317cd5 | 12293 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 12294 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 12295 | |
a4f16749 | 12296 | #: builtin/remote.c:50 |
ef317cd5 | 12297 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 12298 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 12299 | |
a4f16749 | 12300 | #: builtin/remote.c:51 |
ef317cd5 | 12301 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 12302 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 12303 | |
a4f16749 | 12304 | #: builtin/remote.c:56 |
ef317cd5 | 12305 | msgid "git remote show [<options>] <name>" |
07432cef | 12306 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 12307 | |
a4f16749 | 12308 | #: builtin/remote.c:61 |
ef317cd5 | 12309 | msgid "git remote prune [<options>] <name>" |
07432cef | 12310 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 12311 | |
a4f16749 | 12312 | #: builtin/remote.c:66 |
ef317cd5 | 12313 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 12314 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 12315 | |
a4f16749 | 12316 | #: builtin/remote.c:95 |
81809b99 | 12317 | #, c-format |
8ada9598 | 12318 | msgid "Updating %s" |
81809b99 | 12319 | msgstr "更新 %s 中" |
8ada9598 | 12320 | |
a4f16749 | 12321 | #: builtin/remote.c:127 |
8ada9598 JX |
12322 | msgid "" |
12323 | "--mirror is dangerous and deprecated; please\n" | |
12324 | "\t use --mirror=fetch or --mirror=push instead" | |
12325 | msgstr "" | |
81809b99 JX |
12326 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
12327 | "\t 或 --mirror=push" | |
8ada9598 | 12328 | |
a4f16749 | 12329 | #: builtin/remote.c:144 |
81809b99 | 12330 | #, c-format |
8ada9598 | 12331 | msgid "unknown mirror argument: %s" |
81809b99 | 12332 | msgstr "未知的镜像参数:%s" |
8ada9598 | 12333 | |
a4f16749 | 12334 | #: builtin/remote.c:160 |
ef317cd5 | 12335 | msgid "fetch the remote branches" |
07432cef | 12336 | msgstr "抓取远程的分支" |
ef317cd5 | 12337 | |
a4f16749 | 12338 | #: builtin/remote.c:162 |
ef317cd5 | 12339 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 12340 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 12341 | |
a4f16749 | 12342 | #: builtin/remote.c:165 |
ef317cd5 | 12343 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 12344 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 12345 | |
a4f16749 | 12346 | #: builtin/remote.c:167 |
ef317cd5 | 12347 | msgid "branch(es) to track" |
07432cef | 12348 | msgstr "跟踪的分支" |
ef317cd5 | 12349 | |
a4f16749 | 12350 | #: builtin/remote.c:168 |
ef317cd5 | 12351 | msgid "master branch" |
07432cef | 12352 | msgstr "主线分支" |
ef317cd5 | 12353 | |
a4f16749 | 12354 | #: builtin/remote.c:169 |
ef317cd5 | 12355 | msgid "push|fetch" |
07432cef | 12356 | msgstr "push|fetch" |
ef317cd5 | 12357 | |
a4f16749 | 12358 | #: builtin/remote.c:170 |
ef317cd5 | 12359 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 12360 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 12361 | |
a4f16749 | 12362 | #: builtin/remote.c:182 |
8ada9598 | 12363 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 12364 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 12365 | |
a4f16749 | 12366 | #: builtin/remote.c:184 |
8ada9598 | 12367 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 12368 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 12369 | |
6937cb4e | 12370 | #: builtin/remote.c:191 builtin/remote.c:631 |
81809b99 | 12371 | #, c-format |
8ada9598 | 12372 | msgid "remote %s already exists." |
81809b99 | 12373 | msgstr "远程 %s 已经存在。" |
8ada9598 | 12374 | |
6937cb4e | 12375 | #: builtin/remote.c:195 builtin/remote.c:635 |
81809b99 | 12376 | #, c-format |
8ada9598 | 12377 | msgid "'%s' is not a valid remote name" |
81809b99 | 12378 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 12379 | |
a4f16749 | 12380 | #: builtin/remote.c:235 |
81809b99 | 12381 | #, c-format |
8ada9598 | 12382 | msgid "Could not setup master '%s'" |
81809b99 | 12383 | msgstr "无法设置 master '%s'" |
8ada9598 | 12384 | |
a4f16749 | 12385 | #: builtin/remote.c:337 |
81809b99 | 12386 | #, c-format |
8ada9598 | 12387 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 12388 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 12389 | |
a4f16749 | 12390 | #: builtin/remote.c:438 builtin/remote.c:446 |
8ada9598 | 12391 | msgid "(matching)" |
81809b99 | 12392 | msgstr "(匹配)" |
8ada9598 | 12393 | |
a4f16749 | 12394 | #: builtin/remote.c:450 |
8ada9598 | 12395 | msgid "(delete)" |
81809b99 | 12396 | msgstr "(删除)" |
8ada9598 | 12397 | |
6937cb4e | 12398 | #: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 |
81809b99 | 12399 | #, c-format |
8ada9598 | 12400 | msgid "No such remote: %s" |
81809b99 | 12401 | msgstr "没有这样的远程:%s" |
8ada9598 | 12402 | |
6937cb4e | 12403 | #: builtin/remote.c:641 |
81809b99 | 12404 | #, c-format |
8ada9598 | 12405 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 12406 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 12407 | |
6937cb4e | 12408 | #: builtin/remote.c:661 |
8ada9598 JX |
12409 | #, c-format |
12410 | msgid "" | |
d691f479 | 12411 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
12412 | "\t%s\n" |
12413 | "\tPlease update the configuration manually if necessary." | |
12414 | msgstr "" | |
160fb2b2 | 12415 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
12416 | "\t%s\n" |
12417 | "\t如果必要请手动更新配置。" | |
8ada9598 | 12418 | |
6937cb4e | 12419 | #: builtin/remote.c:697 |
81809b99 | 12420 | #, c-format |
8ada9598 | 12421 | msgid "deleting '%s' failed" |
81809b99 | 12422 | msgstr "删除 '%s' 失败" |
8ada9598 | 12423 | |
6937cb4e | 12424 | #: builtin/remote.c:731 |
81809b99 | 12425 | #, c-format |
8ada9598 | 12426 | msgid "creating '%s' failed" |
81809b99 | 12427 | msgstr "创建 '%s' 失败" |
8ada9598 | 12428 | |
6937cb4e | 12429 | #: builtin/remote.c:796 |
8ada9598 JX |
12430 | msgid "" |
12431 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
12432 | "to delete it, use:" | |
12433 | msgid_plural "" | |
12434 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
12435 | "to delete them, use:" | |
5ae481e0 JX |
12436 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
12437 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 12438 | |
6937cb4e | 12439 | #: builtin/remote.c:810 |
276ceeaa JX |
12440 | #, c-format |
12441 | msgid "Could not remove config section '%s'" | |
12442 | msgstr "不能移除配置小节 '%s'" | |
12443 | ||
6937cb4e | 12444 | #: builtin/remote.c:911 |
8ada9598 JX |
12445 | #, c-format |
12446 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 12447 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 12448 | |
6937cb4e | 12449 | #: builtin/remote.c:914 |
8ada9598 | 12450 | msgid " tracked" |
81809b99 | 12451 | msgstr " 已跟踪" |
8ada9598 | 12452 | |
6937cb4e | 12453 | #: builtin/remote.c:916 |
8ada9598 | 12454 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 12455 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 12456 | |
6937cb4e | 12457 | #: builtin/remote.c:918 |
8ada9598 | 12458 | msgid " ???" |
81809b99 | 12459 | msgstr " ???" |
8ada9598 | 12460 | |
6937cb4e | 12461 | #: builtin/remote.c:959 |
8ada9598 JX |
12462 | #, c-format |
12463 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 12464 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 12465 | |
6937cb4e | 12466 | #: builtin/remote.c:967 |
81809b99 | 12467 | #, c-format |
276ceeaa JX |
12468 | msgid "rebases interactively onto remote %s" |
12469 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 12470 | |
6937cb4e | 12471 | #: builtin/remote.c:968 |
5c57d762 JX |
12472 | #, c-format |
12473 | msgid "rebases onto remote %s" | |
12474 | msgstr "变基到远程 %s" | |
12475 | ||
6937cb4e | 12476 | #: builtin/remote.c:971 |
81809b99 | 12477 | #, c-format |
8ada9598 | 12478 | msgid " merges with remote %s" |
81809b99 | 12479 | msgstr " 与远程 %s 合并" |
8ada9598 | 12480 | |
6937cb4e | 12481 | #: builtin/remote.c:974 |
81809b99 | 12482 | #, c-format |
8ada9598 | 12483 | msgid "merges with remote %s" |
81809b99 | 12484 | msgstr "与远程 %s 合并" |
8ada9598 | 12485 | |
6937cb4e | 12486 | #: builtin/remote.c:977 |
5c57d762 JX |
12487 | #, c-format |
12488 | msgid "%-*s and with remote %s\n" | |
12489 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 12490 | |
6937cb4e | 12491 | #: builtin/remote.c:1020 |
8ada9598 | 12492 | msgid "create" |
81809b99 | 12493 | msgstr "创建" |
8ada9598 | 12494 | |
6937cb4e | 12495 | #: builtin/remote.c:1023 |
8ada9598 | 12496 | msgid "delete" |
81809b99 | 12497 | msgstr "删除" |
8ada9598 | 12498 | |
6937cb4e | 12499 | #: builtin/remote.c:1027 |
8ada9598 | 12500 | msgid "up to date" |
81809b99 | 12501 | msgstr "最新" |
8ada9598 | 12502 | |
6937cb4e | 12503 | #: builtin/remote.c:1030 |
8ada9598 | 12504 | msgid "fast-forwardable" |
81809b99 | 12505 | msgstr "可快进" |
8ada9598 | 12506 | |
6937cb4e | 12507 | #: builtin/remote.c:1033 |
8ada9598 | 12508 | msgid "local out of date" |
81809b99 | 12509 | msgstr "本地已过时" |
8ada9598 | 12510 | |
6937cb4e | 12511 | #: builtin/remote.c:1040 |
8ada9598 JX |
12512 | #, c-format |
12513 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 12514 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 12515 | |
6937cb4e | 12516 | #: builtin/remote.c:1043 |
8ada9598 JX |
12517 | #, c-format |
12518 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 12519 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 12520 | |
6937cb4e | 12521 | #: builtin/remote.c:1047 |
8ada9598 JX |
12522 | #, c-format |
12523 | msgid " %-*s forces to %s" | |
81809b99 | 12524 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 12525 | |
6937cb4e | 12526 | #: builtin/remote.c:1050 |
8ada9598 JX |
12527 | #, c-format |
12528 | msgid " %-*s pushes to %s" | |
81809b99 | 12529 | msgstr " %-*s 推送至 %s" |
8ada9598 | 12530 | |
6937cb4e | 12531 | #: builtin/remote.c:1118 |
ef317cd5 | 12532 | msgid "do not query remotes" |
07432cef | 12533 | msgstr "不查询远程" |
ef317cd5 | 12534 | |
6937cb4e | 12535 | #: builtin/remote.c:1145 |
81809b99 | 12536 | #, c-format |
8ada9598 | 12537 | msgid "* remote %s" |
81809b99 | 12538 | msgstr "* 远程 %s" |
8ada9598 | 12539 | |
6937cb4e | 12540 | #: builtin/remote.c:1146 |
8ada9598 JX |
12541 | #, c-format |
12542 | msgid " Fetch URL: %s" | |
81809b99 | 12543 | msgstr " 获取地址:%s" |
8ada9598 | 12544 | |
6937cb4e | 12545 | #: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 |
8ada9598 | 12546 | msgid "(no URL)" |
81809b99 | 12547 | msgstr "(无 URL)" |
8ada9598 | 12548 | |
a4f16749 JX |
12549 | #. TRANSLATORS: the colon ':' should align |
12550 | #. with the one in " Fetch URL: %s" | |
12551 | #. translation. | |
12552 | #. | |
6937cb4e | 12553 | #: builtin/remote.c:1161 builtin/remote.c:1163 |
8ada9598 JX |
12554 | #, c-format |
12555 | msgid " Push URL: %s" | |
81809b99 | 12556 | msgstr " 推送地址:%s" |
8ada9598 | 12557 | |
6937cb4e | 12558 | #: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 |
81809b99 | 12559 | #, c-format |
8ada9598 | 12560 | msgid " HEAD branch: %s" |
4375c10e | 12561 | msgstr " HEAD 分支:%s" |
8ada9598 | 12562 | |
5c57d762 | 12563 | # 译者:中文字符串拼接,可删除前导空格 |
6937cb4e | 12564 | #: builtin/remote.c:1165 |
5c57d762 JX |
12565 | msgid "(not queried)" |
12566 | msgstr "(未查询)" | |
12567 | ||
6937cb4e | 12568 | #: builtin/remote.c:1167 |
5c57d762 JX |
12569 | msgid "(unknown)" |
12570 | msgstr "(未知)" | |
12571 | ||
6937cb4e | 12572 | #: builtin/remote.c:1171 |
8ada9598 JX |
12573 | #, c-format |
12574 | msgid "" | |
12575 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 12576 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 12577 | |
6937cb4e | 12578 | #: builtin/remote.c:1183 |
81809b99 | 12579 | #, c-format |
8ada9598 JX |
12580 | msgid " Remote branch:%s" |
12581 | msgid_plural " Remote branches:%s" | |
81809b99 | 12582 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 12583 | msgstr[1] " 远程分支:%s" |
8ada9598 | 12584 | |
81809b99 | 12585 | # 译者:中文字符串拼接,可删除前导空格 |
6937cb4e | 12586 | #: builtin/remote.c:1186 builtin/remote.c:1212 |
8ada9598 | 12587 | msgid " (status not queried)" |
81809b99 | 12588 | msgstr "(状态未查询)" |
8ada9598 | 12589 | |
6937cb4e | 12590 | #: builtin/remote.c:1195 |
8ada9598 JX |
12591 | msgid " Local branch configured for 'git pull':" |
12592 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 12593 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 12594 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 12595 | |
6937cb4e | 12596 | #: builtin/remote.c:1203 |
8ada9598 | 12597 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 12598 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 12599 | |
6937cb4e | 12600 | #: builtin/remote.c:1209 |
81809b99 | 12601 | #, c-format |
8ada9598 JX |
12602 | msgid " Local ref configured for 'git push'%s:" |
12603 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 12604 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 12605 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 12606 | |
6937cb4e | 12607 | #: builtin/remote.c:1230 |
ef317cd5 | 12608 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 12609 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 12610 | |
6937cb4e | 12611 | #: builtin/remote.c:1232 |
ef317cd5 | 12612 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 12613 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 12614 | |
6937cb4e | 12615 | #: builtin/remote.c:1247 |
8ada9598 | 12616 | msgid "Cannot determine remote HEAD" |
81809b99 | 12617 | msgstr "无法确定远程 HEAD" |
8ada9598 | 12618 | |
6937cb4e | 12619 | #: builtin/remote.c:1249 |
8ada9598 | 12620 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 12621 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 12622 | |
6937cb4e | 12623 | #: builtin/remote.c:1259 |
81809b99 | 12624 | #, c-format |
8ada9598 | 12625 | msgid "Could not delete %s" |
81809b99 | 12626 | msgstr "无法删除 %s" |
8ada9598 | 12627 | |
6937cb4e | 12628 | #: builtin/remote.c:1267 |
81809b99 | 12629 | #, c-format |
8ada9598 | 12630 | msgid "Not a valid ref: %s" |
81809b99 | 12631 | msgstr "不是一个有效引用:%s" |
8ada9598 | 12632 | |
6937cb4e | 12633 | #: builtin/remote.c:1269 |
81809b99 | 12634 | #, c-format |
8ada9598 | 12635 | msgid "Could not setup %s" |
81809b99 | 12636 | msgstr "不能设置 %s" |
8ada9598 JX |
12637 | |
12638 | # 译者:注意保持前导空格 | |
6937cb4e | 12639 | #: builtin/remote.c:1287 |
81809b99 | 12640 | #, c-format |
8ada9598 | 12641 | msgid " %s will become dangling!" |
07432cef | 12642 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
12643 | |
12644 | # 译者:注意保持前导空格 | |
6937cb4e | 12645 | #: builtin/remote.c:1288 |
81809b99 | 12646 | #, c-format |
8ada9598 | 12647 | msgid " %s has become dangling!" |
07432cef | 12648 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 12649 | |
6937cb4e | 12650 | #: builtin/remote.c:1298 |
81809b99 | 12651 | #, c-format |
8ada9598 | 12652 | msgid "Pruning %s" |
81809b99 | 12653 | msgstr "修剪 %s" |
8ada9598 | 12654 | |
6937cb4e | 12655 | #: builtin/remote.c:1299 |
8ada9598 JX |
12656 | #, c-format |
12657 | msgid "URL: %s" | |
81809b99 | 12658 | msgstr "URL:%s" |
8ada9598 | 12659 | |
6937cb4e | 12660 | #: builtin/remote.c:1315 |
8ada9598 JX |
12661 | #, c-format |
12662 | msgid " * [would prune] %s" | |
81809b99 | 12663 | msgstr " * [将删除] %s" |
8ada9598 | 12664 | |
6937cb4e | 12665 | #: builtin/remote.c:1318 |
8ada9598 JX |
12666 | #, c-format |
12667 | msgid " * [pruned] %s" | |
81809b99 | 12668 | msgstr " * [已删除] %s" |
8ada9598 | 12669 | |
6937cb4e | 12670 | #: builtin/remote.c:1363 |
ef317cd5 | 12671 | msgid "prune remotes after fetching" |
07432cef | 12672 | msgstr "抓取后清除远程" |
ef317cd5 | 12673 | |
6937cb4e | 12674 | #: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 |
81809b99 | 12675 | #, c-format |
8ada9598 | 12676 | msgid "No such remote '%s'" |
81809b99 | 12677 | msgstr "没有此远程 '%s'" |
8ada9598 | 12678 | |
6937cb4e | 12679 | #: builtin/remote.c:1442 |
ef317cd5 | 12680 | msgid "add branch" |
07432cef | 12681 | msgstr "添加分支" |
ef317cd5 | 12682 | |
6937cb4e | 12683 | #: builtin/remote.c:1449 |
8ada9598 | 12684 | msgid "no remote specified" |
81809b99 | 12685 | msgstr "未指定远程" |
8ada9598 | 12686 | |
6937cb4e | 12687 | #: builtin/remote.c:1466 |
94550ed3 JX |
12688 | msgid "query push URLs rather than fetch URLs" |
12689 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
12690 | ||
6937cb4e | 12691 | #: builtin/remote.c:1468 |
94550ed3 JX |
12692 | msgid "return all URLs" |
12693 | msgstr "返回所有 URL 地址" | |
12694 | ||
6937cb4e | 12695 | #: builtin/remote.c:1496 |
94550ed3 JX |
12696 | #, c-format |
12697 | msgid "no URLs configured for remote '%s'" | |
12698 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
12699 | ||
6937cb4e | 12700 | #: builtin/remote.c:1522 |
ef317cd5 | 12701 | msgid "manipulate push URLs" |
07432cef | 12702 | msgstr "操作推送 URLS" |
ef317cd5 | 12703 | |
6937cb4e | 12704 | #: builtin/remote.c:1524 |
ef317cd5 | 12705 | msgid "add URL" |
07432cef | 12706 | msgstr "添加 URL" |
ef317cd5 | 12707 | |
6937cb4e | 12708 | #: builtin/remote.c:1526 |
ef317cd5 | 12709 | msgid "delete URLs" |
07432cef | 12710 | msgstr "删除 URLS" |
ef317cd5 | 12711 | |
6937cb4e | 12712 | #: builtin/remote.c:1533 |
8ada9598 | 12713 | msgid "--add --delete doesn't make sense" |
81809b99 | 12714 | msgstr "--add --delete 无意义" |
8ada9598 | 12715 | |
6937cb4e | 12716 | #: builtin/remote.c:1572 |
81809b99 | 12717 | #, c-format |
8ada9598 | 12718 | msgid "Invalid old URL pattern: %s" |
4375c10e | 12719 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 12720 | |
6937cb4e | 12721 | #: builtin/remote.c:1580 |
81809b99 | 12722 | #, c-format |
8ada9598 | 12723 | msgid "No such URL found: %s" |
4375c10e | 12724 | msgstr "未找到此 URL:%s" |
8ada9598 | 12725 | |
6937cb4e | 12726 | #: builtin/remote.c:1582 |
8ada9598 | 12727 | msgid "Will not delete all non-push URLs" |
4375c10e | 12728 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 12729 | |
6937cb4e | 12730 | #: builtin/remote.c:1598 |
ef317cd5 | 12731 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 12732 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 12733 | |
6937cb4e | 12734 | #: builtin/remote.c:1629 |
a0b6b246 JX |
12735 | #, c-format |
12736 | msgid "Unknown subcommand: %s" | |
12737 | msgstr "未知子命令:%s" | |
12738 | ||
a4f16749 | 12739 | #: builtin/repack.c:18 |
814ff314 JX |
12740 | msgid "git repack [<options>]" |
12741 | msgstr "git repack [<选项>]" | |
90314792 | 12742 | |
a4f16749 | 12743 | #: builtin/repack.c:23 |
1a79b2f1 JX |
12744 | msgid "" |
12745 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
12746 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
12747 | msgstr "" | |
12748 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
12749 | "或禁用 pack.writebitmaps 配置。" | |
12750 | ||
31e5e17b | 12751 | #: builtin/repack.c:170 |
90314792 JX |
12752 | msgid "pack everything in a single pack" |
12753 | msgstr "所有内容打包到一个包文件中" | |
12754 | ||
31e5e17b | 12755 | #: builtin/repack.c:172 |
90314792 JX |
12756 | msgid "same as -a, and turn unreachable objects loose" |
12757 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
12758 | ||
31e5e17b | 12759 | #: builtin/repack.c:175 |
90314792 JX |
12760 | msgid "remove redundant packs, and run git-prune-packed" |
12761 | msgstr "删除多余的包,运行 git-prune-packed" | |
12762 | ||
31e5e17b | 12763 | #: builtin/repack.c:177 |
90314792 JX |
12764 | msgid "pass --no-reuse-delta to git-pack-objects" |
12765 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
12766 | ||
31e5e17b | 12767 | #: builtin/repack.c:179 |
90314792 JX |
12768 | msgid "pass --no-reuse-object to git-pack-objects" |
12769 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
12770 | ||
31e5e17b | 12771 | #: builtin/repack.c:181 |
90314792 JX |
12772 | msgid "do not run git-update-server-info" |
12773 | msgstr "不运行 git-update-server-info" | |
12774 | ||
31e5e17b | 12775 | #: builtin/repack.c:184 |
90314792 JX |
12776 | msgid "pass --local to git-pack-objects" |
12777 | msgstr "向 git-pack-objects 传递参数 --local" | |
12778 | ||
31e5e17b | 12779 | #: builtin/repack.c:186 |
6c94aba5 JX |
12780 | msgid "write bitmap index" |
12781 | msgstr "写 bitmap 索引" | |
12782 | ||
31e5e17b | 12783 | #: builtin/repack.c:187 |
90314792 JX |
12784 | msgid "approxidate" |
12785 | msgstr "近似日期" | |
12786 | ||
31e5e17b | 12787 | #: builtin/repack.c:188 |
90314792 JX |
12788 | msgid "with -A, do not loosen objects older than this" |
12789 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
12790 | ||
31e5e17b | 12791 | #: builtin/repack.c:190 |
5c57d762 JX |
12792 | msgid "with -a, repack unreachable objects" |
12793 | msgstr "使用 -a ,重新对不可达对象打包" | |
12794 | ||
31e5e17b | 12795 | #: builtin/repack.c:192 |
90314792 JX |
12796 | msgid "size of the window used for delta compression" |
12797 | msgstr "用于增量压缩的窗口值" | |
12798 | ||
31e5e17b | 12799 | #: builtin/repack.c:193 builtin/repack.c:199 |
8376b58d JX |
12800 | msgid "bytes" |
12801 | msgstr "字节" | |
12802 | ||
31e5e17b | 12803 | #: builtin/repack.c:194 |
90314792 JX |
12804 | msgid "same as the above, but limit memory size instead of entries count" |
12805 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
12806 | ||
31e5e17b | 12807 | #: builtin/repack.c:196 |
90314792 JX |
12808 | msgid "limits the maximum delta depth" |
12809 | msgstr "限制最大增量深度" | |
12810 | ||
31e5e17b | 12811 | #: builtin/repack.c:198 |
a4f16749 JX |
12812 | msgid "limits the maximum number of threads" |
12813 | msgstr "限制最大线程数" | |
12814 | ||
31e5e17b | 12815 | #: builtin/repack.c:200 |
90314792 | 12816 | msgid "maximum size of each packfile" |
dbd6cced | 12817 | msgstr "每个包文件的最大尺寸" |
90314792 | 12818 | |
31e5e17b | 12819 | #: builtin/repack.c:202 |
6c94aba5 JX |
12820 | msgid "repack objects in packs marked with .keep" |
12821 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
12822 | ||
31e5e17b | 12823 | #: builtin/repack.c:212 |
94550ed3 JX |
12824 | msgid "cannot delete packs in a precious-objects repo" |
12825 | msgstr "不能删除珍品仓库中的打包文件" | |
12826 | ||
31e5e17b | 12827 | #: builtin/repack.c:216 |
5c57d762 JX |
12828 | msgid "--keep-unreachable and -A are incompatible" |
12829 | msgstr "--keep-unreachable 和 -A 不兼容" | |
12830 | ||
31e5e17b | 12831 | #: builtin/repack.c:410 builtin/worktree.c:148 |
90314792 | 12832 | #, c-format |
5c57d762 JX |
12833 | msgid "failed to remove '%s'" |
12834 | msgstr "无法删除 '%s'" | |
90314792 | 12835 | |
a4f16749 | 12836 | #: builtin/replace.c:20 |
ef317cd5 | 12837 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 12838 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 12839 | |
a4f16749 | 12840 | #: builtin/replace.c:21 |
6acbf033 JX |
12841 | msgid "git replace [-f] --edit <object>" |
12842 | msgstr "git replace [-f] --edit <对象>" | |
12843 | ||
a4f16749 | 12844 | #: builtin/replace.c:22 |
6acbf033 JX |
12845 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
12846 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
12847 | ||
a4f16749 | 12848 | #: builtin/replace.c:23 |
ef317cd5 | 12849 | msgid "git replace -d <object>..." |
07432cef | 12850 | msgstr "git replace -d <对象>..." |
ef317cd5 | 12851 | |
a4f16749 | 12852 | #: builtin/replace.c:24 |
cfff71a9 JX |
12853 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
12854 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 12855 | |
a4f16749 | 12856 | #: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 |
6acbf033 JX |
12857 | #, c-format |
12858 | msgid "Not a valid object name: '%s'" | |
12859 | msgstr "不是一个有效的对象名:'%s'" | |
12860 | ||
a4f16749 | 12861 | #: builtin/replace.c:361 |
6acbf033 JX |
12862 | #, c-format |
12863 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 12864 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 12865 | |
a4f16749 | 12866 | #: builtin/replace.c:363 |
6acbf033 JX |
12867 | #, c-format |
12868 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 12869 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 12870 | |
a4f16749 | 12871 | #: builtin/replace.c:374 |
6acbf033 JX |
12872 | #, c-format |
12873 | msgid "" | |
12874 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
12875 | "instead of --graft" | |
55a16ee4 | 12876 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 12877 | |
a4f16749 | 12878 | #: builtin/replace.c:407 |
6acbf033 JX |
12879 | #, c-format |
12880 | msgid "the original commit '%s' has a gpg signature." | |
12881 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
12882 | ||
a4f16749 | 12883 | #: builtin/replace.c:408 |
6acbf033 JX |
12884 | msgid "the signature will be removed in the replacement commit!" |
12885 | msgstr "在替换的提交中签名将被移除!" | |
12886 | ||
a4f16749 | 12887 | #: builtin/replace.c:414 |
6acbf033 JX |
12888 | #, c-format |
12889 | msgid "could not write replacement commit for: '%s'" | |
12890 | msgstr "不能为 '%s' 写替换提交" | |
12891 | ||
a4f16749 | 12892 | #: builtin/replace.c:438 |
ef317cd5 | 12893 | msgid "list replace refs" |
07432cef | 12894 | msgstr "列出替换的引用" |
ef317cd5 | 12895 | |
a4f16749 | 12896 | #: builtin/replace.c:439 |
ef317cd5 | 12897 | msgid "delete replace refs" |
07432cef | 12898 | msgstr "删除替换的引用" |
ef317cd5 | 12899 | |
a4f16749 | 12900 | #: builtin/replace.c:440 |
6acbf033 JX |
12901 | msgid "edit existing object" |
12902 | msgstr "编辑现存的对象" | |
12903 | ||
a4f16749 | 12904 | #: builtin/replace.c:441 |
6acbf033 JX |
12905 | msgid "change a commit's parents" |
12906 | msgstr "修改一个提交的父提交" | |
12907 | ||
a4f16749 | 12908 | #: builtin/replace.c:442 |
ef317cd5 | 12909 | msgid "replace the ref if it exists" |
07432cef | 12910 | msgstr "如果存在则替换引用" |
ef317cd5 | 12911 | |
31e5e17b | 12912 | #: builtin/replace.c:444 |
6acbf033 JX |
12913 | msgid "do not pretty-print contents for --edit" |
12914 | msgstr "不要为 --edit 操作美观显示内容" | |
12915 | ||
31e5e17b | 12916 | #: builtin/replace.c:445 |
cfff71a9 JX |
12917 | msgid "use this format" |
12918 | msgstr "使用此格式" | |
12919 | ||
a4f16749 | 12920 | #: builtin/rerere.c:13 |
814ff314 JX |
12921 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
12922 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 12923 | |
a4f16749 | 12924 | #: builtin/rerere.c:59 |
ef317cd5 | 12925 | msgid "register clean resolutions in index" |
07432cef | 12926 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 12927 | |
a4f16749 | 12928 | #: builtin/reset.c:29 |
ef317cd5 JX |
12929 | msgid "" |
12930 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 12931 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 12932 | |
a4f16749 | 12933 | #: builtin/reset.c:30 |
a0b6b246 JX |
12934 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
12935 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 12936 | |
a4f16749 | 12937 | #: builtin/reset.c:31 |
07432cef WS |
12938 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
12939 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 12940 | |
a4f16749 | 12941 | #: builtin/reset.c:37 |
c04f5ac3 JX |
12942 | msgid "mixed" |
12943 | msgstr "混杂" | |
12944 | ||
a4f16749 | 12945 | #: builtin/reset.c:37 |
c04f5ac3 JX |
12946 | msgid "soft" |
12947 | msgstr "软性" | |
12948 | ||
a4f16749 | 12949 | #: builtin/reset.c:37 |
c04f5ac3 JX |
12950 | msgid "hard" |
12951 | msgstr "硬性" | |
12952 | ||
a4f16749 | 12953 | #: builtin/reset.c:37 |
8ada9598 JX |
12954 | msgid "merge" |
12955 | msgstr "合并" | |
12956 | ||
a4f16749 | 12957 | #: builtin/reset.c:37 |
c04f5ac3 JX |
12958 | msgid "keep" |
12959 | msgstr "保持" | |
12960 | ||
6937cb4e | 12961 | #: builtin/reset.c:78 |
c04f5ac3 JX |
12962 | msgid "You do not have a valid HEAD." |
12963 | msgstr "您没有一个有效的 HEAD。" | |
12964 | ||
6937cb4e | 12965 | #: builtin/reset.c:80 |
c04f5ac3 JX |
12966 | msgid "Failed to find tree of HEAD." |
12967 | msgstr "无法找到 HEAD 指向的树。" | |
12968 | ||
6937cb4e | 12969 | #: builtin/reset.c:86 |
c04f5ac3 JX |
12970 | #, c-format |
12971 | msgid "Failed to find tree of %s." | |
12972 | msgstr "无法找到 %s 指向的树。" | |
12973 | ||
31e5e17b | 12974 | #: builtin/reset.c:111 |
c04f5ac3 JX |
12975 | #, c-format |
12976 | msgid "HEAD is now at %s" | |
12977 | msgstr "HEAD 现在位于 %s" | |
12978 | ||
90e6ef53 | 12979 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 12980 | #: builtin/reset.c:189 |
c04f5ac3 JX |
12981 | #, c-format |
12982 | msgid "Cannot do a %s reset in the middle of a merge." | |
12983 | msgstr "在合并过程中不能做%s重置操作。" | |
12984 | ||
31e5e17b | 12985 | #: builtin/reset.c:289 |
ef317cd5 | 12986 | msgid "be quiet, only report errors" |
07432cef | 12987 | msgstr "安静模式,只报告错误" |
ef317cd5 | 12988 | |
31e5e17b | 12989 | #: builtin/reset.c:291 |
ef317cd5 | 12990 | msgid "reset HEAD and index" |
07432cef | 12991 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 12992 | |
31e5e17b | 12993 | #: builtin/reset.c:292 |
ef317cd5 | 12994 | msgid "reset only HEAD" |
07432cef | 12995 | msgstr "只重置 HEAD" |
ef317cd5 | 12996 | |
31e5e17b | 12997 | #: builtin/reset.c:294 builtin/reset.c:296 |
ef317cd5 | 12998 | msgid "reset HEAD, index and working tree" |
07432cef | 12999 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 13000 | |
31e5e17b | 13001 | #: builtin/reset.c:298 |
ef317cd5 | 13002 | msgid "reset HEAD but keep local changes" |
07432cef | 13003 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 13004 | |
31e5e17b | 13005 | #: builtin/reset.c:304 |
6c94aba5 JX |
13006 | msgid "record only the fact that removed paths will be added later" |
13007 | msgstr "将删除的路径标记为稍后添加" | |
13008 | ||
31e5e17b | 13009 | #: builtin/reset.c:321 |
07432cef WS |
13010 | #, c-format |
13011 | msgid "Failed to resolve '%s' as a valid revision." | |
13012 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
13013 | ||
31e5e17b | 13014 | #: builtin/reset.c:329 |
07432cef WS |
13015 | #, c-format |
13016 | msgid "Failed to resolve '%s' as a valid tree." | |
13017 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
13018 | ||
31e5e17b | 13019 | #: builtin/reset.c:338 |
c04f5ac3 | 13020 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 13021 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 13022 | |
31e5e17b | 13023 | #: builtin/reset.c:347 |
c04f5ac3 | 13024 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 13025 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 13026 | |
90e6ef53 | 13027 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 13028 | #: builtin/reset.c:349 |
c04f5ac3 JX |
13029 | #, c-format |
13030 | msgid "Cannot do %s reset with paths." | |
13031 | msgstr "不能带路径进行%s重置。" | |
13032 | ||
90e6ef53 | 13033 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 13034 | #: builtin/reset.c:359 |
c04f5ac3 JX |
13035 | #, c-format |
13036 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 13037 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 13038 | |
31e5e17b | 13039 | #: builtin/reset.c:363 |
6c94aba5 JX |
13040 | msgid "-N can only be used with --mixed" |
13041 | msgstr "-N 只能和 --mixed 同时使用" | |
13042 | ||
31e5e17b | 13043 | #: builtin/reset.c:380 |
90314792 | 13044 | msgid "Unstaged changes after reset:" |
160fb2b2 | 13045 | msgstr "重置后取消暂存的变更:" |
90314792 | 13046 | |
31e5e17b | 13047 | #: builtin/reset.c:386 |
ef317cd5 JX |
13048 | #, c-format |
13049 | msgid "Could not reset index file to revision '%s'." | |
13050 | msgstr "不能重置索引文件至版本 '%s'。" | |
13051 | ||
31e5e17b | 13052 | #: builtin/reset.c:390 |
07432cef WS |
13053 | msgid "Could not write new index file." |
13054 | msgstr "不能写入新的索引文件。" | |
13055 | ||
31e5e17b JX |
13056 | #: builtin/rev-list.c:397 |
13057 | msgid "cannot combine --exclude-promisor-objects and --missing" | |
13058 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
13059 | ||
13060 | #: builtin/rev-list.c:455 | |
5809aa05 JX |
13061 | msgid "object filtering requires --objects" |
13062 | msgstr "对象过滤需要 --objects" | |
13063 | ||
31e5e17b | 13064 | #: builtin/rev-list.c:458 |
5809aa05 JX |
13065 | #, c-format |
13066 | msgid "invalid sparse value '%s'" | |
13067 | msgstr "无效的稀疏值 '%s'" | |
13068 | ||
31e5e17b | 13069 | #: builtin/rev-list.c:499 |
1b7f4a34 JX |
13070 | msgid "rev-list does not support display of notes" |
13071 | msgstr "rev-list 不支持显示注解" | |
13072 | ||
31e5e17b | 13073 | #: builtin/rev-list.c:502 |
5809aa05 JX |
13074 | msgid "cannot combine --use-bitmap-index with object filtering" |
13075 | msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" | |
13076 | ||
6937cb4e | 13077 | #: builtin/rev-parse.c:402 |
814ff314 JX |
13078 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
13079 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 13080 | |
6937cb4e | 13081 | #: builtin/rev-parse.c:407 |
ef317cd5 | 13082 | msgid "keep the `--` passed as an arg" |
07432cef | 13083 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 13084 | |
6937cb4e | 13085 | #: builtin/rev-parse.c:409 |
ef317cd5 | 13086 | msgid "stop parsing after the first non-option argument" |
07432cef | 13087 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 13088 | |
6937cb4e | 13089 | #: builtin/rev-parse.c:412 |
cfff71a9 JX |
13090 | msgid "output in stuck long form" |
13091 | msgstr "以固定长格式输出" | |
13092 | ||
6937cb4e | 13093 | #: builtin/rev-parse.c:545 |
ef317cd5 | 13094 | msgid "" |
814ff314 | 13095 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 13096 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 13097 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
13098 | "\n" |
13099 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
13100 | msgstr "" | |
814ff314 | 13101 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 13102 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 13103 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
13104 | "\n" |
13105 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 13106 | |
a4f16749 | 13107 | #: builtin/revert.c:23 |
814ff314 JX |
13108 | msgid "git revert [<options>] <commit-ish>..." |
13109 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 13110 | |
a4f16749 | 13111 | #: builtin/revert.c:24 |
ef317cd5 | 13112 | msgid "git revert <subcommand>" |
07432cef | 13113 | msgstr "git revert <子命令>" |
ef317cd5 | 13114 | |
a4f16749 | 13115 | #: builtin/revert.c:29 |
814ff314 JX |
13116 | msgid "git cherry-pick [<options>] <commit-ish>..." |
13117 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 13118 | |
a4f16749 | 13119 | #: builtin/revert.c:30 |
ef317cd5 | 13120 | msgid "git cherry-pick <subcommand>" |
07432cef | 13121 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 13122 | |
a4f16749 | 13123 | #: builtin/revert.c:90 |
ef317cd5 JX |
13124 | #, c-format |
13125 | msgid "%s: %s cannot be used with %s" | |
13126 | msgstr "%s:%s 不能和 %s 同时使用" | |
13127 | ||
a4f16749 | 13128 | #: builtin/revert.c:99 |
ef317cd5 | 13129 | msgid "end revert or cherry-pick sequence" |
07432cef | 13130 | msgstr "终止反转或拣选操作" |
ef317cd5 | 13131 | |
a4f16749 | 13132 | #: builtin/revert.c:100 |
ef317cd5 | 13133 | msgid "resume revert or cherry-pick sequence" |
07432cef | 13134 | msgstr "继续反转或拣选操作" |
ef317cd5 | 13135 | |
a4f16749 | 13136 | #: builtin/revert.c:101 |
ef317cd5 | 13137 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 13138 | msgstr "取消反转或拣选操作" |
ef317cd5 | 13139 | |
a4f16749 | 13140 | #: builtin/revert.c:102 |
ef317cd5 | 13141 | msgid "don't automatically commit" |
07432cef | 13142 | msgstr "不要自动提交" |
ef317cd5 | 13143 | |
a4f16749 | 13144 | #: builtin/revert.c:103 |
ef317cd5 | 13145 | msgid "edit the commit message" |
07432cef | 13146 | msgstr "编辑提交说明" |
ef317cd5 | 13147 | |
a4f16749 | 13148 | #: builtin/revert.c:106 |
87cb7997 | 13149 | msgid "parent-number" |
07432cef | 13150 | msgstr "父编号" |
ef317cd5 | 13151 | |
a4f16749 | 13152 | #: builtin/revert.c:107 |
87cb7997 JX |
13153 | msgid "select mainline parent" |
13154 | msgstr "选择主干父提交编号" | |
13155 | ||
a4f16749 | 13156 | #: builtin/revert.c:109 |
ef317cd5 | 13157 | msgid "merge strategy" |
07432cef | 13158 | msgstr "合并策略" |
ef317cd5 | 13159 | |
a4f16749 | 13160 | #: builtin/revert.c:110 |
ef317cd5 | 13161 | msgid "option" |
07432cef | 13162 | msgstr "选项" |
ef317cd5 | 13163 | |
a4f16749 | 13164 | #: builtin/revert.c:111 |
ef317cd5 | 13165 | msgid "option for merge strategy" |
07432cef | 13166 | msgstr "合并策略的选项" |
ef317cd5 | 13167 | |
a4f16749 | 13168 | #: builtin/revert.c:120 |
ef317cd5 | 13169 | msgid "append commit name" |
07432cef | 13170 | msgstr "追加提交名称" |
ef317cd5 | 13171 | |
a4f16749 | 13172 | #: builtin/revert.c:122 |
ef317cd5 | 13173 | msgid "preserve initially empty commits" |
07432cef | 13174 | msgstr "保留初始化的空提交" |
ef317cd5 | 13175 | |
a4f16749 | 13176 | #: builtin/revert.c:124 |
ef317cd5 | 13177 | msgid "keep redundant, empty commits" |
07432cef | 13178 | msgstr "保持多余的、空的提交" |
ef317cd5 | 13179 | |
6937cb4e | 13180 | #: builtin/revert.c:214 |
c04f5ac3 JX |
13181 | msgid "revert failed" |
13182 | msgstr "还原失败" | |
13183 | ||
6937cb4e | 13184 | #: builtin/revert.c:227 |
c04f5ac3 JX |
13185 | msgid "cherry-pick failed" |
13186 | msgstr "拣选失败" | |
13187 | ||
a4f16749 | 13188 | #: builtin/rm.c:18 |
814ff314 JX |
13189 | msgid "git rm [<options>] [--] <file>..." |
13190 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 13191 | |
a4f16749 | 13192 | #: builtin/rm.c:206 |
c04f5ac3 | 13193 | msgid "" |
2e8451e8 JX |
13194 | "the following file has staged content different from both the\n" |
13195 | "file and the HEAD:" | |
13196 | msgid_plural "" | |
13197 | "the following files have staged content different from both the\n" | |
13198 | "file and the HEAD:" | |
13199 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
13200 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
13201 | ||
a4f16749 | 13202 | #: builtin/rm.c:211 |
2e8451e8 JX |
13203 | msgid "" |
13204 | "\n" | |
c04f5ac3 JX |
13205 | "(use -f to force removal)" |
13206 | msgstr "" | |
2e8451e8 | 13207 | "\n" |
c04f5ac3 JX |
13208 | "(使用 -f 强制删除)" |
13209 | ||
a4f16749 | 13210 | #: builtin/rm.c:215 |
2e8451e8 JX |
13211 | msgid "the following file has changes staged in the index:" |
13212 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
13213 | msgstr[0] "下列文件索引中有变更" |
13214 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 13215 | |
a4f16749 | 13216 | #: builtin/rm.c:219 builtin/rm.c:228 |
c04f5ac3 | 13217 | msgid "" |
2e8451e8 | 13218 | "\n" |
c04f5ac3 JX |
13219 | "(use --cached to keep the file, or -f to force removal)" |
13220 | msgstr "" | |
2e8451e8 JX |
13221 | "\n" |
13222 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
13223 | ||
a4f16749 | 13224 | #: builtin/rm.c:225 |
2e8451e8 JX |
13225 | msgid "the following file has local modifications:" |
13226 | msgid_plural "the following files have local modifications:" | |
13227 | msgstr[0] "如下文件有本地修改:" | |
13228 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 13229 | |
a4f16749 | 13230 | #: builtin/rm.c:243 |
ef317cd5 | 13231 | msgid "do not list removed files" |
07432cef | 13232 | msgstr "不列出删除的文件" |
ef317cd5 | 13233 | |
a4f16749 | 13234 | #: builtin/rm.c:244 |
ef317cd5 | 13235 | msgid "only remove from the index" |
07432cef | 13236 | msgstr "只从索引区删除" |
ef317cd5 | 13237 | |
a4f16749 | 13238 | #: builtin/rm.c:245 |
ef317cd5 | 13239 | msgid "override the up-to-date check" |
07432cef | 13240 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 13241 | |
a4f16749 | 13242 | #: builtin/rm.c:246 |
ef317cd5 | 13243 | msgid "allow recursive removal" |
07432cef | 13244 | msgstr "允许递归删除" |
ef317cd5 | 13245 | |
a4f16749 | 13246 | #: builtin/rm.c:248 |
ef317cd5 | 13247 | msgid "exit with a zero status even if nothing matched" |
07432cef | 13248 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 13249 | |
6937cb4e | 13250 | #: builtin/rm.c:307 |
c04f5ac3 JX |
13251 | #, c-format |
13252 | msgid "not removing '%s' recursively without -r" | |
13253 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
13254 | ||
6937cb4e | 13255 | #: builtin/rm.c:346 |
c04f5ac3 JX |
13256 | #, c-format |
13257 | msgid "git rm: unable to remove %s" | |
13258 | msgstr "git rm:不能删除 %s" | |
13259 | ||
6937cb4e | 13260 | #: builtin/rm.c:369 |
1a79b2f1 JX |
13261 | #, c-format |
13262 | msgid "could not remove '%s'" | |
13263 | msgstr "无法删除 '%s'" | |
13264 | ||
a4f16749 | 13265 | #: builtin/send-pack.c:19 |
1b7f4a34 JX |
13266 | msgid "" |
13267 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
13268 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
13269 | "[<ref>...]\n" | |
13270 | " --all and explicit <ref> specification are mutually exclusive." | |
13271 | msgstr "" | |
13272 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
13273 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
13274 | " --all 和明确的 <引用> 互斥。" | |
13275 | ||
a4f16749 | 13276 | #: builtin/send-pack.c:162 |
1b7f4a34 JX |
13277 | msgid "remote name" |
13278 | msgstr "远程名称" | |
13279 | ||
a4f16749 | 13280 | #: builtin/send-pack.c:176 |
1b7f4a34 JX |
13281 | msgid "use stateless RPC protocol" |
13282 | msgstr "使用无状态的 RPC 协议" | |
13283 | ||
a4f16749 | 13284 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
13285 | msgid "read refs from stdin" |
13286 | msgstr "从标准输入读取引用" | |
13287 | ||
a4f16749 | 13288 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
13289 | msgid "print status from remote helper" |
13290 | msgstr "打印来自远程 helper 的状态" | |
13291 | ||
a4f16749 | 13292 | #: builtin/shortlog.c:14 |
814ff314 | 13293 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 13294 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 13295 | |
6937cb4e | 13296 | #: builtin/shortlog.c:263 |
1a79b2f1 JX |
13297 | msgid "Group by committer rather than author" |
13298 | msgstr "按照提交者分组而不是作者" | |
13299 | ||
6937cb4e | 13300 | #: builtin/shortlog.c:265 |
ef317cd5 | 13301 | msgid "sort output according to the number of commits per author" |
07432cef | 13302 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 13303 | |
6937cb4e | 13304 | #: builtin/shortlog.c:267 |
ef317cd5 | 13305 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 13306 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 13307 | |
6937cb4e | 13308 | #: builtin/shortlog.c:269 |
ef317cd5 | 13309 | msgid "Show the email address of each author" |
07432cef | 13310 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 13311 | |
6937cb4e | 13312 | #: builtin/shortlog.c:270 |
ef317cd5 | 13313 | msgid "w[,i1[,i2]]" |
07432cef | 13314 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 13315 | |
6937cb4e | 13316 | #: builtin/shortlog.c:271 |
ef317cd5 | 13317 | msgid "Linewrap output" |
07432cef | 13318 | msgstr "折行输出" |
ef317cd5 | 13319 | |
a4f16749 | 13320 | #: builtin/show-branch.c:12 |
ef317cd5 | 13321 | msgid "" |
814ff314 | 13322 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
13323 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
13324 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
13325 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 13326 | msgstr "" |
814ff314 | 13327 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
13328 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
13329 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
13330 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 13331 | |
a4f16749 | 13332 | #: builtin/show-branch.c:16 |
814ff314 | 13333 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 13334 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 13335 | |
a4f16749 | 13336 | #: builtin/show-branch.c:376 |
a0b6b246 JX |
13337 | #, c-format |
13338 | msgid "ignoring %s; cannot handle more than %d ref" | |
13339 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
13340 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
13341 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
13342 | ||
a4f16749 | 13343 | #: builtin/show-branch.c:530 |
a0b6b246 JX |
13344 | #, c-format |
13345 | msgid "no matching refs with %s" | |
13346 | msgstr "没有和 %s 匹配的引用" | |
13347 | ||
a4f16749 | 13348 | #: builtin/show-branch.c:626 |
ef317cd5 | 13349 | msgid "show remote-tracking and local branches" |
07432cef | 13350 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 13351 | |
a4f16749 | 13352 | #: builtin/show-branch.c:628 |
ef317cd5 | 13353 | msgid "show remote-tracking branches" |
07432cef | 13354 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 13355 | |
a4f16749 | 13356 | #: builtin/show-branch.c:630 |
ef317cd5 | 13357 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 13358 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 13359 | |
a4f16749 | 13360 | #: builtin/show-branch.c:632 |
ef317cd5 | 13361 | msgid "show <n> more commits after the common ancestor" |
07432cef | 13362 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 13363 | |
a4f16749 | 13364 | #: builtin/show-branch.c:634 |
ef317cd5 | 13365 | msgid "synonym to more=-1" |
07432cef | 13366 | msgstr "和 more=-1 同义" |
ef317cd5 | 13367 | |
a4f16749 | 13368 | #: builtin/show-branch.c:635 |
ef317cd5 | 13369 | msgid "suppress naming strings" |
07432cef | 13370 | msgstr "不显示字符串命名" |
ef317cd5 | 13371 | |
a4f16749 | 13372 | #: builtin/show-branch.c:637 |
ef317cd5 | 13373 | msgid "include the current branch" |
07432cef | 13374 | msgstr "包括当前分支" |
ef317cd5 | 13375 | |
a4f16749 | 13376 | #: builtin/show-branch.c:639 |
ef317cd5 | 13377 | msgid "name commits with their object names" |
07432cef | 13378 | msgstr "以对象名字命名提交" |
ef317cd5 | 13379 | |
a4f16749 | 13380 | #: builtin/show-branch.c:641 |
ef317cd5 | 13381 | msgid "show possible merge bases" |
07432cef | 13382 | msgstr "显示可能合并的基线" |
ef317cd5 | 13383 | |
a4f16749 | 13384 | #: builtin/show-branch.c:643 |
ef317cd5 | 13385 | msgid "show refs unreachable from any other ref" |
07432cef | 13386 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 13387 | |
a4f16749 | 13388 | #: builtin/show-branch.c:645 |
ef317cd5 | 13389 | msgid "show commits in topological order" |
07432cef | 13390 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 13391 | |
a4f16749 | 13392 | #: builtin/show-branch.c:648 |
ef317cd5 | 13393 | msgid "show only commits not on the first branch" |
07432cef | 13394 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 13395 | |
a4f16749 | 13396 | #: builtin/show-branch.c:650 |
ef317cd5 | 13397 | msgid "show merges reachable from only one tip" |
07432cef | 13398 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 13399 | |
a4f16749 | 13400 | #: builtin/show-branch.c:652 |
2e8451e8 JX |
13401 | msgid "topologically sort, maintaining date order where possible" |
13402 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 13403 | |
a4f16749 | 13404 | #: builtin/show-branch.c:655 |
ef317cd5 | 13405 | msgid "<n>[,<base>]" |
07432cef | 13406 | msgstr "<n>[,<base>]" |
ef317cd5 | 13407 | |
a4f16749 | 13408 | #: builtin/show-branch.c:656 |
ef317cd5 | 13409 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 13410 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 13411 | |
a4f16749 | 13412 | #: builtin/show-branch.c:690 |
a0b6b246 JX |
13413 | msgid "" |
13414 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
13415 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
13416 | ||
a4f16749 | 13417 | #: builtin/show-branch.c:714 |
a0b6b246 JX |
13418 | msgid "no branches given, and HEAD is not valid" |
13419 | msgstr "未提供分支,且 HEAD 无效" | |
13420 | ||
a4f16749 | 13421 | #: builtin/show-branch.c:717 |
a0b6b246 JX |
13422 | msgid "--reflog option needs one branch name" |
13423 | msgstr "选项 --reflog 需要一个分支名" | |
13424 | ||
a4f16749 | 13425 | #: builtin/show-branch.c:720 |
a0b6b246 JX |
13426 | #, c-format |
13427 | msgid "only %d entry can be shown at one time." | |
13428 | msgid_plural "only %d entries can be shown at one time." | |
13429 | msgstr[0] "一次只能显示 %d 个条目。" | |
13430 | msgstr[1] "一次只能显示 %d 个条目。" | |
13431 | ||
a4f16749 | 13432 | #: builtin/show-branch.c:724 |
a0b6b246 JX |
13433 | #, c-format |
13434 | msgid "no such ref %s" | |
13435 | msgstr "无此引用 %s" | |
13436 | ||
a4f16749 | 13437 | #: builtin/show-branch.c:808 |
a0b6b246 JX |
13438 | #, c-format |
13439 | msgid "cannot handle more than %d rev." | |
13440 | msgid_plural "cannot handle more than %d revs." | |
13441 | msgstr[0] "不能处理 %d 个以上的版本。" | |
13442 | msgstr[1] "不能处理 %d 个以上的版本。" | |
13443 | ||
a4f16749 | 13444 | #: builtin/show-branch.c:812 |
a0b6b246 JX |
13445 | #, c-format |
13446 | msgid "'%s' is not a valid ref." | |
13447 | msgstr "'%s' 不是一个有效的引用。" | |
13448 | ||
a4f16749 | 13449 | #: builtin/show-branch.c:815 |
a0b6b246 JX |
13450 | #, c-format |
13451 | msgid "cannot find commit %s (%s)" | |
29004bbb | 13452 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 13453 | |
ef317cd5 JX |
13454 | #: builtin/show-ref.c:10 |
13455 | msgid "" | |
814ff314 JX |
13456 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
13457 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 13458 | msgstr "" |
814ff314 JX |
13459 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
13460 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
13461 | |
13462 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
13463 | msgid "git show-ref --exclude-existing[=<pattern>]" |
13464 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 13465 | |
1a79b2f1 | 13466 | #: builtin/show-ref.c:159 |
ef317cd5 | 13467 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 13468 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 13469 | |
1a79b2f1 | 13470 | #: builtin/show-ref.c:160 |
ef317cd5 | 13471 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 13472 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 13473 | |
1a79b2f1 | 13474 | #: builtin/show-ref.c:161 |
ef317cd5 | 13475 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 13476 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 13477 | |
1a79b2f1 | 13478 | #: builtin/show-ref.c:164 builtin/show-ref.c:166 |
2e8451e8 JX |
13479 | msgid "show the HEAD reference, even if it would be filtered out" |
13480 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 13481 | |
1a79b2f1 | 13482 | #: builtin/show-ref.c:168 |
ef317cd5 | 13483 | msgid "dereference tags into object IDs" |
4375c10e | 13484 | msgstr "转换标签到对象 ID" |
ef317cd5 | 13485 | |
1a79b2f1 | 13486 | #: builtin/show-ref.c:170 |
ef317cd5 | 13487 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 13488 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 13489 | |
1a79b2f1 | 13490 | #: builtin/show-ref.c:174 |
ef317cd5 | 13491 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 13492 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 13493 | |
1a79b2f1 | 13494 | #: builtin/show-ref.c:176 |
ef317cd5 | 13495 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 13496 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 13497 | |
a4f16749 | 13498 | #: builtin/stripspace.c:18 |
94550ed3 JX |
13499 | msgid "git stripspace [-s | --strip-comments]" |
13500 | msgstr "git stripspace [-s | --strip-comments]" | |
13501 | ||
a4f16749 | 13502 | #: builtin/stripspace.c:19 |
94550ed3 JX |
13503 | msgid "git stripspace [-c | --comment-lines]" |
13504 | msgstr "git stripspace [-c | --comment-lines]" | |
13505 | ||
a4f16749 | 13506 | #: builtin/stripspace.c:36 |
94550ed3 JX |
13507 | msgid "skip and remove all lines starting with comment character" |
13508 | msgstr "跳过和移除所有的注释行" | |
13509 | ||
a4f16749 | 13510 | #: builtin/stripspace.c:39 |
276ceeaa | 13511 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
13512 | msgstr "为每一行的行首添加注释符和空格" |
13513 | ||
31e5e17b | 13514 | #: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 |
5b04ee3b JX |
13515 | #, c-format |
13516 | msgid "No such ref: %s" | |
13517 | msgstr "没有这样的引用:%s" | |
13518 | ||
31e5e17b | 13519 | #: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 |
5b04ee3b JX |
13520 | #, c-format |
13521 | msgid "Expecting a full ref name, got %s" | |
13522 | msgstr "期望一个完整的引用名称,却得到 %s" | |
13523 | ||
31e5e17b JX |
13524 | #: builtin/submodule--helper.c:59 |
13525 | msgid "submodule--helper print-default-remote takes no arguments" | |
13526 | msgstr "submodule--helper print-default-remote 不带参数" | |
13527 | ||
13528 | #: builtin/submodule--helper.c:96 | |
5b04ee3b JX |
13529 | #, c-format |
13530 | msgid "cannot strip one component off url '%s'" | |
13531 | msgstr "无法从 url '%s' 剥离一个组件" | |
13532 | ||
31e5e17b | 13533 | #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 |
94550ed3 JX |
13534 | msgid "alternative anchor for relative paths" |
13535 | msgstr "相对路径的替代锚记(anchor)" | |
13536 | ||
31e5e17b | 13537 | #: builtin/submodule--helper.c:409 |
94550ed3 JX |
13538 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
13539 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
13540 | ||
31e5e17b | 13541 | #: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 |
5b04ee3b JX |
13542 | #, c-format |
13543 | msgid "No url found for submodule path '%s' in .gitmodules" | |
13544 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
13545 | ||
31e5e17b | 13546 | #: builtin/submodule--helper.c:498 |
87cb7997 JX |
13547 | #, c-format |
13548 | msgid "" | |
13549 | "could not lookup configuration '%s'. Assuming this repository is its own " | |
13550 | "authoritative upstream." | |
13551 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
13552 | ||
31e5e17b | 13553 | #: builtin/submodule--helper.c:509 |
5b04ee3b JX |
13554 | #, c-format |
13555 | msgid "Failed to register url for submodule path '%s'" | |
13556 | msgstr "无法为子模组 '%s' 注册 url" | |
13557 | ||
31e5e17b | 13558 | #: builtin/submodule--helper.c:513 |
5b04ee3b JX |
13559 | #, c-format |
13560 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 13561 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
13562 | |
13563 | # | |
31e5e17b | 13564 | #: builtin/submodule--helper.c:523 |
aef18cc6 | 13565 | #, c-format |
5b04ee3b | 13566 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 13567 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 13568 | |
31e5e17b | 13569 | #: builtin/submodule--helper.c:530 |
5b04ee3b JX |
13570 | #, c-format |
13571 | msgid "Failed to register update mode for submodule path '%s'" | |
13572 | msgstr "无法为子模组 '%s' 注册更新模式" | |
13573 | ||
31e5e17b | 13574 | #: builtin/submodule--helper.c:552 |
5b04ee3b | 13575 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 13576 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 13577 | |
31e5e17b | 13578 | #: builtin/submodule--helper.c:557 |
5b04ee3b JX |
13579 | msgid "git submodule--helper init [<path>]" |
13580 | msgstr "git submodule--helper init [<路径>]" | |
13581 | ||
31e5e17b | 13582 | #: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 |
94550ed3 JX |
13583 | #, c-format |
13584 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
13585 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
13586 | ||
31e5e17b | 13587 | #: builtin/submodule--helper.c:660 |
5809aa05 JX |
13588 | #, c-format |
13589 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
13590 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
13591 | ||
31e5e17b | 13592 | #: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 |
5809aa05 JX |
13593 | #, c-format |
13594 | msgid "failed to recurse into submodule '%s'" | |
13595 | msgstr "无法递归子模组 '%s'" | |
13596 | ||
31e5e17b | 13597 | #: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 |
5809aa05 | 13598 | msgid "Suppress submodule status output" |
31e5e17b | 13599 | msgstr "阻止子模组状态输出" |
5809aa05 | 13600 | |
31e5e17b | 13601 | #: builtin/submodule--helper.c:712 |
5809aa05 JX |
13602 | msgid "" |
13603 | "Use commit stored in the index instead of the one stored in the submodule " | |
13604 | "HEAD" | |
13605 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
13606 | ||
31e5e17b | 13607 | #: builtin/submodule--helper.c:713 |
5809aa05 | 13608 | msgid "recurse into nested submodules" |
31e5e17b | 13609 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 13610 | |
31e5e17b | 13611 | #: builtin/submodule--helper.c:718 |
5809aa05 JX |
13612 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
13613 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
13614 | ||
31e5e17b | 13615 | #: builtin/submodule--helper.c:742 |
5809aa05 JX |
13616 | msgid "git submodule--helper name <path>" |
13617 | msgstr "git submodule--helper name <路径>" | |
13618 | ||
31e5e17b JX |
13619 | #: builtin/submodule--helper.c:806 |
13620 | #, c-format | |
13621 | msgid "Synchronizing submodule url for '%s'\n" | |
13622 | msgstr "为 '%s' 同步子模组 url\n" | |
13623 | ||
13624 | #: builtin/submodule--helper.c:812 | |
13625 | #, c-format | |
13626 | msgid "failed to register url for submodule path '%s'" | |
13627 | msgstr "无法为子模组路径 '%s' 注册 url" | |
13628 | ||
13629 | #: builtin/submodule--helper.c:826 | |
13630 | #, c-format | |
13631 | msgid "failed to get the default remote for submodule '%s'" | |
13632 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
13633 | ||
13634 | #: builtin/submodule--helper.c:837 | |
13635 | #, c-format | |
13636 | msgid "failed to update remote for submodule '%s'" | |
13637 | msgstr "无法为子模组 '%s' 更新远程关联" | |
13638 | ||
13639 | #: builtin/submodule--helper.c:885 | |
13640 | msgid "Suppress output of synchronizing submodule url" | |
13641 | msgstr "阻止子模组 url 同步的输出" | |
13642 | ||
13643 | #: builtin/submodule--helper.c:887 | |
13644 | msgid "Recurse into nested submodules" | |
13645 | msgstr "递归进入嵌套子模组中" | |
13646 | ||
13647 | #: builtin/submodule--helper.c:892 | |
13648 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" | |
13649 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
13650 | ||
13651 | #: builtin/submodule--helper.c:946 | |
13652 | #, c-format | |
13653 | msgid "" | |
13654 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
13655 | "really want to remove it including all of its history)" | |
13656 | msgstr "" | |
13657 | "子模组工作区 '%s' 包含一个 .git 目录(如果您真的想删除它及其全部历史,使用 " | |
13658 | "'rm -rf' 命令)" | |
13659 | ||
13660 | #: builtin/submodule--helper.c:958 | |
13661 | #, c-format | |
13662 | msgid "" | |
13663 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
13664 | "them" | |
13665 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
13666 | ||
13667 | #: builtin/submodule--helper.c:966 | |
13668 | #, c-format | |
13669 | msgid "Cleared directory '%s'\n" | |
13670 | msgstr "已清除目录 '%s'\n" | |
13671 | ||
13672 | #: builtin/submodule--helper.c:968 | |
13673 | #, c-format | |
13674 | msgid "Could not remove submodule work tree '%s'\n" | |
13675 | msgstr "无法移除子模组工作区 '%s'\n" | |
13676 | ||
13677 | #: builtin/submodule--helper.c:977 | |
13678 | #, c-format | |
13679 | msgid "could not create empty submodule directory %s" | |
13680 | msgstr "不能创建空的子模组目录 %s" | |
13681 | ||
13682 | #: builtin/submodule--helper.c:993 | |
13683 | #, c-format | |
13684 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
13685 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
13686 | ||
13687 | #: builtin/submodule--helper.c:1022 | |
13688 | msgid "Remove submodule working trees even if they contain local changes" | |
13689 | msgstr "删除子模组工作区,即使包含本地修改" | |
13690 | ||
13691 | #: builtin/submodule--helper.c:1023 | |
13692 | msgid "Unregister all submodules" | |
13693 | msgstr "将所有子模组取消注册" | |
13694 | ||
13695 | #: builtin/submodule--helper.c:1028 | |
13696 | msgid "" | |
13697 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
13698 | msgstr "" | |
13699 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
13700 | ||
13701 | #: builtin/submodule--helper.c:1042 | |
13702 | msgid "Use '--all' if you really want to deinitialize all submodules" | |
13703 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
13704 | ||
13705 | #: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 | |
a0b6b246 JX |
13706 | #, c-format |
13707 | msgid "submodule '%s' cannot add alternate: %s" | |
13708 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
13709 | ||
31e5e17b | 13710 | #: builtin/submodule--helper.c:1172 |
a0b6b246 JX |
13711 | #, c-format |
13712 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
13713 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
13714 | ||
31e5e17b | 13715 | #: builtin/submodule--helper.c:1179 |
a0b6b246 JX |
13716 | #, c-format |
13717 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
13718 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
13719 | ||
31e5e17b | 13720 | #: builtin/submodule--helper.c:1201 |
94550ed3 JX |
13721 | msgid "where the new submodule will be cloned to" |
13722 | msgstr "新的子模组将要克隆的路径" | |
13723 | ||
31e5e17b | 13724 | #: builtin/submodule--helper.c:1204 |
94550ed3 JX |
13725 | msgid "name of the new submodule" |
13726 | msgstr "新子模组的名称" | |
13727 | ||
31e5e17b | 13728 | #: builtin/submodule--helper.c:1207 |
94550ed3 JX |
13729 | msgid "url where to clone the submodule from" |
13730 | msgstr "克隆子模组的 url 地址" | |
13731 | ||
31e5e17b | 13732 | #: builtin/submodule--helper.c:1213 |
94550ed3 JX |
13733 | msgid "depth for shallow clones" |
13734 | msgstr "浅克隆的深度" | |
13735 | ||
31e5e17b | 13736 | #: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 |
a0b6b246 | 13737 | msgid "force cloning progress" |
29004bbb | 13738 | msgstr "强制显示克隆进度" |
a0b6b246 | 13739 | |
31e5e17b | 13740 | #: builtin/submodule--helper.c:1221 |
94550ed3 JX |
13741 | msgid "" |
13742 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 13743 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
13744 | msgstr "" |
13745 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
13746 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 13747 | |
31e5e17b | 13748 | #: builtin/submodule--helper.c:1252 |
94550ed3 JX |
13749 | #, c-format |
13750 | msgid "clone of '%s' into submodule path '%s' failed" | |
13751 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
13752 | ||
31e5e17b | 13753 | #: builtin/submodule--helper.c:1267 |
94550ed3 JX |
13754 | #, c-format |
13755 | msgid "could not get submodule directory for '%s'" | |
13756 | msgstr "无法得到 '%s' 的子模组目录" | |
13757 | ||
31e5e17b | 13758 | #: builtin/submodule--helper.c:1332 |
5b04ee3b JX |
13759 | #, c-format |
13760 | msgid "Submodule path '%s' not initialized" | |
13761 | msgstr "子模组 '%s' 尚未初始化" | |
13762 | ||
31e5e17b | 13763 | #: builtin/submodule--helper.c:1336 |
5b04ee3b JX |
13764 | msgid "Maybe you want to use 'update --init'?" |
13765 | msgstr "也许您想要执行 'update --init'?" | |
13766 | ||
31e5e17b | 13767 | #: builtin/submodule--helper.c:1365 |
5b04ee3b JX |
13768 | #, c-format |
13769 | msgid "Skipping unmerged submodule %s" | |
13770 | msgstr "略过未合并的子模组 %s" | |
13771 | ||
31e5e17b | 13772 | #: builtin/submodule--helper.c:1394 |
5b04ee3b JX |
13773 | #, c-format |
13774 | msgid "Skipping submodule '%s'" | |
13775 | msgstr "略过子模组 '%s'" | |
13776 | ||
31e5e17b | 13777 | #: builtin/submodule--helper.c:1527 |
5c57d762 JX |
13778 | #, c-format |
13779 | msgid "Failed to clone '%s'. Retry scheduled" | |
13780 | msgstr "克隆 '%s' 失败。按计划重试" | |
13781 | ||
31e5e17b | 13782 | #: builtin/submodule--helper.c:1538 |
5c57d762 JX |
13783 | #, c-format |
13784 | msgid "Failed to clone '%s' a second time, aborting" | |
13785 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
13786 | ||
31e5e17b | 13787 | #: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 |
5b04ee3b JX |
13788 | msgid "path into the working tree" |
13789 | msgstr "到工作区的路径" | |
13790 | ||
31e5e17b | 13791 | #: builtin/submodule--helper.c:1571 |
5b04ee3b JX |
13792 | msgid "path into the working tree, across nested submodule boundaries" |
13793 | msgstr "工作区中的路径,递归嵌套子模组" | |
13794 | ||
31e5e17b | 13795 | #: builtin/submodule--helper.c:1575 |
5b04ee3b JX |
13796 | msgid "rebase, merge, checkout or none" |
13797 | msgstr "rebase、merge、checkout 或 none" | |
13798 | ||
31e5e17b | 13799 | #: builtin/submodule--helper.c:1579 |
5b04ee3b JX |
13800 | msgid "Create a shallow clone truncated to the specified number of revisions" |
13801 | msgstr "创建一个指定深度的浅克隆" | |
13802 | ||
31e5e17b | 13803 | #: builtin/submodule--helper.c:1582 |
5b04ee3b JX |
13804 | msgid "parallel jobs" |
13805 | msgstr "并发任务" | |
13806 | ||
31e5e17b | 13807 | #: builtin/submodule--helper.c:1584 |
5c57d762 | 13808 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 13809 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 13810 | |
31e5e17b | 13811 | #: builtin/submodule--helper.c:1585 |
5b04ee3b JX |
13812 | msgid "don't print cloning progress" |
13813 | msgstr "不要输出克隆进度" | |
94550ed3 | 13814 | |
31e5e17b | 13815 | #: builtin/submodule--helper.c:1592 |
5b04ee3b JX |
13816 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
13817 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
13818 | ||
31e5e17b | 13819 | #: builtin/submodule--helper.c:1605 |
5b04ee3b JX |
13820 | msgid "bad value for update parameter" |
13821 | msgstr "update 参数取值错误" | |
13822 | ||
31e5e17b | 13823 | #: builtin/submodule--helper.c:1673 |
5c57d762 JX |
13824 | #, c-format |
13825 | msgid "" | |
13826 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
13827 | "the superproject is not on any branch" | |
13828 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
13829 | ||
31e5e17b | 13830 | #: builtin/submodule--helper.c:1789 |
1a79b2f1 JX |
13831 | msgid "recurse into submodules" |
13832 | msgstr "在子模组中递归" | |
13833 | ||
31e5e17b | 13834 | #: builtin/submodule--helper.c:1795 |
1a79b2f1 JX |
13835 | msgid "git submodule--helper embed-git-dir [<path>...]" |
13836 | msgstr "git submodule--helper embed-git-dir [<路径>...]" | |
13837 | ||
31e5e17b | 13838 | #: builtin/submodule--helper.c:1857 |
1a79b2f1 JX |
13839 | #, c-format |
13840 | msgid "%s doesn't support --super-prefix" | |
13841 | msgstr "%s 不支持 --super-prefix" | |
13842 | ||
31e5e17b | 13843 | #: builtin/submodule--helper.c:1863 |
94550ed3 | 13844 | #, c-format |
5b04ee3b JX |
13845 | msgid "'%s' is not a valid submodule--helper subcommand" |
13846 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 13847 | |
a4f16749 | 13848 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
13849 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
13850 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 13851 | |
a4f16749 | 13852 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
13853 | msgid "git symbolic-ref -d [-q] <name>" |
13854 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 13855 | |
6937cb4e | 13856 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 13857 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
13858 | msgstr "不显示非符号(分离的)引用的错误信息" |
13859 | ||
6937cb4e | 13860 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
13861 | msgid "delete symbolic ref" |
13862 | msgstr "删除符号引用" | |
ef317cd5 | 13863 | |
6937cb4e | 13864 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 13865 | msgid "shorten ref output" |
6937cb4e | 13866 | msgstr "缩短引用输出" |
ef317cd5 | 13867 | |
6937cb4e | 13868 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 13869 | msgid "reason" |
07432cef | 13870 | msgstr "原因" |
ef317cd5 | 13871 | |
6937cb4e | 13872 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 13873 | msgid "reason of the update" |
07432cef | 13874 | msgstr "更新的原因" |
ef317cd5 | 13875 | |
a4f16749 | 13876 | #: builtin/tag.c:24 |
ef317cd5 | 13877 | msgid "" |
814ff314 JX |
13878 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
13879 | "[<head>]" | |
13880 | msgstr "" | |
13881 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 13882 | |
a4f16749 | 13883 | #: builtin/tag.c:25 |
ef317cd5 | 13884 | msgid "git tag -d <tagname>..." |
07432cef | 13885 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 13886 | |
a4f16749 | 13887 | #: builtin/tag.c:26 |
ef317cd5 | 13888 | msgid "" |
87cb7997 JX |
13889 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
13890 | "points-at <object>]\n" | |
94550ed3 | 13891 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 13892 | msgstr "" |
87cb7997 JX |
13893 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
13894 | "at <对象>]\n" | |
94550ed3 | 13895 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 13896 | |
a4f16749 | 13897 | #: builtin/tag.c:28 |
1a79b2f1 JX |
13898 | msgid "git tag -v [--format=<format>] <tagname>..." |
13899 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 13900 | |
6937cb4e | 13901 | #: builtin/tag.c:86 |
c04f5ac3 JX |
13902 | #, c-format |
13903 | msgid "tag '%s' not found." | |
55a16ee4 | 13904 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 13905 | |
6937cb4e | 13906 | #: builtin/tag.c:102 |
c04f5ac3 JX |
13907 | #, c-format |
13908 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 13909 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 13910 | |
6937cb4e | 13911 | #: builtin/tag.c:131 |
a77c07d9 | 13912 | #, c-format |
c04f5ac3 JX |
13913 | msgid "" |
13914 | "\n" | |
6acbf033 JX |
13915 | "Write a message for tag:\n" |
13916 | " %s\n" | |
a77c07d9 | 13917 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
13918 | msgstr "" |
13919 | "\n" | |
55a16ee4 | 13920 | "输入一个标签说明:\n" |
6acbf033 | 13921 | " %s\n" |
a77c07d9 | 13922 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 13923 | |
6937cb4e | 13924 | #: builtin/tag.c:135 |
a77c07d9 | 13925 | #, c-format |
c04f5ac3 JX |
13926 | msgid "" |
13927 | "\n" | |
6acbf033 JX |
13928 | "Write a message for tag:\n" |
13929 | " %s\n" | |
a77c07d9 | 13930 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 13931 | "want to.\n" |
c04f5ac3 JX |
13932 | msgstr "" |
13933 | "\n" | |
55a16ee4 | 13934 | "输入一个标签说明:\n" |
6acbf033 | 13935 | " %s\n" |
a77c07d9 | 13936 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 13937 | |
6937cb4e | 13938 | #: builtin/tag.c:189 |
c04f5ac3 | 13939 | msgid "unable to sign the tag" |
55a16ee4 | 13940 | msgstr "无法签署标签" |
c04f5ac3 | 13941 | |
6937cb4e | 13942 | #: builtin/tag.c:191 |
c04f5ac3 | 13943 | msgid "unable to write tag file" |
55a16ee4 | 13944 | msgstr "无法写标签文件" |
c04f5ac3 | 13945 | |
31e5e17b | 13946 | #: builtin/tag.c:216 |
c04f5ac3 | 13947 | msgid "bad object type." |
90e6ef53 | 13948 | msgstr "坏的对象类型。" |
c04f5ac3 | 13949 | |
31e5e17b | 13950 | #: builtin/tag.c:265 |
c04f5ac3 | 13951 | msgid "no tag message?" |
55a16ee4 | 13952 | msgstr "无标签说明?" |
c04f5ac3 | 13953 | |
31e5e17b | 13954 | #: builtin/tag.c:272 |
c04f5ac3 JX |
13955 | #, c-format |
13956 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 13957 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 13958 | |
31e5e17b | 13959 | #: builtin/tag.c:381 |
ef317cd5 | 13960 | msgid "list tag names" |
55a16ee4 | 13961 | msgstr "列出标签名称" |
ef317cd5 | 13962 | |
31e5e17b | 13963 | #: builtin/tag.c:383 |
ef317cd5 | 13964 | msgid "print <n> lines of each tag message" |
55a16ee4 | 13965 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 13966 | |
31e5e17b | 13967 | #: builtin/tag.c:385 |
ef317cd5 | 13968 | msgid "delete tags" |
55a16ee4 | 13969 | msgstr "删除标签" |
ef317cd5 | 13970 | |
31e5e17b | 13971 | #: builtin/tag.c:386 |
ef317cd5 | 13972 | msgid "verify tags" |
55a16ee4 | 13973 | msgstr "验证标签" |
ef317cd5 | 13974 | |
31e5e17b | 13975 | #: builtin/tag.c:388 |
ef317cd5 | 13976 | msgid "Tag creation options" |
55a16ee4 | 13977 | msgstr "标签创建选项" |
ef317cd5 | 13978 | |
31e5e17b | 13979 | #: builtin/tag.c:390 |
ef317cd5 | 13980 | msgid "annotated tag, needs a message" |
55a16ee4 | 13981 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 13982 | |
31e5e17b | 13983 | #: builtin/tag.c:392 |
ef317cd5 | 13984 | msgid "tag message" |
55a16ee4 | 13985 | msgstr "标签说明" |
ef317cd5 | 13986 | |
31e5e17b JX |
13987 | #: builtin/tag.c:394 |
13988 | msgid "force edit of tag message" | |
13989 | msgstr "强制编辑标签说明" | |
13990 | ||
13991 | #: builtin/tag.c:395 | |
ef317cd5 | 13992 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 13993 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 13994 | |
31e5e17b | 13995 | #: builtin/tag.c:399 |
ef317cd5 | 13996 | msgid "use another key to sign the tag" |
55a16ee4 | 13997 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 13998 | |
31e5e17b | 13999 | #: builtin/tag.c:400 |
ef317cd5 | 14000 | msgid "replace the tag if exists" |
55a16ee4 | 14001 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 14002 | |
31e5e17b | 14003 | #: builtin/tag.c:401 builtin/update-ref.c:368 |
03ea3327 | 14004 | msgid "create a reflog" |
1b7f4a34 JX |
14005 | msgstr "创建引用日志" |
14006 | ||
31e5e17b | 14007 | #: builtin/tag.c:403 |
814ff314 | 14008 | msgid "Tag listing options" |
55a16ee4 | 14009 | msgstr "标签列表选项" |
814ff314 | 14010 | |
31e5e17b | 14011 | #: builtin/tag.c:404 |
ef317cd5 | 14012 | msgid "show tag list in columns" |
55a16ee4 | 14013 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 14014 | |
31e5e17b | 14015 | #: builtin/tag.c:405 builtin/tag.c:407 |
ef317cd5 | 14016 | msgid "print only tags that contain the commit" |
87cb7997 | 14017 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 14018 | |
31e5e17b | 14019 | #: builtin/tag.c:406 builtin/tag.c:408 |
87cb7997 JX |
14020 | msgid "print only tags that don't contain the commit" |
14021 | msgstr "只打印不包含该提交的标签" | |
14022 | ||
31e5e17b | 14023 | #: builtin/tag.c:409 |
94550ed3 JX |
14024 | msgid "print only tags that are merged" |
14025 | msgstr "只打印已经合并的标签" | |
14026 | ||
31e5e17b | 14027 | #: builtin/tag.c:410 |
94550ed3 JX |
14028 | msgid "print only tags that are not merged" |
14029 | msgstr "只打印尚未合并的标签" | |
14030 | ||
31e5e17b | 14031 | #: builtin/tag.c:415 |
ef317cd5 | 14032 | msgid "print only tags of the object" |
87cb7997 | 14033 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 14034 | |
31e5e17b | 14035 | #: builtin/tag.c:459 |
8ada9598 | 14036 | msgid "--column and -n are incompatible" |
81809b99 | 14037 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 14038 | |
31e5e17b | 14039 | #: builtin/tag.c:481 |
87cb7997 JX |
14040 | msgid "-n option is only allowed in list mode" |
14041 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 14042 | |
31e5e17b | 14043 | #: builtin/tag.c:483 |
87cb7997 JX |
14044 | msgid "--contains option is only allowed in list mode" |
14045 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 14046 | |
31e5e17b | 14047 | #: builtin/tag.c:485 |
87cb7997 JX |
14048 | msgid "--no-contains option is only allowed in list mode" |
14049 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 14050 | |
31e5e17b | 14051 | #: builtin/tag.c:487 |
87cb7997 JX |
14052 | msgid "--points-at option is only allowed in list mode" |
14053 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 14054 | |
31e5e17b | 14055 | #: builtin/tag.c:489 |
87cb7997 JX |
14056 | msgid "--merged and --no-merged options are only allowed in list mode" |
14057 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
14058 | ||
31e5e17b | 14059 | #: builtin/tag.c:500 |
c04f5ac3 JX |
14060 | msgid "only one -F or -m option is allowed." |
14061 | msgstr "只允许一个 -F 或 -m 选项。" | |
14062 | ||
31e5e17b | 14063 | #: builtin/tag.c:519 |
c04f5ac3 JX |
14064 | msgid "too many params" |
14065 | msgstr "太多参数" | |
14066 | ||
31e5e17b | 14067 | #: builtin/tag.c:525 |
c04f5ac3 JX |
14068 | #, c-format |
14069 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 14070 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 14071 | |
31e5e17b | 14072 | #: builtin/tag.c:530 |
c04f5ac3 JX |
14073 | #, c-format |
14074 | msgid "tag '%s' already exists" | |
55a16ee4 | 14075 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 14076 | |
31e5e17b | 14077 | #: builtin/tag.c:561 |
c04f5ac3 JX |
14078 | #, c-format |
14079 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 14080 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 14081 | |
31e5e17b | 14082 | #: builtin/unpack-objects.c:498 |
6c94aba5 JX |
14083 | msgid "Unpacking objects" |
14084 | msgstr "展开对象中" | |
14085 | ||
5809aa05 | 14086 | #: builtin/update-index.c:82 |
7aea43ff JX |
14087 | #, c-format |
14088 | msgid "failed to create directory %s" | |
14089 | msgstr "无法创建目录 %s" | |
14090 | ||
5809aa05 | 14091 | #: builtin/update-index.c:88 |
7aea43ff JX |
14092 | #, c-format |
14093 | msgid "failed to stat %s" | |
65e2041e | 14094 | msgstr "对 %s 调用 stat 失败" |
7aea43ff | 14095 | |
5809aa05 | 14096 | #: builtin/update-index.c:98 |
7aea43ff JX |
14097 | #, c-format |
14098 | msgid "failed to create file %s" | |
14099 | msgstr "无法创建文件 %s" | |
14100 | ||
5809aa05 | 14101 | #: builtin/update-index.c:106 |
7aea43ff JX |
14102 | #, c-format |
14103 | msgid "failed to delete file %s" | |
14104 | msgstr "无法删除文件 %s" | |
14105 | ||
5809aa05 | 14106 | #: builtin/update-index.c:113 builtin/update-index.c:219 |
7aea43ff JX |
14107 | #, c-format |
14108 | msgid "failed to delete directory %s" | |
14109 | msgstr "无法删除目录 %s" | |
14110 | ||
5809aa05 | 14111 | #: builtin/update-index.c:138 |
7aea43ff | 14112 | #, c-format |
276ceeaa JX |
14113 | msgid "Testing mtime in '%s' " |
14114 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 14115 | |
5809aa05 | 14116 | #: builtin/update-index.c:152 |
7aea43ff JX |
14117 | msgid "directory stat info does not change after adding a new file" |
14118 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
14119 | ||
5809aa05 | 14120 | #: builtin/update-index.c:165 |
7aea43ff JX |
14121 | msgid "directory stat info does not change after adding a new directory" |
14122 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
14123 | ||
5809aa05 | 14124 | #: builtin/update-index.c:178 |
7aea43ff JX |
14125 | msgid "directory stat info changes after updating a file" |
14126 | msgstr "更新一个文件后,目录的状态信息被修改" | |
14127 | ||
5809aa05 | 14128 | #: builtin/update-index.c:189 |
7aea43ff JX |
14129 | msgid "directory stat info changes after adding a file inside subdirectory" |
14130 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
14131 | ||
5809aa05 | 14132 | #: builtin/update-index.c:200 |
7aea43ff JX |
14133 | msgid "directory stat info does not change after deleting a file" |
14134 | msgstr "删除一个文件后,目录的状态信息未改变" | |
14135 | ||
5809aa05 | 14136 | #: builtin/update-index.c:213 |
7aea43ff JX |
14137 | msgid "directory stat info does not change after deleting a directory" |
14138 | msgstr "删除一个目录后,目录的状态信息未改变" | |
14139 | ||
5809aa05 | 14140 | #: builtin/update-index.c:220 |
7aea43ff JX |
14141 | msgid " OK" |
14142 | msgstr " OK" | |
14143 | ||
5809aa05 | 14144 | #: builtin/update-index.c:579 |
814ff314 JX |
14145 | msgid "git update-index [<options>] [--] [<file>...]" |
14146 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 14147 | |
5809aa05 | 14148 | #: builtin/update-index.c:936 |
ef317cd5 | 14149 | msgid "continue refresh even when index needs update" |
07432cef | 14150 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 14151 | |
5809aa05 | 14152 | #: builtin/update-index.c:939 |
ef317cd5 | 14153 | msgid "refresh: ignore submodules" |
07432cef | 14154 | msgstr "刷新:忽略子模组" |
8ada9598 | 14155 | |
5809aa05 | 14156 | #: builtin/update-index.c:942 |
ef317cd5 | 14157 | msgid "do not ignore new files" |
07432cef | 14158 | msgstr "不忽略新的文件" |
8ada9598 | 14159 | |
5809aa05 | 14160 | #: builtin/update-index.c:944 |
ef317cd5 | 14161 | msgid "let files replace directories and vice-versa" |
07432cef | 14162 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 14163 | |
5809aa05 | 14164 | #: builtin/update-index.c:946 |
ef317cd5 | 14165 | msgid "notice files missing from worktree" |
07432cef | 14166 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 14167 | |
5809aa05 | 14168 | #: builtin/update-index.c:948 |
ef317cd5 | 14169 | msgid "refresh even if index contains unmerged entries" |
07432cef | 14170 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 14171 | |
5809aa05 | 14172 | #: builtin/update-index.c:951 |
ef317cd5 | 14173 | msgid "refresh stat information" |
07432cef | 14174 | msgstr "刷新统计信息" |
ef317cd5 | 14175 | |
5809aa05 | 14176 | #: builtin/update-index.c:955 |
ef317cd5 | 14177 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 14178 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 14179 | |
5809aa05 | 14180 | #: builtin/update-index.c:959 |
6c94aba5 | 14181 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 14182 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 14183 | |
5809aa05 | 14184 | #: builtin/update-index.c:960 |
ef317cd5 | 14185 | msgid "add the specified entry to the index" |
07432cef | 14186 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 14187 | |
5809aa05 | 14188 | #: builtin/update-index.c:969 |
ef317cd5 | 14189 | msgid "mark files as \"not changing\"" |
07432cef | 14190 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 14191 | |
5809aa05 | 14192 | #: builtin/update-index.c:972 |
ef317cd5 | 14193 | msgid "clear assumed-unchanged bit" |
07432cef | 14194 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 14195 | |
5809aa05 | 14196 | #: builtin/update-index.c:975 |
ef317cd5 | 14197 | msgid "mark files as \"index-only\"" |
07432cef | 14198 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 14199 | |
5809aa05 | 14200 | #: builtin/update-index.c:978 |
ef317cd5 | 14201 | msgid "clear skip-worktree bit" |
07432cef | 14202 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 14203 | |
5809aa05 | 14204 | #: builtin/update-index.c:981 |
ef317cd5 | 14205 | msgid "add to index only; do not add content to object database" |
07432cef | 14206 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 14207 | |
5809aa05 | 14208 | #: builtin/update-index.c:983 |
ef317cd5 | 14209 | msgid "remove named paths even if present in worktree" |
07432cef | 14210 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 14211 | |
5809aa05 | 14212 | #: builtin/update-index.c:985 |
ef317cd5 | 14213 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 14214 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 14215 | |
5809aa05 | 14216 | #: builtin/update-index.c:987 |
ef317cd5 | 14217 | msgid "read list of paths to be updated from standard input" |
07432cef | 14218 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 14219 | |
5809aa05 | 14220 | #: builtin/update-index.c:991 |
ef317cd5 | 14221 | msgid "add entries from standard input to the index" |
07432cef | 14222 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 14223 | |
5809aa05 | 14224 | #: builtin/update-index.c:995 |
ef317cd5 | 14225 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 14226 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 14227 | |
5809aa05 | 14228 | #: builtin/update-index.c:999 |
ef317cd5 | 14229 | msgid "only update entries that differ from HEAD" |
07432cef | 14230 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 14231 | |
5809aa05 | 14232 | #: builtin/update-index.c:1003 |
ef317cd5 | 14233 | msgid "ignore files missing from worktree" |
07432cef | 14234 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 14235 | |
5809aa05 | 14236 | #: builtin/update-index.c:1006 |
ef317cd5 | 14237 | msgid "report actions to standard output" |
07432cef | 14238 | msgstr "在标准输出显示操作" |
ef317cd5 | 14239 | |
5809aa05 | 14240 | #: builtin/update-index.c:1008 |
ef317cd5 | 14241 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 14242 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 14243 | |
5809aa05 | 14244 | #: builtin/update-index.c:1012 |
ef317cd5 | 14245 | msgid "write index in this format" |
07432cef | 14246 | msgstr "以这种格式写入索引区" |
ef317cd5 | 14247 | |
5809aa05 | 14248 | #: builtin/update-index.c:1014 |
6acbf033 JX |
14249 | msgid "enable or disable split index" |
14250 | msgstr "启用或禁用索引拆分" | |
14251 | ||
5809aa05 | 14252 | #: builtin/update-index.c:1016 |
7aea43ff JX |
14253 | msgid "enable/disable untracked cache" |
14254 | msgstr "启用/禁用对未跟踪文件的缓存" | |
14255 | ||
5809aa05 | 14256 | #: builtin/update-index.c:1018 |
276ceeaa JX |
14257 | msgid "test if the filesystem supports untracked cache" |
14258 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
14259 | ||
5809aa05 | 14260 | #: builtin/update-index.c:1020 |
7aea43ff JX |
14261 | msgid "enable untracked cache without testing the filesystem" |
14262 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
14263 | ||
5809aa05 JX |
14264 | #: builtin/update-index.c:1022 |
14265 | msgid "write out the index even if is not flagged as changed" | |
14266 | msgstr "即使没有被标记为已更改,也要写出索引" | |
14267 | ||
14268 | #: builtin/update-index.c:1024 | |
14269 | msgid "enable or disable file system monitor" | |
14270 | msgstr "启用或禁用文件系统监控" | |
14271 | ||
14272 | #: builtin/update-index.c:1026 | |
14273 | msgid "mark files as fsmonitor valid" | |
14274 | msgstr "标记文件为 fsmonitor 有效" | |
14275 | ||
14276 | #: builtin/update-index.c:1029 | |
14277 | msgid "clear fsmonitor valid bit" | |
14278 | msgstr "清除 fsmonitor 有效位" | |
14279 | ||
14280 | #: builtin/update-index.c:1127 | |
87cb7997 JX |
14281 | msgid "" |
14282 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
14283 | "enable split index" | |
14284 | msgstr "" | |
14285 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
14286 | ||
5809aa05 | 14287 | #: builtin/update-index.c:1136 |
87cb7997 JX |
14288 | msgid "" |
14289 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
14290 | "disable split index" | |
14291 | msgstr "" | |
14292 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
14293 | ||
5809aa05 | 14294 | #: builtin/update-index.c:1147 |
a0b6b246 JX |
14295 | msgid "" |
14296 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
14297 | "to disable the untracked cache" | |
275588f9 JX |
14298 | msgstr "" |
14299 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
14300 | "改它。" | |
a0b6b246 | 14301 | |
5809aa05 | 14302 | #: builtin/update-index.c:1151 |
276ceeaa JX |
14303 | msgid "Untracked cache disabled" |
14304 | msgstr "缓存未跟踪文件被禁用" | |
14305 | ||
5809aa05 | 14306 | #: builtin/update-index.c:1159 |
a0b6b246 JX |
14307 | msgid "" |
14308 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
14309 | "to enable the untracked cache" | |
275588f9 JX |
14310 | msgstr "" |
14311 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
14312 | "修改它。" | |
a0b6b246 | 14313 | |
5809aa05 | 14314 | #: builtin/update-index.c:1163 |
276ceeaa JX |
14315 | #, c-format |
14316 | msgid "Untracked cache enabled for '%s'" | |
14317 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
14318 | ||
5809aa05 JX |
14319 | #: builtin/update-index.c:1171 |
14320 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" | |
31e5e17b | 14321 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 JX |
14322 | |
14323 | #: builtin/update-index.c:1175 | |
14324 | msgid "fsmonitor enabled" | |
14325 | msgstr "fsmonitor 被启用" | |
14326 | ||
14327 | #: builtin/update-index.c:1178 | |
14328 | msgid "" | |
14329 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 14330 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 JX |
14331 | |
14332 | #: builtin/update-index.c:1182 | |
14333 | msgid "fsmonitor disabled" | |
14334 | msgstr "fsmonitor 被禁用" | |
14335 | ||
a4f16749 | 14336 | #: builtin/update-ref.c:10 |
814ff314 JX |
14337 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
14338 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 14339 | |
a4f16749 | 14340 | #: builtin/update-ref.c:11 |
814ff314 JX |
14341 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
14342 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 14343 | |
a4f16749 | 14344 | #: builtin/update-ref.c:12 |
814ff314 JX |
14345 | msgid "git update-ref [<options>] --stdin [-z]" |
14346 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 14347 | |
6937cb4e | 14348 | #: builtin/update-ref.c:363 |
ef317cd5 | 14349 | msgid "delete the reference" |
07432cef | 14350 | msgstr "删除引用" |
ef317cd5 | 14351 | |
6937cb4e | 14352 | #: builtin/update-ref.c:365 |
ef317cd5 | 14353 | msgid "update <refname> not the one it points to" |
07432cef | 14354 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 14355 | |
6937cb4e | 14356 | #: builtin/update-ref.c:366 |
90314792 JX |
14357 | msgid "stdin has NUL-terminated arguments" |
14358 | msgstr "标准输入有以 NUL 字符终止的参数" | |
14359 | ||
6937cb4e | 14360 | #: builtin/update-ref.c:367 |
90314792 JX |
14361 | msgid "read updates from stdin" |
14362 | msgstr "从标准输入读取更新" | |
14363 | ||
a4f16749 | 14364 | #: builtin/update-server-info.c:7 |
ef317cd5 | 14365 | msgid "git update-server-info [--force]" |
07432cef | 14366 | msgstr "git update-server-info [--force]" |
ef317cd5 | 14367 | |
a4f16749 | 14368 | #: builtin/update-server-info.c:15 |
ef317cd5 | 14369 | msgid "update the info files from scratch" |
07432cef | 14370 | msgstr "从头开始更新文件信息" |
ef317cd5 | 14371 | |
a4f16749 | 14372 | #: builtin/verify-commit.c:18 |
814ff314 JX |
14373 | msgid "git verify-commit [-v | --verbose] <commit>..." |
14374 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 14375 | |
a4f16749 | 14376 | #: builtin/verify-commit.c:73 |
6acbf033 JX |
14377 | msgid "print commit contents" |
14378 | msgstr "打印提交内容" | |
14379 | ||
a4f16749 | 14380 | #: builtin/verify-commit.c:74 builtin/verify-tag.c:38 |
1b7f4a34 JX |
14381 | msgid "print raw gpg status output" |
14382 | msgstr "打印原始 gpg 状态输出" | |
14383 | ||
a4f16749 | 14384 | #: builtin/verify-pack.c:55 |
814ff314 JX |
14385 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
14386 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 14387 | |
a4f16749 | 14388 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
14389 | msgid "verbose" |
14390 | msgstr "冗长输出" | |
14391 | ||
a4f16749 | 14392 | #: builtin/verify-pack.c:67 |
ef317cd5 | 14393 | msgid "show statistics only" |
07432cef | 14394 | msgstr "只显示统计" |
ef317cd5 | 14395 | |
a4f16749 | 14396 | #: builtin/verify-tag.c:19 |
1a79b2f1 JX |
14397 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
14398 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 14399 | |
a4f16749 | 14400 | #: builtin/verify-tag.c:37 |
ef317cd5 | 14401 | msgid "print tag contents" |
55a16ee4 | 14402 | msgstr "打印标签内容" |
ef317cd5 | 14403 | |
5809aa05 | 14404 | #: builtin/worktree.c:17 |
31e5e17b JX |
14405 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
14406 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 14407 | |
5809aa05 | 14408 | #: builtin/worktree.c:18 |
5c57d762 JX |
14409 | msgid "git worktree list [<options>]" |
14410 | msgstr "git worktree list [<选项>]" | |
14411 | ||
5809aa05 | 14412 | #: builtin/worktree.c:19 |
5c57d762 JX |
14413 | msgid "git worktree lock [<options>] <path>" |
14414 | msgstr "git worktree lock [<选项>] <路径>" | |
14415 | ||
5809aa05 | 14416 | #: builtin/worktree.c:20 |
31e5e17b JX |
14417 | msgid "git worktree move <worktree> <new-path>" |
14418 | msgstr "git worktree move <工作区> <新路径>" | |
14419 | ||
14420 | #: builtin/worktree.c:21 | |
5bb01d4f JX |
14421 | msgid "git worktree prune [<options>]" |
14422 | msgstr "git worktree prune [<选项>]" | |
14423 | ||
31e5e17b JX |
14424 | #: builtin/worktree.c:22 |
14425 | msgid "git worktree remove [<options>] <worktree>" | |
14426 | msgstr "git worktree remove [<选项>] <工作区>" | |
14427 | ||
14428 | #: builtin/worktree.c:23 | |
5c57d762 JX |
14429 | msgid "git worktree unlock <path>" |
14430 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 14431 | |
31e5e17b | 14432 | #: builtin/worktree.c:60 |
5bb01d4f JX |
14433 | #, c-format |
14434 | msgid "Removing worktrees/%s: not a valid directory" | |
14435 | msgstr "删除工作区/%s:不是一个有效的目录" | |
14436 | ||
31e5e17b | 14437 | #: builtin/worktree.c:66 |
5bb01d4f JX |
14438 | #, c-format |
14439 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
14440 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
14441 | ||
31e5e17b | 14442 | #: builtin/worktree.c:71 builtin/worktree.c:80 |
5bb01d4f JX |
14443 | #, c-format |
14444 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
14445 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
14446 | ||
31e5e17b | 14447 | #: builtin/worktree.c:90 |
6937cb4e JX |
14448 | #, c-format |
14449 | msgid "" | |
14450 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
14451 | "%<PRIuMAX>)" | |
14452 | msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
14453 | ||
31e5e17b | 14454 | #: builtin/worktree.c:98 |
5bb01d4f JX |
14455 | #, c-format |
14456 | msgid "Removing worktrees/%s: invalid gitdir file" | |
14457 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
14458 | ||
31e5e17b | 14459 | #: builtin/worktree.c:114 |
5bb01d4f JX |
14460 | #, c-format |
14461 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
14462 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
14463 | ||
31e5e17b | 14464 | #: builtin/worktree.c:161 |
1a79b2f1 JX |
14465 | msgid "report pruned working trees" |
14466 | msgstr "报告清除的工作区" | |
14467 | ||
31e5e17b | 14468 | #: builtin/worktree.c:163 |
1a79b2f1 | 14469 | msgid "expire working trees older than <time>" |
58b6f078 | 14470 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 14471 | |
31e5e17b | 14472 | #: builtin/worktree.c:238 |
5bb01d4f JX |
14473 | #, c-format |
14474 | msgid "'%s' already exists" | |
14475 | msgstr "'%s' 已经存在" | |
14476 | ||
31e5e17b | 14477 | #: builtin/worktree.c:269 |
5bb01d4f JX |
14478 | #, c-format |
14479 | msgid "could not create directory of '%s'" | |
14480 | msgstr "不能创建目录 '%s'" | |
14481 | ||
31e5e17b | 14482 | #: builtin/worktree.c:308 |
5bb01d4f | 14483 | #, c-format |
1b7f4a34 | 14484 | msgid "Preparing %s (identifier %s)" |
29004bbb | 14485 | msgstr "准备 %s(标识符 %s)" |
5bb01d4f | 14486 | |
31e5e17b | 14487 | #: builtin/worktree.c:385 |
5bb01d4f | 14488 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 14489 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 14490 | |
31e5e17b | 14491 | #: builtin/worktree.c:388 |
5bb01d4f JX |
14492 | msgid "create a new branch" |
14493 | msgstr "创建一个新分支" | |
14494 | ||
31e5e17b | 14495 | #: builtin/worktree.c:390 |
5bb01d4f JX |
14496 | msgid "create or reset a branch" |
14497 | msgstr "创建或重置一个分支" | |
14498 | ||
31e5e17b | 14499 | #: builtin/worktree.c:392 |
5b04ee3b JX |
14500 | msgid "populate the new working tree" |
14501 | msgstr "生成新的工作区" | |
14502 | ||
31e5e17b | 14503 | #: builtin/worktree.c:393 |
60638e98 JX |
14504 | msgid "keep the new working tree locked" |
14505 | msgstr "锁定新工作区" | |
14506 | ||
31e5e17b | 14507 | #: builtin/worktree.c:395 |
5809aa05 JX |
14508 | msgid "set up tracking mode (see git-branch(1))" |
14509 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
14510 | ||
31e5e17b | 14511 | #: builtin/worktree.c:398 |
5809aa05 JX |
14512 | msgid "try to match the new branch name with a remote-tracking branch" |
14513 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
14514 | ||
31e5e17b | 14515 | #: builtin/worktree.c:406 |
1b7f4a34 JX |
14516 | msgid "-b, -B, and --detach are mutually exclusive" |
14517 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 14518 | |
31e5e17b | 14519 | #: builtin/worktree.c:471 |
5809aa05 JX |
14520 | msgid "--[no-]track can only be used if a new branch is created" |
14521 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
14522 | ||
31e5e17b | 14523 | #: builtin/worktree.c:571 |
5c57d762 JX |
14524 | msgid "reason for locking" |
14525 | msgstr "锁定原因" | |
14526 | ||
31e5e17b JX |
14527 | #: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 |
14528 | #: builtin/worktree.c:809 | |
5c57d762 JX |
14529 | #, c-format |
14530 | msgid "'%s' is not a working tree" | |
14531 | msgstr "'%s' 不是一个工作区" | |
14532 | ||
31e5e17b | 14533 | #: builtin/worktree.c:585 builtin/worktree.c:618 |
5c57d762 JX |
14534 | msgid "The main working tree cannot be locked or unlocked" |
14535 | msgstr "主工作区无法被加锁或解锁" | |
14536 | ||
31e5e17b | 14537 | #: builtin/worktree.c:590 |
5c57d762 JX |
14538 | #, c-format |
14539 | msgid "'%s' is already locked, reason: %s" | |
14540 | msgstr "'%s' 已被锁定,原因:%s" | |
14541 | ||
31e5e17b | 14542 | #: builtin/worktree.c:592 |
5c57d762 JX |
14543 | #, c-format |
14544 | msgid "'%s' is already locked" | |
14545 | msgstr "'%s' 已被锁定" | |
14546 | ||
31e5e17b | 14547 | #: builtin/worktree.c:620 |
5c57d762 JX |
14548 | #, c-format |
14549 | msgid "'%s' is not locked" | |
14550 | msgstr "'%s' 未被锁定" | |
14551 | ||
31e5e17b JX |
14552 | #: builtin/worktree.c:645 |
14553 | msgid "working trees containing submodules cannot be moved or removed" | |
14554 | msgstr "包含子模组的工作区不能移动或删除" | |
14555 | ||
14556 | #: builtin/worktree.c:672 builtin/worktree.c:811 | |
14557 | #, c-format | |
14558 | msgid "'%s' is a main working tree" | |
14559 | msgstr "'%s' 是一个主工作区" | |
14560 | ||
14561 | #: builtin/worktree.c:677 | |
14562 | #, c-format | |
14563 | msgid "could not figure out destination name from '%s'" | |
14564 | msgstr "无法从 '%s' 算出目标名称" | |
14565 | ||
14566 | #: builtin/worktree.c:683 | |
14567 | #, c-format | |
14568 | msgid "target '%s' already exists" | |
14569 | msgstr "目标 '%s' 已存在" | |
14570 | ||
14571 | #: builtin/worktree.c:690 | |
14572 | #, c-format | |
14573 | msgid "cannot move a locked working tree, lock reason: %s" | |
14574 | msgstr "无法移动一个锁定的工作区,锁定原因:%s" | |
14575 | ||
14576 | #: builtin/worktree.c:692 | |
14577 | msgid "cannot move a locked working tree" | |
14578 | msgstr "无法移动一个锁定的工作区" | |
14579 | ||
14580 | #: builtin/worktree.c:695 | |
14581 | #, c-format | |
14582 | msgid "validation failed, cannot move working tree: %s" | |
14583 | msgstr "验证失败,无法移动工作区:%s" | |
14584 | ||
14585 | #: builtin/worktree.c:700 | |
14586 | #, c-format | |
14587 | msgid "failed to move '%s' to '%s'" | |
14588 | msgstr "无法移动 '%s' 到 '%s'" | |
14589 | ||
14590 | #: builtin/worktree.c:748 | |
14591 | #, c-format | |
14592 | msgid "failed to run 'git status' on '%s'" | |
14593 | msgstr "无法在 '%s' 中执行 'git status'" | |
14594 | ||
14595 | #: builtin/worktree.c:752 | |
14596 | #, c-format | |
14597 | msgid "'%s' is dirty, use --force to delete it" | |
14598 | msgstr "'%s' 是脏的,使用 --force 删除" | |
14599 | ||
14600 | #: builtin/worktree.c:757 | |
14601 | #, c-format | |
14602 | msgid "failed to run 'git status' on '%s', code %d" | |
14603 | msgstr "无法在 '%s' 中执行 'git status',退出码 %d" | |
14604 | ||
14605 | #: builtin/worktree.c:768 builtin/worktree.c:782 | |
14606 | #, c-format | |
14607 | msgid "failed to delete '%s'" | |
14608 | msgstr "无法删除 '%s'" | |
14609 | ||
14610 | #: builtin/worktree.c:794 | |
14611 | msgid "force removing even if the worktree is dirty" | |
14612 | msgstr "强制删除,即使工作区是脏的" | |
14613 | ||
14614 | #: builtin/worktree.c:815 | |
14615 | #, c-format | |
14616 | msgid "cannot remove a locked working tree, lock reason: %s" | |
14617 | msgstr "无法删除一个锁定的工作区,锁定原因:%s" | |
14618 | ||
14619 | #: builtin/worktree.c:817 | |
14620 | msgid "cannot remove a locked working tree" | |
14621 | msgstr "无法删除一个锁定的工作区" | |
14622 | ||
14623 | #: builtin/worktree.c:820 | |
14624 | #, c-format | |
14625 | msgid "validation failed, cannot remove working tree: %s" | |
14626 | msgstr "验证失败,无法删除工作区:%s" | |
14627 | ||
a4f16749 | 14628 | #: builtin/write-tree.c:14 |
ef317cd5 | 14629 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 14630 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 14631 | |
a4f16749 | 14632 | #: builtin/write-tree.c:27 |
ef317cd5 | 14633 | msgid "<prefix>/" |
07432cef | 14634 | msgstr "<前缀>/" |
ef317cd5 | 14635 | |
a4f16749 | 14636 | #: builtin/write-tree.c:28 |
ef317cd5 | 14637 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 14638 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 14639 | |
a4f16749 | 14640 | #: builtin/write-tree.c:31 |
ef317cd5 | 14641 | msgid "only useful for debugging" |
07432cef | 14642 | msgstr "只对调试有用" |
ef317cd5 | 14643 | |
31e5e17b | 14644 | #: upload-pack.c:27 |
5c57d762 JX |
14645 | msgid "git upload-pack [<options>] <dir>" |
14646 | msgstr "git upload-pack [<选项>] <目录>" | |
14647 | ||
31e5e17b | 14648 | #: upload-pack.c:1070 |
5c57d762 JX |
14649 | msgid "quit after a single request/response exchange" |
14650 | msgstr "在一次单独的请求/响应(request/response)交换后退出" | |
14651 | ||
31e5e17b | 14652 | #: upload-pack.c:1072 |
5c57d762 JX |
14653 | msgid "exit immediately after initial ref advertisement" |
14654 | msgstr "在初始的引用广告后立即退出" | |
14655 | ||
31e5e17b | 14656 | #: upload-pack.c:1074 |
5c57d762 | 14657 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" |
58b6f078 | 14658 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" |
5c57d762 | 14659 | |
31e5e17b | 14660 | #: upload-pack.c:1076 |
5c57d762 JX |
14661 | msgid "interrupt transfer after <n> seconds of inactivity" |
14662 | msgstr "不活动 <n> 秒钟后终止传输" | |
14663 | ||
6937cb4e | 14664 | #: credential-cache--daemon.c:222 |
a0b6b246 JX |
14665 | #, c-format |
14666 | msgid "" | |
14667 | "The permissions on your socket directory are too loose; other\n" | |
14668 | "users may be able to read your cached credentials. Consider running:\n" | |
14669 | "\n" | |
14670 | "\tchmod 0700 %s" | |
14671 | msgstr "" | |
1a79b2f1 JX |
14672 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
14673 | "行:\n" | |
a0b6b246 JX |
14674 | "\n" |
14675 | "\tchmod 0700 %s" | |
14676 | ||
6937cb4e | 14677 | #: credential-cache--daemon.c:271 |
220c313c JX |
14678 | msgid "print debugging messages to stderr" |
14679 | msgstr "调试信息输出到标准错误" | |
14680 | ||
31e5e17b JX |
14681 | #: git.c:8 |
14682 | msgid "" | |
14683 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
14684 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
14685 | " [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" | |
14686 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" | |
14687 | " <command> [<args>]" | |
14688 | msgstr "" | |
14689 | "git [--version] [--help] [-C <path>] [-c <键名>=<值>]\n" | |
14690 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" | |
14691 | " [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" | |
14692 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" | |
14693 | " <命令> [<参数>]" | |
14694 | ||
a4f16749 | 14695 | #: git.c:15 |
4dcdc3d8 | 14696 | msgid "" |
220c313c | 14697 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
14698 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
14699 | "to read about a specific subcommand or concept." | |
14700 | msgstr "" | |
220c313c JX |
14701 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
14702 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
14703 | "帮助。" | |
8ada9598 | 14704 | |
31e5e17b JX |
14705 | #: git.c:95 |
14706 | #, c-format | |
14707 | msgid "no directory given for --git-dir\n" | |
14708 | msgstr "没有为 --git-dir 提供目录\n" | |
14709 | ||
14710 | #: git.c:109 | |
14711 | #, c-format | |
14712 | msgid "no namespace given for --namespace\n" | |
14713 | msgstr "没有为 --namespace 提供命名空间\n" | |
14714 | ||
14715 | #: git.c:123 | |
14716 | #, c-format | |
14717 | msgid "no directory given for --work-tree\n" | |
14718 | msgstr "没有为 --work-tree 提供目录\n" | |
14719 | ||
14720 | #: git.c:137 | |
14721 | #, c-format | |
14722 | msgid "no prefix given for --super-prefix\n" | |
14723 | msgstr "没有为 --super-prefix 提供前缀\n" | |
14724 | ||
14725 | #: git.c:159 | |
14726 | #, c-format | |
14727 | msgid "-c expects a configuration string\n" | |
14728 | msgstr "应为 -c 提供一个配置字符串\n" | |
14729 | ||
14730 | #: git.c:197 | |
14731 | #, c-format | |
14732 | msgid "no directory given for -C\n" | |
14733 | msgstr "没有为 -C 提供目录\n" | |
14734 | ||
14735 | #: git.c:212 | |
14736 | #, c-format | |
14737 | msgid "unknown option: %s\n" | |
14738 | msgstr "未知选项:%s\n" | |
14739 | ||
14740 | #: git.c:687 | |
14741 | #, c-format | |
14742 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
14743 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
14744 | ||
14745 | #: git.c:699 | |
14746 | #, c-format | |
14747 | msgid "failed to run command '%s': %s\n" | |
14748 | msgstr "无法运行命令 '%s':%s\n" | |
14749 | ||
14750 | #: http.c:342 | |
60638e98 JX |
14751 | #, c-format |
14752 | msgid "negative value for http.postbuffer; defaulting to %d" | |
14753 | msgstr "http.postbuffer 为负值,默认为 %d" | |
14754 | ||
31e5e17b | 14755 | #: http.c:363 |
a0b6b246 JX |
14756 | msgid "Delegation control is not supported with cURL < 7.22.0" |
14757 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" | |
14758 | ||
31e5e17b | 14759 | #: http.c:372 |
276ceeaa JX |
14760 | msgid "Public key pinning not supported with cURL < 7.44.0" |
14761 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
14762 | ||
31e5e17b | 14763 | #: http.c:1857 |
1a79b2f1 JX |
14764 | #, c-format |
14765 | msgid "" | |
14766 | "unable to update url base from redirection:\n" | |
14767 | " asked for: %s\n" | |
14768 | " redirect: %s" | |
14769 | msgstr "" | |
14770 | "不能更新重定向的 url base:\n" | |
14771 | " 请求:%s\n" | |
14772 | " 重定向:%s" | |
14773 | ||
31e5e17b | 14774 | #: remote-curl.c:345 |
1a79b2f1 JX |
14775 | #, c-format |
14776 | msgid "redirecting to %s" | |
14777 | msgstr "重定向到 %s" | |
14778 | ||
31e5e17b | 14779 | #: list-objects-filter-options.h:59 |
5809aa05 JX |
14780 | msgid "args" |
14781 | msgstr "参数" | |
14782 | ||
31e5e17b | 14783 | #: list-objects-filter-options.h:60 |
5809aa05 JX |
14784 | msgid "object filtering" |
14785 | msgstr "对象过滤" | |
14786 | ||
1b7f4a34 | 14787 | #: common-cmds.h:9 |
7aea43ff JX |
14788 | msgid "start a working area (see also: git help tutorial)" |
14789 | msgstr "开始一个工作区(参见:git help tutorial)" | |
14790 | ||
1b7f4a34 | 14791 | #: common-cmds.h:10 |
7aea43ff JX |
14792 | msgid "work on the current change (see also: git help everyday)" |
14793 | msgstr "在当前变更上工作(参见:git help everyday)" | |
14794 | ||
1b7f4a34 | 14795 | #: common-cmds.h:11 |
7aea43ff JX |
14796 | msgid "examine the history and state (see also: git help revisions)" |
14797 | msgstr "检查历史和状态(参见:git help revisions)" | |
14798 | ||
1b7f4a34 | 14799 | #: common-cmds.h:12 |
7aea43ff JX |
14800 | msgid "grow, mark and tweak your common history" |
14801 | msgstr "扩展、标记和调校您的历史记录" | |
14802 | ||
1b7f4a34 | 14803 | #: common-cmds.h:13 |
7aea43ff JX |
14804 | msgid "collaborate (see also: git help workflows)" |
14805 | msgstr "协同(参见:git help workflows)" | |
14806 | ||
1b7f4a34 | 14807 | #: common-cmds.h:17 |
8ada9598 | 14808 | msgid "Add file contents to the index" |
81809b99 | 14809 | msgstr "添加文件内容至索引" |
8ada9598 | 14810 | |
1b7f4a34 JX |
14811 | #: common-cmds.h:18 |
14812 | msgid "Use binary search to find the commit that introduced a bug" | |
14813 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 14814 | |
1b7f4a34 | 14815 | #: common-cmds.h:19 |
8ada9598 | 14816 | msgid "List, create, or delete branches" |
81809b99 | 14817 | msgstr "列出、创建或删除分支" |
8ada9598 | 14818 | |
1b7f4a34 | 14819 | #: common-cmds.h:20 |
5bb01d4f JX |
14820 | msgid "Switch branches or restore working tree files" |
14821 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 14822 | |
1b7f4a34 | 14823 | #: common-cmds.h:21 |
8ada9598 | 14824 | msgid "Clone a repository into a new directory" |
160fb2b2 | 14825 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 14826 | |
1b7f4a34 | 14827 | #: common-cmds.h:22 |
8ada9598 | 14828 | msgid "Record changes to the repository" |
160fb2b2 | 14829 | msgstr "记录变更到仓库" |
8ada9598 | 14830 | |
1b7f4a34 | 14831 | #: common-cmds.h:23 |
8ada9598 | 14832 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 14833 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 14834 | |
1b7f4a34 | 14835 | #: common-cmds.h:24 |
8ada9598 | 14836 | msgid "Download objects and refs from another repository" |
160fb2b2 | 14837 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 14838 | |
1b7f4a34 | 14839 | #: common-cmds.h:25 |
8ada9598 | 14840 | msgid "Print lines matching a pattern" |
81809b99 | 14841 | msgstr "输出和模式匹配的行" |
8ada9598 | 14842 | |
1b7f4a34 | 14843 | #: common-cmds.h:26 |
a77c07d9 | 14844 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 14845 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 14846 | |
1b7f4a34 | 14847 | #: common-cmds.h:27 |
8ada9598 | 14848 | msgid "Show commit logs" |
81809b99 | 14849 | msgstr "显示提交日志" |
8ada9598 | 14850 | |
1b7f4a34 | 14851 | #: common-cmds.h:28 |
8ada9598 | 14852 | msgid "Join two or more development histories together" |
81809b99 | 14853 | msgstr "合并两个或更多开发历史" |
8ada9598 | 14854 | |
1b7f4a34 | 14855 | #: common-cmds.h:29 |
8ada9598 | 14856 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 14857 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 14858 | |
1b7f4a34 | 14859 | #: common-cmds.h:30 |
2e8451e8 | 14860 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 14861 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 14862 | |
1b7f4a34 | 14863 | #: common-cmds.h:31 |
8ada9598 | 14864 | msgid "Update remote refs along with associated objects" |
81809b99 | 14865 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 14866 | |
1b7f4a34 | 14867 | #: common-cmds.h:32 |
3495628d JX |
14868 | msgid "Reapply commits on top of another base tip" |
14869 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 14870 | |
1b7f4a34 | 14871 | #: common-cmds.h:33 |
8ada9598 | 14872 | msgid "Reset current HEAD to the specified state" |
4375c10e | 14873 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 14874 | |
1b7f4a34 | 14875 | #: common-cmds.h:34 |
8ada9598 | 14876 | msgid "Remove files from the working tree and from the index" |
81809b99 | 14877 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 14878 | |
1b7f4a34 | 14879 | #: common-cmds.h:35 |
8ada9598 | 14880 | msgid "Show various types of objects" |
81809b99 | 14881 | msgstr "显示各种类型的对象" |
8ada9598 | 14882 | |
1b7f4a34 | 14883 | #: common-cmds.h:36 |
8ada9598 | 14884 | msgid "Show the working tree status" |
81809b99 | 14885 | msgstr "显示工作区状态" |
8ada9598 | 14886 | |
1b7f4a34 | 14887 | #: common-cmds.h:37 |
8ada9598 | 14888 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 14889 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 14890 | |
31e5e17b | 14891 | #: parse-options.h:157 |
220c313c JX |
14892 | msgid "expiry-date" |
14893 | msgstr "到期时间" | |
14894 | ||
31e5e17b | 14895 | #: parse-options.h:172 |
220c313c JX |
14896 | msgid "no-op (backward compatibility)" |
14897 | msgstr "空操作(向后兼容)" | |
14898 | ||
31e5e17b | 14899 | #: parse-options.h:250 |
220c313c JX |
14900 | msgid "be more verbose" |
14901 | msgstr "更加详细" | |
14902 | ||
31e5e17b | 14903 | #: parse-options.h:252 |
220c313c JX |
14904 | msgid "be more quiet" |
14905 | msgstr "更加安静" | |
14906 | ||
31e5e17b | 14907 | #: parse-options.h:258 |
220c313c JX |
14908 | msgid "use <n> digits to display SHA-1s" |
14909 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
14910 | ||
5b04ee3b | 14911 | #: rerere.h:40 |
220c313c JX |
14912 | msgid "update the index with reused conflict resolution if possible" |
14913 | msgstr "如果可能,重用冲突解决更新索引" | |
14914 | ||
5c57d762 | 14915 | #: git-bisect.sh:54 |
b694fbb1 JX |
14916 | msgid "You need to start by \"git bisect start\"" |
14917 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
14918 | ||
90e6ef53 | 14919 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
14920 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
14921 | #. translation. The program will only accept English input | |
14922 | #. at this point. | |
5c57d762 | 14923 | #: git-bisect.sh:60 |
c04f5ac3 JX |
14924 | msgid "Do you want me to do it for you [Y/n]? " |
14925 | msgstr "您想让我为您这样做么[Y/n]? " | |
14926 | ||
5c57d762 | 14927 | #: git-bisect.sh:121 |
c04f5ac3 JX |
14928 | #, sh-format |
14929 | msgid "unrecognised option: '$arg'" | |
81809b99 | 14930 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 14931 | |
5c57d762 | 14932 | #: git-bisect.sh:125 |
c04f5ac3 JX |
14933 | #, sh-format |
14934 | msgid "'$arg' does not appear to be a valid revision" | |
14935 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
14936 | ||
5c57d762 | 14937 | #: git-bisect.sh:154 |
c04f5ac3 JX |
14938 | msgid "Bad HEAD - I need a HEAD" |
14939 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
14940 | ||
5c57d762 | 14941 | #: git-bisect.sh:167 |
c04f5ac3 JX |
14942 | #, sh-format |
14943 | msgid "" | |
814ff314 | 14944 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 14945 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 14946 | |
5c57d762 | 14947 | #: git-bisect.sh:177 |
cfff71a9 JX |
14948 | msgid "won't bisect on cg-seek'ed tree" |
14949 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 14950 | |
5c57d762 | 14951 | #: git-bisect.sh:181 |
c04f5ac3 | 14952 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 14953 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 14954 | |
5c57d762 | 14955 | #: git-bisect.sh:233 |
c04f5ac3 JX |
14956 | #, sh-format |
14957 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 14958 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 14959 | |
5809aa05 | 14960 | #: git-bisect.sh:246 |
c04f5ac3 JX |
14961 | #, sh-format |
14962 | msgid "Bad rev input: $arg" | |
9a4b694c | 14963 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 14964 | |
5809aa05 | 14965 | #: git-bisect.sh:265 |
5c57d762 JX |
14966 | #, sh-format |
14967 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 14968 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 14969 | |
5809aa05 | 14970 | #: git-bisect.sh:274 |
c04f5ac3 JX |
14971 | #, sh-format |
14972 | msgid "Bad rev input: $rev" | |
9a4b694c | 14973 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 14974 | |
5809aa05 | 14975 | #: git-bisect.sh:283 |
1b7f4a34 JX |
14976 | #, sh-format |
14977 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
14978 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
14979 | ||
5809aa05 | 14980 | #: git-bisect.sh:306 |
1b7f4a34 JX |
14981 | #, sh-format |
14982 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
14983 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 14984 | |
90e6ef53 | 14985 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
14986 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
14987 | #. translation. The program will only accept English input | |
14988 | #. at this point. | |
5809aa05 | 14989 | #: git-bisect.sh:312 |
c04f5ac3 JX |
14990 | msgid "Are you sure [Y/n]? " |
14991 | msgstr "您确认么[Y/n]? " | |
14992 | ||
5809aa05 | 14993 | #: git-bisect.sh:324 |
1b7f4a34 | 14994 | #, sh-format |
b694fbb1 | 14995 | msgid "" |
1b7f4a34 JX |
14996 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
14997 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
14998 | msgstr "" |
14999 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 15000 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 15001 | |
5809aa05 | 15002 | #: git-bisect.sh:327 |
1b7f4a34 | 15003 | #, sh-format |
b694fbb1 JX |
15004 | msgid "" |
15005 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
15006 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
15007 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
15008 | msgstr "" |
15009 | "您需要执行 \"git bisect start\" 来开始。\n" | |
15010 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 15011 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 15012 | |
5809aa05 | 15013 | #: git-bisect.sh:398 git-bisect.sh:512 |
b694fbb1 JX |
15014 | msgid "We are not bisecting." |
15015 | msgstr "我们没有在二分查找。" | |
15016 | ||
5809aa05 | 15017 | #: git-bisect.sh:405 |
c04f5ac3 JX |
15018 | #, sh-format |
15019 | msgid "'$invalid' is not a valid commit" | |
15020 | msgstr "'$invalid' 不是一个有效的提交" | |
15021 | ||
5809aa05 | 15022 | #: git-bisect.sh:414 |
c04f5ac3 JX |
15023 | #, sh-format |
15024 | msgid "" | |
15025 | "Could not check out original HEAD '$branch'.\n" | |
15026 | "Try 'git bisect reset <commit>'." | |
15027 | msgstr "" | |
15028 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 15029 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 15030 | |
5809aa05 | 15031 | #: git-bisect.sh:422 |
c04f5ac3 JX |
15032 | msgid "No logfile given" |
15033 | msgstr "未提供日志文件" | |
15034 | ||
5809aa05 | 15035 | #: git-bisect.sh:423 |
c04f5ac3 JX |
15036 | #, sh-format |
15037 | msgid "cannot read $file for replaying" | |
15038 | msgstr "不能读取 $file 来重放" | |
15039 | ||
5809aa05 | 15040 | #: git-bisect.sh:444 |
c04f5ac3 JX |
15041 | msgid "?? what are you talking about?" |
15042 | msgstr "?? 您在说什么?" | |
15043 | ||
5809aa05 JX |
15044 | #: git-bisect.sh:453 |
15045 | msgid "bisect run failed: no command provided." | |
15046 | msgstr "二分查找运行失败:没有提供命令。" | |
15047 | ||
15048 | #: git-bisect.sh:458 | |
b694fbb1 JX |
15049 | #, sh-format |
15050 | msgid "running $command" | |
15051 | msgstr "运行 $command" | |
15052 | ||
5809aa05 | 15053 | #: git-bisect.sh:465 |
b694fbb1 JX |
15054 | #, sh-format |
15055 | msgid "" | |
15056 | "bisect run failed:\n" | |
15057 | "exit code $res from '$command' is < 0 or >= 128" | |
15058 | msgstr "" | |
15059 | "二分查找运行失败:\n" | |
07432cef | 15060 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 15061 | |
5809aa05 | 15062 | #: git-bisect.sh:491 |
b694fbb1 JX |
15063 | msgid "bisect run cannot continue any more" |
15064 | msgstr "二分查找不能继续运行" | |
15065 | ||
5809aa05 | 15066 | #: git-bisect.sh:497 |
b694fbb1 JX |
15067 | #, sh-format |
15068 | msgid "" | |
15069 | "bisect run failed:\n" | |
15070 | "'bisect_state $state' exited with error code $res" | |
15071 | msgstr "" | |
15072 | "二分查找运行失败:\n" | |
15073 | "'bisect_state $state' 退出码为 $res" | |
15074 | ||
5809aa05 | 15075 | #: git-bisect.sh:504 |
b694fbb1 JX |
15076 | msgid "bisect run success" |
15077 | msgstr "二分查找运行成功" | |
c04f5ac3 | 15078 | |
5809aa05 | 15079 | #: git-bisect.sh:533 |
b694fbb1 | 15080 | #, sh-format |
1b7f4a34 JX |
15081 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
15082 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 15083 | |
5809aa05 | 15084 | #: git-bisect.sh:567 |
94550ed3 JX |
15085 | msgid "no terms defined" |
15086 | msgstr "未定义术语" | |
15087 | ||
5809aa05 | 15088 | #: git-bisect.sh:584 |
94550ed3 JX |
15089 | #, sh-format |
15090 | msgid "" | |
15091 | "invalid argument $arg for 'git bisect terms'.\n" | |
15092 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
15093 | msgstr "" | |
15094 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
15095 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
15096 | ||
5c57d762 JX |
15097 | #: git-merge-octopus.sh:46 |
15098 | msgid "" | |
15099 | "Error: Your local changes to the following files would be overwritten by " | |
15100 | "merge" | |
15101 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
15102 | ||
15103 | #: git-merge-octopus.sh:61 | |
15104 | msgid "Automated merge did not work." | |
9a4b694c | 15105 | msgstr "自动合并未生效。" |
5c57d762 JX |
15106 | |
15107 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 15108 | msgid "Should not be doing an octopus." |
5c57d762 JX |
15109 | msgstr "不应该执行章鱼式合并。" |
15110 | ||
15111 | #: git-merge-octopus.sh:73 | |
15112 | #, sh-format | |
15113 | msgid "Unable to find common commit with $pretty_name" | |
15114 | msgstr "无法找到和 $pretty_name 的基线提交" | |
15115 | ||
15116 | #: git-merge-octopus.sh:77 | |
15117 | #, sh-format | |
6937cb4e | 15118 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
15119 | msgstr "已经和 $pretty_name 保持一致" |
15120 | ||
15121 | #: git-merge-octopus.sh:89 | |
15122 | #, sh-format | |
15123 | msgid "Fast-forwarding to: $pretty_name" | |
15124 | msgstr "快进至:$pretty_name" | |
15125 | ||
15126 | #: git-merge-octopus.sh:97 | |
15127 | #, sh-format | |
15128 | msgid "Trying simple merge with $pretty_name" | |
15129 | msgstr "尝试和 $pretty_name 的简单合并" | |
15130 | ||
15131 | #: git-merge-octopus.sh:102 | |
15132 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 15133 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 15134 | |
31e5e17b | 15135 | #: git-rebase.sh:60 |
649900bc | 15136 | msgid "" |
6937cb4e JX |
15137 | "Resolve all conflicts manually, mark them as resolved with\n" |
15138 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
15139 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
15140 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
15141 | "abort\"." | |
649900bc | 15142 | msgstr "" |
58b6f078 | 15143 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" |
6937cb4e JX |
15144 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" |
15145 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
15146 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
649900bc | 15147 | |
31e5e17b | 15148 | #: git-rebase.sh:163 git-rebase.sh:409 |
5c57d762 JX |
15149 | #, sh-format |
15150 | msgid "Could not move back to $head_name" | |
15151 | msgstr "无法移回 $head_name" | |
15152 | ||
31e5e17b | 15153 | #: git-rebase.sh:174 |
a4f16749 JX |
15154 | msgid "Applied autostash." |
15155 | msgstr "成功应用 autostash。" | |
15156 | ||
31e5e17b | 15157 | #: git-rebase.sh:177 |
2e8451e8 JX |
15158 | #, sh-format |
15159 | msgid "Cannot store $stash_sha1" | |
15160 | msgstr "无法保存 $stash_sha1" | |
15161 | ||
31e5e17b | 15162 | #: git-rebase.sh:218 |
649900bc | 15163 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 15164 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 15165 | |
31e5e17b | 15166 | #: git-rebase.sh:223 |
5809aa05 JX |
15167 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
15168 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
649900bc | 15169 | |
31e5e17b | 15170 | #: git-rebase.sh:370 |
649900bc JX |
15171 | msgid "No rebase in progress?" |
15172 | msgstr "没有正在进行的变基?" | |
15173 | ||
31e5e17b | 15174 | #: git-rebase.sh:381 |
07432cef WS |
15175 | msgid "The --edit-todo action can only be used during interactive rebase." |
15176 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
15177 | ||
31e5e17b | 15178 | #: git-rebase.sh:388 |
649900bc JX |
15179 | msgid "Cannot read HEAD" |
15180 | msgstr "不能读取 HEAD" | |
15181 | ||
31e5e17b | 15182 | #: git-rebase.sh:391 |
649900bc JX |
15183 | msgid "" |
15184 | "You must edit all merge conflicts and then\n" | |
15185 | "mark them as resolved using git add" | |
15186 | msgstr "" | |
15187 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
15188 | "命令将它们标记为已解决" | |
15189 | ||
31e5e17b | 15190 | #: git-rebase.sh:435 |
649900bc JX |
15191 | #, sh-format |
15192 | msgid "" | |
15193 | "It seems that there is already a $state_dir_base directory, and\n" | |
15194 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
15195 | "case, please try\n" | |
15196 | "\t$cmd_live_rebase\n" | |
15197 | "If that is not the case, please\n" | |
15198 | "\t$cmd_clear_stale_rebase\n" | |
15199 | "and run me again. I am stopping in case you still have something\n" | |
15200 | "valuable there." | |
15201 | msgstr "" | |
98b2761d JX |
15202 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
15203 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
15204 | "\t$cmd_live_rebase\n" |
15205 | "如果不是这样,请执行\n" | |
15206 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 15207 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 15208 | |
31e5e17b | 15209 | #: git-rebase.sh:491 |
649900bc | 15210 | #, sh-format |
5809aa05 JX |
15211 | msgid "invalid upstream '$upstream_name'" |
15212 | msgstr "无效的上游 '$upstream_name'" | |
649900bc | 15213 | |
31e5e17b | 15214 | #: git-rebase.sh:515 |
649900bc JX |
15215 | #, sh-format |
15216 | msgid "$onto_name: there are more than one merge bases" | |
15217 | msgstr "$onto_name: 有一个以上的合并基准" | |
15218 | ||
31e5e17b | 15219 | #: git-rebase.sh:518 git-rebase.sh:522 |
649900bc JX |
15220 | #, sh-format |
15221 | msgid "$onto_name: there is no merge base" | |
15222 | msgstr "$onto_name: 没有合并基准" | |
15223 | ||
31e5e17b | 15224 | #: git-rebase.sh:527 |
649900bc JX |
15225 | #, sh-format |
15226 | msgid "Does not point to a valid commit: $onto_name" | |
15227 | msgstr "没有指向一个有效的提交:$onto_name" | |
15228 | ||
31e5e17b | 15229 | #: git-rebase.sh:553 |
649900bc | 15230 | #, sh-format |
5809aa05 JX |
15231 | msgid "fatal: no such branch/commit '$branch_name'" |
15232 | msgstr "严重错误:无此分支/提交 '$branch_name'" | |
649900bc | 15233 | |
31e5e17b | 15234 | #: git-rebase.sh:586 |
2e8451e8 JX |
15235 | msgid "Cannot autostash" |
15236 | msgstr "无法 autostash" | |
15237 | ||
31e5e17b | 15238 | #: git-rebase.sh:591 |
2e8451e8 JX |
15239 | #, sh-format |
15240 | msgid "Created autostash: $stash_abbrev" | |
15241 | msgstr "创建了 autostash: $stash_abbrev" | |
15242 | ||
31e5e17b | 15243 | #: git-rebase.sh:595 |
649900bc | 15244 | msgid "Please commit or stash them." |
a4f16749 | 15245 | msgstr "请提交或贮藏修改。" |
649900bc | 15246 | |
31e5e17b | 15247 | #: git-rebase.sh:618 |
5809aa05 JX |
15248 | #, sh-format |
15249 | msgid "HEAD is up to date." | |
15250 | msgstr "HEAD 是最新的。" | |
15251 | ||
31e5e17b | 15252 | #: git-rebase.sh:620 |
649900bc JX |
15253 | #, sh-format |
15254 | msgid "Current branch $branch_name is up to date." | |
15255 | msgstr "当前分支 $branch_name 是最新的。" | |
15256 | ||
31e5e17b | 15257 | #: git-rebase.sh:628 |
5809aa05 JX |
15258 | #, sh-format |
15259 | msgid "HEAD is up to date, rebase forced." | |
15260 | msgstr "HEAD 是最新的,强制变基。" | |
15261 | ||
31e5e17b | 15262 | #: git-rebase.sh:630 |
649900bc JX |
15263 | #, sh-format |
15264 | msgid "Current branch $branch_name is up to date, rebase forced." | |
15265 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
15266 | ||
31e5e17b | 15267 | #: git-rebase.sh:642 |
649900bc JX |
15268 | #, sh-format |
15269 | msgid "Changes from $mb to $onto:" | |
15270 | msgstr "变更从 $mb 到 $onto:" | |
15271 | ||
31e5e17b | 15272 | #: git-rebase.sh:651 |
649900bc | 15273 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 15274 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 15275 | |
31e5e17b | 15276 | #: git-rebase.sh:661 |
649900bc JX |
15277 | #, sh-format |
15278 | msgid "Fast-forwarded $branch_name to $onto_name." | |
15279 | msgstr "快进 $branch_name 至 $onto_name。" | |
15280 | ||
6937cb4e | 15281 | #: git-stash.sh:61 |
c04f5ac3 JX |
15282 | msgid "git stash clear with parameters is unimplemented" |
15283 | msgstr "git stash clear 不支持参数" | |
15284 | ||
5809aa05 | 15285 | #: git-stash.sh:108 |
c04f5ac3 JX |
15286 | msgid "You do not have the initial commit yet" |
15287 | msgstr "您尚未建立初始提交" | |
15288 | ||
5809aa05 | 15289 | #: git-stash.sh:123 |
c04f5ac3 | 15290 | msgid "Cannot save the current index state" |
90e6ef53 | 15291 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 15292 | |
5809aa05 | 15293 | #: git-stash.sh:138 |
a0b6b246 JX |
15294 | msgid "Cannot save the untracked files" |
15295 | msgstr "无法保存未跟踪文件" | |
15296 | ||
5809aa05 | 15297 | #: git-stash.sh:158 git-stash.sh:171 |
c04f5ac3 JX |
15298 | msgid "Cannot save the current worktree state" |
15299 | msgstr "无法保存当前工作区状态" | |
15300 | ||
5809aa05 | 15301 | #: git-stash.sh:175 |
c04f5ac3 | 15302 | msgid "No changes selected" |
90e6ef53 | 15303 | msgstr "没有选择变更" |
c04f5ac3 | 15304 | |
5809aa05 | 15305 | #: git-stash.sh:178 |
c04f5ac3 | 15306 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 15307 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 15308 | |
5809aa05 | 15309 | #: git-stash.sh:191 |
c04f5ac3 JX |
15310 | msgid "Cannot record working tree state" |
15311 | msgstr "不能记录工作区状态" | |
15312 | ||
5809aa05 | 15313 | #: git-stash.sh:229 |
2e8451e8 JX |
15314 | #, sh-format |
15315 | msgid "Cannot update $ref_stash with $w_commit" | |
15316 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
15317 | ||
5809aa05 | 15318 | #: git-stash.sh:281 |
b694fbb1 | 15319 | #, sh-format |
5809aa05 JX |
15320 | msgid "error: unknown option for 'stash push': $option" |
15321 | msgstr "错误:'stash push' 的未知选项:$option" | |
b694fbb1 | 15322 | |
5809aa05 | 15323 | #: git-stash.sh:295 |
a0b6b246 JX |
15324 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
15325 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
15326 | ||
5809aa05 | 15327 | #: git-stash.sh:303 |
c04f5ac3 JX |
15328 | msgid "No local changes to save" |
15329 | msgstr "没有要保存的本地修改" | |
15330 | ||
5809aa05 | 15331 | #: git-stash.sh:308 |
c04f5ac3 | 15332 | msgid "Cannot initialize stash" |
a4f16749 | 15333 | msgstr "无法初始化贮藏" |
c04f5ac3 | 15334 | |
5809aa05 | 15335 | #: git-stash.sh:312 |
c04f5ac3 JX |
15336 | msgid "Cannot save the current status" |
15337 | msgstr "无法保存当前状态" | |
15338 | ||
5809aa05 | 15339 | #: git-stash.sh:313 |
5c57d762 JX |
15340 | #, sh-format |
15341 | msgid "Saved working directory and index state $stash_msg" | |
15342 | msgstr "保存工作目录和索引状态 $stash_msg" | |
15343 | ||
31e5e17b | 15344 | #: git-stash.sh:340 |
c04f5ac3 JX |
15345 | msgid "Cannot remove worktree changes" |
15346 | msgstr "无法删除工作区变更" | |
15347 | ||
31e5e17b | 15348 | #: git-stash.sh:488 |
7aea43ff JX |
15349 | #, sh-format |
15350 | msgid "unknown option: $opt" | |
15351 | msgstr "未知选项: $opt" | |
15352 | ||
31e5e17b | 15353 | #: git-stash.sh:501 |
a4f16749 JX |
15354 | msgid "No stash entries found." |
15355 | msgstr "未发现贮藏条目。" | |
c04f5ac3 | 15356 | |
31e5e17b | 15357 | #: git-stash.sh:508 |
c04f5ac3 JX |
15358 | #, sh-format |
15359 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 15360 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 15361 | |
31e5e17b | 15362 | #: git-stash.sh:523 |
c04f5ac3 | 15363 | #, sh-format |
220c313c JX |
15364 | msgid "$reference is not a valid reference" |
15365 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 15366 | |
31e5e17b | 15367 | #: git-stash.sh:551 |
c04f5ac3 JX |
15368 | #, sh-format |
15369 | msgid "'$args' is not a stash-like commit" | |
a4f16749 | 15370 | msgstr "'$args' 不是贮藏式提交" |
c04f5ac3 | 15371 | |
31e5e17b | 15372 | #: git-stash.sh:562 |
c04f5ac3 JX |
15373 | #, sh-format |
15374 | msgid "'$args' is not a stash reference" | |
a4f16749 | 15375 | msgstr "'$args' 不是一个贮藏引用" |
c04f5ac3 | 15376 | |
31e5e17b | 15377 | #: git-stash.sh:570 |
c04f5ac3 | 15378 | msgid "unable to refresh index" |
90e6ef53 | 15379 | msgstr "无法刷新索引" |
c04f5ac3 | 15380 | |
31e5e17b | 15381 | #: git-stash.sh:574 |
c04f5ac3 | 15382 | msgid "Cannot apply a stash in the middle of a merge" |
a4f16749 | 15383 | msgstr "无法在合并过程应用贮藏" |
c04f5ac3 | 15384 | |
31e5e17b | 15385 | #: git-stash.sh:582 |
c04f5ac3 | 15386 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 15387 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 15388 | |
31e5e17b | 15389 | #: git-stash.sh:584 |
c04f5ac3 | 15390 | msgid "Could not save index tree" |
90e6ef53 | 15391 | msgstr "不能保存索引树" |
c04f5ac3 | 15392 | |
31e5e17b | 15393 | #: git-stash.sh:593 |
a4f16749 JX |
15394 | msgid "Could not restore untracked files from stash entry" |
15395 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
a0b6b246 | 15396 | |
31e5e17b | 15397 | #: git-stash.sh:618 |
c04f5ac3 | 15398 | msgid "Cannot unstage modified files" |
160fb2b2 | 15399 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 15400 | |
31e5e17b | 15401 | #: git-stash.sh:633 |
b694fbb1 | 15402 | msgid "Index was not unstashed." |
a4f16749 | 15403 | msgstr "索引未从贮藏中恢复。" |
b694fbb1 | 15404 | |
31e5e17b | 15405 | #: git-stash.sh:647 |
a4f16749 JX |
15406 | msgid "The stash entry is kept in case you need it again." |
15407 | msgstr "贮藏条目被保留以备您再次需要。" | |
5c57d762 | 15408 | |
31e5e17b | 15409 | #: git-stash.sh:656 |
c04f5ac3 JX |
15410 | #, sh-format |
15411 | msgid "Dropped ${REV} ($s)" | |
15412 | msgstr "丢弃了 ${REV} ($s)" | |
15413 | ||
31e5e17b | 15414 | #: git-stash.sh:657 |
c04f5ac3 JX |
15415 | #, sh-format |
15416 | msgid "${REV}: Could not drop stash entry" | |
a4f16749 | 15417 | msgstr "${REV}:无法丢弃贮藏条目" |
c04f5ac3 | 15418 | |
31e5e17b | 15419 | #: git-stash.sh:665 |
c04f5ac3 JX |
15420 | msgid "No branch name specified" |
15421 | msgstr "未指定分支名" | |
15422 | ||
31e5e17b | 15423 | #: git-stash.sh:744 |
c04f5ac3 JX |
15424 | msgid "(To restore them type \"git stash apply\")" |
15425 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
15426 | ||
1a79b2f1 | 15427 | #: git-submodule.sh:181 |
2e8451e8 JX |
15428 | msgid "Relative path can only be used from the toplevel of the working tree" |
15429 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
15430 | ||
1a79b2f1 | 15431 | #: git-submodule.sh:191 |
c04f5ac3 JX |
15432 | #, sh-format |
15433 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 15434 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 15435 | |
1a79b2f1 | 15436 | #: git-submodule.sh:210 |
c04f5ac3 | 15437 | #, sh-format |
170e9899 JX |
15438 | msgid "'$sm_path' already exists in the index" |
15439 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 15440 | |
1a79b2f1 JX |
15441 | #: git-submodule.sh:213 |
15442 | #, sh-format | |
15443 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
15444 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
15445 | ||
a4f16749 | 15446 | #: git-submodule.sh:219 |
b694fbb1 JX |
15447 | #, sh-format |
15448 | msgid "" | |
15449 | "The following path is ignored by one of your .gitignore files:\n" | |
15450 | "$sm_path\n" | |
15451 | "Use -f if you really want to add it." | |
15452 | msgstr "" | |
15453 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
15454 | "$sm_path\n" | |
15455 | "如果您确实想添加它,使用 -f 参数。" | |
15456 | ||
a4f16749 | 15457 | #: git-submodule.sh:237 |
b694fbb1 JX |
15458 | #, sh-format |
15459 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 15460 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 15461 | |
a4f16749 | 15462 | #: git-submodule.sh:239 |
c04f5ac3 | 15463 | #, sh-format |
170e9899 | 15464 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 15465 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 15466 | |
a4f16749 | 15467 | #: git-submodule.sh:247 |
07432cef WS |
15468 | #, sh-format |
15469 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 15470 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 15471 | |
a4f16749 | 15472 | #: git-submodule.sh:249 |
07432cef WS |
15473 | #, sh-format |
15474 | msgid "" | |
5c57d762 JX |
15475 | "If you want to reuse this local git directory instead of cloning again from\n" |
15476 | " $realrepo\n" | |
15477 | "use the '--force' option. If the local git directory is not the correct " | |
15478 | "repo\n" | |
07432cef WS |
15479 | "or you are unsure what this means choose another name with the '--name' " |
15480 | "option." | |
5c57d762 JX |
15481 | msgstr "" |
15482 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
15483 | " $realrepo\n" | |
15484 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
15485 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 15486 | |
a4f16749 | 15487 | #: git-submodule.sh:255 |
07432cef WS |
15488 | #, sh-format |
15489 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
15490 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
15491 | ||
a4f16749 | 15492 | #: git-submodule.sh:267 |
c04f5ac3 | 15493 | #, sh-format |
170e9899 JX |
15494 | msgid "Unable to checkout submodule '$sm_path'" |
15495 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 15496 | |
a4f16749 | 15497 | #: git-submodule.sh:272 |
c04f5ac3 | 15498 | #, sh-format |
170e9899 JX |
15499 | msgid "Failed to add submodule '$sm_path'" |
15500 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 15501 | |
a4f16749 | 15502 | #: git-submodule.sh:281 |
c04f5ac3 | 15503 | #, sh-format |
170e9899 JX |
15504 | msgid "Failed to register submodule '$sm_path'" |
15505 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 15506 | |
a4f16749 | 15507 | #: git-submodule.sh:342 |
c04f5ac3 | 15508 | #, sh-format |
5b04ee3b JX |
15509 | msgid "Entering '$displaypath'" |
15510 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 15511 | |
a4f16749 | 15512 | #: git-submodule.sh:362 |
c04f5ac3 | 15513 | #, sh-format |
5b04ee3b | 15514 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 15515 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 15516 | |
31e5e17b | 15517 | #: git-submodule.sh:584 |
c04f5ac3 | 15518 | #, sh-format |
2e8451e8 JX |
15519 | msgid "Unable to find current revision in submodule path '$displaypath'" |
15520 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 15521 | |
31e5e17b | 15522 | #: git-submodule.sh:594 |
c04f5ac3 | 15523 | #, sh-format |
170e9899 JX |
15524 | msgid "Unable to fetch in submodule path '$sm_path'" |
15525 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 15526 | |
31e5e17b | 15527 | #: git-submodule.sh:599 |
5c57d762 JX |
15528 | #, sh-format |
15529 | msgid "" | |
15530 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
15531 | "'$sm_path'" | |
9a4b694c | 15532 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 15533 | |
31e5e17b | 15534 | #: git-submodule.sh:617 |
2e8451e8 JX |
15535 | #, sh-format |
15536 | msgid "Unable to fetch in submodule path '$displaypath'" | |
15537 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
15538 | ||
31e5e17b | 15539 | #: git-submodule.sh:623 |
5c57d762 JX |
15540 | #, sh-format |
15541 | msgid "" | |
15542 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
15543 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
15544 | msgstr "" |
15545 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 15546 | |
31e5e17b | 15547 | #: git-submodule.sh:630 |
6c94aba5 JX |
15548 | #, sh-format |
15549 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
15550 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
15551 | ||
31e5e17b | 15552 | #: git-submodule.sh:631 |
c04f5ac3 | 15553 | #, sh-format |
6c94aba5 JX |
15554 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
15555 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
15556 | ||
31e5e17b | 15557 | #: git-submodule.sh:635 |
6c94aba5 | 15558 | #, sh-format |
2e8451e8 JX |
15559 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
15560 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 15561 | |
31e5e17b | 15562 | #: git-submodule.sh:636 |
c04f5ac3 | 15563 | #, sh-format |
2e8451e8 JX |
15564 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
15565 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 15566 | |
31e5e17b | 15567 | #: git-submodule.sh:641 |
c04f5ac3 | 15568 | #, sh-format |
2e8451e8 JX |
15569 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
15570 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 15571 | |
31e5e17b | 15572 | #: git-submodule.sh:642 |
c04f5ac3 | 15573 | #, sh-format |
2e8451e8 JX |
15574 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
15575 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 15576 | |
31e5e17b | 15577 | #: git-submodule.sh:647 |
c04f5ac3 | 15578 | #, sh-format |
5b04ee3b JX |
15579 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
15580 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 15581 | |
31e5e17b | 15582 | #: git-submodule.sh:648 |
c04f5ac3 | 15583 | #, sh-format |
5b04ee3b | 15584 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 15585 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 15586 | |
31e5e17b | 15587 | #: git-submodule.sh:679 |
2e8451e8 JX |
15588 | #, sh-format |
15589 | msgid "Failed to recurse into submodule path '$displaypath'" | |
15590 | msgstr "无法递归进子模组路径 '$displaypath'" | |
15591 | ||
31e5e17b | 15592 | #: git-submodule.sh:775 |
649900bc JX |
15593 | msgid "The --cached option cannot be used with the --files option" |
15594 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 15595 | |
31e5e17b | 15596 | #: git-submodule.sh:827 |
b694fbb1 JX |
15597 | #, sh-format |
15598 | msgid "unexpected mode $mod_dst" | |
15599 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 15600 | |
90e6ef53 | 15601 | # 译者:注意保持前导空格 |
31e5e17b | 15602 | #: git-submodule.sh:847 |
c04f5ac3 | 15603 | #, sh-format |
2e8451e8 JX |
15604 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
15605 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 15606 | |
90e6ef53 | 15607 | # 译者:注意保持前导空格 |
31e5e17b | 15608 | #: git-submodule.sh:850 |
c04f5ac3 | 15609 | #, sh-format |
2e8451e8 JX |
15610 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
15611 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 15612 | |
90e6ef53 | 15613 | # 译者:注意保持前导空格 |
31e5e17b | 15614 | #: git-submodule.sh:853 |
c04f5ac3 | 15615 | #, sh-format |
2e8451e8 JX |
15616 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
15617 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 15618 | |
5b04ee3b JX |
15619 | #: git-parse-remote.sh:89 |
15620 | #, sh-format | |
15621 | msgid "See git-${cmd}(1) for details." | |
15622 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 15623 | |
1a79b2f1 | 15624 | #: git-rebase--interactive.sh:140 |
5c57d762 JX |
15625 | #, sh-format |
15626 | msgid "Rebasing ($new_count/$total)" | |
15627 | msgstr "变基中($new_count/$total)" | |
15628 | ||
1a79b2f1 | 15629 | #: git-rebase--interactive.sh:156 |
5c57d762 JX |
15630 | msgid "" |
15631 | "\n" | |
15632 | "Commands:\n" | |
6937cb4e JX |
15633 | "p, pick = use commit\n" |
15634 | "r, reword = use commit, but edit the commit message\n" | |
15635 | "e, edit = use commit, but stop for amending\n" | |
15636 | "s, squash = use commit, but meld into previous commit\n" | |
15637 | "f, fixup = like \"squash\", but discard this commit's log message\n" | |
15638 | "x, exec = run command (the rest of the line) using shell\n" | |
15639 | "d, drop = remove commit\n" | |
5c57d762 JX |
15640 | "\n" |
15641 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
15642 | msgstr "" | |
15643 | "\n" | |
15644 | "命令:\n" | |
6937cb4e JX |
15645 | "p, pick = 使用提交\n" |
15646 | "r, reword = 使用提交,但修改提交说明\n" | |
15647 | "e, edit = 使用提交,但停止以便进行提交修补\n" | |
15648 | "s, squash = 使用提交,但和前一个版本融合\n" | |
15649 | "f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n" | |
15650 | "x, exec = 使用 shell 运行命令(此行剩余部分)\n" | |
15651 | "d, drop = 删除提交\n" | |
5c57d762 | 15652 | "\n" |
9a4b694c | 15653 | "这些行可以被重新排序;它们会被从上至下地执行。\n" |
5c57d762 | 15654 | |
1a79b2f1 | 15655 | #: git-rebase--interactive.sh:171 |
5c57d762 JX |
15656 | msgid "" |
15657 | "\n" | |
15658 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
a0b6b246 JX |
15659 | msgstr "" |
15660 | "\n" | |
15661 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5c57d762 | 15662 | |
1a79b2f1 | 15663 | #: git-rebase--interactive.sh:175 |
5c57d762 JX |
15664 | msgid "" |
15665 | "\n" | |
15666 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
a0b6b246 JX |
15667 | msgstr "" |
15668 | "\n" | |
15669 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5c57d762 | 15670 | |
31e5e17b | 15671 | #: git-rebase--interactive.sh:213 |
5c57d762 JX |
15672 | #, sh-format |
15673 | msgid "" | |
15674 | "You can amend the commit now, with\n" | |
15675 | "\n" | |
15676 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
15677 | "\n" | |
15678 | "Once you are satisfied with your changes, run\n" | |
15679 | "\n" | |
15680 | "\tgit rebase --continue" | |
15681 | msgstr "" | |
15682 | "您现在可以修补这个提交,使用\n" | |
15683 | "\n" | |
15684 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
15685 | "\n" | |
9a4b694c | 15686 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
15687 | "\n" |
15688 | "\tgit rebase --continue" | |
15689 | ||
31e5e17b | 15690 | #: git-rebase--interactive.sh:238 |
5c57d762 JX |
15691 | #, sh-format |
15692 | msgid "$sha1: not a commit that can be picked" | |
15693 | msgstr "$sha1:不是一个可以被拣选的提交" | |
15694 | ||
31e5e17b | 15695 | #: git-rebase--interactive.sh:277 |
5c57d762 JX |
15696 | #, sh-format |
15697 | msgid "Invalid commit name: $sha1" | |
15698 | msgstr "无效的提交名:$sha1" | |
15699 | ||
31e5e17b | 15700 | #: git-rebase--interactive.sh:319 |
5c57d762 JX |
15701 | msgid "Cannot write current commit's replacement sha1" |
15702 | msgstr "不能写入当前提交的替代 sha1" | |
15703 | ||
31e5e17b | 15704 | #: git-rebase--interactive.sh:371 |
5c57d762 JX |
15705 | #, sh-format |
15706 | msgid "Fast-forward to $sha1" | |
15707 | msgstr "快进到 $sha1" | |
15708 | ||
31e5e17b | 15709 | #: git-rebase--interactive.sh:373 |
5c57d762 JX |
15710 | #, sh-format |
15711 | msgid "Cannot fast-forward to $sha1" | |
15712 | msgstr "不能快进到 $sha1" | |
15713 | ||
31e5e17b | 15714 | #: git-rebase--interactive.sh:382 |
5c57d762 JX |
15715 | #, sh-format |
15716 | msgid "Cannot move HEAD to $first_parent" | |
15717 | msgstr "不能移动 HEAD 到 $first_parent" | |
15718 | ||
31e5e17b | 15719 | #: git-rebase--interactive.sh:387 |
5c57d762 JX |
15720 | #, sh-format |
15721 | msgid "Refusing to squash a merge: $sha1" | |
15722 | msgstr "拒绝压缩一个合并:$sha1" | |
15723 | ||
31e5e17b | 15724 | #: git-rebase--interactive.sh:405 |
5c57d762 JX |
15725 | #, sh-format |
15726 | msgid "Error redoing merge $sha1" | |
15727 | msgstr "无法重做合并 $sha1" | |
15728 | ||
31e5e17b | 15729 | #: git-rebase--interactive.sh:414 |
5c57d762 JX |
15730 | #, sh-format |
15731 | msgid "Could not pick $sha1" | |
15732 | msgstr "不能拣选 $sha1" | |
15733 | ||
31e5e17b | 15734 | #: git-rebase--interactive.sh:423 |
5c57d762 JX |
15735 | #, sh-format |
15736 | msgid "This is the commit message #${n}:" | |
9a4b694c | 15737 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 15738 | |
31e5e17b | 15739 | #: git-rebase--interactive.sh:428 |
5c57d762 JX |
15740 | #, sh-format |
15741 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 15742 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 15743 | |
31e5e17b | 15744 | #: git-rebase--interactive.sh:439 |
5c57d762 JX |
15745 | #, sh-format |
15746 | msgid "This is a combination of $count commit." | |
15747 | msgid_plural "This is a combination of $count commits." | |
15748 | msgstr[0] "这是一个 $count 个提交的组合。" | |
15749 | msgstr[1] "这是一个 $count 个提交的组合。" | |
15750 | ||
31e5e17b | 15751 | #: git-rebase--interactive.sh:448 |
5c57d762 JX |
15752 | #, sh-format |
15753 | msgid "Cannot write $fixup_msg" | |
15754 | msgstr "不能写入 $fixup_msg" | |
15755 | ||
31e5e17b | 15756 | #: git-rebase--interactive.sh:451 |
5c57d762 JX |
15757 | msgid "This is a combination of 2 commits." |
15758 | msgstr "这是一个 2 个提交的组合。" | |
15759 | ||
31e5e17b JX |
15760 | #: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 |
15761 | #: git-rebase--interactive.sh:538 | |
5c57d762 JX |
15762 | #, sh-format |
15763 | msgid "Could not apply $sha1... $rest" | |
15764 | msgstr "不能应用 $sha1... $rest" | |
15765 | ||
31e5e17b | 15766 | #: git-rebase--interactive.sh:567 |
5c57d762 JX |
15767 | #, sh-format |
15768 | msgid "" | |
15769 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
15770 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
15771 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
15772 | "before\n" | |
15773 | "you are able to reword the commit." | |
15774 | msgstr "" | |
15775 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
15776 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
15777 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
15778 | ||
31e5e17b | 15779 | #: git-rebase--interactive.sh:582 |
5c57d762 JX |
15780 | #, sh-format |
15781 | msgid "Stopped at $sha1_abbrev... $rest" | |
15782 | msgstr "停止在 $sha1_abbrev... $rest" | |
15783 | ||
31e5e17b | 15784 | #: git-rebase--interactive.sh:597 |
5c57d762 JX |
15785 | #, sh-format |
15786 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 15787 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 15788 | |
31e5e17b | 15789 | #: git-rebase--interactive.sh:639 |
5c57d762 JX |
15790 | #, sh-format |
15791 | msgid "Executing: $rest" | |
15792 | msgstr "执行:$rest" | |
15793 | ||
31e5e17b | 15794 | #: git-rebase--interactive.sh:647 |
5c57d762 JX |
15795 | #, sh-format |
15796 | msgid "Execution failed: $rest" | |
15797 | msgstr "执行失败:$rest" | |
15798 | ||
31e5e17b | 15799 | #: git-rebase--interactive.sh:649 |
5c57d762 JX |
15800 | msgid "and made changes to the index and/or the working tree" |
15801 | msgstr "并且修改索引和/或工作区" | |
15802 | ||
15803 | # 译者:注意保持前导空格 | |
31e5e17b | 15804 | #: git-rebase--interactive.sh:651 |
5c57d762 JX |
15805 | msgid "" |
15806 | "You can fix the problem, and then run\n" | |
15807 | "\n" | |
15808 | "\tgit rebase --continue" | |
15809 | msgstr "" | |
15810 | "您可以解决这个问题,然后运行\n" | |
15811 | "\n" | |
15812 | "\tgit rebase --continue" | |
15813 | ||
15814 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
31e5e17b | 15815 | #: git-rebase--interactive.sh:664 |
5c57d762 JX |
15816 | #, sh-format |
15817 | msgid "" | |
15818 | "Execution succeeded: $rest\n" | |
15819 | "but left changes to the index and/or the working tree\n" | |
15820 | "Commit or stash your changes, and then run\n" | |
15821 | "\n" | |
15822 | "\tgit rebase --continue" | |
15823 | msgstr "" | |
15824 | "执行成功:$rest\n" | |
a4f16749 | 15825 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
15826 | "\n" |
15827 | "\tgit rebase --continue" | |
15828 | ||
31e5e17b | 15829 | #: git-rebase--interactive.sh:675 |
5c57d762 JX |
15830 | #, sh-format |
15831 | msgid "Unknown command: $command $sha1 $rest" | |
15832 | msgstr "未知命令:$command $sha1 $rest" | |
15833 | ||
31e5e17b | 15834 | #: git-rebase--interactive.sh:676 |
5c57d762 JX |
15835 | msgid "Please fix this using 'git rebase --edit-todo'." |
15836 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
15837 | ||
31e5e17b | 15838 | #: git-rebase--interactive.sh:711 |
5c57d762 JX |
15839 | #, sh-format |
15840 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 15841 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 15842 | |
31e5e17b | 15843 | #: git-rebase--interactive.sh:735 |
5c57d762 JX |
15844 | msgid "could not detach HEAD" |
15845 | msgstr "不能检出为分离头指针" | |
15846 | ||
31e5e17b | 15847 | #: git-rebase--interactive.sh:771 |
5c57d762 JX |
15848 | msgid "Could not remove CHERRY_PICK_HEAD" |
15849 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
15850 | ||
31e5e17b | 15851 | #: git-rebase--interactive.sh:776 |
5c57d762 JX |
15852 | #, sh-format |
15853 | msgid "" | |
15854 | "You have staged changes in your working tree.\n" | |
15855 | "If these changes are meant to be\n" | |
15856 | "squashed into the previous commit, run:\n" | |
15857 | "\n" | |
15858 | " git commit --amend $gpg_sign_opt_quoted\n" | |
15859 | "\n" | |
15860 | "If they are meant to go into a new commit, run:\n" | |
15861 | "\n" | |
15862 | " git commit $gpg_sign_opt_quoted\n" | |
15863 | "\n" | |
a0b6b246 | 15864 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
15865 | "\n" |
15866 | " git rebase --continue\n" | |
15867 | msgstr "" | |
15868 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
15869 | "\n" | |
15870 | " git commit --amend $gpg_sign_opt_quoted\n" | |
15871 | "\n" | |
15872 | "如果这些变更要形成一个新提交,执行:\n" | |
15873 | "\n" | |
15874 | " git commit $gpg_sign_opt_quoted\n" | |
15875 | "\n" | |
9a4b694c | 15876 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
15877 | "\n" |
15878 | " git rebase --continue\n" | |
15879 | ||
31e5e17b | 15880 | #: git-rebase--interactive.sh:793 |
5c57d762 | 15881 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 15882 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 15883 | |
31e5e17b | 15884 | #: git-rebase--interactive.sh:798 |
5c57d762 JX |
15885 | msgid "" |
15886 | "You have uncommitted changes in your working tree. Please commit them\n" | |
15887 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
15888 | msgstr "" |
15889 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 15890 | |
31e5e17b | 15891 | #: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 |
5c57d762 JX |
15892 | msgid "Could not commit staged changes." |
15893 | msgstr "不能提交暂存的修改。" | |
15894 | ||
31e5e17b | 15895 | #: git-rebase--interactive.sh:836 |
5c57d762 JX |
15896 | msgid "" |
15897 | "\n" | |
15898 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
15899 | "To continue rebase after editing, run:\n" | |
15900 | " git rebase --continue\n" | |
15901 | "\n" | |
15902 | msgstr "" | |
15903 | "\n" | |
6937cb4e | 15904 | "您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" |
5c57d762 JX |
15905 | "请执行:\n" |
15906 | " git rebase --continue\n" | |
15907 | "\n" | |
15908 | ||
31e5e17b | 15909 | #: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 |
5c57d762 JX |
15910 | msgid "Could not execute editor" |
15911 | msgstr "无法运行编辑器" | |
15912 | ||
31e5e17b | 15913 | #: git-rebase--interactive.sh:860 |
5c57d762 JX |
15914 | #, sh-format |
15915 | msgid "Could not checkout $switch_to" | |
15916 | msgstr "不能检出 $switch_to" | |
15917 | ||
31e5e17b | 15918 | #: git-rebase--interactive.sh:865 |
5c57d762 JX |
15919 | msgid "No HEAD?" |
15920 | msgstr "没有 HEAD?" | |
15921 | ||
31e5e17b | 15922 | #: git-rebase--interactive.sh:866 |
5c57d762 JX |
15923 | #, sh-format |
15924 | msgid "Could not create temporary $state_dir" | |
15925 | msgstr "不能创建临时 $state_dir" | |
15926 | ||
31e5e17b | 15927 | #: git-rebase--interactive.sh:869 |
5c57d762 JX |
15928 | msgid "Could not mark as interactive" |
15929 | msgstr "不能标记为交互式" | |
15930 | ||
31e5e17b | 15931 | #: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 |
5c57d762 JX |
15932 | msgid "Could not init rewritten commits" |
15933 | msgstr "不能对重写提交进行初始化" | |
15934 | ||
31e5e17b | 15935 | #: git-rebase--interactive.sh:910 |
5809aa05 JX |
15936 | msgid "Could not generate todo list" |
15937 | msgstr "无法生成待办列表" | |
15938 | ||
31e5e17b | 15939 | #: git-rebase--interactive.sh:986 |
5c57d762 JX |
15940 | #, sh-format |
15941 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
15942 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
15943 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
15944 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
15945 | ||
31e5e17b | 15946 | #: git-rebase--interactive.sh:991 |
5c57d762 JX |
15947 | msgid "" |
15948 | "\n" | |
15949 | "However, if you remove everything, the rebase will be aborted.\n" | |
15950 | "\n" | |
a0b6b246 JX |
15951 | msgstr "" |
15952 | "\n" | |
15953 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
15954 | "\n" | |
5c57d762 | 15955 | |
31e5e17b | 15956 | #: git-rebase--interactive.sh:998 |
5c57d762 JX |
15957 | msgid "Note that empty commits are commented out" |
15958 | msgstr "注意空提交已被注释掉" | |
15959 | ||
15960 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 | |
15961 | #, sh-format | |
15962 | msgid "usage: $dashless $USAGE" | |
15963 | msgstr "用法:$dashless $USAGE" | |
15964 | ||
15965 | #: git-sh-setup.sh:190 | |
15966 | #, sh-format | |
15967 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 15968 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
15969 | |
15970 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
15971 | #, sh-format | |
15972 | msgid "fatal: $program_name cannot be used without a working tree." | |
15973 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
15974 | ||
15975 | #: git-sh-setup.sh:220 | |
15976 | msgid "Cannot rebase: You have unstaged changes." | |
15977 | msgstr "不能变基:您有未暂存的变更。" | |
15978 | ||
15979 | #: git-sh-setup.sh:223 | |
15980 | msgid "Cannot rewrite branches: You have unstaged changes." | |
15981 | msgstr "不能重写分支:您有未暂存的变更。" | |
15982 | ||
a0b6b246 JX |
15983 | #: git-sh-setup.sh:226 |
15984 | msgid "Cannot pull with rebase: You have unstaged changes." | |
15985 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
15986 | ||
5c57d762 JX |
15987 | #: git-sh-setup.sh:229 |
15988 | #, sh-format | |
15989 | msgid "Cannot $action: You have unstaged changes." | |
15990 | msgstr "不能 $action:您有未暂存的变更。" | |
15991 | ||
15992 | #: git-sh-setup.sh:242 | |
15993 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
15994 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
15995 | ||
a0b6b246 JX |
15996 | #: git-sh-setup.sh:245 |
15997 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
15998 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
15999 | ||
5c57d762 JX |
16000 | #: git-sh-setup.sh:248 |
16001 | #, sh-format | |
16002 | msgid "Cannot $action: Your index contains uncommitted changes." | |
16003 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
16004 | ||
a0b6b246 JX |
16005 | #: git-sh-setup.sh:252 |
16006 | msgid "Additionally, your index contains uncommitted changes." | |
16007 | msgstr "而且您的索引中包含未提交的变更。" | |
16008 | ||
5c57d762 JX |
16009 | #: git-sh-setup.sh:372 |
16010 | msgid "You need to run this command from the toplevel of the working tree." | |
16011 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
16012 | ||
16013 | #: git-sh-setup.sh:377 | |
16014 | msgid "Unable to determine absolute path of git directory" | |
16015 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 16016 | |
1a79b2f1 | 16017 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
a4f16749 | 16018 | #: git-add--interactive.perl:196 |
1a79b2f1 JX |
16019 | #, perl-format |
16020 | msgid "%12s %12s %s" | |
16021 | msgstr "%12s %12s %s" | |
16022 | ||
a4f16749 | 16023 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
16024 | msgid "staged" |
16025 | msgstr "缓存" | |
16026 | ||
a4f16749 | 16027 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
16028 | msgid "unstaged" |
16029 | msgstr "未缓存" | |
16030 | ||
a4f16749 | 16031 | #: git-add--interactive.perl:246 git-add--interactive.perl:271 |
1a79b2f1 JX |
16032 | msgid "binary" |
16033 | msgstr "二进制" | |
16034 | ||
a4f16749 | 16035 | #: git-add--interactive.perl:255 git-add--interactive.perl:309 |
1a79b2f1 JX |
16036 | msgid "nothing" |
16037 | msgstr "无" | |
16038 | ||
a4f16749 | 16039 | #: git-add--interactive.perl:291 git-add--interactive.perl:306 |
1a79b2f1 JX |
16040 | msgid "unchanged" |
16041 | msgstr "没有修改" | |
16042 | ||
a4f16749 | 16043 | #: git-add--interactive.perl:602 |
1a79b2f1 JX |
16044 | #, perl-format |
16045 | msgid "added %d path\n" | |
16046 | msgid_plural "added %d paths\n" | |
16047 | msgstr[0] "增加了 %d 个路径\n" | |
16048 | msgstr[1] "增加了 %d 个路径\n" | |
16049 | ||
a4f16749 | 16050 | #: git-add--interactive.perl:605 |
1a79b2f1 JX |
16051 | #, perl-format |
16052 | msgid "updated %d path\n" | |
16053 | msgid_plural "updated %d paths\n" | |
16054 | msgstr[0] "更新了 %d 个路径\n" | |
16055 | msgstr[1] "更新了 %d 个路径\n" | |
16056 | ||
a4f16749 | 16057 | #: git-add--interactive.perl:608 |
1a79b2f1 JX |
16058 | #, perl-format |
16059 | msgid "reverted %d path\n" | |
16060 | msgid_plural "reverted %d paths\n" | |
16061 | msgstr[0] "还原了 %d 个路径\n" | |
16062 | msgstr[1] "还原了 %d 个路径\n" | |
16063 | ||
a4f16749 | 16064 | #: git-add--interactive.perl:611 |
1a79b2f1 JX |
16065 | #, perl-format |
16066 | msgid "touched %d path\n" | |
16067 | msgid_plural "touched %d paths\n" | |
16068 | msgstr[0] "触碰了 %d 个路径\n" | |
16069 | msgstr[1] "触碰了 %d 个路径\n" | |
16070 | ||
a4f16749 | 16071 | #: git-add--interactive.perl:620 |
1a79b2f1 JX |
16072 | msgid "Update" |
16073 | msgstr "更新" | |
16074 | ||
a4f16749 | 16075 | #: git-add--interactive.perl:632 |
1a79b2f1 JX |
16076 | msgid "Revert" |
16077 | msgstr "还原" | |
16078 | ||
a4f16749 | 16079 | #: git-add--interactive.perl:655 |
1a79b2f1 JX |
16080 | #, perl-format |
16081 | msgid "note: %s is untracked now.\n" | |
16082 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
16083 | ||
a4f16749 | 16084 | #: git-add--interactive.perl:666 |
1a79b2f1 JX |
16085 | msgid "Add untracked" |
16086 | msgstr "添加未跟踪的" | |
16087 | ||
a4f16749 | 16088 | #: git-add--interactive.perl:672 |
1a79b2f1 JX |
16089 | msgid "No untracked files.\n" |
16090 | msgstr "没有未跟踪的文件。\n" | |
16091 | ||
31e5e17b | 16092 | #: git-add--interactive.perl:1026 |
1a79b2f1 JX |
16093 | msgid "" |
16094 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16095 | "marked for staging." | |
16096 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
16097 | ||
31e5e17b | 16098 | #: git-add--interactive.perl:1029 |
1a79b2f1 JX |
16099 | msgid "" |
16100 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16101 | "marked for stashing." | |
a4f16749 | 16102 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 16103 | |
31e5e17b | 16104 | #: git-add--interactive.perl:1032 |
1a79b2f1 JX |
16105 | msgid "" |
16106 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16107 | "marked for unstaging." | |
16108 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
16109 | ||
31e5e17b | 16110 | #: git-add--interactive.perl:1035 git-add--interactive.perl:1044 |
1a79b2f1 JX |
16111 | msgid "" |
16112 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16113 | "marked for applying." | |
16114 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
16115 | ||
31e5e17b | 16116 | #: git-add--interactive.perl:1038 git-add--interactive.perl:1041 |
1a79b2f1 JX |
16117 | msgid "" |
16118 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
16119 | "marked for discarding." | |
16120 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
16121 | ||
31e5e17b | 16122 | #: git-add--interactive.perl:1078 |
1a79b2f1 JX |
16123 | #, perl-format |
16124 | msgid "failed to open hunk edit file for writing: %s" | |
16125 | msgstr "无法写入块编辑文件:%s" | |
16126 | ||
31e5e17b | 16127 | #: git-add--interactive.perl:1079 |
1a79b2f1 JX |
16128 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
16129 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
16130 | ||
31e5e17b | 16131 | #: git-add--interactive.perl:1085 |
1a79b2f1 JX |
16132 | #, perl-format |
16133 | msgid "" | |
16134 | "---\n" | |
16135 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
16136 | "To remove '%s' lines, delete them.\n" | |
16137 | "Lines starting with %s will be removed.\n" | |
16138 | msgstr "" | |
16139 | "---\n" | |
16140 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
16141 | "要删除 '%s' 开始的行,删除它们。\n" | |
16142 | "以 %s 开始的行将被删除。\n" | |
16143 | ||
16144 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
31e5e17b | 16145 | #: git-add--interactive.perl:1093 |
1a79b2f1 JX |
16146 | msgid "" |
16147 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
16148 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
16149 | "aborted and the hunk is left unchanged.\n" | |
16150 | msgstr "" | |
16151 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
16152 | "此次编辑被终止,该块不会被修改。\n" | |
16153 | ||
31e5e17b | 16154 | #: git-add--interactive.perl:1107 |
1a79b2f1 JX |
16155 | #, perl-format |
16156 | msgid "failed to open hunk edit file for reading: %s" | |
16157 | msgstr "无法读取块编辑文件:%s" | |
16158 | ||
16159 | #. TRANSLATORS: do not translate [y/n] | |
16160 | #. The program will only accept that input | |
16161 | #. at this point. | |
16162 | #. Consider translating (saying "no" discards!) as | |
16163 | #. (saying "n" for "no" discards!) if the translation | |
16164 | #. of the word "no" does not start with n. | |
31e5e17b | 16165 | #: git-add--interactive.perl:1206 |
1a79b2f1 JX |
16166 | msgid "" |
16167 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
16168 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
16169 | ||
31e5e17b | 16170 | #: git-add--interactive.perl:1215 |
1a79b2f1 JX |
16171 | msgid "" |
16172 | "y - stage this hunk\n" | |
16173 | "n - do not stage this hunk\n" | |
16174 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
16175 | "a - stage this hunk and all later hunks in the file\n" | |
16176 | "d - do not stage this hunk or any of the later hunks in the file" | |
16177 | msgstr "" | |
16178 | "y - 暂存该块\n" | |
16179 | "n - 不要暂存该块\n" | |
16180 | "q - 退出。不暂存该块及后面的全部块\n" | |
16181 | "a - 暂存该块和本文件中后面的全部块\n" | |
16182 | "d - 不暂存该块和本文件中后面的全部块" | |
16183 | ||
31e5e17b | 16184 | #: git-add--interactive.perl:1221 |
1a79b2f1 JX |
16185 | msgid "" |
16186 | "y - stash this hunk\n" | |
16187 | "n - do not stash this hunk\n" | |
16188 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
16189 | "a - stash this hunk and all later hunks in the file\n" | |
16190 | "d - do not stash this hunk or any of the later hunks in the file" | |
16191 | msgstr "" | |
16192 | "y - 贮藏该块\n" | |
16193 | "n - 不要贮藏该块\n" | |
16194 | "q - 退出。不贮藏该块及后面的全部块\n" | |
16195 | "a - 贮藏该块和本文件中后面的全部块\n" | |
16196 | "d - 不贮藏该块和本文件中后面的全部块" | |
16197 | ||
31e5e17b | 16198 | #: git-add--interactive.perl:1227 |
1a79b2f1 JX |
16199 | msgid "" |
16200 | "y - unstage this hunk\n" | |
16201 | "n - do not unstage this hunk\n" | |
16202 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
16203 | "a - unstage this hunk and all later hunks in the file\n" | |
16204 | "d - do not unstage this hunk or any of the later hunks in the file" | |
16205 | msgstr "" | |
16206 | "y - 不暂存该块\n" | |
16207 | "n - 不要不暂存该块\n" | |
16208 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
16209 | "a - 不暂存该块和本文件中后面的全部块\n" | |
16210 | "d - 不要不暂存该块和本文件中后面的全部块" | |
16211 | ||
31e5e17b | 16212 | #: git-add--interactive.perl:1233 |
1a79b2f1 JX |
16213 | msgid "" |
16214 | "y - apply this hunk to index\n" | |
16215 | "n - do not apply this hunk to index\n" | |
16216 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
16217 | "a - apply this hunk and all later hunks in the file\n" | |
16218 | "d - do not apply this hunk or any of the later hunks in the file" | |
16219 | msgstr "" | |
16220 | "y - 在索引中应用该块\n" | |
16221 | "n - 不要在索引中应用该块\n" | |
16222 | "q - 退出。不要应用该块及后面的全部块\n" | |
16223 | "a - 应用该块和本文件中后面的全部块\n" | |
16224 | "d - 不要应用该块和本文件中后面的全部块" | |
16225 | ||
31e5e17b | 16226 | #: git-add--interactive.perl:1239 |
1a79b2f1 JX |
16227 | msgid "" |
16228 | "y - discard this hunk from worktree\n" | |
16229 | "n - do not discard this hunk from worktree\n" | |
16230 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
16231 | "a - discard this hunk and all later hunks in the file\n" | |
16232 | "d - do not discard this hunk or any of the later hunks in the file" | |
16233 | msgstr "" | |
16234 | "y - 在工作区中丢弃该块\n" | |
16235 | "n - 不要在工作区中丢弃该块\n" | |
16236 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
16237 | "a - 丢弃该块和本文件中后面的全部块\n" | |
16238 | "d - 不要丢弃该块和本文件中后面的全部块" | |
16239 | ||
31e5e17b | 16240 | #: git-add--interactive.perl:1245 |
1a79b2f1 JX |
16241 | msgid "" |
16242 | "y - discard this hunk from index and worktree\n" | |
16243 | "n - do not discard this hunk from index and worktree\n" | |
16244 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
16245 | "a - discard this hunk and all later hunks in the file\n" | |
16246 | "d - do not discard this hunk or any of the later hunks in the file" | |
16247 | msgstr "" | |
16248 | "y - 在索引和工作区中丢弃该块\n" | |
16249 | "n - 不要在索引和工作区中丢弃该块\n" | |
16250 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
16251 | "a - 丢弃该块和本文件中后面的全部块\n" | |
16252 | "d - 不要丢弃该块和本文件中后面的全部块" | |
16253 | ||
31e5e17b | 16254 | #: git-add--interactive.perl:1251 |
1a79b2f1 JX |
16255 | msgid "" |
16256 | "y - apply this hunk to index and worktree\n" | |
16257 | "n - do not apply this hunk to index and worktree\n" | |
16258 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
16259 | "a - apply this hunk and all later hunks in the file\n" | |
16260 | "d - do not apply this hunk or any of the later hunks in the file" | |
16261 | msgstr "" | |
16262 | "y - 在索引和工作区中应用该块\n" | |
16263 | "n - 不要在索引和工作区中应用该块\n" | |
16264 | "q - 退出。不要应用该块及后面的全部块\n" | |
16265 | "a - 应用该块和本文件中后面的全部块\n" | |
16266 | "d - 不要应用该块和本文件中后面的全部块" | |
16267 | ||
31e5e17b | 16268 | #: git-add--interactive.perl:1266 |
1a79b2f1 JX |
16269 | msgid "" |
16270 | "g - select a hunk to go to\n" | |
16271 | "/ - search for a hunk matching the given regex\n" | |
16272 | "j - leave this hunk undecided, see next undecided hunk\n" | |
16273 | "J - leave this hunk undecided, see next hunk\n" | |
16274 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
16275 | "K - leave this hunk undecided, see previous hunk\n" | |
16276 | "s - split the current hunk into smaller hunks\n" | |
16277 | "e - manually edit the current hunk\n" | |
16278 | "? - print help\n" | |
16279 | msgstr "" | |
16280 | "g - 选择跳转到一个块\n" | |
16281 | "/ - 查找和给定正则表达式匹配的块\n" | |
16282 | "j - 维持该块未决状态,查看下一个未决块\n" | |
16283 | "J - 维持该块未决状态,查看下一个块\n" | |
16284 | "k - 维持该块未决状态,查看上一个未决块\n" | |
16285 | "K - 维持该块未决状态,查看上一个块\n" | |
16286 | "s - 拆分当前块为更小的块\n" | |
16287 | "e - 手动编辑当前块\n" | |
16288 | "? - 显示帮助\n" | |
16289 | ||
31e5e17b | 16290 | #: git-add--interactive.perl:1297 |
1a79b2f1 JX |
16291 | msgid "The selected hunks do not apply to the index!\n" |
16292 | msgstr "选中的块不能应用到索引!\n" | |
16293 | ||
31e5e17b | 16294 | #: git-add--interactive.perl:1298 |
1a79b2f1 JX |
16295 | msgid "Apply them to the worktree anyway? " |
16296 | msgstr "无论如何都要应用到工作区么?" | |
16297 | ||
31e5e17b | 16298 | #: git-add--interactive.perl:1301 |
1a79b2f1 JX |
16299 | msgid "Nothing was applied.\n" |
16300 | msgstr "未应用。\n" | |
16301 | ||
31e5e17b | 16302 | #: git-add--interactive.perl:1312 |
1a79b2f1 JX |
16303 | #, perl-format |
16304 | msgid "ignoring unmerged: %s\n" | |
16305 | msgstr "忽略未合入的:%s\n" | |
16306 | ||
31e5e17b | 16307 | #: git-add--interactive.perl:1321 |
1a79b2f1 JX |
16308 | msgid "Only binary files changed.\n" |
16309 | msgstr "只有二进制文件被修改。\n" | |
16310 | ||
31e5e17b | 16311 | #: git-add--interactive.perl:1323 |
1a79b2f1 JX |
16312 | msgid "No changes.\n" |
16313 | msgstr "没有修改。\n" | |
16314 | ||
31e5e17b | 16315 | #: git-add--interactive.perl:1331 |
1a79b2f1 JX |
16316 | msgid "Patch update" |
16317 | msgstr "补丁更新" | |
16318 | ||
31e5e17b | 16319 | #: git-add--interactive.perl:1383 |
1a79b2f1 | 16320 | #, perl-format |
31e5e17b JX |
16321 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
16322 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16323 | |
31e5e17b | 16324 | #: git-add--interactive.perl:1384 |
1a79b2f1 | 16325 | #, perl-format |
31e5e17b JX |
16326 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
16327 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16328 | |
31e5e17b | 16329 | #: git-add--interactive.perl:1385 |
1a79b2f1 | 16330 | #, perl-format |
31e5e17b JX |
16331 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
16332 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16333 | |
31e5e17b | 16334 | #: git-add--interactive.perl:1388 |
1a79b2f1 | 16335 | #, perl-format |
31e5e17b JX |
16336 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
16337 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16338 | |
31e5e17b | 16339 | #: git-add--interactive.perl:1389 |
1a79b2f1 | 16340 | #, perl-format |
31e5e17b JX |
16341 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
16342 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16343 | |
31e5e17b | 16344 | #: git-add--interactive.perl:1390 |
1a79b2f1 | 16345 | #, perl-format |
31e5e17b JX |
16346 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
16347 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16348 | |
31e5e17b | 16349 | #: git-add--interactive.perl:1393 |
1a79b2f1 | 16350 | #, perl-format |
31e5e17b JX |
16351 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
16352 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16353 | |
31e5e17b | 16354 | #: git-add--interactive.perl:1394 |
1a79b2f1 | 16355 | #, perl-format |
31e5e17b JX |
16356 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
16357 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16358 | |
31e5e17b | 16359 | #: git-add--interactive.perl:1395 |
1a79b2f1 | 16360 | #, perl-format |
31e5e17b JX |
16361 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
16362 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16363 | |
31e5e17b | 16364 | #: git-add--interactive.perl:1398 |
1a79b2f1 | 16365 | #, perl-format |
31e5e17b JX |
16366 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
16367 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16368 | |
31e5e17b | 16369 | #: git-add--interactive.perl:1399 |
1a79b2f1 | 16370 | #, perl-format |
31e5e17b JX |
16371 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
16372 | msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16373 | |
31e5e17b | 16374 | #: git-add--interactive.perl:1400 |
1a79b2f1 | 16375 | #, perl-format |
31e5e17b JX |
16376 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
16377 | msgstr "将此块应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16378 | |
31e5e17b | 16379 | #: git-add--interactive.perl:1403 |
1a79b2f1 | 16380 | #, perl-format |
31e5e17b JX |
16381 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
16382 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16383 | |
31e5e17b | 16384 | #: git-add--interactive.perl:1404 |
1a79b2f1 | 16385 | #, perl-format |
31e5e17b JX |
16386 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
16387 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16388 | |
31e5e17b | 16389 | #: git-add--interactive.perl:1405 |
1a79b2f1 | 16390 | #, perl-format |
31e5e17b JX |
16391 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
16392 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16393 | |
31e5e17b | 16394 | #: git-add--interactive.perl:1408 |
1a79b2f1 | 16395 | #, perl-format |
31e5e17b JX |
16396 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
16397 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16398 | |
31e5e17b | 16399 | #: git-add--interactive.perl:1409 |
1a79b2f1 | 16400 | #, perl-format |
31e5e17b JX |
16401 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
16402 | msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16403 | |
31e5e17b | 16404 | #: git-add--interactive.perl:1410 |
1a79b2f1 | 16405 | #, perl-format |
31e5e17b JX |
16406 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
16407 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16408 | |
31e5e17b | 16409 | #: git-add--interactive.perl:1413 |
1a79b2f1 | 16410 | #, perl-format |
31e5e17b JX |
16411 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
16412 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16413 | |
31e5e17b | 16414 | #: git-add--interactive.perl:1414 |
1a79b2f1 | 16415 | #, perl-format |
31e5e17b JX |
16416 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
16417 | msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 16418 | |
31e5e17b | 16419 | #: git-add--interactive.perl:1415 |
1a79b2f1 | 16420 | #, perl-format |
31e5e17b JX |
16421 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
16422 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
16423 | ||
16424 | #: git-add--interactive.perl:1515 | |
16425 | msgid "No other hunks to goto\n" | |
16426 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 16427 | |
31e5e17b | 16428 | #: git-add--interactive.perl:1522 |
1a79b2f1 JX |
16429 | msgid "go to which hunk (<ret> to see more)? " |
16430 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
16431 | ||
31e5e17b | 16432 | #: git-add--interactive.perl:1524 |
1a79b2f1 JX |
16433 | msgid "go to which hunk? " |
16434 | msgstr "跳转到哪个块?" | |
16435 | ||
31e5e17b | 16436 | #: git-add--interactive.perl:1533 |
1a79b2f1 JX |
16437 | #, perl-format |
16438 | msgid "Invalid number: '%s'\n" | |
16439 | msgstr "无效数字:'%s'\n" | |
16440 | ||
31e5e17b | 16441 | #: git-add--interactive.perl:1538 |
1a79b2f1 JX |
16442 | #, perl-format |
16443 | msgid "Sorry, only %d hunk available.\n" | |
16444 | msgid_plural "Sorry, only %d hunks available.\n" | |
16445 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
16446 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
16447 | ||
31e5e17b JX |
16448 | #: git-add--interactive.perl:1564 |
16449 | msgid "No other hunks to search\n" | |
16450 | msgstr "没有其它可供查找的块\n" | |
16451 | ||
16452 | #: git-add--interactive.perl:1568 | |
1a79b2f1 JX |
16453 | msgid "search for regex? " |
16454 | msgstr "使用正则表达式搜索?" | |
16455 | ||
31e5e17b | 16456 | #: git-add--interactive.perl:1581 |
1a79b2f1 JX |
16457 | #, perl-format |
16458 | msgid "Malformed search regexp %s: %s\n" | |
16459 | msgstr "错误的正则表达式 %s:%s\n" | |
16460 | ||
31e5e17b | 16461 | #: git-add--interactive.perl:1591 |
1a79b2f1 JX |
16462 | msgid "No hunk matches the given pattern\n" |
16463 | msgstr "没有和给定模式相匹配的快\n" | |
16464 | ||
31e5e17b | 16465 | #: git-add--interactive.perl:1603 git-add--interactive.perl:1625 |
1a79b2f1 JX |
16466 | msgid "No previous hunk\n" |
16467 | msgstr "没有前一个块\n" | |
16468 | ||
31e5e17b | 16469 | #: git-add--interactive.perl:1612 git-add--interactive.perl:1631 |
1a79b2f1 JX |
16470 | msgid "No next hunk\n" |
16471 | msgstr "没有下一个块\n" | |
16472 | ||
31e5e17b JX |
16473 | #: git-add--interactive.perl:1637 |
16474 | msgid "Sorry, cannot split this hunk\n" | |
16475 | msgstr "对不起,不能拆分这个块\n" | |
16476 | ||
16477 | #: git-add--interactive.perl:1643 | |
1a79b2f1 JX |
16478 | #, perl-format |
16479 | msgid "Split into %d hunk.\n" | |
16480 | msgid_plural "Split into %d hunks.\n" | |
16481 | msgstr[0] "拆分为 %d 块。\n" | |
16482 | msgstr[1] "拆分为 %d 块。\n" | |
16483 | ||
31e5e17b JX |
16484 | #: git-add--interactive.perl:1653 |
16485 | msgid "Sorry, cannot edit this hunk\n" | |
16486 | msgstr "对不起,不能编辑这个块\n" | |
16487 | ||
16488 | #: git-add--interactive.perl:1699 | |
1a79b2f1 JX |
16489 | msgid "Review diff" |
16490 | msgstr "检视 diff" | |
16491 | ||
16492 | #. TRANSLATORS: please do not translate the command names | |
16493 | #. 'status', 'update', 'revert', etc. | |
31e5e17b | 16494 | #: git-add--interactive.perl:1718 |
1a79b2f1 JX |
16495 | msgid "" |
16496 | "status - show paths with changes\n" | |
16497 | "update - add working tree state to the staged set of changes\n" | |
16498 | "revert - revert staged set of changes back to the HEAD version\n" | |
16499 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 16500 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
16501 | "add untracked - add contents of untracked files to the staged set of " |
16502 | "changes\n" | |
16503 | msgstr "" | |
16504 | "status - 显示含变更的路径\n" | |
16505 | "update - 添加工作区状态至暂存列表\n" | |
16506 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
16507 | "patch - 挑选块并且有选择地更新\n" | |
16508 | "diff - 显示 HEAD 和索引间差异\n" | |
16509 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
16510 | ||
31e5e17b JX |
16511 | #: git-add--interactive.perl:1735 git-add--interactive.perl:1740 |
16512 | #: git-add--interactive.perl:1743 git-add--interactive.perl:1750 | |
16513 | #: git-add--interactive.perl:1754 git-add--interactive.perl:1760 | |
1a79b2f1 JX |
16514 | msgid "missing --" |
16515 | msgstr "缺失 --" | |
16516 | ||
31e5e17b | 16517 | #: git-add--interactive.perl:1756 |
1a79b2f1 JX |
16518 | #, perl-format |
16519 | msgid "unknown --patch mode: %s" | |
16520 | msgstr "未知的 --patch 模式:%s" | |
16521 | ||
31e5e17b | 16522 | #: git-add--interactive.perl:1762 git-add--interactive.perl:1768 |
1a79b2f1 JX |
16523 | #, perl-format |
16524 | msgid "invalid argument %s, expecting --" | |
16525 | msgstr "无效的参数 %s,期望是 --" | |
16526 | ||
31e5e17b | 16527 | #: git-send-email.perl:130 |
1a79b2f1 JX |
16528 | msgid "local zone differs from GMT by a non-minute interval\n" |
16529 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
16530 | ||
31e5e17b | 16531 | #: git-send-email.perl:137 git-send-email.perl:143 |
1a79b2f1 JX |
16532 | msgid "local time offset greater than or equal to 24 hours\n" |
16533 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
16534 | ||
31e5e17b | 16535 | #: git-send-email.perl:211 git-send-email.perl:217 |
1a79b2f1 JX |
16536 | msgid "the editor exited uncleanly, aborting everything" |
16537 | msgstr "编辑器非正常退出,终止所有操作" | |
16538 | ||
31e5e17b | 16539 | #: git-send-email.perl:294 |
1a79b2f1 JX |
16540 | #, perl-format |
16541 | msgid "" | |
16542 | "'%s' contains an intermediate version of the email you were composing.\n" | |
16543 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
16544 | ||
31e5e17b | 16545 | #: git-send-email.perl:299 |
1a79b2f1 JX |
16546 | #, perl-format |
16547 | msgid "'%s.final' contains the composed email.\n" | |
16548 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
16549 | ||
31e5e17b | 16550 | #: git-send-email.perl:317 |
1a79b2f1 JX |
16551 | msgid "--dump-aliases incompatible with other options\n" |
16552 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
16553 | ||
31e5e17b | 16554 | #: git-send-email.perl:383 git-send-email.perl:638 |
1a79b2f1 JX |
16555 | msgid "Cannot run git format-patch from outside a repository\n" |
16556 | msgstr "不能在仓库之外运行 git format-patch\n" | |
16557 | ||
31e5e17b JX |
16558 | #: git-send-email.perl:386 |
16559 | msgid "" | |
16560 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
16561 | "configuration option)\n" | |
16562 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
16563 | ||
16564 | #: git-send-email.perl:456 | |
1a79b2f1 JX |
16565 | #, perl-format |
16566 | msgid "Unknown --suppress-cc field: '%s'\n" | |
16567 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
16568 | ||
31e5e17b | 16569 | #: git-send-email.perl:485 |
1a79b2f1 JX |
16570 | #, perl-format |
16571 | msgid "Unknown --confirm setting: '%s'\n" | |
16572 | msgstr "未知的 --confirm 设置:'%s'\n" | |
16573 | ||
31e5e17b | 16574 | #: git-send-email.perl:513 |
1a79b2f1 JX |
16575 | #, perl-format |
16576 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
16577 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
16578 | ||
31e5e17b | 16579 | #: git-send-email.perl:515 |
1a79b2f1 JX |
16580 | #, perl-format |
16581 | msgid "warning: `:include:` not supported: %s\n" | |
16582 | msgstr "警告:不支持 `:include:`:%s\n" | |
16583 | ||
31e5e17b | 16584 | #: git-send-email.perl:517 |
1a79b2f1 JX |
16585 | #, perl-format |
16586 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
16587 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
16588 | ||
31e5e17b | 16589 | #: git-send-email.perl:522 |
1a79b2f1 JX |
16590 | #, perl-format |
16591 | msgid "warning: sendmail line is not recognized: %s\n" | |
16592 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
16593 | ||
31e5e17b | 16594 | #: git-send-email.perl:604 |
1a79b2f1 JX |
16595 | #, perl-format |
16596 | msgid "" | |
16597 | "File '%s' exists but it could also be the range of commits\n" | |
16598 | "to produce patches for. Please disambiguate by...\n" | |
16599 | "\n" | |
16600 | " * Saying \"./%s\" if you mean a file; or\n" | |
16601 | " * Giving --format-patch option if you mean a range.\n" | |
16602 | msgstr "" | |
87cb7997 JX |
16603 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
16604 | "歧义:\n" | |
1a79b2f1 JX |
16605 | "\n" |
16606 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
16607 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
16608 | ||
31e5e17b | 16609 | #: git-send-email.perl:625 |
1a79b2f1 JX |
16610 | #, perl-format |
16611 | msgid "Failed to opendir %s: %s" | |
16612 | msgstr "无法打开目录 %s: %s" | |
16613 | ||
31e5e17b | 16614 | #: git-send-email.perl:649 |
1a79b2f1 JX |
16615 | #, perl-format |
16616 | msgid "" | |
16617 | "fatal: %s: %s\n" | |
16618 | "warning: no patches were sent\n" | |
16619 | msgstr "" | |
16620 | "严重:%s:%s\n" | |
16621 | "警告:补丁未能发送\n" | |
16622 | ||
31e5e17b | 16623 | #: git-send-email.perl:660 |
1a79b2f1 JX |
16624 | msgid "" |
16625 | "\n" | |
16626 | "No patch files specified!\n" | |
16627 | "\n" | |
87cb7997 JX |
16628 | msgstr "" |
16629 | "\n" | |
16630 | "未指定补丁文件!\n" | |
16631 | "\n" | |
1a79b2f1 | 16632 | |
31e5e17b | 16633 | #: git-send-email.perl:673 |
1a79b2f1 JX |
16634 | #, perl-format |
16635 | msgid "No subject line in %s?" | |
16636 | msgstr "在 %s 中没有标题行?" | |
16637 | ||
31e5e17b | 16638 | #: git-send-email.perl:683 |
1a79b2f1 JX |
16639 | #, perl-format |
16640 | msgid "Failed to open for writing %s: %s" | |
16641 | msgstr "无法写入 %s: %s" | |
16642 | ||
31e5e17b | 16643 | #: git-send-email.perl:694 |
1a79b2f1 JX |
16644 | msgid "" |
16645 | "Lines beginning in \"GIT:\" will be removed.\n" | |
16646 | "Consider including an overall diffstat or table of contents\n" | |
16647 | "for the patch you are writing.\n" | |
16648 | "\n" | |
16649 | "Clear the body content if you don't wish to send a summary.\n" | |
16650 | msgstr "" | |
16651 | "以 \"GIT:\" 开头的行将被删除。\n" | |
16652 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" | |
16653 | "\n" | |
16654 | "如果您不想发送摘要,清除内容。\n" | |
16655 | ||
31e5e17b | 16656 | #: git-send-email.perl:718 |
1a79b2f1 JX |
16657 | #, perl-format |
16658 | msgid "Failed to open %s: %s" | |
16659 | msgstr "无法打开 %s: %s" | |
16660 | ||
31e5e17b JX |
16661 | #: git-send-email.perl:735 |
16662 | #, perl-format | |
16663 | msgid "Failed to open %s.final: %s" | |
16664 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 16665 | |
31e5e17b | 16666 | #: git-send-email.perl:778 |
1a79b2f1 JX |
16667 | msgid "Summary email is empty, skipping it\n" |
16668 | msgstr "摘要邮件为空,跳过\n" | |
16669 | ||
16670 | #. TRANSLATORS: please keep [y/N] as is. | |
31e5e17b | 16671 | #: git-send-email.perl:813 |
1a79b2f1 JX |
16672 | #, perl-format |
16673 | msgid "Are you sure you want to use <%s> [y/N]? " | |
16674 | msgstr "您确认要使用 <%s> [y/N]?" | |
16675 | ||
31e5e17b | 16676 | #: git-send-email.perl:868 |
1a79b2f1 JX |
16677 | msgid "" |
16678 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
16679 | "Encoding.\n" | |
16680 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
16681 | ||
31e5e17b | 16682 | #: git-send-email.perl:873 |
1a79b2f1 JX |
16683 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
16684 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
16685 | ||
31e5e17b | 16686 | #: git-send-email.perl:881 |
1a79b2f1 JX |
16687 | #, perl-format |
16688 | msgid "" | |
16689 | "Refusing to send because the patch\n" | |
16690 | "\t%s\n" | |
16691 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
16692 | "want to send.\n" | |
16693 | msgstr "" | |
16694 | "拒绝发送,因为补丁\n" | |
16695 | "\t%s\n" | |
16696 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
16697 | ||
31e5e17b | 16698 | #: git-send-email.perl:900 |
1a79b2f1 JX |
16699 | msgid "To whom should the emails be sent (if anyone)?" |
16700 | msgstr "邮件将要发送给谁?" | |
16701 | ||
31e5e17b | 16702 | #: git-send-email.perl:918 |
1a79b2f1 JX |
16703 | #, perl-format |
16704 | msgid "fatal: alias '%s' expands to itself\n" | |
16705 | msgstr "严重:别名 '%s' 扩展为它自己\n" | |
16706 | ||
31e5e17b | 16707 | #: git-send-email.perl:930 |
1a79b2f1 JX |
16708 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
16709 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
16710 | ||
31e5e17b | 16711 | #: git-send-email.perl:988 git-send-email.perl:996 |
1a79b2f1 JX |
16712 | #, perl-format |
16713 | msgid "error: unable to extract a valid address from: %s\n" | |
16714 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
16715 | ||
16716 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
16717 | #. translation. The program will only accept English input | |
16718 | #. at this point. | |
31e5e17b | 16719 | #: git-send-email.perl:1000 |
1a79b2f1 JX |
16720 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
16721 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
16722 | ||
31e5e17b | 16723 | #: git-send-email.perl:1317 |
1a79b2f1 JX |
16724 | #, perl-format |
16725 | msgid "CA path \"%s\" does not exist" | |
16726 | msgstr "CA 路径 \"%s\" 不存在" | |
16727 | ||
31e5e17b | 16728 | #: git-send-email.perl:1395 |
1a79b2f1 JX |
16729 | msgid "" |
16730 | " The Cc list above has been expanded by additional\n" | |
16731 | " addresses found in the patch commit message. By default\n" | |
16732 | " send-email prompts before sending whenever this occurs.\n" | |
16733 | " This behavior is controlled by the sendemail.confirm\n" | |
16734 | " configuration setting.\n" | |
16735 | "\n" | |
16736 | " For additional information, run 'git send-email --help'.\n" | |
16737 | " To retain the current behavior, but squelch this message,\n" | |
16738 | " run 'git config --global sendemail.confirm auto'.\n" | |
16739 | "\n" | |
16740 | msgstr "" | |
16741 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
16742 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
16743 | " sendemail.confirm 配置设置。\n" | |
16744 | "\n" | |
16745 | " 更多信息,执行 'git send-email --help'。\n" | |
16746 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
16747 | " sendemail.confirm auto'。\n" | |
16748 | "\n" | |
16749 | ||
16750 | #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your | |
16751 | #. translation. The program will only accept English input | |
16752 | #. at this point. | |
31e5e17b | 16753 | #: git-send-email.perl:1410 |
1a79b2f1 JX |
16754 | msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " |
16755 | msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):" | |
16756 | ||
31e5e17b | 16757 | #: git-send-email.perl:1413 |
1a79b2f1 JX |
16758 | msgid "Send this email reply required" |
16759 | msgstr "发送要求的邮件回复" | |
16760 | ||
31e5e17b | 16761 | #: git-send-email.perl:1439 |
1a79b2f1 JX |
16762 | msgid "The required SMTP server is not properly defined." |
16763 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
16764 | ||
31e5e17b | 16765 | #: git-send-email.perl:1486 |
1a79b2f1 JX |
16766 | #, perl-format |
16767 | msgid "Server does not support STARTTLS! %s" | |
16768 | msgstr "服务器不支持 STARTTLS!%s" | |
16769 | ||
31e5e17b | 16770 | #: git-send-email.perl:1491 git-send-email.perl:1495 |
a4f16749 JX |
16771 | #, perl-format |
16772 | msgid "STARTTLS failed! %s" | |
16773 | msgstr "STARTTLS 失败!%s" | |
16774 | ||
31e5e17b | 16775 | #: git-send-email.perl:1505 |
1a79b2f1 JX |
16776 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
16777 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
16778 | ||
31e5e17b | 16779 | #: git-send-email.perl:1523 |
1a79b2f1 JX |
16780 | #, perl-format |
16781 | msgid "Failed to send %s\n" | |
16782 | msgstr "无法发送 %s\n" | |
16783 | ||
31e5e17b | 16784 | #: git-send-email.perl:1526 |
1a79b2f1 JX |
16785 | #, perl-format |
16786 | msgid "Dry-Sent %s\n" | |
16787 | msgstr "演习发送 %s\n" | |
16788 | ||
31e5e17b | 16789 | #: git-send-email.perl:1526 |
1a79b2f1 JX |
16790 | #, perl-format |
16791 | msgid "Sent %s\n" | |
16792 | msgstr "正发送 %s\n" | |
16793 | ||
31e5e17b | 16794 | #: git-send-email.perl:1528 |
1a79b2f1 JX |
16795 | msgid "Dry-OK. Log says:\n" |
16796 | msgstr "演习成功。日志说:\n" | |
16797 | ||
31e5e17b | 16798 | #: git-send-email.perl:1528 |
1a79b2f1 JX |
16799 | msgid "OK. Log says:\n" |
16800 | msgstr "OK。日志说:\n" | |
16801 | ||
31e5e17b | 16802 | #: git-send-email.perl:1540 |
1a79b2f1 JX |
16803 | msgid "Result: " |
16804 | msgstr "结果:" | |
16805 | ||
31e5e17b | 16806 | #: git-send-email.perl:1543 |
1a79b2f1 JX |
16807 | msgid "Result: OK\n" |
16808 | msgstr "结果:OK\n" | |
16809 | ||
31e5e17b | 16810 | #: git-send-email.perl:1556 |
1a79b2f1 JX |
16811 | #, perl-format |
16812 | msgid "can't open file %s" | |
16813 | msgstr "无法打开文件 %s" | |
16814 | ||
31e5e17b | 16815 | #: git-send-email.perl:1603 git-send-email.perl:1623 |
1a79b2f1 JX |
16816 | #, perl-format |
16817 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
16818 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
16819 | ||
31e5e17b | 16820 | #: git-send-email.perl:1609 |
1a79b2f1 JX |
16821 | #, perl-format |
16822 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
16823 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
16824 | ||
31e5e17b | 16825 | #: git-send-email.perl:1657 |
1a79b2f1 JX |
16826 | #, perl-format |
16827 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
16828 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
16829 | ||
31e5e17b | 16830 | #: git-send-email.perl:1682 |
1a79b2f1 JX |
16831 | #, perl-format |
16832 | msgid "(body) Adding cc: %s from line '%s'\n" | |
16833 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
16834 | ||
31e5e17b | 16835 | #: git-send-email.perl:1788 |
1a79b2f1 JX |
16836 | #, perl-format |
16837 | msgid "(%s) Could not execute '%s'" | |
16838 | msgstr "(%s) 不能执行 '%s'" | |
16839 | ||
31e5e17b | 16840 | #: git-send-email.perl:1795 |
1a79b2f1 JX |
16841 | #, perl-format |
16842 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
16843 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
16844 | ||
31e5e17b | 16845 | #: git-send-email.perl:1799 |
1a79b2f1 JX |
16846 | #, perl-format |
16847 | msgid "(%s) failed to close pipe to '%s'" | |
16848 | msgstr "(%s) 无法关闭管道至 '%s'" | |
16849 | ||
31e5e17b | 16850 | #: git-send-email.perl:1826 |
1a79b2f1 JX |
16851 | msgid "cannot send message as 7bit" |
16852 | msgstr "不能以 7bit 形式发送信息" | |
16853 | ||
31e5e17b | 16854 | #: git-send-email.perl:1834 |
1a79b2f1 JX |
16855 | msgid "invalid transfer encoding" |
16856 | msgstr "无效的传送编码" | |
16857 | ||
31e5e17b | 16858 | #: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 |
1a79b2f1 JX |
16859 | #, perl-format |
16860 | msgid "unable to open %s: %s\n" | |
16861 | msgstr "不能打开 %s:%s\n" | |
16862 | ||
31e5e17b | 16863 | #: git-send-email.perl:1875 |
1a79b2f1 JX |
16864 | #, perl-format |
16865 | msgid "%s: patch contains a line longer than 998 characters" | |
16866 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
16867 | ||
31e5e17b | 16868 | #: git-send-email.perl:1891 |
1a79b2f1 JX |
16869 | #, perl-format |
16870 | msgid "Skipping %s with backup suffix '%s'.\n" | |
16871 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
16872 | ||
16873 | #. TRANSLATORS: please keep "[y|N]" as is. | |
31e5e17b | 16874 | #: git-send-email.perl:1895 |
1a79b2f1 JX |
16875 | #, perl-format |
16876 | msgid "Do you really want to send %s? [y|N]: " | |
16877 | msgstr "您真的要发送 %s?[y|N]:" | |
5809aa05 | 16878 | |
31e5e17b JX |
16879 | #~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" |
16880 | #~ msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n" | |
16881 | ||
16882 | #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" | |
16883 | #~ msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" | |
16884 | ||
16885 | #~ msgid "The copy of the patch that failed is found in: %s" | |
16886 | #~ msgstr "失败的补丁文件副本位于:%s" | |
16887 | ||
16888 | #~ msgid "invalid filter-spec expression '%s'" | |
16889 | #~ msgstr "无效的 filter-spec 表达式 '%s'" | |
16890 | ||
16891 | #~ msgid "pathspec and --all are incompatible" | |
16892 | #~ msgstr "pathspec 和 --all 不兼容" | |
16893 | ||
16894 | #~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" | |
16895 | #~ msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
16896 | ||
5809aa05 JX |
16897 | #~ msgid "" |
16898 | #~ "empty strings as pathspecs will be made invalid in upcoming releases. " | |
16899 | #~ "please use . instead if you meant to match all paths" | |
16900 | #~ msgstr "" | |
16901 | #~ "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路" | |
16902 | #~ "径,\n" | |
16903 | #~ "请代之以 ." | |
16904 | ||
16905 | #~ msgid "unable to open '%s' for writing" | |
16906 | #~ msgstr "无法以写入方式打开 '%s'" | |
16907 | ||
16908 | #~ msgid "could not truncate '%s'" | |
16909 | #~ msgstr "无法截断 '%s'" | |
16910 | ||
16911 | #~ msgid "could not finish '%s'" | |
16912 | #~ msgstr "无法结束 '%s'" | |
16913 | ||
16914 | #~ msgid "could not close %s" | |
16915 | #~ msgstr "不能关闭 %s" | |
16916 | ||
16917 | #~ msgid "Copied a misnamed branch '%s' away" | |
16918 | #~ msgstr "已将错误命名的分支 '%s' 复制" | |
16919 | ||
16920 | #~ msgid "it does not make sense to create 'HEAD' manually" | |
16921 | #~ msgstr "手工创建 'HEAD' 没有意义" | |
16922 | ||
16923 | #~ msgid "Don't know how to clone %s" | |
16924 | #~ msgstr "不知道如何克隆 %s" | |
16925 | ||
16926 | #~ msgid "show ignored files" | |
16927 | #~ msgstr "显示忽略的文件" | |
16928 | ||
16929 | #~ msgid "%s is not a valid '%s' object" | |
16930 | #~ msgstr "%s 不是一个有效的 '%s' 对象" | |
16931 | ||
16932 | #~ msgid "Don't know how to fetch from %s" | |
16933 | #~ msgstr "不知道如何从 %s 获取" | |
16934 | ||
16935 | #~ msgid "'$term' is not a valid term" | |
16936 | #~ msgstr "'$term' 不是一个有效的名称" | |
16937 | ||
16938 | #~ msgid "" | |
16939 | #~ "error: unknown option for 'stash save': $option\n" | |
16940 | #~ " To provide a message, use git stash save -- '$option'" | |
16941 | #~ msgstr "" | |
16942 | #~ "错误:'stash save' 的未知选项:$option\n" | |
16943 | #~ " 要提供一个描述信息,使用 git stash save -- '$option'" | |
16944 | ||
16945 | #~ msgid "Failed to recurse into submodule path '$sm_path'" | |
16946 | #~ msgstr "无法递归进子模组路径 '$sm_path'" |