]>
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(仓库链接文件) | |
fd8cb379 | 61 | # grafts | (提交)移植 |
160fb2b2 JX |
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" | |
c1ac5258 JX |
141 | "POT-Creation-Date: 2018-09-04 08:50+0800\n" |
142 | "PO-Revision-Date: 2018-09-09 21:07+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 | |
c1ac5258 | 151 | #: advice.c:97 |
c04f5ac3 | 152 | #, c-format |
fd8cb379 JX |
153 | msgid "%shint: %.*s%s\n" |
154 | msgstr "%s提示:%.*s%s\n" | |
c04f5ac3 | 155 | |
c1ac5258 | 156 | #: advice.c:150 |
5c57d762 JX |
157 | msgid "Cherry-picking is not possible because you have unmerged files." |
158 | msgstr "无法拣选,因为您有未合并的文件。" | |
159 | ||
c1ac5258 | 160 | #: advice.c:152 |
5c57d762 JX |
161 | msgid "Committing is not possible because you have unmerged files." |
162 | msgstr "无法提交,因为您有未合并的文件。" | |
163 | ||
c1ac5258 | 164 | #: advice.c:154 |
5c57d762 JX |
165 | msgid "Merging is not possible because you have unmerged files." |
166 | msgstr "无法合并,因为您有未合并的文件。" | |
167 | ||
c1ac5258 | 168 | #: advice.c:156 |
5c57d762 JX |
169 | msgid "Pulling is not possible because you have unmerged files." |
170 | msgstr "无法拉取,因为您有未合并的文件。" | |
171 | ||
c1ac5258 | 172 | #: advice.c:158 |
5c57d762 JX |
173 | msgid "Reverting is not possible because you have unmerged files." |
174 | msgstr "无法回退,因为您有未合并的文件。" | |
175 | ||
c1ac5258 | 176 | #: advice.c:160 |
5c57d762 JX |
177 | #, c-format |
178 | msgid "It is not possible to %s because you have unmerged files." | |
179 | msgstr "无法 %s,因为您有未合并的文件。" | |
180 | ||
c1ac5258 | 181 | #: advice.c:168 |
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 | |
c1ac5258 | 189 | #: advice.c:176 |
5c57d762 JX |
190 | msgid "Exiting because of an unresolved conflict." |
191 | msgstr "因为存在未解决的冲突而退出。" | |
192 | ||
c1ac5258 | 193 | #: advice.c:181 builtin/merge.c:1286 |
1b7f4a34 JX |
194 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
195 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
196 | ||
c1ac5258 | 197 | #: advice.c:183 |
94550ed3 | 198 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
199 | msgstr "请在合并前先提交您的修改。" |
200 | ||
c1ac5258 | 201 | #: advice.c:184 |
1b7f4a34 JX |
202 | msgid "Exiting because of unfinished merge." |
203 | msgstr "因为存在未完成的合并而退出。" | |
204 | ||
c1ac5258 | 205 | #: advice.c:190 |
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 | ||
c1ac5258 | 232 | #: apply.c:59 |
a0b6b246 JX |
233 | #, c-format |
234 | msgid "unrecognized whitespace option '%s'" | |
235 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 236 | |
c1ac5258 | 237 | #: apply.c:75 |
90314792 | 238 | #, c-format |
a0b6b246 JX |
239 | msgid "unrecognized whitespace ignore option '%s'" |
240 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 241 | |
c1ac5258 | 242 | #: apply.c:125 |
a0b6b246 | 243 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 244 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 245 | |
c1ac5258 | 246 | #: apply.c:127 |
a0b6b246 JX |
247 | msgid "--cached and --3way cannot be used together." |
248 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 249 | |
c1ac5258 | 250 | #: apply.c:130 |
a0b6b246 JX |
251 | msgid "--3way outside a repository" |
252 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 253 | |
c1ac5258 | 254 | #: apply.c:141 |
a0b6b246 JX |
255 | msgid "--index outside a repository" |
256 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 257 | |
c1ac5258 | 258 | #: apply.c:144 |
a0b6b246 JX |
259 | msgid "--cached outside a repository" |
260 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 261 | |
c1ac5258 | 262 | #: apply.c:826 |
a0b6b246 JX |
263 | #, c-format |
264 | msgid "Cannot prepare timestamp regexp %s" | |
265 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 266 | |
c1ac5258 | 267 | #: apply.c:835 |
a0b6b246 JX |
268 | #, c-format |
269 | msgid "regexec returned %d for input: %s" | |
270 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 271 | |
c1ac5258 | 272 | #: apply.c:909 |
a0b6b246 JX |
273 | #, c-format |
274 | msgid "unable to find filename in patch at line %d" | |
275 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 276 | |
c1ac5258 | 277 | #: apply.c:947 |
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 | |
c1ac5258 | 282 | #: apply.c:953 |
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 | |
c1ac5258 | 287 | #: apply.c:954 |
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 | |
c1ac5258 | 292 | #: apply.c:959 |
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 | |
c1ac5258 | 297 | #: apply.c:988 |
a4f16749 JX |
298 | #, c-format |
299 | msgid "invalid mode on line %d: %s" | |
300 | msgstr "第 %d 行包含无效文件模式:%s" | |
301 | ||
c1ac5258 | 302 | #: apply.c:1306 |
a4f16749 JX |
303 | #, c-format |
304 | msgid "inconsistent header lines %d and %d" | |
305 | msgstr "不一致的文件头,%d 行和 %d 行" | |
306 | ||
c1ac5258 | 307 | #: apply.c:1478 |
a0b6b246 JX |
308 | #, c-format |
309 | msgid "recount: unexpected line: %.*s" | |
310 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 311 | |
c1ac5258 | 312 | #: apply.c:1547 |
a0b6b246 JX |
313 | #, c-format |
314 | msgid "patch fragment without header at line %d: %.*s" | |
315 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 316 | |
c1ac5258 | 317 | #: apply.c:1567 |
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 | |
c1ac5258 | 328 | #: apply.c:1580 |
a0b6b246 JX |
329 | #, c-format |
330 | msgid "git diff header lacks filename information (line %d)" | |
331 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 332 | |
c1ac5258 | 333 | #: apply.c:1768 |
a0b6b246 JX |
334 | msgid "new file depends on old contents" |
335 | msgstr "新文件依赖旧内容" | |
5c57d762 | 336 | |
c1ac5258 | 337 | #: apply.c:1770 |
a0b6b246 JX |
338 | msgid "deleted file still has contents" |
339 | msgstr "删除的文件仍有内容" | |
5c57d762 | 340 | |
c1ac5258 | 341 | #: apply.c:1804 |
a0b6b246 JX |
342 | #, c-format |
343 | msgid "corrupt patch at line %d" | |
344 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 345 | |
c1ac5258 | 346 | #: apply.c:1841 |
5c57d762 | 347 | #, c-format |
a0b6b246 JX |
348 | msgid "new file %s depends on old contents" |
349 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 350 | |
c1ac5258 | 351 | #: apply.c:1843 |
5c57d762 | 352 | #, c-format |
a0b6b246 JX |
353 | msgid "deleted file %s still has contents" |
354 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 355 | |
c1ac5258 | 356 | #: apply.c:1846 |
a0b6b246 JX |
357 | #, c-format |
358 | msgid "** warning: file %s becomes empty but is not deleted" | |
359 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 360 | |
c1ac5258 | 361 | #: apply.c:1993 |
5c57d762 | 362 | #, c-format |
a0b6b246 JX |
363 | msgid "corrupt binary patch at line %d: %.*s" |
364 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 365 | |
c1ac5258 | 366 | #: apply.c:2030 |
5c57d762 | 367 | #, c-format |
a0b6b246 JX |
368 | msgid "unrecognized binary patch at line %d" |
369 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 370 | |
c1ac5258 | 371 | #: apply.c:2190 |
5c57d762 | 372 | #, c-format |
a0b6b246 JX |
373 | msgid "patch with only garbage at line %d" |
374 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 375 | |
c1ac5258 | 376 | #: apply.c:2276 |
5c57d762 | 377 | #, c-format |
a0b6b246 JX |
378 | msgid "unable to read symlink %s" |
379 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 380 | |
c1ac5258 | 381 | #: apply.c:2280 |
5c57d762 | 382 | #, c-format |
a0b6b246 JX |
383 | msgid "unable to open or read %s" |
384 | msgstr "不能打开或读取 %s" | |
5c57d762 | 385 | |
c1ac5258 | 386 | #: apply.c:2939 |
5c57d762 | 387 | #, c-format |
a0b6b246 JX |
388 | msgid "invalid start of line: '%c'" |
389 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 390 | |
c1ac5258 | 391 | #: apply.c:3060 |
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 | |
c1ac5258 | 398 | #: apply.c:3072 |
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 | |
c1ac5258 | 403 | #: apply.c:3078 |
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 | |
c1ac5258 | 412 | #: apply.c:3100 |
5c57d762 | 413 | #, c-format |
a0b6b246 JX |
414 | msgid "missing binary patch data for '%s'" |
415 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 416 | |
c1ac5258 | 417 | #: apply.c:3108 |
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 | |
c1ac5258 | 422 | #: apply.c:3154 |
5c57d762 | 423 | #, c-format |
a0b6b246 JX |
424 | msgid "cannot apply binary patch to '%s' without full index line" |
425 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 426 | |
c1ac5258 | 427 | #: apply.c:3164 |
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 | |
c1ac5258 | 433 | #: apply.c:3172 |
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 | |
c1ac5258 | 438 | #: apply.c:3190 |
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 | |
c1ac5258 | 443 | #: apply.c:3203 |
5c57d762 | 444 | #, c-format |
a0b6b246 JX |
445 | msgid "binary patch does not apply to '%s'" |
446 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 447 | |
c1ac5258 | 448 | #: apply.c:3209 |
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 | |
c1ac5258 | 453 | #: apply.c:3230 |
276ceeaa | 454 | #, c-format |
a0b6b246 JX |
455 | msgid "patch failed: %s:%ld" |
456 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 457 | |
c1ac5258 | 458 | #: apply.c:3352 |
4dcdc3d8 | 459 | #, c-format |
a0b6b246 JX |
460 | msgid "cannot checkout %s" |
461 | msgstr "不能检出 %s" | |
4dcdc3d8 | 462 | |
c1ac5258 | 463 | #: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 |
4dcdc3d8 | 464 | #, c-format |
a0b6b246 JX |
465 | msgid "failed to read %s" |
466 | msgstr "无法读取 %s" | |
4dcdc3d8 | 467 | |
c1ac5258 | 468 | #: apply.c:3412 |
4dcdc3d8 | 469 | #, c-format |
a0b6b246 JX |
470 | msgid "reading from '%s' beyond a symbolic link" |
471 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 472 | |
c1ac5258 | 473 | #: apply.c:3441 apply.c:3681 |
4dcdc3d8 | 474 | #, c-format |
a0b6b246 JX |
475 | msgid "path %s has been renamed/deleted" |
476 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 477 | |
c1ac5258 | 478 | #: apply.c:3524 apply.c:3696 |
4dcdc3d8 | 479 | #, c-format |
a0b6b246 JX |
480 | msgid "%s: does not exist in index" |
481 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 482 | |
c1ac5258 | 483 | #: apply.c:3533 apply.c:3704 |
4dcdc3d8 | 484 | #, c-format |
a0b6b246 JX |
485 | msgid "%s: does not match index" |
486 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 487 | |
c1ac5258 | 488 | #: apply.c:3568 |
a0b6b246 JX |
489 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
490 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 491 | |
c1ac5258 | 492 | #: apply.c:3571 |
4dcdc3d8 | 493 | #, c-format |
a0b6b246 JX |
494 | msgid "Falling back to three-way merge...\n" |
495 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 496 | |
c1ac5258 | 497 | #: apply.c:3587 apply.c:3591 |
4dcdc3d8 | 498 | #, c-format |
a0b6b246 JX |
499 | msgid "cannot read the current contents of '%s'" |
500 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 501 | |
c1ac5258 | 502 | #: apply.c:3603 |
4dcdc3d8 | 503 | #, c-format |
a0b6b246 JX |
504 | msgid "Failed to fall back on three-way merge...\n" |
505 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 506 | |
c1ac5258 | 507 | #: apply.c:3617 |
4dcdc3d8 | 508 | #, c-format |
a0b6b246 JX |
509 | msgid "Applied patch to '%s' with conflicts.\n" |
510 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 511 | |
c1ac5258 | 512 | #: apply.c:3622 |
4dcdc3d8 | 513 | #, c-format |
a0b6b246 JX |
514 | msgid "Applied patch to '%s' cleanly.\n" |
515 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 516 | |
c1ac5258 | 517 | #: apply.c:3648 |
a0b6b246 JX |
518 | msgid "removal patch leaves file contents" |
519 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 520 | |
c1ac5258 | 521 | #: apply.c:3721 |
1003b3a5 | 522 | #, c-format |
a0b6b246 JX |
523 | msgid "%s: wrong type" |
524 | msgstr "%s:错误类型" | |
1003b3a5 | 525 | |
c1ac5258 | 526 | #: apply.c:3723 |
1003b3a5 | 527 | #, c-format |
a0b6b246 JX |
528 | msgid "%s has type %o, expected %o" |
529 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 530 | |
c1ac5258 | 531 | #: apply.c:3874 apply.c:3876 |
4dcdc3d8 | 532 | #, c-format |
a0b6b246 JX |
533 | msgid "invalid path '%s'" |
534 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 535 | |
c1ac5258 | 536 | #: apply.c:3932 |
4dcdc3d8 | 537 | #, c-format |
a0b6b246 JX |
538 | msgid "%s: already exists in index" |
539 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 540 | |
c1ac5258 | 541 | #: apply.c:3935 |
4dcdc3d8 | 542 | #, c-format |
a0b6b246 JX |
543 | msgid "%s: already exists in working directory" |
544 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 545 | |
c1ac5258 | 546 | #: apply.c:3955 |
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 | |
c1ac5258 | 551 | #: apply.c:3960 |
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 | |
c1ac5258 | 556 | #: apply.c:3980 |
8ada9598 | 557 | #, c-format |
a0b6b246 JX |
558 | msgid "affected file '%s' is beyond a symbolic link" |
559 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 560 | |
c1ac5258 | 561 | #: apply.c:3984 |
81809b99 | 562 | #, c-format |
a0b6b246 JX |
563 | msgid "%s: patch does not apply" |
564 | msgstr "%s:补丁未应用" | |
8ada9598 | 565 | |
c1ac5258 | 566 | #: apply.c:3999 |
8ada9598 | 567 | #, c-format |
a0b6b246 JX |
568 | msgid "Checking patch %s..." |
569 | msgstr "检查补丁 %s..." | |
8ada9598 | 570 | |
c1ac5258 | 571 | #: apply.c:4091 |
a0b6b246 JX |
572 | #, c-format |
573 | msgid "sha1 information is lacking or useless for submodule %s" | |
574 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 575 | |
c1ac5258 | 576 | #: apply.c:4098 |
8ada9598 | 577 | #, c-format |
a0b6b246 | 578 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 579 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 580 | |
c1ac5258 | 581 | #: apply.c:4101 |
a0b6b246 JX |
582 | #, c-format |
583 | msgid "sha1 information is lacking or useless (%s)." | |
584 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 585 | |
c1ac5258 | 586 | #: apply.c:4106 builtin/checkout.c:237 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 | |
c1ac5258 | 591 | #: apply.c:4110 |
a0b6b246 JX |
592 | #, c-format |
593 | msgid "could not add %s to temporary index" | |
594 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 595 | |
c1ac5258 | 596 | #: apply.c:4120 |
a0b6b246 JX |
597 | #, c-format |
598 | msgid "could not write temporary index to %s" | |
599 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 600 | |
c1ac5258 | 601 | #: apply.c:4258 |
a0b6b246 JX |
602 | #, c-format |
603 | msgid "unable to remove %s from index" | |
604 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 605 | |
c1ac5258 | 606 | #: apply.c:4292 |
8ada9598 | 607 | #, c-format |
a0b6b246 JX |
608 | msgid "corrupt patch for submodule %s" |
609 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 610 | |
c1ac5258 | 611 | #: apply.c:4298 |
9aeb4c2b | 612 | #, c-format |
a0b6b246 | 613 | msgid "unable to stat newly created file '%s'" |
65e2041e | 614 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 615 | |
c1ac5258 | 616 | #: apply.c:4306 |
a0b6b246 JX |
617 | #, c-format |
618 | msgid "unable to create backing store for newly created file %s" | |
619 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 620 | |
c1ac5258 | 621 | #: apply.c:4312 apply.c:4457 |
81809b99 | 622 | #, c-format |
a0b6b246 JX |
623 | msgid "unable to add cache entry for %s" |
624 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 625 | |
c1ac5258 | 626 | #: apply.c:4355 |
a0b6b246 JX |
627 | #, c-format |
628 | msgid "failed to write to '%s'" | |
c1ac5258 | 629 | msgstr "写入 '%s' 失败" |
8ada9598 | 630 | |
c1ac5258 | 631 | #: apply.c:4359 |
220c313c | 632 | #, c-format |
a0b6b246 JX |
633 | msgid "closing file '%s'" |
634 | msgstr "关闭文件 '%s'" | |
220c313c | 635 | |
c1ac5258 | 636 | #: apply.c:4429 |
c04f5ac3 | 637 | #, c-format |
a0b6b246 JX |
638 | msgid "unable to write file '%s' mode %o" |
639 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 640 | |
c1ac5258 | 641 | #: apply.c:4527 |
c04f5ac3 | 642 | #, c-format |
a0b6b246 JX |
643 | msgid "Applied patch %s cleanly." |
644 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 645 | |
c1ac5258 | 646 | #: apply.c:4535 |
a0b6b246 JX |
647 | msgid "internal error" |
648 | msgstr "内部错误" | |
c04f5ac3 | 649 | |
c1ac5258 | 650 | #: apply.c:4538 |
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 | |
c1ac5258 | 657 | #: apply.c:4549 |
5c57d762 | 658 | #, c-format |
a0b6b246 JX |
659 | msgid "truncating .rej filename to %.*s.rej" |
660 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 661 | |
c1ac5258 | 662 | #: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 |
220c313c | 663 | #, c-format |
a0b6b246 JX |
664 | msgid "cannot open %s" |
665 | msgstr "不能打开 %s" | |
220c313c | 666 | |
c1ac5258 | 667 | #: apply.c:4571 |
220c313c | 668 | #, c-format |
a0b6b246 JX |
669 | msgid "Hunk #%d applied cleanly." |
670 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 671 | |
c1ac5258 | 672 | #: apply.c:4575 |
5c57d762 | 673 | #, c-format |
a0b6b246 JX |
674 | msgid "Rejected hunk #%d." |
675 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 676 | |
c1ac5258 | 677 | #: apply.c:4685 |
5c57d762 | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "Skipped patch '%s'." |
680 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 681 | |
c1ac5258 | 682 | #: apply.c:4693 |
a0b6b246 JX |
683 | msgid "unrecognized input" |
684 | msgstr "未能识别的输入" | |
5c57d762 | 685 | |
c1ac5258 | 686 | #: apply.c:4712 |
a0b6b246 JX |
687 | msgid "unable to read index file" |
688 | msgstr "无法读取索引文件" | |
5c57d762 | 689 | |
c1ac5258 | 690 | #: apply.c:4849 |
220c313c | 691 | #, c-format |
a0b6b246 JX |
692 | msgid "can't open patch '%s': %s" |
693 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 694 | |
c1ac5258 | 695 | #: apply.c:4876 |
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 | |
c1ac5258 | 702 | #: apply.c:4882 apply.c:4897 |
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 | |
c1ac5258 | 709 | #: apply.c:4890 |
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 | |
c1ac5258 | 716 | #: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 |
a0b6b246 JX |
717 | msgid "Unable to write new index file" |
718 | msgstr "无法写入新索引文件" | |
5c57d762 | 719 | |
c1ac5258 JX |
720 | #: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 |
721 | #: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 | |
722 | #: builtin/pull.c:198 builtin/submodule--helper.c:406 | |
723 | #: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 | |
724 | #: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 | |
725 | #: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 | |
a0b6b246 JX |
726 | msgid "path" |
727 | msgstr "路径" | |
5c57d762 | 728 | |
c1ac5258 | 729 | #: apply.c:4934 |
a0b6b246 JX |
730 | msgid "don't apply changes matching the given path" |
731 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 732 | |
c1ac5258 | 733 | #: apply.c:4937 |
a0b6b246 JX |
734 | msgid "apply changes matching the given path" |
735 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 736 | |
c1ac5258 | 737 | #: apply.c:4939 builtin/am.c:2263 |
a0b6b246 JX |
738 | msgid "num" |
739 | msgstr "数字" | |
220c313c | 740 | |
c1ac5258 | 741 | #: apply.c:4940 |
a0b6b246 JX |
742 | msgid "remove <num> leading slashes from traditional diff paths" |
743 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 744 | |
c1ac5258 | 745 | #: apply.c:4943 |
a0b6b246 JX |
746 | msgid "ignore additions made by the patch" |
747 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 748 | |
c1ac5258 | 749 | #: apply.c:4945 |
a0b6b246 JX |
750 | msgid "instead of applying the patch, output diffstat for the input" |
751 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 752 | |
c1ac5258 | 753 | #: apply.c:4949 |
a0b6b246 JX |
754 | msgid "show number of added and deleted lines in decimal notation" |
755 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 756 | |
c1ac5258 | 757 | #: apply.c:4951 |
a0b6b246 JX |
758 | msgid "instead of applying the patch, output a summary for the input" |
759 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 760 | |
c1ac5258 | 761 | #: apply.c:4953 |
a0b6b246 JX |
762 | msgid "instead of applying the patch, see if the patch is applicable" |
763 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 764 | |
c1ac5258 | 765 | #: apply.c:4955 |
a0b6b246 JX |
766 | msgid "make sure the patch is applicable to the current index" |
767 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 768 | |
c1ac5258 JX |
769 | #: apply.c:4957 |
770 | msgid "mark new files with `git add --intent-to-add`" | |
771 | msgstr "使用命令 `git add --intent-to-add` 标记新增文件" | |
772 | ||
773 | #: apply.c:4959 | |
a0b6b246 JX |
774 | msgid "apply a patch without touching the working tree" |
775 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 776 | |
c1ac5258 | 777 | #: apply.c:4961 |
a0b6b246 JX |
778 | msgid "accept a patch that touches outside the working area" |
779 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 780 | |
c1ac5258 | 781 | #: apply.c:4964 |
a0b6b246 JX |
782 | msgid "also apply the patch (use with --stat/--summary/--check)" |
783 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 784 | |
c1ac5258 | 785 | #: apply.c:4966 |
a0b6b246 JX |
786 | msgid "attempt three-way merge if a patch does not apply" |
787 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 788 | |
c1ac5258 | 789 | #: apply.c:4968 |
a0b6b246 JX |
790 | msgid "build a temporary index based on embedded index information" |
791 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 792 | |
c1ac5258 | 793 | #: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 |
a0b6b246 JX |
794 | msgid "paths are separated with NUL character" |
795 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 796 | |
c1ac5258 | 797 | #: apply.c:4973 |
a0b6b246 JX |
798 | msgid "ensure at least <n> lines of context match" |
799 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 800 | |
c1ac5258 | 801 | #: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 |
6937cb4e | 802 | #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 |
c1ac5258 | 803 | #: builtin/pack-objects.c:3202 |
a0b6b246 JX |
804 | msgid "action" |
805 | msgstr "动作" | |
8ada9598 | 806 | |
c1ac5258 | 807 | #: apply.c:4975 |
a0b6b246 JX |
808 | msgid "detect new or modified lines that have whitespace errors" |
809 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 810 | |
c1ac5258 | 811 | #: apply.c:4978 apply.c:4981 |
a0b6b246 JX |
812 | msgid "ignore changes in whitespace when finding context" |
813 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 814 | |
c1ac5258 | 815 | #: apply.c:4984 |
a0b6b246 JX |
816 | msgid "apply the patch in reverse" |
817 | msgstr "反向应用补丁" | |
8ada9598 | 818 | |
c1ac5258 | 819 | #: apply.c:4986 |
a0b6b246 JX |
820 | msgid "don't expect at least one line of context" |
821 | msgstr "无需至少一行上下文" | |
8ada9598 | 822 | |
c1ac5258 | 823 | #: apply.c:4988 |
a0b6b246 JX |
824 | msgid "leave the rejected hunks in corresponding *.rej files" |
825 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 826 | |
c1ac5258 | 827 | #: apply.c:4990 |
a0b6b246 JX |
828 | msgid "allow overlapping hunks" |
829 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 830 | |
c1ac5258 JX |
831 | #: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 |
832 | #: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 | |
833 | #: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 | |
a0b6b246 JX |
834 | msgid "be verbose" |
835 | msgstr "冗长输出" | |
8ada9598 | 836 | |
c1ac5258 | 837 | #: apply.c:4993 |
a0b6b246 JX |
838 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
839 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 840 | |
c1ac5258 | 841 | #: apply.c:4996 |
a0b6b246 JX |
842 | msgid "do not trust the line counts in the hunk headers" |
843 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 844 | |
c1ac5258 | 845 | #: apply.c:4998 builtin/am.c:2251 |
a0b6b246 JX |
846 | msgid "root" |
847 | msgstr "根目录" | |
c04f5ac3 | 848 | |
c1ac5258 | 849 | #: apply.c:4999 |
a0b6b246 JX |
850 | msgid "prepend <root> to all filenames" |
851 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 852 | |
c1ac5258 | 853 | #: archive.c:14 |
a0b6b246 JX |
854 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
855 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 856 | |
c1ac5258 | 857 | #: archive.c:15 |
a0b6b246 JX |
858 | msgid "git archive --list" |
859 | msgstr "git archive --list" | |
860 | ||
c1ac5258 | 861 | #: archive.c:16 |
c04f5ac3 | 862 | msgid "" |
a0b6b246 | 863 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 864 | msgstr "" |
a0b6b246 | 865 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 866 | |
c1ac5258 | 867 | #: archive.c:17 |
a0b6b246 JX |
868 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
869 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 870 | |
c1ac5258 | 871 | #: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 |
c04f5ac3 | 872 | #, c-format |
a0b6b246 JX |
873 | msgid "pathspec '%s' did not match any files" |
874 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 875 | |
c1ac5258 | 876 | #: archive.c:446 |
a0b6b246 JX |
877 | msgid "fmt" |
878 | msgstr "格式" | |
07432cef | 879 | |
c1ac5258 | 880 | #: archive.c:446 |
a0b6b246 JX |
881 | msgid "archive format" |
882 | msgstr "归档格式" | |
7aea43ff | 883 | |
c1ac5258 | 884 | #: archive.c:447 builtin/log.c:1473 |
a0b6b246 JX |
885 | msgid "prefix" |
886 | msgstr "前缀" | |
7aea43ff | 887 | |
c1ac5258 | 888 | #: archive.c:448 |
a0b6b246 JX |
889 | msgid "prepend prefix to each pathname in the archive" |
890 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 891 | |
c1ac5258 JX |
892 | #: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 |
893 | #: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 | |
894 | #: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 | |
895 | #: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 | |
31e5e17b | 896 | #: parse-options.h:165 |
a0b6b246 JX |
897 | msgid "file" |
898 | msgstr "文件" | |
a77c07d9 | 899 | |
c1ac5258 | 900 | #: archive.c:450 builtin/archive.c:89 |
a0b6b246 JX |
901 | msgid "write the archive to this file" |
902 | msgstr "归档写入此文件" | |
a77c07d9 | 903 | |
c1ac5258 | 904 | #: archive.c:452 |
a0b6b246 JX |
905 | msgid "read .gitattributes in working directory" |
906 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 907 | |
c1ac5258 | 908 | #: archive.c:453 |
a0b6b246 JX |
909 | msgid "report archived files on stderr" |
910 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 911 | |
c1ac5258 | 912 | #: archive.c:454 |
a0b6b246 JX |
913 | msgid "store only" |
914 | msgstr "只存储" | |
7ac1c0ad | 915 | |
c1ac5258 | 916 | #: archive.c:455 |
a0b6b246 JX |
917 | msgid "compress faster" |
918 | msgstr "压缩速度更快" | |
8ada9598 | 919 | |
c1ac5258 | 920 | #: archive.c:463 |
a0b6b246 JX |
921 | msgid "compress better" |
922 | msgstr "压缩效果更好" | |
8ada9598 | 923 | |
c1ac5258 | 924 | #: archive.c:466 |
a0b6b246 JX |
925 | msgid "list supported archive formats" |
926 | msgstr "列出支持的归档格式" | |
a77c07d9 | 927 | |
c1ac5258 JX |
928 | #: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 |
929 | #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 | |
a0b6b246 JX |
930 | msgid "repo" |
931 | msgstr "仓库" | |
c04f5ac3 | 932 | |
c1ac5258 | 933 | #: archive.c:469 builtin/archive.c:91 |
a0b6b246 JX |
934 | msgid "retrieve the archive from remote repository <repo>" |
935 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 936 | |
c1ac5258 JX |
937 | #: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 |
938 | #: builtin/notes.c:491 | |
a0b6b246 JX |
939 | msgid "command" |
940 | msgstr "命令" | |
941 | ||
c1ac5258 | 942 | #: archive.c:471 builtin/archive.c:93 |
a0b6b246 JX |
943 | msgid "path to the remote git-upload-archive command" |
944 | msgstr "远程 git-upload-archive 命令的路径" | |
945 | ||
c1ac5258 | 946 | #: archive.c:478 |
a0b6b246 JX |
947 | msgid "Unexpected option --remote" |
948 | msgstr "未知参数 --remote" | |
949 | ||
c1ac5258 | 950 | #: archive.c:480 |
a0b6b246 JX |
951 | msgid "Option --exec can only be used together with --remote" |
952 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
953 | ||
c1ac5258 | 954 | #: archive.c:482 |
a0b6b246 JX |
955 | msgid "Unexpected option --output" |
956 | msgstr "未知参数 --output" | |
957 | ||
c1ac5258 | 958 | #: archive.c:504 |
a0b6b246 JX |
959 | #, c-format |
960 | msgid "Unknown archive format '%s'" | |
961 | msgstr "未知归档格式 '%s'" | |
962 | ||
c1ac5258 | 963 | #: archive.c:511 |
8ada9598 | 964 | #, c-format |
a0b6b246 JX |
965 | msgid "Argument not supported for format '%s': -%d" |
966 | msgstr "参数不支持此格式 '%s':-%d" | |
967 | ||
c1ac5258 JX |
968 | #: archive-tar.c:125 archive-zip.c:344 |
969 | #, c-format | |
970 | msgid "cannot stream blob %s" | |
971 | msgstr "不能为数据对象 %s 打开流" | |
972 | ||
973 | #: archive-tar.c:260 archive-zip.c:361 | |
974 | #, c-format | |
975 | msgid "unsupported file mode: 0%o (SHA1: %s)" | |
976 | msgstr "不支持的文件属性:0%o (SHA1: %s)" | |
977 | ||
978 | #: archive-tar.c:287 archive-zip.c:352 | |
979 | #, c-format | |
980 | msgid "cannot read %s" | |
981 | msgstr "不能读取 %s" | |
982 | ||
983 | #: archive-tar.c:458 | |
984 | #, c-format | |
985 | msgid "unable to start '%s' filter" | |
986 | msgstr "无法启动 '%s' 过滤器" | |
987 | ||
988 | #: archive-tar.c:461 | |
989 | msgid "unable to redirect descriptor" | |
990 | msgstr "无法重定向描述符" | |
991 | ||
992 | #: archive-tar.c:468 | |
993 | #, c-format | |
994 | msgid "'%s' filter reported error" | |
995 | msgstr "'%s' 过滤器报告错误" | |
996 | ||
997 | #: archive-zip.c:313 | |
998 | #, c-format | |
999 | msgid "path is not valid UTF-8: %s" | |
1000 | msgstr "路径不是有效的 UTF-8:%s" | |
1001 | ||
1002 | #: archive-zip.c:317 | |
1003 | #, c-format | |
1004 | msgid "path too long (%d chars, SHA1: %s): %s" | |
1005 | msgstr "路径太长(%d 字符,SHA1:%s):%s" | |
1006 | ||
1007 | #: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 | |
1008 | #, c-format | |
1009 | msgid "deflate error (%d)" | |
1010 | msgstr "压缩错误 (%d)" | |
1011 | ||
1012 | #: archive-zip.c:605 | |
1013 | #, c-format | |
1014 | msgid "timestamp too large for this system: %<PRIuMAX>" | |
1015 | msgstr "对于本系统时间戳太长:%<PRIuMAX>" | |
1016 | ||
6937cb4e | 1017 | #: attr.c:218 |
87cb7997 JX |
1018 | #, c-format |
1019 | msgid "%.*s is not a valid attribute name" | |
1020 | msgstr "%.*s 不是一个有效的属性名" | |
1021 | ||
6937cb4e | 1022 | #: attr.c:415 |
8ada9598 | 1023 | msgid "" |
a0b6b246 JX |
1024 | "Negative patterns are ignored in git attributes\n" |
1025 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 1026 | msgstr "" |
a0b6b246 JX |
1027 | "负值模版在 git attributes 中被忽略\n" |
1028 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 1029 | |
c1ac5258 | 1030 | #: bisect.c:467 |
8ada9598 | 1031 | #, c-format |
a0b6b246 JX |
1032 | msgid "Badly quoted content in file '%s': %s" |
1033 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 1034 | |
c1ac5258 | 1035 | #: bisect.c:675 |
a0b6b246 JX |
1036 | #, c-format |
1037 | msgid "We cannot bisect more!\n" | |
1038 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 1039 | |
c1ac5258 | 1040 | #: bisect.c:729 |
2e8451e8 | 1041 | #, c-format |
a0b6b246 JX |
1042 | msgid "Not a valid commit name %s" |
1043 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 1044 | |
c1ac5258 | 1045 | #: bisect.c:753 |
5b04ee3b JX |
1046 | #, c-format |
1047 | msgid "" | |
a0b6b246 JX |
1048 | "The merge base %s is bad.\n" |
1049 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 1050 | msgstr "" |
a0b6b246 JX |
1051 | "合并基线 %s 是坏的。\n" |
1052 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 1053 | |
c1ac5258 | 1054 | #: bisect.c:758 |
5b04ee3b | 1055 | #, c-format |
a0b6b246 JX |
1056 | msgid "" |
1057 | "The merge base %s is new.\n" | |
1058 | "The property has changed between %s and [%s].\n" | |
1059 | msgstr "" | |
1060 | "合并基线 %s 是新的。\n" | |
1061 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1062 | |
c1ac5258 | 1063 | #: bisect.c:763 |
a0b6b246 JX |
1064 | #, c-format |
1065 | msgid "" | |
1066 | "The merge base %s is %s.\n" | |
1067 | "This means the first '%s' commit is between %s and [%s].\n" | |
1068 | msgstr "" | |
1069 | "合并基线 %s 是 %s。\n" | |
1070 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1071 | |
c1ac5258 | 1072 | #: bisect.c:771 |
a0b6b246 JX |
1073 | #, c-format |
1074 | msgid "" | |
1a79b2f1 | 1075 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1076 | "git bisect cannot work properly in this case.\n" |
1077 | "Maybe you mistook %s and %s revs?\n" | |
1078 | msgstr "" | |
1079 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1080 | "这种情况下 git 二分查找无法正常工作。\n" | |
1081 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1082 | |
c1ac5258 | 1083 | #: bisect.c:784 |
a0b6b246 JX |
1084 | #, c-format |
1085 | msgid "" | |
1086 | "the merge base between %s and [%s] must be skipped.\n" | |
1087 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1088 | "We continue anyway." | |
1089 | msgstr "" | |
1090 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1091 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1092 | "我们仍旧继续。" | |
649900bc | 1093 | |
c1ac5258 | 1094 | #: bisect.c:817 |
649900bc | 1095 | #, c-format |
a0b6b246 JX |
1096 | msgid "Bisecting: a merge base must be tested\n" |
1097 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1098 | |
c1ac5258 | 1099 | #: bisect.c:857 |
a0b6b246 JX |
1100 | #, c-format |
1101 | msgid "a %s revision is needed" | |
1102 | msgstr "需要一个 %s 版本" | |
649900bc | 1103 | |
c1ac5258 | 1104 | #: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 |
649900bc | 1105 | #, c-format |
a0b6b246 JX |
1106 | msgid "could not create file '%s'" |
1107 | msgstr "不能创建文件 '%s'" | |
649900bc | 1108 | |
c1ac5258 | 1109 | #: bisect.c:927 builtin/merge.c:137 |
649900bc | 1110 | #, c-format |
a0b6b246 JX |
1111 | msgid "could not read file '%s'" |
1112 | msgstr "不能读取文件 '%s'" | |
649900bc | 1113 | |
c1ac5258 | 1114 | #: bisect.c:957 |
a0b6b246 JX |
1115 | msgid "reading bisect refs failed" |
1116 | msgstr "读取二分查找引用失败" | |
649900bc | 1117 | |
c1ac5258 | 1118 | #: bisect.c:976 |
649900bc | 1119 | #, c-format |
a0b6b246 JX |
1120 | msgid "%s was both %s and %s\n" |
1121 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1122 | |
c1ac5258 | 1123 | #: bisect.c:984 |
649900bc | 1124 | #, c-format |
a0b6b246 JX |
1125 | msgid "" |
1126 | "No testable commit found.\n" | |
1127 | "Maybe you started with bad path parameters?\n" | |
1128 | msgstr "" | |
1129 | "没有发现可测试的提交。\n" | |
1130 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1131 | |
c1ac5258 | 1132 | #: bisect.c:1003 |
649900bc | 1133 | #, c-format |
a0b6b246 JX |
1134 | msgid "(roughly %d step)" |
1135 | msgid_plural "(roughly %d steps)" | |
1136 | msgstr[0] "(大概 %d 步)" | |
1137 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1138 | |
a4f16749 JX |
1139 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1140 | #. steps)" translation. | |
1141 | #. | |
c1ac5258 | 1142 | #: bisect.c:1009 |
649900bc | 1143 | #, c-format |
a0b6b246 JX |
1144 | msgid "Bisecting: %d revision left to test after this %s\n" |
1145 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1146 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1147 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1148 | |
c1ac5258 | 1149 | #: blame.c:1784 |
a4f16749 JX |
1150 | msgid "--contents and --reverse do not blend well." |
1151 | msgstr "--contents 和 --reverse 不能混用。" | |
1152 | ||
c1ac5258 | 1153 | #: blame.c:1798 |
a4f16749 JX |
1154 | msgid "cannot use --contents with final commit object name" |
1155 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1156 | ||
c1ac5258 | 1157 | #: blame.c:1819 |
a4f16749 JX |
1158 | msgid "--reverse and --first-parent together require specified latest commit" |
1159 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1160 | ||
c1ac5258 JX |
1161 | #: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 |
1162 | #: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 | |
1163 | #: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 | |
1164 | #: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 | |
fd8cb379 | 1165 | #: builtin/shortlog.c:192 |
a4f16749 JX |
1166 | msgid "revision walk setup failed" |
1167 | msgstr "版本遍历设置失败" | |
1168 | ||
c1ac5258 | 1169 | #: blame.c:1846 |
a4f16749 JX |
1170 | msgid "" |
1171 | "--reverse --first-parent together require range along first-parent chain" | |
1172 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1173 | ||
c1ac5258 | 1174 | #: blame.c:1857 |
a4f16749 JX |
1175 | #, c-format |
1176 | msgid "no such path %s in %s" | |
1177 | msgstr "在 %2$s 中无此路径 %1$s" | |
1178 | ||
c1ac5258 | 1179 | #: blame.c:1868 |
a4f16749 JX |
1180 | #, c-format |
1181 | msgid "cannot read blob %s for path %s" | |
1182 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1183 | ||
c1ac5258 | 1184 | #: branch.c:52 |
649900bc | 1185 | #, c-format |
a0b6b246 JX |
1186 | msgid "" |
1187 | "\n" | |
1188 | "After fixing the error cause you may try to fix up\n" | |
1189 | "the remote tracking information by invoking\n" | |
1190 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1191 | msgstr "" | |
1192 | "\n" | |
1193 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1194 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1195 | |
c1ac5258 | 1196 | #: branch.c:66 |
649900bc | 1197 | #, c-format |
a0b6b246 JX |
1198 | msgid "Not setting branch %s as its own upstream." |
1199 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1200 | |
c1ac5258 | 1201 | #: branch.c:92 |
649900bc | 1202 | #, c-format |
6937cb4e JX |
1203 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1204 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1205 | |
c1ac5258 | 1206 | #: branch.c:93 |
649900bc | 1207 | #, c-format |
6937cb4e JX |
1208 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1209 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1210 | |
c1ac5258 | 1211 | #: branch.c:97 |
649900bc | 1212 | #, c-format |
6937cb4e JX |
1213 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1214 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1215 | |
c1ac5258 | 1216 | #: branch.c:98 |
649900bc | 1217 | #, c-format |
6937cb4e | 1218 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1219 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1220 | |
c1ac5258 | 1221 | #: branch.c:103 |
649900bc | 1222 | #, c-format |
6937cb4e JX |
1223 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1224 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1225 | |
c1ac5258 | 1226 | #: branch.c:104 |
649900bc | 1227 | #, c-format |
6937cb4e JX |
1228 | msgid "Branch '%s' set up to track remote ref '%s'." |
1229 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1230 | |
c1ac5258 | 1231 | #: branch.c:108 |
649900bc | 1232 | #, c-format |
6937cb4e JX |
1233 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1234 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1235 | |
c1ac5258 | 1236 | #: branch.c:109 |
649900bc | 1237 | #, c-format |
6937cb4e JX |
1238 | msgid "Branch '%s' set up to track local ref '%s'." |
1239 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1240 | |
c1ac5258 | 1241 | #: branch.c:118 |
a0b6b246 JX |
1242 | msgid "Unable to write upstream branch configuration" |
1243 | msgstr "无法写入上游分支配置" | |
649900bc | 1244 | |
c1ac5258 | 1245 | #: branch.c:155 |
649900bc | 1246 | #, c-format |
a0b6b246 JX |
1247 | msgid "Not tracking: ambiguous information for ref %s" |
1248 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1249 | |
c1ac5258 | 1250 | #: branch.c:188 |
649900bc | 1251 | #, c-format |
a0b6b246 JX |
1252 | msgid "'%s' is not a valid branch name." |
1253 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1254 | |
c1ac5258 | 1255 | #: branch.c:207 |
649900bc | 1256 | #, c-format |
a0b6b246 JX |
1257 | msgid "A branch named '%s' already exists." |
1258 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1259 | |
c1ac5258 | 1260 | #: branch.c:212 |
a0b6b246 JX |
1261 | msgid "Cannot force update the current branch." |
1262 | msgstr "无法强制更新当前分支。" | |
649900bc | 1263 | |
c1ac5258 | 1264 | #: branch.c:232 |
649900bc | 1265 | #, c-format |
a0b6b246 JX |
1266 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1267 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1268 | |
c1ac5258 | 1269 | #: branch.c:234 |
649900bc | 1270 | #, c-format |
a0b6b246 JX |
1271 | msgid "the requested upstream branch '%s' does not exist" |
1272 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1273 | |
c1ac5258 | 1274 | #: branch.c:236 |
a0b6b246 JX |
1275 | msgid "" |
1276 | "\n" | |
1277 | "If you are planning on basing your work on an upstream\n" | |
1278 | "branch that already exists at the remote, you may need to\n" | |
1279 | "run \"git fetch\" to retrieve it.\n" | |
1280 | "\n" | |
1281 | "If you are planning to push out a new local branch that\n" | |
1282 | "will track its remote counterpart, you may want to use\n" | |
1283 | "\"git push -u\" to set the upstream config as you push." | |
1284 | msgstr "" | |
1285 | "\n" | |
1286 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1287 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1288 | "\n" | |
1289 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1290 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1291 | |
c1ac5258 | 1292 | #: branch.c:279 |
649900bc | 1293 | #, c-format |
a0b6b246 JX |
1294 | msgid "Not a valid object name: '%s'." |
1295 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1296 | |
c1ac5258 | 1297 | #: branch.c:299 |
649900bc | 1298 | #, c-format |
a0b6b246 JX |
1299 | msgid "Ambiguous object name: '%s'." |
1300 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1301 | |
c1ac5258 | 1302 | #: branch.c:304 |
649900bc | 1303 | #, c-format |
a0b6b246 JX |
1304 | msgid "Not a valid branch point: '%s'." |
1305 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1306 | |
c1ac5258 | 1307 | #: branch.c:358 |
649900bc | 1308 | #, c-format |
a0b6b246 JX |
1309 | msgid "'%s' is already checked out at '%s'" |
1310 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1311 | |
c1ac5258 | 1312 | #: branch.c:381 |
a0b6b246 JX |
1313 | #, c-format |
1314 | msgid "HEAD of working tree %s is not updated" | |
1315 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1316 | |
c1ac5258 | 1317 | #: bundle.c:36 |
649900bc | 1318 | #, c-format |
a0b6b246 JX |
1319 | msgid "'%s' does not look like a v2 bundle file" |
1320 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1321 | |
c1ac5258 | 1322 | #: bundle.c:64 |
a0b6b246 JX |
1323 | #, c-format |
1324 | msgid "unrecognized header: %s%s (%d)" | |
1325 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1326 | |
c1ac5258 | 1327 | #: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 |
649900bc | 1328 | #, c-format |
a0b6b246 JX |
1329 | msgid "could not open '%s'" |
1330 | msgstr "不能打开 '%s'" | |
649900bc | 1331 | |
c1ac5258 | 1332 | #: bundle.c:141 |
a0b6b246 JX |
1333 | msgid "Repository lacks these prerequisite commits:" |
1334 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1335 | |
c1ac5258 | 1336 | #: bundle.c:192 |
2e8451e8 | 1337 | #, c-format |
a0b6b246 JX |
1338 | msgid "The bundle contains this ref:" |
1339 | msgid_plural "The bundle contains these %d refs:" | |
1340 | msgstr[0] "这个包中含有这个引用:" | |
1341 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1342 | |
c1ac5258 | 1343 | #: bundle.c:199 |
a0b6b246 JX |
1344 | msgid "The bundle records a complete history." |
1345 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1346 | |
c1ac5258 | 1347 | #: bundle.c:201 |
2e8451e8 | 1348 | #, c-format |
a0b6b246 JX |
1349 | msgid "The bundle requires this ref:" |
1350 | msgid_plural "The bundle requires these %d refs:" | |
1351 | msgstr[0] "这个包需要这个引用:" | |
1352 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1353 | |
c1ac5258 | 1354 | #: bundle.c:260 |
a0b6b246 JX |
1355 | msgid "Could not spawn pack-objects" |
1356 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1357 | |
c1ac5258 | 1358 | #: bundle.c:271 |
a0b6b246 JX |
1359 | msgid "pack-objects died" |
1360 | msgstr "pack-objects 终止" | |
8ada9598 | 1361 | |
c1ac5258 | 1362 | #: bundle.c:313 |
a0b6b246 JX |
1363 | msgid "rev-list died" |
1364 | msgstr "rev-list 终止" | |
1365 | ||
c1ac5258 | 1366 | #: bundle.c:362 |
81809b99 | 1367 | #, c-format |
a0b6b246 JX |
1368 | msgid "ref '%s' is excluded by the rev-list options" |
1369 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1370 | |
c1ac5258 | 1371 | #: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 |
81809b99 | 1372 | #, c-format |
a0b6b246 JX |
1373 | msgid "unrecognized argument: %s" |
1374 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1375 | |
c1ac5258 | 1376 | #: bundle.c:461 |
a0b6b246 JX |
1377 | msgid "Refusing to create empty bundle." |
1378 | msgstr "不能创建空包。" | |
1379 | ||
c1ac5258 | 1380 | #: bundle.c:473 |
81809b99 | 1381 | #, c-format |
a0b6b246 JX |
1382 | msgid "cannot create '%s'" |
1383 | msgstr "不能创建 '%s'" | |
8ada9598 | 1384 | |
c1ac5258 | 1385 | #: bundle.c:501 |
a0b6b246 JX |
1386 | msgid "index-pack died" |
1387 | msgstr "index-pack 终止" | |
63af42fe | 1388 | |
31e5e17b | 1389 | #: color.c:296 |
94550ed3 | 1390 | #, c-format |
a0b6b246 JX |
1391 | msgid "invalid color value: %.*s" |
1392 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1393 | |
c1ac5258 JX |
1394 | #: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 |
1395 | #: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 | |
fd8cb379 | 1396 | #: builtin/replace.c:448 |
94550ed3 | 1397 | #, c-format |
a0b6b246 JX |
1398 | msgid "could not parse %s" |
1399 | msgstr "不能解析 %s" | |
94550ed3 | 1400 | |
c1ac5258 | 1401 | #: commit.c:50 |
a0b6b246 JX |
1402 | #, c-format |
1403 | msgid "%s %s is not a commit!" | |
31e5e17b | 1404 | msgstr "%s %s 不是一个提交!" |
90314792 | 1405 | |
c1ac5258 | 1406 | #: commit.c:191 |
fd8cb379 JX |
1407 | msgid "" |
1408 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
1409 | "and will be removed in a future Git version.\n" | |
1410 | "\n" | |
1411 | "Please use \"git replace --convert-graft-file\"\n" | |
1412 | "to convert the grafts into replace refs.\n" | |
1413 | "\n" | |
1414 | "Turn this message off by running\n" | |
1415 | "\"git config advice.graftFileDeprecated false\"" | |
1416 | msgstr "" | |
1417 | "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n" | |
1418 | "未来的Git版本中被移除。\n" | |
1419 | "\n" | |
1420 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
1421 | "grafts 转换为替换引用。\n" | |
1422 | "\n" | |
1423 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
1424 | "可关闭本消息" | |
1425 | ||
c1ac5258 | 1426 | #: commit.c:1629 |
90314792 | 1427 | msgid "" |
a0b6b246 JX |
1428 | "Warning: commit message did not conform to UTF-8.\n" |
1429 | "You may want to amend it after fixing the message, or set the config\n" | |
1430 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1431 | msgstr "" | |
29004bbb | 1432 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1433 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1434 | "设置为您项目所用的字符编码。\n" |
90314792 | 1435 | |
c1ac5258 JX |
1436 | #: commit-graph.c:83 |
1437 | #, c-format | |
1438 | msgid "graph file %s is too small" | |
1439 | msgstr "图形文件 %s 太小" | |
1440 | ||
1441 | #: commit-graph.c:90 | |
1442 | #, c-format | |
1443 | msgid "graph signature %X does not match signature %X" | |
1444 | msgstr "图形签名 %X 和签名 %X 不匹配" | |
1445 | ||
1446 | #: commit-graph.c:97 | |
1447 | #, c-format | |
1448 | msgid "graph version %X does not match version %X" | |
1449 | msgstr "图形版本 %X 和版本 %X 不匹配" | |
1450 | ||
1451 | #: commit-graph.c:104 | |
1452 | #, c-format | |
1453 | msgid "hash version %X does not match version %X" | |
1454 | msgstr "散列版本 %X 和版本 %X 不匹配" | |
1455 | ||
1456 | #: commit-graph.c:128 | |
1457 | #, c-format | |
1458 | msgid "improper chunk offset %08x%08x" | |
1459 | msgstr "不正确的块偏移 %08x%08x" | |
1460 | ||
1461 | #: commit-graph.c:164 | |
1462 | #, c-format | |
1463 | msgid "chunk id %08x appears multiple times" | |
1464 | msgstr "块 id %08x 出现了多次" | |
1465 | ||
1466 | #: commit-graph.c:261 | |
1467 | #, c-format | |
1468 | msgid "could not find commit %s" | |
1469 | msgstr "无法找到提交 %s" | |
1470 | ||
1471 | #: commit-graph.c:565 builtin/pack-objects.c:2568 | |
1472 | #, c-format | |
1473 | msgid "unable to get type of object %s" | |
1474 | msgstr "无法获得对象 %s 类型" | |
1475 | ||
1476 | #: commit-graph.c:730 | |
1477 | #, c-format | |
1478 | msgid "error adding pack %s" | |
1479 | msgstr "添加包 %s 出错" | |
1480 | ||
1481 | #: commit-graph.c:732 | |
1482 | #, c-format | |
1483 | msgid "error opening index for %s" | |
1484 | msgstr "为 %s 打开索引出错" | |
1485 | ||
1486 | #: commit-graph.c:773 | |
fd8cb379 JX |
1487 | #, c-format |
1488 | msgid "the commit graph format cannot write %d commits" | |
1489 | msgstr "提交图形格式不能写入 %d 个提交" | |
1490 | ||
c1ac5258 | 1491 | #: commit-graph.c:800 |
fd8cb379 JX |
1492 | msgid "too many commits to write graph" |
1493 | msgstr "提交太多不能画图" | |
1494 | ||
c1ac5258 | 1495 | #: commit-graph.c:806 |
fd8cb379 | 1496 | #, c-format |
c1ac5258 JX |
1497 | msgid "unable to create leading directories of %s" |
1498 | msgstr "不能为 %s 创建先导目录" | |
1499 | ||
1500 | #: commit-graph.c:904 | |
1501 | msgid "the commit-graph file has incorrect checksum and is likely corrupt" | |
1502 | msgstr "提交图形文件的校验码错误,好像已经损坏" | |
fd8cb379 | 1503 | |
5809aa05 | 1504 | #: compat/obstack.c:405 compat/obstack.c:407 |
a0b6b246 JX |
1505 | msgid "memory exhausted" |
1506 | msgstr "内存耗尽" | |
90314792 | 1507 | |
c1ac5258 JX |
1508 | #: config.c:123 |
1509 | #, c-format | |
1510 | msgid "" | |
1511 | "exceeded maximum include depth (%d) while including\n" | |
1512 | "\t%s\n" | |
1513 | "from\n" | |
1514 | "\t%s\n" | |
1515 | "This might be due to circular includes." | |
1516 | msgstr "" | |
1517 | "超过了最大引用深度(%1$d),当从\n" | |
1518 | "\t%3$s\n" | |
1519 | "包含\n" | |
1520 | "\t%2$s\n" | |
1521 | "这可能是因为循环引用。" | |
1522 | ||
1523 | #: config.c:139 | |
1524 | #, c-format | |
1525 | msgid "could not expand include path '%s'" | |
1526 | msgstr "无法扩展包含路径 '%s'" | |
1527 | ||
1528 | #: config.c:150 | |
1529 | msgid "relative config includes must come from files" | |
1530 | msgstr "相对路径的配置文件引用必须来自于文件" | |
1531 | ||
1532 | #: config.c:190 | |
87cb7997 | 1533 | msgid "relative config include conditionals must come from files" |
c1ac5258 JX |
1534 | msgstr "相对路径的配置文件条件引用必须来自于文件" |
1535 | ||
1536 | #: config.c:348 | |
1537 | #, c-format | |
1538 | msgid "key does not contain a section: %s" | |
1539 | msgstr "键名没有包含一个小节名称:%s" | |
87cb7997 | 1540 | |
c1ac5258 JX |
1541 | #: config.c:354 |
1542 | #, c-format | |
1543 | msgid "key does not contain variable name: %s" | |
1544 | msgstr "键名没有包含变量名:%s" | |
1545 | ||
1546 | #: config.c:378 sequencer.c:2206 | |
1547 | #, c-format | |
1548 | msgid "invalid key: %s" | |
1549 | msgstr "无效键名:%s" | |
1550 | ||
1551 | #: config.c:384 | |
1552 | #, c-format | |
1553 | msgid "invalid key (newline): %s" | |
1554 | msgstr "无效键名(有换行符):%s" | |
1555 | ||
1556 | #: config.c:420 config.c:432 | |
1557 | #, c-format | |
1558 | msgid "bogus config parameter: %s" | |
1559 | msgstr "伪配置参数:%s" | |
1560 | ||
1561 | #: config.c:467 | |
1562 | #, c-format | |
1563 | msgid "bogus format in %s" | |
1564 | msgstr "%s 中格式错误" | |
1565 | ||
1566 | #: config.c:793 | |
90314792 | 1567 | #, c-format |
a0b6b246 JX |
1568 | msgid "bad config line %d in blob %s" |
1569 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1570 | |
c1ac5258 | 1571 | #: config.c:797 |
a77c07d9 | 1572 | #, c-format |
a0b6b246 JX |
1573 | msgid "bad config line %d in file %s" |
1574 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1575 | |
c1ac5258 | 1576 | #: config.c:801 |
a77c07d9 | 1577 | #, c-format |
a0b6b246 JX |
1578 | msgid "bad config line %d in standard input" |
1579 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1580 | |
c1ac5258 | 1581 | #: config.c:805 |
90314792 | 1582 | #, c-format |
a0b6b246 JX |
1583 | msgid "bad config line %d in submodule-blob %s" |
1584 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1585 | |
c1ac5258 | 1586 | #: config.c:809 |
90314792 | 1587 | #, c-format |
a0b6b246 JX |
1588 | msgid "bad config line %d in command line %s" |
1589 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1590 | |
c1ac5258 | 1591 | #: config.c:813 |
90314792 | 1592 | #, c-format |
a0b6b246 JX |
1593 | msgid "bad config line %d in %s" |
1594 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1595 | |
c1ac5258 | 1596 | #: config.c:952 |
a0b6b246 JX |
1597 | msgid "out of range" |
1598 | msgstr "超出范围" | |
6c94aba5 | 1599 | |
c1ac5258 | 1600 | #: config.c:952 |
a0b6b246 JX |
1601 | msgid "invalid unit" |
1602 | msgstr "无效的单位" | |
6c94aba5 | 1603 | |
c1ac5258 | 1604 | #: config.c:958 |
6c94aba5 | 1605 | #, c-format |
a0b6b246 JX |
1606 | msgid "bad numeric config value '%s' for '%s': %s" |
1607 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1608 | |
c1ac5258 | 1609 | #: config.c:963 |
1b7f4a34 | 1610 | #, c-format |
a0b6b246 JX |
1611 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1612 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1613 | |
c1ac5258 | 1614 | #: config.c:966 |
1b7f4a34 | 1615 | #, c-format |
a0b6b246 JX |
1616 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1617 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1618 | |
c1ac5258 | 1619 | #: config.c:969 |
1b7f4a34 | 1620 | #, c-format |
a0b6b246 JX |
1621 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1622 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1623 | |
c1ac5258 | 1624 | #: config.c:972 |
1b7f4a34 | 1625 | #, c-format |
a0b6b246 JX |
1626 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1627 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1628 | |
c1ac5258 | 1629 | #: config.c:975 |
94550ed3 | 1630 | #, c-format |
a0b6b246 JX |
1631 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1632 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1633 | |
c1ac5258 | 1634 | #: config.c:978 |
276ceeaa | 1635 | #, c-format |
a0b6b246 JX |
1636 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1637 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1638 | |
c1ac5258 | 1639 | #: config.c:1073 |
276ceeaa | 1640 | #, c-format |
a0b6b246 | 1641 | msgid "failed to expand user dir in: '%s'" |
c1ac5258 | 1642 | msgstr "无法扩展用户目录:'%s'" |
94550ed3 | 1643 | |
c1ac5258 | 1644 | #: config.c:1082 |
5809aa05 JX |
1645 | #, c-format |
1646 | msgid "'%s' for '%s' is not a valid timestamp" | |
1647 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
1648 | ||
c1ac5258 JX |
1649 | #: config.c:1173 |
1650 | #, c-format | |
1651 | msgid "abbrev length out of range: %d" | |
1652 | msgstr "缩写长度超出范围:%d" | |
1653 | ||
1654 | #: config.c:1187 config.c:1198 | |
3495628d | 1655 | #, c-format |
a0b6b246 JX |
1656 | msgid "bad zlib compression level %d" |
1657 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1658 | |
c1ac5258 JX |
1659 | #: config.c:1290 |
1660 | msgid "core.commentChar should only be one character" | |
1661 | msgstr "core.commentChar 应该是一个字符" | |
1662 | ||
1663 | #: config.c:1323 | |
3495628d | 1664 | #, c-format |
a0b6b246 JX |
1665 | msgid "invalid mode for object creation: %s" |
1666 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1667 | |
c1ac5258 JX |
1668 | #: config.c:1403 |
1669 | #, c-format | |
1670 | msgid "malformed value for %s" | |
1671 | msgstr "%s 的取值格式错误" | |
1672 | ||
1673 | #: config.c:1429 | |
1674 | #, c-format | |
1675 | msgid "malformed value for %s: %s" | |
1676 | msgstr "%s 的取值格式错误:%s" | |
1677 | ||
1678 | #: config.c:1430 | |
1679 | msgid "must be one of nothing, matching, simple, upstream or current" | |
1680 | msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" | |
1681 | ||
1682 | #: config.c:1489 builtin/pack-objects.c:3279 | |
1a79b2f1 JX |
1683 | #, c-format |
1684 | msgid "bad pack compression level %d" | |
1685 | msgstr "错误的打包压缩级别 %d" | |
1686 | ||
c1ac5258 JX |
1687 | #: config.c:1610 |
1688 | #, c-format | |
1689 | msgid "unable to load config blob object '%s'" | |
1690 | msgstr "无法从数据对象 '%s' 加载配置" | |
1691 | ||
1692 | #: config.c:1613 | |
1693 | #, c-format | |
1694 | msgid "reference '%s' does not point to a blob" | |
1695 | msgstr "引用 '%s' 没有指向一个数据对象" | |
1696 | ||
1697 | #: config.c:1630 | |
1698 | #, c-format | |
1699 | msgid "unable to resolve config blob '%s'" | |
1700 | msgstr "不能解析配置对象 '%s'" | |
1701 | ||
1702 | #: config.c:1660 | |
1703 | #, c-format | |
1704 | msgid "failed to parse %s" | |
1705 | msgstr "解析 %s 失败" | |
1706 | ||
1707 | #: config.c:1700 | |
a0b6b246 JX |
1708 | msgid "unable to parse command-line config" |
1709 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1710 | |
c1ac5258 | 1711 | #: config.c:2032 |
a0b6b246 JX |
1712 | msgid "unknown error occurred while reading the configuration files" |
1713 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1714 | |
c1ac5258 | 1715 | #: config.c:2202 |
87cb7997 JX |
1716 | #, c-format |
1717 | msgid "Invalid %s: '%s'" | |
1718 | msgstr "无效 %s:'%s'" | |
1719 | ||
c1ac5258 | 1720 | #: config.c:2245 |
87cb7997 JX |
1721 | #, c-format |
1722 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1723 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1724 | ||
c1ac5258 | 1725 | #: config.c:2271 |
87cb7997 JX |
1726 | #, c-format |
1727 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1728 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1729 | ||
c1ac5258 | 1730 | #: config.c:2296 |
276ceeaa | 1731 | #, c-format |
a0b6b246 JX |
1732 | msgid "unable to parse '%s' from command-line config" |
1733 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1734 | |
c1ac5258 | 1735 | #: config.c:2298 |
94550ed3 | 1736 | #, c-format |
a0b6b246 JX |
1737 | msgid "bad config variable '%s' in file '%s' at line %d" |
1738 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1739 | |
c1ac5258 JX |
1740 | #: config.c:2379 |
1741 | #, c-format | |
1742 | msgid "invalid section name '%s'" | |
1743 | msgstr "无效的小节名称 '%s'" | |
1744 | ||
1745 | #: config.c:2411 | |
276ceeaa | 1746 | #, c-format |
a0b6b246 JX |
1747 | msgid "%s has multiple values" |
1748 | msgstr "%s 有多个取值" | |
276ceeaa | 1749 | |
c1ac5258 JX |
1750 | #: config.c:2440 |
1751 | #, c-format | |
1752 | msgid "failed to write new configuration file %s" | |
1753 | msgstr "写入新的配置文件 %s 失败" | |
1754 | ||
1755 | #: config.c:2691 config.c:3015 | |
1756 | #, c-format | |
1757 | msgid "could not lock config file %s" | |
1758 | msgstr "不能锁定配置文件 %s" | |
1759 | ||
1760 | #: config.c:2702 | |
1761 | #, c-format | |
1762 | msgid "opening %s" | |
1763 | msgstr "打开 %s" | |
1764 | ||
1765 | #: config.c:2737 builtin/config.c:324 | |
1766 | #, c-format | |
1767 | msgid "invalid pattern: %s" | |
1768 | msgstr "无效模式:%s" | |
1769 | ||
1770 | #: config.c:2762 | |
1771 | #, c-format | |
1772 | msgid "invalid config file %s" | |
1773 | msgstr "无效的配置文件 %s" | |
1774 | ||
1775 | #: config.c:2775 config.c:3028 | |
1a79b2f1 JX |
1776 | #, c-format |
1777 | msgid "fstat on %s failed" | |
65e2041e | 1778 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 1779 | |
c1ac5258 JX |
1780 | #: config.c:2786 |
1781 | #, c-format | |
1782 | msgid "unable to mmap '%s'" | |
1783 | msgstr "不能 mmap '%s'" | |
1784 | ||
1785 | #: config.c:2795 config.c:3033 | |
1786 | #, c-format | |
1787 | msgid "chmod on %s failed" | |
1788 | msgstr "对 %s 调用 chmod 失败" | |
1789 | ||
1790 | #: config.c:2880 config.c:3130 | |
1791 | #, c-format | |
1792 | msgid "could not write config file %s" | |
1793 | msgstr "不能写入配置文件 %s" | |
1794 | ||
1795 | #: config.c:2914 | |
94550ed3 | 1796 | #, c-format |
a0b6b246 JX |
1797 | msgid "could not set '%s' to '%s'" |
1798 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1799 | |
c1ac5258 | 1800 | #: config.c:2916 builtin/remote.c:781 |
276ceeaa | 1801 | #, c-format |
a0b6b246 JX |
1802 | msgid "could not unset '%s'" |
1803 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1804 | |
c1ac5258 JX |
1805 | #: config.c:3006 |
1806 | #, c-format | |
1807 | msgid "invalid section name: %s" | |
1808 | msgstr "无效的小节名称:%s" | |
1809 | ||
1810 | #: config.c:3173 | |
1811 | #, c-format | |
1812 | msgid "missing value for '%s'" | |
1813 | msgstr "%s 的取值缺失" | |
1814 | ||
fd8cb379 | 1815 | #: connect.c:61 |
c1ac5258 JX |
1816 | msgid "the remote end hung up upon initial contact" |
1817 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 1818 | |
fd8cb379 | 1819 | #: connect.c:63 |
a0b6b246 JX |
1820 | msgid "" |
1821 | "Could not read from remote repository.\n" | |
1822 | "\n" | |
1823 | "Please make sure you have the correct access rights\n" | |
1824 | "and the repository exists." | |
1825 | msgstr "" | |
1826 | "无法读取远程仓库。\n" | |
1827 | "\n" | |
1828 | "请确认您有正确的访问权限并且仓库存在。" | |
1829 | ||
c1ac5258 JX |
1830 | #: connect.c:81 |
1831 | #, c-format | |
1832 | msgid "server doesn't support '%s'" | |
1833 | msgstr "服务器不支持 '%s'" | |
1834 | ||
1835 | #: connect.c:103 | |
1836 | #, c-format | |
1837 | msgid "server doesn't support feature '%s'" | |
1838 | msgstr "服务器不支持特性 '%s'" | |
1839 | ||
1840 | #: connect.c:114 | |
1841 | msgid "expected flush after capabilities" | |
1842 | msgstr "在能力之后应为一个 flush 包" | |
1843 | ||
1844 | #: connect.c:233 | |
1845 | #, c-format | |
1846 | msgid "ignoring capabilities after first line '%s'" | |
1847 | msgstr "忽略第一行 '%s' 之后的功能字段" | |
1848 | ||
1849 | #: connect.c:252 | |
1850 | msgid "protocol error: unexpected capabilities^{}" | |
1851 | msgstr "协议错误:意外的 capabilities^{}" | |
1852 | ||
1853 | #: connect.c:273 | |
1854 | #, c-format | |
1855 | msgid "protocol error: expected shallow sha-1, got '%s'" | |
1856 | msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" | |
1857 | ||
1858 | #: connect.c:275 | |
1859 | msgid "repository on the other end cannot be shallow" | |
1860 | msgstr "另一端的仓库不能是浅克隆仓库" | |
1861 | ||
1862 | #: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 | |
1863 | #, c-format | |
1864 | msgid "remote error: %s" | |
1865 | msgstr "远程错误:%s" | |
1866 | ||
1867 | #: connect.c:316 | |
1868 | msgid "invalid packet" | |
1869 | msgstr "无效数据包" | |
1870 | ||
1871 | #: connect.c:336 | |
1872 | #, c-format | |
1873 | msgid "protocol error: unexpected '%s'" | |
1874 | msgstr "协议错误:意外的 '%s'" | |
1875 | ||
1876 | #: connect.c:444 | |
1877 | #, c-format | |
1878 | msgid "invalid ls-refs response: %s" | |
1879 | msgstr "无效的 ls-refs 响应:%s" | |
1880 | ||
1881 | #: connect.c:448 | |
1882 | msgid "expected flush after ref listing" | |
1883 | msgstr "在引用列表之后应该有一个 flush 包" | |
1884 | ||
1885 | #: connect.c:547 | |
1886 | #, c-format | |
1887 | msgid "protocol '%s' is not supported" | |
1888 | msgstr "不支持 '%s' 协议" | |
1889 | ||
1890 | #: connect.c:598 | |
1891 | msgid "unable to set SO_KEEPALIVE on socket" | |
1892 | msgstr "无法为 socket 设置 SO_KEEPALIVE" | |
1893 | ||
1894 | #: connect.c:638 connect.c:701 | |
1895 | #, c-format | |
1896 | msgid "Looking up %s ... " | |
1897 | msgstr "查找 %s ..." | |
1898 | ||
1899 | #: connect.c:642 | |
1900 | #, c-format | |
1901 | msgid "unable to look up %s (port %s) (%s)" | |
1902 | msgstr "无法查找 %s(端口 %s)(%s)" | |
1903 | ||
1904 | #. TRANSLATORS: this is the end of "Looking up %s ... " | |
1905 | #: connect.c:646 connect.c:717 | |
1906 | #, c-format | |
1907 | msgid "" | |
1908 | "done.\n" | |
1909 | "Connecting to %s (port %s) ... " | |
1910 | msgstr "" | |
1911 | "完成。\n" | |
1912 | "连接到 %s(端口 %s)... " | |
1913 | ||
1914 | #: connect.c:668 connect.c:745 | |
1915 | #, c-format | |
1916 | msgid "" | |
1917 | "unable to connect to %s:\n" | |
1918 | "%s" | |
1919 | msgstr "" | |
1920 | "无法连接到 %s:\n" | |
1921 | "%s" | |
1922 | ||
1923 | #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " | |
1924 | #: connect.c:674 connect.c:751 | |
1925 | msgid "done." | |
1926 | msgstr "完成。" | |
1927 | ||
1928 | #: connect.c:705 | |
1929 | #, c-format | |
1930 | msgid "unable to look up %s (%s)" | |
1931 | msgstr "无法查找 %s(%s)" | |
1932 | ||
1933 | #: connect.c:711 | |
1934 | #, c-format | |
1935 | msgid "unknown port %s" | |
1936 | msgstr "未知端口 %s" | |
1937 | ||
1938 | #: connect.c:848 connect.c:1174 | |
1939 | #, c-format | |
1940 | msgid "strange hostname '%s' blocked" | |
1941 | msgstr "已阻止奇怪的主机名 '%s'" | |
1942 | ||
1943 | #: connect.c:850 | |
1944 | #, c-format | |
1945 | msgid "strange port '%s' blocked" | |
1946 | msgstr "已阻止奇怪的端口号 '%s'" | |
1947 | ||
1948 | #: connect.c:860 | |
1949 | #, c-format | |
1950 | msgid "cannot start proxy %s" | |
1951 | msgstr "不能启动代理 %s" | |
1952 | ||
1953 | #: connect.c:927 | |
1954 | msgid "no path specified; see 'git help pull' for valid url syntax" | |
1955 | msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" | |
1956 | ||
1957 | #: connect.c:1122 | |
1958 | msgid "ssh variant 'simple' does not support -4" | |
1959 | msgstr "ssh 变体 'simple' 不支持 -4" | |
1960 | ||
1961 | #: connect.c:1134 | |
1962 | msgid "ssh variant 'simple' does not support -6" | |
1963 | msgstr "ssh 变体 'simple' 不支持 -6" | |
1964 | ||
1965 | #: connect.c:1151 | |
1966 | msgid "ssh variant 'simple' does not support setting port" | |
1967 | msgstr "'simple' 类型的 ssh 不支持设置端口" | |
1968 | ||
1969 | #: connect.c:1262 | |
1970 | #, c-format | |
1971 | msgid "strange pathname '%s' blocked" | |
1972 | msgstr "已阻止奇怪的路径名 '%s'" | |
1973 | ||
1974 | #: connect.c:1307 | |
1975 | msgid "unable to fork" | |
1976 | msgstr "无法 fork" | |
1977 | ||
1978 | #: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 | |
a0b6b246 JX |
1979 | msgid "Checking connectivity" |
1980 | msgstr "检查连接中" | |
1981 | ||
c1ac5258 | 1982 | #: connected.c:80 |
a0b6b246 JX |
1983 | msgid "Could not run 'git rev-list'" |
1984 | msgstr "不能执行 'git rev-list'" | |
1985 | ||
c1ac5258 | 1986 | #: connected.c:100 |
a0b6b246 | 1987 | msgid "failed write to rev-list" |
c1ac5258 | 1988 | msgstr "写入 rev-list 失败" |
a0b6b246 | 1989 | |
c1ac5258 | 1990 | #: connected.c:107 |
a0b6b246 | 1991 | msgid "failed to close rev-list's stdin" |
c1ac5258 JX |
1992 | msgstr "关闭 rev-list 的标准输入失败" |
1993 | ||
1994 | #: convert.c:194 | |
1995 | #, c-format | |
1996 | msgid "illegal crlf_action %d" | |
1997 | msgstr "非法的 crlf 动作 %d" | |
a0b6b246 | 1998 | |
c1ac5258 | 1999 | #: convert.c:207 |
3495628d | 2000 | #, c-format |
c1ac5258 JX |
2001 | msgid "CRLF would be replaced by LF in %s" |
2002 | msgstr "%s 中的 CRLF 将被 LF 替换" | |
31e5e17b | 2003 | |
c1ac5258 | 2004 | #: convert.c:209 |
31e5e17b | 2005 | #, c-format |
a0b6b246 JX |
2006 | msgid "" |
2007 | "CRLF will be replaced by LF in %s.\n" | |
c1ac5258 | 2008 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2009 | msgstr "" |
c1ac5258 | 2010 | "%s 中的 CRLF 将被 LF 替换。<\n" |
a0b6b246 | 2011 | "在工作区中该文件仍保持原有的换行符。" |
3495628d | 2012 | |
c1ac5258 | 2013 | #: convert.c:217 |
3495628d | 2014 | #, c-format |
31e5e17b JX |
2015 | msgid "LF would be replaced by CRLF in %s" |
2016 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 2017 | |
c1ac5258 | 2018 | #: convert.c:219 |
276ceeaa | 2019 | #, c-format |
a0b6b246 JX |
2020 | msgid "" |
2021 | "LF will be replaced by CRLF in %s.\n" | |
c1ac5258 | 2022 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2023 | msgstr "" |
c1ac5258 JX |
2024 | "%s 中的 LF 将被 CRLF 替换。\n" |
2025 | "在工作区中该文件仍保持原有的换行符" | |
276ceeaa | 2026 | |
c1ac5258 | 2027 | #: convert.c:280 |
fd8cb379 JX |
2028 | #, c-format |
2029 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
2030 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
2031 | ||
c1ac5258 | 2032 | #: convert.c:287 |
fd8cb379 JX |
2033 | #, c-format |
2034 | msgid "" | |
2035 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" | |
2036 | "tree-encoding." | |
2037 | msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。" | |
2038 | ||
c1ac5258 | 2039 | #: convert.c:305 |
fd8cb379 JX |
2040 | #, c-format |
2041 | msgid "BOM is required in '%s' if encoded as %s" | |
2042 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
2043 | ||
c1ac5258 | 2044 | #: convert.c:307 |
fd8cb379 JX |
2045 | #, c-format |
2046 | msgid "" | |
2047 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
2048 | "%sLE (depending on the byte order) as working-tree-encoding." | |
2049 | msgstr "" | |
2050 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
2051 | "节序)作为工作区编码。" | |
2052 | ||
c1ac5258 | 2053 | #: convert.c:425 convert.c:496 |
fd8cb379 JX |
2054 | #, c-format |
2055 | msgid "failed to encode '%s' from %s to %s" | |
2056 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
2057 | ||
c1ac5258 | 2058 | #: convert.c:468 |
fd8cb379 JX |
2059 | #, c-format |
2060 | msgid "encoding '%s' from %s to %s and back is not the same" | |
2061 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
2062 | ||
c1ac5258 JX |
2063 | #: convert.c:674 |
2064 | #, c-format | |
2065 | msgid "cannot fork to run external filter '%s'" | |
2066 | msgstr "不能 fork 以执行外部过滤程序 '%s'" | |
2067 | ||
2068 | #: convert.c:694 | |
2069 | #, c-format | |
2070 | msgid "cannot feed the input to external filter '%s'" | |
2071 | msgstr "不能将标准输入传递给外部过滤器 '%s'" | |
2072 | ||
2073 | #: convert.c:701 | |
2074 | #, c-format | |
2075 | msgid "external filter '%s' failed %d" | |
2076 | msgstr "外部过滤程序 '%s' 失败码 %d" | |
2077 | ||
2078 | #: convert.c:736 convert.c:739 | |
2079 | #, c-format | |
2080 | msgid "read from external filter '%s' failed" | |
2081 | msgstr "从外部过滤器 '%s' 读取失败" | |
2082 | ||
2083 | #: convert.c:742 convert.c:796 | |
2084 | #, c-format | |
2085 | msgid "external filter '%s' failed" | |
2086 | msgstr "外部过滤器 '%s' 失败" | |
2087 | ||
2088 | #: convert.c:844 | |
2089 | msgid "unexpected filter type" | |
2090 | msgstr "意外的过滤类型" | |
2091 | ||
2092 | #: convert.c:855 | |
2093 | msgid "path name too long for external filter" | |
2094 | msgstr "外部过滤器的路径名太长" | |
2095 | ||
2096 | #: convert.c:929 | |
2097 | #, c-format | |
2098 | msgid "" | |
2099 | "external filter '%s' is not available anymore although not all paths have " | |
2100 | "been filtered" | |
2101 | msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" | |
2102 | ||
2103 | #: convert.c:1228 | |
fd8cb379 JX |
2104 | msgid "true/false are no valid working-tree-encodings" |
2105 | msgstr "true/false 不是有效的工作区编码" | |
2106 | ||
c1ac5258 JX |
2107 | #: convert.c:1402 convert.c:1436 |
2108 | #, c-format | |
2109 | msgid "%s: clean filter '%s' failed" | |
2110 | msgstr "%s:clean 过滤器 '%s' 失败" | |
2111 | ||
2112 | #: convert.c:1480 | |
2113 | #, c-format | |
2114 | msgid "%s: smudge filter %s failed" | |
2115 | msgstr "%s:smudge 过滤器 %s 失败" | |
2116 | ||
a4f16749 | 2117 | #: date.c:116 |
a0b6b246 JX |
2118 | msgid "in the future" |
2119 | msgstr "在将来" | |
3495628d | 2120 | |
a4f16749 | 2121 | #: date.c:122 |
3495628d | 2122 | #, c-format |
a4f16749 JX |
2123 | msgid "%<PRIuMAX> second ago" |
2124 | msgid_plural "%<PRIuMAX> seconds ago" | |
2125 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
2126 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 2127 | |
a4f16749 | 2128 | #: date.c:129 |
3495628d | 2129 | #, c-format |
a4f16749 JX |
2130 | msgid "%<PRIuMAX> minute ago" |
2131 | msgid_plural "%<PRIuMAX> minutes ago" | |
2132 | msgstr[0] "%<PRIuMAX> 分钟前" | |
2133 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 2134 | |
a4f16749 | 2135 | #: date.c:136 |
3495628d | 2136 | #, c-format |
a4f16749 JX |
2137 | msgid "%<PRIuMAX> hour ago" |
2138 | msgid_plural "%<PRIuMAX> hours ago" | |
2139 | msgstr[0] "%<PRIuMAX> 小时前" | |
2140 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 2141 | |
a4f16749 | 2142 | #: date.c:143 |
3495628d | 2143 | #, c-format |
a4f16749 JX |
2144 | msgid "%<PRIuMAX> day ago" |
2145 | msgid_plural "%<PRIuMAX> days ago" | |
2146 | msgstr[0] "%<PRIuMAX> 天前" | |
2147 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 2148 | |
a4f16749 | 2149 | #: date.c:149 |
94550ed3 | 2150 | #, c-format |
a4f16749 JX |
2151 | msgid "%<PRIuMAX> week ago" |
2152 | msgid_plural "%<PRIuMAX> weeks ago" | |
2153 | msgstr[0] "%<PRIuMAX> 周前" | |
2154 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 2155 | |
a4f16749 | 2156 | #: date.c:156 |
3495628d | 2157 | #, c-format |
a4f16749 JX |
2158 | msgid "%<PRIuMAX> month ago" |
2159 | msgid_plural "%<PRIuMAX> months ago" | |
2160 | msgstr[0] "%<PRIuMAX> 个月前" | |
2161 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 2162 | |
a4f16749 | 2163 | #: date.c:167 |
3495628d | 2164 | #, c-format |
a4f16749 JX |
2165 | msgid "%<PRIuMAX> year" |
2166 | msgid_plural "%<PRIuMAX> years" | |
2167 | msgstr[0] "%<PRIuMAX> 年" | |
2168 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 2169 | |
a0b6b246 | 2170 | #. TRANSLATORS: "%s" is "<n> years" |
a4f16749 | 2171 | #: date.c:170 |
94550ed3 | 2172 | #, c-format |
a4f16749 JX |
2173 | msgid "%s, %<PRIuMAX> month ago" |
2174 | msgid_plural "%s, %<PRIuMAX> months ago" | |
2175 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
2176 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 2177 | |
a4f16749 | 2178 | #: date.c:175 date.c:180 |
94550ed3 | 2179 | #, c-format |
a4f16749 JX |
2180 | msgid "%<PRIuMAX> year ago" |
2181 | msgid_plural "%<PRIuMAX> years ago" | |
2182 | msgstr[0] "%<PRIuMAX> 年前" | |
2183 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 2184 | |
a0b6b246 | 2185 | #: diffcore-order.c:24 |
cfff71a9 | 2186 | #, c-format |
a0b6b246 | 2187 | msgid "failed to read orderfile '%s'" |
c1ac5258 | 2188 | msgstr "读取排序文件 '%s' 失败" |
cfff71a9 | 2189 | |
c1ac5258 | 2190 | #: diffcore-rename.c:536 |
a0b6b246 | 2191 | msgid "Performing inexact rename detection" |
87cb7997 | 2192 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 2193 | |
c1ac5258 | 2194 | #: diff.c:108 |
cfff71a9 | 2195 | #, c-format |
a0b6b246 JX |
2196 | msgid "option '%s' requires a value" |
2197 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 2198 | |
a0b6b246 | 2199 | # 译者:注意保持前导空格 |
c1ac5258 | 2200 | #: diff.c:158 |
a0b6b246 JX |
2201 | #, c-format |
2202 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
2203 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 2204 | |
a0b6b246 | 2205 | # 译者:注意保持前导空格 |
c1ac5258 | 2206 | #: diff.c:163 |
a0b6b246 JX |
2207 | #, c-format |
2208 | msgid " Unknown dirstat parameter '%s'\n" | |
2209 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 2210 | |
c1ac5258 | 2211 | #: diff.c:291 |
6937cb4e | 2212 | msgid "" |
c1ac5258 JX |
2213 | "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " |
2214 | "'dimmed-zebra', 'plain'" | |
5809aa05 | 2215 | msgstr "" |
c1ac5258 JX |
2216 | "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " |
2217 | "'plain'" | |
2218 | ||
2219 | #: diff.c:316 | |
2220 | #, c-format | |
2221 | msgid "ignoring unknown color-moved-ws mode '%s'" | |
2222 | msgstr "忽略未知的 color-moved-ws 模式 '%s'" | |
2223 | ||
2224 | #: diff.c:323 | |
2225 | msgid "" | |
2226 | "color-moved-ws: allow-indentation-change cannot be combined with other white " | |
2227 | "space modes" | |
2228 | msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" | |
6937cb4e | 2229 | |
c1ac5258 | 2230 | #: diff.c:394 |
7aea43ff | 2231 | #, c-format |
a0b6b246 JX |
2232 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
2233 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 2234 | |
c1ac5258 | 2235 | #: diff.c:454 |
7aea43ff | 2236 | #, c-format |
a0b6b246 JX |
2237 | msgid "" |
2238 | "Found errors in 'diff.dirstat' config variable:\n" | |
2239 | "%s" | |
2240 | msgstr "" | |
2241 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
2242 | "%s" | |
7aea43ff | 2243 | |
c1ac5258 | 2244 | #: diff.c:4096 |
7aea43ff | 2245 | #, c-format |
a0b6b246 JX |
2246 | msgid "external diff died, stopping at %s" |
2247 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 2248 | |
c1ac5258 | 2249 | #: diff.c:4427 |
a0b6b246 JX |
2250 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
2251 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
2252 | ||
c1ac5258 | 2253 | #: diff.c:4430 |
31e5e17b JX |
2254 | msgid "-G, -S and --find-object are mutually exclusive" |
2255 | msgstr "-G、-S 和 --find-object 是互斥的" | |
2256 | ||
c1ac5258 | 2257 | #: diff.c:4508 |
a0b6b246 JX |
2258 | msgid "--follow requires exactly one pathspec" |
2259 | msgstr "--follow 明确要求只跟一个路径规格" | |
2260 | ||
c1ac5258 | 2261 | #: diff.c:4674 |
7aea43ff | 2262 | #, c-format |
a0b6b246 JX |
2263 | msgid "" |
2264 | "Failed to parse --dirstat/-X option parameter:\n" | |
2265 | "%s" | |
2266 | msgstr "" | |
2267 | "无法解析 --dirstat/-X 选项的参数:\n" | |
2268 | "%s" | |
7aea43ff | 2269 | |
c1ac5258 | 2270 | #: diff.c:4688 |
7aea43ff | 2271 | #, c-format |
a0b6b246 JX |
2272 | msgid "Failed to parse --submodule option parameter: '%s'" |
2273 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 2274 | |
c1ac5258 | 2275 | #: diff.c:5766 |
a0b6b246 JX |
2276 | msgid "inexact rename detection was skipped due to too many files." |
2277 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
2278 | ||
c1ac5258 | 2279 | #: diff.c:5769 |
a0b6b246 JX |
2280 | msgid "only found copies from modified paths due to too many files." |
2281 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
2282 | ||
c1ac5258 | 2283 | #: diff.c:5772 |
7aea43ff | 2284 | #, c-format |
a0b6b246 JX |
2285 | msgid "" |
2286 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 2287 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 2288 | |
c1ac5258 JX |
2289 | #: dir.c:569 |
2290 | #, c-format | |
2291 | msgid "pathspec '%s' did not match any file(s) known to git" | |
2292 | msgstr "路径规格 '%s' 未匹配任何 git 已知文件" | |
2293 | ||
2294 | #: dir.c:958 | |
2295 | #, c-format | |
2296 | msgid "cannot use %s as an exclude file" | |
2297 | msgstr "不能将 %s 用作排除文件" | |
2298 | ||
2299 | #: dir.c:1873 | |
31e5e17b JX |
2300 | #, c-format |
2301 | msgid "could not open directory '%s'" | |
2302 | msgstr "不能打开目录 '%s'" | |
2303 | ||
c1ac5258 | 2304 | #: dir.c:2115 |
a0b6b246 JX |
2305 | msgid "failed to get kernel name and information" |
2306 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 2307 | |
c1ac5258 JX |
2308 | #: dir.c:2239 |
2309 | msgid "untracked cache is disabled on this system or location" | |
2310 | msgstr "缓存未跟踪文件在本系统或位置中被禁用" | |
2311 | ||
2312 | #: dir.c:3037 | |
2313 | #, c-format | |
2314 | msgid "index file corrupt in repo %s" | |
2315 | msgstr "仓库 %s 中的索引文件损坏" | |
7aea43ff | 2316 | |
c1ac5258 | 2317 | #: dir.c:3082 dir.c:3087 |
87cb7997 JX |
2318 | #, c-format |
2319 | msgid "could not create directories for %s" | |
2320 | msgstr "不能为 %s 创建目录" | |
2321 | ||
c1ac5258 | 2322 | #: dir.c:3116 |
1a79b2f1 JX |
2323 | #, c-format |
2324 | msgid "could not migrate git directory from '%s' to '%s'" | |
2325 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
2326 | ||
5809aa05 JX |
2327 | #: editor.c:61 |
2328 | #, c-format | |
2329 | msgid "hint: Waiting for your editor to close the file...%c" | |
2330 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
2331 | ||
c1ac5258 | 2332 | #: entry.c:178 |
6937cb4e JX |
2333 | msgid "Filtering content" |
2334 | msgstr "过滤内容" | |
2335 | ||
c1ac5258 | 2336 | #: entry.c:437 |
87cb7997 JX |
2337 | #, c-format |
2338 | msgid "could not stat file '%s'" | |
65e2041e | 2339 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 2340 | |
c1ac5258 JX |
2341 | #: environment.c:150 |
2342 | #, c-format | |
2343 | msgid "bad git namespace path \"%s\"" | |
2344 | msgstr "糟糕的 git 名字空间路径 \"%s\"" | |
2345 | ||
2346 | #: environment.c:332 | |
2347 | #, c-format | |
2348 | msgid "could not set GIT_DIR to '%s'" | |
2349 | msgstr "不能设置 GIT_DIR 为 '%s'" | |
2350 | ||
2351 | #: exec-cmd.c:361 | |
2352 | #, c-format | |
2353 | msgid "too many args to run %s" | |
2354 | msgstr "执行 %s 的参数太多" | |
2355 | ||
31e5e17b JX |
2356 | #: fetch-object.c:17 |
2357 | msgid "Remote with no URL" | |
2358 | msgstr "远程未设置 URL" | |
2359 | ||
c1ac5258 | 2360 | #: fetch-pack.c:152 |
a0b6b246 JX |
2361 | msgid "git fetch-pack: expected shallow list" |
2362 | msgstr "git fetch-pack:应为 shallow 列表" | |
2363 | ||
c1ac5258 | 2364 | #: fetch-pack.c:164 |
31e5e17b JX |
2365 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
2366 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 2367 | |
c1ac5258 | 2368 | #: fetch-pack.c:184 |
90314792 | 2369 | #, c-format |
275588f9 | 2370 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 2371 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 2372 | |
c1ac5258 | 2373 | #: fetch-pack.c:254 |
a0b6b246 JX |
2374 | msgid "--stateless-rpc requires multi_ack_detailed" |
2375 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 2376 | |
c1ac5258 | 2377 | #: fetch-pack.c:342 fetch-pack.c:1257 |
90314792 | 2378 | #, c-format |
a0b6b246 JX |
2379 | msgid "invalid shallow line: %s" |
2380 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 2381 | |
c1ac5258 | 2382 | #: fetch-pack.c:348 fetch-pack.c:1263 |
c04f5ac3 | 2383 | #, c-format |
a0b6b246 JX |
2384 | msgid "invalid unshallow line: %s" |
2385 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 2386 | |
c1ac5258 | 2387 | #: fetch-pack.c:350 fetch-pack.c:1265 |
a0b6b246 JX |
2388 | #, c-format |
2389 | msgid "object not found: %s" | |
2390 | msgstr "对象未找到:%s" | |
07432cef | 2391 | |
c1ac5258 | 2392 | #: fetch-pack.c:353 fetch-pack.c:1268 |
c04f5ac3 | 2393 | #, c-format |
a0b6b246 JX |
2394 | msgid "error in object: %s" |
2395 | msgstr "对象中出错:%s" | |
07432cef | 2396 | |
c1ac5258 | 2397 | #: fetch-pack.c:355 fetch-pack.c:1270 |
c04f5ac3 | 2398 | #, c-format |
a0b6b246 JX |
2399 | msgid "no shallow found: %s" |
2400 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 2401 | |
c1ac5258 | 2402 | #: fetch-pack.c:358 fetch-pack.c:1273 |
a0b6b246 JX |
2403 | #, c-format |
2404 | msgid "expected shallow/unshallow, got %s" | |
2405 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 2406 | |
c1ac5258 | 2407 | #: fetch-pack.c:399 |
a0b6b246 JX |
2408 | #, c-format |
2409 | msgid "got %s %d %s" | |
2410 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 2411 | |
c1ac5258 | 2412 | #: fetch-pack.c:416 |
1b7f4a34 | 2413 | #, c-format |
a0b6b246 JX |
2414 | msgid "invalid commit %s" |
2415 | msgstr "无效提交 %s" | |
1b7f4a34 | 2416 | |
c1ac5258 | 2417 | #: fetch-pack.c:447 |
a0b6b246 JX |
2418 | msgid "giving up" |
2419 | msgstr "放弃" | |
814ff314 | 2420 | |
c1ac5258 | 2421 | #: fetch-pack.c:459 progress.c:229 |
a0b6b246 JX |
2422 | msgid "done" |
2423 | msgstr "完成" | |
2e8451e8 | 2424 | |
c1ac5258 | 2425 | #: fetch-pack.c:471 |
2e8451e8 | 2426 | #, c-format |
a0b6b246 JX |
2427 | msgid "got %s (%d) %s" |
2428 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 2429 | |
c1ac5258 | 2430 | #: fetch-pack.c:517 |
a0b6b246 JX |
2431 | #, c-format |
2432 | msgid "Marking %s as complete" | |
2433 | msgstr "标记 %s 为完成" | |
220c313c | 2434 | |
c1ac5258 | 2435 | #: fetch-pack.c:764 |
a0b6b246 JX |
2436 | #, c-format |
2437 | msgid "already have %s (%s)" | |
29004bbb | 2438 | msgstr "已经有 %s(%s)" |
220c313c | 2439 | |
c1ac5258 | 2440 | #: fetch-pack.c:803 |
a0b6b246 JX |
2441 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
2442 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 2443 | |
c1ac5258 | 2444 | #: fetch-pack.c:811 |
a0b6b246 JX |
2445 | msgid "protocol error: bad pack header" |
2446 | msgstr "协议错误:坏的包头" | |
814ff314 | 2447 | |
c1ac5258 | 2448 | #: fetch-pack.c:879 |
a0b6b246 JX |
2449 | #, c-format |
2450 | msgid "fetch-pack: unable to fork off %s" | |
2451 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 2452 | |
c1ac5258 | 2453 | #: fetch-pack.c:895 |
a0b6b246 JX |
2454 | #, c-format |
2455 | msgid "%s failed" | |
2456 | msgstr "%s 失败" | |
14c8bced | 2457 | |
c1ac5258 | 2458 | #: fetch-pack.c:897 |
a0b6b246 JX |
2459 | msgid "error in sideband demultiplexer" |
2460 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 2461 | |
c1ac5258 | 2462 | #: fetch-pack.c:926 |
a0b6b246 JX |
2463 | msgid "Server does not support shallow clients" |
2464 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 2465 | |
c1ac5258 | 2466 | #: fetch-pack.c:930 |
a0b6b246 JX |
2467 | msgid "Server supports multi_ack_detailed" |
2468 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 2469 | |
c1ac5258 | 2470 | #: fetch-pack.c:933 |
a0b6b246 JX |
2471 | msgid "Server supports no-done" |
2472 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 2473 | |
c1ac5258 | 2474 | #: fetch-pack.c:939 |
a0b6b246 JX |
2475 | msgid "Server supports multi_ack" |
2476 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 2477 | |
c1ac5258 | 2478 | #: fetch-pack.c:943 |
a0b6b246 JX |
2479 | msgid "Server supports side-band-64k" |
2480 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 2481 | |
c1ac5258 | 2482 | #: fetch-pack.c:947 |
a0b6b246 JX |
2483 | msgid "Server supports side-band" |
2484 | msgstr "服务器支持 side-band" | |
5c57d762 | 2485 | |
c1ac5258 | 2486 | #: fetch-pack.c:951 |
a0b6b246 JX |
2487 | msgid "Server supports allow-tip-sha1-in-want" |
2488 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 2489 | |
c1ac5258 | 2490 | #: fetch-pack.c:955 |
a0b6b246 JX |
2491 | msgid "Server supports allow-reachable-sha1-in-want" |
2492 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 2493 | |
c1ac5258 | 2494 | #: fetch-pack.c:965 |
a0b6b246 JX |
2495 | msgid "Server supports ofs-delta" |
2496 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 2497 | |
c1ac5258 | 2498 | #: fetch-pack.c:971 fetch-pack.c:1150 |
31e5e17b JX |
2499 | msgid "Server supports filter" |
2500 | msgstr "服务器支持 filter" | |
2501 | ||
c1ac5258 | 2502 | #: fetch-pack.c:979 |
81809b99 | 2503 | #, c-format |
a0b6b246 JX |
2504 | msgid "Server version is %.*s" |
2505 | msgstr "服务器版本 %.*s" | |
8ada9598 | 2506 | |
c1ac5258 | 2507 | #: fetch-pack.c:985 |
a0b6b246 JX |
2508 | msgid "Server does not support --shallow-since" |
2509 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 2510 | |
c1ac5258 | 2511 | #: fetch-pack.c:989 |
a0b6b246 JX |
2512 | msgid "Server does not support --shallow-exclude" |
2513 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 2514 | |
c1ac5258 | 2515 | #: fetch-pack.c:991 |
a0b6b246 JX |
2516 | msgid "Server does not support --deepen" |
2517 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 2518 | |
c1ac5258 | 2519 | #: fetch-pack.c:1004 |
a0b6b246 JX |
2520 | msgid "no common commits" |
2521 | msgstr "没有共同的提交" | |
c04f5ac3 | 2522 | |
c1ac5258 | 2523 | #: fetch-pack.c:1016 fetch-pack.c:1393 |
a0b6b246 JX |
2524 | msgid "git fetch-pack: fetch failed." |
2525 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 2526 | |
c1ac5258 | 2527 | #: fetch-pack.c:1145 |
fd8cb379 JX |
2528 | msgid "Server does not support shallow requests" |
2529 | msgstr "服务器不支持 shalllow 请求" | |
2530 | ||
c1ac5258 JX |
2531 | #: fetch-pack.c:1191 |
2532 | #, c-format | |
2533 | msgid "error reading section header '%s'" | |
2534 | msgstr "读取节标题 '%s' 出错" | |
2535 | ||
2536 | #: fetch-pack.c:1197 | |
2537 | #, c-format | |
2538 | msgid "expected '%s', received '%s'" | |
2539 | msgstr "预期 '%s',得到 '%s'" | |
2540 | ||
2541 | #: fetch-pack.c:1236 | |
2542 | #, c-format | |
2543 | msgid "unexpected acknowledgment line: '%s'" | |
2544 | msgstr "意外的确认行:'%s'" | |
2545 | ||
2546 | #: fetch-pack.c:1241 | |
2547 | #, c-format | |
2548 | msgid "error processing acks: %d" | |
2549 | msgstr "处理 ack 出错:%d" | |
2550 | ||
2551 | #: fetch-pack.c:1278 | |
2552 | #, c-format | |
2553 | msgid "error processing shallow info: %d" | |
2554 | msgstr "处理浅克隆信息出错:%d" | |
2555 | ||
2556 | #: fetch-pack.c:1294 | |
2557 | #, c-format | |
2558 | msgid "expected wanted-ref, got '%s'" | |
2559 | msgstr "预期 wanted-ref,得到 '%s'" | |
2560 | ||
2561 | #: fetch-pack.c:1304 | |
2562 | #, c-format | |
2563 | msgid "unexpected wanted-ref: '%s'" | |
2564 | msgstr "意外的 wanted-ref:'%s'" | |
2565 | ||
2566 | #: fetch-pack.c:1308 | |
2567 | #, c-format | |
2568 | msgid "error processing wanted refs: %d" | |
2569 | msgstr "处理要获取的引用出错:%d" | |
2570 | ||
2571 | #: fetch-pack.c:1603 | |
a0b6b246 JX |
2572 | msgid "no matching remote head" |
2573 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 2574 | |
c1ac5258 JX |
2575 | #: fetch-pack.c:1621 builtin/clone.c:664 |
2576 | msgid "remote did not send all necessary objects" | |
2577 | msgstr "远程没有发送所有必须的对象" | |
2578 | ||
2579 | #: fetch-pack.c:1647 | |
87cb7997 JX |
2580 | #, c-format |
2581 | msgid "no such remote ref %s" | |
2582 | msgstr "没有这样的远程引用 %s" | |
2583 | ||
c1ac5258 | 2584 | #: fetch-pack.c:1650 |
87cb7997 JX |
2585 | #, c-format |
2586 | msgid "Server does not allow request for unadvertised object %s" | |
2587 | msgstr "服务器不允许请求未公开的对象 %s" | |
2588 | ||
c1ac5258 | 2589 | #: gpg-interface.c:253 |
a0b6b246 JX |
2590 | msgid "gpg failed to sign the data" |
2591 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 2592 | |
c1ac5258 | 2593 | #: gpg-interface.c:279 |
a0b6b246 JX |
2594 | msgid "could not create temporary file" |
2595 | msgstr "不能创建临时文件" | |
c04f5ac3 | 2596 | |
c1ac5258 | 2597 | #: gpg-interface.c:282 |
c04f5ac3 | 2598 | #, c-format |
a0b6b246 JX |
2599 | msgid "failed writing detached signature to '%s'" |
2600 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 2601 | |
a4f16749 | 2602 | #: graph.c:97 |
1a79b2f1 JX |
2603 | #, c-format |
2604 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
2605 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
2606 | ||
c1ac5258 | 2607 | #: grep.c:2115 |
c04f5ac3 | 2608 | #, c-format |
a0b6b246 JX |
2609 | msgid "'%s': unable to read %s" |
2610 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 2611 | |
c1ac5258 | 2612 | #: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 |
31e5e17b | 2613 | #: builtin/rm.c:134 |
c04f5ac3 | 2614 | #, c-format |
a0b6b246 | 2615 | msgid "failed to stat '%s'" |
65e2041e | 2616 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 2617 | |
c1ac5258 | 2618 | #: grep.c:2143 |
a0b6b246 JX |
2619 | #, c-format |
2620 | msgid "'%s': short read" | |
2621 | msgstr "'%s':读取不完整" | |
5c57d762 | 2622 | |
fd8cb379 JX |
2623 | #: help.c:23 |
2624 | msgid "start a working area (see also: git help tutorial)" | |
2625 | msgstr "开始一个工作区(参见:git help tutorial)" | |
2626 | ||
2627 | #: help.c:24 | |
2628 | msgid "work on the current change (see also: git help everyday)" | |
2629 | msgstr "在当前变更上工作(参见:git help everyday)" | |
2630 | ||
2631 | #: help.c:25 | |
2632 | msgid "examine the history and state (see also: git help revisions)" | |
2633 | msgstr "检查历史和状态(参见:git help revisions)" | |
2634 | ||
2635 | #: help.c:26 | |
2636 | msgid "grow, mark and tweak your common history" | |
2637 | msgstr "扩展、标记和调校您的历史记录" | |
2638 | ||
2639 | #: help.c:27 | |
2640 | msgid "collaborate (see also: git help workflows)" | |
2641 | msgstr "协同(参见:git help workflows)" | |
2642 | ||
2643 | #: help.c:31 | |
2644 | msgid "Main Porcelain Commands" | |
2645 | msgstr "主要的上层命令" | |
2646 | ||
2647 | #: help.c:32 | |
2648 | msgid "Ancillary Commands / Manipulators" | |
2649 | msgstr "辅助命令/操作者" | |
2650 | ||
2651 | #: help.c:33 | |
2652 | msgid "Ancillary Commands / Interrogators" | |
2653 | msgstr "辅助命令/询问者" | |
2654 | ||
2655 | #: help.c:34 | |
2656 | msgid "Interacting with Others" | |
2657 | msgstr "与其它系统交互" | |
2658 | ||
2659 | #: help.c:35 | |
2660 | msgid "Low-level Commands / Manipulators" | |
2661 | msgstr "低级命令/操作者" | |
2662 | ||
2663 | #: help.c:36 | |
2664 | msgid "Low-level Commands / Interrogators" | |
2665 | msgstr "低级命令/询问者" | |
2666 | ||
2667 | #: help.c:37 | |
2668 | msgid "Low-level Commands / Synching Repositories" | |
2669 | msgstr "低级命令/同步仓库" | |
2670 | ||
2671 | #: help.c:38 | |
2672 | msgid "Low-level Commands / Internal Helpers" | |
2673 | msgstr "低级命令/内部助手" | |
2674 | ||
2675 | #: help.c:293 | |
a0b6b246 JX |
2676 | #, c-format |
2677 | msgid "available git commands in '%s'" | |
2678 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 2679 | |
fd8cb379 | 2680 | #: help.c:300 |
a0b6b246 JX |
2681 | msgid "git commands available from elsewhere on your $PATH" |
2682 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 2683 | |
fd8cb379 | 2684 | #: help.c:309 |
a0b6b246 JX |
2685 | msgid "These are common Git commands used in various situations:" |
2686 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 2687 | |
fd8cb379 JX |
2688 | #: help.c:358 git.c:90 |
2689 | #, c-format | |
2690 | msgid "unsupported command listing type '%s'" | |
2691 | msgstr "不支持的命令列表类型 '%s'" | |
2692 | ||
2693 | #: help.c:405 | |
2694 | msgid "The common Git guides are:" | |
2695 | msgstr "最常用的 Git 向导有:" | |
2696 | ||
c1ac5258 | 2697 | #: help.c:552 |
c04f5ac3 | 2698 | #, c-format |
a0b6b246 JX |
2699 | msgid "" |
2700 | "'%s' appears to be a git command, but we were not\n" | |
2701 | "able to execute it. Maybe git-%s is broken?" | |
2702 | msgstr "" | |
2703 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
2704 | "可能是 git-%s 受损?" | |
c04f5ac3 | 2705 | |
c1ac5258 | 2706 | #: help.c:611 |
a0b6b246 JX |
2707 | msgid "Uh oh. Your system reports no Git commands at all." |
2708 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 2709 | |
c1ac5258 | 2710 | #: help.c:633 |
c04f5ac3 | 2711 | #, c-format |
a4f16749 | 2712 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 2713 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 2714 | |
c1ac5258 | 2715 | #: help.c:638 |
a4f16749 JX |
2716 | #, c-format |
2717 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 2718 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 2719 | |
c1ac5258 | 2720 | #: help.c:643 |
c04f5ac3 | 2721 | #, c-format |
a4f16749 | 2722 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 2723 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 2724 | |
c1ac5258 | 2725 | #: help.c:651 |
c04f5ac3 | 2726 | #, c-format |
a0b6b246 JX |
2727 | msgid "git: '%s' is not a git command. See 'git --help'." |
2728 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 2729 | |
c1ac5258 | 2730 | #: help.c:655 |
a4f16749 JX |
2731 | msgid "" |
2732 | "\n" | |
2733 | "The most similar command is" | |
2734 | msgid_plural "" | |
2735 | "\n" | |
2736 | "The most similar commands are" | |
6937cb4e JX |
2737 | msgstr[0] "" |
2738 | "\n" | |
2739 | "最相似的命令是" | |
2740 | msgstr[1] "" | |
2741 | "\n" | |
2742 | "最相似的命令是" | |
a4f16749 | 2743 | |
c1ac5258 | 2744 | #: help.c:670 |
a4f16749 JX |
2745 | msgid "git version [<options>]" |
2746 | msgstr "git version [<选项>]" | |
2747 | ||
c1ac5258 | 2748 | #: help.c:738 |
a4f16749 JX |
2749 | #, c-format |
2750 | msgid "%s: %s - %s" | |
2751 | msgstr "%s:%s - %s" | |
2752 | ||
c1ac5258 | 2753 | #: help.c:742 |
a0b6b246 JX |
2754 | msgid "" |
2755 | "\n" | |
2756 | "Did you mean this?" | |
2757 | msgid_plural "" | |
2758 | "\n" | |
2759 | "Did you mean one of these?" | |
2760 | msgstr[0] "" | |
2761 | "\n" | |
2762 | "您指的是这个么?" | |
2763 | msgstr[1] "" | |
2764 | "\n" | |
2765 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 2766 | |
a4f16749 | 2767 | #: ident.c:342 |
a0b6b246 JX |
2768 | msgid "" |
2769 | "\n" | |
2770 | "*** Please tell me who you are.\n" | |
2771 | "\n" | |
2772 | "Run\n" | |
2773 | "\n" | |
2774 | " git config --global user.email \"you@example.com\"\n" | |
2775 | " git config --global user.name \"Your Name\"\n" | |
2776 | "\n" | |
2777 | "to set your account's default identity.\n" | |
2778 | "Omit --global to set the identity only in this repository.\n" | |
2779 | "\n" | |
2780 | msgstr "" | |
2781 | "\n" | |
2782 | "*** 请告诉我你是谁。\n" | |
2783 | "\n" | |
2784 | "运行\n" | |
2785 | "\n" | |
2786 | " git config --global user.email \"you@example.com\"\n" | |
2787 | " git config --global user.name \"Your Name\"\n" | |
2788 | "\n" | |
2789 | "来设置您账号的缺省身份标识。\n" | |
2790 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 2791 | |
a4f16749 | 2792 | #: ident.c:366 |
87cb7997 | 2793 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 2794 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 2795 | |
a4f16749 | 2796 | #: ident.c:371 |
87cb7997 JX |
2797 | #, c-format |
2798 | msgid "unable to auto-detect email address (got '%s')" | |
2799 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
2800 | ||
a4f16749 | 2801 | #: ident.c:381 |
87cb7997 JX |
2802 | msgid "no name was given and auto-detection is disabled" |
2803 | msgstr "未提供姓名且自动探测被禁用" | |
2804 | ||
a4f16749 | 2805 | #: ident.c:387 |
87cb7997 JX |
2806 | #, c-format |
2807 | msgid "unable to auto-detect name (got '%s')" | |
2808 | msgstr "无法自动探测姓名(得到 '%s')" | |
2809 | ||
a4f16749 | 2810 | #: ident.c:395 |
87cb7997 JX |
2811 | #, c-format |
2812 | msgid "empty ident name (for <%s>) not allowed" | |
2813 | msgstr "不允许空的姓名(对于 <%s>)" | |
2814 | ||
a4f16749 | 2815 | #: ident.c:401 |
87cb7997 JX |
2816 | #, c-format |
2817 | msgid "name consists only of disallowed characters: %s" | |
2818 | msgstr "姓名中仅包含禁用字符:%s" | |
2819 | ||
c1ac5258 | 2820 | #: ident.c:416 builtin/commit.c:600 |
87cb7997 JX |
2821 | #, c-format |
2822 | msgid "invalid date format: %s" | |
2823 | msgstr "无效的日期格式:%s" | |
2824 | ||
31e5e17b JX |
2825 | #: list-objects-filter-options.c:36 |
2826 | msgid "multiple filter-specs cannot be combined" | |
2827 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 2828 | |
31e5e17b JX |
2829 | #: list-objects-filter-options.c:126 |
2830 | msgid "cannot change partial clone promisor remote" | |
2831 | msgstr "无法修改部分克隆的 promisor 远程仓库" | |
5809aa05 | 2832 | |
6937cb4e | 2833 | #: lockfile.c:151 |
c04f5ac3 | 2834 | #, c-format |
a0b6b246 JX |
2835 | msgid "" |
2836 | "Unable to create '%s.lock': %s.\n" | |
2837 | "\n" | |
2838 | "Another git process seems to be running in this repository, e.g.\n" | |
2839 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2840 | "are terminated then try again. If it still fails, a git process\n" | |
2841 | "may have crashed in this repository earlier:\n" | |
2842 | "remove the file manually to continue." | |
2843 | msgstr "" | |
2844 | "无法创建 '%s.lock':%s。\n" | |
2845 | "\n" | |
2846 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
2847 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
2848 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
2849 | "手动删除这个文件再继续。" | |
c04f5ac3 | 2850 | |
6937cb4e | 2851 | #: lockfile.c:159 |
a0b6b246 JX |
2852 | #, c-format |
2853 | msgid "Unable to create '%s.lock': %s" | |
2854 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 2855 | |
c1ac5258 | 2856 | #: merge.c:40 |
a0b6b246 | 2857 | msgid "failed to read the cache" |
c1ac5258 | 2858 | msgstr "读取缓存失败" |
c04f5ac3 | 2859 | |
c1ac5258 JX |
2860 | #: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 |
2861 | #: builtin/checkout.c:608 builtin/clone.c:763 | |
a0b6b246 JX |
2862 | msgid "unable to write new index file" |
2863 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 2864 | |
c1ac5258 | 2865 | #: merge-recursive.c:303 |
a0b6b246 JX |
2866 | msgid "(bad commit)\n" |
2867 | msgstr "(坏提交)\n" | |
c04f5ac3 | 2868 | |
c1ac5258 | 2869 | #: merge-recursive.c:325 |
a0b6b246 | 2870 | #, c-format |
fd8cb379 | 2871 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 2872 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 2873 | |
c1ac5258 | 2874 | #: merge-recursive.c:333 |
fd8cb379 JX |
2875 | #, c-format |
2876 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 2877 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 | 2878 | |
c1ac5258 | 2879 | #: merge-recursive.c:415 |
a0b6b246 | 2880 | msgid "error building trees" |
c1ac5258 | 2881 | msgstr "创建树出错" |
c04f5ac3 | 2882 | |
c1ac5258 | 2883 | #: merge-recursive.c:886 |
c04f5ac3 | 2884 | #, c-format |
a0b6b246 | 2885 | msgid "failed to create path '%s'%s" |
c1ac5258 | 2886 | msgstr "创建路径 '%s'%s 失败" |
c04f5ac3 | 2887 | |
c1ac5258 | 2888 | #: merge-recursive.c:897 |
c04f5ac3 | 2889 | #, c-format |
a0b6b246 JX |
2890 | msgid "Removing %s to make room for subdirectory\n" |
2891 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 2892 | |
c1ac5258 | 2893 | #: merge-recursive.c:911 merge-recursive.c:930 |
a0b6b246 JX |
2894 | msgid ": perhaps a D/F conflict?" |
2895 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 2896 | |
c1ac5258 | 2897 | #: merge-recursive.c:920 |
c04f5ac3 | 2898 | #, c-format |
a0b6b246 JX |
2899 | msgid "refusing to lose untracked file at '%s'" |
2900 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2901 | |
c1ac5258 | 2902 | #: merge-recursive.c:962 builtin/cat-file.c:39 |
c04f5ac3 | 2903 | #, c-format |
a0b6b246 JX |
2904 | msgid "cannot read object %s '%s'" |
2905 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2906 | |
c1ac5258 | 2907 | #: merge-recursive.c:964 |
4dcdc3d8 | 2908 | #, c-format |
a0b6b246 JX |
2909 | msgid "blob expected for %s '%s'" |
2910 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 2911 | |
c1ac5258 | 2912 | #: merge-recursive.c:988 |
4dcdc3d8 | 2913 | #, c-format |
a0b6b246 | 2914 | msgid "failed to open '%s': %s" |
c1ac5258 | 2915 | msgstr "打开 '%s' 失败:%s" |
4dcdc3d8 | 2916 | |
c1ac5258 | 2917 | #: merge-recursive.c:999 |
a0b6b246 JX |
2918 | #, c-format |
2919 | msgid "failed to symlink '%s': %s" | |
c1ac5258 | 2920 | msgstr "创建符号链接 '%s' 失败:%s" |
c04f5ac3 | 2921 | |
c1ac5258 | 2922 | #: merge-recursive.c:1004 |
5c57d762 | 2923 | #, c-format |
a0b6b246 JX |
2924 | msgid "do not know what to do with %06o %s '%s'" |
2925 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 2926 | |
c1ac5258 | 2927 | #: merge-recursive.c:1191 |
fd8cb379 JX |
2928 | #, c-format |
2929 | msgid "Failed to merge submodule %s (not checked out)" | |
2930 | msgstr "无法合并子模组 %s (没有检出)" | |
2931 | ||
c1ac5258 | 2932 | #: merge-recursive.c:1198 |
fd8cb379 JX |
2933 | #, c-format |
2934 | msgid "Failed to merge submodule %s (commits not present)" | |
2935 | msgstr "无法合并子模组 %s(提交不存在)" | |
2936 | ||
c1ac5258 | 2937 | #: merge-recursive.c:1205 |
fd8cb379 JX |
2938 | #, c-format |
2939 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
2940 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
2941 | ||
c1ac5258 | 2942 | #: merge-recursive.c:1213 merge-recursive.c:1225 |
fd8cb379 JX |
2943 | #, c-format |
2944 | msgid "Fast-forwarding submodule %s to the following commit:" | |
2945 | msgstr "子模组 %s 快进到如下提交:" | |
2946 | ||
c1ac5258 | 2947 | #: merge-recursive.c:1216 merge-recursive.c:1228 |
fd8cb379 JX |
2948 | #, c-format |
2949 | msgid "Fast-forwarding submodule %s" | |
2950 | msgstr "快进子模组 %s" | |
2951 | ||
c1ac5258 | 2952 | #: merge-recursive.c:1250 |
fd8cb379 JX |
2953 | #, c-format |
2954 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
2955 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
2956 | ||
c1ac5258 | 2957 | #: merge-recursive.c:1254 |
fd8cb379 JX |
2958 | #, c-format |
2959 | msgid "Failed to merge submodule %s (not fast-forward)" | |
2960 | msgstr "无法合并子模组 %s(非快进)" | |
2961 | ||
c1ac5258 | 2962 | #: merge-recursive.c:1255 |
fd8cb379 JX |
2963 | msgid "Found a possible merge resolution for the submodule:\n" |
2964 | msgstr "找到子模组的一个可能的合并方案:\n" | |
2965 | ||
c1ac5258 | 2966 | #: merge-recursive.c:1258 |
fd8cb379 JX |
2967 | #, c-format |
2968 | msgid "" | |
2969 | "If this is correct simply add it to the index for example\n" | |
2970 | "by using:\n" | |
2971 | "\n" | |
2972 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
2973 | "\n" | |
2974 | "which will accept this suggestion.\n" | |
2975 | msgstr "" | |
2976 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
2977 | "\n" | |
2978 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
2979 | "\n" | |
2980 | "以接受此建议。\n" | |
2981 | ||
c1ac5258 | 2982 | #: merge-recursive.c:1267 |
fd8cb379 JX |
2983 | #, c-format |
2984 | msgid "Failed to merge submodule %s (multiple merges found)" | |
2985 | msgstr "无法合并子模组 %s (发现多个合并)" | |
2986 | ||
c1ac5258 | 2987 | #: merge-recursive.c:1326 |
a0b6b246 JX |
2988 | msgid "Failed to execute internal merge" |
2989 | msgstr "无法执行内部合并" | |
2990 | ||
c1ac5258 | 2991 | #: merge-recursive.c:1331 |
5c57d762 | 2992 | #, c-format |
a0b6b246 JX |
2993 | msgid "Unable to add %s to database" |
2994 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 2995 | |
c1ac5258 | 2996 | #: merge-recursive.c:1363 |
fd8cb379 JX |
2997 | #, c-format |
2998 | msgid "Auto-merging %s" | |
2999 | msgstr "自动合并 %s" | |
3000 | ||
c1ac5258 | 3001 | #: merge-recursive.c:1434 |
fd8cb379 JX |
3002 | #, c-format |
3003 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
3004 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
3005 | ||
c1ac5258 | 3006 | #: merge-recursive.c:1501 |
5c57d762 JX |
3007 | #, c-format |
3008 | msgid "" | |
a0b6b246 JX |
3009 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
3010 | "in tree." | |
5c57d762 | 3011 | msgstr "" |
87cb7997 JX |
3012 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3013 | "本被保留。" | |
3014 | ||
c1ac5258 | 3015 | #: merge-recursive.c:1506 |
87cb7997 JX |
3016 | #, c-format |
3017 | msgid "" | |
3018 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3019 | "left in tree." | |
3020 | msgstr "" | |
3021 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3022 | "%7$s 版本被保留。" | |
c04f5ac3 | 3023 | |
c1ac5258 | 3024 | #: merge-recursive.c:1513 |
7aea43ff | 3025 | #, c-format |
a0b6b246 JX |
3026 | msgid "" |
3027 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
3028 | "in tree at %s." | |
3029 | msgstr "" | |
87cb7997 JX |
3030 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3031 | "本保留在 %8$s 中。" | |
7aea43ff | 3032 | |
c1ac5258 | 3033 | #: merge-recursive.c:1518 |
87cb7997 JX |
3034 | #, c-format |
3035 | msgid "" | |
3036 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3037 | "left in tree at %s." | |
3038 | msgstr "" | |
3039 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3040 | "%7$s 版本保留在 %9$s 中。" | |
3041 | ||
c1ac5258 | 3042 | #: merge-recursive.c:1552 |
a0b6b246 JX |
3043 | msgid "rename" |
3044 | msgstr "重命名" | |
5b04ee3b | 3045 | |
c1ac5258 | 3046 | #: merge-recursive.c:1552 |
a0b6b246 JX |
3047 | msgid "renamed" |
3048 | msgstr "重命名" | |
5b04ee3b | 3049 | |
c1ac5258 JX |
3050 | #: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 |
3051 | #: merge-recursive.c:3129 | |
fd8cb379 JX |
3052 | #, c-format |
3053 | msgid "Refusing to lose dirty file at %s" | |
3054 | msgstr "拒绝丢失脏文件 '%s'" | |
3055 | ||
c1ac5258 | 3056 | #: merge-recursive.c:1620 |
5c57d762 | 3057 | #, c-format |
a0b6b246 JX |
3058 | msgid "%s is a directory in %s adding as %s instead" |
3059 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 3060 | |
c1ac5258 | 3061 | #: merge-recursive.c:1625 |
fd8cb379 JX |
3062 | #, c-format |
3063 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
3064 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
3065 | ||
c1ac5258 | 3066 | #: merge-recursive.c:1651 |
5c57d762 JX |
3067 | #, c-format |
3068 | msgid "" | |
a0b6b246 JX |
3069 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
3070 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 3071 | msgstr "" |
a0b6b246 JX |
3072 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
3073 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 3074 | |
c1ac5258 | 3075 | #: merge-recursive.c:1656 |
a0b6b246 JX |
3076 | msgid " (left unresolved)" |
3077 | msgstr "(留下未解决)" | |
5c57d762 | 3078 | |
c1ac5258 | 3079 | #: merge-recursive.c:1720 |
5c57d762 | 3080 | #, c-format |
a0b6b246 | 3081 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 3082 | msgstr "" |
a0b6b246 JX |
3083 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
3084 | "%5$s" | |
3495628d | 3085 | |
c1ac5258 | 3086 | #: merge-recursive.c:1759 |
3495628d | 3087 | #, c-format |
a0b6b246 | 3088 | msgid "Renaming %s to %s and %s to %s instead" |
0fcd668f | 3089 | msgstr "代之以重命名 %s 至 %s,以及 %s 至 %s" |
3495628d | 3090 | |
c1ac5258 | 3091 | #: merge-recursive.c:1771 |
fd8cb379 JX |
3092 | #, c-format |
3093 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
0fcd668f | 3094 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" |
fd8cb379 | 3095 | |
c1ac5258 | 3096 | #: merge-recursive.c:1977 |
fd8cb379 JX |
3097 | #, c-format |
3098 | msgid "" | |
3099 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
3100 | "directory %s was renamed to multiple other directories, with no destination " | |
3101 | "getting a majority of the files." | |
c1ac5258 JX |
3102 | msgstr "" |
3103 | "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" | |
3104 | "其它目录,没有目录包含大部分文件。" | |
fd8cb379 | 3105 | |
c1ac5258 | 3106 | #: merge-recursive.c:2009 |
fd8cb379 JX |
3107 | #, c-format |
3108 | msgid "" | |
3109 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
3110 | "implicit directory rename(s) putting the following path(s) there: %s." | |
3111 | msgstr "" | |
3112 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
3113 | "在:%s。" | |
3114 | ||
c1ac5258 | 3115 | #: merge-recursive.c:2019 |
fd8cb379 JX |
3116 | #, c-format |
3117 | msgid "" | |
3118 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
3119 | "implicit directory renames tried to put these paths there: %s" | |
3120 | msgstr "" | |
3121 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
3122 | "径放置于此:%s" | |
3123 | ||
c1ac5258 | 3124 | #: merge-recursive.c:2111 |
fd8cb379 JX |
3125 | #, c-format |
3126 | msgid "" | |
3127 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
3128 | ">%s in %s" | |
3129 | msgstr "" | |
3130 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
3131 | "%4$s->%5$s" | |
3132 | ||
c1ac5258 | 3133 | #: merge-recursive.c:2356 |
fd8cb379 JX |
3134 | #, c-format |
3135 | msgid "" | |
3136 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
3137 | "renamed." | |
3138 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
3139 | ||
c1ac5258 | 3140 | #: merge-recursive.c:2762 |
3495628d | 3141 | #, c-format |
a0b6b246 JX |
3142 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
3143 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 3144 | |
c1ac5258 | 3145 | #: merge-recursive.c:2777 |
a0b6b246 JX |
3146 | #, c-format |
3147 | msgid "Adding merged %s" | |
3148 | msgstr "添加合并后的 %s" | |
90314792 | 3149 | |
c1ac5258 | 3150 | #: merge-recursive.c:2784 merge-recursive.c:3132 |
90314792 | 3151 | #, c-format |
a0b6b246 JX |
3152 | msgid "Adding as %s instead" |
3153 | msgstr "而是以 %s 为名添加" | |
90314792 | 3154 | |
c1ac5258 | 3155 | #: merge-recursive.c:2941 |
90314792 | 3156 | #, c-format |
a0b6b246 JX |
3157 | msgid "cannot read object %s" |
3158 | msgstr "不能读取对象 %s" | |
90314792 | 3159 | |
c1ac5258 | 3160 | #: merge-recursive.c:2944 |
90314792 | 3161 | #, c-format |
a0b6b246 JX |
3162 | msgid "object %s is not a blob" |
3163 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 3164 | |
c1ac5258 | 3165 | #: merge-recursive.c:3013 |
a0b6b246 JX |
3166 | msgid "modify" |
3167 | msgstr "修改" | |
90314792 | 3168 | |
c1ac5258 | 3169 | #: merge-recursive.c:3013 |
a0b6b246 JX |
3170 | msgid "modified" |
3171 | msgstr "修改" | |
5b04ee3b | 3172 | |
c1ac5258 | 3173 | #: merge-recursive.c:3024 |
a0b6b246 JX |
3174 | msgid "content" |
3175 | msgstr "内容" | |
5b04ee3b | 3176 | |
c1ac5258 | 3177 | #: merge-recursive.c:3031 |
a0b6b246 JX |
3178 | msgid "add/add" |
3179 | msgstr "添加/添加" | |
3495628d | 3180 | |
c1ac5258 | 3181 | #: merge-recursive.c:3076 |
220c313c | 3182 | #, c-format |
a0b6b246 JX |
3183 | msgid "Skipped %s (merged same as existing)" |
3184 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 3185 | |
c1ac5258 | 3186 | #: merge-recursive.c:3098 git-submodule.sh:865 |
a0b6b246 JX |
3187 | msgid "submodule" |
3188 | msgstr "子模组" | |
3189 | ||
c1ac5258 | 3190 | #: merge-recursive.c:3099 |
220c313c | 3191 | #, c-format |
a0b6b246 JX |
3192 | msgid "CONFLICT (%s): Merge conflict in %s" |
3193 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 3194 | |
c1ac5258 | 3195 | #: merge-recursive.c:3221 |
220c313c | 3196 | #, c-format |
a0b6b246 JX |
3197 | msgid "Removing %s" |
3198 | msgstr "删除 %s" | |
220c313c | 3199 | |
c1ac5258 | 3200 | #: merge-recursive.c:3247 |
a0b6b246 JX |
3201 | msgid "file/directory" |
3202 | msgstr "文件/目录" | |
220c313c | 3203 | |
c1ac5258 | 3204 | #: merge-recursive.c:3253 |
a0b6b246 JX |
3205 | msgid "directory/file" |
3206 | msgstr "目录/文件" | |
276ceeaa | 3207 | |
c1ac5258 | 3208 | #: merge-recursive.c:3260 |
276ceeaa | 3209 | #, c-format |
a0b6b246 JX |
3210 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
3211 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 3212 | |
c1ac5258 | 3213 | #: merge-recursive.c:3269 |
276ceeaa | 3214 | #, c-format |
a0b6b246 JX |
3215 | msgid "Adding %s" |
3216 | msgstr "添加 %s" | |
276ceeaa | 3217 | |
c1ac5258 | 3218 | #: merge-recursive.c:3303 |
5809aa05 | 3219 | #, c-format |
c1ac5258 JX |
3220 | msgid "" |
3221 | "Your local changes to the following files would be overwritten by merge:\n" | |
3222 | " %s" | |
3223 | msgstr "" | |
3224 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3225 | " %s" | |
5809aa05 | 3226 | |
c1ac5258 | 3227 | #: merge-recursive.c:3314 |
6937cb4e | 3228 | msgid "Already up to date!" |
a0b6b246 | 3229 | msgstr "已经是最新的!" |
276ceeaa | 3230 | |
c1ac5258 | 3231 | #: merge-recursive.c:3323 |
276ceeaa | 3232 | #, c-format |
a0b6b246 JX |
3233 | msgid "merging of trees %s and %s failed" |
3234 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 3235 | |
c1ac5258 | 3236 | #: merge-recursive.c:3422 |
a0b6b246 JX |
3237 | msgid "Merging:" |
3238 | msgstr "合并:" | |
5c57d762 | 3239 | |
c1ac5258 | 3240 | #: merge-recursive.c:3435 |
5c57d762 | 3241 | #, c-format |
a0b6b246 JX |
3242 | msgid "found %u common ancestor:" |
3243 | msgid_plural "found %u common ancestors:" | |
3244 | msgstr[0] "发现 %u 个共同祖先:" | |
3245 | msgstr[1] "发现 %u 个共同祖先:" | |
3246 | ||
c1ac5258 | 3247 | #: merge-recursive.c:3474 |
a0b6b246 JX |
3248 | msgid "merge returned no commit" |
3249 | msgstr "合并未返回提交" | |
3250 | ||
c1ac5258 | 3251 | #: merge-recursive.c:3540 |
5c57d762 | 3252 | #, c-format |
a0b6b246 JX |
3253 | msgid "Could not parse object '%s'" |
3254 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 3255 | |
c1ac5258 | 3256 | #: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 |
a0b6b246 JX |
3257 | msgid "Unable to write index." |
3258 | msgstr "不能写入索引。" | |
3259 | ||
c1ac5258 | 3260 | #: notes-merge.c:274 |
5c57d762 JX |
3261 | #, c-format |
3262 | msgid "" | |
a0b6b246 JX |
3263 | "You have not concluded your previous notes merge (%s exists).\n" |
3264 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
3265 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 3266 | msgstr "" |
29004bbb | 3267 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
3268 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
3269 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 3270 | |
c1ac5258 | 3271 | #: notes-merge.c:281 |
a0b6b246 JX |
3272 | #, c-format |
3273 | msgid "You have not concluded your notes merge (%s exists)." | |
3274 | msgstr "您尚未结束注释合并(存在 %s)。" | |
3275 | ||
c1ac5258 | 3276 | #: notes-utils.c:45 |
a0b6b246 JX |
3277 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
3278 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 3279 | |
c1ac5258 | 3280 | #: notes-utils.c:104 |
1b7f4a34 | 3281 | #, c-format |
a0b6b246 JX |
3282 | msgid "Bad notes.rewriteMode value: '%s'" |
3283 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 3284 | |
c1ac5258 | 3285 | #: notes-utils.c:114 |
5b04ee3b | 3286 | #, c-format |
a0b6b246 JX |
3287 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
3288 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 3289 | |
a4f16749 JX |
3290 | #. TRANSLATORS: The first %s is the name of |
3291 | #. the environment variable, the second %s is | |
3292 | #. its value. | |
3293 | #. | |
c1ac5258 | 3294 | #: notes-utils.c:144 |
5b04ee3b | 3295 | #, c-format |
a0b6b246 JX |
3296 | msgid "Bad %s value: '%s'" |
3297 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 3298 | |
c1ac5258 JX |
3299 | #: object.c:54 |
3300 | #, c-format | |
3301 | msgid "invalid object type \"%s\"" | |
3302 | msgstr "无效的对象类型 \"%s\"" | |
3303 | ||
3304 | #: object.c:173 | |
3305 | #, c-format | |
3306 | msgid "object %s is a %s, not a %s" | |
3307 | msgstr "对象 %s 是一个 %s,不是一个 %s" | |
3308 | ||
3309 | #: object.c:233 | |
3310 | #, c-format | |
3311 | msgid "object %s has unknown type id %d" | |
3312 | msgstr "对象 %s 有未知的类型 id %d" | |
3313 | ||
3314 | #: object.c:246 | |
5b04ee3b | 3315 | #, c-format |
a0b6b246 JX |
3316 | msgid "unable to parse object: %s" |
3317 | msgstr "不能解析对象:%s" | |
5b04ee3b | 3318 | |
c1ac5258 JX |
3319 | #: object.c:266 object.c:277 |
3320 | #, c-format | |
3321 | msgid "sha1 mismatch %s" | |
3322 | msgstr "sha1 与 %s 不匹配" | |
3323 | ||
fd8cb379 | 3324 | #: packfile.c:563 |
6937cb4e JX |
3325 | msgid "offset before end of packfile (broken .idx?)" |
3326 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
3327 | ||
c1ac5258 | 3328 | #: packfile.c:1745 |
6937cb4e JX |
3329 | #, c-format |
3330 | msgid "offset before start of pack index for %s (corrupt index?)" | |
3331 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
3332 | ||
c1ac5258 | 3333 | #: packfile.c:1749 |
6937cb4e JX |
3334 | #, c-format |
3335 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
3336 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
3337 | ||
c1ac5258 | 3338 | #: parse-options.c:672 |
a0b6b246 JX |
3339 | msgid "..." |
3340 | msgstr "..." | |
3341 | ||
c1ac5258 | 3342 | #: parse-options.c:691 |
5b04ee3b | 3343 | #, c-format |
a0b6b246 JX |
3344 | msgid "usage: %s" |
3345 | msgstr "用法:%s" | |
5b04ee3b | 3346 | |
a0b6b246 | 3347 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
3348 | #. one in "usage: %s" translation. |
3349 | #. | |
c1ac5258 | 3350 | #: parse-options.c:697 |
5b04ee3b | 3351 | #, c-format |
a0b6b246 JX |
3352 | msgid " or: %s" |
3353 | msgstr " 或:%s" | |
5b04ee3b | 3354 | |
a0b6b246 | 3355 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c1ac5258 | 3356 | #: parse-options.c:700 |
5b04ee3b | 3357 | #, c-format |
a0b6b246 JX |
3358 | msgid " %s" |
3359 | msgstr " %s" | |
5b04ee3b | 3360 | |
c1ac5258 | 3361 | #: parse-options.c:739 |
a0b6b246 JX |
3362 | msgid "-NUM" |
3363 | msgstr "-数字" | |
3364 | ||
fd8cb379 JX |
3365 | #: parse-options-cb.c:44 |
3366 | #, c-format | |
3367 | msgid "malformed expiration date '%s'" | |
3368 | msgstr "格式错误的到期时间:'%s'" | |
3369 | ||
3370 | #: parse-options-cb.c:112 | |
5b04ee3b | 3371 | #, c-format |
a0b6b246 | 3372 | msgid "malformed object name '%s'" |
fd8cb379 | 3373 | msgstr "格式错误的对象名 '%s'" |
5b04ee3b | 3374 | |
fd8cb379 | 3375 | #: path.c:892 |
5b04ee3b | 3376 | #, c-format |
a0b6b246 JX |
3377 | msgid "Could not make %s writable by group" |
3378 | msgstr "不能设置 %s 为组可写" | |
3379 | ||
a4f16749 | 3380 | #: pathspec.c:129 |
87cb7997 JX |
3381 | msgid "Escape character '\\' not allowed as last character in attr value" |
3382 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
3383 | ||
a4f16749 | 3384 | #: pathspec.c:147 |
87cb7997 JX |
3385 | msgid "Only one 'attr:' specification is allowed." |
3386 | msgstr "只允许一个 'attr:' 规格。" | |
3387 | ||
a4f16749 | 3388 | #: pathspec.c:150 |
87cb7997 JX |
3389 | msgid "attr spec must not be empty" |
3390 | msgstr "属性规格不能为空" | |
3391 | ||
a4f16749 | 3392 | #: pathspec.c:193 |
87cb7997 JX |
3393 | #, c-format |
3394 | msgid "invalid attribute name %s" | |
3395 | msgstr "无效的属性名 %s" | |
3396 | ||
a4f16749 | 3397 | #: pathspec.c:258 |
a0b6b246 JX |
3398 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
3399 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
3400 | ||
a4f16749 | 3401 | #: pathspec.c:265 |
5b04ee3b | 3402 | msgid "" |
a0b6b246 JX |
3403 | "global 'literal' pathspec setting is incompatible with all other global " |
3404 | "pathspec settings" | |
3405 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 3406 | |
a4f16749 | 3407 | #: pathspec.c:305 |
a0b6b246 JX |
3408 | msgid "invalid parameter for pathspec magic 'prefix'" |
3409 | msgstr "路径规格包含无效的神奇前缀" | |
3410 | ||
a4f16749 | 3411 | #: pathspec.c:326 |
5b04ee3b | 3412 | #, c-format |
a0b6b246 JX |
3413 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
3414 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 3415 | |
a4f16749 | 3416 | #: pathspec.c:331 |
5b04ee3b | 3417 | #, c-format |
a0b6b246 JX |
3418 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
3419 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 3420 | |
a4f16749 | 3421 | #: pathspec.c:369 |
5b04ee3b | 3422 | #, c-format |
a0b6b246 JX |
3423 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
3424 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 3425 | |
a4f16749 | 3426 | #: pathspec.c:428 |
5b04ee3b | 3427 | #, c-format |
a0b6b246 JX |
3428 | msgid "%s: 'literal' and 'glob' are incompatible" |
3429 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 3430 | |
a4f16749 | 3431 | #: pathspec.c:441 |
5b04ee3b | 3432 | #, c-format |
a0b6b246 JX |
3433 | msgid "%s: '%s' is outside repository" |
3434 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 3435 | |
a4f16749 | 3436 | #: pathspec.c:515 |
5b04ee3b | 3437 | #, c-format |
1a79b2f1 JX |
3438 | msgid "'%s' (mnemonic: '%c')" |
3439 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 3440 | |
a4f16749 | 3441 | #: pathspec.c:525 |
5b04ee3b | 3442 | #, c-format |
a0b6b246 JX |
3443 | msgid "%s: pathspec magic not supported by this command: %s" |
3444 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
3445 | ||
5809aa05 | 3446 | #: pathspec.c:592 |
5b04ee3b | 3447 | #, c-format |
a0b6b246 JX |
3448 | msgid "pathspec '%s' is beyond a symbolic link" |
3449 | msgstr "路径规格 '%s' 位于符号链接中" | |
3450 | ||
c1ac5258 JX |
3451 | #: pkt-line.c:104 |
3452 | msgid "flush packet write failed" | |
3453 | msgstr "flush 包写错误" | |
3454 | ||
3455 | #: pkt-line.c:142 pkt-line.c:228 | |
3456 | msgid "protocol error: impossibly long line" | |
3457 | msgstr "协议错误:不可能的长行" | |
3458 | ||
3459 | #: pkt-line.c:158 pkt-line.c:160 | |
3460 | msgid "packet write with format failed" | |
3461 | msgstr "格式化包写入错误" | |
3462 | ||
3463 | #: pkt-line.c:192 | |
3464 | msgid "packet write failed - data exceeds max packet size" | |
3465 | msgstr "写数据包失败:数据超过了包的最大长度" | |
3466 | ||
3467 | #: pkt-line.c:199 pkt-line.c:206 | |
3468 | msgid "packet write failed" | |
3469 | msgstr "数据包写入失败" | |
3470 | ||
3471 | #: pkt-line.c:291 | |
3472 | msgid "read error" | |
3473 | msgstr "读取错误" | |
3474 | ||
3475 | #: pkt-line.c:299 | |
3476 | msgid "the remote end hung up unexpectedly" | |
3477 | msgstr "远端意外挂断了" | |
3478 | ||
3479 | #: pkt-line.c:327 | |
3480 | #, c-format | |
3481 | msgid "protocol error: bad line length character: %.4s" | |
3482 | msgstr "协议错误:错误的行长度字符串:%.4s" | |
3483 | ||
3484 | #: pkt-line.c:337 pkt-line.c:342 | |
3485 | #, c-format | |
3486 | msgid "protocol error: bad line length %d" | |
3487 | msgstr "协议错误:错误的行长度 %d" | |
3488 | ||
6937cb4e | 3489 | #: pretty.c:962 |
a0b6b246 JX |
3490 | msgid "unable to parse --pretty format" |
3491 | msgstr "不能解析 --pretty 格式" | |
3492 | ||
c1ac5258 JX |
3493 | #: range-diff.c:48 |
3494 | msgid "could not start `log`" | |
3495 | msgstr "不能启动 `log`" | |
3496 | ||
3497 | #: range-diff.c:51 | |
3498 | msgid "could not read `log` output" | |
3499 | msgstr "不能读取 `log` 的输出" | |
3500 | ||
3501 | #: range-diff.c:66 sequencer.c:4540 | |
3502 | #, c-format | |
3503 | msgid "could not parse commit '%s'" | |
3504 | msgstr "不能解析提交 '%s'" | |
3505 | ||
3506 | #: range-diff.c:196 | |
3507 | msgid "failed to generate diff" | |
3508 | msgstr "生成 diff 失败" | |
3509 | ||
3510 | #: range-diff.c:421 range-diff.c:423 | |
3511 | #, c-format | |
3512 | msgid "could not parse log for '%s'" | |
3513 | msgstr "不能解析 '%s' 的日志" | |
3514 | ||
3515 | #: read-cache.c:1579 | |
5b04ee3b JX |
3516 | #, c-format |
3517 | msgid "" | |
a0b6b246 JX |
3518 | "index.version set, but the value is invalid.\n" |
3519 | "Using version %i" | |
5b04ee3b | 3520 | msgstr "" |
a0b6b246 JX |
3521 | "设置了 index.version,但是取值无效。\n" |
3522 | "使用版本 %i" | |
5b04ee3b | 3523 | |
c1ac5258 | 3524 | #: read-cache.c:1589 |
5b04ee3b JX |
3525 | #, c-format |
3526 | msgid "" | |
a0b6b246 JX |
3527 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
3528 | "Using version %i" | |
5b04ee3b | 3529 | msgstr "" |
a0b6b246 JX |
3530 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
3531 | "使用版本 %i" | |
5b04ee3b | 3532 | |
c1ac5258 | 3533 | #: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 |
a4f16749 JX |
3534 | #, c-format |
3535 | msgid "could not close '%s'" | |
3536 | msgstr "不能关闭 '%s'" | |
3537 | ||
c1ac5258 | 3538 | #: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 |
87cb7997 | 3539 | #, c-format |
60638e98 | 3540 | msgid "could not stat '%s'" |
65e2041e | 3541 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 3542 | |
c1ac5258 | 3543 | #: read-cache.c:2666 |
87cb7997 JX |
3544 | #, c-format |
3545 | msgid "unable to open git dir: %s" | |
3546 | msgstr "不能打开 git 目录:%s" | |
3547 | ||
c1ac5258 | 3548 | #: read-cache.c:2678 |
87cb7997 JX |
3549 | #, c-format |
3550 | msgid "unable to unlink: %s" | |
3551 | msgstr "无法删除:%s" | |
3552 | ||
c1ac5258 JX |
3553 | #: refs.c:192 |
3554 | #, c-format | |
3555 | msgid "%s does not point to a valid object!" | |
3556 | msgstr "%s 没有指向一个有效的对象!" | |
3557 | ||
3558 | #: refs.c:579 | |
3559 | #, c-format | |
3560 | msgid "ignoring dangling symref %s" | |
3561 | msgstr "忽略摇摆符号引用 %s" | |
3562 | ||
3563 | #: refs.c:581 ref-filter.c:2067 | |
3564 | #, c-format | |
3565 | msgid "ignoring broken ref %s" | |
3566 | msgstr "忽略损坏的引用 %s" | |
3567 | ||
3568 | #: refs.c:685 | |
3569 | #, c-format | |
3570 | msgid "could not open '%s' for writing: %s" | |
3571 | msgstr "无法为写入打开 '%s':%s" | |
3572 | ||
3573 | #: refs.c:695 refs.c:746 | |
3574 | #, c-format | |
3575 | msgid "could not read ref '%s'" | |
3576 | msgstr "无法读取引用 '%s'" | |
3577 | ||
3578 | #: refs.c:701 | |
3579 | #, c-format | |
3580 | msgid "ref '%s' already exists" | |
3581 | msgstr "引用 '%s' 已经存在" | |
3582 | ||
3583 | #: refs.c:706 | |
3584 | #, c-format | |
3585 | msgid "unexpected object ID when writing '%s'" | |
3586 | msgstr "写入 '%s' 时意外的对象 ID" | |
3587 | ||
3588 | #: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 | |
3589 | #: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 | |
3590 | #: wrapper.c:656 | |
3591 | #, c-format | |
3592 | msgid "could not write to '%s'" | |
3593 | msgstr "不能写入 '%s'" | |
3594 | ||
3595 | #: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 | |
3596 | #: builtin/am.c:780 | |
5b04ee3b | 3597 | #, c-format |
fd8cb379 | 3598 | msgid "could not open '%s' for writing" |
a0b6b246 | 3599 | msgstr "无法打开 '%s' 进行写入" |
5b04ee3b | 3600 | |
c1ac5258 JX |
3601 | #: refs.c:748 |
3602 | #, c-format | |
3603 | msgid "unexpected object ID when deleting '%s'" | |
3604 | msgstr "删除 '%s' 时意外的对象 ID" | |
3605 | ||
3606 | #: refs.c:879 | |
3607 | #, c-format | |
3608 | msgid "log for ref %s has gap after %s" | |
3609 | msgstr "引用 %s 的日志在 %s 之后有缺口" | |
3610 | ||
3611 | #: refs.c:885 | |
3612 | #, c-format | |
3613 | msgid "log for ref %s unexpectedly ended on %s" | |
3614 | msgstr "引用 %s 的日志意外终止于 %s " | |
3615 | ||
3616 | #: refs.c:943 | |
3617 | #, c-format | |
3618 | msgid "log for %s is empty" | |
3619 | msgstr "%s 的日志为空" | |
3620 | ||
3621 | #: refs.c:1035 | |
3622 | #, c-format | |
3623 | msgid "refusing to update ref with bad name '%s'" | |
3624 | msgstr "拒绝更新有错误名称 '%s' 的引用" | |
3625 | ||
3626 | #: refs.c:1111 | |
3627 | #, c-format | |
3628 | msgid "update_ref failed for ref '%s': %s" | |
3629 | msgstr "对引用 '%s' 执行 update_ref 失败:%s" | |
3630 | ||
3631 | #: refs.c:1853 | |
3632 | #, c-format | |
3633 | msgid "multiple updates for ref '%s' not allowed" | |
3634 | msgstr "不允许对引用 '%s' 多次更新" | |
3635 | ||
3636 | #: refs.c:1885 | |
60638e98 JX |
3637 | msgid "ref updates forbidden inside quarantine environment" |
3638 | msgstr "在隔离环境中禁止更新引用" | |
3639 | ||
c1ac5258 JX |
3640 | #: refs.c:1981 refs.c:2011 |
3641 | #, c-format | |
3642 | msgid "'%s' exists; cannot create '%s'" | |
3643 | msgstr "'%s' 已存在,无法创建 '%s'" | |
3644 | ||
3645 | #: refs.c:1987 refs.c:2022 | |
3646 | #, c-format | |
3647 | msgid "cannot process '%s' and '%s' at the same time" | |
3648 | msgstr "无法同时处理 '%s' 和 '%s'" | |
3649 | ||
fd8cb379 | 3650 | #: refs/files-backend.c:1191 |
6937cb4e JX |
3651 | #, c-format |
3652 | msgid "could not remove reference %s" | |
3653 | msgstr "无法删除引用 %s" | |
3654 | ||
c1ac5258 JX |
3655 | #: refs/files-backend.c:1205 refs/packed-backend.c:1532 |
3656 | #: refs/packed-backend.c:1542 | |
5b04ee3b | 3657 | #, c-format |
a0b6b246 JX |
3658 | msgid "could not delete reference %s: %s" |
3659 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 3660 | |
c1ac5258 | 3661 | #: refs/files-backend.c:1208 refs/packed-backend.c:1545 |
5b04ee3b | 3662 | #, c-format |
a0b6b246 JX |
3663 | msgid "could not delete references: %s" |
3664 | msgstr "无法删除引用:%s" | |
5b04ee3b | 3665 | |
c1ac5258 JX |
3666 | #: refspec.c:137 |
3667 | #, c-format | |
3668 | msgid "invalid refspec '%s'" | |
3669 | msgstr "无效的引用表达式:'%s'" | |
3670 | ||
3671 | #: ref-filter.c:38 wt-status.c:1850 | |
87cb7997 JX |
3672 | msgid "gone" |
3673 | msgstr "丢失" | |
3674 | ||
c1ac5258 | 3675 | #: ref-filter.c:39 |
87cb7997 JX |
3676 | #, c-format |
3677 | msgid "ahead %d" | |
3678 | msgstr "领先 %d" | |
3679 | ||
c1ac5258 | 3680 | #: ref-filter.c:40 |
87cb7997 JX |
3681 | #, c-format |
3682 | msgid "behind %d" | |
3683 | msgstr "落后 %d" | |
3684 | ||
c1ac5258 | 3685 | #: ref-filter.c:41 |
87cb7997 JX |
3686 | #, c-format |
3687 | msgid "ahead %d, behind %d" | |
3688 | msgstr "领先 %d,落后 %d" | |
3689 | ||
c1ac5258 | 3690 | #: ref-filter.c:137 |
5b04ee3b | 3691 | #, c-format |
a0b6b246 | 3692 | msgid "expected format: %%(color:<color>)" |
58b6f078 | 3693 | msgstr "期望的格式:%%(color:<颜色>)" |
5b04ee3b | 3694 | |
c1ac5258 | 3695 | #: ref-filter.c:139 |
5b04ee3b | 3696 | #, c-format |
a0b6b246 JX |
3697 | msgid "unrecognized color: %%(color:%s)" |
3698 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 3699 | |
c1ac5258 | 3700 | #: ref-filter.c:161 |
a0b6b246 | 3701 | #, c-format |
87cb7997 JX |
3702 | msgid "Integer value expected refname:lstrip=%s" |
3703 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 3704 | |
c1ac5258 | 3705 | #: ref-filter.c:165 |
87cb7997 JX |
3706 | #, c-format |
3707 | msgid "Integer value expected refname:rstrip=%s" | |
3708 | msgstr "期望整数值 refname:rstrip=%s" | |
3709 | ||
c1ac5258 | 3710 | #: ref-filter.c:167 |
87cb7997 JX |
3711 | #, c-format |
3712 | msgid "unrecognized %%(%s) argument: %s" | |
3713 | msgstr "未能识别的 %%(%s) 参数:%s" | |
3714 | ||
c1ac5258 JX |
3715 | #: ref-filter.c:222 |
3716 | #, c-format | |
3717 | msgid "%%(objecttype) does not take arguments" | |
3718 | msgstr "%%(objecttype) 不带参数" | |
3719 | ||
3720 | #: ref-filter.c:234 | |
3721 | #, c-format | |
3722 | msgid "%%(objectsize) does not take arguments" | |
3723 | msgstr "%%(objectsize) 不带参数" | |
3724 | ||
3725 | #: ref-filter.c:246 | |
90314792 | 3726 | #, c-format |
a0b6b246 JX |
3727 | msgid "%%(body) does not take arguments" |
3728 | msgstr "%%(body) 不带参数" | |
90314792 | 3729 | |
c1ac5258 | 3730 | #: ref-filter.c:255 |
a0b6b246 JX |
3731 | #, c-format |
3732 | msgid "%%(subject) does not take arguments" | |
3733 | msgstr "%%(subject) 不带参数" | |
90314792 | 3734 | |
c1ac5258 | 3735 | #: ref-filter.c:275 |
1a79b2f1 | 3736 | #, c-format |
6937cb4e JX |
3737 | msgid "unknown %%(trailers) argument: %s" |
3738 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 3739 | |
c1ac5258 | 3740 | #: ref-filter.c:304 |
a0b6b246 JX |
3741 | #, c-format |
3742 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 3743 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 3744 | |
c1ac5258 | 3745 | #: ref-filter.c:306 |
a0b6b246 JX |
3746 | #, c-format |
3747 | msgid "unrecognized %%(contents) argument: %s" | |
3748 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 3749 | |
c1ac5258 | 3750 | #: ref-filter.c:321 |
87cb7997 JX |
3751 | #, c-format |
3752 | msgid "positive value expected objectname:short=%s" | |
3753 | msgstr "期望一个正数 objectname:short=%s" | |
3754 | ||
c1ac5258 | 3755 | #: ref-filter.c:325 |
a0b6b246 JX |
3756 | #, c-format |
3757 | msgid "unrecognized %%(objectname) argument: %s" | |
3758 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 3759 | |
c1ac5258 | 3760 | #: ref-filter.c:355 |
a0b6b246 JX |
3761 | #, c-format |
3762 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 3763 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 3764 | |
c1ac5258 | 3765 | #: ref-filter.c:367 |
5c57d762 | 3766 | #, c-format |
a0b6b246 JX |
3767 | msgid "unrecognized position:%s" |
3768 | msgstr "未能识别的位置:%s" | |
5c57d762 | 3769 | |
c1ac5258 | 3770 | #: ref-filter.c:374 |
1b7f4a34 | 3771 | #, c-format |
a0b6b246 JX |
3772 | msgid "unrecognized width:%s" |
3773 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 3774 | |
c1ac5258 | 3775 | #: ref-filter.c:383 |
1b7f4a34 | 3776 | #, c-format |
a0b6b246 JX |
3777 | msgid "unrecognized %%(align) argument: %s" |
3778 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 3779 | |
c1ac5258 | 3780 | #: ref-filter.c:391 |
1b7f4a34 | 3781 | #, c-format |
a0b6b246 JX |
3782 | msgid "positive width expected with the %%(align) atom" |
3783 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 3784 | |
c1ac5258 | 3785 | #: ref-filter.c:409 |
87cb7997 JX |
3786 | #, c-format |
3787 | msgid "unrecognized %%(if) argument: %s" | |
3788 | msgstr "未能识别的 %%(if) 参数:%s" | |
3789 | ||
c1ac5258 | 3790 | #: ref-filter.c:505 |
07432cef | 3791 | #, c-format |
a0b6b246 | 3792 | msgid "malformed field name: %.*s" |
fd8cb379 | 3793 | msgstr "格式错误的字段名:%.*s" |
ef317cd5 | 3794 | |
c1ac5258 | 3795 | #: ref-filter.c:532 |
a0b6b246 JX |
3796 | #, c-format |
3797 | msgid "unknown field name: %.*s" | |
3798 | msgstr "未知的字段名:%.*s" | |
220c313c | 3799 | |
c1ac5258 | 3800 | #: ref-filter.c:656 |
87cb7997 JX |
3801 | #, c-format |
3802 | msgid "format: %%(if) atom used without a %%(then) atom" | |
3803 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
3804 | ||
c1ac5258 | 3805 | #: ref-filter.c:719 |
87cb7997 JX |
3806 | #, c-format |
3807 | msgid "format: %%(then) atom used without an %%(if) atom" | |
3808 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
3809 | ||
c1ac5258 | 3810 | #: ref-filter.c:721 |
87cb7997 JX |
3811 | #, c-format |
3812 | msgid "format: %%(then) atom used more than once" | |
3813 | msgstr "格式:%%(then) 元素用了多次" | |
3814 | ||
c1ac5258 | 3815 | #: ref-filter.c:723 |
87cb7997 JX |
3816 | #, c-format |
3817 | msgid "format: %%(then) atom used after %%(else)" | |
3818 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
3819 | ||
c1ac5258 | 3820 | #: ref-filter.c:751 |
87cb7997 JX |
3821 | #, c-format |
3822 | msgid "format: %%(else) atom used without an %%(if) atom" | |
3823 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
3824 | ||
c1ac5258 | 3825 | #: ref-filter.c:753 |
87cb7997 JX |
3826 | #, c-format |
3827 | msgid "format: %%(else) atom used without a %%(then) atom" | |
3828 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
3829 | ||
c1ac5258 | 3830 | #: ref-filter.c:755 |
87cb7997 JX |
3831 | #, c-format |
3832 | msgid "format: %%(else) atom used more than once" | |
3833 | msgstr "格式:%%(else) 元素用了多次" | |
3834 | ||
c1ac5258 | 3835 | #: ref-filter.c:770 |
7aea43ff | 3836 | #, c-format |
a0b6b246 JX |
3837 | msgid "format: %%(end) atom used without corresponding atom" |
3838 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 3839 | |
c1ac5258 | 3840 | #: ref-filter.c:827 |
7aea43ff | 3841 | #, c-format |
a0b6b246 | 3842 | msgid "malformed format string %s" |
fd8cb379 | 3843 | msgstr "错误的格式化字符串 %s" |
7aea43ff | 3844 | |
c1ac5258 | 3845 | #: ref-filter.c:1416 |
87cb7997 JX |
3846 | #, c-format |
3847 | msgid "(no branch, rebasing %s)" | |
3848 | msgstr "(非分支,正变基 %s)" | |
3849 | ||
c1ac5258 | 3850 | #: ref-filter.c:1419 |
fd8cb379 JX |
3851 | #, c-format |
3852 | msgid "(no branch, rebasing detached HEAD %s)" | |
3853 | msgstr "(非分支,正变基分离头指针 %s)" | |
3854 | ||
c1ac5258 | 3855 | #: ref-filter.c:1422 |
87cb7997 JX |
3856 | #, c-format |
3857 | msgid "(no branch, bisect started on %s)" | |
3858 | msgstr "(非分支,二分查找开始于 %s)" | |
c04f5ac3 | 3859 | |
a4f16749 JX |
3860 | #. TRANSLATORS: make sure this matches "HEAD |
3861 | #. detached at " in wt-status.c | |
3862 | #. | |
c1ac5258 | 3863 | #: ref-filter.c:1430 |
c04f5ac3 | 3864 | #, c-format |
87cb7997 JX |
3865 | msgid "(HEAD detached at %s)" |
3866 | msgstr "(头指针分离于 %s)" | |
c04f5ac3 | 3867 | |
a4f16749 JX |
3868 | #. TRANSLATORS: make sure this matches "HEAD |
3869 | #. detached from " in wt-status.c | |
3870 | #. | |
c1ac5258 | 3871 | #: ref-filter.c:1437 |
a0b6b246 | 3872 | #, c-format |
87cb7997 JX |
3873 | msgid "(HEAD detached from %s)" |
3874 | msgstr "(头指针分离自 %s)" | |
6792b93b | 3875 | |
c1ac5258 | 3876 | #: ref-filter.c:1441 |
87cb7997 JX |
3877 | msgid "(no branch)" |
3878 | msgstr "(非分支)" | |
3879 | ||
c1ac5258 | 3880 | #: ref-filter.c:1475 ref-filter.c:1623 |
a0b6b246 JX |
3881 | #, c-format |
3882 | msgid "missing object %s for %s" | |
3883 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 3884 | |
c1ac5258 | 3885 | #: ref-filter.c:1483 |
a0b6b246 JX |
3886 | #, c-format |
3887 | msgid "parse_object_buffer failed on %s for %s" | |
3888 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 3889 | |
c1ac5258 | 3890 | #: ref-filter.c:1980 |
a0b6b246 JX |
3891 | #, c-format |
3892 | msgid "malformed object at '%s'" | |
fd8cb379 | 3893 | msgstr "格式错误的对象 '%s'" |
c04f5ac3 | 3894 | |
c1ac5258 | 3895 | #: ref-filter.c:2062 |
a0b6b246 JX |
3896 | #, c-format |
3897 | msgid "ignoring ref with broken name %s" | |
3898 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 3899 | |
c1ac5258 | 3900 | #: ref-filter.c:2340 |
a0b6b246 JX |
3901 | #, c-format |
3902 | msgid "format: %%(end) atom missing" | |
3903 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 3904 | |
c1ac5258 | 3905 | #: ref-filter.c:2444 |
a0b6b246 JX |
3906 | #, c-format |
3907 | msgid "malformed object name %s" | |
fd8cb379 | 3908 | msgstr "格式错误的对象名 %s" |
c04f5ac3 | 3909 | |
c1ac5258 | 3910 | #: remote.c:606 |
a0b6b246 JX |
3911 | #, c-format |
3912 | msgid "Cannot fetch both %s and %s to %s" | |
3913 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 3914 | |
c1ac5258 | 3915 | #: remote.c:610 |
c04f5ac3 | 3916 | #, c-format |
a0b6b246 JX |
3917 | msgid "%s usually tracks %s, not %s" |
3918 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 3919 | |
c1ac5258 | 3920 | #: remote.c:614 |
a0b6b246 JX |
3921 | #, c-format |
3922 | msgid "%s tracks both %s and %s" | |
3923 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 3924 | |
c1ac5258 | 3925 | #: remote.c:622 |
a0b6b246 JX |
3926 | msgid "Internal error" |
3927 | msgstr "内部错误" | |
c04f5ac3 | 3928 | |
c1ac5258 | 3929 | #: remote.c:1536 remote.c:1637 |
a0b6b246 JX |
3930 | msgid "HEAD does not point to a branch" |
3931 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 3932 | |
c1ac5258 | 3933 | #: remote.c:1545 |
a0b6b246 JX |
3934 | #, c-format |
3935 | msgid "no such branch: '%s'" | |
3936 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 3937 | |
c1ac5258 | 3938 | #: remote.c:1548 |
a0b6b246 JX |
3939 | #, c-format |
3940 | msgid "no upstream configured for branch '%s'" | |
3941 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 3942 | |
c1ac5258 | 3943 | #: remote.c:1554 |
a0b6b246 JX |
3944 | #, c-format |
3945 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
3946 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 3947 | |
c1ac5258 | 3948 | #: remote.c:1569 |
a0b6b246 JX |
3949 | #, c-format |
3950 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
3951 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 3952 | |
c1ac5258 | 3953 | #: remote.c:1581 |
a0b6b246 JX |
3954 | #, c-format |
3955 | msgid "branch '%s' has no remote for pushing" | |
3956 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 3957 | |
c1ac5258 | 3958 | #: remote.c:1591 |
a0b6b246 JX |
3959 | #, c-format |
3960 | msgid "push refspecs for '%s' do not include '%s'" | |
3961 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 3962 | |
c1ac5258 | 3963 | #: remote.c:1604 |
a0b6b246 JX |
3964 | msgid "push has no destination (push.default is 'nothing')" |
3965 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 3966 | |
c1ac5258 | 3967 | #: remote.c:1626 |
a0b6b246 JX |
3968 | msgid "cannot resolve 'simple' push to a single destination" |
3969 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 3970 | |
c1ac5258 | 3971 | #: remote.c:1951 |
a0b6b246 JX |
3972 | #, c-format |
3973 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
3974 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 3975 | |
c1ac5258 | 3976 | #: remote.c:1955 |
a0b6b246 JX |
3977 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
3978 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 3979 | |
c1ac5258 | 3980 | #: remote.c:1958 |
a0b6b246 | 3981 | #, c-format |
6937cb4e | 3982 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 3983 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 3984 | |
c1ac5258 | 3985 | #: remote.c:1962 |
31e5e17b JX |
3986 | #, c-format |
3987 | msgid "Your branch and '%s' refer to different commits.\n" | |
3988 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
3989 | ||
c1ac5258 | 3990 | #: remote.c:1965 |
31e5e17b JX |
3991 | #, c-format |
3992 | msgid " (use \"%s\" for details)\n" | |
3993 | msgstr " (使用 \"%s\" 查看详情)\n" | |
3994 | ||
c1ac5258 | 3995 | #: remote.c:1969 |
a0b6b246 JX |
3996 | #, c-format |
3997 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
3998 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
3999 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
4000 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 4001 | |
c1ac5258 | 4002 | #: remote.c:1975 |
a0b6b246 JX |
4003 | msgid " (use \"git push\" to publish your local commits)\n" |
4004 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 4005 | |
c1ac5258 | 4006 | #: remote.c:1978 |
a0b6b246 JX |
4007 | #, c-format |
4008 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
4009 | msgid_plural "" | |
4010 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
4011 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
4012 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 4013 | |
a0b6b246 | 4014 | # 译者:注意保持前导空格 |
c1ac5258 | 4015 | #: remote.c:1986 |
a0b6b246 JX |
4016 | msgid " (use \"git pull\" to update your local branch)\n" |
4017 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 4018 | |
c1ac5258 | 4019 | #: remote.c:1989 |
a0b6b246 JX |
4020 | #, c-format |
4021 | msgid "" | |
4022 | "Your branch and '%s' have diverged,\n" | |
4023 | "and have %d and %d different commit each, respectively.\n" | |
4024 | msgid_plural "" | |
4025 | "Your branch and '%s' have diverged,\n" | |
4026 | "and have %d and %d different commits each, respectively.\n" | |
4027 | msgstr[0] "" | |
4028 | "您的分支和 '%s' 出现了偏离,\n" | |
4029 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
4030 | msgstr[1] "" | |
4031 | "您的分支和 '%s' 出现了偏离,\n" | |
4032 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 4033 | |
a0b6b246 | 4034 | # 译者:注意保持前导空格 |
c1ac5258 | 4035 | #: remote.c:1999 |
a0b6b246 JX |
4036 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
4037 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 4038 | |
c1ac5258 JX |
4039 | #: replace-object.c:20 |
4040 | #, c-format | |
4041 | msgid "bad replace ref name: %s" | |
4042 | msgstr "错误的替换引用名称:%s" | |
4043 | ||
4044 | #: replace-object.c:29 | |
4045 | #, c-format | |
4046 | msgid "duplicate replace ref: %s" | |
4047 | msgstr "重复的替换引用:%s" | |
4048 | ||
4049 | #: replace-object.c:72 | |
4050 | #, c-format | |
4051 | msgid "replace depth too high for object %s" | |
4052 | msgstr "对象 %s 的替换层级太深" | |
4053 | ||
4054 | #: revision.c:2305 | |
a0b6b246 JX |
4055 | msgid "your current branch appears to be broken" |
4056 | msgstr "您的当前分支好像被损坏" | |
cfff71a9 | 4057 | |
c1ac5258 | 4058 | #: revision.c:2308 |
a0b6b246 JX |
4059 | #, c-format |
4060 | msgid "your current branch '%s' does not have any commits yet" | |
4061 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6792b93b | 4062 | |
c1ac5258 | 4063 | #: revision.c:2505 |
a0b6b246 JX |
4064 | msgid "--first-parent is incompatible with --bisect" |
4065 | msgstr "--first-parent 与 --bisect 不兼容" | |
6792b93b | 4066 | |
fd8cb379 | 4067 | #: run-command.c:728 |
a0b6b246 JX |
4068 | msgid "open /dev/null failed" |
4069 | msgstr "不能打开 /dev/null" | |
5c57d762 | 4070 | |
fd8cb379 | 4071 | #: run-command.c:1271 |
5809aa05 JX |
4072 | #, c-format |
4073 | msgid "" | |
4074 | "The '%s' hook was ignored because it's not set as executable.\n" | |
4075 | "You can disable this warning with `git config advice.ignoredHook false`." | |
4076 | msgstr "" | |
4077 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
4078 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
4079 | ||
c1ac5258 | 4080 | #: send-pack.c:142 |
31e5e17b JX |
4081 | msgid "unexpected flush packet while reading remote unpack status" |
4082 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
4083 | ||
c1ac5258 | 4084 | #: send-pack.c:144 |
87cb7997 JX |
4085 | #, c-format |
4086 | msgid "unable to parse remote unpack status: %s" | |
4087 | msgstr "不能解析远程解包状态:%s" | |
4088 | ||
c1ac5258 | 4089 | #: send-pack.c:146 |
87cb7997 JX |
4090 | #, c-format |
4091 | msgid "remote unpack failed: %s" | |
4092 | msgstr "远程解包失败:%s" | |
4093 | ||
c1ac5258 | 4094 | #: send-pack.c:309 |
a0b6b246 | 4095 | msgid "failed to sign the push certificate" |
c1ac5258 | 4096 | msgstr "为推送证书签名失败" |
6792b93b | 4097 | |
c1ac5258 | 4098 | #: send-pack.c:422 |
a0b6b246 JX |
4099 | msgid "the receiving end does not support --signed push" |
4100 | msgstr "接收端不支持签名推送" | |
6792b93b | 4101 | |
c1ac5258 | 4102 | #: send-pack.c:424 |
a0b6b246 JX |
4103 | msgid "" |
4104 | "not sending a push certificate since the receiving end does not support --" | |
4105 | "signed push" | |
4106 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 4107 | |
c1ac5258 | 4108 | #: send-pack.c:436 |
a0b6b246 JX |
4109 | msgid "the receiving end does not support --atomic push" |
4110 | msgstr "接收端不支持原子推送" | |
6792b93b | 4111 | |
c1ac5258 | 4112 | #: send-pack.c:441 |
a0b6b246 JX |
4113 | msgid "the receiving end does not support push options" |
4114 | msgstr "接收端不支持推送选项" | |
6792b93b | 4115 | |
c1ac5258 | 4116 | #: sequencer.c:177 |
31e5e17b JX |
4117 | #, c-format |
4118 | msgid "invalid commit message cleanup mode '%s'" | |
4119 | msgstr "无效的提交信息清理模式 '%s'" | |
4120 | ||
c1ac5258 | 4121 | #: sequencer.c:278 |
fd8cb379 JX |
4122 | #, c-format |
4123 | msgid "could not delete '%s'" | |
4124 | msgstr "无法删除 '%s'" | |
4125 | ||
c1ac5258 | 4126 | #: sequencer.c:304 |
a0b6b246 JX |
4127 | msgid "revert" |
4128 | msgstr "还原" | |
6792b93b | 4129 | |
c1ac5258 | 4130 | #: sequencer.c:306 |
a0b6b246 JX |
4131 | msgid "cherry-pick" |
4132 | msgstr "拣选" | |
4133 | ||
c1ac5258 | 4134 | #: sequencer.c:308 |
1a79b2f1 JX |
4135 | msgid "rebase -i" |
4136 | msgstr "rebase -i" | |
4137 | ||
c1ac5258 | 4138 | #: sequencer.c:310 |
1a79b2f1 | 4139 | #, c-format |
c1ac5258 | 4140 | msgid "unknown action: %d" |
1a79b2f1 JX |
4141 | msgstr "未知动作:%d" |
4142 | ||
c1ac5258 | 4143 | #: sequencer.c:367 |
a0b6b246 JX |
4144 | msgid "" |
4145 | "after resolving the conflicts, mark the corrected paths\n" | |
4146 | "with 'git add <paths>' or 'git rm <paths>'" | |
4147 | msgstr "" | |
4148 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
4149 | "命令标记修正后的文件" | |
4150 | ||
c1ac5258 | 4151 | #: sequencer.c:370 |
a0b6b246 JX |
4152 | msgid "" |
4153 | "after resolving the conflicts, mark the corrected paths\n" | |
4154 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
4155 | "and commit the result with 'git commit'" | |
4156 | msgstr "" | |
4157 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
4158 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 4159 | |
c1ac5258 | 4160 | #: sequencer.c:383 sequencer.c:2488 |
1b7f4a34 | 4161 | #, c-format |
a0b6b246 JX |
4162 | msgid "could not lock '%s'" |
4163 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 4164 | |
c1ac5258 | 4165 | #: sequencer.c:390 |
a0b6b246 | 4166 | #, c-format |
72351d7d | 4167 | msgid "could not write eol to '%s'" |
a0b6b246 | 4168 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 4169 | |
c1ac5258 JX |
4170 | #: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 |
4171 | #: sequencer.c:2741 | |
1b7f4a34 | 4172 | #, c-format |
31e5e17b JX |
4173 | msgid "failed to finalize '%s'" |
4174 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 4175 | |
c1ac5258 JX |
4176 | #: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 |
4177 | #: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 | |
4178 | #: builtin/merge.c:1081 | |
a0b6b246 JX |
4179 | #, c-format |
4180 | msgid "could not read '%s'" | |
4181 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 4182 | |
c1ac5258 | 4183 | #: sequencer.c:444 |
63af42fe | 4184 | #, c-format |
a0b6b246 JX |
4185 | msgid "your local changes would be overwritten by %s." |
4186 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 4187 | |
c1ac5258 | 4188 | #: sequencer.c:448 |
a0b6b246 | 4189 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 4190 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 4191 | |
c1ac5258 | 4192 | #: sequencer.c:477 |
a0b6b246 JX |
4193 | #, c-format |
4194 | msgid "%s: fast-forward" | |
4195 | msgstr "%s:快进" | |
6792b93b | 4196 | |
1a79b2f1 | 4197 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
a4f16749 | 4198 | #. "rebase -i". |
1a79b2f1 | 4199 | #. |
c1ac5258 | 4200 | #: sequencer.c:566 |
a0b6b246 JX |
4201 | #, c-format |
4202 | msgid "%s: Unable to write new index file" | |
4203 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 4204 | |
c1ac5258 | 4205 | #: sequencer.c:582 |
5809aa05 JX |
4206 | msgid "unable to update cache tree" |
4207 | msgstr "不能更新缓存树" | |
6792b93b | 4208 | |
c1ac5258 | 4209 | #: sequencer.c:595 |
fd8cb379 JX |
4210 | msgid "could not resolve HEAD commit" |
4211 | msgstr "不能解析 HEAD 提交" | |
4212 | ||
c1ac5258 JX |
4213 | #: sequencer.c:723 sequencer.c:740 |
4214 | #, c-format | |
4215 | msgid "could not parse '%s' (looking for '%s')" | |
4216 | msgstr "不能解析 '%s'(查找 '%s')" | |
4217 | ||
4218 | #: sequencer.c:731 | |
4219 | #, c-format | |
4220 | msgid "bad quoting on %s value in '%s'" | |
4221 | msgstr "'%2$s' 中的值 %1$s 有错误引用" | |
4222 | ||
4223 | #: sequencer.c:747 | |
4224 | #, c-format | |
4225 | msgid "invalid date format '%s' in '%s'" | |
4226 | msgstr "'%2$s' 中无效的日期格式 '%1$s'" | |
4227 | ||
4228 | #: sequencer.c:761 | |
63af42fe JX |
4229 | #, c-format |
4230 | msgid "" | |
a0b6b246 JX |
4231 | "you have staged changes in your working tree\n" |
4232 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
4233 | "\n" | |
4234 | " git commit --amend %s\n" | |
4235 | "\n" | |
4236 | "If they are meant to go into a new commit, run:\n" | |
4237 | "\n" | |
4238 | " git commit %s\n" | |
4239 | "\n" | |
4240 | "In both cases, once you're done, continue with:\n" | |
4241 | "\n" | |
4242 | " git rebase --continue\n" | |
4243 | msgstr "" | |
1a79b2f1 JX |
4244 | "您的工作区中存在已暂存的修改\n" |
4245 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
4246 | "\n" |
4247 | " git commit --amend %s\n" | |
4248 | "\n" | |
29004bbb | 4249 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
4250 | "\n" |
4251 | " git commit %s\n" | |
4252 | "\n" | |
4253 | "无论哪种情况,当您完成提交,继续执行:\n" | |
4254 | "\n" | |
4255 | " git rebase --continue\n" | |
6792b93b | 4256 | |
c1ac5258 | 4257 | #: sequencer.c:830 |
fd8cb379 JX |
4258 | msgid "writing root commit" |
4259 | msgstr "写根提交" | |
4260 | ||
c1ac5258 | 4261 | #: sequencer.c:1055 |
31e5e17b JX |
4262 | msgid "'prepare-commit-msg' hook failed" |
4263 | msgstr "'prepare-commit-msg' 钩子失败" | |
4264 | ||
c1ac5258 | 4265 | #: sequencer.c:1062 |
31e5e17b JX |
4266 | msgid "" |
4267 | "Your name and email address were configured automatically based\n" | |
4268 | "on your username and hostname. Please check that they are accurate.\n" | |
4269 | "You can suppress this message by setting them explicitly. Run the\n" | |
4270 | "following command and follow the instructions in your editor to edit\n" | |
4271 | "your configuration file:\n" | |
4272 | "\n" | |
4273 | " git config --global --edit\n" | |
4274 | "\n" | |
4275 | "After doing this, you may fix the identity used for this commit with:\n" | |
4276 | "\n" | |
4277 | " git commit --amend --reset-author\n" | |
4278 | msgstr "" | |
4279 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4280 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
4281 | "中编辑您的配置文件:\n" | |
4282 | "\n" | |
4283 | " git config --global --edit\n" | |
4284 | "\n" | |
4285 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4286 | "\n" | |
4287 | " git commit --amend --reset-author\n" | |
4288 | ||
c1ac5258 | 4289 | #: sequencer.c:1075 |
31e5e17b JX |
4290 | msgid "" |
4291 | "Your name and email address were configured automatically based\n" | |
4292 | "on your username and hostname. Please check that they are accurate.\n" | |
4293 | "You can suppress this message by setting them explicitly:\n" | |
4294 | "\n" | |
4295 | " git config --global user.name \"Your Name\"\n" | |
4296 | " git config --global user.email you@example.com\n" | |
4297 | "\n" | |
4298 | "After doing this, you may fix the identity used for this commit with:\n" | |
4299 | "\n" | |
4300 | " git commit --amend --reset-author\n" | |
4301 | msgstr "" | |
4302 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4303 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
4304 | "\n" | |
4305 | " git config --global user.name \"Your Name\"\n" | |
4306 | " git config --global user.email you@example.com\n" | |
4307 | "\n" | |
4308 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4309 | "\n" | |
4310 | " git commit --amend --reset-author\n" | |
4311 | ||
c1ac5258 | 4312 | #: sequencer.c:1115 |
31e5e17b JX |
4313 | msgid "couldn't look up newly created commit" |
4314 | msgstr "无法找到新创建的提交" | |
4315 | ||
c1ac5258 | 4316 | #: sequencer.c:1117 |
31e5e17b JX |
4317 | msgid "could not parse newly created commit" |
4318 | msgstr "不能解析新创建的提交" | |
4319 | ||
c1ac5258 | 4320 | #: sequencer.c:1163 |
31e5e17b JX |
4321 | msgid "unable to resolve HEAD after creating commit" |
4322 | msgstr "创建提交后,不能解析 HEAD" | |
4323 | ||
c1ac5258 | 4324 | #: sequencer.c:1165 |
31e5e17b JX |
4325 | msgid "detached HEAD" |
4326 | msgstr "分离头指针" | |
4327 | ||
4328 | # 译者:中文字符串拼接,可删除前导空格 | |
c1ac5258 | 4329 | #: sequencer.c:1169 |
31e5e17b JX |
4330 | msgid " (root-commit)" |
4331 | msgstr "(根提交)" | |
4332 | ||
c1ac5258 | 4333 | #: sequencer.c:1190 |
31e5e17b JX |
4334 | msgid "could not parse HEAD" |
4335 | msgstr "不能解析 HEAD" | |
4336 | ||
c1ac5258 | 4337 | #: sequencer.c:1192 |
31e5e17b JX |
4338 | #, c-format |
4339 | msgid "HEAD %s is not a commit!" | |
4340 | msgstr "HEAD %s 不是一个提交!" | |
4341 | ||
c1ac5258 | 4342 | #: sequencer.c:1196 builtin/commit.c:1528 |
31e5e17b JX |
4343 | msgid "could not parse HEAD commit" |
4344 | msgstr "不能解析 HEAD 提交" | |
4345 | ||
c1ac5258 | 4346 | #: sequencer.c:1247 sequencer.c:1845 |
31e5e17b JX |
4347 | msgid "unable to parse commit author" |
4348 | msgstr "不能解析提交作者" | |
4349 | ||
c1ac5258 | 4350 | #: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 |
31e5e17b JX |
4351 | msgid "git write-tree failed to write a tree" |
4352 | msgstr "git write-tree 无法写入树对象" | |
4353 | ||
c1ac5258 | 4354 | #: sequencer.c:1274 sequencer.c:1329 |
31e5e17b JX |
4355 | #, c-format |
4356 | msgid "unable to read commit message from '%s'" | |
4357 | msgstr "不能从 '%s' 读取提交说明" | |
4358 | ||
c1ac5258 JX |
4359 | #: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 |
4360 | #: builtin/merge.c:880 | |
31e5e17b | 4361 | msgid "failed to write commit object" |
c1ac5258 | 4362 | msgstr "写提交对象失败" |
31e5e17b | 4363 | |
c1ac5258 | 4364 | #: sequencer.c:1356 |
a0b6b246 | 4365 | #, c-format |
5809aa05 JX |
4366 | msgid "could not parse commit %s" |
4367 | msgstr "不能解析提交 %s" | |
6792b93b | 4368 | |
c1ac5258 | 4369 | #: sequencer.c:1361 |
63af42fe | 4370 | #, c-format |
5809aa05 JX |
4371 | msgid "could not parse parent commit %s" |
4372 | msgstr "不能解析父提交 %s" | |
63af42fe | 4373 | |
c1ac5258 JX |
4374 | #: sequencer.c:1457 sequencer.c:1565 |
4375 | #, c-format | |
4376 | msgid "unknown command: %d" | |
4377 | msgstr "未知命令:%d" | |
4378 | ||
4379 | #: sequencer.c:1512 sequencer.c:1537 | |
1a79b2f1 JX |
4380 | #, c-format |
4381 | msgid "This is a combination of %d commits." | |
4382 | msgstr "这是一个 %d 个提交的组合。" | |
4383 | ||
c1ac5258 | 4384 | #: sequencer.c:1522 sequencer.c:4520 |
1a79b2f1 JX |
4385 | msgid "need a HEAD to fixup" |
4386 | msgstr "需要一个 HEAD 来修复" | |
4387 | ||
c1ac5258 | 4388 | #: sequencer.c:1524 sequencer.c:2768 |
1a79b2f1 JX |
4389 | msgid "could not read HEAD" |
4390 | msgstr "不能读取 HEAD" | |
4391 | ||
c1ac5258 | 4392 | #: sequencer.c:1526 |
1a79b2f1 JX |
4393 | msgid "could not read HEAD's commit message" |
4394 | msgstr "不能读取 HEAD 的提交说明" | |
4395 | ||
c1ac5258 | 4396 | #: sequencer.c:1532 |
1a79b2f1 JX |
4397 | #, c-format |
4398 | msgid "cannot write '%s'" | |
4399 | msgstr "不能写 '%s'" | |
4400 | ||
c1ac5258 | 4401 | #: sequencer.c:1539 git-rebase--preserve-merges.sh:441 |
1a79b2f1 JX |
4402 | msgid "This is the 1st commit message:" |
4403 | msgstr "这是第一个提交说明:" | |
4404 | ||
c1ac5258 | 4405 | #: sequencer.c:1547 |
1a79b2f1 JX |
4406 | #, c-format |
4407 | msgid "could not read commit message of %s" | |
4408 | msgstr "不能读取 %s 的提交说明" | |
4409 | ||
c1ac5258 | 4410 | #: sequencer.c:1554 |
1a79b2f1 JX |
4411 | #, c-format |
4412 | msgid "This is the commit message #%d:" | |
4413 | msgstr "这是提交说明 #%d:" | |
4414 | ||
c1ac5258 | 4415 | #: sequencer.c:1560 |
1a79b2f1 JX |
4416 | #, c-format |
4417 | msgid "The commit message #%d will be skipped:" | |
4418 | msgstr "提交说明 #%d 将被跳过:" | |
4419 | ||
c1ac5258 | 4420 | #: sequencer.c:1643 |
a0b6b246 JX |
4421 | msgid "your index file is unmerged." |
4422 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 4423 | |
c1ac5258 | 4424 | #: sequencer.c:1650 |
fd8cb379 JX |
4425 | msgid "cannot fixup root commit" |
4426 | msgstr "不能修复根提交" | |
4427 | ||
c1ac5258 | 4428 | #: sequencer.c:1669 |
a0b6b246 JX |
4429 | #, c-format |
4430 | msgid "commit %s is a merge but no -m option was given." | |
4431 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 4432 | |
c1ac5258 | 4433 | #: sequencer.c:1677 |
a0b6b246 JX |
4434 | #, c-format |
4435 | msgid "commit %s does not have parent %d" | |
4436 | msgstr "提交 %s 没有第 %d 个父提交" | |
4437 | ||
c1ac5258 | 4438 | #: sequencer.c:1681 |
a0b6b246 JX |
4439 | #, c-format |
4440 | msgid "mainline was specified but commit %s is not a merge." | |
4441 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
4442 | ||
c1ac5258 | 4443 | #: sequencer.c:1687 |
1a79b2f1 JX |
4444 | #, c-format |
4445 | msgid "cannot get commit message for %s" | |
4446 | msgstr "不能得到 %s 的提交说明" | |
4447 | ||
a0b6b246 JX |
4448 | #. TRANSLATORS: The first %s will be a "todo" command like |
4449 | #. "revert" or "pick", the second %s a SHA1. | |
c1ac5258 | 4450 | #: sequencer.c:1706 |
a0b6b246 JX |
4451 | #, c-format |
4452 | msgid "%s: cannot parse parent commit %s" | |
4453 | msgstr "%s:不能解析父提交 %s" | |
4454 | ||
c1ac5258 | 4455 | #: sequencer.c:1771 |
a0b6b246 | 4456 | #, c-format |
1a79b2f1 JX |
4457 | msgid "could not rename '%s' to '%s'" |
4458 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 4459 | |
c1ac5258 | 4460 | #: sequencer.c:1826 |
a0b6b246 JX |
4461 | #, c-format |
4462 | msgid "could not revert %s... %s" | |
4463 | msgstr "不能还原 %s... %s" | |
4464 | ||
c1ac5258 | 4465 | #: sequencer.c:1827 |
a0b6b246 JX |
4466 | #, c-format |
4467 | msgid "could not apply %s... %s" | |
4468 | msgstr "不能应用 %s... %s" | |
4469 | ||
c1ac5258 | 4470 | #: sequencer.c:1885 |
a0b6b246 JX |
4471 | #, c-format |
4472 | msgid "git %s: failed to read the index" | |
4473 | msgstr "git %s:无法读取索引" | |
4474 | ||
c1ac5258 | 4475 | #: sequencer.c:1892 |
a0b6b246 JX |
4476 | #, c-format |
4477 | msgid "git %s: failed to refresh the index" | |
4478 | msgstr "git %s:无法刷新索引" | |
4479 | ||
c1ac5258 | 4480 | #: sequencer.c:1972 |
5809aa05 JX |
4481 | #, c-format |
4482 | msgid "%s does not accept arguments: '%s'" | |
4483 | msgstr "%s 不接受参数:'%s'" | |
4484 | ||
c1ac5258 | 4485 | #: sequencer.c:1981 |
5809aa05 JX |
4486 | #, c-format |
4487 | msgid "missing arguments for %s" | |
4488 | msgstr "缺少 %s 的参数" | |
4489 | ||
c1ac5258 | 4490 | #: sequencer.c:2040 |
a0b6b246 JX |
4491 | #, c-format |
4492 | msgid "invalid line %d: %.*s" | |
4493 | msgstr "无效行 %d:%.*s" | |
4494 | ||
c1ac5258 | 4495 | #: sequencer.c:2048 |
1a79b2f1 JX |
4496 | #, c-format |
4497 | msgid "cannot '%s' without a previous commit" | |
4498 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 4499 | |
c1ac5258 | 4500 | #: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 |
a0b6b246 JX |
4501 | #, c-format |
4502 | msgid "could not read '%s'." | |
4503 | msgstr "不能读取 '%s'。" | |
4504 | ||
c1ac5258 | 4505 | #: sequencer.c:2119 |
1a79b2f1 JX |
4506 | msgid "please fix this using 'git rebase --edit-todo'." |
4507 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
4508 | ||
c1ac5258 | 4509 | #: sequencer.c:2121 |
a0b6b246 JX |
4510 | #, c-format |
4511 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 4512 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 4513 | |
c1ac5258 | 4514 | #: sequencer.c:2126 |
1a79b2f1 JX |
4515 | msgid "no commits parsed." |
4516 | msgstr "没有解析提交。" | |
4517 | ||
c1ac5258 | 4518 | #: sequencer.c:2137 |
a0b6b246 JX |
4519 | msgid "cannot cherry-pick during a revert." |
4520 | msgstr "不能在回退中执行拣选。" | |
4521 | ||
c1ac5258 | 4522 | #: sequencer.c:2139 |
a0b6b246 JX |
4523 | msgid "cannot revert during a cherry-pick." |
4524 | msgstr "不能在拣选中执行回退。" | |
4525 | ||
c1ac5258 | 4526 | #: sequencer.c:2209 |
a0b6b246 JX |
4527 | #, c-format |
4528 | msgid "invalid value for %s: %s" | |
4529 | msgstr "%s 的值无效:%s" | |
4530 | ||
c1ac5258 | 4531 | #: sequencer.c:2285 |
fd8cb379 JX |
4532 | msgid "unusable squash-onto" |
4533 | msgstr "不可用的 squash-onto" | |
4534 | ||
c1ac5258 | 4535 | #: sequencer.c:2301 |
a0b6b246 JX |
4536 | #, c-format |
4537 | msgid "malformed options sheet: '%s'" | |
fd8cb379 | 4538 | msgstr "格式错误的选项清单:'%s'" |
a0b6b246 | 4539 | |
c1ac5258 JX |
4540 | #: sequencer.c:2335 sequencer.c:3775 |
4541 | msgid "empty commit set passed" | |
4542 | msgstr "提供了空的提交集" | |
4543 | ||
4544 | #: sequencer.c:2343 | |
a0b6b246 JX |
4545 | msgid "a cherry-pick or revert is already in progress" |
4546 | msgstr "一个拣选或还原操作已在进行" | |
4547 | ||
c1ac5258 | 4548 | #: sequencer.c:2344 |
a0b6b246 JX |
4549 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
4550 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
4551 | ||
c1ac5258 | 4552 | #: sequencer.c:2347 |
a0b6b246 JX |
4553 | #, c-format |
4554 | msgid "could not create sequencer directory '%s'" | |
4555 | msgstr "不能创建序列目录 '%s'" | |
4556 | ||
c1ac5258 | 4557 | #: sequencer.c:2361 |
a0b6b246 JX |
4558 | msgid "could not lock HEAD" |
4559 | msgstr "不能锁定 HEAD" | |
4560 | ||
c1ac5258 | 4561 | #: sequencer.c:2416 sequencer.c:3543 |
a0b6b246 JX |
4562 | msgid "no cherry-pick or revert in progress" |
4563 | msgstr "拣选或还原操作并未进行" | |
4564 | ||
c1ac5258 | 4565 | #: sequencer.c:2418 |
a0b6b246 JX |
4566 | msgid "cannot resolve HEAD" |
4567 | msgstr "不能解析 HEAD" | |
4568 | ||
c1ac5258 | 4569 | #: sequencer.c:2420 sequencer.c:2455 |
a0b6b246 JX |
4570 | msgid "cannot abort from a branch yet to be born" |
4571 | msgstr "不能从尚未建立的分支终止" | |
4572 | ||
c1ac5258 | 4573 | #: sequencer.c:2441 builtin/grep.c:721 |
a0b6b246 JX |
4574 | #, c-format |
4575 | msgid "cannot open '%s'" | |
4576 | msgstr "不能打开 '%s'" | |
4577 | ||
c1ac5258 | 4578 | #: sequencer.c:2443 |
a0b6b246 JX |
4579 | #, c-format |
4580 | msgid "cannot read '%s': %s" | |
4581 | msgstr "不能读取 '%s':%s" | |
4582 | ||
c1ac5258 | 4583 | #: sequencer.c:2444 |
a0b6b246 JX |
4584 | msgid "unexpected end of file" |
4585 | msgstr "意外的文件结束" | |
4586 | ||
c1ac5258 | 4587 | #: sequencer.c:2450 |
a0b6b246 JX |
4588 | #, c-format |
4589 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
4590 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
4591 | ||
c1ac5258 | 4592 | #: sequencer.c:2461 |
1a79b2f1 JX |
4593 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
4594 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
4595 | ||
c1ac5258 | 4596 | #: sequencer.c:2565 sequencer.c:3461 |
31e5e17b JX |
4597 | #, c-format |
4598 | msgid "could not update %s" | |
4599 | msgstr "不能更新 %s" | |
4600 | ||
c1ac5258 | 4601 | #: sequencer.c:2603 sequencer.c:3441 |
1a79b2f1 JX |
4602 | msgid "cannot read HEAD" |
4603 | msgstr "不能读取 HEAD" | |
4604 | ||
c1ac5258 JX |
4605 | #: sequencer.c:2618 |
4606 | #, c-format | |
4607 | msgid "unable to copy '%s' to '%s'" | |
4608 | msgstr "无法拷贝 '%s' 至 '%s'" | |
4609 | ||
4610 | #: sequencer.c:2626 | |
4611 | #, c-format | |
4612 | msgid "" | |
4613 | "You can amend the commit now, with\n" | |
4614 | "\n" | |
4615 | " git commit --amend %s\n" | |
4616 | "\n" | |
4617 | "Once you are satisfied with your changes, run\n" | |
4618 | "\n" | |
4619 | " git rebase --continue\n" | |
4620 | msgstr "" | |
4621 | "您现在可以修补这个提交,使用\n" | |
4622 | "\n" | |
4623 | " git commit --amend %s\n" | |
4624 | "\n" | |
4625 | "当您对变更感到满意,执行\n" | |
4626 | "\n" | |
4627 | " git rebase --continue\n" | |
4628 | ||
4629 | #: sequencer.c:2636 | |
4630 | #, c-format | |
4631 | msgid "Could not apply %s... %.*s" | |
4632 | msgstr "不能应用 %s... %.*s" | |
4633 | ||
4634 | #: sequencer.c:2643 | |
4635 | #, c-format | |
4636 | msgid "Could not merge %.*s" | |
4637 | msgstr "不能合并 %.*s" | |
4638 | ||
4639 | #: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 | |
1a79b2f1 JX |
4640 | #, c-format |
4641 | msgid "could not copy '%s' to '%s'" | |
4642 | msgstr "不能拷贝 '%s' 至 '%s'" | |
4643 | ||
c1ac5258 | 4644 | #: sequencer.c:2680 sequencer.c:3095 |
1a79b2f1 JX |
4645 | msgid "could not read index" |
4646 | msgstr "不能读取索引" | |
4647 | ||
4648 | # 译者:注意保持前导空格 | |
c1ac5258 | 4649 | #: sequencer.c:2685 |
1a79b2f1 JX |
4650 | #, c-format |
4651 | msgid "" | |
4652 | "execution failed: %s\n" | |
4653 | "%sYou can fix the problem, and then run\n" | |
4654 | "\n" | |
4655 | " git rebase --continue\n" | |
4656 | "\n" | |
4657 | msgstr "" | |
4658 | "执行失败:%s\n" | |
4659 | "%s您可以改正该问题,然后运行\n" | |
4660 | "\n" | |
4661 | " git rebase --continue\n" | |
4662 | "\n" | |
4663 | ||
c1ac5258 | 4664 | #: sequencer.c:2691 |
1a79b2f1 JX |
4665 | msgid "and made changes to the index and/or the working tree\n" |
4666 | msgstr "并且修改索引和/或工作区\n" | |
4667 | ||
c1ac5258 | 4668 | #: sequencer.c:2697 |
1a79b2f1 JX |
4669 | #, c-format |
4670 | msgid "" | |
4671 | "execution succeeded: %s\n" | |
4672 | "but left changes to the index and/or the working tree\n" | |
4673 | "Commit or stash your changes, and then run\n" | |
4674 | "\n" | |
4675 | " git rebase --continue\n" | |
4676 | "\n" | |
4677 | msgstr "" | |
4678 | "执行成功:%s\n" | |
4679 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 4680 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
4681 | "\n" |
4682 | " git rebase --continue\n" | |
4683 | "\n" | |
4684 | ||
c1ac5258 JX |
4685 | #: sequencer.c:2758 |
4686 | #, c-format | |
4687 | msgid "illegal label name: '%.*s'" | |
4688 | msgstr "非法的标签名称:'%.*s'" | |
4689 | ||
4690 | #: sequencer.c:2810 | |
fd8cb379 JX |
4691 | msgid "writing fake root commit" |
4692 | msgstr "写伪根提交" | |
4693 | ||
c1ac5258 | 4694 | #: sequencer.c:2815 |
fd8cb379 JX |
4695 | msgid "writing squash-onto" |
4696 | msgstr "写入 squash-onto" | |
4697 | ||
c1ac5258 | 4698 | #: sequencer.c:2850 |
fd8cb379 JX |
4699 | #, c-format |
4700 | msgid "failed to find tree of %s" | |
4701 | msgstr "无法找到 %s 指向的树。" | |
4702 | ||
c1ac5258 | 4703 | #: sequencer.c:2868 |
fd8cb379 JX |
4704 | msgid "could not write index" |
4705 | msgstr "不能写入索引" | |
4706 | ||
c1ac5258 JX |
4707 | #: sequencer.c:2895 |
4708 | #, c-format | |
4709 | msgid "could not resolve '%s'" | |
4710 | msgstr "无法解析 '%s'" | |
4711 | ||
4712 | #: sequencer.c:2921 | |
fd8cb379 JX |
4713 | msgid "cannot merge without a current revision" |
4714 | msgstr "没有当前版本不能合并" | |
4715 | ||
c1ac5258 | 4716 | #: sequencer.c:2943 |
fd8cb379 | 4717 | #, c-format |
c1ac5258 JX |
4718 | msgid "unable to parse '%.*s'" |
4719 | msgstr "无法解析 '%.*s'" | |
4720 | ||
4721 | #: sequencer.c:2952 | |
4722 | #, c-format | |
4723 | msgid "nothing to merge: '%.*s'" | |
4724 | msgstr "无可用合并:'%.*s'" | |
4725 | ||
4726 | #: sequencer.c:2964 | |
4727 | msgid "octopus merge cannot be executed on top of a [new root]" | |
4728 | msgstr "章鱼合并不能在一个新的根提交上执行" | |
fd8cb379 | 4729 | |
c1ac5258 | 4730 | #: sequencer.c:2979 |
fd8cb379 JX |
4731 | #, c-format |
4732 | msgid "could not get commit message of '%s'" | |
4733 | msgstr "不能获取 '%s' 的提交说明" | |
4734 | ||
c1ac5258 | 4735 | #: sequencer.c:2989 sequencer.c:3015 |
fd8cb379 JX |
4736 | #, c-format |
4737 | msgid "could not write '%s'" | |
4738 | msgstr "不能写入 '%s'" | |
4739 | ||
c1ac5258 | 4740 | #: sequencer.c:3127 |
fd8cb379 JX |
4741 | #, c-format |
4742 | msgid "could not even attempt to merge '%.*s'" | |
4743 | msgstr "甚至不能尝试合并 '%.*s'" | |
4744 | ||
c1ac5258 | 4745 | #: sequencer.c:3143 |
fd8cb379 JX |
4746 | msgid "merge: Unable to write new index file" |
4747 | msgstr "合并:无法写入新索引文件" | |
4748 | ||
c1ac5258 | 4749 | #: sequencer.c:3211 |
1a79b2f1 | 4750 | #, c-format |
a4f16749 JX |
4751 | msgid "Applied autostash.\n" |
4752 | msgstr "已应用 autostash。\n" | |
1a79b2f1 | 4753 | |
c1ac5258 | 4754 | #: sequencer.c:3223 |
1a79b2f1 JX |
4755 | #, c-format |
4756 | msgid "cannot store %s" | |
4757 | msgstr "不能存储 %s" | |
4758 | ||
c1ac5258 | 4759 | #: sequencer.c:3226 git-rebase.sh:188 |
1a79b2f1 JX |
4760 | #, c-format |
4761 | msgid "" | |
4762 | "Applying autostash resulted in conflicts.\n" | |
4763 | "Your changes are safe in the stash.\n" | |
4764 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
4765 | msgstr "" | |
4766 | "应用 autostash 导致冲突。\n" | |
a4f16749 | 4767 | "您的修改安全地保存在贮藏区中。\n" |
1a79b2f1 JX |
4768 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
4769 | ||
c1ac5258 | 4770 | #: sequencer.c:3257 |
fd8cb379 JX |
4771 | #, c-format |
4772 | msgid "" | |
4773 | "Could not execute the todo command\n" | |
4774 | "\n" | |
4775 | " %.*s\n" | |
4776 | "It has been rescheduled; To edit the command before continuing, please\n" | |
4777 | "edit the todo list first:\n" | |
4778 | "\n" | |
4779 | " git rebase --edit-todo\n" | |
4780 | " git rebase --continue\n" | |
4781 | msgstr "" | |
4782 | "无法执行待办命令\n" | |
4783 | "\n" | |
4784 | " %.*s\n" | |
4785 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
4786 | "\n" | |
4787 | " git rebase --edit-todo\n" | |
4788 | " git rebase --continue\n" | |
4789 | ||
c1ac5258 | 4790 | #: sequencer.c:3325 |
1a79b2f1 | 4791 | #, c-format |
87cb7997 JX |
4792 | msgid "Stopped at %s... %.*s\n" |
4793 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 4794 | |
c1ac5258 | 4795 | #: sequencer.c:3404 |
1a79b2f1 JX |
4796 | #, c-format |
4797 | msgid "unknown command %d" | |
4798 | msgstr "未知命令 %d" | |
4799 | ||
c1ac5258 | 4800 | #: sequencer.c:3449 |
1a79b2f1 JX |
4801 | msgid "could not read orig-head" |
4802 | msgstr "不能读取 orig-head" | |
4803 | ||
c1ac5258 | 4804 | #: sequencer.c:3454 sequencer.c:4517 |
1a79b2f1 JX |
4805 | msgid "could not read 'onto'" |
4806 | msgstr "不能读取 'onto'" | |
4807 | ||
c1ac5258 | 4808 | #: sequencer.c:3468 |
1a79b2f1 JX |
4809 | #, c-format |
4810 | msgid "could not update HEAD to %s" | |
4811 | msgstr "不能更新 HEAD 为 %s" | |
4812 | ||
c1ac5258 | 4813 | #: sequencer.c:3554 |
1a79b2f1 JX |
4814 | msgid "cannot rebase: You have unstaged changes." |
4815 | msgstr "不能变基:您有未暂存的变更。" | |
4816 | ||
c1ac5258 | 4817 | #: sequencer.c:3563 |
1a79b2f1 JX |
4818 | msgid "cannot amend non-existing commit" |
4819 | msgstr "不能修补不存在的提交" | |
4820 | ||
c1ac5258 | 4821 | #: sequencer.c:3565 |
1a79b2f1 JX |
4822 | #, c-format |
4823 | msgid "invalid file: '%s'" | |
4824 | msgstr "无效文件:'%s'" | |
4825 | ||
c1ac5258 | 4826 | #: sequencer.c:3567 |
1a79b2f1 JX |
4827 | #, c-format |
4828 | msgid "invalid contents: '%s'" | |
4829 | msgstr "无效内容:'%s'" | |
4830 | ||
c1ac5258 | 4831 | #: sequencer.c:3570 |
1a79b2f1 JX |
4832 | msgid "" |
4833 | "\n" | |
4834 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
4835 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
4836 | msgstr "" |
4837 | "\n" | |
4838 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 4839 | |
c1ac5258 | 4840 | #: sequencer.c:3595 sequencer.c:3633 |
fd8cb379 JX |
4841 | #, c-format |
4842 | msgid "could not write file: '%s'" | |
4843 | msgstr "不能写入文件:'%s'" | |
4844 | ||
c1ac5258 | 4845 | #: sequencer.c:3648 |
fd8cb379 JX |
4846 | msgid "could not remove CHERRY_PICK_HEAD" |
4847 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
4848 | ||
c1ac5258 | 4849 | #: sequencer.c:3655 |
1a79b2f1 JX |
4850 | msgid "could not commit staged changes." |
4851 | msgstr "不能提交暂存的修改。" | |
4852 | ||
c1ac5258 | 4853 | #: sequencer.c:3752 |
a0b6b246 JX |
4854 | #, c-format |
4855 | msgid "%s: can't cherry-pick a %s" | |
4856 | msgstr "%s:不能拣选一个%s" | |
4857 | ||
c1ac5258 | 4858 | #: sequencer.c:3756 |
a0b6b246 JX |
4859 | #, c-format |
4860 | msgid "%s: bad revision" | |
4861 | msgstr "%s:错误的版本" | |
4862 | ||
c1ac5258 | 4863 | #: sequencer.c:3791 |
a0b6b246 JX |
4864 | msgid "can't revert as initial commit" |
4865 | msgstr "不能作为初始提交回退" | |
4866 | ||
c1ac5258 | 4867 | #: sequencer.c:4238 |
6937cb4e JX |
4868 | msgid "make_script: unhandled options" |
4869 | msgstr "make_script:有未能处理的选项" | |
4870 | ||
c1ac5258 | 4871 | #: sequencer.c:4241 |
6937cb4e JX |
4872 | msgid "make_script: error preparing revisions" |
4873 | msgstr "make_script:准备版本时错误" | |
4874 | ||
c1ac5258 | 4875 | #: sequencer.c:4281 sequencer.c:4337 |
6937cb4e JX |
4876 | #, c-format |
4877 | msgid "unusable todo list: '%s'" | |
4878 | msgstr "不可用的待办列表:'%s'" | |
4879 | ||
c1ac5258 | 4880 | #: sequencer.c:4396 |
6937cb4e JX |
4881 | #, c-format |
4882 | msgid "" | |
4883 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
4884 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
4885 | ||
c1ac5258 | 4886 | #: sequencer.c:4466 |
6937cb4e JX |
4887 | #, c-format |
4888 | msgid "" | |
4889 | "Warning: some commits may have been dropped accidentally.\n" | |
4890 | "Dropped commits (newer to older):\n" | |
4891 | msgstr "" | |
4892 | "警告:一些提交可能被意外丢弃。\n" | |
4893 | "丢弃的提交(从新到旧):\n" | |
4894 | ||
c1ac5258 | 4895 | #: sequencer.c:4473 |
6937cb4e JX |
4896 | #, c-format |
4897 | msgid "" | |
4898 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
4899 | "\n" | |
4900 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
4901 | "warnings.\n" | |
4902 | "The possible behaviours are: ignore, warn, error.\n" | |
4903 | "\n" | |
4904 | msgstr "" | |
4905 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
4906 | "\n" | |
4907 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
4908 | "可选值有:ignore、warn、error。\n" | |
4909 | "\n" | |
4910 | ||
c1ac5258 | 4911 | #: sequencer.c:4486 |
6937cb4e JX |
4912 | #, c-format |
4913 | msgid "" | |
4914 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
4915 | "continue'.\n" | |
4916 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
4917 | msgstr "" | |
4918 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
4919 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
4920 | ||
c1ac5258 | 4921 | #: sequencer.c:4660 |
6937cb4e JX |
4922 | msgid "the script was already rearranged." |
4923 | msgstr "脚本已经重新编排。" | |
4924 | ||
fd8cb379 | 4925 | #: setup.c:123 |
31e5e17b JX |
4926 | #, c-format |
4927 | msgid "'%s' is outside repository" | |
4928 | msgstr "'%s' 在仓库之外" | |
4929 | ||
fd8cb379 | 4930 | #: setup.c:172 |
a0b6b246 | 4931 | #, c-format |
6792b93b | 4932 | msgid "" |
a0b6b246 JX |
4933 | "%s: no such path in the working tree.\n" |
4934 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
4935 | msgstr "" | |
4936 | "%s:工作区中无此路径。\n" | |
58b6f078 | 4937 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 4938 | |
fd8cb379 | 4939 | #: setup.c:185 |
90314792 | 4940 | #, c-format |
a0b6b246 JX |
4941 | msgid "" |
4942 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
4943 | "Use '--' to separate paths from revisions, like this:\n" | |
4944 | "'git <command> [<revision>...] -- [<file>...]'" | |
4945 | msgstr "" | |
4946 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
4947 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 4948 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 4949 | |
fd8cb379 | 4950 | #: setup.c:234 |
31e5e17b JX |
4951 | #, c-format |
4952 | msgid "option '%s' must come before non-option arguments" | |
4953 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
4954 | ||
fd8cb379 | 4955 | #: setup.c:253 |
a0b6b246 JX |
4956 | #, c-format |
4957 | msgid "" | |
4958 | "ambiguous argument '%s': both revision and filename\n" | |
4959 | "Use '--' to separate paths from revisions, like this:\n" | |
4960 | "'git <command> [<revision>...] -- [<file>...]'" | |
4961 | msgstr "" | |
4962 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
4963 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 4964 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 4965 | |
fd8cb379 | 4966 | #: setup.c:389 |
31e5e17b JX |
4967 | msgid "unable to set up work tree using invalid config" |
4968 | msgstr "无法使用无效配置来创建工作区" | |
4969 | ||
fd8cb379 | 4970 | #: setup.c:393 |
31e5e17b | 4971 | msgid "this operation must be run in a work tree" |
610f8099 | 4972 | msgstr "该操作必须在一个工作区中运行" |
31e5e17b | 4973 | |
fd8cb379 | 4974 | #: setup.c:503 |
a0b6b246 JX |
4975 | #, c-format |
4976 | msgid "Expected git repo version <= %d, found %d" | |
4977 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 4978 | |
fd8cb379 | 4979 | #: setup.c:511 |
a0b6b246 JX |
4980 | msgid "unknown repository extensions found:" |
4981 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 4982 | |
fd8cb379 | 4983 | #: setup.c:530 |
1003b3a5 | 4984 | #, c-format |
31e5e17b | 4985 | msgid "error opening '%s'" |
c1ac5258 | 4986 | msgstr "打开 '%s' 出错" |
1003b3a5 | 4987 | |
fd8cb379 | 4988 | #: setup.c:532 |
31e5e17b JX |
4989 | #, c-format |
4990 | msgid "too large to be a .git file: '%s'" | |
610f8099 | 4991 | msgstr "文件太大,无法作为 .git 文件:'%s'" |
31e5e17b | 4992 | |
fd8cb379 | 4993 | #: setup.c:534 |
31e5e17b JX |
4994 | #, c-format |
4995 | msgid "error reading %s" | |
c1ac5258 | 4996 | msgstr "读取 %s 出错" |
31e5e17b | 4997 | |
fd8cb379 | 4998 | #: setup.c:536 |
31e5e17b JX |
4999 | #, c-format |
5000 | msgid "invalid gitfile format: %s" | |
5001 | msgstr "无效的 gitfile 格式:%s" | |
5002 | ||
fd8cb379 | 5003 | #: setup.c:538 |
31e5e17b JX |
5004 | #, c-format |
5005 | msgid "no path in gitfile: %s" | |
5006 | msgstr "在 gitfile 中没有路径:%s" | |
5007 | ||
fd8cb379 | 5008 | #: setup.c:540 |
31e5e17b JX |
5009 | #, c-format |
5010 | msgid "not a git repository: %s" | |
5011 | msgstr "不是一个 git 仓库:%s" | |
5012 | ||
fd8cb379 | 5013 | #: setup.c:639 |
31e5e17b JX |
5014 | #, c-format |
5015 | msgid "'$%s' too big" | |
5016 | msgstr "'$%s' 太大" | |
5017 | ||
fd8cb379 | 5018 | #: setup.c:653 |
31e5e17b JX |
5019 | #, c-format |
5020 | msgid "not a git repository: '%s'" | |
5021 | msgstr "不是一个 git 仓库:'%s'" | |
5022 | ||
fd8cb379 | 5023 | #: setup.c:682 setup.c:684 setup.c:715 |
31e5e17b JX |
5024 | #, c-format |
5025 | msgid "cannot chdir to '%s'" | |
5026 | msgstr "不能切换目录到 '%s'" | |
5027 | ||
fd8cb379 | 5028 | #: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 |
31e5e17b | 5029 | msgid "cannot come back to cwd" |
a0b6b246 | 5030 | msgstr "无法返回当前工作目录" |
1003b3a5 | 5031 | |
fd8cb379 | 5032 | #: setup.c:813 |
31e5e17b JX |
5033 | #, c-format |
5034 | msgid "not a git repository (or any of the parent directories): %s" | |
5035 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
5036 | ||
fd8cb379 | 5037 | #: setup.c:824 |
31e5e17b JX |
5038 | #, c-format |
5039 | msgid "failed to stat '%*s%s%s'" | |
c1ac5258 | 5040 | msgstr "获取 '%*s%s%s' 状态(stat)失败" |
31e5e17b | 5041 | |
fd8cb379 | 5042 | #: setup.c:1054 |
a0b6b246 JX |
5043 | msgid "Unable to read current working directory" |
5044 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 5045 | |
fd8cb379 | 5046 | #: setup.c:1066 setup.c:1072 |
87cb7997 | 5047 | #, c-format |
31e5e17b | 5048 | msgid "cannot change to '%s'" |
87cb7997 JX |
5049 | msgstr "不能切换到 '%s'" |
5050 | ||
fd8cb379 | 5051 | #: setup.c:1085 |
a0b6b246 JX |
5052 | #, c-format |
5053 | msgid "" | |
31e5e17b | 5054 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
5055 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
5056 | msgstr "" | |
31e5e17b | 5057 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 5058 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 5059 | |
fd8cb379 | 5060 | #: setup.c:1168 |
a0b6b246 JX |
5061 | #, c-format |
5062 | msgid "" | |
31e5e17b | 5063 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
5064 | "The owner of files must always have read and write permissions." |
5065 | msgstr "" | |
31e5e17b | 5066 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 5067 | "文件属主必须始终拥有读写权限。" |
6792b93b | 5068 | |
fd8cb379 | 5069 | #: setup.c:1211 |
31e5e17b JX |
5070 | msgid "open /dev/null or dup failed" |
5071 | msgstr "不能打开或者复制 /dev/null" | |
5072 | ||
fd8cb379 | 5073 | #: setup.c:1226 |
31e5e17b JX |
5074 | msgid "fork failed" |
5075 | msgstr "fork 失败" | |
5076 | ||
fd8cb379 | 5077 | #: setup.c:1231 |
31e5e17b JX |
5078 | msgid "setsid failed" |
5079 | msgstr "setsid 失败" | |
5080 | ||
c1ac5258 JX |
5081 | #: sha1-file.c:381 |
5082 | #, c-format | |
5083 | msgid "object directory %s does not exist; check .git/objects/info/alternates" | |
5084 | msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" | |
5085 | ||
5086 | #: sha1-file.c:432 | |
5087 | #, c-format | |
5088 | msgid "unable to normalize alternate object path: %s" | |
5089 | msgstr "无法规范化备用对象路径:%s" | |
5090 | ||
5091 | #: sha1-file.c:503 | |
5092 | #, c-format | |
5093 | msgid "%s: ignoring alternate object stores, nesting too deep" | |
5094 | msgstr "%s:忽略备用对象库,嵌套太深" | |
5095 | ||
5096 | #: sha1-file.c:510 | |
5097 | #, c-format | |
5098 | msgid "unable to normalize object directory: %s" | |
5099 | msgstr "无法规范化对象目录: %s" | |
5100 | ||
5101 | #: sha1-file.c:565 | |
5102 | msgid "unable to fdopen alternates lockfile" | |
5103 | msgstr "无法 fdopen 替换锁文件" | |
5104 | ||
5105 | #: sha1-file.c:583 | |
5106 | msgid "unable to read alternates file" | |
5107 | msgstr "无法读取替代文件" | |
5108 | ||
5109 | #: sha1-file.c:590 | |
5110 | msgid "unable to move new alternates file into place" | |
5111 | msgstr "无法将新的替代文件移动到位" | |
5112 | ||
fd8cb379 | 5113 | #: sha1-file.c:625 |
a0b6b246 JX |
5114 | #, c-format |
5115 | msgid "path '%s' does not exist" | |
5116 | msgstr "路径 '%s' 不存在" | |
5117 | ||
fd8cb379 | 5118 | #: sha1-file.c:651 |
a0b6b246 JX |
5119 | #, c-format |
5120 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
5121 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
5122 | ||
fd8cb379 | 5123 | #: sha1-file.c:657 |
a0b6b246 JX |
5124 | #, c-format |
5125 | msgid "reference repository '%s' is not a local repository." | |
5126 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
5127 | ||
fd8cb379 | 5128 | #: sha1-file.c:663 |
a0b6b246 JX |
5129 | #, c-format |
5130 | msgid "reference repository '%s' is shallow" | |
5131 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
5132 | ||
fd8cb379 | 5133 | #: sha1-file.c:671 |
a0b6b246 JX |
5134 | #, c-format |
5135 | msgid "reference repository '%s' is grafted" | |
fd8cb379 | 5136 | msgstr "参考仓库 '%s' 已被移植" |
a0b6b246 | 5137 | |
c1ac5258 JX |
5138 | #: sha1-file.c:781 |
5139 | #, c-format | |
5140 | msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" | |
5141 | msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" | |
5142 | ||
5143 | #: sha1-file.c:806 | |
5144 | msgid "mmap failed" | |
5145 | msgstr "mmap 失败" | |
5146 | ||
5147 | #: sha1-file.c:973 | |
5148 | #, c-format | |
5149 | msgid "object file %s is empty" | |
5150 | msgstr "对象文件 %s 为空" | |
5151 | ||
5152 | #: sha1-file.c:1093 sha1-file.c:2206 | |
5153 | #, c-format | |
5154 | msgid "corrupt loose object '%s'" | |
5155 | msgstr "损坏的松散对象 '%s'" | |
5156 | ||
5157 | #: sha1-file.c:1095 sha1-file.c:2210 | |
5158 | #, c-format | |
5159 | msgid "garbage at end of loose object '%s'" | |
5160 | msgstr "松散对象 '%s' 后面有垃圾数据" | |
5161 | ||
5162 | #: sha1-file.c:1137 | |
5163 | msgid "invalid object type" | |
5164 | msgstr "无效的对象类型" | |
5165 | ||
5166 | #: sha1-file.c:1219 | |
5167 | #, c-format | |
5168 | msgid "unable to unpack %s header with --allow-unknown-type" | |
5169 | msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" | |
5170 | ||
5171 | #: sha1-file.c:1222 | |
5172 | #, c-format | |
5173 | msgid "unable to unpack %s header" | |
5174 | msgstr "无法解开 %s 头部" | |
5175 | ||
5176 | #: sha1-file.c:1228 | |
5177 | #, c-format | |
5178 | msgid "unable to parse %s header with --allow-unknown-type" | |
5179 | msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" | |
5180 | ||
5181 | #: sha1-file.c:1231 | |
5182 | #, c-format | |
5183 | msgid "unable to parse %s header" | |
5184 | msgstr "无法解析 %s 头部" | |
5185 | ||
5186 | #: sha1-file.c:1422 | |
5187 | #, c-format | |
5188 | msgid "failed to read object %s" | |
5189 | msgstr "读取对象 %s 失败" | |
5190 | ||
5191 | #: sha1-file.c:1426 | |
5192 | #, c-format | |
5193 | msgid "replacement %s not found for %s" | |
5194 | msgstr "找不到 %2$s 的替代 %1$s" | |
5195 | ||
5196 | #: sha1-file.c:1430 | |
5197 | #, c-format | |
5198 | msgid "loose object %s (stored in %s) is corrupt" | |
5199 | msgstr "松散对象 %s(保存在 %s)已损坏" | |
5200 | ||
5201 | #: sha1-file.c:1434 | |
5202 | #, c-format | |
5203 | msgid "packed object %s (stored in %s) is corrupt" | |
5204 | msgstr "打包对象 %s(保存在 %s)已损坏" | |
5205 | ||
5206 | #: sha1-file.c:1536 | |
5207 | #, c-format | |
5208 | msgid "unable to write sha1 filename %s" | |
5209 | msgstr "无法写入 sha1 文件名 %s" | |
5210 | ||
5211 | #: sha1-file.c:1543 | |
5212 | #, c-format | |
5213 | msgid "unable to set permission to '%s'" | |
5214 | msgstr "无法为 '%s' 设置权限" | |
5215 | ||
5216 | #: sha1-file.c:1550 | |
5217 | msgid "file write error" | |
5218 | msgstr "文件写错误" | |
5219 | ||
5220 | #: sha1-file.c:1569 | |
5221 | msgid "error when closing sha1 file" | |
5222 | msgstr "关闭 sha1 文件时出错" | |
5223 | ||
5224 | #: sha1-file.c:1635 | |
5225 | #, c-format | |
5226 | msgid "insufficient permission for adding an object to repository database %s" | |
5227 | msgstr "权限不足,无法在仓库对象库 %s 中添加对象" | |
5228 | ||
5229 | #: sha1-file.c:1637 | |
5230 | msgid "unable to create temporary file" | |
5231 | msgstr "无法创建临时文件" | |
5232 | ||
5233 | #: sha1-file.c:1661 | |
5234 | msgid "unable to write sha1 file" | |
5235 | msgstr "无法写入 sha1 文件" | |
5236 | ||
5237 | #: sha1-file.c:1667 | |
5238 | #, c-format | |
5239 | msgid "unable to deflate new object %s (%d)" | |
5240 | msgstr "不能压缩新对象 %s(%d)" | |
5241 | ||
5242 | #: sha1-file.c:1671 | |
5243 | #, c-format | |
5244 | msgid "deflateEnd on object %s failed (%d)" | |
5245 | msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" | |
5246 | ||
5247 | #: sha1-file.c:1675 | |
5248 | #, c-format | |
5249 | msgid "confused by unstable object source data for %s" | |
5250 | msgstr "被 %s 的不稳定对象源数据搞糊涂了" | |
5251 | ||
5252 | #: sha1-file.c:1685 builtin/pack-objects.c:899 | |
5253 | #, c-format | |
5254 | msgid "failed utime() on %s" | |
5255 | msgstr "在 %s 上调用 utime() 失败" | |
5256 | ||
5257 | #: sha1-file.c:1760 | |
5258 | #, c-format | |
5259 | msgid "cannot read sha1_file for %s" | |
5260 | msgstr "不能从 %s 读取 sha1 文件" | |
5261 | ||
5262 | #: sha1-file.c:1805 | |
5263 | msgid "corrupt commit" | |
5264 | msgstr "损坏的提交" | |
5265 | ||
5266 | #: sha1-file.c:1813 | |
5267 | msgid "corrupt tag" | |
5268 | msgstr "损坏的标签" | |
5269 | ||
5270 | #: sha1-file.c:1906 | |
5271 | #, c-format | |
5272 | msgid "read error while indexing %s" | |
5273 | msgstr "索引 %s 时读取错误" | |
5274 | ||
5275 | #: sha1-file.c:1909 | |
5276 | #, c-format | |
5277 | msgid "short read while indexing %s" | |
5278 | msgstr "索引 %s 时读入不完整" | |
5279 | ||
5280 | #: sha1-file.c:1980 sha1-file.c:1989 | |
5281 | #, c-format | |
5282 | msgid "%s: failed to insert into database" | |
5283 | msgstr "%s:插入数据库失败" | |
5284 | ||
5285 | #: sha1-file.c:1995 | |
5286 | #, c-format | |
5287 | msgid "%s: unsupported file type" | |
5288 | msgstr "%s:不支持的文件类型" | |
5289 | ||
5290 | #: sha1-file.c:2019 | |
5291 | #, c-format | |
5292 | msgid "%s is not a valid object" | |
5293 | msgstr "%s 不是一个有效的对象" | |
5294 | ||
5295 | #: sha1-file.c:2021 | |
5296 | #, c-format | |
5297 | msgid "%s is not a valid '%s' object" | |
5298 | msgstr "%s 不是一个有效的 '%s' 对象" | |
5299 | ||
5300 | #: sha1-file.c:2048 builtin/index-pack.c:158 | |
5301 | #, c-format | |
5302 | msgid "unable to open %s" | |
5303 | msgstr "不能打开 %s" | |
5304 | ||
5305 | #: sha1-file.c:2217 sha1-file.c:2269 | |
5306 | #, c-format | |
5307 | msgid "sha1 mismatch for %s (expected %s)" | |
5308 | msgstr "%s 的 sha1 不匹配(预期 %s)" | |
5309 | ||
5310 | #: sha1-file.c:2241 | |
5311 | #, c-format | |
5312 | msgid "unable to mmap %s" | |
5313 | msgstr "不能 mmap %s" | |
5314 | ||
5315 | #: sha1-file.c:2246 | |
5316 | #, c-format | |
5317 | msgid "unable to unpack header of %s" | |
5318 | msgstr "无法解压缩 %s 的头部" | |
5319 | ||
5320 | #: sha1-file.c:2252 | |
5321 | #, c-format | |
5322 | msgid "unable to parse header of %s" | |
5323 | msgstr "无法解析 %s 的头部" | |
5324 | ||
5325 | #: sha1-file.c:2263 | |
5326 | #, c-format | |
5327 | msgid "unable to unpack contents of %s" | |
5328 | msgstr "无法解压缩 %s 的内容" | |
5329 | ||
5330 | #: sha1-name.c:444 | |
a0b6b246 JX |
5331 | #, c-format |
5332 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 5333 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 5334 | |
c1ac5258 | 5335 | #: sha1-name.c:455 |
a0b6b246 JX |
5336 | msgid "The candidates are:" |
5337 | msgstr "候选者有:" | |
5338 | ||
c1ac5258 | 5339 | #: sha1-name.c:699 |
a0b6b246 JX |
5340 | msgid "" |
5341 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
5342 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
5343 | "may be created by mistake. For example,\n" | |
5344 | "\n" | |
5345 | " git checkout -b $br $(git rev-parse ...)\n" | |
5346 | "\n" | |
5347 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
5348 | "examine these refs and maybe delete them. Turn this message off by\n" | |
5349 | "running \"git config advice.objectNameWarning false\"" | |
5350 | msgstr "" | |
5351 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
5352 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
5353 | "\n" | |
5354 | " git checkout -b $br $(git rev-parse ...)\n" | |
5355 | "\n" | |
5356 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
5357 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
5358 | "命令关闭本消息通知。" | |
5359 | ||
fd8cb379 | 5360 | #: submodule.c:97 submodule.c:131 |
a0b6b246 JX |
5361 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
5362 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
5363 | ||
fd8cb379 | 5364 | #: submodule.c:101 submodule.c:135 |
a0b6b246 JX |
5365 | #, c-format |
5366 | msgid "Could not find section in .gitmodules where path=%s" | |
5367 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
5368 | ||
fd8cb379 | 5369 | #: submodule.c:109 |
a0b6b246 JX |
5370 | #, c-format |
5371 | msgid "Could not update .gitmodules entry %s" | |
5372 | msgstr "不能更新 .gitmodules 条目 %s" | |
5373 | ||
fd8cb379 | 5374 | #: submodule.c:142 |
a0b6b246 JX |
5375 | #, c-format |
5376 | msgid "Could not remove .gitmodules entry for %s" | |
5377 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
5378 | ||
fd8cb379 | 5379 | #: submodule.c:153 |
a0b6b246 JX |
5380 | msgid "staging updated .gitmodules failed" |
5381 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
5382 | ||
fd8cb379 | 5383 | #: submodule.c:315 |
a4f16749 JX |
5384 | #, c-format |
5385 | msgid "in unpopulated submodule '%s'" | |
5386 | msgstr "位于未检出的子模组 '%s'" | |
5387 | ||
fd8cb379 | 5388 | #: submodule.c:346 |
a4f16749 JX |
5389 | #, c-format |
5390 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
5391 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
5392 | ||
c1ac5258 | 5393 | #: submodule.c:839 |
6937cb4e JX |
5394 | #, c-format |
5395 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 5396 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 5397 | |
c1ac5258 | 5398 | #: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888 |
6937cb4e JX |
5399 | msgid "Failed to resolve HEAD as a valid ref." |
5400 | msgstr "无法将 HEAD 解析为有效引用。" | |
5401 | ||
c1ac5258 | 5402 | #: submodule.c:1377 |
1a79b2f1 | 5403 | #, c-format |
87cb7997 | 5404 | msgid "'%s' not recognized as a git repository" |
65e2041e | 5405 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 5406 | |
c1ac5258 | 5407 | #: submodule.c:1515 |
1a79b2f1 | 5408 | #, c-format |
87cb7997 JX |
5409 | msgid "could not start 'git status' in submodule '%s'" |
5410 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 5411 | |
c1ac5258 | 5412 | #: submodule.c:1528 |
87cb7997 JX |
5413 | #, c-format |
5414 | msgid "could not run 'git status' in submodule '%s'" | |
5415 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
5416 | ||
c1ac5258 JX |
5417 | #: submodule.c:1543 |
5418 | #, c-format | |
5419 | msgid "Could not unset core.worktree setting in submodule '%s'" | |
5420 | msgstr "无法取消子模组 '%s' 中的 core.worktree 设置" | |
5421 | ||
5422 | #: submodule.c:1633 | |
87cb7997 JX |
5423 | #, c-format |
5424 | msgid "submodule '%s' has dirty index" | |
5425 | msgstr "子模组 '%s' 中有脏索引" | |
5426 | ||
c1ac5258 JX |
5427 | #: submodule.c:1685 |
5428 | #, c-format | |
5429 | msgid "Submodule '%s' could not be updated." | |
5430 | msgstr "子模组 '%s' 无法被更新。" | |
5431 | ||
5432 | #: submodule.c:1734 | |
1a79b2f1 JX |
5433 | #, c-format |
5434 | msgid "" | |
5435 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
5436 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
5437 | ||
c1ac5258 | 5438 | #: submodule.c:1746 submodule.c:1802 |
1a79b2f1 JX |
5439 | #, c-format |
5440 | msgid "could not lookup name for submodule '%s'" | |
5441 | msgstr "不能查询子模组 '%s' 的名称" | |
5442 | ||
c1ac5258 JX |
5443 | #: submodule.c:1750 builtin/submodule--helper.c:1406 |
5444 | #: builtin/submodule--helper.c:1416 | |
1a79b2f1 JX |
5445 | #, c-format |
5446 | msgid "could not create directory '%s'" | |
5447 | msgstr "不能创建目录 '%s'" | |
5448 | ||
c1ac5258 | 5449 | #: submodule.c:1753 |
1a79b2f1 JX |
5450 | #, c-format |
5451 | msgid "" | |
5452 | "Migrating git directory of '%s%s' from\n" | |
5453 | "'%s' to\n" | |
5454 | "'%s'\n" | |
5455 | msgstr "" | |
5456 | "将 '%s%s' 的 git 目录从\n" | |
5457 | "'%s' 迁移至\n" | |
5458 | "'%s'\n" | |
5459 | ||
c1ac5258 | 5460 | #: submodule.c:1837 |
1a79b2f1 JX |
5461 | #, c-format |
5462 | msgid "could not recurse into submodule '%s'" | |
5463 | msgstr "无法递归进子模组路径 '%s'" | |
5464 | ||
c1ac5258 | 5465 | #: submodule.c:1881 |
87cb7997 JX |
5466 | msgid "could not start ls-files in .." |
5467 | msgstr "无法在 .. 中启动 ls-files" | |
5468 | ||
c1ac5258 | 5469 | #: submodule.c:1920 |
87cb7997 JX |
5470 | #, c-format |
5471 | msgid "ls-tree returned unexpected return code %d" | |
5472 | msgstr "ls-tree 返回未知返回值 %d" | |
5473 | ||
c1ac5258 | 5474 | #: submodule-config.c:231 |
fd8cb379 JX |
5475 | #, c-format |
5476 | msgid "ignoring suspicious submodule name: %s" | |
5477 | msgstr "忽略可疑的子模组名称:%s" | |
5478 | ||
c1ac5258 | 5479 | #: submodule-config.c:295 |
6937cb4e JX |
5480 | msgid "negative values not allowed for submodule.fetchjobs" |
5481 | msgstr "submodule.fetchjobs 不允许为负值" | |
5482 | ||
c1ac5258 | 5483 | #: submodule-config.c:468 |
a0b6b246 JX |
5484 | #, c-format |
5485 | msgid "invalid value for %s" | |
5486 | msgstr "%s 的值无效" | |
5487 | ||
6937cb4e | 5488 | #: trailer.c:238 |
a0b6b246 JX |
5489 | #, c-format |
5490 | msgid "running trailer command '%s' failed" | |
5491 | msgstr "执行 trailer 命令 '%s' 失败" | |
5492 | ||
6937cb4e JX |
5493 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
5494 | #: trailer.c:557 | |
a0b6b246 JX |
5495 | #, c-format |
5496 | msgid "unknown value '%s' for key '%s'" | |
5497 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
5498 | ||
c1ac5258 | 5499 | #: trailer.c:539 trailer.c:544 builtin/remote.c:294 |
a0b6b246 JX |
5500 | #, c-format |
5501 | msgid "more than one %s" | |
5502 | msgstr "多于一个 %s" | |
5503 | ||
6937cb4e | 5504 | #: trailer.c:730 |
a0b6b246 JX |
5505 | #, c-format |
5506 | msgid "empty trailer token in trailer '%.*s'" | |
5507 | msgstr "签名 '%.*s' 的键为空" | |
5508 | ||
6937cb4e | 5509 | #: trailer.c:750 |
a0b6b246 JX |
5510 | #, c-format |
5511 | msgid "could not read input file '%s'" | |
5512 | msgstr "不能读取输入文件 '%s'" | |
5513 | ||
6937cb4e | 5514 | #: trailer.c:753 |
a0b6b246 JX |
5515 | msgid "could not read from stdin" |
5516 | msgstr "不能自标准输入读取" | |
5517 | ||
c1ac5258 | 5518 | #: trailer.c:1008 builtin/am.c:47 |
a0b6b246 JX |
5519 | #, c-format |
5520 | msgid "could not stat %s" | |
65e2041e | 5521 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 5522 | |
6937cb4e | 5523 | #: trailer.c:1010 |
a0b6b246 JX |
5524 | #, c-format |
5525 | msgid "file %s is not a regular file" | |
5526 | msgstr "文件 %s 不是一个正规文件" | |
5527 | ||
6937cb4e | 5528 | #: trailer.c:1012 |
a0b6b246 JX |
5529 | #, c-format |
5530 | msgid "file %s is not writable by user" | |
5531 | msgstr "文件 %s 用户不可写" | |
5532 | ||
6937cb4e | 5533 | #: trailer.c:1024 |
a0b6b246 JX |
5534 | msgid "could not open temporary file" |
5535 | msgstr "不能打开临时文件" | |
5536 | ||
6937cb4e | 5537 | #: trailer.c:1064 |
a0b6b246 JX |
5538 | #, c-format |
5539 | msgid "could not rename temporary file to %s" | |
5540 | msgstr "不能重命名临时文件为 %s" | |
5541 | ||
fd8cb379 | 5542 | #: transport.c:116 |
a0b6b246 JX |
5543 | #, c-format |
5544 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
5545 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
5546 | ||
c1ac5258 JX |
5547 | #: transport.c:142 |
5548 | #, c-format | |
5549 | msgid "could not read bundle '%s'" | |
5550 | msgstr "无法读取 bundle '%s'" | |
5551 | ||
fd8cb379 | 5552 | #: transport.c:208 |
a0b6b246 JX |
5553 | #, c-format |
5554 | msgid "transport: invalid depth option '%s'" | |
5555 | msgstr "传输:无效的深度选项 '%s'" | |
5556 | ||
c1ac5258 | 5557 | #: transport.c:586 |
fd8cb379 JX |
5558 | msgid "could not parse transport.color.* config" |
5559 | msgstr "不能解析 transport.color.* 配置" | |
5560 | ||
c1ac5258 JX |
5561 | #: transport.c:659 |
5562 | msgid "support for protocol v2 not implemented yet" | |
5563 | msgstr "协议 v2 的支持尚未实现" | |
5564 | ||
5565 | #: transport.c:785 | |
5566 | #, c-format | |
5567 | msgid "unknown value for config '%s': %s" | |
5568 | msgstr "配置 '%s' 的取值未知:%s" | |
5569 | ||
5570 | #: transport.c:851 | |
5571 | #, c-format | |
5572 | msgid "transport '%s' not allowed" | |
5573 | msgstr "传输 '%s' 不允许" | |
5574 | ||
5575 | #: transport.c:903 | |
5576 | msgid "git-over-rsync is no longer supported" | |
5577 | msgstr "不再支持 git-over-rsync" | |
5578 | ||
5579 | #: transport.c:998 | |
a0b6b246 JX |
5580 | #, c-format |
5581 | msgid "" | |
5582 | "The following submodule paths contain changes that can\n" | |
5583 | "not be found on any remote:\n" | |
5584 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
5585 | ||
c1ac5258 | 5586 | #: transport.c:1002 |
a0b6b246 JX |
5587 | #, c-format |
5588 | msgid "" | |
5589 | "\n" | |
5590 | "Please try\n" | |
5591 | "\n" | |
5592 | "\tgit push --recurse-submodules=on-demand\n" | |
5593 | "\n" | |
5594 | "or cd to the path and use\n" | |
5595 | "\n" | |
5596 | "\tgit push\n" | |
5597 | "\n" | |
5598 | "to push them to a remote.\n" | |
5599 | "\n" | |
5600 | msgstr "" | |
5601 | "\n" | |
5602 | "请尝试\n" | |
5603 | "\n" | |
5604 | "\tgit push --recurse-submodules=on-demand\n" | |
5605 | "\n" | |
5606 | "或者进入到子目录执行\n" | |
5607 | "\n" | |
5608 | "\tgit push\n" | |
5609 | "\n" | |
5610 | "以推送至远程。\n" | |
5611 | "\n" | |
5612 | ||
c1ac5258 | 5613 | #: transport.c:1010 |
a0b6b246 JX |
5614 | msgid "Aborting." |
5615 | msgstr "正在终止。" | |
5616 | ||
c1ac5258 JX |
5617 | #: transport.c:1148 |
5618 | msgid "failed to push all needed submodules" | |
5619 | msgstr "不能推送全部需要的子模组" | |
5620 | ||
5621 | #: transport.c:1270 transport-helper.c:643 | |
5622 | msgid "operation not supported by protocol" | |
5623 | msgstr "协议不支持该操作" | |
5624 | ||
5625 | #: transport.c:1352 | |
5626 | #, c-format | |
5627 | msgid "invalid line while parsing alternate refs: %s" | |
5628 | msgstr "解析备用引用时无效的行:%s" | |
5629 | ||
5630 | #: transport-helper.c:51 transport-helper.c:80 | |
5631 | msgid "full write to remote helper failed" | |
5632 | msgstr "完整写入远程助手失败" | |
5633 | ||
5634 | #: transport-helper.c:132 | |
5635 | #, c-format | |
5636 | msgid "unable to find remote helper for '%s'" | |
5637 | msgstr "无法为 '%s' 找到远程助手" | |
5638 | ||
5639 | #: transport-helper.c:148 transport-helper.c:557 | |
5640 | msgid "can't dup helper output fd" | |
5641 | msgstr "无法复制助手输出文件句柄" | |
5642 | ||
5643 | #: transport-helper.c:199 | |
5644 | #, c-format | |
5645 | msgid "" | |
5646 | "unknown mandatory capability %s; this remote helper probably needs newer " | |
5647 | "version of Git" | |
5648 | msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" | |
5649 | ||
5650 | #: transport-helper.c:205 | |
5651 | msgid "this remote helper should implement refspec capability" | |
5652 | msgstr "远程助手需要实现 refspec 能力" | |
5653 | ||
5654 | #: transport-helper.c:272 transport-helper.c:412 | |
5655 | #, c-format | |
5656 | msgid "%s unexpectedly said: '%s'" | |
5657 | msgstr "%s 意外地说:'%s'" | |
5658 | ||
5659 | #: transport-helper.c:401 | |
5660 | #, c-format | |
5661 | msgid "%s also locked %s" | |
5662 | msgstr "%s 也锁定了 %s" | |
5663 | ||
5664 | #: transport-helper.c:479 | |
5665 | msgid "couldn't run fast-import" | |
5666 | msgstr "不能执行 fast-import" | |
5667 | ||
5668 | #: transport-helper.c:502 | |
5669 | msgid "error while running fast-import" | |
5670 | msgstr "执行 fast-import 出错" | |
5671 | ||
5672 | #: transport-helper.c:531 transport-helper.c:1091 | |
5673 | #, c-format | |
5674 | msgid "could not read ref %s" | |
5675 | msgstr "无法读取引用 %s" | |
5676 | ||
5677 | #: transport-helper.c:576 | |
5678 | #, c-format | |
5679 | msgid "unknown response to connect: %s" | |
5680 | msgstr "连接时未知的响应:%s" | |
5681 | ||
5682 | #: transport-helper.c:598 | |
5683 | msgid "setting remote service path not supported by protocol" | |
5684 | msgstr "协议不支持设置远程服务路径" | |
5685 | ||
5686 | #: transport-helper.c:600 | |
5687 | msgid "invalid remote service path" | |
5688 | msgstr "无效的远程服务路径" | |
5689 | ||
5690 | #: transport-helper.c:646 | |
5691 | #, c-format | |
5692 | msgid "can't connect to subservice %s" | |
5693 | msgstr "不能连接到子服务 %s" | |
5694 | ||
5695 | #: transport-helper.c:713 | |
5696 | #, c-format | |
5697 | msgid "expected ok/error, helper said '%s'" | |
5698 | msgstr "预期 ok/error,助手说 '%s'" | |
5699 | ||
5700 | #: transport-helper.c:766 | |
5701 | #, c-format | |
5702 | msgid "helper reported unexpected status of %s" | |
5703 | msgstr "助手报告 %s 的意外状态" | |
5704 | ||
5705 | #: transport-helper.c:827 | |
a0b6b246 | 5706 | #, c-format |
c1ac5258 JX |
5707 | msgid "helper %s does not support dry-run" |
5708 | msgstr "助手 %s 不支持 dry-run" | |
a0b6b246 | 5709 | |
c1ac5258 JX |
5710 | #: transport-helper.c:830 |
5711 | #, c-format | |
5712 | msgid "helper %s does not support --signed" | |
5713 | msgstr "助手 %s 不支持 --signed" | |
5714 | ||
5715 | #: transport-helper.c:833 | |
5716 | #, c-format | |
5717 | msgid "helper %s does not support --signed=if-asked" | |
5718 | msgstr "助手 %s 不支持 --signed=if-asked" | |
5719 | ||
5720 | #: transport-helper.c:840 | |
5721 | #, c-format | |
5722 | msgid "helper %s does not support 'push-option'" | |
5723 | msgstr "助手 %s 不支持 'push-option'" | |
5724 | ||
5725 | #: transport-helper.c:932 | |
5726 | msgid "remote-helper doesn't support push; refspec needed" | |
5727 | msgstr "remote-heper 不支持 push,需要引用表达式" | |
5728 | ||
5729 | #: transport-helper.c:937 | |
5730 | #, c-format | |
5731 | msgid "helper %s does not support 'force'" | |
5732 | msgstr "助手 %s 不支持 'force'" | |
5733 | ||
5734 | #: transport-helper.c:984 | |
5735 | msgid "couldn't run fast-export" | |
5736 | msgstr "无法执行 fast-export" | |
5737 | ||
5738 | #: transport-helper.c:989 | |
5739 | msgid "error while running fast-export" | |
5740 | msgstr "执行 fast-export 时出错" | |
5741 | ||
5742 | #: transport-helper.c:1014 | |
5743 | #, c-format | |
5744 | msgid "" | |
5745 | "No refs in common and none specified; doing nothing.\n" | |
5746 | "Perhaps you should specify a branch such as 'master'.\n" | |
5747 | msgstr "" | |
5748 | "没有共同的引用并且也没有指定,什么也不会做。\n" | |
5749 | "可能您应该指定一个分支如 'master'。\n" | |
5750 | ||
5751 | #: transport-helper.c:1077 | |
5752 | #, c-format | |
5753 | msgid "malformed response in ref list: %s" | |
5754 | msgstr "引用列表中格式错误的响应:%s" | |
5755 | ||
5756 | #: transport-helper.c:1230 | |
5757 | #, c-format | |
5758 | msgid "read(%s) failed" | |
5759 | msgstr "读取(%s)失败" | |
5760 | ||
5761 | #: transport-helper.c:1257 | |
5762 | #, c-format | |
5763 | msgid "write(%s) failed" | |
5764 | msgstr "写(%s)失败" | |
5765 | ||
5766 | #: transport-helper.c:1306 | |
5767 | #, c-format | |
5768 | msgid "%s thread failed" | |
5769 | msgstr "%s 线程失败" | |
5770 | ||
5771 | #: transport-helper.c:1310 | |
5772 | #, c-format | |
5773 | msgid "%s thread failed to join: %s" | |
5774 | msgstr "%s 加入线程失败:%s" | |
5775 | ||
5776 | #: transport-helper.c:1329 transport-helper.c:1333 | |
5777 | #, c-format | |
5778 | msgid "can't start thread for copying data: %s" | |
5779 | msgstr "不能启动线程来拷贝数据:%s" | |
5780 | ||
5781 | #: transport-helper.c:1370 | |
5782 | #, c-format | |
5783 | msgid "%s process failed to wait" | |
5784 | msgstr "%s 进程等待失败" | |
5785 | ||
5786 | #: transport-helper.c:1374 | |
5787 | #, c-format | |
5788 | msgid "%s process failed" | |
5789 | msgstr "%s 进程失败" | |
5790 | ||
5791 | #: transport-helper.c:1392 transport-helper.c:1401 | |
5792 | msgid "can't start thread for copying data" | |
5793 | msgstr "不能启动线程来拷贝数据" | |
5794 | ||
5795 | #: tree-walk.c:33 | |
a0b6b246 JX |
5796 | msgid "too-short tree object" |
5797 | msgstr "太短的树对象" | |
5798 | ||
c1ac5258 | 5799 | #: tree-walk.c:39 |
a0b6b246 | 5800 | msgid "malformed mode in tree entry" |
29004bbb | 5801 | msgstr "树对象中的条目模式错误" |
a0b6b246 | 5802 | |
c1ac5258 | 5803 | #: tree-walk.c:43 |
a0b6b246 JX |
5804 | msgid "empty filename in tree entry" |
5805 | msgstr "树对象条目中空的文件名" | |
5806 | ||
c1ac5258 | 5807 | #: tree-walk.c:115 |
a0b6b246 JX |
5808 | msgid "too-short tree file" |
5809 | msgstr "太短的树文件" | |
5810 | ||
c1ac5258 | 5811 | #: unpack-trees.c:112 |
a0b6b246 JX |
5812 | #, c-format |
5813 | msgid "" | |
5814 | "Your local changes to the following files would be overwritten by checkout:\n" | |
5815 | "%%sPlease commit your changes or stash them before you switch branches." | |
5816 | msgstr "" | |
5817 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 5818 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 5819 | |
c1ac5258 | 5820 | #: unpack-trees.c:114 |
a0b6b246 JX |
5821 | #, c-format |
5822 | msgid "" | |
5823 | "Your local changes to the following files would be overwritten by checkout:\n" | |
5824 | "%%s" | |
5825 | msgstr "" | |
5826 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
5827 | "%%s" | |
5828 | ||
c1ac5258 | 5829 | #: unpack-trees.c:117 |
a0b6b246 JX |
5830 | #, c-format |
5831 | msgid "" | |
5832 | "Your local changes to the following files would be overwritten by merge:\n" | |
5833 | "%%sPlease commit your changes or stash them before you merge." | |
5834 | msgstr "" | |
5835 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 5836 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 5837 | |
c1ac5258 | 5838 | #: unpack-trees.c:119 |
a0b6b246 JX |
5839 | #, c-format |
5840 | msgid "" | |
5841 | "Your local changes to the following files would be overwritten by merge:\n" | |
5842 | "%%s" | |
5843 | msgstr "" | |
5844 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
5845 | "%%s" | |
5846 | ||
c1ac5258 | 5847 | #: unpack-trees.c:122 |
a0b6b246 JX |
5848 | #, c-format |
5849 | msgid "" | |
5850 | "Your local changes to the following files would be overwritten by %s:\n" | |
5851 | "%%sPlease commit your changes or stash them before you %s." | |
5852 | msgstr "" | |
5853 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 5854 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 5855 | |
c1ac5258 | 5856 | #: unpack-trees.c:124 |
a0b6b246 JX |
5857 | #, c-format |
5858 | msgid "" | |
5859 | "Your local changes to the following files would be overwritten by %s:\n" | |
5860 | "%%s" | |
5861 | msgstr "" | |
5862 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
5863 | "%%s" | |
c04f5ac3 | 5864 | |
c1ac5258 | 5865 | #: unpack-trees.c:129 |
a0b6b246 JX |
5866 | #, c-format |
5867 | msgid "" | |
1a79b2f1 | 5868 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
5869 | "%s" |
5870 | msgstr "" | |
5871 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
5872 | "%s" | |
1b7f4a34 | 5873 | |
c1ac5258 | 5874 | #: unpack-trees.c:133 |
a0b6b246 JX |
5875 | #, c-format |
5876 | msgid "" | |
5877 | "The following untracked working tree files would be removed by checkout:\n" | |
5878 | "%%sPlease move or remove them before you switch branches." | |
5879 | msgstr "" | |
5880 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
5881 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 5882 | |
c1ac5258 | 5883 | #: unpack-trees.c:135 |
a0b6b246 JX |
5884 | #, c-format |
5885 | msgid "" | |
5886 | "The following untracked working tree files would be removed by checkout:\n" | |
5887 | "%%s" | |
5888 | msgstr "" | |
5889 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
5890 | "%%s" | |
1003b3a5 | 5891 | |
c1ac5258 | 5892 | #: unpack-trees.c:138 |
a0b6b246 JX |
5893 | #, c-format |
5894 | msgid "" | |
5895 | "The following untracked working tree files would be removed by merge:\n" | |
5896 | "%%sPlease move or remove them before you merge." | |
5897 | msgstr "" | |
5898 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
5899 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 5900 | |
c1ac5258 | 5901 | #: unpack-trees.c:140 |
a0b6b246 JX |
5902 | #, c-format |
5903 | msgid "" | |
5904 | "The following untracked working tree files would be removed by merge:\n" | |
5905 | "%%s" | |
5906 | msgstr "" | |
5907 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
5908 | "%%s" | |
c04f5ac3 | 5909 | |
c1ac5258 | 5910 | #: unpack-trees.c:143 |
a0b6b246 JX |
5911 | #, c-format |
5912 | msgid "" | |
5913 | "The following untracked working tree files would be removed by %s:\n" | |
5914 | "%%sPlease move or remove them before you %s." | |
5915 | msgstr "" | |
5916 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
5917 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 5918 | |
c1ac5258 | 5919 | #: unpack-trees.c:145 |
a0b6b246 JX |
5920 | #, c-format |
5921 | msgid "" | |
5922 | "The following untracked working tree files would be removed by %s:\n" | |
5923 | "%%s" | |
5924 | msgstr "" | |
5925 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
5926 | "%%s" | |
c04f5ac3 | 5927 | |
c1ac5258 | 5928 | #: unpack-trees.c:151 |
a0b6b246 JX |
5929 | #, c-format |
5930 | msgid "" | |
5931 | "The following untracked working tree files would be overwritten by " | |
5932 | "checkout:\n" | |
5933 | "%%sPlease move or remove them before you switch branches." | |
5934 | msgstr "" | |
5935 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
5936 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 5937 | |
c1ac5258 | 5938 | #: unpack-trees.c:153 |
1003b3a5 | 5939 | #, c-format |
4dcdc3d8 | 5940 | msgid "" |
a0b6b246 JX |
5941 | "The following untracked working tree files would be overwritten by " |
5942 | "checkout:\n" | |
5943 | "%%s" | |
4dcdc3d8 | 5944 | msgstr "" |
a0b6b246 JX |
5945 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
5946 | "%%s" | |
1003b3a5 | 5947 | |
c1ac5258 | 5948 | #: unpack-trees.c:156 |
c04f5ac3 | 5949 | #, c-format |
a0b6b246 JX |
5950 | msgid "" |
5951 | "The following untracked working tree files would be overwritten by merge:\n" | |
5952 | "%%sPlease move or remove them before you merge." | |
5953 | msgstr "" | |
5954 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
5955 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 5956 | |
c1ac5258 | 5957 | #: unpack-trees.c:158 |
a0b6b246 JX |
5958 | #, c-format |
5959 | msgid "" | |
5960 | "The following untracked working tree files would be overwritten by merge:\n" | |
5961 | "%%s" | |
5962 | msgstr "" | |
5963 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
5964 | "%%s" | |
c04f5ac3 | 5965 | |
c1ac5258 | 5966 | #: unpack-trees.c:161 |
a0b6b246 JX |
5967 | #, c-format |
5968 | msgid "" | |
5969 | "The following untracked working tree files would be overwritten by %s:\n" | |
5970 | "%%sPlease move or remove them before you %s." | |
5971 | msgstr "" | |
5972 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
5973 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 5974 | |
c1ac5258 | 5975 | #: unpack-trees.c:163 |
07432cef | 5976 | #, c-format |
a0b6b246 JX |
5977 | msgid "" |
5978 | "The following untracked working tree files would be overwritten by %s:\n" | |
5979 | "%%s" | |
5980 | msgstr "" | |
5981 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
5982 | "%%s" | |
c04f5ac3 | 5983 | |
c1ac5258 | 5984 | #: unpack-trees.c:171 |
07432cef | 5985 | #, c-format |
a0b6b246 JX |
5986 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
5987 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 5988 | |
c1ac5258 | 5989 | #: unpack-trees.c:174 |
07432cef | 5990 | #, c-format |
ef317cd5 | 5991 | msgid "" |
6937cb4e | 5992 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
a0b6b246 JX |
5993 | "%s" |
5994 | msgstr "" | |
5995 | "无法更新稀疏检出:如下条目不是最新:\n" | |
5996 | "%s" | |
c04f5ac3 | 5997 | |
c1ac5258 | 5998 | #: unpack-trees.c:176 |
07432cef | 5999 | #, c-format |
a0b6b246 JX |
6000 | msgid "" |
6001 | "The following working tree files would be overwritten by sparse checkout " | |
6002 | "update:\n" | |
6003 | "%s" | |
6004 | msgstr "" | |
6005 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
6006 | "%s" | |
c04f5ac3 | 6007 | |
c1ac5258 | 6008 | #: unpack-trees.c:178 |
07432cef | 6009 | #, c-format |
a0b6b246 JX |
6010 | msgid "" |
6011 | "The following working tree files would be removed by sparse checkout " | |
6012 | "update:\n" | |
6013 | "%s" | |
6014 | msgstr "" | |
6015 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
6016 | "%s" | |
c04f5ac3 | 6017 | |
c1ac5258 | 6018 | #: unpack-trees.c:180 |
87cb7997 JX |
6019 | #, c-format |
6020 | msgid "" | |
6021 | "Cannot update submodule:\n" | |
6022 | "%s" | |
6023 | msgstr "" | |
6024 | "无法更新子模组:\n" | |
6025 | "%s" | |
6026 | ||
c1ac5258 | 6027 | #: unpack-trees.c:254 |
07432cef | 6028 | #, c-format |
a0b6b246 JX |
6029 | msgid "Aborting\n" |
6030 | msgstr "终止中\n" | |
ef317cd5 | 6031 | |
c1ac5258 | 6032 | #: unpack-trees.c:336 |
a0b6b246 JX |
6033 | msgid "Checking out files" |
6034 | msgstr "正在检出文件" | |
c04f5ac3 | 6035 | |
87cb7997 | 6036 | #: urlmatch.c:163 |
a0b6b246 JX |
6037 | msgid "invalid URL scheme name or missing '://' suffix" |
6038 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
6039 | ||
87cb7997 | 6040 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 6041 | #, c-format |
a0b6b246 JX |
6042 | msgid "invalid %XX escape sequence" |
6043 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 6044 | |
87cb7997 | 6045 | #: urlmatch.c:215 |
a0b6b246 JX |
6046 | msgid "missing host and scheme is not 'file:'" |
6047 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 6048 | |
87cb7997 | 6049 | #: urlmatch.c:232 |
a0b6b246 JX |
6050 | msgid "a 'file:' URL may not have a port number" |
6051 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 6052 | |
87cb7997 | 6053 | #: urlmatch.c:247 |
a0b6b246 JX |
6054 | msgid "invalid characters in host name" |
6055 | msgstr "主机名中包含无效的字符" | |
90314792 | 6056 | |
87cb7997 | 6057 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
6058 | msgid "invalid port number" |
6059 | msgstr "无效的端口号" | |
c04f5ac3 | 6060 | |
87cb7997 | 6061 | #: urlmatch.c:371 |
a0b6b246 JX |
6062 | msgid "invalid '..' path segment" |
6063 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 6064 | |
31e5e17b | 6065 | #: worktree.c:245 builtin/am.c:2147 |
a77c07d9 | 6066 | #, c-format |
a0b6b246 | 6067 | msgid "failed to read '%s'" |
c1ac5258 | 6068 | msgstr "读取 '%s' 失败" |
ef317cd5 | 6069 | |
31e5e17b JX |
6070 | #: worktree.c:291 |
6071 | #, c-format | |
6072 | msgid "'%s' at main working tree is not the repository directory" | |
6073 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
6074 | ||
6075 | #: worktree.c:302 | |
6076 | #, c-format | |
6077 | msgid "'%s' file does not contain absolute path to the working tree location" | |
6078 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
6079 | ||
6080 | #: worktree.c:314 | |
6081 | #, c-format | |
6082 | msgid "'%s' does not exist" | |
6083 | msgstr "'%s' 不存在" | |
6084 | ||
6085 | #: worktree.c:320 | |
6086 | #, c-format | |
6087 | msgid "'%s' is not a .git file, error code %d" | |
6088 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
6089 | ||
6090 | #: worktree.c:328 | |
6091 | #, c-format | |
6092 | msgid "'%s' does not point back to '%s'" | |
6093 | msgstr "'%s' 没有指回到 '%s'" | |
6094 | ||
a4f16749 | 6095 | #: wrapper.c:223 wrapper.c:393 |
c04f5ac3 | 6096 | #, c-format |
a0b6b246 JX |
6097 | msgid "could not open '%s' for reading and writing" |
6098 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 6099 | |
c1ac5258 JX |
6100 | #: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 |
6101 | #: builtin/am.c:863 builtin/merge.c:1078 | |
c04f5ac3 | 6102 | #, c-format |
a0b6b246 JX |
6103 | msgid "could not open '%s' for reading" |
6104 | msgstr "无法打开 '%s' 进行读取" | |
c04f5ac3 | 6105 | |
a4f16749 | 6106 | #: wrapper.c:424 wrapper.c:624 |
a0b6b246 JX |
6107 | #, c-format |
6108 | msgid "unable to access '%s'" | |
6109 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 6110 | |
a4f16749 | 6111 | #: wrapper.c:632 |
a0b6b246 JX |
6112 | msgid "unable to get current working directory" |
6113 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 6114 | |
fd8cb379 | 6115 | #: wt-status.c:154 |
a0b6b246 JX |
6116 | msgid "Unmerged paths:" |
6117 | msgstr "未合并的路径:" | |
7aea43ff | 6118 | |
a0b6b246 | 6119 | # 译者:注意保持前导空格 |
fd8cb379 | 6120 | #: wt-status.c:181 wt-status.c:208 |
c04f5ac3 | 6121 | #, c-format |
a0b6b246 JX |
6122 | msgid " (use \"git reset %s <file>...\" to unstage)" |
6123 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 6124 | |
a0b6b246 | 6125 | # 译者:注意保持前导空格 |
fd8cb379 | 6126 | #: wt-status.c:183 wt-status.c:210 |
a0b6b246 JX |
6127 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
6128 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 6129 | |
a0b6b246 | 6130 | # 译者:注意保持前导空格 |
fd8cb379 | 6131 | #: wt-status.c:187 |
a0b6b246 JX |
6132 | msgid " (use \"git add <file>...\" to mark resolution)" |
6133 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 6134 | |
a0b6b246 | 6135 | # 译者:注意保持前导空格 |
fd8cb379 | 6136 | #: wt-status.c:189 wt-status.c:193 |
a0b6b246 JX |
6137 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
6138 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 6139 | |
a0b6b246 | 6140 | # 译者:注意保持前导空格 |
fd8cb379 | 6141 | #: wt-status.c:191 |
a0b6b246 JX |
6142 | msgid " (use \"git rm <file>...\" to mark resolution)" |
6143 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 6144 | |
fd8cb379 | 6145 | #: wt-status.c:202 wt-status.c:1015 |
a0b6b246 JX |
6146 | msgid "Changes to be committed:" |
6147 | msgstr "要提交的变更:" | |
ef317cd5 | 6148 | |
fd8cb379 | 6149 | #: wt-status.c:220 wt-status.c:1024 |
a0b6b246 JX |
6150 | msgid "Changes not staged for commit:" |
6151 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 6152 | |
a0b6b246 | 6153 | # 译者:注意保持前导空格 |
fd8cb379 | 6154 | #: wt-status.c:224 |
a0b6b246 JX |
6155 | msgid " (use \"git add <file>...\" to update what will be committed)" |
6156 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 6157 | |
a0b6b246 | 6158 | # 译者:注意保持前导空格 |
fd8cb379 | 6159 | #: wt-status.c:226 |
a0b6b246 JX |
6160 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
6161 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 6162 | |
a0b6b246 | 6163 | # 译者:注意保持前导空格 |
fd8cb379 | 6164 | #: wt-status.c:227 |
a0b6b246 JX |
6165 | msgid "" |
6166 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
6167 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 6168 | |
a0b6b246 | 6169 | # 译者:注意保持前导空格 |
fd8cb379 | 6170 | #: wt-status.c:229 |
a0b6b246 JX |
6171 | msgid " (commit or discard the untracked or modified content in submodules)" |
6172 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 6173 | |
a0b6b246 | 6174 | # 译者:注意保持前导空格 |
fd8cb379 | 6175 | #: wt-status.c:241 |
a0b6b246 JX |
6176 | #, c-format |
6177 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
6178 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 6179 | |
fd8cb379 | 6180 | #: wt-status.c:256 |
a0b6b246 JX |
6181 | msgid "both deleted:" |
6182 | msgstr "双方删除:" | |
ef317cd5 | 6183 | |
fd8cb379 | 6184 | #: wt-status.c:258 |
a0b6b246 JX |
6185 | msgid "added by us:" |
6186 | msgstr "由我们添加:" | |
4dcdc3d8 | 6187 | |
fd8cb379 | 6188 | #: wt-status.c:260 |
a0b6b246 JX |
6189 | msgid "deleted by them:" |
6190 | msgstr "由他们删除:" | |
ef317cd5 | 6191 | |
fd8cb379 | 6192 | #: wt-status.c:262 |
a0b6b246 JX |
6193 | msgid "added by them:" |
6194 | msgstr "由他们添加:" | |
ef317cd5 | 6195 | |
fd8cb379 | 6196 | #: wt-status.c:264 |
a0b6b246 JX |
6197 | msgid "deleted by us:" |
6198 | msgstr "由我们删除:" | |
ef317cd5 | 6199 | |
fd8cb379 | 6200 | #: wt-status.c:266 |
a0b6b246 JX |
6201 | msgid "both added:" |
6202 | msgstr "双方添加:" | |
5c57d762 | 6203 | |
fd8cb379 | 6204 | #: wt-status.c:268 |
a0b6b246 JX |
6205 | msgid "both modified:" |
6206 | msgstr "双方修改:" | |
5c57d762 | 6207 | |
fd8cb379 | 6208 | #: wt-status.c:278 |
a0b6b246 JX |
6209 | msgid "new file:" |
6210 | msgstr "新文件:" | |
8ada9598 | 6211 | |
fd8cb379 | 6212 | #: wt-status.c:280 |
a0b6b246 JX |
6213 | msgid "copied:" |
6214 | msgstr "拷贝:" | |
8ada9598 | 6215 | |
fd8cb379 | 6216 | #: wt-status.c:282 |
a0b6b246 JX |
6217 | msgid "deleted:" |
6218 | msgstr "删除:" | |
8ada9598 | 6219 | |
fd8cb379 | 6220 | #: wt-status.c:284 |
a0b6b246 JX |
6221 | msgid "modified:" |
6222 | msgstr "修改:" | |
8ada9598 | 6223 | |
fd8cb379 | 6224 | #: wt-status.c:286 |
a0b6b246 JX |
6225 | msgid "renamed:" |
6226 | msgstr "重命名:" | |
5c57d762 | 6227 | |
fd8cb379 | 6228 | #: wt-status.c:288 |
a0b6b246 JX |
6229 | msgid "typechange:" |
6230 | msgstr "类型变更:" | |
8ada9598 | 6231 | |
fd8cb379 | 6232 | #: wt-status.c:290 |
a0b6b246 JX |
6233 | msgid "unknown:" |
6234 | msgstr "未知:" | |
8ada9598 | 6235 | |
fd8cb379 | 6236 | #: wt-status.c:292 |
a0b6b246 JX |
6237 | msgid "unmerged:" |
6238 | msgstr "未合并:" | |
8ada9598 | 6239 | |
a0b6b246 | 6240 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 6241 | #: wt-status.c:372 |
a0b6b246 JX |
6242 | msgid "new commits, " |
6243 | msgstr "新提交, " | |
8ada9598 | 6244 | |
a0b6b246 | 6245 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 6246 | #: wt-status.c:374 |
a0b6b246 JX |
6247 | msgid "modified content, " |
6248 | msgstr "修改的内容, " | |
1b7f4a34 | 6249 | |
a0b6b246 | 6250 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 6251 | #: wt-status.c:376 |
a0b6b246 JX |
6252 | msgid "untracked content, " |
6253 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 6254 | |
fd8cb379 | 6255 | #: wt-status.c:853 |
a4f16749 JX |
6256 | #, c-format |
6257 | msgid "Your stash currently has %d entry" | |
6258 | msgid_plural "Your stash currently has %d entries" | |
6259 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
6260 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
6261 | ||
fd8cb379 | 6262 | #: wt-status.c:885 |
a0b6b246 JX |
6263 | msgid "Submodules changed but not updated:" |
6264 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 6265 | |
fd8cb379 | 6266 | #: wt-status.c:887 |
a0b6b246 JX |
6267 | msgid "Submodule changes to be committed:" |
6268 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 6269 | |
fd8cb379 | 6270 | #: wt-status.c:969 |
a0b6b246 | 6271 | msgid "" |
6937cb4e JX |
6272 | "Do not modify or remove the line above.\n" |
6273 | "Everything below it will be ignored." | |
a0b6b246 | 6274 | msgstr "" |
6937cb4e JX |
6275 | "不要改动或删除上面的一行。\n" |
6276 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 6277 | |
fd8cb379 | 6278 | #: wt-status.c:1084 |
a0b6b246 JX |
6279 | msgid "You have unmerged paths." |
6280 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 6281 | |
a0b6b246 | 6282 | # 译者:注意保持前导空格 |
fd8cb379 | 6283 | #: wt-status.c:1087 |
a0b6b246 JX |
6284 | msgid " (fix conflicts and run \"git commit\")" |
6285 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 6286 | |
a0b6b246 | 6287 | # 译者:注意保持前导空格 |
fd8cb379 | 6288 | #: wt-status.c:1089 |
a0b6b246 JX |
6289 | msgid " (use \"git merge --abort\" to abort the merge)" |
6290 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 6291 | |
fd8cb379 | 6292 | #: wt-status.c:1094 |
a0b6b246 JX |
6293 | msgid "All conflicts fixed but you are still merging." |
6294 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 6295 | |
a0b6b246 | 6296 | # 译者:注意保持前导空格 |
fd8cb379 | 6297 | #: wt-status.c:1097 |
a0b6b246 JX |
6298 | msgid " (use \"git commit\" to conclude merge)" |
6299 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 6300 | |
fd8cb379 | 6301 | #: wt-status.c:1107 |
a0b6b246 JX |
6302 | msgid "You are in the middle of an am session." |
6303 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 6304 | |
fd8cb379 | 6305 | #: wt-status.c:1110 |
a0b6b246 JX |
6306 | msgid "The current patch is empty." |
6307 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 6308 | |
a0b6b246 | 6309 | # 译者:注意保持前导空格 |
fd8cb379 | 6310 | #: wt-status.c:1114 |
a0b6b246 JX |
6311 | msgid " (fix conflicts and then run \"git am --continue\")" |
6312 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 6313 | |
a0b6b246 | 6314 | # 译者:注意保持前导空格 |
fd8cb379 | 6315 | #: wt-status.c:1116 |
a0b6b246 JX |
6316 | msgid " (use \"git am --skip\" to skip this patch)" |
6317 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 6318 | |
a0b6b246 | 6319 | # 译者:注意保持前导空格 |
fd8cb379 | 6320 | #: wt-status.c:1118 |
a0b6b246 JX |
6321 | msgid " (use \"git am --abort\" to restore the original branch)" |
6322 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 6323 | |
fd8cb379 | 6324 | #: wt-status.c:1250 |
1a79b2f1 JX |
6325 | msgid "git-rebase-todo is missing." |
6326 | msgstr "git-rebase-todo 丢失。" | |
6327 | ||
fd8cb379 | 6328 | #: wt-status.c:1252 |
a0b6b246 JX |
6329 | msgid "No commands done." |
6330 | msgstr "没有命令被执行。" | |
6331 | ||
fd8cb379 | 6332 | #: wt-status.c:1255 |
1b7f4a34 | 6333 | #, c-format |
a0b6b246 JX |
6334 | msgid "Last command done (%d command done):" |
6335 | msgid_plural "Last commands done (%d commands done):" | |
6336 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
6337 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 6338 | |
fd8cb379 | 6339 | #: wt-status.c:1266 |
1b7f4a34 | 6340 | #, c-format |
a0b6b246 JX |
6341 | msgid " (see more in file %s)" |
6342 | msgstr " (更多参见文件 %s)" | |
6343 | ||
fd8cb379 | 6344 | #: wt-status.c:1271 |
a0b6b246 JX |
6345 | msgid "No commands remaining." |
6346 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 6347 | |
fd8cb379 | 6348 | #: wt-status.c:1274 |
1b7f4a34 | 6349 | #, c-format |
a0b6b246 JX |
6350 | msgid "Next command to do (%d remaining command):" |
6351 | msgid_plural "Next commands to do (%d remaining commands):" | |
6352 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
6353 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 6354 | |
a0b6b246 | 6355 | # 译者:注意保持前导空格 |
fd8cb379 | 6356 | #: wt-status.c:1282 |
a0b6b246 JX |
6357 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
6358 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 6359 | |
fd8cb379 | 6360 | #: wt-status.c:1295 |
1b7f4a34 | 6361 | #, c-format |
a0b6b246 JX |
6362 | msgid "You are currently rebasing branch '%s' on '%s'." |
6363 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 6364 | |
fd8cb379 | 6365 | #: wt-status.c:1300 |
a0b6b246 JX |
6366 | msgid "You are currently rebasing." |
6367 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 6368 | |
a0b6b246 | 6369 | # 译者:注意保持前导空格 |
fd8cb379 | 6370 | #: wt-status.c:1314 |
a0b6b246 JX |
6371 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
6372 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 6373 | |
a0b6b246 | 6374 | # 译者:注意保持前导空格 |
fd8cb379 | 6375 | #: wt-status.c:1316 |
a0b6b246 JX |
6376 | msgid " (use \"git rebase --skip\" to skip this patch)" |
6377 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
6378 | ||
6379 | # 译者:注意保持前导空格 | |
fd8cb379 | 6380 | #: wt-status.c:1318 |
a0b6b246 JX |
6381 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
6382 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
6383 | ||
6384 | # 译者:注意保持前导空格 | |
fd8cb379 | 6385 | #: wt-status.c:1324 |
a0b6b246 JX |
6386 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
6387 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 6388 | |
fd8cb379 | 6389 | #: wt-status.c:1328 |
a0b6b246 | 6390 | #, c-format |
1b7f4a34 | 6391 | msgid "" |
a0b6b246 JX |
6392 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
6393 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 6394 | |
fd8cb379 | 6395 | #: wt-status.c:1333 |
a0b6b246 JX |
6396 | msgid "You are currently splitting a commit during a rebase." |
6397 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 6398 | |
a0b6b246 | 6399 | # 译者:注意保持前导空格 |
fd8cb379 | 6400 | #: wt-status.c:1336 |
a0b6b246 JX |
6401 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
6402 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 6403 | |
fd8cb379 | 6404 | #: wt-status.c:1340 |
a0b6b246 JX |
6405 | #, c-format |
6406 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
6407 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 6408 | |
fd8cb379 | 6409 | #: wt-status.c:1345 |
a0b6b246 JX |
6410 | msgid "You are currently editing a commit during a rebase." |
6411 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 6412 | |
a0b6b246 | 6413 | # 译者:注意保持前导空格 |
fd8cb379 | 6414 | #: wt-status.c:1348 |
a0b6b246 JX |
6415 | msgid " (use \"git commit --amend\" to amend the current commit)" |
6416 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
6417 | ||
6418 | # 译者:注意保持前导空格 | |
fd8cb379 | 6419 | #: wt-status.c:1350 |
a0b6b246 JX |
6420 | msgid "" |
6421 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
6422 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 6423 | |
fd8cb379 | 6424 | #: wt-status.c:1360 |
1b7f4a34 | 6425 | #, c-format |
a0b6b246 JX |
6426 | msgid "You are currently cherry-picking commit %s." |
6427 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 6428 | |
a0b6b246 | 6429 | # 译者:注意保持前导空格 |
fd8cb379 | 6430 | #: wt-status.c:1365 |
a0b6b246 JX |
6431 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
6432 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 6433 | |
a0b6b246 | 6434 | # 译者:注意保持前导空格 |
fd8cb379 | 6435 | #: wt-status.c:1368 |
a0b6b246 JX |
6436 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
6437 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 6438 | |
a0b6b246 | 6439 | # 译者:注意保持前导空格 |
fd8cb379 | 6440 | #: wt-status.c:1370 |
a0b6b246 JX |
6441 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
6442 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 6443 | |
fd8cb379 | 6444 | #: wt-status.c:1379 |
1b7f4a34 | 6445 | #, c-format |
a0b6b246 JX |
6446 | msgid "You are currently reverting commit %s." |
6447 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 6448 | |
a0b6b246 | 6449 | # 译者:注意保持前导空格 |
fd8cb379 | 6450 | #: wt-status.c:1384 |
a0b6b246 JX |
6451 | msgid " (fix conflicts and run \"git revert --continue\")" |
6452 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 6453 | |
a0b6b246 | 6454 | # 译者:注意保持前导空格 |
fd8cb379 | 6455 | #: wt-status.c:1387 |
a0b6b246 JX |
6456 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
6457 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 6458 | |
a0b6b246 | 6459 | # 译者:注意保持前导空格 |
fd8cb379 | 6460 | #: wt-status.c:1389 |
a0b6b246 JX |
6461 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
6462 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 6463 | |
fd8cb379 | 6464 | #: wt-status.c:1400 |
1b7f4a34 | 6465 | #, c-format |
a0b6b246 JX |
6466 | msgid "You are currently bisecting, started from branch '%s'." |
6467 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 6468 | |
fd8cb379 | 6469 | #: wt-status.c:1404 |
a0b6b246 JX |
6470 | msgid "You are currently bisecting." |
6471 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 6472 | |
a0b6b246 | 6473 | # 译者:注意保持前导空格 |
fd8cb379 | 6474 | #: wt-status.c:1407 |
a0b6b246 JX |
6475 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
6476 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 6477 | |
fd8cb379 | 6478 | #: wt-status.c:1604 |
a0b6b246 JX |
6479 | msgid "On branch " |
6480 | msgstr "位于分支 " | |
1b7f4a34 | 6481 | |
fd8cb379 | 6482 | #: wt-status.c:1610 |
a0b6b246 JX |
6483 | msgid "interactive rebase in progress; onto " |
6484 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 6485 | |
fd8cb379 | 6486 | #: wt-status.c:1612 |
a0b6b246 JX |
6487 | msgid "rebase in progress; onto " |
6488 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 6489 | |
fd8cb379 | 6490 | #: wt-status.c:1617 |
a0b6b246 JX |
6491 | msgid "HEAD detached at " |
6492 | msgstr "头指针分离于 " | |
1b7f4a34 | 6493 | |
fd8cb379 | 6494 | #: wt-status.c:1619 |
a0b6b246 JX |
6495 | msgid "HEAD detached from " |
6496 | msgstr "头指针分离自 " | |
1b7f4a34 | 6497 | |
fd8cb379 | 6498 | #: wt-status.c:1622 |
a0b6b246 JX |
6499 | msgid "Not currently on any branch." |
6500 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 6501 | |
fd8cb379 | 6502 | #: wt-status.c:1642 |
a0b6b246 JX |
6503 | msgid "Initial commit" |
6504 | msgstr "初始提交" | |
1b7f4a34 | 6505 | |
fd8cb379 | 6506 | #: wt-status.c:1643 |
a4f16749 JX |
6507 | msgid "No commits yet" |
6508 | msgstr "尚无提交" | |
6509 | ||
fd8cb379 | 6510 | #: wt-status.c:1657 |
a0b6b246 JX |
6511 | msgid "Untracked files" |
6512 | msgstr "未跟踪的文件" | |
1b7f4a34 | 6513 | |
fd8cb379 | 6514 | #: wt-status.c:1659 |
a0b6b246 JX |
6515 | msgid "Ignored files" |
6516 | msgstr "忽略的文件" | |
1b7f4a34 | 6517 | |
fd8cb379 | 6518 | #: wt-status.c:1663 |
a0b6b246 JX |
6519 | #, c-format |
6520 | msgid "" | |
6521 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
6522 | "may speed it up, but you have to be careful not to forget to add\n" | |
6523 | "new files yourself (see 'git help status')." | |
6524 | msgstr "" | |
6525 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
6526 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 6527 | |
fd8cb379 | 6528 | #: wt-status.c:1669 |
a0b6b246 JX |
6529 | #, c-format |
6530 | msgid "Untracked files not listed%s" | |
6531 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 6532 | |
a0b6b246 | 6533 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 6534 | #: wt-status.c:1671 |
a0b6b246 JX |
6535 | msgid " (use -u option to show untracked files)" |
6536 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 6537 | |
fd8cb379 | 6538 | #: wt-status.c:1677 |
a0b6b246 JX |
6539 | msgid "No changes" |
6540 | msgstr "没有修改" | |
1b7f4a34 | 6541 | |
fd8cb379 | 6542 | #: wt-status.c:1682 |
a0b6b246 JX |
6543 | #, c-format |
6544 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
6545 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 6546 | |
fd8cb379 | 6547 | #: wt-status.c:1685 |
a0b6b246 JX |
6548 | #, c-format |
6549 | msgid "no changes added to commit\n" | |
6550 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 6551 | |
fd8cb379 | 6552 | #: wt-status.c:1688 |
a0b6b246 JX |
6553 | #, c-format |
6554 | msgid "" | |
6555 | "nothing added to commit but untracked files present (use \"git add\" to " | |
6556 | "track)\n" | |
6557 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 6558 | |
fd8cb379 | 6559 | #: wt-status.c:1691 |
a0b6b246 JX |
6560 | #, c-format |
6561 | msgid "nothing added to commit but untracked files present\n" | |
6562 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 6563 | |
a0b6b246 | 6564 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 6565 | #: wt-status.c:1694 |
a0b6b246 JX |
6566 | #, c-format |
6567 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
6568 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 6569 | |
fd8cb379 | 6570 | #: wt-status.c:1697 wt-status.c:1702 |
a0b6b246 JX |
6571 | #, c-format |
6572 | msgid "nothing to commit\n" | |
6573 | msgstr "无文件要提交\n" | |
1b7f4a34 | 6574 | |
a0b6b246 | 6575 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 6576 | #: wt-status.c:1700 |
a0b6b246 JX |
6577 | #, c-format |
6578 | msgid "nothing to commit (use -u to show untracked files)\n" | |
6579 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 6580 | |
a0b6b246 | 6581 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 6582 | #: wt-status.c:1704 |
a0b6b246 JX |
6583 | #, c-format |
6584 | msgid "nothing to commit, working tree clean\n" | |
6585 | msgstr "无文件要提交,干净的工作区\n" | |
6586 | ||
fd8cb379 | 6587 | #: wt-status.c:1817 |
a4f16749 JX |
6588 | msgid "No commits yet on " |
6589 | msgstr "尚无提交在 " | |
1b7f4a34 | 6590 | |
fd8cb379 | 6591 | #: wt-status.c:1821 |
a0b6b246 JX |
6592 | msgid "HEAD (no branch)" |
6593 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 6594 | |
fd8cb379 | 6595 | #: wt-status.c:1852 |
31e5e17b JX |
6596 | msgid "different" |
6597 | msgstr "不同" | |
6598 | ||
a0b6b246 | 6599 | # 译者:注意保持句尾空格 |
fd8cb379 | 6600 | #: wt-status.c:1854 wt-status.c:1862 |
a0b6b246 JX |
6601 | msgid "behind " |
6602 | msgstr "落后 " | |
1b7f4a34 | 6603 | |
fd8cb379 | 6604 | #: wt-status.c:1857 wt-status.c:1860 |
a0b6b246 JX |
6605 | msgid "ahead " |
6606 | msgstr "领先 " | |
1b7f4a34 | 6607 | |
a0b6b246 | 6608 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
c1ac5258 | 6609 | #: wt-status.c:2376 |
a0b6b246 JX |
6610 | #, c-format |
6611 | msgid "cannot %s: You have unstaged changes." | |
6612 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 6613 | |
c1ac5258 | 6614 | #: wt-status.c:2382 |
a0b6b246 | 6615 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 6616 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 6617 | |
c1ac5258 | 6618 | #: wt-status.c:2384 |
a0b6b246 JX |
6619 | #, c-format |
6620 | msgid "cannot %s: Your index contains uncommitted changes." | |
6621 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 6622 | |
c1ac5258 | 6623 | #: compat/precompose_utf8.c:58 builtin/clone.c:443 |
a0b6b246 JX |
6624 | #, c-format |
6625 | msgid "failed to unlink '%s'" | |
c1ac5258 | 6626 | msgstr "删除 '%s' 失败" |
1b7f4a34 | 6627 | |
a4f16749 | 6628 | #: builtin/add.c:24 |
a0b6b246 JX |
6629 | msgid "git add [<options>] [--] <pathspec>..." |
6630 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 6631 | |
5809aa05 | 6632 | #: builtin/add.c:83 |
a0b6b246 JX |
6633 | #, c-format |
6634 | msgid "unexpected diff status %c" | |
6635 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 6636 | |
c1ac5258 | 6637 | #: builtin/add.c:88 builtin/commit.c:279 |
a0b6b246 JX |
6638 | msgid "updating files failed" |
6639 | msgstr "更新文件失败" | |
1b7f4a34 | 6640 | |
5809aa05 | 6641 | #: builtin/add.c:98 |
a0b6b246 JX |
6642 | #, c-format |
6643 | msgid "remove '%s'\n" | |
6644 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 6645 | |
5809aa05 | 6646 | #: builtin/add.c:173 |
a0b6b246 JX |
6647 | msgid "Unstaged changes after refreshing the index:" |
6648 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 6649 | |
c1ac5258 | 6650 | #: builtin/add.c:233 builtin/rev-parse.c:893 |
a0b6b246 JX |
6651 | msgid "Could not read the index" |
6652 | msgstr "不能读取索引" | |
1b7f4a34 | 6653 | |
5809aa05 | 6654 | #: builtin/add.c:244 |
a0b6b246 JX |
6655 | #, c-format |
6656 | msgid "Could not open '%s' for writing." | |
c1ac5258 | 6657 | msgstr "无法为写入打开 '%s'。" |
1b7f4a34 | 6658 | |
5809aa05 | 6659 | #: builtin/add.c:248 |
a0b6b246 JX |
6660 | msgid "Could not write patch" |
6661 | msgstr "不能生成补丁" | |
1b7f4a34 | 6662 | |
5809aa05 | 6663 | #: builtin/add.c:251 |
a0b6b246 JX |
6664 | msgid "editing patch failed" |
6665 | msgstr "编辑补丁失败" | |
1b7f4a34 | 6666 | |
5809aa05 | 6667 | #: builtin/add.c:254 |
1b7f4a34 | 6668 | #, c-format |
a0b6b246 | 6669 | msgid "Could not stat '%s'" |
65e2041e | 6670 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 6671 | |
5809aa05 | 6672 | #: builtin/add.c:256 |
a0b6b246 JX |
6673 | msgid "Empty patch. Aborted." |
6674 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 6675 | |
5809aa05 | 6676 | #: builtin/add.c:261 |
a0b6b246 JX |
6677 | #, c-format |
6678 | msgid "Could not apply '%s'" | |
6679 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 6680 | |
fd8cb379 | 6681 | #: builtin/add.c:269 |
a0b6b246 JX |
6682 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
6683 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 6684 | |
c1ac5258 JX |
6685 | #: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 |
6686 | #: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 | |
6687 | #: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 | |
a0b6b246 JX |
6688 | msgid "dry run" |
6689 | msgstr "演习" | |
8ada9598 | 6690 | |
fd8cb379 | 6691 | #: builtin/add.c:292 |
a0b6b246 JX |
6692 | msgid "interactive picking" |
6693 | msgstr "交互式拣选" | |
8ada9598 | 6694 | |
c1ac5258 | 6695 | #: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 |
a0b6b246 JX |
6696 | msgid "select hunks interactively" |
6697 | msgstr "交互式挑选数据块" | |
8ada9598 | 6698 | |
fd8cb379 | 6699 | #: builtin/add.c:294 |
a0b6b246 JX |
6700 | msgid "edit current diff and apply" |
6701 | msgstr "编辑当前差异并应用" | |
8ada9598 | 6702 | |
fd8cb379 | 6703 | #: builtin/add.c:295 |
a0b6b246 JX |
6704 | msgid "allow adding otherwise ignored files" |
6705 | msgstr "允许添加忽略的文件" | |
8ada9598 | 6706 | |
fd8cb379 | 6707 | #: builtin/add.c:296 |
a0b6b246 JX |
6708 | msgid "update tracked files" |
6709 | msgstr "更新已跟踪的文件" | |
8ada9598 | 6710 | |
fd8cb379 | 6711 | #: builtin/add.c:297 |
5809aa05 JX |
6712 | msgid "renormalize EOL of tracked files (implies -u)" |
6713 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
6714 | ||
fd8cb379 | 6715 | #: builtin/add.c:298 |
a0b6b246 JX |
6716 | msgid "record only the fact that the path will be added later" |
6717 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 6718 | |
fd8cb379 | 6719 | #: builtin/add.c:299 |
a0b6b246 JX |
6720 | msgid "add changes from all tracked and untracked files" |
6721 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 6722 | |
fd8cb379 | 6723 | #: builtin/add.c:302 |
a0b6b246 JX |
6724 | msgid "ignore paths removed in the working tree (same as --no-all)" |
6725 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 6726 | |
fd8cb379 | 6727 | #: builtin/add.c:304 |
a0b6b246 JX |
6728 | msgid "don't add, only refresh the index" |
6729 | msgstr "不添加,只刷新索引" | |
8ada9598 | 6730 | |
fd8cb379 | 6731 | #: builtin/add.c:305 |
a0b6b246 JX |
6732 | msgid "just skip files which cannot be added because of errors" |
6733 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 6734 | |
fd8cb379 | 6735 | #: builtin/add.c:306 |
a0b6b246 JX |
6736 | msgid "check if - even missing - files are ignored in dry run" |
6737 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 6738 | |
c1ac5258 | 6739 | #: builtin/add.c:308 builtin/update-index.c:973 |
a0b6b246 JX |
6740 | msgid "override the executable bit of the listed files" |
6741 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 6742 | |
c1ac5258 | 6743 | #: builtin/add.c:310 |
a4f16749 JX |
6744 | msgid "warn when adding an embedded repository" |
6745 | msgstr "创建一个嵌入式仓库时给予警告" | |
6746 | ||
c1ac5258 | 6747 | #: builtin/add.c:325 |
a4f16749 JX |
6748 | #, c-format |
6749 | msgid "" | |
6750 | "You've added another git repository inside your current repository.\n" | |
6751 | "Clones of the outer repository will not contain the contents of\n" | |
6752 | "the embedded repository and will not know how to obtain it.\n" | |
6753 | "If you meant to add a submodule, use:\n" | |
6754 | "\n" | |
6755 | "\tgit submodule add <url> %s\n" | |
6756 | "\n" | |
6757 | "If you added this path by mistake, you can remove it from the\n" | |
6758 | "index with:\n" | |
6759 | "\n" | |
6760 | "\tgit rm --cached %s\n" | |
6761 | "\n" | |
6762 | "See \"git help submodule\" for more information." | |
6763 | msgstr "" | |
6937cb4e JX |
6764 | "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并" |
6765 | "且不知道该如何获取它。\n" | |
a4f16749 JX |
6766 | "如果您要添加一个子模组,使用:\n" |
6767 | "\n" | |
6768 | "\tgit submodule add <url> %s\n" | |
6769 | "\n" | |
6770 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
6771 | "\n" | |
6772 | "\tgit rm --cached %s\n" | |
6773 | "\n" | |
6774 | "参见 \"git help submodule\" 获取更多信息。" | |
6775 | ||
c1ac5258 | 6776 | #: builtin/add.c:353 |
a4f16749 JX |
6777 | #, c-format |
6778 | msgid "adding embedded git repository: %s" | |
6779 | msgstr "正在添加嵌入式 git 仓库:%s" | |
6780 | ||
c1ac5258 | 6781 | #: builtin/add.c:371 |
8ada9598 | 6782 | #, c-format |
a0b6b246 JX |
6783 | msgid "Use -f if you really want to add them.\n" |
6784 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 6785 | |
c1ac5258 | 6786 | #: builtin/add.c:379 |
a0b6b246 JX |
6787 | msgid "adding files failed" |
6788 | msgstr "添加文件失败" | |
8ada9598 | 6789 | |
c1ac5258 | 6790 | #: builtin/add.c:417 |
a0b6b246 JX |
6791 | msgid "-A and -u are mutually incompatible" |
6792 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 6793 | |
c1ac5258 | 6794 | #: builtin/add.c:424 |
a0b6b246 JX |
6795 | msgid "Option --ignore-missing can only be used together with --dry-run" |
6796 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 6797 | |
c1ac5258 | 6798 | #: builtin/add.c:428 |
8ada9598 | 6799 | #, c-format |
a0b6b246 JX |
6800 | msgid "--chmod param '%s' must be either -x or +x" |
6801 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 6802 | |
c1ac5258 | 6803 | #: builtin/add.c:443 |
8ada9598 | 6804 | #, c-format |
a0b6b246 JX |
6805 | msgid "Nothing specified, nothing added.\n" |
6806 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 6807 | |
c1ac5258 | 6808 | #: builtin/add.c:444 |
8ada9598 | 6809 | #, c-format |
a0b6b246 JX |
6810 | msgid "Maybe you wanted to say 'git add .'?\n" |
6811 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 6812 | |
c1ac5258 JX |
6813 | #: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 |
6814 | #: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 | |
6815 | #: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 | |
6816 | #: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 | |
a0b6b246 JX |
6817 | msgid "index file corrupt" |
6818 | msgstr "索引文件损坏" | |
8ada9598 | 6819 | |
c1ac5258 | 6820 | #: builtin/am.c:415 |
a0b6b246 JX |
6821 | msgid "could not parse author script" |
6822 | msgstr "不能解析作者脚本" | |
8ada9598 | 6823 | |
c1ac5258 | 6824 | #: builtin/am.c:499 |
81809b99 | 6825 | #, c-format |
a0b6b246 JX |
6826 | msgid "'%s' was deleted by the applypatch-msg hook" |
6827 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 6828 | |
c1ac5258 | 6829 | #: builtin/am.c:540 |
8ada9598 | 6830 | #, c-format |
a0b6b246 JX |
6831 | msgid "Malformed input line: '%s'." |
6832 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 6833 | |
c1ac5258 | 6834 | #: builtin/am.c:577 |
8ada9598 | 6835 | #, c-format |
a0b6b246 JX |
6836 | msgid "Failed to copy notes from '%s' to '%s'" |
6837 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 6838 | |
c1ac5258 | 6839 | #: builtin/am.c:603 |
a0b6b246 JX |
6840 | msgid "fseek failed" |
6841 | msgstr "fseek 失败" | |
8ada9598 | 6842 | |
c1ac5258 | 6843 | #: builtin/am.c:791 |
8ada9598 | 6844 | #, c-format |
a0b6b246 JX |
6845 | msgid "could not parse patch '%s'" |
6846 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 6847 | |
c1ac5258 | 6848 | #: builtin/am.c:856 |
a0b6b246 JX |
6849 | msgid "Only one StGIT patch series can be applied at once" |
6850 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
6851 | ||
c1ac5258 | 6852 | #: builtin/am.c:904 |
a0b6b246 JX |
6853 | msgid "invalid timestamp" |
6854 | msgstr "无效的时间戳" | |
6855 | ||
c1ac5258 | 6856 | #: builtin/am.c:909 builtin/am.c:921 |
a0b6b246 JX |
6857 | msgid "invalid Date line" |
6858 | msgstr "无效的日期行" | |
8ada9598 | 6859 | |
c1ac5258 | 6860 | #: builtin/am.c:916 |
a0b6b246 JX |
6861 | msgid "invalid timezone offset" |
6862 | msgstr "无效的时区偏移值" | |
8ada9598 | 6863 | |
c1ac5258 | 6864 | #: builtin/am.c:1009 |
a0b6b246 | 6865 | msgid "Patch format detection failed." |
87cb7997 | 6866 | msgstr "补丁格式探测失败。" |
8ada9598 | 6867 | |
c1ac5258 | 6868 | #: builtin/am.c:1014 builtin/clone.c:408 |
8ada9598 | 6869 | #, c-format |
a0b6b246 | 6870 | msgid "failed to create directory '%s'" |
c1ac5258 | 6871 | msgstr "创建目录 '%s' 失败" |
8ada9598 | 6872 | |
c1ac5258 | 6873 | #: builtin/am.c:1019 |
a0b6b246 | 6874 | msgid "Failed to split patches." |
c1ac5258 | 6875 | msgstr "拆分补丁失败。" |
814ff314 | 6876 | |
c1ac5258 | 6877 | #: builtin/am.c:1149 builtin/commit.c:364 |
a0b6b246 JX |
6878 | msgid "unable to write index file" |
6879 | msgstr "无法写入索引文件" | |
8ada9598 | 6880 | |
c1ac5258 | 6881 | #: builtin/am.c:1163 |
8ada9598 | 6882 | #, c-format |
a0b6b246 JX |
6883 | msgid "When you have resolved this problem, run \"%s --continue\"." |
6884 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 6885 | |
c1ac5258 | 6886 | #: builtin/am.c:1164 |
81809b99 | 6887 | #, c-format |
a0b6b246 JX |
6888 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
6889 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 6890 | |
c1ac5258 | 6891 | #: builtin/am.c:1165 |
81809b99 | 6892 | #, c-format |
a0b6b246 JX |
6893 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
6894 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 6895 | |
c1ac5258 | 6896 | #: builtin/am.c:1272 |
a4f16749 JX |
6897 | msgid "Patch is empty." |
6898 | msgstr "补丁为空。" | |
23ff3338 | 6899 | |
c1ac5258 | 6900 | #: builtin/am.c:1338 |
8ada9598 | 6901 | #, c-format |
a4f16749 JX |
6902 | msgid "invalid ident line: %.*s" |
6903 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 6904 | |
c1ac5258 | 6905 | #: builtin/am.c:1360 |
8ada9598 | 6906 | #, c-format |
a0b6b246 JX |
6907 | msgid "unable to parse commit %s" |
6908 | msgstr "不能解析提交 %s" | |
8ada9598 | 6909 | |
c1ac5258 | 6910 | #: builtin/am.c:1556 |
a0b6b246 JX |
6911 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
6912 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 6913 | |
c1ac5258 | 6914 | #: builtin/am.c:1558 |
a0b6b246 JX |
6915 | msgid "Using index info to reconstruct a base tree..." |
6916 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 6917 | |
c1ac5258 | 6918 | #: builtin/am.c:1577 |
a0b6b246 JX |
6919 | msgid "" |
6920 | "Did you hand edit your patch?\n" | |
6921 | "It does not apply to blobs recorded in its index." | |
6922 | msgstr "" | |
6923 | "您是否曾手动编辑过您的补丁?\n" | |
6924 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 6925 | |
c1ac5258 | 6926 | #: builtin/am.c:1583 |
a0b6b246 JX |
6927 | msgid "Falling back to patching base and 3-way merge..." |
6928 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 6929 | |
c1ac5258 | 6930 | #: builtin/am.c:1608 |
a0b6b246 JX |
6931 | msgid "Failed to merge in the changes." |
6932 | msgstr "无法合并变更。" | |
d691f479 | 6933 | |
c1ac5258 | 6934 | #: builtin/am.c:1640 |
a0b6b246 JX |
6935 | msgid "applying to an empty history" |
6936 | msgstr "正应用到一个空历史上" | |
8ada9598 | 6937 | |
c1ac5258 | 6938 | #: builtin/am.c:1686 builtin/am.c:1690 |
8ada9598 | 6939 | #, c-format |
a0b6b246 JX |
6940 | msgid "cannot resume: %s does not exist." |
6941 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 6942 | |
c1ac5258 | 6943 | #: builtin/am.c:1706 |
a0b6b246 JX |
6944 | msgid "cannot be interactive without stdin connected to a terminal." |
6945 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 6946 | |
c1ac5258 | 6947 | #: builtin/am.c:1711 |
a0b6b246 JX |
6948 | msgid "Commit Body is:" |
6949 | msgstr "提交内容为:" | |
8ada9598 | 6950 | |
a0b6b246 JX |
6951 | # 译者:注意保持句尾空格 |
6952 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
6953 | #. in your translation. The program will only accept English | |
6954 | #. input at this point. | |
6955 | #. | |
c1ac5258 | 6956 | #: builtin/am.c:1721 |
a0b6b246 JX |
6957 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
6958 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 6959 | |
c1ac5258 | 6960 | #: builtin/am.c:1771 |
8ada9598 | 6961 | #, c-format |
a0b6b246 JX |
6962 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
6963 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 6964 | |
c1ac5258 | 6965 | #: builtin/am.c:1811 builtin/am.c:1879 |
81809b99 | 6966 | #, c-format |
a0b6b246 JX |
6967 | msgid "Applying: %.*s" |
6968 | msgstr "应用:%.*s" | |
8ada9598 | 6969 | |
c1ac5258 | 6970 | #: builtin/am.c:1828 |
a0b6b246 JX |
6971 | msgid "No changes -- Patch already applied." |
6972 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 6973 | |
c1ac5258 | 6974 | #: builtin/am.c:1834 |
81809b99 | 6975 | #, c-format |
a0b6b246 JX |
6976 | msgid "Patch failed at %s %.*s" |
6977 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 6978 | |
31e5e17b JX |
6979 | #: builtin/am.c:1838 |
6980 | msgid "Use 'git am --show-current-patch' to see the failed patch" | |
6981 | msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" | |
8ada9598 | 6982 | |
31e5e17b | 6983 | #: builtin/am.c:1882 |
a0b6b246 JX |
6984 | msgid "" |
6985 | "No changes - did you forget to use 'git add'?\n" | |
6986 | "If there is nothing left to stage, chances are that something else\n" | |
6987 | "already introduced the same changes; you might want to skip this patch." | |
6988 | msgstr "" | |
6989 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
6990 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
6991 | "您也许想要跳过这个补丁。" | |
8ada9598 | 6992 | |
31e5e17b | 6993 | #: builtin/am.c:1889 |
a0b6b246 JX |
6994 | msgid "" |
6995 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
6996 | "You should 'git add' each file with resolved conflicts to mark them as " |
6997 | "such.\n" | |
6998 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 6999 | msgstr "" |
a4f16749 JX |
7000 | "在您的索引中仍存在未合并的路径。\n" |
7001 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
7002 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 7003 | |
31e5e17b JX |
7004 | #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 |
7005 | #: builtin/reset.c:332 | |
8ada9598 | 7006 | #, c-format |
a0b6b246 JX |
7007 | msgid "Could not parse object '%s'." |
7008 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 7009 | |
31e5e17b | 7010 | #: builtin/am.c:2048 |
a0b6b246 | 7011 | msgid "failed to clean index" |
c1ac5258 | 7012 | msgstr "清空索引失败" |
5b04ee3b | 7013 | |
31e5e17b | 7014 | #: builtin/am.c:2083 |
a0b6b246 JX |
7015 | msgid "" |
7016 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
7017 | "Not rewinding to ORIG_HEAD" | |
7018 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 7019 | |
31e5e17b | 7020 | #: builtin/am.c:2174 |
8ada9598 | 7021 | #, c-format |
a0b6b246 JX |
7022 | msgid "Invalid value for --patch-format: %s" |
7023 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 7024 | |
31e5e17b | 7025 | #: builtin/am.c:2210 |
a0b6b246 JX |
7026 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
7027 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 7028 | |
31e5e17b | 7029 | #: builtin/am.c:2211 |
a0b6b246 JX |
7030 | msgid "git am [<options>] (--continue | --skip | --abort)" |
7031 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 7032 | |
31e5e17b | 7033 | #: builtin/am.c:2217 |
a0b6b246 JX |
7034 | msgid "run interactively" |
7035 | msgstr "以交互式方式运行" | |
8ada9598 | 7036 | |
31e5e17b | 7037 | #: builtin/am.c:2219 |
a0b6b246 JX |
7038 | msgid "historical option -- no-op" |
7039 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 7040 | |
31e5e17b | 7041 | #: builtin/am.c:2221 |
a0b6b246 JX |
7042 | msgid "allow fall back on 3way merging if needed" |
7043 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 7044 | |
c1ac5258 JX |
7045 | #: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 |
7046 | #: builtin/repack.c:299 | |
a0b6b246 JX |
7047 | msgid "be quiet" |
7048 | msgstr "静默模式" | |
8ada9598 | 7049 | |
31e5e17b | 7050 | #: builtin/am.c:2224 |
a0b6b246 JX |
7051 | msgid "add a Signed-off-by line to the commit message" |
7052 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 7053 | |
31e5e17b | 7054 | #: builtin/am.c:2227 |
a0b6b246 JX |
7055 | msgid "recode into utf8 (default)" |
7056 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 7057 | |
31e5e17b | 7058 | #: builtin/am.c:2229 |
a0b6b246 JX |
7059 | msgid "pass -k flag to git-mailinfo" |
7060 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 7061 | |
31e5e17b | 7062 | #: builtin/am.c:2231 |
a0b6b246 JX |
7063 | msgid "pass -b flag to git-mailinfo" |
7064 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 7065 | |
31e5e17b | 7066 | #: builtin/am.c:2233 |
a0b6b246 JX |
7067 | msgid "pass -m flag to git-mailinfo" |
7068 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 7069 | |
31e5e17b | 7070 | #: builtin/am.c:2235 |
a0b6b246 JX |
7071 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
7072 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 7073 | |
31e5e17b | 7074 | #: builtin/am.c:2238 |
a0b6b246 JX |
7075 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
7076 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 7077 | |
31e5e17b | 7078 | #: builtin/am.c:2241 |
a0b6b246 JX |
7079 | msgid "strip everything before a scissors line" |
7080 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 7081 | |
31e5e17b JX |
7082 | #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 |
7083 | #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 | |
7084 | #: builtin/am.c:2270 | |
a0b6b246 JX |
7085 | msgid "pass it through git-apply" |
7086 | msgstr "传递给 git-apply" | |
8ada9598 | 7087 | |
c1ac5258 JX |
7088 | #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 |
7089 | #: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 | |
7090 | #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 | |
7091 | #: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 | |
7092 | #: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 | |
fd8cb379 | 7093 | #: parse-options.h:146 parse-options.h:258 |
a0b6b246 JX |
7094 | msgid "n" |
7095 | msgstr "n" | |
8ada9598 | 7096 | |
c1ac5258 JX |
7097 | #: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38 |
7098 | #: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 | |
a0b6b246 JX |
7099 | msgid "format" |
7100 | msgstr "格式" | |
8ada9598 | 7101 | |
31e5e17b | 7102 | #: builtin/am.c:2267 |
a0b6b246 JX |
7103 | msgid "format the patch(es) are in" |
7104 | msgstr "补丁的格式" | |
8ada9598 | 7105 | |
31e5e17b | 7106 | #: builtin/am.c:2273 |
a0b6b246 JX |
7107 | msgid "override error message when patch failure occurs" |
7108 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 7109 | |
31e5e17b | 7110 | #: builtin/am.c:2275 |
a0b6b246 JX |
7111 | msgid "continue applying patches after resolving a conflict" |
7112 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 7113 | |
31e5e17b | 7114 | #: builtin/am.c:2278 |
a0b6b246 JX |
7115 | msgid "synonyms for --continue" |
7116 | msgstr "和 --continue 同义" | |
8ada9598 | 7117 | |
31e5e17b | 7118 | #: builtin/am.c:2281 |
a0b6b246 JX |
7119 | msgid "skip the current patch" |
7120 | msgstr "跳过当前补丁" | |
23ff3338 | 7121 | |
31e5e17b | 7122 | #: builtin/am.c:2284 |
a0b6b246 JX |
7123 | msgid "restore the original branch and abort the patching operation." |
7124 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 7125 | |
31e5e17b JX |
7126 | #: builtin/am.c:2287 |
7127 | msgid "abort the patching operation but keep HEAD where it is." | |
7128 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
7129 | ||
7130 | #: builtin/am.c:2290 | |
7131 | msgid "show the patch being applied." | |
7132 | msgstr "显示正在应用的补丁。" | |
7133 | ||
7134 | #: builtin/am.c:2294 | |
a0b6b246 JX |
7135 | msgid "lie about committer date" |
7136 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 7137 | |
31e5e17b | 7138 | #: builtin/am.c:2296 |
a0b6b246 JX |
7139 | msgid "use current timestamp for author date" |
7140 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 7141 | |
c1ac5258 JX |
7142 | #: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 |
7143 | #: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 | |
a0b6b246 JX |
7144 | msgid "key-id" |
7145 | msgstr "key-id" | |
8ada9598 | 7146 | |
31e5e17b | 7147 | #: builtin/am.c:2299 |
a0b6b246 JX |
7148 | msgid "GPG-sign commits" |
7149 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 7150 | |
31e5e17b | 7151 | #: builtin/am.c:2302 |
a0b6b246 JX |
7152 | msgid "(internal use for git-rebase)" |
7153 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 7154 | |
31e5e17b | 7155 | #: builtin/am.c:2320 |
a0b6b246 JX |
7156 | msgid "" |
7157 | "The -b/--binary option has been a no-op for long time, and\n" | |
7158 | "it will be removed. Please do not use it anymore." | |
7159 | msgstr "" | |
7160 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
7161 | "请不要再使用它了。" | |
8ada9598 | 7162 | |
31e5e17b | 7163 | #: builtin/am.c:2327 |
a0b6b246 | 7164 | msgid "failed to read the index" |
c1ac5258 | 7165 | msgstr "读取索引失败" |
8ada9598 | 7166 | |
31e5e17b | 7167 | #: builtin/am.c:2342 |
a0b6b246 JX |
7168 | #, c-format |
7169 | msgid "previous rebase directory %s still exists but mbox given." | |
7170 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 7171 | |
31e5e17b | 7172 | #: builtin/am.c:2366 |
a0b6b246 JX |
7173 | #, c-format |
7174 | msgid "" | |
7175 | "Stray %s directory found.\n" | |
7176 | "Use \"git am --abort\" to remove it." | |
7177 | msgstr "" | |
7178 | "发现了错误的 %s 目录。\n" | |
7179 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 7180 | |
31e5e17b | 7181 | #: builtin/am.c:2372 |
a0b6b246 JX |
7182 | msgid "Resolve operation not in progress, we are not resuming." |
7183 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 7184 | |
a0b6b246 JX |
7185 | #: builtin/apply.c:8 |
7186 | msgid "git apply [<options>] [<patch>...]" | |
7187 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 7188 | |
c04f5ac3 JX |
7189 | #: builtin/archive.c:17 |
7190 | #, c-format | |
7191 | msgid "could not create archive file '%s'" | |
90e6ef53 | 7192 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
7193 | |
7194 | #: builtin/archive.c:20 | |
7195 | msgid "could not redirect output" | |
195febda | 7196 | msgstr "不能重定向输出" |
c04f5ac3 JX |
7197 | |
7198 | #: builtin/archive.c:37 | |
7199 | msgid "git archive: Remote with no URL" | |
4375c10e | 7200 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
7201 | |
7202 | #: builtin/archive.c:58 | |
31e5e17b JX |
7203 | msgid "git archive: expected ACK/NAK, got a flush packet" |
7204 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 7205 | |
1003b3a5 | 7206 | #: builtin/archive.c:61 |
c04f5ac3 JX |
7207 | #, c-format |
7208 | msgid "git archive: NACK %s" | |
90e6ef53 | 7209 | msgstr "git archive:NACK %s" |
c04f5ac3 | 7210 | |
1003b3a5 | 7211 | #: builtin/archive.c:64 |
c04f5ac3 | 7212 | msgid "git archive: protocol error" |
90e6ef53 | 7213 | msgstr "git archive:协议错误" |
c04f5ac3 | 7214 | |
1003b3a5 | 7215 | #: builtin/archive.c:68 |
c04f5ac3 | 7216 | msgid "git archive: expected a flush" |
31e5e17b | 7217 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 7218 | |
5809aa05 | 7219 | #: builtin/bisect--helper.c:12 |
ef317cd5 | 7220 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 7221 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 7222 | |
5809aa05 JX |
7223 | #: builtin/bisect--helper.c:13 |
7224 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" | |
7225 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
7226 | ||
7227 | #: builtin/bisect--helper.c:14 | |
7228 | msgid "git bisect--helper --bisect-clean-state" | |
7229 | msgstr "git bisect--helper --bisect-clean-state" | |
7230 | ||
7231 | #: builtin/bisect--helper.c:46 | |
7232 | #, c-format | |
7233 | msgid "'%s' is not a valid term" | |
7234 | msgstr "'%s' 不是一个有效的术语" | |
7235 | ||
7236 | #: builtin/bisect--helper.c:50 | |
7237 | #, c-format | |
7238 | msgid "can't use the builtin command '%s' as a term" | |
7239 | msgstr "不能使用内置命令 '%s' 作为术语" | |
7240 | ||
7241 | #: builtin/bisect--helper.c:60 | |
7242 | #, c-format | |
7243 | msgid "can't change the meaning of the term '%s'" | |
7244 | msgstr "不能修改术语 '%s' 的含义" | |
7245 | ||
7246 | #: builtin/bisect--helper.c:71 | |
7247 | msgid "please use two different terms" | |
7248 | msgstr "请使用两个不同的术语" | |
7249 | ||
7250 | #: builtin/bisect--helper.c:78 | |
7251 | msgid "could not open the file BISECT_TERMS" | |
7252 | msgstr "不能打开文件 BISECT_TERMS" | |
7253 | ||
7254 | #: builtin/bisect--helper.c:120 | |
ef317cd5 | 7255 | msgid "perform 'git bisect next'" |
07432cef | 7256 | msgstr "执行 'git bisect next'" |
ef317cd5 | 7257 | |
5809aa05 JX |
7258 | #: builtin/bisect--helper.c:122 |
7259 | msgid "write the terms to .git/BISECT_TERMS" | |
7260 | msgstr "将术语写入 .git/BISECT_TERMS" | |
7261 | ||
7262 | #: builtin/bisect--helper.c:124 | |
7263 | msgid "cleanup the bisection state" | |
7264 | msgstr "清除二分查找状态" | |
7265 | ||
7266 | #: builtin/bisect--helper.c:126 | |
7267 | msgid "check for expected revs" | |
7268 | msgstr "检查预期的版本" | |
7269 | ||
7270 | #: builtin/bisect--helper.c:128 | |
ef317cd5 | 7271 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 7272 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 7273 | |
5809aa05 JX |
7274 | #: builtin/bisect--helper.c:143 |
7275 | msgid "--write-terms requires two arguments" | |
7276 | msgstr "--write-terms 需要两个参数" | |
7277 | ||
7278 | #: builtin/bisect--helper.c:147 | |
7279 | msgid "--bisect-clean-state requires no arguments" | |
7280 | msgstr "--bisect-clean-state 不需要参数" | |
7281 | ||
c1ac5258 | 7282 | #: builtin/blame.c:31 |
7aea43ff JX |
7283 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
7284 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 7285 | |
c1ac5258 | 7286 | #: builtin/blame.c:36 |
814ff314 JX |
7287 | msgid "<rev-opts> are documented in git-rev-list(1)" |
7288 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 7289 | |
c1ac5258 | 7290 | #: builtin/blame.c:406 |
fd8cb379 JX |
7291 | #, c-format |
7292 | msgid "expecting a color: %s" | |
7293 | msgstr "期望一个颜色:%s" | |
7294 | ||
c1ac5258 | 7295 | #: builtin/blame.c:413 |
fd8cb379 JX |
7296 | msgid "must end with a color" |
7297 | msgstr "必须以一个颜色结尾" | |
7298 | ||
c1ac5258 | 7299 | #: builtin/blame.c:700 |
fd8cb379 JX |
7300 | #, c-format |
7301 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
7302 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
7303 | ||
c1ac5258 | 7304 | #: builtin/blame.c:718 |
fd8cb379 JX |
7305 | msgid "invalid value for blame.coloring" |
7306 | msgstr "设置 blame.coloring 中的无效取值" | |
7307 | ||
c1ac5258 | 7308 | #: builtin/blame.c:789 |
ef317cd5 | 7309 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 7310 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 7311 | |
c1ac5258 | 7312 | #: builtin/blame.c:790 |
ef317cd5 | 7313 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 7314 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 7315 | |
c1ac5258 | 7316 | #: builtin/blame.c:791 |
ef317cd5 | 7317 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 7318 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 7319 | |
c1ac5258 | 7320 | #: builtin/blame.c:792 |
ef317cd5 | 7321 | msgid "Show work cost statistics" |
07432cef | 7322 | msgstr "显示命令消耗统计" |
ef317cd5 | 7323 | |
c1ac5258 | 7324 | #: builtin/blame.c:793 |
276ceeaa JX |
7325 | msgid "Force progress reporting" |
7326 | msgstr "强制进度显示" | |
7327 | ||
c1ac5258 | 7328 | #: builtin/blame.c:794 |
ef317cd5 | 7329 | msgid "Show output score for blame entries" |
07432cef | 7330 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 7331 | |
c1ac5258 | 7332 | #: builtin/blame.c:795 |
ef317cd5 | 7333 | msgid "Show original filename (Default: auto)" |
07432cef | 7334 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 7335 | |
c1ac5258 | 7336 | #: builtin/blame.c:796 |
ef317cd5 | 7337 | msgid "Show original linenumber (Default: off)" |
07432cef | 7338 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 7339 | |
c1ac5258 | 7340 | #: builtin/blame.c:797 |
ef317cd5 | 7341 | msgid "Show in a format designed for machine consumption" |
07432cef | 7342 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 7343 | |
c1ac5258 | 7344 | #: builtin/blame.c:798 |
ef317cd5 | 7345 | msgid "Show porcelain format with per-line commit information" |
07432cef | 7346 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 7347 | |
c1ac5258 | 7348 | #: builtin/blame.c:799 |
ef317cd5 | 7349 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 7350 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 7351 | |
c1ac5258 | 7352 | #: builtin/blame.c:800 |
ef317cd5 | 7353 | msgid "Show raw timestamp (Default: off)" |
07432cef | 7354 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 7355 | |
c1ac5258 | 7356 | #: builtin/blame.c:801 |
ef317cd5 | 7357 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 7358 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 7359 | |
c1ac5258 | 7360 | #: builtin/blame.c:802 |
ef317cd5 | 7361 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 7362 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 7363 | |
c1ac5258 | 7364 | #: builtin/blame.c:803 |
ef317cd5 | 7365 | msgid "Show author email instead of name (Default: off)" |
07432cef | 7366 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 7367 | |
c1ac5258 | 7368 | #: builtin/blame.c:804 |
ef317cd5 | 7369 | msgid "Ignore whitespace differences" |
07432cef | 7370 | msgstr "忽略空白差异" |
ef317cd5 | 7371 | |
c1ac5258 | 7372 | #: builtin/blame.c:805 |
fd8cb379 JX |
7373 | msgid "color redundant metadata from previous line differently" |
7374 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
7375 | ||
c1ac5258 | 7376 | #: builtin/blame.c:806 |
fd8cb379 JX |
7377 | msgid "color lines by age" |
7378 | msgstr "依据时间着色" | |
7379 | ||
c1ac5258 | 7380 | #: builtin/blame.c:813 |
1a79b2f1 JX |
7381 | msgid "Use an experimental heuristic to improve diffs" |
7382 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 7383 | |
c1ac5258 | 7384 | #: builtin/blame.c:815 |
ef317cd5 | 7385 | msgid "Spend extra cycles to find better match" |
07432cef | 7386 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 7387 | |
c1ac5258 | 7388 | #: builtin/blame.c:816 |
ef317cd5 | 7389 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 7390 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 7391 | |
c1ac5258 | 7392 | #: builtin/blame.c:817 |
ef317cd5 | 7393 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 7394 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 7395 | |
c1ac5258 | 7396 | #: builtin/blame.c:818 builtin/blame.c:819 |
ef317cd5 | 7397 | msgid "score" |
07432cef | 7398 | msgstr "得分" |
ef317cd5 | 7399 | |
c1ac5258 | 7400 | #: builtin/blame.c:818 |
ef317cd5 | 7401 | msgid "Find line copies within and across files" |
07432cef | 7402 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 7403 | |
c1ac5258 | 7404 | #: builtin/blame.c:819 |
ef317cd5 | 7405 | msgid "Find line movements within and across files" |
07432cef | 7406 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 7407 | |
c1ac5258 | 7408 | #: builtin/blame.c:820 |
ef317cd5 | 7409 | msgid "n,m" |
07432cef | 7410 | msgstr "n,m" |
ef317cd5 | 7411 | |
c1ac5258 | 7412 | #: builtin/blame.c:820 |
ef317cd5 | 7413 | msgid "Process only line range n,m, counting from 1" |
07432cef | 7414 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 7415 | |
c1ac5258 | 7416 | #: builtin/blame.c:869 |
a0b6b246 JX |
7417 | msgid "--progress can't be used with --incremental or porcelain formats" |
7418 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
7419 | ||
a4f16749 JX |
7420 | #. TRANSLATORS: This string is used to tell us the |
7421 | #. maximum display width for a relative timestamp in | |
7422 | #. "git blame" output. For C locale, "4 years, 11 | |
7423 | #. months ago", which takes 22 places, is the longest | |
7424 | #. among various forms of relative timestamps, but | |
7425 | #. your language may need more or fewer display | |
7426 | #. columns. | |
7427 | #. | |
c1ac5258 | 7428 | #: builtin/blame.c:920 |
6c94aba5 JX |
7429 | msgid "4 years, 11 months ago" |
7430 | msgstr "4 年 11 个月前" | |
7431 | ||
c1ac5258 | 7432 | #: builtin/blame.c:1007 |
a0b6b246 JX |
7433 | #, c-format |
7434 | msgid "file %s has only %lu line" | |
7435 | msgid_plural "file %s has only %lu lines" | |
7436 | msgstr[0] "文件 %s 只有 %lu 行" | |
7437 | msgstr[1] "文件 %s 只有 %lu 行" | |
7438 | ||
c1ac5258 | 7439 | #: builtin/blame.c:1053 |
a4f16749 JX |
7440 | msgid "Blaming lines" |
7441 | msgstr "追踪代码行" | |
7442 | ||
c1ac5258 | 7443 | #: builtin/branch.c:28 |
814ff314 JX |
7444 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
7445 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 7446 | |
c1ac5258 | 7447 | #: builtin/branch.c:29 |
814ff314 JX |
7448 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
7449 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 7450 | |
c1ac5258 | 7451 | #: builtin/branch.c:30 |
814ff314 JX |
7452 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
7453 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 7454 | |
c1ac5258 | 7455 | #: builtin/branch.c:31 |
814ff314 JX |
7456 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
7457 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 7458 | |
c1ac5258 | 7459 | #: builtin/branch.c:32 |
6937cb4e JX |
7460 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
7461 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
7462 | ||
c1ac5258 | 7463 | #: builtin/branch.c:33 |
94550ed3 JX |
7464 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
7465 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
7466 | ||
c1ac5258 | 7467 | #: builtin/branch.c:34 |
87cb7997 JX |
7468 | msgid "git branch [<options>] [-r | -a] [--format]" |
7469 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
7470 | ||
90e6ef53 | 7471 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
c1ac5258 | 7472 | #: builtin/branch.c:151 |
c04f5ac3 JX |
7473 | #, c-format |
7474 | msgid "" | |
7475 | "deleting branch '%s' that has been merged to\n" | |
7476 | " '%s', but not yet merged to HEAD." | |
7477 | msgstr "" | |
70fc47bf | 7478 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
7479 | " '%s',但未合并到 HEAD。" |
7480 | ||
90e6ef53 | 7481 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
c1ac5258 | 7482 | #: builtin/branch.c:155 |
c04f5ac3 JX |
7483 | #, c-format |
7484 | msgid "" | |
7485 | "not deleting branch '%s' that is not yet merged to\n" | |
7486 | " '%s', even though it is merged to HEAD." | |
7487 | msgstr "" | |
70fc47bf T |
7488 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
7489 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 7490 | |
c1ac5258 | 7491 | #: builtin/branch.c:169 |
07432cef WS |
7492 | #, c-format |
7493 | msgid "Couldn't look up commit object for '%s'" | |
7494 | msgstr "无法查询 '%s' 指向的提交对象" | |
7495 | ||
c1ac5258 | 7496 | #: builtin/branch.c:173 |
07432cef WS |
7497 | #, c-format |
7498 | msgid "" | |
7499 | "The branch '%s' is not fully merged.\n" | |
7500 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
7501 | msgstr "" | |
7502 | "分支 '%s' 没有完全合并。\n" | |
7503 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
7504 | ||
c1ac5258 | 7505 | #: builtin/branch.c:186 |
07432cef | 7506 | msgid "Update of config-file failed" |
6937cb4e | 7507 | msgstr "更新配置文件失败" |
07432cef | 7508 | |
c1ac5258 | 7509 | #: builtin/branch.c:217 |
c04f5ac3 | 7510 | msgid "cannot use -a with -d" |
649900bc | 7511 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 7512 | |
c1ac5258 | 7513 | #: builtin/branch.c:223 |
c04f5ac3 JX |
7514 | msgid "Couldn't look up commit object for HEAD" |
7515 | msgstr "无法查询 HEAD 指向的提交对象" | |
7516 | ||
c1ac5258 | 7517 | #: builtin/branch.c:237 |
c04f5ac3 | 7518 | #, c-format |
5b04ee3b JX |
7519 | msgid "Cannot delete branch '%s' checked out at '%s'" |
7520 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 7521 | |
c1ac5258 | 7522 | #: builtin/branch.c:252 |
5ae481e0 | 7523 | #, c-format |
7aea43ff JX |
7524 | msgid "remote-tracking branch '%s' not found." |
7525 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 7526 | |
c1ac5258 | 7527 | #: builtin/branch.c:253 |
81809b99 | 7528 | #, c-format |
8ada9598 | 7529 | msgid "branch '%s' not found." |
81809b99 | 7530 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 7531 | |
c1ac5258 | 7532 | #: builtin/branch.c:268 |
81809b99 | 7533 | #, c-format |
7aea43ff JX |
7534 | msgid "Error deleting remote-tracking branch '%s'" |
7535 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 7536 | |
c1ac5258 | 7537 | #: builtin/branch.c:269 |
81809b99 | 7538 | #, c-format |
8ada9598 | 7539 | msgid "Error deleting branch '%s'" |
7aea43ff | 7540 | msgstr "无法删除分支 '%s'" |
8ada9598 | 7541 | |
c1ac5258 | 7542 | #: builtin/branch.c:276 |
81809b99 | 7543 | #, c-format |
7aea43ff JX |
7544 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
7545 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 7546 | |
c1ac5258 | 7547 | #: builtin/branch.c:277 |
81809b99 | 7548 | #, c-format |
8ada9598 | 7549 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 7550 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 7551 | |
c1ac5258 | 7552 | #: builtin/branch.c:421 builtin/tag.c:59 |
6937cb4e JX |
7553 | msgid "unable to parse format string" |
7554 | msgstr "不能解析格式化字符串" | |
7555 | ||
c1ac5258 | 7556 | #: builtin/branch.c:458 |
5b04ee3b JX |
7557 | #, c-format |
7558 | msgid "Branch %s is being rebased at %s" | |
7559 | msgstr "分支 %s 正被变基到 %s" | |
7560 | ||
c1ac5258 | 7561 | #: builtin/branch.c:462 |
5b04ee3b JX |
7562 | #, c-format |
7563 | msgid "Branch %s is being bisected at %s" | |
7564 | msgstr "分支 %s 正被二分查找于 %s" | |
7565 | ||
c1ac5258 | 7566 | #: builtin/branch.c:479 |
6937cb4e JX |
7567 | msgid "cannot copy the current branch while not on any." |
7568 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
7569 | ||
c1ac5258 | 7570 | #: builtin/branch.c:481 |
c04f5ac3 | 7571 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 7572 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 7573 | |
c1ac5258 | 7574 | #: builtin/branch.c:492 |
c04f5ac3 JX |
7575 | #, c-format |
7576 | msgid "Invalid branch name: '%s'" | |
7577 | msgstr "无效的分支名:'%s'" | |
7578 | ||
c1ac5258 | 7579 | #: builtin/branch.c:519 |
c04f5ac3 JX |
7580 | msgid "Branch rename failed" |
7581 | msgstr "分支重命名失败" | |
7582 | ||
c1ac5258 | 7583 | #: builtin/branch.c:521 |
6937cb4e JX |
7584 | msgid "Branch copy failed" |
7585 | msgstr "分支拷贝失败" | |
7586 | ||
c1ac5258 | 7587 | #: builtin/branch.c:525 |
6937cb4e | 7588 | #, c-format |
5809aa05 JX |
7589 | msgid "Created a copy of a misnamed branch '%s'" |
7590 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 7591 | |
c1ac5258 | 7592 | #: builtin/branch.c:528 |
c04f5ac3 JX |
7593 | #, c-format |
7594 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 7595 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 7596 | |
c1ac5258 | 7597 | #: builtin/branch.c:534 |
c04f5ac3 JX |
7598 | #, c-format |
7599 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
7600 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
7601 | ||
c1ac5258 | 7602 | #: builtin/branch.c:543 |
c04f5ac3 | 7603 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
7604 | msgstr "分支被重命名,但更新配置文件失败" |
7605 | ||
c1ac5258 | 7606 | #: builtin/branch.c:545 |
6937cb4e JX |
7607 | msgid "Branch is copied, but update of config-file failed" |
7608 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 7609 | |
c1ac5258 | 7610 | #: builtin/branch.c:561 |
5c57d762 JX |
7611 | #, c-format |
7612 | msgid "" | |
7613 | "Please edit the description for the branch\n" | |
7614 | " %s\n" | |
7615 | "Lines starting with '%c' will be stripped.\n" | |
7616 | msgstr "" | |
7617 | "请编辑分支的描述\n" | |
7618 | " %s\n" | |
7619 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 7620 | |
c1ac5258 | 7621 | #: builtin/branch.c:602 |
ef317cd5 | 7622 | msgid "Generic options" |
07432cef | 7623 | msgstr "通用选项" |
c04f5ac3 | 7624 | |
c1ac5258 | 7625 | #: builtin/branch.c:604 |
ef317cd5 | 7626 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 7627 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 7628 | |
c1ac5258 | 7629 | #: builtin/branch.c:605 |
ef317cd5 | 7630 | msgid "suppress informational messages" |
07432cef | 7631 | msgstr "不显示信息" |
8ada9598 | 7632 | |
c1ac5258 | 7633 | #: builtin/branch.c:606 |
ef317cd5 | 7634 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 7635 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 7636 | |
c1ac5258 | 7637 | #: builtin/branch.c:608 |
6937cb4e JX |
7638 | msgid "do not use" |
7639 | msgstr "不要使用" | |
c04f5ac3 | 7640 | |
c1ac5258 | 7641 | #: builtin/branch.c:610 |
5b04ee3b JX |
7642 | msgid "upstream" |
7643 | msgstr "上游" | |
7644 | ||
c1ac5258 | 7645 | #: builtin/branch.c:610 |
5b04ee3b JX |
7646 | msgid "change the upstream info" |
7647 | msgstr "改变上游信息" | |
7648 | ||
c1ac5258 | 7649 | #: builtin/branch.c:611 |
a0b6b246 JX |
7650 | msgid "Unset the upstream info" |
7651 | msgstr "取消上游信息的设置" | |
7652 | ||
c1ac5258 | 7653 | #: builtin/branch.c:612 |
ef317cd5 | 7654 | msgid "use colored output" |
07432cef | 7655 | msgstr "使用彩色输出" |
c04f5ac3 | 7656 | |
c1ac5258 | 7657 | #: builtin/branch.c:613 |
ef317cd5 | 7658 | msgid "act on remote-tracking branches" |
07432cef | 7659 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 7660 | |
c1ac5258 | 7661 | #: builtin/branch.c:615 builtin/branch.c:617 |
ef317cd5 | 7662 | msgid "print only branches that contain the commit" |
07432cef | 7663 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 7664 | |
c1ac5258 | 7665 | #: builtin/branch.c:616 builtin/branch.c:618 |
87cb7997 JX |
7666 | msgid "print only branches that don't contain the commit" |
7667 | msgstr "只打印不包含该提交的分支" | |
7668 | ||
c1ac5258 | 7669 | #: builtin/branch.c:621 |
ef317cd5 | 7670 | msgid "Specific git-branch actions:" |
07432cef | 7671 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 7672 | |
c1ac5258 | 7673 | #: builtin/branch.c:622 |
ef317cd5 | 7674 | msgid "list both remote-tracking and local branches" |
07432cef | 7675 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 7676 | |
c1ac5258 | 7677 | #: builtin/branch.c:624 |
ef317cd5 | 7678 | msgid "delete fully merged branch" |
07432cef | 7679 | msgstr "删除完全合并的分支" |
c04f5ac3 | 7680 | |
c1ac5258 | 7681 | #: builtin/branch.c:625 |
ef317cd5 | 7682 | msgid "delete branch (even if not merged)" |
07432cef | 7683 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 7684 | |
c1ac5258 | 7685 | #: builtin/branch.c:626 |
ef317cd5 | 7686 | msgid "move/rename a branch and its reflog" |
07432cef | 7687 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 7688 | |
c1ac5258 | 7689 | #: builtin/branch.c:627 |
ef317cd5 | 7690 | msgid "move/rename a branch, even if target exists" |
07432cef | 7691 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 7692 | |
c1ac5258 | 7693 | #: builtin/branch.c:628 |
6937cb4e JX |
7694 | msgid "copy a branch and its reflog" |
7695 | msgstr "拷贝一个分支和它的引用日志" | |
7696 | ||
c1ac5258 | 7697 | #: builtin/branch.c:629 |
6937cb4e JX |
7698 | msgid "copy a branch, even if target exists" |
7699 | msgstr "拷贝一个分支,即使目标已存在" | |
7700 | ||
c1ac5258 | 7701 | #: builtin/branch.c:630 |
ef317cd5 | 7702 | msgid "list branch names" |
07432cef | 7703 | msgstr "列出分支名" |
c04f5ac3 | 7704 | |
c1ac5258 | 7705 | #: builtin/branch.c:631 |
ef317cd5 | 7706 | msgid "create the branch's reflog" |
07432cef | 7707 | msgstr "创建分支的引用日志" |
ef317cd5 | 7708 | |
c1ac5258 JX |
7709 | #: builtin/branch.c:634 |
7710 | msgid "deprecated synonym for --create-reflog" | |
7711 | msgstr "--create-reflog 的已弃用的同义词" | |
7712 | ||
7713 | #: builtin/branch.c:639 | |
ef317cd5 | 7714 | msgid "edit the description for the branch" |
07432cef | 7715 | msgstr "标记分支的描述" |
ef317cd5 | 7716 | |
c1ac5258 | 7717 | #: builtin/branch.c:640 |
04cb2f28 JX |
7718 | msgid "force creation, move/rename, deletion" |
7719 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 7720 | |
c1ac5258 | 7721 | #: builtin/branch.c:641 |
94550ed3 JX |
7722 | msgid "print only branches that are merged" |
7723 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 7724 | |
c1ac5258 | 7725 | #: builtin/branch.c:642 |
94550ed3 JX |
7726 | msgid "print only branches that are not merged" |
7727 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 7728 | |
c1ac5258 | 7729 | #: builtin/branch.c:643 |
ef317cd5 | 7730 | msgid "list branches in columns" |
07432cef | 7731 | msgstr "以列的方式显示分支" |
ef317cd5 | 7732 | |
c1ac5258 JX |
7733 | #: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 |
7734 | #: builtin/tag.c:413 | |
94550ed3 JX |
7735 | msgid "key" |
7736 | msgstr "key" | |
7737 | ||
c1ac5258 JX |
7738 | #: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 |
7739 | #: builtin/tag.c:414 | |
94550ed3 JX |
7740 | msgid "field name to sort on" |
7741 | msgstr "排序的字段名" | |
7742 | ||
c1ac5258 JX |
7743 | #: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410 |
7744 | #: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 | |
7745 | #: builtin/tag.c:416 | |
94550ed3 JX |
7746 | msgid "object" |
7747 | msgstr "对象" | |
7748 | ||
c1ac5258 | 7749 | #: builtin/branch.c:648 |
94550ed3 JX |
7750 | msgid "print only branches of the object" |
7751 | msgstr "只打印指向该对象的分支" | |
7752 | ||
c1ac5258 | 7753 | #: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423 |
1a79b2f1 JX |
7754 | msgid "sorting and filtering are case insensitive" |
7755 | msgstr "排序和过滤属于大小写不敏感" | |
7756 | ||
c1ac5258 | 7757 | #: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421 |
a4f16749 | 7758 | #: builtin/verify-tag.c:39 |
87cb7997 JX |
7759 | msgid "format to use for the output" |
7760 | msgstr "输出格式" | |
7761 | ||
c1ac5258 | 7762 | #: builtin/branch.c:674 builtin/clone.c:739 |
c04f5ac3 | 7763 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 7764 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 7765 | |
c1ac5258 | 7766 | #: builtin/branch.c:697 |
8ada9598 | 7767 | msgid "--column and --verbose are incompatible" |
81809b99 | 7768 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 7769 | |
c1ac5258 | 7770 | #: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778 |
a77c07d9 JX |
7771 | msgid "branch name required" |
7772 | msgstr "必须提供分支名" | |
7773 | ||
c1ac5258 | 7774 | #: builtin/branch.c:745 |
a77c07d9 JX |
7775 | msgid "Cannot give description to detached HEAD" |
7776 | msgstr "不能向分离头指针提供描述" | |
7777 | ||
c1ac5258 | 7778 | #: builtin/branch.c:750 |
a77c07d9 JX |
7779 | msgid "cannot edit description of more than one branch" |
7780 | msgstr "不能为一个以上的分支编辑描述" | |
7781 | ||
c1ac5258 | 7782 | #: builtin/branch.c:757 |
a77c07d9 JX |
7783 | #, c-format |
7784 | msgid "No commit on branch '%s' yet." | |
7785 | msgstr "分支 '%s' 尚无提交。" | |
7786 | ||
c1ac5258 | 7787 | #: builtin/branch.c:760 |
a77c07d9 JX |
7788 | #, c-format |
7789 | msgid "No branch named '%s'." | |
7790 | msgstr "没有分支 '%s'。" | |
7791 | ||
c1ac5258 | 7792 | #: builtin/branch.c:775 |
6937cb4e JX |
7793 | msgid "too many branches for a copy operation" |
7794 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 7795 | |
c1ac5258 | 7796 | #: builtin/branch.c:784 |
6937cb4e JX |
7797 | msgid "too many arguments for a rename operation" |
7798 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 7799 | |
c1ac5258 | 7800 | #: builtin/branch.c:789 |
6937cb4e JX |
7801 | msgid "too many arguments to set new upstream" |
7802 | msgstr "为设置新上游提供了太多的参数" | |
7803 | ||
c1ac5258 | 7804 | #: builtin/branch.c:793 |
1003b3a5 JX |
7805 | #, c-format |
7806 | msgid "" | |
7807 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
7808 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
7809 | ||
c1ac5258 | 7810 | #: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834 |
1003b3a5 JX |
7811 | #, c-format |
7812 | msgid "no such branch '%s'" | |
7813 | msgstr "没有此分支 '%s'" | |
7814 | ||
c1ac5258 | 7815 | #: builtin/branch.c:800 |
07432cef | 7816 | #, c-format |
ef317cd5 | 7817 | msgid "branch '%s' does not exist" |
07432cef | 7818 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 7819 | |
c1ac5258 | 7820 | #: builtin/branch.c:812 |
6937cb4e JX |
7821 | msgid "too many arguments to unset upstream" |
7822 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 7823 | |
c1ac5258 | 7824 | #: builtin/branch.c:816 |
1003b3a5 JX |
7825 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
7826 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
7827 | ||
c1ac5258 | 7828 | #: builtin/branch.c:822 |
ef317cd5 JX |
7829 | #, c-format |
7830 | msgid "Branch '%s' has no upstream information" | |
07432cef | 7831 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 7832 | |
c1ac5258 | 7833 | #: builtin/branch.c:837 |
c04f5ac3 JX |
7834 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
7835 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
7836 | ||
c1ac5258 | 7837 | #: builtin/branch.c:840 |
ef317cd5 | 7838 | msgid "" |
6937cb4e JX |
7839 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
7840 | "'--set-upstream-to' instead." | |
ef317cd5 | 7841 | msgstr "" |
6937cb4e | 7842 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" |
ef317cd5 | 7843 | |
87cb7997 | 7844 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
7845 | #, c-format |
7846 | msgid "%s is okay\n" | |
7847 | msgstr "%s 可以\n" | |
7848 | ||
87cb7997 | 7849 | #: builtin/bundle.c:58 |
c04f5ac3 | 7850 | msgid "Need a repository to create a bundle." |
160fb2b2 | 7851 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 7852 | |
87cb7997 | 7853 | #: builtin/bundle.c:62 |
c04f5ac3 | 7854 | msgid "Need a repository to unbundle." |
160fb2b2 | 7855 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 7856 | |
c1ac5258 | 7857 | #: builtin/cat-file.c:577 |
7aea43ff | 7858 | msgid "" |
a0b6b246 JX |
7859 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
7860 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
7861 | msgstr "" |
7862 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
7863 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 7864 | |
c1ac5258 | 7865 | #: builtin/cat-file.c:578 |
a0b6b246 JX |
7866 | msgid "" |
7867 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
7868 | "filters]" | |
275588f9 JX |
7869 | msgstr "" |
7870 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
7871 | "filters]" | |
ef317cd5 | 7872 | |
c1ac5258 | 7873 | #: builtin/cat-file.c:615 |
ef317cd5 | 7874 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 7875 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 7876 | |
c1ac5258 | 7877 | #: builtin/cat-file.c:616 |
ef317cd5 | 7878 | msgid "show object type" |
07432cef | 7879 | msgstr "显示对象类型" |
ef317cd5 | 7880 | |
c1ac5258 | 7881 | #: builtin/cat-file.c:617 |
ef317cd5 | 7882 | msgid "show object size" |
07432cef | 7883 | msgstr "显示对象大小" |
ef317cd5 | 7884 | |
c1ac5258 | 7885 | #: builtin/cat-file.c:619 |
ef317cd5 | 7886 | msgid "exit with zero when there's no error" |
07432cef | 7887 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 7888 | |
c1ac5258 | 7889 | #: builtin/cat-file.c:620 |
ef317cd5 | 7890 | msgid "pretty-print object's content" |
07432cef | 7891 | msgstr "美观地打印对象的内容" |
ef317cd5 | 7892 | |
c1ac5258 | 7893 | #: builtin/cat-file.c:622 |
ef317cd5 | 7894 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
7895 | msgstr "对于数据对象,对其内容做文本转换" |
7896 | ||
c1ac5258 | 7897 | #: builtin/cat-file.c:624 |
a0b6b246 JX |
7898 | msgid "for blob objects, run filters on object's content" |
7899 | msgstr "对于数据对象,对其内容做过滤" | |
7900 | ||
c1ac5258 | 7901 | #: builtin/cat-file.c:625 git-submodule.sh:864 |
a0b6b246 JX |
7902 | msgid "blob" |
7903 | msgstr "数据对象" | |
7904 | ||
c1ac5258 | 7905 | #: builtin/cat-file.c:626 |
a0b6b246 JX |
7906 | msgid "use a specific path for --textconv/--filters" |
7907 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 7908 | |
c1ac5258 | 7909 | #: builtin/cat-file.c:628 |
7aea43ff JX |
7910 | msgid "allow -s and -t to work with broken/corrupt objects" |
7911 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
7912 | ||
c1ac5258 | 7913 | #: builtin/cat-file.c:629 |
1b7f4a34 JX |
7914 | msgid "buffer --batch output" |
7915 | msgstr "缓冲 --batch 的输出" | |
7916 | ||
c1ac5258 | 7917 | #: builtin/cat-file.c:631 |
ef317cd5 | 7918 | msgid "show info and content of objects fed from the standard input" |
07432cef | 7919 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 7920 | |
c1ac5258 | 7921 | #: builtin/cat-file.c:634 |
ef317cd5 | 7922 | msgid "show info about objects fed from the standard input" |
07432cef | 7923 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 7924 | |
c1ac5258 | 7925 | #: builtin/cat-file.c:637 |
7aea43ff JX |
7926 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
7927 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
7928 | ||
c1ac5258 | 7929 | #: builtin/cat-file.c:639 |
1b7f4a34 JX |
7930 | msgid "show all objects with --batch or --batch-check" |
7931 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
7932 | ||
c1ac5258 JX |
7933 | #: builtin/cat-file.c:641 |
7934 | msgid "do not order --batch-all-objects output" | |
7935 | msgstr "不要对 --batch-all-objects 的输出排序" | |
7936 | ||
a4f16749 | 7937 | #: builtin/check-attr.c:12 |
814ff314 JX |
7938 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
7939 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 7940 | |
a4f16749 | 7941 | #: builtin/check-attr.c:13 |
94550ed3 JX |
7942 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
7943 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 7944 | |
a4f16749 | 7945 | #: builtin/check-attr.c:20 |
ef317cd5 | 7946 | msgid "report all attributes set on file" |
07432cef | 7947 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 7948 | |
a4f16749 | 7949 | #: builtin/check-attr.c:21 |
ef317cd5 | 7950 | msgid "use .gitattributes only from the index" |
07432cef | 7951 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 7952 | |
c1ac5258 | 7953 | #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 |
ef317cd5 | 7954 | msgid "read file names from stdin" |
07432cef | 7955 | msgstr "从标准输入读出文件名" |
ef317cd5 | 7956 | |
a4f16749 | 7957 | #: builtin/check-attr.c:24 builtin/check-ignore.c:26 |
90314792 JX |
7958 | msgid "terminate input and output records by a NUL character" |
7959 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 7960 | |
c1ac5258 JX |
7961 | #: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 |
7962 | #: builtin/worktree.c:447 | |
a77c07d9 JX |
7963 | msgid "suppress progress reporting" |
7964 | msgstr "不显示进度报告" | |
7965 | ||
a4f16749 | 7966 | #: builtin/check-ignore.c:28 |
2e8451e8 JX |
7967 | msgid "show non-matching input paths" |
7968 | msgstr "显示未匹配的输入路径" | |
7969 | ||
a4f16749 | 7970 | #: builtin/check-ignore.c:30 |
90314792 JX |
7971 | msgid "ignore index when checking" |
7972 | msgstr "检查时忽略索引" | |
7973 | ||
31e5e17b | 7974 | #: builtin/check-ignore.c:159 |
a77c07d9 | 7975 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 7976 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 7977 | |
31e5e17b | 7978 | #: builtin/check-ignore.c:162 |
a77c07d9 JX |
7979 | msgid "-z only makes sense with --stdin" |
7980 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
7981 | ||
31e5e17b | 7982 | #: builtin/check-ignore.c:164 |
a77c07d9 JX |
7983 | msgid "no path specified" |
7984 | msgstr "未指定路径" | |
7985 | ||
31e5e17b | 7986 | #: builtin/check-ignore.c:168 |
a77c07d9 JX |
7987 | msgid "--quiet is only valid with a single pathname" |
7988 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
7989 | ||
31e5e17b | 7990 | #: builtin/check-ignore.c:170 |
a77c07d9 JX |
7991 | msgid "cannot have both --quiet and --verbose" |
7992 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
7993 | ||
31e5e17b | 7994 | #: builtin/check-ignore.c:173 |
2e8451e8 JX |
7995 | msgid "--non-matching is only valid with --verbose" |
7996 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
7997 | ||
a4f16749 | 7998 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
7999 | msgid "git check-mailmap [<options>] <contact>..." |
8000 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 8001 | |
a4f16749 | 8002 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
8003 | msgid "also read contacts from stdin" |
8004 | msgstr "还从标准输入读取联系地址" | |
8005 | ||
a4f16749 | 8006 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
8007 | #, c-format |
8008 | msgid "unable to parse contact: %s" | |
8009 | msgstr "不能解析联系地址:%s" | |
8010 | ||
a4f16749 | 8011 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
8012 | msgid "no contacts specified" |
8013 | msgstr "未指定联系地址" | |
8014 | ||
a4f16749 | 8015 | #: builtin/checkout-index.c:128 |
814ff314 JX |
8016 | msgid "git checkout-index [<options>] [--] [<file>...]" |
8017 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 8018 | |
5809aa05 | 8019 | #: builtin/checkout-index.c:143 |
276ceeaa JX |
8020 | msgid "stage should be between 1 and 3 or all" |
8021 | msgstr "索引值应该取值 1 到 3 或者 all" | |
8022 | ||
5809aa05 | 8023 | #: builtin/checkout-index.c:159 |
ef317cd5 | 8024 | msgid "check out all files in the index" |
07432cef | 8025 | msgstr "检出索引区的所有文件" |
ef317cd5 | 8026 | |
5809aa05 | 8027 | #: builtin/checkout-index.c:160 |
ef317cd5 | 8028 | msgid "force overwrite of existing files" |
07432cef | 8029 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 8030 | |
5809aa05 | 8031 | #: builtin/checkout-index.c:162 |
ef317cd5 | 8032 | msgid "no warning for existing files and files not in index" |
07432cef | 8033 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 8034 | |
5809aa05 | 8035 | #: builtin/checkout-index.c:164 |
ef317cd5 | 8036 | msgid "don't checkout new files" |
07432cef | 8037 | msgstr "不检出新文件" |
ef317cd5 | 8038 | |
5809aa05 | 8039 | #: builtin/checkout-index.c:166 |
ef317cd5 | 8040 | msgid "update stat information in the index file" |
07432cef | 8041 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 8042 | |
5809aa05 | 8043 | #: builtin/checkout-index.c:170 |
ef317cd5 | 8044 | msgid "read list of paths from the standard input" |
07432cef | 8045 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 8046 | |
5809aa05 | 8047 | #: builtin/checkout-index.c:172 |
ef317cd5 | 8048 | msgid "write the content to temporary files" |
07432cef | 8049 | msgstr "将内容写入临时文件" |
ef317cd5 | 8050 | |
5809aa05 | 8051 | #: builtin/checkout-index.c:173 builtin/column.c:31 |
c1ac5258 JX |
8052 | #: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 |
8053 | #: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 | |
8054 | #: builtin/worktree.c:620 | |
ef317cd5 | 8055 | msgid "string" |
07432cef | 8056 | msgstr "字符串" |
ef317cd5 | 8057 | |
5809aa05 | 8058 | #: builtin/checkout-index.c:174 |
ef317cd5 | 8059 | msgid "when creating files, prepend <string>" |
4375c10e | 8060 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 8061 | |
5809aa05 | 8062 | #: builtin/checkout-index.c:176 |
ef317cd5 | 8063 | msgid "copy out the files from named stage" |
07432cef | 8064 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 8065 | |
c1ac5258 | 8066 | #: builtin/checkout.c:29 |
814ff314 JX |
8067 | msgid "git checkout [<options>] <branch>" |
8068 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 8069 | |
c1ac5258 | 8070 | #: builtin/checkout.c:30 |
814ff314 JX |
8071 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
8072 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 8073 | |
c1ac5258 | 8074 | #: builtin/checkout.c:138 builtin/checkout.c:171 |
c04f5ac3 JX |
8075 | #, c-format |
8076 | msgid "path '%s' does not have our version" | |
8077 | msgstr "路径 '%s' 没有我们的版本" | |
8078 | ||
c1ac5258 | 8079 | #: builtin/checkout.c:140 builtin/checkout.c:173 |
c04f5ac3 JX |
8080 | #, c-format |
8081 | msgid "path '%s' does not have their version" | |
8082 | msgstr "路径 '%s' 没有他们的版本" | |
8083 | ||
c1ac5258 | 8084 | #: builtin/checkout.c:156 |
c04f5ac3 JX |
8085 | #, c-format |
8086 | msgid "path '%s' does not have all necessary versions" | |
8087 | msgstr "路径 '%s' 没有全部必须的版本" | |
8088 | ||
c1ac5258 | 8089 | #: builtin/checkout.c:200 |
c04f5ac3 JX |
8090 | #, c-format |
8091 | msgid "path '%s' does not have necessary versions" | |
8092 | msgstr "路径 '%s' 没有必须的版本" | |
8093 | ||
c1ac5258 | 8094 | #: builtin/checkout.c:217 |
c04f5ac3 JX |
8095 | #, c-format |
8096 | msgid "path '%s': cannot merge" | |
90e6ef53 | 8097 | msgstr "path '%s':无法合并" |
c04f5ac3 | 8098 | |
c1ac5258 | 8099 | #: builtin/checkout.c:233 |
c04f5ac3 JX |
8100 | #, c-format |
8101 | msgid "Unable to add merge result for '%s'" | |
8102 | msgstr "无法为 '%s' 添加合并结果" | |
8103 | ||
c1ac5258 JX |
8104 | #: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 |
8105 | #: builtin/checkout.c:264 | |
07432cef | 8106 | #, c-format |
ef317cd5 | 8107 | msgid "'%s' cannot be used with updating paths" |
07432cef | 8108 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 8109 | |
c1ac5258 | 8110 | #: builtin/checkout.c:267 builtin/checkout.c:270 |
07432cef | 8111 | #, c-format |
ef317cd5 | 8112 | msgid "'%s' cannot be used with %s" |
07432cef | 8113 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 8114 | |
c1ac5258 | 8115 | #: builtin/checkout.c:273 |
ef317cd5 JX |
8116 | #, c-format |
8117 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 8118 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 8119 | |
c1ac5258 | 8120 | #: builtin/checkout.c:342 builtin/checkout.c:349 |
c04f5ac3 JX |
8121 | #, c-format |
8122 | msgid "path '%s' is unmerged" | |
8123 | msgstr "路径 '%s' 未合并" | |
8124 | ||
c1ac5258 | 8125 | #: builtin/checkout.c:508 |
c04f5ac3 | 8126 | msgid "you need to resolve your current index first" |
90e6ef53 | 8127 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 8128 | |
c1ac5258 | 8129 | #: builtin/checkout.c:645 |
c04f5ac3 | 8130 | #, c-format |
1b7f4a34 JX |
8131 | msgid "Can not do reflog for '%s': %s\n" |
8132 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 8133 | |
c1ac5258 | 8134 | #: builtin/checkout.c:686 |
c04f5ac3 JX |
8135 | msgid "HEAD is now at" |
8136 | msgstr "HEAD 目前位于" | |
8137 | ||
c1ac5258 | 8138 | #: builtin/checkout.c:690 builtin/clone.c:692 |
3495628d JX |
8139 | msgid "unable to update HEAD" |
8140 | msgstr "不能更新 HEAD" | |
8141 | ||
c1ac5258 | 8142 | #: builtin/checkout.c:694 |
c04f5ac3 JX |
8143 | #, c-format |
8144 | msgid "Reset branch '%s'\n" | |
8145 | msgstr "重置分支 '%s'\n" | |
8146 | ||
c1ac5258 | 8147 | #: builtin/checkout.c:697 |
c04f5ac3 JX |
8148 | #, c-format |
8149 | msgid "Already on '%s'\n" | |
8150 | msgstr "已经位于 '%s'\n" | |
8151 | ||
c1ac5258 | 8152 | #: builtin/checkout.c:701 |
c04f5ac3 JX |
8153 | #, c-format |
8154 | msgid "Switched to and reset branch '%s'\n" | |
8155 | msgstr "切换并重置分支 '%s'\n" | |
8156 | ||
c1ac5258 | 8157 | #: builtin/checkout.c:703 builtin/checkout.c:1052 |
c04f5ac3 JX |
8158 | #, c-format |
8159 | msgid "Switched to a new branch '%s'\n" | |
8160 | msgstr "切换到一个新分支 '%s'\n" | |
8161 | ||
c1ac5258 | 8162 | #: builtin/checkout.c:705 |
c04f5ac3 JX |
8163 | #, c-format |
8164 | msgid "Switched to branch '%s'\n" | |
8165 | msgstr "切换到分支 '%s'\n" | |
8166 | ||
90e6ef53 | 8167 | # 译者:注意保持前导空格 |
c1ac5258 | 8168 | #: builtin/checkout.c:756 |
c04f5ac3 JX |
8169 | #, c-format |
8170 | msgid " ... and %d more.\n" | |
90e6ef53 | 8171 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 8172 | |
c1ac5258 | 8173 | #: builtin/checkout.c:762 |
c04f5ac3 JX |
8174 | #, c-format |
8175 | msgid "" | |
8176 | "Warning: you are leaving %d commit behind, not connected to\n" | |
8177 | "any of your branches:\n" | |
8178 | "\n" | |
8179 | "%s\n" | |
8180 | msgid_plural "" | |
8181 | "Warning: you are leaving %d commits behind, not connected to\n" | |
8182 | "any of your branches:\n" | |
8183 | "\n" | |
8184 | "%s\n" | |
8185 | msgstr[0] "" | |
8186 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
8187 | "\n" | |
8188 | "%s\n" | |
5ae481e0 JX |
8189 | msgstr[1] "" |
8190 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
8191 | "\n" | |
8192 | "%s\n" | |
c04f5ac3 | 8193 | |
c1ac5258 | 8194 | #: builtin/checkout.c:781 |
c04f5ac3 JX |
8195 | #, c-format |
8196 | msgid "" | |
7aea43ff JX |
8197 | "If you want to keep it by creating a new branch, this may be a good time\n" |
8198 | "to do so with:\n" | |
8199 | "\n" | |
8200 | " git branch <new-branch-name> %s\n" | |
8201 | "\n" | |
8202 | msgid_plural "" | |
c04f5ac3 JX |
8203 | "If you want to keep them by creating a new branch, this may be a good time\n" |
8204 | "to do so with:\n" | |
8205 | "\n" | |
814ff314 | 8206 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 8207 | "\n" |
7aea43ff JX |
8208 | msgstr[0] "" |
8209 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
8210 | "如下操作:\n" | |
8211 | "\n" | |
8212 | " git branch <新分支名> %s\n" | |
8213 | "\n" | |
8214 | msgstr[1] "" | |
8215 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
8216 | "如下操作:\n" |
8217 | "\n" | |
814ff314 | 8218 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
8219 | "\n" |
8220 | ||
c1ac5258 | 8221 | #: builtin/checkout.c:813 |
c04f5ac3 JX |
8222 | msgid "internal error in revision walk" |
8223 | msgstr "在版本遍历时遇到内部错误" | |
8224 | ||
c1ac5258 | 8225 | #: builtin/checkout.c:817 |
c04f5ac3 JX |
8226 | msgid "Previous HEAD position was" |
8227 | msgstr "之前的 HEAD 位置是" | |
8228 | ||
c1ac5258 | 8229 | #: builtin/checkout.c:845 builtin/checkout.c:1047 |
c04f5ac3 | 8230 | msgid "You are on a branch yet to be born" |
90e6ef53 | 8231 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 8232 | |
c1ac5258 | 8233 | #: builtin/checkout.c:952 |
90314792 JX |
8234 | #, c-format |
8235 | msgid "only one reference expected, %d given." | |
a0b6b246 | 8236 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 8237 | |
c1ac5258 | 8238 | #: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396 |
c04f5ac3 JX |
8239 | #, c-format |
8240 | msgid "invalid reference: %s" | |
8241 | msgstr "无效引用:%s" | |
8242 | ||
c1ac5258 | 8243 | #: builtin/checkout.c:1022 |
c04f5ac3 JX |
8244 | #, c-format |
8245 | msgid "reference is not a tree: %s" | |
8246 | msgstr "引用不是一个树:%s" | |
8247 | ||
c1ac5258 | 8248 | #: builtin/checkout.c:1061 |
ef317cd5 | 8249 | msgid "paths cannot be used with switching branches" |
07432cef | 8250 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 8251 | |
c1ac5258 | 8252 | #: builtin/checkout.c:1064 builtin/checkout.c:1068 |
07432cef | 8253 | #, c-format |
ef317cd5 | 8254 | msgid "'%s' cannot be used with switching branches" |
07432cef | 8255 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 8256 | |
c1ac5258 JX |
8257 | #: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 |
8258 | #: builtin/checkout.c:1083 | |
07432cef | 8259 | #, c-format |
ef317cd5 | 8260 | msgid "'%s' cannot be used with '%s'" |
07432cef | 8261 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 8262 | |
c1ac5258 | 8263 | #: builtin/checkout.c:1088 |
07432cef | 8264 | #, c-format |
ef317cd5 | 8265 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 8266 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 8267 | |
c1ac5258 JX |
8268 | #: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 |
8269 | #: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440 | |
8270 | #: builtin/worktree.c:442 | |
ef317cd5 | 8271 | msgid "branch" |
07432cef | 8272 | msgstr "分支" |
c04f5ac3 | 8273 | |
c1ac5258 | 8274 | #: builtin/checkout.c:1122 |
ef317cd5 | 8275 | msgid "create and checkout a new branch" |
07432cef | 8276 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 8277 | |
c1ac5258 | 8278 | #: builtin/checkout.c:1124 |
ef317cd5 | 8279 | msgid "create/reset and checkout a branch" |
07432cef | 8280 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 8281 | |
c1ac5258 | 8282 | #: builtin/checkout.c:1125 |
ef317cd5 | 8283 | msgid "create reflog for new branch" |
07432cef | 8284 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 8285 | |
c1ac5258 | 8286 | #: builtin/checkout.c:1126 builtin/worktree.c:444 |
5c57d762 JX |
8287 | msgid "detach HEAD at named commit" |
8288 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 8289 | |
c1ac5258 | 8290 | #: builtin/checkout.c:1127 |
ef317cd5 | 8291 | msgid "set upstream info for new branch" |
07432cef | 8292 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 8293 | |
c1ac5258 | 8294 | #: builtin/checkout.c:1129 |
6c94aba5 | 8295 | msgid "new-branch" |
07432cef | 8296 | msgstr "新分支" |
ef317cd5 | 8297 | |
c1ac5258 | 8298 | #: builtin/checkout.c:1129 |
ef317cd5 | 8299 | msgid "new unparented branch" |
07432cef | 8300 | msgstr "新的没有父提交的分支" |
ef317cd5 | 8301 | |
c1ac5258 | 8302 | #: builtin/checkout.c:1131 |
ef317cd5 | 8303 | msgid "checkout our version for unmerged files" |
07432cef | 8304 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 8305 | |
c1ac5258 | 8306 | #: builtin/checkout.c:1134 |
ef317cd5 | 8307 | msgid "checkout their version for unmerged files" |
07432cef | 8308 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 8309 | |
c1ac5258 | 8310 | #: builtin/checkout.c:1136 |
ef317cd5 | 8311 | msgid "force checkout (throw away local modifications)" |
07432cef | 8312 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 8313 | |
c1ac5258 | 8314 | #: builtin/checkout.c:1138 |
ef317cd5 | 8315 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 8316 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 8317 | |
c1ac5258 | 8318 | #: builtin/checkout.c:1140 builtin/merge.c:273 |
ef317cd5 | 8319 | msgid "update ignored files (default)" |
07432cef | 8320 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 8321 | |
c1ac5258 | 8322 | #: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 |
ef317cd5 | 8323 | msgid "style" |
07432cef | 8324 | msgstr "风格" |
ef317cd5 | 8325 | |
c1ac5258 | 8326 | #: builtin/checkout.c:1143 |
ef317cd5 | 8327 | msgid "conflict style (merge or diff3)" |
07432cef | 8328 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 8329 | |
c1ac5258 | 8330 | #: builtin/checkout.c:1146 |
4dcdc3d8 JX |
8331 | msgid "do not limit pathspecs to sparse entries only" |
8332 | msgstr "对路径不做稀疏检出的限制" | |
8333 | ||
c1ac5258 | 8334 | #: builtin/checkout.c:1148 |
814ff314 JX |
8335 | msgid "second guess 'git checkout <no-such-branch>'" |
8336 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 8337 | |
c1ac5258 | 8338 | #: builtin/checkout.c:1150 |
7aea43ff JX |
8339 | msgid "do not check if another worktree is holding the given ref" |
8340 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
8341 | ||
c1ac5258 JX |
8342 | #: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 |
8343 | #: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 | |
fd8cb379 | 8344 | #: builtin/send-pack.c:174 |
94550ed3 JX |
8345 | msgid "force progress reporting" |
8346 | msgstr "强制显示进度报告" | |
8347 | ||
c1ac5258 | 8348 | #: builtin/checkout.c:1184 |
ef317cd5 | 8349 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 8350 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 8351 | |
c1ac5258 | 8352 | #: builtin/checkout.c:1201 |
ef317cd5 JX |
8353 | msgid "--track needs a branch name" |
8354 | msgstr "--track 需要一个分支名" | |
8355 | ||
c1ac5258 JX |
8356 | #: builtin/checkout.c:1206 |
8357 | msgid "missing branch name; try -b" | |
8358 | msgstr "缺少分支名,尝试 -b" | |
ef317cd5 | 8359 | |
c1ac5258 | 8360 | #: builtin/checkout.c:1243 |
c04f5ac3 | 8361 | msgid "invalid path specification" |
90e6ef53 | 8362 | msgstr "无效的路径规格" |
c04f5ac3 | 8363 | |
c1ac5258 | 8364 | #: builtin/checkout.c:1250 |
07432cef | 8365 | #, c-format |
a4f16749 JX |
8366 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
8367 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 8368 | |
c1ac5258 | 8369 | #: builtin/checkout.c:1254 |
07432cef | 8370 | #, c-format |
ef317cd5 | 8371 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 8372 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 8373 | |
c1ac5258 | 8374 | #: builtin/checkout.c:1258 |
c04f5ac3 JX |
8375 | msgid "" |
8376 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
8377 | "checking out of the index." | |
8378 | msgstr "" | |
90e6ef53 | 8379 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 8380 | |
c1ac5258 JX |
8381 | #: builtin/checkout.c:1278 |
8382 | #, c-format | |
8383 | msgid "" | |
8384 | "'%s' matched more than one remote tracking branch.\n" | |
8385 | "We found %d remotes with a reference that matched. So we fell back\n" | |
8386 | "on trying to resolve the argument as a path, but failed there too!\n" | |
8387 | "\n" | |
8388 | "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" | |
8389 | "you can do so by fully qualifying the name with the --track option:\n" | |
8390 | "\n" | |
8391 | " git checkout --track origin/<name>\n" | |
8392 | "\n" | |
8393 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
8394 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
8395 | "checkout.defaultRemote=origin in your config." | |
8396 | msgstr "" | |
8397 | "'%s' 匹配了一个以上的远程跟踪分支。\n" | |
8398 | "我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n" | |
8399 | "路径,但是也失败了!\n" | |
8400 | "\n" | |
8401 | "如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n" | |
8402 | "使用分支全名和 --track 选项:\n" | |
8403 | "\n" | |
8404 | " git checkout --track origin/<name>\n" | |
8405 | "\n" | |
8406 | "如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n" | |
8407 | "仓库名,可以在配置中设置 checkout.defaultRemote=origin。" | |
8408 | ||
8409 | #: builtin/clean.c:27 | |
2e8451e8 JX |
8410 | msgid "" |
8411 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
8412 | msgstr "" | |
8413 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 8414 | |
c1ac5258 | 8415 | #: builtin/clean.c:31 |
07432cef WS |
8416 | #, c-format |
8417 | msgid "Removing %s\n" | |
8418 | msgstr "正删除 %s\n" | |
8419 | ||
c1ac5258 | 8420 | #: builtin/clean.c:32 |
07432cef WS |
8421 | #, c-format |
8422 | msgid "Would remove %s\n" | |
8423 | msgstr "将删除 %s\n" | |
8424 | ||
c1ac5258 | 8425 | #: builtin/clean.c:33 |
07432cef WS |
8426 | #, c-format |
8427 | msgid "Skipping repository %s\n" | |
160fb2b2 | 8428 | msgstr "忽略仓库 %s\n" |
07432cef | 8429 | |
c1ac5258 | 8430 | #: builtin/clean.c:34 |
07432cef WS |
8431 | #, c-format |
8432 | msgid "Would skip repository %s\n" | |
160fb2b2 | 8433 | msgstr "将忽略仓库 %s\n" |
07432cef | 8434 | |
c1ac5258 | 8435 | #: builtin/clean.c:35 |
07432cef WS |
8436 | #, c-format |
8437 | msgid "failed to remove %s" | |
c1ac5258 | 8438 | msgstr "删除 %s 失败" |
07432cef | 8439 | |
c1ac5258 | 8440 | #: builtin/clean.c:297 git-add--interactive.perl:579 |
1a79b2f1 | 8441 | #, c-format |
2e8451e8 JX |
8442 | msgid "" |
8443 | "Prompt help:\n" | |
8444 | "1 - select a numbered item\n" | |
8445 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 8446 | " - (empty) select nothing\n" |
2e8451e8 JX |
8447 | msgstr "" |
8448 | "帮助:\n" | |
8449 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
8450 | "foo - 通过唯一前缀选择一个选项\n" |
8451 | " - (空)什么也不选择\n" | |
2e8451e8 | 8452 | |
c1ac5258 | 8453 | #: builtin/clean.c:301 git-add--interactive.perl:588 |
1a79b2f1 | 8454 | #, c-format |
2e8451e8 JX |
8455 | msgid "" |
8456 | "Prompt help:\n" | |
8457 | "1 - select a single item\n" | |
8458 | "3-5 - select a range of items\n" | |
8459 | "2-3,6-9 - select multiple ranges\n" | |
8460 | "foo - select item based on unique prefix\n" | |
8461 | "-... - unselect specified items\n" | |
8462 | "* - choose all items\n" | |
1a79b2f1 | 8463 | " - (empty) finish selecting\n" |
2e8451e8 JX |
8464 | msgstr "" |
8465 | "帮助:\n" | |
8466 | "1 - 选择一个选项\n" | |
8467 | "3-5 - 选择一个范围内的所有选项\n" | |
8468 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 8469 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
8470 | "-... - 反选特定的选项\n" |
8471 | "* - 选择所有选项\n" | |
1a79b2f1 | 8472 | " - (空)结束选择\n" |
2e8451e8 | 8473 | |
c1ac5258 | 8474 | #: builtin/clean.c:517 git-add--interactive.perl:554 |
fd8cb379 | 8475 | #: git-add--interactive.perl:559 |
1a79b2f1 JX |
8476 | #, c-format, perl-format |
8477 | msgid "Huh (%s)?\n" | |
8478 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 8479 | |
c1ac5258 | 8480 | #: builtin/clean.c:659 |
2e8451e8 JX |
8481 | #, c-format |
8482 | msgid "Input ignore patterns>> " | |
8483 | msgstr "输入模版以排除条目>> " | |
8484 | ||
c1ac5258 | 8485 | #: builtin/clean.c:696 |
2e8451e8 JX |
8486 | #, c-format |
8487 | msgid "WARNING: Cannot find items matched by: %s" | |
8488 | msgstr "警告:无法找到和 %s 匹配的条目" | |
8489 | ||
c1ac5258 | 8490 | #: builtin/clean.c:717 |
2e8451e8 JX |
8491 | msgid "Select items to delete" |
8492 | msgstr "选择要删除的条目" | |
8493 | ||
814ff314 | 8494 | #. TRANSLATORS: Make sure to keep [y/N] as is |
c1ac5258 | 8495 | #: builtin/clean.c:758 |
2e8451e8 | 8496 | #, c-format |
814ff314 JX |
8497 | msgid "Remove %s [y/N]? " |
8498 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 8499 | |
c1ac5258 | 8500 | #: builtin/clean.c:783 git-add--interactive.perl:1717 |
1a79b2f1 JX |
8501 | #, c-format |
8502 | msgid "Bye.\n" | |
8503 | msgstr "再见。\n" | |
2e8451e8 | 8504 | |
c1ac5258 | 8505 | #: builtin/clean.c:791 |
2e8451e8 JX |
8506 | msgid "" |
8507 | "clean - start cleaning\n" | |
8508 | "filter by pattern - exclude items from deletion\n" | |
8509 | "select by numbers - select items to be deleted by numbers\n" | |
8510 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
8511 | "quit - stop cleaning\n" | |
8512 | "help - this screen\n" | |
8513 | "? - help for prompt selection" | |
8514 | msgstr "" | |
8515 | "clean - 开始清理\n" | |
8516 | "filter by pattern - 通过模版排除要删除的条目\n" | |
8517 | "select by numbers - 通过数字选择要删除的条目\n" | |
8518 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
8519 | "quit - 停止删除并退出\n" | |
8520 | "help - 显示本帮助\n" | |
8521 | "? - 显示如何在提示符下选择的帮助" | |
8522 | ||
c1ac5258 | 8523 | #: builtin/clean.c:818 git-add--interactive.perl:1793 |
2e8451e8 JX |
8524 | msgid "*** Commands ***" |
8525 | msgstr "*** 命令 ***" | |
8526 | ||
c1ac5258 | 8527 | #: builtin/clean.c:819 git-add--interactive.perl:1790 |
2e8451e8 JX |
8528 | msgid "What now" |
8529 | msgstr "请选择" | |
8530 | ||
c1ac5258 | 8531 | #: builtin/clean.c:827 |
2e8451e8 JX |
8532 | msgid "Would remove the following item:" |
8533 | msgid_plural "Would remove the following items:" | |
8534 | msgstr[0] "将删除如下条目:" | |
8535 | msgstr[1] "将删除如下条目:" | |
8536 | ||
c1ac5258 | 8537 | #: builtin/clean.c:843 |
2e8451e8 JX |
8538 | msgid "No more files to clean, exiting." |
8539 | msgstr "没有要清理的文件,退出。" | |
8540 | ||
c1ac5258 | 8541 | #: builtin/clean.c:905 |
ef317cd5 | 8542 | msgid "do not print names of files removed" |
07432cef | 8543 | msgstr "不打印删除文件的名称" |
ef317cd5 | 8544 | |
c1ac5258 | 8545 | #: builtin/clean.c:907 |
ef317cd5 | 8546 | msgid "force" |
07432cef | 8547 | msgstr "强制" |
ef317cd5 | 8548 | |
c1ac5258 | 8549 | #: builtin/clean.c:908 |
2e8451e8 JX |
8550 | msgid "interactive cleaning" |
8551 | msgstr "交互式清除" | |
8552 | ||
c1ac5258 | 8553 | #: builtin/clean.c:910 |
ef317cd5 | 8554 | msgid "remove whole directories" |
07432cef | 8555 | msgstr "删除整个目录" |
ef317cd5 | 8556 | |
c1ac5258 JX |
8557 | #: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 |
8558 | #: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 | |
8559 | #: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 | |
8560 | #: builtin/show-ref.c:177 | |
ef317cd5 | 8561 | msgid "pattern" |
07432cef | 8562 | msgstr "模式" |
ef317cd5 | 8563 | |
c1ac5258 | 8564 | #: builtin/clean.c:912 |
ef317cd5 | 8565 | msgid "add <pattern> to ignore rules" |
4375c10e | 8566 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 8567 | |
c1ac5258 | 8568 | #: builtin/clean.c:913 |
ef317cd5 | 8569 | msgid "remove ignored files, too" |
07432cef | 8570 | msgstr "也删除忽略的文件" |
ef317cd5 | 8571 | |
c1ac5258 | 8572 | #: builtin/clean.c:915 |
ef317cd5 | 8573 | msgid "remove only ignored files" |
07432cef | 8574 | msgstr "只删除忽略的文件" |
c04f5ac3 | 8575 | |
c1ac5258 | 8576 | #: builtin/clean.c:933 |
c04f5ac3 | 8577 | msgid "-x and -X cannot be used together" |
649900bc | 8578 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 8579 | |
c1ac5258 | 8580 | #: builtin/clean.c:937 |
c04f5ac3 | 8581 | msgid "" |
6c94aba5 | 8582 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 8583 | "clean" |
c04f5ac3 | 8584 | msgstr "" |
2e8451e8 | 8585 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 8586 | |
c1ac5258 | 8587 | #: builtin/clean.c:940 |
c04f5ac3 | 8588 | msgid "" |
6c94aba5 | 8589 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 8590 | "refusing to clean" |
c04f5ac3 | 8591 | msgstr "" |
2e8451e8 | 8592 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 8593 | |
c1ac5258 | 8594 | #: builtin/clone.c:43 |
814ff314 | 8595 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 8596 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 8597 | |
c1ac5258 | 8598 | #: builtin/clone.c:88 |
ef317cd5 | 8599 | msgid "don't create a checkout" |
07432cef | 8600 | msgstr "不创建一个检出" |
ef317cd5 | 8601 | |
c1ac5258 | 8602 | #: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 |
ef317cd5 | 8603 | msgid "create a bare repository" |
160fb2b2 | 8604 | msgstr "创建一个纯仓库" |
ef317cd5 | 8605 | |
c1ac5258 | 8606 | #: builtin/clone.c:93 |
ef317cd5 | 8607 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 8608 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 8609 | |
c1ac5258 | 8610 | #: builtin/clone.c:95 |
ef317cd5 | 8611 | msgid "to clone from a local repository" |
160fb2b2 | 8612 | msgstr "从本地仓库克隆" |
ef317cd5 | 8613 | |
c1ac5258 | 8614 | #: builtin/clone.c:97 |
ef317cd5 | 8615 | msgid "don't use local hardlinks, always copy" |
07432cef | 8616 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 8617 | |
c1ac5258 | 8618 | #: builtin/clone.c:99 |
ef317cd5 | 8619 | msgid "setup as shared repository" |
160fb2b2 | 8620 | msgstr "设置为共享仓库" |
ef317cd5 | 8621 | |
c1ac5258 | 8622 | #: builtin/clone.c:101 builtin/clone.c:105 |
87cb7997 | 8623 | msgid "pathspec" |
65e2041e | 8624 | msgstr "路径规格" |
87cb7997 | 8625 | |
c1ac5258 | 8626 | #: builtin/clone.c:101 builtin/clone.c:105 |
ef317cd5 | 8627 | msgid "initialize submodules in the clone" |
07432cef | 8628 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 8629 | |
c1ac5258 | 8630 | #: builtin/clone.c:108 |
5b04ee3b JX |
8631 | msgid "number of submodules cloned in parallel" |
8632 | msgstr "并发克隆的子模组的数量" | |
8633 | ||
c1ac5258 | 8634 | #: builtin/clone.c:109 builtin/init-db.c:477 |
ef317cd5 | 8635 | msgid "template-directory" |
07432cef | 8636 | msgstr "模板目录" |
ef317cd5 | 8637 | |
c1ac5258 | 8638 | #: builtin/clone.c:110 builtin/init-db.c:478 |
ef317cd5 | 8639 | msgid "directory from which templates will be used" |
07432cef | 8640 | msgstr "模板目录将被使用" |
ef317cd5 | 8641 | |
c1ac5258 JX |
8642 | #: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 |
8643 | #: builtin/submodule--helper.c:1739 | |
ef317cd5 | 8644 | msgid "reference repository" |
160fb2b2 | 8645 | msgstr "参考仓库" |
ef317cd5 | 8646 | |
c1ac5258 JX |
8647 | #: builtin/clone.c:116 builtin/submodule--helper.c:1370 |
8648 | #: builtin/submodule--helper.c:1741 | |
7aea43ff | 8649 | msgid "use --reference only while cloning" |
160fb2b2 | 8650 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 8651 | |
c1ac5258 JX |
8652 | #: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 |
8653 | #: builtin/pack-objects.c:3191 builtin/repack.c:320 | |
ef317cd5 | 8654 | msgid "name" |
07432cef | 8655 | msgstr "名称" |
ef317cd5 | 8656 | |
c1ac5258 | 8657 | #: builtin/clone.c:118 |
ef317cd5 | 8658 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 8659 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 8660 | |
c1ac5258 | 8661 | #: builtin/clone.c:120 |
ef317cd5 | 8662 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 8663 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 8664 | |
c1ac5258 | 8665 | #: builtin/clone.c:122 |
ef317cd5 | 8666 | msgid "path to git-upload-pack on the remote" |
07432cef | 8667 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 8668 | |
c1ac5258 | 8669 | #: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 |
fd8cb379 | 8670 | #: builtin/pull.c:216 |
ef317cd5 | 8671 | msgid "depth" |
07432cef | 8672 | msgstr "深度" |
ef317cd5 | 8673 | |
c1ac5258 | 8674 | #: builtin/clone.c:124 |
ef317cd5 | 8675 | msgid "create a shallow clone of that depth" |
07432cef | 8676 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 8677 | |
c1ac5258 | 8678 | #: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182 |
31e5e17b | 8679 | #: parse-options.h:154 |
a0b6b246 JX |
8680 | msgid "time" |
8681 | msgstr "时间" | |
8682 | ||
c1ac5258 | 8683 | #: builtin/clone.c:126 |
a0b6b246 JX |
8684 | msgid "create a shallow clone since a specific time" |
8685 | msgstr "从一个特定时间创建一个浅克隆" | |
8686 | ||
c1ac5258 | 8687 | #: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 |
a0b6b246 JX |
8688 | msgid "revision" |
8689 | msgstr "版本" | |
8690 | ||
c1ac5258 | 8691 | #: builtin/clone.c:128 builtin/fetch.c:144 |
1a79b2f1 JX |
8692 | msgid "deepen history of shallow clone, excluding rev" |
8693 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 8694 | |
c1ac5258 | 8695 | #: builtin/clone.c:130 |
ef317cd5 | 8696 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 8697 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 8698 | |
c1ac5258 | 8699 | #: builtin/clone.c:132 |
a4f16749 JX |
8700 | msgid "don't clone any tags, and make later fetches not to follow them" |
8701 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
8702 | ||
c1ac5258 | 8703 | #: builtin/clone.c:134 |
5b04ee3b JX |
8704 | msgid "any cloned submodules will be shallow" |
8705 | msgstr "子模组将以浅下载模式克隆" | |
8706 | ||
c1ac5258 | 8707 | #: builtin/clone.c:135 builtin/init-db.c:486 |
ef317cd5 | 8708 | msgid "gitdir" |
07432cef | 8709 | msgstr "git目录" |
ef317cd5 | 8710 | |
c1ac5258 | 8711 | #: builtin/clone.c:136 builtin/init-db.c:487 |
ef317cd5 | 8712 | msgid "separate git dir from working tree" |
07432cef | 8713 | msgstr "git目录和工作区分离" |
ef317cd5 | 8714 | |
c1ac5258 | 8715 | #: builtin/clone.c:137 |
ef317cd5 | 8716 | msgid "key=value" |
07432cef | 8717 | msgstr "key=value" |
ef317cd5 | 8718 | |
c1ac5258 | 8719 | #: builtin/clone.c:138 |
ef317cd5 | 8720 | msgid "set config inside the new repository" |
160fb2b2 | 8721 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 8722 | |
c1ac5258 | 8723 | #: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 |
fd8cb379 | 8724 | #: builtin/push.c:583 |
276ceeaa JX |
8725 | msgid "use IPv4 addresses only" |
8726 | msgstr "只使用 IPv4 地址" | |
8727 | ||
c1ac5258 | 8728 | #: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 |
fd8cb379 | 8729 | #: builtin/push.c:585 |
276ceeaa JX |
8730 | msgid "use IPv6 addresses only" |
8731 | msgstr "只使用 IPv6 地址" | |
8732 | ||
c1ac5258 | 8733 | #: builtin/clone.c:279 |
3495628d JX |
8734 | msgid "" |
8735 | "No directory name could be guessed.\n" | |
8736 | "Please specify a directory on the command line" | |
8737 | msgstr "" | |
8738 | "无法猜到目录名。\n" | |
26e4cbec | 8739 | "请在命令行指定一个目录" |
3495628d | 8740 | |
c1ac5258 | 8741 | #: builtin/clone.c:332 |
cfff71a9 | 8742 | #, c-format |
a0b6b246 JX |
8743 | msgid "info: Could not add alternate for '%s': %s\n" |
8744 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 8745 | |
c1ac5258 | 8746 | #: builtin/clone.c:404 |
5c57d762 JX |
8747 | #, c-format |
8748 | msgid "failed to open '%s'" | |
c1ac5258 | 8749 | msgstr "打开 '%s' 失败" |
5c57d762 | 8750 | |
c1ac5258 | 8751 | #: builtin/clone.c:412 |
c04f5ac3 JX |
8752 | #, c-format |
8753 | msgid "%s exists and is not a directory" | |
8754 | msgstr "%s 存在且不是一个目录" | |
8755 | ||
c1ac5258 | 8756 | #: builtin/clone.c:426 |
c04f5ac3 JX |
8757 | #, c-format |
8758 | msgid "failed to stat %s\n" | |
65e2041e | 8759 | msgstr "对 %s 调用 stat 失败\n" |
c04f5ac3 | 8760 | |
c1ac5258 | 8761 | #: builtin/clone.c:448 |
c04f5ac3 JX |
8762 | #, c-format |
8763 | msgid "failed to create link '%s'" | |
c1ac5258 | 8764 | msgstr "创建链接 '%s' 失败" |
c04f5ac3 | 8765 | |
c1ac5258 | 8766 | #: builtin/clone.c:452 |
c04f5ac3 JX |
8767 | #, c-format |
8768 | msgid "failed to copy file to '%s'" | |
c1ac5258 | 8769 | msgstr "拷贝文件至 '%s' 失败" |
c04f5ac3 | 8770 | |
c1ac5258 | 8771 | #: builtin/clone.c:478 |
c04f5ac3 JX |
8772 | #, c-format |
8773 | msgid "done.\n" | |
8774 | msgstr "完成。\n" | |
8775 | ||
c1ac5258 | 8776 | #: builtin/clone.c:492 |
1003b3a5 JX |
8777 | msgid "" |
8778 | "Clone succeeded, but checkout failed.\n" | |
8779 | "You can inspect what was checked out with 'git status'\n" | |
8780 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
8781 | msgstr "" | |
8782 | "克隆成功,但是检出失败。\n" | |
8783 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
8784 | "'git checkout -f HEAD' 重试\n" | |
8785 | ||
c1ac5258 | 8786 | #: builtin/clone.c:569 |
c04f5ac3 JX |
8787 | #, c-format |
8788 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 8789 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 8790 | |
c1ac5258 | 8791 | #: builtin/clone.c:680 |
3495628d JX |
8792 | #, c-format |
8793 | msgid "unable to update %s" | |
8794 | msgstr "不能更新 %s" | |
8795 | ||
c1ac5258 | 8796 | #: builtin/clone.c:730 |
c04f5ac3 JX |
8797 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
8798 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
8799 | ||
c1ac5258 | 8800 | #: builtin/clone.c:760 |
1003b3a5 JX |
8801 | msgid "unable to checkout working tree" |
8802 | msgstr "不能检出工作区" | |
8803 | ||
c1ac5258 | 8804 | #: builtin/clone.c:805 |
3495628d JX |
8805 | msgid "unable to write parameters to config file" |
8806 | msgstr "无法将参数写入配置文件" | |
8807 | ||
c1ac5258 | 8808 | #: builtin/clone.c:868 |
04cb2f28 JX |
8809 | msgid "cannot repack to clean up" |
8810 | msgstr "无法执行 repack 来清理" | |
8811 | ||
c1ac5258 | 8812 | #: builtin/clone.c:870 |
04cb2f28 JX |
8813 | msgid "cannot unlink temporary alternates file" |
8814 | msgstr "无法删除临时的 alternates 文件" | |
8815 | ||
c1ac5258 | 8816 | #: builtin/clone.c:910 builtin/receive-pack.c:1935 |
c04f5ac3 JX |
8817 | msgid "Too many arguments." |
8818 | msgstr "太多参数。" | |
8819 | ||
c1ac5258 | 8820 | #: builtin/clone.c:914 |
c04f5ac3 | 8821 | msgid "You must specify a repository to clone." |
160fb2b2 | 8822 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 8823 | |
c1ac5258 | 8824 | #: builtin/clone.c:927 |
c04f5ac3 JX |
8825 | #, c-format |
8826 | msgid "--bare and --origin %s options are incompatible." | |
8827 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
8828 | ||
c1ac5258 | 8829 | #: builtin/clone.c:930 |
07432cef WS |
8830 | msgid "--bare and --separate-git-dir are incompatible." |
8831 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
8832 | ||
c1ac5258 | 8833 | #: builtin/clone.c:943 |
c04f5ac3 JX |
8834 | #, c-format |
8835 | msgid "repository '%s' does not exist" | |
160fb2b2 | 8836 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 8837 | |
c1ac5258 | 8838 | #: builtin/clone.c:949 builtin/fetch.c:1512 |
cfff71a9 JX |
8839 | #, c-format |
8840 | msgid "depth %s is not a positive number" | |
8841 | msgstr "深度 %s 不是一个正数" | |
8842 | ||
c1ac5258 | 8843 | #: builtin/clone.c:959 |
c04f5ac3 JX |
8844 | #, c-format |
8845 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 8846 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 8847 | |
c1ac5258 | 8848 | #: builtin/clone.c:969 |
c04f5ac3 JX |
8849 | #, c-format |
8850 | msgid "working tree '%s' already exists." | |
8851 | msgstr "工作区 '%s' 已经存在。" | |
8852 | ||
c1ac5258 JX |
8853 | #: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 |
8854 | #: builtin/worktree.c:247 builtin/worktree.c:277 | |
5bb01d4f JX |
8855 | #, c-format |
8856 | msgid "could not create leading directories of '%s'" | |
8857 | msgstr "不能为 '%s' 创建先导目录" | |
8858 | ||
c1ac5258 | 8859 | #: builtin/clone.c:989 |
c04f5ac3 | 8860 | #, c-format |
814ff314 JX |
8861 | msgid "could not create work tree dir '%s'" |
8862 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 8863 | |
c1ac5258 | 8864 | #: builtin/clone.c:1009 |
c04f5ac3 JX |
8865 | #, c-format |
8866 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 8867 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 8868 | |
c1ac5258 | 8869 | #: builtin/clone.c:1011 |
c04f5ac3 JX |
8870 | #, c-format |
8871 | msgid "Cloning into '%s'...\n" | |
8872 | msgstr "正克隆到 '%s'...\n" | |
8873 | ||
c1ac5258 | 8874 | #: builtin/clone.c:1035 |
a0b6b246 JX |
8875 | msgid "" |
8876 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
8877 | "able" | |
8878 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
8879 | ||
c1ac5258 | 8880 | #: builtin/clone.c:1096 |
6acbf033 | 8881 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
8882 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
8883 | ||
c1ac5258 | 8884 | #: builtin/clone.c:1098 |
a0b6b246 JX |
8885 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
8886 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 8887 | |
c1ac5258 | 8888 | #: builtin/clone.c:1100 |
a0b6b246 JX |
8889 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
8890 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
8891 | ||
c1ac5258 | 8892 | #: builtin/clone.c:1102 |
31e5e17b JX |
8893 | msgid "--filter is ignored in local clones; use file:// instead." |
8894 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
8895 | ||
c1ac5258 | 8896 | #: builtin/clone.c:1105 |
6acbf033 | 8897 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 8898 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 8899 | |
c1ac5258 | 8900 | #: builtin/clone.c:1110 |
6acbf033 JX |
8901 | msgid "--local is ignored" |
8902 | msgstr "--local 被忽略" | |
8903 | ||
c1ac5258 | 8904 | #: builtin/clone.c:1180 builtin/clone.c:1188 |
c04f5ac3 JX |
8905 | #, c-format |
8906 | msgid "Remote branch %s not found in upstream %s" | |
8907 | msgstr "远程分支 %s 在上游 %s 未发现" | |
8908 | ||
c1ac5258 | 8909 | #: builtin/clone.c:1191 |
c04f5ac3 | 8910 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 8911 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 8912 | |
a4f16749 | 8913 | #: builtin/column.c:10 |
814ff314 JX |
8914 | msgid "git column [<options>]" |
8915 | msgstr "git column [<选项>]" | |
ef317cd5 | 8916 | |
a4f16749 | 8917 | #: builtin/column.c:27 |
ef317cd5 | 8918 | msgid "lookup config vars" |
07432cef | 8919 | msgstr "查找配置变量" |
ef317cd5 | 8920 | |
a4f16749 | 8921 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 8922 | msgid "layout to use" |
07432cef | 8923 | msgstr "要使用的布局" |
ef317cd5 | 8924 | |
a4f16749 | 8925 | #: builtin/column.c:30 |
ef317cd5 | 8926 | msgid "Maximum width" |
07432cef | 8927 | msgstr "最大宽度" |
ef317cd5 | 8928 | |
a4f16749 | 8929 | #: builtin/column.c:31 |
ef317cd5 | 8930 | msgid "Padding space on left border" |
07432cef | 8931 | msgstr "左边框的填充空间" |
ef317cd5 | 8932 | |
a4f16749 | 8933 | #: builtin/column.c:32 |
ef317cd5 | 8934 | msgid "Padding space on right border" |
07432cef | 8935 | msgstr "右边框的填充空间" |
ef317cd5 | 8936 | |
a4f16749 | 8937 | #: builtin/column.c:33 |
ef317cd5 | 8938 | msgid "Padding space between columns" |
07432cef | 8939 | msgstr "两列之间的填充空间" |
ef317cd5 | 8940 | |
fd8cb379 | 8941 | #: builtin/column.c:51 |
8ada9598 | 8942 | msgid "--command must be the first argument" |
81809b99 | 8943 | msgstr "--command 必须是第一个参数" |
8ada9598 | 8944 | |
c1ac5258 | 8945 | #: builtin/commit.c:38 |
814ff314 | 8946 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 8947 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 8948 | |
c1ac5258 | 8949 | #: builtin/commit.c:43 |
814ff314 | 8950 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 8951 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 8952 | |
c1ac5258 | 8953 | #: builtin/commit.c:48 |
c04f5ac3 JX |
8954 | msgid "" |
8955 | "You asked to amend the most recent commit, but doing so would make\n" | |
8956 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
8957 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
8958 | msgstr "" | |
1b150dc9 T |
8959 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
8960 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 8961 | |
c1ac5258 | 8962 | #: builtin/commit.c:53 |
c04f5ac3 JX |
8963 | msgid "" |
8964 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
8965 | "If you wish to commit it anyway, use:\n" | |
8966 | "\n" | |
8967 | " git commit --allow-empty\n" | |
8968 | "\n" | |
c04f5ac3 | 8969 | msgstr "" |
a9ce4543 T |
8970 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
8971 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
8972 | "\n" |
8973 | " git commit --allow-empty\n" | |
8974 | "\n" | |
c04f5ac3 | 8975 | |
c1ac5258 | 8976 | #: builtin/commit.c:60 |
b1894384 JX |
8977 | msgid "Otherwise, please use 'git reset'\n" |
8978 | msgstr "否则,请使用命令 'git reset'\n" | |
8979 | ||
c1ac5258 | 8980 | #: builtin/commit.c:63 |
b1894384 JX |
8981 | msgid "" |
8982 | "If you wish to skip this commit, use:\n" | |
8983 | "\n" | |
8984 | " git reset\n" | |
8985 | "\n" | |
8986 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
8987 | "the remaining commits.\n" | |
8988 | msgstr "" | |
8989 | "如果您想跳过这个提交,使用命令:\n" | |
8990 | "\n" | |
8991 | " git reset\n" | |
8992 | "\n" | |
8993 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
8994 | "操作。\n" | |
8995 | ||
c1ac5258 | 8996 | #: builtin/commit.c:306 |
c04f5ac3 | 8997 | msgid "failed to unpack HEAD tree object" |
c1ac5258 | 8998 | msgstr "解包 HEAD 树对象失败" |
c04f5ac3 | 8999 | |
c1ac5258 | 9000 | #: builtin/commit.c:347 |
c04f5ac3 | 9001 | msgid "unable to create temporary index" |
90e6ef53 | 9002 | msgstr "不能创建临时索引" |
c04f5ac3 | 9003 | |
c1ac5258 | 9004 | #: builtin/commit.c:353 |
c04f5ac3 JX |
9005 | msgid "interactive add failed" |
9006 | msgstr "交互式添加失败" | |
9007 | ||
c1ac5258 | 9008 | #: builtin/commit.c:366 |
220c313c JX |
9009 | msgid "unable to update temporary index" |
9010 | msgstr "无法更新临时索引" | |
9011 | ||
c1ac5258 | 9012 | #: builtin/commit.c:368 |
220c313c JX |
9013 | msgid "Failed to update main cache tree" |
9014 | msgstr "不能更新树的主缓存" | |
9015 | ||
c1ac5258 | 9016 | #: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 |
c04f5ac3 | 9017 | msgid "unable to write new_index file" |
90e6ef53 | 9018 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 9019 | |
c1ac5258 | 9020 | #: builtin/commit.c:445 |
8ada9598 | 9021 | msgid "cannot do a partial commit during a merge." |
81809b99 | 9022 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 9023 | |
c1ac5258 | 9024 | #: builtin/commit.c:447 |
8ada9598 | 9025 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 9026 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 9027 | |
c1ac5258 | 9028 | #: builtin/commit.c:455 |
c04f5ac3 | 9029 | msgid "cannot read the index" |
90e6ef53 | 9030 | msgstr "无法读取索引" |
c04f5ac3 | 9031 | |
c1ac5258 | 9032 | #: builtin/commit.c:474 |
c04f5ac3 | 9033 | msgid "unable to write temporary index file" |
90e6ef53 | 9034 | msgstr "无法写临时索引文件" |
c04f5ac3 | 9035 | |
c1ac5258 | 9036 | #: builtin/commit.c:571 |
220c313c JX |
9037 | #, c-format |
9038 | msgid "commit '%s' lacks author header" | |
9039 | msgstr "提交 '%s' 缺少作者信息" | |
9040 | ||
c1ac5258 | 9041 | #: builtin/commit.c:573 |
c04f5ac3 | 9042 | #, c-format |
220c313c | 9043 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 9044 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 9045 | |
c1ac5258 | 9046 | #: builtin/commit.c:592 |
c04f5ac3 | 9047 | msgid "malformed --author parameter" |
fd8cb379 | 9048 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 9049 | |
c1ac5258 | 9050 | #: builtin/commit.c:644 |
6acbf033 JX |
9051 | msgid "" |
9052 | "unable to select a comment character that is not used\n" | |
9053 | "in the current commit message" | |
9054 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
9055 | ||
c1ac5258 | 9056 | #: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 |
c04f5ac3 JX |
9057 | #, c-format |
9058 | msgid "could not lookup commit %s" | |
9059 | msgstr "不能查询提交 %s" | |
9060 | ||
c1ac5258 | 9061 | #: builtin/commit.c:693 builtin/shortlog.c:317 |
c04f5ac3 JX |
9062 | #, c-format |
9063 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 9064 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 9065 | |
c1ac5258 | 9066 | #: builtin/commit.c:695 |
c04f5ac3 | 9067 | msgid "could not read log from standard input" |
90e6ef53 | 9068 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 9069 | |
c1ac5258 | 9070 | #: builtin/commit.c:699 |
c04f5ac3 JX |
9071 | #, c-format |
9072 | msgid "could not read log file '%s'" | |
90e6ef53 | 9073 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 9074 | |
c1ac5258 | 9075 | #: builtin/commit.c:728 builtin/commit.c:736 |
c04f5ac3 | 9076 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 9077 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 9078 | |
c1ac5258 | 9079 | #: builtin/commit.c:733 |
5b04ee3b JX |
9080 | msgid "could not read MERGE_MSG" |
9081 | msgstr "不能读取 MERGE_MSG" | |
9082 | ||
c1ac5258 | 9083 | #: builtin/commit.c:787 |
c04f5ac3 | 9084 | msgid "could not write commit template" |
90e6ef53 | 9085 | msgstr "不能写提交模版" |
c04f5ac3 | 9086 | |
c1ac5258 | 9087 | #: builtin/commit.c:805 |
81809b99 | 9088 | #, c-format |
c04f5ac3 JX |
9089 | msgid "" |
9090 | "\n" | |
8ada9598 | 9091 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
9092 | "If this is not correct, please remove the file\n" |
9093 | "\t%s\n" | |
9094 | "and try again.\n" | |
9095 | msgstr "" | |
9096 | "\n" | |
649900bc | 9097 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
9098 | "\t%s\n" |
9099 | "然后重试。\n" | |
9100 | ||
c1ac5258 | 9101 | #: builtin/commit.c:810 |
81809b99 | 9102 | #, c-format |
8ada9598 JX |
9103 | msgid "" |
9104 | "\n" | |
9105 | "It looks like you may be committing a cherry-pick.\n" | |
9106 | "If this is not correct, please remove the file\n" | |
9107 | "\t%s\n" | |
9108 | "and try again.\n" | |
9109 | msgstr "" | |
9110 | "\n" | |
649900bc | 9111 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
9112 | "\t%s\n" |
9113 | "然后重试。\n" | |
c04f5ac3 | 9114 | |
c1ac5258 | 9115 | #: builtin/commit.c:823 |
a77c07d9 | 9116 | #, c-format |
c04f5ac3 | 9117 | msgid "" |
8ada9598 | 9118 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 9119 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 9120 | msgstr "" |
a77c07d9 | 9121 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 9122 | "说明将会终止提交。\n" |
c04f5ac3 | 9123 | |
c1ac5258 | 9124 | #: builtin/commit.c:831 |
a77c07d9 | 9125 | #, c-format |
c04f5ac3 | 9126 | msgid "" |
8ada9598 | 9127 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 9128 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
9129 | "An empty message aborts the commit.\n" |
9130 | msgstr "" | |
a77c07d9 JX |
9131 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
9132 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 9133 | |
90e6ef53 | 9134 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c1ac5258 | 9135 | #: builtin/commit.c:848 |
6acbf033 JX |
9136 | #, c-format |
9137 | msgid "%sAuthor: %.*s <%.*s>" | |
9138 | msgstr "%s作者: %.*s <%.*s>" | |
9139 | ||
9140 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
c1ac5258 | 9141 | #: builtin/commit.c:856 |
c04f5ac3 | 9142 | #, c-format |
6acbf033 JX |
9143 | msgid "%sDate: %s" |
9144 | msgstr "%s日期: %s" | |
c04f5ac3 | 9145 | |
90e6ef53 | 9146 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c1ac5258 | 9147 | #: builtin/commit.c:863 |
c04f5ac3 | 9148 | #, c-format |
6acbf033 JX |
9149 | msgid "%sCommitter: %.*s <%.*s>" |
9150 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 9151 | |
c1ac5258 | 9152 | #: builtin/commit.c:880 |
c04f5ac3 | 9153 | msgid "Cannot read index" |
90e6ef53 | 9154 | msgstr "无法读取索引" |
c04f5ac3 | 9155 | |
c1ac5258 | 9156 | #: builtin/commit.c:946 |
c04f5ac3 JX |
9157 | msgid "Error building trees" |
9158 | msgstr "无法创建树对象" | |
9159 | ||
c1ac5258 | 9160 | #: builtin/commit.c:960 builtin/tag.c:258 |
c04f5ac3 JX |
9161 | #, c-format |
9162 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 9163 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 9164 | |
c1ac5258 | 9165 | #: builtin/commit.c:1004 |
c04f5ac3 | 9166 | #, c-format |
814ff314 | 9167 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 9168 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 9169 | |
c1ac5258 | 9170 | #: builtin/commit.c:1018 |
5809aa05 JX |
9171 | #, c-format |
9172 | msgid "Invalid ignored mode '%s'" | |
9173 | msgstr "无效的忽略模式 '%s'" | |
9174 | ||
c1ac5258 | 9175 | #: builtin/commit.c:1032 builtin/commit.c:1269 |
c04f5ac3 JX |
9176 | #, c-format |
9177 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 9178 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 9179 | |
c1ac5258 | 9180 | #: builtin/commit.c:1070 |
2e8451e8 JX |
9181 | msgid "--long and -z are incompatible" |
9182 | msgstr "--long 和 -z 选项不兼容" | |
9183 | ||
c1ac5258 | 9184 | #: builtin/commit.c:1103 |
c04f5ac3 JX |
9185 | msgid "Using both --reset-author and --author does not make sense" |
9186 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
9187 | ||
c1ac5258 | 9188 | #: builtin/commit.c:1112 |
c04f5ac3 | 9189 | msgid "You have nothing to amend." |
90e6ef53 | 9190 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 9191 | |
c1ac5258 | 9192 | #: builtin/commit.c:1115 |
8ada9598 | 9193 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 9194 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 9195 | |
c1ac5258 | 9196 | #: builtin/commit.c:1117 |
8ada9598 | 9197 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 9198 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 9199 | |
c1ac5258 | 9200 | #: builtin/commit.c:1120 |
c04f5ac3 | 9201 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 9202 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 9203 | |
c1ac5258 | 9204 | #: builtin/commit.c:1130 |
c04f5ac3 JX |
9205 | msgid "Only one of -c/-C/-F/--fixup can be used." |
9206 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
9207 | ||
c1ac5258 | 9208 | #: builtin/commit.c:1132 |
31e5e17b JX |
9209 | msgid "Option -m cannot be combined with -c/-C/-F." |
9210 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 9211 | |
c1ac5258 | 9212 | #: builtin/commit.c:1140 |
c04f5ac3 | 9213 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 9214 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 9215 | |
c1ac5258 | 9216 | #: builtin/commit.c:1157 |
c04f5ac3 JX |
9217 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
9218 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
9219 | ||
c1ac5258 | 9220 | #: builtin/commit.c:1159 |
c04f5ac3 JX |
9221 | msgid "No paths with --include/--only does not make sense." |
9222 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
9223 | ||
c1ac5258 | 9224 | #: builtin/commit.c:1173 builtin/tag.c:544 |
c04f5ac3 JX |
9225 | #, c-format |
9226 | msgid "Invalid cleanup mode %s" | |
9227 | msgstr "无效的清理模式 %s" | |
9228 | ||
c1ac5258 | 9229 | #: builtin/commit.c:1178 |
c04f5ac3 | 9230 | msgid "Paths with -a does not make sense." |
649900bc | 9231 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 9232 | |
fd8cb379 | 9233 | #: builtin/commit.c:1303 builtin/commit.c:1480 |
ef317cd5 | 9234 | msgid "show status concisely" |
07432cef | 9235 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 9236 | |
fd8cb379 | 9237 | #: builtin/commit.c:1305 builtin/commit.c:1482 |
ef317cd5 | 9238 | msgid "show branch information" |
07432cef | 9239 | msgstr "显示分支信息" |
ef317cd5 | 9240 | |
fd8cb379 | 9241 | #: builtin/commit.c:1307 |
a4f16749 JX |
9242 | msgid "show stash information" |
9243 | msgstr "显示贮藏区信息" | |
9244 | ||
fd8cb379 | 9245 | #: builtin/commit.c:1309 builtin/commit.c:1484 |
31e5e17b JX |
9246 | msgid "compute full ahead/behind values" |
9247 | msgstr "计算完整的领先/落后值" | |
9248 | ||
fd8cb379 | 9249 | #: builtin/commit.c:1311 |
a0b6b246 JX |
9250 | msgid "version" |
9251 | msgstr "版本" | |
9252 | ||
fd8cb379 | 9253 | #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 |
c1ac5258 | 9254 | #: builtin/worktree.c:591 |
ef317cd5 | 9255 | msgid "machine-readable output" |
07432cef WS |
9256 | msgstr "机器可读的输出" |
9257 | ||
fd8cb379 | 9258 | #: builtin/commit.c:1314 builtin/commit.c:1488 |
07432cef WS |
9259 | msgid "show status in long format (default)" |
9260 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 9261 | |
fd8cb379 | 9262 | #: builtin/commit.c:1317 builtin/commit.c:1491 |
ef317cd5 | 9263 | msgid "terminate entries with NUL" |
4375c10e | 9264 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 9265 | |
fd8cb379 | 9266 | #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 |
c1ac5258 | 9267 | #: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 |
ef317cd5 | 9268 | msgid "mode" |
07432cef | 9269 | msgstr "模式" |
ef317cd5 | 9270 | |
fd8cb379 | 9271 | #: builtin/commit.c:1320 builtin/commit.c:1494 |
ef317cd5 | 9272 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 9273 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 9274 | |
fd8cb379 | 9275 | #: builtin/commit.c:1324 |
5809aa05 JX |
9276 | msgid "" |
9277 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
9278 | "traditional)" | |
31e5e17b JX |
9279 | msgstr "" |
9280 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 9281 | |
fd8cb379 | 9282 | #: builtin/commit.c:1326 parse-options.h:167 |
ef317cd5 JX |
9283 | msgid "when" |
9284 | msgstr "何时" | |
9285 | ||
fd8cb379 | 9286 | #: builtin/commit.c:1327 |
ef317cd5 JX |
9287 | msgid "" |
9288 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
9289 | "(Default: all)" | |
9290 | msgstr "" | |
07432cef | 9291 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 9292 | |
fd8cb379 | 9293 | #: builtin/commit.c:1329 |
ef317cd5 | 9294 | msgid "list untracked files in columns" |
07432cef | 9295 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 9296 | |
fd8cb379 JX |
9297 | #: builtin/commit.c:1330 |
9298 | msgid "do not detect renames" | |
9299 | msgstr "不检测重命名" | |
9300 | ||
9301 | #: builtin/commit.c:1332 | |
9302 | msgid "detect renames, optionally set similarity index" | |
9303 | msgstr "检测重命名,可以设置索引相似度" | |
9304 | ||
9305 | #: builtin/commit.c:1352 | |
5809aa05 JX |
9306 | msgid "Unsupported combination of ignored and untracked-files arguments" |
9307 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
9308 | ||
fd8cb379 | 9309 | #: builtin/commit.c:1450 |
ef317cd5 | 9310 | msgid "suppress summary after successful commit" |
07432cef | 9311 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 9312 | |
fd8cb379 | 9313 | #: builtin/commit.c:1451 |
ef317cd5 | 9314 | msgid "show diff in commit message template" |
07432cef | 9315 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 9316 | |
fd8cb379 | 9317 | #: builtin/commit.c:1453 |
ef317cd5 | 9318 | msgid "Commit message options" |
07432cef | 9319 | msgstr "提交说明选项" |
c04f5ac3 | 9320 | |
c1ac5258 | 9321 | #: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 |
ef317cd5 | 9322 | msgid "read message from file" |
07432cef | 9323 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 9324 | |
fd8cb379 | 9325 | #: builtin/commit.c:1455 |
ef317cd5 | 9326 | msgid "author" |
07432cef | 9327 | msgstr "作者" |
c04f5ac3 | 9328 | |
fd8cb379 | 9329 | #: builtin/commit.c:1455 |
ef317cd5 | 9330 | msgid "override author for commit" |
07432cef | 9331 | msgstr "提交时覆盖作者" |
73a60cd2 | 9332 | |
c1ac5258 | 9333 | #: builtin/commit.c:1456 builtin/gc.c:504 |
ef317cd5 | 9334 | msgid "date" |
07432cef | 9335 | msgstr "日期" |
c04f5ac3 | 9336 | |
fd8cb379 | 9337 | #: builtin/commit.c:1456 |
ef317cd5 | 9338 | msgid "override date for commit" |
07432cef | 9339 | msgstr "提交时覆盖日期" |
c04f5ac3 | 9340 | |
c1ac5258 JX |
9341 | #: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 |
9342 | #: builtin/notes.c:567 builtin/tag.c:393 | |
ef317cd5 | 9343 | msgid "message" |
07432cef | 9344 | msgstr "说明" |
c04f5ac3 | 9345 | |
fd8cb379 | 9346 | #: builtin/commit.c:1457 |
ef317cd5 | 9347 | msgid "commit message" |
07432cef | 9348 | msgstr "提交说明" |
ef317cd5 | 9349 | |
fd8cb379 JX |
9350 | #: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 |
9351 | #: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 | |
94550ed3 JX |
9352 | msgid "commit" |
9353 | msgstr "提交" | |
9354 | ||
fd8cb379 | 9355 | #: builtin/commit.c:1458 |
ef317cd5 | 9356 | msgid "reuse and edit message from specified commit" |
07432cef | 9357 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 9358 | |
fd8cb379 | 9359 | #: builtin/commit.c:1459 |
ef317cd5 | 9360 | msgid "reuse message from specified commit" |
07432cef | 9361 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 9362 | |
fd8cb379 | 9363 | #: builtin/commit.c:1460 |
ef317cd5 | 9364 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 9365 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 9366 | |
fd8cb379 | 9367 | #: builtin/commit.c:1461 |
ef317cd5 | 9368 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 9369 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 9370 | |
fd8cb379 | 9371 | #: builtin/commit.c:1462 |
ef317cd5 | 9372 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 9373 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 9374 | |
c1ac5258 JX |
9375 | #: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 |
9376 | #: builtin/pull.c:154 builtin/revert.c:106 | |
ef317cd5 | 9377 | msgid "add Signed-off-by:" |
07432cef | 9378 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 9379 | |
fd8cb379 | 9380 | #: builtin/commit.c:1464 |
ef317cd5 | 9381 | msgid "use specified template file" |
07432cef | 9382 | msgstr "使用指定的模板文件" |
ef317cd5 | 9383 | |
fd8cb379 | 9384 | #: builtin/commit.c:1465 |
ef317cd5 | 9385 | msgid "force edit of commit" |
07432cef | 9386 | msgstr "强制编辑提交" |
ef317cd5 | 9387 | |
07432cef | 9388 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
fd8cb379 | 9389 | #: builtin/commit.c:1466 |
ef317cd5 | 9390 | msgid "default" |
07432cef | 9391 | msgstr "default" |
ef317cd5 | 9392 | |
c1ac5258 | 9393 | #: builtin/commit.c:1466 builtin/tag.c:399 |
ef317cd5 | 9394 | msgid "how to strip spaces and #comments from message" |
07432cef | 9395 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 9396 | |
fd8cb379 | 9397 | #: builtin/commit.c:1467 |
ef317cd5 | 9398 | msgid "include status in commit message template" |
07432cef | 9399 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 9400 | |
c1ac5258 JX |
9401 | #: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 |
9402 | #: builtin/revert.c:114 | |
ef317cd5 | 9403 | msgid "GPG sign commit" |
07432cef | 9404 | msgstr "GPG 提交签名" |
ef317cd5 | 9405 | |
fd8cb379 | 9406 | #: builtin/commit.c:1472 |
ef317cd5 | 9407 | msgid "Commit contents options" |
07432cef | 9408 | msgstr "提交内容选项" |
ef317cd5 | 9409 | |
fd8cb379 | 9410 | #: builtin/commit.c:1473 |
ef317cd5 | 9411 | msgid "commit all changed files" |
07432cef | 9412 | msgstr "提交所有改动的文件" |
ef317cd5 | 9413 | |
fd8cb379 | 9414 | #: builtin/commit.c:1474 |
ef317cd5 | 9415 | msgid "add specified files to index for commit" |
07432cef | 9416 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 9417 | |
fd8cb379 | 9418 | #: builtin/commit.c:1475 |
ef317cd5 | 9419 | msgid "interactively add files" |
07432cef | 9420 | msgstr "交互式添加文件" |
ef317cd5 | 9421 | |
fd8cb379 | 9422 | #: builtin/commit.c:1476 |
ef317cd5 | 9423 | msgid "interactively add changes" |
07432cef | 9424 | msgstr "交互式添加变更" |
ef317cd5 | 9425 | |
fd8cb379 | 9426 | #: builtin/commit.c:1477 |
ef317cd5 | 9427 | msgid "commit only specified files" |
07432cef | 9428 | msgstr "只提交指定的文件" |
ef317cd5 | 9429 | |
fd8cb379 | 9430 | #: builtin/commit.c:1478 |
5c57d762 JX |
9431 | msgid "bypass pre-commit and commit-msg hooks" |
9432 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
9433 | ||
fd8cb379 | 9434 | #: builtin/commit.c:1479 |
ef317cd5 | 9435 | msgid "show what would be committed" |
07432cef | 9436 | msgstr "显示将要提交的内容" |
ef317cd5 | 9437 | |
fd8cb379 | 9438 | #: builtin/commit.c:1492 |
ef317cd5 | 9439 | msgid "amend previous commit" |
07432cef | 9440 | msgstr "修改先前的提交" |
ef317cd5 | 9441 | |
fd8cb379 | 9442 | #: builtin/commit.c:1493 |
ef317cd5 | 9443 | msgid "bypass post-rewrite hook" |
07432cef | 9444 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 9445 | |
fd8cb379 | 9446 | #: builtin/commit.c:1498 |
ef317cd5 | 9447 | msgid "ok to record an empty change" |
07432cef | 9448 | msgstr "允许一个空提交" |
ef317cd5 | 9449 | |
fd8cb379 | 9450 | #: builtin/commit.c:1500 |
ef317cd5 | 9451 | msgid "ok to record a change with an empty message" |
07432cef | 9452 | msgstr "允许空的提交说明" |
ef317cd5 | 9453 | |
fd8cb379 | 9454 | #: builtin/commit.c:1573 |
c04f5ac3 JX |
9455 | #, c-format |
9456 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 9457 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 9458 | |
fd8cb379 | 9459 | #: builtin/commit.c:1580 |
c04f5ac3 | 9460 | msgid "could not read MERGE_MODE" |
90e6ef53 | 9461 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 9462 | |
fd8cb379 | 9463 | #: builtin/commit.c:1599 |
c04f5ac3 JX |
9464 | #, c-format |
9465 | msgid "could not read commit message: %s" | |
90e6ef53 | 9466 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 9467 | |
fd8cb379 | 9468 | #: builtin/commit.c:1610 |
c04f5ac3 JX |
9469 | #, c-format |
9470 | msgid "Aborting commit due to empty commit message.\n" | |
9471 | msgstr "终止提交因为提交说明为空。\n" | |
9472 | ||
fd8cb379 | 9473 | #: builtin/commit.c:1615 |
6937cb4e JX |
9474 | #, c-format |
9475 | msgid "Aborting commit; you did not edit the message.\n" | |
9476 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
9477 | ||
fd8cb379 | 9478 | #: builtin/commit.c:1650 |
c04f5ac3 | 9479 | msgid "" |
c1ac5258 | 9480 | "repository has been updated, but unable to write\n" |
220c313c | 9481 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
9482 | "not exceeded, and then \"git reset HEAD\" to recover." |
9483 | msgstr "" | |
160fb2b2 | 9484 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 9485 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 9486 | |
c1ac5258 | 9487 | #: builtin/commit-graph.c:10 |
fd8cb379 JX |
9488 | msgid "git commit-graph [--object-dir <objdir>]" |
9489 | msgstr "git commit-graph [--object-dir <对象目录>]" | |
9490 | ||
c1ac5258 | 9491 | #: builtin/commit-graph.c:11 builtin/commit-graph.c:23 |
fd8cb379 JX |
9492 | msgid "git commit-graph read [--object-dir <objdir>]" |
9493 | msgstr "git commit-graph read [--object-dir <对象目录>]" | |
9494 | ||
c1ac5258 JX |
9495 | #: builtin/commit-graph.c:12 builtin/commit-graph.c:18 |
9496 | msgid "git commit-graph verify [--object-dir <objdir>]" | |
9497 | msgstr "git commit-graph verify [--object-dir <对象目录>]" | |
9498 | ||
9499 | #: builtin/commit-graph.c:13 builtin/commit-graph.c:28 | |
fd8cb379 | 9500 | msgid "" |
c1ac5258 JX |
9501 | "git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" |
9502 | "stdin-packs|--stdin-commits]" | |
fd8cb379 | 9503 | msgstr "" |
c1ac5258 JX |
9504 | "git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--" |
9505 | "stdin-packs|--stdin-commits]" | |
fd8cb379 | 9506 | |
c1ac5258 JX |
9507 | #: builtin/commit-graph.c:48 builtin/commit-graph.c:77 |
9508 | #: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 | |
9509 | #: builtin/log.c:1477 | |
fd8cb379 JX |
9510 | msgid "dir" |
9511 | msgstr "目录" | |
9512 | ||
c1ac5258 JX |
9513 | #: builtin/commit-graph.c:49 builtin/commit-graph.c:78 |
9514 | #: builtin/commit-graph.c:132 builtin/commit-graph.c:185 | |
fd8cb379 JX |
9515 | msgid "The object directory to store the graph" |
9516 | msgstr "保存图形的对象目录" | |
9517 | ||
c1ac5258 JX |
9518 | #: builtin/commit-graph.c:134 |
9519 | msgid "start walk at all refs" | |
9520 | msgstr "开始遍历所有引用" | |
9521 | ||
9522 | #: builtin/commit-graph.c:136 | |
fd8cb379 JX |
9523 | msgid "scan pack-indexes listed by stdin for commits" |
9524 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
9525 | ||
c1ac5258 | 9526 | #: builtin/commit-graph.c:138 |
fd8cb379 JX |
9527 | msgid "start walk at commits listed by stdin" |
9528 | msgstr "从标准输入中的提交开始扫描" | |
9529 | ||
c1ac5258 | 9530 | #: builtin/commit-graph.c:140 |
fd8cb379 JX |
9531 | msgid "include all commits already in the commit-graph file" |
9532 | msgstr "包含 commit-graph 文件中已有所有提交" | |
9533 | ||
c1ac5258 JX |
9534 | #: builtin/commit-graph.c:149 |
9535 | msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" | |
9536 | msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" | |
fd8cb379 | 9537 | |
a4f16749 | 9538 | #: builtin/config.c:10 |
814ff314 JX |
9539 | msgid "git config [<options>]" |
9540 | msgstr "git config [<选项>]" | |
ef317cd5 | 9541 | |
fd8cb379 JX |
9542 | #: builtin/config.c:101 |
9543 | #, c-format | |
9544 | msgid "unrecognized --type argument, %s" | |
9545 | msgstr "未能识别的 --type 参数,%s" | |
9546 | ||
c1ac5258 JX |
9547 | #: builtin/config.c:113 |
9548 | msgid "only one type at a time" | |
9549 | msgstr "一次只能一个类型" | |
9550 | ||
9551 | #: builtin/config.c:122 | |
ef317cd5 | 9552 | msgid "Config file location" |
07432cef | 9553 | msgstr "配置文件位置" |
ef317cd5 | 9554 | |
c1ac5258 | 9555 | #: builtin/config.c:123 |
ef317cd5 | 9556 | msgid "use global config file" |
07432cef | 9557 | msgstr "使用全局配置文件" |
ef317cd5 | 9558 | |
c1ac5258 | 9559 | #: builtin/config.c:124 |
ef317cd5 | 9560 | msgid "use system config file" |
07432cef | 9561 | msgstr "使用系统级配置文件" |
ef317cd5 | 9562 | |
c1ac5258 | 9563 | #: builtin/config.c:125 |
ef317cd5 | 9564 | msgid "use repository config file" |
160fb2b2 | 9565 | msgstr "使用仓库级配置文件" |
ef317cd5 | 9566 | |
c1ac5258 | 9567 | #: builtin/config.c:126 |
ef317cd5 | 9568 | msgid "use given config file" |
07432cef | 9569 | msgstr "使用指定的配置文件" |
ef317cd5 | 9570 | |
c1ac5258 | 9571 | #: builtin/config.c:127 |
2e8451e8 | 9572 | msgid "blob-id" |
4375c10e | 9573 | msgstr "数据对象 ID" |
2e8451e8 | 9574 | |
c1ac5258 | 9575 | #: builtin/config.c:127 |
2e8451e8 JX |
9576 | msgid "read config from given blob object" |
9577 | msgstr "从给定的数据对象读取配置" | |
9578 | ||
c1ac5258 | 9579 | #: builtin/config.c:128 |
ef317cd5 | 9580 | msgid "Action" |
07432cef | 9581 | msgstr "操作" |
ef317cd5 | 9582 | |
c1ac5258 | 9583 | #: builtin/config.c:129 |
ef317cd5 | 9584 | msgid "get value: name [value-regex]" |
07432cef | 9585 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 9586 | |
c1ac5258 | 9587 | #: builtin/config.c:130 |
ef317cd5 | 9588 | msgid "get all values: key [value-regex]" |
07432cef | 9589 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 9590 | |
c1ac5258 | 9591 | #: builtin/config.c:131 |
ef317cd5 | 9592 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 9593 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 9594 | |
c1ac5258 | 9595 | #: builtin/config.c:132 |
90314792 JX |
9596 | msgid "get value specific for the URL: section[.var] URL" |
9597 | msgstr "获得 URL 取值:section[.var] URL" | |
9598 | ||
c1ac5258 | 9599 | #: builtin/config.c:133 |
ef317cd5 | 9600 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 9601 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 9602 | |
c1ac5258 | 9603 | #: builtin/config.c:134 |
ef317cd5 | 9604 | msgid "add a new variable: name value" |
07432cef | 9605 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 9606 | |
c1ac5258 | 9607 | #: builtin/config.c:135 |
ef317cd5 | 9608 | msgid "remove a variable: name [value-regex]" |
07432cef | 9609 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 9610 | |
c1ac5258 | 9611 | #: builtin/config.c:136 |
ef317cd5 | 9612 | msgid "remove all matches: name [value-regex]" |
07432cef | 9613 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 9614 | |
c1ac5258 | 9615 | #: builtin/config.c:137 |
ef317cd5 | 9616 | msgid "rename section: old-name new-name" |
07432cef | 9617 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 9618 | |
c1ac5258 | 9619 | #: builtin/config.c:138 |
ef317cd5 | 9620 | msgid "remove a section: name" |
07432cef | 9621 | msgstr "删除一个小节:name" |
ef317cd5 | 9622 | |
c1ac5258 | 9623 | #: builtin/config.c:139 |
ef317cd5 | 9624 | msgid "list all" |
07432cef | 9625 | msgstr "列出所有" |
ef317cd5 | 9626 | |
c1ac5258 | 9627 | #: builtin/config.c:140 |
ef317cd5 | 9628 | msgid "open an editor" |
07432cef | 9629 | msgstr "打开一个编辑器" |
ef317cd5 | 9630 | |
c1ac5258 | 9631 | #: builtin/config.c:141 |
04cb2f28 JX |
9632 | msgid "find the color configured: slot [default]" |
9633 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 9634 | |
c1ac5258 | 9635 | #: builtin/config.c:142 |
04cb2f28 JX |
9636 | msgid "find the color setting: slot [stdout-is-tty]" |
9637 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 9638 | |
c1ac5258 | 9639 | #: builtin/config.c:143 |
ef317cd5 | 9640 | msgid "Type" |
07432cef | 9641 | msgstr "类型" |
ef317cd5 | 9642 | |
c1ac5258 | 9643 | #: builtin/config.c:144 |
fd8cb379 JX |
9644 | msgid "value is given this type" |
9645 | msgstr "取值为该类型" | |
9646 | ||
c1ac5258 | 9647 | #: builtin/config.c:145 |
ef317cd5 | 9648 | msgid "value is \"true\" or \"false\"" |
07432cef | 9649 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 9650 | |
c1ac5258 | 9651 | #: builtin/config.c:146 |
ef317cd5 | 9652 | msgid "value is decimal number" |
07432cef | 9653 | msgstr "值是十进制数" |
ef317cd5 | 9654 | |
c1ac5258 | 9655 | #: builtin/config.c:147 |
ef317cd5 | 9656 | msgid "value is --bool or --int" |
07432cef | 9657 | msgstr "值是 --bool or --int" |
ef317cd5 | 9658 | |
c1ac5258 | 9659 | #: builtin/config.c:148 |
ef317cd5 | 9660 | msgid "value is a path (file or directory name)" |
07432cef | 9661 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 9662 | |
c1ac5258 | 9663 | #: builtin/config.c:149 |
5809aa05 JX |
9664 | msgid "value is an expiry date" |
9665 | msgstr "值是一个到期日期" | |
9666 | ||
c1ac5258 | 9667 | #: builtin/config.c:150 |
ef317cd5 | 9668 | msgid "Other" |
07432cef | 9669 | msgstr "其它" |
ef317cd5 | 9670 | |
c1ac5258 | 9671 | #: builtin/config.c:151 |
ef317cd5 | 9672 | msgid "terminate values with NUL byte" |
4375c10e | 9673 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 9674 | |
c1ac5258 | 9675 | #: builtin/config.c:152 |
1b7f4a34 JX |
9676 | msgid "show variable names only" |
9677 | msgstr "只显示变量名" | |
9678 | ||
c1ac5258 | 9679 | #: builtin/config.c:153 |
ef317cd5 | 9680 | msgid "respect include directives on lookup" |
07432cef | 9681 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 9682 | |
c1ac5258 | 9683 | #: builtin/config.c:154 |
276ceeaa JX |
9684 | msgid "show origin of config (file, standard input, blob, command line)" |
9685 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
9686 | ||
c1ac5258 | 9687 | #: builtin/config.c:155 |
fd8cb379 JX |
9688 | msgid "value" |
9689 | msgstr "取值" | |
9690 | ||
c1ac5258 | 9691 | #: builtin/config.c:155 |
fd8cb379 JX |
9692 | msgid "with --get, use default value when missing entry" |
9693 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
9694 | ||
c1ac5258 JX |
9695 | #: builtin/config.c:168 |
9696 | #, c-format | |
9697 | msgid "wrong number of arguments, should be %d" | |
9698 | msgstr "错误的参数个数,应该为 %d 个" | |
9699 | ||
9700 | #: builtin/config.c:170 | |
9701 | #, c-format | |
9702 | msgid "wrong number of arguments, should be from %d to %d" | |
9703 | msgstr "错误的参数个数,应该为从 %d 个到 %d 个" | |
9704 | ||
9705 | #: builtin/config.c:304 | |
9706 | #, c-format | |
9707 | msgid "invalid key pattern: %s" | |
9708 | msgstr "无效键名模式:%s" | |
9709 | ||
9710 | #: builtin/config.c:340 | |
fd8cb379 JX |
9711 | #, c-format |
9712 | msgid "failed to format default config value: %s" | |
c1ac5258 JX |
9713 | msgstr "格式化默认配置值失败:%s" |
9714 | ||
9715 | #: builtin/config.c:397 | |
9716 | #, c-format | |
9717 | msgid "cannot parse color '%s'" | |
9718 | msgstr "无法解析颜色 '%s'" | |
fd8cb379 | 9719 | |
c1ac5258 | 9720 | #: builtin/config.c:439 |
220c313c | 9721 | msgid "unable to parse default color value" |
c1ac5258 JX |
9722 | msgstr "无法解析默认颜色值" |
9723 | ||
9724 | #: builtin/config.c:492 builtin/config.c:724 | |
9725 | msgid "not in a git directory" | |
9726 | msgstr "不在 git 仓库中" | |
9727 | ||
9728 | #: builtin/config.c:495 | |
9729 | msgid "writing to stdin is not supported" | |
9730 | msgstr "不支持写到标准输入" | |
9731 | ||
9732 | #: builtin/config.c:498 | |
9733 | msgid "writing config blobs is not supported" | |
9734 | msgstr "不支持写到配置数据对象" | |
220c313c | 9735 | |
c1ac5258 | 9736 | #: builtin/config.c:583 |
220c313c JX |
9737 | #, c-format |
9738 | msgid "" | |
9739 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 9740 | "[user]\n" |
220c313c | 9741 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 9742 | "#\tname = %s\n" |
220c313c JX |
9743 | "#\temail = %s\n" |
9744 | msgstr "" | |
9745 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 9746 | "[user]\n" |
220c313c | 9747 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 9748 | "#\tname = %s\n" |
220c313c JX |
9749 | "#\temail = %s\n" |
9750 | ||
c1ac5258 JX |
9751 | #: builtin/config.c:606 |
9752 | msgid "only one config file at a time" | |
9753 | msgstr "一次只能有一个配置文件" | |
9754 | ||
9755 | #: builtin/config.c:611 | |
a4f16749 JX |
9756 | msgid "--local can only be used inside a git repository" |
9757 | msgstr "--local 只能在一个仓库内使用" | |
9758 | ||
c1ac5258 | 9759 | #: builtin/config.c:614 |
fd8cb379 JX |
9760 | msgid "--blob can only be used inside a git repository" |
9761 | msgstr "--blob 只能在一个仓库内使用" | |
9762 | ||
c1ac5258 JX |
9763 | #: builtin/config.c:633 |
9764 | msgid "$HOME not set" | |
9765 | msgstr "$HOME 未设置" | |
9766 | ||
9767 | #: builtin/config.c:670 | |
9768 | msgid "--get-color and variable type are incoherent" | |
9769 | msgstr "--get-color 和变量类型不兼容" | |
9770 | ||
9771 | #: builtin/config.c:675 | |
9772 | msgid "only one action at a time" | |
9773 | msgstr "一次只能有一个动作" | |
9774 | ||
9775 | #: builtin/config.c:688 | |
9776 | msgid "--name-only is only applicable to --list or --get-regexp" | |
9777 | msgstr "--name-only 仅适用于 --list 或 --get-regexp" | |
9778 | ||
9779 | #: builtin/config.c:694 | |
9780 | msgid "" | |
9781 | "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" | |
9782 | "list" | |
9783 | msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" | |
9784 | ||
9785 | #: builtin/config.c:700 | |
9786 | msgid "--default is only applicable to --get" | |
9787 | msgstr "--default 仅适用于 --get" | |
9788 | ||
9789 | #: builtin/config.c:713 | |
9790 | #, c-format | |
9791 | msgid "unable to read config file '%s'" | |
9792 | msgstr "无法读取配置文件 '%s'" | |
9793 | ||
9794 | #: builtin/config.c:716 | |
9795 | msgid "error processing config file(s)" | |
9796 | msgstr "处理配置文件出错" | |
9797 | ||
9798 | #: builtin/config.c:726 | |
9799 | msgid "editing stdin is not supported" | |
9800 | msgstr "不支持编辑标准输入" | |
9801 | ||
9802 | #: builtin/config.c:728 | |
9803 | msgid "editing blobs is not supported" | |
9804 | msgstr "不支持编辑数据对象" | |
9805 | ||
9806 | #: builtin/config.c:742 | |
220c313c JX |
9807 | #, c-format |
9808 | msgid "cannot create configuration file %s" | |
9809 | msgstr "不能创建配置文件 %s" | |
9810 | ||
c1ac5258 | 9811 | #: builtin/config.c:755 |
a0b6b246 JX |
9812 | #, c-format |
9813 | msgid "" | |
9814 | "cannot overwrite multiple values with a single value\n" | |
9815 | " Use a regexp, --add or --replace-all to change %s." | |
9816 | msgstr "" | |
9817 | "无法用一个值覆盖多个值\n" | |
9818 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
9819 | ||
c1ac5258 JX |
9820 | #: builtin/config.c:829 builtin/config.c:840 |
9821 | #, c-format | |
9822 | msgid "no such section: %s" | |
9823 | msgstr "无此小节:%s" | |
9824 | ||
fd8cb379 | 9825 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
9826 | msgid "git count-objects [-v] [-H | --human-readable]" |
9827 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
9828 | ||
fd8cb379 | 9829 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
9830 | msgid "print sizes in human readable format" |
9831 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 9832 | |
c1ac5258 | 9833 | #: builtin/describe.c:26 |
814ff314 JX |
9834 | msgid "git describe [<options>] [<commit-ish>...]" |
9835 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 9836 | |
c1ac5258 | 9837 | #: builtin/describe.c:27 |
814ff314 JX |
9838 | msgid "git describe [<options>] --dirty" |
9839 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 9840 | |
c1ac5258 | 9841 | #: builtin/describe.c:62 |
87cb7997 JX |
9842 | msgid "head" |
9843 | msgstr "头" | |
9844 | ||
c1ac5258 | 9845 | #: builtin/describe.c:62 |
87cb7997 JX |
9846 | msgid "lightweight" |
9847 | msgstr "轻量级的" | |
9848 | ||
c1ac5258 | 9849 | #: builtin/describe.c:62 |
87cb7997 JX |
9850 | msgid "annotated" |
9851 | msgstr "附注的" | |
9852 | ||
c1ac5258 | 9853 | #: builtin/describe.c:272 |
c04f5ac3 JX |
9854 | #, c-format |
9855 | msgid "annotated tag %s not available" | |
55a16ee4 | 9856 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 9857 | |
c1ac5258 | 9858 | #: builtin/describe.c:276 |
c04f5ac3 JX |
9859 | #, c-format |
9860 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 9861 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 9862 | |
c1ac5258 | 9863 | #: builtin/describe.c:278 |
c04f5ac3 JX |
9864 | #, c-format |
9865 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 9866 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 9867 | |
c1ac5258 | 9868 | #: builtin/describe.c:322 |
c04f5ac3 JX |
9869 | #, c-format |
9870 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 9871 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 9872 | |
c1ac5258 | 9873 | #: builtin/describe.c:324 |
c04f5ac3 | 9874 | #, c-format |
5809aa05 JX |
9875 | msgid "No exact match on refs or tags, searching to describe\n" |
9876 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 9877 | |
c1ac5258 | 9878 | #: builtin/describe.c:378 |
c04f5ac3 JX |
9879 | #, c-format |
9880 | msgid "finished search at %s\n" | |
9881 | msgstr "完成搜索 %s\n" | |
9882 | ||
c1ac5258 | 9883 | #: builtin/describe.c:404 |
c04f5ac3 JX |
9884 | #, c-format |
9885 | msgid "" | |
9886 | "No annotated tags can describe '%s'.\n" | |
9887 | "However, there were unannotated tags: try --tags." | |
9888 | msgstr "" | |
55a16ee4 RC |
9889 | "没有附注标签能描述 '%s'。\n" |
9890 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 9891 | |
c1ac5258 | 9892 | #: builtin/describe.c:408 |
c04f5ac3 JX |
9893 | #, c-format |
9894 | msgid "" | |
9895 | "No tags can describe '%s'.\n" | |
9896 | "Try --always, or create some tags." | |
9897 | msgstr "" | |
55a16ee4 RC |
9898 | "没有标签能描述 '%s'。\n" |
9899 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 9900 | |
c1ac5258 | 9901 | #: builtin/describe.c:438 |
c04f5ac3 JX |
9902 | #, c-format |
9903 | msgid "traversed %lu commits\n" | |
9904 | msgstr "已遍历 %lu 个提交\n" | |
9905 | ||
c1ac5258 | 9906 | #: builtin/describe.c:441 |
c04f5ac3 JX |
9907 | #, c-format |
9908 | msgid "" | |
9909 | "more than %i tags found; listed %i most recent\n" | |
9910 | "gave up search at %s\n" | |
9911 | msgstr "" | |
55a16ee4 | 9912 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 9913 | "在 %s 放弃搜索\n" |
c04f5ac3 | 9914 | |
c1ac5258 | 9915 | #: builtin/describe.c:509 |
5809aa05 JX |
9916 | #, c-format |
9917 | msgid "describe %s\n" | |
9918 | msgstr "描述 %s\n" | |
9919 | ||
c1ac5258 | 9920 | #: builtin/describe.c:512 builtin/log.c:508 |
5809aa05 JX |
9921 | #, c-format |
9922 | msgid "Not a valid object name %s" | |
9923 | msgstr "不是一个有效的对象名 %s" | |
9924 | ||
c1ac5258 | 9925 | #: builtin/describe.c:520 |
5809aa05 JX |
9926 | #, c-format |
9927 | msgid "%s is neither a commit nor blob" | |
9928 | msgstr "%s 既不是提交也不是数据对象" | |
9929 | ||
c1ac5258 | 9930 | #: builtin/describe.c:534 |
ef317cd5 | 9931 | msgid "find the tag that comes after the commit" |
55a16ee4 | 9932 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 9933 | |
c1ac5258 | 9934 | #: builtin/describe.c:535 |
ef317cd5 | 9935 | msgid "debug search strategy on stderr" |
07432cef | 9936 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 9937 | |
c1ac5258 | 9938 | #: builtin/describe.c:536 |
1003b3a5 JX |
9939 | msgid "use any ref" |
9940 | msgstr "使用任意引用" | |
9941 | ||
c1ac5258 | 9942 | #: builtin/describe.c:537 |
1003b3a5 | 9943 | msgid "use any tag, even unannotated" |
55a16ee4 | 9944 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 9945 | |
c1ac5258 | 9946 | #: builtin/describe.c:538 |
ef317cd5 | 9947 | msgid "always use long format" |
07432cef | 9948 | msgstr "始终使用长提交号格式" |
ef317cd5 | 9949 | |
c1ac5258 | 9950 | #: builtin/describe.c:539 |
2e8451e8 JX |
9951 | msgid "only follow first parent" |
9952 | msgstr "只跟随第一个父提交" | |
9953 | ||
c1ac5258 | 9954 | #: builtin/describe.c:542 |
ef317cd5 | 9955 | msgid "only output exact matches" |
07432cef | 9956 | msgstr "只输出精确匹配" |
ef317cd5 | 9957 | |
c1ac5258 | 9958 | #: builtin/describe.c:544 |
ef317cd5 | 9959 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 9960 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 9961 | |
c1ac5258 | 9962 | #: builtin/describe.c:546 |
ef317cd5 | 9963 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 9964 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 9965 | |
c1ac5258 | 9966 | #: builtin/describe.c:548 |
87cb7997 JX |
9967 | msgid "do not consider tags matching <pattern>" |
9968 | msgstr "不考虑匹配 <模式> 的标签" | |
9969 | ||
c1ac5258 | 9970 | #: builtin/describe.c:550 builtin/name-rev.c:424 |
ef317cd5 | 9971 | msgid "show abbreviated commit object as fallback" |
07432cef | 9972 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 9973 | |
c1ac5258 | 9974 | #: builtin/describe.c:551 builtin/describe.c:554 |
ef317cd5 | 9975 | msgid "mark" |
07432cef | 9976 | msgstr "标记" |
ef317cd5 | 9977 | |
c1ac5258 | 9978 | #: builtin/describe.c:552 |
ef317cd5 | 9979 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 9980 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 9981 | |
c1ac5258 | 9982 | #: builtin/describe.c:555 |
87cb7997 JX |
9983 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
9984 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
9985 | ||
c1ac5258 | 9986 | #: builtin/describe.c:573 |
c04f5ac3 JX |
9987 | msgid "--long is incompatible with --abbrev=0" |
9988 | msgstr "--long 与 --abbrev=0 不兼容" | |
9989 | ||
c1ac5258 | 9990 | #: builtin/describe.c:602 |
c04f5ac3 | 9991 | msgid "No names found, cannot describe anything." |
90e6ef53 | 9992 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 9993 | |
c1ac5258 | 9994 | #: builtin/describe.c:652 |
a8a5406a | 9995 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
9996 | msgstr "--dirty 与提交号不兼容" |
9997 | ||
c1ac5258 | 9998 | #: builtin/describe.c:654 |
87cb7997 JX |
9999 | msgid "--broken is incompatible with commit-ishes" |
10000 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 10001 | |
1a79b2f1 | 10002 | #: builtin/diff.c:83 |
c04f5ac3 JX |
10003 | #, c-format |
10004 | msgid "'%s': not a regular file or symlink" | |
10005 | msgstr "'%s':不是一个正规文件或符号链接" | |
10006 | ||
5809aa05 | 10007 | #: builtin/diff.c:234 |
c04f5ac3 JX |
10008 | #, c-format |
10009 | msgid "invalid option: %s" | |
10010 | msgstr "无效选项:%s" | |
10011 | ||
c1ac5258 | 10012 | #: builtin/diff.c:363 |
c04f5ac3 | 10013 | msgid "Not a git repository" |
160fb2b2 | 10014 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 10015 | |
c1ac5258 | 10016 | #: builtin/diff.c:407 |
c04f5ac3 JX |
10017 | #, c-format |
10018 | msgid "invalid object '%s' given." | |
10019 | msgstr "提供了无效对象 '%s'。" | |
10020 | ||
c1ac5258 | 10021 | #: builtin/diff.c:416 |
c04f5ac3 JX |
10022 | #, c-format |
10023 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 10024 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 10025 | |
c1ac5258 | 10026 | #: builtin/diff.c:421 |
c04f5ac3 JX |
10027 | #, c-format |
10028 | msgid "unhandled object '%s' given." | |
6c94aba5 | 10029 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 10030 | |
c1ac5258 | 10031 | #: builtin/difftool.c:30 |
1a79b2f1 JX |
10032 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
10033 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
10034 | ||
c1ac5258 | 10035 | #: builtin/difftool.c:260 |
1a79b2f1 JX |
10036 | #, c-format |
10037 | msgid "failed: %d" | |
10038 | msgstr "失败:%d" | |
10039 | ||
c1ac5258 | 10040 | #: builtin/difftool.c:302 |
87cb7997 JX |
10041 | #, c-format |
10042 | msgid "could not read symlink %s" | |
10043 | msgstr "无法读取符号链接 %s" | |
10044 | ||
c1ac5258 | 10045 | #: builtin/difftool.c:304 |
87cb7997 JX |
10046 | #, c-format |
10047 | msgid "could not read symlink file %s" | |
10048 | msgstr "无法读取符号链接文件 %s" | |
10049 | ||
c1ac5258 | 10050 | #: builtin/difftool.c:312 |
87cb7997 JX |
10051 | #, c-format |
10052 | msgid "could not read object %s for symlink %s" | |
10053 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
10054 | ||
c1ac5258 | 10055 | #: builtin/difftool.c:413 |
1a79b2f1 JX |
10056 | msgid "" |
10057 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
10058 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
10059 | msgstr "" |
10060 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
10061 | "cc')。" | |
1a79b2f1 | 10062 | |
c1ac5258 | 10063 | #: builtin/difftool.c:633 |
1a79b2f1 JX |
10064 | #, c-format |
10065 | msgid "both files modified: '%s' and '%s'." | |
10066 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
10067 | ||
c1ac5258 | 10068 | #: builtin/difftool.c:635 |
1a79b2f1 JX |
10069 | msgid "working tree file has been left." |
10070 | msgstr "工作区文件被留了下来。" | |
10071 | ||
c1ac5258 | 10072 | #: builtin/difftool.c:646 |
1a79b2f1 JX |
10073 | #, c-format |
10074 | msgid "temporary files exist in '%s'." | |
10075 | msgstr "临时文件存在于 '%s'。" | |
10076 | ||
c1ac5258 | 10077 | #: builtin/difftool.c:647 |
1a79b2f1 JX |
10078 | msgid "you may want to cleanup or recover these." |
10079 | msgstr "您可能想要清理或者恢复它们。" | |
10080 | ||
c1ac5258 | 10081 | #: builtin/difftool.c:696 |
1a79b2f1 JX |
10082 | msgid "use `diff.guitool` instead of `diff.tool`" |
10083 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
10084 | ||
c1ac5258 | 10085 | #: builtin/difftool.c:698 |
1a79b2f1 JX |
10086 | msgid "perform a full-directory diff" |
10087 | msgstr "执行一个全目录差异比较" | |
10088 | ||
c1ac5258 | 10089 | #: builtin/difftool.c:700 |
1a79b2f1 JX |
10090 | msgid "do not prompt before launching a diff tool" |
10091 | msgstr "启动差异比较工具之前不提示" | |
10092 | ||
c1ac5258 | 10093 | #: builtin/difftool.c:705 |
1a79b2f1 JX |
10094 | msgid "use symlinks in dir-diff mode" |
10095 | msgstr "在 dir-diff 模式中使用符号链接" | |
10096 | ||
fd8cb379 | 10097 | #: builtin/difftool.c:706 |
c1ac5258 JX |
10098 | msgid "tool" |
10099 | msgstr "工具" | |
10100 | ||
10101 | #: builtin/difftool.c:707 | |
1a79b2f1 JX |
10102 | msgid "use the specified diff tool" |
10103 | msgstr "使用指定的差异比较工具" | |
10104 | ||
c1ac5258 | 10105 | #: builtin/difftool.c:709 |
1a79b2f1 JX |
10106 | msgid "print a list of diff tools that may be used with `--tool`" |
10107 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
10108 | ||
c1ac5258 | 10109 | #: builtin/difftool.c:712 |
1a79b2f1 JX |
10110 | msgid "" |
10111 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
10112 | "code" | |
10113 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
10114 | ||
c1ac5258 | 10115 | #: builtin/difftool.c:715 |
1a79b2f1 JX |
10116 | msgid "specify a custom command for viewing diffs" |
10117 | msgstr "指定一个用于查看差异的自定义命令" | |
10118 | ||
c1ac5258 | 10119 | #: builtin/difftool.c:739 |
1a79b2f1 JX |
10120 | msgid "no <tool> given for --tool=<tool>" |
10121 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
10122 | ||
c1ac5258 | 10123 | #: builtin/difftool.c:746 |
1a79b2f1 JX |
10124 | msgid "no <cmd> given for --extcmd=<cmd>" |
10125 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
10126 | ||
c1ac5258 | 10127 | #: builtin/fast-export.c:29 |
ef317cd5 | 10128 | msgid "git fast-export [rev-list-opts]" |
07432cef | 10129 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 10130 | |
c1ac5258 | 10131 | #: builtin/fast-export.c:1006 |
ef317cd5 | 10132 | msgid "show progress after <n> objects" |
07432cef | 10133 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 10134 | |
c1ac5258 | 10135 | #: builtin/fast-export.c:1008 |
ef317cd5 | 10136 | msgid "select handling of signed tags" |
55a16ee4 | 10137 | msgstr "选择如何处理签名标签" |
ef317cd5 | 10138 | |
c1ac5258 | 10139 | #: builtin/fast-export.c:1011 |
ef317cd5 | 10140 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 10141 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 10142 | |
c1ac5258 | 10143 | #: builtin/fast-export.c:1014 |
ef317cd5 | 10144 | msgid "Dump marks to this file" |
07432cef | 10145 | msgstr "把标记存储到这个文件" |
ef317cd5 | 10146 | |
c1ac5258 | 10147 | #: builtin/fast-export.c:1016 |
ef317cd5 | 10148 | msgid "Import marks from this file" |
07432cef | 10149 | msgstr "从这个文件导入标记" |
ef317cd5 | 10150 | |
c1ac5258 | 10151 | #: builtin/fast-export.c:1018 |
ef317cd5 | 10152 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 10153 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 10154 | |
c1ac5258 | 10155 | #: builtin/fast-export.c:1020 |
ef317cd5 | 10156 | msgid "Output full tree for each commit" |
07432cef | 10157 | msgstr "每次提交都输出整个树" |
ef317cd5 | 10158 | |
c1ac5258 | 10159 | #: builtin/fast-export.c:1022 |
ef317cd5 | 10160 | msgid "Use the done feature to terminate the stream" |
07432cef | 10161 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 10162 | |
c1ac5258 | 10163 | #: builtin/fast-export.c:1023 |
ef317cd5 | 10164 | msgid "Skip output of blob data" |
07432cef | 10165 | msgstr "跳过数据对象的输出" |
ef317cd5 | 10166 | |
c1ac5258 | 10167 | #: builtin/fast-export.c:1024 |
6acbf033 | 10168 | msgid "refspec" |
160fb2b2 | 10169 | msgstr "引用规格" |
6acbf033 | 10170 | |
c1ac5258 | 10171 | #: builtin/fast-export.c:1025 |
6acbf033 | 10172 | msgid "Apply refspec to exported refs" |
160fb2b2 | 10173 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 10174 | |
c1ac5258 | 10175 | #: builtin/fast-export.c:1026 |
220c313c JX |
10176 | msgid "anonymize output" |
10177 | msgstr "匿名输出" | |
10178 | ||
c1ac5258 | 10179 | #: builtin/fetch.c:27 |
ef317cd5 | 10180 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 10181 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 10182 | |
c1ac5258 | 10183 | #: builtin/fetch.c:28 |
ef317cd5 | 10184 | msgid "git fetch [<options>] <group>" |
07432cef | 10185 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 10186 | |
c1ac5258 | 10187 | #: builtin/fetch.c:29 |
ef317cd5 | 10188 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 10189 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 10190 | |
c1ac5258 | 10191 | #: builtin/fetch.c:30 |
ef317cd5 | 10192 | msgid "git fetch --all [<options>]" |
07432cef | 10193 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 10194 | |
c1ac5258 | 10195 | #: builtin/fetch.c:112 builtin/pull.c:193 |
ef317cd5 | 10196 | msgid "fetch from all remotes" |
07432cef | 10197 | msgstr "从所有的远程抓取" |
ef317cd5 | 10198 | |
c1ac5258 | 10199 | #: builtin/fetch.c:114 builtin/pull.c:196 |
ef317cd5 | 10200 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 10201 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 10202 | |
c1ac5258 | 10203 | #: builtin/fetch.c:116 builtin/pull.c:199 |
ef317cd5 | 10204 | msgid "path to upload pack on remote end" |
07432cef | 10205 | msgstr "上传包到远程的路径" |
ef317cd5 | 10206 | |
c1ac5258 | 10207 | #: builtin/fetch.c:117 builtin/pull.c:201 |
ef317cd5 | 10208 | msgid "force overwrite of local branch" |
07432cef | 10209 | msgstr "强制覆盖本地分支" |
ef317cd5 | 10210 | |
c1ac5258 | 10211 | #: builtin/fetch.c:119 |
ef317cd5 | 10212 | msgid "fetch from multiple remotes" |
07432cef | 10213 | msgstr "从多个远程抓取" |
ef317cd5 | 10214 | |
c1ac5258 | 10215 | #: builtin/fetch.c:121 builtin/pull.c:203 |
ef317cd5 | 10216 | msgid "fetch all tags and associated objects" |
55a16ee4 | 10217 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 10218 | |
c1ac5258 | 10219 | #: builtin/fetch.c:123 |
ef317cd5 | 10220 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 10221 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 10222 | |
c1ac5258 | 10223 | #: builtin/fetch.c:125 |
276ceeaa JX |
10224 | msgid "number of submodules fetched in parallel" |
10225 | msgstr "子模组获取的并发数" | |
10226 | ||
c1ac5258 | 10227 | #: builtin/fetch.c:127 builtin/pull.c:206 |
ef317cd5 | 10228 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 10229 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 10230 | |
c1ac5258 | 10231 | #: builtin/fetch.c:129 |
31e5e17b JX |
10232 | msgid "prune local tags no longer on remote and clobber changed tags" |
10233 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
10234 | ||
07432cef | 10235 | # 译者:可选值,不能翻译 |
c1ac5258 | 10236 | #: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131 |
ef317cd5 | 10237 | msgid "on-demand" |
07432cef | 10238 | msgstr "on-demand" |
ef317cd5 | 10239 | |
c1ac5258 | 10240 | #: builtin/fetch.c:131 |
ef317cd5 | 10241 | msgid "control recursive fetching of submodules" |
07432cef | 10242 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 10243 | |
c1ac5258 | 10244 | #: builtin/fetch.c:135 builtin/pull.c:214 |
ef317cd5 | 10245 | msgid "keep downloaded pack" |
07432cef | 10246 | msgstr "保持下载包" |
ef317cd5 | 10247 | |
c1ac5258 | 10248 | #: builtin/fetch.c:137 |
ef317cd5 | 10249 | msgid "allow updating of HEAD ref" |
07432cef | 10250 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 10251 | |
c1ac5258 | 10252 | #: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 |
ef317cd5 | 10253 | msgid "deepen history of shallow clone" |
07432cef | 10254 | msgstr "深化浅克隆的历史" |
ef317cd5 | 10255 | |
c1ac5258 | 10256 | #: builtin/fetch.c:142 |
a0b6b246 JX |
10257 | msgid "deepen history of shallow repository based on time" |
10258 | msgstr "基于时间来深化浅克隆的历史" | |
10259 | ||
c1ac5258 | 10260 | #: builtin/fetch.c:148 builtin/pull.c:220 |
a77c07d9 | 10261 | msgid "convert to a complete repository" |
160fb2b2 | 10262 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 10263 | |
c1ac5258 | 10264 | #: builtin/fetch.c:151 |
ef317cd5 | 10265 | msgid "prepend this to submodule path output" |
07432cef | 10266 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 10267 | |
c1ac5258 | 10268 | #: builtin/fetch.c:154 |
a4f16749 JX |
10269 | msgid "" |
10270 | "default for recursive fetching of submodules (lower priority than config " | |
10271 | "files)" | |
10272 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 10273 | |
c1ac5258 | 10274 | #: builtin/fetch.c:158 builtin/pull.c:223 |
cfff71a9 JX |
10275 | msgid "accept refs that update .git/shallow" |
10276 | msgstr "接受更新 .git/shallow 的引用" | |
10277 | ||
c1ac5258 | 10278 | #: builtin/fetch.c:159 builtin/pull.c:225 |
6acbf033 JX |
10279 | msgid "refmap" |
10280 | msgstr "引用映射" | |
10281 | ||
c1ac5258 | 10282 | #: builtin/fetch.c:160 builtin/pull.c:226 |
6acbf033 JX |
10283 | msgid "specify fetch refmap" |
10284 | msgstr "指定获取操作的引用映射" | |
10285 | ||
c1ac5258 | 10286 | #: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 |
fd8cb379 JX |
10287 | #: builtin/send-pack.c:172 |
10288 | msgid "server-specific" | |
10289 | msgstr "server-specific" | |
10290 | ||
c1ac5258 | 10291 | #: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 |
fd8cb379 JX |
10292 | #: builtin/send-pack.c:173 |
10293 | msgid "option to transmit" | |
10294 | msgstr "传输选项" | |
10295 | ||
c1ac5258 JX |
10296 | #: builtin/fetch.c:167 |
10297 | msgid "report that we have only objects reachable from this object" | |
10298 | msgstr "报告我们只拥有从该对象开始可达的对象" | |
10299 | ||
10300 | #: builtin/fetch.c:418 | |
c04f5ac3 JX |
10301 | msgid "Couldn't find remote ref HEAD" |
10302 | msgstr "无法发现远程 HEAD 引用" | |
10303 | ||
c1ac5258 | 10304 | #: builtin/fetch.c:552 |
5c57d762 JX |
10305 | #, c-format |
10306 | msgid "configuration fetch.output contains invalid value %s" | |
10307 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
10308 | ||
c1ac5258 | 10309 | #: builtin/fetch.c:645 |
c04f5ac3 JX |
10310 | #, c-format |
10311 | msgid "object %s not found" | |
10312 | msgstr "对象 %s 未发现" | |
10313 | ||
c1ac5258 | 10314 | #: builtin/fetch.c:649 |
c04f5ac3 JX |
10315 | msgid "[up to date]" |
10316 | msgstr "[最新]" | |
10317 | ||
c1ac5258 | 10318 | #: builtin/fetch.c:662 builtin/fetch.c:744 |
c04f5ac3 JX |
10319 | msgid "[rejected]" |
10320 | msgstr "[已拒绝]" | |
10321 | ||
c1ac5258 | 10322 | #: builtin/fetch.c:663 |
5c57d762 | 10323 | msgid "can't fetch in current branch" |
9a4b694c | 10324 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 10325 | |
c1ac5258 | 10326 | #: builtin/fetch.c:672 |
c04f5ac3 | 10327 | msgid "[tag update]" |
55a16ee4 | 10328 | msgstr "[标签更新]" |
c04f5ac3 | 10329 | |
c1ac5258 JX |
10330 | #: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 |
10331 | #: builtin/fetch.c:739 | |
5c57d762 JX |
10332 | msgid "unable to update local ref" |
10333 | msgstr "不能更新本地引用" | |
c04f5ac3 | 10334 | |
c1ac5258 | 10335 | #: builtin/fetch.c:694 |
c04f5ac3 | 10336 | msgid "[new tag]" |
55a16ee4 | 10337 | msgstr "[新标签]" |
c04f5ac3 | 10338 | |
c1ac5258 | 10339 | #: builtin/fetch.c:697 |
c04f5ac3 JX |
10340 | msgid "[new branch]" |
10341 | msgstr "[新分支]" | |
10342 | ||
c1ac5258 | 10343 | #: builtin/fetch.c:700 |
170e9899 JX |
10344 | msgid "[new ref]" |
10345 | msgstr "[新引用]" | |
10346 | ||
c1ac5258 | 10347 | #: builtin/fetch.c:739 |
c04f5ac3 JX |
10348 | msgid "forced update" |
10349 | msgstr "强制更新" | |
10350 | ||
c1ac5258 | 10351 | #: builtin/fetch.c:744 |
5c57d762 JX |
10352 | msgid "non-fast-forward" |
10353 | msgstr "非快进" | |
c04f5ac3 | 10354 | |
c1ac5258 | 10355 | #: builtin/fetch.c:790 |
c04f5ac3 JX |
10356 | #, c-format |
10357 | msgid "%s did not send all necessary objects\n" | |
10358 | msgstr "%s 未发送所有必须的对象\n" | |
10359 | ||
c1ac5258 | 10360 | #: builtin/fetch.c:811 |
cfff71a9 JX |
10361 | #, c-format |
10362 | msgid "reject %s because shallow roots are not allowed to be updated" | |
10363 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
10364 | ||
c1ac5258 | 10365 | #: builtin/fetch.c:900 builtin/fetch.c:1011 |
c04f5ac3 JX |
10366 | #, c-format |
10367 | msgid "From %.*s\n" | |
10368 | msgstr "来自 %.*s\n" | |
10369 | ||
c1ac5258 | 10370 | #: builtin/fetch.c:911 |
c04f5ac3 JX |
10371 | #, c-format |
10372 | msgid "" | |
10373 | "some local refs could not be updated; try running\n" | |
10374 | " 'git remote prune %s' to remove any old, conflicting branches" | |
10375 | msgstr "" | |
10376 | "一些本地引用不能被更新;尝试运行\n" | |
10377 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
10378 | ||
90e6ef53 | 10379 | # 译者:注意保持前导空格 |
c1ac5258 | 10380 | #: builtin/fetch.c:981 |
81809b99 | 10381 | #, c-format |
8ada9598 | 10382 | msgid " (%s will become dangling)" |
07432cef | 10383 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 10384 | |
90e6ef53 | 10385 | # 译者:注意保持前导空格 |
c1ac5258 | 10386 | #: builtin/fetch.c:982 |
81809b99 | 10387 | #, c-format |
8ada9598 | 10388 | msgid " (%s has become dangling)" |
07432cef | 10389 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 10390 | |
c1ac5258 | 10391 | #: builtin/fetch.c:1014 |
c04f5ac3 JX |
10392 | msgid "[deleted]" |
10393 | msgstr "[已删除]" | |
10394 | ||
c1ac5258 | 10395 | #: builtin/fetch.c:1015 builtin/remote.c:1035 |
c04f5ac3 JX |
10396 | msgid "(none)" |
10397 | msgstr "(无)" | |
10398 | ||
c1ac5258 | 10399 | #: builtin/fetch.c:1038 |
c04f5ac3 JX |
10400 | #, c-format |
10401 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 10402 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 10403 | |
c1ac5258 | 10404 | #: builtin/fetch.c:1057 |
c04f5ac3 JX |
10405 | #, c-format |
10406 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
10407 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
10408 | ||
c1ac5258 | 10409 | #: builtin/fetch.c:1060 |
c04f5ac3 JX |
10410 | #, c-format |
10411 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 10412 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 10413 | |
c1ac5258 | 10414 | #: builtin/fetch.c:1339 |
c04f5ac3 JX |
10415 | #, c-format |
10416 | msgid "Fetching %s\n" | |
d4a8e00b | 10417 | msgstr "正在获取 %s\n" |
c04f5ac3 | 10418 | |
c1ac5258 | 10419 | #: builtin/fetch.c:1341 builtin/remote.c:99 |
c04f5ac3 JX |
10420 | #, c-format |
10421 | msgid "Could not fetch %s" | |
10422 | msgstr "不能获取 %s" | |
10423 | ||
c1ac5258 | 10424 | #: builtin/fetch.c:1387 builtin/fetch.c:1555 |
31e5e17b JX |
10425 | msgid "" |
10426 | "--filter can only be used with the remote configured in core.partialClone" | |
10427 | msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库" | |
10428 | ||
c1ac5258 | 10429 | #: builtin/fetch.c:1410 |
c04f5ac3 JX |
10430 | msgid "" |
10431 | "No remote repository specified. Please, specify either a URL or a\n" | |
10432 | "remote name from which new revisions should be fetched." | |
4375c10e | 10433 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 10434 | |
c1ac5258 | 10435 | #: builtin/fetch.c:1447 |
c04f5ac3 | 10436 | msgid "You need to specify a tag name." |
55a16ee4 | 10437 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 10438 | |
c1ac5258 | 10439 | #: builtin/fetch.c:1496 |
a0b6b246 JX |
10440 | msgid "Negative depth in --deepen is not supported" |
10441 | msgstr "--deepen 不支持负数深度" | |
10442 | ||
c1ac5258 | 10443 | #: builtin/fetch.c:1498 |
a0b6b246 JX |
10444 | msgid "--deepen and --depth are mutually exclusive" |
10445 | msgstr "--deepen 和 --depth 是互斥的" | |
10446 | ||
c1ac5258 | 10447 | #: builtin/fetch.c:1503 |
a77c07d9 JX |
10448 | msgid "--depth and --unshallow cannot be used together" |
10449 | msgstr "--depth 和 --unshallow 不能同时使用" | |
10450 | ||
c1ac5258 | 10451 | #: builtin/fetch.c:1505 |
a77c07d9 | 10452 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 10453 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 10454 | |
c1ac5258 | 10455 | #: builtin/fetch.c:1521 |
c04f5ac3 | 10456 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 10457 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 10458 | |
c1ac5258 | 10459 | #: builtin/fetch.c:1523 |
c04f5ac3 | 10460 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 10461 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 10462 | |
c1ac5258 | 10463 | #: builtin/fetch.c:1532 |
c04f5ac3 JX |
10464 | #, c-format |
10465 | msgid "No such remote or remote group: %s" | |
10466 | msgstr "没有这样的远程或远程组:%s" | |
10467 | ||
c1ac5258 | 10468 | #: builtin/fetch.c:1539 |
c04f5ac3 | 10469 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 10470 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 10471 | |
c1ac5258 | 10472 | #: builtin/fmt-merge-msg.c:17 |
814ff314 JX |
10473 | msgid "" |
10474 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
10475 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 10476 | |
c1ac5258 | 10477 | #: builtin/fmt-merge-msg.c:671 |
ef317cd5 | 10478 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 10479 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 10480 | |
c1ac5258 | 10481 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 10482 | msgid "alias for --log (deprecated)" |
07432cef | 10483 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 10484 | |
c1ac5258 | 10485 | #: builtin/fmt-merge-msg.c:677 |
ef317cd5 | 10486 | msgid "text" |
07432cef | 10487 | msgstr "文本" |
ef317cd5 | 10488 | |
c1ac5258 | 10489 | #: builtin/fmt-merge-msg.c:678 |
ef317cd5 | 10490 | msgid "use <text> as start of message" |
07432cef | 10491 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 10492 | |
c1ac5258 | 10493 | #: builtin/fmt-merge-msg.c:679 |
ef317cd5 | 10494 | msgid "file to read from" |
07432cef | 10495 | msgstr "从文件中读取" |
ef317cd5 | 10496 | |
a4f16749 | 10497 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
10498 | msgid "git for-each-ref [<options>] [<pattern>]" |
10499 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 10500 | |
a4f16749 | 10501 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
10502 | msgid "git for-each-ref [--points-at <object>]" |
10503 | msgstr "git for-each-ref [--points-at <对象>]" | |
10504 | ||
a4f16749 | 10505 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
10506 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
10507 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 10508 | |
a4f16749 | 10509 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
10510 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
10511 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 10512 | |
a4f16749 | 10513 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 10514 | msgid "quote placeholders suitably for shells" |
07432cef | 10515 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 10516 | |
a4f16749 | 10517 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 10518 | msgid "quote placeholders suitably for perl" |
07432cef | 10519 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 10520 | |
a4f16749 | 10521 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 10522 | msgid "quote placeholders suitably for python" |
07432cef | 10523 | msgstr "引用占位符适用于 python" |
ef317cd5 | 10524 | |
a4f16749 | 10525 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
10526 | msgid "quote placeholders suitably for Tcl" |
10527 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 10528 | |
a4f16749 | 10529 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 10530 | msgid "show only <n> matched refs" |
07432cef | 10531 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 10532 | |
c1ac5258 | 10533 | #: builtin/for-each-ref.c:39 builtin/tag.c:422 |
6937cb4e JX |
10534 | msgid "respect format colors" |
10535 | msgstr "遵照格式中的颜色输出" | |
10536 | ||
10537 | #: builtin/for-each-ref.c:43 | |
94550ed3 JX |
10538 | msgid "print only refs which points at the given object" |
10539 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 10540 | |
6937cb4e | 10541 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
10542 | msgid "print only refs that are merged" |
10543 | msgstr "只打印已经合并的引用" | |
10544 | ||
6937cb4e | 10545 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
10546 | msgid "print only refs that are not merged" |
10547 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 10548 | |
6937cb4e | 10549 | #: builtin/for-each-ref.c:47 |
94550ed3 JX |
10550 | msgid "print only refs which contain the commit" |
10551 | msgstr "只打印包含该提交的引用" | |
10552 | ||
6937cb4e | 10553 | #: builtin/for-each-ref.c:48 |
87cb7997 JX |
10554 | msgid "print only refs which don't contain the commit" |
10555 | msgstr "只打印不包含该提交的引用" | |
10556 | ||
c1ac5258 | 10557 | #: builtin/fsck.c:574 |
6c94aba5 JX |
10558 | msgid "Checking object directories" |
10559 | msgstr "检查对象目录中" | |
10560 | ||
c1ac5258 | 10561 | #: builtin/fsck.c:666 |
814ff314 JX |
10562 | msgid "git fsck [<options>] [<object>...]" |
10563 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 10564 | |
c1ac5258 | 10565 | #: builtin/fsck.c:672 |
ef317cd5 | 10566 | msgid "show unreachable objects" |
07432cef | 10567 | msgstr "显示不可达的对象" |
ef317cd5 | 10568 | |
c1ac5258 | 10569 | #: builtin/fsck.c:673 |
ef317cd5 | 10570 | msgid "show dangling objects" |
07432cef | 10571 | msgstr "显示摇摆的对象" |
ef317cd5 | 10572 | |
c1ac5258 | 10573 | #: builtin/fsck.c:674 |
ef317cd5 | 10574 | msgid "report tags" |
55a16ee4 | 10575 | msgstr "报告标签" |
ef317cd5 | 10576 | |
c1ac5258 | 10577 | #: builtin/fsck.c:675 |
ef317cd5 | 10578 | msgid "report root nodes" |
07432cef | 10579 | msgstr "报告根节点" |
ef317cd5 | 10580 | |
c1ac5258 | 10581 | #: builtin/fsck.c:676 |
ef317cd5 | 10582 | msgid "make index objects head nodes" |
07432cef | 10583 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 10584 | |
c1ac5258 | 10585 | #: builtin/fsck.c:677 |
ef317cd5 | 10586 | msgid "make reflogs head nodes (default)" |
07432cef | 10587 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 10588 | |
c1ac5258 | 10589 | #: builtin/fsck.c:678 |
ef317cd5 | 10590 | msgid "also consider packs and alternate objects" |
07432cef | 10591 | msgstr "也考虑包和备用对象" |
ef317cd5 | 10592 | |
c1ac5258 | 10593 | #: builtin/fsck.c:679 |
1b7f4a34 JX |
10594 | msgid "check only connectivity" |
10595 | msgstr "仅检查连通性" | |
10596 | ||
c1ac5258 | 10597 | #: builtin/fsck.c:680 |
ef317cd5 | 10598 | msgid "enable more strict checking" |
07432cef | 10599 | msgstr "启用更严格的检查" |
ef317cd5 | 10600 | |
c1ac5258 | 10601 | #: builtin/fsck.c:682 |
ef317cd5 | 10602 | msgid "write dangling objects in .git/lost-found" |
07432cef | 10603 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 10604 | |
c1ac5258 | 10605 | #: builtin/fsck.c:683 builtin/prune.c:110 |
ef317cd5 | 10606 | msgid "show progress" |
07432cef | 10607 | msgstr "显示进度" |
ef317cd5 | 10608 | |
c1ac5258 | 10609 | #: builtin/fsck.c:684 |
5c57d762 JX |
10610 | msgid "show verbose names for reachable objects" |
10611 | msgstr "显示可达对象的详细名称" | |
10612 | ||
c1ac5258 | 10613 | #: builtin/fsck.c:750 |
6c94aba5 JX |
10614 | msgid "Checking objects" |
10615 | msgstr "检查对象中" | |
10616 | ||
c1ac5258 | 10617 | #: builtin/gc.c:34 |
814ff314 JX |
10618 | msgid "git gc [<options>]" |
10619 | msgstr "git gc [<选项>]" | |
ef317cd5 | 10620 | |
c1ac5258 | 10621 | #: builtin/gc.c:90 |
c04f5ac3 | 10622 | #, c-format |
87cb7997 | 10623 | msgid "Failed to fstat %s: %s" |
65e2041e | 10624 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 10625 | |
c1ac5258 | 10626 | #: builtin/gc.c:455 |
c04f5ac3 | 10627 | #, c-format |
87cb7997 | 10628 | msgid "Can't stat %s" |
65e2041e | 10629 | msgstr "不能对 %s 调用 stat" |
c04f5ac3 | 10630 | |
c1ac5258 | 10631 | #: builtin/gc.c:464 |
94550ed3 JX |
10632 | #, c-format |
10633 | msgid "" | |
10634 | "The last gc run reported the following. Please correct the root cause\n" | |
10635 | "and remove %s.\n" | |
10636 | "Automatic cleanup will not be performed until the file is removed.\n" | |
10637 | "\n" | |
10638 | "%s" | |
10639 | msgstr "" | |
10640 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
10641 | "在该文件被删除之前,自动清理将不会执行。\n" | |
10642 | "\n" | |
10643 | "%s" | |
10644 | ||
c1ac5258 | 10645 | #: builtin/gc.c:505 |
ef317cd5 | 10646 | msgid "prune unreferenced objects" |
07432cef | 10647 | msgstr "清除未引用的对象" |
ef317cd5 | 10648 | |
c1ac5258 | 10649 | #: builtin/gc.c:507 |
ef317cd5 | 10650 | msgid "be more thorough (increased runtime)" |
07432cef | 10651 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 10652 | |
c1ac5258 | 10653 | #: builtin/gc.c:508 |
ef317cd5 | 10654 | msgid "enable auto-gc mode" |
07432cef | 10655 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 10656 | |
c1ac5258 | 10657 | #: builtin/gc.c:511 |
90314792 JX |
10658 | msgid "force running gc even if there may be another gc running" |
10659 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
10660 | ||
c1ac5258 | 10661 | #: builtin/gc.c:514 |
fd8cb379 JX |
10662 | msgid "repack all other packs except the largest pack" |
10663 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
10664 | ||
c1ac5258 | 10665 | #: builtin/gc.c:531 |
fd8cb379 JX |
10666 | #, c-format |
10667 | msgid "failed to parse gc.logexpiry value %s" | |
c1ac5258 | 10668 | msgstr "解析 gc.logexpiry 的值 %s 失败" |
fd8cb379 | 10669 | |
c1ac5258 | 10670 | #: builtin/gc.c:542 |
87cb7997 | 10671 | #, c-format |
fd8cb379 | 10672 | msgid "failed to parse prune expiry value %s" |
c1ac5258 | 10673 | msgstr "解析清除期限值 %s 失败" |
87cb7997 | 10674 | |
c1ac5258 | 10675 | #: builtin/gc.c:562 |
c04f5ac3 | 10676 | #, c-format |
6c94aba5 | 10677 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 10678 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 10679 | |
c1ac5258 | 10680 | #: builtin/gc.c:564 |
6c94aba5 JX |
10681 | #, c-format |
10682 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 10683 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 10684 | |
c1ac5258 | 10685 | #: builtin/gc.c:565 |
6c94aba5 JX |
10686 | #, c-format |
10687 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
10688 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 10689 | |
c1ac5258 | 10690 | #: builtin/gc.c:601 |
90314792 JX |
10691 | #, c-format |
10692 | msgid "" | |
10693 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
10694 | msgstr "" | |
29004bbb | 10695 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 10696 | |
c1ac5258 | 10697 | #: builtin/gc.c:652 |
c04f5ac3 JX |
10698 | msgid "" |
10699 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 10700 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 10701 | |
fd8cb379 | 10702 | #: builtin/grep.c:28 |
814ff314 JX |
10703 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
10704 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 10705 | |
fd8cb379 | 10706 | #: builtin/grep.c:226 |
c04f5ac3 JX |
10707 | #, c-format |
10708 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 10709 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 10710 | |
fd8cb379 | 10711 | #: builtin/grep.c:284 |
276ceeaa JX |
10712 | #, c-format |
10713 | msgid "invalid number of threads specified (%d) for %s" | |
10714 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
10715 | ||
a4f16749 JX |
10716 | #. TRANSLATORS: %s is the configuration |
10717 | #. variable for tweaking threads, currently | |
10718 | #. grep.threads | |
10719 | #. | |
c1ac5258 JX |
10720 | #: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 |
10721 | #: builtin/pack-objects.c:2636 | |
a4f16749 JX |
10722 | #, c-format |
10723 | msgid "no threads support, ignoring %s" | |
10724 | msgstr "没有线程支持,忽略 %s" | |
10725 | ||
fd8cb379 | 10726 | #: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 |
c04f5ac3 JX |
10727 | #, c-format |
10728 | msgid "unable to read tree (%s)" | |
90e6ef53 | 10729 | msgstr "无法读取树(%s)" |
c04f5ac3 | 10730 | |
fd8cb379 | 10731 | #: builtin/grep.c:638 |
c04f5ac3 JX |
10732 | #, c-format |
10733 | msgid "unable to grep from object of type %s" | |
10734 | msgstr "无法抓取来自于 %s 类型的对象" | |
10735 | ||
c1ac5258 | 10736 | #: builtin/grep.c:704 |
c04f5ac3 JX |
10737 | #, c-format |
10738 | msgid "switch `%c' expects a numerical value" | |
10739 | msgstr "开关 `%c' 期望一个数字值" | |
10740 | ||
c1ac5258 | 10741 | #: builtin/grep.c:791 |
ef317cd5 | 10742 | msgid "search in index instead of in the work tree" |
07432cef | 10743 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 10744 | |
c1ac5258 | 10745 | #: builtin/grep.c:793 |
ef317cd5 | 10746 | msgid "find in contents not managed by git" |
07432cef | 10747 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
10748 | |
10749 | # 译者:中文字符串拼接,可删除前导空格 | |
c1ac5258 | 10750 | #: builtin/grep.c:795 |
ef317cd5 | 10751 | msgid "search in both tracked and untracked files" |
07432cef | 10752 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 10753 | |
c1ac5258 | 10754 | #: builtin/grep.c:797 |
814ff314 JX |
10755 | msgid "ignore files specified via '.gitignore'" |
10756 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 10757 | |
c1ac5258 | 10758 | #: builtin/grep.c:799 |
87cb7997 | 10759 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
10760 | msgstr "在每一个子模组中递归搜索" |
10761 | ||
c1ac5258 | 10762 | #: builtin/grep.c:802 |
ef317cd5 | 10763 | msgid "show non-matching lines" |
07432cef | 10764 | msgstr "显示未匹配的行" |
ef317cd5 | 10765 | |
c1ac5258 | 10766 | #: builtin/grep.c:804 |
ef317cd5 | 10767 | msgid "case insensitive matching" |
07432cef | 10768 | msgstr "不区分大小写匹配" |
ef317cd5 | 10769 | |
c1ac5258 | 10770 | #: builtin/grep.c:806 |
ef317cd5 | 10771 | msgid "match patterns only at word boundaries" |
07432cef | 10772 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 10773 | |
c1ac5258 | 10774 | #: builtin/grep.c:808 |
ef317cd5 | 10775 | msgid "process binary files as text" |
07432cef | 10776 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 10777 | |
c1ac5258 | 10778 | #: builtin/grep.c:810 |
ef317cd5 | 10779 | msgid "don't match patterns in binary files" |
07432cef | 10780 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 10781 | |
c1ac5258 | 10782 | #: builtin/grep.c:813 |
90314792 JX |
10783 | msgid "process binary files with textconv filters" |
10784 | msgstr "用 textconv 过滤器处理二进制文件" | |
10785 | ||
c1ac5258 | 10786 | #: builtin/grep.c:815 |
ef317cd5 | 10787 | msgid "descend at most <depth> levels" |
07432cef | 10788 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 10789 | |
c1ac5258 | 10790 | #: builtin/grep.c:819 |
ef317cd5 | 10791 | msgid "use extended POSIX regular expressions" |
07432cef | 10792 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 10793 | |
c1ac5258 | 10794 | #: builtin/grep.c:822 |
ef317cd5 | 10795 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 10796 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 10797 | |
c1ac5258 | 10798 | #: builtin/grep.c:825 |
ef317cd5 | 10799 | msgid "interpret patterns as fixed strings" |
07432cef | 10800 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 10801 | |
c1ac5258 | 10802 | #: builtin/grep.c:828 |
ef317cd5 | 10803 | msgid "use Perl-compatible regular expressions" |
07432cef | 10804 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 10805 | |
c1ac5258 | 10806 | #: builtin/grep.c:831 |
ef317cd5 | 10807 | msgid "show line numbers" |
07432cef | 10808 | msgstr "显示行号" |
ef317cd5 | 10809 | |
c1ac5258 JX |
10810 | #: builtin/grep.c:832 |
10811 | msgid "show column number of first match" | |
10812 | msgstr "显示第一个匹配的列号" | |
10813 | ||
10814 | #: builtin/grep.c:833 | |
ef317cd5 | 10815 | msgid "don't show filenames" |
07432cef | 10816 | msgstr "不显示文件名" |
ef317cd5 | 10817 | |
c1ac5258 | 10818 | #: builtin/grep.c:834 |
ef317cd5 | 10819 | msgid "show filenames" |
07432cef | 10820 | msgstr "显示文件名" |
ef317cd5 | 10821 | |
c1ac5258 | 10822 | #: builtin/grep.c:836 |
ef317cd5 | 10823 | msgid "show filenames relative to top directory" |
07432cef | 10824 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 10825 | |
c1ac5258 | 10826 | #: builtin/grep.c:838 |
ef317cd5 | 10827 | msgid "show only filenames instead of matching lines" |
07432cef | 10828 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 10829 | |
c1ac5258 | 10830 | #: builtin/grep.c:840 |
ef317cd5 | 10831 | msgid "synonym for --files-with-matches" |
07432cef | 10832 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 10833 | |
c1ac5258 | 10834 | #: builtin/grep.c:843 |
ef317cd5 | 10835 | msgid "show only the names of files without match" |
07432cef | 10836 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 10837 | |
c1ac5258 | 10838 | #: builtin/grep.c:845 |
ef317cd5 | 10839 | msgid "print NUL after filenames" |
07432cef | 10840 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 10841 | |
c1ac5258 JX |
10842 | #: builtin/grep.c:848 |
10843 | msgid "show only matching parts of a line" | |
10844 | msgstr "只显示行中的匹配的部分" | |
10845 | ||
10846 | #: builtin/grep.c:850 | |
ef317cd5 | 10847 | msgid "show the number of matches instead of matching lines" |
07432cef | 10848 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 10849 | |
c1ac5258 | 10850 | #: builtin/grep.c:851 |
ef317cd5 | 10851 | msgid "highlight matches" |
07432cef | 10852 | msgstr "高亮显示匹配项" |
ef317cd5 | 10853 | |
c1ac5258 | 10854 | #: builtin/grep.c:853 |
ef317cd5 | 10855 | msgid "print empty line between matches from different files" |
07432cef | 10856 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 10857 | |
c1ac5258 | 10858 | #: builtin/grep.c:855 |
ef317cd5 | 10859 | msgid "show filename only once above matches from same file" |
07432cef | 10860 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 10861 | |
c1ac5258 | 10862 | #: builtin/grep.c:858 |
ef317cd5 | 10863 | msgid "show <n> context lines before and after matches" |
07432cef | 10864 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 10865 | |
c1ac5258 | 10866 | #: builtin/grep.c:861 |
ef317cd5 | 10867 | msgid "show <n> context lines before matches" |
07432cef | 10868 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 10869 | |
c1ac5258 | 10870 | #: builtin/grep.c:863 |
ef317cd5 | 10871 | msgid "show <n> context lines after matches" |
07432cef | 10872 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 10873 | |
c1ac5258 | 10874 | #: builtin/grep.c:865 |
276ceeaa JX |
10875 | msgid "use <n> worker threads" |
10876 | msgstr "使用 <n> 个工作线程" | |
10877 | ||
c1ac5258 | 10878 | #: builtin/grep.c:866 |
ef317cd5 | 10879 | msgid "shortcut for -C NUM" |
07432cef | 10880 | msgstr "快捷键 -C 数字" |
ef317cd5 | 10881 | |
c1ac5258 | 10882 | #: builtin/grep.c:869 |
ef317cd5 | 10883 | msgid "show a line with the function name before matches" |
07432cef | 10884 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 10885 | |
c1ac5258 | 10886 | #: builtin/grep.c:871 |
ef317cd5 | 10887 | msgid "show the surrounding function" |
07432cef | 10888 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 10889 | |
c1ac5258 | 10890 | #: builtin/grep.c:874 |
ef317cd5 | 10891 | msgid "read patterns from file" |
07432cef | 10892 | msgstr "从文件读取模式" |
ef317cd5 | 10893 | |
c1ac5258 | 10894 | #: builtin/grep.c:876 |
ef317cd5 | 10895 | msgid "match <pattern>" |
07432cef | 10896 | msgstr "匹配 <模式>" |
ef317cd5 | 10897 | |
c1ac5258 | 10898 | #: builtin/grep.c:878 |
ef317cd5 | 10899 | msgid "combine patterns specified with -e" |
07432cef | 10900 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 10901 | |
c1ac5258 | 10902 | #: builtin/grep.c:890 |
ef317cd5 | 10903 | msgid "indicate hit with exit status without output" |
07432cef | 10904 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 10905 | |
c1ac5258 | 10906 | #: builtin/grep.c:892 |
ef317cd5 | 10907 | msgid "show only matches from files that match all patterns" |
07432cef | 10908 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 10909 | |
c1ac5258 | 10910 | #: builtin/grep.c:894 |
07432cef WS |
10911 | msgid "show parse tree for grep expression" |
10912 | msgstr "显示 grep 表达式的解析树" | |
10913 | ||
c1ac5258 | 10914 | #: builtin/grep.c:898 |
ef317cd5 | 10915 | msgid "pager" |
07432cef | 10916 | msgstr "分页" |
ef317cd5 | 10917 | |
c1ac5258 | 10918 | #: builtin/grep.c:898 |
ef317cd5 | 10919 | msgid "show matching files in the pager" |
07432cef | 10920 | msgstr "分页显示匹配的文件" |
ef317cd5 | 10921 | |
c1ac5258 | 10922 | #: builtin/grep.c:902 |
ef317cd5 | 10923 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 10924 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 10925 | |
c1ac5258 JX |
10926 | #: builtin/grep.c:966 |
10927 | msgid "no pattern given" | |
10928 | msgstr "未提供匹配模式" | |
c04f5ac3 | 10929 | |
c1ac5258 | 10930 | #: builtin/grep.c:1002 |
87cb7997 JX |
10931 | msgid "--no-index or --untracked cannot be used with revs" |
10932 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
10933 | ||
c1ac5258 | 10934 | #: builtin/grep.c:1009 |
87cb7997 JX |
10935 | #, c-format |
10936 | msgid "unable to resolve revision: %s" | |
10937 | msgstr "不能解析版本:%s" | |
10938 | ||
c1ac5258 | 10939 | #: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632 |
276ceeaa JX |
10940 | #, c-format |
10941 | msgid "invalid number of threads specified (%d)" | |
10942 | msgstr "指定的线程数无效(%d)" | |
10943 | ||
c1ac5258 | 10944 | #: builtin/grep.c:1049 builtin/pack-objects.c:3286 |
a4f16749 JX |
10945 | msgid "no threads support, ignoring --threads" |
10946 | msgstr "没有线程支持,忽略 --threads" | |
10947 | ||
c1ac5258 | 10948 | #: builtin/grep.c:1073 |
c04f5ac3 JX |
10949 | msgid "--open-files-in-pager only works on the worktree" |
10950 | msgstr "--open-files-in-pager 仅用于工作区" | |
10951 | ||
c1ac5258 JX |
10952 | #: builtin/grep.c:1096 |
10953 | msgid "option not supported with --recurse-submodules" | |
10954 | msgstr "选项不支持和 --recurse-submodules 共用" | |
c04f5ac3 | 10955 | |
c1ac5258 JX |
10956 | #: builtin/grep.c:1102 |
10957 | msgid "--cached or --untracked cannot be used with --no-index" | |
10958 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" | |
c04f5ac3 | 10959 | |
31e5e17b | 10960 | #: builtin/grep.c:1108 |
c1ac5258 JX |
10961 | msgid "--[no-]exclude-standard cannot be used for tracked contents" |
10962 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容" | |
c04f5ac3 | 10963 | |
c1ac5258 JX |
10964 | #: builtin/grep.c:1116 |
10965 | msgid "both --cached and trees are given" | |
10966 | msgstr "同时给出了 --cached 和树对象" | |
10967 | ||
10968 | #: builtin/hash-object.c:84 | |
ef317cd5 | 10969 | msgid "" |
814ff314 JX |
10970 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
10971 | "[--] <file>..." | |
ef317cd5 | 10972 | msgstr "" |
814ff314 JX |
10973 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
10974 | "[--] <文件>..." | |
ef317cd5 | 10975 | |
c1ac5258 | 10976 | #: builtin/hash-object.c:85 |
94550ed3 JX |
10977 | msgid "git hash-object --stdin-paths" |
10978 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 10979 | |
c1ac5258 | 10980 | #: builtin/hash-object.c:97 |
ef317cd5 | 10981 | msgid "type" |
07432cef | 10982 | msgstr "类型" |
ef317cd5 | 10983 | |
c1ac5258 | 10984 | #: builtin/hash-object.c:97 |
ef317cd5 | 10985 | msgid "object type" |
07432cef | 10986 | msgstr "对象类型" |
ef317cd5 | 10987 | |
c1ac5258 | 10988 | #: builtin/hash-object.c:98 |
ef317cd5 | 10989 | msgid "write the object into the object database" |
07432cef | 10990 | msgstr "将对象写入对象数据库" |
ef317cd5 | 10991 | |
c1ac5258 | 10992 | #: builtin/hash-object.c:100 |
ef317cd5 | 10993 | msgid "read the object from stdin" |
07432cef | 10994 | msgstr "从标准输入读取对象" |
ef317cd5 | 10995 | |
c1ac5258 | 10996 | #: builtin/hash-object.c:102 |
ef317cd5 | 10997 | msgid "store file as is without filters" |
07432cef | 10998 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 10999 | |
c1ac5258 | 11000 | #: builtin/hash-object.c:103 |
220c313c JX |
11001 | msgid "" |
11002 | "just hash any random garbage to create corrupt objects for debugging Git" | |
11003 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
11004 | ||
c1ac5258 | 11005 | #: builtin/hash-object.c:104 |
ef317cd5 | 11006 | msgid "process file as it were from this path" |
07432cef | 11007 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 11008 | |
c1ac5258 | 11009 | #: builtin/help.c:46 |
ef317cd5 | 11010 | msgid "print all available commands" |
07432cef | 11011 | msgstr "打印所有可用的命令" |
ef317cd5 | 11012 | |
c1ac5258 | 11013 | #: builtin/help.c:47 |
a0b6b246 JX |
11014 | msgid "exclude guides" |
11015 | msgstr "排除向导" | |
11016 | ||
c1ac5258 | 11017 | #: builtin/help.c:48 |
4dcdc3d8 JX |
11018 | msgid "print list of useful guides" |
11019 | msgstr "显示有用的指南列表" | |
11020 | ||
c1ac5258 JX |
11021 | #: builtin/help.c:49 |
11022 | msgid "print all configuration variable names" | |
11023 | msgstr "打印所有配置变量名称" | |
11024 | ||
11025 | #: builtin/help.c:51 | |
ef317cd5 | 11026 | msgid "show man page" |
07432cef | 11027 | msgstr "显示 man 手册" |
ef317cd5 | 11028 | |
c1ac5258 | 11029 | #: builtin/help.c:52 |
ef317cd5 | 11030 | msgid "show manual in web browser" |
07432cef | 11031 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 11032 | |
c1ac5258 | 11033 | #: builtin/help.c:54 |
ef317cd5 | 11034 | msgid "show info page" |
07432cef | 11035 | msgstr "显示 info 手册" |
ef317cd5 | 11036 | |
c1ac5258 | 11037 | #: builtin/help.c:56 |
fd8cb379 JX |
11038 | msgid "print command description" |
11039 | msgstr "打印命令描述" | |
11040 | ||
c1ac5258 | 11041 | #: builtin/help.c:61 |
814ff314 JX |
11042 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
11043 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 11044 | |
c1ac5258 | 11045 | #: builtin/help.c:73 |
81809b99 | 11046 | #, c-format |
8ada9598 | 11047 | msgid "unrecognized help format '%s'" |
81809b99 | 11048 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 11049 | |
c1ac5258 | 11050 | #: builtin/help.c:100 |
8ada9598 | 11051 | msgid "Failed to start emacsclient." |
81809b99 | 11052 | msgstr "无法启动 emacsclient。" |
8ada9598 | 11053 | |
c1ac5258 | 11054 | #: builtin/help.c:113 |
8ada9598 | 11055 | msgid "Failed to parse emacsclient version." |
81809b99 | 11056 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 11057 | |
c1ac5258 | 11058 | #: builtin/help.c:121 |
8ada9598 JX |
11059 | #, c-format |
11060 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 11061 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 11062 | |
c1ac5258 | 11063 | #: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 |
81809b99 | 11064 | #, c-format |
5b04ee3b | 11065 | msgid "failed to exec '%s'" |
c1ac5258 | 11066 | msgstr "执行 '%s' 失败" |
8ada9598 | 11067 | |
c1ac5258 | 11068 | #: builtin/help.c:217 |
8ada9598 JX |
11069 | #, c-format |
11070 | msgid "" | |
11071 | "'%s': path for unsupported man viewer.\n" | |
11072 | "Please consider using 'man.<tool>.cmd' instead." | |
11073 | msgstr "" | |
81809b99 | 11074 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 11075 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 11076 | |
c1ac5258 | 11077 | #: builtin/help.c:229 |
8ada9598 JX |
11078 | #, c-format |
11079 | msgid "" | |
11080 | "'%s': cmd for supported man viewer.\n" | |
11081 | "Please consider using 'man.<tool>.path' instead." | |
11082 | msgstr "" | |
81809b99 | 11083 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 11084 | "请使用 'man.<工具>.path'。" |
8ada9598 | 11085 | |
c1ac5258 | 11086 | #: builtin/help.c:346 |
8ada9598 JX |
11087 | #, c-format |
11088 | msgid "'%s': unknown man viewer." | |
81809b99 | 11089 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 11090 | |
c1ac5258 | 11091 | #: builtin/help.c:363 |
8ada9598 | 11092 | msgid "no man viewer handled the request" |
81809b99 | 11093 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 11094 | |
c1ac5258 | 11095 | #: builtin/help.c:371 |
8ada9598 | 11096 | msgid "no info viewer handled the request" |
81809b99 | 11097 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 11098 | |
c1ac5258 | 11099 | #: builtin/help.c:418 |
fd8cb379 JX |
11100 | #, c-format |
11101 | msgid "'%s' is aliased to '%s'" | |
11102 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 11103 | |
c1ac5258 | 11104 | #: builtin/help.c:445 builtin/help.c:475 |
fd8cb379 JX |
11105 | #, c-format |
11106 | msgid "usage: %s%s" | |
11107 | msgstr "用法:%s%s" | |
4dcdc3d8 | 11108 | |
c1ac5258 JX |
11109 | #: builtin/help.c:459 |
11110 | msgid "'git help config' for more information" | |
11111 | msgstr "'git help config' 获取更多信息" | |
4dcdc3d8 | 11112 | |
fd8cb379 | 11113 | #: builtin/index-pack.c:208 |
8ada9598 JX |
11114 | #, c-format |
11115 | msgid "object type mismatch at %s" | |
81809b99 | 11116 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 11117 | |
fd8cb379 | 11118 | #: builtin/index-pack.c:228 |
6acbf033 JX |
11119 | #, c-format |
11120 | msgid "did not receive expected object %s" | |
a0b6b246 | 11121 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 11122 | |
fd8cb379 | 11123 | #: builtin/index-pack.c:231 |
6acbf033 JX |
11124 | #, c-format |
11125 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 11126 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 11127 | |
fd8cb379 | 11128 | #: builtin/index-pack.c:273 |
81809b99 | 11129 | #, c-format |
8ada9598 JX |
11130 | msgid "cannot fill %d byte" |
11131 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 11132 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 11133 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 11134 | |
fd8cb379 | 11135 | #: builtin/index-pack.c:283 |
8ada9598 | 11136 | msgid "early EOF" |
81809b99 | 11137 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 11138 | |
fd8cb379 | 11139 | #: builtin/index-pack.c:284 |
8ada9598 | 11140 | msgid "read error on input" |
81809b99 | 11141 | msgstr "输入上的读错误" |
8ada9598 | 11142 | |
fd8cb379 | 11143 | #: builtin/index-pack.c:296 |
8ada9598 | 11144 | msgid "used more bytes than were available" |
81809b99 | 11145 | msgstr "用掉了超过可用的字节" |
8ada9598 | 11146 | |
c1ac5258 | 11147 | #: builtin/index-pack.c:303 builtin/pack-objects.c:590 |
8ada9598 | 11148 | msgid "pack too large for current definition of off_t" |
81809b99 | 11149 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 11150 | |
c1ac5258 | 11151 | #: builtin/index-pack.c:306 builtin/unpack-objects.c:94 |
a0b6b246 JX |
11152 | msgid "pack exceeds maximum allowed size" |
11153 | msgstr "包超过了最大允许值" | |
11154 | ||
fd8cb379 | 11155 | #: builtin/index-pack.c:321 |
81809b99 | 11156 | #, c-format |
8ada9598 | 11157 | msgid "unable to create '%s'" |
81809b99 | 11158 | msgstr "不能创建 '%s'" |
8ada9598 | 11159 | |
fd8cb379 | 11160 | #: builtin/index-pack.c:327 |
81809b99 | 11161 | #, c-format |
8ada9598 | 11162 | msgid "cannot open packfile '%s'" |
81809b99 | 11163 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 11164 | |
fd8cb379 | 11165 | #: builtin/index-pack.c:341 |
8ada9598 | 11166 | msgid "pack signature mismatch" |
81809b99 | 11167 | msgstr "包签名不匹配" |
8ada9598 | 11168 | |
fd8cb379 | 11169 | #: builtin/index-pack.c:343 |
ef317cd5 JX |
11170 | #, c-format |
11171 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 11172 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 11173 | |
fd8cb379 | 11174 | #: builtin/index-pack.c:361 |
8ada9598 | 11175 | #, c-format |
5c57d762 JX |
11176 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
11177 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 11178 | |
fd8cb379 | 11179 | #: builtin/index-pack.c:482 |
8ada9598 JX |
11180 | #, c-format |
11181 | msgid "inflate returned %d" | |
81809b99 | 11182 | msgstr "解压缩返回 %d" |
8ada9598 | 11183 | |
fd8cb379 | 11184 | #: builtin/index-pack.c:531 |
8ada9598 | 11185 | msgid "offset value overflow for delta base object" |
81809b99 | 11186 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 11187 | |
fd8cb379 | 11188 | #: builtin/index-pack.c:539 |
8ada9598 | 11189 | msgid "delta base offset is out of bound" |
81809b99 | 11190 | msgstr "delta 基准偏移越界" |
8ada9598 | 11191 | |
fd8cb379 | 11192 | #: builtin/index-pack.c:547 |
81809b99 | 11193 | #, c-format |
8ada9598 | 11194 | msgid "unknown object type %d" |
81809b99 | 11195 | msgstr "未知对象类型 %d" |
8ada9598 | 11196 | |
fd8cb379 | 11197 | #: builtin/index-pack.c:578 |
8ada9598 | 11198 | msgid "cannot pread pack file" |
81809b99 | 11199 | msgstr "无法读取包文件" |
8ada9598 | 11200 | |
fd8cb379 | 11201 | #: builtin/index-pack.c:580 |
8ada9598 | 11202 | #, c-format |
5c57d762 JX |
11203 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
11204 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
11205 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
11206 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 11207 | |
fd8cb379 | 11208 | #: builtin/index-pack.c:606 |
8ada9598 | 11209 | msgid "serious inflate inconsistency" |
81809b99 | 11210 | msgstr "解压缩严重的不一致" |
8ada9598 | 11211 | |
fd8cb379 JX |
11212 | #: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 |
11213 | #: builtin/index-pack.c:819 builtin/index-pack.c:828 | |
8ada9598 JX |
11214 | #, c-format |
11215 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 11216 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 11217 | |
c1ac5258 JX |
11218 | #: builtin/index-pack.c:754 builtin/pack-objects.c:143 |
11219 | #: builtin/pack-objects.c:203 builtin/pack-objects.c:297 | |
6792b93b JX |
11220 | #, c-format |
11221 | msgid "unable to read %s" | |
11222 | msgstr "不能读 %s" | |
11223 | ||
fd8cb379 | 11224 | #: builtin/index-pack.c:817 |
87cb7997 JX |
11225 | #, c-format |
11226 | msgid "cannot read existing object info %s" | |
11227 | msgstr "不能读取现存对象信息 %s" | |
11228 | ||
fd8cb379 | 11229 | #: builtin/index-pack.c:825 |
6792b93b JX |
11230 | #, c-format |
11231 | msgid "cannot read existing object %s" | |
11232 | msgstr "不能读取现存对象 %s" | |
11233 | ||
fd8cb379 | 11234 | #: builtin/index-pack.c:839 |
81809b99 | 11235 | #, c-format |
8ada9598 | 11236 | msgid "invalid blob object %s" |
160fb2b2 | 11237 | msgstr "无效的数据对象 %s" |
8ada9598 | 11238 | |
c1ac5258 | 11239 | #: builtin/index-pack.c:842 builtin/index-pack.c:861 |
fd8cb379 JX |
11240 | msgid "fsck error in packed object" |
11241 | msgstr "对打包对象 fsck 检查出错" | |
11242 | ||
c1ac5258 | 11243 | #: builtin/index-pack.c:858 |
81809b99 | 11244 | #, c-format |
8ada9598 | 11245 | msgid "invalid %s" |
81809b99 | 11246 | msgstr "无效的 %s" |
8ada9598 | 11247 | |
c1ac5258 | 11248 | #: builtin/index-pack.c:863 |
8ada9598 JX |
11249 | #, c-format |
11250 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 11251 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 11252 | |
c1ac5258 | 11253 | #: builtin/index-pack.c:935 builtin/index-pack.c:966 |
8ada9598 | 11254 | msgid "failed to apply delta" |
c1ac5258 | 11255 | msgstr "应用 delta 失败" |
8ada9598 | 11256 | |
c1ac5258 | 11257 | #: builtin/index-pack.c:1136 |
8ada9598 | 11258 | msgid "Receiving objects" |
81809b99 | 11259 | msgstr "接收对象中" |
8ada9598 | 11260 | |
c1ac5258 | 11261 | #: builtin/index-pack.c:1136 |
8ada9598 | 11262 | msgid "Indexing objects" |
81809b99 | 11263 | msgstr "索引对象中" |
8ada9598 | 11264 | |
c1ac5258 | 11265 | #: builtin/index-pack.c:1170 |
8ada9598 | 11266 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 11267 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 11268 | |
c1ac5258 | 11269 | #: builtin/index-pack.c:1175 |
8ada9598 | 11270 | msgid "cannot fstat packfile" |
65e2041e | 11271 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 11272 | |
c1ac5258 | 11273 | #: builtin/index-pack.c:1178 |
8ada9598 | 11274 | msgid "pack has junk at the end" |
81809b99 | 11275 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 11276 | |
c1ac5258 | 11277 | #: builtin/index-pack.c:1190 |
6792b93b JX |
11278 | msgid "confusion beyond insanity in parse_pack_objects()" |
11279 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
11280 | ||
c1ac5258 | 11281 | #: builtin/index-pack.c:1213 |
8ada9598 | 11282 | msgid "Resolving deltas" |
81809b99 | 11283 | msgstr "处理 delta 中" |
8ada9598 | 11284 | |
c1ac5258 | 11285 | #: builtin/index-pack.c:1224 builtin/pack-objects.c:2407 |
07432cef | 11286 | #, c-format |
ef317cd5 | 11287 | msgid "unable to create thread: %s" |
07432cef | 11288 | msgstr "不能创建线程:%s" |
ef317cd5 | 11289 | |
c1ac5258 | 11290 | #: builtin/index-pack.c:1266 |
8ada9598 | 11291 | msgid "confusion beyond insanity" |
81809b99 | 11292 | msgstr "不可理喻" |
8ada9598 | 11293 | |
c1ac5258 | 11294 | #: builtin/index-pack.c:1272 |
ef317cd5 | 11295 | #, c-format |
5b04ee3b JX |
11296 | msgid "completed with %d local object" |
11297 | msgid_plural "completed with %d local objects" | |
11298 | msgstr[0] "完成 %d 个本地对象" | |
11299 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 11300 | |
c1ac5258 | 11301 | #: builtin/index-pack.c:1284 |
ef317cd5 JX |
11302 | #, c-format |
11303 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 11304 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 11305 | |
c1ac5258 | 11306 | #: builtin/index-pack.c:1288 |
8ada9598 JX |
11307 | #, c-format |
11308 | msgid "pack has %d unresolved delta" | |
11309 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 11310 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 11311 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 11312 | |
c1ac5258 | 11313 | #: builtin/index-pack.c:1312 |
81809b99 | 11314 | #, c-format |
8ada9598 | 11315 | msgid "unable to deflate appended object (%d)" |
07432cef | 11316 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 11317 | |
c1ac5258 | 11318 | #: builtin/index-pack.c:1389 |
8ada9598 JX |
11319 | #, c-format |
11320 | msgid "local object %s is corrupt" | |
81809b99 | 11321 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 11322 | |
c1ac5258 | 11323 | #: builtin/index-pack.c:1403 |
31e5e17b JX |
11324 | #, c-format |
11325 | msgid "packfile name '%s' does not end with '.pack'" | |
11326 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 11327 | |
c1ac5258 | 11328 | #: builtin/index-pack.c:1428 |
81809b99 | 11329 | #, c-format |
31e5e17b JX |
11330 | msgid "cannot write %s file '%s'" |
11331 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 11332 | |
c1ac5258 | 11333 | #: builtin/index-pack.c:1436 |
81809b99 | 11334 | #, c-format |
31e5e17b JX |
11335 | msgid "cannot close written %s file '%s'" |
11336 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
11337 | ||
c1ac5258 | 11338 | #: builtin/index-pack.c:1460 |
31e5e17b JX |
11339 | msgid "error while closing pack file" |
11340 | msgstr "关闭包文件时出错" | |
8ada9598 | 11341 | |
c1ac5258 | 11342 | #: builtin/index-pack.c:1474 |
8ada9598 | 11343 | msgid "cannot store pack file" |
81809b99 | 11344 | msgstr "无法存储包文件" |
8ada9598 | 11345 | |
c1ac5258 | 11346 | #: builtin/index-pack.c:1482 |
8ada9598 | 11347 | msgid "cannot store index file" |
81809b99 | 11348 | msgstr "无法存储索引文件" |
8ada9598 | 11349 | |
c1ac5258 | 11350 | #: builtin/index-pack.c:1526 builtin/pack-objects.c:2645 |
07432cef | 11351 | #, c-format |
ef317cd5 | 11352 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 11353 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 11354 | |
c1ac5258 | 11355 | #: builtin/index-pack.c:1595 |
81809b99 | 11356 | #, c-format |
8ada9598 | 11357 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 11358 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 11359 | |
c1ac5258 | 11360 | #: builtin/index-pack.c:1597 |
81809b99 | 11361 | #, c-format |
8ada9598 | 11362 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 11363 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 11364 | |
c1ac5258 | 11365 | #: builtin/index-pack.c:1645 |
81809b99 | 11366 | #, c-format |
8ada9598 JX |
11367 | msgid "non delta: %d object" |
11368 | msgid_plural "non delta: %d objects" | |
81809b99 | 11369 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 11370 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 11371 | |
c1ac5258 | 11372 | #: builtin/index-pack.c:1652 |
8ada9598 JX |
11373 | #, c-format |
11374 | msgid "chain length = %d: %lu object" | |
11375 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 11376 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 11377 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 11378 | |
c1ac5258 | 11379 | #: builtin/index-pack.c:1689 |
31e5e17b JX |
11380 | msgid "Cannot come back to cwd" |
11381 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 11382 | |
c1ac5258 JX |
11383 | #: builtin/index-pack.c:1740 builtin/index-pack.c:1743 |
11384 | #: builtin/index-pack.c:1759 builtin/index-pack.c:1763 | |
81809b99 | 11385 | #, c-format |
8ada9598 | 11386 | msgid "bad %s" |
81809b99 | 11387 | msgstr "错误选项 %s" |
8ada9598 | 11388 | |
c1ac5258 | 11389 | #: builtin/index-pack.c:1779 |
8ada9598 | 11390 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 11391 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 11392 | |
c1ac5258 | 11393 | #: builtin/index-pack.c:1781 |
1a79b2f1 JX |
11394 | msgid "--stdin requires a git repository" |
11395 | msgstr "--stdin 需要一个 git 仓库" | |
11396 | ||
c1ac5258 | 11397 | #: builtin/index-pack.c:1787 |
8ada9598 | 11398 | msgid "--verify with no packfile name given" |
dbd6cced | 11399 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 11400 | |
c1ac5258 | 11401 | #: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 |
fd8cb379 JX |
11402 | msgid "fsck error in pack objects" |
11403 | msgstr "在打包对象中 fsck 检查出错" | |
11404 | ||
a4f16749 | 11405 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
11406 | #, c-format |
11407 | msgid "cannot stat '%s'" | |
65e2041e | 11408 | msgstr "不能对 '%s' 调用 stat" |
c04f5ac3 | 11409 | |
a4f16749 | 11410 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
11411 | #, c-format |
11412 | msgid "cannot stat template '%s'" | |
65e2041e | 11413 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 11414 | |
a4f16749 | 11415 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
11416 | #, c-format |
11417 | msgid "cannot opendir '%s'" | |
11418 | msgstr "不能打开目录 '%s'" | |
11419 | ||
c1ac5258 | 11420 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
11421 | #, c-format |
11422 | msgid "cannot readlink '%s'" | |
11423 | msgstr "不能读取链接 '%s'" | |
11424 | ||
c1ac5258 | 11425 | #: builtin/init-db.c:80 |
c04f5ac3 JX |
11426 | #, c-format |
11427 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 11428 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 11429 | |
c1ac5258 | 11430 | #: builtin/init-db.c:86 |
c04f5ac3 JX |
11431 | #, c-format |
11432 | msgid "cannot copy '%s' to '%s'" | |
11433 | msgstr "不能拷贝 '%s' 至 '%s'" | |
11434 | ||
c1ac5258 | 11435 | #: builtin/init-db.c:90 |
c04f5ac3 JX |
11436 | #, c-format |
11437 | msgid "ignoring template %s" | |
11438 | msgstr "忽略模版 %s" | |
11439 | ||
c1ac5258 | 11440 | #: builtin/init-db.c:121 |
c04f5ac3 | 11441 | #, c-format |
fd8cb379 JX |
11442 | msgid "templates not found in %s" |
11443 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 11444 | |
c1ac5258 | 11445 | #: builtin/init-db.c:136 |
c04f5ac3 | 11446 | #, c-format |
5b04ee3b JX |
11447 | msgid "not copying templates from '%s': %s" |
11448 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 11449 | |
c1ac5258 | 11450 | #: builtin/init-db.c:329 |
c04f5ac3 JX |
11451 | #, c-format |
11452 | msgid "unable to handle file type %d" | |
11453 | msgstr "不能处理 %d 类型的文件" | |
11454 | ||
c1ac5258 | 11455 | #: builtin/init-db.c:332 |
c04f5ac3 JX |
11456 | #, c-format |
11457 | msgid "unable to move %s to %s" | |
11458 | msgstr "不能移动 %s 至 %s" | |
11459 | ||
c1ac5258 | 11460 | #: builtin/init-db.c:349 builtin/init-db.c:352 |
a0b6b246 JX |
11461 | #, c-format |
11462 | msgid "%s already exists" | |
11463 | msgstr "%s 已经存在" | |
11464 | ||
c1ac5258 | 11465 | #: builtin/init-db.c:405 |
c04f5ac3 | 11466 | #, c-format |
5c57d762 JX |
11467 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
11468 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 11469 | |
c1ac5258 | 11470 | #: builtin/init-db.c:406 |
5c57d762 JX |
11471 | #, c-format |
11472 | msgid "Reinitialized existing Git repository in %s%s\n" | |
11473 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 11474 | |
c1ac5258 | 11475 | #: builtin/init-db.c:410 |
5c57d762 JX |
11476 | #, c-format |
11477 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 11478 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 11479 | |
c1ac5258 | 11480 | #: builtin/init-db.c:411 |
5c57d762 JX |
11481 | #, c-format |
11482 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 11483 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 11484 | |
c1ac5258 | 11485 | #: builtin/init-db.c:459 |
ef317cd5 | 11486 | msgid "" |
a77c07d9 | 11487 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 11488 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 11489 | msgstr "" |
07432cef | 11490 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 11491 | "[<目录>]" |
ef317cd5 | 11492 | |
c1ac5258 | 11493 | #: builtin/init-db.c:482 |
ef317cd5 | 11494 | msgid "permissions" |
07432cef | 11495 | msgstr "权限" |
ef317cd5 | 11496 | |
c1ac5258 | 11497 | #: builtin/init-db.c:483 |
ef317cd5 | 11498 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 11499 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 11500 | |
c1ac5258 JX |
11501 | #: builtin/init-db.c:517 builtin/init-db.c:522 |
11502 | #, c-format | |
11503 | msgid "cannot mkdir %s" | |
11504 | msgstr "不能创建目录 %s" | |
11505 | ||
11506 | #: builtin/init-db.c:526 | |
c04f5ac3 JX |
11507 | #, c-format |
11508 | msgid "cannot chdir to %s" | |
11509 | msgstr "不能切换目录到 %s" | |
11510 | ||
c1ac5258 | 11511 | #: builtin/init-db.c:547 |
c04f5ac3 JX |
11512 | #, c-format |
11513 | msgid "" | |
11514 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
11515 | "dir=<directory>)" | |
1e607449 | 11516 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 11517 | |
c1ac5258 | 11518 | #: builtin/init-db.c:575 |
c04f5ac3 JX |
11519 | #, c-format |
11520 | msgid "Cannot access work tree '%s'" | |
11521 | msgstr "不能访问工作区 '%s'" | |
11522 | ||
220c313c JX |
11523 | #: builtin/interpret-trailers.c:15 |
11524 | msgid "" | |
276ceeaa JX |
11525 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
11526 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
11527 | msgstr "" |
11528 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
11529 | ">])...] [<文件>...]" | |
276ceeaa | 11530 | |
6937cb4e | 11531 | #: builtin/interpret-trailers.c:92 |
276ceeaa JX |
11532 | msgid "edit files in place" |
11533 | msgstr "在原位编辑文件" | |
220c313c | 11534 | |
6937cb4e | 11535 | #: builtin/interpret-trailers.c:93 |
220c313c | 11536 | msgid "trim empty trailers" |
6937cb4e JX |
11537 | msgstr "删除空的尾部署名" |
11538 | ||
11539 | #: builtin/interpret-trailers.c:96 | |
11540 | msgid "where to place the new trailer" | |
11541 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 11542 | |
6937cb4e JX |
11543 | #: builtin/interpret-trailers.c:98 |
11544 | msgid "action if trailer already exists" | |
11545 | msgstr "当尾部署名已经存在时所采取的动作" | |
11546 | ||
11547 | #: builtin/interpret-trailers.c:100 | |
11548 | msgid "action if trailer is missing" | |
11549 | msgstr "当尾部署名缺失时所采取的动作" | |
11550 | ||
11551 | #: builtin/interpret-trailers.c:102 | |
11552 | msgid "output only the trailers" | |
11553 | msgstr "只输出尾部署名" | |
11554 | ||
11555 | #: builtin/interpret-trailers.c:103 | |
11556 | msgid "do not apply config rules" | |
11557 | msgstr "不要应用配置规则" | |
11558 | ||
11559 | #: builtin/interpret-trailers.c:104 | |
11560 | msgid "join whitespace-continued values" | |
11561 | msgstr "连接空白折行的值" | |
11562 | ||
11563 | #: builtin/interpret-trailers.c:105 | |
11564 | msgid "set parsing options" | |
11565 | msgstr "设置解析选项" | |
11566 | ||
11567 | #: builtin/interpret-trailers.c:107 | |
220c313c | 11568 | msgid "trailer" |
6937cb4e | 11569 | msgstr "尾部署名" |
220c313c | 11570 | |
6937cb4e | 11571 | #: builtin/interpret-trailers.c:108 |
220c313c | 11572 | msgid "trailer(s) to add" |
6937cb4e | 11573 | msgstr "要添加的尾部署名" |
220c313c | 11574 | |
6937cb4e JX |
11575 | #: builtin/interpret-trailers.c:117 |
11576 | msgid "--trailer with --only-input does not make sense" | |
11577 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
11578 | ||
11579 | #: builtin/interpret-trailers.c:127 | |
276ceeaa JX |
11580 | msgid "no input file given for in-place editing" |
11581 | msgstr "没有给出要原位编辑的文件" | |
11582 | ||
c1ac5258 | 11583 | #: builtin/log.c:51 |
7aea43ff | 11584 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 11585 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 11586 | |
c1ac5258 | 11587 | #: builtin/log.c:52 |
814ff314 JX |
11588 | msgid "git show [<options>] <object>..." |
11589 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 11590 | |
c1ac5258 | 11591 | #: builtin/log.c:96 |
220c313c JX |
11592 | #, c-format |
11593 | msgid "invalid --decorate option: %s" | |
11594 | msgstr "无效的 --decorate 选项:%s" | |
11595 | ||
c1ac5258 | 11596 | #: builtin/log.c:157 |
ef317cd5 | 11597 | msgid "suppress diff output" |
07432cef | 11598 | msgstr "不显示差异输出" |
ef317cd5 | 11599 | |
c1ac5258 | 11600 | #: builtin/log.c:158 |
ef317cd5 | 11601 | msgid "show source" |
07432cef | 11602 | msgstr "显示源" |
ef317cd5 | 11603 | |
c1ac5258 | 11604 | #: builtin/log.c:159 |
07432cef WS |
11605 | msgid "Use mail map file" |
11606 | msgstr "使用邮件映射文件" | |
11607 | ||
c1ac5258 | 11608 | #: builtin/log.c:161 |
5809aa05 JX |
11609 | msgid "only decorate refs that match <pattern>" |
11610 | msgstr "只修饰与 <模式> 匹配的引用" | |
11611 | ||
c1ac5258 | 11612 | #: builtin/log.c:163 |
5809aa05 JX |
11613 | msgid "do not decorate refs that match <pattern>" |
11614 | msgstr "不修饰和 <模式> 匹配的引用" | |
11615 | ||
c1ac5258 | 11616 | #: builtin/log.c:164 |
ef317cd5 | 11617 | msgid "decorate options" |
07432cef | 11618 | msgstr "修饰选项" |
ef317cd5 | 11619 | |
c1ac5258 | 11620 | #: builtin/log.c:167 |
220c313c JX |
11621 | msgid "Process line range n,m in file, counting from 1" |
11622 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
11623 | ||
c1ac5258 | 11624 | #: builtin/log.c:265 |
c04f5ac3 JX |
11625 | #, c-format |
11626 | msgid "Final output: %d %s\n" | |
11627 | msgstr "最终输出:%d %s\n" | |
11628 | ||
c1ac5258 | 11629 | #: builtin/log.c:516 |
220c313c JX |
11630 | #, c-format |
11631 | msgid "git show %s: bad file" | |
11632 | msgstr "git show %s: 损坏的文件" | |
11633 | ||
c1ac5258 | 11634 | #: builtin/log.c:531 builtin/log.c:625 |
c04f5ac3 JX |
11635 | #, c-format |
11636 | msgid "Could not read object %s" | |
90e6ef53 | 11637 | msgstr "不能读取对象 %s" |
c04f5ac3 | 11638 | |
c1ac5258 | 11639 | #: builtin/log.c:649 |
c04f5ac3 JX |
11640 | #, c-format |
11641 | msgid "Unknown type: %d" | |
11642 | msgstr "未知类型:%d" | |
11643 | ||
c1ac5258 | 11644 | #: builtin/log.c:770 |
c04f5ac3 JX |
11645 | msgid "format.headers without value" |
11646 | msgstr "format.headers 没有值" | |
11647 | ||
c1ac5258 | 11648 | #: builtin/log.c:871 |
c04f5ac3 JX |
11649 | msgid "name of output directory is too long" |
11650 | msgstr "输出目录名太长" | |
11651 | ||
c1ac5258 | 11652 | #: builtin/log.c:887 |
c04f5ac3 JX |
11653 | #, c-format |
11654 | msgid "Cannot open patch file %s" | |
11655 | msgstr "无法打开补丁文件 %s" | |
11656 | ||
c1ac5258 | 11657 | #: builtin/log.c:904 |
c04f5ac3 JX |
11658 | msgid "Need exactly one range." |
11659 | msgstr "只需要一个范围。" | |
11660 | ||
c1ac5258 | 11661 | #: builtin/log.c:914 |
c04f5ac3 JX |
11662 | msgid "Not a range." |
11663 | msgstr "不是一个范围。" | |
11664 | ||
c1ac5258 | 11665 | #: builtin/log.c:1020 |
c04f5ac3 JX |
11666 | msgid "Cover letter needs email format" |
11667 | msgstr "信封需要邮件地址格式" | |
11668 | ||
c1ac5258 | 11669 | #: builtin/log.c:1101 |
c04f5ac3 JX |
11670 | #, c-format |
11671 | msgid "insane in-reply-to: %s" | |
11672 | msgstr "不正常的 in-reply-to:%s" | |
11673 | ||
c1ac5258 | 11674 | #: builtin/log.c:1128 |
814ff314 JX |
11675 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
11676 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 11677 | |
c1ac5258 | 11678 | #: builtin/log.c:1178 |
c04f5ac3 JX |
11679 | msgid "Two output directories?" |
11680 | msgstr "两个输出目录?" | |
11681 | ||
c1ac5258 | 11682 | #: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 |
5b04ee3b JX |
11683 | #, c-format |
11684 | msgid "Unknown commit %s" | |
11685 | msgstr "未知提交 %s" | |
11686 | ||
c1ac5258 | 11687 | #: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 |
5b04ee3b JX |
11688 | #, c-format |
11689 | msgid "Failed to resolve '%s' as a valid ref." | |
11690 | msgstr "无法解析 '%s' 为一个有效引用。" | |
11691 | ||
c1ac5258 | 11692 | #: builtin/log.c:1300 |
5b04ee3b JX |
11693 | msgid "Could not find exact merge base." |
11694 | msgstr "不能找到准确的合并基线。" | |
11695 | ||
c1ac5258 | 11696 | #: builtin/log.c:1304 |
5b04ee3b JX |
11697 | msgid "" |
11698 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
11699 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
11700 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
11701 | msgstr "" | |
11702 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 11703 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
58b6f078 | 11704 | "参数 --base=<基线提交> 手动指定一个基线提交。" |
5b04ee3b | 11705 | |
c1ac5258 | 11706 | #: builtin/log.c:1324 |
5b04ee3b JX |
11707 | msgid "Failed to find exact merge base" |
11708 | msgstr "无法找到准确的合并基线" | |
11709 | ||
c1ac5258 | 11710 | #: builtin/log.c:1335 |
5b04ee3b JX |
11711 | msgid "base commit should be the ancestor of revision list" |
11712 | msgstr "基线提交应该是版本列表的祖先" | |
11713 | ||
c1ac5258 | 11714 | #: builtin/log.c:1339 |
5b04ee3b JX |
11715 | msgid "base commit shouldn't be in revision list" |
11716 | msgstr "基线提交不应该出现在版本列表中" | |
11717 | ||
c1ac5258 | 11718 | #: builtin/log.c:1392 |
5b04ee3b | 11719 | msgid "cannot get patch id" |
aef18cc6 | 11720 | msgstr "无法得到补丁 id" |
5b04ee3b | 11721 | |
c1ac5258 | 11722 | #: builtin/log.c:1452 |
ef317cd5 | 11723 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 11724 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 11725 | |
c1ac5258 | 11726 | #: builtin/log.c:1455 |
ef317cd5 | 11727 | msgid "use [PATCH] even with multiple patches" |
07432cef | 11728 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 11729 | |
c1ac5258 | 11730 | #: builtin/log.c:1459 |
ef317cd5 | 11731 | msgid "print patches to standard out" |
07432cef | 11732 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 11733 | |
c1ac5258 | 11734 | #: builtin/log.c:1461 |
ef317cd5 | 11735 | msgid "generate a cover letter" |
07432cef | 11736 | msgstr "生成一封附信" |
c04f5ac3 | 11737 | |
c1ac5258 | 11738 | #: builtin/log.c:1463 |
ef317cd5 | 11739 | msgid "use simple number sequence for output file names" |
07432cef | 11740 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 11741 | |
c1ac5258 | 11742 | #: builtin/log.c:1464 |
ef317cd5 | 11743 | msgid "sfx" |
07432cef | 11744 | msgstr "后缀" |
ef317cd5 | 11745 | |
c1ac5258 | 11746 | #: builtin/log.c:1465 |
ef317cd5 | 11747 | msgid "use <sfx> instead of '.patch'" |
07432cef | 11748 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 11749 | |
c1ac5258 | 11750 | #: builtin/log.c:1467 |
ef317cd5 | 11751 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
11752 | msgstr "补丁以 <n> 开始编号,而不是1" |
11753 | ||
c1ac5258 | 11754 | #: builtin/log.c:1469 |
07432cef WS |
11755 | msgid "mark the series as Nth re-roll" |
11756 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 11757 | |
c1ac5258 | 11758 | #: builtin/log.c:1471 |
a0b6b246 JX |
11759 | msgid "Use [RFC PATCH] instead of [PATCH]" |
11760 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
11761 | ||
c1ac5258 | 11762 | #: builtin/log.c:1474 |
ef317cd5 | 11763 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 11764 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 11765 | |
c1ac5258 | 11766 | #: builtin/log.c:1477 |
ef317cd5 | 11767 | msgid "store resulting files in <dir>" |
d9d56b23 | 11768 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 11769 | |
c1ac5258 | 11770 | #: builtin/log.c:1480 |
ef317cd5 | 11771 | msgid "don't strip/add [PATCH]" |
07432cef | 11772 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 11773 | |
c1ac5258 | 11774 | #: builtin/log.c:1483 |
ef317cd5 | 11775 | msgid "don't output binary diffs" |
07432cef | 11776 | msgstr "不输出二进制差异" |
ef317cd5 | 11777 | |
c1ac5258 | 11778 | #: builtin/log.c:1485 |
89f80d72 JX |
11779 | msgid "output all-zero hash in From header" |
11780 | msgstr "在 From 头信息中输出全为零的哈希值" | |
11781 | ||
c1ac5258 | 11782 | #: builtin/log.c:1487 |
ef317cd5 | 11783 | msgid "don't include a patch matching a commit upstream" |
07432cef | 11784 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 11785 | |
c1ac5258 | 11786 | #: builtin/log.c:1489 |
ef317cd5 | 11787 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 11788 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 11789 | |
c1ac5258 | 11790 | #: builtin/log.c:1491 |
ef317cd5 | 11791 | msgid "Messaging" |
07432cef | 11792 | msgstr "邮件发送" |
ef317cd5 | 11793 | |
c1ac5258 | 11794 | #: builtin/log.c:1492 |
ef317cd5 | 11795 | msgid "header" |
07432cef | 11796 | msgstr "header" |
ef317cd5 | 11797 | |
c1ac5258 | 11798 | #: builtin/log.c:1493 |
ef317cd5 | 11799 | msgid "add email header" |
07432cef | 11800 | msgstr "添加邮件头" |
ef317cd5 | 11801 | |
c1ac5258 | 11802 | #: builtin/log.c:1494 builtin/log.c:1496 |
ef317cd5 | 11803 | msgid "email" |
07432cef | 11804 | msgstr "邮件地址" |
ef317cd5 | 11805 | |
c1ac5258 | 11806 | #: builtin/log.c:1494 |
ef317cd5 | 11807 | msgid "add To: header" |
07432cef | 11808 | msgstr "添加收件人" |
ef317cd5 | 11809 | |
c1ac5258 | 11810 | #: builtin/log.c:1496 |
ef317cd5 | 11811 | msgid "add Cc: header" |
07432cef | 11812 | msgstr "添加抄送" |
ef317cd5 | 11813 | |
c1ac5258 | 11814 | #: builtin/log.c:1498 |
2e8451e8 | 11815 | msgid "ident" |
d9d56b23 | 11816 | msgstr "标识" |
2e8451e8 | 11817 | |
c1ac5258 | 11818 | #: builtin/log.c:1499 |
2e8451e8 | 11819 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 11820 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 11821 | |
c1ac5258 | 11822 | #: builtin/log.c:1501 |
ef317cd5 | 11823 | msgid "message-id" |
d9d56b23 | 11824 | msgstr "邮件标识" |
ef317cd5 | 11825 | |
c1ac5258 | 11826 | #: builtin/log.c:1502 |
ef317cd5 | 11827 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 11828 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 11829 | |
c1ac5258 | 11830 | #: builtin/log.c:1503 builtin/log.c:1506 |
ef317cd5 | 11831 | msgid "boundary" |
07432cef | 11832 | msgstr "边界" |
ef317cd5 | 11833 | |
c1ac5258 | 11834 | #: builtin/log.c:1504 |
ef317cd5 | 11835 | msgid "attach the patch" |
07432cef | 11836 | msgstr "附件方式添加补丁" |
ef317cd5 | 11837 | |
c1ac5258 | 11838 | #: builtin/log.c:1507 |
ef317cd5 | 11839 | msgid "inline the patch" |
07432cef | 11840 | msgstr "内联显示补丁" |
ef317cd5 | 11841 | |
c1ac5258 | 11842 | #: builtin/log.c:1511 |
ef317cd5 | 11843 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 11844 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 11845 | |
c1ac5258 | 11846 | #: builtin/log.c:1513 |
ef317cd5 | 11847 | msgid "signature" |
07432cef | 11848 | msgstr "签名" |
ef317cd5 | 11849 | |
c1ac5258 | 11850 | #: builtin/log.c:1514 |
ef317cd5 | 11851 | msgid "add a signature" |
07432cef | 11852 | msgstr "添加一个签名" |
ef317cd5 | 11853 | |
c1ac5258 | 11854 | #: builtin/log.c:1515 |
5b04ee3b JX |
11855 | msgid "base-commit" |
11856 | msgstr "基线提交" | |
11857 | ||
c1ac5258 | 11858 | #: builtin/log.c:1516 |
5b04ee3b JX |
11859 | msgid "add prerequisite tree info to the patch series" |
11860 | msgstr "为补丁列表添加前置树信息" | |
11861 | ||
c1ac5258 | 11862 | #: builtin/log.c:1518 |
6acbf033 JX |
11863 | msgid "add a signature from a file" |
11864 | msgstr "从文件添加一个签名" | |
11865 | ||
c1ac5258 | 11866 | #: builtin/log.c:1519 |
ef317cd5 | 11867 | msgid "don't print the patch filenames" |
07432cef | 11868 | msgstr "不要打印补丁文件名" |
ef317cd5 | 11869 | |
c1ac5258 | 11870 | #: builtin/log.c:1521 |
6937cb4e JX |
11871 | msgid "show progress while generating patches" |
11872 | msgstr "在生成补丁时显示进度" | |
11873 | ||
c1ac5258 | 11874 | #: builtin/log.c:1596 |
a4f16749 JX |
11875 | #, c-format |
11876 | msgid "invalid ident line: %s" | |
11877 | msgstr "包含无效的身份标识:%s" | |
11878 | ||
c1ac5258 JX |
11879 | #: builtin/log.c:1611 |
11880 | msgid "-n and -k are mutually exclusive" | |
11881 | msgstr "-n 和 -k 互斥" | |
c04f5ac3 | 11882 | |
c1ac5258 JX |
11883 | #: builtin/log.c:1613 |
11884 | msgid "--subject-prefix/--rfc and -k are mutually exclusive" | |
11885 | msgstr "--subject-prefix/--rfc 和 -k 互斥" | |
c04f5ac3 | 11886 | |
c1ac5258 | 11887 | #: builtin/log.c:1621 |
c04f5ac3 JX |
11888 | msgid "--name-only does not make sense" |
11889 | msgstr "--name-only 无意义" | |
11890 | ||
c1ac5258 | 11891 | #: builtin/log.c:1623 |
c04f5ac3 JX |
11892 | msgid "--name-status does not make sense" |
11893 | msgstr "--name-status 无意义" | |
11894 | ||
c1ac5258 | 11895 | #: builtin/log.c:1625 |
c04f5ac3 JX |
11896 | msgid "--check does not make sense" |
11897 | msgstr "--check 无意义" | |
11898 | ||
c1ac5258 | 11899 | #: builtin/log.c:1657 |
c04f5ac3 JX |
11900 | msgid "standard output, or directory, which one?" |
11901 | msgstr "标准输出或目录,哪一个?" | |
11902 | ||
c1ac5258 | 11903 | #: builtin/log.c:1659 |
c04f5ac3 JX |
11904 | #, c-format |
11905 | msgid "Could not create directory '%s'" | |
90e6ef53 | 11906 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 11907 | |
c1ac5258 | 11908 | #: builtin/log.c:1752 |
6acbf033 JX |
11909 | #, c-format |
11910 | msgid "unable to read signature file '%s'" | |
11911 | msgstr "无法读取签名文件 '%s'" | |
11912 | ||
c1ac5258 | 11913 | #: builtin/log.c:1785 |
6937cb4e JX |
11914 | msgid "Generating patches" |
11915 | msgstr "生成补丁" | |
11916 | ||
c1ac5258 | 11917 | #: builtin/log.c:1829 |
c04f5ac3 JX |
11918 | msgid "Failed to create output files" |
11919 | msgstr "无法创建输出文件" | |
11920 | ||
c1ac5258 | 11921 | #: builtin/log.c:1880 |
ef317cd5 | 11922 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 11923 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 11924 | |
c1ac5258 | 11925 | #: builtin/log.c:1934 |
c04f5ac3 JX |
11926 | #, c-format |
11927 | msgid "" | |
11928 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 11929 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 11930 | |
c1ac5258 | 11931 | #: builtin/ls-files.c:469 |
814ff314 JX |
11932 | msgid "git ls-files [<options>] [<file>...]" |
11933 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 11934 | |
c1ac5258 | 11935 | #: builtin/ls-files.c:518 |
ef317cd5 | 11936 | msgid "identify the file status with tags" |
07432cef | 11937 | msgstr "用标签标识文件的状态" |
ef317cd5 | 11938 | |
c1ac5258 | 11939 | #: builtin/ls-files.c:520 |
ef317cd5 | 11940 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 11941 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 11942 | |
c1ac5258 | 11943 | #: builtin/ls-files.c:522 |
5809aa05 JX |
11944 | msgid "use lowercase letters for 'fsmonitor clean' files" |
11945 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
11946 | ||
c1ac5258 | 11947 | #: builtin/ls-files.c:524 |
ef317cd5 | 11948 | msgid "show cached files in the output (default)" |
07432cef | 11949 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 11950 | |
c1ac5258 | 11951 | #: builtin/ls-files.c:526 |
ef317cd5 | 11952 | msgid "show deleted files in the output" |
07432cef | 11953 | msgstr "显示已删除的文件" |
ef317cd5 | 11954 | |
c1ac5258 | 11955 | #: builtin/ls-files.c:528 |
ef317cd5 | 11956 | msgid "show modified files in the output" |
07432cef | 11957 | msgstr "显示已修改的文件" |
ef317cd5 | 11958 | |
c1ac5258 | 11959 | #: builtin/ls-files.c:530 |
ef317cd5 | 11960 | msgid "show other files in the output" |
07432cef | 11961 | msgstr "显示其它文件" |
ef317cd5 | 11962 | |
c1ac5258 | 11963 | #: builtin/ls-files.c:532 |
ef317cd5 | 11964 | msgid "show ignored files in the output" |
07432cef | 11965 | msgstr "显示忽略的文件" |
ef317cd5 | 11966 | |
c1ac5258 | 11967 | #: builtin/ls-files.c:535 |
ef317cd5 | 11968 | msgid "show staged contents' object name in the output" |
07432cef | 11969 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 11970 | |
c1ac5258 | 11971 | #: builtin/ls-files.c:537 |
ef317cd5 | 11972 | msgid "show files on the filesystem that need to be removed" |
07432cef | 11973 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 11974 | |
c1ac5258 | 11975 | #: builtin/ls-files.c:539 |
220c313c | 11976 | msgid "show 'other' directories' names only" |
07432cef | 11977 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 11978 | |
c1ac5258 | 11979 | #: builtin/ls-files.c:541 |
276ceeaa JX |
11980 | msgid "show line endings of files" |
11981 | msgstr "显示文件换行符格式" | |
11982 | ||
c1ac5258 | 11983 | #: builtin/ls-files.c:543 |
ef317cd5 | 11984 | msgid "don't show empty directories" |
07432cef | 11985 | msgstr "不显示空目录" |
ef317cd5 | 11986 | |
c1ac5258 | 11987 | #: builtin/ls-files.c:546 |
ef317cd5 | 11988 | msgid "show unmerged files in the output" |
07432cef | 11989 | msgstr "显示未合并的文件" |
ef317cd5 | 11990 | |
c1ac5258 | 11991 | #: builtin/ls-files.c:548 |
ef317cd5 | 11992 | msgid "show resolve-undo information" |
07432cef | 11993 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 11994 | |
c1ac5258 | 11995 | #: builtin/ls-files.c:550 |
ef317cd5 | 11996 | msgid "skip files matching pattern" |
07432cef | 11997 | msgstr "匹配排除文件的模式" |
ef317cd5 | 11998 | |
c1ac5258 | 11999 | #: builtin/ls-files.c:553 |
ef317cd5 | 12000 | msgid "exclude patterns are read from <file>" |
07432cef | 12001 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 12002 | |
c1ac5258 | 12003 | #: builtin/ls-files.c:556 |
ef317cd5 | 12004 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 12005 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 12006 | |
c1ac5258 | 12007 | #: builtin/ls-files.c:558 |
ef317cd5 | 12008 | msgid "add the standard git exclusions" |
07432cef | 12009 | msgstr "添加标准的 git 排除" |
ef317cd5 | 12010 | |
c1ac5258 | 12011 | #: builtin/ls-files.c:561 |
ef317cd5 | 12012 | msgid "make the output relative to the project top directory" |
07432cef | 12013 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 12014 | |
c1ac5258 | 12015 | #: builtin/ls-files.c:564 |
a0b6b246 JX |
12016 | msgid "recurse through submodules" |
12017 | msgstr "在子模组中递归" | |
12018 | ||
c1ac5258 | 12019 | #: builtin/ls-files.c:566 |
ef317cd5 | 12020 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 12021 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 12022 | |
c1ac5258 | 12023 | #: builtin/ls-files.c:567 |
ef317cd5 | 12024 | msgid "tree-ish" |
07432cef | 12025 | msgstr "树或提交" |
ef317cd5 | 12026 | |
c1ac5258 | 12027 | #: builtin/ls-files.c:568 |
ef317cd5 | 12028 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 12029 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 12030 | |
c1ac5258 | 12031 | #: builtin/ls-files.c:570 |
ef317cd5 | 12032 | msgid "show debugging data" |
07432cef | 12033 | msgstr "显示调试数据" |
ef317cd5 | 12034 | |
fd8cb379 | 12035 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
12036 | msgid "" |
12037 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
12038 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
12039 | " [--symref] [<repository> [<refs>...]]" | |
12040 | msgstr "" | |
12041 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
12042 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
12043 | " [--symref] [<仓库> [<引用>...]]" | |
12044 | ||
fd8cb379 | 12045 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
12046 | msgid "do not print remote URL" |
12047 | msgstr "不打印远程 URL" | |
12048 | ||
fd8cb379 | 12049 | #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 |
276ceeaa JX |
12050 | msgid "exec" |
12051 | msgstr "exec" | |
12052 | ||
fd8cb379 | 12053 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 |
276ceeaa JX |
12054 | msgid "path of git-upload-pack on the remote host" |
12055 | msgstr "远程主机上的 git-upload-pack 路径" | |
12056 | ||
fd8cb379 | 12057 | #: builtin/ls-remote.c:65 |
276ceeaa JX |
12058 | msgid "limit to tags" |
12059 | msgstr "仅限于标签" | |
12060 | ||
fd8cb379 | 12061 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
12062 | msgid "limit to heads" |
12063 | msgstr "仅限于分支" | |
12064 | ||
fd8cb379 | 12065 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
12066 | msgid "do not show peeled tags" |
12067 | msgstr "不显示已解析的标签" | |
12068 | ||
fd8cb379 | 12069 | #: builtin/ls-remote.c:69 |
276ceeaa JX |
12070 | msgid "take url.<base>.insteadOf into account" |
12071 | msgstr "参考 url.<base>.insteadOf 设置" | |
12072 | ||
fd8cb379 | 12073 | #: builtin/ls-remote.c:73 |
276ceeaa JX |
12074 | msgid "exit with exit code 2 if no matching refs are found" |
12075 | msgstr "若未找到匹配的引用则以退出码2退出" | |
12076 | ||
fd8cb379 | 12077 | #: builtin/ls-remote.c:76 |
276ceeaa JX |
12078 | msgid "show underlying ref in addition to the object pointed by it" |
12079 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
12080 | ||
c1ac5258 | 12081 | #: builtin/ls-tree.c:30 |
ef317cd5 | 12082 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 12083 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 12084 | |
c1ac5258 | 12085 | #: builtin/ls-tree.c:128 |
ef317cd5 | 12086 | msgid "only show trees" |
07432cef | 12087 | msgstr "只显示树" |
ef317cd5 | 12088 | |
c1ac5258 | 12089 | #: builtin/ls-tree.c:130 |
ef317cd5 | 12090 | msgid "recurse into subtrees" |
07432cef | 12091 | msgstr "递归到子树" |
ef317cd5 | 12092 | |
c1ac5258 | 12093 | #: builtin/ls-tree.c:132 |
ef317cd5 | 12094 | msgid "show trees when recursing" |
07432cef | 12095 | msgstr "当递归时显示树" |
ef317cd5 | 12096 | |
c1ac5258 | 12097 | #: builtin/ls-tree.c:135 |
ef317cd5 | 12098 | msgid "terminate entries with NUL byte" |
4375c10e | 12099 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 12100 | |
c1ac5258 | 12101 | #: builtin/ls-tree.c:136 |
ef317cd5 | 12102 | msgid "include object size" |
07432cef | 12103 | msgstr "包括对象大小" |
ef317cd5 | 12104 | |
c1ac5258 | 12105 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 12106 | msgid "list only filenames" |
07432cef | 12107 | msgstr "只列出文件名" |
ef317cd5 | 12108 | |
c1ac5258 | 12109 | #: builtin/ls-tree.c:143 |
ef317cd5 | 12110 | msgid "use full path names" |
07432cef | 12111 | msgstr "使用文件的全路径" |
ef317cd5 | 12112 | |
c1ac5258 | 12113 | #: builtin/ls-tree.c:145 |
ef317cd5 | 12114 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 12115 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 12116 | |
a4f16749 JX |
12117 | #: builtin/mailsplit.c:241 |
12118 | #, c-format | |
12119 | msgid "empty mbox: '%s'" | |
12120 | msgstr "空的 mbox:'%s'" | |
12121 | ||
fd8cb379 | 12122 | #: builtin/merge.c:51 |
814ff314 JX |
12123 | msgid "git merge [<options>] [<commit>...]" |
12124 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 12125 | |
fd8cb379 | 12126 | #: builtin/merge.c:52 |
ef317cd5 | 12127 | msgid "git merge --abort" |
07432cef | 12128 | msgstr "git merge --abort" |
ef317cd5 | 12129 | |
fd8cb379 | 12130 | #: builtin/merge.c:53 |
1a79b2f1 JX |
12131 | msgid "git merge --continue" |
12132 | msgstr "git merge --continue" | |
12133 | ||
fd8cb379 | 12134 | #: builtin/merge.c:110 |
c04f5ac3 JX |
12135 | msgid "switch `m' requires a value" |
12136 | msgstr "开关 `m' 需要一个值" | |
12137 | ||
c1ac5258 | 12138 | #: builtin/merge.c:176 |
c04f5ac3 JX |
12139 | #, c-format |
12140 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 12141 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 12142 | |
c1ac5258 | 12143 | #: builtin/merge.c:177 |
c04f5ac3 JX |
12144 | #, c-format |
12145 | msgid "Available strategies are:" | |
12146 | msgstr "可用的策略有:" | |
12147 | ||
c1ac5258 | 12148 | #: builtin/merge.c:182 |
c04f5ac3 JX |
12149 | #, c-format |
12150 | msgid "Available custom strategies are:" | |
12151 | msgstr "可用的自定义策略有:" | |
12152 | ||
c1ac5258 | 12153 | #: builtin/merge.c:232 builtin/pull.c:142 |
ef317cd5 | 12154 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 12155 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 12156 | |
c1ac5258 | 12157 | #: builtin/merge.c:235 builtin/pull.c:145 |
ef317cd5 | 12158 | msgid "show a diffstat at the end of the merge" |
07432cef | 12159 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 12160 | |
c1ac5258 | 12161 | #: builtin/merge.c:236 builtin/pull.c:148 |
ef317cd5 | 12162 | msgid "(synonym to --stat)" |
07432cef | 12163 | msgstr "(和 --stat 同义)" |
ef317cd5 | 12164 | |
c1ac5258 | 12165 | #: builtin/merge.c:238 builtin/pull.c:151 |
ef317cd5 | 12166 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 12167 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 12168 | |
c1ac5258 | 12169 | #: builtin/merge.c:241 builtin/pull.c:157 |
ef317cd5 | 12170 | msgid "create a single commit instead of doing a merge" |
07432cef | 12171 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 12172 | |
c1ac5258 | 12173 | #: builtin/merge.c:243 builtin/pull.c:160 |
ef317cd5 | 12174 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 12175 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 12176 | |
c1ac5258 | 12177 | #: builtin/merge.c:245 builtin/pull.c:163 |
ef317cd5 | 12178 | msgid "edit message before committing" |
07432cef | 12179 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 12180 | |
c1ac5258 | 12181 | #: builtin/merge.c:246 |
ef317cd5 | 12182 | msgid "allow fast-forward (default)" |
07432cef | 12183 | msgstr "允许快进(默认)" |
ef317cd5 | 12184 | |
c1ac5258 | 12185 | #: builtin/merge.c:248 builtin/pull.c:169 |
ef317cd5 | 12186 | msgid "abort if fast-forward is not possible" |
07432cef | 12187 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 12188 | |
c1ac5258 | 12189 | #: builtin/merge.c:252 builtin/pull.c:172 |
5c57d762 | 12190 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
12191 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
12192 | ||
c1ac5258 JX |
12193 | #: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 |
12194 | #: builtin/revert.c:110 | |
ef317cd5 | 12195 | msgid "strategy" |
07432cef | 12196 | msgstr "策略" |
ef317cd5 | 12197 | |
c1ac5258 | 12198 | #: builtin/merge.c:254 builtin/pull.c:177 |
ef317cd5 | 12199 | msgid "merge strategy to use" |
07432cef | 12200 | msgstr "要使用的合并策略" |
ef317cd5 | 12201 | |
c1ac5258 | 12202 | #: builtin/merge.c:255 builtin/pull.c:180 |
ef317cd5 | 12203 | msgid "option=value" |
07432cef | 12204 | msgstr "option=value" |
ef317cd5 | 12205 | |
c1ac5258 | 12206 | #: builtin/merge.c:256 builtin/pull.c:181 |
ef317cd5 | 12207 | msgid "option for selected merge strategy" |
07432cef | 12208 | msgstr "所选的合并策略的选项" |
ef317cd5 | 12209 | |
c1ac5258 | 12210 | #: builtin/merge.c:258 |
ef317cd5 | 12211 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 12212 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 12213 | |
c1ac5258 | 12214 | #: builtin/merge.c:265 |
ef317cd5 | 12215 | msgid "abort the current in-progress merge" |
07432cef | 12216 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 12217 | |
c1ac5258 | 12218 | #: builtin/merge.c:267 |
1a79b2f1 JX |
12219 | msgid "continue the current in-progress merge" |
12220 | msgstr "继续当前正在进行的合并" | |
12221 | ||
c1ac5258 | 12222 | #: builtin/merge.c:269 builtin/pull.c:188 |
5b04ee3b JX |
12223 | msgid "allow merging unrelated histories" |
12224 | msgstr "允许合并不相关的历史" | |
12225 | ||
c1ac5258 | 12226 | #: builtin/merge.c:275 |
6937cb4e JX |
12227 | msgid "verify commit-msg hook" |
12228 | msgstr "校验 commit-msg 钩子" | |
12229 | ||
c1ac5258 | 12230 | #: builtin/merge.c:300 |
c04f5ac3 | 12231 | msgid "could not run stash." |
a4f16749 | 12232 | msgstr "不能运行贮藏。" |
c04f5ac3 | 12233 | |
c1ac5258 | 12234 | #: builtin/merge.c:305 |
c04f5ac3 | 12235 | msgid "stash failed" |
a4f16749 | 12236 | msgstr "贮藏失败" |
c04f5ac3 | 12237 | |
c1ac5258 | 12238 | #: builtin/merge.c:310 |
c04f5ac3 JX |
12239 | #, c-format |
12240 | msgid "not a valid object: %s" | |
12241 | msgstr "不是一个有效对象:%s" | |
12242 | ||
c1ac5258 | 12243 | #: builtin/merge.c:332 builtin/merge.c:349 |
c04f5ac3 JX |
12244 | msgid "read-tree failed" |
12245 | msgstr "读取树失败" | |
12246 | ||
90e6ef53 | 12247 | # 译者:注意保持前导空格 |
c1ac5258 | 12248 | #: builtin/merge.c:379 |
c04f5ac3 JX |
12249 | msgid " (nothing to squash)" |
12250 | msgstr " (无可压缩)" | |
12251 | ||
c1ac5258 | 12252 | #: builtin/merge.c:390 |
c04f5ac3 JX |
12253 | #, c-format |
12254 | msgid "Squash commit -- not updating HEAD\n" | |
12255 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
12256 | ||
c1ac5258 | 12257 | #: builtin/merge.c:440 |
c04f5ac3 JX |
12258 | #, c-format |
12259 | msgid "No merge message -- not updating HEAD\n" | |
12260 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
12261 | ||
c1ac5258 | 12262 | #: builtin/merge.c:491 |
c04f5ac3 JX |
12263 | #, c-format |
12264 | msgid "'%s' does not point to a commit" | |
12265 | msgstr "'%s' 没有指向一个提交" | |
12266 | ||
c1ac5258 | 12267 | #: builtin/merge.c:578 |
c04f5ac3 JX |
12268 | #, c-format |
12269 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 12270 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 12271 | |
c1ac5258 | 12272 | #: builtin/merge.c:699 |
c04f5ac3 | 12273 | msgid "Not handling anything other than two heads merge." |
29004bbb | 12274 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 12275 | |
c1ac5258 | 12276 | #: builtin/merge.c:713 |
c04f5ac3 JX |
12277 | #, c-format |
12278 | msgid "Unknown option for merge-recursive: -X%s" | |
12279 | msgstr "merge-recursive 的未知选项:-X%s" | |
12280 | ||
c1ac5258 | 12281 | #: builtin/merge.c:728 |
c04f5ac3 JX |
12282 | #, c-format |
12283 | msgid "unable to write %s" | |
12284 | msgstr "不能写 %s" | |
12285 | ||
c1ac5258 | 12286 | #: builtin/merge.c:779 |
c04f5ac3 JX |
12287 | #, c-format |
12288 | msgid "Could not read from '%s'" | |
12289 | msgstr "不能从 '%s' 读取" | |
12290 | ||
c1ac5258 | 12291 | #: builtin/merge.c:788 |
c04f5ac3 JX |
12292 | #, c-format |
12293 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
12294 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
12295 | ||
c1ac5258 | 12296 | #: builtin/merge.c:794 |
a77c07d9 | 12297 | #, c-format |
c04f5ac3 JX |
12298 | msgid "" |
12299 | "Please enter a commit message to explain why this merge is necessary,\n" | |
12300 | "especially if it merges an updated upstream into a topic branch.\n" | |
12301 | "\n" | |
a77c07d9 | 12302 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
12303 | "the commit.\n" |
12304 | msgstr "" | |
12305 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
12306 | "合并到主题分支。\n" | |
12307 | "\n" | |
a77c07d9 | 12308 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 12309 | |
c1ac5258 | 12310 | #: builtin/merge.c:830 |
c04f5ac3 JX |
12311 | msgid "Empty commit message." |
12312 | msgstr "空提交信息。" | |
12313 | ||
c1ac5258 | 12314 | #: builtin/merge.c:849 |
c04f5ac3 JX |
12315 | #, c-format |
12316 | msgid "Wonderful.\n" | |
12317 | msgstr "太棒了。\n" | |
12318 | ||
c1ac5258 | 12319 | #: builtin/merge.c:902 |
c04f5ac3 JX |
12320 | #, c-format |
12321 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
12322 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
12323 | ||
c1ac5258 | 12324 | #: builtin/merge.c:941 |
c04f5ac3 | 12325 | msgid "No current branch." |
90e6ef53 | 12326 | msgstr "没有当前分支。" |
c04f5ac3 | 12327 | |
c1ac5258 | 12328 | #: builtin/merge.c:943 |
c04f5ac3 | 12329 | msgid "No remote for the current branch." |
160fb2b2 | 12330 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 12331 | |
c1ac5258 | 12332 | #: builtin/merge.c:945 |
c04f5ac3 | 12333 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 12334 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 12335 | |
c1ac5258 | 12336 | #: builtin/merge.c:950 |
170e9899 | 12337 | #, c-format |
2e8451e8 JX |
12338 | msgid "No remote-tracking branch for %s from %s" |
12339 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 12340 | |
c1ac5258 | 12341 | #: builtin/merge.c:1007 |
5c57d762 JX |
12342 | #, c-format |
12343 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 12344 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 12345 | |
c1ac5258 | 12346 | #: builtin/merge.c:1110 |
5c57d762 JX |
12347 | #, c-format |
12348 | msgid "not something we can merge in %s: %s" | |
12349 | msgstr "不能在 %s 中合并:%s" | |
12350 | ||
c1ac5258 | 12351 | #: builtin/merge.c:1144 |
5c57d762 JX |
12352 | msgid "not something we can merge" |
12353 | msgstr "不能合并" | |
12354 | ||
c1ac5258 | 12355 | #: builtin/merge.c:1247 |
1a79b2f1 JX |
12356 | msgid "--abort expects no arguments" |
12357 | msgstr "--abort 不带参数" | |
12358 | ||
c1ac5258 | 12359 | #: builtin/merge.c:1251 |
c04f5ac3 | 12360 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 12361 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 12362 | |
c1ac5258 | 12363 | #: builtin/merge.c:1263 |
1a79b2f1 JX |
12364 | msgid "--continue expects no arguments" |
12365 | msgstr "--continue 不带参数" | |
12366 | ||
c1ac5258 | 12367 | #: builtin/merge.c:1267 |
1a79b2f1 JX |
12368 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
12369 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
12370 | ||
c1ac5258 | 12371 | #: builtin/merge.c:1283 |
c04f5ac3 JX |
12372 | msgid "" |
12373 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 12374 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
12375 | msgstr "" |
12376 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 12377 | "请在合并前先提交您的修改。" |
c04f5ac3 | 12378 | |
c1ac5258 | 12379 | #: builtin/merge.c:1290 |
c04f5ac3 JX |
12380 | msgid "" |
12381 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 12382 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
12383 | msgstr "" |
12384 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 12385 | "请在合并前先提交您的修改。" |
c04f5ac3 | 12386 | |
c1ac5258 | 12387 | #: builtin/merge.c:1293 |
c04f5ac3 JX |
12388 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
12389 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
12390 | ||
c1ac5258 | 12391 | #: builtin/merge.c:1302 |
c04f5ac3 | 12392 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 12393 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 12394 | |
c1ac5258 | 12395 | #: builtin/merge.c:1310 |
c04f5ac3 | 12396 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 12397 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 12398 | |
c1ac5258 | 12399 | #: builtin/merge.c:1327 |
c04f5ac3 JX |
12400 | msgid "Squash commit into empty head not supported yet" |
12401 | msgstr "尚不支持到空分支的压缩提交" | |
12402 | ||
c1ac5258 | 12403 | #: builtin/merge.c:1329 |
c04f5ac3 JX |
12404 | msgid "Non-fast-forward commit does not make sense into an empty head" |
12405 | msgstr "到空分支的非快进式提交没有意义" | |
12406 | ||
c1ac5258 | 12407 | #: builtin/merge.c:1334 |
2e8451e8 JX |
12408 | #, c-format |
12409 | msgid "%s - not something we can merge" | |
12410 | msgstr "%s - 不能被合并" | |
12411 | ||
c1ac5258 | 12412 | #: builtin/merge.c:1336 |
7aea43ff JX |
12413 | msgid "Can merge only exactly one commit into empty head" |
12414 | msgstr "只能将一个提交合并到空分支上" | |
12415 | ||
c1ac5258 | 12416 | #: builtin/merge.c:1370 |
1003b3a5 JX |
12417 | #, c-format |
12418 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
12419 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
12420 | ||
c1ac5258 | 12421 | #: builtin/merge.c:1373 |
1003b3a5 JX |
12422 | #, c-format |
12423 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
12424 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
12425 | ||
c1ac5258 | 12426 | #: builtin/merge.c:1376 |
1003b3a5 JX |
12427 | #, c-format |
12428 | msgid "Commit %s does not have a GPG signature." | |
12429 | msgstr "提交 %s 没有一个 GPG 签名。" | |
12430 | ||
c1ac5258 | 12431 | #: builtin/merge.c:1379 |
1003b3a5 JX |
12432 | #, c-format |
12433 | msgid "Commit %s has a good GPG signature by %s\n" | |
12434 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
12435 | ||
c1ac5258 | 12436 | #: builtin/merge.c:1438 |
5b04ee3b JX |
12437 | msgid "refusing to merge unrelated histories" |
12438 | msgstr "拒绝合并无关的历史" | |
12439 | ||
c1ac5258 | 12440 | #: builtin/merge.c:1447 |
6937cb4e | 12441 | msgid "Already up to date." |
5c57d762 JX |
12442 | msgstr "已经是最新的。" |
12443 | ||
c1ac5258 | 12444 | #: builtin/merge.c:1457 |
c04f5ac3 JX |
12445 | #, c-format |
12446 | msgid "Updating %s..%s\n" | |
12447 | msgstr "更新 %s..%s\n" | |
12448 | ||
c1ac5258 | 12449 | #: builtin/merge.c:1498 |
c04f5ac3 JX |
12450 | #, c-format |
12451 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 12452 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 12453 | |
c1ac5258 | 12454 | #: builtin/merge.c:1505 |
c04f5ac3 JX |
12455 | #, c-format |
12456 | msgid "Nope.\n" | |
12457 | msgstr "无。\n" | |
12458 | ||
c1ac5258 | 12459 | #: builtin/merge.c:1530 |
6937cb4e | 12460 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
12461 | msgstr "已经是最新的。耶!" |
12462 | ||
c1ac5258 | 12463 | #: builtin/merge.c:1536 |
c04f5ac3 | 12464 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 12465 | msgstr "无法快进,终止。" |
c04f5ac3 | 12466 | |
c1ac5258 | 12467 | #: builtin/merge.c:1559 builtin/merge.c:1638 |
c04f5ac3 JX |
12468 | #, c-format |
12469 | msgid "Rewinding the tree to pristine...\n" | |
12470 | msgstr "将树回滚至原始状态...\n" | |
12471 | ||
c1ac5258 | 12472 | #: builtin/merge.c:1563 |
c04f5ac3 JX |
12473 | #, c-format |
12474 | msgid "Trying merge strategy %s...\n" | |
12475 | msgstr "尝试合并策略 %s...\n" | |
12476 | ||
c1ac5258 | 12477 | #: builtin/merge.c:1629 |
c04f5ac3 JX |
12478 | #, c-format |
12479 | msgid "No merge strategy handled the merge.\n" | |
12480 | msgstr "没有合并策略处理此合并。\n" | |
12481 | ||
c1ac5258 | 12482 | #: builtin/merge.c:1631 |
c04f5ac3 JX |
12483 | #, c-format |
12484 | msgid "Merge with strategy %s failed.\n" | |
12485 | msgstr "使用策略 %s 合并失败。\n" | |
12486 | ||
c1ac5258 | 12487 | #: builtin/merge.c:1640 |
c04f5ac3 JX |
12488 | #, c-format |
12489 | msgid "Using the %s to prepare resolving by hand.\n" | |
12490 | msgstr "使用 %s 以准备手工解决。\n" | |
12491 | ||
c1ac5258 | 12492 | #: builtin/merge.c:1652 |
c04f5ac3 JX |
12493 | #, c-format |
12494 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
12495 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
12496 | ||
c1ac5258 | 12497 | #: builtin/merge-base.c:31 |
814ff314 JX |
12498 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
12499 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 12500 | |
c1ac5258 | 12501 | #: builtin/merge-base.c:32 |
814ff314 JX |
12502 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
12503 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 12504 | |
c1ac5258 | 12505 | #: builtin/merge-base.c:33 |
ef317cd5 | 12506 | msgid "git merge-base --independent <commit>..." |
07432cef | 12507 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 12508 | |
c1ac5258 | 12509 | #: builtin/merge-base.c:34 |
ef317cd5 | 12510 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 12511 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 12512 | |
c1ac5258 | 12513 | #: builtin/merge-base.c:35 |
cfff71a9 | 12514 | msgid "git merge-base --fork-point <ref> [<commit>]" |
d9d56b23 | 12515 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 12516 | |
c1ac5258 | 12517 | #: builtin/merge-base.c:221 |
ef317cd5 | 12518 | msgid "output all common ancestors" |
07432cef | 12519 | msgstr "输出所有共同的祖先" |
ef317cd5 | 12520 | |
c1ac5258 | 12521 | #: builtin/merge-base.c:223 |
ef317cd5 | 12522 | msgid "find ancestors for a single n-way merge" |
07432cef | 12523 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 12524 | |
c1ac5258 | 12525 | #: builtin/merge-base.c:225 |
ef317cd5 | 12526 | msgid "list revs not reachable from others" |
07432cef | 12527 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 12528 | |
c1ac5258 | 12529 | #: builtin/merge-base.c:227 |
ef317cd5 | 12530 | msgid "is the first one ancestor of the other?" |
07432cef | 12531 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 12532 | |
c1ac5258 | 12533 | #: builtin/merge-base.c:229 |
cfff71a9 | 12534 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 12535 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 12536 | |
a4f16749 | 12537 | #: builtin/merge-file.c:9 |
ef317cd5 | 12538 | msgid "" |
814ff314 JX |
12539 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
12540 | "<orig-file> <file2>" | |
ef317cd5 | 12541 | msgstr "" |
814ff314 JX |
12542 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
12543 | "件> <文件2>" | |
ef317cd5 | 12544 | |
a4f16749 | 12545 | #: builtin/merge-file.c:33 |
ef317cd5 | 12546 | msgid "send results to standard output" |
07432cef | 12547 | msgstr "将结果发送到标准输出" |
ef317cd5 | 12548 | |
a4f16749 | 12549 | #: builtin/merge-file.c:34 |
ef317cd5 | 12550 | msgid "use a diff3 based merge" |
07432cef | 12551 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 12552 | |
a4f16749 | 12553 | #: builtin/merge-file.c:35 |
ef317cd5 | 12554 | msgid "for conflicts, use our version" |
07432cef | 12555 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 12556 | |
a4f16749 | 12557 | #: builtin/merge-file.c:37 |
ef317cd5 | 12558 | msgid "for conflicts, use their version" |
07432cef | 12559 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 12560 | |
a4f16749 | 12561 | #: builtin/merge-file.c:39 |
ef317cd5 | 12562 | msgid "for conflicts, use a union version" |
07432cef | 12563 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 12564 | |
a4f16749 | 12565 | #: builtin/merge-file.c:42 |
ef317cd5 | 12566 | msgid "for conflicts, use this marker size" |
07432cef | 12567 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 12568 | |
a4f16749 | 12569 | #: builtin/merge-file.c:43 |
ef317cd5 | 12570 | msgid "do not warn about conflicts" |
07432cef | 12571 | msgstr "不要警告冲突" |
ef317cd5 | 12572 | |
a4f16749 | 12573 | #: builtin/merge-file.c:45 |
814ff314 JX |
12574 | msgid "set labels for file1/orig-file/file2" |
12575 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 12576 | |
a0b6b246 JX |
12577 | #: builtin/merge-recursive.c:45 |
12578 | #, c-format | |
12579 | msgid "unknown option %s" | |
12580 | msgstr "未知选项 %s" | |
12581 | ||
12582 | #: builtin/merge-recursive.c:51 | |
12583 | #, c-format | |
12584 | msgid "could not parse object '%s'" | |
12585 | msgstr "不能解析对象 '%s'" | |
12586 | ||
12587 | #: builtin/merge-recursive.c:55 | |
12588 | #, c-format | |
12589 | msgid "cannot handle more than %d base. Ignoring %s." | |
12590 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
12591 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
12592 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
12593 | ||
12594 | #: builtin/merge-recursive.c:63 | |
12595 | msgid "not handling anything other than two heads merge." | |
12596 | msgstr "不能处理两个头合并之外的任何操作。" | |
12597 | ||
12598 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
12599 | #, c-format | |
12600 | msgid "could not resolve ref '%s'" | |
12601 | msgstr "无法解析引用 '%s'" | |
12602 | ||
12603 | #: builtin/merge-recursive.c:77 | |
12604 | #, c-format | |
12605 | msgid "Merging %s with %s\n" | |
12606 | msgstr "合并 %s 和 %s\n" | |
12607 | ||
c1ac5258 | 12608 | #: builtin/mktree.c:66 |
ef317cd5 | 12609 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 12610 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 12611 | |
c1ac5258 | 12612 | #: builtin/mktree.c:154 |
ef317cd5 | 12613 | msgid "input is NUL terminated" |
07432cef | 12614 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 12615 | |
c1ac5258 | 12616 | #: builtin/mktree.c:155 builtin/write-tree.c:25 |
ef317cd5 | 12617 | msgid "allow missing objects" |
07432cef | 12618 | msgstr "允许丢失的对象" |
c04f5ac3 | 12619 | |
c1ac5258 | 12620 | #: builtin/mktree.c:156 |
ef317cd5 | 12621 | msgid "allow creation of more than one tree" |
07432cef | 12622 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 12623 | |
a4f16749 | 12624 | #: builtin/mv.c:17 |
814ff314 JX |
12625 | msgid "git mv [<options>] <source>... <destination>" |
12626 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 12627 | |
fd8cb379 | 12628 | #: builtin/mv.c:82 |
220c313c JX |
12629 | #, c-format |
12630 | msgid "Directory %s is in index and no submodule?" | |
12631 | msgstr "目录 %s 在索引中并且不是子模组?" | |
12632 | ||
c1ac5258 | 12633 | #: builtin/mv.c:84 |
220c313c | 12634 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 12635 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 12636 | |
fd8cb379 | 12637 | #: builtin/mv.c:102 |
220c313c JX |
12638 | #, c-format |
12639 | msgid "%.*s is in index" | |
12640 | msgstr "%.*s 在索引中" | |
12641 | ||
fd8cb379 | 12642 | #: builtin/mv.c:124 |
ef317cd5 | 12643 | msgid "force move/rename even if target exists" |
07432cef | 12644 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 12645 | |
fd8cb379 | 12646 | #: builtin/mv.c:126 |
ef317cd5 | 12647 | msgid "skip move/rename errors" |
07432cef | 12648 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 12649 | |
31e5e17b | 12650 | #: builtin/mv.c:168 |
220c313c JX |
12651 | #, c-format |
12652 | msgid "destination '%s' is not a directory" | |
12653 | msgstr "目标 '%s' 不是一个目录" | |
12654 | ||
31e5e17b | 12655 | #: builtin/mv.c:179 |
c04f5ac3 JX |
12656 | #, c-format |
12657 | msgid "Checking rename of '%s' to '%s'\n" | |
12658 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
12659 | ||
31e5e17b | 12660 | #: builtin/mv.c:183 |
c04f5ac3 JX |
12661 | msgid "bad source" |
12662 | msgstr "坏的源" | |
12663 | ||
31e5e17b | 12664 | #: builtin/mv.c:186 |
c04f5ac3 JX |
12665 | msgid "can not move directory into itself" |
12666 | msgstr "不能将目录移动到自身" | |
12667 | ||
31e5e17b | 12668 | #: builtin/mv.c:189 |
c04f5ac3 JX |
12669 | msgid "cannot move directory over file" |
12670 | msgstr "不能将目录移动到文件" | |
12671 | ||
31e5e17b | 12672 | #: builtin/mv.c:198 |
c04f5ac3 JX |
12673 | msgid "source directory is empty" |
12674 | msgstr "源目录为空" | |
12675 | ||
31e5e17b | 12676 | #: builtin/mv.c:223 |
c04f5ac3 JX |
12677 | msgid "not under version control" |
12678 | msgstr "不在版本控制之下" | |
12679 | ||
31e5e17b | 12680 | #: builtin/mv.c:226 |
c04f5ac3 JX |
12681 | msgid "destination exists" |
12682 | msgstr "目标已存在" | |
12683 | ||
31e5e17b | 12684 | #: builtin/mv.c:234 |
c04f5ac3 JX |
12685 | #, c-format |
12686 | msgid "overwriting '%s'" | |
12687 | msgstr "覆盖 '%s'" | |
12688 | ||
31e5e17b | 12689 | #: builtin/mv.c:237 |
c04f5ac3 JX |
12690 | msgid "Cannot overwrite" |
12691 | msgstr "不能覆盖" | |
12692 | ||
31e5e17b | 12693 | #: builtin/mv.c:240 |
c04f5ac3 JX |
12694 | msgid "multiple sources for the same target" |
12695 | msgstr "同一目标具有多个源" | |
12696 | ||
31e5e17b | 12697 | #: builtin/mv.c:242 |
cfff71a9 JX |
12698 | msgid "destination directory does not exist" |
12699 | msgstr "目标目录不存在" | |
12700 | ||
31e5e17b | 12701 | #: builtin/mv.c:249 |
c04f5ac3 JX |
12702 | #, c-format |
12703 | msgid "%s, source=%s, destination=%s" | |
12704 | msgstr "%s,源=%s,目标=%s" | |
12705 | ||
31e5e17b | 12706 | #: builtin/mv.c:270 |
c04f5ac3 JX |
12707 | #, c-format |
12708 | msgid "Renaming %s to %s\n" | |
12709 | msgstr "重命名 %s 至 %s\n" | |
12710 | ||
c1ac5258 | 12711 | #: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 |
c04f5ac3 JX |
12712 | #, c-format |
12713 | msgid "renaming '%s' failed" | |
12714 | msgstr "重命名 '%s' 失败" | |
12715 | ||
c1ac5258 | 12716 | #: builtin/name-rev.c:355 |
814ff314 JX |
12717 | msgid "git name-rev [<options>] <commit>..." |
12718 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 12719 | |
c1ac5258 | 12720 | #: builtin/name-rev.c:356 |
814ff314 JX |
12721 | msgid "git name-rev [<options>] --all" |
12722 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 12723 | |
c1ac5258 | 12724 | #: builtin/name-rev.c:357 |
814ff314 JX |
12725 | msgid "git name-rev [<options>] --stdin" |
12726 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 12727 | |
c1ac5258 | 12728 | #: builtin/name-rev.c:413 |
ef317cd5 | 12729 | msgid "print only names (no SHA-1)" |
07432cef | 12730 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 12731 | |
c1ac5258 | 12732 | #: builtin/name-rev.c:414 |
ef317cd5 | 12733 | msgid "only use tags to name the commits" |
55a16ee4 | 12734 | msgstr "只使用标签来命名提交" |
ef317cd5 | 12735 | |
c1ac5258 | 12736 | #: builtin/name-rev.c:416 |
ef317cd5 | 12737 | msgid "only use refs matching <pattern>" |
07432cef | 12738 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 12739 | |
c1ac5258 | 12740 | #: builtin/name-rev.c:418 |
87cb7997 JX |
12741 | msgid "ignore refs matching <pattern>" |
12742 | msgstr "忽略和 <模式> 相匹配的引用" | |
12743 | ||
c1ac5258 | 12744 | #: builtin/name-rev.c:420 |
ef317cd5 | 12745 | msgid "list all commits reachable from all refs" |
07432cef | 12746 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 12747 | |
c1ac5258 | 12748 | #: builtin/name-rev.c:421 |
ef317cd5 | 12749 | msgid "read from stdin" |
07432cef | 12750 | msgstr "从标准输入读取" |
ef317cd5 | 12751 | |
c1ac5258 | 12752 | #: builtin/name-rev.c:422 |
90314792 JX |
12753 | msgid "allow to print `undefined` names (default)" |
12754 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 12755 | |
c1ac5258 | 12756 | #: builtin/name-rev.c:428 |
2e8451e8 | 12757 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 12758 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 12759 | |
c1ac5258 | 12760 | #: builtin/notes.c:28 |
814ff314 | 12761 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 12762 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 12763 | |
c1ac5258 | 12764 | #: builtin/notes.c:29 |
ef317cd5 | 12765 | msgid "" |
814ff314 | 12766 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 12767 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 12768 | msgstr "" |
04cb2f28 JX |
12769 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
12770 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 12771 | |
c1ac5258 | 12772 | #: builtin/notes.c:30 |
814ff314 | 12773 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 12774 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 12775 | |
c1ac5258 | 12776 | #: builtin/notes.c:31 |
ef317cd5 | 12777 | msgid "" |
814ff314 | 12778 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 12779 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 12780 | msgstr "" |
04cb2f28 JX |
12781 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
12782 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 12783 | |
c1ac5258 | 12784 | #: builtin/notes.c:32 |
814ff314 | 12785 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 12786 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 12787 | |
c1ac5258 | 12788 | #: builtin/notes.c:33 |
814ff314 | 12789 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 12790 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 12791 | |
c1ac5258 | 12792 | #: builtin/notes.c:34 |
ef317cd5 | 12793 | msgid "" |
814ff314 | 12794 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 12795 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 12796 | |
c1ac5258 | 12797 | #: builtin/notes.c:35 |
ef317cd5 | 12798 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 12799 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 12800 | |
c1ac5258 | 12801 | #: builtin/notes.c:36 |
ef317cd5 | 12802 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 12803 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 12804 | |
c1ac5258 | 12805 | #: builtin/notes.c:37 |
814ff314 | 12806 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 12807 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 12808 | |
c1ac5258 | 12809 | #: builtin/notes.c:38 |
5809aa05 JX |
12810 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
12811 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 12812 | |
c1ac5258 | 12813 | #: builtin/notes.c:39 |
814ff314 | 12814 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 12815 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 12816 | |
c1ac5258 | 12817 | #: builtin/notes.c:44 |
ef317cd5 | 12818 | msgid "git notes [list [<object>]]" |
07432cef | 12819 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 12820 | |
c1ac5258 | 12821 | #: builtin/notes.c:49 |
ef317cd5 | 12822 | msgid "git notes add [<options>] [<object>]" |
07432cef | 12823 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 12824 | |
c1ac5258 | 12825 | #: builtin/notes.c:54 |
ef317cd5 | 12826 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 12827 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 12828 | |
c1ac5258 | 12829 | #: builtin/notes.c:55 |
ef317cd5 | 12830 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 12831 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 12832 | |
c1ac5258 | 12833 | #: builtin/notes.c:60 |
ef317cd5 | 12834 | msgid "git notes append [<options>] [<object>]" |
07432cef | 12835 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 12836 | |
c1ac5258 | 12837 | #: builtin/notes.c:65 |
ef317cd5 | 12838 | msgid "git notes edit [<object>]" |
07432cef | 12839 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 12840 | |
c1ac5258 | 12841 | #: builtin/notes.c:70 |
ef317cd5 | 12842 | msgid "git notes show [<object>]" |
07432cef | 12843 | msgstr "git notes show [<对象>]" |
ef317cd5 | 12844 | |
c1ac5258 | 12845 | #: builtin/notes.c:75 |
814ff314 | 12846 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 12847 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 12848 | |
c1ac5258 | 12849 | #: builtin/notes.c:76 |
ef317cd5 | 12850 | msgid "git notes merge --commit [<options>]" |
07432cef | 12851 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 12852 | |
c1ac5258 | 12853 | #: builtin/notes.c:77 |
ef317cd5 | 12854 | msgid "git notes merge --abort [<options>]" |
07432cef | 12855 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 12856 | |
c1ac5258 | 12857 | #: builtin/notes.c:82 |
ef317cd5 | 12858 | msgid "git notes remove [<object>]" |
07432cef | 12859 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 12860 | |
c1ac5258 | 12861 | #: builtin/notes.c:87 |
ef317cd5 | 12862 | msgid "git notes prune [<options>]" |
07432cef | 12863 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 12864 | |
c1ac5258 | 12865 | #: builtin/notes.c:92 |
ef317cd5 | 12866 | msgid "git notes get-ref" |
07432cef | 12867 | msgstr "git notes get-ref" |
ef317cd5 | 12868 | |
c1ac5258 | 12869 | #: builtin/notes.c:97 |
5c57d762 JX |
12870 | msgid "Write/edit the notes for the following object:" |
12871 | msgstr "为下面的对象写/编辑说明:" | |
12872 | ||
c1ac5258 | 12873 | #: builtin/notes.c:150 |
c04f5ac3 JX |
12874 | #, c-format |
12875 | msgid "unable to start 'show' for object '%s'" | |
12876 | msgstr "不能为对象 '%s' 开始 'show'" | |
12877 | ||
c1ac5258 | 12878 | #: builtin/notes.c:154 |
a77c07d9 JX |
12879 | msgid "could not read 'show' output" |
12880 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 12881 | |
c1ac5258 | 12882 | #: builtin/notes.c:162 |
c04f5ac3 JX |
12883 | #, c-format |
12884 | msgid "failed to finish 'show' for object '%s'" | |
12885 | msgstr "无法为对象 '%s' 完成 'show'" | |
12886 | ||
c1ac5258 | 12887 | #: builtin/notes.c:197 |
a0b6b246 | 12888 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
12889 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
12890 | ||
c1ac5258 | 12891 | #: builtin/notes.c:206 |
c04f5ac3 JX |
12892 | msgid "unable to write note object" |
12893 | msgstr "不能写注解对象" | |
12894 | ||
c1ac5258 | 12895 | #: builtin/notes.c:208 |
c04f5ac3 | 12896 | #, c-format |
a0b6b246 | 12897 | msgid "the note contents have been left in %s" |
220c313c | 12898 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 12899 | |
c1ac5258 | 12900 | #: builtin/notes.c:236 builtin/tag.c:508 |
c04f5ac3 JX |
12901 | #, c-format |
12902 | msgid "cannot read '%s'" | |
12903 | msgstr "不能读取 '%s'" | |
12904 | ||
c1ac5258 | 12905 | #: builtin/notes.c:238 builtin/tag.c:511 |
c04f5ac3 JX |
12906 | #, c-format |
12907 | msgid "could not open or read '%s'" | |
12908 | msgstr "不能打开或读取 '%s'" | |
12909 | ||
c1ac5258 JX |
12910 | #: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 |
12911 | #: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 | |
12912 | #: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 | |
a0b6b246 JX |
12913 | #, c-format |
12914 | msgid "failed to resolve '%s' as a valid ref." | |
12915 | msgstr "无法解析 '%s' 为一个有效引用。" | |
12916 | ||
c1ac5258 | 12917 | #: builtin/notes.c:260 |
c04f5ac3 | 12918 | #, c-format |
a0b6b246 | 12919 | msgid "failed to read object '%s'." |
c1ac5258 | 12920 | msgstr "读取对象 '%s' 失败。" |
c04f5ac3 | 12921 | |
c1ac5258 | 12922 | #: builtin/notes.c:264 |
6c94aba5 | 12923 | #, c-format |
a0b6b246 JX |
12924 | msgid "cannot read note data from non-blob object '%s'." |
12925 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
12926 | ||
c1ac5258 | 12927 | #: builtin/notes.c:304 |
a0b6b246 JX |
12928 | #, c-format |
12929 | msgid "malformed input line: '%s'." | |
fd8cb379 | 12930 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 12931 | |
c1ac5258 | 12932 | #: builtin/notes.c:319 |
a0b6b246 JX |
12933 | #, c-format |
12934 | msgid "failed to copy notes from '%s' to '%s'" | |
12935 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 12936 | |
a4f16749 JX |
12937 | #. TRANSLATORS: the first %s will be replaced by a git |
12938 | #. notes command: 'add', 'merge', 'remove', etc. | |
12939 | #. | |
c1ac5258 | 12940 | #: builtin/notes.c:351 |
a0b6b246 JX |
12941 | #, c-format |
12942 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
12943 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
12944 | ||
c1ac5258 JX |
12945 | #: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 |
12946 | #: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 | |
12947 | #: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 | |
c04f5ac3 JX |
12948 | msgid "too many parameters" |
12949 | msgstr "参数太多" | |
12950 | ||
c1ac5258 | 12951 | #: builtin/notes.c:384 builtin/notes.c:670 |
c04f5ac3 | 12952 | #, c-format |
a0b6b246 | 12953 | msgid "no note found for object %s." |
c04f5ac3 JX |
12954 | msgstr "未发现对象 %s 的注解。" |
12955 | ||
c1ac5258 | 12956 | #: builtin/notes.c:405 builtin/notes.c:568 |
ef317cd5 | 12957 | msgid "note contents as a string" |
07432cef | 12958 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 12959 | |
c1ac5258 | 12960 | #: builtin/notes.c:408 builtin/notes.c:571 |
ef317cd5 | 12961 | msgid "note contents in a file" |
07432cef | 12962 | msgstr "注解内容到一个文件中" |
ef317cd5 | 12963 | |
c1ac5258 | 12964 | #: builtin/notes.c:411 builtin/notes.c:574 |
ef317cd5 | 12965 | msgid "reuse and edit specified note object" |
07432cef | 12966 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 12967 | |
c1ac5258 | 12968 | #: builtin/notes.c:414 builtin/notes.c:577 |
ef317cd5 | 12969 | msgid "reuse specified note object" |
07432cef | 12970 | msgstr "重用指定的注解对象" |
ef317cd5 | 12971 | |
c1ac5258 | 12972 | #: builtin/notes.c:417 builtin/notes.c:580 |
04cb2f28 JX |
12973 | msgid "allow storing empty note" |
12974 | msgstr "允许保存空白注释" | |
12975 | ||
c1ac5258 | 12976 | #: builtin/notes.c:418 builtin/notes.c:489 |
ef317cd5 | 12977 | msgid "replace existing notes" |
07432cef | 12978 | msgstr "替换已存在的注解" |
ef317cd5 | 12979 | |
c1ac5258 | 12980 | #: builtin/notes.c:443 |
c04f5ac3 JX |
12981 | #, c-format |
12982 | msgid "" | |
12983 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
12984 | "existing notes" | |
12985 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
12986 | ||
c1ac5258 | 12987 | #: builtin/notes.c:458 builtin/notes.c:537 |
c04f5ac3 JX |
12988 | #, c-format |
12989 | msgid "Overwriting existing notes for object %s\n" | |
12990 | msgstr "覆盖对象 %s 现存注解\n" | |
12991 | ||
c1ac5258 | 12992 | #: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 |
04cb2f28 JX |
12993 | #, c-format |
12994 | msgid "Removing note for object %s\n" | |
12995 | msgstr "删除对象 %s 的注解\n" | |
12996 | ||
c1ac5258 | 12997 | #: builtin/notes.c:490 |
ef317cd5 | 12998 | msgid "read objects from stdin" |
07432cef | 12999 | msgstr "从标准输入读取对象" |
ef317cd5 | 13000 | |
c1ac5258 | 13001 | #: builtin/notes.c:492 |
ef317cd5 | 13002 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 13003 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 13004 | |
c1ac5258 | 13005 | #: builtin/notes.c:510 |
c04f5ac3 JX |
13006 | msgid "too few parameters" |
13007 | msgstr "参数太少" | |
13008 | ||
c1ac5258 | 13009 | #: builtin/notes.c:531 |
c04f5ac3 JX |
13010 | #, c-format |
13011 | msgid "" | |
13012 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
13013 | "existing notes" | |
13014 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
13015 | ||
c1ac5258 | 13016 | #: builtin/notes.c:543 |
c04f5ac3 | 13017 | #, c-format |
a0b6b246 | 13018 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
13019 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
13020 | ||
c1ac5258 | 13021 | #: builtin/notes.c:595 |
ef317cd5 JX |
13022 | #, c-format |
13023 | msgid "" | |
13024 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
13025 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
13026 | msgstr "" | |
13027 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
13028 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
13029 | ||
c1ac5258 | 13030 | #: builtin/notes.c:690 |
a0b6b246 | 13031 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 13032 | msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 13033 | |
c1ac5258 | 13034 | #: builtin/notes.c:692 |
a0b6b246 | 13035 | msgid "failed to delete ref NOTES_MERGE_REF" |
c1ac5258 | 13036 | msgstr "删除引用 NOTES_MERGE_REF 失败" |
a0b6b246 | 13037 | |
c1ac5258 | 13038 | #: builtin/notes.c:694 |
a0b6b246 | 13039 | msgid "failed to remove 'git notes merge' worktree" |
c1ac5258 | 13040 | msgstr "删除 'git notes merge' 工作区失败" |
a0b6b246 | 13041 | |
c1ac5258 | 13042 | #: builtin/notes.c:714 |
a0b6b246 | 13043 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 13044 | msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 13045 | |
c1ac5258 | 13046 | #: builtin/notes.c:716 |
a0b6b246 JX |
13047 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
13048 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
13049 | ||
c1ac5258 | 13050 | #: builtin/notes.c:718 |
a0b6b246 JX |
13051 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
13052 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
13053 | ||
c1ac5258 | 13054 | #: builtin/notes.c:731 |
a0b6b246 | 13055 | msgid "failed to resolve NOTES_MERGE_REF" |
c1ac5258 | 13056 | msgstr "解析 NOTES_MERGE_REF 失败" |
a0b6b246 | 13057 | |
c1ac5258 | 13058 | #: builtin/notes.c:734 |
a0b6b246 JX |
13059 | msgid "failed to finalize notes merge" |
13060 | msgstr "无法完成注解合并" | |
13061 | ||
c1ac5258 | 13062 | #: builtin/notes.c:760 |
5c57d762 JX |
13063 | #, c-format |
13064 | msgid "unknown notes merge strategy %s" | |
13065 | msgstr "未知的注解合并策略 %s" | |
13066 | ||
c1ac5258 | 13067 | #: builtin/notes.c:776 |
ef317cd5 | 13068 | msgid "General options" |
07432cef | 13069 | msgstr "通用选项" |
ef317cd5 | 13070 | |
c1ac5258 | 13071 | #: builtin/notes.c:778 |
ef317cd5 | 13072 | msgid "Merge options" |
07432cef | 13073 | msgstr "合并选项" |
ef317cd5 | 13074 | |
c1ac5258 | 13075 | #: builtin/notes.c:780 |
ef317cd5 JX |
13076 | msgid "" |
13077 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
13078 | "cat_sort_uniq)" | |
07432cef | 13079 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 13080 | |
c1ac5258 | 13081 | #: builtin/notes.c:782 |
ef317cd5 | 13082 | msgid "Committing unmerged notes" |
07432cef | 13083 | msgstr "提交未合并的注解" |
ef317cd5 | 13084 | |
c1ac5258 | 13085 | #: builtin/notes.c:784 |
ef317cd5 | 13086 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 13087 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 13088 | |
c1ac5258 | 13089 | #: builtin/notes.c:786 |
ef317cd5 | 13090 | msgid "Aborting notes merge resolution" |
07432cef | 13091 | msgstr "中止注解合并的方案" |
ef317cd5 | 13092 | |
c1ac5258 | 13093 | #: builtin/notes.c:788 |
ef317cd5 | 13094 | msgid "abort notes merge" |
07432cef | 13095 | msgstr "中止注解合并" |
ef317cd5 | 13096 | |
c1ac5258 | 13097 | #: builtin/notes.c:799 |
5c57d762 JX |
13098 | msgid "cannot mix --commit, --abort or -s/--strategy" |
13099 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
13100 | ||
c1ac5258 | 13101 | #: builtin/notes.c:804 |
a0b6b246 | 13102 | msgid "must specify a notes ref to merge" |
9a4b694c | 13103 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 13104 | |
c1ac5258 | 13105 | #: builtin/notes.c:828 |
5c57d762 | 13106 | #, c-format |
a0b6b246 | 13107 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
13108 | msgstr "未知的 -s/--strategy:%s" |
13109 | ||
c1ac5258 | 13110 | #: builtin/notes.c:865 |
1b7f4a34 | 13111 | #, c-format |
a0b6b246 JX |
13112 | msgid "a notes merge into %s is already in-progress at %s" |
13113 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 13114 | |
c1ac5258 | 13115 | #: builtin/notes.c:868 |
5c57d762 | 13116 | #, c-format |
a0b6b246 JX |
13117 | msgid "failed to store link to current notes ref (%s)" |
13118 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 13119 | |
c1ac5258 | 13120 | #: builtin/notes.c:870 |
5c57d762 JX |
13121 | #, c-format |
13122 | msgid "" | |
13123 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
13124 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
13125 | "abort'.\n" | |
a0b6b246 JX |
13126 | msgstr "" |
13127 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
13128 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 13129 | |
c1ac5258 | 13130 | #: builtin/notes.c:892 |
ef317cd5 JX |
13131 | #, c-format |
13132 | msgid "Object %s has no note\n" | |
13133 | msgstr "对象 %s 没有注解\n" | |
13134 | ||
c1ac5258 | 13135 | #: builtin/notes.c:904 |
ef317cd5 | 13136 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 13137 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 13138 | |
c1ac5258 | 13139 | #: builtin/notes.c:907 |
ef317cd5 | 13140 | msgid "read object names from the standard input" |
07432cef | 13141 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 13142 | |
c1ac5258 | 13143 | #: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152 |
5c57d762 JX |
13144 | msgid "do not remove, show only" |
13145 | msgstr "不删除,只显示" | |
13146 | ||
c1ac5258 | 13147 | #: builtin/notes.c:946 |
5c57d762 JX |
13148 | msgid "report pruned notes" |
13149 | msgstr "报告清除的注解" | |
13150 | ||
c1ac5258 | 13151 | #: builtin/notes.c:988 |
6c94aba5 | 13152 | msgid "notes-ref" |
07432cef | 13153 | msgstr "注解引用" |
ef317cd5 | 13154 | |
c1ac5258 | 13155 | #: builtin/notes.c:989 |
814ff314 | 13156 | msgid "use notes from <notes-ref>" |
07432cef | 13157 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 13158 | |
c1ac5258 | 13159 | #: builtin/notes.c:1024 |
ef317cd5 | 13160 | #, c-format |
a0b6b246 | 13161 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
13162 | msgstr "未知子命令:%s" |
13163 | ||
fd8cb379 | 13164 | #: builtin/pack-objects.c:48 |
1b7f4a34 JX |
13165 | msgid "" |
13166 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
13167 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 13168 | |
fd8cb379 | 13169 | #: builtin/pack-objects.c:49 |
1b7f4a34 JX |
13170 | msgid "" |
13171 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 13172 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 13173 | |
c1ac5258 | 13174 | #: builtin/pack-objects.c:414 |
ef317cd5 | 13175 | #, c-format |
c1ac5258 JX |
13176 | msgid "bad packed object CRC for %s" |
13177 | msgstr "%s 错的包对象 CRC" | |
13178 | ||
13179 | #: builtin/pack-objects.c:425 | |
13180 | #, c-format | |
13181 | msgid "corrupt packed object for %s" | |
13182 | msgstr "%s 损坏的包对象" | |
13183 | ||
13184 | #: builtin/pack-objects.c:556 | |
13185 | #, c-format | |
13186 | msgid "recursive delta detected for object %s" | |
13187 | msgstr "发现对象 %s 递归 delta" | |
13188 | ||
13189 | #: builtin/pack-objects.c:756 | |
13190 | #, c-format | |
13191 | msgid "ordered %u objects, expected %<PRIu32>" | |
13192 | msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" | |
13193 | ||
13194 | #: builtin/pack-objects.c:769 | |
13195 | #, c-format | |
13196 | msgid "packfile is invalid: %s" | |
13197 | msgstr "无效的包文件:%s" | |
13198 | ||
13199 | #: builtin/pack-objects.c:773 | |
13200 | #, c-format | |
13201 | msgid "unable to open packfile for reuse: %s" | |
13202 | msgstr "无法为重用打开包文件:%s" | |
13203 | ||
13204 | #: builtin/pack-objects.c:777 | |
13205 | msgid "unable to seek in reused packfile" | |
13206 | msgstr "无法在重用的包文件中查找" | |
ef317cd5 | 13207 | |
c1ac5258 JX |
13208 | #: builtin/pack-objects.c:788 |
13209 | msgid "unable to read from reused packfile" | |
13210 | msgstr "无法读取索引文件" | |
13211 | ||
13212 | #: builtin/pack-objects.c:816 | |
5b04ee3b JX |
13213 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
13214 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
13215 | ||
c1ac5258 | 13216 | #: builtin/pack-objects.c:829 |
6c94aba5 JX |
13217 | msgid "Writing objects" |
13218 | msgstr "写入对象中" | |
13219 | ||
c1ac5258 JX |
13220 | #: builtin/pack-objects.c:891 builtin/update-index.c:88 |
13221 | #, c-format | |
13222 | msgid "failed to stat %s" | |
13223 | msgstr "对 %s 调用 stat 失败" | |
13224 | ||
13225 | #: builtin/pack-objects.c:944 | |
13226 | #, c-format | |
13227 | msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" | |
13228 | msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" | |
13229 | ||
13230 | #: builtin/pack-objects.c:1112 | |
6c94aba5 JX |
13231 | msgid "disabling bitmap writing, as some objects are not being packed" |
13232 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
13233 | ||
c1ac5258 JX |
13234 | #: builtin/pack-objects.c:1489 |
13235 | #, c-format | |
13236 | msgid "delta base offset overflow in pack for %s" | |
13237 | msgstr "%s 压缩中 delta 基准偏移越界" | |
13238 | ||
13239 | #: builtin/pack-objects.c:1498 | |
13240 | #, c-format | |
13241 | msgid "delta base offset out of bound for %s" | |
13242 | msgstr "%s 的 delta 基准偏移越界" | |
13243 | ||
13244 | #: builtin/pack-objects.c:1771 | |
fd8cb379 JX |
13245 | msgid "Counting objects" |
13246 | msgstr "对象计数中" | |
13247 | ||
c1ac5258 | 13248 | #: builtin/pack-objects.c:1913 |
fd8cb379 JX |
13249 | #, c-format |
13250 | msgid "unable to get size of %s" | |
13251 | msgstr "不能得到 %s 的大小" | |
13252 | ||
c1ac5258 | 13253 | #: builtin/pack-objects.c:1928 |
fd8cb379 JX |
13254 | #, c-format |
13255 | msgid "unable to parse object header of %s" | |
13256 | msgstr "无法解析对象 %s 头信息" | |
13257 | ||
c1ac5258 JX |
13258 | #: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 |
13259 | #: builtin/pack-objects.c:2021 | |
13260 | #, c-format | |
13261 | msgid "object %s cannot be read" | |
13262 | msgstr "对象 %s 无法读取" | |
13263 | ||
13264 | #: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 | |
13265 | #, c-format | |
13266 | msgid "object %s inconsistent object length (%lu vs %lu)" | |
13267 | msgstr "对象 %s 的长度不一致(%lu vs %lu)" | |
13268 | ||
13269 | #: builtin/pack-objects.c:2035 | |
13270 | msgid "suboptimal pack - out of memory" | |
13271 | msgstr "次优(suboptimal)打包 - 内存不足" | |
13272 | ||
13273 | #: builtin/pack-objects.c:2366 | |
13274 | #, c-format | |
13275 | msgid "Delta compression using up to %d threads" | |
13276 | msgstr "使用 %d 个线程进行压缩" | |
13277 | ||
13278 | #: builtin/pack-objects.c:2502 | |
13279 | #, c-format | |
13280 | msgid "unable to pack objects reachable from tag %s" | |
13281 | msgstr "无法为标签 %s 压缩对象" | |
13282 | ||
13283 | #: builtin/pack-objects.c:2586 | |
6c94aba5 JX |
13284 | msgid "Compressing objects" |
13285 | msgstr "压缩对象中" | |
13286 | ||
c1ac5258 JX |
13287 | #: builtin/pack-objects.c:2592 |
13288 | msgid "inconsistency with delta count" | |
13289 | msgstr "不一致的差异计数" | |
13290 | ||
13291 | # | |
13292 | #: builtin/pack-objects.c:2671 | |
13293 | #, c-format | |
13294 | msgid "" | |
13295 | "expected edge object ID, got garbage:\n" | |
13296 | " %s" | |
13297 | msgstr "" | |
13298 | "预期边界对象(edge object)ID,却得到垃圾数据:\n" | |
13299 | " %s" | |
13300 | ||
13301 | #: builtin/pack-objects.c:2677 | |
13302 | #, c-format | |
13303 | msgid "" | |
13304 | "expected object ID, got garbage:\n" | |
13305 | " %s" | |
13306 | msgstr "" | |
13307 | "预期对象 ID,却得到垃圾数据:\n" | |
13308 | " %s" | |
13309 | ||
13310 | #: builtin/pack-objects.c:2757 | |
5809aa05 JX |
13311 | msgid "invalid value for --missing" |
13312 | msgstr "选项 --missing 的值无效" | |
13313 | ||
c1ac5258 JX |
13314 | #: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924 |
13315 | msgid "cannot open pack index" | |
13316 | msgstr "无法打开包文件索引" | |
13317 | ||
13318 | #: builtin/pack-objects.c:2847 | |
13319 | #, c-format | |
13320 | msgid "loose object at %s could not be examined" | |
13321 | msgstr "无法检查 %s 处的松散对象" | |
13322 | ||
13323 | #: builtin/pack-objects.c:2932 | |
13324 | msgid "unable to force loose object" | |
13325 | msgstr "无法强制松散对象" | |
13326 | ||
13327 | #: builtin/pack-objects.c:3019 | |
13328 | #, c-format | |
13329 | msgid "not a rev '%s'" | |
13330 | msgstr "不是一个版本 '%s'" | |
13331 | ||
13332 | #: builtin/pack-objects.c:3022 | |
13333 | #, c-format | |
13334 | msgid "bad revision '%s'" | |
13335 | msgstr "坏的版本 '%s'" | |
13336 | ||
13337 | #: builtin/pack-objects.c:3042 | |
13338 | msgid "unable to add recent objects" | |
13339 | msgstr "无法添加最近的对象" | |
13340 | ||
13341 | #: builtin/pack-objects.c:3092 | |
ef317cd5 JX |
13342 | #, c-format |
13343 | msgid "unsupported index version %s" | |
13344 | msgstr "不支持的索引版本 %s" | |
13345 | ||
c1ac5258 | 13346 | #: builtin/pack-objects.c:3096 |
ef317cd5 JX |
13347 | #, c-format |
13348 | msgid "bad index version '%s'" | |
13349 | msgstr "坏的索引版本 '%s'" | |
13350 | ||
c1ac5258 | 13351 | #: builtin/pack-objects.c:3127 |
ef317cd5 | 13352 | msgid "do not show progress meter" |
07432cef | 13353 | msgstr "不显示进度表" |
ef317cd5 | 13354 | |
c1ac5258 | 13355 | #: builtin/pack-objects.c:3129 |
ef317cd5 | 13356 | msgid "show progress meter" |
07432cef | 13357 | msgstr "显示进度表" |
ef317cd5 | 13358 | |
c1ac5258 | 13359 | #: builtin/pack-objects.c:3131 |
ef317cd5 | 13360 | msgid "show progress meter during object writing phase" |
07432cef | 13361 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 13362 | |
c1ac5258 | 13363 | #: builtin/pack-objects.c:3134 |
ef317cd5 | 13364 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 13365 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 13366 | |
c1ac5258 JX |
13367 | #: builtin/pack-objects.c:3135 |
13368 | msgid "<version>[,<offset>]" | |
13369 | msgstr "<版本>[,<偏移>]" | |
ef317cd5 | 13370 | |
c1ac5258 | 13371 | #: builtin/pack-objects.c:3136 |
ef317cd5 | 13372 | msgid "write the pack index file in the specified idx format version" |
07432cef | 13373 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 13374 | |
c1ac5258 | 13375 | #: builtin/pack-objects.c:3139 |
ef317cd5 | 13376 | msgid "maximum size of each output pack file" |
07432cef | 13377 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 13378 | |
c1ac5258 | 13379 | #: builtin/pack-objects.c:3141 |
ef317cd5 | 13380 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 13381 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 13382 | |
c1ac5258 | 13383 | #: builtin/pack-objects.c:3143 |
ef317cd5 | 13384 | msgid "ignore packed objects" |
07432cef | 13385 | msgstr "忽略包对象" |
ef317cd5 | 13386 | |
c1ac5258 | 13387 | #: builtin/pack-objects.c:3145 |
ef317cd5 | 13388 | msgid "limit pack window by objects" |
07432cef | 13389 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 13390 | |
c1ac5258 | 13391 | #: builtin/pack-objects.c:3147 |
ef317cd5 | 13392 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 13393 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 13394 | |
c1ac5258 | 13395 | #: builtin/pack-objects.c:3149 |
ef317cd5 | 13396 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 13397 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 13398 | |
c1ac5258 | 13399 | #: builtin/pack-objects.c:3151 |
ef317cd5 | 13400 | msgid "reuse existing deltas" |
07432cef | 13401 | msgstr "重用已存在的 deltas" |
ef317cd5 | 13402 | |
c1ac5258 | 13403 | #: builtin/pack-objects.c:3153 |
ef317cd5 | 13404 | msgid "reuse existing objects" |
07432cef | 13405 | msgstr "重用已存在的对象" |
ef317cd5 | 13406 | |
c1ac5258 | 13407 | #: builtin/pack-objects.c:3155 |
ef317cd5 | 13408 | msgid "use OFS_DELTA objects" |
07432cef | 13409 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 13410 | |
c1ac5258 | 13411 | #: builtin/pack-objects.c:3157 |
ef317cd5 | 13412 | msgid "use threads when searching for best delta matches" |
07432cef | 13413 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 13414 | |
c1ac5258 | 13415 | #: builtin/pack-objects.c:3159 |
ef317cd5 | 13416 | msgid "do not create an empty pack output" |
07432cef | 13417 | msgstr "不创建空的包输出" |
ef317cd5 | 13418 | |
c1ac5258 | 13419 | #: builtin/pack-objects.c:3161 |
ef317cd5 | 13420 | msgid "read revision arguments from standard input" |
d9d56b23 | 13421 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 13422 | |
c1ac5258 | 13423 | #: builtin/pack-objects.c:3163 |
ef317cd5 | 13424 | msgid "limit the objects to those that are not yet packed" |
07432cef | 13425 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 13426 | |
c1ac5258 | 13427 | #: builtin/pack-objects.c:3166 |
ef317cd5 | 13428 | msgid "include objects reachable from any reference" |
07432cef | 13429 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 13430 | |
c1ac5258 | 13431 | #: builtin/pack-objects.c:3169 |
ef317cd5 | 13432 | msgid "include objects referred by reflog entries" |
07432cef | 13433 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 13434 | |
c1ac5258 | 13435 | #: builtin/pack-objects.c:3172 |
220c313c JX |
13436 | msgid "include objects referred to by the index" |
13437 | msgstr "包括被索引引用到的对象" | |
13438 | ||
c1ac5258 | 13439 | #: builtin/pack-objects.c:3175 |
ef317cd5 | 13440 | msgid "output pack to stdout" |
07432cef | 13441 | msgstr "输出包到标准输出" |
ef317cd5 | 13442 | |
c1ac5258 | 13443 | #: builtin/pack-objects.c:3177 |
ef317cd5 | 13444 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 13445 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 13446 | |
c1ac5258 | 13447 | #: builtin/pack-objects.c:3179 |
ef317cd5 | 13448 | msgid "keep unreachable objects" |
07432cef | 13449 | msgstr "维持不可达的对象" |
ef317cd5 | 13450 | |
c1ac5258 | 13451 | #: builtin/pack-objects.c:3181 |
5c57d762 JX |
13452 | msgid "pack loose unreachable objects" |
13453 | msgstr "打包松散的不可达对象" | |
13454 | ||
c1ac5258 | 13455 | #: builtin/pack-objects.c:3183 |
ef317cd5 | 13456 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 13457 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 13458 | |
c1ac5258 | 13459 | #: builtin/pack-objects.c:3186 |
ef317cd5 | 13460 | msgid "create thin packs" |
07432cef | 13461 | msgstr "创建精简包" |
ef317cd5 | 13462 | |
c1ac5258 | 13463 | #: builtin/pack-objects.c:3188 |
04cb2f28 | 13464 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 13465 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 13466 | |
c1ac5258 | 13467 | #: builtin/pack-objects.c:3190 |
ef317cd5 | 13468 | msgid "ignore packs that have companion .keep file" |
07432cef | 13469 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 13470 | |
c1ac5258 | 13471 | #: builtin/pack-objects.c:3192 |
fd8cb379 JX |
13472 | msgid "ignore this pack" |
13473 | msgstr "忽略该 pack" | |
13474 | ||
c1ac5258 | 13475 | #: builtin/pack-objects.c:3194 |
ef317cd5 | 13476 | msgid "pack compression level" |
07432cef | 13477 | msgstr "打包压缩级别" |
ef317cd5 | 13478 | |
c1ac5258 | 13479 | #: builtin/pack-objects.c:3196 |
ef317cd5 | 13480 | msgid "do not hide commits by grafts" |
fd8cb379 | 13481 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 13482 | |
c1ac5258 | 13483 | #: builtin/pack-objects.c:3198 |
6c94aba5 JX |
13484 | msgid "use a bitmap index if available to speed up counting objects" |
13485 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
13486 | ||
c1ac5258 | 13487 | #: builtin/pack-objects.c:3200 |
6c94aba5 JX |
13488 | msgid "write a bitmap index together with the pack index" |
13489 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
13490 | ||
c1ac5258 | 13491 | #: builtin/pack-objects.c:3203 |
5809aa05 JX |
13492 | msgid "handling for missing objects" |
13493 | msgstr "处理丢失的对象" | |
13494 | ||
c1ac5258 | 13495 | #: builtin/pack-objects.c:3206 |
31e5e17b JX |
13496 | msgid "do not pack objects in promisor packfiles" |
13497 | msgstr "不要打包 promisor 包文件中的对象" | |
13498 | ||
c1ac5258 | 13499 | #: builtin/pack-objects.c:3230 |
fd8cb379 JX |
13500 | #, c-format |
13501 | msgid "delta chain depth %d is too deep, forcing %d" | |
13502 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
13503 | ||
c1ac5258 | 13504 | #: builtin/pack-objects.c:3235 |
fd8cb379 JX |
13505 | #, c-format |
13506 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
13507 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 13508 | |
c1ac5258 JX |
13509 | #: builtin/pack-objects.c:3291 |
13510 | msgid "--max-pack-size cannot be used to build a pack for transfer" | |
13511 | msgstr "不能使用 --max-pack-size 来构建传输用的包文件" | |
13512 | ||
13513 | #: builtin/pack-objects.c:3293 | |
13514 | msgid "minimum pack size limit is 1 MiB" | |
13515 | msgstr "最小的包文件大小是 1 MB" | |
13516 | ||
13517 | #: builtin/pack-objects.c:3298 | |
13518 | msgid "--thin cannot be used to build an indexable pack" | |
13519 | msgstr "--thin 不能用于创建一个可索引包" | |
13520 | ||
13521 | #: builtin/pack-objects.c:3301 | |
13522 | msgid "--keep-unreachable and --unpack-unreachable are incompatible" | |
13523 | msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" | |
13524 | ||
13525 | #: builtin/pack-objects.c:3307 | |
13526 | msgid "cannot use --filter without --stdout" | |
13527 | msgstr "不能使用 --filter 而没有 --stdout" | |
13528 | ||
13529 | #: builtin/pack-objects.c:3363 | |
fd8cb379 JX |
13530 | msgid "Enumerating objects" |
13531 | msgstr "枚举对象" | |
13532 | ||
c1ac5258 JX |
13533 | #: builtin/pack-objects.c:3382 |
13534 | #, c-format | |
13535 | msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" | |
13536 | msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)" | |
13537 | ||
fd8cb379 | 13538 | #: builtin/pack-refs.c:7 |
814ff314 JX |
13539 | msgid "git pack-refs [<options>]" |
13540 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 13541 | |
fd8cb379 | 13542 | #: builtin/pack-refs.c:15 |
ef317cd5 | 13543 | msgid "pack everything" |
07432cef | 13544 | msgstr "打包一切" |
c04f5ac3 | 13545 | |
fd8cb379 | 13546 | #: builtin/pack-refs.c:16 |
ef317cd5 | 13547 | msgid "prune loose refs (default)" |
07432cef | 13548 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 13549 | |
c1ac5258 | 13550 | #: builtin/prune-packed.c:9 |
814ff314 JX |
13551 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
13552 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 13553 | |
c1ac5258 | 13554 | #: builtin/prune-packed.c:42 |
6c94aba5 JX |
13555 | msgid "Removing duplicate objects" |
13556 | msgstr "正在删除重复对象" | |
13557 | ||
c1ac5258 | 13558 | #: builtin/prune.c:12 |
5809aa05 JX |
13559 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
13560 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 13561 | |
c1ac5258 | 13562 | #: builtin/prune.c:109 |
1b7f4a34 JX |
13563 | msgid "report pruned objects" |
13564 | msgstr "报告清除的对象" | |
13565 | ||
c1ac5258 | 13566 | #: builtin/prune.c:112 |
1b7f4a34 JX |
13567 | msgid "expire objects older than <time>" |
13568 | msgstr "使早于给定时间的对象过期" | |
13569 | ||
c1ac5258 | 13570 | #: builtin/prune.c:114 |
31e5e17b JX |
13571 | msgid "limit traversal to objects outside promisor packfiles" |
13572 | msgstr "限制遍历 promisor 包以外的对象" | |
13573 | ||
c1ac5258 | 13574 | #: builtin/prune.c:128 |
94550ed3 JX |
13575 | msgid "cannot prune in a precious-objects repo" |
13576 | msgstr "不能在珍品仓库中执行清理操作" | |
13577 | ||
fd8cb379 | 13578 | #: builtin/pull.c:59 builtin/pull.c:61 |
a0b6b246 JX |
13579 | #, c-format |
13580 | msgid "Invalid value for %s: %s" | |
13581 | msgstr "%s 的值无效:%s" | |
13582 | ||
fd8cb379 | 13583 | #: builtin/pull.c:81 |
94550ed3 | 13584 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
13585 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
13586 | ||
fd8cb379 | 13587 | #: builtin/pull.c:132 |
a4f16749 JX |
13588 | msgid "control for recursive fetching of submodules" |
13589 | msgstr "控制子模组的递归获取" | |
13590 | ||
fd8cb379 | 13591 | #: builtin/pull.c:136 |
1b7f4a34 JX |
13592 | msgid "Options related to merging" |
13593 | msgstr "和合并相关的选项" | |
13594 | ||
fd8cb379 | 13595 | #: builtin/pull.c:139 |
1b7f4a34 JX |
13596 | msgid "incorporate changes by rebasing rather than merging" |
13597 | msgstr "使用变基操作取代合并操作以合入修改" | |
13598 | ||
c1ac5258 | 13599 | #: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 |
1b7f4a34 JX |
13600 | msgid "allow fast-forward" |
13601 | msgstr "允许快进式" | |
13602 | ||
fd8cb379 | 13603 | #: builtin/pull.c:175 |
5b04ee3b | 13604 | msgid "automatically stash/stash pop before and after rebase" |
554e8501 | 13605 | msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
5b04ee3b | 13606 | |
fd8cb379 | 13607 | #: builtin/pull.c:191 |
1b7f4a34 JX |
13608 | msgid "Options related to fetching" |
13609 | msgstr "和获取相关的参数" | |
13610 | ||
fd8cb379 | 13611 | #: builtin/pull.c:209 |
276ceeaa JX |
13612 | msgid "number of submodules pulled in parallel" |
13613 | msgstr "并发拉取的子模组的数量" | |
13614 | ||
fd8cb379 | 13615 | #: builtin/pull.c:304 |
1b7f4a34 JX |
13616 | #, c-format |
13617 | msgid "Invalid value for pull.ff: %s" | |
13618 | msgstr "pull.ff 的取值无效:%s" | |
13619 | ||
fd8cb379 | 13620 | #: builtin/pull.c:420 |
1b7f4a34 JX |
13621 | msgid "" |
13622 | "There is no candidate for rebasing against among the refs that you just " | |
13623 | "fetched." | |
13624 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
13625 | ||
fd8cb379 | 13626 | #: builtin/pull.c:422 |
1b7f4a34 JX |
13627 | msgid "" |
13628 | "There are no candidates for merging among the refs that you just fetched." | |
13629 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
13630 | ||
fd8cb379 | 13631 | #: builtin/pull.c:423 |
1b7f4a34 JX |
13632 | msgid "" |
13633 | "Generally this means that you provided a wildcard refspec which had no\n" | |
13634 | "matches on the remote end." | |
13635 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
13636 | ||
fd8cb379 | 13637 | #: builtin/pull.c:426 |
1b7f4a34 JX |
13638 | #, c-format |
13639 | msgid "" | |
13640 | "You asked to pull from the remote '%s', but did not specify\n" | |
13641 | "a branch. Because this is not the default configured remote\n" | |
13642 | "for your current branch, you must specify a branch on the command line." | |
13643 | msgstr "" | |
13644 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
13645 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
13646 | ||
fd8cb379 | 13647 | #: builtin/pull.c:431 git-parse-remote.sh:73 |
1b7f4a34 JX |
13648 | msgid "You are not currently on a branch." |
13649 | msgstr "您当前不在一个分支上。" | |
13650 | ||
fd8cb379 | 13651 | #: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 |
1b7f4a34 JX |
13652 | msgid "Please specify which branch you want to rebase against." |
13653 | msgstr "请指定您要变基到哪一个分支。" | |
13654 | ||
fd8cb379 | 13655 | #: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 |
1b7f4a34 JX |
13656 | msgid "Please specify which branch you want to merge with." |
13657 | msgstr "请指定您要合并哪一个分支。" | |
13658 | ||
fd8cb379 | 13659 | #: builtin/pull.c:436 builtin/pull.c:451 |
1b7f4a34 JX |
13660 | msgid "See git-pull(1) for details." |
13661 | msgstr "详见 git-pull(1)。" | |
13662 | ||
fd8cb379 | 13663 | #: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 |
5b04ee3b JX |
13664 | #: git-parse-remote.sh:64 |
13665 | msgid "<remote>" | |
13666 | msgstr "<远程>" | |
13667 | ||
c1ac5258 | 13668 | #: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 |
5b04ee3b JX |
13669 | #: git-parse-remote.sh:65 |
13670 | msgid "<branch>" | |
13671 | msgstr "<分支>" | |
13672 | ||
fd8cb379 | 13673 | #: builtin/pull.c:446 git-parse-remote.sh:75 |
1b7f4a34 JX |
13674 | msgid "There is no tracking information for the current branch." |
13675 | msgstr "当前分支没有跟踪信息。" | |
13676 | ||
fd8cb379 | 13677 | #: builtin/pull.c:455 git-parse-remote.sh:95 |
1b7f4a34 | 13678 | msgid "" |
5b04ee3b JX |
13679 | "If you wish to set tracking information for this branch you can do so with:" |
13680 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 13681 | |
fd8cb379 | 13682 | #: builtin/pull.c:460 |
1b7f4a34 JX |
13683 | #, c-format |
13684 | msgid "" | |
13685 | "Your configuration specifies to merge with the ref '%s'\n" | |
13686 | "from the remote, but no such ref was fetched." | |
13687 | msgstr "" | |
13688 | "您的配置中指定要合并远程的引用 '%s',\n" | |
13689 | "但是没有获取到这个引用。" | |
7ac1c0ad | 13690 | |
c1ac5258 | 13691 | #: builtin/pull.c:829 |
5c57d762 JX |
13692 | msgid "ignoring --verify-signatures for rebase" |
13693 | msgstr "为变基操作忽略 --verify-signatures" | |
13694 | ||
c1ac5258 | 13695 | #: builtin/pull.c:877 |
5b04ee3b JX |
13696 | msgid "--[no-]autostash option is only valid with --rebase." |
13697 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
13698 | ||
c1ac5258 | 13699 | #: builtin/pull.c:885 |
1b7f4a34 JX |
13700 | msgid "Updating an unborn branch with changes added to the index." |
13701 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
13702 | ||
c1ac5258 | 13703 | #: builtin/pull.c:888 |
a0b6b246 JX |
13704 | msgid "pull with rebase" |
13705 | msgstr "变基式拉取" | |
13706 | ||
c1ac5258 | 13707 | #: builtin/pull.c:889 |
a0b6b246 | 13708 | msgid "please commit or stash them." |
554e8501 | 13709 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 13710 | |
c1ac5258 | 13711 | #: builtin/pull.c:914 |
1b7f4a34 JX |
13712 | #, c-format |
13713 | msgid "" | |
13714 | "fetch updated the current branch head.\n" | |
13715 | "fast-forwarding your working tree from\n" | |
13716 | "commit %s." | |
13717 | msgstr "" | |
13718 | "fetch 更新了当前的分支。快进您的工作区\n" | |
13719 | "至提交 %s。" | |
ef317cd5 | 13720 | |
c1ac5258 | 13721 | #: builtin/pull.c:919 |
1b7f4a34 JX |
13722 | #, c-format |
13723 | msgid "" | |
13724 | "Cannot fast-forward your working tree.\n" | |
13725 | "After making sure that you saved anything precious from\n" | |
13726 | "$ git diff %s\n" | |
13727 | "output, run\n" | |
13728 | "$ git reset --hard\n" | |
13729 | "to recover." | |
13730 | msgstr "" | |
13731 | "您当前的工作区无法执行快进操作。\n" | |
13732 | "首先执行如下命令:\n" | |
13733 | "$ git diff %s\n" | |
13734 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
13735 | "$ git reset --hard\n" | |
13736 | "恢复之前的状态。" | |
13737 | ||
c1ac5258 | 13738 | #: builtin/pull.c:934 |
1b7f4a34 JX |
13739 | msgid "Cannot merge multiple branches into empty head." |
13740 | msgstr "无法将多个分支合并到空分支。" | |
13741 | ||
c1ac5258 | 13742 | #: builtin/pull.c:938 |
1b7f4a34 JX |
13743 | msgid "Cannot rebase onto multiple branches." |
13744 | msgstr "无法变基到多个分支。" | |
13745 | ||
c1ac5258 | 13746 | #: builtin/pull.c:945 |
a4f16749 JX |
13747 | msgid "cannot rebase with locally recorded submodule modifications" |
13748 | msgstr "本地子模组中有修改,无法变基" | |
13749 | ||
fd8cb379 | 13750 | #: builtin/push.c:19 |
ef317cd5 | 13751 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 13752 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 13753 | |
fd8cb379 | 13754 | #: builtin/push.c:111 |
c04f5ac3 | 13755 | msgid "tag shorthand without <tag>" |
55a16ee4 | 13756 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 13757 | |
fd8cb379 | 13758 | #: builtin/push.c:121 |
c04f5ac3 | 13759 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 13760 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 13761 | |
fd8cb379 | 13762 | #: builtin/push.c:165 |
8ada9598 JX |
13763 | msgid "" |
13764 | "\n" | |
13765 | "To choose either option permanently, see push.default in 'git help config'." | |
13766 | msgstr "" | |
81809b99 JX |
13767 | "\n" |
13768 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 13769 | |
fd8cb379 | 13770 | #: builtin/push.c:168 |
8ada9598 JX |
13771 | #, c-format |
13772 | msgid "" | |
13773 | "The upstream branch of your current branch does not match\n" | |
13774 | "the name of your current branch. To push to the upstream branch\n" | |
13775 | "on the remote, use\n" | |
13776 | "\n" | |
13777 | " git push %s HEAD:%s\n" | |
13778 | "\n" | |
13779 | "To push to the branch of the same name on the remote, use\n" | |
13780 | "\n" | |
13781 | " git push %s %s\n" | |
13782 | "%s" | |
13783 | msgstr "" | |
81809b99 JX |
13784 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
13785 | "上游分支,使用\n" | |
13786 | "\n" | |
13787 | " git push %s HEAD:%s\n" | |
13788 | "\n" | |
13789 | "为推送至远程同名分支,使用\n" | |
13790 | "\n" | |
13791 | " git push %s %s\n" | |
13792 | "%s" | |
8ada9598 | 13793 | |
fd8cb379 | 13794 | #: builtin/push.c:183 |
c04f5ac3 JX |
13795 | #, c-format |
13796 | msgid "" | |
13797 | "You are not currently on a branch.\n" | |
13798 | "To push the history leading to the current (detached HEAD)\n" | |
13799 | "state now, use\n" | |
13800 | "\n" | |
13801 | " git push %s HEAD:<name-of-remote-branch>\n" | |
13802 | msgstr "" | |
13803 | "您当前不在一个分支上。\n" | |
90e6ef53 | 13804 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 13805 | "\n" |
d9d56b23 | 13806 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 13807 | |
fd8cb379 | 13808 | #: builtin/push.c:197 |
c04f5ac3 JX |
13809 | #, c-format |
13810 | msgid "" | |
13811 | "The current branch %s has no upstream branch.\n" | |
13812 | "To push the current branch and set the remote as upstream, use\n" | |
13813 | "\n" | |
13814 | " git push --set-upstream %s %s\n" | |
13815 | msgstr "" | |
13816 | "当前分支 %s 没有对应的上游分支。\n" | |
13817 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
13818 | "\n" | |
13819 | " git push --set-upstream %s %s\n" | |
13820 | ||
fd8cb379 | 13821 | #: builtin/push.c:205 |
c04f5ac3 JX |
13822 | #, c-format |
13823 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
13824 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
13825 | ||
fd8cb379 | 13826 | #: builtin/push.c:208 |
73a60cd2 JX |
13827 | #, c-format |
13828 | msgid "" | |
13829 | "You are pushing to remote '%s', which is not the upstream of\n" | |
13830 | "your current branch '%s', without telling me what to push\n" | |
13831 | "to update which remote branch." | |
13832 | msgstr "" | |
13833 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
13834 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
13835 | ||
fd8cb379 | 13836 | #: builtin/push.c:267 |
c04f5ac3 JX |
13837 | msgid "" |
13838 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 13839 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 13840 | |
fd8cb379 | 13841 | #: builtin/push.c:274 |
170e9899 JX |
13842 | msgid "" |
13843 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
13844 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
13845 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
13846 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
13847 | msgstr "" | |
eff6d3a9 | 13848 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 13849 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 13850 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 13851 | |
fd8cb379 | 13852 | #: builtin/push.c:280 |
170e9899 JX |
13853 | msgid "" |
13854 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
13855 | "counterpart. Check out this branch and integrate the remote changes\n" |
13856 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
13857 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
13858 | msgstr "" | |
eff6d3a9 | 13859 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 13860 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 13861 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 13862 | |
fd8cb379 | 13863 | #: builtin/push.c:286 |
07432cef | 13864 | msgid "" |
a77c07d9 JX |
13865 | "Updates were rejected because the remote contains work that you do\n" |
13866 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
13867 | "to the same ref. You may want to first integrate the remote changes\n" |
13868 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
13869 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
13870 | msgstr "" | |
160fb2b2 JX |
13871 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
13872 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 13873 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
13874 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
13875 | ||
fd8cb379 | 13876 | #: builtin/push.c:293 |
a77c07d9 | 13877 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 13878 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 13879 | |
fd8cb379 | 13880 | #: builtin/push.c:296 |
a77c07d9 JX |
13881 | msgid "" |
13882 | "You cannot update a remote ref that points at a non-commit object,\n" | |
13883 | "or update a remote ref to make it point at a non-commit object,\n" | |
13884 | "without using the '--force' option.\n" | |
13885 | msgstr "" | |
13886 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
13887 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 13888 | |
fd8cb379 | 13889 | #: builtin/push.c:357 |
c04f5ac3 JX |
13890 | #, c-format |
13891 | msgid "Pushing to %s\n" | |
13892 | msgstr "推送到 %s\n" | |
13893 | ||
fd8cb379 | 13894 | #: builtin/push.c:361 |
c04f5ac3 JX |
13895 | #, c-format |
13896 | msgid "failed to push some refs to '%s'" | |
c1ac5258 | 13897 | msgstr "推送一些引用到 '%s' 失败" |
c04f5ac3 | 13898 | |
fd8cb379 | 13899 | #: builtin/push.c:395 |
c04f5ac3 JX |
13900 | #, c-format |
13901 | msgid "bad repository '%s'" | |
160fb2b2 | 13902 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 13903 | |
fd8cb379 | 13904 | #: builtin/push.c:396 |
c04f5ac3 JX |
13905 | msgid "" |
13906 | "No configured push destination.\n" | |
13907 | "Either specify the URL from the command-line or configure a remote " | |
13908 | "repository using\n" | |
13909 | "\n" | |
13910 | " git remote add <name> <url>\n" | |
13911 | "\n" | |
13912 | "and then push using the remote name\n" | |
13913 | "\n" | |
13914 | " git push <name>\n" | |
13915 | msgstr "" | |
90e6ef53 | 13916 | "没有配置推送目标。\n" |
4375c10e | 13917 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 13918 | "\n" |
d9d56b23 | 13919 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 13920 | "\n" |
160fb2b2 | 13921 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 13922 | "\n" |
d9d56b23 | 13923 | " git push <名称>\n" |
c04f5ac3 | 13924 | |
fd8cb379 | 13925 | #: builtin/push.c:551 |
ef317cd5 | 13926 | msgid "repository" |
160fb2b2 | 13927 | msgstr "仓库" |
ef317cd5 | 13928 | |
fd8cb379 | 13929 | #: builtin/push.c:552 builtin/send-pack.c:164 |
ef317cd5 | 13930 | msgid "push all refs" |
07432cef | 13931 | msgstr "推送所有引用" |
ef317cd5 | 13932 | |
fd8cb379 | 13933 | #: builtin/push.c:553 builtin/send-pack.c:166 |
ef317cd5 | 13934 | msgid "mirror all refs" |
07432cef | 13935 | msgstr "镜像所有引用" |
ef317cd5 | 13936 | |
fd8cb379 | 13937 | #: builtin/push.c:555 |
ef317cd5 | 13938 | msgid "delete refs" |
07432cef | 13939 | msgstr "删除引用" |
ef317cd5 | 13940 | |
fd8cb379 | 13941 | #: builtin/push.c:556 |
ef317cd5 | 13942 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 13943 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 13944 | |
fd8cb379 | 13945 | #: builtin/push.c:559 builtin/send-pack.c:167 |
ef317cd5 JX |
13946 | msgid "force updates" |
13947 | msgstr "强制更新" | |
13948 | ||
fd8cb379 | 13949 | #: builtin/push.c:561 builtin/send-pack.c:181 |
c1ac5258 JX |
13950 | msgid "<refname>:<expect>" |
13951 | msgstr "<引用名>:<期望值>" | |
90314792 | 13952 | |
fd8cb379 | 13953 | #: builtin/push.c:562 builtin/send-pack.c:182 |
90314792 JX |
13954 | msgid "require old value of ref to be at this value" |
13955 | msgstr "要求引用旧的取值为设定值" | |
13956 | ||
fd8cb379 | 13957 | #: builtin/push.c:565 |
ef317cd5 | 13958 | msgid "control recursive pushing of submodules" |
07432cef | 13959 | msgstr "控制子模组的递归推送" |
ef317cd5 | 13960 | |
fd8cb379 | 13961 | #: builtin/push.c:567 builtin/send-pack.c:175 |
ef317cd5 | 13962 | msgid "use thin pack" |
07432cef | 13963 | msgstr "使用精简打包" |
ef317cd5 | 13964 | |
fd8cb379 JX |
13965 | #: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 |
13966 | #: builtin/send-pack.c:162 | |
ef317cd5 | 13967 | msgid "receive pack program" |
07432cef | 13968 | msgstr "接收包程序" |
ef317cd5 | 13969 | |
fd8cb379 | 13970 | #: builtin/push.c:570 |
ef317cd5 | 13971 | msgid "set upstream for git pull/status" |
07432cef | 13972 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 13973 | |
fd8cb379 | 13974 | #: builtin/push.c:573 |
ef317cd5 | 13975 | msgid "prune locally removed refs" |
07432cef | 13976 | msgstr "清除本地删除的引用" |
ef317cd5 | 13977 | |
fd8cb379 | 13978 | #: builtin/push.c:575 |
a77c07d9 JX |
13979 | msgid "bypass pre-push hook" |
13980 | msgstr "绕过 pre-push 钩子" | |
13981 | ||
fd8cb379 | 13982 | #: builtin/push.c:576 |
1003b3a5 | 13983 | msgid "push missing but relevant tags" |
55a16ee4 | 13984 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 13985 | |
fd8cb379 | 13986 | #: builtin/push.c:579 builtin/send-pack.c:169 |
220c313c JX |
13987 | msgid "GPG sign the push" |
13988 | msgstr "用 GPG 为推送签名" | |
13989 | ||
fd8cb379 | 13990 | #: builtin/push.c:581 builtin/send-pack.c:176 |
814ff314 JX |
13991 | msgid "request atomic transaction on remote side" |
13992 | msgstr "需要远端支持原子事务" | |
13993 | ||
fd8cb379 | 13994 | #: builtin/push.c:599 |
c04f5ac3 JX |
13995 | msgid "--delete is incompatible with --all, --mirror and --tags" |
13996 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
13997 | ||
fd8cb379 | 13998 | #: builtin/push.c:601 |
c04f5ac3 JX |
13999 | msgid "--delete doesn't make sense without any refs" |
14000 | msgstr "--delete 未接任何引用没有意义" | |
14001 | ||
5809aa05 | 14002 | #: builtin/push.c:604 |
fd8cb379 JX |
14003 | msgid "--all and --tags are incompatible" |
14004 | msgstr "--all 和 --tags 不兼容" | |
14005 | ||
14006 | #: builtin/push.c:606 | |
14007 | msgid "--all can't be combined with refspecs" | |
14008 | msgstr "--all 不能和引用规格同时使用" | |
14009 | ||
14010 | #: builtin/push.c:610 | |
14011 | msgid "--mirror and --tags are incompatible" | |
14012 | msgstr "--mirror 和 --tags 不兼容" | |
14013 | ||
14014 | #: builtin/push.c:612 | |
14015 | msgid "--mirror can't be combined with refspecs" | |
14016 | msgstr "--mirror 不能和引用规格同时使用" | |
14017 | ||
14018 | #: builtin/push.c:615 | |
14019 | msgid "--all and --mirror are incompatible" | |
14020 | msgstr "--all 和 --mirror 不兼容" | |
14021 | ||
14022 | #: builtin/push.c:634 | |
5c57d762 JX |
14023 | msgid "push options must not have new line characters" |
14024 | msgstr "推送选项不能有换行符" | |
14025 | ||
c1ac5258 JX |
14026 | #: builtin/range-diff.c:8 |
14027 | msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
14028 | msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
14029 | ||
14030 | #: builtin/range-diff.c:9 | |
14031 | msgid "git range-diff [<options>] <old-tip>...<new-tip>" | |
14032 | msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" | |
14033 | ||
14034 | #: builtin/range-diff.c:10 | |
14035 | msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" | |
14036 | msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" | |
14037 | ||
14038 | #: builtin/range-diff.c:26 | |
14039 | msgid "Percentage by which creation is weighted" | |
14040 | msgstr "创建权重的百分比" | |
14041 | ||
14042 | #: builtin/range-diff.c:28 | |
14043 | msgid "use simple diff colors" | |
14044 | msgstr "使用简单差异颜色" | |
14045 | ||
14046 | #: builtin/range-diff.c:75 builtin/range-diff.c:79 | |
14047 | #, c-format | |
14048 | msgid "no .. in range: '%s'" | |
14049 | msgstr "没有在范围中使用 ..:'%s'" | |
14050 | ||
14051 | #: builtin/range-diff.c:89 | |
14052 | msgid "single arg format must be symmetric range" | |
14053 | msgstr "单个参数格式必须是对称范围(即包含...)" | |
14054 | ||
14055 | #: builtin/range-diff.c:104 | |
14056 | msgid "need two commit ranges" | |
14057 | msgstr "需要两个提交范围" | |
14058 | ||
87cb7997 | 14059 | #: builtin/read-tree.c:40 |
ef317cd5 | 14060 | msgid "" |
1b7f4a34 | 14061 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
14062 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
14063 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
14064 | msgstr "" | |
1b7f4a34 | 14065 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 14066 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 14067 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 14068 | |
fd8cb379 | 14069 | #: builtin/read-tree.c:120 |
ef317cd5 | 14070 | msgid "write resulting index to <file>" |
d9d56b23 | 14071 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 14072 | |
fd8cb379 | 14073 | #: builtin/read-tree.c:123 |
ef317cd5 | 14074 | msgid "only empty the index" |
07432cef | 14075 | msgstr "只是清空索引" |
ef317cd5 | 14076 | |
fd8cb379 | 14077 | #: builtin/read-tree.c:125 |
ef317cd5 | 14078 | msgid "Merging" |
07432cef | 14079 | msgstr "合并" |
ef317cd5 | 14080 | |
fd8cb379 | 14081 | #: builtin/read-tree.c:127 |
ef317cd5 | 14082 | msgid "perform a merge in addition to a read" |
07432cef | 14083 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 14084 | |
fd8cb379 | 14085 | #: builtin/read-tree.c:129 |
ef317cd5 | 14086 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 14087 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 14088 | |
fd8cb379 | 14089 | #: builtin/read-tree.c:131 |
ef317cd5 | 14090 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 14091 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 14092 | |
fd8cb379 | 14093 | #: builtin/read-tree.c:133 |
ef317cd5 | 14094 | msgid "same as -m, but discard unmerged entries" |
07432cef | 14095 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 14096 | |
fd8cb379 | 14097 | #: builtin/read-tree.c:134 |
ef317cd5 | 14098 | msgid "<subdirectory>/" |
07432cef | 14099 | msgstr "<子目录>/" |
ef317cd5 | 14100 | |
fd8cb379 | 14101 | #: builtin/read-tree.c:135 |
ef317cd5 | 14102 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 14103 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 14104 | |
fd8cb379 | 14105 | #: builtin/read-tree.c:138 |
ef317cd5 | 14106 | msgid "update working tree with merge result" |
07432cef | 14107 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 14108 | |
fd8cb379 | 14109 | #: builtin/read-tree.c:140 |
ef317cd5 | 14110 | msgid "gitignore" |
07432cef | 14111 | msgstr "gitignore" |
ef317cd5 | 14112 | |
fd8cb379 | 14113 | #: builtin/read-tree.c:141 |
ef317cd5 | 14114 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 14115 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 14116 | |
fd8cb379 | 14117 | #: builtin/read-tree.c:144 |
ef317cd5 | 14118 | msgid "don't check the working tree after merging" |
07432cef | 14119 | msgstr "合并后不检查工作区" |
ef317cd5 | 14120 | |
fd8cb379 | 14121 | #: builtin/read-tree.c:145 |
ef317cd5 | 14122 | msgid "don't update the index or the work tree" |
07432cef | 14123 | msgstr "不更新索引区和工作区" |
ef317cd5 | 14124 | |
fd8cb379 | 14125 | #: builtin/read-tree.c:147 |
ef317cd5 | 14126 | msgid "skip applying sparse checkout filter" |
07432cef | 14127 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 14128 | |
fd8cb379 | 14129 | #: builtin/read-tree.c:149 |
ef317cd5 | 14130 | msgid "debug unpack-trees" |
07432cef | 14131 | msgstr "调试 unpack-trees" |
ef317cd5 | 14132 | |
a4f16749 | 14133 | #: builtin/rebase--helper.c:8 |
87cb7997 JX |
14134 | msgid "git rebase--helper [<options>]" |
14135 | msgstr "git rebase--helper [<选项>]" | |
14136 | ||
5809aa05 | 14137 | #: builtin/rebase--helper.c:24 |
6937cb4e JX |
14138 | msgid "keep empty commits" |
14139 | msgstr "保持空提交" | |
14140 | ||
c1ac5258 | 14141 | #: builtin/rebase--helper.c:26 builtin/revert.c:124 |
31e5e17b JX |
14142 | msgid "allow commits with empty messages" |
14143 | msgstr "允许提交说明为空" | |
14144 | ||
14145 | #: builtin/rebase--helper.c:27 | |
fd8cb379 JX |
14146 | msgid "rebase merge commits" |
14147 | msgstr "对合并提交变基" | |
14148 | ||
14149 | #: builtin/rebase--helper.c:29 | |
14150 | msgid "keep original branch points of cousins" | |
14151 | msgstr "保持兄弟提交的原始分支点" | |
14152 | ||
14153 | #: builtin/rebase--helper.c:30 | |
87cb7997 JX |
14154 | msgid "continue rebase" |
14155 | msgstr "继续变基" | |
14156 | ||
fd8cb379 | 14157 | #: builtin/rebase--helper.c:32 |
87cb7997 JX |
14158 | msgid "abort rebase" |
14159 | msgstr "中止变基" | |
14160 | ||
fd8cb379 | 14161 | #: builtin/rebase--helper.c:35 |
6937cb4e JX |
14162 | msgid "make rebase script" |
14163 | msgstr "制作变基脚本" | |
14164 | ||
fd8cb379 | 14165 | #: builtin/rebase--helper.c:37 |
5809aa05 JX |
14166 | msgid "shorten commit ids in the todo list" |
14167 | msgstr "缩短待办列表中的提交号" | |
6937cb4e | 14168 | |
fd8cb379 | 14169 | #: builtin/rebase--helper.c:39 |
5809aa05 JX |
14170 | msgid "expand commit ids in the todo list" |
14171 | msgstr "扩展待办列表中的提交号" | |
14172 | ||
fd8cb379 | 14173 | #: builtin/rebase--helper.c:41 |
6937cb4e JX |
14174 | msgid "check the todo list" |
14175 | msgstr "检查待办列表" | |
14176 | ||
fd8cb379 | 14177 | #: builtin/rebase--helper.c:43 |
6937cb4e JX |
14178 | msgid "skip unnecessary picks" |
14179 | msgstr "跳过不必要的拣选" | |
14180 | ||
fd8cb379 | 14181 | #: builtin/rebase--helper.c:45 |
6937cb4e JX |
14182 | msgid "rearrange fixup/squash lines" |
14183 | msgstr "重新排列 fixup/squash 行" | |
14184 | ||
fd8cb379 | 14185 | #: builtin/rebase--helper.c:47 |
5809aa05 JX |
14186 | msgid "insert exec commands in todo list" |
14187 | msgstr "在待办列表中插入 exec 执行命令" | |
14188 | ||
fd8cb379 JX |
14189 | #: builtin/rebase--helper.c:68 |
14190 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" | |
14191 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
14192 | ||
c1ac5258 | 14193 | #: builtin/receive-pack.c:32 |
5b04ee3b | 14194 | msgid "git receive-pack <git-dir>" |
58b6f078 | 14195 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 14196 | |
c1ac5258 | 14197 | #: builtin/receive-pack.c:830 |
a0b6b246 JX |
14198 | msgid "" |
14199 | "By default, updating the current branch in a non-bare repository\n" | |
14200 | "is denied, because it will make the index and work tree inconsistent\n" | |
14201 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
14202 | "the work tree to HEAD.\n" | |
14203 | "\n" | |
1a79b2f1 JX |
14204 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
14205 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
14206 | "its current branch; however, this is not recommended unless you\n" |
14207 | "arranged to update its work tree to match what you pushed in some\n" | |
14208 | "other way.\n" | |
14209 | "\n" | |
14210 | "To squelch this message and still keep the default behaviour, set\n" | |
14211 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
14212 | msgstr "" | |
14213 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
14214 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
14215 | "\n" | |
14216 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
14217 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
14218 | "用某种方式将其工作区更新至您推送的状态。\n" | |
14219 | "\n" | |
14220 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
14221 | "配置变量为 'refuse'。" | |
14222 | ||
c1ac5258 | 14223 | #: builtin/receive-pack.c:850 |
a0b6b246 JX |
14224 | msgid "" |
14225 | "By default, deleting the current branch is denied, because the next\n" | |
14226 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
14227 | "\n" | |
14228 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
14229 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
14230 | "current branch, with or without a warning message.\n" | |
14231 | "\n" | |
14232 | "To squelch this message, you can set it to 'refuse'." | |
14233 | msgstr "" | |
14234 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 14235 | "导致困惑。\n" |
a0b6b246 JX |
14236 | "\n" |
14237 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 14238 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
14239 | "\n" |
14240 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
14241 | ||
c1ac5258 | 14242 | #: builtin/receive-pack.c:1923 |
5b04ee3b JX |
14243 | msgid "quiet" |
14244 | msgstr "静默模式" | |
14245 | ||
c1ac5258 | 14246 | #: builtin/receive-pack.c:1937 |
5b04ee3b JX |
14247 | msgid "You must specify a directory." |
14248 | msgstr "您必须指定一个目录。" | |
14249 | ||
c1ac5258 | 14250 | #: builtin/reflog.c:536 builtin/reflog.c:541 |
2e8451e8 JX |
14251 | #, c-format |
14252 | msgid "'%s' is not a valid timestamp" | |
14253 | msgstr "'%s' 不是一个有效的时间戳" | |
14254 | ||
c1ac5258 | 14255 | #: builtin/remote.c:15 |
ef317cd5 | 14256 | msgid "git remote [-v | --verbose]" |
07432cef | 14257 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 14258 | |
c1ac5258 | 14259 | #: builtin/remote.c:16 |
ef317cd5 | 14260 | msgid "" |
814ff314 | 14261 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
14262 | "mirror=<fetch|push>] <name> <url>" |
14263 | msgstr "" | |
814ff314 | 14264 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 14265 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 14266 | |
c1ac5258 | 14267 | #: builtin/remote.c:17 builtin/remote.c:37 |
ef317cd5 | 14268 | msgid "git remote rename <old> <new>" |
07432cef | 14269 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 14270 | |
c1ac5258 | 14271 | #: builtin/remote.c:18 builtin/remote.c:42 |
ef317cd5 | 14272 | msgid "git remote remove <name>" |
07432cef | 14273 | msgstr "git remote remove <名称>" |
ef317cd5 | 14274 | |
c1ac5258 | 14275 | #: builtin/remote.c:19 builtin/remote.c:47 |
814ff314 JX |
14276 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
14277 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 14278 | |
c1ac5258 | 14279 | #: builtin/remote.c:20 |
ef317cd5 | 14280 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 14281 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 14282 | |
c1ac5258 | 14283 | #: builtin/remote.c:21 |
ef317cd5 | 14284 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 14285 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 14286 | |
c1ac5258 | 14287 | #: builtin/remote.c:22 |
ef317cd5 JX |
14288 | msgid "" |
14289 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 14290 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 14291 | |
c1ac5258 | 14292 | #: builtin/remote.c:23 |
ef317cd5 | 14293 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 14294 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 14295 | |
c1ac5258 | 14296 | #: builtin/remote.c:24 builtin/remote.c:73 |
94550ed3 JX |
14297 | msgid "git remote get-url [--push] [--all] <name>" |
14298 | msgstr "git remote get-url [--push] [--all] <名称>" | |
14299 | ||
c1ac5258 | 14300 | #: builtin/remote.c:25 builtin/remote.c:78 |
ef317cd5 | 14301 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 14302 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 14303 | |
c1ac5258 | 14304 | #: builtin/remote.c:26 builtin/remote.c:79 |
ef317cd5 | 14305 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 14306 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 14307 | |
c1ac5258 | 14308 | #: builtin/remote.c:27 builtin/remote.c:80 |
ef317cd5 | 14309 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 14310 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 14311 | |
c1ac5258 | 14312 | #: builtin/remote.c:32 |
ef317cd5 | 14313 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 14314 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 14315 | |
c1ac5258 | 14316 | #: builtin/remote.c:52 |
ef317cd5 | 14317 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 14318 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 14319 | |
c1ac5258 | 14320 | #: builtin/remote.c:53 |
ef317cd5 | 14321 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 14322 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 14323 | |
c1ac5258 | 14324 | #: builtin/remote.c:58 |
ef317cd5 | 14325 | msgid "git remote show [<options>] <name>" |
07432cef | 14326 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 14327 | |
c1ac5258 | 14328 | #: builtin/remote.c:63 |
ef317cd5 | 14329 | msgid "git remote prune [<options>] <name>" |
07432cef | 14330 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 14331 | |
c1ac5258 | 14332 | #: builtin/remote.c:68 |
ef317cd5 | 14333 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 14334 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 14335 | |
c1ac5258 | 14336 | #: builtin/remote.c:97 |
81809b99 | 14337 | #, c-format |
8ada9598 | 14338 | msgid "Updating %s" |
81809b99 | 14339 | msgstr "更新 %s 中" |
8ada9598 | 14340 | |
c1ac5258 | 14341 | #: builtin/remote.c:129 |
8ada9598 JX |
14342 | msgid "" |
14343 | "--mirror is dangerous and deprecated; please\n" | |
14344 | "\t use --mirror=fetch or --mirror=push instead" | |
14345 | msgstr "" | |
81809b99 JX |
14346 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
14347 | "\t 或 --mirror=push" | |
8ada9598 | 14348 | |
c1ac5258 | 14349 | #: builtin/remote.c:146 |
81809b99 | 14350 | #, c-format |
8ada9598 | 14351 | msgid "unknown mirror argument: %s" |
81809b99 | 14352 | msgstr "未知的镜像参数:%s" |
8ada9598 | 14353 | |
c1ac5258 | 14354 | #: builtin/remote.c:162 |
ef317cd5 | 14355 | msgid "fetch the remote branches" |
07432cef | 14356 | msgstr "抓取远程的分支" |
ef317cd5 | 14357 | |
c1ac5258 | 14358 | #: builtin/remote.c:164 |
ef317cd5 | 14359 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 14360 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 14361 | |
c1ac5258 | 14362 | #: builtin/remote.c:167 |
ef317cd5 | 14363 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 14364 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 14365 | |
c1ac5258 | 14366 | #: builtin/remote.c:169 |
ef317cd5 | 14367 | msgid "branch(es) to track" |
07432cef | 14368 | msgstr "跟踪的分支" |
ef317cd5 | 14369 | |
c1ac5258 | 14370 | #: builtin/remote.c:170 |
ef317cd5 | 14371 | msgid "master branch" |
07432cef | 14372 | msgstr "主线分支" |
ef317cd5 | 14373 | |
c1ac5258 | 14374 | #: builtin/remote.c:172 |
ef317cd5 | 14375 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 14376 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 14377 | |
c1ac5258 | 14378 | #: builtin/remote.c:184 |
8ada9598 | 14379 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 14380 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 14381 | |
c1ac5258 | 14382 | #: builtin/remote.c:186 |
8ada9598 | 14383 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 14384 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 14385 | |
c1ac5258 | 14386 | #: builtin/remote.c:193 builtin/remote.c:635 |
81809b99 | 14387 | #, c-format |
8ada9598 | 14388 | msgid "remote %s already exists." |
81809b99 | 14389 | msgstr "远程 %s 已经存在。" |
8ada9598 | 14390 | |
c1ac5258 | 14391 | #: builtin/remote.c:197 builtin/remote.c:639 |
81809b99 | 14392 | #, c-format |
8ada9598 | 14393 | msgid "'%s' is not a valid remote name" |
81809b99 | 14394 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 14395 | |
c1ac5258 | 14396 | #: builtin/remote.c:237 |
81809b99 | 14397 | #, c-format |
8ada9598 | 14398 | msgid "Could not setup master '%s'" |
81809b99 | 14399 | msgstr "无法设置 master '%s'" |
8ada9598 | 14400 | |
c1ac5258 | 14401 | #: builtin/remote.c:343 |
81809b99 | 14402 | #, c-format |
8ada9598 | 14403 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 14404 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 14405 | |
c1ac5258 | 14406 | #: builtin/remote.c:442 builtin/remote.c:450 |
8ada9598 | 14407 | msgid "(matching)" |
81809b99 | 14408 | msgstr "(匹配)" |
8ada9598 | 14409 | |
c1ac5258 | 14410 | #: builtin/remote.c:454 |
8ada9598 | 14411 | msgid "(delete)" |
81809b99 | 14412 | msgstr "(删除)" |
8ada9598 | 14413 | |
c1ac5258 | 14414 | #: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 |
81809b99 | 14415 | #, c-format |
8ada9598 | 14416 | msgid "No such remote: %s" |
81809b99 | 14417 | msgstr "没有这样的远程:%s" |
8ada9598 | 14418 | |
c1ac5258 | 14419 | #: builtin/remote.c:645 |
81809b99 | 14420 | #, c-format |
8ada9598 | 14421 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 14422 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 14423 | |
c1ac5258 | 14424 | #: builtin/remote.c:665 |
8ada9598 JX |
14425 | #, c-format |
14426 | msgid "" | |
d691f479 | 14427 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
14428 | "\t%s\n" |
14429 | "\tPlease update the configuration manually if necessary." | |
14430 | msgstr "" | |
160fb2b2 | 14431 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
14432 | "\t%s\n" |
14433 | "\t如果必要请手动更新配置。" | |
8ada9598 | 14434 | |
c1ac5258 | 14435 | #: builtin/remote.c:701 |
81809b99 | 14436 | #, c-format |
8ada9598 | 14437 | msgid "deleting '%s' failed" |
81809b99 | 14438 | msgstr "删除 '%s' 失败" |
8ada9598 | 14439 | |
c1ac5258 | 14440 | #: builtin/remote.c:735 |
81809b99 | 14441 | #, c-format |
8ada9598 | 14442 | msgid "creating '%s' failed" |
81809b99 | 14443 | msgstr "创建 '%s' 失败" |
8ada9598 | 14444 | |
c1ac5258 | 14445 | #: builtin/remote.c:801 |
8ada9598 JX |
14446 | msgid "" |
14447 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
14448 | "to delete it, use:" | |
14449 | msgid_plural "" | |
14450 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
14451 | "to delete them, use:" | |
5ae481e0 JX |
14452 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
14453 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 14454 | |
c1ac5258 | 14455 | #: builtin/remote.c:815 |
276ceeaa JX |
14456 | #, c-format |
14457 | msgid "Could not remove config section '%s'" | |
14458 | msgstr "不能移除配置小节 '%s'" | |
14459 | ||
c1ac5258 | 14460 | #: builtin/remote.c:916 |
8ada9598 JX |
14461 | #, c-format |
14462 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 14463 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 14464 | |
c1ac5258 | 14465 | #: builtin/remote.c:919 |
8ada9598 | 14466 | msgid " tracked" |
81809b99 | 14467 | msgstr " 已跟踪" |
8ada9598 | 14468 | |
c1ac5258 | 14469 | #: builtin/remote.c:921 |
8ada9598 | 14470 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 14471 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 14472 | |
c1ac5258 | 14473 | #: builtin/remote.c:923 |
8ada9598 | 14474 | msgid " ???" |
81809b99 | 14475 | msgstr " ???" |
8ada9598 | 14476 | |
c1ac5258 | 14477 | #: builtin/remote.c:964 |
8ada9598 JX |
14478 | #, c-format |
14479 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 14480 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 14481 | |
c1ac5258 | 14482 | #: builtin/remote.c:973 |
81809b99 | 14483 | #, c-format |
276ceeaa JX |
14484 | msgid "rebases interactively onto remote %s" |
14485 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 14486 | |
c1ac5258 | 14487 | #: builtin/remote.c:975 |
fd8cb379 JX |
14488 | #, c-format |
14489 | msgid "rebases interactively (with merges) onto remote %s" | |
14490 | msgstr "交互式变基(含合并提交)到远程 %s" | |
14491 | ||
c1ac5258 | 14492 | #: builtin/remote.c:978 |
5c57d762 JX |
14493 | #, c-format |
14494 | msgid "rebases onto remote %s" | |
14495 | msgstr "变基到远程 %s" | |
14496 | ||
c1ac5258 | 14497 | #: builtin/remote.c:982 |
81809b99 | 14498 | #, c-format |
8ada9598 | 14499 | msgid " merges with remote %s" |
81809b99 | 14500 | msgstr " 与远程 %s 合并" |
8ada9598 | 14501 | |
c1ac5258 | 14502 | #: builtin/remote.c:985 |
81809b99 | 14503 | #, c-format |
8ada9598 | 14504 | msgid "merges with remote %s" |
81809b99 | 14505 | msgstr "与远程 %s 合并" |
8ada9598 | 14506 | |
c1ac5258 | 14507 | #: builtin/remote.c:988 |
5c57d762 JX |
14508 | #, c-format |
14509 | msgid "%-*s and with remote %s\n" | |
14510 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 14511 | |
c1ac5258 | 14512 | #: builtin/remote.c:1031 |
8ada9598 | 14513 | msgid "create" |
81809b99 | 14514 | msgstr "创建" |
8ada9598 | 14515 | |
c1ac5258 | 14516 | #: builtin/remote.c:1034 |
8ada9598 | 14517 | msgid "delete" |
81809b99 | 14518 | msgstr "删除" |
8ada9598 | 14519 | |
c1ac5258 | 14520 | #: builtin/remote.c:1038 |
8ada9598 | 14521 | msgid "up to date" |
81809b99 | 14522 | msgstr "最新" |
8ada9598 | 14523 | |
c1ac5258 | 14524 | #: builtin/remote.c:1041 |
8ada9598 | 14525 | msgid "fast-forwardable" |
81809b99 | 14526 | msgstr "可快进" |
8ada9598 | 14527 | |
c1ac5258 | 14528 | #: builtin/remote.c:1044 |
8ada9598 | 14529 | msgid "local out of date" |
81809b99 | 14530 | msgstr "本地已过时" |
8ada9598 | 14531 | |
c1ac5258 | 14532 | #: builtin/remote.c:1051 |
8ada9598 JX |
14533 | #, c-format |
14534 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 14535 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 14536 | |
c1ac5258 | 14537 | #: builtin/remote.c:1054 |
8ada9598 JX |
14538 | #, c-format |
14539 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 14540 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 14541 | |
c1ac5258 | 14542 | #: builtin/remote.c:1058 |
8ada9598 JX |
14543 | #, c-format |
14544 | msgid " %-*s forces to %s" | |
81809b99 | 14545 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 14546 | |
c1ac5258 | 14547 | #: builtin/remote.c:1061 |
8ada9598 JX |
14548 | #, c-format |
14549 | msgid " %-*s pushes to %s" | |
81809b99 | 14550 | msgstr " %-*s 推送至 %s" |
8ada9598 | 14551 | |
c1ac5258 | 14552 | #: builtin/remote.c:1129 |
ef317cd5 | 14553 | msgid "do not query remotes" |
07432cef | 14554 | msgstr "不查询远程" |
ef317cd5 | 14555 | |
c1ac5258 | 14556 | #: builtin/remote.c:1156 |
81809b99 | 14557 | #, c-format |
8ada9598 | 14558 | msgid "* remote %s" |
81809b99 | 14559 | msgstr "* 远程 %s" |
8ada9598 | 14560 | |
c1ac5258 | 14561 | #: builtin/remote.c:1157 |
8ada9598 JX |
14562 | #, c-format |
14563 | msgid " Fetch URL: %s" | |
81809b99 | 14564 | msgstr " 获取地址:%s" |
8ada9598 | 14565 | |
c1ac5258 | 14566 | #: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 |
8ada9598 | 14567 | msgid "(no URL)" |
81809b99 | 14568 | msgstr "(无 URL)" |
8ada9598 | 14569 | |
a4f16749 JX |
14570 | #. TRANSLATORS: the colon ':' should align |
14571 | #. with the one in " Fetch URL: %s" | |
14572 | #. translation. | |
14573 | #. | |
c1ac5258 | 14574 | #: builtin/remote.c:1172 builtin/remote.c:1174 |
8ada9598 JX |
14575 | #, c-format |
14576 | msgid " Push URL: %s" | |
81809b99 | 14577 | msgstr " 推送地址:%s" |
8ada9598 | 14578 | |
c1ac5258 | 14579 | #: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 |
81809b99 | 14580 | #, c-format |
8ada9598 | 14581 | msgid " HEAD branch: %s" |
4375c10e | 14582 | msgstr " HEAD 分支:%s" |
8ada9598 | 14583 | |
5c57d762 | 14584 | # 译者:中文字符串拼接,可删除前导空格 |
c1ac5258 | 14585 | #: builtin/remote.c:1176 |
5c57d762 JX |
14586 | msgid "(not queried)" |
14587 | msgstr "(未查询)" | |
14588 | ||
c1ac5258 | 14589 | #: builtin/remote.c:1178 |
5c57d762 JX |
14590 | msgid "(unknown)" |
14591 | msgstr "(未知)" | |
14592 | ||
c1ac5258 | 14593 | #: builtin/remote.c:1182 |
8ada9598 JX |
14594 | #, c-format |
14595 | msgid "" | |
14596 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 14597 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 14598 | |
c1ac5258 | 14599 | #: builtin/remote.c:1194 |
81809b99 | 14600 | #, c-format |
8ada9598 JX |
14601 | msgid " Remote branch:%s" |
14602 | msgid_plural " Remote branches:%s" | |
81809b99 | 14603 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 14604 | msgstr[1] " 远程分支:%s" |
8ada9598 | 14605 | |
81809b99 | 14606 | # 译者:中文字符串拼接,可删除前导空格 |
c1ac5258 | 14607 | #: builtin/remote.c:1197 builtin/remote.c:1223 |
8ada9598 | 14608 | msgid " (status not queried)" |
81809b99 | 14609 | msgstr "(状态未查询)" |
8ada9598 | 14610 | |
c1ac5258 | 14611 | #: builtin/remote.c:1206 |
8ada9598 JX |
14612 | msgid " Local branch configured for 'git pull':" |
14613 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 14614 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 14615 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 14616 | |
c1ac5258 | 14617 | #: builtin/remote.c:1214 |
8ada9598 | 14618 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 14619 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 14620 | |
c1ac5258 | 14621 | #: builtin/remote.c:1220 |
81809b99 | 14622 | #, c-format |
8ada9598 JX |
14623 | msgid " Local ref configured for 'git push'%s:" |
14624 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 14625 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 14626 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 14627 | |
c1ac5258 | 14628 | #: builtin/remote.c:1241 |
ef317cd5 | 14629 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 14630 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 14631 | |
c1ac5258 | 14632 | #: builtin/remote.c:1243 |
ef317cd5 | 14633 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 14634 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 14635 | |
c1ac5258 | 14636 | #: builtin/remote.c:1258 |
8ada9598 | 14637 | msgid "Cannot determine remote HEAD" |
81809b99 | 14638 | msgstr "无法确定远程 HEAD" |
8ada9598 | 14639 | |
c1ac5258 | 14640 | #: builtin/remote.c:1260 |
8ada9598 | 14641 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 14642 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 14643 | |
c1ac5258 | 14644 | #: builtin/remote.c:1270 |
81809b99 | 14645 | #, c-format |
8ada9598 | 14646 | msgid "Could not delete %s" |
81809b99 | 14647 | msgstr "无法删除 %s" |
8ada9598 | 14648 | |
c1ac5258 | 14649 | #: builtin/remote.c:1278 |
81809b99 | 14650 | #, c-format |
8ada9598 | 14651 | msgid "Not a valid ref: %s" |
81809b99 | 14652 | msgstr "不是一个有效引用:%s" |
8ada9598 | 14653 | |
c1ac5258 | 14654 | #: builtin/remote.c:1280 |
81809b99 | 14655 | #, c-format |
8ada9598 | 14656 | msgid "Could not setup %s" |
81809b99 | 14657 | msgstr "不能设置 %s" |
8ada9598 JX |
14658 | |
14659 | # 译者:注意保持前导空格 | |
c1ac5258 | 14660 | #: builtin/remote.c:1298 |
81809b99 | 14661 | #, c-format |
8ada9598 | 14662 | msgid " %s will become dangling!" |
07432cef | 14663 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
14664 | |
14665 | # 译者:注意保持前导空格 | |
c1ac5258 | 14666 | #: builtin/remote.c:1299 |
81809b99 | 14667 | #, c-format |
8ada9598 | 14668 | msgid " %s has become dangling!" |
07432cef | 14669 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 14670 | |
c1ac5258 | 14671 | #: builtin/remote.c:1309 |
81809b99 | 14672 | #, c-format |
8ada9598 | 14673 | msgid "Pruning %s" |
81809b99 | 14674 | msgstr "修剪 %s" |
8ada9598 | 14675 | |
c1ac5258 | 14676 | #: builtin/remote.c:1310 |
8ada9598 JX |
14677 | #, c-format |
14678 | msgid "URL: %s" | |
81809b99 | 14679 | msgstr "URL:%s" |
8ada9598 | 14680 | |
c1ac5258 | 14681 | #: builtin/remote.c:1326 |
8ada9598 JX |
14682 | #, c-format |
14683 | msgid " * [would prune] %s" | |
81809b99 | 14684 | msgstr " * [将删除] %s" |
8ada9598 | 14685 | |
c1ac5258 | 14686 | #: builtin/remote.c:1329 |
8ada9598 JX |
14687 | #, c-format |
14688 | msgid " * [pruned] %s" | |
81809b99 | 14689 | msgstr " * [已删除] %s" |
8ada9598 | 14690 | |
c1ac5258 | 14691 | #: builtin/remote.c:1374 |
ef317cd5 | 14692 | msgid "prune remotes after fetching" |
07432cef | 14693 | msgstr "抓取后清除远程" |
ef317cd5 | 14694 | |
c1ac5258 | 14695 | #: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 |
81809b99 | 14696 | #, c-format |
8ada9598 | 14697 | msgid "No such remote '%s'" |
81809b99 | 14698 | msgstr "没有此远程 '%s'" |
8ada9598 | 14699 | |
c1ac5258 | 14700 | #: builtin/remote.c:1453 |
ef317cd5 | 14701 | msgid "add branch" |
07432cef | 14702 | msgstr "添加分支" |
ef317cd5 | 14703 | |
c1ac5258 | 14704 | #: builtin/remote.c:1460 |
8ada9598 | 14705 | msgid "no remote specified" |
81809b99 | 14706 | msgstr "未指定远程" |
8ada9598 | 14707 | |
c1ac5258 | 14708 | #: builtin/remote.c:1477 |
94550ed3 JX |
14709 | msgid "query push URLs rather than fetch URLs" |
14710 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
14711 | ||
c1ac5258 | 14712 | #: builtin/remote.c:1479 |
94550ed3 JX |
14713 | msgid "return all URLs" |
14714 | msgstr "返回所有 URL 地址" | |
14715 | ||
c1ac5258 | 14716 | #: builtin/remote.c:1507 |
94550ed3 JX |
14717 | #, c-format |
14718 | msgid "no URLs configured for remote '%s'" | |
14719 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
14720 | ||
c1ac5258 | 14721 | #: builtin/remote.c:1533 |
ef317cd5 | 14722 | msgid "manipulate push URLs" |
07432cef | 14723 | msgstr "操作推送 URLS" |
ef317cd5 | 14724 | |
c1ac5258 | 14725 | #: builtin/remote.c:1535 |
ef317cd5 | 14726 | msgid "add URL" |
07432cef | 14727 | msgstr "添加 URL" |
ef317cd5 | 14728 | |
c1ac5258 | 14729 | #: builtin/remote.c:1537 |
ef317cd5 | 14730 | msgid "delete URLs" |
07432cef | 14731 | msgstr "删除 URLS" |
ef317cd5 | 14732 | |
c1ac5258 | 14733 | #: builtin/remote.c:1544 |
8ada9598 | 14734 | msgid "--add --delete doesn't make sense" |
81809b99 | 14735 | msgstr "--add --delete 无意义" |
8ada9598 | 14736 | |
c1ac5258 | 14737 | #: builtin/remote.c:1583 |
81809b99 | 14738 | #, c-format |
8ada9598 | 14739 | msgid "Invalid old URL pattern: %s" |
4375c10e | 14740 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 14741 | |
c1ac5258 | 14742 | #: builtin/remote.c:1591 |
81809b99 | 14743 | #, c-format |
8ada9598 | 14744 | msgid "No such URL found: %s" |
4375c10e | 14745 | msgstr "未找到此 URL:%s" |
8ada9598 | 14746 | |
c1ac5258 | 14747 | #: builtin/remote.c:1593 |
8ada9598 | 14748 | msgid "Will not delete all non-push URLs" |
4375c10e | 14749 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 14750 | |
c1ac5258 | 14751 | #: builtin/remote.c:1609 |
ef317cd5 | 14752 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 14753 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 14754 | |
c1ac5258 | 14755 | #: builtin/remote.c:1640 |
a0b6b246 JX |
14756 | #, c-format |
14757 | msgid "Unknown subcommand: %s" | |
14758 | msgstr "未知子命令:%s" | |
14759 | ||
c1ac5258 | 14760 | #: builtin/repack.c:20 |
814ff314 JX |
14761 | msgid "git repack [<options>]" |
14762 | msgstr "git repack [<选项>]" | |
90314792 | 14763 | |
c1ac5258 | 14764 | #: builtin/repack.c:25 |
1a79b2f1 JX |
14765 | msgid "" |
14766 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
14767 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
14768 | msgstr "" | |
14769 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
14770 | "或禁用 pack.writebitmaps 配置。" | |
14771 | ||
c1ac5258 | 14772 | #: builtin/repack.c:287 |
90314792 JX |
14773 | msgid "pack everything in a single pack" |
14774 | msgstr "所有内容打包到一个包文件中" | |
14775 | ||
c1ac5258 | 14776 | #: builtin/repack.c:289 |
90314792 JX |
14777 | msgid "same as -a, and turn unreachable objects loose" |
14778 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
14779 | ||
c1ac5258 | 14780 | #: builtin/repack.c:292 |
90314792 JX |
14781 | msgid "remove redundant packs, and run git-prune-packed" |
14782 | msgstr "删除多余的包,运行 git-prune-packed" | |
14783 | ||
c1ac5258 | 14784 | #: builtin/repack.c:294 |
90314792 JX |
14785 | msgid "pass --no-reuse-delta to git-pack-objects" |
14786 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
14787 | ||
c1ac5258 | 14788 | #: builtin/repack.c:296 |
90314792 JX |
14789 | msgid "pass --no-reuse-object to git-pack-objects" |
14790 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
14791 | ||
c1ac5258 | 14792 | #: builtin/repack.c:298 |
90314792 JX |
14793 | msgid "do not run git-update-server-info" |
14794 | msgstr "不运行 git-update-server-info" | |
14795 | ||
c1ac5258 | 14796 | #: builtin/repack.c:301 |
90314792 JX |
14797 | msgid "pass --local to git-pack-objects" |
14798 | msgstr "向 git-pack-objects 传递参数 --local" | |
14799 | ||
c1ac5258 | 14800 | #: builtin/repack.c:303 |
6c94aba5 JX |
14801 | msgid "write bitmap index" |
14802 | msgstr "写 bitmap 索引" | |
14803 | ||
c1ac5258 | 14804 | #: builtin/repack.c:304 |
90314792 JX |
14805 | msgid "approxidate" |
14806 | msgstr "近似日期" | |
14807 | ||
c1ac5258 | 14808 | #: builtin/repack.c:305 |
90314792 JX |
14809 | msgid "with -A, do not loosen objects older than this" |
14810 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
14811 | ||
c1ac5258 | 14812 | #: builtin/repack.c:307 |
5c57d762 JX |
14813 | msgid "with -a, repack unreachable objects" |
14814 | msgstr "使用 -a ,重新对不可达对象打包" | |
14815 | ||
c1ac5258 | 14816 | #: builtin/repack.c:309 |
90314792 JX |
14817 | msgid "size of the window used for delta compression" |
14818 | msgstr "用于增量压缩的窗口值" | |
14819 | ||
c1ac5258 | 14820 | #: builtin/repack.c:310 builtin/repack.c:316 |
8376b58d JX |
14821 | msgid "bytes" |
14822 | msgstr "字节" | |
14823 | ||
c1ac5258 | 14824 | #: builtin/repack.c:311 |
90314792 JX |
14825 | msgid "same as the above, but limit memory size instead of entries count" |
14826 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
14827 | ||
c1ac5258 | 14828 | #: builtin/repack.c:313 |
90314792 JX |
14829 | msgid "limits the maximum delta depth" |
14830 | msgstr "限制最大增量深度" | |
14831 | ||
c1ac5258 | 14832 | #: builtin/repack.c:315 |
a4f16749 JX |
14833 | msgid "limits the maximum number of threads" |
14834 | msgstr "限制最大线程数" | |
14835 | ||
c1ac5258 | 14836 | #: builtin/repack.c:317 |
90314792 | 14837 | msgid "maximum size of each packfile" |
dbd6cced | 14838 | msgstr "每个包文件的最大尺寸" |
90314792 | 14839 | |
c1ac5258 | 14840 | #: builtin/repack.c:319 |
6c94aba5 JX |
14841 | msgid "repack objects in packs marked with .keep" |
14842 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
14843 | ||
c1ac5258 | 14844 | #: builtin/repack.c:321 |
fd8cb379 JX |
14845 | msgid "do not repack this pack" |
14846 | msgstr "不要对该包文件重新打包" | |
14847 | ||
c1ac5258 | 14848 | #: builtin/repack.c:331 |
94550ed3 JX |
14849 | msgid "cannot delete packs in a precious-objects repo" |
14850 | msgstr "不能删除珍品仓库中的打包文件" | |
14851 | ||
c1ac5258 | 14852 | #: builtin/repack.c:335 |
5c57d762 JX |
14853 | msgid "--keep-unreachable and -A are incompatible" |
14854 | msgstr "--keep-unreachable 和 -A 不兼容" | |
14855 | ||
c1ac5258 | 14856 | #: builtin/repack.c:510 builtin/worktree.c:140 |
90314792 | 14857 | #, c-format |
5c57d762 | 14858 | msgid "failed to remove '%s'" |
c1ac5258 | 14859 | msgstr "删除 '%s' 失败" |
90314792 | 14860 | |
fd8cb379 | 14861 | #: builtin/replace.c:22 |
ef317cd5 | 14862 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 14863 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 14864 | |
fd8cb379 | 14865 | #: builtin/replace.c:23 |
6acbf033 JX |
14866 | msgid "git replace [-f] --edit <object>" |
14867 | msgstr "git replace [-f] --edit <对象>" | |
14868 | ||
fd8cb379 | 14869 | #: builtin/replace.c:24 |
6acbf033 JX |
14870 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
14871 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
14872 | ||
fd8cb379 JX |
14873 | #: builtin/replace.c:25 |
14874 | msgid "git replace [-f] --convert-graft-file" | |
14875 | msgstr "git replace [-f] --convert-graft-file" | |
14876 | ||
14877 | #: builtin/replace.c:26 | |
ef317cd5 | 14878 | msgid "git replace -d <object>..." |
07432cef | 14879 | msgstr "git replace -d <对象>..." |
ef317cd5 | 14880 | |
fd8cb379 | 14881 | #: builtin/replace.c:27 |
cfff71a9 JX |
14882 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
14883 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 14884 | |
c1ac5258 | 14885 | #: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 |
6acbf033 | 14886 | #, c-format |
c1ac5258 JX |
14887 | msgid "failed to resolve '%s' as a valid ref" |
14888 | msgstr "无法将 '%s' 解析为一个有效引用" | |
14889 | ||
14890 | #: builtin/replace.c:86 | |
14891 | #, c-format | |
14892 | msgid "" | |
14893 | "invalid replace format '%s'\n" | |
14894 | "valid formats are 'short', 'medium' and 'long'" | |
14895 | msgstr "" | |
14896 | "无效的替换格式 '%s'\n" | |
14897 | "有效的格式有 'short'、'medium' 和 'long'" | |
14898 | ||
14899 | #: builtin/replace.c:121 | |
14900 | #, c-format | |
14901 | msgid "replace ref '%s' not found" | |
14902 | msgstr "未发现替换引用 '%s'" | |
14903 | ||
14904 | #: builtin/replace.c:137 | |
14905 | #, c-format | |
14906 | msgid "Deleted replace ref '%s'" | |
14907 | msgstr "删除替换引用 '%s'" | |
14908 | ||
14909 | #: builtin/replace.c:149 | |
14910 | #, c-format | |
14911 | msgid "'%s' is not a valid ref name" | |
14912 | msgstr "'%s' 不是一个有效的引用名" | |
14913 | ||
14914 | #: builtin/replace.c:154 | |
14915 | #, c-format | |
14916 | msgid "replace ref '%s' already exists" | |
14917 | msgstr "替换引用 '%s' 已经存在" | |
14918 | ||
14919 | #: builtin/replace.c:174 | |
14920 | #, c-format | |
14921 | msgid "" | |
14922 | "Objects must be of the same type.\n" | |
14923 | "'%s' points to a replaced object of type '%s'\n" | |
14924 | "while '%s' points to a replacement object of type '%s'." | |
14925 | msgstr "" | |
14926 | "对象必须属于同一类型。\n" | |
14927 | "'%s' 指向 '%s' 类型的替换对象\n" | |
14928 | "而 '%s' 指向 '%s' 类型的替换对象。" | |
14929 | ||
14930 | #: builtin/replace.c:225 | |
14931 | #, c-format | |
14932 | msgid "unable to open %s for writing" | |
14933 | msgstr "无法为写入打开 %s" | |
14934 | ||
14935 | #: builtin/replace.c:238 | |
14936 | msgid "cat-file reported failure" | |
14937 | msgstr "cat-file 报告失败" | |
14938 | ||
14939 | #: builtin/replace.c:254 | |
14940 | #, c-format | |
14941 | msgid "unable to open %s for reading" | |
14942 | msgstr "无法为读取打开 %s" | |
14943 | ||
14944 | #: builtin/replace.c:268 | |
14945 | msgid "unable to spawn mktree" | |
14946 | msgstr "无法启动 mktree" | |
14947 | ||
14948 | #: builtin/replace.c:272 | |
14949 | msgid "unable to read from mktree" | |
14950 | msgstr "无法从 mktree 读取" | |
14951 | ||
14952 | #: builtin/replace.c:281 | |
14953 | msgid "mktree reported failure" | |
14954 | msgstr "mktree 报告失败" | |
14955 | ||
14956 | #: builtin/replace.c:285 | |
14957 | msgid "mktree did not return an object name" | |
14958 | msgstr "mktree 没有返回一个对象名" | |
14959 | ||
14960 | #: builtin/replace.c:294 | |
14961 | #, c-format | |
14962 | msgid "unable to fstat %s" | |
14963 | msgstr "无法对 %s 执行 fstat" | |
14964 | ||
14965 | #: builtin/replace.c:299 | |
14966 | msgid "unable to write object to database" | |
14967 | msgstr "无法向数据库写入对象" | |
14968 | ||
14969 | #: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 | |
14970 | #: builtin/replace.c:445 | |
14971 | #, c-format | |
14972 | msgid "not a valid object name: '%s'" | |
6acbf033 JX |
14973 | msgstr "不是一个有效的对象名:'%s'" |
14974 | ||
c1ac5258 JX |
14975 | #: builtin/replace.c:322 |
14976 | #, c-format | |
14977 | msgid "unable to get object type for %s" | |
14978 | msgstr "无法得到 %s 的对象类型" | |
14979 | ||
14980 | #: builtin/replace.c:338 | |
14981 | msgid "editing object file failed" | |
14982 | msgstr "编辑对象文件失败" | |
14983 | ||
14984 | #: builtin/replace.c:347 | |
14985 | #, c-format | |
14986 | msgid "new object is the same as the old one: '%s'" | |
14987 | msgstr "新对象和旧对象相同:'%s'" | |
14988 | ||
fd8cb379 | 14989 | #: builtin/replace.c:407 |
6acbf033 JX |
14990 | #, c-format |
14991 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 14992 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 14993 | |
fd8cb379 | 14994 | #: builtin/replace.c:409 |
6acbf033 JX |
14995 | #, c-format |
14996 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 14997 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 14998 | |
fd8cb379 | 14999 | #: builtin/replace.c:421 |
6acbf033 JX |
15000 | #, c-format |
15001 | msgid "" | |
15002 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
15003 | "instead of --graft" | |
55a16ee4 | 15004 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 15005 | |
fd8cb379 | 15006 | #: builtin/replace.c:460 |
6acbf033 | 15007 | #, c-format |
c1ac5258 JX |
15008 | msgid "the original commit '%s' has a gpg signature" |
15009 | msgstr "原始提交 '%s' 中有一个 gpg 签名" | |
6acbf033 | 15010 | |
fd8cb379 | 15011 | #: builtin/replace.c:461 |
6acbf033 JX |
15012 | msgid "the signature will be removed in the replacement commit!" |
15013 | msgstr "在替换的提交中签名将被移除!" | |
15014 | ||
fd8cb379 | 15015 | #: builtin/replace.c:471 |
6acbf033 JX |
15016 | #, c-format |
15017 | msgid "could not write replacement commit for: '%s'" | |
15018 | msgstr "不能为 '%s' 写替换提交" | |
15019 | ||
c1ac5258 JX |
15020 | #: builtin/replace.c:479 |
15021 | #, c-format | |
15022 | msgid "graft for '%s' unnecessary" | |
15023 | msgstr "对 '%s' 移植没有必要" | |
15024 | ||
15025 | #: builtin/replace.c:482 | |
15026 | #, c-format | |
15027 | msgid "new commit is the same as the old one: '%s'" | |
15028 | msgstr "新提交和旧的一样:'%s'" | |
15029 | ||
fd8cb379 JX |
15030 | #: builtin/replace.c:514 |
15031 | #, c-format | |
15032 | msgid "" | |
15033 | "could not convert the following graft(s):\n" | |
15034 | "%s" | |
15035 | msgstr "" | |
15036 | "不能转换下列移植:\n" | |
15037 | "%s" | |
15038 | ||
15039 | #: builtin/replace.c:535 | |
ef317cd5 | 15040 | msgid "list replace refs" |
07432cef | 15041 | msgstr "列出替换的引用" |
ef317cd5 | 15042 | |
fd8cb379 | 15043 | #: builtin/replace.c:536 |
ef317cd5 | 15044 | msgid "delete replace refs" |
07432cef | 15045 | msgstr "删除替换的引用" |
ef317cd5 | 15046 | |
fd8cb379 | 15047 | #: builtin/replace.c:537 |
6acbf033 JX |
15048 | msgid "edit existing object" |
15049 | msgstr "编辑现存的对象" | |
15050 | ||
fd8cb379 | 15051 | #: builtin/replace.c:538 |
6acbf033 JX |
15052 | msgid "change a commit's parents" |
15053 | msgstr "修改一个提交的父提交" | |
15054 | ||
fd8cb379 JX |
15055 | #: builtin/replace.c:539 |
15056 | msgid "convert existing graft file" | |
15057 | msgstr "转换现存的移植文件" | |
15058 | ||
15059 | #: builtin/replace.c:540 | |
ef317cd5 | 15060 | msgid "replace the ref if it exists" |
07432cef | 15061 | msgstr "如果存在则替换引用" |
ef317cd5 | 15062 | |
fd8cb379 | 15063 | #: builtin/replace.c:542 |
6acbf033 JX |
15064 | msgid "do not pretty-print contents for --edit" |
15065 | msgstr "不要为 --edit 操作美观显示内容" | |
15066 | ||
fd8cb379 | 15067 | #: builtin/replace.c:543 |
cfff71a9 JX |
15068 | msgid "use this format" |
15069 | msgstr "使用此格式" | |
15070 | ||
c1ac5258 JX |
15071 | #: builtin/replace.c:556 |
15072 | msgid "--format cannot be used when not listing" | |
15073 | msgstr "不列示时不能使用 --format" | |
15074 | ||
15075 | #: builtin/replace.c:564 | |
15076 | msgid "-f only makes sense when writing a replacement" | |
15077 | msgstr "只有写一个替换时 -f 才有意义" | |
15078 | ||
15079 | #: builtin/replace.c:568 | |
15080 | msgid "--raw only makes sense with --edit" | |
15081 | msgstr "--raw 只有和 --edit 共用才有意义" | |
15082 | ||
15083 | #: builtin/replace.c:574 | |
15084 | msgid "-d needs at least one argument" | |
15085 | msgstr "-d 需要至少一个参数" | |
15086 | ||
15087 | #: builtin/replace.c:580 | |
15088 | msgid "bad number of arguments" | |
15089 | msgstr "错误的参数个数" | |
15090 | ||
15091 | #: builtin/replace.c:586 | |
15092 | msgid "-e needs exactly one argument" | |
15093 | msgstr "-e 只需要一个参数" | |
15094 | ||
15095 | #: builtin/replace.c:592 | |
15096 | msgid "-g needs at least one argument" | |
15097 | msgstr "-g 需要至少一个参数" | |
15098 | ||
15099 | #: builtin/replace.c:598 | |
15100 | msgid "--convert-graft-file takes no argument" | |
15101 | msgstr "--convert-graft-file 不带参数" | |
15102 | ||
15103 | #: builtin/replace.c:604 | |
15104 | msgid "only one pattern can be given with -l" | |
15105 | msgstr "只能为 -l 提供一个模式" | |
15106 | ||
a4f16749 | 15107 | #: builtin/rerere.c:13 |
814ff314 JX |
15108 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
15109 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 15110 | |
a4f16749 | 15111 | #: builtin/rerere.c:59 |
ef317cd5 | 15112 | msgid "register clean resolutions in index" |
07432cef | 15113 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 15114 | |
a4f16749 | 15115 | #: builtin/reset.c:29 |
ef317cd5 JX |
15116 | msgid "" |
15117 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 15118 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 15119 | |
a4f16749 | 15120 | #: builtin/reset.c:30 |
a0b6b246 JX |
15121 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
15122 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 15123 | |
a4f16749 | 15124 | #: builtin/reset.c:31 |
07432cef WS |
15125 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
15126 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 15127 | |
a4f16749 | 15128 | #: builtin/reset.c:37 |
c04f5ac3 JX |
15129 | msgid "mixed" |
15130 | msgstr "混杂" | |
15131 | ||
a4f16749 | 15132 | #: builtin/reset.c:37 |
c04f5ac3 JX |
15133 | msgid "soft" |
15134 | msgstr "软性" | |
15135 | ||
a4f16749 | 15136 | #: builtin/reset.c:37 |
c04f5ac3 JX |
15137 | msgid "hard" |
15138 | msgstr "硬性" | |
15139 | ||
a4f16749 | 15140 | #: builtin/reset.c:37 |
8ada9598 JX |
15141 | msgid "merge" |
15142 | msgstr "合并" | |
15143 | ||
a4f16749 | 15144 | #: builtin/reset.c:37 |
c04f5ac3 JX |
15145 | msgid "keep" |
15146 | msgstr "保持" | |
15147 | ||
6937cb4e | 15148 | #: builtin/reset.c:78 |
c04f5ac3 JX |
15149 | msgid "You do not have a valid HEAD." |
15150 | msgstr "您没有一个有效的 HEAD。" | |
15151 | ||
6937cb4e | 15152 | #: builtin/reset.c:80 |
c04f5ac3 JX |
15153 | msgid "Failed to find tree of HEAD." |
15154 | msgstr "无法找到 HEAD 指向的树。" | |
15155 | ||
6937cb4e | 15156 | #: builtin/reset.c:86 |
c04f5ac3 JX |
15157 | #, c-format |
15158 | msgid "Failed to find tree of %s." | |
15159 | msgstr "无法找到 %s 指向的树。" | |
15160 | ||
31e5e17b | 15161 | #: builtin/reset.c:111 |
c04f5ac3 JX |
15162 | #, c-format |
15163 | msgid "HEAD is now at %s" | |
15164 | msgstr "HEAD 现在位于 %s" | |
15165 | ||
90e6ef53 | 15166 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 15167 | #: builtin/reset.c:189 |
c04f5ac3 JX |
15168 | #, c-format |
15169 | msgid "Cannot do a %s reset in the middle of a merge." | |
15170 | msgstr "在合并过程中不能做%s重置操作。" | |
15171 | ||
31e5e17b | 15172 | #: builtin/reset.c:289 |
ef317cd5 | 15173 | msgid "be quiet, only report errors" |
07432cef | 15174 | msgstr "安静模式,只报告错误" |
ef317cd5 | 15175 | |
31e5e17b | 15176 | #: builtin/reset.c:291 |
ef317cd5 | 15177 | msgid "reset HEAD and index" |
07432cef | 15178 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 15179 | |
31e5e17b | 15180 | #: builtin/reset.c:292 |
ef317cd5 | 15181 | msgid "reset only HEAD" |
07432cef | 15182 | msgstr "只重置 HEAD" |
ef317cd5 | 15183 | |
31e5e17b | 15184 | #: builtin/reset.c:294 builtin/reset.c:296 |
ef317cd5 | 15185 | msgid "reset HEAD, index and working tree" |
07432cef | 15186 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 15187 | |
31e5e17b | 15188 | #: builtin/reset.c:298 |
ef317cd5 | 15189 | msgid "reset HEAD but keep local changes" |
07432cef | 15190 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 15191 | |
31e5e17b | 15192 | #: builtin/reset.c:304 |
6c94aba5 JX |
15193 | msgid "record only the fact that removed paths will be added later" |
15194 | msgstr "将删除的路径标记为稍后添加" | |
15195 | ||
31e5e17b | 15196 | #: builtin/reset.c:321 |
07432cef WS |
15197 | #, c-format |
15198 | msgid "Failed to resolve '%s' as a valid revision." | |
15199 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
15200 | ||
31e5e17b | 15201 | #: builtin/reset.c:329 |
07432cef WS |
15202 | #, c-format |
15203 | msgid "Failed to resolve '%s' as a valid tree." | |
15204 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
15205 | ||
31e5e17b | 15206 | #: builtin/reset.c:338 |
c04f5ac3 | 15207 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 15208 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 15209 | |
31e5e17b | 15210 | #: builtin/reset.c:347 |
c04f5ac3 | 15211 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 15212 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 15213 | |
90e6ef53 | 15214 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 15215 | #: builtin/reset.c:349 |
c04f5ac3 JX |
15216 | #, c-format |
15217 | msgid "Cannot do %s reset with paths." | |
15218 | msgstr "不能带路径进行%s重置。" | |
15219 | ||
90e6ef53 | 15220 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 15221 | #: builtin/reset.c:359 |
c04f5ac3 JX |
15222 | #, c-format |
15223 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 15224 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 15225 | |
31e5e17b | 15226 | #: builtin/reset.c:363 |
6c94aba5 JX |
15227 | msgid "-N can only be used with --mixed" |
15228 | msgstr "-N 只能和 --mixed 同时使用" | |
15229 | ||
31e5e17b | 15230 | #: builtin/reset.c:380 |
90314792 | 15231 | msgid "Unstaged changes after reset:" |
160fb2b2 | 15232 | msgstr "重置后取消暂存的变更:" |
90314792 | 15233 | |
31e5e17b | 15234 | #: builtin/reset.c:386 |
ef317cd5 JX |
15235 | #, c-format |
15236 | msgid "Could not reset index file to revision '%s'." | |
15237 | msgstr "不能重置索引文件至版本 '%s'。" | |
15238 | ||
31e5e17b | 15239 | #: builtin/reset.c:390 |
07432cef WS |
15240 | msgid "Could not write new index file." |
15241 | msgstr "不能写入新的索引文件。" | |
15242 | ||
c1ac5258 | 15243 | #: builtin/rev-list.c:399 |
31e5e17b JX |
15244 | msgid "cannot combine --exclude-promisor-objects and --missing" |
15245 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
15246 | ||
c1ac5258 | 15247 | #: builtin/rev-list.c:457 |
5809aa05 JX |
15248 | msgid "object filtering requires --objects" |
15249 | msgstr "对象过滤需要 --objects" | |
15250 | ||
c1ac5258 | 15251 | #: builtin/rev-list.c:460 |
5809aa05 JX |
15252 | #, c-format |
15253 | msgid "invalid sparse value '%s'" | |
15254 | msgstr "无效的稀疏值 '%s'" | |
15255 | ||
c1ac5258 | 15256 | #: builtin/rev-list.c:501 |
1b7f4a34 JX |
15257 | msgid "rev-list does not support display of notes" |
15258 | msgstr "rev-list 不支持显示注解" | |
15259 | ||
c1ac5258 | 15260 | #: builtin/rev-list.c:504 |
5809aa05 JX |
15261 | msgid "cannot combine --use-bitmap-index with object filtering" |
15262 | msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" | |
15263 | ||
fd8cb379 | 15264 | #: builtin/rev-parse.c:406 |
814ff314 JX |
15265 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
15266 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 15267 | |
fd8cb379 | 15268 | #: builtin/rev-parse.c:411 |
ef317cd5 | 15269 | msgid "keep the `--` passed as an arg" |
07432cef | 15270 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 15271 | |
fd8cb379 | 15272 | #: builtin/rev-parse.c:413 |
ef317cd5 | 15273 | msgid "stop parsing after the first non-option argument" |
07432cef | 15274 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 15275 | |
fd8cb379 | 15276 | #: builtin/rev-parse.c:416 |
cfff71a9 JX |
15277 | msgid "output in stuck long form" |
15278 | msgstr "以固定长格式输出" | |
15279 | ||
fd8cb379 | 15280 | #: builtin/rev-parse.c:549 |
ef317cd5 | 15281 | msgid "" |
814ff314 | 15282 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 15283 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 15284 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
15285 | "\n" |
15286 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
15287 | msgstr "" | |
814ff314 | 15288 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 15289 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 15290 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
15291 | "\n" |
15292 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 15293 | |
c1ac5258 | 15294 | #: builtin/revert.c:24 |
814ff314 JX |
15295 | msgid "git revert [<options>] <commit-ish>..." |
15296 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 15297 | |
c1ac5258 | 15298 | #: builtin/revert.c:25 |
ef317cd5 | 15299 | msgid "git revert <subcommand>" |
07432cef | 15300 | msgstr "git revert <子命令>" |
ef317cd5 | 15301 | |
c1ac5258 | 15302 | #: builtin/revert.c:30 |
814ff314 JX |
15303 | msgid "git cherry-pick [<options>] <commit-ish>..." |
15304 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 15305 | |
c1ac5258 | 15306 | #: builtin/revert.c:31 |
ef317cd5 | 15307 | msgid "git cherry-pick <subcommand>" |
07432cef | 15308 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 15309 | |
c1ac5258 | 15310 | #: builtin/revert.c:91 |
ef317cd5 JX |
15311 | #, c-format |
15312 | msgid "%s: %s cannot be used with %s" | |
15313 | msgstr "%s:%s 不能和 %s 同时使用" | |
15314 | ||
c1ac5258 | 15315 | #: builtin/revert.c:100 |
ef317cd5 | 15316 | msgid "end revert or cherry-pick sequence" |
07432cef | 15317 | msgstr "终止反转或拣选操作" |
ef317cd5 | 15318 | |
c1ac5258 | 15319 | #: builtin/revert.c:101 |
ef317cd5 | 15320 | msgid "resume revert or cherry-pick sequence" |
07432cef | 15321 | msgstr "继续反转或拣选操作" |
ef317cd5 | 15322 | |
c1ac5258 | 15323 | #: builtin/revert.c:102 |
ef317cd5 | 15324 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 15325 | msgstr "取消反转或拣选操作" |
ef317cd5 | 15326 | |
c1ac5258 | 15327 | #: builtin/revert.c:103 |
ef317cd5 | 15328 | msgid "don't automatically commit" |
07432cef | 15329 | msgstr "不要自动提交" |
ef317cd5 | 15330 | |
c1ac5258 | 15331 | #: builtin/revert.c:104 |
ef317cd5 | 15332 | msgid "edit the commit message" |
07432cef | 15333 | msgstr "编辑提交说明" |
ef317cd5 | 15334 | |
c1ac5258 | 15335 | #: builtin/revert.c:107 |
87cb7997 | 15336 | msgid "parent-number" |
07432cef | 15337 | msgstr "父编号" |
ef317cd5 | 15338 | |
c1ac5258 | 15339 | #: builtin/revert.c:108 |
87cb7997 JX |
15340 | msgid "select mainline parent" |
15341 | msgstr "选择主干父提交编号" | |
15342 | ||
c1ac5258 | 15343 | #: builtin/revert.c:110 |
ef317cd5 | 15344 | msgid "merge strategy" |
07432cef | 15345 | msgstr "合并策略" |
ef317cd5 | 15346 | |
c1ac5258 | 15347 | #: builtin/revert.c:111 |
ef317cd5 | 15348 | msgid "option" |
07432cef | 15349 | msgstr "选项" |
ef317cd5 | 15350 | |
c1ac5258 | 15351 | #: builtin/revert.c:112 |
ef317cd5 | 15352 | msgid "option for merge strategy" |
07432cef | 15353 | msgstr "合并策略的选项" |
ef317cd5 | 15354 | |
c1ac5258 | 15355 | #: builtin/revert.c:121 |
ef317cd5 | 15356 | msgid "append commit name" |
07432cef | 15357 | msgstr "追加提交名称" |
ef317cd5 | 15358 | |
c1ac5258 | 15359 | #: builtin/revert.c:123 |
ef317cd5 | 15360 | msgid "preserve initially empty commits" |
07432cef | 15361 | msgstr "保留初始化的空提交" |
ef317cd5 | 15362 | |
c1ac5258 | 15363 | #: builtin/revert.c:125 |
ef317cd5 | 15364 | msgid "keep redundant, empty commits" |
07432cef | 15365 | msgstr "保持多余的、空的提交" |
ef317cd5 | 15366 | |
c1ac5258 | 15367 | #: builtin/revert.c:219 |
c04f5ac3 JX |
15368 | msgid "revert failed" |
15369 | msgstr "还原失败" | |
15370 | ||
c1ac5258 | 15371 | #: builtin/revert.c:232 |
c04f5ac3 JX |
15372 | msgid "cherry-pick failed" |
15373 | msgstr "拣选失败" | |
15374 | ||
a4f16749 | 15375 | #: builtin/rm.c:18 |
814ff314 JX |
15376 | msgid "git rm [<options>] [--] <file>..." |
15377 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 15378 | |
a4f16749 | 15379 | #: builtin/rm.c:206 |
c04f5ac3 | 15380 | msgid "" |
2e8451e8 JX |
15381 | "the following file has staged content different from both the\n" |
15382 | "file and the HEAD:" | |
15383 | msgid_plural "" | |
15384 | "the following files have staged content different from both the\n" | |
15385 | "file and the HEAD:" | |
15386 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
15387 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
15388 | ||
a4f16749 | 15389 | #: builtin/rm.c:211 |
2e8451e8 JX |
15390 | msgid "" |
15391 | "\n" | |
c04f5ac3 JX |
15392 | "(use -f to force removal)" |
15393 | msgstr "" | |
2e8451e8 | 15394 | "\n" |
c04f5ac3 JX |
15395 | "(使用 -f 强制删除)" |
15396 | ||
a4f16749 | 15397 | #: builtin/rm.c:215 |
2e8451e8 JX |
15398 | msgid "the following file has changes staged in the index:" |
15399 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
15400 | msgstr[0] "下列文件索引中有变更" |
15401 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 15402 | |
a4f16749 | 15403 | #: builtin/rm.c:219 builtin/rm.c:228 |
c04f5ac3 | 15404 | msgid "" |
2e8451e8 | 15405 | "\n" |
c04f5ac3 JX |
15406 | "(use --cached to keep the file, or -f to force removal)" |
15407 | msgstr "" | |
2e8451e8 JX |
15408 | "\n" |
15409 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
15410 | ||
a4f16749 | 15411 | #: builtin/rm.c:225 |
2e8451e8 JX |
15412 | msgid "the following file has local modifications:" |
15413 | msgid_plural "the following files have local modifications:" | |
15414 | msgstr[0] "如下文件有本地修改:" | |
15415 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 15416 | |
fd8cb379 | 15417 | #: builtin/rm.c:241 |
ef317cd5 | 15418 | msgid "do not list removed files" |
07432cef | 15419 | msgstr "不列出删除的文件" |
ef317cd5 | 15420 | |
fd8cb379 | 15421 | #: builtin/rm.c:242 |
ef317cd5 | 15422 | msgid "only remove from the index" |
07432cef | 15423 | msgstr "只从索引区删除" |
ef317cd5 | 15424 | |
fd8cb379 | 15425 | #: builtin/rm.c:243 |
ef317cd5 | 15426 | msgid "override the up-to-date check" |
07432cef | 15427 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 15428 | |
fd8cb379 | 15429 | #: builtin/rm.c:244 |
ef317cd5 | 15430 | msgid "allow recursive removal" |
07432cef | 15431 | msgstr "允许递归删除" |
ef317cd5 | 15432 | |
fd8cb379 | 15433 | #: builtin/rm.c:246 |
ef317cd5 | 15434 | msgid "exit with a zero status even if nothing matched" |
07432cef | 15435 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 15436 | |
c1ac5258 JX |
15437 | #: builtin/rm.c:288 |
15438 | msgid "please stage your changes to .gitmodules or stash them to proceed" | |
15439 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" | |
15440 | ||
fd8cb379 | 15441 | #: builtin/rm.c:306 |
c04f5ac3 JX |
15442 | #, c-format |
15443 | msgid "not removing '%s' recursively without -r" | |
15444 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
15445 | ||
fd8cb379 | 15446 | #: builtin/rm.c:345 |
c04f5ac3 JX |
15447 | #, c-format |
15448 | msgid "git rm: unable to remove %s" | |
15449 | msgstr "git rm:不能删除 %s" | |
15450 | ||
fd8cb379 | 15451 | #: builtin/rm.c:368 |
1a79b2f1 JX |
15452 | #, c-format |
15453 | msgid "could not remove '%s'" | |
15454 | msgstr "无法删除 '%s'" | |
15455 | ||
fd8cb379 | 15456 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
15457 | msgid "" |
15458 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
15459 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
15460 | "[<ref>...]\n" | |
15461 | " --all and explicit <ref> specification are mutually exclusive." | |
15462 | msgstr "" | |
15463 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
15464 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
15465 | " --all 和明确的 <引用> 互斥。" | |
15466 | ||
fd8cb379 | 15467 | #: builtin/send-pack.c:163 |
1b7f4a34 JX |
15468 | msgid "remote name" |
15469 | msgstr "远程名称" | |
15470 | ||
fd8cb379 | 15471 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
15472 | msgid "use stateless RPC protocol" |
15473 | msgstr "使用无状态的 RPC 协议" | |
15474 | ||
fd8cb379 | 15475 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
15476 | msgid "read refs from stdin" |
15477 | msgstr "从标准输入读取引用" | |
15478 | ||
fd8cb379 | 15479 | #: builtin/send-pack.c:179 |
1b7f4a34 JX |
15480 | msgid "print status from remote helper" |
15481 | msgstr "打印来自远程 helper 的状态" | |
15482 | ||
fd8cb379 JX |
15483 | #: builtin/serve.c:7 |
15484 | msgid "git serve [<options>]" | |
15485 | msgstr "git serve [<选项>]" | |
15486 | ||
15487 | #: builtin/serve.c:17 builtin/upload-pack.c:23 | |
15488 | msgid "quit after a single request/response exchange" | |
15489 | msgstr "在一次单独的请求/响应之后退出" | |
15490 | ||
15491 | #: builtin/serve.c:19 | |
15492 | msgid "exit immediately after advertising capabilities" | |
15493 | msgstr "在广告功能后立即退出" | |
15494 | ||
a4f16749 | 15495 | #: builtin/shortlog.c:14 |
fd8cb379 JX |
15496 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
15497 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
15498 | ||
15499 | #: builtin/shortlog.c:15 | |
15500 | msgid "git log --pretty=short | git shortlog [<options>]" | |
15501 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 15502 | |
fd8cb379 | 15503 | #: builtin/shortlog.c:264 |
1a79b2f1 JX |
15504 | msgid "Group by committer rather than author" |
15505 | msgstr "按照提交者分组而不是作者" | |
15506 | ||
fd8cb379 | 15507 | #: builtin/shortlog.c:266 |
ef317cd5 | 15508 | msgid "sort output according to the number of commits per author" |
07432cef | 15509 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 15510 | |
fd8cb379 | 15511 | #: builtin/shortlog.c:268 |
ef317cd5 | 15512 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 15513 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 15514 | |
fd8cb379 | 15515 | #: builtin/shortlog.c:270 |
ef317cd5 | 15516 | msgid "Show the email address of each author" |
07432cef | 15517 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 15518 | |
fd8cb379 | 15519 | #: builtin/shortlog.c:271 |
c1ac5258 JX |
15520 | msgid "<w>[,<i1>[,<i2>]]" |
15521 | msgstr "<w>[,<i1>[,<i2>]]" | |
ef317cd5 | 15522 | |
fd8cb379 | 15523 | #: builtin/shortlog.c:272 |
ef317cd5 | 15524 | msgid "Linewrap output" |
07432cef | 15525 | msgstr "折行输出" |
ef317cd5 | 15526 | |
c1ac5258 | 15527 | #: builtin/shortlog.c:299 |
fd8cb379 JX |
15528 | msgid "too many arguments given outside repository" |
15529 | msgstr "仓库外执行提供了太多的参数" | |
15530 | ||
c1ac5258 | 15531 | #: builtin/show-branch.c:13 |
ef317cd5 | 15532 | msgid "" |
814ff314 | 15533 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
15534 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
15535 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
15536 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 15537 | msgstr "" |
814ff314 | 15538 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
15539 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
15540 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
15541 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 15542 | |
c1ac5258 | 15543 | #: builtin/show-branch.c:17 |
814ff314 | 15544 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 15545 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 15546 | |
c1ac5258 | 15547 | #: builtin/show-branch.c:395 |
a0b6b246 JX |
15548 | #, c-format |
15549 | msgid "ignoring %s; cannot handle more than %d ref" | |
15550 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
15551 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
15552 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
15553 | ||
c1ac5258 | 15554 | #: builtin/show-branch.c:549 |
a0b6b246 JX |
15555 | #, c-format |
15556 | msgid "no matching refs with %s" | |
15557 | msgstr "没有和 %s 匹配的引用" | |
15558 | ||
c1ac5258 | 15559 | #: builtin/show-branch.c:645 |
ef317cd5 | 15560 | msgid "show remote-tracking and local branches" |
07432cef | 15561 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 15562 | |
c1ac5258 | 15563 | #: builtin/show-branch.c:647 |
ef317cd5 | 15564 | msgid "show remote-tracking branches" |
07432cef | 15565 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 15566 | |
c1ac5258 | 15567 | #: builtin/show-branch.c:649 |
ef317cd5 | 15568 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 15569 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 15570 | |
c1ac5258 | 15571 | #: builtin/show-branch.c:651 |
ef317cd5 | 15572 | msgid "show <n> more commits after the common ancestor" |
07432cef | 15573 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 15574 | |
c1ac5258 | 15575 | #: builtin/show-branch.c:653 |
ef317cd5 | 15576 | msgid "synonym to more=-1" |
07432cef | 15577 | msgstr "和 more=-1 同义" |
ef317cd5 | 15578 | |
c1ac5258 | 15579 | #: builtin/show-branch.c:654 |
ef317cd5 | 15580 | msgid "suppress naming strings" |
07432cef | 15581 | msgstr "不显示字符串命名" |
ef317cd5 | 15582 | |
c1ac5258 | 15583 | #: builtin/show-branch.c:656 |
ef317cd5 | 15584 | msgid "include the current branch" |
07432cef | 15585 | msgstr "包括当前分支" |
ef317cd5 | 15586 | |
c1ac5258 | 15587 | #: builtin/show-branch.c:658 |
ef317cd5 | 15588 | msgid "name commits with their object names" |
07432cef | 15589 | msgstr "以对象名字命名提交" |
ef317cd5 | 15590 | |
c1ac5258 | 15591 | #: builtin/show-branch.c:660 |
ef317cd5 | 15592 | msgid "show possible merge bases" |
07432cef | 15593 | msgstr "显示可能合并的基线" |
ef317cd5 | 15594 | |
c1ac5258 | 15595 | #: builtin/show-branch.c:662 |
ef317cd5 | 15596 | msgid "show refs unreachable from any other ref" |
07432cef | 15597 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 15598 | |
c1ac5258 | 15599 | #: builtin/show-branch.c:664 |
ef317cd5 | 15600 | msgid "show commits in topological order" |
07432cef | 15601 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 15602 | |
c1ac5258 | 15603 | #: builtin/show-branch.c:667 |
ef317cd5 | 15604 | msgid "show only commits not on the first branch" |
07432cef | 15605 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 15606 | |
c1ac5258 | 15607 | #: builtin/show-branch.c:669 |
ef317cd5 | 15608 | msgid "show merges reachable from only one tip" |
07432cef | 15609 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 15610 | |
c1ac5258 | 15611 | #: builtin/show-branch.c:671 |
2e8451e8 JX |
15612 | msgid "topologically sort, maintaining date order where possible" |
15613 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 15614 | |
c1ac5258 | 15615 | #: builtin/show-branch.c:674 |
ef317cd5 | 15616 | msgid "<n>[,<base>]" |
07432cef | 15617 | msgstr "<n>[,<base>]" |
ef317cd5 | 15618 | |
c1ac5258 | 15619 | #: builtin/show-branch.c:675 |
ef317cd5 | 15620 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 15621 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 15622 | |
c1ac5258 | 15623 | #: builtin/show-branch.c:711 |
a0b6b246 JX |
15624 | msgid "" |
15625 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
15626 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
15627 | ||
c1ac5258 | 15628 | #: builtin/show-branch.c:735 |
a0b6b246 JX |
15629 | msgid "no branches given, and HEAD is not valid" |
15630 | msgstr "未提供分支,且 HEAD 无效" | |
15631 | ||
c1ac5258 | 15632 | #: builtin/show-branch.c:738 |
a0b6b246 JX |
15633 | msgid "--reflog option needs one branch name" |
15634 | msgstr "选项 --reflog 需要一个分支名" | |
15635 | ||
c1ac5258 | 15636 | #: builtin/show-branch.c:741 |
a0b6b246 JX |
15637 | #, c-format |
15638 | msgid "only %d entry can be shown at one time." | |
15639 | msgid_plural "only %d entries can be shown at one time." | |
15640 | msgstr[0] "一次只能显示 %d 个条目。" | |
15641 | msgstr[1] "一次只能显示 %d 个条目。" | |
15642 | ||
c1ac5258 | 15643 | #: builtin/show-branch.c:745 |
a0b6b246 JX |
15644 | #, c-format |
15645 | msgid "no such ref %s" | |
15646 | msgstr "无此引用 %s" | |
15647 | ||
c1ac5258 | 15648 | #: builtin/show-branch.c:829 |
a0b6b246 JX |
15649 | #, c-format |
15650 | msgid "cannot handle more than %d rev." | |
15651 | msgid_plural "cannot handle more than %d revs." | |
15652 | msgstr[0] "不能处理 %d 个以上的版本。" | |
15653 | msgstr[1] "不能处理 %d 个以上的版本。" | |
15654 | ||
c1ac5258 | 15655 | #: builtin/show-branch.c:833 |
a0b6b246 JX |
15656 | #, c-format |
15657 | msgid "'%s' is not a valid ref." | |
15658 | msgstr "'%s' 不是一个有效的引用。" | |
15659 | ||
c1ac5258 | 15660 | #: builtin/show-branch.c:836 |
a0b6b246 JX |
15661 | #, c-format |
15662 | msgid "cannot find commit %s (%s)" | |
29004bbb | 15663 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 15664 | |
c1ac5258 | 15665 | #: builtin/show-ref.c:11 |
ef317cd5 | 15666 | msgid "" |
814ff314 JX |
15667 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
15668 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 15669 | msgstr "" |
814ff314 JX |
15670 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
15671 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 | 15672 | |
c1ac5258 | 15673 | #: builtin/show-ref.c:12 |
94550ed3 JX |
15674 | msgid "git show-ref --exclude-existing[=<pattern>]" |
15675 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 15676 | |
c1ac5258 | 15677 | #: builtin/show-ref.c:160 |
ef317cd5 | 15678 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 15679 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 15680 | |
c1ac5258 | 15681 | #: builtin/show-ref.c:161 |
ef317cd5 | 15682 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 15683 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 15684 | |
c1ac5258 | 15685 | #: builtin/show-ref.c:162 |
ef317cd5 | 15686 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 15687 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 15688 | |
c1ac5258 | 15689 | #: builtin/show-ref.c:165 builtin/show-ref.c:167 |
2e8451e8 JX |
15690 | msgid "show the HEAD reference, even if it would be filtered out" |
15691 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 15692 | |
c1ac5258 | 15693 | #: builtin/show-ref.c:169 |
ef317cd5 | 15694 | msgid "dereference tags into object IDs" |
4375c10e | 15695 | msgstr "转换标签到对象 ID" |
ef317cd5 | 15696 | |
c1ac5258 | 15697 | #: builtin/show-ref.c:171 |
ef317cd5 | 15698 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 15699 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 15700 | |
c1ac5258 | 15701 | #: builtin/show-ref.c:175 |
ef317cd5 | 15702 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 15703 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 15704 | |
c1ac5258 | 15705 | #: builtin/show-ref.c:177 |
ef317cd5 | 15706 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 15707 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 15708 | |
a4f16749 | 15709 | #: builtin/stripspace.c:18 |
94550ed3 JX |
15710 | msgid "git stripspace [-s | --strip-comments]" |
15711 | msgstr "git stripspace [-s | --strip-comments]" | |
15712 | ||
a4f16749 | 15713 | #: builtin/stripspace.c:19 |
94550ed3 JX |
15714 | msgid "git stripspace [-c | --comment-lines]" |
15715 | msgstr "git stripspace [-c | --comment-lines]" | |
15716 | ||
a4f16749 | 15717 | #: builtin/stripspace.c:36 |
94550ed3 JX |
15718 | msgid "skip and remove all lines starting with comment character" |
15719 | msgstr "跳过和移除所有的注释行" | |
15720 | ||
a4f16749 | 15721 | #: builtin/stripspace.c:39 |
276ceeaa | 15722 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
15723 | msgstr "为每一行的行首添加注释符和空格" |
15724 | ||
c1ac5258 | 15725 | #: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 |
5b04ee3b JX |
15726 | #, c-format |
15727 | msgid "No such ref: %s" | |
15728 | msgstr "没有这样的引用:%s" | |
15729 | ||
c1ac5258 | 15730 | #: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 |
5b04ee3b JX |
15731 | #, c-format |
15732 | msgid "Expecting a full ref name, got %s" | |
15733 | msgstr "期望一个完整的引用名称,却得到 %s" | |
15734 | ||
fd8cb379 | 15735 | #: builtin/submodule--helper.c:61 |
31e5e17b JX |
15736 | msgid "submodule--helper print-default-remote takes no arguments" |
15737 | msgstr "submodule--helper print-default-remote 不带参数" | |
15738 | ||
c1ac5258 | 15739 | #: builtin/submodule--helper.c:99 |
5b04ee3b JX |
15740 | #, c-format |
15741 | msgid "cannot strip one component off url '%s'" | |
15742 | msgstr "无法从 url '%s' 剥离一个组件" | |
15743 | ||
c1ac5258 | 15744 | #: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 |
94550ed3 JX |
15745 | msgid "alternative anchor for relative paths" |
15746 | msgstr "相对路径的替代锚记(anchor)" | |
15747 | ||
c1ac5258 | 15748 | #: builtin/submodule--helper.c:412 |
94550ed3 JX |
15749 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
15750 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
15751 | ||
c1ac5258 JX |
15752 | #: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 |
15753 | #: builtin/submodule--helper.c:629 | |
5b04ee3b JX |
15754 | #, c-format |
15755 | msgid "No url found for submodule path '%s' in .gitmodules" | |
15756 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
15757 | ||
c1ac5258 JX |
15758 | #: builtin/submodule--helper.c:521 |
15759 | #, c-format | |
15760 | msgid "Entering '%s'\n" | |
15761 | msgstr "进入 '%s'\n" | |
15762 | ||
15763 | #: builtin/submodule--helper.c:524 | |
15764 | #, c-format | |
15765 | msgid "" | |
15766 | "run_command returned non-zero status for %s\n" | |
15767 | "." | |
15768 | msgstr "对 %s 执行 run_command 返回非零值。\n." | |
15769 | ||
15770 | #: builtin/submodule--helper.c:545 | |
15771 | #, c-format | |
15772 | msgid "" | |
15773 | "run_command returned non-zero status while recursing in the nested " | |
15774 | "submodules of %s\n" | |
15775 | "." | |
15776 | msgstr "在递归 %s 的子模组执行 run_command 时返回非零值。\n." | |
15777 | ||
15778 | #: builtin/submodule--helper.c:561 | |
15779 | msgid "Suppress output of entering each submodule command" | |
15780 | msgstr "阻止进入每一个子模组命令的输出" | |
15781 | ||
15782 | #: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 | |
15783 | msgid "Recurse into nested submodules" | |
15784 | msgstr "递归进入嵌套子模组中" | |
15785 | ||
15786 | #: builtin/submodule--helper.c:568 | |
15787 | msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" | |
15788 | msgstr "git submodule--helper foreach [--quiet] [--recursive] <命令>" | |
15789 | ||
15790 | #: builtin/submodule--helper.c:644 | |
87cb7997 JX |
15791 | #, c-format |
15792 | msgid "" | |
15793 | "could not lookup configuration '%s'. Assuming this repository is its own " | |
15794 | "authoritative upstream." | |
15795 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
15796 | ||
c1ac5258 | 15797 | #: builtin/submodule--helper.c:655 |
5b04ee3b JX |
15798 | #, c-format |
15799 | msgid "Failed to register url for submodule path '%s'" | |
15800 | msgstr "无法为子模组 '%s' 注册 url" | |
15801 | ||
c1ac5258 | 15802 | #: builtin/submodule--helper.c:659 |
5b04ee3b JX |
15803 | #, c-format |
15804 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 15805 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
15806 | |
15807 | # | |
c1ac5258 | 15808 | #: builtin/submodule--helper.c:669 |
aef18cc6 | 15809 | #, c-format |
5b04ee3b | 15810 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 15811 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 15812 | |
c1ac5258 | 15813 | #: builtin/submodule--helper.c:676 |
5b04ee3b JX |
15814 | #, c-format |
15815 | msgid "Failed to register update mode for submodule path '%s'" | |
15816 | msgstr "无法为子模组 '%s' 注册更新模式" | |
15817 | ||
c1ac5258 | 15818 | #: builtin/submodule--helper.c:698 |
5b04ee3b | 15819 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 15820 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 15821 | |
c1ac5258 | 15822 | #: builtin/submodule--helper.c:703 |
5b04ee3b JX |
15823 | msgid "git submodule--helper init [<path>]" |
15824 | msgstr "git submodule--helper init [<路径>]" | |
15825 | ||
c1ac5258 | 15826 | #: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 |
94550ed3 JX |
15827 | #, c-format |
15828 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
15829 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
15830 | ||
c1ac5258 | 15831 | #: builtin/submodule--helper.c:814 |
5809aa05 JX |
15832 | #, c-format |
15833 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
15834 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
15835 | ||
c1ac5258 | 15836 | #: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 |
5809aa05 JX |
15837 | #, c-format |
15838 | msgid "failed to recurse into submodule '%s'" | |
c1ac5258 | 15839 | msgstr "递归子模组 '%s' 失败" |
5809aa05 | 15840 | |
c1ac5258 | 15841 | #: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 |
5809aa05 | 15842 | msgid "Suppress submodule status output" |
31e5e17b | 15843 | msgstr "阻止子模组状态输出" |
5809aa05 | 15844 | |
c1ac5258 | 15845 | #: builtin/submodule--helper.c:866 |
5809aa05 JX |
15846 | msgid "" |
15847 | "Use commit stored in the index instead of the one stored in the submodule " | |
15848 | "HEAD" | |
15849 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
15850 | ||
c1ac5258 | 15851 | #: builtin/submodule--helper.c:867 |
5809aa05 | 15852 | msgid "recurse into nested submodules" |
31e5e17b | 15853 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 15854 | |
c1ac5258 | 15855 | #: builtin/submodule--helper.c:872 |
5809aa05 JX |
15856 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
15857 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
15858 | ||
c1ac5258 | 15859 | #: builtin/submodule--helper.c:896 |
5809aa05 JX |
15860 | msgid "git submodule--helper name <path>" |
15861 | msgstr "git submodule--helper name <路径>" | |
15862 | ||
c1ac5258 | 15863 | #: builtin/submodule--helper.c:960 |
31e5e17b JX |
15864 | #, c-format |
15865 | msgid "Synchronizing submodule url for '%s'\n" | |
15866 | msgstr "为 '%s' 同步子模组 url\n" | |
15867 | ||
c1ac5258 | 15868 | #: builtin/submodule--helper.c:966 |
31e5e17b JX |
15869 | #, c-format |
15870 | msgid "failed to register url for submodule path '%s'" | |
15871 | msgstr "无法为子模组路径 '%s' 注册 url" | |
15872 | ||
c1ac5258 | 15873 | #: builtin/submodule--helper.c:980 |
31e5e17b JX |
15874 | #, c-format |
15875 | msgid "failed to get the default remote for submodule '%s'" | |
15876 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
15877 | ||
c1ac5258 | 15878 | #: builtin/submodule--helper.c:991 |
31e5e17b JX |
15879 | #, c-format |
15880 | msgid "failed to update remote for submodule '%s'" | |
15881 | msgstr "无法为子模组 '%s' 更新远程关联" | |
15882 | ||
c1ac5258 | 15883 | #: builtin/submodule--helper.c:1038 |
31e5e17b JX |
15884 | msgid "Suppress output of synchronizing submodule url" |
15885 | msgstr "阻止子模组 url 同步的输出" | |
15886 | ||
c1ac5258 | 15887 | #: builtin/submodule--helper.c:1045 |
31e5e17b JX |
15888 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
15889 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
15890 | ||
c1ac5258 | 15891 | #: builtin/submodule--helper.c:1099 |
31e5e17b JX |
15892 | #, c-format |
15893 | msgid "" | |
15894 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
15895 | "really want to remove it including all of its history)" | |
15896 | msgstr "" | |
fd8cb379 JX |
15897 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
15898 | "-rf' 命令)" | |
31e5e17b | 15899 | |
c1ac5258 | 15900 | #: builtin/submodule--helper.c:1111 |
31e5e17b JX |
15901 | #, c-format |
15902 | msgid "" | |
15903 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
15904 | "them" | |
15905 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
15906 | ||
c1ac5258 | 15907 | #: builtin/submodule--helper.c:1119 |
31e5e17b JX |
15908 | #, c-format |
15909 | msgid "Cleared directory '%s'\n" | |
15910 | msgstr "已清除目录 '%s'\n" | |
15911 | ||
c1ac5258 | 15912 | #: builtin/submodule--helper.c:1121 |
31e5e17b JX |
15913 | #, c-format |
15914 | msgid "Could not remove submodule work tree '%s'\n" | |
15915 | msgstr "无法移除子模组工作区 '%s'\n" | |
15916 | ||
c1ac5258 | 15917 | #: builtin/submodule--helper.c:1132 |
31e5e17b JX |
15918 | #, c-format |
15919 | msgid "could not create empty submodule directory %s" | |
15920 | msgstr "不能创建空的子模组目录 %s" | |
15921 | ||
c1ac5258 | 15922 | #: builtin/submodule--helper.c:1148 |
31e5e17b JX |
15923 | #, c-format |
15924 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
15925 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
15926 | ||
c1ac5258 | 15927 | #: builtin/submodule--helper.c:1177 |
31e5e17b JX |
15928 | msgid "Remove submodule working trees even if they contain local changes" |
15929 | msgstr "删除子模组工作区,即使包含本地修改" | |
15930 | ||
c1ac5258 | 15931 | #: builtin/submodule--helper.c:1178 |
31e5e17b JX |
15932 | msgid "Unregister all submodules" |
15933 | msgstr "将所有子模组取消注册" | |
15934 | ||
c1ac5258 | 15935 | #: builtin/submodule--helper.c:1183 |
31e5e17b JX |
15936 | msgid "" |
15937 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
15938 | msgstr "" | |
15939 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
15940 | ||
c1ac5258 | 15941 | #: builtin/submodule--helper.c:1197 |
31e5e17b JX |
15942 | msgid "Use '--all' if you really want to deinitialize all submodules" |
15943 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
15944 | ||
c1ac5258 | 15945 | #: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 |
a0b6b246 JX |
15946 | #, c-format |
15947 | msgid "submodule '%s' cannot add alternate: %s" | |
15948 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
15949 | ||
c1ac5258 | 15950 | #: builtin/submodule--helper.c:1329 |
a0b6b246 JX |
15951 | #, c-format |
15952 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
15953 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
15954 | ||
c1ac5258 | 15955 | #: builtin/submodule--helper.c:1336 |
a0b6b246 JX |
15956 | #, c-format |
15957 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
15958 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
15959 | ||
c1ac5258 | 15960 | #: builtin/submodule--helper.c:1359 |
94550ed3 JX |
15961 | msgid "where the new submodule will be cloned to" |
15962 | msgstr "新的子模组将要克隆的路径" | |
15963 | ||
c1ac5258 | 15964 | #: builtin/submodule--helper.c:1362 |
94550ed3 JX |
15965 | msgid "name of the new submodule" |
15966 | msgstr "新子模组的名称" | |
15967 | ||
c1ac5258 | 15968 | #: builtin/submodule--helper.c:1365 |
94550ed3 JX |
15969 | msgid "url where to clone the submodule from" |
15970 | msgstr "克隆子模组的 url 地址" | |
15971 | ||
c1ac5258 | 15972 | #: builtin/submodule--helper.c:1373 |
94550ed3 JX |
15973 | msgid "depth for shallow clones" |
15974 | msgstr "浅克隆的深度" | |
15975 | ||
c1ac5258 | 15976 | #: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 |
a0b6b246 | 15977 | msgid "force cloning progress" |
29004bbb | 15978 | msgstr "强制显示克隆进度" |
a0b6b246 | 15979 | |
c1ac5258 | 15980 | #: builtin/submodule--helper.c:1381 |
94550ed3 JX |
15981 | msgid "" |
15982 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 15983 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
15984 | msgstr "" |
15985 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
15986 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 15987 | |
c1ac5258 | 15988 | #: builtin/submodule--helper.c:1412 |
94550ed3 JX |
15989 | #, c-format |
15990 | msgid "clone of '%s' into submodule path '%s' failed" | |
15991 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
15992 | ||
c1ac5258 | 15993 | #: builtin/submodule--helper.c:1426 |
94550ed3 JX |
15994 | #, c-format |
15995 | msgid "could not get submodule directory for '%s'" | |
15996 | msgstr "无法得到 '%s' 的子模组目录" | |
15997 | ||
c1ac5258 | 15998 | #: builtin/submodule--helper.c:1492 |
5b04ee3b JX |
15999 | #, c-format |
16000 | msgid "Submodule path '%s' not initialized" | |
16001 | msgstr "子模组 '%s' 尚未初始化" | |
16002 | ||
c1ac5258 | 16003 | #: builtin/submodule--helper.c:1496 |
5b04ee3b JX |
16004 | msgid "Maybe you want to use 'update --init'?" |
16005 | msgstr "也许您想要执行 'update --init'?" | |
16006 | ||
c1ac5258 | 16007 | #: builtin/submodule--helper.c:1525 |
5b04ee3b JX |
16008 | #, c-format |
16009 | msgid "Skipping unmerged submodule %s" | |
16010 | msgstr "略过未合并的子模组 %s" | |
16011 | ||
c1ac5258 | 16012 | #: builtin/submodule--helper.c:1554 |
5b04ee3b JX |
16013 | #, c-format |
16014 | msgid "Skipping submodule '%s'" | |
16015 | msgstr "略过子模组 '%s'" | |
16016 | ||
c1ac5258 | 16017 | #: builtin/submodule--helper.c:1689 |
5c57d762 JX |
16018 | #, c-format |
16019 | msgid "Failed to clone '%s'. Retry scheduled" | |
16020 | msgstr "克隆 '%s' 失败。按计划重试" | |
16021 | ||
c1ac5258 | 16022 | #: builtin/submodule--helper.c:1700 |
5c57d762 JX |
16023 | #, c-format |
16024 | msgid "Failed to clone '%s' a second time, aborting" | |
16025 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
16026 | ||
c1ac5258 | 16027 | #: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 |
5b04ee3b JX |
16028 | msgid "path into the working tree" |
16029 | msgstr "到工作区的路径" | |
16030 | ||
c1ac5258 | 16031 | #: builtin/submodule--helper.c:1733 |
5b04ee3b JX |
16032 | msgid "path into the working tree, across nested submodule boundaries" |
16033 | msgstr "工作区中的路径,递归嵌套子模组" | |
16034 | ||
c1ac5258 | 16035 | #: builtin/submodule--helper.c:1737 |
5b04ee3b JX |
16036 | msgid "rebase, merge, checkout or none" |
16037 | msgstr "rebase、merge、checkout 或 none" | |
16038 | ||
c1ac5258 | 16039 | #: builtin/submodule--helper.c:1743 |
5b04ee3b JX |
16040 | msgid "Create a shallow clone truncated to the specified number of revisions" |
16041 | msgstr "创建一个指定深度的浅克隆" | |
16042 | ||
c1ac5258 | 16043 | #: builtin/submodule--helper.c:1746 |
5b04ee3b JX |
16044 | msgid "parallel jobs" |
16045 | msgstr "并发任务" | |
16046 | ||
c1ac5258 | 16047 | #: builtin/submodule--helper.c:1748 |
5c57d762 | 16048 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 16049 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 16050 | |
c1ac5258 | 16051 | #: builtin/submodule--helper.c:1749 |
5b04ee3b JX |
16052 | msgid "don't print cloning progress" |
16053 | msgstr "不要输出克隆进度" | |
94550ed3 | 16054 | |
c1ac5258 | 16055 | #: builtin/submodule--helper.c:1756 |
5b04ee3b JX |
16056 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
16057 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
16058 | ||
c1ac5258 | 16059 | #: builtin/submodule--helper.c:1769 |
5b04ee3b JX |
16060 | msgid "bad value for update parameter" |
16061 | msgstr "update 参数取值错误" | |
16062 | ||
c1ac5258 | 16063 | #: builtin/submodule--helper.c:1837 |
5c57d762 JX |
16064 | #, c-format |
16065 | msgid "" | |
16066 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
16067 | "the superproject is not on any branch" | |
16068 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
16069 | ||
c1ac5258 | 16070 | #: builtin/submodule--helper.c:1954 |
1a79b2f1 JX |
16071 | msgid "recurse into submodules" |
16072 | msgstr "在子模组中递归" | |
16073 | ||
c1ac5258 | 16074 | #: builtin/submodule--helper.c:1960 |
1a79b2f1 JX |
16075 | msgid "git submodule--helper embed-git-dir [<path>...]" |
16076 | msgstr "git submodule--helper embed-git-dir [<路径>...]" | |
16077 | ||
c1ac5258 | 16078 | #: builtin/submodule--helper.c:2071 |
1a79b2f1 JX |
16079 | #, c-format |
16080 | msgid "%s doesn't support --super-prefix" | |
16081 | msgstr "%s 不支持 --super-prefix" | |
16082 | ||
c1ac5258 | 16083 | #: builtin/submodule--helper.c:2077 |
94550ed3 | 16084 | #, c-format |
5b04ee3b JX |
16085 | msgid "'%s' is not a valid submodule--helper subcommand" |
16086 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 16087 | |
a4f16749 | 16088 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
16089 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
16090 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 16091 | |
a4f16749 | 16092 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
16093 | msgid "git symbolic-ref -d [-q] <name>" |
16094 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 16095 | |
6937cb4e | 16096 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 16097 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
16098 | msgstr "不显示非符号(分离的)引用的错误信息" |
16099 | ||
6937cb4e | 16100 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
16101 | msgid "delete symbolic ref" |
16102 | msgstr "删除符号引用" | |
ef317cd5 | 16103 | |
6937cb4e | 16104 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 16105 | msgid "shorten ref output" |
6937cb4e | 16106 | msgstr "缩短引用输出" |
ef317cd5 | 16107 | |
c1ac5258 | 16108 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 16109 | msgid "reason" |
07432cef | 16110 | msgstr "原因" |
ef317cd5 | 16111 | |
c1ac5258 | 16112 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 16113 | msgid "reason of the update" |
07432cef | 16114 | msgstr "更新的原因" |
ef317cd5 | 16115 | |
c1ac5258 | 16116 | #: builtin/tag.c:25 |
ef317cd5 | 16117 | msgid "" |
814ff314 JX |
16118 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
16119 | "[<head>]" | |
16120 | msgstr "" | |
16121 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 16122 | |
c1ac5258 | 16123 | #: builtin/tag.c:26 |
ef317cd5 | 16124 | msgid "git tag -d <tagname>..." |
07432cef | 16125 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 16126 | |
c1ac5258 | 16127 | #: builtin/tag.c:27 |
ef317cd5 | 16128 | msgid "" |
87cb7997 JX |
16129 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
16130 | "points-at <object>]\n" | |
94550ed3 | 16131 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 16132 | msgstr "" |
87cb7997 JX |
16133 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
16134 | "at <对象>]\n" | |
94550ed3 | 16135 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 16136 | |
c1ac5258 | 16137 | #: builtin/tag.c:29 |
1a79b2f1 JX |
16138 | msgid "git tag -v [--format=<format>] <tagname>..." |
16139 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 16140 | |
c1ac5258 | 16141 | #: builtin/tag.c:87 |
c04f5ac3 JX |
16142 | #, c-format |
16143 | msgid "tag '%s' not found." | |
55a16ee4 | 16144 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 16145 | |
c1ac5258 | 16146 | #: builtin/tag.c:103 |
c04f5ac3 JX |
16147 | #, c-format |
16148 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 16149 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 16150 | |
c1ac5258 | 16151 | #: builtin/tag.c:133 |
a77c07d9 | 16152 | #, c-format |
c04f5ac3 JX |
16153 | msgid "" |
16154 | "\n" | |
6acbf033 JX |
16155 | "Write a message for tag:\n" |
16156 | " %s\n" | |
a77c07d9 | 16157 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
16158 | msgstr "" |
16159 | "\n" | |
55a16ee4 | 16160 | "输入一个标签说明:\n" |
6acbf033 | 16161 | " %s\n" |
a77c07d9 | 16162 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 16163 | |
c1ac5258 | 16164 | #: builtin/tag.c:137 |
a77c07d9 | 16165 | #, c-format |
c04f5ac3 JX |
16166 | msgid "" |
16167 | "\n" | |
6acbf033 JX |
16168 | "Write a message for tag:\n" |
16169 | " %s\n" | |
a77c07d9 | 16170 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 16171 | "want to.\n" |
c04f5ac3 JX |
16172 | msgstr "" |
16173 | "\n" | |
55a16ee4 | 16174 | "输入一个标签说明:\n" |
6acbf033 | 16175 | " %s\n" |
a77c07d9 | 16176 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 16177 | |
c1ac5258 | 16178 | #: builtin/tag.c:191 |
c04f5ac3 | 16179 | msgid "unable to sign the tag" |
55a16ee4 | 16180 | msgstr "无法签署标签" |
c04f5ac3 | 16181 | |
c1ac5258 | 16182 | #: builtin/tag.c:193 |
c04f5ac3 | 16183 | msgid "unable to write tag file" |
55a16ee4 | 16184 | msgstr "无法写标签文件" |
c04f5ac3 | 16185 | |
c1ac5258 | 16186 | #: builtin/tag.c:218 |
c04f5ac3 | 16187 | msgid "bad object type." |
90e6ef53 | 16188 | msgstr "坏的对象类型。" |
c04f5ac3 | 16189 | |
c1ac5258 | 16190 | #: builtin/tag.c:267 |
c04f5ac3 | 16191 | msgid "no tag message?" |
55a16ee4 | 16192 | msgstr "无标签说明?" |
c04f5ac3 | 16193 | |
c1ac5258 | 16194 | #: builtin/tag.c:274 |
c04f5ac3 JX |
16195 | #, c-format |
16196 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 16197 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 16198 | |
c1ac5258 | 16199 | #: builtin/tag.c:383 |
ef317cd5 | 16200 | msgid "list tag names" |
55a16ee4 | 16201 | msgstr "列出标签名称" |
ef317cd5 | 16202 | |
c1ac5258 | 16203 | #: builtin/tag.c:385 |
ef317cd5 | 16204 | msgid "print <n> lines of each tag message" |
55a16ee4 | 16205 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 16206 | |
c1ac5258 | 16207 | #: builtin/tag.c:387 |
ef317cd5 | 16208 | msgid "delete tags" |
55a16ee4 | 16209 | msgstr "删除标签" |
ef317cd5 | 16210 | |
c1ac5258 | 16211 | #: builtin/tag.c:388 |
ef317cd5 | 16212 | msgid "verify tags" |
55a16ee4 | 16213 | msgstr "验证标签" |
ef317cd5 | 16214 | |
c1ac5258 | 16215 | #: builtin/tag.c:390 |
ef317cd5 | 16216 | msgid "Tag creation options" |
55a16ee4 | 16217 | msgstr "标签创建选项" |
ef317cd5 | 16218 | |
c1ac5258 | 16219 | #: builtin/tag.c:392 |
ef317cd5 | 16220 | msgid "annotated tag, needs a message" |
55a16ee4 | 16221 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 16222 | |
c1ac5258 | 16223 | #: builtin/tag.c:394 |
ef317cd5 | 16224 | msgid "tag message" |
55a16ee4 | 16225 | msgstr "标签说明" |
ef317cd5 | 16226 | |
c1ac5258 | 16227 | #: builtin/tag.c:396 |
31e5e17b JX |
16228 | msgid "force edit of tag message" |
16229 | msgstr "强制编辑标签说明" | |
16230 | ||
c1ac5258 | 16231 | #: builtin/tag.c:397 |
ef317cd5 | 16232 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 16233 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 16234 | |
c1ac5258 | 16235 | #: builtin/tag.c:401 |
ef317cd5 | 16236 | msgid "use another key to sign the tag" |
55a16ee4 | 16237 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 16238 | |
c1ac5258 | 16239 | #: builtin/tag.c:402 |
ef317cd5 | 16240 | msgid "replace the tag if exists" |
55a16ee4 | 16241 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 16242 | |
c1ac5258 | 16243 | #: builtin/tag.c:403 builtin/update-ref.c:369 |
03ea3327 | 16244 | msgid "create a reflog" |
1b7f4a34 JX |
16245 | msgstr "创建引用日志" |
16246 | ||
c1ac5258 | 16247 | #: builtin/tag.c:405 |
814ff314 | 16248 | msgid "Tag listing options" |
55a16ee4 | 16249 | msgstr "标签列表选项" |
814ff314 | 16250 | |
c1ac5258 | 16251 | #: builtin/tag.c:406 |
ef317cd5 | 16252 | msgid "show tag list in columns" |
55a16ee4 | 16253 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 16254 | |
c1ac5258 | 16255 | #: builtin/tag.c:407 builtin/tag.c:409 |
ef317cd5 | 16256 | msgid "print only tags that contain the commit" |
87cb7997 | 16257 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 16258 | |
c1ac5258 | 16259 | #: builtin/tag.c:408 builtin/tag.c:410 |
87cb7997 JX |
16260 | msgid "print only tags that don't contain the commit" |
16261 | msgstr "只打印不包含该提交的标签" | |
16262 | ||
c1ac5258 | 16263 | #: builtin/tag.c:411 |
94550ed3 JX |
16264 | msgid "print only tags that are merged" |
16265 | msgstr "只打印已经合并的标签" | |
16266 | ||
c1ac5258 | 16267 | #: builtin/tag.c:412 |
94550ed3 JX |
16268 | msgid "print only tags that are not merged" |
16269 | msgstr "只打印尚未合并的标签" | |
16270 | ||
c1ac5258 | 16271 | #: builtin/tag.c:417 |
ef317cd5 | 16272 | msgid "print only tags of the object" |
87cb7997 | 16273 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 16274 | |
c1ac5258 | 16275 | #: builtin/tag.c:461 |
8ada9598 | 16276 | msgid "--column and -n are incompatible" |
81809b99 | 16277 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 16278 | |
c1ac5258 | 16279 | #: builtin/tag.c:483 |
87cb7997 JX |
16280 | msgid "-n option is only allowed in list mode" |
16281 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 16282 | |
c1ac5258 | 16283 | #: builtin/tag.c:485 |
87cb7997 JX |
16284 | msgid "--contains option is only allowed in list mode" |
16285 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 16286 | |
c1ac5258 | 16287 | #: builtin/tag.c:487 |
87cb7997 JX |
16288 | msgid "--no-contains option is only allowed in list mode" |
16289 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 16290 | |
c1ac5258 | 16291 | #: builtin/tag.c:489 |
87cb7997 JX |
16292 | msgid "--points-at option is only allowed in list mode" |
16293 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 16294 | |
c1ac5258 | 16295 | #: builtin/tag.c:491 |
87cb7997 JX |
16296 | msgid "--merged and --no-merged options are only allowed in list mode" |
16297 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
16298 | ||
c1ac5258 | 16299 | #: builtin/tag.c:502 |
c04f5ac3 JX |
16300 | msgid "only one -F or -m option is allowed." |
16301 | msgstr "只允许一个 -F 或 -m 选项。" | |
16302 | ||
c1ac5258 | 16303 | #: builtin/tag.c:521 |
c04f5ac3 JX |
16304 | msgid "too many params" |
16305 | msgstr "太多参数" | |
16306 | ||
c1ac5258 | 16307 | #: builtin/tag.c:527 |
c04f5ac3 JX |
16308 | #, c-format |
16309 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 16310 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 16311 | |
c1ac5258 | 16312 | #: builtin/tag.c:532 |
c04f5ac3 JX |
16313 | #, c-format |
16314 | msgid "tag '%s' already exists" | |
55a16ee4 | 16315 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 16316 | |
c1ac5258 | 16317 | #: builtin/tag.c:563 |
c04f5ac3 JX |
16318 | #, c-format |
16319 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 16320 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 16321 | |
c1ac5258 | 16322 | #: builtin/unpack-objects.c:500 |
6c94aba5 JX |
16323 | msgid "Unpacking objects" |
16324 | msgstr "展开对象中" | |
16325 | ||
5809aa05 | 16326 | #: builtin/update-index.c:82 |
7aea43ff JX |
16327 | #, c-format |
16328 | msgid "failed to create directory %s" | |
c1ac5258 | 16329 | msgstr "创建目录 %s 失败" |
7aea43ff | 16330 | |
5809aa05 | 16331 | #: builtin/update-index.c:98 |
7aea43ff JX |
16332 | #, c-format |
16333 | msgid "failed to create file %s" | |
c1ac5258 | 16334 | msgstr "创建文件 %s 失败" |
7aea43ff | 16335 | |
5809aa05 | 16336 | #: builtin/update-index.c:106 |
7aea43ff JX |
16337 | #, c-format |
16338 | msgid "failed to delete file %s" | |
c1ac5258 | 16339 | msgstr "删除文件 %s 失败" |
7aea43ff | 16340 | |
5809aa05 | 16341 | #: builtin/update-index.c:113 builtin/update-index.c:219 |
7aea43ff JX |
16342 | #, c-format |
16343 | msgid "failed to delete directory %s" | |
c1ac5258 | 16344 | msgstr "删除目录 %s 失败" |
7aea43ff | 16345 | |
5809aa05 | 16346 | #: builtin/update-index.c:138 |
7aea43ff | 16347 | #, c-format |
276ceeaa JX |
16348 | msgid "Testing mtime in '%s' " |
16349 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 16350 | |
5809aa05 | 16351 | #: builtin/update-index.c:152 |
7aea43ff JX |
16352 | msgid "directory stat info does not change after adding a new file" |
16353 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
16354 | ||
5809aa05 | 16355 | #: builtin/update-index.c:165 |
7aea43ff JX |
16356 | msgid "directory stat info does not change after adding a new directory" |
16357 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
16358 | ||
5809aa05 | 16359 | #: builtin/update-index.c:178 |
7aea43ff JX |
16360 | msgid "directory stat info changes after updating a file" |
16361 | msgstr "更新一个文件后,目录的状态信息被修改" | |
16362 | ||
5809aa05 | 16363 | #: builtin/update-index.c:189 |
7aea43ff JX |
16364 | msgid "directory stat info changes after adding a file inside subdirectory" |
16365 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
16366 | ||
5809aa05 | 16367 | #: builtin/update-index.c:200 |
7aea43ff JX |
16368 | msgid "directory stat info does not change after deleting a file" |
16369 | msgstr "删除一个文件后,目录的状态信息未改变" | |
16370 | ||
5809aa05 | 16371 | #: builtin/update-index.c:213 |
7aea43ff JX |
16372 | msgid "directory stat info does not change after deleting a directory" |
16373 | msgstr "删除一个目录后,目录的状态信息未改变" | |
16374 | ||
5809aa05 | 16375 | #: builtin/update-index.c:220 |
7aea43ff JX |
16376 | msgid " OK" |
16377 | msgstr " OK" | |
16378 | ||
c1ac5258 | 16379 | #: builtin/update-index.c:588 |
814ff314 JX |
16380 | msgid "git update-index [<options>] [--] [<file>...]" |
16381 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 16382 | |
c1ac5258 | 16383 | #: builtin/update-index.c:944 |
ef317cd5 | 16384 | msgid "continue refresh even when index needs update" |
07432cef | 16385 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 16386 | |
c1ac5258 | 16387 | #: builtin/update-index.c:947 |
ef317cd5 | 16388 | msgid "refresh: ignore submodules" |
07432cef | 16389 | msgstr "刷新:忽略子模组" |
8ada9598 | 16390 | |
c1ac5258 | 16391 | #: builtin/update-index.c:950 |
ef317cd5 | 16392 | msgid "do not ignore new files" |
07432cef | 16393 | msgstr "不忽略新的文件" |
8ada9598 | 16394 | |
c1ac5258 | 16395 | #: builtin/update-index.c:952 |
ef317cd5 | 16396 | msgid "let files replace directories and vice-versa" |
07432cef | 16397 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 16398 | |
c1ac5258 | 16399 | #: builtin/update-index.c:954 |
ef317cd5 | 16400 | msgid "notice files missing from worktree" |
07432cef | 16401 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 16402 | |
c1ac5258 | 16403 | #: builtin/update-index.c:956 |
ef317cd5 | 16404 | msgid "refresh even if index contains unmerged entries" |
07432cef | 16405 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 16406 | |
c1ac5258 | 16407 | #: builtin/update-index.c:959 |
ef317cd5 | 16408 | msgid "refresh stat information" |
07432cef | 16409 | msgstr "刷新统计信息" |
ef317cd5 | 16410 | |
c1ac5258 | 16411 | #: builtin/update-index.c:963 |
ef317cd5 | 16412 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 16413 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 16414 | |
c1ac5258 | 16415 | #: builtin/update-index.c:967 |
6c94aba5 | 16416 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 16417 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 16418 | |
c1ac5258 | 16419 | #: builtin/update-index.c:968 |
ef317cd5 | 16420 | msgid "add the specified entry to the index" |
07432cef | 16421 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 16422 | |
c1ac5258 | 16423 | #: builtin/update-index.c:977 |
ef317cd5 | 16424 | msgid "mark files as \"not changing\"" |
07432cef | 16425 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 16426 | |
c1ac5258 | 16427 | #: builtin/update-index.c:980 |
ef317cd5 | 16428 | msgid "clear assumed-unchanged bit" |
07432cef | 16429 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 16430 | |
c1ac5258 | 16431 | #: builtin/update-index.c:983 |
ef317cd5 | 16432 | msgid "mark files as \"index-only\"" |
07432cef | 16433 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 16434 | |
c1ac5258 | 16435 | #: builtin/update-index.c:986 |
ef317cd5 | 16436 | msgid "clear skip-worktree bit" |
07432cef | 16437 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 16438 | |
c1ac5258 | 16439 | #: builtin/update-index.c:989 |
ef317cd5 | 16440 | msgid "add to index only; do not add content to object database" |
07432cef | 16441 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 16442 | |
c1ac5258 | 16443 | #: builtin/update-index.c:991 |
ef317cd5 | 16444 | msgid "remove named paths even if present in worktree" |
07432cef | 16445 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 16446 | |
c1ac5258 | 16447 | #: builtin/update-index.c:993 |
ef317cd5 | 16448 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 16449 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 16450 | |
c1ac5258 | 16451 | #: builtin/update-index.c:995 |
ef317cd5 | 16452 | msgid "read list of paths to be updated from standard input" |
07432cef | 16453 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 16454 | |
c1ac5258 | 16455 | #: builtin/update-index.c:999 |
ef317cd5 | 16456 | msgid "add entries from standard input to the index" |
07432cef | 16457 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 16458 | |
c1ac5258 | 16459 | #: builtin/update-index.c:1003 |
ef317cd5 | 16460 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 16461 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 16462 | |
c1ac5258 | 16463 | #: builtin/update-index.c:1007 |
ef317cd5 | 16464 | msgid "only update entries that differ from HEAD" |
07432cef | 16465 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 16466 | |
c1ac5258 | 16467 | #: builtin/update-index.c:1011 |
ef317cd5 | 16468 | msgid "ignore files missing from worktree" |
07432cef | 16469 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 16470 | |
c1ac5258 | 16471 | #: builtin/update-index.c:1014 |
ef317cd5 | 16472 | msgid "report actions to standard output" |
07432cef | 16473 | msgstr "在标准输出显示操作" |
ef317cd5 | 16474 | |
c1ac5258 | 16475 | #: builtin/update-index.c:1016 |
ef317cd5 | 16476 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 16477 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 16478 | |
c1ac5258 | 16479 | #: builtin/update-index.c:1020 |
ef317cd5 | 16480 | msgid "write index in this format" |
07432cef | 16481 | msgstr "以这种格式写入索引区" |
ef317cd5 | 16482 | |
c1ac5258 | 16483 | #: builtin/update-index.c:1022 |
6acbf033 JX |
16484 | msgid "enable or disable split index" |
16485 | msgstr "启用或禁用索引拆分" | |
16486 | ||
c1ac5258 | 16487 | #: builtin/update-index.c:1024 |
7aea43ff JX |
16488 | msgid "enable/disable untracked cache" |
16489 | msgstr "启用/禁用对未跟踪文件的缓存" | |
16490 | ||
c1ac5258 | 16491 | #: builtin/update-index.c:1026 |
276ceeaa JX |
16492 | msgid "test if the filesystem supports untracked cache" |
16493 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
16494 | ||
c1ac5258 | 16495 | #: builtin/update-index.c:1028 |
7aea43ff JX |
16496 | msgid "enable untracked cache without testing the filesystem" |
16497 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
16498 | ||
c1ac5258 | 16499 | #: builtin/update-index.c:1030 |
5809aa05 JX |
16500 | msgid "write out the index even if is not flagged as changed" |
16501 | msgstr "即使没有被标记为已更改,也要写出索引" | |
16502 | ||
c1ac5258 | 16503 | #: builtin/update-index.c:1032 |
5809aa05 JX |
16504 | msgid "enable or disable file system monitor" |
16505 | msgstr "启用或禁用文件系统监控" | |
16506 | ||
c1ac5258 | 16507 | #: builtin/update-index.c:1034 |
5809aa05 JX |
16508 | msgid "mark files as fsmonitor valid" |
16509 | msgstr "标记文件为 fsmonitor 有效" | |
16510 | ||
c1ac5258 | 16511 | #: builtin/update-index.c:1037 |
5809aa05 JX |
16512 | msgid "clear fsmonitor valid bit" |
16513 | msgstr "清除 fsmonitor 有效位" | |
16514 | ||
c1ac5258 | 16515 | #: builtin/update-index.c:1136 |
87cb7997 JX |
16516 | msgid "" |
16517 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
16518 | "enable split index" | |
16519 | msgstr "" | |
16520 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
16521 | ||
c1ac5258 | 16522 | #: builtin/update-index.c:1145 |
87cb7997 JX |
16523 | msgid "" |
16524 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
16525 | "disable split index" | |
16526 | msgstr "" | |
16527 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
16528 | ||
c1ac5258 | 16529 | #: builtin/update-index.c:1156 |
a0b6b246 JX |
16530 | msgid "" |
16531 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
16532 | "to disable the untracked cache" | |
275588f9 JX |
16533 | msgstr "" |
16534 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
16535 | "改它。" | |
a0b6b246 | 16536 | |
c1ac5258 | 16537 | #: builtin/update-index.c:1160 |
276ceeaa JX |
16538 | msgid "Untracked cache disabled" |
16539 | msgstr "缓存未跟踪文件被禁用" | |
16540 | ||
c1ac5258 | 16541 | #: builtin/update-index.c:1168 |
a0b6b246 JX |
16542 | msgid "" |
16543 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
16544 | "to enable the untracked cache" | |
275588f9 JX |
16545 | msgstr "" |
16546 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
16547 | "修改它。" | |
a0b6b246 | 16548 | |
c1ac5258 | 16549 | #: builtin/update-index.c:1172 |
276ceeaa JX |
16550 | #, c-format |
16551 | msgid "Untracked cache enabled for '%s'" | |
16552 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
16553 | ||
c1ac5258 | 16554 | #: builtin/update-index.c:1180 |
5809aa05 | 16555 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 16556 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 16557 | |
c1ac5258 | 16558 | #: builtin/update-index.c:1184 |
5809aa05 JX |
16559 | msgid "fsmonitor enabled" |
16560 | msgstr "fsmonitor 被启用" | |
16561 | ||
c1ac5258 | 16562 | #: builtin/update-index.c:1187 |
5809aa05 JX |
16563 | msgid "" |
16564 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 16565 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 16566 | |
c1ac5258 | 16567 | #: builtin/update-index.c:1191 |
5809aa05 JX |
16568 | msgid "fsmonitor disabled" |
16569 | msgstr "fsmonitor 被禁用" | |
16570 | ||
a4f16749 | 16571 | #: builtin/update-ref.c:10 |
814ff314 JX |
16572 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
16573 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 16574 | |
a4f16749 | 16575 | #: builtin/update-ref.c:11 |
814ff314 JX |
16576 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
16577 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 16578 | |
a4f16749 | 16579 | #: builtin/update-ref.c:12 |
814ff314 JX |
16580 | msgid "git update-ref [<options>] --stdin [-z]" |
16581 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 16582 | |
c1ac5258 | 16583 | #: builtin/update-ref.c:364 |
ef317cd5 | 16584 | msgid "delete the reference" |
07432cef | 16585 | msgstr "删除引用" |
ef317cd5 | 16586 | |
c1ac5258 | 16587 | #: builtin/update-ref.c:366 |
ef317cd5 | 16588 | msgid "update <refname> not the one it points to" |
07432cef | 16589 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 16590 | |
c1ac5258 | 16591 | #: builtin/update-ref.c:367 |
90314792 JX |
16592 | msgid "stdin has NUL-terminated arguments" |
16593 | msgstr "标准输入有以 NUL 字符终止的参数" | |
16594 | ||
c1ac5258 | 16595 | #: builtin/update-ref.c:368 |
90314792 JX |
16596 | msgid "read updates from stdin" |
16597 | msgstr "从标准输入读取更新" | |
16598 | ||
a4f16749 | 16599 | #: builtin/update-server-info.c:7 |
ef317cd5 | 16600 | msgid "git update-server-info [--force]" |
07432cef | 16601 | msgstr "git update-server-info [--force]" |
ef317cd5 | 16602 | |
a4f16749 | 16603 | #: builtin/update-server-info.c:15 |
ef317cd5 | 16604 | msgid "update the info files from scratch" |
07432cef | 16605 | msgstr "从头开始更新文件信息" |
ef317cd5 | 16606 | |
fd8cb379 JX |
16607 | #: builtin/upload-pack.c:11 |
16608 | msgid "git upload-pack [<options>] <dir>" | |
16609 | msgstr "git upload-pack [<选项>] <目录>" | |
16610 | ||
16611 | #: builtin/upload-pack.c:25 | |
16612 | msgid "exit immediately after initial ref advertisement" | |
16613 | msgstr "在初始的引用广告后立即退出" | |
16614 | ||
16615 | #: builtin/upload-pack.c:27 | |
16616 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
16617 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
16618 | ||
16619 | #: builtin/upload-pack.c:29 | |
16620 | msgid "interrupt transfer after <n> seconds of inactivity" | |
16621 | msgstr "不活动 <n> 秒钟后终止传输" | |
16622 | ||
c1ac5258 | 16623 | #: builtin/verify-commit.c:20 |
814ff314 JX |
16624 | msgid "git verify-commit [-v | --verbose] <commit>..." |
16625 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 16626 | |
c1ac5258 | 16627 | #: builtin/verify-commit.c:76 |
6acbf033 JX |
16628 | msgid "print commit contents" |
16629 | msgstr "打印提交内容" | |
16630 | ||
c1ac5258 | 16631 | #: builtin/verify-commit.c:77 builtin/verify-tag.c:38 |
1b7f4a34 JX |
16632 | msgid "print raw gpg status output" |
16633 | msgstr "打印原始 gpg 状态输出" | |
16634 | ||
a4f16749 | 16635 | #: builtin/verify-pack.c:55 |
814ff314 JX |
16636 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
16637 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 16638 | |
a4f16749 | 16639 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
16640 | msgid "verbose" |
16641 | msgstr "冗长输出" | |
16642 | ||
a4f16749 | 16643 | #: builtin/verify-pack.c:67 |
ef317cd5 | 16644 | msgid "show statistics only" |
07432cef | 16645 | msgstr "只显示统计" |
ef317cd5 | 16646 | |
a4f16749 | 16647 | #: builtin/verify-tag.c:19 |
1a79b2f1 JX |
16648 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
16649 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 16650 | |
a4f16749 | 16651 | #: builtin/verify-tag.c:37 |
ef317cd5 | 16652 | msgid "print tag contents" |
55a16ee4 | 16653 | msgstr "打印标签内容" |
ef317cd5 | 16654 | |
5809aa05 | 16655 | #: builtin/worktree.c:17 |
31e5e17b JX |
16656 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
16657 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 16658 | |
5809aa05 | 16659 | #: builtin/worktree.c:18 |
5c57d762 JX |
16660 | msgid "git worktree list [<options>]" |
16661 | msgstr "git worktree list [<选项>]" | |
16662 | ||
5809aa05 | 16663 | #: builtin/worktree.c:19 |
5c57d762 JX |
16664 | msgid "git worktree lock [<options>] <path>" |
16665 | msgstr "git worktree lock [<选项>] <路径>" | |
16666 | ||
5809aa05 | 16667 | #: builtin/worktree.c:20 |
31e5e17b JX |
16668 | msgid "git worktree move <worktree> <new-path>" |
16669 | msgstr "git worktree move <工作区> <新路径>" | |
16670 | ||
16671 | #: builtin/worktree.c:21 | |
5bb01d4f JX |
16672 | msgid "git worktree prune [<options>]" |
16673 | msgstr "git worktree prune [<选项>]" | |
16674 | ||
31e5e17b JX |
16675 | #: builtin/worktree.c:22 |
16676 | msgid "git worktree remove [<options>] <worktree>" | |
16677 | msgstr "git worktree remove [<选项>] <工作区>" | |
16678 | ||
16679 | #: builtin/worktree.c:23 | |
5c57d762 JX |
16680 | msgid "git worktree unlock <path>" |
16681 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 16682 | |
c1ac5258 | 16683 | #: builtin/worktree.c:59 |
5bb01d4f JX |
16684 | #, c-format |
16685 | msgid "Removing worktrees/%s: not a valid directory" | |
16686 | msgstr "删除工作区/%s:不是一个有效的目录" | |
16687 | ||
c1ac5258 | 16688 | #: builtin/worktree.c:65 |
5bb01d4f JX |
16689 | #, c-format |
16690 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
16691 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
16692 | ||
c1ac5258 | 16693 | #: builtin/worktree.c:70 builtin/worktree.c:79 |
5bb01d4f JX |
16694 | #, c-format |
16695 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
16696 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
16697 | ||
c1ac5258 | 16698 | #: builtin/worktree.c:89 |
6937cb4e JX |
16699 | #, c-format |
16700 | msgid "" | |
16701 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
16702 | "%<PRIuMAX>)" | |
16703 | msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
16704 | ||
c1ac5258 | 16705 | #: builtin/worktree.c:97 |
5bb01d4f JX |
16706 | #, c-format |
16707 | msgid "Removing worktrees/%s: invalid gitdir file" | |
16708 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
16709 | ||
c1ac5258 | 16710 | #: builtin/worktree.c:106 |
5bb01d4f JX |
16711 | #, c-format |
16712 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
16713 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
16714 | ||
c1ac5258 | 16715 | #: builtin/worktree.c:153 |
1a79b2f1 JX |
16716 | msgid "report pruned working trees" |
16717 | msgstr "报告清除的工作区" | |
16718 | ||
c1ac5258 | 16719 | #: builtin/worktree.c:155 |
1a79b2f1 | 16720 | msgid "expire working trees older than <time>" |
58b6f078 | 16721 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 16722 | |
c1ac5258 | 16723 | #: builtin/worktree.c:230 |
5bb01d4f JX |
16724 | #, c-format |
16725 | msgid "'%s' already exists" | |
16726 | msgstr "'%s' 已经存在" | |
16727 | ||
c1ac5258 | 16728 | #: builtin/worktree.c:261 |
5bb01d4f JX |
16729 | #, c-format |
16730 | msgid "could not create directory of '%s'" | |
16731 | msgstr "不能创建目录 '%s'" | |
16732 | ||
c1ac5258 | 16733 | #: builtin/worktree.c:380 builtin/worktree.c:386 |
fd8cb379 JX |
16734 | #, c-format |
16735 | msgid "Preparing worktree (new branch '%s')" | |
16736 | msgstr "准备工作区(新分支 '%s')" | |
16737 | ||
c1ac5258 | 16738 | #: builtin/worktree.c:382 |
fd8cb379 JX |
16739 | #, c-format |
16740 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
16741 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
16742 | ||
c1ac5258 | 16743 | #: builtin/worktree.c:391 |
fd8cb379 JX |
16744 | #, c-format |
16745 | msgid "Preparing worktree (checking out '%s')" | |
16746 | msgstr "准备工作区(检出 '%s')" | |
16747 | ||
c1ac5258 | 16748 | #: builtin/worktree.c:397 |
5bb01d4f | 16749 | #, c-format |
fd8cb379 JX |
16750 | msgid "Preparing worktree (detached HEAD %s)" |
16751 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 16752 | |
c1ac5258 | 16753 | #: builtin/worktree.c:438 |
5bb01d4f | 16754 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 16755 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 16756 | |
c1ac5258 | 16757 | #: builtin/worktree.c:441 |
5bb01d4f JX |
16758 | msgid "create a new branch" |
16759 | msgstr "创建一个新分支" | |
16760 | ||
c1ac5258 | 16761 | #: builtin/worktree.c:443 |
5bb01d4f JX |
16762 | msgid "create or reset a branch" |
16763 | msgstr "创建或重置一个分支" | |
16764 | ||
c1ac5258 | 16765 | #: builtin/worktree.c:445 |
5b04ee3b JX |
16766 | msgid "populate the new working tree" |
16767 | msgstr "生成新的工作区" | |
16768 | ||
c1ac5258 | 16769 | #: builtin/worktree.c:446 |
60638e98 JX |
16770 | msgid "keep the new working tree locked" |
16771 | msgstr "锁定新工作区" | |
16772 | ||
c1ac5258 | 16773 | #: builtin/worktree.c:449 |
5809aa05 JX |
16774 | msgid "set up tracking mode (see git-branch(1))" |
16775 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
16776 | ||
c1ac5258 | 16777 | #: builtin/worktree.c:452 |
5809aa05 JX |
16778 | msgid "try to match the new branch name with a remote-tracking branch" |
16779 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
16780 | ||
c1ac5258 | 16781 | #: builtin/worktree.c:460 |
1b7f4a34 JX |
16782 | msgid "-b, -B, and --detach are mutually exclusive" |
16783 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 16784 | |
c1ac5258 | 16785 | #: builtin/worktree.c:521 |
5809aa05 JX |
16786 | msgid "--[no-]track can only be used if a new branch is created" |
16787 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
16788 | ||
c1ac5258 | 16789 | #: builtin/worktree.c:621 |
5c57d762 JX |
16790 | msgid "reason for locking" |
16791 | msgstr "锁定原因" | |
16792 | ||
c1ac5258 JX |
16793 | #: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720 |
16794 | #: builtin/worktree.c:860 | |
5c57d762 JX |
16795 | #, c-format |
16796 | msgid "'%s' is not a working tree" | |
16797 | msgstr "'%s' 不是一个工作区" | |
16798 | ||
c1ac5258 | 16799 | #: builtin/worktree.c:635 builtin/worktree.c:668 |
5c57d762 JX |
16800 | msgid "The main working tree cannot be locked or unlocked" |
16801 | msgstr "主工作区无法被加锁或解锁" | |
16802 | ||
c1ac5258 | 16803 | #: builtin/worktree.c:640 |
5c57d762 JX |
16804 | #, c-format |
16805 | msgid "'%s' is already locked, reason: %s" | |
16806 | msgstr "'%s' 已被锁定,原因:%s" | |
16807 | ||
c1ac5258 | 16808 | #: builtin/worktree.c:642 |
5c57d762 JX |
16809 | #, c-format |
16810 | msgid "'%s' is already locked" | |
16811 | msgstr "'%s' 已被锁定" | |
16812 | ||
c1ac5258 | 16813 | #: builtin/worktree.c:670 |
5c57d762 JX |
16814 | #, c-format |
16815 | msgid "'%s' is not locked" | |
16816 | msgstr "'%s' 未被锁定" | |
16817 | ||
c1ac5258 | 16818 | #: builtin/worktree.c:695 |
31e5e17b | 16819 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 16820 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 16821 | |
c1ac5258 | 16822 | #: builtin/worktree.c:722 builtin/worktree.c:862 |
31e5e17b JX |
16823 | #, c-format |
16824 | msgid "'%s' is a main working tree" | |
16825 | msgstr "'%s' 是一个主工作区" | |
16826 | ||
c1ac5258 | 16827 | #: builtin/worktree.c:727 |
31e5e17b JX |
16828 | #, c-format |
16829 | msgid "could not figure out destination name from '%s'" | |
16830 | msgstr "无法从 '%s' 算出目标名称" | |
16831 | ||
c1ac5258 | 16832 | #: builtin/worktree.c:733 |
31e5e17b JX |
16833 | #, c-format |
16834 | msgid "target '%s' already exists" | |
16835 | msgstr "目标 '%s' 已存在" | |
16836 | ||
c1ac5258 | 16837 | #: builtin/worktree.c:740 |
31e5e17b JX |
16838 | #, c-format |
16839 | msgid "cannot move a locked working tree, lock reason: %s" | |
16840 | msgstr "无法移动一个锁定的工作区,锁定原因:%s" | |
16841 | ||
c1ac5258 | 16842 | #: builtin/worktree.c:742 |
31e5e17b JX |
16843 | msgid "cannot move a locked working tree" |
16844 | msgstr "无法移动一个锁定的工作区" | |
16845 | ||
c1ac5258 | 16846 | #: builtin/worktree.c:745 |
31e5e17b JX |
16847 | #, c-format |
16848 | msgid "validation failed, cannot move working tree: %s" | |
16849 | msgstr "验证失败,无法移动工作区:%s" | |
16850 | ||
c1ac5258 | 16851 | #: builtin/worktree.c:750 |
31e5e17b JX |
16852 | #, c-format |
16853 | msgid "failed to move '%s' to '%s'" | |
c1ac5258 | 16854 | msgstr "移动 '%s' 到 '%s' 失败" |
31e5e17b | 16855 | |
c1ac5258 | 16856 | #: builtin/worktree.c:798 |
31e5e17b JX |
16857 | #, c-format |
16858 | msgid "failed to run 'git status' on '%s'" | |
c1ac5258 | 16859 | msgstr "在 '%s' 中执行 'git status' 失败" |
31e5e17b | 16860 | |
c1ac5258 | 16861 | #: builtin/worktree.c:802 |
31e5e17b JX |
16862 | #, c-format |
16863 | msgid "'%s' is dirty, use --force to delete it" | |
16864 | msgstr "'%s' 是脏的,使用 --force 删除" | |
16865 | ||
c1ac5258 | 16866 | #: builtin/worktree.c:807 |
31e5e17b JX |
16867 | #, c-format |
16868 | msgid "failed to run 'git status' on '%s', code %d" | |
c1ac5258 | 16869 | msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" |
31e5e17b | 16870 | |
c1ac5258 | 16871 | #: builtin/worktree.c:818 builtin/worktree.c:832 |
31e5e17b JX |
16872 | #, c-format |
16873 | msgid "failed to delete '%s'" | |
c1ac5258 | 16874 | msgstr "删除 '%s' 失败" |
31e5e17b | 16875 | |
c1ac5258 | 16876 | #: builtin/worktree.c:844 |
31e5e17b JX |
16877 | msgid "force removing even if the worktree is dirty" |
16878 | msgstr "强制删除,即使工作区是脏的" | |
16879 | ||
c1ac5258 | 16880 | #: builtin/worktree.c:866 |
31e5e17b JX |
16881 | #, c-format |
16882 | msgid "cannot remove a locked working tree, lock reason: %s" | |
16883 | msgstr "无法删除一个锁定的工作区,锁定原因:%s" | |
16884 | ||
c1ac5258 | 16885 | #: builtin/worktree.c:868 |
31e5e17b JX |
16886 | msgid "cannot remove a locked working tree" |
16887 | msgstr "无法删除一个锁定的工作区" | |
16888 | ||
c1ac5258 | 16889 | #: builtin/worktree.c:871 |
31e5e17b JX |
16890 | #, c-format |
16891 | msgid "validation failed, cannot remove working tree: %s" | |
16892 | msgstr "验证失败,无法删除工作区:%s" | |
16893 | ||
a4f16749 | 16894 | #: builtin/write-tree.c:14 |
ef317cd5 | 16895 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 16896 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 16897 | |
a4f16749 | 16898 | #: builtin/write-tree.c:27 |
ef317cd5 | 16899 | msgid "<prefix>/" |
07432cef | 16900 | msgstr "<前缀>/" |
ef317cd5 | 16901 | |
a4f16749 | 16902 | #: builtin/write-tree.c:28 |
ef317cd5 | 16903 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 16904 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 16905 | |
c1ac5258 | 16906 | #: builtin/write-tree.c:30 |
ef317cd5 | 16907 | msgid "only useful for debugging" |
07432cef | 16908 | msgstr "只对调试有用" |
ef317cd5 | 16909 | |
6937cb4e | 16910 | #: credential-cache--daemon.c:222 |
a0b6b246 JX |
16911 | #, c-format |
16912 | msgid "" | |
16913 | "The permissions on your socket directory are too loose; other\n" | |
16914 | "users may be able to read your cached credentials. Consider running:\n" | |
16915 | "\n" | |
16916 | "\tchmod 0700 %s" | |
16917 | msgstr "" | |
1a79b2f1 JX |
16918 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
16919 | "行:\n" | |
a0b6b246 JX |
16920 | "\n" |
16921 | "\tchmod 0700 %s" | |
16922 | ||
6937cb4e | 16923 | #: credential-cache--daemon.c:271 |
220c313c JX |
16924 | msgid "print debugging messages to stderr" |
16925 | msgstr "调试信息输出到标准错误" | |
16926 | ||
fd8cb379 | 16927 | #: git.c:27 |
31e5e17b JX |
16928 | msgid "" |
16929 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
16930 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
16931 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
16932 | "bare]\n" | |
31e5e17b JX |
16933 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
16934 | " <command> [<args>]" | |
16935 | msgstr "" | |
fd8cb379 | 16936 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 16937 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
fd8cb379 JX |
16938 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
16939 | "bare]\n" | |
31e5e17b JX |
16940 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
16941 | " <命令> [<参数>]" | |
16942 | ||
fd8cb379 | 16943 | #: git.c:34 |
4dcdc3d8 | 16944 | msgid "" |
220c313c | 16945 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
16946 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
16947 | "to read about a specific subcommand or concept." | |
16948 | msgstr "" | |
220c313c JX |
16949 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
16950 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
16951 | "帮助。" | |
8ada9598 | 16952 | |
fd8cb379 | 16953 | #: git.c:173 |
31e5e17b JX |
16954 | #, c-format |
16955 | msgid "no directory given for --git-dir\n" | |
16956 | msgstr "没有为 --git-dir 提供目录\n" | |
16957 | ||
fd8cb379 | 16958 | #: git.c:187 |
31e5e17b JX |
16959 | #, c-format |
16960 | msgid "no namespace given for --namespace\n" | |
16961 | msgstr "没有为 --namespace 提供命名空间\n" | |
16962 | ||
fd8cb379 | 16963 | #: git.c:201 |
31e5e17b JX |
16964 | #, c-format |
16965 | msgid "no directory given for --work-tree\n" | |
16966 | msgstr "没有为 --work-tree 提供目录\n" | |
16967 | ||
fd8cb379 | 16968 | #: git.c:215 |
31e5e17b JX |
16969 | #, c-format |
16970 | msgid "no prefix given for --super-prefix\n" | |
16971 | msgstr "没有为 --super-prefix 提供前缀\n" | |
16972 | ||
fd8cb379 | 16973 | #: git.c:237 |
31e5e17b JX |
16974 | #, c-format |
16975 | msgid "-c expects a configuration string\n" | |
16976 | msgstr "应为 -c 提供一个配置字符串\n" | |
16977 | ||
fd8cb379 | 16978 | #: git.c:275 |
31e5e17b JX |
16979 | #, c-format |
16980 | msgid "no directory given for -C\n" | |
16981 | msgstr "没有为 -C 提供目录\n" | |
16982 | ||
fd8cb379 | 16983 | #: git.c:300 |
31e5e17b JX |
16984 | #, c-format |
16985 | msgid "unknown option: %s\n" | |
16986 | msgstr "未知选项:%s\n" | |
16987 | ||
c1ac5258 | 16988 | #: git.c:770 |
31e5e17b JX |
16989 | #, c-format |
16990 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
16991 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
16992 | ||
c1ac5258 | 16993 | #: git.c:782 |
31e5e17b JX |
16994 | #, c-format |
16995 | msgid "failed to run command '%s': %s\n" | |
c1ac5258 | 16996 | msgstr "运行命令 '%s' 失败:%s\n" |
31e5e17b | 16997 | |
fd8cb379 | 16998 | #: http.c:348 |
60638e98 JX |
16999 | #, c-format |
17000 | msgid "negative value for http.postbuffer; defaulting to %d" | |
17001 | msgstr "http.postbuffer 为负值,默认为 %d" | |
17002 | ||
fd8cb379 | 17003 | #: http.c:369 |
a0b6b246 JX |
17004 | msgid "Delegation control is not supported with cURL < 7.22.0" |
17005 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" | |
17006 | ||
fd8cb379 | 17007 | #: http.c:378 |
276ceeaa JX |
17008 | msgid "Public key pinning not supported with cURL < 7.44.0" |
17009 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
17010 | ||
fd8cb379 | 17011 | #: http.c:1854 |
1a79b2f1 JX |
17012 | #, c-format |
17013 | msgid "" | |
17014 | "unable to update url base from redirection:\n" | |
17015 | " asked for: %s\n" | |
17016 | " redirect: %s" | |
17017 | msgstr "" | |
17018 | "不能更新重定向的 url base:\n" | |
17019 | " 请求:%s\n" | |
17020 | " 重定向:%s" | |
17021 | ||
fd8cb379 | 17022 | #: remote-curl.c:401 |
1a79b2f1 JX |
17023 | #, c-format |
17024 | msgid "redirecting to %s" | |
17025 | msgstr "重定向到 %s" | |
17026 | ||
31e5e17b | 17027 | #: list-objects-filter-options.h:59 |
5809aa05 JX |
17028 | msgid "args" |
17029 | msgstr "参数" | |
17030 | ||
31e5e17b | 17031 | #: list-objects-filter-options.h:60 |
5809aa05 JX |
17032 | msgid "object filtering" |
17033 | msgstr "对象过滤" | |
17034 | ||
fd8cb379 JX |
17035 | #: parse-options.h:157 |
17036 | msgid "expiry-date" | |
17037 | msgstr "到期时间" | |
7aea43ff | 17038 | |
fd8cb379 JX |
17039 | #: parse-options.h:172 |
17040 | msgid "no-op (backward compatibility)" | |
17041 | msgstr "空操作(向后兼容)" | |
7aea43ff | 17042 | |
fd8cb379 JX |
17043 | #: parse-options.h:251 |
17044 | msgid "be more verbose" | |
17045 | msgstr "更加详细" | |
7aea43ff | 17046 | |
fd8cb379 JX |
17047 | #: parse-options.h:253 |
17048 | msgid "be more quiet" | |
17049 | msgstr "更加安静" | |
7aea43ff | 17050 | |
fd8cb379 JX |
17051 | #: parse-options.h:259 |
17052 | msgid "use <n> digits to display SHA-1s" | |
17053 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
7aea43ff | 17054 | |
fd8cb379 | 17055 | #: command-list.h:50 |
8ada9598 | 17056 | msgid "Add file contents to the index" |
81809b99 | 17057 | msgstr "添加文件内容至索引" |
8ada9598 | 17058 | |
fd8cb379 JX |
17059 | #: command-list.h:51 |
17060 | msgid "Apply a series of patches from a mailbox" | |
17061 | msgstr "应用邮箱格式的系列补丁" | |
17062 | ||
17063 | #: command-list.h:52 | |
17064 | msgid "Annotate file lines with commit information" | |
17065 | msgstr "使用提交信息注释文件行" | |
17066 | ||
17067 | #: command-list.h:53 | |
17068 | msgid "Apply a patch to files and/or to the index" | |
17069 | msgstr "应用一个补丁到文件和/或索引区" | |
17070 | ||
17071 | #: command-list.h:54 | |
17072 | msgid "Import an Arch repository into Git" | |
17073 | msgstr "将一个 Arch 仓库导入到 Git" | |
17074 | ||
17075 | #: command-list.h:55 | |
17076 | msgid "Create an archive of files from a named tree" | |
17077 | msgstr "基于一个指定的树创建文件存档" | |
17078 | ||
17079 | #: command-list.h:56 | |
1b7f4a34 JX |
17080 | msgid "Use binary search to find the commit that introduced a bug" |
17081 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 17082 | |
fd8cb379 JX |
17083 | #: command-list.h:57 |
17084 | msgid "Show what revision and author last modified each line of a file" | |
17085 | msgstr "显示文件每一行最后修改的版本和修改者" | |
17086 | ||
17087 | #: command-list.h:58 | |
8ada9598 | 17088 | msgid "List, create, or delete branches" |
81809b99 | 17089 | msgstr "列出、创建或删除分支" |
8ada9598 | 17090 | |
fd8cb379 JX |
17091 | #: command-list.h:59 |
17092 | msgid "Move objects and refs by archive" | |
17093 | msgstr "通过归档移动对象和引用" | |
17094 | ||
17095 | #: command-list.h:60 | |
17096 | msgid "Provide content or type and size information for repository objects" | |
17097 | msgstr "提供仓库对象的内容、类型或大小" | |
17098 | ||
17099 | #: command-list.h:61 | |
17100 | msgid "Display gitattributes information" | |
17101 | msgstr "显示 gitattributes 信息" | |
17102 | ||
17103 | #: command-list.h:62 | |
17104 | msgid "Debug gitignore / exclude files" | |
17105 | msgstr "调试 gitignore / exclude 文件" | |
17106 | ||
17107 | #: command-list.h:63 | |
17108 | msgid "Show canonical names and email addresses of contacts" | |
17109 | msgstr "显示联系人的规范名称和电子邮件" | |
17110 | ||
17111 | #: command-list.h:64 | |
5bb01d4f JX |
17112 | msgid "Switch branches or restore working tree files" |
17113 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 17114 | |
fd8cb379 JX |
17115 | #: command-list.h:65 |
17116 | msgid "Copy files from the index to the working tree" | |
17117 | msgstr "从索引拷贝文件到工作区" | |
17118 | ||
17119 | #: command-list.h:66 | |
17120 | msgid "Ensures that a reference name is well formed" | |
17121 | msgstr "确保引用名称格式正确" | |
17122 | ||
17123 | #: command-list.h:67 | |
17124 | msgid "Find commits yet to be applied to upstream" | |
17125 | msgstr "查找尚未应用到上游的提交" | |
17126 | ||
17127 | #: command-list.h:68 | |
17128 | msgid "Apply the changes introduced by some existing commits" | |
17129 | msgstr "应用一些现存提交引入的修改" | |
17130 | ||
17131 | #: command-list.h:69 | |
17132 | msgid "Graphical alternative to git-commit" | |
17133 | msgstr "git-commit 的图形替代界面" | |
17134 | ||
17135 | #: command-list.h:70 | |
17136 | msgid "Remove untracked files from the working tree" | |
17137 | msgstr "从工作区中删除未跟踪文件" | |
17138 | ||
17139 | #: command-list.h:71 | |
8ada9598 | 17140 | msgid "Clone a repository into a new directory" |
160fb2b2 | 17141 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 17142 | |
fd8cb379 JX |
17143 | #: command-list.h:72 |
17144 | msgid "Display data in columns" | |
17145 | msgstr "以列的方式显示数据" | |
17146 | ||
17147 | #: command-list.h:73 | |
8ada9598 | 17148 | msgid "Record changes to the repository" |
160fb2b2 | 17149 | msgstr "记录变更到仓库" |
8ada9598 | 17150 | |
fd8cb379 JX |
17151 | #: command-list.h:74 |
17152 | msgid "Write and verify Git commit graph files" | |
17153 | msgstr "写入和校验 Git 提交图形文件" | |
17154 | ||
17155 | #: command-list.h:75 | |
17156 | msgid "Create a new commit object" | |
17157 | msgstr "创建一个新的提交对象" | |
17158 | ||
17159 | #: command-list.h:76 | |
17160 | msgid "Get and set repository or global options" | |
17161 | msgstr "获取和设置仓库或者全局选项" | |
17162 | ||
17163 | #: command-list.h:77 | |
17164 | msgid "Count unpacked number of objects and their disk consumption" | |
17165 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
17166 | ||
17167 | #: command-list.h:78 | |
17168 | msgid "Retrieve and store user credentials" | |
17169 | msgstr "检索和存储用户密码" | |
17170 | ||
17171 | #: command-list.h:79 | |
17172 | msgid "Helper to temporarily store passwords in memory" | |
17173 | msgstr "在内存中临时存储密码的助手" | |
17174 | ||
17175 | #: command-list.h:80 | |
17176 | msgid "Helper to store credentials on disk" | |
17177 | msgstr "在磁盘存储密码的助手" | |
17178 | ||
17179 | #: command-list.h:81 | |
17180 | msgid "Export a single commit to a CVS checkout" | |
17181 | msgstr "将一个提交导出到 CVS 检出中" | |
17182 | ||
17183 | #: command-list.h:82 | |
17184 | msgid "Salvage your data out of another SCM people love to hate" | |
17185 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
17186 | ||
17187 | #: command-list.h:83 | |
17188 | msgid "A CVS server emulator for Git" | |
17189 | msgstr "Git 的一个 CVS 服务模拟器" | |
17190 | ||
17191 | #: command-list.h:84 | |
17192 | msgid "A really simple server for Git repositories" | |
17193 | msgstr "一个非常简单的 Git 仓库服务器" | |
17194 | ||
17195 | #: command-list.h:85 | |
17196 | msgid "Give an object a human readable name based on an available ref" | |
17197 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
17198 | ||
17199 | #: command-list.h:86 | |
8ada9598 | 17200 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 17201 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 17202 | |
fd8cb379 JX |
17203 | #: command-list.h:87 |
17204 | msgid "Compares files in the working tree and the index" | |
17205 | msgstr "比较工作区和索引区中的文件" | |
17206 | ||
17207 | #: command-list.h:88 | |
17208 | msgid "Compare a tree to the working tree or index" | |
17209 | msgstr "将一个树和工作区或索引做比较" | |
17210 | ||
17211 | #: command-list.h:89 | |
17212 | msgid "Compares the content and mode of blobs found via two tree objects" | |
17213 | msgstr "比较两个树对象的文件内容和模式" | |
17214 | ||
17215 | #: command-list.h:90 | |
17216 | msgid "Show changes using common diff tools" | |
17217 | msgstr "使用常见的差异工具显示更改" | |
17218 | ||
17219 | #: command-list.h:91 | |
17220 | msgid "Git data exporter" | |
17221 | msgstr "Git 数据导出器" | |
17222 | ||
17223 | #: command-list.h:92 | |
17224 | msgid "Backend for fast Git data importers" | |
17225 | msgstr "Git 快速数据导入器后端" | |
17226 | ||
17227 | #: command-list.h:93 | |
8ada9598 | 17228 | msgid "Download objects and refs from another repository" |
160fb2b2 | 17229 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 17230 | |
fd8cb379 JX |
17231 | #: command-list.h:94 |
17232 | msgid "Receive missing objects from another repository" | |
17233 | msgstr "从另一个仓库获取缺失的对象" | |
17234 | ||
17235 | #: command-list.h:95 | |
17236 | msgid "Rewrite branches" | |
17237 | msgstr "重写分支" | |
17238 | ||
17239 | #: command-list.h:96 | |
17240 | msgid "Produce a merge commit message" | |
17241 | msgstr "生成一个合并提交信息" | |
17242 | ||
17243 | #: command-list.h:97 | |
17244 | msgid "Output information on each ref" | |
17245 | msgstr "对每一个引用输出信息 " | |
17246 | ||
17247 | #: command-list.h:98 | |
17248 | msgid "Prepare patches for e-mail submission" | |
17249 | msgstr "准备电子邮件提交的补丁" | |
17250 | ||
17251 | #: command-list.h:99 | |
17252 | msgid "Verifies the connectivity and validity of the objects in the database" | |
17253 | msgstr "验证仓库中对象的连通性和有效性" | |
17254 | ||
17255 | #: command-list.h:100 | |
17256 | msgid "Cleanup unnecessary files and optimize the local repository" | |
17257 | msgstr "清除不必要的文件和优化本地仓库" | |
17258 | ||
17259 | #: command-list.h:101 | |
17260 | msgid "Extract commit ID from an archive created using git-archive" | |
17261 | msgstr "从 git-archive 创建的归档文件中提取提交ID" | |
17262 | ||
17263 | #: command-list.h:102 | |
8ada9598 | 17264 | msgid "Print lines matching a pattern" |
81809b99 | 17265 | msgstr "输出和模式匹配的行" |
8ada9598 | 17266 | |
fd8cb379 JX |
17267 | #: command-list.h:103 |
17268 | msgid "A portable graphical interface to Git" | |
17269 | msgstr "一个便携的 Git 图形客户端" | |
17270 | ||
17271 | #: command-list.h:104 | |
17272 | msgid "Compute object ID and optionally creates a blob from a file" | |
17273 | msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象" | |
17274 | ||
17275 | #: command-list.h:105 | |
17276 | msgid "Display help information about Git" | |
17277 | msgstr "显示 Git 的帮助信息" | |
17278 | ||
17279 | #: command-list.h:106 | |
17280 | msgid "Server side implementation of Git over HTTP" | |
17281 | msgstr "Git HTTP 协议的服务端实现" | |
17282 | ||
17283 | #: command-list.h:107 | |
17284 | msgid "Download from a remote Git repository via HTTP" | |
17285 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
17286 | ||
17287 | #: command-list.h:108 | |
17288 | msgid "Push objects over HTTP/DAV to another repository" | |
17289 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
17290 | ||
17291 | #: command-list.h:109 | |
17292 | msgid "Send a collection of patches from stdin to an IMAP folder" | |
17293 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
17294 | ||
17295 | #: command-list.h:110 | |
17296 | msgid "Build pack index file for an existing packed archive" | |
17297 | msgstr "从一个现存的包存档文件创建包索引" | |
17298 | ||
17299 | #: command-list.h:111 | |
a77c07d9 | 17300 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 17301 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 17302 | |
fd8cb379 JX |
17303 | #: command-list.h:112 |
17304 | msgid "Instantly browse your working repository in gitweb" | |
17305 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
17306 | ||
17307 | #: command-list.h:113 | |
17308 | msgid "add or parse structured information in commit messages" | |
17309 | msgstr "添加或解析提交说明中的结构化信息" | |
17310 | ||
17311 | #: command-list.h:114 | |
17312 | msgid "The Git repository browser" | |
17313 | msgstr "Git 仓库浏览器" | |
17314 | ||
17315 | #: command-list.h:115 | |
8ada9598 | 17316 | msgid "Show commit logs" |
81809b99 | 17317 | msgstr "显示提交日志" |
8ada9598 | 17318 | |
fd8cb379 JX |
17319 | #: command-list.h:116 |
17320 | msgid "Show information about files in the index and the working tree" | |
17321 | msgstr "显示索引和工作区中文件的信息" | |
17322 | ||
17323 | #: command-list.h:117 | |
17324 | msgid "List references in a remote repository" | |
17325 | msgstr "显示一个远程仓库的引用" | |
17326 | ||
17327 | #: command-list.h:118 | |
17328 | msgid "List the contents of a tree object" | |
17329 | msgstr "显示一个树对象的内容" | |
17330 | ||
17331 | #: command-list.h:119 | |
17332 | msgid "Extracts patch and authorship from a single e-mail message" | |
17333 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
17334 | ||
17335 | #: command-list.h:120 | |
17336 | msgid "Simple UNIX mbox splitter program" | |
17337 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
17338 | ||
17339 | #: command-list.h:121 | |
8ada9598 | 17340 | msgid "Join two or more development histories together" |
81809b99 | 17341 | msgstr "合并两个或更多开发历史" |
8ada9598 | 17342 | |
fd8cb379 JX |
17343 | #: command-list.h:122 |
17344 | msgid "Find as good common ancestors as possible for a merge" | |
17345 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
17346 | ||
17347 | #: command-list.h:123 | |
17348 | msgid "Run a three-way file merge" | |
17349 | msgstr "运行一个三路文件合并" | |
17350 | ||
17351 | #: command-list.h:124 | |
17352 | msgid "Run a merge for files needing merging" | |
17353 | msgstr "对于需要合并的文件执行合并" | |
17354 | ||
17355 | #: command-list.h:125 | |
17356 | msgid "The standard helper program to use with git-merge-index" | |
17357 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
17358 | ||
17359 | #: command-list.h:126 | |
17360 | msgid "Run merge conflict resolution tools to resolve merge conflicts" | |
17361 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
17362 | ||
17363 | #: command-list.h:127 | |
17364 | msgid "Show three-way merge without touching index" | |
17365 | msgstr "显示三路合并而不动索引" | |
17366 | ||
17367 | #: command-list.h:128 | |
17368 | msgid "Creates a tag object" | |
17369 | msgstr "创建一个标签对象" | |
17370 | ||
17371 | #: command-list.h:129 | |
17372 | msgid "Build a tree-object from ls-tree formatted text" | |
17373 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
17374 | ||
17375 | #: command-list.h:130 | |
8ada9598 | 17376 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 17377 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 17378 | |
fd8cb379 JX |
17379 | # 查找给定版本的符号名称 |
17380 | #: command-list.h:131 | |
17381 | msgid "Find symbolic names for given revs" | |
17382 | msgstr "查找给定版本的符号名称" | |
17383 | ||
17384 | #: command-list.h:132 | |
17385 | msgid "Add or inspect object notes" | |
17386 | msgstr "添加或检查对象注释" | |
17387 | ||
17388 | #: command-list.h:133 | |
17389 | msgid "Import from and submit to Perforce repositories" | |
17390 | msgstr "导入和提交到 Perforce 仓库中" | |
17391 | ||
17392 | #: command-list.h:134 | |
17393 | msgid "Create a packed archive of objects" | |
17394 | msgstr "创建对象的存档包" | |
17395 | ||
17396 | #: command-list.h:135 | |
17397 | msgid "Find redundant pack files" | |
17398 | msgstr "查找冗余的包文件" | |
17399 | ||
17400 | #: command-list.h:136 | |
17401 | msgid "Pack heads and tags for efficient repository access" | |
17402 | msgstr "打包头和标签以实现高效的仓库访问" | |
17403 | ||
17404 | #: command-list.h:137 | |
17405 | msgid "Routines to help parsing remote repository access parameters" | |
17406 | msgstr "帮助解析远程仓库访问参数的例程" | |
17407 | ||
17408 | #: command-list.h:138 | |
17409 | msgid "Compute unique ID for a patch" | |
17410 | msgstr "计算一个补丁的唯一ID" | |
17411 | ||
17412 | #: command-list.h:139 | |
17413 | msgid "Prune all unreachable objects from the object database" | |
17414 | msgstr "删除对象库中所有不可达对象" | |
17415 | ||
17416 | #: command-list.h:140 | |
17417 | msgid "Remove extra objects that are already in pack files" | |
17418 | msgstr "删除已经在包文件中的多余对象" | |
17419 | ||
17420 | #: command-list.h:141 | |
2e8451e8 | 17421 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 17422 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 17423 | |
fd8cb379 | 17424 | #: command-list.h:142 |
8ada9598 | 17425 | msgid "Update remote refs along with associated objects" |
81809b99 | 17426 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 17427 | |
fd8cb379 JX |
17428 | #: command-list.h:143 |
17429 | msgid "Applies a quilt patchset onto the current branch" | |
17430 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
17431 | ||
17432 | #: command-list.h:144 | |
c1ac5258 JX |
17433 | msgid "Compare two commit ranges (e.g. two versions of a branch)" |
17434 | msgstr "比较两个提交范围(如一个分支的两个版本)" | |
17435 | ||
17436 | #: command-list.h:145 | |
fd8cb379 JX |
17437 | msgid "Reads tree information into the index" |
17438 | msgstr "将树信息读取到索引" | |
17439 | ||
c1ac5258 | 17440 | #: command-list.h:146 |
3495628d JX |
17441 | msgid "Reapply commits on top of another base tip" |
17442 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 17443 | |
c1ac5258 | 17444 | #: command-list.h:147 |
fd8cb379 JX |
17445 | msgid "Receive what is pushed into the repository" |
17446 | msgstr "接收推送到仓库中的对象" | |
17447 | ||
c1ac5258 | 17448 | #: command-list.h:148 |
fd8cb379 JX |
17449 | msgid "Manage reflog information" |
17450 | msgstr "管理 reflog 信息" | |
17451 | ||
c1ac5258 | 17452 | #: command-list.h:149 |
fd8cb379 JX |
17453 | msgid "Manage set of tracked repositories" |
17454 | msgstr "管理已跟踪仓库" | |
17455 | ||
c1ac5258 | 17456 | #: command-list.h:150 |
fd8cb379 JX |
17457 | msgid "Pack unpacked objects in a repository" |
17458 | msgstr "打包仓库中未打包对象" | |
17459 | ||
c1ac5258 | 17460 | #: command-list.h:151 |
fd8cb379 JX |
17461 | msgid "Create, list, delete refs to replace objects" |
17462 | msgstr "创建、列出、删除对象替换引用" | |
17463 | ||
c1ac5258 | 17464 | #: command-list.h:152 |
fd8cb379 JX |
17465 | msgid "Generates a summary of pending changes" |
17466 | msgstr "生成待定更改的摘要" | |
17467 | ||
c1ac5258 | 17468 | #: command-list.h:153 |
fd8cb379 JX |
17469 | msgid "Reuse recorded resolution of conflicted merges" |
17470 | msgstr "重用冲突合并的解决方案记录" | |
17471 | ||
c1ac5258 | 17472 | #: command-list.h:154 |
8ada9598 | 17473 | msgid "Reset current HEAD to the specified state" |
4375c10e | 17474 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 17475 | |
c1ac5258 | 17476 | #: command-list.h:155 |
fd8cb379 JX |
17477 | msgid "Revert some existing commits" |
17478 | msgstr "回退一些现存提交" | |
17479 | ||
c1ac5258 | 17480 | #: command-list.h:156 |
fd8cb379 JX |
17481 | msgid "Lists commit objects in reverse chronological order" |
17482 | msgstr "按时间顺序列出提交对象" | |
17483 | ||
c1ac5258 | 17484 | #: command-list.h:157 |
fd8cb379 JX |
17485 | msgid "Pick out and massage parameters" |
17486 | msgstr "选出并处理参数" | |
17487 | ||
c1ac5258 | 17488 | #: command-list.h:158 |
8ada9598 | 17489 | msgid "Remove files from the working tree and from the index" |
81809b99 | 17490 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 17491 | |
c1ac5258 | 17492 | #: command-list.h:159 |
fd8cb379 JX |
17493 | msgid "Send a collection of patches as emails" |
17494 | msgstr "通过电子邮件发送一组补丁" | |
17495 | ||
c1ac5258 | 17496 | #: command-list.h:160 |
fd8cb379 JX |
17497 | msgid "Push objects over Git protocol to another repository" |
17498 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
17499 | ||
c1ac5258 | 17500 | #: command-list.h:161 |
fd8cb379 JX |
17501 | msgid "Restricted login shell for Git-only SSH access" |
17502 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
17503 | ||
c1ac5258 | 17504 | #: command-list.h:162 |
fd8cb379 JX |
17505 | msgid "Summarize 'git log' output" |
17506 | msgstr "'git log' 输出摘要" | |
17507 | ||
c1ac5258 | 17508 | #: command-list.h:163 |
8ada9598 | 17509 | msgid "Show various types of objects" |
81809b99 | 17510 | msgstr "显示各种类型的对象" |
8ada9598 | 17511 | |
c1ac5258 | 17512 | #: command-list.h:164 |
fd8cb379 JX |
17513 | msgid "Show branches and their commits" |
17514 | msgstr "显示分支和提交" | |
17515 | ||
c1ac5258 | 17516 | #: command-list.h:165 |
fd8cb379 JX |
17517 | msgid "Show packed archive index" |
17518 | msgstr "显示打包归档索引" | |
17519 | ||
c1ac5258 | 17520 | #: command-list.h:166 |
fd8cb379 JX |
17521 | msgid "List references in a local repository" |
17522 | msgstr "显示本地仓库中的引用" | |
17523 | ||
c1ac5258 | 17524 | #: command-list.h:167 |
fd8cb379 JX |
17525 | msgid "Git's i18n setup code for shell scripts" |
17526 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
17527 | ||
c1ac5258 | 17528 | #: command-list.h:168 |
fd8cb379 JX |
17529 | msgid "Common Git shell script setup code" |
17530 | msgstr "常用的 Git shell 脚本设置代码" | |
17531 | ||
c1ac5258 | 17532 | #: command-list.h:169 |
fd8cb379 JX |
17533 | msgid "Stash the changes in a dirty working directory away" |
17534 | msgstr "贮藏脏工作区中的修改" | |
17535 | ||
c1ac5258 | 17536 | #: command-list.h:170 |
fd8cb379 JX |
17537 | msgid "Add file contents to the staging area" |
17538 | msgstr "将文件内容添加到索引" | |
17539 | ||
c1ac5258 | 17540 | #: command-list.h:171 |
8ada9598 | 17541 | msgid "Show the working tree status" |
81809b99 | 17542 | msgstr "显示工作区状态" |
8ada9598 | 17543 | |
c1ac5258 | 17544 | #: command-list.h:172 |
fd8cb379 JX |
17545 | msgid "Remove unnecessary whitespace" |
17546 | msgstr "删除不必要的空白字符" | |
17547 | ||
c1ac5258 | 17548 | #: command-list.h:173 |
fd8cb379 JX |
17549 | msgid "Initialize, update or inspect submodules" |
17550 | msgstr "初始化、更新或检查子模组" | |
17551 | ||
c1ac5258 | 17552 | #: command-list.h:174 |
fd8cb379 JX |
17553 | msgid "Bidirectional operation between a Subversion repository and Git" |
17554 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
17555 | ||
c1ac5258 | 17556 | #: command-list.h:175 |
fd8cb379 JX |
17557 | msgid "Read, modify and delete symbolic refs" |
17558 | msgstr "读取、修改和删除符号引用" | |
17559 | ||
c1ac5258 | 17560 | #: command-list.h:176 |
8ada9598 | 17561 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 17562 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 17563 | |
c1ac5258 | 17564 | #: command-list.h:177 |
fd8cb379 JX |
17565 | msgid "Creates a temporary file with a blob's contents" |
17566 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 17567 | |
c1ac5258 | 17568 | #: command-list.h:178 |
fd8cb379 JX |
17569 | msgid "Unpack objects from a packed archive" |
17570 | msgstr "从打包文件中解压缩对象" | |
220c313c | 17571 | |
c1ac5258 | 17572 | #: command-list.h:179 |
fd8cb379 JX |
17573 | msgid "Register file contents in the working tree to the index" |
17574 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 17575 | |
c1ac5258 | 17576 | #: command-list.h:180 |
fd8cb379 JX |
17577 | msgid "Update the object name stored in a ref safely" |
17578 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 17579 | |
c1ac5258 | 17580 | #: command-list.h:181 |
fd8cb379 JX |
17581 | msgid "Update auxiliary info file to help dumb servers" |
17582 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
17583 | ||
c1ac5258 | 17584 | #: command-list.h:182 |
fd8cb379 JX |
17585 | msgid "Send archive back to git-archive" |
17586 | msgstr "将存档发送回 git-archive" | |
17587 | ||
c1ac5258 | 17588 | #: command-list.h:183 |
fd8cb379 JX |
17589 | msgid "Send objects packed back to git-fetch-pack" |
17590 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
17591 | ||
c1ac5258 | 17592 | #: command-list.h:184 |
fd8cb379 JX |
17593 | msgid "Show a Git logical variable" |
17594 | msgstr "显示一个Git逻辑变量" | |
17595 | ||
c1ac5258 | 17596 | #: command-list.h:185 |
fd8cb379 JX |
17597 | msgid "Check the GPG signature of commits" |
17598 | msgstr "检查 GPG 提交签名" | |
17599 | ||
c1ac5258 | 17600 | #: command-list.h:186 |
fd8cb379 JX |
17601 | msgid "Validate packed Git archive files" |
17602 | msgstr "校验打包的Git存仓文件" | |
17603 | ||
c1ac5258 | 17604 | #: command-list.h:187 |
fd8cb379 JX |
17605 | msgid "Check the GPG signature of tags" |
17606 | msgstr "检查标签的 GPG 签名" | |
17607 | ||
c1ac5258 | 17608 | #: command-list.h:188 |
fd8cb379 JX |
17609 | msgid "Git web interface (web frontend to Git repositories)" |
17610 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
17611 | ||
c1ac5258 | 17612 | #: command-list.h:189 |
fd8cb379 JX |
17613 | msgid "Show logs with difference each commit introduces" |
17614 | msgstr "显示每一个提交引入的差异日志" | |
17615 | ||
c1ac5258 | 17616 | #: command-list.h:190 |
fd8cb379 JX |
17617 | msgid "Manage multiple working trees" |
17618 | msgstr "管理多个工作区" | |
17619 | ||
c1ac5258 | 17620 | #: command-list.h:191 |
fd8cb379 JX |
17621 | msgid "Create a tree object from the current index" |
17622 | msgstr "从当前索引创建一个树对象" | |
17623 | ||
c1ac5258 | 17624 | #: command-list.h:192 |
fd8cb379 JX |
17625 | msgid "Defining attributes per path" |
17626 | msgstr "定义路径的属性" | |
17627 | ||
c1ac5258 | 17628 | #: command-list.h:193 |
fd8cb379 JX |
17629 | msgid "Git command-line interface and conventions" |
17630 | msgstr "Git 命令行界面和约定" | |
17631 | ||
c1ac5258 | 17632 | #: command-list.h:194 |
fd8cb379 JX |
17633 | msgid "A Git core tutorial for developers" |
17634 | msgstr "面向开发人员的 Git 核心教程" | |
17635 | ||
c1ac5258 | 17636 | #: command-list.h:195 |
fd8cb379 JX |
17637 | msgid "Git for CVS users" |
17638 | msgstr "适合 CVS 用户的 Git 帮助" | |
17639 | ||
c1ac5258 | 17640 | #: command-list.h:196 |
fd8cb379 JX |
17641 | msgid "Tweaking diff output" |
17642 | msgstr "调整差异输出" | |
17643 | ||
c1ac5258 | 17644 | #: command-list.h:197 |
fd8cb379 JX |
17645 | msgid "A useful minimum set of commands for Everyday Git" |
17646 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
17647 | ||
c1ac5258 | 17648 | #: command-list.h:198 |
fd8cb379 JX |
17649 | msgid "A Git Glossary" |
17650 | msgstr "Git 词汇表" | |
17651 | ||
c1ac5258 | 17652 | #: command-list.h:199 |
fd8cb379 JX |
17653 | msgid "Hooks used by Git" |
17654 | msgstr "Git 使用的钩子" | |
17655 | ||
c1ac5258 | 17656 | #: command-list.h:200 |
fd8cb379 JX |
17657 | msgid "Specifies intentionally untracked files to ignore" |
17658 | msgstr "忽略指定的未跟踪文件" | |
17659 | ||
c1ac5258 | 17660 | #: command-list.h:201 |
fd8cb379 JX |
17661 | msgid "Defining submodule properties" |
17662 | msgstr "定义子模组属性" | |
17663 | ||
c1ac5258 | 17664 | #: command-list.h:202 |
fd8cb379 JX |
17665 | msgid "Git namespaces" |
17666 | msgstr "Git 名字空间" | |
17667 | ||
c1ac5258 | 17668 | #: command-list.h:203 |
fd8cb379 JX |
17669 | msgid "Git Repository Layout" |
17670 | msgstr "Git 仓库布局" | |
17671 | ||
c1ac5258 | 17672 | #: command-list.h:204 |
fd8cb379 JX |
17673 | msgid "Specifying revisions and ranges for Git" |
17674 | msgstr "指定 Git 的版本和版本范围" | |
17675 | ||
c1ac5258 | 17676 | #: command-list.h:205 |
fd8cb379 JX |
17677 | msgid "A tutorial introduction to Git: part two" |
17678 | msgstr "一个 Git 教程:第二部分" | |
17679 | ||
c1ac5258 | 17680 | #: command-list.h:206 |
fd8cb379 JX |
17681 | msgid "A tutorial introduction to Git" |
17682 | msgstr "一个 Git 教程" | |
17683 | ||
c1ac5258 | 17684 | #: command-list.h:207 |
fd8cb379 JX |
17685 | msgid "An overview of recommended workflows with Git" |
17686 | msgstr "Git 推荐的工作流概览" | |
220c313c | 17687 | |
5b04ee3b | 17688 | #: rerere.h:40 |
220c313c JX |
17689 | msgid "update the index with reused conflict resolution if possible" |
17690 | msgstr "如果可能,重用冲突解决更新索引" | |
17691 | ||
5c57d762 | 17692 | #: git-bisect.sh:54 |
b694fbb1 JX |
17693 | msgid "You need to start by \"git bisect start\"" |
17694 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
17695 | ||
90e6ef53 | 17696 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
17697 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
17698 | #. translation. The program will only accept English input | |
17699 | #. at this point. | |
5c57d762 | 17700 | #: git-bisect.sh:60 |
c04f5ac3 JX |
17701 | msgid "Do you want me to do it for you [Y/n]? " |
17702 | msgstr "您想让我为您这样做么[Y/n]? " | |
17703 | ||
5c57d762 | 17704 | #: git-bisect.sh:121 |
c04f5ac3 JX |
17705 | #, sh-format |
17706 | msgid "unrecognised option: '$arg'" | |
81809b99 | 17707 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 17708 | |
5c57d762 | 17709 | #: git-bisect.sh:125 |
c04f5ac3 JX |
17710 | #, sh-format |
17711 | msgid "'$arg' does not appear to be a valid revision" | |
17712 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
17713 | ||
5c57d762 | 17714 | #: git-bisect.sh:154 |
c04f5ac3 JX |
17715 | msgid "Bad HEAD - I need a HEAD" |
17716 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
17717 | ||
5c57d762 | 17718 | #: git-bisect.sh:167 |
c04f5ac3 JX |
17719 | #, sh-format |
17720 | msgid "" | |
814ff314 | 17721 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 17722 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 17723 | |
5c57d762 | 17724 | #: git-bisect.sh:177 |
cfff71a9 JX |
17725 | msgid "won't bisect on cg-seek'ed tree" |
17726 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 17727 | |
5c57d762 | 17728 | #: git-bisect.sh:181 |
c04f5ac3 | 17729 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 17730 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 17731 | |
5c57d762 | 17732 | #: git-bisect.sh:233 |
c04f5ac3 JX |
17733 | #, sh-format |
17734 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 17735 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 17736 | |
5809aa05 | 17737 | #: git-bisect.sh:246 |
c04f5ac3 JX |
17738 | #, sh-format |
17739 | msgid "Bad rev input: $arg" | |
9a4b694c | 17740 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 17741 | |
5809aa05 | 17742 | #: git-bisect.sh:265 |
5c57d762 JX |
17743 | #, sh-format |
17744 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 17745 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 17746 | |
5809aa05 | 17747 | #: git-bisect.sh:274 |
c04f5ac3 JX |
17748 | #, sh-format |
17749 | msgid "Bad rev input: $rev" | |
9a4b694c | 17750 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 17751 | |
5809aa05 | 17752 | #: git-bisect.sh:283 |
1b7f4a34 JX |
17753 | #, sh-format |
17754 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
17755 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
17756 | ||
5809aa05 | 17757 | #: git-bisect.sh:306 |
1b7f4a34 JX |
17758 | #, sh-format |
17759 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
17760 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 17761 | |
90e6ef53 | 17762 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
17763 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
17764 | #. translation. The program will only accept English input | |
17765 | #. at this point. | |
5809aa05 | 17766 | #: git-bisect.sh:312 |
c04f5ac3 JX |
17767 | msgid "Are you sure [Y/n]? " |
17768 | msgstr "您确认么[Y/n]? " | |
17769 | ||
5809aa05 | 17770 | #: git-bisect.sh:324 |
1b7f4a34 | 17771 | #, sh-format |
b694fbb1 | 17772 | msgid "" |
1b7f4a34 JX |
17773 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
17774 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
17775 | msgstr "" |
17776 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 17777 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 17778 | |
5809aa05 | 17779 | #: git-bisect.sh:327 |
1b7f4a34 | 17780 | #, sh-format |
b694fbb1 JX |
17781 | msgid "" |
17782 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
17783 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
17784 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
17785 | msgstr "" |
17786 | "您需要执行 \"git bisect start\" 来开始。\n" | |
17787 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 17788 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 17789 | |
5809aa05 | 17790 | #: git-bisect.sh:398 git-bisect.sh:512 |
b694fbb1 JX |
17791 | msgid "We are not bisecting." |
17792 | msgstr "我们没有在二分查找。" | |
17793 | ||
5809aa05 | 17794 | #: git-bisect.sh:405 |
c04f5ac3 JX |
17795 | #, sh-format |
17796 | msgid "'$invalid' is not a valid commit" | |
17797 | msgstr "'$invalid' 不是一个有效的提交" | |
17798 | ||
5809aa05 | 17799 | #: git-bisect.sh:414 |
c04f5ac3 JX |
17800 | #, sh-format |
17801 | msgid "" | |
17802 | "Could not check out original HEAD '$branch'.\n" | |
17803 | "Try 'git bisect reset <commit>'." | |
17804 | msgstr "" | |
17805 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 17806 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 17807 | |
5809aa05 | 17808 | #: git-bisect.sh:422 |
c04f5ac3 JX |
17809 | msgid "No logfile given" |
17810 | msgstr "未提供日志文件" | |
17811 | ||
5809aa05 | 17812 | #: git-bisect.sh:423 |
c04f5ac3 JX |
17813 | #, sh-format |
17814 | msgid "cannot read $file for replaying" | |
17815 | msgstr "不能读取 $file 来重放" | |
17816 | ||
5809aa05 | 17817 | #: git-bisect.sh:444 |
c04f5ac3 JX |
17818 | msgid "?? what are you talking about?" |
17819 | msgstr "?? 您在说什么?" | |
17820 | ||
5809aa05 JX |
17821 | #: git-bisect.sh:453 |
17822 | msgid "bisect run failed: no command provided." | |
17823 | msgstr "二分查找运行失败:没有提供命令。" | |
17824 | ||
17825 | #: git-bisect.sh:458 | |
b694fbb1 JX |
17826 | #, sh-format |
17827 | msgid "running $command" | |
17828 | msgstr "运行 $command" | |
17829 | ||
5809aa05 | 17830 | #: git-bisect.sh:465 |
b694fbb1 JX |
17831 | #, sh-format |
17832 | msgid "" | |
17833 | "bisect run failed:\n" | |
17834 | "exit code $res from '$command' is < 0 or >= 128" | |
17835 | msgstr "" | |
17836 | "二分查找运行失败:\n" | |
07432cef | 17837 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 17838 | |
5809aa05 | 17839 | #: git-bisect.sh:491 |
b694fbb1 JX |
17840 | msgid "bisect run cannot continue any more" |
17841 | msgstr "二分查找不能继续运行" | |
17842 | ||
5809aa05 | 17843 | #: git-bisect.sh:497 |
b694fbb1 JX |
17844 | #, sh-format |
17845 | msgid "" | |
17846 | "bisect run failed:\n" | |
17847 | "'bisect_state $state' exited with error code $res" | |
17848 | msgstr "" | |
17849 | "二分查找运行失败:\n" | |
17850 | "'bisect_state $state' 退出码为 $res" | |
17851 | ||
5809aa05 | 17852 | #: git-bisect.sh:504 |
b694fbb1 JX |
17853 | msgid "bisect run success" |
17854 | msgstr "二分查找运行成功" | |
c04f5ac3 | 17855 | |
5809aa05 | 17856 | #: git-bisect.sh:533 |
b694fbb1 | 17857 | #, sh-format |
1b7f4a34 JX |
17858 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
17859 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 17860 | |
5809aa05 | 17861 | #: git-bisect.sh:567 |
94550ed3 JX |
17862 | msgid "no terms defined" |
17863 | msgstr "未定义术语" | |
17864 | ||
5809aa05 | 17865 | #: git-bisect.sh:584 |
94550ed3 JX |
17866 | #, sh-format |
17867 | msgid "" | |
17868 | "invalid argument $arg for 'git bisect terms'.\n" | |
17869 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
17870 | msgstr "" | |
17871 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
17872 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
17873 | ||
5c57d762 JX |
17874 | #: git-merge-octopus.sh:46 |
17875 | msgid "" | |
17876 | "Error: Your local changes to the following files would be overwritten by " | |
17877 | "merge" | |
17878 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
17879 | ||
17880 | #: git-merge-octopus.sh:61 | |
17881 | msgid "Automated merge did not work." | |
9a4b694c | 17882 | msgstr "自动合并未生效。" |
5c57d762 JX |
17883 | |
17884 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 17885 | msgid "Should not be doing an octopus." |
5c57d762 JX |
17886 | msgstr "不应该执行章鱼式合并。" |
17887 | ||
17888 | #: git-merge-octopus.sh:73 | |
17889 | #, sh-format | |
17890 | msgid "Unable to find common commit with $pretty_name" | |
17891 | msgstr "无法找到和 $pretty_name 的基线提交" | |
17892 | ||
17893 | #: git-merge-octopus.sh:77 | |
17894 | #, sh-format | |
6937cb4e | 17895 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
17896 | msgstr "已经和 $pretty_name 保持一致" |
17897 | ||
17898 | #: git-merge-octopus.sh:89 | |
17899 | #, sh-format | |
17900 | msgid "Fast-forwarding to: $pretty_name" | |
17901 | msgstr "快进至:$pretty_name" | |
17902 | ||
17903 | #: git-merge-octopus.sh:97 | |
17904 | #, sh-format | |
17905 | msgid "Trying simple merge with $pretty_name" | |
17906 | msgstr "尝试和 $pretty_name 的简单合并" | |
17907 | ||
17908 | #: git-merge-octopus.sh:102 | |
17909 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 17910 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 17911 | |
fd8cb379 | 17912 | #: git-rebase.sh:61 |
649900bc | 17913 | msgid "" |
6937cb4e JX |
17914 | "Resolve all conflicts manually, mark them as resolved with\n" |
17915 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
17916 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
17917 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
17918 | "abort\"." | |
649900bc | 17919 | msgstr "" |
58b6f078 | 17920 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" |
6937cb4e JX |
17921 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" |
17922 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
17923 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
649900bc | 17924 | |
c1ac5258 | 17925 | #: git-rebase.sh:173 git-rebase.sh:454 |
5c57d762 JX |
17926 | #, sh-format |
17927 | msgid "Could not move back to $head_name" | |
17928 | msgstr "无法移回 $head_name" | |
17929 | ||
fd8cb379 | 17930 | #: git-rebase.sh:184 |
a4f16749 JX |
17931 | msgid "Applied autostash." |
17932 | msgstr "成功应用 autostash。" | |
17933 | ||
fd8cb379 | 17934 | #: git-rebase.sh:187 |
2e8451e8 JX |
17935 | #, sh-format |
17936 | msgid "Cannot store $stash_sha1" | |
17937 | msgstr "无法保存 $stash_sha1" | |
17938 | ||
c1ac5258 | 17939 | #: git-rebase.sh:236 |
649900bc | 17940 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 17941 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 17942 | |
c1ac5258 | 17943 | #: git-rebase.sh:241 |
5809aa05 JX |
17944 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
17945 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
649900bc | 17946 | |
c1ac5258 | 17947 | #: git-rebase.sh:415 |
649900bc JX |
17948 | msgid "No rebase in progress?" |
17949 | msgstr "没有正在进行的变基?" | |
17950 | ||
c1ac5258 | 17951 | #: git-rebase.sh:426 |
07432cef WS |
17952 | msgid "The --edit-todo action can only be used during interactive rebase." |
17953 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
17954 | ||
c1ac5258 | 17955 | #: git-rebase.sh:433 |
649900bc JX |
17956 | msgid "Cannot read HEAD" |
17957 | msgstr "不能读取 HEAD" | |
17958 | ||
c1ac5258 | 17959 | #: git-rebase.sh:436 |
649900bc JX |
17960 | msgid "" |
17961 | "You must edit all merge conflicts and then\n" | |
17962 | "mark them as resolved using git add" | |
17963 | msgstr "" | |
17964 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
17965 | "命令将它们标记为已解决" | |
17966 | ||
c1ac5258 | 17967 | #: git-rebase.sh:480 |
649900bc JX |
17968 | #, sh-format |
17969 | msgid "" | |
17970 | "It seems that there is already a $state_dir_base directory, and\n" | |
17971 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
17972 | "case, please try\n" | |
17973 | "\t$cmd_live_rebase\n" | |
17974 | "If that is not the case, please\n" | |
17975 | "\t$cmd_clear_stale_rebase\n" | |
17976 | "and run me again. I am stopping in case you still have something\n" | |
17977 | "valuable there." | |
17978 | msgstr "" | |
98b2761d JX |
17979 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
17980 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
17981 | "\t$cmd_live_rebase\n" |
17982 | "如果不是这样,请执行\n" | |
17983 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 17984 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 17985 | |
c1ac5258 | 17986 | #: git-rebase.sh:545 |
fd8cb379 | 17987 | msgid "error: cannot combine '--signoff' with '--preserve-merges'" |
c1ac5258 JX |
17988 | msgstr "错误:不能组合 '--signoff' 和 '--preserve-merges'" |
17989 | ||
17990 | #: git-rebase.sh:556 | |
17991 | msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" | |
17992 | msgstr "错误:不能组合 '--preserve_merges' 和 '--rebase-merges'" | |
17993 | ||
17994 | #: git-rebase.sh:562 | |
17995 | msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" | |
17996 | msgstr "错误:不能组合 '--rebase_merges' 和 '--strategy-option'" | |
17997 | ||
17998 | #: git-rebase.sh:564 | |
17999 | msgid "error: cannot combine '--rebase_merges' with '--strategy'" | |
18000 | msgstr "错误:不能组合 '--rebase_merges' 和 '--strategy'" | |
fd8cb379 | 18001 | |
c1ac5258 | 18002 | #: git-rebase.sh:590 |
649900bc | 18003 | #, sh-format |
5809aa05 JX |
18004 | msgid "invalid upstream '$upstream_name'" |
18005 | msgstr "无效的上游 '$upstream_name'" | |
649900bc | 18006 | |
c1ac5258 | 18007 | #: git-rebase.sh:614 |
649900bc JX |
18008 | #, sh-format |
18009 | msgid "$onto_name: there are more than one merge bases" | |
18010 | msgstr "$onto_name: 有一个以上的合并基准" | |
18011 | ||
c1ac5258 | 18012 | #: git-rebase.sh:617 git-rebase.sh:621 |
649900bc JX |
18013 | #, sh-format |
18014 | msgid "$onto_name: there is no merge base" | |
18015 | msgstr "$onto_name: 没有合并基准" | |
18016 | ||
c1ac5258 | 18017 | #: git-rebase.sh:626 |
649900bc JX |
18018 | #, sh-format |
18019 | msgid "Does not point to a valid commit: $onto_name" | |
18020 | msgstr "没有指向一个有效的提交:$onto_name" | |
18021 | ||
c1ac5258 | 18022 | #: git-rebase.sh:652 |
649900bc | 18023 | #, sh-format |
5809aa05 JX |
18024 | msgid "fatal: no such branch/commit '$branch_name'" |
18025 | msgstr "严重错误:无此分支/提交 '$branch_name'" | |
649900bc | 18026 | |
c1ac5258 | 18027 | #: git-rebase.sh:685 |
2e8451e8 JX |
18028 | msgid "Cannot autostash" |
18029 | msgstr "无法 autostash" | |
18030 | ||
c1ac5258 | 18031 | #: git-rebase.sh:690 |
2e8451e8 JX |
18032 | #, sh-format |
18033 | msgid "Created autostash: $stash_abbrev" | |
18034 | msgstr "创建了 autostash: $stash_abbrev" | |
18035 | ||
c1ac5258 | 18036 | #: git-rebase.sh:694 |
649900bc | 18037 | msgid "Please commit or stash them." |
a4f16749 | 18038 | msgstr "请提交或贮藏修改。" |
649900bc | 18039 | |
c1ac5258 | 18040 | #: git-rebase.sh:717 |
5809aa05 JX |
18041 | #, sh-format |
18042 | msgid "HEAD is up to date." | |
18043 | msgstr "HEAD 是最新的。" | |
18044 | ||
c1ac5258 | 18045 | #: git-rebase.sh:719 |
649900bc JX |
18046 | #, sh-format |
18047 | msgid "Current branch $branch_name is up to date." | |
18048 | msgstr "当前分支 $branch_name 是最新的。" | |
18049 | ||
c1ac5258 | 18050 | #: git-rebase.sh:727 |
5809aa05 JX |
18051 | #, sh-format |
18052 | msgid "HEAD is up to date, rebase forced." | |
18053 | msgstr "HEAD 是最新的,强制变基。" | |
18054 | ||
c1ac5258 | 18055 | #: git-rebase.sh:729 |
649900bc JX |
18056 | #, sh-format |
18057 | msgid "Current branch $branch_name is up to date, rebase forced." | |
18058 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
18059 | ||
c1ac5258 | 18060 | #: git-rebase.sh:741 |
649900bc JX |
18061 | #, sh-format |
18062 | msgid "Changes from $mb to $onto:" | |
18063 | msgstr "变更从 $mb 到 $onto:" | |
18064 | ||
c1ac5258 | 18065 | #: git-rebase.sh:750 |
649900bc | 18066 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 18067 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 18068 | |
c1ac5258 | 18069 | #: git-rebase.sh:760 |
649900bc JX |
18070 | #, sh-format |
18071 | msgid "Fast-forwarded $branch_name to $onto_name." | |
18072 | msgstr "快进 $branch_name 至 $onto_name。" | |
18073 | ||
6937cb4e | 18074 | #: git-stash.sh:61 |
c04f5ac3 JX |
18075 | msgid "git stash clear with parameters is unimplemented" |
18076 | msgstr "git stash clear 不支持参数" | |
18077 | ||
5809aa05 | 18078 | #: git-stash.sh:108 |
c04f5ac3 JX |
18079 | msgid "You do not have the initial commit yet" |
18080 | msgstr "您尚未建立初始提交" | |
18081 | ||
5809aa05 | 18082 | #: git-stash.sh:123 |
c04f5ac3 | 18083 | msgid "Cannot save the current index state" |
90e6ef53 | 18084 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 18085 | |
5809aa05 | 18086 | #: git-stash.sh:138 |
a0b6b246 JX |
18087 | msgid "Cannot save the untracked files" |
18088 | msgstr "无法保存未跟踪文件" | |
18089 | ||
5809aa05 | 18090 | #: git-stash.sh:158 git-stash.sh:171 |
c04f5ac3 JX |
18091 | msgid "Cannot save the current worktree state" |
18092 | msgstr "无法保存当前工作区状态" | |
18093 | ||
5809aa05 | 18094 | #: git-stash.sh:175 |
c04f5ac3 | 18095 | msgid "No changes selected" |
90e6ef53 | 18096 | msgstr "没有选择变更" |
c04f5ac3 | 18097 | |
5809aa05 | 18098 | #: git-stash.sh:178 |
c04f5ac3 | 18099 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 18100 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 18101 | |
5809aa05 | 18102 | #: git-stash.sh:191 |
c04f5ac3 JX |
18103 | msgid "Cannot record working tree state" |
18104 | msgstr "不能记录工作区状态" | |
18105 | ||
5809aa05 | 18106 | #: git-stash.sh:229 |
2e8451e8 JX |
18107 | #, sh-format |
18108 | msgid "Cannot update $ref_stash with $w_commit" | |
18109 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
18110 | ||
5809aa05 | 18111 | #: git-stash.sh:281 |
b694fbb1 | 18112 | #, sh-format |
5809aa05 JX |
18113 | msgid "error: unknown option for 'stash push': $option" |
18114 | msgstr "错误:'stash push' 的未知选项:$option" | |
b694fbb1 | 18115 | |
5809aa05 | 18116 | #: git-stash.sh:295 |
a0b6b246 JX |
18117 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
18118 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
18119 | ||
5809aa05 | 18120 | #: git-stash.sh:303 |
c04f5ac3 JX |
18121 | msgid "No local changes to save" |
18122 | msgstr "没有要保存的本地修改" | |
18123 | ||
5809aa05 | 18124 | #: git-stash.sh:308 |
c04f5ac3 | 18125 | msgid "Cannot initialize stash" |
a4f16749 | 18126 | msgstr "无法初始化贮藏" |
c04f5ac3 | 18127 | |
5809aa05 | 18128 | #: git-stash.sh:312 |
c04f5ac3 JX |
18129 | msgid "Cannot save the current status" |
18130 | msgstr "无法保存当前状态" | |
18131 | ||
5809aa05 | 18132 | #: git-stash.sh:313 |
5c57d762 JX |
18133 | #, sh-format |
18134 | msgid "Saved working directory and index state $stash_msg" | |
18135 | msgstr "保存工作目录和索引状态 $stash_msg" | |
18136 | ||
fd8cb379 | 18137 | #: git-stash.sh:342 |
c04f5ac3 JX |
18138 | msgid "Cannot remove worktree changes" |
18139 | msgstr "无法删除工作区变更" | |
18140 | ||
fd8cb379 | 18141 | #: git-stash.sh:490 |
7aea43ff JX |
18142 | #, sh-format |
18143 | msgid "unknown option: $opt" | |
18144 | msgstr "未知选项: $opt" | |
18145 | ||
fd8cb379 | 18146 | #: git-stash.sh:503 |
a4f16749 JX |
18147 | msgid "No stash entries found." |
18148 | msgstr "未发现贮藏条目。" | |
c04f5ac3 | 18149 | |
fd8cb379 | 18150 | #: git-stash.sh:510 |
c04f5ac3 JX |
18151 | #, sh-format |
18152 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 18153 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 18154 | |
fd8cb379 | 18155 | #: git-stash.sh:525 |
c04f5ac3 | 18156 | #, sh-format |
220c313c JX |
18157 | msgid "$reference is not a valid reference" |
18158 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 18159 | |
fd8cb379 | 18160 | #: git-stash.sh:553 |
c04f5ac3 JX |
18161 | #, sh-format |
18162 | msgid "'$args' is not a stash-like commit" | |
a4f16749 | 18163 | msgstr "'$args' 不是贮藏式提交" |
c04f5ac3 | 18164 | |
fd8cb379 | 18165 | #: git-stash.sh:564 |
c04f5ac3 JX |
18166 | #, sh-format |
18167 | msgid "'$args' is not a stash reference" | |
a4f16749 | 18168 | msgstr "'$args' 不是一个贮藏引用" |
c04f5ac3 | 18169 | |
fd8cb379 | 18170 | #: git-stash.sh:572 |
c04f5ac3 | 18171 | msgid "unable to refresh index" |
90e6ef53 | 18172 | msgstr "无法刷新索引" |
c04f5ac3 | 18173 | |
fd8cb379 | 18174 | #: git-stash.sh:576 |
c04f5ac3 | 18175 | msgid "Cannot apply a stash in the middle of a merge" |
a4f16749 | 18176 | msgstr "无法在合并过程应用贮藏" |
c04f5ac3 | 18177 | |
fd8cb379 | 18178 | #: git-stash.sh:584 |
c04f5ac3 | 18179 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 18180 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 18181 | |
fd8cb379 | 18182 | #: git-stash.sh:586 |
c04f5ac3 | 18183 | msgid "Could not save index tree" |
90e6ef53 | 18184 | msgstr "不能保存索引树" |
c04f5ac3 | 18185 | |
fd8cb379 | 18186 | #: git-stash.sh:595 |
a4f16749 JX |
18187 | msgid "Could not restore untracked files from stash entry" |
18188 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
a0b6b246 | 18189 | |
fd8cb379 | 18190 | #: git-stash.sh:620 |
c04f5ac3 | 18191 | msgid "Cannot unstage modified files" |
160fb2b2 | 18192 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 18193 | |
fd8cb379 | 18194 | #: git-stash.sh:635 |
b694fbb1 | 18195 | msgid "Index was not unstashed." |
a4f16749 | 18196 | msgstr "索引未从贮藏中恢复。" |
b694fbb1 | 18197 | |
fd8cb379 | 18198 | #: git-stash.sh:649 |
a4f16749 JX |
18199 | msgid "The stash entry is kept in case you need it again." |
18200 | msgstr "贮藏条目被保留以备您再次需要。" | |
5c57d762 | 18201 | |
fd8cb379 | 18202 | #: git-stash.sh:658 |
c04f5ac3 JX |
18203 | #, sh-format |
18204 | msgid "Dropped ${REV} ($s)" | |
18205 | msgstr "丢弃了 ${REV} ($s)" | |
18206 | ||
fd8cb379 | 18207 | #: git-stash.sh:659 |
c04f5ac3 JX |
18208 | #, sh-format |
18209 | msgid "${REV}: Could not drop stash entry" | |
a4f16749 | 18210 | msgstr "${REV}:无法丢弃贮藏条目" |
c04f5ac3 | 18211 | |
fd8cb379 | 18212 | #: git-stash.sh:667 |
c04f5ac3 JX |
18213 | msgid "No branch name specified" |
18214 | msgstr "未指定分支名" | |
18215 | ||
fd8cb379 | 18216 | #: git-stash.sh:746 |
c04f5ac3 JX |
18217 | msgid "(To restore them type \"git stash apply\")" |
18218 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
18219 | ||
fd8cb379 | 18220 | #: git-submodule.sh:188 |
2e8451e8 JX |
18221 | msgid "Relative path can only be used from the toplevel of the working tree" |
18222 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
18223 | ||
fd8cb379 | 18224 | #: git-submodule.sh:198 |
c04f5ac3 JX |
18225 | #, sh-format |
18226 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 18227 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 18228 | |
fd8cb379 | 18229 | #: git-submodule.sh:217 |
c04f5ac3 | 18230 | #, sh-format |
170e9899 JX |
18231 | msgid "'$sm_path' already exists in the index" |
18232 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 18233 | |
fd8cb379 | 18234 | #: git-submodule.sh:220 |
1a79b2f1 JX |
18235 | #, sh-format |
18236 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
18237 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
18238 | ||
fd8cb379 | 18239 | #: git-submodule.sh:226 |
b694fbb1 JX |
18240 | #, sh-format |
18241 | msgid "" | |
18242 | "The following path is ignored by one of your .gitignore files:\n" | |
18243 | "$sm_path\n" | |
18244 | "Use -f if you really want to add it." | |
18245 | msgstr "" | |
18246 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
18247 | "$sm_path\n" | |
18248 | "如果您确实想添加它,使用 -f 参数。" | |
18249 | ||
fd8cb379 | 18250 | #: git-submodule.sh:249 |
b694fbb1 JX |
18251 | #, sh-format |
18252 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 18253 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 18254 | |
fd8cb379 | 18255 | #: git-submodule.sh:251 |
c04f5ac3 | 18256 | #, sh-format |
170e9899 | 18257 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 18258 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 18259 | |
fd8cb379 | 18260 | #: git-submodule.sh:259 |
07432cef WS |
18261 | #, sh-format |
18262 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 18263 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 18264 | |
fd8cb379 | 18265 | #: git-submodule.sh:261 |
07432cef WS |
18266 | #, sh-format |
18267 | msgid "" | |
5c57d762 JX |
18268 | "If you want to reuse this local git directory instead of cloning again from\n" |
18269 | " $realrepo\n" | |
18270 | "use the '--force' option. If the local git directory is not the correct " | |
18271 | "repo\n" | |
07432cef WS |
18272 | "or you are unsure what this means choose another name with the '--name' " |
18273 | "option." | |
5c57d762 JX |
18274 | msgstr "" |
18275 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
18276 | " $realrepo\n" | |
18277 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
18278 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 18279 | |
fd8cb379 | 18280 | #: git-submodule.sh:267 |
07432cef WS |
18281 | #, sh-format |
18282 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
18283 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
18284 | ||
fd8cb379 | 18285 | #: git-submodule.sh:279 |
c04f5ac3 | 18286 | #, sh-format |
170e9899 JX |
18287 | msgid "Unable to checkout submodule '$sm_path'" |
18288 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 18289 | |
fd8cb379 | 18290 | #: git-submodule.sh:284 |
c04f5ac3 | 18291 | #, sh-format |
170e9899 JX |
18292 | msgid "Failed to add submodule '$sm_path'" |
18293 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 18294 | |
fd8cb379 | 18295 | #: git-submodule.sh:293 |
c04f5ac3 | 18296 | #, sh-format |
170e9899 JX |
18297 | msgid "Failed to register submodule '$sm_path'" |
18298 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 18299 | |
c1ac5258 | 18300 | #: git-submodule.sh:565 |
c04f5ac3 | 18301 | #, sh-format |
2e8451e8 JX |
18302 | msgid "Unable to find current revision in submodule path '$displaypath'" |
18303 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 18304 | |
c1ac5258 | 18305 | #: git-submodule.sh:575 |
c04f5ac3 | 18306 | #, sh-format |
170e9899 JX |
18307 | msgid "Unable to fetch in submodule path '$sm_path'" |
18308 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 18309 | |
c1ac5258 | 18310 | #: git-submodule.sh:580 |
5c57d762 JX |
18311 | #, sh-format |
18312 | msgid "" | |
18313 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
18314 | "'$sm_path'" | |
9a4b694c | 18315 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 18316 | |
c1ac5258 | 18317 | #: git-submodule.sh:603 |
2e8451e8 JX |
18318 | #, sh-format |
18319 | msgid "Unable to fetch in submodule path '$displaypath'" | |
18320 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
18321 | ||
c1ac5258 | 18322 | #: git-submodule.sh:609 |
5c57d762 JX |
18323 | #, sh-format |
18324 | msgid "" | |
18325 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
18326 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
18327 | msgstr "" |
18328 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 18329 | |
c1ac5258 | 18330 | #: git-submodule.sh:616 |
6c94aba5 JX |
18331 | #, sh-format |
18332 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
18333 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
18334 | ||
c1ac5258 | 18335 | #: git-submodule.sh:617 |
c04f5ac3 | 18336 | #, sh-format |
6c94aba5 JX |
18337 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
18338 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
18339 | ||
c1ac5258 | 18340 | #: git-submodule.sh:621 |
6c94aba5 | 18341 | #, sh-format |
2e8451e8 JX |
18342 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
18343 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 18344 | |
c1ac5258 | 18345 | #: git-submodule.sh:622 |
c04f5ac3 | 18346 | #, sh-format |
2e8451e8 JX |
18347 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
18348 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 18349 | |
c1ac5258 | 18350 | #: git-submodule.sh:627 |
c04f5ac3 | 18351 | #, sh-format |
2e8451e8 JX |
18352 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
18353 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 18354 | |
c1ac5258 | 18355 | #: git-submodule.sh:628 |
c04f5ac3 | 18356 | #, sh-format |
2e8451e8 JX |
18357 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
18358 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 18359 | |
c1ac5258 | 18360 | #: git-submodule.sh:633 |
c04f5ac3 | 18361 | #, sh-format |
5b04ee3b JX |
18362 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
18363 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 18364 | |
c1ac5258 | 18365 | #: git-submodule.sh:634 |
c04f5ac3 | 18366 | #, sh-format |
5b04ee3b | 18367 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 18368 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 18369 | |
c1ac5258 | 18370 | #: git-submodule.sh:665 |
2e8451e8 JX |
18371 | #, sh-format |
18372 | msgid "Failed to recurse into submodule path '$displaypath'" | |
18373 | msgstr "无法递归进子模组路径 '$displaypath'" | |
18374 | ||
c1ac5258 | 18375 | #: git-submodule.sh:761 |
649900bc JX |
18376 | msgid "The --cached option cannot be used with the --files option" |
18377 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 18378 | |
c1ac5258 | 18379 | #: git-submodule.sh:813 |
b694fbb1 JX |
18380 | #, sh-format |
18381 | msgid "unexpected mode $mod_dst" | |
18382 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 18383 | |
90e6ef53 | 18384 | # 译者:注意保持前导空格 |
c1ac5258 | 18385 | #: git-submodule.sh:833 |
c04f5ac3 | 18386 | #, sh-format |
2e8451e8 JX |
18387 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
18388 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 18389 | |
90e6ef53 | 18390 | # 译者:注意保持前导空格 |
c1ac5258 | 18391 | #: git-submodule.sh:836 |
c04f5ac3 | 18392 | #, sh-format |
2e8451e8 JX |
18393 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
18394 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 18395 | |
90e6ef53 | 18396 | # 译者:注意保持前导空格 |
c1ac5258 | 18397 | #: git-submodule.sh:839 |
c04f5ac3 | 18398 | #, sh-format |
2e8451e8 JX |
18399 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
18400 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 18401 | |
5b04ee3b JX |
18402 | #: git-parse-remote.sh:89 |
18403 | #, sh-format | |
18404 | msgid "See git-${cmd}(1) for details." | |
18405 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 18406 | |
c1ac5258 | 18407 | #: git-rebase--interactive.sh:43 |
5c57d762 JX |
18408 | msgid "" |
18409 | "\n" | |
18410 | "Commands:\n" | |
fd8cb379 JX |
18411 | "p, pick <commit> = use commit\n" |
18412 | "r, reword <commit> = use commit, but edit the commit message\n" | |
18413 | "e, edit <commit> = use commit, but stop for amending\n" | |
18414 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
18415 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
18416 | "x, exec <command> = run command (the rest of the line) using shell\n" | |
18417 | "d, drop <commit> = remove commit\n" | |
18418 | "l, label <label> = label current HEAD with a name\n" | |
18419 | "t, reset <label> = reset HEAD to a label\n" | |
18420 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
18421 | ". create a merge commit using the original merge commit's\n" | |
18422 | ". message (or the oneline, if no original merge commit was\n" | |
18423 | ". specified). Use -c <commit> to reword the commit message.\n" | |
5c57d762 JX |
18424 | "\n" |
18425 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
18426 | msgstr "" | |
18427 | "\n" | |
18428 | "命令:\n" | |
fd8cb379 JX |
18429 | "p, pick <提交> = 使用提交\n" |
18430 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
18431 | "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n" | |
18432 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
18433 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
18434 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
18435 | "d, drop <提交> = 删除提交\n" | |
18436 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
18437 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
18438 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
18439 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
18440 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
18441 | ". -c <提交> 可以编辑提交说明。\n" | |
5c57d762 | 18442 | "\n" |
fd8cb379 | 18443 | "可以对这些行重新排序,将从上至下执行。\n" |
5c57d762 | 18444 | |
c1ac5258 | 18445 | #: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 |
5c57d762 JX |
18446 | msgid "" |
18447 | "\n" | |
18448 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
a0b6b246 JX |
18449 | msgstr "" |
18450 | "\n" | |
18451 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5c57d762 | 18452 | |
c1ac5258 | 18453 | #: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 |
5c57d762 JX |
18454 | msgid "" |
18455 | "\n" | |
18456 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
a0b6b246 JX |
18457 | msgstr "" |
18458 | "\n" | |
18459 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5c57d762 | 18460 | |
c1ac5258 JX |
18461 | #: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 |
18462 | msgid "could not detach HEAD" | |
18463 | msgstr "不能检出为分离头指针" | |
18464 | ||
18465 | #: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 | |
18466 | msgid "" | |
18467 | "\n" | |
18468 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
18469 | "To continue rebase after editing, run:\n" | |
18470 | " git rebase --continue\n" | |
18471 | "\n" | |
18472 | msgstr "" | |
18473 | "\n" | |
18474 | "您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" | |
18475 | "请执行:\n" | |
18476 | " git rebase --continue\n" | |
18477 | "\n" | |
18478 | ||
18479 | #: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 | |
18480 | #: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 | |
18481 | msgid "Could not execute editor" | |
18482 | msgstr "无法运行编辑器" | |
18483 | ||
18484 | #: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 | |
18485 | #, sh-format | |
18486 | msgid "Could not checkout $switch_to" | |
18487 | msgstr "不能检出 $switch_to" | |
18488 | ||
18489 | #: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 | |
18490 | msgid "No HEAD?" | |
18491 | msgstr "没有 HEAD?" | |
18492 | ||
18493 | #: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 | |
18494 | #, sh-format | |
18495 | msgid "Could not create temporary $state_dir" | |
18496 | msgstr "不能创建临时 $state_dir" | |
18497 | ||
18498 | #: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 | |
18499 | msgid "Could not mark as interactive" | |
18500 | msgstr "不能标记为交互式" | |
18501 | ||
18502 | #: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 | |
18503 | #, sh-format | |
18504 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
18505 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
18506 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
18507 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
18508 | ||
18509 | #: git-rebase--interactive.sh:224 | |
18510 | msgid "" | |
18511 | "\n" | |
18512 | "\tHowever, if you remove everything, the rebase will be aborted.\n" | |
18513 | "\n" | |
18514 | "\t" | |
18515 | msgstr "" | |
18516 | "\n" | |
18517 | "\t然而,如果您删除全部内容,变基操作将会终止。\n" | |
18518 | "\n" | |
18519 | "\t" | |
18520 | ||
18521 | #: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 | |
18522 | msgid "Note that empty commits are commented out" | |
18523 | msgstr "注意空提交已被注释掉" | |
18524 | ||
18525 | #: git-rebase--interactive.sh:280 | |
18526 | msgid "Could not generate todo list" | |
18527 | msgstr "无法生成待办列表" | |
18528 | ||
18529 | #: git-rebase--preserve-merges.sh:136 | |
18530 | #, sh-format | |
18531 | msgid "Rebasing ($new_count/$total)" | |
18532 | msgstr "变基中($new_count/$total)" | |
18533 | ||
18534 | #: git-rebase--preserve-merges.sh:152 | |
18535 | msgid "" | |
18536 | "\n" | |
18537 | "Commands:\n" | |
18538 | "p, pick <commit> = use commit\n" | |
18539 | "r, reword <commit> = use commit, but edit the commit message\n" | |
18540 | "e, edit <commit> = use commit, but stop for amending\n" | |
18541 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
18542 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
18543 | "x, exec <commit> = run command (the rest of the line) using shell\n" | |
18544 | "d, drop <commit> = remove commit\n" | |
18545 | "l, label <label> = label current HEAD with a name\n" | |
18546 | "t, reset <label> = reset HEAD to a label\n" | |
18547 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
18548 | ". create a merge commit using the original merge commit's\n" | |
18549 | ". message (or the oneline, if no original merge commit was\n" | |
18550 | ". specified). Use -c <commit> to reword the commit message.\n" | |
18551 | "\n" | |
18552 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
18553 | msgstr "" | |
18554 | "\n" | |
18555 | "命令:\n" | |
18556 | "p, pick <提交> = 使用提交\n" | |
18557 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
18558 | "e, edit <提交> = 使用提交,但停下来修补\n" | |
18559 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
18560 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
18561 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
18562 | "d, drop <提交> = 删除提交\n" | |
18563 | "l, label <标签> = 为当前 HEAD 打上标签\n" | |
18564 | "t, reset <标签> = 重置 HEAD 到该标签\n" | |
18565 | "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" | |
18566 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
18567 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
18568 | ". -c <提交> 可以编辑提交说明。\n" | |
18569 | "\n" | |
18570 | "可以对这些行重新排序,将从上至下执行。\n" | |
18571 | ||
18572 | #: git-rebase--preserve-merges.sh:215 | |
5c57d762 JX |
18573 | #, sh-format |
18574 | msgid "" | |
18575 | "You can amend the commit now, with\n" | |
18576 | "\n" | |
18577 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
18578 | "\n" | |
18579 | "Once you are satisfied with your changes, run\n" | |
18580 | "\n" | |
18581 | "\tgit rebase --continue" | |
18582 | msgstr "" | |
18583 | "您现在可以修补这个提交,使用\n" | |
18584 | "\n" | |
18585 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
18586 | "\n" | |
9a4b694c | 18587 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
18588 | "\n" |
18589 | "\tgit rebase --continue" | |
18590 | ||
c1ac5258 | 18591 | #: git-rebase--preserve-merges.sh:240 |
5c57d762 JX |
18592 | #, sh-format |
18593 | msgid "$sha1: not a commit that can be picked" | |
18594 | msgstr "$sha1:不是一个可以被拣选的提交" | |
18595 | ||
c1ac5258 | 18596 | #: git-rebase--preserve-merges.sh:279 |
5c57d762 JX |
18597 | #, sh-format |
18598 | msgid "Invalid commit name: $sha1" | |
18599 | msgstr "无效的提交名:$sha1" | |
18600 | ||
c1ac5258 | 18601 | #: git-rebase--preserve-merges.sh:309 |
5c57d762 JX |
18602 | msgid "Cannot write current commit's replacement sha1" |
18603 | msgstr "不能写入当前提交的替代 sha1" | |
18604 | ||
c1ac5258 | 18605 | #: git-rebase--preserve-merges.sh:360 |
5c57d762 JX |
18606 | #, sh-format |
18607 | msgid "Fast-forward to $sha1" | |
18608 | msgstr "快进到 $sha1" | |
18609 | ||
c1ac5258 | 18610 | #: git-rebase--preserve-merges.sh:362 |
5c57d762 JX |
18611 | #, sh-format |
18612 | msgid "Cannot fast-forward to $sha1" | |
18613 | msgstr "不能快进到 $sha1" | |
18614 | ||
c1ac5258 | 18615 | #: git-rebase--preserve-merges.sh:371 |
5c57d762 JX |
18616 | #, sh-format |
18617 | msgid "Cannot move HEAD to $first_parent" | |
18618 | msgstr "不能移动 HEAD 到 $first_parent" | |
18619 | ||
c1ac5258 | 18620 | #: git-rebase--preserve-merges.sh:376 |
5c57d762 JX |
18621 | #, sh-format |
18622 | msgid "Refusing to squash a merge: $sha1" | |
18623 | msgstr "拒绝压缩一个合并:$sha1" | |
18624 | ||
c1ac5258 | 18625 | #: git-rebase--preserve-merges.sh:394 |
5c57d762 JX |
18626 | #, sh-format |
18627 | msgid "Error redoing merge $sha1" | |
18628 | msgstr "无法重做合并 $sha1" | |
18629 | ||
c1ac5258 | 18630 | #: git-rebase--preserve-merges.sh:403 |
5c57d762 JX |
18631 | #, sh-format |
18632 | msgid "Could not pick $sha1" | |
18633 | msgstr "不能拣选 $sha1" | |
18634 | ||
c1ac5258 | 18635 | #: git-rebase--preserve-merges.sh:412 |
5c57d762 JX |
18636 | #, sh-format |
18637 | msgid "This is the commit message #${n}:" | |
9a4b694c | 18638 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 18639 | |
c1ac5258 | 18640 | #: git-rebase--preserve-merges.sh:417 |
5c57d762 JX |
18641 | #, sh-format |
18642 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 18643 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 18644 | |
c1ac5258 | 18645 | #: git-rebase--preserve-merges.sh:428 |
5c57d762 JX |
18646 | #, sh-format |
18647 | msgid "This is a combination of $count commit." | |
18648 | msgid_plural "This is a combination of $count commits." | |
18649 | msgstr[0] "这是一个 $count 个提交的组合。" | |
18650 | msgstr[1] "这是一个 $count 个提交的组合。" | |
18651 | ||
c1ac5258 | 18652 | #: git-rebase--preserve-merges.sh:437 |
5c57d762 JX |
18653 | #, sh-format |
18654 | msgid "Cannot write $fixup_msg" | |
18655 | msgstr "不能写入 $fixup_msg" | |
18656 | ||
c1ac5258 | 18657 | #: git-rebase--preserve-merges.sh:440 |
5c57d762 JX |
18658 | msgid "This is a combination of 2 commits." |
18659 | msgstr "这是一个 2 个提交的组合。" | |
18660 | ||
c1ac5258 JX |
18661 | #: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 |
18662 | #: git-rebase--preserve-merges.sh:527 | |
5c57d762 JX |
18663 | #, sh-format |
18664 | msgid "Could not apply $sha1... $rest" | |
18665 | msgstr "不能应用 $sha1... $rest" | |
18666 | ||
c1ac5258 | 18667 | #: git-rebase--preserve-merges.sh:556 |
5c57d762 JX |
18668 | #, sh-format |
18669 | msgid "" | |
18670 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
18671 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
18672 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
18673 | "before\n" | |
18674 | "you are able to reword the commit." | |
18675 | msgstr "" | |
18676 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
18677 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
18678 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
18679 | ||
c1ac5258 | 18680 | #: git-rebase--preserve-merges.sh:571 |
5c57d762 JX |
18681 | #, sh-format |
18682 | msgid "Stopped at $sha1_abbrev... $rest" | |
18683 | msgstr "停止在 $sha1_abbrev... $rest" | |
18684 | ||
c1ac5258 | 18685 | #: git-rebase--preserve-merges.sh:586 |
5c57d762 JX |
18686 | #, sh-format |
18687 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 18688 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 18689 | |
c1ac5258 | 18690 | #: git-rebase--preserve-merges.sh:628 |
5c57d762 JX |
18691 | #, sh-format |
18692 | msgid "Executing: $rest" | |
18693 | msgstr "执行:$rest" | |
18694 | ||
c1ac5258 | 18695 | #: git-rebase--preserve-merges.sh:636 |
5c57d762 JX |
18696 | #, sh-format |
18697 | msgid "Execution failed: $rest" | |
18698 | msgstr "执行失败:$rest" | |
18699 | ||
c1ac5258 | 18700 | #: git-rebase--preserve-merges.sh:638 |
5c57d762 JX |
18701 | msgid "and made changes to the index and/or the working tree" |
18702 | msgstr "并且修改索引和/或工作区" | |
18703 | ||
18704 | # 译者:注意保持前导空格 | |
c1ac5258 | 18705 | #: git-rebase--preserve-merges.sh:640 |
5c57d762 JX |
18706 | msgid "" |
18707 | "You can fix the problem, and then run\n" | |
18708 | "\n" | |
18709 | "\tgit rebase --continue" | |
18710 | msgstr "" | |
18711 | "您可以解决这个问题,然后运行\n" | |
18712 | "\n" | |
18713 | "\tgit rebase --continue" | |
18714 | ||
18715 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
c1ac5258 | 18716 | #: git-rebase--preserve-merges.sh:653 |
5c57d762 JX |
18717 | #, sh-format |
18718 | msgid "" | |
18719 | "Execution succeeded: $rest\n" | |
18720 | "but left changes to the index and/or the working tree\n" | |
18721 | "Commit or stash your changes, and then run\n" | |
18722 | "\n" | |
18723 | "\tgit rebase --continue" | |
18724 | msgstr "" | |
18725 | "执行成功:$rest\n" | |
a4f16749 | 18726 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
18727 | "\n" |
18728 | "\tgit rebase --continue" | |
18729 | ||
c1ac5258 | 18730 | #: git-rebase--preserve-merges.sh:664 |
5c57d762 JX |
18731 | #, sh-format |
18732 | msgid "Unknown command: $command $sha1 $rest" | |
18733 | msgstr "未知命令:$command $sha1 $rest" | |
18734 | ||
c1ac5258 | 18735 | #: git-rebase--preserve-merges.sh:665 |
5c57d762 JX |
18736 | msgid "Please fix this using 'git rebase --edit-todo'." |
18737 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
18738 | ||
c1ac5258 | 18739 | #: git-rebase--preserve-merges.sh:700 |
5c57d762 JX |
18740 | #, sh-format |
18741 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 18742 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 18743 | |
c1ac5258 | 18744 | #: git-rebase--preserve-merges.sh:757 |
5c57d762 JX |
18745 | msgid "Could not remove CHERRY_PICK_HEAD" |
18746 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
18747 | ||
c1ac5258 | 18748 | #: git-rebase--preserve-merges.sh:762 |
5c57d762 JX |
18749 | #, sh-format |
18750 | msgid "" | |
18751 | "You have staged changes in your working tree.\n" | |
18752 | "If these changes are meant to be\n" | |
18753 | "squashed into the previous commit, run:\n" | |
18754 | "\n" | |
18755 | " git commit --amend $gpg_sign_opt_quoted\n" | |
18756 | "\n" | |
18757 | "If they are meant to go into a new commit, run:\n" | |
18758 | "\n" | |
18759 | " git commit $gpg_sign_opt_quoted\n" | |
18760 | "\n" | |
a0b6b246 | 18761 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
18762 | "\n" |
18763 | " git rebase --continue\n" | |
18764 | msgstr "" | |
18765 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
18766 | "\n" | |
18767 | " git commit --amend $gpg_sign_opt_quoted\n" | |
18768 | "\n" | |
18769 | "如果这些变更要形成一个新提交,执行:\n" | |
18770 | "\n" | |
18771 | " git commit $gpg_sign_opt_quoted\n" | |
18772 | "\n" | |
9a4b694c | 18773 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
18774 | "\n" |
18775 | " git rebase --continue\n" | |
18776 | ||
c1ac5258 | 18777 | #: git-rebase--preserve-merges.sh:779 |
5c57d762 | 18778 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 18779 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 18780 | |
c1ac5258 | 18781 | #: git-rebase--preserve-merges.sh:784 |
5c57d762 JX |
18782 | msgid "" |
18783 | "You have uncommitted changes in your working tree. Please commit them\n" | |
18784 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
18785 | msgstr "" |
18786 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 18787 | |
c1ac5258 | 18788 | #: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 |
5c57d762 JX |
18789 | msgid "Could not commit staged changes." |
18790 | msgstr "不能提交暂存的修改。" | |
18791 | ||
c1ac5258 | 18792 | #: git-rebase--preserve-merges.sh:893 |
5c57d762 JX |
18793 | msgid "" |
18794 | "\n" | |
c1ac5258 | 18795 | "However, if you remove everything, the rebase will be aborted.\n" |
5c57d762 | 18796 | "\n" |
a0b6b246 JX |
18797 | msgstr "" |
18798 | "\n" | |
c1ac5258 | 18799 | "然而,如果您删除全部内容,变基操作将会终止。\n" |
a0b6b246 | 18800 | "\n" |
5c57d762 | 18801 | |
c1ac5258 | 18802 | #: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 |
fd8cb379 JX |
18803 | msgid "Could not init rewritten commits" |
18804 | msgstr "不能对重写提交进行初始化" | |
18805 | ||
5c57d762 JX |
18806 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
18807 | #, sh-format | |
18808 | msgid "usage: $dashless $USAGE" | |
18809 | msgstr "用法:$dashless $USAGE" | |
18810 | ||
18811 | #: git-sh-setup.sh:190 | |
18812 | #, sh-format | |
18813 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 18814 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
18815 | |
18816 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
18817 | #, sh-format | |
18818 | msgid "fatal: $program_name cannot be used without a working tree." | |
18819 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
18820 | ||
18821 | #: git-sh-setup.sh:220 | |
18822 | msgid "Cannot rebase: You have unstaged changes." | |
18823 | msgstr "不能变基:您有未暂存的变更。" | |
18824 | ||
18825 | #: git-sh-setup.sh:223 | |
18826 | msgid "Cannot rewrite branches: You have unstaged changes." | |
18827 | msgstr "不能重写分支:您有未暂存的变更。" | |
18828 | ||
a0b6b246 JX |
18829 | #: git-sh-setup.sh:226 |
18830 | msgid "Cannot pull with rebase: You have unstaged changes." | |
18831 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
18832 | ||
5c57d762 JX |
18833 | #: git-sh-setup.sh:229 |
18834 | #, sh-format | |
18835 | msgid "Cannot $action: You have unstaged changes." | |
18836 | msgstr "不能 $action:您有未暂存的变更。" | |
18837 | ||
18838 | #: git-sh-setup.sh:242 | |
18839 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
18840 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
18841 | ||
a0b6b246 JX |
18842 | #: git-sh-setup.sh:245 |
18843 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
18844 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
18845 | ||
5c57d762 JX |
18846 | #: git-sh-setup.sh:248 |
18847 | #, sh-format | |
18848 | msgid "Cannot $action: Your index contains uncommitted changes." | |
18849 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
18850 | ||
a0b6b246 JX |
18851 | #: git-sh-setup.sh:252 |
18852 | msgid "Additionally, your index contains uncommitted changes." | |
18853 | msgstr "而且您的索引中包含未提交的变更。" | |
18854 | ||
5c57d762 JX |
18855 | #: git-sh-setup.sh:372 |
18856 | msgid "You need to run this command from the toplevel of the working tree." | |
18857 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
18858 | ||
18859 | #: git-sh-setup.sh:377 | |
18860 | msgid "Unable to determine absolute path of git directory" | |
18861 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 18862 | |
1a79b2f1 | 18863 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
a4f16749 | 18864 | #: git-add--interactive.perl:196 |
1a79b2f1 JX |
18865 | #, perl-format |
18866 | msgid "%12s %12s %s" | |
18867 | msgstr "%12s %12s %s" | |
18868 | ||
a4f16749 | 18869 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
18870 | msgid "staged" |
18871 | msgstr "缓存" | |
18872 | ||
a4f16749 | 18873 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
18874 | msgid "unstaged" |
18875 | msgstr "未缓存" | |
18876 | ||
fd8cb379 | 18877 | #: git-add--interactive.perl:253 git-add--interactive.perl:278 |
1a79b2f1 JX |
18878 | msgid "binary" |
18879 | msgstr "二进制" | |
18880 | ||
fd8cb379 | 18881 | #: git-add--interactive.perl:262 git-add--interactive.perl:316 |
1a79b2f1 JX |
18882 | msgid "nothing" |
18883 | msgstr "无" | |
18884 | ||
fd8cb379 | 18885 | #: git-add--interactive.perl:298 git-add--interactive.perl:313 |
1a79b2f1 JX |
18886 | msgid "unchanged" |
18887 | msgstr "没有修改" | |
18888 | ||
fd8cb379 | 18889 | #: git-add--interactive.perl:609 |
1a79b2f1 JX |
18890 | #, perl-format |
18891 | msgid "added %d path\n" | |
18892 | msgid_plural "added %d paths\n" | |
18893 | msgstr[0] "增加了 %d 个路径\n" | |
18894 | msgstr[1] "增加了 %d 个路径\n" | |
18895 | ||
fd8cb379 | 18896 | #: git-add--interactive.perl:612 |
1a79b2f1 JX |
18897 | #, perl-format |
18898 | msgid "updated %d path\n" | |
18899 | msgid_plural "updated %d paths\n" | |
18900 | msgstr[0] "更新了 %d 个路径\n" | |
18901 | msgstr[1] "更新了 %d 个路径\n" | |
18902 | ||
fd8cb379 | 18903 | #: git-add--interactive.perl:615 |
1a79b2f1 JX |
18904 | #, perl-format |
18905 | msgid "reverted %d path\n" | |
18906 | msgid_plural "reverted %d paths\n" | |
18907 | msgstr[0] "还原了 %d 个路径\n" | |
18908 | msgstr[1] "还原了 %d 个路径\n" | |
18909 | ||
fd8cb379 | 18910 | #: git-add--interactive.perl:618 |
1a79b2f1 JX |
18911 | #, perl-format |
18912 | msgid "touched %d path\n" | |
18913 | msgid_plural "touched %d paths\n" | |
18914 | msgstr[0] "触碰了 %d 个路径\n" | |
18915 | msgstr[1] "触碰了 %d 个路径\n" | |
18916 | ||
fd8cb379 | 18917 | #: git-add--interactive.perl:627 |
1a79b2f1 JX |
18918 | msgid "Update" |
18919 | msgstr "更新" | |
18920 | ||
fd8cb379 | 18921 | #: git-add--interactive.perl:639 |
1a79b2f1 JX |
18922 | msgid "Revert" |
18923 | msgstr "还原" | |
18924 | ||
fd8cb379 | 18925 | #: git-add--interactive.perl:662 |
1a79b2f1 JX |
18926 | #, perl-format |
18927 | msgid "note: %s is untracked now.\n" | |
18928 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
18929 | ||
fd8cb379 | 18930 | #: git-add--interactive.perl:673 |
1a79b2f1 JX |
18931 | msgid "Add untracked" |
18932 | msgstr "添加未跟踪的" | |
18933 | ||
fd8cb379 | 18934 | #: git-add--interactive.perl:679 |
1a79b2f1 JX |
18935 | msgid "No untracked files.\n" |
18936 | msgstr "没有未跟踪的文件。\n" | |
18937 | ||
fd8cb379 | 18938 | #: git-add--interactive.perl:1033 |
1a79b2f1 JX |
18939 | msgid "" |
18940 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
18941 | "marked for staging." | |
18942 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
18943 | ||
fd8cb379 | 18944 | #: git-add--interactive.perl:1036 |
1a79b2f1 JX |
18945 | msgid "" |
18946 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
18947 | "marked for stashing." | |
a4f16749 | 18948 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 18949 | |
fd8cb379 | 18950 | #: git-add--interactive.perl:1039 |
1a79b2f1 JX |
18951 | msgid "" |
18952 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
18953 | "marked for unstaging." | |
18954 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
18955 | ||
fd8cb379 | 18956 | #: git-add--interactive.perl:1042 git-add--interactive.perl:1051 |
1a79b2f1 JX |
18957 | msgid "" |
18958 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
18959 | "marked for applying." | |
18960 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
18961 | ||
fd8cb379 | 18962 | #: git-add--interactive.perl:1045 git-add--interactive.perl:1048 |
1a79b2f1 JX |
18963 | msgid "" |
18964 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
18965 | "marked for discarding." | |
18966 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
18967 | ||
fd8cb379 | 18968 | #: git-add--interactive.perl:1085 |
1a79b2f1 JX |
18969 | #, perl-format |
18970 | msgid "failed to open hunk edit file for writing: %s" | |
c1ac5258 | 18971 | msgstr "为写入打开块编辑文件失败:%s" |
1a79b2f1 | 18972 | |
fd8cb379 | 18973 | #: git-add--interactive.perl:1086 |
1a79b2f1 JX |
18974 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
18975 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
18976 | ||
fd8cb379 | 18977 | #: git-add--interactive.perl:1092 |
1a79b2f1 JX |
18978 | #, perl-format |
18979 | msgid "" | |
18980 | "---\n" | |
18981 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
18982 | "To remove '%s' lines, delete them.\n" | |
18983 | "Lines starting with %s will be removed.\n" | |
18984 | msgstr "" | |
18985 | "---\n" | |
18986 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
18987 | "要删除 '%s' 开始的行,删除它们。\n" | |
18988 | "以 %s 开始的行将被删除。\n" | |
18989 | ||
18990 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
fd8cb379 | 18991 | #: git-add--interactive.perl:1100 |
1a79b2f1 JX |
18992 | msgid "" |
18993 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
18994 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
18995 | "aborted and the hunk is left unchanged.\n" | |
18996 | msgstr "" | |
18997 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
18998 | "此次编辑被终止,该块不会被修改。\n" | |
18999 | ||
fd8cb379 | 19000 | #: git-add--interactive.perl:1114 |
1a79b2f1 JX |
19001 | #, perl-format |
19002 | msgid "failed to open hunk edit file for reading: %s" | |
19003 | msgstr "无法读取块编辑文件:%s" | |
19004 | ||
19005 | #. TRANSLATORS: do not translate [y/n] | |
19006 | #. The program will only accept that input | |
19007 | #. at this point. | |
19008 | #. Consider translating (saying "no" discards!) as | |
19009 | #. (saying "n" for "no" discards!) if the translation | |
19010 | #. of the word "no" does not start with n. | |
fd8cb379 | 19011 | #: git-add--interactive.perl:1213 |
1a79b2f1 JX |
19012 | msgid "" |
19013 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
19014 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
19015 | ||
fd8cb379 | 19016 | #: git-add--interactive.perl:1222 |
1a79b2f1 JX |
19017 | msgid "" |
19018 | "y - stage this hunk\n" | |
19019 | "n - do not stage this hunk\n" | |
19020 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
19021 | "a - stage this hunk and all later hunks in the file\n" | |
19022 | "d - do not stage this hunk or any of the later hunks in the file" | |
19023 | msgstr "" | |
19024 | "y - 暂存该块\n" | |
19025 | "n - 不要暂存该块\n" | |
19026 | "q - 退出。不暂存该块及后面的全部块\n" | |
19027 | "a - 暂存该块和本文件中后面的全部块\n" | |
19028 | "d - 不暂存该块和本文件中后面的全部块" | |
19029 | ||
fd8cb379 | 19030 | #: git-add--interactive.perl:1228 |
1a79b2f1 JX |
19031 | msgid "" |
19032 | "y - stash this hunk\n" | |
19033 | "n - do not stash this hunk\n" | |
19034 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
19035 | "a - stash this hunk and all later hunks in the file\n" | |
19036 | "d - do not stash this hunk or any of the later hunks in the file" | |
19037 | msgstr "" | |
19038 | "y - 贮藏该块\n" | |
19039 | "n - 不要贮藏该块\n" | |
19040 | "q - 退出。不贮藏该块及后面的全部块\n" | |
19041 | "a - 贮藏该块和本文件中后面的全部块\n" | |
19042 | "d - 不贮藏该块和本文件中后面的全部块" | |
19043 | ||
fd8cb379 | 19044 | #: git-add--interactive.perl:1234 |
1a79b2f1 JX |
19045 | msgid "" |
19046 | "y - unstage this hunk\n" | |
19047 | "n - do not unstage this hunk\n" | |
19048 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
19049 | "a - unstage this hunk and all later hunks in the file\n" | |
19050 | "d - do not unstage this hunk or any of the later hunks in the file" | |
19051 | msgstr "" | |
19052 | "y - 不暂存该块\n" | |
19053 | "n - 不要不暂存该块\n" | |
19054 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
19055 | "a - 不暂存该块和本文件中后面的全部块\n" | |
19056 | "d - 不要不暂存该块和本文件中后面的全部块" | |
19057 | ||
fd8cb379 | 19058 | #: git-add--interactive.perl:1240 |
1a79b2f1 JX |
19059 | msgid "" |
19060 | "y - apply this hunk to index\n" | |
19061 | "n - do not apply this hunk to index\n" | |
19062 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
19063 | "a - apply this hunk and all later hunks in the file\n" | |
19064 | "d - do not apply this hunk or any of the later hunks in the file" | |
19065 | msgstr "" | |
19066 | "y - 在索引中应用该块\n" | |
19067 | "n - 不要在索引中应用该块\n" | |
19068 | "q - 退出。不要应用该块及后面的全部块\n" | |
19069 | "a - 应用该块和本文件中后面的全部块\n" | |
19070 | "d - 不要应用该块和本文件中后面的全部块" | |
19071 | ||
fd8cb379 | 19072 | #: git-add--interactive.perl:1246 |
1a79b2f1 JX |
19073 | msgid "" |
19074 | "y - discard this hunk from worktree\n" | |
19075 | "n - do not discard this hunk from worktree\n" | |
19076 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
19077 | "a - discard this hunk and all later hunks in the file\n" | |
19078 | "d - do not discard this hunk or any of the later hunks in the file" | |
19079 | msgstr "" | |
19080 | "y - 在工作区中丢弃该块\n" | |
19081 | "n - 不要在工作区中丢弃该块\n" | |
19082 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
19083 | "a - 丢弃该块和本文件中后面的全部块\n" | |
19084 | "d - 不要丢弃该块和本文件中后面的全部块" | |
19085 | ||
fd8cb379 | 19086 | #: git-add--interactive.perl:1252 |
1a79b2f1 JX |
19087 | msgid "" |
19088 | "y - discard this hunk from index and worktree\n" | |
19089 | "n - do not discard this hunk from index and worktree\n" | |
19090 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
19091 | "a - discard this hunk and all later hunks in the file\n" | |
19092 | "d - do not discard this hunk or any of the later hunks in the file" | |
19093 | msgstr "" | |
19094 | "y - 在索引和工作区中丢弃该块\n" | |
19095 | "n - 不要在索引和工作区中丢弃该块\n" | |
19096 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
19097 | "a - 丢弃该块和本文件中后面的全部块\n" | |
19098 | "d - 不要丢弃该块和本文件中后面的全部块" | |
19099 | ||
fd8cb379 | 19100 | #: git-add--interactive.perl:1258 |
1a79b2f1 JX |
19101 | msgid "" |
19102 | "y - apply this hunk to index and worktree\n" | |
19103 | "n - do not apply this hunk to index and worktree\n" | |
19104 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
19105 | "a - apply this hunk and all later hunks in the file\n" | |
19106 | "d - do not apply this hunk or any of the later hunks in the file" | |
19107 | msgstr "" | |
19108 | "y - 在索引和工作区中应用该块\n" | |
19109 | "n - 不要在索引和工作区中应用该块\n" | |
19110 | "q - 退出。不要应用该块及后面的全部块\n" | |
19111 | "a - 应用该块和本文件中后面的全部块\n" | |
19112 | "d - 不要应用该块和本文件中后面的全部块" | |
19113 | ||
fd8cb379 | 19114 | #: git-add--interactive.perl:1273 |
1a79b2f1 JX |
19115 | msgid "" |
19116 | "g - select a hunk to go to\n" | |
19117 | "/ - search for a hunk matching the given regex\n" | |
19118 | "j - leave this hunk undecided, see next undecided hunk\n" | |
19119 | "J - leave this hunk undecided, see next hunk\n" | |
19120 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
19121 | "K - leave this hunk undecided, see previous hunk\n" | |
19122 | "s - split the current hunk into smaller hunks\n" | |
19123 | "e - manually edit the current hunk\n" | |
19124 | "? - print help\n" | |
19125 | msgstr "" | |
19126 | "g - 选择跳转到一个块\n" | |
19127 | "/ - 查找和给定正则表达式匹配的块\n" | |
19128 | "j - 维持该块未决状态,查看下一个未决块\n" | |
19129 | "J - 维持该块未决状态,查看下一个块\n" | |
19130 | "k - 维持该块未决状态,查看上一个未决块\n" | |
19131 | "K - 维持该块未决状态,查看上一个块\n" | |
19132 | "s - 拆分当前块为更小的块\n" | |
19133 | "e - 手动编辑当前块\n" | |
19134 | "? - 显示帮助\n" | |
19135 | ||
fd8cb379 | 19136 | #: git-add--interactive.perl:1304 |
1a79b2f1 JX |
19137 | msgid "The selected hunks do not apply to the index!\n" |
19138 | msgstr "选中的块不能应用到索引!\n" | |
19139 | ||
fd8cb379 | 19140 | #: git-add--interactive.perl:1305 |
1a79b2f1 JX |
19141 | msgid "Apply them to the worktree anyway? " |
19142 | msgstr "无论如何都要应用到工作区么?" | |
19143 | ||
fd8cb379 | 19144 | #: git-add--interactive.perl:1308 |
1a79b2f1 JX |
19145 | msgid "Nothing was applied.\n" |
19146 | msgstr "未应用。\n" | |
19147 | ||
fd8cb379 | 19148 | #: git-add--interactive.perl:1319 |
1a79b2f1 JX |
19149 | #, perl-format |
19150 | msgid "ignoring unmerged: %s\n" | |
19151 | msgstr "忽略未合入的:%s\n" | |
19152 | ||
fd8cb379 | 19153 | #: git-add--interactive.perl:1328 |
1a79b2f1 JX |
19154 | msgid "Only binary files changed.\n" |
19155 | msgstr "只有二进制文件被修改。\n" | |
19156 | ||
fd8cb379 | 19157 | #: git-add--interactive.perl:1330 |
1a79b2f1 JX |
19158 | msgid "No changes.\n" |
19159 | msgstr "没有修改。\n" | |
19160 | ||
fd8cb379 | 19161 | #: git-add--interactive.perl:1338 |
1a79b2f1 JX |
19162 | msgid "Patch update" |
19163 | msgstr "补丁更新" | |
19164 | ||
fd8cb379 | 19165 | #: git-add--interactive.perl:1390 |
1a79b2f1 | 19166 | #, perl-format |
31e5e17b JX |
19167 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
19168 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19169 | |
fd8cb379 | 19170 | #: git-add--interactive.perl:1391 |
1a79b2f1 | 19171 | #, perl-format |
31e5e17b JX |
19172 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
19173 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19174 | |
fd8cb379 | 19175 | #: git-add--interactive.perl:1392 |
1a79b2f1 | 19176 | #, perl-format |
31e5e17b JX |
19177 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
19178 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19179 | |
fd8cb379 | 19180 | #: git-add--interactive.perl:1395 |
1a79b2f1 | 19181 | #, perl-format |
31e5e17b JX |
19182 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
19183 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19184 | |
fd8cb379 | 19185 | #: git-add--interactive.perl:1396 |
1a79b2f1 | 19186 | #, perl-format |
31e5e17b JX |
19187 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
19188 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19189 | |
fd8cb379 | 19190 | #: git-add--interactive.perl:1397 |
1a79b2f1 | 19191 | #, perl-format |
31e5e17b JX |
19192 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
19193 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19194 | |
fd8cb379 | 19195 | #: git-add--interactive.perl:1400 |
1a79b2f1 | 19196 | #, perl-format |
31e5e17b JX |
19197 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
19198 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19199 | |
fd8cb379 | 19200 | #: git-add--interactive.perl:1401 |
1a79b2f1 | 19201 | #, perl-format |
31e5e17b JX |
19202 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
19203 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19204 | |
fd8cb379 | 19205 | #: git-add--interactive.perl:1402 |
1a79b2f1 | 19206 | #, perl-format |
31e5e17b JX |
19207 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
19208 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19209 | |
fd8cb379 | 19210 | #: git-add--interactive.perl:1405 |
1a79b2f1 | 19211 | #, perl-format |
31e5e17b JX |
19212 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
19213 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19214 | |
fd8cb379 | 19215 | #: git-add--interactive.perl:1406 |
1a79b2f1 | 19216 | #, perl-format |
31e5e17b JX |
19217 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
19218 | msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19219 | |
fd8cb379 | 19220 | #: git-add--interactive.perl:1407 |
1a79b2f1 | 19221 | #, perl-format |
31e5e17b | 19222 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
610f8099 | 19223 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 19224 | |
fd8cb379 | 19225 | #: git-add--interactive.perl:1410 |
1a79b2f1 | 19226 | #, perl-format |
31e5e17b JX |
19227 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
19228 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19229 | |
fd8cb379 | 19230 | #: git-add--interactive.perl:1411 |
1a79b2f1 | 19231 | #, perl-format |
31e5e17b JX |
19232 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
19233 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19234 | |
fd8cb379 | 19235 | #: git-add--interactive.perl:1412 |
1a79b2f1 | 19236 | #, perl-format |
31e5e17b JX |
19237 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
19238 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19239 | |
fd8cb379 | 19240 | #: git-add--interactive.perl:1415 |
1a79b2f1 | 19241 | #, perl-format |
31e5e17b JX |
19242 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
19243 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19244 | |
fd8cb379 | 19245 | #: git-add--interactive.perl:1416 |
1a79b2f1 | 19246 | #, perl-format |
31e5e17b JX |
19247 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
19248 | msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19249 | |
fd8cb379 | 19250 | #: git-add--interactive.perl:1417 |
1a79b2f1 | 19251 | #, perl-format |
31e5e17b JX |
19252 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
19253 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19254 | |
fd8cb379 | 19255 | #: git-add--interactive.perl:1420 |
1a79b2f1 | 19256 | #, perl-format |
31e5e17b JX |
19257 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
19258 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19259 | |
fd8cb379 | 19260 | #: git-add--interactive.perl:1421 |
1a79b2f1 | 19261 | #, perl-format |
31e5e17b JX |
19262 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
19263 | msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 19264 | |
fd8cb379 | 19265 | #: git-add--interactive.perl:1422 |
1a79b2f1 | 19266 | #, perl-format |
31e5e17b JX |
19267 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
19268 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
19269 | ||
fd8cb379 | 19270 | #: git-add--interactive.perl:1522 |
31e5e17b JX |
19271 | msgid "No other hunks to goto\n" |
19272 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 19273 | |
fd8cb379 | 19274 | #: git-add--interactive.perl:1529 |
1a79b2f1 JX |
19275 | msgid "go to which hunk (<ret> to see more)? " |
19276 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
19277 | ||
fd8cb379 | 19278 | #: git-add--interactive.perl:1531 |
1a79b2f1 JX |
19279 | msgid "go to which hunk? " |
19280 | msgstr "跳转到哪个块?" | |
19281 | ||
fd8cb379 | 19282 | #: git-add--interactive.perl:1540 |
1a79b2f1 JX |
19283 | #, perl-format |
19284 | msgid "Invalid number: '%s'\n" | |
19285 | msgstr "无效数字:'%s'\n" | |
19286 | ||
fd8cb379 | 19287 | #: git-add--interactive.perl:1545 |
1a79b2f1 JX |
19288 | #, perl-format |
19289 | msgid "Sorry, only %d hunk available.\n" | |
19290 | msgid_plural "Sorry, only %d hunks available.\n" | |
19291 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
19292 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
19293 | ||
fd8cb379 | 19294 | #: git-add--interactive.perl:1571 |
31e5e17b JX |
19295 | msgid "No other hunks to search\n" |
19296 | msgstr "没有其它可供查找的块\n" | |
19297 | ||
fd8cb379 | 19298 | #: git-add--interactive.perl:1575 |
1a79b2f1 JX |
19299 | msgid "search for regex? " |
19300 | msgstr "使用正则表达式搜索?" | |
19301 | ||
fd8cb379 | 19302 | #: git-add--interactive.perl:1588 |
1a79b2f1 JX |
19303 | #, perl-format |
19304 | msgid "Malformed search regexp %s: %s\n" | |
19305 | msgstr "错误的正则表达式 %s:%s\n" | |
19306 | ||
fd8cb379 | 19307 | #: git-add--interactive.perl:1598 |
1a79b2f1 JX |
19308 | msgid "No hunk matches the given pattern\n" |
19309 | msgstr "没有和给定模式相匹配的快\n" | |
19310 | ||
fd8cb379 | 19311 | #: git-add--interactive.perl:1610 git-add--interactive.perl:1632 |
1a79b2f1 JX |
19312 | msgid "No previous hunk\n" |
19313 | msgstr "没有前一个块\n" | |
19314 | ||
fd8cb379 | 19315 | #: git-add--interactive.perl:1619 git-add--interactive.perl:1638 |
1a79b2f1 JX |
19316 | msgid "No next hunk\n" |
19317 | msgstr "没有下一个块\n" | |
19318 | ||
fd8cb379 | 19319 | #: git-add--interactive.perl:1644 |
31e5e17b JX |
19320 | msgid "Sorry, cannot split this hunk\n" |
19321 | msgstr "对不起,不能拆分这个块\n" | |
19322 | ||
fd8cb379 | 19323 | #: git-add--interactive.perl:1650 |
1a79b2f1 JX |
19324 | #, perl-format |
19325 | msgid "Split into %d hunk.\n" | |
19326 | msgid_plural "Split into %d hunks.\n" | |
19327 | msgstr[0] "拆分为 %d 块。\n" | |
19328 | msgstr[1] "拆分为 %d 块。\n" | |
19329 | ||
fd8cb379 | 19330 | #: git-add--interactive.perl:1660 |
31e5e17b JX |
19331 | msgid "Sorry, cannot edit this hunk\n" |
19332 | msgstr "对不起,不能编辑这个块\n" | |
19333 | ||
fd8cb379 | 19334 | #: git-add--interactive.perl:1706 |
1a79b2f1 JX |
19335 | msgid "Review diff" |
19336 | msgstr "检视 diff" | |
19337 | ||
19338 | #. TRANSLATORS: please do not translate the command names | |
19339 | #. 'status', 'update', 'revert', etc. | |
fd8cb379 | 19340 | #: git-add--interactive.perl:1725 |
1a79b2f1 JX |
19341 | msgid "" |
19342 | "status - show paths with changes\n" | |
19343 | "update - add working tree state to the staged set of changes\n" | |
19344 | "revert - revert staged set of changes back to the HEAD version\n" | |
19345 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 19346 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
19347 | "add untracked - add contents of untracked files to the staged set of " |
19348 | "changes\n" | |
19349 | msgstr "" | |
19350 | "status - 显示含变更的路径\n" | |
19351 | "update - 添加工作区状态至暂存列表\n" | |
19352 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
19353 | "patch - 挑选块并且有选择地更新\n" | |
19354 | "diff - 显示 HEAD 和索引间差异\n" | |
19355 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
19356 | ||
fd8cb379 JX |
19357 | #: git-add--interactive.perl:1742 git-add--interactive.perl:1747 |
19358 | #: git-add--interactive.perl:1750 git-add--interactive.perl:1757 | |
19359 | #: git-add--interactive.perl:1761 git-add--interactive.perl:1767 | |
1a79b2f1 JX |
19360 | msgid "missing --" |
19361 | msgstr "缺失 --" | |
19362 | ||
fd8cb379 | 19363 | #: git-add--interactive.perl:1763 |
1a79b2f1 JX |
19364 | #, perl-format |
19365 | msgid "unknown --patch mode: %s" | |
19366 | msgstr "未知的 --patch 模式:%s" | |
19367 | ||
fd8cb379 | 19368 | #: git-add--interactive.perl:1769 git-add--interactive.perl:1775 |
1a79b2f1 JX |
19369 | #, perl-format |
19370 | msgid "invalid argument %s, expecting --" | |
19371 | msgstr "无效的参数 %s,期望是 --" | |
19372 | ||
31e5e17b | 19373 | #: git-send-email.perl:130 |
1a79b2f1 JX |
19374 | msgid "local zone differs from GMT by a non-minute interval\n" |
19375 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
19376 | ||
31e5e17b | 19377 | #: git-send-email.perl:137 git-send-email.perl:143 |
1a79b2f1 JX |
19378 | msgid "local time offset greater than or equal to 24 hours\n" |
19379 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
19380 | ||
31e5e17b | 19381 | #: git-send-email.perl:211 git-send-email.perl:217 |
1a79b2f1 JX |
19382 | msgid "the editor exited uncleanly, aborting everything" |
19383 | msgstr "编辑器非正常退出,终止所有操作" | |
19384 | ||
31e5e17b | 19385 | #: git-send-email.perl:294 |
1a79b2f1 JX |
19386 | #, perl-format |
19387 | msgid "" | |
19388 | "'%s' contains an intermediate version of the email you were composing.\n" | |
19389 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
19390 | ||
31e5e17b | 19391 | #: git-send-email.perl:299 |
1a79b2f1 JX |
19392 | #, perl-format |
19393 | msgid "'%s.final' contains the composed email.\n" | |
19394 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
19395 | ||
31e5e17b | 19396 | #: git-send-email.perl:317 |
1a79b2f1 JX |
19397 | msgid "--dump-aliases incompatible with other options\n" |
19398 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
19399 | ||
31e5e17b | 19400 | #: git-send-email.perl:383 git-send-email.perl:638 |
1a79b2f1 JX |
19401 | msgid "Cannot run git format-patch from outside a repository\n" |
19402 | msgstr "不能在仓库之外运行 git format-patch\n" | |
19403 | ||
31e5e17b JX |
19404 | #: git-send-email.perl:386 |
19405 | msgid "" | |
19406 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
19407 | "configuration option)\n" | |
19408 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
19409 | ||
19410 | #: git-send-email.perl:456 | |
1a79b2f1 JX |
19411 | #, perl-format |
19412 | msgid "Unknown --suppress-cc field: '%s'\n" | |
19413 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
19414 | ||
31e5e17b | 19415 | #: git-send-email.perl:485 |
1a79b2f1 JX |
19416 | #, perl-format |
19417 | msgid "Unknown --confirm setting: '%s'\n" | |
19418 | msgstr "未知的 --confirm 设置:'%s'\n" | |
19419 | ||
31e5e17b | 19420 | #: git-send-email.perl:513 |
1a79b2f1 JX |
19421 | #, perl-format |
19422 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
19423 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
19424 | ||
31e5e17b | 19425 | #: git-send-email.perl:515 |
1a79b2f1 JX |
19426 | #, perl-format |
19427 | msgid "warning: `:include:` not supported: %s\n" | |
19428 | msgstr "警告:不支持 `:include:`:%s\n" | |
19429 | ||
31e5e17b | 19430 | #: git-send-email.perl:517 |
1a79b2f1 JX |
19431 | #, perl-format |
19432 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
19433 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
19434 | ||
31e5e17b | 19435 | #: git-send-email.perl:522 |
1a79b2f1 JX |
19436 | #, perl-format |
19437 | msgid "warning: sendmail line is not recognized: %s\n" | |
19438 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
19439 | ||
31e5e17b | 19440 | #: git-send-email.perl:604 |
1a79b2f1 JX |
19441 | #, perl-format |
19442 | msgid "" | |
19443 | "File '%s' exists but it could also be the range of commits\n" | |
19444 | "to produce patches for. Please disambiguate by...\n" | |
19445 | "\n" | |
19446 | " * Saying \"./%s\" if you mean a file; or\n" | |
19447 | " * Giving --format-patch option if you mean a range.\n" | |
19448 | msgstr "" | |
87cb7997 JX |
19449 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
19450 | "歧义:\n" | |
1a79b2f1 JX |
19451 | "\n" |
19452 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
19453 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
19454 | ||
31e5e17b | 19455 | #: git-send-email.perl:625 |
1a79b2f1 JX |
19456 | #, perl-format |
19457 | msgid "Failed to opendir %s: %s" | |
19458 | msgstr "无法打开目录 %s: %s" | |
19459 | ||
31e5e17b | 19460 | #: git-send-email.perl:649 |
1a79b2f1 JX |
19461 | #, perl-format |
19462 | msgid "" | |
19463 | "fatal: %s: %s\n" | |
19464 | "warning: no patches were sent\n" | |
19465 | msgstr "" | |
19466 | "严重:%s:%s\n" | |
19467 | "警告:补丁未能发送\n" | |
19468 | ||
31e5e17b | 19469 | #: git-send-email.perl:660 |
1a79b2f1 JX |
19470 | msgid "" |
19471 | "\n" | |
19472 | "No patch files specified!\n" | |
19473 | "\n" | |
87cb7997 JX |
19474 | msgstr "" |
19475 | "\n" | |
19476 | "未指定补丁文件!\n" | |
19477 | "\n" | |
1a79b2f1 | 19478 | |
31e5e17b | 19479 | #: git-send-email.perl:673 |
1a79b2f1 JX |
19480 | #, perl-format |
19481 | msgid "No subject line in %s?" | |
19482 | msgstr "在 %s 中没有标题行?" | |
19483 | ||
31e5e17b | 19484 | #: git-send-email.perl:683 |
1a79b2f1 JX |
19485 | #, perl-format |
19486 | msgid "Failed to open for writing %s: %s" | |
c1ac5258 | 19487 | msgstr "为写入打开 %s 失败: %s" |
1a79b2f1 | 19488 | |
31e5e17b | 19489 | #: git-send-email.perl:694 |
1a79b2f1 JX |
19490 | msgid "" |
19491 | "Lines beginning in \"GIT:\" will be removed.\n" | |
19492 | "Consider including an overall diffstat or table of contents\n" | |
19493 | "for the patch you are writing.\n" | |
19494 | "\n" | |
19495 | "Clear the body content if you don't wish to send a summary.\n" | |
19496 | msgstr "" | |
19497 | "以 \"GIT:\" 开头的行将被删除。\n" | |
19498 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" | |
19499 | "\n" | |
19500 | "如果您不想发送摘要,清除内容。\n" | |
19501 | ||
31e5e17b | 19502 | #: git-send-email.perl:718 |
1a79b2f1 JX |
19503 | #, perl-format |
19504 | msgid "Failed to open %s: %s" | |
19505 | msgstr "无法打开 %s: %s" | |
19506 | ||
31e5e17b JX |
19507 | #: git-send-email.perl:735 |
19508 | #, perl-format | |
19509 | msgid "Failed to open %s.final: %s" | |
19510 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 19511 | |
31e5e17b | 19512 | #: git-send-email.perl:778 |
1a79b2f1 JX |
19513 | msgid "Summary email is empty, skipping it\n" |
19514 | msgstr "摘要邮件为空,跳过\n" | |
19515 | ||
19516 | #. TRANSLATORS: please keep [y/N] as is. | |
31e5e17b | 19517 | #: git-send-email.perl:813 |
1a79b2f1 JX |
19518 | #, perl-format |
19519 | msgid "Are you sure you want to use <%s> [y/N]? " | |
19520 | msgstr "您确认要使用 <%s> [y/N]?" | |
19521 | ||
31e5e17b | 19522 | #: git-send-email.perl:868 |
1a79b2f1 JX |
19523 | msgid "" |
19524 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
19525 | "Encoding.\n" | |
19526 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
19527 | ||
31e5e17b | 19528 | #: git-send-email.perl:873 |
1a79b2f1 JX |
19529 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
19530 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
19531 | ||
31e5e17b | 19532 | #: git-send-email.perl:881 |
1a79b2f1 JX |
19533 | #, perl-format |
19534 | msgid "" | |
19535 | "Refusing to send because the patch\n" | |
19536 | "\t%s\n" | |
19537 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
19538 | "want to send.\n" | |
19539 | msgstr "" | |
19540 | "拒绝发送,因为补丁\n" | |
19541 | "\t%s\n" | |
19542 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
19543 | ||
31e5e17b | 19544 | #: git-send-email.perl:900 |
1a79b2f1 JX |
19545 | msgid "To whom should the emails be sent (if anyone)?" |
19546 | msgstr "邮件将要发送给谁?" | |
19547 | ||
31e5e17b | 19548 | #: git-send-email.perl:918 |
1a79b2f1 JX |
19549 | #, perl-format |
19550 | msgid "fatal: alias '%s' expands to itself\n" | |
19551 | msgstr "严重:别名 '%s' 扩展为它自己\n" | |
19552 | ||
31e5e17b | 19553 | #: git-send-email.perl:930 |
1a79b2f1 JX |
19554 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
19555 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
19556 | ||
31e5e17b | 19557 | #: git-send-email.perl:988 git-send-email.perl:996 |
1a79b2f1 JX |
19558 | #, perl-format |
19559 | msgid "error: unable to extract a valid address from: %s\n" | |
19560 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
19561 | ||
19562 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
19563 | #. translation. The program will only accept English input | |
19564 | #. at this point. | |
31e5e17b | 19565 | #: git-send-email.perl:1000 |
1a79b2f1 JX |
19566 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
19567 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
19568 | ||
31e5e17b | 19569 | #: git-send-email.perl:1317 |
1a79b2f1 JX |
19570 | #, perl-format |
19571 | msgid "CA path \"%s\" does not exist" | |
19572 | msgstr "CA 路径 \"%s\" 不存在" | |
19573 | ||
fd8cb379 | 19574 | #: git-send-email.perl:1400 |
1a79b2f1 JX |
19575 | msgid "" |
19576 | " The Cc list above has been expanded by additional\n" | |
19577 | " addresses found in the patch commit message. By default\n" | |
19578 | " send-email prompts before sending whenever this occurs.\n" | |
19579 | " This behavior is controlled by the sendemail.confirm\n" | |
19580 | " configuration setting.\n" | |
19581 | "\n" | |
19582 | " For additional information, run 'git send-email --help'.\n" | |
19583 | " To retain the current behavior, but squelch this message,\n" | |
19584 | " run 'git config --global sendemail.confirm auto'.\n" | |
19585 | "\n" | |
19586 | msgstr "" | |
19587 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
19588 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
19589 | " sendemail.confirm 配置设置。\n" | |
19590 | "\n" | |
19591 | " 更多信息,执行 'git send-email --help'。\n" | |
19592 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
19593 | " sendemail.confirm auto'。\n" | |
19594 | "\n" | |
19595 | ||
fd8cb379 | 19596 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
19597 | #. translation. The program will only accept English input |
19598 | #. at this point. | |
fd8cb379 JX |
19599 | #: git-send-email.perl:1415 |
19600 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
19601 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 19602 | |
fd8cb379 | 19603 | #: git-send-email.perl:1418 |
1a79b2f1 JX |
19604 | msgid "Send this email reply required" |
19605 | msgstr "发送要求的邮件回复" | |
19606 | ||
fd8cb379 | 19607 | #: git-send-email.perl:1446 |
1a79b2f1 JX |
19608 | msgid "The required SMTP server is not properly defined." |
19609 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
19610 | ||
fd8cb379 | 19611 | #: git-send-email.perl:1493 |
1a79b2f1 JX |
19612 | #, perl-format |
19613 | msgid "Server does not support STARTTLS! %s" | |
19614 | msgstr "服务器不支持 STARTTLS!%s" | |
19615 | ||
fd8cb379 | 19616 | #: git-send-email.perl:1498 git-send-email.perl:1502 |
a4f16749 JX |
19617 | #, perl-format |
19618 | msgid "STARTTLS failed! %s" | |
19619 | msgstr "STARTTLS 失败!%s" | |
19620 | ||
c1ac5258 | 19621 | #: git-send-email.perl:1511 |
1a79b2f1 JX |
19622 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
19623 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
19624 | ||
c1ac5258 | 19625 | #: git-send-email.perl:1529 |
1a79b2f1 JX |
19626 | #, perl-format |
19627 | msgid "Failed to send %s\n" | |
19628 | msgstr "无法发送 %s\n" | |
19629 | ||
c1ac5258 | 19630 | #: git-send-email.perl:1532 |
1a79b2f1 JX |
19631 | #, perl-format |
19632 | msgid "Dry-Sent %s\n" | |
19633 | msgstr "演习发送 %s\n" | |
19634 | ||
c1ac5258 | 19635 | #: git-send-email.perl:1532 |
1a79b2f1 JX |
19636 | #, perl-format |
19637 | msgid "Sent %s\n" | |
19638 | msgstr "正发送 %s\n" | |
19639 | ||
c1ac5258 | 19640 | #: git-send-email.perl:1534 |
1a79b2f1 JX |
19641 | msgid "Dry-OK. Log says:\n" |
19642 | msgstr "演习成功。日志说:\n" | |
19643 | ||
c1ac5258 | 19644 | #: git-send-email.perl:1534 |
1a79b2f1 JX |
19645 | msgid "OK. Log says:\n" |
19646 | msgstr "OK。日志说:\n" | |
19647 | ||
c1ac5258 | 19648 | #: git-send-email.perl:1546 |
1a79b2f1 JX |
19649 | msgid "Result: " |
19650 | msgstr "结果:" | |
19651 | ||
c1ac5258 | 19652 | #: git-send-email.perl:1549 |
1a79b2f1 JX |
19653 | msgid "Result: OK\n" |
19654 | msgstr "结果:OK\n" | |
19655 | ||
c1ac5258 | 19656 | #: git-send-email.perl:1567 |
1a79b2f1 JX |
19657 | #, perl-format |
19658 | msgid "can't open file %s" | |
19659 | msgstr "无法打开文件 %s" | |
19660 | ||
c1ac5258 | 19661 | #: git-send-email.perl:1614 git-send-email.perl:1634 |
1a79b2f1 JX |
19662 | #, perl-format |
19663 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
19664 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
19665 | ||
c1ac5258 | 19666 | #: git-send-email.perl:1620 |
1a79b2f1 JX |
19667 | #, perl-format |
19668 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
19669 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
19670 | ||
c1ac5258 | 19671 | #: git-send-email.perl:1673 |
1a79b2f1 JX |
19672 | #, perl-format |
19673 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
19674 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
19675 | ||
c1ac5258 | 19676 | #: git-send-email.perl:1698 |
1a79b2f1 JX |
19677 | #, perl-format |
19678 | msgid "(body) Adding cc: %s from line '%s'\n" | |
19679 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
19680 | ||
c1ac5258 | 19681 | #: git-send-email.perl:1809 |
1a79b2f1 JX |
19682 | #, perl-format |
19683 | msgid "(%s) Could not execute '%s'" | |
19684 | msgstr "(%s) 不能执行 '%s'" | |
19685 | ||
c1ac5258 | 19686 | #: git-send-email.perl:1816 |
1a79b2f1 JX |
19687 | #, perl-format |
19688 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
19689 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
19690 | ||
c1ac5258 | 19691 | #: git-send-email.perl:1820 |
1a79b2f1 JX |
19692 | #, perl-format |
19693 | msgid "(%s) failed to close pipe to '%s'" | |
19694 | msgstr "(%s) 无法关闭管道至 '%s'" | |
19695 | ||
c1ac5258 | 19696 | #: git-send-email.perl:1850 |
1a79b2f1 JX |
19697 | msgid "cannot send message as 7bit" |
19698 | msgstr "不能以 7bit 形式发送信息" | |
19699 | ||
c1ac5258 | 19700 | #: git-send-email.perl:1858 |
1a79b2f1 JX |
19701 | msgid "invalid transfer encoding" |
19702 | msgstr "无效的传送编码" | |
19703 | ||
c1ac5258 | 19704 | #: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 |
1a79b2f1 JX |
19705 | #, perl-format |
19706 | msgid "unable to open %s: %s\n" | |
19707 | msgstr "不能打开 %s:%s\n" | |
19708 | ||
c1ac5258 | 19709 | #: git-send-email.perl:1902 |
1a79b2f1 JX |
19710 | #, perl-format |
19711 | msgid "%s: patch contains a line longer than 998 characters" | |
19712 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
19713 | ||
c1ac5258 | 19714 | #: git-send-email.perl:1919 |
1a79b2f1 JX |
19715 | #, perl-format |
19716 | msgid "Skipping %s with backup suffix '%s'.\n" | |
19717 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
19718 | ||
19719 | #. TRANSLATORS: please keep "[y|N]" as is. | |
c1ac5258 | 19720 | #: git-send-email.perl:1923 |
1a79b2f1 JX |
19721 | #, perl-format |
19722 | msgid "Do you really want to send %s? [y|N]: " | |
19723 | msgstr "您真的要发送 %s?[y|N]:" | |
5809aa05 | 19724 | |
c1ac5258 JX |
19725 | #~ msgid "Dirty index: cannot merge (dirty: %s)" |
19726 | #~ msgstr "脏索引:不能合并(脏文件:%s)" | |
19727 | ||
19728 | #~ msgid "Stopping at '$displaypath'; script returned non-zero status." | |
19729 | #~ msgstr "停止于 '$displaypath';脚本返回非零值。" | |
19730 | ||
fd8cb379 JX |
19731 | #~ msgid "Everyday Git With 20 Commands Or So" |
19732 | #~ msgstr "每一天 Git 常用的约 20 条命令" | |
19733 | ||
fd8cb379 JX |
19734 | #~ msgid "BUG: returned path string doesn't match cwd?" |
19735 | #~ msgstr "BUG:返回的路径和当前路径不匹配?" | |
19736 | ||
fd8cb379 JX |
19737 | #~ msgid "" |
19738 | #~ "unexpected 1st line of squash message:\n" | |
19739 | #~ "\n" | |
19740 | #~ "\t%.*s" | |
19741 | #~ msgstr "" | |
19742 | #~ "意外的压缩提交首行提交信息:\n" | |
19743 | #~ "\n" | |
19744 | #~ "\t%.*s" | |
19745 | ||
19746 | #~ msgid "" | |
19747 | #~ "invalid 1st line of squash message:\n" | |
19748 | #~ "\n" | |
19749 | #~ "\t%.*s" | |
19750 | #~ msgstr "" | |
19751 | #~ "压缩提交的首行提交信息无效:\n" | |
19752 | #~ "\n" | |
19753 | #~ "\t%.*s" | |
19754 | ||
31e5e17b JX |
19755 | #~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" |
19756 | #~ msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n" | |
19757 | ||
19758 | #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" | |
19759 | #~ msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" | |
19760 | ||
19761 | #~ msgid "The copy of the patch that failed is found in: %s" | |
19762 | #~ msgstr "失败的补丁文件副本位于:%s" | |
19763 | ||
19764 | #~ msgid "invalid filter-spec expression '%s'" | |
19765 | #~ msgstr "无效的 filter-spec 表达式 '%s'" | |
19766 | ||
19767 | #~ msgid "pathspec and --all are incompatible" | |
19768 | #~ msgstr "pathspec 和 --all 不兼容" | |
19769 | ||
19770 | #~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" | |
19771 | #~ msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
19772 | ||
5809aa05 JX |
19773 | #~ msgid "" |
19774 | #~ "empty strings as pathspecs will be made invalid in upcoming releases. " | |
19775 | #~ "please use . instead if you meant to match all paths" | |
19776 | #~ msgstr "" | |
19777 | #~ "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路" | |
19778 | #~ "径,\n" | |
19779 | #~ "请代之以 ." | |
19780 | ||
5809aa05 JX |
19781 | #~ msgid "Copied a misnamed branch '%s' away" |
19782 | #~ msgstr "已将错误命名的分支 '%s' 复制" | |
19783 | ||
19784 | #~ msgid "it does not make sense to create 'HEAD' manually" | |
19785 | #~ msgstr "手工创建 'HEAD' 没有意义" | |
19786 | ||
19787 | #~ msgid "Don't know how to clone %s" | |
19788 | #~ msgstr "不知道如何克隆 %s" | |
19789 | ||
19790 | #~ msgid "show ignored files" | |
19791 | #~ msgstr "显示忽略的文件" | |
19792 | ||
5809aa05 JX |
19793 | #~ msgid "Don't know how to fetch from %s" |
19794 | #~ msgstr "不知道如何从 %s 获取" | |
19795 | ||
19796 | #~ msgid "'$term' is not a valid term" | |
19797 | #~ msgstr "'$term' 不是一个有效的名称" | |
19798 | ||
19799 | #~ msgid "" | |
19800 | #~ "error: unknown option for 'stash save': $option\n" | |
19801 | #~ " To provide a message, use git stash save -- '$option'" | |
19802 | #~ msgstr "" | |
19803 | #~ "错误:'stash save' 的未知选项:$option\n" | |
19804 | #~ " 要提供一个描述信息,使用 git stash save -- '$option'" | |
19805 | ||
19806 | #~ msgid "Failed to recurse into submodule path '$sm_path'" | |
19807 | #~ msgstr "无法递归进子模组路径 '$sm_path'" |