]>
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" | |
fd8cb379 | 141 | "POT-Creation-Date: 2018-06-16 22:06+0800\n" |
0fcd668f | 142 | "PO-Revision-Date: 2018-07-02 10:22+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 | |
fd8cb379 | 151 | #: advice.c:92 |
c04f5ac3 | 152 | #, c-format |
fd8cb379 JX |
153 | msgid "%shint: %.*s%s\n" |
154 | msgstr "%s提示:%.*s%s\n" | |
c04f5ac3 | 155 | |
fd8cb379 | 156 | #: advice.c:137 |
5c57d762 JX |
157 | msgid "Cherry-picking is not possible because you have unmerged files." |
158 | msgstr "无法拣选,因为您有未合并的文件。" | |
159 | ||
fd8cb379 | 160 | #: advice.c:139 |
5c57d762 JX |
161 | msgid "Committing is not possible because you have unmerged files." |
162 | msgstr "无法提交,因为您有未合并的文件。" | |
163 | ||
fd8cb379 | 164 | #: advice.c:141 |
5c57d762 JX |
165 | msgid "Merging is not possible because you have unmerged files." |
166 | msgstr "无法合并,因为您有未合并的文件。" | |
167 | ||
fd8cb379 | 168 | #: advice.c:143 |
5c57d762 JX |
169 | msgid "Pulling is not possible because you have unmerged files." |
170 | msgstr "无法拉取,因为您有未合并的文件。" | |
171 | ||
fd8cb379 | 172 | #: advice.c:145 |
5c57d762 JX |
173 | msgid "Reverting is not possible because you have unmerged files." |
174 | msgstr "无法回退,因为您有未合并的文件。" | |
175 | ||
fd8cb379 | 176 | #: advice.c:147 |
5c57d762 JX |
177 | #, c-format |
178 | msgid "It is not possible to %s because you have unmerged files." | |
179 | msgstr "无法 %s,因为您有未合并的文件。" | |
180 | ||
fd8cb379 | 181 | #: advice.c:155 |
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 | |
fd8cb379 | 189 | #: advice.c:163 |
5c57d762 JX |
190 | msgid "Exiting because of an unresolved conflict." |
191 | msgstr "因为存在未解决的冲突而退出。" | |
192 | ||
fd8cb379 | 193 | #: advice.c:168 builtin/merge.c:1250 |
1b7f4a34 JX |
194 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
195 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
196 | ||
fd8cb379 | 197 | #: advice.c:170 |
94550ed3 | 198 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
199 | msgstr "请在合并前先提交您的修改。" |
200 | ||
fd8cb379 | 201 | #: advice.c:171 |
1b7f4a34 JX |
202 | msgid "Exiting because of unfinished merge." |
203 | msgstr "因为存在未完成的合并而退出。" | |
204 | ||
fd8cb379 | 205 | #: advice.c:177 |
5c57d762 JX |
206 | #, c-format |
207 | msgid "" | |
208 | "Note: checking out '%s'.\n" | |
209 | "\n" | |
210 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
211 | "changes and commit them, and you can discard any commits you make in this\n" | |
212 | "state without impacting any branches by performing another checkout.\n" | |
213 | "\n" | |
214 | "If you want to create a new branch to retain commits you create, you may\n" | |
215 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
216 | "\n" | |
217 | " git checkout -b <new-branch-name>\n" | |
218 | "\n" | |
219 | msgstr "" | |
220 | "注意:正在检出 '%s'。\n" | |
221 | "\n" | |
a0b6b246 JX |
222 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" |
223 | "外\n" | |
5c57d762 JX |
224 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" |
225 | "\n" | |
226 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" | |
227 | "参数 -b 来实现(现在或稍后)。例如:\n" | |
228 | "\n" | |
58b6f078 | 229 | " git checkout -b <新分支名>\n" |
5c57d762 JX |
230 | "\n" |
231 | ||
a4f16749 | 232 | #: apply.c:58 |
a0b6b246 JX |
233 | #, c-format |
234 | msgid "unrecognized whitespace option '%s'" | |
235 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 236 | |
a4f16749 | 237 | #: apply.c:74 |
90314792 | 238 | #, c-format |
a0b6b246 JX |
239 | msgid "unrecognized whitespace ignore option '%s'" |
240 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 241 | |
5809aa05 | 242 | #: apply.c:122 |
a0b6b246 | 243 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 244 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 245 | |
5809aa05 | 246 | #: apply.c:124 |
a0b6b246 JX |
247 | msgid "--cached and --3way cannot be used together." |
248 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 249 | |
5809aa05 | 250 | #: apply.c:127 |
a0b6b246 JX |
251 | msgid "--3way outside a repository" |
252 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 253 | |
5809aa05 | 254 | #: apply.c:138 |
a0b6b246 JX |
255 | msgid "--index outside a repository" |
256 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 257 | |
5809aa05 | 258 | #: apply.c:141 |
a0b6b246 JX |
259 | msgid "--cached outside a repository" |
260 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 261 | |
5809aa05 | 262 | #: apply.c:821 |
a0b6b246 JX |
263 | #, c-format |
264 | msgid "Cannot prepare timestamp regexp %s" | |
265 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 266 | |
5809aa05 | 267 | #: apply.c:830 |
a0b6b246 JX |
268 | #, c-format |
269 | msgid "regexec returned %d for input: %s" | |
270 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 271 | |
5809aa05 | 272 | #: apply.c:904 |
a0b6b246 JX |
273 | #, c-format |
274 | msgid "unable to find filename in patch at line %d" | |
275 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 276 | |
5809aa05 | 277 | #: apply.c:942 |
a0b6b246 JX |
278 | #, c-format |
279 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
280 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 281 | |
5809aa05 | 282 | #: apply.c:948 |
a0b6b246 JX |
283 | #, c-format |
284 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
285 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 286 | |
5809aa05 | 287 | #: apply.c:949 |
a0b6b246 JX |
288 | #, c-format |
289 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
290 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 291 | |
5809aa05 | 292 | #: apply.c:954 |
a0b6b246 JX |
293 | #, c-format |
294 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
295 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 296 | |
5809aa05 | 297 | #: apply.c:983 |
a4f16749 JX |
298 | #, c-format |
299 | msgid "invalid mode on line %d: %s" | |
300 | msgstr "第 %d 行包含无效文件模式:%s" | |
301 | ||
5809aa05 | 302 | #: apply.c:1301 |
a4f16749 JX |
303 | #, c-format |
304 | msgid "inconsistent header lines %d and %d" | |
305 | msgstr "不一致的文件头,%d 行和 %d 行" | |
306 | ||
5809aa05 | 307 | #: apply.c:1473 |
a0b6b246 JX |
308 | #, c-format |
309 | msgid "recount: unexpected line: %.*s" | |
310 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 311 | |
5809aa05 | 312 | #: apply.c:1542 |
a0b6b246 JX |
313 | #, c-format |
314 | msgid "patch fragment without header at line %d: %.*s" | |
315 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 316 | |
5809aa05 | 317 | #: apply.c:1562 |
a0b6b246 JX |
318 | #, c-format |
319 | msgid "" | |
320 | "git diff header lacks filename information when removing %d leading pathname " | |
321 | "component (line %d)" | |
322 | msgid_plural "" | |
323 | "git diff header lacks filename information when removing %d leading pathname " | |
324 | "components (line %d)" | |
325 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
326 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 327 | |
5809aa05 | 328 | #: apply.c:1575 |
a0b6b246 JX |
329 | #, c-format |
330 | msgid "git diff header lacks filename information (line %d)" | |
331 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 332 | |
5809aa05 | 333 | #: apply.c:1763 |
a0b6b246 JX |
334 | msgid "new file depends on old contents" |
335 | msgstr "新文件依赖旧内容" | |
5c57d762 | 336 | |
5809aa05 | 337 | #: apply.c:1765 |
a0b6b246 JX |
338 | msgid "deleted file still has contents" |
339 | msgstr "删除的文件仍有内容" | |
5c57d762 | 340 | |
5809aa05 | 341 | #: apply.c:1799 |
a0b6b246 JX |
342 | #, c-format |
343 | msgid "corrupt patch at line %d" | |
344 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 345 | |
5809aa05 | 346 | #: apply.c:1836 |
5c57d762 | 347 | #, c-format |
a0b6b246 JX |
348 | msgid "new file %s depends on old contents" |
349 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 350 | |
5809aa05 | 351 | #: apply.c:1838 |
5c57d762 | 352 | #, c-format |
a0b6b246 JX |
353 | msgid "deleted file %s still has contents" |
354 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 355 | |
5809aa05 | 356 | #: apply.c:1841 |
a0b6b246 JX |
357 | #, c-format |
358 | msgid "** warning: file %s becomes empty but is not deleted" | |
359 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 360 | |
5809aa05 | 361 | #: apply.c:1988 |
5c57d762 | 362 | #, c-format |
a0b6b246 JX |
363 | msgid "corrupt binary patch at line %d: %.*s" |
364 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 365 | |
5809aa05 | 366 | #: apply.c:2025 |
5c57d762 | 367 | #, c-format |
a0b6b246 JX |
368 | msgid "unrecognized binary patch at line %d" |
369 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 370 | |
5809aa05 | 371 | #: apply.c:2185 |
5c57d762 | 372 | #, c-format |
a0b6b246 JX |
373 | msgid "patch with only garbage at line %d" |
374 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 375 | |
5809aa05 | 376 | #: apply.c:2271 |
5c57d762 | 377 | #, c-format |
a0b6b246 JX |
378 | msgid "unable to read symlink %s" |
379 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 380 | |
5809aa05 | 381 | #: apply.c:2275 |
5c57d762 | 382 | #, c-format |
a0b6b246 JX |
383 | msgid "unable to open or read %s" |
384 | msgstr "不能打开或读取 %s" | |
5c57d762 | 385 | |
5809aa05 | 386 | #: apply.c:2934 |
5c57d762 | 387 | #, c-format |
a0b6b246 JX |
388 | msgid "invalid start of line: '%c'" |
389 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 390 | |
5809aa05 | 391 | #: apply.c:3055 |
5c57d762 | 392 | #, c-format |
a0b6b246 JX |
393 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
394 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
395 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
396 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 397 | |
5809aa05 | 398 | #: apply.c:3067 |
5c57d762 | 399 | #, c-format |
a0b6b246 JX |
400 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
401 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 402 | |
5809aa05 | 403 | #: apply.c:3073 |
5c57d762 JX |
404 | #, c-format |
405 | msgid "" | |
a0b6b246 JX |
406 | "while searching for:\n" |
407 | "%.*s" | |
5c57d762 | 408 | msgstr "" |
a0b6b246 JX |
409 | "当查询:\n" |
410 | "%.*s" | |
5c57d762 | 411 | |
5809aa05 | 412 | #: apply.c:3095 |
5c57d762 | 413 | #, c-format |
a0b6b246 JX |
414 | msgid "missing binary patch data for '%s'" |
415 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 416 | |
5809aa05 | 417 | #: apply.c:3103 |
5c57d762 | 418 | #, c-format |
a0b6b246 | 419 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 420 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 421 | |
5809aa05 | 422 | #: apply.c:3149 |
5c57d762 | 423 | #, c-format |
a0b6b246 JX |
424 | msgid "cannot apply binary patch to '%s' without full index line" |
425 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 426 | |
5809aa05 | 427 | #: apply.c:3159 |
5c57d762 | 428 | #, c-format |
a0b6b246 JX |
429 | msgid "" |
430 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 431 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 432 | |
5809aa05 | 433 | #: apply.c:3167 |
a0b6b246 JX |
434 | #, c-format |
435 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 436 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 437 | |
5809aa05 | 438 | #: apply.c:3185 |
5c57d762 | 439 | #, c-format |
a0b6b246 JX |
440 | msgid "the necessary postimage %s for '%s' cannot be read" |
441 | msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" | |
5c57d762 | 442 | |
5809aa05 | 443 | #: apply.c:3198 |
5c57d762 | 444 | #, c-format |
a0b6b246 JX |
445 | msgid "binary patch does not apply to '%s'" |
446 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 447 | |
5809aa05 | 448 | #: apply.c:3204 |
5c57d762 | 449 | #, c-format |
a0b6b246 JX |
450 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
451 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 452 | |
5809aa05 | 453 | #: apply.c:3225 |
276ceeaa | 454 | #, c-format |
a0b6b246 JX |
455 | msgid "patch failed: %s:%ld" |
456 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 457 | |
5809aa05 | 458 | #: apply.c:3347 |
4dcdc3d8 | 459 | #, c-format |
a0b6b246 JX |
460 | msgid "cannot checkout %s" |
461 | msgstr "不能检出 %s" | |
4dcdc3d8 | 462 | |
fd8cb379 | 463 | #: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 |
4dcdc3d8 | 464 | #, c-format |
a0b6b246 JX |
465 | msgid "failed to read %s" |
466 | msgstr "无法读取 %s" | |
4dcdc3d8 | 467 | |
5809aa05 | 468 | #: apply.c:3404 |
4dcdc3d8 | 469 | #, c-format |
a0b6b246 JX |
470 | msgid "reading from '%s' beyond a symbolic link" |
471 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 472 | |
5809aa05 | 473 | #: apply.c:3433 apply.c:3673 |
4dcdc3d8 | 474 | #, c-format |
a0b6b246 JX |
475 | msgid "path %s has been renamed/deleted" |
476 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 477 | |
5809aa05 | 478 | #: apply.c:3516 apply.c:3687 |
4dcdc3d8 | 479 | #, c-format |
a0b6b246 JX |
480 | msgid "%s: does not exist in index" |
481 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 482 | |
5809aa05 | 483 | #: apply.c:3525 apply.c:3695 |
4dcdc3d8 | 484 | #, c-format |
a0b6b246 JX |
485 | msgid "%s: does not match index" |
486 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 487 | |
5809aa05 | 488 | #: apply.c:3560 |
a0b6b246 JX |
489 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
490 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 491 | |
5809aa05 | 492 | #: apply.c:3563 |
4dcdc3d8 | 493 | #, c-format |
a0b6b246 JX |
494 | msgid "Falling back to three-way merge...\n" |
495 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 496 | |
5809aa05 | 497 | #: apply.c:3579 apply.c:3583 |
4dcdc3d8 | 498 | #, c-format |
a0b6b246 JX |
499 | msgid "cannot read the current contents of '%s'" |
500 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 501 | |
5809aa05 | 502 | #: apply.c:3595 |
4dcdc3d8 | 503 | #, c-format |
a0b6b246 JX |
504 | msgid "Failed to fall back on three-way merge...\n" |
505 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 506 | |
5809aa05 | 507 | #: apply.c:3609 |
4dcdc3d8 | 508 | #, c-format |
a0b6b246 JX |
509 | msgid "Applied patch to '%s' with conflicts.\n" |
510 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 511 | |
5809aa05 | 512 | #: apply.c:3614 |
4dcdc3d8 | 513 | #, c-format |
a0b6b246 JX |
514 | msgid "Applied patch to '%s' cleanly.\n" |
515 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 516 | |
5809aa05 | 517 | #: apply.c:3640 |
a0b6b246 JX |
518 | msgid "removal patch leaves file contents" |
519 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 520 | |
5809aa05 | 521 | #: apply.c:3712 |
1003b3a5 | 522 | #, c-format |
a0b6b246 JX |
523 | msgid "%s: wrong type" |
524 | msgstr "%s:错误类型" | |
1003b3a5 | 525 | |
5809aa05 | 526 | #: apply.c:3714 |
1003b3a5 | 527 | #, c-format |
a0b6b246 JX |
528 | msgid "%s has type %o, expected %o" |
529 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 530 | |
5809aa05 | 531 | #: apply.c:3864 apply.c:3866 |
4dcdc3d8 | 532 | #, c-format |
a0b6b246 JX |
533 | msgid "invalid path '%s'" |
534 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 535 | |
5809aa05 | 536 | #: apply.c:3922 |
4dcdc3d8 | 537 | #, c-format |
a0b6b246 JX |
538 | msgid "%s: already exists in index" |
539 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 540 | |
5809aa05 | 541 | #: apply.c:3925 |
4dcdc3d8 | 542 | #, c-format |
a0b6b246 JX |
543 | msgid "%s: already exists in working directory" |
544 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 545 | |
5809aa05 | 546 | #: apply.c:3945 |
1b7f4a34 | 547 | #, c-format |
a0b6b246 JX |
548 | msgid "new mode (%o) of %s does not match old mode (%o)" |
549 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 550 | |
5809aa05 | 551 | #: apply.c:3950 |
5b04ee3b | 552 | #, c-format |
a0b6b246 JX |
553 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
554 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 555 | |
5809aa05 | 556 | #: apply.c:3970 |
8ada9598 | 557 | #, c-format |
a0b6b246 JX |
558 | msgid "affected file '%s' is beyond a symbolic link" |
559 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 560 | |
5809aa05 | 561 | #: apply.c:3974 |
81809b99 | 562 | #, c-format |
a0b6b246 JX |
563 | msgid "%s: patch does not apply" |
564 | msgstr "%s:补丁未应用" | |
8ada9598 | 565 | |
5809aa05 | 566 | #: apply.c:3989 |
8ada9598 | 567 | #, c-format |
a0b6b246 JX |
568 | msgid "Checking patch %s..." |
569 | msgstr "检查补丁 %s..." | |
8ada9598 | 570 | |
5809aa05 | 571 | #: apply.c:4080 |
a0b6b246 JX |
572 | #, c-format |
573 | msgid "sha1 information is lacking or useless for submodule %s" | |
574 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 575 | |
5809aa05 | 576 | #: apply.c:4087 |
8ada9598 | 577 | #, c-format |
a0b6b246 | 578 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 579 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 580 | |
5809aa05 | 581 | #: apply.c:4090 |
a0b6b246 JX |
582 | #, c-format |
583 | msgid "sha1 information is lacking or useless (%s)." | |
584 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 585 | |
31e5e17b | 586 | #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 |
8ada9598 | 587 | #, c-format |
a0b6b246 JX |
588 | msgid "make_cache_entry failed for path '%s'" |
589 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
8ada9598 | 590 | |
5809aa05 | 591 | #: apply.c:4099 |
a0b6b246 JX |
592 | #, c-format |
593 | msgid "could not add %s to temporary index" | |
594 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 595 | |
5809aa05 | 596 | #: apply.c:4109 |
a0b6b246 JX |
597 | #, c-format |
598 | msgid "could not write temporary index to %s" | |
599 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 600 | |
5809aa05 | 601 | #: apply.c:4247 |
a0b6b246 JX |
602 | #, c-format |
603 | msgid "unable to remove %s from index" | |
604 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 605 | |
5809aa05 | 606 | #: apply.c:4282 |
8ada9598 | 607 | #, c-format |
a0b6b246 JX |
608 | msgid "corrupt patch for submodule %s" |
609 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 610 | |
5809aa05 | 611 | #: apply.c:4288 |
9aeb4c2b | 612 | #, c-format |
a0b6b246 | 613 | msgid "unable to stat newly created file '%s'" |
65e2041e | 614 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 615 | |
5809aa05 | 616 | #: apply.c:4296 |
a0b6b246 JX |
617 | #, c-format |
618 | msgid "unable to create backing store for newly created file %s" | |
619 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 620 | |
5809aa05 | 621 | #: apply.c:4302 apply.c:4446 |
81809b99 | 622 | #, c-format |
a0b6b246 JX |
623 | msgid "unable to add cache entry for %s" |
624 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 625 | |
5809aa05 | 626 | #: apply.c:4343 |
a0b6b246 JX |
627 | #, c-format |
628 | msgid "failed to write to '%s'" | |
629 | msgstr "无法写入 '%s'" | |
8ada9598 | 630 | |
5809aa05 | 631 | #: apply.c:4347 |
220c313c | 632 | #, c-format |
a0b6b246 JX |
633 | msgid "closing file '%s'" |
634 | msgstr "关闭文件 '%s'" | |
220c313c | 635 | |
5809aa05 | 636 | #: apply.c:4417 |
c04f5ac3 | 637 | #, c-format |
a0b6b246 JX |
638 | msgid "unable to write file '%s' mode %o" |
639 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 640 | |
5809aa05 | 641 | #: apply.c:4515 |
c04f5ac3 | 642 | #, c-format |
a0b6b246 JX |
643 | msgid "Applied patch %s cleanly." |
644 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 645 | |
5809aa05 | 646 | #: apply.c:4523 |
a0b6b246 JX |
647 | msgid "internal error" |
648 | msgstr "内部错误" | |
c04f5ac3 | 649 | |
5809aa05 | 650 | #: apply.c:4526 |
5c57d762 | 651 | #, c-format |
a0b6b246 JX |
652 | msgid "Applying patch %%s with %d reject..." |
653 | msgid_plural "Applying patch %%s with %d rejects..." | |
654 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
655 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 656 | |
5809aa05 | 657 | #: apply.c:4537 |
5c57d762 | 658 | #, c-format |
a0b6b246 JX |
659 | msgid "truncating .rej filename to %.*s.rej" |
660 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 661 | |
fd8cb379 | 662 | #: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 |
220c313c | 663 | #, c-format |
a0b6b246 JX |
664 | msgid "cannot open %s" |
665 | msgstr "不能打开 %s" | |
220c313c | 666 | |
5809aa05 | 667 | #: apply.c:4559 |
220c313c | 668 | #, c-format |
a0b6b246 JX |
669 | msgid "Hunk #%d applied cleanly." |
670 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 671 | |
5809aa05 | 672 | #: apply.c:4563 |
5c57d762 | 673 | #, c-format |
a0b6b246 JX |
674 | msgid "Rejected hunk #%d." |
675 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 676 | |
5809aa05 | 677 | #: apply.c:4673 |
5c57d762 | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "Skipped patch '%s'." |
680 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 681 | |
5809aa05 | 682 | #: apply.c:4681 |
a0b6b246 JX |
683 | msgid "unrecognized input" |
684 | msgstr "未能识别的输入" | |
5c57d762 | 685 | |
5809aa05 | 686 | #: apply.c:4700 |
a0b6b246 JX |
687 | msgid "unable to read index file" |
688 | msgstr "无法读取索引文件" | |
5c57d762 | 689 | |
5809aa05 | 690 | #: apply.c:4837 |
220c313c | 691 | #, c-format |
a0b6b246 JX |
692 | msgid "can't open patch '%s': %s" |
693 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 694 | |
5809aa05 | 695 | #: apply.c:4864 |
5c57d762 | 696 | #, c-format |
a0b6b246 JX |
697 | msgid "squelched %d whitespace error" |
698 | msgid_plural "squelched %d whitespace errors" | |
699 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
700 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 701 | |
5809aa05 | 702 | #: apply.c:4870 apply.c:4885 |
5c57d762 | 703 | #, c-format |
a0b6b246 JX |
704 | msgid "%d line adds whitespace errors." |
705 | msgid_plural "%d lines add whitespace errors." | |
a4f16749 JX |
706 | msgstr[0] "%d 行新增了空白字符误用。" |
707 | msgstr[1] "%d 行新增了空白字符误用。" | |
5c57d762 | 708 | |
5809aa05 | 709 | #: apply.c:4878 |
5c57d762 | 710 | #, c-format |
a0b6b246 JX |
711 | msgid "%d line applied after fixing whitespace errors." |
712 | msgid_plural "%d lines applied after fixing whitespace errors." | |
713 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
714 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 715 | |
fd8cb379 | 716 | #: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 |
a0b6b246 JX |
717 | msgid "Unable to write new index file" |
718 | msgstr "无法写入新索引文件" | |
5c57d762 | 719 | |
31e5e17b | 720 | #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 |
fd8cb379 JX |
721 | #: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 |
722 | #: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 | |
723 | #: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 | |
724 | #: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 | |
a4f16749 | 725 | #: git-add--interactive.perl:197 |
a0b6b246 JX |
726 | msgid "path" |
727 | msgstr "路径" | |
5c57d762 | 728 | |
5809aa05 | 729 | #: apply.c:4922 |
a0b6b246 JX |
730 | msgid "don't apply changes matching the given path" |
731 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 732 | |
5809aa05 | 733 | #: apply.c:4925 |
a0b6b246 JX |
734 | msgid "apply changes matching the given path" |
735 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 736 | |
31e5e17b | 737 | #: apply.c:4927 builtin/am.c:2263 |
a0b6b246 JX |
738 | msgid "num" |
739 | msgstr "数字" | |
220c313c | 740 | |
5809aa05 | 741 | #: apply.c:4928 |
a0b6b246 JX |
742 | msgid "remove <num> leading slashes from traditional diff paths" |
743 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 744 | |
5809aa05 | 745 | #: apply.c:4931 |
a0b6b246 JX |
746 | msgid "ignore additions made by the patch" |
747 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 748 | |
5809aa05 | 749 | #: apply.c:4933 |
a0b6b246 JX |
750 | msgid "instead of applying the patch, output diffstat for the input" |
751 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 752 | |
5809aa05 | 753 | #: apply.c:4937 |
a0b6b246 JX |
754 | msgid "show number of added and deleted lines in decimal notation" |
755 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 756 | |
5809aa05 | 757 | #: apply.c:4939 |
a0b6b246 JX |
758 | msgid "instead of applying the patch, output a summary for the input" |
759 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 760 | |
5809aa05 | 761 | #: apply.c:4941 |
a0b6b246 JX |
762 | msgid "instead of applying the patch, see if the patch is applicable" |
763 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 764 | |
5809aa05 | 765 | #: apply.c:4943 |
a0b6b246 JX |
766 | msgid "make sure the patch is applicable to the current index" |
767 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 768 | |
5809aa05 | 769 | #: apply.c:4945 |
a0b6b246 JX |
770 | msgid "apply a patch without touching the working tree" |
771 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 772 | |
5809aa05 | 773 | #: apply.c:4947 |
a0b6b246 JX |
774 | msgid "accept a patch that touches outside the working area" |
775 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 776 | |
31e5e17b | 777 | #: apply.c:4950 |
a0b6b246 JX |
778 | msgid "also apply the patch (use with --stat/--summary/--check)" |
779 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 780 | |
31e5e17b | 781 | #: apply.c:4952 |
a0b6b246 JX |
782 | msgid "attempt three-way merge if a patch does not apply" |
783 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 784 | |
31e5e17b | 785 | #: apply.c:4954 |
a0b6b246 JX |
786 | msgid "build a temporary index based on embedded index information" |
787 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 788 | |
31e5e17b | 789 | #: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 |
a0b6b246 JX |
790 | msgid "paths are separated with NUL character" |
791 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 792 | |
31e5e17b | 793 | #: apply.c:4959 |
a0b6b246 JX |
794 | msgid "ensure at least <n> lines of context match" |
795 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 796 | |
31e5e17b | 797 | #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 |
6937cb4e | 798 | #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 |
fd8cb379 | 799 | #: builtin/pack-objects.c:3177 |
a0b6b246 JX |
800 | msgid "action" |
801 | msgstr "动作" | |
8ada9598 | 802 | |
31e5e17b | 803 | #: apply.c:4961 |
a0b6b246 JX |
804 | msgid "detect new or modified lines that have whitespace errors" |
805 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 806 | |
31e5e17b | 807 | #: apply.c:4964 apply.c:4967 |
a0b6b246 JX |
808 | msgid "ignore changes in whitespace when finding context" |
809 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 810 | |
31e5e17b | 811 | #: apply.c:4970 |
a0b6b246 JX |
812 | msgid "apply the patch in reverse" |
813 | msgstr "反向应用补丁" | |
8ada9598 | 814 | |
31e5e17b | 815 | #: apply.c:4972 |
a0b6b246 JX |
816 | msgid "don't expect at least one line of context" |
817 | msgstr "无需至少一行上下文" | |
8ada9598 | 818 | |
31e5e17b | 819 | #: apply.c:4974 |
a0b6b246 JX |
820 | msgid "leave the rejected hunks in corresponding *.rej files" |
821 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 822 | |
31e5e17b | 823 | #: apply.c:4976 |
a0b6b246 JX |
824 | msgid "allow overlapping hunks" |
825 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 826 | |
fd8cb379 JX |
827 | #: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 |
828 | #: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 | |
829 | #: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 | |
a0b6b246 JX |
830 | msgid "be verbose" |
831 | msgstr "冗长输出" | |
8ada9598 | 832 | |
31e5e17b | 833 | #: apply.c:4979 |
a0b6b246 JX |
834 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
835 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 836 | |
31e5e17b | 837 | #: apply.c:4982 |
a0b6b246 JX |
838 | msgid "do not trust the line counts in the hunk headers" |
839 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 840 | |
31e5e17b | 841 | #: apply.c:4984 builtin/am.c:2251 |
a0b6b246 JX |
842 | msgid "root" |
843 | msgstr "根目录" | |
c04f5ac3 | 844 | |
31e5e17b | 845 | #: apply.c:4985 |
a0b6b246 JX |
846 | msgid "prepend <root> to all filenames" |
847 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 848 | |
a4f16749 | 849 | #: archive.c:13 |
a0b6b246 JX |
850 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
851 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 852 | |
a4f16749 | 853 | #: archive.c:14 |
a0b6b246 JX |
854 | msgid "git archive --list" |
855 | msgstr "git archive --list" | |
856 | ||
a4f16749 | 857 | #: archive.c:15 |
c04f5ac3 | 858 | msgid "" |
a0b6b246 | 859 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 860 | msgstr "" |
a0b6b246 | 861 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 862 | |
a4f16749 | 863 | #: archive.c:16 |
a0b6b246 JX |
864 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
865 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 866 | |
fd8cb379 | 867 | #: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 |
c04f5ac3 | 868 | #, c-format |
a0b6b246 JX |
869 | msgid "pathspec '%s' did not match any files" |
870 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 871 | |
fd8cb379 | 872 | #: archive.c:434 |
a0b6b246 JX |
873 | msgid "fmt" |
874 | msgstr "格式" | |
07432cef | 875 | |
fd8cb379 | 876 | #: archive.c:434 |
a0b6b246 JX |
877 | msgid "archive format" |
878 | msgstr "归档格式" | |
7aea43ff | 879 | |
fd8cb379 | 880 | #: archive.c:435 builtin/log.c:1462 |
a0b6b246 JX |
881 | msgid "prefix" |
882 | msgstr "前缀" | |
7aea43ff | 883 | |
fd8cb379 | 884 | #: archive.c:436 |
a0b6b246 JX |
885 | msgid "prepend prefix to each pathname in the archive" |
886 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 887 | |
fd8cb379 JX |
888 | #: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 |
889 | #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 | |
31e5e17b | 890 | #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 |
fd8cb379 | 891 | #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 |
31e5e17b | 892 | #: parse-options.h:165 |
a0b6b246 JX |
893 | msgid "file" |
894 | msgstr "文件" | |
a77c07d9 | 895 | |
fd8cb379 | 896 | #: archive.c:438 builtin/archive.c:89 |
a0b6b246 JX |
897 | msgid "write the archive to this file" |
898 | msgstr "归档写入此文件" | |
a77c07d9 | 899 | |
fd8cb379 | 900 | #: archive.c:440 |
a0b6b246 JX |
901 | msgid "read .gitattributes in working directory" |
902 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 903 | |
fd8cb379 | 904 | #: archive.c:441 |
a0b6b246 JX |
905 | msgid "report archived files on stderr" |
906 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 907 | |
fd8cb379 | 908 | #: archive.c:442 |
a0b6b246 JX |
909 | msgid "store only" |
910 | msgstr "只存储" | |
7ac1c0ad | 911 | |
fd8cb379 | 912 | #: archive.c:443 |
a0b6b246 JX |
913 | msgid "compress faster" |
914 | msgstr "压缩速度更快" | |
8ada9598 | 915 | |
fd8cb379 | 916 | #: archive.c:451 |
a0b6b246 JX |
917 | msgid "compress better" |
918 | msgstr "压缩效果更好" | |
8ada9598 | 919 | |
fd8cb379 | 920 | #: archive.c:454 |
a0b6b246 JX |
921 | msgid "list supported archive formats" |
922 | msgstr "列出支持的归档格式" | |
a77c07d9 | 923 | |
fd8cb379 JX |
924 | #: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 |
925 | #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 | |
a0b6b246 JX |
926 | msgid "repo" |
927 | msgstr "仓库" | |
c04f5ac3 | 928 | |
fd8cb379 | 929 | #: archive.c:457 builtin/archive.c:91 |
a0b6b246 JX |
930 | msgid "retrieve the archive from remote repository <repo>" |
931 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 932 | |
fd8cb379 | 933 | #: archive.c:458 builtin/archive.c:92 builtin/notes.c:489 |
a0b6b246 JX |
934 | msgid "command" |
935 | msgstr "命令" | |
936 | ||
fd8cb379 | 937 | #: archive.c:459 builtin/archive.c:93 |
a0b6b246 JX |
938 | msgid "path to the remote git-upload-archive command" |
939 | msgstr "远程 git-upload-archive 命令的路径" | |
940 | ||
fd8cb379 | 941 | #: archive.c:466 |
a0b6b246 JX |
942 | msgid "Unexpected option --remote" |
943 | msgstr "未知参数 --remote" | |
944 | ||
fd8cb379 | 945 | #: archive.c:468 |
a0b6b246 JX |
946 | msgid "Option --exec can only be used together with --remote" |
947 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
948 | ||
fd8cb379 | 949 | #: archive.c:470 |
a0b6b246 JX |
950 | msgid "Unexpected option --output" |
951 | msgstr "未知参数 --output" | |
952 | ||
fd8cb379 | 953 | #: archive.c:492 |
a0b6b246 JX |
954 | #, c-format |
955 | msgid "Unknown archive format '%s'" | |
956 | msgstr "未知归档格式 '%s'" | |
957 | ||
fd8cb379 | 958 | #: archive.c:499 |
8ada9598 | 959 | #, c-format |
a0b6b246 JX |
960 | msgid "Argument not supported for format '%s': -%d" |
961 | msgstr "参数不支持此格式 '%s':-%d" | |
962 | ||
6937cb4e | 963 | #: attr.c:218 |
87cb7997 JX |
964 | #, c-format |
965 | msgid "%.*s is not a valid attribute name" | |
966 | msgstr "%.*s 不是一个有效的属性名" | |
967 | ||
6937cb4e | 968 | #: attr.c:415 |
8ada9598 | 969 | msgid "" |
a0b6b246 JX |
970 | "Negative patterns are ignored in git attributes\n" |
971 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 972 | msgstr "" |
a0b6b246 JX |
973 | "负值模版在 git attributes 中被忽略\n" |
974 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 975 | |
fd8cb379 | 976 | #: bisect.c:461 |
8ada9598 | 977 | #, c-format |
a0b6b246 JX |
978 | msgid "Badly quoted content in file '%s': %s" |
979 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 980 | |
fd8cb379 | 981 | #: bisect.c:669 |
a0b6b246 JX |
982 | #, c-format |
983 | msgid "We cannot bisect more!\n" | |
984 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 985 | |
fd8cb379 | 986 | #: bisect.c:723 |
2e8451e8 | 987 | #, c-format |
a0b6b246 JX |
988 | msgid "Not a valid commit name %s" |
989 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 990 | |
fd8cb379 | 991 | #: bisect.c:747 |
5b04ee3b JX |
992 | #, c-format |
993 | msgid "" | |
a0b6b246 JX |
994 | "The merge base %s is bad.\n" |
995 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 996 | msgstr "" |
a0b6b246 JX |
997 | "合并基线 %s 是坏的。\n" |
998 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 999 | |
fd8cb379 | 1000 | #: bisect.c:752 |
5b04ee3b | 1001 | #, c-format |
a0b6b246 JX |
1002 | msgid "" |
1003 | "The merge base %s is new.\n" | |
1004 | "The property has changed between %s and [%s].\n" | |
1005 | msgstr "" | |
1006 | "合并基线 %s 是新的。\n" | |
1007 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1008 | |
fd8cb379 | 1009 | #: bisect.c:757 |
a0b6b246 JX |
1010 | #, c-format |
1011 | msgid "" | |
1012 | "The merge base %s is %s.\n" | |
1013 | "This means the first '%s' commit is between %s and [%s].\n" | |
1014 | msgstr "" | |
1015 | "合并基线 %s 是 %s。\n" | |
1016 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1017 | |
fd8cb379 | 1018 | #: bisect.c:765 |
a0b6b246 JX |
1019 | #, c-format |
1020 | msgid "" | |
1a79b2f1 | 1021 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1022 | "git bisect cannot work properly in this case.\n" |
1023 | "Maybe you mistook %s and %s revs?\n" | |
1024 | msgstr "" | |
1025 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1026 | "这种情况下 git 二分查找无法正常工作。\n" | |
1027 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1028 | |
fd8cb379 | 1029 | #: bisect.c:778 |
a0b6b246 JX |
1030 | #, c-format |
1031 | msgid "" | |
1032 | "the merge base between %s and [%s] must be skipped.\n" | |
1033 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1034 | "We continue anyway." | |
1035 | msgstr "" | |
1036 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1037 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1038 | "我们仍旧继续。" | |
649900bc | 1039 | |
fd8cb379 | 1040 | #: bisect.c:811 |
649900bc | 1041 | #, c-format |
a0b6b246 JX |
1042 | msgid "Bisecting: a merge base must be tested\n" |
1043 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1044 | |
fd8cb379 | 1045 | #: bisect.c:851 |
a0b6b246 JX |
1046 | #, c-format |
1047 | msgid "a %s revision is needed" | |
1048 | msgstr "需要一个 %s 版本" | |
649900bc | 1049 | |
fd8cb379 | 1050 | #: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 |
649900bc | 1051 | #, c-format |
a0b6b246 JX |
1052 | msgid "could not create file '%s'" |
1053 | msgstr "不能创建文件 '%s'" | |
649900bc | 1054 | |
fd8cb379 | 1055 | #: bisect.c:921 |
649900bc | 1056 | #, c-format |
a0b6b246 JX |
1057 | msgid "could not read file '%s'" |
1058 | msgstr "不能读取文件 '%s'" | |
649900bc | 1059 | |
fd8cb379 | 1060 | #: bisect.c:951 |
a0b6b246 JX |
1061 | msgid "reading bisect refs failed" |
1062 | msgstr "读取二分查找引用失败" | |
649900bc | 1063 | |
fd8cb379 | 1064 | #: bisect.c:970 |
649900bc | 1065 | #, c-format |
a0b6b246 JX |
1066 | msgid "%s was both %s and %s\n" |
1067 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1068 | |
fd8cb379 | 1069 | #: bisect.c:978 |
649900bc | 1070 | #, c-format |
a0b6b246 JX |
1071 | msgid "" |
1072 | "No testable commit found.\n" | |
1073 | "Maybe you started with bad path parameters?\n" | |
1074 | msgstr "" | |
1075 | "没有发现可测试的提交。\n" | |
1076 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1077 | |
fd8cb379 | 1078 | #: bisect.c:997 |
649900bc | 1079 | #, c-format |
a0b6b246 JX |
1080 | msgid "(roughly %d step)" |
1081 | msgid_plural "(roughly %d steps)" | |
1082 | msgstr[0] "(大概 %d 步)" | |
1083 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1084 | |
a4f16749 JX |
1085 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1086 | #. steps)" translation. | |
1087 | #. | |
fd8cb379 | 1088 | #: bisect.c:1003 |
649900bc | 1089 | #, c-format |
a0b6b246 JX |
1090 | msgid "Bisecting: %d revision left to test after this %s\n" |
1091 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1092 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1093 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1094 | |
fd8cb379 | 1095 | #: blame.c:1756 |
a4f16749 JX |
1096 | msgid "--contents and --reverse do not blend well." |
1097 | msgstr "--contents 和 --reverse 不能混用。" | |
1098 | ||
fd8cb379 | 1099 | #: blame.c:1767 |
a4f16749 JX |
1100 | msgid "cannot use --contents with final commit object name" |
1101 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1102 | ||
fd8cb379 | 1103 | #: blame.c:1787 |
a4f16749 JX |
1104 | msgid "--reverse and --first-parent together require specified latest commit" |
1105 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1106 | ||
fd8cb379 JX |
1107 | #: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861 |
1108 | #: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 | |
1109 | #: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372 | |
1110 | #: builtin/shortlog.c:192 | |
a4f16749 JX |
1111 | msgid "revision walk setup failed" |
1112 | msgstr "版本遍历设置失败" | |
1113 | ||
fd8cb379 | 1114 | #: blame.c:1814 |
a4f16749 JX |
1115 | msgid "" |
1116 | "--reverse --first-parent together require range along first-parent chain" | |
1117 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1118 | ||
fd8cb379 | 1119 | #: blame.c:1825 |
a4f16749 JX |
1120 | #, c-format |
1121 | msgid "no such path %s in %s" | |
1122 | msgstr "在 %2$s 中无此路径 %1$s" | |
1123 | ||
fd8cb379 | 1124 | #: blame.c:1836 |
a4f16749 JX |
1125 | #, c-format |
1126 | msgid "cannot read blob %s for path %s" | |
1127 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1128 | ||
fd8cb379 | 1129 | #: branch.c:54 |
649900bc | 1130 | #, c-format |
a0b6b246 JX |
1131 | msgid "" |
1132 | "\n" | |
1133 | "After fixing the error cause you may try to fix up\n" | |
1134 | "the remote tracking information by invoking\n" | |
1135 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1136 | msgstr "" | |
1137 | "\n" | |
1138 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1139 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1140 | |
fd8cb379 | 1141 | #: branch.c:68 |
649900bc | 1142 | #, c-format |
a0b6b246 JX |
1143 | msgid "Not setting branch %s as its own upstream." |
1144 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1145 | |
fd8cb379 | 1146 | #: branch.c:94 |
649900bc | 1147 | #, c-format |
6937cb4e JX |
1148 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1149 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1150 | |
fd8cb379 | 1151 | #: branch.c:95 |
649900bc | 1152 | #, c-format |
6937cb4e JX |
1153 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1154 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1155 | |
fd8cb379 | 1156 | #: branch.c:99 |
649900bc | 1157 | #, c-format |
6937cb4e JX |
1158 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1159 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1160 | |
fd8cb379 | 1161 | #: branch.c:100 |
649900bc | 1162 | #, c-format |
6937cb4e | 1163 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1164 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1165 | |
fd8cb379 | 1166 | #: branch.c:105 |
649900bc | 1167 | #, c-format |
6937cb4e JX |
1168 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1169 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1170 | |
fd8cb379 | 1171 | #: branch.c:106 |
649900bc | 1172 | #, c-format |
6937cb4e JX |
1173 | msgid "Branch '%s' set up to track remote ref '%s'." |
1174 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1175 | |
fd8cb379 | 1176 | #: branch.c:110 |
649900bc | 1177 | #, c-format |
6937cb4e JX |
1178 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1179 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1180 | |
fd8cb379 | 1181 | #: branch.c:111 |
649900bc | 1182 | #, c-format |
6937cb4e JX |
1183 | msgid "Branch '%s' set up to track local ref '%s'." |
1184 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1185 | |
fd8cb379 | 1186 | #: branch.c:120 |
a0b6b246 JX |
1187 | msgid "Unable to write upstream branch configuration" |
1188 | msgstr "无法写入上游分支配置" | |
649900bc | 1189 | |
fd8cb379 | 1190 | #: branch.c:157 |
649900bc | 1191 | #, c-format |
a0b6b246 JX |
1192 | msgid "Not tracking: ambiguous information for ref %s" |
1193 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1194 | |
fd8cb379 | 1195 | #: branch.c:190 |
649900bc | 1196 | #, c-format |
a0b6b246 JX |
1197 | msgid "'%s' is not a valid branch name." |
1198 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1199 | |
fd8cb379 | 1200 | #: branch.c:209 |
649900bc | 1201 | #, c-format |
a0b6b246 JX |
1202 | msgid "A branch named '%s' already exists." |
1203 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1204 | |
fd8cb379 | 1205 | #: branch.c:214 |
a0b6b246 JX |
1206 | msgid "Cannot force update the current branch." |
1207 | msgstr "无法强制更新当前分支。" | |
649900bc | 1208 | |
fd8cb379 | 1209 | #: branch.c:234 |
649900bc | 1210 | #, c-format |
a0b6b246 JX |
1211 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1212 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1213 | |
fd8cb379 | 1214 | #: branch.c:236 |
649900bc | 1215 | #, c-format |
a0b6b246 JX |
1216 | msgid "the requested upstream branch '%s' does not exist" |
1217 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1218 | |
fd8cb379 | 1219 | #: branch.c:238 |
a0b6b246 JX |
1220 | msgid "" |
1221 | "\n" | |
1222 | "If you are planning on basing your work on an upstream\n" | |
1223 | "branch that already exists at the remote, you may need to\n" | |
1224 | "run \"git fetch\" to retrieve it.\n" | |
1225 | "\n" | |
1226 | "If you are planning to push out a new local branch that\n" | |
1227 | "will track its remote counterpart, you may want to use\n" | |
1228 | "\"git push -u\" to set the upstream config as you push." | |
1229 | msgstr "" | |
1230 | "\n" | |
1231 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1232 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1233 | "\n" | |
1234 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1235 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1236 | |
fd8cb379 | 1237 | #: branch.c:281 |
649900bc | 1238 | #, c-format |
a0b6b246 JX |
1239 | msgid "Not a valid object name: '%s'." |
1240 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1241 | |
fd8cb379 | 1242 | #: branch.c:301 |
649900bc | 1243 | #, c-format |
a0b6b246 JX |
1244 | msgid "Ambiguous object name: '%s'." |
1245 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1246 | |
fd8cb379 | 1247 | #: branch.c:306 |
649900bc | 1248 | #, c-format |
a0b6b246 JX |
1249 | msgid "Not a valid branch point: '%s'." |
1250 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1251 | |
fd8cb379 | 1252 | #: branch.c:360 |
649900bc | 1253 | #, c-format |
a0b6b246 JX |
1254 | msgid "'%s' is already checked out at '%s'" |
1255 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1256 | |
fd8cb379 | 1257 | #: branch.c:383 |
a0b6b246 JX |
1258 | #, c-format |
1259 | msgid "HEAD of working tree %s is not updated" | |
1260 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1261 | |
a0b6b246 | 1262 | #: bundle.c:34 |
649900bc | 1263 | #, c-format |
a0b6b246 JX |
1264 | msgid "'%s' does not look like a v2 bundle file" |
1265 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1266 | |
a4f16749 | 1267 | #: bundle.c:62 |
a0b6b246 JX |
1268 | #, c-format |
1269 | msgid "unrecognized header: %s%s (%d)" | |
1270 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1271 | |
fd8cb379 | 1272 | #: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755 |
649900bc | 1273 | #, c-format |
a0b6b246 JX |
1274 | msgid "could not open '%s'" |
1275 | msgstr "不能打开 '%s'" | |
649900bc | 1276 | |
31e5e17b | 1277 | #: bundle.c:139 |
a0b6b246 JX |
1278 | msgid "Repository lacks these prerequisite commits:" |
1279 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1280 | |
31e5e17b | 1281 | #: bundle.c:190 |
2e8451e8 | 1282 | #, c-format |
a0b6b246 JX |
1283 | msgid "The bundle contains this ref:" |
1284 | msgid_plural "The bundle contains these %d refs:" | |
1285 | msgstr[0] "这个包中含有这个引用:" | |
1286 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1287 | |
31e5e17b | 1288 | #: bundle.c:197 |
a0b6b246 JX |
1289 | msgid "The bundle records a complete history." |
1290 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1291 | |
31e5e17b | 1292 | #: bundle.c:199 |
2e8451e8 | 1293 | #, c-format |
a0b6b246 JX |
1294 | msgid "The bundle requires this ref:" |
1295 | msgid_plural "The bundle requires these %d refs:" | |
1296 | msgstr[0] "这个包需要这个引用:" | |
1297 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1298 | |
31e5e17b | 1299 | #: bundle.c:258 |
a0b6b246 JX |
1300 | msgid "Could not spawn pack-objects" |
1301 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1302 | |
31e5e17b | 1303 | #: bundle.c:269 |
a0b6b246 JX |
1304 | msgid "pack-objects died" |
1305 | msgstr "pack-objects 终止" | |
8ada9598 | 1306 | |
31e5e17b | 1307 | #: bundle.c:311 |
a0b6b246 JX |
1308 | msgid "rev-list died" |
1309 | msgstr "rev-list 终止" | |
1310 | ||
31e5e17b | 1311 | #: bundle.c:360 |
81809b99 | 1312 | #, c-format |
a0b6b246 JX |
1313 | msgid "ref '%s' is excluded by the rev-list options" |
1314 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1315 | |
fd8cb379 | 1316 | #: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 |
81809b99 | 1317 | #, c-format |
a0b6b246 JX |
1318 | msgid "unrecognized argument: %s" |
1319 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1320 | |
31e5e17b | 1321 | #: bundle.c:458 |
a0b6b246 JX |
1322 | msgid "Refusing to create empty bundle." |
1323 | msgstr "不能创建空包。" | |
1324 | ||
31e5e17b | 1325 | #: bundle.c:470 |
81809b99 | 1326 | #, c-format |
a0b6b246 JX |
1327 | msgid "cannot create '%s'" |
1328 | msgstr "不能创建 '%s'" | |
8ada9598 | 1329 | |
31e5e17b | 1330 | #: bundle.c:498 |
a0b6b246 JX |
1331 | msgid "index-pack died" |
1332 | msgstr "index-pack 终止" | |
63af42fe | 1333 | |
31e5e17b | 1334 | #: color.c:296 |
94550ed3 | 1335 | #, c-format |
a0b6b246 JX |
1336 | msgid "invalid color value: %.*s" |
1337 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1338 | |
fd8cb379 JX |
1339 | #: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465 |
1340 | #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 | |
1341 | #: builtin/replace.c:448 | |
94550ed3 | 1342 | #, c-format |
a0b6b246 JX |
1343 | msgid "could not parse %s" |
1344 | msgstr "不能解析 %s" | |
94550ed3 | 1345 | |
fd8cb379 | 1346 | #: commit.c:45 |
a0b6b246 JX |
1347 | #, c-format |
1348 | msgid "%s %s is not a commit!" | |
31e5e17b | 1349 | msgstr "%s %s 不是一个提交!" |
90314792 | 1350 | |
fd8cb379 JX |
1351 | #: commit.c:182 |
1352 | msgid "" | |
1353 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
1354 | "and will be removed in a future Git version.\n" | |
1355 | "\n" | |
1356 | "Please use \"git replace --convert-graft-file\"\n" | |
1357 | "to convert the grafts into replace refs.\n" | |
1358 | "\n" | |
1359 | "Turn this message off by running\n" | |
1360 | "\"git config advice.graftFileDeprecated false\"" | |
1361 | msgstr "" | |
1362 | "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n" | |
1363 | "未来的Git版本中被移除。\n" | |
1364 | "\n" | |
1365 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
1366 | "grafts 转换为替换引用。\n" | |
1367 | "\n" | |
1368 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
1369 | "可关闭本消息" | |
1370 | ||
1371 | #: commit.c:1540 | |
90314792 | 1372 | msgid "" |
a0b6b246 JX |
1373 | "Warning: commit message did not conform to UTF-8.\n" |
1374 | "You may want to amend it after fixing the message, or set the config\n" | |
1375 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1376 | msgstr "" | |
29004bbb | 1377 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1378 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1379 | "设置为您项目所用的字符编码。\n" |
90314792 | 1380 | |
fd8cb379 JX |
1381 | #: commit-graph.c:669 |
1382 | #, c-format | |
1383 | msgid "the commit graph format cannot write %d commits" | |
1384 | msgstr "提交图形格式不能写入 %d 个提交" | |
1385 | ||
1386 | #: commit-graph.c:696 | |
1387 | msgid "too many commits to write graph" | |
1388 | msgstr "提交太多不能画图" | |
1389 | ||
1390 | #: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 | |
1391 | #, c-format | |
1392 | msgid "cannot mkdir %s" | |
1393 | msgstr "不能创建目录 %s" | |
1394 | ||
5809aa05 | 1395 | #: compat/obstack.c:405 compat/obstack.c:407 |
a0b6b246 JX |
1396 | msgid "memory exhausted" |
1397 | msgstr "内存耗尽" | |
90314792 | 1398 | |
fd8cb379 | 1399 | #: config.c:187 |
87cb7997 JX |
1400 | msgid "relative config include conditionals must come from files" |
1401 | msgstr "包含相对路径的条件引用必须来自于文件" | |
1402 | ||
fd8cb379 | 1403 | #: config.c:788 |
90314792 | 1404 | #, c-format |
a0b6b246 JX |
1405 | msgid "bad config line %d in blob %s" |
1406 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1407 | |
fd8cb379 | 1408 | #: config.c:792 |
a77c07d9 | 1409 | #, c-format |
a0b6b246 JX |
1410 | msgid "bad config line %d in file %s" |
1411 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1412 | |
fd8cb379 | 1413 | #: config.c:796 |
a77c07d9 | 1414 | #, c-format |
a0b6b246 JX |
1415 | msgid "bad config line %d in standard input" |
1416 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1417 | |
fd8cb379 | 1418 | #: config.c:800 |
90314792 | 1419 | #, c-format |
a0b6b246 JX |
1420 | msgid "bad config line %d in submodule-blob %s" |
1421 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1422 | |
fd8cb379 | 1423 | #: config.c:804 |
90314792 | 1424 | #, c-format |
a0b6b246 JX |
1425 | msgid "bad config line %d in command line %s" |
1426 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1427 | |
fd8cb379 | 1428 | #: config.c:808 |
90314792 | 1429 | #, c-format |
a0b6b246 JX |
1430 | msgid "bad config line %d in %s" |
1431 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1432 | |
fd8cb379 | 1433 | #: config.c:936 |
a0b6b246 JX |
1434 | msgid "out of range" |
1435 | msgstr "超出范围" | |
6c94aba5 | 1436 | |
fd8cb379 | 1437 | #: config.c:936 |
a0b6b246 JX |
1438 | msgid "invalid unit" |
1439 | msgstr "无效的单位" | |
6c94aba5 | 1440 | |
fd8cb379 | 1441 | #: config.c:942 |
6c94aba5 | 1442 | #, c-format |
a0b6b246 JX |
1443 | msgid "bad numeric config value '%s' for '%s': %s" |
1444 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1445 | |
fd8cb379 | 1446 | #: config.c:947 |
1b7f4a34 | 1447 | #, c-format |
a0b6b246 JX |
1448 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1449 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1450 | |
fd8cb379 | 1451 | #: config.c:950 |
1b7f4a34 | 1452 | #, c-format |
a0b6b246 JX |
1453 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1454 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1455 | |
fd8cb379 | 1456 | #: config.c:953 |
1b7f4a34 | 1457 | #, c-format |
a0b6b246 JX |
1458 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1459 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1460 | |
fd8cb379 | 1461 | #: config.c:956 |
1b7f4a34 | 1462 | #, c-format |
a0b6b246 JX |
1463 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1464 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1465 | |
fd8cb379 | 1466 | #: config.c:959 |
94550ed3 | 1467 | #, c-format |
a0b6b246 JX |
1468 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1469 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1470 | |
fd8cb379 | 1471 | #: config.c:962 |
276ceeaa | 1472 | #, c-format |
a0b6b246 JX |
1473 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1474 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1475 | |
fd8cb379 | 1476 | #: config.c:1057 |
276ceeaa | 1477 | #, c-format |
a0b6b246 JX |
1478 | msgid "failed to expand user dir in: '%s'" |
1479 | msgstr "无法扩展 '%s' 中的用户目录" | |
94550ed3 | 1480 | |
fd8cb379 | 1481 | #: config.c:1066 |
5809aa05 JX |
1482 | #, c-format |
1483 | msgid "'%s' for '%s' is not a valid timestamp" | |
1484 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
1485 | ||
fd8cb379 | 1486 | #: config.c:1171 config.c:1182 |
3495628d | 1487 | #, c-format |
a0b6b246 JX |
1488 | msgid "bad zlib compression level %d" |
1489 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1490 | |
fd8cb379 | 1491 | #: config.c:1307 |
3495628d | 1492 | #, c-format |
a0b6b246 JX |
1493 | msgid "invalid mode for object creation: %s" |
1494 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1495 | |
fd8cb379 | 1496 | #: config.c:1473 |
1a79b2f1 JX |
1497 | #, c-format |
1498 | msgid "bad pack compression level %d" | |
1499 | msgstr "错误的打包压缩级别 %d" | |
1500 | ||
fd8cb379 | 1501 | #: config.c:1681 |
a0b6b246 JX |
1502 | msgid "unable to parse command-line config" |
1503 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1504 | |
fd8cb379 | 1505 | #: config.c:2013 |
a0b6b246 JX |
1506 | msgid "unknown error occurred while reading the configuration files" |
1507 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1508 | |
fd8cb379 | 1509 | #: config.c:2200 |
87cb7997 JX |
1510 | #, c-format |
1511 | msgid "Invalid %s: '%s'" | |
1512 | msgstr "无效 %s:'%s'" | |
1513 | ||
fd8cb379 | 1514 | #: config.c:2243 |
87cb7997 JX |
1515 | #, c-format |
1516 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1517 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1518 | ||
fd8cb379 | 1519 | #: config.c:2269 |
87cb7997 JX |
1520 | #, c-format |
1521 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1522 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1523 | ||
fd8cb379 | 1524 | #: config.c:2294 |
276ceeaa | 1525 | #, c-format |
a0b6b246 JX |
1526 | msgid "unable to parse '%s' from command-line config" |
1527 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1528 | |
fd8cb379 | 1529 | #: config.c:2296 |
94550ed3 | 1530 | #, c-format |
a0b6b246 JX |
1531 | msgid "bad config variable '%s' in file '%s' at line %d" |
1532 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1533 | |
fd8cb379 | 1534 | #: config.c:2402 |
276ceeaa | 1535 | #, c-format |
a0b6b246 JX |
1536 | msgid "%s has multiple values" |
1537 | msgstr "%s 有多个取值" | |
276ceeaa | 1538 | |
fd8cb379 | 1539 | #: config.c:2766 config.c:3019 |
1a79b2f1 JX |
1540 | #, c-format |
1541 | msgid "fstat on %s failed" | |
65e2041e | 1542 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 1543 | |
fd8cb379 | 1544 | #: config.c:2905 |
94550ed3 | 1545 | #, c-format |
a0b6b246 JX |
1546 | msgid "could not set '%s' to '%s'" |
1547 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1548 | |
fd8cb379 | 1549 | #: config.c:2907 builtin/remote.c:779 |
276ceeaa | 1550 | #, c-format |
a0b6b246 JX |
1551 | msgid "could not unset '%s'" |
1552 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1553 | |
fd8cb379 | 1554 | #: connect.c:61 |
a0b6b246 | 1555 | msgid "The remote end hung up upon initial contact" |
29004bbb | 1556 | msgstr "远端在连接发起时即挂断" |
94550ed3 | 1557 | |
fd8cb379 | 1558 | #: connect.c:63 |
a0b6b246 JX |
1559 | msgid "" |
1560 | "Could not read from remote repository.\n" | |
1561 | "\n" | |
1562 | "Please make sure you have the correct access rights\n" | |
1563 | "and the repository exists." | |
1564 | msgstr "" | |
1565 | "无法读取远程仓库。\n" | |
1566 | "\n" | |
1567 | "请确认您有正确的访问权限并且仓库存在。" | |
1568 | ||
fd8cb379 | 1569 | #: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 |
a0b6b246 JX |
1570 | msgid "Checking connectivity" |
1571 | msgstr "检查连接中" | |
1572 | ||
31e5e17b | 1573 | #: connected.c:78 |
a0b6b246 JX |
1574 | msgid "Could not run 'git rev-list'" |
1575 | msgstr "不能执行 'git rev-list'" | |
1576 | ||
31e5e17b | 1577 | #: connected.c:98 |
a0b6b246 JX |
1578 | msgid "failed write to rev-list" |
1579 | msgstr "无法写入 rev-list" | |
1580 | ||
31e5e17b | 1581 | #: connected.c:105 |
a0b6b246 JX |
1582 | msgid "failed to close rev-list's stdin" |
1583 | msgstr "无法关闭 rev-list 的标准输入" | |
1584 | ||
fd8cb379 | 1585 | #: convert.c:206 |
3495628d | 1586 | #, c-format |
31e5e17b JX |
1587 | msgid "CRLF would be replaced by LF in %s." |
1588 | msgstr "文件 %s 中的 CRLF 将被 LF 替换。" | |
1589 | ||
fd8cb379 | 1590 | #: convert.c:208 |
31e5e17b | 1591 | #, c-format |
a0b6b246 JX |
1592 | msgid "" |
1593 | "CRLF will be replaced by LF in %s.\n" | |
1594 | "The file will have its original line endings in your working directory." | |
1595 | msgstr "" | |
1596 | "文件 %s 中的 CRLF 将被 LF 替换。\n" | |
1597 | "在工作区中该文件仍保持原有的换行符。" | |
3495628d | 1598 | |
fd8cb379 | 1599 | #: convert.c:216 |
3495628d | 1600 | #, c-format |
31e5e17b JX |
1601 | msgid "LF would be replaced by CRLF in %s" |
1602 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 1603 | |
fd8cb379 | 1604 | #: convert.c:218 |
276ceeaa | 1605 | #, c-format |
a0b6b246 JX |
1606 | msgid "" |
1607 | "LF will be replaced by CRLF in %s.\n" | |
1608 | "The file will have its original line endings in your working directory." | |
1609 | msgstr "" | |
1610 | "文件 %s 中的 LF 将被 CRLF 替换。\n" | |
1611 | "在工作区中该文件仍保持原有的换行符。" | |
276ceeaa | 1612 | |
fd8cb379 JX |
1613 | #: convert.c:279 |
1614 | #, c-format | |
1615 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
1616 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
1617 | ||
1618 | #: convert.c:286 | |
1619 | #, c-format | |
1620 | msgid "" | |
1621 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" | |
1622 | "tree-encoding." | |
1623 | msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。" | |
1624 | ||
1625 | #: convert.c:304 | |
1626 | #, c-format | |
1627 | msgid "BOM is required in '%s' if encoded as %s" | |
1628 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
1629 | ||
1630 | #: convert.c:306 | |
1631 | #, c-format | |
1632 | msgid "" | |
1633 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
1634 | "%sLE (depending on the byte order) as working-tree-encoding." | |
1635 | msgstr "" | |
1636 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
1637 | "节序)作为工作区编码。" | |
1638 | ||
1639 | #: convert.c:424 | |
1640 | #, c-format | |
1641 | msgid "failed to encode '%s' from %s to %s" | |
1642 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
1643 | ||
1644 | #: convert.c:467 | |
1645 | #, c-format | |
1646 | msgid "encoding '%s' from %s to %s and back is not the same" | |
1647 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
1648 | ||
1649 | #: convert.c:1225 | |
1650 | msgid "true/false are no valid working-tree-encodings" | |
1651 | msgstr "true/false 不是有效的工作区编码" | |
1652 | ||
a4f16749 | 1653 | #: date.c:116 |
a0b6b246 JX |
1654 | msgid "in the future" |
1655 | msgstr "在将来" | |
3495628d | 1656 | |
a4f16749 | 1657 | #: date.c:122 |
3495628d | 1658 | #, c-format |
a4f16749 JX |
1659 | msgid "%<PRIuMAX> second ago" |
1660 | msgid_plural "%<PRIuMAX> seconds ago" | |
1661 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
1662 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 1663 | |
a4f16749 | 1664 | #: date.c:129 |
3495628d | 1665 | #, c-format |
a4f16749 JX |
1666 | msgid "%<PRIuMAX> minute ago" |
1667 | msgid_plural "%<PRIuMAX> minutes ago" | |
1668 | msgstr[0] "%<PRIuMAX> 分钟前" | |
1669 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 1670 | |
a4f16749 | 1671 | #: date.c:136 |
3495628d | 1672 | #, c-format |
a4f16749 JX |
1673 | msgid "%<PRIuMAX> hour ago" |
1674 | msgid_plural "%<PRIuMAX> hours ago" | |
1675 | msgstr[0] "%<PRIuMAX> 小时前" | |
1676 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 1677 | |
a4f16749 | 1678 | #: date.c:143 |
3495628d | 1679 | #, c-format |
a4f16749 JX |
1680 | msgid "%<PRIuMAX> day ago" |
1681 | msgid_plural "%<PRIuMAX> days ago" | |
1682 | msgstr[0] "%<PRIuMAX> 天前" | |
1683 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 1684 | |
a4f16749 | 1685 | #: date.c:149 |
94550ed3 | 1686 | #, c-format |
a4f16749 JX |
1687 | msgid "%<PRIuMAX> week ago" |
1688 | msgid_plural "%<PRIuMAX> weeks ago" | |
1689 | msgstr[0] "%<PRIuMAX> 周前" | |
1690 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 1691 | |
a4f16749 | 1692 | #: date.c:156 |
3495628d | 1693 | #, c-format |
a4f16749 JX |
1694 | msgid "%<PRIuMAX> month ago" |
1695 | msgid_plural "%<PRIuMAX> months ago" | |
1696 | msgstr[0] "%<PRIuMAX> 个月前" | |
1697 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 1698 | |
a4f16749 | 1699 | #: date.c:167 |
3495628d | 1700 | #, c-format |
a4f16749 JX |
1701 | msgid "%<PRIuMAX> year" |
1702 | msgid_plural "%<PRIuMAX> years" | |
1703 | msgstr[0] "%<PRIuMAX> 年" | |
1704 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 1705 | |
a0b6b246 | 1706 | #. TRANSLATORS: "%s" is "<n> years" |
a4f16749 | 1707 | #: date.c:170 |
94550ed3 | 1708 | #, c-format |
a4f16749 JX |
1709 | msgid "%s, %<PRIuMAX> month ago" |
1710 | msgid_plural "%s, %<PRIuMAX> months ago" | |
1711 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
1712 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 1713 | |
a4f16749 | 1714 | #: date.c:175 date.c:180 |
94550ed3 | 1715 | #, c-format |
a4f16749 JX |
1716 | msgid "%<PRIuMAX> year ago" |
1717 | msgid_plural "%<PRIuMAX> years ago" | |
1718 | msgstr[0] "%<PRIuMAX> 年前" | |
1719 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 1720 | |
a0b6b246 | 1721 | #: diffcore-order.c:24 |
cfff71a9 | 1722 | #, c-format |
a0b6b246 JX |
1723 | msgid "failed to read orderfile '%s'" |
1724 | msgstr "无法读取排序文件 '%s'" | |
cfff71a9 | 1725 | |
5809aa05 | 1726 | #: diffcore-rename.c:535 |
a0b6b246 | 1727 | msgid "Performing inexact rename detection" |
87cb7997 | 1728 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 1729 | |
6937cb4e | 1730 | #: diff.c:74 |
cfff71a9 | 1731 | #, c-format |
a0b6b246 JX |
1732 | msgid "option '%s' requires a value" |
1733 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 1734 | |
a0b6b246 | 1735 | # 译者:注意保持前导空格 |
6937cb4e | 1736 | #: diff.c:152 |
a0b6b246 JX |
1737 | #, c-format |
1738 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
1739 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 1740 | |
a0b6b246 | 1741 | # 译者:注意保持前导空格 |
6937cb4e | 1742 | #: diff.c:157 |
a0b6b246 JX |
1743 | #, c-format |
1744 | msgid " Unknown dirstat parameter '%s'\n" | |
1745 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 1746 | |
6937cb4e JX |
1747 | #: diff.c:281 |
1748 | msgid "" | |
1749 | "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " | |
1750 | "'plain'" | |
5809aa05 JX |
1751 | msgstr "" |
1752 | "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'" | |
6937cb4e JX |
1753 | |
1754 | #: diff.c:341 | |
7aea43ff | 1755 | #, c-format |
a0b6b246 JX |
1756 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
1757 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 1758 | |
5809aa05 | 1759 | #: diff.c:401 |
7aea43ff | 1760 | #, c-format |
a0b6b246 JX |
1761 | msgid "" |
1762 | "Found errors in 'diff.dirstat' config variable:\n" | |
1763 | "%s" | |
1764 | msgstr "" | |
1765 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
1766 | "%s" | |
7aea43ff | 1767 | |
fd8cb379 | 1768 | #: diff.c:3823 |
7aea43ff | 1769 | #, c-format |
a0b6b246 JX |
1770 | msgid "external diff died, stopping at %s" |
1771 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 1772 | |
fd8cb379 | 1773 | #: diff.c:4153 |
a0b6b246 JX |
1774 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
1775 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
1776 | ||
fd8cb379 | 1777 | #: diff.c:4156 |
31e5e17b JX |
1778 | msgid "-G, -S and --find-object are mutually exclusive" |
1779 | msgstr "-G、-S 和 --find-object 是互斥的" | |
1780 | ||
fd8cb379 | 1781 | #: diff.c:4244 |
a0b6b246 JX |
1782 | msgid "--follow requires exactly one pathspec" |
1783 | msgstr "--follow 明确要求只跟一个路径规格" | |
1784 | ||
fd8cb379 | 1785 | #: diff.c:4410 |
7aea43ff | 1786 | #, c-format |
a0b6b246 JX |
1787 | msgid "" |
1788 | "Failed to parse --dirstat/-X option parameter:\n" | |
1789 | "%s" | |
1790 | msgstr "" | |
1791 | "无法解析 --dirstat/-X 选项的参数:\n" | |
1792 | "%s" | |
7aea43ff | 1793 | |
fd8cb379 | 1794 | #: diff.c:4424 |
7aea43ff | 1795 | #, c-format |
a0b6b246 JX |
1796 | msgid "Failed to parse --submodule option parameter: '%s'" |
1797 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 1798 | |
fd8cb379 | 1799 | #: diff.c:5500 |
a0b6b246 JX |
1800 | msgid "inexact rename detection was skipped due to too many files." |
1801 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
1802 | ||
fd8cb379 | 1803 | #: diff.c:5503 |
a0b6b246 JX |
1804 | msgid "only found copies from modified paths due to too many files." |
1805 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
1806 | ||
fd8cb379 | 1807 | #: diff.c:5506 |
7aea43ff | 1808 | #, c-format |
a0b6b246 JX |
1809 | msgid "" |
1810 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 1811 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 1812 | |
fd8cb379 | 1813 | #: dir.c:1867 |
31e5e17b JX |
1814 | #, c-format |
1815 | msgid "could not open directory '%s'" | |
1816 | msgstr "不能打开目录 '%s'" | |
1817 | ||
fd8cb379 | 1818 | #: dir.c:2109 |
a0b6b246 JX |
1819 | msgid "failed to get kernel name and information" |
1820 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 1821 | |
fd8cb379 | 1822 | #: dir.c:2233 |
a0b6b246 JX |
1823 | msgid "Untracked cache is disabled on this system or location." |
1824 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 1825 | |
fd8cb379 | 1826 | #: dir.c:3075 dir.c:3080 |
87cb7997 JX |
1827 | #, c-format |
1828 | msgid "could not create directories for %s" | |
1829 | msgstr "不能为 %s 创建目录" | |
1830 | ||
fd8cb379 | 1831 | #: dir.c:3109 |
1a79b2f1 JX |
1832 | #, c-format |
1833 | msgid "could not migrate git directory from '%s' to '%s'" | |
1834 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
1835 | ||
5809aa05 JX |
1836 | #: editor.c:61 |
1837 | #, c-format | |
1838 | msgid "hint: Waiting for your editor to close the file...%c" | |
1839 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
1840 | ||
1841 | #: entry.c:177 | |
6937cb4e JX |
1842 | msgid "Filtering content" |
1843 | msgstr "过滤内容" | |
1844 | ||
5809aa05 | 1845 | #: entry.c:435 |
87cb7997 JX |
1846 | #, c-format |
1847 | msgid "could not stat file '%s'" | |
65e2041e | 1848 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 1849 | |
31e5e17b JX |
1850 | #: fetch-object.c:17 |
1851 | msgid "Remote with no URL" | |
1852 | msgstr "远程未设置 URL" | |
1853 | ||
fd8cb379 | 1854 | #: fetch-pack.c:254 |
a0b6b246 JX |
1855 | msgid "git fetch-pack: expected shallow list" |
1856 | msgstr "git fetch-pack:应为 shallow 列表" | |
1857 | ||
fd8cb379 | 1858 | #: fetch-pack.c:266 |
31e5e17b JX |
1859 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
1860 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 1861 | |
fd8cb379 | 1862 | #: fetch-pack.c:285 builtin/archive.c:63 |
60638e98 JX |
1863 | #, c-format |
1864 | msgid "remote error: %s" | |
1865 | msgstr "远程错误:%s" | |
1866 | ||
fd8cb379 | 1867 | #: fetch-pack.c:286 |
90314792 | 1868 | #, c-format |
275588f9 | 1869 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 1870 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 1871 | |
fd8cb379 | 1872 | #: fetch-pack.c:338 |
a0b6b246 JX |
1873 | msgid "--stateless-rpc requires multi_ack_detailed" |
1874 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 1875 | |
fd8cb379 | 1876 | #: fetch-pack.c:429 fetch-pack.c:1310 |
90314792 | 1877 | #, c-format |
a0b6b246 JX |
1878 | msgid "invalid shallow line: %s" |
1879 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 1880 | |
fd8cb379 | 1881 | #: fetch-pack.c:435 fetch-pack.c:1316 |
c04f5ac3 | 1882 | #, c-format |
a0b6b246 JX |
1883 | msgid "invalid unshallow line: %s" |
1884 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 1885 | |
fd8cb379 | 1886 | #: fetch-pack.c:437 fetch-pack.c:1318 |
a0b6b246 JX |
1887 | #, c-format |
1888 | msgid "object not found: %s" | |
1889 | msgstr "对象未找到:%s" | |
07432cef | 1890 | |
fd8cb379 | 1891 | #: fetch-pack.c:440 fetch-pack.c:1321 |
c04f5ac3 | 1892 | #, c-format |
a0b6b246 JX |
1893 | msgid "error in object: %s" |
1894 | msgstr "对象中出错:%s" | |
07432cef | 1895 | |
fd8cb379 | 1896 | #: fetch-pack.c:442 fetch-pack.c:1323 |
c04f5ac3 | 1897 | #, c-format |
a0b6b246 JX |
1898 | msgid "no shallow found: %s" |
1899 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 1900 | |
fd8cb379 | 1901 | #: fetch-pack.c:445 fetch-pack.c:1326 |
a0b6b246 JX |
1902 | #, c-format |
1903 | msgid "expected shallow/unshallow, got %s" | |
1904 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 1905 | |
fd8cb379 | 1906 | #: fetch-pack.c:486 |
a0b6b246 JX |
1907 | #, c-format |
1908 | msgid "got %s %d %s" | |
1909 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 1910 | |
fd8cb379 | 1911 | #: fetch-pack.c:500 |
1b7f4a34 | 1912 | #, c-format |
a0b6b246 JX |
1913 | msgid "invalid commit %s" |
1914 | msgstr "无效提交 %s" | |
1b7f4a34 | 1915 | |
fd8cb379 | 1916 | #: fetch-pack.c:533 |
a0b6b246 JX |
1917 | msgid "giving up" |
1918 | msgstr "放弃" | |
814ff314 | 1919 | |
fd8cb379 | 1920 | #: fetch-pack.c:543 progress.c:229 |
a0b6b246 JX |
1921 | msgid "done" |
1922 | msgstr "完成" | |
2e8451e8 | 1923 | |
fd8cb379 | 1924 | #: fetch-pack.c:555 |
2e8451e8 | 1925 | #, c-format |
a0b6b246 JX |
1926 | msgid "got %s (%d) %s" |
1927 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 1928 | |
fd8cb379 | 1929 | #: fetch-pack.c:601 |
a0b6b246 JX |
1930 | #, c-format |
1931 | msgid "Marking %s as complete" | |
1932 | msgstr "标记 %s 为完成" | |
220c313c | 1933 | |
fd8cb379 | 1934 | #: fetch-pack.c:828 |
a0b6b246 JX |
1935 | #, c-format |
1936 | msgid "already have %s (%s)" | |
29004bbb | 1937 | msgstr "已经有 %s(%s)" |
220c313c | 1938 | |
fd8cb379 | 1939 | #: fetch-pack.c:869 |
a0b6b246 JX |
1940 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
1941 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 1942 | |
fd8cb379 | 1943 | #: fetch-pack.c:877 |
a0b6b246 JX |
1944 | msgid "protocol error: bad pack header" |
1945 | msgstr "协议错误:坏的包头" | |
814ff314 | 1946 | |
fd8cb379 | 1947 | #: fetch-pack.c:944 |
a0b6b246 JX |
1948 | #, c-format |
1949 | msgid "fetch-pack: unable to fork off %s" | |
1950 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 1951 | |
fd8cb379 | 1952 | #: fetch-pack.c:960 |
a0b6b246 JX |
1953 | #, c-format |
1954 | msgid "%s failed" | |
1955 | msgstr "%s 失败" | |
14c8bced | 1956 | |
fd8cb379 | 1957 | #: fetch-pack.c:962 |
a0b6b246 JX |
1958 | msgid "error in sideband demultiplexer" |
1959 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 1960 | |
fd8cb379 | 1961 | #: fetch-pack.c:989 |
a0b6b246 JX |
1962 | msgid "Server does not support shallow clients" |
1963 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 1964 | |
fd8cb379 | 1965 | #: fetch-pack.c:993 |
a0b6b246 JX |
1966 | msgid "Server supports multi_ack_detailed" |
1967 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 1968 | |
fd8cb379 | 1969 | #: fetch-pack.c:996 |
a0b6b246 JX |
1970 | msgid "Server supports no-done" |
1971 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 1972 | |
fd8cb379 | 1973 | #: fetch-pack.c:1002 |
a0b6b246 JX |
1974 | msgid "Server supports multi_ack" |
1975 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 1976 | |
fd8cb379 | 1977 | #: fetch-pack.c:1006 |
a0b6b246 JX |
1978 | msgid "Server supports side-band-64k" |
1979 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 1980 | |
fd8cb379 | 1981 | #: fetch-pack.c:1010 |
a0b6b246 JX |
1982 | msgid "Server supports side-band" |
1983 | msgstr "服务器支持 side-band" | |
5c57d762 | 1984 | |
fd8cb379 | 1985 | #: fetch-pack.c:1014 |
a0b6b246 JX |
1986 | msgid "Server supports allow-tip-sha1-in-want" |
1987 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 1988 | |
fd8cb379 | 1989 | #: fetch-pack.c:1018 |
a0b6b246 JX |
1990 | msgid "Server supports allow-reachable-sha1-in-want" |
1991 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 1992 | |
fd8cb379 | 1993 | #: fetch-pack.c:1028 |
a0b6b246 JX |
1994 | msgid "Server supports ofs-delta" |
1995 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 1996 | |
fd8cb379 | 1997 | #: fetch-pack.c:1034 fetch-pack.c:1204 |
31e5e17b JX |
1998 | msgid "Server supports filter" |
1999 | msgstr "服务器支持 filter" | |
2000 | ||
fd8cb379 | 2001 | #: fetch-pack.c:1042 |
81809b99 | 2002 | #, c-format |
a0b6b246 JX |
2003 | msgid "Server version is %.*s" |
2004 | msgstr "服务器版本 %.*s" | |
8ada9598 | 2005 | |
fd8cb379 | 2006 | #: fetch-pack.c:1048 |
a0b6b246 JX |
2007 | msgid "Server does not support --shallow-since" |
2008 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 2009 | |
fd8cb379 | 2010 | #: fetch-pack.c:1052 |
a0b6b246 JX |
2011 | msgid "Server does not support --shallow-exclude" |
2012 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 2013 | |
fd8cb379 | 2014 | #: fetch-pack.c:1054 |
a0b6b246 JX |
2015 | msgid "Server does not support --deepen" |
2016 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 2017 | |
fd8cb379 | 2018 | #: fetch-pack.c:1065 |
a0b6b246 JX |
2019 | msgid "no common commits" |
2020 | msgstr "没有共同的提交" | |
c04f5ac3 | 2021 | |
fd8cb379 | 2022 | #: fetch-pack.c:1077 fetch-pack.c:1414 |
a0b6b246 JX |
2023 | msgid "git fetch-pack: fetch failed." |
2024 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 2025 | |
fd8cb379 JX |
2026 | #: fetch-pack.c:1199 |
2027 | msgid "Server does not support shallow requests" | |
2028 | msgstr "服务器不支持 shalllow 请求" | |
2029 | ||
2030 | #: fetch-pack.c:1584 | |
a0b6b246 JX |
2031 | msgid "no matching remote head" |
2032 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 2033 | |
fd8cb379 | 2034 | #: fetch-pack.c:1610 |
87cb7997 JX |
2035 | #, c-format |
2036 | msgid "no such remote ref %s" | |
2037 | msgstr "没有这样的远程引用 %s" | |
2038 | ||
fd8cb379 | 2039 | #: fetch-pack.c:1613 |
87cb7997 JX |
2040 | #, c-format |
2041 | msgid "Server does not allow request for unadvertised object %s" | |
2042 | msgstr "服务器不允许请求未公开的对象 %s" | |
2043 | ||
fd8cb379 | 2044 | #: gpg-interface.c:185 |
a0b6b246 JX |
2045 | msgid "gpg failed to sign the data" |
2046 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 2047 | |
fd8cb379 | 2048 | #: gpg-interface.c:210 |
a0b6b246 JX |
2049 | msgid "could not create temporary file" |
2050 | msgstr "不能创建临时文件" | |
c04f5ac3 | 2051 | |
fd8cb379 | 2052 | #: gpg-interface.c:213 |
c04f5ac3 | 2053 | #, c-format |
a0b6b246 JX |
2054 | msgid "failed writing detached signature to '%s'" |
2055 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 2056 | |
a4f16749 | 2057 | #: graph.c:97 |
1a79b2f1 JX |
2058 | #, c-format |
2059 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
2060 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
2061 | ||
fd8cb379 | 2062 | #: grep.c:2020 |
c04f5ac3 | 2063 | #, c-format |
a0b6b246 JX |
2064 | msgid "'%s': unable to read %s" |
2065 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 2066 | |
fd8cb379 | 2067 | #: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 |
31e5e17b | 2068 | #: builtin/rm.c:134 |
c04f5ac3 | 2069 | #, c-format |
a0b6b246 | 2070 | msgid "failed to stat '%s'" |
65e2041e | 2071 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 2072 | |
fd8cb379 | 2073 | #: grep.c:2048 |
a0b6b246 JX |
2074 | #, c-format |
2075 | msgid "'%s': short read" | |
2076 | msgstr "'%s':读取不完整" | |
5c57d762 | 2077 | |
fd8cb379 JX |
2078 | #: help.c:23 |
2079 | msgid "start a working area (see also: git help tutorial)" | |
2080 | msgstr "开始一个工作区(参见:git help tutorial)" | |
2081 | ||
2082 | #: help.c:24 | |
2083 | msgid "work on the current change (see also: git help everyday)" | |
2084 | msgstr "在当前变更上工作(参见:git help everyday)" | |
2085 | ||
2086 | #: help.c:25 | |
2087 | msgid "examine the history and state (see also: git help revisions)" | |
2088 | msgstr "检查历史和状态(参见:git help revisions)" | |
2089 | ||
2090 | #: help.c:26 | |
2091 | msgid "grow, mark and tweak your common history" | |
2092 | msgstr "扩展、标记和调校您的历史记录" | |
2093 | ||
2094 | #: help.c:27 | |
2095 | msgid "collaborate (see also: git help workflows)" | |
2096 | msgstr "协同(参见:git help workflows)" | |
2097 | ||
2098 | #: help.c:31 | |
2099 | msgid "Main Porcelain Commands" | |
2100 | msgstr "主要的上层命令" | |
2101 | ||
2102 | #: help.c:32 | |
2103 | msgid "Ancillary Commands / Manipulators" | |
2104 | msgstr "辅助命令/操作者" | |
2105 | ||
2106 | #: help.c:33 | |
2107 | msgid "Ancillary Commands / Interrogators" | |
2108 | msgstr "辅助命令/询问者" | |
2109 | ||
2110 | #: help.c:34 | |
2111 | msgid "Interacting with Others" | |
2112 | msgstr "与其它系统交互" | |
2113 | ||
2114 | #: help.c:35 | |
2115 | msgid "Low-level Commands / Manipulators" | |
2116 | msgstr "低级命令/操作者" | |
2117 | ||
2118 | #: help.c:36 | |
2119 | msgid "Low-level Commands / Interrogators" | |
2120 | msgstr "低级命令/询问者" | |
2121 | ||
2122 | #: help.c:37 | |
2123 | msgid "Low-level Commands / Synching Repositories" | |
2124 | msgstr "低级命令/同步仓库" | |
2125 | ||
2126 | #: help.c:38 | |
2127 | msgid "Low-level Commands / Internal Helpers" | |
2128 | msgstr "低级命令/内部助手" | |
2129 | ||
2130 | #: help.c:293 | |
a0b6b246 JX |
2131 | #, c-format |
2132 | msgid "available git commands in '%s'" | |
2133 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 2134 | |
fd8cb379 | 2135 | #: help.c:300 |
a0b6b246 JX |
2136 | msgid "git commands available from elsewhere on your $PATH" |
2137 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 2138 | |
fd8cb379 | 2139 | #: help.c:309 |
a0b6b246 JX |
2140 | msgid "These are common Git commands used in various situations:" |
2141 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 2142 | |
fd8cb379 JX |
2143 | #: help.c:358 git.c:90 |
2144 | #, c-format | |
2145 | msgid "unsupported command listing type '%s'" | |
2146 | msgstr "不支持的命令列表类型 '%s'" | |
2147 | ||
2148 | #: help.c:405 | |
2149 | msgid "The common Git guides are:" | |
2150 | msgstr "最常用的 Git 向导有:" | |
2151 | ||
2152 | #: help.c:467 | |
c04f5ac3 | 2153 | #, c-format |
a0b6b246 JX |
2154 | msgid "" |
2155 | "'%s' appears to be a git command, but we were not\n" | |
2156 | "able to execute it. Maybe git-%s is broken?" | |
2157 | msgstr "" | |
2158 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
2159 | "可能是 git-%s 受损?" | |
c04f5ac3 | 2160 | |
fd8cb379 | 2161 | #: help.c:526 |
a0b6b246 JX |
2162 | msgid "Uh oh. Your system reports no Git commands at all." |
2163 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 2164 | |
fd8cb379 | 2165 | #: help.c:548 |
c04f5ac3 | 2166 | #, c-format |
a4f16749 | 2167 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 2168 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 2169 | |
fd8cb379 | 2170 | #: help.c:553 |
a4f16749 JX |
2171 | #, c-format |
2172 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 2173 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 2174 | |
fd8cb379 | 2175 | #: help.c:558 |
c04f5ac3 | 2176 | #, c-format |
a4f16749 | 2177 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 2178 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 2179 | |
fd8cb379 | 2180 | #: help.c:566 |
c04f5ac3 | 2181 | #, c-format |
a0b6b246 JX |
2182 | msgid "git: '%s' is not a git command. See 'git --help'." |
2183 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 2184 | |
fd8cb379 | 2185 | #: help.c:570 |
a4f16749 JX |
2186 | msgid "" |
2187 | "\n" | |
2188 | "The most similar command is" | |
2189 | msgid_plural "" | |
2190 | "\n" | |
2191 | "The most similar commands are" | |
6937cb4e JX |
2192 | msgstr[0] "" |
2193 | "\n" | |
2194 | "最相似的命令是" | |
2195 | msgstr[1] "" | |
2196 | "\n" | |
2197 | "最相似的命令是" | |
a4f16749 | 2198 | |
fd8cb379 | 2199 | #: help.c:585 |
a4f16749 JX |
2200 | msgid "git version [<options>]" |
2201 | msgstr "git version [<选项>]" | |
2202 | ||
fd8cb379 | 2203 | #: help.c:652 |
a4f16749 JX |
2204 | #, c-format |
2205 | msgid "%s: %s - %s" | |
2206 | msgstr "%s:%s - %s" | |
2207 | ||
fd8cb379 | 2208 | #: help.c:656 |
a0b6b246 JX |
2209 | msgid "" |
2210 | "\n" | |
2211 | "Did you mean this?" | |
2212 | msgid_plural "" | |
2213 | "\n" | |
2214 | "Did you mean one of these?" | |
2215 | msgstr[0] "" | |
2216 | "\n" | |
2217 | "您指的是这个么?" | |
2218 | msgstr[1] "" | |
2219 | "\n" | |
2220 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 2221 | |
a4f16749 | 2222 | #: ident.c:342 |
a0b6b246 JX |
2223 | msgid "" |
2224 | "\n" | |
2225 | "*** Please tell me who you are.\n" | |
2226 | "\n" | |
2227 | "Run\n" | |
2228 | "\n" | |
2229 | " git config --global user.email \"you@example.com\"\n" | |
2230 | " git config --global user.name \"Your Name\"\n" | |
2231 | "\n" | |
2232 | "to set your account's default identity.\n" | |
2233 | "Omit --global to set the identity only in this repository.\n" | |
2234 | "\n" | |
2235 | msgstr "" | |
2236 | "\n" | |
2237 | "*** 请告诉我你是谁。\n" | |
2238 | "\n" | |
2239 | "运行\n" | |
2240 | "\n" | |
2241 | " git config --global user.email \"you@example.com\"\n" | |
2242 | " git config --global user.name \"Your Name\"\n" | |
2243 | "\n" | |
2244 | "来设置您账号的缺省身份标识。\n" | |
2245 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 2246 | |
a4f16749 | 2247 | #: ident.c:366 |
87cb7997 | 2248 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 2249 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 2250 | |
a4f16749 | 2251 | #: ident.c:371 |
87cb7997 JX |
2252 | #, c-format |
2253 | msgid "unable to auto-detect email address (got '%s')" | |
2254 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
2255 | ||
a4f16749 | 2256 | #: ident.c:381 |
87cb7997 JX |
2257 | msgid "no name was given and auto-detection is disabled" |
2258 | msgstr "未提供姓名且自动探测被禁用" | |
2259 | ||
a4f16749 | 2260 | #: ident.c:387 |
87cb7997 JX |
2261 | #, c-format |
2262 | msgid "unable to auto-detect name (got '%s')" | |
2263 | msgstr "无法自动探测姓名(得到 '%s')" | |
2264 | ||
a4f16749 | 2265 | #: ident.c:395 |
87cb7997 JX |
2266 | #, c-format |
2267 | msgid "empty ident name (for <%s>) not allowed" | |
2268 | msgstr "不允许空的姓名(对于 <%s>)" | |
2269 | ||
a4f16749 | 2270 | #: ident.c:401 |
87cb7997 JX |
2271 | #, c-format |
2272 | msgid "name consists only of disallowed characters: %s" | |
2273 | msgstr "姓名中仅包含禁用字符:%s" | |
2274 | ||
fd8cb379 | 2275 | #: ident.c:416 builtin/commit.c:587 |
87cb7997 JX |
2276 | #, c-format |
2277 | msgid "invalid date format: %s" | |
2278 | msgstr "无效的日期格式:%s" | |
2279 | ||
31e5e17b JX |
2280 | #: list-objects-filter-options.c:36 |
2281 | msgid "multiple filter-specs cannot be combined" | |
2282 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 2283 | |
31e5e17b JX |
2284 | #: list-objects-filter-options.c:126 |
2285 | msgid "cannot change partial clone promisor remote" | |
2286 | msgstr "无法修改部分克隆的 promisor 远程仓库" | |
5809aa05 | 2287 | |
6937cb4e | 2288 | #: lockfile.c:151 |
c04f5ac3 | 2289 | #, c-format |
a0b6b246 JX |
2290 | msgid "" |
2291 | "Unable to create '%s.lock': %s.\n" | |
2292 | "\n" | |
2293 | "Another git process seems to be running in this repository, e.g.\n" | |
2294 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2295 | "are terminated then try again. If it still fails, a git process\n" | |
2296 | "may have crashed in this repository earlier:\n" | |
2297 | "remove the file manually to continue." | |
2298 | msgstr "" | |
2299 | "无法创建 '%s.lock':%s。\n" | |
2300 | "\n" | |
2301 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
2302 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
2303 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
2304 | "手动删除这个文件再继续。" | |
c04f5ac3 | 2305 | |
6937cb4e | 2306 | #: lockfile.c:159 |
a0b6b246 JX |
2307 | #, c-format |
2308 | msgid "Unable to create '%s.lock': %s" | |
2309 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 2310 | |
fd8cb379 | 2311 | #: merge.c:71 |
a0b6b246 JX |
2312 | msgid "failed to read the cache" |
2313 | msgstr "无法读取缓存" | |
c04f5ac3 | 2314 | |
fd8cb379 JX |
2315 | #: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 |
2316 | #: builtin/checkout.c:606 builtin/clone.c:761 | |
a0b6b246 JX |
2317 | msgid "unable to write new index file" |
2318 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 2319 | |
fd8cb379 | 2320 | #: merge-recursive.c:298 |
a0b6b246 JX |
2321 | msgid "(bad commit)\n" |
2322 | msgstr "(坏提交)\n" | |
c04f5ac3 | 2323 | |
fd8cb379 | 2324 | #: merge-recursive.c:320 |
a0b6b246 | 2325 | #, c-format |
fd8cb379 | 2326 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 2327 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 2328 | |
fd8cb379 JX |
2329 | #: merge-recursive.c:328 |
2330 | #, c-format | |
2331 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 2332 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 JX |
2333 | |
2334 | #: merge-recursive.c:410 | |
a0b6b246 JX |
2335 | msgid "error building trees" |
2336 | msgstr "无法创建树" | |
c04f5ac3 | 2337 | |
fd8cb379 | 2338 | #: merge-recursive.c:881 |
c04f5ac3 | 2339 | #, c-format |
a0b6b246 JX |
2340 | msgid "failed to create path '%s'%s" |
2341 | msgstr "无法创建路径 '%s'%s" | |
c04f5ac3 | 2342 | |
fd8cb379 | 2343 | #: merge-recursive.c:892 |
c04f5ac3 | 2344 | #, c-format |
a0b6b246 JX |
2345 | msgid "Removing %s to make room for subdirectory\n" |
2346 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 2347 | |
fd8cb379 | 2348 | #: merge-recursive.c:906 merge-recursive.c:925 |
a0b6b246 JX |
2349 | msgid ": perhaps a D/F conflict?" |
2350 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 2351 | |
fd8cb379 | 2352 | #: merge-recursive.c:915 |
c04f5ac3 | 2353 | #, c-format |
a0b6b246 JX |
2354 | msgid "refusing to lose untracked file at '%s'" |
2355 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2356 | |
fd8cb379 | 2357 | #: merge-recursive.c:957 builtin/cat-file.c:37 |
c04f5ac3 | 2358 | #, c-format |
a0b6b246 JX |
2359 | msgid "cannot read object %s '%s'" |
2360 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2361 | |
fd8cb379 | 2362 | #: merge-recursive.c:959 |
4dcdc3d8 | 2363 | #, c-format |
a0b6b246 JX |
2364 | msgid "blob expected for %s '%s'" |
2365 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 2366 | |
fd8cb379 | 2367 | #: merge-recursive.c:983 |
4dcdc3d8 | 2368 | #, c-format |
a0b6b246 JX |
2369 | msgid "failed to open '%s': %s" |
2370 | msgstr "无法打开 '%s':%s" | |
4dcdc3d8 | 2371 | |
fd8cb379 | 2372 | #: merge-recursive.c:994 |
a0b6b246 JX |
2373 | #, c-format |
2374 | msgid "failed to symlink '%s': %s" | |
2375 | msgstr "无法创建符号链接 '%s':%s" | |
c04f5ac3 | 2376 | |
fd8cb379 | 2377 | #: merge-recursive.c:999 |
5c57d762 | 2378 | #, c-format |
a0b6b246 JX |
2379 | msgid "do not know what to do with %06o %s '%s'" |
2380 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 2381 | |
fd8cb379 JX |
2382 | #: merge-recursive.c:1186 |
2383 | #, c-format | |
2384 | msgid "Failed to merge submodule %s (not checked out)" | |
2385 | msgstr "无法合并子模组 %s (没有检出)" | |
2386 | ||
2387 | #: merge-recursive.c:1193 | |
2388 | #, c-format | |
2389 | msgid "Failed to merge submodule %s (commits not present)" | |
2390 | msgstr "无法合并子模组 %s(提交不存在)" | |
2391 | ||
2392 | #: merge-recursive.c:1200 | |
2393 | #, c-format | |
2394 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
2395 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
2396 | ||
2397 | #: merge-recursive.c:1208 merge-recursive.c:1220 | |
2398 | #, c-format | |
2399 | msgid "Fast-forwarding submodule %s to the following commit:" | |
2400 | msgstr "子模组 %s 快进到如下提交:" | |
2401 | ||
2402 | #: merge-recursive.c:1211 merge-recursive.c:1223 | |
2403 | #, c-format | |
2404 | msgid "Fast-forwarding submodule %s" | |
2405 | msgstr "快进子模组 %s" | |
2406 | ||
2407 | #: merge-recursive.c:1245 | |
2408 | #, c-format | |
2409 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
2410 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
2411 | ||
2412 | #: merge-recursive.c:1249 | |
2413 | #, c-format | |
2414 | msgid "Failed to merge submodule %s (not fast-forward)" | |
2415 | msgstr "无法合并子模组 %s(非快进)" | |
2416 | ||
2417 | #: merge-recursive.c:1250 | |
2418 | msgid "Found a possible merge resolution for the submodule:\n" | |
2419 | msgstr "找到子模组的一个可能的合并方案:\n" | |
2420 | ||
2421 | #: merge-recursive.c:1253 | |
2422 | #, c-format | |
2423 | msgid "" | |
2424 | "If this is correct simply add it to the index for example\n" | |
2425 | "by using:\n" | |
2426 | "\n" | |
2427 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
2428 | "\n" | |
2429 | "which will accept this suggestion.\n" | |
2430 | msgstr "" | |
2431 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
2432 | "\n" | |
2433 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
2434 | "\n" | |
2435 | "以接受此建议。\n" | |
2436 | ||
2437 | #: merge-recursive.c:1262 | |
2438 | #, c-format | |
2439 | msgid "Failed to merge submodule %s (multiple merges found)" | |
2440 | msgstr "无法合并子模组 %s (发现多个合并)" | |
2441 | ||
2442 | #: merge-recursive.c:1321 | |
a0b6b246 JX |
2443 | msgid "Failed to execute internal merge" |
2444 | msgstr "无法执行内部合并" | |
2445 | ||
fd8cb379 | 2446 | #: merge-recursive.c:1326 |
5c57d762 | 2447 | #, c-format |
a0b6b246 JX |
2448 | msgid "Unable to add %s to database" |
2449 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 2450 | |
fd8cb379 JX |
2451 | #: merge-recursive.c:1358 |
2452 | #, c-format | |
2453 | msgid "Auto-merging %s" | |
2454 | msgstr "自动合并 %s" | |
2455 | ||
2456 | #: merge-recursive.c:1423 | |
2457 | #, c-format | |
2458 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
2459 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
2460 | ||
2461 | #: merge-recursive.c:1475 | |
5c57d762 JX |
2462 | #, c-format |
2463 | msgid "" | |
a0b6b246 JX |
2464 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
2465 | "in tree." | |
5c57d762 | 2466 | msgstr "" |
87cb7997 JX |
2467 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2468 | "本被保留。" | |
2469 | ||
fd8cb379 | 2470 | #: merge-recursive.c:1480 |
87cb7997 JX |
2471 | #, c-format |
2472 | msgid "" | |
2473 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2474 | "left in tree." | |
2475 | msgstr "" | |
2476 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2477 | "%7$s 版本被保留。" | |
c04f5ac3 | 2478 | |
fd8cb379 | 2479 | #: merge-recursive.c:1487 |
7aea43ff | 2480 | #, c-format |
a0b6b246 JX |
2481 | msgid "" |
2482 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
2483 | "in tree at %s." | |
2484 | msgstr "" | |
87cb7997 JX |
2485 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
2486 | "本保留在 %8$s 中。" | |
7aea43ff | 2487 | |
fd8cb379 | 2488 | #: merge-recursive.c:1492 |
87cb7997 JX |
2489 | #, c-format |
2490 | msgid "" | |
2491 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
2492 | "left in tree at %s." | |
2493 | msgstr "" | |
2494 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
2495 | "%7$s 版本保留在 %9$s 中。" | |
2496 | ||
fd8cb379 | 2497 | #: merge-recursive.c:1526 |
a0b6b246 JX |
2498 | msgid "rename" |
2499 | msgstr "重命名" | |
5b04ee3b | 2500 | |
fd8cb379 | 2501 | #: merge-recursive.c:1526 |
a0b6b246 JX |
2502 | msgid "renamed" |
2503 | msgstr "重命名" | |
5b04ee3b | 2504 | |
fd8cb379 JX |
2505 | #: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 |
2506 | #: merge-recursive.c:3086 | |
2507 | #, c-format | |
2508 | msgid "Refusing to lose dirty file at %s" | |
2509 | msgstr "拒绝丢失脏文件 '%s'" | |
2510 | ||
2511 | #: merge-recursive.c:1594 | |
5c57d762 | 2512 | #, c-format |
a0b6b246 JX |
2513 | msgid "%s is a directory in %s adding as %s instead" |
2514 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 2515 | |
fd8cb379 JX |
2516 | #: merge-recursive.c:1599 |
2517 | #, c-format | |
2518 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
2519 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
2520 | ||
2521 | #: merge-recursive.c:1625 | |
5c57d762 JX |
2522 | #, c-format |
2523 | msgid "" | |
a0b6b246 JX |
2524 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
2525 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 2526 | msgstr "" |
a0b6b246 JX |
2527 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
2528 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 2529 | |
fd8cb379 | 2530 | #: merge-recursive.c:1630 |
a0b6b246 JX |
2531 | msgid " (left unresolved)" |
2532 | msgstr "(留下未解决)" | |
5c57d762 | 2533 | |
fd8cb379 | 2534 | #: merge-recursive.c:1694 |
5c57d762 | 2535 | #, c-format |
a0b6b246 | 2536 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 2537 | msgstr "" |
a0b6b246 JX |
2538 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
2539 | "%5$s" | |
3495628d | 2540 | |
fd8cb379 | 2541 | #: merge-recursive.c:1733 |
3495628d | 2542 | #, c-format |
a0b6b246 | 2543 | msgid "Renaming %s to %s and %s to %s instead" |
0fcd668f | 2544 | msgstr "代之以重命名 %s 至 %s,以及 %s 至 %s" |
3495628d | 2545 | |
fd8cb379 JX |
2546 | #: merge-recursive.c:1745 |
2547 | #, c-format | |
2548 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
0fcd668f | 2549 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" |
fd8cb379 JX |
2550 | |
2551 | #: merge-recursive.c:1951 | |
2552 | #, c-format | |
2553 | msgid "" | |
2554 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
2555 | "directory %s was renamed to multiple other directories, with no destination " | |
2556 | "getting a majority of the files." | |
0fcd668f | 2557 | msgstr "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个其它目录,没有目录包含大部分文件。" |
fd8cb379 JX |
2558 | |
2559 | #: merge-recursive.c:1983 | |
2560 | #, c-format | |
2561 | msgid "" | |
2562 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
2563 | "implicit directory rename(s) putting the following path(s) there: %s." | |
2564 | msgstr "" | |
2565 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
2566 | "在:%s。" | |
2567 | ||
2568 | #: merge-recursive.c:1993 | |
2569 | #, c-format | |
2570 | msgid "" | |
2571 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
2572 | "implicit directory renames tried to put these paths there: %s" | |
2573 | msgstr "" | |
2574 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
2575 | "径放置于此:%s" | |
2576 | ||
2577 | #: merge-recursive.c:2085 | |
2578 | #, c-format | |
2579 | msgid "" | |
2580 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
2581 | ">%s in %s" | |
2582 | msgstr "" | |
2583 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
2584 | "%4$s->%5$s" | |
2585 | ||
2586 | #: merge-recursive.c:2330 | |
2587 | #, c-format | |
2588 | msgid "" | |
2589 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
2590 | "renamed." | |
2591 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
2592 | ||
2593 | #: merge-recursive.c:2736 | |
3495628d | 2594 | #, c-format |
a0b6b246 JX |
2595 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
2596 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 2597 | |
fd8cb379 | 2598 | #: merge-recursive.c:2751 |
a0b6b246 JX |
2599 | #, c-format |
2600 | msgid "Adding merged %s" | |
2601 | msgstr "添加合并后的 %s" | |
90314792 | 2602 | |
fd8cb379 | 2603 | #: merge-recursive.c:2758 merge-recursive.c:3089 |
90314792 | 2604 | #, c-format |
a0b6b246 JX |
2605 | msgid "Adding as %s instead" |
2606 | msgstr "而是以 %s 为名添加" | |
90314792 | 2607 | |
fd8cb379 | 2608 | #: merge-recursive.c:2914 |
90314792 | 2609 | #, c-format |
a0b6b246 JX |
2610 | msgid "cannot read object %s" |
2611 | msgstr "不能读取对象 %s" | |
90314792 | 2612 | |
fd8cb379 | 2613 | #: merge-recursive.c:2917 |
90314792 | 2614 | #, c-format |
a0b6b246 JX |
2615 | msgid "object %s is not a blob" |
2616 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 2617 | |
fd8cb379 | 2618 | #: merge-recursive.c:2986 |
a0b6b246 JX |
2619 | msgid "modify" |
2620 | msgstr "修改" | |
90314792 | 2621 | |
fd8cb379 | 2622 | #: merge-recursive.c:2986 |
a0b6b246 JX |
2623 | msgid "modified" |
2624 | msgstr "修改" | |
5b04ee3b | 2625 | |
fd8cb379 | 2626 | #: merge-recursive.c:2997 |
a0b6b246 JX |
2627 | msgid "content" |
2628 | msgstr "内容" | |
5b04ee3b | 2629 | |
fd8cb379 | 2630 | #: merge-recursive.c:3004 |
a0b6b246 JX |
2631 | msgid "add/add" |
2632 | msgstr "添加/添加" | |
3495628d | 2633 | |
fd8cb379 | 2634 | #: merge-recursive.c:3046 |
220c313c | 2635 | #, c-format |
a0b6b246 JX |
2636 | msgid "Skipped %s (merged same as existing)" |
2637 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 2638 | |
fd8cb379 | 2639 | #: merge-recursive.c:3055 git-submodule.sh:895 |
a0b6b246 JX |
2640 | msgid "submodule" |
2641 | msgstr "子模组" | |
2642 | ||
fd8cb379 | 2643 | #: merge-recursive.c:3056 |
220c313c | 2644 | #, c-format |
a0b6b246 JX |
2645 | msgid "CONFLICT (%s): Merge conflict in %s" |
2646 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 2647 | |
fd8cb379 | 2648 | #: merge-recursive.c:3178 |
220c313c | 2649 | #, c-format |
a0b6b246 JX |
2650 | msgid "Removing %s" |
2651 | msgstr "删除 %s" | |
220c313c | 2652 | |
fd8cb379 | 2653 | #: merge-recursive.c:3204 |
a0b6b246 JX |
2654 | msgid "file/directory" |
2655 | msgstr "文件/目录" | |
220c313c | 2656 | |
fd8cb379 | 2657 | #: merge-recursive.c:3210 |
a0b6b246 JX |
2658 | msgid "directory/file" |
2659 | msgstr "目录/文件" | |
276ceeaa | 2660 | |
fd8cb379 | 2661 | #: merge-recursive.c:3217 |
276ceeaa | 2662 | #, c-format |
a0b6b246 JX |
2663 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
2664 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 2665 | |
fd8cb379 | 2666 | #: merge-recursive.c:3226 |
276ceeaa | 2667 | #, c-format |
a0b6b246 JX |
2668 | msgid "Adding %s" |
2669 | msgstr "添加 %s" | |
276ceeaa | 2670 | |
fd8cb379 | 2671 | #: merge-recursive.c:3267 |
5809aa05 JX |
2672 | #, c-format |
2673 | msgid "Dirty index: cannot merge (dirty: %s)" | |
2674 | msgstr "脏索引:不能合并(脏文件:%s)" | |
2675 | ||
fd8cb379 | 2676 | #: merge-recursive.c:3271 |
6937cb4e | 2677 | msgid "Already up to date!" |
a0b6b246 | 2678 | msgstr "已经是最新的!" |
276ceeaa | 2679 | |
fd8cb379 | 2680 | #: merge-recursive.c:3280 |
276ceeaa | 2681 | #, c-format |
a0b6b246 JX |
2682 | msgid "merging of trees %s and %s failed" |
2683 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 2684 | |
fd8cb379 | 2685 | #: merge-recursive.c:3379 |
a0b6b246 JX |
2686 | msgid "Merging:" |
2687 | msgstr "合并:" | |
5c57d762 | 2688 | |
fd8cb379 | 2689 | #: merge-recursive.c:3392 |
5c57d762 | 2690 | #, c-format |
a0b6b246 JX |
2691 | msgid "found %u common ancestor:" |
2692 | msgid_plural "found %u common ancestors:" | |
2693 | msgstr[0] "发现 %u 个共同祖先:" | |
2694 | msgstr[1] "发现 %u 个共同祖先:" | |
2695 | ||
fd8cb379 | 2696 | #: merge-recursive.c:3431 |
a0b6b246 JX |
2697 | msgid "merge returned no commit" |
2698 | msgstr "合并未返回提交" | |
2699 | ||
fd8cb379 | 2700 | #: merge-recursive.c:3495 |
5c57d762 | 2701 | #, c-format |
a0b6b246 JX |
2702 | msgid "Could not parse object '%s'" |
2703 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 2704 | |
fd8cb379 | 2705 | #: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816 |
a0b6b246 JX |
2706 | msgid "Unable to write index." |
2707 | msgstr "不能写入索引。" | |
2708 | ||
6937cb4e | 2709 | #: notes-merge.c:272 |
5c57d762 JX |
2710 | #, c-format |
2711 | msgid "" | |
a0b6b246 JX |
2712 | "You have not concluded your previous notes merge (%s exists).\n" |
2713 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
2714 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 2715 | msgstr "" |
29004bbb | 2716 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
2717 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
2718 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 2719 | |
6937cb4e | 2720 | #: notes-merge.c:279 |
a0b6b246 JX |
2721 | #, c-format |
2722 | msgid "You have not concluded your notes merge (%s exists)." | |
2723 | msgstr "您尚未结束注释合并(存在 %s)。" | |
2724 | ||
31e5e17b | 2725 | #: notes-utils.c:43 |
a0b6b246 JX |
2726 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
2727 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 2728 | |
31e5e17b | 2729 | #: notes-utils.c:102 |
1b7f4a34 | 2730 | #, c-format |
a0b6b246 JX |
2731 | msgid "Bad notes.rewriteMode value: '%s'" |
2732 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 2733 | |
31e5e17b | 2734 | #: notes-utils.c:112 |
5b04ee3b | 2735 | #, c-format |
a0b6b246 JX |
2736 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
2737 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 2738 | |
a4f16749 JX |
2739 | #. TRANSLATORS: The first %s is the name of |
2740 | #. the environment variable, the second %s is | |
2741 | #. its value. | |
2742 | #. | |
31e5e17b | 2743 | #: notes-utils.c:142 |
5b04ee3b | 2744 | #, c-format |
a0b6b246 JX |
2745 | msgid "Bad %s value: '%s'" |
2746 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 2747 | |
fd8cb379 | 2748 | #: object.c:242 |
5b04ee3b | 2749 | #, c-format |
a0b6b246 JX |
2750 | msgid "unable to parse object: %s" |
2751 | msgstr "不能解析对象:%s" | |
5b04ee3b | 2752 | |
fd8cb379 | 2753 | #: packfile.c:563 |
6937cb4e JX |
2754 | msgid "offset before end of packfile (broken .idx?)" |
2755 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
2756 | ||
fd8cb379 | 2757 | #: packfile.c:1742 |
6937cb4e JX |
2758 | #, c-format |
2759 | msgid "offset before start of pack index for %s (corrupt index?)" | |
2760 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
2761 | ||
fd8cb379 | 2762 | #: packfile.c:1746 |
6937cb4e JX |
2763 | #, c-format |
2764 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
2765 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
2766 | ||
fd8cb379 | 2767 | #: parse-options.c:621 |
a0b6b246 JX |
2768 | msgid "..." |
2769 | msgstr "..." | |
2770 | ||
fd8cb379 | 2771 | #: parse-options.c:640 |
5b04ee3b | 2772 | #, c-format |
a0b6b246 JX |
2773 | msgid "usage: %s" |
2774 | msgstr "用法:%s" | |
5b04ee3b | 2775 | |
a0b6b246 | 2776 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
2777 | #. one in "usage: %s" translation. |
2778 | #. | |
fd8cb379 | 2779 | #: parse-options.c:646 |
5b04ee3b | 2780 | #, c-format |
a0b6b246 JX |
2781 | msgid " or: %s" |
2782 | msgstr " 或:%s" | |
5b04ee3b | 2783 | |
a0b6b246 | 2784 | # 译者:为保证在输出中对齐,注意调整句中空格! |
fd8cb379 | 2785 | #: parse-options.c:649 |
5b04ee3b | 2786 | #, c-format |
a0b6b246 JX |
2787 | msgid " %s" |
2788 | msgstr " %s" | |
5b04ee3b | 2789 | |
fd8cb379 | 2790 | #: parse-options.c:688 |
a0b6b246 JX |
2791 | msgid "-NUM" |
2792 | msgstr "-数字" | |
2793 | ||
fd8cb379 JX |
2794 | #: parse-options-cb.c:44 |
2795 | #, c-format | |
2796 | msgid "malformed expiration date '%s'" | |
2797 | msgstr "格式错误的到期时间:'%s'" | |
2798 | ||
2799 | #: parse-options-cb.c:112 | |
5b04ee3b | 2800 | #, c-format |
a0b6b246 | 2801 | msgid "malformed object name '%s'" |
fd8cb379 | 2802 | msgstr "格式错误的对象名 '%s'" |
5b04ee3b | 2803 | |
fd8cb379 | 2804 | #: path.c:892 |
5b04ee3b | 2805 | #, c-format |
a0b6b246 JX |
2806 | msgid "Could not make %s writable by group" |
2807 | msgstr "不能设置 %s 为组可写" | |
2808 | ||
a4f16749 | 2809 | #: pathspec.c:129 |
87cb7997 JX |
2810 | msgid "Escape character '\\' not allowed as last character in attr value" |
2811 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
2812 | ||
a4f16749 | 2813 | #: pathspec.c:147 |
87cb7997 JX |
2814 | msgid "Only one 'attr:' specification is allowed." |
2815 | msgstr "只允许一个 'attr:' 规格。" | |
2816 | ||
a4f16749 | 2817 | #: pathspec.c:150 |
87cb7997 JX |
2818 | msgid "attr spec must not be empty" |
2819 | msgstr "属性规格不能为空" | |
2820 | ||
a4f16749 | 2821 | #: pathspec.c:193 |
87cb7997 JX |
2822 | #, c-format |
2823 | msgid "invalid attribute name %s" | |
2824 | msgstr "无效的属性名 %s" | |
2825 | ||
a4f16749 | 2826 | #: pathspec.c:258 |
a0b6b246 JX |
2827 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
2828 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
2829 | ||
a4f16749 | 2830 | #: pathspec.c:265 |
5b04ee3b | 2831 | msgid "" |
a0b6b246 JX |
2832 | "global 'literal' pathspec setting is incompatible with all other global " |
2833 | "pathspec settings" | |
2834 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 2835 | |
a4f16749 | 2836 | #: pathspec.c:305 |
a0b6b246 JX |
2837 | msgid "invalid parameter for pathspec magic 'prefix'" |
2838 | msgstr "路径规格包含无效的神奇前缀" | |
2839 | ||
a4f16749 | 2840 | #: pathspec.c:326 |
5b04ee3b | 2841 | #, c-format |
a0b6b246 JX |
2842 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
2843 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 2844 | |
a4f16749 | 2845 | #: pathspec.c:331 |
5b04ee3b | 2846 | #, c-format |
a0b6b246 JX |
2847 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
2848 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 2849 | |
a4f16749 | 2850 | #: pathspec.c:369 |
5b04ee3b | 2851 | #, c-format |
a0b6b246 JX |
2852 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
2853 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 2854 | |
a4f16749 | 2855 | #: pathspec.c:428 |
5b04ee3b | 2856 | #, c-format |
a0b6b246 JX |
2857 | msgid "%s: 'literal' and 'glob' are incompatible" |
2858 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 2859 | |
a4f16749 | 2860 | #: pathspec.c:441 |
5b04ee3b | 2861 | #, c-format |
a0b6b246 JX |
2862 | msgid "%s: '%s' is outside repository" |
2863 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 2864 | |
a4f16749 | 2865 | #: pathspec.c:515 |
5b04ee3b | 2866 | #, c-format |
1a79b2f1 JX |
2867 | msgid "'%s' (mnemonic: '%c')" |
2868 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 2869 | |
a4f16749 | 2870 | #: pathspec.c:525 |
5b04ee3b | 2871 | #, c-format |
a0b6b246 JX |
2872 | msgid "%s: pathspec magic not supported by this command: %s" |
2873 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
2874 | ||
5809aa05 | 2875 | #: pathspec.c:592 |
5b04ee3b | 2876 | #, c-format |
a0b6b246 JX |
2877 | msgid "pathspec '%s' is beyond a symbolic link" |
2878 | msgstr "路径规格 '%s' 位于符号链接中" | |
2879 | ||
6937cb4e | 2880 | #: pretty.c:962 |
a0b6b246 JX |
2881 | msgid "unable to parse --pretty format" |
2882 | msgstr "不能解析 --pretty 格式" | |
2883 | ||
fd8cb379 | 2884 | #: read-cache.c:1500 |
5b04ee3b JX |
2885 | #, c-format |
2886 | msgid "" | |
a0b6b246 JX |
2887 | "index.version set, but the value is invalid.\n" |
2888 | "Using version %i" | |
5b04ee3b | 2889 | msgstr "" |
a0b6b246 JX |
2890 | "设置了 index.version,但是取值无效。\n" |
2891 | "使用版本 %i" | |
5b04ee3b | 2892 | |
fd8cb379 | 2893 | #: read-cache.c:1510 |
5b04ee3b JX |
2894 | #, c-format |
2895 | msgid "" | |
a0b6b246 JX |
2896 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
2897 | "Using version %i" | |
5b04ee3b | 2898 | msgstr "" |
a0b6b246 JX |
2899 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
2900 | "使用版本 %i" | |
5b04ee3b | 2901 | |
fd8cb379 | 2902 | #: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048 |
a4f16749 JX |
2903 | #, c-format |
2904 | msgid "could not close '%s'" | |
2905 | msgstr "不能关闭 '%s'" | |
2906 | ||
fd8cb379 | 2907 | #: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234 |
87cb7997 | 2908 | #, c-format |
60638e98 | 2909 | msgid "could not stat '%s'" |
65e2041e | 2910 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 2911 | |
fd8cb379 | 2912 | #: read-cache.c:2490 |
87cb7997 JX |
2913 | #, c-format |
2914 | msgid "unable to open git dir: %s" | |
2915 | msgstr "不能打开 git 目录:%s" | |
2916 | ||
fd8cb379 | 2917 | #: read-cache.c:2502 |
87cb7997 JX |
2918 | #, c-format |
2919 | msgid "unable to unlink: %s" | |
2920 | msgstr "无法删除:%s" | |
2921 | ||
fd8cb379 JX |
2922 | #: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395 |
2923 | #: builtin/am.c:779 | |
5b04ee3b | 2924 | #, c-format |
fd8cb379 | 2925 | msgid "could not open '%s' for writing" |
a0b6b246 | 2926 | msgstr "无法打开 '%s' 进行写入" |
5b04ee3b | 2927 | |
fd8cb379 | 2928 | #: refs.c:1880 |
60638e98 JX |
2929 | msgid "ref updates forbidden inside quarantine environment" |
2930 | msgstr "在隔离环境中禁止更新引用" | |
2931 | ||
fd8cb379 | 2932 | #: refs/files-backend.c:1191 |
6937cb4e JX |
2933 | #, c-format |
2934 | msgid "could not remove reference %s" | |
2935 | msgstr "无法删除引用 %s" | |
2936 | ||
fd8cb379 JX |
2937 | #: refs/files-backend.c:1205 refs/packed-backend.c:1531 |
2938 | #: refs/packed-backend.c:1541 | |
5b04ee3b | 2939 | #, c-format |
a0b6b246 JX |
2940 | msgid "could not delete reference %s: %s" |
2941 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 2942 | |
fd8cb379 | 2943 | #: refs/files-backend.c:1208 refs/packed-backend.c:1544 |
5b04ee3b | 2944 | #, c-format |
a0b6b246 JX |
2945 | msgid "could not delete references: %s" |
2946 | msgstr "无法删除引用:%s" | |
5b04ee3b | 2947 | |
fd8cb379 | 2948 | #: ref-filter.c:35 wt-status.c:1850 |
87cb7997 JX |
2949 | msgid "gone" |
2950 | msgstr "丢失" | |
2951 | ||
2952 | #: ref-filter.c:36 | |
2953 | #, c-format | |
2954 | msgid "ahead %d" | |
2955 | msgstr "领先 %d" | |
2956 | ||
2957 | #: ref-filter.c:37 | |
2958 | #, c-format | |
2959 | msgid "behind %d" | |
2960 | msgstr "落后 %d" | |
2961 | ||
2962 | #: ref-filter.c:38 | |
2963 | #, c-format | |
2964 | msgid "ahead %d, behind %d" | |
2965 | msgstr "领先 %d,落后 %d" | |
2966 | ||
fd8cb379 | 2967 | #: ref-filter.c:121 |
5b04ee3b | 2968 | #, c-format |
a0b6b246 | 2969 | msgid "expected format: %%(color:<color>)" |
58b6f078 | 2970 | msgstr "期望的格式:%%(color:<颜色>)" |
5b04ee3b | 2971 | |
fd8cb379 | 2972 | #: ref-filter.c:123 |
5b04ee3b | 2973 | #, c-format |
a0b6b246 JX |
2974 | msgid "unrecognized color: %%(color:%s)" |
2975 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 2976 | |
fd8cb379 | 2977 | #: ref-filter.c:145 |
a0b6b246 | 2978 | #, c-format |
87cb7997 JX |
2979 | msgid "Integer value expected refname:lstrip=%s" |
2980 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 2981 | |
fd8cb379 | 2982 | #: ref-filter.c:149 |
87cb7997 JX |
2983 | #, c-format |
2984 | msgid "Integer value expected refname:rstrip=%s" | |
2985 | msgstr "期望整数值 refname:rstrip=%s" | |
2986 | ||
fd8cb379 | 2987 | #: ref-filter.c:151 |
87cb7997 JX |
2988 | #, c-format |
2989 | msgid "unrecognized %%(%s) argument: %s" | |
2990 | msgstr "未能识别的 %%(%s) 参数:%s" | |
2991 | ||
fd8cb379 | 2992 | #: ref-filter.c:206 |
90314792 | 2993 | #, c-format |
a0b6b246 JX |
2994 | msgid "%%(body) does not take arguments" |
2995 | msgstr "%%(body) 不带参数" | |
90314792 | 2996 | |
fd8cb379 | 2997 | #: ref-filter.c:215 |
a0b6b246 JX |
2998 | #, c-format |
2999 | msgid "%%(subject) does not take arguments" | |
3000 | msgstr "%%(subject) 不带参数" | |
90314792 | 3001 | |
fd8cb379 | 3002 | #: ref-filter.c:235 |
1a79b2f1 | 3003 | #, c-format |
6937cb4e JX |
3004 | msgid "unknown %%(trailers) argument: %s" |
3005 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 3006 | |
fd8cb379 | 3007 | #: ref-filter.c:264 |
a0b6b246 JX |
3008 | #, c-format |
3009 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 3010 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 3011 | |
fd8cb379 | 3012 | #: ref-filter.c:266 |
a0b6b246 JX |
3013 | #, c-format |
3014 | msgid "unrecognized %%(contents) argument: %s" | |
3015 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 3016 | |
fd8cb379 | 3017 | #: ref-filter.c:281 |
87cb7997 JX |
3018 | #, c-format |
3019 | msgid "positive value expected objectname:short=%s" | |
3020 | msgstr "期望一个正数 objectname:short=%s" | |
3021 | ||
fd8cb379 | 3022 | #: ref-filter.c:285 |
a0b6b246 JX |
3023 | #, c-format |
3024 | msgid "unrecognized %%(objectname) argument: %s" | |
3025 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 3026 | |
fd8cb379 | 3027 | #: ref-filter.c:315 |
a0b6b246 JX |
3028 | #, c-format |
3029 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 3030 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 3031 | |
fd8cb379 | 3032 | #: ref-filter.c:327 |
5c57d762 | 3033 | #, c-format |
a0b6b246 JX |
3034 | msgid "unrecognized position:%s" |
3035 | msgstr "未能识别的位置:%s" | |
5c57d762 | 3036 | |
fd8cb379 | 3037 | #: ref-filter.c:334 |
1b7f4a34 | 3038 | #, c-format |
a0b6b246 JX |
3039 | msgid "unrecognized width:%s" |
3040 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 3041 | |
fd8cb379 | 3042 | #: ref-filter.c:343 |
1b7f4a34 | 3043 | #, c-format |
a0b6b246 JX |
3044 | msgid "unrecognized %%(align) argument: %s" |
3045 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 3046 | |
fd8cb379 | 3047 | #: ref-filter.c:351 |
1b7f4a34 | 3048 | #, c-format |
a0b6b246 JX |
3049 | msgid "positive width expected with the %%(align) atom" |
3050 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 3051 | |
fd8cb379 | 3052 | #: ref-filter.c:369 |
87cb7997 JX |
3053 | #, c-format |
3054 | msgid "unrecognized %%(if) argument: %s" | |
3055 | msgstr "未能识别的 %%(if) 参数:%s" | |
3056 | ||
fd8cb379 | 3057 | #: ref-filter.c:464 |
07432cef | 3058 | #, c-format |
a0b6b246 | 3059 | msgid "malformed field name: %.*s" |
fd8cb379 | 3060 | msgstr "格式错误的字段名:%.*s" |
ef317cd5 | 3061 | |
fd8cb379 | 3062 | #: ref-filter.c:491 |
a0b6b246 JX |
3063 | #, c-format |
3064 | msgid "unknown field name: %.*s" | |
3065 | msgstr "未知的字段名:%.*s" | |
220c313c | 3066 | |
fd8cb379 | 3067 | #: ref-filter.c:608 |
87cb7997 JX |
3068 | #, c-format |
3069 | msgid "format: %%(if) atom used without a %%(then) atom" | |
3070 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
3071 | ||
fd8cb379 | 3072 | #: ref-filter.c:671 |
87cb7997 JX |
3073 | #, c-format |
3074 | msgid "format: %%(then) atom used without an %%(if) atom" | |
3075 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
3076 | ||
fd8cb379 | 3077 | #: ref-filter.c:673 |
87cb7997 JX |
3078 | #, c-format |
3079 | msgid "format: %%(then) atom used more than once" | |
3080 | msgstr "格式:%%(then) 元素用了多次" | |
3081 | ||
fd8cb379 | 3082 | #: ref-filter.c:675 |
87cb7997 JX |
3083 | #, c-format |
3084 | msgid "format: %%(then) atom used after %%(else)" | |
3085 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
3086 | ||
fd8cb379 | 3087 | #: ref-filter.c:703 |
87cb7997 JX |
3088 | #, c-format |
3089 | msgid "format: %%(else) atom used without an %%(if) atom" | |
3090 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
3091 | ||
fd8cb379 | 3092 | #: ref-filter.c:705 |
87cb7997 JX |
3093 | #, c-format |
3094 | msgid "format: %%(else) atom used without a %%(then) atom" | |
3095 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
3096 | ||
fd8cb379 | 3097 | #: ref-filter.c:707 |
87cb7997 JX |
3098 | #, c-format |
3099 | msgid "format: %%(else) atom used more than once" | |
3100 | msgstr "格式:%%(else) 元素用了多次" | |
3101 | ||
fd8cb379 | 3102 | #: ref-filter.c:722 |
7aea43ff | 3103 | #, c-format |
a0b6b246 JX |
3104 | msgid "format: %%(end) atom used without corresponding atom" |
3105 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 3106 | |
fd8cb379 | 3107 | #: ref-filter.c:779 |
7aea43ff | 3108 | #, c-format |
a0b6b246 | 3109 | msgid "malformed format string %s" |
fd8cb379 | 3110 | msgstr "错误的格式化字符串 %s" |
7aea43ff | 3111 | |
fd8cb379 | 3112 | #: ref-filter.c:1387 |
87cb7997 JX |
3113 | #, c-format |
3114 | msgid "(no branch, rebasing %s)" | |
3115 | msgstr "(非分支,正变基 %s)" | |
3116 | ||
fd8cb379 JX |
3117 | #: ref-filter.c:1390 |
3118 | #, c-format | |
3119 | msgid "(no branch, rebasing detached HEAD %s)" | |
3120 | msgstr "(非分支,正变基分离头指针 %s)" | |
3121 | ||
3122 | #: ref-filter.c:1393 | |
87cb7997 JX |
3123 | #, c-format |
3124 | msgid "(no branch, bisect started on %s)" | |
3125 | msgstr "(非分支,二分查找开始于 %s)" | |
c04f5ac3 | 3126 | |
a4f16749 JX |
3127 | #. TRANSLATORS: make sure this matches "HEAD |
3128 | #. detached at " in wt-status.c | |
3129 | #. | |
fd8cb379 | 3130 | #: ref-filter.c:1401 |
c04f5ac3 | 3131 | #, c-format |
87cb7997 JX |
3132 | msgid "(HEAD detached at %s)" |
3133 | msgstr "(头指针分离于 %s)" | |
c04f5ac3 | 3134 | |
a4f16749 JX |
3135 | #. TRANSLATORS: make sure this matches "HEAD |
3136 | #. detached from " in wt-status.c | |
3137 | #. | |
fd8cb379 | 3138 | #: ref-filter.c:1408 |
a0b6b246 | 3139 | #, c-format |
87cb7997 JX |
3140 | msgid "(HEAD detached from %s)" |
3141 | msgstr "(头指针分离自 %s)" | |
6792b93b | 3142 | |
fd8cb379 | 3143 | #: ref-filter.c:1412 |
87cb7997 JX |
3144 | msgid "(no branch)" |
3145 | msgstr "(非分支)" | |
3146 | ||
fd8cb379 | 3147 | #: ref-filter.c:1442 |
a0b6b246 JX |
3148 | #, c-format |
3149 | msgid "missing object %s for %s" | |
3150 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 3151 | |
fd8cb379 | 3152 | #: ref-filter.c:1445 |
a0b6b246 JX |
3153 | #, c-format |
3154 | msgid "parse_object_buffer failed on %s for %s" | |
3155 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 3156 | |
fd8cb379 | 3157 | #: ref-filter.c:1902 |
a0b6b246 JX |
3158 | #, c-format |
3159 | msgid "malformed object at '%s'" | |
fd8cb379 | 3160 | msgstr "格式错误的对象 '%s'" |
c04f5ac3 | 3161 | |
fd8cb379 | 3162 | #: ref-filter.c:1984 |
a0b6b246 JX |
3163 | #, c-format |
3164 | msgid "ignoring ref with broken name %s" | |
3165 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 3166 | |
fd8cb379 | 3167 | #: ref-filter.c:1989 |
a0b6b246 JX |
3168 | #, c-format |
3169 | msgid "ignoring broken ref %s" | |
3170 | msgstr "忽略损坏的引用 %s" | |
c04f5ac3 | 3171 | |
fd8cb379 | 3172 | #: ref-filter.c:2261 |
a0b6b246 JX |
3173 | #, c-format |
3174 | msgid "format: %%(end) atom missing" | |
3175 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 3176 | |
fd8cb379 | 3177 | #: ref-filter.c:2365 |
a0b6b246 JX |
3178 | #, c-format |
3179 | msgid "malformed object name %s" | |
fd8cb379 | 3180 | msgstr "格式错误的对象名 %s" |
c04f5ac3 | 3181 | |
fd8cb379 | 3182 | #: remote.c:605 |
a0b6b246 JX |
3183 | #, c-format |
3184 | msgid "Cannot fetch both %s and %s to %s" | |
3185 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 3186 | |
fd8cb379 | 3187 | #: remote.c:609 |
c04f5ac3 | 3188 | #, c-format |
a0b6b246 JX |
3189 | msgid "%s usually tracks %s, not %s" |
3190 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 3191 | |
fd8cb379 | 3192 | #: remote.c:613 |
a0b6b246 JX |
3193 | #, c-format |
3194 | msgid "%s tracks both %s and %s" | |
3195 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 3196 | |
fd8cb379 | 3197 | #: remote.c:621 |
a0b6b246 JX |
3198 | msgid "Internal error" |
3199 | msgstr "内部错误" | |
c04f5ac3 | 3200 | |
fd8cb379 | 3201 | #: remote.c:1534 remote.c:1635 |
a0b6b246 JX |
3202 | msgid "HEAD does not point to a branch" |
3203 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 3204 | |
fd8cb379 | 3205 | #: remote.c:1543 |
a0b6b246 JX |
3206 | #, c-format |
3207 | msgid "no such branch: '%s'" | |
3208 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 3209 | |
fd8cb379 | 3210 | #: remote.c:1546 |
a0b6b246 JX |
3211 | #, c-format |
3212 | msgid "no upstream configured for branch '%s'" | |
3213 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 3214 | |
fd8cb379 | 3215 | #: remote.c:1552 |
a0b6b246 JX |
3216 | #, c-format |
3217 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
3218 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 3219 | |
fd8cb379 | 3220 | #: remote.c:1567 |
a0b6b246 JX |
3221 | #, c-format |
3222 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
3223 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 3224 | |
fd8cb379 | 3225 | #: remote.c:1579 |
a0b6b246 JX |
3226 | #, c-format |
3227 | msgid "branch '%s' has no remote for pushing" | |
3228 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 3229 | |
fd8cb379 | 3230 | #: remote.c:1589 |
a0b6b246 JX |
3231 | #, c-format |
3232 | msgid "push refspecs for '%s' do not include '%s'" | |
3233 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 3234 | |
fd8cb379 | 3235 | #: remote.c:1602 |
a0b6b246 JX |
3236 | msgid "push has no destination (push.default is 'nothing')" |
3237 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 3238 | |
fd8cb379 | 3239 | #: remote.c:1624 |
a0b6b246 JX |
3240 | msgid "cannot resolve 'simple' push to a single destination" |
3241 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 3242 | |
fd8cb379 | 3243 | #: remote.c:1939 |
a0b6b246 JX |
3244 | #, c-format |
3245 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
3246 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 3247 | |
fd8cb379 | 3248 | #: remote.c:1943 |
a0b6b246 JX |
3249 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
3250 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 3251 | |
fd8cb379 | 3252 | #: remote.c:1946 |
a0b6b246 | 3253 | #, c-format |
6937cb4e | 3254 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 3255 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 3256 | |
fd8cb379 | 3257 | #: remote.c:1950 |
31e5e17b JX |
3258 | #, c-format |
3259 | msgid "Your branch and '%s' refer to different commits.\n" | |
3260 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
3261 | ||
fd8cb379 | 3262 | #: remote.c:1953 |
31e5e17b JX |
3263 | #, c-format |
3264 | msgid " (use \"%s\" for details)\n" | |
3265 | msgstr " (使用 \"%s\" 查看详情)\n" | |
3266 | ||
fd8cb379 | 3267 | #: remote.c:1957 |
a0b6b246 JX |
3268 | #, c-format |
3269 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
3270 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
3271 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
3272 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 3273 | |
fd8cb379 | 3274 | #: remote.c:1963 |
a0b6b246 JX |
3275 | msgid " (use \"git push\" to publish your local commits)\n" |
3276 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 3277 | |
fd8cb379 | 3278 | #: remote.c:1966 |
a0b6b246 JX |
3279 | #, c-format |
3280 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
3281 | msgid_plural "" | |
3282 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
3283 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
3284 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 3285 | |
a0b6b246 | 3286 | # 译者:注意保持前导空格 |
fd8cb379 | 3287 | #: remote.c:1974 |
a0b6b246 JX |
3288 | msgid " (use \"git pull\" to update your local branch)\n" |
3289 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 3290 | |
fd8cb379 | 3291 | #: remote.c:1977 |
a0b6b246 JX |
3292 | #, c-format |
3293 | msgid "" | |
3294 | "Your branch and '%s' have diverged,\n" | |
3295 | "and have %d and %d different commit each, respectively.\n" | |
3296 | msgid_plural "" | |
3297 | "Your branch and '%s' have diverged,\n" | |
3298 | "and have %d and %d different commits each, respectively.\n" | |
3299 | msgstr[0] "" | |
3300 | "您的分支和 '%s' 出现了偏离,\n" | |
3301 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
3302 | msgstr[1] "" | |
3303 | "您的分支和 '%s' 出现了偏离,\n" | |
3304 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 3305 | |
a0b6b246 | 3306 | # 译者:注意保持前导空格 |
fd8cb379 | 3307 | #: remote.c:1987 |
a0b6b246 JX |
3308 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
3309 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 3310 | |
fd8cb379 | 3311 | #: revision.c:2289 |
a0b6b246 JX |
3312 | msgid "your current branch appears to be broken" |
3313 | msgstr "您的当前分支好像被损坏" | |
cfff71a9 | 3314 | |
fd8cb379 | 3315 | #: revision.c:2292 |
a0b6b246 JX |
3316 | #, c-format |
3317 | msgid "your current branch '%s' does not have any commits yet" | |
3318 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6792b93b | 3319 | |
fd8cb379 | 3320 | #: revision.c:2489 |
a0b6b246 JX |
3321 | msgid "--first-parent is incompatible with --bisect" |
3322 | msgstr "--first-parent 与 --bisect 不兼容" | |
6792b93b | 3323 | |
fd8cb379 | 3324 | #: run-command.c:728 |
a0b6b246 JX |
3325 | msgid "open /dev/null failed" |
3326 | msgstr "不能打开 /dev/null" | |
5c57d762 | 3327 | |
fd8cb379 | 3328 | #: run-command.c:1271 |
5809aa05 JX |
3329 | #, c-format |
3330 | msgid "" | |
3331 | "The '%s' hook was ignored because it's not set as executable.\n" | |
3332 | "You can disable this warning with `git config advice.ignoredHook false`." | |
3333 | msgstr "" | |
3334 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
3335 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
3336 | ||
3337 | #: send-pack.c:141 | |
31e5e17b JX |
3338 | msgid "unexpected flush packet while reading remote unpack status" |
3339 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
3340 | ||
3341 | #: send-pack.c:143 | |
87cb7997 JX |
3342 | #, c-format |
3343 | msgid "unable to parse remote unpack status: %s" | |
3344 | msgstr "不能解析远程解包状态:%s" | |
3345 | ||
31e5e17b | 3346 | #: send-pack.c:145 |
87cb7997 JX |
3347 | #, c-format |
3348 | msgid "remote unpack failed: %s" | |
3349 | msgstr "远程解包失败:%s" | |
3350 | ||
31e5e17b | 3351 | #: send-pack.c:308 |
a0b6b246 JX |
3352 | msgid "failed to sign the push certificate" |
3353 | msgstr "无法为推送证书签名" | |
6792b93b | 3354 | |
31e5e17b | 3355 | #: send-pack.c:421 |
a0b6b246 JX |
3356 | msgid "the receiving end does not support --signed push" |
3357 | msgstr "接收端不支持签名推送" | |
6792b93b | 3358 | |
31e5e17b | 3359 | #: send-pack.c:423 |
a0b6b246 JX |
3360 | msgid "" |
3361 | "not sending a push certificate since the receiving end does not support --" | |
3362 | "signed push" | |
3363 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 3364 | |
31e5e17b | 3365 | #: send-pack.c:435 |
a0b6b246 JX |
3366 | msgid "the receiving end does not support --atomic push" |
3367 | msgstr "接收端不支持原子推送" | |
6792b93b | 3368 | |
31e5e17b | 3369 | #: send-pack.c:440 |
a0b6b246 JX |
3370 | msgid "the receiving end does not support push options" |
3371 | msgstr "接收端不支持推送选项" | |
6792b93b | 3372 | |
fd8cb379 | 3373 | #: sequencer.c:175 |
31e5e17b JX |
3374 | #, c-format |
3375 | msgid "invalid commit message cleanup mode '%s'" | |
3376 | msgstr "无效的提交信息清理模式 '%s'" | |
3377 | ||
fd8cb379 JX |
3378 | #: sequencer.c:275 |
3379 | #, c-format | |
3380 | msgid "could not delete '%s'" | |
3381 | msgstr "无法删除 '%s'" | |
3382 | ||
3383 | #: sequencer.c:301 | |
a0b6b246 JX |
3384 | msgid "revert" |
3385 | msgstr "还原" | |
6792b93b | 3386 | |
fd8cb379 | 3387 | #: sequencer.c:303 |
a0b6b246 JX |
3388 | msgid "cherry-pick" |
3389 | msgstr "拣选" | |
3390 | ||
fd8cb379 | 3391 | #: sequencer.c:305 |
1a79b2f1 JX |
3392 | msgid "rebase -i" |
3393 | msgstr "rebase -i" | |
3394 | ||
fd8cb379 | 3395 | #: sequencer.c:307 |
1a79b2f1 JX |
3396 | #, c-format |
3397 | msgid "Unknown action: %d" | |
3398 | msgstr "未知动作:%d" | |
3399 | ||
fd8cb379 | 3400 | #: sequencer.c:364 |
a0b6b246 JX |
3401 | msgid "" |
3402 | "after resolving the conflicts, mark the corrected paths\n" | |
3403 | "with 'git add <paths>' or 'git rm <paths>'" | |
3404 | msgstr "" | |
3405 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
3406 | "命令标记修正后的文件" | |
3407 | ||
fd8cb379 | 3408 | #: sequencer.c:367 |
a0b6b246 JX |
3409 | msgid "" |
3410 | "after resolving the conflicts, mark the corrected paths\n" | |
3411 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
3412 | "and commit the result with 'git commit'" | |
3413 | msgstr "" | |
3414 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
3415 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 3416 | |
fd8cb379 | 3417 | #: sequencer.c:380 sequencer.c:2468 |
1b7f4a34 | 3418 | #, c-format |
a0b6b246 JX |
3419 | msgid "could not lock '%s'" |
3420 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 3421 | |
fd8cb379 JX |
3422 | #: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486 |
3423 | #: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656 | |
1b7f4a34 | 3424 | #, c-format |
a0b6b246 JX |
3425 | msgid "could not write to '%s'" |
3426 | msgstr "不能写入 '%s'" | |
1b7f4a34 | 3427 | |
fd8cb379 | 3428 | #: sequencer.c:387 |
a0b6b246 | 3429 | #, c-format |
72351d7d | 3430 | msgid "could not write eol to '%s'" |
a0b6b246 | 3431 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 3432 | |
fd8cb379 JX |
3433 | #: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488 |
3434 | #: sequencer.c:2702 | |
1b7f4a34 | 3435 | #, c-format |
31e5e17b JX |
3436 | msgid "failed to finalize '%s'" |
3437 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 3438 | |
fd8cb379 JX |
3439 | #: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371 |
3440 | #: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727 | |
3441 | #: builtin/merge.c:1046 | |
a0b6b246 JX |
3442 | #, c-format |
3443 | msgid "could not read '%s'" | |
3444 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 3445 | |
fd8cb379 | 3446 | #: sequencer.c:441 |
63af42fe | 3447 | #, c-format |
a0b6b246 JX |
3448 | msgid "your local changes would be overwritten by %s." |
3449 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 3450 | |
fd8cb379 | 3451 | #: sequencer.c:445 |
a0b6b246 | 3452 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 3453 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 3454 | |
fd8cb379 | 3455 | #: sequencer.c:474 |
a0b6b246 JX |
3456 | #, c-format |
3457 | msgid "%s: fast-forward" | |
3458 | msgstr "%s:快进" | |
6792b93b | 3459 | |
1a79b2f1 | 3460 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
a4f16749 | 3461 | #. "rebase -i". |
1a79b2f1 | 3462 | #. |
fd8cb379 | 3463 | #: sequencer.c:563 |
a0b6b246 JX |
3464 | #, c-format |
3465 | msgid "%s: Unable to write new index file" | |
3466 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 3467 | |
fd8cb379 | 3468 | #: sequencer.c:579 |
5809aa05 JX |
3469 | msgid "unable to update cache tree" |
3470 | msgstr "不能更新缓存树" | |
6792b93b | 3471 | |
fd8cb379 JX |
3472 | #: sequencer.c:592 |
3473 | msgid "could not resolve HEAD commit" | |
3474 | msgstr "不能解析 HEAD 提交" | |
3475 | ||
3476 | #: sequencer.c:749 | |
63af42fe JX |
3477 | #, c-format |
3478 | msgid "" | |
a0b6b246 JX |
3479 | "you have staged changes in your working tree\n" |
3480 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
3481 | "\n" | |
3482 | " git commit --amend %s\n" | |
3483 | "\n" | |
3484 | "If they are meant to go into a new commit, run:\n" | |
3485 | "\n" | |
3486 | " git commit %s\n" | |
3487 | "\n" | |
3488 | "In both cases, once you're done, continue with:\n" | |
3489 | "\n" | |
3490 | " git rebase --continue\n" | |
3491 | msgstr "" | |
1a79b2f1 JX |
3492 | "您的工作区中存在已暂存的修改\n" |
3493 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
3494 | "\n" |
3495 | " git commit --amend %s\n" | |
3496 | "\n" | |
29004bbb | 3497 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
3498 | "\n" |
3499 | " git commit %s\n" | |
3500 | "\n" | |
3501 | "无论哪种情况,当您完成提交,继续执行:\n" | |
3502 | "\n" | |
3503 | " git rebase --continue\n" | |
6792b93b | 3504 | |
fd8cb379 JX |
3505 | #: sequencer.c:818 |
3506 | msgid "writing root commit" | |
3507 | msgstr "写根提交" | |
3508 | ||
3509 | #: sequencer.c:1043 | |
31e5e17b JX |
3510 | msgid "'prepare-commit-msg' hook failed" |
3511 | msgstr "'prepare-commit-msg' 钩子失败" | |
3512 | ||
fd8cb379 | 3513 | #: sequencer.c:1050 |
31e5e17b JX |
3514 | msgid "" |
3515 | "Your name and email address were configured automatically based\n" | |
3516 | "on your username and hostname. Please check that they are accurate.\n" | |
3517 | "You can suppress this message by setting them explicitly. Run the\n" | |
3518 | "following command and follow the instructions in your editor to edit\n" | |
3519 | "your configuration file:\n" | |
3520 | "\n" | |
3521 | " git config --global --edit\n" | |
3522 | "\n" | |
3523 | "After doing this, you may fix the identity used for this commit with:\n" | |
3524 | "\n" | |
3525 | " git commit --amend --reset-author\n" | |
3526 | msgstr "" | |
3527 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
3528 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
3529 | "中编辑您的配置文件:\n" | |
3530 | "\n" | |
3531 | " git config --global --edit\n" | |
3532 | "\n" | |
3533 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
3534 | "\n" | |
3535 | " git commit --amend --reset-author\n" | |
3536 | ||
fd8cb379 | 3537 | #: sequencer.c:1063 |
31e5e17b JX |
3538 | msgid "" |
3539 | "Your name and email address were configured automatically based\n" | |
3540 | "on your username and hostname. Please check that they are accurate.\n" | |
3541 | "You can suppress this message by setting them explicitly:\n" | |
3542 | "\n" | |
3543 | " git config --global user.name \"Your Name\"\n" | |
3544 | " git config --global user.email you@example.com\n" | |
3545 | "\n" | |
3546 | "After doing this, you may fix the identity used for this commit with:\n" | |
3547 | "\n" | |
3548 | " git commit --amend --reset-author\n" | |
3549 | msgstr "" | |
3550 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
3551 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
3552 | "\n" | |
3553 | " git config --global user.name \"Your Name\"\n" | |
3554 | " git config --global user.email you@example.com\n" | |
3555 | "\n" | |
3556 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
3557 | "\n" | |
3558 | " git commit --amend --reset-author\n" | |
3559 | ||
fd8cb379 | 3560 | #: sequencer.c:1103 |
31e5e17b JX |
3561 | msgid "couldn't look up newly created commit" |
3562 | msgstr "无法找到新创建的提交" | |
3563 | ||
fd8cb379 | 3564 | #: sequencer.c:1105 |
31e5e17b JX |
3565 | msgid "could not parse newly created commit" |
3566 | msgstr "不能解析新创建的提交" | |
3567 | ||
fd8cb379 | 3568 | #: sequencer.c:1151 |
31e5e17b JX |
3569 | msgid "unable to resolve HEAD after creating commit" |
3570 | msgstr "创建提交后,不能解析 HEAD" | |
3571 | ||
fd8cb379 | 3572 | #: sequencer.c:1153 |
31e5e17b JX |
3573 | msgid "detached HEAD" |
3574 | msgstr "分离头指针" | |
3575 | ||
3576 | # 译者:中文字符串拼接,可删除前导空格 | |
fd8cb379 | 3577 | #: sequencer.c:1157 |
31e5e17b JX |
3578 | msgid " (root-commit)" |
3579 | msgstr "(根提交)" | |
3580 | ||
fd8cb379 | 3581 | #: sequencer.c:1178 |
31e5e17b JX |
3582 | msgid "could not parse HEAD" |
3583 | msgstr "不能解析 HEAD" | |
3584 | ||
fd8cb379 | 3585 | #: sequencer.c:1180 |
31e5e17b JX |
3586 | #, c-format |
3587 | msgid "HEAD %s is not a commit!" | |
3588 | msgstr "HEAD %s 不是一个提交!" | |
3589 | ||
fd8cb379 | 3590 | #: sequencer.c:1184 builtin/commit.c:1528 |
31e5e17b JX |
3591 | msgid "could not parse HEAD commit" |
3592 | msgstr "不能解析 HEAD 提交" | |
3593 | ||
fd8cb379 | 3594 | #: sequencer.c:1235 sequencer.c:1832 |
31e5e17b JX |
3595 | msgid "unable to parse commit author" |
3596 | msgstr "不能解析提交作者" | |
3597 | ||
fd8cb379 | 3598 | #: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645 |
31e5e17b JX |
3599 | msgid "git write-tree failed to write a tree" |
3600 | msgstr "git write-tree 无法写入树对象" | |
3601 | ||
fd8cb379 | 3602 | #: sequencer.c:1262 sequencer.c:1317 |
31e5e17b JX |
3603 | #, c-format |
3604 | msgid "unable to read commit message from '%s'" | |
3605 | msgstr "不能从 '%s' 读取提交说明" | |
3606 | ||
fd8cb379 JX |
3607 | #: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825 |
3608 | #: builtin/merge.c:850 | |
31e5e17b JX |
3609 | msgid "failed to write commit object" |
3610 | msgstr "无法写提交对象" | |
3611 | ||
fd8cb379 | 3612 | #: sequencer.c:1344 |
a0b6b246 | 3613 | #, c-format |
5809aa05 JX |
3614 | msgid "could not parse commit %s" |
3615 | msgstr "不能解析提交 %s" | |
6792b93b | 3616 | |
fd8cb379 | 3617 | #: sequencer.c:1349 |
63af42fe | 3618 | #, c-format |
5809aa05 JX |
3619 | msgid "could not parse parent commit %s" |
3620 | msgstr "不能解析父提交 %s" | |
63af42fe | 3621 | |
fd8cb379 | 3622 | #: sequencer.c:1500 sequencer.c:1525 |
1a79b2f1 JX |
3623 | #, c-format |
3624 | msgid "This is a combination of %d commits." | |
3625 | msgstr "这是一个 %d 个提交的组合。" | |
3626 | ||
fd8cb379 | 3627 | #: sequencer.c:1510 sequencer.c:4355 |
1a79b2f1 JX |
3628 | msgid "need a HEAD to fixup" |
3629 | msgstr "需要一个 HEAD 来修复" | |
3630 | ||
fd8cb379 | 3631 | #: sequencer.c:1512 sequencer.c:2729 |
1a79b2f1 JX |
3632 | msgid "could not read HEAD" |
3633 | msgstr "不能读取 HEAD" | |
3634 | ||
fd8cb379 | 3635 | #: sequencer.c:1514 |
1a79b2f1 JX |
3636 | msgid "could not read HEAD's commit message" |
3637 | msgstr "不能读取 HEAD 的提交说明" | |
3638 | ||
fd8cb379 | 3639 | #: sequencer.c:1520 |
1a79b2f1 JX |
3640 | #, c-format |
3641 | msgid "cannot write '%s'" | |
3642 | msgstr "不能写 '%s'" | |
3643 | ||
fd8cb379 | 3644 | #: sequencer.c:1527 git-rebase--interactive.sh:457 |
1a79b2f1 JX |
3645 | msgid "This is the 1st commit message:" |
3646 | msgstr "这是第一个提交说明:" | |
3647 | ||
fd8cb379 | 3648 | #: sequencer.c:1535 |
1a79b2f1 JX |
3649 | #, c-format |
3650 | msgid "could not read commit message of %s" | |
3651 | msgstr "不能读取 %s 的提交说明" | |
3652 | ||
fd8cb379 | 3653 | #: sequencer.c:1542 |
1a79b2f1 JX |
3654 | #, c-format |
3655 | msgid "This is the commit message #%d:" | |
3656 | msgstr "这是提交说明 #%d:" | |
3657 | ||
fd8cb379 | 3658 | #: sequencer.c:1548 |
1a79b2f1 JX |
3659 | #, c-format |
3660 | msgid "The commit message #%d will be skipped:" | |
3661 | msgstr "提交说明 #%d 将被跳过:" | |
3662 | ||
fd8cb379 | 3663 | #: sequencer.c:1553 |
1a79b2f1 JX |
3664 | #, c-format |
3665 | msgid "unknown command: %d" | |
3666 | msgstr "未知命令:%d" | |
3667 | ||
fd8cb379 | 3668 | #: sequencer.c:1631 |
a0b6b246 JX |
3669 | msgid "your index file is unmerged." |
3670 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 3671 | |
fd8cb379 JX |
3672 | #: sequencer.c:1638 |
3673 | msgid "cannot fixup root commit" | |
3674 | msgstr "不能修复根提交" | |
3675 | ||
3676 | #: sequencer.c:1657 | |
a0b6b246 JX |
3677 | #, c-format |
3678 | msgid "commit %s is a merge but no -m option was given." | |
3679 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 3680 | |
fd8cb379 | 3681 | #: sequencer.c:1665 |
a0b6b246 JX |
3682 | #, c-format |
3683 | msgid "commit %s does not have parent %d" | |
3684 | msgstr "提交 %s 没有第 %d 个父提交" | |
3685 | ||
fd8cb379 | 3686 | #: sequencer.c:1669 |
a0b6b246 JX |
3687 | #, c-format |
3688 | msgid "mainline was specified but commit %s is not a merge." | |
3689 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
3690 | ||
fd8cb379 | 3691 | #: sequencer.c:1675 |
1a79b2f1 JX |
3692 | #, c-format |
3693 | msgid "cannot get commit message for %s" | |
3694 | msgstr "不能得到 %s 的提交说明" | |
3695 | ||
a0b6b246 JX |
3696 | #. TRANSLATORS: The first %s will be a "todo" command like |
3697 | #. "revert" or "pick", the second %s a SHA1. | |
fd8cb379 | 3698 | #: sequencer.c:1694 |
a0b6b246 JX |
3699 | #, c-format |
3700 | msgid "%s: cannot parse parent commit %s" | |
3701 | msgstr "%s:不能解析父提交 %s" | |
3702 | ||
fd8cb379 | 3703 | #: sequencer.c:1759 |
a0b6b246 | 3704 | #, c-format |
1a79b2f1 JX |
3705 | msgid "could not rename '%s' to '%s'" |
3706 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 3707 | |
fd8cb379 | 3708 | #: sequencer.c:1813 |
a0b6b246 JX |
3709 | #, c-format |
3710 | msgid "could not revert %s... %s" | |
3711 | msgstr "不能还原 %s... %s" | |
3712 | ||
fd8cb379 | 3713 | #: sequencer.c:1814 |
a0b6b246 JX |
3714 | #, c-format |
3715 | msgid "could not apply %s... %s" | |
3716 | msgstr "不能应用 %s... %s" | |
3717 | ||
fd8cb379 | 3718 | #: sequencer.c:1864 |
a0b6b246 JX |
3719 | msgid "empty commit set passed" |
3720 | msgstr "提供了空的提交集" | |
3721 | ||
fd8cb379 | 3722 | #: sequencer.c:1874 |
a0b6b246 JX |
3723 | #, c-format |
3724 | msgid "git %s: failed to read the index" | |
3725 | msgstr "git %s:无法读取索引" | |
3726 | ||
fd8cb379 | 3727 | #: sequencer.c:1881 |
a0b6b246 JX |
3728 | #, c-format |
3729 | msgid "git %s: failed to refresh the index" | |
3730 | msgstr "git %s:无法刷新索引" | |
3731 | ||
fd8cb379 | 3732 | #: sequencer.c:1961 |
5809aa05 JX |
3733 | #, c-format |
3734 | msgid "%s does not accept arguments: '%s'" | |
3735 | msgstr "%s 不接受参数:'%s'" | |
3736 | ||
fd8cb379 | 3737 | #: sequencer.c:1970 |
5809aa05 JX |
3738 | #, c-format |
3739 | msgid "missing arguments for %s" | |
3740 | msgstr "缺少 %s 的参数" | |
3741 | ||
fd8cb379 | 3742 | #: sequencer.c:2029 |
a0b6b246 JX |
3743 | #, c-format |
3744 | msgid "invalid line %d: %.*s" | |
3745 | msgstr "无效行 %d:%.*s" | |
3746 | ||
fd8cb379 | 3747 | #: sequencer.c:2037 |
1a79b2f1 JX |
3748 | #, c-format |
3749 | msgid "cannot '%s' without a previous commit" | |
3750 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 3751 | |
fd8cb379 | 3752 | #: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173 |
a0b6b246 JX |
3753 | #, c-format |
3754 | msgid "could not read '%s'." | |
3755 | msgstr "不能读取 '%s'。" | |
3756 | ||
fd8cb379 | 3757 | #: sequencer.c:2108 |
1a79b2f1 JX |
3758 | msgid "please fix this using 'git rebase --edit-todo'." |
3759 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
3760 | ||
fd8cb379 | 3761 | #: sequencer.c:2110 |
a0b6b246 JX |
3762 | #, c-format |
3763 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 3764 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 3765 | |
fd8cb379 | 3766 | #: sequencer.c:2115 |
1a79b2f1 JX |
3767 | msgid "no commits parsed." |
3768 | msgstr "没有解析提交。" | |
3769 | ||
fd8cb379 | 3770 | #: sequencer.c:2126 |
a0b6b246 JX |
3771 | msgid "cannot cherry-pick during a revert." |
3772 | msgstr "不能在回退中执行拣选。" | |
3773 | ||
fd8cb379 | 3774 | #: sequencer.c:2128 |
a0b6b246 JX |
3775 | msgid "cannot revert during a cherry-pick." |
3776 | msgstr "不能在拣选中执行回退。" | |
3777 | ||
fd8cb379 | 3778 | #: sequencer.c:2195 |
a0b6b246 JX |
3779 | #, c-format |
3780 | msgid "invalid key: %s" | |
3781 | msgstr "无效键名:%s" | |
3782 | ||
fd8cb379 | 3783 | #: sequencer.c:2198 |
a0b6b246 JX |
3784 | #, c-format |
3785 | msgid "invalid value for %s: %s" | |
3786 | msgstr "%s 的值无效:%s" | |
3787 | ||
fd8cb379 JX |
3788 | #: sequencer.c:2269 |
3789 | msgid "unusable squash-onto" | |
3790 | msgstr "不可用的 squash-onto" | |
3791 | ||
3792 | #: sequencer.c:2285 | |
a0b6b246 JX |
3793 | #, c-format |
3794 | msgid "malformed options sheet: '%s'" | |
fd8cb379 | 3795 | msgstr "格式错误的选项清单:'%s'" |
a0b6b246 | 3796 | |
fd8cb379 | 3797 | #: sequencer.c:2323 |
a0b6b246 JX |
3798 | msgid "a cherry-pick or revert is already in progress" |
3799 | msgstr "一个拣选或还原操作已在进行" | |
3800 | ||
fd8cb379 | 3801 | #: sequencer.c:2324 |
a0b6b246 JX |
3802 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
3803 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
3804 | ||
fd8cb379 | 3805 | #: sequencer.c:2327 |
a0b6b246 JX |
3806 | #, c-format |
3807 | msgid "could not create sequencer directory '%s'" | |
3808 | msgstr "不能创建序列目录 '%s'" | |
3809 | ||
fd8cb379 | 3810 | #: sequencer.c:2341 |
a0b6b246 JX |
3811 | msgid "could not lock HEAD" |
3812 | msgstr "不能锁定 HEAD" | |
3813 | ||
fd8cb379 | 3814 | #: sequencer.c:2396 sequencer.c:3403 |
a0b6b246 JX |
3815 | msgid "no cherry-pick or revert in progress" |
3816 | msgstr "拣选或还原操作并未进行" | |
3817 | ||
fd8cb379 | 3818 | #: sequencer.c:2398 |
a0b6b246 JX |
3819 | msgid "cannot resolve HEAD" |
3820 | msgstr "不能解析 HEAD" | |
3821 | ||
fd8cb379 | 3822 | #: sequencer.c:2400 sequencer.c:2435 |
a0b6b246 JX |
3823 | msgid "cannot abort from a branch yet to be born" |
3824 | msgstr "不能从尚未建立的分支终止" | |
3825 | ||
fd8cb379 | 3826 | #: sequencer.c:2421 builtin/grep.c:720 |
a0b6b246 JX |
3827 | #, c-format |
3828 | msgid "cannot open '%s'" | |
3829 | msgstr "不能打开 '%s'" | |
3830 | ||
fd8cb379 | 3831 | #: sequencer.c:2423 |
a0b6b246 JX |
3832 | #, c-format |
3833 | msgid "cannot read '%s': %s" | |
3834 | msgstr "不能读取 '%s':%s" | |
3835 | ||
fd8cb379 | 3836 | #: sequencer.c:2424 |
a0b6b246 JX |
3837 | msgid "unexpected end of file" |
3838 | msgstr "意外的文件结束" | |
3839 | ||
fd8cb379 | 3840 | #: sequencer.c:2430 |
a0b6b246 JX |
3841 | #, c-format |
3842 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
3843 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
3844 | ||
fd8cb379 | 3845 | #: sequencer.c:2441 |
1a79b2f1 JX |
3846 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
3847 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
3848 | ||
fd8cb379 | 3849 | #: sequencer.c:2545 sequencer.c:3321 |
31e5e17b JX |
3850 | #, c-format |
3851 | msgid "could not update %s" | |
3852 | msgstr "不能更新 %s" | |
3853 | ||
fd8cb379 | 3854 | #: sequencer.c:2583 sequencer.c:3301 |
1a79b2f1 JX |
3855 | msgid "cannot read HEAD" |
3856 | msgstr "不能读取 HEAD" | |
3857 | ||
fd8cb379 | 3858 | #: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639 |
1a79b2f1 JX |
3859 | #, c-format |
3860 | msgid "could not copy '%s' to '%s'" | |
3861 | msgstr "不能拷贝 '%s' 至 '%s'" | |
3862 | ||
fd8cb379 | 3863 | #: sequencer.c:2641 |
1a79b2f1 JX |
3864 | msgid "could not read index" |
3865 | msgstr "不能读取索引" | |
3866 | ||
3867 | # 译者:注意保持前导空格 | |
fd8cb379 | 3868 | #: sequencer.c:2646 |
1a79b2f1 JX |
3869 | #, c-format |
3870 | msgid "" | |
3871 | "execution failed: %s\n" | |
3872 | "%sYou can fix the problem, and then run\n" | |
3873 | "\n" | |
3874 | " git rebase --continue\n" | |
3875 | "\n" | |
3876 | msgstr "" | |
3877 | "执行失败:%s\n" | |
3878 | "%s您可以改正该问题,然后运行\n" | |
3879 | "\n" | |
3880 | " git rebase --continue\n" | |
3881 | "\n" | |
3882 | ||
fd8cb379 | 3883 | #: sequencer.c:2652 |
1a79b2f1 JX |
3884 | msgid "and made changes to the index and/or the working tree\n" |
3885 | msgstr "并且修改索引和/或工作区\n" | |
3886 | ||
fd8cb379 | 3887 | #: sequencer.c:2658 |
1a79b2f1 JX |
3888 | #, c-format |
3889 | msgid "" | |
3890 | "execution succeeded: %s\n" | |
3891 | "but left changes to the index and/or the working tree\n" | |
3892 | "Commit or stash your changes, and then run\n" | |
3893 | "\n" | |
3894 | " git rebase --continue\n" | |
3895 | "\n" | |
3896 | msgstr "" | |
3897 | "执行成功:%s\n" | |
3898 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 3899 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
3900 | "\n" |
3901 | " git rebase --continue\n" | |
3902 | "\n" | |
3903 | ||
fd8cb379 JX |
3904 | #: sequencer.c:2771 |
3905 | msgid "writing fake root commit" | |
3906 | msgstr "写伪根提交" | |
3907 | ||
3908 | #: sequencer.c:2776 | |
3909 | msgid "writing squash-onto" | |
3910 | msgstr "写入 squash-onto" | |
3911 | ||
3912 | #: sequencer.c:2811 | |
3913 | #, c-format | |
3914 | msgid "failed to find tree of %s" | |
3915 | msgstr "无法找到 %s 指向的树。" | |
3916 | ||
3917 | #: sequencer.c:2829 | |
3918 | msgid "could not write index" | |
3919 | msgstr "不能写入索引" | |
3920 | ||
3921 | #: sequencer.c:2861 | |
3922 | msgid "cannot merge without a current revision" | |
3923 | msgstr "没有当前版本不能合并" | |
3924 | ||
3925 | #: sequencer.c:2884 | |
3926 | #, c-format | |
3927 | msgid "could not resolve '%s'" | |
3928 | msgstr "无法解析 '%s'" | |
3929 | ||
3930 | #: sequencer.c:2906 | |
3931 | #, c-format | |
3932 | msgid "could not get commit message of '%s'" | |
3933 | msgstr "不能获取 '%s' 的提交说明" | |
3934 | ||
3935 | #: sequencer.c:2916 sequencer.c:2941 | |
3936 | #, c-format | |
3937 | msgid "could not write '%s'" | |
3938 | msgstr "不能写入 '%s'" | |
3939 | ||
3940 | #: sequencer.c:3005 | |
3941 | #, c-format | |
3942 | msgid "could not even attempt to merge '%.*s'" | |
3943 | msgstr "甚至不能尝试合并 '%.*s'" | |
3944 | ||
3945 | #: sequencer.c:3021 | |
3946 | msgid "merge: Unable to write new index file" | |
3947 | msgstr "合并:无法写入新索引文件" | |
3948 | ||
3949 | #: sequencer.c:3088 | |
1a79b2f1 | 3950 | #, c-format |
a4f16749 JX |
3951 | msgid "Applied autostash.\n" |
3952 | msgstr "已应用 autostash。\n" | |
1a79b2f1 | 3953 | |
fd8cb379 | 3954 | #: sequencer.c:3100 |
1a79b2f1 JX |
3955 | #, c-format |
3956 | msgid "cannot store %s" | |
3957 | msgstr "不能存储 %s" | |
3958 | ||
fd8cb379 | 3959 | #: sequencer.c:3103 git-rebase.sh:188 |
1a79b2f1 JX |
3960 | #, c-format |
3961 | msgid "" | |
3962 | "Applying autostash resulted in conflicts.\n" | |
3963 | "Your changes are safe in the stash.\n" | |
3964 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
3965 | msgstr "" | |
3966 | "应用 autostash 导致冲突。\n" | |
a4f16749 | 3967 | "您的修改安全地保存在贮藏区中。\n" |
1a79b2f1 JX |
3968 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
3969 | ||
fd8cb379 JX |
3970 | #: sequencer.c:3134 |
3971 | #, c-format | |
3972 | msgid "" | |
3973 | "Could not execute the todo command\n" | |
3974 | "\n" | |
3975 | " %.*s\n" | |
3976 | "It has been rescheduled; To edit the command before continuing, please\n" | |
3977 | "edit the todo list first:\n" | |
3978 | "\n" | |
3979 | " git rebase --edit-todo\n" | |
3980 | " git rebase --continue\n" | |
3981 | msgstr "" | |
3982 | "无法执行待办命令\n" | |
3983 | "\n" | |
3984 | " %.*s\n" | |
3985 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
3986 | "\n" | |
3987 | " git rebase --edit-todo\n" | |
3988 | " git rebase --continue\n" | |
3989 | ||
3990 | #: sequencer.c:3202 | |
1a79b2f1 | 3991 | #, c-format |
87cb7997 JX |
3992 | msgid "Stopped at %s... %.*s\n" |
3993 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 3994 | |
fd8cb379 | 3995 | #: sequencer.c:3264 |
1a79b2f1 JX |
3996 | #, c-format |
3997 | msgid "unknown command %d" | |
3998 | msgstr "未知命令 %d" | |
3999 | ||
fd8cb379 | 4000 | #: sequencer.c:3309 |
1a79b2f1 JX |
4001 | msgid "could not read orig-head" |
4002 | msgstr "不能读取 orig-head" | |
4003 | ||
fd8cb379 | 4004 | #: sequencer.c:3314 sequencer.c:4352 |
1a79b2f1 JX |
4005 | msgid "could not read 'onto'" |
4006 | msgstr "不能读取 'onto'" | |
4007 | ||
fd8cb379 | 4008 | #: sequencer.c:3328 |
1a79b2f1 JX |
4009 | #, c-format |
4010 | msgid "could not update HEAD to %s" | |
4011 | msgstr "不能更新 HEAD 为 %s" | |
4012 | ||
fd8cb379 | 4013 | #: sequencer.c:3414 |
1a79b2f1 JX |
4014 | msgid "cannot rebase: You have unstaged changes." |
4015 | msgstr "不能变基:您有未暂存的变更。" | |
4016 | ||
fd8cb379 | 4017 | #: sequencer.c:3423 |
1a79b2f1 JX |
4018 | msgid "cannot amend non-existing commit" |
4019 | msgstr "不能修补不存在的提交" | |
4020 | ||
fd8cb379 | 4021 | #: sequencer.c:3425 |
1a79b2f1 JX |
4022 | #, c-format |
4023 | msgid "invalid file: '%s'" | |
4024 | msgstr "无效文件:'%s'" | |
4025 | ||
fd8cb379 | 4026 | #: sequencer.c:3427 |
1a79b2f1 JX |
4027 | #, c-format |
4028 | msgid "invalid contents: '%s'" | |
4029 | msgstr "无效内容:'%s'" | |
4030 | ||
fd8cb379 | 4031 | #: sequencer.c:3430 |
1a79b2f1 JX |
4032 | msgid "" |
4033 | "\n" | |
4034 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
4035 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
4036 | msgstr "" |
4037 | "\n" | |
4038 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 4039 | |
fd8cb379 JX |
4040 | #: sequencer.c:3455 sequencer.c:3493 |
4041 | #, c-format | |
4042 | msgid "could not write file: '%s'" | |
4043 | msgstr "不能写入文件:'%s'" | |
4044 | ||
4045 | #: sequencer.c:3508 | |
4046 | msgid "could not remove CHERRY_PICK_HEAD" | |
4047 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
4048 | ||
4049 | #: sequencer.c:3515 | |
1a79b2f1 JX |
4050 | msgid "could not commit staged changes." |
4051 | msgstr "不能提交暂存的修改。" | |
4052 | ||
fd8cb379 | 4053 | #: sequencer.c:3612 |
a0b6b246 JX |
4054 | #, c-format |
4055 | msgid "%s: can't cherry-pick a %s" | |
4056 | msgstr "%s:不能拣选一个%s" | |
4057 | ||
fd8cb379 | 4058 | #: sequencer.c:3616 |
a0b6b246 JX |
4059 | #, c-format |
4060 | msgid "%s: bad revision" | |
4061 | msgstr "%s:错误的版本" | |
4062 | ||
fd8cb379 | 4063 | #: sequencer.c:3649 |
a0b6b246 JX |
4064 | msgid "can't revert as initial commit" |
4065 | msgstr "不能作为初始提交回退" | |
4066 | ||
fd8cb379 | 4067 | #: sequencer.c:4098 |
6937cb4e JX |
4068 | msgid "make_script: unhandled options" |
4069 | msgstr "make_script:有未能处理的选项" | |
4070 | ||
fd8cb379 | 4071 | #: sequencer.c:4101 |
6937cb4e JX |
4072 | msgid "make_script: error preparing revisions" |
4073 | msgstr "make_script:准备版本时错误" | |
4074 | ||
fd8cb379 | 4075 | #: sequencer.c:4142 sequencer.c:4177 |
6937cb4e JX |
4076 | #, c-format |
4077 | msgid "unusable todo list: '%s'" | |
4078 | msgstr "不可用的待办列表:'%s'" | |
4079 | ||
fd8cb379 | 4080 | #: sequencer.c:4236 |
6937cb4e JX |
4081 | #, c-format |
4082 | msgid "" | |
4083 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
4084 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
4085 | ||
fd8cb379 | 4086 | #: sequencer.c:4302 |
6937cb4e JX |
4087 | #, c-format |
4088 | msgid "" | |
4089 | "Warning: some commits may have been dropped accidentally.\n" | |
4090 | "Dropped commits (newer to older):\n" | |
4091 | msgstr "" | |
4092 | "警告:一些提交可能被意外丢弃。\n" | |
4093 | "丢弃的提交(从新到旧):\n" | |
4094 | ||
fd8cb379 | 4095 | #: sequencer.c:4309 |
6937cb4e JX |
4096 | #, c-format |
4097 | msgid "" | |
4098 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
4099 | "\n" | |
4100 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
4101 | "warnings.\n" | |
4102 | "The possible behaviours are: ignore, warn, error.\n" | |
4103 | "\n" | |
4104 | msgstr "" | |
4105 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
4106 | "\n" | |
4107 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
4108 | "可选值有:ignore、warn、error。\n" | |
4109 | "\n" | |
4110 | ||
fd8cb379 | 4111 | #: sequencer.c:4321 |
6937cb4e JX |
4112 | #, c-format |
4113 | msgid "" | |
4114 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
4115 | "continue'.\n" | |
4116 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
4117 | msgstr "" | |
4118 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
4119 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
4120 | ||
fd8cb379 | 4121 | #: sequencer.c:4375 |
6937cb4e | 4122 | #, c-format |
5809aa05 JX |
4123 | msgid "could not parse commit '%s'" |
4124 | msgstr "不能解析提交 '%s'" | |
6937cb4e | 4125 | |
fd8cb379 | 4126 | #: sequencer.c:4490 |
6937cb4e JX |
4127 | msgid "the script was already rearranged." |
4128 | msgstr "脚本已经重新编排。" | |
4129 | ||
fd8cb379 | 4130 | #: setup.c:123 |
31e5e17b JX |
4131 | #, c-format |
4132 | msgid "'%s' is outside repository" | |
4133 | msgstr "'%s' 在仓库之外" | |
4134 | ||
fd8cb379 | 4135 | #: setup.c:172 |
a0b6b246 | 4136 | #, c-format |
6792b93b | 4137 | msgid "" |
a0b6b246 JX |
4138 | "%s: no such path in the working tree.\n" |
4139 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
4140 | msgstr "" | |
4141 | "%s:工作区中无此路径。\n" | |
58b6f078 | 4142 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 4143 | |
fd8cb379 | 4144 | #: setup.c:185 |
90314792 | 4145 | #, c-format |
a0b6b246 JX |
4146 | msgid "" |
4147 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
4148 | "Use '--' to separate paths from revisions, like this:\n" | |
4149 | "'git <command> [<revision>...] -- [<file>...]'" | |
4150 | msgstr "" | |
4151 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
4152 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 4153 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 4154 | |
fd8cb379 | 4155 | #: setup.c:234 |
31e5e17b JX |
4156 | #, c-format |
4157 | msgid "option '%s' must come before non-option arguments" | |
4158 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
4159 | ||
fd8cb379 | 4160 | #: setup.c:253 |
a0b6b246 JX |
4161 | #, c-format |
4162 | msgid "" | |
4163 | "ambiguous argument '%s': both revision and filename\n" | |
4164 | "Use '--' to separate paths from revisions, like this:\n" | |
4165 | "'git <command> [<revision>...] -- [<file>...]'" | |
4166 | msgstr "" | |
4167 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
4168 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 4169 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 4170 | |
fd8cb379 | 4171 | #: setup.c:389 |
31e5e17b JX |
4172 | msgid "unable to set up work tree using invalid config" |
4173 | msgstr "无法使用无效配置来创建工作区" | |
4174 | ||
fd8cb379 | 4175 | #: setup.c:393 |
31e5e17b | 4176 | msgid "this operation must be run in a work tree" |
610f8099 | 4177 | msgstr "该操作必须在一个工作区中运行" |
31e5e17b | 4178 | |
fd8cb379 | 4179 | #: setup.c:503 |
a0b6b246 JX |
4180 | #, c-format |
4181 | msgid "Expected git repo version <= %d, found %d" | |
4182 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 4183 | |
fd8cb379 | 4184 | #: setup.c:511 |
a0b6b246 JX |
4185 | msgid "unknown repository extensions found:" |
4186 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 4187 | |
fd8cb379 | 4188 | #: setup.c:530 |
1003b3a5 | 4189 | #, c-format |
31e5e17b JX |
4190 | msgid "error opening '%s'" |
4191 | msgstr "无法打开 '%s'" | |
1003b3a5 | 4192 | |
fd8cb379 | 4193 | #: setup.c:532 |
31e5e17b JX |
4194 | #, c-format |
4195 | msgid "too large to be a .git file: '%s'" | |
610f8099 | 4196 | msgstr "文件太大,无法作为 .git 文件:'%s'" |
31e5e17b | 4197 | |
fd8cb379 | 4198 | #: setup.c:534 |
31e5e17b JX |
4199 | #, c-format |
4200 | msgid "error reading %s" | |
4201 | msgstr "无法读取 %s" | |
4202 | ||
fd8cb379 | 4203 | #: setup.c:536 |
31e5e17b JX |
4204 | #, c-format |
4205 | msgid "invalid gitfile format: %s" | |
4206 | msgstr "无效的 gitfile 格式:%s" | |
4207 | ||
fd8cb379 | 4208 | #: setup.c:538 |
31e5e17b JX |
4209 | #, c-format |
4210 | msgid "no path in gitfile: %s" | |
4211 | msgstr "在 gitfile 中没有路径:%s" | |
4212 | ||
fd8cb379 | 4213 | #: setup.c:540 |
31e5e17b JX |
4214 | #, c-format |
4215 | msgid "not a git repository: %s" | |
4216 | msgstr "不是一个 git 仓库:%s" | |
4217 | ||
fd8cb379 | 4218 | #: setup.c:639 |
31e5e17b JX |
4219 | #, c-format |
4220 | msgid "'$%s' too big" | |
4221 | msgstr "'$%s' 太大" | |
4222 | ||
fd8cb379 | 4223 | #: setup.c:653 |
31e5e17b JX |
4224 | #, c-format |
4225 | msgid "not a git repository: '%s'" | |
4226 | msgstr "不是一个 git 仓库:'%s'" | |
4227 | ||
fd8cb379 | 4228 | #: setup.c:682 setup.c:684 setup.c:715 |
31e5e17b JX |
4229 | #, c-format |
4230 | msgid "cannot chdir to '%s'" | |
4231 | msgstr "不能切换目录到 '%s'" | |
4232 | ||
fd8cb379 | 4233 | #: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 |
31e5e17b | 4234 | msgid "cannot come back to cwd" |
a0b6b246 | 4235 | msgstr "无法返回当前工作目录" |
1003b3a5 | 4236 | |
fd8cb379 | 4237 | #: setup.c:813 |
31e5e17b JX |
4238 | #, c-format |
4239 | msgid "not a git repository (or any of the parent directories): %s" | |
4240 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
4241 | ||
fd8cb379 | 4242 | #: setup.c:824 |
31e5e17b JX |
4243 | #, c-format |
4244 | msgid "failed to stat '%*s%s%s'" | |
4245 | msgstr "无法获取 '%*s%s%s' 状态(stat)" | |
4246 | ||
fd8cb379 | 4247 | #: setup.c:1054 |
a0b6b246 JX |
4248 | msgid "Unable to read current working directory" |
4249 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 4250 | |
fd8cb379 | 4251 | #: setup.c:1066 setup.c:1072 |
87cb7997 | 4252 | #, c-format |
31e5e17b | 4253 | msgid "cannot change to '%s'" |
87cb7997 JX |
4254 | msgstr "不能切换到 '%s'" |
4255 | ||
fd8cb379 | 4256 | #: setup.c:1085 |
a0b6b246 JX |
4257 | #, c-format |
4258 | msgid "" | |
31e5e17b | 4259 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
4260 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
4261 | msgstr "" | |
31e5e17b | 4262 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 4263 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 4264 | |
fd8cb379 | 4265 | #: setup.c:1168 |
a0b6b246 JX |
4266 | #, c-format |
4267 | msgid "" | |
31e5e17b | 4268 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
4269 | "The owner of files must always have read and write permissions." |
4270 | msgstr "" | |
31e5e17b | 4271 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 4272 | "文件属主必须始终拥有读写权限。" |
6792b93b | 4273 | |
fd8cb379 | 4274 | #: setup.c:1211 |
31e5e17b JX |
4275 | msgid "open /dev/null or dup failed" |
4276 | msgstr "不能打开或者复制 /dev/null" | |
4277 | ||
fd8cb379 | 4278 | #: setup.c:1226 |
31e5e17b JX |
4279 | msgid "fork failed" |
4280 | msgstr "fork 失败" | |
4281 | ||
fd8cb379 | 4282 | #: setup.c:1231 |
31e5e17b JX |
4283 | msgid "setsid failed" |
4284 | msgstr "setsid 失败" | |
4285 | ||
fd8cb379 | 4286 | #: sha1-file.c:625 |
a0b6b246 JX |
4287 | #, c-format |
4288 | msgid "path '%s' does not exist" | |
4289 | msgstr "路径 '%s' 不存在" | |
4290 | ||
fd8cb379 | 4291 | #: sha1-file.c:651 |
a0b6b246 JX |
4292 | #, c-format |
4293 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
4294 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
4295 | ||
fd8cb379 | 4296 | #: sha1-file.c:657 |
a0b6b246 JX |
4297 | #, c-format |
4298 | msgid "reference repository '%s' is not a local repository." | |
4299 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
4300 | ||
fd8cb379 | 4301 | #: sha1-file.c:663 |
a0b6b246 JX |
4302 | #, c-format |
4303 | msgid "reference repository '%s' is shallow" | |
4304 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
4305 | ||
fd8cb379 | 4306 | #: sha1-file.c:671 |
a0b6b246 JX |
4307 | #, c-format |
4308 | msgid "reference repository '%s' is grafted" | |
fd8cb379 | 4309 | msgstr "参考仓库 '%s' 已被移植" |
a0b6b246 | 4310 | |
fd8cb379 | 4311 | #: sha1-name.c:442 |
a0b6b246 JX |
4312 | #, c-format |
4313 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 4314 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 4315 | |
fd8cb379 | 4316 | #: sha1-name.c:453 |
a0b6b246 JX |
4317 | msgid "The candidates are:" |
4318 | msgstr "候选者有:" | |
4319 | ||
fd8cb379 | 4320 | #: sha1-name.c:695 |
a0b6b246 JX |
4321 | msgid "" |
4322 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
4323 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
4324 | "may be created by mistake. For example,\n" | |
4325 | "\n" | |
4326 | " git checkout -b $br $(git rev-parse ...)\n" | |
4327 | "\n" | |
4328 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
4329 | "examine these refs and maybe delete them. Turn this message off by\n" | |
4330 | "running \"git config advice.objectNameWarning false\"" | |
4331 | msgstr "" | |
4332 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
4333 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
4334 | "\n" | |
4335 | " git checkout -b $br $(git rev-parse ...)\n" | |
4336 | "\n" | |
4337 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
4338 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
4339 | "命令关闭本消息通知。" | |
4340 | ||
fd8cb379 | 4341 | #: submodule.c:97 submodule.c:131 |
a0b6b246 JX |
4342 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
4343 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
4344 | ||
fd8cb379 | 4345 | #: submodule.c:101 submodule.c:135 |
a0b6b246 JX |
4346 | #, c-format |
4347 | msgid "Could not find section in .gitmodules where path=%s" | |
4348 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
4349 | ||
fd8cb379 | 4350 | #: submodule.c:109 |
a0b6b246 JX |
4351 | #, c-format |
4352 | msgid "Could not update .gitmodules entry %s" | |
4353 | msgstr "不能更新 .gitmodules 条目 %s" | |
4354 | ||
fd8cb379 | 4355 | #: submodule.c:142 |
a0b6b246 JX |
4356 | #, c-format |
4357 | msgid "Could not remove .gitmodules entry for %s" | |
4358 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
4359 | ||
fd8cb379 | 4360 | #: submodule.c:153 |
a0b6b246 JX |
4361 | msgid "staging updated .gitmodules failed" |
4362 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
4363 | ||
fd8cb379 | 4364 | #: submodule.c:315 |
a4f16749 JX |
4365 | #, c-format |
4366 | msgid "in unpopulated submodule '%s'" | |
4367 | msgstr "位于未检出的子模组 '%s'" | |
4368 | ||
fd8cb379 | 4369 | #: submodule.c:346 |
a4f16749 JX |
4370 | #, c-format |
4371 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
4372 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
4373 | ||
fd8cb379 | 4374 | #: submodule.c:837 |
6937cb4e JX |
4375 | #, c-format |
4376 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 4377 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 4378 | |
fd8cb379 | 4379 | #: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 |
6937cb4e JX |
4380 | msgid "Failed to resolve HEAD as a valid ref." |
4381 | msgstr "无法将 HEAD 解析为有效引用。" | |
4382 | ||
fd8cb379 | 4383 | #: submodule.c:1375 |
1a79b2f1 | 4384 | #, c-format |
87cb7997 | 4385 | msgid "'%s' not recognized as a git repository" |
65e2041e | 4386 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 4387 | |
fd8cb379 | 4388 | #: submodule.c:1513 |
1a79b2f1 | 4389 | #, c-format |
87cb7997 JX |
4390 | msgid "could not start 'git status' in submodule '%s'" |
4391 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 4392 | |
fd8cb379 | 4393 | #: submodule.c:1526 |
87cb7997 JX |
4394 | #, c-format |
4395 | msgid "could not run 'git status' in submodule '%s'" | |
4396 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
4397 | ||
fd8cb379 | 4398 | #: submodule.c:1619 |
87cb7997 JX |
4399 | #, c-format |
4400 | msgid "submodule '%s' has dirty index" | |
4401 | msgstr "子模组 '%s' 中有脏索引" | |
4402 | ||
fd8cb379 | 4403 | #: submodule.c:1718 |
1a79b2f1 JX |
4404 | #, c-format |
4405 | msgid "" | |
4406 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
4407 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
4408 | ||
fd8cb379 | 4409 | #: submodule.c:1730 submodule.c:1786 |
1a79b2f1 JX |
4410 | #, c-format |
4411 | msgid "could not lookup name for submodule '%s'" | |
4412 | msgstr "不能查询子模组 '%s' 的名称" | |
4413 | ||
fd8cb379 JX |
4414 | #: submodule.c:1734 builtin/submodule--helper.c:1261 |
4415 | #: builtin/submodule--helper.c:1271 | |
1a79b2f1 JX |
4416 | #, c-format |
4417 | msgid "could not create directory '%s'" | |
4418 | msgstr "不能创建目录 '%s'" | |
4419 | ||
fd8cb379 | 4420 | #: submodule.c:1737 |
1a79b2f1 JX |
4421 | #, c-format |
4422 | msgid "" | |
4423 | "Migrating git directory of '%s%s' from\n" | |
4424 | "'%s' to\n" | |
4425 | "'%s'\n" | |
4426 | msgstr "" | |
4427 | "将 '%s%s' 的 git 目录从\n" | |
4428 | "'%s' 迁移至\n" | |
4429 | "'%s'\n" | |
4430 | ||
fd8cb379 | 4431 | #: submodule.c:1821 |
1a79b2f1 JX |
4432 | #, c-format |
4433 | msgid "could not recurse into submodule '%s'" | |
4434 | msgstr "无法递归进子模组路径 '%s'" | |
4435 | ||
fd8cb379 | 4436 | #: submodule.c:1865 |
87cb7997 JX |
4437 | msgid "could not start ls-files in .." |
4438 | msgstr "无法在 .. 中启动 ls-files" | |
4439 | ||
fd8cb379 | 4440 | #: submodule.c:1904 |
87cb7997 JX |
4441 | #, c-format |
4442 | msgid "ls-tree returned unexpected return code %d" | |
4443 | msgstr "ls-tree 返回未知返回值 %d" | |
4444 | ||
fd8cb379 JX |
4445 | #: submodule-config.c:230 |
4446 | #, c-format | |
4447 | msgid "ignoring suspicious submodule name: %s" | |
4448 | msgstr "忽略可疑的子模组名称:%s" | |
4449 | ||
4450 | #: submodule-config.c:294 | |
6937cb4e JX |
4451 | msgid "negative values not allowed for submodule.fetchjobs" |
4452 | msgstr "submodule.fetchjobs 不允许为负值" | |
4453 | ||
fd8cb379 | 4454 | #: submodule-config.c:467 |
a0b6b246 JX |
4455 | #, c-format |
4456 | msgid "invalid value for %s" | |
4457 | msgstr "%s 的值无效" | |
4458 | ||
6937cb4e | 4459 | #: trailer.c:238 |
a0b6b246 JX |
4460 | #, c-format |
4461 | msgid "running trailer command '%s' failed" | |
4462 | msgstr "执行 trailer 命令 '%s' 失败" | |
4463 | ||
6937cb4e JX |
4464 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
4465 | #: trailer.c:557 | |
a0b6b246 JX |
4466 | #, c-format |
4467 | msgid "unknown value '%s' for key '%s'" | |
4468 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
4469 | ||
fd8cb379 | 4470 | #: trailer.c:539 trailer.c:544 builtin/remote.c:293 |
a0b6b246 JX |
4471 | #, c-format |
4472 | msgid "more than one %s" | |
4473 | msgstr "多于一个 %s" | |
4474 | ||
6937cb4e | 4475 | #: trailer.c:730 |
a0b6b246 JX |
4476 | #, c-format |
4477 | msgid "empty trailer token in trailer '%.*s'" | |
4478 | msgstr "签名 '%.*s' 的键为空" | |
4479 | ||
6937cb4e | 4480 | #: trailer.c:750 |
a0b6b246 JX |
4481 | #, c-format |
4482 | msgid "could not read input file '%s'" | |
4483 | msgstr "不能读取输入文件 '%s'" | |
4484 | ||
6937cb4e | 4485 | #: trailer.c:753 |
a0b6b246 JX |
4486 | msgid "could not read from stdin" |
4487 | msgstr "不能自标准输入读取" | |
4488 | ||
6937cb4e | 4489 | #: trailer.c:1008 builtin/am.c:46 |
a0b6b246 JX |
4490 | #, c-format |
4491 | msgid "could not stat %s" | |
65e2041e | 4492 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 4493 | |
6937cb4e | 4494 | #: trailer.c:1010 |
a0b6b246 JX |
4495 | #, c-format |
4496 | msgid "file %s is not a regular file" | |
4497 | msgstr "文件 %s 不是一个正规文件" | |
4498 | ||
6937cb4e | 4499 | #: trailer.c:1012 |
a0b6b246 JX |
4500 | #, c-format |
4501 | msgid "file %s is not writable by user" | |
4502 | msgstr "文件 %s 用户不可写" | |
4503 | ||
6937cb4e | 4504 | #: trailer.c:1024 |
a0b6b246 JX |
4505 | msgid "could not open temporary file" |
4506 | msgstr "不能打开临时文件" | |
4507 | ||
6937cb4e | 4508 | #: trailer.c:1064 |
a0b6b246 JX |
4509 | #, c-format |
4510 | msgid "could not rename temporary file to %s" | |
4511 | msgstr "不能重命名临时文件为 %s" | |
4512 | ||
fd8cb379 | 4513 | #: transport.c:116 |
a0b6b246 JX |
4514 | #, c-format |
4515 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
4516 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
4517 | ||
fd8cb379 | 4518 | #: transport.c:208 |
a0b6b246 JX |
4519 | #, c-format |
4520 | msgid "transport: invalid depth option '%s'" | |
4521 | msgstr "传输:无效的深度选项 '%s'" | |
4522 | ||
fd8cb379 JX |
4523 | #: transport.c:584 |
4524 | msgid "could not parse transport.color.* config" | |
4525 | msgstr "不能解析 transport.color.* 配置" | |
4526 | ||
4527 | #: transport.c:996 | |
a0b6b246 JX |
4528 | #, c-format |
4529 | msgid "" | |
4530 | "The following submodule paths contain changes that can\n" | |
4531 | "not be found on any remote:\n" | |
4532 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
4533 | ||
fd8cb379 | 4534 | #: transport.c:1000 |
a0b6b246 JX |
4535 | #, c-format |
4536 | msgid "" | |
4537 | "\n" | |
4538 | "Please try\n" | |
4539 | "\n" | |
4540 | "\tgit push --recurse-submodules=on-demand\n" | |
4541 | "\n" | |
4542 | "or cd to the path and use\n" | |
4543 | "\n" | |
4544 | "\tgit push\n" | |
4545 | "\n" | |
4546 | "to push them to a remote.\n" | |
4547 | "\n" | |
4548 | msgstr "" | |
4549 | "\n" | |
4550 | "请尝试\n" | |
4551 | "\n" | |
4552 | "\tgit push --recurse-submodules=on-demand\n" | |
4553 | "\n" | |
4554 | "或者进入到子目录执行\n" | |
4555 | "\n" | |
4556 | "\tgit push\n" | |
4557 | "\n" | |
4558 | "以推送至远程。\n" | |
4559 | "\n" | |
4560 | ||
fd8cb379 | 4561 | #: transport.c:1008 |
a0b6b246 JX |
4562 | msgid "Aborting." |
4563 | msgstr "正在终止。" | |
4564 | ||
fd8cb379 | 4565 | #: transport-helper.c:1087 |
a0b6b246 JX |
4566 | #, c-format |
4567 | msgid "Could not read ref %s" | |
4568 | msgstr "不能读取引用 %s" | |
4569 | ||
4570 | #: tree-walk.c:31 | |
4571 | msgid "too-short tree object" | |
4572 | msgstr "太短的树对象" | |
4573 | ||
4574 | #: tree-walk.c:37 | |
4575 | msgid "malformed mode in tree entry" | |
29004bbb | 4576 | msgstr "树对象中的条目模式错误" |
a0b6b246 JX |
4577 | |
4578 | #: tree-walk.c:41 | |
4579 | msgid "empty filename in tree entry" | |
4580 | msgstr "树对象条目中空的文件名" | |
4581 | ||
fd8cb379 | 4582 | #: tree-walk.c:113 |
a0b6b246 JX |
4583 | msgid "too-short tree file" |
4584 | msgstr "太短的树文件" | |
4585 | ||
fd8cb379 | 4586 | #: unpack-trees.c:111 |
a0b6b246 JX |
4587 | #, c-format |
4588 | msgid "" | |
4589 | "Your local changes to the following files would be overwritten by checkout:\n" | |
4590 | "%%sPlease commit your changes or stash them before you switch branches." | |
4591 | msgstr "" | |
4592 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 4593 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 4594 | |
fd8cb379 | 4595 | #: unpack-trees.c:113 |
a0b6b246 JX |
4596 | #, c-format |
4597 | msgid "" | |
4598 | "Your local changes to the following files would be overwritten by checkout:\n" | |
4599 | "%%s" | |
4600 | msgstr "" | |
4601 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
4602 | "%%s" | |
4603 | ||
fd8cb379 | 4604 | #: unpack-trees.c:116 |
a0b6b246 JX |
4605 | #, c-format |
4606 | msgid "" | |
4607 | "Your local changes to the following files would be overwritten by merge:\n" | |
4608 | "%%sPlease commit your changes or stash them before you merge." | |
4609 | msgstr "" | |
4610 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 4611 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 4612 | |
fd8cb379 | 4613 | #: unpack-trees.c:118 |
a0b6b246 JX |
4614 | #, c-format |
4615 | msgid "" | |
4616 | "Your local changes to the following files would be overwritten by merge:\n" | |
4617 | "%%s" | |
4618 | msgstr "" | |
4619 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
4620 | "%%s" | |
4621 | ||
fd8cb379 | 4622 | #: unpack-trees.c:121 |
a0b6b246 JX |
4623 | #, c-format |
4624 | msgid "" | |
4625 | "Your local changes to the following files would be overwritten by %s:\n" | |
4626 | "%%sPlease commit your changes or stash them before you %s." | |
4627 | msgstr "" | |
4628 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 4629 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 4630 | |
fd8cb379 | 4631 | #: unpack-trees.c:123 |
a0b6b246 JX |
4632 | #, c-format |
4633 | msgid "" | |
4634 | "Your local changes to the following files would be overwritten by %s:\n" | |
4635 | "%%s" | |
4636 | msgstr "" | |
4637 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
4638 | "%%s" | |
c04f5ac3 | 4639 | |
fd8cb379 | 4640 | #: unpack-trees.c:128 |
a0b6b246 JX |
4641 | #, c-format |
4642 | msgid "" | |
1a79b2f1 | 4643 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
4644 | "%s" |
4645 | msgstr "" | |
4646 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
4647 | "%s" | |
1b7f4a34 | 4648 | |
fd8cb379 | 4649 | #: unpack-trees.c:132 |
a0b6b246 JX |
4650 | #, c-format |
4651 | msgid "" | |
4652 | "The following untracked working tree files would be removed by checkout:\n" | |
4653 | "%%sPlease move or remove them before you switch branches." | |
4654 | msgstr "" | |
4655 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
4656 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 4657 | |
fd8cb379 | 4658 | #: unpack-trees.c:134 |
a0b6b246 JX |
4659 | #, c-format |
4660 | msgid "" | |
4661 | "The following untracked working tree files would be removed by checkout:\n" | |
4662 | "%%s" | |
4663 | msgstr "" | |
4664 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
4665 | "%%s" | |
1003b3a5 | 4666 | |
fd8cb379 | 4667 | #: unpack-trees.c:137 |
a0b6b246 JX |
4668 | #, c-format |
4669 | msgid "" | |
4670 | "The following untracked working tree files would be removed by merge:\n" | |
4671 | "%%sPlease move or remove them before you merge." | |
4672 | msgstr "" | |
4673 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
4674 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 4675 | |
fd8cb379 | 4676 | #: unpack-trees.c:139 |
a0b6b246 JX |
4677 | #, c-format |
4678 | msgid "" | |
4679 | "The following untracked working tree files would be removed by merge:\n" | |
4680 | "%%s" | |
4681 | msgstr "" | |
4682 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
4683 | "%%s" | |
c04f5ac3 | 4684 | |
fd8cb379 | 4685 | #: unpack-trees.c:142 |
a0b6b246 JX |
4686 | #, c-format |
4687 | msgid "" | |
4688 | "The following untracked working tree files would be removed by %s:\n" | |
4689 | "%%sPlease move or remove them before you %s." | |
4690 | msgstr "" | |
4691 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
4692 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 4693 | |
fd8cb379 | 4694 | #: unpack-trees.c:144 |
a0b6b246 JX |
4695 | #, c-format |
4696 | msgid "" | |
4697 | "The following untracked working tree files would be removed by %s:\n" | |
4698 | "%%s" | |
4699 | msgstr "" | |
4700 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
4701 | "%%s" | |
c04f5ac3 | 4702 | |
fd8cb379 | 4703 | #: unpack-trees.c:150 |
a0b6b246 JX |
4704 | #, c-format |
4705 | msgid "" | |
4706 | "The following untracked working tree files would be overwritten by " | |
4707 | "checkout:\n" | |
4708 | "%%sPlease move or remove them before you switch branches." | |
4709 | msgstr "" | |
4710 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
4711 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 4712 | |
fd8cb379 | 4713 | #: unpack-trees.c:152 |
1003b3a5 | 4714 | #, c-format |
4dcdc3d8 | 4715 | msgid "" |
a0b6b246 JX |
4716 | "The following untracked working tree files would be overwritten by " |
4717 | "checkout:\n" | |
4718 | "%%s" | |
4dcdc3d8 | 4719 | msgstr "" |
a0b6b246 JX |
4720 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
4721 | "%%s" | |
1003b3a5 | 4722 | |
fd8cb379 | 4723 | #: unpack-trees.c:155 |
c04f5ac3 | 4724 | #, c-format |
a0b6b246 JX |
4725 | msgid "" |
4726 | "The following untracked working tree files would be overwritten by merge:\n" | |
4727 | "%%sPlease move or remove them before you merge." | |
4728 | msgstr "" | |
4729 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
4730 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 4731 | |
fd8cb379 | 4732 | #: unpack-trees.c:157 |
a0b6b246 JX |
4733 | #, c-format |
4734 | msgid "" | |
4735 | "The following untracked working tree files would be overwritten by merge:\n" | |
4736 | "%%s" | |
4737 | msgstr "" | |
4738 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
4739 | "%%s" | |
c04f5ac3 | 4740 | |
fd8cb379 | 4741 | #: unpack-trees.c:160 |
a0b6b246 JX |
4742 | #, c-format |
4743 | msgid "" | |
4744 | "The following untracked working tree files would be overwritten by %s:\n" | |
4745 | "%%sPlease move or remove them before you %s." | |
4746 | msgstr "" | |
4747 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
4748 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 4749 | |
fd8cb379 | 4750 | #: unpack-trees.c:162 |
07432cef | 4751 | #, c-format |
a0b6b246 JX |
4752 | msgid "" |
4753 | "The following untracked working tree files would be overwritten by %s:\n" | |
4754 | "%%s" | |
4755 | msgstr "" | |
4756 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
4757 | "%%s" | |
c04f5ac3 | 4758 | |
fd8cb379 | 4759 | #: unpack-trees.c:170 |
07432cef | 4760 | #, c-format |
a0b6b246 JX |
4761 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
4762 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 4763 | |
fd8cb379 | 4764 | #: unpack-trees.c:173 |
07432cef | 4765 | #, c-format |
ef317cd5 | 4766 | msgid "" |
6937cb4e | 4767 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
a0b6b246 JX |
4768 | "%s" |
4769 | msgstr "" | |
4770 | "无法更新稀疏检出:如下条目不是最新:\n" | |
4771 | "%s" | |
c04f5ac3 | 4772 | |
fd8cb379 | 4773 | #: unpack-trees.c:175 |
07432cef | 4774 | #, c-format |
a0b6b246 JX |
4775 | msgid "" |
4776 | "The following working tree files would be overwritten by sparse checkout " | |
4777 | "update:\n" | |
4778 | "%s" | |
4779 | msgstr "" | |
4780 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
4781 | "%s" | |
c04f5ac3 | 4782 | |
fd8cb379 | 4783 | #: unpack-trees.c:177 |
07432cef | 4784 | #, c-format |
a0b6b246 JX |
4785 | msgid "" |
4786 | "The following working tree files would be removed by sparse checkout " | |
4787 | "update:\n" | |
4788 | "%s" | |
4789 | msgstr "" | |
4790 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
4791 | "%s" | |
c04f5ac3 | 4792 | |
fd8cb379 | 4793 | #: unpack-trees.c:179 |
87cb7997 JX |
4794 | #, c-format |
4795 | msgid "" | |
4796 | "Cannot update submodule:\n" | |
4797 | "%s" | |
4798 | msgstr "" | |
4799 | "无法更新子模组:\n" | |
4800 | "%s" | |
4801 | ||
fd8cb379 | 4802 | #: unpack-trees.c:262 |
07432cef | 4803 | #, c-format |
a0b6b246 JX |
4804 | msgid "Aborting\n" |
4805 | msgstr "终止中\n" | |
ef317cd5 | 4806 | |
fd8cb379 | 4807 | #: unpack-trees.c:344 |
a0b6b246 JX |
4808 | msgid "Checking out files" |
4809 | msgstr "正在检出文件" | |
c04f5ac3 | 4810 | |
87cb7997 | 4811 | #: urlmatch.c:163 |
a0b6b246 JX |
4812 | msgid "invalid URL scheme name or missing '://' suffix" |
4813 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
4814 | ||
87cb7997 | 4815 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 4816 | #, c-format |
a0b6b246 JX |
4817 | msgid "invalid %XX escape sequence" |
4818 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 4819 | |
87cb7997 | 4820 | #: urlmatch.c:215 |
a0b6b246 JX |
4821 | msgid "missing host and scheme is not 'file:'" |
4822 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 4823 | |
87cb7997 | 4824 | #: urlmatch.c:232 |
a0b6b246 JX |
4825 | msgid "a 'file:' URL may not have a port number" |
4826 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 4827 | |
87cb7997 | 4828 | #: urlmatch.c:247 |
a0b6b246 JX |
4829 | msgid "invalid characters in host name" |
4830 | msgstr "主机名中包含无效的字符" | |
90314792 | 4831 | |
87cb7997 | 4832 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
4833 | msgid "invalid port number" |
4834 | msgstr "无效的端口号" | |
c04f5ac3 | 4835 | |
87cb7997 | 4836 | #: urlmatch.c:371 |
a0b6b246 JX |
4837 | msgid "invalid '..' path segment" |
4838 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 4839 | |
31e5e17b | 4840 | #: worktree.c:245 builtin/am.c:2147 |
a77c07d9 | 4841 | #, c-format |
a0b6b246 JX |
4842 | msgid "failed to read '%s'" |
4843 | msgstr "无法读取 '%s'" | |
ef317cd5 | 4844 | |
31e5e17b JX |
4845 | #: worktree.c:291 |
4846 | #, c-format | |
4847 | msgid "'%s' at main working tree is not the repository directory" | |
4848 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
4849 | ||
4850 | #: worktree.c:302 | |
4851 | #, c-format | |
4852 | msgid "'%s' file does not contain absolute path to the working tree location" | |
4853 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
4854 | ||
4855 | #: worktree.c:314 | |
4856 | #, c-format | |
4857 | msgid "'%s' does not exist" | |
4858 | msgstr "'%s' 不存在" | |
4859 | ||
4860 | #: worktree.c:320 | |
4861 | #, c-format | |
4862 | msgid "'%s' is not a .git file, error code %d" | |
4863 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
4864 | ||
4865 | #: worktree.c:328 | |
4866 | #, c-format | |
4867 | msgid "'%s' does not point back to '%s'" | |
4868 | msgstr "'%s' 没有指回到 '%s'" | |
4869 | ||
a4f16749 | 4870 | #: wrapper.c:223 wrapper.c:393 |
c04f5ac3 | 4871 | #, c-format |
a0b6b246 JX |
4872 | msgid "could not open '%s' for reading and writing" |
4873 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 4874 | |
5809aa05 | 4875 | #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 |
fd8cb379 | 4876 | #: builtin/am.c:862 builtin/merge.c:1043 |
c04f5ac3 | 4877 | #, c-format |
a0b6b246 JX |
4878 | msgid "could not open '%s' for reading" |
4879 | msgstr "无法打开 '%s' 进行读取" | |
c04f5ac3 | 4880 | |
a4f16749 | 4881 | #: wrapper.c:424 wrapper.c:624 |
a0b6b246 JX |
4882 | #, c-format |
4883 | msgid "unable to access '%s'" | |
4884 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 4885 | |
a4f16749 | 4886 | #: wrapper.c:632 |
a0b6b246 JX |
4887 | msgid "unable to get current working directory" |
4888 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 4889 | |
fd8cb379 | 4890 | #: wt-status.c:154 |
a0b6b246 JX |
4891 | msgid "Unmerged paths:" |
4892 | msgstr "未合并的路径:" | |
7aea43ff | 4893 | |
a0b6b246 | 4894 | # 译者:注意保持前导空格 |
fd8cb379 | 4895 | #: wt-status.c:181 wt-status.c:208 |
c04f5ac3 | 4896 | #, c-format |
a0b6b246 JX |
4897 | msgid " (use \"git reset %s <file>...\" to unstage)" |
4898 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4899 | |
a0b6b246 | 4900 | # 译者:注意保持前导空格 |
fd8cb379 | 4901 | #: wt-status.c:183 wt-status.c:210 |
a0b6b246 JX |
4902 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
4903 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 4904 | |
a0b6b246 | 4905 | # 译者:注意保持前导空格 |
fd8cb379 | 4906 | #: wt-status.c:187 |
a0b6b246 JX |
4907 | msgid " (use \"git add <file>...\" to mark resolution)" |
4908 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 4909 | |
a0b6b246 | 4910 | # 译者:注意保持前导空格 |
fd8cb379 | 4911 | #: wt-status.c:189 wt-status.c:193 |
a0b6b246 JX |
4912 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
4913 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 4914 | |
a0b6b246 | 4915 | # 译者:注意保持前导空格 |
fd8cb379 | 4916 | #: wt-status.c:191 |
a0b6b246 JX |
4917 | msgid " (use \"git rm <file>...\" to mark resolution)" |
4918 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 4919 | |
fd8cb379 | 4920 | #: wt-status.c:202 wt-status.c:1015 |
a0b6b246 JX |
4921 | msgid "Changes to be committed:" |
4922 | msgstr "要提交的变更:" | |
ef317cd5 | 4923 | |
fd8cb379 | 4924 | #: wt-status.c:220 wt-status.c:1024 |
a0b6b246 JX |
4925 | msgid "Changes not staged for commit:" |
4926 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 4927 | |
a0b6b246 | 4928 | # 译者:注意保持前导空格 |
fd8cb379 | 4929 | #: wt-status.c:224 |
a0b6b246 JX |
4930 | msgid " (use \"git add <file>...\" to update what will be committed)" |
4931 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4932 | |
a0b6b246 | 4933 | # 译者:注意保持前导空格 |
fd8cb379 | 4934 | #: wt-status.c:226 |
a0b6b246 JX |
4935 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
4936 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 4937 | |
a0b6b246 | 4938 | # 译者:注意保持前导空格 |
fd8cb379 | 4939 | #: wt-status.c:227 |
a0b6b246 JX |
4940 | msgid "" |
4941 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
4942 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 4943 | |
a0b6b246 | 4944 | # 译者:注意保持前导空格 |
fd8cb379 | 4945 | #: wt-status.c:229 |
a0b6b246 JX |
4946 | msgid " (commit or discard the untracked or modified content in submodules)" |
4947 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 4948 | |
a0b6b246 | 4949 | # 译者:注意保持前导空格 |
fd8cb379 | 4950 | #: wt-status.c:241 |
a0b6b246 JX |
4951 | #, c-format |
4952 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
4953 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 4954 | |
fd8cb379 | 4955 | #: wt-status.c:256 |
a0b6b246 JX |
4956 | msgid "both deleted:" |
4957 | msgstr "双方删除:" | |
ef317cd5 | 4958 | |
fd8cb379 | 4959 | #: wt-status.c:258 |
a0b6b246 JX |
4960 | msgid "added by us:" |
4961 | msgstr "由我们添加:" | |
4dcdc3d8 | 4962 | |
fd8cb379 | 4963 | #: wt-status.c:260 |
a0b6b246 JX |
4964 | msgid "deleted by them:" |
4965 | msgstr "由他们删除:" | |
ef317cd5 | 4966 | |
fd8cb379 | 4967 | #: wt-status.c:262 |
a0b6b246 JX |
4968 | msgid "added by them:" |
4969 | msgstr "由他们添加:" | |
ef317cd5 | 4970 | |
fd8cb379 | 4971 | #: wt-status.c:264 |
a0b6b246 JX |
4972 | msgid "deleted by us:" |
4973 | msgstr "由我们删除:" | |
ef317cd5 | 4974 | |
fd8cb379 | 4975 | #: wt-status.c:266 |
a0b6b246 JX |
4976 | msgid "both added:" |
4977 | msgstr "双方添加:" | |
5c57d762 | 4978 | |
fd8cb379 | 4979 | #: wt-status.c:268 |
a0b6b246 JX |
4980 | msgid "both modified:" |
4981 | msgstr "双方修改:" | |
5c57d762 | 4982 | |
fd8cb379 | 4983 | #: wt-status.c:278 |
a0b6b246 JX |
4984 | msgid "new file:" |
4985 | msgstr "新文件:" | |
8ada9598 | 4986 | |
fd8cb379 | 4987 | #: wt-status.c:280 |
a0b6b246 JX |
4988 | msgid "copied:" |
4989 | msgstr "拷贝:" | |
8ada9598 | 4990 | |
fd8cb379 | 4991 | #: wt-status.c:282 |
a0b6b246 JX |
4992 | msgid "deleted:" |
4993 | msgstr "删除:" | |
8ada9598 | 4994 | |
fd8cb379 | 4995 | #: wt-status.c:284 |
a0b6b246 JX |
4996 | msgid "modified:" |
4997 | msgstr "修改:" | |
8ada9598 | 4998 | |
fd8cb379 | 4999 | #: wt-status.c:286 |
a0b6b246 JX |
5000 | msgid "renamed:" |
5001 | msgstr "重命名:" | |
5c57d762 | 5002 | |
fd8cb379 | 5003 | #: wt-status.c:288 |
a0b6b246 JX |
5004 | msgid "typechange:" |
5005 | msgstr "类型变更:" | |
8ada9598 | 5006 | |
fd8cb379 | 5007 | #: wt-status.c:290 |
a0b6b246 JX |
5008 | msgid "unknown:" |
5009 | msgstr "未知:" | |
8ada9598 | 5010 | |
fd8cb379 | 5011 | #: wt-status.c:292 |
a0b6b246 JX |
5012 | msgid "unmerged:" |
5013 | msgstr "未合并:" | |
8ada9598 | 5014 | |
a0b6b246 | 5015 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 5016 | #: wt-status.c:372 |
a0b6b246 JX |
5017 | msgid "new commits, " |
5018 | msgstr "新提交, " | |
8ada9598 | 5019 | |
a0b6b246 | 5020 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 5021 | #: wt-status.c:374 |
a0b6b246 JX |
5022 | msgid "modified content, " |
5023 | msgstr "修改的内容, " | |
1b7f4a34 | 5024 | |
a0b6b246 | 5025 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 5026 | #: wt-status.c:376 |
a0b6b246 JX |
5027 | msgid "untracked content, " |
5028 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 5029 | |
fd8cb379 | 5030 | #: wt-status.c:853 |
a4f16749 JX |
5031 | #, c-format |
5032 | msgid "Your stash currently has %d entry" | |
5033 | msgid_plural "Your stash currently has %d entries" | |
5034 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
5035 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
5036 | ||
fd8cb379 | 5037 | #: wt-status.c:885 |
a0b6b246 JX |
5038 | msgid "Submodules changed but not updated:" |
5039 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 5040 | |
fd8cb379 | 5041 | #: wt-status.c:887 |
a0b6b246 JX |
5042 | msgid "Submodule changes to be committed:" |
5043 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 5044 | |
fd8cb379 | 5045 | #: wt-status.c:969 |
a0b6b246 | 5046 | msgid "" |
6937cb4e JX |
5047 | "Do not modify or remove the line above.\n" |
5048 | "Everything below it will be ignored." | |
a0b6b246 | 5049 | msgstr "" |
6937cb4e JX |
5050 | "不要改动或删除上面的一行。\n" |
5051 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 5052 | |
fd8cb379 | 5053 | #: wt-status.c:1084 |
a0b6b246 JX |
5054 | msgid "You have unmerged paths." |
5055 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 5056 | |
a0b6b246 | 5057 | # 译者:注意保持前导空格 |
fd8cb379 | 5058 | #: wt-status.c:1087 |
a0b6b246 JX |
5059 | msgid " (fix conflicts and run \"git commit\")" |
5060 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 5061 | |
a0b6b246 | 5062 | # 译者:注意保持前导空格 |
fd8cb379 | 5063 | #: wt-status.c:1089 |
a0b6b246 JX |
5064 | msgid " (use \"git merge --abort\" to abort the merge)" |
5065 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 5066 | |
fd8cb379 | 5067 | #: wt-status.c:1094 |
a0b6b246 JX |
5068 | msgid "All conflicts fixed but you are still merging." |
5069 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 5070 | |
a0b6b246 | 5071 | # 译者:注意保持前导空格 |
fd8cb379 | 5072 | #: wt-status.c:1097 |
a0b6b246 JX |
5073 | msgid " (use \"git commit\" to conclude merge)" |
5074 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 5075 | |
fd8cb379 | 5076 | #: wt-status.c:1107 |
a0b6b246 JX |
5077 | msgid "You are in the middle of an am session." |
5078 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 5079 | |
fd8cb379 | 5080 | #: wt-status.c:1110 |
a0b6b246 JX |
5081 | msgid "The current patch is empty." |
5082 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 5083 | |
a0b6b246 | 5084 | # 译者:注意保持前导空格 |
fd8cb379 | 5085 | #: wt-status.c:1114 |
a0b6b246 JX |
5086 | msgid " (fix conflicts and then run \"git am --continue\")" |
5087 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 5088 | |
a0b6b246 | 5089 | # 译者:注意保持前导空格 |
fd8cb379 | 5090 | #: wt-status.c:1116 |
a0b6b246 JX |
5091 | msgid " (use \"git am --skip\" to skip this patch)" |
5092 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 5093 | |
a0b6b246 | 5094 | # 译者:注意保持前导空格 |
fd8cb379 | 5095 | #: wt-status.c:1118 |
a0b6b246 JX |
5096 | msgid " (use \"git am --abort\" to restore the original branch)" |
5097 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 5098 | |
fd8cb379 | 5099 | #: wt-status.c:1250 |
1a79b2f1 JX |
5100 | msgid "git-rebase-todo is missing." |
5101 | msgstr "git-rebase-todo 丢失。" | |
5102 | ||
fd8cb379 | 5103 | #: wt-status.c:1252 |
a0b6b246 JX |
5104 | msgid "No commands done." |
5105 | msgstr "没有命令被执行。" | |
5106 | ||
fd8cb379 | 5107 | #: wt-status.c:1255 |
1b7f4a34 | 5108 | #, c-format |
a0b6b246 JX |
5109 | msgid "Last command done (%d command done):" |
5110 | msgid_plural "Last commands done (%d commands done):" | |
5111 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
5112 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 5113 | |
fd8cb379 | 5114 | #: wt-status.c:1266 |
1b7f4a34 | 5115 | #, c-format |
a0b6b246 JX |
5116 | msgid " (see more in file %s)" |
5117 | msgstr " (更多参见文件 %s)" | |
5118 | ||
fd8cb379 | 5119 | #: wt-status.c:1271 |
a0b6b246 JX |
5120 | msgid "No commands remaining." |
5121 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 5122 | |
fd8cb379 | 5123 | #: wt-status.c:1274 |
1b7f4a34 | 5124 | #, c-format |
a0b6b246 JX |
5125 | msgid "Next command to do (%d remaining command):" |
5126 | msgid_plural "Next commands to do (%d remaining commands):" | |
5127 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
5128 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 5129 | |
a0b6b246 | 5130 | # 译者:注意保持前导空格 |
fd8cb379 | 5131 | #: wt-status.c:1282 |
a0b6b246 JX |
5132 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
5133 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 5134 | |
fd8cb379 | 5135 | #: wt-status.c:1295 |
1b7f4a34 | 5136 | #, c-format |
a0b6b246 JX |
5137 | msgid "You are currently rebasing branch '%s' on '%s'." |
5138 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 5139 | |
fd8cb379 | 5140 | #: wt-status.c:1300 |
a0b6b246 JX |
5141 | msgid "You are currently rebasing." |
5142 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 5143 | |
a0b6b246 | 5144 | # 译者:注意保持前导空格 |
fd8cb379 | 5145 | #: wt-status.c:1314 |
a0b6b246 JX |
5146 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
5147 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 5148 | |
a0b6b246 | 5149 | # 译者:注意保持前导空格 |
fd8cb379 | 5150 | #: wt-status.c:1316 |
a0b6b246 JX |
5151 | msgid " (use \"git rebase --skip\" to skip this patch)" |
5152 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
5153 | ||
5154 | # 译者:注意保持前导空格 | |
fd8cb379 | 5155 | #: wt-status.c:1318 |
a0b6b246 JX |
5156 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
5157 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
5158 | ||
5159 | # 译者:注意保持前导空格 | |
fd8cb379 | 5160 | #: wt-status.c:1324 |
a0b6b246 JX |
5161 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
5162 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 5163 | |
fd8cb379 | 5164 | #: wt-status.c:1328 |
a0b6b246 | 5165 | #, c-format |
1b7f4a34 | 5166 | msgid "" |
a0b6b246 JX |
5167 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
5168 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 5169 | |
fd8cb379 | 5170 | #: wt-status.c:1333 |
a0b6b246 JX |
5171 | msgid "You are currently splitting a commit during a rebase." |
5172 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 5173 | |
a0b6b246 | 5174 | # 译者:注意保持前导空格 |
fd8cb379 | 5175 | #: wt-status.c:1336 |
a0b6b246 JX |
5176 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
5177 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 5178 | |
fd8cb379 | 5179 | #: wt-status.c:1340 |
a0b6b246 JX |
5180 | #, c-format |
5181 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
5182 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 5183 | |
fd8cb379 | 5184 | #: wt-status.c:1345 |
a0b6b246 JX |
5185 | msgid "You are currently editing a commit during a rebase." |
5186 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 5187 | |
a0b6b246 | 5188 | # 译者:注意保持前导空格 |
fd8cb379 | 5189 | #: wt-status.c:1348 |
a0b6b246 JX |
5190 | msgid " (use \"git commit --amend\" to amend the current commit)" |
5191 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
5192 | ||
5193 | # 译者:注意保持前导空格 | |
fd8cb379 | 5194 | #: wt-status.c:1350 |
a0b6b246 JX |
5195 | msgid "" |
5196 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
5197 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 5198 | |
fd8cb379 | 5199 | #: wt-status.c:1360 |
1b7f4a34 | 5200 | #, c-format |
a0b6b246 JX |
5201 | msgid "You are currently cherry-picking commit %s." |
5202 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 5203 | |
a0b6b246 | 5204 | # 译者:注意保持前导空格 |
fd8cb379 | 5205 | #: wt-status.c:1365 |
a0b6b246 JX |
5206 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
5207 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 5208 | |
a0b6b246 | 5209 | # 译者:注意保持前导空格 |
fd8cb379 | 5210 | #: wt-status.c:1368 |
a0b6b246 JX |
5211 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
5212 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 5213 | |
a0b6b246 | 5214 | # 译者:注意保持前导空格 |
fd8cb379 | 5215 | #: wt-status.c:1370 |
a0b6b246 JX |
5216 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
5217 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 5218 | |
fd8cb379 | 5219 | #: wt-status.c:1379 |
1b7f4a34 | 5220 | #, c-format |
a0b6b246 JX |
5221 | msgid "You are currently reverting commit %s." |
5222 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 5223 | |
a0b6b246 | 5224 | # 译者:注意保持前导空格 |
fd8cb379 | 5225 | #: wt-status.c:1384 |
a0b6b246 JX |
5226 | msgid " (fix conflicts and run \"git revert --continue\")" |
5227 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 5228 | |
a0b6b246 | 5229 | # 译者:注意保持前导空格 |
fd8cb379 | 5230 | #: wt-status.c:1387 |
a0b6b246 JX |
5231 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
5232 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 5233 | |
a0b6b246 | 5234 | # 译者:注意保持前导空格 |
fd8cb379 | 5235 | #: wt-status.c:1389 |
a0b6b246 JX |
5236 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
5237 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 5238 | |
fd8cb379 | 5239 | #: wt-status.c:1400 |
1b7f4a34 | 5240 | #, c-format |
a0b6b246 JX |
5241 | msgid "You are currently bisecting, started from branch '%s'." |
5242 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 5243 | |
fd8cb379 | 5244 | #: wt-status.c:1404 |
a0b6b246 JX |
5245 | msgid "You are currently bisecting." |
5246 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 5247 | |
a0b6b246 | 5248 | # 译者:注意保持前导空格 |
fd8cb379 | 5249 | #: wt-status.c:1407 |
a0b6b246 JX |
5250 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
5251 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 5252 | |
fd8cb379 | 5253 | #: wt-status.c:1604 |
a0b6b246 JX |
5254 | msgid "On branch " |
5255 | msgstr "位于分支 " | |
1b7f4a34 | 5256 | |
fd8cb379 | 5257 | #: wt-status.c:1610 |
a0b6b246 JX |
5258 | msgid "interactive rebase in progress; onto " |
5259 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 5260 | |
fd8cb379 | 5261 | #: wt-status.c:1612 |
a0b6b246 JX |
5262 | msgid "rebase in progress; onto " |
5263 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 5264 | |
fd8cb379 | 5265 | #: wt-status.c:1617 |
a0b6b246 JX |
5266 | msgid "HEAD detached at " |
5267 | msgstr "头指针分离于 " | |
1b7f4a34 | 5268 | |
fd8cb379 | 5269 | #: wt-status.c:1619 |
a0b6b246 JX |
5270 | msgid "HEAD detached from " |
5271 | msgstr "头指针分离自 " | |
1b7f4a34 | 5272 | |
fd8cb379 | 5273 | #: wt-status.c:1622 |
a0b6b246 JX |
5274 | msgid "Not currently on any branch." |
5275 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 5276 | |
fd8cb379 | 5277 | #: wt-status.c:1642 |
a0b6b246 JX |
5278 | msgid "Initial commit" |
5279 | msgstr "初始提交" | |
1b7f4a34 | 5280 | |
fd8cb379 | 5281 | #: wt-status.c:1643 |
a4f16749 JX |
5282 | msgid "No commits yet" |
5283 | msgstr "尚无提交" | |
5284 | ||
fd8cb379 | 5285 | #: wt-status.c:1657 |
a0b6b246 JX |
5286 | msgid "Untracked files" |
5287 | msgstr "未跟踪的文件" | |
1b7f4a34 | 5288 | |
fd8cb379 | 5289 | #: wt-status.c:1659 |
a0b6b246 JX |
5290 | msgid "Ignored files" |
5291 | msgstr "忽略的文件" | |
1b7f4a34 | 5292 | |
fd8cb379 | 5293 | #: wt-status.c:1663 |
a0b6b246 JX |
5294 | #, c-format |
5295 | msgid "" | |
5296 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
5297 | "may speed it up, but you have to be careful not to forget to add\n" | |
5298 | "new files yourself (see 'git help status')." | |
5299 | msgstr "" | |
5300 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
5301 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 5302 | |
fd8cb379 | 5303 | #: wt-status.c:1669 |
a0b6b246 JX |
5304 | #, c-format |
5305 | msgid "Untracked files not listed%s" | |
5306 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 5307 | |
a0b6b246 | 5308 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 5309 | #: wt-status.c:1671 |
a0b6b246 JX |
5310 | msgid " (use -u option to show untracked files)" |
5311 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 5312 | |
fd8cb379 | 5313 | #: wt-status.c:1677 |
a0b6b246 JX |
5314 | msgid "No changes" |
5315 | msgstr "没有修改" | |
1b7f4a34 | 5316 | |
fd8cb379 | 5317 | #: wt-status.c:1682 |
a0b6b246 JX |
5318 | #, c-format |
5319 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
5320 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 5321 | |
fd8cb379 | 5322 | #: wt-status.c:1685 |
a0b6b246 JX |
5323 | #, c-format |
5324 | msgid "no changes added to commit\n" | |
5325 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 5326 | |
fd8cb379 | 5327 | #: wt-status.c:1688 |
a0b6b246 JX |
5328 | #, c-format |
5329 | msgid "" | |
5330 | "nothing added to commit but untracked files present (use \"git add\" to " | |
5331 | "track)\n" | |
5332 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 5333 | |
fd8cb379 | 5334 | #: wt-status.c:1691 |
a0b6b246 JX |
5335 | #, c-format |
5336 | msgid "nothing added to commit but untracked files present\n" | |
5337 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 5338 | |
a0b6b246 | 5339 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 5340 | #: wt-status.c:1694 |
a0b6b246 JX |
5341 | #, c-format |
5342 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
5343 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 5344 | |
fd8cb379 | 5345 | #: wt-status.c:1697 wt-status.c:1702 |
a0b6b246 JX |
5346 | #, c-format |
5347 | msgid "nothing to commit\n" | |
5348 | msgstr "无文件要提交\n" | |
1b7f4a34 | 5349 | |
a0b6b246 | 5350 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 5351 | #: wt-status.c:1700 |
a0b6b246 JX |
5352 | #, c-format |
5353 | msgid "nothing to commit (use -u to show untracked files)\n" | |
5354 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 5355 | |
a0b6b246 | 5356 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 5357 | #: wt-status.c:1704 |
a0b6b246 JX |
5358 | #, c-format |
5359 | msgid "nothing to commit, working tree clean\n" | |
5360 | msgstr "无文件要提交,干净的工作区\n" | |
5361 | ||
fd8cb379 | 5362 | #: wt-status.c:1817 |
a4f16749 JX |
5363 | msgid "No commits yet on " |
5364 | msgstr "尚无提交在 " | |
1b7f4a34 | 5365 | |
fd8cb379 | 5366 | #: wt-status.c:1821 |
a0b6b246 JX |
5367 | msgid "HEAD (no branch)" |
5368 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 5369 | |
fd8cb379 | 5370 | #: wt-status.c:1852 |
31e5e17b JX |
5371 | msgid "different" |
5372 | msgstr "不同" | |
5373 | ||
a0b6b246 | 5374 | # 译者:注意保持句尾空格 |
fd8cb379 | 5375 | #: wt-status.c:1854 wt-status.c:1862 |
a0b6b246 JX |
5376 | msgid "behind " |
5377 | msgstr "落后 " | |
1b7f4a34 | 5378 | |
fd8cb379 | 5379 | #: wt-status.c:1857 wt-status.c:1860 |
a0b6b246 JX |
5380 | msgid "ahead " |
5381 | msgstr "领先 " | |
1b7f4a34 | 5382 | |
a0b6b246 | 5383 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
fd8cb379 | 5384 | #: wt-status.c:2366 |
a0b6b246 JX |
5385 | #, c-format |
5386 | msgid "cannot %s: You have unstaged changes." | |
5387 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 5388 | |
fd8cb379 | 5389 | #: wt-status.c:2372 |
a0b6b246 | 5390 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 5391 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 5392 | |
fd8cb379 | 5393 | #: wt-status.c:2374 |
a0b6b246 JX |
5394 | #, c-format |
5395 | msgid "cannot %s: Your index contains uncommitted changes." | |
5396 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 5397 | |
fd8cb379 | 5398 | #: compat/precompose_utf8.c:58 builtin/clone.c:442 |
a0b6b246 JX |
5399 | #, c-format |
5400 | msgid "failed to unlink '%s'" | |
5401 | msgstr "无法删除 '%s'" | |
1b7f4a34 | 5402 | |
a4f16749 | 5403 | #: builtin/add.c:24 |
a0b6b246 JX |
5404 | msgid "git add [<options>] [--] <pathspec>..." |
5405 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 5406 | |
5809aa05 | 5407 | #: builtin/add.c:83 |
a0b6b246 JX |
5408 | #, c-format |
5409 | msgid "unexpected diff status %c" | |
5410 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 5411 | |
fd8cb379 | 5412 | #: builtin/add.c:88 builtin/commit.c:266 |
a0b6b246 JX |
5413 | msgid "updating files failed" |
5414 | msgstr "更新文件失败" | |
1b7f4a34 | 5415 | |
5809aa05 | 5416 | #: builtin/add.c:98 |
a0b6b246 JX |
5417 | #, c-format |
5418 | msgid "remove '%s'\n" | |
5419 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 5420 | |
5809aa05 | 5421 | #: builtin/add.c:173 |
a0b6b246 JX |
5422 | msgid "Unstaged changes after refreshing the index:" |
5423 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 5424 | |
fd8cb379 | 5425 | #: builtin/add.c:233 builtin/rev-parse.c:892 |
a0b6b246 JX |
5426 | msgid "Could not read the index" |
5427 | msgstr "不能读取索引" | |
1b7f4a34 | 5428 | |
5809aa05 | 5429 | #: builtin/add.c:244 |
a0b6b246 JX |
5430 | #, c-format |
5431 | msgid "Could not open '%s' for writing." | |
5432 | msgstr "无法打开 '%s' 进行写入。" | |
1b7f4a34 | 5433 | |
5809aa05 | 5434 | #: builtin/add.c:248 |
a0b6b246 JX |
5435 | msgid "Could not write patch" |
5436 | msgstr "不能生成补丁" | |
1b7f4a34 | 5437 | |
5809aa05 | 5438 | #: builtin/add.c:251 |
a0b6b246 JX |
5439 | msgid "editing patch failed" |
5440 | msgstr "编辑补丁失败" | |
1b7f4a34 | 5441 | |
5809aa05 | 5442 | #: builtin/add.c:254 |
1b7f4a34 | 5443 | #, c-format |
a0b6b246 | 5444 | msgid "Could not stat '%s'" |
65e2041e | 5445 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 5446 | |
5809aa05 | 5447 | #: builtin/add.c:256 |
a0b6b246 JX |
5448 | msgid "Empty patch. Aborted." |
5449 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 5450 | |
5809aa05 | 5451 | #: builtin/add.c:261 |
a0b6b246 JX |
5452 | #, c-format |
5453 | msgid "Could not apply '%s'" | |
5454 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 5455 | |
fd8cb379 | 5456 | #: builtin/add.c:269 |
a0b6b246 JX |
5457 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
5458 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 5459 | |
fd8cb379 JX |
5460 | #: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 |
5461 | #: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 | |
5462 | #: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 | |
a0b6b246 JX |
5463 | msgid "dry run" |
5464 | msgstr "演习" | |
8ada9598 | 5465 | |
fd8cb379 | 5466 | #: builtin/add.c:292 |
a0b6b246 JX |
5467 | msgid "interactive picking" |
5468 | msgstr "交互式拣选" | |
8ada9598 | 5469 | |
fd8cb379 | 5470 | #: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 |
a0b6b246 JX |
5471 | msgid "select hunks interactively" |
5472 | msgstr "交互式挑选数据块" | |
8ada9598 | 5473 | |
fd8cb379 | 5474 | #: builtin/add.c:294 |
a0b6b246 JX |
5475 | msgid "edit current diff and apply" |
5476 | msgstr "编辑当前差异并应用" | |
8ada9598 | 5477 | |
fd8cb379 | 5478 | #: builtin/add.c:295 |
a0b6b246 JX |
5479 | msgid "allow adding otherwise ignored files" |
5480 | msgstr "允许添加忽略的文件" | |
8ada9598 | 5481 | |
fd8cb379 | 5482 | #: builtin/add.c:296 |
a0b6b246 JX |
5483 | msgid "update tracked files" |
5484 | msgstr "更新已跟踪的文件" | |
8ada9598 | 5485 | |
fd8cb379 | 5486 | #: builtin/add.c:297 |
5809aa05 JX |
5487 | msgid "renormalize EOL of tracked files (implies -u)" |
5488 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
5489 | ||
fd8cb379 | 5490 | #: builtin/add.c:298 |
a0b6b246 JX |
5491 | msgid "record only the fact that the path will be added later" |
5492 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 5493 | |
fd8cb379 | 5494 | #: builtin/add.c:299 |
a0b6b246 JX |
5495 | msgid "add changes from all tracked and untracked files" |
5496 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 5497 | |
fd8cb379 | 5498 | #: builtin/add.c:302 |
a0b6b246 JX |
5499 | msgid "ignore paths removed in the working tree (same as --no-all)" |
5500 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 5501 | |
fd8cb379 | 5502 | #: builtin/add.c:304 |
a0b6b246 JX |
5503 | msgid "don't add, only refresh the index" |
5504 | msgstr "不添加,只刷新索引" | |
8ada9598 | 5505 | |
fd8cb379 | 5506 | #: builtin/add.c:305 |
a0b6b246 JX |
5507 | msgid "just skip files which cannot be added because of errors" |
5508 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 5509 | |
fd8cb379 | 5510 | #: builtin/add.c:306 |
a0b6b246 JX |
5511 | msgid "check if - even missing - files are ignored in dry run" |
5512 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 5513 | |
fd8cb379 | 5514 | #: builtin/add.c:307 builtin/update-index.c:974 |
a0b6b246 JX |
5515 | msgid "(+/-)x" |
5516 | msgstr "(+/-)x" | |
8ada9598 | 5517 | |
fd8cb379 | 5518 | #: builtin/add.c:307 builtin/update-index.c:975 |
a0b6b246 JX |
5519 | msgid "override the executable bit of the listed files" |
5520 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 5521 | |
fd8cb379 | 5522 | #: builtin/add.c:309 |
a4f16749 JX |
5523 | msgid "warn when adding an embedded repository" |
5524 | msgstr "创建一个嵌入式仓库时给予警告" | |
5525 | ||
fd8cb379 | 5526 | #: builtin/add.c:324 |
a4f16749 JX |
5527 | #, c-format |
5528 | msgid "" | |
5529 | "You've added another git repository inside your current repository.\n" | |
5530 | "Clones of the outer repository will not contain the contents of\n" | |
5531 | "the embedded repository and will not know how to obtain it.\n" | |
5532 | "If you meant to add a submodule, use:\n" | |
5533 | "\n" | |
5534 | "\tgit submodule add <url> %s\n" | |
5535 | "\n" | |
5536 | "If you added this path by mistake, you can remove it from the\n" | |
5537 | "index with:\n" | |
5538 | "\n" | |
5539 | "\tgit rm --cached %s\n" | |
5540 | "\n" | |
5541 | "See \"git help submodule\" for more information." | |
5542 | msgstr "" | |
6937cb4e JX |
5543 | "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并" |
5544 | "且不知道该如何获取它。\n" | |
a4f16749 JX |
5545 | "如果您要添加一个子模组,使用:\n" |
5546 | "\n" | |
5547 | "\tgit submodule add <url> %s\n" | |
5548 | "\n" | |
5549 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
5550 | "\n" | |
5551 | "\tgit rm --cached %s\n" | |
5552 | "\n" | |
5553 | "参见 \"git help submodule\" 获取更多信息。" | |
5554 | ||
fd8cb379 | 5555 | #: builtin/add.c:352 |
a4f16749 JX |
5556 | #, c-format |
5557 | msgid "adding embedded git repository: %s" | |
5558 | msgstr "正在添加嵌入式 git 仓库:%s" | |
5559 | ||
fd8cb379 | 5560 | #: builtin/add.c:370 |
8ada9598 | 5561 | #, c-format |
a0b6b246 JX |
5562 | msgid "Use -f if you really want to add them.\n" |
5563 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 5564 | |
fd8cb379 | 5565 | #: builtin/add.c:378 |
a0b6b246 JX |
5566 | msgid "adding files failed" |
5567 | msgstr "添加文件失败" | |
8ada9598 | 5568 | |
fd8cb379 | 5569 | #: builtin/add.c:416 |
a0b6b246 JX |
5570 | msgid "-A and -u are mutually incompatible" |
5571 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 5572 | |
fd8cb379 | 5573 | #: builtin/add.c:423 |
a0b6b246 JX |
5574 | msgid "Option --ignore-missing can only be used together with --dry-run" |
5575 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 5576 | |
fd8cb379 | 5577 | #: builtin/add.c:427 |
8ada9598 | 5578 | #, c-format |
a0b6b246 JX |
5579 | msgid "--chmod param '%s' must be either -x or +x" |
5580 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 5581 | |
fd8cb379 | 5582 | #: builtin/add.c:442 |
8ada9598 | 5583 | #, c-format |
a0b6b246 JX |
5584 | msgid "Nothing specified, nothing added.\n" |
5585 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 5586 | |
fd8cb379 | 5587 | #: builtin/add.c:443 |
8ada9598 | 5588 | #, c-format |
a0b6b246 JX |
5589 | msgid "Maybe you wanted to say 'git add .'?\n" |
5590 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 5591 | |
fd8cb379 JX |
5592 | #: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 |
5593 | #: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 | |
31e5e17b | 5594 | #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 |
fd8cb379 | 5595 | #: builtin/rm.c:270 builtin/submodule--helper.c:328 |
a0b6b246 JX |
5596 | msgid "index file corrupt" |
5597 | msgstr "索引文件损坏" | |
8ada9598 | 5598 | |
6937cb4e | 5599 | #: builtin/am.c:414 |
a0b6b246 JX |
5600 | msgid "could not parse author script" |
5601 | msgstr "不能解析作者脚本" | |
8ada9598 | 5602 | |
6937cb4e | 5603 | #: builtin/am.c:498 |
81809b99 | 5604 | #, c-format |
a0b6b246 JX |
5605 | msgid "'%s' was deleted by the applypatch-msg hook" |
5606 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 5607 | |
6937cb4e | 5608 | #: builtin/am.c:539 |
8ada9598 | 5609 | #, c-format |
a0b6b246 JX |
5610 | msgid "Malformed input line: '%s'." |
5611 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 5612 | |
6937cb4e | 5613 | #: builtin/am.c:576 |
8ada9598 | 5614 | #, c-format |
a0b6b246 JX |
5615 | msgid "Failed to copy notes from '%s' to '%s'" |
5616 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 5617 | |
6937cb4e | 5618 | #: builtin/am.c:602 |
a0b6b246 JX |
5619 | msgid "fseek failed" |
5620 | msgstr "fseek 失败" | |
8ada9598 | 5621 | |
5809aa05 | 5622 | #: builtin/am.c:790 |
8ada9598 | 5623 | #, c-format |
a0b6b246 JX |
5624 | msgid "could not parse patch '%s'" |
5625 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 5626 | |
5809aa05 | 5627 | #: builtin/am.c:855 |
a0b6b246 JX |
5628 | msgid "Only one StGIT patch series can be applied at once" |
5629 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
5630 | ||
5809aa05 | 5631 | #: builtin/am.c:903 |
a0b6b246 JX |
5632 | msgid "invalid timestamp" |
5633 | msgstr "无效的时间戳" | |
5634 | ||
5809aa05 | 5635 | #: builtin/am.c:908 builtin/am.c:920 |
a0b6b246 JX |
5636 | msgid "invalid Date line" |
5637 | msgstr "无效的日期行" | |
8ada9598 | 5638 | |
5809aa05 | 5639 | #: builtin/am.c:915 |
a0b6b246 JX |
5640 | msgid "invalid timezone offset" |
5641 | msgstr "无效的时区偏移值" | |
8ada9598 | 5642 | |
5809aa05 | 5643 | #: builtin/am.c:1008 |
a0b6b246 | 5644 | msgid "Patch format detection failed." |
87cb7997 | 5645 | msgstr "补丁格式探测失败。" |
8ada9598 | 5646 | |
fd8cb379 | 5647 | #: builtin/am.c:1013 builtin/clone.c:407 |
8ada9598 | 5648 | #, c-format |
a0b6b246 JX |
5649 | msgid "failed to create directory '%s'" |
5650 | msgstr "无法创建目录 '%s'" | |
8ada9598 | 5651 | |
31e5e17b | 5652 | #: builtin/am.c:1018 |
a0b6b246 JX |
5653 | msgid "Failed to split patches." |
5654 | msgstr "无法拆分补丁。" | |
814ff314 | 5655 | |
fd8cb379 | 5656 | #: builtin/am.c:1148 builtin/commit.c:351 |
a0b6b246 JX |
5657 | msgid "unable to write index file" |
5658 | msgstr "无法写入索引文件" | |
8ada9598 | 5659 | |
31e5e17b | 5660 | #: builtin/am.c:1162 |
8ada9598 | 5661 | #, c-format |
a0b6b246 JX |
5662 | msgid "When you have resolved this problem, run \"%s --continue\"." |
5663 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 5664 | |
31e5e17b | 5665 | #: builtin/am.c:1163 |
81809b99 | 5666 | #, c-format |
a0b6b246 JX |
5667 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
5668 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 5669 | |
31e5e17b | 5670 | #: builtin/am.c:1164 |
81809b99 | 5671 | #, c-format |
a0b6b246 JX |
5672 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
5673 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 5674 | |
31e5e17b | 5675 | #: builtin/am.c:1271 |
a4f16749 JX |
5676 | msgid "Patch is empty." |
5677 | msgstr "补丁为空。" | |
23ff3338 | 5678 | |
31e5e17b | 5679 | #: builtin/am.c:1337 |
8ada9598 | 5680 | #, c-format |
a4f16749 JX |
5681 | msgid "invalid ident line: %.*s" |
5682 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 5683 | |
31e5e17b | 5684 | #: builtin/am.c:1359 |
8ada9598 | 5685 | #, c-format |
a0b6b246 JX |
5686 | msgid "unable to parse commit %s" |
5687 | msgstr "不能解析提交 %s" | |
8ada9598 | 5688 | |
31e5e17b | 5689 | #: builtin/am.c:1554 |
a0b6b246 JX |
5690 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
5691 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 5692 | |
31e5e17b | 5693 | #: builtin/am.c:1556 |
a0b6b246 JX |
5694 | msgid "Using index info to reconstruct a base tree..." |
5695 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 5696 | |
31e5e17b | 5697 | #: builtin/am.c:1575 |
a0b6b246 JX |
5698 | msgid "" |
5699 | "Did you hand edit your patch?\n" | |
5700 | "It does not apply to blobs recorded in its index." | |
5701 | msgstr "" | |
5702 | "您是否曾手动编辑过您的补丁?\n" | |
5703 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 5704 | |
31e5e17b | 5705 | #: builtin/am.c:1581 |
a0b6b246 JX |
5706 | msgid "Falling back to patching base and 3-way merge..." |
5707 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 5708 | |
31e5e17b | 5709 | #: builtin/am.c:1606 |
a0b6b246 JX |
5710 | msgid "Failed to merge in the changes." |
5711 | msgstr "无法合并变更。" | |
d691f479 | 5712 | |
31e5e17b | 5713 | #: builtin/am.c:1637 |
a0b6b246 JX |
5714 | msgid "applying to an empty history" |
5715 | msgstr "正应用到一个空历史上" | |
8ada9598 | 5716 | |
31e5e17b | 5717 | #: builtin/am.c:1683 builtin/am.c:1687 |
8ada9598 | 5718 | #, c-format |
a0b6b246 JX |
5719 | msgid "cannot resume: %s does not exist." |
5720 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 5721 | |
31e5e17b | 5722 | #: builtin/am.c:1703 |
a0b6b246 JX |
5723 | msgid "cannot be interactive without stdin connected to a terminal." |
5724 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 5725 | |
31e5e17b | 5726 | #: builtin/am.c:1708 |
a0b6b246 JX |
5727 | msgid "Commit Body is:" |
5728 | msgstr "提交内容为:" | |
8ada9598 | 5729 | |
a0b6b246 JX |
5730 | # 译者:注意保持句尾空格 |
5731 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
5732 | #. in your translation. The program will only accept English | |
5733 | #. input at this point. | |
5734 | #. | |
31e5e17b | 5735 | #: builtin/am.c:1718 |
a0b6b246 JX |
5736 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
5737 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 5738 | |
31e5e17b | 5739 | #: builtin/am.c:1768 |
8ada9598 | 5740 | #, c-format |
a0b6b246 JX |
5741 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
5742 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 5743 | |
31e5e17b | 5744 | #: builtin/am.c:1808 builtin/am.c:1879 |
81809b99 | 5745 | #, c-format |
a0b6b246 JX |
5746 | msgid "Applying: %.*s" |
5747 | msgstr "应用:%.*s" | |
8ada9598 | 5748 | |
31e5e17b | 5749 | #: builtin/am.c:1824 |
a0b6b246 JX |
5750 | msgid "No changes -- Patch already applied." |
5751 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 5752 | |
31e5e17b | 5753 | #: builtin/am.c:1832 |
81809b99 | 5754 | #, c-format |
a0b6b246 JX |
5755 | msgid "Patch failed at %s %.*s" |
5756 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 5757 | |
31e5e17b JX |
5758 | #: builtin/am.c:1838 |
5759 | msgid "Use 'git am --show-current-patch' to see the failed patch" | |
5760 | msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" | |
8ada9598 | 5761 | |
31e5e17b | 5762 | #: builtin/am.c:1882 |
a0b6b246 JX |
5763 | msgid "" |
5764 | "No changes - did you forget to use 'git add'?\n" | |
5765 | "If there is nothing left to stage, chances are that something else\n" | |
5766 | "already introduced the same changes; you might want to skip this patch." | |
5767 | msgstr "" | |
5768 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
5769 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
5770 | "您也许想要跳过这个补丁。" | |
8ada9598 | 5771 | |
31e5e17b | 5772 | #: builtin/am.c:1889 |
a0b6b246 JX |
5773 | msgid "" |
5774 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
5775 | "You should 'git add' each file with resolved conflicts to mark them as " |
5776 | "such.\n" | |
5777 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 5778 | msgstr "" |
a4f16749 JX |
5779 | "在您的索引中仍存在未合并的路径。\n" |
5780 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
5781 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 5782 | |
31e5e17b JX |
5783 | #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 |
5784 | #: builtin/reset.c:332 | |
8ada9598 | 5785 | #, c-format |
a0b6b246 JX |
5786 | msgid "Could not parse object '%s'." |
5787 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 5788 | |
31e5e17b | 5789 | #: builtin/am.c:2048 |
a0b6b246 JX |
5790 | msgid "failed to clean index" |
5791 | msgstr "无法清空索引" | |
5b04ee3b | 5792 | |
31e5e17b | 5793 | #: builtin/am.c:2083 |
a0b6b246 JX |
5794 | msgid "" |
5795 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
5796 | "Not rewinding to ORIG_HEAD" | |
5797 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 5798 | |
31e5e17b | 5799 | #: builtin/am.c:2174 |
8ada9598 | 5800 | #, c-format |
a0b6b246 JX |
5801 | msgid "Invalid value for --patch-format: %s" |
5802 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 5803 | |
31e5e17b | 5804 | #: builtin/am.c:2210 |
a0b6b246 JX |
5805 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
5806 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 5807 | |
31e5e17b | 5808 | #: builtin/am.c:2211 |
a0b6b246 JX |
5809 | msgid "git am [<options>] (--continue | --skip | --abort)" |
5810 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 5811 | |
31e5e17b | 5812 | #: builtin/am.c:2217 |
a0b6b246 JX |
5813 | msgid "run interactively" |
5814 | msgstr "以交互式方式运行" | |
8ada9598 | 5815 | |
31e5e17b | 5816 | #: builtin/am.c:2219 |
a0b6b246 JX |
5817 | msgid "historical option -- no-op" |
5818 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 5819 | |
31e5e17b | 5820 | #: builtin/am.c:2221 |
a0b6b246 JX |
5821 | msgid "allow fall back on 3way merging if needed" |
5822 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 5823 | |
31e5e17b | 5824 | #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 |
fd8cb379 | 5825 | #: builtin/repack.c:192 |
a0b6b246 JX |
5826 | msgid "be quiet" |
5827 | msgstr "静默模式" | |
8ada9598 | 5828 | |
31e5e17b | 5829 | #: builtin/am.c:2224 |
a0b6b246 JX |
5830 | msgid "add a Signed-off-by line to the commit message" |
5831 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 5832 | |
31e5e17b | 5833 | #: builtin/am.c:2227 |
a0b6b246 JX |
5834 | msgid "recode into utf8 (default)" |
5835 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 5836 | |
31e5e17b | 5837 | #: builtin/am.c:2229 |
a0b6b246 JX |
5838 | msgid "pass -k flag to git-mailinfo" |
5839 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 5840 | |
31e5e17b | 5841 | #: builtin/am.c:2231 |
a0b6b246 JX |
5842 | msgid "pass -b flag to git-mailinfo" |
5843 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 5844 | |
31e5e17b | 5845 | #: builtin/am.c:2233 |
a0b6b246 JX |
5846 | msgid "pass -m flag to git-mailinfo" |
5847 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 5848 | |
31e5e17b | 5849 | #: builtin/am.c:2235 |
a0b6b246 JX |
5850 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
5851 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 5852 | |
31e5e17b | 5853 | #: builtin/am.c:2238 |
a0b6b246 JX |
5854 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
5855 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 5856 | |
31e5e17b | 5857 | #: builtin/am.c:2241 |
a0b6b246 JX |
5858 | msgid "strip everything before a scissors line" |
5859 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 5860 | |
31e5e17b JX |
5861 | #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 |
5862 | #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 | |
5863 | #: builtin/am.c:2270 | |
a0b6b246 JX |
5864 | msgid "pass it through git-apply" |
5865 | msgstr "传递给 git-apply" | |
8ada9598 | 5866 | |
fd8cb379 JX |
5867 | #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 |
5868 | #: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208 | |
5869 | #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 | |
5870 | #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 | |
5871 | #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 | |
5872 | #: parse-options.h:146 parse-options.h:258 | |
a0b6b246 JX |
5873 | msgid "n" |
5874 | msgstr "n" | |
8ada9598 | 5875 | |
fd8cb379 JX |
5876 | #: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 |
5877 | #: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 | |
a0b6b246 JX |
5878 | msgid "format" |
5879 | msgstr "格式" | |
8ada9598 | 5880 | |
31e5e17b | 5881 | #: builtin/am.c:2267 |
a0b6b246 JX |
5882 | msgid "format the patch(es) are in" |
5883 | msgstr "补丁的格式" | |
8ada9598 | 5884 | |
31e5e17b | 5885 | #: builtin/am.c:2273 |
a0b6b246 JX |
5886 | msgid "override error message when patch failure occurs" |
5887 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 5888 | |
31e5e17b | 5889 | #: builtin/am.c:2275 |
a0b6b246 JX |
5890 | msgid "continue applying patches after resolving a conflict" |
5891 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 5892 | |
31e5e17b | 5893 | #: builtin/am.c:2278 |
a0b6b246 JX |
5894 | msgid "synonyms for --continue" |
5895 | msgstr "和 --continue 同义" | |
8ada9598 | 5896 | |
31e5e17b | 5897 | #: builtin/am.c:2281 |
a0b6b246 JX |
5898 | msgid "skip the current patch" |
5899 | msgstr "跳过当前补丁" | |
23ff3338 | 5900 | |
31e5e17b | 5901 | #: builtin/am.c:2284 |
a0b6b246 JX |
5902 | msgid "restore the original branch and abort the patching operation." |
5903 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 5904 | |
31e5e17b JX |
5905 | #: builtin/am.c:2287 |
5906 | msgid "abort the patching operation but keep HEAD where it is." | |
5907 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
5908 | ||
5909 | #: builtin/am.c:2290 | |
5910 | msgid "show the patch being applied." | |
5911 | msgstr "显示正在应用的补丁。" | |
5912 | ||
5913 | #: builtin/am.c:2294 | |
a0b6b246 JX |
5914 | msgid "lie about committer date" |
5915 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 5916 | |
31e5e17b | 5917 | #: builtin/am.c:2296 |
a0b6b246 JX |
5918 | msgid "use current timestamp for author date" |
5919 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 5920 | |
fd8cb379 JX |
5921 | #: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239 |
5922 | #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 | |
a0b6b246 JX |
5923 | msgid "key-id" |
5924 | msgstr "key-id" | |
8ada9598 | 5925 | |
31e5e17b | 5926 | #: builtin/am.c:2299 |
a0b6b246 JX |
5927 | msgid "GPG-sign commits" |
5928 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 5929 | |
31e5e17b | 5930 | #: builtin/am.c:2302 |
a0b6b246 JX |
5931 | msgid "(internal use for git-rebase)" |
5932 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 5933 | |
31e5e17b | 5934 | #: builtin/am.c:2320 |
a0b6b246 JX |
5935 | msgid "" |
5936 | "The -b/--binary option has been a no-op for long time, and\n" | |
5937 | "it will be removed. Please do not use it anymore." | |
5938 | msgstr "" | |
5939 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
5940 | "请不要再使用它了。" | |
8ada9598 | 5941 | |
31e5e17b | 5942 | #: builtin/am.c:2327 |
a0b6b246 JX |
5943 | msgid "failed to read the index" |
5944 | msgstr "无法读取索引" | |
8ada9598 | 5945 | |
31e5e17b | 5946 | #: builtin/am.c:2342 |
a0b6b246 JX |
5947 | #, c-format |
5948 | msgid "previous rebase directory %s still exists but mbox given." | |
5949 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 5950 | |
31e5e17b | 5951 | #: builtin/am.c:2366 |
a0b6b246 JX |
5952 | #, c-format |
5953 | msgid "" | |
5954 | "Stray %s directory found.\n" | |
5955 | "Use \"git am --abort\" to remove it." | |
5956 | msgstr "" | |
5957 | "发现了错误的 %s 目录。\n" | |
5958 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 5959 | |
31e5e17b | 5960 | #: builtin/am.c:2372 |
a0b6b246 JX |
5961 | msgid "Resolve operation not in progress, we are not resuming." |
5962 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 5963 | |
a0b6b246 JX |
5964 | #: builtin/apply.c:8 |
5965 | msgid "git apply [<options>] [<patch>...]" | |
5966 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 5967 | |
c04f5ac3 JX |
5968 | #: builtin/archive.c:17 |
5969 | #, c-format | |
5970 | msgid "could not create archive file '%s'" | |
90e6ef53 | 5971 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
5972 | |
5973 | #: builtin/archive.c:20 | |
5974 | msgid "could not redirect output" | |
195febda | 5975 | msgstr "不能重定向输出" |
c04f5ac3 JX |
5976 | |
5977 | #: builtin/archive.c:37 | |
5978 | msgid "git archive: Remote with no URL" | |
4375c10e | 5979 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
5980 | |
5981 | #: builtin/archive.c:58 | |
31e5e17b JX |
5982 | msgid "git archive: expected ACK/NAK, got a flush packet" |
5983 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 5984 | |
1003b3a5 | 5985 | #: builtin/archive.c:61 |
c04f5ac3 JX |
5986 | #, c-format |
5987 | msgid "git archive: NACK %s" | |
90e6ef53 | 5988 | msgstr "git archive:NACK %s" |
c04f5ac3 | 5989 | |
1003b3a5 | 5990 | #: builtin/archive.c:64 |
c04f5ac3 | 5991 | msgid "git archive: protocol error" |
90e6ef53 | 5992 | msgstr "git archive:协议错误" |
c04f5ac3 | 5993 | |
1003b3a5 | 5994 | #: builtin/archive.c:68 |
c04f5ac3 | 5995 | msgid "git archive: expected a flush" |
31e5e17b | 5996 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 5997 | |
5809aa05 | 5998 | #: builtin/bisect--helper.c:12 |
ef317cd5 | 5999 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 6000 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 6001 | |
5809aa05 JX |
6002 | #: builtin/bisect--helper.c:13 |
6003 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" | |
6004 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
6005 | ||
6006 | #: builtin/bisect--helper.c:14 | |
6007 | msgid "git bisect--helper --bisect-clean-state" | |
6008 | msgstr "git bisect--helper --bisect-clean-state" | |
6009 | ||
6010 | #: builtin/bisect--helper.c:46 | |
6011 | #, c-format | |
6012 | msgid "'%s' is not a valid term" | |
6013 | msgstr "'%s' 不是一个有效的术语" | |
6014 | ||
6015 | #: builtin/bisect--helper.c:50 | |
6016 | #, c-format | |
6017 | msgid "can't use the builtin command '%s' as a term" | |
6018 | msgstr "不能使用内置命令 '%s' 作为术语" | |
6019 | ||
6020 | #: builtin/bisect--helper.c:60 | |
6021 | #, c-format | |
6022 | msgid "can't change the meaning of the term '%s'" | |
6023 | msgstr "不能修改术语 '%s' 的含义" | |
6024 | ||
6025 | #: builtin/bisect--helper.c:71 | |
6026 | msgid "please use two different terms" | |
6027 | msgstr "请使用两个不同的术语" | |
6028 | ||
6029 | #: builtin/bisect--helper.c:78 | |
6030 | msgid "could not open the file BISECT_TERMS" | |
6031 | msgstr "不能打开文件 BISECT_TERMS" | |
6032 | ||
6033 | #: builtin/bisect--helper.c:120 | |
ef317cd5 | 6034 | msgid "perform 'git bisect next'" |
07432cef | 6035 | msgstr "执行 'git bisect next'" |
ef317cd5 | 6036 | |
5809aa05 JX |
6037 | #: builtin/bisect--helper.c:122 |
6038 | msgid "write the terms to .git/BISECT_TERMS" | |
6039 | msgstr "将术语写入 .git/BISECT_TERMS" | |
6040 | ||
6041 | #: builtin/bisect--helper.c:124 | |
6042 | msgid "cleanup the bisection state" | |
6043 | msgstr "清除二分查找状态" | |
6044 | ||
6045 | #: builtin/bisect--helper.c:126 | |
6046 | msgid "check for expected revs" | |
6047 | msgstr "检查预期的版本" | |
6048 | ||
6049 | #: builtin/bisect--helper.c:128 | |
ef317cd5 | 6050 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 6051 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 6052 | |
5809aa05 JX |
6053 | #: builtin/bisect--helper.c:143 |
6054 | msgid "--write-terms requires two arguments" | |
6055 | msgstr "--write-terms 需要两个参数" | |
6056 | ||
6057 | #: builtin/bisect--helper.c:147 | |
6058 | msgid "--bisect-clean-state requires no arguments" | |
6059 | msgstr "--bisect-clean-state 不需要参数" | |
6060 | ||
fd8cb379 | 6061 | #: builtin/blame.c:29 |
7aea43ff JX |
6062 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
6063 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 6064 | |
fd8cb379 | 6065 | #: builtin/blame.c:34 |
814ff314 JX |
6066 | msgid "<rev-opts> are documented in git-rev-list(1)" |
6067 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 6068 | |
fd8cb379 JX |
6069 | #: builtin/blame.c:404 |
6070 | #, c-format | |
6071 | msgid "expecting a color: %s" | |
6072 | msgstr "期望一个颜色:%s" | |
6073 | ||
6074 | #: builtin/blame.c:411 | |
6075 | msgid "must end with a color" | |
6076 | msgstr "必须以一个颜色结尾" | |
6077 | ||
6078 | #: builtin/blame.c:697 | |
6079 | #, c-format | |
6080 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
6081 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
6082 | ||
6083 | #: builtin/blame.c:715 | |
6084 | msgid "invalid value for blame.coloring" | |
6085 | msgstr "设置 blame.coloring 中的无效取值" | |
6086 | ||
6087 | #: builtin/blame.c:786 | |
ef317cd5 | 6088 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 6089 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 6090 | |
fd8cb379 | 6091 | #: builtin/blame.c:787 |
ef317cd5 | 6092 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 6093 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 6094 | |
fd8cb379 | 6095 | #: builtin/blame.c:788 |
ef317cd5 | 6096 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 6097 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 6098 | |
fd8cb379 | 6099 | #: builtin/blame.c:789 |
ef317cd5 | 6100 | msgid "Show work cost statistics" |
07432cef | 6101 | msgstr "显示命令消耗统计" |
ef317cd5 | 6102 | |
fd8cb379 | 6103 | #: builtin/blame.c:790 |
276ceeaa JX |
6104 | msgid "Force progress reporting" |
6105 | msgstr "强制进度显示" | |
6106 | ||
fd8cb379 | 6107 | #: builtin/blame.c:791 |
ef317cd5 | 6108 | msgid "Show output score for blame entries" |
07432cef | 6109 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 6110 | |
fd8cb379 | 6111 | #: builtin/blame.c:792 |
ef317cd5 | 6112 | msgid "Show original filename (Default: auto)" |
07432cef | 6113 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 6114 | |
fd8cb379 | 6115 | #: builtin/blame.c:793 |
ef317cd5 | 6116 | msgid "Show original linenumber (Default: off)" |
07432cef | 6117 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 6118 | |
fd8cb379 | 6119 | #: builtin/blame.c:794 |
ef317cd5 | 6120 | msgid "Show in a format designed for machine consumption" |
07432cef | 6121 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 6122 | |
fd8cb379 | 6123 | #: builtin/blame.c:795 |
ef317cd5 | 6124 | msgid "Show porcelain format with per-line commit information" |
07432cef | 6125 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 6126 | |
fd8cb379 | 6127 | #: builtin/blame.c:796 |
ef317cd5 | 6128 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 6129 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 6130 | |
fd8cb379 | 6131 | #: builtin/blame.c:797 |
ef317cd5 | 6132 | msgid "Show raw timestamp (Default: off)" |
07432cef | 6133 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 6134 | |
fd8cb379 | 6135 | #: builtin/blame.c:798 |
ef317cd5 | 6136 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 6137 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 6138 | |
fd8cb379 | 6139 | #: builtin/blame.c:799 |
ef317cd5 | 6140 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 6141 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 6142 | |
fd8cb379 | 6143 | #: builtin/blame.c:800 |
ef317cd5 | 6144 | msgid "Show author email instead of name (Default: off)" |
07432cef | 6145 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 6146 | |
fd8cb379 | 6147 | #: builtin/blame.c:801 |
ef317cd5 | 6148 | msgid "Ignore whitespace differences" |
07432cef | 6149 | msgstr "忽略空白差异" |
ef317cd5 | 6150 | |
fd8cb379 JX |
6151 | #: builtin/blame.c:802 |
6152 | msgid "color redundant metadata from previous line differently" | |
6153 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
6154 | ||
6155 | #: builtin/blame.c:803 | |
6156 | msgid "color lines by age" | |
6157 | msgstr "依据时间着色" | |
6158 | ||
6159 | #: builtin/blame.c:810 | |
1a79b2f1 JX |
6160 | msgid "Use an experimental heuristic to improve diffs" |
6161 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 6162 | |
fd8cb379 | 6163 | #: builtin/blame.c:812 |
ef317cd5 | 6164 | msgid "Spend extra cycles to find better match" |
07432cef | 6165 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 6166 | |
fd8cb379 | 6167 | #: builtin/blame.c:813 |
ef317cd5 | 6168 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 6169 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 6170 | |
fd8cb379 | 6171 | #: builtin/blame.c:814 |
ef317cd5 | 6172 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 6173 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 6174 | |
fd8cb379 | 6175 | #: builtin/blame.c:815 builtin/blame.c:816 |
ef317cd5 | 6176 | msgid "score" |
07432cef | 6177 | msgstr "得分" |
ef317cd5 | 6178 | |
fd8cb379 | 6179 | #: builtin/blame.c:815 |
ef317cd5 | 6180 | msgid "Find line copies within and across files" |
07432cef | 6181 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 6182 | |
fd8cb379 | 6183 | #: builtin/blame.c:816 |
ef317cd5 | 6184 | msgid "Find line movements within and across files" |
07432cef | 6185 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 6186 | |
fd8cb379 | 6187 | #: builtin/blame.c:817 |
ef317cd5 | 6188 | msgid "n,m" |
07432cef | 6189 | msgstr "n,m" |
ef317cd5 | 6190 | |
fd8cb379 | 6191 | #: builtin/blame.c:817 |
ef317cd5 | 6192 | msgid "Process only line range n,m, counting from 1" |
07432cef | 6193 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 6194 | |
fd8cb379 | 6195 | #: builtin/blame.c:866 |
a0b6b246 JX |
6196 | msgid "--progress can't be used with --incremental or porcelain formats" |
6197 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
6198 | ||
a4f16749 JX |
6199 | #. TRANSLATORS: This string is used to tell us the |
6200 | #. maximum display width for a relative timestamp in | |
6201 | #. "git blame" output. For C locale, "4 years, 11 | |
6202 | #. months ago", which takes 22 places, is the longest | |
6203 | #. among various forms of relative timestamps, but | |
6204 | #. your language may need more or fewer display | |
6205 | #. columns. | |
6206 | #. | |
fd8cb379 | 6207 | #: builtin/blame.c:917 |
6c94aba5 JX |
6208 | msgid "4 years, 11 months ago" |
6209 | msgstr "4 年 11 个月前" | |
6210 | ||
fd8cb379 | 6211 | #: builtin/blame.c:1003 |
a0b6b246 JX |
6212 | #, c-format |
6213 | msgid "file %s has only %lu line" | |
6214 | msgid_plural "file %s has only %lu lines" | |
6215 | msgstr[0] "文件 %s 只有 %lu 行" | |
6216 | msgstr[1] "文件 %s 只有 %lu 行" | |
6217 | ||
fd8cb379 | 6218 | #: builtin/blame.c:1049 |
a4f16749 JX |
6219 | msgid "Blaming lines" |
6220 | msgstr "追踪代码行" | |
6221 | ||
6222 | #: builtin/branch.c:27 | |
814ff314 JX |
6223 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
6224 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 6225 | |
a4f16749 | 6226 | #: builtin/branch.c:28 |
814ff314 JX |
6227 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
6228 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 6229 | |
a4f16749 | 6230 | #: builtin/branch.c:29 |
814ff314 JX |
6231 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
6232 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 6233 | |
a4f16749 | 6234 | #: builtin/branch.c:30 |
814ff314 JX |
6235 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
6236 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 6237 | |
a4f16749 | 6238 | #: builtin/branch.c:31 |
6937cb4e JX |
6239 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
6240 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
6241 | ||
6242 | #: builtin/branch.c:32 | |
94550ed3 JX |
6243 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
6244 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
6245 | ||
6937cb4e | 6246 | #: builtin/branch.c:33 |
87cb7997 JX |
6247 | msgid "git branch [<options>] [-r | -a] [--format]" |
6248 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
6249 | ||
90e6ef53 | 6250 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
6937cb4e | 6251 | #: builtin/branch.c:146 |
c04f5ac3 JX |
6252 | #, c-format |
6253 | msgid "" | |
6254 | "deleting branch '%s' that has been merged to\n" | |
6255 | " '%s', but not yet merged to HEAD." | |
6256 | msgstr "" | |
70fc47bf | 6257 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
6258 | " '%s',但未合并到 HEAD。" |
6259 | ||
90e6ef53 | 6260 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
6937cb4e | 6261 | #: builtin/branch.c:150 |
c04f5ac3 JX |
6262 | #, c-format |
6263 | msgid "" | |
6264 | "not deleting branch '%s' that is not yet merged to\n" | |
6265 | " '%s', even though it is merged to HEAD." | |
6266 | msgstr "" | |
70fc47bf T |
6267 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
6268 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 6269 | |
6937cb4e | 6270 | #: builtin/branch.c:164 |
07432cef WS |
6271 | #, c-format |
6272 | msgid "Couldn't look up commit object for '%s'" | |
6273 | msgstr "无法查询 '%s' 指向的提交对象" | |
6274 | ||
6937cb4e | 6275 | #: builtin/branch.c:168 |
07432cef WS |
6276 | #, c-format |
6277 | msgid "" | |
6278 | "The branch '%s' is not fully merged.\n" | |
6279 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
6280 | msgstr "" | |
6281 | "分支 '%s' 没有完全合并。\n" | |
6282 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
6283 | ||
6937cb4e | 6284 | #: builtin/branch.c:181 |
07432cef | 6285 | msgid "Update of config-file failed" |
6937cb4e | 6286 | msgstr "更新配置文件失败" |
07432cef | 6287 | |
6937cb4e | 6288 | #: builtin/branch.c:212 |
c04f5ac3 | 6289 | msgid "cannot use -a with -d" |
649900bc | 6290 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 6291 | |
6937cb4e | 6292 | #: builtin/branch.c:218 |
c04f5ac3 JX |
6293 | msgid "Couldn't look up commit object for HEAD" |
6294 | msgstr "无法查询 HEAD 指向的提交对象" | |
6295 | ||
6937cb4e | 6296 | #: builtin/branch.c:232 |
c04f5ac3 | 6297 | #, c-format |
5b04ee3b JX |
6298 | msgid "Cannot delete branch '%s' checked out at '%s'" |
6299 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 6300 | |
6937cb4e | 6301 | #: builtin/branch.c:247 |
5ae481e0 | 6302 | #, c-format |
7aea43ff JX |
6303 | msgid "remote-tracking branch '%s' not found." |
6304 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 6305 | |
6937cb4e | 6306 | #: builtin/branch.c:248 |
81809b99 | 6307 | #, c-format |
8ada9598 | 6308 | msgid "branch '%s' not found." |
81809b99 | 6309 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 6310 | |
6937cb4e | 6311 | #: builtin/branch.c:263 |
81809b99 | 6312 | #, c-format |
7aea43ff JX |
6313 | msgid "Error deleting remote-tracking branch '%s'" |
6314 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 6315 | |
6937cb4e | 6316 | #: builtin/branch.c:264 |
81809b99 | 6317 | #, c-format |
8ada9598 | 6318 | msgid "Error deleting branch '%s'" |
7aea43ff | 6319 | msgstr "无法删除分支 '%s'" |
8ada9598 | 6320 | |
6937cb4e | 6321 | #: builtin/branch.c:271 |
81809b99 | 6322 | #, c-format |
7aea43ff JX |
6323 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
6324 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 6325 | |
6937cb4e | 6326 | #: builtin/branch.c:272 |
81809b99 | 6327 | #, c-format |
8ada9598 | 6328 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 6329 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 6330 | |
fd8cb379 | 6331 | #: builtin/branch.c:416 builtin/tag.c:58 |
6937cb4e JX |
6332 | msgid "unable to parse format string" |
6333 | msgstr "不能解析格式化字符串" | |
6334 | ||
fd8cb379 | 6335 | #: builtin/branch.c:453 |
5b04ee3b JX |
6336 | #, c-format |
6337 | msgid "Branch %s is being rebased at %s" | |
6338 | msgstr "分支 %s 正被变基到 %s" | |
6339 | ||
fd8cb379 | 6340 | #: builtin/branch.c:457 |
5b04ee3b JX |
6341 | #, c-format |
6342 | msgid "Branch %s is being bisected at %s" | |
6343 | msgstr "分支 %s 正被二分查找于 %s" | |
6344 | ||
fd8cb379 | 6345 | #: builtin/branch.c:474 |
6937cb4e JX |
6346 | msgid "cannot copy the current branch while not on any." |
6347 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
6348 | ||
fd8cb379 | 6349 | #: builtin/branch.c:476 |
c04f5ac3 | 6350 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 6351 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 6352 | |
fd8cb379 | 6353 | #: builtin/branch.c:487 |
c04f5ac3 JX |
6354 | #, c-format |
6355 | msgid "Invalid branch name: '%s'" | |
6356 | msgstr "无效的分支名:'%s'" | |
6357 | ||
fd8cb379 | 6358 | #: builtin/branch.c:514 |
c04f5ac3 JX |
6359 | msgid "Branch rename failed" |
6360 | msgstr "分支重命名失败" | |
6361 | ||
fd8cb379 | 6362 | #: builtin/branch.c:516 |
6937cb4e JX |
6363 | msgid "Branch copy failed" |
6364 | msgstr "分支拷贝失败" | |
6365 | ||
fd8cb379 | 6366 | #: builtin/branch.c:520 |
6937cb4e | 6367 | #, c-format |
5809aa05 JX |
6368 | msgid "Created a copy of a misnamed branch '%s'" |
6369 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 6370 | |
fd8cb379 | 6371 | #: builtin/branch.c:523 |
c04f5ac3 JX |
6372 | #, c-format |
6373 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 6374 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 6375 | |
fd8cb379 | 6376 | #: builtin/branch.c:529 |
c04f5ac3 JX |
6377 | #, c-format |
6378 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
6379 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
6380 | ||
fd8cb379 | 6381 | #: builtin/branch.c:538 |
c04f5ac3 | 6382 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
6383 | msgstr "分支被重命名,但更新配置文件失败" |
6384 | ||
fd8cb379 | 6385 | #: builtin/branch.c:540 |
6937cb4e JX |
6386 | msgid "Branch is copied, but update of config-file failed" |
6387 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 6388 | |
fd8cb379 | 6389 | #: builtin/branch.c:556 |
5c57d762 JX |
6390 | #, c-format |
6391 | msgid "" | |
6392 | "Please edit the description for the branch\n" | |
6393 | " %s\n" | |
6394 | "Lines starting with '%c' will be stripped.\n" | |
6395 | msgstr "" | |
6396 | "请编辑分支的描述\n" | |
6397 | " %s\n" | |
6398 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 6399 | |
fd8cb379 | 6400 | #: builtin/branch.c:589 |
ef317cd5 | 6401 | msgid "Generic options" |
07432cef | 6402 | msgstr "通用选项" |
c04f5ac3 | 6403 | |
fd8cb379 | 6404 | #: builtin/branch.c:591 |
ef317cd5 | 6405 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 6406 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 6407 | |
fd8cb379 | 6408 | #: builtin/branch.c:592 |
ef317cd5 | 6409 | msgid "suppress informational messages" |
07432cef | 6410 | msgstr "不显示信息" |
8ada9598 | 6411 | |
fd8cb379 | 6412 | #: builtin/branch.c:593 |
ef317cd5 | 6413 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 6414 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 6415 | |
fd8cb379 | 6416 | #: builtin/branch.c:595 |
6937cb4e JX |
6417 | msgid "do not use" |
6418 | msgstr "不要使用" | |
c04f5ac3 | 6419 | |
fd8cb379 | 6420 | #: builtin/branch.c:597 |
5b04ee3b JX |
6421 | msgid "upstream" |
6422 | msgstr "上游" | |
6423 | ||
fd8cb379 | 6424 | #: builtin/branch.c:597 |
5b04ee3b JX |
6425 | msgid "change the upstream info" |
6426 | msgstr "改变上游信息" | |
6427 | ||
fd8cb379 | 6428 | #: builtin/branch.c:598 |
a0b6b246 JX |
6429 | msgid "Unset the upstream info" |
6430 | msgstr "取消上游信息的设置" | |
6431 | ||
fd8cb379 | 6432 | #: builtin/branch.c:599 |
ef317cd5 | 6433 | msgid "use colored output" |
07432cef | 6434 | msgstr "使用彩色输出" |
c04f5ac3 | 6435 | |
fd8cb379 | 6436 | #: builtin/branch.c:600 |
ef317cd5 | 6437 | msgid "act on remote-tracking branches" |
07432cef | 6438 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 6439 | |
fd8cb379 | 6440 | #: builtin/branch.c:602 builtin/branch.c:604 |
ef317cd5 | 6441 | msgid "print only branches that contain the commit" |
07432cef | 6442 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 6443 | |
fd8cb379 | 6444 | #: builtin/branch.c:603 builtin/branch.c:605 |
87cb7997 JX |
6445 | msgid "print only branches that don't contain the commit" |
6446 | msgstr "只打印不包含该提交的分支" | |
6447 | ||
fd8cb379 | 6448 | #: builtin/branch.c:608 |
ef317cd5 | 6449 | msgid "Specific git-branch actions:" |
07432cef | 6450 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 6451 | |
fd8cb379 | 6452 | #: builtin/branch.c:609 |
ef317cd5 | 6453 | msgid "list both remote-tracking and local branches" |
07432cef | 6454 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 6455 | |
fd8cb379 | 6456 | #: builtin/branch.c:611 |
ef317cd5 | 6457 | msgid "delete fully merged branch" |
07432cef | 6458 | msgstr "删除完全合并的分支" |
c04f5ac3 | 6459 | |
fd8cb379 | 6460 | #: builtin/branch.c:612 |
ef317cd5 | 6461 | msgid "delete branch (even if not merged)" |
07432cef | 6462 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 6463 | |
fd8cb379 | 6464 | #: builtin/branch.c:613 |
ef317cd5 | 6465 | msgid "move/rename a branch and its reflog" |
07432cef | 6466 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 6467 | |
fd8cb379 | 6468 | #: builtin/branch.c:614 |
ef317cd5 | 6469 | msgid "move/rename a branch, even if target exists" |
07432cef | 6470 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 6471 | |
fd8cb379 | 6472 | #: builtin/branch.c:615 |
6937cb4e JX |
6473 | msgid "copy a branch and its reflog" |
6474 | msgstr "拷贝一个分支和它的引用日志" | |
6475 | ||
fd8cb379 | 6476 | #: builtin/branch.c:616 |
6937cb4e JX |
6477 | msgid "copy a branch, even if target exists" |
6478 | msgstr "拷贝一个分支,即使目标已存在" | |
6479 | ||
fd8cb379 | 6480 | #: builtin/branch.c:617 |
ef317cd5 | 6481 | msgid "list branch names" |
07432cef | 6482 | msgstr "列出分支名" |
c04f5ac3 | 6483 | |
fd8cb379 | 6484 | #: builtin/branch.c:618 |
ef317cd5 | 6485 | msgid "create the branch's reflog" |
07432cef | 6486 | msgstr "创建分支的引用日志" |
ef317cd5 | 6487 | |
fd8cb379 | 6488 | #: builtin/branch.c:620 |
ef317cd5 | 6489 | msgid "edit the description for the branch" |
07432cef | 6490 | msgstr "标记分支的描述" |
ef317cd5 | 6491 | |
fd8cb379 | 6492 | #: builtin/branch.c:621 |
04cb2f28 JX |
6493 | msgid "force creation, move/rename, deletion" |
6494 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 6495 | |
fd8cb379 | 6496 | #: builtin/branch.c:622 |
94550ed3 JX |
6497 | msgid "print only branches that are merged" |
6498 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 6499 | |
fd8cb379 | 6500 | #: builtin/branch.c:623 |
94550ed3 JX |
6501 | msgid "print only branches that are not merged" |
6502 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 6503 | |
fd8cb379 | 6504 | #: builtin/branch.c:624 |
ef317cd5 | 6505 | msgid "list branches in columns" |
07432cef | 6506 | msgstr "以列的方式显示分支" |
ef317cd5 | 6507 | |
fd8cb379 JX |
6508 | #: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 |
6509 | #: builtin/tag.c:412 | |
94550ed3 JX |
6510 | msgid "key" |
6511 | msgstr "key" | |
6512 | ||
fd8cb379 JX |
6513 | #: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 |
6514 | #: builtin/tag.c:413 | |
94550ed3 JX |
6515 | msgid "field name to sort on" |
6516 | msgstr "排序的字段名" | |
6517 | ||
fd8cb379 | 6518 | #: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 |
6937cb4e | 6519 | #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 |
fd8cb379 | 6520 | #: builtin/tag.c:415 |
94550ed3 JX |
6521 | msgid "object" |
6522 | msgstr "对象" | |
6523 | ||
fd8cb379 | 6524 | #: builtin/branch.c:629 |
94550ed3 JX |
6525 | msgid "print only branches of the object" |
6526 | msgstr "只打印指向该对象的分支" | |
6527 | ||
fd8cb379 | 6528 | #: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 |
1a79b2f1 JX |
6529 | msgid "sorting and filtering are case insensitive" |
6530 | msgstr "排序和过滤属于大小写不敏感" | |
6531 | ||
fd8cb379 | 6532 | #: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 |
a4f16749 | 6533 | #: builtin/verify-tag.c:39 |
87cb7997 JX |
6534 | msgid "format to use for the output" |
6535 | msgstr "输出格式" | |
6536 | ||
fd8cb379 | 6537 | #: builtin/branch.c:655 builtin/clone.c:737 |
c04f5ac3 | 6538 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 6539 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 6540 | |
fd8cb379 | 6541 | #: builtin/branch.c:678 |
8ada9598 | 6542 | msgid "--column and --verbose are incompatible" |
81809b99 | 6543 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 6544 | |
fd8cb379 | 6545 | #: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 |
a77c07d9 JX |
6546 | msgid "branch name required" |
6547 | msgstr "必须提供分支名" | |
6548 | ||
fd8cb379 | 6549 | #: builtin/branch.c:721 |
a77c07d9 JX |
6550 | msgid "Cannot give description to detached HEAD" |
6551 | msgstr "不能向分离头指针提供描述" | |
6552 | ||
fd8cb379 | 6553 | #: builtin/branch.c:726 |
a77c07d9 JX |
6554 | msgid "cannot edit description of more than one branch" |
6555 | msgstr "不能为一个以上的分支编辑描述" | |
6556 | ||
fd8cb379 | 6557 | #: builtin/branch.c:733 |
a77c07d9 JX |
6558 | #, c-format |
6559 | msgid "No commit on branch '%s' yet." | |
6560 | msgstr "分支 '%s' 尚无提交。" | |
6561 | ||
fd8cb379 | 6562 | #: builtin/branch.c:736 |
a77c07d9 JX |
6563 | #, c-format |
6564 | msgid "No branch named '%s'." | |
6565 | msgstr "没有分支 '%s'。" | |
6566 | ||
fd8cb379 | 6567 | #: builtin/branch.c:751 |
6937cb4e JX |
6568 | msgid "too many branches for a copy operation" |
6569 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 6570 | |
fd8cb379 | 6571 | #: builtin/branch.c:760 |
6937cb4e JX |
6572 | msgid "too many arguments for a rename operation" |
6573 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 6574 | |
fd8cb379 | 6575 | #: builtin/branch.c:765 |
6937cb4e JX |
6576 | msgid "too many arguments to set new upstream" |
6577 | msgstr "为设置新上游提供了太多的参数" | |
6578 | ||
fd8cb379 | 6579 | #: builtin/branch.c:769 |
1003b3a5 JX |
6580 | #, c-format |
6581 | msgid "" | |
6582 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
6583 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
6584 | ||
fd8cb379 | 6585 | #: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810 |
1003b3a5 JX |
6586 | #, c-format |
6587 | msgid "no such branch '%s'" | |
6588 | msgstr "没有此分支 '%s'" | |
6589 | ||
fd8cb379 | 6590 | #: builtin/branch.c:776 |
07432cef | 6591 | #, c-format |
ef317cd5 | 6592 | msgid "branch '%s' does not exist" |
07432cef | 6593 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 6594 | |
fd8cb379 | 6595 | #: builtin/branch.c:788 |
6937cb4e JX |
6596 | msgid "too many arguments to unset upstream" |
6597 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 6598 | |
fd8cb379 | 6599 | #: builtin/branch.c:792 |
1003b3a5 JX |
6600 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
6601 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
6602 | ||
fd8cb379 | 6603 | #: builtin/branch.c:798 |
ef317cd5 JX |
6604 | #, c-format |
6605 | msgid "Branch '%s' has no upstream information" | |
07432cef | 6606 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 6607 | |
fd8cb379 | 6608 | #: builtin/branch.c:813 |
c04f5ac3 JX |
6609 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
6610 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
6611 | ||
fd8cb379 | 6612 | #: builtin/branch.c:816 |
ef317cd5 | 6613 | msgid "" |
6937cb4e JX |
6614 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
6615 | "'--set-upstream-to' instead." | |
ef317cd5 | 6616 | msgstr "" |
6937cb4e | 6617 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" |
ef317cd5 | 6618 | |
87cb7997 | 6619 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
6620 | #, c-format |
6621 | msgid "%s is okay\n" | |
6622 | msgstr "%s 可以\n" | |
6623 | ||
87cb7997 | 6624 | #: builtin/bundle.c:58 |
c04f5ac3 | 6625 | msgid "Need a repository to create a bundle." |
160fb2b2 | 6626 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 6627 | |
87cb7997 | 6628 | #: builtin/bundle.c:62 |
c04f5ac3 | 6629 | msgid "Need a repository to unbundle." |
160fb2b2 | 6630 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 6631 | |
fd8cb379 | 6632 | #: builtin/cat-file.c:525 |
7aea43ff | 6633 | msgid "" |
a0b6b246 JX |
6634 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
6635 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
6636 | msgstr "" |
6637 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
6638 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 6639 | |
fd8cb379 | 6640 | #: builtin/cat-file.c:526 |
a0b6b246 JX |
6641 | msgid "" |
6642 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
6643 | "filters]" | |
275588f9 JX |
6644 | msgstr "" |
6645 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
6646 | "filters]" | |
ef317cd5 | 6647 | |
fd8cb379 | 6648 | #: builtin/cat-file.c:563 |
ef317cd5 | 6649 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 6650 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 6651 | |
fd8cb379 | 6652 | #: builtin/cat-file.c:564 |
ef317cd5 | 6653 | msgid "show object type" |
07432cef | 6654 | msgstr "显示对象类型" |
ef317cd5 | 6655 | |
fd8cb379 | 6656 | #: builtin/cat-file.c:565 |
ef317cd5 | 6657 | msgid "show object size" |
07432cef | 6658 | msgstr "显示对象大小" |
ef317cd5 | 6659 | |
fd8cb379 | 6660 | #: builtin/cat-file.c:567 |
ef317cd5 | 6661 | msgid "exit with zero when there's no error" |
07432cef | 6662 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 6663 | |
fd8cb379 | 6664 | #: builtin/cat-file.c:568 |
ef317cd5 | 6665 | msgid "pretty-print object's content" |
07432cef | 6666 | msgstr "美观地打印对象的内容" |
ef317cd5 | 6667 | |
fd8cb379 | 6668 | #: builtin/cat-file.c:570 |
ef317cd5 | 6669 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
6670 | msgstr "对于数据对象,对其内容做文本转换" |
6671 | ||
fd8cb379 | 6672 | #: builtin/cat-file.c:572 |
a0b6b246 JX |
6673 | msgid "for blob objects, run filters on object's content" |
6674 | msgstr "对于数据对象,对其内容做过滤" | |
6675 | ||
fd8cb379 | 6676 | #: builtin/cat-file.c:573 git-submodule.sh:894 |
a0b6b246 JX |
6677 | msgid "blob" |
6678 | msgstr "数据对象" | |
6679 | ||
fd8cb379 | 6680 | #: builtin/cat-file.c:574 |
a0b6b246 JX |
6681 | msgid "use a specific path for --textconv/--filters" |
6682 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 6683 | |
fd8cb379 | 6684 | #: builtin/cat-file.c:576 |
7aea43ff JX |
6685 | msgid "allow -s and -t to work with broken/corrupt objects" |
6686 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
6687 | ||
fd8cb379 | 6688 | #: builtin/cat-file.c:577 |
1b7f4a34 JX |
6689 | msgid "buffer --batch output" |
6690 | msgstr "缓冲 --batch 的输出" | |
6691 | ||
fd8cb379 | 6692 | #: builtin/cat-file.c:579 |
ef317cd5 | 6693 | msgid "show info and content of objects fed from the standard input" |
07432cef | 6694 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 6695 | |
fd8cb379 | 6696 | #: builtin/cat-file.c:582 |
ef317cd5 | 6697 | msgid "show info about objects fed from the standard input" |
07432cef | 6698 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 6699 | |
fd8cb379 | 6700 | #: builtin/cat-file.c:585 |
7aea43ff JX |
6701 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
6702 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
6703 | ||
fd8cb379 | 6704 | #: builtin/cat-file.c:587 |
1b7f4a34 JX |
6705 | msgid "show all objects with --batch or --batch-check" |
6706 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
6707 | ||
a4f16749 | 6708 | #: builtin/check-attr.c:12 |
814ff314 JX |
6709 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
6710 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 6711 | |
a4f16749 | 6712 | #: builtin/check-attr.c:13 |
94550ed3 JX |
6713 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
6714 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 6715 | |
a4f16749 | 6716 | #: builtin/check-attr.c:20 |
ef317cd5 | 6717 | msgid "report all attributes set on file" |
07432cef | 6718 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 6719 | |
a4f16749 | 6720 | #: builtin/check-attr.c:21 |
ef317cd5 | 6721 | msgid "use .gitattributes only from the index" |
07432cef | 6722 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 6723 | |
31e5e17b | 6724 | #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 |
ef317cd5 | 6725 | msgid "read file names from stdin" |
07432cef | 6726 | msgstr "从标准输入读出文件名" |
ef317cd5 | 6727 | |
a4f16749 | 6728 | #: builtin/check-attr.c:24 builtin/check-ignore.c:26 |
90314792 JX |
6729 | msgid "terminate input and output records by a NUL character" |
6730 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 6731 | |
fd8cb379 | 6732 | #: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 |
a77c07d9 JX |
6733 | msgid "suppress progress reporting" |
6734 | msgstr "不显示进度报告" | |
6735 | ||
a4f16749 | 6736 | #: builtin/check-ignore.c:28 |
2e8451e8 JX |
6737 | msgid "show non-matching input paths" |
6738 | msgstr "显示未匹配的输入路径" | |
6739 | ||
a4f16749 | 6740 | #: builtin/check-ignore.c:30 |
90314792 JX |
6741 | msgid "ignore index when checking" |
6742 | msgstr "检查时忽略索引" | |
6743 | ||
31e5e17b | 6744 | #: builtin/check-ignore.c:159 |
a77c07d9 | 6745 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 6746 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 6747 | |
31e5e17b | 6748 | #: builtin/check-ignore.c:162 |
a77c07d9 JX |
6749 | msgid "-z only makes sense with --stdin" |
6750 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
6751 | ||
31e5e17b | 6752 | #: builtin/check-ignore.c:164 |
a77c07d9 JX |
6753 | msgid "no path specified" |
6754 | msgstr "未指定路径" | |
6755 | ||
31e5e17b | 6756 | #: builtin/check-ignore.c:168 |
a77c07d9 JX |
6757 | msgid "--quiet is only valid with a single pathname" |
6758 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
6759 | ||
31e5e17b | 6760 | #: builtin/check-ignore.c:170 |
a77c07d9 JX |
6761 | msgid "cannot have both --quiet and --verbose" |
6762 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
6763 | ||
31e5e17b | 6764 | #: builtin/check-ignore.c:173 |
2e8451e8 JX |
6765 | msgid "--non-matching is only valid with --verbose" |
6766 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
6767 | ||
a4f16749 | 6768 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
6769 | msgid "git check-mailmap [<options>] <contact>..." |
6770 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 6771 | |
a4f16749 | 6772 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
6773 | msgid "also read contacts from stdin" |
6774 | msgstr "还从标准输入读取联系地址" | |
6775 | ||
a4f16749 | 6776 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
6777 | #, c-format |
6778 | msgid "unable to parse contact: %s" | |
6779 | msgstr "不能解析联系地址:%s" | |
6780 | ||
a4f16749 | 6781 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
6782 | msgid "no contacts specified" |
6783 | msgstr "未指定联系地址" | |
6784 | ||
a4f16749 | 6785 | #: builtin/checkout-index.c:128 |
814ff314 JX |
6786 | msgid "git checkout-index [<options>] [--] [<file>...]" |
6787 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 6788 | |
5809aa05 | 6789 | #: builtin/checkout-index.c:143 |
276ceeaa JX |
6790 | msgid "stage should be between 1 and 3 or all" |
6791 | msgstr "索引值应该取值 1 到 3 或者 all" | |
6792 | ||
5809aa05 | 6793 | #: builtin/checkout-index.c:159 |
ef317cd5 | 6794 | msgid "check out all files in the index" |
07432cef | 6795 | msgstr "检出索引区的所有文件" |
ef317cd5 | 6796 | |
5809aa05 | 6797 | #: builtin/checkout-index.c:160 |
ef317cd5 | 6798 | msgid "force overwrite of existing files" |
07432cef | 6799 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 6800 | |
5809aa05 | 6801 | #: builtin/checkout-index.c:162 |
ef317cd5 | 6802 | msgid "no warning for existing files and files not in index" |
07432cef | 6803 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 6804 | |
5809aa05 | 6805 | #: builtin/checkout-index.c:164 |
ef317cd5 | 6806 | msgid "don't checkout new files" |
07432cef | 6807 | msgstr "不检出新文件" |
ef317cd5 | 6808 | |
5809aa05 | 6809 | #: builtin/checkout-index.c:166 |
ef317cd5 | 6810 | msgid "update stat information in the index file" |
07432cef | 6811 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 6812 | |
5809aa05 | 6813 | #: builtin/checkout-index.c:170 |
ef317cd5 | 6814 | msgid "read list of paths from the standard input" |
07432cef | 6815 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 6816 | |
5809aa05 | 6817 | #: builtin/checkout-index.c:172 |
ef317cd5 | 6818 | msgid "write the content to temporary files" |
07432cef | 6819 | msgstr "将内容写入临时文件" |
ef317cd5 | 6820 | |
5809aa05 | 6821 | #: builtin/checkout-index.c:173 builtin/column.c:31 |
fd8cb379 JX |
6822 | #: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 |
6823 | #: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 | |
6824 | #: builtin/worktree.c:610 | |
ef317cd5 | 6825 | msgid "string" |
07432cef | 6826 | msgstr "字符串" |
ef317cd5 | 6827 | |
5809aa05 | 6828 | #: builtin/checkout-index.c:174 |
ef317cd5 | 6829 | msgid "when creating files, prepend <string>" |
4375c10e | 6830 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 6831 | |
5809aa05 | 6832 | #: builtin/checkout-index.c:176 |
ef317cd5 | 6833 | msgid "copy out the files from named stage" |
07432cef | 6834 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 6835 | |
5809aa05 | 6836 | #: builtin/checkout.c:27 |
814ff314 JX |
6837 | msgid "git checkout [<options>] <branch>" |
6838 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 6839 | |
5809aa05 | 6840 | #: builtin/checkout.c:28 |
814ff314 JX |
6841 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
6842 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 6843 | |
5809aa05 | 6844 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
6845 | #, c-format |
6846 | msgid "path '%s' does not have our version" | |
6847 | msgstr "路径 '%s' 没有我们的版本" | |
6848 | ||
5809aa05 | 6849 | #: builtin/checkout.c:138 builtin/checkout.c:171 |
c04f5ac3 JX |
6850 | #, c-format |
6851 | msgid "path '%s' does not have their version" | |
6852 | msgstr "路径 '%s' 没有他们的版本" | |
6853 | ||
5809aa05 | 6854 | #: builtin/checkout.c:154 |
c04f5ac3 JX |
6855 | #, c-format |
6856 | msgid "path '%s' does not have all necessary versions" | |
6857 | msgstr "路径 '%s' 没有全部必须的版本" | |
6858 | ||
5809aa05 | 6859 | #: builtin/checkout.c:198 |
c04f5ac3 JX |
6860 | #, c-format |
6861 | msgid "path '%s' does not have necessary versions" | |
6862 | msgstr "路径 '%s' 没有必须的版本" | |
6863 | ||
5809aa05 | 6864 | #: builtin/checkout.c:215 |
c04f5ac3 JX |
6865 | #, c-format |
6866 | msgid "path '%s': cannot merge" | |
90e6ef53 | 6867 | msgstr "path '%s':无法合并" |
c04f5ac3 | 6868 | |
31e5e17b | 6869 | #: builtin/checkout.c:231 |
c04f5ac3 JX |
6870 | #, c-format |
6871 | msgid "Unable to add merge result for '%s'" | |
6872 | msgstr "无法为 '%s' 添加合并结果" | |
6873 | ||
31e5e17b JX |
6874 | #: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 |
6875 | #: builtin/checkout.c:262 | |
07432cef | 6876 | #, c-format |
ef317cd5 | 6877 | msgid "'%s' cannot be used with updating paths" |
07432cef | 6878 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 6879 | |
31e5e17b | 6880 | #: builtin/checkout.c:265 builtin/checkout.c:268 |
07432cef | 6881 | #, c-format |
ef317cd5 | 6882 | msgid "'%s' cannot be used with %s" |
07432cef | 6883 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 6884 | |
31e5e17b | 6885 | #: builtin/checkout.c:271 |
ef317cd5 JX |
6886 | #, c-format |
6887 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 6888 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 6889 | |
31e5e17b | 6890 | #: builtin/checkout.c:340 builtin/checkout.c:347 |
c04f5ac3 JX |
6891 | #, c-format |
6892 | msgid "path '%s' is unmerged" | |
6893 | msgstr "路径 '%s' 未合并" | |
6894 | ||
fd8cb379 | 6895 | #: builtin/checkout.c:506 |
c04f5ac3 | 6896 | msgid "you need to resolve your current index first" |
90e6ef53 | 6897 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 6898 | |
fd8cb379 | 6899 | #: builtin/checkout.c:643 |
c04f5ac3 | 6900 | #, c-format |
1b7f4a34 JX |
6901 | msgid "Can not do reflog for '%s': %s\n" |
6902 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 6903 | |
fd8cb379 | 6904 | #: builtin/checkout.c:684 |
c04f5ac3 JX |
6905 | msgid "HEAD is now at" |
6906 | msgstr "HEAD 目前位于" | |
6907 | ||
fd8cb379 | 6908 | #: builtin/checkout.c:688 builtin/clone.c:691 |
3495628d JX |
6909 | msgid "unable to update HEAD" |
6910 | msgstr "不能更新 HEAD" | |
6911 | ||
fd8cb379 | 6912 | #: builtin/checkout.c:692 |
c04f5ac3 JX |
6913 | #, c-format |
6914 | msgid "Reset branch '%s'\n" | |
6915 | msgstr "重置分支 '%s'\n" | |
6916 | ||
fd8cb379 | 6917 | #: builtin/checkout.c:695 |
c04f5ac3 JX |
6918 | #, c-format |
6919 | msgid "Already on '%s'\n" | |
6920 | msgstr "已经位于 '%s'\n" | |
6921 | ||
fd8cb379 | 6922 | #: builtin/checkout.c:699 |
c04f5ac3 JX |
6923 | #, c-format |
6924 | msgid "Switched to and reset branch '%s'\n" | |
6925 | msgstr "切换并重置分支 '%s'\n" | |
6926 | ||
fd8cb379 | 6927 | #: builtin/checkout.c:701 builtin/checkout.c:1046 |
c04f5ac3 JX |
6928 | #, c-format |
6929 | msgid "Switched to a new branch '%s'\n" | |
6930 | msgstr "切换到一个新分支 '%s'\n" | |
6931 | ||
fd8cb379 | 6932 | #: builtin/checkout.c:703 |
c04f5ac3 JX |
6933 | #, c-format |
6934 | msgid "Switched to branch '%s'\n" | |
6935 | msgstr "切换到分支 '%s'\n" | |
6936 | ||
90e6ef53 | 6937 | # 译者:注意保持前导空格 |
fd8cb379 | 6938 | #: builtin/checkout.c:754 |
c04f5ac3 JX |
6939 | #, c-format |
6940 | msgid " ... and %d more.\n" | |
90e6ef53 | 6941 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 6942 | |
fd8cb379 | 6943 | #: builtin/checkout.c:760 |
c04f5ac3 JX |
6944 | #, c-format |
6945 | msgid "" | |
6946 | "Warning: you are leaving %d commit behind, not connected to\n" | |
6947 | "any of your branches:\n" | |
6948 | "\n" | |
6949 | "%s\n" | |
6950 | msgid_plural "" | |
6951 | "Warning: you are leaving %d commits behind, not connected to\n" | |
6952 | "any of your branches:\n" | |
6953 | "\n" | |
6954 | "%s\n" | |
6955 | msgstr[0] "" | |
6956 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6957 | "\n" | |
6958 | "%s\n" | |
5ae481e0 JX |
6959 | msgstr[1] "" |
6960 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
6961 | "\n" | |
6962 | "%s\n" | |
c04f5ac3 | 6963 | |
fd8cb379 | 6964 | #: builtin/checkout.c:779 |
c04f5ac3 JX |
6965 | #, c-format |
6966 | msgid "" | |
7aea43ff JX |
6967 | "If you want to keep it by creating a new branch, this may be a good time\n" |
6968 | "to do so with:\n" | |
6969 | "\n" | |
6970 | " git branch <new-branch-name> %s\n" | |
6971 | "\n" | |
6972 | msgid_plural "" | |
c04f5ac3 JX |
6973 | "If you want to keep them by creating a new branch, this may be a good time\n" |
6974 | "to do so with:\n" | |
6975 | "\n" | |
814ff314 | 6976 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 6977 | "\n" |
7aea43ff JX |
6978 | msgstr[0] "" |
6979 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
6980 | "如下操作:\n" | |
6981 | "\n" | |
6982 | " git branch <新分支名> %s\n" | |
6983 | "\n" | |
6984 | msgstr[1] "" | |
6985 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
6986 | "如下操作:\n" |
6987 | "\n" | |
814ff314 | 6988 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
6989 | "\n" |
6990 | ||
fd8cb379 | 6991 | #: builtin/checkout.c:811 |
c04f5ac3 JX |
6992 | msgid "internal error in revision walk" |
6993 | msgstr "在版本遍历时遇到内部错误" | |
6994 | ||
fd8cb379 | 6995 | #: builtin/checkout.c:815 |
c04f5ac3 JX |
6996 | msgid "Previous HEAD position was" |
6997 | msgstr "之前的 HEAD 位置是" | |
6998 | ||
fd8cb379 | 6999 | #: builtin/checkout.c:843 builtin/checkout.c:1041 |
c04f5ac3 | 7000 | msgid "You are on a branch yet to be born" |
90e6ef53 | 7001 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 7002 | |
fd8cb379 | 7003 | #: builtin/checkout.c:947 |
90314792 JX |
7004 | #, c-format |
7005 | msgid "only one reference expected, %d given." | |
a0b6b246 | 7006 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 7007 | |
fd8cb379 | 7008 | #: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 |
c04f5ac3 JX |
7009 | #, c-format |
7010 | msgid "invalid reference: %s" | |
7011 | msgstr "无效引用:%s" | |
7012 | ||
fd8cb379 | 7013 | #: builtin/checkout.c:1016 |
c04f5ac3 JX |
7014 | #, c-format |
7015 | msgid "reference is not a tree: %s" | |
7016 | msgstr "引用不是一个树:%s" | |
7017 | ||
fd8cb379 | 7018 | #: builtin/checkout.c:1055 |
ef317cd5 | 7019 | msgid "paths cannot be used with switching branches" |
07432cef | 7020 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 7021 | |
fd8cb379 | 7022 | #: builtin/checkout.c:1058 builtin/checkout.c:1062 |
07432cef | 7023 | #, c-format |
ef317cd5 | 7024 | msgid "'%s' cannot be used with switching branches" |
07432cef | 7025 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 7026 | |
fd8cb379 JX |
7027 | #: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 |
7028 | #: builtin/checkout.c:1077 | |
07432cef | 7029 | #, c-format |
ef317cd5 | 7030 | msgid "'%s' cannot be used with '%s'" |
07432cef | 7031 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 7032 | |
fd8cb379 | 7033 | #: builtin/checkout.c:1082 |
07432cef | 7034 | #, c-format |
ef317cd5 | 7035 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 7036 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 7037 | |
fd8cb379 JX |
7038 | #: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 |
7039 | #: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 | |
7040 | #: builtin/worktree.c:435 | |
ef317cd5 | 7041 | msgid "branch" |
07432cef | 7042 | msgstr "分支" |
c04f5ac3 | 7043 | |
fd8cb379 | 7044 | #: builtin/checkout.c:1115 |
ef317cd5 | 7045 | msgid "create and checkout a new branch" |
07432cef | 7046 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 7047 | |
fd8cb379 | 7048 | #: builtin/checkout.c:1117 |
ef317cd5 | 7049 | msgid "create/reset and checkout a branch" |
07432cef | 7050 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 7051 | |
fd8cb379 | 7052 | #: builtin/checkout.c:1118 |
ef317cd5 | 7053 | msgid "create reflog for new branch" |
07432cef | 7054 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 7055 | |
fd8cb379 | 7056 | #: builtin/checkout.c:1119 builtin/worktree.c:437 |
5c57d762 JX |
7057 | msgid "detach HEAD at named commit" |
7058 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 7059 | |
fd8cb379 | 7060 | #: builtin/checkout.c:1120 |
ef317cd5 | 7061 | msgid "set upstream info for new branch" |
07432cef | 7062 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 7063 | |
fd8cb379 | 7064 | #: builtin/checkout.c:1122 |
6c94aba5 | 7065 | msgid "new-branch" |
07432cef | 7066 | msgstr "新分支" |
ef317cd5 | 7067 | |
fd8cb379 | 7068 | #: builtin/checkout.c:1122 |
ef317cd5 | 7069 | msgid "new unparented branch" |
07432cef | 7070 | msgstr "新的没有父提交的分支" |
ef317cd5 | 7071 | |
fd8cb379 | 7072 | #: builtin/checkout.c:1123 |
ef317cd5 | 7073 | msgid "checkout our version for unmerged files" |
07432cef | 7074 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 7075 | |
fd8cb379 | 7076 | #: builtin/checkout.c:1125 |
ef317cd5 | 7077 | msgid "checkout their version for unmerged files" |
07432cef | 7078 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 7079 | |
fd8cb379 | 7080 | #: builtin/checkout.c:1127 |
ef317cd5 | 7081 | msgid "force checkout (throw away local modifications)" |
07432cef | 7082 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 7083 | |
fd8cb379 | 7084 | #: builtin/checkout.c:1129 |
ef317cd5 | 7085 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 7086 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 7087 | |
fd8cb379 | 7088 | #: builtin/checkout.c:1131 builtin/merge.c:241 |
ef317cd5 | 7089 | msgid "update ignored files (default)" |
07432cef | 7090 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 7091 | |
fd8cb379 | 7092 | #: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 |
ef317cd5 | 7093 | msgid "style" |
07432cef | 7094 | msgstr "风格" |
ef317cd5 | 7095 | |
fd8cb379 | 7096 | #: builtin/checkout.c:1134 |
ef317cd5 | 7097 | msgid "conflict style (merge or diff3)" |
07432cef | 7098 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 7099 | |
fd8cb379 | 7100 | #: builtin/checkout.c:1137 |
4dcdc3d8 JX |
7101 | msgid "do not limit pathspecs to sparse entries only" |
7102 | msgstr "对路径不做稀疏检出的限制" | |
7103 | ||
fd8cb379 | 7104 | #: builtin/checkout.c:1139 |
814ff314 JX |
7105 | msgid "second guess 'git checkout <no-such-branch>'" |
7106 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 7107 | |
fd8cb379 | 7108 | #: builtin/checkout.c:1141 |
7aea43ff JX |
7109 | msgid "do not check if another worktree is holding the given ref" |
7110 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
7111 | ||
fd8cb379 JX |
7112 | #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 |
7113 | #: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572 | |
7114 | #: builtin/send-pack.c:174 | |
94550ed3 JX |
7115 | msgid "force progress reporting" |
7116 | msgstr "强制显示进度报告" | |
7117 | ||
fd8cb379 | 7118 | #: builtin/checkout.c:1175 |
ef317cd5 | 7119 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 7120 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 7121 | |
fd8cb379 | 7122 | #: builtin/checkout.c:1192 |
ef317cd5 JX |
7123 | msgid "--track needs a branch name" |
7124 | msgstr "--track 需要一个分支名" | |
7125 | ||
fd8cb379 | 7126 | #: builtin/checkout.c:1197 |
ef317cd5 JX |
7127 | msgid "Missing branch name; try -b" |
7128 | msgstr "缺少分支名;尝试 -b" | |
7129 | ||
fd8cb379 | 7130 | #: builtin/checkout.c:1233 |
c04f5ac3 | 7131 | msgid "invalid path specification" |
90e6ef53 | 7132 | msgstr "无效的路径规格" |
c04f5ac3 | 7133 | |
fd8cb379 | 7134 | #: builtin/checkout.c:1240 |
07432cef | 7135 | #, c-format |
a4f16749 JX |
7136 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
7137 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 7138 | |
fd8cb379 | 7139 | #: builtin/checkout.c:1244 |
07432cef | 7140 | #, c-format |
ef317cd5 | 7141 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 7142 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 7143 | |
fd8cb379 | 7144 | #: builtin/checkout.c:1248 |
c04f5ac3 JX |
7145 | msgid "" |
7146 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
7147 | "checking out of the index." | |
7148 | msgstr "" | |
90e6ef53 | 7149 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 7150 | |
a4f16749 | 7151 | #: builtin/clean.c:26 |
2e8451e8 JX |
7152 | msgid "" |
7153 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
7154 | msgstr "" | |
7155 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 7156 | |
a4f16749 | 7157 | #: builtin/clean.c:30 |
07432cef WS |
7158 | #, c-format |
7159 | msgid "Removing %s\n" | |
7160 | msgstr "正删除 %s\n" | |
7161 | ||
a4f16749 | 7162 | #: builtin/clean.c:31 |
07432cef WS |
7163 | #, c-format |
7164 | msgid "Would remove %s\n" | |
7165 | msgstr "将删除 %s\n" | |
7166 | ||
a4f16749 | 7167 | #: builtin/clean.c:32 |
07432cef WS |
7168 | #, c-format |
7169 | msgid "Skipping repository %s\n" | |
160fb2b2 | 7170 | msgstr "忽略仓库 %s\n" |
07432cef | 7171 | |
a4f16749 | 7172 | #: builtin/clean.c:33 |
07432cef WS |
7173 | #, c-format |
7174 | msgid "Would skip repository %s\n" | |
160fb2b2 | 7175 | msgstr "将忽略仓库 %s\n" |
07432cef | 7176 | |
a4f16749 | 7177 | #: builtin/clean.c:34 |
07432cef WS |
7178 | #, c-format |
7179 | msgid "failed to remove %s" | |
7180 | msgstr "无法删除 %s" | |
7181 | ||
fd8cb379 | 7182 | #: builtin/clean.c:302 git-add--interactive.perl:579 |
1a79b2f1 | 7183 | #, c-format |
2e8451e8 JX |
7184 | msgid "" |
7185 | "Prompt help:\n" | |
7186 | "1 - select a numbered item\n" | |
7187 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 7188 | " - (empty) select nothing\n" |
2e8451e8 JX |
7189 | msgstr "" |
7190 | "帮助:\n" | |
7191 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
7192 | "foo - 通过唯一前缀选择一个选项\n" |
7193 | " - (空)什么也不选择\n" | |
2e8451e8 | 7194 | |
fd8cb379 | 7195 | #: builtin/clean.c:306 git-add--interactive.perl:588 |
1a79b2f1 | 7196 | #, c-format |
2e8451e8 JX |
7197 | msgid "" |
7198 | "Prompt help:\n" | |
7199 | "1 - select a single item\n" | |
7200 | "3-5 - select a range of items\n" | |
7201 | "2-3,6-9 - select multiple ranges\n" | |
7202 | "foo - select item based on unique prefix\n" | |
7203 | "-... - unselect specified items\n" | |
7204 | "* - choose all items\n" | |
1a79b2f1 | 7205 | " - (empty) finish selecting\n" |
2e8451e8 JX |
7206 | msgstr "" |
7207 | "帮助:\n" | |
7208 | "1 - 选择一个选项\n" | |
7209 | "3-5 - 选择一个范围内的所有选项\n" | |
7210 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 7211 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
7212 | "-... - 反选特定的选项\n" |
7213 | "* - 选择所有选项\n" | |
1a79b2f1 | 7214 | " - (空)结束选择\n" |
2e8451e8 | 7215 | |
fd8cb379 JX |
7216 | #: builtin/clean.c:522 git-add--interactive.perl:554 |
7217 | #: git-add--interactive.perl:559 | |
1a79b2f1 JX |
7218 | #, c-format, perl-format |
7219 | msgid "Huh (%s)?\n" | |
7220 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 7221 | |
5809aa05 | 7222 | #: builtin/clean.c:664 |
2e8451e8 JX |
7223 | #, c-format |
7224 | msgid "Input ignore patterns>> " | |
7225 | msgstr "输入模版以排除条目>> " | |
7226 | ||
5809aa05 | 7227 | #: builtin/clean.c:701 |
2e8451e8 JX |
7228 | #, c-format |
7229 | msgid "WARNING: Cannot find items matched by: %s" | |
7230 | msgstr "警告:无法找到和 %s 匹配的条目" | |
7231 | ||
5809aa05 | 7232 | #: builtin/clean.c:722 |
2e8451e8 JX |
7233 | msgid "Select items to delete" |
7234 | msgstr "选择要删除的条目" | |
7235 | ||
814ff314 | 7236 | #. TRANSLATORS: Make sure to keep [y/N] as is |
5809aa05 | 7237 | #: builtin/clean.c:763 |
2e8451e8 | 7238 | #, c-format |
814ff314 JX |
7239 | msgid "Remove %s [y/N]? " |
7240 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 7241 | |
fd8cb379 | 7242 | #: builtin/clean.c:788 git-add--interactive.perl:1717 |
1a79b2f1 JX |
7243 | #, c-format |
7244 | msgid "Bye.\n" | |
7245 | msgstr "再见。\n" | |
2e8451e8 | 7246 | |
5809aa05 | 7247 | #: builtin/clean.c:796 |
2e8451e8 JX |
7248 | msgid "" |
7249 | "clean - start cleaning\n" | |
7250 | "filter by pattern - exclude items from deletion\n" | |
7251 | "select by numbers - select items to be deleted by numbers\n" | |
7252 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
7253 | "quit - stop cleaning\n" | |
7254 | "help - this screen\n" | |
7255 | "? - help for prompt selection" | |
7256 | msgstr "" | |
7257 | "clean - 开始清理\n" | |
7258 | "filter by pattern - 通过模版排除要删除的条目\n" | |
7259 | "select by numbers - 通过数字选择要删除的条目\n" | |
7260 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
7261 | "quit - 停止删除并退出\n" | |
7262 | "help - 显示本帮助\n" | |
7263 | "? - 显示如何在提示符下选择的帮助" | |
7264 | ||
fd8cb379 | 7265 | #: builtin/clean.c:823 git-add--interactive.perl:1793 |
2e8451e8 JX |
7266 | msgid "*** Commands ***" |
7267 | msgstr "*** 命令 ***" | |
7268 | ||
fd8cb379 | 7269 | #: builtin/clean.c:824 git-add--interactive.perl:1790 |
2e8451e8 JX |
7270 | msgid "What now" |
7271 | msgstr "请选择" | |
7272 | ||
5809aa05 | 7273 | #: builtin/clean.c:832 |
2e8451e8 JX |
7274 | msgid "Would remove the following item:" |
7275 | msgid_plural "Would remove the following items:" | |
7276 | msgstr[0] "将删除如下条目:" | |
7277 | msgstr[1] "将删除如下条目:" | |
7278 | ||
5809aa05 | 7279 | #: builtin/clean.c:848 |
2e8451e8 JX |
7280 | msgid "No more files to clean, exiting." |
7281 | msgstr "没有要清理的文件,退出。" | |
7282 | ||
5809aa05 | 7283 | #: builtin/clean.c:910 |
ef317cd5 | 7284 | msgid "do not print names of files removed" |
07432cef | 7285 | msgstr "不打印删除文件的名称" |
ef317cd5 | 7286 | |
5809aa05 | 7287 | #: builtin/clean.c:912 |
ef317cd5 | 7288 | msgid "force" |
07432cef | 7289 | msgstr "强制" |
ef317cd5 | 7290 | |
5809aa05 | 7291 | #: builtin/clean.c:913 |
2e8451e8 JX |
7292 | msgid "interactive cleaning" |
7293 | msgstr "交互式清除" | |
7294 | ||
5809aa05 | 7295 | #: builtin/clean.c:915 |
ef317cd5 | 7296 | msgid "remove whole directories" |
07432cef | 7297 | msgstr "删除整个目录" |
ef317cd5 | 7298 | |
31e5e17b JX |
7299 | #: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 |
7300 | #: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 | |
5809aa05 JX |
7301 | #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 |
7302 | #: builtin/show-ref.c:176 | |
ef317cd5 | 7303 | msgid "pattern" |
07432cef | 7304 | msgstr "模式" |
ef317cd5 | 7305 | |
5809aa05 | 7306 | #: builtin/clean.c:917 |
ef317cd5 | 7307 | msgid "add <pattern> to ignore rules" |
4375c10e | 7308 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 7309 | |
5809aa05 | 7310 | #: builtin/clean.c:918 |
ef317cd5 | 7311 | msgid "remove ignored files, too" |
07432cef | 7312 | msgstr "也删除忽略的文件" |
ef317cd5 | 7313 | |
5809aa05 | 7314 | #: builtin/clean.c:920 |
ef317cd5 | 7315 | msgid "remove only ignored files" |
07432cef | 7316 | msgstr "只删除忽略的文件" |
c04f5ac3 | 7317 | |
5809aa05 | 7318 | #: builtin/clean.c:938 |
c04f5ac3 | 7319 | msgid "-x and -X cannot be used together" |
649900bc | 7320 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 7321 | |
5809aa05 | 7322 | #: builtin/clean.c:942 |
c04f5ac3 | 7323 | msgid "" |
6c94aba5 | 7324 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 7325 | "clean" |
c04f5ac3 | 7326 | msgstr "" |
2e8451e8 | 7327 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 7328 | |
5809aa05 | 7329 | #: builtin/clean.c:945 |
c04f5ac3 | 7330 | msgid "" |
6c94aba5 | 7331 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 7332 | "refusing to clean" |
c04f5ac3 | 7333 | msgstr "" |
2e8451e8 | 7334 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 7335 | |
fd8cb379 | 7336 | #: builtin/clone.c:42 |
814ff314 | 7337 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 7338 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 7339 | |
fd8cb379 | 7340 | #: builtin/clone.c:87 |
ef317cd5 | 7341 | msgid "don't create a checkout" |
07432cef | 7342 | msgstr "不创建一个检出" |
ef317cd5 | 7343 | |
fd8cb379 | 7344 | #: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 |
ef317cd5 | 7345 | msgid "create a bare repository" |
160fb2b2 | 7346 | msgstr "创建一个纯仓库" |
ef317cd5 | 7347 | |
fd8cb379 | 7348 | #: builtin/clone.c:92 |
ef317cd5 | 7349 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 7350 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 7351 | |
fd8cb379 | 7352 | #: builtin/clone.c:94 |
ef317cd5 | 7353 | msgid "to clone from a local repository" |
160fb2b2 | 7354 | msgstr "从本地仓库克隆" |
ef317cd5 | 7355 | |
fd8cb379 | 7356 | #: builtin/clone.c:96 |
ef317cd5 | 7357 | msgid "don't use local hardlinks, always copy" |
07432cef | 7358 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 7359 | |
fd8cb379 | 7360 | #: builtin/clone.c:98 |
ef317cd5 | 7361 | msgid "setup as shared repository" |
160fb2b2 | 7362 | msgstr "设置为共享仓库" |
ef317cd5 | 7363 | |
fd8cb379 | 7364 | #: builtin/clone.c:100 builtin/clone.c:104 |
87cb7997 | 7365 | msgid "pathspec" |
65e2041e | 7366 | msgstr "路径规格" |
87cb7997 | 7367 | |
fd8cb379 | 7368 | #: builtin/clone.c:100 builtin/clone.c:104 |
ef317cd5 | 7369 | msgid "initialize submodules in the clone" |
07432cef | 7370 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 7371 | |
fd8cb379 | 7372 | #: builtin/clone.c:107 |
5b04ee3b JX |
7373 | msgid "number of submodules cloned in parallel" |
7374 | msgstr "并发克隆的子模组的数量" | |
7375 | ||
fd8cb379 | 7376 | #: builtin/clone.c:108 builtin/init-db.c:476 |
ef317cd5 | 7377 | msgid "template-directory" |
07432cef | 7378 | msgstr "模板目录" |
ef317cd5 | 7379 | |
fd8cb379 | 7380 | #: builtin/clone.c:109 builtin/init-db.c:477 |
ef317cd5 | 7381 | msgid "directory from which templates will be used" |
07432cef | 7382 | msgstr "模板目录将被使用" |
ef317cd5 | 7383 | |
fd8cb379 JX |
7384 | #: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 |
7385 | #: builtin/submodule--helper.c:1594 | |
ef317cd5 | 7386 | msgid "reference repository" |
160fb2b2 | 7387 | msgstr "参考仓库" |
ef317cd5 | 7388 | |
fd8cb379 JX |
7389 | #: builtin/clone.c:115 builtin/submodule--helper.c:1225 |
7390 | #: builtin/submodule--helper.c:1596 | |
7aea43ff | 7391 | msgid "use --reference only while cloning" |
160fb2b2 | 7392 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 7393 | |
fd8cb379 JX |
7394 | #: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 |
7395 | #: builtin/pack-objects.c:3166 builtin/repack.c:213 | |
ef317cd5 | 7396 | msgid "name" |
07432cef | 7397 | msgstr "名称" |
ef317cd5 | 7398 | |
fd8cb379 | 7399 | #: builtin/clone.c:117 |
ef317cd5 | 7400 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 7401 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 7402 | |
fd8cb379 | 7403 | #: builtin/clone.c:119 |
ef317cd5 | 7404 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 7405 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 7406 | |
fd8cb379 | 7407 | #: builtin/clone.c:121 |
ef317cd5 | 7408 | msgid "path to git-upload-pack on the remote" |
07432cef | 7409 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 7410 | |
fd8cb379 JX |
7411 | #: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 |
7412 | #: builtin/pull.c:216 | |
ef317cd5 | 7413 | msgid "depth" |
07432cef | 7414 | msgstr "深度" |
ef317cd5 | 7415 | |
fd8cb379 | 7416 | #: builtin/clone.c:123 |
ef317cd5 | 7417 | msgid "create a shallow clone of that depth" |
07432cef | 7418 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 7419 | |
fd8cb379 | 7420 | #: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 |
31e5e17b | 7421 | #: parse-options.h:154 |
a0b6b246 JX |
7422 | msgid "time" |
7423 | msgstr "时间" | |
7424 | ||
fd8cb379 | 7425 | #: builtin/clone.c:125 |
a0b6b246 JX |
7426 | msgid "create a shallow clone since a specific time" |
7427 | msgstr "从一个特定时间创建一个浅克隆" | |
7428 | ||
fd8cb379 | 7429 | #: builtin/clone.c:126 builtin/fetch.c:154 |
a0b6b246 JX |
7430 | msgid "revision" |
7431 | msgstr "版本" | |
7432 | ||
fd8cb379 | 7433 | #: builtin/clone.c:127 builtin/fetch.c:155 |
1a79b2f1 JX |
7434 | msgid "deepen history of shallow clone, excluding rev" |
7435 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 7436 | |
fd8cb379 | 7437 | #: builtin/clone.c:129 |
ef317cd5 | 7438 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 7439 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 7440 | |
fd8cb379 | 7441 | #: builtin/clone.c:131 |
a4f16749 JX |
7442 | msgid "don't clone any tags, and make later fetches not to follow them" |
7443 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
7444 | ||
fd8cb379 | 7445 | #: builtin/clone.c:133 |
5b04ee3b JX |
7446 | msgid "any cloned submodules will be shallow" |
7447 | msgstr "子模组将以浅下载模式克隆" | |
7448 | ||
fd8cb379 | 7449 | #: builtin/clone.c:134 builtin/init-db.c:485 |
ef317cd5 | 7450 | msgid "gitdir" |
07432cef | 7451 | msgstr "git目录" |
ef317cd5 | 7452 | |
fd8cb379 | 7453 | #: builtin/clone.c:135 builtin/init-db.c:486 |
ef317cd5 | 7454 | msgid "separate git dir from working tree" |
07432cef | 7455 | msgstr "git目录和工作区分离" |
ef317cd5 | 7456 | |
fd8cb379 | 7457 | #: builtin/clone.c:136 |
ef317cd5 | 7458 | msgid "key=value" |
07432cef | 7459 | msgstr "key=value" |
ef317cd5 | 7460 | |
fd8cb379 | 7461 | #: builtin/clone.c:137 |
ef317cd5 | 7462 | msgid "set config inside the new repository" |
160fb2b2 | 7463 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 7464 | |
fd8cb379 JX |
7465 | #: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 |
7466 | #: builtin/push.c:583 | |
276ceeaa JX |
7467 | msgid "use IPv4 addresses only" |
7468 | msgstr "只使用 IPv4 地址" | |
7469 | ||
fd8cb379 JX |
7470 | #: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 |
7471 | #: builtin/push.c:585 | |
276ceeaa JX |
7472 | msgid "use IPv6 addresses only" |
7473 | msgstr "只使用 IPv6 地址" | |
7474 | ||
fd8cb379 | 7475 | #: builtin/clone.c:278 |
3495628d JX |
7476 | msgid "" |
7477 | "No directory name could be guessed.\n" | |
7478 | "Please specify a directory on the command line" | |
7479 | msgstr "" | |
7480 | "无法猜到目录名。\n" | |
26e4cbec | 7481 | "请在命令行指定一个目录" |
3495628d | 7482 | |
fd8cb379 | 7483 | #: builtin/clone.c:331 |
cfff71a9 | 7484 | #, c-format |
a0b6b246 JX |
7485 | msgid "info: Could not add alternate for '%s': %s\n" |
7486 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 7487 | |
fd8cb379 | 7488 | #: builtin/clone.c:403 |
5c57d762 JX |
7489 | #, c-format |
7490 | msgid "failed to open '%s'" | |
7491 | msgstr "无法打开 '%s'" | |
7492 | ||
fd8cb379 | 7493 | #: builtin/clone.c:411 |
c04f5ac3 JX |
7494 | #, c-format |
7495 | msgid "%s exists and is not a directory" | |
7496 | msgstr "%s 存在且不是一个目录" | |
7497 | ||
fd8cb379 | 7498 | #: builtin/clone.c:425 |
c04f5ac3 JX |
7499 | #, c-format |
7500 | msgid "failed to stat %s\n" | |
65e2041e | 7501 | msgstr "对 %s 调用 stat 失败\n" |
c04f5ac3 | 7502 | |
fd8cb379 | 7503 | #: builtin/clone.c:447 |
c04f5ac3 JX |
7504 | #, c-format |
7505 | msgid "failed to create link '%s'" | |
90e6ef53 | 7506 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 7507 | |
fd8cb379 | 7508 | #: builtin/clone.c:451 |
c04f5ac3 JX |
7509 | #, c-format |
7510 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 7511 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 7512 | |
fd8cb379 | 7513 | #: builtin/clone.c:477 |
c04f5ac3 JX |
7514 | #, c-format |
7515 | msgid "done.\n" | |
7516 | msgstr "完成。\n" | |
7517 | ||
fd8cb379 | 7518 | #: builtin/clone.c:491 |
1003b3a5 JX |
7519 | msgid "" |
7520 | "Clone succeeded, but checkout failed.\n" | |
7521 | "You can inspect what was checked out with 'git status'\n" | |
7522 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
7523 | msgstr "" | |
7524 | "克隆成功,但是检出失败。\n" | |
7525 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
7526 | "'git checkout -f HEAD' 重试\n" | |
7527 | ||
fd8cb379 | 7528 | #: builtin/clone.c:568 |
c04f5ac3 JX |
7529 | #, c-format |
7530 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 7531 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 7532 | |
fd8cb379 | 7533 | #: builtin/clone.c:663 |
1003b3a5 JX |
7534 | msgid "remote did not send all necessary objects" |
7535 | msgstr "远程没有发送所有必须的对象" | |
7536 | ||
fd8cb379 | 7537 | #: builtin/clone.c:679 |
3495628d JX |
7538 | #, c-format |
7539 | msgid "unable to update %s" | |
7540 | msgstr "不能更新 %s" | |
7541 | ||
fd8cb379 | 7542 | #: builtin/clone.c:728 |
c04f5ac3 JX |
7543 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
7544 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
7545 | ||
fd8cb379 | 7546 | #: builtin/clone.c:758 |
1003b3a5 JX |
7547 | msgid "unable to checkout working tree" |
7548 | msgstr "不能检出工作区" | |
7549 | ||
fd8cb379 | 7550 | #: builtin/clone.c:803 |
3495628d JX |
7551 | msgid "unable to write parameters to config file" |
7552 | msgstr "无法将参数写入配置文件" | |
7553 | ||
fd8cb379 | 7554 | #: builtin/clone.c:866 |
04cb2f28 JX |
7555 | msgid "cannot repack to clean up" |
7556 | msgstr "无法执行 repack 来清理" | |
7557 | ||
fd8cb379 | 7558 | #: builtin/clone.c:868 |
04cb2f28 JX |
7559 | msgid "cannot unlink temporary alternates file" |
7560 | msgstr "无法删除临时的 alternates 文件" | |
7561 | ||
fd8cb379 | 7562 | #: builtin/clone.c:907 builtin/receive-pack.c:1947 |
c04f5ac3 JX |
7563 | msgid "Too many arguments." |
7564 | msgstr "太多参数。" | |
7565 | ||
fd8cb379 | 7566 | #: builtin/clone.c:911 |
c04f5ac3 | 7567 | msgid "You must specify a repository to clone." |
160fb2b2 | 7568 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 7569 | |
fd8cb379 | 7570 | #: builtin/clone.c:924 |
c04f5ac3 JX |
7571 | #, c-format |
7572 | msgid "--bare and --origin %s options are incompatible." | |
7573 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
7574 | ||
fd8cb379 | 7575 | #: builtin/clone.c:927 |
07432cef WS |
7576 | msgid "--bare and --separate-git-dir are incompatible." |
7577 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
7578 | ||
fd8cb379 | 7579 | #: builtin/clone.c:940 |
c04f5ac3 JX |
7580 | #, c-format |
7581 | msgid "repository '%s' does not exist" | |
160fb2b2 | 7582 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 7583 | |
fd8cb379 | 7584 | #: builtin/clone.c:946 builtin/fetch.c:1460 |
cfff71a9 JX |
7585 | #, c-format |
7586 | msgid "depth %s is not a positive number" | |
7587 | msgstr "深度 %s 不是一个正数" | |
7588 | ||
fd8cb379 | 7589 | #: builtin/clone.c:956 |
c04f5ac3 JX |
7590 | #, c-format |
7591 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 7592 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 7593 | |
fd8cb379 | 7594 | #: builtin/clone.c:966 |
c04f5ac3 JX |
7595 | #, c-format |
7596 | msgid "working tree '%s' already exists." | |
7597 | msgstr "工作区 '%s' 已经存在。" | |
7598 | ||
fd8cb379 JX |
7599 | #: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 |
7600 | #: builtin/worktree.c:246 builtin/worktree.c:276 | |
5bb01d4f JX |
7601 | #, c-format |
7602 | msgid "could not create leading directories of '%s'" | |
7603 | msgstr "不能为 '%s' 创建先导目录" | |
7604 | ||
fd8cb379 | 7605 | #: builtin/clone.c:986 |
c04f5ac3 | 7606 | #, c-format |
814ff314 JX |
7607 | msgid "could not create work tree dir '%s'" |
7608 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 7609 | |
fd8cb379 | 7610 | #: builtin/clone.c:1006 |
c04f5ac3 JX |
7611 | #, c-format |
7612 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 7613 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 7614 | |
fd8cb379 | 7615 | #: builtin/clone.c:1008 |
c04f5ac3 JX |
7616 | #, c-format |
7617 | msgid "Cloning into '%s'...\n" | |
7618 | msgstr "正克隆到 '%s'...\n" | |
7619 | ||
fd8cb379 | 7620 | #: builtin/clone.c:1032 |
a0b6b246 JX |
7621 | msgid "" |
7622 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
7623 | "able" | |
7624 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
7625 | ||
31e5e17b | 7626 | #: builtin/clone.c:1093 |
6acbf033 | 7627 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
7628 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
7629 | ||
31e5e17b | 7630 | #: builtin/clone.c:1095 |
a0b6b246 JX |
7631 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
7632 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 7633 | |
31e5e17b | 7634 | #: builtin/clone.c:1097 |
a0b6b246 JX |
7635 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
7636 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
7637 | ||
31e5e17b JX |
7638 | #: builtin/clone.c:1099 |
7639 | msgid "--filter is ignored in local clones; use file:// instead." | |
7640 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
7641 | ||
7642 | #: builtin/clone.c:1102 | |
6acbf033 | 7643 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 7644 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 7645 | |
31e5e17b | 7646 | #: builtin/clone.c:1107 |
6acbf033 JX |
7647 | msgid "--local is ignored" |
7648 | msgstr "--local 被忽略" | |
7649 | ||
31e5e17b | 7650 | #: builtin/clone.c:1169 builtin/clone.c:1177 |
c04f5ac3 JX |
7651 | #, c-format |
7652 | msgid "Remote branch %s not found in upstream %s" | |
7653 | msgstr "远程分支 %s 在上游 %s 未发现" | |
7654 | ||
31e5e17b | 7655 | #: builtin/clone.c:1180 |
c04f5ac3 | 7656 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 7657 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 7658 | |
a4f16749 | 7659 | #: builtin/column.c:10 |
814ff314 JX |
7660 | msgid "git column [<options>]" |
7661 | msgstr "git column [<选项>]" | |
ef317cd5 | 7662 | |
a4f16749 | 7663 | #: builtin/column.c:27 |
ef317cd5 | 7664 | msgid "lookup config vars" |
07432cef | 7665 | msgstr "查找配置变量" |
ef317cd5 | 7666 | |
a4f16749 | 7667 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 7668 | msgid "layout to use" |
07432cef | 7669 | msgstr "要使用的布局" |
ef317cd5 | 7670 | |
a4f16749 | 7671 | #: builtin/column.c:30 |
ef317cd5 | 7672 | msgid "Maximum width" |
07432cef | 7673 | msgstr "最大宽度" |
ef317cd5 | 7674 | |
a4f16749 | 7675 | #: builtin/column.c:31 |
ef317cd5 | 7676 | msgid "Padding space on left border" |
07432cef | 7677 | msgstr "左边框的填充空间" |
ef317cd5 | 7678 | |
a4f16749 | 7679 | #: builtin/column.c:32 |
ef317cd5 | 7680 | msgid "Padding space on right border" |
07432cef | 7681 | msgstr "右边框的填充空间" |
ef317cd5 | 7682 | |
a4f16749 | 7683 | #: builtin/column.c:33 |
ef317cd5 | 7684 | msgid "Padding space between columns" |
07432cef | 7685 | msgstr "两列之间的填充空间" |
ef317cd5 | 7686 | |
fd8cb379 | 7687 | #: builtin/column.c:51 |
8ada9598 | 7688 | msgid "--command must be the first argument" |
81809b99 | 7689 | msgstr "--command 必须是第一个参数" |
8ada9598 | 7690 | |
31e5e17b | 7691 | #: builtin/commit.c:37 |
814ff314 | 7692 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 7693 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 7694 | |
31e5e17b | 7695 | #: builtin/commit.c:42 |
814ff314 | 7696 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 7697 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 7698 | |
31e5e17b | 7699 | #: builtin/commit.c:47 |
c04f5ac3 JX |
7700 | msgid "" |
7701 | "You asked to amend the most recent commit, but doing so would make\n" | |
7702 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
7703 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
7704 | msgstr "" | |
1b150dc9 T |
7705 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
7706 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 7707 | |
31e5e17b | 7708 | #: builtin/commit.c:52 |
c04f5ac3 JX |
7709 | msgid "" |
7710 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
7711 | "If you wish to commit it anyway, use:\n" | |
7712 | "\n" | |
7713 | " git commit --allow-empty\n" | |
7714 | "\n" | |
c04f5ac3 | 7715 | msgstr "" |
a9ce4543 T |
7716 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
7717 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
7718 | "\n" |
7719 | " git commit --allow-empty\n" | |
7720 | "\n" | |
c04f5ac3 | 7721 | |
31e5e17b | 7722 | #: builtin/commit.c:59 |
b1894384 JX |
7723 | msgid "Otherwise, please use 'git reset'\n" |
7724 | msgstr "否则,请使用命令 'git reset'\n" | |
7725 | ||
31e5e17b | 7726 | #: builtin/commit.c:62 |
b1894384 JX |
7727 | msgid "" |
7728 | "If you wish to skip this commit, use:\n" | |
7729 | "\n" | |
7730 | " git reset\n" | |
7731 | "\n" | |
7732 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
7733 | "the remaining commits.\n" | |
7734 | msgstr "" | |
7735 | "如果您想跳过这个提交,使用命令:\n" | |
7736 | "\n" | |
7737 | " git reset\n" | |
7738 | "\n" | |
7739 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
7740 | "操作。\n" | |
7741 | ||
fd8cb379 | 7742 | #: builtin/commit.c:293 |
c04f5ac3 | 7743 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 7744 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 7745 | |
fd8cb379 | 7746 | #: builtin/commit.c:334 |
c04f5ac3 | 7747 | msgid "unable to create temporary index" |
90e6ef53 | 7748 | msgstr "不能创建临时索引" |
c04f5ac3 | 7749 | |
fd8cb379 | 7750 | #: builtin/commit.c:340 |
c04f5ac3 JX |
7751 | msgid "interactive add failed" |
7752 | msgstr "交互式添加失败" | |
7753 | ||
fd8cb379 | 7754 | #: builtin/commit.c:353 |
220c313c JX |
7755 | msgid "unable to update temporary index" |
7756 | msgstr "无法更新临时索引" | |
7757 | ||
fd8cb379 | 7758 | #: builtin/commit.c:355 |
220c313c JX |
7759 | msgid "Failed to update main cache tree" |
7760 | msgstr "不能更新树的主缓存" | |
7761 | ||
fd8cb379 | 7762 | #: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 |
c04f5ac3 | 7763 | msgid "unable to write new_index file" |
90e6ef53 | 7764 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 7765 | |
fd8cb379 | 7766 | #: builtin/commit.c:432 |
8ada9598 | 7767 | msgid "cannot do a partial commit during a merge." |
81809b99 | 7768 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 7769 | |
fd8cb379 | 7770 | #: builtin/commit.c:434 |
8ada9598 | 7771 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 7772 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 7773 | |
fd8cb379 | 7774 | #: builtin/commit.c:442 |
c04f5ac3 | 7775 | msgid "cannot read the index" |
90e6ef53 | 7776 | msgstr "无法读取索引" |
c04f5ac3 | 7777 | |
fd8cb379 | 7778 | #: builtin/commit.c:461 |
c04f5ac3 | 7779 | msgid "unable to write temporary index file" |
90e6ef53 | 7780 | msgstr "无法写临时索引文件" |
c04f5ac3 | 7781 | |
fd8cb379 | 7782 | #: builtin/commit.c:558 |
220c313c JX |
7783 | #, c-format |
7784 | msgid "commit '%s' lacks author header" | |
7785 | msgstr "提交 '%s' 缺少作者信息" | |
7786 | ||
fd8cb379 | 7787 | #: builtin/commit.c:560 |
c04f5ac3 | 7788 | #, c-format |
220c313c | 7789 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 7790 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 7791 | |
fd8cb379 | 7792 | #: builtin/commit.c:579 |
c04f5ac3 | 7793 | msgid "malformed --author parameter" |
fd8cb379 | 7794 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 7795 | |
fd8cb379 | 7796 | #: builtin/commit.c:631 |
6acbf033 JX |
7797 | msgid "" |
7798 | "unable to select a comment character that is not used\n" | |
7799 | "in the current commit message" | |
7800 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
7801 | ||
fd8cb379 | 7802 | #: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 |
c04f5ac3 JX |
7803 | #, c-format |
7804 | msgid "could not lookup commit %s" | |
7805 | msgstr "不能查询提交 %s" | |
7806 | ||
fd8cb379 | 7807 | #: builtin/commit.c:680 builtin/shortlog.c:316 |
c04f5ac3 JX |
7808 | #, c-format |
7809 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 7810 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 7811 | |
fd8cb379 | 7812 | #: builtin/commit.c:682 |
c04f5ac3 | 7813 | msgid "could not read log from standard input" |
90e6ef53 | 7814 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 7815 | |
fd8cb379 | 7816 | #: builtin/commit.c:686 |
c04f5ac3 JX |
7817 | #, c-format |
7818 | msgid "could not read log file '%s'" | |
90e6ef53 | 7819 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 7820 | |
fd8cb379 | 7821 | #: builtin/commit.c:715 builtin/commit.c:723 |
c04f5ac3 | 7822 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 7823 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 7824 | |
fd8cb379 | 7825 | #: builtin/commit.c:720 |
5b04ee3b JX |
7826 | msgid "could not read MERGE_MSG" |
7827 | msgstr "不能读取 MERGE_MSG" | |
7828 | ||
fd8cb379 | 7829 | #: builtin/commit.c:774 |
c04f5ac3 | 7830 | msgid "could not write commit template" |
90e6ef53 | 7831 | msgstr "不能写提交模版" |
c04f5ac3 | 7832 | |
fd8cb379 | 7833 | #: builtin/commit.c:792 |
81809b99 | 7834 | #, c-format |
c04f5ac3 JX |
7835 | msgid "" |
7836 | "\n" | |
8ada9598 | 7837 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
7838 | "If this is not correct, please remove the file\n" |
7839 | "\t%s\n" | |
7840 | "and try again.\n" | |
7841 | msgstr "" | |
7842 | "\n" | |
649900bc | 7843 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
7844 | "\t%s\n" |
7845 | "然后重试。\n" | |
7846 | ||
fd8cb379 | 7847 | #: builtin/commit.c:797 |
81809b99 | 7848 | #, c-format |
8ada9598 JX |
7849 | msgid "" |
7850 | "\n" | |
7851 | "It looks like you may be committing a cherry-pick.\n" | |
7852 | "If this is not correct, please remove the file\n" | |
7853 | "\t%s\n" | |
7854 | "and try again.\n" | |
7855 | msgstr "" | |
7856 | "\n" | |
649900bc | 7857 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
7858 | "\t%s\n" |
7859 | "然后重试。\n" | |
c04f5ac3 | 7860 | |
fd8cb379 | 7861 | #: builtin/commit.c:810 |
a77c07d9 | 7862 | #, c-format |
c04f5ac3 | 7863 | msgid "" |
8ada9598 | 7864 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7865 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 7866 | msgstr "" |
a77c07d9 | 7867 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 7868 | "说明将会终止提交。\n" |
c04f5ac3 | 7869 | |
fd8cb379 | 7870 | #: builtin/commit.c:818 |
a77c07d9 | 7871 | #, c-format |
c04f5ac3 | 7872 | msgid "" |
8ada9598 | 7873 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 7874 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
7875 | "An empty message aborts the commit.\n" |
7876 | msgstr "" | |
a77c07d9 JX |
7877 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
7878 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 7879 | |
90e6ef53 | 7880 | # 译者:为保证在输出中对齐,注意调整句中空格! |
fd8cb379 | 7881 | #: builtin/commit.c:835 |
6acbf033 JX |
7882 | #, c-format |
7883 | msgid "%sAuthor: %.*s <%.*s>" | |
7884 | msgstr "%s作者: %.*s <%.*s>" | |
7885 | ||
7886 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
fd8cb379 | 7887 | #: builtin/commit.c:843 |
c04f5ac3 | 7888 | #, c-format |
6acbf033 JX |
7889 | msgid "%sDate: %s" |
7890 | msgstr "%s日期: %s" | |
c04f5ac3 | 7891 | |
90e6ef53 | 7892 | # 译者:为保证在输出中对齐,注意调整句中空格! |
fd8cb379 | 7893 | #: builtin/commit.c:850 |
c04f5ac3 | 7894 | #, c-format |
6acbf033 JX |
7895 | msgid "%sCommitter: %.*s <%.*s>" |
7896 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 7897 | |
fd8cb379 | 7898 | #: builtin/commit.c:867 |
c04f5ac3 | 7899 | msgid "Cannot read index" |
90e6ef53 | 7900 | msgstr "无法读取索引" |
c04f5ac3 | 7901 | |
fd8cb379 | 7902 | #: builtin/commit.c:933 |
c04f5ac3 JX |
7903 | msgid "Error building trees" |
7904 | msgstr "无法创建树对象" | |
7905 | ||
fd8cb379 | 7906 | #: builtin/commit.c:947 builtin/tag.c:257 |
c04f5ac3 JX |
7907 | #, c-format |
7908 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 7909 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 7910 | |
fd8cb379 | 7911 | #: builtin/commit.c:991 |
c04f5ac3 | 7912 | #, c-format |
814ff314 | 7913 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 7914 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 7915 | |
fd8cb379 | 7916 | #: builtin/commit.c:1005 |
5809aa05 JX |
7917 | #, c-format |
7918 | msgid "Invalid ignored mode '%s'" | |
7919 | msgstr "无效的忽略模式 '%s'" | |
7920 | ||
fd8cb379 | 7921 | #: builtin/commit.c:1019 builtin/commit.c:1269 |
c04f5ac3 JX |
7922 | #, c-format |
7923 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 7924 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 7925 | |
fd8cb379 | 7926 | #: builtin/commit.c:1057 |
2e8451e8 JX |
7927 | msgid "--long and -z are incompatible" |
7928 | msgstr "--long 和 -z 选项不兼容" | |
7929 | ||
fd8cb379 | 7930 | #: builtin/commit.c:1090 |
c04f5ac3 JX |
7931 | msgid "Using both --reset-author and --author does not make sense" |
7932 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
7933 | ||
fd8cb379 | 7934 | #: builtin/commit.c:1099 |
c04f5ac3 | 7935 | msgid "You have nothing to amend." |
90e6ef53 | 7936 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 7937 | |
fd8cb379 | 7938 | #: builtin/commit.c:1102 |
8ada9598 | 7939 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 7940 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 7941 | |
fd8cb379 | 7942 | #: builtin/commit.c:1104 |
8ada9598 | 7943 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 7944 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 7945 | |
fd8cb379 | 7946 | #: builtin/commit.c:1107 |
c04f5ac3 | 7947 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 7948 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 7949 | |
fd8cb379 | 7950 | #: builtin/commit.c:1117 |
c04f5ac3 JX |
7951 | msgid "Only one of -c/-C/-F/--fixup can be used." |
7952 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
7953 | ||
fd8cb379 | 7954 | #: builtin/commit.c:1119 |
31e5e17b JX |
7955 | msgid "Option -m cannot be combined with -c/-C/-F." |
7956 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 7957 | |
fd8cb379 | 7958 | #: builtin/commit.c:1127 |
c04f5ac3 | 7959 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 7960 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 7961 | |
fd8cb379 | 7962 | #: builtin/commit.c:1144 |
c04f5ac3 JX |
7963 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
7964 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
7965 | ||
fd8cb379 | 7966 | #: builtin/commit.c:1146 |
c04f5ac3 JX |
7967 | msgid "No paths with --include/--only does not make sense." |
7968 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
7969 | ||
fd8cb379 | 7970 | #: builtin/commit.c:1160 builtin/tag.c:543 |
c04f5ac3 JX |
7971 | #, c-format |
7972 | msgid "Invalid cleanup mode %s" | |
7973 | msgstr "无效的清理模式 %s" | |
7974 | ||
fd8cb379 | 7975 | #: builtin/commit.c:1165 |
c04f5ac3 | 7976 | msgid "Paths with -a does not make sense." |
649900bc | 7977 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 7978 | |
fd8cb379 | 7979 | #: builtin/commit.c:1303 builtin/commit.c:1480 |
ef317cd5 | 7980 | msgid "show status concisely" |
07432cef | 7981 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 7982 | |
fd8cb379 | 7983 | #: builtin/commit.c:1305 builtin/commit.c:1482 |
ef317cd5 | 7984 | msgid "show branch information" |
07432cef | 7985 | msgstr "显示分支信息" |
ef317cd5 | 7986 | |
fd8cb379 | 7987 | #: builtin/commit.c:1307 |
a4f16749 JX |
7988 | msgid "show stash information" |
7989 | msgstr "显示贮藏区信息" | |
7990 | ||
fd8cb379 | 7991 | #: builtin/commit.c:1309 builtin/commit.c:1484 |
31e5e17b JX |
7992 | msgid "compute full ahead/behind values" |
7993 | msgstr "计算完整的领先/落后值" | |
7994 | ||
fd8cb379 | 7995 | #: builtin/commit.c:1311 |
a0b6b246 JX |
7996 | msgid "version" |
7997 | msgstr "版本" | |
7998 | ||
fd8cb379 JX |
7999 | #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 |
8000 | #: builtin/worktree.c:581 | |
ef317cd5 | 8001 | msgid "machine-readable output" |
07432cef WS |
8002 | msgstr "机器可读的输出" |
8003 | ||
fd8cb379 | 8004 | #: builtin/commit.c:1314 builtin/commit.c:1488 |
07432cef WS |
8005 | msgid "show status in long format (default)" |
8006 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 8007 | |
fd8cb379 | 8008 | #: builtin/commit.c:1317 builtin/commit.c:1491 |
ef317cd5 | 8009 | msgid "terminate entries with NUL" |
4375c10e | 8010 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 8011 | |
fd8cb379 JX |
8012 | #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 |
8013 | #: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 | |
ef317cd5 | 8014 | msgid "mode" |
07432cef | 8015 | msgstr "模式" |
ef317cd5 | 8016 | |
fd8cb379 | 8017 | #: builtin/commit.c:1320 builtin/commit.c:1494 |
ef317cd5 | 8018 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 8019 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 8020 | |
fd8cb379 | 8021 | #: builtin/commit.c:1324 |
5809aa05 JX |
8022 | msgid "" |
8023 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
8024 | "traditional)" | |
31e5e17b JX |
8025 | msgstr "" |
8026 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 8027 | |
fd8cb379 | 8028 | #: builtin/commit.c:1326 parse-options.h:167 |
ef317cd5 JX |
8029 | msgid "when" |
8030 | msgstr "何时" | |
8031 | ||
fd8cb379 | 8032 | #: builtin/commit.c:1327 |
ef317cd5 JX |
8033 | msgid "" |
8034 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
8035 | "(Default: all)" | |
8036 | msgstr "" | |
07432cef | 8037 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 8038 | |
fd8cb379 | 8039 | #: builtin/commit.c:1329 |
ef317cd5 | 8040 | msgid "list untracked files in columns" |
07432cef | 8041 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 8042 | |
fd8cb379 JX |
8043 | #: builtin/commit.c:1330 |
8044 | msgid "do not detect renames" | |
8045 | msgstr "不检测重命名" | |
8046 | ||
8047 | #: builtin/commit.c:1332 | |
8048 | msgid "detect renames, optionally set similarity index" | |
8049 | msgstr "检测重命名,可以设置索引相似度" | |
8050 | ||
8051 | #: builtin/commit.c:1352 | |
5809aa05 JX |
8052 | msgid "Unsupported combination of ignored and untracked-files arguments" |
8053 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
8054 | ||
fd8cb379 | 8055 | #: builtin/commit.c:1450 |
ef317cd5 | 8056 | msgid "suppress summary after successful commit" |
07432cef | 8057 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 8058 | |
fd8cb379 | 8059 | #: builtin/commit.c:1451 |
ef317cd5 | 8060 | msgid "show diff in commit message template" |
07432cef | 8061 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 8062 | |
fd8cb379 | 8063 | #: builtin/commit.c:1453 |
ef317cd5 | 8064 | msgid "Commit message options" |
07432cef | 8065 | msgstr "提交说明选项" |
c04f5ac3 | 8066 | |
fd8cb379 | 8067 | #: builtin/commit.c:1454 builtin/tag.c:394 |
ef317cd5 | 8068 | msgid "read message from file" |
07432cef | 8069 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 8070 | |
fd8cb379 | 8071 | #: builtin/commit.c:1455 |
ef317cd5 | 8072 | msgid "author" |
07432cef | 8073 | msgstr "作者" |
c04f5ac3 | 8074 | |
fd8cb379 | 8075 | #: builtin/commit.c:1455 |
ef317cd5 | 8076 | msgid "override author for commit" |
07432cef | 8077 | msgstr "提交时覆盖作者" |
73a60cd2 | 8078 | |
fd8cb379 | 8079 | #: builtin/commit.c:1456 builtin/gc.c:501 |
ef317cd5 | 8080 | msgid "date" |
07432cef | 8081 | msgstr "日期" |
c04f5ac3 | 8082 | |
fd8cb379 | 8083 | #: builtin/commit.c:1456 |
ef317cd5 | 8084 | msgid "override date for commit" |
07432cef | 8085 | msgstr "提交时覆盖日期" |
c04f5ac3 | 8086 | |
fd8cb379 JX |
8087 | #: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402 |
8088 | #: builtin/notes.c:565 builtin/tag.c:392 | |
ef317cd5 | 8089 | msgid "message" |
07432cef | 8090 | msgstr "说明" |
c04f5ac3 | 8091 | |
fd8cb379 | 8092 | #: builtin/commit.c:1457 |
ef317cd5 | 8093 | msgid "commit message" |
07432cef | 8094 | msgstr "提交说明" |
ef317cd5 | 8095 | |
fd8cb379 JX |
8096 | #: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 |
8097 | #: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 | |
94550ed3 JX |
8098 | msgid "commit" |
8099 | msgstr "提交" | |
8100 | ||
fd8cb379 | 8101 | #: builtin/commit.c:1458 |
ef317cd5 | 8102 | msgid "reuse and edit message from specified commit" |
07432cef | 8103 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 8104 | |
fd8cb379 | 8105 | #: builtin/commit.c:1459 |
ef317cd5 | 8106 | msgid "reuse message from specified commit" |
07432cef | 8107 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 8108 | |
fd8cb379 | 8109 | #: builtin/commit.c:1460 |
ef317cd5 | 8110 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 8111 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 8112 | |
fd8cb379 | 8113 | #: builtin/commit.c:1461 |
ef317cd5 | 8114 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 8115 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 8116 | |
fd8cb379 | 8117 | #: builtin/commit.c:1462 |
ef317cd5 | 8118 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 8119 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 8120 | |
fd8cb379 JX |
8121 | #: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242 |
8122 | #: builtin/pull.c:154 builtin/revert.c:105 | |
ef317cd5 | 8123 | msgid "add Signed-off-by:" |
07432cef | 8124 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 8125 | |
fd8cb379 | 8126 | #: builtin/commit.c:1464 |
ef317cd5 | 8127 | msgid "use specified template file" |
07432cef | 8128 | msgstr "使用指定的模板文件" |
ef317cd5 | 8129 | |
fd8cb379 | 8130 | #: builtin/commit.c:1465 |
ef317cd5 | 8131 | msgid "force edit of commit" |
07432cef | 8132 | msgstr "强制编辑提交" |
ef317cd5 | 8133 | |
07432cef | 8134 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
fd8cb379 | 8135 | #: builtin/commit.c:1466 |
ef317cd5 | 8136 | msgid "default" |
07432cef | 8137 | msgstr "default" |
ef317cd5 | 8138 | |
fd8cb379 | 8139 | #: builtin/commit.c:1466 builtin/tag.c:398 |
ef317cd5 | 8140 | msgid "how to strip spaces and #comments from message" |
07432cef | 8141 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 8142 | |
fd8cb379 | 8143 | #: builtin/commit.c:1467 |
ef317cd5 | 8144 | msgid "include status in commit message template" |
07432cef | 8145 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 8146 | |
fd8cb379 | 8147 | #: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184 |
a4f16749 | 8148 | #: builtin/revert.c:113 |
ef317cd5 | 8149 | msgid "GPG sign commit" |
07432cef | 8150 | msgstr "GPG 提交签名" |
ef317cd5 | 8151 | |
fd8cb379 | 8152 | #: builtin/commit.c:1472 |
ef317cd5 | 8153 | msgid "Commit contents options" |
07432cef | 8154 | msgstr "提交内容选项" |
ef317cd5 | 8155 | |
fd8cb379 | 8156 | #: builtin/commit.c:1473 |
ef317cd5 | 8157 | msgid "commit all changed files" |
07432cef | 8158 | msgstr "提交所有改动的文件" |
ef317cd5 | 8159 | |
fd8cb379 | 8160 | #: builtin/commit.c:1474 |
ef317cd5 | 8161 | msgid "add specified files to index for commit" |
07432cef | 8162 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 8163 | |
fd8cb379 | 8164 | #: builtin/commit.c:1475 |
ef317cd5 | 8165 | msgid "interactively add files" |
07432cef | 8166 | msgstr "交互式添加文件" |
ef317cd5 | 8167 | |
fd8cb379 | 8168 | #: builtin/commit.c:1476 |
ef317cd5 | 8169 | msgid "interactively add changes" |
07432cef | 8170 | msgstr "交互式添加变更" |
ef317cd5 | 8171 | |
fd8cb379 | 8172 | #: builtin/commit.c:1477 |
ef317cd5 | 8173 | msgid "commit only specified files" |
07432cef | 8174 | msgstr "只提交指定的文件" |
ef317cd5 | 8175 | |
fd8cb379 | 8176 | #: builtin/commit.c:1478 |
5c57d762 JX |
8177 | msgid "bypass pre-commit and commit-msg hooks" |
8178 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
8179 | ||
fd8cb379 | 8180 | #: builtin/commit.c:1479 |
ef317cd5 | 8181 | msgid "show what would be committed" |
07432cef | 8182 | msgstr "显示将要提交的内容" |
ef317cd5 | 8183 | |
fd8cb379 | 8184 | #: builtin/commit.c:1492 |
ef317cd5 | 8185 | msgid "amend previous commit" |
07432cef | 8186 | msgstr "修改先前的提交" |
ef317cd5 | 8187 | |
fd8cb379 | 8188 | #: builtin/commit.c:1493 |
ef317cd5 | 8189 | msgid "bypass post-rewrite hook" |
07432cef | 8190 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 8191 | |
fd8cb379 | 8192 | #: builtin/commit.c:1498 |
ef317cd5 | 8193 | msgid "ok to record an empty change" |
07432cef | 8194 | msgstr "允许一个空提交" |
ef317cd5 | 8195 | |
fd8cb379 | 8196 | #: builtin/commit.c:1500 |
ef317cd5 | 8197 | msgid "ok to record a change with an empty message" |
07432cef | 8198 | msgstr "允许空的提交说明" |
ef317cd5 | 8199 | |
fd8cb379 | 8200 | #: builtin/commit.c:1573 |
c04f5ac3 JX |
8201 | #, c-format |
8202 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 8203 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 8204 | |
fd8cb379 | 8205 | #: builtin/commit.c:1580 |
c04f5ac3 | 8206 | msgid "could not read MERGE_MODE" |
90e6ef53 | 8207 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 8208 | |
fd8cb379 | 8209 | #: builtin/commit.c:1599 |
c04f5ac3 JX |
8210 | #, c-format |
8211 | msgid "could not read commit message: %s" | |
90e6ef53 | 8212 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 8213 | |
fd8cb379 | 8214 | #: builtin/commit.c:1610 |
c04f5ac3 JX |
8215 | #, c-format |
8216 | msgid "Aborting commit due to empty commit message.\n" | |
8217 | msgstr "终止提交因为提交说明为空。\n" | |
8218 | ||
fd8cb379 | 8219 | #: builtin/commit.c:1615 |
6937cb4e JX |
8220 | #, c-format |
8221 | msgid "Aborting commit; you did not edit the message.\n" | |
8222 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
8223 | ||
fd8cb379 | 8224 | #: builtin/commit.c:1650 |
c04f5ac3 JX |
8225 | msgid "" |
8226 | "Repository has been updated, but unable to write\n" | |
220c313c | 8227 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
8228 | "not exceeded, and then \"git reset HEAD\" to recover." |
8229 | msgstr "" | |
160fb2b2 | 8230 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 8231 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 8232 | |
fd8cb379 JX |
8233 | #: builtin/commit-graph.c:9 |
8234 | msgid "git commit-graph [--object-dir <objdir>]" | |
8235 | msgstr "git commit-graph [--object-dir <对象目录>]" | |
8236 | ||
8237 | #: builtin/commit-graph.c:10 builtin/commit-graph.c:16 | |
8238 | msgid "git commit-graph read [--object-dir <objdir>]" | |
8239 | msgstr "git commit-graph read [--object-dir <对象目录>]" | |
8240 | ||
8241 | #: builtin/commit-graph.c:11 builtin/commit-graph.c:21 | |
8242 | msgid "" | |
8243 | "git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" | |
8244 | "stdin-commits]" | |
8245 | msgstr "" | |
8246 | "git commit-graph write [--object-dir <对象目录>] [--append] [--stdin-packs|--" | |
8247 | "stdin-commits]" | |
8248 | ||
8249 | #: builtin/commit-graph.c:39 builtin/commit-graph.c:92 | |
8250 | #: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 | |
8251 | msgid "dir" | |
8252 | msgstr "目录" | |
8253 | ||
8254 | #: builtin/commit-graph.c:40 builtin/commit-graph.c:93 | |
8255 | #: builtin/commit-graph.c:148 | |
8256 | msgid "The object directory to store the graph" | |
8257 | msgstr "保存图形的对象目录" | |
8258 | ||
8259 | #: builtin/commit-graph.c:95 | |
8260 | msgid "scan pack-indexes listed by stdin for commits" | |
8261 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
8262 | ||
8263 | #: builtin/commit-graph.c:97 | |
8264 | msgid "start walk at commits listed by stdin" | |
8265 | msgstr "从标准输入中的提交开始扫描" | |
8266 | ||
8267 | #: builtin/commit-graph.c:99 | |
8268 | msgid "include all commits already in the commit-graph file" | |
8269 | msgstr "包含 commit-graph 文件中已有所有提交" | |
8270 | ||
8271 | #: builtin/commit-graph.c:108 | |
8272 | msgid "cannot use both --stdin-commits and --stdin-packs" | |
8273 | msgstr "不能同时使用 --stdin-commits 和 --stdin-packs 选项" | |
8274 | ||
a4f16749 | 8275 | #: builtin/config.c:10 |
814ff314 JX |
8276 | msgid "git config [<options>]" |
8277 | msgstr "git config [<选项>]" | |
ef317cd5 | 8278 | |
fd8cb379 JX |
8279 | #: builtin/config.c:101 |
8280 | #, c-format | |
8281 | msgid "unrecognized --type argument, %s" | |
8282 | msgstr "未能识别的 --type 参数,%s" | |
8283 | ||
8284 | #: builtin/config.c:123 | |
ef317cd5 | 8285 | msgid "Config file location" |
07432cef | 8286 | msgstr "配置文件位置" |
ef317cd5 | 8287 | |
fd8cb379 | 8288 | #: builtin/config.c:124 |
ef317cd5 | 8289 | msgid "use global config file" |
07432cef | 8290 | msgstr "使用全局配置文件" |
ef317cd5 | 8291 | |
fd8cb379 | 8292 | #: builtin/config.c:125 |
ef317cd5 | 8293 | msgid "use system config file" |
07432cef | 8294 | msgstr "使用系统级配置文件" |
ef317cd5 | 8295 | |
fd8cb379 | 8296 | #: builtin/config.c:126 |
ef317cd5 | 8297 | msgid "use repository config file" |
160fb2b2 | 8298 | msgstr "使用仓库级配置文件" |
ef317cd5 | 8299 | |
fd8cb379 | 8300 | #: builtin/config.c:127 |
ef317cd5 | 8301 | msgid "use given config file" |
07432cef | 8302 | msgstr "使用指定的配置文件" |
ef317cd5 | 8303 | |
fd8cb379 | 8304 | #: builtin/config.c:128 |
2e8451e8 | 8305 | msgid "blob-id" |
4375c10e | 8306 | msgstr "数据对象 ID" |
2e8451e8 | 8307 | |
fd8cb379 | 8308 | #: builtin/config.c:128 |
2e8451e8 JX |
8309 | msgid "read config from given blob object" |
8310 | msgstr "从给定的数据对象读取配置" | |
8311 | ||
fd8cb379 | 8312 | #: builtin/config.c:129 |
ef317cd5 | 8313 | msgid "Action" |
07432cef | 8314 | msgstr "操作" |
ef317cd5 | 8315 | |
fd8cb379 | 8316 | #: builtin/config.c:130 |
ef317cd5 | 8317 | msgid "get value: name [value-regex]" |
07432cef | 8318 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 8319 | |
fd8cb379 | 8320 | #: builtin/config.c:131 |
ef317cd5 | 8321 | msgid "get all values: key [value-regex]" |
07432cef | 8322 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 8323 | |
fd8cb379 | 8324 | #: builtin/config.c:132 |
ef317cd5 | 8325 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 8326 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 8327 | |
fd8cb379 | 8328 | #: builtin/config.c:133 |
90314792 JX |
8329 | msgid "get value specific for the URL: section[.var] URL" |
8330 | msgstr "获得 URL 取值:section[.var] URL" | |
8331 | ||
fd8cb379 | 8332 | #: builtin/config.c:134 |
ef317cd5 | 8333 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 8334 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 8335 | |
fd8cb379 | 8336 | #: builtin/config.c:135 |
ef317cd5 | 8337 | msgid "add a new variable: name value" |
07432cef | 8338 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 8339 | |
fd8cb379 | 8340 | #: builtin/config.c:136 |
ef317cd5 | 8341 | msgid "remove a variable: name [value-regex]" |
07432cef | 8342 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 8343 | |
fd8cb379 | 8344 | #: builtin/config.c:137 |
ef317cd5 | 8345 | msgid "remove all matches: name [value-regex]" |
07432cef | 8346 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 8347 | |
fd8cb379 | 8348 | #: builtin/config.c:138 |
ef317cd5 | 8349 | msgid "rename section: old-name new-name" |
07432cef | 8350 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 8351 | |
fd8cb379 | 8352 | #: builtin/config.c:139 |
ef317cd5 | 8353 | msgid "remove a section: name" |
07432cef | 8354 | msgstr "删除一个小节:name" |
ef317cd5 | 8355 | |
fd8cb379 | 8356 | #: builtin/config.c:140 |
ef317cd5 | 8357 | msgid "list all" |
07432cef | 8358 | msgstr "列出所有" |
ef317cd5 | 8359 | |
fd8cb379 | 8360 | #: builtin/config.c:141 |
ef317cd5 | 8361 | msgid "open an editor" |
07432cef | 8362 | msgstr "打开一个编辑器" |
ef317cd5 | 8363 | |
fd8cb379 | 8364 | #: builtin/config.c:142 |
04cb2f28 JX |
8365 | msgid "find the color configured: slot [default]" |
8366 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 8367 | |
fd8cb379 | 8368 | #: builtin/config.c:143 |
04cb2f28 JX |
8369 | msgid "find the color setting: slot [stdout-is-tty]" |
8370 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 8371 | |
fd8cb379 | 8372 | #: builtin/config.c:144 |
ef317cd5 | 8373 | msgid "Type" |
07432cef | 8374 | msgstr "类型" |
ef317cd5 | 8375 | |
fd8cb379 JX |
8376 | #: builtin/config.c:145 |
8377 | msgid "value is given this type" | |
8378 | msgstr "取值为该类型" | |
8379 | ||
8380 | #: builtin/config.c:146 | |
ef317cd5 | 8381 | msgid "value is \"true\" or \"false\"" |
07432cef | 8382 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 8383 | |
fd8cb379 | 8384 | #: builtin/config.c:147 |
ef317cd5 | 8385 | msgid "value is decimal number" |
07432cef | 8386 | msgstr "值是十进制数" |
ef317cd5 | 8387 | |
fd8cb379 | 8388 | #: builtin/config.c:148 |
ef317cd5 | 8389 | msgid "value is --bool or --int" |
07432cef | 8390 | msgstr "值是 --bool or --int" |
ef317cd5 | 8391 | |
fd8cb379 | 8392 | #: builtin/config.c:149 |
ef317cd5 | 8393 | msgid "value is a path (file or directory name)" |
07432cef | 8394 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 8395 | |
fd8cb379 | 8396 | #: builtin/config.c:150 |
5809aa05 JX |
8397 | msgid "value is an expiry date" |
8398 | msgstr "值是一个到期日期" | |
8399 | ||
fd8cb379 | 8400 | #: builtin/config.c:151 |
ef317cd5 | 8401 | msgid "Other" |
07432cef | 8402 | msgstr "其它" |
ef317cd5 | 8403 | |
fd8cb379 | 8404 | #: builtin/config.c:152 |
ef317cd5 | 8405 | msgid "terminate values with NUL byte" |
4375c10e | 8406 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 8407 | |
fd8cb379 | 8408 | #: builtin/config.c:153 |
1b7f4a34 JX |
8409 | msgid "show variable names only" |
8410 | msgstr "只显示变量名" | |
8411 | ||
fd8cb379 | 8412 | #: builtin/config.c:154 |
ef317cd5 | 8413 | msgid "respect include directives on lookup" |
07432cef | 8414 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 8415 | |
fd8cb379 | 8416 | #: builtin/config.c:155 |
276ceeaa JX |
8417 | msgid "show origin of config (file, standard input, blob, command line)" |
8418 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
8419 | ||
fd8cb379 JX |
8420 | #: builtin/config.c:156 |
8421 | msgid "value" | |
8422 | msgstr "取值" | |
8423 | ||
8424 | #: builtin/config.c:156 | |
8425 | msgid "with --get, use default value when missing entry" | |
8426 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
8427 | ||
8428 | #: builtin/config.c:332 | |
8429 | #, c-format | |
8430 | msgid "failed to format default config value: %s" | |
8431 | msgstr "无法格式化默认配置取值:%s" | |
8432 | ||
8433 | #: builtin/config.c:431 | |
220c313c | 8434 | msgid "unable to parse default color value" |
160fb2b2 | 8435 | msgstr "不能解析默认颜色值" |
220c313c | 8436 | |
fd8cb379 | 8437 | #: builtin/config.c:575 |
220c313c JX |
8438 | #, c-format |
8439 | msgid "" | |
8440 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 8441 | "[user]\n" |
220c313c | 8442 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 8443 | "#\tname = %s\n" |
220c313c JX |
8444 | "#\temail = %s\n" |
8445 | msgstr "" | |
8446 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 8447 | "[user]\n" |
220c313c | 8448 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 8449 | "#\tname = %s\n" |
220c313c JX |
8450 | "#\temail = %s\n" |
8451 | ||
fd8cb379 | 8452 | #: builtin/config.c:603 |
a4f16749 JX |
8453 | msgid "--local can only be used inside a git repository" |
8454 | msgstr "--local 只能在一个仓库内使用" | |
8455 | ||
fd8cb379 JX |
8456 | #: builtin/config.c:606 |
8457 | msgid "--blob can only be used inside a git repository" | |
8458 | msgstr "--blob 只能在一个仓库内使用" | |
8459 | ||
8460 | #: builtin/config.c:735 | |
220c313c JX |
8461 | #, c-format |
8462 | msgid "cannot create configuration file %s" | |
8463 | msgstr "不能创建配置文件 %s" | |
8464 | ||
fd8cb379 | 8465 | #: builtin/config.c:748 |
a0b6b246 JX |
8466 | #, c-format |
8467 | msgid "" | |
8468 | "cannot overwrite multiple values with a single value\n" | |
8469 | " Use a regexp, --add or --replace-all to change %s." | |
8470 | msgstr "" | |
8471 | "无法用一个值覆盖多个值\n" | |
8472 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
8473 | ||
fd8cb379 | 8474 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
8475 | msgid "git count-objects [-v] [-H | --human-readable]" |
8476 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
8477 | ||
fd8cb379 | 8478 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
8479 | msgid "print sizes in human readable format" |
8480 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 8481 | |
5809aa05 | 8482 | #: builtin/describe.c:22 |
814ff314 JX |
8483 | msgid "git describe [<options>] [<commit-ish>...]" |
8484 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 8485 | |
5809aa05 | 8486 | #: builtin/describe.c:23 |
814ff314 JX |
8487 | msgid "git describe [<options>] --dirty" |
8488 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 8489 | |
5809aa05 | 8490 | #: builtin/describe.c:57 |
87cb7997 JX |
8491 | msgid "head" |
8492 | msgstr "头" | |
8493 | ||
5809aa05 | 8494 | #: builtin/describe.c:57 |
87cb7997 JX |
8495 | msgid "lightweight" |
8496 | msgstr "轻量级的" | |
8497 | ||
5809aa05 | 8498 | #: builtin/describe.c:57 |
87cb7997 JX |
8499 | msgid "annotated" |
8500 | msgstr "附注的" | |
8501 | ||
5809aa05 | 8502 | #: builtin/describe.c:267 |
c04f5ac3 JX |
8503 | #, c-format |
8504 | msgid "annotated tag %s not available" | |
55a16ee4 | 8505 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 8506 | |
5809aa05 | 8507 | #: builtin/describe.c:271 |
c04f5ac3 JX |
8508 | #, c-format |
8509 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 8510 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 8511 | |
5809aa05 | 8512 | #: builtin/describe.c:273 |
c04f5ac3 JX |
8513 | #, c-format |
8514 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 8515 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 8516 | |
31e5e17b | 8517 | #: builtin/describe.c:317 |
c04f5ac3 JX |
8518 | #, c-format |
8519 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 8520 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 8521 | |
31e5e17b | 8522 | #: builtin/describe.c:319 |
c04f5ac3 | 8523 | #, c-format |
5809aa05 JX |
8524 | msgid "No exact match on refs or tags, searching to describe\n" |
8525 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 8526 | |
31e5e17b | 8527 | #: builtin/describe.c:366 |
c04f5ac3 JX |
8528 | #, c-format |
8529 | msgid "finished search at %s\n" | |
8530 | msgstr "完成搜索 %s\n" | |
8531 | ||
31e5e17b | 8532 | #: builtin/describe.c:392 |
c04f5ac3 JX |
8533 | #, c-format |
8534 | msgid "" | |
8535 | "No annotated tags can describe '%s'.\n" | |
8536 | "However, there were unannotated tags: try --tags." | |
8537 | msgstr "" | |
55a16ee4 RC |
8538 | "没有附注标签能描述 '%s'。\n" |
8539 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 8540 | |
31e5e17b | 8541 | #: builtin/describe.c:396 |
c04f5ac3 JX |
8542 | #, c-format |
8543 | msgid "" | |
8544 | "No tags can describe '%s'.\n" | |
8545 | "Try --always, or create some tags." | |
8546 | msgstr "" | |
55a16ee4 RC |
8547 | "没有标签能描述 '%s'。\n" |
8548 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 8549 | |
31e5e17b | 8550 | #: builtin/describe.c:426 |
c04f5ac3 JX |
8551 | #, c-format |
8552 | msgid "traversed %lu commits\n" | |
8553 | msgstr "已遍历 %lu 个提交\n" | |
8554 | ||
31e5e17b | 8555 | #: builtin/describe.c:429 |
c04f5ac3 JX |
8556 | #, c-format |
8557 | msgid "" | |
8558 | "more than %i tags found; listed %i most recent\n" | |
8559 | "gave up search at %s\n" | |
8560 | msgstr "" | |
55a16ee4 | 8561 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 8562 | "在 %s 放弃搜索\n" |
c04f5ac3 | 8563 | |
31e5e17b | 8564 | #: builtin/describe.c:497 |
5809aa05 JX |
8565 | #, c-format |
8566 | msgid "describe %s\n" | |
8567 | msgstr "描述 %s\n" | |
8568 | ||
31e5e17b | 8569 | #: builtin/describe.c:500 builtin/log.c:502 |
5809aa05 JX |
8570 | #, c-format |
8571 | msgid "Not a valid object name %s" | |
8572 | msgstr "不是一个有效的对象名 %s" | |
8573 | ||
31e5e17b | 8574 | #: builtin/describe.c:508 |
5809aa05 JX |
8575 | #, c-format |
8576 | msgid "%s is neither a commit nor blob" | |
8577 | msgstr "%s 既不是提交也不是数据对象" | |
8578 | ||
31e5e17b | 8579 | #: builtin/describe.c:522 |
ef317cd5 | 8580 | msgid "find the tag that comes after the commit" |
55a16ee4 | 8581 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 8582 | |
31e5e17b | 8583 | #: builtin/describe.c:523 |
ef317cd5 | 8584 | msgid "debug search strategy on stderr" |
07432cef | 8585 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 8586 | |
31e5e17b | 8587 | #: builtin/describe.c:524 |
1003b3a5 JX |
8588 | msgid "use any ref" |
8589 | msgstr "使用任意引用" | |
8590 | ||
31e5e17b | 8591 | #: builtin/describe.c:525 |
1003b3a5 | 8592 | msgid "use any tag, even unannotated" |
55a16ee4 | 8593 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 8594 | |
31e5e17b | 8595 | #: builtin/describe.c:526 |
ef317cd5 | 8596 | msgid "always use long format" |
07432cef | 8597 | msgstr "始终使用长提交号格式" |
ef317cd5 | 8598 | |
31e5e17b | 8599 | #: builtin/describe.c:527 |
2e8451e8 JX |
8600 | msgid "only follow first parent" |
8601 | msgstr "只跟随第一个父提交" | |
8602 | ||
31e5e17b | 8603 | #: builtin/describe.c:530 |
ef317cd5 | 8604 | msgid "only output exact matches" |
07432cef | 8605 | msgstr "只输出精确匹配" |
ef317cd5 | 8606 | |
31e5e17b | 8607 | #: builtin/describe.c:532 |
ef317cd5 | 8608 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 8609 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 8610 | |
31e5e17b | 8611 | #: builtin/describe.c:534 |
ef317cd5 | 8612 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 8613 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 8614 | |
31e5e17b | 8615 | #: builtin/describe.c:536 |
87cb7997 JX |
8616 | msgid "do not consider tags matching <pattern>" |
8617 | msgstr "不考虑匹配 <模式> 的标签" | |
8618 | ||
31e5e17b | 8619 | #: builtin/describe.c:538 builtin/name-rev.c:406 |
ef317cd5 | 8620 | msgid "show abbreviated commit object as fallback" |
07432cef | 8621 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 8622 | |
31e5e17b | 8623 | #: builtin/describe.c:539 builtin/describe.c:542 |
ef317cd5 | 8624 | msgid "mark" |
07432cef | 8625 | msgstr "标记" |
ef317cd5 | 8626 | |
31e5e17b | 8627 | #: builtin/describe.c:540 |
ef317cd5 | 8628 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 8629 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 8630 | |
31e5e17b | 8631 | #: builtin/describe.c:543 |
87cb7997 JX |
8632 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
8633 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
8634 | ||
31e5e17b | 8635 | #: builtin/describe.c:561 |
c04f5ac3 JX |
8636 | msgid "--long is incompatible with --abbrev=0" |
8637 | msgstr "--long 与 --abbrev=0 不兼容" | |
8638 | ||
31e5e17b | 8639 | #: builtin/describe.c:590 |
c04f5ac3 | 8640 | msgid "No names found, cannot describe anything." |
90e6ef53 | 8641 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 8642 | |
31e5e17b | 8643 | #: builtin/describe.c:640 |
a8a5406a | 8644 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
8645 | msgstr "--dirty 与提交号不兼容" |
8646 | ||
31e5e17b | 8647 | #: builtin/describe.c:642 |
87cb7997 JX |
8648 | msgid "--broken is incompatible with commit-ishes" |
8649 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 8650 | |
1a79b2f1 | 8651 | #: builtin/diff.c:83 |
c04f5ac3 JX |
8652 | #, c-format |
8653 | msgid "'%s': not a regular file or symlink" | |
8654 | msgstr "'%s':不是一个正规文件或符号链接" | |
8655 | ||
5809aa05 | 8656 | #: builtin/diff.c:234 |
c04f5ac3 JX |
8657 | #, c-format |
8658 | msgid "invalid option: %s" | |
8659 | msgstr "无效选项:%s" | |
8660 | ||
5809aa05 | 8661 | #: builtin/diff.c:356 |
c04f5ac3 | 8662 | msgid "Not a git repository" |
160fb2b2 | 8663 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 8664 | |
5809aa05 | 8665 | #: builtin/diff.c:399 |
c04f5ac3 JX |
8666 | #, c-format |
8667 | msgid "invalid object '%s' given." | |
8668 | msgstr "提供了无效对象 '%s'。" | |
8669 | ||
5809aa05 | 8670 | #: builtin/diff.c:408 |
c04f5ac3 JX |
8671 | #, c-format |
8672 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 8673 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 8674 | |
5809aa05 | 8675 | #: builtin/diff.c:413 |
c04f5ac3 JX |
8676 | #, c-format |
8677 | msgid "unhandled object '%s' given." | |
6c94aba5 | 8678 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 8679 | |
a4f16749 | 8680 | #: builtin/difftool.c:29 |
1a79b2f1 JX |
8681 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
8682 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
8683 | ||
6937cb4e | 8684 | #: builtin/difftool.c:259 |
1a79b2f1 JX |
8685 | #, c-format |
8686 | msgid "failed: %d" | |
8687 | msgstr "失败:%d" | |
8688 | ||
6937cb4e | 8689 | #: builtin/difftool.c:301 |
87cb7997 JX |
8690 | #, c-format |
8691 | msgid "could not read symlink %s" | |
8692 | msgstr "无法读取符号链接 %s" | |
8693 | ||
6937cb4e | 8694 | #: builtin/difftool.c:303 |
87cb7997 JX |
8695 | #, c-format |
8696 | msgid "could not read symlink file %s" | |
8697 | msgstr "无法读取符号链接文件 %s" | |
8698 | ||
6937cb4e | 8699 | #: builtin/difftool.c:311 |
87cb7997 JX |
8700 | #, c-format |
8701 | msgid "could not read object %s for symlink %s" | |
8702 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
8703 | ||
6937cb4e | 8704 | #: builtin/difftool.c:412 |
1a79b2f1 JX |
8705 | msgid "" |
8706 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
8707 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
8708 | msgstr "" |
8709 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
8710 | "cc')。" | |
1a79b2f1 | 8711 | |
5809aa05 | 8712 | #: builtin/difftool.c:632 |
1a79b2f1 JX |
8713 | #, c-format |
8714 | msgid "both files modified: '%s' and '%s'." | |
8715 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
8716 | ||
5809aa05 | 8717 | #: builtin/difftool.c:634 |
1a79b2f1 JX |
8718 | msgid "working tree file has been left." |
8719 | msgstr "工作区文件被留了下来。" | |
8720 | ||
5809aa05 | 8721 | #: builtin/difftool.c:645 |
1a79b2f1 JX |
8722 | #, c-format |
8723 | msgid "temporary files exist in '%s'." | |
8724 | msgstr "临时文件存在于 '%s'。" | |
8725 | ||
5809aa05 | 8726 | #: builtin/difftool.c:646 |
1a79b2f1 JX |
8727 | msgid "you may want to cleanup or recover these." |
8728 | msgstr "您可能想要清理或者恢复它们。" | |
8729 | ||
5809aa05 | 8730 | #: builtin/difftool.c:695 |
1a79b2f1 JX |
8731 | msgid "use `diff.guitool` instead of `diff.tool`" |
8732 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
8733 | ||
5809aa05 | 8734 | #: builtin/difftool.c:697 |
1a79b2f1 JX |
8735 | msgid "perform a full-directory diff" |
8736 | msgstr "执行一个全目录差异比较" | |
8737 | ||
5809aa05 | 8738 | #: builtin/difftool.c:699 |
1a79b2f1 JX |
8739 | msgid "do not prompt before launching a diff tool" |
8740 | msgstr "启动差异比较工具之前不提示" | |
8741 | ||
fd8cb379 | 8742 | #: builtin/difftool.c:704 |
1a79b2f1 JX |
8743 | msgid "use symlinks in dir-diff mode" |
8744 | msgstr "在 dir-diff 模式中使用符号链接" | |
8745 | ||
fd8cb379 | 8746 | #: builtin/difftool.c:705 |
1a79b2f1 JX |
8747 | msgid "<tool>" |
8748 | msgstr "<工具>" | |
8749 | ||
fd8cb379 | 8750 | #: builtin/difftool.c:706 |
1a79b2f1 JX |
8751 | msgid "use the specified diff tool" |
8752 | msgstr "使用指定的差异比较工具" | |
8753 | ||
fd8cb379 | 8754 | #: builtin/difftool.c:708 |
1a79b2f1 JX |
8755 | msgid "print a list of diff tools that may be used with `--tool`" |
8756 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
8757 | ||
fd8cb379 | 8758 | #: builtin/difftool.c:711 |
1a79b2f1 JX |
8759 | msgid "" |
8760 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
8761 | "code" | |
8762 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
8763 | ||
fd8cb379 | 8764 | #: builtin/difftool.c:713 |
1a79b2f1 JX |
8765 | msgid "<command>" |
8766 | msgstr "<命令>" | |
8767 | ||
fd8cb379 | 8768 | #: builtin/difftool.c:714 |
1a79b2f1 JX |
8769 | msgid "specify a custom command for viewing diffs" |
8770 | msgstr "指定一个用于查看差异的自定义命令" | |
8771 | ||
fd8cb379 | 8772 | #: builtin/difftool.c:738 |
1a79b2f1 JX |
8773 | msgid "no <tool> given for --tool=<tool>" |
8774 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
8775 | ||
fd8cb379 | 8776 | #: builtin/difftool.c:745 |
1a79b2f1 JX |
8777 | msgid "no <cmd> given for --extcmd=<cmd>" |
8778 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
8779 | ||
fd8cb379 | 8780 | #: builtin/fast-export.c:27 |
ef317cd5 | 8781 | msgid "git fast-export [rev-list-opts]" |
07432cef | 8782 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 8783 | |
fd8cb379 | 8784 | #: builtin/fast-export.c:1000 |
ef317cd5 | 8785 | msgid "show progress after <n> objects" |
07432cef | 8786 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 8787 | |
fd8cb379 | 8788 | #: builtin/fast-export.c:1002 |
ef317cd5 | 8789 | msgid "select handling of signed tags" |
55a16ee4 | 8790 | msgstr "选择如何处理签名标签" |
ef317cd5 | 8791 | |
fd8cb379 | 8792 | #: builtin/fast-export.c:1005 |
ef317cd5 | 8793 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 8794 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 8795 | |
fd8cb379 | 8796 | #: builtin/fast-export.c:1008 |
ef317cd5 | 8797 | msgid "Dump marks to this file" |
07432cef | 8798 | msgstr "把标记存储到这个文件" |
ef317cd5 | 8799 | |
fd8cb379 | 8800 | #: builtin/fast-export.c:1010 |
ef317cd5 | 8801 | msgid "Import marks from this file" |
07432cef | 8802 | msgstr "从这个文件导入标记" |
ef317cd5 | 8803 | |
fd8cb379 | 8804 | #: builtin/fast-export.c:1012 |
ef317cd5 | 8805 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 8806 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 8807 | |
fd8cb379 | 8808 | #: builtin/fast-export.c:1014 |
ef317cd5 | 8809 | msgid "Output full tree for each commit" |
07432cef | 8810 | msgstr "每次提交都输出整个树" |
ef317cd5 | 8811 | |
fd8cb379 | 8812 | #: builtin/fast-export.c:1016 |
ef317cd5 | 8813 | msgid "Use the done feature to terminate the stream" |
07432cef | 8814 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 8815 | |
fd8cb379 | 8816 | #: builtin/fast-export.c:1017 |
ef317cd5 | 8817 | msgid "Skip output of blob data" |
07432cef | 8818 | msgstr "跳过数据对象的输出" |
ef317cd5 | 8819 | |
fd8cb379 | 8820 | #: builtin/fast-export.c:1018 |
6acbf033 | 8821 | msgid "refspec" |
160fb2b2 | 8822 | msgstr "引用规格" |
6acbf033 | 8823 | |
fd8cb379 | 8824 | #: builtin/fast-export.c:1019 |
6acbf033 | 8825 | msgid "Apply refspec to exported refs" |
160fb2b2 | 8826 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 8827 | |
fd8cb379 | 8828 | #: builtin/fast-export.c:1020 |
220c313c JX |
8829 | msgid "anonymize output" |
8830 | msgstr "匿名输出" | |
8831 | ||
fd8cb379 | 8832 | #: builtin/fetch.c:26 |
ef317cd5 | 8833 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 8834 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 8835 | |
fd8cb379 | 8836 | #: builtin/fetch.c:27 |
ef317cd5 | 8837 | msgid "git fetch [<options>] <group>" |
07432cef | 8838 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 8839 | |
fd8cb379 | 8840 | #: builtin/fetch.c:28 |
ef317cd5 | 8841 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 8842 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 8843 | |
fd8cb379 | 8844 | #: builtin/fetch.c:29 |
ef317cd5 | 8845 | msgid "git fetch --all [<options>]" |
07432cef | 8846 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 8847 | |
fd8cb379 | 8848 | #: builtin/fetch.c:123 builtin/pull.c:193 |
ef317cd5 | 8849 | msgid "fetch from all remotes" |
07432cef | 8850 | msgstr "从所有的远程抓取" |
ef317cd5 | 8851 | |
fd8cb379 | 8852 | #: builtin/fetch.c:125 builtin/pull.c:196 |
ef317cd5 | 8853 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 8854 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 8855 | |
fd8cb379 | 8856 | #: builtin/fetch.c:127 builtin/pull.c:199 |
ef317cd5 | 8857 | msgid "path to upload pack on remote end" |
07432cef | 8858 | msgstr "上传包到远程的路径" |
ef317cd5 | 8859 | |
fd8cb379 | 8860 | #: builtin/fetch.c:128 builtin/pull.c:201 |
ef317cd5 | 8861 | msgid "force overwrite of local branch" |
07432cef | 8862 | msgstr "强制覆盖本地分支" |
ef317cd5 | 8863 | |
fd8cb379 | 8864 | #: builtin/fetch.c:130 |
ef317cd5 | 8865 | msgid "fetch from multiple remotes" |
07432cef | 8866 | msgstr "从多个远程抓取" |
ef317cd5 | 8867 | |
fd8cb379 | 8868 | #: builtin/fetch.c:132 builtin/pull.c:203 |
ef317cd5 | 8869 | msgid "fetch all tags and associated objects" |
55a16ee4 | 8870 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 8871 | |
fd8cb379 | 8872 | #: builtin/fetch.c:134 |
ef317cd5 | 8873 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 8874 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 8875 | |
fd8cb379 | 8876 | #: builtin/fetch.c:136 |
276ceeaa JX |
8877 | msgid "number of submodules fetched in parallel" |
8878 | msgstr "子模组获取的并发数" | |
8879 | ||
fd8cb379 | 8880 | #: builtin/fetch.c:138 builtin/pull.c:206 |
ef317cd5 | 8881 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 8882 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 8883 | |
fd8cb379 | 8884 | #: builtin/fetch.c:140 |
31e5e17b JX |
8885 | msgid "prune local tags no longer on remote and clobber changed tags" |
8886 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
8887 | ||
07432cef | 8888 | # 译者:可选值,不能翻译 |
fd8cb379 | 8889 | #: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 |
ef317cd5 | 8890 | msgid "on-demand" |
07432cef | 8891 | msgstr "on-demand" |
ef317cd5 | 8892 | |
fd8cb379 | 8893 | #: builtin/fetch.c:142 |
ef317cd5 | 8894 | msgid "control recursive fetching of submodules" |
07432cef | 8895 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 8896 | |
fd8cb379 | 8897 | #: builtin/fetch.c:146 builtin/pull.c:214 |
ef317cd5 | 8898 | msgid "keep downloaded pack" |
07432cef | 8899 | msgstr "保持下载包" |
ef317cd5 | 8900 | |
fd8cb379 | 8901 | #: builtin/fetch.c:148 |
ef317cd5 | 8902 | msgid "allow updating of HEAD ref" |
07432cef | 8903 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 8904 | |
fd8cb379 | 8905 | #: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 |
ef317cd5 | 8906 | msgid "deepen history of shallow clone" |
07432cef | 8907 | msgstr "深化浅克隆的历史" |
ef317cd5 | 8908 | |
fd8cb379 | 8909 | #: builtin/fetch.c:153 |
a0b6b246 JX |
8910 | msgid "deepen history of shallow repository based on time" |
8911 | msgstr "基于时间来深化浅克隆的历史" | |
8912 | ||
fd8cb379 | 8913 | #: builtin/fetch.c:159 builtin/pull.c:220 |
a77c07d9 | 8914 | msgid "convert to a complete repository" |
160fb2b2 | 8915 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 8916 | |
fd8cb379 | 8917 | #: builtin/fetch.c:162 |
ef317cd5 | 8918 | msgid "prepend this to submodule path output" |
07432cef | 8919 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 8920 | |
fd8cb379 | 8921 | #: builtin/fetch.c:165 |
a4f16749 JX |
8922 | msgid "" |
8923 | "default for recursive fetching of submodules (lower priority than config " | |
8924 | "files)" | |
8925 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 8926 | |
fd8cb379 | 8927 | #: builtin/fetch.c:169 builtin/pull.c:223 |
cfff71a9 JX |
8928 | msgid "accept refs that update .git/shallow" |
8929 | msgstr "接受更新 .git/shallow 的引用" | |
8930 | ||
fd8cb379 | 8931 | #: builtin/fetch.c:170 builtin/pull.c:225 |
6acbf033 JX |
8932 | msgid "refmap" |
8933 | msgstr "引用映射" | |
8934 | ||
fd8cb379 | 8935 | #: builtin/fetch.c:171 builtin/pull.c:226 |
6acbf033 JX |
8936 | msgid "specify fetch refmap" |
8937 | msgstr "指定获取操作的引用映射" | |
8938 | ||
fd8cb379 JX |
8939 | #: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 |
8940 | #: builtin/send-pack.c:172 | |
8941 | msgid "server-specific" | |
8942 | msgstr "server-specific" | |
8943 | ||
8944 | #: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 | |
8945 | #: builtin/send-pack.c:173 | |
8946 | msgid "option to transmit" | |
8947 | msgstr "传输选项" | |
8948 | ||
8949 | #: builtin/fetch.c:442 | |
c04f5ac3 JX |
8950 | msgid "Couldn't find remote ref HEAD" |
8951 | msgstr "无法发现远程 HEAD 引用" | |
8952 | ||
fd8cb379 | 8953 | #: builtin/fetch.c:560 |
5c57d762 JX |
8954 | #, c-format |
8955 | msgid "configuration fetch.output contains invalid value %s" | |
8956 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
8957 | ||
fd8cb379 | 8958 | #: builtin/fetch.c:653 |
c04f5ac3 JX |
8959 | #, c-format |
8960 | msgid "object %s not found" | |
8961 | msgstr "对象 %s 未发现" | |
8962 | ||
fd8cb379 | 8963 | #: builtin/fetch.c:657 |
c04f5ac3 JX |
8964 | msgid "[up to date]" |
8965 | msgstr "[最新]" | |
8966 | ||
fd8cb379 | 8967 | #: builtin/fetch.c:670 builtin/fetch.c:750 |
c04f5ac3 JX |
8968 | msgid "[rejected]" |
8969 | msgstr "[已拒绝]" | |
8970 | ||
fd8cb379 | 8971 | #: builtin/fetch.c:671 |
5c57d762 | 8972 | msgid "can't fetch in current branch" |
9a4b694c | 8973 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 8974 | |
fd8cb379 | 8975 | #: builtin/fetch.c:680 |
c04f5ac3 | 8976 | msgid "[tag update]" |
55a16ee4 | 8977 | msgstr "[标签更新]" |
c04f5ac3 | 8978 | |
fd8cb379 JX |
8979 | #: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 |
8980 | #: builtin/fetch.c:745 | |
5c57d762 JX |
8981 | msgid "unable to update local ref" |
8982 | msgstr "不能更新本地引用" | |
c04f5ac3 | 8983 | |
fd8cb379 | 8984 | #: builtin/fetch.c:700 |
c04f5ac3 | 8985 | msgid "[new tag]" |
55a16ee4 | 8986 | msgstr "[新标签]" |
c04f5ac3 | 8987 | |
fd8cb379 | 8988 | #: builtin/fetch.c:703 |
c04f5ac3 JX |
8989 | msgid "[new branch]" |
8990 | msgstr "[新分支]" | |
8991 | ||
fd8cb379 | 8992 | #: builtin/fetch.c:706 |
170e9899 JX |
8993 | msgid "[new ref]" |
8994 | msgstr "[新引用]" | |
8995 | ||
fd8cb379 | 8996 | #: builtin/fetch.c:745 |
c04f5ac3 JX |
8997 | msgid "forced update" |
8998 | msgstr "强制更新" | |
8999 | ||
fd8cb379 | 9000 | #: builtin/fetch.c:750 |
5c57d762 JX |
9001 | msgid "non-fast-forward" |
9002 | msgstr "非快进" | |
c04f5ac3 | 9003 | |
fd8cb379 | 9004 | #: builtin/fetch.c:795 |
c04f5ac3 JX |
9005 | #, c-format |
9006 | msgid "%s did not send all necessary objects\n" | |
9007 | msgstr "%s 未发送所有必须的对象\n" | |
9008 | ||
fd8cb379 | 9009 | #: builtin/fetch.c:815 |
cfff71a9 JX |
9010 | #, c-format |
9011 | msgid "reject %s because shallow roots are not allowed to be updated" | |
9012 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
9013 | ||
fd8cb379 | 9014 | #: builtin/fetch.c:903 builtin/fetch.c:999 |
c04f5ac3 JX |
9015 | #, c-format |
9016 | msgid "From %.*s\n" | |
9017 | msgstr "来自 %.*s\n" | |
9018 | ||
fd8cb379 | 9019 | #: builtin/fetch.c:914 |
c04f5ac3 JX |
9020 | #, c-format |
9021 | msgid "" | |
9022 | "some local refs could not be updated; try running\n" | |
9023 | " 'git remote prune %s' to remove any old, conflicting branches" | |
9024 | msgstr "" | |
9025 | "一些本地引用不能被更新;尝试运行\n" | |
9026 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
9027 | ||
90e6ef53 | 9028 | # 译者:注意保持前导空格 |
fd8cb379 | 9029 | #: builtin/fetch.c:969 |
81809b99 | 9030 | #, c-format |
8ada9598 | 9031 | msgid " (%s will become dangling)" |
07432cef | 9032 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 9033 | |
90e6ef53 | 9034 | # 译者:注意保持前导空格 |
fd8cb379 | 9035 | #: builtin/fetch.c:970 |
81809b99 | 9036 | #, c-format |
8ada9598 | 9037 | msgid " (%s has become dangling)" |
07432cef | 9038 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 9039 | |
fd8cb379 | 9040 | #: builtin/fetch.c:1002 |
c04f5ac3 JX |
9041 | msgid "[deleted]" |
9042 | msgstr "[已删除]" | |
9043 | ||
fd8cb379 | 9044 | #: builtin/fetch.c:1003 builtin/remote.c:1033 |
c04f5ac3 JX |
9045 | msgid "(none)" |
9046 | msgstr "(无)" | |
9047 | ||
fd8cb379 | 9048 | #: builtin/fetch.c:1026 |
c04f5ac3 JX |
9049 | #, c-format |
9050 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 9051 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 9052 | |
fd8cb379 | 9053 | #: builtin/fetch.c:1045 |
c04f5ac3 JX |
9054 | #, c-format |
9055 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
9056 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
9057 | ||
fd8cb379 | 9058 | #: builtin/fetch.c:1048 |
c04f5ac3 JX |
9059 | #, c-format |
9060 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 9061 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 9062 | |
fd8cb379 | 9063 | #: builtin/fetch.c:1287 |
c04f5ac3 JX |
9064 | #, c-format |
9065 | msgid "Fetching %s\n" | |
d4a8e00b | 9066 | msgstr "正在获取 %s\n" |
c04f5ac3 | 9067 | |
fd8cb379 | 9068 | #: builtin/fetch.c:1289 builtin/remote.c:98 |
c04f5ac3 JX |
9069 | #, c-format |
9070 | msgid "Could not fetch %s" | |
9071 | msgstr "不能获取 %s" | |
9072 | ||
fd8cb379 | 9073 | #: builtin/fetch.c:1335 builtin/fetch.c:1503 |
31e5e17b JX |
9074 | msgid "" |
9075 | "--filter can only be used with the remote configured in core.partialClone" | |
9076 | msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库" | |
9077 | ||
fd8cb379 | 9078 | #: builtin/fetch.c:1358 |
c04f5ac3 JX |
9079 | msgid "" |
9080 | "No remote repository specified. Please, specify either a URL or a\n" | |
9081 | "remote name from which new revisions should be fetched." | |
4375c10e | 9082 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 9083 | |
fd8cb379 | 9084 | #: builtin/fetch.c:1395 |
c04f5ac3 | 9085 | msgid "You need to specify a tag name." |
55a16ee4 | 9086 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 9087 | |
fd8cb379 | 9088 | #: builtin/fetch.c:1444 |
a0b6b246 JX |
9089 | msgid "Negative depth in --deepen is not supported" |
9090 | msgstr "--deepen 不支持负数深度" | |
9091 | ||
fd8cb379 | 9092 | #: builtin/fetch.c:1446 |
a0b6b246 JX |
9093 | msgid "--deepen and --depth are mutually exclusive" |
9094 | msgstr "--deepen 和 --depth 是互斥的" | |
9095 | ||
fd8cb379 | 9096 | #: builtin/fetch.c:1451 |
a77c07d9 JX |
9097 | msgid "--depth and --unshallow cannot be used together" |
9098 | msgstr "--depth 和 --unshallow 不能同时使用" | |
9099 | ||
fd8cb379 | 9100 | #: builtin/fetch.c:1453 |
a77c07d9 | 9101 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 9102 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 9103 | |
fd8cb379 | 9104 | #: builtin/fetch.c:1469 |
c04f5ac3 | 9105 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 9106 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 9107 | |
fd8cb379 | 9108 | #: builtin/fetch.c:1471 |
c04f5ac3 | 9109 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 9110 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 9111 | |
fd8cb379 | 9112 | #: builtin/fetch.c:1480 |
c04f5ac3 JX |
9113 | #, c-format |
9114 | msgid "No such remote or remote group: %s" | |
9115 | msgstr "没有这样的远程或远程组:%s" | |
9116 | ||
fd8cb379 | 9117 | #: builtin/fetch.c:1487 |
c04f5ac3 | 9118 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 9119 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 9120 | |
a4f16749 | 9121 | #: builtin/fmt-merge-msg.c:15 |
814ff314 JX |
9122 | msgid "" |
9123 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
9124 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 9125 | |
5809aa05 | 9126 | #: builtin/fmt-merge-msg.c:666 |
ef317cd5 | 9127 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 9128 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 9129 | |
5809aa05 | 9130 | #: builtin/fmt-merge-msg.c:669 |
ef317cd5 | 9131 | msgid "alias for --log (deprecated)" |
07432cef | 9132 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 9133 | |
5809aa05 | 9134 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 9135 | msgid "text" |
07432cef | 9136 | msgstr "文本" |
ef317cd5 | 9137 | |
5809aa05 | 9138 | #: builtin/fmt-merge-msg.c:673 |
ef317cd5 | 9139 | msgid "use <text> as start of message" |
07432cef | 9140 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 9141 | |
5809aa05 | 9142 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 9143 | msgid "file to read from" |
07432cef | 9144 | msgstr "从文件中读取" |
ef317cd5 | 9145 | |
a4f16749 | 9146 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
9147 | msgid "git for-each-ref [<options>] [<pattern>]" |
9148 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 9149 | |
a4f16749 | 9150 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
9151 | msgid "git for-each-ref [--points-at <object>]" |
9152 | msgstr "git for-each-ref [--points-at <对象>]" | |
9153 | ||
a4f16749 | 9154 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
9155 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
9156 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 9157 | |
a4f16749 | 9158 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
9159 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
9160 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 9161 | |
a4f16749 | 9162 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 9163 | msgid "quote placeholders suitably for shells" |
07432cef | 9164 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 9165 | |
a4f16749 | 9166 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 9167 | msgid "quote placeholders suitably for perl" |
07432cef | 9168 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 9169 | |
a4f16749 | 9170 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 9171 | msgid "quote placeholders suitably for python" |
07432cef | 9172 | msgstr "引用占位符适用于 python" |
ef317cd5 | 9173 | |
a4f16749 | 9174 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
9175 | msgid "quote placeholders suitably for Tcl" |
9176 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 9177 | |
a4f16749 | 9178 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 9179 | msgid "show only <n> matched refs" |
07432cef | 9180 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 9181 | |
fd8cb379 | 9182 | #: builtin/for-each-ref.c:39 builtin/tag.c:421 |
6937cb4e JX |
9183 | msgid "respect format colors" |
9184 | msgstr "遵照格式中的颜色输出" | |
9185 | ||
9186 | #: builtin/for-each-ref.c:43 | |
94550ed3 JX |
9187 | msgid "print only refs which points at the given object" |
9188 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 9189 | |
6937cb4e | 9190 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
9191 | msgid "print only refs that are merged" |
9192 | msgstr "只打印已经合并的引用" | |
9193 | ||
6937cb4e | 9194 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
9195 | msgid "print only refs that are not merged" |
9196 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 9197 | |
6937cb4e | 9198 | #: builtin/for-each-ref.c:47 |
94550ed3 JX |
9199 | msgid "print only refs which contain the commit" |
9200 | msgstr "只打印包含该提交的引用" | |
9201 | ||
6937cb4e | 9202 | #: builtin/for-each-ref.c:48 |
87cb7997 JX |
9203 | msgid "print only refs which don't contain the commit" |
9204 | msgstr "只打印不包含该提交的引用" | |
9205 | ||
fd8cb379 | 9206 | #: builtin/fsck.c:569 |
6c94aba5 JX |
9207 | msgid "Checking object directories" |
9208 | msgstr "检查对象目录中" | |
9209 | ||
fd8cb379 | 9210 | #: builtin/fsck.c:661 |
814ff314 JX |
9211 | msgid "git fsck [<options>] [<object>...]" |
9212 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 9213 | |
fd8cb379 | 9214 | #: builtin/fsck.c:667 |
ef317cd5 | 9215 | msgid "show unreachable objects" |
07432cef | 9216 | msgstr "显示不可达的对象" |
ef317cd5 | 9217 | |
fd8cb379 | 9218 | #: builtin/fsck.c:668 |
ef317cd5 | 9219 | msgid "show dangling objects" |
07432cef | 9220 | msgstr "显示摇摆的对象" |
ef317cd5 | 9221 | |
fd8cb379 | 9222 | #: builtin/fsck.c:669 |
ef317cd5 | 9223 | msgid "report tags" |
55a16ee4 | 9224 | msgstr "报告标签" |
ef317cd5 | 9225 | |
fd8cb379 | 9226 | #: builtin/fsck.c:670 |
ef317cd5 | 9227 | msgid "report root nodes" |
07432cef | 9228 | msgstr "报告根节点" |
ef317cd5 | 9229 | |
fd8cb379 | 9230 | #: builtin/fsck.c:671 |
ef317cd5 | 9231 | msgid "make index objects head nodes" |
07432cef | 9232 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 9233 | |
fd8cb379 | 9234 | #: builtin/fsck.c:672 |
ef317cd5 | 9235 | msgid "make reflogs head nodes (default)" |
07432cef | 9236 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 9237 | |
fd8cb379 | 9238 | #: builtin/fsck.c:673 |
ef317cd5 | 9239 | msgid "also consider packs and alternate objects" |
07432cef | 9240 | msgstr "也考虑包和备用对象" |
ef317cd5 | 9241 | |
fd8cb379 | 9242 | #: builtin/fsck.c:674 |
1b7f4a34 JX |
9243 | msgid "check only connectivity" |
9244 | msgstr "仅检查连通性" | |
9245 | ||
fd8cb379 | 9246 | #: builtin/fsck.c:675 |
ef317cd5 | 9247 | msgid "enable more strict checking" |
07432cef | 9248 | msgstr "启用更严格的检查" |
ef317cd5 | 9249 | |
fd8cb379 | 9250 | #: builtin/fsck.c:677 |
ef317cd5 | 9251 | msgid "write dangling objects in .git/lost-found" |
07432cef | 9252 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 9253 | |
fd8cb379 | 9254 | #: builtin/fsck.c:678 builtin/prune.c:109 |
ef317cd5 | 9255 | msgid "show progress" |
07432cef | 9256 | msgstr "显示进度" |
ef317cd5 | 9257 | |
fd8cb379 | 9258 | #: builtin/fsck.c:679 |
5c57d762 JX |
9259 | msgid "show verbose names for reachable objects" |
9260 | msgstr "显示可达对象的详细名称" | |
9261 | ||
fd8cb379 | 9262 | #: builtin/fsck.c:745 |
6c94aba5 JX |
9263 | msgid "Checking objects" |
9264 | msgstr "检查对象中" | |
9265 | ||
fd8cb379 | 9266 | #: builtin/gc.c:33 |
814ff314 JX |
9267 | msgid "git gc [<options>]" |
9268 | msgstr "git gc [<选项>]" | |
ef317cd5 | 9269 | |
fd8cb379 | 9270 | #: builtin/gc.c:88 |
c04f5ac3 | 9271 | #, c-format |
87cb7997 | 9272 | msgid "Failed to fstat %s: %s" |
65e2041e | 9273 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 9274 | |
fd8cb379 | 9275 | #: builtin/gc.c:452 |
c04f5ac3 | 9276 | #, c-format |
87cb7997 | 9277 | msgid "Can't stat %s" |
65e2041e | 9278 | msgstr "不能对 %s 调用 stat" |
c04f5ac3 | 9279 | |
fd8cb379 | 9280 | #: builtin/gc.c:461 |
94550ed3 JX |
9281 | #, c-format |
9282 | msgid "" | |
9283 | "The last gc run reported the following. Please correct the root cause\n" | |
9284 | "and remove %s.\n" | |
9285 | "Automatic cleanup will not be performed until the file is removed.\n" | |
9286 | "\n" | |
9287 | "%s" | |
9288 | msgstr "" | |
9289 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
9290 | "在该文件被删除之前,自动清理将不会执行。\n" | |
9291 | "\n" | |
9292 | "%s" | |
9293 | ||
fd8cb379 | 9294 | #: builtin/gc.c:502 |
ef317cd5 | 9295 | msgid "prune unreferenced objects" |
07432cef | 9296 | msgstr "清除未引用的对象" |
ef317cd5 | 9297 | |
fd8cb379 | 9298 | #: builtin/gc.c:504 |
ef317cd5 | 9299 | msgid "be more thorough (increased runtime)" |
07432cef | 9300 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 9301 | |
fd8cb379 | 9302 | #: builtin/gc.c:505 |
ef317cd5 | 9303 | msgid "enable auto-gc mode" |
07432cef | 9304 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 9305 | |
fd8cb379 | 9306 | #: builtin/gc.c:508 |
90314792 JX |
9307 | msgid "force running gc even if there may be another gc running" |
9308 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
9309 | ||
fd8cb379 JX |
9310 | #: builtin/gc.c:511 |
9311 | msgid "repack all other packs except the largest pack" | |
9312 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
9313 | ||
9314 | #: builtin/gc.c:528 | |
9315 | #, c-format | |
9316 | msgid "failed to parse gc.logexpiry value %s" | |
9317 | msgstr "无法解析 gc.logexpiry 的值 %s" | |
9318 | ||
9319 | #: builtin/gc.c:539 | |
87cb7997 | 9320 | #, c-format |
fd8cb379 | 9321 | msgid "failed to parse prune expiry value %s" |
0fcd668f | 9322 | msgstr "无法解析清除期限值 %s" |
87cb7997 | 9323 | |
fd8cb379 | 9324 | #: builtin/gc.c:559 |
c04f5ac3 | 9325 | #, c-format |
6c94aba5 | 9326 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 9327 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 9328 | |
fd8cb379 | 9329 | #: builtin/gc.c:561 |
6c94aba5 JX |
9330 | #, c-format |
9331 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 9332 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 9333 | |
fd8cb379 | 9334 | #: builtin/gc.c:562 |
6c94aba5 JX |
9335 | #, c-format |
9336 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
9337 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 9338 | |
fd8cb379 | 9339 | #: builtin/gc.c:598 |
90314792 JX |
9340 | #, c-format |
9341 | msgid "" | |
9342 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
9343 | msgstr "" | |
29004bbb | 9344 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 9345 | |
fd8cb379 | 9346 | #: builtin/gc.c:645 |
c04f5ac3 JX |
9347 | msgid "" |
9348 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 9349 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 9350 | |
fd8cb379 | 9351 | #: builtin/grep.c:28 |
814ff314 JX |
9352 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
9353 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 9354 | |
fd8cb379 | 9355 | #: builtin/grep.c:226 |
c04f5ac3 JX |
9356 | #, c-format |
9357 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 9358 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 9359 | |
fd8cb379 | 9360 | #: builtin/grep.c:284 |
276ceeaa JX |
9361 | #, c-format |
9362 | msgid "invalid number of threads specified (%d) for %s" | |
9363 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
9364 | ||
a4f16749 JX |
9365 | #. TRANSLATORS: %s is the configuration |
9366 | #. variable for tweaking threads, currently | |
9367 | #. grep.threads | |
9368 | #. | |
fd8cb379 | 9369 | #: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727 |
a4f16749 JX |
9370 | #, c-format |
9371 | msgid "no threads support, ignoring %s" | |
9372 | msgstr "没有线程支持,忽略 %s" | |
9373 | ||
fd8cb379 | 9374 | #: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 |
c04f5ac3 JX |
9375 | #, c-format |
9376 | msgid "unable to read tree (%s)" | |
90e6ef53 | 9377 | msgstr "无法读取树(%s)" |
c04f5ac3 | 9378 | |
fd8cb379 | 9379 | #: builtin/grep.c:638 |
c04f5ac3 JX |
9380 | #, c-format |
9381 | msgid "unable to grep from object of type %s" | |
9382 | msgstr "无法抓取来自于 %s 类型的对象" | |
9383 | ||
31e5e17b | 9384 | #: builtin/grep.c:703 |
c04f5ac3 JX |
9385 | #, c-format |
9386 | msgid "switch `%c' expects a numerical value" | |
9387 | msgstr "开关 `%c' 期望一个数字值" | |
9388 | ||
31e5e17b | 9389 | #: builtin/grep.c:790 |
ef317cd5 | 9390 | msgid "search in index instead of in the work tree" |
07432cef | 9391 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 9392 | |
31e5e17b | 9393 | #: builtin/grep.c:792 |
ef317cd5 | 9394 | msgid "find in contents not managed by git" |
07432cef | 9395 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
9396 | |
9397 | # 译者:中文字符串拼接,可删除前导空格 | |
31e5e17b | 9398 | #: builtin/grep.c:794 |
ef317cd5 | 9399 | msgid "search in both tracked and untracked files" |
07432cef | 9400 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 9401 | |
31e5e17b | 9402 | #: builtin/grep.c:796 |
814ff314 JX |
9403 | msgid "ignore files specified via '.gitignore'" |
9404 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 9405 | |
31e5e17b | 9406 | #: builtin/grep.c:798 |
87cb7997 | 9407 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
9408 | msgstr "在每一个子模组中递归搜索" |
9409 | ||
31e5e17b | 9410 | #: builtin/grep.c:801 |
ef317cd5 | 9411 | msgid "show non-matching lines" |
07432cef | 9412 | msgstr "显示未匹配的行" |
ef317cd5 | 9413 | |
31e5e17b | 9414 | #: builtin/grep.c:803 |
ef317cd5 | 9415 | msgid "case insensitive matching" |
07432cef | 9416 | msgstr "不区分大小写匹配" |
ef317cd5 | 9417 | |
31e5e17b | 9418 | #: builtin/grep.c:805 |
ef317cd5 | 9419 | msgid "match patterns only at word boundaries" |
07432cef | 9420 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 9421 | |
31e5e17b | 9422 | #: builtin/grep.c:807 |
ef317cd5 | 9423 | msgid "process binary files as text" |
07432cef | 9424 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 9425 | |
31e5e17b | 9426 | #: builtin/grep.c:809 |
ef317cd5 | 9427 | msgid "don't match patterns in binary files" |
07432cef | 9428 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 9429 | |
31e5e17b | 9430 | #: builtin/grep.c:812 |
90314792 JX |
9431 | msgid "process binary files with textconv filters" |
9432 | msgstr "用 textconv 过滤器处理二进制文件" | |
9433 | ||
31e5e17b | 9434 | #: builtin/grep.c:814 |
ef317cd5 | 9435 | msgid "descend at most <depth> levels" |
07432cef | 9436 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 9437 | |
31e5e17b | 9438 | #: builtin/grep.c:818 |
ef317cd5 | 9439 | msgid "use extended POSIX regular expressions" |
07432cef | 9440 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 9441 | |
31e5e17b | 9442 | #: builtin/grep.c:821 |
ef317cd5 | 9443 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 9444 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 9445 | |
31e5e17b | 9446 | #: builtin/grep.c:824 |
ef317cd5 | 9447 | msgid "interpret patterns as fixed strings" |
07432cef | 9448 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 9449 | |
31e5e17b | 9450 | #: builtin/grep.c:827 |
ef317cd5 | 9451 | msgid "use Perl-compatible regular expressions" |
07432cef | 9452 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 9453 | |
31e5e17b | 9454 | #: builtin/grep.c:830 |
ef317cd5 | 9455 | msgid "show line numbers" |
07432cef | 9456 | msgstr "显示行号" |
ef317cd5 | 9457 | |
31e5e17b | 9458 | #: builtin/grep.c:831 |
ef317cd5 | 9459 | msgid "don't show filenames" |
07432cef | 9460 | msgstr "不显示文件名" |
ef317cd5 | 9461 | |
31e5e17b | 9462 | #: builtin/grep.c:832 |
ef317cd5 | 9463 | msgid "show filenames" |
07432cef | 9464 | msgstr "显示文件名" |
ef317cd5 | 9465 | |
31e5e17b | 9466 | #: builtin/grep.c:834 |
ef317cd5 | 9467 | msgid "show filenames relative to top directory" |
07432cef | 9468 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 9469 | |
31e5e17b | 9470 | #: builtin/grep.c:836 |
ef317cd5 | 9471 | msgid "show only filenames instead of matching lines" |
07432cef | 9472 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 9473 | |
31e5e17b | 9474 | #: builtin/grep.c:838 |
ef317cd5 | 9475 | msgid "synonym for --files-with-matches" |
07432cef | 9476 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 9477 | |
31e5e17b | 9478 | #: builtin/grep.c:841 |
ef317cd5 | 9479 | msgid "show only the names of files without match" |
07432cef | 9480 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 9481 | |
31e5e17b | 9482 | #: builtin/grep.c:843 |
ef317cd5 | 9483 | msgid "print NUL after filenames" |
07432cef | 9484 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 9485 | |
31e5e17b | 9486 | #: builtin/grep.c:846 |
ef317cd5 | 9487 | msgid "show the number of matches instead of matching lines" |
07432cef | 9488 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 9489 | |
31e5e17b | 9490 | #: builtin/grep.c:847 |
ef317cd5 | 9491 | msgid "highlight matches" |
07432cef | 9492 | msgstr "高亮显示匹配项" |
ef317cd5 | 9493 | |
31e5e17b | 9494 | #: builtin/grep.c:849 |
ef317cd5 | 9495 | msgid "print empty line between matches from different files" |
07432cef | 9496 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 9497 | |
31e5e17b | 9498 | #: builtin/grep.c:851 |
ef317cd5 | 9499 | msgid "show filename only once above matches from same file" |
07432cef | 9500 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 9501 | |
31e5e17b | 9502 | #: builtin/grep.c:854 |
ef317cd5 | 9503 | msgid "show <n> context lines before and after matches" |
07432cef | 9504 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 9505 | |
31e5e17b | 9506 | #: builtin/grep.c:857 |
ef317cd5 | 9507 | msgid "show <n> context lines before matches" |
07432cef | 9508 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 9509 | |
31e5e17b | 9510 | #: builtin/grep.c:859 |
ef317cd5 | 9511 | msgid "show <n> context lines after matches" |
07432cef | 9512 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 9513 | |
31e5e17b | 9514 | #: builtin/grep.c:861 |
276ceeaa JX |
9515 | msgid "use <n> worker threads" |
9516 | msgstr "使用 <n> 个工作线程" | |
9517 | ||
31e5e17b | 9518 | #: builtin/grep.c:862 |
ef317cd5 | 9519 | msgid "shortcut for -C NUM" |
07432cef | 9520 | msgstr "快捷键 -C 数字" |
ef317cd5 | 9521 | |
31e5e17b | 9522 | #: builtin/grep.c:865 |
ef317cd5 | 9523 | msgid "show a line with the function name before matches" |
07432cef | 9524 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 9525 | |
31e5e17b | 9526 | #: builtin/grep.c:867 |
ef317cd5 | 9527 | msgid "show the surrounding function" |
07432cef | 9528 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 9529 | |
31e5e17b | 9530 | #: builtin/grep.c:870 |
ef317cd5 | 9531 | msgid "read patterns from file" |
07432cef | 9532 | msgstr "从文件读取模式" |
ef317cd5 | 9533 | |
31e5e17b | 9534 | #: builtin/grep.c:872 |
ef317cd5 | 9535 | msgid "match <pattern>" |
07432cef | 9536 | msgstr "匹配 <模式>" |
ef317cd5 | 9537 | |
31e5e17b | 9538 | #: builtin/grep.c:874 |
ef317cd5 | 9539 | msgid "combine patterns specified with -e" |
07432cef | 9540 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 9541 | |
31e5e17b | 9542 | #: builtin/grep.c:886 |
ef317cd5 | 9543 | msgid "indicate hit with exit status without output" |
07432cef | 9544 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 9545 | |
31e5e17b | 9546 | #: builtin/grep.c:888 |
ef317cd5 | 9547 | msgid "show only matches from files that match all patterns" |
07432cef | 9548 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 9549 | |
31e5e17b | 9550 | #: builtin/grep.c:890 |
07432cef WS |
9551 | msgid "show parse tree for grep expression" |
9552 | msgstr "显示 grep 表达式的解析树" | |
9553 | ||
31e5e17b | 9554 | #: builtin/grep.c:894 |
ef317cd5 | 9555 | msgid "pager" |
07432cef | 9556 | msgstr "分页" |
ef317cd5 | 9557 | |
31e5e17b | 9558 | #: builtin/grep.c:894 |
ef317cd5 | 9559 | msgid "show matching files in the pager" |
07432cef | 9560 | msgstr "分页显示匹配的文件" |
ef317cd5 | 9561 | |
31e5e17b | 9562 | #: builtin/grep.c:898 |
ef317cd5 | 9563 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 9564 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 9565 | |
31e5e17b | 9566 | #: builtin/grep.c:962 |
c04f5ac3 JX |
9567 | msgid "no pattern given." |
9568 | msgstr "未提供模式匹配。" | |
9569 | ||
31e5e17b | 9570 | #: builtin/grep.c:994 |
87cb7997 JX |
9571 | msgid "--no-index or --untracked cannot be used with revs" |
9572 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
9573 | ||
31e5e17b | 9574 | #: builtin/grep.c:1001 |
87cb7997 JX |
9575 | #, c-format |
9576 | msgid "unable to resolve revision: %s" | |
9577 | msgstr "不能解析版本:%s" | |
9578 | ||
fd8cb379 | 9579 | #: builtin/grep.c:1036 builtin/index-pack.c:1531 |
276ceeaa JX |
9580 | #, c-format |
9581 | msgid "invalid number of threads specified (%d)" | |
9582 | msgstr "指定的线程数无效(%d)" | |
9583 | ||
31e5e17b | 9584 | #: builtin/grep.c:1041 |
a4f16749 JX |
9585 | msgid "no threads support, ignoring --threads" |
9586 | msgstr "没有线程支持,忽略 --threads" | |
9587 | ||
31e5e17b | 9588 | #: builtin/grep.c:1065 |
c04f5ac3 JX |
9589 | msgid "--open-files-in-pager only works on the worktree" |
9590 | msgstr "--open-files-in-pager 仅用于工作区" | |
9591 | ||
31e5e17b | 9592 | #: builtin/grep.c:1088 |
1a79b2f1 JX |
9593 | msgid "option not supported with --recurse-submodules." |
9594 | msgstr "选项不支持和 --recurse-submodules 共用。" | |
9595 | ||
31e5e17b | 9596 | #: builtin/grep.c:1094 |
c04f5ac3 | 9597 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 9598 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 9599 | |
31e5e17b | 9600 | #: builtin/grep.c:1100 |
c04f5ac3 | 9601 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 9602 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 9603 | |
31e5e17b | 9604 | #: builtin/grep.c:1108 |
c04f5ac3 JX |
9605 | msgid "both --cached and trees are given." |
9606 | msgstr "同时给出了 --cached 和树对象。" | |
9607 | ||
31e5e17b | 9608 | #: builtin/hash-object.c:83 |
ef317cd5 | 9609 | msgid "" |
814ff314 JX |
9610 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
9611 | "[--] <file>..." | |
ef317cd5 | 9612 | msgstr "" |
814ff314 JX |
9613 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
9614 | "[--] <文件>..." | |
ef317cd5 | 9615 | |
31e5e17b | 9616 | #: builtin/hash-object.c:84 |
94550ed3 JX |
9617 | msgid "git hash-object --stdin-paths" |
9618 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 9619 | |
31e5e17b | 9620 | #: builtin/hash-object.c:96 |
ef317cd5 | 9621 | msgid "type" |
07432cef | 9622 | msgstr "类型" |
ef317cd5 | 9623 | |
31e5e17b | 9624 | #: builtin/hash-object.c:96 |
ef317cd5 | 9625 | msgid "object type" |
07432cef | 9626 | msgstr "对象类型" |
ef317cd5 | 9627 | |
31e5e17b | 9628 | #: builtin/hash-object.c:97 |
ef317cd5 | 9629 | msgid "write the object into the object database" |
07432cef | 9630 | msgstr "将对象写入对象数据库" |
ef317cd5 | 9631 | |
31e5e17b | 9632 | #: builtin/hash-object.c:99 |
ef317cd5 | 9633 | msgid "read the object from stdin" |
07432cef | 9634 | msgstr "从标准输入读取对象" |
ef317cd5 | 9635 | |
31e5e17b | 9636 | #: builtin/hash-object.c:101 |
ef317cd5 | 9637 | msgid "store file as is without filters" |
07432cef | 9638 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 9639 | |
31e5e17b | 9640 | #: builtin/hash-object.c:102 |
220c313c JX |
9641 | msgid "" |
9642 | "just hash any random garbage to create corrupt objects for debugging Git" | |
9643 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
9644 | ||
31e5e17b | 9645 | #: builtin/hash-object.c:103 |
ef317cd5 | 9646 | msgid "process file as it were from this path" |
07432cef | 9647 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 9648 | |
fd8cb379 | 9649 | #: builtin/help.c:45 |
ef317cd5 | 9650 | msgid "print all available commands" |
07432cef | 9651 | msgstr "打印所有可用的命令" |
ef317cd5 | 9652 | |
fd8cb379 | 9653 | #: builtin/help.c:46 |
a0b6b246 JX |
9654 | msgid "exclude guides" |
9655 | msgstr "排除向导" | |
9656 | ||
fd8cb379 | 9657 | #: builtin/help.c:47 |
4dcdc3d8 JX |
9658 | msgid "print list of useful guides" |
9659 | msgstr "显示有用的指南列表" | |
9660 | ||
fd8cb379 | 9661 | #: builtin/help.c:48 |
ef317cd5 | 9662 | msgid "show man page" |
07432cef | 9663 | msgstr "显示 man 手册" |
ef317cd5 | 9664 | |
fd8cb379 | 9665 | #: builtin/help.c:49 |
ef317cd5 | 9666 | msgid "show manual in web browser" |
07432cef | 9667 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 9668 | |
fd8cb379 | 9669 | #: builtin/help.c:51 |
ef317cd5 | 9670 | msgid "show info page" |
07432cef | 9671 | msgstr "显示 info 手册" |
ef317cd5 | 9672 | |
fd8cb379 JX |
9673 | #: builtin/help.c:53 |
9674 | msgid "print command description" | |
9675 | msgstr "打印命令描述" | |
9676 | ||
9677 | #: builtin/help.c:58 | |
814ff314 JX |
9678 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
9679 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 9680 | |
fd8cb379 | 9681 | #: builtin/help.c:70 |
81809b99 | 9682 | #, c-format |
8ada9598 | 9683 | msgid "unrecognized help format '%s'" |
81809b99 | 9684 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 9685 | |
fd8cb379 | 9686 | #: builtin/help.c:97 |
8ada9598 | 9687 | msgid "Failed to start emacsclient." |
81809b99 | 9688 | msgstr "无法启动 emacsclient。" |
8ada9598 | 9689 | |
fd8cb379 | 9690 | #: builtin/help.c:110 |
8ada9598 | 9691 | msgid "Failed to parse emacsclient version." |
81809b99 | 9692 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 9693 | |
fd8cb379 | 9694 | #: builtin/help.c:118 |
8ada9598 JX |
9695 | #, c-format |
9696 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 9697 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 9698 | |
fd8cb379 | 9699 | #: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176 |
81809b99 | 9700 | #, c-format |
5b04ee3b JX |
9701 | msgid "failed to exec '%s'" |
9702 | msgstr "无法执行 '%s'" | |
8ada9598 | 9703 | |
fd8cb379 | 9704 | #: builtin/help.c:214 |
8ada9598 JX |
9705 | #, c-format |
9706 | msgid "" | |
9707 | "'%s': path for unsupported man viewer.\n" | |
9708 | "Please consider using 'man.<tool>.cmd' instead." | |
9709 | msgstr "" | |
81809b99 | 9710 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 9711 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 9712 | |
fd8cb379 | 9713 | #: builtin/help.c:226 |
8ada9598 JX |
9714 | #, c-format |
9715 | msgid "" | |
9716 | "'%s': cmd for supported man viewer.\n" | |
9717 | "Please consider using 'man.<tool>.path' instead." | |
9718 | msgstr "" | |
81809b99 | 9719 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 9720 | "请使用 'man.<工具>.path'。" |
8ada9598 | 9721 | |
fd8cb379 | 9722 | #: builtin/help.c:343 |
8ada9598 JX |
9723 | #, c-format |
9724 | msgid "'%s': unknown man viewer." | |
81809b99 | 9725 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 9726 | |
fd8cb379 | 9727 | #: builtin/help.c:360 |
8ada9598 | 9728 | msgid "no man viewer handled the request" |
81809b99 | 9729 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 9730 | |
fd8cb379 | 9731 | #: builtin/help.c:368 |
8ada9598 | 9732 | msgid "no info viewer handled the request" |
81809b99 | 9733 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 9734 | |
fd8cb379 JX |
9735 | #: builtin/help.c:415 |
9736 | #, c-format | |
9737 | msgid "'%s' is aliased to '%s'" | |
9738 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 9739 | |
fd8cb379 JX |
9740 | #: builtin/help.c:442 builtin/help.c:459 |
9741 | #, c-format | |
9742 | msgid "usage: %s%s" | |
9743 | msgstr "用法:%s%s" | |
4dcdc3d8 | 9744 | |
fd8cb379 JX |
9745 | #: builtin/index-pack.c:158 |
9746 | #, c-format | |
9747 | msgid "unable to open %s" | |
9748 | msgstr "不能打开 %s" | |
4dcdc3d8 | 9749 | |
fd8cb379 | 9750 | #: builtin/index-pack.c:208 |
8ada9598 JX |
9751 | #, c-format |
9752 | msgid "object type mismatch at %s" | |
81809b99 | 9753 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 9754 | |
fd8cb379 | 9755 | #: builtin/index-pack.c:228 |
6acbf033 JX |
9756 | #, c-format |
9757 | msgid "did not receive expected object %s" | |
a0b6b246 | 9758 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 9759 | |
fd8cb379 | 9760 | #: builtin/index-pack.c:231 |
6acbf033 JX |
9761 | #, c-format |
9762 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 9763 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 9764 | |
fd8cb379 | 9765 | #: builtin/index-pack.c:273 |
81809b99 | 9766 | #, c-format |
8ada9598 JX |
9767 | msgid "cannot fill %d byte" |
9768 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 9769 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 9770 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 9771 | |
fd8cb379 | 9772 | #: builtin/index-pack.c:283 |
8ada9598 | 9773 | msgid "early EOF" |
81809b99 | 9774 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 9775 | |
fd8cb379 | 9776 | #: builtin/index-pack.c:284 |
8ada9598 | 9777 | msgid "read error on input" |
81809b99 | 9778 | msgstr "输入上的读错误" |
8ada9598 | 9779 | |
fd8cb379 | 9780 | #: builtin/index-pack.c:296 |
8ada9598 | 9781 | msgid "used more bytes than were available" |
81809b99 | 9782 | msgstr "用掉了超过可用的字节" |
8ada9598 | 9783 | |
fd8cb379 | 9784 | #: builtin/index-pack.c:303 |
8ada9598 | 9785 | msgid "pack too large for current definition of off_t" |
81809b99 | 9786 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 9787 | |
fd8cb379 | 9788 | #: builtin/index-pack.c:306 builtin/unpack-objects.c:93 |
a0b6b246 JX |
9789 | msgid "pack exceeds maximum allowed size" |
9790 | msgstr "包超过了最大允许值" | |
9791 | ||
fd8cb379 | 9792 | #: builtin/index-pack.c:321 |
81809b99 | 9793 | #, c-format |
8ada9598 | 9794 | msgid "unable to create '%s'" |
81809b99 | 9795 | msgstr "不能创建 '%s'" |
8ada9598 | 9796 | |
fd8cb379 | 9797 | #: builtin/index-pack.c:327 |
81809b99 | 9798 | #, c-format |
8ada9598 | 9799 | msgid "cannot open packfile '%s'" |
81809b99 | 9800 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 9801 | |
fd8cb379 | 9802 | #: builtin/index-pack.c:341 |
8ada9598 | 9803 | msgid "pack signature mismatch" |
81809b99 | 9804 | msgstr "包签名不匹配" |
8ada9598 | 9805 | |
fd8cb379 | 9806 | #: builtin/index-pack.c:343 |
ef317cd5 JX |
9807 | #, c-format |
9808 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 9809 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 9810 | |
fd8cb379 | 9811 | #: builtin/index-pack.c:361 |
8ada9598 | 9812 | #, c-format |
5c57d762 JX |
9813 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
9814 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 9815 | |
fd8cb379 | 9816 | #: builtin/index-pack.c:482 |
8ada9598 JX |
9817 | #, c-format |
9818 | msgid "inflate returned %d" | |
81809b99 | 9819 | msgstr "解压缩返回 %d" |
8ada9598 | 9820 | |
fd8cb379 | 9821 | #: builtin/index-pack.c:531 |
8ada9598 | 9822 | msgid "offset value overflow for delta base object" |
81809b99 | 9823 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 9824 | |
fd8cb379 | 9825 | #: builtin/index-pack.c:539 |
8ada9598 | 9826 | msgid "delta base offset is out of bound" |
81809b99 | 9827 | msgstr "delta 基准偏移越界" |
8ada9598 | 9828 | |
fd8cb379 | 9829 | #: builtin/index-pack.c:547 |
81809b99 | 9830 | #, c-format |
8ada9598 | 9831 | msgid "unknown object type %d" |
81809b99 | 9832 | msgstr "未知对象类型 %d" |
8ada9598 | 9833 | |
fd8cb379 | 9834 | #: builtin/index-pack.c:578 |
8ada9598 | 9835 | msgid "cannot pread pack file" |
81809b99 | 9836 | msgstr "无法读取包文件" |
8ada9598 | 9837 | |
fd8cb379 | 9838 | #: builtin/index-pack.c:580 |
8ada9598 | 9839 | #, c-format |
5c57d762 JX |
9840 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
9841 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
9842 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
9843 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 9844 | |
fd8cb379 | 9845 | #: builtin/index-pack.c:606 |
8ada9598 | 9846 | msgid "serious inflate inconsistency" |
81809b99 | 9847 | msgstr "解压缩严重的不一致" |
8ada9598 | 9848 | |
fd8cb379 JX |
9849 | #: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 |
9850 | #: builtin/index-pack.c:819 builtin/index-pack.c:828 | |
8ada9598 JX |
9851 | #, c-format |
9852 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 9853 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 9854 | |
fd8cb379 JX |
9855 | #: builtin/index-pack.c:754 builtin/pack-objects.c:198 |
9856 | #: builtin/pack-objects.c:292 | |
6792b93b JX |
9857 | #, c-format |
9858 | msgid "unable to read %s" | |
9859 | msgstr "不能读 %s" | |
9860 | ||
fd8cb379 | 9861 | #: builtin/index-pack.c:817 |
87cb7997 JX |
9862 | #, c-format |
9863 | msgid "cannot read existing object info %s" | |
9864 | msgstr "不能读取现存对象信息 %s" | |
9865 | ||
fd8cb379 | 9866 | #: builtin/index-pack.c:825 |
6792b93b JX |
9867 | #, c-format |
9868 | msgid "cannot read existing object %s" | |
9869 | msgstr "不能读取现存对象 %s" | |
9870 | ||
fd8cb379 | 9871 | #: builtin/index-pack.c:839 |
81809b99 | 9872 | #, c-format |
8ada9598 | 9873 | msgid "invalid blob object %s" |
160fb2b2 | 9874 | msgstr "无效的数据对象 %s" |
8ada9598 | 9875 | |
fd8cb379 JX |
9876 | #: builtin/index-pack.c:842 builtin/index-pack.c:860 |
9877 | msgid "fsck error in packed object" | |
9878 | msgstr "对打包对象 fsck 检查出错" | |
9879 | ||
9880 | #: builtin/index-pack.c:857 | |
81809b99 | 9881 | #, c-format |
8ada9598 | 9882 | msgid "invalid %s" |
81809b99 | 9883 | msgstr "无效的 %s" |
8ada9598 | 9884 | |
fd8cb379 | 9885 | #: builtin/index-pack.c:862 |
8ada9598 JX |
9886 | #, c-format |
9887 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 9888 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 9889 | |
fd8cb379 | 9890 | #: builtin/index-pack.c:934 builtin/index-pack.c:965 |
8ada9598 | 9891 | msgid "failed to apply delta" |
81809b99 | 9892 | msgstr "无法应用 delta" |
8ada9598 | 9893 | |
fd8cb379 | 9894 | #: builtin/index-pack.c:1135 |
8ada9598 | 9895 | msgid "Receiving objects" |
81809b99 | 9896 | msgstr "接收对象中" |
8ada9598 | 9897 | |
fd8cb379 | 9898 | #: builtin/index-pack.c:1135 |
8ada9598 | 9899 | msgid "Indexing objects" |
81809b99 | 9900 | msgstr "索引对象中" |
8ada9598 | 9901 | |
fd8cb379 | 9902 | #: builtin/index-pack.c:1169 |
8ada9598 | 9903 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 9904 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 9905 | |
fd8cb379 | 9906 | #: builtin/index-pack.c:1174 |
8ada9598 | 9907 | msgid "cannot fstat packfile" |
65e2041e | 9908 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 9909 | |
fd8cb379 | 9910 | #: builtin/index-pack.c:1177 |
8ada9598 | 9911 | msgid "pack has junk at the end" |
81809b99 | 9912 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 9913 | |
fd8cb379 | 9914 | #: builtin/index-pack.c:1189 |
6792b93b JX |
9915 | msgid "confusion beyond insanity in parse_pack_objects()" |
9916 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
9917 | ||
fd8cb379 | 9918 | #: builtin/index-pack.c:1212 |
8ada9598 | 9919 | msgid "Resolving deltas" |
81809b99 | 9920 | msgstr "处理 delta 中" |
8ada9598 | 9921 | |
fd8cb379 | 9922 | #: builtin/index-pack.c:1223 |
07432cef | 9923 | #, c-format |
ef317cd5 | 9924 | msgid "unable to create thread: %s" |
07432cef | 9925 | msgstr "不能创建线程:%s" |
ef317cd5 | 9926 | |
fd8cb379 | 9927 | #: builtin/index-pack.c:1265 |
8ada9598 | 9928 | msgid "confusion beyond insanity" |
81809b99 | 9929 | msgstr "不可理喻" |
8ada9598 | 9930 | |
fd8cb379 | 9931 | #: builtin/index-pack.c:1271 |
ef317cd5 | 9932 | #, c-format |
5b04ee3b JX |
9933 | msgid "completed with %d local object" |
9934 | msgid_plural "completed with %d local objects" | |
9935 | msgstr[0] "完成 %d 个本地对象" | |
9936 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 9937 | |
fd8cb379 | 9938 | #: builtin/index-pack.c:1283 |
ef317cd5 JX |
9939 | #, c-format |
9940 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 9941 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 9942 | |
fd8cb379 | 9943 | #: builtin/index-pack.c:1287 |
8ada9598 JX |
9944 | #, c-format |
9945 | msgid "pack has %d unresolved delta" | |
9946 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 9947 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 9948 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 9949 | |
fd8cb379 | 9950 | #: builtin/index-pack.c:1311 |
81809b99 | 9951 | #, c-format |
8ada9598 | 9952 | msgid "unable to deflate appended object (%d)" |
07432cef | 9953 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 9954 | |
fd8cb379 | 9955 | #: builtin/index-pack.c:1388 |
8ada9598 JX |
9956 | #, c-format |
9957 | msgid "local object %s is corrupt" | |
81809b99 | 9958 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 9959 | |
fd8cb379 | 9960 | #: builtin/index-pack.c:1402 |
31e5e17b JX |
9961 | #, c-format |
9962 | msgid "packfile name '%s' does not end with '.pack'" | |
9963 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 9964 | |
fd8cb379 | 9965 | #: builtin/index-pack.c:1427 |
81809b99 | 9966 | #, c-format |
31e5e17b JX |
9967 | msgid "cannot write %s file '%s'" |
9968 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 9969 | |
fd8cb379 | 9970 | #: builtin/index-pack.c:1435 |
81809b99 | 9971 | #, c-format |
31e5e17b JX |
9972 | msgid "cannot close written %s file '%s'" |
9973 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
9974 | ||
fd8cb379 | 9975 | #: builtin/index-pack.c:1459 |
31e5e17b JX |
9976 | msgid "error while closing pack file" |
9977 | msgstr "关闭包文件时出错" | |
8ada9598 | 9978 | |
fd8cb379 | 9979 | #: builtin/index-pack.c:1473 |
8ada9598 | 9980 | msgid "cannot store pack file" |
81809b99 | 9981 | msgstr "无法存储包文件" |
8ada9598 | 9982 | |
fd8cb379 | 9983 | #: builtin/index-pack.c:1481 |
8ada9598 | 9984 | msgid "cannot store index file" |
81809b99 | 9985 | msgstr "无法存储索引文件" |
8ada9598 | 9986 | |
fd8cb379 | 9987 | #: builtin/index-pack.c:1525 |
07432cef | 9988 | #, c-format |
ef317cd5 | 9989 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 9990 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 9991 | |
fd8cb379 | 9992 | #: builtin/index-pack.c:1594 |
81809b99 | 9993 | #, c-format |
8ada9598 | 9994 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 9995 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 9996 | |
fd8cb379 | 9997 | #: builtin/index-pack.c:1596 |
81809b99 | 9998 | #, c-format |
8ada9598 | 9999 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 10000 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 10001 | |
fd8cb379 | 10002 | #: builtin/index-pack.c:1644 |
81809b99 | 10003 | #, c-format |
8ada9598 JX |
10004 | msgid "non delta: %d object" |
10005 | msgid_plural "non delta: %d objects" | |
81809b99 | 10006 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 10007 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 10008 | |
fd8cb379 | 10009 | #: builtin/index-pack.c:1651 |
8ada9598 JX |
10010 | #, c-format |
10011 | msgid "chain length = %d: %lu object" | |
10012 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 10013 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 10014 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 10015 | |
fd8cb379 | 10016 | #: builtin/index-pack.c:1688 |
31e5e17b JX |
10017 | msgid "Cannot come back to cwd" |
10018 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 10019 | |
fd8cb379 JX |
10020 | #: builtin/index-pack.c:1739 builtin/index-pack.c:1742 |
10021 | #: builtin/index-pack.c:1758 builtin/index-pack.c:1762 | |
81809b99 | 10022 | #, c-format |
8ada9598 | 10023 | msgid "bad %s" |
81809b99 | 10024 | msgstr "错误选项 %s" |
8ada9598 | 10025 | |
fd8cb379 | 10026 | #: builtin/index-pack.c:1778 |
8ada9598 | 10027 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 10028 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 10029 | |
fd8cb379 | 10030 | #: builtin/index-pack.c:1780 |
1a79b2f1 JX |
10031 | msgid "--stdin requires a git repository" |
10032 | msgstr "--stdin 需要一个 git 仓库" | |
10033 | ||
fd8cb379 | 10034 | #: builtin/index-pack.c:1786 |
8ada9598 | 10035 | msgid "--verify with no packfile name given" |
dbd6cced | 10036 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 10037 | |
fd8cb379 JX |
10038 | #: builtin/index-pack.c:1836 builtin/unpack-objects.c:578 |
10039 | msgid "fsck error in pack objects" | |
10040 | msgstr "在打包对象中 fsck 检查出错" | |
10041 | ||
a4f16749 | 10042 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
10043 | #, c-format |
10044 | msgid "cannot stat '%s'" | |
65e2041e | 10045 | msgstr "不能对 '%s' 调用 stat" |
c04f5ac3 | 10046 | |
a4f16749 | 10047 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
10048 | #, c-format |
10049 | msgid "cannot stat template '%s'" | |
65e2041e | 10050 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 10051 | |
a4f16749 | 10052 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
10053 | #, c-format |
10054 | msgid "cannot opendir '%s'" | |
10055 | msgstr "不能打开目录 '%s'" | |
10056 | ||
a4f16749 | 10057 | #: builtin/init-db.c:77 |
c04f5ac3 JX |
10058 | #, c-format |
10059 | msgid "cannot readlink '%s'" | |
10060 | msgstr "不能读取链接 '%s'" | |
10061 | ||
a4f16749 | 10062 | #: builtin/init-db.c:79 |
c04f5ac3 JX |
10063 | #, c-format |
10064 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 10065 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 10066 | |
a4f16749 | 10067 | #: builtin/init-db.c:85 |
c04f5ac3 JX |
10068 | #, c-format |
10069 | msgid "cannot copy '%s' to '%s'" | |
10070 | msgstr "不能拷贝 '%s' 至 '%s'" | |
10071 | ||
a4f16749 | 10072 | #: builtin/init-db.c:89 |
c04f5ac3 JX |
10073 | #, c-format |
10074 | msgid "ignoring template %s" | |
10075 | msgstr "忽略模版 %s" | |
10076 | ||
a4f16749 | 10077 | #: builtin/init-db.c:120 |
c04f5ac3 | 10078 | #, c-format |
fd8cb379 JX |
10079 | msgid "templates not found in %s" |
10080 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 10081 | |
a4f16749 | 10082 | #: builtin/init-db.c:135 |
c04f5ac3 | 10083 | #, c-format |
5b04ee3b JX |
10084 | msgid "not copying templates from '%s': %s" |
10085 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 10086 | |
a4f16749 | 10087 | #: builtin/init-db.c:328 |
c04f5ac3 JX |
10088 | #, c-format |
10089 | msgid "unable to handle file type %d" | |
10090 | msgstr "不能处理 %d 类型的文件" | |
10091 | ||
a4f16749 | 10092 | #: builtin/init-db.c:331 |
c04f5ac3 JX |
10093 | #, c-format |
10094 | msgid "unable to move %s to %s" | |
10095 | msgstr "不能移动 %s 至 %s" | |
10096 | ||
a4f16749 | 10097 | #: builtin/init-db.c:348 builtin/init-db.c:351 |
a0b6b246 JX |
10098 | #, c-format |
10099 | msgid "%s already exists" | |
10100 | msgstr "%s 已经存在" | |
10101 | ||
a4f16749 | 10102 | #: builtin/init-db.c:404 |
c04f5ac3 | 10103 | #, c-format |
5c57d762 JX |
10104 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
10105 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 10106 | |
a4f16749 | 10107 | #: builtin/init-db.c:405 |
5c57d762 JX |
10108 | #, c-format |
10109 | msgid "Reinitialized existing Git repository in %s%s\n" | |
10110 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 10111 | |
a4f16749 | 10112 | #: builtin/init-db.c:409 |
5c57d762 JX |
10113 | #, c-format |
10114 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 10115 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 10116 | |
a4f16749 | 10117 | #: builtin/init-db.c:410 |
5c57d762 JX |
10118 | #, c-format |
10119 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 10120 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 10121 | |
a4f16749 | 10122 | #: builtin/init-db.c:458 |
ef317cd5 | 10123 | msgid "" |
a77c07d9 | 10124 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 10125 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 10126 | msgstr "" |
07432cef | 10127 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 10128 | "[<目录>]" |
ef317cd5 | 10129 | |
a4f16749 | 10130 | #: builtin/init-db.c:481 |
ef317cd5 | 10131 | msgid "permissions" |
07432cef | 10132 | msgstr "权限" |
ef317cd5 | 10133 | |
a4f16749 | 10134 | #: builtin/init-db.c:482 |
ef317cd5 | 10135 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 10136 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 10137 | |
a4f16749 | 10138 | #: builtin/init-db.c:525 |
c04f5ac3 JX |
10139 | #, c-format |
10140 | msgid "cannot chdir to %s" | |
10141 | msgstr "不能切换目录到 %s" | |
10142 | ||
a4f16749 | 10143 | #: builtin/init-db.c:546 |
c04f5ac3 JX |
10144 | #, c-format |
10145 | msgid "" | |
10146 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
10147 | "dir=<directory>)" | |
1e607449 | 10148 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 10149 | |
a4f16749 | 10150 | #: builtin/init-db.c:574 |
c04f5ac3 JX |
10151 | #, c-format |
10152 | msgid "Cannot access work tree '%s'" | |
10153 | msgstr "不能访问工作区 '%s'" | |
10154 | ||
220c313c JX |
10155 | #: builtin/interpret-trailers.c:15 |
10156 | msgid "" | |
276ceeaa JX |
10157 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
10158 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
10159 | msgstr "" |
10160 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
10161 | ">])...] [<文件>...]" | |
276ceeaa | 10162 | |
6937cb4e | 10163 | #: builtin/interpret-trailers.c:92 |
276ceeaa JX |
10164 | msgid "edit files in place" |
10165 | msgstr "在原位编辑文件" | |
220c313c | 10166 | |
6937cb4e | 10167 | #: builtin/interpret-trailers.c:93 |
220c313c | 10168 | msgid "trim empty trailers" |
6937cb4e JX |
10169 | msgstr "删除空的尾部署名" |
10170 | ||
10171 | #: builtin/interpret-trailers.c:96 | |
10172 | msgid "where to place the new trailer" | |
10173 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 10174 | |
6937cb4e JX |
10175 | #: builtin/interpret-trailers.c:98 |
10176 | msgid "action if trailer already exists" | |
10177 | msgstr "当尾部署名已经存在时所采取的动作" | |
10178 | ||
10179 | #: builtin/interpret-trailers.c:100 | |
10180 | msgid "action if trailer is missing" | |
10181 | msgstr "当尾部署名缺失时所采取的动作" | |
10182 | ||
10183 | #: builtin/interpret-trailers.c:102 | |
10184 | msgid "output only the trailers" | |
10185 | msgstr "只输出尾部署名" | |
10186 | ||
10187 | #: builtin/interpret-trailers.c:103 | |
10188 | msgid "do not apply config rules" | |
10189 | msgstr "不要应用配置规则" | |
10190 | ||
10191 | #: builtin/interpret-trailers.c:104 | |
10192 | msgid "join whitespace-continued values" | |
10193 | msgstr "连接空白折行的值" | |
10194 | ||
10195 | #: builtin/interpret-trailers.c:105 | |
10196 | msgid "set parsing options" | |
10197 | msgstr "设置解析选项" | |
10198 | ||
10199 | #: builtin/interpret-trailers.c:107 | |
220c313c | 10200 | msgid "trailer" |
6937cb4e | 10201 | msgstr "尾部署名" |
220c313c | 10202 | |
6937cb4e | 10203 | #: builtin/interpret-trailers.c:108 |
220c313c | 10204 | msgid "trailer(s) to add" |
6937cb4e | 10205 | msgstr "要添加的尾部署名" |
220c313c | 10206 | |
6937cb4e JX |
10207 | #: builtin/interpret-trailers.c:117 |
10208 | msgid "--trailer with --only-input does not make sense" | |
10209 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
10210 | ||
10211 | #: builtin/interpret-trailers.c:127 | |
276ceeaa JX |
10212 | msgid "no input file given for in-place editing" |
10213 | msgstr "没有给出要原位编辑的文件" | |
10214 | ||
31e5e17b | 10215 | #: builtin/log.c:48 |
7aea43ff | 10216 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 10217 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 10218 | |
31e5e17b | 10219 | #: builtin/log.c:49 |
814ff314 JX |
10220 | msgid "git show [<options>] <object>..." |
10221 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 10222 | |
31e5e17b | 10223 | #: builtin/log.c:93 |
220c313c JX |
10224 | #, c-format |
10225 | msgid "invalid --decorate option: %s" | |
10226 | msgstr "无效的 --decorate 选项:%s" | |
10227 | ||
31e5e17b | 10228 | #: builtin/log.c:153 |
ef317cd5 | 10229 | msgid "suppress diff output" |
07432cef | 10230 | msgstr "不显示差异输出" |
ef317cd5 | 10231 | |
31e5e17b | 10232 | #: builtin/log.c:154 |
ef317cd5 | 10233 | msgid "show source" |
07432cef | 10234 | msgstr "显示源" |
ef317cd5 | 10235 | |
31e5e17b | 10236 | #: builtin/log.c:155 |
07432cef WS |
10237 | msgid "Use mail map file" |
10238 | msgstr "使用邮件映射文件" | |
10239 | ||
31e5e17b | 10240 | #: builtin/log.c:157 |
5809aa05 JX |
10241 | msgid "only decorate refs that match <pattern>" |
10242 | msgstr "只修饰与 <模式> 匹配的引用" | |
10243 | ||
31e5e17b | 10244 | #: builtin/log.c:159 |
5809aa05 JX |
10245 | msgid "do not decorate refs that match <pattern>" |
10246 | msgstr "不修饰和 <模式> 匹配的引用" | |
10247 | ||
31e5e17b | 10248 | #: builtin/log.c:160 |
ef317cd5 | 10249 | msgid "decorate options" |
07432cef | 10250 | msgstr "修饰选项" |
ef317cd5 | 10251 | |
31e5e17b | 10252 | #: builtin/log.c:163 |
220c313c JX |
10253 | msgid "Process line range n,m in file, counting from 1" |
10254 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
10255 | ||
31e5e17b | 10256 | #: builtin/log.c:259 |
c04f5ac3 JX |
10257 | #, c-format |
10258 | msgid "Final output: %d %s\n" | |
10259 | msgstr "最终输出:%d %s\n" | |
10260 | ||
31e5e17b | 10261 | #: builtin/log.c:510 |
220c313c JX |
10262 | #, c-format |
10263 | msgid "git show %s: bad file" | |
10264 | msgstr "git show %s: 损坏的文件" | |
10265 | ||
31e5e17b | 10266 | #: builtin/log.c:525 builtin/log.c:619 |
c04f5ac3 JX |
10267 | #, c-format |
10268 | msgid "Could not read object %s" | |
90e6ef53 | 10269 | msgstr "不能读取对象 %s" |
c04f5ac3 | 10270 | |
31e5e17b | 10271 | #: builtin/log.c:643 |
c04f5ac3 JX |
10272 | #, c-format |
10273 | msgid "Unknown type: %d" | |
10274 | msgstr "未知类型:%d" | |
10275 | ||
31e5e17b | 10276 | #: builtin/log.c:764 |
c04f5ac3 JX |
10277 | msgid "format.headers without value" |
10278 | msgstr "format.headers 没有值" | |
10279 | ||
31e5e17b | 10280 | #: builtin/log.c:865 |
c04f5ac3 JX |
10281 | msgid "name of output directory is too long" |
10282 | msgstr "输出目录名太长" | |
10283 | ||
31e5e17b | 10284 | #: builtin/log.c:881 |
c04f5ac3 JX |
10285 | #, c-format |
10286 | msgid "Cannot open patch file %s" | |
10287 | msgstr "无法打开补丁文件 %s" | |
10288 | ||
31e5e17b | 10289 | #: builtin/log.c:898 |
c04f5ac3 JX |
10290 | msgid "Need exactly one range." |
10291 | msgstr "只需要一个范围。" | |
10292 | ||
31e5e17b | 10293 | #: builtin/log.c:908 |
c04f5ac3 JX |
10294 | msgid "Not a range." |
10295 | msgstr "不是一个范围。" | |
10296 | ||
31e5e17b | 10297 | #: builtin/log.c:1014 |
c04f5ac3 JX |
10298 | msgid "Cover letter needs email format" |
10299 | msgstr "信封需要邮件地址格式" | |
10300 | ||
31e5e17b | 10301 | #: builtin/log.c:1095 |
c04f5ac3 JX |
10302 | #, c-format |
10303 | msgid "insane in-reply-to: %s" | |
10304 | msgstr "不正常的 in-reply-to:%s" | |
10305 | ||
31e5e17b | 10306 | #: builtin/log.c:1122 |
814ff314 JX |
10307 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
10308 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 10309 | |
31e5e17b | 10310 | #: builtin/log.c:1172 |
c04f5ac3 JX |
10311 | msgid "Two output directories?" |
10312 | msgstr "两个输出目录?" | |
10313 | ||
31e5e17b | 10314 | #: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 |
5b04ee3b JX |
10315 | #, c-format |
10316 | msgid "Unknown commit %s" | |
10317 | msgstr "未知提交 %s" | |
10318 | ||
fd8cb379 | 10319 | #: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 |
5b04ee3b JX |
10320 | #, c-format |
10321 | msgid "Failed to resolve '%s' as a valid ref." | |
10322 | msgstr "无法解析 '%s' 为一个有效引用。" | |
10323 | ||
31e5e17b | 10324 | #: builtin/log.c:1294 |
5b04ee3b JX |
10325 | msgid "Could not find exact merge base." |
10326 | msgstr "不能找到准确的合并基线。" | |
10327 | ||
31e5e17b | 10328 | #: builtin/log.c:1298 |
5b04ee3b JX |
10329 | msgid "" |
10330 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
10331 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
10332 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
10333 | msgstr "" | |
10334 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 10335 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
58b6f078 | 10336 | "参数 --base=<基线提交> 手动指定一个基线提交。" |
5b04ee3b | 10337 | |
31e5e17b | 10338 | #: builtin/log.c:1318 |
5b04ee3b JX |
10339 | msgid "Failed to find exact merge base" |
10340 | msgstr "无法找到准确的合并基线" | |
10341 | ||
31e5e17b | 10342 | #: builtin/log.c:1329 |
5b04ee3b JX |
10343 | msgid "base commit should be the ancestor of revision list" |
10344 | msgstr "基线提交应该是版本列表的祖先" | |
10345 | ||
31e5e17b | 10346 | #: builtin/log.c:1333 |
5b04ee3b JX |
10347 | msgid "base commit shouldn't be in revision list" |
10348 | msgstr "基线提交不应该出现在版本列表中" | |
10349 | ||
31e5e17b | 10350 | #: builtin/log.c:1382 |
5b04ee3b | 10351 | msgid "cannot get patch id" |
aef18cc6 | 10352 | msgstr "无法得到补丁 id" |
5b04ee3b | 10353 | |
31e5e17b | 10354 | #: builtin/log.c:1441 |
ef317cd5 | 10355 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 10356 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 10357 | |
31e5e17b | 10358 | #: builtin/log.c:1444 |
ef317cd5 | 10359 | msgid "use [PATCH] even with multiple patches" |
07432cef | 10360 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 10361 | |
31e5e17b | 10362 | #: builtin/log.c:1448 |
ef317cd5 | 10363 | msgid "print patches to standard out" |
07432cef | 10364 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 10365 | |
31e5e17b | 10366 | #: builtin/log.c:1450 |
ef317cd5 | 10367 | msgid "generate a cover letter" |
07432cef | 10368 | msgstr "生成一封附信" |
c04f5ac3 | 10369 | |
31e5e17b | 10370 | #: builtin/log.c:1452 |
ef317cd5 | 10371 | msgid "use simple number sequence for output file names" |
07432cef | 10372 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 10373 | |
31e5e17b | 10374 | #: builtin/log.c:1453 |
ef317cd5 | 10375 | msgid "sfx" |
07432cef | 10376 | msgstr "后缀" |
ef317cd5 | 10377 | |
31e5e17b | 10378 | #: builtin/log.c:1454 |
ef317cd5 | 10379 | msgid "use <sfx> instead of '.patch'" |
07432cef | 10380 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 10381 | |
31e5e17b | 10382 | #: builtin/log.c:1456 |
ef317cd5 | 10383 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
10384 | msgstr "补丁以 <n> 开始编号,而不是1" |
10385 | ||
31e5e17b | 10386 | #: builtin/log.c:1458 |
07432cef WS |
10387 | msgid "mark the series as Nth re-roll" |
10388 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 10389 | |
31e5e17b | 10390 | #: builtin/log.c:1460 |
a0b6b246 JX |
10391 | msgid "Use [RFC PATCH] instead of [PATCH]" |
10392 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
10393 | ||
31e5e17b | 10394 | #: builtin/log.c:1463 |
ef317cd5 | 10395 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 10396 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 10397 | |
31e5e17b | 10398 | #: builtin/log.c:1466 |
ef317cd5 | 10399 | msgid "store resulting files in <dir>" |
d9d56b23 | 10400 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 10401 | |
31e5e17b | 10402 | #: builtin/log.c:1469 |
ef317cd5 | 10403 | msgid "don't strip/add [PATCH]" |
07432cef | 10404 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 10405 | |
31e5e17b | 10406 | #: builtin/log.c:1472 |
ef317cd5 | 10407 | msgid "don't output binary diffs" |
07432cef | 10408 | msgstr "不输出二进制差异" |
ef317cd5 | 10409 | |
31e5e17b | 10410 | #: builtin/log.c:1474 |
89f80d72 JX |
10411 | msgid "output all-zero hash in From header" |
10412 | msgstr "在 From 头信息中输出全为零的哈希值" | |
10413 | ||
31e5e17b | 10414 | #: builtin/log.c:1476 |
ef317cd5 | 10415 | msgid "don't include a patch matching a commit upstream" |
07432cef | 10416 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 10417 | |
31e5e17b | 10418 | #: builtin/log.c:1478 |
ef317cd5 | 10419 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 10420 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 10421 | |
31e5e17b | 10422 | #: builtin/log.c:1480 |
ef317cd5 | 10423 | msgid "Messaging" |
07432cef | 10424 | msgstr "邮件发送" |
ef317cd5 | 10425 | |
31e5e17b | 10426 | #: builtin/log.c:1481 |
ef317cd5 | 10427 | msgid "header" |
07432cef | 10428 | msgstr "header" |
ef317cd5 | 10429 | |
31e5e17b | 10430 | #: builtin/log.c:1482 |
ef317cd5 | 10431 | msgid "add email header" |
07432cef | 10432 | msgstr "添加邮件头" |
ef317cd5 | 10433 | |
31e5e17b | 10434 | #: builtin/log.c:1483 builtin/log.c:1485 |
ef317cd5 | 10435 | msgid "email" |
07432cef | 10436 | msgstr "邮件地址" |
ef317cd5 | 10437 | |
31e5e17b | 10438 | #: builtin/log.c:1483 |
ef317cd5 | 10439 | msgid "add To: header" |
07432cef | 10440 | msgstr "添加收件人" |
ef317cd5 | 10441 | |
31e5e17b | 10442 | #: builtin/log.c:1485 |
ef317cd5 | 10443 | msgid "add Cc: header" |
07432cef | 10444 | msgstr "添加抄送" |
ef317cd5 | 10445 | |
31e5e17b | 10446 | #: builtin/log.c:1487 |
2e8451e8 | 10447 | msgid "ident" |
d9d56b23 | 10448 | msgstr "标识" |
2e8451e8 | 10449 | |
31e5e17b | 10450 | #: builtin/log.c:1488 |
2e8451e8 | 10451 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 10452 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 10453 | |
31e5e17b | 10454 | #: builtin/log.c:1490 |
ef317cd5 | 10455 | msgid "message-id" |
d9d56b23 | 10456 | msgstr "邮件标识" |
ef317cd5 | 10457 | |
31e5e17b | 10458 | #: builtin/log.c:1491 |
ef317cd5 | 10459 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 10460 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 10461 | |
31e5e17b | 10462 | #: builtin/log.c:1492 builtin/log.c:1495 |
ef317cd5 | 10463 | msgid "boundary" |
07432cef | 10464 | msgstr "边界" |
ef317cd5 | 10465 | |
31e5e17b | 10466 | #: builtin/log.c:1493 |
ef317cd5 | 10467 | msgid "attach the patch" |
07432cef | 10468 | msgstr "附件方式添加补丁" |
ef317cd5 | 10469 | |
31e5e17b | 10470 | #: builtin/log.c:1496 |
ef317cd5 | 10471 | msgid "inline the patch" |
07432cef | 10472 | msgstr "内联显示补丁" |
ef317cd5 | 10473 | |
31e5e17b | 10474 | #: builtin/log.c:1500 |
ef317cd5 | 10475 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 10476 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 10477 | |
31e5e17b | 10478 | #: builtin/log.c:1502 |
ef317cd5 | 10479 | msgid "signature" |
07432cef | 10480 | msgstr "签名" |
ef317cd5 | 10481 | |
31e5e17b | 10482 | #: builtin/log.c:1503 |
ef317cd5 | 10483 | msgid "add a signature" |
07432cef | 10484 | msgstr "添加一个签名" |
ef317cd5 | 10485 | |
31e5e17b | 10486 | #: builtin/log.c:1504 |
5b04ee3b JX |
10487 | msgid "base-commit" |
10488 | msgstr "基线提交" | |
10489 | ||
31e5e17b | 10490 | #: builtin/log.c:1505 |
5b04ee3b JX |
10491 | msgid "add prerequisite tree info to the patch series" |
10492 | msgstr "为补丁列表添加前置树信息" | |
10493 | ||
31e5e17b | 10494 | #: builtin/log.c:1507 |
6acbf033 JX |
10495 | msgid "add a signature from a file" |
10496 | msgstr "从文件添加一个签名" | |
10497 | ||
31e5e17b | 10498 | #: builtin/log.c:1508 |
ef317cd5 | 10499 | msgid "don't print the patch filenames" |
07432cef | 10500 | msgstr "不要打印补丁文件名" |
ef317cd5 | 10501 | |
31e5e17b | 10502 | #: builtin/log.c:1510 |
6937cb4e JX |
10503 | msgid "show progress while generating patches" |
10504 | msgstr "在生成补丁时显示进度" | |
10505 | ||
31e5e17b | 10506 | #: builtin/log.c:1585 |
a4f16749 JX |
10507 | #, c-format |
10508 | msgid "invalid ident line: %s" | |
10509 | msgstr "包含无效的身份标识:%s" | |
10510 | ||
31e5e17b | 10511 | #: builtin/log.c:1600 |
c04f5ac3 JX |
10512 | msgid "-n and -k are mutually exclusive." |
10513 | msgstr "-n 和 -k 互斥。" | |
10514 | ||
31e5e17b | 10515 | #: builtin/log.c:1602 |
a0b6b246 JX |
10516 | msgid "--subject-prefix/--rfc and -k are mutually exclusive." |
10517 | msgstr "--subject-prefix/--rfc 和 -k 互斥。" | |
c04f5ac3 | 10518 | |
31e5e17b | 10519 | #: builtin/log.c:1610 |
c04f5ac3 JX |
10520 | msgid "--name-only does not make sense" |
10521 | msgstr "--name-only 无意义" | |
10522 | ||
31e5e17b | 10523 | #: builtin/log.c:1612 |
c04f5ac3 JX |
10524 | msgid "--name-status does not make sense" |
10525 | msgstr "--name-status 无意义" | |
10526 | ||
31e5e17b | 10527 | #: builtin/log.c:1614 |
c04f5ac3 JX |
10528 | msgid "--check does not make sense" |
10529 | msgstr "--check 无意义" | |
10530 | ||
31e5e17b | 10531 | #: builtin/log.c:1646 |
c04f5ac3 JX |
10532 | msgid "standard output, or directory, which one?" |
10533 | msgstr "标准输出或目录,哪一个?" | |
10534 | ||
31e5e17b | 10535 | #: builtin/log.c:1648 |
c04f5ac3 JX |
10536 | #, c-format |
10537 | msgid "Could not create directory '%s'" | |
90e6ef53 | 10538 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 10539 | |
31e5e17b | 10540 | #: builtin/log.c:1741 |
6acbf033 JX |
10541 | #, c-format |
10542 | msgid "unable to read signature file '%s'" | |
10543 | msgstr "无法读取签名文件 '%s'" | |
10544 | ||
31e5e17b | 10545 | #: builtin/log.c:1773 |
6937cb4e JX |
10546 | msgid "Generating patches" |
10547 | msgstr "生成补丁" | |
10548 | ||
31e5e17b | 10549 | #: builtin/log.c:1817 |
c04f5ac3 JX |
10550 | msgid "Failed to create output files" |
10551 | msgstr "无法创建输出文件" | |
10552 | ||
31e5e17b | 10553 | #: builtin/log.c:1867 |
ef317cd5 | 10554 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 10555 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 10556 | |
31e5e17b | 10557 | #: builtin/log.c:1921 |
c04f5ac3 JX |
10558 | #, c-format |
10559 | msgid "" | |
10560 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 10561 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 10562 | |
5809aa05 | 10563 | #: builtin/ls-files.c:468 |
814ff314 JX |
10564 | msgid "git ls-files [<options>] [<file>...]" |
10565 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 10566 | |
5809aa05 | 10567 | #: builtin/ls-files.c:517 |
ef317cd5 | 10568 | msgid "identify the file status with tags" |
07432cef | 10569 | msgstr "用标签标识文件的状态" |
ef317cd5 | 10570 | |
5809aa05 | 10571 | #: builtin/ls-files.c:519 |
ef317cd5 | 10572 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 10573 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 10574 | |
5809aa05 JX |
10575 | #: builtin/ls-files.c:521 |
10576 | msgid "use lowercase letters for 'fsmonitor clean' files" | |
10577 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
10578 | ||
10579 | #: builtin/ls-files.c:523 | |
ef317cd5 | 10580 | msgid "show cached files in the output (default)" |
07432cef | 10581 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 10582 | |
5809aa05 | 10583 | #: builtin/ls-files.c:525 |
ef317cd5 | 10584 | msgid "show deleted files in the output" |
07432cef | 10585 | msgstr "显示已删除的文件" |
ef317cd5 | 10586 | |
5809aa05 | 10587 | #: builtin/ls-files.c:527 |
ef317cd5 | 10588 | msgid "show modified files in the output" |
07432cef | 10589 | msgstr "显示已修改的文件" |
ef317cd5 | 10590 | |
5809aa05 | 10591 | #: builtin/ls-files.c:529 |
ef317cd5 | 10592 | msgid "show other files in the output" |
07432cef | 10593 | msgstr "显示其它文件" |
ef317cd5 | 10594 | |
5809aa05 | 10595 | #: builtin/ls-files.c:531 |
ef317cd5 | 10596 | msgid "show ignored files in the output" |
07432cef | 10597 | msgstr "显示忽略的文件" |
ef317cd5 | 10598 | |
5809aa05 | 10599 | #: builtin/ls-files.c:534 |
ef317cd5 | 10600 | msgid "show staged contents' object name in the output" |
07432cef | 10601 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 10602 | |
5809aa05 | 10603 | #: builtin/ls-files.c:536 |
ef317cd5 | 10604 | msgid "show files on the filesystem that need to be removed" |
07432cef | 10605 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 10606 | |
5809aa05 | 10607 | #: builtin/ls-files.c:538 |
220c313c | 10608 | msgid "show 'other' directories' names only" |
07432cef | 10609 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 10610 | |
5809aa05 | 10611 | #: builtin/ls-files.c:540 |
276ceeaa JX |
10612 | msgid "show line endings of files" |
10613 | msgstr "显示文件换行符格式" | |
10614 | ||
5809aa05 | 10615 | #: builtin/ls-files.c:542 |
ef317cd5 | 10616 | msgid "don't show empty directories" |
07432cef | 10617 | msgstr "不显示空目录" |
ef317cd5 | 10618 | |
5809aa05 | 10619 | #: builtin/ls-files.c:545 |
ef317cd5 | 10620 | msgid "show unmerged files in the output" |
07432cef | 10621 | msgstr "显示未合并的文件" |
ef317cd5 | 10622 | |
5809aa05 | 10623 | #: builtin/ls-files.c:547 |
ef317cd5 | 10624 | msgid "show resolve-undo information" |
07432cef | 10625 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 10626 | |
5809aa05 | 10627 | #: builtin/ls-files.c:549 |
ef317cd5 | 10628 | msgid "skip files matching pattern" |
07432cef | 10629 | msgstr "匹配排除文件的模式" |
ef317cd5 | 10630 | |
5809aa05 | 10631 | #: builtin/ls-files.c:552 |
ef317cd5 | 10632 | msgid "exclude patterns are read from <file>" |
07432cef | 10633 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 10634 | |
5809aa05 | 10635 | #: builtin/ls-files.c:555 |
ef317cd5 | 10636 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 10637 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 10638 | |
5809aa05 | 10639 | #: builtin/ls-files.c:557 |
ef317cd5 | 10640 | msgid "add the standard git exclusions" |
07432cef | 10641 | msgstr "添加标准的 git 排除" |
ef317cd5 | 10642 | |
5809aa05 | 10643 | #: builtin/ls-files.c:560 |
ef317cd5 | 10644 | msgid "make the output relative to the project top directory" |
07432cef | 10645 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 10646 | |
5809aa05 | 10647 | #: builtin/ls-files.c:563 |
a0b6b246 JX |
10648 | msgid "recurse through submodules" |
10649 | msgstr "在子模组中递归" | |
10650 | ||
5809aa05 | 10651 | #: builtin/ls-files.c:565 |
ef317cd5 | 10652 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 10653 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 10654 | |
5809aa05 | 10655 | #: builtin/ls-files.c:566 |
ef317cd5 | 10656 | msgid "tree-ish" |
07432cef | 10657 | msgstr "树或提交" |
ef317cd5 | 10658 | |
5809aa05 | 10659 | #: builtin/ls-files.c:567 |
ef317cd5 | 10660 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 10661 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 10662 | |
5809aa05 | 10663 | #: builtin/ls-files.c:569 |
ef317cd5 | 10664 | msgid "show debugging data" |
07432cef | 10665 | msgstr "显示调试数据" |
ef317cd5 | 10666 | |
fd8cb379 | 10667 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
10668 | msgid "" |
10669 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
10670 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
10671 | " [--symref] [<repository> [<refs>...]]" | |
10672 | msgstr "" | |
10673 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
10674 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
10675 | " [--symref] [<仓库> [<引用>...]]" | |
10676 | ||
fd8cb379 | 10677 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
10678 | msgid "do not print remote URL" |
10679 | msgstr "不打印远程 URL" | |
10680 | ||
fd8cb379 | 10681 | #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 |
276ceeaa JX |
10682 | msgid "exec" |
10683 | msgstr "exec" | |
10684 | ||
fd8cb379 | 10685 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 |
276ceeaa JX |
10686 | msgid "path of git-upload-pack on the remote host" |
10687 | msgstr "远程主机上的 git-upload-pack 路径" | |
10688 | ||
fd8cb379 | 10689 | #: builtin/ls-remote.c:65 |
276ceeaa JX |
10690 | msgid "limit to tags" |
10691 | msgstr "仅限于标签" | |
10692 | ||
fd8cb379 | 10693 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
10694 | msgid "limit to heads" |
10695 | msgstr "仅限于分支" | |
10696 | ||
fd8cb379 | 10697 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
10698 | msgid "do not show peeled tags" |
10699 | msgstr "不显示已解析的标签" | |
10700 | ||
fd8cb379 | 10701 | #: builtin/ls-remote.c:69 |
276ceeaa JX |
10702 | msgid "take url.<base>.insteadOf into account" |
10703 | msgstr "参考 url.<base>.insteadOf 设置" | |
10704 | ||
fd8cb379 | 10705 | #: builtin/ls-remote.c:73 |
276ceeaa JX |
10706 | msgid "exit with exit code 2 if no matching refs are found" |
10707 | msgstr "若未找到匹配的引用则以退出码2退出" | |
10708 | ||
fd8cb379 | 10709 | #: builtin/ls-remote.c:76 |
276ceeaa JX |
10710 | msgid "show underlying ref in addition to the object pointed by it" |
10711 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
10712 | ||
a4f16749 | 10713 | #: builtin/ls-tree.c:29 |
ef317cd5 | 10714 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 10715 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 10716 | |
a4f16749 | 10717 | #: builtin/ls-tree.c:127 |
ef317cd5 | 10718 | msgid "only show trees" |
07432cef | 10719 | msgstr "只显示树" |
ef317cd5 | 10720 | |
a4f16749 | 10721 | #: builtin/ls-tree.c:129 |
ef317cd5 | 10722 | msgid "recurse into subtrees" |
07432cef | 10723 | msgstr "递归到子树" |
ef317cd5 | 10724 | |
a4f16749 | 10725 | #: builtin/ls-tree.c:131 |
ef317cd5 | 10726 | msgid "show trees when recursing" |
07432cef | 10727 | msgstr "当递归时显示树" |
ef317cd5 | 10728 | |
a4f16749 | 10729 | #: builtin/ls-tree.c:134 |
ef317cd5 | 10730 | msgid "terminate entries with NUL byte" |
4375c10e | 10731 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 10732 | |
a4f16749 | 10733 | #: builtin/ls-tree.c:135 |
ef317cd5 | 10734 | msgid "include object size" |
07432cef | 10735 | msgstr "包括对象大小" |
ef317cd5 | 10736 | |
a4f16749 | 10737 | #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 |
ef317cd5 | 10738 | msgid "list only filenames" |
07432cef | 10739 | msgstr "只列出文件名" |
ef317cd5 | 10740 | |
a4f16749 | 10741 | #: builtin/ls-tree.c:142 |
ef317cd5 | 10742 | msgid "use full path names" |
07432cef | 10743 | msgstr "使用文件的全路径" |
ef317cd5 | 10744 | |
a4f16749 | 10745 | #: builtin/ls-tree.c:144 |
ef317cd5 | 10746 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 10747 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 10748 | |
a4f16749 JX |
10749 | #: builtin/mailsplit.c:241 |
10750 | #, c-format | |
10751 | msgid "empty mbox: '%s'" | |
10752 | msgstr "空的 mbox:'%s'" | |
10753 | ||
fd8cb379 | 10754 | #: builtin/merge.c:51 |
814ff314 JX |
10755 | msgid "git merge [<options>] [<commit>...]" |
10756 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 10757 | |
fd8cb379 | 10758 | #: builtin/merge.c:52 |
ef317cd5 | 10759 | msgid "git merge --abort" |
07432cef | 10760 | msgstr "git merge --abort" |
ef317cd5 | 10761 | |
fd8cb379 | 10762 | #: builtin/merge.c:53 |
1a79b2f1 JX |
10763 | msgid "git merge --continue" |
10764 | msgstr "git merge --continue" | |
10765 | ||
fd8cb379 | 10766 | #: builtin/merge.c:110 |
c04f5ac3 JX |
10767 | msgid "switch `m' requires a value" |
10768 | msgstr "开关 `m' 需要一个值" | |
10769 | ||
fd8cb379 | 10770 | #: builtin/merge.c:147 |
c04f5ac3 JX |
10771 | #, c-format |
10772 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 10773 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 10774 | |
fd8cb379 | 10775 | #: builtin/merge.c:148 |
c04f5ac3 JX |
10776 | #, c-format |
10777 | msgid "Available strategies are:" | |
10778 | msgstr "可用的策略有:" | |
10779 | ||
fd8cb379 | 10780 | #: builtin/merge.c:153 |
c04f5ac3 JX |
10781 | #, c-format |
10782 | msgid "Available custom strategies are:" | |
10783 | msgstr "可用的自定义策略有:" | |
10784 | ||
fd8cb379 | 10785 | #: builtin/merge.c:203 builtin/pull.c:142 |
ef317cd5 | 10786 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 10787 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 10788 | |
fd8cb379 | 10789 | #: builtin/merge.c:206 builtin/pull.c:145 |
ef317cd5 | 10790 | msgid "show a diffstat at the end of the merge" |
07432cef | 10791 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 10792 | |
fd8cb379 | 10793 | #: builtin/merge.c:207 builtin/pull.c:148 |
ef317cd5 | 10794 | msgid "(synonym to --stat)" |
07432cef | 10795 | msgstr "(和 --stat 同义)" |
ef317cd5 | 10796 | |
fd8cb379 | 10797 | #: builtin/merge.c:209 builtin/pull.c:151 |
ef317cd5 | 10798 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 10799 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 10800 | |
fd8cb379 | 10801 | #: builtin/merge.c:212 builtin/pull.c:157 |
ef317cd5 | 10802 | msgid "create a single commit instead of doing a merge" |
07432cef | 10803 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 10804 | |
fd8cb379 | 10805 | #: builtin/merge.c:214 builtin/pull.c:160 |
ef317cd5 | 10806 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 10807 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 10808 | |
fd8cb379 | 10809 | #: builtin/merge.c:216 builtin/pull.c:163 |
ef317cd5 | 10810 | msgid "edit message before committing" |
07432cef | 10811 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 10812 | |
fd8cb379 | 10813 | #: builtin/merge.c:217 |
ef317cd5 | 10814 | msgid "allow fast-forward (default)" |
07432cef | 10815 | msgstr "允许快进(默认)" |
ef317cd5 | 10816 | |
fd8cb379 | 10817 | #: builtin/merge.c:219 builtin/pull.c:169 |
ef317cd5 | 10818 | msgid "abort if fast-forward is not possible" |
07432cef | 10819 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 10820 | |
fd8cb379 | 10821 | #: builtin/merge.c:223 builtin/pull.c:172 |
5c57d762 | 10822 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
10823 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
10824 | ||
fd8cb379 | 10825 | #: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176 |
a4f16749 | 10826 | #: builtin/revert.c:109 |
ef317cd5 | 10827 | msgid "strategy" |
07432cef | 10828 | msgstr "策略" |
ef317cd5 | 10829 | |
fd8cb379 | 10830 | #: builtin/merge.c:225 builtin/pull.c:177 |
ef317cd5 | 10831 | msgid "merge strategy to use" |
07432cef | 10832 | msgstr "要使用的合并策略" |
ef317cd5 | 10833 | |
fd8cb379 | 10834 | #: builtin/merge.c:226 builtin/pull.c:180 |
ef317cd5 | 10835 | msgid "option=value" |
07432cef | 10836 | msgstr "option=value" |
ef317cd5 | 10837 | |
fd8cb379 | 10838 | #: builtin/merge.c:227 builtin/pull.c:181 |
ef317cd5 | 10839 | msgid "option for selected merge strategy" |
07432cef | 10840 | msgstr "所选的合并策略的选项" |
ef317cd5 | 10841 | |
fd8cb379 | 10842 | #: builtin/merge.c:229 |
ef317cd5 | 10843 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 10844 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 10845 | |
fd8cb379 | 10846 | #: builtin/merge.c:233 |
ef317cd5 | 10847 | msgid "abort the current in-progress merge" |
07432cef | 10848 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 10849 | |
fd8cb379 | 10850 | #: builtin/merge.c:235 |
1a79b2f1 JX |
10851 | msgid "continue the current in-progress merge" |
10852 | msgstr "继续当前正在进行的合并" | |
10853 | ||
fd8cb379 | 10854 | #: builtin/merge.c:237 builtin/pull.c:188 |
5b04ee3b JX |
10855 | msgid "allow merging unrelated histories" |
10856 | msgstr "允许合并不相关的历史" | |
10857 | ||
fd8cb379 | 10858 | #: builtin/merge.c:243 |
6937cb4e JX |
10859 | msgid "verify commit-msg hook" |
10860 | msgstr "校验 commit-msg 钩子" | |
10861 | ||
fd8cb379 | 10862 | #: builtin/merge.c:268 |
c04f5ac3 | 10863 | msgid "could not run stash." |
a4f16749 | 10864 | msgstr "不能运行贮藏。" |
c04f5ac3 | 10865 | |
fd8cb379 | 10866 | #: builtin/merge.c:273 |
c04f5ac3 | 10867 | msgid "stash failed" |
a4f16749 | 10868 | msgstr "贮藏失败" |
c04f5ac3 | 10869 | |
fd8cb379 | 10870 | #: builtin/merge.c:278 |
c04f5ac3 JX |
10871 | #, c-format |
10872 | msgid "not a valid object: %s" | |
10873 | msgstr "不是一个有效对象:%s" | |
10874 | ||
fd8cb379 | 10875 | #: builtin/merge.c:300 builtin/merge.c:317 |
c04f5ac3 JX |
10876 | msgid "read-tree failed" |
10877 | msgstr "读取树失败" | |
10878 | ||
90e6ef53 | 10879 | # 译者:注意保持前导空格 |
fd8cb379 | 10880 | #: builtin/merge.c:347 |
c04f5ac3 JX |
10881 | msgid " (nothing to squash)" |
10882 | msgstr " (无可压缩)" | |
10883 | ||
fd8cb379 | 10884 | #: builtin/merge.c:358 |
c04f5ac3 JX |
10885 | #, c-format |
10886 | msgid "Squash commit -- not updating HEAD\n" | |
10887 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
10888 | ||
fd8cb379 | 10889 | #: builtin/merge.c:408 |
c04f5ac3 JX |
10890 | #, c-format |
10891 | msgid "No merge message -- not updating HEAD\n" | |
10892 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
10893 | ||
fd8cb379 | 10894 | #: builtin/merge.c:458 |
c04f5ac3 JX |
10895 | #, c-format |
10896 | msgid "'%s' does not point to a commit" | |
10897 | msgstr "'%s' 没有指向一个提交" | |
10898 | ||
fd8cb379 | 10899 | #: builtin/merge.c:548 |
c04f5ac3 JX |
10900 | #, c-format |
10901 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 10902 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 10903 | |
fd8cb379 | 10904 | #: builtin/merge.c:669 |
c04f5ac3 | 10905 | msgid "Not handling anything other than two heads merge." |
29004bbb | 10906 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 10907 | |
fd8cb379 | 10908 | #: builtin/merge.c:683 |
c04f5ac3 JX |
10909 | #, c-format |
10910 | msgid "Unknown option for merge-recursive: -X%s" | |
10911 | msgstr "merge-recursive 的未知选项:-X%s" | |
10912 | ||
fd8cb379 | 10913 | #: builtin/merge.c:698 |
c04f5ac3 JX |
10914 | #, c-format |
10915 | msgid "unable to write %s" | |
10916 | msgstr "不能写 %s" | |
10917 | ||
31e5e17b | 10918 | #: builtin/merge.c:749 |
c04f5ac3 JX |
10919 | #, c-format |
10920 | msgid "Could not read from '%s'" | |
10921 | msgstr "不能从 '%s' 读取" | |
10922 | ||
31e5e17b | 10923 | #: builtin/merge.c:758 |
c04f5ac3 JX |
10924 | #, c-format |
10925 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
10926 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
10927 | ||
31e5e17b | 10928 | #: builtin/merge.c:764 |
a77c07d9 | 10929 | #, c-format |
c04f5ac3 JX |
10930 | msgid "" |
10931 | "Please enter a commit message to explain why this merge is necessary,\n" | |
10932 | "especially if it merges an updated upstream into a topic branch.\n" | |
10933 | "\n" | |
a77c07d9 | 10934 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
10935 | "the commit.\n" |
10936 | msgstr "" | |
10937 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
10938 | "合并到主题分支。\n" | |
10939 | "\n" | |
a77c07d9 | 10940 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 10941 | |
31e5e17b | 10942 | #: builtin/merge.c:800 |
c04f5ac3 JX |
10943 | msgid "Empty commit message." |
10944 | msgstr "空提交信息。" | |
10945 | ||
fd8cb379 | 10946 | #: builtin/merge.c:819 |
c04f5ac3 JX |
10947 | #, c-format |
10948 | msgid "Wonderful.\n" | |
10949 | msgstr "太棒了。\n" | |
10950 | ||
fd8cb379 | 10951 | #: builtin/merge.c:872 |
c04f5ac3 JX |
10952 | #, c-format |
10953 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
10954 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
10955 | ||
fd8cb379 | 10956 | #: builtin/merge.c:911 |
c04f5ac3 | 10957 | msgid "No current branch." |
90e6ef53 | 10958 | msgstr "没有当前分支。" |
c04f5ac3 | 10959 | |
fd8cb379 | 10960 | #: builtin/merge.c:913 |
c04f5ac3 | 10961 | msgid "No remote for the current branch." |
160fb2b2 | 10962 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 10963 | |
fd8cb379 | 10964 | #: builtin/merge.c:915 |
c04f5ac3 | 10965 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 10966 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 10967 | |
fd8cb379 | 10968 | #: builtin/merge.c:920 |
170e9899 | 10969 | #, c-format |
2e8451e8 JX |
10970 | msgid "No remote-tracking branch for %s from %s" |
10971 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 10972 | |
fd8cb379 | 10973 | #: builtin/merge.c:973 |
5c57d762 JX |
10974 | #, c-format |
10975 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 10976 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 10977 | |
fd8cb379 | 10978 | #: builtin/merge.c:1075 |
5c57d762 JX |
10979 | #, c-format |
10980 | msgid "not something we can merge in %s: %s" | |
10981 | msgstr "不能在 %s 中合并:%s" | |
10982 | ||
fd8cb379 | 10983 | #: builtin/merge.c:1109 |
5c57d762 JX |
10984 | msgid "not something we can merge" |
10985 | msgstr "不能合并" | |
10986 | ||
fd8cb379 | 10987 | #: builtin/merge.c:1211 |
1a79b2f1 JX |
10988 | msgid "--abort expects no arguments" |
10989 | msgstr "--abort 不带参数" | |
10990 | ||
fd8cb379 | 10991 | #: builtin/merge.c:1215 |
c04f5ac3 | 10992 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 10993 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 10994 | |
fd8cb379 | 10995 | #: builtin/merge.c:1227 |
1a79b2f1 JX |
10996 | msgid "--continue expects no arguments" |
10997 | msgstr "--continue 不带参数" | |
10998 | ||
fd8cb379 | 10999 | #: builtin/merge.c:1231 |
1a79b2f1 JX |
11000 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
11001 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
11002 | ||
fd8cb379 | 11003 | #: builtin/merge.c:1247 |
c04f5ac3 JX |
11004 | msgid "" |
11005 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 11006 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
11007 | msgstr "" |
11008 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 11009 | "请在合并前先提交您的修改。" |
c04f5ac3 | 11010 | |
fd8cb379 | 11011 | #: builtin/merge.c:1254 |
c04f5ac3 JX |
11012 | msgid "" |
11013 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 11014 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
11015 | msgstr "" |
11016 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 11017 | "请在合并前先提交您的修改。" |
c04f5ac3 | 11018 | |
fd8cb379 | 11019 | #: builtin/merge.c:1257 |
c04f5ac3 JX |
11020 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
11021 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
11022 | ||
fd8cb379 | 11023 | #: builtin/merge.c:1266 |
c04f5ac3 | 11024 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 11025 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 11026 | |
fd8cb379 | 11027 | #: builtin/merge.c:1274 |
c04f5ac3 | 11028 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 11029 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 11030 | |
fd8cb379 | 11031 | #: builtin/merge.c:1291 |
c04f5ac3 JX |
11032 | msgid "Squash commit into empty head not supported yet" |
11033 | msgstr "尚不支持到空分支的压缩提交" | |
11034 | ||
fd8cb379 | 11035 | #: builtin/merge.c:1293 |
c04f5ac3 JX |
11036 | msgid "Non-fast-forward commit does not make sense into an empty head" |
11037 | msgstr "到空分支的非快进式提交没有意义" | |
11038 | ||
fd8cb379 | 11039 | #: builtin/merge.c:1298 |
2e8451e8 JX |
11040 | #, c-format |
11041 | msgid "%s - not something we can merge" | |
11042 | msgstr "%s - 不能被合并" | |
11043 | ||
fd8cb379 | 11044 | #: builtin/merge.c:1300 |
7aea43ff JX |
11045 | msgid "Can merge only exactly one commit into empty head" |
11046 | msgstr "只能将一个提交合并到空分支上" | |
11047 | ||
fd8cb379 | 11048 | #: builtin/merge.c:1334 |
1003b3a5 JX |
11049 | #, c-format |
11050 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
11051 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
11052 | ||
fd8cb379 | 11053 | #: builtin/merge.c:1337 |
1003b3a5 JX |
11054 | #, c-format |
11055 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
11056 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
11057 | ||
fd8cb379 | 11058 | #: builtin/merge.c:1340 |
1003b3a5 JX |
11059 | #, c-format |
11060 | msgid "Commit %s does not have a GPG signature." | |
11061 | msgstr "提交 %s 没有一个 GPG 签名。" | |
11062 | ||
fd8cb379 | 11063 | #: builtin/merge.c:1343 |
1003b3a5 JX |
11064 | #, c-format |
11065 | msgid "Commit %s has a good GPG signature by %s\n" | |
11066 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
11067 | ||
fd8cb379 | 11068 | #: builtin/merge.c:1402 |
5b04ee3b JX |
11069 | msgid "refusing to merge unrelated histories" |
11070 | msgstr "拒绝合并无关的历史" | |
11071 | ||
fd8cb379 | 11072 | #: builtin/merge.c:1411 |
6937cb4e | 11073 | msgid "Already up to date." |
5c57d762 JX |
11074 | msgstr "已经是最新的。" |
11075 | ||
fd8cb379 | 11076 | #: builtin/merge.c:1421 |
c04f5ac3 JX |
11077 | #, c-format |
11078 | msgid "Updating %s..%s\n" | |
11079 | msgstr "更新 %s..%s\n" | |
11080 | ||
fd8cb379 | 11081 | #: builtin/merge.c:1462 |
c04f5ac3 JX |
11082 | #, c-format |
11083 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 11084 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 11085 | |
fd8cb379 | 11086 | #: builtin/merge.c:1469 |
c04f5ac3 JX |
11087 | #, c-format |
11088 | msgid "Nope.\n" | |
11089 | msgstr "无。\n" | |
11090 | ||
fd8cb379 | 11091 | #: builtin/merge.c:1494 |
6937cb4e | 11092 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
11093 | msgstr "已经是最新的。耶!" |
11094 | ||
fd8cb379 | 11095 | #: builtin/merge.c:1500 |
c04f5ac3 | 11096 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 11097 | msgstr "无法快进,终止。" |
c04f5ac3 | 11098 | |
fd8cb379 | 11099 | #: builtin/merge.c:1523 builtin/merge.c:1602 |
c04f5ac3 JX |
11100 | #, c-format |
11101 | msgid "Rewinding the tree to pristine...\n" | |
11102 | msgstr "将树回滚至原始状态...\n" | |
11103 | ||
fd8cb379 | 11104 | #: builtin/merge.c:1527 |
c04f5ac3 JX |
11105 | #, c-format |
11106 | msgid "Trying merge strategy %s...\n" | |
11107 | msgstr "尝试合并策略 %s...\n" | |
11108 | ||
fd8cb379 | 11109 | #: builtin/merge.c:1593 |
c04f5ac3 JX |
11110 | #, c-format |
11111 | msgid "No merge strategy handled the merge.\n" | |
11112 | msgstr "没有合并策略处理此合并。\n" | |
11113 | ||
fd8cb379 | 11114 | #: builtin/merge.c:1595 |
c04f5ac3 JX |
11115 | #, c-format |
11116 | msgid "Merge with strategy %s failed.\n" | |
11117 | msgstr "使用策略 %s 合并失败。\n" | |
11118 | ||
fd8cb379 | 11119 | #: builtin/merge.c:1604 |
c04f5ac3 JX |
11120 | #, c-format |
11121 | msgid "Using the %s to prepare resolving by hand.\n" | |
11122 | msgstr "使用 %s 以准备手工解决。\n" | |
11123 | ||
fd8cb379 | 11124 | #: builtin/merge.c:1616 |
c04f5ac3 JX |
11125 | #, c-format |
11126 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
11127 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
11128 | ||
a4f16749 | 11129 | #: builtin/merge-base.c:30 |
814ff314 JX |
11130 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
11131 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 11132 | |
a4f16749 | 11133 | #: builtin/merge-base.c:31 |
814ff314 JX |
11134 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
11135 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 11136 | |
a4f16749 | 11137 | #: builtin/merge-base.c:32 |
ef317cd5 | 11138 | msgid "git merge-base --independent <commit>..." |
07432cef | 11139 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 11140 | |
a4f16749 | 11141 | #: builtin/merge-base.c:33 |
ef317cd5 | 11142 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 11143 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 11144 | |
a4f16749 | 11145 | #: builtin/merge-base.c:34 |
cfff71a9 | 11146 | msgid "git merge-base --fork-point <ref> [<commit>]" |
d9d56b23 | 11147 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 11148 | |
5809aa05 | 11149 | #: builtin/merge-base.c:220 |
ef317cd5 | 11150 | msgid "output all common ancestors" |
07432cef | 11151 | msgstr "输出所有共同的祖先" |
ef317cd5 | 11152 | |
5809aa05 | 11153 | #: builtin/merge-base.c:222 |
ef317cd5 | 11154 | msgid "find ancestors for a single n-way merge" |
07432cef | 11155 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 11156 | |
5809aa05 | 11157 | #: builtin/merge-base.c:224 |
ef317cd5 | 11158 | msgid "list revs not reachable from others" |
07432cef | 11159 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 11160 | |
5809aa05 | 11161 | #: builtin/merge-base.c:226 |
ef317cd5 | 11162 | msgid "is the first one ancestor of the other?" |
07432cef | 11163 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 11164 | |
5809aa05 | 11165 | #: builtin/merge-base.c:228 |
cfff71a9 | 11166 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 11167 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 11168 | |
a4f16749 | 11169 | #: builtin/merge-file.c:9 |
ef317cd5 | 11170 | msgid "" |
814ff314 JX |
11171 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
11172 | "<orig-file> <file2>" | |
ef317cd5 | 11173 | msgstr "" |
814ff314 JX |
11174 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
11175 | "件> <文件2>" | |
ef317cd5 | 11176 | |
a4f16749 | 11177 | #: builtin/merge-file.c:33 |
ef317cd5 | 11178 | msgid "send results to standard output" |
07432cef | 11179 | msgstr "将结果发送到标准输出" |
ef317cd5 | 11180 | |
a4f16749 | 11181 | #: builtin/merge-file.c:34 |
ef317cd5 | 11182 | msgid "use a diff3 based merge" |
07432cef | 11183 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 11184 | |
a4f16749 | 11185 | #: builtin/merge-file.c:35 |
ef317cd5 | 11186 | msgid "for conflicts, use our version" |
07432cef | 11187 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 11188 | |
a4f16749 | 11189 | #: builtin/merge-file.c:37 |
ef317cd5 | 11190 | msgid "for conflicts, use their version" |
07432cef | 11191 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 11192 | |
a4f16749 | 11193 | #: builtin/merge-file.c:39 |
ef317cd5 | 11194 | msgid "for conflicts, use a union version" |
07432cef | 11195 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 11196 | |
a4f16749 | 11197 | #: builtin/merge-file.c:42 |
ef317cd5 | 11198 | msgid "for conflicts, use this marker size" |
07432cef | 11199 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 11200 | |
a4f16749 | 11201 | #: builtin/merge-file.c:43 |
ef317cd5 | 11202 | msgid "do not warn about conflicts" |
07432cef | 11203 | msgstr "不要警告冲突" |
ef317cd5 | 11204 | |
a4f16749 | 11205 | #: builtin/merge-file.c:45 |
814ff314 JX |
11206 | msgid "set labels for file1/orig-file/file2" |
11207 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 11208 | |
a0b6b246 JX |
11209 | #: builtin/merge-recursive.c:45 |
11210 | #, c-format | |
11211 | msgid "unknown option %s" | |
11212 | msgstr "未知选项 %s" | |
11213 | ||
11214 | #: builtin/merge-recursive.c:51 | |
11215 | #, c-format | |
11216 | msgid "could not parse object '%s'" | |
11217 | msgstr "不能解析对象 '%s'" | |
11218 | ||
11219 | #: builtin/merge-recursive.c:55 | |
11220 | #, c-format | |
11221 | msgid "cannot handle more than %d base. Ignoring %s." | |
11222 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
11223 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
11224 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
11225 | ||
11226 | #: builtin/merge-recursive.c:63 | |
11227 | msgid "not handling anything other than two heads merge." | |
11228 | msgstr "不能处理两个头合并之外的任何操作。" | |
11229 | ||
11230 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
11231 | #, c-format | |
11232 | msgid "could not resolve ref '%s'" | |
11233 | msgstr "无法解析引用 '%s'" | |
11234 | ||
11235 | #: builtin/merge-recursive.c:77 | |
11236 | #, c-format | |
11237 | msgid "Merging %s with %s\n" | |
11238 | msgstr "合并 %s 和 %s\n" | |
11239 | ||
276ceeaa | 11240 | #: builtin/mktree.c:65 |
ef317cd5 | 11241 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 11242 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 11243 | |
a4f16749 | 11244 | #: builtin/mktree.c:153 |
ef317cd5 | 11245 | msgid "input is NUL terminated" |
07432cef | 11246 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 11247 | |
a4f16749 | 11248 | #: builtin/mktree.c:154 builtin/write-tree.c:25 |
ef317cd5 | 11249 | msgid "allow missing objects" |
07432cef | 11250 | msgstr "允许丢失的对象" |
c04f5ac3 | 11251 | |
a4f16749 | 11252 | #: builtin/mktree.c:155 |
ef317cd5 | 11253 | msgid "allow creation of more than one tree" |
07432cef | 11254 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 11255 | |
a4f16749 | 11256 | #: builtin/mv.c:17 |
814ff314 JX |
11257 | msgid "git mv [<options>] <source>... <destination>" |
11258 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 11259 | |
fd8cb379 | 11260 | #: builtin/mv.c:82 |
220c313c JX |
11261 | #, c-format |
11262 | msgid "Directory %s is in index and no submodule?" | |
11263 | msgstr "目录 %s 在索引中并且不是子模组?" | |
11264 | ||
fd8cb379 | 11265 | #: builtin/mv.c:84 builtin/rm.c:288 |
220c313c | 11266 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 11267 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 11268 | |
fd8cb379 | 11269 | #: builtin/mv.c:102 |
220c313c JX |
11270 | #, c-format |
11271 | msgid "%.*s is in index" | |
11272 | msgstr "%.*s 在索引中" | |
11273 | ||
fd8cb379 | 11274 | #: builtin/mv.c:124 |
ef317cd5 | 11275 | msgid "force move/rename even if target exists" |
07432cef | 11276 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 11277 | |
fd8cb379 | 11278 | #: builtin/mv.c:126 |
ef317cd5 | 11279 | msgid "skip move/rename errors" |
07432cef | 11280 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 11281 | |
31e5e17b | 11282 | #: builtin/mv.c:168 |
220c313c JX |
11283 | #, c-format |
11284 | msgid "destination '%s' is not a directory" | |
11285 | msgstr "目标 '%s' 不是一个目录" | |
11286 | ||
31e5e17b | 11287 | #: builtin/mv.c:179 |
c04f5ac3 JX |
11288 | #, c-format |
11289 | msgid "Checking rename of '%s' to '%s'\n" | |
11290 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
11291 | ||
31e5e17b | 11292 | #: builtin/mv.c:183 |
c04f5ac3 JX |
11293 | msgid "bad source" |
11294 | msgstr "坏的源" | |
11295 | ||
31e5e17b | 11296 | #: builtin/mv.c:186 |
c04f5ac3 JX |
11297 | msgid "can not move directory into itself" |
11298 | msgstr "不能将目录移动到自身" | |
11299 | ||
31e5e17b | 11300 | #: builtin/mv.c:189 |
c04f5ac3 JX |
11301 | msgid "cannot move directory over file" |
11302 | msgstr "不能将目录移动到文件" | |
11303 | ||
31e5e17b | 11304 | #: builtin/mv.c:198 |
c04f5ac3 JX |
11305 | msgid "source directory is empty" |
11306 | msgstr "源目录为空" | |
11307 | ||
31e5e17b | 11308 | #: builtin/mv.c:223 |
c04f5ac3 JX |
11309 | msgid "not under version control" |
11310 | msgstr "不在版本控制之下" | |
11311 | ||
31e5e17b | 11312 | #: builtin/mv.c:226 |
c04f5ac3 JX |
11313 | msgid "destination exists" |
11314 | msgstr "目标已存在" | |
11315 | ||
31e5e17b | 11316 | #: builtin/mv.c:234 |
c04f5ac3 JX |
11317 | #, c-format |
11318 | msgid "overwriting '%s'" | |
11319 | msgstr "覆盖 '%s'" | |
11320 | ||
31e5e17b | 11321 | #: builtin/mv.c:237 |
c04f5ac3 JX |
11322 | msgid "Cannot overwrite" |
11323 | msgstr "不能覆盖" | |
11324 | ||
31e5e17b | 11325 | #: builtin/mv.c:240 |
c04f5ac3 JX |
11326 | msgid "multiple sources for the same target" |
11327 | msgstr "同一目标具有多个源" | |
11328 | ||
31e5e17b | 11329 | #: builtin/mv.c:242 |
cfff71a9 JX |
11330 | msgid "destination directory does not exist" |
11331 | msgstr "目标目录不存在" | |
11332 | ||
31e5e17b | 11333 | #: builtin/mv.c:249 |
c04f5ac3 JX |
11334 | #, c-format |
11335 | msgid "%s, source=%s, destination=%s" | |
11336 | msgstr "%s,源=%s,目标=%s" | |
11337 | ||
31e5e17b | 11338 | #: builtin/mv.c:270 |
c04f5ac3 JX |
11339 | #, c-format |
11340 | msgid "Renaming %s to %s\n" | |
11341 | msgstr "重命名 %s 至 %s\n" | |
11342 | ||
fd8cb379 | 11343 | #: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 |
c04f5ac3 JX |
11344 | #, c-format |
11345 | msgid "renaming '%s' failed" | |
11346 | msgstr "重命名 '%s' 失败" | |
11347 | ||
a4f16749 | 11348 | #: builtin/name-rev.c:338 |
814ff314 JX |
11349 | msgid "git name-rev [<options>] <commit>..." |
11350 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 11351 | |
a4f16749 | 11352 | #: builtin/name-rev.c:339 |
814ff314 JX |
11353 | msgid "git name-rev [<options>] --all" |
11354 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 11355 | |
a4f16749 | 11356 | #: builtin/name-rev.c:340 |
814ff314 JX |
11357 | msgid "git name-rev [<options>] --stdin" |
11358 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 11359 | |
a4f16749 | 11360 | #: builtin/name-rev.c:395 |
ef317cd5 | 11361 | msgid "print only names (no SHA-1)" |
07432cef | 11362 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 11363 | |
a4f16749 | 11364 | #: builtin/name-rev.c:396 |
ef317cd5 | 11365 | msgid "only use tags to name the commits" |
55a16ee4 | 11366 | msgstr "只使用标签来命名提交" |
ef317cd5 | 11367 | |
a4f16749 | 11368 | #: builtin/name-rev.c:398 |
ef317cd5 | 11369 | msgid "only use refs matching <pattern>" |
07432cef | 11370 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 11371 | |
a4f16749 | 11372 | #: builtin/name-rev.c:400 |
87cb7997 JX |
11373 | msgid "ignore refs matching <pattern>" |
11374 | msgstr "忽略和 <模式> 相匹配的引用" | |
11375 | ||
a4f16749 | 11376 | #: builtin/name-rev.c:402 |
ef317cd5 | 11377 | msgid "list all commits reachable from all refs" |
07432cef | 11378 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 11379 | |
a4f16749 | 11380 | #: builtin/name-rev.c:403 |
ef317cd5 | 11381 | msgid "read from stdin" |
07432cef | 11382 | msgstr "从标准输入读取" |
ef317cd5 | 11383 | |
a4f16749 | 11384 | #: builtin/name-rev.c:404 |
90314792 JX |
11385 | msgid "allow to print `undefined` names (default)" |
11386 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 11387 | |
a4f16749 | 11388 | #: builtin/name-rev.c:410 |
2e8451e8 | 11389 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 11390 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 11391 | |
a4f16749 | 11392 | #: builtin/notes.c:26 |
814ff314 | 11393 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 11394 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 11395 | |
a4f16749 | 11396 | #: builtin/notes.c:27 |
ef317cd5 | 11397 | msgid "" |
814ff314 | 11398 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 11399 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 11400 | msgstr "" |
04cb2f28 JX |
11401 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
11402 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 11403 | |
a4f16749 | 11404 | #: builtin/notes.c:28 |
814ff314 | 11405 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 11406 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 11407 | |
a4f16749 | 11408 | #: builtin/notes.c:29 |
ef317cd5 | 11409 | msgid "" |
814ff314 | 11410 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 11411 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 11412 | msgstr "" |
04cb2f28 JX |
11413 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
11414 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 11415 | |
a4f16749 | 11416 | #: builtin/notes.c:30 |
814ff314 | 11417 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 11418 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 11419 | |
a4f16749 | 11420 | #: builtin/notes.c:31 |
814ff314 | 11421 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 11422 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 11423 | |
a4f16749 | 11424 | #: builtin/notes.c:32 |
ef317cd5 | 11425 | msgid "" |
814ff314 | 11426 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 11427 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 11428 | |
a4f16749 | 11429 | #: builtin/notes.c:33 |
ef317cd5 | 11430 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 11431 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 11432 | |
a4f16749 | 11433 | #: builtin/notes.c:34 |
ef317cd5 | 11434 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 11435 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 11436 | |
a4f16749 | 11437 | #: builtin/notes.c:35 |
814ff314 | 11438 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 11439 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 11440 | |
a4f16749 | 11441 | #: builtin/notes.c:36 |
5809aa05 JX |
11442 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
11443 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 11444 | |
a4f16749 | 11445 | #: builtin/notes.c:37 |
814ff314 | 11446 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 11447 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 11448 | |
a4f16749 | 11449 | #: builtin/notes.c:42 |
ef317cd5 | 11450 | msgid "git notes [list [<object>]]" |
07432cef | 11451 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 11452 | |
a4f16749 | 11453 | #: builtin/notes.c:47 |
ef317cd5 | 11454 | msgid "git notes add [<options>] [<object>]" |
07432cef | 11455 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 11456 | |
a4f16749 | 11457 | #: builtin/notes.c:52 |
ef317cd5 | 11458 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 11459 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 11460 | |
a4f16749 | 11461 | #: builtin/notes.c:53 |
ef317cd5 | 11462 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 11463 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 11464 | |
a4f16749 | 11465 | #: builtin/notes.c:58 |
ef317cd5 | 11466 | msgid "git notes append [<options>] [<object>]" |
07432cef | 11467 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 11468 | |
a4f16749 | 11469 | #: builtin/notes.c:63 |
ef317cd5 | 11470 | msgid "git notes edit [<object>]" |
07432cef | 11471 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 11472 | |
a4f16749 | 11473 | #: builtin/notes.c:68 |
ef317cd5 | 11474 | msgid "git notes show [<object>]" |
07432cef | 11475 | msgstr "git notes show [<对象>]" |
ef317cd5 | 11476 | |
a4f16749 | 11477 | #: builtin/notes.c:73 |
814ff314 | 11478 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 11479 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 11480 | |
a4f16749 | 11481 | #: builtin/notes.c:74 |
ef317cd5 | 11482 | msgid "git notes merge --commit [<options>]" |
07432cef | 11483 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 11484 | |
a4f16749 | 11485 | #: builtin/notes.c:75 |
ef317cd5 | 11486 | msgid "git notes merge --abort [<options>]" |
07432cef | 11487 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 11488 | |
a4f16749 | 11489 | #: builtin/notes.c:80 |
ef317cd5 | 11490 | msgid "git notes remove [<object>]" |
07432cef | 11491 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 11492 | |
a4f16749 | 11493 | #: builtin/notes.c:85 |
ef317cd5 | 11494 | msgid "git notes prune [<options>]" |
07432cef | 11495 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 11496 | |
a4f16749 | 11497 | #: builtin/notes.c:90 |
ef317cd5 | 11498 | msgid "git notes get-ref" |
07432cef | 11499 | msgstr "git notes get-ref" |
ef317cd5 | 11500 | |
a4f16749 | 11501 | #: builtin/notes.c:95 |
5c57d762 JX |
11502 | msgid "Write/edit the notes for the following object:" |
11503 | msgstr "为下面的对象写/编辑说明:" | |
11504 | ||
a4f16749 | 11505 | #: builtin/notes.c:148 |
c04f5ac3 JX |
11506 | #, c-format |
11507 | msgid "unable to start 'show' for object '%s'" | |
11508 | msgstr "不能为对象 '%s' 开始 'show'" | |
11509 | ||
a4f16749 | 11510 | #: builtin/notes.c:152 |
a77c07d9 JX |
11511 | msgid "could not read 'show' output" |
11512 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 11513 | |
a4f16749 | 11514 | #: builtin/notes.c:160 |
c04f5ac3 JX |
11515 | #, c-format |
11516 | msgid "failed to finish 'show' for object '%s'" | |
11517 | msgstr "无法为对象 '%s' 完成 'show'" | |
11518 | ||
a4f16749 | 11519 | #: builtin/notes.c:195 |
a0b6b246 | 11520 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
11521 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
11522 | ||
a4f16749 | 11523 | #: builtin/notes.c:204 |
c04f5ac3 JX |
11524 | msgid "unable to write note object" |
11525 | msgstr "不能写注解对象" | |
11526 | ||
a4f16749 | 11527 | #: builtin/notes.c:206 |
c04f5ac3 | 11528 | #, c-format |
a0b6b246 | 11529 | msgid "the note contents have been left in %s" |
220c313c | 11530 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 11531 | |
fd8cb379 | 11532 | #: builtin/notes.c:234 builtin/tag.c:507 |
c04f5ac3 JX |
11533 | #, c-format |
11534 | msgid "cannot read '%s'" | |
11535 | msgstr "不能读取 '%s'" | |
11536 | ||
fd8cb379 | 11537 | #: builtin/notes.c:236 builtin/tag.c:510 |
c04f5ac3 JX |
11538 | #, c-format |
11539 | msgid "could not open or read '%s'" | |
11540 | msgstr "不能打开或读取 '%s'" | |
11541 | ||
a4f16749 | 11542 | #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 |
6937cb4e JX |
11543 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 |
11544 | #: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 | |
a0b6b246 JX |
11545 | #, c-format |
11546 | msgid "failed to resolve '%s' as a valid ref." | |
11547 | msgstr "无法解析 '%s' 为一个有效引用。" | |
11548 | ||
a4f16749 | 11549 | #: builtin/notes.c:258 |
c04f5ac3 | 11550 | #, c-format |
a0b6b246 | 11551 | msgid "failed to read object '%s'." |
c04f5ac3 JX |
11552 | msgstr "无法读取对象 '%s'。" |
11553 | ||
a4f16749 | 11554 | #: builtin/notes.c:262 |
6c94aba5 | 11555 | #, c-format |
a0b6b246 JX |
11556 | msgid "cannot read note data from non-blob object '%s'." |
11557 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
11558 | ||
a4f16749 | 11559 | #: builtin/notes.c:302 |
a0b6b246 JX |
11560 | #, c-format |
11561 | msgid "malformed input line: '%s'." | |
fd8cb379 | 11562 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 11563 | |
a4f16749 | 11564 | #: builtin/notes.c:317 |
a0b6b246 JX |
11565 | #, c-format |
11566 | msgid "failed to copy notes from '%s' to '%s'" | |
11567 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 11568 | |
a4f16749 JX |
11569 | #. TRANSLATORS: the first %s will be replaced by a git |
11570 | #. notes command: 'add', 'merge', 'remove', etc. | |
11571 | #. | |
6937cb4e | 11572 | #: builtin/notes.c:349 |
a0b6b246 JX |
11573 | #, c-format |
11574 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
11575 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
11576 | ||
6937cb4e JX |
11577 | #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 |
11578 | #: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 | |
11579 | #: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 | |
c04f5ac3 JX |
11580 | msgid "too many parameters" |
11581 | msgstr "参数太多" | |
11582 | ||
6937cb4e | 11583 | #: builtin/notes.c:382 builtin/notes.c:668 |
c04f5ac3 | 11584 | #, c-format |
a0b6b246 | 11585 | msgid "no note found for object %s." |
c04f5ac3 JX |
11586 | msgstr "未发现对象 %s 的注解。" |
11587 | ||
6937cb4e | 11588 | #: builtin/notes.c:403 builtin/notes.c:566 |
ef317cd5 | 11589 | msgid "note contents as a string" |
07432cef | 11590 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 11591 | |
6937cb4e | 11592 | #: builtin/notes.c:406 builtin/notes.c:569 |
ef317cd5 | 11593 | msgid "note contents in a file" |
07432cef | 11594 | msgstr "注解内容到一个文件中" |
ef317cd5 | 11595 | |
6937cb4e | 11596 | #: builtin/notes.c:409 builtin/notes.c:572 |
ef317cd5 | 11597 | msgid "reuse and edit specified note object" |
07432cef | 11598 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 11599 | |
6937cb4e | 11600 | #: builtin/notes.c:412 builtin/notes.c:575 |
ef317cd5 | 11601 | msgid "reuse specified note object" |
07432cef | 11602 | msgstr "重用指定的注解对象" |
ef317cd5 | 11603 | |
6937cb4e | 11604 | #: builtin/notes.c:415 builtin/notes.c:578 |
04cb2f28 JX |
11605 | msgid "allow storing empty note" |
11606 | msgstr "允许保存空白注释" | |
11607 | ||
6937cb4e | 11608 | #: builtin/notes.c:416 builtin/notes.c:487 |
ef317cd5 | 11609 | msgid "replace existing notes" |
07432cef | 11610 | msgstr "替换已存在的注解" |
ef317cd5 | 11611 | |
6937cb4e | 11612 | #: builtin/notes.c:441 |
c04f5ac3 JX |
11613 | #, c-format |
11614 | msgid "" | |
11615 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
11616 | "existing notes" | |
11617 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
11618 | ||
6937cb4e | 11619 | #: builtin/notes.c:456 builtin/notes.c:535 |
c04f5ac3 JX |
11620 | #, c-format |
11621 | msgid "Overwriting existing notes for object %s\n" | |
11622 | msgstr "覆盖对象 %s 现存注解\n" | |
11623 | ||
6937cb4e | 11624 | #: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 |
04cb2f28 JX |
11625 | #, c-format |
11626 | msgid "Removing note for object %s\n" | |
11627 | msgstr "删除对象 %s 的注解\n" | |
11628 | ||
6937cb4e | 11629 | #: builtin/notes.c:488 |
ef317cd5 | 11630 | msgid "read objects from stdin" |
07432cef | 11631 | msgstr "从标准输入读取对象" |
ef317cd5 | 11632 | |
6937cb4e | 11633 | #: builtin/notes.c:490 |
ef317cd5 | 11634 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 11635 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 11636 | |
6937cb4e | 11637 | #: builtin/notes.c:508 |
c04f5ac3 JX |
11638 | msgid "too few parameters" |
11639 | msgstr "参数太少" | |
11640 | ||
6937cb4e | 11641 | #: builtin/notes.c:529 |
c04f5ac3 JX |
11642 | #, c-format |
11643 | msgid "" | |
11644 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
11645 | "existing notes" | |
11646 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
11647 | ||
6937cb4e | 11648 | #: builtin/notes.c:541 |
c04f5ac3 | 11649 | #, c-format |
a0b6b246 | 11650 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
11651 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
11652 | ||
6937cb4e | 11653 | #: builtin/notes.c:593 |
ef317cd5 JX |
11654 | #, c-format |
11655 | msgid "" | |
11656 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
11657 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
11658 | msgstr "" | |
11659 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
11660 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
11661 | ||
6937cb4e | 11662 | #: builtin/notes.c:688 |
a0b6b246 JX |
11663 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
11664 | msgstr "无法删除引用 NOTES_MERGE_PARTIAL" | |
11665 | ||
6937cb4e | 11666 | #: builtin/notes.c:690 |
a0b6b246 JX |
11667 | msgid "failed to delete ref NOTES_MERGE_REF" |
11668 | msgstr "无法删除引用 NOTES_MERGE_REF" | |
11669 | ||
6937cb4e | 11670 | #: builtin/notes.c:692 |
a0b6b246 JX |
11671 | msgid "failed to remove 'git notes merge' worktree" |
11672 | msgstr "无法删除 'git notes merge' 工作区" | |
11673 | ||
6937cb4e | 11674 | #: builtin/notes.c:712 |
a0b6b246 JX |
11675 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
11676 | msgstr "无法读取引用 NOTES_MERGE_PARTIAL" | |
11677 | ||
6937cb4e | 11678 | #: builtin/notes.c:714 |
a0b6b246 JX |
11679 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
11680 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
11681 | ||
6937cb4e | 11682 | #: builtin/notes.c:716 |
a0b6b246 JX |
11683 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
11684 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
11685 | ||
6937cb4e | 11686 | #: builtin/notes.c:729 |
a0b6b246 JX |
11687 | msgid "failed to resolve NOTES_MERGE_REF" |
11688 | msgstr "无法解析 NOTES_MERGE_REF" | |
11689 | ||
6937cb4e | 11690 | #: builtin/notes.c:732 |
a0b6b246 JX |
11691 | msgid "failed to finalize notes merge" |
11692 | msgstr "无法完成注解合并" | |
11693 | ||
6937cb4e | 11694 | #: builtin/notes.c:758 |
5c57d762 JX |
11695 | #, c-format |
11696 | msgid "unknown notes merge strategy %s" | |
11697 | msgstr "未知的注解合并策略 %s" | |
11698 | ||
6937cb4e | 11699 | #: builtin/notes.c:774 |
ef317cd5 | 11700 | msgid "General options" |
07432cef | 11701 | msgstr "通用选项" |
ef317cd5 | 11702 | |
6937cb4e | 11703 | #: builtin/notes.c:776 |
ef317cd5 | 11704 | msgid "Merge options" |
07432cef | 11705 | msgstr "合并选项" |
ef317cd5 | 11706 | |
6937cb4e | 11707 | #: builtin/notes.c:778 |
ef317cd5 JX |
11708 | msgid "" |
11709 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
11710 | "cat_sort_uniq)" | |
07432cef | 11711 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 11712 | |
6937cb4e | 11713 | #: builtin/notes.c:780 |
ef317cd5 | 11714 | msgid "Committing unmerged notes" |
07432cef | 11715 | msgstr "提交未合并的注解" |
ef317cd5 | 11716 | |
6937cb4e | 11717 | #: builtin/notes.c:782 |
ef317cd5 | 11718 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 11719 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 11720 | |
6937cb4e | 11721 | #: builtin/notes.c:784 |
ef317cd5 | 11722 | msgid "Aborting notes merge resolution" |
07432cef | 11723 | msgstr "中止注解合并的方案" |
ef317cd5 | 11724 | |
6937cb4e | 11725 | #: builtin/notes.c:786 |
ef317cd5 | 11726 | msgid "abort notes merge" |
07432cef | 11727 | msgstr "中止注解合并" |
ef317cd5 | 11728 | |
6937cb4e | 11729 | #: builtin/notes.c:797 |
5c57d762 JX |
11730 | msgid "cannot mix --commit, --abort or -s/--strategy" |
11731 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
11732 | ||
6937cb4e | 11733 | #: builtin/notes.c:802 |
a0b6b246 | 11734 | msgid "must specify a notes ref to merge" |
9a4b694c | 11735 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 11736 | |
6937cb4e | 11737 | #: builtin/notes.c:826 |
5c57d762 | 11738 | #, c-format |
a0b6b246 | 11739 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
11740 | msgstr "未知的 -s/--strategy:%s" |
11741 | ||
6937cb4e | 11742 | #: builtin/notes.c:863 |
1b7f4a34 | 11743 | #, c-format |
a0b6b246 JX |
11744 | msgid "a notes merge into %s is already in-progress at %s" |
11745 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 11746 | |
6937cb4e | 11747 | #: builtin/notes.c:866 |
5c57d762 | 11748 | #, c-format |
a0b6b246 JX |
11749 | msgid "failed to store link to current notes ref (%s)" |
11750 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 11751 | |
6937cb4e | 11752 | #: builtin/notes.c:868 |
5c57d762 JX |
11753 | #, c-format |
11754 | msgid "" | |
11755 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
11756 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
11757 | "abort'.\n" | |
a0b6b246 JX |
11758 | msgstr "" |
11759 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
11760 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 11761 | |
6937cb4e | 11762 | #: builtin/notes.c:890 |
ef317cd5 JX |
11763 | #, c-format |
11764 | msgid "Object %s has no note\n" | |
11765 | msgstr "对象 %s 没有注解\n" | |
11766 | ||
6937cb4e | 11767 | #: builtin/notes.c:902 |
ef317cd5 | 11768 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 11769 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 11770 | |
6937cb4e | 11771 | #: builtin/notes.c:905 |
ef317cd5 | 11772 | msgid "read object names from the standard input" |
07432cef | 11773 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 11774 | |
fd8cb379 | 11775 | #: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 |
5c57d762 JX |
11776 | msgid "do not remove, show only" |
11777 | msgstr "不删除,只显示" | |
11778 | ||
6937cb4e | 11779 | #: builtin/notes.c:944 |
5c57d762 JX |
11780 | msgid "report pruned notes" |
11781 | msgstr "报告清除的注解" | |
11782 | ||
6937cb4e | 11783 | #: builtin/notes.c:986 |
6c94aba5 | 11784 | msgid "notes-ref" |
07432cef | 11785 | msgstr "注解引用" |
ef317cd5 | 11786 | |
6937cb4e | 11787 | #: builtin/notes.c:987 |
814ff314 | 11788 | msgid "use notes from <notes-ref>" |
07432cef | 11789 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 11790 | |
6937cb4e | 11791 | #: builtin/notes.c:1022 |
ef317cd5 | 11792 | #, c-format |
a0b6b246 | 11793 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
11794 | msgstr "未知子命令:%s" |
11795 | ||
fd8cb379 | 11796 | #: builtin/pack-objects.c:48 |
1b7f4a34 JX |
11797 | msgid "" |
11798 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
11799 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 11800 | |
fd8cb379 | 11801 | #: builtin/pack-objects.c:49 |
1b7f4a34 JX |
11802 | msgid "" |
11803 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 11804 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 11805 | |
fd8cb379 | 11806 | #: builtin/pack-objects.c:211 builtin/pack-objects.c:214 |
ef317cd5 JX |
11807 | #, c-format |
11808 | msgid "deflate error (%d)" | |
11809 | msgstr "压缩错误 (%d)" | |
11810 | ||
fd8cb379 | 11811 | #: builtin/pack-objects.c:810 |
5b04ee3b JX |
11812 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
11813 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
11814 | ||
fd8cb379 | 11815 | #: builtin/pack-objects.c:823 |
6c94aba5 JX |
11816 | msgid "Writing objects" |
11817 | msgstr "写入对象中" | |
11818 | ||
fd8cb379 | 11819 | #: builtin/pack-objects.c:1106 |
6c94aba5 JX |
11820 | msgid "disabling bitmap writing, as some objects are not being packed" |
11821 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
11822 | ||
fd8cb379 JX |
11823 | #: builtin/pack-objects.c:1765 |
11824 | msgid "Counting objects" | |
11825 | msgstr "对象计数中" | |
11826 | ||
11827 | #: builtin/pack-objects.c:1895 | |
11828 | #, c-format | |
11829 | msgid "unable to get size of %s" | |
11830 | msgstr "不能得到 %s 的大小" | |
11831 | ||
11832 | #: builtin/pack-objects.c:1910 | |
11833 | #, c-format | |
11834 | msgid "unable to parse object header of %s" | |
11835 | msgstr "无法解析对象 %s 头信息" | |
11836 | ||
11837 | #: builtin/pack-objects.c:2564 | |
6c94aba5 JX |
11838 | msgid "Compressing objects" |
11839 | msgstr "压缩对象中" | |
11840 | ||
fd8cb379 | 11841 | #: builtin/pack-objects.c:2735 |
5809aa05 JX |
11842 | msgid "invalid value for --missing" |
11843 | msgstr "选项 --missing 的值无效" | |
11844 | ||
fd8cb379 | 11845 | #: builtin/pack-objects.c:3067 |
ef317cd5 JX |
11846 | #, c-format |
11847 | msgid "unsupported index version %s" | |
11848 | msgstr "不支持的索引版本 %s" | |
11849 | ||
fd8cb379 | 11850 | #: builtin/pack-objects.c:3071 |
ef317cd5 JX |
11851 | #, c-format |
11852 | msgid "bad index version '%s'" | |
11853 | msgstr "坏的索引版本 '%s'" | |
11854 | ||
fd8cb379 | 11855 | #: builtin/pack-objects.c:3102 |
ef317cd5 | 11856 | msgid "do not show progress meter" |
07432cef | 11857 | msgstr "不显示进度表" |
ef317cd5 | 11858 | |
fd8cb379 | 11859 | #: builtin/pack-objects.c:3104 |
ef317cd5 | 11860 | msgid "show progress meter" |
07432cef | 11861 | msgstr "显示进度表" |
ef317cd5 | 11862 | |
fd8cb379 | 11863 | #: builtin/pack-objects.c:3106 |
ef317cd5 | 11864 | msgid "show progress meter during object writing phase" |
07432cef | 11865 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 11866 | |
fd8cb379 | 11867 | #: builtin/pack-objects.c:3109 |
ef317cd5 | 11868 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 11869 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 11870 | |
fd8cb379 | 11871 | #: builtin/pack-objects.c:3110 |
ef317cd5 | 11872 | msgid "version[,offset]" |
07432cef | 11873 | msgstr "版本[,偏移]" |
ef317cd5 | 11874 | |
fd8cb379 | 11875 | #: builtin/pack-objects.c:3111 |
ef317cd5 | 11876 | msgid "write the pack index file in the specified idx format version" |
07432cef | 11877 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 11878 | |
fd8cb379 | 11879 | #: builtin/pack-objects.c:3114 |
ef317cd5 | 11880 | msgid "maximum size of each output pack file" |
07432cef | 11881 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 11882 | |
fd8cb379 | 11883 | #: builtin/pack-objects.c:3116 |
ef317cd5 | 11884 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 11885 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 11886 | |
fd8cb379 | 11887 | #: builtin/pack-objects.c:3118 |
ef317cd5 | 11888 | msgid "ignore packed objects" |
07432cef | 11889 | msgstr "忽略包对象" |
ef317cd5 | 11890 | |
fd8cb379 | 11891 | #: builtin/pack-objects.c:3120 |
ef317cd5 | 11892 | msgid "limit pack window by objects" |
07432cef | 11893 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 11894 | |
fd8cb379 | 11895 | #: builtin/pack-objects.c:3122 |
ef317cd5 | 11896 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 11897 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 11898 | |
fd8cb379 | 11899 | #: builtin/pack-objects.c:3124 |
ef317cd5 | 11900 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 11901 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 11902 | |
fd8cb379 | 11903 | #: builtin/pack-objects.c:3126 |
ef317cd5 | 11904 | msgid "reuse existing deltas" |
07432cef | 11905 | msgstr "重用已存在的 deltas" |
ef317cd5 | 11906 | |
fd8cb379 | 11907 | #: builtin/pack-objects.c:3128 |
ef317cd5 | 11908 | msgid "reuse existing objects" |
07432cef | 11909 | msgstr "重用已存在的对象" |
ef317cd5 | 11910 | |
fd8cb379 | 11911 | #: builtin/pack-objects.c:3130 |
ef317cd5 | 11912 | msgid "use OFS_DELTA objects" |
07432cef | 11913 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 11914 | |
fd8cb379 | 11915 | #: builtin/pack-objects.c:3132 |
ef317cd5 | 11916 | msgid "use threads when searching for best delta matches" |
07432cef | 11917 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 11918 | |
fd8cb379 | 11919 | #: builtin/pack-objects.c:3134 |
ef317cd5 | 11920 | msgid "do not create an empty pack output" |
07432cef | 11921 | msgstr "不创建空的包输出" |
ef317cd5 | 11922 | |
fd8cb379 | 11923 | #: builtin/pack-objects.c:3136 |
ef317cd5 | 11924 | msgid "read revision arguments from standard input" |
d9d56b23 | 11925 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 11926 | |
fd8cb379 | 11927 | #: builtin/pack-objects.c:3138 |
ef317cd5 | 11928 | msgid "limit the objects to those that are not yet packed" |
07432cef | 11929 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 11930 | |
fd8cb379 | 11931 | #: builtin/pack-objects.c:3141 |
ef317cd5 | 11932 | msgid "include objects reachable from any reference" |
07432cef | 11933 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 11934 | |
fd8cb379 | 11935 | #: builtin/pack-objects.c:3144 |
ef317cd5 | 11936 | msgid "include objects referred by reflog entries" |
07432cef | 11937 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 11938 | |
fd8cb379 | 11939 | #: builtin/pack-objects.c:3147 |
220c313c JX |
11940 | msgid "include objects referred to by the index" |
11941 | msgstr "包括被索引引用到的对象" | |
11942 | ||
fd8cb379 | 11943 | #: builtin/pack-objects.c:3150 |
ef317cd5 | 11944 | msgid "output pack to stdout" |
07432cef | 11945 | msgstr "输出包到标准输出" |
ef317cd5 | 11946 | |
fd8cb379 | 11947 | #: builtin/pack-objects.c:3152 |
ef317cd5 | 11948 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 11949 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 11950 | |
fd8cb379 | 11951 | #: builtin/pack-objects.c:3154 |
ef317cd5 | 11952 | msgid "keep unreachable objects" |
07432cef | 11953 | msgstr "维持不可达的对象" |
ef317cd5 | 11954 | |
fd8cb379 | 11955 | #: builtin/pack-objects.c:3156 |
5c57d762 JX |
11956 | msgid "pack loose unreachable objects" |
11957 | msgstr "打包松散的不可达对象" | |
11958 | ||
fd8cb379 | 11959 | #: builtin/pack-objects.c:3158 |
ef317cd5 | 11960 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 11961 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 11962 | |
fd8cb379 | 11963 | #: builtin/pack-objects.c:3161 |
ef317cd5 | 11964 | msgid "create thin packs" |
07432cef | 11965 | msgstr "创建精简包" |
ef317cd5 | 11966 | |
fd8cb379 | 11967 | #: builtin/pack-objects.c:3163 |
04cb2f28 | 11968 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 11969 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 11970 | |
fd8cb379 | 11971 | #: builtin/pack-objects.c:3165 |
ef317cd5 | 11972 | msgid "ignore packs that have companion .keep file" |
07432cef | 11973 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 11974 | |
fd8cb379 JX |
11975 | #: builtin/pack-objects.c:3167 |
11976 | msgid "ignore this pack" | |
11977 | msgstr "忽略该 pack" | |
11978 | ||
11979 | #: builtin/pack-objects.c:3169 | |
ef317cd5 | 11980 | msgid "pack compression level" |
07432cef | 11981 | msgstr "打包压缩级别" |
ef317cd5 | 11982 | |
fd8cb379 | 11983 | #: builtin/pack-objects.c:3171 |
ef317cd5 | 11984 | msgid "do not hide commits by grafts" |
fd8cb379 | 11985 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 11986 | |
fd8cb379 | 11987 | #: builtin/pack-objects.c:3173 |
6c94aba5 JX |
11988 | msgid "use a bitmap index if available to speed up counting objects" |
11989 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
11990 | ||
fd8cb379 | 11991 | #: builtin/pack-objects.c:3175 |
6c94aba5 JX |
11992 | msgid "write a bitmap index together with the pack index" |
11993 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
11994 | ||
fd8cb379 | 11995 | #: builtin/pack-objects.c:3178 |
5809aa05 JX |
11996 | msgid "handling for missing objects" |
11997 | msgstr "处理丢失的对象" | |
11998 | ||
fd8cb379 | 11999 | #: builtin/pack-objects.c:3181 |
31e5e17b JX |
12000 | msgid "do not pack objects in promisor packfiles" |
12001 | msgstr "不要打包 promisor 包文件中的对象" | |
12002 | ||
fd8cb379 JX |
12003 | #: builtin/pack-objects.c:3205 |
12004 | #, c-format | |
12005 | msgid "delta chain depth %d is too deep, forcing %d" | |
12006 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
12007 | ||
12008 | #: builtin/pack-objects.c:3210 | |
12009 | #, c-format | |
12010 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
12011 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 12012 | |
fd8cb379 JX |
12013 | #: builtin/pack-objects.c:3338 |
12014 | msgid "Enumerating objects" | |
12015 | msgstr "枚举对象" | |
12016 | ||
12017 | #: builtin/pack-refs.c:7 | |
814ff314 JX |
12018 | msgid "git pack-refs [<options>]" |
12019 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 12020 | |
fd8cb379 | 12021 | #: builtin/pack-refs.c:15 |
ef317cd5 | 12022 | msgid "pack everything" |
07432cef | 12023 | msgstr "打包一切" |
c04f5ac3 | 12024 | |
fd8cb379 | 12025 | #: builtin/pack-refs.c:16 |
ef317cd5 | 12026 | msgid "prune loose refs (default)" |
07432cef | 12027 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 12028 | |
6937cb4e | 12029 | #: builtin/prune-packed.c:8 |
814ff314 JX |
12030 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
12031 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 12032 | |
6937cb4e | 12033 | #: builtin/prune-packed.c:41 |
6c94aba5 JX |
12034 | msgid "Removing duplicate objects" |
12035 | msgstr "正在删除重复对象" | |
12036 | ||
5bb01d4f | 12037 | #: builtin/prune.c:11 |
5809aa05 JX |
12038 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
12039 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 12040 | |
fd8cb379 | 12041 | #: builtin/prune.c:108 |
1b7f4a34 JX |
12042 | msgid "report pruned objects" |
12043 | msgstr "报告清除的对象" | |
12044 | ||
fd8cb379 | 12045 | #: builtin/prune.c:111 |
1b7f4a34 JX |
12046 | msgid "expire objects older than <time>" |
12047 | msgstr "使早于给定时间的对象过期" | |
12048 | ||
fd8cb379 | 12049 | #: builtin/prune.c:113 |
31e5e17b JX |
12050 | msgid "limit traversal to objects outside promisor packfiles" |
12051 | msgstr "限制遍历 promisor 包以外的对象" | |
12052 | ||
fd8cb379 | 12053 | #: builtin/prune.c:127 |
94550ed3 JX |
12054 | msgid "cannot prune in a precious-objects repo" |
12055 | msgstr "不能在珍品仓库中执行清理操作" | |
12056 | ||
fd8cb379 | 12057 | #: builtin/pull.c:59 builtin/pull.c:61 |
a0b6b246 JX |
12058 | #, c-format |
12059 | msgid "Invalid value for %s: %s" | |
12060 | msgstr "%s 的值无效:%s" | |
12061 | ||
fd8cb379 | 12062 | #: builtin/pull.c:81 |
94550ed3 | 12063 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
12064 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
12065 | ||
fd8cb379 | 12066 | #: builtin/pull.c:132 |
a4f16749 JX |
12067 | msgid "control for recursive fetching of submodules" |
12068 | msgstr "控制子模组的递归获取" | |
12069 | ||
fd8cb379 | 12070 | #: builtin/pull.c:136 |
1b7f4a34 JX |
12071 | msgid "Options related to merging" |
12072 | msgstr "和合并相关的选项" | |
12073 | ||
fd8cb379 | 12074 | #: builtin/pull.c:139 |
1b7f4a34 JX |
12075 | msgid "incorporate changes by rebasing rather than merging" |
12076 | msgstr "使用变基操作取代合并操作以合入修改" | |
12077 | ||
fd8cb379 | 12078 | #: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 |
1b7f4a34 JX |
12079 | msgid "allow fast-forward" |
12080 | msgstr "允许快进式" | |
12081 | ||
fd8cb379 | 12082 | #: builtin/pull.c:175 |
5b04ee3b | 12083 | msgid "automatically stash/stash pop before and after rebase" |
554e8501 | 12084 | msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
5b04ee3b | 12085 | |
fd8cb379 | 12086 | #: builtin/pull.c:191 |
1b7f4a34 JX |
12087 | msgid "Options related to fetching" |
12088 | msgstr "和获取相关的参数" | |
12089 | ||
fd8cb379 | 12090 | #: builtin/pull.c:209 |
276ceeaa JX |
12091 | msgid "number of submodules pulled in parallel" |
12092 | msgstr "并发拉取的子模组的数量" | |
12093 | ||
fd8cb379 | 12094 | #: builtin/pull.c:304 |
1b7f4a34 JX |
12095 | #, c-format |
12096 | msgid "Invalid value for pull.ff: %s" | |
12097 | msgstr "pull.ff 的取值无效:%s" | |
12098 | ||
fd8cb379 | 12099 | #: builtin/pull.c:420 |
1b7f4a34 JX |
12100 | msgid "" |
12101 | "There is no candidate for rebasing against among the refs that you just " | |
12102 | "fetched." | |
12103 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
12104 | ||
fd8cb379 | 12105 | #: builtin/pull.c:422 |
1b7f4a34 JX |
12106 | msgid "" |
12107 | "There are no candidates for merging among the refs that you just fetched." | |
12108 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
12109 | ||
fd8cb379 | 12110 | #: builtin/pull.c:423 |
1b7f4a34 JX |
12111 | msgid "" |
12112 | "Generally this means that you provided a wildcard refspec which had no\n" | |
12113 | "matches on the remote end." | |
12114 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
12115 | ||
fd8cb379 | 12116 | #: builtin/pull.c:426 |
1b7f4a34 JX |
12117 | #, c-format |
12118 | msgid "" | |
12119 | "You asked to pull from the remote '%s', but did not specify\n" | |
12120 | "a branch. Because this is not the default configured remote\n" | |
12121 | "for your current branch, you must specify a branch on the command line." | |
12122 | msgstr "" | |
12123 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
12124 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
12125 | ||
fd8cb379 | 12126 | #: builtin/pull.c:431 git-parse-remote.sh:73 |
1b7f4a34 JX |
12127 | msgid "You are not currently on a branch." |
12128 | msgstr "您当前不在一个分支上。" | |
12129 | ||
fd8cb379 | 12130 | #: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 |
1b7f4a34 JX |
12131 | msgid "Please specify which branch you want to rebase against." |
12132 | msgstr "请指定您要变基到哪一个分支。" | |
12133 | ||
fd8cb379 | 12134 | #: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 |
1b7f4a34 JX |
12135 | msgid "Please specify which branch you want to merge with." |
12136 | msgstr "请指定您要合并哪一个分支。" | |
12137 | ||
fd8cb379 | 12138 | #: builtin/pull.c:436 builtin/pull.c:451 |
1b7f4a34 JX |
12139 | msgid "See git-pull(1) for details." |
12140 | msgstr "详见 git-pull(1)。" | |
12141 | ||
fd8cb379 | 12142 | #: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 |
5b04ee3b JX |
12143 | #: git-parse-remote.sh:64 |
12144 | msgid "<remote>" | |
12145 | msgstr "<远程>" | |
12146 | ||
fd8cb379 | 12147 | #: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 |
5b04ee3b JX |
12148 | #: git-parse-remote.sh:65 |
12149 | msgid "<branch>" | |
12150 | msgstr "<分支>" | |
12151 | ||
fd8cb379 | 12152 | #: builtin/pull.c:446 git-parse-remote.sh:75 |
1b7f4a34 JX |
12153 | msgid "There is no tracking information for the current branch." |
12154 | msgstr "当前分支没有跟踪信息。" | |
12155 | ||
fd8cb379 | 12156 | #: builtin/pull.c:455 git-parse-remote.sh:95 |
1b7f4a34 | 12157 | msgid "" |
5b04ee3b JX |
12158 | "If you wish to set tracking information for this branch you can do so with:" |
12159 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 12160 | |
fd8cb379 | 12161 | #: builtin/pull.c:460 |
1b7f4a34 JX |
12162 | #, c-format |
12163 | msgid "" | |
12164 | "Your configuration specifies to merge with the ref '%s'\n" | |
12165 | "from the remote, but no such ref was fetched." | |
12166 | msgstr "" | |
12167 | "您的配置中指定要合并远程的引用 '%s',\n" | |
12168 | "但是没有获取到这个引用。" | |
7ac1c0ad | 12169 | |
fd8cb379 | 12170 | #: builtin/pull.c:826 |
5c57d762 JX |
12171 | msgid "ignoring --verify-signatures for rebase" |
12172 | msgstr "为变基操作忽略 --verify-signatures" | |
12173 | ||
fd8cb379 | 12174 | #: builtin/pull.c:874 |
5b04ee3b JX |
12175 | msgid "--[no-]autostash option is only valid with --rebase." |
12176 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
12177 | ||
fd8cb379 | 12178 | #: builtin/pull.c:882 |
1b7f4a34 JX |
12179 | msgid "Updating an unborn branch with changes added to the index." |
12180 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
12181 | ||
fd8cb379 | 12182 | #: builtin/pull.c:885 |
a0b6b246 JX |
12183 | msgid "pull with rebase" |
12184 | msgstr "变基式拉取" | |
12185 | ||
fd8cb379 | 12186 | #: builtin/pull.c:886 |
a0b6b246 | 12187 | msgid "please commit or stash them." |
554e8501 | 12188 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 12189 | |
fd8cb379 | 12190 | #: builtin/pull.c:911 |
1b7f4a34 JX |
12191 | #, c-format |
12192 | msgid "" | |
12193 | "fetch updated the current branch head.\n" | |
12194 | "fast-forwarding your working tree from\n" | |
12195 | "commit %s." | |
12196 | msgstr "" | |
12197 | "fetch 更新了当前的分支。快进您的工作区\n" | |
12198 | "至提交 %s。" | |
ef317cd5 | 12199 | |
fd8cb379 | 12200 | #: builtin/pull.c:916 |
1b7f4a34 JX |
12201 | #, c-format |
12202 | msgid "" | |
12203 | "Cannot fast-forward your working tree.\n" | |
12204 | "After making sure that you saved anything precious from\n" | |
12205 | "$ git diff %s\n" | |
12206 | "output, run\n" | |
12207 | "$ git reset --hard\n" | |
12208 | "to recover." | |
12209 | msgstr "" | |
12210 | "您当前的工作区无法执行快进操作。\n" | |
12211 | "首先执行如下命令:\n" | |
12212 | "$ git diff %s\n" | |
12213 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
12214 | "$ git reset --hard\n" | |
12215 | "恢复之前的状态。" | |
12216 | ||
fd8cb379 | 12217 | #: builtin/pull.c:931 |
1b7f4a34 JX |
12218 | msgid "Cannot merge multiple branches into empty head." |
12219 | msgstr "无法将多个分支合并到空分支。" | |
12220 | ||
fd8cb379 | 12221 | #: builtin/pull.c:935 |
1b7f4a34 JX |
12222 | msgid "Cannot rebase onto multiple branches." |
12223 | msgstr "无法变基到多个分支。" | |
12224 | ||
fd8cb379 | 12225 | #: builtin/pull.c:942 |
a4f16749 JX |
12226 | msgid "cannot rebase with locally recorded submodule modifications" |
12227 | msgstr "本地子模组中有修改,无法变基" | |
12228 | ||
fd8cb379 | 12229 | #: builtin/push.c:19 |
ef317cd5 | 12230 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 12231 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 12232 | |
fd8cb379 | 12233 | #: builtin/push.c:111 |
c04f5ac3 | 12234 | msgid "tag shorthand without <tag>" |
55a16ee4 | 12235 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 12236 | |
fd8cb379 | 12237 | #: builtin/push.c:121 |
c04f5ac3 | 12238 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 12239 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 12240 | |
fd8cb379 | 12241 | #: builtin/push.c:165 |
8ada9598 JX |
12242 | msgid "" |
12243 | "\n" | |
12244 | "To choose either option permanently, see push.default in 'git help config'." | |
12245 | msgstr "" | |
81809b99 JX |
12246 | "\n" |
12247 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 12248 | |
fd8cb379 | 12249 | #: builtin/push.c:168 |
8ada9598 JX |
12250 | #, c-format |
12251 | msgid "" | |
12252 | "The upstream branch of your current branch does not match\n" | |
12253 | "the name of your current branch. To push to the upstream branch\n" | |
12254 | "on the remote, use\n" | |
12255 | "\n" | |
12256 | " git push %s HEAD:%s\n" | |
12257 | "\n" | |
12258 | "To push to the branch of the same name on the remote, use\n" | |
12259 | "\n" | |
12260 | " git push %s %s\n" | |
12261 | "%s" | |
12262 | msgstr "" | |
81809b99 JX |
12263 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
12264 | "上游分支,使用\n" | |
12265 | "\n" | |
12266 | " git push %s HEAD:%s\n" | |
12267 | "\n" | |
12268 | "为推送至远程同名分支,使用\n" | |
12269 | "\n" | |
12270 | " git push %s %s\n" | |
12271 | "%s" | |
8ada9598 | 12272 | |
fd8cb379 | 12273 | #: builtin/push.c:183 |
c04f5ac3 JX |
12274 | #, c-format |
12275 | msgid "" | |
12276 | "You are not currently on a branch.\n" | |
12277 | "To push the history leading to the current (detached HEAD)\n" | |
12278 | "state now, use\n" | |
12279 | "\n" | |
12280 | " git push %s HEAD:<name-of-remote-branch>\n" | |
12281 | msgstr "" | |
12282 | "您当前不在一个分支上。\n" | |
90e6ef53 | 12283 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 12284 | "\n" |
d9d56b23 | 12285 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 12286 | |
fd8cb379 | 12287 | #: builtin/push.c:197 |
c04f5ac3 JX |
12288 | #, c-format |
12289 | msgid "" | |
12290 | "The current branch %s has no upstream branch.\n" | |
12291 | "To push the current branch and set the remote as upstream, use\n" | |
12292 | "\n" | |
12293 | " git push --set-upstream %s %s\n" | |
12294 | msgstr "" | |
12295 | "当前分支 %s 没有对应的上游分支。\n" | |
12296 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
12297 | "\n" | |
12298 | " git push --set-upstream %s %s\n" | |
12299 | ||
fd8cb379 | 12300 | #: builtin/push.c:205 |
c04f5ac3 JX |
12301 | #, c-format |
12302 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
12303 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
12304 | ||
fd8cb379 | 12305 | #: builtin/push.c:208 |
73a60cd2 JX |
12306 | #, c-format |
12307 | msgid "" | |
12308 | "You are pushing to remote '%s', which is not the upstream of\n" | |
12309 | "your current branch '%s', without telling me what to push\n" | |
12310 | "to update which remote branch." | |
12311 | msgstr "" | |
12312 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
12313 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
12314 | ||
fd8cb379 | 12315 | #: builtin/push.c:267 |
c04f5ac3 JX |
12316 | msgid "" |
12317 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 12318 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 12319 | |
fd8cb379 | 12320 | #: builtin/push.c:274 |
170e9899 JX |
12321 | msgid "" |
12322 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
12323 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
12324 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
12325 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
12326 | msgstr "" | |
eff6d3a9 | 12327 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 12328 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 12329 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 12330 | |
fd8cb379 | 12331 | #: builtin/push.c:280 |
170e9899 JX |
12332 | msgid "" |
12333 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
12334 | "counterpart. Check out this branch and integrate the remote changes\n" |
12335 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
12336 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
12337 | msgstr "" | |
eff6d3a9 | 12338 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 12339 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 12340 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 12341 | |
fd8cb379 | 12342 | #: builtin/push.c:286 |
07432cef | 12343 | msgid "" |
a77c07d9 JX |
12344 | "Updates were rejected because the remote contains work that you do\n" |
12345 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
12346 | "to the same ref. You may want to first integrate the remote changes\n" |
12347 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
12348 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
12349 | msgstr "" | |
160fb2b2 JX |
12350 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
12351 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 12352 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
12353 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
12354 | ||
fd8cb379 | 12355 | #: builtin/push.c:293 |
a77c07d9 | 12356 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 12357 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 12358 | |
fd8cb379 | 12359 | #: builtin/push.c:296 |
a77c07d9 JX |
12360 | msgid "" |
12361 | "You cannot update a remote ref that points at a non-commit object,\n" | |
12362 | "or update a remote ref to make it point at a non-commit object,\n" | |
12363 | "without using the '--force' option.\n" | |
12364 | msgstr "" | |
12365 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
12366 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 12367 | |
fd8cb379 | 12368 | #: builtin/push.c:357 |
c04f5ac3 JX |
12369 | #, c-format |
12370 | msgid "Pushing to %s\n" | |
12371 | msgstr "推送到 %s\n" | |
12372 | ||
fd8cb379 | 12373 | #: builtin/push.c:361 |
c04f5ac3 JX |
12374 | #, c-format |
12375 | msgid "failed to push some refs to '%s'" | |
12376 | msgstr "无法推送一些引用到 '%s'" | |
12377 | ||
fd8cb379 | 12378 | #: builtin/push.c:395 |
c04f5ac3 JX |
12379 | #, c-format |
12380 | msgid "bad repository '%s'" | |
160fb2b2 | 12381 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 12382 | |
fd8cb379 | 12383 | #: builtin/push.c:396 |
c04f5ac3 JX |
12384 | msgid "" |
12385 | "No configured push destination.\n" | |
12386 | "Either specify the URL from the command-line or configure a remote " | |
12387 | "repository using\n" | |
12388 | "\n" | |
12389 | " git remote add <name> <url>\n" | |
12390 | "\n" | |
12391 | "and then push using the remote name\n" | |
12392 | "\n" | |
12393 | " git push <name>\n" | |
12394 | msgstr "" | |
90e6ef53 | 12395 | "没有配置推送目标。\n" |
4375c10e | 12396 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 12397 | "\n" |
d9d56b23 | 12398 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 12399 | "\n" |
160fb2b2 | 12400 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 12401 | "\n" |
d9d56b23 | 12402 | " git push <名称>\n" |
c04f5ac3 | 12403 | |
fd8cb379 | 12404 | #: builtin/push.c:551 |
ef317cd5 | 12405 | msgid "repository" |
160fb2b2 | 12406 | msgstr "仓库" |
ef317cd5 | 12407 | |
fd8cb379 | 12408 | #: builtin/push.c:552 builtin/send-pack.c:164 |
ef317cd5 | 12409 | msgid "push all refs" |
07432cef | 12410 | msgstr "推送所有引用" |
ef317cd5 | 12411 | |
fd8cb379 | 12412 | #: builtin/push.c:553 builtin/send-pack.c:166 |
ef317cd5 | 12413 | msgid "mirror all refs" |
07432cef | 12414 | msgstr "镜像所有引用" |
ef317cd5 | 12415 | |
fd8cb379 | 12416 | #: builtin/push.c:555 |
ef317cd5 | 12417 | msgid "delete refs" |
07432cef | 12418 | msgstr "删除引用" |
ef317cd5 | 12419 | |
fd8cb379 | 12420 | #: builtin/push.c:556 |
ef317cd5 | 12421 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 12422 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 12423 | |
fd8cb379 | 12424 | #: builtin/push.c:559 builtin/send-pack.c:167 |
ef317cd5 JX |
12425 | msgid "force updates" |
12426 | msgstr "强制更新" | |
12427 | ||
fd8cb379 | 12428 | #: builtin/push.c:561 builtin/send-pack.c:181 |
90314792 JX |
12429 | msgid "refname>:<expect" |
12430 | msgstr "引用名>:<期望值" | |
12431 | ||
fd8cb379 | 12432 | #: builtin/push.c:562 builtin/send-pack.c:182 |
90314792 JX |
12433 | msgid "require old value of ref to be at this value" |
12434 | msgstr "要求引用旧的取值为设定值" | |
12435 | ||
fd8cb379 | 12436 | #: builtin/push.c:565 |
ef317cd5 | 12437 | msgid "control recursive pushing of submodules" |
07432cef | 12438 | msgstr "控制子模组的递归推送" |
ef317cd5 | 12439 | |
fd8cb379 | 12440 | #: builtin/push.c:567 builtin/send-pack.c:175 |
ef317cd5 | 12441 | msgid "use thin pack" |
07432cef | 12442 | msgstr "使用精简打包" |
ef317cd5 | 12443 | |
fd8cb379 JX |
12444 | #: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 |
12445 | #: builtin/send-pack.c:162 | |
ef317cd5 | 12446 | msgid "receive pack program" |
07432cef | 12447 | msgstr "接收包程序" |
ef317cd5 | 12448 | |
fd8cb379 | 12449 | #: builtin/push.c:570 |
ef317cd5 | 12450 | msgid "set upstream for git pull/status" |
07432cef | 12451 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 12452 | |
fd8cb379 | 12453 | #: builtin/push.c:573 |
ef317cd5 | 12454 | msgid "prune locally removed refs" |
07432cef | 12455 | msgstr "清除本地删除的引用" |
ef317cd5 | 12456 | |
fd8cb379 | 12457 | #: builtin/push.c:575 |
a77c07d9 JX |
12458 | msgid "bypass pre-push hook" |
12459 | msgstr "绕过 pre-push 钩子" | |
12460 | ||
fd8cb379 | 12461 | #: builtin/push.c:576 |
1003b3a5 | 12462 | msgid "push missing but relevant tags" |
55a16ee4 | 12463 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 12464 | |
fd8cb379 | 12465 | #: builtin/push.c:579 builtin/send-pack.c:169 |
220c313c JX |
12466 | msgid "GPG sign the push" |
12467 | msgstr "用 GPG 为推送签名" | |
12468 | ||
fd8cb379 | 12469 | #: builtin/push.c:581 builtin/send-pack.c:176 |
814ff314 JX |
12470 | msgid "request atomic transaction on remote side" |
12471 | msgstr "需要远端支持原子事务" | |
12472 | ||
fd8cb379 | 12473 | #: builtin/push.c:599 |
c04f5ac3 JX |
12474 | msgid "--delete is incompatible with --all, --mirror and --tags" |
12475 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
12476 | ||
fd8cb379 | 12477 | #: builtin/push.c:601 |
c04f5ac3 JX |
12478 | msgid "--delete doesn't make sense without any refs" |
12479 | msgstr "--delete 未接任何引用没有意义" | |
12480 | ||
5809aa05 | 12481 | #: builtin/push.c:604 |
fd8cb379 JX |
12482 | msgid "--all and --tags are incompatible" |
12483 | msgstr "--all 和 --tags 不兼容" | |
12484 | ||
12485 | #: builtin/push.c:606 | |
12486 | msgid "--all can't be combined with refspecs" | |
12487 | msgstr "--all 不能和引用规格同时使用" | |
12488 | ||
12489 | #: builtin/push.c:610 | |
12490 | msgid "--mirror and --tags are incompatible" | |
12491 | msgstr "--mirror 和 --tags 不兼容" | |
12492 | ||
12493 | #: builtin/push.c:612 | |
12494 | msgid "--mirror can't be combined with refspecs" | |
12495 | msgstr "--mirror 不能和引用规格同时使用" | |
12496 | ||
12497 | #: builtin/push.c:615 | |
12498 | msgid "--all and --mirror are incompatible" | |
12499 | msgstr "--all 和 --mirror 不兼容" | |
12500 | ||
12501 | #: builtin/push.c:634 | |
5c57d762 JX |
12502 | msgid "push options must not have new line characters" |
12503 | msgstr "推送选项不能有换行符" | |
12504 | ||
87cb7997 | 12505 | #: builtin/read-tree.c:40 |
ef317cd5 | 12506 | msgid "" |
1b7f4a34 | 12507 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
12508 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
12509 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
12510 | msgstr "" | |
1b7f4a34 | 12511 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 12512 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 12513 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 12514 | |
fd8cb379 | 12515 | #: builtin/read-tree.c:120 |
ef317cd5 | 12516 | msgid "write resulting index to <file>" |
d9d56b23 | 12517 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 12518 | |
fd8cb379 | 12519 | #: builtin/read-tree.c:123 |
ef317cd5 | 12520 | msgid "only empty the index" |
07432cef | 12521 | msgstr "只是清空索引" |
ef317cd5 | 12522 | |
fd8cb379 | 12523 | #: builtin/read-tree.c:125 |
ef317cd5 | 12524 | msgid "Merging" |
07432cef | 12525 | msgstr "合并" |
ef317cd5 | 12526 | |
fd8cb379 | 12527 | #: builtin/read-tree.c:127 |
ef317cd5 | 12528 | msgid "perform a merge in addition to a read" |
07432cef | 12529 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 12530 | |
fd8cb379 | 12531 | #: builtin/read-tree.c:129 |
ef317cd5 | 12532 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 12533 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 12534 | |
fd8cb379 | 12535 | #: builtin/read-tree.c:131 |
ef317cd5 | 12536 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 12537 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 12538 | |
fd8cb379 | 12539 | #: builtin/read-tree.c:133 |
ef317cd5 | 12540 | msgid "same as -m, but discard unmerged entries" |
07432cef | 12541 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 12542 | |
fd8cb379 | 12543 | #: builtin/read-tree.c:134 |
ef317cd5 | 12544 | msgid "<subdirectory>/" |
07432cef | 12545 | msgstr "<子目录>/" |
ef317cd5 | 12546 | |
fd8cb379 | 12547 | #: builtin/read-tree.c:135 |
ef317cd5 | 12548 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 12549 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 12550 | |
fd8cb379 | 12551 | #: builtin/read-tree.c:138 |
ef317cd5 | 12552 | msgid "update working tree with merge result" |
07432cef | 12553 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 12554 | |
fd8cb379 | 12555 | #: builtin/read-tree.c:140 |
ef317cd5 | 12556 | msgid "gitignore" |
07432cef | 12557 | msgstr "gitignore" |
ef317cd5 | 12558 | |
fd8cb379 | 12559 | #: builtin/read-tree.c:141 |
ef317cd5 | 12560 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 12561 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 12562 | |
fd8cb379 | 12563 | #: builtin/read-tree.c:144 |
ef317cd5 | 12564 | msgid "don't check the working tree after merging" |
07432cef | 12565 | msgstr "合并后不检查工作区" |
ef317cd5 | 12566 | |
fd8cb379 | 12567 | #: builtin/read-tree.c:145 |
ef317cd5 | 12568 | msgid "don't update the index or the work tree" |
07432cef | 12569 | msgstr "不更新索引区和工作区" |
ef317cd5 | 12570 | |
fd8cb379 | 12571 | #: builtin/read-tree.c:147 |
ef317cd5 | 12572 | msgid "skip applying sparse checkout filter" |
07432cef | 12573 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 12574 | |
fd8cb379 | 12575 | #: builtin/read-tree.c:149 |
ef317cd5 | 12576 | msgid "debug unpack-trees" |
07432cef | 12577 | msgstr "调试 unpack-trees" |
ef317cd5 | 12578 | |
a4f16749 | 12579 | #: builtin/rebase--helper.c:8 |
87cb7997 JX |
12580 | msgid "git rebase--helper [<options>]" |
12581 | msgstr "git rebase--helper [<选项>]" | |
12582 | ||
5809aa05 | 12583 | #: builtin/rebase--helper.c:24 |
6937cb4e JX |
12584 | msgid "keep empty commits" |
12585 | msgstr "保持空提交" | |
12586 | ||
31e5e17b JX |
12587 | #: builtin/rebase--helper.c:26 builtin/revert.c:123 |
12588 | msgid "allow commits with empty messages" | |
12589 | msgstr "允许提交说明为空" | |
12590 | ||
12591 | #: builtin/rebase--helper.c:27 | |
fd8cb379 JX |
12592 | msgid "rebase merge commits" |
12593 | msgstr "对合并提交变基" | |
12594 | ||
12595 | #: builtin/rebase--helper.c:29 | |
12596 | msgid "keep original branch points of cousins" | |
12597 | msgstr "保持兄弟提交的原始分支点" | |
12598 | ||
12599 | #: builtin/rebase--helper.c:30 | |
87cb7997 JX |
12600 | msgid "continue rebase" |
12601 | msgstr "继续变基" | |
12602 | ||
fd8cb379 | 12603 | #: builtin/rebase--helper.c:32 |
87cb7997 JX |
12604 | msgid "abort rebase" |
12605 | msgstr "中止变基" | |
12606 | ||
fd8cb379 | 12607 | #: builtin/rebase--helper.c:35 |
6937cb4e JX |
12608 | msgid "make rebase script" |
12609 | msgstr "制作变基脚本" | |
12610 | ||
fd8cb379 | 12611 | #: builtin/rebase--helper.c:37 |
5809aa05 JX |
12612 | msgid "shorten commit ids in the todo list" |
12613 | msgstr "缩短待办列表中的提交号" | |
6937cb4e | 12614 | |
fd8cb379 | 12615 | #: builtin/rebase--helper.c:39 |
5809aa05 JX |
12616 | msgid "expand commit ids in the todo list" |
12617 | msgstr "扩展待办列表中的提交号" | |
12618 | ||
fd8cb379 | 12619 | #: builtin/rebase--helper.c:41 |
6937cb4e JX |
12620 | msgid "check the todo list" |
12621 | msgstr "检查待办列表" | |
12622 | ||
fd8cb379 | 12623 | #: builtin/rebase--helper.c:43 |
6937cb4e JX |
12624 | msgid "skip unnecessary picks" |
12625 | msgstr "跳过不必要的拣选" | |
12626 | ||
fd8cb379 | 12627 | #: builtin/rebase--helper.c:45 |
6937cb4e JX |
12628 | msgid "rearrange fixup/squash lines" |
12629 | msgstr "重新排列 fixup/squash 行" | |
12630 | ||
fd8cb379 | 12631 | #: builtin/rebase--helper.c:47 |
5809aa05 JX |
12632 | msgid "insert exec commands in todo list" |
12633 | msgstr "在待办列表中插入 exec 执行命令" | |
12634 | ||
fd8cb379 JX |
12635 | #: builtin/rebase--helper.c:68 |
12636 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" | |
12637 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
12638 | ||
12639 | #: builtin/receive-pack.c:31 | |
5b04ee3b | 12640 | msgid "git receive-pack <git-dir>" |
58b6f078 | 12641 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 12642 | |
fd8cb379 | 12643 | #: builtin/receive-pack.c:842 |
a0b6b246 JX |
12644 | msgid "" |
12645 | "By default, updating the current branch in a non-bare repository\n" | |
12646 | "is denied, because it will make the index and work tree inconsistent\n" | |
12647 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
12648 | "the work tree to HEAD.\n" | |
12649 | "\n" | |
1a79b2f1 JX |
12650 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
12651 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
12652 | "its current branch; however, this is not recommended unless you\n" |
12653 | "arranged to update its work tree to match what you pushed in some\n" | |
12654 | "other way.\n" | |
12655 | "\n" | |
12656 | "To squelch this message and still keep the default behaviour, set\n" | |
12657 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
12658 | msgstr "" | |
12659 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
12660 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
12661 | "\n" | |
12662 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
12663 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
12664 | "用某种方式将其工作区更新至您推送的状态。\n" | |
12665 | "\n" | |
12666 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
12667 | "配置变量为 'refuse'。" | |
12668 | ||
fd8cb379 | 12669 | #: builtin/receive-pack.c:862 |
a0b6b246 JX |
12670 | msgid "" |
12671 | "By default, deleting the current branch is denied, because the next\n" | |
12672 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
12673 | "\n" | |
12674 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
12675 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
12676 | "current branch, with or without a warning message.\n" | |
12677 | "\n" | |
12678 | "To squelch this message, you can set it to 'refuse'." | |
12679 | msgstr "" | |
12680 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 12681 | "导致困惑。\n" |
a0b6b246 JX |
12682 | "\n" |
12683 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 12684 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
12685 | "\n" |
12686 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
12687 | ||
fd8cb379 | 12688 | #: builtin/receive-pack.c:1935 |
5b04ee3b JX |
12689 | msgid "quiet" |
12690 | msgstr "静默模式" | |
12691 | ||
fd8cb379 | 12692 | #: builtin/receive-pack.c:1949 |
5b04ee3b JX |
12693 | msgid "You must specify a directory." |
12694 | msgstr "您必须指定一个目录。" | |
12695 | ||
31e5e17b | 12696 | #: builtin/reflog.c:532 builtin/reflog.c:537 |
2e8451e8 JX |
12697 | #, c-format |
12698 | msgid "'%s' is not a valid timestamp" | |
12699 | msgstr "'%s' 不是一个有效的时间戳" | |
12700 | ||
fd8cb379 | 12701 | #: builtin/remote.c:14 |
ef317cd5 | 12702 | msgid "git remote [-v | --verbose]" |
07432cef | 12703 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 12704 | |
fd8cb379 | 12705 | #: builtin/remote.c:15 |
ef317cd5 | 12706 | msgid "" |
814ff314 | 12707 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
12708 | "mirror=<fetch|push>] <name> <url>" |
12709 | msgstr "" | |
814ff314 | 12710 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 12711 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 12712 | |
fd8cb379 | 12713 | #: builtin/remote.c:16 builtin/remote.c:36 |
ef317cd5 | 12714 | msgid "git remote rename <old> <new>" |
07432cef | 12715 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 12716 | |
fd8cb379 | 12717 | #: builtin/remote.c:17 builtin/remote.c:41 |
ef317cd5 | 12718 | msgid "git remote remove <name>" |
07432cef | 12719 | msgstr "git remote remove <名称>" |
ef317cd5 | 12720 | |
fd8cb379 | 12721 | #: builtin/remote.c:18 builtin/remote.c:46 |
814ff314 JX |
12722 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
12723 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 12724 | |
fd8cb379 | 12725 | #: builtin/remote.c:19 |
ef317cd5 | 12726 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 12727 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 12728 | |
fd8cb379 | 12729 | #: builtin/remote.c:20 |
ef317cd5 | 12730 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 12731 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 12732 | |
fd8cb379 | 12733 | #: builtin/remote.c:21 |
ef317cd5 JX |
12734 | msgid "" |
12735 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 12736 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 12737 | |
fd8cb379 | 12738 | #: builtin/remote.c:22 |
ef317cd5 | 12739 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 12740 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 12741 | |
fd8cb379 | 12742 | #: builtin/remote.c:23 builtin/remote.c:72 |
94550ed3 JX |
12743 | msgid "git remote get-url [--push] [--all] <name>" |
12744 | msgstr "git remote get-url [--push] [--all] <名称>" | |
12745 | ||
fd8cb379 | 12746 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 12747 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 12748 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 12749 | |
fd8cb379 | 12750 | #: builtin/remote.c:25 builtin/remote.c:78 |
ef317cd5 | 12751 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 12752 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 12753 | |
fd8cb379 | 12754 | #: builtin/remote.c:26 builtin/remote.c:79 |
ef317cd5 | 12755 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 12756 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 12757 | |
fd8cb379 | 12758 | #: builtin/remote.c:31 |
ef317cd5 | 12759 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 12760 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 12761 | |
fd8cb379 | 12762 | #: builtin/remote.c:51 |
ef317cd5 | 12763 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 12764 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 12765 | |
fd8cb379 | 12766 | #: builtin/remote.c:52 |
ef317cd5 | 12767 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 12768 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 12769 | |
fd8cb379 | 12770 | #: builtin/remote.c:57 |
ef317cd5 | 12771 | msgid "git remote show [<options>] <name>" |
07432cef | 12772 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 12773 | |
fd8cb379 | 12774 | #: builtin/remote.c:62 |
ef317cd5 | 12775 | msgid "git remote prune [<options>] <name>" |
07432cef | 12776 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 12777 | |
fd8cb379 | 12778 | #: builtin/remote.c:67 |
ef317cd5 | 12779 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 12780 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 12781 | |
fd8cb379 | 12782 | #: builtin/remote.c:96 |
81809b99 | 12783 | #, c-format |
8ada9598 | 12784 | msgid "Updating %s" |
81809b99 | 12785 | msgstr "更新 %s 中" |
8ada9598 | 12786 | |
fd8cb379 | 12787 | #: builtin/remote.c:128 |
8ada9598 JX |
12788 | msgid "" |
12789 | "--mirror is dangerous and deprecated; please\n" | |
12790 | "\t use --mirror=fetch or --mirror=push instead" | |
12791 | msgstr "" | |
81809b99 JX |
12792 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
12793 | "\t 或 --mirror=push" | |
8ada9598 | 12794 | |
fd8cb379 | 12795 | #: builtin/remote.c:145 |
81809b99 | 12796 | #, c-format |
8ada9598 | 12797 | msgid "unknown mirror argument: %s" |
81809b99 | 12798 | msgstr "未知的镜像参数:%s" |
8ada9598 | 12799 | |
fd8cb379 | 12800 | #: builtin/remote.c:161 |
ef317cd5 | 12801 | msgid "fetch the remote branches" |
07432cef | 12802 | msgstr "抓取远程的分支" |
ef317cd5 | 12803 | |
fd8cb379 | 12804 | #: builtin/remote.c:163 |
ef317cd5 | 12805 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 12806 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 12807 | |
fd8cb379 | 12808 | #: builtin/remote.c:166 |
ef317cd5 | 12809 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 12810 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 12811 | |
fd8cb379 | 12812 | #: builtin/remote.c:168 |
ef317cd5 | 12813 | msgid "branch(es) to track" |
07432cef | 12814 | msgstr "跟踪的分支" |
ef317cd5 | 12815 | |
fd8cb379 | 12816 | #: builtin/remote.c:169 |
ef317cd5 | 12817 | msgid "master branch" |
07432cef | 12818 | msgstr "主线分支" |
ef317cd5 | 12819 | |
fd8cb379 | 12820 | #: builtin/remote.c:170 |
ef317cd5 | 12821 | msgid "push|fetch" |
07432cef | 12822 | msgstr "push|fetch" |
ef317cd5 | 12823 | |
fd8cb379 | 12824 | #: builtin/remote.c:171 |
ef317cd5 | 12825 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 12826 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 12827 | |
fd8cb379 | 12828 | #: builtin/remote.c:183 |
8ada9598 | 12829 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 12830 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 12831 | |
fd8cb379 | 12832 | #: builtin/remote.c:185 |
8ada9598 | 12833 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 12834 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 12835 | |
fd8cb379 | 12836 | #: builtin/remote.c:192 builtin/remote.c:634 |
81809b99 | 12837 | #, c-format |
8ada9598 | 12838 | msgid "remote %s already exists." |
81809b99 | 12839 | msgstr "远程 %s 已经存在。" |
8ada9598 | 12840 | |
fd8cb379 | 12841 | #: builtin/remote.c:196 builtin/remote.c:638 |
81809b99 | 12842 | #, c-format |
8ada9598 | 12843 | msgid "'%s' is not a valid remote name" |
81809b99 | 12844 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 12845 | |
fd8cb379 | 12846 | #: builtin/remote.c:236 |
81809b99 | 12847 | #, c-format |
8ada9598 | 12848 | msgid "Could not setup master '%s'" |
81809b99 | 12849 | msgstr "无法设置 master '%s'" |
8ada9598 | 12850 | |
fd8cb379 | 12851 | #: builtin/remote.c:342 |
81809b99 | 12852 | #, c-format |
8ada9598 | 12853 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 12854 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 12855 | |
fd8cb379 | 12856 | #: builtin/remote.c:441 builtin/remote.c:449 |
8ada9598 | 12857 | msgid "(matching)" |
81809b99 | 12858 | msgstr "(匹配)" |
8ada9598 | 12859 | |
fd8cb379 | 12860 | #: builtin/remote.c:453 |
8ada9598 | 12861 | msgid "(delete)" |
81809b99 | 12862 | msgstr "(删除)" |
8ada9598 | 12863 | |
fd8cb379 | 12864 | #: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 |
81809b99 | 12865 | #, c-format |
8ada9598 | 12866 | msgid "No such remote: %s" |
81809b99 | 12867 | msgstr "没有这样的远程:%s" |
8ada9598 | 12868 | |
fd8cb379 | 12869 | #: builtin/remote.c:644 |
81809b99 | 12870 | #, c-format |
8ada9598 | 12871 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 12872 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 12873 | |
fd8cb379 | 12874 | #: builtin/remote.c:664 |
8ada9598 JX |
12875 | #, c-format |
12876 | msgid "" | |
d691f479 | 12877 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
12878 | "\t%s\n" |
12879 | "\tPlease update the configuration manually if necessary." | |
12880 | msgstr "" | |
160fb2b2 | 12881 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
12882 | "\t%s\n" |
12883 | "\t如果必要请手动更新配置。" | |
8ada9598 | 12884 | |
fd8cb379 | 12885 | #: builtin/remote.c:700 |
81809b99 | 12886 | #, c-format |
8ada9598 | 12887 | msgid "deleting '%s' failed" |
81809b99 | 12888 | msgstr "删除 '%s' 失败" |
8ada9598 | 12889 | |
fd8cb379 | 12890 | #: builtin/remote.c:734 |
81809b99 | 12891 | #, c-format |
8ada9598 | 12892 | msgid "creating '%s' failed" |
81809b99 | 12893 | msgstr "创建 '%s' 失败" |
8ada9598 | 12894 | |
fd8cb379 | 12895 | #: builtin/remote.c:799 |
8ada9598 JX |
12896 | msgid "" |
12897 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
12898 | "to delete it, use:" | |
12899 | msgid_plural "" | |
12900 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
12901 | "to delete them, use:" | |
5ae481e0 JX |
12902 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
12903 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 12904 | |
fd8cb379 | 12905 | #: builtin/remote.c:813 |
276ceeaa JX |
12906 | #, c-format |
12907 | msgid "Could not remove config section '%s'" | |
12908 | msgstr "不能移除配置小节 '%s'" | |
12909 | ||
fd8cb379 | 12910 | #: builtin/remote.c:914 |
8ada9598 JX |
12911 | #, c-format |
12912 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 12913 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 12914 | |
fd8cb379 | 12915 | #: builtin/remote.c:917 |
8ada9598 | 12916 | msgid " tracked" |
81809b99 | 12917 | msgstr " 已跟踪" |
8ada9598 | 12918 | |
fd8cb379 | 12919 | #: builtin/remote.c:919 |
8ada9598 | 12920 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 12921 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 12922 | |
fd8cb379 | 12923 | #: builtin/remote.c:921 |
8ada9598 | 12924 | msgid " ???" |
81809b99 | 12925 | msgstr " ???" |
8ada9598 | 12926 | |
fd8cb379 | 12927 | #: builtin/remote.c:962 |
8ada9598 JX |
12928 | #, c-format |
12929 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 12930 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 12931 | |
fd8cb379 | 12932 | #: builtin/remote.c:971 |
81809b99 | 12933 | #, c-format |
276ceeaa JX |
12934 | msgid "rebases interactively onto remote %s" |
12935 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 12936 | |
fd8cb379 JX |
12937 | #: builtin/remote.c:973 |
12938 | #, c-format | |
12939 | msgid "rebases interactively (with merges) onto remote %s" | |
12940 | msgstr "交互式变基(含合并提交)到远程 %s" | |
12941 | ||
12942 | #: builtin/remote.c:976 | |
5c57d762 JX |
12943 | #, c-format |
12944 | msgid "rebases onto remote %s" | |
12945 | msgstr "变基到远程 %s" | |
12946 | ||
fd8cb379 | 12947 | #: builtin/remote.c:980 |
81809b99 | 12948 | #, c-format |
8ada9598 | 12949 | msgid " merges with remote %s" |
81809b99 | 12950 | msgstr " 与远程 %s 合并" |
8ada9598 | 12951 | |
fd8cb379 | 12952 | #: builtin/remote.c:983 |
81809b99 | 12953 | #, c-format |
8ada9598 | 12954 | msgid "merges with remote %s" |
81809b99 | 12955 | msgstr "与远程 %s 合并" |
8ada9598 | 12956 | |
fd8cb379 | 12957 | #: builtin/remote.c:986 |
5c57d762 JX |
12958 | #, c-format |
12959 | msgid "%-*s and with remote %s\n" | |
12960 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 12961 | |
fd8cb379 | 12962 | #: builtin/remote.c:1029 |
8ada9598 | 12963 | msgid "create" |
81809b99 | 12964 | msgstr "创建" |
8ada9598 | 12965 | |
fd8cb379 | 12966 | #: builtin/remote.c:1032 |
8ada9598 | 12967 | msgid "delete" |
81809b99 | 12968 | msgstr "删除" |
8ada9598 | 12969 | |
fd8cb379 | 12970 | #: builtin/remote.c:1036 |
8ada9598 | 12971 | msgid "up to date" |
81809b99 | 12972 | msgstr "最新" |
8ada9598 | 12973 | |
fd8cb379 | 12974 | #: builtin/remote.c:1039 |
8ada9598 | 12975 | msgid "fast-forwardable" |
81809b99 | 12976 | msgstr "可快进" |
8ada9598 | 12977 | |
fd8cb379 | 12978 | #: builtin/remote.c:1042 |
8ada9598 | 12979 | msgid "local out of date" |
81809b99 | 12980 | msgstr "本地已过时" |
8ada9598 | 12981 | |
fd8cb379 | 12982 | #: builtin/remote.c:1049 |
8ada9598 JX |
12983 | #, c-format |
12984 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 12985 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 12986 | |
fd8cb379 | 12987 | #: builtin/remote.c:1052 |
8ada9598 JX |
12988 | #, c-format |
12989 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 12990 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 12991 | |
fd8cb379 | 12992 | #: builtin/remote.c:1056 |
8ada9598 JX |
12993 | #, c-format |
12994 | msgid " %-*s forces to %s" | |
81809b99 | 12995 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 12996 | |
fd8cb379 | 12997 | #: builtin/remote.c:1059 |
8ada9598 JX |
12998 | #, c-format |
12999 | msgid " %-*s pushes to %s" | |
81809b99 | 13000 | msgstr " %-*s 推送至 %s" |
8ada9598 | 13001 | |
fd8cb379 | 13002 | #: builtin/remote.c:1127 |
ef317cd5 | 13003 | msgid "do not query remotes" |
07432cef | 13004 | msgstr "不查询远程" |
ef317cd5 | 13005 | |
fd8cb379 | 13006 | #: builtin/remote.c:1154 |
81809b99 | 13007 | #, c-format |
8ada9598 | 13008 | msgid "* remote %s" |
81809b99 | 13009 | msgstr "* 远程 %s" |
8ada9598 | 13010 | |
fd8cb379 | 13011 | #: builtin/remote.c:1155 |
8ada9598 JX |
13012 | #, c-format |
13013 | msgid " Fetch URL: %s" | |
81809b99 | 13014 | msgstr " 获取地址:%s" |
8ada9598 | 13015 | |
fd8cb379 | 13016 | #: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 |
8ada9598 | 13017 | msgid "(no URL)" |
81809b99 | 13018 | msgstr "(无 URL)" |
8ada9598 | 13019 | |
a4f16749 JX |
13020 | #. TRANSLATORS: the colon ':' should align |
13021 | #. with the one in " Fetch URL: %s" | |
13022 | #. translation. | |
13023 | #. | |
fd8cb379 | 13024 | #: builtin/remote.c:1170 builtin/remote.c:1172 |
8ada9598 JX |
13025 | #, c-format |
13026 | msgid " Push URL: %s" | |
81809b99 | 13027 | msgstr " 推送地址:%s" |
8ada9598 | 13028 | |
fd8cb379 | 13029 | #: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 |
81809b99 | 13030 | #, c-format |
8ada9598 | 13031 | msgid " HEAD branch: %s" |
4375c10e | 13032 | msgstr " HEAD 分支:%s" |
8ada9598 | 13033 | |
5c57d762 | 13034 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 13035 | #: builtin/remote.c:1174 |
5c57d762 JX |
13036 | msgid "(not queried)" |
13037 | msgstr "(未查询)" | |
13038 | ||
fd8cb379 | 13039 | #: builtin/remote.c:1176 |
5c57d762 JX |
13040 | msgid "(unknown)" |
13041 | msgstr "(未知)" | |
13042 | ||
fd8cb379 | 13043 | #: builtin/remote.c:1180 |
8ada9598 JX |
13044 | #, c-format |
13045 | msgid "" | |
13046 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 13047 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 13048 | |
fd8cb379 | 13049 | #: builtin/remote.c:1192 |
81809b99 | 13050 | #, c-format |
8ada9598 JX |
13051 | msgid " Remote branch:%s" |
13052 | msgid_plural " Remote branches:%s" | |
81809b99 | 13053 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 13054 | msgstr[1] " 远程分支:%s" |
8ada9598 | 13055 | |
81809b99 | 13056 | # 译者:中文字符串拼接,可删除前导空格 |
fd8cb379 | 13057 | #: builtin/remote.c:1195 builtin/remote.c:1221 |
8ada9598 | 13058 | msgid " (status not queried)" |
81809b99 | 13059 | msgstr "(状态未查询)" |
8ada9598 | 13060 | |
fd8cb379 | 13061 | #: builtin/remote.c:1204 |
8ada9598 JX |
13062 | msgid " Local branch configured for 'git pull':" |
13063 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 13064 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 13065 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 13066 | |
fd8cb379 | 13067 | #: builtin/remote.c:1212 |
8ada9598 | 13068 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 13069 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 13070 | |
fd8cb379 | 13071 | #: builtin/remote.c:1218 |
81809b99 | 13072 | #, c-format |
8ada9598 JX |
13073 | msgid " Local ref configured for 'git push'%s:" |
13074 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 13075 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 13076 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 13077 | |
fd8cb379 | 13078 | #: builtin/remote.c:1239 |
ef317cd5 | 13079 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 13080 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 13081 | |
fd8cb379 | 13082 | #: builtin/remote.c:1241 |
ef317cd5 | 13083 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 13084 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 13085 | |
fd8cb379 | 13086 | #: builtin/remote.c:1256 |
8ada9598 | 13087 | msgid "Cannot determine remote HEAD" |
81809b99 | 13088 | msgstr "无法确定远程 HEAD" |
8ada9598 | 13089 | |
fd8cb379 | 13090 | #: builtin/remote.c:1258 |
8ada9598 | 13091 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 13092 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 13093 | |
fd8cb379 | 13094 | #: builtin/remote.c:1268 |
81809b99 | 13095 | #, c-format |
8ada9598 | 13096 | msgid "Could not delete %s" |
81809b99 | 13097 | msgstr "无法删除 %s" |
8ada9598 | 13098 | |
fd8cb379 | 13099 | #: builtin/remote.c:1276 |
81809b99 | 13100 | #, c-format |
8ada9598 | 13101 | msgid "Not a valid ref: %s" |
81809b99 | 13102 | msgstr "不是一个有效引用:%s" |
8ada9598 | 13103 | |
fd8cb379 | 13104 | #: builtin/remote.c:1278 |
81809b99 | 13105 | #, c-format |
8ada9598 | 13106 | msgid "Could not setup %s" |
81809b99 | 13107 | msgstr "不能设置 %s" |
8ada9598 JX |
13108 | |
13109 | # 译者:注意保持前导空格 | |
fd8cb379 | 13110 | #: builtin/remote.c:1296 |
81809b99 | 13111 | #, c-format |
8ada9598 | 13112 | msgid " %s will become dangling!" |
07432cef | 13113 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
13114 | |
13115 | # 译者:注意保持前导空格 | |
fd8cb379 | 13116 | #: builtin/remote.c:1297 |
81809b99 | 13117 | #, c-format |
8ada9598 | 13118 | msgid " %s has become dangling!" |
07432cef | 13119 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 13120 | |
fd8cb379 | 13121 | #: builtin/remote.c:1307 |
81809b99 | 13122 | #, c-format |
8ada9598 | 13123 | msgid "Pruning %s" |
81809b99 | 13124 | msgstr "修剪 %s" |
8ada9598 | 13125 | |
fd8cb379 | 13126 | #: builtin/remote.c:1308 |
8ada9598 JX |
13127 | #, c-format |
13128 | msgid "URL: %s" | |
81809b99 | 13129 | msgstr "URL:%s" |
8ada9598 | 13130 | |
fd8cb379 | 13131 | #: builtin/remote.c:1324 |
8ada9598 JX |
13132 | #, c-format |
13133 | msgid " * [would prune] %s" | |
81809b99 | 13134 | msgstr " * [将删除] %s" |
8ada9598 | 13135 | |
fd8cb379 | 13136 | #: builtin/remote.c:1327 |
8ada9598 JX |
13137 | #, c-format |
13138 | msgid " * [pruned] %s" | |
81809b99 | 13139 | msgstr " * [已删除] %s" |
8ada9598 | 13140 | |
fd8cb379 | 13141 | #: builtin/remote.c:1372 |
ef317cd5 | 13142 | msgid "prune remotes after fetching" |
07432cef | 13143 | msgstr "抓取后清除远程" |
ef317cd5 | 13144 | |
fd8cb379 | 13145 | #: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 |
81809b99 | 13146 | #, c-format |
8ada9598 | 13147 | msgid "No such remote '%s'" |
81809b99 | 13148 | msgstr "没有此远程 '%s'" |
8ada9598 | 13149 | |
fd8cb379 | 13150 | #: builtin/remote.c:1451 |
ef317cd5 | 13151 | msgid "add branch" |
07432cef | 13152 | msgstr "添加分支" |
ef317cd5 | 13153 | |
fd8cb379 | 13154 | #: builtin/remote.c:1458 |
8ada9598 | 13155 | msgid "no remote specified" |
81809b99 | 13156 | msgstr "未指定远程" |
8ada9598 | 13157 | |
fd8cb379 | 13158 | #: builtin/remote.c:1475 |
94550ed3 JX |
13159 | msgid "query push URLs rather than fetch URLs" |
13160 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
13161 | ||
fd8cb379 | 13162 | #: builtin/remote.c:1477 |
94550ed3 JX |
13163 | msgid "return all URLs" |
13164 | msgstr "返回所有 URL 地址" | |
13165 | ||
fd8cb379 | 13166 | #: builtin/remote.c:1505 |
94550ed3 JX |
13167 | #, c-format |
13168 | msgid "no URLs configured for remote '%s'" | |
13169 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
13170 | ||
fd8cb379 | 13171 | #: builtin/remote.c:1531 |
ef317cd5 | 13172 | msgid "manipulate push URLs" |
07432cef | 13173 | msgstr "操作推送 URLS" |
ef317cd5 | 13174 | |
fd8cb379 | 13175 | #: builtin/remote.c:1533 |
ef317cd5 | 13176 | msgid "add URL" |
07432cef | 13177 | msgstr "添加 URL" |
ef317cd5 | 13178 | |
fd8cb379 | 13179 | #: builtin/remote.c:1535 |
ef317cd5 | 13180 | msgid "delete URLs" |
07432cef | 13181 | msgstr "删除 URLS" |
ef317cd5 | 13182 | |
fd8cb379 | 13183 | #: builtin/remote.c:1542 |
8ada9598 | 13184 | msgid "--add --delete doesn't make sense" |
81809b99 | 13185 | msgstr "--add --delete 无意义" |
8ada9598 | 13186 | |
fd8cb379 | 13187 | #: builtin/remote.c:1581 |
81809b99 | 13188 | #, c-format |
8ada9598 | 13189 | msgid "Invalid old URL pattern: %s" |
4375c10e | 13190 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 13191 | |
fd8cb379 | 13192 | #: builtin/remote.c:1589 |
81809b99 | 13193 | #, c-format |
8ada9598 | 13194 | msgid "No such URL found: %s" |
4375c10e | 13195 | msgstr "未找到此 URL:%s" |
8ada9598 | 13196 | |
fd8cb379 | 13197 | #: builtin/remote.c:1591 |
8ada9598 | 13198 | msgid "Will not delete all non-push URLs" |
4375c10e | 13199 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 13200 | |
fd8cb379 | 13201 | #: builtin/remote.c:1607 |
ef317cd5 | 13202 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 13203 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 13204 | |
fd8cb379 | 13205 | #: builtin/remote.c:1638 |
a0b6b246 JX |
13206 | #, c-format |
13207 | msgid "Unknown subcommand: %s" | |
13208 | msgstr "未知子命令:%s" | |
13209 | ||
a4f16749 | 13210 | #: builtin/repack.c:18 |
814ff314 JX |
13211 | msgid "git repack [<options>]" |
13212 | msgstr "git repack [<选项>]" | |
90314792 | 13213 | |
a4f16749 | 13214 | #: builtin/repack.c:23 |
1a79b2f1 JX |
13215 | msgid "" |
13216 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
13217 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
13218 | msgstr "" | |
13219 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
13220 | "或禁用 pack.writebitmaps 配置。" | |
13221 | ||
fd8cb379 | 13222 | #: builtin/repack.c:180 |
90314792 JX |
13223 | msgid "pack everything in a single pack" |
13224 | msgstr "所有内容打包到一个包文件中" | |
13225 | ||
fd8cb379 | 13226 | #: builtin/repack.c:182 |
90314792 JX |
13227 | msgid "same as -a, and turn unreachable objects loose" |
13228 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
13229 | ||
fd8cb379 | 13230 | #: builtin/repack.c:185 |
90314792 JX |
13231 | msgid "remove redundant packs, and run git-prune-packed" |
13232 | msgstr "删除多余的包,运行 git-prune-packed" | |
13233 | ||
fd8cb379 | 13234 | #: builtin/repack.c:187 |
90314792 JX |
13235 | msgid "pass --no-reuse-delta to git-pack-objects" |
13236 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
13237 | ||
fd8cb379 | 13238 | #: builtin/repack.c:189 |
90314792 JX |
13239 | msgid "pass --no-reuse-object to git-pack-objects" |
13240 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
13241 | ||
fd8cb379 | 13242 | #: builtin/repack.c:191 |
90314792 JX |
13243 | msgid "do not run git-update-server-info" |
13244 | msgstr "不运行 git-update-server-info" | |
13245 | ||
fd8cb379 | 13246 | #: builtin/repack.c:194 |
90314792 JX |
13247 | msgid "pass --local to git-pack-objects" |
13248 | msgstr "向 git-pack-objects 传递参数 --local" | |
13249 | ||
fd8cb379 | 13250 | #: builtin/repack.c:196 |
6c94aba5 JX |
13251 | msgid "write bitmap index" |
13252 | msgstr "写 bitmap 索引" | |
13253 | ||
fd8cb379 | 13254 | #: builtin/repack.c:197 |
90314792 JX |
13255 | msgid "approxidate" |
13256 | msgstr "近似日期" | |
13257 | ||
fd8cb379 | 13258 | #: builtin/repack.c:198 |
90314792 JX |
13259 | msgid "with -A, do not loosen objects older than this" |
13260 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
13261 | ||
fd8cb379 | 13262 | #: builtin/repack.c:200 |
5c57d762 JX |
13263 | msgid "with -a, repack unreachable objects" |
13264 | msgstr "使用 -a ,重新对不可达对象打包" | |
13265 | ||
fd8cb379 | 13266 | #: builtin/repack.c:202 |
90314792 JX |
13267 | msgid "size of the window used for delta compression" |
13268 | msgstr "用于增量压缩的窗口值" | |
13269 | ||
fd8cb379 | 13270 | #: builtin/repack.c:203 builtin/repack.c:209 |
8376b58d JX |
13271 | msgid "bytes" |
13272 | msgstr "字节" | |
13273 | ||
fd8cb379 | 13274 | #: builtin/repack.c:204 |
90314792 JX |
13275 | msgid "same as the above, but limit memory size instead of entries count" |
13276 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
13277 | ||
fd8cb379 | 13278 | #: builtin/repack.c:206 |
90314792 JX |
13279 | msgid "limits the maximum delta depth" |
13280 | msgstr "限制最大增量深度" | |
13281 | ||
fd8cb379 | 13282 | #: builtin/repack.c:208 |
a4f16749 JX |
13283 | msgid "limits the maximum number of threads" |
13284 | msgstr "限制最大线程数" | |
13285 | ||
fd8cb379 | 13286 | #: builtin/repack.c:210 |
90314792 | 13287 | msgid "maximum size of each packfile" |
dbd6cced | 13288 | msgstr "每个包文件的最大尺寸" |
90314792 | 13289 | |
fd8cb379 | 13290 | #: builtin/repack.c:212 |
6c94aba5 JX |
13291 | msgid "repack objects in packs marked with .keep" |
13292 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
13293 | ||
fd8cb379 JX |
13294 | #: builtin/repack.c:214 |
13295 | msgid "do not repack this pack" | |
13296 | msgstr "不要对该包文件重新打包" | |
13297 | ||
13298 | #: builtin/repack.c:224 | |
94550ed3 JX |
13299 | msgid "cannot delete packs in a precious-objects repo" |
13300 | msgstr "不能删除珍品仓库中的打包文件" | |
13301 | ||
fd8cb379 | 13302 | #: builtin/repack.c:228 |
5c57d762 JX |
13303 | msgid "--keep-unreachable and -A are incompatible" |
13304 | msgstr "--keep-unreachable 和 -A 不兼容" | |
13305 | ||
fd8cb379 | 13306 | #: builtin/repack.c:425 builtin/worktree.c:139 |
90314792 | 13307 | #, c-format |
5c57d762 JX |
13308 | msgid "failed to remove '%s'" |
13309 | msgstr "无法删除 '%s'" | |
90314792 | 13310 | |
fd8cb379 | 13311 | #: builtin/replace.c:22 |
ef317cd5 | 13312 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 13313 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 13314 | |
fd8cb379 | 13315 | #: builtin/replace.c:23 |
6acbf033 JX |
13316 | msgid "git replace [-f] --edit <object>" |
13317 | msgstr "git replace [-f] --edit <对象>" | |
13318 | ||
fd8cb379 | 13319 | #: builtin/replace.c:24 |
6acbf033 JX |
13320 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
13321 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
13322 | ||
fd8cb379 JX |
13323 | #: builtin/replace.c:25 |
13324 | msgid "git replace [-f] --convert-graft-file" | |
13325 | msgstr "git replace [-f] --convert-graft-file" | |
13326 | ||
13327 | #: builtin/replace.c:26 | |
ef317cd5 | 13328 | msgid "git replace -d <object>..." |
07432cef | 13329 | msgstr "git replace -d <对象>..." |
ef317cd5 | 13330 | |
fd8cb379 | 13331 | #: builtin/replace.c:27 |
cfff71a9 JX |
13332 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
13333 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 13334 | |
fd8cb379 | 13335 | #: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 |
6acbf033 JX |
13336 | #, c-format |
13337 | msgid "Not a valid object name: '%s'" | |
13338 | msgstr "不是一个有效的对象名:'%s'" | |
13339 | ||
fd8cb379 | 13340 | #: builtin/replace.c:407 |
6acbf033 JX |
13341 | #, c-format |
13342 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 13343 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 13344 | |
fd8cb379 | 13345 | #: builtin/replace.c:409 |
6acbf033 JX |
13346 | #, c-format |
13347 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 13348 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 13349 | |
fd8cb379 | 13350 | #: builtin/replace.c:421 |
6acbf033 JX |
13351 | #, c-format |
13352 | msgid "" | |
13353 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
13354 | "instead of --graft" | |
55a16ee4 | 13355 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 13356 | |
fd8cb379 | 13357 | #: builtin/replace.c:460 |
6acbf033 JX |
13358 | #, c-format |
13359 | msgid "the original commit '%s' has a gpg signature." | |
13360 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
13361 | ||
fd8cb379 | 13362 | #: builtin/replace.c:461 |
6acbf033 JX |
13363 | msgid "the signature will be removed in the replacement commit!" |
13364 | msgstr "在替换的提交中签名将被移除!" | |
13365 | ||
fd8cb379 | 13366 | #: builtin/replace.c:471 |
6acbf033 JX |
13367 | #, c-format |
13368 | msgid "could not write replacement commit for: '%s'" | |
13369 | msgstr "不能为 '%s' 写替换提交" | |
13370 | ||
fd8cb379 JX |
13371 | #: builtin/replace.c:514 |
13372 | #, c-format | |
13373 | msgid "" | |
13374 | "could not convert the following graft(s):\n" | |
13375 | "%s" | |
13376 | msgstr "" | |
13377 | "不能转换下列移植:\n" | |
13378 | "%s" | |
13379 | ||
13380 | #: builtin/replace.c:535 | |
ef317cd5 | 13381 | msgid "list replace refs" |
07432cef | 13382 | msgstr "列出替换的引用" |
ef317cd5 | 13383 | |
fd8cb379 | 13384 | #: builtin/replace.c:536 |
ef317cd5 | 13385 | msgid "delete replace refs" |
07432cef | 13386 | msgstr "删除替换的引用" |
ef317cd5 | 13387 | |
fd8cb379 | 13388 | #: builtin/replace.c:537 |
6acbf033 JX |
13389 | msgid "edit existing object" |
13390 | msgstr "编辑现存的对象" | |
13391 | ||
fd8cb379 | 13392 | #: builtin/replace.c:538 |
6acbf033 JX |
13393 | msgid "change a commit's parents" |
13394 | msgstr "修改一个提交的父提交" | |
13395 | ||
fd8cb379 JX |
13396 | #: builtin/replace.c:539 |
13397 | msgid "convert existing graft file" | |
13398 | msgstr "转换现存的移植文件" | |
13399 | ||
13400 | #: builtin/replace.c:540 | |
ef317cd5 | 13401 | msgid "replace the ref if it exists" |
07432cef | 13402 | msgstr "如果存在则替换引用" |
ef317cd5 | 13403 | |
fd8cb379 | 13404 | #: builtin/replace.c:542 |
6acbf033 JX |
13405 | msgid "do not pretty-print contents for --edit" |
13406 | msgstr "不要为 --edit 操作美观显示内容" | |
13407 | ||
fd8cb379 | 13408 | #: builtin/replace.c:543 |
cfff71a9 JX |
13409 | msgid "use this format" |
13410 | msgstr "使用此格式" | |
13411 | ||
a4f16749 | 13412 | #: builtin/rerere.c:13 |
814ff314 JX |
13413 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
13414 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 13415 | |
a4f16749 | 13416 | #: builtin/rerere.c:59 |
ef317cd5 | 13417 | msgid "register clean resolutions in index" |
07432cef | 13418 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 13419 | |
a4f16749 | 13420 | #: builtin/reset.c:29 |
ef317cd5 JX |
13421 | msgid "" |
13422 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 13423 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 13424 | |
a4f16749 | 13425 | #: builtin/reset.c:30 |
a0b6b246 JX |
13426 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
13427 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 13428 | |
a4f16749 | 13429 | #: builtin/reset.c:31 |
07432cef WS |
13430 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
13431 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 13432 | |
a4f16749 | 13433 | #: builtin/reset.c:37 |
c04f5ac3 JX |
13434 | msgid "mixed" |
13435 | msgstr "混杂" | |
13436 | ||
a4f16749 | 13437 | #: builtin/reset.c:37 |
c04f5ac3 JX |
13438 | msgid "soft" |
13439 | msgstr "软性" | |
13440 | ||
a4f16749 | 13441 | #: builtin/reset.c:37 |
c04f5ac3 JX |
13442 | msgid "hard" |
13443 | msgstr "硬性" | |
13444 | ||
a4f16749 | 13445 | #: builtin/reset.c:37 |
8ada9598 JX |
13446 | msgid "merge" |
13447 | msgstr "合并" | |
13448 | ||
a4f16749 | 13449 | #: builtin/reset.c:37 |
c04f5ac3 JX |
13450 | msgid "keep" |
13451 | msgstr "保持" | |
13452 | ||
6937cb4e | 13453 | #: builtin/reset.c:78 |
c04f5ac3 JX |
13454 | msgid "You do not have a valid HEAD." |
13455 | msgstr "您没有一个有效的 HEAD。" | |
13456 | ||
6937cb4e | 13457 | #: builtin/reset.c:80 |
c04f5ac3 JX |
13458 | msgid "Failed to find tree of HEAD." |
13459 | msgstr "无法找到 HEAD 指向的树。" | |
13460 | ||
6937cb4e | 13461 | #: builtin/reset.c:86 |
c04f5ac3 JX |
13462 | #, c-format |
13463 | msgid "Failed to find tree of %s." | |
13464 | msgstr "无法找到 %s 指向的树。" | |
13465 | ||
31e5e17b | 13466 | #: builtin/reset.c:111 |
c04f5ac3 JX |
13467 | #, c-format |
13468 | msgid "HEAD is now at %s" | |
13469 | msgstr "HEAD 现在位于 %s" | |
13470 | ||
90e6ef53 | 13471 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 13472 | #: builtin/reset.c:189 |
c04f5ac3 JX |
13473 | #, c-format |
13474 | msgid "Cannot do a %s reset in the middle of a merge." | |
13475 | msgstr "在合并过程中不能做%s重置操作。" | |
13476 | ||
31e5e17b | 13477 | #: builtin/reset.c:289 |
ef317cd5 | 13478 | msgid "be quiet, only report errors" |
07432cef | 13479 | msgstr "安静模式,只报告错误" |
ef317cd5 | 13480 | |
31e5e17b | 13481 | #: builtin/reset.c:291 |
ef317cd5 | 13482 | msgid "reset HEAD and index" |
07432cef | 13483 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 13484 | |
31e5e17b | 13485 | #: builtin/reset.c:292 |
ef317cd5 | 13486 | msgid "reset only HEAD" |
07432cef | 13487 | msgstr "只重置 HEAD" |
ef317cd5 | 13488 | |
31e5e17b | 13489 | #: builtin/reset.c:294 builtin/reset.c:296 |
ef317cd5 | 13490 | msgid "reset HEAD, index and working tree" |
07432cef | 13491 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 13492 | |
31e5e17b | 13493 | #: builtin/reset.c:298 |
ef317cd5 | 13494 | msgid "reset HEAD but keep local changes" |
07432cef | 13495 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 13496 | |
31e5e17b | 13497 | #: builtin/reset.c:304 |
6c94aba5 JX |
13498 | msgid "record only the fact that removed paths will be added later" |
13499 | msgstr "将删除的路径标记为稍后添加" | |
13500 | ||
31e5e17b | 13501 | #: builtin/reset.c:321 |
07432cef WS |
13502 | #, c-format |
13503 | msgid "Failed to resolve '%s' as a valid revision." | |
13504 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
13505 | ||
31e5e17b | 13506 | #: builtin/reset.c:329 |
07432cef WS |
13507 | #, c-format |
13508 | msgid "Failed to resolve '%s' as a valid tree." | |
13509 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
13510 | ||
31e5e17b | 13511 | #: builtin/reset.c:338 |
c04f5ac3 | 13512 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 13513 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 13514 | |
31e5e17b | 13515 | #: builtin/reset.c:347 |
c04f5ac3 | 13516 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 13517 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 13518 | |
90e6ef53 | 13519 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 13520 | #: builtin/reset.c:349 |
c04f5ac3 JX |
13521 | #, c-format |
13522 | msgid "Cannot do %s reset with paths." | |
13523 | msgstr "不能带路径进行%s重置。" | |
13524 | ||
90e6ef53 | 13525 | # 译者:汉字之间无空格,故删除%s前后空格 |
31e5e17b | 13526 | #: builtin/reset.c:359 |
c04f5ac3 JX |
13527 | #, c-format |
13528 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 13529 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 13530 | |
31e5e17b | 13531 | #: builtin/reset.c:363 |
6c94aba5 JX |
13532 | msgid "-N can only be used with --mixed" |
13533 | msgstr "-N 只能和 --mixed 同时使用" | |
13534 | ||
31e5e17b | 13535 | #: builtin/reset.c:380 |
90314792 | 13536 | msgid "Unstaged changes after reset:" |
160fb2b2 | 13537 | msgstr "重置后取消暂存的变更:" |
90314792 | 13538 | |
31e5e17b | 13539 | #: builtin/reset.c:386 |
ef317cd5 JX |
13540 | #, c-format |
13541 | msgid "Could not reset index file to revision '%s'." | |
13542 | msgstr "不能重置索引文件至版本 '%s'。" | |
13543 | ||
31e5e17b | 13544 | #: builtin/reset.c:390 |
07432cef WS |
13545 | msgid "Could not write new index file." |
13546 | msgstr "不能写入新的索引文件。" | |
13547 | ||
31e5e17b JX |
13548 | #: builtin/rev-list.c:397 |
13549 | msgid "cannot combine --exclude-promisor-objects and --missing" | |
13550 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
13551 | ||
13552 | #: builtin/rev-list.c:455 | |
5809aa05 JX |
13553 | msgid "object filtering requires --objects" |
13554 | msgstr "对象过滤需要 --objects" | |
13555 | ||
31e5e17b | 13556 | #: builtin/rev-list.c:458 |
5809aa05 JX |
13557 | #, c-format |
13558 | msgid "invalid sparse value '%s'" | |
13559 | msgstr "无效的稀疏值 '%s'" | |
13560 | ||
31e5e17b | 13561 | #: builtin/rev-list.c:499 |
1b7f4a34 JX |
13562 | msgid "rev-list does not support display of notes" |
13563 | msgstr "rev-list 不支持显示注解" | |
13564 | ||
31e5e17b | 13565 | #: builtin/rev-list.c:502 |
5809aa05 JX |
13566 | msgid "cannot combine --use-bitmap-index with object filtering" |
13567 | msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" | |
13568 | ||
fd8cb379 | 13569 | #: builtin/rev-parse.c:406 |
814ff314 JX |
13570 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
13571 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 13572 | |
fd8cb379 | 13573 | #: builtin/rev-parse.c:411 |
ef317cd5 | 13574 | msgid "keep the `--` passed as an arg" |
07432cef | 13575 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 13576 | |
fd8cb379 | 13577 | #: builtin/rev-parse.c:413 |
ef317cd5 | 13578 | msgid "stop parsing after the first non-option argument" |
07432cef | 13579 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 13580 | |
fd8cb379 | 13581 | #: builtin/rev-parse.c:416 |
cfff71a9 JX |
13582 | msgid "output in stuck long form" |
13583 | msgstr "以固定长格式输出" | |
13584 | ||
fd8cb379 | 13585 | #: builtin/rev-parse.c:549 |
ef317cd5 | 13586 | msgid "" |
814ff314 | 13587 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 13588 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 13589 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
13590 | "\n" |
13591 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
13592 | msgstr "" | |
814ff314 | 13593 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 13594 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 13595 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
13596 | "\n" |
13597 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 13598 | |
a4f16749 | 13599 | #: builtin/revert.c:23 |
814ff314 JX |
13600 | msgid "git revert [<options>] <commit-ish>..." |
13601 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 13602 | |
a4f16749 | 13603 | #: builtin/revert.c:24 |
ef317cd5 | 13604 | msgid "git revert <subcommand>" |
07432cef | 13605 | msgstr "git revert <子命令>" |
ef317cd5 | 13606 | |
a4f16749 | 13607 | #: builtin/revert.c:29 |
814ff314 JX |
13608 | msgid "git cherry-pick [<options>] <commit-ish>..." |
13609 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 13610 | |
a4f16749 | 13611 | #: builtin/revert.c:30 |
ef317cd5 | 13612 | msgid "git cherry-pick <subcommand>" |
07432cef | 13613 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 13614 | |
a4f16749 | 13615 | #: builtin/revert.c:90 |
ef317cd5 JX |
13616 | #, c-format |
13617 | msgid "%s: %s cannot be used with %s" | |
13618 | msgstr "%s:%s 不能和 %s 同时使用" | |
13619 | ||
a4f16749 | 13620 | #: builtin/revert.c:99 |
ef317cd5 | 13621 | msgid "end revert or cherry-pick sequence" |
07432cef | 13622 | msgstr "终止反转或拣选操作" |
ef317cd5 | 13623 | |
a4f16749 | 13624 | #: builtin/revert.c:100 |
ef317cd5 | 13625 | msgid "resume revert or cherry-pick sequence" |
07432cef | 13626 | msgstr "继续反转或拣选操作" |
ef317cd5 | 13627 | |
a4f16749 | 13628 | #: builtin/revert.c:101 |
ef317cd5 | 13629 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 13630 | msgstr "取消反转或拣选操作" |
ef317cd5 | 13631 | |
a4f16749 | 13632 | #: builtin/revert.c:102 |
ef317cd5 | 13633 | msgid "don't automatically commit" |
07432cef | 13634 | msgstr "不要自动提交" |
ef317cd5 | 13635 | |
a4f16749 | 13636 | #: builtin/revert.c:103 |
ef317cd5 | 13637 | msgid "edit the commit message" |
07432cef | 13638 | msgstr "编辑提交说明" |
ef317cd5 | 13639 | |
a4f16749 | 13640 | #: builtin/revert.c:106 |
87cb7997 | 13641 | msgid "parent-number" |
07432cef | 13642 | msgstr "父编号" |
ef317cd5 | 13643 | |
a4f16749 | 13644 | #: builtin/revert.c:107 |
87cb7997 JX |
13645 | msgid "select mainline parent" |
13646 | msgstr "选择主干父提交编号" | |
13647 | ||
a4f16749 | 13648 | #: builtin/revert.c:109 |
ef317cd5 | 13649 | msgid "merge strategy" |
07432cef | 13650 | msgstr "合并策略" |
ef317cd5 | 13651 | |
a4f16749 | 13652 | #: builtin/revert.c:110 |
ef317cd5 | 13653 | msgid "option" |
07432cef | 13654 | msgstr "选项" |
ef317cd5 | 13655 | |
a4f16749 | 13656 | #: builtin/revert.c:111 |
ef317cd5 | 13657 | msgid "option for merge strategy" |
07432cef | 13658 | msgstr "合并策略的选项" |
ef317cd5 | 13659 | |
a4f16749 | 13660 | #: builtin/revert.c:120 |
ef317cd5 | 13661 | msgid "append commit name" |
07432cef | 13662 | msgstr "追加提交名称" |
ef317cd5 | 13663 | |
a4f16749 | 13664 | #: builtin/revert.c:122 |
ef317cd5 | 13665 | msgid "preserve initially empty commits" |
07432cef | 13666 | msgstr "保留初始化的空提交" |
ef317cd5 | 13667 | |
a4f16749 | 13668 | #: builtin/revert.c:124 |
ef317cd5 | 13669 | msgid "keep redundant, empty commits" |
07432cef | 13670 | msgstr "保持多余的、空的提交" |
ef317cd5 | 13671 | |
6937cb4e | 13672 | #: builtin/revert.c:214 |
c04f5ac3 JX |
13673 | msgid "revert failed" |
13674 | msgstr "还原失败" | |
13675 | ||
6937cb4e | 13676 | #: builtin/revert.c:227 |
c04f5ac3 JX |
13677 | msgid "cherry-pick failed" |
13678 | msgstr "拣选失败" | |
13679 | ||
a4f16749 | 13680 | #: builtin/rm.c:18 |
814ff314 JX |
13681 | msgid "git rm [<options>] [--] <file>..." |
13682 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 13683 | |
a4f16749 | 13684 | #: builtin/rm.c:206 |
c04f5ac3 | 13685 | msgid "" |
2e8451e8 JX |
13686 | "the following file has staged content different from both the\n" |
13687 | "file and the HEAD:" | |
13688 | msgid_plural "" | |
13689 | "the following files have staged content different from both the\n" | |
13690 | "file and the HEAD:" | |
13691 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
13692 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
13693 | ||
a4f16749 | 13694 | #: builtin/rm.c:211 |
2e8451e8 JX |
13695 | msgid "" |
13696 | "\n" | |
c04f5ac3 JX |
13697 | "(use -f to force removal)" |
13698 | msgstr "" | |
2e8451e8 | 13699 | "\n" |
c04f5ac3 JX |
13700 | "(使用 -f 强制删除)" |
13701 | ||
a4f16749 | 13702 | #: builtin/rm.c:215 |
2e8451e8 JX |
13703 | msgid "the following file has changes staged in the index:" |
13704 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
13705 | msgstr[0] "下列文件索引中有变更" |
13706 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 13707 | |
a4f16749 | 13708 | #: builtin/rm.c:219 builtin/rm.c:228 |
c04f5ac3 | 13709 | msgid "" |
2e8451e8 | 13710 | "\n" |
c04f5ac3 JX |
13711 | "(use --cached to keep the file, or -f to force removal)" |
13712 | msgstr "" | |
2e8451e8 JX |
13713 | "\n" |
13714 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
13715 | ||
a4f16749 | 13716 | #: builtin/rm.c:225 |
2e8451e8 JX |
13717 | msgid "the following file has local modifications:" |
13718 | msgid_plural "the following files have local modifications:" | |
13719 | msgstr[0] "如下文件有本地修改:" | |
13720 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 13721 | |
fd8cb379 | 13722 | #: builtin/rm.c:241 |
ef317cd5 | 13723 | msgid "do not list removed files" |
07432cef | 13724 | msgstr "不列出删除的文件" |
ef317cd5 | 13725 | |
fd8cb379 | 13726 | #: builtin/rm.c:242 |
ef317cd5 | 13727 | msgid "only remove from the index" |
07432cef | 13728 | msgstr "只从索引区删除" |
ef317cd5 | 13729 | |
fd8cb379 | 13730 | #: builtin/rm.c:243 |
ef317cd5 | 13731 | msgid "override the up-to-date check" |
07432cef | 13732 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 13733 | |
fd8cb379 | 13734 | #: builtin/rm.c:244 |
ef317cd5 | 13735 | msgid "allow recursive removal" |
07432cef | 13736 | msgstr "允许递归删除" |
ef317cd5 | 13737 | |
fd8cb379 | 13738 | #: builtin/rm.c:246 |
ef317cd5 | 13739 | msgid "exit with a zero status even if nothing matched" |
07432cef | 13740 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 13741 | |
fd8cb379 | 13742 | #: builtin/rm.c:306 |
c04f5ac3 JX |
13743 | #, c-format |
13744 | msgid "not removing '%s' recursively without -r" | |
13745 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
13746 | ||
fd8cb379 | 13747 | #: builtin/rm.c:345 |
c04f5ac3 JX |
13748 | #, c-format |
13749 | msgid "git rm: unable to remove %s" | |
13750 | msgstr "git rm:不能删除 %s" | |
13751 | ||
fd8cb379 | 13752 | #: builtin/rm.c:368 |
1a79b2f1 JX |
13753 | #, c-format |
13754 | msgid "could not remove '%s'" | |
13755 | msgstr "无法删除 '%s'" | |
13756 | ||
fd8cb379 | 13757 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
13758 | msgid "" |
13759 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
13760 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
13761 | "[<ref>...]\n" | |
13762 | " --all and explicit <ref> specification are mutually exclusive." | |
13763 | msgstr "" | |
13764 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
13765 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
13766 | " --all 和明确的 <引用> 互斥。" | |
13767 | ||
fd8cb379 | 13768 | #: builtin/send-pack.c:163 |
1b7f4a34 JX |
13769 | msgid "remote name" |
13770 | msgstr "远程名称" | |
13771 | ||
fd8cb379 | 13772 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
13773 | msgid "use stateless RPC protocol" |
13774 | msgstr "使用无状态的 RPC 协议" | |
13775 | ||
fd8cb379 | 13776 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
13777 | msgid "read refs from stdin" |
13778 | msgstr "从标准输入读取引用" | |
13779 | ||
fd8cb379 | 13780 | #: builtin/send-pack.c:179 |
1b7f4a34 JX |
13781 | msgid "print status from remote helper" |
13782 | msgstr "打印来自远程 helper 的状态" | |
13783 | ||
fd8cb379 JX |
13784 | #: builtin/serve.c:7 |
13785 | msgid "git serve [<options>]" | |
13786 | msgstr "git serve [<选项>]" | |
13787 | ||
13788 | #: builtin/serve.c:17 builtin/upload-pack.c:23 | |
13789 | msgid "quit after a single request/response exchange" | |
13790 | msgstr "在一次单独的请求/响应之后退出" | |
13791 | ||
13792 | #: builtin/serve.c:19 | |
13793 | msgid "exit immediately after advertising capabilities" | |
13794 | msgstr "在广告功能后立即退出" | |
13795 | ||
a4f16749 | 13796 | #: builtin/shortlog.c:14 |
fd8cb379 JX |
13797 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
13798 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
13799 | ||
13800 | #: builtin/shortlog.c:15 | |
13801 | msgid "git log --pretty=short | git shortlog [<options>]" | |
13802 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 13803 | |
fd8cb379 | 13804 | #: builtin/shortlog.c:264 |
1a79b2f1 JX |
13805 | msgid "Group by committer rather than author" |
13806 | msgstr "按照提交者分组而不是作者" | |
13807 | ||
fd8cb379 | 13808 | #: builtin/shortlog.c:266 |
ef317cd5 | 13809 | msgid "sort output according to the number of commits per author" |
07432cef | 13810 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 13811 | |
fd8cb379 | 13812 | #: builtin/shortlog.c:268 |
ef317cd5 | 13813 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 13814 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 13815 | |
fd8cb379 | 13816 | #: builtin/shortlog.c:270 |
ef317cd5 | 13817 | msgid "Show the email address of each author" |
07432cef | 13818 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 13819 | |
fd8cb379 | 13820 | #: builtin/shortlog.c:271 |
ef317cd5 | 13821 | msgid "w[,i1[,i2]]" |
07432cef | 13822 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 13823 | |
fd8cb379 | 13824 | #: builtin/shortlog.c:272 |
ef317cd5 | 13825 | msgid "Linewrap output" |
07432cef | 13826 | msgstr "折行输出" |
ef317cd5 | 13827 | |
fd8cb379 JX |
13828 | #: builtin/shortlog.c:298 |
13829 | msgid "too many arguments given outside repository" | |
13830 | msgstr "仓库外执行提供了太多的参数" | |
13831 | ||
a4f16749 | 13832 | #: builtin/show-branch.c:12 |
ef317cd5 | 13833 | msgid "" |
814ff314 | 13834 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
13835 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
13836 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
13837 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 13838 | msgstr "" |
814ff314 | 13839 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
13840 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
13841 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
13842 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 13843 | |
a4f16749 | 13844 | #: builtin/show-branch.c:16 |
814ff314 | 13845 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 13846 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 13847 | |
a4f16749 | 13848 | #: builtin/show-branch.c:376 |
a0b6b246 JX |
13849 | #, c-format |
13850 | msgid "ignoring %s; cannot handle more than %d ref" | |
13851 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
13852 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
13853 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
13854 | ||
a4f16749 | 13855 | #: builtin/show-branch.c:530 |
a0b6b246 JX |
13856 | #, c-format |
13857 | msgid "no matching refs with %s" | |
13858 | msgstr "没有和 %s 匹配的引用" | |
13859 | ||
a4f16749 | 13860 | #: builtin/show-branch.c:626 |
ef317cd5 | 13861 | msgid "show remote-tracking and local branches" |
07432cef | 13862 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 13863 | |
a4f16749 | 13864 | #: builtin/show-branch.c:628 |
ef317cd5 | 13865 | msgid "show remote-tracking branches" |
07432cef | 13866 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 13867 | |
a4f16749 | 13868 | #: builtin/show-branch.c:630 |
ef317cd5 | 13869 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 13870 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 13871 | |
a4f16749 | 13872 | #: builtin/show-branch.c:632 |
ef317cd5 | 13873 | msgid "show <n> more commits after the common ancestor" |
07432cef | 13874 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 13875 | |
a4f16749 | 13876 | #: builtin/show-branch.c:634 |
ef317cd5 | 13877 | msgid "synonym to more=-1" |
07432cef | 13878 | msgstr "和 more=-1 同义" |
ef317cd5 | 13879 | |
a4f16749 | 13880 | #: builtin/show-branch.c:635 |
ef317cd5 | 13881 | msgid "suppress naming strings" |
07432cef | 13882 | msgstr "不显示字符串命名" |
ef317cd5 | 13883 | |
a4f16749 | 13884 | #: builtin/show-branch.c:637 |
ef317cd5 | 13885 | msgid "include the current branch" |
07432cef | 13886 | msgstr "包括当前分支" |
ef317cd5 | 13887 | |
a4f16749 | 13888 | #: builtin/show-branch.c:639 |
ef317cd5 | 13889 | msgid "name commits with their object names" |
07432cef | 13890 | msgstr "以对象名字命名提交" |
ef317cd5 | 13891 | |
a4f16749 | 13892 | #: builtin/show-branch.c:641 |
ef317cd5 | 13893 | msgid "show possible merge bases" |
07432cef | 13894 | msgstr "显示可能合并的基线" |
ef317cd5 | 13895 | |
a4f16749 | 13896 | #: builtin/show-branch.c:643 |
ef317cd5 | 13897 | msgid "show refs unreachable from any other ref" |
07432cef | 13898 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 13899 | |
a4f16749 | 13900 | #: builtin/show-branch.c:645 |
ef317cd5 | 13901 | msgid "show commits in topological order" |
07432cef | 13902 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 13903 | |
a4f16749 | 13904 | #: builtin/show-branch.c:648 |
ef317cd5 | 13905 | msgid "show only commits not on the first branch" |
07432cef | 13906 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 13907 | |
a4f16749 | 13908 | #: builtin/show-branch.c:650 |
ef317cd5 | 13909 | msgid "show merges reachable from only one tip" |
07432cef | 13910 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 13911 | |
a4f16749 | 13912 | #: builtin/show-branch.c:652 |
2e8451e8 JX |
13913 | msgid "topologically sort, maintaining date order where possible" |
13914 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 13915 | |
a4f16749 | 13916 | #: builtin/show-branch.c:655 |
ef317cd5 | 13917 | msgid "<n>[,<base>]" |
07432cef | 13918 | msgstr "<n>[,<base>]" |
ef317cd5 | 13919 | |
a4f16749 | 13920 | #: builtin/show-branch.c:656 |
ef317cd5 | 13921 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 13922 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 13923 | |
a4f16749 | 13924 | #: builtin/show-branch.c:690 |
a0b6b246 JX |
13925 | msgid "" |
13926 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
13927 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
13928 | ||
a4f16749 | 13929 | #: builtin/show-branch.c:714 |
a0b6b246 JX |
13930 | msgid "no branches given, and HEAD is not valid" |
13931 | msgstr "未提供分支,且 HEAD 无效" | |
13932 | ||
a4f16749 | 13933 | #: builtin/show-branch.c:717 |
a0b6b246 JX |
13934 | msgid "--reflog option needs one branch name" |
13935 | msgstr "选项 --reflog 需要一个分支名" | |
13936 | ||
a4f16749 | 13937 | #: builtin/show-branch.c:720 |
a0b6b246 JX |
13938 | #, c-format |
13939 | msgid "only %d entry can be shown at one time." | |
13940 | msgid_plural "only %d entries can be shown at one time." | |
13941 | msgstr[0] "一次只能显示 %d 个条目。" | |
13942 | msgstr[1] "一次只能显示 %d 个条目。" | |
13943 | ||
a4f16749 | 13944 | #: builtin/show-branch.c:724 |
a0b6b246 JX |
13945 | #, c-format |
13946 | msgid "no such ref %s" | |
13947 | msgstr "无此引用 %s" | |
13948 | ||
a4f16749 | 13949 | #: builtin/show-branch.c:808 |
a0b6b246 JX |
13950 | #, c-format |
13951 | msgid "cannot handle more than %d rev." | |
13952 | msgid_plural "cannot handle more than %d revs." | |
13953 | msgstr[0] "不能处理 %d 个以上的版本。" | |
13954 | msgstr[1] "不能处理 %d 个以上的版本。" | |
13955 | ||
a4f16749 | 13956 | #: builtin/show-branch.c:812 |
a0b6b246 JX |
13957 | #, c-format |
13958 | msgid "'%s' is not a valid ref." | |
13959 | msgstr "'%s' 不是一个有效的引用。" | |
13960 | ||
a4f16749 | 13961 | #: builtin/show-branch.c:815 |
a0b6b246 JX |
13962 | #, c-format |
13963 | msgid "cannot find commit %s (%s)" | |
29004bbb | 13964 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 13965 | |
ef317cd5 JX |
13966 | #: builtin/show-ref.c:10 |
13967 | msgid "" | |
814ff314 JX |
13968 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
13969 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 13970 | msgstr "" |
814ff314 JX |
13971 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
13972 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
13973 | |
13974 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
13975 | msgid "git show-ref --exclude-existing[=<pattern>]" |
13976 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 13977 | |
1a79b2f1 | 13978 | #: builtin/show-ref.c:159 |
ef317cd5 | 13979 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 13980 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 13981 | |
1a79b2f1 | 13982 | #: builtin/show-ref.c:160 |
ef317cd5 | 13983 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 13984 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 13985 | |
1a79b2f1 | 13986 | #: builtin/show-ref.c:161 |
ef317cd5 | 13987 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 13988 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 13989 | |
1a79b2f1 | 13990 | #: builtin/show-ref.c:164 builtin/show-ref.c:166 |
2e8451e8 JX |
13991 | msgid "show the HEAD reference, even if it would be filtered out" |
13992 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 13993 | |
1a79b2f1 | 13994 | #: builtin/show-ref.c:168 |
ef317cd5 | 13995 | msgid "dereference tags into object IDs" |
4375c10e | 13996 | msgstr "转换标签到对象 ID" |
ef317cd5 | 13997 | |
1a79b2f1 | 13998 | #: builtin/show-ref.c:170 |
ef317cd5 | 13999 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 14000 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 14001 | |
1a79b2f1 | 14002 | #: builtin/show-ref.c:174 |
ef317cd5 | 14003 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 14004 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 14005 | |
1a79b2f1 | 14006 | #: builtin/show-ref.c:176 |
ef317cd5 | 14007 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 14008 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 14009 | |
a4f16749 | 14010 | #: builtin/stripspace.c:18 |
94550ed3 JX |
14011 | msgid "git stripspace [-s | --strip-comments]" |
14012 | msgstr "git stripspace [-s | --strip-comments]" | |
14013 | ||
a4f16749 | 14014 | #: builtin/stripspace.c:19 |
94550ed3 JX |
14015 | msgid "git stripspace [-c | --comment-lines]" |
14016 | msgstr "git stripspace [-c | --comment-lines]" | |
14017 | ||
a4f16749 | 14018 | #: builtin/stripspace.c:36 |
94550ed3 JX |
14019 | msgid "skip and remove all lines starting with comment character" |
14020 | msgstr "跳过和移除所有的注释行" | |
14021 | ||
a4f16749 | 14022 | #: builtin/stripspace.c:39 |
276ceeaa | 14023 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
14024 | msgstr "为每一行的行首添加注释符和空格" |
14025 | ||
fd8cb379 | 14026 | #: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688 |
5b04ee3b JX |
14027 | #, c-format |
14028 | msgid "No such ref: %s" | |
14029 | msgstr "没有这样的引用:%s" | |
14030 | ||
fd8cb379 | 14031 | #: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 |
5b04ee3b JX |
14032 | #, c-format |
14033 | msgid "Expecting a full ref name, got %s" | |
14034 | msgstr "期望一个完整的引用名称,却得到 %s" | |
14035 | ||
fd8cb379 | 14036 | #: builtin/submodule--helper.c:61 |
31e5e17b JX |
14037 | msgid "submodule--helper print-default-remote takes no arguments" |
14038 | msgstr "submodule--helper print-default-remote 不带参数" | |
14039 | ||
fd8cb379 | 14040 | #: builtin/submodule--helper.c:98 |
5b04ee3b JX |
14041 | #, c-format |
14042 | msgid "cannot strip one component off url '%s'" | |
14043 | msgstr "无法从 url '%s' 剥离一个组件" | |
14044 | ||
fd8cb379 | 14045 | #: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211 |
94550ed3 JX |
14046 | msgid "alternative anchor for relative paths" |
14047 | msgstr "相对路径的替代锚记(anchor)" | |
14048 | ||
fd8cb379 | 14049 | #: builtin/submodule--helper.c:411 |
94550ed3 JX |
14050 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
14051 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
14052 | ||
fd8cb379 | 14053 | #: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 |
5b04ee3b JX |
14054 | #, c-format |
14055 | msgid "No url found for submodule path '%s' in .gitmodules" | |
14056 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
14057 | ||
fd8cb379 | 14058 | #: builtin/submodule--helper.c:500 |
87cb7997 JX |
14059 | #, c-format |
14060 | msgid "" | |
14061 | "could not lookup configuration '%s'. Assuming this repository is its own " | |
14062 | "authoritative upstream." | |
14063 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
14064 | ||
fd8cb379 | 14065 | #: builtin/submodule--helper.c:511 |
5b04ee3b JX |
14066 | #, c-format |
14067 | msgid "Failed to register url for submodule path '%s'" | |
14068 | msgstr "无法为子模组 '%s' 注册 url" | |
14069 | ||
fd8cb379 | 14070 | #: builtin/submodule--helper.c:515 |
5b04ee3b JX |
14071 | #, c-format |
14072 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 14073 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
14074 | |
14075 | # | |
fd8cb379 | 14076 | #: builtin/submodule--helper.c:525 |
aef18cc6 | 14077 | #, c-format |
5b04ee3b | 14078 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 14079 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 14080 | |
fd8cb379 | 14081 | #: builtin/submodule--helper.c:532 |
5b04ee3b JX |
14082 | #, c-format |
14083 | msgid "Failed to register update mode for submodule path '%s'" | |
14084 | msgstr "无法为子模组 '%s' 注册更新模式" | |
14085 | ||
fd8cb379 | 14086 | #: builtin/submodule--helper.c:554 |
5b04ee3b | 14087 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 14088 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 14089 | |
fd8cb379 | 14090 | #: builtin/submodule--helper.c:559 |
5b04ee3b JX |
14091 | msgid "git submodule--helper init [<path>]" |
14092 | msgstr "git submodule--helper init [<路径>]" | |
14093 | ||
fd8cb379 | 14094 | #: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 |
94550ed3 JX |
14095 | #, c-format |
14096 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
14097 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
14098 | ||
fd8cb379 | 14099 | #: builtin/submodule--helper.c:670 |
5809aa05 JX |
14100 | #, c-format |
14101 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
14102 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
14103 | ||
fd8cb379 | 14104 | #: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866 |
5809aa05 JX |
14105 | #, c-format |
14106 | msgid "failed to recurse into submodule '%s'" | |
14107 | msgstr "无法递归子模组 '%s'" | |
14108 | ||
fd8cb379 | 14109 | #: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 |
5809aa05 | 14110 | msgid "Suppress submodule status output" |
31e5e17b | 14111 | msgstr "阻止子模组状态输出" |
5809aa05 | 14112 | |
fd8cb379 | 14113 | #: builtin/submodule--helper.c:722 |
5809aa05 JX |
14114 | msgid "" |
14115 | "Use commit stored in the index instead of the one stored in the submodule " | |
14116 | "HEAD" | |
14117 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
14118 | ||
fd8cb379 | 14119 | #: builtin/submodule--helper.c:723 |
5809aa05 | 14120 | msgid "recurse into nested submodules" |
31e5e17b | 14121 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 14122 | |
fd8cb379 | 14123 | #: builtin/submodule--helper.c:728 |
5809aa05 JX |
14124 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
14125 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
14126 | ||
fd8cb379 | 14127 | #: builtin/submodule--helper.c:752 |
5809aa05 JX |
14128 | msgid "git submodule--helper name <path>" |
14129 | msgstr "git submodule--helper name <路径>" | |
14130 | ||
fd8cb379 | 14131 | #: builtin/submodule--helper.c:816 |
31e5e17b JX |
14132 | #, c-format |
14133 | msgid "Synchronizing submodule url for '%s'\n" | |
14134 | msgstr "为 '%s' 同步子模组 url\n" | |
14135 | ||
fd8cb379 | 14136 | #: builtin/submodule--helper.c:822 |
31e5e17b JX |
14137 | #, c-format |
14138 | msgid "failed to register url for submodule path '%s'" | |
14139 | msgstr "无法为子模组路径 '%s' 注册 url" | |
14140 | ||
fd8cb379 | 14141 | #: builtin/submodule--helper.c:836 |
31e5e17b JX |
14142 | #, c-format |
14143 | msgid "failed to get the default remote for submodule '%s'" | |
14144 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
14145 | ||
fd8cb379 | 14146 | #: builtin/submodule--helper.c:847 |
31e5e17b JX |
14147 | #, c-format |
14148 | msgid "failed to update remote for submodule '%s'" | |
14149 | msgstr "无法为子模组 '%s' 更新远程关联" | |
14150 | ||
fd8cb379 | 14151 | #: builtin/submodule--helper.c:895 |
31e5e17b JX |
14152 | msgid "Suppress output of synchronizing submodule url" |
14153 | msgstr "阻止子模组 url 同步的输出" | |
14154 | ||
fd8cb379 | 14155 | #: builtin/submodule--helper.c:897 |
31e5e17b JX |
14156 | msgid "Recurse into nested submodules" |
14157 | msgstr "递归进入嵌套子模组中" | |
14158 | ||
fd8cb379 | 14159 | #: builtin/submodule--helper.c:902 |
31e5e17b JX |
14160 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
14161 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
14162 | ||
fd8cb379 | 14163 | #: builtin/submodule--helper.c:956 |
31e5e17b JX |
14164 | #, c-format |
14165 | msgid "" | |
14166 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
14167 | "really want to remove it including all of its history)" | |
14168 | msgstr "" | |
fd8cb379 JX |
14169 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
14170 | "-rf' 命令)" | |
31e5e17b | 14171 | |
fd8cb379 | 14172 | #: builtin/submodule--helper.c:968 |
31e5e17b JX |
14173 | #, c-format |
14174 | msgid "" | |
14175 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
14176 | "them" | |
14177 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
14178 | ||
fd8cb379 | 14179 | #: builtin/submodule--helper.c:976 |
31e5e17b JX |
14180 | #, c-format |
14181 | msgid "Cleared directory '%s'\n" | |
14182 | msgstr "已清除目录 '%s'\n" | |
14183 | ||
fd8cb379 | 14184 | #: builtin/submodule--helper.c:978 |
31e5e17b JX |
14185 | #, c-format |
14186 | msgid "Could not remove submodule work tree '%s'\n" | |
14187 | msgstr "无法移除子模组工作区 '%s'\n" | |
14188 | ||
fd8cb379 | 14189 | #: builtin/submodule--helper.c:987 |
31e5e17b JX |
14190 | #, c-format |
14191 | msgid "could not create empty submodule directory %s" | |
14192 | msgstr "不能创建空的子模组目录 %s" | |
14193 | ||
fd8cb379 | 14194 | #: builtin/submodule--helper.c:1003 |
31e5e17b JX |
14195 | #, c-format |
14196 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
14197 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
14198 | ||
fd8cb379 | 14199 | #: builtin/submodule--helper.c:1032 |
31e5e17b JX |
14200 | msgid "Remove submodule working trees even if they contain local changes" |
14201 | msgstr "删除子模组工作区,即使包含本地修改" | |
14202 | ||
fd8cb379 | 14203 | #: builtin/submodule--helper.c:1033 |
31e5e17b JX |
14204 | msgid "Unregister all submodules" |
14205 | msgstr "将所有子模组取消注册" | |
14206 | ||
fd8cb379 | 14207 | #: builtin/submodule--helper.c:1038 |
31e5e17b JX |
14208 | msgid "" |
14209 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
14210 | msgstr "" | |
14211 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
14212 | ||
fd8cb379 | 14213 | #: builtin/submodule--helper.c:1052 |
31e5e17b JX |
14214 | msgid "Use '--all' if you really want to deinitialize all submodules" |
14215 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
14216 | ||
fd8cb379 | 14217 | #: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 |
a0b6b246 JX |
14218 | #, c-format |
14219 | msgid "submodule '%s' cannot add alternate: %s" | |
14220 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
14221 | ||
fd8cb379 | 14222 | #: builtin/submodule--helper.c:1184 |
a0b6b246 JX |
14223 | #, c-format |
14224 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
14225 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
14226 | ||
fd8cb379 | 14227 | #: builtin/submodule--helper.c:1191 |
a0b6b246 JX |
14228 | #, c-format |
14229 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
14230 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
14231 | ||
fd8cb379 | 14232 | #: builtin/submodule--helper.c:1214 |
94550ed3 JX |
14233 | msgid "where the new submodule will be cloned to" |
14234 | msgstr "新的子模组将要克隆的路径" | |
14235 | ||
fd8cb379 | 14236 | #: builtin/submodule--helper.c:1217 |
94550ed3 JX |
14237 | msgid "name of the new submodule" |
14238 | msgstr "新子模组的名称" | |
14239 | ||
fd8cb379 | 14240 | #: builtin/submodule--helper.c:1220 |
94550ed3 JX |
14241 | msgid "url where to clone the submodule from" |
14242 | msgstr "克隆子模组的 url 地址" | |
14243 | ||
fd8cb379 | 14244 | #: builtin/submodule--helper.c:1228 |
94550ed3 JX |
14245 | msgid "depth for shallow clones" |
14246 | msgstr "浅克隆的深度" | |
14247 | ||
fd8cb379 | 14248 | #: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 |
a0b6b246 | 14249 | msgid "force cloning progress" |
29004bbb | 14250 | msgstr "强制显示克隆进度" |
a0b6b246 | 14251 | |
fd8cb379 | 14252 | #: builtin/submodule--helper.c:1236 |
94550ed3 JX |
14253 | msgid "" |
14254 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 14255 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
14256 | msgstr "" |
14257 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
14258 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 14259 | |
fd8cb379 | 14260 | #: builtin/submodule--helper.c:1267 |
94550ed3 JX |
14261 | #, c-format |
14262 | msgid "clone of '%s' into submodule path '%s' failed" | |
14263 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
14264 | ||
fd8cb379 | 14265 | #: builtin/submodule--helper.c:1281 |
94550ed3 JX |
14266 | #, c-format |
14267 | msgid "could not get submodule directory for '%s'" | |
14268 | msgstr "无法得到 '%s' 的子模组目录" | |
14269 | ||
fd8cb379 | 14270 | #: builtin/submodule--helper.c:1347 |
5b04ee3b JX |
14271 | #, c-format |
14272 | msgid "Submodule path '%s' not initialized" | |
14273 | msgstr "子模组 '%s' 尚未初始化" | |
14274 | ||
fd8cb379 | 14275 | #: builtin/submodule--helper.c:1351 |
5b04ee3b JX |
14276 | msgid "Maybe you want to use 'update --init'?" |
14277 | msgstr "也许您想要执行 'update --init'?" | |
14278 | ||
fd8cb379 | 14279 | #: builtin/submodule--helper.c:1380 |
5b04ee3b JX |
14280 | #, c-format |
14281 | msgid "Skipping unmerged submodule %s" | |
14282 | msgstr "略过未合并的子模组 %s" | |
14283 | ||
fd8cb379 | 14284 | #: builtin/submodule--helper.c:1409 |
5b04ee3b JX |
14285 | #, c-format |
14286 | msgid "Skipping submodule '%s'" | |
14287 | msgstr "略过子模组 '%s'" | |
14288 | ||
fd8cb379 | 14289 | #: builtin/submodule--helper.c:1544 |
5c57d762 JX |
14290 | #, c-format |
14291 | msgid "Failed to clone '%s'. Retry scheduled" | |
14292 | msgstr "克隆 '%s' 失败。按计划重试" | |
14293 | ||
fd8cb379 | 14294 | #: builtin/submodule--helper.c:1555 |
5c57d762 JX |
14295 | #, c-format |
14296 | msgid "Failed to clone '%s' a second time, aborting" | |
14297 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
14298 | ||
fd8cb379 | 14299 | #: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808 |
5b04ee3b JX |
14300 | msgid "path into the working tree" |
14301 | msgstr "到工作区的路径" | |
14302 | ||
fd8cb379 | 14303 | #: builtin/submodule--helper.c:1588 |
5b04ee3b JX |
14304 | msgid "path into the working tree, across nested submodule boundaries" |
14305 | msgstr "工作区中的路径,递归嵌套子模组" | |
14306 | ||
fd8cb379 | 14307 | #: builtin/submodule--helper.c:1592 |
5b04ee3b JX |
14308 | msgid "rebase, merge, checkout or none" |
14309 | msgstr "rebase、merge、checkout 或 none" | |
14310 | ||
fd8cb379 | 14311 | #: builtin/submodule--helper.c:1598 |
5b04ee3b JX |
14312 | msgid "Create a shallow clone truncated to the specified number of revisions" |
14313 | msgstr "创建一个指定深度的浅克隆" | |
14314 | ||
fd8cb379 | 14315 | #: builtin/submodule--helper.c:1601 |
5b04ee3b JX |
14316 | msgid "parallel jobs" |
14317 | msgstr "并发任务" | |
14318 | ||
fd8cb379 | 14319 | #: builtin/submodule--helper.c:1603 |
5c57d762 | 14320 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 14321 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 14322 | |
fd8cb379 | 14323 | #: builtin/submodule--helper.c:1604 |
5b04ee3b JX |
14324 | msgid "don't print cloning progress" |
14325 | msgstr "不要输出克隆进度" | |
94550ed3 | 14326 | |
fd8cb379 | 14327 | #: builtin/submodule--helper.c:1611 |
5b04ee3b JX |
14328 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
14329 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
14330 | ||
fd8cb379 | 14331 | #: builtin/submodule--helper.c:1624 |
5b04ee3b JX |
14332 | msgid "bad value for update parameter" |
14333 | msgstr "update 参数取值错误" | |
14334 | ||
fd8cb379 | 14335 | #: builtin/submodule--helper.c:1692 |
5c57d762 JX |
14336 | #, c-format |
14337 | msgid "" | |
14338 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
14339 | "the superproject is not on any branch" | |
14340 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
14341 | ||
fd8cb379 | 14342 | #: builtin/submodule--helper.c:1809 |
1a79b2f1 JX |
14343 | msgid "recurse into submodules" |
14344 | msgstr "在子模组中递归" | |
14345 | ||
fd8cb379 | 14346 | #: builtin/submodule--helper.c:1815 |
1a79b2f1 JX |
14347 | msgid "git submodule--helper embed-git-dir [<path>...]" |
14348 | msgstr "git submodule--helper embed-git-dir [<路径>...]" | |
14349 | ||
fd8cb379 | 14350 | #: builtin/submodule--helper.c:1901 |
1a79b2f1 JX |
14351 | #, c-format |
14352 | msgid "%s doesn't support --super-prefix" | |
14353 | msgstr "%s 不支持 --super-prefix" | |
14354 | ||
fd8cb379 | 14355 | #: builtin/submodule--helper.c:1907 |
94550ed3 | 14356 | #, c-format |
5b04ee3b JX |
14357 | msgid "'%s' is not a valid submodule--helper subcommand" |
14358 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 14359 | |
a4f16749 | 14360 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
14361 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
14362 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 14363 | |
a4f16749 | 14364 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
14365 | msgid "git symbolic-ref -d [-q] <name>" |
14366 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 14367 | |
6937cb4e | 14368 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 14369 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
14370 | msgstr "不显示非符号(分离的)引用的错误信息" |
14371 | ||
6937cb4e | 14372 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
14373 | msgid "delete symbolic ref" |
14374 | msgstr "删除符号引用" | |
ef317cd5 | 14375 | |
6937cb4e | 14376 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 14377 | msgid "shorten ref output" |
6937cb4e | 14378 | msgstr "缩短引用输出" |
ef317cd5 | 14379 | |
6937cb4e | 14380 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 14381 | msgid "reason" |
07432cef | 14382 | msgstr "原因" |
ef317cd5 | 14383 | |
6937cb4e | 14384 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 14385 | msgid "reason of the update" |
07432cef | 14386 | msgstr "更新的原因" |
ef317cd5 | 14387 | |
a4f16749 | 14388 | #: builtin/tag.c:24 |
ef317cd5 | 14389 | msgid "" |
814ff314 JX |
14390 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
14391 | "[<head>]" | |
14392 | msgstr "" | |
14393 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 14394 | |
a4f16749 | 14395 | #: builtin/tag.c:25 |
ef317cd5 | 14396 | msgid "git tag -d <tagname>..." |
07432cef | 14397 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 14398 | |
a4f16749 | 14399 | #: builtin/tag.c:26 |
ef317cd5 | 14400 | msgid "" |
87cb7997 JX |
14401 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
14402 | "points-at <object>]\n" | |
94550ed3 | 14403 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 14404 | msgstr "" |
87cb7997 JX |
14405 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
14406 | "at <对象>]\n" | |
94550ed3 | 14407 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 14408 | |
a4f16749 | 14409 | #: builtin/tag.c:28 |
1a79b2f1 JX |
14410 | msgid "git tag -v [--format=<format>] <tagname>..." |
14411 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 14412 | |
6937cb4e | 14413 | #: builtin/tag.c:86 |
c04f5ac3 JX |
14414 | #, c-format |
14415 | msgid "tag '%s' not found." | |
55a16ee4 | 14416 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 14417 | |
6937cb4e | 14418 | #: builtin/tag.c:102 |
c04f5ac3 JX |
14419 | #, c-format |
14420 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 14421 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 14422 | |
fd8cb379 | 14423 | #: builtin/tag.c:132 |
a77c07d9 | 14424 | #, c-format |
c04f5ac3 JX |
14425 | msgid "" |
14426 | "\n" | |
6acbf033 JX |
14427 | "Write a message for tag:\n" |
14428 | " %s\n" | |
a77c07d9 | 14429 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
14430 | msgstr "" |
14431 | "\n" | |
55a16ee4 | 14432 | "输入一个标签说明:\n" |
6acbf033 | 14433 | " %s\n" |
a77c07d9 | 14434 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 14435 | |
fd8cb379 | 14436 | #: builtin/tag.c:136 |
a77c07d9 | 14437 | #, c-format |
c04f5ac3 JX |
14438 | msgid "" |
14439 | "\n" | |
6acbf033 JX |
14440 | "Write a message for tag:\n" |
14441 | " %s\n" | |
a77c07d9 | 14442 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 14443 | "want to.\n" |
c04f5ac3 JX |
14444 | msgstr "" |
14445 | "\n" | |
55a16ee4 | 14446 | "输入一个标签说明:\n" |
6acbf033 | 14447 | " %s\n" |
a77c07d9 | 14448 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 14449 | |
fd8cb379 | 14450 | #: builtin/tag.c:190 |
c04f5ac3 | 14451 | msgid "unable to sign the tag" |
55a16ee4 | 14452 | msgstr "无法签署标签" |
c04f5ac3 | 14453 | |
fd8cb379 | 14454 | #: builtin/tag.c:192 |
c04f5ac3 | 14455 | msgid "unable to write tag file" |
55a16ee4 | 14456 | msgstr "无法写标签文件" |
c04f5ac3 | 14457 | |
fd8cb379 | 14458 | #: builtin/tag.c:217 |
c04f5ac3 | 14459 | msgid "bad object type." |
90e6ef53 | 14460 | msgstr "坏的对象类型。" |
c04f5ac3 | 14461 | |
fd8cb379 | 14462 | #: builtin/tag.c:266 |
c04f5ac3 | 14463 | msgid "no tag message?" |
55a16ee4 | 14464 | msgstr "无标签说明?" |
c04f5ac3 | 14465 | |
fd8cb379 | 14466 | #: builtin/tag.c:273 |
c04f5ac3 JX |
14467 | #, c-format |
14468 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 14469 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 14470 | |
fd8cb379 | 14471 | #: builtin/tag.c:382 |
ef317cd5 | 14472 | msgid "list tag names" |
55a16ee4 | 14473 | msgstr "列出标签名称" |
ef317cd5 | 14474 | |
fd8cb379 | 14475 | #: builtin/tag.c:384 |
ef317cd5 | 14476 | msgid "print <n> lines of each tag message" |
55a16ee4 | 14477 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 14478 | |
fd8cb379 | 14479 | #: builtin/tag.c:386 |
ef317cd5 | 14480 | msgid "delete tags" |
55a16ee4 | 14481 | msgstr "删除标签" |
ef317cd5 | 14482 | |
fd8cb379 | 14483 | #: builtin/tag.c:387 |
ef317cd5 | 14484 | msgid "verify tags" |
55a16ee4 | 14485 | msgstr "验证标签" |
ef317cd5 | 14486 | |
fd8cb379 | 14487 | #: builtin/tag.c:389 |
ef317cd5 | 14488 | msgid "Tag creation options" |
55a16ee4 | 14489 | msgstr "标签创建选项" |
ef317cd5 | 14490 | |
fd8cb379 | 14491 | #: builtin/tag.c:391 |
ef317cd5 | 14492 | msgid "annotated tag, needs a message" |
55a16ee4 | 14493 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 14494 | |
fd8cb379 | 14495 | #: builtin/tag.c:393 |
ef317cd5 | 14496 | msgid "tag message" |
55a16ee4 | 14497 | msgstr "标签说明" |
ef317cd5 | 14498 | |
fd8cb379 | 14499 | #: builtin/tag.c:395 |
31e5e17b JX |
14500 | msgid "force edit of tag message" |
14501 | msgstr "强制编辑标签说明" | |
14502 | ||
fd8cb379 | 14503 | #: builtin/tag.c:396 |
ef317cd5 | 14504 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 14505 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 14506 | |
fd8cb379 | 14507 | #: builtin/tag.c:400 |
ef317cd5 | 14508 | msgid "use another key to sign the tag" |
55a16ee4 | 14509 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 14510 | |
fd8cb379 | 14511 | #: builtin/tag.c:401 |
ef317cd5 | 14512 | msgid "replace the tag if exists" |
55a16ee4 | 14513 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 14514 | |
fd8cb379 | 14515 | #: builtin/tag.c:402 builtin/update-ref.c:368 |
03ea3327 | 14516 | msgid "create a reflog" |
1b7f4a34 JX |
14517 | msgstr "创建引用日志" |
14518 | ||
fd8cb379 | 14519 | #: builtin/tag.c:404 |
814ff314 | 14520 | msgid "Tag listing options" |
55a16ee4 | 14521 | msgstr "标签列表选项" |
814ff314 | 14522 | |
fd8cb379 | 14523 | #: builtin/tag.c:405 |
ef317cd5 | 14524 | msgid "show tag list in columns" |
55a16ee4 | 14525 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 14526 | |
fd8cb379 | 14527 | #: builtin/tag.c:406 builtin/tag.c:408 |
ef317cd5 | 14528 | msgid "print only tags that contain the commit" |
87cb7997 | 14529 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 14530 | |
fd8cb379 | 14531 | #: builtin/tag.c:407 builtin/tag.c:409 |
87cb7997 JX |
14532 | msgid "print only tags that don't contain the commit" |
14533 | msgstr "只打印不包含该提交的标签" | |
14534 | ||
fd8cb379 | 14535 | #: builtin/tag.c:410 |
94550ed3 JX |
14536 | msgid "print only tags that are merged" |
14537 | msgstr "只打印已经合并的标签" | |
14538 | ||
fd8cb379 | 14539 | #: builtin/tag.c:411 |
94550ed3 JX |
14540 | msgid "print only tags that are not merged" |
14541 | msgstr "只打印尚未合并的标签" | |
14542 | ||
fd8cb379 | 14543 | #: builtin/tag.c:416 |
ef317cd5 | 14544 | msgid "print only tags of the object" |
87cb7997 | 14545 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 14546 | |
fd8cb379 | 14547 | #: builtin/tag.c:460 |
8ada9598 | 14548 | msgid "--column and -n are incompatible" |
81809b99 | 14549 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 14550 | |
fd8cb379 | 14551 | #: builtin/tag.c:482 |
87cb7997 JX |
14552 | msgid "-n option is only allowed in list mode" |
14553 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 14554 | |
fd8cb379 | 14555 | #: builtin/tag.c:484 |
87cb7997 JX |
14556 | msgid "--contains option is only allowed in list mode" |
14557 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 14558 | |
fd8cb379 | 14559 | #: builtin/tag.c:486 |
87cb7997 JX |
14560 | msgid "--no-contains option is only allowed in list mode" |
14561 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 14562 | |
fd8cb379 | 14563 | #: builtin/tag.c:488 |
87cb7997 JX |
14564 | msgid "--points-at option is only allowed in list mode" |
14565 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 14566 | |
fd8cb379 | 14567 | #: builtin/tag.c:490 |
87cb7997 JX |
14568 | msgid "--merged and --no-merged options are only allowed in list mode" |
14569 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
14570 | ||
fd8cb379 | 14571 | #: builtin/tag.c:501 |
c04f5ac3 JX |
14572 | msgid "only one -F or -m option is allowed." |
14573 | msgstr "只允许一个 -F 或 -m 选项。" | |
14574 | ||
fd8cb379 | 14575 | #: builtin/tag.c:520 |
c04f5ac3 JX |
14576 | msgid "too many params" |
14577 | msgstr "太多参数" | |
14578 | ||
fd8cb379 | 14579 | #: builtin/tag.c:526 |
c04f5ac3 JX |
14580 | #, c-format |
14581 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 14582 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 14583 | |
fd8cb379 | 14584 | #: builtin/tag.c:531 |
c04f5ac3 JX |
14585 | #, c-format |
14586 | msgid "tag '%s' already exists" | |
55a16ee4 | 14587 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 14588 | |
fd8cb379 | 14589 | #: builtin/tag.c:562 |
c04f5ac3 JX |
14590 | #, c-format |
14591 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 14592 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 14593 | |
31e5e17b | 14594 | #: builtin/unpack-objects.c:498 |
6c94aba5 JX |
14595 | msgid "Unpacking objects" |
14596 | msgstr "展开对象中" | |
14597 | ||
5809aa05 | 14598 | #: builtin/update-index.c:82 |
7aea43ff JX |
14599 | #, c-format |
14600 | msgid "failed to create directory %s" | |
14601 | msgstr "无法创建目录 %s" | |
14602 | ||
5809aa05 | 14603 | #: builtin/update-index.c:88 |
7aea43ff JX |
14604 | #, c-format |
14605 | msgid "failed to stat %s" | |
65e2041e | 14606 | msgstr "对 %s 调用 stat 失败" |
7aea43ff | 14607 | |
5809aa05 | 14608 | #: builtin/update-index.c:98 |
7aea43ff JX |
14609 | #, c-format |
14610 | msgid "failed to create file %s" | |
14611 | msgstr "无法创建文件 %s" | |
14612 | ||
5809aa05 | 14613 | #: builtin/update-index.c:106 |
7aea43ff JX |
14614 | #, c-format |
14615 | msgid "failed to delete file %s" | |
14616 | msgstr "无法删除文件 %s" | |
14617 | ||
5809aa05 | 14618 | #: builtin/update-index.c:113 builtin/update-index.c:219 |
7aea43ff JX |
14619 | #, c-format |
14620 | msgid "failed to delete directory %s" | |
14621 | msgstr "无法删除目录 %s" | |
14622 | ||
5809aa05 | 14623 | #: builtin/update-index.c:138 |
7aea43ff | 14624 | #, c-format |
276ceeaa JX |
14625 | msgid "Testing mtime in '%s' " |
14626 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 14627 | |
5809aa05 | 14628 | #: builtin/update-index.c:152 |
7aea43ff JX |
14629 | msgid "directory stat info does not change after adding a new file" |
14630 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
14631 | ||
5809aa05 | 14632 | #: builtin/update-index.c:165 |
7aea43ff JX |
14633 | msgid "directory stat info does not change after adding a new directory" |
14634 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
14635 | ||
5809aa05 | 14636 | #: builtin/update-index.c:178 |
7aea43ff JX |
14637 | msgid "directory stat info changes after updating a file" |
14638 | msgstr "更新一个文件后,目录的状态信息被修改" | |
14639 | ||
5809aa05 | 14640 | #: builtin/update-index.c:189 |
7aea43ff JX |
14641 | msgid "directory stat info changes after adding a file inside subdirectory" |
14642 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
14643 | ||
5809aa05 | 14644 | #: builtin/update-index.c:200 |
7aea43ff JX |
14645 | msgid "directory stat info does not change after deleting a file" |
14646 | msgstr "删除一个文件后,目录的状态信息未改变" | |
14647 | ||
5809aa05 | 14648 | #: builtin/update-index.c:213 |
7aea43ff JX |
14649 | msgid "directory stat info does not change after deleting a directory" |
14650 | msgstr "删除一个目录后,目录的状态信息未改变" | |
14651 | ||
5809aa05 | 14652 | #: builtin/update-index.c:220 |
7aea43ff JX |
14653 | msgid " OK" |
14654 | msgstr " OK" | |
14655 | ||
fd8cb379 | 14656 | #: builtin/update-index.c:589 |
814ff314 JX |
14657 | msgid "git update-index [<options>] [--] [<file>...]" |
14658 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 14659 | |
fd8cb379 | 14660 | #: builtin/update-index.c:946 |
ef317cd5 | 14661 | msgid "continue refresh even when index needs update" |
07432cef | 14662 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 14663 | |
fd8cb379 | 14664 | #: builtin/update-index.c:949 |
ef317cd5 | 14665 | msgid "refresh: ignore submodules" |
07432cef | 14666 | msgstr "刷新:忽略子模组" |
8ada9598 | 14667 | |
fd8cb379 | 14668 | #: builtin/update-index.c:952 |
ef317cd5 | 14669 | msgid "do not ignore new files" |
07432cef | 14670 | msgstr "不忽略新的文件" |
8ada9598 | 14671 | |
fd8cb379 | 14672 | #: builtin/update-index.c:954 |
ef317cd5 | 14673 | msgid "let files replace directories and vice-versa" |
07432cef | 14674 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 14675 | |
fd8cb379 | 14676 | #: builtin/update-index.c:956 |
ef317cd5 | 14677 | msgid "notice files missing from worktree" |
07432cef | 14678 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 14679 | |
fd8cb379 | 14680 | #: builtin/update-index.c:958 |
ef317cd5 | 14681 | msgid "refresh even if index contains unmerged entries" |
07432cef | 14682 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 14683 | |
fd8cb379 | 14684 | #: builtin/update-index.c:961 |
ef317cd5 | 14685 | msgid "refresh stat information" |
07432cef | 14686 | msgstr "刷新统计信息" |
ef317cd5 | 14687 | |
fd8cb379 | 14688 | #: builtin/update-index.c:965 |
ef317cd5 | 14689 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 14690 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 14691 | |
fd8cb379 | 14692 | #: builtin/update-index.c:969 |
6c94aba5 | 14693 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 14694 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 14695 | |
fd8cb379 | 14696 | #: builtin/update-index.c:970 |
ef317cd5 | 14697 | msgid "add the specified entry to the index" |
07432cef | 14698 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 14699 | |
fd8cb379 | 14700 | #: builtin/update-index.c:979 |
ef317cd5 | 14701 | msgid "mark files as \"not changing\"" |
07432cef | 14702 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 14703 | |
fd8cb379 | 14704 | #: builtin/update-index.c:982 |
ef317cd5 | 14705 | msgid "clear assumed-unchanged bit" |
07432cef | 14706 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 14707 | |
fd8cb379 | 14708 | #: builtin/update-index.c:985 |
ef317cd5 | 14709 | msgid "mark files as \"index-only\"" |
07432cef | 14710 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 14711 | |
fd8cb379 | 14712 | #: builtin/update-index.c:988 |
ef317cd5 | 14713 | msgid "clear skip-worktree bit" |
07432cef | 14714 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 14715 | |
fd8cb379 | 14716 | #: builtin/update-index.c:991 |
ef317cd5 | 14717 | msgid "add to index only; do not add content to object database" |
07432cef | 14718 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 14719 | |
fd8cb379 | 14720 | #: builtin/update-index.c:993 |
ef317cd5 | 14721 | msgid "remove named paths even if present in worktree" |
07432cef | 14722 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 14723 | |
fd8cb379 | 14724 | #: builtin/update-index.c:995 |
ef317cd5 | 14725 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 14726 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 14727 | |
fd8cb379 | 14728 | #: builtin/update-index.c:997 |
ef317cd5 | 14729 | msgid "read list of paths to be updated from standard input" |
07432cef | 14730 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 14731 | |
fd8cb379 | 14732 | #: builtin/update-index.c:1001 |
ef317cd5 | 14733 | msgid "add entries from standard input to the index" |
07432cef | 14734 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 14735 | |
fd8cb379 | 14736 | #: builtin/update-index.c:1005 |
ef317cd5 | 14737 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 14738 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 14739 | |
fd8cb379 | 14740 | #: builtin/update-index.c:1009 |
ef317cd5 | 14741 | msgid "only update entries that differ from HEAD" |
07432cef | 14742 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 14743 | |
fd8cb379 | 14744 | #: builtin/update-index.c:1013 |
ef317cd5 | 14745 | msgid "ignore files missing from worktree" |
07432cef | 14746 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 14747 | |
fd8cb379 | 14748 | #: builtin/update-index.c:1016 |
ef317cd5 | 14749 | msgid "report actions to standard output" |
07432cef | 14750 | msgstr "在标准输出显示操作" |
ef317cd5 | 14751 | |
fd8cb379 | 14752 | #: builtin/update-index.c:1018 |
ef317cd5 | 14753 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 14754 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 14755 | |
fd8cb379 | 14756 | #: builtin/update-index.c:1022 |
ef317cd5 | 14757 | msgid "write index in this format" |
07432cef | 14758 | msgstr "以这种格式写入索引区" |
ef317cd5 | 14759 | |
fd8cb379 | 14760 | #: builtin/update-index.c:1024 |
6acbf033 JX |
14761 | msgid "enable or disable split index" |
14762 | msgstr "启用或禁用索引拆分" | |
14763 | ||
fd8cb379 | 14764 | #: builtin/update-index.c:1026 |
7aea43ff JX |
14765 | msgid "enable/disable untracked cache" |
14766 | msgstr "启用/禁用对未跟踪文件的缓存" | |
14767 | ||
fd8cb379 | 14768 | #: builtin/update-index.c:1028 |
276ceeaa JX |
14769 | msgid "test if the filesystem supports untracked cache" |
14770 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
14771 | ||
fd8cb379 | 14772 | #: builtin/update-index.c:1030 |
7aea43ff JX |
14773 | msgid "enable untracked cache without testing the filesystem" |
14774 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
14775 | ||
fd8cb379 | 14776 | #: builtin/update-index.c:1032 |
5809aa05 JX |
14777 | msgid "write out the index even if is not flagged as changed" |
14778 | msgstr "即使没有被标记为已更改,也要写出索引" | |
14779 | ||
fd8cb379 | 14780 | #: builtin/update-index.c:1034 |
5809aa05 JX |
14781 | msgid "enable or disable file system monitor" |
14782 | msgstr "启用或禁用文件系统监控" | |
14783 | ||
fd8cb379 | 14784 | #: builtin/update-index.c:1036 |
5809aa05 JX |
14785 | msgid "mark files as fsmonitor valid" |
14786 | msgstr "标记文件为 fsmonitor 有效" | |
14787 | ||
fd8cb379 | 14788 | #: builtin/update-index.c:1039 |
5809aa05 JX |
14789 | msgid "clear fsmonitor valid bit" |
14790 | msgstr "清除 fsmonitor 有效位" | |
14791 | ||
fd8cb379 | 14792 | #: builtin/update-index.c:1138 |
87cb7997 JX |
14793 | msgid "" |
14794 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
14795 | "enable split index" | |
14796 | msgstr "" | |
14797 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
14798 | ||
fd8cb379 | 14799 | #: builtin/update-index.c:1147 |
87cb7997 JX |
14800 | msgid "" |
14801 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
14802 | "disable split index" | |
14803 | msgstr "" | |
14804 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
14805 | ||
fd8cb379 | 14806 | #: builtin/update-index.c:1158 |
a0b6b246 JX |
14807 | msgid "" |
14808 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
14809 | "to disable the untracked cache" | |
275588f9 JX |
14810 | msgstr "" |
14811 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
14812 | "改它。" | |
a0b6b246 | 14813 | |
fd8cb379 | 14814 | #: builtin/update-index.c:1162 |
276ceeaa JX |
14815 | msgid "Untracked cache disabled" |
14816 | msgstr "缓存未跟踪文件被禁用" | |
14817 | ||
fd8cb379 | 14818 | #: builtin/update-index.c:1170 |
a0b6b246 JX |
14819 | msgid "" |
14820 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
14821 | "to enable the untracked cache" | |
275588f9 JX |
14822 | msgstr "" |
14823 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
14824 | "修改它。" | |
a0b6b246 | 14825 | |
fd8cb379 | 14826 | #: builtin/update-index.c:1174 |
276ceeaa JX |
14827 | #, c-format |
14828 | msgid "Untracked cache enabled for '%s'" | |
14829 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
14830 | ||
fd8cb379 | 14831 | #: builtin/update-index.c:1182 |
5809aa05 | 14832 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 14833 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 14834 | |
fd8cb379 | 14835 | #: builtin/update-index.c:1186 |
5809aa05 JX |
14836 | msgid "fsmonitor enabled" |
14837 | msgstr "fsmonitor 被启用" | |
14838 | ||
fd8cb379 | 14839 | #: builtin/update-index.c:1189 |
5809aa05 JX |
14840 | msgid "" |
14841 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 14842 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 14843 | |
fd8cb379 | 14844 | #: builtin/update-index.c:1193 |
5809aa05 JX |
14845 | msgid "fsmonitor disabled" |
14846 | msgstr "fsmonitor 被禁用" | |
14847 | ||
a4f16749 | 14848 | #: builtin/update-ref.c:10 |
814ff314 JX |
14849 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
14850 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 14851 | |
a4f16749 | 14852 | #: builtin/update-ref.c:11 |
814ff314 JX |
14853 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
14854 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 14855 | |
a4f16749 | 14856 | #: builtin/update-ref.c:12 |
814ff314 JX |
14857 | msgid "git update-ref [<options>] --stdin [-z]" |
14858 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 14859 | |
6937cb4e | 14860 | #: builtin/update-ref.c:363 |
ef317cd5 | 14861 | msgid "delete the reference" |
07432cef | 14862 | msgstr "删除引用" |
ef317cd5 | 14863 | |
6937cb4e | 14864 | #: builtin/update-ref.c:365 |
ef317cd5 | 14865 | msgid "update <refname> not the one it points to" |
07432cef | 14866 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 14867 | |
6937cb4e | 14868 | #: builtin/update-ref.c:366 |
90314792 JX |
14869 | msgid "stdin has NUL-terminated arguments" |
14870 | msgstr "标准输入有以 NUL 字符终止的参数" | |
14871 | ||
6937cb4e | 14872 | #: builtin/update-ref.c:367 |
90314792 JX |
14873 | msgid "read updates from stdin" |
14874 | msgstr "从标准输入读取更新" | |
14875 | ||
a4f16749 | 14876 | #: builtin/update-server-info.c:7 |
ef317cd5 | 14877 | msgid "git update-server-info [--force]" |
07432cef | 14878 | msgstr "git update-server-info [--force]" |
ef317cd5 | 14879 | |
a4f16749 | 14880 | #: builtin/update-server-info.c:15 |
ef317cd5 | 14881 | msgid "update the info files from scratch" |
07432cef | 14882 | msgstr "从头开始更新文件信息" |
ef317cd5 | 14883 | |
fd8cb379 JX |
14884 | #: builtin/upload-pack.c:11 |
14885 | msgid "git upload-pack [<options>] <dir>" | |
14886 | msgstr "git upload-pack [<选项>] <目录>" | |
14887 | ||
14888 | #: builtin/upload-pack.c:25 | |
14889 | msgid "exit immediately after initial ref advertisement" | |
14890 | msgstr "在初始的引用广告后立即退出" | |
14891 | ||
14892 | #: builtin/upload-pack.c:27 | |
14893 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
14894 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
14895 | ||
14896 | #: builtin/upload-pack.c:29 | |
14897 | msgid "interrupt transfer after <n> seconds of inactivity" | |
14898 | msgstr "不活动 <n> 秒钟后终止传输" | |
14899 | ||
a4f16749 | 14900 | #: builtin/verify-commit.c:18 |
814ff314 JX |
14901 | msgid "git verify-commit [-v | --verbose] <commit>..." |
14902 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 14903 | |
a4f16749 | 14904 | #: builtin/verify-commit.c:73 |
6acbf033 JX |
14905 | msgid "print commit contents" |
14906 | msgstr "打印提交内容" | |
14907 | ||
a4f16749 | 14908 | #: builtin/verify-commit.c:74 builtin/verify-tag.c:38 |
1b7f4a34 JX |
14909 | msgid "print raw gpg status output" |
14910 | msgstr "打印原始 gpg 状态输出" | |
14911 | ||
a4f16749 | 14912 | #: builtin/verify-pack.c:55 |
814ff314 JX |
14913 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
14914 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 14915 | |
a4f16749 | 14916 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
14917 | msgid "verbose" |
14918 | msgstr "冗长输出" | |
14919 | ||
a4f16749 | 14920 | #: builtin/verify-pack.c:67 |
ef317cd5 | 14921 | msgid "show statistics only" |
07432cef | 14922 | msgstr "只显示统计" |
ef317cd5 | 14923 | |
a4f16749 | 14924 | #: builtin/verify-tag.c:19 |
1a79b2f1 JX |
14925 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
14926 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 14927 | |
a4f16749 | 14928 | #: builtin/verify-tag.c:37 |
ef317cd5 | 14929 | msgid "print tag contents" |
55a16ee4 | 14930 | msgstr "打印标签内容" |
ef317cd5 | 14931 | |
5809aa05 | 14932 | #: builtin/worktree.c:17 |
31e5e17b JX |
14933 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
14934 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 14935 | |
5809aa05 | 14936 | #: builtin/worktree.c:18 |
5c57d762 JX |
14937 | msgid "git worktree list [<options>]" |
14938 | msgstr "git worktree list [<选项>]" | |
14939 | ||
5809aa05 | 14940 | #: builtin/worktree.c:19 |
5c57d762 JX |
14941 | msgid "git worktree lock [<options>] <path>" |
14942 | msgstr "git worktree lock [<选项>] <路径>" | |
14943 | ||
5809aa05 | 14944 | #: builtin/worktree.c:20 |
31e5e17b JX |
14945 | msgid "git worktree move <worktree> <new-path>" |
14946 | msgstr "git worktree move <工作区> <新路径>" | |
14947 | ||
14948 | #: builtin/worktree.c:21 | |
5bb01d4f JX |
14949 | msgid "git worktree prune [<options>]" |
14950 | msgstr "git worktree prune [<选项>]" | |
14951 | ||
31e5e17b JX |
14952 | #: builtin/worktree.c:22 |
14953 | msgid "git worktree remove [<options>] <worktree>" | |
14954 | msgstr "git worktree remove [<选项>] <工作区>" | |
14955 | ||
14956 | #: builtin/worktree.c:23 | |
5c57d762 JX |
14957 | msgid "git worktree unlock <path>" |
14958 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 14959 | |
fd8cb379 | 14960 | #: builtin/worktree.c:58 |
5bb01d4f JX |
14961 | #, c-format |
14962 | msgid "Removing worktrees/%s: not a valid directory" | |
14963 | msgstr "删除工作区/%s:不是一个有效的目录" | |
14964 | ||
fd8cb379 | 14965 | #: builtin/worktree.c:64 |
5bb01d4f JX |
14966 | #, c-format |
14967 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
14968 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
14969 | ||
fd8cb379 | 14970 | #: builtin/worktree.c:69 builtin/worktree.c:78 |
5bb01d4f JX |
14971 | #, c-format |
14972 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
14973 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
14974 | ||
fd8cb379 | 14975 | #: builtin/worktree.c:88 |
6937cb4e JX |
14976 | #, c-format |
14977 | msgid "" | |
14978 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
14979 | "%<PRIuMAX>)" | |
14980 | msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
14981 | ||
fd8cb379 | 14982 | #: builtin/worktree.c:96 |
5bb01d4f JX |
14983 | #, c-format |
14984 | msgid "Removing worktrees/%s: invalid gitdir file" | |
14985 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
14986 | ||
fd8cb379 | 14987 | #: builtin/worktree.c:105 |
5bb01d4f JX |
14988 | #, c-format |
14989 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
14990 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
14991 | ||
fd8cb379 | 14992 | #: builtin/worktree.c:152 |
1a79b2f1 JX |
14993 | msgid "report pruned working trees" |
14994 | msgstr "报告清除的工作区" | |
14995 | ||
fd8cb379 | 14996 | #: builtin/worktree.c:154 |
1a79b2f1 | 14997 | msgid "expire working trees older than <time>" |
58b6f078 | 14998 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 14999 | |
fd8cb379 | 15000 | #: builtin/worktree.c:229 |
5bb01d4f JX |
15001 | #, c-format |
15002 | msgid "'%s' already exists" | |
15003 | msgstr "'%s' 已经存在" | |
15004 | ||
fd8cb379 | 15005 | #: builtin/worktree.c:260 |
5bb01d4f JX |
15006 | #, c-format |
15007 | msgid "could not create directory of '%s'" | |
15008 | msgstr "不能创建目录 '%s'" | |
15009 | ||
fd8cb379 JX |
15010 | #: builtin/worktree.c:373 builtin/worktree.c:379 |
15011 | #, c-format | |
15012 | msgid "Preparing worktree (new branch '%s')" | |
15013 | msgstr "准备工作区(新分支 '%s')" | |
15014 | ||
15015 | #: builtin/worktree.c:375 | |
15016 | #, c-format | |
15017 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
15018 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
15019 | ||
15020 | #: builtin/worktree.c:384 | |
15021 | #, c-format | |
15022 | msgid "Preparing worktree (checking out '%s')" | |
15023 | msgstr "准备工作区(检出 '%s')" | |
15024 | ||
15025 | #: builtin/worktree.c:390 | |
5bb01d4f | 15026 | #, c-format |
fd8cb379 JX |
15027 | msgid "Preparing worktree (detached HEAD %s)" |
15028 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 15029 | |
fd8cb379 | 15030 | #: builtin/worktree.c:431 |
5bb01d4f | 15031 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 15032 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 15033 | |
fd8cb379 | 15034 | #: builtin/worktree.c:434 |
5bb01d4f JX |
15035 | msgid "create a new branch" |
15036 | msgstr "创建一个新分支" | |
15037 | ||
fd8cb379 | 15038 | #: builtin/worktree.c:436 |
5bb01d4f JX |
15039 | msgid "create or reset a branch" |
15040 | msgstr "创建或重置一个分支" | |
15041 | ||
fd8cb379 | 15042 | #: builtin/worktree.c:438 |
5b04ee3b JX |
15043 | msgid "populate the new working tree" |
15044 | msgstr "生成新的工作区" | |
15045 | ||
fd8cb379 | 15046 | #: builtin/worktree.c:439 |
60638e98 JX |
15047 | msgid "keep the new working tree locked" |
15048 | msgstr "锁定新工作区" | |
15049 | ||
fd8cb379 | 15050 | #: builtin/worktree.c:441 |
5809aa05 JX |
15051 | msgid "set up tracking mode (see git-branch(1))" |
15052 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
15053 | ||
fd8cb379 | 15054 | #: builtin/worktree.c:444 |
5809aa05 JX |
15055 | msgid "try to match the new branch name with a remote-tracking branch" |
15056 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
15057 | ||
fd8cb379 | 15058 | #: builtin/worktree.c:452 |
1b7f4a34 JX |
15059 | msgid "-b, -B, and --detach are mutually exclusive" |
15060 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 15061 | |
fd8cb379 | 15062 | #: builtin/worktree.c:511 |
5809aa05 JX |
15063 | msgid "--[no-]track can only be used if a new branch is created" |
15064 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
15065 | ||
fd8cb379 | 15066 | #: builtin/worktree.c:611 |
5c57d762 JX |
15067 | msgid "reason for locking" |
15068 | msgstr "锁定原因" | |
15069 | ||
fd8cb379 JX |
15070 | #: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 |
15071 | #: builtin/worktree.c:850 | |
5c57d762 JX |
15072 | #, c-format |
15073 | msgid "'%s' is not a working tree" | |
15074 | msgstr "'%s' 不是一个工作区" | |
15075 | ||
fd8cb379 | 15076 | #: builtin/worktree.c:625 builtin/worktree.c:658 |
5c57d762 JX |
15077 | msgid "The main working tree cannot be locked or unlocked" |
15078 | msgstr "主工作区无法被加锁或解锁" | |
15079 | ||
fd8cb379 | 15080 | #: builtin/worktree.c:630 |
5c57d762 JX |
15081 | #, c-format |
15082 | msgid "'%s' is already locked, reason: %s" | |
15083 | msgstr "'%s' 已被锁定,原因:%s" | |
15084 | ||
fd8cb379 | 15085 | #: builtin/worktree.c:632 |
5c57d762 JX |
15086 | #, c-format |
15087 | msgid "'%s' is already locked" | |
15088 | msgstr "'%s' 已被锁定" | |
15089 | ||
fd8cb379 | 15090 | #: builtin/worktree.c:660 |
5c57d762 JX |
15091 | #, c-format |
15092 | msgid "'%s' is not locked" | |
15093 | msgstr "'%s' 未被锁定" | |
15094 | ||
fd8cb379 | 15095 | #: builtin/worktree.c:685 |
31e5e17b | 15096 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 15097 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 15098 | |
fd8cb379 | 15099 | #: builtin/worktree.c:712 builtin/worktree.c:852 |
31e5e17b JX |
15100 | #, c-format |
15101 | msgid "'%s' is a main working tree" | |
15102 | msgstr "'%s' 是一个主工作区" | |
15103 | ||
fd8cb379 | 15104 | #: builtin/worktree.c:717 |
31e5e17b JX |
15105 | #, c-format |
15106 | msgid "could not figure out destination name from '%s'" | |
15107 | msgstr "无法从 '%s' 算出目标名称" | |
15108 | ||
fd8cb379 | 15109 | #: builtin/worktree.c:723 |
31e5e17b JX |
15110 | #, c-format |
15111 | msgid "target '%s' already exists" | |
15112 | msgstr "目标 '%s' 已存在" | |
15113 | ||
fd8cb379 | 15114 | #: builtin/worktree.c:730 |
31e5e17b JX |
15115 | #, c-format |
15116 | msgid "cannot move a locked working tree, lock reason: %s" | |
15117 | msgstr "无法移动一个锁定的工作区,锁定原因:%s" | |
15118 | ||
fd8cb379 | 15119 | #: builtin/worktree.c:732 |
31e5e17b JX |
15120 | msgid "cannot move a locked working tree" |
15121 | msgstr "无法移动一个锁定的工作区" | |
15122 | ||
fd8cb379 | 15123 | #: builtin/worktree.c:735 |
31e5e17b JX |
15124 | #, c-format |
15125 | msgid "validation failed, cannot move working tree: %s" | |
15126 | msgstr "验证失败,无法移动工作区:%s" | |
15127 | ||
fd8cb379 | 15128 | #: builtin/worktree.c:740 |
31e5e17b JX |
15129 | #, c-format |
15130 | msgid "failed to move '%s' to '%s'" | |
15131 | msgstr "无法移动 '%s' 到 '%s'" | |
15132 | ||
fd8cb379 | 15133 | #: builtin/worktree.c:788 |
31e5e17b JX |
15134 | #, c-format |
15135 | msgid "failed to run 'git status' on '%s'" | |
15136 | msgstr "无法在 '%s' 中执行 'git status'" | |
15137 | ||
fd8cb379 | 15138 | #: builtin/worktree.c:792 |
31e5e17b JX |
15139 | #, c-format |
15140 | msgid "'%s' is dirty, use --force to delete it" | |
15141 | msgstr "'%s' 是脏的,使用 --force 删除" | |
15142 | ||
fd8cb379 | 15143 | #: builtin/worktree.c:797 |
31e5e17b JX |
15144 | #, c-format |
15145 | msgid "failed to run 'git status' on '%s', code %d" | |
15146 | msgstr "无法在 '%s' 中执行 'git status',退出码 %d" | |
15147 | ||
fd8cb379 | 15148 | #: builtin/worktree.c:808 builtin/worktree.c:822 |
31e5e17b JX |
15149 | #, c-format |
15150 | msgid "failed to delete '%s'" | |
15151 | msgstr "无法删除 '%s'" | |
15152 | ||
fd8cb379 | 15153 | #: builtin/worktree.c:834 |
31e5e17b JX |
15154 | msgid "force removing even if the worktree is dirty" |
15155 | msgstr "强制删除,即使工作区是脏的" | |
15156 | ||
fd8cb379 | 15157 | #: builtin/worktree.c:856 |
31e5e17b JX |
15158 | #, c-format |
15159 | msgid "cannot remove a locked working tree, lock reason: %s" | |
15160 | msgstr "无法删除一个锁定的工作区,锁定原因:%s" | |
15161 | ||
fd8cb379 | 15162 | #: builtin/worktree.c:858 |
31e5e17b JX |
15163 | msgid "cannot remove a locked working tree" |
15164 | msgstr "无法删除一个锁定的工作区" | |
15165 | ||
fd8cb379 | 15166 | #: builtin/worktree.c:861 |
31e5e17b JX |
15167 | #, c-format |
15168 | msgid "validation failed, cannot remove working tree: %s" | |
15169 | msgstr "验证失败,无法删除工作区:%s" | |
15170 | ||
a4f16749 | 15171 | #: builtin/write-tree.c:14 |
ef317cd5 | 15172 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 15173 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 15174 | |
a4f16749 | 15175 | #: builtin/write-tree.c:27 |
ef317cd5 | 15176 | msgid "<prefix>/" |
07432cef | 15177 | msgstr "<前缀>/" |
ef317cd5 | 15178 | |
a4f16749 | 15179 | #: builtin/write-tree.c:28 |
ef317cd5 | 15180 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 15181 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 15182 | |
a4f16749 | 15183 | #: builtin/write-tree.c:31 |
ef317cd5 | 15184 | msgid "only useful for debugging" |
07432cef | 15185 | msgstr "只对调试有用" |
ef317cd5 | 15186 | |
6937cb4e | 15187 | #: credential-cache--daemon.c:222 |
a0b6b246 JX |
15188 | #, c-format |
15189 | msgid "" | |
15190 | "The permissions on your socket directory are too loose; other\n" | |
15191 | "users may be able to read your cached credentials. Consider running:\n" | |
15192 | "\n" | |
15193 | "\tchmod 0700 %s" | |
15194 | msgstr "" | |
1a79b2f1 JX |
15195 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
15196 | "行:\n" | |
a0b6b246 JX |
15197 | "\n" |
15198 | "\tchmod 0700 %s" | |
15199 | ||
6937cb4e | 15200 | #: credential-cache--daemon.c:271 |
220c313c JX |
15201 | msgid "print debugging messages to stderr" |
15202 | msgstr "调试信息输出到标准错误" | |
15203 | ||
fd8cb379 | 15204 | #: git.c:27 |
31e5e17b JX |
15205 | msgid "" |
15206 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
15207 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
15208 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
15209 | "bare]\n" | |
31e5e17b JX |
15210 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
15211 | " <command> [<args>]" | |
15212 | msgstr "" | |
fd8cb379 | 15213 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 15214 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
fd8cb379 JX |
15215 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
15216 | "bare]\n" | |
31e5e17b JX |
15217 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
15218 | " <命令> [<参数>]" | |
15219 | ||
fd8cb379 | 15220 | #: git.c:34 |
4dcdc3d8 | 15221 | msgid "" |
220c313c | 15222 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
15223 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
15224 | "to read about a specific subcommand or concept." | |
15225 | msgstr "" | |
220c313c JX |
15226 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
15227 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
15228 | "帮助。" | |
8ada9598 | 15229 | |
fd8cb379 | 15230 | #: git.c:173 |
31e5e17b JX |
15231 | #, c-format |
15232 | msgid "no directory given for --git-dir\n" | |
15233 | msgstr "没有为 --git-dir 提供目录\n" | |
15234 | ||
fd8cb379 | 15235 | #: git.c:187 |
31e5e17b JX |
15236 | #, c-format |
15237 | msgid "no namespace given for --namespace\n" | |
15238 | msgstr "没有为 --namespace 提供命名空间\n" | |
15239 | ||
fd8cb379 | 15240 | #: git.c:201 |
31e5e17b JX |
15241 | #, c-format |
15242 | msgid "no directory given for --work-tree\n" | |
15243 | msgstr "没有为 --work-tree 提供目录\n" | |
15244 | ||
fd8cb379 | 15245 | #: git.c:215 |
31e5e17b JX |
15246 | #, c-format |
15247 | msgid "no prefix given for --super-prefix\n" | |
15248 | msgstr "没有为 --super-prefix 提供前缀\n" | |
15249 | ||
fd8cb379 | 15250 | #: git.c:237 |
31e5e17b JX |
15251 | #, c-format |
15252 | msgid "-c expects a configuration string\n" | |
15253 | msgstr "应为 -c 提供一个配置字符串\n" | |
15254 | ||
fd8cb379 | 15255 | #: git.c:275 |
31e5e17b JX |
15256 | #, c-format |
15257 | msgid "no directory given for -C\n" | |
15258 | msgstr "没有为 -C 提供目录\n" | |
15259 | ||
fd8cb379 | 15260 | #: git.c:300 |
31e5e17b JX |
15261 | #, c-format |
15262 | msgid "unknown option: %s\n" | |
15263 | msgstr "未知选项:%s\n" | |
15264 | ||
fd8cb379 | 15265 | #: git.c:765 |
31e5e17b JX |
15266 | #, c-format |
15267 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
15268 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
15269 | ||
fd8cb379 | 15270 | #: git.c:777 |
31e5e17b JX |
15271 | #, c-format |
15272 | msgid "failed to run command '%s': %s\n" | |
15273 | msgstr "无法运行命令 '%s':%s\n" | |
15274 | ||
fd8cb379 | 15275 | #: http.c:348 |
60638e98 JX |
15276 | #, c-format |
15277 | msgid "negative value for http.postbuffer; defaulting to %d" | |
15278 | msgstr "http.postbuffer 为负值,默认为 %d" | |
15279 | ||
fd8cb379 | 15280 | #: http.c:369 |
a0b6b246 JX |
15281 | msgid "Delegation control is not supported with cURL < 7.22.0" |
15282 | msgstr "当 cURL < 7.22.0 时,不支持委托控制" | |
15283 | ||
fd8cb379 | 15284 | #: http.c:378 |
276ceeaa JX |
15285 | msgid "Public key pinning not supported with cURL < 7.44.0" |
15286 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
15287 | ||
fd8cb379 | 15288 | #: http.c:1854 |
1a79b2f1 JX |
15289 | #, c-format |
15290 | msgid "" | |
15291 | "unable to update url base from redirection:\n" | |
15292 | " asked for: %s\n" | |
15293 | " redirect: %s" | |
15294 | msgstr "" | |
15295 | "不能更新重定向的 url base:\n" | |
15296 | " 请求:%s\n" | |
15297 | " 重定向:%s" | |
15298 | ||
fd8cb379 | 15299 | #: remote-curl.c:401 |
1a79b2f1 JX |
15300 | #, c-format |
15301 | msgid "redirecting to %s" | |
15302 | msgstr "重定向到 %s" | |
15303 | ||
31e5e17b | 15304 | #: list-objects-filter-options.h:59 |
5809aa05 JX |
15305 | msgid "args" |
15306 | msgstr "参数" | |
15307 | ||
31e5e17b | 15308 | #: list-objects-filter-options.h:60 |
5809aa05 JX |
15309 | msgid "object filtering" |
15310 | msgstr "对象过滤" | |
15311 | ||
fd8cb379 JX |
15312 | #: parse-options.h:157 |
15313 | msgid "expiry-date" | |
15314 | msgstr "到期时间" | |
7aea43ff | 15315 | |
fd8cb379 JX |
15316 | #: parse-options.h:172 |
15317 | msgid "no-op (backward compatibility)" | |
15318 | msgstr "空操作(向后兼容)" | |
7aea43ff | 15319 | |
fd8cb379 JX |
15320 | #: parse-options.h:251 |
15321 | msgid "be more verbose" | |
15322 | msgstr "更加详细" | |
7aea43ff | 15323 | |
fd8cb379 JX |
15324 | #: parse-options.h:253 |
15325 | msgid "be more quiet" | |
15326 | msgstr "更加安静" | |
7aea43ff | 15327 | |
fd8cb379 JX |
15328 | #: parse-options.h:259 |
15329 | msgid "use <n> digits to display SHA-1s" | |
15330 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
7aea43ff | 15331 | |
fd8cb379 | 15332 | #: command-list.h:50 |
8ada9598 | 15333 | msgid "Add file contents to the index" |
81809b99 | 15334 | msgstr "添加文件内容至索引" |
8ada9598 | 15335 | |
fd8cb379 JX |
15336 | #: command-list.h:51 |
15337 | msgid "Apply a series of patches from a mailbox" | |
15338 | msgstr "应用邮箱格式的系列补丁" | |
15339 | ||
15340 | #: command-list.h:52 | |
15341 | msgid "Annotate file lines with commit information" | |
15342 | msgstr "使用提交信息注释文件行" | |
15343 | ||
15344 | #: command-list.h:53 | |
15345 | msgid "Apply a patch to files and/or to the index" | |
15346 | msgstr "应用一个补丁到文件和/或索引区" | |
15347 | ||
15348 | #: command-list.h:54 | |
15349 | msgid "Import an Arch repository into Git" | |
15350 | msgstr "将一个 Arch 仓库导入到 Git" | |
15351 | ||
15352 | #: command-list.h:55 | |
15353 | msgid "Create an archive of files from a named tree" | |
15354 | msgstr "基于一个指定的树创建文件存档" | |
15355 | ||
15356 | #: command-list.h:56 | |
1b7f4a34 JX |
15357 | msgid "Use binary search to find the commit that introduced a bug" |
15358 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 15359 | |
fd8cb379 JX |
15360 | #: command-list.h:57 |
15361 | msgid "Show what revision and author last modified each line of a file" | |
15362 | msgstr "显示文件每一行最后修改的版本和修改者" | |
15363 | ||
15364 | #: command-list.h:58 | |
8ada9598 | 15365 | msgid "List, create, or delete branches" |
81809b99 | 15366 | msgstr "列出、创建或删除分支" |
8ada9598 | 15367 | |
fd8cb379 JX |
15368 | #: command-list.h:59 |
15369 | msgid "Move objects and refs by archive" | |
15370 | msgstr "通过归档移动对象和引用" | |
15371 | ||
15372 | #: command-list.h:60 | |
15373 | msgid "Provide content or type and size information for repository objects" | |
15374 | msgstr "提供仓库对象的内容、类型或大小" | |
15375 | ||
15376 | #: command-list.h:61 | |
15377 | msgid "Display gitattributes information" | |
15378 | msgstr "显示 gitattributes 信息" | |
15379 | ||
15380 | #: command-list.h:62 | |
15381 | msgid "Debug gitignore / exclude files" | |
15382 | msgstr "调试 gitignore / exclude 文件" | |
15383 | ||
15384 | #: command-list.h:63 | |
15385 | msgid "Show canonical names and email addresses of contacts" | |
15386 | msgstr "显示联系人的规范名称和电子邮件" | |
15387 | ||
15388 | #: command-list.h:64 | |
5bb01d4f JX |
15389 | msgid "Switch branches or restore working tree files" |
15390 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 15391 | |
fd8cb379 JX |
15392 | #: command-list.h:65 |
15393 | msgid "Copy files from the index to the working tree" | |
15394 | msgstr "从索引拷贝文件到工作区" | |
15395 | ||
15396 | #: command-list.h:66 | |
15397 | msgid "Ensures that a reference name is well formed" | |
15398 | msgstr "确保引用名称格式正确" | |
15399 | ||
15400 | #: command-list.h:67 | |
15401 | msgid "Find commits yet to be applied to upstream" | |
15402 | msgstr "查找尚未应用到上游的提交" | |
15403 | ||
15404 | #: command-list.h:68 | |
15405 | msgid "Apply the changes introduced by some existing commits" | |
15406 | msgstr "应用一些现存提交引入的修改" | |
15407 | ||
15408 | #: command-list.h:69 | |
15409 | msgid "Graphical alternative to git-commit" | |
15410 | msgstr "git-commit 的图形替代界面" | |
15411 | ||
15412 | #: command-list.h:70 | |
15413 | msgid "Remove untracked files from the working tree" | |
15414 | msgstr "从工作区中删除未跟踪文件" | |
15415 | ||
15416 | #: command-list.h:71 | |
8ada9598 | 15417 | msgid "Clone a repository into a new directory" |
160fb2b2 | 15418 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 15419 | |
fd8cb379 JX |
15420 | #: command-list.h:72 |
15421 | msgid "Display data in columns" | |
15422 | msgstr "以列的方式显示数据" | |
15423 | ||
15424 | #: command-list.h:73 | |
8ada9598 | 15425 | msgid "Record changes to the repository" |
160fb2b2 | 15426 | msgstr "记录变更到仓库" |
8ada9598 | 15427 | |
fd8cb379 JX |
15428 | #: command-list.h:74 |
15429 | msgid "Write and verify Git commit graph files" | |
15430 | msgstr "写入和校验 Git 提交图形文件" | |
15431 | ||
15432 | #: command-list.h:75 | |
15433 | msgid "Create a new commit object" | |
15434 | msgstr "创建一个新的提交对象" | |
15435 | ||
15436 | #: command-list.h:76 | |
15437 | msgid "Get and set repository or global options" | |
15438 | msgstr "获取和设置仓库或者全局选项" | |
15439 | ||
15440 | #: command-list.h:77 | |
15441 | msgid "Count unpacked number of objects and their disk consumption" | |
15442 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
15443 | ||
15444 | #: command-list.h:78 | |
15445 | msgid "Retrieve and store user credentials" | |
15446 | msgstr "检索和存储用户密码" | |
15447 | ||
15448 | #: command-list.h:79 | |
15449 | msgid "Helper to temporarily store passwords in memory" | |
15450 | msgstr "在内存中临时存储密码的助手" | |
15451 | ||
15452 | #: command-list.h:80 | |
15453 | msgid "Helper to store credentials on disk" | |
15454 | msgstr "在磁盘存储密码的助手" | |
15455 | ||
15456 | #: command-list.h:81 | |
15457 | msgid "Export a single commit to a CVS checkout" | |
15458 | msgstr "将一个提交导出到 CVS 检出中" | |
15459 | ||
15460 | #: command-list.h:82 | |
15461 | msgid "Salvage your data out of another SCM people love to hate" | |
15462 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
15463 | ||
15464 | #: command-list.h:83 | |
15465 | msgid "A CVS server emulator for Git" | |
15466 | msgstr "Git 的一个 CVS 服务模拟器" | |
15467 | ||
15468 | #: command-list.h:84 | |
15469 | msgid "A really simple server for Git repositories" | |
15470 | msgstr "一个非常简单的 Git 仓库服务器" | |
15471 | ||
15472 | #: command-list.h:85 | |
15473 | msgid "Give an object a human readable name based on an available ref" | |
15474 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
15475 | ||
15476 | #: command-list.h:86 | |
8ada9598 | 15477 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 15478 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 15479 | |
fd8cb379 JX |
15480 | #: command-list.h:87 |
15481 | msgid "Compares files in the working tree and the index" | |
15482 | msgstr "比较工作区和索引区中的文件" | |
15483 | ||
15484 | #: command-list.h:88 | |
15485 | msgid "Compare a tree to the working tree or index" | |
15486 | msgstr "将一个树和工作区或索引做比较" | |
15487 | ||
15488 | #: command-list.h:89 | |
15489 | msgid "Compares the content and mode of blobs found via two tree objects" | |
15490 | msgstr "比较两个树对象的文件内容和模式" | |
15491 | ||
15492 | #: command-list.h:90 | |
15493 | msgid "Show changes using common diff tools" | |
15494 | msgstr "使用常见的差异工具显示更改" | |
15495 | ||
15496 | #: command-list.h:91 | |
15497 | msgid "Git data exporter" | |
15498 | msgstr "Git 数据导出器" | |
15499 | ||
15500 | #: command-list.h:92 | |
15501 | msgid "Backend for fast Git data importers" | |
15502 | msgstr "Git 快速数据导入器后端" | |
15503 | ||
15504 | #: command-list.h:93 | |
8ada9598 | 15505 | msgid "Download objects and refs from another repository" |
160fb2b2 | 15506 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 15507 | |
fd8cb379 JX |
15508 | #: command-list.h:94 |
15509 | msgid "Receive missing objects from another repository" | |
15510 | msgstr "从另一个仓库获取缺失的对象" | |
15511 | ||
15512 | #: command-list.h:95 | |
15513 | msgid "Rewrite branches" | |
15514 | msgstr "重写分支" | |
15515 | ||
15516 | #: command-list.h:96 | |
15517 | msgid "Produce a merge commit message" | |
15518 | msgstr "生成一个合并提交信息" | |
15519 | ||
15520 | #: command-list.h:97 | |
15521 | msgid "Output information on each ref" | |
15522 | msgstr "对每一个引用输出信息 " | |
15523 | ||
15524 | #: command-list.h:98 | |
15525 | msgid "Prepare patches for e-mail submission" | |
15526 | msgstr "准备电子邮件提交的补丁" | |
15527 | ||
15528 | #: command-list.h:99 | |
15529 | msgid "Verifies the connectivity and validity of the objects in the database" | |
15530 | msgstr "验证仓库中对象的连通性和有效性" | |
15531 | ||
15532 | #: command-list.h:100 | |
15533 | msgid "Cleanup unnecessary files and optimize the local repository" | |
15534 | msgstr "清除不必要的文件和优化本地仓库" | |
15535 | ||
15536 | #: command-list.h:101 | |
15537 | msgid "Extract commit ID from an archive created using git-archive" | |
15538 | msgstr "从 git-archive 创建的归档文件中提取提交ID" | |
15539 | ||
15540 | #: command-list.h:102 | |
8ada9598 | 15541 | msgid "Print lines matching a pattern" |
81809b99 | 15542 | msgstr "输出和模式匹配的行" |
8ada9598 | 15543 | |
fd8cb379 JX |
15544 | #: command-list.h:103 |
15545 | msgid "A portable graphical interface to Git" | |
15546 | msgstr "一个便携的 Git 图形客户端" | |
15547 | ||
15548 | #: command-list.h:104 | |
15549 | msgid "Compute object ID and optionally creates a blob from a file" | |
15550 | msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象" | |
15551 | ||
15552 | #: command-list.h:105 | |
15553 | msgid "Display help information about Git" | |
15554 | msgstr "显示 Git 的帮助信息" | |
15555 | ||
15556 | #: command-list.h:106 | |
15557 | msgid "Server side implementation of Git over HTTP" | |
15558 | msgstr "Git HTTP 协议的服务端实现" | |
15559 | ||
15560 | #: command-list.h:107 | |
15561 | msgid "Download from a remote Git repository via HTTP" | |
15562 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
15563 | ||
15564 | #: command-list.h:108 | |
15565 | msgid "Push objects over HTTP/DAV to another repository" | |
15566 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
15567 | ||
15568 | #: command-list.h:109 | |
15569 | msgid "Send a collection of patches from stdin to an IMAP folder" | |
15570 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
15571 | ||
15572 | #: command-list.h:110 | |
15573 | msgid "Build pack index file for an existing packed archive" | |
15574 | msgstr "从一个现存的包存档文件创建包索引" | |
15575 | ||
15576 | #: command-list.h:111 | |
a77c07d9 | 15577 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 15578 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 15579 | |
fd8cb379 JX |
15580 | #: command-list.h:112 |
15581 | msgid "Instantly browse your working repository in gitweb" | |
15582 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
15583 | ||
15584 | #: command-list.h:113 | |
15585 | msgid "add or parse structured information in commit messages" | |
15586 | msgstr "添加或解析提交说明中的结构化信息" | |
15587 | ||
15588 | #: command-list.h:114 | |
15589 | msgid "The Git repository browser" | |
15590 | msgstr "Git 仓库浏览器" | |
15591 | ||
15592 | #: command-list.h:115 | |
8ada9598 | 15593 | msgid "Show commit logs" |
81809b99 | 15594 | msgstr "显示提交日志" |
8ada9598 | 15595 | |
fd8cb379 JX |
15596 | #: command-list.h:116 |
15597 | msgid "Show information about files in the index and the working tree" | |
15598 | msgstr "显示索引和工作区中文件的信息" | |
15599 | ||
15600 | #: command-list.h:117 | |
15601 | msgid "List references in a remote repository" | |
15602 | msgstr "显示一个远程仓库的引用" | |
15603 | ||
15604 | #: command-list.h:118 | |
15605 | msgid "List the contents of a tree object" | |
15606 | msgstr "显示一个树对象的内容" | |
15607 | ||
15608 | #: command-list.h:119 | |
15609 | msgid "Extracts patch and authorship from a single e-mail message" | |
15610 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
15611 | ||
15612 | #: command-list.h:120 | |
15613 | msgid "Simple UNIX mbox splitter program" | |
15614 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
15615 | ||
15616 | #: command-list.h:121 | |
8ada9598 | 15617 | msgid "Join two or more development histories together" |
81809b99 | 15618 | msgstr "合并两个或更多开发历史" |
8ada9598 | 15619 | |
fd8cb379 JX |
15620 | #: command-list.h:122 |
15621 | msgid "Find as good common ancestors as possible for a merge" | |
15622 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
15623 | ||
15624 | #: command-list.h:123 | |
15625 | msgid "Run a three-way file merge" | |
15626 | msgstr "运行一个三路文件合并" | |
15627 | ||
15628 | #: command-list.h:124 | |
15629 | msgid "Run a merge for files needing merging" | |
15630 | msgstr "对于需要合并的文件执行合并" | |
15631 | ||
15632 | #: command-list.h:125 | |
15633 | msgid "The standard helper program to use with git-merge-index" | |
15634 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
15635 | ||
15636 | #: command-list.h:126 | |
15637 | msgid "Run merge conflict resolution tools to resolve merge conflicts" | |
15638 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
15639 | ||
15640 | #: command-list.h:127 | |
15641 | msgid "Show three-way merge without touching index" | |
15642 | msgstr "显示三路合并而不动索引" | |
15643 | ||
15644 | #: command-list.h:128 | |
15645 | msgid "Creates a tag object" | |
15646 | msgstr "创建一个标签对象" | |
15647 | ||
15648 | #: command-list.h:129 | |
15649 | msgid "Build a tree-object from ls-tree formatted text" | |
15650 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
15651 | ||
15652 | #: command-list.h:130 | |
8ada9598 | 15653 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 15654 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 15655 | |
fd8cb379 JX |
15656 | # 查找给定版本的符号名称 |
15657 | #: command-list.h:131 | |
15658 | msgid "Find symbolic names for given revs" | |
15659 | msgstr "查找给定版本的符号名称" | |
15660 | ||
15661 | #: command-list.h:132 | |
15662 | msgid "Add or inspect object notes" | |
15663 | msgstr "添加或检查对象注释" | |
15664 | ||
15665 | #: command-list.h:133 | |
15666 | msgid "Import from and submit to Perforce repositories" | |
15667 | msgstr "导入和提交到 Perforce 仓库中" | |
15668 | ||
15669 | #: command-list.h:134 | |
15670 | msgid "Create a packed archive of objects" | |
15671 | msgstr "创建对象的存档包" | |
15672 | ||
15673 | #: command-list.h:135 | |
15674 | msgid "Find redundant pack files" | |
15675 | msgstr "查找冗余的包文件" | |
15676 | ||
15677 | #: command-list.h:136 | |
15678 | msgid "Pack heads and tags for efficient repository access" | |
15679 | msgstr "打包头和标签以实现高效的仓库访问" | |
15680 | ||
15681 | #: command-list.h:137 | |
15682 | msgid "Routines to help parsing remote repository access parameters" | |
15683 | msgstr "帮助解析远程仓库访问参数的例程" | |
15684 | ||
15685 | #: command-list.h:138 | |
15686 | msgid "Compute unique ID for a patch" | |
15687 | msgstr "计算一个补丁的唯一ID" | |
15688 | ||
15689 | #: command-list.h:139 | |
15690 | msgid "Prune all unreachable objects from the object database" | |
15691 | msgstr "删除对象库中所有不可达对象" | |
15692 | ||
15693 | #: command-list.h:140 | |
15694 | msgid "Remove extra objects that are already in pack files" | |
15695 | msgstr "删除已经在包文件中的多余对象" | |
15696 | ||
15697 | #: command-list.h:141 | |
2e8451e8 | 15698 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 15699 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 15700 | |
fd8cb379 | 15701 | #: command-list.h:142 |
8ada9598 | 15702 | msgid "Update remote refs along with associated objects" |
81809b99 | 15703 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 15704 | |
fd8cb379 JX |
15705 | #: command-list.h:143 |
15706 | msgid "Applies a quilt patchset onto the current branch" | |
15707 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
15708 | ||
15709 | #: command-list.h:144 | |
15710 | msgid "Reads tree information into the index" | |
15711 | msgstr "将树信息读取到索引" | |
15712 | ||
15713 | #: command-list.h:145 | |
3495628d JX |
15714 | msgid "Reapply commits on top of another base tip" |
15715 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 15716 | |
fd8cb379 JX |
15717 | #: command-list.h:146 |
15718 | msgid "Receive what is pushed into the repository" | |
15719 | msgstr "接收推送到仓库中的对象" | |
15720 | ||
15721 | #: command-list.h:147 | |
15722 | msgid "Manage reflog information" | |
15723 | msgstr "管理 reflog 信息" | |
15724 | ||
15725 | #: command-list.h:148 | |
15726 | msgid "Manage set of tracked repositories" | |
15727 | msgstr "管理已跟踪仓库" | |
15728 | ||
15729 | #: command-list.h:149 | |
15730 | msgid "Pack unpacked objects in a repository" | |
15731 | msgstr "打包仓库中未打包对象" | |
15732 | ||
15733 | #: command-list.h:150 | |
15734 | msgid "Create, list, delete refs to replace objects" | |
15735 | msgstr "创建、列出、删除对象替换引用" | |
15736 | ||
15737 | #: command-list.h:151 | |
15738 | msgid "Generates a summary of pending changes" | |
15739 | msgstr "生成待定更改的摘要" | |
15740 | ||
15741 | #: command-list.h:152 | |
15742 | msgid "Reuse recorded resolution of conflicted merges" | |
15743 | msgstr "重用冲突合并的解决方案记录" | |
15744 | ||
15745 | #: command-list.h:153 | |
8ada9598 | 15746 | msgid "Reset current HEAD to the specified state" |
4375c10e | 15747 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 15748 | |
fd8cb379 JX |
15749 | #: command-list.h:154 |
15750 | msgid "Revert some existing commits" | |
15751 | msgstr "回退一些现存提交" | |
15752 | ||
15753 | #: command-list.h:155 | |
15754 | msgid "Lists commit objects in reverse chronological order" | |
15755 | msgstr "按时间顺序列出提交对象" | |
15756 | ||
15757 | #: command-list.h:156 | |
15758 | msgid "Pick out and massage parameters" | |
15759 | msgstr "选出并处理参数" | |
15760 | ||
15761 | #: command-list.h:157 | |
8ada9598 | 15762 | msgid "Remove files from the working tree and from the index" |
81809b99 | 15763 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 15764 | |
fd8cb379 JX |
15765 | #: command-list.h:158 |
15766 | msgid "Send a collection of patches as emails" | |
15767 | msgstr "通过电子邮件发送一组补丁" | |
15768 | ||
15769 | #: command-list.h:159 | |
15770 | msgid "Push objects over Git protocol to another repository" | |
15771 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
15772 | ||
15773 | #: command-list.h:160 | |
15774 | msgid "Restricted login shell for Git-only SSH access" | |
15775 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
15776 | ||
15777 | #: command-list.h:161 | |
15778 | msgid "Summarize 'git log' output" | |
15779 | msgstr "'git log' 输出摘要" | |
15780 | ||
15781 | #: command-list.h:162 | |
8ada9598 | 15782 | msgid "Show various types of objects" |
81809b99 | 15783 | msgstr "显示各种类型的对象" |
8ada9598 | 15784 | |
fd8cb379 JX |
15785 | #: command-list.h:163 |
15786 | msgid "Show branches and their commits" | |
15787 | msgstr "显示分支和提交" | |
15788 | ||
15789 | #: command-list.h:164 | |
15790 | msgid "Show packed archive index" | |
15791 | msgstr "显示打包归档索引" | |
15792 | ||
15793 | #: command-list.h:165 | |
15794 | msgid "List references in a local repository" | |
15795 | msgstr "显示本地仓库中的引用" | |
15796 | ||
15797 | #: command-list.h:166 | |
15798 | msgid "Git's i18n setup code for shell scripts" | |
15799 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
15800 | ||
15801 | #: command-list.h:167 | |
15802 | msgid "Common Git shell script setup code" | |
15803 | msgstr "常用的 Git shell 脚本设置代码" | |
15804 | ||
15805 | #: command-list.h:168 | |
15806 | msgid "Stash the changes in a dirty working directory away" | |
15807 | msgstr "贮藏脏工作区中的修改" | |
15808 | ||
15809 | #: command-list.h:169 | |
15810 | msgid "Add file contents to the staging area" | |
15811 | msgstr "将文件内容添加到索引" | |
15812 | ||
15813 | #: command-list.h:170 | |
8ada9598 | 15814 | msgid "Show the working tree status" |
81809b99 | 15815 | msgstr "显示工作区状态" |
8ada9598 | 15816 | |
fd8cb379 JX |
15817 | #: command-list.h:171 |
15818 | msgid "Remove unnecessary whitespace" | |
15819 | msgstr "删除不必要的空白字符" | |
15820 | ||
15821 | #: command-list.h:172 | |
15822 | msgid "Initialize, update or inspect submodules" | |
15823 | msgstr "初始化、更新或检查子模组" | |
15824 | ||
15825 | #: command-list.h:173 | |
15826 | msgid "Bidirectional operation between a Subversion repository and Git" | |
15827 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
15828 | ||
15829 | #: command-list.h:174 | |
15830 | msgid "Read, modify and delete symbolic refs" | |
15831 | msgstr "读取、修改和删除符号引用" | |
15832 | ||
15833 | #: command-list.h:175 | |
8ada9598 | 15834 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 15835 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 15836 | |
fd8cb379 JX |
15837 | #: command-list.h:176 |
15838 | msgid "Creates a temporary file with a blob's contents" | |
15839 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 15840 | |
fd8cb379 JX |
15841 | #: command-list.h:177 |
15842 | msgid "Unpack objects from a packed archive" | |
15843 | msgstr "从打包文件中解压缩对象" | |
220c313c | 15844 | |
fd8cb379 JX |
15845 | #: command-list.h:178 |
15846 | msgid "Register file contents in the working tree to the index" | |
15847 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 15848 | |
fd8cb379 JX |
15849 | #: command-list.h:179 |
15850 | msgid "Update the object name stored in a ref safely" | |
15851 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 15852 | |
fd8cb379 JX |
15853 | #: command-list.h:180 |
15854 | msgid "Update auxiliary info file to help dumb servers" | |
15855 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
15856 | ||
15857 | #: command-list.h:181 | |
15858 | msgid "Send archive back to git-archive" | |
15859 | msgstr "将存档发送回 git-archive" | |
15860 | ||
15861 | #: command-list.h:182 | |
15862 | msgid "Send objects packed back to git-fetch-pack" | |
15863 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
15864 | ||
15865 | #: command-list.h:183 | |
15866 | msgid "Show a Git logical variable" | |
15867 | msgstr "显示一个Git逻辑变量" | |
15868 | ||
15869 | #: command-list.h:184 | |
15870 | msgid "Check the GPG signature of commits" | |
15871 | msgstr "检查 GPG 提交签名" | |
15872 | ||
15873 | #: command-list.h:185 | |
15874 | msgid "Validate packed Git archive files" | |
15875 | msgstr "校验打包的Git存仓文件" | |
15876 | ||
15877 | #: command-list.h:186 | |
15878 | msgid "Check the GPG signature of tags" | |
15879 | msgstr "检查标签的 GPG 签名" | |
15880 | ||
15881 | #: command-list.h:187 | |
15882 | msgid "Git web interface (web frontend to Git repositories)" | |
15883 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
15884 | ||
15885 | #: command-list.h:188 | |
15886 | msgid "Show logs with difference each commit introduces" | |
15887 | msgstr "显示每一个提交引入的差异日志" | |
15888 | ||
15889 | #: command-list.h:189 | |
15890 | msgid "Manage multiple working trees" | |
15891 | msgstr "管理多个工作区" | |
15892 | ||
15893 | #: command-list.h:190 | |
15894 | msgid "Create a tree object from the current index" | |
15895 | msgstr "从当前索引创建一个树对象" | |
15896 | ||
15897 | #: command-list.h:191 | |
15898 | msgid "Defining attributes per path" | |
15899 | msgstr "定义路径的属性" | |
15900 | ||
15901 | #: command-list.h:192 | |
15902 | msgid "Git command-line interface and conventions" | |
15903 | msgstr "Git 命令行界面和约定" | |
15904 | ||
15905 | #: command-list.h:193 | |
15906 | msgid "A Git core tutorial for developers" | |
15907 | msgstr "面向开发人员的 Git 核心教程" | |
15908 | ||
15909 | #: command-list.h:194 | |
15910 | msgid "Git for CVS users" | |
15911 | msgstr "适合 CVS 用户的 Git 帮助" | |
15912 | ||
15913 | #: command-list.h:195 | |
15914 | msgid "Tweaking diff output" | |
15915 | msgstr "调整差异输出" | |
15916 | ||
15917 | #: command-list.h:196 | |
15918 | msgid "A useful minimum set of commands for Everyday Git" | |
15919 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
15920 | ||
15921 | #: command-list.h:197 | |
15922 | msgid "A Git Glossary" | |
15923 | msgstr "Git 词汇表" | |
15924 | ||
15925 | #: command-list.h:198 | |
15926 | msgid "Hooks used by Git" | |
15927 | msgstr "Git 使用的钩子" | |
15928 | ||
15929 | #: command-list.h:199 | |
15930 | msgid "Specifies intentionally untracked files to ignore" | |
15931 | msgstr "忽略指定的未跟踪文件" | |
15932 | ||
15933 | #: command-list.h:200 | |
15934 | msgid "Defining submodule properties" | |
15935 | msgstr "定义子模组属性" | |
15936 | ||
15937 | #: command-list.h:201 | |
15938 | msgid "Git namespaces" | |
15939 | msgstr "Git 名字空间" | |
15940 | ||
15941 | #: command-list.h:202 | |
15942 | msgid "Git Repository Layout" | |
15943 | msgstr "Git 仓库布局" | |
15944 | ||
15945 | #: command-list.h:203 | |
15946 | msgid "Specifying revisions and ranges for Git" | |
15947 | msgstr "指定 Git 的版本和版本范围" | |
15948 | ||
15949 | #: command-list.h:204 | |
15950 | msgid "A tutorial introduction to Git: part two" | |
15951 | msgstr "一个 Git 教程:第二部分" | |
15952 | ||
15953 | #: command-list.h:205 | |
15954 | msgid "A tutorial introduction to Git" | |
15955 | msgstr "一个 Git 教程" | |
15956 | ||
15957 | #: command-list.h:206 | |
15958 | msgid "An overview of recommended workflows with Git" | |
15959 | msgstr "Git 推荐的工作流概览" | |
220c313c | 15960 | |
5b04ee3b | 15961 | #: rerere.h:40 |
220c313c JX |
15962 | msgid "update the index with reused conflict resolution if possible" |
15963 | msgstr "如果可能,重用冲突解决更新索引" | |
15964 | ||
5c57d762 | 15965 | #: git-bisect.sh:54 |
b694fbb1 JX |
15966 | msgid "You need to start by \"git bisect start\"" |
15967 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
15968 | ||
90e6ef53 | 15969 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
15970 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
15971 | #. translation. The program will only accept English input | |
15972 | #. at this point. | |
5c57d762 | 15973 | #: git-bisect.sh:60 |
c04f5ac3 JX |
15974 | msgid "Do you want me to do it for you [Y/n]? " |
15975 | msgstr "您想让我为您这样做么[Y/n]? " | |
15976 | ||
5c57d762 | 15977 | #: git-bisect.sh:121 |
c04f5ac3 JX |
15978 | #, sh-format |
15979 | msgid "unrecognised option: '$arg'" | |
81809b99 | 15980 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 15981 | |
5c57d762 | 15982 | #: git-bisect.sh:125 |
c04f5ac3 JX |
15983 | #, sh-format |
15984 | msgid "'$arg' does not appear to be a valid revision" | |
15985 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
15986 | ||
5c57d762 | 15987 | #: git-bisect.sh:154 |
c04f5ac3 JX |
15988 | msgid "Bad HEAD - I need a HEAD" |
15989 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
15990 | ||
5c57d762 | 15991 | #: git-bisect.sh:167 |
c04f5ac3 JX |
15992 | #, sh-format |
15993 | msgid "" | |
814ff314 | 15994 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 15995 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 15996 | |
5c57d762 | 15997 | #: git-bisect.sh:177 |
cfff71a9 JX |
15998 | msgid "won't bisect on cg-seek'ed tree" |
15999 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 16000 | |
5c57d762 | 16001 | #: git-bisect.sh:181 |
c04f5ac3 | 16002 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 16003 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 16004 | |
5c57d762 | 16005 | #: git-bisect.sh:233 |
c04f5ac3 JX |
16006 | #, sh-format |
16007 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 16008 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 16009 | |
5809aa05 | 16010 | #: git-bisect.sh:246 |
c04f5ac3 JX |
16011 | #, sh-format |
16012 | msgid "Bad rev input: $arg" | |
9a4b694c | 16013 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 16014 | |
5809aa05 | 16015 | #: git-bisect.sh:265 |
5c57d762 JX |
16016 | #, sh-format |
16017 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 16018 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 16019 | |
5809aa05 | 16020 | #: git-bisect.sh:274 |
c04f5ac3 JX |
16021 | #, sh-format |
16022 | msgid "Bad rev input: $rev" | |
9a4b694c | 16023 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 16024 | |
5809aa05 | 16025 | #: git-bisect.sh:283 |
1b7f4a34 JX |
16026 | #, sh-format |
16027 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
16028 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
16029 | ||
5809aa05 | 16030 | #: git-bisect.sh:306 |
1b7f4a34 JX |
16031 | #, sh-format |
16032 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
16033 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 16034 | |
90e6ef53 | 16035 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
16036 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
16037 | #. translation. The program will only accept English input | |
16038 | #. at this point. | |
5809aa05 | 16039 | #: git-bisect.sh:312 |
c04f5ac3 JX |
16040 | msgid "Are you sure [Y/n]? " |
16041 | msgstr "您确认么[Y/n]? " | |
16042 | ||
5809aa05 | 16043 | #: git-bisect.sh:324 |
1b7f4a34 | 16044 | #, sh-format |
b694fbb1 | 16045 | msgid "" |
1b7f4a34 JX |
16046 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
16047 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
16048 | msgstr "" |
16049 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 16050 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 16051 | |
5809aa05 | 16052 | #: git-bisect.sh:327 |
1b7f4a34 | 16053 | #, sh-format |
b694fbb1 JX |
16054 | msgid "" |
16055 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
16056 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
16057 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
16058 | msgstr "" |
16059 | "您需要执行 \"git bisect start\" 来开始。\n" | |
16060 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 16061 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 16062 | |
5809aa05 | 16063 | #: git-bisect.sh:398 git-bisect.sh:512 |
b694fbb1 JX |
16064 | msgid "We are not bisecting." |
16065 | msgstr "我们没有在二分查找。" | |
16066 | ||
5809aa05 | 16067 | #: git-bisect.sh:405 |
c04f5ac3 JX |
16068 | #, sh-format |
16069 | msgid "'$invalid' is not a valid commit" | |
16070 | msgstr "'$invalid' 不是一个有效的提交" | |
16071 | ||
5809aa05 | 16072 | #: git-bisect.sh:414 |
c04f5ac3 JX |
16073 | #, sh-format |
16074 | msgid "" | |
16075 | "Could not check out original HEAD '$branch'.\n" | |
16076 | "Try 'git bisect reset <commit>'." | |
16077 | msgstr "" | |
16078 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 16079 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 16080 | |
5809aa05 | 16081 | #: git-bisect.sh:422 |
c04f5ac3 JX |
16082 | msgid "No logfile given" |
16083 | msgstr "未提供日志文件" | |
16084 | ||
5809aa05 | 16085 | #: git-bisect.sh:423 |
c04f5ac3 JX |
16086 | #, sh-format |
16087 | msgid "cannot read $file for replaying" | |
16088 | msgstr "不能读取 $file 来重放" | |
16089 | ||
5809aa05 | 16090 | #: git-bisect.sh:444 |
c04f5ac3 JX |
16091 | msgid "?? what are you talking about?" |
16092 | msgstr "?? 您在说什么?" | |
16093 | ||
5809aa05 JX |
16094 | #: git-bisect.sh:453 |
16095 | msgid "bisect run failed: no command provided." | |
16096 | msgstr "二分查找运行失败:没有提供命令。" | |
16097 | ||
16098 | #: git-bisect.sh:458 | |
b694fbb1 JX |
16099 | #, sh-format |
16100 | msgid "running $command" | |
16101 | msgstr "运行 $command" | |
16102 | ||
5809aa05 | 16103 | #: git-bisect.sh:465 |
b694fbb1 JX |
16104 | #, sh-format |
16105 | msgid "" | |
16106 | "bisect run failed:\n" | |
16107 | "exit code $res from '$command' is < 0 or >= 128" | |
16108 | msgstr "" | |
16109 | "二分查找运行失败:\n" | |
07432cef | 16110 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 16111 | |
5809aa05 | 16112 | #: git-bisect.sh:491 |
b694fbb1 JX |
16113 | msgid "bisect run cannot continue any more" |
16114 | msgstr "二分查找不能继续运行" | |
16115 | ||
5809aa05 | 16116 | #: git-bisect.sh:497 |
b694fbb1 JX |
16117 | #, sh-format |
16118 | msgid "" | |
16119 | "bisect run failed:\n" | |
16120 | "'bisect_state $state' exited with error code $res" | |
16121 | msgstr "" | |
16122 | "二分查找运行失败:\n" | |
16123 | "'bisect_state $state' 退出码为 $res" | |
16124 | ||
5809aa05 | 16125 | #: git-bisect.sh:504 |
b694fbb1 JX |
16126 | msgid "bisect run success" |
16127 | msgstr "二分查找运行成功" | |
c04f5ac3 | 16128 | |
5809aa05 | 16129 | #: git-bisect.sh:533 |
b694fbb1 | 16130 | #, sh-format |
1b7f4a34 JX |
16131 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
16132 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 16133 | |
5809aa05 | 16134 | #: git-bisect.sh:567 |
94550ed3 JX |
16135 | msgid "no terms defined" |
16136 | msgstr "未定义术语" | |
16137 | ||
5809aa05 | 16138 | #: git-bisect.sh:584 |
94550ed3 JX |
16139 | #, sh-format |
16140 | msgid "" | |
16141 | "invalid argument $arg for 'git bisect terms'.\n" | |
16142 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
16143 | msgstr "" | |
16144 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
16145 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
16146 | ||
5c57d762 JX |
16147 | #: git-merge-octopus.sh:46 |
16148 | msgid "" | |
16149 | "Error: Your local changes to the following files would be overwritten by " | |
16150 | "merge" | |
16151 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
16152 | ||
16153 | #: git-merge-octopus.sh:61 | |
16154 | msgid "Automated merge did not work." | |
9a4b694c | 16155 | msgstr "自动合并未生效。" |
5c57d762 JX |
16156 | |
16157 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 16158 | msgid "Should not be doing an octopus." |
5c57d762 JX |
16159 | msgstr "不应该执行章鱼式合并。" |
16160 | ||
16161 | #: git-merge-octopus.sh:73 | |
16162 | #, sh-format | |
16163 | msgid "Unable to find common commit with $pretty_name" | |
16164 | msgstr "无法找到和 $pretty_name 的基线提交" | |
16165 | ||
16166 | #: git-merge-octopus.sh:77 | |
16167 | #, sh-format | |
6937cb4e | 16168 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
16169 | msgstr "已经和 $pretty_name 保持一致" |
16170 | ||
16171 | #: git-merge-octopus.sh:89 | |
16172 | #, sh-format | |
16173 | msgid "Fast-forwarding to: $pretty_name" | |
16174 | msgstr "快进至:$pretty_name" | |
16175 | ||
16176 | #: git-merge-octopus.sh:97 | |
16177 | #, sh-format | |
16178 | msgid "Trying simple merge with $pretty_name" | |
16179 | msgstr "尝试和 $pretty_name 的简单合并" | |
16180 | ||
16181 | #: git-merge-octopus.sh:102 | |
16182 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 16183 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 16184 | |
fd8cb379 | 16185 | #: git-rebase.sh:61 |
649900bc | 16186 | msgid "" |
6937cb4e JX |
16187 | "Resolve all conflicts manually, mark them as resolved with\n" |
16188 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
16189 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
16190 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
16191 | "abort\"." | |
649900bc | 16192 | msgstr "" |
58b6f078 | 16193 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" |
6937cb4e JX |
16194 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" |
16195 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
16196 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
649900bc | 16197 | |
fd8cb379 | 16198 | #: git-rebase.sh:173 git-rebase.sh:442 |
5c57d762 JX |
16199 | #, sh-format |
16200 | msgid "Could not move back to $head_name" | |
16201 | msgstr "无法移回 $head_name" | |
16202 | ||
fd8cb379 | 16203 | #: git-rebase.sh:184 |
a4f16749 JX |
16204 | msgid "Applied autostash." |
16205 | msgstr "成功应用 autostash。" | |
16206 | ||
fd8cb379 | 16207 | #: git-rebase.sh:187 |
2e8451e8 JX |
16208 | #, sh-format |
16209 | msgid "Cannot store $stash_sha1" | |
16210 | msgstr "无法保存 $stash_sha1" | |
16211 | ||
fd8cb379 | 16212 | #: git-rebase.sh:229 |
649900bc | 16213 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 16214 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 16215 | |
fd8cb379 | 16216 | #: git-rebase.sh:234 |
5809aa05 JX |
16217 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
16218 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
649900bc | 16219 | |
fd8cb379 | 16220 | #: git-rebase.sh:403 |
649900bc JX |
16221 | msgid "No rebase in progress?" |
16222 | msgstr "没有正在进行的变基?" | |
16223 | ||
fd8cb379 | 16224 | #: git-rebase.sh:414 |
07432cef WS |
16225 | msgid "The --edit-todo action can only be used during interactive rebase." |
16226 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
16227 | ||
fd8cb379 | 16228 | #: git-rebase.sh:421 |
649900bc JX |
16229 | msgid "Cannot read HEAD" |
16230 | msgstr "不能读取 HEAD" | |
16231 | ||
fd8cb379 | 16232 | #: git-rebase.sh:424 |
649900bc JX |
16233 | msgid "" |
16234 | "You must edit all merge conflicts and then\n" | |
16235 | "mark them as resolved using git add" | |
16236 | msgstr "" | |
16237 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
16238 | "命令将它们标记为已解决" | |
16239 | ||
fd8cb379 | 16240 | #: git-rebase.sh:468 |
649900bc JX |
16241 | #, sh-format |
16242 | msgid "" | |
16243 | "It seems that there is already a $state_dir_base directory, and\n" | |
16244 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
16245 | "case, please try\n" | |
16246 | "\t$cmd_live_rebase\n" | |
16247 | "If that is not the case, please\n" | |
16248 | "\t$cmd_clear_stale_rebase\n" | |
16249 | "and run me again. I am stopping in case you still have something\n" | |
16250 | "valuable there." | |
16251 | msgstr "" | |
98b2761d JX |
16252 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
16253 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
16254 | "\t$cmd_live_rebase\n" |
16255 | "如果不是这样,请执行\n" | |
16256 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 16257 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 16258 | |
fd8cb379 JX |
16259 | #: git-rebase.sh:509 |
16260 | msgid "error: cannot combine '--signoff' with '--preserve-merges'" | |
16261 | msgstr "错误:不能组合参数 '--signoff' 和 '--preserve-merges'" | |
16262 | ||
16263 | #: git-rebase.sh:537 | |
649900bc | 16264 | #, sh-format |
5809aa05 JX |
16265 | msgid "invalid upstream '$upstream_name'" |
16266 | msgstr "无效的上游 '$upstream_name'" | |
649900bc | 16267 | |
fd8cb379 | 16268 | #: git-rebase.sh:561 |
649900bc JX |
16269 | #, sh-format |
16270 | msgid "$onto_name: there are more than one merge bases" | |
16271 | msgstr "$onto_name: 有一个以上的合并基准" | |
16272 | ||
fd8cb379 | 16273 | #: git-rebase.sh:564 git-rebase.sh:568 |
649900bc JX |
16274 | #, sh-format |
16275 | msgid "$onto_name: there is no merge base" | |
16276 | msgstr "$onto_name: 没有合并基准" | |
16277 | ||
fd8cb379 | 16278 | #: git-rebase.sh:573 |
649900bc JX |
16279 | #, sh-format |
16280 | msgid "Does not point to a valid commit: $onto_name" | |
16281 | msgstr "没有指向一个有效的提交:$onto_name" | |
16282 | ||
fd8cb379 | 16283 | #: git-rebase.sh:599 |
649900bc | 16284 | #, sh-format |
5809aa05 JX |
16285 | msgid "fatal: no such branch/commit '$branch_name'" |
16286 | msgstr "严重错误:无此分支/提交 '$branch_name'" | |
649900bc | 16287 | |
fd8cb379 | 16288 | #: git-rebase.sh:632 |
2e8451e8 JX |
16289 | msgid "Cannot autostash" |
16290 | msgstr "无法 autostash" | |
16291 | ||
fd8cb379 | 16292 | #: git-rebase.sh:637 |
2e8451e8 JX |
16293 | #, sh-format |
16294 | msgid "Created autostash: $stash_abbrev" | |
16295 | msgstr "创建了 autostash: $stash_abbrev" | |
16296 | ||
fd8cb379 | 16297 | #: git-rebase.sh:641 |
649900bc | 16298 | msgid "Please commit or stash them." |
a4f16749 | 16299 | msgstr "请提交或贮藏修改。" |
649900bc | 16300 | |
fd8cb379 | 16301 | #: git-rebase.sh:664 |
5809aa05 JX |
16302 | #, sh-format |
16303 | msgid "HEAD is up to date." | |
16304 | msgstr "HEAD 是最新的。" | |
16305 | ||
fd8cb379 | 16306 | #: git-rebase.sh:666 |
649900bc JX |
16307 | #, sh-format |
16308 | msgid "Current branch $branch_name is up to date." | |
16309 | msgstr "当前分支 $branch_name 是最新的。" | |
16310 | ||
fd8cb379 | 16311 | #: git-rebase.sh:674 |
5809aa05 JX |
16312 | #, sh-format |
16313 | msgid "HEAD is up to date, rebase forced." | |
16314 | msgstr "HEAD 是最新的,强制变基。" | |
16315 | ||
fd8cb379 | 16316 | #: git-rebase.sh:676 |
649900bc JX |
16317 | #, sh-format |
16318 | msgid "Current branch $branch_name is up to date, rebase forced." | |
16319 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
16320 | ||
fd8cb379 | 16321 | #: git-rebase.sh:688 |
649900bc JX |
16322 | #, sh-format |
16323 | msgid "Changes from $mb to $onto:" | |
16324 | msgstr "变更从 $mb 到 $onto:" | |
16325 | ||
fd8cb379 | 16326 | #: git-rebase.sh:697 |
649900bc | 16327 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 16328 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 16329 | |
fd8cb379 | 16330 | #: git-rebase.sh:707 |
649900bc JX |
16331 | #, sh-format |
16332 | msgid "Fast-forwarded $branch_name to $onto_name." | |
16333 | msgstr "快进 $branch_name 至 $onto_name。" | |
16334 | ||
6937cb4e | 16335 | #: git-stash.sh:61 |
c04f5ac3 JX |
16336 | msgid "git stash clear with parameters is unimplemented" |
16337 | msgstr "git stash clear 不支持参数" | |
16338 | ||
5809aa05 | 16339 | #: git-stash.sh:108 |
c04f5ac3 JX |
16340 | msgid "You do not have the initial commit yet" |
16341 | msgstr "您尚未建立初始提交" | |
16342 | ||
5809aa05 | 16343 | #: git-stash.sh:123 |
c04f5ac3 | 16344 | msgid "Cannot save the current index state" |
90e6ef53 | 16345 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 16346 | |
5809aa05 | 16347 | #: git-stash.sh:138 |
a0b6b246 JX |
16348 | msgid "Cannot save the untracked files" |
16349 | msgstr "无法保存未跟踪文件" | |
16350 | ||
5809aa05 | 16351 | #: git-stash.sh:158 git-stash.sh:171 |
c04f5ac3 JX |
16352 | msgid "Cannot save the current worktree state" |
16353 | msgstr "无法保存当前工作区状态" | |
16354 | ||
5809aa05 | 16355 | #: git-stash.sh:175 |
c04f5ac3 | 16356 | msgid "No changes selected" |
90e6ef53 | 16357 | msgstr "没有选择变更" |
c04f5ac3 | 16358 | |
5809aa05 | 16359 | #: git-stash.sh:178 |
c04f5ac3 | 16360 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 16361 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 16362 | |
5809aa05 | 16363 | #: git-stash.sh:191 |
c04f5ac3 JX |
16364 | msgid "Cannot record working tree state" |
16365 | msgstr "不能记录工作区状态" | |
16366 | ||
5809aa05 | 16367 | #: git-stash.sh:229 |
2e8451e8 JX |
16368 | #, sh-format |
16369 | msgid "Cannot update $ref_stash with $w_commit" | |
16370 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
16371 | ||
5809aa05 | 16372 | #: git-stash.sh:281 |
b694fbb1 | 16373 | #, sh-format |
5809aa05 JX |
16374 | msgid "error: unknown option for 'stash push': $option" |
16375 | msgstr "错误:'stash push' 的未知选项:$option" | |
b694fbb1 | 16376 | |
5809aa05 | 16377 | #: git-stash.sh:295 |
a0b6b246 JX |
16378 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
16379 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
16380 | ||
5809aa05 | 16381 | #: git-stash.sh:303 |
c04f5ac3 JX |
16382 | msgid "No local changes to save" |
16383 | msgstr "没有要保存的本地修改" | |
16384 | ||
5809aa05 | 16385 | #: git-stash.sh:308 |
c04f5ac3 | 16386 | msgid "Cannot initialize stash" |
a4f16749 | 16387 | msgstr "无法初始化贮藏" |
c04f5ac3 | 16388 | |
5809aa05 | 16389 | #: git-stash.sh:312 |
c04f5ac3 JX |
16390 | msgid "Cannot save the current status" |
16391 | msgstr "无法保存当前状态" | |
16392 | ||
5809aa05 | 16393 | #: git-stash.sh:313 |
5c57d762 JX |
16394 | #, sh-format |
16395 | msgid "Saved working directory and index state $stash_msg" | |
16396 | msgstr "保存工作目录和索引状态 $stash_msg" | |
16397 | ||
fd8cb379 | 16398 | #: git-stash.sh:342 |
c04f5ac3 JX |
16399 | msgid "Cannot remove worktree changes" |
16400 | msgstr "无法删除工作区变更" | |
16401 | ||
fd8cb379 | 16402 | #: git-stash.sh:490 |
7aea43ff JX |
16403 | #, sh-format |
16404 | msgid "unknown option: $opt" | |
16405 | msgstr "未知选项: $opt" | |
16406 | ||
fd8cb379 | 16407 | #: git-stash.sh:503 |
a4f16749 JX |
16408 | msgid "No stash entries found." |
16409 | msgstr "未发现贮藏条目。" | |
c04f5ac3 | 16410 | |
fd8cb379 | 16411 | #: git-stash.sh:510 |
c04f5ac3 JX |
16412 | #, sh-format |
16413 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 16414 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 16415 | |
fd8cb379 | 16416 | #: git-stash.sh:525 |
c04f5ac3 | 16417 | #, sh-format |
220c313c JX |
16418 | msgid "$reference is not a valid reference" |
16419 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 16420 | |
fd8cb379 | 16421 | #: git-stash.sh:553 |
c04f5ac3 JX |
16422 | #, sh-format |
16423 | msgid "'$args' is not a stash-like commit" | |
a4f16749 | 16424 | msgstr "'$args' 不是贮藏式提交" |
c04f5ac3 | 16425 | |
fd8cb379 | 16426 | #: git-stash.sh:564 |
c04f5ac3 JX |
16427 | #, sh-format |
16428 | msgid "'$args' is not a stash reference" | |
a4f16749 | 16429 | msgstr "'$args' 不是一个贮藏引用" |
c04f5ac3 | 16430 | |
fd8cb379 | 16431 | #: git-stash.sh:572 |
c04f5ac3 | 16432 | msgid "unable to refresh index" |
90e6ef53 | 16433 | msgstr "无法刷新索引" |
c04f5ac3 | 16434 | |
fd8cb379 | 16435 | #: git-stash.sh:576 |
c04f5ac3 | 16436 | msgid "Cannot apply a stash in the middle of a merge" |
a4f16749 | 16437 | msgstr "无法在合并过程应用贮藏" |
c04f5ac3 | 16438 | |
fd8cb379 | 16439 | #: git-stash.sh:584 |
c04f5ac3 | 16440 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 16441 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 16442 | |
fd8cb379 | 16443 | #: git-stash.sh:586 |
c04f5ac3 | 16444 | msgid "Could not save index tree" |
90e6ef53 | 16445 | msgstr "不能保存索引树" |
c04f5ac3 | 16446 | |
fd8cb379 | 16447 | #: git-stash.sh:595 |
a4f16749 JX |
16448 | msgid "Could not restore untracked files from stash entry" |
16449 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
a0b6b246 | 16450 | |
fd8cb379 | 16451 | #: git-stash.sh:620 |
c04f5ac3 | 16452 | msgid "Cannot unstage modified files" |
160fb2b2 | 16453 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 16454 | |
fd8cb379 | 16455 | #: git-stash.sh:635 |
b694fbb1 | 16456 | msgid "Index was not unstashed." |
a4f16749 | 16457 | msgstr "索引未从贮藏中恢复。" |
b694fbb1 | 16458 | |
fd8cb379 | 16459 | #: git-stash.sh:649 |
a4f16749 JX |
16460 | msgid "The stash entry is kept in case you need it again." |
16461 | msgstr "贮藏条目被保留以备您再次需要。" | |
5c57d762 | 16462 | |
fd8cb379 | 16463 | #: git-stash.sh:658 |
c04f5ac3 JX |
16464 | #, sh-format |
16465 | msgid "Dropped ${REV} ($s)" | |
16466 | msgstr "丢弃了 ${REV} ($s)" | |
16467 | ||
fd8cb379 | 16468 | #: git-stash.sh:659 |
c04f5ac3 JX |
16469 | #, sh-format |
16470 | msgid "${REV}: Could not drop stash entry" | |
a4f16749 | 16471 | msgstr "${REV}:无法丢弃贮藏条目" |
c04f5ac3 | 16472 | |
fd8cb379 | 16473 | #: git-stash.sh:667 |
c04f5ac3 JX |
16474 | msgid "No branch name specified" |
16475 | msgstr "未指定分支名" | |
16476 | ||
fd8cb379 | 16477 | #: git-stash.sh:746 |
c04f5ac3 JX |
16478 | msgid "(To restore them type \"git stash apply\")" |
16479 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
16480 | ||
fd8cb379 | 16481 | #: git-submodule.sh:188 |
2e8451e8 JX |
16482 | msgid "Relative path can only be used from the toplevel of the working tree" |
16483 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
16484 | ||
fd8cb379 | 16485 | #: git-submodule.sh:198 |
c04f5ac3 JX |
16486 | #, sh-format |
16487 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 16488 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 16489 | |
fd8cb379 | 16490 | #: git-submodule.sh:217 |
c04f5ac3 | 16491 | #, sh-format |
170e9899 JX |
16492 | msgid "'$sm_path' already exists in the index" |
16493 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 16494 | |
fd8cb379 | 16495 | #: git-submodule.sh:220 |
1a79b2f1 JX |
16496 | #, sh-format |
16497 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
16498 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
16499 | ||
fd8cb379 | 16500 | #: git-submodule.sh:226 |
b694fbb1 JX |
16501 | #, sh-format |
16502 | msgid "" | |
16503 | "The following path is ignored by one of your .gitignore files:\n" | |
16504 | "$sm_path\n" | |
16505 | "Use -f if you really want to add it." | |
16506 | msgstr "" | |
16507 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
16508 | "$sm_path\n" | |
16509 | "如果您确实想添加它,使用 -f 参数。" | |
16510 | ||
fd8cb379 | 16511 | #: git-submodule.sh:249 |
b694fbb1 JX |
16512 | #, sh-format |
16513 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 16514 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 16515 | |
fd8cb379 | 16516 | #: git-submodule.sh:251 |
c04f5ac3 | 16517 | #, sh-format |
170e9899 | 16518 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 16519 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 16520 | |
fd8cb379 | 16521 | #: git-submodule.sh:259 |
07432cef WS |
16522 | #, sh-format |
16523 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 16524 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 16525 | |
fd8cb379 | 16526 | #: git-submodule.sh:261 |
07432cef WS |
16527 | #, sh-format |
16528 | msgid "" | |
5c57d762 JX |
16529 | "If you want to reuse this local git directory instead of cloning again from\n" |
16530 | " $realrepo\n" | |
16531 | "use the '--force' option. If the local git directory is not the correct " | |
16532 | "repo\n" | |
07432cef WS |
16533 | "or you are unsure what this means choose another name with the '--name' " |
16534 | "option." | |
5c57d762 JX |
16535 | msgstr "" |
16536 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
16537 | " $realrepo\n" | |
16538 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
16539 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 16540 | |
fd8cb379 | 16541 | #: git-submodule.sh:267 |
07432cef WS |
16542 | #, sh-format |
16543 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
16544 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
16545 | ||
fd8cb379 | 16546 | #: git-submodule.sh:279 |
c04f5ac3 | 16547 | #, sh-format |
170e9899 JX |
16548 | msgid "Unable to checkout submodule '$sm_path'" |
16549 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 16550 | |
fd8cb379 | 16551 | #: git-submodule.sh:284 |
c04f5ac3 | 16552 | #, sh-format |
170e9899 JX |
16553 | msgid "Failed to add submodule '$sm_path'" |
16554 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 16555 | |
fd8cb379 | 16556 | #: git-submodule.sh:293 |
c04f5ac3 | 16557 | #, sh-format |
170e9899 JX |
16558 | msgid "Failed to register submodule '$sm_path'" |
16559 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 16560 | |
fd8cb379 | 16561 | #: git-submodule.sh:354 |
c04f5ac3 | 16562 | #, sh-format |
5b04ee3b JX |
16563 | msgid "Entering '$displaypath'" |
16564 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 16565 | |
fd8cb379 | 16566 | #: git-submodule.sh:374 |
c04f5ac3 | 16567 | #, sh-format |
5b04ee3b | 16568 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 16569 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 16570 | |
fd8cb379 | 16571 | #: git-submodule.sh:600 |
c04f5ac3 | 16572 | #, sh-format |
2e8451e8 JX |
16573 | msgid "Unable to find current revision in submodule path '$displaypath'" |
16574 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 16575 | |
fd8cb379 | 16576 | #: git-submodule.sh:610 |
c04f5ac3 | 16577 | #, sh-format |
170e9899 JX |
16578 | msgid "Unable to fetch in submodule path '$sm_path'" |
16579 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 16580 | |
fd8cb379 | 16581 | #: git-submodule.sh:615 |
5c57d762 JX |
16582 | #, sh-format |
16583 | msgid "" | |
16584 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
16585 | "'$sm_path'" | |
9a4b694c | 16586 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 16587 | |
fd8cb379 | 16588 | #: git-submodule.sh:633 |
2e8451e8 JX |
16589 | #, sh-format |
16590 | msgid "Unable to fetch in submodule path '$displaypath'" | |
16591 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
16592 | ||
fd8cb379 | 16593 | #: git-submodule.sh:639 |
5c57d762 JX |
16594 | #, sh-format |
16595 | msgid "" | |
16596 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
16597 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
16598 | msgstr "" |
16599 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 16600 | |
fd8cb379 | 16601 | #: git-submodule.sh:646 |
6c94aba5 JX |
16602 | #, sh-format |
16603 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
16604 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
16605 | ||
fd8cb379 | 16606 | #: git-submodule.sh:647 |
c04f5ac3 | 16607 | #, sh-format |
6c94aba5 JX |
16608 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
16609 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
16610 | ||
fd8cb379 | 16611 | #: git-submodule.sh:651 |
6c94aba5 | 16612 | #, sh-format |
2e8451e8 JX |
16613 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
16614 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 16615 | |
fd8cb379 | 16616 | #: git-submodule.sh:652 |
c04f5ac3 | 16617 | #, sh-format |
2e8451e8 JX |
16618 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
16619 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 16620 | |
fd8cb379 | 16621 | #: git-submodule.sh:657 |
c04f5ac3 | 16622 | #, sh-format |
2e8451e8 JX |
16623 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
16624 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 16625 | |
fd8cb379 | 16626 | #: git-submodule.sh:658 |
c04f5ac3 | 16627 | #, sh-format |
2e8451e8 JX |
16628 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
16629 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 16630 | |
fd8cb379 | 16631 | #: git-submodule.sh:663 |
c04f5ac3 | 16632 | #, sh-format |
5b04ee3b JX |
16633 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
16634 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 16635 | |
fd8cb379 | 16636 | #: git-submodule.sh:664 |
c04f5ac3 | 16637 | #, sh-format |
5b04ee3b | 16638 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 16639 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 16640 | |
fd8cb379 | 16641 | #: git-submodule.sh:695 |
2e8451e8 JX |
16642 | #, sh-format |
16643 | msgid "Failed to recurse into submodule path '$displaypath'" | |
16644 | msgstr "无法递归进子模组路径 '$displaypath'" | |
16645 | ||
fd8cb379 | 16646 | #: git-submodule.sh:791 |
649900bc JX |
16647 | msgid "The --cached option cannot be used with the --files option" |
16648 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 16649 | |
fd8cb379 | 16650 | #: git-submodule.sh:843 |
b694fbb1 JX |
16651 | #, sh-format |
16652 | msgid "unexpected mode $mod_dst" | |
16653 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 16654 | |
90e6ef53 | 16655 | # 译者:注意保持前导空格 |
fd8cb379 | 16656 | #: git-submodule.sh:863 |
c04f5ac3 | 16657 | #, sh-format |
2e8451e8 JX |
16658 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
16659 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 16660 | |
90e6ef53 | 16661 | # 译者:注意保持前导空格 |
fd8cb379 | 16662 | #: git-submodule.sh:866 |
c04f5ac3 | 16663 | #, sh-format |
2e8451e8 JX |
16664 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
16665 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 16666 | |
90e6ef53 | 16667 | # 译者:注意保持前导空格 |
fd8cb379 | 16668 | #: git-submodule.sh:869 |
c04f5ac3 | 16669 | #, sh-format |
2e8451e8 JX |
16670 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
16671 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 16672 | |
5b04ee3b JX |
16673 | #: git-parse-remote.sh:89 |
16674 | #, sh-format | |
16675 | msgid "See git-${cmd}(1) for details." | |
16676 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 16677 | |
fd8cb379 | 16678 | #: git-rebase--interactive.sh:142 |
5c57d762 JX |
16679 | #, sh-format |
16680 | msgid "Rebasing ($new_count/$total)" | |
16681 | msgstr "变基中($new_count/$total)" | |
16682 | ||
fd8cb379 | 16683 | #: git-rebase--interactive.sh:158 |
5c57d762 JX |
16684 | msgid "" |
16685 | "\n" | |
16686 | "Commands:\n" | |
fd8cb379 JX |
16687 | "p, pick <commit> = use commit\n" |
16688 | "r, reword <commit> = use commit, but edit the commit message\n" | |
16689 | "e, edit <commit> = use commit, but stop for amending\n" | |
16690 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
16691 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
16692 | "x, exec <command> = run command (the rest of the line) using shell\n" | |
16693 | "d, drop <commit> = remove commit\n" | |
16694 | "l, label <label> = label current HEAD with a name\n" | |
16695 | "t, reset <label> = reset HEAD to a label\n" | |
16696 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
16697 | ". create a merge commit using the original merge commit's\n" | |
16698 | ". message (or the oneline, if no original merge commit was\n" | |
16699 | ". specified). Use -c <commit> to reword the commit message.\n" | |
5c57d762 JX |
16700 | "\n" |
16701 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
16702 | msgstr "" | |
16703 | "\n" | |
16704 | "命令:\n" | |
fd8cb379 JX |
16705 | "p, pick <提交> = 使用提交\n" |
16706 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
16707 | "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n" | |
16708 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
16709 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
16710 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
16711 | "d, drop <提交> = 删除提交\n" | |
16712 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
16713 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
16714 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
16715 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
16716 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
16717 | ". -c <提交> 可以编辑提交说明。\n" | |
5c57d762 | 16718 | "\n" |
fd8cb379 | 16719 | "可以对这些行重新排序,将从上至下执行。\n" |
5c57d762 | 16720 | |
fd8cb379 | 16721 | #: git-rebase--interactive.sh:179 |
5c57d762 JX |
16722 | msgid "" |
16723 | "\n" | |
16724 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
a0b6b246 JX |
16725 | msgstr "" |
16726 | "\n" | |
16727 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5c57d762 | 16728 | |
fd8cb379 | 16729 | #: git-rebase--interactive.sh:183 |
5c57d762 JX |
16730 | msgid "" |
16731 | "\n" | |
16732 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
a0b6b246 JX |
16733 | msgstr "" |
16734 | "\n" | |
16735 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5c57d762 | 16736 | |
fd8cb379 | 16737 | #: git-rebase--interactive.sh:221 |
5c57d762 JX |
16738 | #, sh-format |
16739 | msgid "" | |
16740 | "You can amend the commit now, with\n" | |
16741 | "\n" | |
16742 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
16743 | "\n" | |
16744 | "Once you are satisfied with your changes, run\n" | |
16745 | "\n" | |
16746 | "\tgit rebase --continue" | |
16747 | msgstr "" | |
16748 | "您现在可以修补这个提交,使用\n" | |
16749 | "\n" | |
16750 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
16751 | "\n" | |
9a4b694c | 16752 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
16753 | "\n" |
16754 | "\tgit rebase --continue" | |
16755 | ||
fd8cb379 | 16756 | #: git-rebase--interactive.sh:246 |
5c57d762 JX |
16757 | #, sh-format |
16758 | msgid "$sha1: not a commit that can be picked" | |
16759 | msgstr "$sha1:不是一个可以被拣选的提交" | |
16760 | ||
fd8cb379 | 16761 | #: git-rebase--interactive.sh:285 |
5c57d762 JX |
16762 | #, sh-format |
16763 | msgid "Invalid commit name: $sha1" | |
16764 | msgstr "无效的提交名:$sha1" | |
16765 | ||
fd8cb379 | 16766 | #: git-rebase--interactive.sh:325 |
5c57d762 JX |
16767 | msgid "Cannot write current commit's replacement sha1" |
16768 | msgstr "不能写入当前提交的替代 sha1" | |
16769 | ||
fd8cb379 | 16770 | #: git-rebase--interactive.sh:376 |
5c57d762 JX |
16771 | #, sh-format |
16772 | msgid "Fast-forward to $sha1" | |
16773 | msgstr "快进到 $sha1" | |
16774 | ||
fd8cb379 | 16775 | #: git-rebase--interactive.sh:378 |
5c57d762 JX |
16776 | #, sh-format |
16777 | msgid "Cannot fast-forward to $sha1" | |
16778 | msgstr "不能快进到 $sha1" | |
16779 | ||
fd8cb379 | 16780 | #: git-rebase--interactive.sh:387 |
5c57d762 JX |
16781 | #, sh-format |
16782 | msgid "Cannot move HEAD to $first_parent" | |
16783 | msgstr "不能移动 HEAD 到 $first_parent" | |
16784 | ||
fd8cb379 | 16785 | #: git-rebase--interactive.sh:392 |
5c57d762 JX |
16786 | #, sh-format |
16787 | msgid "Refusing to squash a merge: $sha1" | |
16788 | msgstr "拒绝压缩一个合并:$sha1" | |
16789 | ||
fd8cb379 | 16790 | #: git-rebase--interactive.sh:410 |
5c57d762 JX |
16791 | #, sh-format |
16792 | msgid "Error redoing merge $sha1" | |
16793 | msgstr "无法重做合并 $sha1" | |
16794 | ||
fd8cb379 | 16795 | #: git-rebase--interactive.sh:419 |
5c57d762 JX |
16796 | #, sh-format |
16797 | msgid "Could not pick $sha1" | |
16798 | msgstr "不能拣选 $sha1" | |
16799 | ||
fd8cb379 | 16800 | #: git-rebase--interactive.sh:428 |
5c57d762 JX |
16801 | #, sh-format |
16802 | msgid "This is the commit message #${n}:" | |
9a4b694c | 16803 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 16804 | |
fd8cb379 | 16805 | #: git-rebase--interactive.sh:433 |
5c57d762 JX |
16806 | #, sh-format |
16807 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 16808 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 16809 | |
fd8cb379 | 16810 | #: git-rebase--interactive.sh:444 |
5c57d762 JX |
16811 | #, sh-format |
16812 | msgid "This is a combination of $count commit." | |
16813 | msgid_plural "This is a combination of $count commits." | |
16814 | msgstr[0] "这是一个 $count 个提交的组合。" | |
16815 | msgstr[1] "这是一个 $count 个提交的组合。" | |
16816 | ||
fd8cb379 | 16817 | #: git-rebase--interactive.sh:453 |
5c57d762 JX |
16818 | #, sh-format |
16819 | msgid "Cannot write $fixup_msg" | |
16820 | msgstr "不能写入 $fixup_msg" | |
16821 | ||
fd8cb379 | 16822 | #: git-rebase--interactive.sh:456 |
5c57d762 JX |
16823 | msgid "This is a combination of 2 commits." |
16824 | msgstr "这是一个 2 个提交的组合。" | |
16825 | ||
fd8cb379 JX |
16826 | #: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 |
16827 | #: git-rebase--interactive.sh:543 | |
5c57d762 JX |
16828 | #, sh-format |
16829 | msgid "Could not apply $sha1... $rest" | |
16830 | msgstr "不能应用 $sha1... $rest" | |
16831 | ||
fd8cb379 | 16832 | #: git-rebase--interactive.sh:572 |
5c57d762 JX |
16833 | #, sh-format |
16834 | msgid "" | |
16835 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
16836 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
16837 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
16838 | "before\n" | |
16839 | "you are able to reword the commit." | |
16840 | msgstr "" | |
16841 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
16842 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
16843 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
16844 | ||
fd8cb379 | 16845 | #: git-rebase--interactive.sh:587 |
5c57d762 JX |
16846 | #, sh-format |
16847 | msgid "Stopped at $sha1_abbrev... $rest" | |
16848 | msgstr "停止在 $sha1_abbrev... $rest" | |
16849 | ||
fd8cb379 | 16850 | #: git-rebase--interactive.sh:602 |
5c57d762 JX |
16851 | #, sh-format |
16852 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 16853 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 16854 | |
fd8cb379 | 16855 | #: git-rebase--interactive.sh:644 |
5c57d762 JX |
16856 | #, sh-format |
16857 | msgid "Executing: $rest" | |
16858 | msgstr "执行:$rest" | |
16859 | ||
fd8cb379 | 16860 | #: git-rebase--interactive.sh:652 |
5c57d762 JX |
16861 | #, sh-format |
16862 | msgid "Execution failed: $rest" | |
16863 | msgstr "执行失败:$rest" | |
16864 | ||
fd8cb379 | 16865 | #: git-rebase--interactive.sh:654 |
5c57d762 JX |
16866 | msgid "and made changes to the index and/or the working tree" |
16867 | msgstr "并且修改索引和/或工作区" | |
16868 | ||
16869 | # 译者:注意保持前导空格 | |
fd8cb379 | 16870 | #: git-rebase--interactive.sh:656 |
5c57d762 JX |
16871 | msgid "" |
16872 | "You can fix the problem, and then run\n" | |
16873 | "\n" | |
16874 | "\tgit rebase --continue" | |
16875 | msgstr "" | |
16876 | "您可以解决这个问题,然后运行\n" | |
16877 | "\n" | |
16878 | "\tgit rebase --continue" | |
16879 | ||
16880 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
fd8cb379 | 16881 | #: git-rebase--interactive.sh:669 |
5c57d762 JX |
16882 | #, sh-format |
16883 | msgid "" | |
16884 | "Execution succeeded: $rest\n" | |
16885 | "but left changes to the index and/or the working tree\n" | |
16886 | "Commit or stash your changes, and then run\n" | |
16887 | "\n" | |
16888 | "\tgit rebase --continue" | |
16889 | msgstr "" | |
16890 | "执行成功:$rest\n" | |
a4f16749 | 16891 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
16892 | "\n" |
16893 | "\tgit rebase --continue" | |
16894 | ||
fd8cb379 | 16895 | #: git-rebase--interactive.sh:680 |
5c57d762 JX |
16896 | #, sh-format |
16897 | msgid "Unknown command: $command $sha1 $rest" | |
16898 | msgstr "未知命令:$command $sha1 $rest" | |
16899 | ||
fd8cb379 | 16900 | #: git-rebase--interactive.sh:681 |
5c57d762 JX |
16901 | msgid "Please fix this using 'git rebase --edit-todo'." |
16902 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
16903 | ||
fd8cb379 | 16904 | #: git-rebase--interactive.sh:716 |
5c57d762 JX |
16905 | #, sh-format |
16906 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 16907 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 16908 | |
fd8cb379 | 16909 | #: git-rebase--interactive.sh:740 |
5c57d762 JX |
16910 | msgid "could not detach HEAD" |
16911 | msgstr "不能检出为分离头指针" | |
16912 | ||
fd8cb379 | 16913 | #: git-rebase--interactive.sh:778 |
5c57d762 JX |
16914 | msgid "Could not remove CHERRY_PICK_HEAD" |
16915 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
16916 | ||
fd8cb379 | 16917 | #: git-rebase--interactive.sh:783 |
5c57d762 JX |
16918 | #, sh-format |
16919 | msgid "" | |
16920 | "You have staged changes in your working tree.\n" | |
16921 | "If these changes are meant to be\n" | |
16922 | "squashed into the previous commit, run:\n" | |
16923 | "\n" | |
16924 | " git commit --amend $gpg_sign_opt_quoted\n" | |
16925 | "\n" | |
16926 | "If they are meant to go into a new commit, run:\n" | |
16927 | "\n" | |
16928 | " git commit $gpg_sign_opt_quoted\n" | |
16929 | "\n" | |
a0b6b246 | 16930 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
16931 | "\n" |
16932 | " git rebase --continue\n" | |
16933 | msgstr "" | |
16934 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
16935 | "\n" | |
16936 | " git commit --amend $gpg_sign_opt_quoted\n" | |
16937 | "\n" | |
16938 | "如果这些变更要形成一个新提交,执行:\n" | |
16939 | "\n" | |
16940 | " git commit $gpg_sign_opt_quoted\n" | |
16941 | "\n" | |
9a4b694c | 16942 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
16943 | "\n" |
16944 | " git rebase --continue\n" | |
16945 | ||
fd8cb379 | 16946 | #: git-rebase--interactive.sh:800 |
5c57d762 | 16947 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 16948 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 16949 | |
fd8cb379 | 16950 | #: git-rebase--interactive.sh:805 |
5c57d762 JX |
16951 | msgid "" |
16952 | "You have uncommitted changes in your working tree. Please commit them\n" | |
16953 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
16954 | msgstr "" |
16955 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 16956 | |
fd8cb379 | 16957 | #: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 |
5c57d762 JX |
16958 | msgid "Could not commit staged changes." |
16959 | msgstr "不能提交暂存的修改。" | |
16960 | ||
fd8cb379 | 16961 | #: git-rebase--interactive.sh:843 |
5c57d762 JX |
16962 | msgid "" |
16963 | "\n" | |
16964 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
16965 | "To continue rebase after editing, run:\n" | |
16966 | " git rebase --continue\n" | |
16967 | "\n" | |
16968 | msgstr "" | |
16969 | "\n" | |
6937cb4e | 16970 | "您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" |
5c57d762 JX |
16971 | "请执行:\n" |
16972 | " git rebase --continue\n" | |
16973 | "\n" | |
16974 | ||
fd8cb379 | 16975 | #: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 |
5c57d762 JX |
16976 | msgid "Could not execute editor" |
16977 | msgstr "无法运行编辑器" | |
16978 | ||
fd8cb379 | 16979 | #: git-rebase--interactive.sh:872 |
5c57d762 JX |
16980 | #, sh-format |
16981 | msgid "Could not checkout $switch_to" | |
16982 | msgstr "不能检出 $switch_to" | |
16983 | ||
fd8cb379 | 16984 | #: git-rebase--interactive.sh:879 |
5c57d762 JX |
16985 | msgid "No HEAD?" |
16986 | msgstr "没有 HEAD?" | |
16987 | ||
fd8cb379 | 16988 | #: git-rebase--interactive.sh:880 |
5c57d762 JX |
16989 | #, sh-format |
16990 | msgid "Could not create temporary $state_dir" | |
16991 | msgstr "不能创建临时 $state_dir" | |
16992 | ||
fd8cb379 | 16993 | #: git-rebase--interactive.sh:883 |
5c57d762 JX |
16994 | msgid "Could not mark as interactive" |
16995 | msgstr "不能标记为交互式" | |
16996 | ||
fd8cb379 | 16997 | #: git-rebase--interactive.sh:915 |
5c57d762 JX |
16998 | #, sh-format |
16999 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
17000 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
17001 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
17002 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
17003 | ||
fd8cb379 | 17004 | #: git-rebase--interactive.sh:920 |
5c57d762 JX |
17005 | msgid "" |
17006 | "\n" | |
fd8cb379 | 17007 | "\tHowever, if you remove everything, the rebase will be aborted.\n" |
5c57d762 | 17008 | "\n" |
fd8cb379 | 17009 | "\t" |
a0b6b246 JX |
17010 | msgstr "" |
17011 | "\n" | |
fd8cb379 | 17012 | "\t然而,如果您删除全部内容,变基操作将会终止。\n" |
a0b6b246 | 17013 | "\n" |
fd8cb379 | 17014 | "\t" |
5c57d762 | 17015 | |
fd8cb379 | 17016 | #: git-rebase--interactive.sh:927 |
5c57d762 JX |
17017 | msgid "Note that empty commits are commented out" |
17018 | msgstr "注意空提交已被注释掉" | |
17019 | ||
fd8cb379 JX |
17020 | #: git-rebase--interactive.sh:980 |
17021 | msgid "Could not generate todo list" | |
17022 | msgstr "无法生成待办列表" | |
17023 | ||
17024 | #: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 | |
17025 | msgid "Could not init rewritten commits" | |
17026 | msgstr "不能对重写提交进行初始化" | |
17027 | ||
5c57d762 JX |
17028 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
17029 | #, sh-format | |
17030 | msgid "usage: $dashless $USAGE" | |
17031 | msgstr "用法:$dashless $USAGE" | |
17032 | ||
17033 | #: git-sh-setup.sh:190 | |
17034 | #, sh-format | |
17035 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 17036 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
17037 | |
17038 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
17039 | #, sh-format | |
17040 | msgid "fatal: $program_name cannot be used without a working tree." | |
17041 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
17042 | ||
17043 | #: git-sh-setup.sh:220 | |
17044 | msgid "Cannot rebase: You have unstaged changes." | |
17045 | msgstr "不能变基:您有未暂存的变更。" | |
17046 | ||
17047 | #: git-sh-setup.sh:223 | |
17048 | msgid "Cannot rewrite branches: You have unstaged changes." | |
17049 | msgstr "不能重写分支:您有未暂存的变更。" | |
17050 | ||
a0b6b246 JX |
17051 | #: git-sh-setup.sh:226 |
17052 | msgid "Cannot pull with rebase: You have unstaged changes." | |
17053 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
17054 | ||
5c57d762 JX |
17055 | #: git-sh-setup.sh:229 |
17056 | #, sh-format | |
17057 | msgid "Cannot $action: You have unstaged changes." | |
17058 | msgstr "不能 $action:您有未暂存的变更。" | |
17059 | ||
17060 | #: git-sh-setup.sh:242 | |
17061 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
17062 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
17063 | ||
a0b6b246 JX |
17064 | #: git-sh-setup.sh:245 |
17065 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
17066 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
17067 | ||
5c57d762 JX |
17068 | #: git-sh-setup.sh:248 |
17069 | #, sh-format | |
17070 | msgid "Cannot $action: Your index contains uncommitted changes." | |
17071 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
17072 | ||
a0b6b246 JX |
17073 | #: git-sh-setup.sh:252 |
17074 | msgid "Additionally, your index contains uncommitted changes." | |
17075 | msgstr "而且您的索引中包含未提交的变更。" | |
17076 | ||
5c57d762 JX |
17077 | #: git-sh-setup.sh:372 |
17078 | msgid "You need to run this command from the toplevel of the working tree." | |
17079 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
17080 | ||
17081 | #: git-sh-setup.sh:377 | |
17082 | msgid "Unable to determine absolute path of git directory" | |
17083 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 17084 | |
1a79b2f1 | 17085 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
a4f16749 | 17086 | #: git-add--interactive.perl:196 |
1a79b2f1 JX |
17087 | #, perl-format |
17088 | msgid "%12s %12s %s" | |
17089 | msgstr "%12s %12s %s" | |
17090 | ||
a4f16749 | 17091 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
17092 | msgid "staged" |
17093 | msgstr "缓存" | |
17094 | ||
a4f16749 | 17095 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
17096 | msgid "unstaged" |
17097 | msgstr "未缓存" | |
17098 | ||
fd8cb379 | 17099 | #: git-add--interactive.perl:253 git-add--interactive.perl:278 |
1a79b2f1 JX |
17100 | msgid "binary" |
17101 | msgstr "二进制" | |
17102 | ||
fd8cb379 | 17103 | #: git-add--interactive.perl:262 git-add--interactive.perl:316 |
1a79b2f1 JX |
17104 | msgid "nothing" |
17105 | msgstr "无" | |
17106 | ||
fd8cb379 | 17107 | #: git-add--interactive.perl:298 git-add--interactive.perl:313 |
1a79b2f1 JX |
17108 | msgid "unchanged" |
17109 | msgstr "没有修改" | |
17110 | ||
fd8cb379 | 17111 | #: git-add--interactive.perl:609 |
1a79b2f1 JX |
17112 | #, perl-format |
17113 | msgid "added %d path\n" | |
17114 | msgid_plural "added %d paths\n" | |
17115 | msgstr[0] "增加了 %d 个路径\n" | |
17116 | msgstr[1] "增加了 %d 个路径\n" | |
17117 | ||
fd8cb379 | 17118 | #: git-add--interactive.perl:612 |
1a79b2f1 JX |
17119 | #, perl-format |
17120 | msgid "updated %d path\n" | |
17121 | msgid_plural "updated %d paths\n" | |
17122 | msgstr[0] "更新了 %d 个路径\n" | |
17123 | msgstr[1] "更新了 %d 个路径\n" | |
17124 | ||
fd8cb379 | 17125 | #: git-add--interactive.perl:615 |
1a79b2f1 JX |
17126 | #, perl-format |
17127 | msgid "reverted %d path\n" | |
17128 | msgid_plural "reverted %d paths\n" | |
17129 | msgstr[0] "还原了 %d 个路径\n" | |
17130 | msgstr[1] "还原了 %d 个路径\n" | |
17131 | ||
fd8cb379 | 17132 | #: git-add--interactive.perl:618 |
1a79b2f1 JX |
17133 | #, perl-format |
17134 | msgid "touched %d path\n" | |
17135 | msgid_plural "touched %d paths\n" | |
17136 | msgstr[0] "触碰了 %d 个路径\n" | |
17137 | msgstr[1] "触碰了 %d 个路径\n" | |
17138 | ||
fd8cb379 | 17139 | #: git-add--interactive.perl:627 |
1a79b2f1 JX |
17140 | msgid "Update" |
17141 | msgstr "更新" | |
17142 | ||
fd8cb379 | 17143 | #: git-add--interactive.perl:639 |
1a79b2f1 JX |
17144 | msgid "Revert" |
17145 | msgstr "还原" | |
17146 | ||
fd8cb379 | 17147 | #: git-add--interactive.perl:662 |
1a79b2f1 JX |
17148 | #, perl-format |
17149 | msgid "note: %s is untracked now.\n" | |
17150 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
17151 | ||
fd8cb379 | 17152 | #: git-add--interactive.perl:673 |
1a79b2f1 JX |
17153 | msgid "Add untracked" |
17154 | msgstr "添加未跟踪的" | |
17155 | ||
fd8cb379 | 17156 | #: git-add--interactive.perl:679 |
1a79b2f1 JX |
17157 | msgid "No untracked files.\n" |
17158 | msgstr "没有未跟踪的文件。\n" | |
17159 | ||
fd8cb379 | 17160 | #: git-add--interactive.perl:1033 |
1a79b2f1 JX |
17161 | msgid "" |
17162 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
17163 | "marked for staging." | |
17164 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
17165 | ||
fd8cb379 | 17166 | #: git-add--interactive.perl:1036 |
1a79b2f1 JX |
17167 | msgid "" |
17168 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
17169 | "marked for stashing." | |
a4f16749 | 17170 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 17171 | |
fd8cb379 | 17172 | #: git-add--interactive.perl:1039 |
1a79b2f1 JX |
17173 | msgid "" |
17174 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
17175 | "marked for unstaging." | |
17176 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
17177 | ||
fd8cb379 | 17178 | #: git-add--interactive.perl:1042 git-add--interactive.perl:1051 |
1a79b2f1 JX |
17179 | msgid "" |
17180 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
17181 | "marked for applying." | |
17182 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
17183 | ||
fd8cb379 | 17184 | #: git-add--interactive.perl:1045 git-add--interactive.perl:1048 |
1a79b2f1 JX |
17185 | msgid "" |
17186 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
17187 | "marked for discarding." | |
17188 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
17189 | ||
fd8cb379 | 17190 | #: git-add--interactive.perl:1085 |
1a79b2f1 JX |
17191 | #, perl-format |
17192 | msgid "failed to open hunk edit file for writing: %s" | |
17193 | msgstr "无法写入块编辑文件:%s" | |
17194 | ||
fd8cb379 | 17195 | #: git-add--interactive.perl:1086 |
1a79b2f1 JX |
17196 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
17197 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
17198 | ||
fd8cb379 | 17199 | #: git-add--interactive.perl:1092 |
1a79b2f1 JX |
17200 | #, perl-format |
17201 | msgid "" | |
17202 | "---\n" | |
17203 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
17204 | "To remove '%s' lines, delete them.\n" | |
17205 | "Lines starting with %s will be removed.\n" | |
17206 | msgstr "" | |
17207 | "---\n" | |
17208 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
17209 | "要删除 '%s' 开始的行,删除它们。\n" | |
17210 | "以 %s 开始的行将被删除。\n" | |
17211 | ||
17212 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
fd8cb379 | 17213 | #: git-add--interactive.perl:1100 |
1a79b2f1 JX |
17214 | msgid "" |
17215 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
17216 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
17217 | "aborted and the hunk is left unchanged.\n" | |
17218 | msgstr "" | |
17219 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
17220 | "此次编辑被终止,该块不会被修改。\n" | |
17221 | ||
fd8cb379 | 17222 | #: git-add--interactive.perl:1114 |
1a79b2f1 JX |
17223 | #, perl-format |
17224 | msgid "failed to open hunk edit file for reading: %s" | |
17225 | msgstr "无法读取块编辑文件:%s" | |
17226 | ||
17227 | #. TRANSLATORS: do not translate [y/n] | |
17228 | #. The program will only accept that input | |
17229 | #. at this point. | |
17230 | #. Consider translating (saying "no" discards!) as | |
17231 | #. (saying "n" for "no" discards!) if the translation | |
17232 | #. of the word "no" does not start with n. | |
fd8cb379 | 17233 | #: git-add--interactive.perl:1213 |
1a79b2f1 JX |
17234 | msgid "" |
17235 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
17236 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
17237 | ||
fd8cb379 | 17238 | #: git-add--interactive.perl:1222 |
1a79b2f1 JX |
17239 | msgid "" |
17240 | "y - stage this hunk\n" | |
17241 | "n - do not stage this hunk\n" | |
17242 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
17243 | "a - stage this hunk and all later hunks in the file\n" | |
17244 | "d - do not stage this hunk or any of the later hunks in the file" | |
17245 | msgstr "" | |
17246 | "y - 暂存该块\n" | |
17247 | "n - 不要暂存该块\n" | |
17248 | "q - 退出。不暂存该块及后面的全部块\n" | |
17249 | "a - 暂存该块和本文件中后面的全部块\n" | |
17250 | "d - 不暂存该块和本文件中后面的全部块" | |
17251 | ||
fd8cb379 | 17252 | #: git-add--interactive.perl:1228 |
1a79b2f1 JX |
17253 | msgid "" |
17254 | "y - stash this hunk\n" | |
17255 | "n - do not stash this hunk\n" | |
17256 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
17257 | "a - stash this hunk and all later hunks in the file\n" | |
17258 | "d - do not stash this hunk or any of the later hunks in the file" | |
17259 | msgstr "" | |
17260 | "y - 贮藏该块\n" | |
17261 | "n - 不要贮藏该块\n" | |
17262 | "q - 退出。不贮藏该块及后面的全部块\n" | |
17263 | "a - 贮藏该块和本文件中后面的全部块\n" | |
17264 | "d - 不贮藏该块和本文件中后面的全部块" | |
17265 | ||
fd8cb379 | 17266 | #: git-add--interactive.perl:1234 |
1a79b2f1 JX |
17267 | msgid "" |
17268 | "y - unstage this hunk\n" | |
17269 | "n - do not unstage this hunk\n" | |
17270 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
17271 | "a - unstage this hunk and all later hunks in the file\n" | |
17272 | "d - do not unstage this hunk or any of the later hunks in the file" | |
17273 | msgstr "" | |
17274 | "y - 不暂存该块\n" | |
17275 | "n - 不要不暂存该块\n" | |
17276 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
17277 | "a - 不暂存该块和本文件中后面的全部块\n" | |
17278 | "d - 不要不暂存该块和本文件中后面的全部块" | |
17279 | ||
fd8cb379 | 17280 | #: git-add--interactive.perl:1240 |
1a79b2f1 JX |
17281 | msgid "" |
17282 | "y - apply this hunk to index\n" | |
17283 | "n - do not apply this hunk to index\n" | |
17284 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
17285 | "a - apply this hunk and all later hunks in the file\n" | |
17286 | "d - do not apply this hunk or any of the later hunks in the file" | |
17287 | msgstr "" | |
17288 | "y - 在索引中应用该块\n" | |
17289 | "n - 不要在索引中应用该块\n" | |
17290 | "q - 退出。不要应用该块及后面的全部块\n" | |
17291 | "a - 应用该块和本文件中后面的全部块\n" | |
17292 | "d - 不要应用该块和本文件中后面的全部块" | |
17293 | ||
fd8cb379 | 17294 | #: git-add--interactive.perl:1246 |
1a79b2f1 JX |
17295 | msgid "" |
17296 | "y - discard this hunk from worktree\n" | |
17297 | "n - do not discard this hunk from worktree\n" | |
17298 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
17299 | "a - discard this hunk and all later hunks in the file\n" | |
17300 | "d - do not discard this hunk or any of the later hunks in the file" | |
17301 | msgstr "" | |
17302 | "y - 在工作区中丢弃该块\n" | |
17303 | "n - 不要在工作区中丢弃该块\n" | |
17304 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
17305 | "a - 丢弃该块和本文件中后面的全部块\n" | |
17306 | "d - 不要丢弃该块和本文件中后面的全部块" | |
17307 | ||
fd8cb379 | 17308 | #: git-add--interactive.perl:1252 |
1a79b2f1 JX |
17309 | msgid "" |
17310 | "y - discard this hunk from index and worktree\n" | |
17311 | "n - do not discard this hunk from index and worktree\n" | |
17312 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
17313 | "a - discard this hunk and all later hunks in the file\n" | |
17314 | "d - do not discard this hunk or any of the later hunks in the file" | |
17315 | msgstr "" | |
17316 | "y - 在索引和工作区中丢弃该块\n" | |
17317 | "n - 不要在索引和工作区中丢弃该块\n" | |
17318 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
17319 | "a - 丢弃该块和本文件中后面的全部块\n" | |
17320 | "d - 不要丢弃该块和本文件中后面的全部块" | |
17321 | ||
fd8cb379 | 17322 | #: git-add--interactive.perl:1258 |
1a79b2f1 JX |
17323 | msgid "" |
17324 | "y - apply this hunk to index and worktree\n" | |
17325 | "n - do not apply this hunk to index and worktree\n" | |
17326 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
17327 | "a - apply this hunk and all later hunks in the file\n" | |
17328 | "d - do not apply this hunk or any of the later hunks in the file" | |
17329 | msgstr "" | |
17330 | "y - 在索引和工作区中应用该块\n" | |
17331 | "n - 不要在索引和工作区中应用该块\n" | |
17332 | "q - 退出。不要应用该块及后面的全部块\n" | |
17333 | "a - 应用该块和本文件中后面的全部块\n" | |
17334 | "d - 不要应用该块和本文件中后面的全部块" | |
17335 | ||
fd8cb379 | 17336 | #: git-add--interactive.perl:1273 |
1a79b2f1 JX |
17337 | msgid "" |
17338 | "g - select a hunk to go to\n" | |
17339 | "/ - search for a hunk matching the given regex\n" | |
17340 | "j - leave this hunk undecided, see next undecided hunk\n" | |
17341 | "J - leave this hunk undecided, see next hunk\n" | |
17342 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
17343 | "K - leave this hunk undecided, see previous hunk\n" | |
17344 | "s - split the current hunk into smaller hunks\n" | |
17345 | "e - manually edit the current hunk\n" | |
17346 | "? - print help\n" | |
17347 | msgstr "" | |
17348 | "g - 选择跳转到一个块\n" | |
17349 | "/ - 查找和给定正则表达式匹配的块\n" | |
17350 | "j - 维持该块未决状态,查看下一个未决块\n" | |
17351 | "J - 维持该块未决状态,查看下一个块\n" | |
17352 | "k - 维持该块未决状态,查看上一个未决块\n" | |
17353 | "K - 维持该块未决状态,查看上一个块\n" | |
17354 | "s - 拆分当前块为更小的块\n" | |
17355 | "e - 手动编辑当前块\n" | |
17356 | "? - 显示帮助\n" | |
17357 | ||
fd8cb379 | 17358 | #: git-add--interactive.perl:1304 |
1a79b2f1 JX |
17359 | msgid "The selected hunks do not apply to the index!\n" |
17360 | msgstr "选中的块不能应用到索引!\n" | |
17361 | ||
fd8cb379 | 17362 | #: git-add--interactive.perl:1305 |
1a79b2f1 JX |
17363 | msgid "Apply them to the worktree anyway? " |
17364 | msgstr "无论如何都要应用到工作区么?" | |
17365 | ||
fd8cb379 | 17366 | #: git-add--interactive.perl:1308 |
1a79b2f1 JX |
17367 | msgid "Nothing was applied.\n" |
17368 | msgstr "未应用。\n" | |
17369 | ||
fd8cb379 | 17370 | #: git-add--interactive.perl:1319 |
1a79b2f1 JX |
17371 | #, perl-format |
17372 | msgid "ignoring unmerged: %s\n" | |
17373 | msgstr "忽略未合入的:%s\n" | |
17374 | ||
fd8cb379 | 17375 | #: git-add--interactive.perl:1328 |
1a79b2f1 JX |
17376 | msgid "Only binary files changed.\n" |
17377 | msgstr "只有二进制文件被修改。\n" | |
17378 | ||
fd8cb379 | 17379 | #: git-add--interactive.perl:1330 |
1a79b2f1 JX |
17380 | msgid "No changes.\n" |
17381 | msgstr "没有修改。\n" | |
17382 | ||
fd8cb379 | 17383 | #: git-add--interactive.perl:1338 |
1a79b2f1 JX |
17384 | msgid "Patch update" |
17385 | msgstr "补丁更新" | |
17386 | ||
fd8cb379 | 17387 | #: git-add--interactive.perl:1390 |
1a79b2f1 | 17388 | #, perl-format |
31e5e17b JX |
17389 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
17390 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17391 | |
fd8cb379 | 17392 | #: git-add--interactive.perl:1391 |
1a79b2f1 | 17393 | #, perl-format |
31e5e17b JX |
17394 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
17395 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17396 | |
fd8cb379 | 17397 | #: git-add--interactive.perl:1392 |
1a79b2f1 | 17398 | #, perl-format |
31e5e17b JX |
17399 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
17400 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17401 | |
fd8cb379 | 17402 | #: git-add--interactive.perl:1395 |
1a79b2f1 | 17403 | #, perl-format |
31e5e17b JX |
17404 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
17405 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17406 | |
fd8cb379 | 17407 | #: git-add--interactive.perl:1396 |
1a79b2f1 | 17408 | #, perl-format |
31e5e17b JX |
17409 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
17410 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17411 | |
fd8cb379 | 17412 | #: git-add--interactive.perl:1397 |
1a79b2f1 | 17413 | #, perl-format |
31e5e17b JX |
17414 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
17415 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17416 | |
fd8cb379 | 17417 | #: git-add--interactive.perl:1400 |
1a79b2f1 | 17418 | #, perl-format |
31e5e17b JX |
17419 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
17420 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17421 | |
fd8cb379 | 17422 | #: git-add--interactive.perl:1401 |
1a79b2f1 | 17423 | #, perl-format |
31e5e17b JX |
17424 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
17425 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17426 | |
fd8cb379 | 17427 | #: git-add--interactive.perl:1402 |
1a79b2f1 | 17428 | #, perl-format |
31e5e17b JX |
17429 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
17430 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17431 | |
fd8cb379 | 17432 | #: git-add--interactive.perl:1405 |
1a79b2f1 | 17433 | #, perl-format |
31e5e17b JX |
17434 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
17435 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17436 | |
fd8cb379 | 17437 | #: git-add--interactive.perl:1406 |
1a79b2f1 | 17438 | #, perl-format |
31e5e17b JX |
17439 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
17440 | msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17441 | |
fd8cb379 | 17442 | #: git-add--interactive.perl:1407 |
1a79b2f1 | 17443 | #, perl-format |
31e5e17b | 17444 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
610f8099 | 17445 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 17446 | |
fd8cb379 | 17447 | #: git-add--interactive.perl:1410 |
1a79b2f1 | 17448 | #, perl-format |
31e5e17b JX |
17449 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
17450 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17451 | |
fd8cb379 | 17452 | #: git-add--interactive.perl:1411 |
1a79b2f1 | 17453 | #, perl-format |
31e5e17b JX |
17454 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
17455 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17456 | |
fd8cb379 | 17457 | #: git-add--interactive.perl:1412 |
1a79b2f1 | 17458 | #, perl-format |
31e5e17b JX |
17459 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
17460 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17461 | |
fd8cb379 | 17462 | #: git-add--interactive.perl:1415 |
1a79b2f1 | 17463 | #, perl-format |
31e5e17b JX |
17464 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
17465 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17466 | |
fd8cb379 | 17467 | #: git-add--interactive.perl:1416 |
1a79b2f1 | 17468 | #, perl-format |
31e5e17b JX |
17469 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
17470 | msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17471 | |
fd8cb379 | 17472 | #: git-add--interactive.perl:1417 |
1a79b2f1 | 17473 | #, perl-format |
31e5e17b JX |
17474 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
17475 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17476 | |
fd8cb379 | 17477 | #: git-add--interactive.perl:1420 |
1a79b2f1 | 17478 | #, perl-format |
31e5e17b JX |
17479 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
17480 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17481 | |
fd8cb379 | 17482 | #: git-add--interactive.perl:1421 |
1a79b2f1 | 17483 | #, perl-format |
31e5e17b JX |
17484 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
17485 | msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 17486 | |
fd8cb379 | 17487 | #: git-add--interactive.perl:1422 |
1a79b2f1 | 17488 | #, perl-format |
31e5e17b JX |
17489 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
17490 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
17491 | ||
fd8cb379 | 17492 | #: git-add--interactive.perl:1522 |
31e5e17b JX |
17493 | msgid "No other hunks to goto\n" |
17494 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 17495 | |
fd8cb379 | 17496 | #: git-add--interactive.perl:1529 |
1a79b2f1 JX |
17497 | msgid "go to which hunk (<ret> to see more)? " |
17498 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
17499 | ||
fd8cb379 | 17500 | #: git-add--interactive.perl:1531 |
1a79b2f1 JX |
17501 | msgid "go to which hunk? " |
17502 | msgstr "跳转到哪个块?" | |
17503 | ||
fd8cb379 | 17504 | #: git-add--interactive.perl:1540 |
1a79b2f1 JX |
17505 | #, perl-format |
17506 | msgid "Invalid number: '%s'\n" | |
17507 | msgstr "无效数字:'%s'\n" | |
17508 | ||
fd8cb379 | 17509 | #: git-add--interactive.perl:1545 |
1a79b2f1 JX |
17510 | #, perl-format |
17511 | msgid "Sorry, only %d hunk available.\n" | |
17512 | msgid_plural "Sorry, only %d hunks available.\n" | |
17513 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
17514 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
17515 | ||
fd8cb379 | 17516 | #: git-add--interactive.perl:1571 |
31e5e17b JX |
17517 | msgid "No other hunks to search\n" |
17518 | msgstr "没有其它可供查找的块\n" | |
17519 | ||
fd8cb379 | 17520 | #: git-add--interactive.perl:1575 |
1a79b2f1 JX |
17521 | msgid "search for regex? " |
17522 | msgstr "使用正则表达式搜索?" | |
17523 | ||
fd8cb379 | 17524 | #: git-add--interactive.perl:1588 |
1a79b2f1 JX |
17525 | #, perl-format |
17526 | msgid "Malformed search regexp %s: %s\n" | |
17527 | msgstr "错误的正则表达式 %s:%s\n" | |
17528 | ||
fd8cb379 | 17529 | #: git-add--interactive.perl:1598 |
1a79b2f1 JX |
17530 | msgid "No hunk matches the given pattern\n" |
17531 | msgstr "没有和给定模式相匹配的快\n" | |
17532 | ||
fd8cb379 | 17533 | #: git-add--interactive.perl:1610 git-add--interactive.perl:1632 |
1a79b2f1 JX |
17534 | msgid "No previous hunk\n" |
17535 | msgstr "没有前一个块\n" | |
17536 | ||
fd8cb379 | 17537 | #: git-add--interactive.perl:1619 git-add--interactive.perl:1638 |
1a79b2f1 JX |
17538 | msgid "No next hunk\n" |
17539 | msgstr "没有下一个块\n" | |
17540 | ||
fd8cb379 | 17541 | #: git-add--interactive.perl:1644 |
31e5e17b JX |
17542 | msgid "Sorry, cannot split this hunk\n" |
17543 | msgstr "对不起,不能拆分这个块\n" | |
17544 | ||
fd8cb379 | 17545 | #: git-add--interactive.perl:1650 |
1a79b2f1 JX |
17546 | #, perl-format |
17547 | msgid "Split into %d hunk.\n" | |
17548 | msgid_plural "Split into %d hunks.\n" | |
17549 | msgstr[0] "拆分为 %d 块。\n" | |
17550 | msgstr[1] "拆分为 %d 块。\n" | |
17551 | ||
fd8cb379 | 17552 | #: git-add--interactive.perl:1660 |
31e5e17b JX |
17553 | msgid "Sorry, cannot edit this hunk\n" |
17554 | msgstr "对不起,不能编辑这个块\n" | |
17555 | ||
fd8cb379 | 17556 | #: git-add--interactive.perl:1706 |
1a79b2f1 JX |
17557 | msgid "Review diff" |
17558 | msgstr "检视 diff" | |
17559 | ||
17560 | #. TRANSLATORS: please do not translate the command names | |
17561 | #. 'status', 'update', 'revert', etc. | |
fd8cb379 | 17562 | #: git-add--interactive.perl:1725 |
1a79b2f1 JX |
17563 | msgid "" |
17564 | "status - show paths with changes\n" | |
17565 | "update - add working tree state to the staged set of changes\n" | |
17566 | "revert - revert staged set of changes back to the HEAD version\n" | |
17567 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 17568 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
17569 | "add untracked - add contents of untracked files to the staged set of " |
17570 | "changes\n" | |
17571 | msgstr "" | |
17572 | "status - 显示含变更的路径\n" | |
17573 | "update - 添加工作区状态至暂存列表\n" | |
17574 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
17575 | "patch - 挑选块并且有选择地更新\n" | |
17576 | "diff - 显示 HEAD 和索引间差异\n" | |
17577 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
17578 | ||
fd8cb379 JX |
17579 | #: git-add--interactive.perl:1742 git-add--interactive.perl:1747 |
17580 | #: git-add--interactive.perl:1750 git-add--interactive.perl:1757 | |
17581 | #: git-add--interactive.perl:1761 git-add--interactive.perl:1767 | |
1a79b2f1 JX |
17582 | msgid "missing --" |
17583 | msgstr "缺失 --" | |
17584 | ||
fd8cb379 | 17585 | #: git-add--interactive.perl:1763 |
1a79b2f1 JX |
17586 | #, perl-format |
17587 | msgid "unknown --patch mode: %s" | |
17588 | msgstr "未知的 --patch 模式:%s" | |
17589 | ||
fd8cb379 | 17590 | #: git-add--interactive.perl:1769 git-add--interactive.perl:1775 |
1a79b2f1 JX |
17591 | #, perl-format |
17592 | msgid "invalid argument %s, expecting --" | |
17593 | msgstr "无效的参数 %s,期望是 --" | |
17594 | ||
31e5e17b | 17595 | #: git-send-email.perl:130 |
1a79b2f1 JX |
17596 | msgid "local zone differs from GMT by a non-minute interval\n" |
17597 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
17598 | ||
31e5e17b | 17599 | #: git-send-email.perl:137 git-send-email.perl:143 |
1a79b2f1 JX |
17600 | msgid "local time offset greater than or equal to 24 hours\n" |
17601 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
17602 | ||
31e5e17b | 17603 | #: git-send-email.perl:211 git-send-email.perl:217 |
1a79b2f1 JX |
17604 | msgid "the editor exited uncleanly, aborting everything" |
17605 | msgstr "编辑器非正常退出,终止所有操作" | |
17606 | ||
31e5e17b | 17607 | #: git-send-email.perl:294 |
1a79b2f1 JX |
17608 | #, perl-format |
17609 | msgid "" | |
17610 | "'%s' contains an intermediate version of the email you were composing.\n" | |
17611 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
17612 | ||
31e5e17b | 17613 | #: git-send-email.perl:299 |
1a79b2f1 JX |
17614 | #, perl-format |
17615 | msgid "'%s.final' contains the composed email.\n" | |
17616 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
17617 | ||
31e5e17b | 17618 | #: git-send-email.perl:317 |
1a79b2f1 JX |
17619 | msgid "--dump-aliases incompatible with other options\n" |
17620 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
17621 | ||
31e5e17b | 17622 | #: git-send-email.perl:383 git-send-email.perl:638 |
1a79b2f1 JX |
17623 | msgid "Cannot run git format-patch from outside a repository\n" |
17624 | msgstr "不能在仓库之外运行 git format-patch\n" | |
17625 | ||
31e5e17b JX |
17626 | #: git-send-email.perl:386 |
17627 | msgid "" | |
17628 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
17629 | "configuration option)\n" | |
17630 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
17631 | ||
17632 | #: git-send-email.perl:456 | |
1a79b2f1 JX |
17633 | #, perl-format |
17634 | msgid "Unknown --suppress-cc field: '%s'\n" | |
17635 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
17636 | ||
31e5e17b | 17637 | #: git-send-email.perl:485 |
1a79b2f1 JX |
17638 | #, perl-format |
17639 | msgid "Unknown --confirm setting: '%s'\n" | |
17640 | msgstr "未知的 --confirm 设置:'%s'\n" | |
17641 | ||
31e5e17b | 17642 | #: git-send-email.perl:513 |
1a79b2f1 JX |
17643 | #, perl-format |
17644 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
17645 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
17646 | ||
31e5e17b | 17647 | #: git-send-email.perl:515 |
1a79b2f1 JX |
17648 | #, perl-format |
17649 | msgid "warning: `:include:` not supported: %s\n" | |
17650 | msgstr "警告:不支持 `:include:`:%s\n" | |
17651 | ||
31e5e17b | 17652 | #: git-send-email.perl:517 |
1a79b2f1 JX |
17653 | #, perl-format |
17654 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
17655 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
17656 | ||
31e5e17b | 17657 | #: git-send-email.perl:522 |
1a79b2f1 JX |
17658 | #, perl-format |
17659 | msgid "warning: sendmail line is not recognized: %s\n" | |
17660 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
17661 | ||
31e5e17b | 17662 | #: git-send-email.perl:604 |
1a79b2f1 JX |
17663 | #, perl-format |
17664 | msgid "" | |
17665 | "File '%s' exists but it could also be the range of commits\n" | |
17666 | "to produce patches for. Please disambiguate by...\n" | |
17667 | "\n" | |
17668 | " * Saying \"./%s\" if you mean a file; or\n" | |
17669 | " * Giving --format-patch option if you mean a range.\n" | |
17670 | msgstr "" | |
87cb7997 JX |
17671 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
17672 | "歧义:\n" | |
1a79b2f1 JX |
17673 | "\n" |
17674 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
17675 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
17676 | ||
31e5e17b | 17677 | #: git-send-email.perl:625 |
1a79b2f1 JX |
17678 | #, perl-format |
17679 | msgid "Failed to opendir %s: %s" | |
17680 | msgstr "无法打开目录 %s: %s" | |
17681 | ||
31e5e17b | 17682 | #: git-send-email.perl:649 |
1a79b2f1 JX |
17683 | #, perl-format |
17684 | msgid "" | |
17685 | "fatal: %s: %s\n" | |
17686 | "warning: no patches were sent\n" | |
17687 | msgstr "" | |
17688 | "严重:%s:%s\n" | |
17689 | "警告:补丁未能发送\n" | |
17690 | ||
31e5e17b | 17691 | #: git-send-email.perl:660 |
1a79b2f1 JX |
17692 | msgid "" |
17693 | "\n" | |
17694 | "No patch files specified!\n" | |
17695 | "\n" | |
87cb7997 JX |
17696 | msgstr "" |
17697 | "\n" | |
17698 | "未指定补丁文件!\n" | |
17699 | "\n" | |
1a79b2f1 | 17700 | |
31e5e17b | 17701 | #: git-send-email.perl:673 |
1a79b2f1 JX |
17702 | #, perl-format |
17703 | msgid "No subject line in %s?" | |
17704 | msgstr "在 %s 中没有标题行?" | |
17705 | ||
31e5e17b | 17706 | #: git-send-email.perl:683 |
1a79b2f1 JX |
17707 | #, perl-format |
17708 | msgid "Failed to open for writing %s: %s" | |
17709 | msgstr "无法写入 %s: %s" | |
17710 | ||
31e5e17b | 17711 | #: git-send-email.perl:694 |
1a79b2f1 JX |
17712 | msgid "" |
17713 | "Lines beginning in \"GIT:\" will be removed.\n" | |
17714 | "Consider including an overall diffstat or table of contents\n" | |
17715 | "for the patch you are writing.\n" | |
17716 | "\n" | |
17717 | "Clear the body content if you don't wish to send a summary.\n" | |
17718 | msgstr "" | |
17719 | "以 \"GIT:\" 开头的行将被删除。\n" | |
17720 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" | |
17721 | "\n" | |
17722 | "如果您不想发送摘要,清除内容。\n" | |
17723 | ||
31e5e17b | 17724 | #: git-send-email.perl:718 |
1a79b2f1 JX |
17725 | #, perl-format |
17726 | msgid "Failed to open %s: %s" | |
17727 | msgstr "无法打开 %s: %s" | |
17728 | ||
31e5e17b JX |
17729 | #: git-send-email.perl:735 |
17730 | #, perl-format | |
17731 | msgid "Failed to open %s.final: %s" | |
17732 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 17733 | |
31e5e17b | 17734 | #: git-send-email.perl:778 |
1a79b2f1 JX |
17735 | msgid "Summary email is empty, skipping it\n" |
17736 | msgstr "摘要邮件为空,跳过\n" | |
17737 | ||
17738 | #. TRANSLATORS: please keep [y/N] as is. | |
31e5e17b | 17739 | #: git-send-email.perl:813 |
1a79b2f1 JX |
17740 | #, perl-format |
17741 | msgid "Are you sure you want to use <%s> [y/N]? " | |
17742 | msgstr "您确认要使用 <%s> [y/N]?" | |
17743 | ||
31e5e17b | 17744 | #: git-send-email.perl:868 |
1a79b2f1 JX |
17745 | msgid "" |
17746 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
17747 | "Encoding.\n" | |
17748 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
17749 | ||
31e5e17b | 17750 | #: git-send-email.perl:873 |
1a79b2f1 JX |
17751 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
17752 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
17753 | ||
31e5e17b | 17754 | #: git-send-email.perl:881 |
1a79b2f1 JX |
17755 | #, perl-format |
17756 | msgid "" | |
17757 | "Refusing to send because the patch\n" | |
17758 | "\t%s\n" | |
17759 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
17760 | "want to send.\n" | |
17761 | msgstr "" | |
17762 | "拒绝发送,因为补丁\n" | |
17763 | "\t%s\n" | |
17764 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
17765 | ||
31e5e17b | 17766 | #: git-send-email.perl:900 |
1a79b2f1 JX |
17767 | msgid "To whom should the emails be sent (if anyone)?" |
17768 | msgstr "邮件将要发送给谁?" | |
17769 | ||
31e5e17b | 17770 | #: git-send-email.perl:918 |
1a79b2f1 JX |
17771 | #, perl-format |
17772 | msgid "fatal: alias '%s' expands to itself\n" | |
17773 | msgstr "严重:别名 '%s' 扩展为它自己\n" | |
17774 | ||
31e5e17b | 17775 | #: git-send-email.perl:930 |
1a79b2f1 JX |
17776 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
17777 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
17778 | ||
31e5e17b | 17779 | #: git-send-email.perl:988 git-send-email.perl:996 |
1a79b2f1 JX |
17780 | #, perl-format |
17781 | msgid "error: unable to extract a valid address from: %s\n" | |
17782 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
17783 | ||
17784 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
17785 | #. translation. The program will only accept English input | |
17786 | #. at this point. | |
31e5e17b | 17787 | #: git-send-email.perl:1000 |
1a79b2f1 JX |
17788 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
17789 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
17790 | ||
31e5e17b | 17791 | #: git-send-email.perl:1317 |
1a79b2f1 JX |
17792 | #, perl-format |
17793 | msgid "CA path \"%s\" does not exist" | |
17794 | msgstr "CA 路径 \"%s\" 不存在" | |
17795 | ||
fd8cb379 | 17796 | #: git-send-email.perl:1400 |
1a79b2f1 JX |
17797 | msgid "" |
17798 | " The Cc list above has been expanded by additional\n" | |
17799 | " addresses found in the patch commit message. By default\n" | |
17800 | " send-email prompts before sending whenever this occurs.\n" | |
17801 | " This behavior is controlled by the sendemail.confirm\n" | |
17802 | " configuration setting.\n" | |
17803 | "\n" | |
17804 | " For additional information, run 'git send-email --help'.\n" | |
17805 | " To retain the current behavior, but squelch this message,\n" | |
17806 | " run 'git config --global sendemail.confirm auto'.\n" | |
17807 | "\n" | |
17808 | msgstr "" | |
17809 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
17810 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
17811 | " sendemail.confirm 配置设置。\n" | |
17812 | "\n" | |
17813 | " 更多信息,执行 'git send-email --help'。\n" | |
17814 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
17815 | " sendemail.confirm auto'。\n" | |
17816 | "\n" | |
17817 | ||
fd8cb379 | 17818 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
17819 | #. translation. The program will only accept English input |
17820 | #. at this point. | |
fd8cb379 JX |
17821 | #: git-send-email.perl:1415 |
17822 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
17823 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 17824 | |
fd8cb379 | 17825 | #: git-send-email.perl:1418 |
1a79b2f1 JX |
17826 | msgid "Send this email reply required" |
17827 | msgstr "发送要求的邮件回复" | |
17828 | ||
fd8cb379 | 17829 | #: git-send-email.perl:1446 |
1a79b2f1 JX |
17830 | msgid "The required SMTP server is not properly defined." |
17831 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
17832 | ||
fd8cb379 | 17833 | #: git-send-email.perl:1493 |
1a79b2f1 JX |
17834 | #, perl-format |
17835 | msgid "Server does not support STARTTLS! %s" | |
17836 | msgstr "服务器不支持 STARTTLS!%s" | |
17837 | ||
fd8cb379 | 17838 | #: git-send-email.perl:1498 git-send-email.perl:1502 |
a4f16749 JX |
17839 | #, perl-format |
17840 | msgid "STARTTLS failed! %s" | |
17841 | msgstr "STARTTLS 失败!%s" | |
17842 | ||
fd8cb379 | 17843 | #: git-send-email.perl:1512 |
1a79b2f1 JX |
17844 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
17845 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
17846 | ||
fd8cb379 | 17847 | #: git-send-email.perl:1530 |
1a79b2f1 JX |
17848 | #, perl-format |
17849 | msgid "Failed to send %s\n" | |
17850 | msgstr "无法发送 %s\n" | |
17851 | ||
fd8cb379 | 17852 | #: git-send-email.perl:1533 |
1a79b2f1 JX |
17853 | #, perl-format |
17854 | msgid "Dry-Sent %s\n" | |
17855 | msgstr "演习发送 %s\n" | |
17856 | ||
fd8cb379 | 17857 | #: git-send-email.perl:1533 |
1a79b2f1 JX |
17858 | #, perl-format |
17859 | msgid "Sent %s\n" | |
17860 | msgstr "正发送 %s\n" | |
17861 | ||
fd8cb379 | 17862 | #: git-send-email.perl:1535 |
1a79b2f1 JX |
17863 | msgid "Dry-OK. Log says:\n" |
17864 | msgstr "演习成功。日志说:\n" | |
17865 | ||
fd8cb379 | 17866 | #: git-send-email.perl:1535 |
1a79b2f1 JX |
17867 | msgid "OK. Log says:\n" |
17868 | msgstr "OK。日志说:\n" | |
17869 | ||
fd8cb379 | 17870 | #: git-send-email.perl:1547 |
1a79b2f1 JX |
17871 | msgid "Result: " |
17872 | msgstr "结果:" | |
17873 | ||
fd8cb379 | 17874 | #: git-send-email.perl:1550 |
1a79b2f1 JX |
17875 | msgid "Result: OK\n" |
17876 | msgstr "结果:OK\n" | |
17877 | ||
fd8cb379 | 17878 | #: git-send-email.perl:1568 |
1a79b2f1 JX |
17879 | #, perl-format |
17880 | msgid "can't open file %s" | |
17881 | msgstr "无法打开文件 %s" | |
17882 | ||
fd8cb379 | 17883 | #: git-send-email.perl:1615 git-send-email.perl:1635 |
1a79b2f1 JX |
17884 | #, perl-format |
17885 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
17886 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
17887 | ||
fd8cb379 | 17888 | #: git-send-email.perl:1621 |
1a79b2f1 JX |
17889 | #, perl-format |
17890 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
17891 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
17892 | ||
fd8cb379 | 17893 | #: git-send-email.perl:1674 |
1a79b2f1 JX |
17894 | #, perl-format |
17895 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
17896 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
17897 | ||
fd8cb379 | 17898 | #: git-send-email.perl:1699 |
1a79b2f1 JX |
17899 | #, perl-format |
17900 | msgid "(body) Adding cc: %s from line '%s'\n" | |
17901 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
17902 | ||
fd8cb379 | 17903 | #: git-send-email.perl:1817 |
1a79b2f1 JX |
17904 | #, perl-format |
17905 | msgid "(%s) Could not execute '%s'" | |
17906 | msgstr "(%s) 不能执行 '%s'" | |
17907 | ||
fd8cb379 | 17908 | #: git-send-email.perl:1824 |
1a79b2f1 JX |
17909 | #, perl-format |
17910 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
17911 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
17912 | ||
fd8cb379 | 17913 | #: git-send-email.perl:1828 |
1a79b2f1 JX |
17914 | #, perl-format |
17915 | msgid "(%s) failed to close pipe to '%s'" | |
17916 | msgstr "(%s) 无法关闭管道至 '%s'" | |
17917 | ||
fd8cb379 | 17918 | #: git-send-email.perl:1855 |
1a79b2f1 JX |
17919 | msgid "cannot send message as 7bit" |
17920 | msgstr "不能以 7bit 形式发送信息" | |
17921 | ||
fd8cb379 | 17922 | #: git-send-email.perl:1863 |
1a79b2f1 JX |
17923 | msgid "invalid transfer encoding" |
17924 | msgstr "无效的传送编码" | |
17925 | ||
fd8cb379 | 17926 | #: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 |
1a79b2f1 JX |
17927 | #, perl-format |
17928 | msgid "unable to open %s: %s\n" | |
17929 | msgstr "不能打开 %s:%s\n" | |
17930 | ||
fd8cb379 | 17931 | #: git-send-email.perl:1904 |
1a79b2f1 JX |
17932 | #, perl-format |
17933 | msgid "%s: patch contains a line longer than 998 characters" | |
17934 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
17935 | ||
fd8cb379 | 17936 | #: git-send-email.perl:1920 |
1a79b2f1 JX |
17937 | #, perl-format |
17938 | msgid "Skipping %s with backup suffix '%s'.\n" | |
17939 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
17940 | ||
17941 | #. TRANSLATORS: please keep "[y|N]" as is. | |
fd8cb379 | 17942 | #: git-send-email.perl:1924 |
1a79b2f1 JX |
17943 | #, perl-format |
17944 | msgid "Do you really want to send %s? [y|N]: " | |
17945 | msgstr "您真的要发送 %s?[y|N]:" | |
5809aa05 | 17946 | |
fd8cb379 JX |
17947 | #~ msgid "Everyday Git With 20 Commands Or So" |
17948 | #~ msgstr "每一天 Git 常用的约 20 条命令" | |
17949 | ||
17950 | #~ msgid "Could not open '%s' for writing" | |
17951 | #~ msgstr "无法打开 '%s' 进行写入" | |
17952 | ||
17953 | #~ msgid "BUG: returned path string doesn't match cwd?" | |
17954 | #~ msgstr "BUG:返回的路径和当前路径不匹配?" | |
17955 | ||
17956 | #~ msgid "Error in object" | |
17957 | #~ msgstr "对象中出错" | |
17958 | ||
17959 | #~ msgid "" | |
17960 | #~ "unexpected 1st line of squash message:\n" | |
17961 | #~ "\n" | |
17962 | #~ "\t%.*s" | |
17963 | #~ msgstr "" | |
17964 | #~ "意外的压缩提交首行提交信息:\n" | |
17965 | #~ "\n" | |
17966 | #~ "\t%.*s" | |
17967 | ||
17968 | #~ msgid "" | |
17969 | #~ "invalid 1st line of squash message:\n" | |
17970 | #~ "\n" | |
17971 | #~ "\t%.*s" | |
17972 | #~ msgstr "" | |
17973 | #~ "压缩提交的首行提交信息无效:\n" | |
17974 | #~ "\n" | |
17975 | #~ "\t%.*s" | |
17976 | ||
31e5e17b JX |
17977 | #~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" |
17978 | #~ msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n" | |
17979 | ||
17980 | #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" | |
17981 | #~ msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF" | |
17982 | ||
17983 | #~ msgid "The copy of the patch that failed is found in: %s" | |
17984 | #~ msgstr "失败的补丁文件副本位于:%s" | |
17985 | ||
17986 | #~ msgid "invalid filter-spec expression '%s'" | |
17987 | #~ msgstr "无效的 filter-spec 表达式 '%s'" | |
17988 | ||
17989 | #~ msgid "pathspec and --all are incompatible" | |
17990 | #~ msgstr "pathspec 和 --all 不兼容" | |
17991 | ||
17992 | #~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" | |
17993 | #~ msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
17994 | ||
5809aa05 JX |
17995 | #~ msgid "" |
17996 | #~ "empty strings as pathspecs will be made invalid in upcoming releases. " | |
17997 | #~ "please use . instead if you meant to match all paths" | |
17998 | #~ msgstr "" | |
17999 | #~ "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路" | |
18000 | #~ "径,\n" | |
18001 | #~ "请代之以 ." | |
18002 | ||
18003 | #~ msgid "unable to open '%s' for writing" | |
18004 | #~ msgstr "无法以写入方式打开 '%s'" | |
18005 | ||
18006 | #~ msgid "could not truncate '%s'" | |
18007 | #~ msgstr "无法截断 '%s'" | |
18008 | ||
18009 | #~ msgid "could not finish '%s'" | |
18010 | #~ msgstr "无法结束 '%s'" | |
18011 | ||
18012 | #~ msgid "could not close %s" | |
18013 | #~ msgstr "不能关闭 %s" | |
18014 | ||
18015 | #~ msgid "Copied a misnamed branch '%s' away" | |
18016 | #~ msgstr "已将错误命名的分支 '%s' 复制" | |
18017 | ||
18018 | #~ msgid "it does not make sense to create 'HEAD' manually" | |
18019 | #~ msgstr "手工创建 'HEAD' 没有意义" | |
18020 | ||
18021 | #~ msgid "Don't know how to clone %s" | |
18022 | #~ msgstr "不知道如何克隆 %s" | |
18023 | ||
18024 | #~ msgid "show ignored files" | |
18025 | #~ msgstr "显示忽略的文件" | |
18026 | ||
18027 | #~ msgid "%s is not a valid '%s' object" | |
18028 | #~ msgstr "%s 不是一个有效的 '%s' 对象" | |
18029 | ||
18030 | #~ msgid "Don't know how to fetch from %s" | |
18031 | #~ msgstr "不知道如何从 %s 获取" | |
18032 | ||
18033 | #~ msgid "'$term' is not a valid term" | |
18034 | #~ msgstr "'$term' 不是一个有效的名称" | |
18035 | ||
18036 | #~ msgid "" | |
18037 | #~ "error: unknown option for 'stash save': $option\n" | |
18038 | #~ " To provide a message, use git stash save -- '$option'" | |
18039 | #~ msgstr "" | |
18040 | #~ "错误:'stash save' 的未知选项:$option\n" | |
18041 | #~ " 要提供一个描述信息,使用 git stash save -- '$option'" | |
18042 | ||
18043 | #~ msgid "Failed to recurse into submodule path '$sm_path'" | |
18044 | #~ msgstr "无法递归进子模组路径 '$sm_path'" |