]>
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 | 有向无环图 | |
e640d114 | 49 | # dangling object | 悬空对象 |
160fb2b2 JX |
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" | |
4c27fcb5 JX |
141 | "POT-Creation-Date: 2018-12-02 10:55+0800\n" |
142 | "PO-Revision-Date: 2018-12-03 18:08+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 | |
4c27fcb5 | 151 | #: advice.c:99 |
c04f5ac3 | 152 | #, c-format |
fd8cb379 JX |
153 | msgid "%shint: %.*s%s\n" |
154 | msgstr "%s提示:%.*s%s\n" | |
c04f5ac3 | 155 | |
4c27fcb5 | 156 | #: advice.c:152 |
5c57d762 JX |
157 | msgid "Cherry-picking is not possible because you have unmerged files." |
158 | msgstr "无法拣选,因为您有未合并的文件。" | |
159 | ||
4c27fcb5 | 160 | #: advice.c:154 |
5c57d762 JX |
161 | msgid "Committing is not possible because you have unmerged files." |
162 | msgstr "无法提交,因为您有未合并的文件。" | |
163 | ||
4c27fcb5 | 164 | #: advice.c:156 |
5c57d762 JX |
165 | msgid "Merging is not possible because you have unmerged files." |
166 | msgstr "无法合并,因为您有未合并的文件。" | |
167 | ||
4c27fcb5 | 168 | #: advice.c:158 |
5c57d762 JX |
169 | msgid "Pulling is not possible because you have unmerged files." |
170 | msgstr "无法拉取,因为您有未合并的文件。" | |
171 | ||
4c27fcb5 | 172 | #: advice.c:160 |
5c57d762 JX |
173 | msgid "Reverting is not possible because you have unmerged files." |
174 | msgstr "无法回退,因为您有未合并的文件。" | |
175 | ||
4c27fcb5 | 176 | #: advice.c:162 |
5c57d762 JX |
177 | #, c-format |
178 | msgid "It is not possible to %s because you have unmerged files." | |
179 | msgstr "无法 %s,因为您有未合并的文件。" | |
180 | ||
4c27fcb5 | 181 | #: advice.c:170 |
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 | |
4c27fcb5 | 189 | #: advice.c:178 |
5c57d762 JX |
190 | msgid "Exiting because of an unresolved conflict." |
191 | msgstr "因为存在未解决的冲突而退出。" | |
192 | ||
4c27fcb5 | 193 | #: advice.c:183 builtin/merge.c:1289 |
1b7f4a34 JX |
194 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
195 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
196 | ||
4c27fcb5 | 197 | #: advice.c:185 |
94550ed3 | 198 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
199 | msgstr "请在合并前先提交您的修改。" |
200 | ||
4c27fcb5 | 201 | #: advice.c:186 |
1b7f4a34 JX |
202 | msgid "Exiting because of unfinished merge." |
203 | msgstr "因为存在未完成的合并而退出。" | |
204 | ||
4c27fcb5 | 205 | #: advice.c:192 |
5c57d762 JX |
206 | #, c-format |
207 | msgid "" | |
208 | "Note: checking out '%s'.\n" | |
209 | "\n" | |
210 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
211 | "changes and commit them, and you can discard any commits you make in this\n" | |
212 | "state without impacting any branches by performing another checkout.\n" | |
213 | "\n" | |
214 | "If you want to create a new branch to retain commits you create, you may\n" | |
215 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
216 | "\n" | |
217 | " git checkout -b <new-branch-name>\n" | |
218 | "\n" | |
219 | msgstr "" | |
220 | "注意:正在检出 '%s'。\n" | |
221 | "\n" | |
a0b6b246 JX |
222 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另" |
223 | "外\n" | |
5c57d762 JX |
224 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" |
225 | "\n" | |
226 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" | |
227 | "参数 -b 来实现(现在或稍后)。例如:\n" | |
228 | "\n" | |
58b6f078 | 229 | " git checkout -b <新分支名>\n" |
5c57d762 JX |
230 | "\n" |
231 | ||
c1ac5258 | 232 | #: apply.c:59 |
a0b6b246 JX |
233 | #, c-format |
234 | msgid "unrecognized whitespace option '%s'" | |
235 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 236 | |
c1ac5258 | 237 | #: apply.c:75 |
90314792 | 238 | #, c-format |
a0b6b246 JX |
239 | msgid "unrecognized whitespace ignore option '%s'" |
240 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 241 | |
c1ac5258 | 242 | #: apply.c:125 |
a0b6b246 | 243 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 244 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 245 | |
c1ac5258 | 246 | #: apply.c:127 |
a0b6b246 JX |
247 | msgid "--cached and --3way cannot be used together." |
248 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 249 | |
c1ac5258 | 250 | #: apply.c:130 |
a0b6b246 JX |
251 | msgid "--3way outside a repository" |
252 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 253 | |
c1ac5258 | 254 | #: apply.c:141 |
a0b6b246 JX |
255 | msgid "--index outside a repository" |
256 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 257 | |
c1ac5258 | 258 | #: apply.c:144 |
a0b6b246 JX |
259 | msgid "--cached outside a repository" |
260 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 261 | |
c1ac5258 | 262 | #: apply.c:826 |
a0b6b246 JX |
263 | #, c-format |
264 | msgid "Cannot prepare timestamp regexp %s" | |
265 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 266 | |
c1ac5258 | 267 | #: apply.c:835 |
a0b6b246 JX |
268 | #, c-format |
269 | msgid "regexec returned %d for input: %s" | |
270 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 271 | |
c1ac5258 | 272 | #: apply.c:909 |
a0b6b246 JX |
273 | #, c-format |
274 | msgid "unable to find filename in patch at line %d" | |
275 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 276 | |
c1ac5258 | 277 | #: apply.c:947 |
a0b6b246 JX |
278 | #, c-format |
279 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
280 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 281 | |
c1ac5258 | 282 | #: apply.c:953 |
a0b6b246 JX |
283 | #, c-format |
284 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
285 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 286 | |
c1ac5258 | 287 | #: apply.c:954 |
a0b6b246 JX |
288 | #, c-format |
289 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
290 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 291 | |
c1ac5258 | 292 | #: apply.c:959 |
a0b6b246 JX |
293 | #, c-format |
294 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
295 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 296 | |
c1ac5258 | 297 | #: apply.c:988 |
a4f16749 JX |
298 | #, c-format |
299 | msgid "invalid mode on line %d: %s" | |
300 | msgstr "第 %d 行包含无效文件模式:%s" | |
301 | ||
4c27fcb5 | 302 | #: apply.c:1307 |
a4f16749 JX |
303 | #, c-format |
304 | msgid "inconsistent header lines %d and %d" | |
305 | msgstr "不一致的文件头,%d 行和 %d 行" | |
306 | ||
4c27fcb5 | 307 | #: apply.c:1479 |
a0b6b246 JX |
308 | #, c-format |
309 | msgid "recount: unexpected line: %.*s" | |
310 | msgstr "recount:意外的行:%.*s" | |
ef317cd5 | 311 | |
4c27fcb5 | 312 | #: apply.c:1548 |
a0b6b246 JX |
313 | #, c-format |
314 | msgid "patch fragment without header at line %d: %.*s" | |
315 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
ef317cd5 | 316 | |
4c27fcb5 | 317 | #: apply.c:1568 |
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 | |
4c27fcb5 | 328 | #: apply.c:1581 |
a0b6b246 JX |
329 | #, c-format |
330 | msgid "git diff header lacks filename information (line %d)" | |
331 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 332 | |
4c27fcb5 | 333 | #: apply.c:1769 |
a0b6b246 JX |
334 | msgid "new file depends on old contents" |
335 | msgstr "新文件依赖旧内容" | |
5c57d762 | 336 | |
4c27fcb5 | 337 | #: apply.c:1771 |
a0b6b246 JX |
338 | msgid "deleted file still has contents" |
339 | msgstr "删除的文件仍有内容" | |
5c57d762 | 340 | |
4c27fcb5 | 341 | #: apply.c:1805 |
a0b6b246 JX |
342 | #, c-format |
343 | msgid "corrupt patch at line %d" | |
344 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 345 | |
4c27fcb5 | 346 | #: apply.c:1842 |
5c57d762 | 347 | #, c-format |
a0b6b246 JX |
348 | msgid "new file %s depends on old contents" |
349 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 350 | |
4c27fcb5 | 351 | #: apply.c:1844 |
5c57d762 | 352 | #, c-format |
a0b6b246 JX |
353 | msgid "deleted file %s still has contents" |
354 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 355 | |
4c27fcb5 | 356 | #: apply.c:1847 |
a0b6b246 JX |
357 | #, c-format |
358 | msgid "** warning: file %s becomes empty but is not deleted" | |
359 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 360 | |
4c27fcb5 | 361 | #: apply.c:1994 |
5c57d762 | 362 | #, c-format |
a0b6b246 JX |
363 | msgid "corrupt binary patch at line %d: %.*s" |
364 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 365 | |
4c27fcb5 | 366 | #: apply.c:2031 |
5c57d762 | 367 | #, c-format |
a0b6b246 JX |
368 | msgid "unrecognized binary patch at line %d" |
369 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 370 | |
4c27fcb5 | 371 | #: apply.c:2193 |
5c57d762 | 372 | #, c-format |
a0b6b246 JX |
373 | msgid "patch with only garbage at line %d" |
374 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 375 | |
4c27fcb5 | 376 | #: apply.c:2279 |
5c57d762 | 377 | #, c-format |
a0b6b246 JX |
378 | msgid "unable to read symlink %s" |
379 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 380 | |
4c27fcb5 | 381 | #: apply.c:2283 |
5c57d762 | 382 | #, c-format |
a0b6b246 JX |
383 | msgid "unable to open or read %s" |
384 | msgstr "不能打开或读取 %s" | |
5c57d762 | 385 | |
4c27fcb5 | 386 | #: apply.c:2942 |
5c57d762 | 387 | #, c-format |
a0b6b246 JX |
388 | msgid "invalid start of line: '%c'" |
389 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 390 | |
4c27fcb5 | 391 | #: apply.c:3063 |
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 | |
4c27fcb5 | 398 | #: apply.c:3075 |
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 | |
4c27fcb5 | 403 | #: apply.c:3081 |
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 | |
4c27fcb5 | 412 | #: apply.c:3103 |
5c57d762 | 413 | #, c-format |
a0b6b246 JX |
414 | msgid "missing binary patch data for '%s'" |
415 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 416 | |
4c27fcb5 | 417 | #: apply.c:3111 |
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 | |
4c27fcb5 | 422 | #: apply.c:3158 |
5c57d762 | 423 | #, c-format |
a0b6b246 JX |
424 | msgid "cannot apply binary patch to '%s' without full index line" |
425 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 426 | |
4c27fcb5 | 427 | #: apply.c:3168 |
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 | |
4c27fcb5 | 433 | #: apply.c:3176 |
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 | |
4c27fcb5 | 438 | #: apply.c:3194 |
5c57d762 | 439 | #, c-format |
a0b6b246 | 440 | msgid "the necessary postimage %s for '%s' cannot be read" |
e640d114 | 441 | msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" |
5c57d762 | 442 | |
4c27fcb5 | 443 | #: apply.c:3207 |
5c57d762 | 444 | #, c-format |
a0b6b246 JX |
445 | msgid "binary patch does not apply to '%s'" |
446 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 447 | |
4c27fcb5 | 448 | #: apply.c:3213 |
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 | |
4c27fcb5 | 453 | #: apply.c:3234 |
276ceeaa | 454 | #, c-format |
a0b6b246 JX |
455 | msgid "patch failed: %s:%ld" |
456 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 457 | |
4c27fcb5 | 458 | #: apply.c:3356 |
4dcdc3d8 | 459 | #, c-format |
a0b6b246 JX |
460 | msgid "cannot checkout %s" |
461 | msgstr "不能检出 %s" | |
4dcdc3d8 | 462 | |
4c27fcb5 | 463 | #: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 |
4dcdc3d8 | 464 | #, c-format |
a0b6b246 JX |
465 | msgid "failed to read %s" |
466 | msgstr "无法读取 %s" | |
4dcdc3d8 | 467 | |
4c27fcb5 | 468 | #: apply.c:3416 |
4dcdc3d8 | 469 | #, c-format |
a0b6b246 JX |
470 | msgid "reading from '%s' beyond a symbolic link" |
471 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 472 | |
4c27fcb5 | 473 | #: apply.c:3445 apply.c:3688 |
4dcdc3d8 | 474 | #, c-format |
a0b6b246 JX |
475 | msgid "path %s has been renamed/deleted" |
476 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 477 | |
4c27fcb5 | 478 | #: apply.c:3531 apply.c:3703 |
4dcdc3d8 | 479 | #, c-format |
a0b6b246 JX |
480 | msgid "%s: does not exist in index" |
481 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 482 | |
4c27fcb5 | 483 | #: apply.c:3540 apply.c:3711 |
4dcdc3d8 | 484 | #, c-format |
a0b6b246 JX |
485 | msgid "%s: does not match index" |
486 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 487 | |
4c27fcb5 | 488 | #: apply.c:3575 |
a0b6b246 JX |
489 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
490 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 491 | |
4c27fcb5 | 492 | #: apply.c:3578 |
4dcdc3d8 | 493 | #, c-format |
a0b6b246 JX |
494 | msgid "Falling back to three-way merge...\n" |
495 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 496 | |
4c27fcb5 | 497 | #: apply.c:3594 apply.c:3598 |
4dcdc3d8 | 498 | #, c-format |
a0b6b246 JX |
499 | msgid "cannot read the current contents of '%s'" |
500 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 501 | |
4c27fcb5 | 502 | #: apply.c:3610 |
4dcdc3d8 | 503 | #, c-format |
a0b6b246 JX |
504 | msgid "Failed to fall back on three-way merge...\n" |
505 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 506 | |
4c27fcb5 | 507 | #: apply.c:3624 |
4dcdc3d8 | 508 | #, c-format |
a0b6b246 JX |
509 | msgid "Applied patch to '%s' with conflicts.\n" |
510 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 511 | |
4c27fcb5 | 512 | #: apply.c:3629 |
4dcdc3d8 | 513 | #, c-format |
a0b6b246 JX |
514 | msgid "Applied patch to '%s' cleanly.\n" |
515 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 516 | |
4c27fcb5 | 517 | #: apply.c:3655 |
a0b6b246 JX |
518 | msgid "removal patch leaves file contents" |
519 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 520 | |
4c27fcb5 | 521 | #: apply.c:3728 |
1003b3a5 | 522 | #, c-format |
a0b6b246 JX |
523 | msgid "%s: wrong type" |
524 | msgstr "%s:错误类型" | |
1003b3a5 | 525 | |
4c27fcb5 | 526 | #: apply.c:3730 |
1003b3a5 | 527 | #, c-format |
a0b6b246 JX |
528 | msgid "%s has type %o, expected %o" |
529 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 530 | |
4c27fcb5 | 531 | #: apply.c:3881 apply.c:3883 |
4dcdc3d8 | 532 | #, c-format |
a0b6b246 JX |
533 | msgid "invalid path '%s'" |
534 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 535 | |
4c27fcb5 | 536 | #: apply.c:3939 |
4dcdc3d8 | 537 | #, c-format |
a0b6b246 JX |
538 | msgid "%s: already exists in index" |
539 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 540 | |
4c27fcb5 | 541 | #: apply.c:3942 |
4dcdc3d8 | 542 | #, c-format |
a0b6b246 JX |
543 | msgid "%s: already exists in working directory" |
544 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 545 | |
4c27fcb5 | 546 | #: apply.c:3962 |
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 | |
4c27fcb5 | 551 | #: apply.c:3967 |
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 | |
4c27fcb5 | 556 | #: apply.c:3987 |
8ada9598 | 557 | #, c-format |
a0b6b246 JX |
558 | msgid "affected file '%s' is beyond a symbolic link" |
559 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 560 | |
4c27fcb5 | 561 | #: apply.c:3991 |
81809b99 | 562 | #, c-format |
a0b6b246 JX |
563 | msgid "%s: patch does not apply" |
564 | msgstr "%s:补丁未应用" | |
8ada9598 | 565 | |
4c27fcb5 | 566 | #: apply.c:4006 |
8ada9598 | 567 | #, c-format |
a0b6b246 JX |
568 | msgid "Checking patch %s..." |
569 | msgstr "检查补丁 %s..." | |
8ada9598 | 570 | |
4c27fcb5 | 571 | #: apply.c:4098 |
a0b6b246 JX |
572 | #, c-format |
573 | msgid "sha1 information is lacking or useless for submodule %s" | |
574 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 575 | |
4c27fcb5 | 576 | #: apply.c:4105 |
8ada9598 | 577 | #, c-format |
a0b6b246 | 578 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 579 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 580 | |
4c27fcb5 | 581 | #: apply.c:4108 |
a0b6b246 JX |
582 | #, c-format |
583 | msgid "sha1 information is lacking or useless (%s)." | |
584 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 585 | |
4c27fcb5 | 586 | #: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142 |
8ada9598 | 587 | #, c-format |
a0b6b246 JX |
588 | msgid "make_cache_entry failed for path '%s'" |
589 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
8ada9598 | 590 | |
4c27fcb5 | 591 | #: apply.c:4117 |
a0b6b246 JX |
592 | #, c-format |
593 | msgid "could not add %s to temporary index" | |
594 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 595 | |
4c27fcb5 | 596 | #: apply.c:4127 |
a0b6b246 JX |
597 | #, c-format |
598 | msgid "could not write temporary index to %s" | |
599 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 600 | |
4c27fcb5 | 601 | #: apply.c:4265 |
a0b6b246 JX |
602 | #, c-format |
603 | msgid "unable to remove %s from index" | |
604 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 605 | |
4c27fcb5 | 606 | #: apply.c:4299 |
8ada9598 | 607 | #, c-format |
a0b6b246 JX |
608 | msgid "corrupt patch for submodule %s" |
609 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 610 | |
4c27fcb5 | 611 | #: apply.c:4305 |
9aeb4c2b | 612 | #, c-format |
a0b6b246 | 613 | msgid "unable to stat newly created file '%s'" |
65e2041e | 614 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 615 | |
4c27fcb5 | 616 | #: apply.c:4313 |
a0b6b246 JX |
617 | #, c-format |
618 | msgid "unable to create backing store for newly created file %s" | |
619 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 620 | |
4c27fcb5 | 621 | #: apply.c:4319 apply.c:4464 |
81809b99 | 622 | #, c-format |
a0b6b246 JX |
623 | msgid "unable to add cache entry for %s" |
624 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 625 | |
4c27fcb5 | 626 | #: apply.c:4362 |
a0b6b246 JX |
627 | #, c-format |
628 | msgid "failed to write to '%s'" | |
c1ac5258 | 629 | msgstr "写入 '%s' 失败" |
8ada9598 | 630 | |
4c27fcb5 | 631 | #: apply.c:4366 |
220c313c | 632 | #, c-format |
a0b6b246 JX |
633 | msgid "closing file '%s'" |
634 | msgstr "关闭文件 '%s'" | |
220c313c | 635 | |
4c27fcb5 | 636 | #: apply.c:4436 |
c04f5ac3 | 637 | #, c-format |
a0b6b246 JX |
638 | msgid "unable to write file '%s' mode %o" |
639 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 640 | |
4c27fcb5 | 641 | #: apply.c:4534 |
c04f5ac3 | 642 | #, c-format |
a0b6b246 JX |
643 | msgid "Applied patch %s cleanly." |
644 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 645 | |
4c27fcb5 | 646 | #: apply.c:4542 |
a0b6b246 JX |
647 | msgid "internal error" |
648 | msgstr "内部错误" | |
c04f5ac3 | 649 | |
4c27fcb5 | 650 | #: apply.c:4545 |
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 | |
4c27fcb5 | 657 | #: apply.c:4556 |
5c57d762 | 658 | #, c-format |
a0b6b246 JX |
659 | msgid "truncating .rej filename to %.*s.rej" |
660 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 661 | |
4c27fcb5 | 662 | #: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122 |
220c313c | 663 | #, c-format |
a0b6b246 JX |
664 | msgid "cannot open %s" |
665 | msgstr "不能打开 %s" | |
220c313c | 666 | |
4c27fcb5 | 667 | #: apply.c:4578 |
220c313c | 668 | #, c-format |
a0b6b246 JX |
669 | msgid "Hunk #%d applied cleanly." |
670 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 671 | |
4c27fcb5 | 672 | #: apply.c:4582 |
5c57d762 | 673 | #, c-format |
a0b6b246 JX |
674 | msgid "Rejected hunk #%d." |
675 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 676 | |
4c27fcb5 | 677 | #: apply.c:4692 |
5c57d762 | 678 | #, c-format |
a0b6b246 JX |
679 | msgid "Skipped patch '%s'." |
680 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 681 | |
4c27fcb5 | 682 | #: apply.c:4700 |
a0b6b246 JX |
683 | msgid "unrecognized input" |
684 | msgstr "未能识别的输入" | |
5c57d762 | 685 | |
4c27fcb5 | 686 | #: apply.c:4719 |
a0b6b246 JX |
687 | msgid "unable to read index file" |
688 | msgstr "无法读取索引文件" | |
5c57d762 | 689 | |
4c27fcb5 | 690 | #: apply.c:4874 |
220c313c | 691 | #, c-format |
a0b6b246 JX |
692 | msgid "can't open patch '%s': %s" |
693 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 694 | |
4c27fcb5 | 695 | #: apply.c:4901 |
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 | |
4c27fcb5 | 702 | #: apply.c:4907 apply.c:4922 |
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 | |
4c27fcb5 | 709 | #: apply.c:4915 |
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 | |
4c27fcb5 | 716 | #: apply.c:4931 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 | |
4c27fcb5 JX |
720 | #: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212 |
721 | #: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262 | |
722 | #: builtin/pull.c:199 builtin/submodule--helper.c:406 | |
723 | #: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365 | |
724 | #: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849 | |
725 | #: builtin/submodule--helper.c:2088 git-add--interactive.perl:197 | |
a0b6b246 JX |
726 | msgid "path" |
727 | msgstr "路径" | |
5c57d762 | 728 | |
4c27fcb5 | 729 | #: apply.c:4959 |
a0b6b246 JX |
730 | msgid "don't apply changes matching the given path" |
731 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 732 | |
4c27fcb5 | 733 | #: apply.c:4962 |
a0b6b246 JX |
734 | msgid "apply changes matching the given path" |
735 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 736 | |
4c27fcb5 | 737 | #: apply.c:4964 builtin/am.c:2218 |
a0b6b246 JX |
738 | msgid "num" |
739 | msgstr "数字" | |
220c313c | 740 | |
4c27fcb5 | 741 | #: apply.c:4965 |
a0b6b246 JX |
742 | msgid "remove <num> leading slashes from traditional diff paths" |
743 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 744 | |
4c27fcb5 | 745 | #: apply.c:4968 |
a0b6b246 JX |
746 | msgid "ignore additions made by the patch" |
747 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 748 | |
4c27fcb5 | 749 | #: apply.c:4970 |
a0b6b246 JX |
750 | msgid "instead of applying the patch, output diffstat for the input" |
751 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 752 | |
4c27fcb5 | 753 | #: apply.c:4974 |
a0b6b246 JX |
754 | msgid "show number of added and deleted lines in decimal notation" |
755 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 756 | |
4c27fcb5 | 757 | #: apply.c:4976 |
a0b6b246 JX |
758 | msgid "instead of applying the patch, output a summary for the input" |
759 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 760 | |
4c27fcb5 | 761 | #: apply.c:4978 |
a0b6b246 JX |
762 | msgid "instead of applying the patch, see if the patch is applicable" |
763 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 764 | |
4c27fcb5 | 765 | #: apply.c:4980 |
a0b6b246 JX |
766 | msgid "make sure the patch is applicable to the current index" |
767 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 768 | |
4c27fcb5 | 769 | #: apply.c:4982 |
c1ac5258 JX |
770 | msgid "mark new files with `git add --intent-to-add`" |
771 | msgstr "使用命令 `git add --intent-to-add` 标记新增文件" | |
772 | ||
4c27fcb5 | 773 | #: apply.c:4984 |
a0b6b246 JX |
774 | msgid "apply a patch without touching the working tree" |
775 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 776 | |
4c27fcb5 | 777 | #: apply.c:4986 |
a0b6b246 JX |
778 | msgid "accept a patch that touches outside the working area" |
779 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 780 | |
4c27fcb5 | 781 | #: apply.c:4989 |
a0b6b246 JX |
782 | msgid "also apply the patch (use with --stat/--summary/--check)" |
783 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 784 | |
4c27fcb5 | 785 | #: apply.c:4991 |
a0b6b246 JX |
786 | msgid "attempt three-way merge if a patch does not apply" |
787 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 788 | |
4c27fcb5 | 789 | #: apply.c:4993 |
a0b6b246 JX |
790 | msgid "build a temporary index based on embedded index information" |
791 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 792 | |
4c27fcb5 | 793 | #: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523 |
a0b6b246 JX |
794 | msgid "paths are separated with NUL character" |
795 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 796 | |
4c27fcb5 | 797 | #: apply.c:4998 |
a0b6b246 JX |
798 | msgid "ensure at least <n> lines of context match" |
799 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 800 | |
4c27fcb5 JX |
801 | #: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 |
802 | #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 | |
803 | #: builtin/pack-objects.c:3312 builtin/rebase.c:857 | |
a0b6b246 JX |
804 | msgid "action" |
805 | msgstr "动作" | |
8ada9598 | 806 | |
4c27fcb5 | 807 | #: apply.c:5000 |
a0b6b246 JX |
808 | msgid "detect new or modified lines that have whitespace errors" |
809 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 810 | |
4c27fcb5 | 811 | #: apply.c:5003 apply.c:5006 |
a0b6b246 JX |
812 | msgid "ignore changes in whitespace when finding context" |
813 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 814 | |
4c27fcb5 | 815 | #: apply.c:5009 |
a0b6b246 JX |
816 | msgid "apply the patch in reverse" |
817 | msgstr "反向应用补丁" | |
8ada9598 | 818 | |
4c27fcb5 | 819 | #: apply.c:5011 |
a0b6b246 JX |
820 | msgid "don't expect at least one line of context" |
821 | msgstr "无需至少一行上下文" | |
8ada9598 | 822 | |
4c27fcb5 | 823 | #: apply.c:5013 |
a0b6b246 JX |
824 | msgid "leave the rejected hunks in corresponding *.rej files" |
825 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 826 | |
4c27fcb5 | 827 | #: apply.c:5015 |
a0b6b246 JX |
828 | msgid "allow overlapping hunks" |
829 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 830 | |
4c27fcb5 JX |
831 | #: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21 |
832 | #: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698 | |
833 | #: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127 | |
834 | #: builtin/rebase--interactive.c:157 | |
a0b6b246 JX |
835 | msgid "be verbose" |
836 | msgstr "冗长输出" | |
8ada9598 | 837 | |
4c27fcb5 | 838 | #: apply.c:5018 |
a0b6b246 JX |
839 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
840 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 841 | |
4c27fcb5 | 842 | #: apply.c:5021 |
a0b6b246 JX |
843 | msgid "do not trust the line counts in the hunk headers" |
844 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 845 | |
4c27fcb5 | 846 | #: apply.c:5023 builtin/am.c:2206 |
a0b6b246 JX |
847 | msgid "root" |
848 | msgstr "根目录" | |
c04f5ac3 | 849 | |
4c27fcb5 | 850 | #: apply.c:5024 |
a0b6b246 JX |
851 | msgid "prepend <root> to all filenames" |
852 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 853 | |
c1ac5258 | 854 | #: archive.c:14 |
a0b6b246 JX |
855 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
856 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
07432cef | 857 | |
c1ac5258 | 858 | #: archive.c:15 |
a0b6b246 JX |
859 | msgid "git archive --list" |
860 | msgstr "git archive --list" | |
861 | ||
c1ac5258 | 862 | #: archive.c:16 |
c04f5ac3 | 863 | msgid "" |
a0b6b246 | 864 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 865 | msgstr "" |
a0b6b246 | 866 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
6acbf033 | 867 | |
c1ac5258 | 868 | #: archive.c:17 |
a0b6b246 JX |
869 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
870 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 871 | |
4c27fcb5 | 872 | #: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 |
c04f5ac3 | 873 | #, c-format |
a0b6b246 JX |
874 | msgid "pathspec '%s' did not match any files" |
875 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 876 | |
4c27fcb5 | 877 | #: archive.c:453 |
a0b6b246 JX |
878 | msgid "fmt" |
879 | msgstr "格式" | |
07432cef | 880 | |
4c27fcb5 | 881 | #: archive.c:453 |
a0b6b246 JX |
882 | msgid "archive format" |
883 | msgstr "归档格式" | |
7aea43ff | 884 | |
4c27fcb5 | 885 | #: archive.c:454 builtin/log.c:1536 |
a0b6b246 JX |
886 | msgid "prefix" |
887 | msgstr "前缀" | |
7aea43ff | 888 | |
4c27fcb5 | 889 | #: archive.c:455 |
a0b6b246 JX |
890 | msgid "prepend prefix to each pathname in the archive" |
891 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 892 | |
4c27fcb5 JX |
893 | #: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 |
894 | #: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884 | |
895 | #: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562 | |
896 | #: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122 | |
897 | #: parse-options.h:162 | |
a0b6b246 JX |
898 | msgid "file" |
899 | msgstr "文件" | |
a77c07d9 | 900 | |
4c27fcb5 | 901 | #: archive.c:457 builtin/archive.c:89 |
a0b6b246 JX |
902 | msgid "write the archive to this file" |
903 | msgstr "归档写入此文件" | |
a77c07d9 | 904 | |
4c27fcb5 | 905 | #: archive.c:459 |
a0b6b246 JX |
906 | msgid "read .gitattributes in working directory" |
907 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 908 | |
4c27fcb5 | 909 | #: archive.c:460 |
a0b6b246 JX |
910 | msgid "report archived files on stderr" |
911 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 912 | |
4c27fcb5 | 913 | #: archive.c:461 |
a0b6b246 JX |
914 | msgid "store only" |
915 | msgstr "只存储" | |
7ac1c0ad | 916 | |
4c27fcb5 | 917 | #: archive.c:462 |
a0b6b246 JX |
918 | msgid "compress faster" |
919 | msgstr "压缩速度更快" | |
8ada9598 | 920 | |
4c27fcb5 | 921 | #: archive.c:470 |
a0b6b246 JX |
922 | msgid "compress better" |
923 | msgstr "压缩效果更好" | |
8ada9598 | 924 | |
4c27fcb5 | 925 | #: archive.c:473 |
a0b6b246 JX |
926 | msgid "list supported archive formats" |
927 | msgstr "列出支持的归档格式" | |
a77c07d9 | 928 | |
4c27fcb5 JX |
929 | #: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 |
930 | #: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855 | |
a0b6b246 JX |
931 | msgid "repo" |
932 | msgstr "仓库" | |
c04f5ac3 | 933 | |
4c27fcb5 | 934 | #: archive.c:476 builtin/archive.c:91 |
a0b6b246 JX |
935 | msgid "retrieve the archive from remote repository <repo>" |
936 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 937 | |
4c27fcb5 JX |
938 | #: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714 |
939 | #: builtin/notes.c:496 | |
a0b6b246 JX |
940 | msgid "command" |
941 | msgstr "命令" | |
942 | ||
4c27fcb5 | 943 | #: archive.c:478 builtin/archive.c:93 |
a0b6b246 JX |
944 | msgid "path to the remote git-upload-archive command" |
945 | msgstr "远程 git-upload-archive 命令的路径" | |
946 | ||
4c27fcb5 | 947 | #: archive.c:485 |
a0b6b246 JX |
948 | msgid "Unexpected option --remote" |
949 | msgstr "未知参数 --remote" | |
950 | ||
4c27fcb5 | 951 | #: archive.c:487 |
a0b6b246 JX |
952 | msgid "Option --exec can only be used together with --remote" |
953 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
954 | ||
4c27fcb5 | 955 | #: archive.c:489 |
a0b6b246 JX |
956 | msgid "Unexpected option --output" |
957 | msgstr "未知参数 --output" | |
958 | ||
4c27fcb5 | 959 | #: archive.c:511 |
a0b6b246 JX |
960 | #, c-format |
961 | msgid "Unknown archive format '%s'" | |
962 | msgstr "未知归档格式 '%s'" | |
963 | ||
4c27fcb5 | 964 | #: archive.c:518 |
8ada9598 | 965 | #, c-format |
a0b6b246 JX |
966 | msgid "Argument not supported for format '%s': -%d" |
967 | msgstr "参数不支持此格式 '%s':-%d" | |
968 | ||
4c27fcb5 | 969 | #: archive-tar.c:125 archive-zip.c:345 |
c1ac5258 JX |
970 | #, c-format |
971 | msgid "cannot stream blob %s" | |
e640d114 | 972 | msgstr "不能打开数据对象 %s" |
c1ac5258 | 973 | |
4c27fcb5 | 974 | #: archive-tar.c:260 archive-zip.c:363 |
c1ac5258 JX |
975 | #, c-format |
976 | msgid "unsupported file mode: 0%o (SHA1: %s)" | |
e640d114 | 977 | msgstr "不支持的文件模式:0%o (SHA1: %s)" |
c1ac5258 | 978 | |
4c27fcb5 | 979 | #: archive-tar.c:287 archive-zip.c:353 |
c1ac5258 JX |
980 | #, c-format |
981 | msgid "cannot read %s" | |
982 | msgstr "不能读取 %s" | |
983 | ||
984 | #: archive-tar.c:458 | |
985 | #, c-format | |
986 | msgid "unable to start '%s' filter" | |
987 | msgstr "无法启动 '%s' 过滤器" | |
988 | ||
989 | #: archive-tar.c:461 | |
990 | msgid "unable to redirect descriptor" | |
991 | msgstr "无法重定向描述符" | |
992 | ||
993 | #: archive-tar.c:468 | |
994 | #, c-format | |
995 | msgid "'%s' filter reported error" | |
e640d114 | 996 | msgstr "'%s' 过滤器报告了错误" |
c1ac5258 | 997 | |
4c27fcb5 | 998 | #: archive-zip.c:314 |
c1ac5258 JX |
999 | #, c-format |
1000 | msgid "path is not valid UTF-8: %s" | |
1001 | msgstr "路径不是有效的 UTF-8:%s" | |
1002 | ||
4c27fcb5 | 1003 | #: archive-zip.c:318 |
c1ac5258 JX |
1004 | #, c-format |
1005 | msgid "path too long (%d chars, SHA1: %s): %s" | |
1006 | msgstr "路径太长(%d 字符,SHA1:%s):%s" | |
1007 | ||
4c27fcb5 | 1008 | #: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227 |
c1ac5258 JX |
1009 | #, c-format |
1010 | msgid "deflate error (%d)" | |
1011 | msgstr "压缩错误 (%d)" | |
1012 | ||
4c27fcb5 | 1013 | #: archive-zip.c:609 |
c1ac5258 JX |
1014 | #, c-format |
1015 | msgid "timestamp too large for this system: %<PRIuMAX>" | |
e640d114 | 1016 | msgstr "对于本系统时间戳太大:%<PRIuMAX>" |
c1ac5258 | 1017 | |
4c27fcb5 | 1018 | #: attr.c:212 |
87cb7997 JX |
1019 | #, c-format |
1020 | msgid "%.*s is not a valid attribute name" | |
1021 | msgstr "%.*s 不是一个有效的属性名" | |
1022 | ||
4c27fcb5 | 1023 | #: attr.c:409 |
8ada9598 | 1024 | msgid "" |
a0b6b246 JX |
1025 | "Negative patterns are ignored in git attributes\n" |
1026 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 1027 | msgstr "" |
a0b6b246 JX |
1028 | "负值模版在 git attributes 中被忽略\n" |
1029 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 1030 | |
4c27fcb5 | 1031 | #: bisect.c:468 |
8ada9598 | 1032 | #, c-format |
a0b6b246 JX |
1033 | msgid "Badly quoted content in file '%s': %s" |
1034 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 1035 | |
4c27fcb5 | 1036 | #: bisect.c:676 |
a0b6b246 JX |
1037 | #, c-format |
1038 | msgid "We cannot bisect more!\n" | |
1039 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 1040 | |
4c27fcb5 | 1041 | #: bisect.c:730 |
2e8451e8 | 1042 | #, c-format |
a0b6b246 JX |
1043 | msgid "Not a valid commit name %s" |
1044 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 1045 | |
4c27fcb5 | 1046 | #: bisect.c:754 |
5b04ee3b JX |
1047 | #, c-format |
1048 | msgid "" | |
a0b6b246 JX |
1049 | "The merge base %s is bad.\n" |
1050 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 1051 | msgstr "" |
a0b6b246 JX |
1052 | "合并基线 %s 是坏的。\n" |
1053 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 1054 | |
4c27fcb5 | 1055 | #: bisect.c:759 |
5b04ee3b | 1056 | #, c-format |
a0b6b246 JX |
1057 | msgid "" |
1058 | "The merge base %s is new.\n" | |
1059 | "The property has changed between %s and [%s].\n" | |
1060 | msgstr "" | |
1061 | "合并基线 %s 是新的。\n" | |
1062 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1063 | |
4c27fcb5 | 1064 | #: bisect.c:764 |
a0b6b246 JX |
1065 | #, c-format |
1066 | msgid "" | |
1067 | "The merge base %s is %s.\n" | |
1068 | "This means the first '%s' commit is between %s and [%s].\n" | |
1069 | msgstr "" | |
1070 | "合并基线 %s 是 %s。\n" | |
1071 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1072 | |
4c27fcb5 | 1073 | #: bisect.c:772 |
a0b6b246 JX |
1074 | #, c-format |
1075 | msgid "" | |
1a79b2f1 | 1076 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1077 | "git bisect cannot work properly in this case.\n" |
1078 | "Maybe you mistook %s and %s revs?\n" | |
1079 | msgstr "" | |
1080 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1081 | "这种情况下 git 二分查找无法正常工作。\n" | |
1082 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1083 | |
4c27fcb5 | 1084 | #: bisect.c:785 |
a0b6b246 JX |
1085 | #, c-format |
1086 | msgid "" | |
1087 | "the merge base between %s and [%s] must be skipped.\n" | |
1088 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1089 | "We continue anyway." | |
1090 | msgstr "" | |
1091 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1092 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1093 | "我们仍旧继续。" | |
649900bc | 1094 | |
4c27fcb5 | 1095 | #: bisect.c:818 |
649900bc | 1096 | #, c-format |
a0b6b246 JX |
1097 | msgid "Bisecting: a merge base must be tested\n" |
1098 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1099 | |
4c27fcb5 | 1100 | #: bisect.c:858 |
a0b6b246 JX |
1101 | #, c-format |
1102 | msgid "a %s revision is needed" | |
1103 | msgstr "需要一个 %s 版本" | |
649900bc | 1104 | |
4c27fcb5 | 1105 | #: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237 |
649900bc | 1106 | #, c-format |
a0b6b246 JX |
1107 | msgid "could not create file '%s'" |
1108 | msgstr "不能创建文件 '%s'" | |
649900bc | 1109 | |
4c27fcb5 | 1110 | #: bisect.c:928 builtin/merge.c:138 |
649900bc | 1111 | #, c-format |
a0b6b246 JX |
1112 | msgid "could not read file '%s'" |
1113 | msgstr "不能读取文件 '%s'" | |
649900bc | 1114 | |
4c27fcb5 | 1115 | #: bisect.c:958 |
a0b6b246 JX |
1116 | msgid "reading bisect refs failed" |
1117 | msgstr "读取二分查找引用失败" | |
649900bc | 1118 | |
4c27fcb5 | 1119 | #: bisect.c:977 |
649900bc | 1120 | #, c-format |
a0b6b246 JX |
1121 | msgid "%s was both %s and %s\n" |
1122 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1123 | |
4c27fcb5 | 1124 | #: bisect.c:985 |
649900bc | 1125 | #, c-format |
a0b6b246 JX |
1126 | msgid "" |
1127 | "No testable commit found.\n" | |
1128 | "Maybe you started with bad path parameters?\n" | |
1129 | msgstr "" | |
1130 | "没有发现可测试的提交。\n" | |
1131 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1132 | |
4c27fcb5 | 1133 | #: bisect.c:1004 |
649900bc | 1134 | #, c-format |
a0b6b246 JX |
1135 | msgid "(roughly %d step)" |
1136 | msgid_plural "(roughly %d steps)" | |
1137 | msgstr[0] "(大概 %d 步)" | |
1138 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1139 | |
a4f16749 JX |
1140 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1141 | #. steps)" translation. | |
1142 | #. | |
4c27fcb5 | 1143 | #: bisect.c:1010 |
649900bc | 1144 | #, c-format |
a0b6b246 JX |
1145 | msgid "Bisecting: %d revision left to test after this %s\n" |
1146 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1147 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1148 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1149 | |
4c27fcb5 | 1150 | #: blame.c:1787 |
a4f16749 JX |
1151 | msgid "--contents and --reverse do not blend well." |
1152 | msgstr "--contents 和 --reverse 不能混用。" | |
1153 | ||
4c27fcb5 | 1154 | #: blame.c:1801 |
a4f16749 JX |
1155 | msgid "cannot use --contents with final commit object name" |
1156 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1157 | ||
4c27fcb5 | 1158 | #: blame.c:1822 |
a4f16749 JX |
1159 | msgid "--reverse and --first-parent together require specified latest commit" |
1160 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1161 | ||
4c27fcb5 JX |
1162 | #: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963 |
1163 | #: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932 | |
1164 | #: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406 | |
1165 | #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 | |
fd8cb379 | 1166 | #: builtin/shortlog.c:192 |
a4f16749 JX |
1167 | msgid "revision walk setup failed" |
1168 | msgstr "版本遍历设置失败" | |
1169 | ||
4c27fcb5 | 1170 | #: blame.c:1849 |
a4f16749 JX |
1171 | msgid "" |
1172 | "--reverse --first-parent together require range along first-parent chain" | |
1173 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1174 | ||
4c27fcb5 | 1175 | #: blame.c:1860 |
a4f16749 JX |
1176 | #, c-format |
1177 | msgid "no such path %s in %s" | |
1178 | msgstr "在 %2$s 中无此路径 %1$s" | |
1179 | ||
4c27fcb5 | 1180 | #: blame.c:1871 |
a4f16749 JX |
1181 | #, c-format |
1182 | msgid "cannot read blob %s for path %s" | |
1183 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1184 | ||
c1ac5258 | 1185 | #: branch.c:52 |
649900bc | 1186 | #, c-format |
a0b6b246 JX |
1187 | msgid "" |
1188 | "\n" | |
1189 | "After fixing the error cause you may try to fix up\n" | |
1190 | "the remote tracking information by invoking\n" | |
1191 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1192 | msgstr "" | |
1193 | "\n" | |
1194 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1195 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1196 | |
c1ac5258 | 1197 | #: branch.c:66 |
649900bc | 1198 | #, c-format |
a0b6b246 JX |
1199 | msgid "Not setting branch %s as its own upstream." |
1200 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1201 | |
c1ac5258 | 1202 | #: branch.c:92 |
649900bc | 1203 | #, c-format |
6937cb4e JX |
1204 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1205 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1206 | |
c1ac5258 | 1207 | #: branch.c:93 |
649900bc | 1208 | #, c-format |
6937cb4e JX |
1209 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1210 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1211 | |
c1ac5258 | 1212 | #: branch.c:97 |
649900bc | 1213 | #, c-format |
6937cb4e JX |
1214 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1215 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1216 | |
c1ac5258 | 1217 | #: branch.c:98 |
649900bc | 1218 | #, c-format |
6937cb4e | 1219 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1220 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1221 | |
c1ac5258 | 1222 | #: branch.c:103 |
649900bc | 1223 | #, c-format |
6937cb4e JX |
1224 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1225 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1226 | |
c1ac5258 | 1227 | #: branch.c:104 |
649900bc | 1228 | #, c-format |
6937cb4e JX |
1229 | msgid "Branch '%s' set up to track remote ref '%s'." |
1230 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1231 | |
c1ac5258 | 1232 | #: branch.c:108 |
649900bc | 1233 | #, c-format |
6937cb4e JX |
1234 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1235 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1236 | |
c1ac5258 | 1237 | #: branch.c:109 |
649900bc | 1238 | #, c-format |
6937cb4e JX |
1239 | msgid "Branch '%s' set up to track local ref '%s'." |
1240 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1241 | |
c1ac5258 | 1242 | #: branch.c:118 |
a0b6b246 JX |
1243 | msgid "Unable to write upstream branch configuration" |
1244 | msgstr "无法写入上游分支配置" | |
649900bc | 1245 | |
c1ac5258 | 1246 | #: branch.c:155 |
649900bc | 1247 | #, c-format |
a0b6b246 JX |
1248 | msgid "Not tracking: ambiguous information for ref %s" |
1249 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1250 | |
c1ac5258 | 1251 | #: branch.c:188 |
649900bc | 1252 | #, c-format |
a0b6b246 JX |
1253 | msgid "'%s' is not a valid branch name." |
1254 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1255 | |
c1ac5258 | 1256 | #: branch.c:207 |
649900bc | 1257 | #, c-format |
a0b6b246 JX |
1258 | msgid "A branch named '%s' already exists." |
1259 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 1260 | |
c1ac5258 | 1261 | #: branch.c:212 |
a0b6b246 JX |
1262 | msgid "Cannot force update the current branch." |
1263 | msgstr "无法强制更新当前分支。" | |
649900bc | 1264 | |
c1ac5258 | 1265 | #: branch.c:232 |
649900bc | 1266 | #, c-format |
a0b6b246 JX |
1267 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
1268 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 1269 | |
c1ac5258 | 1270 | #: branch.c:234 |
649900bc | 1271 | #, c-format |
a0b6b246 JX |
1272 | msgid "the requested upstream branch '%s' does not exist" |
1273 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 1274 | |
c1ac5258 | 1275 | #: branch.c:236 |
a0b6b246 JX |
1276 | msgid "" |
1277 | "\n" | |
1278 | "If you are planning on basing your work on an upstream\n" | |
1279 | "branch that already exists at the remote, you may need to\n" | |
1280 | "run \"git fetch\" to retrieve it.\n" | |
1281 | "\n" | |
1282 | "If you are planning to push out a new local branch that\n" | |
1283 | "will track its remote counterpart, you may want to use\n" | |
1284 | "\"git push -u\" to set the upstream config as you push." | |
1285 | msgstr "" | |
1286 | "\n" | |
1287 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
1288 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
1289 | "\n" | |
1290 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
1291 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 1292 | |
c1ac5258 | 1293 | #: branch.c:279 |
649900bc | 1294 | #, c-format |
a0b6b246 JX |
1295 | msgid "Not a valid object name: '%s'." |
1296 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 1297 | |
c1ac5258 | 1298 | #: branch.c:299 |
649900bc | 1299 | #, c-format |
a0b6b246 JX |
1300 | msgid "Ambiguous object name: '%s'." |
1301 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 1302 | |
c1ac5258 | 1303 | #: branch.c:304 |
649900bc | 1304 | #, c-format |
a0b6b246 JX |
1305 | msgid "Not a valid branch point: '%s'." |
1306 | msgstr "无效的分支点:'%s'。" | |
649900bc | 1307 | |
c1ac5258 | 1308 | #: branch.c:358 |
649900bc | 1309 | #, c-format |
a0b6b246 JX |
1310 | msgid "'%s' is already checked out at '%s'" |
1311 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 1312 | |
c1ac5258 | 1313 | #: branch.c:381 |
a0b6b246 JX |
1314 | #, c-format |
1315 | msgid "HEAD of working tree %s is not updated" | |
1316 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 1317 | |
c1ac5258 | 1318 | #: bundle.c:36 |
649900bc | 1319 | #, c-format |
a0b6b246 JX |
1320 | msgid "'%s' does not look like a v2 bundle file" |
1321 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 1322 | |
c1ac5258 | 1323 | #: bundle.c:64 |
a0b6b246 JX |
1324 | #, c-format |
1325 | msgid "unrecognized header: %s%s (%d)" | |
1326 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 1327 | |
4c27fcb5 JX |
1328 | #: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722 |
1329 | #: builtin/commit.c:774 | |
649900bc | 1330 | #, c-format |
a0b6b246 JX |
1331 | msgid "could not open '%s'" |
1332 | msgstr "不能打开 '%s'" | |
649900bc | 1333 | |
c1ac5258 | 1334 | #: bundle.c:141 |
a0b6b246 JX |
1335 | msgid "Repository lacks these prerequisite commits:" |
1336 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 1337 | |
c1ac5258 | 1338 | #: bundle.c:192 |
2e8451e8 | 1339 | #, c-format |
a0b6b246 JX |
1340 | msgid "The bundle contains this ref:" |
1341 | msgid_plural "The bundle contains these %d refs:" | |
1342 | msgstr[0] "这个包中含有这个引用:" | |
1343 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 1344 | |
c1ac5258 | 1345 | #: bundle.c:199 |
a0b6b246 JX |
1346 | msgid "The bundle records a complete history." |
1347 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 1348 | |
c1ac5258 | 1349 | #: bundle.c:201 |
2e8451e8 | 1350 | #, c-format |
a0b6b246 JX |
1351 | msgid "The bundle requires this ref:" |
1352 | msgid_plural "The bundle requires these %d refs:" | |
1353 | msgstr[0] "这个包需要这个引用:" | |
1354 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 1355 | |
4c27fcb5 JX |
1356 | #: bundle.c:267 |
1357 | msgid "unable to dup bundle descriptor" | |
1358 | msgstr "无法复制 bundle 描述符" | |
1359 | ||
1360 | #: bundle.c:274 | |
a0b6b246 JX |
1361 | msgid "Could not spawn pack-objects" |
1362 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 1363 | |
4c27fcb5 | 1364 | #: bundle.c:285 |
a0b6b246 JX |
1365 | msgid "pack-objects died" |
1366 | msgstr "pack-objects 终止" | |
8ada9598 | 1367 | |
4c27fcb5 | 1368 | #: bundle.c:327 |
a0b6b246 JX |
1369 | msgid "rev-list died" |
1370 | msgstr "rev-list 终止" | |
1371 | ||
4c27fcb5 | 1372 | #: bundle.c:376 |
81809b99 | 1373 | #, c-format |
a0b6b246 JX |
1374 | msgid "ref '%s' is excluded by the rev-list options" |
1375 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 1376 | |
4c27fcb5 | 1377 | #: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304 |
81809b99 | 1378 | #, c-format |
a0b6b246 JX |
1379 | msgid "unrecognized argument: %s" |
1380 | msgstr "未能识别的参数:%s" | |
8ada9598 | 1381 | |
4c27fcb5 | 1382 | #: bundle.c:464 |
a0b6b246 JX |
1383 | msgid "Refusing to create empty bundle." |
1384 | msgstr "不能创建空包。" | |
1385 | ||
4c27fcb5 | 1386 | #: bundle.c:474 |
81809b99 | 1387 | #, c-format |
a0b6b246 JX |
1388 | msgid "cannot create '%s'" |
1389 | msgstr "不能创建 '%s'" | |
8ada9598 | 1390 | |
4c27fcb5 | 1391 | #: bundle.c:498 |
a0b6b246 JX |
1392 | msgid "index-pack died" |
1393 | msgstr "index-pack 终止" | |
63af42fe | 1394 | |
31e5e17b | 1395 | #: color.c:296 |
94550ed3 | 1396 | #, c-format |
a0b6b246 JX |
1397 | msgid "invalid color value: %.*s" |
1398 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 1399 | |
4c27fcb5 JX |
1400 | #: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414 |
1401 | #: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376 | |
fd8cb379 | 1402 | #: builtin/replace.c:448 |
94550ed3 | 1403 | #, c-format |
a0b6b246 JX |
1404 | msgid "could not parse %s" |
1405 | msgstr "不能解析 %s" | |
94550ed3 | 1406 | |
4c27fcb5 | 1407 | #: commit.c:52 |
a0b6b246 JX |
1408 | #, c-format |
1409 | msgid "%s %s is not a commit!" | |
31e5e17b | 1410 | msgstr "%s %s 不是一个提交!" |
90314792 | 1411 | |
4c27fcb5 | 1412 | #: commit.c:193 |
fd8cb379 JX |
1413 | msgid "" |
1414 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
1415 | "and will be removed in a future Git version.\n" | |
1416 | "\n" | |
1417 | "Please use \"git replace --convert-graft-file\"\n" | |
1418 | "to convert the grafts into replace refs.\n" | |
1419 | "\n" | |
1420 | "Turn this message off by running\n" | |
1421 | "\"git config advice.graftFileDeprecated false\"" | |
1422 | msgstr "" | |
1423 | "对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n" | |
1424 | "未来的Git版本中被移除。\n" | |
1425 | "\n" | |
1426 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
1427 | "grafts 转换为替换引用。\n" | |
1428 | "\n" | |
1429 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
1430 | "可关闭本消息" | |
1431 | ||
4c27fcb5 JX |
1432 | #: commit.c:1115 |
1433 | #, c-format | |
1434 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
1435 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
1436 | ||
1437 | #: commit.c:1118 | |
1438 | #, c-format | |
1439 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
1440 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
1441 | ||
1442 | #: commit.c:1121 | |
1443 | #, c-format | |
1444 | msgid "Commit %s does not have a GPG signature." | |
1445 | msgstr "提交 %s 没有 GPG 签名。" | |
1446 | ||
1447 | #: commit.c:1124 | |
1448 | #, c-format | |
1449 | msgid "Commit %s has a good GPG signature by %s\n" | |
1450 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
1451 | ||
1452 | #: commit.c:1378 | |
90314792 | 1453 | msgid "" |
a0b6b246 JX |
1454 | "Warning: commit message did not conform to UTF-8.\n" |
1455 | "You may want to amend it after fixing the message, or set the config\n" | |
1456 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
1457 | msgstr "" | |
29004bbb | 1458 | "警告:提交说明不符合 UTF-8 字符编码。\n" |
a0b6b246 | 1459 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" |
29004bbb | 1460 | "设置为您项目所用的字符编码。\n" |
90314792 | 1461 | |
4c27fcb5 | 1462 | #: commit-graph.c:108 |
c1ac5258 JX |
1463 | #, c-format |
1464 | msgid "graph file %s is too small" | |
1465 | msgstr "图形文件 %s 太小" | |
1466 | ||
4c27fcb5 | 1467 | #: commit-graph.c:115 |
c1ac5258 JX |
1468 | #, c-format |
1469 | msgid "graph signature %X does not match signature %X" | |
1470 | msgstr "图形签名 %X 和签名 %X 不匹配" | |
1471 | ||
4c27fcb5 | 1472 | #: commit-graph.c:122 |
c1ac5258 JX |
1473 | #, c-format |
1474 | msgid "graph version %X does not match version %X" | |
1475 | msgstr "图形版本 %X 和版本 %X 不匹配" | |
1476 | ||
4c27fcb5 | 1477 | #: commit-graph.c:129 |
c1ac5258 JX |
1478 | #, c-format |
1479 | msgid "hash version %X does not match version %X" | |
1480 | msgstr "散列版本 %X 和版本 %X 不匹配" | |
1481 | ||
4c27fcb5 | 1482 | #: commit-graph.c:153 |
c1ac5258 JX |
1483 | #, c-format |
1484 | msgid "improper chunk offset %08x%08x" | |
1485 | msgstr "不正确的块偏移 %08x%08x" | |
1486 | ||
4c27fcb5 | 1487 | #: commit-graph.c:189 |
c1ac5258 JX |
1488 | #, c-format |
1489 | msgid "chunk id %08x appears multiple times" | |
1490 | msgstr "块 id %08x 出现了多次" | |
1491 | ||
4c27fcb5 | 1492 | #: commit-graph.c:308 |
c1ac5258 JX |
1493 | #, c-format |
1494 | msgid "could not find commit %s" | |
1495 | msgstr "无法找到提交 %s" | |
1496 | ||
4c27fcb5 | 1497 | #: commit-graph.c:617 builtin/pack-objects.c:2652 |
c1ac5258 JX |
1498 | #, c-format |
1499 | msgid "unable to get type of object %s" | |
1500 | msgstr "无法获得对象 %s 类型" | |
1501 | ||
4c27fcb5 JX |
1502 | #: commit-graph.c:651 |
1503 | msgid "Annotating commits in commit graph" | |
1504 | msgstr "正在注解提交图中的提交" | |
1505 | ||
1506 | #: commit-graph.c:691 | |
1507 | msgid "Computing commit graph generation numbers" | |
1508 | msgstr "正在计算提交图世代数字" | |
1509 | ||
1510 | #: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852 | |
1511 | msgid "Finding commits for commit graph" | |
1512 | msgstr "正在查找提交图的提交" | |
1513 | ||
1514 | #: commit-graph.c:812 | |
c1ac5258 JX |
1515 | #, c-format |
1516 | msgid "error adding pack %s" | |
1517 | msgstr "添加包 %s 出错" | |
1518 | ||
4c27fcb5 | 1519 | #: commit-graph.c:814 |
c1ac5258 JX |
1520 | #, c-format |
1521 | msgid "error opening index for %s" | |
1522 | msgstr "为 %s 打开索引出错" | |
1523 | ||
4c27fcb5 | 1524 | #: commit-graph.c:868 |
fd8cb379 JX |
1525 | #, c-format |
1526 | msgid "the commit graph format cannot write %d commits" | |
4c27fcb5 | 1527 | msgstr "提交图格式不能写入 %d 个提交" |
fd8cb379 | 1528 | |
4c27fcb5 | 1529 | #: commit-graph.c:895 |
fd8cb379 JX |
1530 | msgid "too many commits to write graph" |
1531 | msgstr "提交太多不能画图" | |
1532 | ||
4c27fcb5 | 1533 | #: commit-graph.c:902 midx.c:769 |
fd8cb379 | 1534 | #, c-format |
c1ac5258 JX |
1535 | msgid "unable to create leading directories of %s" |
1536 | msgstr "不能为 %s 创建先导目录" | |
1537 | ||
4c27fcb5 | 1538 | #: commit-graph.c:1002 |
c1ac5258 | 1539 | msgid "the commit-graph file has incorrect checksum and is likely corrupt" |
4c27fcb5 JX |
1540 | msgstr "提交图文件的校验码错误,可能已经损坏" |
1541 | ||
1542 | #: commit-graph.c:1046 | |
1543 | msgid "Verifying commits in commit graph" | |
1544 | msgstr "校验提交图中的提交" | |
fd8cb379 | 1545 | |
5809aa05 | 1546 | #: compat/obstack.c:405 compat/obstack.c:407 |
a0b6b246 JX |
1547 | msgid "memory exhausted" |
1548 | msgstr "内存耗尽" | |
90314792 | 1549 | |
c1ac5258 JX |
1550 | #: config.c:123 |
1551 | #, c-format | |
1552 | msgid "" | |
1553 | "exceeded maximum include depth (%d) while including\n" | |
1554 | "\t%s\n" | |
1555 | "from\n" | |
1556 | "\t%s\n" | |
1557 | "This might be due to circular includes." | |
1558 | msgstr "" | |
e640d114 | 1559 | "超过了最大包含深度(%1$d),当从\n" |
c1ac5258 JX |
1560 | "\t%3$s\n" |
1561 | "包含\n" | |
1562 | "\t%2$s\n" | |
e640d114 | 1563 | "这可能是因为循环包含。" |
c1ac5258 JX |
1564 | |
1565 | #: config.c:139 | |
1566 | #, c-format | |
1567 | msgid "could not expand include path '%s'" | |
1568 | msgstr "无法扩展包含路径 '%s'" | |
1569 | ||
1570 | #: config.c:150 | |
1571 | msgid "relative config includes must come from files" | |
1572 | msgstr "相对路径的配置文件引用必须来自于文件" | |
1573 | ||
1574 | #: config.c:190 | |
87cb7997 | 1575 | msgid "relative config include conditionals must come from files" |
c1ac5258 JX |
1576 | msgstr "相对路径的配置文件条件引用必须来自于文件" |
1577 | ||
1578 | #: config.c:348 | |
1579 | #, c-format | |
1580 | msgid "key does not contain a section: %s" | |
1581 | msgstr "键名没有包含一个小节名称:%s" | |
87cb7997 | 1582 | |
c1ac5258 JX |
1583 | #: config.c:354 |
1584 | #, c-format | |
1585 | msgid "key does not contain variable name: %s" | |
1586 | msgstr "键名没有包含变量名:%s" | |
1587 | ||
4c27fcb5 | 1588 | #: config.c:378 sequencer.c:2296 |
c1ac5258 JX |
1589 | #, c-format |
1590 | msgid "invalid key: %s" | |
1591 | msgstr "无效键名:%s" | |
1592 | ||
1593 | #: config.c:384 | |
1594 | #, c-format | |
1595 | msgid "invalid key (newline): %s" | |
1596 | msgstr "无效键名(有换行符):%s" | |
1597 | ||
1598 | #: config.c:420 config.c:432 | |
1599 | #, c-format | |
1600 | msgid "bogus config parameter: %s" | |
1601 | msgstr "伪配置参数:%s" | |
1602 | ||
1603 | #: config.c:467 | |
1604 | #, c-format | |
1605 | msgid "bogus format in %s" | |
1606 | msgstr "%s 中格式错误" | |
1607 | ||
1608 | #: config.c:793 | |
90314792 | 1609 | #, c-format |
a0b6b246 JX |
1610 | msgid "bad config line %d in blob %s" |
1611 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1612 | |
c1ac5258 | 1613 | #: config.c:797 |
a77c07d9 | 1614 | #, c-format |
a0b6b246 JX |
1615 | msgid "bad config line %d in file %s" |
1616 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 1617 | |
c1ac5258 | 1618 | #: config.c:801 |
a77c07d9 | 1619 | #, c-format |
a0b6b246 JX |
1620 | msgid "bad config line %d in standard input" |
1621 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 1622 | |
c1ac5258 | 1623 | #: config.c:805 |
90314792 | 1624 | #, c-format |
a0b6b246 JX |
1625 | msgid "bad config line %d in submodule-blob %s" |
1626 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 1627 | |
c1ac5258 | 1628 | #: config.c:809 |
90314792 | 1629 | #, c-format |
a0b6b246 JX |
1630 | msgid "bad config line %d in command line %s" |
1631 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 1632 | |
c1ac5258 | 1633 | #: config.c:813 |
90314792 | 1634 | #, c-format |
a0b6b246 JX |
1635 | msgid "bad config line %d in %s" |
1636 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 1637 | |
c1ac5258 | 1638 | #: config.c:952 |
a0b6b246 JX |
1639 | msgid "out of range" |
1640 | msgstr "超出范围" | |
6c94aba5 | 1641 | |
c1ac5258 | 1642 | #: config.c:952 |
a0b6b246 JX |
1643 | msgid "invalid unit" |
1644 | msgstr "无效的单位" | |
6c94aba5 | 1645 | |
c1ac5258 | 1646 | #: config.c:958 |
6c94aba5 | 1647 | #, c-format |
a0b6b246 JX |
1648 | msgid "bad numeric config value '%s' for '%s': %s" |
1649 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 1650 | |
c1ac5258 | 1651 | #: config.c:963 |
1b7f4a34 | 1652 | #, c-format |
a0b6b246 JX |
1653 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
1654 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1655 | |
c1ac5258 | 1656 | #: config.c:966 |
1b7f4a34 | 1657 | #, c-format |
a0b6b246 JX |
1658 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
1659 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1660 | |
c1ac5258 | 1661 | #: config.c:969 |
1b7f4a34 | 1662 | #, c-format |
a0b6b246 JX |
1663 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
1664 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 1665 | |
c1ac5258 | 1666 | #: config.c:972 |
1b7f4a34 | 1667 | #, c-format |
a0b6b246 JX |
1668 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
1669 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 1670 | |
c1ac5258 | 1671 | #: config.c:975 |
94550ed3 | 1672 | #, c-format |
a0b6b246 JX |
1673 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
1674 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1675 | |
c1ac5258 | 1676 | #: config.c:978 |
276ceeaa | 1677 | #, c-format |
a0b6b246 JX |
1678 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
1679 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 1680 | |
c1ac5258 | 1681 | #: config.c:1073 |
276ceeaa | 1682 | #, c-format |
a0b6b246 | 1683 | msgid "failed to expand user dir in: '%s'" |
c1ac5258 | 1684 | msgstr "无法扩展用户目录:'%s'" |
94550ed3 | 1685 | |
c1ac5258 | 1686 | #: config.c:1082 |
5809aa05 JX |
1687 | #, c-format |
1688 | msgid "'%s' for '%s' is not a valid timestamp" | |
1689 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
1690 | ||
c1ac5258 JX |
1691 | #: config.c:1173 |
1692 | #, c-format | |
1693 | msgid "abbrev length out of range: %d" | |
1694 | msgstr "缩写长度超出范围:%d" | |
1695 | ||
1696 | #: config.c:1187 config.c:1198 | |
3495628d | 1697 | #, c-format |
a0b6b246 JX |
1698 | msgid "bad zlib compression level %d" |
1699 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 1700 | |
c1ac5258 JX |
1701 | #: config.c:1290 |
1702 | msgid "core.commentChar should only be one character" | |
1703 | msgstr "core.commentChar 应该是一个字符" | |
1704 | ||
1705 | #: config.c:1323 | |
3495628d | 1706 | #, c-format |
a0b6b246 JX |
1707 | msgid "invalid mode for object creation: %s" |
1708 | msgstr "无效的对象创建模式:%s" | |
3495628d | 1709 | |
4c27fcb5 | 1710 | #: config.c:1395 |
c1ac5258 JX |
1711 | #, c-format |
1712 | msgid "malformed value for %s" | |
1713 | msgstr "%s 的取值格式错误" | |
1714 | ||
4c27fcb5 | 1715 | #: config.c:1421 |
c1ac5258 JX |
1716 | #, c-format |
1717 | msgid "malformed value for %s: %s" | |
1718 | msgstr "%s 的取值格式错误:%s" | |
1719 | ||
4c27fcb5 | 1720 | #: config.c:1422 |
c1ac5258 JX |
1721 | msgid "must be one of nothing, matching, simple, upstream or current" |
1722 | msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" | |
1723 | ||
4c27fcb5 | 1724 | #: config.c:1481 builtin/pack-objects.c:3391 |
1a79b2f1 JX |
1725 | #, c-format |
1726 | msgid "bad pack compression level %d" | |
1727 | msgstr "错误的打包压缩级别 %d" | |
1728 | ||
4c27fcb5 | 1729 | #: config.c:1602 |
c1ac5258 JX |
1730 | #, c-format |
1731 | msgid "unable to load config blob object '%s'" | |
1732 | msgstr "无法从数据对象 '%s' 加载配置" | |
1733 | ||
4c27fcb5 | 1734 | #: config.c:1605 |
c1ac5258 JX |
1735 | #, c-format |
1736 | msgid "reference '%s' does not point to a blob" | |
1737 | msgstr "引用 '%s' 没有指向一个数据对象" | |
1738 | ||
4c27fcb5 | 1739 | #: config.c:1622 |
c1ac5258 JX |
1740 | #, c-format |
1741 | msgid "unable to resolve config blob '%s'" | |
1742 | msgstr "不能解析配置对象 '%s'" | |
1743 | ||
4c27fcb5 | 1744 | #: config.c:1652 |
c1ac5258 JX |
1745 | #, c-format |
1746 | msgid "failed to parse %s" | |
1747 | msgstr "解析 %s 失败" | |
1748 | ||
4c27fcb5 | 1749 | #: config.c:1705 |
a0b6b246 JX |
1750 | msgid "unable to parse command-line config" |
1751 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 1752 | |
4c27fcb5 | 1753 | #: config.c:2037 |
a0b6b246 JX |
1754 | msgid "unknown error occurred while reading the configuration files" |
1755 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 1756 | |
4c27fcb5 | 1757 | #: config.c:2207 |
87cb7997 JX |
1758 | #, c-format |
1759 | msgid "Invalid %s: '%s'" | |
1760 | msgstr "无效 %s:'%s'" | |
1761 | ||
4c27fcb5 | 1762 | #: config.c:2250 |
87cb7997 JX |
1763 | #, c-format |
1764 | msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" | |
1765 | msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" | |
1766 | ||
4c27fcb5 | 1767 | #: config.c:2276 |
87cb7997 JX |
1768 | #, c-format |
1769 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
1770 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
1771 | ||
4c27fcb5 | 1772 | #: config.c:2322 |
276ceeaa | 1773 | #, c-format |
a0b6b246 JX |
1774 | msgid "unable to parse '%s' from command-line config" |
1775 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 1776 | |
4c27fcb5 | 1777 | #: config.c:2324 |
94550ed3 | 1778 | #, c-format |
a0b6b246 JX |
1779 | msgid "bad config variable '%s' in file '%s' at line %d" |
1780 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 1781 | |
4c27fcb5 | 1782 | #: config.c:2405 |
c1ac5258 JX |
1783 | #, c-format |
1784 | msgid "invalid section name '%s'" | |
1785 | msgstr "无效的小节名称 '%s'" | |
1786 | ||
4c27fcb5 | 1787 | #: config.c:2437 |
276ceeaa | 1788 | #, c-format |
a0b6b246 JX |
1789 | msgid "%s has multiple values" |
1790 | msgstr "%s 有多个取值" | |
276ceeaa | 1791 | |
4c27fcb5 | 1792 | #: config.c:2466 |
c1ac5258 JX |
1793 | #, c-format |
1794 | msgid "failed to write new configuration file %s" | |
1795 | msgstr "写入新的配置文件 %s 失败" | |
1796 | ||
4c27fcb5 | 1797 | #: config.c:2717 config.c:3041 |
c1ac5258 JX |
1798 | #, c-format |
1799 | msgid "could not lock config file %s" | |
1800 | msgstr "不能锁定配置文件 %s" | |
1801 | ||
4c27fcb5 | 1802 | #: config.c:2728 |
c1ac5258 JX |
1803 | #, c-format |
1804 | msgid "opening %s" | |
1805 | msgstr "打开 %s" | |
1806 | ||
4c27fcb5 | 1807 | #: config.c:2763 builtin/config.c:327 |
c1ac5258 JX |
1808 | #, c-format |
1809 | msgid "invalid pattern: %s" | |
1810 | msgstr "无效模式:%s" | |
1811 | ||
4c27fcb5 | 1812 | #: config.c:2788 |
c1ac5258 JX |
1813 | #, c-format |
1814 | msgid "invalid config file %s" | |
1815 | msgstr "无效的配置文件 %s" | |
1816 | ||
4c27fcb5 | 1817 | #: config.c:2801 config.c:3054 |
1a79b2f1 JX |
1818 | #, c-format |
1819 | msgid "fstat on %s failed" | |
65e2041e | 1820 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 1821 | |
4c27fcb5 | 1822 | #: config.c:2812 |
c1ac5258 JX |
1823 | #, c-format |
1824 | msgid "unable to mmap '%s'" | |
1825 | msgstr "不能 mmap '%s'" | |
1826 | ||
4c27fcb5 | 1827 | #: config.c:2821 config.c:3059 |
c1ac5258 JX |
1828 | #, c-format |
1829 | msgid "chmod on %s failed" | |
1830 | msgstr "对 %s 调用 chmod 失败" | |
1831 | ||
4c27fcb5 | 1832 | #: config.c:2906 config.c:3156 |
c1ac5258 JX |
1833 | #, c-format |
1834 | msgid "could not write config file %s" | |
1835 | msgstr "不能写入配置文件 %s" | |
1836 | ||
4c27fcb5 | 1837 | #: config.c:2940 |
94550ed3 | 1838 | #, c-format |
a0b6b246 JX |
1839 | msgid "could not set '%s' to '%s'" |
1840 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 1841 | |
4c27fcb5 | 1842 | #: config.c:2942 builtin/remote.c:782 |
276ceeaa | 1843 | #, c-format |
a0b6b246 JX |
1844 | msgid "could not unset '%s'" |
1845 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 1846 | |
4c27fcb5 | 1847 | #: config.c:3032 |
c1ac5258 JX |
1848 | #, c-format |
1849 | msgid "invalid section name: %s" | |
1850 | msgstr "无效的小节名称:%s" | |
1851 | ||
4c27fcb5 | 1852 | #: config.c:3199 |
c1ac5258 JX |
1853 | #, c-format |
1854 | msgid "missing value for '%s'" | |
1855 | msgstr "%s 的取值缺失" | |
1856 | ||
fd8cb379 | 1857 | #: connect.c:61 |
c1ac5258 JX |
1858 | msgid "the remote end hung up upon initial contact" |
1859 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 1860 | |
fd8cb379 | 1861 | #: connect.c:63 |
a0b6b246 JX |
1862 | msgid "" |
1863 | "Could not read from remote repository.\n" | |
1864 | "\n" | |
1865 | "Please make sure you have the correct access rights\n" | |
1866 | "and the repository exists." | |
1867 | msgstr "" | |
1868 | "无法读取远程仓库。\n" | |
1869 | "\n" | |
1870 | "请确认您有正确的访问权限并且仓库存在。" | |
1871 | ||
c1ac5258 JX |
1872 | #: connect.c:81 |
1873 | #, c-format | |
1874 | msgid "server doesn't support '%s'" | |
1875 | msgstr "服务器不支持 '%s'" | |
1876 | ||
1877 | #: connect.c:103 | |
1878 | #, c-format | |
1879 | msgid "server doesn't support feature '%s'" | |
1880 | msgstr "服务器不支持特性 '%s'" | |
1881 | ||
1882 | #: connect.c:114 | |
1883 | msgid "expected flush after capabilities" | |
1884 | msgstr "在能力之后应为一个 flush 包" | |
1885 | ||
1886 | #: connect.c:233 | |
1887 | #, c-format | |
1888 | msgid "ignoring capabilities after first line '%s'" | |
e640d114 | 1889 | msgstr "忽略第一行 '%s' 之后的能力字段" |
c1ac5258 JX |
1890 | |
1891 | #: connect.c:252 | |
1892 | msgid "protocol error: unexpected capabilities^{}" | |
1893 | msgstr "协议错误:意外的 capabilities^{}" | |
1894 | ||
1895 | #: connect.c:273 | |
1896 | #, c-format | |
1897 | msgid "protocol error: expected shallow sha-1, got '%s'" | |
1898 | msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" | |
1899 | ||
1900 | #: connect.c:275 | |
1901 | msgid "repository on the other end cannot be shallow" | |
1902 | msgstr "另一端的仓库不能是浅克隆仓库" | |
1903 | ||
4c27fcb5 | 1904 | #: connect.c:310 fetch-pack.c:182 builtin/archive.c:63 |
c1ac5258 JX |
1905 | #, c-format |
1906 | msgid "remote error: %s" | |
1907 | msgstr "远程错误:%s" | |
1908 | ||
1909 | #: connect.c:316 | |
1910 | msgid "invalid packet" | |
1911 | msgstr "无效数据包" | |
1912 | ||
1913 | #: connect.c:336 | |
1914 | #, c-format | |
1915 | msgid "protocol error: unexpected '%s'" | |
1916 | msgstr "协议错误:意外的 '%s'" | |
1917 | ||
1918 | #: connect.c:444 | |
1919 | #, c-format | |
1920 | msgid "invalid ls-refs response: %s" | |
1921 | msgstr "无效的 ls-refs 响应:%s" | |
1922 | ||
1923 | #: connect.c:448 | |
1924 | msgid "expected flush after ref listing" | |
1925 | msgstr "在引用列表之后应该有一个 flush 包" | |
1926 | ||
1927 | #: connect.c:547 | |
1928 | #, c-format | |
1929 | msgid "protocol '%s' is not supported" | |
1930 | msgstr "不支持 '%s' 协议" | |
1931 | ||
1932 | #: connect.c:598 | |
1933 | msgid "unable to set SO_KEEPALIVE on socket" | |
1934 | msgstr "无法为 socket 设置 SO_KEEPALIVE" | |
1935 | ||
1936 | #: connect.c:638 connect.c:701 | |
1937 | #, c-format | |
1938 | msgid "Looking up %s ... " | |
1939 | msgstr "查找 %s ..." | |
1940 | ||
1941 | #: connect.c:642 | |
1942 | #, c-format | |
1943 | msgid "unable to look up %s (port %s) (%s)" | |
1944 | msgstr "无法查找 %s(端口 %s)(%s)" | |
1945 | ||
1946 | #. TRANSLATORS: this is the end of "Looking up %s ... " | |
1947 | #: connect.c:646 connect.c:717 | |
1948 | #, c-format | |
1949 | msgid "" | |
1950 | "done.\n" | |
1951 | "Connecting to %s (port %s) ... " | |
1952 | msgstr "" | |
1953 | "完成。\n" | |
1954 | "连接到 %s(端口 %s)... " | |
1955 | ||
1956 | #: connect.c:668 connect.c:745 | |
1957 | #, c-format | |
1958 | msgid "" | |
1959 | "unable to connect to %s:\n" | |
1960 | "%s" | |
1961 | msgstr "" | |
1962 | "无法连接到 %s:\n" | |
1963 | "%s" | |
1964 | ||
1965 | #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " | |
1966 | #: connect.c:674 connect.c:751 | |
1967 | msgid "done." | |
1968 | msgstr "完成。" | |
1969 | ||
1970 | #: connect.c:705 | |
1971 | #, c-format | |
1972 | msgid "unable to look up %s (%s)" | |
1973 | msgstr "无法查找 %s(%s)" | |
1974 | ||
1975 | #: connect.c:711 | |
1976 | #, c-format | |
1977 | msgid "unknown port %s" | |
1978 | msgstr "未知端口 %s" | |
1979 | ||
1980 | #: connect.c:848 connect.c:1174 | |
1981 | #, c-format | |
1982 | msgid "strange hostname '%s' blocked" | |
1983 | msgstr "已阻止奇怪的主机名 '%s'" | |
1984 | ||
1985 | #: connect.c:850 | |
1986 | #, c-format | |
1987 | msgid "strange port '%s' blocked" | |
1988 | msgstr "已阻止奇怪的端口号 '%s'" | |
1989 | ||
1990 | #: connect.c:860 | |
1991 | #, c-format | |
1992 | msgid "cannot start proxy %s" | |
1993 | msgstr "不能启动代理 %s" | |
1994 | ||
1995 | #: connect.c:927 | |
1996 | msgid "no path specified; see 'git help pull' for valid url syntax" | |
1997 | msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" | |
1998 | ||
1999 | #: connect.c:1122 | |
2000 | msgid "ssh variant 'simple' does not support -4" | |
2001 | msgstr "ssh 变体 'simple' 不支持 -4" | |
2002 | ||
2003 | #: connect.c:1134 | |
2004 | msgid "ssh variant 'simple' does not support -6" | |
2005 | msgstr "ssh 变体 'simple' 不支持 -6" | |
2006 | ||
2007 | #: connect.c:1151 | |
2008 | msgid "ssh variant 'simple' does not support setting port" | |
e640d114 | 2009 | msgstr "ssh 变体 'simple' 不支持设置端口" |
c1ac5258 JX |
2010 | |
2011 | #: connect.c:1262 | |
2012 | #, c-format | |
2013 | msgid "strange pathname '%s' blocked" | |
2014 | msgstr "已阻止奇怪的路径名 '%s'" | |
2015 | ||
2016 | #: connect.c:1307 | |
2017 | msgid "unable to fork" | |
2018 | msgstr "无法 fork" | |
2019 | ||
4c27fcb5 | 2020 | #: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147 |
a0b6b246 JX |
2021 | msgid "Checking connectivity" |
2022 | msgstr "检查连接中" | |
2023 | ||
c1ac5258 | 2024 | #: connected.c:80 |
a0b6b246 JX |
2025 | msgid "Could not run 'git rev-list'" |
2026 | msgstr "不能执行 'git rev-list'" | |
2027 | ||
c1ac5258 | 2028 | #: connected.c:100 |
a0b6b246 | 2029 | msgid "failed write to rev-list" |
c1ac5258 | 2030 | msgstr "写入 rev-list 失败" |
a0b6b246 | 2031 | |
c1ac5258 | 2032 | #: connected.c:107 |
a0b6b246 | 2033 | msgid "failed to close rev-list's stdin" |
c1ac5258 JX |
2034 | msgstr "关闭 rev-list 的标准输入失败" |
2035 | ||
2036 | #: convert.c:194 | |
2037 | #, c-format | |
2038 | msgid "illegal crlf_action %d" | |
2039 | msgstr "非法的 crlf 动作 %d" | |
a0b6b246 | 2040 | |
c1ac5258 | 2041 | #: convert.c:207 |
3495628d | 2042 | #, c-format |
c1ac5258 JX |
2043 | msgid "CRLF would be replaced by LF in %s" |
2044 | msgstr "%s 中的 CRLF 将被 LF 替换" | |
31e5e17b | 2045 | |
c1ac5258 | 2046 | #: convert.c:209 |
31e5e17b | 2047 | #, c-format |
a0b6b246 JX |
2048 | msgid "" |
2049 | "CRLF will be replaced by LF in %s.\n" | |
c1ac5258 | 2050 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2051 | msgstr "" |
c1ac5258 | 2052 | "%s 中的 CRLF 将被 LF 替换。<\n" |
a0b6b246 | 2053 | "在工作区中该文件仍保持原有的换行符。" |
3495628d | 2054 | |
c1ac5258 | 2055 | #: convert.c:217 |
3495628d | 2056 | #, c-format |
31e5e17b JX |
2057 | msgid "LF would be replaced by CRLF in %s" |
2058 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 2059 | |
c1ac5258 | 2060 | #: convert.c:219 |
276ceeaa | 2061 | #, c-format |
a0b6b246 JX |
2062 | msgid "" |
2063 | "LF will be replaced by CRLF in %s.\n" | |
c1ac5258 | 2064 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2065 | msgstr "" |
c1ac5258 JX |
2066 | "%s 中的 LF 将被 CRLF 替换。\n" |
2067 | "在工作区中该文件仍保持原有的换行符" | |
276ceeaa | 2068 | |
c1ac5258 | 2069 | #: convert.c:280 |
fd8cb379 JX |
2070 | #, c-format |
2071 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
2072 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
2073 | ||
c1ac5258 | 2074 | #: convert.c:287 |
fd8cb379 JX |
2075 | #, c-format |
2076 | msgid "" | |
2077 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" | |
2078 | "tree-encoding." | |
2079 | msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。" | |
2080 | ||
c1ac5258 | 2081 | #: convert.c:305 |
fd8cb379 JX |
2082 | #, c-format |
2083 | msgid "BOM is required in '%s' if encoded as %s" | |
2084 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
2085 | ||
c1ac5258 | 2086 | #: convert.c:307 |
fd8cb379 JX |
2087 | #, c-format |
2088 | msgid "" | |
2089 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
2090 | "%sLE (depending on the byte order) as working-tree-encoding." | |
2091 | msgstr "" | |
2092 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
2093 | "节序)作为工作区编码。" | |
2094 | ||
c1ac5258 | 2095 | #: convert.c:425 convert.c:496 |
fd8cb379 JX |
2096 | #, c-format |
2097 | msgid "failed to encode '%s' from %s to %s" | |
2098 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
2099 | ||
c1ac5258 | 2100 | #: convert.c:468 |
fd8cb379 JX |
2101 | #, c-format |
2102 | msgid "encoding '%s' from %s to %s and back is not the same" | |
2103 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
2104 | ||
c1ac5258 JX |
2105 | #: convert.c:674 |
2106 | #, c-format | |
2107 | msgid "cannot fork to run external filter '%s'" | |
e640d114 | 2108 | msgstr "不能 fork 以执行外部过滤器 '%s'" |
c1ac5258 JX |
2109 | |
2110 | #: convert.c:694 | |
2111 | #, c-format | |
2112 | msgid "cannot feed the input to external filter '%s'" | |
e640d114 | 2113 | msgstr "不能将输入传递给外部过滤器 '%s'" |
c1ac5258 JX |
2114 | |
2115 | #: convert.c:701 | |
2116 | #, c-format | |
2117 | msgid "external filter '%s' failed %d" | |
e640d114 | 2118 | msgstr "外部过滤器 '%s' 失败码 %d" |
c1ac5258 JX |
2119 | |
2120 | #: convert.c:736 convert.c:739 | |
2121 | #, c-format | |
2122 | msgid "read from external filter '%s' failed" | |
2123 | msgstr "从外部过滤器 '%s' 读取失败" | |
2124 | ||
2125 | #: convert.c:742 convert.c:796 | |
2126 | #, c-format | |
2127 | msgid "external filter '%s' failed" | |
2128 | msgstr "外部过滤器 '%s' 失败" | |
2129 | ||
2130 | #: convert.c:844 | |
2131 | msgid "unexpected filter type" | |
2132 | msgstr "意外的过滤类型" | |
2133 | ||
2134 | #: convert.c:855 | |
2135 | msgid "path name too long for external filter" | |
2136 | msgstr "外部过滤器的路径名太长" | |
2137 | ||
2138 | #: convert.c:929 | |
2139 | #, c-format | |
2140 | msgid "" | |
2141 | "external filter '%s' is not available anymore although not all paths have " | |
2142 | "been filtered" | |
2143 | msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" | |
2144 | ||
2145 | #: convert.c:1228 | |
fd8cb379 JX |
2146 | msgid "true/false are no valid working-tree-encodings" |
2147 | msgstr "true/false 不是有效的工作区编码" | |
2148 | ||
4c27fcb5 | 2149 | #: convert.c:1398 convert.c:1432 |
c1ac5258 JX |
2150 | #, c-format |
2151 | msgid "%s: clean filter '%s' failed" | |
2152 | msgstr "%s:clean 过滤器 '%s' 失败" | |
2153 | ||
4c27fcb5 | 2154 | #: convert.c:1476 |
c1ac5258 JX |
2155 | #, c-format |
2156 | msgid "%s: smudge filter %s failed" | |
2157 | msgstr "%s:smudge 过滤器 %s 失败" | |
2158 | ||
a4f16749 | 2159 | #: date.c:116 |
a0b6b246 JX |
2160 | msgid "in the future" |
2161 | msgstr "在将来" | |
3495628d | 2162 | |
a4f16749 | 2163 | #: date.c:122 |
3495628d | 2164 | #, c-format |
a4f16749 JX |
2165 | msgid "%<PRIuMAX> second ago" |
2166 | msgid_plural "%<PRIuMAX> seconds ago" | |
2167 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
2168 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 2169 | |
a4f16749 | 2170 | #: date.c:129 |
3495628d | 2171 | #, c-format |
a4f16749 JX |
2172 | msgid "%<PRIuMAX> minute ago" |
2173 | msgid_plural "%<PRIuMAX> minutes ago" | |
2174 | msgstr[0] "%<PRIuMAX> 分钟前" | |
2175 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 2176 | |
a4f16749 | 2177 | #: date.c:136 |
3495628d | 2178 | #, c-format |
a4f16749 JX |
2179 | msgid "%<PRIuMAX> hour ago" |
2180 | msgid_plural "%<PRIuMAX> hours ago" | |
2181 | msgstr[0] "%<PRIuMAX> 小时前" | |
2182 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 2183 | |
a4f16749 | 2184 | #: date.c:143 |
3495628d | 2185 | #, c-format |
a4f16749 JX |
2186 | msgid "%<PRIuMAX> day ago" |
2187 | msgid_plural "%<PRIuMAX> days ago" | |
2188 | msgstr[0] "%<PRIuMAX> 天前" | |
2189 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 2190 | |
a4f16749 | 2191 | #: date.c:149 |
94550ed3 | 2192 | #, c-format |
a4f16749 JX |
2193 | msgid "%<PRIuMAX> week ago" |
2194 | msgid_plural "%<PRIuMAX> weeks ago" | |
2195 | msgstr[0] "%<PRIuMAX> 周前" | |
2196 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 2197 | |
a4f16749 | 2198 | #: date.c:156 |
3495628d | 2199 | #, c-format |
a4f16749 JX |
2200 | msgid "%<PRIuMAX> month ago" |
2201 | msgid_plural "%<PRIuMAX> months ago" | |
2202 | msgstr[0] "%<PRIuMAX> 个月前" | |
2203 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 2204 | |
a4f16749 | 2205 | #: date.c:167 |
3495628d | 2206 | #, c-format |
a4f16749 JX |
2207 | msgid "%<PRIuMAX> year" |
2208 | msgid_plural "%<PRIuMAX> years" | |
2209 | msgstr[0] "%<PRIuMAX> 年" | |
2210 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 2211 | |
a0b6b246 | 2212 | #. TRANSLATORS: "%s" is "<n> years" |
a4f16749 | 2213 | #: date.c:170 |
94550ed3 | 2214 | #, c-format |
a4f16749 JX |
2215 | msgid "%s, %<PRIuMAX> month ago" |
2216 | msgid_plural "%s, %<PRIuMAX> months ago" | |
2217 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
2218 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 2219 | |
a4f16749 | 2220 | #: date.c:175 date.c:180 |
94550ed3 | 2221 | #, c-format |
a4f16749 JX |
2222 | msgid "%<PRIuMAX> year ago" |
2223 | msgid_plural "%<PRIuMAX> years ago" | |
2224 | msgstr[0] "%<PRIuMAX> 年前" | |
2225 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 2226 | |
4c27fcb5 JX |
2227 | #: delta-islands.c:268 |
2228 | msgid "Propagating island marks" | |
2229 | msgstr "正在传播数据岛标记" | |
2230 | ||
2231 | #: delta-islands.c:286 | |
2232 | #, c-format | |
2233 | msgid "bad tree object %s" | |
2234 | msgstr "坏的树对象 %s" | |
2235 | ||
2236 | #: delta-islands.c:330 | |
2237 | #, c-format | |
2238 | msgid "failed to load island regex for '%s': %s" | |
2239 | msgstr "未能加载 '%s' 的数据岛正则表达式:%s" | |
2240 | ||
2241 | #: delta-islands.c:386 | |
2242 | #, c-format | |
2243 | msgid "island regex from config has too many capture groups (max=%d)" | |
2244 | msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)" | |
2245 | ||
2246 | #: delta-islands.c:462 | |
2247 | #, c-format | |
2248 | msgid "Marked %d islands, done.\n" | |
2249 | msgstr "已标记 %d 个数据岛,结束。\n" | |
2250 | ||
a0b6b246 | 2251 | #: diffcore-order.c:24 |
cfff71a9 | 2252 | #, c-format |
a0b6b246 | 2253 | msgid "failed to read orderfile '%s'" |
c1ac5258 | 2254 | msgstr "读取排序文件 '%s' 失败" |
cfff71a9 | 2255 | |
4c27fcb5 | 2256 | #: diffcore-rename.c:544 |
a0b6b246 | 2257 | msgid "Performing inexact rename detection" |
87cb7997 | 2258 | msgstr "正在进行非精确的重命名探测" |
cfff71a9 | 2259 | |
c1ac5258 | 2260 | #: diff.c:108 |
cfff71a9 | 2261 | #, c-format |
a0b6b246 JX |
2262 | msgid "option '%s' requires a value" |
2263 | msgstr "选项 '%s' 需要一个值" | |
cfff71a9 | 2264 | |
a0b6b246 | 2265 | # 译者:注意保持前导空格 |
c1ac5258 | 2266 | #: diff.c:158 |
a0b6b246 JX |
2267 | #, c-format |
2268 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
2269 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 2270 | |
a0b6b246 | 2271 | # 译者:注意保持前导空格 |
c1ac5258 | 2272 | #: diff.c:163 |
a0b6b246 JX |
2273 | #, c-format |
2274 | msgid " Unknown dirstat parameter '%s'\n" | |
2275 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 2276 | |
c1ac5258 | 2277 | #: diff.c:291 |
6937cb4e | 2278 | msgid "" |
c1ac5258 JX |
2279 | "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " |
2280 | "'dimmed-zebra', 'plain'" | |
5809aa05 | 2281 | msgstr "" |
c1ac5258 JX |
2282 | "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " |
2283 | "'plain'" | |
2284 | ||
2285 | #: diff.c:316 | |
2286 | #, c-format | |
2287 | msgid "ignoring unknown color-moved-ws mode '%s'" | |
2288 | msgstr "忽略未知的 color-moved-ws 模式 '%s'" | |
2289 | ||
2290 | #: diff.c:323 | |
2291 | msgid "" | |
2292 | "color-moved-ws: allow-indentation-change cannot be combined with other white " | |
2293 | "space modes" | |
2294 | msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" | |
6937cb4e | 2295 | |
c1ac5258 | 2296 | #: diff.c:394 |
7aea43ff | 2297 | #, c-format |
a0b6b246 JX |
2298 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
2299 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 2300 | |
c1ac5258 | 2301 | #: diff.c:454 |
7aea43ff | 2302 | #, c-format |
a0b6b246 JX |
2303 | msgid "" |
2304 | "Found errors in 'diff.dirstat' config variable:\n" | |
2305 | "%s" | |
2306 | msgstr "" | |
2307 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
2308 | "%s" | |
7aea43ff | 2309 | |
4c27fcb5 | 2310 | #: diff.c:4140 |
7aea43ff | 2311 | #, c-format |
a0b6b246 JX |
2312 | msgid "external diff died, stopping at %s" |
2313 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 2314 | |
4c27fcb5 | 2315 | #: diff.c:4482 |
a0b6b246 JX |
2316 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
2317 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
2318 | ||
4c27fcb5 | 2319 | #: diff.c:4485 |
31e5e17b JX |
2320 | msgid "-G, -S and --find-object are mutually exclusive" |
2321 | msgstr "-G、-S 和 --find-object 是互斥的" | |
2322 | ||
4c27fcb5 | 2323 | #: diff.c:4563 |
a0b6b246 JX |
2324 | msgid "--follow requires exactly one pathspec" |
2325 | msgstr "--follow 明确要求只跟一个路径规格" | |
2326 | ||
4c27fcb5 | 2327 | #: diff.c:4729 |
7aea43ff | 2328 | #, c-format |
a0b6b246 JX |
2329 | msgid "" |
2330 | "Failed to parse --dirstat/-X option parameter:\n" | |
2331 | "%s" | |
2332 | msgstr "" | |
2333 | "无法解析 --dirstat/-X 选项的参数:\n" | |
2334 | "%s" | |
7aea43ff | 2335 | |
4c27fcb5 | 2336 | #: diff.c:4743 |
7aea43ff | 2337 | #, c-format |
a0b6b246 JX |
2338 | msgid "Failed to parse --submodule option parameter: '%s'" |
2339 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
7aea43ff | 2340 | |
4c27fcb5 | 2341 | #: diff.c:5823 |
a0b6b246 JX |
2342 | msgid "inexact rename detection was skipped due to too many files." |
2343 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
2344 | ||
4c27fcb5 | 2345 | #: diff.c:5826 |
a0b6b246 JX |
2346 | msgid "only found copies from modified paths due to too many files." |
2347 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
2348 | ||
4c27fcb5 | 2349 | #: diff.c:5829 |
7aea43ff | 2350 | #, c-format |
a0b6b246 JX |
2351 | msgid "" |
2352 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 2353 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 2354 | |
4c27fcb5 | 2355 | #: dir.c:576 |
c1ac5258 JX |
2356 | #, c-format |
2357 | msgid "pathspec '%s' did not match any file(s) known to git" | |
2358 | msgstr "路径规格 '%s' 未匹配任何 git 已知文件" | |
2359 | ||
4c27fcb5 | 2360 | #: dir.c:965 |
c1ac5258 JX |
2361 | #, c-format |
2362 | msgid "cannot use %s as an exclude file" | |
2363 | msgstr "不能将 %s 用作排除文件" | |
2364 | ||
4c27fcb5 | 2365 | #: dir.c:1880 |
31e5e17b JX |
2366 | #, c-format |
2367 | msgid "could not open directory '%s'" | |
2368 | msgstr "不能打开目录 '%s'" | |
2369 | ||
4c27fcb5 | 2370 | #: dir.c:2122 |
a0b6b246 JX |
2371 | msgid "failed to get kernel name and information" |
2372 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 2373 | |
4c27fcb5 | 2374 | #: dir.c:2246 |
c1ac5258 JX |
2375 | msgid "untracked cache is disabled on this system or location" |
2376 | msgstr "缓存未跟踪文件在本系统或位置中被禁用" | |
2377 | ||
4c27fcb5 | 2378 | #: dir.c:3047 |
c1ac5258 JX |
2379 | #, c-format |
2380 | msgid "index file corrupt in repo %s" | |
2381 | msgstr "仓库 %s 中的索引文件损坏" | |
7aea43ff | 2382 | |
4c27fcb5 | 2383 | #: dir.c:3092 dir.c:3097 |
87cb7997 JX |
2384 | #, c-format |
2385 | msgid "could not create directories for %s" | |
2386 | msgstr "不能为 %s 创建目录" | |
2387 | ||
4c27fcb5 | 2388 | #: dir.c:3126 |
1a79b2f1 JX |
2389 | #, c-format |
2390 | msgid "could not migrate git directory from '%s' to '%s'" | |
2391 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
2392 | ||
4c27fcb5 | 2393 | #: editor.c:73 |
5809aa05 JX |
2394 | #, c-format |
2395 | msgid "hint: Waiting for your editor to close the file...%c" | |
2396 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
2397 | ||
c1ac5258 | 2398 | #: entry.c:178 |
6937cb4e JX |
2399 | msgid "Filtering content" |
2400 | msgstr "过滤内容" | |
2401 | ||
4c27fcb5 | 2402 | #: entry.c:465 |
87cb7997 JX |
2403 | #, c-format |
2404 | msgid "could not stat file '%s'" | |
65e2041e | 2405 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 2406 | |
c1ac5258 JX |
2407 | #: environment.c:150 |
2408 | #, c-format | |
2409 | msgid "bad git namespace path \"%s\"" | |
e640d114 | 2410 | msgstr "错误的 git 名字空间路径 \"%s\"" |
c1ac5258 JX |
2411 | |
2412 | #: environment.c:332 | |
2413 | #, c-format | |
2414 | msgid "could not set GIT_DIR to '%s'" | |
2415 | msgstr "不能设置 GIT_DIR 为 '%s'" | |
2416 | ||
2417 | #: exec-cmd.c:361 | |
2418 | #, c-format | |
2419 | msgid "too many args to run %s" | |
2420 | msgstr "执行 %s 的参数太多" | |
2421 | ||
31e5e17b JX |
2422 | #: fetch-object.c:17 |
2423 | msgid "Remote with no URL" | |
2424 | msgstr "远程未设置 URL" | |
2425 | ||
4c27fcb5 | 2426 | #: fetch-pack.c:151 |
a0b6b246 JX |
2427 | msgid "git fetch-pack: expected shallow list" |
2428 | msgstr "git fetch-pack:应为 shallow 列表" | |
2429 | ||
4c27fcb5 | 2430 | #: fetch-pack.c:163 |
31e5e17b JX |
2431 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
2432 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 2433 | |
4c27fcb5 | 2434 | #: fetch-pack.c:183 |
90314792 | 2435 | #, c-format |
275588f9 | 2436 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 2437 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 2438 | |
4c27fcb5 | 2439 | #: fetch-pack.c:253 |
a0b6b246 JX |
2440 | msgid "--stateless-rpc requires multi_ack_detailed" |
2441 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 2442 | |
4c27fcb5 | 2443 | #: fetch-pack.c:347 fetch-pack.c:1277 |
90314792 | 2444 | #, c-format |
a0b6b246 JX |
2445 | msgid "invalid shallow line: %s" |
2446 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 2447 | |
4c27fcb5 | 2448 | #: fetch-pack.c:353 fetch-pack.c:1283 |
c04f5ac3 | 2449 | #, c-format |
a0b6b246 JX |
2450 | msgid "invalid unshallow line: %s" |
2451 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 2452 | |
4c27fcb5 | 2453 | #: fetch-pack.c:355 fetch-pack.c:1285 |
a0b6b246 JX |
2454 | #, c-format |
2455 | msgid "object not found: %s" | |
2456 | msgstr "对象未找到:%s" | |
07432cef | 2457 | |
4c27fcb5 | 2458 | #: fetch-pack.c:358 fetch-pack.c:1288 |
c04f5ac3 | 2459 | #, c-format |
a0b6b246 JX |
2460 | msgid "error in object: %s" |
2461 | msgstr "对象中出错:%s" | |
07432cef | 2462 | |
4c27fcb5 | 2463 | #: fetch-pack.c:360 fetch-pack.c:1290 |
c04f5ac3 | 2464 | #, c-format |
a0b6b246 JX |
2465 | msgid "no shallow found: %s" |
2466 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 2467 | |
4c27fcb5 | 2468 | #: fetch-pack.c:363 fetch-pack.c:1293 |
a0b6b246 JX |
2469 | #, c-format |
2470 | msgid "expected shallow/unshallow, got %s" | |
2471 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 2472 | |
4c27fcb5 | 2473 | #: fetch-pack.c:404 |
a0b6b246 JX |
2474 | #, c-format |
2475 | msgid "got %s %d %s" | |
2476 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 2477 | |
4c27fcb5 | 2478 | #: fetch-pack.c:421 |
1b7f4a34 | 2479 | #, c-format |
a0b6b246 JX |
2480 | msgid "invalid commit %s" |
2481 | msgstr "无效提交 %s" | |
1b7f4a34 | 2482 | |
4c27fcb5 | 2483 | #: fetch-pack.c:452 |
a0b6b246 JX |
2484 | msgid "giving up" |
2485 | msgstr "放弃" | |
814ff314 | 2486 | |
4c27fcb5 | 2487 | #: fetch-pack.c:464 progress.c:229 |
a0b6b246 JX |
2488 | msgid "done" |
2489 | msgstr "完成" | |
2e8451e8 | 2490 | |
4c27fcb5 | 2491 | #: fetch-pack.c:476 |
2e8451e8 | 2492 | #, c-format |
a0b6b246 JX |
2493 | msgid "got %s (%d) %s" |
2494 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 2495 | |
4c27fcb5 | 2496 | #: fetch-pack.c:522 |
a0b6b246 JX |
2497 | #, c-format |
2498 | msgid "Marking %s as complete" | |
2499 | msgstr "标记 %s 为完成" | |
220c313c | 2500 | |
c1ac5258 | 2501 | #: fetch-pack.c:764 |
a0b6b246 JX |
2502 | #, c-format |
2503 | msgid "already have %s (%s)" | |
29004bbb | 2504 | msgstr "已经有 %s(%s)" |
220c313c | 2505 | |
c1ac5258 | 2506 | #: fetch-pack.c:803 |
a0b6b246 JX |
2507 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
2508 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 2509 | |
c1ac5258 | 2510 | #: fetch-pack.c:811 |
a0b6b246 JX |
2511 | msgid "protocol error: bad pack header" |
2512 | msgstr "协议错误:坏的包头" | |
814ff314 | 2513 | |
c1ac5258 | 2514 | #: fetch-pack.c:879 |
a0b6b246 JX |
2515 | #, c-format |
2516 | msgid "fetch-pack: unable to fork off %s" | |
2517 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 2518 | |
c1ac5258 | 2519 | #: fetch-pack.c:895 |
a0b6b246 JX |
2520 | #, c-format |
2521 | msgid "%s failed" | |
2522 | msgstr "%s 失败" | |
14c8bced | 2523 | |
c1ac5258 | 2524 | #: fetch-pack.c:897 |
a0b6b246 JX |
2525 | msgid "error in sideband demultiplexer" |
2526 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 2527 | |
c1ac5258 | 2528 | #: fetch-pack.c:926 |
a0b6b246 JX |
2529 | msgid "Server does not support shallow clients" |
2530 | msgstr "服务器不支持 shalllow 客户端" | |
c04f5ac3 | 2531 | |
c1ac5258 | 2532 | #: fetch-pack.c:930 |
a0b6b246 JX |
2533 | msgid "Server supports multi_ack_detailed" |
2534 | msgstr "服务器支持 multi_ack_detailed" | |
c04f5ac3 | 2535 | |
c1ac5258 | 2536 | #: fetch-pack.c:933 |
a0b6b246 JX |
2537 | msgid "Server supports no-done" |
2538 | msgstr "服务器支持 no-done" | |
c04f5ac3 | 2539 | |
c1ac5258 | 2540 | #: fetch-pack.c:939 |
a0b6b246 JX |
2541 | msgid "Server supports multi_ack" |
2542 | msgstr "服务器支持 multi_ack" | |
c04f5ac3 | 2543 | |
c1ac5258 | 2544 | #: fetch-pack.c:943 |
a0b6b246 JX |
2545 | msgid "Server supports side-band-64k" |
2546 | msgstr "服务器支持 side-band-64k" | |
c04f5ac3 | 2547 | |
c1ac5258 | 2548 | #: fetch-pack.c:947 |
a0b6b246 JX |
2549 | msgid "Server supports side-band" |
2550 | msgstr "服务器支持 side-band" | |
5c57d762 | 2551 | |
c1ac5258 | 2552 | #: fetch-pack.c:951 |
a0b6b246 JX |
2553 | msgid "Server supports allow-tip-sha1-in-want" |
2554 | msgstr "服务器支持 allow-tip-sha1-in-want" | |
c04f5ac3 | 2555 | |
c1ac5258 | 2556 | #: fetch-pack.c:955 |
a0b6b246 JX |
2557 | msgid "Server supports allow-reachable-sha1-in-want" |
2558 | msgstr "服务器支持 allow-reachable-sha1-in-want" | |
8ada9598 | 2559 | |
c1ac5258 | 2560 | #: fetch-pack.c:965 |
a0b6b246 JX |
2561 | msgid "Server supports ofs-delta" |
2562 | msgstr "服务器支持 ofs-delta" | |
8ada9598 | 2563 | |
4c27fcb5 | 2564 | #: fetch-pack.c:971 fetch-pack.c:1158 |
31e5e17b JX |
2565 | msgid "Server supports filter" |
2566 | msgstr "服务器支持 filter" | |
2567 | ||
c1ac5258 | 2568 | #: fetch-pack.c:979 |
81809b99 | 2569 | #, c-format |
a0b6b246 JX |
2570 | msgid "Server version is %.*s" |
2571 | msgstr "服务器版本 %.*s" | |
8ada9598 | 2572 | |
c1ac5258 | 2573 | #: fetch-pack.c:985 |
a0b6b246 JX |
2574 | msgid "Server does not support --shallow-since" |
2575 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 2576 | |
c1ac5258 | 2577 | #: fetch-pack.c:989 |
a0b6b246 JX |
2578 | msgid "Server does not support --shallow-exclude" |
2579 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 2580 | |
c1ac5258 | 2581 | #: fetch-pack.c:991 |
a0b6b246 JX |
2582 | msgid "Server does not support --deepen" |
2583 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 2584 | |
4c27fcb5 | 2585 | #: fetch-pack.c:1008 |
a0b6b246 JX |
2586 | msgid "no common commits" |
2587 | msgstr "没有共同的提交" | |
c04f5ac3 | 2588 | |
4c27fcb5 | 2589 | #: fetch-pack.c:1020 fetch-pack.c:1418 |
a0b6b246 JX |
2590 | msgid "git fetch-pack: fetch failed." |
2591 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 2592 | |
4c27fcb5 | 2593 | #: fetch-pack.c:1153 |
fd8cb379 JX |
2594 | msgid "Server does not support shallow requests" |
2595 | msgstr "服务器不支持 shalllow 请求" | |
2596 | ||
4c27fcb5 | 2597 | #: fetch-pack.c:1199 |
c1ac5258 JX |
2598 | #, c-format |
2599 | msgid "error reading section header '%s'" | |
2600 | msgstr "读取节标题 '%s' 出错" | |
2601 | ||
4c27fcb5 | 2602 | #: fetch-pack.c:1205 |
c1ac5258 JX |
2603 | #, c-format |
2604 | msgid "expected '%s', received '%s'" | |
2605 | msgstr "预期 '%s',得到 '%s'" | |
2606 | ||
4c27fcb5 | 2607 | #: fetch-pack.c:1244 |
c1ac5258 JX |
2608 | #, c-format |
2609 | msgid "unexpected acknowledgment line: '%s'" | |
2610 | msgstr "意外的确认行:'%s'" | |
2611 | ||
4c27fcb5 | 2612 | #: fetch-pack.c:1249 |
c1ac5258 JX |
2613 | #, c-format |
2614 | msgid "error processing acks: %d" | |
2615 | msgstr "处理 ack 出错:%d" | |
2616 | ||
4c27fcb5 JX |
2617 | #: fetch-pack.c:1259 |
2618 | msgid "expected packfile to be sent after 'ready'" | |
2619 | msgstr "预期在 'ready' 之后发送 packfile" | |
2620 | ||
2621 | #: fetch-pack.c:1261 | |
2622 | msgid "expected no other sections to be sent after no 'ready'" | |
2623 | msgstr "在没有 'ready' 不应该发送其它小节" | |
2624 | ||
2625 | #: fetch-pack.c:1298 | |
c1ac5258 JX |
2626 | #, c-format |
2627 | msgid "error processing shallow info: %d" | |
2628 | msgstr "处理浅克隆信息出错:%d" | |
2629 | ||
4c27fcb5 | 2630 | #: fetch-pack.c:1314 |
c1ac5258 JX |
2631 | #, c-format |
2632 | msgid "expected wanted-ref, got '%s'" | |
2633 | msgstr "预期 wanted-ref,得到 '%s'" | |
2634 | ||
4c27fcb5 | 2635 | #: fetch-pack.c:1324 |
c1ac5258 JX |
2636 | #, c-format |
2637 | msgid "unexpected wanted-ref: '%s'" | |
2638 | msgstr "意外的 wanted-ref:'%s'" | |
2639 | ||
4c27fcb5 | 2640 | #: fetch-pack.c:1328 |
c1ac5258 JX |
2641 | #, c-format |
2642 | msgid "error processing wanted refs: %d" | |
2643 | msgstr "处理要获取的引用出错:%d" | |
2644 | ||
4c27fcb5 | 2645 | #: fetch-pack.c:1642 |
a0b6b246 JX |
2646 | msgid "no matching remote head" |
2647 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 2648 | |
4c27fcb5 | 2649 | #: fetch-pack.c:1660 builtin/clone.c:664 |
c1ac5258 | 2650 | msgid "remote did not send all necessary objects" |
e640d114 | 2651 | msgstr "远程没有发送所有必需的对象" |
c1ac5258 | 2652 | |
4c27fcb5 | 2653 | #: fetch-pack.c:1686 |
87cb7997 JX |
2654 | #, c-format |
2655 | msgid "no such remote ref %s" | |
2656 | msgstr "没有这样的远程引用 %s" | |
2657 | ||
4c27fcb5 | 2658 | #: fetch-pack.c:1689 |
87cb7997 JX |
2659 | #, c-format |
2660 | msgid "Server does not allow request for unadvertised object %s" | |
2661 | msgstr "服务器不允许请求未公开的对象 %s" | |
2662 | ||
4c27fcb5 | 2663 | #: gpg-interface.c:318 |
a0b6b246 JX |
2664 | msgid "gpg failed to sign the data" |
2665 | msgstr "gpg 无法为数据签名" | |
c04f5ac3 | 2666 | |
4c27fcb5 | 2667 | #: gpg-interface.c:344 |
a0b6b246 JX |
2668 | msgid "could not create temporary file" |
2669 | msgstr "不能创建临时文件" | |
c04f5ac3 | 2670 | |
4c27fcb5 | 2671 | #: gpg-interface.c:347 |
c04f5ac3 | 2672 | #, c-format |
a0b6b246 JX |
2673 | msgid "failed writing detached signature to '%s'" |
2674 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 2675 | |
a4f16749 | 2676 | #: graph.c:97 |
1a79b2f1 JX |
2677 | #, c-format |
2678 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
2679 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
2680 | ||
4c27fcb5 | 2681 | #: grep.c:2113 |
c04f5ac3 | 2682 | #, c-format |
a0b6b246 JX |
2683 | msgid "'%s': unable to read %s" |
2684 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 2685 | |
4c27fcb5 | 2686 | #: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 |
31e5e17b | 2687 | #: builtin/rm.c:134 |
c04f5ac3 | 2688 | #, c-format |
a0b6b246 | 2689 | msgid "failed to stat '%s'" |
65e2041e | 2690 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 2691 | |
4c27fcb5 | 2692 | #: grep.c:2141 |
a0b6b246 JX |
2693 | #, c-format |
2694 | msgid "'%s': short read" | |
2695 | msgstr "'%s':读取不完整" | |
5c57d762 | 2696 | |
fd8cb379 JX |
2697 | #: help.c:23 |
2698 | msgid "start a working area (see also: git help tutorial)" | |
2699 | msgstr "开始一个工作区(参见:git help tutorial)" | |
2700 | ||
2701 | #: help.c:24 | |
2702 | msgid "work on the current change (see also: git help everyday)" | |
2703 | msgstr "在当前变更上工作(参见:git help everyday)" | |
2704 | ||
2705 | #: help.c:25 | |
2706 | msgid "examine the history and state (see also: git help revisions)" | |
2707 | msgstr "检查历史和状态(参见:git help revisions)" | |
2708 | ||
2709 | #: help.c:26 | |
2710 | msgid "grow, mark and tweak your common history" | |
2711 | msgstr "扩展、标记和调校您的历史记录" | |
2712 | ||
2713 | #: help.c:27 | |
2714 | msgid "collaborate (see also: git help workflows)" | |
2715 | msgstr "协同(参见:git help workflows)" | |
2716 | ||
2717 | #: help.c:31 | |
2718 | msgid "Main Porcelain Commands" | |
2719 | msgstr "主要的上层命令" | |
2720 | ||
2721 | #: help.c:32 | |
2722 | msgid "Ancillary Commands / Manipulators" | |
2723 | msgstr "辅助命令/操作者" | |
2724 | ||
2725 | #: help.c:33 | |
2726 | msgid "Ancillary Commands / Interrogators" | |
2727 | msgstr "辅助命令/询问者" | |
2728 | ||
2729 | #: help.c:34 | |
2730 | msgid "Interacting with Others" | |
2731 | msgstr "与其它系统交互" | |
2732 | ||
2733 | #: help.c:35 | |
2734 | msgid "Low-level Commands / Manipulators" | |
2735 | msgstr "低级命令/操作者" | |
2736 | ||
2737 | #: help.c:36 | |
2738 | msgid "Low-level Commands / Interrogators" | |
2739 | msgstr "低级命令/询问者" | |
2740 | ||
2741 | #: help.c:37 | |
2742 | msgid "Low-level Commands / Synching Repositories" | |
2743 | msgstr "低级命令/同步仓库" | |
2744 | ||
2745 | #: help.c:38 | |
2746 | msgid "Low-level Commands / Internal Helpers" | |
2747 | msgstr "低级命令/内部助手" | |
2748 | ||
4c27fcb5 | 2749 | #: help.c:296 |
a0b6b246 JX |
2750 | #, c-format |
2751 | msgid "available git commands in '%s'" | |
2752 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 2753 | |
4c27fcb5 | 2754 | #: help.c:303 |
a0b6b246 JX |
2755 | msgid "git commands available from elsewhere on your $PATH" |
2756 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 2757 | |
4c27fcb5 | 2758 | #: help.c:312 |
a0b6b246 JX |
2759 | msgid "These are common Git commands used in various situations:" |
2760 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 2761 | |
4c27fcb5 | 2762 | #: help.c:361 git.c:90 |
fd8cb379 JX |
2763 | #, c-format |
2764 | msgid "unsupported command listing type '%s'" | |
2765 | msgstr "不支持的命令列表类型 '%s'" | |
2766 | ||
4c27fcb5 | 2767 | #: help.c:408 |
fd8cb379 JX |
2768 | msgid "The common Git guides are:" |
2769 | msgstr "最常用的 Git 向导有:" | |
2770 | ||
4c27fcb5 JX |
2771 | #: help.c:517 |
2772 | msgid "See 'git help <command>' to read about a specific subcommand" | |
2773 | msgstr "执行 'git help <command>' 来查看特定子命令" | |
2774 | ||
2775 | #: help.c:522 | |
2776 | msgid "External commands" | |
2777 | msgstr "外部命令" | |
2778 | ||
2779 | #: help.c:530 | |
2780 | msgid "Command aliases" | |
2781 | msgstr "命令别名" | |
2782 | ||
2783 | #: help.c:594 | |
c04f5ac3 | 2784 | #, c-format |
a0b6b246 JX |
2785 | msgid "" |
2786 | "'%s' appears to be a git command, but we were not\n" | |
2787 | "able to execute it. Maybe git-%s is broken?" | |
2788 | msgstr "" | |
2789 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
2790 | "可能是 git-%s 受损?" | |
c04f5ac3 | 2791 | |
4c27fcb5 | 2792 | #: help.c:653 |
a0b6b246 JX |
2793 | msgid "Uh oh. Your system reports no Git commands at all." |
2794 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 2795 | |
4c27fcb5 | 2796 | #: help.c:675 |
c04f5ac3 | 2797 | #, c-format |
a4f16749 | 2798 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 2799 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 2800 | |
4c27fcb5 | 2801 | #: help.c:680 |
a4f16749 JX |
2802 | #, c-format |
2803 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 2804 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 2805 | |
4c27fcb5 | 2806 | #: help.c:685 |
c04f5ac3 | 2807 | #, c-format |
a4f16749 | 2808 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 2809 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 2810 | |
4c27fcb5 | 2811 | #: help.c:693 |
c04f5ac3 | 2812 | #, c-format |
a0b6b246 JX |
2813 | msgid "git: '%s' is not a git command. See 'git --help'." |
2814 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 2815 | |
4c27fcb5 | 2816 | #: help.c:697 |
a4f16749 JX |
2817 | msgid "" |
2818 | "\n" | |
2819 | "The most similar command is" | |
2820 | msgid_plural "" | |
2821 | "\n" | |
2822 | "The most similar commands are" | |
6937cb4e JX |
2823 | msgstr[0] "" |
2824 | "\n" | |
2825 | "最相似的命令是" | |
2826 | msgstr[1] "" | |
2827 | "\n" | |
2828 | "最相似的命令是" | |
a4f16749 | 2829 | |
4c27fcb5 | 2830 | #: help.c:712 |
a4f16749 JX |
2831 | msgid "git version [<options>]" |
2832 | msgstr "git version [<选项>]" | |
2833 | ||
4c27fcb5 | 2834 | #: help.c:780 |
a4f16749 JX |
2835 | #, c-format |
2836 | msgid "%s: %s - %s" | |
2837 | msgstr "%s:%s - %s" | |
2838 | ||
4c27fcb5 | 2839 | #: help.c:784 |
a0b6b246 JX |
2840 | msgid "" |
2841 | "\n" | |
2842 | "Did you mean this?" | |
2843 | msgid_plural "" | |
2844 | "\n" | |
2845 | "Did you mean one of these?" | |
2846 | msgstr[0] "" | |
2847 | "\n" | |
2848 | "您指的是这个么?" | |
2849 | msgstr[1] "" | |
2850 | "\n" | |
2851 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 2852 | |
4c27fcb5 | 2853 | #: ident.c:345 |
a0b6b246 JX |
2854 | msgid "" |
2855 | "\n" | |
2856 | "*** Please tell me who you are.\n" | |
2857 | "\n" | |
2858 | "Run\n" | |
2859 | "\n" | |
2860 | " git config --global user.email \"you@example.com\"\n" | |
2861 | " git config --global user.name \"Your Name\"\n" | |
2862 | "\n" | |
2863 | "to set your account's default identity.\n" | |
2864 | "Omit --global to set the identity only in this repository.\n" | |
2865 | "\n" | |
2866 | msgstr "" | |
2867 | "\n" | |
2868 | "*** 请告诉我你是谁。\n" | |
2869 | "\n" | |
2870 | "运行\n" | |
2871 | "\n" | |
2872 | " git config --global user.email \"you@example.com\"\n" | |
2873 | " git config --global user.name \"Your Name\"\n" | |
2874 | "\n" | |
2875 | "来设置您账号的缺省身份标识。\n" | |
2876 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 2877 | |
4c27fcb5 | 2878 | #: ident.c:369 |
87cb7997 | 2879 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 2880 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 2881 | |
4c27fcb5 | 2882 | #: ident.c:374 |
87cb7997 JX |
2883 | #, c-format |
2884 | msgid "unable to auto-detect email address (got '%s')" | |
2885 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
2886 | ||
4c27fcb5 | 2887 | #: ident.c:384 |
87cb7997 JX |
2888 | msgid "no name was given and auto-detection is disabled" |
2889 | msgstr "未提供姓名且自动探测被禁用" | |
2890 | ||
4c27fcb5 | 2891 | #: ident.c:390 |
87cb7997 JX |
2892 | #, c-format |
2893 | msgid "unable to auto-detect name (got '%s')" | |
2894 | msgstr "无法自动探测姓名(得到 '%s')" | |
2895 | ||
4c27fcb5 | 2896 | #: ident.c:398 |
87cb7997 JX |
2897 | #, c-format |
2898 | msgid "empty ident name (for <%s>) not allowed" | |
2899 | msgstr "不允许空的姓名(对于 <%s>)" | |
2900 | ||
4c27fcb5 | 2901 | #: ident.c:404 |
87cb7997 JX |
2902 | #, c-format |
2903 | msgid "name consists only of disallowed characters: %s" | |
2904 | msgstr "姓名中仅包含禁用字符:%s" | |
2905 | ||
4c27fcb5 | 2906 | #: ident.c:419 builtin/commit.c:606 |
87cb7997 JX |
2907 | #, c-format |
2908 | msgid "invalid date format: %s" | |
2909 | msgstr "无效的日期格式:%s" | |
2910 | ||
4c27fcb5 | 2911 | #: list-objects-filter-options.c:35 |
31e5e17b JX |
2912 | msgid "multiple filter-specs cannot be combined" |
2913 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 2914 | |
4c27fcb5 JX |
2915 | #: list-objects-filter-options.c:58 |
2916 | msgid "only 'tree:0' is supported" | |
2917 | msgstr "只支持 'tree:0'" | |
2918 | ||
2919 | #: list-objects-filter-options.c:137 | |
31e5e17b JX |
2920 | msgid "cannot change partial clone promisor remote" |
2921 | msgstr "无法修改部分克隆的 promisor 远程仓库" | |
5809aa05 | 2922 | |
6937cb4e | 2923 | #: lockfile.c:151 |
c04f5ac3 | 2924 | #, c-format |
a0b6b246 JX |
2925 | msgid "" |
2926 | "Unable to create '%s.lock': %s.\n" | |
2927 | "\n" | |
2928 | "Another git process seems to be running in this repository, e.g.\n" | |
2929 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
2930 | "are terminated then try again. If it still fails, a git process\n" | |
2931 | "may have crashed in this repository earlier:\n" | |
2932 | "remove the file manually to continue." | |
2933 | msgstr "" | |
2934 | "无法创建 '%s.lock':%s。\n" | |
2935 | "\n" | |
2936 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
2937 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
2938 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
2939 | "手动删除这个文件再继续。" | |
c04f5ac3 | 2940 | |
6937cb4e | 2941 | #: lockfile.c:159 |
a0b6b246 JX |
2942 | #, c-format |
2943 | msgid "Unable to create '%s.lock': %s" | |
2944 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 2945 | |
4c27fcb5 | 2946 | #: merge.c:41 |
a0b6b246 | 2947 | msgid "failed to read the cache" |
c1ac5258 | 2948 | msgstr "读取缓存失败" |
c04f5ac3 | 2949 | |
4c27fcb5 JX |
2950 | #: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933 |
2951 | #: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764 | |
a0b6b246 JX |
2952 | msgid "unable to write new index file" |
2953 | msgstr "无法写新的索引文件" | |
c04f5ac3 | 2954 | |
4c27fcb5 | 2955 | #: merge-recursive.c:323 |
a0b6b246 JX |
2956 | msgid "(bad commit)\n" |
2957 | msgstr "(坏提交)\n" | |
c04f5ac3 | 2958 | |
4c27fcb5 | 2959 | #: merge-recursive.c:345 |
a0b6b246 | 2960 | #, c-format |
fd8cb379 | 2961 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 2962 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 2963 | |
4c27fcb5 | 2964 | #: merge-recursive.c:353 |
fd8cb379 JX |
2965 | #, c-format |
2966 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 2967 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 | 2968 | |
4c27fcb5 | 2969 | #: merge-recursive.c:435 |
a0b6b246 | 2970 | msgid "error building trees" |
c1ac5258 | 2971 | msgstr "创建树出错" |
c04f5ac3 | 2972 | |
4c27fcb5 | 2973 | #: merge-recursive.c:906 |
c04f5ac3 | 2974 | #, c-format |
a0b6b246 | 2975 | msgid "failed to create path '%s'%s" |
c1ac5258 | 2976 | msgstr "创建路径 '%s'%s 失败" |
c04f5ac3 | 2977 | |
4c27fcb5 | 2978 | #: merge-recursive.c:917 |
c04f5ac3 | 2979 | #, c-format |
a0b6b246 JX |
2980 | msgid "Removing %s to make room for subdirectory\n" |
2981 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 2982 | |
4c27fcb5 | 2983 | #: merge-recursive.c:931 merge-recursive.c:950 |
a0b6b246 JX |
2984 | msgid ": perhaps a D/F conflict?" |
2985 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 2986 | |
4c27fcb5 | 2987 | #: merge-recursive.c:940 |
c04f5ac3 | 2988 | #, c-format |
a0b6b246 JX |
2989 | msgid "refusing to lose untracked file at '%s'" |
2990 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 2991 | |
4c27fcb5 | 2992 | #: merge-recursive.c:982 builtin/cat-file.c:39 |
c04f5ac3 | 2993 | #, c-format |
a0b6b246 JX |
2994 | msgid "cannot read object %s '%s'" |
2995 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 2996 | |
4c27fcb5 | 2997 | #: merge-recursive.c:984 |
4dcdc3d8 | 2998 | #, c-format |
a0b6b246 JX |
2999 | msgid "blob expected for %s '%s'" |
3000 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 3001 | |
4c27fcb5 | 3002 | #: merge-recursive.c:1008 |
4dcdc3d8 | 3003 | #, c-format |
a0b6b246 | 3004 | msgid "failed to open '%s': %s" |
c1ac5258 | 3005 | msgstr "打开 '%s' 失败:%s" |
4dcdc3d8 | 3006 | |
4c27fcb5 | 3007 | #: merge-recursive.c:1019 |
a0b6b246 JX |
3008 | #, c-format |
3009 | msgid "failed to symlink '%s': %s" | |
c1ac5258 | 3010 | msgstr "创建符号链接 '%s' 失败:%s" |
c04f5ac3 | 3011 | |
4c27fcb5 | 3012 | #: merge-recursive.c:1024 |
5c57d762 | 3013 | #, c-format |
a0b6b246 JX |
3014 | msgid "do not know what to do with %06o %s '%s'" |
3015 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 3016 | |
4c27fcb5 | 3017 | #: merge-recursive.c:1212 |
fd8cb379 JX |
3018 | #, c-format |
3019 | msgid "Failed to merge submodule %s (not checked out)" | |
3020 | msgstr "无法合并子模组 %s (没有检出)" | |
3021 | ||
4c27fcb5 | 3022 | #: merge-recursive.c:1219 |
fd8cb379 JX |
3023 | #, c-format |
3024 | msgid "Failed to merge submodule %s (commits not present)" | |
3025 | msgstr "无法合并子模组 %s(提交不存在)" | |
3026 | ||
4c27fcb5 | 3027 | #: merge-recursive.c:1226 |
fd8cb379 JX |
3028 | #, c-format |
3029 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
3030 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
3031 | ||
4c27fcb5 | 3032 | #: merge-recursive.c:1234 merge-recursive.c:1246 |
fd8cb379 JX |
3033 | #, c-format |
3034 | msgid "Fast-forwarding submodule %s to the following commit:" | |
3035 | msgstr "子模组 %s 快进到如下提交:" | |
3036 | ||
4c27fcb5 | 3037 | #: merge-recursive.c:1237 merge-recursive.c:1249 |
fd8cb379 JX |
3038 | #, c-format |
3039 | msgid "Fast-forwarding submodule %s" | |
3040 | msgstr "快进子模组 %s" | |
3041 | ||
4c27fcb5 | 3042 | #: merge-recursive.c:1271 |
fd8cb379 JX |
3043 | #, c-format |
3044 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
3045 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
3046 | ||
4c27fcb5 | 3047 | #: merge-recursive.c:1275 |
fd8cb379 JX |
3048 | #, c-format |
3049 | msgid "Failed to merge submodule %s (not fast-forward)" | |
3050 | msgstr "无法合并子模组 %s(非快进)" | |
3051 | ||
4c27fcb5 | 3052 | #: merge-recursive.c:1276 |
fd8cb379 JX |
3053 | msgid "Found a possible merge resolution for the submodule:\n" |
3054 | msgstr "找到子模组的一个可能的合并方案:\n" | |
3055 | ||
4c27fcb5 | 3056 | #: merge-recursive.c:1279 |
fd8cb379 JX |
3057 | #, c-format |
3058 | msgid "" | |
3059 | "If this is correct simply add it to the index for example\n" | |
3060 | "by using:\n" | |
3061 | "\n" | |
3062 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
3063 | "\n" | |
3064 | "which will accept this suggestion.\n" | |
3065 | msgstr "" | |
3066 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
3067 | "\n" | |
3068 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
3069 | "\n" | |
3070 | "以接受此建议。\n" | |
3071 | ||
4c27fcb5 | 3072 | #: merge-recursive.c:1288 |
fd8cb379 JX |
3073 | #, c-format |
3074 | msgid "Failed to merge submodule %s (multiple merges found)" | |
3075 | msgstr "无法合并子模组 %s (发现多个合并)" | |
3076 | ||
4c27fcb5 | 3077 | #: merge-recursive.c:1358 |
a0b6b246 JX |
3078 | msgid "Failed to execute internal merge" |
3079 | msgstr "无法执行内部合并" | |
3080 | ||
4c27fcb5 | 3081 | #: merge-recursive.c:1363 |
5c57d762 | 3082 | #, c-format |
a0b6b246 JX |
3083 | msgid "Unable to add %s to database" |
3084 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 3085 | |
4c27fcb5 | 3086 | #: merge-recursive.c:1395 |
fd8cb379 JX |
3087 | #, c-format |
3088 | msgid "Auto-merging %s" | |
3089 | msgstr "自动合并 %s" | |
3090 | ||
4c27fcb5 | 3091 | #: merge-recursive.c:1416 |
fd8cb379 JX |
3092 | #, c-format |
3093 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
3094 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
3095 | ||
4c27fcb5 | 3096 | #: merge-recursive.c:1483 |
5c57d762 JX |
3097 | #, c-format |
3098 | msgid "" | |
a0b6b246 JX |
3099 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
3100 | "in tree." | |
5c57d762 | 3101 | msgstr "" |
87cb7997 JX |
3102 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3103 | "本被保留。" | |
3104 | ||
4c27fcb5 | 3105 | #: merge-recursive.c:1488 |
87cb7997 JX |
3106 | #, c-format |
3107 | msgid "" | |
3108 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3109 | "left in tree." | |
3110 | msgstr "" | |
3111 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3112 | "%7$s 版本被保留。" | |
c04f5ac3 | 3113 | |
4c27fcb5 | 3114 | #: merge-recursive.c:1495 |
7aea43ff | 3115 | #, c-format |
a0b6b246 JX |
3116 | msgid "" |
3117 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
3118 | "in tree at %s." | |
3119 | msgstr "" | |
87cb7997 JX |
3120 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
3121 | "本保留在 %8$s 中。" | |
7aea43ff | 3122 | |
4c27fcb5 | 3123 | #: merge-recursive.c:1500 |
87cb7997 JX |
3124 | #, c-format |
3125 | msgid "" | |
3126 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
3127 | "left in tree at %s." | |
3128 | msgstr "" | |
3129 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
3130 | "%7$s 版本保留在 %9$s 中。" | |
3131 | ||
4c27fcb5 | 3132 | #: merge-recursive.c:1534 |
a0b6b246 JX |
3133 | msgid "rename" |
3134 | msgstr "重命名" | |
5b04ee3b | 3135 | |
4c27fcb5 | 3136 | #: merge-recursive.c:1534 |
a0b6b246 JX |
3137 | msgid "renamed" |
3138 | msgstr "重命名" | |
5b04ee3b | 3139 | |
4c27fcb5 JX |
3140 | #: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369 |
3141 | #: merge-recursive.c:3124 | |
fd8cb379 JX |
3142 | #, c-format |
3143 | msgid "Refusing to lose dirty file at %s" | |
3144 | msgstr "拒绝丢失脏文件 '%s'" | |
3145 | ||
4c27fcb5 | 3146 | #: merge-recursive.c:1602 |
5c57d762 | 3147 | #, c-format |
a0b6b246 JX |
3148 | msgid "%s is a directory in %s adding as %s instead" |
3149 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 3150 | |
4c27fcb5 | 3151 | #: merge-recursive.c:1607 |
fd8cb379 JX |
3152 | #, c-format |
3153 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
3154 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
3155 | ||
4c27fcb5 | 3156 | #: merge-recursive.c:1633 |
5c57d762 JX |
3157 | #, c-format |
3158 | msgid "" | |
a0b6b246 JX |
3159 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
3160 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 3161 | msgstr "" |
a0b6b246 JX |
3162 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
3163 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 3164 | |
4c27fcb5 | 3165 | #: merge-recursive.c:1638 |
a0b6b246 JX |
3166 | msgid " (left unresolved)" |
3167 | msgstr "(留下未解决)" | |
5c57d762 | 3168 | |
4c27fcb5 | 3169 | #: merge-recursive.c:1699 |
5c57d762 | 3170 | #, c-format |
a0b6b246 | 3171 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 3172 | msgstr "" |
a0b6b246 JX |
3173 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
3174 | "%5$s" | |
3495628d | 3175 | |
4c27fcb5 | 3176 | #: merge-recursive.c:1734 |
3495628d | 3177 | #, c-format |
a0b6b246 | 3178 | msgid "Renaming %s to %s and %s to %s instead" |
0fcd668f | 3179 | msgstr "代之以重命名 %s 至 %s,以及 %s 至 %s" |
3495628d | 3180 | |
4c27fcb5 | 3181 | #: merge-recursive.c:1746 |
fd8cb379 JX |
3182 | #, c-format |
3183 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
0fcd668f | 3184 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" |
fd8cb379 | 3185 | |
4c27fcb5 | 3186 | #: merge-recursive.c:1952 |
fd8cb379 JX |
3187 | #, c-format |
3188 | msgid "" | |
3189 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
3190 | "directory %s was renamed to multiple other directories, with no destination " | |
3191 | "getting a majority of the files." | |
c1ac5258 JX |
3192 | msgstr "" |
3193 | "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" | |
3194 | "其它目录,没有目录包含大部分文件。" | |
fd8cb379 | 3195 | |
4c27fcb5 | 3196 | #: merge-recursive.c:1984 |
fd8cb379 JX |
3197 | #, c-format |
3198 | msgid "" | |
3199 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
3200 | "implicit directory rename(s) putting the following path(s) there: %s." | |
3201 | msgstr "" | |
3202 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
3203 | "在:%s。" | |
3204 | ||
4c27fcb5 | 3205 | #: merge-recursive.c:1994 |
fd8cb379 JX |
3206 | #, c-format |
3207 | msgid "" | |
3208 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
3209 | "implicit directory renames tried to put these paths there: %s" | |
3210 | msgstr "" | |
3211 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
3212 | "径放置于此:%s" | |
3213 | ||
4c27fcb5 | 3214 | #: merge-recursive.c:2086 |
fd8cb379 JX |
3215 | #, c-format |
3216 | msgid "" | |
3217 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
3218 | ">%s in %s" | |
3219 | msgstr "" | |
3220 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
3221 | "%4$s->%5$s" | |
3222 | ||
4c27fcb5 | 3223 | #: merge-recursive.c:2331 |
fd8cb379 JX |
3224 | #, c-format |
3225 | msgid "" | |
3226 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
3227 | "renamed." | |
3228 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
3229 | ||
4c27fcb5 | 3230 | #: merge-recursive.c:2737 |
3495628d | 3231 | #, c-format |
a0b6b246 JX |
3232 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" |
3233 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
2e8451e8 | 3234 | |
4c27fcb5 | 3235 | #: merge-recursive.c:2763 |
a0b6b246 JX |
3236 | #, c-format |
3237 | msgid "Adding merged %s" | |
3238 | msgstr "添加合并后的 %s" | |
90314792 | 3239 | |
4c27fcb5 | 3240 | #: merge-recursive.c:2770 merge-recursive.c:3127 |
90314792 | 3241 | #, c-format |
a0b6b246 JX |
3242 | msgid "Adding as %s instead" |
3243 | msgstr "而是以 %s 为名添加" | |
90314792 | 3244 | |
4c27fcb5 | 3245 | #: merge-recursive.c:2934 |
90314792 | 3246 | #, c-format |
a0b6b246 JX |
3247 | msgid "cannot read object %s" |
3248 | msgstr "不能读取对象 %s" | |
90314792 | 3249 | |
4c27fcb5 | 3250 | #: merge-recursive.c:2937 |
90314792 | 3251 | #, c-format |
a0b6b246 JX |
3252 | msgid "object %s is not a blob" |
3253 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 3254 | |
4c27fcb5 | 3255 | #: merge-recursive.c:3006 |
a0b6b246 JX |
3256 | msgid "modify" |
3257 | msgstr "修改" | |
90314792 | 3258 | |
4c27fcb5 | 3259 | #: merge-recursive.c:3006 |
a0b6b246 JX |
3260 | msgid "modified" |
3261 | msgstr "修改" | |
5b04ee3b | 3262 | |
4c27fcb5 | 3263 | #: merge-recursive.c:3017 |
a0b6b246 JX |
3264 | msgid "content" |
3265 | msgstr "内容" | |
5b04ee3b | 3266 | |
4c27fcb5 | 3267 | #: merge-recursive.c:3024 |
a0b6b246 JX |
3268 | msgid "add/add" |
3269 | msgstr "添加/添加" | |
3495628d | 3270 | |
4c27fcb5 | 3271 | #: merge-recursive.c:3071 |
220c313c | 3272 | #, c-format |
a0b6b246 JX |
3273 | msgid "Skipped %s (merged same as existing)" |
3274 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 3275 | |
4c27fcb5 | 3276 | #: merge-recursive.c:3093 git-submodule.sh:858 |
a0b6b246 JX |
3277 | msgid "submodule" |
3278 | msgstr "子模组" | |
3279 | ||
4c27fcb5 | 3280 | #: merge-recursive.c:3094 |
220c313c | 3281 | #, c-format |
a0b6b246 JX |
3282 | msgid "CONFLICT (%s): Merge conflict in %s" |
3283 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 3284 | |
4c27fcb5 | 3285 | #: merge-recursive.c:3216 |
220c313c | 3286 | #, c-format |
a0b6b246 JX |
3287 | msgid "Removing %s" |
3288 | msgstr "删除 %s" | |
220c313c | 3289 | |
4c27fcb5 | 3290 | #: merge-recursive.c:3242 |
a0b6b246 JX |
3291 | msgid "file/directory" |
3292 | msgstr "文件/目录" | |
220c313c | 3293 | |
4c27fcb5 | 3294 | #: merge-recursive.c:3248 |
a0b6b246 JX |
3295 | msgid "directory/file" |
3296 | msgstr "目录/文件" | |
276ceeaa | 3297 | |
4c27fcb5 | 3298 | #: merge-recursive.c:3255 |
276ceeaa | 3299 | #, c-format |
a0b6b246 JX |
3300 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
3301 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 3302 | |
4c27fcb5 | 3303 | #: merge-recursive.c:3264 |
276ceeaa | 3304 | #, c-format |
a0b6b246 JX |
3305 | msgid "Adding %s" |
3306 | msgstr "添加 %s" | |
276ceeaa | 3307 | |
4c27fcb5 | 3308 | #: merge-recursive.c:3300 |
5809aa05 | 3309 | #, c-format |
c1ac5258 JX |
3310 | msgid "" |
3311 | "Your local changes to the following files would be overwritten by merge:\n" | |
3312 | " %s" | |
3313 | msgstr "" | |
3314 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
3315 | " %s" | |
5809aa05 | 3316 | |
4c27fcb5 | 3317 | #: merge-recursive.c:3311 |
6937cb4e | 3318 | msgid "Already up to date!" |
a0b6b246 | 3319 | msgstr "已经是最新的!" |
276ceeaa | 3320 | |
4c27fcb5 | 3321 | #: merge-recursive.c:3320 |
276ceeaa | 3322 | #, c-format |
a0b6b246 JX |
3323 | msgid "merging of trees %s and %s failed" |
3324 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 3325 | |
4c27fcb5 | 3326 | #: merge-recursive.c:3419 |
a0b6b246 JX |
3327 | msgid "Merging:" |
3328 | msgstr "合并:" | |
5c57d762 | 3329 | |
4c27fcb5 | 3330 | #: merge-recursive.c:3432 |
5c57d762 | 3331 | #, c-format |
a0b6b246 JX |
3332 | msgid "found %u common ancestor:" |
3333 | msgid_plural "found %u common ancestors:" | |
3334 | msgstr[0] "发现 %u 个共同祖先:" | |
3335 | msgstr[1] "发现 %u 个共同祖先:" | |
3336 | ||
4c27fcb5 | 3337 | #: merge-recursive.c:3471 |
a0b6b246 JX |
3338 | msgid "merge returned no commit" |
3339 | msgstr "合并未返回提交" | |
3340 | ||
4c27fcb5 | 3341 | #: merge-recursive.c:3537 |
5c57d762 | 3342 | #, c-format |
a0b6b246 JX |
3343 | msgid "Could not parse object '%s'" |
3344 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 3345 | |
4c27fcb5 | 3346 | #: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849 |
a0b6b246 JX |
3347 | msgid "Unable to write index." |
3348 | msgstr "不能写入索引。" | |
3349 | ||
4c27fcb5 JX |
3350 | #: midx.c:65 |
3351 | #, c-format | |
3352 | msgid "multi-pack-index file %s is too small" | |
3353 | msgstr "多包索引文件 %s 太小" | |
3354 | ||
3355 | #: midx.c:81 | |
3356 | #, c-format | |
3357 | msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" | |
3358 | msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" | |
3359 | ||
3360 | #: midx.c:86 | |
3361 | #, c-format | |
3362 | msgid "multi-pack-index version %d not recognized" | |
3363 | msgstr "multi-pack-index 版本 %d 不能被识别" | |
3364 | ||
3365 | #: midx.c:91 | |
3366 | #, c-format | |
3367 | msgid "hash version %u does not match" | |
3368 | msgstr "散列版本 %u 不匹配" | |
3369 | ||
3370 | #: midx.c:105 | |
3371 | msgid "invalid chunk offset (too large)" | |
3372 | msgstr "无效的块偏移(太大)" | |
3373 | ||
3374 | #: midx.c:129 | |
3375 | msgid "terminating multi-pack-index chunk id appears earlier than expected" | |
3376 | msgstr "终止多包索引块 id 出现时间早于预期" | |
3377 | ||
3378 | #: midx.c:142 | |
3379 | msgid "multi-pack-index missing required pack-name chunk" | |
3380 | msgstr "多包索引缺少必需的包名块" | |
3381 | ||
3382 | #: midx.c:144 | |
3383 | msgid "multi-pack-index missing required OID fanout chunk" | |
3384 | msgstr "多包索引缺少必需的 OID 扇出块" | |
3385 | ||
3386 | #: midx.c:146 | |
3387 | msgid "multi-pack-index missing required OID lookup chunk" | |
3388 | msgstr "多包索引缺少必需的 OID 查询块" | |
3389 | ||
3390 | #: midx.c:148 | |
3391 | msgid "multi-pack-index missing required object offsets chunk" | |
3392 | msgstr "多包索引缺少必需的对象偏移块" | |
3393 | ||
3394 | #: midx.c:162 | |
3395 | #, c-format | |
3396 | msgid "multi-pack-index pack names out of order: '%s' before '%s'" | |
3397 | msgstr "多包索引包名无序:'%s' 在 '%s' 之前" | |
3398 | ||
3399 | #: midx.c:205 | |
3400 | #, c-format | |
3401 | msgid "bad pack-int-id: %u (%u total packs)" | |
3402 | msgstr "错的 pack-int-id:%u(共有 %u 个包)" | |
3403 | ||
3404 | #: midx.c:246 | |
3405 | msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" | |
3406 | msgstr "多包索引存储一个64位偏移,但是 off_t 太小" | |
3407 | ||
3408 | #: midx.c:271 | |
3409 | msgid "error preparing packfile from multi-pack-index" | |
3410 | msgstr "从多包索引准备 packfile 出错" | |
3411 | ||
3412 | #: midx.c:407 | |
3413 | #, c-format | |
3414 | msgid "failed to add packfile '%s'" | |
3415 | msgstr "添加包文件 '%s' 失败" | |
3416 | ||
3417 | #: midx.c:413 | |
3418 | #, c-format | |
3419 | msgid "failed to open pack-index '%s'" | |
3420 | msgstr "打开包索引 '%s' 失败" | |
3421 | ||
3422 | #: midx.c:507 | |
3423 | #, c-format | |
3424 | msgid "failed to locate object %d in packfile" | |
3425 | msgstr "在包文件中定位对象 %d 失败" | |
3426 | ||
3427 | #: midx.c:943 | |
3428 | #, c-format | |
3429 | msgid "failed to clear multi-pack-index at %s" | |
3430 | msgstr "清理位于 %s 的多包索引失败" | |
3431 | ||
3432 | #: midx.c:981 | |
3433 | #, c-format | |
3434 | msgid "" | |
3435 | "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" | |
3436 | msgstr "oid 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" | |
3437 | ||
3438 | #: midx.c:992 | |
3439 | #, c-format | |
3440 | msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" | |
3441 | msgstr "oid 查询无序:oid[%d] = %s >= %s = oid[%d]" | |
3442 | ||
3443 | #: midx.c:996 | |
3444 | msgid "Verifying object offsets" | |
3445 | msgstr "校验对象偏移" | |
3446 | ||
3447 | #: midx.c:1004 | |
3448 | #, c-format | |
3449 | msgid "failed to load pack entry for oid[%d] = %s" | |
3450 | msgstr "为 oid[%d] = %s 加载包条目失败" | |
3451 | ||
3452 | #: midx.c:1010 | |
3453 | #, c-format | |
3454 | msgid "failed to load pack-index for packfile %s" | |
3455 | msgstr "为包文件 %s 加载包索引失败" | |
3456 | ||
3457 | #: midx.c:1019 | |
3458 | #, c-format | |
3459 | msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" | |
3460 | msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>" | |
3461 | ||
3462 | #: name-hash.c:532 | |
3463 | #, c-format | |
3464 | msgid "unable to create lazy_dir thread: %s" | |
3465 | msgstr "不能创建 lazy_dir 线程:%s" | |
3466 | ||
3467 | #: name-hash.c:554 | |
3468 | #, c-format | |
3469 | msgid "unable to create lazy_name thread: %s" | |
3470 | msgstr "不能创建 lazy_name 线程:%s" | |
3471 | ||
3472 | #: name-hash.c:560 | |
3473 | #, c-format | |
3474 | msgid "unable to join lazy_name thread: %s" | |
3475 | msgstr "不能加入 lasy_name 线程:%s" | |
3476 | ||
3477 | #: notes-merge.c:275 | |
5c57d762 JX |
3478 | #, c-format |
3479 | msgid "" | |
a0b6b246 JX |
3480 | "You have not concluded your previous notes merge (%s exists).\n" |
3481 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
3482 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 3483 | msgstr "" |
29004bbb | 3484 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
3485 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
3486 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 3487 | |
4c27fcb5 | 3488 | #: notes-merge.c:282 |
a0b6b246 JX |
3489 | #, c-format |
3490 | msgid "You have not concluded your notes merge (%s exists)." | |
3491 | msgstr "您尚未结束注释合并(存在 %s)。" | |
3492 | ||
c1ac5258 | 3493 | #: notes-utils.c:45 |
a0b6b246 JX |
3494 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
3495 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 3496 | |
c1ac5258 | 3497 | #: notes-utils.c:104 |
1b7f4a34 | 3498 | #, c-format |
a0b6b246 JX |
3499 | msgid "Bad notes.rewriteMode value: '%s'" |
3500 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 3501 | |
c1ac5258 | 3502 | #: notes-utils.c:114 |
5b04ee3b | 3503 | #, c-format |
a0b6b246 JX |
3504 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
3505 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 3506 | |
a4f16749 JX |
3507 | #. TRANSLATORS: The first %s is the name of |
3508 | #. the environment variable, the second %s is | |
3509 | #. its value. | |
3510 | #. | |
c1ac5258 | 3511 | #: notes-utils.c:144 |
5b04ee3b | 3512 | #, c-format |
a0b6b246 JX |
3513 | msgid "Bad %s value: '%s'" |
3514 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 3515 | |
c1ac5258 JX |
3516 | #: object.c:54 |
3517 | #, c-format | |
3518 | msgid "invalid object type \"%s\"" | |
3519 | msgstr "无效的对象类型 \"%s\"" | |
3520 | ||
3521 | #: object.c:173 | |
3522 | #, c-format | |
3523 | msgid "object %s is a %s, not a %s" | |
3524 | msgstr "对象 %s 是一个 %s,不是一个 %s" | |
3525 | ||
3526 | #: object.c:233 | |
3527 | #, c-format | |
3528 | msgid "object %s has unknown type id %d" | |
3529 | msgstr "对象 %s 有未知的类型 id %d" | |
3530 | ||
3531 | #: object.c:246 | |
5b04ee3b | 3532 | #, c-format |
a0b6b246 JX |
3533 | msgid "unable to parse object: %s" |
3534 | msgstr "不能解析对象:%s" | |
5b04ee3b | 3535 | |
c1ac5258 JX |
3536 | #: object.c:266 object.c:277 |
3537 | #, c-format | |
3538 | msgid "sha1 mismatch %s" | |
3539 | msgstr "sha1 与 %s 不匹配" | |
3540 | ||
4c27fcb5 | 3541 | #: packfile.c:607 |
6937cb4e JX |
3542 | msgid "offset before end of packfile (broken .idx?)" |
3543 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
3544 | ||
4c27fcb5 | 3545 | #: packfile.c:1864 |
6937cb4e JX |
3546 | #, c-format |
3547 | msgid "offset before start of pack index for %s (corrupt index?)" | |
3548 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
3549 | ||
4c27fcb5 | 3550 | #: packfile.c:1868 |
6937cb4e JX |
3551 | #, c-format |
3552 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
3553 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
3554 | ||
c1ac5258 | 3555 | #: parse-options.c:672 |
a0b6b246 JX |
3556 | msgid "..." |
3557 | msgstr "..." | |
3558 | ||
c1ac5258 | 3559 | #: parse-options.c:691 |
5b04ee3b | 3560 | #, c-format |
a0b6b246 JX |
3561 | msgid "usage: %s" |
3562 | msgstr "用法:%s" | |
5b04ee3b | 3563 | |
a0b6b246 | 3564 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
3565 | #. one in "usage: %s" translation. |
3566 | #. | |
c1ac5258 | 3567 | #: parse-options.c:697 |
5b04ee3b | 3568 | #, c-format |
a0b6b246 JX |
3569 | msgid " or: %s" |
3570 | msgstr " 或:%s" | |
5b04ee3b | 3571 | |
a0b6b246 | 3572 | # 译者:为保证在输出中对齐,注意调整句中空格! |
c1ac5258 | 3573 | #: parse-options.c:700 |
5b04ee3b | 3574 | #, c-format |
a0b6b246 JX |
3575 | msgid " %s" |
3576 | msgstr " %s" | |
5b04ee3b | 3577 | |
c1ac5258 | 3578 | #: parse-options.c:739 |
a0b6b246 JX |
3579 | msgid "-NUM" |
3580 | msgstr "-数字" | |
3581 | ||
4c27fcb5 | 3582 | #: parse-options-cb.c:37 |
fd8cb379 JX |
3583 | #, c-format |
3584 | msgid "malformed expiration date '%s'" | |
3585 | msgstr "格式错误的到期时间:'%s'" | |
3586 | ||
4c27fcb5 | 3587 | #: parse-options-cb.c:109 |
5b04ee3b | 3588 | #, c-format |
a0b6b246 | 3589 | msgid "malformed object name '%s'" |
fd8cb379 | 3590 | msgstr "格式错误的对象名 '%s'" |
5b04ee3b | 3591 | |
4c27fcb5 | 3592 | #: path.c:894 |
5b04ee3b | 3593 | #, c-format |
a0b6b246 JX |
3594 | msgid "Could not make %s writable by group" |
3595 | msgstr "不能设置 %s 为组可写" | |
3596 | ||
a4f16749 | 3597 | #: pathspec.c:129 |
87cb7997 JX |
3598 | msgid "Escape character '\\' not allowed as last character in attr value" |
3599 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
3600 | ||
a4f16749 | 3601 | #: pathspec.c:147 |
87cb7997 JX |
3602 | msgid "Only one 'attr:' specification is allowed." |
3603 | msgstr "只允许一个 'attr:' 规格。" | |
3604 | ||
a4f16749 | 3605 | #: pathspec.c:150 |
87cb7997 JX |
3606 | msgid "attr spec must not be empty" |
3607 | msgstr "属性规格不能为空" | |
3608 | ||
a4f16749 | 3609 | #: pathspec.c:193 |
87cb7997 JX |
3610 | #, c-format |
3611 | msgid "invalid attribute name %s" | |
3612 | msgstr "无效的属性名 %s" | |
3613 | ||
a4f16749 | 3614 | #: pathspec.c:258 |
a0b6b246 JX |
3615 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
3616 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
3617 | ||
a4f16749 | 3618 | #: pathspec.c:265 |
5b04ee3b | 3619 | msgid "" |
a0b6b246 JX |
3620 | "global 'literal' pathspec setting is incompatible with all other global " |
3621 | "pathspec settings" | |
3622 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 3623 | |
a4f16749 | 3624 | #: pathspec.c:305 |
a0b6b246 JX |
3625 | msgid "invalid parameter for pathspec magic 'prefix'" |
3626 | msgstr "路径规格包含无效的神奇前缀" | |
3627 | ||
a4f16749 | 3628 | #: pathspec.c:326 |
5b04ee3b | 3629 | #, c-format |
a0b6b246 JX |
3630 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
3631 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 3632 | |
a4f16749 | 3633 | #: pathspec.c:331 |
5b04ee3b | 3634 | #, c-format |
a0b6b246 JX |
3635 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
3636 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 3637 | |
a4f16749 | 3638 | #: pathspec.c:369 |
5b04ee3b | 3639 | #, c-format |
a0b6b246 JX |
3640 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
3641 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 3642 | |
a4f16749 | 3643 | #: pathspec.c:428 |
5b04ee3b | 3644 | #, c-format |
a0b6b246 JX |
3645 | msgid "%s: 'literal' and 'glob' are incompatible" |
3646 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 3647 | |
a4f16749 | 3648 | #: pathspec.c:441 |
5b04ee3b | 3649 | #, c-format |
a0b6b246 JX |
3650 | msgid "%s: '%s' is outside repository" |
3651 | msgstr "%s:'%s' 在仓库之外" | |
5b04ee3b | 3652 | |
a4f16749 | 3653 | #: pathspec.c:515 |
5b04ee3b | 3654 | #, c-format |
1a79b2f1 JX |
3655 | msgid "'%s' (mnemonic: '%c')" |
3656 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 3657 | |
a4f16749 | 3658 | #: pathspec.c:525 |
5b04ee3b | 3659 | #, c-format |
a0b6b246 JX |
3660 | msgid "%s: pathspec magic not supported by this command: %s" |
3661 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
3662 | ||
5809aa05 | 3663 | #: pathspec.c:592 |
5b04ee3b | 3664 | #, c-format |
a0b6b246 JX |
3665 | msgid "pathspec '%s' is beyond a symbolic link" |
3666 | msgstr "路径规格 '%s' 位于符号链接中" | |
3667 | ||
c1ac5258 JX |
3668 | #: pkt-line.c:104 |
3669 | msgid "flush packet write failed" | |
3670 | msgstr "flush 包写错误" | |
3671 | ||
3672 | #: pkt-line.c:142 pkt-line.c:228 | |
3673 | msgid "protocol error: impossibly long line" | |
3674 | msgstr "协议错误:不可能的长行" | |
3675 | ||
3676 | #: pkt-line.c:158 pkt-line.c:160 | |
3677 | msgid "packet write with format failed" | |
3678 | msgstr "格式化包写入错误" | |
3679 | ||
3680 | #: pkt-line.c:192 | |
3681 | msgid "packet write failed - data exceeds max packet size" | |
3682 | msgstr "写数据包失败:数据超过了包的最大长度" | |
3683 | ||
3684 | #: pkt-line.c:199 pkt-line.c:206 | |
3685 | msgid "packet write failed" | |
3686 | msgstr "数据包写入失败" | |
3687 | ||
3688 | #: pkt-line.c:291 | |
3689 | msgid "read error" | |
3690 | msgstr "读取错误" | |
3691 | ||
3692 | #: pkt-line.c:299 | |
3693 | msgid "the remote end hung up unexpectedly" | |
3694 | msgstr "远端意外挂断了" | |
3695 | ||
3696 | #: pkt-line.c:327 | |
3697 | #, c-format | |
3698 | msgid "protocol error: bad line length character: %.4s" | |
3699 | msgstr "协议错误:错误的行长度字符串:%.4s" | |
3700 | ||
3701 | #: pkt-line.c:337 pkt-line.c:342 | |
3702 | #, c-format | |
3703 | msgid "protocol error: bad line length %d" | |
3704 | msgstr "协议错误:错误的行长度 %d" | |
3705 | ||
4c27fcb5 JX |
3706 | #: preload-index.c:118 |
3707 | msgid "Refreshing index" | |
3708 | msgstr "正在刷新索引" | |
3709 | ||
3710 | #: preload-index.c:137 | |
3711 | #, c-format | |
3712 | msgid "unable to create threaded lstat: %s" | |
3713 | msgstr "无法创建线程 lstat:%s" | |
3714 | ||
6937cb4e | 3715 | #: pretty.c:962 |
a0b6b246 JX |
3716 | msgid "unable to parse --pretty format" |
3717 | msgstr "不能解析 --pretty 格式" | |
3718 | ||
4c27fcb5 | 3719 | #: range-diff.c:56 |
c1ac5258 JX |
3720 | msgid "could not start `log`" |
3721 | msgstr "不能启动 `log`" | |
3722 | ||
4c27fcb5 | 3723 | #: range-diff.c:59 |
c1ac5258 JX |
3724 | msgid "could not read `log` output" |
3725 | msgstr "不能读取 `log` 的输出" | |
3726 | ||
4c27fcb5 | 3727 | #: range-diff.c:74 sequencer.c:4764 |
c1ac5258 JX |
3728 | #, c-format |
3729 | msgid "could not parse commit '%s'" | |
3730 | msgstr "不能解析提交 '%s'" | |
3731 | ||
4c27fcb5 | 3732 | #: range-diff.c:224 |
c1ac5258 JX |
3733 | msgid "failed to generate diff" |
3734 | msgstr "生成 diff 失败" | |
3735 | ||
4c27fcb5 | 3736 | #: range-diff.c:455 range-diff.c:457 |
c1ac5258 JX |
3737 | #, c-format |
3738 | msgid "could not parse log for '%s'" | |
3739 | msgstr "不能解析 '%s' 的日志" | |
3740 | ||
4c27fcb5 JX |
3741 | #: read-cache.c:1490 |
3742 | msgid "Refresh index" | |
3743 | msgstr "刷新索引" | |
3744 | ||
3745 | #: read-cache.c:1604 | |
5b04ee3b JX |
3746 | #, c-format |
3747 | msgid "" | |
a0b6b246 JX |
3748 | "index.version set, but the value is invalid.\n" |
3749 | "Using version %i" | |
5b04ee3b | 3750 | msgstr "" |
a0b6b246 JX |
3751 | "设置了 index.version,但是取值无效。\n" |
3752 | "使用版本 %i" | |
5b04ee3b | 3753 | |
4c27fcb5 | 3754 | #: read-cache.c:1614 |
5b04ee3b JX |
3755 | #, c-format |
3756 | msgid "" | |
a0b6b246 JX |
3757 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
3758 | "Using version %i" | |
5b04ee3b | 3759 | msgstr "" |
a0b6b246 JX |
3760 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
3761 | "使用版本 %i" | |
5b04ee3b | 3762 | |
4c27fcb5 JX |
3763 | #: read-cache.c:1792 |
3764 | #, c-format | |
3765 | msgid "malformed name field in the index, near path '%s'" | |
3766 | msgstr "索引中靠近路径 '%s' 有错误的名称字段" | |
3767 | ||
3768 | #: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458 | |
3769 | #: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585 | |
3770 | #: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343 | |
3771 | #: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144 | |
3772 | #: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329 | |
3773 | msgid "index file corrupt" | |
3774 | msgstr "索引文件损坏" | |
3775 | ||
3776 | #: read-cache.c:2101 | |
3777 | #, c-format | |
3778 | msgid "unable to create load_cache_entries thread: %s" | |
3779 | msgstr "无法创建 load_cache_entries 线程:%s" | |
3780 | ||
3781 | #: read-cache.c:2114 | |
3782 | #, c-format | |
3783 | msgid "unable to join load_cache_entries thread: %s" | |
3784 | msgstr "无法加入 load_cache_entries 线程:%s" | |
3785 | ||
3786 | #: read-cache.c:2201 | |
3787 | #, c-format | |
3788 | msgid "unable to create load_index_extensions thread: %s" | |
3789 | msgstr "无法创建 load_index_extensions 线程:%s" | |
3790 | ||
3791 | #: read-cache.c:2228 | |
3792 | #, c-format | |
3793 | msgid "unable to join load_index_extensions thread: %s" | |
3794 | msgstr "无法加入 load_index_extensions 线程:%s" | |
3795 | ||
3796 | #: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086 | |
a4f16749 JX |
3797 | #, c-format |
3798 | msgid "could not close '%s'" | |
3799 | msgstr "不能关闭 '%s'" | |
3800 | ||
4c27fcb5 | 3801 | #: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592 |
87cb7997 | 3802 | #, c-format |
60638e98 | 3803 | msgid "could not stat '%s'" |
65e2041e | 3804 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 3805 | |
4c27fcb5 | 3806 | #: read-cache.c:3068 |
87cb7997 JX |
3807 | #, c-format |
3808 | msgid "unable to open git dir: %s" | |
3809 | msgstr "不能打开 git 目录:%s" | |
3810 | ||
4c27fcb5 | 3811 | #: read-cache.c:3080 |
87cb7997 JX |
3812 | #, c-format |
3813 | msgid "unable to unlink: %s" | |
3814 | msgstr "无法删除:%s" | |
3815 | ||
4c27fcb5 JX |
3816 | #: rebase-interactive.c:10 |
3817 | msgid "" | |
3818 | "\n" | |
3819 | "Commands:\n" | |
3820 | "p, pick <commit> = use commit\n" | |
3821 | "r, reword <commit> = use commit, but edit the commit message\n" | |
3822 | "e, edit <commit> = use commit, but stop for amending\n" | |
3823 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
3824 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
3825 | "x, exec <command> = run command (the rest of the line) using shell\n" | |
3826 | "b, break = stop here (continue rebase later with 'git rebase --continue')\n" | |
3827 | "d, drop <commit> = remove commit\n" | |
3828 | "l, label <label> = label current HEAD with a name\n" | |
3829 | "t, reset <label> = reset HEAD to a label\n" | |
3830 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
3831 | ". create a merge commit using the original merge commit's\n" | |
3832 | ". message (or the oneline, if no original merge commit was\n" | |
3833 | ". specified). Use -c <commit> to reword the commit message.\n" | |
3834 | "\n" | |
3835 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
3836 | msgstr "" | |
3837 | "\n" | |
3838 | "命令:\n" | |
3839 | "p, pick <提交> = 使用提交\n" | |
3840 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
3841 | "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n" | |
3842 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
3843 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
3844 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
3845 | "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n" | |
3846 | "d, drop <提交> = 删除提交\n" | |
3847 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
3848 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
3849 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
3850 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
3851 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
3852 | ". -c <提交> 可以编辑提交说明。\n" | |
3853 | "\n" | |
3854 | "可以对这些行重新排序,将从上至下执行。\n" | |
3855 | ||
3856 | #: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 | |
3857 | msgid "" | |
3858 | "\n" | |
3859 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
3860 | msgstr "" | |
3861 | "\n" | |
3862 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
3863 | ||
3864 | #: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 | |
3865 | msgid "" | |
3866 | "\n" | |
3867 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
3868 | msgstr "" | |
3869 | "\n" | |
3870 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
3871 | ||
3872 | #: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 | |
3873 | msgid "" | |
3874 | "\n" | |
3875 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
3876 | "To continue rebase after editing, run:\n" | |
3877 | " git rebase --continue\n" | |
3878 | "\n" | |
3879 | msgstr "" | |
3880 | "\n" | |
3881 | "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" | |
3882 | "请执行:\n" | |
3883 | " git rebase --continue\n" | |
3884 | "\n" | |
3885 | ||
3886 | #: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 | |
3887 | msgid "" | |
3888 | "\n" | |
3889 | "However, if you remove everything, the rebase will be aborted.\n" | |
3890 | "\n" | |
3891 | msgstr "" | |
3892 | "\n" | |
3893 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
3894 | "\n" | |
3895 | ||
3896 | #: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 | |
3897 | msgid "Note that empty commits are commented out" | |
3898 | msgstr "注意空提交已被注释掉" | |
3899 | ||
3900 | #: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186 | |
3901 | #: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836 | |
3902 | #, c-format | |
3903 | msgid "could not read '%s'." | |
3904 | msgstr "不能读取 '%s'。" | |
3905 | ||
c1ac5258 JX |
3906 | #: refs.c:192 |
3907 | #, c-format | |
3908 | msgid "%s does not point to a valid object!" | |
3909 | msgstr "%s 没有指向一个有效的对象!" | |
3910 | ||
4c27fcb5 | 3911 | #: refs.c:583 |
c1ac5258 JX |
3912 | #, c-format |
3913 | msgid "ignoring dangling symref %s" | |
e640d114 | 3914 | msgstr "忽略悬空符号引用 %s" |
c1ac5258 | 3915 | |
4c27fcb5 | 3916 | #: refs.c:585 ref-filter.c:1951 |
c1ac5258 JX |
3917 | #, c-format |
3918 | msgid "ignoring broken ref %s" | |
3919 | msgstr "忽略损坏的引用 %s" | |
3920 | ||
4c27fcb5 | 3921 | #: refs.c:711 |
c1ac5258 JX |
3922 | #, c-format |
3923 | msgid "could not open '%s' for writing: %s" | |
3924 | msgstr "无法为写入打开 '%s':%s" | |
3925 | ||
4c27fcb5 | 3926 | #: refs.c:721 refs.c:772 |
c1ac5258 JX |
3927 | #, c-format |
3928 | msgid "could not read ref '%s'" | |
3929 | msgstr "无法读取引用 '%s'" | |
3930 | ||
4c27fcb5 | 3931 | #: refs.c:727 |
c1ac5258 JX |
3932 | #, c-format |
3933 | msgid "ref '%s' already exists" | |
3934 | msgstr "引用 '%s' 已经存在" | |
3935 | ||
4c27fcb5 | 3936 | #: refs.c:732 |
c1ac5258 JX |
3937 | #, c-format |
3938 | msgid "unexpected object ID when writing '%s'" | |
3939 | msgstr "写入 '%s' 时意外的对象 ID" | |
3940 | ||
4c27fcb5 JX |
3941 | #: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636 |
3942 | #: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788 | |
c1ac5258 JX |
3943 | #: wrapper.c:656 |
3944 | #, c-format | |
3945 | msgid "could not write to '%s'" | |
3946 | msgstr "不能写入 '%s'" | |
3947 | ||
4c27fcb5 JX |
3948 | #: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395 |
3949 | #: builtin/am.c:728 | |
5b04ee3b | 3950 | #, c-format |
fd8cb379 | 3951 | msgid "could not open '%s' for writing" |
a0b6b246 | 3952 | msgstr "无法打开 '%s' 进行写入" |
5b04ee3b | 3953 | |
4c27fcb5 | 3954 | #: refs.c:774 |
c1ac5258 JX |
3955 | #, c-format |
3956 | msgid "unexpected object ID when deleting '%s'" | |
3957 | msgstr "删除 '%s' 时意外的对象 ID" | |
3958 | ||
4c27fcb5 | 3959 | #: refs.c:905 |
c1ac5258 JX |
3960 | #, c-format |
3961 | msgid "log for ref %s has gap after %s" | |
3962 | msgstr "引用 %s 的日志在 %s 之后有缺口" | |
3963 | ||
4c27fcb5 | 3964 | #: refs.c:911 |
c1ac5258 JX |
3965 | #, c-format |
3966 | msgid "log for ref %s unexpectedly ended on %s" | |
3967 | msgstr "引用 %s 的日志意外终止于 %s " | |
3968 | ||
4c27fcb5 | 3969 | #: refs.c:969 |
c1ac5258 JX |
3970 | #, c-format |
3971 | msgid "log for %s is empty" | |
3972 | msgstr "%s 的日志为空" | |
3973 | ||
4c27fcb5 | 3974 | #: refs.c:1061 |
c1ac5258 JX |
3975 | #, c-format |
3976 | msgid "refusing to update ref with bad name '%s'" | |
3977 | msgstr "拒绝更新有错误名称 '%s' 的引用" | |
3978 | ||
4c27fcb5 | 3979 | #: refs.c:1137 |
c1ac5258 JX |
3980 | #, c-format |
3981 | msgid "update_ref failed for ref '%s': %s" | |
3982 | msgstr "对引用 '%s' 执行 update_ref 失败:%s" | |
3983 | ||
4c27fcb5 | 3984 | #: refs.c:1911 |
c1ac5258 JX |
3985 | #, c-format |
3986 | msgid "multiple updates for ref '%s' not allowed" | |
3987 | msgstr "不允许对引用 '%s' 多次更新" | |
3988 | ||
4c27fcb5 | 3989 | #: refs.c:1943 |
60638e98 JX |
3990 | msgid "ref updates forbidden inside quarantine environment" |
3991 | msgstr "在隔离环境中禁止更新引用" | |
3992 | ||
4c27fcb5 | 3993 | #: refs.c:2039 refs.c:2069 |
c1ac5258 JX |
3994 | #, c-format |
3995 | msgid "'%s' exists; cannot create '%s'" | |
3996 | msgstr "'%s' 已存在,无法创建 '%s'" | |
3997 | ||
4c27fcb5 | 3998 | #: refs.c:2045 refs.c:2080 |
c1ac5258 JX |
3999 | #, c-format |
4000 | msgid "cannot process '%s' and '%s' at the same time" | |
4001 | msgstr "无法同时处理 '%s' 和 '%s'" | |
4002 | ||
4c27fcb5 | 4003 | #: refs/files-backend.c:1228 |
6937cb4e JX |
4004 | #, c-format |
4005 | msgid "could not remove reference %s" | |
4006 | msgstr "无法删除引用 %s" | |
4007 | ||
4c27fcb5 | 4008 | #: refs/files-backend.c:1242 refs/packed-backend.c:1532 |
c1ac5258 | 4009 | #: refs/packed-backend.c:1542 |
5b04ee3b | 4010 | #, c-format |
a0b6b246 JX |
4011 | msgid "could not delete reference %s: %s" |
4012 | msgstr "无法删除引用 %s:%s" | |
5b04ee3b | 4013 | |
4c27fcb5 | 4014 | #: refs/files-backend.c:1245 refs/packed-backend.c:1545 |
5b04ee3b | 4015 | #, c-format |
a0b6b246 JX |
4016 | msgid "could not delete references: %s" |
4017 | msgstr "无法删除引用:%s" | |
5b04ee3b | 4018 | |
c1ac5258 JX |
4019 | #: refspec.c:137 |
4020 | #, c-format | |
4021 | msgid "invalid refspec '%s'" | |
4022 | msgstr "无效的引用表达式:'%s'" | |
4023 | ||
4c27fcb5 | 4024 | #: ref-filter.c:39 wt-status.c:1855 |
87cb7997 JX |
4025 | msgid "gone" |
4026 | msgstr "丢失" | |
4027 | ||
4c27fcb5 | 4028 | #: ref-filter.c:40 |
87cb7997 JX |
4029 | #, c-format |
4030 | msgid "ahead %d" | |
4031 | msgstr "领先 %d" | |
4032 | ||
4c27fcb5 | 4033 | #: ref-filter.c:41 |
87cb7997 JX |
4034 | #, c-format |
4035 | msgid "behind %d" | |
4036 | msgstr "落后 %d" | |
4037 | ||
4c27fcb5 | 4038 | #: ref-filter.c:42 |
87cb7997 JX |
4039 | #, c-format |
4040 | msgid "ahead %d, behind %d" | |
4041 | msgstr "领先 %d,落后 %d" | |
4042 | ||
4c27fcb5 | 4043 | #: ref-filter.c:138 |
5b04ee3b | 4044 | #, c-format |
a0b6b246 | 4045 | msgid "expected format: %%(color:<color>)" |
58b6f078 | 4046 | msgstr "期望的格式:%%(color:<颜色>)" |
5b04ee3b | 4047 | |
4c27fcb5 | 4048 | #: ref-filter.c:140 |
5b04ee3b | 4049 | #, c-format |
a0b6b246 JX |
4050 | msgid "unrecognized color: %%(color:%s)" |
4051 | msgstr "未能识别的颜色:%%(color:%s)" | |
6c94aba5 | 4052 | |
4c27fcb5 | 4053 | #: ref-filter.c:162 |
a0b6b246 | 4054 | #, c-format |
87cb7997 JX |
4055 | msgid "Integer value expected refname:lstrip=%s" |
4056 | msgstr "期望整数值 refname:lstrip=%s" | |
90314792 | 4057 | |
4c27fcb5 | 4058 | #: ref-filter.c:166 |
87cb7997 JX |
4059 | #, c-format |
4060 | msgid "Integer value expected refname:rstrip=%s" | |
4061 | msgstr "期望整数值 refname:rstrip=%s" | |
4062 | ||
4c27fcb5 | 4063 | #: ref-filter.c:168 |
87cb7997 JX |
4064 | #, c-format |
4065 | msgid "unrecognized %%(%s) argument: %s" | |
4066 | msgstr "未能识别的 %%(%s) 参数:%s" | |
4067 | ||
4c27fcb5 | 4068 | #: ref-filter.c:223 |
c1ac5258 JX |
4069 | #, c-format |
4070 | msgid "%%(objecttype) does not take arguments" | |
4071 | msgstr "%%(objecttype) 不带参数" | |
4072 | ||
4c27fcb5 | 4073 | #: ref-filter.c:235 |
c1ac5258 JX |
4074 | #, c-format |
4075 | msgid "%%(objectsize) does not take arguments" | |
4076 | msgstr "%%(objectsize) 不带参数" | |
4077 | ||
4c27fcb5 | 4078 | #: ref-filter.c:247 |
90314792 | 4079 | #, c-format |
a0b6b246 JX |
4080 | msgid "%%(body) does not take arguments" |
4081 | msgstr "%%(body) 不带参数" | |
90314792 | 4082 | |
4c27fcb5 | 4083 | #: ref-filter.c:256 |
a0b6b246 JX |
4084 | #, c-format |
4085 | msgid "%%(subject) does not take arguments" | |
4086 | msgstr "%%(subject) 不带参数" | |
90314792 | 4087 | |
4c27fcb5 | 4088 | #: ref-filter.c:278 |
1a79b2f1 | 4089 | #, c-format |
6937cb4e JX |
4090 | msgid "unknown %%(trailers) argument: %s" |
4091 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 4092 | |
4c27fcb5 | 4093 | #: ref-filter.c:307 |
a0b6b246 JX |
4094 | #, c-format |
4095 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 4096 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 4097 | |
4c27fcb5 | 4098 | #: ref-filter.c:309 |
a0b6b246 JX |
4099 | #, c-format |
4100 | msgid "unrecognized %%(contents) argument: %s" | |
4101 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 4102 | |
4c27fcb5 | 4103 | #: ref-filter.c:324 |
87cb7997 JX |
4104 | #, c-format |
4105 | msgid "positive value expected objectname:short=%s" | |
4106 | msgstr "期望一个正数 objectname:short=%s" | |
4107 | ||
4c27fcb5 | 4108 | #: ref-filter.c:328 |
a0b6b246 JX |
4109 | #, c-format |
4110 | msgid "unrecognized %%(objectname) argument: %s" | |
4111 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 4112 | |
4c27fcb5 | 4113 | #: ref-filter.c:358 |
a0b6b246 JX |
4114 | #, c-format |
4115 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 4116 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 4117 | |
4c27fcb5 | 4118 | #: ref-filter.c:370 |
5c57d762 | 4119 | #, c-format |
a0b6b246 JX |
4120 | msgid "unrecognized position:%s" |
4121 | msgstr "未能识别的位置:%s" | |
5c57d762 | 4122 | |
4c27fcb5 | 4123 | #: ref-filter.c:377 |
1b7f4a34 | 4124 | #, c-format |
a0b6b246 JX |
4125 | msgid "unrecognized width:%s" |
4126 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 4127 | |
4c27fcb5 | 4128 | #: ref-filter.c:386 |
1b7f4a34 | 4129 | #, c-format |
a0b6b246 JX |
4130 | msgid "unrecognized %%(align) argument: %s" |
4131 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 4132 | |
4c27fcb5 | 4133 | #: ref-filter.c:394 |
1b7f4a34 | 4134 | #, c-format |
a0b6b246 JX |
4135 | msgid "positive width expected with the %%(align) atom" |
4136 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 4137 | |
4c27fcb5 | 4138 | #: ref-filter.c:412 |
87cb7997 JX |
4139 | #, c-format |
4140 | msgid "unrecognized %%(if) argument: %s" | |
4141 | msgstr "未能识别的 %%(if) 参数:%s" | |
4142 | ||
4c27fcb5 | 4143 | #: ref-filter.c:508 |
07432cef | 4144 | #, c-format |
a0b6b246 | 4145 | msgid "malformed field name: %.*s" |
fd8cb379 | 4146 | msgstr "格式错误的字段名:%.*s" |
ef317cd5 | 4147 | |
4c27fcb5 | 4148 | #: ref-filter.c:535 |
a0b6b246 JX |
4149 | #, c-format |
4150 | msgid "unknown field name: %.*s" | |
4151 | msgstr "未知的字段名:%.*s" | |
220c313c | 4152 | |
4c27fcb5 JX |
4153 | #: ref-filter.c:539 |
4154 | #, c-format | |
4155 | msgid "" | |
4156 | "not a git repository, but the field '%.*s' requires access to object data" | |
4157 | msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据" | |
4158 | ||
4159 | #: ref-filter.c:663 | |
87cb7997 JX |
4160 | #, c-format |
4161 | msgid "format: %%(if) atom used without a %%(then) atom" | |
4162 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
4163 | ||
4c27fcb5 | 4164 | #: ref-filter.c:726 |
87cb7997 JX |
4165 | #, c-format |
4166 | msgid "format: %%(then) atom used without an %%(if) atom" | |
4167 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
4168 | ||
4c27fcb5 | 4169 | #: ref-filter.c:728 |
87cb7997 JX |
4170 | #, c-format |
4171 | msgid "format: %%(then) atom used more than once" | |
4172 | msgstr "格式:%%(then) 元素用了多次" | |
4173 | ||
4c27fcb5 | 4174 | #: ref-filter.c:730 |
87cb7997 JX |
4175 | #, c-format |
4176 | msgid "format: %%(then) atom used after %%(else)" | |
4177 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
4178 | ||
4c27fcb5 | 4179 | #: ref-filter.c:758 |
87cb7997 JX |
4180 | #, c-format |
4181 | msgid "format: %%(else) atom used without an %%(if) atom" | |
4182 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
4183 | ||
4c27fcb5 | 4184 | #: ref-filter.c:760 |
87cb7997 JX |
4185 | #, c-format |
4186 | msgid "format: %%(else) atom used without a %%(then) atom" | |
4187 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
4188 | ||
4c27fcb5 | 4189 | #: ref-filter.c:762 |
87cb7997 JX |
4190 | #, c-format |
4191 | msgid "format: %%(else) atom used more than once" | |
4192 | msgstr "格式:%%(else) 元素用了多次" | |
4193 | ||
4c27fcb5 | 4194 | #: ref-filter.c:777 |
7aea43ff | 4195 | #, c-format |
a0b6b246 JX |
4196 | msgid "format: %%(end) atom used without corresponding atom" |
4197 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 4198 | |
4c27fcb5 | 4199 | #: ref-filter.c:834 |
7aea43ff | 4200 | #, c-format |
a0b6b246 | 4201 | msgid "malformed format string %s" |
fd8cb379 | 4202 | msgstr "错误的格式化字符串 %s" |
7aea43ff | 4203 | |
4c27fcb5 | 4204 | #: ref-filter.c:1424 |
87cb7997 JX |
4205 | #, c-format |
4206 | msgid "(no branch, rebasing %s)" | |
4207 | msgstr "(非分支,正变基 %s)" | |
4208 | ||
4c27fcb5 | 4209 | #: ref-filter.c:1427 |
fd8cb379 JX |
4210 | #, c-format |
4211 | msgid "(no branch, rebasing detached HEAD %s)" | |
4212 | msgstr "(非分支,正变基分离头指针 %s)" | |
4213 | ||
4c27fcb5 | 4214 | #: ref-filter.c:1430 |
87cb7997 JX |
4215 | #, c-format |
4216 | msgid "(no branch, bisect started on %s)" | |
4217 | msgstr "(非分支,二分查找开始于 %s)" | |
c04f5ac3 | 4218 | |
a4f16749 JX |
4219 | #. TRANSLATORS: make sure this matches "HEAD |
4220 | #. detached at " in wt-status.c | |
4221 | #. | |
4c27fcb5 | 4222 | #: ref-filter.c:1438 |
c04f5ac3 | 4223 | #, c-format |
87cb7997 JX |
4224 | msgid "(HEAD detached at %s)" |
4225 | msgstr "(头指针分离于 %s)" | |
c04f5ac3 | 4226 | |
a4f16749 JX |
4227 | #. TRANSLATORS: make sure this matches "HEAD |
4228 | #. detached from " in wt-status.c | |
4229 | #. | |
4c27fcb5 | 4230 | #: ref-filter.c:1445 |
a0b6b246 | 4231 | #, c-format |
87cb7997 JX |
4232 | msgid "(HEAD detached from %s)" |
4233 | msgstr "(头指针分离自 %s)" | |
6792b93b | 4234 | |
4c27fcb5 | 4235 | #: ref-filter.c:1449 |
87cb7997 JX |
4236 | msgid "(no branch)" |
4237 | msgstr "(非分支)" | |
4238 | ||
4c27fcb5 | 4239 | #: ref-filter.c:1483 ref-filter.c:1638 |
a0b6b246 JX |
4240 | #, c-format |
4241 | msgid "missing object %s for %s" | |
4242 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 4243 | |
4c27fcb5 | 4244 | #: ref-filter.c:1491 |
a0b6b246 JX |
4245 | #, c-format |
4246 | msgid "parse_object_buffer failed on %s for %s" | |
4247 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 4248 | |
4c27fcb5 | 4249 | #: ref-filter.c:1857 |
a0b6b246 JX |
4250 | #, c-format |
4251 | msgid "malformed object at '%s'" | |
fd8cb379 | 4252 | msgstr "格式错误的对象 '%s'" |
c04f5ac3 | 4253 | |
4c27fcb5 | 4254 | #: ref-filter.c:1946 |
a0b6b246 JX |
4255 | #, c-format |
4256 | msgid "ignoring ref with broken name %s" | |
4257 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 4258 | |
4c27fcb5 | 4259 | #: ref-filter.c:2232 |
a0b6b246 JX |
4260 | #, c-format |
4261 | msgid "format: %%(end) atom missing" | |
4262 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 4263 | |
4c27fcb5 | 4264 | #: ref-filter.c:2338 |
a0b6b246 JX |
4265 | #, c-format |
4266 | msgid "malformed object name %s" | |
fd8cb379 | 4267 | msgstr "格式错误的对象名 %s" |
c04f5ac3 | 4268 | |
4c27fcb5 | 4269 | #: remote.c:607 |
a0b6b246 JX |
4270 | #, c-format |
4271 | msgid "Cannot fetch both %s and %s to %s" | |
4272 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 4273 | |
4c27fcb5 | 4274 | #: remote.c:611 |
c04f5ac3 | 4275 | #, c-format |
a0b6b246 JX |
4276 | msgid "%s usually tracks %s, not %s" |
4277 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 4278 | |
4c27fcb5 | 4279 | #: remote.c:615 |
a0b6b246 JX |
4280 | #, c-format |
4281 | msgid "%s tracks both %s and %s" | |
4282 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 4283 | |
4c27fcb5 | 4284 | #: remote.c:623 |
a0b6b246 JX |
4285 | msgid "Internal error" |
4286 | msgstr "内部错误" | |
c04f5ac3 | 4287 | |
4c27fcb5 | 4288 | #: remote.c:1569 remote.c:1670 |
a0b6b246 JX |
4289 | msgid "HEAD does not point to a branch" |
4290 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 4291 | |
4c27fcb5 | 4292 | #: remote.c:1578 |
a0b6b246 JX |
4293 | #, c-format |
4294 | msgid "no such branch: '%s'" | |
4295 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 4296 | |
4c27fcb5 | 4297 | #: remote.c:1581 |
a0b6b246 JX |
4298 | #, c-format |
4299 | msgid "no upstream configured for branch '%s'" | |
4300 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 4301 | |
4c27fcb5 | 4302 | #: remote.c:1587 |
a0b6b246 JX |
4303 | #, c-format |
4304 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
4305 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 4306 | |
4c27fcb5 | 4307 | #: remote.c:1602 |
a0b6b246 JX |
4308 | #, c-format |
4309 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
4310 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 4311 | |
4c27fcb5 | 4312 | #: remote.c:1614 |
a0b6b246 JX |
4313 | #, c-format |
4314 | msgid "branch '%s' has no remote for pushing" | |
4315 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 4316 | |
4c27fcb5 | 4317 | #: remote.c:1624 |
a0b6b246 JX |
4318 | #, c-format |
4319 | msgid "push refspecs for '%s' do not include '%s'" | |
4320 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 4321 | |
4c27fcb5 | 4322 | #: remote.c:1637 |
a0b6b246 JX |
4323 | msgid "push has no destination (push.default is 'nothing')" |
4324 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 4325 | |
4c27fcb5 | 4326 | #: remote.c:1659 |
a0b6b246 JX |
4327 | msgid "cannot resolve 'simple' push to a single destination" |
4328 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 4329 | |
4c27fcb5 | 4330 | #: remote.c:1935 |
a0b6b246 JX |
4331 | #, c-format |
4332 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
4333 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 4334 | |
4c27fcb5 | 4335 | #: remote.c:1939 |
a0b6b246 JX |
4336 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
4337 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 4338 | |
4c27fcb5 | 4339 | #: remote.c:1942 |
a0b6b246 | 4340 | #, c-format |
6937cb4e | 4341 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 4342 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 4343 | |
4c27fcb5 | 4344 | #: remote.c:1946 |
31e5e17b JX |
4345 | #, c-format |
4346 | msgid "Your branch and '%s' refer to different commits.\n" | |
4347 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
4348 | ||
4c27fcb5 | 4349 | #: remote.c:1949 |
31e5e17b JX |
4350 | #, c-format |
4351 | msgid " (use \"%s\" for details)\n" | |
4352 | msgstr " (使用 \"%s\" 查看详情)\n" | |
4353 | ||
4c27fcb5 | 4354 | #: remote.c:1953 |
a0b6b246 JX |
4355 | #, c-format |
4356 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
4357 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
4358 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
4359 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 4360 | |
4c27fcb5 | 4361 | #: remote.c:1959 |
a0b6b246 JX |
4362 | msgid " (use \"git push\" to publish your local commits)\n" |
4363 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 4364 | |
4c27fcb5 | 4365 | #: remote.c:1962 |
a0b6b246 JX |
4366 | #, c-format |
4367 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
4368 | msgid_plural "" | |
4369 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
4370 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
4371 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 4372 | |
a0b6b246 | 4373 | # 译者:注意保持前导空格 |
4c27fcb5 | 4374 | #: remote.c:1970 |
a0b6b246 JX |
4375 | msgid " (use \"git pull\" to update your local branch)\n" |
4376 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 4377 | |
4c27fcb5 | 4378 | #: remote.c:1973 |
a0b6b246 JX |
4379 | #, c-format |
4380 | msgid "" | |
4381 | "Your branch and '%s' have diverged,\n" | |
4382 | "and have %d and %d different commit each, respectively.\n" | |
4383 | msgid_plural "" | |
4384 | "Your branch and '%s' have diverged,\n" | |
4385 | "and have %d and %d different commits each, respectively.\n" | |
4386 | msgstr[0] "" | |
4387 | "您的分支和 '%s' 出现了偏离,\n" | |
4388 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
4389 | msgstr[1] "" | |
4390 | "您的分支和 '%s' 出现了偏离,\n" | |
4391 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 4392 | |
a0b6b246 | 4393 | # 译者:注意保持前导空格 |
4c27fcb5 | 4394 | #: remote.c:1983 |
a0b6b246 JX |
4395 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
4396 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 4397 | |
4c27fcb5 | 4398 | #: replace-object.c:21 |
c1ac5258 JX |
4399 | #, c-format |
4400 | msgid "bad replace ref name: %s" | |
4401 | msgstr "错误的替换引用名称:%s" | |
4402 | ||
4c27fcb5 | 4403 | #: replace-object.c:30 |
c1ac5258 JX |
4404 | #, c-format |
4405 | msgid "duplicate replace ref: %s" | |
4406 | msgstr "重复的替换引用:%s" | |
4407 | ||
4c27fcb5 | 4408 | #: replace-object.c:73 |
c1ac5258 JX |
4409 | #, c-format |
4410 | msgid "replace depth too high for object %s" | |
4411 | msgstr "对象 %s 的替换层级太深" | |
4412 | ||
4c27fcb5 JX |
4413 | #: rerere.c:217 rerere.c:226 rerere.c:229 |
4414 | msgid "corrupt MERGE_RR" | |
4415 | msgstr "损坏的 MERGE_RR" | |
4416 | ||
4417 | #: rerere.c:264 rerere.c:269 | |
4418 | msgid "unable to write rerere record" | |
4419 | msgstr "无法写入 rerere 记录" | |
cfff71a9 | 4420 | |
4c27fcb5 | 4421 | #: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162 |
a0b6b246 | 4422 | #, c-format |
4c27fcb5 JX |
4423 | msgid "could not write '%s'" |
4424 | msgstr "不能写入 '%s'" | |
6792b93b | 4425 | |
4c27fcb5 JX |
4426 | #: rerere.c:495 |
4427 | #, c-format | |
4428 | msgid "there were errors while writing '%s' (%s)" | |
4429 | msgstr "写入 '%s' (%s) 时出错" | |
6792b93b | 4430 | |
4c27fcb5 JX |
4431 | #: rerere.c:498 |
4432 | #, c-format | |
4433 | msgid "failed to flush '%s'" | |
4434 | msgstr "刷新 '%s' 失败" | |
5c57d762 | 4435 | |
4c27fcb5 | 4436 | #: rerere.c:503 rerere.c:1039 |
5809aa05 | 4437 | #, c-format |
4c27fcb5 JX |
4438 | msgid "could not parse conflict hunks in '%s'" |
4439 | msgstr "不能解析 '%s' 中的冲突块" | |
5809aa05 | 4440 | |
4c27fcb5 JX |
4441 | #: rerere.c:684 |
4442 | #, c-format | |
4443 | msgid "failed utime() on '%s'" | |
4444 | msgstr "在 '%s' 上调用 utime() 失败" | |
31e5e17b | 4445 | |
4c27fcb5 | 4446 | #: rerere.c:694 |
87cb7997 | 4447 | #, c-format |
4c27fcb5 JX |
4448 | msgid "writing '%s' failed" |
4449 | msgstr "写入 '%s' 失败" | |
87cb7997 | 4450 | |
4c27fcb5 | 4451 | #: rerere.c:714 |
87cb7997 | 4452 | #, c-format |
4c27fcb5 JX |
4453 | msgid "Staged '%s' using previous resolution." |
4454 | msgstr "使用之前的解决方案暂存 '%s'。" | |
87cb7997 | 4455 | |
4c27fcb5 JX |
4456 | #: rerere.c:753 |
4457 | #, c-format | |
4458 | msgid "Recorded resolution for '%s'." | |
4459 | msgstr "已记录 '%s' 的解决方案。" | |
6792b93b | 4460 | |
4c27fcb5 JX |
4461 | #: rerere.c:788 |
4462 | #, c-format | |
4463 | msgid "Resolved '%s' using previous resolution." | |
4464 | msgstr "使用之前的解决方案解决 '%s'。" | |
4465 | ||
4466 | #: rerere.c:803 | |
4467 | #, c-format | |
4468 | msgid "cannot unlink stray '%s'" | |
4469 | msgstr "不能删除 stray '%s'" | |
4470 | ||
4471 | #: rerere.c:807 | |
4472 | #, c-format | |
4473 | msgid "Recorded preimage for '%s'" | |
4474 | msgstr "为 '%s' 记录 preimage" | |
4475 | ||
4476 | #: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413 | |
4477 | #: builtin/submodule--helper.c:1423 | |
4478 | #, c-format | |
4479 | msgid "could not create directory '%s'" | |
4480 | msgstr "不能创建目录 '%s'" | |
4481 | ||
4482 | #: rerere.c:1057 | |
4483 | #, c-format | |
4484 | msgid "failed to update conflicted state in '%s'" | |
4485 | msgstr "更新 '%s' 中的冲突状态失败" | |
4486 | ||
4487 | #: rerere.c:1068 rerere.c:1075 | |
4488 | #, c-format | |
4489 | msgid "no remembered resolution for '%s'" | |
4490 | msgstr "没有为 '%s' 记忆的解决方案" | |
4491 | ||
4492 | #: rerere.c:1077 | |
4493 | #, c-format | |
4494 | msgid "cannot unlink '%s'" | |
4495 | msgstr "不能删除 '%s'" | |
4496 | ||
4497 | #: rerere.c:1087 | |
4498 | #, c-format | |
4499 | msgid "Updated preimage for '%s'" | |
4500 | msgstr "已为 '%s' 更新 preimage" | |
4501 | ||
4502 | #: rerere.c:1096 | |
4503 | #, c-format | |
4504 | msgid "Forgot resolution for '%s'\n" | |
4505 | msgstr "忘记 '%s' 的解决方案\n" | |
4506 | ||
4507 | #: rerere.c:1199 | |
4508 | msgid "unable to open rr-cache directory" | |
4509 | msgstr "不能打开 rr-cache 目录" | |
4510 | ||
4511 | #: revision.c:2324 | |
4512 | msgid "your current branch appears to be broken" | |
4513 | msgstr "您的当前分支好像被损坏" | |
4514 | ||
4515 | #: revision.c:2327 | |
4516 | #, c-format | |
4517 | msgid "your current branch '%s' does not have any commits yet" | |
4518 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
4519 | ||
4520 | #: revision.c:2523 | |
4521 | msgid "--first-parent is incompatible with --bisect" | |
4522 | msgstr "--first-parent 与 --bisect 不兼容" | |
4523 | ||
4524 | #: run-command.c:740 | |
4525 | msgid "open /dev/null failed" | |
4526 | msgstr "不能打开 /dev/null" | |
4527 | ||
4528 | #: run-command.c:1229 | |
4529 | #, c-format | |
4530 | msgid "cannot create async thread: %s" | |
4531 | msgstr "不能创建 async 线程:%s" | |
4532 | ||
4533 | #: run-command.c:1293 | |
4534 | #, c-format | |
4535 | msgid "" | |
4536 | "The '%s' hook was ignored because it's not set as executable.\n" | |
4537 | "You can disable this warning with `git config advice.ignoredHook false`." | |
4538 | msgstr "" | |
4539 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
4540 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
4541 | ||
4542 | #: send-pack.c:142 | |
4543 | msgid "unexpected flush packet while reading remote unpack status" | |
4544 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
4545 | ||
4546 | #: send-pack.c:144 | |
4547 | #, c-format | |
4548 | msgid "unable to parse remote unpack status: %s" | |
4549 | msgstr "不能解析远程解包状态:%s" | |
4550 | ||
4551 | #: send-pack.c:146 | |
4552 | #, c-format | |
4553 | msgid "remote unpack failed: %s" | |
4554 | msgstr "远程解包失败:%s" | |
4555 | ||
4556 | #: send-pack.c:308 | |
4557 | msgid "failed to sign the push certificate" | |
4558 | msgstr "为推送证书签名失败" | |
4559 | ||
4560 | #: send-pack.c:421 | |
a0b6b246 JX |
4561 | msgid "the receiving end does not support --signed push" |
4562 | msgstr "接收端不支持签名推送" | |
6792b93b | 4563 | |
4c27fcb5 | 4564 | #: send-pack.c:423 |
a0b6b246 JX |
4565 | msgid "" |
4566 | "not sending a push certificate since the receiving end does not support --" | |
4567 | "signed push" | |
4568 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 4569 | |
4c27fcb5 | 4570 | #: send-pack.c:435 |
a0b6b246 JX |
4571 | msgid "the receiving end does not support --atomic push" |
4572 | msgstr "接收端不支持原子推送" | |
6792b93b | 4573 | |
4c27fcb5 | 4574 | #: send-pack.c:440 |
a0b6b246 JX |
4575 | msgid "the receiving end does not support push options" |
4576 | msgstr "接收端不支持推送选项" | |
6792b93b | 4577 | |
4c27fcb5 | 4578 | #: sequencer.c:183 |
31e5e17b JX |
4579 | #, c-format |
4580 | msgid "invalid commit message cleanup mode '%s'" | |
4581 | msgstr "无效的提交信息清理模式 '%s'" | |
4582 | ||
4c27fcb5 | 4583 | #: sequencer.c:287 |
fd8cb379 JX |
4584 | #, c-format |
4585 | msgid "could not delete '%s'" | |
4586 | msgstr "无法删除 '%s'" | |
4587 | ||
4c27fcb5 | 4588 | #: sequencer.c:313 |
a0b6b246 JX |
4589 | msgid "revert" |
4590 | msgstr "还原" | |
6792b93b | 4591 | |
4c27fcb5 | 4592 | #: sequencer.c:315 |
a0b6b246 JX |
4593 | msgid "cherry-pick" |
4594 | msgstr "拣选" | |
4595 | ||
4c27fcb5 | 4596 | #: sequencer.c:317 |
1a79b2f1 JX |
4597 | msgid "rebase -i" |
4598 | msgstr "rebase -i" | |
4599 | ||
4c27fcb5 | 4600 | #: sequencer.c:319 |
1a79b2f1 | 4601 | #, c-format |
c1ac5258 | 4602 | msgid "unknown action: %d" |
1a79b2f1 JX |
4603 | msgstr "未知动作:%d" |
4604 | ||
4c27fcb5 | 4605 | #: sequencer.c:376 |
a0b6b246 JX |
4606 | msgid "" |
4607 | "after resolving the conflicts, mark the corrected paths\n" | |
4608 | "with 'git add <paths>' or 'git rm <paths>'" | |
4609 | msgstr "" | |
4610 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
4611 | "命令标记修正后的文件" | |
4612 | ||
4c27fcb5 | 4613 | #: sequencer.c:379 |
a0b6b246 JX |
4614 | msgid "" |
4615 | "after resolving the conflicts, mark the corrected paths\n" | |
4616 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
4617 | "and commit the result with 'git commit'" | |
4618 | msgstr "" | |
4619 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
4620 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 4621 | |
4c27fcb5 | 4622 | #: sequencer.c:392 sequencer.c:2632 |
1b7f4a34 | 4623 | #, c-format |
a0b6b246 JX |
4624 | msgid "could not lock '%s'" |
4625 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 4626 | |
4c27fcb5 | 4627 | #: sequencer.c:399 |
a0b6b246 | 4628 | #, c-format |
72351d7d | 4629 | msgid "could not write eol to '%s'" |
a0b6b246 | 4630 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 4631 | |
4c27fcb5 JX |
4632 | #: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652 |
4633 | #: sequencer.c:2885 | |
1b7f4a34 | 4634 | #, c-format |
31e5e17b JX |
4635 | msgid "failed to finalize '%s'" |
4636 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 4637 | |
4c27fcb5 JX |
4638 | #: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535 |
4639 | #: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746 | |
4640 | #: builtin/merge.c:1084 builtin/rebase.c:152 | |
a0b6b246 JX |
4641 | #, c-format |
4642 | msgid "could not read '%s'" | |
4643 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 4644 | |
4c27fcb5 | 4645 | #: sequencer.c:453 |
63af42fe | 4646 | #, c-format |
a0b6b246 JX |
4647 | msgid "your local changes would be overwritten by %s." |
4648 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 4649 | |
4c27fcb5 | 4650 | #: sequencer.c:457 |
a0b6b246 | 4651 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 4652 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 4653 | |
4c27fcb5 | 4654 | #: sequencer.c:486 |
a0b6b246 JX |
4655 | #, c-format |
4656 | msgid "%s: fast-forward" | |
4657 | msgstr "%s:快进" | |
6792b93b | 4658 | |
1a79b2f1 | 4659 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
a4f16749 | 4660 | #. "rebase -i". |
1a79b2f1 | 4661 | #. |
4c27fcb5 | 4662 | #: sequencer.c:575 |
a0b6b246 JX |
4663 | #, c-format |
4664 | msgid "%s: Unable to write new index file" | |
4665 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 4666 | |
4c27fcb5 | 4667 | #: sequencer.c:591 |
5809aa05 JX |
4668 | msgid "unable to update cache tree" |
4669 | msgstr "不能更新缓存树" | |
6792b93b | 4670 | |
4c27fcb5 | 4671 | #: sequencer.c:604 |
fd8cb379 JX |
4672 | msgid "could not resolve HEAD commit" |
4673 | msgstr "不能解析 HEAD 提交" | |
4674 | ||
4c27fcb5 JX |
4675 | #: sequencer.c:684 |
4676 | #, c-format | |
4677 | msgid "no key present in '%.*s'" | |
4678 | msgstr "在 '%.*s' 中没有 key" | |
4679 | ||
4680 | #: sequencer.c:695 | |
c1ac5258 | 4681 | #, c-format |
4c27fcb5 JX |
4682 | msgid "unable to dequote value of '%s'" |
4683 | msgstr "无法为 '%s' 的值去引号" | |
c1ac5258 | 4684 | |
4c27fcb5 JX |
4685 | #: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719 |
4686 | #: builtin/am.c:811 builtin/merge.c:1081 | |
c1ac5258 | 4687 | #, c-format |
4c27fcb5 JX |
4688 | msgid "could not open '%s' for reading" |
4689 | msgstr "无法打开 '%s' 进行读取" | |
4690 | ||
4691 | #: sequencer.c:742 | |
4692 | msgid "'GIT_AUTHOR_NAME' already given" | |
4693 | msgstr "已经给出 'GIT_AUTHOR_NAME'" | |
c1ac5258 JX |
4694 | |
4695 | #: sequencer.c:747 | |
4c27fcb5 JX |
4696 | msgid "'GIT_AUTHOR_EMAIL' already given" |
4697 | msgstr "已经给出 'GIT_AUTHOR_EMAIL'" | |
4698 | ||
4699 | #: sequencer.c:752 | |
4700 | msgid "'GIT_AUTHOR_DATE' already given" | |
4701 | msgstr "已经给出 'GIT_AUTHOR_DATE'" | |
4702 | ||
4703 | #: sequencer.c:756 | |
4704 | #, c-format | |
4705 | msgid "unknown variable '%s'" | |
4706 | msgstr "未知变量 '%s'" | |
4707 | ||
4708 | #: sequencer.c:761 | |
4709 | msgid "missing 'GIT_AUTHOR_NAME'" | |
4710 | msgstr "缺少 'GIT_AUTHOR_NAME'" | |
4711 | ||
4712 | #: sequencer.c:763 | |
4713 | msgid "missing 'GIT_AUTHOR_EMAIL'" | |
4714 | msgstr "缺少 'GIT_AUTHOR_EMAIL'" | |
4715 | ||
4716 | #: sequencer.c:765 | |
4717 | msgid "missing 'GIT_AUTHOR_DATE'" | |
4718 | msgstr "缺少 'GIT_AUTHOR_DATE'" | |
4719 | ||
4720 | #: sequencer.c:825 | |
c1ac5258 JX |
4721 | #, c-format |
4722 | msgid "invalid date format '%s' in '%s'" | |
4723 | msgstr "'%2$s' 中无效的日期格式 '%1$s'" | |
4724 | ||
4c27fcb5 | 4725 | #: sequencer.c:842 |
63af42fe JX |
4726 | #, c-format |
4727 | msgid "" | |
a0b6b246 JX |
4728 | "you have staged changes in your working tree\n" |
4729 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
4730 | "\n" | |
4731 | " git commit --amend %s\n" | |
4732 | "\n" | |
4733 | "If they are meant to go into a new commit, run:\n" | |
4734 | "\n" | |
4735 | " git commit %s\n" | |
4736 | "\n" | |
4737 | "In both cases, once you're done, continue with:\n" | |
4738 | "\n" | |
4739 | " git rebase --continue\n" | |
4740 | msgstr "" | |
1a79b2f1 JX |
4741 | "您的工作区中存在已暂存的修改\n" |
4742 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
4743 | "\n" |
4744 | " git commit --amend %s\n" | |
4745 | "\n" | |
29004bbb | 4746 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
4747 | "\n" |
4748 | " git commit %s\n" | |
4749 | "\n" | |
4750 | "无论哪种情况,当您完成提交,继续执行:\n" | |
4751 | "\n" | |
4752 | " git rebase --continue\n" | |
6792b93b | 4753 | |
4c27fcb5 | 4754 | #: sequencer.c:935 |
fd8cb379 JX |
4755 | msgid "writing root commit" |
4756 | msgstr "写根提交" | |
4757 | ||
4c27fcb5 | 4758 | #: sequencer.c:1142 |
31e5e17b JX |
4759 | msgid "'prepare-commit-msg' hook failed" |
4760 | msgstr "'prepare-commit-msg' 钩子失败" | |
4761 | ||
4c27fcb5 | 4762 | #: sequencer.c:1149 |
31e5e17b JX |
4763 | msgid "" |
4764 | "Your name and email address were configured automatically based\n" | |
4765 | "on your username and hostname. Please check that they are accurate.\n" | |
4766 | "You can suppress this message by setting them explicitly. Run the\n" | |
4767 | "following command and follow the instructions in your editor to edit\n" | |
4768 | "your configuration file:\n" | |
4769 | "\n" | |
4770 | " git config --global --edit\n" | |
4771 | "\n" | |
4772 | "After doing this, you may fix the identity used for this commit with:\n" | |
4773 | "\n" | |
4774 | " git commit --amend --reset-author\n" | |
4775 | msgstr "" | |
4776 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4777 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
4778 | "中编辑您的配置文件:\n" | |
4779 | "\n" | |
4780 | " git config --global --edit\n" | |
4781 | "\n" | |
4782 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4783 | "\n" | |
4784 | " git commit --amend --reset-author\n" | |
4785 | ||
4c27fcb5 | 4786 | #: sequencer.c:1162 |
31e5e17b JX |
4787 | msgid "" |
4788 | "Your name and email address were configured automatically based\n" | |
4789 | "on your username and hostname. Please check that they are accurate.\n" | |
4790 | "You can suppress this message by setting them explicitly:\n" | |
4791 | "\n" | |
4792 | " git config --global user.name \"Your Name\"\n" | |
4793 | " git config --global user.email you@example.com\n" | |
4794 | "\n" | |
4795 | "After doing this, you may fix the identity used for this commit with:\n" | |
4796 | "\n" | |
4797 | " git commit --amend --reset-author\n" | |
4798 | msgstr "" | |
4799 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
4800 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
4801 | "\n" | |
4802 | " git config --global user.name \"Your Name\"\n" | |
4803 | " git config --global user.email you@example.com\n" | |
4804 | "\n" | |
4805 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
4806 | "\n" | |
4807 | " git commit --amend --reset-author\n" | |
4808 | ||
4c27fcb5 | 4809 | #: sequencer.c:1202 |
31e5e17b JX |
4810 | msgid "couldn't look up newly created commit" |
4811 | msgstr "无法找到新创建的提交" | |
4812 | ||
4c27fcb5 | 4813 | #: sequencer.c:1204 |
31e5e17b JX |
4814 | msgid "could not parse newly created commit" |
4815 | msgstr "不能解析新创建的提交" | |
4816 | ||
4c27fcb5 | 4817 | #: sequencer.c:1250 |
31e5e17b JX |
4818 | msgid "unable to resolve HEAD after creating commit" |
4819 | msgstr "创建提交后,不能解析 HEAD" | |
4820 | ||
4c27fcb5 | 4821 | #: sequencer.c:1252 |
31e5e17b JX |
4822 | msgid "detached HEAD" |
4823 | msgstr "分离头指针" | |
4824 | ||
4825 | # 译者:中文字符串拼接,可删除前导空格 | |
4c27fcb5 | 4826 | #: sequencer.c:1256 |
31e5e17b JX |
4827 | msgid " (root-commit)" |
4828 | msgstr "(根提交)" | |
4829 | ||
4c27fcb5 | 4830 | #: sequencer.c:1277 |
31e5e17b JX |
4831 | msgid "could not parse HEAD" |
4832 | msgstr "不能解析 HEAD" | |
4833 | ||
4c27fcb5 | 4834 | #: sequencer.c:1279 |
31e5e17b JX |
4835 | #, c-format |
4836 | msgid "HEAD %s is not a commit!" | |
4837 | msgstr "HEAD %s 不是一个提交!" | |
4838 | ||
4c27fcb5 | 4839 | #: sequencer.c:1283 builtin/commit.c:1543 |
31e5e17b JX |
4840 | msgid "could not parse HEAD commit" |
4841 | msgstr "不能解析 HEAD 提交" | |
4842 | ||
4c27fcb5 | 4843 | #: sequencer.c:1334 sequencer.c:1934 |
31e5e17b JX |
4844 | msgid "unable to parse commit author" |
4845 | msgstr "不能解析提交作者" | |
4846 | ||
4c27fcb5 | 4847 | #: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677 |
31e5e17b JX |
4848 | msgid "git write-tree failed to write a tree" |
4849 | msgstr "git write-tree 无法写入树对象" | |
4850 | ||
4c27fcb5 | 4851 | #: sequencer.c:1361 sequencer.c:1416 |
31e5e17b JX |
4852 | #, c-format |
4853 | msgid "unable to read commit message from '%s'" | |
4854 | msgstr "不能从 '%s' 读取提交说明" | |
4855 | ||
4c27fcb5 JX |
4856 | #: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858 |
4857 | #: builtin/merge.c:883 | |
31e5e17b | 4858 | msgid "failed to write commit object" |
c1ac5258 | 4859 | msgstr "写提交对象失败" |
31e5e17b | 4860 | |
4c27fcb5 | 4861 | #: sequencer.c:1443 |
a0b6b246 | 4862 | #, c-format |
5809aa05 JX |
4863 | msgid "could not parse commit %s" |
4864 | msgstr "不能解析提交 %s" | |
6792b93b | 4865 | |
4c27fcb5 | 4866 | #: sequencer.c:1448 |
63af42fe | 4867 | #, c-format |
5809aa05 JX |
4868 | msgid "could not parse parent commit %s" |
4869 | msgstr "不能解析父提交 %s" | |
63af42fe | 4870 | |
4c27fcb5 | 4871 | #: sequencer.c:1546 sequencer.c:1654 |
c1ac5258 JX |
4872 | #, c-format |
4873 | msgid "unknown command: %d" | |
4874 | msgstr "未知命令:%d" | |
4875 | ||
4c27fcb5 | 4876 | #: sequencer.c:1601 sequencer.c:1626 |
1a79b2f1 JX |
4877 | #, c-format |
4878 | msgid "This is a combination of %d commits." | |
4879 | msgstr "这是一个 %d 个提交的组合。" | |
4880 | ||
4c27fcb5 | 4881 | #: sequencer.c:1611 sequencer.c:4744 |
1a79b2f1 JX |
4882 | msgid "need a HEAD to fixup" |
4883 | msgstr "需要一个 HEAD 来修复" | |
4884 | ||
4c27fcb5 | 4885 | #: sequencer.c:1613 sequencer.c:2912 |
1a79b2f1 JX |
4886 | msgid "could not read HEAD" |
4887 | msgstr "不能读取 HEAD" | |
4888 | ||
4c27fcb5 | 4889 | #: sequencer.c:1615 |
1a79b2f1 JX |
4890 | msgid "could not read HEAD's commit message" |
4891 | msgstr "不能读取 HEAD 的提交说明" | |
4892 | ||
4c27fcb5 | 4893 | #: sequencer.c:1621 |
1a79b2f1 JX |
4894 | #, c-format |
4895 | msgid "cannot write '%s'" | |
4896 | msgstr "不能写 '%s'" | |
4897 | ||
4c27fcb5 | 4898 | #: sequencer.c:1628 git-rebase--preserve-merges.sh:441 |
1a79b2f1 JX |
4899 | msgid "This is the 1st commit message:" |
4900 | msgstr "这是第一个提交说明:" | |
4901 | ||
4c27fcb5 | 4902 | #: sequencer.c:1636 |
1a79b2f1 JX |
4903 | #, c-format |
4904 | msgid "could not read commit message of %s" | |
4905 | msgstr "不能读取 %s 的提交说明" | |
4906 | ||
4c27fcb5 | 4907 | #: sequencer.c:1643 |
1a79b2f1 JX |
4908 | #, c-format |
4909 | msgid "This is the commit message #%d:" | |
4910 | msgstr "这是提交说明 #%d:" | |
4911 | ||
4c27fcb5 | 4912 | #: sequencer.c:1649 |
1a79b2f1 JX |
4913 | #, c-format |
4914 | msgid "The commit message #%d will be skipped:" | |
4915 | msgstr "提交说明 #%d 将被跳过:" | |
4916 | ||
4c27fcb5 | 4917 | #: sequencer.c:1732 |
a0b6b246 JX |
4918 | msgid "your index file is unmerged." |
4919 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 4920 | |
4c27fcb5 | 4921 | #: sequencer.c:1739 |
fd8cb379 JX |
4922 | msgid "cannot fixup root commit" |
4923 | msgstr "不能修复根提交" | |
4924 | ||
4c27fcb5 | 4925 | #: sequencer.c:1758 |
a0b6b246 JX |
4926 | #, c-format |
4927 | msgid "commit %s is a merge but no -m option was given." | |
4928 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 4929 | |
4c27fcb5 | 4930 | #: sequencer.c:1766 |
a0b6b246 JX |
4931 | #, c-format |
4932 | msgid "commit %s does not have parent %d" | |
4933 | msgstr "提交 %s 没有第 %d 个父提交" | |
4934 | ||
4c27fcb5 | 4935 | #: sequencer.c:1770 |
a0b6b246 JX |
4936 | #, c-format |
4937 | msgid "mainline was specified but commit %s is not a merge." | |
4938 | msgstr "指定了主线,但是提交 %s 不是一个合并提交。" | |
4939 | ||
4c27fcb5 | 4940 | #: sequencer.c:1776 |
1a79b2f1 JX |
4941 | #, c-format |
4942 | msgid "cannot get commit message for %s" | |
4943 | msgstr "不能得到 %s 的提交说明" | |
4944 | ||
a0b6b246 JX |
4945 | #. TRANSLATORS: The first %s will be a "todo" command like |
4946 | #. "revert" or "pick", the second %s a SHA1. | |
4c27fcb5 | 4947 | #: sequencer.c:1795 |
a0b6b246 JX |
4948 | #, c-format |
4949 | msgid "%s: cannot parse parent commit %s" | |
4950 | msgstr "%s:不能解析父提交 %s" | |
4951 | ||
4c27fcb5 | 4952 | #: sequencer.c:1860 |
a0b6b246 | 4953 | #, c-format |
1a79b2f1 JX |
4954 | msgid "could not rename '%s' to '%s'" |
4955 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 4956 | |
4c27fcb5 | 4957 | #: sequencer.c:1915 |
a0b6b246 JX |
4958 | #, c-format |
4959 | msgid "could not revert %s... %s" | |
4960 | msgstr "不能还原 %s... %s" | |
4961 | ||
4c27fcb5 | 4962 | #: sequencer.c:1916 |
a0b6b246 JX |
4963 | #, c-format |
4964 | msgid "could not apply %s... %s" | |
4965 | msgstr "不能应用 %s... %s" | |
4966 | ||
4c27fcb5 | 4967 | #: sequencer.c:1974 |
a0b6b246 JX |
4968 | #, c-format |
4969 | msgid "git %s: failed to read the index" | |
4970 | msgstr "git %s:无法读取索引" | |
4971 | ||
4c27fcb5 | 4972 | #: sequencer.c:1981 |
a0b6b246 JX |
4973 | #, c-format |
4974 | msgid "git %s: failed to refresh the index" | |
4975 | msgstr "git %s:无法刷新索引" | |
4976 | ||
4c27fcb5 | 4977 | #: sequencer.c:2062 |
5809aa05 JX |
4978 | #, c-format |
4979 | msgid "%s does not accept arguments: '%s'" | |
4980 | msgstr "%s 不接受参数:'%s'" | |
4981 | ||
4c27fcb5 | 4982 | #: sequencer.c:2071 |
5809aa05 JX |
4983 | #, c-format |
4984 | msgid "missing arguments for %s" | |
4985 | msgstr "缺少 %s 的参数" | |
4986 | ||
4c27fcb5 | 4987 | #: sequencer.c:2130 |
a0b6b246 JX |
4988 | #, c-format |
4989 | msgid "invalid line %d: %.*s" | |
4990 | msgstr "无效行 %d:%.*s" | |
4991 | ||
4c27fcb5 | 4992 | #: sequencer.c:2138 |
1a79b2f1 JX |
4993 | #, c-format |
4994 | msgid "cannot '%s' without a previous commit" | |
4995 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 4996 | |
4c27fcb5 | 4997 | #: sequencer.c:2209 |
1a79b2f1 JX |
4998 | msgid "please fix this using 'git rebase --edit-todo'." |
4999 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
5000 | ||
4c27fcb5 | 5001 | #: sequencer.c:2211 |
a0b6b246 JX |
5002 | #, c-format |
5003 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 5004 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 5005 | |
4c27fcb5 | 5006 | #: sequencer.c:2216 |
1a79b2f1 JX |
5007 | msgid "no commits parsed." |
5008 | msgstr "没有解析提交。" | |
5009 | ||
4c27fcb5 | 5010 | #: sequencer.c:2227 |
a0b6b246 JX |
5011 | msgid "cannot cherry-pick during a revert." |
5012 | msgstr "不能在回退中执行拣选。" | |
5013 | ||
4c27fcb5 | 5014 | #: sequencer.c:2229 |
a0b6b246 JX |
5015 | msgid "cannot revert during a cherry-pick." |
5016 | msgstr "不能在拣选中执行回退。" | |
5017 | ||
4c27fcb5 | 5018 | #: sequencer.c:2299 |
a0b6b246 JX |
5019 | #, c-format |
5020 | msgid "invalid value for %s: %s" | |
5021 | msgstr "%s 的值无效:%s" | |
5022 | ||
4c27fcb5 | 5023 | #: sequencer.c:2380 |
fd8cb379 JX |
5024 | msgid "unusable squash-onto" |
5025 | msgstr "不可用的 squash-onto" | |
5026 | ||
4c27fcb5 | 5027 | #: sequencer.c:2396 |
a0b6b246 JX |
5028 | #, c-format |
5029 | msgid "malformed options sheet: '%s'" | |
fd8cb379 | 5030 | msgstr "格式错误的选项清单:'%s'" |
a0b6b246 | 5031 | |
4c27fcb5 | 5032 | #: sequencer.c:2479 sequencer.c:4005 |
c1ac5258 JX |
5033 | msgid "empty commit set passed" |
5034 | msgstr "提供了空的提交集" | |
5035 | ||
4c27fcb5 | 5036 | #: sequencer.c:2487 |
a0b6b246 JX |
5037 | msgid "a cherry-pick or revert is already in progress" |
5038 | msgstr "一个拣选或还原操作已在进行" | |
5039 | ||
4c27fcb5 | 5040 | #: sequencer.c:2488 |
a0b6b246 JX |
5041 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
5042 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
5043 | ||
4c27fcb5 | 5044 | #: sequencer.c:2491 |
a0b6b246 JX |
5045 | #, c-format |
5046 | msgid "could not create sequencer directory '%s'" | |
5047 | msgstr "不能创建序列目录 '%s'" | |
5048 | ||
4c27fcb5 | 5049 | #: sequencer.c:2505 |
a0b6b246 JX |
5050 | msgid "could not lock HEAD" |
5051 | msgstr "不能锁定 HEAD" | |
5052 | ||
4c27fcb5 | 5053 | #: sequencer.c:2560 sequencer.c:3761 |
a0b6b246 JX |
5054 | msgid "no cherry-pick or revert in progress" |
5055 | msgstr "拣选或还原操作并未进行" | |
5056 | ||
4c27fcb5 | 5057 | #: sequencer.c:2562 |
a0b6b246 JX |
5058 | msgid "cannot resolve HEAD" |
5059 | msgstr "不能解析 HEAD" | |
5060 | ||
4c27fcb5 | 5061 | #: sequencer.c:2564 sequencer.c:2599 |
a0b6b246 JX |
5062 | msgid "cannot abort from a branch yet to be born" |
5063 | msgstr "不能从尚未建立的分支终止" | |
5064 | ||
4c27fcb5 | 5065 | #: sequencer.c:2585 builtin/grep.c:721 |
a0b6b246 JX |
5066 | #, c-format |
5067 | msgid "cannot open '%s'" | |
5068 | msgstr "不能打开 '%s'" | |
5069 | ||
4c27fcb5 | 5070 | #: sequencer.c:2587 |
a0b6b246 JX |
5071 | #, c-format |
5072 | msgid "cannot read '%s': %s" | |
5073 | msgstr "不能读取 '%s':%s" | |
5074 | ||
4c27fcb5 | 5075 | #: sequencer.c:2588 |
a0b6b246 JX |
5076 | msgid "unexpected end of file" |
5077 | msgstr "意外的文件结束" | |
5078 | ||
4c27fcb5 | 5079 | #: sequencer.c:2594 |
a0b6b246 JX |
5080 | #, c-format |
5081 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
5082 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
5083 | ||
4c27fcb5 | 5084 | #: sequencer.c:2605 |
1a79b2f1 JX |
5085 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
5086 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
5087 | ||
4c27fcb5 | 5088 | #: sequencer.c:2709 sequencer.c:3679 |
31e5e17b JX |
5089 | #, c-format |
5090 | msgid "could not update %s" | |
5091 | msgstr "不能更新 %s" | |
5092 | ||
4c27fcb5 | 5093 | #: sequencer.c:2747 sequencer.c:3659 |
1a79b2f1 JX |
5094 | msgid "cannot read HEAD" |
5095 | msgstr "不能读取 HEAD" | |
5096 | ||
4c27fcb5 | 5097 | #: sequencer.c:2762 |
c1ac5258 JX |
5098 | #, c-format |
5099 | msgid "unable to copy '%s' to '%s'" | |
5100 | msgstr "无法拷贝 '%s' 至 '%s'" | |
5101 | ||
4c27fcb5 | 5102 | #: sequencer.c:2770 |
c1ac5258 JX |
5103 | #, c-format |
5104 | msgid "" | |
5105 | "You can amend the commit now, with\n" | |
5106 | "\n" | |
5107 | " git commit --amend %s\n" | |
5108 | "\n" | |
5109 | "Once you are satisfied with your changes, run\n" | |
5110 | "\n" | |
5111 | " git rebase --continue\n" | |
5112 | msgstr "" | |
5113 | "您现在可以修补这个提交,使用\n" | |
5114 | "\n" | |
5115 | " git commit --amend %s\n" | |
5116 | "\n" | |
5117 | "当您对变更感到满意,执行\n" | |
5118 | "\n" | |
5119 | " git rebase --continue\n" | |
5120 | ||
4c27fcb5 | 5121 | #: sequencer.c:2780 |
c1ac5258 JX |
5122 | #, c-format |
5123 | msgid "Could not apply %s... %.*s" | |
5124 | msgstr "不能应用 %s... %.*s" | |
5125 | ||
4c27fcb5 | 5126 | #: sequencer.c:2787 |
c1ac5258 JX |
5127 | #, c-format |
5128 | msgid "Could not merge %.*s" | |
5129 | msgstr "不能合并 %.*s" | |
5130 | ||
4c27fcb5 | 5131 | #: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640 |
1a79b2f1 JX |
5132 | #, c-format |
5133 | msgid "could not copy '%s' to '%s'" | |
5134 | msgstr "不能拷贝 '%s' 至 '%s'" | |
5135 | ||
4c27fcb5 JX |
5136 | #: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019 |
5137 | #: builtin/rebase.c:1372 builtin/rebase.c:1426 | |
1a79b2f1 JX |
5138 | msgid "could not read index" |
5139 | msgstr "不能读取索引" | |
5140 | ||
5141 | # 译者:注意保持前导空格 | |
4c27fcb5 | 5142 | #: sequencer.c:2829 |
1a79b2f1 JX |
5143 | #, c-format |
5144 | msgid "" | |
5145 | "execution failed: %s\n" | |
5146 | "%sYou can fix the problem, and then run\n" | |
5147 | "\n" | |
5148 | " git rebase --continue\n" | |
5149 | "\n" | |
5150 | msgstr "" | |
5151 | "执行失败:%s\n" | |
5152 | "%s您可以改正该问题,然后运行\n" | |
5153 | "\n" | |
5154 | " git rebase --continue\n" | |
5155 | "\n" | |
5156 | ||
4c27fcb5 | 5157 | #: sequencer.c:2835 |
1a79b2f1 JX |
5158 | msgid "and made changes to the index and/or the working tree\n" |
5159 | msgstr "并且修改索引和/或工作区\n" | |
5160 | ||
4c27fcb5 | 5161 | #: sequencer.c:2841 |
1a79b2f1 JX |
5162 | #, c-format |
5163 | msgid "" | |
5164 | "execution succeeded: %s\n" | |
5165 | "but left changes to the index and/or the working tree\n" | |
5166 | "Commit or stash your changes, and then run\n" | |
5167 | "\n" | |
5168 | " git rebase --continue\n" | |
5169 | "\n" | |
5170 | msgstr "" | |
5171 | "执行成功:%s\n" | |
5172 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 5173 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
5174 | "\n" |
5175 | " git rebase --continue\n" | |
5176 | "\n" | |
5177 | ||
4c27fcb5 | 5178 | #: sequencer.c:2902 |
c1ac5258 JX |
5179 | #, c-format |
5180 | msgid "illegal label name: '%.*s'" | |
5181 | msgstr "非法的标签名称:'%.*s'" | |
5182 | ||
4c27fcb5 | 5183 | #: sequencer.c:2954 |
fd8cb379 JX |
5184 | msgid "writing fake root commit" |
5185 | msgstr "写伪根提交" | |
5186 | ||
4c27fcb5 | 5187 | #: sequencer.c:2959 |
fd8cb379 JX |
5188 | msgid "writing squash-onto" |
5189 | msgstr "写入 squash-onto" | |
5190 | ||
4c27fcb5 | 5191 | #: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591 |
fd8cb379 JX |
5192 | #, c-format |
5193 | msgid "failed to find tree of %s" | |
5194 | msgstr "无法找到 %s 指向的树。" | |
5195 | ||
4c27fcb5 | 5196 | #: sequencer.c:3015 builtin/rebase.c:604 |
fd8cb379 JX |
5197 | msgid "could not write index" |
5198 | msgstr "不能写入索引" | |
5199 | ||
4c27fcb5 | 5200 | #: sequencer.c:3042 |
c1ac5258 JX |
5201 | #, c-format |
5202 | msgid "could not resolve '%s'" | |
5203 | msgstr "无法解析 '%s'" | |
5204 | ||
4c27fcb5 | 5205 | #: sequencer.c:3068 |
fd8cb379 JX |
5206 | msgid "cannot merge without a current revision" |
5207 | msgstr "没有当前版本不能合并" | |
5208 | ||
4c27fcb5 | 5209 | #: sequencer.c:3090 |
fd8cb379 | 5210 | #, c-format |
c1ac5258 JX |
5211 | msgid "unable to parse '%.*s'" |
5212 | msgstr "无法解析 '%.*s'" | |
5213 | ||
4c27fcb5 | 5214 | #: sequencer.c:3099 |
c1ac5258 JX |
5215 | #, c-format |
5216 | msgid "nothing to merge: '%.*s'" | |
5217 | msgstr "无可用合并:'%.*s'" | |
5218 | ||
4c27fcb5 | 5219 | #: sequencer.c:3111 |
c1ac5258 JX |
5220 | msgid "octopus merge cannot be executed on top of a [new root]" |
5221 | msgstr "章鱼合并不能在一个新的根提交上执行" | |
fd8cb379 | 5222 | |
4c27fcb5 | 5223 | #: sequencer.c:3126 |
fd8cb379 JX |
5224 | #, c-format |
5225 | msgid "could not get commit message of '%s'" | |
5226 | msgstr "不能获取 '%s' 的提交说明" | |
5227 | ||
4c27fcb5 | 5228 | #: sequencer.c:3274 |
fd8cb379 JX |
5229 | #, c-format |
5230 | msgid "could not even attempt to merge '%.*s'" | |
5231 | msgstr "甚至不能尝试合并 '%.*s'" | |
5232 | ||
4c27fcb5 | 5233 | #: sequencer.c:3290 |
fd8cb379 JX |
5234 | msgid "merge: Unable to write new index file" |
5235 | msgstr "合并:无法写入新索引文件" | |
5236 | ||
4c27fcb5 | 5237 | #: sequencer.c:3358 builtin/rebase.c:268 |
1a79b2f1 | 5238 | #, c-format |
a4f16749 JX |
5239 | msgid "Applied autostash.\n" |
5240 | msgstr "已应用 autostash。\n" | |
1a79b2f1 | 5241 | |
4c27fcb5 | 5242 | #: sequencer.c:3370 |
1a79b2f1 JX |
5243 | #, c-format |
5244 | msgid "cannot store %s" | |
5245 | msgstr "不能存储 %s" | |
5246 | ||
4c27fcb5 | 5247 | #: sequencer.c:3373 builtin/rebase.c:284 |
1a79b2f1 JX |
5248 | #, c-format |
5249 | msgid "" | |
5250 | "Applying autostash resulted in conflicts.\n" | |
5251 | "Your changes are safe in the stash.\n" | |
5252 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
5253 | msgstr "" | |
5254 | "应用 autostash 导致冲突。\n" | |
a4f16749 | 5255 | "您的修改安全地保存在贮藏区中。\n" |
1a79b2f1 JX |
5256 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
5257 | ||
4c27fcb5 JX |
5258 | #: sequencer.c:3427 |
5259 | #, c-format | |
5260 | msgid "could not checkout %s" | |
5261 | msgstr "不能检出 %s" | |
5262 | ||
5263 | #: sequencer.c:3441 | |
5264 | #, c-format | |
5265 | msgid "%s: not a valid OID" | |
5266 | msgstr "%s:不是一个有效的 OID" | |
5267 | ||
5268 | #: sequencer.c:3446 git-rebase--preserve-merges.sh:724 | |
5269 | msgid "could not detach HEAD" | |
5270 | msgstr "不能分离头指针" | |
5271 | ||
5272 | #: sequencer.c:3461 | |
5273 | #, c-format | |
5274 | msgid "Stopped at HEAD\n" | |
5275 | msgstr "停止在 HEAD\n" | |
5276 | ||
5277 | #: sequencer.c:3463 | |
5278 | #, c-format | |
5279 | msgid "Stopped at %s\n" | |
5280 | msgstr "停止在 %s\n" | |
5281 | ||
5282 | #: sequencer.c:3471 | |
fd8cb379 JX |
5283 | #, c-format |
5284 | msgid "" | |
5285 | "Could not execute the todo command\n" | |
5286 | "\n" | |
5287 | " %.*s\n" | |
5288 | "It has been rescheduled; To edit the command before continuing, please\n" | |
5289 | "edit the todo list first:\n" | |
5290 | "\n" | |
5291 | " git rebase --edit-todo\n" | |
5292 | " git rebase --continue\n" | |
5293 | msgstr "" | |
5294 | "无法执行待办命令\n" | |
5295 | "\n" | |
5296 | " %.*s\n" | |
5297 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
5298 | "\n" | |
5299 | " git rebase --edit-todo\n" | |
5300 | " git rebase --continue\n" | |
5301 | ||
4c27fcb5 | 5302 | #: sequencer.c:3543 |
1a79b2f1 | 5303 | #, c-format |
87cb7997 JX |
5304 | msgid "Stopped at %s... %.*s\n" |
5305 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 5306 | |
4c27fcb5 | 5307 | #: sequencer.c:3622 |
1a79b2f1 JX |
5308 | #, c-format |
5309 | msgid "unknown command %d" | |
5310 | msgstr "未知命令 %d" | |
5311 | ||
4c27fcb5 | 5312 | #: sequencer.c:3667 |
1a79b2f1 JX |
5313 | msgid "could not read orig-head" |
5314 | msgstr "不能读取 orig-head" | |
5315 | ||
4c27fcb5 | 5316 | #: sequencer.c:3672 sequencer.c:4741 |
1a79b2f1 JX |
5317 | msgid "could not read 'onto'" |
5318 | msgstr "不能读取 'onto'" | |
5319 | ||
4c27fcb5 | 5320 | #: sequencer.c:3686 |
1a79b2f1 JX |
5321 | #, c-format |
5322 | msgid "could not update HEAD to %s" | |
5323 | msgstr "不能更新 HEAD 为 %s" | |
5324 | ||
4c27fcb5 | 5325 | #: sequencer.c:3772 |
1a79b2f1 JX |
5326 | msgid "cannot rebase: You have unstaged changes." |
5327 | msgstr "不能变基:您有未暂存的变更。" | |
5328 | ||
4c27fcb5 | 5329 | #: sequencer.c:3781 |
1a79b2f1 JX |
5330 | msgid "cannot amend non-existing commit" |
5331 | msgstr "不能修补不存在的提交" | |
5332 | ||
4c27fcb5 | 5333 | #: sequencer.c:3783 |
1a79b2f1 JX |
5334 | #, c-format |
5335 | msgid "invalid file: '%s'" | |
5336 | msgstr "无效文件:'%s'" | |
5337 | ||
4c27fcb5 | 5338 | #: sequencer.c:3785 |
1a79b2f1 JX |
5339 | #, c-format |
5340 | msgid "invalid contents: '%s'" | |
5341 | msgstr "无效内容:'%s'" | |
5342 | ||
4c27fcb5 | 5343 | #: sequencer.c:3788 |
1a79b2f1 JX |
5344 | msgid "" |
5345 | "\n" | |
5346 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
5347 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
5348 | msgstr "" |
5349 | "\n" | |
5350 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 5351 | |
4c27fcb5 | 5352 | #: sequencer.c:3824 sequencer.c:3862 |
fd8cb379 JX |
5353 | #, c-format |
5354 | msgid "could not write file: '%s'" | |
5355 | msgstr "不能写入文件:'%s'" | |
5356 | ||
4c27fcb5 | 5357 | #: sequencer.c:3877 |
fd8cb379 JX |
5358 | msgid "could not remove CHERRY_PICK_HEAD" |
5359 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
5360 | ||
4c27fcb5 | 5361 | #: sequencer.c:3884 |
1a79b2f1 JX |
5362 | msgid "could not commit staged changes." |
5363 | msgstr "不能提交暂存的修改。" | |
5364 | ||
4c27fcb5 | 5365 | #: sequencer.c:3982 |
a0b6b246 JX |
5366 | #, c-format |
5367 | msgid "%s: can't cherry-pick a %s" | |
5368 | msgstr "%s:不能拣选一个%s" | |
5369 | ||
4c27fcb5 | 5370 | #: sequencer.c:3986 |
a0b6b246 JX |
5371 | #, c-format |
5372 | msgid "%s: bad revision" | |
5373 | msgstr "%s:错误的版本" | |
5374 | ||
4c27fcb5 | 5375 | #: sequencer.c:4021 |
a0b6b246 JX |
5376 | msgid "can't revert as initial commit" |
5377 | msgstr "不能作为初始提交回退" | |
5378 | ||
4c27fcb5 | 5379 | #: sequencer.c:4466 |
6937cb4e JX |
5380 | msgid "make_script: unhandled options" |
5381 | msgstr "make_script:有未能处理的选项" | |
5382 | ||
4c27fcb5 | 5383 | #: sequencer.c:4469 |
6937cb4e JX |
5384 | msgid "make_script: error preparing revisions" |
5385 | msgstr "make_script:准备版本时错误" | |
5386 | ||
4c27fcb5 | 5387 | #: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840 |
6937cb4e JX |
5388 | #, c-format |
5389 | msgid "unusable todo list: '%s'" | |
5390 | msgstr "不可用的待办列表:'%s'" | |
5391 | ||
4c27fcb5 | 5392 | #: sequencer.c:4620 |
6937cb4e JX |
5393 | #, c-format |
5394 | msgid "" | |
5395 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
5396 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
5397 | ||
4c27fcb5 | 5398 | #: sequencer.c:4690 |
6937cb4e JX |
5399 | #, c-format |
5400 | msgid "" | |
5401 | "Warning: some commits may have been dropped accidentally.\n" | |
5402 | "Dropped commits (newer to older):\n" | |
5403 | msgstr "" | |
5404 | "警告:一些提交可能被意外丢弃。\n" | |
5405 | "丢弃的提交(从新到旧):\n" | |
5406 | ||
4c27fcb5 | 5407 | #: sequencer.c:4697 |
6937cb4e JX |
5408 | #, c-format |
5409 | msgid "" | |
5410 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
5411 | "\n" | |
5412 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
5413 | "warnings.\n" | |
5414 | "The possible behaviours are: ignore, warn, error.\n" | |
5415 | "\n" | |
5416 | msgstr "" | |
5417 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
5418 | "\n" | |
5419 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
5420 | "可选值有:ignore、warn、error。\n" | |
5421 | "\n" | |
5422 | ||
4c27fcb5 | 5423 | #: sequencer.c:4710 |
6937cb4e JX |
5424 | #, c-format |
5425 | msgid "" | |
5426 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
5427 | "continue'.\n" | |
5428 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
5429 | msgstr "" | |
5430 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
5431 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
5432 | ||
4c27fcb5 JX |
5433 | #: sequencer.c:4848 sequencer.c:4886 |
5434 | msgid "nothing to do" | |
5435 | msgstr "无事可做" | |
5436 | ||
5437 | #: sequencer.c:4852 | |
5438 | #, c-format | |
5439 | msgid "Rebase %s onto %s (%d command)" | |
5440 | msgid_plural "Rebase %s onto %s (%d commands)" | |
5441 | msgstr[0] "变基 %s 到 %s(%d 个提交)" | |
5442 | msgstr[1] "变基 %s 到 %s(%d 个提交)" | |
5443 | ||
5444 | #: sequencer.c:4864 | |
5445 | #, c-format | |
5446 | msgid "could not copy '%s' to '%s'." | |
5447 | msgstr "不能拷贝 '%s' 至 '%s'。" | |
5448 | ||
5449 | #: sequencer.c:4868 sequencer.c:4897 | |
5450 | msgid "could not transform the todo list" | |
5451 | msgstr "无法改变待办列表" | |
5452 | ||
5453 | #: sequencer.c:4900 | |
5454 | msgid "could not skip unnecessary pick commands" | |
5455 | msgstr "无法跳过不必要的拣选" | |
5456 | ||
5457 | #: sequencer.c:4983 | |
6937cb4e JX |
5458 | msgid "the script was already rearranged." |
5459 | msgstr "脚本已经重新编排。" | |
5460 | ||
fd8cb379 | 5461 | #: setup.c:123 |
31e5e17b JX |
5462 | #, c-format |
5463 | msgid "'%s' is outside repository" | |
5464 | msgstr "'%s' 在仓库之外" | |
5465 | ||
fd8cb379 | 5466 | #: setup.c:172 |
a0b6b246 | 5467 | #, c-format |
6792b93b | 5468 | msgid "" |
a0b6b246 JX |
5469 | "%s: no such path in the working tree.\n" |
5470 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
5471 | msgstr "" | |
5472 | "%s:工作区中无此路径。\n" | |
58b6f078 | 5473 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 5474 | |
fd8cb379 | 5475 | #: setup.c:185 |
90314792 | 5476 | #, c-format |
a0b6b246 JX |
5477 | msgid "" |
5478 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
5479 | "Use '--' to separate paths from revisions, like this:\n" | |
5480 | "'git <command> [<revision>...] -- [<file>...]'" | |
5481 | msgstr "" | |
5482 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
5483 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 5484 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 5485 | |
fd8cb379 | 5486 | #: setup.c:234 |
31e5e17b JX |
5487 | #, c-format |
5488 | msgid "option '%s' must come before non-option arguments" | |
5489 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
5490 | ||
fd8cb379 | 5491 | #: setup.c:253 |
a0b6b246 JX |
5492 | #, c-format |
5493 | msgid "" | |
5494 | "ambiguous argument '%s': both revision and filename\n" | |
5495 | "Use '--' to separate paths from revisions, like this:\n" | |
5496 | "'git <command> [<revision>...] -- [<file>...]'" | |
5497 | msgstr "" | |
5498 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
5499 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 5500 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 5501 | |
fd8cb379 | 5502 | #: setup.c:389 |
31e5e17b JX |
5503 | msgid "unable to set up work tree using invalid config" |
5504 | msgstr "无法使用无效配置来创建工作区" | |
5505 | ||
fd8cb379 | 5506 | #: setup.c:393 |
31e5e17b | 5507 | msgid "this operation must be run in a work tree" |
610f8099 | 5508 | msgstr "该操作必须在一个工作区中运行" |
31e5e17b | 5509 | |
4c27fcb5 | 5510 | #: setup.c:527 |
a0b6b246 JX |
5511 | #, c-format |
5512 | msgid "Expected git repo version <= %d, found %d" | |
5513 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 5514 | |
4c27fcb5 | 5515 | #: setup.c:535 |
a0b6b246 JX |
5516 | msgid "unknown repository extensions found:" |
5517 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 5518 | |
4c27fcb5 | 5519 | #: setup.c:554 |
1003b3a5 | 5520 | #, c-format |
31e5e17b | 5521 | msgid "error opening '%s'" |
c1ac5258 | 5522 | msgstr "打开 '%s' 出错" |
1003b3a5 | 5523 | |
4c27fcb5 | 5524 | #: setup.c:556 |
31e5e17b JX |
5525 | #, c-format |
5526 | msgid "too large to be a .git file: '%s'" | |
610f8099 | 5527 | msgstr "文件太大,无法作为 .git 文件:'%s'" |
31e5e17b | 5528 | |
4c27fcb5 | 5529 | #: setup.c:558 |
31e5e17b JX |
5530 | #, c-format |
5531 | msgid "error reading %s" | |
c1ac5258 | 5532 | msgstr "读取 %s 出错" |
31e5e17b | 5533 | |
4c27fcb5 | 5534 | #: setup.c:560 |
31e5e17b JX |
5535 | #, c-format |
5536 | msgid "invalid gitfile format: %s" | |
5537 | msgstr "无效的 gitfile 格式:%s" | |
5538 | ||
4c27fcb5 | 5539 | #: setup.c:562 |
31e5e17b JX |
5540 | #, c-format |
5541 | msgid "no path in gitfile: %s" | |
5542 | msgstr "在 gitfile 中没有路径:%s" | |
5543 | ||
4c27fcb5 | 5544 | #: setup.c:564 |
31e5e17b JX |
5545 | #, c-format |
5546 | msgid "not a git repository: %s" | |
5547 | msgstr "不是一个 git 仓库:%s" | |
5548 | ||
4c27fcb5 | 5549 | #: setup.c:663 |
31e5e17b JX |
5550 | #, c-format |
5551 | msgid "'$%s' too big" | |
5552 | msgstr "'$%s' 太大" | |
5553 | ||
4c27fcb5 | 5554 | #: setup.c:677 |
31e5e17b JX |
5555 | #, c-format |
5556 | msgid "not a git repository: '%s'" | |
5557 | msgstr "不是一个 git 仓库:'%s'" | |
5558 | ||
4c27fcb5 | 5559 | #: setup.c:706 setup.c:708 setup.c:739 |
31e5e17b JX |
5560 | #, c-format |
5561 | msgid "cannot chdir to '%s'" | |
5562 | msgstr "不能切换目录到 '%s'" | |
5563 | ||
4c27fcb5 | 5564 | #: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839 |
31e5e17b | 5565 | msgid "cannot come back to cwd" |
a0b6b246 | 5566 | msgstr "无法返回当前工作目录" |
1003b3a5 | 5567 | |
4c27fcb5 | 5568 | #: setup.c:837 |
31e5e17b JX |
5569 | #, c-format |
5570 | msgid "not a git repository (or any of the parent directories): %s" | |
5571 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
5572 | ||
4c27fcb5 | 5573 | #: setup.c:848 |
31e5e17b JX |
5574 | #, c-format |
5575 | msgid "failed to stat '%*s%s%s'" | |
c1ac5258 | 5576 | msgstr "获取 '%*s%s%s' 状态(stat)失败" |
31e5e17b | 5577 | |
4c27fcb5 | 5578 | #: setup.c:1078 |
a0b6b246 JX |
5579 | msgid "Unable to read current working directory" |
5580 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 5581 | |
4c27fcb5 | 5582 | #: setup.c:1090 setup.c:1096 |
87cb7997 | 5583 | #, c-format |
31e5e17b | 5584 | msgid "cannot change to '%s'" |
87cb7997 JX |
5585 | msgstr "不能切换到 '%s'" |
5586 | ||
4c27fcb5 | 5587 | #: setup.c:1109 |
a0b6b246 JX |
5588 | #, c-format |
5589 | msgid "" | |
31e5e17b | 5590 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
5591 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
5592 | msgstr "" | |
31e5e17b | 5593 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 5594 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 5595 | |
4c27fcb5 | 5596 | #: setup.c:1192 |
a0b6b246 JX |
5597 | #, c-format |
5598 | msgid "" | |
31e5e17b | 5599 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
5600 | "The owner of files must always have read and write permissions." |
5601 | msgstr "" | |
31e5e17b | 5602 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 5603 | "文件属主必须始终拥有读写权限。" |
6792b93b | 5604 | |
4c27fcb5 | 5605 | #: setup.c:1235 |
31e5e17b JX |
5606 | msgid "open /dev/null or dup failed" |
5607 | msgstr "不能打开或者复制 /dev/null" | |
5608 | ||
4c27fcb5 | 5609 | #: setup.c:1250 |
31e5e17b JX |
5610 | msgid "fork failed" |
5611 | msgstr "fork 失败" | |
5612 | ||
4c27fcb5 | 5613 | #: setup.c:1255 |
31e5e17b JX |
5614 | msgid "setsid failed" |
5615 | msgstr "setsid 失败" | |
5616 | ||
c1ac5258 JX |
5617 | #: sha1-file.c:381 |
5618 | #, c-format | |
5619 | msgid "object directory %s does not exist; check .git/objects/info/alternates" | |
5620 | msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" | |
5621 | ||
5622 | #: sha1-file.c:432 | |
5623 | #, c-format | |
5624 | msgid "unable to normalize alternate object path: %s" | |
5625 | msgstr "无法规范化备用对象路径:%s" | |
5626 | ||
5627 | #: sha1-file.c:503 | |
5628 | #, c-format | |
5629 | msgid "%s: ignoring alternate object stores, nesting too deep" | |
5630 | msgstr "%s:忽略备用对象库,嵌套太深" | |
5631 | ||
5632 | #: sha1-file.c:510 | |
5633 | #, c-format | |
5634 | msgid "unable to normalize object directory: %s" | |
5635 | msgstr "无法规范化对象目录: %s" | |
5636 | ||
5637 | #: sha1-file.c:565 | |
5638 | msgid "unable to fdopen alternates lockfile" | |
5639 | msgstr "无法 fdopen 替换锁文件" | |
5640 | ||
5641 | #: sha1-file.c:583 | |
5642 | msgid "unable to read alternates file" | |
5643 | msgstr "无法读取替代文件" | |
5644 | ||
5645 | #: sha1-file.c:590 | |
5646 | msgid "unable to move new alternates file into place" | |
5647 | msgstr "无法将新的替代文件移动到位" | |
5648 | ||
fd8cb379 | 5649 | #: sha1-file.c:625 |
a0b6b246 JX |
5650 | #, c-format |
5651 | msgid "path '%s' does not exist" | |
5652 | msgstr "路径 '%s' 不存在" | |
5653 | ||
fd8cb379 | 5654 | #: sha1-file.c:651 |
a0b6b246 JX |
5655 | #, c-format |
5656 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
5657 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
5658 | ||
fd8cb379 | 5659 | #: sha1-file.c:657 |
a0b6b246 JX |
5660 | #, c-format |
5661 | msgid "reference repository '%s' is not a local repository." | |
5662 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
5663 | ||
fd8cb379 | 5664 | #: sha1-file.c:663 |
a0b6b246 JX |
5665 | #, c-format |
5666 | msgid "reference repository '%s' is shallow" | |
5667 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
5668 | ||
fd8cb379 | 5669 | #: sha1-file.c:671 |
a0b6b246 JX |
5670 | #, c-format |
5671 | msgid "reference repository '%s' is grafted" | |
fd8cb379 | 5672 | msgstr "参考仓库 '%s' 已被移植" |
a0b6b246 | 5673 | |
c1ac5258 JX |
5674 | #: sha1-file.c:781 |
5675 | #, c-format | |
5676 | msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" | |
5677 | msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" | |
5678 | ||
5679 | #: sha1-file.c:806 | |
5680 | msgid "mmap failed" | |
5681 | msgstr "mmap 失败" | |
5682 | ||
5683 | #: sha1-file.c:973 | |
5684 | #, c-format | |
5685 | msgid "object file %s is empty" | |
5686 | msgstr "对象文件 %s 为空" | |
5687 | ||
4c27fcb5 | 5688 | #: sha1-file.c:1093 sha1-file.c:2215 |
c1ac5258 JX |
5689 | #, c-format |
5690 | msgid "corrupt loose object '%s'" | |
5691 | msgstr "损坏的松散对象 '%s'" | |
5692 | ||
4c27fcb5 | 5693 | #: sha1-file.c:1095 sha1-file.c:2219 |
c1ac5258 JX |
5694 | #, c-format |
5695 | msgid "garbage at end of loose object '%s'" | |
5696 | msgstr "松散对象 '%s' 后面有垃圾数据" | |
5697 | ||
5698 | #: sha1-file.c:1137 | |
5699 | msgid "invalid object type" | |
5700 | msgstr "无效的对象类型" | |
5701 | ||
5702 | #: sha1-file.c:1219 | |
5703 | #, c-format | |
5704 | msgid "unable to unpack %s header with --allow-unknown-type" | |
5705 | msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" | |
5706 | ||
5707 | #: sha1-file.c:1222 | |
5708 | #, c-format | |
5709 | msgid "unable to unpack %s header" | |
5710 | msgstr "无法解开 %s 头部" | |
5711 | ||
5712 | #: sha1-file.c:1228 | |
5713 | #, c-format | |
5714 | msgid "unable to parse %s header with --allow-unknown-type" | |
5715 | msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" | |
5716 | ||
5717 | #: sha1-file.c:1231 | |
5718 | #, c-format | |
5719 | msgid "unable to parse %s header" | |
5720 | msgstr "无法解析 %s 头部" | |
5721 | ||
5722 | #: sha1-file.c:1422 | |
5723 | #, c-format | |
5724 | msgid "failed to read object %s" | |
5725 | msgstr "读取对象 %s 失败" | |
5726 | ||
5727 | #: sha1-file.c:1426 | |
5728 | #, c-format | |
5729 | msgid "replacement %s not found for %s" | |
5730 | msgstr "找不到 %2$s 的替代 %1$s" | |
5731 | ||
5732 | #: sha1-file.c:1430 | |
5733 | #, c-format | |
5734 | msgid "loose object %s (stored in %s) is corrupt" | |
5735 | msgstr "松散对象 %s(保存在 %s)已损坏" | |
5736 | ||
5737 | #: sha1-file.c:1434 | |
5738 | #, c-format | |
5739 | msgid "packed object %s (stored in %s) is corrupt" | |
5740 | msgstr "打包对象 %s(保存在 %s)已损坏" | |
5741 | ||
5742 | #: sha1-file.c:1536 | |
5743 | #, c-format | |
5744 | msgid "unable to write sha1 filename %s" | |
5745 | msgstr "无法写入 sha1 文件名 %s" | |
5746 | ||
5747 | #: sha1-file.c:1543 | |
5748 | #, c-format | |
5749 | msgid "unable to set permission to '%s'" | |
5750 | msgstr "无法为 '%s' 设置权限" | |
5751 | ||
5752 | #: sha1-file.c:1550 | |
5753 | msgid "file write error" | |
5754 | msgstr "文件写错误" | |
5755 | ||
5756 | #: sha1-file.c:1569 | |
5757 | msgid "error when closing sha1 file" | |
5758 | msgstr "关闭 sha1 文件时出错" | |
5759 | ||
5760 | #: sha1-file.c:1635 | |
5761 | #, c-format | |
5762 | msgid "insufficient permission for adding an object to repository database %s" | |
5763 | msgstr "权限不足,无法在仓库对象库 %s 中添加对象" | |
5764 | ||
5765 | #: sha1-file.c:1637 | |
5766 | msgid "unable to create temporary file" | |
5767 | msgstr "无法创建临时文件" | |
5768 | ||
5769 | #: sha1-file.c:1661 | |
5770 | msgid "unable to write sha1 file" | |
5771 | msgstr "无法写入 sha1 文件" | |
5772 | ||
5773 | #: sha1-file.c:1667 | |
5774 | #, c-format | |
5775 | msgid "unable to deflate new object %s (%d)" | |
5776 | msgstr "不能压缩新对象 %s(%d)" | |
5777 | ||
5778 | #: sha1-file.c:1671 | |
5779 | #, c-format | |
5780 | msgid "deflateEnd on object %s failed (%d)" | |
5781 | msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" | |
5782 | ||
5783 | #: sha1-file.c:1675 | |
5784 | #, c-format | |
5785 | msgid "confused by unstable object source data for %s" | |
5786 | msgstr "被 %s 的不稳定对象源数据搞糊涂了" | |
5787 | ||
4c27fcb5 | 5788 | #: sha1-file.c:1685 builtin/pack-objects.c:918 |
c1ac5258 JX |
5789 | #, c-format |
5790 | msgid "failed utime() on %s" | |
5791 | msgstr "在 %s 上调用 utime() 失败" | |
5792 | ||
5793 | #: sha1-file.c:1760 | |
5794 | #, c-format | |
5795 | msgid "cannot read sha1_file for %s" | |
5796 | msgstr "不能从 %s 读取 sha1 文件" | |
5797 | ||
5798 | #: sha1-file.c:1805 | |
5799 | msgid "corrupt commit" | |
5800 | msgstr "损坏的提交" | |
5801 | ||
5802 | #: sha1-file.c:1813 | |
5803 | msgid "corrupt tag" | |
5804 | msgstr "损坏的标签" | |
5805 | ||
4c27fcb5 | 5806 | #: sha1-file.c:1912 |
c1ac5258 JX |
5807 | #, c-format |
5808 | msgid "read error while indexing %s" | |
5809 | msgstr "索引 %s 时读取错误" | |
5810 | ||
4c27fcb5 | 5811 | #: sha1-file.c:1915 |
c1ac5258 JX |
5812 | #, c-format |
5813 | msgid "short read while indexing %s" | |
5814 | msgstr "索引 %s 时读入不完整" | |
5815 | ||
4c27fcb5 | 5816 | #: sha1-file.c:1988 sha1-file.c:1997 |
c1ac5258 JX |
5817 | #, c-format |
5818 | msgid "%s: failed to insert into database" | |
5819 | msgstr "%s:插入数据库失败" | |
5820 | ||
4c27fcb5 | 5821 | #: sha1-file.c:2003 |
c1ac5258 JX |
5822 | #, c-format |
5823 | msgid "%s: unsupported file type" | |
5824 | msgstr "%s:不支持的文件类型" | |
5825 | ||
4c27fcb5 | 5826 | #: sha1-file.c:2027 |
c1ac5258 JX |
5827 | #, c-format |
5828 | msgid "%s is not a valid object" | |
5829 | msgstr "%s 不是一个有效的对象" | |
5830 | ||
4c27fcb5 | 5831 | #: sha1-file.c:2029 |
c1ac5258 JX |
5832 | #, c-format |
5833 | msgid "%s is not a valid '%s' object" | |
5834 | msgstr "%s 不是一个有效的 '%s' 对象" | |
5835 | ||
4c27fcb5 | 5836 | #: sha1-file.c:2056 builtin/index-pack.c:154 |
c1ac5258 JX |
5837 | #, c-format |
5838 | msgid "unable to open %s" | |
5839 | msgstr "不能打开 %s" | |
5840 | ||
4c27fcb5 | 5841 | #: sha1-file.c:2226 sha1-file.c:2278 |
c1ac5258 JX |
5842 | #, c-format |
5843 | msgid "sha1 mismatch for %s (expected %s)" | |
5844 | msgstr "%s 的 sha1 不匹配(预期 %s)" | |
5845 | ||
4c27fcb5 | 5846 | #: sha1-file.c:2250 |
c1ac5258 JX |
5847 | #, c-format |
5848 | msgid "unable to mmap %s" | |
5849 | msgstr "不能 mmap %s" | |
5850 | ||
4c27fcb5 | 5851 | #: sha1-file.c:2255 |
c1ac5258 JX |
5852 | #, c-format |
5853 | msgid "unable to unpack header of %s" | |
5854 | msgstr "无法解压缩 %s 的头部" | |
5855 | ||
4c27fcb5 | 5856 | #: sha1-file.c:2261 |
c1ac5258 JX |
5857 | #, c-format |
5858 | msgid "unable to parse header of %s" | |
5859 | msgstr "无法解析 %s 的头部" | |
5860 | ||
4c27fcb5 | 5861 | #: sha1-file.c:2272 |
c1ac5258 JX |
5862 | #, c-format |
5863 | msgid "unable to unpack contents of %s" | |
5864 | msgstr "无法解压缩 %s 的内容" | |
5865 | ||
4c27fcb5 | 5866 | #: sha1-name.c:476 |
a0b6b246 JX |
5867 | #, c-format |
5868 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 5869 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 5870 | |
4c27fcb5 | 5871 | #: sha1-name.c:487 |
a0b6b246 JX |
5872 | msgid "The candidates are:" |
5873 | msgstr "候选者有:" | |
5874 | ||
4c27fcb5 | 5875 | #: sha1-name.c:770 |
a0b6b246 JX |
5876 | msgid "" |
5877 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
5878 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
5879 | "may be created by mistake. For example,\n" | |
5880 | "\n" | |
5881 | " git checkout -b $br $(git rev-parse ...)\n" | |
5882 | "\n" | |
5883 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
5884 | "examine these refs and maybe delete them. Turn this message off by\n" | |
5885 | "running \"git config advice.objectNameWarning false\"" | |
5886 | msgstr "" | |
5887 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
5888 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
5889 | "\n" | |
5890 | " git checkout -b $br $(git rev-parse ...)\n" | |
5891 | "\n" | |
5892 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
5893 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" | |
5894 | "命令关闭本消息通知。" | |
5895 | ||
4c27fcb5 | 5896 | #: submodule.c:116 submodule.c:145 |
a0b6b246 JX |
5897 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
5898 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
5899 | ||
4c27fcb5 | 5900 | #: submodule.c:120 submodule.c:149 |
a0b6b246 JX |
5901 | #, c-format |
5902 | msgid "Could not find section in .gitmodules where path=%s" | |
5903 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
5904 | ||
4c27fcb5 | 5905 | #: submodule.c:156 |
a0b6b246 JX |
5906 | #, c-format |
5907 | msgid "Could not remove .gitmodules entry for %s" | |
5908 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
5909 | ||
4c27fcb5 | 5910 | #: submodule.c:167 |
a0b6b246 JX |
5911 | msgid "staging updated .gitmodules failed" |
5912 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
5913 | ||
4c27fcb5 | 5914 | #: submodule.c:329 |
a4f16749 JX |
5915 | #, c-format |
5916 | msgid "in unpopulated submodule '%s'" | |
5917 | msgstr "位于未检出的子模组 '%s'" | |
5918 | ||
4c27fcb5 | 5919 | #: submodule.c:360 |
a4f16749 JX |
5920 | #, c-format |
5921 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
5922 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
5923 | ||
4c27fcb5 | 5924 | #: submodule.c:857 |
6937cb4e JX |
5925 | #, c-format |
5926 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 5927 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 5928 | |
4c27fcb5 | 5929 | #: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985 |
6937cb4e JX |
5930 | msgid "Failed to resolve HEAD as a valid ref." |
5931 | msgstr "无法将 HEAD 解析为有效引用。" | |
5932 | ||
4c27fcb5 | 5933 | #: submodule.c:1404 |
1a79b2f1 | 5934 | #, c-format |
87cb7997 | 5935 | msgid "'%s' not recognized as a git repository" |
65e2041e | 5936 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 5937 | |
4c27fcb5 | 5938 | #: submodule.c:1542 |
1a79b2f1 | 5939 | #, c-format |
87cb7997 JX |
5940 | msgid "could not start 'git status' in submodule '%s'" |
5941 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 5942 | |
4c27fcb5 | 5943 | #: submodule.c:1555 |
87cb7997 JX |
5944 | #, c-format |
5945 | msgid "could not run 'git status' in submodule '%s'" | |
5946 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
5947 | ||
4c27fcb5 | 5948 | #: submodule.c:1648 |
87cb7997 JX |
5949 | #, c-format |
5950 | msgid "submodule '%s' has dirty index" | |
5951 | msgstr "子模组 '%s' 中有脏索引" | |
5952 | ||
4c27fcb5 | 5953 | #: submodule.c:1700 |
c1ac5258 JX |
5954 | #, c-format |
5955 | msgid "Submodule '%s' could not be updated." | |
5956 | msgstr "子模组 '%s' 无法被更新。" | |
5957 | ||
4c27fcb5 | 5958 | #: submodule.c:1747 |
1a79b2f1 JX |
5959 | #, c-format |
5960 | msgid "" | |
5961 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
5962 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
5963 | ||
4c27fcb5 | 5964 | #: submodule.c:1759 submodule.c:1815 |
1a79b2f1 JX |
5965 | #, c-format |
5966 | msgid "could not lookup name for submodule '%s'" | |
5967 | msgstr "不能查询子模组 '%s' 的名称" | |
5968 | ||
4c27fcb5 | 5969 | #: submodule.c:1766 |
1a79b2f1 JX |
5970 | #, c-format |
5971 | msgid "" | |
5972 | "Migrating git directory of '%s%s' from\n" | |
5973 | "'%s' to\n" | |
5974 | "'%s'\n" | |
5975 | msgstr "" | |
5976 | "将 '%s%s' 的 git 目录从\n" | |
5977 | "'%s' 迁移至\n" | |
5978 | "'%s'\n" | |
5979 | ||
4c27fcb5 | 5980 | #: submodule.c:1850 |
1a79b2f1 JX |
5981 | #, c-format |
5982 | msgid "could not recurse into submodule '%s'" | |
5983 | msgstr "无法递归进子模组路径 '%s'" | |
5984 | ||
4c27fcb5 | 5985 | #: submodule.c:1894 |
87cb7997 JX |
5986 | msgid "could not start ls-files in .." |
5987 | msgstr "无法在 .. 中启动 ls-files" | |
5988 | ||
4c27fcb5 | 5989 | #: submodule.c:1933 |
87cb7997 JX |
5990 | #, c-format |
5991 | msgid "ls-tree returned unexpected return code %d" | |
5992 | msgstr "ls-tree 返回未知返回值 %d" | |
5993 | ||
4c27fcb5 | 5994 | #: submodule-config.c:232 |
fd8cb379 JX |
5995 | #, c-format |
5996 | msgid "ignoring suspicious submodule name: %s" | |
5997 | msgstr "忽略可疑的子模组名称:%s" | |
5998 | ||
4c27fcb5 | 5999 | #: submodule-config.c:296 |
6937cb4e JX |
6000 | msgid "negative values not allowed for submodule.fetchjobs" |
6001 | msgstr "submodule.fetchjobs 不允许为负值" | |
6002 | ||
4c27fcb5 JX |
6003 | #: submodule-config.c:390 |
6004 | #, c-format | |
6005 | msgid "ignoring '%s' which may be interpreted as a command-line option: %s" | |
6006 | msgstr "忽略可能被解析为命令行选项的 '%s':%s" | |
6007 | ||
6008 | #: submodule-config.c:479 | |
a0b6b246 JX |
6009 | #, c-format |
6010 | msgid "invalid value for %s" | |
6011 | msgstr "%s 的值无效" | |
6012 | ||
4c27fcb5 JX |
6013 | #: submodule-config.c:754 |
6014 | #, c-format | |
6015 | msgid "Could not update .gitmodules entry %s" | |
6016 | msgstr "不能更新 .gitmodules 条目 %s" | |
6017 | ||
6937cb4e | 6018 | #: trailer.c:238 |
a0b6b246 JX |
6019 | #, c-format |
6020 | msgid "running trailer command '%s' failed" | |
6021 | msgstr "执行 trailer 命令 '%s' 失败" | |
6022 | ||
6937cb4e JX |
6023 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
6024 | #: trailer.c:557 | |
a0b6b246 JX |
6025 | #, c-format |
6026 | msgid "unknown value '%s' for key '%s'" | |
6027 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
6028 | ||
4c27fcb5 | 6029 | #: trailer.c:539 trailer.c:544 builtin/remote.c:295 |
a0b6b246 JX |
6030 | #, c-format |
6031 | msgid "more than one %s" | |
6032 | msgstr "多于一个 %s" | |
6033 | ||
6937cb4e | 6034 | #: trailer.c:730 |
a0b6b246 JX |
6035 | #, c-format |
6036 | msgid "empty trailer token in trailer '%.*s'" | |
6037 | msgstr "签名 '%.*s' 的键为空" | |
6038 | ||
6937cb4e | 6039 | #: trailer.c:750 |
a0b6b246 JX |
6040 | #, c-format |
6041 | msgid "could not read input file '%s'" | |
6042 | msgstr "不能读取输入文件 '%s'" | |
6043 | ||
6937cb4e | 6044 | #: trailer.c:753 |
a0b6b246 JX |
6045 | msgid "could not read from stdin" |
6046 | msgstr "不能自标准输入读取" | |
6047 | ||
4c27fcb5 | 6048 | #: trailer.c:1011 builtin/am.c:47 |
a0b6b246 JX |
6049 | #, c-format |
6050 | msgid "could not stat %s" | |
65e2041e | 6051 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 6052 | |
4c27fcb5 | 6053 | #: trailer.c:1013 |
a0b6b246 JX |
6054 | #, c-format |
6055 | msgid "file %s is not a regular file" | |
6056 | msgstr "文件 %s 不是一个正规文件" | |
6057 | ||
4c27fcb5 | 6058 | #: trailer.c:1015 |
a0b6b246 JX |
6059 | #, c-format |
6060 | msgid "file %s is not writable by user" | |
6061 | msgstr "文件 %s 用户不可写" | |
6062 | ||
4c27fcb5 | 6063 | #: trailer.c:1027 |
a0b6b246 JX |
6064 | msgid "could not open temporary file" |
6065 | msgstr "不能打开临时文件" | |
6066 | ||
4c27fcb5 | 6067 | #: trailer.c:1067 |
a0b6b246 JX |
6068 | #, c-format |
6069 | msgid "could not rename temporary file to %s" | |
6070 | msgstr "不能重命名临时文件为 %s" | |
6071 | ||
fd8cb379 | 6072 | #: transport.c:116 |
a0b6b246 JX |
6073 | #, c-format |
6074 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
6075 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
6076 | ||
c1ac5258 JX |
6077 | #: transport.c:142 |
6078 | #, c-format | |
6079 | msgid "could not read bundle '%s'" | |
6080 | msgstr "无法读取 bundle '%s'" | |
6081 | ||
fd8cb379 | 6082 | #: transport.c:208 |
a0b6b246 JX |
6083 | #, c-format |
6084 | msgid "transport: invalid depth option '%s'" | |
6085 | msgstr "传输:无效的深度选项 '%s'" | |
6086 | ||
4c27fcb5 | 6087 | #: transport.c:616 |
fd8cb379 JX |
6088 | msgid "could not parse transport.color.* config" |
6089 | msgstr "不能解析 transport.color.* 配置" | |
6090 | ||
4c27fcb5 | 6091 | #: transport.c:689 |
c1ac5258 JX |
6092 | msgid "support for protocol v2 not implemented yet" |
6093 | msgstr "协议 v2 的支持尚未实现" | |
6094 | ||
4c27fcb5 | 6095 | #: transport.c:816 |
c1ac5258 JX |
6096 | #, c-format |
6097 | msgid "unknown value for config '%s': %s" | |
6098 | msgstr "配置 '%s' 的取值未知:%s" | |
6099 | ||
4c27fcb5 | 6100 | #: transport.c:882 |
c1ac5258 JX |
6101 | #, c-format |
6102 | msgid "transport '%s' not allowed" | |
6103 | msgstr "传输 '%s' 不允许" | |
6104 | ||
4c27fcb5 | 6105 | #: transport.c:936 |
c1ac5258 JX |
6106 | msgid "git-over-rsync is no longer supported" |
6107 | msgstr "不再支持 git-over-rsync" | |
6108 | ||
4c27fcb5 | 6109 | #: transport.c:1031 |
a0b6b246 JX |
6110 | #, c-format |
6111 | msgid "" | |
6112 | "The following submodule paths contain changes that can\n" | |
6113 | "not be found on any remote:\n" | |
6114 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
6115 | ||
4c27fcb5 | 6116 | #: transport.c:1035 |
a0b6b246 JX |
6117 | #, c-format |
6118 | msgid "" | |
6119 | "\n" | |
6120 | "Please try\n" | |
6121 | "\n" | |
6122 | "\tgit push --recurse-submodules=on-demand\n" | |
6123 | "\n" | |
6124 | "or cd to the path and use\n" | |
6125 | "\n" | |
6126 | "\tgit push\n" | |
6127 | "\n" | |
6128 | "to push them to a remote.\n" | |
6129 | "\n" | |
6130 | msgstr "" | |
6131 | "\n" | |
6132 | "请尝试\n" | |
6133 | "\n" | |
6134 | "\tgit push --recurse-submodules=on-demand\n" | |
6135 | "\n" | |
6136 | "或者进入到子目录执行\n" | |
6137 | "\n" | |
6138 | "\tgit push\n" | |
6139 | "\n" | |
6140 | "以推送至远程。\n" | |
6141 | "\n" | |
6142 | ||
4c27fcb5 | 6143 | #: transport.c:1043 |
a0b6b246 JX |
6144 | msgid "Aborting." |
6145 | msgstr "正在终止。" | |
6146 | ||
4c27fcb5 | 6147 | #: transport.c:1182 |
c1ac5258 JX |
6148 | msgid "failed to push all needed submodules" |
6149 | msgstr "不能推送全部需要的子模组" | |
6150 | ||
4c27fcb5 | 6151 | #: transport.c:1315 transport-helper.c:643 |
c1ac5258 JX |
6152 | msgid "operation not supported by protocol" |
6153 | msgstr "协议不支持该操作" | |
6154 | ||
4c27fcb5 | 6155 | #: transport.c:1419 |
c1ac5258 JX |
6156 | #, c-format |
6157 | msgid "invalid line while parsing alternate refs: %s" | |
6158 | msgstr "解析备用引用时无效的行:%s" | |
6159 | ||
6160 | #: transport-helper.c:51 transport-helper.c:80 | |
6161 | msgid "full write to remote helper failed" | |
6162 | msgstr "完整写入远程助手失败" | |
6163 | ||
6164 | #: transport-helper.c:132 | |
6165 | #, c-format | |
6166 | msgid "unable to find remote helper for '%s'" | |
6167 | msgstr "无法为 '%s' 找到远程助手" | |
6168 | ||
6169 | #: transport-helper.c:148 transport-helper.c:557 | |
6170 | msgid "can't dup helper output fd" | |
6171 | msgstr "无法复制助手输出文件句柄" | |
6172 | ||
6173 | #: transport-helper.c:199 | |
6174 | #, c-format | |
6175 | msgid "" | |
6176 | "unknown mandatory capability %s; this remote helper probably needs newer " | |
6177 | "version of Git" | |
6178 | msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" | |
6179 | ||
6180 | #: transport-helper.c:205 | |
6181 | msgid "this remote helper should implement refspec capability" | |
6182 | msgstr "远程助手需要实现 refspec 能力" | |
6183 | ||
6184 | #: transport-helper.c:272 transport-helper.c:412 | |
6185 | #, c-format | |
6186 | msgid "%s unexpectedly said: '%s'" | |
6187 | msgstr "%s 意外地说:'%s'" | |
6188 | ||
6189 | #: transport-helper.c:401 | |
6190 | #, c-format | |
6191 | msgid "%s also locked %s" | |
6192 | msgstr "%s 也锁定了 %s" | |
6193 | ||
6194 | #: transport-helper.c:479 | |
6195 | msgid "couldn't run fast-import" | |
6196 | msgstr "不能执行 fast-import" | |
6197 | ||
6198 | #: transport-helper.c:502 | |
6199 | msgid "error while running fast-import" | |
6200 | msgstr "执行 fast-import 出错" | |
6201 | ||
6202 | #: transport-helper.c:531 transport-helper.c:1091 | |
6203 | #, c-format | |
6204 | msgid "could not read ref %s" | |
6205 | msgstr "无法读取引用 %s" | |
6206 | ||
6207 | #: transport-helper.c:576 | |
6208 | #, c-format | |
6209 | msgid "unknown response to connect: %s" | |
6210 | msgstr "连接时未知的响应:%s" | |
6211 | ||
6212 | #: transport-helper.c:598 | |
6213 | msgid "setting remote service path not supported by protocol" | |
6214 | msgstr "协议不支持设置远程服务路径" | |
6215 | ||
6216 | #: transport-helper.c:600 | |
6217 | msgid "invalid remote service path" | |
6218 | msgstr "无效的远程服务路径" | |
6219 | ||
6220 | #: transport-helper.c:646 | |
6221 | #, c-format | |
6222 | msgid "can't connect to subservice %s" | |
6223 | msgstr "不能连接到子服务 %s" | |
6224 | ||
6225 | #: transport-helper.c:713 | |
6226 | #, c-format | |
6227 | msgid "expected ok/error, helper said '%s'" | |
6228 | msgstr "预期 ok/error,助手说 '%s'" | |
6229 | ||
6230 | #: transport-helper.c:766 | |
6231 | #, c-format | |
6232 | msgid "helper reported unexpected status of %s" | |
6233 | msgstr "助手报告 %s 的意外状态" | |
6234 | ||
6235 | #: transport-helper.c:827 | |
a0b6b246 | 6236 | #, c-format |
c1ac5258 JX |
6237 | msgid "helper %s does not support dry-run" |
6238 | msgstr "助手 %s 不支持 dry-run" | |
a0b6b246 | 6239 | |
c1ac5258 JX |
6240 | #: transport-helper.c:830 |
6241 | #, c-format | |
6242 | msgid "helper %s does not support --signed" | |
6243 | msgstr "助手 %s 不支持 --signed" | |
6244 | ||
6245 | #: transport-helper.c:833 | |
6246 | #, c-format | |
6247 | msgid "helper %s does not support --signed=if-asked" | |
6248 | msgstr "助手 %s 不支持 --signed=if-asked" | |
6249 | ||
6250 | #: transport-helper.c:840 | |
6251 | #, c-format | |
6252 | msgid "helper %s does not support 'push-option'" | |
6253 | msgstr "助手 %s 不支持 'push-option'" | |
6254 | ||
6255 | #: transport-helper.c:932 | |
6256 | msgid "remote-helper doesn't support push; refspec needed" | |
6257 | msgstr "remote-heper 不支持 push,需要引用表达式" | |
6258 | ||
6259 | #: transport-helper.c:937 | |
6260 | #, c-format | |
6261 | msgid "helper %s does not support 'force'" | |
6262 | msgstr "助手 %s 不支持 'force'" | |
6263 | ||
6264 | #: transport-helper.c:984 | |
6265 | msgid "couldn't run fast-export" | |
6266 | msgstr "无法执行 fast-export" | |
6267 | ||
6268 | #: transport-helper.c:989 | |
6269 | msgid "error while running fast-export" | |
6270 | msgstr "执行 fast-export 时出错" | |
6271 | ||
6272 | #: transport-helper.c:1014 | |
6273 | #, c-format | |
6274 | msgid "" | |
6275 | "No refs in common and none specified; doing nothing.\n" | |
6276 | "Perhaps you should specify a branch such as 'master'.\n" | |
6277 | msgstr "" | |
6278 | "没有共同的引用并且也没有指定,什么也不会做。\n" | |
6279 | "可能您应该指定一个分支如 'master'。\n" | |
6280 | ||
6281 | #: transport-helper.c:1077 | |
6282 | #, c-format | |
6283 | msgid "malformed response in ref list: %s" | |
6284 | msgstr "引用列表中格式错误的响应:%s" | |
6285 | ||
4c27fcb5 | 6286 | #: transport-helper.c:1231 |
c1ac5258 JX |
6287 | #, c-format |
6288 | msgid "read(%s) failed" | |
6289 | msgstr "读取(%s)失败" | |
6290 | ||
4c27fcb5 | 6291 | #: transport-helper.c:1258 |
c1ac5258 JX |
6292 | #, c-format |
6293 | msgid "write(%s) failed" | |
6294 | msgstr "写(%s)失败" | |
6295 | ||
4c27fcb5 | 6296 | #: transport-helper.c:1307 |
c1ac5258 JX |
6297 | #, c-format |
6298 | msgid "%s thread failed" | |
6299 | msgstr "%s 线程失败" | |
6300 | ||
4c27fcb5 | 6301 | #: transport-helper.c:1311 |
c1ac5258 JX |
6302 | #, c-format |
6303 | msgid "%s thread failed to join: %s" | |
e640d114 | 6304 | msgstr "%s 线程等待失败:%s" |
c1ac5258 | 6305 | |
4c27fcb5 | 6306 | #: transport-helper.c:1330 transport-helper.c:1334 |
c1ac5258 JX |
6307 | #, c-format |
6308 | msgid "can't start thread for copying data: %s" | |
6309 | msgstr "不能启动线程来拷贝数据:%s" | |
6310 | ||
4c27fcb5 | 6311 | #: transport-helper.c:1371 |
c1ac5258 JX |
6312 | #, c-format |
6313 | msgid "%s process failed to wait" | |
6314 | msgstr "%s 进程等待失败" | |
6315 | ||
4c27fcb5 | 6316 | #: transport-helper.c:1375 |
c1ac5258 JX |
6317 | #, c-format |
6318 | msgid "%s process failed" | |
6319 | msgstr "%s 进程失败" | |
6320 | ||
4c27fcb5 | 6321 | #: transport-helper.c:1393 transport-helper.c:1402 |
c1ac5258 JX |
6322 | msgid "can't start thread for copying data" |
6323 | msgstr "不能启动线程来拷贝数据" | |
6324 | ||
6325 | #: tree-walk.c:33 | |
a0b6b246 JX |
6326 | msgid "too-short tree object" |
6327 | msgstr "太短的树对象" | |
6328 | ||
c1ac5258 | 6329 | #: tree-walk.c:39 |
a0b6b246 | 6330 | msgid "malformed mode in tree entry" |
29004bbb | 6331 | msgstr "树对象中的条目模式错误" |
a0b6b246 | 6332 | |
c1ac5258 | 6333 | #: tree-walk.c:43 |
a0b6b246 JX |
6334 | msgid "empty filename in tree entry" |
6335 | msgstr "树对象条目中空的文件名" | |
6336 | ||
c1ac5258 | 6337 | #: tree-walk.c:115 |
a0b6b246 JX |
6338 | msgid "too-short tree file" |
6339 | msgstr "太短的树文件" | |
6340 | ||
c1ac5258 | 6341 | #: unpack-trees.c:112 |
a0b6b246 JX |
6342 | #, c-format |
6343 | msgid "" | |
6344 | "Your local changes to the following files would be overwritten by checkout:\n" | |
6345 | "%%sPlease commit your changes or stash them before you switch branches." | |
6346 | msgstr "" | |
6347 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 6348 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 6349 | |
c1ac5258 | 6350 | #: unpack-trees.c:114 |
a0b6b246 JX |
6351 | #, c-format |
6352 | msgid "" | |
6353 | "Your local changes to the following files would be overwritten by checkout:\n" | |
6354 | "%%s" | |
6355 | msgstr "" | |
6356 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
6357 | "%%s" | |
6358 | ||
c1ac5258 | 6359 | #: unpack-trees.c:117 |
a0b6b246 JX |
6360 | #, c-format |
6361 | msgid "" | |
6362 | "Your local changes to the following files would be overwritten by merge:\n" | |
6363 | "%%sPlease commit your changes or stash them before you merge." | |
6364 | msgstr "" | |
6365 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 6366 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 6367 | |
c1ac5258 | 6368 | #: unpack-trees.c:119 |
a0b6b246 JX |
6369 | #, c-format |
6370 | msgid "" | |
6371 | "Your local changes to the following files would be overwritten by merge:\n" | |
6372 | "%%s" | |
6373 | msgstr "" | |
6374 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
6375 | "%%s" | |
6376 | ||
c1ac5258 | 6377 | #: unpack-trees.c:122 |
a0b6b246 JX |
6378 | #, c-format |
6379 | msgid "" | |
6380 | "Your local changes to the following files would be overwritten by %s:\n" | |
6381 | "%%sPlease commit your changes or stash them before you %s." | |
6382 | msgstr "" | |
6383 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 6384 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 6385 | |
c1ac5258 | 6386 | #: unpack-trees.c:124 |
a0b6b246 JX |
6387 | #, c-format |
6388 | msgid "" | |
6389 | "Your local changes to the following files would be overwritten by %s:\n" | |
6390 | "%%s" | |
6391 | msgstr "" | |
6392 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
6393 | "%%s" | |
c04f5ac3 | 6394 | |
c1ac5258 | 6395 | #: unpack-trees.c:129 |
a0b6b246 JX |
6396 | #, c-format |
6397 | msgid "" | |
1a79b2f1 | 6398 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
6399 | "%s" |
6400 | msgstr "" | |
6401 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
6402 | "%s" | |
1b7f4a34 | 6403 | |
c1ac5258 | 6404 | #: unpack-trees.c:133 |
a0b6b246 JX |
6405 | #, c-format |
6406 | msgid "" | |
6407 | "The following untracked working tree files would be removed by checkout:\n" | |
6408 | "%%sPlease move or remove them before you switch branches." | |
6409 | msgstr "" | |
6410 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
6411 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 6412 | |
c1ac5258 | 6413 | #: unpack-trees.c:135 |
a0b6b246 JX |
6414 | #, c-format |
6415 | msgid "" | |
6416 | "The following untracked working tree files would be removed by checkout:\n" | |
6417 | "%%s" | |
6418 | msgstr "" | |
6419 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
6420 | "%%s" | |
1003b3a5 | 6421 | |
c1ac5258 | 6422 | #: unpack-trees.c:138 |
a0b6b246 JX |
6423 | #, c-format |
6424 | msgid "" | |
6425 | "The following untracked working tree files would be removed by merge:\n" | |
6426 | "%%sPlease move or remove them before you merge." | |
6427 | msgstr "" | |
6428 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
6429 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 6430 | |
c1ac5258 | 6431 | #: unpack-trees.c:140 |
a0b6b246 JX |
6432 | #, c-format |
6433 | msgid "" | |
6434 | "The following untracked working tree files would be removed by merge:\n" | |
6435 | "%%s" | |
6436 | msgstr "" | |
6437 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
6438 | "%%s" | |
c04f5ac3 | 6439 | |
c1ac5258 | 6440 | #: unpack-trees.c:143 |
a0b6b246 JX |
6441 | #, c-format |
6442 | msgid "" | |
6443 | "The following untracked working tree files would be removed by %s:\n" | |
6444 | "%%sPlease move or remove them before you %s." | |
6445 | msgstr "" | |
6446 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
6447 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 6448 | |
c1ac5258 | 6449 | #: unpack-trees.c:145 |
a0b6b246 JX |
6450 | #, c-format |
6451 | msgid "" | |
6452 | "The following untracked working tree files would be removed by %s:\n" | |
6453 | "%%s" | |
6454 | msgstr "" | |
6455 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
6456 | "%%s" | |
c04f5ac3 | 6457 | |
c1ac5258 | 6458 | #: unpack-trees.c:151 |
a0b6b246 JX |
6459 | #, c-format |
6460 | msgid "" | |
6461 | "The following untracked working tree files would be overwritten by " | |
6462 | "checkout:\n" | |
6463 | "%%sPlease move or remove them before you switch branches." | |
6464 | msgstr "" | |
6465 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
6466 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 6467 | |
c1ac5258 | 6468 | #: unpack-trees.c:153 |
1003b3a5 | 6469 | #, c-format |
4dcdc3d8 | 6470 | msgid "" |
a0b6b246 JX |
6471 | "The following untracked working tree files would be overwritten by " |
6472 | "checkout:\n" | |
6473 | "%%s" | |
4dcdc3d8 | 6474 | msgstr "" |
a0b6b246 JX |
6475 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
6476 | "%%s" | |
1003b3a5 | 6477 | |
c1ac5258 | 6478 | #: unpack-trees.c:156 |
c04f5ac3 | 6479 | #, c-format |
a0b6b246 JX |
6480 | msgid "" |
6481 | "The following untracked working tree files would be overwritten by merge:\n" | |
6482 | "%%sPlease move or remove them before you merge." | |
6483 | msgstr "" | |
6484 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
6485 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 6486 | |
c1ac5258 | 6487 | #: unpack-trees.c:158 |
a0b6b246 JX |
6488 | #, c-format |
6489 | msgid "" | |
6490 | "The following untracked working tree files would be overwritten by merge:\n" | |
6491 | "%%s" | |
6492 | msgstr "" | |
6493 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
6494 | "%%s" | |
c04f5ac3 | 6495 | |
c1ac5258 | 6496 | #: unpack-trees.c:161 |
a0b6b246 JX |
6497 | #, c-format |
6498 | msgid "" | |
6499 | "The following untracked working tree files would be overwritten by %s:\n" | |
6500 | "%%sPlease move or remove them before you %s." | |
6501 | msgstr "" | |
6502 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
6503 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 6504 | |
c1ac5258 | 6505 | #: unpack-trees.c:163 |
07432cef | 6506 | #, c-format |
a0b6b246 JX |
6507 | msgid "" |
6508 | "The following untracked working tree files would be overwritten by %s:\n" | |
6509 | "%%s" | |
6510 | msgstr "" | |
6511 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
6512 | "%%s" | |
c04f5ac3 | 6513 | |
c1ac5258 | 6514 | #: unpack-trees.c:171 |
07432cef | 6515 | #, c-format |
a0b6b246 JX |
6516 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
6517 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 6518 | |
c1ac5258 | 6519 | #: unpack-trees.c:174 |
07432cef | 6520 | #, c-format |
ef317cd5 | 6521 | msgid "" |
6937cb4e | 6522 | "Cannot update sparse checkout: the following entries are not up to date:\n" |
a0b6b246 JX |
6523 | "%s" |
6524 | msgstr "" | |
6525 | "无法更新稀疏检出:如下条目不是最新:\n" | |
6526 | "%s" | |
c04f5ac3 | 6527 | |
c1ac5258 | 6528 | #: unpack-trees.c:176 |
07432cef | 6529 | #, c-format |
a0b6b246 JX |
6530 | msgid "" |
6531 | "The following working tree files would be overwritten by sparse checkout " | |
6532 | "update:\n" | |
6533 | "%s" | |
6534 | msgstr "" | |
6535 | "工作区中下列文件将被稀疏检出更新所覆盖:\n" | |
6536 | "%s" | |
c04f5ac3 | 6537 | |
c1ac5258 | 6538 | #: unpack-trees.c:178 |
07432cef | 6539 | #, c-format |
a0b6b246 JX |
6540 | msgid "" |
6541 | "The following working tree files would be removed by sparse checkout " | |
6542 | "update:\n" | |
6543 | "%s" | |
6544 | msgstr "" | |
6545 | "工作区中下列文件将被稀疏检出更新所删除:\n" | |
6546 | "%s" | |
c04f5ac3 | 6547 | |
c1ac5258 | 6548 | #: unpack-trees.c:180 |
87cb7997 JX |
6549 | #, c-format |
6550 | msgid "" | |
6551 | "Cannot update submodule:\n" | |
6552 | "%s" | |
6553 | msgstr "" | |
6554 | "无法更新子模组:\n" | |
6555 | "%s" | |
6556 | ||
c1ac5258 | 6557 | #: unpack-trees.c:254 |
07432cef | 6558 | #, c-format |
a0b6b246 JX |
6559 | msgid "Aborting\n" |
6560 | msgstr "终止中\n" | |
ef317cd5 | 6561 | |
c1ac5258 | 6562 | #: unpack-trees.c:336 |
a0b6b246 JX |
6563 | msgid "Checking out files" |
6564 | msgstr "正在检出文件" | |
c04f5ac3 | 6565 | |
4c27fcb5 JX |
6566 | #: unpack-trees.c:368 |
6567 | msgid "" | |
6568 | "the following paths have collided (e.g. case-sensitive paths\n" | |
6569 | "on a case-insensitive filesystem) and only one from the same\n" | |
6570 | "colliding group is in the working tree:\n" | |
6571 | msgstr "" | |
6572 | "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n" | |
6573 | "并且碰撞组中只有一个文件存在工作区中:\n" | |
6574 | ||
87cb7997 | 6575 | #: urlmatch.c:163 |
a0b6b246 JX |
6576 | msgid "invalid URL scheme name or missing '://' suffix" |
6577 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
6578 | ||
87cb7997 | 6579 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 6580 | #, c-format |
a0b6b246 JX |
6581 | msgid "invalid %XX escape sequence" |
6582 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 6583 | |
87cb7997 | 6584 | #: urlmatch.c:215 |
a0b6b246 JX |
6585 | msgid "missing host and scheme is not 'file:'" |
6586 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 6587 | |
87cb7997 | 6588 | #: urlmatch.c:232 |
a0b6b246 JX |
6589 | msgid "a 'file:' URL may not have a port number" |
6590 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 6591 | |
87cb7997 | 6592 | #: urlmatch.c:247 |
a0b6b246 JX |
6593 | msgid "invalid characters in host name" |
6594 | msgstr "主机名中包含无效的字符" | |
90314792 | 6595 | |
87cb7997 | 6596 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
6597 | msgid "invalid port number" |
6598 | msgstr "无效的端口号" | |
c04f5ac3 | 6599 | |
87cb7997 | 6600 | #: urlmatch.c:371 |
a0b6b246 JX |
6601 | msgid "invalid '..' path segment" |
6602 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 6603 | |
4c27fcb5 | 6604 | #: worktree.c:249 builtin/am.c:2100 |
a77c07d9 | 6605 | #, c-format |
a0b6b246 | 6606 | msgid "failed to read '%s'" |
c1ac5258 | 6607 | msgstr "读取 '%s' 失败" |
ef317cd5 | 6608 | |
4c27fcb5 | 6609 | #: worktree.c:295 |
31e5e17b JX |
6610 | #, c-format |
6611 | msgid "'%s' at main working tree is not the repository directory" | |
6612 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
6613 | ||
4c27fcb5 | 6614 | #: worktree.c:306 |
31e5e17b JX |
6615 | #, c-format |
6616 | msgid "'%s' file does not contain absolute path to the working tree location" | |
6617 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
6618 | ||
4c27fcb5 | 6619 | #: worktree.c:318 |
31e5e17b JX |
6620 | #, c-format |
6621 | msgid "'%s' does not exist" | |
6622 | msgstr "'%s' 不存在" | |
6623 | ||
4c27fcb5 | 6624 | #: worktree.c:324 |
31e5e17b JX |
6625 | #, c-format |
6626 | msgid "'%s' is not a .git file, error code %d" | |
6627 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
6628 | ||
4c27fcb5 | 6629 | #: worktree.c:332 |
31e5e17b JX |
6630 | #, c-format |
6631 | msgid "'%s' does not point back to '%s'" | |
6632 | msgstr "'%s' 没有指回到 '%s'" | |
6633 | ||
a4f16749 | 6634 | #: wrapper.c:223 wrapper.c:393 |
c04f5ac3 | 6635 | #, c-format |
a0b6b246 JX |
6636 | msgid "could not open '%s' for reading and writing" |
6637 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 6638 | |
a4f16749 | 6639 | #: wrapper.c:424 wrapper.c:624 |
a0b6b246 JX |
6640 | #, c-format |
6641 | msgid "unable to access '%s'" | |
6642 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 6643 | |
a4f16749 | 6644 | #: wrapper.c:632 |
a0b6b246 JX |
6645 | msgid "unable to get current working directory" |
6646 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 6647 | |
fd8cb379 | 6648 | #: wt-status.c:154 |
a0b6b246 JX |
6649 | msgid "Unmerged paths:" |
6650 | msgstr "未合并的路径:" | |
7aea43ff | 6651 | |
a0b6b246 | 6652 | # 译者:注意保持前导空格 |
fd8cb379 | 6653 | #: wt-status.c:181 wt-status.c:208 |
c04f5ac3 | 6654 | #, c-format |
a0b6b246 JX |
6655 | msgid " (use \"git reset %s <file>...\" to unstage)" |
6656 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" | |
c04f5ac3 | 6657 | |
a0b6b246 | 6658 | # 译者:注意保持前导空格 |
fd8cb379 | 6659 | #: wt-status.c:183 wt-status.c:210 |
a0b6b246 JX |
6660 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
6661 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 6662 | |
a0b6b246 | 6663 | # 译者:注意保持前导空格 |
fd8cb379 | 6664 | #: wt-status.c:187 |
a0b6b246 JX |
6665 | msgid " (use \"git add <file>...\" to mark resolution)" |
6666 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 6667 | |
a0b6b246 | 6668 | # 译者:注意保持前导空格 |
fd8cb379 | 6669 | #: wt-status.c:189 wt-status.c:193 |
a0b6b246 JX |
6670 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
6671 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 6672 | |
a0b6b246 | 6673 | # 译者:注意保持前导空格 |
fd8cb379 | 6674 | #: wt-status.c:191 |
a0b6b246 JX |
6675 | msgid " (use \"git rm <file>...\" to mark resolution)" |
6676 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 6677 | |
4c27fcb5 | 6678 | #: wt-status.c:202 wt-status.c:1042 |
a0b6b246 JX |
6679 | msgid "Changes to be committed:" |
6680 | msgstr "要提交的变更:" | |
ef317cd5 | 6681 | |
4c27fcb5 | 6682 | #: wt-status.c:220 wt-status.c:1051 |
a0b6b246 JX |
6683 | msgid "Changes not staged for commit:" |
6684 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 6685 | |
a0b6b246 | 6686 | # 译者:注意保持前导空格 |
fd8cb379 | 6687 | #: wt-status.c:224 |
a0b6b246 JX |
6688 | msgid " (use \"git add <file>...\" to update what will be committed)" |
6689 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 6690 | |
a0b6b246 | 6691 | # 译者:注意保持前导空格 |
fd8cb379 | 6692 | #: wt-status.c:226 |
a0b6b246 JX |
6693 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
6694 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 6695 | |
a0b6b246 | 6696 | # 译者:注意保持前导空格 |
fd8cb379 | 6697 | #: wt-status.c:227 |
a0b6b246 JX |
6698 | msgid "" |
6699 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
6700 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 6701 | |
a0b6b246 | 6702 | # 译者:注意保持前导空格 |
fd8cb379 | 6703 | #: wt-status.c:229 |
a0b6b246 JX |
6704 | msgid " (commit or discard the untracked or modified content in submodules)" |
6705 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 6706 | |
a0b6b246 | 6707 | # 译者:注意保持前导空格 |
fd8cb379 | 6708 | #: wt-status.c:241 |
a0b6b246 JX |
6709 | #, c-format |
6710 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
6711 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 6712 | |
fd8cb379 | 6713 | #: wt-status.c:256 |
a0b6b246 JX |
6714 | msgid "both deleted:" |
6715 | msgstr "双方删除:" | |
ef317cd5 | 6716 | |
fd8cb379 | 6717 | #: wt-status.c:258 |
a0b6b246 JX |
6718 | msgid "added by us:" |
6719 | msgstr "由我们添加:" | |
4dcdc3d8 | 6720 | |
fd8cb379 | 6721 | #: wt-status.c:260 |
a0b6b246 JX |
6722 | msgid "deleted by them:" |
6723 | msgstr "由他们删除:" | |
ef317cd5 | 6724 | |
fd8cb379 | 6725 | #: wt-status.c:262 |
a0b6b246 JX |
6726 | msgid "added by them:" |
6727 | msgstr "由他们添加:" | |
ef317cd5 | 6728 | |
fd8cb379 | 6729 | #: wt-status.c:264 |
a0b6b246 JX |
6730 | msgid "deleted by us:" |
6731 | msgstr "由我们删除:" | |
ef317cd5 | 6732 | |
fd8cb379 | 6733 | #: wt-status.c:266 |
a0b6b246 JX |
6734 | msgid "both added:" |
6735 | msgstr "双方添加:" | |
5c57d762 | 6736 | |
fd8cb379 | 6737 | #: wt-status.c:268 |
a0b6b246 JX |
6738 | msgid "both modified:" |
6739 | msgstr "双方修改:" | |
5c57d762 | 6740 | |
fd8cb379 | 6741 | #: wt-status.c:278 |
a0b6b246 JX |
6742 | msgid "new file:" |
6743 | msgstr "新文件:" | |
8ada9598 | 6744 | |
fd8cb379 | 6745 | #: wt-status.c:280 |
a0b6b246 JX |
6746 | msgid "copied:" |
6747 | msgstr "拷贝:" | |
8ada9598 | 6748 | |
fd8cb379 | 6749 | #: wt-status.c:282 |
a0b6b246 JX |
6750 | msgid "deleted:" |
6751 | msgstr "删除:" | |
8ada9598 | 6752 | |
fd8cb379 | 6753 | #: wt-status.c:284 |
a0b6b246 JX |
6754 | msgid "modified:" |
6755 | msgstr "修改:" | |
8ada9598 | 6756 | |
fd8cb379 | 6757 | #: wt-status.c:286 |
a0b6b246 JX |
6758 | msgid "renamed:" |
6759 | msgstr "重命名:" | |
5c57d762 | 6760 | |
fd8cb379 | 6761 | #: wt-status.c:288 |
a0b6b246 JX |
6762 | msgid "typechange:" |
6763 | msgstr "类型变更:" | |
8ada9598 | 6764 | |
fd8cb379 | 6765 | #: wt-status.c:290 |
a0b6b246 JX |
6766 | msgid "unknown:" |
6767 | msgstr "未知:" | |
8ada9598 | 6768 | |
fd8cb379 | 6769 | #: wt-status.c:292 |
a0b6b246 JX |
6770 | msgid "unmerged:" |
6771 | msgstr "未合并:" | |
8ada9598 | 6772 | |
a0b6b246 | 6773 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 6774 | #: wt-status.c:372 |
a0b6b246 JX |
6775 | msgid "new commits, " |
6776 | msgstr "新提交, " | |
8ada9598 | 6777 | |
a0b6b246 | 6778 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 6779 | #: wt-status.c:374 |
a0b6b246 JX |
6780 | msgid "modified content, " |
6781 | msgstr "修改的内容, " | |
1b7f4a34 | 6782 | |
a0b6b246 | 6783 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
fd8cb379 | 6784 | #: wt-status.c:376 |
a0b6b246 JX |
6785 | msgid "untracked content, " |
6786 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 6787 | |
4c27fcb5 | 6788 | #: wt-status.c:880 |
a4f16749 JX |
6789 | #, c-format |
6790 | msgid "Your stash currently has %d entry" | |
6791 | msgid_plural "Your stash currently has %d entries" | |
6792 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
6793 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
6794 | ||
4c27fcb5 | 6795 | #: wt-status.c:912 |
a0b6b246 JX |
6796 | msgid "Submodules changed but not updated:" |
6797 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 6798 | |
4c27fcb5 | 6799 | #: wt-status.c:914 |
a0b6b246 JX |
6800 | msgid "Submodule changes to be committed:" |
6801 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 6802 | |
4c27fcb5 | 6803 | #: wt-status.c:996 |
a0b6b246 | 6804 | msgid "" |
6937cb4e JX |
6805 | "Do not modify or remove the line above.\n" |
6806 | "Everything below it will be ignored." | |
a0b6b246 | 6807 | msgstr "" |
6937cb4e JX |
6808 | "不要改动或删除上面的一行。\n" |
6809 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 6810 | |
4c27fcb5 | 6811 | #: wt-status.c:1097 |
a0b6b246 JX |
6812 | msgid "You have unmerged paths." |
6813 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 6814 | |
a0b6b246 | 6815 | # 译者:注意保持前导空格 |
4c27fcb5 | 6816 | #: wt-status.c:1100 |
a0b6b246 JX |
6817 | msgid " (fix conflicts and run \"git commit\")" |
6818 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 6819 | |
a0b6b246 | 6820 | # 译者:注意保持前导空格 |
4c27fcb5 | 6821 | #: wt-status.c:1102 |
a0b6b246 JX |
6822 | msgid " (use \"git merge --abort\" to abort the merge)" |
6823 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 6824 | |
4c27fcb5 | 6825 | #: wt-status.c:1106 |
a0b6b246 JX |
6826 | msgid "All conflicts fixed but you are still merging." |
6827 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 6828 | |
a0b6b246 | 6829 | # 译者:注意保持前导空格 |
4c27fcb5 | 6830 | #: wt-status.c:1109 |
a0b6b246 JX |
6831 | msgid " (use \"git commit\" to conclude merge)" |
6832 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 6833 | |
4c27fcb5 | 6834 | #: wt-status.c:1118 |
a0b6b246 JX |
6835 | msgid "You are in the middle of an am session." |
6836 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 6837 | |
4c27fcb5 | 6838 | #: wt-status.c:1121 |
a0b6b246 JX |
6839 | msgid "The current patch is empty." |
6840 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 6841 | |
a0b6b246 | 6842 | # 译者:注意保持前导空格 |
4c27fcb5 | 6843 | #: wt-status.c:1125 |
a0b6b246 JX |
6844 | msgid " (fix conflicts and then run \"git am --continue\")" |
6845 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 6846 | |
a0b6b246 | 6847 | # 译者:注意保持前导空格 |
4c27fcb5 | 6848 | #: wt-status.c:1127 |
a0b6b246 JX |
6849 | msgid " (use \"git am --skip\" to skip this patch)" |
6850 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 6851 | |
a0b6b246 | 6852 | # 译者:注意保持前导空格 |
4c27fcb5 | 6853 | #: wt-status.c:1129 |
a0b6b246 JX |
6854 | msgid " (use \"git am --abort\" to restore the original branch)" |
6855 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 6856 | |
4c27fcb5 | 6857 | #: wt-status.c:1260 |
1a79b2f1 JX |
6858 | msgid "git-rebase-todo is missing." |
6859 | msgstr "git-rebase-todo 丢失。" | |
6860 | ||
4c27fcb5 | 6861 | #: wt-status.c:1262 |
a0b6b246 JX |
6862 | msgid "No commands done." |
6863 | msgstr "没有命令被执行。" | |
6864 | ||
4c27fcb5 | 6865 | #: wt-status.c:1265 |
1b7f4a34 | 6866 | #, c-format |
a0b6b246 JX |
6867 | msgid "Last command done (%d command done):" |
6868 | msgid_plural "Last commands done (%d commands done):" | |
6869 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
6870 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 6871 | |
4c27fcb5 | 6872 | #: wt-status.c:1276 |
1b7f4a34 | 6873 | #, c-format |
a0b6b246 JX |
6874 | msgid " (see more in file %s)" |
6875 | msgstr " (更多参见文件 %s)" | |
6876 | ||
4c27fcb5 | 6877 | #: wt-status.c:1281 |
a0b6b246 JX |
6878 | msgid "No commands remaining." |
6879 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 6880 | |
4c27fcb5 | 6881 | #: wt-status.c:1284 |
1b7f4a34 | 6882 | #, c-format |
a0b6b246 JX |
6883 | msgid "Next command to do (%d remaining command):" |
6884 | msgid_plural "Next commands to do (%d remaining commands):" | |
6885 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
6886 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 6887 | |
a0b6b246 | 6888 | # 译者:注意保持前导空格 |
4c27fcb5 | 6889 | #: wt-status.c:1292 |
a0b6b246 JX |
6890 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
6891 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 6892 | |
4c27fcb5 | 6893 | #: wt-status.c:1304 |
1b7f4a34 | 6894 | #, c-format |
a0b6b246 JX |
6895 | msgid "You are currently rebasing branch '%s' on '%s'." |
6896 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 6897 | |
4c27fcb5 | 6898 | #: wt-status.c:1309 |
a0b6b246 JX |
6899 | msgid "You are currently rebasing." |
6900 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 6901 | |
a0b6b246 | 6902 | # 译者:注意保持前导空格 |
4c27fcb5 | 6903 | #: wt-status.c:1322 |
a0b6b246 JX |
6904 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
6905 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 6906 | |
a0b6b246 | 6907 | # 译者:注意保持前导空格 |
4c27fcb5 | 6908 | #: wt-status.c:1324 |
a0b6b246 JX |
6909 | msgid " (use \"git rebase --skip\" to skip this patch)" |
6910 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
6911 | ||
6912 | # 译者:注意保持前导空格 | |
4c27fcb5 | 6913 | #: wt-status.c:1326 |
a0b6b246 JX |
6914 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
6915 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
6916 | ||
6917 | # 译者:注意保持前导空格 | |
4c27fcb5 | 6918 | #: wt-status.c:1333 |
a0b6b246 JX |
6919 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
6920 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 6921 | |
4c27fcb5 | 6922 | #: wt-status.c:1337 |
a0b6b246 | 6923 | #, c-format |
1b7f4a34 | 6924 | msgid "" |
a0b6b246 JX |
6925 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
6926 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 6927 | |
4c27fcb5 | 6928 | #: wt-status.c:1342 |
a0b6b246 JX |
6929 | msgid "You are currently splitting a commit during a rebase." |
6930 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 6931 | |
a0b6b246 | 6932 | # 译者:注意保持前导空格 |
4c27fcb5 | 6933 | #: wt-status.c:1345 |
a0b6b246 JX |
6934 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
6935 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 6936 | |
4c27fcb5 | 6937 | #: wt-status.c:1349 |
a0b6b246 JX |
6938 | #, c-format |
6939 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
6940 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 6941 | |
4c27fcb5 | 6942 | #: wt-status.c:1354 |
a0b6b246 JX |
6943 | msgid "You are currently editing a commit during a rebase." |
6944 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 6945 | |
a0b6b246 | 6946 | # 译者:注意保持前导空格 |
4c27fcb5 | 6947 | #: wt-status.c:1357 |
a0b6b246 JX |
6948 | msgid " (use \"git commit --amend\" to amend the current commit)" |
6949 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
6950 | ||
6951 | # 译者:注意保持前导空格 | |
4c27fcb5 | 6952 | #: wt-status.c:1359 |
a0b6b246 JX |
6953 | msgid "" |
6954 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
6955 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 6956 | |
4c27fcb5 | 6957 | #: wt-status.c:1368 |
1b7f4a34 | 6958 | #, c-format |
a0b6b246 JX |
6959 | msgid "You are currently cherry-picking commit %s." |
6960 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 6961 | |
a0b6b246 | 6962 | # 译者:注意保持前导空格 |
4c27fcb5 | 6963 | #: wt-status.c:1373 |
a0b6b246 JX |
6964 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
6965 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 6966 | |
a0b6b246 | 6967 | # 译者:注意保持前导空格 |
4c27fcb5 | 6968 | #: wt-status.c:1376 |
a0b6b246 JX |
6969 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
6970 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 6971 | |
a0b6b246 | 6972 | # 译者:注意保持前导空格 |
4c27fcb5 | 6973 | #: wt-status.c:1378 |
a0b6b246 JX |
6974 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
6975 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 6976 | |
4c27fcb5 | 6977 | #: wt-status.c:1386 |
1b7f4a34 | 6978 | #, c-format |
a0b6b246 JX |
6979 | msgid "You are currently reverting commit %s." |
6980 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 6981 | |
a0b6b246 | 6982 | # 译者:注意保持前导空格 |
4c27fcb5 | 6983 | #: wt-status.c:1391 |
a0b6b246 JX |
6984 | msgid " (fix conflicts and run \"git revert --continue\")" |
6985 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1b7f4a34 | 6986 | |
a0b6b246 | 6987 | # 译者:注意保持前导空格 |
4c27fcb5 | 6988 | #: wt-status.c:1394 |
a0b6b246 JX |
6989 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
6990 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1b7f4a34 | 6991 | |
a0b6b246 | 6992 | # 译者:注意保持前导空格 |
4c27fcb5 | 6993 | #: wt-status.c:1396 |
a0b6b246 JX |
6994 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
6995 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 6996 | |
4c27fcb5 | 6997 | #: wt-status.c:1406 |
1b7f4a34 | 6998 | #, c-format |
a0b6b246 JX |
6999 | msgid "You are currently bisecting, started from branch '%s'." |
7000 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 7001 | |
4c27fcb5 | 7002 | #: wt-status.c:1410 |
a0b6b246 JX |
7003 | msgid "You are currently bisecting." |
7004 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 7005 | |
a0b6b246 | 7006 | # 译者:注意保持前导空格 |
4c27fcb5 | 7007 | #: wt-status.c:1413 |
a0b6b246 JX |
7008 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
7009 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 7010 | |
4c27fcb5 | 7011 | #: wt-status.c:1611 |
a0b6b246 JX |
7012 | msgid "On branch " |
7013 | msgstr "位于分支 " | |
1b7f4a34 | 7014 | |
4c27fcb5 | 7015 | #: wt-status.c:1618 |
a0b6b246 JX |
7016 | msgid "interactive rebase in progress; onto " |
7017 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 7018 | |
4c27fcb5 | 7019 | #: wt-status.c:1620 |
a0b6b246 JX |
7020 | msgid "rebase in progress; onto " |
7021 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 7022 | |
4c27fcb5 | 7023 | #: wt-status.c:1625 |
a0b6b246 JX |
7024 | msgid "HEAD detached at " |
7025 | msgstr "头指针分离于 " | |
1b7f4a34 | 7026 | |
4c27fcb5 | 7027 | #: wt-status.c:1627 |
a0b6b246 JX |
7028 | msgid "HEAD detached from " |
7029 | msgstr "头指针分离自 " | |
1b7f4a34 | 7030 | |
4c27fcb5 | 7031 | #: wt-status.c:1630 |
a0b6b246 JX |
7032 | msgid "Not currently on any branch." |
7033 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 7034 | |
4c27fcb5 | 7035 | #: wt-status.c:1647 |
a0b6b246 JX |
7036 | msgid "Initial commit" |
7037 | msgstr "初始提交" | |
1b7f4a34 | 7038 | |
4c27fcb5 | 7039 | #: wt-status.c:1648 |
a4f16749 JX |
7040 | msgid "No commits yet" |
7041 | msgstr "尚无提交" | |
7042 | ||
4c27fcb5 | 7043 | #: wt-status.c:1662 |
a0b6b246 JX |
7044 | msgid "Untracked files" |
7045 | msgstr "未跟踪的文件" | |
1b7f4a34 | 7046 | |
4c27fcb5 | 7047 | #: wt-status.c:1664 |
a0b6b246 JX |
7048 | msgid "Ignored files" |
7049 | msgstr "忽略的文件" | |
1b7f4a34 | 7050 | |
4c27fcb5 | 7051 | #: wt-status.c:1668 |
a0b6b246 JX |
7052 | #, c-format |
7053 | msgid "" | |
7054 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
7055 | "may speed it up, but you have to be careful not to forget to add\n" | |
7056 | "new files yourself (see 'git help status')." | |
7057 | msgstr "" | |
7058 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
7059 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 7060 | |
4c27fcb5 | 7061 | #: wt-status.c:1674 |
a0b6b246 JX |
7062 | #, c-format |
7063 | msgid "Untracked files not listed%s" | |
7064 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 7065 | |
a0b6b246 | 7066 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 7067 | #: wt-status.c:1676 |
a0b6b246 JX |
7068 | msgid " (use -u option to show untracked files)" |
7069 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 7070 | |
4c27fcb5 | 7071 | #: wt-status.c:1682 |
a0b6b246 JX |
7072 | msgid "No changes" |
7073 | msgstr "没有修改" | |
1b7f4a34 | 7074 | |
4c27fcb5 | 7075 | #: wt-status.c:1687 |
a0b6b246 JX |
7076 | #, c-format |
7077 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
7078 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 7079 | |
4c27fcb5 | 7080 | #: wt-status.c:1690 |
a0b6b246 JX |
7081 | #, c-format |
7082 | msgid "no changes added to commit\n" | |
7083 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 7084 | |
4c27fcb5 | 7085 | #: wt-status.c:1693 |
a0b6b246 JX |
7086 | #, c-format |
7087 | msgid "" | |
7088 | "nothing added to commit but untracked files present (use \"git add\" to " | |
7089 | "track)\n" | |
7090 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 7091 | |
4c27fcb5 | 7092 | #: wt-status.c:1696 |
a0b6b246 JX |
7093 | #, c-format |
7094 | msgid "nothing added to commit but untracked files present\n" | |
7095 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 7096 | |
a0b6b246 | 7097 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 7098 | #: wt-status.c:1699 |
a0b6b246 JX |
7099 | #, c-format |
7100 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
7101 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 7102 | |
4c27fcb5 | 7103 | #: wt-status.c:1702 wt-status.c:1707 |
a0b6b246 JX |
7104 | #, c-format |
7105 | msgid "nothing to commit\n" | |
7106 | msgstr "无文件要提交\n" | |
1b7f4a34 | 7107 | |
a0b6b246 | 7108 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 7109 | #: wt-status.c:1705 |
a0b6b246 JX |
7110 | #, c-format |
7111 | msgid "nothing to commit (use -u to show untracked files)\n" | |
7112 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 7113 | |
a0b6b246 | 7114 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 7115 | #: wt-status.c:1709 |
a0b6b246 JX |
7116 | #, c-format |
7117 | msgid "nothing to commit, working tree clean\n" | |
7118 | msgstr "无文件要提交,干净的工作区\n" | |
7119 | ||
4c27fcb5 | 7120 | #: wt-status.c:1822 |
a4f16749 JX |
7121 | msgid "No commits yet on " |
7122 | msgstr "尚无提交在 " | |
1b7f4a34 | 7123 | |
4c27fcb5 | 7124 | #: wt-status.c:1826 |
a0b6b246 JX |
7125 | msgid "HEAD (no branch)" |
7126 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 7127 | |
4c27fcb5 | 7128 | #: wt-status.c:1857 |
31e5e17b JX |
7129 | msgid "different" |
7130 | msgstr "不同" | |
7131 | ||
a0b6b246 | 7132 | # 译者:注意保持句尾空格 |
4c27fcb5 | 7133 | #: wt-status.c:1859 wt-status.c:1867 |
a0b6b246 JX |
7134 | msgid "behind " |
7135 | msgstr "落后 " | |
1b7f4a34 | 7136 | |
4c27fcb5 | 7137 | #: wt-status.c:1862 wt-status.c:1865 |
a0b6b246 JX |
7138 | msgid "ahead " |
7139 | msgstr "领先 " | |
1b7f4a34 | 7140 | |
a0b6b246 | 7141 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
4c27fcb5 | 7142 | #: wt-status.c:2374 |
a0b6b246 JX |
7143 | #, c-format |
7144 | msgid "cannot %s: You have unstaged changes." | |
7145 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 7146 | |
4c27fcb5 | 7147 | #: wt-status.c:2380 |
a0b6b246 | 7148 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 7149 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 7150 | |
4c27fcb5 | 7151 | #: wt-status.c:2382 |
a0b6b246 JX |
7152 | #, c-format |
7153 | msgid "cannot %s: Your index contains uncommitted changes." | |
7154 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 7155 | |
a4f16749 | 7156 | #: builtin/add.c:24 |
a0b6b246 JX |
7157 | msgid "git add [<options>] [--] <pathspec>..." |
7158 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 7159 | |
5809aa05 | 7160 | #: builtin/add.c:83 |
a0b6b246 JX |
7161 | #, c-format |
7162 | msgid "unexpected diff status %c" | |
7163 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 7164 | |
4c27fcb5 | 7165 | #: builtin/add.c:88 builtin/commit.c:284 |
a0b6b246 JX |
7166 | msgid "updating files failed" |
7167 | msgstr "更新文件失败" | |
1b7f4a34 | 7168 | |
5809aa05 | 7169 | #: builtin/add.c:98 |
a0b6b246 JX |
7170 | #, c-format |
7171 | msgid "remove '%s'\n" | |
7172 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 7173 | |
5809aa05 | 7174 | #: builtin/add.c:173 |
a0b6b246 JX |
7175 | msgid "Unstaged changes after refreshing the index:" |
7176 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 7177 | |
4c27fcb5 | 7178 | #: builtin/add.c:233 builtin/rev-parse.c:895 |
a0b6b246 JX |
7179 | msgid "Could not read the index" |
7180 | msgstr "不能读取索引" | |
1b7f4a34 | 7181 | |
5809aa05 | 7182 | #: builtin/add.c:244 |
a0b6b246 JX |
7183 | #, c-format |
7184 | msgid "Could not open '%s' for writing." | |
c1ac5258 | 7185 | msgstr "无法为写入打开 '%s'。" |
1b7f4a34 | 7186 | |
5809aa05 | 7187 | #: builtin/add.c:248 |
a0b6b246 JX |
7188 | msgid "Could not write patch" |
7189 | msgstr "不能生成补丁" | |
1b7f4a34 | 7190 | |
5809aa05 | 7191 | #: builtin/add.c:251 |
a0b6b246 JX |
7192 | msgid "editing patch failed" |
7193 | msgstr "编辑补丁失败" | |
1b7f4a34 | 7194 | |
5809aa05 | 7195 | #: builtin/add.c:254 |
1b7f4a34 | 7196 | #, c-format |
a0b6b246 | 7197 | msgid "Could not stat '%s'" |
65e2041e | 7198 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 7199 | |
5809aa05 | 7200 | #: builtin/add.c:256 |
a0b6b246 JX |
7201 | msgid "Empty patch. Aborted." |
7202 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 7203 | |
5809aa05 | 7204 | #: builtin/add.c:261 |
a0b6b246 JX |
7205 | #, c-format |
7206 | msgid "Could not apply '%s'" | |
7207 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 7208 | |
fd8cb379 | 7209 | #: builtin/add.c:269 |
a0b6b246 JX |
7210 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
7211 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 7212 | |
4c27fcb5 JX |
7213 | #: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123 |
7214 | #: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557 | |
7215 | #: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165 | |
a0b6b246 JX |
7216 | msgid "dry run" |
7217 | msgstr "演习" | |
8ada9598 | 7218 | |
fd8cb379 | 7219 | #: builtin/add.c:292 |
a0b6b246 JX |
7220 | msgid "interactive picking" |
7221 | msgstr "交互式拣选" | |
8ada9598 | 7222 | |
4c27fcb5 | 7223 | #: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305 |
a0b6b246 JX |
7224 | msgid "select hunks interactively" |
7225 | msgstr "交互式挑选数据块" | |
8ada9598 | 7226 | |
fd8cb379 | 7227 | #: builtin/add.c:294 |
a0b6b246 JX |
7228 | msgid "edit current diff and apply" |
7229 | msgstr "编辑当前差异并应用" | |
8ada9598 | 7230 | |
fd8cb379 | 7231 | #: builtin/add.c:295 |
a0b6b246 JX |
7232 | msgid "allow adding otherwise ignored files" |
7233 | msgstr "允许添加忽略的文件" | |
8ada9598 | 7234 | |
fd8cb379 | 7235 | #: builtin/add.c:296 |
a0b6b246 JX |
7236 | msgid "update tracked files" |
7237 | msgstr "更新已跟踪的文件" | |
8ada9598 | 7238 | |
fd8cb379 | 7239 | #: builtin/add.c:297 |
5809aa05 JX |
7240 | msgid "renormalize EOL of tracked files (implies -u)" |
7241 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
7242 | ||
fd8cb379 | 7243 | #: builtin/add.c:298 |
a0b6b246 JX |
7244 | msgid "record only the fact that the path will be added later" |
7245 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 7246 | |
fd8cb379 | 7247 | #: builtin/add.c:299 |
a0b6b246 JX |
7248 | msgid "add changes from all tracked and untracked files" |
7249 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 7250 | |
fd8cb379 | 7251 | #: builtin/add.c:302 |
a0b6b246 JX |
7252 | msgid "ignore paths removed in the working tree (same as --no-all)" |
7253 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 7254 | |
fd8cb379 | 7255 | #: builtin/add.c:304 |
a0b6b246 JX |
7256 | msgid "don't add, only refresh the index" |
7257 | msgstr "不添加,只刷新索引" | |
8ada9598 | 7258 | |
fd8cb379 | 7259 | #: builtin/add.c:305 |
a0b6b246 JX |
7260 | msgid "just skip files which cannot be added because of errors" |
7261 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 7262 | |
fd8cb379 | 7263 | #: builtin/add.c:306 |
a0b6b246 JX |
7264 | msgid "check if - even missing - files are ignored in dry run" |
7265 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 7266 | |
4c27fcb5 | 7267 | #: builtin/add.c:308 builtin/update-index.c:990 |
a0b6b246 JX |
7268 | msgid "override the executable bit of the listed files" |
7269 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 7270 | |
c1ac5258 | 7271 | #: builtin/add.c:310 |
a4f16749 JX |
7272 | msgid "warn when adding an embedded repository" |
7273 | msgstr "创建一个嵌入式仓库时给予警告" | |
7274 | ||
c1ac5258 | 7275 | #: builtin/add.c:325 |
a4f16749 JX |
7276 | #, c-format |
7277 | msgid "" | |
7278 | "You've added another git repository inside your current repository.\n" | |
7279 | "Clones of the outer repository will not contain the contents of\n" | |
7280 | "the embedded repository and will not know how to obtain it.\n" | |
7281 | "If you meant to add a submodule, use:\n" | |
7282 | "\n" | |
7283 | "\tgit submodule add <url> %s\n" | |
7284 | "\n" | |
7285 | "If you added this path by mistake, you can remove it from the\n" | |
7286 | "index with:\n" | |
7287 | "\n" | |
7288 | "\tgit rm --cached %s\n" | |
7289 | "\n" | |
7290 | "See \"git help submodule\" for more information." | |
7291 | msgstr "" | |
6937cb4e JX |
7292 | "您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并" |
7293 | "且不知道该如何获取它。\n" | |
a4f16749 JX |
7294 | "如果您要添加一个子模组,使用:\n" |
7295 | "\n" | |
7296 | "\tgit submodule add <url> %s\n" | |
7297 | "\n" | |
7298 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
7299 | "\n" | |
7300 | "\tgit rm --cached %s\n" | |
7301 | "\n" | |
7302 | "参见 \"git help submodule\" 获取更多信息。" | |
7303 | ||
c1ac5258 | 7304 | #: builtin/add.c:353 |
a4f16749 JX |
7305 | #, c-format |
7306 | msgid "adding embedded git repository: %s" | |
7307 | msgstr "正在添加嵌入式 git 仓库:%s" | |
7308 | ||
c1ac5258 | 7309 | #: builtin/add.c:371 |
8ada9598 | 7310 | #, c-format |
a0b6b246 JX |
7311 | msgid "Use -f if you really want to add them.\n" |
7312 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
8ada9598 | 7313 | |
c1ac5258 | 7314 | #: builtin/add.c:379 |
a0b6b246 JX |
7315 | msgid "adding files failed" |
7316 | msgstr "添加文件失败" | |
8ada9598 | 7317 | |
c1ac5258 | 7318 | #: builtin/add.c:417 |
a0b6b246 JX |
7319 | msgid "-A and -u are mutually incompatible" |
7320 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 7321 | |
c1ac5258 | 7322 | #: builtin/add.c:424 |
a0b6b246 JX |
7323 | msgid "Option --ignore-missing can only be used together with --dry-run" |
7324 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 7325 | |
c1ac5258 | 7326 | #: builtin/add.c:428 |
8ada9598 | 7327 | #, c-format |
a0b6b246 JX |
7328 | msgid "--chmod param '%s' must be either -x or +x" |
7329 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 7330 | |
c1ac5258 | 7331 | #: builtin/add.c:443 |
8ada9598 | 7332 | #, c-format |
a0b6b246 JX |
7333 | msgid "Nothing specified, nothing added.\n" |
7334 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 7335 | |
c1ac5258 | 7336 | #: builtin/add.c:444 |
8ada9598 | 7337 | #, c-format |
a0b6b246 JX |
7338 | msgid "Maybe you wanted to say 'git add .'?\n" |
7339 | msgstr "也许您想要执行 'git add .'?\n" | |
8ada9598 | 7340 | |
4c27fcb5 | 7341 | #: builtin/am.c:363 |
a0b6b246 JX |
7342 | msgid "could not parse author script" |
7343 | msgstr "不能解析作者脚本" | |
8ada9598 | 7344 | |
4c27fcb5 | 7345 | #: builtin/am.c:447 |
81809b99 | 7346 | #, c-format |
a0b6b246 JX |
7347 | msgid "'%s' was deleted by the applypatch-msg hook" |
7348 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 7349 | |
4c27fcb5 | 7350 | #: builtin/am.c:488 |
8ada9598 | 7351 | #, c-format |
a0b6b246 JX |
7352 | msgid "Malformed input line: '%s'." |
7353 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 7354 | |
4c27fcb5 | 7355 | #: builtin/am.c:525 |
8ada9598 | 7356 | #, c-format |
a0b6b246 JX |
7357 | msgid "Failed to copy notes from '%s' to '%s'" |
7358 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 7359 | |
4c27fcb5 | 7360 | #: builtin/am.c:551 |
a0b6b246 JX |
7361 | msgid "fseek failed" |
7362 | msgstr "fseek 失败" | |
8ada9598 | 7363 | |
4c27fcb5 | 7364 | #: builtin/am.c:739 |
8ada9598 | 7365 | #, c-format |
a0b6b246 JX |
7366 | msgid "could not parse patch '%s'" |
7367 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 7368 | |
4c27fcb5 | 7369 | #: builtin/am.c:804 |
a0b6b246 JX |
7370 | msgid "Only one StGIT patch series can be applied at once" |
7371 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
7372 | ||
4c27fcb5 | 7373 | #: builtin/am.c:852 |
a0b6b246 JX |
7374 | msgid "invalid timestamp" |
7375 | msgstr "无效的时间戳" | |
7376 | ||
4c27fcb5 | 7377 | #: builtin/am.c:857 builtin/am.c:869 |
a0b6b246 JX |
7378 | msgid "invalid Date line" |
7379 | msgstr "无效的日期行" | |
8ada9598 | 7380 | |
4c27fcb5 | 7381 | #: builtin/am.c:864 |
a0b6b246 JX |
7382 | msgid "invalid timezone offset" |
7383 | msgstr "无效的时区偏移值" | |
8ada9598 | 7384 | |
4c27fcb5 | 7385 | #: builtin/am.c:957 |
a0b6b246 | 7386 | msgid "Patch format detection failed." |
87cb7997 | 7387 | msgstr "补丁格式探测失败。" |
8ada9598 | 7388 | |
4c27fcb5 | 7389 | #: builtin/am.c:962 builtin/clone.c:408 |
8ada9598 | 7390 | #, c-format |
a0b6b246 | 7391 | msgid "failed to create directory '%s'" |
c1ac5258 | 7392 | msgstr "创建目录 '%s' 失败" |
8ada9598 | 7393 | |
4c27fcb5 | 7394 | #: builtin/am.c:967 |
a0b6b246 | 7395 | msgid "Failed to split patches." |
c1ac5258 | 7396 | msgstr "拆分补丁失败。" |
814ff314 | 7397 | |
4c27fcb5 | 7398 | #: builtin/am.c:1097 builtin/commit.c:369 |
a0b6b246 JX |
7399 | msgid "unable to write index file" |
7400 | msgstr "无法写入索引文件" | |
8ada9598 | 7401 | |
4c27fcb5 | 7402 | #: builtin/am.c:1111 |
8ada9598 | 7403 | #, c-format |
a0b6b246 JX |
7404 | msgid "When you have resolved this problem, run \"%s --continue\"." |
7405 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 7406 | |
4c27fcb5 | 7407 | #: builtin/am.c:1112 |
81809b99 | 7408 | #, c-format |
a0b6b246 JX |
7409 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
7410 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 7411 | |
4c27fcb5 | 7412 | #: builtin/am.c:1113 |
81809b99 | 7413 | #, c-format |
a0b6b246 JX |
7414 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
7415 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 7416 | |
4c27fcb5 JX |
7417 | #: builtin/am.c:1196 |
7418 | msgid "Patch sent with format=flowed; space at the end of lines might be lost." | |
7419 | msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。" | |
7420 | ||
7421 | #: builtin/am.c:1224 | |
a4f16749 JX |
7422 | msgid "Patch is empty." |
7423 | msgstr "补丁为空。" | |
23ff3338 | 7424 | |
4c27fcb5 | 7425 | #: builtin/am.c:1290 |
8ada9598 | 7426 | #, c-format |
a4f16749 JX |
7427 | msgid "invalid ident line: %.*s" |
7428 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 7429 | |
4c27fcb5 | 7430 | #: builtin/am.c:1312 |
8ada9598 | 7431 | #, c-format |
a0b6b246 JX |
7432 | msgid "unable to parse commit %s" |
7433 | msgstr "不能解析提交 %s" | |
8ada9598 | 7434 | |
4c27fcb5 | 7435 | #: builtin/am.c:1508 |
a0b6b246 JX |
7436 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
7437 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 7438 | |
4c27fcb5 | 7439 | #: builtin/am.c:1510 |
a0b6b246 JX |
7440 | msgid "Using index info to reconstruct a base tree..." |
7441 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 7442 | |
4c27fcb5 | 7443 | #: builtin/am.c:1529 |
a0b6b246 JX |
7444 | msgid "" |
7445 | "Did you hand edit your patch?\n" | |
7446 | "It does not apply to blobs recorded in its index." | |
7447 | msgstr "" | |
7448 | "您是否曾手动编辑过您的补丁?\n" | |
7449 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 7450 | |
4c27fcb5 | 7451 | #: builtin/am.c:1535 |
a0b6b246 JX |
7452 | msgid "Falling back to patching base and 3-way merge..." |
7453 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 7454 | |
4c27fcb5 | 7455 | #: builtin/am.c:1561 |
a0b6b246 JX |
7456 | msgid "Failed to merge in the changes." |
7457 | msgstr "无法合并变更。" | |
d691f479 | 7458 | |
4c27fcb5 | 7459 | #: builtin/am.c:1593 |
a0b6b246 JX |
7460 | msgid "applying to an empty history" |
7461 | msgstr "正应用到一个空历史上" | |
8ada9598 | 7462 | |
4c27fcb5 | 7463 | #: builtin/am.c:1639 builtin/am.c:1643 |
8ada9598 | 7464 | #, c-format |
a0b6b246 JX |
7465 | msgid "cannot resume: %s does not exist." |
7466 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 7467 | |
4c27fcb5 | 7468 | #: builtin/am.c:1659 |
a0b6b246 JX |
7469 | msgid "cannot be interactive without stdin connected to a terminal." |
7470 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
8ada9598 | 7471 | |
4c27fcb5 | 7472 | #: builtin/am.c:1664 |
a0b6b246 JX |
7473 | msgid "Commit Body is:" |
7474 | msgstr "提交内容为:" | |
8ada9598 | 7475 | |
a0b6b246 JX |
7476 | # 译者:注意保持句尾空格 |
7477 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
7478 | #. in your translation. The program will only accept English | |
7479 | #. input at this point. | |
7480 | #. | |
4c27fcb5 | 7481 | #: builtin/am.c:1674 |
a0b6b246 JX |
7482 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
7483 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 7484 | |
4c27fcb5 | 7485 | #: builtin/am.c:1724 |
8ada9598 | 7486 | #, c-format |
a0b6b246 JX |
7487 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
7488 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 7489 | |
4c27fcb5 | 7490 | #: builtin/am.c:1764 builtin/am.c:1832 |
81809b99 | 7491 | #, c-format |
a0b6b246 JX |
7492 | msgid "Applying: %.*s" |
7493 | msgstr "应用:%.*s" | |
8ada9598 | 7494 | |
4c27fcb5 | 7495 | #: builtin/am.c:1781 |
a0b6b246 JX |
7496 | msgid "No changes -- Patch already applied." |
7497 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 7498 | |
4c27fcb5 | 7499 | #: builtin/am.c:1787 |
81809b99 | 7500 | #, c-format |
a0b6b246 JX |
7501 | msgid "Patch failed at %s %.*s" |
7502 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 7503 | |
4c27fcb5 | 7504 | #: builtin/am.c:1791 |
31e5e17b JX |
7505 | msgid "Use 'git am --show-current-patch' to see the failed patch" |
7506 | msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" | |
8ada9598 | 7507 | |
4c27fcb5 | 7508 | #: builtin/am.c:1835 |
a0b6b246 JX |
7509 | msgid "" |
7510 | "No changes - did you forget to use 'git add'?\n" | |
7511 | "If there is nothing left to stage, chances are that something else\n" | |
7512 | "already introduced the same changes; you might want to skip this patch." | |
7513 | msgstr "" | |
7514 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
7515 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
7516 | "您也许想要跳过这个补丁。" | |
8ada9598 | 7517 | |
4c27fcb5 | 7518 | #: builtin/am.c:1842 |
a0b6b246 JX |
7519 | msgid "" |
7520 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
7521 | "You should 'git add' each file with resolved conflicts to mark them as " |
7522 | "such.\n" | |
7523 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 7524 | msgstr "" |
a4f16749 JX |
7525 | "在您的索引中仍存在未合并的路径。\n" |
7526 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
7527 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 7528 | |
4c27fcb5 JX |
7529 | #: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328 |
7530 | #: builtin/reset.c:336 | |
8ada9598 | 7531 | #, c-format |
a0b6b246 JX |
7532 | msgid "Could not parse object '%s'." |
7533 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 7534 | |
4c27fcb5 | 7535 | #: builtin/am.c:2001 |
a0b6b246 | 7536 | msgid "failed to clean index" |
c1ac5258 | 7537 | msgstr "清空索引失败" |
5b04ee3b | 7538 | |
4c27fcb5 | 7539 | #: builtin/am.c:2036 |
a0b6b246 JX |
7540 | msgid "" |
7541 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
7542 | "Not rewinding to ORIG_HEAD" | |
7543 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 7544 | |
4c27fcb5 | 7545 | #: builtin/am.c:2129 |
8ada9598 | 7546 | #, c-format |
a0b6b246 JX |
7547 | msgid "Invalid value for --patch-format: %s" |
7548 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 7549 | |
4c27fcb5 | 7550 | #: builtin/am.c:2165 |
a0b6b246 JX |
7551 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
7552 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 7553 | |
4c27fcb5 | 7554 | #: builtin/am.c:2166 |
a0b6b246 JX |
7555 | msgid "git am [<options>] (--continue | --skip | --abort)" |
7556 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 7557 | |
4c27fcb5 | 7558 | #: builtin/am.c:2172 |
a0b6b246 JX |
7559 | msgid "run interactively" |
7560 | msgstr "以交互式方式运行" | |
8ada9598 | 7561 | |
4c27fcb5 | 7562 | #: builtin/am.c:2174 |
a0b6b246 JX |
7563 | msgid "historical option -- no-op" |
7564 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 7565 | |
4c27fcb5 | 7566 | #: builtin/am.c:2176 |
a0b6b246 JX |
7567 | msgid "allow fall back on 3way merging if needed" |
7568 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 7569 | |
4c27fcb5 JX |
7570 | #: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58 |
7571 | #: builtin/repack.c:306 | |
a0b6b246 JX |
7572 | msgid "be quiet" |
7573 | msgstr "静默模式" | |
8ada9598 | 7574 | |
4c27fcb5 | 7575 | #: builtin/am.c:2179 |
a0b6b246 JX |
7576 | msgid "add a Signed-off-by line to the commit message" |
7577 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 7578 | |
4c27fcb5 | 7579 | #: builtin/am.c:2182 |
a0b6b246 JX |
7580 | msgid "recode into utf8 (default)" |
7581 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 7582 | |
4c27fcb5 | 7583 | #: builtin/am.c:2184 |
a0b6b246 JX |
7584 | msgid "pass -k flag to git-mailinfo" |
7585 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 7586 | |
4c27fcb5 | 7587 | #: builtin/am.c:2186 |
a0b6b246 JX |
7588 | msgid "pass -b flag to git-mailinfo" |
7589 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 7590 | |
4c27fcb5 | 7591 | #: builtin/am.c:2188 |
a0b6b246 JX |
7592 | msgid "pass -m flag to git-mailinfo" |
7593 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 7594 | |
4c27fcb5 | 7595 | #: builtin/am.c:2190 |
a0b6b246 JX |
7596 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
7597 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 7598 | |
4c27fcb5 | 7599 | #: builtin/am.c:2193 |
a0b6b246 JX |
7600 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
7601 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 7602 | |
4c27fcb5 | 7603 | #: builtin/am.c:2196 |
a0b6b246 JX |
7604 | msgid "strip everything before a scissors line" |
7605 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 7606 | |
4c27fcb5 JX |
7607 | #: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 |
7608 | #: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219 | |
7609 | #: builtin/am.c:2225 | |
a0b6b246 JX |
7610 | msgid "pass it through git-apply" |
7611 | msgstr "传递给 git-apply" | |
8ada9598 | 7612 | |
4c27fcb5 JX |
7613 | #: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671 |
7614 | #: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239 | |
7615 | #: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854 | |
7616 | #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 | |
7617 | #: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386 | |
7618 | #: parse-options.h:144 parse-options.h:146 parse-options.h:268 | |
a0b6b246 JX |
7619 | msgid "n" |
7620 | msgstr "n" | |
8ada9598 | 7621 | |
4c27fcb5 JX |
7622 | #: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38 |
7623 | #: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 | |
a0b6b246 JX |
7624 | msgid "format" |
7625 | msgstr "格式" | |
8ada9598 | 7626 | |
4c27fcb5 | 7627 | #: builtin/am.c:2222 |
a0b6b246 JX |
7628 | msgid "format the patch(es) are in" |
7629 | msgstr "补丁的格式" | |
8ada9598 | 7630 | |
4c27fcb5 | 7631 | #: builtin/am.c:2228 |
a0b6b246 JX |
7632 | msgid "override error message when patch failure occurs" |
7633 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 7634 | |
4c27fcb5 | 7635 | #: builtin/am.c:2230 |
a0b6b246 JX |
7636 | msgid "continue applying patches after resolving a conflict" |
7637 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 7638 | |
4c27fcb5 | 7639 | #: builtin/am.c:2233 |
a0b6b246 JX |
7640 | msgid "synonyms for --continue" |
7641 | msgstr "和 --continue 同义" | |
8ada9598 | 7642 | |
4c27fcb5 | 7643 | #: builtin/am.c:2236 |
a0b6b246 JX |
7644 | msgid "skip the current patch" |
7645 | msgstr "跳过当前补丁" | |
23ff3338 | 7646 | |
4c27fcb5 | 7647 | #: builtin/am.c:2239 |
a0b6b246 JX |
7648 | msgid "restore the original branch and abort the patching operation." |
7649 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 7650 | |
4c27fcb5 | 7651 | #: builtin/am.c:2242 |
31e5e17b JX |
7652 | msgid "abort the patching operation but keep HEAD where it is." |
7653 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
7654 | ||
4c27fcb5 | 7655 | #: builtin/am.c:2245 |
31e5e17b JX |
7656 | msgid "show the patch being applied." |
7657 | msgstr "显示正在应用的补丁。" | |
7658 | ||
4c27fcb5 | 7659 | #: builtin/am.c:2249 |
a0b6b246 JX |
7660 | msgid "lie about committer date" |
7661 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 7662 | |
4c27fcb5 | 7663 | #: builtin/am.c:2251 |
a0b6b246 JX |
7664 | msgid "use current timestamp for author date" |
7665 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 7666 | |
4c27fcb5 JX |
7667 | #: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273 |
7668 | #: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183 | |
7669 | #: builtin/revert.c:113 builtin/tag.c:402 | |
a0b6b246 JX |
7670 | msgid "key-id" |
7671 | msgstr "key-id" | |
8ada9598 | 7672 | |
4c27fcb5 | 7673 | #: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184 |
a0b6b246 JX |
7674 | msgid "GPG-sign commits" |
7675 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 7676 | |
4c27fcb5 | 7677 | #: builtin/am.c:2257 |
a0b6b246 JX |
7678 | msgid "(internal use for git-rebase)" |
7679 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 7680 | |
4c27fcb5 | 7681 | #: builtin/am.c:2275 |
a0b6b246 JX |
7682 | msgid "" |
7683 | "The -b/--binary option has been a no-op for long time, and\n" | |
7684 | "it will be removed. Please do not use it anymore." | |
7685 | msgstr "" | |
7686 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
7687 | "请不要再使用它了。" | |
8ada9598 | 7688 | |
4c27fcb5 | 7689 | #: builtin/am.c:2282 |
a0b6b246 | 7690 | msgid "failed to read the index" |
c1ac5258 | 7691 | msgstr "读取索引失败" |
8ada9598 | 7692 | |
4c27fcb5 | 7693 | #: builtin/am.c:2297 |
a0b6b246 JX |
7694 | #, c-format |
7695 | msgid "previous rebase directory %s still exists but mbox given." | |
7696 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 7697 | |
4c27fcb5 | 7698 | #: builtin/am.c:2321 |
a0b6b246 JX |
7699 | #, c-format |
7700 | msgid "" | |
7701 | "Stray %s directory found.\n" | |
7702 | "Use \"git am --abort\" to remove it." | |
7703 | msgstr "" | |
7704 | "发现了错误的 %s 目录。\n" | |
7705 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 7706 | |
4c27fcb5 | 7707 | #: builtin/am.c:2327 |
a0b6b246 JX |
7708 | msgid "Resolve operation not in progress, we are not resuming." |
7709 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 7710 | |
a0b6b246 JX |
7711 | #: builtin/apply.c:8 |
7712 | msgid "git apply [<options>] [<patch>...]" | |
7713 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 7714 | |
c04f5ac3 JX |
7715 | #: builtin/archive.c:17 |
7716 | #, c-format | |
7717 | msgid "could not create archive file '%s'" | |
90e6ef53 | 7718 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
7719 | |
7720 | #: builtin/archive.c:20 | |
7721 | msgid "could not redirect output" | |
195febda | 7722 | msgstr "不能重定向输出" |
c04f5ac3 JX |
7723 | |
7724 | #: builtin/archive.c:37 | |
7725 | msgid "git archive: Remote with no URL" | |
4375c10e | 7726 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
7727 | |
7728 | #: builtin/archive.c:58 | |
31e5e17b JX |
7729 | msgid "git archive: expected ACK/NAK, got a flush packet" |
7730 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 7731 | |
1003b3a5 | 7732 | #: builtin/archive.c:61 |
c04f5ac3 JX |
7733 | #, c-format |
7734 | msgid "git archive: NACK %s" | |
90e6ef53 | 7735 | msgstr "git archive:NACK %s" |
c04f5ac3 | 7736 | |
1003b3a5 | 7737 | #: builtin/archive.c:64 |
c04f5ac3 | 7738 | msgid "git archive: protocol error" |
90e6ef53 | 7739 | msgstr "git archive:协议错误" |
c04f5ac3 | 7740 | |
1003b3a5 | 7741 | #: builtin/archive.c:68 |
c04f5ac3 | 7742 | msgid "git archive: expected a flush" |
31e5e17b | 7743 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 7744 | |
5809aa05 | 7745 | #: builtin/bisect--helper.c:12 |
ef317cd5 | 7746 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 7747 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 7748 | |
5809aa05 JX |
7749 | #: builtin/bisect--helper.c:13 |
7750 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" | |
7751 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
7752 | ||
7753 | #: builtin/bisect--helper.c:14 | |
7754 | msgid "git bisect--helper --bisect-clean-state" | |
7755 | msgstr "git bisect--helper --bisect-clean-state" | |
7756 | ||
7757 | #: builtin/bisect--helper.c:46 | |
7758 | #, c-format | |
7759 | msgid "'%s' is not a valid term" | |
7760 | msgstr "'%s' 不是一个有效的术语" | |
7761 | ||
7762 | #: builtin/bisect--helper.c:50 | |
7763 | #, c-format | |
7764 | msgid "can't use the builtin command '%s' as a term" | |
7765 | msgstr "不能使用内置命令 '%s' 作为术语" | |
7766 | ||
7767 | #: builtin/bisect--helper.c:60 | |
7768 | #, c-format | |
7769 | msgid "can't change the meaning of the term '%s'" | |
7770 | msgstr "不能修改术语 '%s' 的含义" | |
7771 | ||
7772 | #: builtin/bisect--helper.c:71 | |
7773 | msgid "please use two different terms" | |
7774 | msgstr "请使用两个不同的术语" | |
7775 | ||
7776 | #: builtin/bisect--helper.c:78 | |
7777 | msgid "could not open the file BISECT_TERMS" | |
7778 | msgstr "不能打开文件 BISECT_TERMS" | |
7779 | ||
7780 | #: builtin/bisect--helper.c:120 | |
ef317cd5 | 7781 | msgid "perform 'git bisect next'" |
07432cef | 7782 | msgstr "执行 'git bisect next'" |
ef317cd5 | 7783 | |
5809aa05 JX |
7784 | #: builtin/bisect--helper.c:122 |
7785 | msgid "write the terms to .git/BISECT_TERMS" | |
7786 | msgstr "将术语写入 .git/BISECT_TERMS" | |
7787 | ||
7788 | #: builtin/bisect--helper.c:124 | |
7789 | msgid "cleanup the bisection state" | |
7790 | msgstr "清除二分查找状态" | |
7791 | ||
7792 | #: builtin/bisect--helper.c:126 | |
7793 | msgid "check for expected revs" | |
7794 | msgstr "检查预期的版本" | |
7795 | ||
7796 | #: builtin/bisect--helper.c:128 | |
ef317cd5 | 7797 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 7798 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 7799 | |
5809aa05 JX |
7800 | #: builtin/bisect--helper.c:143 |
7801 | msgid "--write-terms requires two arguments" | |
7802 | msgstr "--write-terms 需要两个参数" | |
7803 | ||
7804 | #: builtin/bisect--helper.c:147 | |
7805 | msgid "--bisect-clean-state requires no arguments" | |
7806 | msgstr "--bisect-clean-state 不需要参数" | |
7807 | ||
c1ac5258 | 7808 | #: builtin/blame.c:31 |
7aea43ff JX |
7809 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
7810 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 7811 | |
c1ac5258 | 7812 | #: builtin/blame.c:36 |
814ff314 JX |
7813 | msgid "<rev-opts> are documented in git-rev-list(1)" |
7814 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 7815 | |
c1ac5258 | 7816 | #: builtin/blame.c:406 |
fd8cb379 JX |
7817 | #, c-format |
7818 | msgid "expecting a color: %s" | |
7819 | msgstr "期望一个颜色:%s" | |
7820 | ||
c1ac5258 | 7821 | #: builtin/blame.c:413 |
fd8cb379 JX |
7822 | msgid "must end with a color" |
7823 | msgstr "必须以一个颜色结尾" | |
7824 | ||
c1ac5258 | 7825 | #: builtin/blame.c:700 |
fd8cb379 JX |
7826 | #, c-format |
7827 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
7828 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
7829 | ||
c1ac5258 | 7830 | #: builtin/blame.c:718 |
fd8cb379 JX |
7831 | msgid "invalid value for blame.coloring" |
7832 | msgstr "设置 blame.coloring 中的无效取值" | |
7833 | ||
4c27fcb5 | 7834 | #: builtin/blame.c:793 |
ef317cd5 | 7835 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 7836 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 7837 | |
4c27fcb5 | 7838 | #: builtin/blame.c:794 |
ef317cd5 | 7839 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 7840 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 7841 | |
4c27fcb5 | 7842 | #: builtin/blame.c:795 |
ef317cd5 | 7843 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 7844 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 7845 | |
4c27fcb5 | 7846 | #: builtin/blame.c:796 |
ef317cd5 | 7847 | msgid "Show work cost statistics" |
07432cef | 7848 | msgstr "显示命令消耗统计" |
ef317cd5 | 7849 | |
4c27fcb5 | 7850 | #: builtin/blame.c:797 |
276ceeaa JX |
7851 | msgid "Force progress reporting" |
7852 | msgstr "强制进度显示" | |
7853 | ||
4c27fcb5 | 7854 | #: builtin/blame.c:798 |
ef317cd5 | 7855 | msgid "Show output score for blame entries" |
07432cef | 7856 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 7857 | |
4c27fcb5 | 7858 | #: builtin/blame.c:799 |
ef317cd5 | 7859 | msgid "Show original filename (Default: auto)" |
07432cef | 7860 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 7861 | |
4c27fcb5 | 7862 | #: builtin/blame.c:800 |
ef317cd5 | 7863 | msgid "Show original linenumber (Default: off)" |
07432cef | 7864 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 7865 | |
4c27fcb5 | 7866 | #: builtin/blame.c:801 |
ef317cd5 | 7867 | msgid "Show in a format designed for machine consumption" |
07432cef | 7868 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 7869 | |
4c27fcb5 | 7870 | #: builtin/blame.c:802 |
ef317cd5 | 7871 | msgid "Show porcelain format with per-line commit information" |
07432cef | 7872 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 7873 | |
4c27fcb5 | 7874 | #: builtin/blame.c:803 |
ef317cd5 | 7875 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 7876 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 7877 | |
4c27fcb5 | 7878 | #: builtin/blame.c:804 |
ef317cd5 | 7879 | msgid "Show raw timestamp (Default: off)" |
07432cef | 7880 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 7881 | |
4c27fcb5 | 7882 | #: builtin/blame.c:805 |
ef317cd5 | 7883 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 7884 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 7885 | |
4c27fcb5 | 7886 | #: builtin/blame.c:806 |
ef317cd5 | 7887 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 7888 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 7889 | |
4c27fcb5 | 7890 | #: builtin/blame.c:807 |
ef317cd5 | 7891 | msgid "Show author email instead of name (Default: off)" |
07432cef | 7892 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 7893 | |
4c27fcb5 | 7894 | #: builtin/blame.c:808 |
ef317cd5 | 7895 | msgid "Ignore whitespace differences" |
07432cef | 7896 | msgstr "忽略空白差异" |
ef317cd5 | 7897 | |
4c27fcb5 | 7898 | #: builtin/blame.c:809 |
fd8cb379 JX |
7899 | msgid "color redundant metadata from previous line differently" |
7900 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
7901 | ||
4c27fcb5 | 7902 | #: builtin/blame.c:810 |
fd8cb379 JX |
7903 | msgid "color lines by age" |
7904 | msgstr "依据时间着色" | |
7905 | ||
4c27fcb5 | 7906 | #: builtin/blame.c:817 |
1a79b2f1 JX |
7907 | msgid "Use an experimental heuristic to improve diffs" |
7908 | msgstr "使用一个试验性的启发式算法改进差异显示" | |
a0b6b246 | 7909 | |
4c27fcb5 | 7910 | #: builtin/blame.c:819 |
ef317cd5 | 7911 | msgid "Spend extra cycles to find better match" |
07432cef | 7912 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 7913 | |
4c27fcb5 | 7914 | #: builtin/blame.c:820 |
ef317cd5 | 7915 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 7916 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 7917 | |
4c27fcb5 | 7918 | #: builtin/blame.c:821 |
ef317cd5 | 7919 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 7920 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 7921 | |
4c27fcb5 | 7922 | #: builtin/blame.c:822 builtin/blame.c:823 |
ef317cd5 | 7923 | msgid "score" |
07432cef | 7924 | msgstr "得分" |
ef317cd5 | 7925 | |
4c27fcb5 | 7926 | #: builtin/blame.c:822 |
ef317cd5 | 7927 | msgid "Find line copies within and across files" |
07432cef | 7928 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 7929 | |
4c27fcb5 | 7930 | #: builtin/blame.c:823 |
ef317cd5 | 7931 | msgid "Find line movements within and across files" |
07432cef | 7932 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 7933 | |
4c27fcb5 | 7934 | #: builtin/blame.c:824 |
ef317cd5 | 7935 | msgid "n,m" |
07432cef | 7936 | msgstr "n,m" |
ef317cd5 | 7937 | |
4c27fcb5 | 7938 | #: builtin/blame.c:824 |
ef317cd5 | 7939 | msgid "Process only line range n,m, counting from 1" |
07432cef | 7940 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 7941 | |
4c27fcb5 | 7942 | #: builtin/blame.c:873 |
a0b6b246 JX |
7943 | msgid "--progress can't be used with --incremental or porcelain formats" |
7944 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
7945 | ||
a4f16749 JX |
7946 | #. TRANSLATORS: This string is used to tell us the |
7947 | #. maximum display width for a relative timestamp in | |
7948 | #. "git blame" output. For C locale, "4 years, 11 | |
7949 | #. months ago", which takes 22 places, is the longest | |
7950 | #. among various forms of relative timestamps, but | |
7951 | #. your language may need more or fewer display | |
7952 | #. columns. | |
7953 | #. | |
4c27fcb5 | 7954 | #: builtin/blame.c:924 |
6c94aba5 JX |
7955 | msgid "4 years, 11 months ago" |
7956 | msgstr "4 年 11 个月前" | |
7957 | ||
4c27fcb5 | 7958 | #: builtin/blame.c:1011 |
a0b6b246 JX |
7959 | #, c-format |
7960 | msgid "file %s has only %lu line" | |
7961 | msgid_plural "file %s has only %lu lines" | |
7962 | msgstr[0] "文件 %s 只有 %lu 行" | |
7963 | msgstr[1] "文件 %s 只有 %lu 行" | |
7964 | ||
4c27fcb5 | 7965 | #: builtin/blame.c:1057 |
a4f16749 JX |
7966 | msgid "Blaming lines" |
7967 | msgstr "追踪代码行" | |
7968 | ||
4c27fcb5 | 7969 | #: builtin/branch.c:29 |
814ff314 JX |
7970 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
7971 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 7972 | |
4c27fcb5 | 7973 | #: builtin/branch.c:30 |
814ff314 JX |
7974 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
7975 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 7976 | |
4c27fcb5 | 7977 | #: builtin/branch.c:31 |
814ff314 JX |
7978 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
7979 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 7980 | |
4c27fcb5 | 7981 | #: builtin/branch.c:32 |
814ff314 JX |
7982 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
7983 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 7984 | |
4c27fcb5 | 7985 | #: builtin/branch.c:33 |
6937cb4e JX |
7986 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
7987 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
7988 | ||
4c27fcb5 | 7989 | #: builtin/branch.c:34 |
94550ed3 JX |
7990 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
7991 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
7992 | ||
4c27fcb5 | 7993 | #: builtin/branch.c:35 |
87cb7997 JX |
7994 | msgid "git branch [<options>] [-r | -a] [--format]" |
7995 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
7996 | ||
90e6ef53 | 7997 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
c1ac5258 | 7998 | #: builtin/branch.c:151 |
c04f5ac3 JX |
7999 | #, c-format |
8000 | msgid "" | |
8001 | "deleting branch '%s' that has been merged to\n" | |
8002 | " '%s', but not yet merged to HEAD." | |
8003 | msgstr "" | |
70fc47bf | 8004 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
8005 | " '%s',但未合并到 HEAD。" |
8006 | ||
90e6ef53 | 8007 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
c1ac5258 | 8008 | #: builtin/branch.c:155 |
c04f5ac3 JX |
8009 | #, c-format |
8010 | msgid "" | |
8011 | "not deleting branch '%s' that is not yet merged to\n" | |
8012 | " '%s', even though it is merged to HEAD." | |
8013 | msgstr "" | |
70fc47bf T |
8014 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
8015 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 8016 | |
c1ac5258 | 8017 | #: builtin/branch.c:169 |
07432cef WS |
8018 | #, c-format |
8019 | msgid "Couldn't look up commit object for '%s'" | |
8020 | msgstr "无法查询 '%s' 指向的提交对象" | |
8021 | ||
c1ac5258 | 8022 | #: builtin/branch.c:173 |
07432cef WS |
8023 | #, c-format |
8024 | msgid "" | |
8025 | "The branch '%s' is not fully merged.\n" | |
8026 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
8027 | msgstr "" | |
8028 | "分支 '%s' 没有完全合并。\n" | |
8029 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
8030 | ||
c1ac5258 | 8031 | #: builtin/branch.c:186 |
07432cef | 8032 | msgid "Update of config-file failed" |
6937cb4e | 8033 | msgstr "更新配置文件失败" |
07432cef | 8034 | |
c1ac5258 | 8035 | #: builtin/branch.c:217 |
c04f5ac3 | 8036 | msgid "cannot use -a with -d" |
649900bc | 8037 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 8038 | |
c1ac5258 | 8039 | #: builtin/branch.c:223 |
c04f5ac3 JX |
8040 | msgid "Couldn't look up commit object for HEAD" |
8041 | msgstr "无法查询 HEAD 指向的提交对象" | |
8042 | ||
c1ac5258 | 8043 | #: builtin/branch.c:237 |
c04f5ac3 | 8044 | #, c-format |
5b04ee3b JX |
8045 | msgid "Cannot delete branch '%s' checked out at '%s'" |
8046 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 8047 | |
c1ac5258 | 8048 | #: builtin/branch.c:252 |
5ae481e0 | 8049 | #, c-format |
7aea43ff JX |
8050 | msgid "remote-tracking branch '%s' not found." |
8051 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 8052 | |
c1ac5258 | 8053 | #: builtin/branch.c:253 |
81809b99 | 8054 | #, c-format |
8ada9598 | 8055 | msgid "branch '%s' not found." |
81809b99 | 8056 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 8057 | |
c1ac5258 | 8058 | #: builtin/branch.c:268 |
81809b99 | 8059 | #, c-format |
7aea43ff JX |
8060 | msgid "Error deleting remote-tracking branch '%s'" |
8061 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 8062 | |
c1ac5258 | 8063 | #: builtin/branch.c:269 |
81809b99 | 8064 | #, c-format |
8ada9598 | 8065 | msgid "Error deleting branch '%s'" |
7aea43ff | 8066 | msgstr "无法删除分支 '%s'" |
8ada9598 | 8067 | |
c1ac5258 | 8068 | #: builtin/branch.c:276 |
81809b99 | 8069 | #, c-format |
7aea43ff JX |
8070 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
8071 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 8072 | |
c1ac5258 | 8073 | #: builtin/branch.c:277 |
81809b99 | 8074 | #, c-format |
8ada9598 | 8075 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 8076 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 8077 | |
c1ac5258 | 8078 | #: builtin/branch.c:421 builtin/tag.c:59 |
6937cb4e JX |
8079 | msgid "unable to parse format string" |
8080 | msgstr "不能解析格式化字符串" | |
8081 | ||
c1ac5258 | 8082 | #: builtin/branch.c:458 |
5b04ee3b JX |
8083 | #, c-format |
8084 | msgid "Branch %s is being rebased at %s" | |
8085 | msgstr "分支 %s 正被变基到 %s" | |
8086 | ||
c1ac5258 | 8087 | #: builtin/branch.c:462 |
5b04ee3b JX |
8088 | #, c-format |
8089 | msgid "Branch %s is being bisected at %s" | |
8090 | msgstr "分支 %s 正被二分查找于 %s" | |
8091 | ||
c1ac5258 | 8092 | #: builtin/branch.c:479 |
6937cb4e JX |
8093 | msgid "cannot copy the current branch while not on any." |
8094 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
8095 | ||
c1ac5258 | 8096 | #: builtin/branch.c:481 |
c04f5ac3 | 8097 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 8098 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 8099 | |
c1ac5258 | 8100 | #: builtin/branch.c:492 |
c04f5ac3 JX |
8101 | #, c-format |
8102 | msgid "Invalid branch name: '%s'" | |
8103 | msgstr "无效的分支名:'%s'" | |
8104 | ||
c1ac5258 | 8105 | #: builtin/branch.c:519 |
c04f5ac3 JX |
8106 | msgid "Branch rename failed" |
8107 | msgstr "分支重命名失败" | |
8108 | ||
c1ac5258 | 8109 | #: builtin/branch.c:521 |
6937cb4e JX |
8110 | msgid "Branch copy failed" |
8111 | msgstr "分支拷贝失败" | |
8112 | ||
c1ac5258 | 8113 | #: builtin/branch.c:525 |
6937cb4e | 8114 | #, c-format |
5809aa05 JX |
8115 | msgid "Created a copy of a misnamed branch '%s'" |
8116 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 8117 | |
c1ac5258 | 8118 | #: builtin/branch.c:528 |
c04f5ac3 JX |
8119 | #, c-format |
8120 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 8121 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 8122 | |
c1ac5258 | 8123 | #: builtin/branch.c:534 |
c04f5ac3 JX |
8124 | #, c-format |
8125 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
8126 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
8127 | ||
c1ac5258 | 8128 | #: builtin/branch.c:543 |
c04f5ac3 | 8129 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
8130 | msgstr "分支被重命名,但更新配置文件失败" |
8131 | ||
c1ac5258 | 8132 | #: builtin/branch.c:545 |
6937cb4e JX |
8133 | msgid "Branch is copied, but update of config-file failed" |
8134 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 8135 | |
c1ac5258 | 8136 | #: builtin/branch.c:561 |
5c57d762 JX |
8137 | #, c-format |
8138 | msgid "" | |
8139 | "Please edit the description for the branch\n" | |
8140 | " %s\n" | |
8141 | "Lines starting with '%c' will be stripped.\n" | |
8142 | msgstr "" | |
8143 | "请编辑分支的描述\n" | |
8144 | " %s\n" | |
8145 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 8146 | |
4c27fcb5 | 8147 | #: builtin/branch.c:594 |
ef317cd5 | 8148 | msgid "Generic options" |
07432cef | 8149 | msgstr "通用选项" |
c04f5ac3 | 8150 | |
4c27fcb5 | 8151 | #: builtin/branch.c:596 |
ef317cd5 | 8152 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 8153 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 8154 | |
4c27fcb5 | 8155 | #: builtin/branch.c:597 |
ef317cd5 | 8156 | msgid "suppress informational messages" |
07432cef | 8157 | msgstr "不显示信息" |
8ada9598 | 8158 | |
4c27fcb5 | 8159 | #: builtin/branch.c:598 |
ef317cd5 | 8160 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 8161 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 8162 | |
4c27fcb5 | 8163 | #: builtin/branch.c:600 |
6937cb4e JX |
8164 | msgid "do not use" |
8165 | msgstr "不要使用" | |
c04f5ac3 | 8166 | |
4c27fcb5 | 8167 | #: builtin/branch.c:602 builtin/rebase--interactive.c:180 |
5b04ee3b JX |
8168 | msgid "upstream" |
8169 | msgstr "上游" | |
8170 | ||
4c27fcb5 | 8171 | #: builtin/branch.c:602 |
5b04ee3b JX |
8172 | msgid "change the upstream info" |
8173 | msgstr "改变上游信息" | |
8174 | ||
4c27fcb5 | 8175 | #: builtin/branch.c:603 |
a0b6b246 JX |
8176 | msgid "Unset the upstream info" |
8177 | msgstr "取消上游信息的设置" | |
8178 | ||
4c27fcb5 | 8179 | #: builtin/branch.c:604 |
ef317cd5 | 8180 | msgid "use colored output" |
07432cef | 8181 | msgstr "使用彩色输出" |
c04f5ac3 | 8182 | |
4c27fcb5 | 8183 | #: builtin/branch.c:605 |
ef317cd5 | 8184 | msgid "act on remote-tracking branches" |
07432cef | 8185 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 8186 | |
4c27fcb5 | 8187 | #: builtin/branch.c:607 builtin/branch.c:609 |
ef317cd5 | 8188 | msgid "print only branches that contain the commit" |
07432cef | 8189 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 8190 | |
4c27fcb5 | 8191 | #: builtin/branch.c:608 builtin/branch.c:610 |
87cb7997 JX |
8192 | msgid "print only branches that don't contain the commit" |
8193 | msgstr "只打印不包含该提交的分支" | |
8194 | ||
4c27fcb5 | 8195 | #: builtin/branch.c:613 |
ef317cd5 | 8196 | msgid "Specific git-branch actions:" |
07432cef | 8197 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 8198 | |
4c27fcb5 | 8199 | #: builtin/branch.c:614 |
ef317cd5 | 8200 | msgid "list both remote-tracking and local branches" |
07432cef | 8201 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 8202 | |
4c27fcb5 | 8203 | #: builtin/branch.c:616 |
ef317cd5 | 8204 | msgid "delete fully merged branch" |
07432cef | 8205 | msgstr "删除完全合并的分支" |
c04f5ac3 | 8206 | |
4c27fcb5 | 8207 | #: builtin/branch.c:617 |
ef317cd5 | 8208 | msgid "delete branch (even if not merged)" |
07432cef | 8209 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 8210 | |
4c27fcb5 | 8211 | #: builtin/branch.c:618 |
ef317cd5 | 8212 | msgid "move/rename a branch and its reflog" |
07432cef | 8213 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 8214 | |
4c27fcb5 | 8215 | #: builtin/branch.c:619 |
ef317cd5 | 8216 | msgid "move/rename a branch, even if target exists" |
07432cef | 8217 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 8218 | |
4c27fcb5 | 8219 | #: builtin/branch.c:620 |
6937cb4e JX |
8220 | msgid "copy a branch and its reflog" |
8221 | msgstr "拷贝一个分支和它的引用日志" | |
8222 | ||
4c27fcb5 | 8223 | #: builtin/branch.c:621 |
6937cb4e JX |
8224 | msgid "copy a branch, even if target exists" |
8225 | msgstr "拷贝一个分支,即使目标已存在" | |
8226 | ||
4c27fcb5 | 8227 | #: builtin/branch.c:622 |
ef317cd5 | 8228 | msgid "list branch names" |
07432cef | 8229 | msgstr "列出分支名" |
c04f5ac3 | 8230 | |
4c27fcb5 | 8231 | #: builtin/branch.c:623 |
ef317cd5 | 8232 | msgid "create the branch's reflog" |
07432cef | 8233 | msgstr "创建分支的引用日志" |
ef317cd5 | 8234 | |
4c27fcb5 | 8235 | #: builtin/branch.c:625 |
ef317cd5 | 8236 | msgid "edit the description for the branch" |
07432cef | 8237 | msgstr "标记分支的描述" |
ef317cd5 | 8238 | |
4c27fcb5 | 8239 | #: builtin/branch.c:626 |
04cb2f28 JX |
8240 | msgid "force creation, move/rename, deletion" |
8241 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 8242 | |
4c27fcb5 | 8243 | #: builtin/branch.c:627 |
94550ed3 JX |
8244 | msgid "print only branches that are merged" |
8245 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 8246 | |
4c27fcb5 | 8247 | #: builtin/branch.c:628 |
94550ed3 JX |
8248 | msgid "print only branches that are not merged" |
8249 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 8250 | |
4c27fcb5 | 8251 | #: builtin/branch.c:629 |
ef317cd5 | 8252 | msgid "list branches in columns" |
07432cef | 8253 | msgstr "以列的方式显示分支" |
ef317cd5 | 8254 | |
4c27fcb5 JX |
8255 | #: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 |
8256 | #: builtin/tag.c:415 | |
94550ed3 JX |
8257 | msgid "key" |
8258 | msgstr "key" | |
8259 | ||
4c27fcb5 JX |
8260 | #: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 |
8261 | #: builtin/tag.c:416 | |
94550ed3 JX |
8262 | msgid "field name to sort on" |
8263 | msgstr "排序的字段名" | |
8264 | ||
4c27fcb5 JX |
8265 | #: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 |
8266 | #: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581 | |
8267 | #: builtin/tag.c:418 | |
94550ed3 JX |
8268 | msgid "object" |
8269 | msgstr "对象" | |
8270 | ||
4c27fcb5 | 8271 | #: builtin/branch.c:634 |
94550ed3 JX |
8272 | msgid "print only branches of the object" |
8273 | msgstr "只打印指向该对象的分支" | |
8274 | ||
4c27fcb5 | 8275 | #: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 |
1a79b2f1 JX |
8276 | msgid "sorting and filtering are case insensitive" |
8277 | msgstr "排序和过滤属于大小写不敏感" | |
8278 | ||
4c27fcb5 | 8279 | #: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 |
a4f16749 | 8280 | #: builtin/verify-tag.c:39 |
87cb7997 JX |
8281 | msgid "format to use for the output" |
8282 | msgstr "输出格式" | |
8283 | ||
4c27fcb5 | 8284 | #: builtin/branch.c:660 builtin/clone.c:739 |
c04f5ac3 | 8285 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 8286 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 8287 | |
4c27fcb5 | 8288 | #: builtin/branch.c:683 |
8ada9598 | 8289 | msgid "--column and --verbose are incompatible" |
81809b99 | 8290 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 8291 | |
4c27fcb5 | 8292 | #: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 |
a77c07d9 JX |
8293 | msgid "branch name required" |
8294 | msgstr "必须提供分支名" | |
8295 | ||
4c27fcb5 | 8296 | #: builtin/branch.c:725 |
a77c07d9 JX |
8297 | msgid "Cannot give description to detached HEAD" |
8298 | msgstr "不能向分离头指针提供描述" | |
8299 | ||
4c27fcb5 | 8300 | #: builtin/branch.c:730 |
a77c07d9 JX |
8301 | msgid "cannot edit description of more than one branch" |
8302 | msgstr "不能为一个以上的分支编辑描述" | |
8303 | ||
4c27fcb5 | 8304 | #: builtin/branch.c:737 |
a77c07d9 JX |
8305 | #, c-format |
8306 | msgid "No commit on branch '%s' yet." | |
8307 | msgstr "分支 '%s' 尚无提交。" | |
8308 | ||
4c27fcb5 | 8309 | #: builtin/branch.c:740 |
a77c07d9 JX |
8310 | #, c-format |
8311 | msgid "No branch named '%s'." | |
8312 | msgstr "没有分支 '%s'。" | |
8313 | ||
4c27fcb5 | 8314 | #: builtin/branch.c:755 |
6937cb4e JX |
8315 | msgid "too many branches for a copy operation" |
8316 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 8317 | |
4c27fcb5 | 8318 | #: builtin/branch.c:764 |
6937cb4e JX |
8319 | msgid "too many arguments for a rename operation" |
8320 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 8321 | |
4c27fcb5 | 8322 | #: builtin/branch.c:769 |
6937cb4e JX |
8323 | msgid "too many arguments to set new upstream" |
8324 | msgstr "为设置新上游提供了太多的参数" | |
8325 | ||
4c27fcb5 | 8326 | #: builtin/branch.c:773 |
1003b3a5 JX |
8327 | #, c-format |
8328 | msgid "" | |
8329 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
8330 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
8331 | ||
4c27fcb5 | 8332 | #: builtin/branch.c:776 builtin/branch.c:798 |
1003b3a5 JX |
8333 | #, c-format |
8334 | msgid "no such branch '%s'" | |
8335 | msgstr "没有此分支 '%s'" | |
8336 | ||
4c27fcb5 | 8337 | #: builtin/branch.c:780 |
07432cef | 8338 | #, c-format |
ef317cd5 | 8339 | msgid "branch '%s' does not exist" |
07432cef | 8340 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 8341 | |
4c27fcb5 | 8342 | #: builtin/branch.c:792 |
6937cb4e JX |
8343 | msgid "too many arguments to unset upstream" |
8344 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 8345 | |
4c27fcb5 | 8346 | #: builtin/branch.c:796 |
1003b3a5 JX |
8347 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
8348 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
8349 | ||
4c27fcb5 | 8350 | #: builtin/branch.c:802 |
ef317cd5 JX |
8351 | #, c-format |
8352 | msgid "Branch '%s' has no upstream information" | |
07432cef | 8353 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 8354 | |
4c27fcb5 | 8355 | #: builtin/branch.c:812 |
c04f5ac3 JX |
8356 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
8357 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
8358 | ||
4c27fcb5 | 8359 | #: builtin/branch.c:815 |
ef317cd5 | 8360 | msgid "" |
6937cb4e JX |
8361 | "the '--set-upstream' option is no longer supported. Please use '--track' or " |
8362 | "'--set-upstream-to' instead." | |
ef317cd5 | 8363 | msgstr "" |
6937cb4e | 8364 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" |
ef317cd5 | 8365 | |
87cb7997 | 8366 | #: builtin/bundle.c:45 |
c04f5ac3 JX |
8367 | #, c-format |
8368 | msgid "%s is okay\n" | |
8369 | msgstr "%s 可以\n" | |
8370 | ||
87cb7997 | 8371 | #: builtin/bundle.c:58 |
c04f5ac3 | 8372 | msgid "Need a repository to create a bundle." |
160fb2b2 | 8373 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 8374 | |
87cb7997 | 8375 | #: builtin/bundle.c:62 |
c04f5ac3 | 8376 | msgid "Need a repository to unbundle." |
160fb2b2 | 8377 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 8378 | |
4c27fcb5 | 8379 | #: builtin/cat-file.c:587 |
7aea43ff | 8380 | msgid "" |
a0b6b246 JX |
8381 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
8382 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
8383 | msgstr "" |
8384 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
8385 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 8386 | |
4c27fcb5 | 8387 | #: builtin/cat-file.c:588 |
a0b6b246 JX |
8388 | msgid "" |
8389 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
8390 | "filters]" | |
275588f9 JX |
8391 | msgstr "" |
8392 | "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" | |
8393 | "filters]" | |
ef317cd5 | 8394 | |
4c27fcb5 JX |
8395 | #: builtin/cat-file.c:609 |
8396 | msgid "only one batch option may be specified" | |
8397 | msgstr "只能指定一个批处理选项" | |
8398 | ||
8399 | #: builtin/cat-file.c:627 | |
ef317cd5 | 8400 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 8401 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 8402 | |
4c27fcb5 | 8403 | #: builtin/cat-file.c:628 |
ef317cd5 | 8404 | msgid "show object type" |
07432cef | 8405 | msgstr "显示对象类型" |
ef317cd5 | 8406 | |
4c27fcb5 | 8407 | #: builtin/cat-file.c:629 |
ef317cd5 | 8408 | msgid "show object size" |
07432cef | 8409 | msgstr "显示对象大小" |
ef317cd5 | 8410 | |
4c27fcb5 | 8411 | #: builtin/cat-file.c:631 |
ef317cd5 | 8412 | msgid "exit with zero when there's no error" |
07432cef | 8413 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 8414 | |
4c27fcb5 | 8415 | #: builtin/cat-file.c:632 |
ef317cd5 | 8416 | msgid "pretty-print object's content" |
07432cef | 8417 | msgstr "美观地打印对象的内容" |
ef317cd5 | 8418 | |
4c27fcb5 | 8419 | #: builtin/cat-file.c:634 |
ef317cd5 | 8420 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
8421 | msgstr "对于数据对象,对其内容做文本转换" |
8422 | ||
4c27fcb5 | 8423 | #: builtin/cat-file.c:636 |
a0b6b246 JX |
8424 | msgid "for blob objects, run filters on object's content" |
8425 | msgstr "对于数据对象,对其内容做过滤" | |
8426 | ||
4c27fcb5 | 8427 | #: builtin/cat-file.c:637 git-submodule.sh:857 |
a0b6b246 JX |
8428 | msgid "blob" |
8429 | msgstr "数据对象" | |
8430 | ||
4c27fcb5 | 8431 | #: builtin/cat-file.c:638 |
a0b6b246 JX |
8432 | msgid "use a specific path for --textconv/--filters" |
8433 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 8434 | |
4c27fcb5 | 8435 | #: builtin/cat-file.c:640 |
7aea43ff JX |
8436 | msgid "allow -s and -t to work with broken/corrupt objects" |
8437 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
8438 | ||
4c27fcb5 | 8439 | #: builtin/cat-file.c:641 |
1b7f4a34 JX |
8440 | msgid "buffer --batch output" |
8441 | msgstr "缓冲 --batch 的输出" | |
8442 | ||
4c27fcb5 | 8443 | #: builtin/cat-file.c:643 |
ef317cd5 | 8444 | msgid "show info and content of objects fed from the standard input" |
07432cef | 8445 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 8446 | |
4c27fcb5 | 8447 | #: builtin/cat-file.c:647 |
ef317cd5 | 8448 | msgid "show info about objects fed from the standard input" |
07432cef | 8449 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 8450 | |
4c27fcb5 | 8451 | #: builtin/cat-file.c:651 |
7aea43ff JX |
8452 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
8453 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
8454 | ||
4c27fcb5 | 8455 | #: builtin/cat-file.c:653 |
1b7f4a34 JX |
8456 | msgid "show all objects with --batch or --batch-check" |
8457 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
8458 | ||
4c27fcb5 | 8459 | #: builtin/cat-file.c:655 |
c1ac5258 JX |
8460 | msgid "do not order --batch-all-objects output" |
8461 | msgstr "不要对 --batch-all-objects 的输出排序" | |
8462 | ||
a4f16749 | 8463 | #: builtin/check-attr.c:12 |
814ff314 JX |
8464 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
8465 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 8466 | |
a4f16749 | 8467 | #: builtin/check-attr.c:13 |
94550ed3 JX |
8468 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
8469 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 8470 | |
a4f16749 | 8471 | #: builtin/check-attr.c:20 |
ef317cd5 | 8472 | msgid "report all attributes set on file" |
07432cef | 8473 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 8474 | |
a4f16749 | 8475 | #: builtin/check-attr.c:21 |
ef317cd5 | 8476 | msgid "use .gitattributes only from the index" |
07432cef | 8477 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 8478 | |
c1ac5258 | 8479 | #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 |
ef317cd5 | 8480 | msgid "read file names from stdin" |
07432cef | 8481 | msgstr "从标准输入读出文件名" |
ef317cd5 | 8482 | |
a4f16749 | 8483 | #: builtin/check-attr.c:24 builtin/check-ignore.c:26 |
90314792 JX |
8484 | msgid "terminate input and output records by a NUL character" |
8485 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 8486 | |
4c27fcb5 JX |
8487 | #: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517 |
8488 | #: builtin/worktree.c:495 | |
a77c07d9 JX |
8489 | msgid "suppress progress reporting" |
8490 | msgstr "不显示进度报告" | |
8491 | ||
a4f16749 | 8492 | #: builtin/check-ignore.c:28 |
2e8451e8 JX |
8493 | msgid "show non-matching input paths" |
8494 | msgstr "显示未匹配的输入路径" | |
8495 | ||
a4f16749 | 8496 | #: builtin/check-ignore.c:30 |
90314792 JX |
8497 | msgid "ignore index when checking" |
8498 | msgstr "检查时忽略索引" | |
8499 | ||
31e5e17b | 8500 | #: builtin/check-ignore.c:159 |
a77c07d9 | 8501 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 8502 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 8503 | |
31e5e17b | 8504 | #: builtin/check-ignore.c:162 |
a77c07d9 JX |
8505 | msgid "-z only makes sense with --stdin" |
8506 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
8507 | ||
31e5e17b | 8508 | #: builtin/check-ignore.c:164 |
a77c07d9 JX |
8509 | msgid "no path specified" |
8510 | msgstr "未指定路径" | |
8511 | ||
31e5e17b | 8512 | #: builtin/check-ignore.c:168 |
a77c07d9 JX |
8513 | msgid "--quiet is only valid with a single pathname" |
8514 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
8515 | ||
31e5e17b | 8516 | #: builtin/check-ignore.c:170 |
a77c07d9 JX |
8517 | msgid "cannot have both --quiet and --verbose" |
8518 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
8519 | ||
31e5e17b | 8520 | #: builtin/check-ignore.c:173 |
2e8451e8 JX |
8521 | msgid "--non-matching is only valid with --verbose" |
8522 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
8523 | ||
a4f16749 | 8524 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
8525 | msgid "git check-mailmap [<options>] <contact>..." |
8526 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 8527 | |
a4f16749 | 8528 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
8529 | msgid "also read contacts from stdin" |
8530 | msgstr "还从标准输入读取联系地址" | |
8531 | ||
a4f16749 | 8532 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
8533 | #, c-format |
8534 | msgid "unable to parse contact: %s" | |
8535 | msgstr "不能解析联系地址:%s" | |
8536 | ||
a4f16749 | 8537 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
8538 | msgid "no contacts specified" |
8539 | msgstr "未指定联系地址" | |
8540 | ||
a4f16749 | 8541 | #: builtin/checkout-index.c:128 |
814ff314 JX |
8542 | msgid "git checkout-index [<options>] [--] [<file>...]" |
8543 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 8544 | |
4c27fcb5 | 8545 | #: builtin/checkout-index.c:145 |
276ceeaa JX |
8546 | msgid "stage should be between 1 and 3 or all" |
8547 | msgstr "索引值应该取值 1 到 3 或者 all" | |
8548 | ||
4c27fcb5 | 8549 | #: builtin/checkout-index.c:161 |
ef317cd5 | 8550 | msgid "check out all files in the index" |
07432cef | 8551 | msgstr "检出索引区的所有文件" |
ef317cd5 | 8552 | |
4c27fcb5 | 8553 | #: builtin/checkout-index.c:162 |
ef317cd5 | 8554 | msgid "force overwrite of existing files" |
07432cef | 8555 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 8556 | |
4c27fcb5 | 8557 | #: builtin/checkout-index.c:164 |
ef317cd5 | 8558 | msgid "no warning for existing files and files not in index" |
07432cef | 8559 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 8560 | |
4c27fcb5 | 8561 | #: builtin/checkout-index.c:166 |
ef317cd5 | 8562 | msgid "don't checkout new files" |
07432cef | 8563 | msgstr "不检出新文件" |
ef317cd5 | 8564 | |
4c27fcb5 | 8565 | #: builtin/checkout-index.c:168 |
ef317cd5 | 8566 | msgid "update stat information in the index file" |
07432cef | 8567 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 8568 | |
4c27fcb5 | 8569 | #: builtin/checkout-index.c:172 |
ef317cd5 | 8570 | msgid "read list of paths from the standard input" |
07432cef | 8571 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 8572 | |
4c27fcb5 | 8573 | #: builtin/checkout-index.c:174 |
ef317cd5 | 8574 | msgid "write the content to temporary files" |
07432cef | 8575 | msgstr "将内容写入临时文件" |
ef317cd5 | 8576 | |
4c27fcb5 JX |
8577 | #: builtin/checkout-index.c:175 builtin/column.c:31 |
8578 | #: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371 | |
8579 | #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853 | |
8580 | #: builtin/worktree.c:668 | |
ef317cd5 | 8581 | msgid "string" |
07432cef | 8582 | msgstr "字符串" |
ef317cd5 | 8583 | |
4c27fcb5 | 8584 | #: builtin/checkout-index.c:176 |
ef317cd5 | 8585 | msgid "when creating files, prepend <string>" |
4375c10e | 8586 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 8587 | |
4c27fcb5 | 8588 | #: builtin/checkout-index.c:178 |
ef317cd5 | 8589 | msgid "copy out the files from named stage" |
07432cef | 8590 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 8591 | |
4c27fcb5 | 8592 | #: builtin/checkout.c:31 |
814ff314 JX |
8593 | msgid "git checkout [<options>] <branch>" |
8594 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 8595 | |
4c27fcb5 | 8596 | #: builtin/checkout.c:32 |
814ff314 JX |
8597 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
8598 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 8599 | |
4c27fcb5 | 8600 | #: builtin/checkout.c:144 builtin/checkout.c:177 |
c04f5ac3 JX |
8601 | #, c-format |
8602 | msgid "path '%s' does not have our version" | |
8603 | msgstr "路径 '%s' 没有我们的版本" | |
8604 | ||
4c27fcb5 | 8605 | #: builtin/checkout.c:146 builtin/checkout.c:179 |
c04f5ac3 JX |
8606 | #, c-format |
8607 | msgid "path '%s' does not have their version" | |
8608 | msgstr "路径 '%s' 没有他们的版本" | |
8609 | ||
4c27fcb5 | 8610 | #: builtin/checkout.c:162 |
c04f5ac3 JX |
8611 | #, c-format |
8612 | msgid "path '%s' does not have all necessary versions" | |
e640d114 | 8613 | msgstr "路径 '%s' 没有全部必需的版本" |
c04f5ac3 | 8614 | |
4c27fcb5 | 8615 | #: builtin/checkout.c:206 |
c04f5ac3 JX |
8616 | #, c-format |
8617 | msgid "path '%s' does not have necessary versions" | |
e640d114 | 8618 | msgstr "路径 '%s' 没有必需的版本" |
c04f5ac3 | 8619 | |
4c27fcb5 | 8620 | #: builtin/checkout.c:224 |
c04f5ac3 JX |
8621 | #, c-format |
8622 | msgid "path '%s': cannot merge" | |
90e6ef53 | 8623 | msgstr "path '%s':无法合并" |
c04f5ac3 | 8624 | |
4c27fcb5 | 8625 | #: builtin/checkout.c:240 |
c04f5ac3 JX |
8626 | #, c-format |
8627 | msgid "Unable to add merge result for '%s'" | |
8628 | msgstr "无法为 '%s' 添加合并结果" | |
8629 | ||
4c27fcb5 JX |
8630 | #: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268 |
8631 | #: builtin/checkout.c:271 | |
07432cef | 8632 | #, c-format |
ef317cd5 | 8633 | msgid "'%s' cannot be used with updating paths" |
07432cef | 8634 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 8635 | |
4c27fcb5 | 8636 | #: builtin/checkout.c:274 builtin/checkout.c:277 |
07432cef | 8637 | #, c-format |
ef317cd5 | 8638 | msgid "'%s' cannot be used with %s" |
07432cef | 8639 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 8640 | |
4c27fcb5 | 8641 | #: builtin/checkout.c:280 |
ef317cd5 JX |
8642 | #, c-format |
8643 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 8644 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 8645 | |
4c27fcb5 | 8646 | #: builtin/checkout.c:349 builtin/checkout.c:356 |
c04f5ac3 JX |
8647 | #, c-format |
8648 | msgid "path '%s' is unmerged" | |
8649 | msgstr "路径 '%s' 未合并" | |
8650 | ||
4c27fcb5 | 8651 | #: builtin/checkout.c:608 |
c04f5ac3 | 8652 | msgid "you need to resolve your current index first" |
90e6ef53 | 8653 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 8654 | |
4c27fcb5 | 8655 | #: builtin/checkout.c:745 |
c04f5ac3 | 8656 | #, c-format |
1b7f4a34 JX |
8657 | msgid "Can not do reflog for '%s': %s\n" |
8658 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 8659 | |
4c27fcb5 | 8660 | #: builtin/checkout.c:786 |
c04f5ac3 JX |
8661 | msgid "HEAD is now at" |
8662 | msgstr "HEAD 目前位于" | |
8663 | ||
4c27fcb5 | 8664 | #: builtin/checkout.c:790 builtin/clone.c:692 |
3495628d JX |
8665 | msgid "unable to update HEAD" |
8666 | msgstr "不能更新 HEAD" | |
8667 | ||
4c27fcb5 | 8668 | #: builtin/checkout.c:794 |
c04f5ac3 JX |
8669 | #, c-format |
8670 | msgid "Reset branch '%s'\n" | |
8671 | msgstr "重置分支 '%s'\n" | |
8672 | ||
4c27fcb5 | 8673 | #: builtin/checkout.c:797 |
c04f5ac3 JX |
8674 | #, c-format |
8675 | msgid "Already on '%s'\n" | |
8676 | msgstr "已经位于 '%s'\n" | |
8677 | ||
4c27fcb5 | 8678 | #: builtin/checkout.c:801 |
c04f5ac3 JX |
8679 | #, c-format |
8680 | msgid "Switched to and reset branch '%s'\n" | |
8681 | msgstr "切换并重置分支 '%s'\n" | |
8682 | ||
4c27fcb5 | 8683 | #: builtin/checkout.c:803 builtin/checkout.c:1166 |
c04f5ac3 JX |
8684 | #, c-format |
8685 | msgid "Switched to a new branch '%s'\n" | |
8686 | msgstr "切换到一个新分支 '%s'\n" | |
8687 | ||
4c27fcb5 | 8688 | #: builtin/checkout.c:805 |
c04f5ac3 JX |
8689 | #, c-format |
8690 | msgid "Switched to branch '%s'\n" | |
8691 | msgstr "切换到分支 '%s'\n" | |
8692 | ||
90e6ef53 | 8693 | # 译者:注意保持前导空格 |
4c27fcb5 | 8694 | #: builtin/checkout.c:856 |
c04f5ac3 JX |
8695 | #, c-format |
8696 | msgid " ... and %d more.\n" | |
90e6ef53 | 8697 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 8698 | |
4c27fcb5 | 8699 | #: builtin/checkout.c:862 |
c04f5ac3 JX |
8700 | #, c-format |
8701 | msgid "" | |
8702 | "Warning: you are leaving %d commit behind, not connected to\n" | |
8703 | "any of your branches:\n" | |
8704 | "\n" | |
8705 | "%s\n" | |
8706 | msgid_plural "" | |
8707 | "Warning: you are leaving %d commits behind, not connected to\n" | |
8708 | "any of your branches:\n" | |
8709 | "\n" | |
8710 | "%s\n" | |
8711 | msgstr[0] "" | |
8712 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
8713 | "\n" | |
8714 | "%s\n" | |
5ae481e0 JX |
8715 | msgstr[1] "" |
8716 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
8717 | "\n" | |
8718 | "%s\n" | |
c04f5ac3 | 8719 | |
4c27fcb5 | 8720 | #: builtin/checkout.c:881 |
c04f5ac3 JX |
8721 | #, c-format |
8722 | msgid "" | |
7aea43ff JX |
8723 | "If you want to keep it by creating a new branch, this may be a good time\n" |
8724 | "to do so with:\n" | |
8725 | "\n" | |
8726 | " git branch <new-branch-name> %s\n" | |
8727 | "\n" | |
8728 | msgid_plural "" | |
c04f5ac3 JX |
8729 | "If you want to keep them by creating a new branch, this may be a good time\n" |
8730 | "to do so with:\n" | |
8731 | "\n" | |
814ff314 | 8732 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 8733 | "\n" |
7aea43ff JX |
8734 | msgstr[0] "" |
8735 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
8736 | "如下操作:\n" | |
8737 | "\n" | |
8738 | " git branch <新分支名> %s\n" | |
8739 | "\n" | |
8740 | msgstr[1] "" | |
8741 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
8742 | "如下操作:\n" |
8743 | "\n" | |
814ff314 | 8744 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
8745 | "\n" |
8746 | ||
4c27fcb5 | 8747 | #: builtin/checkout.c:913 |
c04f5ac3 JX |
8748 | msgid "internal error in revision walk" |
8749 | msgstr "在版本遍历时遇到内部错误" | |
8750 | ||
4c27fcb5 | 8751 | #: builtin/checkout.c:917 |
c04f5ac3 JX |
8752 | msgid "Previous HEAD position was" |
8753 | msgstr "之前的 HEAD 位置是" | |
8754 | ||
4c27fcb5 | 8755 | #: builtin/checkout.c:945 builtin/checkout.c:1161 |
c04f5ac3 | 8756 | msgid "You are on a branch yet to be born" |
90e6ef53 | 8757 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 8758 | |
4c27fcb5 | 8759 | #: builtin/checkout.c:1066 |
90314792 JX |
8760 | #, c-format |
8761 | msgid "only one reference expected, %d given." | |
a0b6b246 | 8762 | msgstr "应只有一个引用,却给出了 %d 个" |
90314792 | 8763 | |
4c27fcb5 | 8764 | #: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444 |
c04f5ac3 JX |
8765 | #, c-format |
8766 | msgid "invalid reference: %s" | |
8767 | msgstr "无效引用:%s" | |
8768 | ||
4c27fcb5 | 8769 | #: builtin/checkout.c:1136 |
c04f5ac3 JX |
8770 | #, c-format |
8771 | msgid "reference is not a tree: %s" | |
8772 | msgstr "引用不是一个树:%s" | |
8773 | ||
4c27fcb5 | 8774 | #: builtin/checkout.c:1175 |
ef317cd5 | 8775 | msgid "paths cannot be used with switching branches" |
07432cef | 8776 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 8777 | |
4c27fcb5 | 8778 | #: builtin/checkout.c:1178 builtin/checkout.c:1182 |
07432cef | 8779 | #, c-format |
ef317cd5 | 8780 | msgid "'%s' cannot be used with switching branches" |
07432cef | 8781 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 8782 | |
4c27fcb5 JX |
8783 | #: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194 |
8784 | #: builtin/checkout.c:1197 | |
07432cef | 8785 | #, c-format |
ef317cd5 | 8786 | msgid "'%s' cannot be used with '%s'" |
07432cef | 8787 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 8788 | |
4c27fcb5 | 8789 | #: builtin/checkout.c:1202 |
07432cef | 8790 | #, c-format |
ef317cd5 | 8791 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 8792 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 8793 | |
4c27fcb5 JX |
8794 | #: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119 |
8795 | #: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488 | |
8796 | #: builtin/worktree.c:490 | |
ef317cd5 | 8797 | msgid "branch" |
07432cef | 8798 | msgstr "分支" |
c04f5ac3 | 8799 | |
4c27fcb5 | 8800 | #: builtin/checkout.c:1236 |
ef317cd5 | 8801 | msgid "create and checkout a new branch" |
07432cef | 8802 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 8803 | |
4c27fcb5 | 8804 | #: builtin/checkout.c:1238 |
ef317cd5 | 8805 | msgid "create/reset and checkout a branch" |
07432cef | 8806 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 8807 | |
4c27fcb5 | 8808 | #: builtin/checkout.c:1239 |
ef317cd5 | 8809 | msgid "create reflog for new branch" |
07432cef | 8810 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 8811 | |
4c27fcb5 | 8812 | #: builtin/checkout.c:1240 builtin/worktree.c:492 |
5c57d762 JX |
8813 | msgid "detach HEAD at named commit" |
8814 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 8815 | |
4c27fcb5 | 8816 | #: builtin/checkout.c:1241 |
ef317cd5 | 8817 | msgid "set upstream info for new branch" |
07432cef | 8818 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 8819 | |
4c27fcb5 | 8820 | #: builtin/checkout.c:1243 |
6c94aba5 | 8821 | msgid "new-branch" |
07432cef | 8822 | msgstr "新分支" |
ef317cd5 | 8823 | |
4c27fcb5 | 8824 | #: builtin/checkout.c:1243 |
ef317cd5 | 8825 | msgid "new unparented branch" |
07432cef | 8826 | msgstr "新的没有父提交的分支" |
ef317cd5 | 8827 | |
4c27fcb5 | 8828 | #: builtin/checkout.c:1245 |
ef317cd5 | 8829 | msgid "checkout our version for unmerged files" |
07432cef | 8830 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 8831 | |
4c27fcb5 | 8832 | #: builtin/checkout.c:1248 |
ef317cd5 | 8833 | msgid "checkout their version for unmerged files" |
07432cef | 8834 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 8835 | |
4c27fcb5 | 8836 | #: builtin/checkout.c:1250 |
ef317cd5 | 8837 | msgid "force checkout (throw away local modifications)" |
07432cef | 8838 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 8839 | |
4c27fcb5 | 8840 | #: builtin/checkout.c:1252 |
ef317cd5 | 8841 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 8842 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 8843 | |
4c27fcb5 | 8844 | #: builtin/checkout.c:1254 builtin/merge.c:275 |
ef317cd5 | 8845 | msgid "update ignored files (default)" |
07432cef | 8846 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 8847 | |
4c27fcb5 | 8848 | #: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274 |
ef317cd5 | 8849 | msgid "style" |
07432cef | 8850 | msgstr "风格" |
ef317cd5 | 8851 | |
4c27fcb5 | 8852 | #: builtin/checkout.c:1257 |
ef317cd5 | 8853 | msgid "conflict style (merge or diff3)" |
07432cef | 8854 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 8855 | |
4c27fcb5 | 8856 | #: builtin/checkout.c:1260 |
4dcdc3d8 JX |
8857 | msgid "do not limit pathspecs to sparse entries only" |
8858 | msgstr "对路径不做稀疏检出的限制" | |
8859 | ||
4c27fcb5 | 8860 | #: builtin/checkout.c:1262 |
814ff314 JX |
8861 | msgid "second guess 'git checkout <no-such-branch>'" |
8862 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 8863 | |
4c27fcb5 | 8864 | #: builtin/checkout.c:1264 |
7aea43ff JX |
8865 | msgid "do not check if another worktree is holding the given ref" |
8866 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
8867 | ||
4c27fcb5 JX |
8868 | #: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141 |
8869 | #: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572 | |
fd8cb379 | 8870 | #: builtin/send-pack.c:174 |
94550ed3 JX |
8871 | msgid "force progress reporting" |
8872 | msgstr "强制显示进度报告" | |
8873 | ||
4c27fcb5 | 8874 | #: builtin/checkout.c:1298 |
ef317cd5 | 8875 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 8876 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 8877 | |
4c27fcb5 | 8878 | #: builtin/checkout.c:1315 |
ef317cd5 JX |
8879 | msgid "--track needs a branch name" |
8880 | msgstr "--track 需要一个分支名" | |
8881 | ||
4c27fcb5 | 8882 | #: builtin/checkout.c:1320 |
c1ac5258 JX |
8883 | msgid "missing branch name; try -b" |
8884 | msgstr "缺少分支名,尝试 -b" | |
ef317cd5 | 8885 | |
4c27fcb5 | 8886 | #: builtin/checkout.c:1357 |
c04f5ac3 | 8887 | msgid "invalid path specification" |
90e6ef53 | 8888 | msgstr "无效的路径规格" |
c04f5ac3 | 8889 | |
4c27fcb5 | 8890 | #: builtin/checkout.c:1364 |
07432cef | 8891 | #, c-format |
a4f16749 JX |
8892 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
8893 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 8894 | |
4c27fcb5 | 8895 | #: builtin/checkout.c:1368 |
07432cef | 8896 | #, c-format |
ef317cd5 | 8897 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 8898 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 8899 | |
4c27fcb5 | 8900 | #: builtin/checkout.c:1372 |
c04f5ac3 JX |
8901 | msgid "" |
8902 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
8903 | "checking out of the index." | |
8904 | msgstr "" | |
90e6ef53 | 8905 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 8906 | |
4c27fcb5 | 8907 | #: builtin/checkout.c:1392 |
c1ac5258 JX |
8908 | #, c-format |
8909 | msgid "" | |
8910 | "'%s' matched more than one remote tracking branch.\n" | |
8911 | "We found %d remotes with a reference that matched. So we fell back\n" | |
8912 | "on trying to resolve the argument as a path, but failed there too!\n" | |
8913 | "\n" | |
8914 | "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" | |
8915 | "you can do so by fully qualifying the name with the --track option:\n" | |
8916 | "\n" | |
8917 | " git checkout --track origin/<name>\n" | |
8918 | "\n" | |
8919 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
8920 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
8921 | "checkout.defaultRemote=origin in your config." | |
8922 | msgstr "" | |
8923 | "'%s' 匹配了一个以上的远程跟踪分支。\n" | |
8924 | "我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n" | |
8925 | "路径,但是也失败了!\n" | |
8926 | "\n" | |
8927 | "如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n" | |
8928 | "使用分支全名和 --track 选项:\n" | |
8929 | "\n" | |
8930 | " git checkout --track origin/<name>\n" | |
8931 | "\n" | |
8932 | "如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n" | |
8933 | "仓库名,可以在配置中设置 checkout.defaultRemote=origin。" | |
8934 | ||
8935 | #: builtin/clean.c:27 | |
2e8451e8 JX |
8936 | msgid "" |
8937 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
8938 | msgstr "" | |
8939 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 8940 | |
c1ac5258 | 8941 | #: builtin/clean.c:31 |
07432cef WS |
8942 | #, c-format |
8943 | msgid "Removing %s\n" | |
8944 | msgstr "正删除 %s\n" | |
8945 | ||
c1ac5258 | 8946 | #: builtin/clean.c:32 |
07432cef WS |
8947 | #, c-format |
8948 | msgid "Would remove %s\n" | |
8949 | msgstr "将删除 %s\n" | |
8950 | ||
c1ac5258 | 8951 | #: builtin/clean.c:33 |
07432cef WS |
8952 | #, c-format |
8953 | msgid "Skipping repository %s\n" | |
160fb2b2 | 8954 | msgstr "忽略仓库 %s\n" |
07432cef | 8955 | |
c1ac5258 | 8956 | #: builtin/clean.c:34 |
07432cef WS |
8957 | #, c-format |
8958 | msgid "Would skip repository %s\n" | |
160fb2b2 | 8959 | msgstr "将忽略仓库 %s\n" |
07432cef | 8960 | |
c1ac5258 | 8961 | #: builtin/clean.c:35 |
07432cef WS |
8962 | #, c-format |
8963 | msgid "failed to remove %s" | |
c1ac5258 | 8964 | msgstr "删除 %s 失败" |
07432cef | 8965 | |
4c27fcb5 | 8966 | #: builtin/clean.c:298 git-add--interactive.perl:579 |
1a79b2f1 | 8967 | #, c-format |
2e8451e8 JX |
8968 | msgid "" |
8969 | "Prompt help:\n" | |
8970 | "1 - select a numbered item\n" | |
8971 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 8972 | " - (empty) select nothing\n" |
2e8451e8 JX |
8973 | msgstr "" |
8974 | "帮助:\n" | |
8975 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
8976 | "foo - 通过唯一前缀选择一个选项\n" |
8977 | " - (空)什么也不选择\n" | |
2e8451e8 | 8978 | |
4c27fcb5 | 8979 | #: builtin/clean.c:302 git-add--interactive.perl:588 |
1a79b2f1 | 8980 | #, c-format |
2e8451e8 JX |
8981 | msgid "" |
8982 | "Prompt help:\n" | |
8983 | "1 - select a single item\n" | |
8984 | "3-5 - select a range of items\n" | |
8985 | "2-3,6-9 - select multiple ranges\n" | |
8986 | "foo - select item based on unique prefix\n" | |
8987 | "-... - unselect specified items\n" | |
8988 | "* - choose all items\n" | |
1a79b2f1 | 8989 | " - (empty) finish selecting\n" |
2e8451e8 JX |
8990 | msgstr "" |
8991 | "帮助:\n" | |
8992 | "1 - 选择一个选项\n" | |
8993 | "3-5 - 选择一个范围内的所有选项\n" | |
8994 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 8995 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
8996 | "-... - 反选特定的选项\n" |
8997 | "* - 选择所有选项\n" | |
1a79b2f1 | 8998 | " - (空)结束选择\n" |
2e8451e8 | 8999 | |
4c27fcb5 | 9000 | #: builtin/clean.c:518 git-add--interactive.perl:554 |
fd8cb379 | 9001 | #: git-add--interactive.perl:559 |
1a79b2f1 JX |
9002 | #, c-format, perl-format |
9003 | msgid "Huh (%s)?\n" | |
9004 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 9005 | |
4c27fcb5 | 9006 | #: builtin/clean.c:660 |
2e8451e8 JX |
9007 | #, c-format |
9008 | msgid "Input ignore patterns>> " | |
9009 | msgstr "输入模版以排除条目>> " | |
9010 | ||
4c27fcb5 | 9011 | #: builtin/clean.c:697 |
2e8451e8 JX |
9012 | #, c-format |
9013 | msgid "WARNING: Cannot find items matched by: %s" | |
9014 | msgstr "警告:无法找到和 %s 匹配的条目" | |
9015 | ||
4c27fcb5 | 9016 | #: builtin/clean.c:718 |
2e8451e8 JX |
9017 | msgid "Select items to delete" |
9018 | msgstr "选择要删除的条目" | |
9019 | ||
814ff314 | 9020 | #. TRANSLATORS: Make sure to keep [y/N] as is |
4c27fcb5 | 9021 | #: builtin/clean.c:759 |
2e8451e8 | 9022 | #, c-format |
814ff314 JX |
9023 | msgid "Remove %s [y/N]? " |
9024 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 9025 | |
4c27fcb5 | 9026 | #: builtin/clean.c:784 git-add--interactive.perl:1717 |
1a79b2f1 JX |
9027 | #, c-format |
9028 | msgid "Bye.\n" | |
9029 | msgstr "再见。\n" | |
2e8451e8 | 9030 | |
4c27fcb5 | 9031 | #: builtin/clean.c:792 |
2e8451e8 JX |
9032 | msgid "" |
9033 | "clean - start cleaning\n" | |
9034 | "filter by pattern - exclude items from deletion\n" | |
9035 | "select by numbers - select items to be deleted by numbers\n" | |
9036 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
9037 | "quit - stop cleaning\n" | |
9038 | "help - this screen\n" | |
9039 | "? - help for prompt selection" | |
9040 | msgstr "" | |
9041 | "clean - 开始清理\n" | |
9042 | "filter by pattern - 通过模版排除要删除的条目\n" | |
9043 | "select by numbers - 通过数字选择要删除的条目\n" | |
9044 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
9045 | "quit - 停止删除并退出\n" | |
9046 | "help - 显示本帮助\n" | |
9047 | "? - 显示如何在提示符下选择的帮助" | |
9048 | ||
4c27fcb5 | 9049 | #: builtin/clean.c:819 git-add--interactive.perl:1793 |
2e8451e8 JX |
9050 | msgid "*** Commands ***" |
9051 | msgstr "*** 命令 ***" | |
9052 | ||
4c27fcb5 | 9053 | #: builtin/clean.c:820 git-add--interactive.perl:1790 |
2e8451e8 JX |
9054 | msgid "What now" |
9055 | msgstr "请选择" | |
9056 | ||
4c27fcb5 | 9057 | #: builtin/clean.c:828 |
2e8451e8 JX |
9058 | msgid "Would remove the following item:" |
9059 | msgid_plural "Would remove the following items:" | |
9060 | msgstr[0] "将删除如下条目:" | |
9061 | msgstr[1] "将删除如下条目:" | |
9062 | ||
4c27fcb5 | 9063 | #: builtin/clean.c:844 |
2e8451e8 JX |
9064 | msgid "No more files to clean, exiting." |
9065 | msgstr "没有要清理的文件,退出。" | |
9066 | ||
4c27fcb5 | 9067 | #: builtin/clean.c:906 |
ef317cd5 | 9068 | msgid "do not print names of files removed" |
07432cef | 9069 | msgstr "不打印删除文件的名称" |
ef317cd5 | 9070 | |
4c27fcb5 | 9071 | #: builtin/clean.c:908 |
ef317cd5 | 9072 | msgid "force" |
07432cef | 9073 | msgstr "强制" |
ef317cd5 | 9074 | |
4c27fcb5 | 9075 | #: builtin/clean.c:909 |
2e8451e8 JX |
9076 | msgid "interactive cleaning" |
9077 | msgstr "交互式清除" | |
9078 | ||
4c27fcb5 | 9079 | #: builtin/clean.c:911 |
ef317cd5 | 9080 | msgid "remove whole directories" |
07432cef | 9081 | msgstr "删除整个目录" |
ef317cd5 | 9082 | |
4c27fcb5 JX |
9083 | #: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547 |
9084 | #: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168 | |
9085 | #: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417 | |
9086 | #: builtin/show-ref.c:178 | |
ef317cd5 | 9087 | msgid "pattern" |
07432cef | 9088 | msgstr "模式" |
ef317cd5 | 9089 | |
4c27fcb5 | 9090 | #: builtin/clean.c:913 |
ef317cd5 | 9091 | msgid "add <pattern> to ignore rules" |
4375c10e | 9092 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 9093 | |
4c27fcb5 | 9094 | #: builtin/clean.c:914 |
ef317cd5 | 9095 | msgid "remove ignored files, too" |
07432cef | 9096 | msgstr "也删除忽略的文件" |
ef317cd5 | 9097 | |
4c27fcb5 | 9098 | #: builtin/clean.c:916 |
ef317cd5 | 9099 | msgid "remove only ignored files" |
07432cef | 9100 | msgstr "只删除忽略的文件" |
c04f5ac3 | 9101 | |
4c27fcb5 | 9102 | #: builtin/clean.c:934 |
c04f5ac3 | 9103 | msgid "-x and -X cannot be used together" |
649900bc | 9104 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 9105 | |
4c27fcb5 | 9106 | #: builtin/clean.c:938 |
c04f5ac3 | 9107 | msgid "" |
6c94aba5 | 9108 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 9109 | "clean" |
c04f5ac3 | 9110 | msgstr "" |
2e8451e8 | 9111 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 9112 | |
4c27fcb5 | 9113 | #: builtin/clean.c:941 |
c04f5ac3 | 9114 | msgid "" |
6c94aba5 | 9115 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 9116 | "refusing to clean" |
c04f5ac3 | 9117 | msgstr "" |
2e8451e8 | 9118 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 9119 | |
c1ac5258 | 9120 | #: builtin/clone.c:43 |
814ff314 | 9121 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 9122 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 9123 | |
c1ac5258 | 9124 | #: builtin/clone.c:88 |
ef317cd5 | 9125 | msgid "don't create a checkout" |
07432cef | 9126 | msgstr "不创建一个检出" |
ef317cd5 | 9127 | |
4c27fcb5 | 9128 | #: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481 |
ef317cd5 | 9129 | msgid "create a bare repository" |
160fb2b2 | 9130 | msgstr "创建一个纯仓库" |
ef317cd5 | 9131 | |
c1ac5258 | 9132 | #: builtin/clone.c:93 |
ef317cd5 | 9133 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 9134 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 9135 | |
c1ac5258 | 9136 | #: builtin/clone.c:95 |
ef317cd5 | 9137 | msgid "to clone from a local repository" |
160fb2b2 | 9138 | msgstr "从本地仓库克隆" |
ef317cd5 | 9139 | |
c1ac5258 | 9140 | #: builtin/clone.c:97 |
ef317cd5 | 9141 | msgid "don't use local hardlinks, always copy" |
07432cef | 9142 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 9143 | |
c1ac5258 | 9144 | #: builtin/clone.c:99 |
ef317cd5 | 9145 | msgid "setup as shared repository" |
160fb2b2 | 9146 | msgstr "设置为共享仓库" |
ef317cd5 | 9147 | |
c1ac5258 | 9148 | #: builtin/clone.c:101 builtin/clone.c:105 |
87cb7997 | 9149 | msgid "pathspec" |
65e2041e | 9150 | msgstr "路径规格" |
87cb7997 | 9151 | |
c1ac5258 | 9152 | #: builtin/clone.c:101 builtin/clone.c:105 |
ef317cd5 | 9153 | msgid "initialize submodules in the clone" |
07432cef | 9154 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 9155 | |
c1ac5258 | 9156 | #: builtin/clone.c:108 |
5b04ee3b JX |
9157 | msgid "number of submodules cloned in parallel" |
9158 | msgstr "并发克隆的子模组的数量" | |
9159 | ||
4c27fcb5 | 9160 | #: builtin/clone.c:109 builtin/init-db.c:478 |
ef317cd5 | 9161 | msgid "template-directory" |
07432cef | 9162 | msgstr "模板目录" |
ef317cd5 | 9163 | |
4c27fcb5 | 9164 | #: builtin/clone.c:110 builtin/init-db.c:479 |
ef317cd5 | 9165 | msgid "directory from which templates will be used" |
07432cef | 9166 | msgstr "模板目录将被使用" |
ef317cd5 | 9167 | |
4c27fcb5 JX |
9168 | #: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375 |
9169 | #: builtin/submodule--helper.c:1856 | |
ef317cd5 | 9170 | msgid "reference repository" |
160fb2b2 | 9171 | msgstr "参考仓库" |
ef317cd5 | 9172 | |
4c27fcb5 JX |
9173 | #: builtin/clone.c:116 builtin/submodule--helper.c:1377 |
9174 | #: builtin/submodule--helper.c:1858 | |
7aea43ff | 9175 | msgid "use --reference only while cloning" |
160fb2b2 | 9176 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 9177 | |
4c27fcb5 JX |
9178 | #: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46 |
9179 | #: builtin/pack-objects.c:3301 builtin/repack.c:329 | |
ef317cd5 | 9180 | msgid "name" |
07432cef | 9181 | msgstr "名称" |
ef317cd5 | 9182 | |
c1ac5258 | 9183 | #: builtin/clone.c:118 |
ef317cd5 | 9184 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 9185 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 9186 | |
c1ac5258 | 9187 | #: builtin/clone.c:120 |
ef317cd5 | 9188 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 9189 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 9190 | |
c1ac5258 | 9191 | #: builtin/clone.c:122 |
ef317cd5 | 9192 | msgid "path to git-upload-pack on the remote" |
07432cef | 9193 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 9194 | |
4c27fcb5 JX |
9195 | #: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825 |
9196 | #: builtin/pull.c:217 | |
ef317cd5 | 9197 | msgid "depth" |
07432cef | 9198 | msgstr "深度" |
ef317cd5 | 9199 | |
c1ac5258 | 9200 | #: builtin/clone.c:124 |
ef317cd5 | 9201 | msgid "create a shallow clone of that depth" |
07432cef | 9202 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 9203 | |
4c27fcb5 | 9204 | #: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292 |
a0b6b246 JX |
9205 | msgid "time" |
9206 | msgstr "时间" | |
9207 | ||
c1ac5258 | 9208 | #: builtin/clone.c:126 |
a0b6b246 JX |
9209 | msgid "create a shallow clone since a specific time" |
9210 | msgstr "从一个特定时间创建一个浅克隆" | |
9211 | ||
4c27fcb5 JX |
9212 | #: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169 |
9213 | #: builtin/rebase.c:831 | |
a0b6b246 JX |
9214 | msgid "revision" |
9215 | msgstr "版本" | |
9216 | ||
4c27fcb5 | 9217 | #: builtin/clone.c:128 builtin/fetch.c:147 |
1a79b2f1 JX |
9218 | msgid "deepen history of shallow clone, excluding rev" |
9219 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 9220 | |
c1ac5258 | 9221 | #: builtin/clone.c:130 |
ef317cd5 | 9222 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 9223 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 9224 | |
c1ac5258 | 9225 | #: builtin/clone.c:132 |
a4f16749 JX |
9226 | msgid "don't clone any tags, and make later fetches not to follow them" |
9227 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
9228 | ||
c1ac5258 | 9229 | #: builtin/clone.c:134 |
5b04ee3b JX |
9230 | msgid "any cloned submodules will be shallow" |
9231 | msgstr "子模组将以浅下载模式克隆" | |
9232 | ||
4c27fcb5 | 9233 | #: builtin/clone.c:135 builtin/init-db.c:487 |
ef317cd5 | 9234 | msgid "gitdir" |
07432cef | 9235 | msgstr "git目录" |
ef317cd5 | 9236 | |
4c27fcb5 | 9237 | #: builtin/clone.c:136 builtin/init-db.c:488 |
ef317cd5 | 9238 | msgid "separate git dir from working tree" |
07432cef | 9239 | msgstr "git目录和工作区分离" |
ef317cd5 | 9240 | |
c1ac5258 | 9241 | #: builtin/clone.c:137 |
ef317cd5 | 9242 | msgid "key=value" |
07432cef | 9243 | msgstr "key=value" |
ef317cd5 | 9244 | |
c1ac5258 | 9245 | #: builtin/clone.c:138 |
ef317cd5 | 9246 | msgid "set config inside the new repository" |
160fb2b2 | 9247 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 9248 | |
4c27fcb5 | 9249 | #: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230 |
fd8cb379 | 9250 | #: builtin/push.c:583 |
276ceeaa JX |
9251 | msgid "use IPv4 addresses only" |
9252 | msgstr "只使用 IPv4 地址" | |
9253 | ||
4c27fcb5 | 9254 | #: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233 |
fd8cb379 | 9255 | #: builtin/push.c:585 |
276ceeaa JX |
9256 | msgid "use IPv6 addresses only" |
9257 | msgstr "只使用 IPv6 地址" | |
9258 | ||
c1ac5258 | 9259 | #: builtin/clone.c:279 |
3495628d JX |
9260 | msgid "" |
9261 | "No directory name could be guessed.\n" | |
9262 | "Please specify a directory on the command line" | |
9263 | msgstr "" | |
9264 | "无法猜到目录名。\n" | |
26e4cbec | 9265 | "请在命令行指定一个目录" |
3495628d | 9266 | |
c1ac5258 | 9267 | #: builtin/clone.c:332 |
cfff71a9 | 9268 | #, c-format |
a0b6b246 JX |
9269 | msgid "info: Could not add alternate for '%s': %s\n" |
9270 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 9271 | |
c1ac5258 | 9272 | #: builtin/clone.c:404 |
5c57d762 JX |
9273 | #, c-format |
9274 | msgid "failed to open '%s'" | |
c1ac5258 | 9275 | msgstr "打开 '%s' 失败" |
5c57d762 | 9276 | |
c1ac5258 | 9277 | #: builtin/clone.c:412 |
c04f5ac3 JX |
9278 | #, c-format |
9279 | msgid "%s exists and is not a directory" | |
9280 | msgstr "%s 存在且不是一个目录" | |
9281 | ||
c1ac5258 | 9282 | #: builtin/clone.c:426 |
c04f5ac3 JX |
9283 | #, c-format |
9284 | msgid "failed to stat %s\n" | |
65e2041e | 9285 | msgstr "对 %s 调用 stat 失败\n" |
c04f5ac3 | 9286 | |
4c27fcb5 JX |
9287 | #: builtin/clone.c:443 |
9288 | #, c-format | |
9289 | msgid "failed to unlink '%s'" | |
9290 | msgstr "删除 '%s' 失败" | |
9291 | ||
c1ac5258 | 9292 | #: builtin/clone.c:448 |
c04f5ac3 JX |
9293 | #, c-format |
9294 | msgid "failed to create link '%s'" | |
c1ac5258 | 9295 | msgstr "创建链接 '%s' 失败" |
c04f5ac3 | 9296 | |
c1ac5258 | 9297 | #: builtin/clone.c:452 |
c04f5ac3 JX |
9298 | #, c-format |
9299 | msgid "failed to copy file to '%s'" | |
c1ac5258 | 9300 | msgstr "拷贝文件至 '%s' 失败" |
c04f5ac3 | 9301 | |
c1ac5258 | 9302 | #: builtin/clone.c:478 |
c04f5ac3 JX |
9303 | #, c-format |
9304 | msgid "done.\n" | |
9305 | msgstr "完成。\n" | |
9306 | ||
c1ac5258 | 9307 | #: builtin/clone.c:492 |
1003b3a5 JX |
9308 | msgid "" |
9309 | "Clone succeeded, but checkout failed.\n" | |
9310 | "You can inspect what was checked out with 'git status'\n" | |
9311 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
9312 | msgstr "" | |
9313 | "克隆成功,但是检出失败。\n" | |
9314 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
9315 | "'git checkout -f HEAD' 重试\n" | |
9316 | ||
c1ac5258 | 9317 | #: builtin/clone.c:569 |
c04f5ac3 JX |
9318 | #, c-format |
9319 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 9320 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 9321 | |
c1ac5258 | 9322 | #: builtin/clone.c:680 |
3495628d JX |
9323 | #, c-format |
9324 | msgid "unable to update %s" | |
9325 | msgstr "不能更新 %s" | |
9326 | ||
c1ac5258 | 9327 | #: builtin/clone.c:730 |
c04f5ac3 JX |
9328 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
9329 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
9330 | ||
4c27fcb5 | 9331 | #: builtin/clone.c:761 |
1003b3a5 JX |
9332 | msgid "unable to checkout working tree" |
9333 | msgstr "不能检出工作区" | |
9334 | ||
4c27fcb5 | 9335 | #: builtin/clone.c:806 |
3495628d JX |
9336 | msgid "unable to write parameters to config file" |
9337 | msgstr "无法将参数写入配置文件" | |
9338 | ||
4c27fcb5 | 9339 | #: builtin/clone.c:869 |
04cb2f28 JX |
9340 | msgid "cannot repack to clean up" |
9341 | msgstr "无法执行 repack 来清理" | |
9342 | ||
4c27fcb5 | 9343 | #: builtin/clone.c:871 |
04cb2f28 JX |
9344 | msgid "cannot unlink temporary alternates file" |
9345 | msgstr "无法删除临时的 alternates 文件" | |
9346 | ||
4c27fcb5 | 9347 | #: builtin/clone.c:911 builtin/receive-pack.c:1941 |
c04f5ac3 JX |
9348 | msgid "Too many arguments." |
9349 | msgstr "太多参数。" | |
9350 | ||
4c27fcb5 | 9351 | #: builtin/clone.c:915 |
c04f5ac3 | 9352 | msgid "You must specify a repository to clone." |
160fb2b2 | 9353 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 9354 | |
4c27fcb5 | 9355 | #: builtin/clone.c:928 |
c04f5ac3 JX |
9356 | #, c-format |
9357 | msgid "--bare and --origin %s options are incompatible." | |
9358 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
9359 | ||
4c27fcb5 | 9360 | #: builtin/clone.c:931 |
07432cef WS |
9361 | msgid "--bare and --separate-git-dir are incompatible." |
9362 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
9363 | ||
4c27fcb5 | 9364 | #: builtin/clone.c:944 |
c04f5ac3 JX |
9365 | #, c-format |
9366 | msgid "repository '%s' does not exist" | |
160fb2b2 | 9367 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 9368 | |
4c27fcb5 | 9369 | #: builtin/clone.c:950 builtin/fetch.c:1606 |
cfff71a9 JX |
9370 | #, c-format |
9371 | msgid "depth %s is not a positive number" | |
9372 | msgstr "深度 %s 不是一个正数" | |
9373 | ||
4c27fcb5 | 9374 | #: builtin/clone.c:960 |
c04f5ac3 JX |
9375 | #, c-format |
9376 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 9377 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 9378 | |
4c27fcb5 | 9379 | #: builtin/clone.c:970 |
c04f5ac3 JX |
9380 | #, c-format |
9381 | msgid "working tree '%s' already exists." | |
9382 | msgstr "工作区 '%s' 已经存在。" | |
9383 | ||
4c27fcb5 JX |
9384 | #: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271 |
9385 | #: builtin/worktree.c:295 builtin/worktree.c:325 | |
5bb01d4f JX |
9386 | #, c-format |
9387 | msgid "could not create leading directories of '%s'" | |
9388 | msgstr "不能为 '%s' 创建先导目录" | |
9389 | ||
4c27fcb5 | 9390 | #: builtin/clone.c:990 |
c04f5ac3 | 9391 | #, c-format |
814ff314 JX |
9392 | msgid "could not create work tree dir '%s'" |
9393 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 9394 | |
4c27fcb5 | 9395 | #: builtin/clone.c:1010 |
c04f5ac3 JX |
9396 | #, c-format |
9397 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 9398 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 9399 | |
4c27fcb5 | 9400 | #: builtin/clone.c:1012 |
c04f5ac3 JX |
9401 | #, c-format |
9402 | msgid "Cloning into '%s'...\n" | |
9403 | msgstr "正克隆到 '%s'...\n" | |
9404 | ||
4c27fcb5 | 9405 | #: builtin/clone.c:1036 |
a0b6b246 JX |
9406 | msgid "" |
9407 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
9408 | "able" | |
9409 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
9410 | ||
4c27fcb5 | 9411 | #: builtin/clone.c:1097 |
6acbf033 | 9412 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
9413 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
9414 | ||
4c27fcb5 | 9415 | #: builtin/clone.c:1099 |
a0b6b246 JX |
9416 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
9417 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 9418 | |
4c27fcb5 | 9419 | #: builtin/clone.c:1101 |
a0b6b246 JX |
9420 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
9421 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
9422 | ||
4c27fcb5 | 9423 | #: builtin/clone.c:1103 |
31e5e17b JX |
9424 | msgid "--filter is ignored in local clones; use file:// instead." |
9425 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
9426 | ||
4c27fcb5 | 9427 | #: builtin/clone.c:1106 |
6acbf033 | 9428 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 9429 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 9430 | |
4c27fcb5 | 9431 | #: builtin/clone.c:1111 |
6acbf033 JX |
9432 | msgid "--local is ignored" |
9433 | msgstr "--local 被忽略" | |
9434 | ||
4c27fcb5 | 9435 | #: builtin/clone.c:1181 builtin/clone.c:1189 |
c04f5ac3 JX |
9436 | #, c-format |
9437 | msgid "Remote branch %s not found in upstream %s" | |
9438 | msgstr "远程分支 %s 在上游 %s 未发现" | |
9439 | ||
4c27fcb5 | 9440 | #: builtin/clone.c:1192 |
c04f5ac3 | 9441 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 9442 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 9443 | |
a4f16749 | 9444 | #: builtin/column.c:10 |
814ff314 JX |
9445 | msgid "git column [<options>]" |
9446 | msgstr "git column [<选项>]" | |
ef317cd5 | 9447 | |
a4f16749 | 9448 | #: builtin/column.c:27 |
ef317cd5 | 9449 | msgid "lookup config vars" |
07432cef | 9450 | msgstr "查找配置变量" |
ef317cd5 | 9451 | |
a4f16749 | 9452 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 9453 | msgid "layout to use" |
07432cef | 9454 | msgstr "要使用的布局" |
ef317cd5 | 9455 | |
a4f16749 | 9456 | #: builtin/column.c:30 |
ef317cd5 | 9457 | msgid "Maximum width" |
07432cef | 9458 | msgstr "最大宽度" |
ef317cd5 | 9459 | |
a4f16749 | 9460 | #: builtin/column.c:31 |
ef317cd5 | 9461 | msgid "Padding space on left border" |
07432cef | 9462 | msgstr "左边框的填充空间" |
ef317cd5 | 9463 | |
a4f16749 | 9464 | #: builtin/column.c:32 |
ef317cd5 | 9465 | msgid "Padding space on right border" |
07432cef | 9466 | msgstr "右边框的填充空间" |
ef317cd5 | 9467 | |
a4f16749 | 9468 | #: builtin/column.c:33 |
ef317cd5 | 9469 | msgid "Padding space between columns" |
07432cef | 9470 | msgstr "两列之间的填充空间" |
ef317cd5 | 9471 | |
fd8cb379 | 9472 | #: builtin/column.c:51 |
8ada9598 | 9473 | msgid "--command must be the first argument" |
81809b99 | 9474 | msgstr "--command 必须是第一个参数" |
8ada9598 | 9475 | |
4c27fcb5 | 9476 | #: builtin/commit.c:40 |
814ff314 | 9477 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 9478 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 9479 | |
4c27fcb5 | 9480 | #: builtin/commit.c:45 |
814ff314 | 9481 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 9482 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 9483 | |
4c27fcb5 | 9484 | #: builtin/commit.c:50 |
c04f5ac3 JX |
9485 | msgid "" |
9486 | "You asked to amend the most recent commit, but doing so would make\n" | |
9487 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
9488 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
9489 | msgstr "" | |
1b150dc9 T |
9490 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
9491 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 9492 | |
4c27fcb5 | 9493 | #: builtin/commit.c:55 |
c04f5ac3 JX |
9494 | msgid "" |
9495 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
9496 | "If you wish to commit it anyway, use:\n" | |
9497 | "\n" | |
9498 | " git commit --allow-empty\n" | |
9499 | "\n" | |
c04f5ac3 | 9500 | msgstr "" |
a9ce4543 T |
9501 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
9502 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
9503 | "\n" |
9504 | " git commit --allow-empty\n" | |
9505 | "\n" | |
c04f5ac3 | 9506 | |
4c27fcb5 | 9507 | #: builtin/commit.c:62 |
b1894384 JX |
9508 | msgid "Otherwise, please use 'git reset'\n" |
9509 | msgstr "否则,请使用命令 'git reset'\n" | |
9510 | ||
4c27fcb5 | 9511 | #: builtin/commit.c:65 |
b1894384 JX |
9512 | msgid "" |
9513 | "If you wish to skip this commit, use:\n" | |
9514 | "\n" | |
9515 | " git reset\n" | |
9516 | "\n" | |
9517 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
9518 | "the remaining commits.\n" | |
9519 | msgstr "" | |
9520 | "如果您想跳过这个提交,使用命令:\n" | |
9521 | "\n" | |
9522 | " git reset\n" | |
9523 | "\n" | |
9524 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
9525 | "操作。\n" | |
9526 | ||
4c27fcb5 | 9527 | #: builtin/commit.c:311 |
c04f5ac3 | 9528 | msgid "failed to unpack HEAD tree object" |
c1ac5258 | 9529 | msgstr "解包 HEAD 树对象失败" |
c04f5ac3 | 9530 | |
4c27fcb5 | 9531 | #: builtin/commit.c:352 |
c04f5ac3 | 9532 | msgid "unable to create temporary index" |
90e6ef53 | 9533 | msgstr "不能创建临时索引" |
c04f5ac3 | 9534 | |
4c27fcb5 | 9535 | #: builtin/commit.c:358 |
c04f5ac3 JX |
9536 | msgid "interactive add failed" |
9537 | msgstr "交互式添加失败" | |
9538 | ||
4c27fcb5 | 9539 | #: builtin/commit.c:371 |
220c313c JX |
9540 | msgid "unable to update temporary index" |
9541 | msgstr "无法更新临时索引" | |
9542 | ||
4c27fcb5 | 9543 | #: builtin/commit.c:373 |
220c313c JX |
9544 | msgid "Failed to update main cache tree" |
9545 | msgstr "不能更新树的主缓存" | |
9546 | ||
4c27fcb5 | 9547 | #: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467 |
c04f5ac3 | 9548 | msgid "unable to write new_index file" |
90e6ef53 | 9549 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 9550 | |
4c27fcb5 | 9551 | #: builtin/commit.c:450 |
8ada9598 | 9552 | msgid "cannot do a partial commit during a merge." |
81809b99 | 9553 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 9554 | |
4c27fcb5 | 9555 | #: builtin/commit.c:452 |
8ada9598 | 9556 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 9557 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 9558 | |
4c27fcb5 | 9559 | #: builtin/commit.c:460 |
c04f5ac3 | 9560 | msgid "cannot read the index" |
90e6ef53 | 9561 | msgstr "无法读取索引" |
c04f5ac3 | 9562 | |
4c27fcb5 | 9563 | #: builtin/commit.c:479 |
c04f5ac3 | 9564 | msgid "unable to write temporary index file" |
90e6ef53 | 9565 | msgstr "无法写临时索引文件" |
c04f5ac3 | 9566 | |
4c27fcb5 | 9567 | #: builtin/commit.c:577 |
220c313c JX |
9568 | #, c-format |
9569 | msgid "commit '%s' lacks author header" | |
9570 | msgstr "提交 '%s' 缺少作者信息" | |
9571 | ||
4c27fcb5 | 9572 | #: builtin/commit.c:579 |
c04f5ac3 | 9573 | #, c-format |
220c313c | 9574 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 9575 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 9576 | |
4c27fcb5 | 9577 | #: builtin/commit.c:598 |
c04f5ac3 | 9578 | msgid "malformed --author parameter" |
fd8cb379 | 9579 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 9580 | |
4c27fcb5 | 9581 | #: builtin/commit.c:650 |
6acbf033 JX |
9582 | msgid "" |
9583 | "unable to select a comment character that is not used\n" | |
9584 | "in the current commit message" | |
9585 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
9586 | ||
4c27fcb5 | 9587 | #: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049 |
c04f5ac3 JX |
9588 | #, c-format |
9589 | msgid "could not lookup commit %s" | |
9590 | msgstr "不能查询提交 %s" | |
9591 | ||
4c27fcb5 | 9592 | #: builtin/commit.c:699 builtin/shortlog.c:317 |
c04f5ac3 JX |
9593 | #, c-format |
9594 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 9595 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 9596 | |
4c27fcb5 | 9597 | #: builtin/commit.c:701 |
c04f5ac3 | 9598 | msgid "could not read log from standard input" |
90e6ef53 | 9599 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 9600 | |
4c27fcb5 | 9601 | #: builtin/commit.c:705 |
c04f5ac3 JX |
9602 | #, c-format |
9603 | msgid "could not read log file '%s'" | |
90e6ef53 | 9604 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 9605 | |
4c27fcb5 | 9606 | #: builtin/commit.c:734 builtin/commit.c:742 |
c04f5ac3 | 9607 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 9608 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 9609 | |
4c27fcb5 | 9610 | #: builtin/commit.c:739 |
5b04ee3b JX |
9611 | msgid "could not read MERGE_MSG" |
9612 | msgstr "不能读取 MERGE_MSG" | |
9613 | ||
4c27fcb5 | 9614 | #: builtin/commit.c:793 |
c04f5ac3 | 9615 | msgid "could not write commit template" |
90e6ef53 | 9616 | msgstr "不能写提交模版" |
c04f5ac3 | 9617 | |
4c27fcb5 | 9618 | #: builtin/commit.c:811 |
81809b99 | 9619 | #, c-format |
c04f5ac3 JX |
9620 | msgid "" |
9621 | "\n" | |
8ada9598 | 9622 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
9623 | "If this is not correct, please remove the file\n" |
9624 | "\t%s\n" | |
9625 | "and try again.\n" | |
9626 | msgstr "" | |
9627 | "\n" | |
649900bc | 9628 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
9629 | "\t%s\n" |
9630 | "然后重试。\n" | |
9631 | ||
4c27fcb5 | 9632 | #: builtin/commit.c:816 |
81809b99 | 9633 | #, c-format |
8ada9598 JX |
9634 | msgid "" |
9635 | "\n" | |
9636 | "It looks like you may be committing a cherry-pick.\n" | |
9637 | "If this is not correct, please remove the file\n" | |
9638 | "\t%s\n" | |
9639 | "and try again.\n" | |
9640 | msgstr "" | |
9641 | "\n" | |
649900bc | 9642 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
9643 | "\t%s\n" |
9644 | "然后重试。\n" | |
c04f5ac3 | 9645 | |
4c27fcb5 | 9646 | #: builtin/commit.c:829 |
a77c07d9 | 9647 | #, c-format |
c04f5ac3 | 9648 | msgid "" |
8ada9598 | 9649 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 9650 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 9651 | msgstr "" |
a77c07d9 | 9652 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 9653 | "说明将会终止提交。\n" |
c04f5ac3 | 9654 | |
4c27fcb5 | 9655 | #: builtin/commit.c:837 |
a77c07d9 | 9656 | #, c-format |
c04f5ac3 | 9657 | msgid "" |
8ada9598 | 9658 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 9659 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
9660 | "An empty message aborts the commit.\n" |
9661 | msgstr "" | |
a77c07d9 JX |
9662 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
9663 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 9664 | |
90e6ef53 | 9665 | # 译者:为保证在输出中对齐,注意调整句中空格! |
4c27fcb5 | 9666 | #: builtin/commit.c:854 |
6acbf033 JX |
9667 | #, c-format |
9668 | msgid "%sAuthor: %.*s <%.*s>" | |
9669 | msgstr "%s作者: %.*s <%.*s>" | |
9670 | ||
9671 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
4c27fcb5 | 9672 | #: builtin/commit.c:862 |
c04f5ac3 | 9673 | #, c-format |
6acbf033 JX |
9674 | msgid "%sDate: %s" |
9675 | msgstr "%s日期: %s" | |
c04f5ac3 | 9676 | |
90e6ef53 | 9677 | # 译者:为保证在输出中对齐,注意调整句中空格! |
4c27fcb5 | 9678 | #: builtin/commit.c:869 |
c04f5ac3 | 9679 | #, c-format |
6acbf033 JX |
9680 | msgid "%sCommitter: %.*s <%.*s>" |
9681 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 9682 | |
4c27fcb5 | 9683 | #: builtin/commit.c:887 |
c04f5ac3 | 9684 | msgid "Cannot read index" |
90e6ef53 | 9685 | msgstr "无法读取索引" |
c04f5ac3 | 9686 | |
4c27fcb5 | 9687 | #: builtin/commit.c:953 |
c04f5ac3 JX |
9688 | msgid "Error building trees" |
9689 | msgstr "无法创建树对象" | |
9690 | ||
4c27fcb5 | 9691 | #: builtin/commit.c:967 builtin/tag.c:258 |
c04f5ac3 JX |
9692 | #, c-format |
9693 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 9694 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 9695 | |
4c27fcb5 | 9696 | #: builtin/commit.c:1011 |
c04f5ac3 | 9697 | #, c-format |
814ff314 | 9698 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 9699 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 9700 | |
4c27fcb5 | 9701 | #: builtin/commit.c:1025 |
5809aa05 JX |
9702 | #, c-format |
9703 | msgid "Invalid ignored mode '%s'" | |
9704 | msgstr "无效的忽略模式 '%s'" | |
9705 | ||
4c27fcb5 | 9706 | #: builtin/commit.c:1039 builtin/commit.c:1276 |
c04f5ac3 JX |
9707 | #, c-format |
9708 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 9709 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 9710 | |
4c27fcb5 | 9711 | #: builtin/commit.c:1077 |
2e8451e8 JX |
9712 | msgid "--long and -z are incompatible" |
9713 | msgstr "--long 和 -z 选项不兼容" | |
9714 | ||
4c27fcb5 | 9715 | #: builtin/commit.c:1110 |
c04f5ac3 JX |
9716 | msgid "Using both --reset-author and --author does not make sense" |
9717 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
9718 | ||
4c27fcb5 | 9719 | #: builtin/commit.c:1119 |
c04f5ac3 | 9720 | msgid "You have nothing to amend." |
90e6ef53 | 9721 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 9722 | |
4c27fcb5 | 9723 | #: builtin/commit.c:1122 |
8ada9598 | 9724 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 9725 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 9726 | |
4c27fcb5 | 9727 | #: builtin/commit.c:1124 |
8ada9598 | 9728 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 9729 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 9730 | |
4c27fcb5 | 9731 | #: builtin/commit.c:1127 |
c04f5ac3 | 9732 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 9733 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 9734 | |
4c27fcb5 | 9735 | #: builtin/commit.c:1137 |
c04f5ac3 JX |
9736 | msgid "Only one of -c/-C/-F/--fixup can be used." |
9737 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
9738 | ||
4c27fcb5 | 9739 | #: builtin/commit.c:1139 |
31e5e17b JX |
9740 | msgid "Option -m cannot be combined with -c/-C/-F." |
9741 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 9742 | |
4c27fcb5 | 9743 | #: builtin/commit.c:1147 |
c04f5ac3 | 9744 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 9745 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 9746 | |
4c27fcb5 | 9747 | #: builtin/commit.c:1164 |
c04f5ac3 JX |
9748 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
9749 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
9750 | ||
4c27fcb5 | 9751 | #: builtin/commit.c:1166 |
c04f5ac3 JX |
9752 | msgid "No paths with --include/--only does not make sense." |
9753 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
9754 | ||
4c27fcb5 | 9755 | #: builtin/commit.c:1180 builtin/tag.c:546 |
c04f5ac3 JX |
9756 | #, c-format |
9757 | msgid "Invalid cleanup mode %s" | |
9758 | msgstr "无效的清理模式 %s" | |
9759 | ||
4c27fcb5 | 9760 | #: builtin/commit.c:1185 |
c04f5ac3 | 9761 | msgid "Paths with -a does not make sense." |
649900bc | 9762 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 9763 | |
4c27fcb5 | 9764 | #: builtin/commit.c:1311 builtin/commit.c:1495 |
ef317cd5 | 9765 | msgid "show status concisely" |
07432cef | 9766 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 9767 | |
4c27fcb5 | 9768 | #: builtin/commit.c:1313 builtin/commit.c:1497 |
ef317cd5 | 9769 | msgid "show branch information" |
07432cef | 9770 | msgstr "显示分支信息" |
ef317cd5 | 9771 | |
4c27fcb5 | 9772 | #: builtin/commit.c:1315 |
a4f16749 JX |
9773 | msgid "show stash information" |
9774 | msgstr "显示贮藏区信息" | |
9775 | ||
4c27fcb5 | 9776 | #: builtin/commit.c:1317 builtin/commit.c:1499 |
31e5e17b JX |
9777 | msgid "compute full ahead/behind values" |
9778 | msgstr "计算完整的领先/落后值" | |
9779 | ||
4c27fcb5 | 9780 | #: builtin/commit.c:1319 |
a0b6b246 JX |
9781 | msgid "version" |
9782 | msgstr "版本" | |
9783 | ||
4c27fcb5 JX |
9784 | #: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558 |
9785 | #: builtin/worktree.c:639 | |
ef317cd5 | 9786 | msgid "machine-readable output" |
07432cef WS |
9787 | msgstr "机器可读的输出" |
9788 | ||
4c27fcb5 | 9789 | #: builtin/commit.c:1322 builtin/commit.c:1503 |
07432cef WS |
9790 | msgid "show status in long format (default)" |
9791 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 9792 | |
4c27fcb5 | 9793 | #: builtin/commit.c:1325 builtin/commit.c:1506 |
ef317cd5 | 9794 | msgid "terminate entries with NUL" |
4375c10e | 9795 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 9796 | |
4c27fcb5 JX |
9797 | #: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509 |
9798 | #: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910 | |
9799 | #: builtin/tag.c:400 | |
ef317cd5 | 9800 | msgid "mode" |
07432cef | 9801 | msgstr "模式" |
ef317cd5 | 9802 | |
4c27fcb5 | 9803 | #: builtin/commit.c:1328 builtin/commit.c:1509 |
ef317cd5 | 9804 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 9805 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 9806 | |
4c27fcb5 | 9807 | #: builtin/commit.c:1332 |
5809aa05 JX |
9808 | msgid "" |
9809 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
9810 | "traditional)" | |
31e5e17b JX |
9811 | msgstr "" |
9812 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 9813 | |
4c27fcb5 | 9814 | #: builtin/commit.c:1334 parse-options.h:164 |
ef317cd5 JX |
9815 | msgid "when" |
9816 | msgstr "何时" | |
9817 | ||
4c27fcb5 | 9818 | #: builtin/commit.c:1335 |
ef317cd5 JX |
9819 | msgid "" |
9820 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
9821 | "(Default: all)" | |
9822 | msgstr "" | |
07432cef | 9823 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 9824 | |
4c27fcb5 | 9825 | #: builtin/commit.c:1337 |
ef317cd5 | 9826 | msgid "list untracked files in columns" |
07432cef | 9827 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 9828 | |
4c27fcb5 | 9829 | #: builtin/commit.c:1338 |
fd8cb379 JX |
9830 | msgid "do not detect renames" |
9831 | msgstr "不检测重命名" | |
9832 | ||
4c27fcb5 | 9833 | #: builtin/commit.c:1340 |
fd8cb379 JX |
9834 | msgid "detect renames, optionally set similarity index" |
9835 | msgstr "检测重命名,可以设置索引相似度" | |
9836 | ||
4c27fcb5 | 9837 | #: builtin/commit.c:1360 |
5809aa05 JX |
9838 | msgid "Unsupported combination of ignored and untracked-files arguments" |
9839 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
9840 | ||
4c27fcb5 | 9841 | #: builtin/commit.c:1465 |
ef317cd5 | 9842 | msgid "suppress summary after successful commit" |
07432cef | 9843 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 9844 | |
4c27fcb5 | 9845 | #: builtin/commit.c:1466 |
ef317cd5 | 9846 | msgid "show diff in commit message template" |
07432cef | 9847 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 9848 | |
4c27fcb5 | 9849 | #: builtin/commit.c:1468 |
ef317cd5 | 9850 | msgid "Commit message options" |
07432cef | 9851 | msgstr "提交说明选项" |
c04f5ac3 | 9852 | |
4c27fcb5 | 9853 | #: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397 |
ef317cd5 | 9854 | msgid "read message from file" |
07432cef | 9855 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 9856 | |
4c27fcb5 | 9857 | #: builtin/commit.c:1470 |
ef317cd5 | 9858 | msgid "author" |
07432cef | 9859 | msgstr "作者" |
c04f5ac3 | 9860 | |
4c27fcb5 | 9861 | #: builtin/commit.c:1470 |
ef317cd5 | 9862 | msgid "override author for commit" |
07432cef | 9863 | msgstr "提交时覆盖作者" |
73a60cd2 | 9864 | |
4c27fcb5 | 9865 | #: builtin/commit.c:1471 builtin/gc.c:518 |
ef317cd5 | 9866 | msgid "date" |
07432cef | 9867 | msgstr "日期" |
c04f5ac3 | 9868 | |
4c27fcb5 | 9869 | #: builtin/commit.c:1471 |
ef317cd5 | 9870 | msgid "override date for commit" |
07432cef | 9871 | msgstr "提交时覆盖日期" |
c04f5ac3 | 9872 | |
4c27fcb5 JX |
9873 | #: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409 |
9874 | #: builtin/notes.c:572 builtin/tag.c:395 | |
ef317cd5 | 9875 | msgid "message" |
07432cef | 9876 | msgstr "说明" |
c04f5ac3 | 9877 | |
4c27fcb5 | 9878 | #: builtin/commit.c:1472 |
ef317cd5 | 9879 | msgid "commit message" |
07432cef | 9880 | msgstr "提交说明" |
ef317cd5 | 9881 | |
4c27fcb5 JX |
9882 | #: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475 |
9883 | #: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280 | |
94550ed3 JX |
9884 | msgid "commit" |
9885 | msgstr "提交" | |
9886 | ||
4c27fcb5 | 9887 | #: builtin/commit.c:1473 |
ef317cd5 | 9888 | msgid "reuse and edit message from specified commit" |
07432cef | 9889 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 9890 | |
4c27fcb5 | 9891 | #: builtin/commit.c:1474 |
ef317cd5 | 9892 | msgid "reuse message from specified commit" |
07432cef | 9893 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 9894 | |
4c27fcb5 | 9895 | #: builtin/commit.c:1475 |
ef317cd5 | 9896 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 9897 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 9898 | |
4c27fcb5 | 9899 | #: builtin/commit.c:1476 |
ef317cd5 | 9900 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 9901 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 9902 | |
4c27fcb5 | 9903 | #: builtin/commit.c:1477 |
ef317cd5 | 9904 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 9905 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 9906 | |
4c27fcb5 JX |
9907 | #: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276 |
9908 | #: builtin/pull.c:155 builtin/revert.c:106 | |
ef317cd5 | 9909 | msgid "add Signed-off-by:" |
07432cef | 9910 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 9911 | |
4c27fcb5 | 9912 | #: builtin/commit.c:1479 |
ef317cd5 | 9913 | msgid "use specified template file" |
07432cef | 9914 | msgstr "使用指定的模板文件" |
ef317cd5 | 9915 | |
4c27fcb5 | 9916 | #: builtin/commit.c:1480 |
ef317cd5 | 9917 | msgid "force edit of commit" |
07432cef | 9918 | msgstr "强制编辑提交" |
ef317cd5 | 9919 | |
07432cef | 9920 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
4c27fcb5 | 9921 | #: builtin/commit.c:1481 |
ef317cd5 | 9922 | msgid "default" |
07432cef | 9923 | msgstr "default" |
ef317cd5 | 9924 | |
4c27fcb5 | 9925 | #: builtin/commit.c:1481 builtin/tag.c:401 |
ef317cd5 | 9926 | msgid "how to strip spaces and #comments from message" |
07432cef | 9927 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 9928 | |
4c27fcb5 | 9929 | #: builtin/commit.c:1482 |
ef317cd5 | 9930 | msgid "include status in commit message template" |
07432cef | 9931 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 9932 | |
4c27fcb5 | 9933 | #: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185 |
c1ac5258 | 9934 | #: builtin/revert.c:114 |
ef317cd5 | 9935 | msgid "GPG sign commit" |
07432cef | 9936 | msgstr "GPG 提交签名" |
ef317cd5 | 9937 | |
4c27fcb5 | 9938 | #: builtin/commit.c:1487 |
ef317cd5 | 9939 | msgid "Commit contents options" |
07432cef | 9940 | msgstr "提交内容选项" |
ef317cd5 | 9941 | |
4c27fcb5 | 9942 | #: builtin/commit.c:1488 |
ef317cd5 | 9943 | msgid "commit all changed files" |
07432cef | 9944 | msgstr "提交所有改动的文件" |
ef317cd5 | 9945 | |
4c27fcb5 | 9946 | #: builtin/commit.c:1489 |
ef317cd5 | 9947 | msgid "add specified files to index for commit" |
07432cef | 9948 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 9949 | |
4c27fcb5 | 9950 | #: builtin/commit.c:1490 |
ef317cd5 | 9951 | msgid "interactively add files" |
07432cef | 9952 | msgstr "交互式添加文件" |
ef317cd5 | 9953 | |
4c27fcb5 | 9954 | #: builtin/commit.c:1491 |
ef317cd5 | 9955 | msgid "interactively add changes" |
07432cef | 9956 | msgstr "交互式添加变更" |
ef317cd5 | 9957 | |
4c27fcb5 | 9958 | #: builtin/commit.c:1492 |
ef317cd5 | 9959 | msgid "commit only specified files" |
07432cef | 9960 | msgstr "只提交指定的文件" |
ef317cd5 | 9961 | |
4c27fcb5 | 9962 | #: builtin/commit.c:1493 |
5c57d762 JX |
9963 | msgid "bypass pre-commit and commit-msg hooks" |
9964 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
9965 | ||
4c27fcb5 | 9966 | #: builtin/commit.c:1494 |
ef317cd5 | 9967 | msgid "show what would be committed" |
07432cef | 9968 | msgstr "显示将要提交的内容" |
ef317cd5 | 9969 | |
4c27fcb5 | 9970 | #: builtin/commit.c:1507 |
ef317cd5 | 9971 | msgid "amend previous commit" |
07432cef | 9972 | msgstr "修改先前的提交" |
ef317cd5 | 9973 | |
4c27fcb5 | 9974 | #: builtin/commit.c:1508 |
ef317cd5 | 9975 | msgid "bypass post-rewrite hook" |
07432cef | 9976 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 9977 | |
4c27fcb5 | 9978 | #: builtin/commit.c:1513 |
ef317cd5 | 9979 | msgid "ok to record an empty change" |
07432cef | 9980 | msgstr "允许一个空提交" |
ef317cd5 | 9981 | |
4c27fcb5 | 9982 | #: builtin/commit.c:1515 |
ef317cd5 | 9983 | msgid "ok to record a change with an empty message" |
07432cef | 9984 | msgstr "允许空的提交说明" |
ef317cd5 | 9985 | |
4c27fcb5 | 9986 | #: builtin/commit.c:1588 |
c04f5ac3 JX |
9987 | #, c-format |
9988 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 9989 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 9990 | |
4c27fcb5 | 9991 | #: builtin/commit.c:1595 |
c04f5ac3 | 9992 | msgid "could not read MERGE_MODE" |
90e6ef53 | 9993 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 9994 | |
4c27fcb5 | 9995 | #: builtin/commit.c:1614 |
c04f5ac3 JX |
9996 | #, c-format |
9997 | msgid "could not read commit message: %s" | |
90e6ef53 | 9998 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 9999 | |
4c27fcb5 | 10000 | #: builtin/commit.c:1625 |
c04f5ac3 JX |
10001 | #, c-format |
10002 | msgid "Aborting commit due to empty commit message.\n" | |
10003 | msgstr "终止提交因为提交说明为空。\n" | |
10004 | ||
4c27fcb5 | 10005 | #: builtin/commit.c:1630 |
6937cb4e JX |
10006 | #, c-format |
10007 | msgid "Aborting commit; you did not edit the message.\n" | |
10008 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
10009 | ||
4c27fcb5 | 10010 | #: builtin/commit.c:1665 |
c04f5ac3 | 10011 | msgid "" |
c1ac5258 | 10012 | "repository has been updated, but unable to write\n" |
220c313c | 10013 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
10014 | "not exceeded, and then \"git reset HEAD\" to recover." |
10015 | msgstr "" | |
160fb2b2 | 10016 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 10017 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 10018 | |
c1ac5258 | 10019 | #: builtin/commit-graph.c:10 |
fd8cb379 JX |
10020 | msgid "git commit-graph [--object-dir <objdir>]" |
10021 | msgstr "git commit-graph [--object-dir <对象目录>]" | |
10022 | ||
c1ac5258 | 10023 | #: builtin/commit-graph.c:11 builtin/commit-graph.c:23 |
fd8cb379 JX |
10024 | msgid "git commit-graph read [--object-dir <objdir>]" |
10025 | msgstr "git commit-graph read [--object-dir <对象目录>]" | |
10026 | ||
c1ac5258 JX |
10027 | #: builtin/commit-graph.c:12 builtin/commit-graph.c:18 |
10028 | msgid "git commit-graph verify [--object-dir <objdir>]" | |
10029 | msgstr "git commit-graph verify [--object-dir <对象目录>]" | |
10030 | ||
10031 | #: builtin/commit-graph.c:13 builtin/commit-graph.c:28 | |
fd8cb379 | 10032 | msgid "" |
c1ac5258 JX |
10033 | "git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" |
10034 | "stdin-packs|--stdin-commits]" | |
fd8cb379 | 10035 | msgstr "" |
c1ac5258 JX |
10036 | "git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--" |
10037 | "stdin-packs|--stdin-commits]" | |
fd8cb379 | 10038 | |
4c27fcb5 JX |
10039 | #: builtin/commit-graph.c:48 builtin/commit-graph.c:78 |
10040 | #: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 | |
10041 | #: builtin/log.c:1540 | |
fd8cb379 JX |
10042 | msgid "dir" |
10043 | msgstr "目录" | |
10044 | ||
4c27fcb5 JX |
10045 | #: builtin/commit-graph.c:49 builtin/commit-graph.c:79 |
10046 | #: builtin/commit-graph.c:133 builtin/commit-graph.c:191 | |
fd8cb379 JX |
10047 | msgid "The object directory to store the graph" |
10048 | msgstr "保存图形的对象目录" | |
10049 | ||
4c27fcb5 | 10050 | #: builtin/commit-graph.c:135 |
c1ac5258 JX |
10051 | msgid "start walk at all refs" |
10052 | msgstr "开始遍历所有引用" | |
10053 | ||
4c27fcb5 | 10054 | #: builtin/commit-graph.c:137 |
fd8cb379 JX |
10055 | msgid "scan pack-indexes listed by stdin for commits" |
10056 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
10057 | ||
4c27fcb5 | 10058 | #: builtin/commit-graph.c:139 |
fd8cb379 JX |
10059 | msgid "start walk at commits listed by stdin" |
10060 | msgstr "从标准输入中的提交开始扫描" | |
10061 | ||
4c27fcb5 | 10062 | #: builtin/commit-graph.c:141 |
fd8cb379 JX |
10063 | msgid "include all commits already in the commit-graph file" |
10064 | msgstr "包含 commit-graph 文件中已有所有提交" | |
10065 | ||
4c27fcb5 | 10066 | #: builtin/commit-graph.c:150 |
c1ac5258 JX |
10067 | msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" |
10068 | msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" | |
fd8cb379 | 10069 | |
4c27fcb5 | 10070 | #: builtin/config.c:11 |
814ff314 JX |
10071 | msgid "git config [<options>]" |
10072 | msgstr "git config [<选项>]" | |
ef317cd5 | 10073 | |
4c27fcb5 | 10074 | #: builtin/config.c:103 |
fd8cb379 JX |
10075 | #, c-format |
10076 | msgid "unrecognized --type argument, %s" | |
10077 | msgstr "未能识别的 --type 参数,%s" | |
10078 | ||
4c27fcb5 | 10079 | #: builtin/config.c:115 |
c1ac5258 JX |
10080 | msgid "only one type at a time" |
10081 | msgstr "一次只能一个类型" | |
10082 | ||
4c27fcb5 | 10083 | #: builtin/config.c:124 |
ef317cd5 | 10084 | msgid "Config file location" |
07432cef | 10085 | msgstr "配置文件位置" |
ef317cd5 | 10086 | |
4c27fcb5 | 10087 | #: builtin/config.c:125 |
ef317cd5 | 10088 | msgid "use global config file" |
07432cef | 10089 | msgstr "使用全局配置文件" |
ef317cd5 | 10090 | |
4c27fcb5 | 10091 | #: builtin/config.c:126 |
ef317cd5 | 10092 | msgid "use system config file" |
07432cef | 10093 | msgstr "使用系统级配置文件" |
ef317cd5 | 10094 | |
4c27fcb5 | 10095 | #: builtin/config.c:127 |
ef317cd5 | 10096 | msgid "use repository config file" |
160fb2b2 | 10097 | msgstr "使用仓库级配置文件" |
ef317cd5 | 10098 | |
4c27fcb5 JX |
10099 | #: builtin/config.c:128 |
10100 | msgid "use per-worktree config file" | |
10101 | msgstr "使用工作区级别的配置文件" | |
10102 | ||
10103 | #: builtin/config.c:129 | |
ef317cd5 | 10104 | msgid "use given config file" |
07432cef | 10105 | msgstr "使用指定的配置文件" |
ef317cd5 | 10106 | |
4c27fcb5 | 10107 | #: builtin/config.c:130 |
2e8451e8 | 10108 | msgid "blob-id" |
4375c10e | 10109 | msgstr "数据对象 ID" |
2e8451e8 | 10110 | |
4c27fcb5 | 10111 | #: builtin/config.c:130 |
2e8451e8 JX |
10112 | msgid "read config from given blob object" |
10113 | msgstr "从给定的数据对象读取配置" | |
10114 | ||
4c27fcb5 | 10115 | #: builtin/config.c:131 |
ef317cd5 | 10116 | msgid "Action" |
07432cef | 10117 | msgstr "操作" |
ef317cd5 | 10118 | |
4c27fcb5 | 10119 | #: builtin/config.c:132 |
ef317cd5 | 10120 | msgid "get value: name [value-regex]" |
07432cef | 10121 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 10122 | |
4c27fcb5 | 10123 | #: builtin/config.c:133 |
ef317cd5 | 10124 | msgid "get all values: key [value-regex]" |
07432cef | 10125 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 10126 | |
4c27fcb5 | 10127 | #: builtin/config.c:134 |
ef317cd5 | 10128 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 10129 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 10130 | |
4c27fcb5 | 10131 | #: builtin/config.c:135 |
90314792 JX |
10132 | msgid "get value specific for the URL: section[.var] URL" |
10133 | msgstr "获得 URL 取值:section[.var] URL" | |
10134 | ||
4c27fcb5 | 10135 | #: builtin/config.c:136 |
ef317cd5 | 10136 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 10137 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 10138 | |
4c27fcb5 | 10139 | #: builtin/config.c:137 |
ef317cd5 | 10140 | msgid "add a new variable: name value" |
07432cef | 10141 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 10142 | |
4c27fcb5 | 10143 | #: builtin/config.c:138 |
ef317cd5 | 10144 | msgid "remove a variable: name [value-regex]" |
07432cef | 10145 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 10146 | |
4c27fcb5 | 10147 | #: builtin/config.c:139 |
ef317cd5 | 10148 | msgid "remove all matches: name [value-regex]" |
07432cef | 10149 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 10150 | |
4c27fcb5 | 10151 | #: builtin/config.c:140 |
ef317cd5 | 10152 | msgid "rename section: old-name new-name" |
07432cef | 10153 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 10154 | |
4c27fcb5 | 10155 | #: builtin/config.c:141 |
ef317cd5 | 10156 | msgid "remove a section: name" |
07432cef | 10157 | msgstr "删除一个小节:name" |
ef317cd5 | 10158 | |
4c27fcb5 | 10159 | #: builtin/config.c:142 |
ef317cd5 | 10160 | msgid "list all" |
07432cef | 10161 | msgstr "列出所有" |
ef317cd5 | 10162 | |
4c27fcb5 | 10163 | #: builtin/config.c:143 |
ef317cd5 | 10164 | msgid "open an editor" |
07432cef | 10165 | msgstr "打开一个编辑器" |
ef317cd5 | 10166 | |
4c27fcb5 | 10167 | #: builtin/config.c:144 |
04cb2f28 JX |
10168 | msgid "find the color configured: slot [default]" |
10169 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 10170 | |
4c27fcb5 | 10171 | #: builtin/config.c:145 |
04cb2f28 JX |
10172 | msgid "find the color setting: slot [stdout-is-tty]" |
10173 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 10174 | |
4c27fcb5 | 10175 | #: builtin/config.c:146 |
ef317cd5 | 10176 | msgid "Type" |
07432cef | 10177 | msgstr "类型" |
ef317cd5 | 10178 | |
4c27fcb5 | 10179 | #: builtin/config.c:147 |
fd8cb379 JX |
10180 | msgid "value is given this type" |
10181 | msgstr "取值为该类型" | |
10182 | ||
4c27fcb5 | 10183 | #: builtin/config.c:148 |
ef317cd5 | 10184 | msgid "value is \"true\" or \"false\"" |
07432cef | 10185 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 10186 | |
4c27fcb5 | 10187 | #: builtin/config.c:149 |
ef317cd5 | 10188 | msgid "value is decimal number" |
07432cef | 10189 | msgstr "值是十进制数" |
ef317cd5 | 10190 | |
4c27fcb5 | 10191 | #: builtin/config.c:150 |
ef317cd5 | 10192 | msgid "value is --bool or --int" |
07432cef | 10193 | msgstr "值是 --bool or --int" |
ef317cd5 | 10194 | |
4c27fcb5 | 10195 | #: builtin/config.c:151 |
ef317cd5 | 10196 | msgid "value is a path (file or directory name)" |
07432cef | 10197 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 10198 | |
4c27fcb5 | 10199 | #: builtin/config.c:152 |
5809aa05 JX |
10200 | msgid "value is an expiry date" |
10201 | msgstr "值是一个到期日期" | |
10202 | ||
4c27fcb5 | 10203 | #: builtin/config.c:153 |
ef317cd5 | 10204 | msgid "Other" |
07432cef | 10205 | msgstr "其它" |
ef317cd5 | 10206 | |
4c27fcb5 | 10207 | #: builtin/config.c:154 |
ef317cd5 | 10208 | msgid "terminate values with NUL byte" |
4375c10e | 10209 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 10210 | |
4c27fcb5 | 10211 | #: builtin/config.c:155 |
1b7f4a34 JX |
10212 | msgid "show variable names only" |
10213 | msgstr "只显示变量名" | |
10214 | ||
4c27fcb5 | 10215 | #: builtin/config.c:156 |
ef317cd5 | 10216 | msgid "respect include directives on lookup" |
07432cef | 10217 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 10218 | |
4c27fcb5 | 10219 | #: builtin/config.c:157 |
276ceeaa JX |
10220 | msgid "show origin of config (file, standard input, blob, command line)" |
10221 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
10222 | ||
4c27fcb5 | 10223 | #: builtin/config.c:158 |
fd8cb379 JX |
10224 | msgid "value" |
10225 | msgstr "取值" | |
10226 | ||
4c27fcb5 | 10227 | #: builtin/config.c:158 |
fd8cb379 JX |
10228 | msgid "with --get, use default value when missing entry" |
10229 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
10230 | ||
4c27fcb5 | 10231 | #: builtin/config.c:171 |
c1ac5258 JX |
10232 | #, c-format |
10233 | msgid "wrong number of arguments, should be %d" | |
10234 | msgstr "错误的参数个数,应该为 %d 个" | |
10235 | ||
4c27fcb5 | 10236 | #: builtin/config.c:173 |
c1ac5258 JX |
10237 | #, c-format |
10238 | msgid "wrong number of arguments, should be from %d to %d" | |
10239 | msgstr "错误的参数个数,应该为从 %d 个到 %d 个" | |
10240 | ||
4c27fcb5 | 10241 | #: builtin/config.c:307 |
c1ac5258 JX |
10242 | #, c-format |
10243 | msgid "invalid key pattern: %s" | |
10244 | msgstr "无效键名模式:%s" | |
10245 | ||
4c27fcb5 | 10246 | #: builtin/config.c:343 |
fd8cb379 JX |
10247 | #, c-format |
10248 | msgid "failed to format default config value: %s" | |
c1ac5258 JX |
10249 | msgstr "格式化默认配置值失败:%s" |
10250 | ||
4c27fcb5 | 10251 | #: builtin/config.c:400 |
c1ac5258 JX |
10252 | #, c-format |
10253 | msgid "cannot parse color '%s'" | |
10254 | msgstr "无法解析颜色 '%s'" | |
fd8cb379 | 10255 | |
4c27fcb5 | 10256 | #: builtin/config.c:442 |
220c313c | 10257 | msgid "unable to parse default color value" |
c1ac5258 JX |
10258 | msgstr "无法解析默认颜色值" |
10259 | ||
4c27fcb5 | 10260 | #: builtin/config.c:495 builtin/config.c:741 |
c1ac5258 JX |
10261 | msgid "not in a git directory" |
10262 | msgstr "不在 git 仓库中" | |
10263 | ||
4c27fcb5 | 10264 | #: builtin/config.c:498 |
c1ac5258 JX |
10265 | msgid "writing to stdin is not supported" |
10266 | msgstr "不支持写到标准输入" | |
10267 | ||
4c27fcb5 | 10268 | #: builtin/config.c:501 |
c1ac5258 JX |
10269 | msgid "writing config blobs is not supported" |
10270 | msgstr "不支持写到配置数据对象" | |
220c313c | 10271 | |
4c27fcb5 | 10272 | #: builtin/config.c:586 |
220c313c JX |
10273 | #, c-format |
10274 | msgid "" | |
10275 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 10276 | "[user]\n" |
220c313c | 10277 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 10278 | "#\tname = %s\n" |
220c313c JX |
10279 | "#\temail = %s\n" |
10280 | msgstr "" | |
10281 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 10282 | "[user]\n" |
220c313c | 10283 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 10284 | "#\tname = %s\n" |
220c313c JX |
10285 | "#\temail = %s\n" |
10286 | ||
4c27fcb5 | 10287 | #: builtin/config.c:610 |
c1ac5258 JX |
10288 | msgid "only one config file at a time" |
10289 | msgstr "一次只能有一个配置文件" | |
10290 | ||
4c27fcb5 | 10291 | #: builtin/config.c:615 |
a4f16749 JX |
10292 | msgid "--local can only be used inside a git repository" |
10293 | msgstr "--local 只能在一个仓库内使用" | |
10294 | ||
4c27fcb5 | 10295 | #: builtin/config.c:618 |
fd8cb379 JX |
10296 | msgid "--blob can only be used inside a git repository" |
10297 | msgstr "--blob 只能在一个仓库内使用" | |
10298 | ||
4c27fcb5 | 10299 | #: builtin/config.c:637 |
c1ac5258 JX |
10300 | msgid "$HOME not set" |
10301 | msgstr "$HOME 未设置" | |
10302 | ||
4c27fcb5 JX |
10303 | #: builtin/config.c:657 |
10304 | msgid "" | |
10305 | "--worktree cannot be used with multiple working trees unless the config\n" | |
10306 | "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" | |
10307 | "section in \"git help worktree\" for details" | |
10308 | msgstr "" | |
10309 | "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n" | |
10310 | "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" | |
10311 | ||
10312 | #: builtin/config.c:687 | |
c1ac5258 JX |
10313 | msgid "--get-color and variable type are incoherent" |
10314 | msgstr "--get-color 和变量类型不兼容" | |
10315 | ||
4c27fcb5 | 10316 | #: builtin/config.c:692 |
c1ac5258 JX |
10317 | msgid "only one action at a time" |
10318 | msgstr "一次只能有一个动作" | |
10319 | ||
4c27fcb5 | 10320 | #: builtin/config.c:705 |
c1ac5258 JX |
10321 | msgid "--name-only is only applicable to --list or --get-regexp" |
10322 | msgstr "--name-only 仅适用于 --list 或 --get-regexp" | |
10323 | ||
4c27fcb5 | 10324 | #: builtin/config.c:711 |
c1ac5258 JX |
10325 | msgid "" |
10326 | "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" | |
10327 | "list" | |
10328 | msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" | |
10329 | ||
4c27fcb5 | 10330 | #: builtin/config.c:717 |
c1ac5258 JX |
10331 | msgid "--default is only applicable to --get" |
10332 | msgstr "--default 仅适用于 --get" | |
10333 | ||
4c27fcb5 | 10334 | #: builtin/config.c:730 |
c1ac5258 JX |
10335 | #, c-format |
10336 | msgid "unable to read config file '%s'" | |
10337 | msgstr "无法读取配置文件 '%s'" | |
10338 | ||
4c27fcb5 | 10339 | #: builtin/config.c:733 |
c1ac5258 JX |
10340 | msgid "error processing config file(s)" |
10341 | msgstr "处理配置文件出错" | |
10342 | ||
4c27fcb5 | 10343 | #: builtin/config.c:743 |
c1ac5258 JX |
10344 | msgid "editing stdin is not supported" |
10345 | msgstr "不支持编辑标准输入" | |
10346 | ||
4c27fcb5 | 10347 | #: builtin/config.c:745 |
c1ac5258 JX |
10348 | msgid "editing blobs is not supported" |
10349 | msgstr "不支持编辑数据对象" | |
10350 | ||
4c27fcb5 | 10351 | #: builtin/config.c:759 |
220c313c JX |
10352 | #, c-format |
10353 | msgid "cannot create configuration file %s" | |
10354 | msgstr "不能创建配置文件 %s" | |
10355 | ||
4c27fcb5 | 10356 | #: builtin/config.c:772 |
a0b6b246 JX |
10357 | #, c-format |
10358 | msgid "" | |
10359 | "cannot overwrite multiple values with a single value\n" | |
10360 | " Use a regexp, --add or --replace-all to change %s." | |
10361 | msgstr "" | |
10362 | "无法用一个值覆盖多个值\n" | |
10363 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
10364 | ||
4c27fcb5 | 10365 | #: builtin/config.c:846 builtin/config.c:857 |
c1ac5258 JX |
10366 | #, c-format |
10367 | msgid "no such section: %s" | |
10368 | msgstr "无此小节:%s" | |
10369 | ||
fd8cb379 | 10370 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
10371 | msgid "git count-objects [-v] [-H | --human-readable]" |
10372 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
10373 | ||
fd8cb379 | 10374 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
10375 | msgid "print sizes in human readable format" |
10376 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 10377 | |
c1ac5258 | 10378 | #: builtin/describe.c:26 |
814ff314 JX |
10379 | msgid "git describe [<options>] [<commit-ish>...]" |
10380 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 10381 | |
c1ac5258 | 10382 | #: builtin/describe.c:27 |
814ff314 JX |
10383 | msgid "git describe [<options>] --dirty" |
10384 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 10385 | |
c1ac5258 | 10386 | #: builtin/describe.c:62 |
87cb7997 JX |
10387 | msgid "head" |
10388 | msgstr "头" | |
10389 | ||
c1ac5258 | 10390 | #: builtin/describe.c:62 |
87cb7997 JX |
10391 | msgid "lightweight" |
10392 | msgstr "轻量级的" | |
10393 | ||
c1ac5258 | 10394 | #: builtin/describe.c:62 |
87cb7997 JX |
10395 | msgid "annotated" |
10396 | msgstr "附注的" | |
10397 | ||
c1ac5258 | 10398 | #: builtin/describe.c:272 |
c04f5ac3 JX |
10399 | #, c-format |
10400 | msgid "annotated tag %s not available" | |
55a16ee4 | 10401 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 10402 | |
c1ac5258 | 10403 | #: builtin/describe.c:276 |
c04f5ac3 JX |
10404 | #, c-format |
10405 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 10406 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 10407 | |
c1ac5258 | 10408 | #: builtin/describe.c:278 |
c04f5ac3 JX |
10409 | #, c-format |
10410 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 10411 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 10412 | |
c1ac5258 | 10413 | #: builtin/describe.c:322 |
c04f5ac3 JX |
10414 | #, c-format |
10415 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 10416 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 10417 | |
c1ac5258 | 10418 | #: builtin/describe.c:324 |
c04f5ac3 | 10419 | #, c-format |
5809aa05 JX |
10420 | msgid "No exact match on refs or tags, searching to describe\n" |
10421 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 10422 | |
c1ac5258 | 10423 | #: builtin/describe.c:378 |
c04f5ac3 JX |
10424 | #, c-format |
10425 | msgid "finished search at %s\n" | |
10426 | msgstr "完成搜索 %s\n" | |
10427 | ||
c1ac5258 | 10428 | #: builtin/describe.c:404 |
c04f5ac3 JX |
10429 | #, c-format |
10430 | msgid "" | |
10431 | "No annotated tags can describe '%s'.\n" | |
10432 | "However, there were unannotated tags: try --tags." | |
10433 | msgstr "" | |
55a16ee4 RC |
10434 | "没有附注标签能描述 '%s'。\n" |
10435 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 10436 | |
c1ac5258 | 10437 | #: builtin/describe.c:408 |
c04f5ac3 JX |
10438 | #, c-format |
10439 | msgid "" | |
10440 | "No tags can describe '%s'.\n" | |
10441 | "Try --always, or create some tags." | |
10442 | msgstr "" | |
55a16ee4 RC |
10443 | "没有标签能描述 '%s'。\n" |
10444 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 10445 | |
c1ac5258 | 10446 | #: builtin/describe.c:438 |
c04f5ac3 JX |
10447 | #, c-format |
10448 | msgid "traversed %lu commits\n" | |
10449 | msgstr "已遍历 %lu 个提交\n" | |
10450 | ||
c1ac5258 | 10451 | #: builtin/describe.c:441 |
c04f5ac3 JX |
10452 | #, c-format |
10453 | msgid "" | |
10454 | "more than %i tags found; listed %i most recent\n" | |
10455 | "gave up search at %s\n" | |
10456 | msgstr "" | |
55a16ee4 | 10457 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 10458 | "在 %s 放弃搜索\n" |
c04f5ac3 | 10459 | |
c1ac5258 | 10460 | #: builtin/describe.c:509 |
5809aa05 JX |
10461 | #, c-format |
10462 | msgid "describe %s\n" | |
10463 | msgstr "描述 %s\n" | |
10464 | ||
4c27fcb5 | 10465 | #: builtin/describe.c:512 builtin/log.c:513 |
5809aa05 JX |
10466 | #, c-format |
10467 | msgid "Not a valid object name %s" | |
10468 | msgstr "不是一个有效的对象名 %s" | |
10469 | ||
c1ac5258 | 10470 | #: builtin/describe.c:520 |
5809aa05 JX |
10471 | #, c-format |
10472 | msgid "%s is neither a commit nor blob" | |
10473 | msgstr "%s 既不是提交也不是数据对象" | |
10474 | ||
c1ac5258 | 10475 | #: builtin/describe.c:534 |
ef317cd5 | 10476 | msgid "find the tag that comes after the commit" |
55a16ee4 | 10477 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 10478 | |
c1ac5258 | 10479 | #: builtin/describe.c:535 |
ef317cd5 | 10480 | msgid "debug search strategy on stderr" |
07432cef | 10481 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 10482 | |
c1ac5258 | 10483 | #: builtin/describe.c:536 |
1003b3a5 JX |
10484 | msgid "use any ref" |
10485 | msgstr "使用任意引用" | |
10486 | ||
c1ac5258 | 10487 | #: builtin/describe.c:537 |
1003b3a5 | 10488 | msgid "use any tag, even unannotated" |
55a16ee4 | 10489 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 10490 | |
c1ac5258 | 10491 | #: builtin/describe.c:538 |
ef317cd5 | 10492 | msgid "always use long format" |
07432cef | 10493 | msgstr "始终使用长提交号格式" |
ef317cd5 | 10494 | |
c1ac5258 | 10495 | #: builtin/describe.c:539 |
2e8451e8 JX |
10496 | msgid "only follow first parent" |
10497 | msgstr "只跟随第一个父提交" | |
10498 | ||
c1ac5258 | 10499 | #: builtin/describe.c:542 |
ef317cd5 | 10500 | msgid "only output exact matches" |
07432cef | 10501 | msgstr "只输出精确匹配" |
ef317cd5 | 10502 | |
c1ac5258 | 10503 | #: builtin/describe.c:544 |
ef317cd5 | 10504 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 10505 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 10506 | |
c1ac5258 | 10507 | #: builtin/describe.c:546 |
ef317cd5 | 10508 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 10509 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 10510 | |
c1ac5258 | 10511 | #: builtin/describe.c:548 |
87cb7997 JX |
10512 | msgid "do not consider tags matching <pattern>" |
10513 | msgstr "不考虑匹配 <模式> 的标签" | |
10514 | ||
c1ac5258 | 10515 | #: builtin/describe.c:550 builtin/name-rev.c:424 |
ef317cd5 | 10516 | msgid "show abbreviated commit object as fallback" |
07432cef | 10517 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 10518 | |
c1ac5258 | 10519 | #: builtin/describe.c:551 builtin/describe.c:554 |
ef317cd5 | 10520 | msgid "mark" |
07432cef | 10521 | msgstr "标记" |
ef317cd5 | 10522 | |
c1ac5258 | 10523 | #: builtin/describe.c:552 |
ef317cd5 | 10524 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 10525 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 10526 | |
c1ac5258 | 10527 | #: builtin/describe.c:555 |
87cb7997 JX |
10528 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
10529 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
10530 | ||
c1ac5258 | 10531 | #: builtin/describe.c:573 |
c04f5ac3 JX |
10532 | msgid "--long is incompatible with --abbrev=0" |
10533 | msgstr "--long 与 --abbrev=0 不兼容" | |
10534 | ||
c1ac5258 | 10535 | #: builtin/describe.c:602 |
c04f5ac3 | 10536 | msgid "No names found, cannot describe anything." |
90e6ef53 | 10537 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 10538 | |
c1ac5258 | 10539 | #: builtin/describe.c:652 |
a8a5406a | 10540 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
10541 | msgstr "--dirty 与提交号不兼容" |
10542 | ||
c1ac5258 | 10543 | #: builtin/describe.c:654 |
87cb7997 JX |
10544 | msgid "--broken is incompatible with commit-ishes" |
10545 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 10546 | |
1a79b2f1 | 10547 | #: builtin/diff.c:83 |
c04f5ac3 JX |
10548 | #, c-format |
10549 | msgid "'%s': not a regular file or symlink" | |
10550 | msgstr "'%s':不是一个正规文件或符号链接" | |
10551 | ||
5809aa05 | 10552 | #: builtin/diff.c:234 |
c04f5ac3 JX |
10553 | #, c-format |
10554 | msgid "invalid option: %s" | |
10555 | msgstr "无效选项:%s" | |
10556 | ||
c1ac5258 | 10557 | #: builtin/diff.c:363 |
c04f5ac3 | 10558 | msgid "Not a git repository" |
160fb2b2 | 10559 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 10560 | |
c1ac5258 | 10561 | #: builtin/diff.c:407 |
c04f5ac3 JX |
10562 | #, c-format |
10563 | msgid "invalid object '%s' given." | |
10564 | msgstr "提供了无效对象 '%s'。" | |
10565 | ||
c1ac5258 | 10566 | #: builtin/diff.c:416 |
c04f5ac3 JX |
10567 | #, c-format |
10568 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 10569 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 10570 | |
c1ac5258 | 10571 | #: builtin/diff.c:421 |
c04f5ac3 JX |
10572 | #, c-format |
10573 | msgid "unhandled object '%s' given." | |
6c94aba5 | 10574 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 10575 | |
c1ac5258 | 10576 | #: builtin/difftool.c:30 |
1a79b2f1 JX |
10577 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
10578 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
10579 | ||
c1ac5258 | 10580 | #: builtin/difftool.c:260 |
1a79b2f1 JX |
10581 | #, c-format |
10582 | msgid "failed: %d" | |
10583 | msgstr "失败:%d" | |
10584 | ||
c1ac5258 | 10585 | #: builtin/difftool.c:302 |
87cb7997 JX |
10586 | #, c-format |
10587 | msgid "could not read symlink %s" | |
10588 | msgstr "无法读取符号链接 %s" | |
10589 | ||
c1ac5258 | 10590 | #: builtin/difftool.c:304 |
87cb7997 JX |
10591 | #, c-format |
10592 | msgid "could not read symlink file %s" | |
10593 | msgstr "无法读取符号链接文件 %s" | |
10594 | ||
c1ac5258 | 10595 | #: builtin/difftool.c:312 |
87cb7997 JX |
10596 | #, c-format |
10597 | msgid "could not read object %s for symlink %s" | |
10598 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
10599 | ||
c1ac5258 | 10600 | #: builtin/difftool.c:413 |
1a79b2f1 JX |
10601 | msgid "" |
10602 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
10603 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
10604 | msgstr "" |
10605 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
10606 | "cc')。" | |
1a79b2f1 | 10607 | |
c1ac5258 | 10608 | #: builtin/difftool.c:633 |
1a79b2f1 JX |
10609 | #, c-format |
10610 | msgid "both files modified: '%s' and '%s'." | |
10611 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
10612 | ||
c1ac5258 | 10613 | #: builtin/difftool.c:635 |
1a79b2f1 JX |
10614 | msgid "working tree file has been left." |
10615 | msgstr "工作区文件被留了下来。" | |
10616 | ||
c1ac5258 | 10617 | #: builtin/difftool.c:646 |
1a79b2f1 JX |
10618 | #, c-format |
10619 | msgid "temporary files exist in '%s'." | |
10620 | msgstr "临时文件存在于 '%s'。" | |
10621 | ||
c1ac5258 | 10622 | #: builtin/difftool.c:647 |
1a79b2f1 JX |
10623 | msgid "you may want to cleanup or recover these." |
10624 | msgstr "您可能想要清理或者恢复它们。" | |
10625 | ||
c1ac5258 | 10626 | #: builtin/difftool.c:696 |
1a79b2f1 JX |
10627 | msgid "use `diff.guitool` instead of `diff.tool`" |
10628 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
10629 | ||
c1ac5258 | 10630 | #: builtin/difftool.c:698 |
1a79b2f1 JX |
10631 | msgid "perform a full-directory diff" |
10632 | msgstr "执行一个全目录差异比较" | |
10633 | ||
c1ac5258 | 10634 | #: builtin/difftool.c:700 |
1a79b2f1 JX |
10635 | msgid "do not prompt before launching a diff tool" |
10636 | msgstr "启动差异比较工具之前不提示" | |
10637 | ||
c1ac5258 | 10638 | #: builtin/difftool.c:705 |
1a79b2f1 JX |
10639 | msgid "use symlinks in dir-diff mode" |
10640 | msgstr "在 dir-diff 模式中使用符号链接" | |
10641 | ||
fd8cb379 | 10642 | #: builtin/difftool.c:706 |
c1ac5258 JX |
10643 | msgid "tool" |
10644 | msgstr "工具" | |
10645 | ||
10646 | #: builtin/difftool.c:707 | |
1a79b2f1 JX |
10647 | msgid "use the specified diff tool" |
10648 | msgstr "使用指定的差异比较工具" | |
10649 | ||
c1ac5258 | 10650 | #: builtin/difftool.c:709 |
1a79b2f1 JX |
10651 | msgid "print a list of diff tools that may be used with `--tool`" |
10652 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
10653 | ||
c1ac5258 | 10654 | #: builtin/difftool.c:712 |
1a79b2f1 JX |
10655 | msgid "" |
10656 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
10657 | "code" | |
10658 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
10659 | ||
c1ac5258 | 10660 | #: builtin/difftool.c:715 |
1a79b2f1 JX |
10661 | msgid "specify a custom command for viewing diffs" |
10662 | msgstr "指定一个用于查看差异的自定义命令" | |
10663 | ||
c1ac5258 | 10664 | #: builtin/difftool.c:739 |
1a79b2f1 JX |
10665 | msgid "no <tool> given for --tool=<tool>" |
10666 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
10667 | ||
c1ac5258 | 10668 | #: builtin/difftool.c:746 |
1a79b2f1 JX |
10669 | msgid "no <cmd> given for --extcmd=<cmd>" |
10670 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
10671 | ||
c1ac5258 | 10672 | #: builtin/fast-export.c:29 |
ef317cd5 | 10673 | msgid "git fast-export [rev-list-opts]" |
07432cef | 10674 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 10675 | |
c1ac5258 | 10676 | #: builtin/fast-export.c:1006 |
ef317cd5 | 10677 | msgid "show progress after <n> objects" |
07432cef | 10678 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 10679 | |
c1ac5258 | 10680 | #: builtin/fast-export.c:1008 |
ef317cd5 | 10681 | msgid "select handling of signed tags" |
55a16ee4 | 10682 | msgstr "选择如何处理签名标签" |
ef317cd5 | 10683 | |
c1ac5258 | 10684 | #: builtin/fast-export.c:1011 |
ef317cd5 | 10685 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 10686 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 10687 | |
c1ac5258 | 10688 | #: builtin/fast-export.c:1014 |
ef317cd5 | 10689 | msgid "Dump marks to this file" |
07432cef | 10690 | msgstr "把标记存储到这个文件" |
ef317cd5 | 10691 | |
c1ac5258 | 10692 | #: builtin/fast-export.c:1016 |
ef317cd5 | 10693 | msgid "Import marks from this file" |
07432cef | 10694 | msgstr "从这个文件导入标记" |
ef317cd5 | 10695 | |
c1ac5258 | 10696 | #: builtin/fast-export.c:1018 |
ef317cd5 | 10697 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 10698 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 10699 | |
c1ac5258 | 10700 | #: builtin/fast-export.c:1020 |
ef317cd5 | 10701 | msgid "Output full tree for each commit" |
07432cef | 10702 | msgstr "每次提交都输出整个树" |
ef317cd5 | 10703 | |
c1ac5258 | 10704 | #: builtin/fast-export.c:1022 |
ef317cd5 | 10705 | msgid "Use the done feature to terminate the stream" |
07432cef | 10706 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 10707 | |
c1ac5258 | 10708 | #: builtin/fast-export.c:1023 |
ef317cd5 | 10709 | msgid "Skip output of blob data" |
07432cef | 10710 | msgstr "跳过数据对象的输出" |
ef317cd5 | 10711 | |
4c27fcb5 | 10712 | #: builtin/fast-export.c:1024 builtin/log.c:1588 |
6acbf033 | 10713 | msgid "refspec" |
160fb2b2 | 10714 | msgstr "引用规格" |
6acbf033 | 10715 | |
c1ac5258 | 10716 | #: builtin/fast-export.c:1025 |
6acbf033 | 10717 | msgid "Apply refspec to exported refs" |
160fb2b2 | 10718 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 10719 | |
c1ac5258 | 10720 | #: builtin/fast-export.c:1026 |
220c313c JX |
10721 | msgid "anonymize output" |
10722 | msgstr "匿名输出" | |
10723 | ||
4c27fcb5 | 10724 | #: builtin/fetch.c:28 |
ef317cd5 | 10725 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 10726 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 10727 | |
4c27fcb5 | 10728 | #: builtin/fetch.c:29 |
ef317cd5 | 10729 | msgid "git fetch [<options>] <group>" |
07432cef | 10730 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 10731 | |
4c27fcb5 | 10732 | #: builtin/fetch.c:30 |
ef317cd5 | 10733 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 10734 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 10735 | |
4c27fcb5 | 10736 | #: builtin/fetch.c:31 |
ef317cd5 | 10737 | msgid "git fetch --all [<options>]" |
07432cef | 10738 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 10739 | |
4c27fcb5 | 10740 | #: builtin/fetch.c:115 builtin/pull.c:194 |
ef317cd5 | 10741 | msgid "fetch from all remotes" |
07432cef | 10742 | msgstr "从所有的远程抓取" |
ef317cd5 | 10743 | |
4c27fcb5 | 10744 | #: builtin/fetch.c:117 builtin/pull.c:197 |
ef317cd5 | 10745 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 10746 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 10747 | |
4c27fcb5 | 10748 | #: builtin/fetch.c:119 builtin/pull.c:200 |
ef317cd5 | 10749 | msgid "path to upload pack on remote end" |
07432cef | 10750 | msgstr "上传包到远程的路径" |
ef317cd5 | 10751 | |
4c27fcb5 JX |
10752 | #: builtin/fetch.c:120 |
10753 | msgid "force overwrite of local reference" | |
10754 | msgstr "强制覆盖本地引用" | |
ef317cd5 | 10755 | |
4c27fcb5 | 10756 | #: builtin/fetch.c:122 |
ef317cd5 | 10757 | msgid "fetch from multiple remotes" |
07432cef | 10758 | msgstr "从多个远程抓取" |
ef317cd5 | 10759 | |
4c27fcb5 | 10760 | #: builtin/fetch.c:124 builtin/pull.c:204 |
ef317cd5 | 10761 | msgid "fetch all tags and associated objects" |
55a16ee4 | 10762 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 10763 | |
4c27fcb5 | 10764 | #: builtin/fetch.c:126 |
ef317cd5 | 10765 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 10766 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 10767 | |
4c27fcb5 | 10768 | #: builtin/fetch.c:128 |
276ceeaa JX |
10769 | msgid "number of submodules fetched in parallel" |
10770 | msgstr "子模组获取的并发数" | |
10771 | ||
4c27fcb5 | 10772 | #: builtin/fetch.c:130 builtin/pull.c:207 |
ef317cd5 | 10773 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 10774 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 10775 | |
4c27fcb5 | 10776 | #: builtin/fetch.c:132 |
31e5e17b JX |
10777 | msgid "prune local tags no longer on remote and clobber changed tags" |
10778 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
10779 | ||
07432cef | 10780 | # 译者:可选值,不能翻译 |
4c27fcb5 | 10781 | #: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132 |
ef317cd5 | 10782 | msgid "on-demand" |
07432cef | 10783 | msgstr "on-demand" |
ef317cd5 | 10784 | |
4c27fcb5 | 10785 | #: builtin/fetch.c:134 |
ef317cd5 | 10786 | msgid "control recursive fetching of submodules" |
07432cef | 10787 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 10788 | |
4c27fcb5 | 10789 | #: builtin/fetch.c:138 builtin/pull.c:215 |
ef317cd5 | 10790 | msgid "keep downloaded pack" |
07432cef | 10791 | msgstr "保持下载包" |
ef317cd5 | 10792 | |
4c27fcb5 | 10793 | #: builtin/fetch.c:140 |
ef317cd5 | 10794 | msgid "allow updating of HEAD ref" |
07432cef | 10795 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 10796 | |
4c27fcb5 | 10797 | #: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218 |
ef317cd5 | 10798 | msgid "deepen history of shallow clone" |
07432cef | 10799 | msgstr "深化浅克隆的历史" |
ef317cd5 | 10800 | |
4c27fcb5 | 10801 | #: builtin/fetch.c:145 |
a0b6b246 JX |
10802 | msgid "deepen history of shallow repository based on time" |
10803 | msgstr "基于时间来深化浅克隆的历史" | |
10804 | ||
4c27fcb5 | 10805 | #: builtin/fetch.c:151 builtin/pull.c:221 |
a77c07d9 | 10806 | msgid "convert to a complete repository" |
160fb2b2 | 10807 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 10808 | |
4c27fcb5 | 10809 | #: builtin/fetch.c:154 |
ef317cd5 | 10810 | msgid "prepend this to submodule path output" |
07432cef | 10811 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 10812 | |
4c27fcb5 | 10813 | #: builtin/fetch.c:157 |
a4f16749 JX |
10814 | msgid "" |
10815 | "default for recursive fetching of submodules (lower priority than config " | |
10816 | "files)" | |
10817 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 10818 | |
4c27fcb5 | 10819 | #: builtin/fetch.c:161 builtin/pull.c:224 |
cfff71a9 JX |
10820 | msgid "accept refs that update .git/shallow" |
10821 | msgstr "接受更新 .git/shallow 的引用" | |
10822 | ||
4c27fcb5 | 10823 | #: builtin/fetch.c:162 builtin/pull.c:226 |
6acbf033 JX |
10824 | msgid "refmap" |
10825 | msgstr "引用映射" | |
10826 | ||
4c27fcb5 | 10827 | #: builtin/fetch.c:163 builtin/pull.c:227 |
6acbf033 JX |
10828 | msgid "specify fetch refmap" |
10829 | msgstr "指定获取操作的引用映射" | |
10830 | ||
4c27fcb5 | 10831 | #: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582 |
fd8cb379 JX |
10832 | #: builtin/send-pack.c:172 |
10833 | msgid "server-specific" | |
10834 | msgstr "server-specific" | |
10835 | ||
4c27fcb5 | 10836 | #: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582 |
fd8cb379 JX |
10837 | #: builtin/send-pack.c:173 |
10838 | msgid "option to transmit" | |
10839 | msgstr "传输选项" | |
10840 | ||
4c27fcb5 | 10841 | #: builtin/fetch.c:170 |
c1ac5258 JX |
10842 | msgid "report that we have only objects reachable from this object" |
10843 | msgstr "报告我们只拥有从该对象开始可达的对象" | |
10844 | ||
4c27fcb5 | 10845 | #: builtin/fetch.c:470 |
c04f5ac3 JX |
10846 | msgid "Couldn't find remote ref HEAD" |
10847 | msgstr "无法发现远程 HEAD 引用" | |
10848 | ||
4c27fcb5 | 10849 | #: builtin/fetch.c:609 |
5c57d762 JX |
10850 | #, c-format |
10851 | msgid "configuration fetch.output contains invalid value %s" | |
10852 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
10853 | ||
4c27fcb5 | 10854 | #: builtin/fetch.c:702 |
c04f5ac3 JX |
10855 | #, c-format |
10856 | msgid "object %s not found" | |
10857 | msgstr "对象 %s 未发现" | |
10858 | ||
4c27fcb5 | 10859 | #: builtin/fetch.c:706 |
c04f5ac3 JX |
10860 | msgid "[up to date]" |
10861 | msgstr "[最新]" | |
10862 | ||
4c27fcb5 | 10863 | #: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807 |
c04f5ac3 JX |
10864 | msgid "[rejected]" |
10865 | msgstr "[已拒绝]" | |
10866 | ||
4c27fcb5 | 10867 | #: builtin/fetch.c:720 |
5c57d762 | 10868 | msgid "can't fetch in current branch" |
9a4b694c | 10869 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 10870 | |
4c27fcb5 | 10871 | #: builtin/fetch.c:730 |
c04f5ac3 | 10872 | msgid "[tag update]" |
55a16ee4 | 10873 | msgstr "[标签更新]" |
c04f5ac3 | 10874 | |
4c27fcb5 JX |
10875 | #: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787 |
10876 | #: builtin/fetch.c:802 | |
5c57d762 JX |
10877 | msgid "unable to update local ref" |
10878 | msgstr "不能更新本地引用" | |
c04f5ac3 | 10879 | |
4c27fcb5 JX |
10880 | #: builtin/fetch.c:735 |
10881 | msgid "would clobber existing tag" | |
10882 | msgstr "会破坏现有的标签" | |
10883 | ||
10884 | #: builtin/fetch.c:757 | |
c04f5ac3 | 10885 | msgid "[new tag]" |
55a16ee4 | 10886 | msgstr "[新标签]" |
c04f5ac3 | 10887 | |
4c27fcb5 | 10888 | #: builtin/fetch.c:760 |
c04f5ac3 JX |
10889 | msgid "[new branch]" |
10890 | msgstr "[新分支]" | |
10891 | ||
4c27fcb5 | 10892 | #: builtin/fetch.c:763 |
170e9899 JX |
10893 | msgid "[new ref]" |
10894 | msgstr "[新引用]" | |
10895 | ||
4c27fcb5 | 10896 | #: builtin/fetch.c:802 |
c04f5ac3 JX |
10897 | msgid "forced update" |
10898 | msgstr "强制更新" | |
10899 | ||
4c27fcb5 | 10900 | #: builtin/fetch.c:807 |
5c57d762 JX |
10901 | msgid "non-fast-forward" |
10902 | msgstr "非快进" | |
c04f5ac3 | 10903 | |
4c27fcb5 | 10904 | #: builtin/fetch.c:853 |
c04f5ac3 JX |
10905 | #, c-format |
10906 | msgid "%s did not send all necessary objects\n" | |
e640d114 | 10907 | msgstr "%s 未发送所有必需的对象\n" |
c04f5ac3 | 10908 | |
4c27fcb5 | 10909 | #: builtin/fetch.c:874 |
cfff71a9 JX |
10910 | #, c-format |
10911 | msgid "reject %s because shallow roots are not allowed to be updated" | |
10912 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
10913 | ||
4c27fcb5 | 10914 | #: builtin/fetch.c:963 builtin/fetch.c:1085 |
c04f5ac3 JX |
10915 | #, c-format |
10916 | msgid "From %.*s\n" | |
10917 | msgstr "来自 %.*s\n" | |
10918 | ||
4c27fcb5 | 10919 | #: builtin/fetch.c:974 |
c04f5ac3 JX |
10920 | #, c-format |
10921 | msgid "" | |
10922 | "some local refs could not be updated; try running\n" | |
10923 | " 'git remote prune %s' to remove any old, conflicting branches" | |
10924 | msgstr "" | |
10925 | "一些本地引用不能被更新;尝试运行\n" | |
10926 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
10927 | ||
90e6ef53 | 10928 | # 译者:注意保持前导空格 |
4c27fcb5 | 10929 | #: builtin/fetch.c:1055 |
81809b99 | 10930 | #, c-format |
8ada9598 | 10931 | msgid " (%s will become dangling)" |
e640d114 | 10932 | msgstr " (%s 将成为悬空状态)" |
c04f5ac3 | 10933 | |
90e6ef53 | 10934 | # 译者:注意保持前导空格 |
4c27fcb5 | 10935 | #: builtin/fetch.c:1056 |
81809b99 | 10936 | #, c-format |
8ada9598 | 10937 | msgid " (%s has become dangling)" |
e640d114 | 10938 | msgstr " (%s 已成为悬空状态)" |
c04f5ac3 | 10939 | |
4c27fcb5 | 10940 | #: builtin/fetch.c:1088 |
c04f5ac3 JX |
10941 | msgid "[deleted]" |
10942 | msgstr "[已删除]" | |
10943 | ||
4c27fcb5 | 10944 | #: builtin/fetch.c:1089 builtin/remote.c:1036 |
c04f5ac3 JX |
10945 | msgid "(none)" |
10946 | msgstr "(无)" | |
10947 | ||
4c27fcb5 | 10948 | #: builtin/fetch.c:1112 |
c04f5ac3 JX |
10949 | #, c-format |
10950 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 10951 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 10952 | |
4c27fcb5 | 10953 | #: builtin/fetch.c:1131 |
c04f5ac3 JX |
10954 | #, c-format |
10955 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
10956 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
10957 | ||
4c27fcb5 | 10958 | #: builtin/fetch.c:1134 |
c04f5ac3 JX |
10959 | #, c-format |
10960 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 10961 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 10962 | |
4c27fcb5 | 10963 | #: builtin/fetch.c:1433 |
c04f5ac3 JX |
10964 | #, c-format |
10965 | msgid "Fetching %s\n" | |
d4a8e00b | 10966 | msgstr "正在获取 %s\n" |
c04f5ac3 | 10967 | |
4c27fcb5 | 10968 | #: builtin/fetch.c:1435 builtin/remote.c:100 |
c04f5ac3 JX |
10969 | #, c-format |
10970 | msgid "Could not fetch %s" | |
10971 | msgstr "不能获取 %s" | |
10972 | ||
4c27fcb5 | 10973 | #: builtin/fetch.c:1481 builtin/fetch.c:1649 |
31e5e17b JX |
10974 | msgid "" |
10975 | "--filter can only be used with the remote configured in core.partialClone" | |
10976 | msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库" | |
10977 | ||
4c27fcb5 | 10978 | #: builtin/fetch.c:1504 |
c04f5ac3 JX |
10979 | msgid "" |
10980 | "No remote repository specified. Please, specify either a URL or a\n" | |
10981 | "remote name from which new revisions should be fetched." | |
4375c10e | 10982 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 10983 | |
4c27fcb5 | 10984 | #: builtin/fetch.c:1541 |
c04f5ac3 | 10985 | msgid "You need to specify a tag name." |
55a16ee4 | 10986 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 10987 | |
4c27fcb5 | 10988 | #: builtin/fetch.c:1590 |
a0b6b246 JX |
10989 | msgid "Negative depth in --deepen is not supported" |
10990 | msgstr "--deepen 不支持负数深度" | |
10991 | ||
4c27fcb5 | 10992 | #: builtin/fetch.c:1592 |
a0b6b246 JX |
10993 | msgid "--deepen and --depth are mutually exclusive" |
10994 | msgstr "--deepen 和 --depth 是互斥的" | |
10995 | ||
4c27fcb5 | 10996 | #: builtin/fetch.c:1597 |
a77c07d9 JX |
10997 | msgid "--depth and --unshallow cannot be used together" |
10998 | msgstr "--depth 和 --unshallow 不能同时使用" | |
10999 | ||
4c27fcb5 | 11000 | #: builtin/fetch.c:1599 |
a77c07d9 | 11001 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 11002 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 11003 | |
4c27fcb5 | 11004 | #: builtin/fetch.c:1615 |
c04f5ac3 | 11005 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 11006 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 11007 | |
4c27fcb5 | 11008 | #: builtin/fetch.c:1617 |
c04f5ac3 | 11009 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 11010 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 11011 | |
4c27fcb5 | 11012 | #: builtin/fetch.c:1626 |
c04f5ac3 JX |
11013 | #, c-format |
11014 | msgid "No such remote or remote group: %s" | |
11015 | msgstr "没有这样的远程或远程组:%s" | |
11016 | ||
4c27fcb5 | 11017 | #: builtin/fetch.c:1633 |
c04f5ac3 | 11018 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 11019 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 11020 | |
4c27fcb5 | 11021 | #: builtin/fmt-merge-msg.c:18 |
814ff314 JX |
11022 | msgid "" |
11023 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
11024 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 11025 | |
4c27fcb5 | 11026 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 11027 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 11028 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 11029 | |
4c27fcb5 | 11030 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 11031 | msgid "alias for --log (deprecated)" |
07432cef | 11032 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 11033 | |
4c27fcb5 | 11034 | #: builtin/fmt-merge-msg.c:678 |
ef317cd5 | 11035 | msgid "text" |
07432cef | 11036 | msgstr "文本" |
ef317cd5 | 11037 | |
4c27fcb5 | 11038 | #: builtin/fmt-merge-msg.c:679 |
ef317cd5 | 11039 | msgid "use <text> as start of message" |
07432cef | 11040 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 11041 | |
4c27fcb5 | 11042 | #: builtin/fmt-merge-msg.c:680 |
ef317cd5 | 11043 | msgid "file to read from" |
07432cef | 11044 | msgstr "从文件中读取" |
ef317cd5 | 11045 | |
a4f16749 | 11046 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
11047 | msgid "git for-each-ref [<options>] [<pattern>]" |
11048 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 11049 | |
a4f16749 | 11050 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
11051 | msgid "git for-each-ref [--points-at <object>]" |
11052 | msgstr "git for-each-ref [--points-at <对象>]" | |
11053 | ||
a4f16749 | 11054 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
11055 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
11056 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 11057 | |
a4f16749 | 11058 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
11059 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
11060 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 11061 | |
a4f16749 | 11062 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 11063 | msgid "quote placeholders suitably for shells" |
07432cef | 11064 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 11065 | |
a4f16749 | 11066 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 11067 | msgid "quote placeholders suitably for perl" |
07432cef | 11068 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 11069 | |
a4f16749 | 11070 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 11071 | msgid "quote placeholders suitably for python" |
07432cef | 11072 | msgstr "引用占位符适用于 python" |
ef317cd5 | 11073 | |
a4f16749 | 11074 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
11075 | msgid "quote placeholders suitably for Tcl" |
11076 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 11077 | |
a4f16749 | 11078 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 11079 | msgid "show only <n> matched refs" |
07432cef | 11080 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 11081 | |
4c27fcb5 | 11082 | #: builtin/for-each-ref.c:39 builtin/tag.c:424 |
6937cb4e JX |
11083 | msgid "respect format colors" |
11084 | msgstr "遵照格式中的颜色输出" | |
11085 | ||
11086 | #: builtin/for-each-ref.c:43 | |
94550ed3 JX |
11087 | msgid "print only refs which points at the given object" |
11088 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 11089 | |
6937cb4e | 11090 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
11091 | msgid "print only refs that are merged" |
11092 | msgstr "只打印已经合并的引用" | |
11093 | ||
6937cb4e | 11094 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
11095 | msgid "print only refs that are not merged" |
11096 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 11097 | |
6937cb4e | 11098 | #: builtin/for-each-ref.c:47 |
94550ed3 JX |
11099 | msgid "print only refs which contain the commit" |
11100 | msgstr "只打印包含该提交的引用" | |
11101 | ||
6937cb4e | 11102 | #: builtin/for-each-ref.c:48 |
87cb7997 JX |
11103 | msgid "print only refs which don't contain the commit" |
11104 | msgstr "只打印不包含该提交的引用" | |
11105 | ||
4c27fcb5 | 11106 | #: builtin/fsck.c:598 |
6c94aba5 JX |
11107 | msgid "Checking object directories" |
11108 | msgstr "检查对象目录中" | |
11109 | ||
4c27fcb5 | 11110 | #: builtin/fsck.c:693 |
814ff314 JX |
11111 | msgid "git fsck [<options>] [<object>...]" |
11112 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 11113 | |
4c27fcb5 | 11114 | #: builtin/fsck.c:699 |
ef317cd5 | 11115 | msgid "show unreachable objects" |
07432cef | 11116 | msgstr "显示不可达的对象" |
ef317cd5 | 11117 | |
4c27fcb5 | 11118 | #: builtin/fsck.c:700 |
ef317cd5 | 11119 | msgid "show dangling objects" |
e640d114 | 11120 | msgstr "显示悬空的对象" |
ef317cd5 | 11121 | |
4c27fcb5 | 11122 | #: builtin/fsck.c:701 |
ef317cd5 | 11123 | msgid "report tags" |
55a16ee4 | 11124 | msgstr "报告标签" |
ef317cd5 | 11125 | |
4c27fcb5 | 11126 | #: builtin/fsck.c:702 |
ef317cd5 | 11127 | msgid "report root nodes" |
07432cef | 11128 | msgstr "报告根节点" |
ef317cd5 | 11129 | |
4c27fcb5 | 11130 | #: builtin/fsck.c:703 |
ef317cd5 | 11131 | msgid "make index objects head nodes" |
07432cef | 11132 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 11133 | |
4c27fcb5 | 11134 | #: builtin/fsck.c:704 |
ef317cd5 | 11135 | msgid "make reflogs head nodes (default)" |
07432cef | 11136 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 11137 | |
4c27fcb5 | 11138 | #: builtin/fsck.c:705 |
ef317cd5 | 11139 | msgid "also consider packs and alternate objects" |
07432cef | 11140 | msgstr "也考虑包和备用对象" |
ef317cd5 | 11141 | |
4c27fcb5 | 11142 | #: builtin/fsck.c:706 |
1b7f4a34 JX |
11143 | msgid "check only connectivity" |
11144 | msgstr "仅检查连通性" | |
11145 | ||
4c27fcb5 | 11146 | #: builtin/fsck.c:707 |
ef317cd5 | 11147 | msgid "enable more strict checking" |
07432cef | 11148 | msgstr "启用更严格的检查" |
ef317cd5 | 11149 | |
4c27fcb5 | 11150 | #: builtin/fsck.c:709 |
ef317cd5 | 11151 | msgid "write dangling objects in .git/lost-found" |
e640d114 | 11152 | msgstr "将悬空对象写入 .git/lost-found 中" |
ef317cd5 | 11153 | |
4c27fcb5 | 11154 | #: builtin/fsck.c:710 builtin/prune.c:110 |
ef317cd5 | 11155 | msgid "show progress" |
07432cef | 11156 | msgstr "显示进度" |
ef317cd5 | 11157 | |
4c27fcb5 | 11158 | #: builtin/fsck.c:711 |
5c57d762 JX |
11159 | msgid "show verbose names for reachable objects" |
11160 | msgstr "显示可达对象的详细名称" | |
11161 | ||
4c27fcb5 | 11162 | #: builtin/fsck.c:776 |
6c94aba5 JX |
11163 | msgid "Checking objects" |
11164 | msgstr "检查对象中" | |
11165 | ||
c1ac5258 | 11166 | #: builtin/gc.c:34 |
814ff314 JX |
11167 | msgid "git gc [<options>]" |
11168 | msgstr "git gc [<选项>]" | |
ef317cd5 | 11169 | |
c1ac5258 | 11170 | #: builtin/gc.c:90 |
c04f5ac3 | 11171 | #, c-format |
87cb7997 | 11172 | msgid "Failed to fstat %s: %s" |
65e2041e | 11173 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 11174 | |
4c27fcb5 | 11175 | #: builtin/gc.c:461 builtin/init-db.c:55 |
c04f5ac3 | 11176 | #, c-format |
4c27fcb5 JX |
11177 | msgid "cannot stat '%s'" |
11178 | msgstr "不能对 '%s' 调用 stat" | |
11179 | ||
11180 | #: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 | |
11181 | #, c-format | |
11182 | msgid "cannot read '%s'" | |
11183 | msgstr "不能读取 '%s'" | |
c04f5ac3 | 11184 | |
4c27fcb5 | 11185 | #: builtin/gc.c:477 |
94550ed3 JX |
11186 | #, c-format |
11187 | msgid "" | |
11188 | "The last gc run reported the following. Please correct the root cause\n" | |
11189 | "and remove %s.\n" | |
11190 | "Automatic cleanup will not be performed until the file is removed.\n" | |
11191 | "\n" | |
11192 | "%s" | |
11193 | msgstr "" | |
11194 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
11195 | "在该文件被删除之前,自动清理将不会执行。\n" | |
11196 | "\n" | |
11197 | "%s" | |
11198 | ||
4c27fcb5 | 11199 | #: builtin/gc.c:519 |
ef317cd5 | 11200 | msgid "prune unreferenced objects" |
07432cef | 11201 | msgstr "清除未引用的对象" |
ef317cd5 | 11202 | |
4c27fcb5 | 11203 | #: builtin/gc.c:521 |
ef317cd5 | 11204 | msgid "be more thorough (increased runtime)" |
07432cef | 11205 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 11206 | |
4c27fcb5 | 11207 | #: builtin/gc.c:522 |
ef317cd5 | 11208 | msgid "enable auto-gc mode" |
07432cef | 11209 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 11210 | |
4c27fcb5 | 11211 | #: builtin/gc.c:525 |
90314792 JX |
11212 | msgid "force running gc even if there may be another gc running" |
11213 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
11214 | ||
4c27fcb5 | 11215 | #: builtin/gc.c:528 |
fd8cb379 JX |
11216 | msgid "repack all other packs except the largest pack" |
11217 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
11218 | ||
4c27fcb5 | 11219 | #: builtin/gc.c:545 |
fd8cb379 JX |
11220 | #, c-format |
11221 | msgid "failed to parse gc.logexpiry value %s" | |
c1ac5258 | 11222 | msgstr "解析 gc.logexpiry 的值 %s 失败" |
fd8cb379 | 11223 | |
4c27fcb5 | 11224 | #: builtin/gc.c:556 |
87cb7997 | 11225 | #, c-format |
fd8cb379 | 11226 | msgid "failed to parse prune expiry value %s" |
c1ac5258 | 11227 | msgstr "解析清除期限值 %s 失败" |
87cb7997 | 11228 | |
4c27fcb5 | 11229 | #: builtin/gc.c:576 |
c04f5ac3 | 11230 | #, c-format |
6c94aba5 | 11231 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 11232 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 11233 | |
4c27fcb5 | 11234 | #: builtin/gc.c:578 |
6c94aba5 JX |
11235 | #, c-format |
11236 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 11237 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 11238 | |
4c27fcb5 | 11239 | #: builtin/gc.c:579 |
6c94aba5 JX |
11240 | #, c-format |
11241 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
11242 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 11243 | |
4c27fcb5 | 11244 | #: builtin/gc.c:619 |
90314792 JX |
11245 | #, c-format |
11246 | msgid "" | |
11247 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
11248 | msgstr "" | |
29004bbb | 11249 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 11250 | |
4c27fcb5 | 11251 | #: builtin/gc.c:670 |
c04f5ac3 JX |
11252 | msgid "" |
11253 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 11254 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 11255 | |
fd8cb379 | 11256 | #: builtin/grep.c:28 |
814ff314 JX |
11257 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
11258 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 11259 | |
4c27fcb5 | 11260 | #: builtin/grep.c:224 |
c04f5ac3 JX |
11261 | #, c-format |
11262 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 11263 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 11264 | |
4c27fcb5 | 11265 | #: builtin/grep.c:278 |
276ceeaa JX |
11266 | #, c-format |
11267 | msgid "invalid number of threads specified (%d) for %s" | |
11268 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
11269 | ||
a4f16749 JX |
11270 | #. TRANSLATORS: %s is the configuration |
11271 | #. variable for tweaking threads, currently | |
11272 | #. grep.threads | |
11273 | #. | |
4c27fcb5 JX |
11274 | #: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697 |
11275 | #: builtin/pack-objects.c:2719 | |
a4f16749 JX |
11276 | #, c-format |
11277 | msgid "no threads support, ignoring %s" | |
11278 | msgstr "没有线程支持,忽略 %s" | |
11279 | ||
4c27fcb5 | 11280 | #: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620 |
c04f5ac3 JX |
11281 | #, c-format |
11282 | msgid "unable to read tree (%s)" | |
90e6ef53 | 11283 | msgstr "无法读取树(%s)" |
c04f5ac3 | 11284 | |
4c27fcb5 | 11285 | #: builtin/grep.c:635 |
c04f5ac3 JX |
11286 | #, c-format |
11287 | msgid "unable to grep from object of type %s" | |
11288 | msgstr "无法抓取来自于 %s 类型的对象" | |
11289 | ||
4c27fcb5 | 11290 | #: builtin/grep.c:701 |
c04f5ac3 JX |
11291 | #, c-format |
11292 | msgid "switch `%c' expects a numerical value" | |
11293 | msgstr "开关 `%c' 期望一个数字值" | |
11294 | ||
4c27fcb5 | 11295 | #: builtin/grep.c:800 |
ef317cd5 | 11296 | msgid "search in index instead of in the work tree" |
07432cef | 11297 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 11298 | |
4c27fcb5 | 11299 | #: builtin/grep.c:802 |
ef317cd5 | 11300 | msgid "find in contents not managed by git" |
07432cef | 11301 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
11302 | |
11303 | # 译者:中文字符串拼接,可删除前导空格 | |
4c27fcb5 | 11304 | #: builtin/grep.c:804 |
ef317cd5 | 11305 | msgid "search in both tracked and untracked files" |
07432cef | 11306 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 11307 | |
4c27fcb5 | 11308 | #: builtin/grep.c:806 |
814ff314 JX |
11309 | msgid "ignore files specified via '.gitignore'" |
11310 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 11311 | |
4c27fcb5 | 11312 | #: builtin/grep.c:808 |
87cb7997 | 11313 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
11314 | msgstr "在每一个子模组中递归搜索" |
11315 | ||
4c27fcb5 | 11316 | #: builtin/grep.c:811 |
ef317cd5 | 11317 | msgid "show non-matching lines" |
07432cef | 11318 | msgstr "显示未匹配的行" |
ef317cd5 | 11319 | |
4c27fcb5 | 11320 | #: builtin/grep.c:813 |
ef317cd5 | 11321 | msgid "case insensitive matching" |
07432cef | 11322 | msgstr "不区分大小写匹配" |
ef317cd5 | 11323 | |
4c27fcb5 | 11324 | #: builtin/grep.c:815 |
ef317cd5 | 11325 | msgid "match patterns only at word boundaries" |
07432cef | 11326 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 11327 | |
4c27fcb5 | 11328 | #: builtin/grep.c:817 |
ef317cd5 | 11329 | msgid "process binary files as text" |
07432cef | 11330 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 11331 | |
4c27fcb5 | 11332 | #: builtin/grep.c:819 |
ef317cd5 | 11333 | msgid "don't match patterns in binary files" |
07432cef | 11334 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 11335 | |
4c27fcb5 | 11336 | #: builtin/grep.c:822 |
90314792 JX |
11337 | msgid "process binary files with textconv filters" |
11338 | msgstr "用 textconv 过滤器处理二进制文件" | |
11339 | ||
4c27fcb5 JX |
11340 | #: builtin/grep.c:824 |
11341 | msgid "search in subdirectories (default)" | |
11342 | msgstr "在子目录中寻找(默认)" | |
11343 | ||
11344 | #: builtin/grep.c:826 | |
ef317cd5 | 11345 | msgid "descend at most <depth> levels" |
07432cef | 11346 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 11347 | |
4c27fcb5 | 11348 | #: builtin/grep.c:830 |
ef317cd5 | 11349 | msgid "use extended POSIX regular expressions" |
07432cef | 11350 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 11351 | |
4c27fcb5 | 11352 | #: builtin/grep.c:833 |
ef317cd5 | 11353 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 11354 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 11355 | |
4c27fcb5 | 11356 | #: builtin/grep.c:836 |
ef317cd5 | 11357 | msgid "interpret patterns as fixed strings" |
07432cef | 11358 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 11359 | |
4c27fcb5 | 11360 | #: builtin/grep.c:839 |
ef317cd5 | 11361 | msgid "use Perl-compatible regular expressions" |
07432cef | 11362 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 11363 | |
4c27fcb5 | 11364 | #: builtin/grep.c:842 |
ef317cd5 | 11365 | msgid "show line numbers" |
07432cef | 11366 | msgstr "显示行号" |
ef317cd5 | 11367 | |
4c27fcb5 | 11368 | #: builtin/grep.c:843 |
c1ac5258 JX |
11369 | msgid "show column number of first match" |
11370 | msgstr "显示第一个匹配的列号" | |
11371 | ||
4c27fcb5 | 11372 | #: builtin/grep.c:844 |
ef317cd5 | 11373 | msgid "don't show filenames" |
07432cef | 11374 | msgstr "不显示文件名" |
ef317cd5 | 11375 | |
4c27fcb5 | 11376 | #: builtin/grep.c:845 |
ef317cd5 | 11377 | msgid "show filenames" |
07432cef | 11378 | msgstr "显示文件名" |
ef317cd5 | 11379 | |
4c27fcb5 | 11380 | #: builtin/grep.c:847 |
ef317cd5 | 11381 | msgid "show filenames relative to top directory" |
07432cef | 11382 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 11383 | |
4c27fcb5 | 11384 | #: builtin/grep.c:849 |
ef317cd5 | 11385 | msgid "show only filenames instead of matching lines" |
07432cef | 11386 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 11387 | |
4c27fcb5 | 11388 | #: builtin/grep.c:851 |
ef317cd5 | 11389 | msgid "synonym for --files-with-matches" |
07432cef | 11390 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 11391 | |
4c27fcb5 | 11392 | #: builtin/grep.c:854 |
ef317cd5 | 11393 | msgid "show only the names of files without match" |
07432cef | 11394 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 11395 | |
4c27fcb5 | 11396 | #: builtin/grep.c:856 |
ef317cd5 | 11397 | msgid "print NUL after filenames" |
07432cef | 11398 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 11399 | |
4c27fcb5 | 11400 | #: builtin/grep.c:859 |
c1ac5258 JX |
11401 | msgid "show only matching parts of a line" |
11402 | msgstr "只显示行中的匹配的部分" | |
11403 | ||
4c27fcb5 | 11404 | #: builtin/grep.c:861 |
ef317cd5 | 11405 | msgid "show the number of matches instead of matching lines" |
07432cef | 11406 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 11407 | |
4c27fcb5 | 11408 | #: builtin/grep.c:862 |
ef317cd5 | 11409 | msgid "highlight matches" |
07432cef | 11410 | msgstr "高亮显示匹配项" |
ef317cd5 | 11411 | |
4c27fcb5 | 11412 | #: builtin/grep.c:864 |
ef317cd5 | 11413 | msgid "print empty line between matches from different files" |
07432cef | 11414 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 11415 | |
4c27fcb5 | 11416 | #: builtin/grep.c:866 |
ef317cd5 | 11417 | msgid "show filename only once above matches from same file" |
07432cef | 11418 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 11419 | |
4c27fcb5 | 11420 | #: builtin/grep.c:869 |
ef317cd5 | 11421 | msgid "show <n> context lines before and after matches" |
07432cef | 11422 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 11423 | |
4c27fcb5 | 11424 | #: builtin/grep.c:872 |
ef317cd5 | 11425 | msgid "show <n> context lines before matches" |
07432cef | 11426 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 11427 | |
4c27fcb5 | 11428 | #: builtin/grep.c:874 |
ef317cd5 | 11429 | msgid "show <n> context lines after matches" |
07432cef | 11430 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 11431 | |
4c27fcb5 | 11432 | #: builtin/grep.c:876 |
276ceeaa JX |
11433 | msgid "use <n> worker threads" |
11434 | msgstr "使用 <n> 个工作线程" | |
11435 | ||
4c27fcb5 | 11436 | #: builtin/grep.c:877 |
ef317cd5 | 11437 | msgid "shortcut for -C NUM" |
07432cef | 11438 | msgstr "快捷键 -C 数字" |
ef317cd5 | 11439 | |
4c27fcb5 | 11440 | #: builtin/grep.c:880 |
ef317cd5 | 11441 | msgid "show a line with the function name before matches" |
07432cef | 11442 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 11443 | |
4c27fcb5 | 11444 | #: builtin/grep.c:882 |
ef317cd5 | 11445 | msgid "show the surrounding function" |
07432cef | 11446 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 11447 | |
4c27fcb5 | 11448 | #: builtin/grep.c:885 |
ef317cd5 | 11449 | msgid "read patterns from file" |
07432cef | 11450 | msgstr "从文件读取模式" |
ef317cd5 | 11451 | |
4c27fcb5 | 11452 | #: builtin/grep.c:887 |
ef317cd5 | 11453 | msgid "match <pattern>" |
07432cef | 11454 | msgstr "匹配 <模式>" |
ef317cd5 | 11455 | |
4c27fcb5 | 11456 | #: builtin/grep.c:889 |
ef317cd5 | 11457 | msgid "combine patterns specified with -e" |
07432cef | 11458 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 11459 | |
4c27fcb5 | 11460 | #: builtin/grep.c:901 |
ef317cd5 | 11461 | msgid "indicate hit with exit status without output" |
07432cef | 11462 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 11463 | |
4c27fcb5 | 11464 | #: builtin/grep.c:903 |
ef317cd5 | 11465 | msgid "show only matches from files that match all patterns" |
07432cef | 11466 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 11467 | |
4c27fcb5 | 11468 | #: builtin/grep.c:905 |
07432cef WS |
11469 | msgid "show parse tree for grep expression" |
11470 | msgstr "显示 grep 表达式的解析树" | |
11471 | ||
4c27fcb5 | 11472 | #: builtin/grep.c:909 |
ef317cd5 | 11473 | msgid "pager" |
07432cef | 11474 | msgstr "分页" |
ef317cd5 | 11475 | |
4c27fcb5 | 11476 | #: builtin/grep.c:909 |
ef317cd5 | 11477 | msgid "show matching files in the pager" |
07432cef | 11478 | msgstr "分页显示匹配的文件" |
ef317cd5 | 11479 | |
4c27fcb5 | 11480 | #: builtin/grep.c:913 |
ef317cd5 | 11481 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 11482 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 11483 | |
4c27fcb5 | 11484 | #: builtin/grep.c:977 |
c1ac5258 JX |
11485 | msgid "no pattern given" |
11486 | msgstr "未提供匹配模式" | |
c04f5ac3 | 11487 | |
4c27fcb5 | 11488 | #: builtin/grep.c:1013 |
87cb7997 JX |
11489 | msgid "--no-index or --untracked cannot be used with revs" |
11490 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
11491 | ||
4c27fcb5 | 11492 | #: builtin/grep.c:1020 |
87cb7997 JX |
11493 | #, c-format |
11494 | msgid "unable to resolve revision: %s" | |
11495 | msgstr "不能解析版本:%s" | |
11496 | ||
4c27fcb5 JX |
11497 | #: builtin/grep.c:1051 |
11498 | msgid "invalid option combination, ignoring --threads" | |
11499 | msgstr "无效的选项组合,忽略 --threads" | |
276ceeaa | 11500 | |
4c27fcb5 | 11501 | #: builtin/grep.c:1054 builtin/pack-objects.c:3397 |
a4f16749 JX |
11502 | msgid "no threads support, ignoring --threads" |
11503 | msgstr "没有线程支持,忽略 --threads" | |
11504 | ||
4c27fcb5 JX |
11505 | #: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716 |
11506 | #, c-format | |
11507 | msgid "invalid number of threads specified (%d)" | |
11508 | msgstr "指定的线程数无效(%d)" | |
11509 | ||
11510 | #: builtin/grep.c:1080 | |
c04f5ac3 JX |
11511 | msgid "--open-files-in-pager only works on the worktree" |
11512 | msgstr "--open-files-in-pager 仅用于工作区" | |
11513 | ||
4c27fcb5 | 11514 | #: builtin/grep.c:1103 |
c1ac5258 JX |
11515 | msgid "option not supported with --recurse-submodules" |
11516 | msgstr "选项不支持和 --recurse-submodules 共用" | |
c04f5ac3 | 11517 | |
4c27fcb5 | 11518 | #: builtin/grep.c:1109 |
c1ac5258 JX |
11519 | msgid "--cached or --untracked cannot be used with --no-index" |
11520 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" | |
c04f5ac3 | 11521 | |
4c27fcb5 | 11522 | #: builtin/grep.c:1115 |
c1ac5258 JX |
11523 | msgid "--[no-]exclude-standard cannot be used for tracked contents" |
11524 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容" | |
c04f5ac3 | 11525 | |
4c27fcb5 | 11526 | #: builtin/grep.c:1123 |
c1ac5258 JX |
11527 | msgid "both --cached and trees are given" |
11528 | msgstr "同时给出了 --cached 和树对象" | |
11529 | ||
11530 | #: builtin/hash-object.c:84 | |
ef317cd5 | 11531 | msgid "" |
814ff314 JX |
11532 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
11533 | "[--] <file>..." | |
ef317cd5 | 11534 | msgstr "" |
814ff314 JX |
11535 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
11536 | "[--] <文件>..." | |
ef317cd5 | 11537 | |
c1ac5258 | 11538 | #: builtin/hash-object.c:85 |
94550ed3 JX |
11539 | msgid "git hash-object --stdin-paths" |
11540 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 11541 | |
c1ac5258 | 11542 | #: builtin/hash-object.c:97 |
ef317cd5 | 11543 | msgid "type" |
07432cef | 11544 | msgstr "类型" |
ef317cd5 | 11545 | |
c1ac5258 | 11546 | #: builtin/hash-object.c:97 |
ef317cd5 | 11547 | msgid "object type" |
07432cef | 11548 | msgstr "对象类型" |
ef317cd5 | 11549 | |
c1ac5258 | 11550 | #: builtin/hash-object.c:98 |
ef317cd5 | 11551 | msgid "write the object into the object database" |
07432cef | 11552 | msgstr "将对象写入对象数据库" |
ef317cd5 | 11553 | |
c1ac5258 | 11554 | #: builtin/hash-object.c:100 |
ef317cd5 | 11555 | msgid "read the object from stdin" |
07432cef | 11556 | msgstr "从标准输入读取对象" |
ef317cd5 | 11557 | |
c1ac5258 | 11558 | #: builtin/hash-object.c:102 |
ef317cd5 | 11559 | msgid "store file as is without filters" |
07432cef | 11560 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 11561 | |
c1ac5258 | 11562 | #: builtin/hash-object.c:103 |
220c313c JX |
11563 | msgid "" |
11564 | "just hash any random garbage to create corrupt objects for debugging Git" | |
11565 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
11566 | ||
c1ac5258 | 11567 | #: builtin/hash-object.c:104 |
ef317cd5 | 11568 | msgid "process file as it were from this path" |
07432cef | 11569 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 11570 | |
c1ac5258 | 11571 | #: builtin/help.c:46 |
ef317cd5 | 11572 | msgid "print all available commands" |
07432cef | 11573 | msgstr "打印所有可用的命令" |
ef317cd5 | 11574 | |
c1ac5258 | 11575 | #: builtin/help.c:47 |
a0b6b246 JX |
11576 | msgid "exclude guides" |
11577 | msgstr "排除向导" | |
11578 | ||
c1ac5258 | 11579 | #: builtin/help.c:48 |
4dcdc3d8 JX |
11580 | msgid "print list of useful guides" |
11581 | msgstr "显示有用的指南列表" | |
11582 | ||
c1ac5258 JX |
11583 | #: builtin/help.c:49 |
11584 | msgid "print all configuration variable names" | |
11585 | msgstr "打印所有配置变量名称" | |
11586 | ||
11587 | #: builtin/help.c:51 | |
ef317cd5 | 11588 | msgid "show man page" |
07432cef | 11589 | msgstr "显示 man 手册" |
ef317cd5 | 11590 | |
c1ac5258 | 11591 | #: builtin/help.c:52 |
ef317cd5 | 11592 | msgid "show manual in web browser" |
07432cef | 11593 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 11594 | |
c1ac5258 | 11595 | #: builtin/help.c:54 |
ef317cd5 | 11596 | msgid "show info page" |
07432cef | 11597 | msgstr "显示 info 手册" |
ef317cd5 | 11598 | |
c1ac5258 | 11599 | #: builtin/help.c:56 |
fd8cb379 JX |
11600 | msgid "print command description" |
11601 | msgstr "打印命令描述" | |
11602 | ||
c1ac5258 | 11603 | #: builtin/help.c:61 |
814ff314 JX |
11604 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
11605 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 11606 | |
c1ac5258 | 11607 | #: builtin/help.c:73 |
81809b99 | 11608 | #, c-format |
8ada9598 | 11609 | msgid "unrecognized help format '%s'" |
81809b99 | 11610 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 11611 | |
c1ac5258 | 11612 | #: builtin/help.c:100 |
8ada9598 | 11613 | msgid "Failed to start emacsclient." |
81809b99 | 11614 | msgstr "无法启动 emacsclient。" |
8ada9598 | 11615 | |
c1ac5258 | 11616 | #: builtin/help.c:113 |
8ada9598 | 11617 | msgid "Failed to parse emacsclient version." |
81809b99 | 11618 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 11619 | |
c1ac5258 | 11620 | #: builtin/help.c:121 |
8ada9598 JX |
11621 | #, c-format |
11622 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 11623 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 11624 | |
c1ac5258 | 11625 | #: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 |
81809b99 | 11626 | #, c-format |
5b04ee3b | 11627 | msgid "failed to exec '%s'" |
c1ac5258 | 11628 | msgstr "执行 '%s' 失败" |
8ada9598 | 11629 | |
c1ac5258 | 11630 | #: builtin/help.c:217 |
8ada9598 JX |
11631 | #, c-format |
11632 | msgid "" | |
11633 | "'%s': path for unsupported man viewer.\n" | |
11634 | "Please consider using 'man.<tool>.cmd' instead." | |
11635 | msgstr "" | |
81809b99 | 11636 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 11637 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 11638 | |
c1ac5258 | 11639 | #: builtin/help.c:229 |
8ada9598 JX |
11640 | #, c-format |
11641 | msgid "" | |
11642 | "'%s': cmd for supported man viewer.\n" | |
11643 | "Please consider using 'man.<tool>.path' instead." | |
11644 | msgstr "" | |
81809b99 | 11645 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 11646 | "请使用 'man.<工具>.path'。" |
8ada9598 | 11647 | |
c1ac5258 | 11648 | #: builtin/help.c:346 |
8ada9598 JX |
11649 | #, c-format |
11650 | msgid "'%s': unknown man viewer." | |
81809b99 | 11651 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 11652 | |
c1ac5258 | 11653 | #: builtin/help.c:363 |
8ada9598 | 11654 | msgid "no man viewer handled the request" |
81809b99 | 11655 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 11656 | |
c1ac5258 | 11657 | #: builtin/help.c:371 |
8ada9598 | 11658 | msgid "no info viewer handled the request" |
81809b99 | 11659 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 11660 | |
4c27fcb5 | 11661 | #: builtin/help.c:430 builtin/help.c:441 git.c:322 |
fd8cb379 JX |
11662 | #, c-format |
11663 | msgid "'%s' is aliased to '%s'" | |
11664 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 11665 | |
4c27fcb5 JX |
11666 | #: builtin/help.c:444 |
11667 | #, c-format | |
11668 | msgid "bad alias.%s string: %s" | |
11669 | msgstr "坏的 alias.%s 字符串:%s" | |
11670 | ||
11671 | #: builtin/help.c:473 builtin/help.c:503 | |
fd8cb379 JX |
11672 | #, c-format |
11673 | msgid "usage: %s%s" | |
11674 | msgstr "用法:%s%s" | |
4dcdc3d8 | 11675 | |
4c27fcb5 | 11676 | #: builtin/help.c:487 |
c1ac5258 JX |
11677 | msgid "'git help config' for more information" |
11678 | msgstr "'git help config' 获取更多信息" | |
4dcdc3d8 | 11679 | |
4c27fcb5 | 11680 | #: builtin/index-pack.c:184 |
8ada9598 JX |
11681 | #, c-format |
11682 | msgid "object type mismatch at %s" | |
81809b99 | 11683 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 11684 | |
4c27fcb5 | 11685 | #: builtin/index-pack.c:204 |
6acbf033 JX |
11686 | #, c-format |
11687 | msgid "did not receive expected object %s" | |
a0b6b246 | 11688 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 11689 | |
4c27fcb5 | 11690 | #: builtin/index-pack.c:207 |
6acbf033 JX |
11691 | #, c-format |
11692 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 11693 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 11694 | |
4c27fcb5 | 11695 | #: builtin/index-pack.c:249 |
81809b99 | 11696 | #, c-format |
8ada9598 JX |
11697 | msgid "cannot fill %d byte" |
11698 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 11699 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 11700 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 11701 | |
4c27fcb5 | 11702 | #: builtin/index-pack.c:259 |
8ada9598 | 11703 | msgid "early EOF" |
81809b99 | 11704 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 11705 | |
4c27fcb5 | 11706 | #: builtin/index-pack.c:260 |
8ada9598 | 11707 | msgid "read error on input" |
81809b99 | 11708 | msgstr "输入上的读错误" |
8ada9598 | 11709 | |
4c27fcb5 | 11710 | #: builtin/index-pack.c:272 |
8ada9598 | 11711 | msgid "used more bytes than were available" |
81809b99 | 11712 | msgstr "用掉了超过可用的字节" |
8ada9598 | 11713 | |
4c27fcb5 | 11714 | #: builtin/index-pack.c:279 builtin/pack-objects.c:598 |
8ada9598 | 11715 | msgid "pack too large for current definition of off_t" |
81809b99 | 11716 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 11717 | |
4c27fcb5 | 11718 | #: builtin/index-pack.c:282 builtin/unpack-objects.c:94 |
a0b6b246 JX |
11719 | msgid "pack exceeds maximum allowed size" |
11720 | msgstr "包超过了最大允许值" | |
11721 | ||
4c27fcb5 | 11722 | #: builtin/index-pack.c:297 |
81809b99 | 11723 | #, c-format |
8ada9598 | 11724 | msgid "unable to create '%s'" |
81809b99 | 11725 | msgstr "不能创建 '%s'" |
8ada9598 | 11726 | |
4c27fcb5 | 11727 | #: builtin/index-pack.c:303 |
81809b99 | 11728 | #, c-format |
8ada9598 | 11729 | msgid "cannot open packfile '%s'" |
81809b99 | 11730 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 11731 | |
4c27fcb5 | 11732 | #: builtin/index-pack.c:317 |
8ada9598 | 11733 | msgid "pack signature mismatch" |
81809b99 | 11734 | msgstr "包签名不匹配" |
8ada9598 | 11735 | |
4c27fcb5 | 11736 | #: builtin/index-pack.c:319 |
ef317cd5 JX |
11737 | #, c-format |
11738 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 11739 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 11740 | |
4c27fcb5 | 11741 | #: builtin/index-pack.c:337 |
8ada9598 | 11742 | #, c-format |
5c57d762 JX |
11743 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
11744 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 11745 | |
4c27fcb5 | 11746 | #: builtin/index-pack.c:457 |
8ada9598 JX |
11747 | #, c-format |
11748 | msgid "inflate returned %d" | |
81809b99 | 11749 | msgstr "解压缩返回 %d" |
8ada9598 | 11750 | |
4c27fcb5 | 11751 | #: builtin/index-pack.c:506 |
8ada9598 | 11752 | msgid "offset value overflow for delta base object" |
81809b99 | 11753 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 11754 | |
4c27fcb5 | 11755 | #: builtin/index-pack.c:514 |
8ada9598 | 11756 | msgid "delta base offset is out of bound" |
81809b99 | 11757 | msgstr "delta 基准偏移越界" |
8ada9598 | 11758 | |
4c27fcb5 | 11759 | #: builtin/index-pack.c:522 |
81809b99 | 11760 | #, c-format |
8ada9598 | 11761 | msgid "unknown object type %d" |
81809b99 | 11762 | msgstr "未知对象类型 %d" |
8ada9598 | 11763 | |
4c27fcb5 | 11764 | #: builtin/index-pack.c:553 |
8ada9598 | 11765 | msgid "cannot pread pack file" |
81809b99 | 11766 | msgstr "无法读取包文件" |
8ada9598 | 11767 | |
4c27fcb5 | 11768 | #: builtin/index-pack.c:555 |
8ada9598 | 11769 | #, c-format |
5c57d762 JX |
11770 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
11771 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
11772 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
11773 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 11774 | |
4c27fcb5 | 11775 | #: builtin/index-pack.c:581 |
8ada9598 | 11776 | msgid "serious inflate inconsistency" |
81809b99 | 11777 | msgstr "解压缩严重的不一致" |
8ada9598 | 11778 | |
4c27fcb5 JX |
11779 | #: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 |
11780 | #: builtin/index-pack.c:794 builtin/index-pack.c:803 | |
8ada9598 JX |
11781 | #, c-format |
11782 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 11783 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 11784 | |
4c27fcb5 JX |
11785 | #: builtin/index-pack.c:729 builtin/pack-objects.c:151 |
11786 | #: builtin/pack-objects.c:211 builtin/pack-objects.c:305 | |
6792b93b JX |
11787 | #, c-format |
11788 | msgid "unable to read %s" | |
11789 | msgstr "不能读 %s" | |
11790 | ||
4c27fcb5 | 11791 | #: builtin/index-pack.c:792 |
87cb7997 JX |
11792 | #, c-format |
11793 | msgid "cannot read existing object info %s" | |
11794 | msgstr "不能读取现存对象信息 %s" | |
11795 | ||
4c27fcb5 | 11796 | #: builtin/index-pack.c:800 |
6792b93b JX |
11797 | #, c-format |
11798 | msgid "cannot read existing object %s" | |
11799 | msgstr "不能读取现存对象 %s" | |
11800 | ||
4c27fcb5 | 11801 | #: builtin/index-pack.c:814 |
81809b99 | 11802 | #, c-format |
8ada9598 | 11803 | msgid "invalid blob object %s" |
160fb2b2 | 11804 | msgstr "无效的数据对象 %s" |
8ada9598 | 11805 | |
4c27fcb5 | 11806 | #: builtin/index-pack.c:817 builtin/index-pack.c:836 |
fd8cb379 JX |
11807 | msgid "fsck error in packed object" |
11808 | msgstr "对打包对象 fsck 检查出错" | |
11809 | ||
4c27fcb5 | 11810 | #: builtin/index-pack.c:833 |
81809b99 | 11811 | #, c-format |
8ada9598 | 11812 | msgid "invalid %s" |
81809b99 | 11813 | msgstr "无效的 %s" |
8ada9598 | 11814 | |
4c27fcb5 | 11815 | #: builtin/index-pack.c:838 |
8ada9598 JX |
11816 | #, c-format |
11817 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 11818 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 11819 | |
4c27fcb5 | 11820 | #: builtin/index-pack.c:910 builtin/index-pack.c:941 |
8ada9598 | 11821 | msgid "failed to apply delta" |
c1ac5258 | 11822 | msgstr "应用 delta 失败" |
8ada9598 | 11823 | |
4c27fcb5 | 11824 | #: builtin/index-pack.c:1109 |
8ada9598 | 11825 | msgid "Receiving objects" |
81809b99 | 11826 | msgstr "接收对象中" |
8ada9598 | 11827 | |
4c27fcb5 | 11828 | #: builtin/index-pack.c:1109 |
8ada9598 | 11829 | msgid "Indexing objects" |
81809b99 | 11830 | msgstr "索引对象中" |
8ada9598 | 11831 | |
4c27fcb5 | 11832 | #: builtin/index-pack.c:1143 |
8ada9598 | 11833 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 11834 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 11835 | |
4c27fcb5 | 11836 | #: builtin/index-pack.c:1148 |
8ada9598 | 11837 | msgid "cannot fstat packfile" |
65e2041e | 11838 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 11839 | |
4c27fcb5 | 11840 | #: builtin/index-pack.c:1151 |
8ada9598 | 11841 | msgid "pack has junk at the end" |
81809b99 | 11842 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 11843 | |
4c27fcb5 | 11844 | #: builtin/index-pack.c:1163 |
6792b93b JX |
11845 | msgid "confusion beyond insanity in parse_pack_objects()" |
11846 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
11847 | ||
4c27fcb5 | 11848 | #: builtin/index-pack.c:1186 |
8ada9598 | 11849 | msgid "Resolving deltas" |
81809b99 | 11850 | msgstr "处理 delta 中" |
8ada9598 | 11851 | |
4c27fcb5 | 11852 | #: builtin/index-pack.c:1196 builtin/pack-objects.c:2492 |
07432cef | 11853 | #, c-format |
ef317cd5 | 11854 | msgid "unable to create thread: %s" |
07432cef | 11855 | msgstr "不能创建线程:%s" |
ef317cd5 | 11856 | |
4c27fcb5 | 11857 | #: builtin/index-pack.c:1237 |
8ada9598 | 11858 | msgid "confusion beyond insanity" |
81809b99 | 11859 | msgstr "不可理喻" |
8ada9598 | 11860 | |
4c27fcb5 | 11861 | #: builtin/index-pack.c:1243 |
ef317cd5 | 11862 | #, c-format |
5b04ee3b JX |
11863 | msgid "completed with %d local object" |
11864 | msgid_plural "completed with %d local objects" | |
11865 | msgstr[0] "完成 %d 个本地对象" | |
11866 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 11867 | |
4c27fcb5 | 11868 | #: builtin/index-pack.c:1255 |
ef317cd5 JX |
11869 | #, c-format |
11870 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 11871 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 11872 | |
4c27fcb5 | 11873 | #: builtin/index-pack.c:1259 |
8ada9598 JX |
11874 | #, c-format |
11875 | msgid "pack has %d unresolved delta" | |
11876 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 11877 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 11878 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 11879 | |
4c27fcb5 | 11880 | #: builtin/index-pack.c:1283 |
81809b99 | 11881 | #, c-format |
8ada9598 | 11882 | msgid "unable to deflate appended object (%d)" |
07432cef | 11883 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 11884 | |
4c27fcb5 | 11885 | #: builtin/index-pack.c:1360 |
8ada9598 JX |
11886 | #, c-format |
11887 | msgid "local object %s is corrupt" | |
81809b99 | 11888 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 11889 | |
4c27fcb5 | 11890 | #: builtin/index-pack.c:1374 |
31e5e17b JX |
11891 | #, c-format |
11892 | msgid "packfile name '%s' does not end with '.pack'" | |
11893 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 11894 | |
4c27fcb5 | 11895 | #: builtin/index-pack.c:1399 |
81809b99 | 11896 | #, c-format |
31e5e17b JX |
11897 | msgid "cannot write %s file '%s'" |
11898 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 11899 | |
4c27fcb5 | 11900 | #: builtin/index-pack.c:1407 |
81809b99 | 11901 | #, c-format |
31e5e17b JX |
11902 | msgid "cannot close written %s file '%s'" |
11903 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
11904 | ||
4c27fcb5 | 11905 | #: builtin/index-pack.c:1431 |
31e5e17b JX |
11906 | msgid "error while closing pack file" |
11907 | msgstr "关闭包文件时出错" | |
8ada9598 | 11908 | |
4c27fcb5 | 11909 | #: builtin/index-pack.c:1445 |
8ada9598 | 11910 | msgid "cannot store pack file" |
81809b99 | 11911 | msgstr "无法存储包文件" |
8ada9598 | 11912 | |
4c27fcb5 | 11913 | #: builtin/index-pack.c:1453 |
8ada9598 | 11914 | msgid "cannot store index file" |
81809b99 | 11915 | msgstr "无法存储索引文件" |
8ada9598 | 11916 | |
4c27fcb5 | 11917 | #: builtin/index-pack.c:1497 builtin/pack-objects.c:2727 |
07432cef | 11918 | #, c-format |
ef317cd5 | 11919 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 11920 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 11921 | |
4c27fcb5 | 11922 | #: builtin/index-pack.c:1565 |
81809b99 | 11923 | #, c-format |
8ada9598 | 11924 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 11925 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 11926 | |
4c27fcb5 | 11927 | #: builtin/index-pack.c:1567 |
81809b99 | 11928 | #, c-format |
8ada9598 | 11929 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 11930 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 11931 | |
4c27fcb5 | 11932 | #: builtin/index-pack.c:1615 |
81809b99 | 11933 | #, c-format |
8ada9598 JX |
11934 | msgid "non delta: %d object" |
11935 | msgid_plural "non delta: %d objects" | |
81809b99 | 11936 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 11937 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 11938 | |
4c27fcb5 | 11939 | #: builtin/index-pack.c:1622 |
8ada9598 JX |
11940 | #, c-format |
11941 | msgid "chain length = %d: %lu object" | |
11942 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 11943 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 11944 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 11945 | |
4c27fcb5 | 11946 | #: builtin/index-pack.c:1659 |
31e5e17b JX |
11947 | msgid "Cannot come back to cwd" |
11948 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 11949 | |
4c27fcb5 JX |
11950 | #: builtin/index-pack.c:1708 builtin/index-pack.c:1711 |
11951 | #: builtin/index-pack.c:1727 builtin/index-pack.c:1731 | |
81809b99 | 11952 | #, c-format |
8ada9598 | 11953 | msgid "bad %s" |
81809b99 | 11954 | msgstr "错误选项 %s" |
8ada9598 | 11955 | |
4c27fcb5 | 11956 | #: builtin/index-pack.c:1747 |
8ada9598 | 11957 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 11958 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 11959 | |
4c27fcb5 | 11960 | #: builtin/index-pack.c:1749 |
1a79b2f1 JX |
11961 | msgid "--stdin requires a git repository" |
11962 | msgstr "--stdin 需要一个 git 仓库" | |
11963 | ||
4c27fcb5 | 11964 | #: builtin/index-pack.c:1755 |
8ada9598 | 11965 | msgid "--verify with no packfile name given" |
dbd6cced | 11966 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 11967 | |
4c27fcb5 | 11968 | #: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 |
fd8cb379 JX |
11969 | msgid "fsck error in pack objects" |
11970 | msgstr "在打包对象中 fsck 检查出错" | |
11971 | ||
a4f16749 | 11972 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
11973 | #, c-format |
11974 | msgid "cannot stat template '%s'" | |
65e2041e | 11975 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 11976 | |
a4f16749 | 11977 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
11978 | #, c-format |
11979 | msgid "cannot opendir '%s'" | |
11980 | msgstr "不能打开目录 '%s'" | |
11981 | ||
c1ac5258 | 11982 | #: builtin/init-db.c:78 |
c04f5ac3 JX |
11983 | #, c-format |
11984 | msgid "cannot readlink '%s'" | |
11985 | msgstr "不能读取链接 '%s'" | |
11986 | ||
c1ac5258 | 11987 | #: builtin/init-db.c:80 |
c04f5ac3 JX |
11988 | #, c-format |
11989 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 11990 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 11991 | |
c1ac5258 | 11992 | #: builtin/init-db.c:86 |
c04f5ac3 JX |
11993 | #, c-format |
11994 | msgid "cannot copy '%s' to '%s'" | |
11995 | msgstr "不能拷贝 '%s' 至 '%s'" | |
11996 | ||
c1ac5258 | 11997 | #: builtin/init-db.c:90 |
c04f5ac3 JX |
11998 | #, c-format |
11999 | msgid "ignoring template %s" | |
12000 | msgstr "忽略模版 %s" | |
12001 | ||
c1ac5258 | 12002 | #: builtin/init-db.c:121 |
c04f5ac3 | 12003 | #, c-format |
fd8cb379 JX |
12004 | msgid "templates not found in %s" |
12005 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 12006 | |
c1ac5258 | 12007 | #: builtin/init-db.c:136 |
c04f5ac3 | 12008 | #, c-format |
5b04ee3b JX |
12009 | msgid "not copying templates from '%s': %s" |
12010 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 12011 | |
c1ac5258 | 12012 | #: builtin/init-db.c:329 |
c04f5ac3 JX |
12013 | #, c-format |
12014 | msgid "unable to handle file type %d" | |
12015 | msgstr "不能处理 %d 类型的文件" | |
12016 | ||
c1ac5258 | 12017 | #: builtin/init-db.c:332 |
c04f5ac3 JX |
12018 | #, c-format |
12019 | msgid "unable to move %s to %s" | |
12020 | msgstr "不能移动 %s 至 %s" | |
12021 | ||
c1ac5258 | 12022 | #: builtin/init-db.c:349 builtin/init-db.c:352 |
a0b6b246 JX |
12023 | #, c-format |
12024 | msgid "%s already exists" | |
12025 | msgstr "%s 已经存在" | |
12026 | ||
c1ac5258 | 12027 | #: builtin/init-db.c:405 |
c04f5ac3 | 12028 | #, c-format |
5c57d762 JX |
12029 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
12030 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 12031 | |
c1ac5258 | 12032 | #: builtin/init-db.c:406 |
5c57d762 JX |
12033 | #, c-format |
12034 | msgid "Reinitialized existing Git repository in %s%s\n" | |
12035 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 12036 | |
c1ac5258 | 12037 | #: builtin/init-db.c:410 |
5c57d762 JX |
12038 | #, c-format |
12039 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 12040 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 12041 | |
c1ac5258 | 12042 | #: builtin/init-db.c:411 |
5c57d762 JX |
12043 | #, c-format |
12044 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 12045 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 12046 | |
4c27fcb5 | 12047 | #: builtin/init-db.c:460 |
ef317cd5 | 12048 | msgid "" |
a77c07d9 | 12049 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 12050 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 12051 | msgstr "" |
07432cef | 12052 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 12053 | "[<目录>]" |
ef317cd5 | 12054 | |
4c27fcb5 | 12055 | #: builtin/init-db.c:483 |
ef317cd5 | 12056 | msgid "permissions" |
07432cef | 12057 | msgstr "权限" |
ef317cd5 | 12058 | |
4c27fcb5 | 12059 | #: builtin/init-db.c:484 |
ef317cd5 | 12060 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 12061 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 12062 | |
4c27fcb5 | 12063 | #: builtin/init-db.c:518 builtin/init-db.c:523 |
c1ac5258 JX |
12064 | #, c-format |
12065 | msgid "cannot mkdir %s" | |
12066 | msgstr "不能创建目录 %s" | |
12067 | ||
4c27fcb5 | 12068 | #: builtin/init-db.c:527 |
c04f5ac3 JX |
12069 | #, c-format |
12070 | msgid "cannot chdir to %s" | |
12071 | msgstr "不能切换目录到 %s" | |
12072 | ||
4c27fcb5 | 12073 | #: builtin/init-db.c:548 |
c04f5ac3 JX |
12074 | #, c-format |
12075 | msgid "" | |
12076 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
12077 | "dir=<directory>)" | |
1e607449 | 12078 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 12079 | |
4c27fcb5 | 12080 | #: builtin/init-db.c:576 |
c04f5ac3 JX |
12081 | #, c-format |
12082 | msgid "Cannot access work tree '%s'" | |
12083 | msgstr "不能访问工作区 '%s'" | |
12084 | ||
220c313c JX |
12085 | #: builtin/interpret-trailers.c:15 |
12086 | msgid "" | |
276ceeaa JX |
12087 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
12088 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
12089 | msgstr "" |
12090 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
12091 | ">])...] [<文件>...]" | |
276ceeaa | 12092 | |
4c27fcb5 | 12093 | #: builtin/interpret-trailers.c:94 |
276ceeaa JX |
12094 | msgid "edit files in place" |
12095 | msgstr "在原位编辑文件" | |
220c313c | 12096 | |
4c27fcb5 | 12097 | #: builtin/interpret-trailers.c:95 |
220c313c | 12098 | msgid "trim empty trailers" |
6937cb4e JX |
12099 | msgstr "删除空的尾部署名" |
12100 | ||
4c27fcb5 | 12101 | #: builtin/interpret-trailers.c:98 |
6937cb4e JX |
12102 | msgid "where to place the new trailer" |
12103 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 12104 | |
4c27fcb5 | 12105 | #: builtin/interpret-trailers.c:100 |
6937cb4e JX |
12106 | msgid "action if trailer already exists" |
12107 | msgstr "当尾部署名已经存在时所采取的动作" | |
12108 | ||
4c27fcb5 | 12109 | #: builtin/interpret-trailers.c:102 |
6937cb4e JX |
12110 | msgid "action if trailer is missing" |
12111 | msgstr "当尾部署名缺失时所采取的动作" | |
12112 | ||
4c27fcb5 | 12113 | #: builtin/interpret-trailers.c:104 |
6937cb4e JX |
12114 | msgid "output only the trailers" |
12115 | msgstr "只输出尾部署名" | |
12116 | ||
4c27fcb5 | 12117 | #: builtin/interpret-trailers.c:105 |
6937cb4e JX |
12118 | msgid "do not apply config rules" |
12119 | msgstr "不要应用配置规则" | |
12120 | ||
4c27fcb5 | 12121 | #: builtin/interpret-trailers.c:106 |
6937cb4e JX |
12122 | msgid "join whitespace-continued values" |
12123 | msgstr "连接空白折行的值" | |
12124 | ||
4c27fcb5 | 12125 | #: builtin/interpret-trailers.c:107 |
6937cb4e JX |
12126 | msgid "set parsing options" |
12127 | msgstr "设置解析选项" | |
12128 | ||
4c27fcb5 JX |
12129 | #: builtin/interpret-trailers.c:109 |
12130 | msgid "do not treat --- specially" | |
12131 | msgstr "不要对 --- 特殊处理" | |
12132 | ||
12133 | #: builtin/interpret-trailers.c:110 | |
220c313c | 12134 | msgid "trailer" |
6937cb4e | 12135 | msgstr "尾部署名" |
220c313c | 12136 | |
4c27fcb5 | 12137 | #: builtin/interpret-trailers.c:111 |
220c313c | 12138 | msgid "trailer(s) to add" |
6937cb4e | 12139 | msgstr "要添加的尾部署名" |
220c313c | 12140 | |
4c27fcb5 | 12141 | #: builtin/interpret-trailers.c:120 |
6937cb4e JX |
12142 | msgid "--trailer with --only-input does not make sense" |
12143 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
12144 | ||
4c27fcb5 | 12145 | #: builtin/interpret-trailers.c:130 |
276ceeaa JX |
12146 | msgid "no input file given for in-place editing" |
12147 | msgstr "没有给出要原位编辑的文件" | |
12148 | ||
4c27fcb5 | 12149 | #: builtin/log.c:54 |
7aea43ff | 12150 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 12151 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 12152 | |
4c27fcb5 | 12153 | #: builtin/log.c:55 |
814ff314 JX |
12154 | msgid "git show [<options>] <object>..." |
12155 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 12156 | |
4c27fcb5 | 12157 | #: builtin/log.c:99 |
220c313c JX |
12158 | #, c-format |
12159 | msgid "invalid --decorate option: %s" | |
12160 | msgstr "无效的 --decorate 选项:%s" | |
12161 | ||
4c27fcb5 | 12162 | #: builtin/log.c:162 |
ef317cd5 | 12163 | msgid "suppress diff output" |
07432cef | 12164 | msgstr "不显示差异输出" |
ef317cd5 | 12165 | |
4c27fcb5 | 12166 | #: builtin/log.c:163 |
ef317cd5 | 12167 | msgid "show source" |
07432cef | 12168 | msgstr "显示源" |
ef317cd5 | 12169 | |
4c27fcb5 | 12170 | #: builtin/log.c:164 |
07432cef WS |
12171 | msgid "Use mail map file" |
12172 | msgstr "使用邮件映射文件" | |
12173 | ||
4c27fcb5 | 12174 | #: builtin/log.c:166 |
5809aa05 JX |
12175 | msgid "only decorate refs that match <pattern>" |
12176 | msgstr "只修饰与 <模式> 匹配的引用" | |
12177 | ||
4c27fcb5 | 12178 | #: builtin/log.c:168 |
5809aa05 JX |
12179 | msgid "do not decorate refs that match <pattern>" |
12180 | msgstr "不修饰和 <模式> 匹配的引用" | |
12181 | ||
4c27fcb5 | 12182 | #: builtin/log.c:169 |
ef317cd5 | 12183 | msgid "decorate options" |
07432cef | 12184 | msgstr "修饰选项" |
ef317cd5 | 12185 | |
4c27fcb5 | 12186 | #: builtin/log.c:172 |
220c313c JX |
12187 | msgid "Process line range n,m in file, counting from 1" |
12188 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
12189 | ||
4c27fcb5 | 12190 | #: builtin/log.c:270 |
c04f5ac3 JX |
12191 | #, c-format |
12192 | msgid "Final output: %d %s\n" | |
12193 | msgstr "最终输出:%d %s\n" | |
12194 | ||
4c27fcb5 | 12195 | #: builtin/log.c:522 |
220c313c JX |
12196 | #, c-format |
12197 | msgid "git show %s: bad file" | |
12198 | msgstr "git show %s: 损坏的文件" | |
12199 | ||
4c27fcb5 | 12200 | #: builtin/log.c:537 builtin/log.c:631 |
c04f5ac3 JX |
12201 | #, c-format |
12202 | msgid "Could not read object %s" | |
90e6ef53 | 12203 | msgstr "不能读取对象 %s" |
c04f5ac3 | 12204 | |
4c27fcb5 | 12205 | #: builtin/log.c:655 |
c04f5ac3 JX |
12206 | #, c-format |
12207 | msgid "Unknown type: %d" | |
12208 | msgstr "未知类型:%d" | |
12209 | ||
4c27fcb5 | 12210 | #: builtin/log.c:776 |
c04f5ac3 JX |
12211 | msgid "format.headers without value" |
12212 | msgstr "format.headers 没有值" | |
12213 | ||
4c27fcb5 | 12214 | #: builtin/log.c:877 |
c04f5ac3 JX |
12215 | msgid "name of output directory is too long" |
12216 | msgstr "输出目录名太长" | |
12217 | ||
4c27fcb5 | 12218 | #: builtin/log.c:893 |
c04f5ac3 JX |
12219 | #, c-format |
12220 | msgid "Cannot open patch file %s" | |
12221 | msgstr "无法打开补丁文件 %s" | |
12222 | ||
4c27fcb5 | 12223 | #: builtin/log.c:910 |
c04f5ac3 JX |
12224 | msgid "Need exactly one range." |
12225 | msgstr "只需要一个范围。" | |
12226 | ||
4c27fcb5 | 12227 | #: builtin/log.c:920 |
c04f5ac3 JX |
12228 | msgid "Not a range." |
12229 | msgstr "不是一个范围。" | |
12230 | ||
4c27fcb5 | 12231 | #: builtin/log.c:1043 |
c04f5ac3 JX |
12232 | msgid "Cover letter needs email format" |
12233 | msgstr "信封需要邮件地址格式" | |
12234 | ||
4c27fcb5 | 12235 | #: builtin/log.c:1119 |
c04f5ac3 JX |
12236 | #, c-format |
12237 | msgid "insane in-reply-to: %s" | |
12238 | msgstr "不正常的 in-reply-to:%s" | |
12239 | ||
4c27fcb5 | 12240 | #: builtin/log.c:1146 |
814ff314 JX |
12241 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
12242 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 12243 | |
4c27fcb5 | 12244 | #: builtin/log.c:1204 |
c04f5ac3 JX |
12245 | msgid "Two output directories?" |
12246 | msgstr "两个输出目录?" | |
12247 | ||
4c27fcb5 | 12248 | #: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 |
5b04ee3b JX |
12249 | #, c-format |
12250 | msgid "Unknown commit %s" | |
12251 | msgstr "未知提交 %s" | |
12252 | ||
4c27fcb5 | 12253 | #: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526 |
5b04ee3b JX |
12254 | #, c-format |
12255 | msgid "Failed to resolve '%s' as a valid ref." | |
12256 | msgstr "无法解析 '%s' 为一个有效引用。" | |
12257 | ||
4c27fcb5 | 12258 | #: builtin/log.c:1326 |
5b04ee3b JX |
12259 | msgid "Could not find exact merge base." |
12260 | msgstr "不能找到准确的合并基线。" | |
12261 | ||
4c27fcb5 | 12262 | #: builtin/log.c:1330 |
5b04ee3b JX |
12263 | msgid "" |
12264 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
12265 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
12266 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
12267 | msgstr "" | |
12268 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 12269 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
58b6f078 | 12270 | "参数 --base=<基线提交> 手动指定一个基线提交。" |
5b04ee3b | 12271 | |
4c27fcb5 | 12272 | #: builtin/log.c:1350 |
5b04ee3b JX |
12273 | msgid "Failed to find exact merge base" |
12274 | msgstr "无法找到准确的合并基线" | |
12275 | ||
4c27fcb5 | 12276 | #: builtin/log.c:1361 |
5b04ee3b JX |
12277 | msgid "base commit should be the ancestor of revision list" |
12278 | msgstr "基线提交应该是版本列表的祖先" | |
12279 | ||
4c27fcb5 | 12280 | #: builtin/log.c:1365 |
5b04ee3b JX |
12281 | msgid "base commit shouldn't be in revision list" |
12282 | msgstr "基线提交不应该出现在版本列表中" | |
12283 | ||
4c27fcb5 | 12284 | #: builtin/log.c:1418 |
5b04ee3b | 12285 | msgid "cannot get patch id" |
aef18cc6 | 12286 | msgstr "无法得到补丁 id" |
5b04ee3b | 12287 | |
4c27fcb5 JX |
12288 | #: builtin/log.c:1470 |
12289 | msgid "failed to infer range-diff ranges" | |
12290 | msgstr "无法推断 range-diff 范围" | |
12291 | ||
12292 | #: builtin/log.c:1515 | |
ef317cd5 | 12293 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 12294 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 12295 | |
4c27fcb5 | 12296 | #: builtin/log.c:1518 |
ef317cd5 | 12297 | msgid "use [PATCH] even with multiple patches" |
07432cef | 12298 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 12299 | |
4c27fcb5 | 12300 | #: builtin/log.c:1522 |
ef317cd5 | 12301 | msgid "print patches to standard out" |
07432cef | 12302 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 12303 | |
4c27fcb5 | 12304 | #: builtin/log.c:1524 |
ef317cd5 | 12305 | msgid "generate a cover letter" |
07432cef | 12306 | msgstr "生成一封附信" |
c04f5ac3 | 12307 | |
4c27fcb5 | 12308 | #: builtin/log.c:1526 |
ef317cd5 | 12309 | msgid "use simple number sequence for output file names" |
07432cef | 12310 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 12311 | |
4c27fcb5 | 12312 | #: builtin/log.c:1527 |
ef317cd5 | 12313 | msgid "sfx" |
07432cef | 12314 | msgstr "后缀" |
ef317cd5 | 12315 | |
4c27fcb5 | 12316 | #: builtin/log.c:1528 |
ef317cd5 | 12317 | msgid "use <sfx> instead of '.patch'" |
07432cef | 12318 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 12319 | |
4c27fcb5 | 12320 | #: builtin/log.c:1530 |
ef317cd5 | 12321 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
12322 | msgstr "补丁以 <n> 开始编号,而不是1" |
12323 | ||
4c27fcb5 | 12324 | #: builtin/log.c:1532 |
07432cef WS |
12325 | msgid "mark the series as Nth re-roll" |
12326 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 12327 | |
4c27fcb5 | 12328 | #: builtin/log.c:1534 |
a0b6b246 JX |
12329 | msgid "Use [RFC PATCH] instead of [PATCH]" |
12330 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
12331 | ||
4c27fcb5 | 12332 | #: builtin/log.c:1537 |
ef317cd5 | 12333 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 12334 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 12335 | |
4c27fcb5 | 12336 | #: builtin/log.c:1540 |
ef317cd5 | 12337 | msgid "store resulting files in <dir>" |
d9d56b23 | 12338 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 12339 | |
4c27fcb5 | 12340 | #: builtin/log.c:1543 |
ef317cd5 | 12341 | msgid "don't strip/add [PATCH]" |
07432cef | 12342 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 12343 | |
4c27fcb5 | 12344 | #: builtin/log.c:1546 |
ef317cd5 | 12345 | msgid "don't output binary diffs" |
07432cef | 12346 | msgstr "不输出二进制差异" |
ef317cd5 | 12347 | |
4c27fcb5 | 12348 | #: builtin/log.c:1548 |
89f80d72 JX |
12349 | msgid "output all-zero hash in From header" |
12350 | msgstr "在 From 头信息中输出全为零的哈希值" | |
12351 | ||
4c27fcb5 | 12352 | #: builtin/log.c:1550 |
ef317cd5 | 12353 | msgid "don't include a patch matching a commit upstream" |
07432cef | 12354 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 12355 | |
4c27fcb5 | 12356 | #: builtin/log.c:1552 |
ef317cd5 | 12357 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 12358 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 12359 | |
4c27fcb5 | 12360 | #: builtin/log.c:1554 |
ef317cd5 | 12361 | msgid "Messaging" |
07432cef | 12362 | msgstr "邮件发送" |
ef317cd5 | 12363 | |
4c27fcb5 | 12364 | #: builtin/log.c:1555 |
ef317cd5 | 12365 | msgid "header" |
07432cef | 12366 | msgstr "header" |
ef317cd5 | 12367 | |
4c27fcb5 | 12368 | #: builtin/log.c:1556 |
ef317cd5 | 12369 | msgid "add email header" |
07432cef | 12370 | msgstr "添加邮件头" |
ef317cd5 | 12371 | |
4c27fcb5 | 12372 | #: builtin/log.c:1557 builtin/log.c:1559 |
ef317cd5 | 12373 | msgid "email" |
07432cef | 12374 | msgstr "邮件地址" |
ef317cd5 | 12375 | |
4c27fcb5 | 12376 | #: builtin/log.c:1557 |
ef317cd5 | 12377 | msgid "add To: header" |
07432cef | 12378 | msgstr "添加收件人" |
ef317cd5 | 12379 | |
4c27fcb5 | 12380 | #: builtin/log.c:1559 |
ef317cd5 | 12381 | msgid "add Cc: header" |
07432cef | 12382 | msgstr "添加抄送" |
ef317cd5 | 12383 | |
4c27fcb5 | 12384 | #: builtin/log.c:1561 |
2e8451e8 | 12385 | msgid "ident" |
d9d56b23 | 12386 | msgstr "标识" |
2e8451e8 | 12387 | |
4c27fcb5 | 12388 | #: builtin/log.c:1562 |
2e8451e8 | 12389 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 12390 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 12391 | |
4c27fcb5 | 12392 | #: builtin/log.c:1564 |
ef317cd5 | 12393 | msgid "message-id" |
d9d56b23 | 12394 | msgstr "邮件标识" |
ef317cd5 | 12395 | |
4c27fcb5 | 12396 | #: builtin/log.c:1565 |
ef317cd5 | 12397 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 12398 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 12399 | |
4c27fcb5 | 12400 | #: builtin/log.c:1566 builtin/log.c:1569 |
ef317cd5 | 12401 | msgid "boundary" |
07432cef | 12402 | msgstr "边界" |
ef317cd5 | 12403 | |
4c27fcb5 | 12404 | #: builtin/log.c:1567 |
ef317cd5 | 12405 | msgid "attach the patch" |
07432cef | 12406 | msgstr "附件方式添加补丁" |
ef317cd5 | 12407 | |
4c27fcb5 | 12408 | #: builtin/log.c:1570 |
ef317cd5 | 12409 | msgid "inline the patch" |
07432cef | 12410 | msgstr "内联显示补丁" |
ef317cd5 | 12411 | |
4c27fcb5 | 12412 | #: builtin/log.c:1574 |
ef317cd5 | 12413 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 12414 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 12415 | |
4c27fcb5 | 12416 | #: builtin/log.c:1576 |
ef317cd5 | 12417 | msgid "signature" |
07432cef | 12418 | msgstr "签名" |
ef317cd5 | 12419 | |
4c27fcb5 | 12420 | #: builtin/log.c:1577 |
ef317cd5 | 12421 | msgid "add a signature" |
07432cef | 12422 | msgstr "添加一个签名" |
ef317cd5 | 12423 | |
4c27fcb5 | 12424 | #: builtin/log.c:1578 |
5b04ee3b JX |
12425 | msgid "base-commit" |
12426 | msgstr "基线提交" | |
12427 | ||
4c27fcb5 | 12428 | #: builtin/log.c:1579 |
5b04ee3b JX |
12429 | msgid "add prerequisite tree info to the patch series" |
12430 | msgstr "为补丁列表添加前置树信息" | |
12431 | ||
4c27fcb5 | 12432 | #: builtin/log.c:1581 |
6acbf033 JX |
12433 | msgid "add a signature from a file" |
12434 | msgstr "从文件添加一个签名" | |
12435 | ||
4c27fcb5 | 12436 | #: builtin/log.c:1582 |
ef317cd5 | 12437 | msgid "don't print the patch filenames" |
07432cef | 12438 | msgstr "不要打印补丁文件名" |
ef317cd5 | 12439 | |
4c27fcb5 | 12440 | #: builtin/log.c:1584 |
6937cb4e JX |
12441 | msgid "show progress while generating patches" |
12442 | msgstr "在生成补丁时显示进度" | |
12443 | ||
4c27fcb5 JX |
12444 | #: builtin/log.c:1585 |
12445 | msgid "rev" | |
12446 | msgstr "版本" | |
12447 | ||
12448 | #: builtin/log.c:1586 | |
12449 | msgid "show changes against <rev> in cover letter or single patch" | |
12450 | msgstr "在附函或单个补丁中显示和 <rev> 的差异" | |
12451 | ||
12452 | #: builtin/log.c:1589 | |
12453 | msgid "show changes against <refspec> in cover letter or single patch" | |
12454 | msgstr "在附函或单个补丁中显示和 <refspec> 的差异" | |
12455 | ||
12456 | #: builtin/log.c:1591 | |
12457 | msgid "percentage by which creation is weighted" | |
12458 | msgstr "创建权重的百分比" | |
12459 | ||
12460 | #: builtin/log.c:1666 | |
a4f16749 JX |
12461 | #, c-format |
12462 | msgid "invalid ident line: %s" | |
12463 | msgstr "包含无效的身份标识:%s" | |
12464 | ||
4c27fcb5 | 12465 | #: builtin/log.c:1681 |
c1ac5258 JX |
12466 | msgid "-n and -k are mutually exclusive" |
12467 | msgstr "-n 和 -k 互斥" | |
c04f5ac3 | 12468 | |
4c27fcb5 | 12469 | #: builtin/log.c:1683 |
c1ac5258 JX |
12470 | msgid "--subject-prefix/--rfc and -k are mutually exclusive" |
12471 | msgstr "--subject-prefix/--rfc 和 -k 互斥" | |
c04f5ac3 | 12472 | |
4c27fcb5 | 12473 | #: builtin/log.c:1691 |
c04f5ac3 JX |
12474 | msgid "--name-only does not make sense" |
12475 | msgstr "--name-only 无意义" | |
12476 | ||
4c27fcb5 | 12477 | #: builtin/log.c:1693 |
c04f5ac3 JX |
12478 | msgid "--name-status does not make sense" |
12479 | msgstr "--name-status 无意义" | |
12480 | ||
4c27fcb5 | 12481 | #: builtin/log.c:1695 |
c04f5ac3 JX |
12482 | msgid "--check does not make sense" |
12483 | msgstr "--check 无意义" | |
12484 | ||
4c27fcb5 | 12485 | #: builtin/log.c:1727 |
c04f5ac3 JX |
12486 | msgid "standard output, or directory, which one?" |
12487 | msgstr "标准输出或目录,哪一个?" | |
12488 | ||
4c27fcb5 | 12489 | #: builtin/log.c:1729 |
c04f5ac3 JX |
12490 | #, c-format |
12491 | msgid "Could not create directory '%s'" | |
90e6ef53 | 12492 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 12493 | |
4c27fcb5 JX |
12494 | #: builtin/log.c:1816 |
12495 | msgid "--interdiff requires --cover-letter or single patch" | |
12496 | msgstr "--interdiff 需要 --cover-letter 或单一补丁" | |
12497 | ||
12498 | #: builtin/log.c:1820 | |
12499 | msgid "Interdiff:" | |
12500 | msgstr "版本间差异:" | |
12501 | ||
12502 | #: builtin/log.c:1821 | |
12503 | #, c-format | |
12504 | msgid "Interdiff against v%d:" | |
12505 | msgstr "对 v%d 的版本差异:" | |
12506 | ||
12507 | #: builtin/log.c:1827 | |
12508 | msgid "--creation-factor requires --range-diff" | |
12509 | msgstr "--creation-factor 需要 --range-diff" | |
12510 | ||
12511 | #: builtin/log.c:1831 | |
12512 | msgid "--range-diff requires --cover-letter or single patch" | |
12513 | msgstr "--range-diff 需要 --cover-letter 或单一补丁" | |
12514 | ||
12515 | #: builtin/log.c:1839 | |
12516 | msgid "Range-diff:" | |
12517 | msgstr "范围差异:" | |
12518 | ||
12519 | #: builtin/log.c:1840 | |
12520 | #, c-format | |
12521 | msgid "Range-diff against v%d:" | |
12522 | msgstr "对 v%d 的范围差异:" | |
12523 | ||
12524 | #: builtin/log.c:1851 | |
6acbf033 JX |
12525 | #, c-format |
12526 | msgid "unable to read signature file '%s'" | |
12527 | msgstr "无法读取签名文件 '%s'" | |
12528 | ||
4c27fcb5 | 12529 | #: builtin/log.c:1887 |
6937cb4e JX |
12530 | msgid "Generating patches" |
12531 | msgstr "生成补丁" | |
12532 | ||
4c27fcb5 | 12533 | #: builtin/log.c:1931 |
c04f5ac3 JX |
12534 | msgid "Failed to create output files" |
12535 | msgstr "无法创建输出文件" | |
12536 | ||
4c27fcb5 | 12537 | #: builtin/log.c:1989 |
ef317cd5 | 12538 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 12539 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 12540 | |
4c27fcb5 | 12541 | #: builtin/log.c:2043 |
c04f5ac3 JX |
12542 | #, c-format |
12543 | msgid "" | |
12544 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 12545 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 12546 | |
c1ac5258 | 12547 | #: builtin/ls-files.c:469 |
814ff314 JX |
12548 | msgid "git ls-files [<options>] [<file>...]" |
12549 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 12550 | |
4c27fcb5 | 12551 | #: builtin/ls-files.c:525 |
ef317cd5 | 12552 | msgid "identify the file status with tags" |
07432cef | 12553 | msgstr "用标签标识文件的状态" |
ef317cd5 | 12554 | |
4c27fcb5 | 12555 | #: builtin/ls-files.c:527 |
ef317cd5 | 12556 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 12557 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 12558 | |
4c27fcb5 | 12559 | #: builtin/ls-files.c:529 |
5809aa05 JX |
12560 | msgid "use lowercase letters for 'fsmonitor clean' files" |
12561 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
12562 | ||
4c27fcb5 | 12563 | #: builtin/ls-files.c:531 |
ef317cd5 | 12564 | msgid "show cached files in the output (default)" |
07432cef | 12565 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 12566 | |
4c27fcb5 | 12567 | #: builtin/ls-files.c:533 |
ef317cd5 | 12568 | msgid "show deleted files in the output" |
07432cef | 12569 | msgstr "显示已删除的文件" |
ef317cd5 | 12570 | |
4c27fcb5 | 12571 | #: builtin/ls-files.c:535 |
ef317cd5 | 12572 | msgid "show modified files in the output" |
07432cef | 12573 | msgstr "显示已修改的文件" |
ef317cd5 | 12574 | |
4c27fcb5 | 12575 | #: builtin/ls-files.c:537 |
ef317cd5 | 12576 | msgid "show other files in the output" |
07432cef | 12577 | msgstr "显示其它文件" |
ef317cd5 | 12578 | |
4c27fcb5 | 12579 | #: builtin/ls-files.c:539 |
ef317cd5 | 12580 | msgid "show ignored files in the output" |
07432cef | 12581 | msgstr "显示忽略的文件" |
ef317cd5 | 12582 | |
4c27fcb5 | 12583 | #: builtin/ls-files.c:542 |
ef317cd5 | 12584 | msgid "show staged contents' object name in the output" |
07432cef | 12585 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 12586 | |
4c27fcb5 | 12587 | #: builtin/ls-files.c:544 |
ef317cd5 | 12588 | msgid "show files on the filesystem that need to be removed" |
07432cef | 12589 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 12590 | |
4c27fcb5 | 12591 | #: builtin/ls-files.c:546 |
220c313c | 12592 | msgid "show 'other' directories' names only" |
07432cef | 12593 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 12594 | |
4c27fcb5 | 12595 | #: builtin/ls-files.c:548 |
276ceeaa JX |
12596 | msgid "show line endings of files" |
12597 | msgstr "显示文件换行符格式" | |
12598 | ||
4c27fcb5 | 12599 | #: builtin/ls-files.c:550 |
ef317cd5 | 12600 | msgid "don't show empty directories" |
07432cef | 12601 | msgstr "不显示空目录" |
ef317cd5 | 12602 | |
4c27fcb5 | 12603 | #: builtin/ls-files.c:553 |
ef317cd5 | 12604 | msgid "show unmerged files in the output" |
07432cef | 12605 | msgstr "显示未合并的文件" |
ef317cd5 | 12606 | |
4c27fcb5 | 12607 | #: builtin/ls-files.c:555 |
ef317cd5 | 12608 | msgid "show resolve-undo information" |
07432cef | 12609 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 12610 | |
4c27fcb5 | 12611 | #: builtin/ls-files.c:557 |
ef317cd5 | 12612 | msgid "skip files matching pattern" |
07432cef | 12613 | msgstr "匹配排除文件的模式" |
ef317cd5 | 12614 | |
4c27fcb5 | 12615 | #: builtin/ls-files.c:560 |
ef317cd5 | 12616 | msgid "exclude patterns are read from <file>" |
07432cef | 12617 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 12618 | |
4c27fcb5 | 12619 | #: builtin/ls-files.c:563 |
ef317cd5 | 12620 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 12621 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 12622 | |
4c27fcb5 | 12623 | #: builtin/ls-files.c:565 |
ef317cd5 | 12624 | msgid "add the standard git exclusions" |
07432cef | 12625 | msgstr "添加标准的 git 排除" |
ef317cd5 | 12626 | |
4c27fcb5 | 12627 | #: builtin/ls-files.c:569 |
ef317cd5 | 12628 | msgid "make the output relative to the project top directory" |
07432cef | 12629 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 12630 | |
4c27fcb5 | 12631 | #: builtin/ls-files.c:572 |
a0b6b246 JX |
12632 | msgid "recurse through submodules" |
12633 | msgstr "在子模组中递归" | |
12634 | ||
4c27fcb5 | 12635 | #: builtin/ls-files.c:574 |
ef317cd5 | 12636 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 12637 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 12638 | |
4c27fcb5 | 12639 | #: builtin/ls-files.c:575 |
ef317cd5 | 12640 | msgid "tree-ish" |
07432cef | 12641 | msgstr "树或提交" |
ef317cd5 | 12642 | |
4c27fcb5 | 12643 | #: builtin/ls-files.c:576 |
ef317cd5 | 12644 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 12645 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 12646 | |
4c27fcb5 | 12647 | #: builtin/ls-files.c:578 |
ef317cd5 | 12648 | msgid "show debugging data" |
07432cef | 12649 | msgstr "显示调试数据" |
ef317cd5 | 12650 | |
fd8cb379 | 12651 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
12652 | msgid "" |
12653 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
12654 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
12655 | " [--symref] [<repository> [<refs>...]]" | |
12656 | msgstr "" | |
12657 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
12658 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
12659 | " [--symref] [<仓库> [<引用>...]]" | |
12660 | ||
fd8cb379 | 12661 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
12662 | msgid "do not print remote URL" |
12663 | msgstr "不打印远程 URL" | |
12664 | ||
4c27fcb5 | 12665 | #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903 |
276ceeaa JX |
12666 | msgid "exec" |
12667 | msgstr "exec" | |
12668 | ||
fd8cb379 | 12669 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 |
276ceeaa JX |
12670 | msgid "path of git-upload-pack on the remote host" |
12671 | msgstr "远程主机上的 git-upload-pack 路径" | |
12672 | ||
fd8cb379 | 12673 | #: builtin/ls-remote.c:65 |
276ceeaa JX |
12674 | msgid "limit to tags" |
12675 | msgstr "仅限于标签" | |
12676 | ||
fd8cb379 | 12677 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
12678 | msgid "limit to heads" |
12679 | msgstr "仅限于分支" | |
12680 | ||
fd8cb379 | 12681 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
12682 | msgid "do not show peeled tags" |
12683 | msgstr "不显示已解析的标签" | |
12684 | ||
fd8cb379 | 12685 | #: builtin/ls-remote.c:69 |
276ceeaa JX |
12686 | msgid "take url.<base>.insteadOf into account" |
12687 | msgstr "参考 url.<base>.insteadOf 设置" | |
12688 | ||
fd8cb379 | 12689 | #: builtin/ls-remote.c:73 |
276ceeaa JX |
12690 | msgid "exit with exit code 2 if no matching refs are found" |
12691 | msgstr "若未找到匹配的引用则以退出码2退出" | |
12692 | ||
fd8cb379 | 12693 | #: builtin/ls-remote.c:76 |
276ceeaa JX |
12694 | msgid "show underlying ref in addition to the object pointed by it" |
12695 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
12696 | ||
c1ac5258 | 12697 | #: builtin/ls-tree.c:30 |
ef317cd5 | 12698 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 12699 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 12700 | |
c1ac5258 | 12701 | #: builtin/ls-tree.c:128 |
ef317cd5 | 12702 | msgid "only show trees" |
07432cef | 12703 | msgstr "只显示树" |
ef317cd5 | 12704 | |
c1ac5258 | 12705 | #: builtin/ls-tree.c:130 |
ef317cd5 | 12706 | msgid "recurse into subtrees" |
07432cef | 12707 | msgstr "递归到子树" |
ef317cd5 | 12708 | |
c1ac5258 | 12709 | #: builtin/ls-tree.c:132 |
ef317cd5 | 12710 | msgid "show trees when recursing" |
07432cef | 12711 | msgstr "当递归时显示树" |
ef317cd5 | 12712 | |
c1ac5258 | 12713 | #: builtin/ls-tree.c:135 |
ef317cd5 | 12714 | msgid "terminate entries with NUL byte" |
4375c10e | 12715 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 12716 | |
c1ac5258 | 12717 | #: builtin/ls-tree.c:136 |
ef317cd5 | 12718 | msgid "include object size" |
07432cef | 12719 | msgstr "包括对象大小" |
ef317cd5 | 12720 | |
c1ac5258 | 12721 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 12722 | msgid "list only filenames" |
07432cef | 12723 | msgstr "只列出文件名" |
ef317cd5 | 12724 | |
c1ac5258 | 12725 | #: builtin/ls-tree.c:143 |
ef317cd5 | 12726 | msgid "use full path names" |
07432cef | 12727 | msgstr "使用文件的全路径" |
ef317cd5 | 12728 | |
c1ac5258 | 12729 | #: builtin/ls-tree.c:145 |
ef317cd5 | 12730 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 12731 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 12732 | |
a4f16749 JX |
12733 | #: builtin/mailsplit.c:241 |
12734 | #, c-format | |
12735 | msgid "empty mbox: '%s'" | |
12736 | msgstr "空的 mbox:'%s'" | |
12737 | ||
4c27fcb5 | 12738 | #: builtin/merge.c:52 |
814ff314 JX |
12739 | msgid "git merge [<options>] [<commit>...]" |
12740 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 12741 | |
4c27fcb5 | 12742 | #: builtin/merge.c:53 |
ef317cd5 | 12743 | msgid "git merge --abort" |
07432cef | 12744 | msgstr "git merge --abort" |
ef317cd5 | 12745 | |
4c27fcb5 | 12746 | #: builtin/merge.c:54 |
1a79b2f1 JX |
12747 | msgid "git merge --continue" |
12748 | msgstr "git merge --continue" | |
12749 | ||
4c27fcb5 | 12750 | #: builtin/merge.c:111 |
c04f5ac3 JX |
12751 | msgid "switch `m' requires a value" |
12752 | msgstr "开关 `m' 需要一个值" | |
12753 | ||
4c27fcb5 | 12754 | #: builtin/merge.c:177 |
c04f5ac3 JX |
12755 | #, c-format |
12756 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 12757 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 12758 | |
4c27fcb5 | 12759 | #: builtin/merge.c:178 |
c04f5ac3 JX |
12760 | #, c-format |
12761 | msgid "Available strategies are:" | |
12762 | msgstr "可用的策略有:" | |
12763 | ||
4c27fcb5 | 12764 | #: builtin/merge.c:183 |
c04f5ac3 JX |
12765 | #, c-format |
12766 | msgid "Available custom strategies are:" | |
12767 | msgstr "可用的自定义策略有:" | |
12768 | ||
4c27fcb5 | 12769 | #: builtin/merge.c:234 builtin/pull.c:143 |
ef317cd5 | 12770 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 12771 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 12772 | |
4c27fcb5 | 12773 | #: builtin/merge.c:237 builtin/pull.c:146 |
ef317cd5 | 12774 | msgid "show a diffstat at the end of the merge" |
07432cef | 12775 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 12776 | |
4c27fcb5 | 12777 | #: builtin/merge.c:238 builtin/pull.c:149 |
ef317cd5 | 12778 | msgid "(synonym to --stat)" |
07432cef | 12779 | msgstr "(和 --stat 同义)" |
ef317cd5 | 12780 | |
4c27fcb5 | 12781 | #: builtin/merge.c:240 builtin/pull.c:152 |
ef317cd5 | 12782 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 12783 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 12784 | |
4c27fcb5 | 12785 | #: builtin/merge.c:243 builtin/pull.c:158 |
ef317cd5 | 12786 | msgid "create a single commit instead of doing a merge" |
07432cef | 12787 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 12788 | |
4c27fcb5 | 12789 | #: builtin/merge.c:245 builtin/pull.c:161 |
ef317cd5 | 12790 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 12791 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 12792 | |
4c27fcb5 | 12793 | #: builtin/merge.c:247 builtin/pull.c:164 |
ef317cd5 | 12794 | msgid "edit message before committing" |
07432cef | 12795 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 12796 | |
4c27fcb5 | 12797 | #: builtin/merge.c:248 |
ef317cd5 | 12798 | msgid "allow fast-forward (default)" |
07432cef | 12799 | msgstr "允许快进(默认)" |
ef317cd5 | 12800 | |
4c27fcb5 | 12801 | #: builtin/merge.c:250 builtin/pull.c:170 |
ef317cd5 | 12802 | msgid "abort if fast-forward is not possible" |
07432cef | 12803 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 12804 | |
4c27fcb5 | 12805 | #: builtin/merge.c:254 builtin/pull.c:173 |
5c57d762 | 12806 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
12807 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
12808 | ||
4c27fcb5 JX |
12809 | #: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177 |
12810 | #: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110 | |
ef317cd5 | 12811 | msgid "strategy" |
07432cef | 12812 | msgstr "策略" |
ef317cd5 | 12813 | |
4c27fcb5 | 12814 | #: builtin/merge.c:256 builtin/pull.c:178 |
ef317cd5 | 12815 | msgid "merge strategy to use" |
07432cef | 12816 | msgstr "要使用的合并策略" |
ef317cd5 | 12817 | |
4c27fcb5 | 12818 | #: builtin/merge.c:257 builtin/pull.c:181 |
ef317cd5 | 12819 | msgid "option=value" |
07432cef | 12820 | msgstr "option=value" |
ef317cd5 | 12821 | |
4c27fcb5 | 12822 | #: builtin/merge.c:258 builtin/pull.c:182 |
ef317cd5 | 12823 | msgid "option for selected merge strategy" |
07432cef | 12824 | msgstr "所选的合并策略的选项" |
ef317cd5 | 12825 | |
4c27fcb5 | 12826 | #: builtin/merge.c:260 |
ef317cd5 | 12827 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 12828 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 12829 | |
4c27fcb5 | 12830 | #: builtin/merge.c:267 |
ef317cd5 | 12831 | msgid "abort the current in-progress merge" |
07432cef | 12832 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 12833 | |
4c27fcb5 | 12834 | #: builtin/merge.c:269 |
1a79b2f1 JX |
12835 | msgid "continue the current in-progress merge" |
12836 | msgstr "继续当前正在进行的合并" | |
12837 | ||
4c27fcb5 | 12838 | #: builtin/merge.c:271 builtin/pull.c:189 |
5b04ee3b JX |
12839 | msgid "allow merging unrelated histories" |
12840 | msgstr "允许合并不相关的历史" | |
12841 | ||
4c27fcb5 | 12842 | #: builtin/merge.c:277 |
6937cb4e JX |
12843 | msgid "verify commit-msg hook" |
12844 | msgstr "校验 commit-msg 钩子" | |
12845 | ||
4c27fcb5 | 12846 | #: builtin/merge.c:302 |
c04f5ac3 | 12847 | msgid "could not run stash." |
a4f16749 | 12848 | msgstr "不能运行贮藏。" |
c04f5ac3 | 12849 | |
4c27fcb5 | 12850 | #: builtin/merge.c:307 |
c04f5ac3 | 12851 | msgid "stash failed" |
a4f16749 | 12852 | msgstr "贮藏失败" |
c04f5ac3 | 12853 | |
4c27fcb5 | 12854 | #: builtin/merge.c:312 |
c04f5ac3 JX |
12855 | #, c-format |
12856 | msgid "not a valid object: %s" | |
12857 | msgstr "不是一个有效对象:%s" | |
12858 | ||
4c27fcb5 | 12859 | #: builtin/merge.c:334 builtin/merge.c:351 |
c04f5ac3 JX |
12860 | msgid "read-tree failed" |
12861 | msgstr "读取树失败" | |
12862 | ||
90e6ef53 | 12863 | # 译者:注意保持前导空格 |
4c27fcb5 | 12864 | #: builtin/merge.c:381 |
c04f5ac3 JX |
12865 | msgid " (nothing to squash)" |
12866 | msgstr " (无可压缩)" | |
12867 | ||
4c27fcb5 | 12868 | #: builtin/merge.c:392 |
c04f5ac3 JX |
12869 | #, c-format |
12870 | msgid "Squash commit -- not updating HEAD\n" | |
12871 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
12872 | ||
4c27fcb5 | 12873 | #: builtin/merge.c:442 |
c04f5ac3 JX |
12874 | #, c-format |
12875 | msgid "No merge message -- not updating HEAD\n" | |
12876 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
12877 | ||
4c27fcb5 | 12878 | #: builtin/merge.c:493 |
c04f5ac3 JX |
12879 | #, c-format |
12880 | msgid "'%s' does not point to a commit" | |
12881 | msgstr "'%s' 没有指向一个提交" | |
12882 | ||
4c27fcb5 | 12883 | #: builtin/merge.c:580 |
c04f5ac3 JX |
12884 | #, c-format |
12885 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 12886 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 12887 | |
4c27fcb5 | 12888 | #: builtin/merge.c:701 |
c04f5ac3 | 12889 | msgid "Not handling anything other than two heads merge." |
29004bbb | 12890 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 12891 | |
4c27fcb5 | 12892 | #: builtin/merge.c:715 |
c04f5ac3 JX |
12893 | #, c-format |
12894 | msgid "Unknown option for merge-recursive: -X%s" | |
12895 | msgstr "merge-recursive 的未知选项:-X%s" | |
12896 | ||
4c27fcb5 | 12897 | #: builtin/merge.c:730 |
c04f5ac3 JX |
12898 | #, c-format |
12899 | msgid "unable to write %s" | |
12900 | msgstr "不能写 %s" | |
12901 | ||
4c27fcb5 | 12902 | #: builtin/merge.c:782 |
c04f5ac3 JX |
12903 | #, c-format |
12904 | msgid "Could not read from '%s'" | |
12905 | msgstr "不能从 '%s' 读取" | |
12906 | ||
4c27fcb5 | 12907 | #: builtin/merge.c:791 |
c04f5ac3 JX |
12908 | #, c-format |
12909 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
12910 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
12911 | ||
4c27fcb5 | 12912 | #: builtin/merge.c:797 |
a77c07d9 | 12913 | #, c-format |
c04f5ac3 JX |
12914 | msgid "" |
12915 | "Please enter a commit message to explain why this merge is necessary,\n" | |
12916 | "especially if it merges an updated upstream into a topic branch.\n" | |
12917 | "\n" | |
a77c07d9 | 12918 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
12919 | "the commit.\n" |
12920 | msgstr "" | |
12921 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
12922 | "合并到主题分支。\n" | |
12923 | "\n" | |
a77c07d9 | 12924 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 12925 | |
4c27fcb5 | 12926 | #: builtin/merge.c:833 |
c04f5ac3 JX |
12927 | msgid "Empty commit message." |
12928 | msgstr "空提交信息。" | |
12929 | ||
4c27fcb5 | 12930 | #: builtin/merge.c:852 |
c04f5ac3 JX |
12931 | #, c-format |
12932 | msgid "Wonderful.\n" | |
12933 | msgstr "太棒了。\n" | |
12934 | ||
4c27fcb5 | 12935 | #: builtin/merge.c:905 |
c04f5ac3 JX |
12936 | #, c-format |
12937 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
12938 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
12939 | ||
4c27fcb5 | 12940 | #: builtin/merge.c:944 |
c04f5ac3 | 12941 | msgid "No current branch." |
90e6ef53 | 12942 | msgstr "没有当前分支。" |
c04f5ac3 | 12943 | |
4c27fcb5 | 12944 | #: builtin/merge.c:946 |
c04f5ac3 | 12945 | msgid "No remote for the current branch." |
160fb2b2 | 12946 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 12947 | |
4c27fcb5 | 12948 | #: builtin/merge.c:948 |
c04f5ac3 | 12949 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 12950 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 12951 | |
4c27fcb5 | 12952 | #: builtin/merge.c:953 |
170e9899 | 12953 | #, c-format |
2e8451e8 JX |
12954 | msgid "No remote-tracking branch for %s from %s" |
12955 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 12956 | |
4c27fcb5 | 12957 | #: builtin/merge.c:1010 |
5c57d762 JX |
12958 | #, c-format |
12959 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 12960 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 12961 | |
4c27fcb5 | 12962 | #: builtin/merge.c:1113 |
5c57d762 JX |
12963 | #, c-format |
12964 | msgid "not something we can merge in %s: %s" | |
12965 | msgstr "不能在 %s 中合并:%s" | |
12966 | ||
4c27fcb5 | 12967 | #: builtin/merge.c:1147 |
5c57d762 JX |
12968 | msgid "not something we can merge" |
12969 | msgstr "不能合并" | |
12970 | ||
4c27fcb5 | 12971 | #: builtin/merge.c:1250 |
1a79b2f1 JX |
12972 | msgid "--abort expects no arguments" |
12973 | msgstr "--abort 不带参数" | |
12974 | ||
4c27fcb5 | 12975 | #: builtin/merge.c:1254 |
c04f5ac3 | 12976 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 12977 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 12978 | |
4c27fcb5 | 12979 | #: builtin/merge.c:1266 |
1a79b2f1 JX |
12980 | msgid "--continue expects no arguments" |
12981 | msgstr "--continue 不带参数" | |
12982 | ||
4c27fcb5 | 12983 | #: builtin/merge.c:1270 |
1a79b2f1 JX |
12984 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
12985 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
12986 | ||
4c27fcb5 | 12987 | #: builtin/merge.c:1286 |
c04f5ac3 JX |
12988 | msgid "" |
12989 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 12990 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
12991 | msgstr "" |
12992 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 12993 | "请在合并前先提交您的修改。" |
c04f5ac3 | 12994 | |
4c27fcb5 | 12995 | #: builtin/merge.c:1293 |
c04f5ac3 JX |
12996 | msgid "" |
12997 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 12998 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
12999 | msgstr "" |
13000 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 13001 | "请在合并前先提交您的修改。" |
c04f5ac3 | 13002 | |
4c27fcb5 | 13003 | #: builtin/merge.c:1296 |
c04f5ac3 JX |
13004 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
13005 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
13006 | ||
4c27fcb5 | 13007 | #: builtin/merge.c:1305 |
c04f5ac3 | 13008 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 13009 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 13010 | |
4c27fcb5 | 13011 | #: builtin/merge.c:1313 |
c04f5ac3 | 13012 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 13013 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 13014 | |
4c27fcb5 | 13015 | #: builtin/merge.c:1330 |
c04f5ac3 JX |
13016 | msgid "Squash commit into empty head not supported yet" |
13017 | msgstr "尚不支持到空分支的压缩提交" | |
13018 | ||
4c27fcb5 | 13019 | #: builtin/merge.c:1332 |
c04f5ac3 JX |
13020 | msgid "Non-fast-forward commit does not make sense into an empty head" |
13021 | msgstr "到空分支的非快进式提交没有意义" | |
13022 | ||
4c27fcb5 | 13023 | #: builtin/merge.c:1337 |
2e8451e8 JX |
13024 | #, c-format |
13025 | msgid "%s - not something we can merge" | |
13026 | msgstr "%s - 不能被合并" | |
13027 | ||
4c27fcb5 | 13028 | #: builtin/merge.c:1339 |
7aea43ff JX |
13029 | msgid "Can merge only exactly one commit into empty head" |
13030 | msgstr "只能将一个提交合并到空分支上" | |
13031 | ||
4c27fcb5 | 13032 | #: builtin/merge.c:1421 |
5b04ee3b JX |
13033 | msgid "refusing to merge unrelated histories" |
13034 | msgstr "拒绝合并无关的历史" | |
13035 | ||
4c27fcb5 | 13036 | #: builtin/merge.c:1430 |
6937cb4e | 13037 | msgid "Already up to date." |
5c57d762 JX |
13038 | msgstr "已经是最新的。" |
13039 | ||
4c27fcb5 | 13040 | #: builtin/merge.c:1440 |
c04f5ac3 JX |
13041 | #, c-format |
13042 | msgid "Updating %s..%s\n" | |
13043 | msgstr "更新 %s..%s\n" | |
13044 | ||
4c27fcb5 | 13045 | #: builtin/merge.c:1482 |
c04f5ac3 JX |
13046 | #, c-format |
13047 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 13048 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 13049 | |
4c27fcb5 | 13050 | #: builtin/merge.c:1489 |
c04f5ac3 JX |
13051 | #, c-format |
13052 | msgid "Nope.\n" | |
13053 | msgstr "无。\n" | |
13054 | ||
4c27fcb5 | 13055 | #: builtin/merge.c:1514 |
6937cb4e | 13056 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
13057 | msgstr "已经是最新的。耶!" |
13058 | ||
4c27fcb5 | 13059 | #: builtin/merge.c:1520 |
c04f5ac3 | 13060 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 13061 | msgstr "无法快进,终止。" |
c04f5ac3 | 13062 | |
4c27fcb5 | 13063 | #: builtin/merge.c:1543 builtin/merge.c:1622 |
c04f5ac3 JX |
13064 | #, c-format |
13065 | msgid "Rewinding the tree to pristine...\n" | |
13066 | msgstr "将树回滚至原始状态...\n" | |
13067 | ||
4c27fcb5 | 13068 | #: builtin/merge.c:1547 |
c04f5ac3 JX |
13069 | #, c-format |
13070 | msgid "Trying merge strategy %s...\n" | |
13071 | msgstr "尝试合并策略 %s...\n" | |
13072 | ||
4c27fcb5 | 13073 | #: builtin/merge.c:1613 |
c04f5ac3 JX |
13074 | #, c-format |
13075 | msgid "No merge strategy handled the merge.\n" | |
13076 | msgstr "没有合并策略处理此合并。\n" | |
13077 | ||
4c27fcb5 | 13078 | #: builtin/merge.c:1615 |
c04f5ac3 JX |
13079 | #, c-format |
13080 | msgid "Merge with strategy %s failed.\n" | |
13081 | msgstr "使用策略 %s 合并失败。\n" | |
13082 | ||
4c27fcb5 | 13083 | #: builtin/merge.c:1624 |
c04f5ac3 JX |
13084 | #, c-format |
13085 | msgid "Using the %s to prepare resolving by hand.\n" | |
13086 | msgstr "使用 %s 以准备手工解决。\n" | |
13087 | ||
4c27fcb5 | 13088 | #: builtin/merge.c:1636 |
c04f5ac3 JX |
13089 | #, c-format |
13090 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
13091 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
13092 | ||
4c27fcb5 | 13093 | #: builtin/merge-base.c:32 |
814ff314 JX |
13094 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
13095 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 13096 | |
4c27fcb5 | 13097 | #: builtin/merge-base.c:33 |
814ff314 JX |
13098 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
13099 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 13100 | |
4c27fcb5 | 13101 | #: builtin/merge-base.c:34 |
ef317cd5 | 13102 | msgid "git merge-base --independent <commit>..." |
07432cef | 13103 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 13104 | |
4c27fcb5 | 13105 | #: builtin/merge-base.c:35 |
ef317cd5 | 13106 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 13107 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 13108 | |
4c27fcb5 | 13109 | #: builtin/merge-base.c:36 |
cfff71a9 | 13110 | msgid "git merge-base --fork-point <ref> [<commit>]" |
d9d56b23 | 13111 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 | 13112 | |
4c27fcb5 | 13113 | #: builtin/merge-base.c:153 |
ef317cd5 | 13114 | msgid "output all common ancestors" |
07432cef | 13115 | msgstr "输出所有共同的祖先" |
ef317cd5 | 13116 | |
4c27fcb5 | 13117 | #: builtin/merge-base.c:155 |
ef317cd5 | 13118 | msgid "find ancestors for a single n-way merge" |
07432cef | 13119 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 13120 | |
4c27fcb5 | 13121 | #: builtin/merge-base.c:157 |
ef317cd5 | 13122 | msgid "list revs not reachable from others" |
07432cef | 13123 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 13124 | |
4c27fcb5 | 13125 | #: builtin/merge-base.c:159 |
ef317cd5 | 13126 | msgid "is the first one ancestor of the other?" |
07432cef | 13127 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 13128 | |
4c27fcb5 | 13129 | #: builtin/merge-base.c:161 |
cfff71a9 | 13130 | msgid "find where <commit> forked from reflog of <ref>" |
e397e7e3 | 13131 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 13132 | |
a4f16749 | 13133 | #: builtin/merge-file.c:9 |
ef317cd5 | 13134 | msgid "" |
814ff314 JX |
13135 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
13136 | "<orig-file> <file2>" | |
ef317cd5 | 13137 | msgstr "" |
814ff314 JX |
13138 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
13139 | "件> <文件2>" | |
ef317cd5 | 13140 | |
4c27fcb5 | 13141 | #: builtin/merge-file.c:35 |
ef317cd5 | 13142 | msgid "send results to standard output" |
07432cef | 13143 | msgstr "将结果发送到标准输出" |
ef317cd5 | 13144 | |
4c27fcb5 | 13145 | #: builtin/merge-file.c:36 |
ef317cd5 | 13146 | msgid "use a diff3 based merge" |
07432cef | 13147 | msgstr "使用基于 diff3 的合并" |
ef317cd5 | 13148 | |
4c27fcb5 | 13149 | #: builtin/merge-file.c:37 |
ef317cd5 | 13150 | msgid "for conflicts, use our version" |
07432cef | 13151 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 | 13152 | |
4c27fcb5 | 13153 | #: builtin/merge-file.c:39 |
ef317cd5 | 13154 | msgid "for conflicts, use their version" |
07432cef | 13155 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 | 13156 | |
4c27fcb5 | 13157 | #: builtin/merge-file.c:41 |
ef317cd5 | 13158 | msgid "for conflicts, use a union version" |
07432cef | 13159 | msgstr "如果冲突,使用联合版本" |
ef317cd5 | 13160 | |
4c27fcb5 | 13161 | #: builtin/merge-file.c:44 |
ef317cd5 | 13162 | msgid "for conflicts, use this marker size" |
07432cef | 13163 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 | 13164 | |
4c27fcb5 | 13165 | #: builtin/merge-file.c:45 |
ef317cd5 | 13166 | msgid "do not warn about conflicts" |
07432cef | 13167 | msgstr "不要警告冲突" |
ef317cd5 | 13168 | |
4c27fcb5 | 13169 | #: builtin/merge-file.c:47 |
814ff314 JX |
13170 | msgid "set labels for file1/orig-file/file2" |
13171 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 13172 | |
a0b6b246 JX |
13173 | #: builtin/merge-recursive.c:45 |
13174 | #, c-format | |
13175 | msgid "unknown option %s" | |
13176 | msgstr "未知选项 %s" | |
13177 | ||
13178 | #: builtin/merge-recursive.c:51 | |
13179 | #, c-format | |
13180 | msgid "could not parse object '%s'" | |
13181 | msgstr "不能解析对象 '%s'" | |
13182 | ||
13183 | #: builtin/merge-recursive.c:55 | |
13184 | #, c-format | |
13185 | msgid "cannot handle more than %d base. Ignoring %s." | |
13186 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
13187 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
13188 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
13189 | ||
13190 | #: builtin/merge-recursive.c:63 | |
13191 | msgid "not handling anything other than two heads merge." | |
13192 | msgstr "不能处理两个头合并之外的任何操作。" | |
13193 | ||
13194 | #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 | |
13195 | #, c-format | |
13196 | msgid "could not resolve ref '%s'" | |
13197 | msgstr "无法解析引用 '%s'" | |
13198 | ||
13199 | #: builtin/merge-recursive.c:77 | |
13200 | #, c-format | |
13201 | msgid "Merging %s with %s\n" | |
13202 | msgstr "合并 %s 和 %s\n" | |
13203 | ||
c1ac5258 | 13204 | #: builtin/mktree.c:66 |
ef317cd5 | 13205 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 13206 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 13207 | |
c1ac5258 | 13208 | #: builtin/mktree.c:154 |
ef317cd5 | 13209 | msgid "input is NUL terminated" |
07432cef | 13210 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 13211 | |
c1ac5258 | 13212 | #: builtin/mktree.c:155 builtin/write-tree.c:25 |
ef317cd5 | 13213 | msgid "allow missing objects" |
07432cef | 13214 | msgstr "允许丢失的对象" |
c04f5ac3 | 13215 | |
c1ac5258 | 13216 | #: builtin/mktree.c:156 |
ef317cd5 | 13217 | msgid "allow creation of more than one tree" |
07432cef | 13218 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 13219 | |
4c27fcb5 JX |
13220 | #: builtin/multi-pack-index.c:8 |
13221 | msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" | |
13222 | msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)" | |
13223 | ||
13224 | #: builtin/multi-pack-index.c:21 | |
13225 | msgid "object directory containing set of packfile and pack-index pairs" | |
13226 | msgstr "包含成对包文件和包索引的对象目录" | |
13227 | ||
13228 | #: builtin/multi-pack-index.c:39 | |
13229 | msgid "too many arguments" | |
13230 | msgstr "太多参数" | |
13231 | ||
13232 | #: builtin/multi-pack-index.c:48 | |
13233 | #, c-format | |
13234 | msgid "unrecognized verb: %s" | |
13235 | msgstr "未能识别的动作:%s" | |
13236 | ||
a4f16749 | 13237 | #: builtin/mv.c:17 |
814ff314 JX |
13238 | msgid "git mv [<options>] <source>... <destination>" |
13239 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 13240 | |
fd8cb379 | 13241 | #: builtin/mv.c:82 |
220c313c JX |
13242 | #, c-format |
13243 | msgid "Directory %s is in index and no submodule?" | |
13244 | msgstr "目录 %s 在索引中并且不是子模组?" | |
13245 | ||
c1ac5258 | 13246 | #: builtin/mv.c:84 |
220c313c | 13247 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 13248 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 13249 | |
fd8cb379 | 13250 | #: builtin/mv.c:102 |
220c313c JX |
13251 | #, c-format |
13252 | msgid "%.*s is in index" | |
13253 | msgstr "%.*s 在索引中" | |
13254 | ||
fd8cb379 | 13255 | #: builtin/mv.c:124 |
ef317cd5 | 13256 | msgid "force move/rename even if target exists" |
07432cef | 13257 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 13258 | |
fd8cb379 | 13259 | #: builtin/mv.c:126 |
ef317cd5 | 13260 | msgid "skip move/rename errors" |
07432cef | 13261 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 13262 | |
31e5e17b | 13263 | #: builtin/mv.c:168 |
220c313c JX |
13264 | #, c-format |
13265 | msgid "destination '%s' is not a directory" | |
13266 | msgstr "目标 '%s' 不是一个目录" | |
13267 | ||
31e5e17b | 13268 | #: builtin/mv.c:179 |
c04f5ac3 JX |
13269 | #, c-format |
13270 | msgid "Checking rename of '%s' to '%s'\n" | |
13271 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
13272 | ||
31e5e17b | 13273 | #: builtin/mv.c:183 |
c04f5ac3 JX |
13274 | msgid "bad source" |
13275 | msgstr "坏的源" | |
13276 | ||
31e5e17b | 13277 | #: builtin/mv.c:186 |
c04f5ac3 JX |
13278 | msgid "can not move directory into itself" |
13279 | msgstr "不能将目录移动到自身" | |
13280 | ||
31e5e17b | 13281 | #: builtin/mv.c:189 |
c04f5ac3 JX |
13282 | msgid "cannot move directory over file" |
13283 | msgstr "不能将目录移动到文件" | |
13284 | ||
31e5e17b | 13285 | #: builtin/mv.c:198 |
c04f5ac3 JX |
13286 | msgid "source directory is empty" |
13287 | msgstr "源目录为空" | |
13288 | ||
31e5e17b | 13289 | #: builtin/mv.c:223 |
c04f5ac3 JX |
13290 | msgid "not under version control" |
13291 | msgstr "不在版本控制之下" | |
13292 | ||
31e5e17b | 13293 | #: builtin/mv.c:226 |
c04f5ac3 JX |
13294 | msgid "destination exists" |
13295 | msgstr "目标已存在" | |
13296 | ||
31e5e17b | 13297 | #: builtin/mv.c:234 |
c04f5ac3 JX |
13298 | #, c-format |
13299 | msgid "overwriting '%s'" | |
13300 | msgstr "覆盖 '%s'" | |
13301 | ||
31e5e17b | 13302 | #: builtin/mv.c:237 |
c04f5ac3 JX |
13303 | msgid "Cannot overwrite" |
13304 | msgstr "不能覆盖" | |
13305 | ||
31e5e17b | 13306 | #: builtin/mv.c:240 |
c04f5ac3 JX |
13307 | msgid "multiple sources for the same target" |
13308 | msgstr "同一目标具有多个源" | |
13309 | ||
31e5e17b | 13310 | #: builtin/mv.c:242 |
cfff71a9 JX |
13311 | msgid "destination directory does not exist" |
13312 | msgstr "目标目录不存在" | |
13313 | ||
31e5e17b | 13314 | #: builtin/mv.c:249 |
c04f5ac3 JX |
13315 | #, c-format |
13316 | msgid "%s, source=%s, destination=%s" | |
13317 | msgstr "%s,源=%s,目标=%s" | |
13318 | ||
31e5e17b | 13319 | #: builtin/mv.c:270 |
c04f5ac3 JX |
13320 | #, c-format |
13321 | msgid "Renaming %s to %s\n" | |
13322 | msgstr "重命名 %s 至 %s\n" | |
13323 | ||
4c27fcb5 | 13324 | #: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511 |
c04f5ac3 JX |
13325 | #, c-format |
13326 | msgid "renaming '%s' failed" | |
13327 | msgstr "重命名 '%s' 失败" | |
13328 | ||
c1ac5258 | 13329 | #: builtin/name-rev.c:355 |
814ff314 JX |
13330 | msgid "git name-rev [<options>] <commit>..." |
13331 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 13332 | |
c1ac5258 | 13333 | #: builtin/name-rev.c:356 |
814ff314 JX |
13334 | msgid "git name-rev [<options>] --all" |
13335 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 13336 | |
c1ac5258 | 13337 | #: builtin/name-rev.c:357 |
814ff314 JX |
13338 | msgid "git name-rev [<options>] --stdin" |
13339 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 13340 | |
c1ac5258 | 13341 | #: builtin/name-rev.c:413 |
ef317cd5 | 13342 | msgid "print only names (no SHA-1)" |
07432cef | 13343 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 13344 | |
c1ac5258 | 13345 | #: builtin/name-rev.c:414 |
ef317cd5 | 13346 | msgid "only use tags to name the commits" |
55a16ee4 | 13347 | msgstr "只使用标签来命名提交" |
ef317cd5 | 13348 | |
c1ac5258 | 13349 | #: builtin/name-rev.c:416 |
ef317cd5 | 13350 | msgid "only use refs matching <pattern>" |
07432cef | 13351 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 13352 | |
c1ac5258 | 13353 | #: builtin/name-rev.c:418 |
87cb7997 JX |
13354 | msgid "ignore refs matching <pattern>" |
13355 | msgstr "忽略和 <模式> 相匹配的引用" | |
13356 | ||
c1ac5258 | 13357 | #: builtin/name-rev.c:420 |
ef317cd5 | 13358 | msgid "list all commits reachable from all refs" |
07432cef | 13359 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 13360 | |
c1ac5258 | 13361 | #: builtin/name-rev.c:421 |
ef317cd5 | 13362 | msgid "read from stdin" |
07432cef | 13363 | msgstr "从标准输入读取" |
ef317cd5 | 13364 | |
c1ac5258 | 13365 | #: builtin/name-rev.c:422 |
90314792 JX |
13366 | msgid "allow to print `undefined` names (default)" |
13367 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 13368 | |
c1ac5258 | 13369 | #: builtin/name-rev.c:428 |
2e8451e8 | 13370 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 13371 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 13372 | |
c1ac5258 | 13373 | #: builtin/notes.c:28 |
814ff314 | 13374 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 13375 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 13376 | |
c1ac5258 | 13377 | #: builtin/notes.c:29 |
ef317cd5 | 13378 | msgid "" |
814ff314 | 13379 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 13380 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 13381 | msgstr "" |
04cb2f28 JX |
13382 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
13383 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 13384 | |
c1ac5258 | 13385 | #: builtin/notes.c:30 |
814ff314 | 13386 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 13387 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 13388 | |
c1ac5258 | 13389 | #: builtin/notes.c:31 |
ef317cd5 | 13390 | msgid "" |
814ff314 | 13391 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 13392 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 13393 | msgstr "" |
04cb2f28 JX |
13394 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
13395 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 13396 | |
c1ac5258 | 13397 | #: builtin/notes.c:32 |
814ff314 | 13398 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 13399 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 13400 | |
c1ac5258 | 13401 | #: builtin/notes.c:33 |
814ff314 | 13402 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 13403 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 13404 | |
c1ac5258 | 13405 | #: builtin/notes.c:34 |
ef317cd5 | 13406 | msgid "" |
814ff314 | 13407 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 13408 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 13409 | |
c1ac5258 | 13410 | #: builtin/notes.c:35 |
ef317cd5 | 13411 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 13412 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 13413 | |
c1ac5258 | 13414 | #: builtin/notes.c:36 |
ef317cd5 | 13415 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 13416 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 13417 | |
c1ac5258 | 13418 | #: builtin/notes.c:37 |
814ff314 | 13419 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 13420 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 13421 | |
c1ac5258 | 13422 | #: builtin/notes.c:38 |
5809aa05 JX |
13423 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
13424 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 13425 | |
c1ac5258 | 13426 | #: builtin/notes.c:39 |
814ff314 | 13427 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 13428 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 13429 | |
c1ac5258 | 13430 | #: builtin/notes.c:44 |
ef317cd5 | 13431 | msgid "git notes [list [<object>]]" |
07432cef | 13432 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 13433 | |
c1ac5258 | 13434 | #: builtin/notes.c:49 |
ef317cd5 | 13435 | msgid "git notes add [<options>] [<object>]" |
07432cef | 13436 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 13437 | |
c1ac5258 | 13438 | #: builtin/notes.c:54 |
ef317cd5 | 13439 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 13440 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 13441 | |
c1ac5258 | 13442 | #: builtin/notes.c:55 |
ef317cd5 | 13443 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 13444 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 13445 | |
c1ac5258 | 13446 | #: builtin/notes.c:60 |
ef317cd5 | 13447 | msgid "git notes append [<options>] [<object>]" |
07432cef | 13448 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 13449 | |
c1ac5258 | 13450 | #: builtin/notes.c:65 |
ef317cd5 | 13451 | msgid "git notes edit [<object>]" |
07432cef | 13452 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 13453 | |
c1ac5258 | 13454 | #: builtin/notes.c:70 |
ef317cd5 | 13455 | msgid "git notes show [<object>]" |
07432cef | 13456 | msgstr "git notes show [<对象>]" |
ef317cd5 | 13457 | |
c1ac5258 | 13458 | #: builtin/notes.c:75 |
814ff314 | 13459 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 13460 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 13461 | |
c1ac5258 | 13462 | #: builtin/notes.c:76 |
ef317cd5 | 13463 | msgid "git notes merge --commit [<options>]" |
07432cef | 13464 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 13465 | |
c1ac5258 | 13466 | #: builtin/notes.c:77 |
ef317cd5 | 13467 | msgid "git notes merge --abort [<options>]" |
07432cef | 13468 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 13469 | |
c1ac5258 | 13470 | #: builtin/notes.c:82 |
ef317cd5 | 13471 | msgid "git notes remove [<object>]" |
07432cef | 13472 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 13473 | |
c1ac5258 | 13474 | #: builtin/notes.c:87 |
ef317cd5 | 13475 | msgid "git notes prune [<options>]" |
07432cef | 13476 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 13477 | |
c1ac5258 | 13478 | #: builtin/notes.c:92 |
ef317cd5 | 13479 | msgid "git notes get-ref" |
07432cef | 13480 | msgstr "git notes get-ref" |
ef317cd5 | 13481 | |
c1ac5258 | 13482 | #: builtin/notes.c:97 |
5c57d762 JX |
13483 | msgid "Write/edit the notes for the following object:" |
13484 | msgstr "为下面的对象写/编辑说明:" | |
13485 | ||
c1ac5258 | 13486 | #: builtin/notes.c:150 |
c04f5ac3 JX |
13487 | #, c-format |
13488 | msgid "unable to start 'show' for object '%s'" | |
13489 | msgstr "不能为对象 '%s' 开始 'show'" | |
13490 | ||
c1ac5258 | 13491 | #: builtin/notes.c:154 |
a77c07d9 JX |
13492 | msgid "could not read 'show' output" |
13493 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 13494 | |
c1ac5258 | 13495 | #: builtin/notes.c:162 |
c04f5ac3 JX |
13496 | #, c-format |
13497 | msgid "failed to finish 'show' for object '%s'" | |
13498 | msgstr "无法为对象 '%s' 完成 'show'" | |
13499 | ||
c1ac5258 | 13500 | #: builtin/notes.c:197 |
a0b6b246 | 13501 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
13502 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
13503 | ||
c1ac5258 | 13504 | #: builtin/notes.c:206 |
c04f5ac3 JX |
13505 | msgid "unable to write note object" |
13506 | msgstr "不能写注解对象" | |
13507 | ||
c1ac5258 | 13508 | #: builtin/notes.c:208 |
c04f5ac3 | 13509 | #, c-format |
a0b6b246 | 13510 | msgid "the note contents have been left in %s" |
220c313c | 13511 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 13512 | |
4c27fcb5 | 13513 | #: builtin/notes.c:242 builtin/tag.c:513 |
c04f5ac3 JX |
13514 | #, c-format |
13515 | msgid "could not open or read '%s'" | |
13516 | msgstr "不能打开或读取 '%s'" | |
13517 | ||
4c27fcb5 JX |
13518 | #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 |
13519 | #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524 | |
13520 | #: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669 | |
a0b6b246 JX |
13521 | #, c-format |
13522 | msgid "failed to resolve '%s' as a valid ref." | |
13523 | msgstr "无法解析 '%s' 为一个有效引用。" | |
13524 | ||
4c27fcb5 | 13525 | #: builtin/notes.c:265 |
c04f5ac3 | 13526 | #, c-format |
a0b6b246 | 13527 | msgid "failed to read object '%s'." |
c1ac5258 | 13528 | msgstr "读取对象 '%s' 失败。" |
c04f5ac3 | 13529 | |
4c27fcb5 | 13530 | #: builtin/notes.c:268 |
6c94aba5 | 13531 | #, c-format |
a0b6b246 JX |
13532 | msgid "cannot read note data from non-blob object '%s'." |
13533 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
13534 | ||
4c27fcb5 | 13535 | #: builtin/notes.c:309 |
a0b6b246 JX |
13536 | #, c-format |
13537 | msgid "malformed input line: '%s'." | |
fd8cb379 | 13538 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 13539 | |
4c27fcb5 | 13540 | #: builtin/notes.c:324 |
a0b6b246 JX |
13541 | #, c-format |
13542 | msgid "failed to copy notes from '%s' to '%s'" | |
13543 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 13544 | |
a4f16749 JX |
13545 | #. TRANSLATORS: the first %s will be replaced by a git |
13546 | #. notes command: 'add', 'merge', 'remove', etc. | |
13547 | #. | |
4c27fcb5 | 13548 | #: builtin/notes.c:356 |
a0b6b246 JX |
13549 | #, c-format |
13550 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
13551 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
13552 | ||
4c27fcb5 JX |
13553 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507 |
13554 | #: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662 | |
13555 | #: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980 | |
c04f5ac3 JX |
13556 | msgid "too many parameters" |
13557 | msgstr "参数太多" | |
13558 | ||
4c27fcb5 | 13559 | #: builtin/notes.c:389 builtin/notes.c:675 |
c04f5ac3 | 13560 | #, c-format |
a0b6b246 | 13561 | msgid "no note found for object %s." |
c04f5ac3 JX |
13562 | msgstr "未发现对象 %s 的注解。" |
13563 | ||
4c27fcb5 | 13564 | #: builtin/notes.c:410 builtin/notes.c:573 |
ef317cd5 | 13565 | msgid "note contents as a string" |
07432cef | 13566 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 13567 | |
4c27fcb5 | 13568 | #: builtin/notes.c:413 builtin/notes.c:576 |
ef317cd5 | 13569 | msgid "note contents in a file" |
07432cef | 13570 | msgstr "注解内容到一个文件中" |
ef317cd5 | 13571 | |
4c27fcb5 | 13572 | #: builtin/notes.c:416 builtin/notes.c:579 |
ef317cd5 | 13573 | msgid "reuse and edit specified note object" |
07432cef | 13574 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 13575 | |
4c27fcb5 | 13576 | #: builtin/notes.c:419 builtin/notes.c:582 |
ef317cd5 | 13577 | msgid "reuse specified note object" |
07432cef | 13578 | msgstr "重用指定的注解对象" |
ef317cd5 | 13579 | |
4c27fcb5 | 13580 | #: builtin/notes.c:422 builtin/notes.c:585 |
04cb2f28 JX |
13581 | msgid "allow storing empty note" |
13582 | msgstr "允许保存空白注释" | |
13583 | ||
4c27fcb5 | 13584 | #: builtin/notes.c:423 builtin/notes.c:494 |
ef317cd5 | 13585 | msgid "replace existing notes" |
07432cef | 13586 | msgstr "替换已存在的注解" |
ef317cd5 | 13587 | |
4c27fcb5 | 13588 | #: builtin/notes.c:448 |
c04f5ac3 JX |
13589 | #, c-format |
13590 | msgid "" | |
13591 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
13592 | "existing notes" | |
13593 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
13594 | ||
4c27fcb5 | 13595 | #: builtin/notes.c:463 builtin/notes.c:542 |
c04f5ac3 JX |
13596 | #, c-format |
13597 | msgid "Overwriting existing notes for object %s\n" | |
13598 | msgstr "覆盖对象 %s 现存注解\n" | |
13599 | ||
4c27fcb5 | 13600 | #: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899 |
04cb2f28 JX |
13601 | #, c-format |
13602 | msgid "Removing note for object %s\n" | |
13603 | msgstr "删除对象 %s 的注解\n" | |
13604 | ||
4c27fcb5 | 13605 | #: builtin/notes.c:495 |
ef317cd5 | 13606 | msgid "read objects from stdin" |
07432cef | 13607 | msgstr "从标准输入读取对象" |
ef317cd5 | 13608 | |
4c27fcb5 | 13609 | #: builtin/notes.c:497 |
ef317cd5 | 13610 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 13611 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 13612 | |
4c27fcb5 | 13613 | #: builtin/notes.c:515 |
c04f5ac3 JX |
13614 | msgid "too few parameters" |
13615 | msgstr "参数太少" | |
13616 | ||
4c27fcb5 | 13617 | #: builtin/notes.c:536 |
c04f5ac3 JX |
13618 | #, c-format |
13619 | msgid "" | |
13620 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
13621 | "existing notes" | |
13622 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
13623 | ||
4c27fcb5 | 13624 | #: builtin/notes.c:548 |
c04f5ac3 | 13625 | #, c-format |
a0b6b246 | 13626 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
13627 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
13628 | ||
4c27fcb5 | 13629 | #: builtin/notes.c:600 |
ef317cd5 JX |
13630 | #, c-format |
13631 | msgid "" | |
13632 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
13633 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
13634 | msgstr "" | |
13635 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
13636 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
13637 | ||
4c27fcb5 | 13638 | #: builtin/notes.c:695 |
a0b6b246 | 13639 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 13640 | msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 13641 | |
4c27fcb5 | 13642 | #: builtin/notes.c:697 |
a0b6b246 | 13643 | msgid "failed to delete ref NOTES_MERGE_REF" |
c1ac5258 | 13644 | msgstr "删除引用 NOTES_MERGE_REF 失败" |
a0b6b246 | 13645 | |
4c27fcb5 | 13646 | #: builtin/notes.c:699 |
a0b6b246 | 13647 | msgid "failed to remove 'git notes merge' worktree" |
c1ac5258 | 13648 | msgstr "删除 'git notes merge' 工作区失败" |
a0b6b246 | 13649 | |
4c27fcb5 | 13650 | #: builtin/notes.c:719 |
a0b6b246 | 13651 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 13652 | msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 13653 | |
4c27fcb5 | 13654 | #: builtin/notes.c:721 |
a0b6b246 JX |
13655 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
13656 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
13657 | ||
4c27fcb5 | 13658 | #: builtin/notes.c:723 |
a0b6b246 JX |
13659 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
13660 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
13661 | ||
4c27fcb5 | 13662 | #: builtin/notes.c:736 |
a0b6b246 | 13663 | msgid "failed to resolve NOTES_MERGE_REF" |
c1ac5258 | 13664 | msgstr "解析 NOTES_MERGE_REF 失败" |
a0b6b246 | 13665 | |
4c27fcb5 | 13666 | #: builtin/notes.c:739 |
a0b6b246 JX |
13667 | msgid "failed to finalize notes merge" |
13668 | msgstr "无法完成注解合并" | |
13669 | ||
4c27fcb5 | 13670 | #: builtin/notes.c:765 |
5c57d762 JX |
13671 | #, c-format |
13672 | msgid "unknown notes merge strategy %s" | |
13673 | msgstr "未知的注解合并策略 %s" | |
13674 | ||
4c27fcb5 | 13675 | #: builtin/notes.c:781 |
ef317cd5 | 13676 | msgid "General options" |
07432cef | 13677 | msgstr "通用选项" |
ef317cd5 | 13678 | |
4c27fcb5 | 13679 | #: builtin/notes.c:783 |
ef317cd5 | 13680 | msgid "Merge options" |
07432cef | 13681 | msgstr "合并选项" |
ef317cd5 | 13682 | |
4c27fcb5 | 13683 | #: builtin/notes.c:785 |
ef317cd5 JX |
13684 | msgid "" |
13685 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
13686 | "cat_sort_uniq)" | |
07432cef | 13687 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 13688 | |
4c27fcb5 | 13689 | #: builtin/notes.c:787 |
ef317cd5 | 13690 | msgid "Committing unmerged notes" |
07432cef | 13691 | msgstr "提交未合并的注解" |
ef317cd5 | 13692 | |
4c27fcb5 | 13693 | #: builtin/notes.c:789 |
ef317cd5 | 13694 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 13695 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 13696 | |
4c27fcb5 | 13697 | #: builtin/notes.c:791 |
ef317cd5 | 13698 | msgid "Aborting notes merge resolution" |
07432cef | 13699 | msgstr "中止注解合并的方案" |
ef317cd5 | 13700 | |
4c27fcb5 | 13701 | #: builtin/notes.c:793 |
ef317cd5 | 13702 | msgid "abort notes merge" |
07432cef | 13703 | msgstr "中止注解合并" |
ef317cd5 | 13704 | |
4c27fcb5 | 13705 | #: builtin/notes.c:804 |
5c57d762 JX |
13706 | msgid "cannot mix --commit, --abort or -s/--strategy" |
13707 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
13708 | ||
4c27fcb5 | 13709 | #: builtin/notes.c:809 |
a0b6b246 | 13710 | msgid "must specify a notes ref to merge" |
9a4b694c | 13711 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 13712 | |
4c27fcb5 | 13713 | #: builtin/notes.c:833 |
5c57d762 | 13714 | #, c-format |
a0b6b246 | 13715 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
13716 | msgstr "未知的 -s/--strategy:%s" |
13717 | ||
4c27fcb5 | 13718 | #: builtin/notes.c:870 |
1b7f4a34 | 13719 | #, c-format |
a0b6b246 JX |
13720 | msgid "a notes merge into %s is already in-progress at %s" |
13721 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 13722 | |
4c27fcb5 | 13723 | #: builtin/notes.c:873 |
5c57d762 | 13724 | #, c-format |
a0b6b246 JX |
13725 | msgid "failed to store link to current notes ref (%s)" |
13726 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 13727 | |
4c27fcb5 | 13728 | #: builtin/notes.c:875 |
5c57d762 JX |
13729 | #, c-format |
13730 | msgid "" | |
13731 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
13732 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
13733 | "abort'.\n" | |
a0b6b246 JX |
13734 | msgstr "" |
13735 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
13736 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 13737 | |
4c27fcb5 | 13738 | #: builtin/notes.c:897 |
ef317cd5 JX |
13739 | #, c-format |
13740 | msgid "Object %s has no note\n" | |
13741 | msgstr "对象 %s 没有注解\n" | |
13742 | ||
4c27fcb5 | 13743 | #: builtin/notes.c:909 |
ef317cd5 | 13744 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 13745 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 13746 | |
4c27fcb5 | 13747 | #: builtin/notes.c:912 |
ef317cd5 | 13748 | msgid "read object names from the standard input" |
07432cef | 13749 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 13750 | |
4c27fcb5 | 13751 | #: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164 |
5c57d762 JX |
13752 | msgid "do not remove, show only" |
13753 | msgstr "不删除,只显示" | |
13754 | ||
4c27fcb5 | 13755 | #: builtin/notes.c:951 |
5c57d762 JX |
13756 | msgid "report pruned notes" |
13757 | msgstr "报告清除的注解" | |
13758 | ||
4c27fcb5 | 13759 | #: builtin/notes.c:993 |
6c94aba5 | 13760 | msgid "notes-ref" |
07432cef | 13761 | msgstr "注解引用" |
ef317cd5 | 13762 | |
4c27fcb5 | 13763 | #: builtin/notes.c:994 |
814ff314 | 13764 | msgid "use notes from <notes-ref>" |
07432cef | 13765 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 13766 | |
4c27fcb5 | 13767 | #: builtin/notes.c:1029 |
ef317cd5 | 13768 | #, c-format |
a0b6b246 | 13769 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
13770 | msgstr "未知子命令:%s" |
13771 | ||
4c27fcb5 | 13772 | #: builtin/pack-objects.c:51 |
1b7f4a34 JX |
13773 | msgid "" |
13774 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
13775 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 13776 | |
4c27fcb5 | 13777 | #: builtin/pack-objects.c:52 |
1b7f4a34 JX |
13778 | msgid "" |
13779 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 13780 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 13781 | |
4c27fcb5 | 13782 | #: builtin/pack-objects.c:422 |
ef317cd5 | 13783 | #, c-format |
c1ac5258 JX |
13784 | msgid "bad packed object CRC for %s" |
13785 | msgstr "%s 错的包对象 CRC" | |
13786 | ||
4c27fcb5 | 13787 | #: builtin/pack-objects.c:433 |
c1ac5258 JX |
13788 | #, c-format |
13789 | msgid "corrupt packed object for %s" | |
13790 | msgstr "%s 损坏的包对象" | |
13791 | ||
4c27fcb5 | 13792 | #: builtin/pack-objects.c:564 |
c1ac5258 JX |
13793 | #, c-format |
13794 | msgid "recursive delta detected for object %s" | |
13795 | msgstr "发现对象 %s 递归 delta" | |
13796 | ||
4c27fcb5 | 13797 | #: builtin/pack-objects.c:775 |
c1ac5258 JX |
13798 | #, c-format |
13799 | msgid "ordered %u objects, expected %<PRIu32>" | |
13800 | msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" | |
13801 | ||
4c27fcb5 | 13802 | #: builtin/pack-objects.c:788 |
c1ac5258 JX |
13803 | #, c-format |
13804 | msgid "packfile is invalid: %s" | |
13805 | msgstr "无效的包文件:%s" | |
13806 | ||
4c27fcb5 | 13807 | #: builtin/pack-objects.c:792 |
c1ac5258 JX |
13808 | #, c-format |
13809 | msgid "unable to open packfile for reuse: %s" | |
13810 | msgstr "无法为重用打开包文件:%s" | |
13811 | ||
4c27fcb5 | 13812 | #: builtin/pack-objects.c:796 |
c1ac5258 JX |
13813 | msgid "unable to seek in reused packfile" |
13814 | msgstr "无法在重用的包文件中查找" | |
ef317cd5 | 13815 | |
4c27fcb5 | 13816 | #: builtin/pack-objects.c:807 |
c1ac5258 JX |
13817 | msgid "unable to read from reused packfile" |
13818 | msgstr "无法读取索引文件" | |
13819 | ||
4c27fcb5 | 13820 | #: builtin/pack-objects.c:835 |
5b04ee3b JX |
13821 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
13822 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
13823 | ||
4c27fcb5 | 13824 | #: builtin/pack-objects.c:848 |
6c94aba5 JX |
13825 | msgid "Writing objects" |
13826 | msgstr "写入对象中" | |
13827 | ||
4c27fcb5 | 13828 | #: builtin/pack-objects.c:910 builtin/update-index.c:88 |
c1ac5258 JX |
13829 | #, c-format |
13830 | msgid "failed to stat %s" | |
13831 | msgstr "对 %s 调用 stat 失败" | |
13832 | ||
4c27fcb5 | 13833 | #: builtin/pack-objects.c:963 |
c1ac5258 JX |
13834 | #, c-format |
13835 | msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" | |
13836 | msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" | |
13837 | ||
4c27fcb5 | 13838 | #: builtin/pack-objects.c:1157 |
6c94aba5 JX |
13839 | msgid "disabling bitmap writing, as some objects are not being packed" |
13840 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
13841 | ||
4c27fcb5 | 13842 | #: builtin/pack-objects.c:1585 |
c1ac5258 JX |
13843 | #, c-format |
13844 | msgid "delta base offset overflow in pack for %s" | |
13845 | msgstr "%s 压缩中 delta 基准偏移越界" | |
13846 | ||
4c27fcb5 | 13847 | #: builtin/pack-objects.c:1594 |
c1ac5258 JX |
13848 | #, c-format |
13849 | msgid "delta base offset out of bound for %s" | |
13850 | msgstr "%s 的 delta 基准偏移越界" | |
13851 | ||
4c27fcb5 | 13852 | #: builtin/pack-objects.c:1863 |
fd8cb379 JX |
13853 | msgid "Counting objects" |
13854 | msgstr "对象计数中" | |
13855 | ||
4c27fcb5 | 13856 | #: builtin/pack-objects.c:1998 |
fd8cb379 JX |
13857 | #, c-format |
13858 | msgid "unable to get size of %s" | |
13859 | msgstr "不能得到 %s 的大小" | |
13860 | ||
4c27fcb5 | 13861 | #: builtin/pack-objects.c:2013 |
fd8cb379 JX |
13862 | #, c-format |
13863 | msgid "unable to parse object header of %s" | |
13864 | msgstr "无法解析对象 %s 头信息" | |
13865 | ||
4c27fcb5 JX |
13866 | #: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099 |
13867 | #: builtin/pack-objects.c:2109 | |
c1ac5258 JX |
13868 | #, c-format |
13869 | msgid "object %s cannot be read" | |
13870 | msgstr "对象 %s 无法读取" | |
13871 | ||
4c27fcb5 | 13872 | #: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113 |
c1ac5258 | 13873 | #, c-format |
4c27fcb5 JX |
13874 | msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" |
13875 | msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)" | |
c1ac5258 | 13876 | |
4c27fcb5 | 13877 | #: builtin/pack-objects.c:2123 |
c1ac5258 JX |
13878 | msgid "suboptimal pack - out of memory" |
13879 | msgstr "次优(suboptimal)打包 - 内存不足" | |
13880 | ||
4c27fcb5 | 13881 | #: builtin/pack-objects.c:2451 |
c1ac5258 JX |
13882 | #, c-format |
13883 | msgid "Delta compression using up to %d threads" | |
13884 | msgstr "使用 %d 个线程进行压缩" | |
13885 | ||
4c27fcb5 | 13886 | #: builtin/pack-objects.c:2583 |
c1ac5258 JX |
13887 | #, c-format |
13888 | msgid "unable to pack objects reachable from tag %s" | |
13889 | msgstr "无法为标签 %s 压缩对象" | |
13890 | ||
4c27fcb5 | 13891 | #: builtin/pack-objects.c:2670 |
6c94aba5 JX |
13892 | msgid "Compressing objects" |
13893 | msgstr "压缩对象中" | |
13894 | ||
4c27fcb5 | 13895 | #: builtin/pack-objects.c:2676 |
c1ac5258 JX |
13896 | msgid "inconsistency with delta count" |
13897 | msgstr "不一致的差异计数" | |
13898 | ||
13899 | # | |
4c27fcb5 | 13900 | #: builtin/pack-objects.c:2753 |
c1ac5258 JX |
13901 | #, c-format |
13902 | msgid "" | |
13903 | "expected edge object ID, got garbage:\n" | |
13904 | " %s" | |
13905 | msgstr "" | |
13906 | "预期边界对象(edge object)ID,却得到垃圾数据:\n" | |
13907 | " %s" | |
13908 | ||
4c27fcb5 | 13909 | #: builtin/pack-objects.c:2759 |
c1ac5258 JX |
13910 | #, c-format |
13911 | msgid "" | |
13912 | "expected object ID, got garbage:\n" | |
13913 | " %s" | |
13914 | msgstr "" | |
13915 | "预期对象 ID,却得到垃圾数据:\n" | |
13916 | " %s" | |
13917 | ||
4c27fcb5 | 13918 | #: builtin/pack-objects.c:2857 |
5809aa05 JX |
13919 | msgid "invalid value for --missing" |
13920 | msgstr "选项 --missing 的值无效" | |
13921 | ||
4c27fcb5 | 13922 | #: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024 |
c1ac5258 JX |
13923 | msgid "cannot open pack index" |
13924 | msgstr "无法打开包文件索引" | |
13925 | ||
4c27fcb5 | 13926 | #: builtin/pack-objects.c:2947 |
c1ac5258 JX |
13927 | #, c-format |
13928 | msgid "loose object at %s could not be examined" | |
13929 | msgstr "无法检查 %s 处的松散对象" | |
13930 | ||
4c27fcb5 | 13931 | #: builtin/pack-objects.c:3032 |
c1ac5258 JX |
13932 | msgid "unable to force loose object" |
13933 | msgstr "无法强制松散对象" | |
13934 | ||
4c27fcb5 | 13935 | #: builtin/pack-objects.c:3122 |
c1ac5258 JX |
13936 | #, c-format |
13937 | msgid "not a rev '%s'" | |
13938 | msgstr "不是一个版本 '%s'" | |
13939 | ||
4c27fcb5 | 13940 | #: builtin/pack-objects.c:3125 |
c1ac5258 JX |
13941 | #, c-format |
13942 | msgid "bad revision '%s'" | |
13943 | msgstr "坏的版本 '%s'" | |
13944 | ||
4c27fcb5 | 13945 | #: builtin/pack-objects.c:3150 |
c1ac5258 JX |
13946 | msgid "unable to add recent objects" |
13947 | msgstr "无法添加最近的对象" | |
13948 | ||
4c27fcb5 | 13949 | #: builtin/pack-objects.c:3203 |
ef317cd5 JX |
13950 | #, c-format |
13951 | msgid "unsupported index version %s" | |
13952 | msgstr "不支持的索引版本 %s" | |
13953 | ||
4c27fcb5 | 13954 | #: builtin/pack-objects.c:3207 |
ef317cd5 JX |
13955 | #, c-format |
13956 | msgid "bad index version '%s'" | |
13957 | msgstr "坏的索引版本 '%s'" | |
13958 | ||
4c27fcb5 | 13959 | #: builtin/pack-objects.c:3237 |
ef317cd5 | 13960 | msgid "do not show progress meter" |
07432cef | 13961 | msgstr "不显示进度表" |
ef317cd5 | 13962 | |
4c27fcb5 | 13963 | #: builtin/pack-objects.c:3239 |
ef317cd5 | 13964 | msgid "show progress meter" |
07432cef | 13965 | msgstr "显示进度表" |
ef317cd5 | 13966 | |
4c27fcb5 | 13967 | #: builtin/pack-objects.c:3241 |
ef317cd5 | 13968 | msgid "show progress meter during object writing phase" |
07432cef | 13969 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 13970 | |
4c27fcb5 | 13971 | #: builtin/pack-objects.c:3244 |
ef317cd5 | 13972 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 13973 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 13974 | |
4c27fcb5 | 13975 | #: builtin/pack-objects.c:3245 |
c1ac5258 JX |
13976 | msgid "<version>[,<offset>]" |
13977 | msgstr "<版本>[,<偏移>]" | |
ef317cd5 | 13978 | |
4c27fcb5 | 13979 | #: builtin/pack-objects.c:3246 |
ef317cd5 | 13980 | msgid "write the pack index file in the specified idx format version" |
07432cef | 13981 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 13982 | |
4c27fcb5 | 13983 | #: builtin/pack-objects.c:3249 |
ef317cd5 | 13984 | msgid "maximum size of each output pack file" |
07432cef | 13985 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 13986 | |
4c27fcb5 | 13987 | #: builtin/pack-objects.c:3251 |
ef317cd5 | 13988 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 13989 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 13990 | |
4c27fcb5 | 13991 | #: builtin/pack-objects.c:3253 |
ef317cd5 | 13992 | msgid "ignore packed objects" |
07432cef | 13993 | msgstr "忽略包对象" |
ef317cd5 | 13994 | |
4c27fcb5 | 13995 | #: builtin/pack-objects.c:3255 |
ef317cd5 | 13996 | msgid "limit pack window by objects" |
07432cef | 13997 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 13998 | |
4c27fcb5 | 13999 | #: builtin/pack-objects.c:3257 |
ef317cd5 | 14000 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 14001 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 14002 | |
4c27fcb5 | 14003 | #: builtin/pack-objects.c:3259 |
ef317cd5 | 14004 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 14005 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 14006 | |
4c27fcb5 | 14007 | #: builtin/pack-objects.c:3261 |
ef317cd5 | 14008 | msgid "reuse existing deltas" |
07432cef | 14009 | msgstr "重用已存在的 deltas" |
ef317cd5 | 14010 | |
4c27fcb5 | 14011 | #: builtin/pack-objects.c:3263 |
ef317cd5 | 14012 | msgid "reuse existing objects" |
07432cef | 14013 | msgstr "重用已存在的对象" |
ef317cd5 | 14014 | |
4c27fcb5 | 14015 | #: builtin/pack-objects.c:3265 |
ef317cd5 | 14016 | msgid "use OFS_DELTA objects" |
07432cef | 14017 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 14018 | |
4c27fcb5 | 14019 | #: builtin/pack-objects.c:3267 |
ef317cd5 | 14020 | msgid "use threads when searching for best delta matches" |
07432cef | 14021 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 14022 | |
4c27fcb5 | 14023 | #: builtin/pack-objects.c:3269 |
ef317cd5 | 14024 | msgid "do not create an empty pack output" |
07432cef | 14025 | msgstr "不创建空的包输出" |
ef317cd5 | 14026 | |
4c27fcb5 | 14027 | #: builtin/pack-objects.c:3271 |
ef317cd5 | 14028 | msgid "read revision arguments from standard input" |
d9d56b23 | 14029 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 14030 | |
4c27fcb5 | 14031 | #: builtin/pack-objects.c:3273 |
ef317cd5 | 14032 | msgid "limit the objects to those that are not yet packed" |
07432cef | 14033 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 14034 | |
4c27fcb5 | 14035 | #: builtin/pack-objects.c:3276 |
ef317cd5 | 14036 | msgid "include objects reachable from any reference" |
07432cef | 14037 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 14038 | |
4c27fcb5 | 14039 | #: builtin/pack-objects.c:3279 |
ef317cd5 | 14040 | msgid "include objects referred by reflog entries" |
07432cef | 14041 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 14042 | |
4c27fcb5 | 14043 | #: builtin/pack-objects.c:3282 |
220c313c JX |
14044 | msgid "include objects referred to by the index" |
14045 | msgstr "包括被索引引用到的对象" | |
14046 | ||
4c27fcb5 | 14047 | #: builtin/pack-objects.c:3285 |
ef317cd5 | 14048 | msgid "output pack to stdout" |
07432cef | 14049 | msgstr "输出包到标准输出" |
ef317cd5 | 14050 | |
4c27fcb5 | 14051 | #: builtin/pack-objects.c:3287 |
ef317cd5 | 14052 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 14053 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 14054 | |
4c27fcb5 | 14055 | #: builtin/pack-objects.c:3289 |
ef317cd5 | 14056 | msgid "keep unreachable objects" |
07432cef | 14057 | msgstr "维持不可达的对象" |
ef317cd5 | 14058 | |
4c27fcb5 | 14059 | #: builtin/pack-objects.c:3291 |
5c57d762 JX |
14060 | msgid "pack loose unreachable objects" |
14061 | msgstr "打包松散的不可达对象" | |
14062 | ||
4c27fcb5 | 14063 | #: builtin/pack-objects.c:3293 |
ef317cd5 | 14064 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 14065 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 14066 | |
4c27fcb5 | 14067 | #: builtin/pack-objects.c:3296 |
ef317cd5 | 14068 | msgid "create thin packs" |
07432cef | 14069 | msgstr "创建精简包" |
ef317cd5 | 14070 | |
4c27fcb5 | 14071 | #: builtin/pack-objects.c:3298 |
04cb2f28 | 14072 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 14073 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 14074 | |
4c27fcb5 | 14075 | #: builtin/pack-objects.c:3300 |
ef317cd5 | 14076 | msgid "ignore packs that have companion .keep file" |
07432cef | 14077 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 14078 | |
4c27fcb5 | 14079 | #: builtin/pack-objects.c:3302 |
fd8cb379 JX |
14080 | msgid "ignore this pack" |
14081 | msgstr "忽略该 pack" | |
14082 | ||
4c27fcb5 | 14083 | #: builtin/pack-objects.c:3304 |
ef317cd5 | 14084 | msgid "pack compression level" |
07432cef | 14085 | msgstr "打包压缩级别" |
ef317cd5 | 14086 | |
4c27fcb5 | 14087 | #: builtin/pack-objects.c:3306 |
ef317cd5 | 14088 | msgid "do not hide commits by grafts" |
fd8cb379 | 14089 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 14090 | |
4c27fcb5 | 14091 | #: builtin/pack-objects.c:3308 |
6c94aba5 JX |
14092 | msgid "use a bitmap index if available to speed up counting objects" |
14093 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
14094 | ||
4c27fcb5 | 14095 | #: builtin/pack-objects.c:3310 |
6c94aba5 JX |
14096 | msgid "write a bitmap index together with the pack index" |
14097 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
14098 | ||
4c27fcb5 | 14099 | #: builtin/pack-objects.c:3313 |
5809aa05 JX |
14100 | msgid "handling for missing objects" |
14101 | msgstr "处理丢失的对象" | |
14102 | ||
4c27fcb5 | 14103 | #: builtin/pack-objects.c:3316 |
31e5e17b JX |
14104 | msgid "do not pack objects in promisor packfiles" |
14105 | msgstr "不要打包 promisor 包文件中的对象" | |
14106 | ||
4c27fcb5 JX |
14107 | #: builtin/pack-objects.c:3318 |
14108 | msgid "respect islands during delta compression" | |
14109 | msgstr "在增量压缩时参考数据岛" | |
14110 | ||
14111 | #: builtin/pack-objects.c:3342 | |
fd8cb379 JX |
14112 | #, c-format |
14113 | msgid "delta chain depth %d is too deep, forcing %d" | |
14114 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
14115 | ||
4c27fcb5 | 14116 | #: builtin/pack-objects.c:3347 |
fd8cb379 JX |
14117 | #, c-format |
14118 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
14119 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 14120 | |
4c27fcb5 | 14121 | #: builtin/pack-objects.c:3401 |
c1ac5258 JX |
14122 | msgid "--max-pack-size cannot be used to build a pack for transfer" |
14123 | msgstr "不能使用 --max-pack-size 来构建传输用的包文件" | |
14124 | ||
4c27fcb5 | 14125 | #: builtin/pack-objects.c:3403 |
c1ac5258 | 14126 | msgid "minimum pack size limit is 1 MiB" |
e640d114 | 14127 | msgstr "最小的包文件大小是 1 MiB" |
c1ac5258 | 14128 | |
4c27fcb5 | 14129 | #: builtin/pack-objects.c:3408 |
c1ac5258 JX |
14130 | msgid "--thin cannot be used to build an indexable pack" |
14131 | msgstr "--thin 不能用于创建一个可索引包" | |
14132 | ||
4c27fcb5 | 14133 | #: builtin/pack-objects.c:3411 |
c1ac5258 JX |
14134 | msgid "--keep-unreachable and --unpack-unreachable are incompatible" |
14135 | msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" | |
14136 | ||
4c27fcb5 | 14137 | #: builtin/pack-objects.c:3417 |
c1ac5258 | 14138 | msgid "cannot use --filter without --stdout" |
e640d114 | 14139 | msgstr "不能在没有 --stdout 的情况下使用 --filter" |
c1ac5258 | 14140 | |
4c27fcb5 | 14141 | #: builtin/pack-objects.c:3476 |
fd8cb379 JX |
14142 | msgid "Enumerating objects" |
14143 | msgstr "枚举对象" | |
14144 | ||
4c27fcb5 | 14145 | #: builtin/pack-objects.c:3495 |
c1ac5258 JX |
14146 | #, c-format |
14147 | msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" | |
14148 | msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)" | |
14149 | ||
fd8cb379 | 14150 | #: builtin/pack-refs.c:7 |
814ff314 JX |
14151 | msgid "git pack-refs [<options>]" |
14152 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 14153 | |
fd8cb379 | 14154 | #: builtin/pack-refs.c:15 |
ef317cd5 | 14155 | msgid "pack everything" |
07432cef | 14156 | msgstr "打包一切" |
c04f5ac3 | 14157 | |
fd8cb379 | 14158 | #: builtin/pack-refs.c:16 |
ef317cd5 | 14159 | msgid "prune loose refs (default)" |
07432cef | 14160 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 14161 | |
c1ac5258 | 14162 | #: builtin/prune-packed.c:9 |
814ff314 JX |
14163 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
14164 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 14165 | |
c1ac5258 | 14166 | #: builtin/prune-packed.c:42 |
6c94aba5 JX |
14167 | msgid "Removing duplicate objects" |
14168 | msgstr "正在删除重复对象" | |
14169 | ||
c1ac5258 | 14170 | #: builtin/prune.c:12 |
5809aa05 JX |
14171 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
14172 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 14173 | |
c1ac5258 | 14174 | #: builtin/prune.c:109 |
1b7f4a34 JX |
14175 | msgid "report pruned objects" |
14176 | msgstr "报告清除的对象" | |
14177 | ||
c1ac5258 | 14178 | #: builtin/prune.c:112 |
1b7f4a34 JX |
14179 | msgid "expire objects older than <time>" |
14180 | msgstr "使早于给定时间的对象过期" | |
14181 | ||
c1ac5258 | 14182 | #: builtin/prune.c:114 |
31e5e17b JX |
14183 | msgid "limit traversal to objects outside promisor packfiles" |
14184 | msgstr "限制遍历 promisor 包以外的对象" | |
14185 | ||
4c27fcb5 | 14186 | #: builtin/prune.c:129 |
94550ed3 JX |
14187 | msgid "cannot prune in a precious-objects repo" |
14188 | msgstr "不能在珍品仓库中执行清理操作" | |
14189 | ||
4c27fcb5 | 14190 | #: builtin/pull.c:60 builtin/pull.c:62 |
a0b6b246 JX |
14191 | #, c-format |
14192 | msgid "Invalid value for %s: %s" | |
14193 | msgstr "%s 的值无效:%s" | |
14194 | ||
4c27fcb5 | 14195 | #: builtin/pull.c:82 |
94550ed3 | 14196 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
14197 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
14198 | ||
4c27fcb5 | 14199 | #: builtin/pull.c:133 |
a4f16749 JX |
14200 | msgid "control for recursive fetching of submodules" |
14201 | msgstr "控制子模组的递归获取" | |
14202 | ||
4c27fcb5 | 14203 | #: builtin/pull.c:137 |
1b7f4a34 JX |
14204 | msgid "Options related to merging" |
14205 | msgstr "和合并相关的选项" | |
14206 | ||
4c27fcb5 | 14207 | #: builtin/pull.c:140 |
1b7f4a34 JX |
14208 | msgid "incorporate changes by rebasing rather than merging" |
14209 | msgstr "使用变基操作取代合并操作以合入修改" | |
14210 | ||
4c27fcb5 | 14211 | #: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122 |
1b7f4a34 JX |
14212 | msgid "allow fast-forward" |
14213 | msgstr "允许快进式" | |
14214 | ||
4c27fcb5 | 14215 | #: builtin/pull.c:176 |
5b04ee3b | 14216 | msgid "automatically stash/stash pop before and after rebase" |
554e8501 | 14217 | msgstr "变基操作前后执行自动贮藏和弹出贮藏" |
5b04ee3b | 14218 | |
4c27fcb5 | 14219 | #: builtin/pull.c:192 |
1b7f4a34 JX |
14220 | msgid "Options related to fetching" |
14221 | msgstr "和获取相关的参数" | |
14222 | ||
4c27fcb5 JX |
14223 | #: builtin/pull.c:202 |
14224 | msgid "force overwrite of local branch" | |
14225 | msgstr "强制覆盖本地分支" | |
14226 | ||
14227 | #: builtin/pull.c:210 | |
276ceeaa JX |
14228 | msgid "number of submodules pulled in parallel" |
14229 | msgstr "并发拉取的子模组的数量" | |
14230 | ||
4c27fcb5 | 14231 | #: builtin/pull.c:305 |
1b7f4a34 JX |
14232 | #, c-format |
14233 | msgid "Invalid value for pull.ff: %s" | |
14234 | msgstr "pull.ff 的取值无效:%s" | |
14235 | ||
4c27fcb5 | 14236 | #: builtin/pull.c:421 |
1b7f4a34 JX |
14237 | msgid "" |
14238 | "There is no candidate for rebasing against among the refs that you just " | |
14239 | "fetched." | |
14240 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
14241 | ||
4c27fcb5 | 14242 | #: builtin/pull.c:423 |
1b7f4a34 JX |
14243 | msgid "" |
14244 | "There are no candidates for merging among the refs that you just fetched." | |
14245 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
14246 | ||
4c27fcb5 | 14247 | #: builtin/pull.c:424 |
1b7f4a34 JX |
14248 | msgid "" |
14249 | "Generally this means that you provided a wildcard refspec which had no\n" | |
14250 | "matches on the remote end." | |
14251 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
14252 | ||
4c27fcb5 | 14253 | #: builtin/pull.c:427 |
1b7f4a34 JX |
14254 | #, c-format |
14255 | msgid "" | |
14256 | "You asked to pull from the remote '%s', but did not specify\n" | |
14257 | "a branch. Because this is not the default configured remote\n" | |
14258 | "for your current branch, you must specify a branch on the command line." | |
14259 | msgstr "" | |
14260 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
14261 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
14262 | ||
4c27fcb5 | 14263 | #: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73 |
1b7f4a34 JX |
14264 | msgid "You are not currently on a branch." |
14265 | msgstr "您当前不在一个分支上。" | |
14266 | ||
4c27fcb5 | 14267 | #: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79 |
1b7f4a34 JX |
14268 | msgid "Please specify which branch you want to rebase against." |
14269 | msgstr "请指定您要变基到哪一个分支。" | |
14270 | ||
4c27fcb5 | 14271 | #: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82 |
1b7f4a34 JX |
14272 | msgid "Please specify which branch you want to merge with." |
14273 | msgstr "请指定您要合并哪一个分支。" | |
14274 | ||
4c27fcb5 | 14275 | #: builtin/pull.c:437 builtin/pull.c:452 |
1b7f4a34 JX |
14276 | msgid "See git-pull(1) for details." |
14277 | msgstr "详见 git-pull(1)。" | |
14278 | ||
4c27fcb5 JX |
14279 | #: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454 |
14280 | #: builtin/rebase.c:767 git-parse-remote.sh:64 | |
5b04ee3b JX |
14281 | msgid "<remote>" |
14282 | msgstr "<远程>" | |
14283 | ||
4c27fcb5 JX |
14284 | #: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459 |
14285 | #: git-legacy-rebase.sh:556 git-parse-remote.sh:65 | |
5b04ee3b JX |
14286 | msgid "<branch>" |
14287 | msgstr "<分支>" | |
14288 | ||
4c27fcb5 | 14289 | #: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75 |
1b7f4a34 JX |
14290 | msgid "There is no tracking information for the current branch." |
14291 | msgstr "当前分支没有跟踪信息。" | |
14292 | ||
4c27fcb5 | 14293 | #: builtin/pull.c:456 git-parse-remote.sh:95 |
1b7f4a34 | 14294 | msgid "" |
5b04ee3b JX |
14295 | "If you wish to set tracking information for this branch you can do so with:" |
14296 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 14297 | |
4c27fcb5 | 14298 | #: builtin/pull.c:461 |
1b7f4a34 JX |
14299 | #, c-format |
14300 | msgid "" | |
14301 | "Your configuration specifies to merge with the ref '%s'\n" | |
14302 | "from the remote, but no such ref was fetched." | |
14303 | msgstr "" | |
14304 | "您的配置中指定要合并远程的引用 '%s',\n" | |
14305 | "但是没有获取到这个引用。" | |
7ac1c0ad | 14306 | |
4c27fcb5 JX |
14307 | #: builtin/pull.c:565 |
14308 | #, c-format | |
14309 | msgid "unable to access commit %s" | |
14310 | msgstr "无法访问提交 %s" | |
14311 | ||
14312 | #: builtin/pull.c:843 | |
5c57d762 JX |
14313 | msgid "ignoring --verify-signatures for rebase" |
14314 | msgstr "为变基操作忽略 --verify-signatures" | |
14315 | ||
4c27fcb5 | 14316 | #: builtin/pull.c:891 |
5b04ee3b JX |
14317 | msgid "--[no-]autostash option is only valid with --rebase." |
14318 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
14319 | ||
4c27fcb5 | 14320 | #: builtin/pull.c:899 |
1b7f4a34 JX |
14321 | msgid "Updating an unborn branch with changes added to the index." |
14322 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
14323 | ||
4c27fcb5 | 14324 | #: builtin/pull.c:902 |
a0b6b246 JX |
14325 | msgid "pull with rebase" |
14326 | msgstr "变基式拉取" | |
14327 | ||
4c27fcb5 | 14328 | #: builtin/pull.c:903 |
a0b6b246 | 14329 | msgid "please commit or stash them." |
554e8501 | 14330 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 14331 | |
4c27fcb5 | 14332 | #: builtin/pull.c:928 |
1b7f4a34 JX |
14333 | #, c-format |
14334 | msgid "" | |
14335 | "fetch updated the current branch head.\n" | |
14336 | "fast-forwarding your working tree from\n" | |
14337 | "commit %s." | |
14338 | msgstr "" | |
14339 | "fetch 更新了当前的分支。快进您的工作区\n" | |
14340 | "至提交 %s。" | |
ef317cd5 | 14341 | |
4c27fcb5 | 14342 | #: builtin/pull.c:934 |
1b7f4a34 JX |
14343 | #, c-format |
14344 | msgid "" | |
14345 | "Cannot fast-forward your working tree.\n" | |
14346 | "After making sure that you saved anything precious from\n" | |
14347 | "$ git diff %s\n" | |
14348 | "output, run\n" | |
14349 | "$ git reset --hard\n" | |
14350 | "to recover." | |
14351 | msgstr "" | |
14352 | "您当前的工作区无法执行快进操作。\n" | |
14353 | "首先执行如下命令:\n" | |
14354 | "$ git diff %s\n" | |
14355 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
14356 | "$ git reset --hard\n" | |
14357 | "恢复之前的状态。" | |
14358 | ||
4c27fcb5 | 14359 | #: builtin/pull.c:949 |
1b7f4a34 JX |
14360 | msgid "Cannot merge multiple branches into empty head." |
14361 | msgstr "无法将多个分支合并到空分支。" | |
14362 | ||
4c27fcb5 | 14363 | #: builtin/pull.c:953 |
1b7f4a34 JX |
14364 | msgid "Cannot rebase onto multiple branches." |
14365 | msgstr "无法变基到多个分支。" | |
14366 | ||
4c27fcb5 | 14367 | #: builtin/pull.c:960 |
a4f16749 JX |
14368 | msgid "cannot rebase with locally recorded submodule modifications" |
14369 | msgstr "本地子模组中有修改,无法变基" | |
14370 | ||
fd8cb379 | 14371 | #: builtin/push.c:19 |
ef317cd5 | 14372 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 14373 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 14374 | |
fd8cb379 | 14375 | #: builtin/push.c:111 |
c04f5ac3 | 14376 | msgid "tag shorthand without <tag>" |
55a16ee4 | 14377 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 14378 | |
fd8cb379 | 14379 | #: builtin/push.c:121 |
c04f5ac3 | 14380 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 14381 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 14382 | |
fd8cb379 | 14383 | #: builtin/push.c:165 |
8ada9598 JX |
14384 | msgid "" |
14385 | "\n" | |
14386 | "To choose either option permanently, see push.default in 'git help config'." | |
14387 | msgstr "" | |
81809b99 JX |
14388 | "\n" |
14389 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 14390 | |
fd8cb379 | 14391 | #: builtin/push.c:168 |
8ada9598 JX |
14392 | #, c-format |
14393 | msgid "" | |
14394 | "The upstream branch of your current branch does not match\n" | |
14395 | "the name of your current branch. To push to the upstream branch\n" | |
14396 | "on the remote, use\n" | |
14397 | "\n" | |
14398 | " git push %s HEAD:%s\n" | |
14399 | "\n" | |
14400 | "To push to the branch of the same name on the remote, use\n" | |
14401 | "\n" | |
4c27fcb5 | 14402 | " git push %s HEAD\n" |
8ada9598 JX |
14403 | "%s" |
14404 | msgstr "" | |
4c27fcb5 JX |
14405 | "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n" |
14406 | "使用\n" | |
81809b99 JX |
14407 | "\n" |
14408 | " git push %s HEAD:%s\n" | |
14409 | "\n" | |
14410 | "为推送至远程同名分支,使用\n" | |
14411 | "\n" | |
4c27fcb5 | 14412 | " git push %s HEAD\n" |
81809b99 | 14413 | "%s" |
8ada9598 | 14414 | |
fd8cb379 | 14415 | #: builtin/push.c:183 |
c04f5ac3 JX |
14416 | #, c-format |
14417 | msgid "" | |
14418 | "You are not currently on a branch.\n" | |
14419 | "To push the history leading to the current (detached HEAD)\n" | |
14420 | "state now, use\n" | |
14421 | "\n" | |
14422 | " git push %s HEAD:<name-of-remote-branch>\n" | |
14423 | msgstr "" | |
14424 | "您当前不在一个分支上。\n" | |
90e6ef53 | 14425 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 14426 | "\n" |
d9d56b23 | 14427 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 14428 | |
fd8cb379 | 14429 | #: builtin/push.c:197 |
c04f5ac3 JX |
14430 | #, c-format |
14431 | msgid "" | |
14432 | "The current branch %s has no upstream branch.\n" | |
14433 | "To push the current branch and set the remote as upstream, use\n" | |
14434 | "\n" | |
14435 | " git push --set-upstream %s %s\n" | |
14436 | msgstr "" | |
14437 | "当前分支 %s 没有对应的上游分支。\n" | |
14438 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
14439 | "\n" | |
14440 | " git push --set-upstream %s %s\n" | |
14441 | ||
fd8cb379 | 14442 | #: builtin/push.c:205 |
c04f5ac3 JX |
14443 | #, c-format |
14444 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
14445 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
14446 | ||
fd8cb379 | 14447 | #: builtin/push.c:208 |
73a60cd2 JX |
14448 | #, c-format |
14449 | msgid "" | |
14450 | "You are pushing to remote '%s', which is not the upstream of\n" | |
14451 | "your current branch '%s', without telling me what to push\n" | |
14452 | "to update which remote branch." | |
14453 | msgstr "" | |
14454 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
14455 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
14456 | ||
fd8cb379 | 14457 | #: builtin/push.c:267 |
c04f5ac3 JX |
14458 | msgid "" |
14459 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 14460 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 14461 | |
fd8cb379 | 14462 | #: builtin/push.c:274 |
170e9899 JX |
14463 | msgid "" |
14464 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
14465 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
14466 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
14467 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
14468 | msgstr "" | |
eff6d3a9 | 14469 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 14470 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 14471 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 14472 | |
fd8cb379 | 14473 | #: builtin/push.c:280 |
170e9899 JX |
14474 | msgid "" |
14475 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
14476 | "counterpart. Check out this branch and integrate the remote changes\n" |
14477 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
14478 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
14479 | msgstr "" | |
eff6d3a9 | 14480 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 14481 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 14482 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 14483 | |
fd8cb379 | 14484 | #: builtin/push.c:286 |
07432cef | 14485 | msgid "" |
a77c07d9 JX |
14486 | "Updates were rejected because the remote contains work that you do\n" |
14487 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
14488 | "to the same ref. You may want to first integrate the remote changes\n" |
14489 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
14490 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
14491 | msgstr "" | |
160fb2b2 JX |
14492 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
14493 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 14494 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
14495 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
14496 | ||
fd8cb379 | 14497 | #: builtin/push.c:293 |
a77c07d9 | 14498 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 14499 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 14500 | |
fd8cb379 | 14501 | #: builtin/push.c:296 |
a77c07d9 JX |
14502 | msgid "" |
14503 | "You cannot update a remote ref that points at a non-commit object,\n" | |
14504 | "or update a remote ref to make it point at a non-commit object,\n" | |
14505 | "without using the '--force' option.\n" | |
14506 | msgstr "" | |
14507 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
14508 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 14509 | |
fd8cb379 | 14510 | #: builtin/push.c:357 |
c04f5ac3 JX |
14511 | #, c-format |
14512 | msgid "Pushing to %s\n" | |
14513 | msgstr "推送到 %s\n" | |
14514 | ||
fd8cb379 | 14515 | #: builtin/push.c:361 |
c04f5ac3 JX |
14516 | #, c-format |
14517 | msgid "failed to push some refs to '%s'" | |
c1ac5258 | 14518 | msgstr "推送一些引用到 '%s' 失败" |
c04f5ac3 | 14519 | |
fd8cb379 | 14520 | #: builtin/push.c:395 |
c04f5ac3 JX |
14521 | #, c-format |
14522 | msgid "bad repository '%s'" | |
160fb2b2 | 14523 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 14524 | |
fd8cb379 | 14525 | #: builtin/push.c:396 |
c04f5ac3 JX |
14526 | msgid "" |
14527 | "No configured push destination.\n" | |
14528 | "Either specify the URL from the command-line or configure a remote " | |
14529 | "repository using\n" | |
14530 | "\n" | |
14531 | " git remote add <name> <url>\n" | |
14532 | "\n" | |
14533 | "and then push using the remote name\n" | |
14534 | "\n" | |
14535 | " git push <name>\n" | |
14536 | msgstr "" | |
90e6ef53 | 14537 | "没有配置推送目标。\n" |
4375c10e | 14538 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 14539 | "\n" |
d9d56b23 | 14540 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 14541 | "\n" |
160fb2b2 | 14542 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 14543 | "\n" |
d9d56b23 | 14544 | " git push <名称>\n" |
c04f5ac3 | 14545 | |
fd8cb379 | 14546 | #: builtin/push.c:551 |
ef317cd5 | 14547 | msgid "repository" |
160fb2b2 | 14548 | msgstr "仓库" |
ef317cd5 | 14549 | |
fd8cb379 | 14550 | #: builtin/push.c:552 builtin/send-pack.c:164 |
ef317cd5 | 14551 | msgid "push all refs" |
07432cef | 14552 | msgstr "推送所有引用" |
ef317cd5 | 14553 | |
fd8cb379 | 14554 | #: builtin/push.c:553 builtin/send-pack.c:166 |
ef317cd5 | 14555 | msgid "mirror all refs" |
07432cef | 14556 | msgstr "镜像所有引用" |
ef317cd5 | 14557 | |
fd8cb379 | 14558 | #: builtin/push.c:555 |
ef317cd5 | 14559 | msgid "delete refs" |
07432cef | 14560 | msgstr "删除引用" |
ef317cd5 | 14561 | |
fd8cb379 | 14562 | #: builtin/push.c:556 |
ef317cd5 | 14563 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 14564 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 14565 | |
fd8cb379 | 14566 | #: builtin/push.c:559 builtin/send-pack.c:167 |
ef317cd5 JX |
14567 | msgid "force updates" |
14568 | msgstr "强制更新" | |
14569 | ||
fd8cb379 | 14570 | #: builtin/push.c:561 builtin/send-pack.c:181 |
c1ac5258 JX |
14571 | msgid "<refname>:<expect>" |
14572 | msgstr "<引用名>:<期望值>" | |
90314792 | 14573 | |
fd8cb379 | 14574 | #: builtin/push.c:562 builtin/send-pack.c:182 |
90314792 JX |
14575 | msgid "require old value of ref to be at this value" |
14576 | msgstr "要求引用旧的取值为设定值" | |
14577 | ||
fd8cb379 | 14578 | #: builtin/push.c:565 |
ef317cd5 | 14579 | msgid "control recursive pushing of submodules" |
07432cef | 14580 | msgstr "控制子模组的递归推送" |
ef317cd5 | 14581 | |
fd8cb379 | 14582 | #: builtin/push.c:567 builtin/send-pack.c:175 |
ef317cd5 | 14583 | msgid "use thin pack" |
07432cef | 14584 | msgstr "使用精简打包" |
ef317cd5 | 14585 | |
fd8cb379 JX |
14586 | #: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 |
14587 | #: builtin/send-pack.c:162 | |
ef317cd5 | 14588 | msgid "receive pack program" |
07432cef | 14589 | msgstr "接收包程序" |
ef317cd5 | 14590 | |
fd8cb379 | 14591 | #: builtin/push.c:570 |
ef317cd5 | 14592 | msgid "set upstream for git pull/status" |
07432cef | 14593 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 14594 | |
fd8cb379 | 14595 | #: builtin/push.c:573 |
ef317cd5 | 14596 | msgid "prune locally removed refs" |
07432cef | 14597 | msgstr "清除本地删除的引用" |
ef317cd5 | 14598 | |
fd8cb379 | 14599 | #: builtin/push.c:575 |
a77c07d9 JX |
14600 | msgid "bypass pre-push hook" |
14601 | msgstr "绕过 pre-push 钩子" | |
14602 | ||
fd8cb379 | 14603 | #: builtin/push.c:576 |
1003b3a5 | 14604 | msgid "push missing but relevant tags" |
55a16ee4 | 14605 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 14606 | |
fd8cb379 | 14607 | #: builtin/push.c:579 builtin/send-pack.c:169 |
220c313c JX |
14608 | msgid "GPG sign the push" |
14609 | msgstr "用 GPG 为推送签名" | |
14610 | ||
fd8cb379 | 14611 | #: builtin/push.c:581 builtin/send-pack.c:176 |
814ff314 JX |
14612 | msgid "request atomic transaction on remote side" |
14613 | msgstr "需要远端支持原子事务" | |
14614 | ||
fd8cb379 | 14615 | #: builtin/push.c:599 |
c04f5ac3 JX |
14616 | msgid "--delete is incompatible with --all, --mirror and --tags" |
14617 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
14618 | ||
fd8cb379 | 14619 | #: builtin/push.c:601 |
c04f5ac3 JX |
14620 | msgid "--delete doesn't make sense without any refs" |
14621 | msgstr "--delete 未接任何引用没有意义" | |
14622 | ||
5809aa05 | 14623 | #: builtin/push.c:604 |
fd8cb379 JX |
14624 | msgid "--all and --tags are incompatible" |
14625 | msgstr "--all 和 --tags 不兼容" | |
14626 | ||
14627 | #: builtin/push.c:606 | |
14628 | msgid "--all can't be combined with refspecs" | |
14629 | msgstr "--all 不能和引用规格同时使用" | |
14630 | ||
14631 | #: builtin/push.c:610 | |
14632 | msgid "--mirror and --tags are incompatible" | |
14633 | msgstr "--mirror 和 --tags 不兼容" | |
14634 | ||
14635 | #: builtin/push.c:612 | |
14636 | msgid "--mirror can't be combined with refspecs" | |
14637 | msgstr "--mirror 不能和引用规格同时使用" | |
14638 | ||
14639 | #: builtin/push.c:615 | |
14640 | msgid "--all and --mirror are incompatible" | |
14641 | msgstr "--all 和 --mirror 不兼容" | |
14642 | ||
14643 | #: builtin/push.c:634 | |
5c57d762 JX |
14644 | msgid "push options must not have new line characters" |
14645 | msgstr "推送选项不能有换行符" | |
14646 | ||
c1ac5258 JX |
14647 | #: builtin/range-diff.c:8 |
14648 | msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
14649 | msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
14650 | ||
14651 | #: builtin/range-diff.c:9 | |
14652 | msgid "git range-diff [<options>] <old-tip>...<new-tip>" | |
14653 | msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" | |
14654 | ||
14655 | #: builtin/range-diff.c:10 | |
14656 | msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" | |
14657 | msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" | |
14658 | ||
4c27fcb5 | 14659 | #: builtin/range-diff.c:21 |
c1ac5258 JX |
14660 | msgid "Percentage by which creation is weighted" |
14661 | msgstr "创建权重的百分比" | |
14662 | ||
4c27fcb5 | 14663 | #: builtin/range-diff.c:23 |
c1ac5258 JX |
14664 | msgid "use simple diff colors" |
14665 | msgstr "使用简单差异颜色" | |
14666 | ||
4c27fcb5 | 14667 | #: builtin/range-diff.c:61 builtin/range-diff.c:65 |
c1ac5258 JX |
14668 | #, c-format |
14669 | msgid "no .. in range: '%s'" | |
14670 | msgstr "没有在范围中使用 ..:'%s'" | |
14671 | ||
4c27fcb5 | 14672 | #: builtin/range-diff.c:75 |
c1ac5258 JX |
14673 | msgid "single arg format must be symmetric range" |
14674 | msgstr "单个参数格式必须是对称范围(即包含...)" | |
14675 | ||
4c27fcb5 | 14676 | #: builtin/range-diff.c:90 |
c1ac5258 JX |
14677 | msgid "need two commit ranges" |
14678 | msgstr "需要两个提交范围" | |
14679 | ||
87cb7997 | 14680 | #: builtin/read-tree.c:40 |
ef317cd5 | 14681 | msgid "" |
1b7f4a34 | 14682 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
14683 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
14684 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
14685 | msgstr "" | |
1b7f4a34 | 14686 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 14687 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 14688 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 14689 | |
4c27fcb5 | 14690 | #: builtin/read-tree.c:123 |
ef317cd5 | 14691 | msgid "write resulting index to <file>" |
d9d56b23 | 14692 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 14693 | |
4c27fcb5 | 14694 | #: builtin/read-tree.c:126 |
ef317cd5 | 14695 | msgid "only empty the index" |
07432cef | 14696 | msgstr "只是清空索引" |
ef317cd5 | 14697 | |
4c27fcb5 | 14698 | #: builtin/read-tree.c:128 |
ef317cd5 | 14699 | msgid "Merging" |
07432cef | 14700 | msgstr "合并" |
ef317cd5 | 14701 | |
4c27fcb5 | 14702 | #: builtin/read-tree.c:130 |
ef317cd5 | 14703 | msgid "perform a merge in addition to a read" |
07432cef | 14704 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 14705 | |
4c27fcb5 | 14706 | #: builtin/read-tree.c:132 |
ef317cd5 | 14707 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 14708 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 14709 | |
4c27fcb5 | 14710 | #: builtin/read-tree.c:134 |
ef317cd5 | 14711 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 14712 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 14713 | |
4c27fcb5 | 14714 | #: builtin/read-tree.c:136 |
ef317cd5 | 14715 | msgid "same as -m, but discard unmerged entries" |
07432cef | 14716 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 14717 | |
4c27fcb5 | 14718 | #: builtin/read-tree.c:137 |
ef317cd5 | 14719 | msgid "<subdirectory>/" |
07432cef | 14720 | msgstr "<子目录>/" |
ef317cd5 | 14721 | |
4c27fcb5 | 14722 | #: builtin/read-tree.c:138 |
ef317cd5 | 14723 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 14724 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 14725 | |
4c27fcb5 | 14726 | #: builtin/read-tree.c:141 |
ef317cd5 | 14727 | msgid "update working tree with merge result" |
07432cef | 14728 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 14729 | |
4c27fcb5 | 14730 | #: builtin/read-tree.c:143 |
ef317cd5 | 14731 | msgid "gitignore" |
07432cef | 14732 | msgstr "gitignore" |
ef317cd5 | 14733 | |
4c27fcb5 | 14734 | #: builtin/read-tree.c:144 |
ef317cd5 | 14735 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 14736 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 14737 | |
4c27fcb5 | 14738 | #: builtin/read-tree.c:147 |
ef317cd5 | 14739 | msgid "don't check the working tree after merging" |
07432cef | 14740 | msgstr "合并后不检查工作区" |
ef317cd5 | 14741 | |
4c27fcb5 | 14742 | #: builtin/read-tree.c:148 |
ef317cd5 | 14743 | msgid "don't update the index or the work tree" |
07432cef | 14744 | msgstr "不更新索引区和工作区" |
ef317cd5 | 14745 | |
4c27fcb5 | 14746 | #: builtin/read-tree.c:150 |
ef317cd5 | 14747 | msgid "skip applying sparse checkout filter" |
07432cef | 14748 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 14749 | |
4c27fcb5 | 14750 | #: builtin/read-tree.c:152 |
ef317cd5 | 14751 | msgid "debug unpack-trees" |
07432cef | 14752 | msgstr "调试 unpack-trees" |
ef317cd5 | 14753 | |
4c27fcb5 JX |
14754 | #: builtin/rebase.c:29 |
14755 | msgid "" | |
14756 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " | |
14757 | "[<branch>]" | |
14758 | msgstr "" | |
14759 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]" | |
14760 | ||
14761 | #: builtin/rebase.c:31 | |
14762 | msgid "" | |
14763 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" | |
14764 | msgstr "" | |
14765 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" | |
14766 | ||
14767 | #: builtin/rebase.c:33 | |
14768 | msgid "git rebase --continue | --abort | --skip | --edit-todo" | |
14769 | msgstr "git rebase --continue | --abort | --skip | --edit-todo" | |
14770 | ||
14771 | #: builtin/rebase.c:119 | |
14772 | #, c-format | |
14773 | msgid "%s requires an interactive rebase" | |
14774 | msgstr "%s 需要交互式变基" | |
14775 | ||
14776 | #: builtin/rebase.c:171 | |
14777 | #, c-format | |
14778 | msgid "could not get 'onto': '%s'" | |
14779 | msgstr "无法获取 'onto':'%s'" | |
14780 | ||
14781 | #: builtin/rebase.c:186 | |
14782 | #, c-format | |
14783 | msgid "invalid orig-head: '%s'" | |
14784 | msgstr "无效的原始 head:'%s'" | |
14785 | ||
14786 | #: builtin/rebase.c:214 | |
14787 | #, c-format | |
14788 | msgid "ignoring invalid allow_rerere_autoupdate: '%s'" | |
14789 | msgstr "忽略无效的 allow_rerere_autoupdate:'%s'" | |
14790 | ||
14791 | #: builtin/rebase.c:259 | |
14792 | #, c-format | |
14793 | msgid "Could not read '%s'" | |
14794 | msgstr "不能读取 '%s'" | |
14795 | ||
14796 | #: builtin/rebase.c:277 | |
14797 | #, c-format | |
14798 | msgid "Cannot store %s" | |
14799 | msgstr "不能存储 %s" | |
14800 | ||
14801 | #: builtin/rebase.c:337 | |
14802 | msgid "" | |
14803 | "Resolve all conflicts manually, mark them as resolved with\n" | |
14804 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
14805 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
14806 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
14807 | "abort\"." | |
14808 | msgstr "" | |
14809 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" | |
14810 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" | |
14811 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
14812 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
14813 | ||
14814 | #: builtin/rebase.c:561 | |
14815 | msgid "could not determine HEAD revision" | |
14816 | msgstr "不能确定 HEAD 版本" | |
14817 | ||
14818 | #: builtin/rebase.c:753 | |
14819 | #, c-format | |
14820 | msgid "" | |
14821 | "%s\n" | |
14822 | "Please specify which branch you want to rebase against.\n" | |
14823 | "See git-rebase(1) for details.\n" | |
14824 | "\n" | |
14825 | " git rebase '<branch>'\n" | |
14826 | "\n" | |
14827 | msgstr "" | |
14828 | "%s\n" | |
14829 | "请指定您要变基到哪个分支。\n" | |
14830 | "详见 git-rebase(1)。\n" | |
14831 | "\n" | |
14832 | " git rebase '<branch>'\n" | |
14833 | "\n" | |
14834 | ||
14835 | #: builtin/rebase.c:769 | |
14836 | #, c-format | |
14837 | msgid "" | |
14838 | "If you wish to set tracking information for this branch you can do so with:\n" | |
14839 | "\n" | |
14840 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
14841 | "\n" | |
14842 | msgstr "" | |
14843 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
14844 | "\n" | |
14845 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
14846 | "\n" | |
14847 | ||
14848 | #: builtin/rebase.c:832 | |
14849 | msgid "rebase onto given branch instead of upstream" | |
14850 | msgstr "变基到给定的分支而非上游" | |
14851 | ||
14852 | #: builtin/rebase.c:834 | |
14853 | msgid "allow pre-rebase hook to run" | |
14854 | msgstr "允许执行 pre-rebase 钩子" | |
14855 | ||
14856 | #: builtin/rebase.c:836 | |
14857 | msgid "be quiet. implies --no-stat" | |
14858 | msgstr "安静。暗示 --no-stat" | |
14859 | ||
14860 | #: builtin/rebase.c:839 | |
14861 | msgid "display a diffstat of what changed upstream" | |
14862 | msgstr "显示上游变化的 diffstat" | |
14863 | ||
14864 | #: builtin/rebase.c:842 | |
14865 | msgid "do not show diffstat of what changed upstream" | |
14866 | msgstr "不显示上游变化的 diffstat" | |
14867 | ||
14868 | #: builtin/rebase.c:845 | |
14869 | msgid "add a Signed-off-by: line to each commit" | |
14870 | msgstr "为每一个提交添加一个 Signed-off-by: 签名" | |
14871 | ||
14872 | #: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853 | |
14873 | msgid "passed to 'git am'" | |
14874 | msgstr "传递给 'git am'" | |
14875 | ||
14876 | #: builtin/rebase.c:855 builtin/rebase.c:857 | |
14877 | msgid "passed to 'git apply'" | |
14878 | msgstr "传递给 'git apply'" | |
14879 | ||
14880 | #: builtin/rebase.c:859 builtin/rebase.c:862 | |
14881 | msgid "cherry-pick all commits, even if unchanged" | |
14882 | msgstr "拣选所有提交,即使未修改" | |
14883 | ||
14884 | #: builtin/rebase.c:864 | |
14885 | msgid "continue" | |
14886 | msgstr "继续" | |
14887 | ||
14888 | #: builtin/rebase.c:867 | |
14889 | msgid "skip current patch and continue" | |
14890 | msgstr "跳过当前补丁并继续" | |
14891 | ||
14892 | # 译者:注意保持前导空格 | |
14893 | #: builtin/rebase.c:869 | |
14894 | msgid "abort and check out the original branch" | |
14895 | msgstr "终止并检出原有分支" | |
14896 | ||
14897 | #: builtin/rebase.c:872 | |
14898 | msgid "abort but keep HEAD where it is" | |
14899 | msgstr "终止但保持 HEAD 不变" | |
14900 | ||
14901 | #: builtin/rebase.c:873 | |
14902 | msgid "edit the todo list during an interactive rebase" | |
14903 | msgstr "在交互式变基中编辑待办列表" | |
14904 | ||
14905 | #: builtin/rebase.c:876 | |
14906 | msgid "show the patch file being applied or merged" | |
14907 | msgstr "显示正在应用或合并的补丁文件" | |
14908 | ||
14909 | #: builtin/rebase.c:879 | |
14910 | msgid "use merging strategies to rebase" | |
14911 | msgstr "使用合并策略进行变基" | |
14912 | ||
14913 | #: builtin/rebase.c:883 | |
14914 | msgid "let the user edit the list of commits to rebase" | |
14915 | msgstr "让用户编辑要变基的提交列表" | |
14916 | ||
14917 | #: builtin/rebase.c:887 | |
14918 | msgid "try to recreate merges instead of ignoring them" | |
14919 | msgstr "尝试重建合并提交而非忽略它们" | |
14920 | ||
14921 | #: builtin/rebase.c:891 | |
14922 | msgid "allow rerere to update index with resolved conflict" | |
14923 | msgstr "允许 rerere 用已解决的冲突更新索引" | |
14924 | ||
14925 | #: builtin/rebase.c:894 | |
14926 | msgid "preserve empty commits during rebase" | |
14927 | msgstr "变基时保留空提交" | |
14928 | ||
14929 | #: builtin/rebase.c:896 | |
14930 | msgid "move commits that begin with squash!/fixup! under -i" | |
14931 | msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交" | |
14932 | ||
14933 | #: builtin/rebase.c:902 | |
14934 | msgid "automatically stash/stash pop before and after" | |
14935 | msgstr "在操作前后执行自动贮藏和弹出贮藏" | |
14936 | ||
14937 | #: builtin/rebase.c:904 | |
14938 | msgid "add exec lines after each commit of the editable list" | |
14939 | msgstr "可编辑列表的每一个提交下面增加一行 exec" | |
14940 | ||
14941 | #: builtin/rebase.c:908 | |
14942 | msgid "allow rebasing commits with empty messages" | |
14943 | msgstr "允许针对空提交说明的提交变基" | |
14944 | ||
14945 | #: builtin/rebase.c:911 | |
14946 | msgid "try to rebase merges instead of skipping them" | |
14947 | msgstr "尝试对合并提交变基而不是忽略它们" | |
14948 | ||
14949 | #: builtin/rebase.c:914 | |
14950 | msgid "use 'merge-base --fork-point' to refine upstream" | |
14951 | msgstr "使用 'merge-base --fork-point' 来优化上游" | |
14952 | ||
14953 | #: builtin/rebase.c:916 | |
14954 | msgid "use the given merge strategy" | |
14955 | msgstr "使用给定的合并策略" | |
14956 | ||
14957 | #: builtin/rebase.c:918 builtin/revert.c:111 | |
14958 | msgid "option" | |
14959 | msgstr "选项" | |
14960 | ||
14961 | #: builtin/rebase.c:919 | |
14962 | msgid "pass the argument through to the merge strategy" | |
14963 | msgstr "将参数传递给合并策略" | |
14964 | ||
14965 | #: builtin/rebase.c:922 | |
14966 | msgid "rebase all reachable commits up to the root(s)" | |
14967 | msgstr "将所有可达的提交变基到根提交" | |
14968 | ||
14969 | #: builtin/rebase.c:938 | |
14970 | #, c-format | |
14971 | msgid "could not exec %s" | |
14972 | msgstr "不能执行 %s" | |
14973 | ||
14974 | #: builtin/rebase.c:956 git-legacy-rebase.sh:213 | |
14975 | msgid "It looks like 'git am' is in progress. Cannot rebase." | |
14976 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
14977 | ||
14978 | #: builtin/rebase.c:997 git-legacy-rebase.sh:395 | |
14979 | msgid "No rebase in progress?" | |
14980 | msgstr "没有正在进行的变基?" | |
14981 | ||
14982 | #: builtin/rebase.c:1001 git-legacy-rebase.sh:406 | |
14983 | msgid "The --edit-todo action can only be used during interactive rebase." | |
14984 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
14985 | ||
14986 | #: builtin/rebase.c:1015 git-legacy-rebase.sh:413 | |
14987 | msgid "Cannot read HEAD" | |
14988 | msgstr "不能读取 HEAD" | |
14989 | ||
14990 | #: builtin/rebase.c:1028 git-legacy-rebase.sh:416 | |
14991 | msgid "" | |
14992 | "You must edit all merge conflicts and then\n" | |
14993 | "mark them as resolved using git add" | |
14994 | msgstr "" | |
14995 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
14996 | "命令将它们标记为已解决" | |
14997 | ||
14998 | #: builtin/rebase.c:1047 | |
14999 | msgid "could not discard worktree changes" | |
15000 | msgstr "无法丢弃工作区变更" | |
15001 | ||
15002 | #: builtin/rebase.c:1066 | |
15003 | #, c-format | |
15004 | msgid "could not move back to %s" | |
15005 | msgstr "无法移回 %s" | |
15006 | ||
15007 | #: builtin/rebase.c:1077 builtin/rm.c:368 | |
15008 | #, c-format | |
15009 | msgid "could not remove '%s'" | |
15010 | msgstr "无法删除 '%s'" | |
15011 | ||
15012 | #: builtin/rebase.c:1103 | |
15013 | #, c-format | |
15014 | msgid "" | |
15015 | "It seems that there is already a %s directory, and\n" | |
15016 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
15017 | "case, please try\n" | |
15018 | "\t%s\n" | |
15019 | "If that is not the case, please\n" | |
15020 | "\t%s\n" | |
15021 | "and run me again. I am stopping in case you still have something\n" | |
15022 | "valuable there.\n" | |
15023 | msgstr "" | |
15024 | "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n" | |
15025 | "如果是这样,请执行\n" | |
15026 | "\t%s\n" | |
15027 | "如果不是这样,请执行\n" | |
15028 | "\t%s\n" | |
15029 | "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n" | |
15030 | ||
15031 | #: builtin/rebase.c:1124 | |
15032 | msgid "switch `C' expects a numerical value" | |
15033 | msgstr "开关 `C' 期望一个数字值" | |
15034 | ||
15035 | #: builtin/rebase.c:1161 | |
15036 | #, c-format | |
15037 | msgid "Unknown mode: %s" | |
15038 | msgstr "未知模式:%s" | |
15039 | ||
15040 | #: builtin/rebase.c:1183 | |
15041 | msgid "--strategy requires --merge or --interactive" | |
15042 | msgstr "--strategy 需要 --merge 或 --interactive" | |
15043 | ||
15044 | #: builtin/rebase.c:1226 | |
15045 | #, c-format | |
15046 | msgid "" | |
15047 | "error: cannot combine interactive options (--interactive, --exec, --rebase-" | |
15048 | "merges, --preserve-merges, --keep-empty, --root + --onto) with am options " | |
15049 | "(%s)" | |
15050 | msgstr "" | |
15051 | "错误:无法同时使用交互式选项(--interactive, --exec, --rebase-merges, --preserve-" | |
15052 | "merges, --keep-empty, --root + --onto)和 am 选项(%s)" | |
15053 | ||
15054 | #: builtin/rebase.c:1231 | |
15055 | #, c-format | |
15056 | msgid "" | |
15057 | "error: cannot combine merge options (--merge, --strategy, --strategy-option) " | |
15058 | "with am options (%s)" | |
15059 | msgstr "错误:不能组合合并选项(--merge、--strategy、--strategy-option)和 am 选项(%s)" | |
15060 | ||
15061 | #: builtin/rebase.c:1251 git-legacy-rebase.sh:536 | |
15062 | msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'" | |
15063 | msgstr "错误:不能组合 '--preserve-merges' 和 '--rebase-merges'" | |
15064 | ||
15065 | #: builtin/rebase.c:1256 git-legacy-rebase.sh:542 | |
15066 | msgid "error: cannot combine '--rebase-merges' with '--strategy-option'" | |
15067 | msgstr "错误:不能组合 '--rebase-merges' 和 '--strategy-option'" | |
15068 | ||
15069 | #: builtin/rebase.c:1259 git-legacy-rebase.sh:544 | |
15070 | msgid "error: cannot combine '--rebase-merges' with '--strategy'" | |
15071 | msgstr "错误:不能组合 '--rebase-merges' 和 '--strategy'" | |
15072 | ||
15073 | #: builtin/rebase.c:1283 | |
15074 | #, c-format | |
15075 | msgid "invalid upstream '%s'" | |
15076 | msgstr "无效的上游 '%s'" | |
15077 | ||
15078 | #: builtin/rebase.c:1289 | |
15079 | msgid "Could not create new root commit" | |
15080 | msgstr "不能创建新的根提交" | |
15081 | ||
15082 | #: builtin/rebase.c:1307 | |
15083 | #, c-format | |
15084 | msgid "'%s': need exactly one merge base" | |
15085 | msgstr "'%s':只需要一个合并基线" | |
15086 | ||
15087 | #: builtin/rebase.c:1314 | |
15088 | #, c-format | |
15089 | msgid "Does not point to a valid commit '%s'" | |
15090 | msgstr "没有指向一个有效的提交 '%s'" | |
15091 | ||
15092 | #: builtin/rebase.c:1339 | |
15093 | #, c-format | |
15094 | msgid "fatal: no such branch/commit '%s'" | |
15095 | msgstr "严重错误:无此分支/提交 '%s'" | |
15096 | ||
15097 | #: builtin/rebase.c:1347 builtin/submodule--helper.c:37 | |
15098 | #: builtin/submodule--helper.c:1930 | |
15099 | #, c-format | |
15100 | msgid "No such ref: %s" | |
15101 | msgstr "没有这样的引用:%s" | |
15102 | ||
15103 | #: builtin/rebase.c:1359 | |
15104 | msgid "Could not resolve HEAD to a revision" | |
15105 | msgstr "无法将 HEAD 解析为一个版本" | |
15106 | ||
15107 | #: builtin/rebase.c:1399 git-legacy-rebase.sh:665 | |
15108 | msgid "Cannot autostash" | |
15109 | msgstr "无法 autostash" | |
15110 | ||
15111 | #: builtin/rebase.c:1402 | |
15112 | #, c-format | |
15113 | msgid "Unexpected stash response: '%s'" | |
15114 | msgstr "意外的 stash 响应:'%s'" | |
15115 | ||
15116 | #: builtin/rebase.c:1408 | |
15117 | #, c-format | |
15118 | msgid "Could not create directory for '%s'" | |
15119 | msgstr "不能为 '%s' 创建目录" | |
15120 | ||
15121 | #: builtin/rebase.c:1411 | |
15122 | #, c-format | |
15123 | msgid "Created autostash: %s\n" | |
15124 | msgstr "创建了 autostash:%s\n" | |
15125 | ||
15126 | #: builtin/rebase.c:1414 | |
15127 | msgid "could not reset --hard" | |
15128 | msgstr "无法 reset --hard" | |
15129 | ||
15130 | #: builtin/rebase.c:1415 builtin/reset.c:113 | |
15131 | #, c-format | |
15132 | msgid "HEAD is now at %s" | |
15133 | msgstr "HEAD 现在位于 %s" | |
15134 | ||
15135 | #: builtin/rebase.c:1431 git-legacy-rebase.sh:674 | |
15136 | msgid "Please commit or stash them." | |
15137 | msgstr "请提交或贮藏修改。" | |
15138 | ||
15139 | #: builtin/rebase.c:1458 | |
15140 | #, c-format | |
15141 | msgid "could not parse '%s'" | |
15142 | msgstr "无法解析 '%s'" | |
15143 | ||
15144 | #: builtin/rebase.c:1470 | |
15145 | #, c-format | |
15146 | msgid "could not switch to %s" | |
15147 | msgstr "无法切换到 %s" | |
15148 | ||
15149 | #: builtin/rebase.c:1481 git-legacy-rebase.sh:697 | |
15150 | #, sh-format | |
15151 | msgid "HEAD is up to date." | |
15152 | msgstr "HEAD 是最新的。" | |
15153 | ||
15154 | #: builtin/rebase.c:1483 | |
15155 | #, c-format | |
15156 | msgid "Current branch %s is up to date.\n" | |
15157 | msgstr "当前分支 %s 是最新的。\n" | |
15158 | ||
15159 | #: builtin/rebase.c:1491 git-legacy-rebase.sh:707 | |
15160 | #, sh-format | |
15161 | msgid "HEAD is up to date, rebase forced." | |
15162 | msgstr "HEAD 是最新的,强制变基。" | |
15163 | ||
15164 | #: builtin/rebase.c:1493 | |
15165 | #, c-format | |
15166 | msgid "Current branch %s is up to date, rebase forced.\n" | |
15167 | msgstr "当前分支 %s 是最新的,强制变基。\n" | |
15168 | ||
15169 | #: builtin/rebase.c:1501 git-legacy-rebase.sh:208 | |
15170 | msgid "The pre-rebase hook refused to rebase." | |
15171 | msgstr "pre-rebase 钩子拒绝了变基操作。" | |
15172 | ||
15173 | #: builtin/rebase.c:1508 | |
15174 | #, c-format | |
15175 | msgid "Changes to %s:\n" | |
15176 | msgstr "到 %s 的变更:\n" | |
15177 | ||
15178 | #: builtin/rebase.c:1511 | |
15179 | #, c-format | |
15180 | msgid "Changes from %s to %s:\n" | |
15181 | msgstr "从 %s 到 %s 的变更:\n" | |
15182 | ||
15183 | #: builtin/rebase.c:1536 | |
15184 | #, c-format | |
15185 | msgid "First, rewinding head to replay your work on top of it...\n" | |
15186 | msgstr "首先,回退头指针以便在其上重放您的工作...\n" | |
15187 | ||
15188 | #: builtin/rebase.c:1543 | |
15189 | msgid "Could not detach HEAD" | |
15190 | msgstr "无法分离头指针" | |
15191 | ||
15192 | #: builtin/rebase.c:1552 | |
15193 | #, c-format | |
15194 | msgid "Fast-forwarded %s to %s.\n" | |
15195 | msgstr "快进 %s 到 %s。\n" | |
15196 | ||
15197 | #: builtin/rebase--interactive.c:24 | |
15198 | msgid "no HEAD?" | |
15199 | msgstr "没有 HEAD?" | |
15200 | ||
15201 | #: builtin/rebase--interactive.c:51 | |
15202 | #, c-format | |
15203 | msgid "could not create temporary %s" | |
15204 | msgstr "无法创建临时的 %s" | |
15205 | ||
15206 | #: builtin/rebase--interactive.c:57 | |
15207 | msgid "could not mark as interactive" | |
15208 | msgstr "无法标记为交互式" | |
15209 | ||
15210 | #: builtin/rebase--interactive.c:101 | |
15211 | #, c-format | |
15212 | msgid "could not open %s" | |
15213 | msgstr "无法打开 %s" | |
15214 | ||
15215 | #: builtin/rebase--interactive.c:114 | |
15216 | msgid "could not generate todo list" | |
15217 | msgstr "无法生成待办列表" | |
15218 | ||
15219 | #: builtin/rebase--interactive.c:129 | |
15220 | msgid "git rebase--interactive [<options>]" | |
15221 | msgstr "git rebase--interactive [<选项>]" | |
87cb7997 | 15222 | |
4c27fcb5 | 15223 | #: builtin/rebase--interactive.c:148 |
6937cb4e JX |
15224 | msgid "keep empty commits" |
15225 | msgstr "保持空提交" | |
15226 | ||
4c27fcb5 | 15227 | #: builtin/rebase--interactive.c:150 builtin/revert.c:124 |
31e5e17b JX |
15228 | msgid "allow commits with empty messages" |
15229 | msgstr "允许提交说明为空" | |
15230 | ||
4c27fcb5 | 15231 | #: builtin/rebase--interactive.c:151 |
fd8cb379 JX |
15232 | msgid "rebase merge commits" |
15233 | msgstr "对合并提交变基" | |
15234 | ||
4c27fcb5 | 15235 | #: builtin/rebase--interactive.c:153 |
fd8cb379 JX |
15236 | msgid "keep original branch points of cousins" |
15237 | msgstr "保持兄弟提交的原始分支点" | |
15238 | ||
4c27fcb5 JX |
15239 | #: builtin/rebase--interactive.c:155 |
15240 | msgid "move commits that begin with squash!/fixup!" | |
15241 | msgstr "移动以 squash!/fixup! 开头的提交" | |
15242 | ||
15243 | #: builtin/rebase--interactive.c:156 | |
15244 | msgid "sign commits" | |
15245 | msgstr "签名提交" | |
15246 | ||
15247 | #: builtin/rebase--interactive.c:158 | |
87cb7997 JX |
15248 | msgid "continue rebase" |
15249 | msgstr "继续变基" | |
15250 | ||
4c27fcb5 JX |
15251 | #: builtin/rebase--interactive.c:160 |
15252 | msgid "skip commit" | |
15253 | msgstr "跳过提交" | |
15254 | ||
15255 | #: builtin/rebase--interactive.c:161 | |
15256 | msgid "edit the todo list" | |
15257 | msgstr "变基待办列表" | |
87cb7997 | 15258 | |
4c27fcb5 JX |
15259 | #: builtin/rebase--interactive.c:163 |
15260 | msgid "show the current patch" | |
15261 | msgstr "显示当前补丁" | |
6937cb4e | 15262 | |
4c27fcb5 | 15263 | #: builtin/rebase--interactive.c:166 |
5809aa05 JX |
15264 | msgid "shorten commit ids in the todo list" |
15265 | msgstr "缩短待办列表中的提交号" | |
6937cb4e | 15266 | |
4c27fcb5 | 15267 | #: builtin/rebase--interactive.c:168 |
5809aa05 JX |
15268 | msgid "expand commit ids in the todo list" |
15269 | msgstr "扩展待办列表中的提交号" | |
15270 | ||
4c27fcb5 | 15271 | #: builtin/rebase--interactive.c:170 |
6937cb4e JX |
15272 | msgid "check the todo list" |
15273 | msgstr "检查待办列表" | |
15274 | ||
4c27fcb5 | 15275 | #: builtin/rebase--interactive.c:172 |
6937cb4e JX |
15276 | msgid "rearrange fixup/squash lines" |
15277 | msgstr "重新排列 fixup/squash 行" | |
15278 | ||
4c27fcb5 | 15279 | #: builtin/rebase--interactive.c:174 |
5809aa05 JX |
15280 | msgid "insert exec commands in todo list" |
15281 | msgstr "在待办列表中插入 exec 执行命令" | |
15282 | ||
4c27fcb5 JX |
15283 | #: builtin/rebase--interactive.c:175 |
15284 | msgid "onto" | |
15285 | msgstr "onto" | |
15286 | ||
15287 | #: builtin/rebase--interactive.c:177 | |
15288 | msgid "restrict-revision" | |
15289 | msgstr "restrict-revision" | |
15290 | ||
15291 | #: builtin/rebase--interactive.c:177 | |
15292 | msgid "restrict revision" | |
15293 | msgstr "限制版本" | |
15294 | ||
15295 | #: builtin/rebase--interactive.c:178 | |
15296 | msgid "squash-onto" | |
15297 | msgstr "squash-onto" | |
15298 | ||
15299 | #: builtin/rebase--interactive.c:179 | |
15300 | msgid "squash onto" | |
15301 | msgstr "squash onto" | |
15302 | ||
15303 | #: builtin/rebase--interactive.c:181 | |
15304 | msgid "the upstream commit" | |
15305 | msgstr "上游提交" | |
15306 | ||
15307 | #: builtin/rebase--interactive.c:182 | |
15308 | msgid "head-name" | |
15309 | msgstr "head-name" | |
15310 | ||
15311 | #: builtin/rebase--interactive.c:182 | |
15312 | msgid "head name" | |
15313 | msgstr "head 名称" | |
15314 | ||
15315 | #: builtin/rebase--interactive.c:187 | |
15316 | msgid "rebase strategy" | |
15317 | msgstr "变基策略" | |
15318 | ||
15319 | #: builtin/rebase--interactive.c:188 | |
15320 | msgid "strategy-opts" | |
15321 | msgstr "strategy-opts" | |
15322 | ||
15323 | #: builtin/rebase--interactive.c:189 | |
15324 | msgid "strategy options" | |
15325 | msgstr "策略选项" | |
15326 | ||
15327 | #: builtin/rebase--interactive.c:190 | |
15328 | msgid "switch-to" | |
15329 | msgstr "切换到" | |
15330 | ||
15331 | #: builtin/rebase--interactive.c:191 | |
15332 | msgid "the branch or commit to checkout" | |
15333 | msgstr "要检出的分支或提交" | |
15334 | ||
15335 | #: builtin/rebase--interactive.c:192 | |
15336 | msgid "onto-name" | |
15337 | msgstr "onto-name" | |
15338 | ||
15339 | #: builtin/rebase--interactive.c:192 | |
15340 | msgid "onto name" | |
15341 | msgstr "onto name" | |
15342 | ||
15343 | #: builtin/rebase--interactive.c:193 | |
15344 | msgid "cmd" | |
15345 | msgstr "cmd" | |
15346 | ||
15347 | #: builtin/rebase--interactive.c:193 | |
15348 | msgid "the command to run" | |
15349 | msgstr "要执行的命令" | |
15350 | ||
15351 | #: builtin/rebase--interactive.c:220 | |
fd8cb379 JX |
15352 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" |
15353 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
15354 | ||
4c27fcb5 JX |
15355 | #: builtin/rebase--interactive.c:226 |
15356 | msgid "a base commit must be provided with --upstream or --onto" | |
15357 | msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" | |
15358 | ||
15359 | #: builtin/receive-pack.c:33 | |
5b04ee3b | 15360 | msgid "git receive-pack <git-dir>" |
58b6f078 | 15361 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 15362 | |
c1ac5258 | 15363 | #: builtin/receive-pack.c:830 |
a0b6b246 JX |
15364 | msgid "" |
15365 | "By default, updating the current branch in a non-bare repository\n" | |
15366 | "is denied, because it will make the index and work tree inconsistent\n" | |
15367 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
15368 | "the work tree to HEAD.\n" | |
15369 | "\n" | |
1a79b2f1 JX |
15370 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
15371 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
15372 | "its current branch; however, this is not recommended unless you\n" |
15373 | "arranged to update its work tree to match what you pushed in some\n" | |
15374 | "other way.\n" | |
15375 | "\n" | |
15376 | "To squelch this message and still keep the default behaviour, set\n" | |
15377 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
15378 | msgstr "" | |
15379 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
15380 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
15381 | "\n" | |
15382 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
15383 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
15384 | "用某种方式将其工作区更新至您推送的状态。\n" | |
15385 | "\n" | |
15386 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
15387 | "配置变量为 'refuse'。" | |
15388 | ||
c1ac5258 | 15389 | #: builtin/receive-pack.c:850 |
a0b6b246 JX |
15390 | msgid "" |
15391 | "By default, deleting the current branch is denied, because the next\n" | |
15392 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
15393 | "\n" | |
15394 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
15395 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
15396 | "current branch, with or without a warning message.\n" | |
15397 | "\n" | |
15398 | "To squelch this message, you can set it to 'refuse'." | |
15399 | msgstr "" | |
15400 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 15401 | "导致困惑。\n" |
a0b6b246 JX |
15402 | "\n" |
15403 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 15404 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
15405 | "\n" |
15406 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
15407 | ||
4c27fcb5 | 15408 | #: builtin/receive-pack.c:1929 |
5b04ee3b JX |
15409 | msgid "quiet" |
15410 | msgstr "静默模式" | |
15411 | ||
4c27fcb5 | 15412 | #: builtin/receive-pack.c:1943 |
5b04ee3b JX |
15413 | msgid "You must specify a directory." |
15414 | msgstr "您必须指定一个目录。" | |
15415 | ||
4c27fcb5 | 15416 | #: builtin/reflog.c:563 builtin/reflog.c:568 |
2e8451e8 JX |
15417 | #, c-format |
15418 | msgid "'%s' is not a valid timestamp" | |
15419 | msgstr "'%s' 不是一个有效的时间戳" | |
15420 | ||
4c27fcb5 | 15421 | #: builtin/remote.c:16 |
ef317cd5 | 15422 | msgid "git remote [-v | --verbose]" |
07432cef | 15423 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 15424 | |
4c27fcb5 | 15425 | #: builtin/remote.c:17 |
ef317cd5 | 15426 | msgid "" |
814ff314 | 15427 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
15428 | "mirror=<fetch|push>] <name> <url>" |
15429 | msgstr "" | |
814ff314 | 15430 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 15431 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 15432 | |
4c27fcb5 | 15433 | #: builtin/remote.c:18 builtin/remote.c:38 |
ef317cd5 | 15434 | msgid "git remote rename <old> <new>" |
07432cef | 15435 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 15436 | |
4c27fcb5 | 15437 | #: builtin/remote.c:19 builtin/remote.c:43 |
ef317cd5 | 15438 | msgid "git remote remove <name>" |
07432cef | 15439 | msgstr "git remote remove <名称>" |
ef317cd5 | 15440 | |
4c27fcb5 | 15441 | #: builtin/remote.c:20 builtin/remote.c:48 |
814ff314 JX |
15442 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
15443 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 15444 | |
4c27fcb5 | 15445 | #: builtin/remote.c:21 |
ef317cd5 | 15446 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 15447 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 15448 | |
4c27fcb5 | 15449 | #: builtin/remote.c:22 |
ef317cd5 | 15450 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 15451 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 15452 | |
4c27fcb5 | 15453 | #: builtin/remote.c:23 |
ef317cd5 JX |
15454 | msgid "" |
15455 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 15456 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 15457 | |
4c27fcb5 | 15458 | #: builtin/remote.c:24 |
ef317cd5 | 15459 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 15460 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 15461 | |
4c27fcb5 | 15462 | #: builtin/remote.c:25 builtin/remote.c:74 |
94550ed3 JX |
15463 | msgid "git remote get-url [--push] [--all] <name>" |
15464 | msgstr "git remote get-url [--push] [--all] <名称>" | |
15465 | ||
4c27fcb5 | 15466 | #: builtin/remote.c:26 builtin/remote.c:79 |
ef317cd5 | 15467 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 15468 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 15469 | |
4c27fcb5 | 15470 | #: builtin/remote.c:27 builtin/remote.c:80 |
ef317cd5 | 15471 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 15472 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 15473 | |
4c27fcb5 | 15474 | #: builtin/remote.c:28 builtin/remote.c:81 |
ef317cd5 | 15475 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 15476 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 15477 | |
4c27fcb5 | 15478 | #: builtin/remote.c:33 |
ef317cd5 | 15479 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 15480 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 15481 | |
4c27fcb5 | 15482 | #: builtin/remote.c:53 |
ef317cd5 | 15483 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 15484 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 15485 | |
4c27fcb5 | 15486 | #: builtin/remote.c:54 |
ef317cd5 | 15487 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 15488 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 15489 | |
4c27fcb5 | 15490 | #: builtin/remote.c:59 |
ef317cd5 | 15491 | msgid "git remote show [<options>] <name>" |
07432cef | 15492 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 15493 | |
4c27fcb5 | 15494 | #: builtin/remote.c:64 |
ef317cd5 | 15495 | msgid "git remote prune [<options>] <name>" |
07432cef | 15496 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 15497 | |
4c27fcb5 | 15498 | #: builtin/remote.c:69 |
ef317cd5 | 15499 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 15500 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 15501 | |
4c27fcb5 | 15502 | #: builtin/remote.c:98 |
81809b99 | 15503 | #, c-format |
8ada9598 | 15504 | msgid "Updating %s" |
81809b99 | 15505 | msgstr "更新 %s 中" |
8ada9598 | 15506 | |
4c27fcb5 | 15507 | #: builtin/remote.c:130 |
8ada9598 JX |
15508 | msgid "" |
15509 | "--mirror is dangerous and deprecated; please\n" | |
15510 | "\t use --mirror=fetch or --mirror=push instead" | |
15511 | msgstr "" | |
81809b99 JX |
15512 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
15513 | "\t 或 --mirror=push" | |
8ada9598 | 15514 | |
4c27fcb5 | 15515 | #: builtin/remote.c:147 |
81809b99 | 15516 | #, c-format |
8ada9598 | 15517 | msgid "unknown mirror argument: %s" |
81809b99 | 15518 | msgstr "未知的镜像参数:%s" |
8ada9598 | 15519 | |
4c27fcb5 | 15520 | #: builtin/remote.c:163 |
ef317cd5 | 15521 | msgid "fetch the remote branches" |
07432cef | 15522 | msgstr "抓取远程的分支" |
ef317cd5 | 15523 | |
4c27fcb5 | 15524 | #: builtin/remote.c:165 |
ef317cd5 | 15525 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 15526 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 15527 | |
4c27fcb5 | 15528 | #: builtin/remote.c:168 |
ef317cd5 | 15529 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 15530 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 15531 | |
4c27fcb5 | 15532 | #: builtin/remote.c:170 |
ef317cd5 | 15533 | msgid "branch(es) to track" |
07432cef | 15534 | msgstr "跟踪的分支" |
ef317cd5 | 15535 | |
4c27fcb5 | 15536 | #: builtin/remote.c:171 |
ef317cd5 | 15537 | msgid "master branch" |
07432cef | 15538 | msgstr "主线分支" |
ef317cd5 | 15539 | |
4c27fcb5 | 15540 | #: builtin/remote.c:173 |
ef317cd5 | 15541 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 15542 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 15543 | |
4c27fcb5 | 15544 | #: builtin/remote.c:185 |
8ada9598 | 15545 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 15546 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 15547 | |
4c27fcb5 | 15548 | #: builtin/remote.c:187 |
8ada9598 | 15549 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 15550 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 15551 | |
4c27fcb5 | 15552 | #: builtin/remote.c:194 builtin/remote.c:636 |
81809b99 | 15553 | #, c-format |
8ada9598 | 15554 | msgid "remote %s already exists." |
81809b99 | 15555 | msgstr "远程 %s 已经存在。" |
8ada9598 | 15556 | |
4c27fcb5 | 15557 | #: builtin/remote.c:198 builtin/remote.c:640 |
81809b99 | 15558 | #, c-format |
8ada9598 | 15559 | msgid "'%s' is not a valid remote name" |
81809b99 | 15560 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 15561 | |
4c27fcb5 | 15562 | #: builtin/remote.c:238 |
81809b99 | 15563 | #, c-format |
8ada9598 | 15564 | msgid "Could not setup master '%s'" |
81809b99 | 15565 | msgstr "无法设置 master '%s'" |
8ada9598 | 15566 | |
4c27fcb5 | 15567 | #: builtin/remote.c:344 |
81809b99 | 15568 | #, c-format |
8ada9598 | 15569 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 15570 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 15571 | |
4c27fcb5 | 15572 | #: builtin/remote.c:443 builtin/remote.c:451 |
8ada9598 | 15573 | msgid "(matching)" |
81809b99 | 15574 | msgstr "(匹配)" |
8ada9598 | 15575 | |
4c27fcb5 | 15576 | #: builtin/remote.c:455 |
8ada9598 | 15577 | msgid "(delete)" |
81809b99 | 15578 | msgstr "(删除)" |
8ada9598 | 15579 | |
4c27fcb5 | 15580 | #: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 |
81809b99 | 15581 | #, c-format |
4c27fcb5 JX |
15582 | msgid "No such remote: '%s'" |
15583 | msgstr "没有此远程仓库:'%s'" | |
8ada9598 | 15584 | |
4c27fcb5 | 15585 | #: builtin/remote.c:646 |
81809b99 | 15586 | #, c-format |
8ada9598 | 15587 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 15588 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 15589 | |
4c27fcb5 | 15590 | #: builtin/remote.c:666 |
8ada9598 JX |
15591 | #, c-format |
15592 | msgid "" | |
d691f479 | 15593 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
15594 | "\t%s\n" |
15595 | "\tPlease update the configuration manually if necessary." | |
15596 | msgstr "" | |
160fb2b2 | 15597 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
15598 | "\t%s\n" |
15599 | "\t如果必要请手动更新配置。" | |
8ada9598 | 15600 | |
4c27fcb5 | 15601 | #: builtin/remote.c:702 |
81809b99 | 15602 | #, c-format |
8ada9598 | 15603 | msgid "deleting '%s' failed" |
81809b99 | 15604 | msgstr "删除 '%s' 失败" |
8ada9598 | 15605 | |
4c27fcb5 | 15606 | #: builtin/remote.c:736 |
81809b99 | 15607 | #, c-format |
8ada9598 | 15608 | msgid "creating '%s' failed" |
81809b99 | 15609 | msgstr "创建 '%s' 失败" |
8ada9598 | 15610 | |
4c27fcb5 | 15611 | #: builtin/remote.c:802 |
8ada9598 JX |
15612 | msgid "" |
15613 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
15614 | "to delete it, use:" | |
15615 | msgid_plural "" | |
15616 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
15617 | "to delete them, use:" | |
5ae481e0 JX |
15618 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
15619 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 15620 | |
4c27fcb5 | 15621 | #: builtin/remote.c:816 |
276ceeaa JX |
15622 | #, c-format |
15623 | msgid "Could not remove config section '%s'" | |
15624 | msgstr "不能移除配置小节 '%s'" | |
15625 | ||
4c27fcb5 | 15626 | #: builtin/remote.c:917 |
8ada9598 JX |
15627 | #, c-format |
15628 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 15629 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 15630 | |
4c27fcb5 | 15631 | #: builtin/remote.c:920 |
8ada9598 | 15632 | msgid " tracked" |
81809b99 | 15633 | msgstr " 已跟踪" |
8ada9598 | 15634 | |
4c27fcb5 | 15635 | #: builtin/remote.c:922 |
8ada9598 | 15636 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 15637 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 15638 | |
4c27fcb5 | 15639 | #: builtin/remote.c:924 |
8ada9598 | 15640 | msgid " ???" |
81809b99 | 15641 | msgstr " ???" |
8ada9598 | 15642 | |
4c27fcb5 | 15643 | #: builtin/remote.c:965 |
8ada9598 JX |
15644 | #, c-format |
15645 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 15646 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 15647 | |
4c27fcb5 | 15648 | #: builtin/remote.c:974 |
81809b99 | 15649 | #, c-format |
276ceeaa JX |
15650 | msgid "rebases interactively onto remote %s" |
15651 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 15652 | |
4c27fcb5 | 15653 | #: builtin/remote.c:976 |
fd8cb379 JX |
15654 | #, c-format |
15655 | msgid "rebases interactively (with merges) onto remote %s" | |
15656 | msgstr "交互式变基(含合并提交)到远程 %s" | |
15657 | ||
4c27fcb5 | 15658 | #: builtin/remote.c:979 |
5c57d762 JX |
15659 | #, c-format |
15660 | msgid "rebases onto remote %s" | |
15661 | msgstr "变基到远程 %s" | |
15662 | ||
4c27fcb5 | 15663 | #: builtin/remote.c:983 |
81809b99 | 15664 | #, c-format |
8ada9598 | 15665 | msgid " merges with remote %s" |
81809b99 | 15666 | msgstr " 与远程 %s 合并" |
8ada9598 | 15667 | |
4c27fcb5 | 15668 | #: builtin/remote.c:986 |
81809b99 | 15669 | #, c-format |
8ada9598 | 15670 | msgid "merges with remote %s" |
81809b99 | 15671 | msgstr "与远程 %s 合并" |
8ada9598 | 15672 | |
4c27fcb5 | 15673 | #: builtin/remote.c:989 |
5c57d762 JX |
15674 | #, c-format |
15675 | msgid "%-*s and with remote %s\n" | |
15676 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 15677 | |
4c27fcb5 | 15678 | #: builtin/remote.c:1032 |
8ada9598 | 15679 | msgid "create" |
81809b99 | 15680 | msgstr "创建" |
8ada9598 | 15681 | |
4c27fcb5 | 15682 | #: builtin/remote.c:1035 |
8ada9598 | 15683 | msgid "delete" |
81809b99 | 15684 | msgstr "删除" |
8ada9598 | 15685 | |
4c27fcb5 | 15686 | #: builtin/remote.c:1039 |
8ada9598 | 15687 | msgid "up to date" |
81809b99 | 15688 | msgstr "最新" |
8ada9598 | 15689 | |
4c27fcb5 | 15690 | #: builtin/remote.c:1042 |
8ada9598 | 15691 | msgid "fast-forwardable" |
81809b99 | 15692 | msgstr "可快进" |
8ada9598 | 15693 | |
4c27fcb5 | 15694 | #: builtin/remote.c:1045 |
8ada9598 | 15695 | msgid "local out of date" |
81809b99 | 15696 | msgstr "本地已过时" |
8ada9598 | 15697 | |
4c27fcb5 | 15698 | #: builtin/remote.c:1052 |
8ada9598 JX |
15699 | #, c-format |
15700 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 15701 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 15702 | |
4c27fcb5 | 15703 | #: builtin/remote.c:1055 |
8ada9598 JX |
15704 | #, c-format |
15705 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 15706 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 15707 | |
4c27fcb5 | 15708 | #: builtin/remote.c:1059 |
8ada9598 JX |
15709 | #, c-format |
15710 | msgid " %-*s forces to %s" | |
81809b99 | 15711 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 15712 | |
4c27fcb5 | 15713 | #: builtin/remote.c:1062 |
8ada9598 JX |
15714 | #, c-format |
15715 | msgid " %-*s pushes to %s" | |
81809b99 | 15716 | msgstr " %-*s 推送至 %s" |
8ada9598 | 15717 | |
4c27fcb5 | 15718 | #: builtin/remote.c:1130 |
ef317cd5 | 15719 | msgid "do not query remotes" |
07432cef | 15720 | msgstr "不查询远程" |
ef317cd5 | 15721 | |
4c27fcb5 | 15722 | #: builtin/remote.c:1157 |
81809b99 | 15723 | #, c-format |
8ada9598 | 15724 | msgid "* remote %s" |
81809b99 | 15725 | msgstr "* 远程 %s" |
8ada9598 | 15726 | |
4c27fcb5 | 15727 | #: builtin/remote.c:1158 |
8ada9598 JX |
15728 | #, c-format |
15729 | msgid " Fetch URL: %s" | |
81809b99 | 15730 | msgstr " 获取地址:%s" |
8ada9598 | 15731 | |
4c27fcb5 | 15732 | #: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 |
8ada9598 | 15733 | msgid "(no URL)" |
81809b99 | 15734 | msgstr "(无 URL)" |
8ada9598 | 15735 | |
a4f16749 JX |
15736 | #. TRANSLATORS: the colon ':' should align |
15737 | #. with the one in " Fetch URL: %s" | |
15738 | #. translation. | |
15739 | #. | |
4c27fcb5 | 15740 | #: builtin/remote.c:1173 builtin/remote.c:1175 |
8ada9598 JX |
15741 | #, c-format |
15742 | msgid " Push URL: %s" | |
81809b99 | 15743 | msgstr " 推送地址:%s" |
8ada9598 | 15744 | |
4c27fcb5 | 15745 | #: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 |
81809b99 | 15746 | #, c-format |
8ada9598 | 15747 | msgid " HEAD branch: %s" |
4375c10e | 15748 | msgstr " HEAD 分支:%s" |
8ada9598 | 15749 | |
5c57d762 | 15750 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 15751 | #: builtin/remote.c:1177 |
5c57d762 JX |
15752 | msgid "(not queried)" |
15753 | msgstr "(未查询)" | |
15754 | ||
4c27fcb5 | 15755 | #: builtin/remote.c:1179 |
5c57d762 JX |
15756 | msgid "(unknown)" |
15757 | msgstr "(未知)" | |
15758 | ||
4c27fcb5 | 15759 | #: builtin/remote.c:1183 |
8ada9598 JX |
15760 | #, c-format |
15761 | msgid "" | |
15762 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 15763 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 15764 | |
4c27fcb5 | 15765 | #: builtin/remote.c:1195 |
81809b99 | 15766 | #, c-format |
8ada9598 JX |
15767 | msgid " Remote branch:%s" |
15768 | msgid_plural " Remote branches:%s" | |
81809b99 | 15769 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 15770 | msgstr[1] " 远程分支:%s" |
8ada9598 | 15771 | |
81809b99 | 15772 | # 译者:中文字符串拼接,可删除前导空格 |
4c27fcb5 | 15773 | #: builtin/remote.c:1198 builtin/remote.c:1224 |
8ada9598 | 15774 | msgid " (status not queried)" |
81809b99 | 15775 | msgstr "(状态未查询)" |
8ada9598 | 15776 | |
4c27fcb5 | 15777 | #: builtin/remote.c:1207 |
8ada9598 JX |
15778 | msgid " Local branch configured for 'git pull':" |
15779 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 15780 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 15781 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 15782 | |
4c27fcb5 | 15783 | #: builtin/remote.c:1215 |
8ada9598 | 15784 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 15785 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 15786 | |
4c27fcb5 | 15787 | #: builtin/remote.c:1221 |
81809b99 | 15788 | #, c-format |
8ada9598 JX |
15789 | msgid " Local ref configured for 'git push'%s:" |
15790 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 15791 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 15792 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 15793 | |
4c27fcb5 | 15794 | #: builtin/remote.c:1242 |
ef317cd5 | 15795 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 15796 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 15797 | |
4c27fcb5 | 15798 | #: builtin/remote.c:1244 |
ef317cd5 | 15799 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 15800 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 15801 | |
4c27fcb5 | 15802 | #: builtin/remote.c:1259 |
8ada9598 | 15803 | msgid "Cannot determine remote HEAD" |
81809b99 | 15804 | msgstr "无法确定远程 HEAD" |
8ada9598 | 15805 | |
4c27fcb5 | 15806 | #: builtin/remote.c:1261 |
8ada9598 | 15807 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 15808 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 15809 | |
4c27fcb5 | 15810 | #: builtin/remote.c:1271 |
81809b99 | 15811 | #, c-format |
8ada9598 | 15812 | msgid "Could not delete %s" |
81809b99 | 15813 | msgstr "无法删除 %s" |
8ada9598 | 15814 | |
4c27fcb5 | 15815 | #: builtin/remote.c:1279 |
81809b99 | 15816 | #, c-format |
8ada9598 | 15817 | msgid "Not a valid ref: %s" |
81809b99 | 15818 | msgstr "不是一个有效引用:%s" |
8ada9598 | 15819 | |
4c27fcb5 | 15820 | #: builtin/remote.c:1281 |
81809b99 | 15821 | #, c-format |
8ada9598 | 15822 | msgid "Could not setup %s" |
81809b99 | 15823 | msgstr "不能设置 %s" |
8ada9598 JX |
15824 | |
15825 | # 译者:注意保持前导空格 | |
4c27fcb5 | 15826 | #: builtin/remote.c:1299 |
81809b99 | 15827 | #, c-format |
8ada9598 | 15828 | msgid " %s will become dangling!" |
e640d114 | 15829 | msgstr " %s 将成为悬空状态!" |
8ada9598 JX |
15830 | |
15831 | # 译者:注意保持前导空格 | |
4c27fcb5 | 15832 | #: builtin/remote.c:1300 |
81809b99 | 15833 | #, c-format |
8ada9598 | 15834 | msgid " %s has become dangling!" |
e640d114 | 15835 | msgstr " %s 已成为悬空状态!" |
8ada9598 | 15836 | |
4c27fcb5 | 15837 | #: builtin/remote.c:1310 |
81809b99 | 15838 | #, c-format |
8ada9598 | 15839 | msgid "Pruning %s" |
81809b99 | 15840 | msgstr "修剪 %s" |
8ada9598 | 15841 | |
4c27fcb5 | 15842 | #: builtin/remote.c:1311 |
8ada9598 JX |
15843 | #, c-format |
15844 | msgid "URL: %s" | |
81809b99 | 15845 | msgstr "URL:%s" |
8ada9598 | 15846 | |
4c27fcb5 | 15847 | #: builtin/remote.c:1327 |
8ada9598 JX |
15848 | #, c-format |
15849 | msgid " * [would prune] %s" | |
81809b99 | 15850 | msgstr " * [将删除] %s" |
8ada9598 | 15851 | |
4c27fcb5 | 15852 | #: builtin/remote.c:1330 |
8ada9598 JX |
15853 | #, c-format |
15854 | msgid " * [pruned] %s" | |
81809b99 | 15855 | msgstr " * [已删除] %s" |
8ada9598 | 15856 | |
4c27fcb5 | 15857 | #: builtin/remote.c:1375 |
ef317cd5 | 15858 | msgid "prune remotes after fetching" |
07432cef | 15859 | msgstr "抓取后清除远程" |
ef317cd5 | 15860 | |
4c27fcb5 | 15861 | #: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 |
81809b99 | 15862 | #, c-format |
8ada9598 | 15863 | msgid "No such remote '%s'" |
81809b99 | 15864 | msgstr "没有此远程 '%s'" |
8ada9598 | 15865 | |
4c27fcb5 | 15866 | #: builtin/remote.c:1454 |
ef317cd5 | 15867 | msgid "add branch" |
07432cef | 15868 | msgstr "添加分支" |
ef317cd5 | 15869 | |
4c27fcb5 | 15870 | #: builtin/remote.c:1461 |
8ada9598 | 15871 | msgid "no remote specified" |
81809b99 | 15872 | msgstr "未指定远程" |
8ada9598 | 15873 | |
4c27fcb5 | 15874 | #: builtin/remote.c:1478 |
94550ed3 JX |
15875 | msgid "query push URLs rather than fetch URLs" |
15876 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
15877 | ||
4c27fcb5 | 15878 | #: builtin/remote.c:1480 |
94550ed3 JX |
15879 | msgid "return all URLs" |
15880 | msgstr "返回所有 URL 地址" | |
15881 | ||
4c27fcb5 | 15882 | #: builtin/remote.c:1508 |
94550ed3 JX |
15883 | #, c-format |
15884 | msgid "no URLs configured for remote '%s'" | |
15885 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
15886 | ||
4c27fcb5 | 15887 | #: builtin/remote.c:1534 |
ef317cd5 | 15888 | msgid "manipulate push URLs" |
07432cef | 15889 | msgstr "操作推送 URLS" |
ef317cd5 | 15890 | |
4c27fcb5 | 15891 | #: builtin/remote.c:1536 |
ef317cd5 | 15892 | msgid "add URL" |
07432cef | 15893 | msgstr "添加 URL" |
ef317cd5 | 15894 | |
4c27fcb5 | 15895 | #: builtin/remote.c:1538 |
ef317cd5 | 15896 | msgid "delete URLs" |
07432cef | 15897 | msgstr "删除 URLS" |
ef317cd5 | 15898 | |
4c27fcb5 | 15899 | #: builtin/remote.c:1545 |
8ada9598 | 15900 | msgid "--add --delete doesn't make sense" |
81809b99 | 15901 | msgstr "--add --delete 无意义" |
8ada9598 | 15902 | |
4c27fcb5 | 15903 | #: builtin/remote.c:1584 |
81809b99 | 15904 | #, c-format |
8ada9598 | 15905 | msgid "Invalid old URL pattern: %s" |
4375c10e | 15906 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 15907 | |
4c27fcb5 | 15908 | #: builtin/remote.c:1592 |
81809b99 | 15909 | #, c-format |
8ada9598 | 15910 | msgid "No such URL found: %s" |
4375c10e | 15911 | msgstr "未找到此 URL:%s" |
8ada9598 | 15912 | |
4c27fcb5 | 15913 | #: builtin/remote.c:1594 |
8ada9598 | 15914 | msgid "Will not delete all non-push URLs" |
4375c10e | 15915 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 15916 | |
4c27fcb5 | 15917 | #: builtin/remote.c:1610 |
ef317cd5 | 15918 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 15919 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 15920 | |
4c27fcb5 | 15921 | #: builtin/remote.c:1641 |
a0b6b246 JX |
15922 | #, c-format |
15923 | msgid "Unknown subcommand: %s" | |
15924 | msgstr "未知子命令:%s" | |
15925 | ||
4c27fcb5 | 15926 | #: builtin/repack.c:22 |
814ff314 JX |
15927 | msgid "git repack [<options>]" |
15928 | msgstr "git repack [<选项>]" | |
90314792 | 15929 | |
4c27fcb5 | 15930 | #: builtin/repack.c:27 |
1a79b2f1 JX |
15931 | msgid "" |
15932 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
15933 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
15934 | msgstr "" | |
15935 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
15936 | "或禁用 pack.writebitmaps 配置。" | |
15937 | ||
4c27fcb5 | 15938 | #: builtin/repack.c:294 |
90314792 JX |
15939 | msgid "pack everything in a single pack" |
15940 | msgstr "所有内容打包到一个包文件中" | |
15941 | ||
4c27fcb5 | 15942 | #: builtin/repack.c:296 |
90314792 JX |
15943 | msgid "same as -a, and turn unreachable objects loose" |
15944 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
15945 | ||
4c27fcb5 | 15946 | #: builtin/repack.c:299 |
90314792 JX |
15947 | msgid "remove redundant packs, and run git-prune-packed" |
15948 | msgstr "删除多余的包,运行 git-prune-packed" | |
15949 | ||
4c27fcb5 | 15950 | #: builtin/repack.c:301 |
90314792 JX |
15951 | msgid "pass --no-reuse-delta to git-pack-objects" |
15952 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
15953 | ||
4c27fcb5 | 15954 | #: builtin/repack.c:303 |
90314792 JX |
15955 | msgid "pass --no-reuse-object to git-pack-objects" |
15956 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
15957 | ||
4c27fcb5 | 15958 | #: builtin/repack.c:305 |
90314792 JX |
15959 | msgid "do not run git-update-server-info" |
15960 | msgstr "不运行 git-update-server-info" | |
15961 | ||
4c27fcb5 | 15962 | #: builtin/repack.c:308 |
90314792 JX |
15963 | msgid "pass --local to git-pack-objects" |
15964 | msgstr "向 git-pack-objects 传递参数 --local" | |
15965 | ||
4c27fcb5 | 15966 | #: builtin/repack.c:310 |
6c94aba5 JX |
15967 | msgid "write bitmap index" |
15968 | msgstr "写 bitmap 索引" | |
15969 | ||
4c27fcb5 JX |
15970 | #: builtin/repack.c:312 |
15971 | msgid "pass --delta-islands to git-pack-objects" | |
15972 | msgstr "向 git-pack-objects 传递参数 --delta-islands" | |
15973 | ||
15974 | #: builtin/repack.c:313 | |
90314792 JX |
15975 | msgid "approxidate" |
15976 | msgstr "近似日期" | |
15977 | ||
4c27fcb5 | 15978 | #: builtin/repack.c:314 |
90314792 JX |
15979 | msgid "with -A, do not loosen objects older than this" |
15980 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
15981 | ||
4c27fcb5 | 15982 | #: builtin/repack.c:316 |
5c57d762 JX |
15983 | msgid "with -a, repack unreachable objects" |
15984 | msgstr "使用 -a ,重新对不可达对象打包" | |
15985 | ||
4c27fcb5 | 15986 | #: builtin/repack.c:318 |
90314792 JX |
15987 | msgid "size of the window used for delta compression" |
15988 | msgstr "用于增量压缩的窗口值" | |
15989 | ||
4c27fcb5 | 15990 | #: builtin/repack.c:319 builtin/repack.c:325 |
8376b58d JX |
15991 | msgid "bytes" |
15992 | msgstr "字节" | |
15993 | ||
4c27fcb5 | 15994 | #: builtin/repack.c:320 |
90314792 JX |
15995 | msgid "same as the above, but limit memory size instead of entries count" |
15996 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
15997 | ||
4c27fcb5 | 15998 | #: builtin/repack.c:322 |
90314792 JX |
15999 | msgid "limits the maximum delta depth" |
16000 | msgstr "限制最大增量深度" | |
16001 | ||
4c27fcb5 | 16002 | #: builtin/repack.c:324 |
a4f16749 JX |
16003 | msgid "limits the maximum number of threads" |
16004 | msgstr "限制最大线程数" | |
16005 | ||
4c27fcb5 | 16006 | #: builtin/repack.c:326 |
90314792 | 16007 | msgid "maximum size of each packfile" |
dbd6cced | 16008 | msgstr "每个包文件的最大尺寸" |
90314792 | 16009 | |
4c27fcb5 | 16010 | #: builtin/repack.c:328 |
6c94aba5 JX |
16011 | msgid "repack objects in packs marked with .keep" |
16012 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
16013 | ||
4c27fcb5 | 16014 | #: builtin/repack.c:330 |
fd8cb379 JX |
16015 | msgid "do not repack this pack" |
16016 | msgstr "不要对该包文件重新打包" | |
16017 | ||
4c27fcb5 | 16018 | #: builtin/repack.c:340 |
94550ed3 JX |
16019 | msgid "cannot delete packs in a precious-objects repo" |
16020 | msgstr "不能删除珍品仓库中的打包文件" | |
16021 | ||
4c27fcb5 | 16022 | #: builtin/repack.c:344 |
5c57d762 JX |
16023 | msgid "--keep-unreachable and -A are incompatible" |
16024 | msgstr "--keep-unreachable 和 -A 不兼容" | |
16025 | ||
4c27fcb5 | 16026 | #: builtin/repack.c:527 |
90314792 | 16027 | #, c-format |
5c57d762 | 16028 | msgid "failed to remove '%s'" |
c1ac5258 | 16029 | msgstr "删除 '%s' 失败" |
90314792 | 16030 | |
fd8cb379 | 16031 | #: builtin/replace.c:22 |
ef317cd5 | 16032 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 16033 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 16034 | |
fd8cb379 | 16035 | #: builtin/replace.c:23 |
6acbf033 JX |
16036 | msgid "git replace [-f] --edit <object>" |
16037 | msgstr "git replace [-f] --edit <对象>" | |
16038 | ||
fd8cb379 | 16039 | #: builtin/replace.c:24 |
6acbf033 JX |
16040 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
16041 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
16042 | ||
fd8cb379 JX |
16043 | #: builtin/replace.c:25 |
16044 | msgid "git replace [-f] --convert-graft-file" | |
16045 | msgstr "git replace [-f] --convert-graft-file" | |
16046 | ||
16047 | #: builtin/replace.c:26 | |
ef317cd5 | 16048 | msgid "git replace -d <object>..." |
07432cef | 16049 | msgstr "git replace -d <对象>..." |
ef317cd5 | 16050 | |
fd8cb379 | 16051 | #: builtin/replace.c:27 |
cfff71a9 JX |
16052 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
16053 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 16054 | |
4c27fcb5 | 16055 | #: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 |
6acbf033 | 16056 | #, c-format |
c1ac5258 JX |
16057 | msgid "failed to resolve '%s' as a valid ref" |
16058 | msgstr "无法将 '%s' 解析为一个有效引用" | |
16059 | ||
16060 | #: builtin/replace.c:86 | |
16061 | #, c-format | |
16062 | msgid "" | |
16063 | "invalid replace format '%s'\n" | |
16064 | "valid formats are 'short', 'medium' and 'long'" | |
16065 | msgstr "" | |
16066 | "无效的替换格式 '%s'\n" | |
16067 | "有效的格式有 'short'、'medium' 和 'long'" | |
16068 | ||
16069 | #: builtin/replace.c:121 | |
16070 | #, c-format | |
16071 | msgid "replace ref '%s' not found" | |
16072 | msgstr "未发现替换引用 '%s'" | |
16073 | ||
16074 | #: builtin/replace.c:137 | |
16075 | #, c-format | |
16076 | msgid "Deleted replace ref '%s'" | |
e640d114 | 16077 | msgstr "已删除替换引用 '%s'" |
c1ac5258 JX |
16078 | |
16079 | #: builtin/replace.c:149 | |
16080 | #, c-format | |
16081 | msgid "'%s' is not a valid ref name" | |
16082 | msgstr "'%s' 不是一个有效的引用名" | |
16083 | ||
16084 | #: builtin/replace.c:154 | |
16085 | #, c-format | |
16086 | msgid "replace ref '%s' already exists" | |
16087 | msgstr "替换引用 '%s' 已经存在" | |
16088 | ||
16089 | #: builtin/replace.c:174 | |
16090 | #, c-format | |
16091 | msgid "" | |
16092 | "Objects must be of the same type.\n" | |
16093 | "'%s' points to a replaced object of type '%s'\n" | |
16094 | "while '%s' points to a replacement object of type '%s'." | |
16095 | msgstr "" | |
16096 | "对象必须属于同一类型。\n" | |
16097 | "'%s' 指向 '%s' 类型的替换对象\n" | |
16098 | "而 '%s' 指向 '%s' 类型的替换对象。" | |
16099 | ||
16100 | #: builtin/replace.c:225 | |
16101 | #, c-format | |
16102 | msgid "unable to open %s for writing" | |
16103 | msgstr "无法为写入打开 %s" | |
16104 | ||
16105 | #: builtin/replace.c:238 | |
16106 | msgid "cat-file reported failure" | |
16107 | msgstr "cat-file 报告失败" | |
16108 | ||
16109 | #: builtin/replace.c:254 | |
16110 | #, c-format | |
16111 | msgid "unable to open %s for reading" | |
16112 | msgstr "无法为读取打开 %s" | |
16113 | ||
16114 | #: builtin/replace.c:268 | |
16115 | msgid "unable to spawn mktree" | |
16116 | msgstr "无法启动 mktree" | |
16117 | ||
16118 | #: builtin/replace.c:272 | |
16119 | msgid "unable to read from mktree" | |
16120 | msgstr "无法从 mktree 读取" | |
16121 | ||
16122 | #: builtin/replace.c:281 | |
16123 | msgid "mktree reported failure" | |
16124 | msgstr "mktree 报告失败" | |
16125 | ||
16126 | #: builtin/replace.c:285 | |
16127 | msgid "mktree did not return an object name" | |
16128 | msgstr "mktree 没有返回一个对象名" | |
16129 | ||
16130 | #: builtin/replace.c:294 | |
16131 | #, c-format | |
16132 | msgid "unable to fstat %s" | |
16133 | msgstr "无法对 %s 执行 fstat" | |
16134 | ||
16135 | #: builtin/replace.c:299 | |
16136 | msgid "unable to write object to database" | |
16137 | msgstr "无法向数据库写入对象" | |
16138 | ||
16139 | #: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 | |
16140 | #: builtin/replace.c:445 | |
16141 | #, c-format | |
16142 | msgid "not a valid object name: '%s'" | |
6acbf033 JX |
16143 | msgstr "不是一个有效的对象名:'%s'" |
16144 | ||
c1ac5258 JX |
16145 | #: builtin/replace.c:322 |
16146 | #, c-format | |
16147 | msgid "unable to get object type for %s" | |
16148 | msgstr "无法得到 %s 的对象类型" | |
16149 | ||
16150 | #: builtin/replace.c:338 | |
16151 | msgid "editing object file failed" | |
16152 | msgstr "编辑对象文件失败" | |
16153 | ||
16154 | #: builtin/replace.c:347 | |
16155 | #, c-format | |
16156 | msgid "new object is the same as the old one: '%s'" | |
16157 | msgstr "新对象和旧对象相同:'%s'" | |
16158 | ||
fd8cb379 | 16159 | #: builtin/replace.c:407 |
6acbf033 JX |
16160 | #, c-format |
16161 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 16162 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 16163 | |
fd8cb379 | 16164 | #: builtin/replace.c:409 |
6acbf033 JX |
16165 | #, c-format |
16166 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 16167 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 16168 | |
fd8cb379 | 16169 | #: builtin/replace.c:421 |
6acbf033 JX |
16170 | #, c-format |
16171 | msgid "" | |
16172 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
16173 | "instead of --graft" | |
55a16ee4 | 16174 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 16175 | |
fd8cb379 | 16176 | #: builtin/replace.c:460 |
6acbf033 | 16177 | #, c-format |
c1ac5258 JX |
16178 | msgid "the original commit '%s' has a gpg signature" |
16179 | msgstr "原始提交 '%s' 中有一个 gpg 签名" | |
6acbf033 | 16180 | |
fd8cb379 | 16181 | #: builtin/replace.c:461 |
6acbf033 JX |
16182 | msgid "the signature will be removed in the replacement commit!" |
16183 | msgstr "在替换的提交中签名将被移除!" | |
16184 | ||
fd8cb379 | 16185 | #: builtin/replace.c:471 |
6acbf033 JX |
16186 | #, c-format |
16187 | msgid "could not write replacement commit for: '%s'" | |
16188 | msgstr "不能为 '%s' 写替换提交" | |
16189 | ||
c1ac5258 JX |
16190 | #: builtin/replace.c:479 |
16191 | #, c-format | |
16192 | msgid "graft for '%s' unnecessary" | |
16193 | msgstr "对 '%s' 移植没有必要" | |
16194 | ||
16195 | #: builtin/replace.c:482 | |
16196 | #, c-format | |
16197 | msgid "new commit is the same as the old one: '%s'" | |
16198 | msgstr "新提交和旧的一样:'%s'" | |
16199 | ||
4c27fcb5 | 16200 | #: builtin/replace.c:515 |
fd8cb379 JX |
16201 | #, c-format |
16202 | msgid "" | |
16203 | "could not convert the following graft(s):\n" | |
16204 | "%s" | |
16205 | msgstr "" | |
16206 | "不能转换下列移植:\n" | |
16207 | "%s" | |
16208 | ||
4c27fcb5 | 16209 | #: builtin/replace.c:536 |
ef317cd5 | 16210 | msgid "list replace refs" |
07432cef | 16211 | msgstr "列出替换的引用" |
ef317cd5 | 16212 | |
4c27fcb5 | 16213 | #: builtin/replace.c:537 |
ef317cd5 | 16214 | msgid "delete replace refs" |
07432cef | 16215 | msgstr "删除替换的引用" |
ef317cd5 | 16216 | |
4c27fcb5 | 16217 | #: builtin/replace.c:538 |
6acbf033 JX |
16218 | msgid "edit existing object" |
16219 | msgstr "编辑现存的对象" | |
16220 | ||
4c27fcb5 | 16221 | #: builtin/replace.c:539 |
6acbf033 JX |
16222 | msgid "change a commit's parents" |
16223 | msgstr "修改一个提交的父提交" | |
16224 | ||
4c27fcb5 | 16225 | #: builtin/replace.c:540 |
fd8cb379 JX |
16226 | msgid "convert existing graft file" |
16227 | msgstr "转换现存的移植文件" | |
16228 | ||
4c27fcb5 | 16229 | #: builtin/replace.c:541 |
ef317cd5 | 16230 | msgid "replace the ref if it exists" |
07432cef | 16231 | msgstr "如果存在则替换引用" |
ef317cd5 | 16232 | |
4c27fcb5 | 16233 | #: builtin/replace.c:543 |
6acbf033 JX |
16234 | msgid "do not pretty-print contents for --edit" |
16235 | msgstr "不要为 --edit 操作美观显示内容" | |
16236 | ||
4c27fcb5 | 16237 | #: builtin/replace.c:544 |
cfff71a9 JX |
16238 | msgid "use this format" |
16239 | msgstr "使用此格式" | |
16240 | ||
4c27fcb5 | 16241 | #: builtin/replace.c:557 |
c1ac5258 | 16242 | msgid "--format cannot be used when not listing" |
e640d114 | 16243 | msgstr "不列出时不能使用 --format" |
c1ac5258 | 16244 | |
4c27fcb5 | 16245 | #: builtin/replace.c:565 |
c1ac5258 JX |
16246 | msgid "-f only makes sense when writing a replacement" |
16247 | msgstr "只有写一个替换时 -f 才有意义" | |
16248 | ||
4c27fcb5 | 16249 | #: builtin/replace.c:569 |
c1ac5258 JX |
16250 | msgid "--raw only makes sense with --edit" |
16251 | msgstr "--raw 只有和 --edit 共用才有意义" | |
16252 | ||
4c27fcb5 | 16253 | #: builtin/replace.c:575 |
c1ac5258 JX |
16254 | msgid "-d needs at least one argument" |
16255 | msgstr "-d 需要至少一个参数" | |
16256 | ||
4c27fcb5 | 16257 | #: builtin/replace.c:581 |
c1ac5258 JX |
16258 | msgid "bad number of arguments" |
16259 | msgstr "错误的参数个数" | |
16260 | ||
4c27fcb5 | 16261 | #: builtin/replace.c:587 |
c1ac5258 | 16262 | msgid "-e needs exactly one argument" |
e640d114 | 16263 | msgstr "-e 需要且仅需要一个参数" |
c1ac5258 | 16264 | |
4c27fcb5 | 16265 | #: builtin/replace.c:593 |
c1ac5258 JX |
16266 | msgid "-g needs at least one argument" |
16267 | msgstr "-g 需要至少一个参数" | |
16268 | ||
4c27fcb5 | 16269 | #: builtin/replace.c:599 |
c1ac5258 JX |
16270 | msgid "--convert-graft-file takes no argument" |
16271 | msgstr "--convert-graft-file 不带参数" | |
16272 | ||
4c27fcb5 | 16273 | #: builtin/replace.c:605 |
c1ac5258 JX |
16274 | msgid "only one pattern can be given with -l" |
16275 | msgstr "只能为 -l 提供一个模式" | |
16276 | ||
a4f16749 | 16277 | #: builtin/rerere.c:13 |
814ff314 JX |
16278 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
16279 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 16280 | |
4c27fcb5 | 16281 | #: builtin/rerere.c:60 |
ef317cd5 | 16282 | msgid "register clean resolutions in index" |
07432cef | 16283 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 16284 | |
4c27fcb5 JX |
16285 | #: builtin/rerere.c:79 |
16286 | msgid "'git rerere forget' without paths is deprecated" | |
16287 | msgstr "没有路径的 'git rerere forget' 已经过时" | |
16288 | ||
16289 | #: builtin/rerere.c:111 | |
16290 | #, c-format | |
16291 | msgid "unable to generate diff for '%s'" | |
16292 | msgstr "无法为 '%s' 生成差异" | |
16293 | ||
16294 | #: builtin/reset.c:31 | |
ef317cd5 JX |
16295 | msgid "" |
16296 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 16297 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 16298 | |
4c27fcb5 | 16299 | #: builtin/reset.c:32 |
a0b6b246 JX |
16300 | msgid "git reset [-q] [<tree-ish>] [--] <paths>..." |
16301 | msgstr "git reset [-q] [<树或提交>] [--] <路径>..." | |
ef317cd5 | 16302 | |
4c27fcb5 | 16303 | #: builtin/reset.c:33 |
07432cef WS |
16304 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
16305 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 16306 | |
4c27fcb5 | 16307 | #: builtin/reset.c:39 |
c04f5ac3 JX |
16308 | msgid "mixed" |
16309 | msgstr "混杂" | |
16310 | ||
4c27fcb5 | 16311 | #: builtin/reset.c:39 |
c04f5ac3 JX |
16312 | msgid "soft" |
16313 | msgstr "软性" | |
16314 | ||
4c27fcb5 | 16315 | #: builtin/reset.c:39 |
c04f5ac3 JX |
16316 | msgid "hard" |
16317 | msgstr "硬性" | |
16318 | ||
4c27fcb5 | 16319 | #: builtin/reset.c:39 |
8ada9598 JX |
16320 | msgid "merge" |
16321 | msgstr "合并" | |
16322 | ||
4c27fcb5 | 16323 | #: builtin/reset.c:39 |
c04f5ac3 JX |
16324 | msgid "keep" |
16325 | msgstr "保持" | |
16326 | ||
4c27fcb5 | 16327 | #: builtin/reset.c:80 |
c04f5ac3 JX |
16328 | msgid "You do not have a valid HEAD." |
16329 | msgstr "您没有一个有效的 HEAD。" | |
16330 | ||
4c27fcb5 | 16331 | #: builtin/reset.c:82 |
c04f5ac3 JX |
16332 | msgid "Failed to find tree of HEAD." |
16333 | msgstr "无法找到 HEAD 指向的树。" | |
16334 | ||
4c27fcb5 | 16335 | #: builtin/reset.c:88 |
c04f5ac3 JX |
16336 | #, c-format |
16337 | msgid "Failed to find tree of %s." | |
16338 | msgstr "无法找到 %s 指向的树。" | |
16339 | ||
90e6ef53 | 16340 | # 译者:汉字之间无空格,故删除%s前后空格 |
4c27fcb5 | 16341 | #: builtin/reset.c:192 |
c04f5ac3 JX |
16342 | #, c-format |
16343 | msgid "Cannot do a %s reset in the middle of a merge." | |
16344 | msgstr "在合并过程中不能做%s重置操作。" | |
16345 | ||
4c27fcb5 | 16346 | #: builtin/reset.c:292 |
ef317cd5 | 16347 | msgid "be quiet, only report errors" |
07432cef | 16348 | msgstr "安静模式,只报告错误" |
ef317cd5 | 16349 | |
4c27fcb5 | 16350 | #: builtin/reset.c:294 |
ef317cd5 | 16351 | msgid "reset HEAD and index" |
07432cef | 16352 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 16353 | |
4c27fcb5 | 16354 | #: builtin/reset.c:295 |
ef317cd5 | 16355 | msgid "reset only HEAD" |
07432cef | 16356 | msgstr "只重置 HEAD" |
ef317cd5 | 16357 | |
4c27fcb5 | 16358 | #: builtin/reset.c:297 builtin/reset.c:299 |
ef317cd5 | 16359 | msgid "reset HEAD, index and working tree" |
07432cef | 16360 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 16361 | |
4c27fcb5 | 16362 | #: builtin/reset.c:301 |
ef317cd5 | 16363 | msgid "reset HEAD but keep local changes" |
07432cef | 16364 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 16365 | |
4c27fcb5 | 16366 | #: builtin/reset.c:307 |
6c94aba5 JX |
16367 | msgid "record only the fact that removed paths will be added later" |
16368 | msgstr "将删除的路径标记为稍后添加" | |
16369 | ||
4c27fcb5 | 16370 | #: builtin/reset.c:325 |
07432cef WS |
16371 | #, c-format |
16372 | msgid "Failed to resolve '%s' as a valid revision." | |
16373 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
16374 | ||
4c27fcb5 | 16375 | #: builtin/reset.c:333 |
07432cef WS |
16376 | #, c-format |
16377 | msgid "Failed to resolve '%s' as a valid tree." | |
16378 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
16379 | ||
4c27fcb5 | 16380 | #: builtin/reset.c:342 |
c04f5ac3 | 16381 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 16382 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 16383 | |
4c27fcb5 | 16384 | #: builtin/reset.c:351 |
c04f5ac3 | 16385 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 16386 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 16387 | |
90e6ef53 | 16388 | # 译者:汉字之间无空格,故删除%s前后空格 |
4c27fcb5 | 16389 | #: builtin/reset.c:353 |
c04f5ac3 JX |
16390 | #, c-format |
16391 | msgid "Cannot do %s reset with paths." | |
16392 | msgstr "不能带路径进行%s重置。" | |
16393 | ||
90e6ef53 | 16394 | # 译者:汉字之间无空格,故删除%s前后空格 |
4c27fcb5 | 16395 | #: builtin/reset.c:363 |
c04f5ac3 JX |
16396 | #, c-format |
16397 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 16398 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 16399 | |
4c27fcb5 | 16400 | #: builtin/reset.c:367 |
6c94aba5 JX |
16401 | msgid "-N can only be used with --mixed" |
16402 | msgstr "-N 只能和 --mixed 同时使用" | |
16403 | ||
4c27fcb5 | 16404 | #: builtin/reset.c:387 |
90314792 | 16405 | msgid "Unstaged changes after reset:" |
160fb2b2 | 16406 | msgstr "重置后取消暂存的变更:" |
90314792 | 16407 | |
4c27fcb5 JX |
16408 | #: builtin/reset.c:390 |
16409 | #, c-format | |
16410 | msgid "" | |
16411 | "\n" | |
16412 | "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" | |
16413 | "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" | |
16414 | "to make this the default.\n" | |
16415 | msgstr "" | |
16416 | "\n" | |
16417 | "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" | |
16418 | "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" | |
16419 | ||
16420 | #: builtin/reset.c:400 | |
ef317cd5 JX |
16421 | #, c-format |
16422 | msgid "Could not reset index file to revision '%s'." | |
16423 | msgstr "不能重置索引文件至版本 '%s'。" | |
16424 | ||
4c27fcb5 | 16425 | #: builtin/reset.c:404 |
07432cef WS |
16426 | msgid "Could not write new index file." |
16427 | msgstr "不能写入新的索引文件。" | |
16428 | ||
4c27fcb5 | 16429 | #: builtin/rev-list.c:403 |
31e5e17b JX |
16430 | msgid "cannot combine --exclude-promisor-objects and --missing" |
16431 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
16432 | ||
4c27fcb5 | 16433 | #: builtin/rev-list.c:461 |
5809aa05 JX |
16434 | msgid "object filtering requires --objects" |
16435 | msgstr "对象过滤需要 --objects" | |
16436 | ||
4c27fcb5 | 16437 | #: builtin/rev-list.c:464 |
5809aa05 JX |
16438 | #, c-format |
16439 | msgid "invalid sparse value '%s'" | |
16440 | msgstr "无效的稀疏值 '%s'" | |
16441 | ||
4c27fcb5 | 16442 | #: builtin/rev-list.c:505 |
1b7f4a34 JX |
16443 | msgid "rev-list does not support display of notes" |
16444 | msgstr "rev-list 不支持显示注解" | |
16445 | ||
4c27fcb5 | 16446 | #: builtin/rev-list.c:508 |
5809aa05 JX |
16447 | msgid "cannot combine --use-bitmap-index with object filtering" |
16448 | msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" | |
16449 | ||
4c27fcb5 | 16450 | #: builtin/rev-parse.c:407 |
814ff314 JX |
16451 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
16452 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 16453 | |
4c27fcb5 | 16454 | #: builtin/rev-parse.c:412 |
ef317cd5 | 16455 | msgid "keep the `--` passed as an arg" |
07432cef | 16456 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 16457 | |
4c27fcb5 | 16458 | #: builtin/rev-parse.c:414 |
ef317cd5 | 16459 | msgid "stop parsing after the first non-option argument" |
07432cef | 16460 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 16461 | |
4c27fcb5 | 16462 | #: builtin/rev-parse.c:417 |
cfff71a9 JX |
16463 | msgid "output in stuck long form" |
16464 | msgstr "以固定长格式输出" | |
16465 | ||
4c27fcb5 | 16466 | #: builtin/rev-parse.c:550 |
ef317cd5 | 16467 | msgid "" |
814ff314 | 16468 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 16469 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 16470 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
16471 | "\n" |
16472 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
16473 | msgstr "" | |
814ff314 | 16474 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 16475 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 16476 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
16477 | "\n" |
16478 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 16479 | |
c1ac5258 | 16480 | #: builtin/revert.c:24 |
814ff314 JX |
16481 | msgid "git revert [<options>] <commit-ish>..." |
16482 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 16483 | |
c1ac5258 | 16484 | #: builtin/revert.c:25 |
ef317cd5 | 16485 | msgid "git revert <subcommand>" |
07432cef | 16486 | msgstr "git revert <子命令>" |
ef317cd5 | 16487 | |
c1ac5258 | 16488 | #: builtin/revert.c:30 |
814ff314 JX |
16489 | msgid "git cherry-pick [<options>] <commit-ish>..." |
16490 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 16491 | |
c1ac5258 | 16492 | #: builtin/revert.c:31 |
ef317cd5 | 16493 | msgid "git cherry-pick <subcommand>" |
07432cef | 16494 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 16495 | |
c1ac5258 | 16496 | #: builtin/revert.c:91 |
ef317cd5 JX |
16497 | #, c-format |
16498 | msgid "%s: %s cannot be used with %s" | |
16499 | msgstr "%s:%s 不能和 %s 同时使用" | |
16500 | ||
c1ac5258 | 16501 | #: builtin/revert.c:100 |
ef317cd5 | 16502 | msgid "end revert or cherry-pick sequence" |
07432cef | 16503 | msgstr "终止反转或拣选操作" |
ef317cd5 | 16504 | |
c1ac5258 | 16505 | #: builtin/revert.c:101 |
ef317cd5 | 16506 | msgid "resume revert or cherry-pick sequence" |
07432cef | 16507 | msgstr "继续反转或拣选操作" |
ef317cd5 | 16508 | |
c1ac5258 | 16509 | #: builtin/revert.c:102 |
ef317cd5 | 16510 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 16511 | msgstr "取消反转或拣选操作" |
ef317cd5 | 16512 | |
c1ac5258 | 16513 | #: builtin/revert.c:103 |
ef317cd5 | 16514 | msgid "don't automatically commit" |
07432cef | 16515 | msgstr "不要自动提交" |
ef317cd5 | 16516 | |
c1ac5258 | 16517 | #: builtin/revert.c:104 |
ef317cd5 | 16518 | msgid "edit the commit message" |
07432cef | 16519 | msgstr "编辑提交说明" |
ef317cd5 | 16520 | |
c1ac5258 | 16521 | #: builtin/revert.c:107 |
87cb7997 | 16522 | msgid "parent-number" |
07432cef | 16523 | msgstr "父编号" |
ef317cd5 | 16524 | |
c1ac5258 | 16525 | #: builtin/revert.c:108 |
87cb7997 JX |
16526 | msgid "select mainline parent" |
16527 | msgstr "选择主干父提交编号" | |
16528 | ||
c1ac5258 | 16529 | #: builtin/revert.c:110 |
ef317cd5 | 16530 | msgid "merge strategy" |
07432cef | 16531 | msgstr "合并策略" |
ef317cd5 | 16532 | |
c1ac5258 | 16533 | #: builtin/revert.c:112 |
ef317cd5 | 16534 | msgid "option for merge strategy" |
07432cef | 16535 | msgstr "合并策略的选项" |
ef317cd5 | 16536 | |
c1ac5258 | 16537 | #: builtin/revert.c:121 |
ef317cd5 | 16538 | msgid "append commit name" |
07432cef | 16539 | msgstr "追加提交名称" |
ef317cd5 | 16540 | |
c1ac5258 | 16541 | #: builtin/revert.c:123 |
ef317cd5 | 16542 | msgid "preserve initially empty commits" |
07432cef | 16543 | msgstr "保留初始化的空提交" |
ef317cd5 | 16544 | |
c1ac5258 | 16545 | #: builtin/revert.c:125 |
ef317cd5 | 16546 | msgid "keep redundant, empty commits" |
07432cef | 16547 | msgstr "保持多余的、空的提交" |
ef317cd5 | 16548 | |
c1ac5258 | 16549 | #: builtin/revert.c:219 |
c04f5ac3 JX |
16550 | msgid "revert failed" |
16551 | msgstr "还原失败" | |
16552 | ||
c1ac5258 | 16553 | #: builtin/revert.c:232 |
c04f5ac3 JX |
16554 | msgid "cherry-pick failed" |
16555 | msgstr "拣选失败" | |
16556 | ||
a4f16749 | 16557 | #: builtin/rm.c:18 |
814ff314 JX |
16558 | msgid "git rm [<options>] [--] <file>..." |
16559 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 16560 | |
a4f16749 | 16561 | #: builtin/rm.c:206 |
c04f5ac3 | 16562 | msgid "" |
2e8451e8 JX |
16563 | "the following file has staged content different from both the\n" |
16564 | "file and the HEAD:" | |
16565 | msgid_plural "" | |
16566 | "the following files have staged content different from both the\n" | |
16567 | "file and the HEAD:" | |
16568 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
16569 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
16570 | ||
a4f16749 | 16571 | #: builtin/rm.c:211 |
2e8451e8 JX |
16572 | msgid "" |
16573 | "\n" | |
c04f5ac3 JX |
16574 | "(use -f to force removal)" |
16575 | msgstr "" | |
2e8451e8 | 16576 | "\n" |
c04f5ac3 JX |
16577 | "(使用 -f 强制删除)" |
16578 | ||
a4f16749 | 16579 | #: builtin/rm.c:215 |
2e8451e8 JX |
16580 | msgid "the following file has changes staged in the index:" |
16581 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
16582 | msgstr[0] "下列文件索引中有变更" |
16583 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 16584 | |
a4f16749 | 16585 | #: builtin/rm.c:219 builtin/rm.c:228 |
c04f5ac3 | 16586 | msgid "" |
2e8451e8 | 16587 | "\n" |
c04f5ac3 JX |
16588 | "(use --cached to keep the file, or -f to force removal)" |
16589 | msgstr "" | |
2e8451e8 JX |
16590 | "\n" |
16591 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
16592 | ||
a4f16749 | 16593 | #: builtin/rm.c:225 |
2e8451e8 JX |
16594 | msgid "the following file has local modifications:" |
16595 | msgid_plural "the following files have local modifications:" | |
16596 | msgstr[0] "如下文件有本地修改:" | |
16597 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 16598 | |
fd8cb379 | 16599 | #: builtin/rm.c:241 |
ef317cd5 | 16600 | msgid "do not list removed files" |
07432cef | 16601 | msgstr "不列出删除的文件" |
ef317cd5 | 16602 | |
fd8cb379 | 16603 | #: builtin/rm.c:242 |
ef317cd5 | 16604 | msgid "only remove from the index" |
07432cef | 16605 | msgstr "只从索引区删除" |
ef317cd5 | 16606 | |
fd8cb379 | 16607 | #: builtin/rm.c:243 |
ef317cd5 | 16608 | msgid "override the up-to-date check" |
07432cef | 16609 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 16610 | |
fd8cb379 | 16611 | #: builtin/rm.c:244 |
ef317cd5 | 16612 | msgid "allow recursive removal" |
07432cef | 16613 | msgstr "允许递归删除" |
ef317cd5 | 16614 | |
fd8cb379 | 16615 | #: builtin/rm.c:246 |
ef317cd5 | 16616 | msgid "exit with a zero status even if nothing matched" |
07432cef | 16617 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 16618 | |
c1ac5258 JX |
16619 | #: builtin/rm.c:288 |
16620 | msgid "please stage your changes to .gitmodules or stash them to proceed" | |
16621 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" | |
16622 | ||
fd8cb379 | 16623 | #: builtin/rm.c:306 |
c04f5ac3 JX |
16624 | #, c-format |
16625 | msgid "not removing '%s' recursively without -r" | |
16626 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
16627 | ||
fd8cb379 | 16628 | #: builtin/rm.c:345 |
c04f5ac3 JX |
16629 | #, c-format |
16630 | msgid "git rm: unable to remove %s" | |
16631 | msgstr "git rm:不能删除 %s" | |
16632 | ||
fd8cb379 | 16633 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
16634 | msgid "" |
16635 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
16636 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
16637 | "[<ref>...]\n" | |
16638 | " --all and explicit <ref> specification are mutually exclusive." | |
16639 | msgstr "" | |
16640 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
16641 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
16642 | " --all 和明确的 <引用> 互斥。" | |
16643 | ||
fd8cb379 | 16644 | #: builtin/send-pack.c:163 |
1b7f4a34 JX |
16645 | msgid "remote name" |
16646 | msgstr "远程名称" | |
16647 | ||
fd8cb379 | 16648 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
16649 | msgid "use stateless RPC protocol" |
16650 | msgstr "使用无状态的 RPC 协议" | |
16651 | ||
fd8cb379 | 16652 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
16653 | msgid "read refs from stdin" |
16654 | msgstr "从标准输入读取引用" | |
16655 | ||
fd8cb379 | 16656 | #: builtin/send-pack.c:179 |
1b7f4a34 JX |
16657 | msgid "print status from remote helper" |
16658 | msgstr "打印来自远程 helper 的状态" | |
16659 | ||
fd8cb379 JX |
16660 | #: builtin/serve.c:7 |
16661 | msgid "git serve [<options>]" | |
16662 | msgstr "git serve [<选项>]" | |
16663 | ||
16664 | #: builtin/serve.c:17 builtin/upload-pack.c:23 | |
16665 | msgid "quit after a single request/response exchange" | |
16666 | msgstr "在一次单独的请求/响应之后退出" | |
16667 | ||
16668 | #: builtin/serve.c:19 | |
16669 | msgid "exit immediately after advertising capabilities" | |
e640d114 | 16670 | msgstr "对能力广告之后立即退出" |
fd8cb379 | 16671 | |
a4f16749 | 16672 | #: builtin/shortlog.c:14 |
fd8cb379 JX |
16673 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
16674 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
16675 | ||
16676 | #: builtin/shortlog.c:15 | |
16677 | msgid "git log --pretty=short | git shortlog [<options>]" | |
16678 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 16679 | |
fd8cb379 | 16680 | #: builtin/shortlog.c:264 |
1a79b2f1 JX |
16681 | msgid "Group by committer rather than author" |
16682 | msgstr "按照提交者分组而不是作者" | |
16683 | ||
fd8cb379 | 16684 | #: builtin/shortlog.c:266 |
ef317cd5 | 16685 | msgid "sort output according to the number of commits per author" |
07432cef | 16686 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 16687 | |
fd8cb379 | 16688 | #: builtin/shortlog.c:268 |
ef317cd5 | 16689 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 16690 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 16691 | |
fd8cb379 | 16692 | #: builtin/shortlog.c:270 |
ef317cd5 | 16693 | msgid "Show the email address of each author" |
07432cef | 16694 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 16695 | |
fd8cb379 | 16696 | #: builtin/shortlog.c:271 |
c1ac5258 JX |
16697 | msgid "<w>[,<i1>[,<i2>]]" |
16698 | msgstr "<w>[,<i1>[,<i2>]]" | |
ef317cd5 | 16699 | |
fd8cb379 | 16700 | #: builtin/shortlog.c:272 |
ef317cd5 | 16701 | msgid "Linewrap output" |
07432cef | 16702 | msgstr "折行输出" |
ef317cd5 | 16703 | |
c1ac5258 | 16704 | #: builtin/shortlog.c:299 |
fd8cb379 JX |
16705 | msgid "too many arguments given outside repository" |
16706 | msgstr "仓库外执行提供了太多的参数" | |
16707 | ||
c1ac5258 | 16708 | #: builtin/show-branch.c:13 |
ef317cd5 | 16709 | msgid "" |
814ff314 | 16710 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
16711 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
16712 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
16713 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 16714 | msgstr "" |
814ff314 | 16715 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
16716 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
16717 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
16718 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 16719 | |
c1ac5258 | 16720 | #: builtin/show-branch.c:17 |
814ff314 | 16721 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 16722 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 16723 | |
c1ac5258 | 16724 | #: builtin/show-branch.c:395 |
a0b6b246 JX |
16725 | #, c-format |
16726 | msgid "ignoring %s; cannot handle more than %d ref" | |
16727 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
16728 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
16729 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
16730 | ||
c1ac5258 | 16731 | #: builtin/show-branch.c:549 |
a0b6b246 JX |
16732 | #, c-format |
16733 | msgid "no matching refs with %s" | |
16734 | msgstr "没有和 %s 匹配的引用" | |
16735 | ||
4c27fcb5 | 16736 | #: builtin/show-branch.c:646 |
ef317cd5 | 16737 | msgid "show remote-tracking and local branches" |
07432cef | 16738 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 16739 | |
4c27fcb5 | 16740 | #: builtin/show-branch.c:648 |
ef317cd5 | 16741 | msgid "show remote-tracking branches" |
07432cef | 16742 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 16743 | |
4c27fcb5 | 16744 | #: builtin/show-branch.c:650 |
ef317cd5 | 16745 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 16746 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 16747 | |
4c27fcb5 | 16748 | #: builtin/show-branch.c:652 |
ef317cd5 | 16749 | msgid "show <n> more commits after the common ancestor" |
07432cef | 16750 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 16751 | |
4c27fcb5 | 16752 | #: builtin/show-branch.c:654 |
ef317cd5 | 16753 | msgid "synonym to more=-1" |
07432cef | 16754 | msgstr "和 more=-1 同义" |
ef317cd5 | 16755 | |
4c27fcb5 | 16756 | #: builtin/show-branch.c:655 |
ef317cd5 | 16757 | msgid "suppress naming strings" |
07432cef | 16758 | msgstr "不显示字符串命名" |
ef317cd5 | 16759 | |
4c27fcb5 | 16760 | #: builtin/show-branch.c:657 |
ef317cd5 | 16761 | msgid "include the current branch" |
07432cef | 16762 | msgstr "包括当前分支" |
ef317cd5 | 16763 | |
4c27fcb5 | 16764 | #: builtin/show-branch.c:659 |
ef317cd5 | 16765 | msgid "name commits with their object names" |
07432cef | 16766 | msgstr "以对象名字命名提交" |
ef317cd5 | 16767 | |
4c27fcb5 | 16768 | #: builtin/show-branch.c:661 |
ef317cd5 | 16769 | msgid "show possible merge bases" |
07432cef | 16770 | msgstr "显示可能合并的基线" |
ef317cd5 | 16771 | |
4c27fcb5 | 16772 | #: builtin/show-branch.c:663 |
ef317cd5 | 16773 | msgid "show refs unreachable from any other ref" |
07432cef | 16774 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 16775 | |
4c27fcb5 | 16776 | #: builtin/show-branch.c:665 |
ef317cd5 | 16777 | msgid "show commits in topological order" |
07432cef | 16778 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 16779 | |
4c27fcb5 | 16780 | #: builtin/show-branch.c:668 |
ef317cd5 | 16781 | msgid "show only commits not on the first branch" |
07432cef | 16782 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 16783 | |
4c27fcb5 | 16784 | #: builtin/show-branch.c:670 |
ef317cd5 | 16785 | msgid "show merges reachable from only one tip" |
07432cef | 16786 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 16787 | |
4c27fcb5 | 16788 | #: builtin/show-branch.c:672 |
2e8451e8 JX |
16789 | msgid "topologically sort, maintaining date order where possible" |
16790 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 16791 | |
4c27fcb5 | 16792 | #: builtin/show-branch.c:675 |
ef317cd5 | 16793 | msgid "<n>[,<base>]" |
07432cef | 16794 | msgstr "<n>[,<base>]" |
ef317cd5 | 16795 | |
4c27fcb5 | 16796 | #: builtin/show-branch.c:676 |
ef317cd5 | 16797 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 16798 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 16799 | |
4c27fcb5 | 16800 | #: builtin/show-branch.c:712 |
a0b6b246 JX |
16801 | msgid "" |
16802 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
16803 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
16804 | ||
4c27fcb5 | 16805 | #: builtin/show-branch.c:736 |
a0b6b246 JX |
16806 | msgid "no branches given, and HEAD is not valid" |
16807 | msgstr "未提供分支,且 HEAD 无效" | |
16808 | ||
4c27fcb5 | 16809 | #: builtin/show-branch.c:739 |
a0b6b246 JX |
16810 | msgid "--reflog option needs one branch name" |
16811 | msgstr "选项 --reflog 需要一个分支名" | |
16812 | ||
4c27fcb5 | 16813 | #: builtin/show-branch.c:742 |
a0b6b246 JX |
16814 | #, c-format |
16815 | msgid "only %d entry can be shown at one time." | |
16816 | msgid_plural "only %d entries can be shown at one time." | |
16817 | msgstr[0] "一次只能显示 %d 个条目。" | |
16818 | msgstr[1] "一次只能显示 %d 个条目。" | |
16819 | ||
4c27fcb5 | 16820 | #: builtin/show-branch.c:746 |
a0b6b246 JX |
16821 | #, c-format |
16822 | msgid "no such ref %s" | |
16823 | msgstr "无此引用 %s" | |
16824 | ||
4c27fcb5 | 16825 | #: builtin/show-branch.c:830 |
a0b6b246 JX |
16826 | #, c-format |
16827 | msgid "cannot handle more than %d rev." | |
16828 | msgid_plural "cannot handle more than %d revs." | |
16829 | msgstr[0] "不能处理 %d 个以上的版本。" | |
16830 | msgstr[1] "不能处理 %d 个以上的版本。" | |
16831 | ||
4c27fcb5 | 16832 | #: builtin/show-branch.c:834 |
a0b6b246 JX |
16833 | #, c-format |
16834 | msgid "'%s' is not a valid ref." | |
16835 | msgstr "'%s' 不是一个有效的引用。" | |
16836 | ||
4c27fcb5 | 16837 | #: builtin/show-branch.c:837 |
a0b6b246 JX |
16838 | #, c-format |
16839 | msgid "cannot find commit %s (%s)" | |
29004bbb | 16840 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 16841 | |
c1ac5258 | 16842 | #: builtin/show-ref.c:11 |
ef317cd5 | 16843 | msgid "" |
814ff314 JX |
16844 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
16845 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 16846 | msgstr "" |
814ff314 JX |
16847 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
16848 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 | 16849 | |
c1ac5258 | 16850 | #: builtin/show-ref.c:12 |
94550ed3 JX |
16851 | msgid "git show-ref --exclude-existing[=<pattern>]" |
16852 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 16853 | |
4c27fcb5 | 16854 | #: builtin/show-ref.c:161 |
ef317cd5 | 16855 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 16856 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 16857 | |
4c27fcb5 | 16858 | #: builtin/show-ref.c:162 |
ef317cd5 | 16859 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 16860 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 16861 | |
4c27fcb5 | 16862 | #: builtin/show-ref.c:163 |
ef317cd5 | 16863 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 16864 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 16865 | |
4c27fcb5 | 16866 | #: builtin/show-ref.c:166 builtin/show-ref.c:168 |
2e8451e8 JX |
16867 | msgid "show the HEAD reference, even if it would be filtered out" |
16868 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 16869 | |
4c27fcb5 | 16870 | #: builtin/show-ref.c:170 |
ef317cd5 | 16871 | msgid "dereference tags into object IDs" |
4375c10e | 16872 | msgstr "转换标签到对象 ID" |
ef317cd5 | 16873 | |
4c27fcb5 | 16874 | #: builtin/show-ref.c:172 |
ef317cd5 | 16875 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 16876 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 16877 | |
4c27fcb5 | 16878 | #: builtin/show-ref.c:176 |
ef317cd5 | 16879 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 16880 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 16881 | |
4c27fcb5 | 16882 | #: builtin/show-ref.c:178 |
ef317cd5 | 16883 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 16884 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 16885 | |
a4f16749 | 16886 | #: builtin/stripspace.c:18 |
94550ed3 JX |
16887 | msgid "git stripspace [-s | --strip-comments]" |
16888 | msgstr "git stripspace [-s | --strip-comments]" | |
16889 | ||
a4f16749 | 16890 | #: builtin/stripspace.c:19 |
94550ed3 JX |
16891 | msgid "git stripspace [-c | --comment-lines]" |
16892 | msgstr "git stripspace [-c | --comment-lines]" | |
16893 | ||
a4f16749 | 16894 | #: builtin/stripspace.c:36 |
94550ed3 JX |
16895 | msgid "skip and remove all lines starting with comment character" |
16896 | msgstr "跳过和移除所有的注释行" | |
16897 | ||
a4f16749 | 16898 | #: builtin/stripspace.c:39 |
276ceeaa | 16899 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
16900 | msgstr "为每一行的行首添加注释符和空格" |
16901 | ||
4c27fcb5 | 16902 | #: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939 |
5b04ee3b JX |
16903 | #, c-format |
16904 | msgid "Expecting a full ref name, got %s" | |
16905 | msgstr "期望一个完整的引用名称,却得到 %s" | |
16906 | ||
fd8cb379 | 16907 | #: builtin/submodule--helper.c:61 |
31e5e17b JX |
16908 | msgid "submodule--helper print-default-remote takes no arguments" |
16909 | msgstr "submodule--helper print-default-remote 不带参数" | |
16910 | ||
c1ac5258 | 16911 | #: builtin/submodule--helper.c:99 |
5b04ee3b JX |
16912 | #, c-format |
16913 | msgid "cannot strip one component off url '%s'" | |
16914 | msgstr "无法从 url '%s' 剥离一个组件" | |
16915 | ||
4c27fcb5 | 16916 | #: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363 |
94550ed3 JX |
16917 | msgid "alternative anchor for relative paths" |
16918 | msgstr "相对路径的替代锚记(anchor)" | |
16919 | ||
c1ac5258 | 16920 | #: builtin/submodule--helper.c:412 |
94550ed3 JX |
16921 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
16922 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
16923 | ||
4c27fcb5 JX |
16924 | #: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626 |
16925 | #: builtin/submodule--helper.c:649 | |
5b04ee3b JX |
16926 | #, c-format |
16927 | msgid "No url found for submodule path '%s' in .gitmodules" | |
16928 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
16929 | ||
c1ac5258 JX |
16930 | #: builtin/submodule--helper.c:521 |
16931 | #, c-format | |
16932 | msgid "Entering '%s'\n" | |
16933 | msgstr "进入 '%s'\n" | |
16934 | ||
16935 | #: builtin/submodule--helper.c:524 | |
16936 | #, c-format | |
16937 | msgid "" | |
16938 | "run_command returned non-zero status for %s\n" | |
16939 | "." | |
4c27fcb5 JX |
16940 | msgstr "" |
16941 | "对 %s 执行 run_command 返回非零值。\n" | |
16942 | "." | |
c1ac5258 JX |
16943 | |
16944 | #: builtin/submodule--helper.c:545 | |
16945 | #, c-format | |
16946 | msgid "" | |
16947 | "run_command returned non-zero status while recursing in the nested " | |
16948 | "submodules of %s\n" | |
16949 | "." | |
4c27fcb5 JX |
16950 | msgstr "" |
16951 | "在递归 %s 的子模组执行 run_command 时返回非零值。\n" | |
16952 | "." | |
c1ac5258 JX |
16953 | |
16954 | #: builtin/submodule--helper.c:561 | |
16955 | msgid "Suppress output of entering each submodule command" | |
16956 | msgstr "阻止进入每一个子模组命令的输出" | |
16957 | ||
4c27fcb5 | 16958 | #: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048 |
c1ac5258 JX |
16959 | msgid "Recurse into nested submodules" |
16960 | msgstr "递归进入嵌套子模组中" | |
16961 | ||
16962 | #: builtin/submodule--helper.c:568 | |
16963 | msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" | |
16964 | msgstr "git submodule--helper foreach [--quiet] [--recursive] <命令>" | |
16965 | ||
4c27fcb5 | 16966 | #: builtin/submodule--helper.c:595 |
87cb7997 JX |
16967 | #, c-format |
16968 | msgid "" | |
4c27fcb5 | 16969 | "could not look up configuration '%s'. Assuming this repository is its own " |
87cb7997 JX |
16970 | "authoritative upstream." |
16971 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
16972 | ||
4c27fcb5 | 16973 | #: builtin/submodule--helper.c:663 |
5b04ee3b JX |
16974 | #, c-format |
16975 | msgid "Failed to register url for submodule path '%s'" | |
16976 | msgstr "无法为子模组 '%s' 注册 url" | |
16977 | ||
4c27fcb5 | 16978 | #: builtin/submodule--helper.c:667 |
5b04ee3b JX |
16979 | #, c-format |
16980 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
25c75902 | 16981 | msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n" |
5b04ee3b JX |
16982 | |
16983 | # | |
4c27fcb5 | 16984 | #: builtin/submodule--helper.c:677 |
aef18cc6 | 16985 | #, c-format |
5b04ee3b | 16986 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 16987 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 16988 | |
4c27fcb5 | 16989 | #: builtin/submodule--helper.c:684 |
5b04ee3b JX |
16990 | #, c-format |
16991 | msgid "Failed to register update mode for submodule path '%s'" | |
16992 | msgstr "无法为子模组 '%s' 注册更新模式" | |
16993 | ||
4c27fcb5 | 16994 | #: builtin/submodule--helper.c:706 |
5b04ee3b | 16995 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 16996 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 16997 | |
4c27fcb5 | 16998 | #: builtin/submodule--helper.c:711 |
5b04ee3b JX |
16999 | msgid "git submodule--helper init [<path>]" |
17000 | msgstr "git submodule--helper init [<路径>]" | |
17001 | ||
4c27fcb5 | 17002 | #: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909 |
94550ed3 JX |
17003 | #, c-format |
17004 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
17005 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
17006 | ||
4c27fcb5 | 17007 | #: builtin/submodule--helper.c:822 |
5809aa05 JX |
17008 | #, c-format |
17009 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
17010 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
17011 | ||
4c27fcb5 | 17012 | #: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018 |
5809aa05 JX |
17013 | #, c-format |
17014 | msgid "failed to recurse into submodule '%s'" | |
c1ac5258 | 17015 | msgstr "递归子模组 '%s' 失败" |
5809aa05 | 17016 | |
4c27fcb5 | 17017 | #: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182 |
5809aa05 | 17018 | msgid "Suppress submodule status output" |
31e5e17b | 17019 | msgstr "阻止子模组状态输出" |
5809aa05 | 17020 | |
4c27fcb5 | 17021 | #: builtin/submodule--helper.c:874 |
5809aa05 JX |
17022 | msgid "" |
17023 | "Use commit stored in the index instead of the one stored in the submodule " | |
17024 | "HEAD" | |
17025 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
17026 | ||
4c27fcb5 | 17027 | #: builtin/submodule--helper.c:875 |
5809aa05 | 17028 | msgid "recurse into nested submodules" |
31e5e17b | 17029 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 17030 | |
4c27fcb5 | 17031 | #: builtin/submodule--helper.c:880 |
5809aa05 JX |
17032 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
17033 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
17034 | ||
4c27fcb5 | 17035 | #: builtin/submodule--helper.c:904 |
5809aa05 JX |
17036 | msgid "git submodule--helper name <path>" |
17037 | msgstr "git submodule--helper name <路径>" | |
17038 | ||
4c27fcb5 | 17039 | #: builtin/submodule--helper.c:968 |
31e5e17b JX |
17040 | #, c-format |
17041 | msgid "Synchronizing submodule url for '%s'\n" | |
17042 | msgstr "为 '%s' 同步子模组 url\n" | |
17043 | ||
4c27fcb5 | 17044 | #: builtin/submodule--helper.c:974 |
31e5e17b JX |
17045 | #, c-format |
17046 | msgid "failed to register url for submodule path '%s'" | |
17047 | msgstr "无法为子模组路径 '%s' 注册 url" | |
17048 | ||
4c27fcb5 | 17049 | #: builtin/submodule--helper.c:988 |
31e5e17b JX |
17050 | #, c-format |
17051 | msgid "failed to get the default remote for submodule '%s'" | |
17052 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
17053 | ||
4c27fcb5 | 17054 | #: builtin/submodule--helper.c:999 |
31e5e17b JX |
17055 | #, c-format |
17056 | msgid "failed to update remote for submodule '%s'" | |
17057 | msgstr "无法为子模组 '%s' 更新远程关联" | |
17058 | ||
4c27fcb5 | 17059 | #: builtin/submodule--helper.c:1046 |
31e5e17b JX |
17060 | msgid "Suppress output of synchronizing submodule url" |
17061 | msgstr "阻止子模组 url 同步的输出" | |
17062 | ||
4c27fcb5 | 17063 | #: builtin/submodule--helper.c:1053 |
31e5e17b JX |
17064 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
17065 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
17066 | ||
4c27fcb5 | 17067 | #: builtin/submodule--helper.c:1107 |
31e5e17b JX |
17068 | #, c-format |
17069 | msgid "" | |
17070 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
17071 | "really want to remove it including all of its history)" | |
17072 | msgstr "" | |
fd8cb379 JX |
17073 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
17074 | "-rf' 命令)" | |
31e5e17b | 17075 | |
4c27fcb5 | 17076 | #: builtin/submodule--helper.c:1119 |
31e5e17b JX |
17077 | #, c-format |
17078 | msgid "" | |
17079 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
17080 | "them" | |
17081 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
17082 | ||
4c27fcb5 | 17083 | #: builtin/submodule--helper.c:1127 |
31e5e17b JX |
17084 | #, c-format |
17085 | msgid "Cleared directory '%s'\n" | |
17086 | msgstr "已清除目录 '%s'\n" | |
17087 | ||
4c27fcb5 | 17088 | #: builtin/submodule--helper.c:1129 |
31e5e17b JX |
17089 | #, c-format |
17090 | msgid "Could not remove submodule work tree '%s'\n" | |
17091 | msgstr "无法移除子模组工作区 '%s'\n" | |
17092 | ||
4c27fcb5 | 17093 | #: builtin/submodule--helper.c:1138 |
31e5e17b JX |
17094 | #, c-format |
17095 | msgid "could not create empty submodule directory %s" | |
17096 | msgstr "不能创建空的子模组目录 %s" | |
17097 | ||
4c27fcb5 | 17098 | #: builtin/submodule--helper.c:1154 |
31e5e17b JX |
17099 | #, c-format |
17100 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
17101 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
17102 | ||
4c27fcb5 | 17103 | #: builtin/submodule--helper.c:1183 |
31e5e17b JX |
17104 | msgid "Remove submodule working trees even if they contain local changes" |
17105 | msgstr "删除子模组工作区,即使包含本地修改" | |
17106 | ||
4c27fcb5 | 17107 | #: builtin/submodule--helper.c:1184 |
31e5e17b JX |
17108 | msgid "Unregister all submodules" |
17109 | msgstr "将所有子模组取消注册" | |
17110 | ||
4c27fcb5 | 17111 | #: builtin/submodule--helper.c:1189 |
31e5e17b JX |
17112 | msgid "" |
17113 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
17114 | msgstr "" | |
17115 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
17116 | ||
4c27fcb5 | 17117 | #: builtin/submodule--helper.c:1203 |
31e5e17b JX |
17118 | msgid "Use '--all' if you really want to deinitialize all submodules" |
17119 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
17120 | ||
4c27fcb5 | 17121 | #: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300 |
a0b6b246 JX |
17122 | #, c-format |
17123 | msgid "submodule '%s' cannot add alternate: %s" | |
17124 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
17125 | ||
4c27fcb5 | 17126 | #: builtin/submodule--helper.c:1336 |
a0b6b246 JX |
17127 | #, c-format |
17128 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
17129 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
17130 | ||
4c27fcb5 | 17131 | #: builtin/submodule--helper.c:1343 |
a0b6b246 JX |
17132 | #, c-format |
17133 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
17134 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
17135 | ||
4c27fcb5 | 17136 | #: builtin/submodule--helper.c:1366 |
94550ed3 JX |
17137 | msgid "where the new submodule will be cloned to" |
17138 | msgstr "新的子模组将要克隆的路径" | |
17139 | ||
4c27fcb5 | 17140 | #: builtin/submodule--helper.c:1369 |
94550ed3 JX |
17141 | msgid "name of the new submodule" |
17142 | msgstr "新子模组的名称" | |
17143 | ||
4c27fcb5 | 17144 | #: builtin/submodule--helper.c:1372 |
94550ed3 JX |
17145 | msgid "url where to clone the submodule from" |
17146 | msgstr "克隆子模组的 url 地址" | |
17147 | ||
4c27fcb5 | 17148 | #: builtin/submodule--helper.c:1380 |
94550ed3 JX |
17149 | msgid "depth for shallow clones" |
17150 | msgstr "浅克隆的深度" | |
17151 | ||
4c27fcb5 | 17152 | #: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868 |
a0b6b246 | 17153 | msgid "force cloning progress" |
29004bbb | 17154 | msgstr "强制显示克隆进度" |
a0b6b246 | 17155 | |
4c27fcb5 | 17156 | #: builtin/submodule--helper.c:1388 |
94550ed3 JX |
17157 | msgid "" |
17158 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 17159 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
17160 | msgstr "" |
17161 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
17162 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 17163 | |
4c27fcb5 | 17164 | #: builtin/submodule--helper.c:1419 |
94550ed3 JX |
17165 | #, c-format |
17166 | msgid "clone of '%s' into submodule path '%s' failed" | |
17167 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
17168 | ||
4c27fcb5 | 17169 | #: builtin/submodule--helper.c:1433 |
94550ed3 JX |
17170 | #, c-format |
17171 | msgid "could not get submodule directory for '%s'" | |
17172 | msgstr "无法得到 '%s' 的子模组目录" | |
17173 | ||
4c27fcb5 JX |
17174 | #: builtin/submodule--helper.c:1469 |
17175 | #, c-format | |
17176 | msgid "Invalid update mode '%s' for submodule path '%s'" | |
17177 | msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" | |
17178 | ||
17179 | #: builtin/submodule--helper.c:1473 | |
17180 | #, c-format | |
17181 | msgid "Invalid update mode '%s' configured for submodule path '%s'" | |
17182 | msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" | |
17183 | ||
17184 | #: builtin/submodule--helper.c:1566 | |
5b04ee3b JX |
17185 | #, c-format |
17186 | msgid "Submodule path '%s' not initialized" | |
17187 | msgstr "子模组 '%s' 尚未初始化" | |
17188 | ||
4c27fcb5 | 17189 | #: builtin/submodule--helper.c:1570 |
5b04ee3b JX |
17190 | msgid "Maybe you want to use 'update --init'?" |
17191 | msgstr "也许您想要执行 'update --init'?" | |
17192 | ||
4c27fcb5 | 17193 | #: builtin/submodule--helper.c:1600 |
5b04ee3b JX |
17194 | #, c-format |
17195 | msgid "Skipping unmerged submodule %s" | |
17196 | msgstr "略过未合并的子模组 %s" | |
17197 | ||
4c27fcb5 | 17198 | #: builtin/submodule--helper.c:1629 |
5b04ee3b JX |
17199 | #, c-format |
17200 | msgid "Skipping submodule '%s'" | |
17201 | msgstr "略过子模组 '%s'" | |
17202 | ||
4c27fcb5 | 17203 | #: builtin/submodule--helper.c:1773 |
5c57d762 JX |
17204 | #, c-format |
17205 | msgid "Failed to clone '%s'. Retry scheduled" | |
17206 | msgstr "克隆 '%s' 失败。按计划重试" | |
17207 | ||
4c27fcb5 | 17208 | #: builtin/submodule--helper.c:1784 |
5c57d762 JX |
17209 | #, c-format |
17210 | msgid "Failed to clone '%s' a second time, aborting" | |
17211 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
17212 | ||
4c27fcb5 | 17213 | #: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089 |
5b04ee3b JX |
17214 | msgid "path into the working tree" |
17215 | msgstr "到工作区的路径" | |
17216 | ||
4c27fcb5 | 17217 | #: builtin/submodule--helper.c:1850 |
5b04ee3b JX |
17218 | msgid "path into the working tree, across nested submodule boundaries" |
17219 | msgstr "工作区中的路径,递归嵌套子模组" | |
17220 | ||
4c27fcb5 | 17221 | #: builtin/submodule--helper.c:1854 |
5b04ee3b JX |
17222 | msgid "rebase, merge, checkout or none" |
17223 | msgstr "rebase、merge、checkout 或 none" | |
17224 | ||
4c27fcb5 | 17225 | #: builtin/submodule--helper.c:1860 |
5b04ee3b JX |
17226 | msgid "Create a shallow clone truncated to the specified number of revisions" |
17227 | msgstr "创建一个指定深度的浅克隆" | |
17228 | ||
4c27fcb5 | 17229 | #: builtin/submodule--helper.c:1863 |
5b04ee3b JX |
17230 | msgid "parallel jobs" |
17231 | msgstr "并发任务" | |
17232 | ||
4c27fcb5 | 17233 | #: builtin/submodule--helper.c:1865 |
5c57d762 | 17234 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 17235 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 17236 | |
4c27fcb5 | 17237 | #: builtin/submodule--helper.c:1866 |
5b04ee3b JX |
17238 | msgid "don't print cloning progress" |
17239 | msgstr "不要输出克隆进度" | |
94550ed3 | 17240 | |
4c27fcb5 | 17241 | #: builtin/submodule--helper.c:1873 |
5b04ee3b JX |
17242 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
17243 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
17244 | ||
4c27fcb5 | 17245 | #: builtin/submodule--helper.c:1886 |
5b04ee3b JX |
17246 | msgid "bad value for update parameter" |
17247 | msgstr "update 参数取值错误" | |
17248 | ||
4c27fcb5 | 17249 | #: builtin/submodule--helper.c:1934 |
5c57d762 JX |
17250 | #, c-format |
17251 | msgid "" | |
17252 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
17253 | "the superproject is not on any branch" | |
17254 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
17255 | ||
4c27fcb5 JX |
17256 | #: builtin/submodule--helper.c:2057 |
17257 | #, c-format | |
17258 | msgid "could not get a repository handle for submodule '%s'" | |
17259 | msgstr "无法获得子模组 '%s' 的仓库句柄" | |
17260 | ||
17261 | #: builtin/submodule--helper.c:2090 | |
1a79b2f1 JX |
17262 | msgid "recurse into submodules" |
17263 | msgstr "在子模组中递归" | |
17264 | ||
4c27fcb5 | 17265 | #: builtin/submodule--helper.c:2096 |
1a79b2f1 JX |
17266 | msgid "git submodule--helper embed-git-dir [<path>...]" |
17267 | msgstr "git submodule--helper embed-git-dir [<路径>...]" | |
17268 | ||
4c27fcb5 JX |
17269 | #: builtin/submodule--helper.c:2152 |
17270 | msgid "check if it is safe to write to the .gitmodules file" | |
17271 | msgstr "检查写入 .gitmodules 文件是否安全" | |
17272 | ||
17273 | #: builtin/submodule--helper.c:2157 | |
17274 | msgid "git submodule--helper config name [value]" | |
17275 | msgstr "git submodule--helper config name [value]" | |
17276 | ||
17277 | #: builtin/submodule--helper.c:2158 | |
17278 | msgid "git submodule--helper config --check-writeable" | |
17279 | msgstr "git submodule--helper config --check-writeable" | |
17280 | ||
17281 | #: builtin/submodule--helper.c:2175 git-submodule.sh:169 | |
17282 | #, sh-format | |
17283 | msgid "please make sure that the .gitmodules file is in the working tree" | |
17284 | msgstr "请确认 .gitmodules 文件在工作区里" | |
17285 | ||
17286 | #: builtin/submodule--helper.c:2225 | |
1a79b2f1 JX |
17287 | #, c-format |
17288 | msgid "%s doesn't support --super-prefix" | |
17289 | msgstr "%s 不支持 --super-prefix" | |
17290 | ||
4c27fcb5 | 17291 | #: builtin/submodule--helper.c:2231 |
94550ed3 | 17292 | #, c-format |
5b04ee3b JX |
17293 | msgid "'%s' is not a valid submodule--helper subcommand" |
17294 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 17295 | |
a4f16749 | 17296 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
17297 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
17298 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 17299 | |
a4f16749 | 17300 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
17301 | msgid "git symbolic-ref -d [-q] <name>" |
17302 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 17303 | |
6937cb4e | 17304 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 17305 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
17306 | msgstr "不显示非符号(分离的)引用的错误信息" |
17307 | ||
6937cb4e | 17308 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
17309 | msgid "delete symbolic ref" |
17310 | msgstr "删除符号引用" | |
ef317cd5 | 17311 | |
6937cb4e | 17312 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 17313 | msgid "shorten ref output" |
6937cb4e | 17314 | msgstr "缩短引用输出" |
ef317cd5 | 17315 | |
c1ac5258 | 17316 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 17317 | msgid "reason" |
07432cef | 17318 | msgstr "原因" |
ef317cd5 | 17319 | |
c1ac5258 | 17320 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 |
ef317cd5 | 17321 | msgid "reason of the update" |
07432cef | 17322 | msgstr "更新的原因" |
ef317cd5 | 17323 | |
c1ac5258 | 17324 | #: builtin/tag.c:25 |
ef317cd5 | 17325 | msgid "" |
814ff314 JX |
17326 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
17327 | "[<head>]" | |
17328 | msgstr "" | |
17329 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 17330 | |
c1ac5258 | 17331 | #: builtin/tag.c:26 |
ef317cd5 | 17332 | msgid "git tag -d <tagname>..." |
07432cef | 17333 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 17334 | |
c1ac5258 | 17335 | #: builtin/tag.c:27 |
ef317cd5 | 17336 | msgid "" |
87cb7997 JX |
17337 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
17338 | "points-at <object>]\n" | |
94550ed3 | 17339 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 17340 | msgstr "" |
87cb7997 JX |
17341 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
17342 | "at <对象>]\n" | |
94550ed3 | 17343 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 17344 | |
c1ac5258 | 17345 | #: builtin/tag.c:29 |
1a79b2f1 JX |
17346 | msgid "git tag -v [--format=<format>] <tagname>..." |
17347 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 17348 | |
c1ac5258 | 17349 | #: builtin/tag.c:87 |
c04f5ac3 JX |
17350 | #, c-format |
17351 | msgid "tag '%s' not found." | |
55a16ee4 | 17352 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 17353 | |
c1ac5258 | 17354 | #: builtin/tag.c:103 |
c04f5ac3 JX |
17355 | #, c-format |
17356 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 17357 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 17358 | |
c1ac5258 | 17359 | #: builtin/tag.c:133 |
a77c07d9 | 17360 | #, c-format |
c04f5ac3 JX |
17361 | msgid "" |
17362 | "\n" | |
6acbf033 JX |
17363 | "Write a message for tag:\n" |
17364 | " %s\n" | |
a77c07d9 | 17365 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
17366 | msgstr "" |
17367 | "\n" | |
55a16ee4 | 17368 | "输入一个标签说明:\n" |
6acbf033 | 17369 | " %s\n" |
a77c07d9 | 17370 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 17371 | |
c1ac5258 | 17372 | #: builtin/tag.c:137 |
a77c07d9 | 17373 | #, c-format |
c04f5ac3 JX |
17374 | msgid "" |
17375 | "\n" | |
6acbf033 JX |
17376 | "Write a message for tag:\n" |
17377 | " %s\n" | |
a77c07d9 | 17378 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 17379 | "want to.\n" |
c04f5ac3 JX |
17380 | msgstr "" |
17381 | "\n" | |
55a16ee4 | 17382 | "输入一个标签说明:\n" |
6acbf033 | 17383 | " %s\n" |
a77c07d9 | 17384 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 17385 | |
c1ac5258 | 17386 | #: builtin/tag.c:191 |
c04f5ac3 | 17387 | msgid "unable to sign the tag" |
55a16ee4 | 17388 | msgstr "无法签署标签" |
c04f5ac3 | 17389 | |
c1ac5258 | 17390 | #: builtin/tag.c:193 |
c04f5ac3 | 17391 | msgid "unable to write tag file" |
55a16ee4 | 17392 | msgstr "无法写标签文件" |
c04f5ac3 | 17393 | |
c1ac5258 | 17394 | #: builtin/tag.c:218 |
c04f5ac3 | 17395 | msgid "bad object type." |
90e6ef53 | 17396 | msgstr "坏的对象类型。" |
c04f5ac3 | 17397 | |
c1ac5258 | 17398 | #: builtin/tag.c:267 |
c04f5ac3 | 17399 | msgid "no tag message?" |
55a16ee4 | 17400 | msgstr "无标签说明?" |
c04f5ac3 | 17401 | |
c1ac5258 | 17402 | #: builtin/tag.c:274 |
c04f5ac3 JX |
17403 | #, c-format |
17404 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 17405 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 17406 | |
4c27fcb5 | 17407 | #: builtin/tag.c:385 |
ef317cd5 | 17408 | msgid "list tag names" |
55a16ee4 | 17409 | msgstr "列出标签名称" |
ef317cd5 | 17410 | |
4c27fcb5 | 17411 | #: builtin/tag.c:387 |
ef317cd5 | 17412 | msgid "print <n> lines of each tag message" |
55a16ee4 | 17413 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 17414 | |
4c27fcb5 | 17415 | #: builtin/tag.c:389 |
ef317cd5 | 17416 | msgid "delete tags" |
55a16ee4 | 17417 | msgstr "删除标签" |
ef317cd5 | 17418 | |
4c27fcb5 | 17419 | #: builtin/tag.c:390 |
ef317cd5 | 17420 | msgid "verify tags" |
55a16ee4 | 17421 | msgstr "验证标签" |
ef317cd5 | 17422 | |
4c27fcb5 | 17423 | #: builtin/tag.c:392 |
ef317cd5 | 17424 | msgid "Tag creation options" |
55a16ee4 | 17425 | msgstr "标签创建选项" |
ef317cd5 | 17426 | |
4c27fcb5 | 17427 | #: builtin/tag.c:394 |
ef317cd5 | 17428 | msgid "annotated tag, needs a message" |
55a16ee4 | 17429 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 17430 | |
4c27fcb5 | 17431 | #: builtin/tag.c:396 |
ef317cd5 | 17432 | msgid "tag message" |
55a16ee4 | 17433 | msgstr "标签说明" |
ef317cd5 | 17434 | |
4c27fcb5 | 17435 | #: builtin/tag.c:398 |
31e5e17b JX |
17436 | msgid "force edit of tag message" |
17437 | msgstr "强制编辑标签说明" | |
17438 | ||
4c27fcb5 | 17439 | #: builtin/tag.c:399 |
ef317cd5 | 17440 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 17441 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 17442 | |
4c27fcb5 | 17443 | #: builtin/tag.c:403 |
ef317cd5 | 17444 | msgid "use another key to sign the tag" |
55a16ee4 | 17445 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 17446 | |
4c27fcb5 | 17447 | #: builtin/tag.c:404 |
ef317cd5 | 17448 | msgid "replace the tag if exists" |
55a16ee4 | 17449 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 17450 | |
4c27fcb5 | 17451 | #: builtin/tag.c:405 builtin/update-ref.c:369 |
03ea3327 | 17452 | msgid "create a reflog" |
1b7f4a34 JX |
17453 | msgstr "创建引用日志" |
17454 | ||
4c27fcb5 | 17455 | #: builtin/tag.c:407 |
814ff314 | 17456 | msgid "Tag listing options" |
55a16ee4 | 17457 | msgstr "标签列表选项" |
814ff314 | 17458 | |
4c27fcb5 | 17459 | #: builtin/tag.c:408 |
ef317cd5 | 17460 | msgid "show tag list in columns" |
55a16ee4 | 17461 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 17462 | |
4c27fcb5 | 17463 | #: builtin/tag.c:409 builtin/tag.c:411 |
ef317cd5 | 17464 | msgid "print only tags that contain the commit" |
87cb7997 | 17465 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 17466 | |
4c27fcb5 | 17467 | #: builtin/tag.c:410 builtin/tag.c:412 |
87cb7997 JX |
17468 | msgid "print only tags that don't contain the commit" |
17469 | msgstr "只打印不包含该提交的标签" | |
17470 | ||
4c27fcb5 | 17471 | #: builtin/tag.c:413 |
94550ed3 JX |
17472 | msgid "print only tags that are merged" |
17473 | msgstr "只打印已经合并的标签" | |
17474 | ||
4c27fcb5 | 17475 | #: builtin/tag.c:414 |
94550ed3 JX |
17476 | msgid "print only tags that are not merged" |
17477 | msgstr "只打印尚未合并的标签" | |
17478 | ||
4c27fcb5 | 17479 | #: builtin/tag.c:419 |
ef317cd5 | 17480 | msgid "print only tags of the object" |
87cb7997 | 17481 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 17482 | |
4c27fcb5 | 17483 | #: builtin/tag.c:463 |
8ada9598 | 17484 | msgid "--column and -n are incompatible" |
81809b99 | 17485 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 17486 | |
4c27fcb5 | 17487 | #: builtin/tag.c:485 |
87cb7997 JX |
17488 | msgid "-n option is only allowed in list mode" |
17489 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 17490 | |
4c27fcb5 | 17491 | #: builtin/tag.c:487 |
87cb7997 JX |
17492 | msgid "--contains option is only allowed in list mode" |
17493 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 17494 | |
4c27fcb5 | 17495 | #: builtin/tag.c:489 |
87cb7997 JX |
17496 | msgid "--no-contains option is only allowed in list mode" |
17497 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 17498 | |
4c27fcb5 | 17499 | #: builtin/tag.c:491 |
87cb7997 JX |
17500 | msgid "--points-at option is only allowed in list mode" |
17501 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 17502 | |
4c27fcb5 | 17503 | #: builtin/tag.c:493 |
87cb7997 JX |
17504 | msgid "--merged and --no-merged options are only allowed in list mode" |
17505 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
17506 | ||
4c27fcb5 | 17507 | #: builtin/tag.c:504 |
c04f5ac3 JX |
17508 | msgid "only one -F or -m option is allowed." |
17509 | msgstr "只允许一个 -F 或 -m 选项。" | |
17510 | ||
4c27fcb5 | 17511 | #: builtin/tag.c:523 |
c04f5ac3 JX |
17512 | msgid "too many params" |
17513 | msgstr "太多参数" | |
17514 | ||
4c27fcb5 | 17515 | #: builtin/tag.c:529 |
c04f5ac3 JX |
17516 | #, c-format |
17517 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 17518 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 17519 | |
4c27fcb5 | 17520 | #: builtin/tag.c:534 |
c04f5ac3 JX |
17521 | #, c-format |
17522 | msgid "tag '%s' already exists" | |
55a16ee4 | 17523 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 17524 | |
4c27fcb5 | 17525 | #: builtin/tag.c:565 |
c04f5ac3 JX |
17526 | #, c-format |
17527 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 17528 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 17529 | |
c1ac5258 | 17530 | #: builtin/unpack-objects.c:500 |
6c94aba5 JX |
17531 | msgid "Unpacking objects" |
17532 | msgstr "展开对象中" | |
17533 | ||
5809aa05 | 17534 | #: builtin/update-index.c:82 |
7aea43ff JX |
17535 | #, c-format |
17536 | msgid "failed to create directory %s" | |
c1ac5258 | 17537 | msgstr "创建目录 %s 失败" |
7aea43ff | 17538 | |
5809aa05 | 17539 | #: builtin/update-index.c:98 |
7aea43ff JX |
17540 | #, c-format |
17541 | msgid "failed to create file %s" | |
c1ac5258 | 17542 | msgstr "创建文件 %s 失败" |
7aea43ff | 17543 | |
5809aa05 | 17544 | #: builtin/update-index.c:106 |
7aea43ff JX |
17545 | #, c-format |
17546 | msgid "failed to delete file %s" | |
c1ac5258 | 17547 | msgstr "删除文件 %s 失败" |
7aea43ff | 17548 | |
5809aa05 | 17549 | #: builtin/update-index.c:113 builtin/update-index.c:219 |
7aea43ff JX |
17550 | #, c-format |
17551 | msgid "failed to delete directory %s" | |
c1ac5258 | 17552 | msgstr "删除目录 %s 失败" |
7aea43ff | 17553 | |
5809aa05 | 17554 | #: builtin/update-index.c:138 |
7aea43ff | 17555 | #, c-format |
276ceeaa JX |
17556 | msgid "Testing mtime in '%s' " |
17557 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 17558 | |
5809aa05 | 17559 | #: builtin/update-index.c:152 |
7aea43ff JX |
17560 | msgid "directory stat info does not change after adding a new file" |
17561 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
17562 | ||
5809aa05 | 17563 | #: builtin/update-index.c:165 |
7aea43ff JX |
17564 | msgid "directory stat info does not change after adding a new directory" |
17565 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
17566 | ||
5809aa05 | 17567 | #: builtin/update-index.c:178 |
7aea43ff JX |
17568 | msgid "directory stat info changes after updating a file" |
17569 | msgstr "更新一个文件后,目录的状态信息被修改" | |
17570 | ||
5809aa05 | 17571 | #: builtin/update-index.c:189 |
7aea43ff JX |
17572 | msgid "directory stat info changes after adding a file inside subdirectory" |
17573 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
17574 | ||
5809aa05 | 17575 | #: builtin/update-index.c:200 |
7aea43ff JX |
17576 | msgid "directory stat info does not change after deleting a file" |
17577 | msgstr "删除一个文件后,目录的状态信息未改变" | |
17578 | ||
5809aa05 | 17579 | #: builtin/update-index.c:213 |
7aea43ff JX |
17580 | msgid "directory stat info does not change after deleting a directory" |
17581 | msgstr "删除一个目录后,目录的状态信息未改变" | |
17582 | ||
5809aa05 | 17583 | #: builtin/update-index.c:220 |
7aea43ff JX |
17584 | msgid " OK" |
17585 | msgstr " OK" | |
17586 | ||
c1ac5258 | 17587 | #: builtin/update-index.c:588 |
814ff314 JX |
17588 | msgid "git update-index [<options>] [--] [<file>...]" |
17589 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 17590 | |
4c27fcb5 | 17591 | #: builtin/update-index.c:961 |
ef317cd5 | 17592 | msgid "continue refresh even when index needs update" |
07432cef | 17593 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 17594 | |
4c27fcb5 | 17595 | #: builtin/update-index.c:964 |
ef317cd5 | 17596 | msgid "refresh: ignore submodules" |
07432cef | 17597 | msgstr "刷新:忽略子模组" |
8ada9598 | 17598 | |
4c27fcb5 | 17599 | #: builtin/update-index.c:967 |
ef317cd5 | 17600 | msgid "do not ignore new files" |
07432cef | 17601 | msgstr "不忽略新的文件" |
8ada9598 | 17602 | |
4c27fcb5 | 17603 | #: builtin/update-index.c:969 |
ef317cd5 | 17604 | msgid "let files replace directories and vice-versa" |
07432cef | 17605 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 17606 | |
4c27fcb5 | 17607 | #: builtin/update-index.c:971 |
ef317cd5 | 17608 | msgid "notice files missing from worktree" |
07432cef | 17609 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 17610 | |
4c27fcb5 | 17611 | #: builtin/update-index.c:973 |
ef317cd5 | 17612 | msgid "refresh even if index contains unmerged entries" |
07432cef | 17613 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 17614 | |
4c27fcb5 | 17615 | #: builtin/update-index.c:976 |
ef317cd5 | 17616 | msgid "refresh stat information" |
07432cef | 17617 | msgstr "刷新统计信息" |
ef317cd5 | 17618 | |
4c27fcb5 | 17619 | #: builtin/update-index.c:980 |
ef317cd5 | 17620 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 17621 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 17622 | |
4c27fcb5 | 17623 | #: builtin/update-index.c:984 |
6c94aba5 | 17624 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 17625 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 17626 | |
4c27fcb5 | 17627 | #: builtin/update-index.c:985 |
ef317cd5 | 17628 | msgid "add the specified entry to the index" |
07432cef | 17629 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 17630 | |
4c27fcb5 | 17631 | #: builtin/update-index.c:994 |
ef317cd5 | 17632 | msgid "mark files as \"not changing\"" |
07432cef | 17633 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 17634 | |
4c27fcb5 | 17635 | #: builtin/update-index.c:997 |
ef317cd5 | 17636 | msgid "clear assumed-unchanged bit" |
07432cef | 17637 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 17638 | |
4c27fcb5 | 17639 | #: builtin/update-index.c:1000 |
ef317cd5 | 17640 | msgid "mark files as \"index-only\"" |
07432cef | 17641 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 17642 | |
4c27fcb5 | 17643 | #: builtin/update-index.c:1003 |
ef317cd5 | 17644 | msgid "clear skip-worktree bit" |
07432cef | 17645 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 17646 | |
4c27fcb5 | 17647 | #: builtin/update-index.c:1006 |
ef317cd5 | 17648 | msgid "add to index only; do not add content to object database" |
07432cef | 17649 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 17650 | |
4c27fcb5 | 17651 | #: builtin/update-index.c:1008 |
ef317cd5 | 17652 | msgid "remove named paths even if present in worktree" |
07432cef | 17653 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 17654 | |
4c27fcb5 | 17655 | #: builtin/update-index.c:1010 |
ef317cd5 | 17656 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 17657 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 17658 | |
4c27fcb5 | 17659 | #: builtin/update-index.c:1012 |
ef317cd5 | 17660 | msgid "read list of paths to be updated from standard input" |
07432cef | 17661 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 17662 | |
4c27fcb5 | 17663 | #: builtin/update-index.c:1016 |
ef317cd5 | 17664 | msgid "add entries from standard input to the index" |
07432cef | 17665 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 17666 | |
4c27fcb5 | 17667 | #: builtin/update-index.c:1020 |
ef317cd5 | 17668 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 17669 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 17670 | |
4c27fcb5 | 17671 | #: builtin/update-index.c:1024 |
ef317cd5 | 17672 | msgid "only update entries that differ from HEAD" |
07432cef | 17673 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 17674 | |
4c27fcb5 | 17675 | #: builtin/update-index.c:1028 |
ef317cd5 | 17676 | msgid "ignore files missing from worktree" |
07432cef | 17677 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 17678 | |
4c27fcb5 | 17679 | #: builtin/update-index.c:1031 |
ef317cd5 | 17680 | msgid "report actions to standard output" |
07432cef | 17681 | msgstr "在标准输出显示操作" |
ef317cd5 | 17682 | |
4c27fcb5 | 17683 | #: builtin/update-index.c:1033 |
ef317cd5 | 17684 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 17685 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 17686 | |
4c27fcb5 | 17687 | #: builtin/update-index.c:1037 |
ef317cd5 | 17688 | msgid "write index in this format" |
07432cef | 17689 | msgstr "以这种格式写入索引区" |
ef317cd5 | 17690 | |
4c27fcb5 | 17691 | #: builtin/update-index.c:1039 |
6acbf033 JX |
17692 | msgid "enable or disable split index" |
17693 | msgstr "启用或禁用索引拆分" | |
17694 | ||
4c27fcb5 | 17695 | #: builtin/update-index.c:1041 |
7aea43ff JX |
17696 | msgid "enable/disable untracked cache" |
17697 | msgstr "启用/禁用对未跟踪文件的缓存" | |
17698 | ||
4c27fcb5 | 17699 | #: builtin/update-index.c:1043 |
276ceeaa JX |
17700 | msgid "test if the filesystem supports untracked cache" |
17701 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
17702 | ||
4c27fcb5 | 17703 | #: builtin/update-index.c:1045 |
7aea43ff JX |
17704 | msgid "enable untracked cache without testing the filesystem" |
17705 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
17706 | ||
4c27fcb5 | 17707 | #: builtin/update-index.c:1047 |
5809aa05 JX |
17708 | msgid "write out the index even if is not flagged as changed" |
17709 | msgstr "即使没有被标记为已更改,也要写出索引" | |
17710 | ||
4c27fcb5 | 17711 | #: builtin/update-index.c:1049 |
5809aa05 JX |
17712 | msgid "enable or disable file system monitor" |
17713 | msgstr "启用或禁用文件系统监控" | |
17714 | ||
4c27fcb5 | 17715 | #: builtin/update-index.c:1051 |
5809aa05 JX |
17716 | msgid "mark files as fsmonitor valid" |
17717 | msgstr "标记文件为 fsmonitor 有效" | |
17718 | ||
4c27fcb5 | 17719 | #: builtin/update-index.c:1054 |
5809aa05 JX |
17720 | msgid "clear fsmonitor valid bit" |
17721 | msgstr "清除 fsmonitor 有效位" | |
17722 | ||
4c27fcb5 | 17723 | #: builtin/update-index.c:1153 |
87cb7997 JX |
17724 | msgid "" |
17725 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
17726 | "enable split index" | |
17727 | msgstr "" | |
17728 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
17729 | ||
4c27fcb5 | 17730 | #: builtin/update-index.c:1162 |
87cb7997 JX |
17731 | msgid "" |
17732 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
17733 | "disable split index" | |
17734 | msgstr "" | |
17735 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
17736 | ||
4c27fcb5 | 17737 | #: builtin/update-index.c:1173 |
a0b6b246 JX |
17738 | msgid "" |
17739 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
17740 | "to disable the untracked cache" | |
275588f9 JX |
17741 | msgstr "" |
17742 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
17743 | "改它。" | |
a0b6b246 | 17744 | |
4c27fcb5 | 17745 | #: builtin/update-index.c:1177 |
276ceeaa JX |
17746 | msgid "Untracked cache disabled" |
17747 | msgstr "缓存未跟踪文件被禁用" | |
17748 | ||
4c27fcb5 | 17749 | #: builtin/update-index.c:1185 |
a0b6b246 JX |
17750 | msgid "" |
17751 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
17752 | "to enable the untracked cache" | |
275588f9 JX |
17753 | msgstr "" |
17754 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
17755 | "修改它。" | |
a0b6b246 | 17756 | |
4c27fcb5 | 17757 | #: builtin/update-index.c:1189 |
276ceeaa JX |
17758 | #, c-format |
17759 | msgid "Untracked cache enabled for '%s'" | |
17760 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
17761 | ||
4c27fcb5 | 17762 | #: builtin/update-index.c:1197 |
5809aa05 | 17763 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 17764 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 17765 | |
4c27fcb5 | 17766 | #: builtin/update-index.c:1201 |
5809aa05 JX |
17767 | msgid "fsmonitor enabled" |
17768 | msgstr "fsmonitor 被启用" | |
17769 | ||
4c27fcb5 | 17770 | #: builtin/update-index.c:1204 |
5809aa05 JX |
17771 | msgid "" |
17772 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 17773 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 17774 | |
4c27fcb5 | 17775 | #: builtin/update-index.c:1208 |
5809aa05 JX |
17776 | msgid "fsmonitor disabled" |
17777 | msgstr "fsmonitor 被禁用" | |
17778 | ||
a4f16749 | 17779 | #: builtin/update-ref.c:10 |
814ff314 JX |
17780 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
17781 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 17782 | |
a4f16749 | 17783 | #: builtin/update-ref.c:11 |
814ff314 JX |
17784 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
17785 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 17786 | |
a4f16749 | 17787 | #: builtin/update-ref.c:12 |
814ff314 JX |
17788 | msgid "git update-ref [<options>] --stdin [-z]" |
17789 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 17790 | |
c1ac5258 | 17791 | #: builtin/update-ref.c:364 |
ef317cd5 | 17792 | msgid "delete the reference" |
07432cef | 17793 | msgstr "删除引用" |
ef317cd5 | 17794 | |
c1ac5258 | 17795 | #: builtin/update-ref.c:366 |
ef317cd5 | 17796 | msgid "update <refname> not the one it points to" |
07432cef | 17797 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 17798 | |
c1ac5258 | 17799 | #: builtin/update-ref.c:367 |
90314792 JX |
17800 | msgid "stdin has NUL-terminated arguments" |
17801 | msgstr "标准输入有以 NUL 字符终止的参数" | |
17802 | ||
c1ac5258 | 17803 | #: builtin/update-ref.c:368 |
90314792 JX |
17804 | msgid "read updates from stdin" |
17805 | msgstr "从标准输入读取更新" | |
17806 | ||
a4f16749 | 17807 | #: builtin/update-server-info.c:7 |
ef317cd5 | 17808 | msgid "git update-server-info [--force]" |
07432cef | 17809 | msgstr "git update-server-info [--force]" |
ef317cd5 | 17810 | |
a4f16749 | 17811 | #: builtin/update-server-info.c:15 |
ef317cd5 | 17812 | msgid "update the info files from scratch" |
07432cef | 17813 | msgstr "从头开始更新文件信息" |
ef317cd5 | 17814 | |
fd8cb379 JX |
17815 | #: builtin/upload-pack.c:11 |
17816 | msgid "git upload-pack [<options>] <dir>" | |
17817 | msgstr "git upload-pack [<选项>] <目录>" | |
17818 | ||
17819 | #: builtin/upload-pack.c:25 | |
17820 | msgid "exit immediately after initial ref advertisement" | |
17821 | msgstr "在初始的引用广告后立即退出" | |
17822 | ||
17823 | #: builtin/upload-pack.c:27 | |
17824 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
17825 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
17826 | ||
17827 | #: builtin/upload-pack.c:29 | |
17828 | msgid "interrupt transfer after <n> seconds of inactivity" | |
17829 | msgstr "不活动 <n> 秒钟后终止传输" | |
17830 | ||
c1ac5258 | 17831 | #: builtin/verify-commit.c:20 |
814ff314 JX |
17832 | msgid "git verify-commit [-v | --verbose] <commit>..." |
17833 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 17834 | |
c1ac5258 | 17835 | #: builtin/verify-commit.c:76 |
6acbf033 JX |
17836 | msgid "print commit contents" |
17837 | msgstr "打印提交内容" | |
17838 | ||
c1ac5258 | 17839 | #: builtin/verify-commit.c:77 builtin/verify-tag.c:38 |
1b7f4a34 JX |
17840 | msgid "print raw gpg status output" |
17841 | msgstr "打印原始 gpg 状态输出" | |
17842 | ||
a4f16749 | 17843 | #: builtin/verify-pack.c:55 |
814ff314 JX |
17844 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
17845 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 17846 | |
a4f16749 | 17847 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
17848 | msgid "verbose" |
17849 | msgstr "冗长输出" | |
17850 | ||
a4f16749 | 17851 | #: builtin/verify-pack.c:67 |
ef317cd5 | 17852 | msgid "show statistics only" |
07432cef | 17853 | msgstr "只显示统计" |
ef317cd5 | 17854 | |
a4f16749 | 17855 | #: builtin/verify-tag.c:19 |
1a79b2f1 JX |
17856 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
17857 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 17858 | |
a4f16749 | 17859 | #: builtin/verify-tag.c:37 |
ef317cd5 | 17860 | msgid "print tag contents" |
55a16ee4 | 17861 | msgstr "打印标签内容" |
ef317cd5 | 17862 | |
5809aa05 | 17863 | #: builtin/worktree.c:17 |
31e5e17b JX |
17864 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
17865 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 17866 | |
5809aa05 | 17867 | #: builtin/worktree.c:18 |
5c57d762 JX |
17868 | msgid "git worktree list [<options>]" |
17869 | msgstr "git worktree list [<选项>]" | |
17870 | ||
5809aa05 | 17871 | #: builtin/worktree.c:19 |
5c57d762 JX |
17872 | msgid "git worktree lock [<options>] <path>" |
17873 | msgstr "git worktree lock [<选项>] <路径>" | |
17874 | ||
5809aa05 | 17875 | #: builtin/worktree.c:20 |
31e5e17b JX |
17876 | msgid "git worktree move <worktree> <new-path>" |
17877 | msgstr "git worktree move <工作区> <新路径>" | |
17878 | ||
17879 | #: builtin/worktree.c:21 | |
5bb01d4f JX |
17880 | msgid "git worktree prune [<options>]" |
17881 | msgstr "git worktree prune [<选项>]" | |
17882 | ||
31e5e17b JX |
17883 | #: builtin/worktree.c:22 |
17884 | msgid "git worktree remove [<options>] <worktree>" | |
17885 | msgstr "git worktree remove [<选项>] <工作区>" | |
17886 | ||
17887 | #: builtin/worktree.c:23 | |
5c57d762 JX |
17888 | msgid "git worktree unlock <path>" |
17889 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 17890 | |
4c27fcb5 JX |
17891 | #: builtin/worktree.c:60 builtin/worktree.c:871 |
17892 | #, c-format | |
17893 | msgid "failed to delete '%s'" | |
17894 | msgstr "删除 '%s' 失败" | |
17895 | ||
17896 | #: builtin/worktree.c:79 | |
5bb01d4f JX |
17897 | #, c-format |
17898 | msgid "Removing worktrees/%s: not a valid directory" | |
17899 | msgstr "删除工作区/%s:不是一个有效的目录" | |
17900 | ||
4c27fcb5 | 17901 | #: builtin/worktree.c:85 |
5bb01d4f JX |
17902 | #, c-format |
17903 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
17904 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
17905 | ||
4c27fcb5 | 17906 | #: builtin/worktree.c:90 builtin/worktree.c:99 |
5bb01d4f JX |
17907 | #, c-format |
17908 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
17909 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
17910 | ||
4c27fcb5 | 17911 | #: builtin/worktree.c:109 |
6937cb4e JX |
17912 | #, c-format |
17913 | msgid "" | |
17914 | "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " | |
17915 | "%<PRIuMAX>)" | |
17916 | msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
17917 | ||
4c27fcb5 | 17918 | #: builtin/worktree.c:117 |
5bb01d4f JX |
17919 | #, c-format |
17920 | msgid "Removing worktrees/%s: invalid gitdir file" | |
17921 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
17922 | ||
4c27fcb5 | 17923 | #: builtin/worktree.c:126 |
5bb01d4f JX |
17924 | #, c-format |
17925 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
17926 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
17927 | ||
4c27fcb5 | 17928 | #: builtin/worktree.c:165 |
1a79b2f1 JX |
17929 | msgid "report pruned working trees" |
17930 | msgstr "报告清除的工作区" | |
17931 | ||
4c27fcb5 | 17932 | #: builtin/worktree.c:167 |
1a79b2f1 | 17933 | msgid "expire working trees older than <time>" |
58b6f078 | 17934 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 17935 | |
4c27fcb5 | 17936 | #: builtin/worktree.c:234 |
5bb01d4f JX |
17937 | #, c-format |
17938 | msgid "'%s' already exists" | |
17939 | msgstr "'%s' 已经存在" | |
17940 | ||
4c27fcb5 JX |
17941 | #: builtin/worktree.c:251 |
17942 | #, c-format | |
17943 | msgid "unable to re-add worktree '%s'" | |
17944 | msgstr "无法再次添加工作区 '%s'" | |
17945 | ||
17946 | #: builtin/worktree.c:256 | |
17947 | #, c-format | |
17948 | msgid "" | |
17949 | "'%s' is a missing but locked worktree;\n" | |
17950 | "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" | |
17951 | msgstr "" | |
17952 | "'%s' 是一个丢失但锁定的工作区,使用\n" | |
17953 | "'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除" | |
17954 | ||
17955 | #: builtin/worktree.c:258 | |
17956 | #, c-format | |
17957 | msgid "" | |
17958 | "'%s' is a missing but already registered worktree;\n" | |
17959 | "use 'add -f' to override, or 'prune' or 'remove' to clear" | |
17960 | msgstr "" | |
17961 | "'%s' 是一个丢失但已经注册的工作区,使用\n" | |
17962 | "'add -f' 覆盖,或 'prune' 或 'remove' 清除" | |
17963 | ||
17964 | #: builtin/worktree.c:309 | |
5bb01d4f JX |
17965 | #, c-format |
17966 | msgid "could not create directory of '%s'" | |
17967 | msgstr "不能创建目录 '%s'" | |
17968 | ||
4c27fcb5 | 17969 | #: builtin/worktree.c:428 builtin/worktree.c:434 |
fd8cb379 JX |
17970 | #, c-format |
17971 | msgid "Preparing worktree (new branch '%s')" | |
17972 | msgstr "准备工作区(新分支 '%s')" | |
17973 | ||
4c27fcb5 | 17974 | #: builtin/worktree.c:430 |
fd8cb379 JX |
17975 | #, c-format |
17976 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
17977 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
17978 | ||
4c27fcb5 | 17979 | #: builtin/worktree.c:439 |
fd8cb379 JX |
17980 | #, c-format |
17981 | msgid "Preparing worktree (checking out '%s')" | |
17982 | msgstr "准备工作区(检出 '%s')" | |
17983 | ||
4c27fcb5 | 17984 | #: builtin/worktree.c:445 |
5bb01d4f | 17985 | #, c-format |
fd8cb379 JX |
17986 | msgid "Preparing worktree (detached HEAD %s)" |
17987 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 17988 | |
4c27fcb5 | 17989 | #: builtin/worktree.c:486 |
5bb01d4f | 17990 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 17991 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 17992 | |
4c27fcb5 | 17993 | #: builtin/worktree.c:489 |
5bb01d4f JX |
17994 | msgid "create a new branch" |
17995 | msgstr "创建一个新分支" | |
17996 | ||
4c27fcb5 | 17997 | #: builtin/worktree.c:491 |
5bb01d4f JX |
17998 | msgid "create or reset a branch" |
17999 | msgstr "创建或重置一个分支" | |
18000 | ||
4c27fcb5 | 18001 | #: builtin/worktree.c:493 |
5b04ee3b JX |
18002 | msgid "populate the new working tree" |
18003 | msgstr "生成新的工作区" | |
18004 | ||
4c27fcb5 | 18005 | #: builtin/worktree.c:494 |
60638e98 JX |
18006 | msgid "keep the new working tree locked" |
18007 | msgstr "锁定新工作区" | |
18008 | ||
4c27fcb5 | 18009 | #: builtin/worktree.c:497 |
5809aa05 JX |
18010 | msgid "set up tracking mode (see git-branch(1))" |
18011 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
18012 | ||
4c27fcb5 | 18013 | #: builtin/worktree.c:500 |
5809aa05 JX |
18014 | msgid "try to match the new branch name with a remote-tracking branch" |
18015 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
18016 | ||
4c27fcb5 | 18017 | #: builtin/worktree.c:508 |
1b7f4a34 JX |
18018 | msgid "-b, -B, and --detach are mutually exclusive" |
18019 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 18020 | |
4c27fcb5 | 18021 | #: builtin/worktree.c:569 |
5809aa05 JX |
18022 | msgid "--[no-]track can only be used if a new branch is created" |
18023 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
18024 | ||
4c27fcb5 | 18025 | #: builtin/worktree.c:669 |
5c57d762 JX |
18026 | msgid "reason for locking" |
18027 | msgstr "锁定原因" | |
18028 | ||
4c27fcb5 JX |
18029 | #: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772 |
18030 | #: builtin/worktree.c:899 | |
5c57d762 JX |
18031 | #, c-format |
18032 | msgid "'%s' is not a working tree" | |
18033 | msgstr "'%s' 不是一个工作区" | |
18034 | ||
4c27fcb5 | 18035 | #: builtin/worktree.c:683 builtin/worktree.c:716 |
5c57d762 JX |
18036 | msgid "The main working tree cannot be locked or unlocked" |
18037 | msgstr "主工作区无法被加锁或解锁" | |
18038 | ||
4c27fcb5 | 18039 | #: builtin/worktree.c:688 |
5c57d762 JX |
18040 | #, c-format |
18041 | msgid "'%s' is already locked, reason: %s" | |
18042 | msgstr "'%s' 已被锁定,原因:%s" | |
18043 | ||
4c27fcb5 | 18044 | #: builtin/worktree.c:690 |
5c57d762 JX |
18045 | #, c-format |
18046 | msgid "'%s' is already locked" | |
18047 | msgstr "'%s' 已被锁定" | |
18048 | ||
4c27fcb5 | 18049 | #: builtin/worktree.c:718 |
5c57d762 JX |
18050 | #, c-format |
18051 | msgid "'%s' is not locked" | |
18052 | msgstr "'%s' 未被锁定" | |
18053 | ||
4c27fcb5 | 18054 | #: builtin/worktree.c:743 |
31e5e17b | 18055 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 18056 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 18057 | |
4c27fcb5 JX |
18058 | #: builtin/worktree.c:751 |
18059 | msgid "force move even if worktree is dirty or locked" | |
18060 | msgstr "强制移动,即使工作区是脏的或已锁定" | |
18061 | ||
18062 | #: builtin/worktree.c:774 builtin/worktree.c:901 | |
31e5e17b JX |
18063 | #, c-format |
18064 | msgid "'%s' is a main working tree" | |
18065 | msgstr "'%s' 是一个主工作区" | |
18066 | ||
4c27fcb5 | 18067 | #: builtin/worktree.c:779 |
31e5e17b JX |
18068 | #, c-format |
18069 | msgid "could not figure out destination name from '%s'" | |
18070 | msgstr "无法从 '%s' 算出目标名称" | |
18071 | ||
4c27fcb5 | 18072 | #: builtin/worktree.c:785 |
31e5e17b JX |
18073 | #, c-format |
18074 | msgid "target '%s' already exists" | |
18075 | msgstr "目标 '%s' 已存在" | |
18076 | ||
4c27fcb5 | 18077 | #: builtin/worktree.c:793 |
31e5e17b | 18078 | #, c-format |
4c27fcb5 JX |
18079 | msgid "" |
18080 | "cannot move a locked working tree, lock reason: %s\n" | |
18081 | "use 'move -f -f' to override or unlock first" | |
18082 | msgstr "" | |
18083 | "无法移动一个锁定的工作区,锁定原因:%s\n" | |
18084 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 18085 | |
4c27fcb5 JX |
18086 | #: builtin/worktree.c:795 |
18087 | msgid "" | |
18088 | "cannot move a locked working tree;\n" | |
18089 | "use 'move -f -f' to override or unlock first" | |
18090 | msgstr "" | |
18091 | "无法移动一个锁定的工作区,\n" | |
18092 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 18093 | |
4c27fcb5 | 18094 | #: builtin/worktree.c:798 |
31e5e17b JX |
18095 | #, c-format |
18096 | msgid "validation failed, cannot move working tree: %s" | |
18097 | msgstr "验证失败,无法移动工作区:%s" | |
18098 | ||
4c27fcb5 | 18099 | #: builtin/worktree.c:803 |
31e5e17b JX |
18100 | #, c-format |
18101 | msgid "failed to move '%s' to '%s'" | |
c1ac5258 | 18102 | msgstr "移动 '%s' 到 '%s' 失败" |
31e5e17b | 18103 | |
4c27fcb5 | 18104 | #: builtin/worktree.c:851 |
31e5e17b JX |
18105 | #, c-format |
18106 | msgid "failed to run 'git status' on '%s'" | |
c1ac5258 | 18107 | msgstr "在 '%s' 中执行 'git status' 失败" |
31e5e17b | 18108 | |
4c27fcb5 | 18109 | #: builtin/worktree.c:855 |
31e5e17b JX |
18110 | #, c-format |
18111 | msgid "'%s' is dirty, use --force to delete it" | |
18112 | msgstr "'%s' 是脏的,使用 --force 删除" | |
18113 | ||
4c27fcb5 | 18114 | #: builtin/worktree.c:860 |
31e5e17b JX |
18115 | #, c-format |
18116 | msgid "failed to run 'git status' on '%s', code %d" | |
c1ac5258 | 18117 | msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" |
31e5e17b | 18118 | |
4c27fcb5 JX |
18119 | #: builtin/worktree.c:883 |
18120 | msgid "force removal even if worktree is dirty or locked" | |
18121 | msgstr "强制删除,即使工作区是脏的或已锁定" | |
31e5e17b | 18122 | |
4c27fcb5 | 18123 | #: builtin/worktree.c:906 |
31e5e17b | 18124 | #, c-format |
4c27fcb5 JX |
18125 | msgid "" |
18126 | "cannot remove a locked working tree, lock reason: %s\n" | |
18127 | "use 'remove -f -f' to override or unlock first" | |
18128 | msgstr "" | |
18129 | "无法删除一个锁定的工作区,锁定原因:%s\n" | |
18130 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 18131 | |
4c27fcb5 JX |
18132 | #: builtin/worktree.c:908 |
18133 | msgid "" | |
18134 | "cannot remove a locked working tree;\n" | |
18135 | "use 'remove -f -f' to override or unlock first" | |
18136 | msgstr "" | |
18137 | "无法删除一个锁定的工作区,\n" | |
18138 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 18139 | |
4c27fcb5 | 18140 | #: builtin/worktree.c:911 |
31e5e17b JX |
18141 | #, c-format |
18142 | msgid "validation failed, cannot remove working tree: %s" | |
18143 | msgstr "验证失败,无法删除工作区:%s" | |
18144 | ||
a4f16749 | 18145 | #: builtin/write-tree.c:14 |
ef317cd5 | 18146 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 18147 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 18148 | |
a4f16749 | 18149 | #: builtin/write-tree.c:27 |
ef317cd5 | 18150 | msgid "<prefix>/" |
07432cef | 18151 | msgstr "<前缀>/" |
ef317cd5 | 18152 | |
a4f16749 | 18153 | #: builtin/write-tree.c:28 |
ef317cd5 | 18154 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 18155 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 18156 | |
c1ac5258 | 18157 | #: builtin/write-tree.c:30 |
ef317cd5 | 18158 | msgid "only useful for debugging" |
07432cef | 18159 | msgstr "只对调试有用" |
ef317cd5 | 18160 | |
6937cb4e | 18161 | #: credential-cache--daemon.c:222 |
a0b6b246 JX |
18162 | #, c-format |
18163 | msgid "" | |
18164 | "The permissions on your socket directory are too loose; other\n" | |
18165 | "users may be able to read your cached credentials. Consider running:\n" | |
18166 | "\n" | |
18167 | "\tchmod 0700 %s" | |
18168 | msgstr "" | |
1a79b2f1 JX |
18169 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
18170 | "行:\n" | |
a0b6b246 JX |
18171 | "\n" |
18172 | "\tchmod 0700 %s" | |
18173 | ||
6937cb4e | 18174 | #: credential-cache--daemon.c:271 |
220c313c JX |
18175 | msgid "print debugging messages to stderr" |
18176 | msgstr "调试信息输出到标准错误" | |
18177 | ||
4c27fcb5 JX |
18178 | #: t/helper/test-reach.c:152 |
18179 | #, c-format | |
18180 | msgid "commit %s is not marked reachable" | |
18181 | msgstr "提交 %s 没有标记为可达" | |
18182 | ||
18183 | #: t/helper/test-reach.c:162 | |
18184 | msgid "too many commits marked reachable" | |
18185 | msgstr "太多提交标记为可达" | |
18186 | ||
fd8cb379 | 18187 | #: git.c:27 |
31e5e17b JX |
18188 | msgid "" |
18189 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
18190 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
18191 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
18192 | "bare]\n" | |
31e5e17b JX |
18193 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
18194 | " <command> [<args>]" | |
18195 | msgstr "" | |
fd8cb379 | 18196 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 18197 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
fd8cb379 JX |
18198 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
18199 | "bare]\n" | |
31e5e17b JX |
18200 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
18201 | " <命令> [<参数>]" | |
18202 | ||
fd8cb379 | 18203 | #: git.c:34 |
4dcdc3d8 | 18204 | msgid "" |
220c313c | 18205 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
18206 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
18207 | "to read about a specific subcommand or concept." | |
18208 | msgstr "" | |
220c313c JX |
18209 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
18210 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
18211 | "帮助。" | |
8ada9598 | 18212 | |
fd8cb379 | 18213 | #: git.c:173 |
31e5e17b JX |
18214 | #, c-format |
18215 | msgid "no directory given for --git-dir\n" | |
18216 | msgstr "没有为 --git-dir 提供目录\n" | |
18217 | ||
fd8cb379 | 18218 | #: git.c:187 |
31e5e17b JX |
18219 | #, c-format |
18220 | msgid "no namespace given for --namespace\n" | |
18221 | msgstr "没有为 --namespace 提供命名空间\n" | |
18222 | ||
fd8cb379 | 18223 | #: git.c:201 |
31e5e17b JX |
18224 | #, c-format |
18225 | msgid "no directory given for --work-tree\n" | |
18226 | msgstr "没有为 --work-tree 提供目录\n" | |
18227 | ||
fd8cb379 | 18228 | #: git.c:215 |
31e5e17b JX |
18229 | #, c-format |
18230 | msgid "no prefix given for --super-prefix\n" | |
18231 | msgstr "没有为 --super-prefix 提供前缀\n" | |
18232 | ||
fd8cb379 | 18233 | #: git.c:237 |
31e5e17b JX |
18234 | #, c-format |
18235 | msgid "-c expects a configuration string\n" | |
18236 | msgstr "应为 -c 提供一个配置字符串\n" | |
18237 | ||
fd8cb379 | 18238 | #: git.c:275 |
31e5e17b JX |
18239 | #, c-format |
18240 | msgid "no directory given for -C\n" | |
18241 | msgstr "没有为 -C 提供目录\n" | |
18242 | ||
fd8cb379 | 18243 | #: git.c:300 |
31e5e17b JX |
18244 | #, c-format |
18245 | msgid "unknown option: %s\n" | |
18246 | msgstr "未知选项:%s\n" | |
18247 | ||
4c27fcb5 JX |
18248 | #: git.c:719 |
18249 | #, c-format | |
18250 | msgid "alias loop detected: expansion of '%s' does not terminate:%s" | |
18251 | msgstr "检测到别名循环:'%s'的扩展未终止:%s" | |
18252 | ||
18253 | #: git.c:802 | |
31e5e17b JX |
18254 | #, c-format |
18255 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
18256 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
18257 | ||
4c27fcb5 | 18258 | #: git.c:814 |
31e5e17b JX |
18259 | #, c-format |
18260 | msgid "failed to run command '%s': %s\n" | |
c1ac5258 | 18261 | msgstr "运行命令 '%s' 失败:%s\n" |
31e5e17b | 18262 | |
4c27fcb5 | 18263 | #: http.c:374 |
60638e98 JX |
18264 | #, c-format |
18265 | msgid "negative value for http.postbuffer; defaulting to %d" | |
18266 | msgstr "http.postbuffer 为负值,默认为 %d" | |
18267 | ||
4c27fcb5 | 18268 | #: http.c:395 |
a0b6b246 | 18269 | msgid "Delegation control is not supported with cURL < 7.22.0" |
4c27fcb5 | 18270 | msgstr "不支持委托控制,因为 cURL < 7.22.0" |
a0b6b246 | 18271 | |
4c27fcb5 | 18272 | #: http.c:404 |
276ceeaa JX |
18273 | msgid "Public key pinning not supported with cURL < 7.44.0" |
18274 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
18275 | ||
4c27fcb5 JX |
18276 | #: http.c:837 |
18277 | msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" | |
18278 | msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0" | |
18279 | ||
18280 | #: http.c:910 | |
18281 | msgid "Protocol restrictions not supported with cURL < 7.19.4" | |
18282 | msgstr "不支持协议限制,因为 cURL < 7.19.4" | |
18283 | ||
18284 | #: http.c:1046 | |
18285 | #, c-format | |
18286 | msgid "Unsupported SSL backend '%s'. Supported SSL backends:" | |
18287 | msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:" | |
18288 | ||
18289 | #: http.c:1053 | |
18290 | #, c-format | |
18291 | msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" | |
18292 | msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建" | |
18293 | ||
18294 | #: http.c:1057 | |
18295 | #, c-format | |
18296 | msgid "Could not set SSL backend to '%s': already set" | |
18297 | msgstr "无法将 SSL 后端设置为 '%s':已经设置" | |
18298 | ||
18299 | #: http.c:1921 | |
1a79b2f1 JX |
18300 | #, c-format |
18301 | msgid "" | |
18302 | "unable to update url base from redirection:\n" | |
18303 | " asked for: %s\n" | |
18304 | " redirect: %s" | |
18305 | msgstr "" | |
18306 | "不能更新重定向的 url base:\n" | |
18307 | " 请求:%s\n" | |
18308 | " 重定向:%s" | |
18309 | ||
fd8cb379 | 18310 | #: remote-curl.c:401 |
1a79b2f1 JX |
18311 | #, c-format |
18312 | msgid "redirecting to %s" | |
18313 | msgstr "重定向到 %s" | |
18314 | ||
4c27fcb5 | 18315 | #: list-objects-filter-options.h:60 |
5809aa05 JX |
18316 | msgid "args" |
18317 | msgstr "参数" | |
18318 | ||
4c27fcb5 | 18319 | #: list-objects-filter-options.h:61 |
5809aa05 JX |
18320 | msgid "object filtering" |
18321 | msgstr "对象过滤" | |
18322 | ||
4c27fcb5 | 18323 | #: parse-options.h:154 |
fd8cb379 JX |
18324 | msgid "expiry-date" |
18325 | msgstr "到期时间" | |
7aea43ff | 18326 | |
4c27fcb5 | 18327 | #: parse-options.h:169 |
fd8cb379 JX |
18328 | msgid "no-op (backward compatibility)" |
18329 | msgstr "空操作(向后兼容)" | |
7aea43ff | 18330 | |
4c27fcb5 | 18331 | #: parse-options.h:261 |
fd8cb379 JX |
18332 | msgid "be more verbose" |
18333 | msgstr "更加详细" | |
7aea43ff | 18334 | |
4c27fcb5 | 18335 | #: parse-options.h:263 |
fd8cb379 JX |
18336 | msgid "be more quiet" |
18337 | msgstr "更加安静" | |
7aea43ff | 18338 | |
4c27fcb5 | 18339 | #: parse-options.h:269 |
fd8cb379 JX |
18340 | msgid "use <n> digits to display SHA-1s" |
18341 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
7aea43ff | 18342 | |
fd8cb379 | 18343 | #: command-list.h:50 |
8ada9598 | 18344 | msgid "Add file contents to the index" |
81809b99 | 18345 | msgstr "添加文件内容至索引" |
8ada9598 | 18346 | |
fd8cb379 JX |
18347 | #: command-list.h:51 |
18348 | msgid "Apply a series of patches from a mailbox" | |
18349 | msgstr "应用邮箱格式的系列补丁" | |
18350 | ||
18351 | #: command-list.h:52 | |
18352 | msgid "Annotate file lines with commit information" | |
18353 | msgstr "使用提交信息注释文件行" | |
18354 | ||
18355 | #: command-list.h:53 | |
18356 | msgid "Apply a patch to files and/or to the index" | |
18357 | msgstr "应用一个补丁到文件和/或索引区" | |
18358 | ||
18359 | #: command-list.h:54 | |
4c27fcb5 JX |
18360 | msgid "Import a GNU Arch repository into Git" |
18361 | msgstr "将一个 GNU Arch 仓库导入到 Git" | |
fd8cb379 JX |
18362 | |
18363 | #: command-list.h:55 | |
18364 | msgid "Create an archive of files from a named tree" | |
18365 | msgstr "基于一个指定的树创建文件存档" | |
18366 | ||
18367 | #: command-list.h:56 | |
1b7f4a34 JX |
18368 | msgid "Use binary search to find the commit that introduced a bug" |
18369 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 18370 | |
fd8cb379 JX |
18371 | #: command-list.h:57 |
18372 | msgid "Show what revision and author last modified each line of a file" | |
18373 | msgstr "显示文件每一行最后修改的版本和修改者" | |
18374 | ||
18375 | #: command-list.h:58 | |
8ada9598 | 18376 | msgid "List, create, or delete branches" |
81809b99 | 18377 | msgstr "列出、创建或删除分支" |
8ada9598 | 18378 | |
fd8cb379 JX |
18379 | #: command-list.h:59 |
18380 | msgid "Move objects and refs by archive" | |
18381 | msgstr "通过归档移动对象和引用" | |
18382 | ||
18383 | #: command-list.h:60 | |
18384 | msgid "Provide content or type and size information for repository objects" | |
18385 | msgstr "提供仓库对象的内容、类型或大小" | |
18386 | ||
18387 | #: command-list.h:61 | |
18388 | msgid "Display gitattributes information" | |
18389 | msgstr "显示 gitattributes 信息" | |
18390 | ||
18391 | #: command-list.h:62 | |
18392 | msgid "Debug gitignore / exclude files" | |
18393 | msgstr "调试 gitignore / exclude 文件" | |
18394 | ||
18395 | #: command-list.h:63 | |
18396 | msgid "Show canonical names and email addresses of contacts" | |
18397 | msgstr "显示联系人的规范名称和电子邮件" | |
18398 | ||
18399 | #: command-list.h:64 | |
5bb01d4f JX |
18400 | msgid "Switch branches or restore working tree files" |
18401 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 18402 | |
fd8cb379 JX |
18403 | #: command-list.h:65 |
18404 | msgid "Copy files from the index to the working tree" | |
18405 | msgstr "从索引拷贝文件到工作区" | |
18406 | ||
18407 | #: command-list.h:66 | |
18408 | msgid "Ensures that a reference name is well formed" | |
18409 | msgstr "确保引用名称格式正确" | |
18410 | ||
18411 | #: command-list.h:67 | |
18412 | msgid "Find commits yet to be applied to upstream" | |
18413 | msgstr "查找尚未应用到上游的提交" | |
18414 | ||
18415 | #: command-list.h:68 | |
18416 | msgid "Apply the changes introduced by some existing commits" | |
18417 | msgstr "应用一些现存提交引入的修改" | |
18418 | ||
18419 | #: command-list.h:69 | |
18420 | msgid "Graphical alternative to git-commit" | |
18421 | msgstr "git-commit 的图形替代界面" | |
18422 | ||
18423 | #: command-list.h:70 | |
18424 | msgid "Remove untracked files from the working tree" | |
18425 | msgstr "从工作区中删除未跟踪文件" | |
18426 | ||
18427 | #: command-list.h:71 | |
8ada9598 | 18428 | msgid "Clone a repository into a new directory" |
160fb2b2 | 18429 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 18430 | |
fd8cb379 JX |
18431 | #: command-list.h:72 |
18432 | msgid "Display data in columns" | |
18433 | msgstr "以列的方式显示数据" | |
18434 | ||
18435 | #: command-list.h:73 | |
8ada9598 | 18436 | msgid "Record changes to the repository" |
160fb2b2 | 18437 | msgstr "记录变更到仓库" |
8ada9598 | 18438 | |
fd8cb379 | 18439 | #: command-list.h:74 |
4c27fcb5 JX |
18440 | msgid "Write and verify Git commit-graph files" |
18441 | msgstr "写入和校验 Git 提交图文件" | |
fd8cb379 JX |
18442 | |
18443 | #: command-list.h:75 | |
18444 | msgid "Create a new commit object" | |
18445 | msgstr "创建一个新的提交对象" | |
18446 | ||
18447 | #: command-list.h:76 | |
18448 | msgid "Get and set repository or global options" | |
18449 | msgstr "获取和设置仓库或者全局选项" | |
18450 | ||
18451 | #: command-list.h:77 | |
18452 | msgid "Count unpacked number of objects and their disk consumption" | |
18453 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
18454 | ||
18455 | #: command-list.h:78 | |
18456 | msgid "Retrieve and store user credentials" | |
18457 | msgstr "检索和存储用户密码" | |
18458 | ||
18459 | #: command-list.h:79 | |
18460 | msgid "Helper to temporarily store passwords in memory" | |
18461 | msgstr "在内存中临时存储密码的助手" | |
18462 | ||
18463 | #: command-list.h:80 | |
18464 | msgid "Helper to store credentials on disk" | |
18465 | msgstr "在磁盘存储密码的助手" | |
18466 | ||
18467 | #: command-list.h:81 | |
18468 | msgid "Export a single commit to a CVS checkout" | |
18469 | msgstr "将一个提交导出到 CVS 检出中" | |
18470 | ||
18471 | #: command-list.h:82 | |
18472 | msgid "Salvage your data out of another SCM people love to hate" | |
18473 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
18474 | ||
18475 | #: command-list.h:83 | |
18476 | msgid "A CVS server emulator for Git" | |
18477 | msgstr "Git 的一个 CVS 服务模拟器" | |
18478 | ||
18479 | #: command-list.h:84 | |
18480 | msgid "A really simple server for Git repositories" | |
18481 | msgstr "一个非常简单的 Git 仓库服务器" | |
18482 | ||
18483 | #: command-list.h:85 | |
18484 | msgid "Give an object a human readable name based on an available ref" | |
18485 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
18486 | ||
18487 | #: command-list.h:86 | |
8ada9598 | 18488 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 18489 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 18490 | |
fd8cb379 JX |
18491 | #: command-list.h:87 |
18492 | msgid "Compares files in the working tree and the index" | |
18493 | msgstr "比较工作区和索引区中的文件" | |
18494 | ||
18495 | #: command-list.h:88 | |
18496 | msgid "Compare a tree to the working tree or index" | |
18497 | msgstr "将一个树和工作区或索引做比较" | |
18498 | ||
18499 | #: command-list.h:89 | |
18500 | msgid "Compares the content and mode of blobs found via two tree objects" | |
18501 | msgstr "比较两个树对象的文件内容和模式" | |
18502 | ||
18503 | #: command-list.h:90 | |
18504 | msgid "Show changes using common diff tools" | |
18505 | msgstr "使用常见的差异工具显示更改" | |
18506 | ||
18507 | #: command-list.h:91 | |
18508 | msgid "Git data exporter" | |
18509 | msgstr "Git 数据导出器" | |
18510 | ||
18511 | #: command-list.h:92 | |
18512 | msgid "Backend for fast Git data importers" | |
18513 | msgstr "Git 快速数据导入器后端" | |
18514 | ||
18515 | #: command-list.h:93 | |
8ada9598 | 18516 | msgid "Download objects and refs from another repository" |
160fb2b2 | 18517 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 18518 | |
fd8cb379 JX |
18519 | #: command-list.h:94 |
18520 | msgid "Receive missing objects from another repository" | |
18521 | msgstr "从另一个仓库获取缺失的对象" | |
18522 | ||
18523 | #: command-list.h:95 | |
18524 | msgid "Rewrite branches" | |
18525 | msgstr "重写分支" | |
18526 | ||
18527 | #: command-list.h:96 | |
18528 | msgid "Produce a merge commit message" | |
18529 | msgstr "生成一个合并提交信息" | |
18530 | ||
18531 | #: command-list.h:97 | |
18532 | msgid "Output information on each ref" | |
18533 | msgstr "对每一个引用输出信息 " | |
18534 | ||
18535 | #: command-list.h:98 | |
18536 | msgid "Prepare patches for e-mail submission" | |
18537 | msgstr "准备电子邮件提交的补丁" | |
18538 | ||
18539 | #: command-list.h:99 | |
18540 | msgid "Verifies the connectivity and validity of the objects in the database" | |
18541 | msgstr "验证仓库中对象的连通性和有效性" | |
18542 | ||
18543 | #: command-list.h:100 | |
18544 | msgid "Cleanup unnecessary files and optimize the local repository" | |
18545 | msgstr "清除不必要的文件和优化本地仓库" | |
18546 | ||
18547 | #: command-list.h:101 | |
18548 | msgid "Extract commit ID from an archive created using git-archive" | |
18549 | msgstr "从 git-archive 创建的归档文件中提取提交ID" | |
18550 | ||
18551 | #: command-list.h:102 | |
8ada9598 | 18552 | msgid "Print lines matching a pattern" |
81809b99 | 18553 | msgstr "输出和模式匹配的行" |
8ada9598 | 18554 | |
fd8cb379 JX |
18555 | #: command-list.h:103 |
18556 | msgid "A portable graphical interface to Git" | |
18557 | msgstr "一个便携的 Git 图形客户端" | |
18558 | ||
18559 | #: command-list.h:104 | |
18560 | msgid "Compute object ID and optionally creates a blob from a file" | |
18561 | msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象" | |
18562 | ||
18563 | #: command-list.h:105 | |
18564 | msgid "Display help information about Git" | |
18565 | msgstr "显示 Git 的帮助信息" | |
18566 | ||
18567 | #: command-list.h:106 | |
18568 | msgid "Server side implementation of Git over HTTP" | |
18569 | msgstr "Git HTTP 协议的服务端实现" | |
18570 | ||
18571 | #: command-list.h:107 | |
18572 | msgid "Download from a remote Git repository via HTTP" | |
18573 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
18574 | ||
18575 | #: command-list.h:108 | |
18576 | msgid "Push objects over HTTP/DAV to another repository" | |
18577 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
18578 | ||
18579 | #: command-list.h:109 | |
18580 | msgid "Send a collection of patches from stdin to an IMAP folder" | |
18581 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
18582 | ||
18583 | #: command-list.h:110 | |
18584 | msgid "Build pack index file for an existing packed archive" | |
18585 | msgstr "从一个现存的包存档文件创建包索引" | |
18586 | ||
18587 | #: command-list.h:111 | |
a77c07d9 | 18588 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 18589 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 18590 | |
fd8cb379 JX |
18591 | #: command-list.h:112 |
18592 | msgid "Instantly browse your working repository in gitweb" | |
18593 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
18594 | ||
18595 | #: command-list.h:113 | |
18596 | msgid "add or parse structured information in commit messages" | |
18597 | msgstr "添加或解析提交说明中的结构化信息" | |
18598 | ||
18599 | #: command-list.h:114 | |
18600 | msgid "The Git repository browser" | |
18601 | msgstr "Git 仓库浏览器" | |
18602 | ||
18603 | #: command-list.h:115 | |
8ada9598 | 18604 | msgid "Show commit logs" |
81809b99 | 18605 | msgstr "显示提交日志" |
8ada9598 | 18606 | |
fd8cb379 JX |
18607 | #: command-list.h:116 |
18608 | msgid "Show information about files in the index and the working tree" | |
18609 | msgstr "显示索引和工作区中文件的信息" | |
18610 | ||
18611 | #: command-list.h:117 | |
18612 | msgid "List references in a remote repository" | |
18613 | msgstr "显示一个远程仓库的引用" | |
18614 | ||
18615 | #: command-list.h:118 | |
18616 | msgid "List the contents of a tree object" | |
18617 | msgstr "显示一个树对象的内容" | |
18618 | ||
18619 | #: command-list.h:119 | |
18620 | msgid "Extracts patch and authorship from a single e-mail message" | |
18621 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
18622 | ||
18623 | #: command-list.h:120 | |
18624 | msgid "Simple UNIX mbox splitter program" | |
18625 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
18626 | ||
18627 | #: command-list.h:121 | |
8ada9598 | 18628 | msgid "Join two or more development histories together" |
81809b99 | 18629 | msgstr "合并两个或更多开发历史" |
8ada9598 | 18630 | |
fd8cb379 JX |
18631 | #: command-list.h:122 |
18632 | msgid "Find as good common ancestors as possible for a merge" | |
18633 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
18634 | ||
18635 | #: command-list.h:123 | |
18636 | msgid "Run a three-way file merge" | |
18637 | msgstr "运行一个三路文件合并" | |
18638 | ||
18639 | #: command-list.h:124 | |
18640 | msgid "Run a merge for files needing merging" | |
18641 | msgstr "对于需要合并的文件执行合并" | |
18642 | ||
18643 | #: command-list.h:125 | |
18644 | msgid "The standard helper program to use with git-merge-index" | |
18645 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
18646 | ||
18647 | #: command-list.h:126 | |
18648 | msgid "Run merge conflict resolution tools to resolve merge conflicts" | |
18649 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
18650 | ||
18651 | #: command-list.h:127 | |
18652 | msgid "Show three-way merge without touching index" | |
18653 | msgstr "显示三路合并而不动索引" | |
18654 | ||
18655 | #: command-list.h:128 | |
4c27fcb5 JX |
18656 | msgid "Write and verify multi-pack-indexes" |
18657 | msgstr "写入和校验多包索引" | |
18658 | ||
18659 | #: command-list.h:129 | |
fd8cb379 JX |
18660 | msgid "Creates a tag object" |
18661 | msgstr "创建一个标签对象" | |
18662 | ||
4c27fcb5 | 18663 | #: command-list.h:130 |
fd8cb379 JX |
18664 | msgid "Build a tree-object from ls-tree formatted text" |
18665 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
18666 | ||
4c27fcb5 | 18667 | #: command-list.h:131 |
8ada9598 | 18668 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 18669 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 18670 | |
fd8cb379 | 18671 | # 查找给定版本的符号名称 |
4c27fcb5 | 18672 | #: command-list.h:132 |
fd8cb379 JX |
18673 | msgid "Find symbolic names for given revs" |
18674 | msgstr "查找给定版本的符号名称" | |
18675 | ||
4c27fcb5 | 18676 | #: command-list.h:133 |
fd8cb379 JX |
18677 | msgid "Add or inspect object notes" |
18678 | msgstr "添加或检查对象注释" | |
18679 | ||
4c27fcb5 | 18680 | #: command-list.h:134 |
fd8cb379 JX |
18681 | msgid "Import from and submit to Perforce repositories" |
18682 | msgstr "导入和提交到 Perforce 仓库中" | |
18683 | ||
4c27fcb5 | 18684 | #: command-list.h:135 |
fd8cb379 JX |
18685 | msgid "Create a packed archive of objects" |
18686 | msgstr "创建对象的存档包" | |
18687 | ||
4c27fcb5 | 18688 | #: command-list.h:136 |
fd8cb379 JX |
18689 | msgid "Find redundant pack files" |
18690 | msgstr "查找冗余的包文件" | |
18691 | ||
4c27fcb5 | 18692 | #: command-list.h:137 |
fd8cb379 JX |
18693 | msgid "Pack heads and tags for efficient repository access" |
18694 | msgstr "打包头和标签以实现高效的仓库访问" | |
18695 | ||
4c27fcb5 | 18696 | #: command-list.h:138 |
fd8cb379 JX |
18697 | msgid "Routines to help parsing remote repository access parameters" |
18698 | msgstr "帮助解析远程仓库访问参数的例程" | |
18699 | ||
4c27fcb5 | 18700 | #: command-list.h:139 |
fd8cb379 JX |
18701 | msgid "Compute unique ID for a patch" |
18702 | msgstr "计算一个补丁的唯一ID" | |
18703 | ||
4c27fcb5 | 18704 | #: command-list.h:140 |
fd8cb379 JX |
18705 | msgid "Prune all unreachable objects from the object database" |
18706 | msgstr "删除对象库中所有不可达对象" | |
18707 | ||
4c27fcb5 | 18708 | #: command-list.h:141 |
fd8cb379 JX |
18709 | msgid "Remove extra objects that are already in pack files" |
18710 | msgstr "删除已经在包文件中的多余对象" | |
18711 | ||
4c27fcb5 | 18712 | #: command-list.h:142 |
2e8451e8 | 18713 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 18714 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 18715 | |
4c27fcb5 | 18716 | #: command-list.h:143 |
8ada9598 | 18717 | msgid "Update remote refs along with associated objects" |
81809b99 | 18718 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 18719 | |
4c27fcb5 | 18720 | #: command-list.h:144 |
fd8cb379 JX |
18721 | msgid "Applies a quilt patchset onto the current branch" |
18722 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
18723 | ||
4c27fcb5 | 18724 | #: command-list.h:145 |
c1ac5258 JX |
18725 | msgid "Compare two commit ranges (e.g. two versions of a branch)" |
18726 | msgstr "比较两个提交范围(如一个分支的两个版本)" | |
18727 | ||
4c27fcb5 | 18728 | #: command-list.h:146 |
fd8cb379 JX |
18729 | msgid "Reads tree information into the index" |
18730 | msgstr "将树信息读取到索引" | |
18731 | ||
4c27fcb5 | 18732 | #: command-list.h:147 |
3495628d JX |
18733 | msgid "Reapply commits on top of another base tip" |
18734 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 18735 | |
4c27fcb5 | 18736 | #: command-list.h:148 |
fd8cb379 JX |
18737 | msgid "Receive what is pushed into the repository" |
18738 | msgstr "接收推送到仓库中的对象" | |
18739 | ||
4c27fcb5 | 18740 | #: command-list.h:149 |
fd8cb379 JX |
18741 | msgid "Manage reflog information" |
18742 | msgstr "管理 reflog 信息" | |
18743 | ||
4c27fcb5 | 18744 | #: command-list.h:150 |
fd8cb379 JX |
18745 | msgid "Manage set of tracked repositories" |
18746 | msgstr "管理已跟踪仓库" | |
18747 | ||
4c27fcb5 | 18748 | #: command-list.h:151 |
fd8cb379 JX |
18749 | msgid "Pack unpacked objects in a repository" |
18750 | msgstr "打包仓库中未打包对象" | |
18751 | ||
4c27fcb5 | 18752 | #: command-list.h:152 |
fd8cb379 JX |
18753 | msgid "Create, list, delete refs to replace objects" |
18754 | msgstr "创建、列出、删除对象替换引用" | |
18755 | ||
4c27fcb5 | 18756 | #: command-list.h:153 |
fd8cb379 JX |
18757 | msgid "Generates a summary of pending changes" |
18758 | msgstr "生成待定更改的摘要" | |
18759 | ||
4c27fcb5 | 18760 | #: command-list.h:154 |
fd8cb379 JX |
18761 | msgid "Reuse recorded resolution of conflicted merges" |
18762 | msgstr "重用冲突合并的解决方案记录" | |
18763 | ||
4c27fcb5 | 18764 | #: command-list.h:155 |
8ada9598 | 18765 | msgid "Reset current HEAD to the specified state" |
4375c10e | 18766 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 18767 | |
4c27fcb5 | 18768 | #: command-list.h:156 |
fd8cb379 JX |
18769 | msgid "Revert some existing commits" |
18770 | msgstr "回退一些现存提交" | |
18771 | ||
4c27fcb5 | 18772 | #: command-list.h:157 |
fd8cb379 JX |
18773 | msgid "Lists commit objects in reverse chronological order" |
18774 | msgstr "按时间顺序列出提交对象" | |
18775 | ||
4c27fcb5 | 18776 | #: command-list.h:158 |
fd8cb379 JX |
18777 | msgid "Pick out and massage parameters" |
18778 | msgstr "选出并处理参数" | |
18779 | ||
4c27fcb5 | 18780 | #: command-list.h:159 |
8ada9598 | 18781 | msgid "Remove files from the working tree and from the index" |
81809b99 | 18782 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 18783 | |
4c27fcb5 | 18784 | #: command-list.h:160 |
fd8cb379 JX |
18785 | msgid "Send a collection of patches as emails" |
18786 | msgstr "通过电子邮件发送一组补丁" | |
18787 | ||
4c27fcb5 | 18788 | #: command-list.h:161 |
fd8cb379 JX |
18789 | msgid "Push objects over Git protocol to another repository" |
18790 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
18791 | ||
4c27fcb5 | 18792 | #: command-list.h:162 |
fd8cb379 JX |
18793 | msgid "Restricted login shell for Git-only SSH access" |
18794 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
18795 | ||
4c27fcb5 | 18796 | #: command-list.h:163 |
fd8cb379 JX |
18797 | msgid "Summarize 'git log' output" |
18798 | msgstr "'git log' 输出摘要" | |
18799 | ||
4c27fcb5 | 18800 | #: command-list.h:164 |
8ada9598 | 18801 | msgid "Show various types of objects" |
81809b99 | 18802 | msgstr "显示各种类型的对象" |
8ada9598 | 18803 | |
4c27fcb5 | 18804 | #: command-list.h:165 |
fd8cb379 JX |
18805 | msgid "Show branches and their commits" |
18806 | msgstr "显示分支和提交" | |
18807 | ||
4c27fcb5 | 18808 | #: command-list.h:166 |
fd8cb379 JX |
18809 | msgid "Show packed archive index" |
18810 | msgstr "显示打包归档索引" | |
18811 | ||
4c27fcb5 | 18812 | #: command-list.h:167 |
fd8cb379 JX |
18813 | msgid "List references in a local repository" |
18814 | msgstr "显示本地仓库中的引用" | |
18815 | ||
4c27fcb5 | 18816 | #: command-list.h:168 |
fd8cb379 JX |
18817 | msgid "Git's i18n setup code for shell scripts" |
18818 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
18819 | ||
4c27fcb5 | 18820 | #: command-list.h:169 |
fd8cb379 JX |
18821 | msgid "Common Git shell script setup code" |
18822 | msgstr "常用的 Git shell 脚本设置代码" | |
18823 | ||
4c27fcb5 | 18824 | #: command-list.h:170 |
fd8cb379 JX |
18825 | msgid "Stash the changes in a dirty working directory away" |
18826 | msgstr "贮藏脏工作区中的修改" | |
18827 | ||
4c27fcb5 | 18828 | #: command-list.h:171 |
fd8cb379 JX |
18829 | msgid "Add file contents to the staging area" |
18830 | msgstr "将文件内容添加到索引" | |
18831 | ||
4c27fcb5 | 18832 | #: command-list.h:172 |
8ada9598 | 18833 | msgid "Show the working tree status" |
81809b99 | 18834 | msgstr "显示工作区状态" |
8ada9598 | 18835 | |
4c27fcb5 | 18836 | #: command-list.h:173 |
fd8cb379 JX |
18837 | msgid "Remove unnecessary whitespace" |
18838 | msgstr "删除不必要的空白字符" | |
18839 | ||
4c27fcb5 | 18840 | #: command-list.h:174 |
fd8cb379 JX |
18841 | msgid "Initialize, update or inspect submodules" |
18842 | msgstr "初始化、更新或检查子模组" | |
18843 | ||
4c27fcb5 | 18844 | #: command-list.h:175 |
fd8cb379 JX |
18845 | msgid "Bidirectional operation between a Subversion repository and Git" |
18846 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
18847 | ||
4c27fcb5 | 18848 | #: command-list.h:176 |
fd8cb379 JX |
18849 | msgid "Read, modify and delete symbolic refs" |
18850 | msgstr "读取、修改和删除符号引用" | |
18851 | ||
4c27fcb5 | 18852 | #: command-list.h:177 |
8ada9598 | 18853 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 18854 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 18855 | |
4c27fcb5 | 18856 | #: command-list.h:178 |
fd8cb379 JX |
18857 | msgid "Creates a temporary file with a blob's contents" |
18858 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 18859 | |
4c27fcb5 | 18860 | #: command-list.h:179 |
fd8cb379 JX |
18861 | msgid "Unpack objects from a packed archive" |
18862 | msgstr "从打包文件中解压缩对象" | |
220c313c | 18863 | |
4c27fcb5 | 18864 | #: command-list.h:180 |
fd8cb379 JX |
18865 | msgid "Register file contents in the working tree to the index" |
18866 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 18867 | |
4c27fcb5 | 18868 | #: command-list.h:181 |
fd8cb379 JX |
18869 | msgid "Update the object name stored in a ref safely" |
18870 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 18871 | |
4c27fcb5 | 18872 | #: command-list.h:182 |
fd8cb379 JX |
18873 | msgid "Update auxiliary info file to help dumb servers" |
18874 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
18875 | ||
4c27fcb5 | 18876 | #: command-list.h:183 |
fd8cb379 JX |
18877 | msgid "Send archive back to git-archive" |
18878 | msgstr "将存档发送回 git-archive" | |
18879 | ||
4c27fcb5 | 18880 | #: command-list.h:184 |
fd8cb379 JX |
18881 | msgid "Send objects packed back to git-fetch-pack" |
18882 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
18883 | ||
4c27fcb5 | 18884 | #: command-list.h:185 |
fd8cb379 JX |
18885 | msgid "Show a Git logical variable" |
18886 | msgstr "显示一个Git逻辑变量" | |
18887 | ||
4c27fcb5 | 18888 | #: command-list.h:186 |
fd8cb379 JX |
18889 | msgid "Check the GPG signature of commits" |
18890 | msgstr "检查 GPG 提交签名" | |
18891 | ||
4c27fcb5 | 18892 | #: command-list.h:187 |
fd8cb379 JX |
18893 | msgid "Validate packed Git archive files" |
18894 | msgstr "校验打包的Git存仓文件" | |
18895 | ||
4c27fcb5 | 18896 | #: command-list.h:188 |
fd8cb379 JX |
18897 | msgid "Check the GPG signature of tags" |
18898 | msgstr "检查标签的 GPG 签名" | |
18899 | ||
4c27fcb5 | 18900 | #: command-list.h:189 |
fd8cb379 JX |
18901 | msgid "Git web interface (web frontend to Git repositories)" |
18902 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
18903 | ||
4c27fcb5 | 18904 | #: command-list.h:190 |
fd8cb379 JX |
18905 | msgid "Show logs with difference each commit introduces" |
18906 | msgstr "显示每一个提交引入的差异日志" | |
18907 | ||
4c27fcb5 | 18908 | #: command-list.h:191 |
fd8cb379 JX |
18909 | msgid "Manage multiple working trees" |
18910 | msgstr "管理多个工作区" | |
18911 | ||
4c27fcb5 | 18912 | #: command-list.h:192 |
fd8cb379 JX |
18913 | msgid "Create a tree object from the current index" |
18914 | msgstr "从当前索引创建一个树对象" | |
18915 | ||
4c27fcb5 | 18916 | #: command-list.h:193 |
fd8cb379 JX |
18917 | msgid "Defining attributes per path" |
18918 | msgstr "定义路径的属性" | |
18919 | ||
4c27fcb5 | 18920 | #: command-list.h:194 |
fd8cb379 JX |
18921 | msgid "Git command-line interface and conventions" |
18922 | msgstr "Git 命令行界面和约定" | |
18923 | ||
4c27fcb5 | 18924 | #: command-list.h:195 |
fd8cb379 JX |
18925 | msgid "A Git core tutorial for developers" |
18926 | msgstr "面向开发人员的 Git 核心教程" | |
18927 | ||
4c27fcb5 | 18928 | #: command-list.h:196 |
fd8cb379 JX |
18929 | msgid "Git for CVS users" |
18930 | msgstr "适合 CVS 用户的 Git 帮助" | |
18931 | ||
4c27fcb5 | 18932 | #: command-list.h:197 |
fd8cb379 JX |
18933 | msgid "Tweaking diff output" |
18934 | msgstr "调整差异输出" | |
18935 | ||
4c27fcb5 | 18936 | #: command-list.h:198 |
fd8cb379 JX |
18937 | msgid "A useful minimum set of commands for Everyday Git" |
18938 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
18939 | ||
4c27fcb5 | 18940 | #: command-list.h:199 |
fd8cb379 JX |
18941 | msgid "A Git Glossary" |
18942 | msgstr "Git 词汇表" | |
18943 | ||
4c27fcb5 | 18944 | #: command-list.h:200 |
fd8cb379 JX |
18945 | msgid "Hooks used by Git" |
18946 | msgstr "Git 使用的钩子" | |
18947 | ||
4c27fcb5 | 18948 | #: command-list.h:201 |
fd8cb379 JX |
18949 | msgid "Specifies intentionally untracked files to ignore" |
18950 | msgstr "忽略指定的未跟踪文件" | |
18951 | ||
4c27fcb5 | 18952 | #: command-list.h:202 |
fd8cb379 JX |
18953 | msgid "Defining submodule properties" |
18954 | msgstr "定义子模组属性" | |
18955 | ||
4c27fcb5 | 18956 | #: command-list.h:203 |
fd8cb379 JX |
18957 | msgid "Git namespaces" |
18958 | msgstr "Git 名字空间" | |
18959 | ||
4c27fcb5 | 18960 | #: command-list.h:204 |
fd8cb379 JX |
18961 | msgid "Git Repository Layout" |
18962 | msgstr "Git 仓库布局" | |
18963 | ||
4c27fcb5 | 18964 | #: command-list.h:205 |
fd8cb379 JX |
18965 | msgid "Specifying revisions and ranges for Git" |
18966 | msgstr "指定 Git 的版本和版本范围" | |
18967 | ||
4c27fcb5 | 18968 | #: command-list.h:206 |
fd8cb379 JX |
18969 | msgid "A tutorial introduction to Git: part two" |
18970 | msgstr "一个 Git 教程:第二部分" | |
18971 | ||
4c27fcb5 | 18972 | #: command-list.h:207 |
fd8cb379 JX |
18973 | msgid "A tutorial introduction to Git" |
18974 | msgstr "一个 Git 教程" | |
18975 | ||
4c27fcb5 | 18976 | #: command-list.h:208 |
fd8cb379 JX |
18977 | msgid "An overview of recommended workflows with Git" |
18978 | msgstr "Git 推荐的工作流概览" | |
220c313c | 18979 | |
4c27fcb5 | 18980 | #: rerere.h:44 |
220c313c JX |
18981 | msgid "update the index with reused conflict resolution if possible" |
18982 | msgstr "如果可能,重用冲突解决更新索引" | |
18983 | ||
5c57d762 | 18984 | #: git-bisect.sh:54 |
b694fbb1 JX |
18985 | msgid "You need to start by \"git bisect start\"" |
18986 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
18987 | ||
90e6ef53 | 18988 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
18989 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
18990 | #. translation. The program will only accept English input | |
18991 | #. at this point. | |
5c57d762 | 18992 | #: git-bisect.sh:60 |
c04f5ac3 JX |
18993 | msgid "Do you want me to do it for you [Y/n]? " |
18994 | msgstr "您想让我为您这样做么[Y/n]? " | |
18995 | ||
5c57d762 | 18996 | #: git-bisect.sh:121 |
c04f5ac3 JX |
18997 | #, sh-format |
18998 | msgid "unrecognised option: '$arg'" | |
81809b99 | 18999 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 19000 | |
5c57d762 | 19001 | #: git-bisect.sh:125 |
c04f5ac3 JX |
19002 | #, sh-format |
19003 | msgid "'$arg' does not appear to be a valid revision" | |
19004 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
19005 | ||
5c57d762 | 19006 | #: git-bisect.sh:154 |
c04f5ac3 JX |
19007 | msgid "Bad HEAD - I need a HEAD" |
19008 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
19009 | ||
5c57d762 | 19010 | #: git-bisect.sh:167 |
c04f5ac3 JX |
19011 | #, sh-format |
19012 | msgid "" | |
814ff314 | 19013 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 19014 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 19015 | |
5c57d762 | 19016 | #: git-bisect.sh:177 |
cfff71a9 JX |
19017 | msgid "won't bisect on cg-seek'ed tree" |
19018 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 19019 | |
5c57d762 | 19020 | #: git-bisect.sh:181 |
c04f5ac3 | 19021 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 19022 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 19023 | |
5c57d762 | 19024 | #: git-bisect.sh:233 |
c04f5ac3 JX |
19025 | #, sh-format |
19026 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 19027 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 19028 | |
5809aa05 | 19029 | #: git-bisect.sh:246 |
c04f5ac3 JX |
19030 | #, sh-format |
19031 | msgid "Bad rev input: $arg" | |
9a4b694c | 19032 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 19033 | |
5809aa05 | 19034 | #: git-bisect.sh:265 |
5c57d762 JX |
19035 | #, sh-format |
19036 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 19037 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 19038 | |
5809aa05 | 19039 | #: git-bisect.sh:274 |
c04f5ac3 JX |
19040 | #, sh-format |
19041 | msgid "Bad rev input: $rev" | |
9a4b694c | 19042 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 19043 | |
5809aa05 | 19044 | #: git-bisect.sh:283 |
1b7f4a34 JX |
19045 | #, sh-format |
19046 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
19047 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
19048 | ||
5809aa05 | 19049 | #: git-bisect.sh:306 |
1b7f4a34 JX |
19050 | #, sh-format |
19051 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
19052 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 19053 | |
90e6ef53 | 19054 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
19055 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
19056 | #. translation. The program will only accept English input | |
19057 | #. at this point. | |
5809aa05 | 19058 | #: git-bisect.sh:312 |
c04f5ac3 JX |
19059 | msgid "Are you sure [Y/n]? " |
19060 | msgstr "您确认么[Y/n]? " | |
19061 | ||
5809aa05 | 19062 | #: git-bisect.sh:324 |
1b7f4a34 | 19063 | #, sh-format |
b694fbb1 | 19064 | msgid "" |
1b7f4a34 JX |
19065 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
19066 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
19067 | msgstr "" |
19068 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 19069 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 19070 | |
5809aa05 | 19071 | #: git-bisect.sh:327 |
1b7f4a34 | 19072 | #, sh-format |
b694fbb1 JX |
19073 | msgid "" |
19074 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
19075 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
19076 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
19077 | msgstr "" |
19078 | "您需要执行 \"git bisect start\" 来开始。\n" | |
19079 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 19080 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 19081 | |
5809aa05 | 19082 | #: git-bisect.sh:398 git-bisect.sh:512 |
b694fbb1 JX |
19083 | msgid "We are not bisecting." |
19084 | msgstr "我们没有在二分查找。" | |
19085 | ||
5809aa05 | 19086 | #: git-bisect.sh:405 |
c04f5ac3 JX |
19087 | #, sh-format |
19088 | msgid "'$invalid' is not a valid commit" | |
19089 | msgstr "'$invalid' 不是一个有效的提交" | |
19090 | ||
5809aa05 | 19091 | #: git-bisect.sh:414 |
c04f5ac3 JX |
19092 | #, sh-format |
19093 | msgid "" | |
19094 | "Could not check out original HEAD '$branch'.\n" | |
19095 | "Try 'git bisect reset <commit>'." | |
19096 | msgstr "" | |
19097 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 19098 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 19099 | |
5809aa05 | 19100 | #: git-bisect.sh:422 |
c04f5ac3 JX |
19101 | msgid "No logfile given" |
19102 | msgstr "未提供日志文件" | |
19103 | ||
5809aa05 | 19104 | #: git-bisect.sh:423 |
c04f5ac3 JX |
19105 | #, sh-format |
19106 | msgid "cannot read $file for replaying" | |
19107 | msgstr "不能读取 $file 来重放" | |
19108 | ||
5809aa05 | 19109 | #: git-bisect.sh:444 |
c04f5ac3 JX |
19110 | msgid "?? what are you talking about?" |
19111 | msgstr "?? 您在说什么?" | |
19112 | ||
5809aa05 JX |
19113 | #: git-bisect.sh:453 |
19114 | msgid "bisect run failed: no command provided." | |
19115 | msgstr "二分查找运行失败:没有提供命令。" | |
19116 | ||
19117 | #: git-bisect.sh:458 | |
b694fbb1 JX |
19118 | #, sh-format |
19119 | msgid "running $command" | |
19120 | msgstr "运行 $command" | |
19121 | ||
5809aa05 | 19122 | #: git-bisect.sh:465 |
b694fbb1 JX |
19123 | #, sh-format |
19124 | msgid "" | |
19125 | "bisect run failed:\n" | |
19126 | "exit code $res from '$command' is < 0 or >= 128" | |
19127 | msgstr "" | |
19128 | "二分查找运行失败:\n" | |
07432cef | 19129 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 19130 | |
5809aa05 | 19131 | #: git-bisect.sh:491 |
b694fbb1 JX |
19132 | msgid "bisect run cannot continue any more" |
19133 | msgstr "二分查找不能继续运行" | |
19134 | ||
5809aa05 | 19135 | #: git-bisect.sh:497 |
b694fbb1 JX |
19136 | #, sh-format |
19137 | msgid "" | |
19138 | "bisect run failed:\n" | |
19139 | "'bisect_state $state' exited with error code $res" | |
19140 | msgstr "" | |
19141 | "二分查找运行失败:\n" | |
19142 | "'bisect_state $state' 退出码为 $res" | |
19143 | ||
5809aa05 | 19144 | #: git-bisect.sh:504 |
b694fbb1 JX |
19145 | msgid "bisect run success" |
19146 | msgstr "二分查找运行成功" | |
c04f5ac3 | 19147 | |
5809aa05 | 19148 | #: git-bisect.sh:533 |
b694fbb1 | 19149 | #, sh-format |
1b7f4a34 JX |
19150 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
19151 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 19152 | |
5809aa05 | 19153 | #: git-bisect.sh:567 |
94550ed3 JX |
19154 | msgid "no terms defined" |
19155 | msgstr "未定义术语" | |
19156 | ||
5809aa05 | 19157 | #: git-bisect.sh:584 |
94550ed3 JX |
19158 | #, sh-format |
19159 | msgid "" | |
19160 | "invalid argument $arg for 'git bisect terms'.\n" | |
19161 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
19162 | msgstr "" | |
19163 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
19164 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
19165 | ||
5c57d762 JX |
19166 | #: git-merge-octopus.sh:46 |
19167 | msgid "" | |
19168 | "Error: Your local changes to the following files would be overwritten by " | |
19169 | "merge" | |
19170 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
19171 | ||
19172 | #: git-merge-octopus.sh:61 | |
19173 | msgid "Automated merge did not work." | |
9a4b694c | 19174 | msgstr "自动合并未生效。" |
5c57d762 JX |
19175 | |
19176 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 19177 | msgid "Should not be doing an octopus." |
5c57d762 JX |
19178 | msgstr "不应该执行章鱼式合并。" |
19179 | ||
19180 | #: git-merge-octopus.sh:73 | |
19181 | #, sh-format | |
19182 | msgid "Unable to find common commit with $pretty_name" | |
19183 | msgstr "无法找到和 $pretty_name 的基线提交" | |
19184 | ||
19185 | #: git-merge-octopus.sh:77 | |
19186 | #, sh-format | |
6937cb4e | 19187 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
19188 | msgstr "已经和 $pretty_name 保持一致" |
19189 | ||
19190 | #: git-merge-octopus.sh:89 | |
19191 | #, sh-format | |
19192 | msgid "Fast-forwarding to: $pretty_name" | |
19193 | msgstr "快进至:$pretty_name" | |
19194 | ||
19195 | #: git-merge-octopus.sh:97 | |
19196 | #, sh-format | |
19197 | msgid "Trying simple merge with $pretty_name" | |
19198 | msgstr "尝试和 $pretty_name 的简单合并" | |
19199 | ||
19200 | #: git-merge-octopus.sh:102 | |
19201 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 19202 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 19203 | |
4c27fcb5 | 19204 | #: git-legacy-rebase.sh:434 |
5c57d762 JX |
19205 | #, sh-format |
19206 | msgid "Could not move back to $head_name" | |
19207 | msgstr "无法移回 $head_name" | |
19208 | ||
4c27fcb5 | 19209 | #: git-legacy-rebase.sh:460 |
649900bc JX |
19210 | #, sh-format |
19211 | msgid "" | |
19212 | "It seems that there is already a $state_dir_base directory, and\n" | |
19213 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
19214 | "case, please try\n" | |
19215 | "\t$cmd_live_rebase\n" | |
19216 | "If that is not the case, please\n" | |
19217 | "\t$cmd_clear_stale_rebase\n" | |
19218 | "and run me again. I am stopping in case you still have something\n" | |
19219 | "valuable there." | |
19220 | msgstr "" | |
98b2761d JX |
19221 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
19222 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
19223 | "\t$cmd_live_rebase\n" |
19224 | "如果不是这样,请执行\n" | |
19225 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 19226 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 19227 | |
4c27fcb5 | 19228 | #: git-legacy-rebase.sh:525 |
fd8cb379 | 19229 | msgid "error: cannot combine '--signoff' with '--preserve-merges'" |
c1ac5258 JX |
19230 | msgstr "错误:不能组合 '--signoff' 和 '--preserve-merges'" |
19231 | ||
4c27fcb5 | 19232 | #: git-legacy-rebase.sh:570 |
649900bc | 19233 | #, sh-format |
5809aa05 JX |
19234 | msgid "invalid upstream '$upstream_name'" |
19235 | msgstr "无效的上游 '$upstream_name'" | |
649900bc | 19236 | |
4c27fcb5 | 19237 | #: git-legacy-rebase.sh:594 |
649900bc JX |
19238 | #, sh-format |
19239 | msgid "$onto_name: there are more than one merge bases" | |
19240 | msgstr "$onto_name: 有一个以上的合并基准" | |
19241 | ||
4c27fcb5 | 19242 | #: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601 |
649900bc JX |
19243 | #, sh-format |
19244 | msgid "$onto_name: there is no merge base" | |
19245 | msgstr "$onto_name: 没有合并基准" | |
19246 | ||
4c27fcb5 | 19247 | #: git-legacy-rebase.sh:606 |
649900bc JX |
19248 | #, sh-format |
19249 | msgid "Does not point to a valid commit: $onto_name" | |
19250 | msgstr "没有指向一个有效的提交:$onto_name" | |
19251 | ||
4c27fcb5 | 19252 | #: git-legacy-rebase.sh:632 |
649900bc | 19253 | #, sh-format |
5809aa05 JX |
19254 | msgid "fatal: no such branch/commit '$branch_name'" |
19255 | msgstr "严重错误:无此分支/提交 '$branch_name'" | |
649900bc | 19256 | |
4c27fcb5 | 19257 | #: git-legacy-rebase.sh:670 |
2e8451e8 JX |
19258 | #, sh-format |
19259 | msgid "Created autostash: $stash_abbrev" | |
19260 | msgstr "创建了 autostash: $stash_abbrev" | |
19261 | ||
4c27fcb5 | 19262 | #: git-legacy-rebase.sh:699 |
649900bc JX |
19263 | #, sh-format |
19264 | msgid "Current branch $branch_name is up to date." | |
19265 | msgstr "当前分支 $branch_name 是最新的。" | |
19266 | ||
4c27fcb5 | 19267 | #: git-legacy-rebase.sh:709 |
649900bc JX |
19268 | #, sh-format |
19269 | msgid "Current branch $branch_name is up to date, rebase forced." | |
19270 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
19271 | ||
4c27fcb5 JX |
19272 | #: git-legacy-rebase.sh:723 |
19273 | #, sh-format | |
19274 | msgid "Changes to $onto:" | |
19275 | msgstr "到 $onto 的变更:" | |
19276 | ||
19277 | #: git-legacy-rebase.sh:725 | |
649900bc JX |
19278 | #, sh-format |
19279 | msgid "Changes from $mb to $onto:" | |
4c27fcb5 | 19280 | msgstr "从 $mb 到 $onto 的变更:" |
649900bc | 19281 | |
4c27fcb5 | 19282 | #: git-legacy-rebase.sh:736 |
649900bc | 19283 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 19284 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 19285 | |
4c27fcb5 | 19286 | #: git-legacy-rebase.sh:746 |
649900bc JX |
19287 | #, sh-format |
19288 | msgid "Fast-forwarded $branch_name to $onto_name." | |
19289 | msgstr "快进 $branch_name 至 $onto_name。" | |
19290 | ||
6937cb4e | 19291 | #: git-stash.sh:61 |
c04f5ac3 JX |
19292 | msgid "git stash clear with parameters is unimplemented" |
19293 | msgstr "git stash clear 不支持参数" | |
19294 | ||
5809aa05 | 19295 | #: git-stash.sh:108 |
c04f5ac3 JX |
19296 | msgid "You do not have the initial commit yet" |
19297 | msgstr "您尚未建立初始提交" | |
19298 | ||
5809aa05 | 19299 | #: git-stash.sh:123 |
c04f5ac3 | 19300 | msgid "Cannot save the current index state" |
90e6ef53 | 19301 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 19302 | |
5809aa05 | 19303 | #: git-stash.sh:138 |
a0b6b246 JX |
19304 | msgid "Cannot save the untracked files" |
19305 | msgstr "无法保存未跟踪文件" | |
19306 | ||
5809aa05 | 19307 | #: git-stash.sh:158 git-stash.sh:171 |
c04f5ac3 JX |
19308 | msgid "Cannot save the current worktree state" |
19309 | msgstr "无法保存当前工作区状态" | |
19310 | ||
5809aa05 | 19311 | #: git-stash.sh:175 |
c04f5ac3 | 19312 | msgid "No changes selected" |
90e6ef53 | 19313 | msgstr "没有选择变更" |
c04f5ac3 | 19314 | |
5809aa05 | 19315 | #: git-stash.sh:178 |
c04f5ac3 | 19316 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 19317 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 19318 | |
5809aa05 | 19319 | #: git-stash.sh:191 |
c04f5ac3 JX |
19320 | msgid "Cannot record working tree state" |
19321 | msgstr "不能记录工作区状态" | |
19322 | ||
5809aa05 | 19323 | #: git-stash.sh:229 |
2e8451e8 JX |
19324 | #, sh-format |
19325 | msgid "Cannot update $ref_stash with $w_commit" | |
19326 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
19327 | ||
5809aa05 | 19328 | #: git-stash.sh:281 |
b694fbb1 | 19329 | #, sh-format |
5809aa05 JX |
19330 | msgid "error: unknown option for 'stash push': $option" |
19331 | msgstr "错误:'stash push' 的未知选项:$option" | |
b694fbb1 | 19332 | |
5809aa05 | 19333 | #: git-stash.sh:295 |
a0b6b246 JX |
19334 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
19335 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
19336 | ||
5809aa05 | 19337 | #: git-stash.sh:303 |
c04f5ac3 JX |
19338 | msgid "No local changes to save" |
19339 | msgstr "没有要保存的本地修改" | |
19340 | ||
5809aa05 | 19341 | #: git-stash.sh:308 |
c04f5ac3 | 19342 | msgid "Cannot initialize stash" |
a4f16749 | 19343 | msgstr "无法初始化贮藏" |
c04f5ac3 | 19344 | |
5809aa05 | 19345 | #: git-stash.sh:312 |
c04f5ac3 JX |
19346 | msgid "Cannot save the current status" |
19347 | msgstr "无法保存当前状态" | |
19348 | ||
5809aa05 | 19349 | #: git-stash.sh:313 |
5c57d762 JX |
19350 | #, sh-format |
19351 | msgid "Saved working directory and index state $stash_msg" | |
19352 | msgstr "保存工作目录和索引状态 $stash_msg" | |
19353 | ||
fd8cb379 | 19354 | #: git-stash.sh:342 |
c04f5ac3 JX |
19355 | msgid "Cannot remove worktree changes" |
19356 | msgstr "无法删除工作区变更" | |
19357 | ||
fd8cb379 | 19358 | #: git-stash.sh:490 |
7aea43ff JX |
19359 | #, sh-format |
19360 | msgid "unknown option: $opt" | |
19361 | msgstr "未知选项: $opt" | |
19362 | ||
fd8cb379 | 19363 | #: git-stash.sh:503 |
a4f16749 JX |
19364 | msgid "No stash entries found." |
19365 | msgstr "未发现贮藏条目。" | |
c04f5ac3 | 19366 | |
fd8cb379 | 19367 | #: git-stash.sh:510 |
c04f5ac3 JX |
19368 | #, sh-format |
19369 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 19370 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 19371 | |
fd8cb379 | 19372 | #: git-stash.sh:525 |
c04f5ac3 | 19373 | #, sh-format |
220c313c JX |
19374 | msgid "$reference is not a valid reference" |
19375 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 19376 | |
fd8cb379 | 19377 | #: git-stash.sh:553 |
c04f5ac3 JX |
19378 | #, sh-format |
19379 | msgid "'$args' is not a stash-like commit" | |
a4f16749 | 19380 | msgstr "'$args' 不是贮藏式提交" |
c04f5ac3 | 19381 | |
fd8cb379 | 19382 | #: git-stash.sh:564 |
c04f5ac3 JX |
19383 | #, sh-format |
19384 | msgid "'$args' is not a stash reference" | |
a4f16749 | 19385 | msgstr "'$args' 不是一个贮藏引用" |
c04f5ac3 | 19386 | |
fd8cb379 | 19387 | #: git-stash.sh:572 |
c04f5ac3 | 19388 | msgid "unable to refresh index" |
90e6ef53 | 19389 | msgstr "无法刷新索引" |
c04f5ac3 | 19390 | |
fd8cb379 | 19391 | #: git-stash.sh:576 |
c04f5ac3 | 19392 | msgid "Cannot apply a stash in the middle of a merge" |
a4f16749 | 19393 | msgstr "无法在合并过程应用贮藏" |
c04f5ac3 | 19394 | |
fd8cb379 | 19395 | #: git-stash.sh:584 |
c04f5ac3 | 19396 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 19397 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 19398 | |
fd8cb379 | 19399 | #: git-stash.sh:586 |
c04f5ac3 | 19400 | msgid "Could not save index tree" |
90e6ef53 | 19401 | msgstr "不能保存索引树" |
c04f5ac3 | 19402 | |
fd8cb379 | 19403 | #: git-stash.sh:595 |
a4f16749 JX |
19404 | msgid "Could not restore untracked files from stash entry" |
19405 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
a0b6b246 | 19406 | |
fd8cb379 | 19407 | #: git-stash.sh:620 |
c04f5ac3 | 19408 | msgid "Cannot unstage modified files" |
160fb2b2 | 19409 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 19410 | |
fd8cb379 | 19411 | #: git-stash.sh:635 |
b694fbb1 | 19412 | msgid "Index was not unstashed." |
a4f16749 | 19413 | msgstr "索引未从贮藏中恢复。" |
b694fbb1 | 19414 | |
fd8cb379 | 19415 | #: git-stash.sh:649 |
a4f16749 JX |
19416 | msgid "The stash entry is kept in case you need it again." |
19417 | msgstr "贮藏条目被保留以备您再次需要。" | |
5c57d762 | 19418 | |
fd8cb379 | 19419 | #: git-stash.sh:658 |
c04f5ac3 JX |
19420 | #, sh-format |
19421 | msgid "Dropped ${REV} ($s)" | |
19422 | msgstr "丢弃了 ${REV} ($s)" | |
19423 | ||
fd8cb379 | 19424 | #: git-stash.sh:659 |
c04f5ac3 JX |
19425 | #, sh-format |
19426 | msgid "${REV}: Could not drop stash entry" | |
a4f16749 | 19427 | msgstr "${REV}:无法丢弃贮藏条目" |
c04f5ac3 | 19428 | |
fd8cb379 | 19429 | #: git-stash.sh:667 |
c04f5ac3 JX |
19430 | msgid "No branch name specified" |
19431 | msgstr "未指定分支名" | |
19432 | ||
fd8cb379 | 19433 | #: git-stash.sh:746 |
c04f5ac3 JX |
19434 | msgid "(To restore them type \"git stash apply\")" |
19435 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
19436 | ||
4c27fcb5 | 19437 | #: git-submodule.sh:198 |
2e8451e8 JX |
19438 | msgid "Relative path can only be used from the toplevel of the working tree" |
19439 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
19440 | ||
4c27fcb5 | 19441 | #: git-submodule.sh:208 |
c04f5ac3 JX |
19442 | #, sh-format |
19443 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 19444 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 19445 | |
4c27fcb5 | 19446 | #: git-submodule.sh:227 |
c04f5ac3 | 19447 | #, sh-format |
170e9899 JX |
19448 | msgid "'$sm_path' already exists in the index" |
19449 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 19450 | |
4c27fcb5 | 19451 | #: git-submodule.sh:230 |
1a79b2f1 JX |
19452 | #, sh-format |
19453 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
19454 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
19455 | ||
4c27fcb5 | 19456 | #: git-submodule.sh:236 |
b694fbb1 JX |
19457 | #, sh-format |
19458 | msgid "" | |
19459 | "The following path is ignored by one of your .gitignore files:\n" | |
19460 | "$sm_path\n" | |
19461 | "Use -f if you really want to add it." | |
19462 | msgstr "" | |
19463 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
19464 | "$sm_path\n" | |
19465 | "如果您确实想添加它,使用 -f 参数。" | |
19466 | ||
4c27fcb5 | 19467 | #: git-submodule.sh:259 |
b694fbb1 JX |
19468 | #, sh-format |
19469 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 19470 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 19471 | |
4c27fcb5 | 19472 | #: git-submodule.sh:261 |
c04f5ac3 | 19473 | #, sh-format |
170e9899 | 19474 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 19475 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 19476 | |
4c27fcb5 | 19477 | #: git-submodule.sh:269 |
07432cef WS |
19478 | #, sh-format |
19479 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 19480 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 19481 | |
4c27fcb5 | 19482 | #: git-submodule.sh:271 |
07432cef WS |
19483 | #, sh-format |
19484 | msgid "" | |
5c57d762 JX |
19485 | "If you want to reuse this local git directory instead of cloning again from\n" |
19486 | " $realrepo\n" | |
19487 | "use the '--force' option. If the local git directory is not the correct " | |
19488 | "repo\n" | |
07432cef WS |
19489 | "or you are unsure what this means choose another name with the '--name' " |
19490 | "option." | |
5c57d762 JX |
19491 | msgstr "" |
19492 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
19493 | " $realrepo\n" | |
19494 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
19495 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 19496 | |
4c27fcb5 | 19497 | #: git-submodule.sh:277 |
07432cef WS |
19498 | #, sh-format |
19499 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
19500 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
19501 | ||
4c27fcb5 | 19502 | #: git-submodule.sh:289 |
c04f5ac3 | 19503 | #, sh-format |
170e9899 JX |
19504 | msgid "Unable to checkout submodule '$sm_path'" |
19505 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 19506 | |
4c27fcb5 | 19507 | #: git-submodule.sh:294 |
c04f5ac3 | 19508 | #, sh-format |
170e9899 JX |
19509 | msgid "Failed to add submodule '$sm_path'" |
19510 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 19511 | |
4c27fcb5 | 19512 | #: git-submodule.sh:303 |
c04f5ac3 | 19513 | #, sh-format |
170e9899 JX |
19514 | msgid "Failed to register submodule '$sm_path'" |
19515 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 19516 | |
4c27fcb5 | 19517 | #: git-submodule.sh:563 |
c04f5ac3 | 19518 | #, sh-format |
2e8451e8 JX |
19519 | msgid "Unable to find current revision in submodule path '$displaypath'" |
19520 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 19521 | |
4c27fcb5 | 19522 | #: git-submodule.sh:573 |
c04f5ac3 | 19523 | #, sh-format |
170e9899 JX |
19524 | msgid "Unable to fetch in submodule path '$sm_path'" |
19525 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 19526 | |
4c27fcb5 | 19527 | #: git-submodule.sh:578 |
5c57d762 JX |
19528 | #, sh-format |
19529 | msgid "" | |
19530 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
19531 | "'$sm_path'" | |
9a4b694c | 19532 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 19533 | |
4c27fcb5 | 19534 | #: git-submodule.sh:596 |
2e8451e8 JX |
19535 | #, sh-format |
19536 | msgid "Unable to fetch in submodule path '$displaypath'" | |
19537 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
19538 | ||
4c27fcb5 | 19539 | #: git-submodule.sh:602 |
5c57d762 JX |
19540 | #, sh-format |
19541 | msgid "" | |
19542 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
19543 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
19544 | msgstr "" |
19545 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 19546 | |
4c27fcb5 | 19547 | #: git-submodule.sh:609 |
6c94aba5 JX |
19548 | #, sh-format |
19549 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
19550 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
19551 | ||
4c27fcb5 | 19552 | #: git-submodule.sh:610 |
c04f5ac3 | 19553 | #, sh-format |
6c94aba5 JX |
19554 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
19555 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
19556 | ||
4c27fcb5 | 19557 | #: git-submodule.sh:614 |
6c94aba5 | 19558 | #, sh-format |
2e8451e8 JX |
19559 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
19560 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 19561 | |
4c27fcb5 | 19562 | #: git-submodule.sh:615 |
c04f5ac3 | 19563 | #, sh-format |
2e8451e8 JX |
19564 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
19565 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 19566 | |
4c27fcb5 | 19567 | #: git-submodule.sh:620 |
c04f5ac3 | 19568 | #, sh-format |
2e8451e8 JX |
19569 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
19570 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 19571 | |
4c27fcb5 | 19572 | #: git-submodule.sh:621 |
c04f5ac3 | 19573 | #, sh-format |
2e8451e8 JX |
19574 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
19575 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 19576 | |
4c27fcb5 | 19577 | #: git-submodule.sh:626 |
c04f5ac3 | 19578 | #, sh-format |
5b04ee3b JX |
19579 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
19580 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 19581 | |
4c27fcb5 | 19582 | #: git-submodule.sh:627 |
c04f5ac3 | 19583 | #, sh-format |
5b04ee3b | 19584 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 19585 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 19586 | |
4c27fcb5 | 19587 | #: git-submodule.sh:658 |
2e8451e8 JX |
19588 | #, sh-format |
19589 | msgid "Failed to recurse into submodule path '$displaypath'" | |
19590 | msgstr "无法递归进子模组路径 '$displaypath'" | |
19591 | ||
4c27fcb5 | 19592 | #: git-submodule.sh:754 |
649900bc JX |
19593 | msgid "The --cached option cannot be used with the --files option" |
19594 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 19595 | |
4c27fcb5 | 19596 | #: git-submodule.sh:806 |
b694fbb1 JX |
19597 | #, sh-format |
19598 | msgid "unexpected mode $mod_dst" | |
19599 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 19600 | |
90e6ef53 | 19601 | # 译者:注意保持前导空格 |
4c27fcb5 | 19602 | #: git-submodule.sh:826 |
c04f5ac3 | 19603 | #, sh-format |
2e8451e8 JX |
19604 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
19605 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 19606 | |
90e6ef53 | 19607 | # 译者:注意保持前导空格 |
4c27fcb5 | 19608 | #: git-submodule.sh:829 |
c04f5ac3 | 19609 | #, sh-format |
2e8451e8 JX |
19610 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
19611 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 19612 | |
90e6ef53 | 19613 | # 译者:注意保持前导空格 |
4c27fcb5 | 19614 | #: git-submodule.sh:832 |
c04f5ac3 | 19615 | #, sh-format |
2e8451e8 JX |
19616 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
19617 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 19618 | |
5b04ee3b JX |
19619 | #: git-parse-remote.sh:89 |
19620 | #, sh-format | |
19621 | msgid "See git-${cmd}(1) for details." | |
19622 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 19623 | |
c1ac5258 JX |
19624 | #: git-rebase--preserve-merges.sh:136 |
19625 | #, sh-format | |
19626 | msgid "Rebasing ($new_count/$total)" | |
19627 | msgstr "变基中($new_count/$total)" | |
19628 | ||
19629 | #: git-rebase--preserve-merges.sh:152 | |
19630 | msgid "" | |
19631 | "\n" | |
19632 | "Commands:\n" | |
19633 | "p, pick <commit> = use commit\n" | |
19634 | "r, reword <commit> = use commit, but edit the commit message\n" | |
19635 | "e, edit <commit> = use commit, but stop for amending\n" | |
19636 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
19637 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
19638 | "x, exec <commit> = run command (the rest of the line) using shell\n" | |
19639 | "d, drop <commit> = remove commit\n" | |
19640 | "l, label <label> = label current HEAD with a name\n" | |
19641 | "t, reset <label> = reset HEAD to a label\n" | |
19642 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
19643 | ". create a merge commit using the original merge commit's\n" | |
19644 | ". message (or the oneline, if no original merge commit was\n" | |
19645 | ". specified). Use -c <commit> to reword the commit message.\n" | |
19646 | "\n" | |
19647 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
19648 | msgstr "" | |
19649 | "\n" | |
19650 | "命令:\n" | |
19651 | "p, pick <提交> = 使用提交\n" | |
19652 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
19653 | "e, edit <提交> = 使用提交,但停下来修补\n" | |
19654 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
19655 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
19656 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
19657 | "d, drop <提交> = 删除提交\n" | |
19658 | "l, label <标签> = 为当前 HEAD 打上标签\n" | |
19659 | "t, reset <标签> = 重置 HEAD 到该标签\n" | |
19660 | "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" | |
19661 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
19662 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
19663 | ". -c <提交> 可以编辑提交说明。\n" | |
19664 | "\n" | |
19665 | "可以对这些行重新排序,将从上至下执行。\n" | |
19666 | ||
19667 | #: git-rebase--preserve-merges.sh:215 | |
5c57d762 JX |
19668 | #, sh-format |
19669 | msgid "" | |
19670 | "You can amend the commit now, with\n" | |
19671 | "\n" | |
19672 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
19673 | "\n" | |
19674 | "Once you are satisfied with your changes, run\n" | |
19675 | "\n" | |
19676 | "\tgit rebase --continue" | |
19677 | msgstr "" | |
19678 | "您现在可以修补这个提交,使用\n" | |
19679 | "\n" | |
19680 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
19681 | "\n" | |
9a4b694c | 19682 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
19683 | "\n" |
19684 | "\tgit rebase --continue" | |
19685 | ||
c1ac5258 | 19686 | #: git-rebase--preserve-merges.sh:240 |
5c57d762 JX |
19687 | #, sh-format |
19688 | msgid "$sha1: not a commit that can be picked" | |
19689 | msgstr "$sha1:不是一个可以被拣选的提交" | |
19690 | ||
c1ac5258 | 19691 | #: git-rebase--preserve-merges.sh:279 |
5c57d762 JX |
19692 | #, sh-format |
19693 | msgid "Invalid commit name: $sha1" | |
19694 | msgstr "无效的提交名:$sha1" | |
19695 | ||
c1ac5258 | 19696 | #: git-rebase--preserve-merges.sh:309 |
5c57d762 JX |
19697 | msgid "Cannot write current commit's replacement sha1" |
19698 | msgstr "不能写入当前提交的替代 sha1" | |
19699 | ||
c1ac5258 | 19700 | #: git-rebase--preserve-merges.sh:360 |
5c57d762 JX |
19701 | #, sh-format |
19702 | msgid "Fast-forward to $sha1" | |
19703 | msgstr "快进到 $sha1" | |
19704 | ||
c1ac5258 | 19705 | #: git-rebase--preserve-merges.sh:362 |
5c57d762 JX |
19706 | #, sh-format |
19707 | msgid "Cannot fast-forward to $sha1" | |
19708 | msgstr "不能快进到 $sha1" | |
19709 | ||
c1ac5258 | 19710 | #: git-rebase--preserve-merges.sh:371 |
5c57d762 JX |
19711 | #, sh-format |
19712 | msgid "Cannot move HEAD to $first_parent" | |
19713 | msgstr "不能移动 HEAD 到 $first_parent" | |
19714 | ||
c1ac5258 | 19715 | #: git-rebase--preserve-merges.sh:376 |
5c57d762 JX |
19716 | #, sh-format |
19717 | msgid "Refusing to squash a merge: $sha1" | |
19718 | msgstr "拒绝压缩一个合并:$sha1" | |
19719 | ||
c1ac5258 | 19720 | #: git-rebase--preserve-merges.sh:394 |
5c57d762 JX |
19721 | #, sh-format |
19722 | msgid "Error redoing merge $sha1" | |
19723 | msgstr "无法重做合并 $sha1" | |
19724 | ||
c1ac5258 | 19725 | #: git-rebase--preserve-merges.sh:403 |
5c57d762 JX |
19726 | #, sh-format |
19727 | msgid "Could not pick $sha1" | |
19728 | msgstr "不能拣选 $sha1" | |
19729 | ||
c1ac5258 | 19730 | #: git-rebase--preserve-merges.sh:412 |
5c57d762 JX |
19731 | #, sh-format |
19732 | msgid "This is the commit message #${n}:" | |
9a4b694c | 19733 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 19734 | |
c1ac5258 | 19735 | #: git-rebase--preserve-merges.sh:417 |
5c57d762 JX |
19736 | #, sh-format |
19737 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 19738 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 19739 | |
c1ac5258 | 19740 | #: git-rebase--preserve-merges.sh:428 |
5c57d762 JX |
19741 | #, sh-format |
19742 | msgid "This is a combination of $count commit." | |
19743 | msgid_plural "This is a combination of $count commits." | |
19744 | msgstr[0] "这是一个 $count 个提交的组合。" | |
19745 | msgstr[1] "这是一个 $count 个提交的组合。" | |
19746 | ||
c1ac5258 | 19747 | #: git-rebase--preserve-merges.sh:437 |
5c57d762 JX |
19748 | #, sh-format |
19749 | msgid "Cannot write $fixup_msg" | |
19750 | msgstr "不能写入 $fixup_msg" | |
19751 | ||
c1ac5258 | 19752 | #: git-rebase--preserve-merges.sh:440 |
5c57d762 JX |
19753 | msgid "This is a combination of 2 commits." |
19754 | msgstr "这是一个 2 个提交的组合。" | |
19755 | ||
c1ac5258 JX |
19756 | #: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 |
19757 | #: git-rebase--preserve-merges.sh:527 | |
5c57d762 JX |
19758 | #, sh-format |
19759 | msgid "Could not apply $sha1... $rest" | |
19760 | msgstr "不能应用 $sha1... $rest" | |
19761 | ||
c1ac5258 | 19762 | #: git-rebase--preserve-merges.sh:556 |
5c57d762 JX |
19763 | #, sh-format |
19764 | msgid "" | |
19765 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
19766 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
19767 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
19768 | "before\n" | |
19769 | "you are able to reword the commit." | |
19770 | msgstr "" | |
19771 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
19772 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
19773 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
19774 | ||
c1ac5258 | 19775 | #: git-rebase--preserve-merges.sh:571 |
5c57d762 JX |
19776 | #, sh-format |
19777 | msgid "Stopped at $sha1_abbrev... $rest" | |
19778 | msgstr "停止在 $sha1_abbrev... $rest" | |
19779 | ||
c1ac5258 | 19780 | #: git-rebase--preserve-merges.sh:586 |
5c57d762 JX |
19781 | #, sh-format |
19782 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 19783 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 19784 | |
c1ac5258 | 19785 | #: git-rebase--preserve-merges.sh:628 |
5c57d762 JX |
19786 | #, sh-format |
19787 | msgid "Executing: $rest" | |
19788 | msgstr "执行:$rest" | |
19789 | ||
c1ac5258 | 19790 | #: git-rebase--preserve-merges.sh:636 |
5c57d762 JX |
19791 | #, sh-format |
19792 | msgid "Execution failed: $rest" | |
19793 | msgstr "执行失败:$rest" | |
19794 | ||
c1ac5258 | 19795 | #: git-rebase--preserve-merges.sh:638 |
5c57d762 JX |
19796 | msgid "and made changes to the index and/or the working tree" |
19797 | msgstr "并且修改索引和/或工作区" | |
19798 | ||
19799 | # 译者:注意保持前导空格 | |
c1ac5258 | 19800 | #: git-rebase--preserve-merges.sh:640 |
5c57d762 JX |
19801 | msgid "" |
19802 | "You can fix the problem, and then run\n" | |
19803 | "\n" | |
19804 | "\tgit rebase --continue" | |
19805 | msgstr "" | |
19806 | "您可以解决这个问题,然后运行\n" | |
19807 | "\n" | |
19808 | "\tgit rebase --continue" | |
19809 | ||
19810 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
c1ac5258 | 19811 | #: git-rebase--preserve-merges.sh:653 |
5c57d762 JX |
19812 | #, sh-format |
19813 | msgid "" | |
19814 | "Execution succeeded: $rest\n" | |
19815 | "but left changes to the index and/or the working tree\n" | |
19816 | "Commit or stash your changes, and then run\n" | |
19817 | "\n" | |
19818 | "\tgit rebase --continue" | |
19819 | msgstr "" | |
19820 | "执行成功:$rest\n" | |
a4f16749 | 19821 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
19822 | "\n" |
19823 | "\tgit rebase --continue" | |
19824 | ||
c1ac5258 | 19825 | #: git-rebase--preserve-merges.sh:664 |
5c57d762 JX |
19826 | #, sh-format |
19827 | msgid "Unknown command: $command $sha1 $rest" | |
19828 | msgstr "未知命令:$command $sha1 $rest" | |
19829 | ||
c1ac5258 | 19830 | #: git-rebase--preserve-merges.sh:665 |
5c57d762 JX |
19831 | msgid "Please fix this using 'git rebase --edit-todo'." |
19832 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
19833 | ||
c1ac5258 | 19834 | #: git-rebase--preserve-merges.sh:700 |
5c57d762 JX |
19835 | #, sh-format |
19836 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 19837 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 19838 | |
c1ac5258 | 19839 | #: git-rebase--preserve-merges.sh:757 |
5c57d762 JX |
19840 | msgid "Could not remove CHERRY_PICK_HEAD" |
19841 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
19842 | ||
c1ac5258 | 19843 | #: git-rebase--preserve-merges.sh:762 |
5c57d762 JX |
19844 | #, sh-format |
19845 | msgid "" | |
19846 | "You have staged changes in your working tree.\n" | |
19847 | "If these changes are meant to be\n" | |
19848 | "squashed into the previous commit, run:\n" | |
19849 | "\n" | |
19850 | " git commit --amend $gpg_sign_opt_quoted\n" | |
19851 | "\n" | |
19852 | "If they are meant to go into a new commit, run:\n" | |
19853 | "\n" | |
19854 | " git commit $gpg_sign_opt_quoted\n" | |
19855 | "\n" | |
a0b6b246 | 19856 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
19857 | "\n" |
19858 | " git rebase --continue\n" | |
19859 | msgstr "" | |
19860 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
19861 | "\n" | |
19862 | " git commit --amend $gpg_sign_opt_quoted\n" | |
19863 | "\n" | |
19864 | "如果这些变更要形成一个新提交,执行:\n" | |
19865 | "\n" | |
19866 | " git commit $gpg_sign_opt_quoted\n" | |
19867 | "\n" | |
9a4b694c | 19868 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
19869 | "\n" |
19870 | " git rebase --continue\n" | |
19871 | ||
c1ac5258 | 19872 | #: git-rebase--preserve-merges.sh:779 |
5c57d762 | 19873 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 19874 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 19875 | |
c1ac5258 | 19876 | #: git-rebase--preserve-merges.sh:784 |
5c57d762 JX |
19877 | msgid "" |
19878 | "You have uncommitted changes in your working tree. Please commit them\n" | |
19879 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
19880 | msgstr "" |
19881 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 19882 | |
c1ac5258 | 19883 | #: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 |
5c57d762 JX |
19884 | msgid "Could not commit staged changes." |
19885 | msgstr "不能提交暂存的修改。" | |
19886 | ||
4c27fcb5 JX |
19887 | #: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 |
19888 | msgid "Could not execute editor" | |
19889 | msgstr "无法运行编辑器" | |
19890 | ||
19891 | #: git-rebase--preserve-merges.sh:845 | |
19892 | #, sh-format | |
19893 | msgid "Could not checkout $switch_to" | |
19894 | msgstr "不能检出 $switch_to" | |
19895 | ||
19896 | #: git-rebase--preserve-merges.sh:852 | |
19897 | msgid "No HEAD?" | |
19898 | msgstr "没有 HEAD?" | |
19899 | ||
19900 | #: git-rebase--preserve-merges.sh:853 | |
19901 | #, sh-format | |
19902 | msgid "Could not create temporary $state_dir" | |
19903 | msgstr "不能创建临时 $state_dir" | |
19904 | ||
19905 | #: git-rebase--preserve-merges.sh:856 | |
19906 | msgid "Could not mark as interactive" | |
19907 | msgstr "不能标记为交互式" | |
19908 | ||
19909 | #: git-rebase--preserve-merges.sh:888 | |
19910 | #, sh-format | |
19911 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
19912 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
19913 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
19914 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
5c57d762 | 19915 | |
c1ac5258 | 19916 | #: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 |
fd8cb379 JX |
19917 | msgid "Could not init rewritten commits" |
19918 | msgstr "不能对重写提交进行初始化" | |
19919 | ||
5c57d762 JX |
19920 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
19921 | #, sh-format | |
19922 | msgid "usage: $dashless $USAGE" | |
19923 | msgstr "用法:$dashless $USAGE" | |
19924 | ||
19925 | #: git-sh-setup.sh:190 | |
19926 | #, sh-format | |
19927 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 19928 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 JX |
19929 | |
19930 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
19931 | #, sh-format | |
19932 | msgid "fatal: $program_name cannot be used without a working tree." | |
19933 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
19934 | ||
19935 | #: git-sh-setup.sh:220 | |
19936 | msgid "Cannot rebase: You have unstaged changes." | |
19937 | msgstr "不能变基:您有未暂存的变更。" | |
19938 | ||
19939 | #: git-sh-setup.sh:223 | |
19940 | msgid "Cannot rewrite branches: You have unstaged changes." | |
19941 | msgstr "不能重写分支:您有未暂存的变更。" | |
19942 | ||
a0b6b246 JX |
19943 | #: git-sh-setup.sh:226 |
19944 | msgid "Cannot pull with rebase: You have unstaged changes." | |
19945 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
19946 | ||
5c57d762 JX |
19947 | #: git-sh-setup.sh:229 |
19948 | #, sh-format | |
19949 | msgid "Cannot $action: You have unstaged changes." | |
19950 | msgstr "不能 $action:您有未暂存的变更。" | |
19951 | ||
19952 | #: git-sh-setup.sh:242 | |
19953 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
19954 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
19955 | ||
a0b6b246 JX |
19956 | #: git-sh-setup.sh:245 |
19957 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." | |
19958 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
19959 | ||
5c57d762 JX |
19960 | #: git-sh-setup.sh:248 |
19961 | #, sh-format | |
19962 | msgid "Cannot $action: Your index contains uncommitted changes." | |
19963 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
19964 | ||
a0b6b246 JX |
19965 | #: git-sh-setup.sh:252 |
19966 | msgid "Additionally, your index contains uncommitted changes." | |
19967 | msgstr "而且您的索引中包含未提交的变更。" | |
19968 | ||
5c57d762 JX |
19969 | #: git-sh-setup.sh:372 |
19970 | msgid "You need to run this command from the toplevel of the working tree." | |
19971 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
19972 | ||
19973 | #: git-sh-setup.sh:377 | |
19974 | msgid "Unable to determine absolute path of git directory" | |
19975 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 19976 | |
1a79b2f1 | 19977 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
a4f16749 | 19978 | #: git-add--interactive.perl:196 |
1a79b2f1 JX |
19979 | #, perl-format |
19980 | msgid "%12s %12s %s" | |
19981 | msgstr "%12s %12s %s" | |
19982 | ||
a4f16749 | 19983 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
19984 | msgid "staged" |
19985 | msgstr "缓存" | |
19986 | ||
a4f16749 | 19987 | #: git-add--interactive.perl:197 |
1a79b2f1 JX |
19988 | msgid "unstaged" |
19989 | msgstr "未缓存" | |
19990 | ||
fd8cb379 | 19991 | #: git-add--interactive.perl:253 git-add--interactive.perl:278 |
1a79b2f1 JX |
19992 | msgid "binary" |
19993 | msgstr "二进制" | |
19994 | ||
fd8cb379 | 19995 | #: git-add--interactive.perl:262 git-add--interactive.perl:316 |
1a79b2f1 JX |
19996 | msgid "nothing" |
19997 | msgstr "无" | |
19998 | ||
fd8cb379 | 19999 | #: git-add--interactive.perl:298 git-add--interactive.perl:313 |
1a79b2f1 JX |
20000 | msgid "unchanged" |
20001 | msgstr "没有修改" | |
20002 | ||
fd8cb379 | 20003 | #: git-add--interactive.perl:609 |
1a79b2f1 JX |
20004 | #, perl-format |
20005 | msgid "added %d path\n" | |
20006 | msgid_plural "added %d paths\n" | |
20007 | msgstr[0] "增加了 %d 个路径\n" | |
20008 | msgstr[1] "增加了 %d 个路径\n" | |
20009 | ||
fd8cb379 | 20010 | #: git-add--interactive.perl:612 |
1a79b2f1 JX |
20011 | #, perl-format |
20012 | msgid "updated %d path\n" | |
20013 | msgid_plural "updated %d paths\n" | |
20014 | msgstr[0] "更新了 %d 个路径\n" | |
20015 | msgstr[1] "更新了 %d 个路径\n" | |
20016 | ||
fd8cb379 | 20017 | #: git-add--interactive.perl:615 |
1a79b2f1 JX |
20018 | #, perl-format |
20019 | msgid "reverted %d path\n" | |
20020 | msgid_plural "reverted %d paths\n" | |
20021 | msgstr[0] "还原了 %d 个路径\n" | |
20022 | msgstr[1] "还原了 %d 个路径\n" | |
20023 | ||
fd8cb379 | 20024 | #: git-add--interactive.perl:618 |
1a79b2f1 JX |
20025 | #, perl-format |
20026 | msgid "touched %d path\n" | |
20027 | msgid_plural "touched %d paths\n" | |
20028 | msgstr[0] "触碰了 %d 个路径\n" | |
20029 | msgstr[1] "触碰了 %d 个路径\n" | |
20030 | ||
fd8cb379 | 20031 | #: git-add--interactive.perl:627 |
1a79b2f1 JX |
20032 | msgid "Update" |
20033 | msgstr "更新" | |
20034 | ||
fd8cb379 | 20035 | #: git-add--interactive.perl:639 |
1a79b2f1 JX |
20036 | msgid "Revert" |
20037 | msgstr "还原" | |
20038 | ||
fd8cb379 | 20039 | #: git-add--interactive.perl:662 |
1a79b2f1 JX |
20040 | #, perl-format |
20041 | msgid "note: %s is untracked now.\n" | |
20042 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
20043 | ||
fd8cb379 | 20044 | #: git-add--interactive.perl:673 |
1a79b2f1 JX |
20045 | msgid "Add untracked" |
20046 | msgstr "添加未跟踪的" | |
20047 | ||
fd8cb379 | 20048 | #: git-add--interactive.perl:679 |
1a79b2f1 JX |
20049 | msgid "No untracked files.\n" |
20050 | msgstr "没有未跟踪的文件。\n" | |
20051 | ||
fd8cb379 | 20052 | #: git-add--interactive.perl:1033 |
1a79b2f1 JX |
20053 | msgid "" |
20054 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
20055 | "marked for staging." | |
20056 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
20057 | ||
fd8cb379 | 20058 | #: git-add--interactive.perl:1036 |
1a79b2f1 JX |
20059 | msgid "" |
20060 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
20061 | "marked for stashing." | |
a4f16749 | 20062 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 20063 | |
fd8cb379 | 20064 | #: git-add--interactive.perl:1039 |
1a79b2f1 JX |
20065 | msgid "" |
20066 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
20067 | "marked for unstaging." | |
20068 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
20069 | ||
fd8cb379 | 20070 | #: git-add--interactive.perl:1042 git-add--interactive.perl:1051 |
1a79b2f1 JX |
20071 | msgid "" |
20072 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
20073 | "marked for applying." | |
20074 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
20075 | ||
fd8cb379 | 20076 | #: git-add--interactive.perl:1045 git-add--interactive.perl:1048 |
1a79b2f1 JX |
20077 | msgid "" |
20078 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
20079 | "marked for discarding." | |
20080 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
20081 | ||
fd8cb379 | 20082 | #: git-add--interactive.perl:1085 |
1a79b2f1 JX |
20083 | #, perl-format |
20084 | msgid "failed to open hunk edit file for writing: %s" | |
c1ac5258 | 20085 | msgstr "为写入打开块编辑文件失败:%s" |
1a79b2f1 | 20086 | |
fd8cb379 | 20087 | #: git-add--interactive.perl:1086 |
1a79b2f1 JX |
20088 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
20089 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
20090 | ||
fd8cb379 | 20091 | #: git-add--interactive.perl:1092 |
1a79b2f1 JX |
20092 | #, perl-format |
20093 | msgid "" | |
20094 | "---\n" | |
20095 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
20096 | "To remove '%s' lines, delete them.\n" | |
20097 | "Lines starting with %s will be removed.\n" | |
20098 | msgstr "" | |
20099 | "---\n" | |
20100 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
20101 | "要删除 '%s' 开始的行,删除它们。\n" | |
20102 | "以 %s 开始的行将被删除。\n" | |
20103 | ||
20104 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. | |
fd8cb379 | 20105 | #: git-add--interactive.perl:1100 |
1a79b2f1 JX |
20106 | msgid "" |
20107 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
20108 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
20109 | "aborted and the hunk is left unchanged.\n" | |
20110 | msgstr "" | |
20111 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
20112 | "此次编辑被终止,该块不会被修改。\n" | |
20113 | ||
fd8cb379 | 20114 | #: git-add--interactive.perl:1114 |
1a79b2f1 JX |
20115 | #, perl-format |
20116 | msgid "failed to open hunk edit file for reading: %s" | |
20117 | msgstr "无法读取块编辑文件:%s" | |
20118 | ||
20119 | #. TRANSLATORS: do not translate [y/n] | |
20120 | #. The program will only accept that input | |
20121 | #. at this point. | |
20122 | #. Consider translating (saying "no" discards!) as | |
20123 | #. (saying "n" for "no" discards!) if the translation | |
20124 | #. of the word "no" does not start with n. | |
fd8cb379 | 20125 | #: git-add--interactive.perl:1213 |
1a79b2f1 JX |
20126 | msgid "" |
20127 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
20128 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
20129 | ||
fd8cb379 | 20130 | #: git-add--interactive.perl:1222 |
1a79b2f1 JX |
20131 | msgid "" |
20132 | "y - stage this hunk\n" | |
20133 | "n - do not stage this hunk\n" | |
20134 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
20135 | "a - stage this hunk and all later hunks in the file\n" | |
20136 | "d - do not stage this hunk or any of the later hunks in the file" | |
20137 | msgstr "" | |
20138 | "y - 暂存该块\n" | |
20139 | "n - 不要暂存该块\n" | |
20140 | "q - 退出。不暂存该块及后面的全部块\n" | |
20141 | "a - 暂存该块和本文件中后面的全部块\n" | |
20142 | "d - 不暂存该块和本文件中后面的全部块" | |
20143 | ||
fd8cb379 | 20144 | #: git-add--interactive.perl:1228 |
1a79b2f1 JX |
20145 | msgid "" |
20146 | "y - stash this hunk\n" | |
20147 | "n - do not stash this hunk\n" | |
20148 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
20149 | "a - stash this hunk and all later hunks in the file\n" | |
20150 | "d - do not stash this hunk or any of the later hunks in the file" | |
20151 | msgstr "" | |
20152 | "y - 贮藏该块\n" | |
20153 | "n - 不要贮藏该块\n" | |
20154 | "q - 退出。不贮藏该块及后面的全部块\n" | |
20155 | "a - 贮藏该块和本文件中后面的全部块\n" | |
20156 | "d - 不贮藏该块和本文件中后面的全部块" | |
20157 | ||
fd8cb379 | 20158 | #: git-add--interactive.perl:1234 |
1a79b2f1 JX |
20159 | msgid "" |
20160 | "y - unstage this hunk\n" | |
20161 | "n - do not unstage this hunk\n" | |
20162 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
20163 | "a - unstage this hunk and all later hunks in the file\n" | |
20164 | "d - do not unstage this hunk or any of the later hunks in the file" | |
20165 | msgstr "" | |
20166 | "y - 不暂存该块\n" | |
20167 | "n - 不要不暂存该块\n" | |
20168 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
20169 | "a - 不暂存该块和本文件中后面的全部块\n" | |
20170 | "d - 不要不暂存该块和本文件中后面的全部块" | |
20171 | ||
fd8cb379 | 20172 | #: git-add--interactive.perl:1240 |
1a79b2f1 JX |
20173 | msgid "" |
20174 | "y - apply this hunk to index\n" | |
20175 | "n - do not apply this hunk to index\n" | |
20176 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
20177 | "a - apply this hunk and all later hunks in the file\n" | |
20178 | "d - do not apply this hunk or any of the later hunks in the file" | |
20179 | msgstr "" | |
20180 | "y - 在索引中应用该块\n" | |
20181 | "n - 不要在索引中应用该块\n" | |
20182 | "q - 退出。不要应用该块及后面的全部块\n" | |
20183 | "a - 应用该块和本文件中后面的全部块\n" | |
20184 | "d - 不要应用该块和本文件中后面的全部块" | |
20185 | ||
fd8cb379 | 20186 | #: git-add--interactive.perl:1246 |
1a79b2f1 JX |
20187 | msgid "" |
20188 | "y - discard this hunk from worktree\n" | |
20189 | "n - do not discard this hunk from worktree\n" | |
20190 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
20191 | "a - discard this hunk and all later hunks in the file\n" | |
20192 | "d - do not discard this hunk or any of the later hunks in the file" | |
20193 | msgstr "" | |
20194 | "y - 在工作区中丢弃该块\n" | |
20195 | "n - 不要在工作区中丢弃该块\n" | |
20196 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
20197 | "a - 丢弃该块和本文件中后面的全部块\n" | |
20198 | "d - 不要丢弃该块和本文件中后面的全部块" | |
20199 | ||
fd8cb379 | 20200 | #: git-add--interactive.perl:1252 |
1a79b2f1 JX |
20201 | msgid "" |
20202 | "y - discard this hunk from index and worktree\n" | |
20203 | "n - do not discard this hunk from index and worktree\n" | |
20204 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
20205 | "a - discard this hunk and all later hunks in the file\n" | |
20206 | "d - do not discard this hunk or any of the later hunks in the file" | |
20207 | msgstr "" | |
20208 | "y - 在索引和工作区中丢弃该块\n" | |
20209 | "n - 不要在索引和工作区中丢弃该块\n" | |
20210 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
20211 | "a - 丢弃该块和本文件中后面的全部块\n" | |
20212 | "d - 不要丢弃该块和本文件中后面的全部块" | |
20213 | ||
fd8cb379 | 20214 | #: git-add--interactive.perl:1258 |
1a79b2f1 JX |
20215 | msgid "" |
20216 | "y - apply this hunk to index and worktree\n" | |
20217 | "n - do not apply this hunk to index and worktree\n" | |
20218 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
20219 | "a - apply this hunk and all later hunks in the file\n" | |
20220 | "d - do not apply this hunk or any of the later hunks in the file" | |
20221 | msgstr "" | |
20222 | "y - 在索引和工作区中应用该块\n" | |
20223 | "n - 不要在索引和工作区中应用该块\n" | |
20224 | "q - 退出。不要应用该块及后面的全部块\n" | |
20225 | "a - 应用该块和本文件中后面的全部块\n" | |
20226 | "d - 不要应用该块和本文件中后面的全部块" | |
20227 | ||
fd8cb379 | 20228 | #: git-add--interactive.perl:1273 |
1a79b2f1 JX |
20229 | msgid "" |
20230 | "g - select a hunk to go to\n" | |
20231 | "/ - search for a hunk matching the given regex\n" | |
20232 | "j - leave this hunk undecided, see next undecided hunk\n" | |
20233 | "J - leave this hunk undecided, see next hunk\n" | |
20234 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
20235 | "K - leave this hunk undecided, see previous hunk\n" | |
20236 | "s - split the current hunk into smaller hunks\n" | |
20237 | "e - manually edit the current hunk\n" | |
20238 | "? - print help\n" | |
20239 | msgstr "" | |
20240 | "g - 选择跳转到一个块\n" | |
20241 | "/ - 查找和给定正则表达式匹配的块\n" | |
20242 | "j - 维持该块未决状态,查看下一个未决块\n" | |
20243 | "J - 维持该块未决状态,查看下一个块\n" | |
20244 | "k - 维持该块未决状态,查看上一个未决块\n" | |
20245 | "K - 维持该块未决状态,查看上一个块\n" | |
20246 | "s - 拆分当前块为更小的块\n" | |
20247 | "e - 手动编辑当前块\n" | |
20248 | "? - 显示帮助\n" | |
20249 | ||
fd8cb379 | 20250 | #: git-add--interactive.perl:1304 |
1a79b2f1 JX |
20251 | msgid "The selected hunks do not apply to the index!\n" |
20252 | msgstr "选中的块不能应用到索引!\n" | |
20253 | ||
fd8cb379 | 20254 | #: git-add--interactive.perl:1305 |
1a79b2f1 JX |
20255 | msgid "Apply them to the worktree anyway? " |
20256 | msgstr "无论如何都要应用到工作区么?" | |
20257 | ||
fd8cb379 | 20258 | #: git-add--interactive.perl:1308 |
1a79b2f1 JX |
20259 | msgid "Nothing was applied.\n" |
20260 | msgstr "未应用。\n" | |
20261 | ||
fd8cb379 | 20262 | #: git-add--interactive.perl:1319 |
1a79b2f1 JX |
20263 | #, perl-format |
20264 | msgid "ignoring unmerged: %s\n" | |
20265 | msgstr "忽略未合入的:%s\n" | |
20266 | ||
fd8cb379 | 20267 | #: git-add--interactive.perl:1328 |
1a79b2f1 JX |
20268 | msgid "Only binary files changed.\n" |
20269 | msgstr "只有二进制文件被修改。\n" | |
20270 | ||
fd8cb379 | 20271 | #: git-add--interactive.perl:1330 |
1a79b2f1 JX |
20272 | msgid "No changes.\n" |
20273 | msgstr "没有修改。\n" | |
20274 | ||
fd8cb379 | 20275 | #: git-add--interactive.perl:1338 |
1a79b2f1 JX |
20276 | msgid "Patch update" |
20277 | msgstr "补丁更新" | |
20278 | ||
fd8cb379 | 20279 | #: git-add--interactive.perl:1390 |
1a79b2f1 | 20280 | #, perl-format |
31e5e17b JX |
20281 | msgid "Stage mode change [y,n,q,a,d%s,?]? " |
20282 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20283 | |
fd8cb379 | 20284 | #: git-add--interactive.perl:1391 |
1a79b2f1 | 20285 | #, perl-format |
31e5e17b JX |
20286 | msgid "Stage deletion [y,n,q,a,d%s,?]? " |
20287 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20288 | |
fd8cb379 | 20289 | #: git-add--interactive.perl:1392 |
1a79b2f1 | 20290 | #, perl-format |
31e5e17b JX |
20291 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " |
20292 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20293 | |
fd8cb379 | 20294 | #: git-add--interactive.perl:1395 |
1a79b2f1 | 20295 | #, perl-format |
31e5e17b JX |
20296 | msgid "Stash mode change [y,n,q,a,d%s,?]? " |
20297 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20298 | |
fd8cb379 | 20299 | #: git-add--interactive.perl:1396 |
1a79b2f1 | 20300 | #, perl-format |
31e5e17b JX |
20301 | msgid "Stash deletion [y,n,q,a,d%s,?]? " |
20302 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20303 | |
fd8cb379 | 20304 | #: git-add--interactive.perl:1397 |
1a79b2f1 | 20305 | #, perl-format |
31e5e17b JX |
20306 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " |
20307 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20308 | |
fd8cb379 | 20309 | #: git-add--interactive.perl:1400 |
1a79b2f1 | 20310 | #, perl-format |
31e5e17b JX |
20311 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " |
20312 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20313 | |
fd8cb379 | 20314 | #: git-add--interactive.perl:1401 |
1a79b2f1 | 20315 | #, perl-format |
31e5e17b JX |
20316 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " |
20317 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20318 | |
fd8cb379 | 20319 | #: git-add--interactive.perl:1402 |
1a79b2f1 | 20320 | #, perl-format |
31e5e17b JX |
20321 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " |
20322 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20323 | |
fd8cb379 | 20324 | #: git-add--interactive.perl:1405 |
1a79b2f1 | 20325 | #, perl-format |
31e5e17b JX |
20326 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " |
20327 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20328 | |
fd8cb379 | 20329 | #: git-add--interactive.perl:1406 |
1a79b2f1 | 20330 | #, perl-format |
31e5e17b JX |
20331 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " |
20332 | msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20333 | |
fd8cb379 | 20334 | #: git-add--interactive.perl:1407 |
1a79b2f1 | 20335 | #, perl-format |
31e5e17b | 20336 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " |
610f8099 | 20337 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " |
1a79b2f1 | 20338 | |
fd8cb379 | 20339 | #: git-add--interactive.perl:1410 |
1a79b2f1 | 20340 | #, perl-format |
31e5e17b JX |
20341 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " |
20342 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20343 | |
fd8cb379 | 20344 | #: git-add--interactive.perl:1411 |
1a79b2f1 | 20345 | #, perl-format |
31e5e17b JX |
20346 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " |
20347 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20348 | |
fd8cb379 | 20349 | #: git-add--interactive.perl:1412 |
1a79b2f1 | 20350 | #, perl-format |
31e5e17b JX |
20351 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " |
20352 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20353 | |
fd8cb379 | 20354 | #: git-add--interactive.perl:1415 |
1a79b2f1 | 20355 | #, perl-format |
31e5e17b JX |
20356 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " |
20357 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20358 | |
fd8cb379 | 20359 | #: git-add--interactive.perl:1416 |
1a79b2f1 | 20360 | #, perl-format |
31e5e17b JX |
20361 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " |
20362 | msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20363 | |
fd8cb379 | 20364 | #: git-add--interactive.perl:1417 |
1a79b2f1 | 20365 | #, perl-format |
31e5e17b JX |
20366 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " |
20367 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20368 | |
fd8cb379 | 20369 | #: git-add--interactive.perl:1420 |
1a79b2f1 | 20370 | #, perl-format |
31e5e17b JX |
20371 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " |
20372 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20373 | |
fd8cb379 | 20374 | #: git-add--interactive.perl:1421 |
1a79b2f1 | 20375 | #, perl-format |
31e5e17b JX |
20376 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " |
20377 | msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
1a79b2f1 | 20378 | |
fd8cb379 | 20379 | #: git-add--interactive.perl:1422 |
1a79b2f1 | 20380 | #, perl-format |
31e5e17b JX |
20381 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " |
20382 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
20383 | ||
fd8cb379 | 20384 | #: git-add--interactive.perl:1522 |
31e5e17b JX |
20385 | msgid "No other hunks to goto\n" |
20386 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 20387 | |
fd8cb379 | 20388 | #: git-add--interactive.perl:1529 |
1a79b2f1 JX |
20389 | msgid "go to which hunk (<ret> to see more)? " |
20390 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
20391 | ||
fd8cb379 | 20392 | #: git-add--interactive.perl:1531 |
1a79b2f1 JX |
20393 | msgid "go to which hunk? " |
20394 | msgstr "跳转到哪个块?" | |
20395 | ||
fd8cb379 | 20396 | #: git-add--interactive.perl:1540 |
1a79b2f1 JX |
20397 | #, perl-format |
20398 | msgid "Invalid number: '%s'\n" | |
20399 | msgstr "无效数字:'%s'\n" | |
20400 | ||
fd8cb379 | 20401 | #: git-add--interactive.perl:1545 |
1a79b2f1 JX |
20402 | #, perl-format |
20403 | msgid "Sorry, only %d hunk available.\n" | |
20404 | msgid_plural "Sorry, only %d hunks available.\n" | |
20405 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
20406 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
20407 | ||
fd8cb379 | 20408 | #: git-add--interactive.perl:1571 |
31e5e17b JX |
20409 | msgid "No other hunks to search\n" |
20410 | msgstr "没有其它可供查找的块\n" | |
20411 | ||
fd8cb379 | 20412 | #: git-add--interactive.perl:1575 |
1a79b2f1 JX |
20413 | msgid "search for regex? " |
20414 | msgstr "使用正则表达式搜索?" | |
20415 | ||
fd8cb379 | 20416 | #: git-add--interactive.perl:1588 |
1a79b2f1 JX |
20417 | #, perl-format |
20418 | msgid "Malformed search regexp %s: %s\n" | |
20419 | msgstr "错误的正则表达式 %s:%s\n" | |
20420 | ||
fd8cb379 | 20421 | #: git-add--interactive.perl:1598 |
1a79b2f1 JX |
20422 | msgid "No hunk matches the given pattern\n" |
20423 | msgstr "没有和给定模式相匹配的快\n" | |
20424 | ||
fd8cb379 | 20425 | #: git-add--interactive.perl:1610 git-add--interactive.perl:1632 |
1a79b2f1 JX |
20426 | msgid "No previous hunk\n" |
20427 | msgstr "没有前一个块\n" | |
20428 | ||
fd8cb379 | 20429 | #: git-add--interactive.perl:1619 git-add--interactive.perl:1638 |
1a79b2f1 JX |
20430 | msgid "No next hunk\n" |
20431 | msgstr "没有下一个块\n" | |
20432 | ||
fd8cb379 | 20433 | #: git-add--interactive.perl:1644 |
31e5e17b JX |
20434 | msgid "Sorry, cannot split this hunk\n" |
20435 | msgstr "对不起,不能拆分这个块\n" | |
20436 | ||
fd8cb379 | 20437 | #: git-add--interactive.perl:1650 |
1a79b2f1 JX |
20438 | #, perl-format |
20439 | msgid "Split into %d hunk.\n" | |
20440 | msgid_plural "Split into %d hunks.\n" | |
20441 | msgstr[0] "拆分为 %d 块。\n" | |
20442 | msgstr[1] "拆分为 %d 块。\n" | |
20443 | ||
fd8cb379 | 20444 | #: git-add--interactive.perl:1660 |
31e5e17b JX |
20445 | msgid "Sorry, cannot edit this hunk\n" |
20446 | msgstr "对不起,不能编辑这个块\n" | |
20447 | ||
fd8cb379 | 20448 | #: git-add--interactive.perl:1706 |
1a79b2f1 JX |
20449 | msgid "Review diff" |
20450 | msgstr "检视 diff" | |
20451 | ||
20452 | #. TRANSLATORS: please do not translate the command names | |
20453 | #. 'status', 'update', 'revert', etc. | |
fd8cb379 | 20454 | #: git-add--interactive.perl:1725 |
1a79b2f1 JX |
20455 | msgid "" |
20456 | "status - show paths with changes\n" | |
20457 | "update - add working tree state to the staged set of changes\n" | |
20458 | "revert - revert staged set of changes back to the HEAD version\n" | |
20459 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 20460 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
20461 | "add untracked - add contents of untracked files to the staged set of " |
20462 | "changes\n" | |
20463 | msgstr "" | |
20464 | "status - 显示含变更的路径\n" | |
20465 | "update - 添加工作区状态至暂存列表\n" | |
20466 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
20467 | "patch - 挑选块并且有选择地更新\n" | |
20468 | "diff - 显示 HEAD 和索引间差异\n" | |
20469 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
20470 | ||
fd8cb379 JX |
20471 | #: git-add--interactive.perl:1742 git-add--interactive.perl:1747 |
20472 | #: git-add--interactive.perl:1750 git-add--interactive.perl:1757 | |
20473 | #: git-add--interactive.perl:1761 git-add--interactive.perl:1767 | |
1a79b2f1 JX |
20474 | msgid "missing --" |
20475 | msgstr "缺失 --" | |
20476 | ||
fd8cb379 | 20477 | #: git-add--interactive.perl:1763 |
1a79b2f1 JX |
20478 | #, perl-format |
20479 | msgid "unknown --patch mode: %s" | |
20480 | msgstr "未知的 --patch 模式:%s" | |
20481 | ||
fd8cb379 | 20482 | #: git-add--interactive.perl:1769 git-add--interactive.perl:1775 |
1a79b2f1 JX |
20483 | #, perl-format |
20484 | msgid "invalid argument %s, expecting --" | |
20485 | msgstr "无效的参数 %s,期望是 --" | |
20486 | ||
4c27fcb5 | 20487 | #: git-send-email.perl:138 |
1a79b2f1 JX |
20488 | msgid "local zone differs from GMT by a non-minute interval\n" |
20489 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
20490 | ||
4c27fcb5 | 20491 | #: git-send-email.perl:145 git-send-email.perl:151 |
1a79b2f1 JX |
20492 | msgid "local time offset greater than or equal to 24 hours\n" |
20493 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
20494 | ||
4c27fcb5 | 20495 | #: git-send-email.perl:219 git-send-email.perl:225 |
1a79b2f1 JX |
20496 | msgid "the editor exited uncleanly, aborting everything" |
20497 | msgstr "编辑器非正常退出,终止所有操作" | |
20498 | ||
4c27fcb5 | 20499 | #: git-send-email.perl:302 |
1a79b2f1 JX |
20500 | #, perl-format |
20501 | msgid "" | |
20502 | "'%s' contains an intermediate version of the email you were composing.\n" | |
20503 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
20504 | ||
4c27fcb5 | 20505 | #: git-send-email.perl:307 |
1a79b2f1 JX |
20506 | #, perl-format |
20507 | msgid "'%s.final' contains the composed email.\n" | |
20508 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
20509 | ||
4c27fcb5 | 20510 | #: git-send-email.perl:326 |
1a79b2f1 JX |
20511 | msgid "--dump-aliases incompatible with other options\n" |
20512 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
20513 | ||
4c27fcb5 | 20514 | #: git-send-email.perl:395 git-send-email.perl:650 |
1a79b2f1 JX |
20515 | msgid "Cannot run git format-patch from outside a repository\n" |
20516 | msgstr "不能在仓库之外运行 git format-patch\n" | |
20517 | ||
4c27fcb5 | 20518 | #: git-send-email.perl:398 |
31e5e17b JX |
20519 | msgid "" |
20520 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
20521 | "configuration option)\n" | |
20522 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
20523 | ||
4c27fcb5 | 20524 | #: git-send-email.perl:468 |
1a79b2f1 JX |
20525 | #, perl-format |
20526 | msgid "Unknown --suppress-cc field: '%s'\n" | |
20527 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
20528 | ||
4c27fcb5 | 20529 | #: git-send-email.perl:497 |
1a79b2f1 JX |
20530 | #, perl-format |
20531 | msgid "Unknown --confirm setting: '%s'\n" | |
20532 | msgstr "未知的 --confirm 设置:'%s'\n" | |
20533 | ||
4c27fcb5 | 20534 | #: git-send-email.perl:525 |
1a79b2f1 JX |
20535 | #, perl-format |
20536 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
20537 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
20538 | ||
4c27fcb5 | 20539 | #: git-send-email.perl:527 |
1a79b2f1 JX |
20540 | #, perl-format |
20541 | msgid "warning: `:include:` not supported: %s\n" | |
20542 | msgstr "警告:不支持 `:include:`:%s\n" | |
20543 | ||
4c27fcb5 | 20544 | #: git-send-email.perl:529 |
1a79b2f1 JX |
20545 | #, perl-format |
20546 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
20547 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
20548 | ||
4c27fcb5 | 20549 | #: git-send-email.perl:534 |
1a79b2f1 JX |
20550 | #, perl-format |
20551 | msgid "warning: sendmail line is not recognized: %s\n" | |
20552 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
20553 | ||
4c27fcb5 | 20554 | #: git-send-email.perl:616 |
1a79b2f1 JX |
20555 | #, perl-format |
20556 | msgid "" | |
20557 | "File '%s' exists but it could also be the range of commits\n" | |
20558 | "to produce patches for. Please disambiguate by...\n" | |
20559 | "\n" | |
20560 | " * Saying \"./%s\" if you mean a file; or\n" | |
20561 | " * Giving --format-patch option if you mean a range.\n" | |
20562 | msgstr "" | |
87cb7997 JX |
20563 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
20564 | "歧义:\n" | |
1a79b2f1 JX |
20565 | "\n" |
20566 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
20567 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
20568 | ||
4c27fcb5 | 20569 | #: git-send-email.perl:637 |
1a79b2f1 JX |
20570 | #, perl-format |
20571 | msgid "Failed to opendir %s: %s" | |
20572 | msgstr "无法打开目录 %s: %s" | |
20573 | ||
4c27fcb5 | 20574 | #: git-send-email.perl:661 |
1a79b2f1 JX |
20575 | #, perl-format |
20576 | msgid "" | |
20577 | "fatal: %s: %s\n" | |
20578 | "warning: no patches were sent\n" | |
20579 | msgstr "" | |
20580 | "严重:%s:%s\n" | |
20581 | "警告:补丁未能发送\n" | |
20582 | ||
4c27fcb5 | 20583 | #: git-send-email.perl:672 |
1a79b2f1 JX |
20584 | msgid "" |
20585 | "\n" | |
20586 | "No patch files specified!\n" | |
20587 | "\n" | |
87cb7997 JX |
20588 | msgstr "" |
20589 | "\n" | |
20590 | "未指定补丁文件!\n" | |
20591 | "\n" | |
1a79b2f1 | 20592 | |
4c27fcb5 | 20593 | #: git-send-email.perl:685 |
1a79b2f1 JX |
20594 | #, perl-format |
20595 | msgid "No subject line in %s?" | |
20596 | msgstr "在 %s 中没有标题行?" | |
20597 | ||
4c27fcb5 | 20598 | #: git-send-email.perl:695 |
1a79b2f1 JX |
20599 | #, perl-format |
20600 | msgid "Failed to open for writing %s: %s" | |
c1ac5258 | 20601 | msgstr "为写入打开 %s 失败: %s" |
1a79b2f1 | 20602 | |
4c27fcb5 | 20603 | #: git-send-email.perl:706 |
1a79b2f1 JX |
20604 | msgid "" |
20605 | "Lines beginning in \"GIT:\" will be removed.\n" | |
20606 | "Consider including an overall diffstat or table of contents\n" | |
20607 | "for the patch you are writing.\n" | |
20608 | "\n" | |
20609 | "Clear the body content if you don't wish to send a summary.\n" | |
20610 | msgstr "" | |
20611 | "以 \"GIT:\" 开头的行将被删除。\n" | |
20612 | "考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" | |
20613 | "\n" | |
20614 | "如果您不想发送摘要,清除内容。\n" | |
20615 | ||
4c27fcb5 | 20616 | #: git-send-email.perl:730 |
1a79b2f1 JX |
20617 | #, perl-format |
20618 | msgid "Failed to open %s: %s" | |
20619 | msgstr "无法打开 %s: %s" | |
20620 | ||
4c27fcb5 | 20621 | #: git-send-email.perl:747 |
31e5e17b JX |
20622 | #, perl-format |
20623 | msgid "Failed to open %s.final: %s" | |
20624 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 20625 | |
4c27fcb5 | 20626 | #: git-send-email.perl:790 |
1a79b2f1 JX |
20627 | msgid "Summary email is empty, skipping it\n" |
20628 | msgstr "摘要邮件为空,跳过\n" | |
20629 | ||
20630 | #. TRANSLATORS: please keep [y/N] as is. | |
4c27fcb5 | 20631 | #: git-send-email.perl:825 |
1a79b2f1 JX |
20632 | #, perl-format |
20633 | msgid "Are you sure you want to use <%s> [y/N]? " | |
20634 | msgstr "您确认要使用 <%s> [y/N]?" | |
20635 | ||
4c27fcb5 | 20636 | #: git-send-email.perl:880 |
1a79b2f1 JX |
20637 | msgid "" |
20638 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
20639 | "Encoding.\n" | |
20640 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
20641 | ||
4c27fcb5 | 20642 | #: git-send-email.perl:885 |
1a79b2f1 JX |
20643 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
20644 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
20645 | ||
4c27fcb5 | 20646 | #: git-send-email.perl:893 |
1a79b2f1 JX |
20647 | #, perl-format |
20648 | msgid "" | |
20649 | "Refusing to send because the patch\n" | |
20650 | "\t%s\n" | |
20651 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
20652 | "want to send.\n" | |
20653 | msgstr "" | |
20654 | "拒绝发送,因为补丁\n" | |
20655 | "\t%s\n" | |
20656 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
20657 | ||
4c27fcb5 | 20658 | #: git-send-email.perl:912 |
1a79b2f1 JX |
20659 | msgid "To whom should the emails be sent (if anyone)?" |
20660 | msgstr "邮件将要发送给谁?" | |
20661 | ||
4c27fcb5 | 20662 | #: git-send-email.perl:930 |
1a79b2f1 JX |
20663 | #, perl-format |
20664 | msgid "fatal: alias '%s' expands to itself\n" | |
20665 | msgstr "严重:别名 '%s' 扩展为它自己\n" | |
20666 | ||
4c27fcb5 | 20667 | #: git-send-email.perl:942 |
1a79b2f1 JX |
20668 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
20669 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
20670 | ||
4c27fcb5 | 20671 | #: git-send-email.perl:1000 git-send-email.perl:1008 |
1a79b2f1 JX |
20672 | #, perl-format |
20673 | msgid "error: unable to extract a valid address from: %s\n" | |
20674 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
20675 | ||
20676 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
20677 | #. translation. The program will only accept English input | |
20678 | #. at this point. | |
4c27fcb5 | 20679 | #: git-send-email.perl:1012 |
1a79b2f1 JX |
20680 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
20681 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
20682 | ||
4c27fcb5 | 20683 | #: git-send-email.perl:1329 |
1a79b2f1 JX |
20684 | #, perl-format |
20685 | msgid "CA path \"%s\" does not exist" | |
20686 | msgstr "CA 路径 \"%s\" 不存在" | |
20687 | ||
4c27fcb5 | 20688 | #: git-send-email.perl:1412 |
1a79b2f1 JX |
20689 | msgid "" |
20690 | " The Cc list above has been expanded by additional\n" | |
20691 | " addresses found in the patch commit message. By default\n" | |
20692 | " send-email prompts before sending whenever this occurs.\n" | |
20693 | " This behavior is controlled by the sendemail.confirm\n" | |
20694 | " configuration setting.\n" | |
20695 | "\n" | |
20696 | " For additional information, run 'git send-email --help'.\n" | |
20697 | " To retain the current behavior, but squelch this message,\n" | |
20698 | " run 'git config --global sendemail.confirm auto'.\n" | |
20699 | "\n" | |
20700 | msgstr "" | |
20701 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
20702 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
20703 | " sendemail.confirm 配置设置。\n" | |
20704 | "\n" | |
20705 | " 更多信息,执行 'git send-email --help'。\n" | |
20706 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
20707 | " sendemail.confirm auto'。\n" | |
20708 | "\n" | |
20709 | ||
fd8cb379 | 20710 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
20711 | #. translation. The program will only accept English input |
20712 | #. at this point. | |
4c27fcb5 | 20713 | #: git-send-email.perl:1427 |
fd8cb379 JX |
20714 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " |
20715 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 20716 | |
4c27fcb5 | 20717 | #: git-send-email.perl:1430 |
1a79b2f1 JX |
20718 | msgid "Send this email reply required" |
20719 | msgstr "发送要求的邮件回复" | |
20720 | ||
4c27fcb5 | 20721 | #: git-send-email.perl:1458 |
1a79b2f1 JX |
20722 | msgid "The required SMTP server is not properly defined." |
20723 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
20724 | ||
4c27fcb5 | 20725 | #: git-send-email.perl:1505 |
1a79b2f1 JX |
20726 | #, perl-format |
20727 | msgid "Server does not support STARTTLS! %s" | |
20728 | msgstr "服务器不支持 STARTTLS!%s" | |
20729 | ||
4c27fcb5 | 20730 | #: git-send-email.perl:1510 git-send-email.perl:1514 |
a4f16749 JX |
20731 | #, perl-format |
20732 | msgid "STARTTLS failed! %s" | |
20733 | msgstr "STARTTLS 失败!%s" | |
20734 | ||
4c27fcb5 | 20735 | #: git-send-email.perl:1523 |
1a79b2f1 JX |
20736 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
20737 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
20738 | ||
4c27fcb5 | 20739 | #: git-send-email.perl:1541 |
1a79b2f1 JX |
20740 | #, perl-format |
20741 | msgid "Failed to send %s\n" | |
20742 | msgstr "无法发送 %s\n" | |
20743 | ||
4c27fcb5 | 20744 | #: git-send-email.perl:1544 |
1a79b2f1 JX |
20745 | #, perl-format |
20746 | msgid "Dry-Sent %s\n" | |
20747 | msgstr "演习发送 %s\n" | |
20748 | ||
4c27fcb5 | 20749 | #: git-send-email.perl:1544 |
1a79b2f1 JX |
20750 | #, perl-format |
20751 | msgid "Sent %s\n" | |
20752 | msgstr "正发送 %s\n" | |
20753 | ||
4c27fcb5 | 20754 | #: git-send-email.perl:1546 |
1a79b2f1 JX |
20755 | msgid "Dry-OK. Log says:\n" |
20756 | msgstr "演习成功。日志说:\n" | |
20757 | ||
4c27fcb5 | 20758 | #: git-send-email.perl:1546 |
1a79b2f1 JX |
20759 | msgid "OK. Log says:\n" |
20760 | msgstr "OK。日志说:\n" | |
20761 | ||
4c27fcb5 | 20762 | #: git-send-email.perl:1558 |
1a79b2f1 JX |
20763 | msgid "Result: " |
20764 | msgstr "结果:" | |
20765 | ||
4c27fcb5 | 20766 | #: git-send-email.perl:1561 |
1a79b2f1 JX |
20767 | msgid "Result: OK\n" |
20768 | msgstr "结果:OK\n" | |
20769 | ||
4c27fcb5 | 20770 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
20771 | #, perl-format |
20772 | msgid "can't open file %s" | |
20773 | msgstr "无法打开文件 %s" | |
20774 | ||
4c27fcb5 | 20775 | #: git-send-email.perl:1626 git-send-email.perl:1646 |
1a79b2f1 JX |
20776 | #, perl-format |
20777 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
20778 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
20779 | ||
4c27fcb5 | 20780 | #: git-send-email.perl:1632 |
1a79b2f1 JX |
20781 | #, perl-format |
20782 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
20783 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
20784 | ||
4c27fcb5 | 20785 | #: git-send-email.perl:1685 |
1a79b2f1 JX |
20786 | #, perl-format |
20787 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
20788 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
20789 | ||
4c27fcb5 | 20790 | #: git-send-email.perl:1720 |
1a79b2f1 JX |
20791 | #, perl-format |
20792 | msgid "(body) Adding cc: %s from line '%s'\n" | |
20793 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
20794 | ||
4c27fcb5 | 20795 | #: git-send-email.perl:1831 |
1a79b2f1 JX |
20796 | #, perl-format |
20797 | msgid "(%s) Could not execute '%s'" | |
20798 | msgstr "(%s) 不能执行 '%s'" | |
20799 | ||
4c27fcb5 | 20800 | #: git-send-email.perl:1838 |
1a79b2f1 JX |
20801 | #, perl-format |
20802 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
20803 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
20804 | ||
4c27fcb5 | 20805 | #: git-send-email.perl:1842 |
1a79b2f1 JX |
20806 | #, perl-format |
20807 | msgid "(%s) failed to close pipe to '%s'" | |
20808 | msgstr "(%s) 无法关闭管道至 '%s'" | |
20809 | ||
4c27fcb5 | 20810 | #: git-send-email.perl:1872 |
1a79b2f1 JX |
20811 | msgid "cannot send message as 7bit" |
20812 | msgstr "不能以 7bit 形式发送信息" | |
20813 | ||
4c27fcb5 | 20814 | #: git-send-email.perl:1880 |
1a79b2f1 JX |
20815 | msgid "invalid transfer encoding" |
20816 | msgstr "无效的传送编码" | |
20817 | ||
4c27fcb5 | 20818 | #: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 |
1a79b2f1 JX |
20819 | #, perl-format |
20820 | msgid "unable to open %s: %s\n" | |
20821 | msgstr "不能打开 %s:%s\n" | |
20822 | ||
4c27fcb5 | 20823 | #: git-send-email.perl:1924 |
1a79b2f1 JX |
20824 | #, perl-format |
20825 | msgid "%s: patch contains a line longer than 998 characters" | |
20826 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
20827 | ||
4c27fcb5 | 20828 | #: git-send-email.perl:1941 |
1a79b2f1 JX |
20829 | #, perl-format |
20830 | msgid "Skipping %s with backup suffix '%s'.\n" | |
20831 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
20832 | ||
20833 | #. TRANSLATORS: please keep "[y|N]" as is. | |
4c27fcb5 | 20834 | #: git-send-email.perl:1945 |
1a79b2f1 JX |
20835 | #, perl-format |
20836 | msgid "Do you really want to send %s? [y|N]: " | |
20837 | msgstr "您真的要发送 %s?[y|N]:" |