]>
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: |
c04f5ac3 | 6 | # - Jiang Xin <worldhello.net AT gmail.com> |
bbdf0acc JX |
7 | # - Lian Cheng <rhythm.mail AT gmail.com> |
8 | # - Ray Chen <oldsharp AT gmail.com> | |
c04f5ac3 | 9 | # - Riku <lu.riku AT gmail.com> |
bbdf0acc JX |
10 | # - Thynson <lanxingcan AT gmail.com> |
11 | # - ws3389 <willsmith3389 AT gmail.com> | |
12 | # - Wang Sheng <wangsheng2008love AT 163.com> | |
13 | # - Yichao Yu <yyc1992 AT gmail.com> | |
c04f5ac3 | 14 | # - Zhuang Ya <zhuangya AT me.com> |
c04f5ac3 | 15 | # |
160fb2b2 JX |
16 | # Git glossary for Chinese translators |
17 | # | |
18 | # English | Chinese | |
19 | # ---------------------------------+-------------------------------------- | |
20 | # 3-way merge | 三方合并 | |
21 | # abbreviate | 简写(的 SHA-1 值) | |
22 | # alternate object database | 备用对象库 | |
23 | # amend | 修补 | |
24 | # ancestor | 祖先,祖先提交 | |
25 | # annotated tag | 附注标签 | |
26 | # bare repository | 纯仓库 | |
27 | # bisect | 二分查找 | |
28 | # blob object | 数据对象 | |
29 | # branch | 分支 | |
30 | # bundle | 包 | |
31 | # bypass | 绕过 | |
32 | # cache | 索引(的别称) | |
33 | # chain | (提交)链 | |
34 | # changeset | 变更集 | |
35 | # checkout | 检出 | |
36 | # checksum | 校验,校验和 | |
37 | # cherry-picking | 拣选 | |
38 | # clean | 干净(的工作区) | |
39 | # clone | 克隆 | |
40 | # commit | 提交 | |
667599e8 | 41 | # commit message | 提交说明 |
160fb2b2 JX |
42 | # commit object | 提交对象 |
43 | # commit-ish (also committish) | 提交号 | |
44 | # conflict | 冲突 | |
45 | # core Git | 核心 Git 工具 | |
46 | # DAG | 有向无环图 | |
47 | # dangling object | 摇摆对象 | |
48 | # detached HEAD | 分离头指针 | |
49 | # directory | 目录 | |
50 | # dirty | 脏(的工作区) | |
755c831b | 51 | # dumb HTTP protocol | 哑 HTTP 协议 |
160fb2b2 JX |
52 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
53 | # fast-forward | 快进 | |
54 | # fetch | 获取 | |
55 | # file system | 文件系统 | |
e397e7e3 | 56 | # fork | 派生 |
160fb2b2 JX |
57 | # Git archive | 仓库(对于 arch 用户) |
58 | # gitfile | gitfile(仓库链接文件) | |
59 | # grafts | (提交)嫁接 | |
60 | # hash | 哈希值 | |
61 | # HEAD | HEAD(头指针,亦即当前分支) | |
62 | # head | 头、分支 | |
63 | # head ref | 分支 | |
64 | # header | 头信息 | |
65 | # hook | 钩子 | |
66 | # hunk | 补丁片段 | |
67 | # index | 索引 | |
68 | # index entry | 索引条目 | |
69 | # loose object | 松散对象 | |
70 | # loose refs | 松散引用 | |
71 | # master | master(默认分支名) | |
72 | # merge | 合并 | |
73 | # object | 对象 | |
74 | # object database | 对象库 | |
75 | # object identifier | 对象标识符 | |
76 | # object name | 对象名称 | |
77 | # object type | 对象类型 | |
78 | # octopus | 章鱼式合并(两分支以上的合并) | |
79 | # origin | origin(默认的远程名称) | |
80 | # pack | 包 | |
81 | # pack index | 包索引 | |
82 | # packfile | 包文件 | |
83 | # parent | 父提交 | |
84 | # patch | 补丁 | |
85 | # pathspec | 路径规格 | |
86 | # pattern | 模式 | |
12e59059 | 87 | # pickaxe | 挖掘 |
160fb2b2 JX |
88 | # plumbing | 管件(Git 底层核心命令的别称) |
89 | # porcelain | 瓷件(Git 上层封装命令的别称) | |
94550ed3 | 90 | # precious-objects repo | 珍品仓库 |
160fb2b2 JX |
91 | # prune | 清除 |
92 | # pull | 拉,拉取 | |
93 | # push | 推,推送 | |
94 | # reachable | 可达 | |
95 | # rebase | 变基 | |
96 | # ref | 引用 | |
97 | # reflog | 引用日志 | |
98 | # refspec | 引用规格 | |
99 | # remote | 远程,远程仓库 | |
100 | # remote-tracking branch | 远程跟踪分支 | |
101 | # replay | 重放 | |
102 | # repo | 仓库 | |
103 | # repository | 仓库 | |
104 | # resolve | (冲突)解决 | |
105 | # revert | 还原 | |
106 | # revision | 版本 | |
107 | # rewind | 回退 | |
108 | # SCM | 源代码管理(工具) | |
ee7589bb | 109 | # SHA-1 | SHA-1(安全哈希算法1) |
160fb2b2 JX |
110 | # shallow repository | 浅(克隆)仓库 |
111 | # signed tag | 签名标签 | |
755c831b | 112 | # smart HTTP protocol | 智能 HTTP 协议 |
160fb2b2 JX |
113 | # squash | 压缩 |
114 | # stage | n. 暂存区(即索引); v. 暂存 | |
115 | # stash | n. 进度保存; v. 保存进度 | |
116 | # submodule | 子模组 | |
117 | # symref | 符号引用 | |
933c015e | 118 | # tag | n. 标签; v. 打标签 |
160fb2b2 JX |
119 | # tag object | 标签对象 |
120 | # tagger | 打标签者 | |
121 | # topic branch | 主题分支 | |
122 | # track | 跟踪 | |
123 | # tree | 树(工作区或树对象) | |
124 | # tree object | 树对象 | |
125 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) | |
126 | # unmerged index | 未合并索引 | |
127 | # unpack | 解包 | |
128 | # unreachable object | 不可达对象 | |
129 | # unstage | 取消暂存 | |
130 | # upstream | 上游 | |
131 | # upstream branch | 上游分支 | |
132 | # working tree | 工作区 | |
133 | # | |
c04f5ac3 JX |
134 | msgid "" |
135 | msgstr "" | |
136 | "Project-Id-Version: Git\n" | |
137 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
5c57d762 JX |
138 | "POT-Creation-Date: 2016-08-27 23:21+0800\n" |
139 | "PO-Revision-Date: 2016-08-31 00:11+0800\n" | |
c04f5ac3 | 140 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 141 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
142 | "Language: zh_CN\n" |
143 | "MIME-Version: 1.0\n" | |
144 | "Content-Type: text/plain; charset=UTF-8\n" | |
145 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 146 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 147 | |
6c94aba5 | 148 | #: advice.c:55 |
c04f5ac3 JX |
149 | #, c-format |
150 | msgid "hint: %.*s\n" | |
151 | msgstr "提示:%.*s\n" | |
152 | ||
5c57d762 JX |
153 | #: advice.c:83 |
154 | msgid "Cherry-picking is not possible because you have unmerged files." | |
155 | msgstr "无法拣选,因为您有未合并的文件。" | |
156 | ||
157 | #: advice.c:85 | |
158 | msgid "Committing is not possible because you have unmerged files." | |
159 | msgstr "无法提交,因为您有未合并的文件。" | |
160 | ||
161 | #: advice.c:87 | |
162 | msgid "Merging is not possible because you have unmerged files." | |
163 | msgstr "无法合并,因为您有未合并的文件。" | |
164 | ||
165 | #: advice.c:89 | |
166 | msgid "Pulling is not possible because you have unmerged files." | |
167 | msgstr "无法拉取,因为您有未合并的文件。" | |
168 | ||
169 | #: advice.c:91 | |
170 | msgid "Reverting is not possible because you have unmerged files." | |
171 | msgstr "无法回退,因为您有未合并的文件。" | |
172 | ||
173 | #: advice.c:93 | |
174 | #, c-format | |
175 | msgid "It is not possible to %s because you have unmerged files." | |
176 | msgstr "无法 %s,因为您有未合并的文件。" | |
177 | ||
178 | #: advice.c:101 | |
c04f5ac3 | 179 | msgid "" |
6acbf033 | 180 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 181 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 182 | msgstr "" |
d9d56b23 | 183 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 184 | "解决方案并提交。" |
c04f5ac3 | 185 | |
5c57d762 JX |
186 | #: advice.c:109 |
187 | msgid "Exiting because of an unresolved conflict." | |
188 | msgstr "因为存在未解决的冲突而退出。" | |
189 | ||
190 | #: advice.c:114 builtin/merge.c:1181 | |
1b7f4a34 JX |
191 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
192 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
193 | ||
5c57d762 | 194 | #: advice.c:116 |
94550ed3 | 195 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
196 | msgstr "请在合并前先提交您的修改。" |
197 | ||
5c57d762 | 198 | #: advice.c:117 |
1b7f4a34 JX |
199 | msgid "Exiting because of unfinished merge." |
200 | msgstr "因为存在未完成的合并而退出。" | |
201 | ||
5c57d762 JX |
202 | #: advice.c:123 |
203 | #, c-format | |
204 | msgid "" | |
205 | "Note: checking out '%s'.\n" | |
206 | "\n" | |
207 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
208 | "changes and commit them, and you can discard any commits you make in this\n" | |
209 | "state without impacting any branches by performing another checkout.\n" | |
210 | "\n" | |
211 | "If you want to create a new branch to retain commits you create, you may\n" | |
212 | "do so (now or later) by using -b with the checkout command again. Example:\n" | |
213 | "\n" | |
214 | " git checkout -b <new-branch-name>\n" | |
215 | "\n" | |
216 | msgstr "" | |
217 | "注意:正在检出 '%s'。\n" | |
218 | "\n" | |
219 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另外\n" | |
220 | "的检出分支操作丢弃在这个状态下所做的任何提交。\n" | |
221 | "\n" | |
222 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n" | |
223 | "参数 -b 来实现(现在或稍后)。例如:\n" | |
224 | "\n" | |
225 | " git checkout -b <new-branch-name>\n" | |
226 | "\n" | |
227 | ||
1b7f4a34 | 228 | #: archive.c:12 |
814ff314 JX |
229 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
230 | msgstr "git archive [<选项>] <树或提交> [<路径>...]" | |
ef317cd5 | 231 | |
1b7f4a34 | 232 | #: archive.c:13 |
ef317cd5 | 233 | msgid "git archive --list" |
07432cef | 234 | msgstr "git archive --list" |
ef317cd5 | 235 | |
1b7f4a34 | 236 | #: archive.c:14 |
ef317cd5 | 237 | msgid "" |
814ff314 | 238 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
ef317cd5 | 239 | msgstr "" |
160fb2b2 | 240 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 241 | |
1b7f4a34 | 242 | #: archive.c:15 |
ef317cd5 | 243 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
160fb2b2 | 244 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" |
ef317cd5 | 245 | |
5c57d762 | 246 | #: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 |
90314792 JX |
247 | #, c-format |
248 | msgid "pathspec '%s' did not match any files" | |
160fb2b2 | 249 | msgstr "路径规格 '%s' 未匹配任何文件" |
90314792 | 250 | |
94550ed3 | 251 | #: archive.c:429 |
ef317cd5 | 252 | msgid "fmt" |
07432cef | 253 | msgstr "格式" |
ef317cd5 | 254 | |
94550ed3 | 255 | #: archive.c:429 |
ef317cd5 | 256 | msgid "archive format" |
07432cef | 257 | msgstr "归档格式" |
ef317cd5 | 258 | |
5c57d762 | 259 | #: archive.c:430 builtin/log.c:1422 |
ef317cd5 | 260 | msgid "prefix" |
07432cef | 261 | msgstr "前缀" |
ef317cd5 | 262 | |
94550ed3 | 263 | #: archive.c:431 |
ef317cd5 | 264 | msgid "prepend prefix to each pathname in the archive" |
07432cef | 265 | msgstr "为归档中每个路径名加上前缀" |
ef317cd5 | 266 | |
5c57d762 JX |
267 | #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 |
268 | #: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987 | |
5b04ee3b | 269 | #: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 |
5c57d762 JX |
270 | #: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399 |
271 | #: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153 | |
ef317cd5 JX |
272 | msgid "file" |
273 | msgstr "文件" | |
274 | ||
94550ed3 | 275 | #: archive.c:433 builtin/archive.c:89 |
ef317cd5 | 276 | msgid "write the archive to this file" |
07432cef | 277 | msgstr "归档写入此文件" |
ef317cd5 | 278 | |
94550ed3 | 279 | #: archive.c:435 |
ef317cd5 | 280 | msgid "read .gitattributes in working directory" |
07432cef | 281 | msgstr "读取工作区中的 .gitattributes" |
ef317cd5 | 282 | |
94550ed3 | 283 | #: archive.c:436 |
ef317cd5 | 284 | msgid "report archived files on stderr" |
07432cef | 285 | msgstr "在标准错误上报告归档文件" |
ef317cd5 | 286 | |
94550ed3 | 287 | #: archive.c:437 |
ef317cd5 | 288 | msgid "store only" |
07432cef | 289 | msgstr "只存储" |
ef317cd5 | 290 | |
94550ed3 | 291 | #: archive.c:438 |
ef317cd5 | 292 | msgid "compress faster" |
07432cef | 293 | msgstr "压缩速度更快" |
ef317cd5 | 294 | |
94550ed3 | 295 | #: archive.c:446 |
ef317cd5 | 296 | msgid "compress better" |
07432cef | 297 | msgstr "压缩效果更好" |
ef317cd5 | 298 | |
94550ed3 | 299 | #: archive.c:449 |
ef317cd5 | 300 | msgid "list supported archive formats" |
07432cef | 301 | msgstr "列出支持的归档格式" |
ef317cd5 | 302 | |
5b04ee3b | 303 | #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 |
5c57d762 | 304 | #: builtin/submodule--helper.c:832 |
ef317cd5 | 305 | msgid "repo" |
160fb2b2 | 306 | msgstr "仓库" |
ef317cd5 | 307 | |
94550ed3 | 308 | #: archive.c:452 builtin/archive.c:91 |
ef317cd5 | 309 | msgid "retrieve the archive from remote repository <repo>" |
160fb2b2 | 310 | msgstr "从远程仓库(<仓库>)提取归档文件" |
ef317cd5 | 311 | |
5c57d762 | 312 | #: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 |
ef317cd5 | 313 | msgid "command" |
07432cef | 314 | msgstr "命令" |
ef317cd5 | 315 | |
94550ed3 | 316 | #: archive.c:454 builtin/archive.c:93 |
ef317cd5 | 317 | msgid "path to the remote git-upload-archive command" |
07432cef WS |
318 | msgstr "远程 git-upload-archive 命令的路径" |
319 | ||
5c57d762 JX |
320 | #: archive.c:461 |
321 | msgid "Unexpected option --remote" | |
322 | msgstr "意外的选项 --remote" | |
323 | ||
324 | #: archive.c:463 | |
325 | msgid "Option --exec can only be used together with --remote" | |
326 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
327 | ||
328 | #: archive.c:465 | |
329 | msgid "Unexpected option --output" | |
330 | msgstr "未知参数 --output" | |
331 | ||
332 | #: archive.c:487 | |
333 | #, c-format | |
334 | msgid "Unknown archive format '%s'" | |
335 | msgstr "未知归档格式 '%s'" | |
336 | ||
337 | #: archive.c:494 | |
338 | #, c-format | |
339 | msgid "Argument not supported for format '%s': -%d" | |
340 | msgstr "参数不支持此格式 '%s':-%d" | |
341 | ||
276ceeaa | 342 | #: attr.c:263 |
07432cef | 343 | msgid "" |
a7409dfb | 344 | "Negative patterns are ignored in git attributes\n" |
07432cef | 345 | "Use '\\!' for literal leading exclamation." |
ef317cd5 | 346 | msgstr "" |
a7409dfb | 347 | "负值模版在 git attributes 中被忽略\n" |
07432cef | 348 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
ef317cd5 | 349 | |
5c57d762 JX |
350 | #: bisect.c:441 |
351 | #, c-format | |
352 | msgid "Could not open file '%s'" | |
353 | msgstr "不能打开文件 '%s'" | |
354 | ||
355 | #: bisect.c:446 | |
356 | #, c-format | |
357 | msgid "Badly quoted content in file '%s': %s" | |
358 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
359 | ||
360 | #: bisect.c:655 | |
361 | #, c-format | |
362 | msgid "We cannot bisect more!\n" | |
363 | msgstr "我们无法进行更多的二分查找!\n" | |
364 | ||
365 | #: bisect.c:708 | |
366 | #, c-format | |
367 | msgid "Not a valid commit name %s" | |
368 | msgstr "不是一个有效的提交名 %s" | |
369 | ||
370 | #: bisect.c:732 | |
371 | #, c-format | |
372 | msgid "" | |
373 | "The merge base %s is bad.\n" | |
374 | "This means the bug has been fixed between %s and [%s].\n" | |
375 | msgstr "" | |
376 | "合并基线 %s 是坏的。\n" | |
377 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
378 | ||
379 | #: bisect.c:737 | |
380 | #, c-format | |
381 | msgid "" | |
382 | "The merge base %s is new.\n" | |
383 | "The property has changed between %s and [%s].\n" | |
384 | msgstr "" | |
385 | "合并基线 %s 是新的。\n" | |
386 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
387 | ||
388 | #: bisect.c:742 | |
389 | #, c-format | |
390 | msgid "" | |
391 | "The merge base %s is %s.\n" | |
392 | "This means the first '%s' commit is between %s and [%s].\n" | |
393 | msgstr "" | |
394 | "合并基线 %s 是 %s。\n" | |
395 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
396 | ||
397 | #: bisect.c:750 | |
398 | #, c-format | |
399 | msgid "" | |
400 | "Some %s revs are not ancestor of the %s rev.\n" | |
401 | "git bisect cannot work properly in this case.\n" | |
402 | "Maybe you mistook %s and %s revs?\n" | |
403 | msgstr "" | |
404 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
405 | "这种情况下 git 二分查找无法正常工作。\n" | |
406 | "您可能弄错了 %s 和 %s 版本?\n" | |
407 | ||
408 | #: bisect.c:763 | |
409 | #, c-format | |
410 | msgid "" | |
411 | "the merge base between %s and [%s] must be skipped.\n" | |
412 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
413 | "We continue anyway." | |
414 | msgstr "" | |
415 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
416 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
417 | "我们仍旧继续。" | |
418 | ||
419 | #: bisect.c:798 | |
420 | #, c-format | |
421 | msgid "Bisecting: a merge base must be tested\n" | |
422 | msgstr "二分查找中:合并基线必须要测试\n" | |
423 | ||
424 | #: bisect.c:849 | |
425 | #, c-format | |
426 | msgid "a %s revision is needed" | |
427 | msgstr "需要一个 %s 版本" | |
428 | ||
429 | #: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 | |
430 | #, c-format | |
431 | msgid "could not create file '%s'" | |
432 | msgstr "不能创建文件 '%s'" | |
433 | ||
434 | #: bisect.c:917 | |
435 | #, c-format | |
436 | msgid "could not read file '%s'" | |
437 | msgstr "不能读取文件 '%s'" | |
438 | ||
439 | #: bisect.c:947 | |
440 | msgid "reading bisect refs failed" | |
441 | msgstr "读取二分查找引用失败" | |
442 | ||
443 | #: bisect.c:967 | |
444 | #, c-format | |
445 | msgid "%s was both %s and %s\n" | |
446 | msgstr "%s 同时为 %s 和 %s\n" | |
447 | ||
448 | #: bisect.c:975 | |
449 | #, c-format | |
450 | msgid "" | |
451 | "No testable commit found.\n" | |
452 | "Maybe you started with bad path parameters?\n" | |
453 | msgstr "" | |
454 | "没有发现可测试的提交。\n" | |
455 | "可能您在运行时使用了错误的路径参数?\n" | |
456 | ||
457 | #: bisect.c:994 | |
458 | #, c-format | |
459 | msgid "(roughly %d step)" | |
460 | msgid_plural "(roughly %d steps)" | |
461 | msgstr[0] "(大概 %d 步)" | |
462 | msgstr[1] "(大概 %d 步)" | |
463 | ||
464 | #. TRANSLATORS: the last %s will be replaced with | |
465 | #. "(roughly %d steps)" translation | |
466 | #: bisect.c:998 | |
467 | #, c-format | |
468 | msgid "Bisecting: %d revision left to test after this %s\n" | |
469 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
470 | msgstr[0] "二分查找中:在 %2$s 之后还剩下 %1$d 个版本\n" | |
471 | msgstr[1] "二分查找中:在 %2$s 之后还剩下 %1$d 个版本\n" | |
472 | ||
276ceeaa JX |
473 | #: branch.c:53 |
474 | #, c-format | |
475 | msgid "" | |
476 | "\n" | |
477 | "After fixing the error cause you may try to fix up\n" | |
478 | "the remote tracking information by invoking\n" | |
479 | "\"git branch --set-upstream-to=%s%s%s\"." | |
480 | msgstr "" | |
481 | "\n" | |
482 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
483 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
484 | ||
485 | #: branch.c:67 | |
4dcdc3d8 JX |
486 | #, c-format |
487 | msgid "Not setting branch %s as its own upstream." | |
488 | msgstr "未设置分支 %s 作为它自己的上游。" | |
489 | ||
276ceeaa | 490 | #: branch.c:93 |
4dcdc3d8 JX |
491 | #, c-format |
492 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." | |
493 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
494 | ||
276ceeaa | 495 | #: branch.c:94 |
4dcdc3d8 JX |
496 | #, c-format |
497 | msgid "Branch %s set up to track remote branch %s from %s." | |
498 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
499 | ||
276ceeaa | 500 | #: branch.c:98 |
4dcdc3d8 JX |
501 | #, c-format |
502 | msgid "Branch %s set up to track local branch %s by rebasing." | |
503 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
504 | ||
276ceeaa | 505 | #: branch.c:99 |
4dcdc3d8 JX |
506 | #, c-format |
507 | msgid "Branch %s set up to track local branch %s." | |
508 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
509 | ||
276ceeaa | 510 | #: branch.c:104 |
4dcdc3d8 JX |
511 | #, c-format |
512 | msgid "Branch %s set up to track remote ref %s by rebasing." | |
513 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
514 | ||
276ceeaa | 515 | #: branch.c:105 |
4dcdc3d8 JX |
516 | #, c-format |
517 | msgid "Branch %s set up to track remote ref %s." | |
518 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
519 | ||
276ceeaa | 520 | #: branch.c:109 |
4dcdc3d8 JX |
521 | #, c-format |
522 | msgid "Branch %s set up to track local ref %s by rebasing." | |
523 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
524 | ||
276ceeaa | 525 | #: branch.c:110 |
4dcdc3d8 JX |
526 | #, c-format |
527 | msgid "Branch %s set up to track local ref %s." | |
528 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
529 | ||
276ceeaa JX |
530 | #: branch.c:119 |
531 | msgid "Unable to write upstream branch configuration" | |
532 | msgstr "无法写入上游分支配置" | |
533 | ||
534 | #: branch.c:156 | |
4dcdc3d8 JX |
535 | #, c-format |
536 | msgid "Not tracking: ambiguous information for ref %s" | |
537 | msgstr "未跟踪:引用 %s 有歧义" | |
538 | ||
276ceeaa | 539 | #: branch.c:185 |
4dcdc3d8 JX |
540 | #, c-format |
541 | msgid "'%s' is not a valid branch name." | |
542 | msgstr "'%s' 不是一个有效的分支名称。" | |
543 | ||
276ceeaa | 544 | #: branch.c:190 |
4dcdc3d8 JX |
545 | #, c-format |
546 | msgid "A branch named '%s' already exists." | |
547 | msgstr "一个分支名 '%s' 已经存在。" | |
548 | ||
276ceeaa | 549 | #: branch.c:198 |
4dcdc3d8 JX |
550 | msgid "Cannot force update the current branch." |
551 | msgstr "无法强制更新当前分支。" | |
552 | ||
276ceeaa | 553 | #: branch.c:218 |
1003b3a5 JX |
554 | #, c-format |
555 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
556 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
557 | ||
276ceeaa | 558 | #: branch.c:220 |
1003b3a5 JX |
559 | #, c-format |
560 | msgid "the requested upstream branch '%s' does not exist" | |
561 | msgstr "请求的上游分支 '%s' 不存在" | |
562 | ||
276ceeaa | 563 | #: branch.c:222 |
1003b3a5 JX |
564 | msgid "" |
565 | "\n" | |
566 | "If you are planning on basing your work on an upstream\n" | |
567 | "branch that already exists at the remote, you may need to\n" | |
568 | "run \"git fetch\" to retrieve it.\n" | |
569 | "\n" | |
570 | "If you are planning to push out a new local branch that\n" | |
571 | "will track its remote counterpart, you may want to use\n" | |
572 | "\"git push -u\" to set the upstream config as you push." | |
573 | msgstr "" | |
574 | "\n" | |
575 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
576 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
577 | "\n" | |
578 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
579 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
580 | ||
276ceeaa | 581 | #: branch.c:266 |
4dcdc3d8 JX |
582 | #, c-format |
583 | msgid "Not a valid object name: '%s'." | |
584 | msgstr "不是一个有效的对象名:'%s'。" | |
585 | ||
276ceeaa | 586 | #: branch.c:286 |
4dcdc3d8 JX |
587 | #, c-format |
588 | msgid "Ambiguous object name: '%s'." | |
589 | msgstr "歧义的对象名:'%s'。" | |
590 | ||
276ceeaa | 591 | #: branch.c:291 |
4dcdc3d8 JX |
592 | #, c-format |
593 | msgid "Not a valid branch point: '%s'." | |
594 | msgstr "无效的分支点:'%s'。" | |
595 | ||
5b04ee3b | 596 | #: branch.c:345 |
1b7f4a34 JX |
597 | #, c-format |
598 | msgid "'%s' is already checked out at '%s'" | |
599 | msgstr "'%s' 已经检出到 '%s'" | |
600 | ||
5b04ee3b JX |
601 | #: branch.c:364 |
602 | #, c-format | |
603 | msgid "HEAD of working tree %s is not updated" | |
604 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
605 | ||
220c313c | 606 | #: bundle.c:34 |
8ada9598 JX |
607 | #, c-format |
608 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 609 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 | 610 | |
220c313c | 611 | #: bundle.c:61 |
81809b99 | 612 | #, c-format |
8ada9598 | 613 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 614 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 | 615 | |
5c57d762 | 616 | #: bundle.c:87 builtin/commit.c:778 |
8ada9598 JX |
617 | #, c-format |
618 | msgid "could not open '%s'" | |
619 | msgstr "不能打开 '%s'" | |
620 | ||
220c313c | 621 | #: bundle.c:139 |
8ada9598 | 622 | msgid "Repository lacks these prerequisite commits:" |
160fb2b2 | 623 | msgstr "仓库中缺少这些必备的提交:" |
8ada9598 | 624 | |
5c57d762 JX |
625 | #: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085 |
626 | #: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348 | |
627 | #: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901 | |
628 | #: builtin/merge.c:356 builtin/shortlog.c:170 | |
8ada9598 JX |
629 | msgid "revision walk setup failed" |
630 | msgstr "版本遍历设置失败" | |
631 | ||
220c313c | 632 | #: bundle.c:185 |
8ada9598 | 633 | #, c-format |
1003b3a5 JX |
634 | msgid "The bundle contains this ref:" |
635 | msgid_plural "The bundle contains these %d refs:" | |
636 | msgstr[0] "这个包中含有这个引用:" | |
637 | msgstr[1] "这个包中含有 %d 个引用:" | |
8ada9598 | 638 | |
220c313c | 639 | #: bundle.c:192 |
6792b93b JX |
640 | msgid "The bundle records a complete history." |
641 | msgstr "这个包记录一个完整历史。" | |
642 | ||
220c313c | 643 | #: bundle.c:194 |
8ada9598 | 644 | #, c-format |
1003b3a5 JX |
645 | msgid "The bundle requires this ref:" |
646 | msgid_plural "The bundle requires these %d refs:" | |
647 | msgstr[0] "这个包需要这个引用:" | |
648 | msgstr[1] "这个包需要 %d 个引用:" | |
8ada9598 | 649 | |
1b7f4a34 | 650 | #: bundle.c:253 |
9aeb4c2b JX |
651 | msgid "Could not spawn pack-objects" |
652 | msgstr "不能生成 pack-objects 进程" | |
653 | ||
1b7f4a34 | 654 | #: bundle.c:264 |
9aeb4c2b JX |
655 | msgid "pack-objects died" |
656 | msgstr "pack-objects 终止" | |
657 | ||
1b7f4a34 | 658 | #: bundle.c:304 |
8ada9598 | 659 | msgid "rev-list died" |
81809b99 | 660 | msgstr "rev-list 终止" |
8ada9598 | 661 | |
1b7f4a34 | 662 | #: bundle.c:353 |
8ada9598 JX |
663 | #, c-format |
664 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 665 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 | 666 | |
5c57d762 | 667 | #: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 |
9aeb4c2b JX |
668 | #, c-format |
669 | msgid "unrecognized argument: %s" | |
670 | msgstr "未能识别的参数:%s" | |
671 | ||
5b04ee3b | 672 | #: bundle.c:451 |
8ada9598 | 673 | msgid "Refusing to create empty bundle." |
81809b99 | 674 | msgstr "不能创建空包。" |
8ada9598 | 675 | |
5b04ee3b | 676 | #: bundle.c:463 |
81809b99 | 677 | #, c-format |
8ada9598 | 678 | msgid "cannot create '%s'" |
81809b99 | 679 | msgstr "不能创建 '%s'" |
8ada9598 | 680 | |
5b04ee3b | 681 | #: bundle.c:491 |
8ada9598 | 682 | msgid "index-pack died" |
81809b99 | 683 | msgstr "index-pack 终止" |
8ada9598 | 684 | |
5c57d762 | 685 | #: color.c:290 |
220c313c JX |
686 | #, c-format |
687 | msgid "invalid color value: %.*s" | |
688 | msgstr "无效的颜色值:%.*s" | |
689 | ||
5c57d762 JX |
690 | #: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 |
691 | #: builtin/am.c:2119 | |
c04f5ac3 JX |
692 | #, c-format |
693 | msgid "could not parse %s" | |
694 | msgstr "不能解析 %s" | |
695 | ||
6acbf033 | 696 | #: commit.c:42 |
c04f5ac3 JX |
697 | #, c-format |
698 | msgid "%s %s is not a commit!" | |
699 | msgstr "%s %s 不是一个提交!" | |
700 | ||
701 | #: compat/obstack.c:406 compat/obstack.c:408 | |
702 | msgid "memory exhausted" | |
703 | msgstr "内存耗尽" | |
704 | ||
5c57d762 JX |
705 | #: config.c:516 |
706 | #, c-format | |
707 | msgid "bad config line %d in blob %s" | |
708 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
709 | ||
710 | #: config.c:520 | |
711 | #, c-format | |
712 | msgid "bad config line %d in file %s" | |
713 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
714 | ||
715 | #: config.c:524 | |
220c313c | 716 | #, c-format |
5c57d762 JX |
717 | msgid "bad config line %d in standard input" |
718 | msgstr "标准输入中错误的配置行 %d" | |
220c313c | 719 | |
5c57d762 | 720 | #: config.c:528 |
220c313c | 721 | #, c-format |
5c57d762 JX |
722 | msgid "bad config line %d in submodule-blob %s" |
723 | msgstr "子模组数据 %2$s 中错误的配置行 %1$d" | |
220c313c | 724 | |
5c57d762 JX |
725 | #: config.c:532 |
726 | #, c-format | |
727 | msgid "bad config line %d in command line %s" | |
728 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
729 | ||
730 | #: config.c:536 | |
731 | #, c-format | |
732 | msgid "bad config line %d in %s" | |
733 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
734 | ||
735 | #: config.c:655 | |
736 | msgid "out of range" | |
737 | msgstr "超出范围" | |
738 | ||
739 | #: config.c:655 | |
740 | msgid "invalid unit" | |
741 | msgstr "无效的单位" | |
742 | ||
743 | #: config.c:661 | |
220c313c JX |
744 | #, c-format |
745 | msgid "bad numeric config value '%s' for '%s': %s" | |
746 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s" | |
747 | ||
5c57d762 JX |
748 | #: config.c:666 |
749 | #, c-format | |
750 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" | |
751 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" | |
752 | ||
753 | #: config.c:669 | |
754 | #, c-format | |
755 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" | |
756 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" | |
757 | ||
758 | #: config.c:672 | |
759 | #, c-format | |
760 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" | |
761 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s': %3$s" | |
762 | ||
763 | #: config.c:675 | |
764 | #, c-format | |
765 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" | |
766 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" | |
767 | ||
768 | #: config.c:678 | |
769 | #, c-format | |
770 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" | |
771 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" | |
772 | ||
773 | #: config.c:681 | |
774 | #, c-format | |
775 | msgid "bad numeric config value '%s' for '%s' in %s: %s" | |
776 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s': %4$s" | |
777 | ||
778 | #: config.c:768 | |
220c313c JX |
779 | #, c-format |
780 | msgid "failed to expand user dir in: '%s'" | |
781 | msgstr "无法扩展 '%s' 中的用户目录" | |
782 | ||
5c57d762 | 783 | #: config.c:849 config.c:860 |
220c313c JX |
784 | #, c-format |
785 | msgid "bad zlib compression level %d" | |
786 | msgstr "错误的 zlib 压缩级别 %d" | |
787 | ||
5c57d762 | 788 | #: config.c:978 |
220c313c JX |
789 | #, c-format |
790 | msgid "invalid mode for object creation: %s" | |
791 | msgstr "无效的对象创建模式:%s" | |
792 | ||
5c57d762 | 793 | #: config.c:1312 |
220c313c JX |
794 | msgid "unable to parse command-line config" |
795 | msgstr "无法解析命令行中的配置" | |
796 | ||
5c57d762 JX |
797 | #: config.c:1362 |
798 | msgid "unknown error occurred while reading the configuration files" | |
220c313c JX |
799 | msgstr "在读取配置文件时遇到未知错误" |
800 | ||
5c57d762 | 801 | #: config.c:1716 |
220c313c JX |
802 | #, c-format |
803 | msgid "unable to parse '%s' from command-line config" | |
804 | msgstr "无法解析命令行配置中的 '%s'" | |
805 | ||
5c57d762 | 806 | #: config.c:1718 |
220c313c JX |
807 | #, c-format |
808 | msgid "bad config variable '%s' in file '%s' at line %d" | |
809 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
810 | ||
5c57d762 | 811 | #: config.c:1777 |
220c313c JX |
812 | #, c-format |
813 | msgid "%s has multiple values" | |
814 | msgstr "%s 有多个取值" | |
815 | ||
5c57d762 | 816 | #: config.c:2311 |
276ceeaa | 817 | #, c-format |
5b04ee3b | 818 | msgid "could not set '%s' to '%s'" |
276ceeaa JX |
819 | msgstr "不能设置 '%s' 为 '%s'" |
820 | ||
5c57d762 | 821 | #: config.c:2313 |
5b04ee3b JX |
822 | #, c-format |
823 | msgid "could not unset '%s'" | |
824 | msgstr "不能取消设置 '%s'" | |
825 | ||
5c57d762 JX |
826 | #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 |
827 | msgid "Checking connectivity" | |
828 | msgstr "检查连接中" | |
829 | ||
830 | #: connected.c:74 | |
c04f5ac3 JX |
831 | msgid "Could not run 'git rev-list'" |
832 | msgstr "不能执行 'git rev-list'" | |
833 | ||
5c57d762 | 834 | #: connected.c:94 |
5b04ee3b JX |
835 | msgid "failed write to rev-list" |
836 | msgstr "无法写入 rev-list" | |
c04f5ac3 | 837 | |
5c57d762 | 838 | #: connected.c:101 |
5b04ee3b JX |
839 | msgid "failed to close rev-list's stdin" |
840 | msgstr "无法关闭 rev-list 的标准输入" | |
c04f5ac3 | 841 | |
5c57d762 | 842 | #: date.c:97 |
8ada9598 | 843 | msgid "in the future" |
81809b99 | 844 | msgstr "在将来" |
8ada9598 | 845 | |
5c57d762 | 846 | #: date.c:103 |
8ada9598 JX |
847 | #, c-format |
848 | msgid "%lu second ago" | |
849 | msgid_plural "%lu seconds ago" | |
6c94aba5 JX |
850 | msgstr[0] "%lu 秒钟前" |
851 | msgstr[1] "%lu 秒钟前" | |
8ada9598 | 852 | |
5c57d762 | 853 | #: date.c:110 |
8ada9598 JX |
854 | #, c-format |
855 | msgid "%lu minute ago" | |
856 | msgid_plural "%lu minutes ago" | |
6c94aba5 JX |
857 | msgstr[0] "%lu 分钟前" |
858 | msgstr[1] "%lu 分钟前" | |
8ada9598 | 859 | |
5c57d762 | 860 | #: date.c:117 |
8ada9598 JX |
861 | #, c-format |
862 | msgid "%lu hour ago" | |
863 | msgid_plural "%lu hours ago" | |
6c94aba5 JX |
864 | msgstr[0] "%lu 小时前" |
865 | msgstr[1] "%lu 小时前" | |
8ada9598 | 866 | |
5c57d762 | 867 | #: date.c:124 |
8ada9598 JX |
868 | #, c-format |
869 | msgid "%lu day ago" | |
870 | msgid_plural "%lu days ago" | |
6c94aba5 JX |
871 | msgstr[0] "%lu 天前" |
872 | msgstr[1] "%lu 天前" | |
8ada9598 | 873 | |
5c57d762 | 874 | #: date.c:130 |
8ada9598 JX |
875 | #, c-format |
876 | msgid "%lu week ago" | |
877 | msgid_plural "%lu weeks ago" | |
6c94aba5 JX |
878 | msgstr[0] "%lu 周前" |
879 | msgstr[1] "%lu 周前" | |
8ada9598 | 880 | |
5c57d762 | 881 | #: date.c:137 |
8ada9598 JX |
882 | #, c-format |
883 | msgid "%lu month ago" | |
884 | msgid_plural "%lu months ago" | |
6c94aba5 JX |
885 | msgstr[0] "%lu 个月前" |
886 | msgstr[1] "%lu 个月前" | |
8ada9598 | 887 | |
5c57d762 | 888 | #: date.c:148 |
8ada9598 JX |
889 | #, c-format |
890 | msgid "%lu year" | |
891 | msgid_plural "%lu years" | |
81809b99 | 892 | msgstr[0] "%lu 年" |
5ae481e0 | 893 | msgstr[1] "%lu 年" |
8ada9598 | 894 | |
6c94aba5 | 895 | #. TRANSLATORS: "%s" is "<n> years" |
5c57d762 | 896 | #: date.c:151 |
8ada9598 JX |
897 | #, c-format |
898 | msgid "%s, %lu month ago" | |
899 | msgid_plural "%s, %lu months ago" | |
6c94aba5 JX |
900 | msgstr[0] "%s %lu 个月前" |
901 | msgstr[1] "%s %lu 个月前" | |
8ada9598 | 902 | |
5c57d762 | 903 | #: date.c:156 date.c:161 |
8ada9598 JX |
904 | #, c-format |
905 | msgid "%lu year ago" | |
906 | msgid_plural "%lu years ago" | |
81809b99 | 907 | msgstr[0] "%lu 年前" |
5ae481e0 | 908 | msgstr[1] "%lu 年前" |
8ada9598 | 909 | |
cfff71a9 JX |
910 | #: diffcore-order.c:24 |
911 | #, c-format | |
912 | msgid "failed to read orderfile '%s'" | |
913 | msgstr "无法读取排序文件 '%s'" | |
914 | ||
5c57d762 | 915 | #: diffcore-rename.c:540 |
6c94aba5 JX |
916 | msgid "Performing inexact rename detection" |
917 | msgstr "正在进行非精确的重命名检测" | |
918 | ||
90e6ef53 | 919 | # 译者:注意保持前导空格 |
5b04ee3b | 920 | #: diff.c:116 |
c04f5ac3 | 921 | #, c-format |
07432cef WS |
922 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
923 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
c04f5ac3 | 924 | |
90e6ef53 | 925 | # 译者:注意保持前导空格 |
5b04ee3b | 926 | #: diff.c:121 |
c04f5ac3 | 927 | #, c-format |
07432cef WS |
928 | msgid " Unknown dirstat parameter '%s'\n" |
929 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
c04f5ac3 | 930 | |
5b04ee3b | 931 | #: diff.c:225 |
07432cef WS |
932 | #, c-format |
933 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
934 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
935 | ||
5b04ee3b | 936 | #: diff.c:277 |
c04f5ac3 JX |
937 | #, c-format |
938 | msgid "" | |
939 | "Found errors in 'diff.dirstat' config variable:\n" | |
940 | "%s" | |
941 | msgstr "" | |
90e6ef53 | 942 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
943 | "%s" |
944 | ||
5c57d762 | 945 | #: diff.c:3017 |
6acbf033 JX |
946 | #, c-format |
947 | msgid "external diff died, stopping at %s" | |
948 | msgstr "外部 diff 退出,停止在 %s" | |
949 | ||
5c57d762 | 950 | #: diff.c:3415 |
6acbf033 JX |
951 | msgid "--follow requires exactly one pathspec" |
952 | msgstr "--follow 参数后只跟一个 pathspec" | |
953 | ||
5c57d762 | 954 | #: diff.c:3578 |
c04f5ac3 JX |
955 | #, c-format |
956 | msgid "" | |
957 | "Failed to parse --dirstat/-X option parameter:\n" | |
958 | "%s" | |
959 | msgstr "" | |
960 | "无法解析 --dirstat/-X 选项的参数:\n" | |
961 | "%s" | |
962 | ||
5c57d762 | 963 | #: diff.c:3592 |
07432cef WS |
964 | #, c-format |
965 | msgid "Failed to parse --submodule option parameter: '%s'" | |
966 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
967 | ||
5b04ee3b | 968 | #: dir.c:1823 |
7aea43ff JX |
969 | msgid "failed to get kernel name and information" |
970 | msgstr "无法获得内核名称和信息" | |
971 | ||
5b04ee3b | 972 | #: dir.c:1942 |
276ceeaa JX |
973 | msgid "Untracked cache is disabled on this system or location." |
974 | msgstr "缓存未跟踪文件在本系统或位置中被禁用。" | |
7aea43ff | 975 | |
1b7f4a34 | 976 | #: gpg-interface.c:178 |
c04f5ac3 JX |
977 | msgid "gpg failed to sign the data" |
978 | msgstr "gpg 无法为数据签名" | |
979 | ||
5c57d762 JX |
980 | #: gpg-interface.c:208 |
981 | msgid "could not create temporary file" | |
982 | msgstr "不能创建临时文件" | |
a77c07d9 | 983 | |
5c57d762 | 984 | #: gpg-interface.c:210 |
a77c07d9 | 985 | #, c-format |
5b04ee3b JX |
986 | msgid "failed writing detached signature to '%s'" |
987 | msgstr "无法将分离式签名写入 '%s'" | |
a77c07d9 | 988 | |
5c57d762 | 989 | #: grep.c:1792 |
7ac1c0ad JX |
990 | #, c-format |
991 | msgid "'%s': unable to read %s" | |
992 | msgstr "'%s':无法读取 %s" | |
993 | ||
5c57d762 | 994 | #: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 |
7ac1c0ad | 995 | #, c-format |
5b04ee3b JX |
996 | msgid "failed to stat '%s'" |
997 | msgstr "无法枚举 '%s' 状态" | |
7ac1c0ad | 998 | |
5c57d762 | 999 | #: grep.c:1820 |
7ac1c0ad | 1000 | #, c-format |
5b04ee3b JX |
1001 | msgid "'%s': short read" |
1002 | msgstr "'%s':读取不完整" | |
7ac1c0ad | 1003 | |
276ceeaa | 1004 | #: help.c:205 |
81809b99 | 1005 | #, c-format |
8ada9598 | 1006 | msgid "available git commands in '%s'" |
81809b99 | 1007 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 1008 | |
276ceeaa | 1009 | #: help.c:212 |
8ada9598 | 1010 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 1011 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 1012 | |
276ceeaa | 1013 | #: help.c:244 |
7aea43ff JX |
1014 | msgid "These are common Git commands used in various situations:" |
1015 | msgstr "这些是各种场合常见的 Git 命令:" | |
a77c07d9 | 1016 | |
276ceeaa | 1017 | #: help.c:309 |
c04f5ac3 JX |
1018 | #, c-format |
1019 | msgid "" | |
1020 | "'%s' appears to be a git command, but we were not\n" | |
1021 | "able to execute it. Maybe git-%s is broken?" | |
1022 | msgstr "" | |
1023 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
1024 | "可能是 git-%s 受损?" | |
1025 | ||
276ceeaa | 1026 | #: help.c:366 |
8ada9598 | 1027 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 1028 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 1029 | |
276ceeaa | 1030 | #: help.c:388 |
8ada9598 JX |
1031 | #, c-format |
1032 | msgid "" | |
1033 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
1034 | "Continuing under the assumption that you meant '%s'" | |
1035 | msgstr "" | |
81809b99 JX |
1036 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
1037 | "是 '%s'" | |
8ada9598 | 1038 | |
276ceeaa | 1039 | #: help.c:393 |
8ada9598 JX |
1040 | #, c-format |
1041 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 1042 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 1043 | |
276ceeaa | 1044 | #: help.c:400 |
8ada9598 JX |
1045 | #, c-format |
1046 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 1047 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 1048 | |
5c57d762 | 1049 | #: help.c:404 help.c:470 |
8ada9598 JX |
1050 | msgid "" |
1051 | "\n" | |
1052 | "Did you mean this?" | |
1053 | msgid_plural "" | |
1054 | "\n" | |
1055 | "Did you mean one of these?" | |
1056 | msgstr[0] "" | |
81809b99 JX |
1057 | "\n" |
1058 | "您指的是这个么?" | |
1059 | msgstr[1] "" | |
1060 | "\n" | |
195febda | 1061 | "您指的是这其中的某一个么?" |
8ada9598 | 1062 | |
5c57d762 | 1063 | #: help.c:466 |
2e8451e8 JX |
1064 | #, c-format |
1065 | msgid "%s: %s - %s" | |
1066 | msgstr "%s:%s - %s" | |
1067 | ||
5b04ee3b JX |
1068 | #: lockfile.c:152 |
1069 | #, c-format | |
1070 | msgid "" | |
1071 | "Unable to create '%s.lock': %s.\n" | |
1072 | "\n" | |
1073 | "Another git process seems to be running in this repository, e.g.\n" | |
1074 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
1075 | "are terminated then try again. If it still fails, a git process\n" | |
1076 | "may have crashed in this repository earlier:\n" | |
1077 | "remove the file manually to continue." | |
1078 | msgstr "" | |
1079 | "无法创建 '%s.lock':%s。\n" | |
1080 | "\n" | |
1081 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
1082 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
1083 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
1084 | "手动删除这个文件再继续。" | |
1085 | ||
1086 | #: lockfile.c:160 | |
1087 | #, c-format | |
1088 | msgid "Unable to create '%s.lock': %s" | |
1089 | msgstr "不能创建 '%s.lock':%s" | |
1090 | ||
220c313c | 1091 | #: merge.c:41 |
07432cef WS |
1092 | msgid "failed to read the cache" |
1093 | msgstr "无法读取缓存" | |
1094 | ||
5c57d762 JX |
1095 | #: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 |
1096 | #: builtin/checkout.c:589 builtin/clone.c:732 | |
07432cef WS |
1097 | msgid "unable to write new index file" |
1098 | msgstr "无法写新的索引文件" | |
1099 | ||
5c57d762 | 1100 | #: merge-recursive.c:209 |
649900bc JX |
1101 | msgid "(bad commit)\n" |
1102 | msgstr "(坏提交)\n" | |
1103 | ||
5c57d762 | 1104 | #: merge-recursive.c:231 |
649900bc JX |
1105 | #, c-format |
1106 | msgid "addinfo_cache failed for path '%s'" | |
1107 | msgstr "为路径 '%s' addinfo_cache 失败" | |
1108 | ||
5c57d762 | 1109 | #: merge-recursive.c:301 |
649900bc JX |
1110 | msgid "error building trees" |
1111 | msgstr "无法创建树" | |
1112 | ||
5c57d762 | 1113 | #: merge-recursive.c:720 |
649900bc JX |
1114 | #, c-format |
1115 | msgid "failed to create path '%s'%s" | |
1116 | msgstr "无法创建路径 '%s'%s" | |
1117 | ||
5c57d762 | 1118 | #: merge-recursive.c:731 |
649900bc JX |
1119 | #, c-format |
1120 | msgid "Removing %s to make room for subdirectory\n" | |
1121 | msgstr "删除 %s 以便为子目录留出空间\n" | |
1122 | ||
5c57d762 | 1123 | #: merge-recursive.c:745 merge-recursive.c:764 |
649900bc JX |
1124 | msgid ": perhaps a D/F conflict?" |
1125 | msgstr ":可能是一个目录/文件冲突?" | |
1126 | ||
5c57d762 | 1127 | #: merge-recursive.c:754 |
649900bc JX |
1128 | #, c-format |
1129 | msgid "refusing to lose untracked file at '%s'" | |
1130 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
1131 | ||
5c57d762 | 1132 | #: merge-recursive.c:796 |
649900bc JX |
1133 | #, c-format |
1134 | msgid "cannot read object %s '%s'" | |
1135 | msgstr "不能读取对象 %s '%s'" | |
1136 | ||
5c57d762 | 1137 | #: merge-recursive.c:798 |
649900bc JX |
1138 | #, c-format |
1139 | msgid "blob expected for %s '%s'" | |
160fb2b2 | 1140 | msgstr "%s '%s' 应为数据对象" |
649900bc | 1141 | |
5c57d762 | 1142 | #: merge-recursive.c:822 |
649900bc | 1143 | #, c-format |
5c57d762 JX |
1144 | msgid "failed to open '%s': %s" |
1145 | msgstr "无法打开 '%s':%s" | |
649900bc | 1146 | |
5c57d762 | 1147 | #: merge-recursive.c:833 |
649900bc | 1148 | #, c-format |
5c57d762 JX |
1149 | msgid "failed to symlink '%s': %s" |
1150 | msgstr "无法创建符号链接 '%s':%s" | |
649900bc | 1151 | |
5c57d762 | 1152 | #: merge-recursive.c:838 |
649900bc JX |
1153 | #, c-format |
1154 | msgid "do not know what to do with %06o %s '%s'" | |
1155 | msgstr "不知道如何处理 %06o %s '%s'" | |
1156 | ||
5c57d762 | 1157 | #: merge-recursive.c:978 |
649900bc JX |
1158 | msgid "Failed to execute internal merge" |
1159 | msgstr "无法执行内部合并" | |
1160 | ||
5c57d762 | 1161 | #: merge-recursive.c:982 |
649900bc JX |
1162 | #, c-format |
1163 | msgid "Unable to add %s to database" | |
1164 | msgstr "不能添加 %s 至对象库" | |
1165 | ||
5c57d762 | 1166 | #: merge-recursive.c:1081 merge-recursive.c:1095 |
649900bc JX |
1167 | #, c-format |
1168 | msgid "" | |
1169 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
1170 | "in tree." | |
1171 | msgstr "" | |
1172 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
1173 | "的版本被保留。" | |
1174 | ||
5c57d762 | 1175 | #: merge-recursive.c:1087 merge-recursive.c:1100 |
649900bc JX |
1176 | #, c-format |
1177 | msgid "" | |
1178 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
1179 | "in tree at %s." | |
1180 | msgstr "" | |
1181 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
1182 | "的版本保留于 %8$s 中。" | |
1183 | ||
5c57d762 | 1184 | #: merge-recursive.c:1143 |
649900bc JX |
1185 | msgid "rename" |
1186 | msgstr "重命名" | |
1187 | ||
5c57d762 | 1188 | #: merge-recursive.c:1143 |
649900bc JX |
1189 | msgid "renamed" |
1190 | msgstr "重命名" | |
1191 | ||
5c57d762 | 1192 | #: merge-recursive.c:1200 |
649900bc JX |
1193 | #, c-format |
1194 | msgid "%s is a directory in %s adding as %s instead" | |
1195 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
1196 | ||
5c57d762 | 1197 | #: merge-recursive.c:1225 |
649900bc JX |
1198 | #, c-format |
1199 | msgid "" | |
1200 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
1201 | "\"->\"%s\" in \"%s\"%s" | |
1202 | msgstr "" | |
1203 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " | |
1204 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
1205 | ||
5c57d762 | 1206 | #: merge-recursive.c:1230 |
649900bc JX |
1207 | msgid " (left unresolved)" |
1208 | msgstr "(留下未解决)" | |
1209 | ||
5c57d762 | 1210 | #: merge-recursive.c:1292 |
649900bc JX |
1211 | #, c-format |
1212 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
1213 | msgstr "" | |
1214 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" | |
1215 | "%5$s" | |
1216 | ||
5c57d762 | 1217 | #: merge-recursive.c:1325 |
649900bc JX |
1218 | #, c-format |
1219 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 1220 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 1221 | |
5c57d762 | 1222 | #: merge-recursive.c:1531 |
649900bc JX |
1223 | #, c-format |
1224 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
1225 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
1226 | ||
5c57d762 | 1227 | #: merge-recursive.c:1546 |
649900bc JX |
1228 | #, c-format |
1229 | msgid "Adding merged %s" | |
1230 | msgstr "添加合并后的 %s" | |
1231 | ||
5c57d762 | 1232 | #: merge-recursive.c:1553 merge-recursive.c:1766 |
649900bc JX |
1233 | #, c-format |
1234 | msgid "Adding as %s instead" | |
1235 | msgstr "而是以 %s 为名添加" | |
1236 | ||
5c57d762 | 1237 | #: merge-recursive.c:1610 |
649900bc JX |
1238 | #, c-format |
1239 | msgid "cannot read object %s" | |
1240 | msgstr "不能读取对象 %s" | |
1241 | ||
5c57d762 | 1242 | #: merge-recursive.c:1613 |
649900bc JX |
1243 | #, c-format |
1244 | msgid "object %s is not a blob" | |
160fb2b2 | 1245 | msgstr "对象 %s 不是一个数据对象" |
649900bc | 1246 | |
5c57d762 | 1247 | #: merge-recursive.c:1666 |
649900bc JX |
1248 | msgid "modify" |
1249 | msgstr "修改" | |
1250 | ||
5c57d762 | 1251 | #: merge-recursive.c:1666 |
649900bc JX |
1252 | msgid "modified" |
1253 | msgstr "修改" | |
1254 | ||
5c57d762 | 1255 | #: merge-recursive.c:1676 |
649900bc JX |
1256 | msgid "content" |
1257 | msgstr "内容" | |
1258 | ||
5c57d762 | 1259 | #: merge-recursive.c:1683 |
649900bc JX |
1260 | msgid "add/add" |
1261 | msgstr "添加/添加" | |
1262 | ||
5c57d762 | 1263 | #: merge-recursive.c:1718 |
649900bc JX |
1264 | #, c-format |
1265 | msgid "Skipped %s (merged same as existing)" | |
1266 | msgstr "略过 %s(已经做过相同合并)" | |
1267 | ||
5c57d762 | 1268 | #: merge-recursive.c:1732 |
649900bc JX |
1269 | #, c-format |
1270 | msgid "Auto-merging %s" | |
1271 | msgstr "自动合并 %s" | |
1272 | ||
5c57d762 | 1273 | #: merge-recursive.c:1736 git-submodule.sh:919 |
649900bc JX |
1274 | msgid "submodule" |
1275 | msgstr "子模组" | |
1276 | ||
5c57d762 | 1277 | #: merge-recursive.c:1737 |
649900bc JX |
1278 | #, c-format |
1279 | msgid "CONFLICT (%s): Merge conflict in %s" | |
1280 | msgstr "冲突(%s):合并冲突于 %s" | |
1281 | ||
5c57d762 | 1282 | #: merge-recursive.c:1831 |
649900bc JX |
1283 | #, c-format |
1284 | msgid "Removing %s" | |
1285 | msgstr "删除 %s" | |
1286 | ||
5c57d762 | 1287 | #: merge-recursive.c:1857 |
649900bc JX |
1288 | msgid "file/directory" |
1289 | msgstr "文件/目录" | |
1290 | ||
5c57d762 | 1291 | #: merge-recursive.c:1863 |
649900bc JX |
1292 | msgid "directory/file" |
1293 | msgstr "目录/文件" | |
1294 | ||
5c57d762 | 1295 | #: merge-recursive.c:1868 |
649900bc JX |
1296 | #, c-format |
1297 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
1298 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
1299 | ||
5c57d762 | 1300 | #: merge-recursive.c:1877 |
649900bc JX |
1301 | #, c-format |
1302 | msgid "Adding %s" | |
1303 | msgstr "添加 %s" | |
1304 | ||
5c57d762 | 1305 | #: merge-recursive.c:1914 |
649900bc JX |
1306 | msgid "Already up-to-date!" |
1307 | msgstr "已经是最新的!" | |
1308 | ||
5c57d762 | 1309 | #: merge-recursive.c:1923 |
649900bc JX |
1310 | #, c-format |
1311 | msgid "merging of trees %s and %s failed" | |
1312 | msgstr "无法合并树 %s 和 %s" | |
1313 | ||
5c57d762 | 1314 | #: merge-recursive.c:2006 |
649900bc JX |
1315 | msgid "Merging:" |
1316 | msgstr "合并:" | |
1317 | ||
5c57d762 | 1318 | #: merge-recursive.c:2019 |
649900bc | 1319 | #, c-format |
e5e38ce4 JX |
1320 | msgid "found %u common ancestor:" |
1321 | msgid_plural "found %u common ancestors:" | |
1322 | msgstr[0] "发现 %u 个共同祖先:" | |
1323 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 1324 | |
5c57d762 | 1325 | #: merge-recursive.c:2058 |
649900bc JX |
1326 | msgid "merge returned no commit" |
1327 | msgstr "合并未返回提交" | |
1328 | ||
5c57d762 | 1329 | #: merge-recursive.c:2121 |
649900bc JX |
1330 | #, c-format |
1331 | msgid "Could not parse object '%s'" | |
1332 | msgstr "不能解析对象 '%s'" | |
1333 | ||
5c57d762 | 1334 | #: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 |
649900bc JX |
1335 | msgid "Unable to write index." |
1336 | msgstr "不能写入索引。" | |
1337 | ||
6acbf033 | 1338 | #: notes-utils.c:41 |
2e8451e8 JX |
1339 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
1340 | msgstr "不能提交未初始化/未引用的注解树" | |
1341 | ||
1b7f4a34 | 1342 | #: notes-utils.c:100 |
2e8451e8 JX |
1343 | #, c-format |
1344 | msgid "Bad notes.rewriteMode value: '%s'" | |
1345 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1346 | ||
1b7f4a34 | 1347 | #: notes-utils.c:110 |
2e8451e8 JX |
1348 | #, c-format |
1349 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
1350 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
1351 | ||
1352 | #. TRANSLATORS: The first %s is the name of the | |
1353 | #. environment variable, the second %s is its value | |
1b7f4a34 | 1354 | #: notes-utils.c:137 |
2e8451e8 JX |
1355 | #, c-format |
1356 | msgid "Bad %s value: '%s'" | |
1357 | msgstr "坏的 %s 值:'%s'" | |
1358 | ||
7aea43ff | 1359 | #: object.c:242 |
1003b3a5 JX |
1360 | #, c-format |
1361 | msgid "unable to parse object: %s" | |
1362 | msgstr "不能解析对象:%s" | |
1363 | ||
5b04ee3b | 1364 | #: parse-options.c:572 |
8ada9598 | 1365 | msgid "..." |
81809b99 | 1366 | msgstr "..." |
8ada9598 | 1367 | |
5b04ee3b | 1368 | #: parse-options.c:590 |
81809b99 | 1369 | #, c-format |
8ada9598 | 1370 | msgid "usage: %s" |
81809b99 | 1371 | msgstr "用法:%s" |
8ada9598 JX |
1372 | |
1373 | #. TRANSLATORS: the colon here should align with the | |
1374 | #. one in "usage: %s" translation | |
5b04ee3b | 1375 | #: parse-options.c:594 |
81809b99 | 1376 | #, c-format |
8ada9598 | 1377 | msgid " or: %s" |
81809b99 | 1378 | msgstr " 或:%s" |
8ada9598 JX |
1379 | |
1380 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
5b04ee3b | 1381 | #: parse-options.c:597 |
81809b99 | 1382 | #, c-format |
8ada9598 | 1383 | msgid " %s" |
81809b99 | 1384 | msgstr " %s" |
8ada9598 | 1385 | |
5b04ee3b | 1386 | #: parse-options.c:631 |
63af42fe JX |
1387 | msgid "-NUM" |
1388 | msgstr "-数字" | |
1389 | ||
94550ed3 JX |
1390 | #: parse-options-cb.c:108 |
1391 | #, c-format | |
1392 | msgid "malformed object name '%s'" | |
1393 | msgstr "非法的对象名 '%s'" | |
1394 | ||
5c57d762 | 1395 | #: path.c:798 |
94550ed3 JX |
1396 | #, c-format |
1397 | msgid "Could not make %s writable by group" | |
1398 | msgstr "不能设置 %s 为组可写" | |
1399 | ||
cfff71a9 | 1400 | #: pathspec.c:133 |
90314792 | 1401 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
160fb2b2 | 1402 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" |
90314792 | 1403 | |
cfff71a9 | 1404 | #: pathspec.c:143 |
90314792 JX |
1405 | msgid "" |
1406 | "global 'literal' pathspec setting is incompatible with all other global " | |
1407 | "pathspec settings" | |
160fb2b2 | 1408 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" |
90314792 | 1409 | |
cfff71a9 | 1410 | #: pathspec.c:177 |
90314792 | 1411 | msgid "invalid parameter for pathspec magic 'prefix'" |
160fb2b2 | 1412 | msgstr "路径规格包含无效的神奇前缀" |
90314792 | 1413 | |
cfff71a9 | 1414 | #: pathspec.c:183 |
90314792 JX |
1415 | #, c-format |
1416 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
160fb2b2 | 1417 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" |
90314792 | 1418 | |
cfff71a9 | 1419 | #: pathspec.c:187 |
90314792 JX |
1420 | #, c-format |
1421 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
160fb2b2 | 1422 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" |
90314792 | 1423 | |
cfff71a9 | 1424 | #: pathspec.c:205 |
90314792 JX |
1425 | #, c-format |
1426 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
160fb2b2 | 1427 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" |
90314792 | 1428 | |
cfff71a9 | 1429 | #: pathspec.c:230 |
a77c07d9 | 1430 | #, c-format |
90314792 JX |
1431 | msgid "%s: 'literal' and 'glob' are incompatible" |
1432 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 1433 | |
cfff71a9 | 1434 | #: pathspec.c:241 |
a77c07d9 | 1435 | #, c-format |
90314792 | 1436 | msgid "%s: '%s' is outside repository" |
160fb2b2 | 1437 | msgstr "%s:'%s' 在仓库之外" |
a77c07d9 | 1438 | |
cfff71a9 | 1439 | #: pathspec.c:291 |
90314792 JX |
1440 | #, c-format |
1441 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
160fb2b2 | 1442 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" |
90314792 | 1443 | |
cfff71a9 | 1444 | #: pathspec.c:353 |
90314792 JX |
1445 | #, c-format |
1446 | msgid "%s: pathspec magic not supported by this command: %s" | |
160fb2b2 | 1447 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" |
90314792 | 1448 | |
276ceeaa | 1449 | #: pathspec.c:433 |
90314792 JX |
1450 | #, c-format |
1451 | msgid "pathspec '%s' is beyond a symbolic link" | |
160fb2b2 | 1452 | msgstr "路径规格 '%s' 位于符号链接中" |
90314792 | 1453 | |
276ceeaa | 1454 | #: pathspec.c:442 |
cfff71a9 JX |
1455 | msgid "" |
1456 | "There is nothing to exclude from by :(exclude) patterns.\n" | |
1457 | "Perhaps you forgot to add either ':/' or '.' ?" | |
1458 | msgstr "" | |
1459 | "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n" | |
1460 | "添加 ':/' 或 '.' ?" | |
1461 | ||
5c57d762 | 1462 | #: pretty.c:973 |
220c313c JX |
1463 | msgid "unable to parse --pretty format" |
1464 | msgstr "不能解析 --pretty 格式" | |
1465 | ||
94550ed3 | 1466 | #: progress.c:235 |
6c94aba5 JX |
1467 | msgid "done" |
1468 | msgstr "完成" | |
1469 | ||
94550ed3 | 1470 | #: read-cache.c:1281 |
6c94aba5 JX |
1471 | #, c-format |
1472 | msgid "" | |
1473 | "index.version set, but the value is invalid.\n" | |
1474 | "Using version %i" | |
1475 | msgstr "" | |
1476 | "设置了 index.version,但是取值无效。\n" | |
1477 | "使用版本 %i" | |
1478 | ||
94550ed3 | 1479 | #: read-cache.c:1291 |
6c94aba5 JX |
1480 | #, c-format |
1481 | msgid "" | |
1482 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1483 | "Using version %i" | |
1484 | msgstr "" | |
1485 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" | |
1486 | "使用版本 %i" | |
1487 | ||
5c57d762 | 1488 | #: refs.c:551 builtin/merge.c:840 |
1b7f4a34 JX |
1489 | #, c-format |
1490 | msgid "Could not open '%s' for writing" | |
1491 | msgstr "无法打开 '%s' 进行写入" | |
1492 | ||
5c57d762 | 1493 | #: refs/files-backend.c:2534 |
1b7f4a34 JX |
1494 | #, c-format |
1495 | msgid "could not delete reference %s: %s" | |
1496 | msgstr "无法删除引用 %s:%s" | |
1497 | ||
5c57d762 | 1498 | #: refs/files-backend.c:2537 |
1b7f4a34 JX |
1499 | #, c-format |
1500 | msgid "could not delete references: %s" | |
1501 | msgstr "无法删除引用:%s" | |
1502 | ||
5c57d762 | 1503 | #: refs/files-backend.c:2546 |
1b7f4a34 JX |
1504 | #, c-format |
1505 | msgid "could not remove reference %s" | |
1506 | msgstr "无法删除引用 %s" | |
1507 | ||
276ceeaa | 1508 | #: ref-filter.c:55 |
94550ed3 | 1509 | #, c-format |
276ceeaa JX |
1510 | msgid "expected format: %%(color:<color>)" |
1511 | msgstr "期望的格式:%%(color:<color>)" | |
1512 | ||
1513 | #: ref-filter.c:57 | |
1514 | #, c-format | |
1515 | msgid "unrecognized color: %%(color:%s)" | |
1516 | msgstr "未能识别的颜色:%%(color:%s)" | |
1517 | ||
1518 | #: ref-filter.c:71 | |
1519 | #, c-format | |
1520 | msgid "unrecognized format: %%(%s)" | |
1521 | msgstr "未能识别的格式:%%(%s)" | |
94550ed3 | 1522 | |
3495628d JX |
1523 | #: ref-filter.c:77 |
1524 | #, c-format | |
1525 | msgid "%%(body) does not take arguments" | |
1526 | msgstr "%%(body) 不带参数" | |
1527 | ||
1528 | #: ref-filter.c:84 | |
1529 | #, c-format | |
1530 | msgid "%%(subject) does not take arguments" | |
1531 | msgstr "%%(subject) 不带参数" | |
1532 | ||
276ceeaa | 1533 | #: ref-filter.c:101 |
94550ed3 JX |
1534 | #, c-format |
1535 | msgid "positive value expected contents:lines=%s" | |
1536 | msgstr "要为 contents:lines=%s 提供一个正数" | |
1537 | ||
276ceeaa | 1538 | #: ref-filter.c:103 |
94550ed3 | 1539 | #, c-format |
276ceeaa JX |
1540 | msgid "unrecognized %%(contents) argument: %s" |
1541 | msgstr "未能识别的 %%(contents) 参数:%s" | |
94550ed3 | 1542 | |
276ceeaa JX |
1543 | #: ref-filter.c:113 |
1544 | #, c-format | |
1545 | msgid "unrecognized %%(objectname) argument: %s" | |
1546 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
1b7f4a34 | 1547 | |
276ceeaa | 1548 | #: ref-filter.c:135 |
94550ed3 JX |
1549 | #, c-format |
1550 | msgid "expected format: %%(align:<width>,<position>)" | |
1551 | msgstr "期望的格式:%%(align:<width>,<position>)" | |
1552 | ||
276ceeaa JX |
1553 | #: ref-filter.c:147 |
1554 | #, c-format | |
1555 | msgid "unrecognized position:%s" | |
1556 | msgstr "未能识别的位置:%s" | |
1557 | ||
1558 | #: ref-filter.c:151 | |
94550ed3 | 1559 | #, c-format |
276ceeaa JX |
1560 | msgid "unrecognized width:%s" |
1561 | msgstr "未能识别的宽度:%s" | |
94550ed3 | 1562 | |
276ceeaa JX |
1563 | #: ref-filter.c:157 |
1564 | #, c-format | |
1565 | msgid "unrecognized %%(align) argument: %s" | |
1566 | msgstr "未能识别的 %%(align) 参数:%s" | |
1567 | ||
1568 | #: ref-filter.c:161 | |
94550ed3 JX |
1569 | #, c-format |
1570 | msgid "positive width expected with the %%(align) atom" | |
1571 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1572 | ||
3495628d JX |
1573 | #: ref-filter.c:244 |
1574 | #, c-format | |
1575 | msgid "malformed field name: %.*s" | |
1576 | msgstr "非法的字段名:%.*s" | |
1577 | ||
1578 | #: ref-filter.c:270 | |
1579 | #, c-format | |
1580 | msgid "unknown field name: %.*s" | |
1581 | msgstr "未知的字段名:%.*s" | |
1582 | ||
276ceeaa JX |
1583 | #: ref-filter.c:372 |
1584 | #, c-format | |
1585 | msgid "format: %%(end) atom used without corresponding atom" | |
1586 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
1587 | ||
3495628d JX |
1588 | #: ref-filter.c:424 |
1589 | #, c-format | |
1590 | msgid "malformed format string %s" | |
1591 | msgstr "非法的格式化字符串 %s" | |
1592 | ||
1593 | #: ref-filter.c:878 | |
1594 | msgid ":strip= requires a positive integer argument" | |
1595 | msgstr ":strip= 需要一个正整型参数" | |
1596 | ||
1597 | #: ref-filter.c:883 | |
1598 | #, c-format | |
1599 | msgid "ref '%s' does not have %ld components to :strip" | |
26e4cbec | 1600 | msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件" |
3495628d JX |
1601 | |
1602 | #: ref-filter.c:1046 | |
1603 | #, c-format | |
1604 | msgid "unknown %.*s format %s" | |
26e4cbec | 1605 | msgstr "未知的 %.*s 格式 %s" |
3495628d JX |
1606 | |
1607 | #: ref-filter.c:1066 ref-filter.c:1097 | |
1608 | #, c-format | |
1609 | msgid "missing object %s for %s" | |
26e4cbec | 1610 | msgstr "缺失 %2$s 的对象 %1$s" |
3495628d JX |
1611 | |
1612 | #: ref-filter.c:1069 ref-filter.c:1100 | |
1613 | #, c-format | |
1614 | msgid "parse_object_buffer failed on %s for %s" | |
1615 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
1616 | ||
276ceeaa | 1617 | #: ref-filter.c:1311 |
94550ed3 JX |
1618 | #, c-format |
1619 | msgid "malformed object at '%s'" | |
1620 | msgstr "非法的对象于 '%s'" | |
1621 | ||
3495628d JX |
1622 | #: ref-filter.c:1373 |
1623 | #, c-format | |
1624 | msgid "ignoring ref with broken name %s" | |
1625 | msgstr "忽略带有错误名称 %s 的引用" | |
1626 | ||
1627 | #: ref-filter.c:1378 | |
1628 | #, c-format | |
1629 | msgid "ignoring broken ref %s" | |
1630 | msgstr "忽略损坏的引用 %s" | |
1631 | ||
276ceeaa | 1632 | #: ref-filter.c:1651 |
94550ed3 JX |
1633 | #, c-format |
1634 | msgid "format: %%(end) atom missing" | |
1635 | msgstr "格式:缺少 %%(end) 元素" | |
1636 | ||
276ceeaa | 1637 | #: ref-filter.c:1705 |
94550ed3 JX |
1638 | #, c-format |
1639 | msgid "malformed object name %s" | |
1640 | msgstr "非法的对象名 %s" | |
1641 | ||
5b04ee3b | 1642 | #: remote.c:746 |
cfff71a9 JX |
1643 | #, c-format |
1644 | msgid "Cannot fetch both %s and %s to %s" | |
1645 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
1646 | ||
5b04ee3b | 1647 | #: remote.c:750 |
cfff71a9 JX |
1648 | #, c-format |
1649 | msgid "%s usually tracks %s, not %s" | |
1650 | msgstr "%s 通常跟踪 %s,而非 %s" | |
1651 | ||
5b04ee3b | 1652 | #: remote.c:754 |
cfff71a9 JX |
1653 | #, c-format |
1654 | msgid "%s tracks both %s and %s" | |
1655 | msgstr "%s 同时跟踪 %s 和 %s" | |
1656 | ||
5b04ee3b | 1657 | #: remote.c:762 |
cfff71a9 JX |
1658 | msgid "Internal error" |
1659 | msgstr "内部错误" | |
1660 | ||
5c57d762 | 1661 | #: remote.c:1677 remote.c:1720 |
7aea43ff JX |
1662 | msgid "HEAD does not point to a branch" |
1663 | msgstr "HEAD 没有指向一个分支" | |
1664 | ||
5c57d762 | 1665 | #: remote.c:1686 |
7aea43ff JX |
1666 | #, c-format |
1667 | msgid "no such branch: '%s'" | |
1668 | msgstr "没有此分支:'%s'" | |
1669 | ||
5c57d762 | 1670 | #: remote.c:1689 |
7aea43ff JX |
1671 | #, c-format |
1672 | msgid "no upstream configured for branch '%s'" | |
1673 | msgstr "尚未给分支 '%s' 设置上游" | |
1674 | ||
5c57d762 | 1675 | #: remote.c:1695 |
7aea43ff JX |
1676 | #, c-format |
1677 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
1678 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1679 | ||
5c57d762 | 1680 | #: remote.c:1710 |
7aea43ff JX |
1681 | #, c-format |
1682 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
1683 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
1684 | ||
5c57d762 | 1685 | #: remote.c:1725 |
7aea43ff JX |
1686 | #, c-format |
1687 | msgid "branch '%s' has no remote for pushing" | |
1688 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
1689 | ||
5c57d762 | 1690 | #: remote.c:1736 |
7aea43ff JX |
1691 | #, c-format |
1692 | msgid "push refspecs for '%s' do not include '%s'" | |
160fb2b2 | 1693 | msgstr "向 '%s' 推送引用规格未包含 '%s'" |
7aea43ff | 1694 | |
5c57d762 | 1695 | #: remote.c:1749 |
7aea43ff JX |
1696 | msgid "push has no destination (push.default is 'nothing')" |
1697 | msgstr "推送无目标(push.default 是 'nothing')" | |
1698 | ||
5c57d762 | 1699 | #: remote.c:1771 |
7aea43ff JX |
1700 | msgid "cannot resolve 'simple' push to a single destination" |
1701 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
1702 | ||
5c57d762 | 1703 | #: remote.c:2073 |
90314792 JX |
1704 | #, c-format |
1705 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
1706 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
1707 | ||
5c57d762 | 1708 | #: remote.c:2077 |
90314792 JX |
1709 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
1710 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
1711 | ||
5c57d762 | 1712 | #: remote.c:2080 |
90314792 JX |
1713 | #, c-format |
1714 | msgid "Your branch is up-to-date with '%s'.\n" | |
1715 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
1716 | ||
5c57d762 | 1717 | #: remote.c:2084 |
c04f5ac3 JX |
1718 | #, c-format |
1719 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
1720 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
1721 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 1722 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 1723 | |
5c57d762 | 1724 | #: remote.c:2090 |
07432cef WS |
1725 | msgid " (use \"git push\" to publish your local commits)\n" |
1726 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
1727 | ||
5c57d762 | 1728 | #: remote.c:2093 |
c04f5ac3 JX |
1729 | #, c-format |
1730 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
1731 | msgid_plural "" | |
1732 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 1733 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 1734 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 1735 | |
07432cef | 1736 | # 译者:注意保持前导空格 |
5c57d762 | 1737 | #: remote.c:2101 |
07432cef WS |
1738 | msgid " (use \"git pull\" to update your local branch)\n" |
1739 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
1740 | ||
5c57d762 | 1741 | #: remote.c:2104 |
c04f5ac3 JX |
1742 | #, c-format |
1743 | msgid "" | |
1744 | "Your branch and '%s' have diverged,\n" | |
1745 | "and have %d and %d different commit each, respectively.\n" | |
1746 | msgid_plural "" | |
1747 | "Your branch and '%s' have diverged,\n" | |
1748 | "and have %d and %d different commits each, respectively.\n" | |
1749 | msgstr[0] "" | |
1750 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1751 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1752 | msgstr[1] "" |
1753 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1754 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1755 | |
07432cef | 1756 | # 译者:注意保持前导空格 |
5c57d762 | 1757 | #: remote.c:2114 |
07432cef WS |
1758 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1759 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1760 | ||
5c57d762 | 1761 | #: revision.c:2132 |
1b7f4a34 JX |
1762 | msgid "your current branch appears to be broken" |
1763 | msgstr "您的当前分支好像被损坏" | |
1764 | ||
5c57d762 | 1765 | #: revision.c:2135 |
1b7f4a34 JX |
1766 | #, c-format |
1767 | msgid "your current branch '%s' does not have any commits yet" | |
1768 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
1769 | ||
5c57d762 | 1770 | #: revision.c:2329 |
814ff314 JX |
1771 | msgid "--first-parent is incompatible with --bisect" |
1772 | msgstr "--first-parent 与 --bisect 不兼容" | |
1773 | ||
276ceeaa | 1774 | #: run-command.c:92 |
2e8451e8 JX |
1775 | msgid "open /dev/null failed" |
1776 | msgstr "不能打开 /dev/null" | |
1777 | ||
276ceeaa | 1778 | #: run-command.c:94 |
2e8451e8 JX |
1779 | #, c-format |
1780 | msgid "dup2(%d,%d) failed" | |
1781 | msgstr "不能调用 dup2(%d,%d)" | |
1782 | ||
5c57d762 | 1783 | #: send-pack.c:298 |
220c313c JX |
1784 | msgid "failed to sign the push certificate" |
1785 | msgstr "无法为推送证书签名" | |
1786 | ||
5c57d762 | 1787 | #: send-pack.c:411 |
220c313c JX |
1788 | msgid "the receiving end does not support --signed push" |
1789 | msgstr "接收端不支持签名推送" | |
1790 | ||
5c57d762 | 1791 | #: send-pack.c:413 |
1b7f4a34 JX |
1792 | msgid "" |
1793 | "not sending a push certificate since the receiving end does not support --" | |
1794 | "signed push" | |
1795 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
1796 | ||
5c57d762 | 1797 | #: send-pack.c:425 |
44f518e6 JX |
1798 | msgid "the receiving end does not support --atomic push" |
1799 | msgstr "接收端不支持原子推送" | |
814ff314 | 1800 | |
5c57d762 JX |
1801 | #: send-pack.c:430 |
1802 | msgid "the receiving end does not support push options" | |
1803 | msgstr "接收端不支持推送选项" | |
1804 | ||
276ceeaa | 1805 | #: sequencer.c:174 |
14c8bced JX |
1806 | msgid "" |
1807 | "after resolving the conflicts, mark the corrected paths\n" | |
1808 | "with 'git add <paths>' or 'git rm <paths>'" | |
1809 | msgstr "" | |
d9d56b23 | 1810 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
14c8bced JX |
1811 | "命令标记修正后的文件" |
1812 | ||
276ceeaa | 1813 | #: sequencer.c:177 |
c04f5ac3 JX |
1814 | msgid "" |
1815 | "after resolving the conflicts, mark the corrected paths\n" | |
1816 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
1817 | "and commit the result with 'git commit'" | |
1818 | msgstr "" | |
d9d56b23 | 1819 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" |
c04f5ac3 JX |
1820 | "对修正后的文件做标记,然后用 'git commit' 提交" |
1821 | ||
5c57d762 | 1822 | #: sequencer.c:190 sequencer.c:841 sequencer.c:924 |
c04f5ac3 JX |
1823 | #, c-format |
1824 | msgid "Could not write to %s" | |
1825 | msgstr "不能写入 %s" | |
1826 | ||
5c57d762 | 1827 | #: sequencer.c:193 sequencer.c:843 sequencer.c:928 |
c04f5ac3 | 1828 | #, c-format |
5c57d762 JX |
1829 | msgid "Error wrapping up %s." |
1830 | msgstr "错误收尾 %s。" | |
c04f5ac3 | 1831 | |
276ceeaa | 1832 | #: sequencer.c:208 |
c04f5ac3 JX |
1833 | msgid "Your local changes would be overwritten by cherry-pick." |
1834 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1835 | ||
276ceeaa | 1836 | #: sequencer.c:210 |
c04f5ac3 JX |
1837 | msgid "Your local changes would be overwritten by revert." |
1838 | msgstr "您的本地修改将被还原操作覆盖。" | |
1839 | ||
276ceeaa | 1840 | #: sequencer.c:213 |
c04f5ac3 JX |
1841 | msgid "Commit your changes or stash them to proceed." |
1842 | msgstr "提交您的修改或保存进度后再继续。" | |
1843 | ||
5c57d762 JX |
1844 | #: sequencer.c:228 |
1845 | #, c-format | |
1846 | msgid "%s: fast-forward" | |
1847 | msgstr "%s:快进" | |
1848 | ||
c04f5ac3 | 1849 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" |
5c57d762 | 1850 | #: sequencer.c:303 |
c04f5ac3 JX |
1851 | #, c-format |
1852 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1853 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1854 | |
5c57d762 | 1855 | #: sequencer.c:321 |
8ada9598 | 1856 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1857 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1858 | |
5c57d762 | 1859 | #: sequencer.c:341 |
8ada9598 | 1860 | msgid "Unable to update cache tree\n" |
81809b99 | 1861 | msgstr "不能更新缓存\n" |
8ada9598 | 1862 | |
5c57d762 | 1863 | #: sequencer.c:393 |
81809b99 | 1864 | #, c-format |
8ada9598 | 1865 | msgid "Could not parse commit %s\n" |
81809b99 | 1866 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1867 | |
5c57d762 | 1868 | #: sequencer.c:398 |
81809b99 | 1869 | #, c-format |
8ada9598 | 1870 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1871 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1872 | |
5c57d762 | 1873 | #: sequencer.c:463 |
c04f5ac3 | 1874 | msgid "Your index file is unmerged." |
90e6ef53 | 1875 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1876 | |
5c57d762 | 1877 | #: sequencer.c:482 |
c04f5ac3 JX |
1878 | #, c-format |
1879 | msgid "Commit %s is a merge but no -m option was given." | |
1880 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1881 | ||
5c57d762 | 1882 | #: sequencer.c:490 |
c04f5ac3 JX |
1883 | #, c-format |
1884 | msgid "Commit %s does not have parent %d" | |
1885 | msgstr "提交 %s 没有父提交 %d" | |
1886 | ||
5c57d762 | 1887 | #: sequencer.c:494 |
c04f5ac3 JX |
1888 | #, c-format |
1889 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1890 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
1891 | |
1892 | #. TRANSLATORS: The first %s will be "revert" or | |
1893 | #. "cherry-pick", the second %s a SHA1 | |
5c57d762 | 1894 | #: sequencer.c:507 |
c04f5ac3 JX |
1895 | #, c-format |
1896 | msgid "%s: cannot parse parent commit %s" | |
1897 | msgstr "%s:不能解析父提交 %s" | |
1898 | ||
5c57d762 | 1899 | #: sequencer.c:511 |
c04f5ac3 JX |
1900 | #, c-format |
1901 | msgid "Cannot get commit message for %s" | |
1902 | msgstr "不能得到 %s 的提交说明" | |
1903 | ||
5c57d762 | 1904 | #: sequencer.c:597 |
c04f5ac3 JX |
1905 | #, c-format |
1906 | msgid "could not revert %s... %s" | |
1907 | msgstr "不能还原 %s... %s" | |
1908 | ||
5c57d762 | 1909 | #: sequencer.c:598 |
c04f5ac3 JX |
1910 | #, c-format |
1911 | msgid "could not apply %s... %s" | |
1912 | msgstr "不能应用 %s... %s" | |
1913 | ||
5c57d762 | 1914 | #: sequencer.c:633 |
c04f5ac3 JX |
1915 | msgid "empty commit set passed" |
1916 | msgstr "提供了空的提交集" | |
1917 | ||
5c57d762 | 1918 | #: sequencer.c:641 |
c04f5ac3 JX |
1919 | #, c-format |
1920 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1921 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1922 | |
5c57d762 | 1923 | #: sequencer.c:645 |
c04f5ac3 JX |
1924 | #, c-format |
1925 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1926 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1927 | |
5c57d762 JX |
1928 | #: sequencer.c:705 |
1929 | msgid "Cannot revert during another revert." | |
1930 | msgstr "不能在回退中执行另一回退。" | |
1931 | ||
1932 | #: sequencer.c:706 | |
1933 | msgid "Cannot revert during a cherry-pick." | |
1934 | msgstr "不能在拣选中执行回退。" | |
c04f5ac3 | 1935 | |
5c57d762 JX |
1936 | #: sequencer.c:709 |
1937 | msgid "Cannot cherry-pick during a revert." | |
1938 | msgstr "不能在回退中执行拣选。" | |
1939 | ||
1940 | #: sequencer.c:710 | |
1941 | msgid "Cannot cherry-pick during another cherry-pick." | |
1942 | msgstr "不能在拣选过程中执行另一拣选。" | |
1943 | ||
1944 | #: sequencer.c:732 | |
c04f5ac3 JX |
1945 | #, c-format |
1946 | msgid "Could not parse line %d." | |
90e6ef53 | 1947 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1948 | |
5c57d762 | 1949 | #: sequencer.c:737 |
c04f5ac3 | 1950 | msgid "No commits parsed." |
7e238ab7 | 1951 | msgstr "没有提交被解析。" |
c04f5ac3 | 1952 | |
5c57d762 | 1953 | #: sequencer.c:749 |
c04f5ac3 JX |
1954 | #, c-format |
1955 | msgid "Could not open %s" | |
1956 | msgstr "不能打开 %s" | |
1957 | ||
5c57d762 | 1958 | #: sequencer.c:753 |
c04f5ac3 JX |
1959 | #, c-format |
1960 | msgid "Could not read %s." | |
1961 | msgstr "不能读取 %s。" | |
1962 | ||
5c57d762 | 1963 | #: sequencer.c:760 |
c04f5ac3 JX |
1964 | #, c-format |
1965 | msgid "Unusable instruction sheet: %s" | |
1966 | msgstr "无用的指令表单:%s" | |
1967 | ||
5c57d762 | 1968 | #: sequencer.c:790 |
c04f5ac3 JX |
1969 | #, c-format |
1970 | msgid "Invalid key: %s" | |
1971 | msgstr "无效键名:%s" | |
1972 | ||
5c57d762 | 1973 | #: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 |
c04f5ac3 JX |
1974 | #, c-format |
1975 | msgid "Invalid value for %s: %s" | |
81809b99 | 1976 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1977 | |
5c57d762 | 1978 | #: sequencer.c:803 |
c04f5ac3 JX |
1979 | #, c-format |
1980 | msgid "Malformed options sheet: %s" | |
1981 | msgstr "非法的选项表单:%s" | |
1982 | ||
5c57d762 | 1983 | #: sequencer.c:822 |
c04f5ac3 JX |
1984 | msgid "a cherry-pick or revert is already in progress" |
1985 | msgstr "一个拣选或还原操作已在进行" | |
1986 | ||
5c57d762 | 1987 | #: sequencer.c:823 |
c04f5ac3 JX |
1988 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1989 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1990 | ||
5c57d762 | 1991 | #: sequencer.c:827 |
c04f5ac3 JX |
1992 | #, c-format |
1993 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1994 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1995 | |
5c57d762 | 1996 | #: sequencer.c:862 sequencer.c:998 |
c04f5ac3 | 1997 | msgid "no cherry-pick or revert in progress" |
195febda | 1998 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1999 | |
5c57d762 | 2000 | #: sequencer.c:864 |
c04f5ac3 JX |
2001 | msgid "cannot resolve HEAD" |
2002 | msgstr "不能解析 HEAD" | |
2003 | ||
5c57d762 | 2004 | #: sequencer.c:866 sequencer.c:900 |
c04f5ac3 | 2005 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 2006 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 2007 | |
5c57d762 | 2008 | #: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 |
c04f5ac3 | 2009 | #, c-format |
5b04ee3b JX |
2010 | msgid "cannot open %s" |
2011 | msgstr "不能打开 %s" | |
c04f5ac3 | 2012 | |
5c57d762 | 2013 | #: sequencer.c:888 |
c04f5ac3 JX |
2014 | #, c-format |
2015 | msgid "cannot read %s: %s" | |
2016 | msgstr "不能读取 %s:%s" | |
2017 | ||
5c57d762 | 2018 | #: sequencer.c:889 |
c04f5ac3 | 2019 | msgid "unexpected end of file" |
9aafc933 | 2020 | msgstr "意外的文件结束" |
c04f5ac3 | 2021 | |
5c57d762 | 2022 | #: sequencer.c:895 |
c04f5ac3 JX |
2023 | #, c-format |
2024 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 2025 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 2026 | |
5c57d762 | 2027 | #: sequencer.c:921 |
c04f5ac3 JX |
2028 | #, c-format |
2029 | msgid "Could not format %s." | |
2030 | msgstr "不能格式化 %s。" | |
2031 | ||
5c57d762 | 2032 | #: sequencer.c:1066 |
4dcdc3d8 JX |
2033 | #, c-format |
2034 | msgid "%s: can't cherry-pick a %s" | |
2035 | msgstr "%s:不能拣选一个%s" | |
2036 | ||
5c57d762 | 2037 | #: sequencer.c:1069 |
4dcdc3d8 JX |
2038 | #, c-format |
2039 | msgid "%s: bad revision" | |
2040 | msgstr "%s:错误的版本" | |
2041 | ||
5c57d762 | 2042 | #: sequencer.c:1102 |
c04f5ac3 JX |
2043 | msgid "Can't revert as initial commit" |
2044 | msgstr "不能作为初始提交还原" | |
2045 | ||
5c57d762 JX |
2046 | #: setup.c:160 |
2047 | #, c-format | |
2048 | msgid "" | |
2049 | "%s: no such path in the working tree.\n" | |
2050 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
2051 | msgstr "" | |
2052 | "%s:工作区中无此路径。\n" | |
2053 | "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。" | |
2054 | ||
2055 | #: setup.c:173 | |
2056 | #, c-format | |
2057 | msgid "" | |
2058 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
2059 | "Use '--' to separate paths from revisions, like this:\n" | |
2060 | "'git <command> [<revision>...] -- [<file>...]'" | |
2061 | msgstr "" | |
2062 | "有歧义的参数 '%s':工作区中未知的版本或路径。\n" | |
2063 | "使用 '--' 来分隔版本和路径,例如:\n" | |
2064 | "'git <command> [<revision>...] -- [<file>...]'" | |
2065 | ||
2066 | #: setup.c:223 | |
2067 | #, c-format | |
2068 | msgid "" | |
2069 | "ambiguous argument '%s': both revision and filename\n" | |
2070 | "Use '--' to separate paths from revisions, like this:\n" | |
2071 | "'git <command> [<revision>...] -- [<file>...]'" | |
2072 | msgstr "" | |
2073 | "有歧义的参数 '%s':两者均为版本和文件\n" | |
2074 | "使用 '--' 来分隔版本和路径,例如:\n" | |
2075 | "'git <command> [<revision>...] -- [<file>...]'" | |
c04f5ac3 | 2076 | |
5c57d762 | 2077 | #: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 |
7aea43ff JX |
2078 | #, c-format |
2079 | msgid "failed to read %s" | |
2080 | msgstr "无法读取 %s" | |
2081 | ||
5b04ee3b JX |
2082 | #: setup.c:468 |
2083 | #, c-format | |
2084 | msgid "Expected git repo version <= %d, found %d" | |
2085 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
2086 | ||
2087 | #: setup.c:476 | |
2088 | msgid "unknown repository extensions found:" | |
2089 | msgstr "发现未知的仓库扩展:" | |
2090 | ||
5c57d762 JX |
2091 | #: setup.c:762 |
2092 | #, c-format | |
2093 | msgid "Not a git repository (or any of the parent directories): %s" | |
2094 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
2095 | ||
2096 | #: setup.c:764 setup.c:915 builtin/index-pack.c:1641 | |
2097 | msgid "Cannot come back to cwd" | |
2098 | msgstr "无法返回当前工作目录" | |
2099 | ||
2100 | #: setup.c:845 | |
2101 | msgid "Unable to read current working directory" | |
2102 | msgstr "不能读取当前工作目录" | |
2103 | ||
2104 | #: setup.c:920 | |
2105 | #, c-format | |
2106 | msgid "" | |
2107 | "Not a git repository (or any parent up to mount point %s)\n" | |
2108 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." | |
2109 | msgstr "" | |
2110 | "不是一个 git 仓库(或者任何向上递归到挂载点 %s)\n" | |
2111 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" | |
2112 | ||
2113 | #: setup.c:927 | |
2114 | #, c-format | |
2115 | msgid "Cannot change to '%s/..'" | |
2116 | msgstr "不能切换到 '%s/..'" | |
2117 | ||
2118 | #: setup.c:989 | |
2119 | #, c-format | |
2120 | msgid "" | |
2121 | "Problem with core.sharedRepository filemode value (0%.3o).\n" | |
2122 | "The owner of files must always have read and write permissions." | |
2123 | msgstr "" | |
2124 | "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n" | |
2125 | "文件属主必须始终拥有读写权限。" | |
2126 | ||
2127 | #: sha1_file.c:1046 | |
3495628d JX |
2128 | msgid "offset before end of packfile (broken .idx?)" |
2129 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
2130 | ||
5c57d762 | 2131 | #: sha1_file.c:2434 |
3495628d JX |
2132 | #, c-format |
2133 | msgid "offset before start of pack index for %s (corrupt index?)" | |
2134 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
2135 | ||
5c57d762 | 2136 | #: sha1_file.c:2438 |
3495628d JX |
2137 | #, c-format |
2138 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
26e4cbec | 2139 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" |
3495628d | 2140 | |
276ceeaa | 2141 | #: sha1_name.c:462 |
2e8451e8 JX |
2142 | msgid "" |
2143 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
2144 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
2145 | "may be created by mistake. For example,\n" | |
2146 | "\n" | |
2147 | " git checkout -b $br $(git rev-parse ...)\n" | |
2148 | "\n" | |
2149 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
2150 | "examine these refs and maybe delete them. Turn this message off by\n" | |
b1894384 | 2151 | "running \"git config advice.objectNameWarning false\"" |
2e8451e8 JX |
2152 | msgstr "" |
2153 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
2154 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
2155 | "\n" | |
2156 | " git checkout -b $br $(git rev-parse ...)\n" | |
2157 | "\n" | |
2158 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
b1894384 | 2159 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
2e8451e8 JX |
2160 | "命令关闭本消息通知。" |
2161 | ||
5b04ee3b | 2162 | #: submodule.c:64 submodule.c:98 |
90314792 JX |
2163 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
2164 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
2165 | ||
5b04ee3b | 2166 | #: submodule.c:68 submodule.c:102 |
90314792 JX |
2167 | #, c-format |
2168 | msgid "Could not find section in .gitmodules where path=%s" | |
2169 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
2170 | ||
5b04ee3b | 2171 | #: submodule.c:76 |
90314792 JX |
2172 | #, c-format |
2173 | msgid "Could not update .gitmodules entry %s" | |
2174 | msgstr "不能更新 .gitmodules 条目 %s" | |
2175 | ||
5b04ee3b | 2176 | #: submodule.c:109 |
90314792 JX |
2177 | #, c-format |
2178 | msgid "Could not remove .gitmodules entry for %s" | |
2179 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
2180 | ||
5b04ee3b | 2181 | #: submodule.c:120 |
90314792 JX |
2182 | msgid "staging updated .gitmodules failed" |
2183 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
2184 | ||
5b04ee3b JX |
2185 | #: submodule.c:177 |
2186 | msgid "negative values not allowed for submodule.fetchJobs" | |
2187 | msgstr "submodule.fetchJobs 不允许为负值" | |
2188 | ||
5c57d762 | 2189 | #: submodule-config.c:358 |
5b04ee3b JX |
2190 | #, c-format |
2191 | msgid "invalid value for %s" | |
2192 | msgstr "%s 的值无效" | |
2193 | ||
3495628d JX |
2194 | #: trailer.c:237 |
2195 | #, c-format | |
2196 | msgid "running trailer command '%s' failed" | |
2197 | msgstr "执行 trailer 命令 '%s' 失败" | |
2198 | ||
276ceeaa JX |
2199 | #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 |
2200 | #: trailer.c:562 | |
220c313c JX |
2201 | #, c-format |
2202 | msgid "unknown value '%s' for key '%s'" | |
2203 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
2204 | ||
276ceeaa | 2205 | #: trailer.c:544 trailer.c:549 builtin/remote.c:289 |
220c313c JX |
2206 | #, c-format |
2207 | msgid "more than one %s" | |
2208 | msgstr "多于一个 %s" | |
2209 | ||
276ceeaa | 2210 | #: trailer.c:582 |
220c313c | 2211 | #, c-format |
9aeb4c2b JX |
2212 | msgid "empty trailer token in trailer '%.*s'" |
2213 | msgstr "签名 '%.*s' 的键为空" | |
220c313c | 2214 | |
276ceeaa | 2215 | #: trailer.c:702 |
220c313c JX |
2216 | #, c-format |
2217 | msgid "could not read input file '%s'" | |
2218 | msgstr "不能读取输入文件 '%s'" | |
2219 | ||
276ceeaa | 2220 | #: trailer.c:705 |
220c313c JX |
2221 | msgid "could not read from stdin" |
2222 | msgstr "不能自标准输入读取" | |
2223 | ||
276ceeaa JX |
2224 | #: trailer.c:857 builtin/am.c:42 |
2225 | #, c-format | |
2226 | msgid "could not stat %s" | |
2227 | msgstr "不能获取 %s 的文件状态" | |
2228 | ||
2229 | #: trailer.c:859 | |
2230 | #, c-format | |
2231 | msgid "file %s is not a regular file" | |
2232 | msgstr "文件 %s 不是一个正规文件" | |
2233 | ||
2234 | #: trailer.c:861 | |
2235 | #, c-format | |
2236 | msgid "file %s is not writable by user" | |
2237 | msgstr "文件 %s 用户不可写" | |
2238 | ||
2239 | #: trailer.c:873 | |
2240 | msgid "could not open temporary file" | |
2241 | msgstr "不能打开临时文件" | |
2242 | ||
2243 | #: trailer.c:912 | |
2244 | #, c-format | |
2245 | msgid "could not rename temporary file to %s" | |
2246 | msgstr "不能重命名临时文件为 %s" | |
2247 | ||
5c57d762 JX |
2248 | #: transport.c:62 |
2249 | #, c-format | |
2250 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
2251 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
2252 | ||
2253 | #: transport.c:151 | |
2254 | #, c-format | |
2255 | msgid "transport: invalid depth option '%s'" | |
2256 | msgstr "传输:无效的深度选项 '%s'" | |
2257 | ||
2258 | #: transport.c:771 | |
2259 | #, c-format | |
2260 | msgid "" | |
2261 | "The following submodule paths contain changes that can\n" | |
2262 | "not be found on any remote:\n" | |
2263 | msgstr "如下的子模组路径的修改在任何远程源中都找不到:\n" | |
2264 | ||
2265 | #: transport.c:775 | |
2266 | #, c-format | |
2267 | msgid "" | |
2268 | "\n" | |
2269 | "Please try\n" | |
2270 | "\n" | |
2271 | "\tgit push --recurse-submodules=on-demand\n" | |
2272 | "\n" | |
2273 | "or cd to the path and use\n" | |
2274 | "\n" | |
2275 | "\tgit push\n" | |
2276 | "\n" | |
2277 | "to push them to a remote.\n" | |
2278 | "\n" | |
2279 | msgstr "" | |
2280 | "\n" | |
2281 | "请尝试\n" | |
2282 | "\n" | |
2283 | "\tgit push --recurse-submodules=on-demand\n" | |
2284 | "\n" | |
2285 | "或者进入到子目录执行\n" | |
2286 | "\n" | |
2287 | "\tgit push\n" | |
2288 | "\n" | |
2289 | "来推送到远程源。\n" | |
2290 | "\n" | |
2291 | ||
2292 | #: transport.c:783 | |
2293 | msgid "Aborting." | |
2294 | msgstr "正在终止。" | |
2295 | ||
276ceeaa | 2296 | #: transport-helper.c:1041 |
1b7f4a34 JX |
2297 | #, c-format |
2298 | msgid "Could not read ref %s" | |
2299 | msgstr "不能读取引用 %s" | |
2300 | ||
5b04ee3b JX |
2301 | #: unpack-trees.c:64 |
2302 | #, c-format | |
2303 | msgid "" | |
2304 | "Your local changes to the following files would be overwritten by checkout:\n" | |
5c57d762 | 2305 | "%%sPlease commit your changes or stash them before you switch branches." |
5b04ee3b JX |
2306 | msgstr "" |
2307 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
aef18cc6 | 2308 | "%%s请在切换分支前提交您的修改或者保存进度。" |
5b04ee3b JX |
2309 | |
2310 | #: unpack-trees.c:66 | |
2311 | #, c-format | |
2312 | msgid "" | |
2313 | "Your local changes to the following files would be overwritten by checkout:\n" | |
2314 | "%%s" | |
2315 | msgstr "" | |
2316 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
2317 | "%%s" | |
2318 | ||
2319 | #: unpack-trees.c:69 | |
2320 | #, c-format | |
2321 | msgid "" | |
2322 | "Your local changes to the following files would be overwritten by merge:\n" | |
5c57d762 | 2323 | "%%sPlease commit your changes or stash them before you merge." |
5b04ee3b JX |
2324 | msgstr "" |
2325 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
aef18cc6 | 2326 | "%%s请在合并前提交您的修改或者保存进度。" |
5b04ee3b JX |
2327 | |
2328 | #: unpack-trees.c:71 | |
2329 | #, c-format | |
2330 | msgid "" | |
2331 | "Your local changes to the following files would be overwritten by merge:\n" | |
2332 | "%%s" | |
2333 | msgstr "" | |
2334 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
2335 | "%%s" | |
2336 | ||
2337 | #: unpack-trees.c:74 | |
2338 | #, c-format | |
2339 | msgid "" | |
2340 | "Your local changes to the following files would be overwritten by %s:\n" | |
5c57d762 | 2341 | "%%sPlease commit your changes or stash them before you %s." |
5b04ee3b JX |
2342 | msgstr "" |
2343 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
aef18cc6 | 2344 | "%%s请在 %s 之前提交您的修改或者保存进度。" |
5b04ee3b JX |
2345 | |
2346 | #: unpack-trees.c:76 | |
2347 | #, c-format | |
2348 | msgid "" | |
2349 | "Your local changes to the following files would be overwritten by %s:\n" | |
2350 | "%%s" | |
2351 | msgstr "" | |
2352 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
2353 | "%%s" | |
2354 | ||
2355 | #: unpack-trees.c:81 | |
2356 | #, c-format | |
2357 | msgid "" | |
2358 | "Updating the following directories would lose untracked files in it:\n" | |
2359 | "%s" | |
2360 | msgstr "" | |
2361 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
2362 | "%s" | |
2363 | ||
2364 | #: unpack-trees.c:85 | |
2365 | #, c-format | |
2366 | msgid "" | |
2367 | "The following untracked working tree files would be removed by checkout:\n" | |
5c57d762 | 2368 | "%%sPlease move or remove them before you switch branches." |
5b04ee3b | 2369 | msgstr "" |
aef18cc6 RC |
2370 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" |
2371 | "%%s请在切换分支之前移动或删除。" | |
5b04ee3b JX |
2372 | |
2373 | #: unpack-trees.c:87 | |
2374 | #, c-format | |
2375 | msgid "" | |
2376 | "The following untracked working tree files would be removed by checkout:\n" | |
2377 | "%%s" | |
2378 | msgstr "" | |
2379 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
2380 | "%%s" | |
2381 | ||
2382 | #: unpack-trees.c:90 | |
2383 | #, c-format | |
2384 | msgid "" | |
2385 | "The following untracked working tree files would be removed by merge:\n" | |
5c57d762 | 2386 | "%%sPlease move or remove them before you merge." |
5b04ee3b JX |
2387 | msgstr "" |
2388 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
2389 | "%%s请在合并前移动或删除。" | |
2390 | ||
2391 | #: unpack-trees.c:92 | |
2392 | #, c-format | |
2393 | msgid "" | |
2394 | "The following untracked working tree files would be removed by merge:\n" | |
2395 | "%%s" | |
2396 | msgstr "" | |
2397 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
2398 | "%%s" | |
2399 | ||
2400 | #: unpack-trees.c:95 | |
2401 | #, c-format | |
2402 | msgid "" | |
2403 | "The following untracked working tree files would be removed by %s:\n" | |
5c57d762 | 2404 | "%%sPlease move or remove them before you %s." |
5b04ee3b JX |
2405 | msgstr "" |
2406 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
2407 | "%%s请在 %s 前移动或删除。" | |
2408 | ||
2409 | #: unpack-trees.c:97 | |
2410 | #, c-format | |
2411 | msgid "" | |
2412 | "The following untracked working tree files would be removed by %s:\n" | |
2413 | "%%s" | |
2414 | msgstr "" | |
2415 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
2416 | "%%s" | |
2417 | ||
2418 | #: unpack-trees.c:102 | |
2419 | #, c-format | |
2420 | msgid "" | |
2421 | "The following untracked working tree files would be overwritten by " | |
2422 | "checkout:\n" | |
5c57d762 | 2423 | "%%sPlease move or remove them before you switch branches." |
5b04ee3b JX |
2424 | msgstr "" |
2425 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
2426 | "%%s请在切换分支前移动或删除。" | |
2427 | ||
2428 | #: unpack-trees.c:104 | |
2429 | #, c-format | |
2430 | msgid "" | |
2431 | "The following untracked working tree files would be overwritten by " | |
2432 | "checkout:\n" | |
2433 | "%%s" | |
2434 | msgstr "" | |
2435 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
2436 | "%%s" | |
2437 | ||
2438 | #: unpack-trees.c:107 | |
2439 | #, c-format | |
2440 | msgid "" | |
2441 | "The following untracked working tree files would be overwritten by merge:\n" | |
5c57d762 | 2442 | "%%sPlease move or remove them before you merge." |
5b04ee3b JX |
2443 | msgstr "" |
2444 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
2445 | "%%s请在合并前移动或删除。" | |
2446 | ||
2447 | #: unpack-trees.c:109 | |
2448 | #, c-format | |
2449 | msgid "" | |
2450 | "The following untracked working tree files would be overwritten by merge:\n" | |
2451 | "%%s" | |
2452 | msgstr "" | |
2453 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
2454 | "%%s" | |
2455 | ||
2456 | #: unpack-trees.c:112 | |
2457 | #, c-format | |
2458 | msgid "" | |
2459 | "The following untracked working tree files would be overwritten by %s:\n" | |
5c57d762 | 2460 | "%%sPlease move or remove them before you %s." |
5b04ee3b JX |
2461 | msgstr "" |
2462 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
2463 | "%%s请在 %s 前移动或删除。" | |
2464 | ||
2465 | #: unpack-trees.c:114 | |
2466 | #, c-format | |
2467 | msgid "" | |
2468 | "The following untracked working tree files would be overwritten by %s:\n" | |
2469 | "%%s" | |
2470 | msgstr "" | |
2471 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
2472 | "%%s" | |
2473 | ||
2474 | #: unpack-trees.c:121 | |
2475 | #, c-format | |
2476 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." | |
2477 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
2478 | ||
2479 | #: unpack-trees.c:124 | |
2480 | #, c-format | |
2481 | msgid "" | |
2482 | "Cannot update sparse checkout: the following entries are not up-to-date:\n" | |
2483 | "%s" | |
2484 | msgstr "" | |
aef18cc6 | 2485 | "无法更新稀疏检出:如下条目不是最新:\n" |
5b04ee3b JX |
2486 | "%s" |
2487 | ||
2488 | #: unpack-trees.c:126 | |
2489 | #, c-format | |
2490 | msgid "" | |
2491 | "The following Working tree files would be overwritten by sparse checkout " | |
2492 | "update:\n" | |
2493 | "%s" | |
2494 | msgstr "" | |
2495 | "工作区中下列文件将会因为稀疏检出而被覆盖:\n" | |
2496 | "%s" | |
2497 | ||
2498 | #: unpack-trees.c:128 | |
2499 | #, c-format | |
2500 | msgid "" | |
2501 | "The following Working tree files would be removed by sparse checkout " | |
2502 | "update:\n" | |
2503 | "%s" | |
2504 | msgstr "" | |
2505 | "工作区中下列文件将会因为稀疏检出而被删除:\n" | |
2506 | "%s" | |
2507 | ||
2508 | #: unpack-trees.c:205 | |
2509 | #, c-format | |
2510 | msgid "Aborting\n" | |
2511 | msgstr "终止中\n" | |
2512 | ||
2513 | #: unpack-trees.c:237 | |
6c94aba5 JX |
2514 | msgid "Checking out files" |
2515 | msgstr "正在检出文件" | |
2516 | ||
90314792 JX |
2517 | #: urlmatch.c:120 |
2518 | msgid "invalid URL scheme name or missing '://' suffix" | |
2519 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
2520 | ||
2521 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
2522 | #, c-format | |
2523 | msgid "invalid %XX escape sequence" | |
2524 | msgstr "无效的 %XX 转义序列" | |
2525 | ||
2526 | #: urlmatch.c:172 | |
2527 | msgid "missing host and scheme is not 'file:'" | |
4375c10e | 2528 | msgstr "缺失主机名且 URL 方案不是 'file:'" |
90314792 JX |
2529 | |
2530 | #: urlmatch.c:189 | |
2531 | msgid "a 'file:' URL may not have a port number" | |
2532 | msgstr "一个 'file:' URL 不应该包含端口号" | |
2533 | ||
2534 | #: urlmatch.c:199 | |
2535 | msgid "invalid characters in host name" | |
2536 | msgstr "主机名中包含无效的字符" | |
2537 | ||
2538 | #: urlmatch.c:244 urlmatch.c:255 | |
2539 | msgid "invalid port number" | |
2540 | msgstr "无效的端口号" | |
2541 | ||
2542 | #: urlmatch.c:322 | |
2543 | msgid "invalid '..' path segment" | |
2544 | msgstr "无效的 '..' 路径片段" | |
2545 | ||
5c57d762 JX |
2546 | #: worktree.c:282 |
2547 | #, c-format | |
2548 | msgid "failed to read '%s'" | |
2549 | msgstr "无法读取 '%s'" | |
2550 | ||
2551 | #: wrapper.c:222 wrapper.c:392 | |
1b7f4a34 JX |
2552 | #, c-format |
2553 | msgid "could not open '%s' for reading and writing" | |
2554 | msgstr "无法打开 '%s' 进行读写" | |
2555 | ||
5c57d762 | 2556 | #: wrapper.c:224 wrapper.c:394 builtin/am.c:778 |
1b7f4a34 JX |
2557 | #, c-format |
2558 | msgid "could not open '%s' for writing" | |
2559 | msgstr "无法打开 '%s' 进行写入" | |
2560 | ||
5c57d762 JX |
2561 | #: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 |
2562 | #: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 | |
5b04ee3b | 2563 | #: builtin/pull.c:407 |
1b7f4a34 JX |
2564 | #, c-format |
2565 | msgid "could not open '%s' for reading" | |
2566 | msgstr "无法打开 '%s' 进行读取" | |
2567 | ||
5c57d762 | 2568 | #: wrapper.c:605 wrapper.c:626 |
07432cef WS |
2569 | #, c-format |
2570 | msgid "unable to access '%s'" | |
2571 | msgstr "不能访问 '%s'" | |
ef317cd5 | 2572 | |
5c57d762 | 2573 | #: wrapper.c:634 |
220c313c JX |
2574 | msgid "unable to get current working directory" |
2575 | msgstr "不能获取当前工作目录" | |
2576 | ||
5c57d762 | 2577 | #: wrapper.c:658 |
7aea43ff JX |
2578 | #, c-format |
2579 | msgid "could not write to %s" | |
2580 | msgstr "不能写入 %s" | |
2581 | ||
5c57d762 | 2582 | #: wrapper.c:660 |
7aea43ff JX |
2583 | #, c-format |
2584 | msgid "could not close %s" | |
2585 | msgstr "不能关闭 %s" | |
2586 | ||
5b04ee3b | 2587 | #: wt-status.c:150 |
c04f5ac3 JX |
2588 | msgid "Unmerged paths:" |
2589 | msgstr "未合并的路径:" | |
2590 | ||
90e6ef53 | 2591 | # 译者:注意保持前导空格 |
5b04ee3b | 2592 | #: wt-status.c:177 wt-status.c:204 |
c04f5ac3 JX |
2593 | #, c-format |
2594 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
160fb2b2 | 2595 | msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" |
c04f5ac3 | 2596 | |
90e6ef53 | 2597 | # 译者:注意保持前导空格 |
5b04ee3b | 2598 | #: wt-status.c:179 wt-status.c:206 |
c04f5ac3 | 2599 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
160fb2b2 | 2600 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" |
c04f5ac3 | 2601 | |
90e6ef53 | 2602 | # 译者:注意保持前导空格 |
5b04ee3b | 2603 | #: wt-status.c:183 |
6792b93b | 2604 | msgid " (use \"git add <file>...\" to mark resolution)" |
d9d56b23 | 2605 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" |
6792b93b JX |
2606 | |
2607 | # 译者:注意保持前导空格 | |
5b04ee3b | 2608 | #: wt-status.c:185 wt-status.c:189 |
c04f5ac3 | 2609 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
d9d56b23 | 2610 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" |
c04f5ac3 | 2611 | |
6792b93b | 2612 | # 译者:注意保持前导空格 |
5b04ee3b | 2613 | #: wt-status.c:187 |
6792b93b | 2614 | msgid " (use \"git rm <file>...\" to mark resolution)" |
d9d56b23 | 2615 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" |
6792b93b | 2616 | |
5c57d762 | 2617 | #: wt-status.c:198 wt-status.c:882 |
c04f5ac3 JX |
2618 | msgid "Changes to be committed:" |
2619 | msgstr "要提交的变更:" | |
2620 | ||
5c57d762 | 2621 | #: wt-status.c:216 wt-status.c:891 |
c04f5ac3 | 2622 | msgid "Changes not staged for commit:" |
7e238ab7 | 2623 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 2624 | |
90e6ef53 | 2625 | # 译者:注意保持前导空格 |
5b04ee3b | 2626 | #: wt-status.c:220 |
c04f5ac3 | 2627 | msgid " (use \"git add <file>...\" to update what will be committed)" |
d9d56b23 | 2628 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 2629 | |
90e6ef53 | 2630 | # 译者:注意保持前导空格 |
5b04ee3b | 2631 | #: wt-status.c:222 |
c04f5ac3 | 2632 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
d9d56b23 | 2633 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" |
c04f5ac3 | 2634 | |
90e6ef53 | 2635 | # 译者:注意保持前导空格 |
5b04ee3b | 2636 | #: wt-status.c:223 |
c04f5ac3 JX |
2637 | msgid "" |
2638 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
d9d56b23 | 2639 | msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" |
c04f5ac3 | 2640 | |
90e6ef53 | 2641 | # 译者:注意保持前导空格 |
5b04ee3b | 2642 | #: wt-status.c:225 |
c04f5ac3 JX |
2643 | msgid " (commit or discard the untracked or modified content in submodules)" |
2644 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
2645 | ||
90e6ef53 | 2646 | # 译者:注意保持前导空格 |
5b04ee3b | 2647 | #: wt-status.c:237 |
c04f5ac3 JX |
2648 | #, c-format |
2649 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
d9d56b23 | 2650 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" |
c04f5ac3 | 2651 | |
5b04ee3b | 2652 | #: wt-status.c:252 |
c04f5ac3 JX |
2653 | msgid "both deleted:" |
2654 | msgstr "双方删除:" | |
2655 | ||
5b04ee3b | 2656 | #: wt-status.c:254 |
c04f5ac3 JX |
2657 | msgid "added by us:" |
2658 | msgstr "由我们添加:" | |
2659 | ||
5b04ee3b | 2660 | #: wt-status.c:256 |
c04f5ac3 JX |
2661 | msgid "deleted by them:" |
2662 | msgstr "由他们删除:" | |
2663 | ||
5b04ee3b | 2664 | #: wt-status.c:258 |
c04f5ac3 JX |
2665 | msgid "added by them:" |
2666 | msgstr "由他们添加:" | |
2667 | ||
5b04ee3b | 2668 | #: wt-status.c:260 |
c04f5ac3 JX |
2669 | msgid "deleted by us:" |
2670 | msgstr "由我们删除:" | |
2671 | ||
5b04ee3b | 2672 | #: wt-status.c:262 |
c04f5ac3 JX |
2673 | msgid "both added:" |
2674 | msgstr "双方添加:" | |
2675 | ||
5b04ee3b | 2676 | #: wt-status.c:264 |
c04f5ac3 JX |
2677 | msgid "both modified:" |
2678 | msgstr "双方修改:" | |
2679 | ||
5b04ee3b | 2680 | #: wt-status.c:274 |
6c94aba5 JX |
2681 | msgid "new file:" |
2682 | msgstr "新文件:" | |
cfff71a9 | 2683 | |
5b04ee3b | 2684 | #: wt-status.c:276 |
6c94aba5 JX |
2685 | msgid "copied:" |
2686 | msgstr "拷贝:" | |
cfff71a9 | 2687 | |
5b04ee3b | 2688 | #: wt-status.c:278 |
6c94aba5 JX |
2689 | msgid "deleted:" |
2690 | msgstr "删除:" | |
cfff71a9 | 2691 | |
5b04ee3b | 2692 | #: wt-status.c:280 |
6c94aba5 JX |
2693 | msgid "modified:" |
2694 | msgstr "修改:" | |
2695 | ||
5b04ee3b | 2696 | #: wt-status.c:282 |
6c94aba5 JX |
2697 | msgid "renamed:" |
2698 | msgstr "重命名:" | |
2699 | ||
5b04ee3b | 2700 | #: wt-status.c:284 |
6c94aba5 JX |
2701 | msgid "typechange:" |
2702 | msgstr "类型变更:" | |
2703 | ||
5b04ee3b | 2704 | #: wt-status.c:286 |
6c94aba5 JX |
2705 | msgid "unknown:" |
2706 | msgstr "未知:" | |
cfff71a9 | 2707 | |
5b04ee3b | 2708 | #: wt-status.c:288 |
6c94aba5 JX |
2709 | msgid "unmerged:" |
2710 | msgstr "未合并:" | |
cfff71a9 | 2711 | |
90e6ef53 | 2712 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
5b04ee3b | 2713 | #: wt-status.c:370 |
c04f5ac3 | 2714 | msgid "new commits, " |
aa9565f7 | 2715 | msgstr "新提交, " |
c04f5ac3 | 2716 | |
90e6ef53 | 2717 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
5b04ee3b | 2718 | #: wt-status.c:372 |
c04f5ac3 | 2719 | msgid "modified content, " |
aa9565f7 | 2720 | msgstr "修改的内容, " |
c04f5ac3 | 2721 | |
90e6ef53 | 2722 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
5b04ee3b | 2723 | #: wt-status.c:374 |
c04f5ac3 | 2724 | msgid "untracked content, " |
aa9565f7 | 2725 | msgstr "未跟踪的内容, " |
c04f5ac3 | 2726 | |
5c57d762 | 2727 | #: wt-status.c:756 |
90314792 JX |
2728 | msgid "Submodules changed but not updated:" |
2729 | msgstr "子模组已修改但尚未更新:" | |
2730 | ||
5c57d762 | 2731 | #: wt-status.c:758 |
90314792 JX |
2732 | msgid "Submodule changes to be committed:" |
2733 | msgstr "要提交的子模组变更:" | |
2734 | ||
5c57d762 | 2735 | #: wt-status.c:839 |
cfff71a9 JX |
2736 | msgid "" |
2737 | "Do not touch the line above.\n" | |
2738 | "Everything below will be removed." | |
2739 | msgstr "" | |
2740 | "不要改动上面的一行。\n" | |
2741 | "下面的所有内容均将被删除。" | |
2742 | ||
5c57d762 | 2743 | #: wt-status.c:950 |
6792b93b | 2744 | msgid "You have unmerged paths." |
195febda | 2745 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
2746 | |
2747 | # 译者:注意保持前导空格 | |
5c57d762 | 2748 | #: wt-status.c:953 |
6792b93b JX |
2749 | msgid " (fix conflicts and run \"git commit\")" |
2750 | msgstr " (解决冲突并运行 \"git commit\")" | |
2751 | ||
5c57d762 JX |
2752 | # 译者:注意保持前导空格 |
2753 | #: wt-status.c:955 | |
2754 | msgid " (use \"git merge --abort\" to abort the merge)" | |
2755 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
2756 | ||
2757 | #: wt-status.c:960 | |
6792b93b JX |
2758 | msgid "All conflicts fixed but you are still merging." |
2759 | msgstr "所有冲突已解决但您仍处于合并中。" | |
2760 | ||
2761 | # 译者:注意保持前导空格 | |
5c57d762 | 2762 | #: wt-status.c:963 |
6792b93b JX |
2763 | msgid " (use \"git commit\" to conclude merge)" |
2764 | msgstr " (使用 \"git commit\" 结束合并)" | |
2765 | ||
5c57d762 | 2766 | #: wt-status.c:973 |
6792b93b | 2767 | msgid "You are in the middle of an am session." |
98b2761d | 2768 | msgstr "您正处于 am 操作过程中。" |
6792b93b | 2769 | |
5c57d762 | 2770 | #: wt-status.c:976 |
6792b93b JX |
2771 | msgid "The current patch is empty." |
2772 | msgstr "当前的补丁为空。" | |
2773 | ||
2774 | # 译者:注意保持前导空格 | |
5c57d762 | 2775 | #: wt-status.c:980 |
2e8451e8 JX |
2776 | msgid " (fix conflicts and then run \"git am --continue\")" |
2777 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
2778 | |
2779 | # 译者:注意保持前导空格 | |
5c57d762 | 2780 | #: wt-status.c:982 |
6792b93b JX |
2781 | msgid " (use \"git am --skip\" to skip this patch)" |
2782 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
2783 | ||
2784 | # 译者:注意保持前导空格 | |
5c57d762 | 2785 | #: wt-status.c:984 |
6792b93b JX |
2786 | msgid " (use \"git am --abort\" to restore the original branch)" |
2787 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
2788 | ||
5c57d762 | 2789 | #: wt-status.c:1109 |
1b7f4a34 JX |
2790 | msgid "No commands done." |
2791 | msgstr "没有命令被执行。" | |
2792 | ||
5c57d762 | 2793 | #: wt-status.c:1112 |
1b7f4a34 JX |
2794 | #, c-format |
2795 | msgid "Last command done (%d command done):" | |
2796 | msgid_plural "Last commands done (%d commands done):" | |
2797 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
2798 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
2799 | ||
5c57d762 | 2800 | #: wt-status.c:1123 |
1b7f4a34 JX |
2801 | #, c-format |
2802 | msgid " (see more in file %s)" | |
2803 | msgstr " (更多参见文件 %s)" | |
2804 | ||
5c57d762 | 2805 | #: wt-status.c:1128 |
1b7f4a34 JX |
2806 | msgid "No commands remaining." |
2807 | msgstr "未剩下任何命令。" | |
2808 | ||
5c57d762 | 2809 | #: wt-status.c:1131 |
1b7f4a34 JX |
2810 | #, c-format |
2811 | msgid "Next command to do (%d remaining command):" | |
2812 | msgid_plural "Next commands to do (%d remaining commands):" | |
2813 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
2814 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
2815 | ||
2816 | # 译者:注意保持前导空格 | |
5c57d762 | 2817 | #: wt-status.c:1139 |
1b7f4a34 JX |
2818 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
2819 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
2820 | ||
5c57d762 | 2821 | #: wt-status.c:1152 |
63af42fe JX |
2822 | #, c-format |
2823 | msgid "You are currently rebasing branch '%s' on '%s'." | |
98b2761d | 2824 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" |
63af42fe | 2825 | |
5c57d762 | 2826 | #: wt-status.c:1157 |
6792b93b | 2827 | msgid "You are currently rebasing." |
98b2761d | 2828 | msgstr "您在执行变基操作。" |
6792b93b JX |
2829 | |
2830 | # 译者:注意保持前导空格 | |
5c57d762 | 2831 | #: wt-status.c:1171 |
6792b93b JX |
2832 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
2833 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
2834 | ||
2835 | # 译者:注意保持前导空格 | |
5c57d762 | 2836 | #: wt-status.c:1173 |
6792b93b JX |
2837 | msgid " (use \"git rebase --skip\" to skip this patch)" |
2838 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
2839 | ||
2840 | # 译者:注意保持前导空格 | |
5c57d762 | 2841 | #: wt-status.c:1175 |
6792b93b JX |
2842 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
2843 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
2844 | ||
2845 | # 译者:注意保持前导空格 | |
5c57d762 | 2846 | #: wt-status.c:1181 |
6792b93b JX |
2847 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
2848 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
2849 | ||
5c57d762 | 2850 | #: wt-status.c:1185 |
63af42fe JX |
2851 | #, c-format |
2852 | msgid "" | |
2853 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2854 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" |
63af42fe | 2855 | |
5c57d762 | 2856 | #: wt-status.c:1190 |
6792b93b | 2857 | msgid "You are currently splitting a commit during a rebase." |
98b2761d | 2858 | msgstr "您在执行变基操作时拆分提交。" |
6792b93b JX |
2859 | |
2860 | # 译者:注意保持前导空格 | |
5c57d762 | 2861 | #: wt-status.c:1193 |
6792b93b JX |
2862 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
2863 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
2864 | ||
5c57d762 | 2865 | #: wt-status.c:1197 |
63af42fe JX |
2866 | #, c-format |
2867 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
98b2761d | 2868 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" |
63af42fe | 2869 | |
5c57d762 | 2870 | #: wt-status.c:1202 |
6792b93b | 2871 | msgid "You are currently editing a commit during a rebase." |
98b2761d | 2872 | msgstr "您在执行变基操作时编辑提交。" |
6792b93b JX |
2873 | |
2874 | # 译者:注意保持前导空格 | |
5c57d762 | 2875 | #: wt-status.c:1205 |
6792b93b JX |
2876 | msgid " (use \"git commit --amend\" to amend the current commit)" |
2877 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
2878 | ||
2879 | # 译者:注意保持前导空格 | |
5c57d762 | 2880 | #: wt-status.c:1207 |
6792b93b JX |
2881 | msgid "" |
2882 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 2883 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 2884 | |
5c57d762 | 2885 | #: wt-status.c:1217 |
90314792 JX |
2886 | #, c-format |
2887 | msgid "You are currently cherry-picking commit %s." | |
98b2761d | 2888 | msgstr "您在执行拣选提交 %s 的操作。" |
6792b93b | 2889 | |
2e8451e8 | 2890 | # 译者:注意保持前导空格 |
5c57d762 | 2891 | #: wt-status.c:1222 |
2e8451e8 JX |
2892 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
2893 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
2894 | ||
6792b93b | 2895 | # 译者:注意保持前导空格 |
5c57d762 | 2896 | #: wt-status.c:1225 |
2e8451e8 JX |
2897 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
2898 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 2899 | |
2e8451e8 | 2900 | # 译者:注意保持前导空格 |
5c57d762 | 2901 | #: wt-status.c:1227 |
2e8451e8 JX |
2902 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
2903 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
2904 | ||
5c57d762 | 2905 | #: wt-status.c:1236 |
1003b3a5 JX |
2906 | #, c-format |
2907 | msgid "You are currently reverting commit %s." | |
98b2761d | 2908 | msgstr "您在执行反转提交 %s 的操作。" |
1003b3a5 JX |
2909 | |
2910 | # 译者:注意保持前导空格 | |
5c57d762 | 2911 | #: wt-status.c:1241 |
1003b3a5 JX |
2912 | msgid " (fix conflicts and run \"git revert --continue\")" |
2913 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
2914 | ||
2915 | # 译者:注意保持前导空格 | |
5c57d762 | 2916 | #: wt-status.c:1244 |
1003b3a5 JX |
2917 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
2918 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
2919 | ||
2920 | # 译者:注意保持前导空格 | |
5c57d762 | 2921 | #: wt-status.c:1246 |
1003b3a5 JX |
2922 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
2923 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
2924 | ||
5c57d762 | 2925 | #: wt-status.c:1257 |
63af42fe | 2926 | #, c-format |
1003b3a5 | 2927 | msgid "You are currently bisecting, started from branch '%s'." |
98b2761d | 2928 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" |
63af42fe | 2929 | |
5c57d762 | 2930 | #: wt-status.c:1261 |
6792b93b | 2931 | msgid "You are currently bisecting." |
98b2761d | 2932 | msgstr "您在执行二分查找操作。" |
6792b93b JX |
2933 | |
2934 | # 译者:注意保持前导空格 | |
5c57d762 | 2935 | #: wt-status.c:1264 |
6792b93b JX |
2936 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
2937 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
2938 | ||
5c57d762 | 2939 | #: wt-status.c:1464 |
c04f5ac3 JX |
2940 | msgid "On branch " |
2941 | msgstr "位于分支 " | |
2942 | ||
5c57d762 | 2943 | #: wt-status.c:1470 |
1b7f4a34 JX |
2944 | msgid "interactive rebase in progress; onto " |
2945 | msgstr "交互式变基操作正在进行中;至 " | |
2946 | ||
5c57d762 | 2947 | #: wt-status.c:1472 |
2e8451e8 | 2948 | msgid "rebase in progress; onto " |
98b2761d | 2949 | msgstr "变基操作正在进行中;至 " |
2e8451e8 | 2950 | |
5c57d762 | 2951 | #: wt-status.c:1477 |
1003b3a5 JX |
2952 | msgid "HEAD detached at " |
2953 | msgstr "头指针分离于 " | |
2954 | ||
5c57d762 | 2955 | #: wt-status.c:1479 |
1003b3a5 JX |
2956 | msgid "HEAD detached from " |
2957 | msgstr "头指针分离自 " | |
2958 | ||
5c57d762 | 2959 | #: wt-status.c:1482 |
c04f5ac3 JX |
2960 | msgid "Not currently on any branch." |
2961 | msgstr "当前不在任何分支上。" | |
2962 | ||
5c57d762 | 2963 | #: wt-status.c:1500 |
c04f5ac3 JX |
2964 | msgid "Initial commit" |
2965 | msgstr "初始提交" | |
2966 | ||
5c57d762 | 2967 | #: wt-status.c:1514 |
ef317cd5 | 2968 | msgid "Untracked files" |
07432cef | 2969 | msgstr "未跟踪的文件" |
c04f5ac3 | 2970 | |
5c57d762 | 2971 | #: wt-status.c:1516 |
ef317cd5 | 2972 | msgid "Ignored files" |
07432cef | 2973 | msgstr "忽略的文件" |
c04f5ac3 | 2974 | |
5c57d762 | 2975 | #: wt-status.c:1520 |
1003b3a5 | 2976 | #, c-format |
4dcdc3d8 JX |
2977 | msgid "" |
2978 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
2979 | "may speed it up, but you have to be careful not to forget to add\n" | |
2980 | "new files yourself (see 'git help status')." | |
2981 | msgstr "" | |
2982 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
2983 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 2984 | |
5c57d762 | 2985 | #: wt-status.c:1526 |
c04f5ac3 JX |
2986 | #, c-format |
2987 | msgid "Untracked files not listed%s" | |
2988 | msgstr "未跟踪的文件没有列出%s" | |
2989 | ||
7e238ab7 | 2990 | # 译者:中文字符串拼接,可删除前导空格 |
5c57d762 | 2991 | #: wt-status.c:1528 |
c04f5ac3 | 2992 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 2993 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 2994 | |
5c57d762 | 2995 | #: wt-status.c:1534 |
c04f5ac3 JX |
2996 | msgid "No changes" |
2997 | msgstr "没有修改" | |
2998 | ||
5c57d762 | 2999 | #: wt-status.c:1539 |
07432cef | 3000 | #, c-format |
ef317cd5 | 3001 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 3002 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 3003 | |
5c57d762 | 3004 | #: wt-status.c:1542 |
07432cef | 3005 | #, c-format |
ef317cd5 | 3006 | msgid "no changes added to commit\n" |
07432cef | 3007 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 3008 | |
5c57d762 | 3009 | #: wt-status.c:1545 |
07432cef | 3010 | #, c-format |
ef317cd5 JX |
3011 | msgid "" |
3012 | "nothing added to commit but untracked files present (use \"git add\" to " | |
3013 | "track)\n" | |
07432cef | 3014 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 3015 | |
5c57d762 | 3016 | #: wt-status.c:1548 |
07432cef | 3017 | #, c-format |
ef317cd5 | 3018 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 3019 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 3020 | |
7e238ab7 | 3021 | # 译者:中文字符串拼接,可删除前导空格 |
5c57d762 | 3022 | #: wt-status.c:1551 |
07432cef | 3023 | #, c-format |
ef317cd5 | 3024 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 3025 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 3026 | |
5c57d762 | 3027 | #: wt-status.c:1554 wt-status.c:1559 |
07432cef | 3028 | #, c-format |
ef317cd5 | 3029 | msgid "nothing to commit\n" |
07432cef | 3030 | msgstr "无文件要提交\n" |
ef317cd5 | 3031 | |
7e238ab7 | 3032 | # 译者:中文字符串拼接,可删除前导空格 |
5c57d762 | 3033 | #: wt-status.c:1557 |
07432cef | 3034 | #, c-format |
ef317cd5 | 3035 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 3036 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 3037 | |
7e238ab7 | 3038 | # 译者:中文字符串拼接,可删除前导空格 |
5c57d762 | 3039 | #: wt-status.c:1561 |
07432cef | 3040 | #, c-format |
5c57d762 | 3041 | msgid "nothing to commit, working tree clean\n" |
07432cef | 3042 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 3043 | |
90e6ef53 | 3044 | # 译者:注意保持句尾空格 |
5c57d762 | 3045 | #: wt-status.c:1668 |
c04f5ac3 JX |
3046 | msgid "Initial commit on " |
3047 | msgstr "初始提交于 " | |
3048 | ||
5c57d762 | 3049 | #: wt-status.c:1672 |
94550ed3 JX |
3050 | msgid "HEAD (no branch)" |
3051 | msgstr "HEAD(非分支)" | |
3052 | ||
5c57d762 | 3053 | #: wt-status.c:1701 |
90314792 JX |
3054 | msgid "gone" |
3055 | msgstr "丢失" | |
3056 | ||
90e6ef53 | 3057 | # 译者:注意保持句尾空格 |
5c57d762 | 3058 | #: wt-status.c:1703 wt-status.c:1711 |
c04f5ac3 JX |
3059 | msgid "behind " |
3060 | msgstr "落后 " | |
3061 | ||
5c57d762 | 3062 | #: wt-status.c:1706 wt-status.c:1709 |
5c0c220c JX |
3063 | msgid "ahead " |
3064 | msgstr "领先 " | |
3065 | ||
5b04ee3b | 3066 | #: compat/precompose_utf8.c:57 builtin/clone.c:415 |
a77c07d9 JX |
3067 | #, c-format |
3068 | msgid "failed to unlink '%s'" | |
3069 | msgstr "无法删除 '%s'" | |
3070 | ||
220c313c | 3071 | #: builtin/add.c:22 |
814ff314 | 3072 | msgid "git add [<options>] [--] <pathspec>..." |
160fb2b2 | 3073 | msgstr "git add [<选项>] [--] <路径规格>..." |
ef317cd5 | 3074 | |
220c313c | 3075 | #: builtin/add.c:65 |
c04f5ac3 JX |
3076 | #, c-format |
3077 | msgid "unexpected diff status %c" | |
3078 | msgstr "意外的差异状态 %c" | |
3079 | ||
5c57d762 | 3080 | #: builtin/add.c:71 builtin/commit.c:281 |
c04f5ac3 JX |
3081 | msgid "updating files failed" |
3082 | msgstr "更新文件失败" | |
3083 | ||
5c57d762 | 3084 | #: builtin/add.c:81 |
c04f5ac3 JX |
3085 | #, c-format |
3086 | msgid "remove '%s'\n" | |
3087 | msgstr "删除 '%s'\n" | |
3088 | ||
5c57d762 | 3089 | #: builtin/add.c:136 |
c04f5ac3 | 3090 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 3091 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 3092 | |
5c57d762 | 3093 | #: builtin/add.c:196 builtin/rev-parse.c:811 |
c04f5ac3 | 3094 | msgid "Could not read the index" |
90e6ef53 | 3095 | msgstr "不能读取索引" |
c04f5ac3 | 3096 | |
5c57d762 | 3097 | #: builtin/add.c:207 |
c04f5ac3 JX |
3098 | #, c-format |
3099 | msgid "Could not open '%s' for writing." | |
1b7f4a34 | 3100 | msgstr "无法打开 '%s' 进行写入。" |
c04f5ac3 | 3101 | |
5c57d762 | 3102 | #: builtin/add.c:211 |
c04f5ac3 | 3103 | msgid "Could not write patch" |
195febda | 3104 | msgstr "不能生成补丁" |
c04f5ac3 | 3105 | |
5c57d762 | 3106 | #: builtin/add.c:214 |
7aea43ff JX |
3107 | msgid "editing patch failed" |
3108 | msgstr "编辑补丁失败" | |
3109 | ||
5c57d762 | 3110 | #: builtin/add.c:217 |
c04f5ac3 JX |
3111 | #, c-format |
3112 | msgid "Could not stat '%s'" | |
90e6ef53 | 3113 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 3114 | |
5c57d762 | 3115 | #: builtin/add.c:219 |
c04f5ac3 JX |
3116 | msgid "Empty patch. Aborted." |
3117 | msgstr "空补丁。异常终止。" | |
3118 | ||
5c57d762 | 3119 | #: builtin/add.c:224 |
8ada9598 JX |
3120 | #, c-format |
3121 | msgid "Could not apply '%s'" | |
3122 | msgstr "不能应用 '%s'" | |
3123 | ||
5c57d762 | 3124 | #: builtin/add.c:234 |
8ada9598 | 3125 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 3126 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 3127 | |
5c57d762 JX |
3128 | #: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 |
3129 | #: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 | |
3130 | #: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 | |
ef317cd5 | 3131 | msgid "dry run" |
07432cef | 3132 | msgstr "演习" |
ef317cd5 | 3133 | |
5c57d762 JX |
3134 | #: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 |
3135 | #: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 | |
3136 | #: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 | |
ef317cd5 JX |
3137 | msgid "be verbose" |
3138 | msgstr "冗长输出" | |
3139 | ||
5c57d762 | 3140 | #: builtin/add.c:256 |
ef317cd5 | 3141 | msgid "interactive picking" |
07432cef | 3142 | msgstr "交互式拣选" |
ef317cd5 | 3143 | |
5c57d762 | 3144 | #: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 |
ef317cd5 | 3145 | msgid "select hunks interactively" |
07432cef | 3146 | msgstr "交互式挑选数据块" |
ef317cd5 | 3147 | |
5c57d762 | 3148 | #: builtin/add.c:258 |
ef317cd5 | 3149 | msgid "edit current diff and apply" |
07432cef | 3150 | msgstr "编辑当前差异并应用" |
ef317cd5 | 3151 | |
5c57d762 | 3152 | #: builtin/add.c:259 |
ef317cd5 | 3153 | msgid "allow adding otherwise ignored files" |
07432cef | 3154 | msgstr "允许添加忽略的文件" |
ef317cd5 | 3155 | |
5c57d762 | 3156 | #: builtin/add.c:260 |
ef317cd5 | 3157 | msgid "update tracked files" |
07432cef | 3158 | msgstr "更新已跟踪的文件" |
ef317cd5 | 3159 | |
5c57d762 | 3160 | #: builtin/add.c:261 |
ef317cd5 | 3161 | msgid "record only the fact that the path will be added later" |
07432cef | 3162 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 3163 | |
5c57d762 | 3164 | #: builtin/add.c:262 |
ef317cd5 | 3165 | msgid "add changes from all tracked and untracked files" |
07432cef | 3166 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 3167 | |
5c57d762 | 3168 | #: builtin/add.c:265 |
4dcdc3d8 JX |
3169 | msgid "ignore paths removed in the working tree (same as --no-all)" |
3170 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
3171 | ||
5c57d762 | 3172 | #: builtin/add.c:267 |
ef317cd5 | 3173 | msgid "don't add, only refresh the index" |
07432cef | 3174 | msgstr "不添加,只刷新索引" |
ef317cd5 | 3175 | |
5c57d762 | 3176 | #: builtin/add.c:268 |
ef317cd5 | 3177 | msgid "just skip files which cannot be added because of errors" |
07432cef | 3178 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 3179 | |
5c57d762 | 3180 | #: builtin/add.c:269 |
ef317cd5 | 3181 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 3182 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 3183 | |
5c57d762 JX |
3184 | #: builtin/add.c:270 builtin/update-index.c:958 |
3185 | msgid "(+/-)x" | |
3186 | msgstr "(+/-)x" | |
3187 | ||
3188 | #: builtin/add.c:270 builtin/update-index.c:959 | |
3189 | msgid "override the executable bit of the listed files" | |
3190 | msgstr "覆盖列表里文件的可执行位" | |
3191 | ||
3192 | #: builtin/add.c:292 | |
8ada9598 JX |
3193 | #, c-format |
3194 | msgid "Use -f if you really want to add them.\n" | |
3195 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
3196 | ||
5c57d762 | 3197 | #: builtin/add.c:300 |
8ada9598 JX |
3198 | msgid "adding files failed" |
3199 | msgstr "添加文件失败" | |
3200 | ||
5c57d762 | 3201 | #: builtin/add.c:336 |
8ada9598 JX |
3202 | msgid "-A and -u are mutually incompatible" |
3203 | msgstr "-A 和 -u 选项互斥" | |
3204 | ||
5c57d762 | 3205 | #: builtin/add.c:343 |
8ada9598 | 3206 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 3207 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 3208 | |
94550ed3 | 3209 | #: builtin/add.c:352 |
8ada9598 | 3210 | #, c-format |
5c57d762 JX |
3211 | msgid "--chmod param '%s' must be either -x or +x" |
3212 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
3213 | ||
3214 | #: builtin/add.c:367 | |
3215 | #, c-format | |
8ada9598 JX |
3216 | msgid "Nothing specified, nothing added.\n" |
3217 | msgstr "没有指定文件,也没有文件被添加。\n" | |
3218 | ||
5c57d762 | 3219 | #: builtin/add.c:368 |
8ada9598 JX |
3220 | #, c-format |
3221 | msgid "Maybe you wanted to say 'git add .'?\n" | |
3222 | msgstr "也许您想要执行 'git add .'?\n" | |
3223 | ||
5c57d762 JX |
3224 | #: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 |
3225 | #: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 | |
3226 | #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 | |
5b04ee3b | 3227 | #: builtin/submodule--helper.c:240 |
8ada9598 JX |
3228 | msgid "index file corrupt" |
3229 | msgstr "索引文件损坏" | |
3230 | ||
5c57d762 | 3231 | #: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 |
8ada9598 JX |
3232 | msgid "Unable to write new index file" |
3233 | msgstr "无法写入新索引文件" | |
3234 | ||
5c57d762 | 3235 | #: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 |
1b7f4a34 JX |
3236 | #, c-format |
3237 | msgid "could not read '%s'" | |
3238 | msgstr "不能读取 '%s'" | |
3239 | ||
5c57d762 | 3240 | #: builtin/am.c:426 |
1b7f4a34 JX |
3241 | msgid "could not parse author script" |
3242 | msgstr "不能解析作者脚本" | |
3243 | ||
5c57d762 | 3244 | #: builtin/am.c:503 |
1b7f4a34 JX |
3245 | #, c-format |
3246 | msgid "'%s' was deleted by the applypatch-msg hook" | |
3247 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
3248 | ||
5c57d762 | 3249 | #: builtin/am.c:544 builtin/notes.c:301 |
1b7f4a34 JX |
3250 | #, c-format |
3251 | msgid "Malformed input line: '%s'." | |
3252 | msgstr "非法的输入行:'%s'。" | |
3253 | ||
5c57d762 | 3254 | #: builtin/am.c:581 builtin/notes.c:316 |
1b7f4a34 JX |
3255 | #, c-format |
3256 | msgid "Failed to copy notes from '%s' to '%s'" | |
3257 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
3258 | ||
5c57d762 | 3259 | #: builtin/am.c:607 |
1b7f4a34 JX |
3260 | msgid "fseek failed" |
3261 | msgstr "fseek 失败" | |
3262 | ||
5c57d762 | 3263 | #: builtin/am.c:787 |
1b7f4a34 JX |
3264 | #, c-format |
3265 | msgid "could not parse patch '%s'" | |
3266 | msgstr "无法解析补丁 '%s'" | |
3267 | ||
5c57d762 | 3268 | #: builtin/am.c:852 |
1b7f4a34 JX |
3269 | msgid "Only one StGIT patch series can be applied at once" |
3270 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
3271 | ||
5c57d762 | 3272 | #: builtin/am.c:899 |
1b7f4a34 JX |
3273 | msgid "invalid timestamp" |
3274 | msgstr "无效的时间戳" | |
3275 | ||
5c57d762 | 3276 | #: builtin/am.c:902 builtin/am.c:910 |
1b7f4a34 JX |
3277 | msgid "invalid Date line" |
3278 | msgstr "无效的日期行" | |
3279 | ||
5c57d762 | 3280 | #: builtin/am.c:907 |
1b7f4a34 JX |
3281 | msgid "invalid timezone offset" |
3282 | msgstr "无效的时区偏移值" | |
3283 | ||
5c57d762 | 3284 | #: builtin/am.c:996 |
1b7f4a34 JX |
3285 | msgid "Patch format detection failed." |
3286 | msgstr "补丁格式检测失败。" | |
3287 | ||
5c57d762 | 3288 | #: builtin/am.c:1001 builtin/clone.c:380 |
1b7f4a34 JX |
3289 | #, c-format |
3290 | msgid "failed to create directory '%s'" | |
3291 | msgstr "无法创建目录 '%s'" | |
3292 | ||
5c57d762 | 3293 | #: builtin/am.c:1005 |
1b7f4a34 JX |
3294 | msgid "Failed to split patches." |
3295 | msgstr "无法拆分补丁。" | |
3296 | ||
5c57d762 | 3297 | #: builtin/am.c:1137 builtin/commit.c:366 |
1b7f4a34 JX |
3298 | msgid "unable to write index file" |
3299 | msgstr "无法写入索引文件" | |
3300 | ||
5c57d762 | 3301 | #: builtin/am.c:1188 |
1b7f4a34 JX |
3302 | #, c-format |
3303 | msgid "When you have resolved this problem, run \"%s --continue\"." | |
3304 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
3305 | ||
5c57d762 | 3306 | #: builtin/am.c:1189 |
1b7f4a34 JX |
3307 | #, c-format |
3308 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." | |
3309 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
3310 | ||
5c57d762 | 3311 | #: builtin/am.c:1190 |
1b7f4a34 JX |
3312 | #, c-format |
3313 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." | |
3314 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
3315 | ||
5c57d762 | 3316 | #: builtin/am.c:1328 |
1b7f4a34 JX |
3317 | msgid "Patch is empty. Was it split wrong?" |
3318 | msgstr "补丁为空。是不是切分错误?" | |
3319 | ||
5c57d762 | 3320 | #: builtin/am.c:1402 builtin/log.c:1543 |
1b7f4a34 JX |
3321 | #, c-format |
3322 | msgid "invalid ident line: %s" | |
3323 | msgstr "包含无效的身份标识:%s" | |
3324 | ||
5c57d762 | 3325 | #: builtin/am.c:1429 |
1b7f4a34 JX |
3326 | #, c-format |
3327 | msgid "unable to parse commit %s" | |
3328 | msgstr "不能解析提交 %s" | |
3329 | ||
5c57d762 | 3330 | #: builtin/am.c:1602 |
1b7f4a34 JX |
3331 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
3332 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
3333 | ||
5c57d762 | 3334 | #: builtin/am.c:1604 |
1b7f4a34 JX |
3335 | msgid "Using index info to reconstruct a base tree..." |
3336 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
3337 | ||
5c57d762 | 3338 | #: builtin/am.c:1623 |
1b7f4a34 JX |
3339 | msgid "" |
3340 | "Did you hand edit your patch?\n" | |
3341 | "It does not apply to blobs recorded in its index." | |
3342 | msgstr "" | |
3343 | "您是否曾手动编辑过您的补丁?\n" | |
3344 | "无法应用补丁到索引中的数据对象上。" | |
3345 | ||
5c57d762 | 3346 | #: builtin/am.c:1629 |
1b7f4a34 JX |
3347 | msgid "Falling back to patching base and 3-way merge..." |
3348 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
3349 | ||
5c57d762 | 3350 | #: builtin/am.c:1654 |
1b7f4a34 JX |
3351 | msgid "Failed to merge in the changes." |
3352 | msgstr "无法合并变更。" | |
3353 | ||
5c57d762 | 3354 | #: builtin/am.c:1679 builtin/merge.c:628 |
1b7f4a34 JX |
3355 | msgid "git write-tree failed to write a tree" |
3356 | msgstr "git write-tree 无法写入一树对象" | |
3357 | ||
5c57d762 | 3358 | #: builtin/am.c:1686 |
1b7f4a34 JX |
3359 | msgid "applying to an empty history" |
3360 | msgstr "正应用到一个空历史上" | |
3361 | ||
5c57d762 JX |
3362 | #: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 |
3363 | #: builtin/merge.c:823 | |
1b7f4a34 JX |
3364 | msgid "failed to write commit object" |
3365 | msgstr "无法写提交对象" | |
3366 | ||
5c57d762 | 3367 | #: builtin/am.c:1731 builtin/am.c:1735 |
1b7f4a34 JX |
3368 | #, c-format |
3369 | msgid "cannot resume: %s does not exist." | |
3370 | msgstr "无法继续:%s 不存在。" | |
3371 | ||
5c57d762 | 3372 | #: builtin/am.c:1751 |
1b7f4a34 JX |
3373 | msgid "cannot be interactive without stdin connected to a terminal." |
3374 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" | |
3375 | ||
5c57d762 | 3376 | #: builtin/am.c:1756 |
1b7f4a34 JX |
3377 | msgid "Commit Body is:" |
3378 | msgstr "提交内容为:" | |
3379 | ||
3380 | # 译者:注意保持句尾空格 | |
3381 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
3382 | #. in your translation. The program will only accept English | |
3383 | #. input at this point. | |
3384 | #. | |
5c57d762 | 3385 | #: builtin/am.c:1766 |
1b7f4a34 JX |
3386 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
3387 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
3388 | ||
5c57d762 | 3389 | #: builtin/am.c:1816 |
1b7f4a34 JX |
3390 | #, c-format |
3391 | msgid "Dirty index: cannot apply patches (dirty: %s)" | |
3392 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
3393 | ||
5c57d762 | 3394 | #: builtin/am.c:1853 builtin/am.c:1925 |
1b7f4a34 JX |
3395 | #, c-format |
3396 | msgid "Applying: %.*s" | |
3397 | msgstr "应用:%.*s" | |
3398 | ||
5c57d762 | 3399 | #: builtin/am.c:1869 |
1b7f4a34 JX |
3400 | msgid "No changes -- Patch already applied." |
3401 | msgstr "没有变更 —— 补丁已经应用过。" | |
3402 | ||
5c57d762 | 3403 | #: builtin/am.c:1877 |
1b7f4a34 JX |
3404 | #, c-format |
3405 | msgid "Patch failed at %s %.*s" | |
3406 | msgstr "打补丁失败于 %s %.*s" | |
3407 | ||
5c57d762 | 3408 | #: builtin/am.c:1883 |
1b7f4a34 JX |
3409 | #, c-format |
3410 | msgid "The copy of the patch that failed is found in: %s" | |
3411 | msgstr "失败的补丁文件副本位于:%s" | |
3412 | ||
5c57d762 | 3413 | #: builtin/am.c:1928 |
1b7f4a34 JX |
3414 | msgid "" |
3415 | "No changes - did you forget to use 'git add'?\n" | |
3416 | "If there is nothing left to stage, chances are that something else\n" | |
3417 | "already introduced the same changes; you might want to skip this patch." | |
3418 | msgstr "" | |
3419 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
3420 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
3421 | "您也许想要跳过这个补丁。" | |
3422 | ||
5c57d762 | 3423 | #: builtin/am.c:1935 |
1b7f4a34 JX |
3424 | msgid "" |
3425 | "You still have unmerged paths in your index.\n" | |
3426 | "Did you forget to use 'git add'?" | |
3427 | msgstr "" | |
3428 | "您的索引中仍有未合并的路径。\n" | |
3429 | "您是否忘了执行 'git add'?" | |
3430 | ||
5c57d762 | 3431 | #: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 |
1b7f4a34 JX |
3432 | #: builtin/reset.c:316 |
3433 | #, c-format | |
3434 | msgid "Could not parse object '%s'." | |
3435 | msgstr "不能解析对象 '%s'。" | |
3436 | ||
5c57d762 | 3437 | #: builtin/am.c:2095 |
1b7f4a34 JX |
3438 | msgid "failed to clean index" |
3439 | msgstr "无法清空索引" | |
3440 | ||
5c57d762 | 3441 | #: builtin/am.c:2129 |
1b7f4a34 JX |
3442 | msgid "" |
3443 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
3444 | "Not rewinding to ORIG_HEAD" | |
3445 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
3446 | ||
5c57d762 | 3447 | #: builtin/am.c:2192 |
1b7f4a34 JX |
3448 | #, c-format |
3449 | msgid "Invalid value for --patch-format: %s" | |
3450 | msgstr "无效的 --patch-format 值:%s" | |
3451 | ||
5c57d762 | 3452 | #: builtin/am.c:2225 |
94550ed3 JX |
3453 | msgid "git am [<options>] [(<mbox>|<Maildir>)...]" |
3454 | msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]" | |
1b7f4a34 | 3455 | |
5c57d762 | 3456 | #: builtin/am.c:2226 |
94550ed3 JX |
3457 | msgid "git am [<options>] (--continue | --skip | --abort)" |
3458 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
1b7f4a34 | 3459 | |
5c57d762 | 3460 | #: builtin/am.c:2232 |
1b7f4a34 JX |
3461 | msgid "run interactively" |
3462 | msgstr "以交互式方式运行" | |
3463 | ||
5c57d762 | 3464 | #: builtin/am.c:2234 |
1b7f4a34 JX |
3465 | msgid "historical option -- no-op" |
3466 | msgstr "老的参数 —— 无作用" | |
3467 | ||
5c57d762 | 3468 | #: builtin/am.c:2236 |
1b7f4a34 JX |
3469 | msgid "allow fall back on 3way merging if needed" |
3470 | msgstr "如果必要,允许使用三方合并。" | |
3471 | ||
5c57d762 JX |
3472 | #: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 |
3473 | #: builtin/repack.c:172 | |
1b7f4a34 JX |
3474 | msgid "be quiet" |
3475 | msgstr "静默模式" | |
3476 | ||
5c57d762 | 3477 | #: builtin/am.c:2239 |
1b7f4a34 JX |
3478 | msgid "add a Signed-off-by line to the commit message" |
3479 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
3480 | ||
5c57d762 | 3481 | #: builtin/am.c:2242 |
1b7f4a34 JX |
3482 | msgid "recode into utf8 (default)" |
3483 | msgstr "使用 utf8 字符集(默认)" | |
3484 | ||
5c57d762 | 3485 | #: builtin/am.c:2244 |
1b7f4a34 JX |
3486 | msgid "pass -k flag to git-mailinfo" |
3487 | msgstr "向 git-mailinfo 传递 -k 参数" | |
3488 | ||
5c57d762 | 3489 | #: builtin/am.c:2246 |
1b7f4a34 JX |
3490 | msgid "pass -b flag to git-mailinfo" |
3491 | msgstr "向 git-mailinfo 传递 -b 参数" | |
3492 | ||
5c57d762 | 3493 | #: builtin/am.c:2248 |
1b7f4a34 JX |
3494 | msgid "pass -m flag to git-mailinfo" |
3495 | msgstr "向 git-mailinfo 传递 -m 参数" | |
3496 | ||
5c57d762 | 3497 | #: builtin/am.c:2250 |
1b7f4a34 JX |
3498 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
3499 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
3500 | ||
5c57d762 | 3501 | #: builtin/am.c:2253 |
1b7f4a34 JX |
3502 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
3503 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
3504 | ||
5c57d762 | 3505 | #: builtin/am.c:2256 |
1b7f4a34 JX |
3506 | msgid "strip everything before a scissors line" |
3507 | msgstr "丢弃裁切线前的所有内容" | |
3508 | ||
5c57d762 | 3509 | #: builtin/am.c:2257 builtin/apply.c:4837 |
1b7f4a34 JX |
3510 | msgid "action" |
3511 | msgstr "动作" | |
3512 | ||
5c57d762 JX |
3513 | #: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 |
3514 | #: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 | |
3515 | #: builtin/am.c:2285 | |
1b7f4a34 JX |
3516 | msgid "pass it through git-apply" |
3517 | msgstr "传递给 git-apply" | |
3518 | ||
5c57d762 | 3519 | #: builtin/am.c:2266 builtin/apply.c:4861 |
1b7f4a34 JX |
3520 | msgid "root" |
3521 | msgstr "根目录" | |
3522 | ||
5c57d762 JX |
3523 | #: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 |
3524 | #: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 | |
5b04ee3b | 3525 | #: builtin/pull.c:179 builtin/submodule--helper.c:277 |
5c57d762 JX |
3526 | #: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 |
3527 | #: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 | |
3528 | #: builtin/submodule--helper.c:826 | |
1b7f4a34 JX |
3529 | msgid "path" |
3530 | msgstr "路径" | |
3531 | ||
5c57d762 JX |
3532 | #: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 |
3533 | #: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 | |
3534 | #: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185 | |
276ceeaa JX |
3535 | #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 |
3536 | #: parse-options.h:132 parse-options.h:134 parse-options.h:244 | |
1b7f4a34 JX |
3537 | msgid "n" |
3538 | msgstr "n" | |
3539 | ||
5c57d762 | 3540 | #: builtin/am.c:2278 builtin/apply.c:4805 |
1b7f4a34 JX |
3541 | msgid "num" |
3542 | msgstr "数字" | |
3543 | ||
5c57d762 | 3544 | #: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 |
94550ed3 | 3545 | #: builtin/tag.c:372 |
1b7f4a34 JX |
3546 | msgid "format" |
3547 | msgstr "格式" | |
3548 | ||
5c57d762 | 3549 | #: builtin/am.c:2282 |
1b7f4a34 JX |
3550 | msgid "format the patch(es) are in" |
3551 | msgstr "补丁的格式" | |
3552 | ||
5c57d762 | 3553 | #: builtin/am.c:2288 |
1b7f4a34 JX |
3554 | msgid "override error message when patch failure occurs" |
3555 | msgstr "打补丁失败时显示的错误信息" | |
3556 | ||
5c57d762 | 3557 | #: builtin/am.c:2290 |
1b7f4a34 JX |
3558 | msgid "continue applying patches after resolving a conflict" |
3559 | msgstr "冲突解决后继续应用补丁" | |
3560 | ||
5c57d762 | 3561 | #: builtin/am.c:2293 |
1b7f4a34 JX |
3562 | msgid "synonyms for --continue" |
3563 | msgstr "和 --continue 同义" | |
3564 | ||
5c57d762 | 3565 | #: builtin/am.c:2296 |
1b7f4a34 JX |
3566 | msgid "skip the current patch" |
3567 | msgstr "跳过当前补丁" | |
3568 | ||
5c57d762 | 3569 | #: builtin/am.c:2299 |
1b7f4a34 JX |
3570 | msgid "restore the original branch and abort the patching operation." |
3571 | msgstr "恢复原始分支并终止打补丁操作。" | |
3572 | ||
5c57d762 | 3573 | #: builtin/am.c:2303 |
1b7f4a34 JX |
3574 | msgid "lie about committer date" |
3575 | msgstr "将作者日期作为提交日期" | |
3576 | ||
5c57d762 | 3577 | #: builtin/am.c:2305 |
1b7f4a34 JX |
3578 | msgid "use current timestamp for author date" |
3579 | msgstr "用当前时间作为作者日期" | |
3580 | ||
5c57d762 | 3581 | #: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 |
5b04ee3b | 3582 | #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 |
1b7f4a34 JX |
3583 | msgid "key-id" |
3584 | msgstr "key-id" | |
3585 | ||
5c57d762 | 3586 | #: builtin/am.c:2308 |
1b7f4a34 JX |
3587 | msgid "GPG-sign commits" |
3588 | msgstr "使用 GPG 签名提交" | |
3589 | ||
5c57d762 | 3590 | #: builtin/am.c:2311 |
1b7f4a34 JX |
3591 | msgid "(internal use for git-rebase)" |
3592 | msgstr "(内部使用,用于 git-rebase)" | |
3593 | ||
5c57d762 | 3594 | #: builtin/am.c:2326 |
1b7f4a34 JX |
3595 | msgid "" |
3596 | "The -b/--binary option has been a no-op for long time, and\n" | |
3597 | "it will be removed. Please do not use it anymore." | |
3598 | msgstr "" | |
3599 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
3600 | "请不要再使用它了。" | |
3601 | ||
5c57d762 | 3602 | #: builtin/am.c:2333 |
1b7f4a34 JX |
3603 | msgid "failed to read the index" |
3604 | msgstr "无法读取索引" | |
3605 | ||
5c57d762 | 3606 | #: builtin/am.c:2348 |
1b7f4a34 JX |
3607 | #, c-format |
3608 | msgid "previous rebase directory %s still exists but mbox given." | |
3609 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
3610 | ||
5c57d762 | 3611 | #: builtin/am.c:2372 |
1b7f4a34 JX |
3612 | #, c-format |
3613 | msgid "" | |
3614 | "Stray %s directory found.\n" | |
3615 | "Use \"git am --abort\" to remove it." | |
3616 | msgstr "" | |
3617 | "发现了错误的 %s 目录。\n" | |
3618 | "使用 \"git am --abort\" 删除它。" | |
3619 | ||
5c57d762 | 3620 | #: builtin/am.c:2378 |
1b7f4a34 JX |
3621 | msgid "Resolve operation not in progress, we are not resuming." |
3622 | msgstr "解决操作未进行,我们不会继续。" | |
3623 | ||
5c57d762 | 3624 | #: builtin/apply.c:122 |
814ff314 JX |
3625 | msgid "git apply [<options>] [<patch>...]" |
3626 | msgstr "git apply [<选项>] [<补丁>...]" | |
8ada9598 | 3627 | |
5c57d762 | 3628 | #: builtin/apply.c:153 |
81809b99 | 3629 | #, c-format |
8ada9598 | 3630 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 3631 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 3632 | |
5c57d762 | 3633 | #: builtin/apply.c:169 |
81809b99 | 3634 | #, c-format |
8ada9598 | 3635 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 3636 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 3637 | |
5c57d762 | 3638 | #: builtin/apply.c:854 |
8ada9598 JX |
3639 | #, c-format |
3640 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 3641 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 3642 | |
5c57d762 | 3643 | #: builtin/apply.c:863 |
8ada9598 JX |
3644 | #, c-format |
3645 | msgid "regexec returned %d for input: %s" | |
81809b99 | 3646 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 3647 | |
5c57d762 | 3648 | #: builtin/apply.c:947 |
81809b99 | 3649 | #, c-format |
8ada9598 | 3650 | msgid "unable to find filename in patch at line %d" |
81809b99 | 3651 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 3652 | |
5c57d762 | 3653 | #: builtin/apply.c:984 |
8ada9598 JX |
3654 | #, c-format |
3655 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 3656 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 3657 | |
5c57d762 | 3658 | #: builtin/apply.c:989 |
8ada9598 JX |
3659 | #, c-format |
3660 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 3661 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 3662 | |
5c57d762 | 3663 | #: builtin/apply.c:990 |
8ada9598 JX |
3664 | #, c-format |
3665 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 3666 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 3667 | |
5c57d762 | 3668 | #: builtin/apply.c:995 |
8ada9598 JX |
3669 | #, c-format |
3670 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 3671 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 3672 | |
5c57d762 | 3673 | #: builtin/apply.c:1489 |
8ada9598 JX |
3674 | #, c-format |
3675 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 3676 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 3677 | |
5c57d762 | 3678 | #: builtin/apply.c:1550 |
8ada9598 JX |
3679 | #, c-format |
3680 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 3681 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 3682 | |
5c57d762 | 3683 | #: builtin/apply.c:1567 |
8ada9598 JX |
3684 | #, c-format |
3685 | msgid "" | |
3686 | "git diff header lacks filename information when removing %d leading pathname " | |
3687 | "component (line %d)" | |
3688 | msgid_plural "" | |
3689 | "git diff header lacks filename information when removing %d leading pathname " | |
3690 | "components (line %d)" | |
5ae481e0 JX |
3691 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
3692 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 3693 | |
5c57d762 | 3694 | #: builtin/apply.c:1743 |
8ada9598 | 3695 | msgid "new file depends on old contents" |
81809b99 | 3696 | msgstr "新文件依赖旧内容" |
8ada9598 | 3697 | |
5c57d762 | 3698 | #: builtin/apply.c:1745 |
8ada9598 | 3699 | msgid "deleted file still has contents" |
81809b99 | 3700 | msgstr "删除的文件仍有内容" |
8ada9598 | 3701 | |
5c57d762 | 3702 | #: builtin/apply.c:1774 |
8ada9598 JX |
3703 | #, c-format |
3704 | msgid "corrupt patch at line %d" | |
195febda | 3705 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 3706 | |
5c57d762 | 3707 | #: builtin/apply.c:1810 |
8ada9598 JX |
3708 | #, c-format |
3709 | msgid "new file %s depends on old contents" | |
81809b99 | 3710 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 3711 | |
5c57d762 | 3712 | #: builtin/apply.c:1812 |
8ada9598 JX |
3713 | #, c-format |
3714 | msgid "deleted file %s still has contents" | |
81809b99 | 3715 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 3716 | |
5c57d762 | 3717 | #: builtin/apply.c:1815 |
8ada9598 JX |
3718 | #, c-format |
3719 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 3720 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 3721 | |
5c57d762 | 3722 | #: builtin/apply.c:1962 |
8ada9598 JX |
3723 | #, c-format |
3724 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 3725 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 | 3726 | |
5c57d762 | 3727 | #: builtin/apply.c:1999 |
8ada9598 JX |
3728 | #, c-format |
3729 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 3730 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 3731 | |
5c57d762 | 3732 | #: builtin/apply.c:2154 |
8ada9598 JX |
3733 | #, c-format |
3734 | msgid "patch with only garbage at line %d" | |
81809b99 | 3735 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 3736 | |
5c57d762 | 3737 | #: builtin/apply.c:2244 |
81809b99 | 3738 | #, c-format |
8ada9598 | 3739 | msgid "unable to read symlink %s" |
81809b99 | 3740 | msgstr "无法读取符号链接 %s" |
8ada9598 | 3741 | |
5c57d762 | 3742 | #: builtin/apply.c:2248 |
81809b99 | 3743 | #, c-format |
8ada9598 | 3744 | msgid "unable to open or read %s" |
81809b99 | 3745 | msgstr "不能打开或读取 %s" |
8ada9598 | 3746 | |
5c57d762 | 3747 | #: builtin/apply.c:2901 |
81809b99 | 3748 | #, c-format |
8ada9598 | 3749 | msgid "invalid start of line: '%c'" |
81809b99 | 3750 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 3751 | |
5c57d762 | 3752 | #: builtin/apply.c:3020 |
8ada9598 JX |
3753 | #, c-format |
3754 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
3755 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
3756 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
3757 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 3758 | |
5c57d762 | 3759 | #: builtin/apply.c:3032 |
8ada9598 JX |
3760 | #, c-format |
3761 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 3762 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 3763 | |
5c57d762 | 3764 | #: builtin/apply.c:3038 |
8ada9598 JX |
3765 | #, c-format |
3766 | msgid "" | |
3767 | "while searching for:\n" | |
3768 | "%.*s" | |
3769 | msgstr "" | |
81809b99 JX |
3770 | "当查询:\n" |
3771 | "%.*s" | |
8ada9598 | 3772 | |
5c57d762 | 3773 | #: builtin/apply.c:3060 |
8ada9598 JX |
3774 | #, c-format |
3775 | msgid "missing binary patch data for '%s'" | |
81809b99 | 3776 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 3777 | |
5c57d762 | 3778 | #: builtin/apply.c:3163 |
8ada9598 JX |
3779 | #, c-format |
3780 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 3781 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 3782 | |
5c57d762 | 3783 | #: builtin/apply.c:3169 |
8ada9598 JX |
3784 | #, c-format |
3785 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 3786 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 3787 | |
5c57d762 | 3788 | #: builtin/apply.c:3190 |
8ada9598 JX |
3789 | #, c-format |
3790 | msgid "patch failed: %s:%ld" | |
81809b99 | 3791 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 3792 | |
5c57d762 | 3793 | #: builtin/apply.c:3314 |
8ada9598 | 3794 | #, c-format |
23ff3338 JX |
3795 | msgid "cannot checkout %s" |
3796 | msgstr "不能检出 %s" | |
8ada9598 | 3797 | |
5c57d762 | 3798 | #: builtin/apply.c:3370 |
814ff314 JX |
3799 | #, c-format |
3800 | msgid "reading from '%s' beyond a symbolic link" | |
3801 | msgstr "读取位于符号链接中的 '%s'" | |
3802 | ||
5c57d762 | 3803 | #: builtin/apply.c:3399 builtin/apply.c:3630 |
81809b99 | 3804 | #, c-format |
23ff3338 JX |
3805 | msgid "path %s has been renamed/deleted" |
3806 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 3807 | |
5c57d762 | 3808 | #: builtin/apply.c:3482 builtin/apply.c:3644 |
8ada9598 | 3809 | #, c-format |
23ff3338 JX |
3810 | msgid "%s: does not exist in index" |
3811 | msgstr "%s:不存在于索引中" | |
8ada9598 | 3812 | |
5c57d762 | 3813 | #: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 |
81809b99 | 3814 | #, c-format |
8ada9598 | 3815 | msgid "%s: %s" |
81809b99 | 3816 | msgstr "%s:%s" |
8ada9598 | 3817 | |
5c57d762 | 3818 | #: builtin/apply.c:3491 builtin/apply.c:3652 |
81809b99 | 3819 | #, c-format |
8ada9598 | 3820 | msgid "%s: does not match index" |
81809b99 | 3821 | msgstr "%s:和索引不匹配" |
8ada9598 | 3822 | |
5c57d762 | 3823 | #: builtin/apply.c:3597 |
23ff3338 JX |
3824 | msgid "removal patch leaves file contents" |
3825 | msgstr "移除补丁仍留下了文件内容" | |
3826 | ||
5c57d762 | 3827 | #: builtin/apply.c:3669 |
8ada9598 JX |
3828 | #, c-format |
3829 | msgid "%s: wrong type" | |
81809b99 | 3830 | msgstr "%s:错误类型" |
8ada9598 | 3831 | |
5c57d762 | 3832 | #: builtin/apply.c:3671 |
8ada9598 JX |
3833 | #, c-format |
3834 | msgid "%s has type %o, expected %o" | |
9aafc933 | 3835 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 3836 | |
5c57d762 | 3837 | #: builtin/apply.c:3822 builtin/apply.c:3824 |
814ff314 JX |
3838 | #, c-format |
3839 | msgid "invalid path '%s'" | |
3840 | msgstr "无效路径 '%s'" | |
3841 | ||
5c57d762 | 3842 | #: builtin/apply.c:3879 |
81809b99 | 3843 | #, c-format |
8ada9598 | 3844 | msgid "%s: already exists in index" |
81809b99 | 3845 | msgstr "%s:已经存在于索引中" |
8ada9598 | 3846 | |
5c57d762 | 3847 | #: builtin/apply.c:3882 |
23ff3338 JX |
3848 | #, c-format |
3849 | msgid "%s: already exists in working directory" | |
3850 | msgstr "%s:已经存在于工作区中" | |
3851 | ||
5c57d762 | 3852 | #: builtin/apply.c:3902 |
d691f479 JX |
3853 | #, c-format |
3854 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
3855 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 3856 | |
5c57d762 | 3857 | #: builtin/apply.c:3907 |
8ada9598 | 3858 | #, c-format |
d691f479 JX |
3859 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
3860 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
3861 | ||
5c57d762 | 3862 | #: builtin/apply.c:3927 |
814ff314 JX |
3863 | #, c-format |
3864 | msgid "affected file '%s' is beyond a symbolic link" | |
3865 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
3866 | ||
5c57d762 | 3867 | #: builtin/apply.c:3931 |
d691f479 | 3868 | #, c-format |
8ada9598 | 3869 | msgid "%s: patch does not apply" |
81809b99 | 3870 | msgstr "%s:补丁未应用" |
8ada9598 | 3871 | |
5c57d762 | 3872 | #: builtin/apply.c:3945 |
8ada9598 JX |
3873 | #, c-format |
3874 | msgid "Checking patch %s..." | |
81809b99 | 3875 | msgstr "检查补丁 %s..." |
8ada9598 | 3876 | |
5c57d762 | 3877 | #: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 |
8ada9598 JX |
3878 | #, c-format |
3879 | msgid "make_cache_entry failed for path '%s'" | |
3880 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
3881 | ||
5c57d762 | 3882 | #: builtin/apply.c:4182 |
81809b99 | 3883 | #, c-format |
8ada9598 | 3884 | msgid "unable to remove %s from index" |
81809b99 | 3885 | msgstr "不能从索引中移除 %s" |
8ada9598 | 3886 | |
5c57d762 | 3887 | #: builtin/apply.c:4215 |
8ada9598 | 3888 | #, c-format |
2e8451e8 JX |
3889 | msgid "corrupt patch for submodule %s" |
3890 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 3891 | |
5c57d762 | 3892 | #: builtin/apply.c:4219 |
81809b99 | 3893 | #, c-format |
8ada9598 | 3894 | msgid "unable to stat newly created file '%s'" |
81809b99 | 3895 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 3896 | |
5c57d762 | 3897 | #: builtin/apply.c:4224 |
8ada9598 JX |
3898 | #, c-format |
3899 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 3900 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 3901 | |
5c57d762 | 3902 | #: builtin/apply.c:4227 builtin/apply.c:4340 |
81809b99 | 3903 | #, c-format |
8ada9598 | 3904 | msgid "unable to add cache entry for %s" |
81809b99 | 3905 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 3906 | |
5c57d762 | 3907 | #: builtin/apply.c:4260 |
81809b99 | 3908 | #, c-format |
8ada9598 | 3909 | msgid "closing file '%s'" |
81809b99 | 3910 | msgstr "关闭文件 '%s'" |
8ada9598 | 3911 | |
5c57d762 | 3912 | #: builtin/apply.c:4313 |
81809b99 | 3913 | #, c-format |
8ada9598 | 3914 | msgid "unable to write file '%s' mode %o" |
81809b99 | 3915 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 3916 | |
5c57d762 | 3917 | #: builtin/apply.c:4403 |
8ada9598 JX |
3918 | #, c-format |
3919 | msgid "Applied patch %s cleanly." | |
81809b99 | 3920 | msgstr "成功应用补丁 %s。" |
8ada9598 | 3921 | |
5c57d762 | 3922 | #: builtin/apply.c:4411 |
8ada9598 | 3923 | msgid "internal error" |
81809b99 | 3924 | msgstr "内部错误" |
8ada9598 | 3925 | |
5c57d762 | 3926 | #: builtin/apply.c:4414 |
8ada9598 JX |
3927 | #, c-format |
3928 | msgid "Applying patch %%s with %d reject..." | |
3929 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
3930 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
3931 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 3932 | |
5c57d762 | 3933 | #: builtin/apply.c:4424 |
8ada9598 JX |
3934 | #, c-format |
3935 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 3936 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 3937 | |
5c57d762 | 3938 | #: builtin/apply.c:4432 |
5b04ee3b JX |
3939 | #, c-format |
3940 | msgid "cannot open %s: %s" | |
3941 | msgstr "不能打开 %s:%s" | |
3942 | ||
5c57d762 | 3943 | #: builtin/apply.c:4445 |
8ada9598 JX |
3944 | #, c-format |
3945 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 3946 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 3947 | |
5c57d762 | 3948 | #: builtin/apply.c:4448 |
8ada9598 JX |
3949 | #, c-format |
3950 | msgid "Rejected hunk #%d." | |
81809b99 | 3951 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 3952 | |
5c57d762 | 3953 | #: builtin/apply.c:4537 |
5b04ee3b JX |
3954 | #, c-format |
3955 | msgid "Skipped patch '%s'." | |
3956 | msgstr "略过补丁 '%s'。" | |
3957 | ||
5c57d762 | 3958 | #: builtin/apply.c:4545 |
8ada9598 | 3959 | msgid "unrecognized input" |
81809b99 | 3960 | msgstr "未能识别的输入" |
8ada9598 | 3961 | |
5c57d762 | 3962 | #: builtin/apply.c:4556 |
8ada9598 | 3963 | msgid "unable to read index file" |
81809b99 | 3964 | msgstr "无法读取索引文件" |
8ada9598 | 3965 | |
5c57d762 JX |
3966 | #: builtin/apply.c:4701 |
3967 | msgid "--3way outside a repository" | |
3968 | msgstr "--3way 在一个仓库之外" | |
8ada9598 | 3969 | |
5c57d762 JX |
3970 | #: builtin/apply.c:4709 |
3971 | msgid "--index outside a repository" | |
3972 | msgstr "--index 在一个仓库之外" | |
8ada9598 | 3973 | |
5c57d762 JX |
3974 | #: builtin/apply.c:4712 |
3975 | msgid "--cached outside a repository" | |
3976 | msgstr "--cached 在一个仓库之外" | |
8ada9598 | 3977 | |
5c57d762 JX |
3978 | #: builtin/apply.c:4745 |
3979 | #, c-format | |
3980 | msgid "can't open patch '%s'" | |
3981 | msgstr "不能打开补丁 '%s'" | |
3982 | ||
3983 | #: builtin/apply.c:4760 | |
3984 | #, c-format | |
3985 | msgid "squelched %d whitespace error" | |
3986 | msgid_plural "squelched %d whitespace errors" | |
3987 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
3988 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
3989 | ||
3990 | #: builtin/apply.c:4766 builtin/apply.c:4776 | |
3991 | #, c-format | |
3992 | msgid "%d line adds whitespace errors." | |
3993 | msgid_plural "%d lines add whitespace errors." | |
3994 | msgstr[0] "%d 行有空白字符误用。" | |
3995 | msgstr[1] "%d 行有空白字符误用。" | |
3996 | ||
3997 | #: builtin/apply.c:4800 | |
3998 | msgid "don't apply changes matching the given path" | |
3999 | msgstr "不要应用与给出路径向匹配的变更" | |
4000 | ||
4001 | #: builtin/apply.c:4803 | |
4002 | msgid "apply changes matching the given path" | |
4003 | msgstr "应用与给出路径向匹配的变更" | |
4004 | ||
4005 | #: builtin/apply.c:4806 | |
4006 | msgid "remove <num> leading slashes from traditional diff paths" | |
4007 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
4008 | ||
4009 | #: builtin/apply.c:4809 | |
4010 | msgid "ignore additions made by the patch" | |
81809b99 | 4011 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 4012 | |
5c57d762 | 4013 | #: builtin/apply.c:4811 |
8ada9598 | 4014 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 4015 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 4016 | |
5c57d762 | 4017 | #: builtin/apply.c:4815 |
ef317cd5 | 4018 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 4019 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 4020 | |
5c57d762 | 4021 | #: builtin/apply.c:4817 |
8ada9598 | 4022 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 4023 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 4024 | |
5c57d762 | 4025 | #: builtin/apply.c:4819 |
8ada9598 | 4026 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 4027 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 4028 | |
5c57d762 | 4029 | #: builtin/apply.c:4821 |
8ada9598 | 4030 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 4031 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 4032 | |
5c57d762 | 4033 | #: builtin/apply.c:4823 |
8ada9598 | 4034 | msgid "apply a patch without touching the working tree" |
81809b99 | 4035 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 4036 | |
5c57d762 | 4037 | #: builtin/apply.c:4825 |
814ff314 JX |
4038 | msgid "accept a patch that touches outside the working area" |
4039 | msgstr "接受修改工作区之外文件的补丁" | |
4040 | ||
5c57d762 | 4041 | #: builtin/apply.c:4827 |
8ada9598 | 4042 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 4043 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 4044 | |
5c57d762 | 4045 | #: builtin/apply.c:4829 |
23ff3338 | 4046 | msgid "attempt three-way merge if a patch does not apply" |
160fb2b2 | 4047 | msgstr "如果一个补丁不能应用则尝试三方合并" |
23ff3338 | 4048 | |
5c57d762 | 4049 | #: builtin/apply.c:4831 |
8ada9598 | 4050 | msgid "build a temporary index based on embedded index information" |
81809b99 | 4051 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 4052 | |
5c57d762 | 4053 | #: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 |
8ada9598 | 4054 | msgid "paths are separated with NUL character" |
81809b99 | 4055 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 4056 | |
5c57d762 | 4057 | #: builtin/apply.c:4836 |
8ada9598 | 4058 | msgid "ensure at least <n> lines of context match" |
81809b99 | 4059 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 4060 | |
5c57d762 | 4061 | #: builtin/apply.c:4838 |
8ada9598 | 4062 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 4063 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 4064 | |
5c57d762 | 4065 | #: builtin/apply.c:4841 builtin/apply.c:4844 |
8ada9598 | 4066 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 4067 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 4068 | |
5c57d762 | 4069 | #: builtin/apply.c:4847 |
8ada9598 | 4070 | msgid "apply the patch in reverse" |
81809b99 | 4071 | msgstr "反向应用补丁" |
8ada9598 | 4072 | |
5c57d762 | 4073 | #: builtin/apply.c:4849 |
8ada9598 | 4074 | msgid "don't expect at least one line of context" |
81809b99 | 4075 | msgstr "无需至少一行上下文" |
8ada9598 | 4076 | |
5c57d762 | 4077 | #: builtin/apply.c:4851 |
8ada9598 | 4078 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 4079 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 4080 | |
5c57d762 | 4081 | #: builtin/apply.c:4853 |
8ada9598 | 4082 | msgid "allow overlapping hunks" |
81809b99 | 4083 | msgstr "允许重叠的补丁片段" |
8ada9598 | 4084 | |
5c57d762 | 4085 | #: builtin/apply.c:4856 |
8ada9598 | 4086 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 4087 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 4088 | |
5c57d762 | 4089 | #: builtin/apply.c:4859 |
8ada9598 | 4090 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 4091 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 4092 | |
5c57d762 | 4093 | #: builtin/apply.c:4862 |
8ada9598 | 4094 | msgid "prepend <root> to all filenames" |
81809b99 | 4095 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 4096 | |
c04f5ac3 JX |
4097 | #: builtin/archive.c:17 |
4098 | #, c-format | |
4099 | msgid "could not create archive file '%s'" | |
90e6ef53 | 4100 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
4101 | |
4102 | #: builtin/archive.c:20 | |
4103 | msgid "could not redirect output" | |
195febda | 4104 | msgstr "不能重定向输出" |
c04f5ac3 JX |
4105 | |
4106 | #: builtin/archive.c:37 | |
4107 | msgid "git archive: Remote with no URL" | |
4375c10e | 4108 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 JX |
4109 | |
4110 | #: builtin/archive.c:58 | |
4111 | msgid "git archive: expected ACK/NAK, got EOF" | |
4375c10e | 4112 | msgstr "git archive:应为 ACK/NACK,却得到 EOF" |
c04f5ac3 | 4113 | |
1003b3a5 | 4114 | #: builtin/archive.c:61 |
c04f5ac3 JX |
4115 | #, c-format |
4116 | msgid "git archive: NACK %s" | |
90e6ef53 | 4117 | msgstr "git archive:NACK %s" |
c04f5ac3 | 4118 | |
1003b3a5 | 4119 | #: builtin/archive.c:63 |
c04f5ac3 JX |
4120 | #, c-format |
4121 | msgid "remote error: %s" | |
4122 | msgstr "远程错误:%s" | |
4123 | ||
1003b3a5 | 4124 | #: builtin/archive.c:64 |
c04f5ac3 | 4125 | msgid "git archive: protocol error" |
90e6ef53 | 4126 | msgstr "git archive:协议错误" |
c04f5ac3 | 4127 | |
1003b3a5 | 4128 | #: builtin/archive.c:68 |
c04f5ac3 | 4129 | msgid "git archive: expected a flush" |
195febda | 4130 | msgstr "git archive:应为刷新" |
c04f5ac3 | 4131 | |
ef317cd5 JX |
4132 | #: builtin/bisect--helper.c:7 |
4133 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 4134 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
4135 | |
4136 | #: builtin/bisect--helper.c:17 | |
4137 | msgid "perform 'git bisect next'" | |
07432cef | 4138 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
4139 | |
4140 | #: builtin/bisect--helper.c:19 | |
4141 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 4142 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 4143 | |
276ceeaa | 4144 | #: builtin/blame.c:33 |
7aea43ff JX |
4145 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
4146 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 4147 | |
276ceeaa | 4148 | #: builtin/blame.c:38 |
814ff314 JX |
4149 | msgid "<rev-opts> are documented in git-rev-list(1)" |
4150 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 4151 | |
5c57d762 | 4152 | #: builtin/blame.c:1781 |
276ceeaa JX |
4153 | msgid "Blaming lines" |
4154 | msgstr "追踪代码行" | |
4155 | ||
5c57d762 | 4156 | #: builtin/blame.c:2536 |
ef317cd5 | 4157 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 4158 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 4159 | |
5c57d762 | 4160 | #: builtin/blame.c:2537 |
ef317cd5 | 4161 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 4162 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 4163 | |
5c57d762 | 4164 | #: builtin/blame.c:2538 |
ef317cd5 | 4165 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 4166 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 4167 | |
5c57d762 | 4168 | #: builtin/blame.c:2539 |
ef317cd5 | 4169 | msgid "Show work cost statistics" |
07432cef | 4170 | msgstr "显示命令消耗统计" |
ef317cd5 | 4171 | |
5c57d762 | 4172 | #: builtin/blame.c:2540 |
276ceeaa JX |
4173 | msgid "Force progress reporting" |
4174 | msgstr "强制进度显示" | |
4175 | ||
5c57d762 | 4176 | #: builtin/blame.c:2541 |
ef317cd5 | 4177 | msgid "Show output score for blame entries" |
07432cef | 4178 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 4179 | |
5c57d762 | 4180 | #: builtin/blame.c:2542 |
ef317cd5 | 4181 | msgid "Show original filename (Default: auto)" |
07432cef | 4182 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 4183 | |
5c57d762 | 4184 | #: builtin/blame.c:2543 |
ef317cd5 | 4185 | msgid "Show original linenumber (Default: off)" |
07432cef | 4186 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 4187 | |
5c57d762 | 4188 | #: builtin/blame.c:2544 |
ef317cd5 | 4189 | msgid "Show in a format designed for machine consumption" |
07432cef | 4190 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 4191 | |
5c57d762 | 4192 | #: builtin/blame.c:2545 |
ef317cd5 | 4193 | msgid "Show porcelain format with per-line commit information" |
07432cef | 4194 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 4195 | |
5c57d762 | 4196 | #: builtin/blame.c:2546 |
ef317cd5 | 4197 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 4198 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 4199 | |
5c57d762 | 4200 | #: builtin/blame.c:2547 |
ef317cd5 | 4201 | msgid "Show raw timestamp (Default: off)" |
07432cef | 4202 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 4203 | |
5c57d762 | 4204 | #: builtin/blame.c:2548 |
ef317cd5 | 4205 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 4206 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 4207 | |
5c57d762 | 4208 | #: builtin/blame.c:2549 |
ef317cd5 | 4209 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 4210 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 4211 | |
5c57d762 | 4212 | #: builtin/blame.c:2550 |
ef317cd5 | 4213 | msgid "Show author email instead of name (Default: off)" |
07432cef | 4214 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 4215 | |
5c57d762 | 4216 | #: builtin/blame.c:2551 |
ef317cd5 | 4217 | msgid "Ignore whitespace differences" |
07432cef | 4218 | msgstr "忽略空白差异" |
ef317cd5 | 4219 | |
5c57d762 | 4220 | #: builtin/blame.c:2552 |
ef317cd5 | 4221 | msgid "Spend extra cycles to find better match" |
07432cef | 4222 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 4223 | |
5c57d762 | 4224 | #: builtin/blame.c:2553 |
ef317cd5 | 4225 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 4226 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 4227 | |
5c57d762 | 4228 | #: builtin/blame.c:2554 |
ef317cd5 | 4229 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 4230 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 4231 | |
5c57d762 | 4232 | #: builtin/blame.c:2555 builtin/blame.c:2556 |
ef317cd5 | 4233 | msgid "score" |
07432cef | 4234 | msgstr "得分" |
ef317cd5 | 4235 | |
5c57d762 | 4236 | #: builtin/blame.c:2555 |
ef317cd5 | 4237 | msgid "Find line copies within and across files" |
07432cef | 4238 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 4239 | |
5c57d762 | 4240 | #: builtin/blame.c:2556 |
ef317cd5 | 4241 | msgid "Find line movements within and across files" |
07432cef | 4242 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 4243 | |
5c57d762 | 4244 | #: builtin/blame.c:2557 |
ef317cd5 | 4245 | msgid "n,m" |
07432cef | 4246 | msgstr "n,m" |
ef317cd5 | 4247 | |
5c57d762 | 4248 | #: builtin/blame.c:2557 |
ef317cd5 | 4249 | msgid "Process only line range n,m, counting from 1" |
07432cef | 4250 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 4251 | |
6c94aba5 JX |
4252 | #. TRANSLATORS: This string is used to tell us the maximum |
4253 | #. display width for a relative timestamp in "git blame" | |
4254 | #. output. For C locale, "4 years, 11 months ago", which | |
4255 | #. takes 22 places, is the longest among various forms of | |
4256 | #. relative timestamps, but your language may need more or | |
4257 | #. fewer display columns. | |
5c57d762 | 4258 | #: builtin/blame.c:2649 |
6c94aba5 JX |
4259 | msgid "4 years, 11 months ago" |
4260 | msgstr "4 年 11 个月前" | |
4261 | ||
5b04ee3b | 4262 | #: builtin/branch.c:26 |
814ff314 JX |
4263 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
4264 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 4265 | |
5b04ee3b | 4266 | #: builtin/branch.c:27 |
814ff314 JX |
4267 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
4268 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 4269 | |
5b04ee3b | 4270 | #: builtin/branch.c:28 |
814ff314 JX |
4271 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
4272 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 4273 | |
5b04ee3b | 4274 | #: builtin/branch.c:29 |
814ff314 JX |
4275 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
4276 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 4277 | |
5b04ee3b | 4278 | #: builtin/branch.c:30 |
94550ed3 JX |
4279 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
4280 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
4281 | ||
90e6ef53 | 4282 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
5b04ee3b | 4283 | #: builtin/branch.c:143 |
c04f5ac3 JX |
4284 | #, c-format |
4285 | msgid "" | |
4286 | "deleting branch '%s' that has been merged to\n" | |
4287 | " '%s', but not yet merged to HEAD." | |
4288 | msgstr "" | |
70fc47bf | 4289 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
4290 | " '%s',但未合并到 HEAD。" |
4291 | ||
90e6ef53 | 4292 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
5b04ee3b | 4293 | #: builtin/branch.c:147 |
c04f5ac3 JX |
4294 | #, c-format |
4295 | msgid "" | |
4296 | "not deleting branch '%s' that is not yet merged to\n" | |
4297 | " '%s', even though it is merged to HEAD." | |
4298 | msgstr "" | |
70fc47bf T |
4299 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
4300 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 4301 | |
5b04ee3b | 4302 | #: builtin/branch.c:161 |
07432cef WS |
4303 | #, c-format |
4304 | msgid "Couldn't look up commit object for '%s'" | |
4305 | msgstr "无法查询 '%s' 指向的提交对象" | |
4306 | ||
5b04ee3b | 4307 | #: builtin/branch.c:165 |
07432cef WS |
4308 | #, c-format |
4309 | msgid "" | |
4310 | "The branch '%s' is not fully merged.\n" | |
4311 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
4312 | msgstr "" | |
4313 | "分支 '%s' 没有完全合并。\n" | |
4314 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
4315 | ||
5b04ee3b | 4316 | #: builtin/branch.c:178 |
07432cef WS |
4317 | msgid "Update of config-file failed" |
4318 | msgstr "无法更新 config 文件" | |
4319 | ||
5b04ee3b | 4320 | #: builtin/branch.c:206 |
c04f5ac3 | 4321 | msgid "cannot use -a with -d" |
649900bc | 4322 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 4323 | |
5b04ee3b | 4324 | #: builtin/branch.c:212 |
c04f5ac3 JX |
4325 | msgid "Couldn't look up commit object for HEAD" |
4326 | msgstr "无法查询 HEAD 指向的提交对象" | |
4327 | ||
5b04ee3b | 4328 | #: builtin/branch.c:226 |
c04f5ac3 | 4329 | #, c-format |
5b04ee3b JX |
4330 | msgid "Cannot delete branch '%s' checked out at '%s'" |
4331 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 4332 | |
5b04ee3b | 4333 | #: builtin/branch.c:241 |
5ae481e0 | 4334 | #, c-format |
7aea43ff JX |
4335 | msgid "remote-tracking branch '%s' not found." |
4336 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 4337 | |
5b04ee3b | 4338 | #: builtin/branch.c:242 |
81809b99 | 4339 | #, c-format |
8ada9598 | 4340 | msgid "branch '%s' not found." |
81809b99 | 4341 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 4342 | |
5b04ee3b | 4343 | #: builtin/branch.c:257 |
81809b99 | 4344 | #, c-format |
7aea43ff JX |
4345 | msgid "Error deleting remote-tracking branch '%s'" |
4346 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 4347 | |
5b04ee3b | 4348 | #: builtin/branch.c:258 |
81809b99 | 4349 | #, c-format |
8ada9598 | 4350 | msgid "Error deleting branch '%s'" |
7aea43ff | 4351 | msgstr "无法删除分支 '%s'" |
8ada9598 | 4352 | |
5b04ee3b | 4353 | #: builtin/branch.c:265 |
81809b99 | 4354 | #, c-format |
7aea43ff JX |
4355 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
4356 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 4357 | |
5b04ee3b | 4358 | #: builtin/branch.c:266 |
81809b99 | 4359 | #, c-format |
8ada9598 | 4360 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 4361 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 4362 | |
5c57d762 | 4363 | #: builtin/branch.c:312 |
81809b99 | 4364 | #, c-format |
90314792 JX |
4365 | msgid "[%s: gone]" |
4366 | msgstr "[%s: 丢失]" | |
4367 | ||
5c57d762 | 4368 | #: builtin/branch.c:317 |
90314792 JX |
4369 | #, c-format |
4370 | msgid "[%s]" | |
4371 | msgstr "[%s]" | |
4372 | ||
5c57d762 | 4373 | #: builtin/branch.c:322 |
90314792 | 4374 | #, c-format |
8ada9598 | 4375 | msgid "[%s: behind %d]" |
81809b99 | 4376 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 4377 | |
5c57d762 | 4378 | #: builtin/branch.c:324 |
81809b99 | 4379 | #, c-format |
8ada9598 | 4380 | msgid "[behind %d]" |
81809b99 | 4381 | msgstr "[落后 %d]" |
8ada9598 | 4382 | |
5c57d762 | 4383 | #: builtin/branch.c:328 |
81809b99 | 4384 | #, c-format |
8ada9598 | 4385 | msgid "[%s: ahead %d]" |
81809b99 | 4386 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 4387 | |
5c57d762 | 4388 | #: builtin/branch.c:330 |
81809b99 | 4389 | #, c-format |
8ada9598 | 4390 | msgid "[ahead %d]" |
81809b99 | 4391 | msgstr "[领先 %d]" |
8ada9598 | 4392 | |
5c57d762 | 4393 | #: builtin/branch.c:333 |
81809b99 | 4394 | #, c-format |
8ada9598 | 4395 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 4396 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 4397 | |
5c57d762 | 4398 | #: builtin/branch.c:336 |
81809b99 | 4399 | #, c-format |
8ada9598 | 4400 | msgid "[ahead %d, behind %d]" |
81809b99 | 4401 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 4402 | |
5c57d762 | 4403 | #: builtin/branch.c:349 |
a77c07d9 JX |
4404 | msgid " **** invalid ref ****" |
4405 | msgstr " **** 无效引用 ****" | |
4406 | ||
5c57d762 | 4407 | #: builtin/branch.c:375 |
1003b3a5 JX |
4408 | #, c-format |
4409 | msgid "(no branch, rebasing %s)" | |
4410 | msgstr "(非分支,正变基 %s)" | |
4411 | ||
5c57d762 | 4412 | #: builtin/branch.c:378 |
1003b3a5 JX |
4413 | #, c-format |
4414 | msgid "(no branch, bisect started on %s)" | |
4415 | msgstr "(非分支,二分查找开始于 %s)" | |
4416 | ||
5b04ee3b JX |
4417 | #. TRANSLATORS: make sure this matches |
4418 | #. "HEAD detached at " in wt-status.c | |
5c57d762 | 4419 | #: builtin/branch.c:384 |
1003b3a5 | 4420 | #, c-format |
814ff314 JX |
4421 | msgid "(HEAD detached at %s)" |
4422 | msgstr "(头指针分离于 %s)" | |
1003b3a5 | 4423 | |
5b04ee3b JX |
4424 | #. TRANSLATORS: make sure this matches |
4425 | #. "HEAD detached from " in wt-status.c | |
5c57d762 | 4426 | #: builtin/branch.c:389 |
814ff314 JX |
4427 | #, c-format |
4428 | msgid "(HEAD detached from %s)" | |
4429 | msgstr "(头指针分离自 %s)" | |
4430 | ||
5c57d762 | 4431 | #: builtin/branch.c:393 |
c04f5ac3 JX |
4432 | msgid "(no branch)" |
4433 | msgstr "(非分支)" | |
4434 | ||
5c57d762 | 4435 | #: builtin/branch.c:544 |
5b04ee3b JX |
4436 | #, c-format |
4437 | msgid "Branch %s is being rebased at %s" | |
4438 | msgstr "分支 %s 正被变基到 %s" | |
4439 | ||
5c57d762 | 4440 | #: builtin/branch.c:548 |
5b04ee3b JX |
4441 | #, c-format |
4442 | msgid "Branch %s is being bisected at %s" | |
4443 | msgstr "分支 %s 正被二分查找于 %s" | |
4444 | ||
5c57d762 | 4445 | #: builtin/branch.c:563 |
c04f5ac3 | 4446 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 4447 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 4448 | |
5c57d762 | 4449 | #: builtin/branch.c:573 |
c04f5ac3 JX |
4450 | #, c-format |
4451 | msgid "Invalid branch name: '%s'" | |
4452 | msgstr "无效的分支名:'%s'" | |
4453 | ||
5c57d762 | 4454 | #: builtin/branch.c:590 |
c04f5ac3 JX |
4455 | msgid "Branch rename failed" |
4456 | msgstr "分支重命名失败" | |
4457 | ||
5c57d762 | 4458 | #: builtin/branch.c:594 |
c04f5ac3 JX |
4459 | #, c-format |
4460 | msgid "Renamed a misnamed branch '%s' away" | |
4461 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
4462 | ||
5c57d762 | 4463 | #: builtin/branch.c:597 |
c04f5ac3 JX |
4464 | #, c-format |
4465 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
4466 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
4467 | ||
5c57d762 | 4468 | #: builtin/branch.c:604 |
c04f5ac3 JX |
4469 | msgid "Branch is renamed, but update of config-file failed" |
4470 | msgstr "分支被重命名,但更新 config 文件失败" | |
4471 | ||
5c57d762 JX |
4472 | #: builtin/branch.c:620 |
4473 | #, c-format | |
4474 | msgid "" | |
4475 | "Please edit the description for the branch\n" | |
4476 | " %s\n" | |
4477 | "Lines starting with '%c' will be stripped.\n" | |
4478 | msgstr "" | |
4479 | "请编辑分支的描述\n" | |
4480 | " %s\n" | |
4481 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 4482 | |
5b04ee3b | 4483 | #: builtin/branch.c:651 |
ef317cd5 | 4484 | msgid "Generic options" |
07432cef | 4485 | msgstr "通用选项" |
c04f5ac3 | 4486 | |
5b04ee3b | 4487 | #: builtin/branch.c:653 |
ef317cd5 | 4488 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 4489 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 4490 | |
5b04ee3b | 4491 | #: builtin/branch.c:654 |
ef317cd5 | 4492 | msgid "suppress informational messages" |
07432cef | 4493 | msgstr "不显示信息" |
8ada9598 | 4494 | |
5b04ee3b | 4495 | #: builtin/branch.c:655 |
ef317cd5 | 4496 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 4497 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 4498 | |
5b04ee3b | 4499 | #: builtin/branch.c:657 |
ef317cd5 | 4500 | msgid "change upstream info" |
07432cef | 4501 | msgstr "改变上游信息" |
c04f5ac3 | 4502 | |
5b04ee3b JX |
4503 | #: builtin/branch.c:659 |
4504 | msgid "upstream" | |
4505 | msgstr "上游" | |
4506 | ||
4507 | #: builtin/branch.c:659 | |
4508 | msgid "change the upstream info" | |
4509 | msgstr "改变上游信息" | |
4510 | ||
4511 | #: builtin/branch.c:661 | |
ef317cd5 | 4512 | msgid "use colored output" |
07432cef | 4513 | msgstr "使用彩色输出" |
c04f5ac3 | 4514 | |
5b04ee3b | 4515 | #: builtin/branch.c:662 |
ef317cd5 | 4516 | msgid "act on remote-tracking branches" |
07432cef | 4517 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 4518 | |
5b04ee3b | 4519 | #: builtin/branch.c:664 builtin/branch.c:665 |
ef317cd5 | 4520 | msgid "print only branches that contain the commit" |
07432cef | 4521 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 4522 | |
5b04ee3b | 4523 | #: builtin/branch.c:668 |
ef317cd5 | 4524 | msgid "Specific git-branch actions:" |
07432cef | 4525 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 4526 | |
5b04ee3b | 4527 | #: builtin/branch.c:669 |
ef317cd5 | 4528 | msgid "list both remote-tracking and local branches" |
07432cef | 4529 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 4530 | |
5b04ee3b | 4531 | #: builtin/branch.c:671 |
ef317cd5 | 4532 | msgid "delete fully merged branch" |
07432cef | 4533 | msgstr "删除完全合并的分支" |
c04f5ac3 | 4534 | |
5b04ee3b | 4535 | #: builtin/branch.c:672 |
ef317cd5 | 4536 | msgid "delete branch (even if not merged)" |
07432cef | 4537 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 4538 | |
5b04ee3b | 4539 | #: builtin/branch.c:673 |
ef317cd5 | 4540 | msgid "move/rename a branch and its reflog" |
07432cef | 4541 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 4542 | |
5b04ee3b | 4543 | #: builtin/branch.c:674 |
ef317cd5 | 4544 | msgid "move/rename a branch, even if target exists" |
07432cef | 4545 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 4546 | |
5b04ee3b | 4547 | #: builtin/branch.c:675 |
ef317cd5 | 4548 | msgid "list branch names" |
07432cef | 4549 | msgstr "列出分支名" |
c04f5ac3 | 4550 | |
5b04ee3b | 4551 | #: builtin/branch.c:676 |
ef317cd5 | 4552 | msgid "create the branch's reflog" |
07432cef | 4553 | msgstr "创建分支的引用日志" |
ef317cd5 | 4554 | |
5b04ee3b | 4555 | #: builtin/branch.c:678 |
ef317cd5 | 4556 | msgid "edit the description for the branch" |
07432cef | 4557 | msgstr "标记分支的描述" |
ef317cd5 | 4558 | |
5b04ee3b | 4559 | #: builtin/branch.c:679 |
04cb2f28 JX |
4560 | msgid "force creation, move/rename, deletion" |
4561 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 4562 | |
5b04ee3b | 4563 | #: builtin/branch.c:680 |
94550ed3 JX |
4564 | msgid "print only branches that are merged" |
4565 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 4566 | |
5b04ee3b | 4567 | #: builtin/branch.c:681 |
94550ed3 JX |
4568 | msgid "print only branches that are not merged" |
4569 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 4570 | |
5b04ee3b | 4571 | #: builtin/branch.c:682 |
ef317cd5 | 4572 | msgid "list branches in columns" |
07432cef | 4573 | msgstr "以列的方式显示分支" |
ef317cd5 | 4574 | |
5b04ee3b | 4575 | #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 |
94550ed3 JX |
4576 | msgid "key" |
4577 | msgstr "key" | |
4578 | ||
5b04ee3b | 4579 | #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 |
94550ed3 JX |
4580 | msgid "field name to sort on" |
4581 | msgstr "排序的字段名" | |
4582 | ||
5c57d762 JX |
4583 | #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402 |
4584 | #: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568 | |
94550ed3 JX |
4585 | #: builtin/tag.c:369 |
4586 | msgid "object" | |
4587 | msgstr "对象" | |
4588 | ||
5b04ee3b | 4589 | #: builtin/branch.c:687 |
94550ed3 JX |
4590 | msgid "print only branches of the object" |
4591 | msgstr "只打印指向该对象的分支" | |
4592 | ||
5b04ee3b | 4593 | #: builtin/branch.c:705 |
c04f5ac3 JX |
4594 | msgid "Failed to resolve HEAD as a valid ref." |
4595 | msgstr "无法将 HEAD 解析为有效引用。" | |
4596 | ||
5b04ee3b | 4597 | #: builtin/branch.c:709 builtin/clone.c:707 |
c04f5ac3 | 4598 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 4599 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 4600 | |
5b04ee3b | 4601 | #: builtin/branch.c:729 |
8ada9598 | 4602 | msgid "--column and --verbose are incompatible" |
81809b99 | 4603 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 4604 | |
5b04ee3b | 4605 | #: builtin/branch.c:740 builtin/branch.c:782 |
a77c07d9 JX |
4606 | msgid "branch name required" |
4607 | msgstr "必须提供分支名" | |
4608 | ||
5b04ee3b | 4609 | #: builtin/branch.c:758 |
a77c07d9 JX |
4610 | msgid "Cannot give description to detached HEAD" |
4611 | msgstr "不能向分离头指针提供描述" | |
4612 | ||
5b04ee3b | 4613 | #: builtin/branch.c:763 |
a77c07d9 JX |
4614 | msgid "cannot edit description of more than one branch" |
4615 | msgstr "不能为一个以上的分支编辑描述" | |
4616 | ||
5b04ee3b | 4617 | #: builtin/branch.c:770 |
a77c07d9 JX |
4618 | #, c-format |
4619 | msgid "No commit on branch '%s' yet." | |
4620 | msgstr "分支 '%s' 尚无提交。" | |
4621 | ||
5b04ee3b | 4622 | #: builtin/branch.c:773 |
a77c07d9 JX |
4623 | #, c-format |
4624 | msgid "No branch named '%s'." | |
4625 | msgstr "没有分支 '%s'。" | |
4626 | ||
5b04ee3b | 4627 | #: builtin/branch.c:788 |
a77c07d9 JX |
4628 | msgid "too many branches for a rename operation" |
4629 | msgstr "为重命名操作提供了太多的分支名" | |
4630 | ||
5b04ee3b | 4631 | #: builtin/branch.c:793 |
1003b3a5 JX |
4632 | msgid "too many branches to set new upstream" |
4633 | msgstr "为设置新上游提供了太多的分支名" | |
4634 | ||
5b04ee3b | 4635 | #: builtin/branch.c:797 |
1003b3a5 JX |
4636 | #, c-format |
4637 | msgid "" | |
4638 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
4639 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
4640 | ||
5b04ee3b | 4641 | #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 |
1003b3a5 JX |
4642 | #, c-format |
4643 | msgid "no such branch '%s'" | |
4644 | msgstr "没有此分支 '%s'" | |
4645 | ||
5b04ee3b | 4646 | #: builtin/branch.c:804 |
07432cef | 4647 | #, c-format |
ef317cd5 | 4648 | msgid "branch '%s' does not exist" |
07432cef | 4649 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 4650 | |
5b04ee3b | 4651 | #: builtin/branch.c:816 |
1003b3a5 JX |
4652 | msgid "too many branches to unset upstream" |
4653 | msgstr "为取消上游设置操作提供了太多的分支名" | |
4654 | ||
5b04ee3b | 4655 | #: builtin/branch.c:820 |
1003b3a5 JX |
4656 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
4657 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
4658 | ||
5b04ee3b | 4659 | #: builtin/branch.c:826 |
ef317cd5 JX |
4660 | #, c-format |
4661 | msgid "Branch '%s' has no upstream information" | |
07432cef | 4662 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 4663 | |
5b04ee3b | 4664 | #: builtin/branch.c:840 |
1003b3a5 JX |
4665 | msgid "it does not make sense to create 'HEAD' manually" |
4666 | msgstr "手工创建 'HEAD' 没有意义" | |
4667 | ||
5b04ee3b | 4668 | #: builtin/branch.c:846 |
c04f5ac3 JX |
4669 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
4670 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
4671 | ||
5b04ee3b | 4672 | #: builtin/branch.c:849 |
ef317cd5 JX |
4673 | #, c-format |
4674 | msgid "" | |
4675 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
4676 | "track or --set-upstream-to\n" | |
4677 | msgstr "" | |
07432cef | 4678 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 4679 | |
5b04ee3b | 4680 | #: builtin/branch.c:866 |
ef317cd5 JX |
4681 | #, c-format |
4682 | msgid "" | |
4683 | "\n" | |
4684 | "If you wanted to make '%s' track '%s', do this:\n" | |
4685 | "\n" | |
4686 | msgstr "" | |
07432cef WS |
4687 | "\n" |
4688 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
4689 | "\n" | |
ef317cd5 | 4690 | |
7aea43ff | 4691 | #: builtin/bundle.c:51 |
c04f5ac3 JX |
4692 | #, c-format |
4693 | msgid "%s is okay\n" | |
4694 | msgstr "%s 可以\n" | |
4695 | ||
7aea43ff | 4696 | #: builtin/bundle.c:64 |
c04f5ac3 | 4697 | msgid "Need a repository to create a bundle." |
160fb2b2 | 4698 | msgstr "需要一个仓库来创建包。" |
c04f5ac3 | 4699 | |
7aea43ff | 4700 | #: builtin/bundle.c:68 |
c04f5ac3 | 4701 | msgid "Need a repository to unbundle." |
160fb2b2 | 4702 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 4703 | |
5c57d762 | 4704 | #: builtin/cat-file.c:443 |
7aea43ff JX |
4705 | msgid "" |
4706 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" | |
4707 | "<type>|--textconv) <object>" | |
4708 | msgstr "" | |
4709 | "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" | |
4710 | ">|--textconv) <对象>" | |
ef317cd5 | 4711 | |
5c57d762 | 4712 | #: builtin/cat-file.c:444 |
94550ed3 JX |
4713 | msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" |
4714 | msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" | |
ef317cd5 | 4715 | |
5c57d762 | 4716 | #: builtin/cat-file.c:481 |
ef317cd5 | 4717 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 4718 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 4719 | |
5c57d762 | 4720 | #: builtin/cat-file.c:482 |
ef317cd5 | 4721 | msgid "show object type" |
07432cef | 4722 | msgstr "显示对象类型" |
ef317cd5 | 4723 | |
5c57d762 | 4724 | #: builtin/cat-file.c:483 |
ef317cd5 | 4725 | msgid "show object size" |
07432cef | 4726 | msgstr "显示对象大小" |
ef317cd5 | 4727 | |
5c57d762 | 4728 | #: builtin/cat-file.c:485 |
ef317cd5 | 4729 | msgid "exit with zero when there's no error" |
07432cef | 4730 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 4731 | |
5c57d762 | 4732 | #: builtin/cat-file.c:486 |
ef317cd5 | 4733 | msgid "pretty-print object's content" |
07432cef | 4734 | msgstr "美观地打印对象的内容" |
ef317cd5 | 4735 | |
5c57d762 | 4736 | #: builtin/cat-file.c:488 |
ef317cd5 | 4737 | msgid "for blob objects, run textconv on object's content" |
160fb2b2 | 4738 | msgstr "对于数据对象,对其内容执行 textconv" |
ef317cd5 | 4739 | |
5c57d762 | 4740 | #: builtin/cat-file.c:490 |
7aea43ff JX |
4741 | msgid "allow -s and -t to work with broken/corrupt objects" |
4742 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
4743 | ||
5c57d762 | 4744 | #: builtin/cat-file.c:491 |
1b7f4a34 JX |
4745 | msgid "buffer --batch output" |
4746 | msgstr "缓冲 --batch 的输出" | |
4747 | ||
5c57d762 | 4748 | #: builtin/cat-file.c:493 |
ef317cd5 | 4749 | msgid "show info and content of objects fed from the standard input" |
07432cef | 4750 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 4751 | |
5c57d762 | 4752 | #: builtin/cat-file.c:496 |
ef317cd5 | 4753 | msgid "show info about objects fed from the standard input" |
07432cef | 4754 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 4755 | |
5c57d762 | 4756 | #: builtin/cat-file.c:499 |
7aea43ff JX |
4757 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
4758 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
4759 | ||
5c57d762 | 4760 | #: builtin/cat-file.c:501 |
1b7f4a34 JX |
4761 | msgid "show all objects with --batch or --batch-check" |
4762 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
4763 | ||
ef317cd5 | 4764 | #: builtin/check-attr.c:11 |
814ff314 JX |
4765 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
4766 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 JX |
4767 | |
4768 | #: builtin/check-attr.c:12 | |
94550ed3 JX |
4769 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
4770 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 JX |
4771 | |
4772 | #: builtin/check-attr.c:19 | |
4773 | msgid "report all attributes set on file" | |
07432cef | 4774 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
4775 | |
4776 | #: builtin/check-attr.c:20 | |
4777 | msgid "use .gitattributes only from the index" | |
07432cef | 4778 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 4779 | |
276ceeaa | 4780 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 |
ef317cd5 | 4781 | msgid "read file names from stdin" |
07432cef | 4782 | msgstr "从标准输入读出文件名" |
ef317cd5 | 4783 | |
a77c07d9 | 4784 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
4785 | msgid "terminate input and output records by a NUL character" |
4786 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 4787 | |
5c57d762 | 4788 | #: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 |
a77c07d9 JX |
4789 | msgid "suppress progress reporting" |
4790 | msgstr "不显示进度报告" | |
4791 | ||
2e8451e8 JX |
4792 | #: builtin/check-ignore.c:26 |
4793 | msgid "show non-matching input paths" | |
4794 | msgstr "显示未匹配的输入路径" | |
4795 | ||
90314792 JX |
4796 | #: builtin/check-ignore.c:28 |
4797 | msgid "ignore index when checking" | |
4798 | msgstr "检查时忽略索引" | |
4799 | ||
4800 | #: builtin/check-ignore.c:154 | |
a77c07d9 | 4801 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 4802 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 4803 | |
90314792 | 4804 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
4805 | msgid "-z only makes sense with --stdin" |
4806 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
4807 | ||
90314792 | 4808 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
4809 | msgid "no path specified" |
4810 | msgstr "未指定路径" | |
4811 | ||
90314792 | 4812 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
4813 | msgid "--quiet is only valid with a single pathname" |
4814 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
4815 | ||
90314792 | 4816 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
4817 | msgid "cannot have both --quiet and --verbose" |
4818 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
4819 | ||
90314792 | 4820 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
4821 | msgid "--non-matching is only valid with --verbose" |
4822 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
4823 | ||
4824 | #: builtin/check-mailmap.c:8 | |
814ff314 JX |
4825 | msgid "git check-mailmap [<options>] <contact>..." |
4826 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 JX |
4827 | |
4828 | #: builtin/check-mailmap.c:13 | |
4829 | msgid "also read contacts from stdin" | |
4830 | msgstr "还从标准输入读取联系地址" | |
4831 | ||
4832 | #: builtin/check-mailmap.c:24 | |
4833 | #, c-format | |
4834 | msgid "unable to parse contact: %s" | |
4835 | msgstr "不能解析联系地址:%s" | |
4836 | ||
4837 | #: builtin/check-mailmap.c:47 | |
4838 | msgid "no contacts specified" | |
4839 | msgstr "未指定联系地址" | |
4840 | ||
276ceeaa | 4841 | #: builtin/checkout-index.c:127 |
814ff314 JX |
4842 | msgid "git checkout-index [<options>] [--] [<file>...]" |
4843 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 4844 | |
276ceeaa JX |
4845 | #: builtin/checkout-index.c:144 |
4846 | msgid "stage should be between 1 and 3 or all" | |
4847 | msgstr "索引值应该取值 1 到 3 或者 all" | |
4848 | ||
4849 | #: builtin/checkout-index.c:160 | |
ef317cd5 | 4850 | msgid "check out all files in the index" |
07432cef | 4851 | msgstr "检出索引区的所有文件" |
ef317cd5 | 4852 | |
276ceeaa | 4853 | #: builtin/checkout-index.c:161 |
ef317cd5 | 4854 | msgid "force overwrite of existing files" |
07432cef | 4855 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 4856 | |
276ceeaa | 4857 | #: builtin/checkout-index.c:163 |
ef317cd5 | 4858 | msgid "no warning for existing files and files not in index" |
07432cef | 4859 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 4860 | |
276ceeaa | 4861 | #: builtin/checkout-index.c:165 |
ef317cd5 | 4862 | msgid "don't checkout new files" |
07432cef | 4863 | msgstr "不检出新文件" |
ef317cd5 | 4864 | |
276ceeaa | 4865 | #: builtin/checkout-index.c:167 |
ef317cd5 | 4866 | msgid "update stat information in the index file" |
07432cef | 4867 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 4868 | |
276ceeaa | 4869 | #: builtin/checkout-index.c:171 |
ef317cd5 | 4870 | msgid "read list of paths from the standard input" |
07432cef | 4871 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 4872 | |
276ceeaa | 4873 | #: builtin/checkout-index.c:173 |
ef317cd5 | 4874 | msgid "write the content to temporary files" |
07432cef | 4875 | msgstr "将内容写入临时文件" |
ef317cd5 | 4876 | |
276ceeaa | 4877 | #: builtin/checkout-index.c:174 builtin/column.c:30 |
5c57d762 JX |
4878 | #: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491 |
4879 | #: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497 | |
4880 | #: builtin/submodule--helper.c:830 builtin/worktree.c:469 | |
ef317cd5 | 4881 | msgid "string" |
07432cef | 4882 | msgstr "字符串" |
ef317cd5 | 4883 | |
276ceeaa | 4884 | #: builtin/checkout-index.c:175 |
ef317cd5 | 4885 | msgid "when creating files, prepend <string>" |
4375c10e | 4886 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 4887 | |
276ceeaa | 4888 | #: builtin/checkout-index.c:177 |
ef317cd5 | 4889 | msgid "copy out the files from named stage" |
07432cef | 4890 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 4891 | |
1b7f4a34 | 4892 | #: builtin/checkout.c:25 |
814ff314 JX |
4893 | msgid "git checkout [<options>] <branch>" |
4894 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 4895 | |
1b7f4a34 | 4896 | #: builtin/checkout.c:26 |
814ff314 JX |
4897 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
4898 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 4899 | |
94550ed3 | 4900 | #: builtin/checkout.c:134 builtin/checkout.c:167 |
c04f5ac3 JX |
4901 | #, c-format |
4902 | msgid "path '%s' does not have our version" | |
4903 | msgstr "路径 '%s' 没有我们的版本" | |
4904 | ||
94550ed3 | 4905 | #: builtin/checkout.c:136 builtin/checkout.c:169 |
c04f5ac3 JX |
4906 | #, c-format |
4907 | msgid "path '%s' does not have their version" | |
4908 | msgstr "路径 '%s' 没有他们的版本" | |
4909 | ||
94550ed3 | 4910 | #: builtin/checkout.c:152 |
c04f5ac3 JX |
4911 | #, c-format |
4912 | msgid "path '%s' does not have all necessary versions" | |
4913 | msgstr "路径 '%s' 没有全部必须的版本" | |
4914 | ||
94550ed3 | 4915 | #: builtin/checkout.c:196 |
c04f5ac3 JX |
4916 | #, c-format |
4917 | msgid "path '%s' does not have necessary versions" | |
4918 | msgstr "路径 '%s' 没有必须的版本" | |
4919 | ||
94550ed3 | 4920 | #: builtin/checkout.c:213 |
c04f5ac3 JX |
4921 | #, c-format |
4922 | msgid "path '%s': cannot merge" | |
90e6ef53 | 4923 | msgstr "path '%s':无法合并" |
c04f5ac3 | 4924 | |
94550ed3 | 4925 | #: builtin/checkout.c:230 |
c04f5ac3 JX |
4926 | #, c-format |
4927 | msgid "Unable to add merge result for '%s'" | |
4928 | msgstr "无法为 '%s' 添加合并结果" | |
4929 | ||
5b04ee3b JX |
4930 | #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 |
4931 | #: builtin/checkout.c:259 | |
07432cef | 4932 | #, c-format |
ef317cd5 | 4933 | msgid "'%s' cannot be used with updating paths" |
07432cef | 4934 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 4935 | |
5b04ee3b | 4936 | #: builtin/checkout.c:262 builtin/checkout.c:265 |
07432cef | 4937 | #, c-format |
ef317cd5 | 4938 | msgid "'%s' cannot be used with %s" |
07432cef | 4939 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 4940 | |
5b04ee3b | 4941 | #: builtin/checkout.c:268 |
ef317cd5 JX |
4942 | #, c-format |
4943 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 4944 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 4945 | |
5b04ee3b | 4946 | #: builtin/checkout.c:339 builtin/checkout.c:346 |
c04f5ac3 JX |
4947 | #, c-format |
4948 | msgid "path '%s' is unmerged" | |
4949 | msgstr "路径 '%s' 未合并" | |
4950 | ||
5b04ee3b | 4951 | #: builtin/checkout.c:495 |
c04f5ac3 | 4952 | msgid "you need to resolve your current index first" |
90e6ef53 | 4953 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 4954 | |
5c57d762 | 4955 | #: builtin/checkout.c:625 |
c04f5ac3 | 4956 | #, c-format |
1b7f4a34 JX |
4957 | msgid "Can not do reflog for '%s': %s\n" |
4958 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 4959 | |
5c57d762 | 4960 | #: builtin/checkout.c:664 |
c04f5ac3 JX |
4961 | msgid "HEAD is now at" |
4962 | msgstr "HEAD 目前位于" | |
4963 | ||
5c57d762 | 4964 | #: builtin/checkout.c:668 builtin/clone.c:661 |
3495628d JX |
4965 | msgid "unable to update HEAD" |
4966 | msgstr "不能更新 HEAD" | |
4967 | ||
5c57d762 | 4968 | #: builtin/checkout.c:672 |
c04f5ac3 JX |
4969 | #, c-format |
4970 | msgid "Reset branch '%s'\n" | |
4971 | msgstr "重置分支 '%s'\n" | |
4972 | ||
5c57d762 | 4973 | #: builtin/checkout.c:675 |
c04f5ac3 JX |
4974 | #, c-format |
4975 | msgid "Already on '%s'\n" | |
4976 | msgstr "已经位于 '%s'\n" | |
4977 | ||
5c57d762 | 4978 | #: builtin/checkout.c:679 |
c04f5ac3 JX |
4979 | #, c-format |
4980 | msgid "Switched to and reset branch '%s'\n" | |
4981 | msgstr "切换并重置分支 '%s'\n" | |
4982 | ||
5c57d762 | 4983 | #: builtin/checkout.c:681 builtin/checkout.c:1070 |
c04f5ac3 JX |
4984 | #, c-format |
4985 | msgid "Switched to a new branch '%s'\n" | |
4986 | msgstr "切换到一个新分支 '%s'\n" | |
4987 | ||
5c57d762 | 4988 | #: builtin/checkout.c:683 |
c04f5ac3 JX |
4989 | #, c-format |
4990 | msgid "Switched to branch '%s'\n" | |
4991 | msgstr "切换到分支 '%s'\n" | |
4992 | ||
90e6ef53 | 4993 | # 译者:注意保持前导空格 |
5c57d762 | 4994 | #: builtin/checkout.c:734 |
c04f5ac3 JX |
4995 | #, c-format |
4996 | msgid " ... and %d more.\n" | |
90e6ef53 | 4997 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 4998 | |
5c57d762 | 4999 | #: builtin/checkout.c:740 |
c04f5ac3 JX |
5000 | #, c-format |
5001 | msgid "" | |
5002 | "Warning: you are leaving %d commit behind, not connected to\n" | |
5003 | "any of your branches:\n" | |
5004 | "\n" | |
5005 | "%s\n" | |
5006 | msgid_plural "" | |
5007 | "Warning: you are leaving %d commits behind, not connected to\n" | |
5008 | "any of your branches:\n" | |
5009 | "\n" | |
5010 | "%s\n" | |
5011 | msgstr[0] "" | |
5012 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
5013 | "\n" | |
5014 | "%s\n" | |
5ae481e0 JX |
5015 | msgstr[1] "" |
5016 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
5017 | "\n" | |
5018 | "%s\n" | |
c04f5ac3 | 5019 | |
5c57d762 | 5020 | #: builtin/checkout.c:759 |
c04f5ac3 JX |
5021 | #, c-format |
5022 | msgid "" | |
7aea43ff JX |
5023 | "If you want to keep it by creating a new branch, this may be a good time\n" |
5024 | "to do so with:\n" | |
5025 | "\n" | |
5026 | " git branch <new-branch-name> %s\n" | |
5027 | "\n" | |
5028 | msgid_plural "" | |
c04f5ac3 JX |
5029 | "If you want to keep them by creating a new branch, this may be a good time\n" |
5030 | "to do so with:\n" | |
5031 | "\n" | |
814ff314 | 5032 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 5033 | "\n" |
7aea43ff JX |
5034 | msgstr[0] "" |
5035 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
5036 | "如下操作:\n" | |
5037 | "\n" | |
5038 | " git branch <新分支名> %s\n" | |
5039 | "\n" | |
5040 | msgstr[1] "" | |
5041 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
5042 | "如下操作:\n" |
5043 | "\n" | |
814ff314 | 5044 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
5045 | "\n" |
5046 | ||
5c57d762 | 5047 | #: builtin/checkout.c:795 |
c04f5ac3 JX |
5048 | msgid "internal error in revision walk" |
5049 | msgstr "在版本遍历时遇到内部错误" | |
5050 | ||
5c57d762 | 5051 | #: builtin/checkout.c:799 |
c04f5ac3 JX |
5052 | msgid "Previous HEAD position was" |
5053 | msgstr "之前的 HEAD 位置是" | |
5054 | ||
5c57d762 | 5055 | #: builtin/checkout.c:826 builtin/checkout.c:1065 |
c04f5ac3 | 5056 | msgid "You are on a branch yet to be born" |
90e6ef53 | 5057 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 5058 | |
5c57d762 | 5059 | #: builtin/checkout.c:971 |
90314792 JX |
5060 | #, c-format |
5061 | msgid "only one reference expected, %d given." | |
5062 | msgstr "只要一个引用,却给出了 %d 个" | |
5063 | ||
5c57d762 | 5064 | #: builtin/checkout.c:1011 builtin/worktree.c:214 |
c04f5ac3 JX |
5065 | #, c-format |
5066 | msgid "invalid reference: %s" | |
5067 | msgstr "无效引用:%s" | |
5068 | ||
5c57d762 | 5069 | #: builtin/checkout.c:1040 |
c04f5ac3 JX |
5070 | #, c-format |
5071 | msgid "reference is not a tree: %s" | |
5072 | msgstr "引用不是一个树:%s" | |
5073 | ||
5c57d762 | 5074 | #: builtin/checkout.c:1079 |
ef317cd5 | 5075 | msgid "paths cannot be used with switching branches" |
07432cef | 5076 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 5077 | |
5c57d762 | 5078 | #: builtin/checkout.c:1082 builtin/checkout.c:1086 |
07432cef | 5079 | #, c-format |
ef317cd5 | 5080 | msgid "'%s' cannot be used with switching branches" |
07432cef | 5081 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 5082 | |
5c57d762 JX |
5083 | #: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 |
5084 | #: builtin/checkout.c:1101 | |
07432cef | 5085 | #, c-format |
ef317cd5 | 5086 | msgid "'%s' cannot be used with '%s'" |
07432cef | 5087 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 5088 | |
5c57d762 | 5089 | #: builtin/checkout.c:1106 |
07432cef | 5090 | #, c-format |
ef317cd5 | 5091 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 5092 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 5093 | |
5c57d762 JX |
5094 | #: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 |
5095 | #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 | |
5096 | #: builtin/worktree.c:326 | |
ef317cd5 | 5097 | msgid "branch" |
07432cef | 5098 | msgstr "分支" |
c04f5ac3 | 5099 | |
5c57d762 | 5100 | #: builtin/checkout.c:1140 |
ef317cd5 | 5101 | msgid "create and checkout a new branch" |
07432cef | 5102 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 5103 | |
5c57d762 | 5104 | #: builtin/checkout.c:1142 |
ef317cd5 | 5105 | msgid "create/reset and checkout a branch" |
07432cef | 5106 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 5107 | |
5c57d762 | 5108 | #: builtin/checkout.c:1143 |
ef317cd5 | 5109 | msgid "create reflog for new branch" |
07432cef | 5110 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 5111 | |
5c57d762 JX |
5112 | #: builtin/checkout.c:1144 builtin/worktree.c:328 |
5113 | msgid "detach HEAD at named commit" | |
5114 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 5115 | |
5c57d762 | 5116 | #: builtin/checkout.c:1145 |
ef317cd5 | 5117 | msgid "set upstream info for new branch" |
07432cef | 5118 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 5119 | |
5c57d762 | 5120 | #: builtin/checkout.c:1147 |
6c94aba5 | 5121 | msgid "new-branch" |
07432cef | 5122 | msgstr "新分支" |
ef317cd5 | 5123 | |
5c57d762 | 5124 | #: builtin/checkout.c:1147 |
ef317cd5 | 5125 | msgid "new unparented branch" |
07432cef | 5126 | msgstr "新的没有父提交的分支" |
ef317cd5 | 5127 | |
5c57d762 | 5128 | #: builtin/checkout.c:1148 |
ef317cd5 | 5129 | msgid "checkout our version for unmerged files" |
07432cef | 5130 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 5131 | |
5c57d762 | 5132 | #: builtin/checkout.c:1150 |
ef317cd5 | 5133 | msgid "checkout their version for unmerged files" |
07432cef | 5134 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 5135 | |
5c57d762 | 5136 | #: builtin/checkout.c:1152 |
ef317cd5 | 5137 | msgid "force checkout (throw away local modifications)" |
07432cef | 5138 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 5139 | |
5c57d762 | 5140 | #: builtin/checkout.c:1153 |
ef317cd5 | 5141 | msgid "perform a 3-way merge with the new branch" |
160fb2b2 | 5142 | msgstr "和新的分支执行三方合并" |
ef317cd5 | 5143 | |
5c57d762 | 5144 | #: builtin/checkout.c:1154 builtin/merge.c:231 |
ef317cd5 | 5145 | msgid "update ignored files (default)" |
07432cef | 5146 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 5147 | |
5c57d762 | 5148 | #: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 |
ef317cd5 | 5149 | msgid "style" |
07432cef | 5150 | msgstr "风格" |
ef317cd5 | 5151 | |
5c57d762 | 5152 | #: builtin/checkout.c:1156 |
ef317cd5 | 5153 | msgid "conflict style (merge or diff3)" |
07432cef | 5154 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 5155 | |
5c57d762 | 5156 | #: builtin/checkout.c:1159 |
4dcdc3d8 JX |
5157 | msgid "do not limit pathspecs to sparse entries only" |
5158 | msgstr "对路径不做稀疏检出的限制" | |
5159 | ||
5c57d762 | 5160 | #: builtin/checkout.c:1161 |
814ff314 JX |
5161 | msgid "second guess 'git checkout <no-such-branch>'" |
5162 | msgstr "二次猜测'git checkout <无此分支>'" | |
ef317cd5 | 5163 | |
5c57d762 | 5164 | #: builtin/checkout.c:1163 |
7aea43ff JX |
5165 | msgid "do not check if another worktree is holding the given ref" |
5166 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
5167 | ||
5c57d762 JX |
5168 | #: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117 |
5169 | #: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 | |
94550ed3 JX |
5170 | #: builtin/send-pack.c:168 |
5171 | msgid "force progress reporting" | |
5172 | msgstr "强制显示进度报告" | |
5173 | ||
5c57d762 | 5174 | #: builtin/checkout.c:1195 |
ef317cd5 | 5175 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 5176 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 5177 | |
5c57d762 | 5178 | #: builtin/checkout.c:1212 |
ef317cd5 JX |
5179 | msgid "--track needs a branch name" |
5180 | msgstr "--track 需要一个分支名" | |
5181 | ||
5c57d762 | 5182 | #: builtin/checkout.c:1217 |
ef317cd5 JX |
5183 | msgid "Missing branch name; try -b" |
5184 | msgstr "缺少分支名;尝试 -b" | |
5185 | ||
5c57d762 | 5186 | #: builtin/checkout.c:1253 |
c04f5ac3 | 5187 | msgid "invalid path specification" |
90e6ef53 | 5188 | msgstr "无效的路径规格" |
c04f5ac3 | 5189 | |
5c57d762 | 5190 | #: builtin/checkout.c:1260 |
07432cef | 5191 | #, c-format |
c04f5ac3 | 5192 | msgid "" |
ef317cd5 | 5193 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
5194 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
5195 | msgstr "" | |
07432cef WS |
5196 | "不能同时更新路径并切换到分支'%s'。\n" |
5197 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 5198 | |
5c57d762 | 5199 | #: builtin/checkout.c:1265 |
07432cef | 5200 | #, c-format |
ef317cd5 | 5201 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 5202 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 5203 | |
5c57d762 | 5204 | #: builtin/checkout.c:1269 |
c04f5ac3 JX |
5205 | msgid "" |
5206 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
5207 | "checking out of the index." | |
5208 | msgstr "" | |
90e6ef53 | 5209 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 5210 | |
1b7f4a34 | 5211 | #: builtin/clean.c:25 |
2e8451e8 JX |
5212 | msgid "" |
5213 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
5214 | msgstr "" | |
5215 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 5216 | |
1b7f4a34 | 5217 | #: builtin/clean.c:29 |
07432cef WS |
5218 | #, c-format |
5219 | msgid "Removing %s\n" | |
5220 | msgstr "正删除 %s\n" | |
5221 | ||
1b7f4a34 | 5222 | #: builtin/clean.c:30 |
07432cef WS |
5223 | #, c-format |
5224 | msgid "Would remove %s\n" | |
5225 | msgstr "将删除 %s\n" | |
5226 | ||
1b7f4a34 | 5227 | #: builtin/clean.c:31 |
07432cef WS |
5228 | #, c-format |
5229 | msgid "Skipping repository %s\n" | |
160fb2b2 | 5230 | msgstr "忽略仓库 %s\n" |
07432cef | 5231 | |
1b7f4a34 | 5232 | #: builtin/clean.c:32 |
07432cef WS |
5233 | #, c-format |
5234 | msgid "Would skip repository %s\n" | |
160fb2b2 | 5235 | msgstr "将忽略仓库 %s\n" |
07432cef | 5236 | |
1b7f4a34 | 5237 | #: builtin/clean.c:33 |
07432cef WS |
5238 | #, c-format |
5239 | msgid "failed to remove %s" | |
5240 | msgstr "无法删除 %s" | |
5241 | ||
276ceeaa | 5242 | #: builtin/clean.c:291 |
2e8451e8 JX |
5243 | msgid "" |
5244 | "Prompt help:\n" | |
5245 | "1 - select a numbered item\n" | |
5246 | "foo - select item based on unique prefix\n" | |
5247 | " - (empty) select nothing" | |
5248 | msgstr "" | |
5249 | "帮助:\n" | |
5250 | "1 - 通过编号选择一个选项\n" | |
5251 | "foo - 通过标题选择一个选项\n" | |
5252 | " - (空)什么也不选择" | |
5253 | ||
276ceeaa | 5254 | #: builtin/clean.c:295 |
2e8451e8 JX |
5255 | msgid "" |
5256 | "Prompt help:\n" | |
5257 | "1 - select a single item\n" | |
5258 | "3-5 - select a range of items\n" | |
5259 | "2-3,6-9 - select multiple ranges\n" | |
5260 | "foo - select item based on unique prefix\n" | |
5261 | "-... - unselect specified items\n" | |
5262 | "* - choose all items\n" | |
5263 | " - (empty) finish selecting" | |
5264 | msgstr "" | |
5265 | "帮助:\n" | |
5266 | "1 - 选择一个选项\n" | |
5267 | "3-5 - 选择一个范围内的所有选项\n" | |
5268 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
5269 | "foo - 通过标题选择一个选项\n" | |
5270 | "-... - 反选特定的选项\n" | |
5271 | "* - 选择所有选项\n" | |
5272 | " - (空)结束选择" | |
5273 | ||
276ceeaa | 5274 | #: builtin/clean.c:511 |
2e8451e8 JX |
5275 | #, c-format |
5276 | msgid "Huh (%s)?" | |
5277 | msgstr "嗯(%s)?" | |
5278 | ||
276ceeaa | 5279 | #: builtin/clean.c:653 |
2e8451e8 JX |
5280 | #, c-format |
5281 | msgid "Input ignore patterns>> " | |
5282 | msgstr "输入模版以排除条目>> " | |
5283 | ||
276ceeaa | 5284 | #: builtin/clean.c:690 |
2e8451e8 JX |
5285 | #, c-format |
5286 | msgid "WARNING: Cannot find items matched by: %s" | |
5287 | msgstr "警告:无法找到和 %s 匹配的条目" | |
5288 | ||
276ceeaa | 5289 | #: builtin/clean.c:711 |
2e8451e8 JX |
5290 | msgid "Select items to delete" |
5291 | msgstr "选择要删除的条目" | |
5292 | ||
814ff314 | 5293 | #. TRANSLATORS: Make sure to keep [y/N] as is |
276ceeaa | 5294 | #: builtin/clean.c:752 |
2e8451e8 | 5295 | #, c-format |
814ff314 JX |
5296 | msgid "Remove %s [y/N]? " |
5297 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 5298 | |
276ceeaa | 5299 | #: builtin/clean.c:777 |
2e8451e8 JX |
5300 | msgid "Bye." |
5301 | msgstr "再见。" | |
5302 | ||
276ceeaa | 5303 | #: builtin/clean.c:785 |
2e8451e8 JX |
5304 | msgid "" |
5305 | "clean - start cleaning\n" | |
5306 | "filter by pattern - exclude items from deletion\n" | |
5307 | "select by numbers - select items to be deleted by numbers\n" | |
5308 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
5309 | "quit - stop cleaning\n" | |
5310 | "help - this screen\n" | |
5311 | "? - help for prompt selection" | |
5312 | msgstr "" | |
5313 | "clean - 开始清理\n" | |
5314 | "filter by pattern - 通过模版排除要删除的条目\n" | |
5315 | "select by numbers - 通过数字选择要删除的条目\n" | |
5316 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
5317 | "quit - 停止删除并退出\n" | |
5318 | "help - 显示本帮助\n" | |
5319 | "? - 显示如何在提示符下选择的帮助" | |
5320 | ||
276ceeaa | 5321 | #: builtin/clean.c:812 |
2e8451e8 JX |
5322 | msgid "*** Commands ***" |
5323 | msgstr "*** 命令 ***" | |
5324 | ||
276ceeaa | 5325 | #: builtin/clean.c:813 |
2e8451e8 JX |
5326 | msgid "What now" |
5327 | msgstr "请选择" | |
5328 | ||
276ceeaa | 5329 | #: builtin/clean.c:821 |
2e8451e8 JX |
5330 | msgid "Would remove the following item:" |
5331 | msgid_plural "Would remove the following items:" | |
5332 | msgstr[0] "将删除如下条目:" | |
5333 | msgstr[1] "将删除如下条目:" | |
5334 | ||
276ceeaa | 5335 | #: builtin/clean.c:838 |
2e8451e8 JX |
5336 | msgid "No more files to clean, exiting." |
5337 | msgstr "没有要清理的文件,退出。" | |
5338 | ||
276ceeaa | 5339 | #: builtin/clean.c:869 |
ef317cd5 | 5340 | msgid "do not print names of files removed" |
07432cef | 5341 | msgstr "不打印删除文件的名称" |
ef317cd5 | 5342 | |
276ceeaa | 5343 | #: builtin/clean.c:871 |
ef317cd5 | 5344 | msgid "force" |
07432cef | 5345 | msgstr "强制" |
ef317cd5 | 5346 | |
276ceeaa | 5347 | #: builtin/clean.c:872 |
2e8451e8 JX |
5348 | msgid "interactive cleaning" |
5349 | msgstr "交互式清除" | |
5350 | ||
276ceeaa | 5351 | #: builtin/clean.c:874 |
ef317cd5 | 5352 | msgid "remove whole directories" |
07432cef | 5353 | msgstr "删除整个目录" |
ef317cd5 | 5354 | |
5b04ee3b | 5355 | #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 |
5c57d762 | 5356 | #: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 |
ef317cd5 | 5357 | msgid "pattern" |
07432cef | 5358 | msgstr "模式" |
ef317cd5 | 5359 | |
276ceeaa | 5360 | #: builtin/clean.c:876 |
ef317cd5 | 5361 | msgid "add <pattern> to ignore rules" |
4375c10e | 5362 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 5363 | |
276ceeaa | 5364 | #: builtin/clean.c:877 |
ef317cd5 | 5365 | msgid "remove ignored files, too" |
07432cef | 5366 | msgstr "也删除忽略的文件" |
ef317cd5 | 5367 | |
276ceeaa | 5368 | #: builtin/clean.c:879 |
ef317cd5 | 5369 | msgid "remove only ignored files" |
07432cef | 5370 | msgstr "只删除忽略的文件" |
c04f5ac3 | 5371 | |
276ceeaa | 5372 | #: builtin/clean.c:897 |
c04f5ac3 | 5373 | msgid "-x and -X cannot be used together" |
649900bc | 5374 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 5375 | |
276ceeaa | 5376 | #: builtin/clean.c:901 |
c04f5ac3 | 5377 | msgid "" |
6c94aba5 | 5378 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 5379 | "clean" |
c04f5ac3 | 5380 | msgstr "" |
2e8451e8 | 5381 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 5382 | |
276ceeaa | 5383 | #: builtin/clean.c:904 |
c04f5ac3 | 5384 | msgid "" |
6c94aba5 | 5385 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 5386 | "refusing to clean" |
c04f5ac3 | 5387 | msgstr "" |
2e8451e8 | 5388 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 5389 | |
220c313c | 5390 | #: builtin/clone.c:37 |
814ff314 | 5391 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 5392 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 5393 | |
5b04ee3b | 5394 | #: builtin/clone.c:62 |
ef317cd5 | 5395 | msgid "don't create a checkout" |
07432cef | 5396 | msgstr "不创建一个检出" |
ef317cd5 | 5397 | |
5c57d762 | 5398 | #: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 |
ef317cd5 | 5399 | msgid "create a bare repository" |
160fb2b2 | 5400 | msgstr "创建一个纯仓库" |
ef317cd5 | 5401 | |
5b04ee3b | 5402 | #: builtin/clone.c:67 |
ef317cd5 | 5403 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 5404 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 5405 | |
5b04ee3b | 5406 | #: builtin/clone.c:69 |
ef317cd5 | 5407 | msgid "to clone from a local repository" |
160fb2b2 | 5408 | msgstr "从本地仓库克隆" |
ef317cd5 | 5409 | |
5b04ee3b | 5410 | #: builtin/clone.c:71 |
ef317cd5 | 5411 | msgid "don't use local hardlinks, always copy" |
07432cef | 5412 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 5413 | |
5b04ee3b | 5414 | #: builtin/clone.c:73 |
ef317cd5 | 5415 | msgid "setup as shared repository" |
160fb2b2 | 5416 | msgstr "设置为共享仓库" |
ef317cd5 | 5417 | |
5b04ee3b | 5418 | #: builtin/clone.c:75 builtin/clone.c:77 |
ef317cd5 | 5419 | msgid "initialize submodules in the clone" |
07432cef | 5420 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 5421 | |
5b04ee3b JX |
5422 | #: builtin/clone.c:79 |
5423 | msgid "number of submodules cloned in parallel" | |
5424 | msgstr "并发克隆的子模组的数量" | |
5425 | ||
5c57d762 | 5426 | #: builtin/clone.c:80 builtin/init-db.c:473 |
ef317cd5 | 5427 | msgid "template-directory" |
07432cef | 5428 | msgstr "模板目录" |
ef317cd5 | 5429 | |
5c57d762 | 5430 | #: builtin/clone.c:81 builtin/init-db.c:474 |
ef317cd5 | 5431 | msgid "directory from which templates will be used" |
07432cef | 5432 | msgstr "模板目录将被使用" |
ef317cd5 | 5433 | |
5c57d762 JX |
5434 | #: builtin/clone.c:83 builtin/submodule--helper.c:495 |
5435 | #: builtin/submodule--helper.c:833 | |
ef317cd5 | 5436 | msgid "reference repository" |
160fb2b2 | 5437 | msgstr "参考仓库" |
ef317cd5 | 5438 | |
5b04ee3b | 5439 | #: builtin/clone.c:85 |
7aea43ff | 5440 | msgid "use --reference only while cloning" |
160fb2b2 | 5441 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 5442 | |
5b04ee3b | 5443 | #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 |
ef317cd5 | 5444 | msgid "name" |
07432cef | 5445 | msgstr "名称" |
ef317cd5 | 5446 | |
5b04ee3b | 5447 | #: builtin/clone.c:87 |
ef317cd5 | 5448 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 5449 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 5450 | |
5b04ee3b | 5451 | #: builtin/clone.c:89 |
ef317cd5 | 5452 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 5453 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 5454 | |
5b04ee3b | 5455 | #: builtin/clone.c:91 |
ef317cd5 | 5456 | msgid "path to git-upload-pack on the remote" |
07432cef | 5457 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 5458 | |
5c57d762 | 5459 | #: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 |
5b04ee3b | 5460 | #: builtin/pull.c:201 |
ef317cd5 | 5461 | msgid "depth" |
07432cef | 5462 | msgstr "深度" |
ef317cd5 | 5463 | |
5b04ee3b | 5464 | #: builtin/clone.c:93 |
ef317cd5 | 5465 | msgid "create a shallow clone of that depth" |
07432cef | 5466 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 5467 | |
5b04ee3b | 5468 | #: builtin/clone.c:95 |
ef317cd5 | 5469 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 5470 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 5471 | |
5b04ee3b JX |
5472 | #: builtin/clone.c:97 |
5473 | msgid "any cloned submodules will be shallow" | |
5474 | msgstr "子模组将以浅下载模式克隆" | |
5475 | ||
5c57d762 | 5476 | #: builtin/clone.c:98 builtin/init-db.c:482 |
ef317cd5 | 5477 | msgid "gitdir" |
07432cef | 5478 | msgstr "git目录" |
ef317cd5 | 5479 | |
5c57d762 | 5480 | #: builtin/clone.c:99 builtin/init-db.c:483 |
ef317cd5 | 5481 | msgid "separate git dir from working tree" |
07432cef | 5482 | msgstr "git目录和工作区分离" |
ef317cd5 | 5483 | |
5b04ee3b | 5484 | #: builtin/clone.c:100 |
ef317cd5 | 5485 | msgid "key=value" |
07432cef | 5486 | msgstr "key=value" |
ef317cd5 | 5487 | |
5b04ee3b | 5488 | #: builtin/clone.c:101 |
ef317cd5 | 5489 | msgid "set config inside the new repository" |
160fb2b2 | 5490 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 5491 | |
5c57d762 | 5492 | #: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 |
276ceeaa JX |
5493 | msgid "use IPv4 addresses only" |
5494 | msgstr "只使用 IPv4 地址" | |
5495 | ||
5c57d762 | 5496 | #: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 |
276ceeaa JX |
5497 | msgid "use IPv6 addresses only" |
5498 | msgstr "只使用 IPv6 地址" | |
5499 | ||
5b04ee3b | 5500 | #: builtin/clone.c:241 |
3495628d JX |
5501 | msgid "" |
5502 | "No directory name could be guessed.\n" | |
5503 | "Please specify a directory on the command line" | |
5504 | msgstr "" | |
5505 | "无法猜到目录名。\n" | |
26e4cbec | 5506 | "请在命令行指定一个目录" |
3495628d | 5507 | |
5b04ee3b | 5508 | #: builtin/clone.c:307 |
94550ed3 JX |
5509 | #, c-format |
5510 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
5511 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
5512 | ||
5b04ee3b | 5513 | #: builtin/clone.c:309 |
c04f5ac3 | 5514 | #, c-format |
4dcdc3d8 | 5515 | msgid "reference repository '%s' is not a local repository." |
160fb2b2 | 5516 | msgstr "参考仓库 '%s' 不是一个本地仓库。" |
c04f5ac3 | 5517 | |
5b04ee3b | 5518 | #: builtin/clone.c:314 |
cfff71a9 JX |
5519 | #, c-format |
5520 | msgid "reference repository '%s' is shallow" | |
160fb2b2 | 5521 | msgstr "参考仓库 '%s' 是一个浅克隆" |
cfff71a9 | 5522 | |
5b04ee3b | 5523 | #: builtin/clone.c:317 |
cfff71a9 JX |
5524 | #, c-format |
5525 | msgid "reference repository '%s' is grafted" | |
160fb2b2 | 5526 | msgstr "参考仓库 '%s' 已被嫁接" |
cfff71a9 | 5527 | |
5c57d762 JX |
5528 | #: builtin/clone.c:376 |
5529 | #, c-format | |
5530 | msgid "failed to open '%s'" | |
5531 | msgstr "无法打开 '%s'" | |
5532 | ||
5b04ee3b | 5533 | #: builtin/clone.c:384 |
c04f5ac3 JX |
5534 | #, c-format |
5535 | msgid "%s exists and is not a directory" | |
5536 | msgstr "%s 存在且不是一个目录" | |
5537 | ||
5b04ee3b | 5538 | #: builtin/clone.c:398 |
c04f5ac3 JX |
5539 | #, c-format |
5540 | msgid "failed to stat %s\n" | |
90e6ef53 | 5541 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 5542 | |
5b04ee3b | 5543 | #: builtin/clone.c:420 |
c04f5ac3 JX |
5544 | #, c-format |
5545 | msgid "failed to create link '%s'" | |
90e6ef53 | 5546 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 5547 | |
5b04ee3b | 5548 | #: builtin/clone.c:424 |
c04f5ac3 JX |
5549 | #, c-format |
5550 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 5551 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 5552 | |
5c57d762 | 5553 | #: builtin/clone.c:449 |
c04f5ac3 JX |
5554 | #, c-format |
5555 | msgid "done.\n" | |
5556 | msgstr "完成。\n" | |
5557 | ||
5b04ee3b | 5558 | #: builtin/clone.c:461 |
1003b3a5 JX |
5559 | msgid "" |
5560 | "Clone succeeded, but checkout failed.\n" | |
5561 | "You can inspect what was checked out with 'git status'\n" | |
5562 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
5563 | msgstr "" | |
5564 | "克隆成功,但是检出失败。\n" | |
5565 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
5566 | "'git checkout -f HEAD' 重试\n" | |
5567 | ||
5b04ee3b | 5568 | #: builtin/clone.c:538 |
c04f5ac3 JX |
5569 | #, c-format |
5570 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 5571 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 5572 | |
5c57d762 | 5573 | #: builtin/clone.c:633 |
1003b3a5 JX |
5574 | msgid "remote did not send all necessary objects" |
5575 | msgstr "远程没有发送所有必须的对象" | |
5576 | ||
5b04ee3b | 5577 | #: builtin/clone.c:649 |
3495628d JX |
5578 | #, c-format |
5579 | msgid "unable to update %s" | |
5580 | msgstr "不能更新 %s" | |
5581 | ||
5b04ee3b | 5582 | #: builtin/clone.c:698 |
c04f5ac3 JX |
5583 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
5584 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
5585 | ||
5b04ee3b | 5586 | #: builtin/clone.c:729 |
1003b3a5 JX |
5587 | msgid "unable to checkout working tree" |
5588 | msgstr "不能检出工作区" | |
5589 | ||
5c57d762 | 5590 | #: builtin/clone.c:766 |
3495628d JX |
5591 | msgid "unable to write parameters to config file" |
5592 | msgstr "无法将参数写入配置文件" | |
5593 | ||
5c57d762 | 5594 | #: builtin/clone.c:829 |
04cb2f28 JX |
5595 | msgid "cannot repack to clean up" |
5596 | msgstr "无法执行 repack 来清理" | |
5597 | ||
5c57d762 | 5598 | #: builtin/clone.c:831 |
04cb2f28 JX |
5599 | msgid "cannot unlink temporary alternates file" |
5600 | msgstr "无法删除临时的 alternates 文件" | |
5601 | ||
5c57d762 | 5602 | #: builtin/clone.c:863 builtin/receive-pack.c:1855 |
c04f5ac3 JX |
5603 | msgid "Too many arguments." |
5604 | msgstr "太多参数。" | |
5605 | ||
5c57d762 | 5606 | #: builtin/clone.c:867 |
c04f5ac3 | 5607 | msgid "You must specify a repository to clone." |
160fb2b2 | 5608 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 5609 | |
5c57d762 | 5610 | #: builtin/clone.c:878 |
c04f5ac3 JX |
5611 | #, c-format |
5612 | msgid "--bare and --origin %s options are incompatible." | |
5613 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
5614 | ||
5c57d762 | 5615 | #: builtin/clone.c:881 |
07432cef WS |
5616 | msgid "--bare and --separate-git-dir are incompatible." |
5617 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
5618 | ||
5c57d762 | 5619 | #: builtin/clone.c:894 |
c04f5ac3 JX |
5620 | #, c-format |
5621 | msgid "repository '%s' does not exist" | |
160fb2b2 | 5622 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 5623 | |
5c57d762 | 5624 | #: builtin/clone.c:900 builtin/fetch.c:1293 |
cfff71a9 JX |
5625 | #, c-format |
5626 | msgid "depth %s is not a positive number" | |
5627 | msgstr "深度 %s 不是一个正数" | |
5628 | ||
5c57d762 | 5629 | #: builtin/clone.c:910 |
c04f5ac3 JX |
5630 | #, c-format |
5631 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 5632 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 5633 | |
5c57d762 | 5634 | #: builtin/clone.c:920 |
c04f5ac3 JX |
5635 | #, c-format |
5636 | msgid "working tree '%s' already exists." | |
5637 | msgstr "工作区 '%s' 已经存在。" | |
5638 | ||
5c57d762 JX |
5639 | #: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 |
5640 | #: builtin/worktree.c:222 builtin/worktree.c:249 | |
5bb01d4f JX |
5641 | #, c-format |
5642 | msgid "could not create leading directories of '%s'" | |
5643 | msgstr "不能为 '%s' 创建先导目录" | |
5644 | ||
5c57d762 | 5645 | #: builtin/clone.c:938 |
c04f5ac3 | 5646 | #, c-format |
814ff314 JX |
5647 | msgid "could not create work tree dir '%s'" |
5648 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 5649 | |
5c57d762 | 5650 | #: builtin/clone.c:956 |
c04f5ac3 JX |
5651 | #, c-format |
5652 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 5653 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 5654 | |
5c57d762 | 5655 | #: builtin/clone.c:958 |
c04f5ac3 JX |
5656 | #, c-format |
5657 | msgid "Cloning into '%s'...\n" | |
5658 | msgstr "正克隆到 '%s'...\n" | |
5659 | ||
5c57d762 | 5660 | #: builtin/clone.c:997 |
6acbf033 JX |
5661 | msgid "--depth is ignored in local clones; use file:// instead." |
5662 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
5663 | ||
5c57d762 | 5664 | #: builtin/clone.c:1000 |
6acbf033 | 5665 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 5666 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 5667 | |
5c57d762 | 5668 | #: builtin/clone.c:1005 |
6acbf033 JX |
5669 | msgid "--local is ignored" |
5670 | msgstr "--local 被忽略" | |
5671 | ||
5c57d762 | 5672 | #: builtin/clone.c:1009 |
c04f5ac3 JX |
5673 | #, c-format |
5674 | msgid "Don't know how to clone %s" | |
5675 | msgstr "不知道如何克隆 %s" | |
5676 | ||
5c57d762 | 5677 | #: builtin/clone.c:1058 builtin/clone.c:1066 |
c04f5ac3 JX |
5678 | #, c-format |
5679 | msgid "Remote branch %s not found in upstream %s" | |
5680 | msgstr "远程分支 %s 在上游 %s 未发现" | |
5681 | ||
5c57d762 | 5682 | #: builtin/clone.c:1069 |
c04f5ac3 | 5683 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 5684 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 5685 | |
ef317cd5 | 5686 | #: builtin/column.c:9 |
814ff314 JX |
5687 | msgid "git column [<options>]" |
5688 | msgstr "git column [<选项>]" | |
ef317cd5 JX |
5689 | |
5690 | #: builtin/column.c:26 | |
5691 | msgid "lookup config vars" | |
07432cef | 5692 | msgstr "查找配置变量" |
ef317cd5 JX |
5693 | |
5694 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 5695 | msgid "layout to use" |
07432cef | 5696 | msgstr "要使用的布局" |
ef317cd5 JX |
5697 | |
5698 | #: builtin/column.c:29 | |
5699 | msgid "Maximum width" | |
07432cef | 5700 | msgstr "最大宽度" |
ef317cd5 JX |
5701 | |
5702 | #: builtin/column.c:30 | |
5703 | msgid "Padding space on left border" | |
07432cef | 5704 | msgstr "左边框的填充空间" |
ef317cd5 JX |
5705 | |
5706 | #: builtin/column.c:31 | |
5707 | msgid "Padding space on right border" | |
07432cef | 5708 | msgstr "右边框的填充空间" |
ef317cd5 JX |
5709 | |
5710 | #: builtin/column.c:32 | |
5711 | msgid "Padding space between columns" | |
07432cef | 5712 | msgstr "两列之间的填充空间" |
ef317cd5 | 5713 | |
8ada9598 JX |
5714 | #: builtin/column.c:51 |
5715 | msgid "--command must be the first argument" | |
81809b99 | 5716 | msgstr "--command 必须是第一个参数" |
8ada9598 | 5717 | |
94550ed3 | 5718 | #: builtin/commit.c:38 |
814ff314 | 5719 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 5720 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 5721 | |
94550ed3 | 5722 | #: builtin/commit.c:43 |
814ff314 | 5723 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 5724 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 5725 | |
94550ed3 | 5726 | #: builtin/commit.c:48 |
220c313c JX |
5727 | msgid "" |
5728 | "Your name and email address were configured automatically based\n" | |
5729 | "on your username and hostname. Please check that they are accurate.\n" | |
5730 | "You can suppress this message by setting them explicitly. Run the\n" | |
5731 | "following command and follow the instructions in your editor to edit\n" | |
5732 | "your configuration file:\n" | |
5733 | "\n" | |
5734 | " git config --global --edit\n" | |
5735 | "\n" | |
5736 | "After doing this, you may fix the identity used for this commit with:\n" | |
5737 | "\n" | |
5738 | " git commit --amend --reset-author\n" | |
5739 | msgstr "" | |
5740 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
5741 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
5742 | "中编辑您的配置文件:\n" | |
5743 | "\n" | |
5744 | " git config --global --edit\n" | |
5745 | "\n" | |
5746 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
5747 | "\n" | |
5748 | " git commit --amend --reset-author\n" | |
5749 | ||
94550ed3 | 5750 | #: builtin/commit.c:61 |
c04f5ac3 JX |
5751 | msgid "" |
5752 | "Your name and email address were configured automatically based\n" | |
5753 | "on your username and hostname. Please check that they are accurate.\n" | |
5754 | "You can suppress this message by setting them explicitly:\n" | |
5755 | "\n" | |
5756 | " git config --global user.name \"Your Name\"\n" | |
5757 | " git config --global user.email you@example.com\n" | |
5758 | "\n" | |
5759 | "After doing this, you may fix the identity used for this commit with:\n" | |
5760 | "\n" | |
5761 | " git commit --amend --reset-author\n" | |
5762 | msgstr "" | |
90e6ef53 | 5763 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
220c313c | 5764 | "与否。您可以对其进行设置以免再出现本提示信息:\n" |
c04f5ac3 JX |
5765 | "\n" |
5766 | " git config --global user.name \"Your Name\"\n" | |
5767 | " git config --global user.email you@example.com\n" | |
5768 | "\n" | |
90e6ef53 | 5769 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
5770 | "\n" |
5771 | " git commit --amend --reset-author\n" | |
5772 | ||
94550ed3 | 5773 | #: builtin/commit.c:73 |
c04f5ac3 JX |
5774 | msgid "" |
5775 | "You asked to amend the most recent commit, but doing so would make\n" | |
5776 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
5777 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
5778 | msgstr "" | |
1b150dc9 T |
5779 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
5780 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 5781 | |
94550ed3 | 5782 | #: builtin/commit.c:78 |
c04f5ac3 JX |
5783 | msgid "" |
5784 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
5785 | "If you wish to commit it anyway, use:\n" | |
5786 | "\n" | |
5787 | " git commit --allow-empty\n" | |
5788 | "\n" | |
c04f5ac3 | 5789 | msgstr "" |
a9ce4543 T |
5790 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
5791 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
5792 | "\n" |
5793 | " git commit --allow-empty\n" | |
5794 | "\n" | |
c04f5ac3 | 5795 | |
94550ed3 | 5796 | #: builtin/commit.c:85 |
b1894384 JX |
5797 | msgid "Otherwise, please use 'git reset'\n" |
5798 | msgstr "否则,请使用命令 'git reset'\n" | |
5799 | ||
94550ed3 | 5800 | #: builtin/commit.c:88 |
b1894384 JX |
5801 | msgid "" |
5802 | "If you wish to skip this commit, use:\n" | |
5803 | "\n" | |
5804 | " git reset\n" | |
5805 | "\n" | |
5806 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
5807 | "the remaining commits.\n" | |
5808 | msgstr "" | |
5809 | "如果您想跳过这个提交,使用命令:\n" | |
5810 | "\n" | |
5811 | " git reset\n" | |
5812 | "\n" | |
5813 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
5814 | "操作。\n" | |
5815 | ||
5c57d762 | 5816 | #: builtin/commit.c:308 |
c04f5ac3 | 5817 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 5818 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 5819 | |
5c57d762 | 5820 | #: builtin/commit.c:349 |
c04f5ac3 | 5821 | msgid "unable to create temporary index" |
90e6ef53 | 5822 | msgstr "不能创建临时索引" |
c04f5ac3 | 5823 | |
5c57d762 | 5824 | #: builtin/commit.c:355 |
c04f5ac3 JX |
5825 | msgid "interactive add failed" |
5826 | msgstr "交互式添加失败" | |
5827 | ||
5c57d762 | 5828 | #: builtin/commit.c:368 |
220c313c JX |
5829 | msgid "unable to update temporary index" |
5830 | msgstr "无法更新临时索引" | |
5831 | ||
5c57d762 | 5832 | #: builtin/commit.c:370 |
220c313c JX |
5833 | msgid "Failed to update main cache tree" |
5834 | msgstr "不能更新树的主缓存" | |
5835 | ||
5c57d762 | 5836 | #: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 |
c04f5ac3 | 5837 | msgid "unable to write new_index file" |
90e6ef53 | 5838 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 5839 | |
5c57d762 | 5840 | #: builtin/commit.c:448 |
8ada9598 | 5841 | msgid "cannot do a partial commit during a merge." |
81809b99 | 5842 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 5843 | |
5c57d762 | 5844 | #: builtin/commit.c:450 |
8ada9598 | 5845 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 5846 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 5847 | |
5c57d762 | 5848 | #: builtin/commit.c:459 |
c04f5ac3 | 5849 | msgid "cannot read the index" |
90e6ef53 | 5850 | msgstr "无法读取索引" |
c04f5ac3 | 5851 | |
5c57d762 | 5852 | #: builtin/commit.c:478 |
c04f5ac3 | 5853 | msgid "unable to write temporary index file" |
90e6ef53 | 5854 | msgstr "无法写临时索引文件" |
c04f5ac3 | 5855 | |
5c57d762 | 5856 | #: builtin/commit.c:583 |
220c313c JX |
5857 | #, c-format |
5858 | msgid "commit '%s' lacks author header" | |
5859 | msgstr "提交 '%s' 缺少作者信息" | |
5860 | ||
5c57d762 | 5861 | #: builtin/commit.c:585 |
c04f5ac3 | 5862 | #, c-format |
220c313c JX |
5863 | msgid "commit '%s' has malformed author line" |
5864 | msgstr "提交 '%s' 有非法的作者信息" | |
c04f5ac3 | 5865 | |
5c57d762 | 5866 | #: builtin/commit.c:604 |
c04f5ac3 JX |
5867 | msgid "malformed --author parameter" |
5868 | msgstr "非法的 --author 参数" | |
5869 | ||
5c57d762 | 5870 | #: builtin/commit.c:612 |
c04f5ac3 | 5871 | #, c-format |
6acbf033 JX |
5872 | msgid "invalid date format: %s" |
5873 | msgstr "无效的日期格式:%s" | |
5874 | ||
5c57d762 | 5875 | #: builtin/commit.c:656 |
6acbf033 JX |
5876 | msgid "" |
5877 | "unable to select a comment character that is not used\n" | |
5878 | "in the current commit message" | |
5879 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
5880 | ||
5c57d762 | 5881 | #: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 |
c04f5ac3 JX |
5882 | #, c-format |
5883 | msgid "could not lookup commit %s" | |
5884 | msgstr "不能查询提交 %s" | |
5885 | ||
5c57d762 | 5886 | #: builtin/commit.c:705 builtin/shortlog.c:286 |
c04f5ac3 JX |
5887 | #, c-format |
5888 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 5889 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 5890 | |
5c57d762 | 5891 | #: builtin/commit.c:707 |
c04f5ac3 | 5892 | msgid "could not read log from standard input" |
90e6ef53 | 5893 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 5894 | |
5c57d762 | 5895 | #: builtin/commit.c:711 |
c04f5ac3 JX |
5896 | #, c-format |
5897 | msgid "could not read log file '%s'" | |
90e6ef53 | 5898 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 5899 | |
5c57d762 | 5900 | #: builtin/commit.c:738 builtin/commit.c:746 |
c04f5ac3 | 5901 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 5902 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 5903 | |
5c57d762 | 5904 | #: builtin/commit.c:743 |
5b04ee3b JX |
5905 | msgid "could not read MERGE_MSG" |
5906 | msgstr "不能读取 MERGE_MSG" | |
5907 | ||
5c57d762 | 5908 | #: builtin/commit.c:797 |
c04f5ac3 | 5909 | msgid "could not write commit template" |
90e6ef53 | 5910 | msgstr "不能写提交模版" |
c04f5ac3 | 5911 | |
5c57d762 | 5912 | #: builtin/commit.c:815 |
81809b99 | 5913 | #, c-format |
c04f5ac3 JX |
5914 | msgid "" |
5915 | "\n" | |
8ada9598 | 5916 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
5917 | "If this is not correct, please remove the file\n" |
5918 | "\t%s\n" | |
5919 | "and try again.\n" | |
5920 | msgstr "" | |
5921 | "\n" | |
649900bc | 5922 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
5923 | "\t%s\n" |
5924 | "然后重试。\n" | |
5925 | ||
5c57d762 | 5926 | #: builtin/commit.c:820 |
81809b99 | 5927 | #, c-format |
8ada9598 JX |
5928 | msgid "" |
5929 | "\n" | |
5930 | "It looks like you may be committing a cherry-pick.\n" | |
5931 | "If this is not correct, please remove the file\n" | |
5932 | "\t%s\n" | |
5933 | "and try again.\n" | |
5934 | msgstr "" | |
5935 | "\n" | |
649900bc | 5936 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
5937 | "\t%s\n" |
5938 | "然后重试。\n" | |
c04f5ac3 | 5939 | |
5c57d762 | 5940 | #: builtin/commit.c:833 |
a77c07d9 | 5941 | #, c-format |
c04f5ac3 | 5942 | msgid "" |
8ada9598 | 5943 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5944 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 5945 | msgstr "" |
a77c07d9 | 5946 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 5947 | "说明将会终止提交。\n" |
c04f5ac3 | 5948 | |
5c57d762 | 5949 | #: builtin/commit.c:840 |
a77c07d9 | 5950 | #, c-format |
c04f5ac3 | 5951 | msgid "" |
8ada9598 | 5952 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 5953 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
5954 | "An empty message aborts the commit.\n" |
5955 | msgstr "" | |
a77c07d9 JX |
5956 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
5957 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 5958 | |
90e6ef53 | 5959 | # 译者:为保证在输出中对齐,注意调整句中空格! |
5c57d762 | 5960 | #: builtin/commit.c:860 |
6acbf033 JX |
5961 | #, c-format |
5962 | msgid "%sAuthor: %.*s <%.*s>" | |
5963 | msgstr "%s作者: %.*s <%.*s>" | |
5964 | ||
5965 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
5c57d762 | 5966 | #: builtin/commit.c:868 |
c04f5ac3 | 5967 | #, c-format |
6acbf033 JX |
5968 | msgid "%sDate: %s" |
5969 | msgstr "%s日期: %s" | |
c04f5ac3 | 5970 | |
90e6ef53 | 5971 | # 译者:为保证在输出中对齐,注意调整句中空格! |
5c57d762 | 5972 | #: builtin/commit.c:875 |
c04f5ac3 | 5973 | #, c-format |
6acbf033 JX |
5974 | msgid "%sCommitter: %.*s <%.*s>" |
5975 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 5976 | |
5c57d762 | 5977 | #: builtin/commit.c:893 |
c04f5ac3 | 5978 | msgid "Cannot read index" |
90e6ef53 | 5979 | msgstr "无法读取索引" |
c04f5ac3 | 5980 | |
5c57d762 | 5981 | #: builtin/commit.c:950 |
c04f5ac3 JX |
5982 | msgid "Error building trees" |
5983 | msgstr "无法创建树对象" | |
5984 | ||
5c57d762 | 5985 | #: builtin/commit.c:965 builtin/tag.c:266 |
c04f5ac3 JX |
5986 | #, c-format |
5987 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 5988 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 5989 | |
5c57d762 | 5990 | #: builtin/commit.c:1067 |
c04f5ac3 | 5991 | #, c-format |
814ff314 JX |
5992 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
5993 | msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配" | |
c04f5ac3 | 5994 | |
5c57d762 | 5995 | #: builtin/commit.c:1082 builtin/commit.c:1322 |
c04f5ac3 JX |
5996 | #, c-format |
5997 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 5998 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 5999 | |
5c57d762 | 6000 | #: builtin/commit.c:1119 |
2e8451e8 JX |
6001 | msgid "--long and -z are incompatible" |
6002 | msgstr "--long 和 -z 选项不兼容" | |
6003 | ||
5c57d762 | 6004 | #: builtin/commit.c:1149 |
c04f5ac3 JX |
6005 | msgid "Using both --reset-author and --author does not make sense" |
6006 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
6007 | ||
5c57d762 | 6008 | #: builtin/commit.c:1158 |
c04f5ac3 | 6009 | msgid "You have nothing to amend." |
90e6ef53 | 6010 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 6011 | |
5c57d762 | 6012 | #: builtin/commit.c:1161 |
8ada9598 | 6013 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 6014 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 6015 | |
5c57d762 | 6016 | #: builtin/commit.c:1163 |
8ada9598 | 6017 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 6018 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 6019 | |
5c57d762 | 6020 | #: builtin/commit.c:1166 |
c04f5ac3 | 6021 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 6022 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 6023 | |
5c57d762 | 6024 | #: builtin/commit.c:1176 |
c04f5ac3 JX |
6025 | msgid "Only one of -c/-C/-F/--fixup can be used." |
6026 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
6027 | ||
5c57d762 | 6028 | #: builtin/commit.c:1178 |
c04f5ac3 | 6029 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 6030 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 6031 | |
5c57d762 | 6032 | #: builtin/commit.c:1186 |
c04f5ac3 | 6033 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 6034 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 6035 | |
5c57d762 | 6036 | #: builtin/commit.c:1203 |
c04f5ac3 JX |
6037 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
6038 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
6039 | ||
5c57d762 | 6040 | #: builtin/commit.c:1205 |
c04f5ac3 JX |
6041 | msgid "No paths with --include/--only does not make sense." |
6042 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
6043 | ||
5c57d762 | 6044 | #: builtin/commit.c:1207 |
c04f5ac3 | 6045 | msgid "Clever... amending the last one with dirty index." |
160fb2b2 | 6046 | msgstr "聪明... 用脏索引修补最后一个提交。" |
c04f5ac3 | 6047 | |
5c57d762 | 6048 | #: builtin/commit.c:1209 |
6c94aba5 JX |
6049 | msgid "Explicit paths specified without -i or -o; assuming --only paths..." |
6050 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." | |
c04f5ac3 | 6051 | |
5c57d762 | 6052 | #: builtin/commit.c:1221 builtin/tag.c:474 |
c04f5ac3 JX |
6053 | #, c-format |
6054 | msgid "Invalid cleanup mode %s" | |
6055 | msgstr "无效的清理模式 %s" | |
6056 | ||
5c57d762 | 6057 | #: builtin/commit.c:1226 |
c04f5ac3 | 6058 | msgid "Paths with -a does not make sense." |
649900bc | 6059 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 6060 | |
5c57d762 | 6061 | #: builtin/commit.c:1336 builtin/commit.c:1622 |
ef317cd5 | 6062 | msgid "show status concisely" |
07432cef | 6063 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 6064 | |
5c57d762 | 6065 | #: builtin/commit.c:1338 builtin/commit.c:1624 |
ef317cd5 | 6066 | msgid "show branch information" |
07432cef | 6067 | msgstr "显示分支信息" |
ef317cd5 | 6068 | |
5c57d762 JX |
6069 | #: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 |
6070 | #: builtin/worktree.c:440 | |
ef317cd5 | 6071 | msgid "machine-readable output" |
07432cef WS |
6072 | msgstr "机器可读的输出" |
6073 | ||
5c57d762 | 6074 | #: builtin/commit.c:1343 builtin/commit.c:1628 |
07432cef WS |
6075 | msgid "show status in long format (default)" |
6076 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 6077 | |
5c57d762 | 6078 | #: builtin/commit.c:1346 builtin/commit.c:1631 |
ef317cd5 | 6079 | msgid "terminate entries with NUL" |
4375c10e | 6080 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 6081 | |
5c57d762 | 6082 | #: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 |
94550ed3 | 6083 | #: builtin/fast-export.c:984 builtin/tag.c:353 |
ef317cd5 | 6084 | msgid "mode" |
07432cef | 6085 | msgstr "模式" |
ef317cd5 | 6086 | |
5c57d762 | 6087 | #: builtin/commit.c:1349 builtin/commit.c:1634 |
ef317cd5 | 6088 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 6089 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 6090 | |
5c57d762 | 6091 | #: builtin/commit.c:1352 |
ef317cd5 | 6092 | msgid "show ignored files" |
07432cef | 6093 | msgstr "显示忽略的文件" |
ef317cd5 | 6094 | |
5c57d762 | 6095 | #: builtin/commit.c:1353 parse-options.h:155 |
ef317cd5 JX |
6096 | msgid "when" |
6097 | msgstr "何时" | |
6098 | ||
5c57d762 | 6099 | #: builtin/commit.c:1354 |
ef317cd5 JX |
6100 | msgid "" |
6101 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
6102 | "(Default: all)" | |
6103 | msgstr "" | |
07432cef | 6104 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 6105 | |
5c57d762 | 6106 | #: builtin/commit.c:1356 |
ef317cd5 | 6107 | msgid "list untracked files in columns" |
07432cef | 6108 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 6109 | |
5c57d762 | 6110 | #: builtin/commit.c:1442 |
c04f5ac3 JX |
6111 | msgid "couldn't look up newly created commit" |
6112 | msgstr "无法找到新创建的提交" | |
6113 | ||
5c57d762 | 6114 | #: builtin/commit.c:1444 |
c04f5ac3 | 6115 | msgid "could not parse newly created commit" |
90e6ef53 | 6116 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 6117 | |
5c57d762 | 6118 | #: builtin/commit.c:1489 |
c04f5ac3 JX |
6119 | msgid "detached HEAD" |
6120 | msgstr "分离头指针" | |
6121 | ||
7e238ab7 | 6122 | # 译者:中文字符串拼接,可删除前导空格 |
5c57d762 | 6123 | #: builtin/commit.c:1492 |
c04f5ac3 | 6124 | msgid " (root-commit)" |
7e238ab7 | 6125 | msgstr "(根提交)" |
c04f5ac3 | 6126 | |
5c57d762 | 6127 | #: builtin/commit.c:1592 |
ef317cd5 | 6128 | msgid "suppress summary after successful commit" |
07432cef | 6129 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 6130 | |
5c57d762 | 6131 | #: builtin/commit.c:1593 |
ef317cd5 | 6132 | msgid "show diff in commit message template" |
07432cef | 6133 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 6134 | |
5c57d762 | 6135 | #: builtin/commit.c:1595 |
ef317cd5 | 6136 | msgid "Commit message options" |
07432cef | 6137 | msgstr "提交说明选项" |
c04f5ac3 | 6138 | |
5c57d762 | 6139 | #: builtin/commit.c:1596 builtin/tag.c:351 |
ef317cd5 | 6140 | msgid "read message from file" |
07432cef | 6141 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 6142 | |
5c57d762 | 6143 | #: builtin/commit.c:1597 |
ef317cd5 | 6144 | msgid "author" |
07432cef | 6145 | msgstr "作者" |
c04f5ac3 | 6146 | |
5c57d762 | 6147 | #: builtin/commit.c:1597 |
ef317cd5 | 6148 | msgid "override author for commit" |
07432cef | 6149 | msgstr "提交时覆盖作者" |
73a60cd2 | 6150 | |
5c57d762 | 6151 | #: builtin/commit.c:1598 builtin/gc.c:326 |
ef317cd5 | 6152 | msgid "date" |
07432cef | 6153 | msgstr "日期" |
c04f5ac3 | 6154 | |
5c57d762 | 6155 | #: builtin/commit.c:1598 |
ef317cd5 | 6156 | msgid "override date for commit" |
07432cef | 6157 | msgstr "提交时覆盖日期" |
c04f5ac3 | 6158 | |
5c57d762 JX |
6159 | #: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 |
6160 | #: builtin/notes.c:559 builtin/tag.c:349 | |
ef317cd5 | 6161 | msgid "message" |
07432cef | 6162 | msgstr "说明" |
c04f5ac3 | 6163 | |
5c57d762 | 6164 | #: builtin/commit.c:1599 |
ef317cd5 | 6165 | msgid "commit message" |
07432cef | 6166 | msgstr "提交说明" |
ef317cd5 | 6167 | |
5c57d762 JX |
6168 | #: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 |
6169 | #: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 | |
94550ed3 JX |
6170 | msgid "commit" |
6171 | msgstr "提交" | |
6172 | ||
5c57d762 | 6173 | #: builtin/commit.c:1600 |
ef317cd5 | 6174 | msgid "reuse and edit message from specified commit" |
07432cef | 6175 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 6176 | |
5c57d762 | 6177 | #: builtin/commit.c:1601 |
ef317cd5 | 6178 | msgid "reuse message from specified commit" |
07432cef | 6179 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 6180 | |
5c57d762 | 6181 | #: builtin/commit.c:1602 |
ef317cd5 | 6182 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 6183 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 6184 | |
5c57d762 | 6185 | #: builtin/commit.c:1603 |
ef317cd5 | 6186 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 6187 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 6188 | |
5c57d762 | 6189 | #: builtin/commit.c:1604 |
ef317cd5 | 6190 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 6191 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 6192 | |
5c57d762 | 6193 | #: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 |
ef317cd5 | 6194 | msgid "add Signed-off-by:" |
07432cef | 6195 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 6196 | |
5c57d762 | 6197 | #: builtin/commit.c:1606 |
ef317cd5 | 6198 | msgid "use specified template file" |
07432cef | 6199 | msgstr "使用指定的模板文件" |
ef317cd5 | 6200 | |
5c57d762 | 6201 | #: builtin/commit.c:1607 |
ef317cd5 | 6202 | msgid "force edit of commit" |
07432cef | 6203 | msgstr "强制编辑提交" |
ef317cd5 | 6204 | |
07432cef | 6205 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
5c57d762 | 6206 | #: builtin/commit.c:1608 |
ef317cd5 | 6207 | msgid "default" |
07432cef | 6208 | msgstr "default" |
ef317cd5 | 6209 | |
5c57d762 | 6210 | #: builtin/commit.c:1608 builtin/tag.c:354 |
ef317cd5 | 6211 | msgid "how to strip spaces and #comments from message" |
07432cef | 6212 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 6213 | |
5c57d762 | 6214 | #: builtin/commit.c:1609 |
ef317cd5 | 6215 | msgid "include status in commit message template" |
07432cef | 6216 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 6217 | |
5c57d762 | 6218 | #: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 |
1b7f4a34 | 6219 | #: builtin/revert.c:93 |
ef317cd5 | 6220 | msgid "GPG sign commit" |
07432cef | 6221 | msgstr "GPG 提交签名" |
ef317cd5 | 6222 | |
5c57d762 | 6223 | #: builtin/commit.c:1614 |
ef317cd5 | 6224 | msgid "Commit contents options" |
07432cef | 6225 | msgstr "提交内容选项" |
ef317cd5 | 6226 | |
5c57d762 | 6227 | #: builtin/commit.c:1615 |
ef317cd5 | 6228 | msgid "commit all changed files" |
07432cef | 6229 | msgstr "提交所有改动的文件" |
ef317cd5 | 6230 | |
5c57d762 | 6231 | #: builtin/commit.c:1616 |
ef317cd5 | 6232 | msgid "add specified files to index for commit" |
07432cef | 6233 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 6234 | |
5c57d762 | 6235 | #: builtin/commit.c:1617 |
ef317cd5 | 6236 | msgid "interactively add files" |
07432cef | 6237 | msgstr "交互式添加文件" |
ef317cd5 | 6238 | |
5c57d762 | 6239 | #: builtin/commit.c:1618 |
ef317cd5 | 6240 | msgid "interactively add changes" |
07432cef | 6241 | msgstr "交互式添加变更" |
ef317cd5 | 6242 | |
5c57d762 | 6243 | #: builtin/commit.c:1619 |
ef317cd5 | 6244 | msgid "commit only specified files" |
07432cef | 6245 | msgstr "只提交指定的文件" |
ef317cd5 | 6246 | |
5b04ee3b | 6247 | #: builtin/commit.c:1620 |
5c57d762 JX |
6248 | msgid "bypass pre-commit and commit-msg hooks" |
6249 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
6250 | ||
6251 | #: builtin/commit.c:1621 | |
ef317cd5 | 6252 | msgid "show what would be committed" |
07432cef | 6253 | msgstr "显示将要提交的内容" |
ef317cd5 | 6254 | |
5c57d762 | 6255 | #: builtin/commit.c:1632 |
ef317cd5 | 6256 | msgid "amend previous commit" |
07432cef | 6257 | msgstr "修改先前的提交" |
ef317cd5 | 6258 | |
5c57d762 | 6259 | #: builtin/commit.c:1633 |
ef317cd5 | 6260 | msgid "bypass post-rewrite hook" |
07432cef | 6261 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 6262 | |
5c57d762 | 6263 | #: builtin/commit.c:1638 |
ef317cd5 | 6264 | msgid "ok to record an empty change" |
07432cef | 6265 | msgstr "允许一个空提交" |
ef317cd5 | 6266 | |
5c57d762 | 6267 | #: builtin/commit.c:1640 |
ef317cd5 | 6268 | msgid "ok to record a change with an empty message" |
07432cef | 6269 | msgstr "允许空的提交说明" |
ef317cd5 | 6270 | |
5c57d762 | 6271 | #: builtin/commit.c:1669 |
c04f5ac3 | 6272 | msgid "could not parse HEAD commit" |
90e6ef53 | 6273 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 6274 | |
5c57d762 | 6275 | #: builtin/commit.c:1719 |
c04f5ac3 JX |
6276 | #, c-format |
6277 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 6278 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 6279 | |
5c57d762 | 6280 | #: builtin/commit.c:1726 |
c04f5ac3 | 6281 | msgid "could not read MERGE_MODE" |
90e6ef53 | 6282 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 6283 | |
5c57d762 | 6284 | #: builtin/commit.c:1745 |
c04f5ac3 JX |
6285 | #, c-format |
6286 | msgid "could not read commit message: %s" | |
90e6ef53 | 6287 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 6288 | |
5c57d762 | 6289 | #: builtin/commit.c:1756 |
73a60cd2 JX |
6290 | #, c-format |
6291 | msgid "Aborting commit; you did not edit the message.\n" | |
6292 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
6293 | ||
5c57d762 | 6294 | #: builtin/commit.c:1761 |
c04f5ac3 JX |
6295 | #, c-format |
6296 | msgid "Aborting commit due to empty commit message.\n" | |
6297 | msgstr "终止提交因为提交说明为空。\n" | |
6298 | ||
5c57d762 | 6299 | #: builtin/commit.c:1809 |
c04f5ac3 JX |
6300 | msgid "" |
6301 | "Repository has been updated, but unable to write\n" | |
220c313c | 6302 | "new_index file. Check that disk is not full and quota is\n" |
c04f5ac3 JX |
6303 | "not exceeded, and then \"git reset HEAD\" to recover." |
6304 | msgstr "" | |
160fb2b2 | 6305 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
90e6ef53 | 6306 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" |
c04f5ac3 | 6307 | |
276ceeaa | 6308 | #: builtin/config.c:9 |
814ff314 JX |
6309 | msgid "git config [<options>]" |
6310 | msgstr "git config [<选项>]" | |
ef317cd5 | 6311 | |
5c57d762 | 6312 | #: builtin/config.c:55 |
ef317cd5 | 6313 | msgid "Config file location" |
07432cef | 6314 | msgstr "配置文件位置" |
ef317cd5 | 6315 | |
5c57d762 | 6316 | #: builtin/config.c:56 |
ef317cd5 | 6317 | msgid "use global config file" |
07432cef | 6318 | msgstr "使用全局配置文件" |
ef317cd5 | 6319 | |
5c57d762 | 6320 | #: builtin/config.c:57 |
ef317cd5 | 6321 | msgid "use system config file" |
07432cef | 6322 | msgstr "使用系统级配置文件" |
ef317cd5 | 6323 | |
5c57d762 | 6324 | #: builtin/config.c:58 |
ef317cd5 | 6325 | msgid "use repository config file" |
160fb2b2 | 6326 | msgstr "使用仓库级配置文件" |
ef317cd5 | 6327 | |
5c57d762 | 6328 | #: builtin/config.c:59 |
ef317cd5 | 6329 | msgid "use given config file" |
07432cef | 6330 | msgstr "使用指定的配置文件" |
ef317cd5 | 6331 | |
5c57d762 | 6332 | #: builtin/config.c:60 |
2e8451e8 | 6333 | msgid "blob-id" |
4375c10e | 6334 | msgstr "数据对象 ID" |
2e8451e8 | 6335 | |
5c57d762 | 6336 | #: builtin/config.c:60 |
2e8451e8 JX |
6337 | msgid "read config from given blob object" |
6338 | msgstr "从给定的数据对象读取配置" | |
6339 | ||
5c57d762 | 6340 | #: builtin/config.c:61 |
ef317cd5 | 6341 | msgid "Action" |
07432cef | 6342 | msgstr "操作" |
ef317cd5 | 6343 | |
5c57d762 | 6344 | #: builtin/config.c:62 |
ef317cd5 | 6345 | msgid "get value: name [value-regex]" |
07432cef | 6346 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 6347 | |
5c57d762 | 6348 | #: builtin/config.c:63 |
ef317cd5 | 6349 | msgid "get all values: key [value-regex]" |
07432cef | 6350 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 6351 | |
5c57d762 | 6352 | #: builtin/config.c:64 |
ef317cd5 | 6353 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 6354 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 6355 | |
5c57d762 | 6356 | #: builtin/config.c:65 |
90314792 JX |
6357 | msgid "get value specific for the URL: section[.var] URL" |
6358 | msgstr "获得 URL 取值:section[.var] URL" | |
6359 | ||
5c57d762 | 6360 | #: builtin/config.c:66 |
ef317cd5 | 6361 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 6362 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 6363 | |
5c57d762 | 6364 | #: builtin/config.c:67 |
ef317cd5 | 6365 | msgid "add a new variable: name value" |
07432cef | 6366 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 6367 | |
5c57d762 | 6368 | #: builtin/config.c:68 |
ef317cd5 | 6369 | msgid "remove a variable: name [value-regex]" |
07432cef | 6370 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 6371 | |
5c57d762 | 6372 | #: builtin/config.c:69 |
ef317cd5 | 6373 | msgid "remove all matches: name [value-regex]" |
07432cef | 6374 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 6375 | |
5c57d762 | 6376 | #: builtin/config.c:70 |
ef317cd5 | 6377 | msgid "rename section: old-name new-name" |
07432cef | 6378 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 6379 | |
5c57d762 | 6380 | #: builtin/config.c:71 |
ef317cd5 | 6381 | msgid "remove a section: name" |
07432cef | 6382 | msgstr "删除一个小节:name" |
ef317cd5 | 6383 | |
5c57d762 | 6384 | #: builtin/config.c:72 |
ef317cd5 | 6385 | msgid "list all" |
07432cef | 6386 | msgstr "列出所有" |
ef317cd5 | 6387 | |
5c57d762 | 6388 | #: builtin/config.c:73 |
ef317cd5 | 6389 | msgid "open an editor" |
07432cef | 6390 | msgstr "打开一个编辑器" |
ef317cd5 | 6391 | |
5c57d762 | 6392 | #: builtin/config.c:74 |
04cb2f28 JX |
6393 | msgid "find the color configured: slot [default]" |
6394 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 6395 | |
5c57d762 | 6396 | #: builtin/config.c:75 |
04cb2f28 JX |
6397 | msgid "find the color setting: slot [stdout-is-tty]" |
6398 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 6399 | |
5c57d762 | 6400 | #: builtin/config.c:76 |
ef317cd5 | 6401 | msgid "Type" |
07432cef | 6402 | msgstr "类型" |
ef317cd5 | 6403 | |
5c57d762 | 6404 | #: builtin/config.c:77 |
ef317cd5 | 6405 | msgid "value is \"true\" or \"false\"" |
07432cef | 6406 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 6407 | |
5c57d762 | 6408 | #: builtin/config.c:78 |
ef317cd5 | 6409 | msgid "value is decimal number" |
07432cef | 6410 | msgstr "值是十进制数" |
ef317cd5 | 6411 | |
5c57d762 | 6412 | #: builtin/config.c:79 |
ef317cd5 | 6413 | msgid "value is --bool or --int" |
07432cef | 6414 | msgstr "值是 --bool or --int" |
ef317cd5 | 6415 | |
5c57d762 | 6416 | #: builtin/config.c:80 |
ef317cd5 | 6417 | msgid "value is a path (file or directory name)" |
07432cef | 6418 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 6419 | |
5c57d762 | 6420 | #: builtin/config.c:81 |
ef317cd5 | 6421 | msgid "Other" |
07432cef | 6422 | msgstr "其它" |
ef317cd5 | 6423 | |
5c57d762 | 6424 | #: builtin/config.c:82 |
ef317cd5 | 6425 | msgid "terminate values with NUL byte" |
4375c10e | 6426 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 6427 | |
5c57d762 | 6428 | #: builtin/config.c:83 |
1b7f4a34 JX |
6429 | msgid "show variable names only" |
6430 | msgstr "只显示变量名" | |
6431 | ||
5c57d762 | 6432 | #: builtin/config.c:84 |
ef317cd5 | 6433 | msgid "respect include directives on lookup" |
07432cef | 6434 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 6435 | |
5c57d762 | 6436 | #: builtin/config.c:85 |
276ceeaa JX |
6437 | msgid "show origin of config (file, standard input, blob, command line)" |
6438 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
6439 | ||
5c57d762 | 6440 | #: builtin/config.c:327 |
220c313c | 6441 | msgid "unable to parse default color value" |
160fb2b2 | 6442 | msgstr "不能解析默认颜色值" |
220c313c | 6443 | |
5c57d762 | 6444 | #: builtin/config.c:471 |
220c313c JX |
6445 | #, c-format |
6446 | msgid "" | |
6447 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 6448 | "[user]\n" |
220c313c | 6449 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 6450 | "#\tname = %s\n" |
220c313c JX |
6451 | "#\temail = %s\n" |
6452 | msgstr "" | |
6453 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 6454 | "[user]\n" |
220c313c | 6455 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 6456 | "#\tname = %s\n" |
220c313c JX |
6457 | "#\temail = %s\n" |
6458 | ||
5c57d762 | 6459 | #: builtin/config.c:613 |
220c313c JX |
6460 | #, c-format |
6461 | msgid "cannot create configuration file %s" | |
6462 | msgstr "不能创建配置文件 %s" | |
6463 | ||
94550ed3 | 6464 | #: builtin/count-objects.c:77 |
4dcdc3d8 JX |
6465 | msgid "git count-objects [-v] [-H | --human-readable]" |
6466 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
6467 | ||
94550ed3 | 6468 | #: builtin/count-objects.c:87 |
4dcdc3d8 JX |
6469 | msgid "print sizes in human readable format" |
6470 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 6471 | |
220c313c | 6472 | #: builtin/describe.c:17 |
814ff314 JX |
6473 | msgid "git describe [<options>] [<commit-ish>...]" |
6474 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 6475 | |
220c313c | 6476 | #: builtin/describe.c:18 |
814ff314 JX |
6477 | msgid "git describe [<options>] --dirty" |
6478 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 6479 | |
220c313c | 6480 | #: builtin/describe.c:217 |
c04f5ac3 JX |
6481 | #, c-format |
6482 | msgid "annotated tag %s not available" | |
55a16ee4 | 6483 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 6484 | |
220c313c | 6485 | #: builtin/describe.c:221 |
c04f5ac3 JX |
6486 | #, c-format |
6487 | msgid "annotated tag %s has no embedded name" | |
55a16ee4 | 6488 | msgstr "附注标签 %s 没有嵌入名称" |
c04f5ac3 | 6489 | |
220c313c | 6490 | #: builtin/describe.c:223 |
c04f5ac3 JX |
6491 | #, c-format |
6492 | msgid "tag '%s' is really '%s' here" | |
55a16ee4 | 6493 | msgstr "标签 '%s' 的确是在 '%s'" |
c04f5ac3 | 6494 | |
5c57d762 | 6495 | #: builtin/describe.c:250 builtin/log.c:480 |
c04f5ac3 JX |
6496 | #, c-format |
6497 | msgid "Not a valid object name %s" | |
6498 | msgstr "不是一个有效的对象名 %s" | |
6499 | ||
220c313c | 6500 | #: builtin/describe.c:253 |
c04f5ac3 JX |
6501 | #, c-format |
6502 | msgid "%s is not a valid '%s' object" | |
6503 | msgstr "%s 不是一个有效的 '%s' 对象" | |
6504 | ||
220c313c | 6505 | #: builtin/describe.c:270 |
c04f5ac3 JX |
6506 | #, c-format |
6507 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 6508 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 6509 | |
220c313c | 6510 | #: builtin/describe.c:272 |
c04f5ac3 JX |
6511 | #, c-format |
6512 | msgid "searching to describe %s\n" | |
6513 | msgstr "搜索描述 %s\n" | |
6514 | ||
220c313c | 6515 | #: builtin/describe.c:319 |
c04f5ac3 JX |
6516 | #, c-format |
6517 | msgid "finished search at %s\n" | |
6518 | msgstr "完成搜索 %s\n" | |
6519 | ||
220c313c | 6520 | #: builtin/describe.c:346 |
c04f5ac3 JX |
6521 | #, c-format |
6522 | msgid "" | |
6523 | "No annotated tags can describe '%s'.\n" | |
6524 | "However, there were unannotated tags: try --tags." | |
6525 | msgstr "" | |
55a16ee4 RC |
6526 | "没有附注标签能描述 '%s'。\n" |
6527 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 6528 | |
220c313c | 6529 | #: builtin/describe.c:350 |
c04f5ac3 JX |
6530 | #, c-format |
6531 | msgid "" | |
6532 | "No tags can describe '%s'.\n" | |
6533 | "Try --always, or create some tags." | |
6534 | msgstr "" | |
55a16ee4 RC |
6535 | "没有标签能描述 '%s'。\n" |
6536 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 6537 | |
220c313c | 6538 | #: builtin/describe.c:371 |
c04f5ac3 JX |
6539 | #, c-format |
6540 | msgid "traversed %lu commits\n" | |
6541 | msgstr "已遍历 %lu 个提交\n" | |
6542 | ||
220c313c | 6543 | #: builtin/describe.c:374 |
c04f5ac3 JX |
6544 | #, c-format |
6545 | msgid "" | |
6546 | "more than %i tags found; listed %i most recent\n" | |
6547 | "gave up search at %s\n" | |
6548 | msgstr "" | |
55a16ee4 | 6549 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 6550 | "在 %s 放弃搜索\n" |
c04f5ac3 | 6551 | |
220c313c | 6552 | #: builtin/describe.c:396 |
ef317cd5 | 6553 | msgid "find the tag that comes after the commit" |
55a16ee4 | 6554 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 6555 | |
220c313c | 6556 | #: builtin/describe.c:397 |
ef317cd5 | 6557 | msgid "debug search strategy on stderr" |
07432cef | 6558 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 6559 | |
220c313c | 6560 | #: builtin/describe.c:398 |
1003b3a5 JX |
6561 | msgid "use any ref" |
6562 | msgstr "使用任意引用" | |
6563 | ||
220c313c | 6564 | #: builtin/describe.c:399 |
1003b3a5 | 6565 | msgid "use any tag, even unannotated" |
55a16ee4 | 6566 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 6567 | |
220c313c | 6568 | #: builtin/describe.c:400 |
ef317cd5 | 6569 | msgid "always use long format" |
07432cef | 6570 | msgstr "始终使用长提交号格式" |
ef317cd5 | 6571 | |
220c313c | 6572 | #: builtin/describe.c:401 |
2e8451e8 JX |
6573 | msgid "only follow first parent" |
6574 | msgstr "只跟随第一个父提交" | |
6575 | ||
220c313c | 6576 | #: builtin/describe.c:404 |
ef317cd5 | 6577 | msgid "only output exact matches" |
07432cef | 6578 | msgstr "只输出精确匹配" |
ef317cd5 | 6579 | |
220c313c | 6580 | #: builtin/describe.c:406 |
ef317cd5 | 6581 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 6582 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 6583 | |
220c313c | 6584 | #: builtin/describe.c:408 |
ef317cd5 | 6585 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 6586 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 6587 | |
5b04ee3b | 6588 | #: builtin/describe.c:410 builtin/name-rev.c:321 |
ef317cd5 | 6589 | msgid "show abbreviated commit object as fallback" |
07432cef | 6590 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 6591 | |
220c313c | 6592 | #: builtin/describe.c:411 |
ef317cd5 | 6593 | msgid "mark" |
07432cef | 6594 | msgstr "标记" |
ef317cd5 | 6595 | |
220c313c | 6596 | #: builtin/describe.c:412 |
ef317cd5 | 6597 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 6598 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 6599 | |
220c313c | 6600 | #: builtin/describe.c:430 |
c04f5ac3 JX |
6601 | msgid "--long is incompatible with --abbrev=0" |
6602 | msgstr "--long 与 --abbrev=0 不兼容" | |
6603 | ||
220c313c | 6604 | #: builtin/describe.c:456 |
c04f5ac3 | 6605 | msgid "No names found, cannot describe anything." |
90e6ef53 | 6606 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 6607 | |
220c313c | 6608 | #: builtin/describe.c:476 |
a8a5406a | 6609 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 6610 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 6611 | |
220c313c | 6612 | #: builtin/diff.c:86 |
c04f5ac3 JX |
6613 | #, c-format |
6614 | msgid "'%s': not a regular file or symlink" | |
6615 | msgstr "'%s':不是一个正规文件或符号链接" | |
6616 | ||
220c313c | 6617 | #: builtin/diff.c:237 |
c04f5ac3 JX |
6618 | #, c-format |
6619 | msgid "invalid option: %s" | |
6620 | msgstr "无效选项:%s" | |
6621 | ||
5b04ee3b | 6622 | #: builtin/diff.c:360 |
c04f5ac3 | 6623 | msgid "Not a git repository" |
160fb2b2 | 6624 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 6625 | |
5b04ee3b | 6626 | #: builtin/diff.c:403 |
c04f5ac3 JX |
6627 | #, c-format |
6628 | msgid "invalid object '%s' given." | |
6629 | msgstr "提供了无效对象 '%s'。" | |
6630 | ||
5b04ee3b | 6631 | #: builtin/diff.c:412 |
c04f5ac3 JX |
6632 | #, c-format |
6633 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 6634 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 6635 | |
5b04ee3b | 6636 | #: builtin/diff.c:419 |
c04f5ac3 JX |
6637 | #, c-format |
6638 | msgid "unhandled object '%s' given." | |
6c94aba5 | 6639 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 6640 | |
1b7f4a34 | 6641 | #: builtin/fast-export.c:25 |
ef317cd5 | 6642 | msgid "git fast-export [rev-list-opts]" |
07432cef | 6643 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 6644 | |
1b7f4a34 | 6645 | #: builtin/fast-export.c:980 |
ef317cd5 | 6646 | msgid "show progress after <n> objects" |
07432cef | 6647 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 6648 | |
1b7f4a34 | 6649 | #: builtin/fast-export.c:982 |
ef317cd5 | 6650 | msgid "select handling of signed tags" |
55a16ee4 | 6651 | msgstr "选择如何处理签名标签" |
ef317cd5 | 6652 | |
1b7f4a34 | 6653 | #: builtin/fast-export.c:985 |
ef317cd5 | 6654 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 6655 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 6656 | |
1b7f4a34 | 6657 | #: builtin/fast-export.c:988 |
ef317cd5 | 6658 | msgid "Dump marks to this file" |
07432cef | 6659 | msgstr "把标记存储到这个文件" |
ef317cd5 | 6660 | |
1b7f4a34 | 6661 | #: builtin/fast-export.c:990 |
ef317cd5 | 6662 | msgid "Import marks from this file" |
07432cef | 6663 | msgstr "从这个文件导入标记" |
ef317cd5 | 6664 | |
1b7f4a34 | 6665 | #: builtin/fast-export.c:992 |
ef317cd5 | 6666 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 6667 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 6668 | |
1b7f4a34 | 6669 | #: builtin/fast-export.c:994 |
ef317cd5 | 6670 | msgid "Output full tree for each commit" |
07432cef | 6671 | msgstr "每次提交都输出整个树" |
ef317cd5 | 6672 | |
1b7f4a34 | 6673 | #: builtin/fast-export.c:996 |
ef317cd5 | 6674 | msgid "Use the done feature to terminate the stream" |
07432cef | 6675 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 6676 | |
1b7f4a34 | 6677 | #: builtin/fast-export.c:997 |
ef317cd5 | 6678 | msgid "Skip output of blob data" |
07432cef | 6679 | msgstr "跳过数据对象的输出" |
ef317cd5 | 6680 | |
1b7f4a34 | 6681 | #: builtin/fast-export.c:998 |
6acbf033 | 6682 | msgid "refspec" |
160fb2b2 | 6683 | msgstr "引用规格" |
6acbf033 | 6684 | |
1b7f4a34 | 6685 | #: builtin/fast-export.c:999 |
6acbf033 | 6686 | msgid "Apply refspec to exported refs" |
160fb2b2 | 6687 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 6688 | |
1b7f4a34 | 6689 | #: builtin/fast-export.c:1000 |
220c313c JX |
6690 | msgid "anonymize output" |
6691 | msgstr "匿名输出" | |
6692 | ||
5c57d762 | 6693 | #: builtin/fetch.c:21 |
ef317cd5 | 6694 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 6695 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 6696 | |
5c57d762 | 6697 | #: builtin/fetch.c:22 |
ef317cd5 | 6698 | msgid "git fetch [<options>] <group>" |
07432cef | 6699 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 6700 | |
5c57d762 | 6701 | #: builtin/fetch.c:23 |
ef317cd5 | 6702 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 6703 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 6704 | |
5c57d762 | 6705 | #: builtin/fetch.c:24 |
ef317cd5 | 6706 | msgid "git fetch --all [<options>]" |
07432cef | 6707 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 6708 | |
5c57d762 | 6709 | #: builtin/fetch.c:93 builtin/pull.c:174 |
ef317cd5 | 6710 | msgid "fetch from all remotes" |
07432cef | 6711 | msgstr "从所有的远程抓取" |
ef317cd5 | 6712 | |
5c57d762 | 6713 | #: builtin/fetch.c:95 builtin/pull.c:177 |
ef317cd5 | 6714 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 6715 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 6716 | |
5c57d762 | 6717 | #: builtin/fetch.c:97 builtin/pull.c:180 |
ef317cd5 | 6718 | msgid "path to upload pack on remote end" |
07432cef | 6719 | msgstr "上传包到远程的路径" |
ef317cd5 | 6720 | |
5c57d762 | 6721 | #: builtin/fetch.c:98 builtin/pull.c:182 |
ef317cd5 | 6722 | msgid "force overwrite of local branch" |
07432cef | 6723 | msgstr "强制覆盖本地分支" |
ef317cd5 | 6724 | |
5c57d762 | 6725 | #: builtin/fetch.c:100 |
ef317cd5 | 6726 | msgid "fetch from multiple remotes" |
07432cef | 6727 | msgstr "从多个远程抓取" |
ef317cd5 | 6728 | |
5c57d762 | 6729 | #: builtin/fetch.c:102 builtin/pull.c:184 |
ef317cd5 | 6730 | msgid "fetch all tags and associated objects" |
55a16ee4 | 6731 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 6732 | |
5c57d762 | 6733 | #: builtin/fetch.c:104 |
ef317cd5 | 6734 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 6735 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 6736 | |
5c57d762 | 6737 | #: builtin/fetch.c:106 |
276ceeaa JX |
6738 | msgid "number of submodules fetched in parallel" |
6739 | msgstr "子模组获取的并发数" | |
6740 | ||
5c57d762 | 6741 | #: builtin/fetch.c:108 builtin/pull.c:187 |
ef317cd5 | 6742 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 6743 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 6744 | |
07432cef | 6745 | # 译者:可选值,不能翻译 |
5c57d762 | 6746 | #: builtin/fetch.c:109 builtin/pull.c:190 |
ef317cd5 | 6747 | msgid "on-demand" |
07432cef | 6748 | msgstr "on-demand" |
ef317cd5 | 6749 | |
5c57d762 | 6750 | #: builtin/fetch.c:110 builtin/pull.c:191 |
ef317cd5 | 6751 | msgid "control recursive fetching of submodules" |
07432cef | 6752 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 6753 | |
5c57d762 | 6754 | #: builtin/fetch.c:114 builtin/pull.c:199 |
ef317cd5 | 6755 | msgid "keep downloaded pack" |
07432cef | 6756 | msgstr "保持下载包" |
ef317cd5 | 6757 | |
5c57d762 | 6758 | #: builtin/fetch.c:116 |
ef317cd5 | 6759 | msgid "allow updating of HEAD ref" |
07432cef | 6760 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 6761 | |
5c57d762 | 6762 | #: builtin/fetch.c:119 builtin/pull.c:202 |
ef317cd5 | 6763 | msgid "deepen history of shallow clone" |
07432cef | 6764 | msgstr "深化浅克隆的历史" |
ef317cd5 | 6765 | |
5c57d762 | 6766 | #: builtin/fetch.c:121 builtin/pull.c:205 |
a77c07d9 | 6767 | msgid "convert to a complete repository" |
160fb2b2 | 6768 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 6769 | |
5c57d762 | 6770 | #: builtin/fetch.c:123 builtin/log.c:1426 |
ef317cd5 | 6771 | msgid "dir" |
07432cef | 6772 | msgstr "目录" |
ef317cd5 | 6773 | |
5c57d762 | 6774 | #: builtin/fetch.c:124 |
ef317cd5 | 6775 | msgid "prepend this to submodule path output" |
07432cef | 6776 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 6777 | |
5c57d762 | 6778 | #: builtin/fetch.c:127 |
ef317cd5 | 6779 | msgid "default mode for recursion" |
07432cef | 6780 | msgstr "递归的默认模式" |
ef317cd5 | 6781 | |
5c57d762 | 6782 | #: builtin/fetch.c:129 builtin/pull.c:208 |
cfff71a9 JX |
6783 | msgid "accept refs that update .git/shallow" |
6784 | msgstr "接受更新 .git/shallow 的引用" | |
6785 | ||
5c57d762 | 6786 | #: builtin/fetch.c:130 builtin/pull.c:210 |
6acbf033 JX |
6787 | msgid "refmap" |
6788 | msgstr "引用映射" | |
6789 | ||
5c57d762 | 6790 | #: builtin/fetch.c:131 builtin/pull.c:211 |
6acbf033 JX |
6791 | msgid "specify fetch refmap" |
6792 | msgstr "指定获取操作的引用映射" | |
6793 | ||
5c57d762 | 6794 | #: builtin/fetch.c:387 |
c04f5ac3 JX |
6795 | msgid "Couldn't find remote ref HEAD" |
6796 | msgstr "无法发现远程 HEAD 引用" | |
6797 | ||
5c57d762 JX |
6798 | #: builtin/fetch.c:503 |
6799 | #, c-format | |
6800 | msgid "configuration fetch.output contains invalid value %s" | |
6801 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
6802 | ||
6803 | #: builtin/fetch.c:592 | |
c04f5ac3 JX |
6804 | #, c-format |
6805 | msgid "object %s not found" | |
6806 | msgstr "对象 %s 未发现" | |
6807 | ||
5c57d762 | 6808 | #: builtin/fetch.c:596 |
c04f5ac3 JX |
6809 | msgid "[up to date]" |
6810 | msgstr "[最新]" | |
6811 | ||
5c57d762 | 6812 | #: builtin/fetch.c:609 builtin/fetch.c:689 |
c04f5ac3 JX |
6813 | msgid "[rejected]" |
6814 | msgstr "[已拒绝]" | |
6815 | ||
5c57d762 JX |
6816 | #: builtin/fetch.c:610 |
6817 | msgid "can't fetch in current branch" | |
6818 | msgstr "不能获取到当前分支" | |
6819 | ||
6820 | #: builtin/fetch.c:619 | |
c04f5ac3 | 6821 | msgid "[tag update]" |
55a16ee4 | 6822 | msgstr "[标签更新]" |
c04f5ac3 | 6823 | |
5c57d762 JX |
6824 | #: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 |
6825 | #: builtin/fetch.c:684 | |
6826 | msgid "unable to update local ref" | |
6827 | msgstr "不能更新本地引用" | |
c04f5ac3 | 6828 | |
5c57d762 | 6829 | #: builtin/fetch.c:639 |
c04f5ac3 | 6830 | msgid "[new tag]" |
55a16ee4 | 6831 | msgstr "[新标签]" |
c04f5ac3 | 6832 | |
5c57d762 | 6833 | #: builtin/fetch.c:642 |
c04f5ac3 JX |
6834 | msgid "[new branch]" |
6835 | msgstr "[新分支]" | |
6836 | ||
5c57d762 | 6837 | #: builtin/fetch.c:645 |
170e9899 JX |
6838 | msgid "[new ref]" |
6839 | msgstr "[新引用]" | |
6840 | ||
5c57d762 | 6841 | #: builtin/fetch.c:684 |
c04f5ac3 JX |
6842 | msgid "forced update" |
6843 | msgstr "强制更新" | |
6844 | ||
5c57d762 JX |
6845 | #: builtin/fetch.c:689 |
6846 | msgid "non-fast-forward" | |
6847 | msgstr "非快进" | |
c04f5ac3 | 6848 | |
5c57d762 | 6849 | #: builtin/fetch.c:733 |
c04f5ac3 JX |
6850 | #, c-format |
6851 | msgid "%s did not send all necessary objects\n" | |
6852 | msgstr "%s 未发送所有必须的对象\n" | |
6853 | ||
5c57d762 | 6854 | #: builtin/fetch.c:753 |
cfff71a9 JX |
6855 | #, c-format |
6856 | msgid "reject %s because shallow roots are not allowed to be updated" | |
6857 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
6858 | ||
5c57d762 | 6859 | #: builtin/fetch.c:839 builtin/fetch.c:934 |
c04f5ac3 JX |
6860 | #, c-format |
6861 | msgid "From %.*s\n" | |
6862 | msgstr "来自 %.*s\n" | |
6863 | ||
5c57d762 | 6864 | #: builtin/fetch.c:850 |
c04f5ac3 JX |
6865 | #, c-format |
6866 | msgid "" | |
6867 | "some local refs could not be updated; try running\n" | |
6868 | " 'git remote prune %s' to remove any old, conflicting branches" | |
6869 | msgstr "" | |
6870 | "一些本地引用不能被更新;尝试运行\n" | |
6871 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
6872 | ||
90e6ef53 | 6873 | # 译者:注意保持前导空格 |
5c57d762 | 6874 | #: builtin/fetch.c:904 |
81809b99 | 6875 | #, c-format |
8ada9598 | 6876 | msgid " (%s will become dangling)" |
07432cef | 6877 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 6878 | |
90e6ef53 | 6879 | # 译者:注意保持前导空格 |
5c57d762 | 6880 | #: builtin/fetch.c:905 |
81809b99 | 6881 | #, c-format |
8ada9598 | 6882 | msgid " (%s has become dangling)" |
07432cef | 6883 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 6884 | |
5c57d762 | 6885 | #: builtin/fetch.c:937 |
c04f5ac3 JX |
6886 | msgid "[deleted]" |
6887 | msgstr "[已删除]" | |
6888 | ||
5c57d762 | 6889 | #: builtin/fetch.c:938 builtin/remote.c:1020 |
c04f5ac3 JX |
6890 | msgid "(none)" |
6891 | msgstr "(无)" | |
6892 | ||
5c57d762 | 6893 | #: builtin/fetch.c:960 |
c04f5ac3 JX |
6894 | #, c-format |
6895 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 6896 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 6897 | |
5c57d762 | 6898 | #: builtin/fetch.c:979 |
c04f5ac3 JX |
6899 | #, c-format |
6900 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
6901 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
6902 | ||
5c57d762 | 6903 | #: builtin/fetch.c:982 |
c04f5ac3 JX |
6904 | #, c-format |
6905 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 6906 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 6907 | |
5c57d762 | 6908 | #: builtin/fetch.c:1039 |
90314792 JX |
6909 | #, c-format |
6910 | msgid "Don't know how to fetch from %s" | |
6911 | msgstr "不知道如何从 %s 获取" | |
6912 | ||
5c57d762 | 6913 | #: builtin/fetch.c:1199 |
c04f5ac3 JX |
6914 | #, c-format |
6915 | msgid "Fetching %s\n" | |
d4a8e00b | 6916 | msgstr "正在获取 %s\n" |
c04f5ac3 | 6917 | |
5c57d762 | 6918 | #: builtin/fetch.c:1201 builtin/remote.c:96 |
c04f5ac3 JX |
6919 | #, c-format |
6920 | msgid "Could not fetch %s" | |
6921 | msgstr "不能获取 %s" | |
6922 | ||
5c57d762 | 6923 | #: builtin/fetch.c:1219 |
c04f5ac3 JX |
6924 | msgid "" |
6925 | "No remote repository specified. Please, specify either a URL or a\n" | |
6926 | "remote name from which new revisions should be fetched." | |
4375c10e | 6927 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 6928 | |
5c57d762 | 6929 | #: builtin/fetch.c:1242 |
c04f5ac3 | 6930 | msgid "You need to specify a tag name." |
55a16ee4 | 6931 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 6932 | |
5c57d762 | 6933 | #: builtin/fetch.c:1284 |
a77c07d9 JX |
6934 | msgid "--depth and --unshallow cannot be used together" |
6935 | msgstr "--depth 和 --unshallow 不能同时使用" | |
6936 | ||
5c57d762 | 6937 | #: builtin/fetch.c:1286 |
a77c07d9 | 6938 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 6939 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 6940 | |
5c57d762 | 6941 | #: builtin/fetch.c:1306 |
c04f5ac3 | 6942 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 6943 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 6944 | |
5c57d762 | 6945 | #: builtin/fetch.c:1308 |
c04f5ac3 | 6946 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 6947 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 6948 | |
5c57d762 | 6949 | #: builtin/fetch.c:1319 |
c04f5ac3 JX |
6950 | #, c-format |
6951 | msgid "No such remote or remote group: %s" | |
6952 | msgstr "没有这样的远程或远程组:%s" | |
6953 | ||
5c57d762 | 6954 | #: builtin/fetch.c:1327 |
c04f5ac3 | 6955 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 6956 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 6957 | |
1b7f4a34 | 6958 | #: builtin/fmt-merge-msg.c:14 |
814ff314 JX |
6959 | msgid "" |
6960 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
6961 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 6962 | |
94550ed3 | 6963 | #: builtin/fmt-merge-msg.c:667 |
ef317cd5 | 6964 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 6965 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 6966 | |
94550ed3 | 6967 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 6968 | msgid "alias for --log (deprecated)" |
07432cef | 6969 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 6970 | |
94550ed3 | 6971 | #: builtin/fmt-merge-msg.c:673 |
ef317cd5 | 6972 | msgid "text" |
07432cef | 6973 | msgstr "文本" |
ef317cd5 | 6974 | |
94550ed3 | 6975 | #: builtin/fmt-merge-msg.c:674 |
ef317cd5 | 6976 | msgid "use <text> as start of message" |
07432cef | 6977 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 6978 | |
94550ed3 | 6979 | #: builtin/fmt-merge-msg.c:675 |
ef317cd5 | 6980 | msgid "file to read from" |
07432cef | 6981 | msgstr "从文件中读取" |
ef317cd5 | 6982 | |
1b7f4a34 | 6983 | #: builtin/for-each-ref.c:9 |
814ff314 JX |
6984 | msgid "git for-each-ref [<options>] [<pattern>]" |
6985 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 6986 | |
94550ed3 JX |
6987 | #: builtin/for-each-ref.c:10 |
6988 | msgid "git for-each-ref [--points-at <object>]" | |
6989 | msgstr "git for-each-ref [--points-at <对象>]" | |
6990 | ||
6991 | #: builtin/for-each-ref.c:11 | |
6992 | msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" | |
6993 | msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]" | |
6994 | ||
6995 | #: builtin/for-each-ref.c:12 | |
6996 | msgid "git for-each-ref [--contains [<object>]]" | |
6997 | msgstr "git for-each-ref [--contains [<对象>]]" | |
6998 | ||
6999 | #: builtin/for-each-ref.c:27 | |
ef317cd5 | 7000 | msgid "quote placeholders suitably for shells" |
07432cef | 7001 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 7002 | |
94550ed3 | 7003 | #: builtin/for-each-ref.c:29 |
ef317cd5 | 7004 | msgid "quote placeholders suitably for perl" |
07432cef | 7005 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 7006 | |
94550ed3 | 7007 | #: builtin/for-each-ref.c:31 |
ef317cd5 | 7008 | msgid "quote placeholders suitably for python" |
07432cef | 7009 | msgstr "引用占位符适用于 python" |
ef317cd5 | 7010 | |
94550ed3 | 7011 | #: builtin/for-each-ref.c:33 |
04cb2f28 JX |
7012 | msgid "quote placeholders suitably for Tcl" |
7013 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 7014 | |
94550ed3 | 7015 | #: builtin/for-each-ref.c:36 |
ef317cd5 | 7016 | msgid "show only <n> matched refs" |
07432cef | 7017 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 7018 | |
94550ed3 | 7019 | #: builtin/for-each-ref.c:37 builtin/tag.c:372 |
ef317cd5 | 7020 | msgid "format to use for the output" |
07432cef | 7021 | msgstr "输出格式" |
ef317cd5 | 7022 | |
94550ed3 JX |
7023 | #: builtin/for-each-ref.c:41 |
7024 | msgid "print only refs which points at the given object" | |
7025 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 7026 | |
94550ed3 JX |
7027 | #: builtin/for-each-ref.c:43 |
7028 | msgid "print only refs that are merged" | |
7029 | msgstr "只打印已经合并的引用" | |
7030 | ||
7031 | #: builtin/for-each-ref.c:44 | |
7032 | msgid "print only refs that are not merged" | |
7033 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 7034 | |
94550ed3 JX |
7035 | #: builtin/for-each-ref.c:45 |
7036 | msgid "print only refs which contain the commit" | |
7037 | msgstr "只打印包含该提交的引用" | |
7038 | ||
5c57d762 | 7039 | #: builtin/fsck.c:519 |
6c94aba5 JX |
7040 | msgid "Checking object directories" |
7041 | msgstr "检查对象目录中" | |
7042 | ||
5c57d762 | 7043 | #: builtin/fsck.c:588 |
814ff314 JX |
7044 | msgid "git fsck [<options>] [<object>...]" |
7045 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 7046 | |
5c57d762 | 7047 | #: builtin/fsck.c:594 |
ef317cd5 | 7048 | msgid "show unreachable objects" |
07432cef | 7049 | msgstr "显示不可达的对象" |
ef317cd5 | 7050 | |
5c57d762 | 7051 | #: builtin/fsck.c:595 |
ef317cd5 | 7052 | msgid "show dangling objects" |
07432cef | 7053 | msgstr "显示摇摆的对象" |
ef317cd5 | 7054 | |
5c57d762 | 7055 | #: builtin/fsck.c:596 |
ef317cd5 | 7056 | msgid "report tags" |
55a16ee4 | 7057 | msgstr "报告标签" |
ef317cd5 | 7058 | |
5c57d762 | 7059 | #: builtin/fsck.c:597 |
ef317cd5 | 7060 | msgid "report root nodes" |
07432cef | 7061 | msgstr "报告根节点" |
ef317cd5 | 7062 | |
5c57d762 | 7063 | #: builtin/fsck.c:598 |
ef317cd5 | 7064 | msgid "make index objects head nodes" |
07432cef | 7065 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 7066 | |
5c57d762 | 7067 | #: builtin/fsck.c:599 |
ef317cd5 | 7068 | msgid "make reflogs head nodes (default)" |
07432cef | 7069 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 7070 | |
5c57d762 | 7071 | #: builtin/fsck.c:600 |
ef317cd5 | 7072 | msgid "also consider packs and alternate objects" |
07432cef | 7073 | msgstr "也考虑包和备用对象" |
ef317cd5 | 7074 | |
5c57d762 | 7075 | #: builtin/fsck.c:601 |
1b7f4a34 JX |
7076 | msgid "check only connectivity" |
7077 | msgstr "仅检查连通性" | |
7078 | ||
5c57d762 | 7079 | #: builtin/fsck.c:602 |
ef317cd5 | 7080 | msgid "enable more strict checking" |
07432cef | 7081 | msgstr "启用更严格的检查" |
ef317cd5 | 7082 | |
5c57d762 | 7083 | #: builtin/fsck.c:604 |
ef317cd5 | 7084 | msgid "write dangling objects in .git/lost-found" |
07432cef | 7085 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 7086 | |
5c57d762 | 7087 | #: builtin/fsck.c:605 builtin/prune.c:107 |
ef317cd5 | 7088 | msgid "show progress" |
07432cef | 7089 | msgstr "显示进度" |
ef317cd5 | 7090 | |
5c57d762 JX |
7091 | #: builtin/fsck.c:606 |
7092 | msgid "show verbose names for reachable objects" | |
7093 | msgstr "显示可达对象的详细名称" | |
7094 | ||
7095 | #: builtin/fsck.c:671 | |
6c94aba5 JX |
7096 | msgid "Checking objects" |
7097 | msgstr "检查对象中" | |
7098 | ||
1b7f4a34 | 7099 | #: builtin/gc.c:25 |
814ff314 JX |
7100 | msgid "git gc [<options>]" |
7101 | msgstr "git gc [<选项>]" | |
ef317cd5 | 7102 | |
94550ed3 | 7103 | #: builtin/gc.c:72 |
c04f5ac3 | 7104 | #, c-format |
7aea43ff JX |
7105 | msgid "Invalid %s: '%s'" |
7106 | msgstr "无效 %s:'%s'" | |
c04f5ac3 | 7107 | |
94550ed3 | 7108 | #: builtin/gc.c:139 |
c04f5ac3 JX |
7109 | #, c-format |
7110 | msgid "insanely long object directory %.*s" | |
7111 | msgstr "不正常的长对象目录 %.*s" | |
7112 | ||
94550ed3 JX |
7113 | #: builtin/gc.c:290 |
7114 | #, c-format | |
7115 | msgid "" | |
7116 | "The last gc run reported the following. Please correct the root cause\n" | |
7117 | "and remove %s.\n" | |
7118 | "Automatic cleanup will not be performed until the file is removed.\n" | |
7119 | "\n" | |
7120 | "%s" | |
7121 | msgstr "" | |
7122 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
7123 | "在该文件被删除之前,自动清理将不会执行。\n" | |
7124 | "\n" | |
7125 | "%s" | |
7126 | ||
7127 | #: builtin/gc.c:327 | |
ef317cd5 | 7128 | msgid "prune unreferenced objects" |
07432cef | 7129 | msgstr "清除未引用的对象" |
ef317cd5 | 7130 | |
94550ed3 | 7131 | #: builtin/gc.c:329 |
ef317cd5 | 7132 | msgid "be more thorough (increased runtime)" |
07432cef | 7133 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 7134 | |
94550ed3 | 7135 | #: builtin/gc.c:330 |
ef317cd5 | 7136 | msgid "enable auto-gc mode" |
07432cef | 7137 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 7138 | |
94550ed3 | 7139 | #: builtin/gc.c:331 |
90314792 JX |
7140 | msgid "force running gc even if there may be another gc running" |
7141 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
7142 | ||
94550ed3 | 7143 | #: builtin/gc.c:373 |
c04f5ac3 | 7144 | #, c-format |
6c94aba5 | 7145 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 7146 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 7147 | |
94550ed3 | 7148 | #: builtin/gc.c:375 |
6c94aba5 JX |
7149 | #, c-format |
7150 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 7151 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 7152 | |
94550ed3 | 7153 | #: builtin/gc.c:376 |
6c94aba5 JX |
7154 | #, c-format |
7155 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
7156 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 7157 | |
94550ed3 | 7158 | #: builtin/gc.c:397 |
90314792 JX |
7159 | #, c-format |
7160 | msgid "" | |
7161 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
7162 | msgstr "" | |
7163 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
7164 | ||
94550ed3 | 7165 | #: builtin/gc.c:441 |
c04f5ac3 JX |
7166 | msgid "" |
7167 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 7168 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 7169 | |
90314792 | 7170 | #: builtin/grep.c:23 |
814ff314 JX |
7171 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
7172 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 7173 | |
276ceeaa | 7174 | #: builtin/grep.c:219 |
c04f5ac3 JX |
7175 | #, c-format |
7176 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 7177 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 7178 | |
276ceeaa JX |
7179 | #: builtin/grep.c:277 |
7180 | #, c-format | |
7181 | msgid "invalid number of threads specified (%d) for %s" | |
7182 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
7183 | ||
7184 | #: builtin/grep.c:452 builtin/grep.c:487 | |
c04f5ac3 JX |
7185 | #, c-format |
7186 | msgid "unable to read tree (%s)" | |
90e6ef53 | 7187 | msgstr "无法读取树(%s)" |
c04f5ac3 | 7188 | |
276ceeaa | 7189 | #: builtin/grep.c:502 |
c04f5ac3 JX |
7190 | #, c-format |
7191 | msgid "unable to grep from object of type %s" | |
7192 | msgstr "无法抓取来自于 %s 类型的对象" | |
7193 | ||
5b04ee3b | 7194 | #: builtin/grep.c:560 |
c04f5ac3 JX |
7195 | #, c-format |
7196 | msgid "switch `%c' expects a numerical value" | |
7197 | msgstr "开关 `%c' 期望一个数字值" | |
7198 | ||
5b04ee3b | 7199 | #: builtin/grep.c:577 |
c04f5ac3 JX |
7200 | #, c-format |
7201 | msgid "cannot open '%s'" | |
7202 | msgstr "不能打开 '%s'" | |
7203 | ||
5b04ee3b | 7204 | #: builtin/grep.c:646 |
ef317cd5 | 7205 | msgid "search in index instead of in the work tree" |
07432cef | 7206 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 7207 | |
5b04ee3b | 7208 | #: builtin/grep.c:648 |
ef317cd5 | 7209 | msgid "find in contents not managed by git" |
07432cef | 7210 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
7211 | |
7212 | # 译者:中文字符串拼接,可删除前导空格 | |
5b04ee3b | 7213 | #: builtin/grep.c:650 |
ef317cd5 | 7214 | msgid "search in both tracked and untracked files" |
07432cef | 7215 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 7216 | |
5b04ee3b | 7217 | #: builtin/grep.c:652 |
814ff314 JX |
7218 | msgid "ignore files specified via '.gitignore'" |
7219 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 7220 | |
5b04ee3b | 7221 | #: builtin/grep.c:655 |
ef317cd5 | 7222 | msgid "show non-matching lines" |
07432cef | 7223 | msgstr "显示未匹配的行" |
ef317cd5 | 7224 | |
5b04ee3b | 7225 | #: builtin/grep.c:657 |
ef317cd5 | 7226 | msgid "case insensitive matching" |
07432cef | 7227 | msgstr "不区分大小写匹配" |
ef317cd5 | 7228 | |
5b04ee3b | 7229 | #: builtin/grep.c:659 |
ef317cd5 | 7230 | msgid "match patterns only at word boundaries" |
07432cef | 7231 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 7232 | |
5b04ee3b | 7233 | #: builtin/grep.c:661 |
ef317cd5 | 7234 | msgid "process binary files as text" |
07432cef | 7235 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 7236 | |
5b04ee3b | 7237 | #: builtin/grep.c:663 |
ef317cd5 | 7238 | msgid "don't match patterns in binary files" |
07432cef | 7239 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 7240 | |
5b04ee3b | 7241 | #: builtin/grep.c:666 |
90314792 JX |
7242 | msgid "process binary files with textconv filters" |
7243 | msgstr "用 textconv 过滤器处理二进制文件" | |
7244 | ||
5b04ee3b | 7245 | #: builtin/grep.c:668 |
ef317cd5 | 7246 | msgid "descend at most <depth> levels" |
07432cef | 7247 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 7248 | |
5b04ee3b | 7249 | #: builtin/grep.c:672 |
ef317cd5 | 7250 | msgid "use extended POSIX regular expressions" |
07432cef | 7251 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 7252 | |
5b04ee3b | 7253 | #: builtin/grep.c:675 |
ef317cd5 | 7254 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 7255 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 7256 | |
5b04ee3b | 7257 | #: builtin/grep.c:678 |
ef317cd5 | 7258 | msgid "interpret patterns as fixed strings" |
07432cef | 7259 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 7260 | |
5b04ee3b | 7261 | #: builtin/grep.c:681 |
ef317cd5 | 7262 | msgid "use Perl-compatible regular expressions" |
07432cef | 7263 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 7264 | |
5b04ee3b | 7265 | #: builtin/grep.c:684 |
ef317cd5 | 7266 | msgid "show line numbers" |
07432cef | 7267 | msgstr "显示行号" |
ef317cd5 | 7268 | |
5b04ee3b | 7269 | #: builtin/grep.c:685 |
ef317cd5 | 7270 | msgid "don't show filenames" |
07432cef | 7271 | msgstr "不显示文件名" |
ef317cd5 | 7272 | |
5b04ee3b | 7273 | #: builtin/grep.c:686 |
ef317cd5 | 7274 | msgid "show filenames" |
07432cef | 7275 | msgstr "显示文件名" |
ef317cd5 | 7276 | |
5b04ee3b | 7277 | #: builtin/grep.c:688 |
ef317cd5 | 7278 | msgid "show filenames relative to top directory" |
07432cef | 7279 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 7280 | |
5b04ee3b | 7281 | #: builtin/grep.c:690 |
ef317cd5 | 7282 | msgid "show only filenames instead of matching lines" |
07432cef | 7283 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 7284 | |
5b04ee3b | 7285 | #: builtin/grep.c:692 |
ef317cd5 | 7286 | msgid "synonym for --files-with-matches" |
07432cef | 7287 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 7288 | |
5b04ee3b | 7289 | #: builtin/grep.c:695 |
ef317cd5 | 7290 | msgid "show only the names of files without match" |
07432cef | 7291 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 7292 | |
5b04ee3b | 7293 | #: builtin/grep.c:697 |
ef317cd5 | 7294 | msgid "print NUL after filenames" |
07432cef | 7295 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 7296 | |
5b04ee3b | 7297 | #: builtin/grep.c:699 |
ef317cd5 | 7298 | msgid "show the number of matches instead of matching lines" |
07432cef | 7299 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 7300 | |
5b04ee3b | 7301 | #: builtin/grep.c:700 |
ef317cd5 | 7302 | msgid "highlight matches" |
07432cef | 7303 | msgstr "高亮显示匹配项" |
ef317cd5 | 7304 | |
5b04ee3b | 7305 | #: builtin/grep.c:702 |
ef317cd5 | 7306 | msgid "print empty line between matches from different files" |
07432cef | 7307 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 7308 | |
5b04ee3b | 7309 | #: builtin/grep.c:704 |
ef317cd5 | 7310 | msgid "show filename only once above matches from same file" |
07432cef | 7311 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 7312 | |
5b04ee3b | 7313 | #: builtin/grep.c:707 |
ef317cd5 | 7314 | msgid "show <n> context lines before and after matches" |
07432cef | 7315 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 7316 | |
5b04ee3b | 7317 | #: builtin/grep.c:710 |
ef317cd5 | 7318 | msgid "show <n> context lines before matches" |
07432cef | 7319 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 7320 | |
5b04ee3b | 7321 | #: builtin/grep.c:712 |
ef317cd5 | 7322 | msgid "show <n> context lines after matches" |
07432cef | 7323 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 7324 | |
5b04ee3b | 7325 | #: builtin/grep.c:714 |
276ceeaa JX |
7326 | msgid "use <n> worker threads" |
7327 | msgstr "使用 <n> 个工作线程" | |
7328 | ||
5b04ee3b | 7329 | #: builtin/grep.c:715 |
ef317cd5 | 7330 | msgid "shortcut for -C NUM" |
07432cef | 7331 | msgstr "快捷键 -C 数字" |
ef317cd5 | 7332 | |
5b04ee3b | 7333 | #: builtin/grep.c:718 |
ef317cd5 | 7334 | msgid "show a line with the function name before matches" |
07432cef | 7335 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 7336 | |
5b04ee3b | 7337 | #: builtin/grep.c:720 |
ef317cd5 | 7338 | msgid "show the surrounding function" |
07432cef | 7339 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 7340 | |
5b04ee3b | 7341 | #: builtin/grep.c:723 |
ef317cd5 | 7342 | msgid "read patterns from file" |
07432cef | 7343 | msgstr "从文件读取模式" |
ef317cd5 | 7344 | |
5b04ee3b | 7345 | #: builtin/grep.c:725 |
ef317cd5 | 7346 | msgid "match <pattern>" |
07432cef | 7347 | msgstr "匹配 <模式>" |
ef317cd5 | 7348 | |
5b04ee3b | 7349 | #: builtin/grep.c:727 |
ef317cd5 | 7350 | msgid "combine patterns specified with -e" |
07432cef | 7351 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 7352 | |
5b04ee3b | 7353 | #: builtin/grep.c:739 |
ef317cd5 | 7354 | msgid "indicate hit with exit status without output" |
07432cef | 7355 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 7356 | |
5b04ee3b | 7357 | #: builtin/grep.c:741 |
ef317cd5 | 7358 | msgid "show only matches from files that match all patterns" |
07432cef | 7359 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 7360 | |
5b04ee3b | 7361 | #: builtin/grep.c:743 |
07432cef WS |
7362 | msgid "show parse tree for grep expression" |
7363 | msgstr "显示 grep 表达式的解析树" | |
7364 | ||
5b04ee3b | 7365 | #: builtin/grep.c:747 |
ef317cd5 | 7366 | msgid "pager" |
07432cef | 7367 | msgstr "分页" |
ef317cd5 | 7368 | |
5b04ee3b | 7369 | #: builtin/grep.c:747 |
ef317cd5 | 7370 | msgid "show matching files in the pager" |
07432cef | 7371 | msgstr "分页显示匹配的文件" |
ef317cd5 | 7372 | |
5b04ee3b | 7373 | #: builtin/grep.c:750 |
ef317cd5 | 7374 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 7375 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 7376 | |
5b04ee3b | 7377 | #: builtin/grep.c:813 |
c04f5ac3 JX |
7378 | msgid "no pattern given." |
7379 | msgstr "未提供模式匹配。" | |
7380 | ||
5c57d762 | 7381 | #: builtin/grep.c:845 builtin/index-pack.c:1479 |
276ceeaa JX |
7382 | #, c-format |
7383 | msgid "invalid number of threads specified (%d)" | |
7384 | msgstr "指定的线程数无效(%d)" | |
7385 | ||
5b04ee3b | 7386 | #: builtin/grep.c:875 |
c04f5ac3 JX |
7387 | msgid "--open-files-in-pager only works on the worktree" |
7388 | msgstr "--open-files-in-pager 仅用于工作区" | |
7389 | ||
5b04ee3b | 7390 | #: builtin/grep.c:901 |
c04f5ac3 | 7391 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 7392 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 7393 | |
5b04ee3b | 7394 | #: builtin/grep.c:906 |
c04f5ac3 | 7395 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 7396 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 7397 | |
5b04ee3b | 7398 | #: builtin/grep.c:909 |
c04f5ac3 | 7399 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 7400 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 7401 | |
5b04ee3b | 7402 | #: builtin/grep.c:917 |
c04f5ac3 JX |
7403 | msgid "both --cached and trees are given." |
7404 | msgstr "同时给出了 --cached 和树对象。" | |
7405 | ||
276ceeaa | 7406 | #: builtin/hash-object.c:81 |
ef317cd5 | 7407 | msgid "" |
814ff314 JX |
7408 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
7409 | "[--] <file>..." | |
ef317cd5 | 7410 | msgstr "" |
814ff314 JX |
7411 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
7412 | "[--] <文件>..." | |
ef317cd5 | 7413 | |
276ceeaa | 7414 | #: builtin/hash-object.c:82 |
94550ed3 JX |
7415 | msgid "git hash-object --stdin-paths" |
7416 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 7417 | |
276ceeaa | 7418 | #: builtin/hash-object.c:93 |
ef317cd5 | 7419 | msgid "type" |
07432cef | 7420 | msgstr "类型" |
ef317cd5 | 7421 | |
276ceeaa | 7422 | #: builtin/hash-object.c:93 |
ef317cd5 | 7423 | msgid "object type" |
07432cef | 7424 | msgstr "对象类型" |
ef317cd5 | 7425 | |
276ceeaa | 7426 | #: builtin/hash-object.c:94 |
ef317cd5 | 7427 | msgid "write the object into the object database" |
07432cef | 7428 | msgstr "将对象写入对象数据库" |
ef317cd5 | 7429 | |
276ceeaa | 7430 | #: builtin/hash-object.c:96 |
ef317cd5 | 7431 | msgid "read the object from stdin" |
07432cef | 7432 | msgstr "从标准输入读取对象" |
ef317cd5 | 7433 | |
276ceeaa | 7434 | #: builtin/hash-object.c:98 |
ef317cd5 | 7435 | msgid "store file as is without filters" |
07432cef | 7436 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 7437 | |
276ceeaa | 7438 | #: builtin/hash-object.c:99 |
220c313c JX |
7439 | msgid "" |
7440 | "just hash any random garbage to create corrupt objects for debugging Git" | |
7441 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
7442 | ||
276ceeaa | 7443 | #: builtin/hash-object.c:100 |
ef317cd5 | 7444 | msgid "process file as it were from this path" |
07432cef | 7445 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 7446 | |
2e8451e8 | 7447 | #: builtin/help.c:41 |
ef317cd5 | 7448 | msgid "print all available commands" |
07432cef | 7449 | msgstr "打印所有可用的命令" |
ef317cd5 | 7450 | |
2e8451e8 | 7451 | #: builtin/help.c:42 |
4dcdc3d8 JX |
7452 | msgid "print list of useful guides" |
7453 | msgstr "显示有用的指南列表" | |
7454 | ||
2e8451e8 | 7455 | #: builtin/help.c:43 |
ef317cd5 | 7456 | msgid "show man page" |
07432cef | 7457 | msgstr "显示 man 手册" |
ef317cd5 | 7458 | |
2e8451e8 | 7459 | #: builtin/help.c:44 |
ef317cd5 | 7460 | msgid "show manual in web browser" |
07432cef | 7461 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 7462 | |
2e8451e8 | 7463 | #: builtin/help.c:46 |
ef317cd5 | 7464 | msgid "show info page" |
07432cef | 7465 | msgstr "显示 info 手册" |
ef317cd5 | 7466 | |
2e8451e8 | 7467 | #: builtin/help.c:52 |
814ff314 JX |
7468 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
7469 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 7470 | |
2e8451e8 | 7471 | #: builtin/help.c:64 |
81809b99 | 7472 | #, c-format |
8ada9598 | 7473 | msgid "unrecognized help format '%s'" |
81809b99 | 7474 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 7475 | |
220c313c | 7476 | #: builtin/help.c:91 |
8ada9598 | 7477 | msgid "Failed to start emacsclient." |
81809b99 | 7478 | msgstr "无法启动 emacsclient。" |
8ada9598 | 7479 | |
220c313c | 7480 | #: builtin/help.c:104 |
8ada9598 | 7481 | msgid "Failed to parse emacsclient version." |
81809b99 | 7482 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 7483 | |
220c313c | 7484 | #: builtin/help.c:112 |
8ada9598 JX |
7485 | #, c-format |
7486 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 7487 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 7488 | |
94550ed3 | 7489 | #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 |
81809b99 | 7490 | #, c-format |
5b04ee3b JX |
7491 | msgid "failed to exec '%s'" |
7492 | msgstr "无法执行 '%s'" | |
8ada9598 | 7493 | |
276ceeaa | 7494 | #: builtin/help.c:205 |
8ada9598 JX |
7495 | #, c-format |
7496 | msgid "" | |
7497 | "'%s': path for unsupported man viewer.\n" | |
7498 | "Please consider using 'man.<tool>.cmd' instead." | |
7499 | msgstr "" | |
81809b99 | 7500 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 7501 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 7502 | |
276ceeaa | 7503 | #: builtin/help.c:217 |
8ada9598 JX |
7504 | #, c-format |
7505 | msgid "" | |
7506 | "'%s': cmd for supported man viewer.\n" | |
7507 | "Please consider using 'man.<tool>.path' instead." | |
7508 | msgstr "" | |
81809b99 | 7509 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 7510 | "请使用 'man.<工具>.path'。" |
8ada9598 | 7511 | |
276ceeaa | 7512 | #: builtin/help.c:334 |
8ada9598 JX |
7513 | #, c-format |
7514 | msgid "'%s': unknown man viewer." | |
81809b99 | 7515 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 7516 | |
276ceeaa | 7517 | #: builtin/help.c:351 |
8ada9598 | 7518 | msgid "no man viewer handled the request" |
81809b99 | 7519 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 7520 | |
276ceeaa | 7521 | #: builtin/help.c:359 |
8ada9598 | 7522 | msgid "no info viewer handled the request" |
81809b99 | 7523 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 7524 | |
5c57d762 | 7525 | #: builtin/help.c:401 |
4dcdc3d8 JX |
7526 | msgid "Defining attributes per path" |
7527 | msgstr "定义路径的属性" | |
7528 | ||
5c57d762 | 7529 | #: builtin/help.c:402 |
220c313c JX |
7530 | msgid "Everyday Git With 20 Commands Or So" |
7531 | msgstr "每一天 Git 常用的约 20 条命令" | |
7532 | ||
5c57d762 | 7533 | #: builtin/help.c:403 |
4dcdc3d8 JX |
7534 | msgid "A Git glossary" |
7535 | msgstr "Git 词汇表" | |
7536 | ||
5c57d762 | 7537 | #: builtin/help.c:404 |
4dcdc3d8 JX |
7538 | msgid "Specifies intentionally untracked files to ignore" |
7539 | msgstr "忽略指定的未跟踪文件" | |
7540 | ||
5c57d762 | 7541 | #: builtin/help.c:405 |
4dcdc3d8 JX |
7542 | msgid "Defining submodule properties" |
7543 | msgstr "定义子模组属性" | |
7544 | ||
5c57d762 | 7545 | #: builtin/help.c:406 |
4dcdc3d8 JX |
7546 | msgid "Specifying revisions and ranges for Git" |
7547 | msgstr "指定 Git 的版本和版本范围" | |
7548 | ||
5c57d762 | 7549 | #: builtin/help.c:407 |
4dcdc3d8 JX |
7550 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
7551 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
7552 | ||
5c57d762 | 7553 | #: builtin/help.c:408 |
4dcdc3d8 JX |
7554 | msgid "An overview of recommended workflows with Git" |
7555 | msgstr "Git 推荐的工作流概览" | |
7556 | ||
5c57d762 | 7557 | #: builtin/help.c:420 |
4dcdc3d8 JX |
7558 | msgid "The common Git guides are:\n" |
7559 | msgstr "最常用的 Git 向导有:\n" | |
7560 | ||
5c57d762 | 7561 | #: builtin/help.c:441 builtin/help.c:458 |
8ada9598 JX |
7562 | #, c-format |
7563 | msgid "usage: %s%s" | |
81809b99 | 7564 | msgstr "用法:%s%s" |
8ada9598 | 7565 | |
5c57d762 | 7566 | #: builtin/help.c:474 |
8ada9598 JX |
7567 | #, c-format |
7568 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 7569 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 7570 | |
5c57d762 | 7571 | #: builtin/index-pack.c:153 |
6acbf033 JX |
7572 | #, c-format |
7573 | msgid "unable to open %s" | |
7574 | msgstr "不能打开 %s" | |
7575 | ||
5c57d762 | 7576 | #: builtin/index-pack.c:203 |
8ada9598 JX |
7577 | #, c-format |
7578 | msgid "object type mismatch at %s" | |
81809b99 | 7579 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 7580 | |
5c57d762 | 7581 | #: builtin/index-pack.c:223 |
6acbf033 JX |
7582 | #, c-format |
7583 | msgid "did not receive expected object %s" | |
7584 | msgstr "未能获取期望的对象 %s" | |
8ada9598 | 7585 | |
5c57d762 | 7586 | #: builtin/index-pack.c:226 |
6acbf033 JX |
7587 | #, c-format |
7588 | msgid "object %s: expected type %s, found %s" | |
7589 | msgstr "对象 %s:期待类型 %s,却是 %s" | |
7590 | ||
5c57d762 | 7591 | #: builtin/index-pack.c:268 |
81809b99 | 7592 | #, c-format |
8ada9598 JX |
7593 | msgid "cannot fill %d byte" |
7594 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 7595 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 7596 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 7597 | |
5c57d762 | 7598 | #: builtin/index-pack.c:278 |
8ada9598 | 7599 | msgid "early EOF" |
81809b99 | 7600 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 7601 | |
5c57d762 | 7602 | #: builtin/index-pack.c:279 |
8ada9598 | 7603 | msgid "read error on input" |
81809b99 | 7604 | msgstr "输入上的读错误" |
8ada9598 | 7605 | |
5c57d762 | 7606 | #: builtin/index-pack.c:291 |
8ada9598 | 7607 | msgid "used more bytes than were available" |
81809b99 | 7608 | msgstr "用掉了超过可用的字节" |
8ada9598 | 7609 | |
5c57d762 | 7610 | #: builtin/index-pack.c:298 |
8ada9598 | 7611 | msgid "pack too large for current definition of off_t" |
81809b99 | 7612 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 7613 | |
5c57d762 | 7614 | #: builtin/index-pack.c:314 |
81809b99 | 7615 | #, c-format |
8ada9598 | 7616 | msgid "unable to create '%s'" |
81809b99 | 7617 | msgstr "不能创建 '%s'" |
8ada9598 | 7618 | |
5c57d762 | 7619 | #: builtin/index-pack.c:319 |
81809b99 | 7620 | #, c-format |
8ada9598 | 7621 | msgid "cannot open packfile '%s'" |
81809b99 | 7622 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 7623 | |
5c57d762 | 7624 | #: builtin/index-pack.c:333 |
8ada9598 | 7625 | msgid "pack signature mismatch" |
81809b99 | 7626 | msgstr "包签名不匹配" |
8ada9598 | 7627 | |
5c57d762 | 7628 | #: builtin/index-pack.c:335 |
ef317cd5 JX |
7629 | #, c-format |
7630 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 7631 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 7632 | |
5c57d762 | 7633 | #: builtin/index-pack.c:353 |
8ada9598 | 7634 | #, c-format |
5c57d762 JX |
7635 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
7636 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 7637 | |
5c57d762 | 7638 | #: builtin/index-pack.c:475 |
8ada9598 JX |
7639 | #, c-format |
7640 | msgid "inflate returned %d" | |
81809b99 | 7641 | msgstr "解压缩返回 %d" |
8ada9598 | 7642 | |
5c57d762 | 7643 | #: builtin/index-pack.c:524 |
8ada9598 | 7644 | msgid "offset value overflow for delta base object" |
81809b99 | 7645 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 7646 | |
5c57d762 | 7647 | #: builtin/index-pack.c:532 |
8ada9598 | 7648 | msgid "delta base offset is out of bound" |
81809b99 | 7649 | msgstr "delta 基准偏移越界" |
8ada9598 | 7650 | |
5c57d762 | 7651 | #: builtin/index-pack.c:540 |
81809b99 | 7652 | #, c-format |
8ada9598 | 7653 | msgid "unknown object type %d" |
81809b99 | 7654 | msgstr "未知对象类型 %d" |
8ada9598 | 7655 | |
5c57d762 | 7656 | #: builtin/index-pack.c:571 |
8ada9598 | 7657 | msgid "cannot pread pack file" |
81809b99 | 7658 | msgstr "无法读取包文件" |
8ada9598 | 7659 | |
5c57d762 | 7660 | #: builtin/index-pack.c:573 |
8ada9598 | 7661 | #, c-format |
5c57d762 JX |
7662 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
7663 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
7664 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
7665 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 7666 | |
5c57d762 | 7667 | #: builtin/index-pack.c:599 |
8ada9598 | 7668 | msgid "serious inflate inconsistency" |
81809b99 | 7669 | msgstr "解压缩严重的不一致" |
8ada9598 | 7670 | |
5c57d762 JX |
7671 | #: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 |
7672 | #: builtin/index-pack.c:808 builtin/index-pack.c:817 | |
8ada9598 JX |
7673 | #, c-format |
7674 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 7675 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 7676 | |
5c57d762 JX |
7677 | #: builtin/index-pack.c:748 builtin/pack-objects.c:164 |
7678 | #: builtin/pack-objects.c:256 | |
6792b93b JX |
7679 | #, c-format |
7680 | msgid "unable to read %s" | |
7681 | msgstr "不能读 %s" | |
7682 | ||
5c57d762 | 7683 | #: builtin/index-pack.c:814 |
6792b93b JX |
7684 | #, c-format |
7685 | msgid "cannot read existing object %s" | |
7686 | msgstr "不能读取现存对象 %s" | |
7687 | ||
5c57d762 | 7688 | #: builtin/index-pack.c:828 |
81809b99 | 7689 | #, c-format |
8ada9598 | 7690 | msgid "invalid blob object %s" |
160fb2b2 | 7691 | msgstr "无效的数据对象 %s" |
8ada9598 | 7692 | |
5c57d762 | 7693 | #: builtin/index-pack.c:842 |
81809b99 | 7694 | #, c-format |
8ada9598 | 7695 | msgid "invalid %s" |
81809b99 | 7696 | msgstr "无效的 %s" |
8ada9598 | 7697 | |
5c57d762 | 7698 | #: builtin/index-pack.c:845 |
8ada9598 | 7699 | msgid "Error in object" |
81809b99 | 7700 | msgstr "对象中出错" |
8ada9598 | 7701 | |
5c57d762 | 7702 | #: builtin/index-pack.c:847 |
8ada9598 JX |
7703 | #, c-format |
7704 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 7705 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 7706 | |
5c57d762 | 7707 | #: builtin/index-pack.c:919 builtin/index-pack.c:950 |
8ada9598 | 7708 | msgid "failed to apply delta" |
81809b99 | 7709 | msgstr "无法应用 delta" |
8ada9598 | 7710 | |
5c57d762 | 7711 | #: builtin/index-pack.c:1120 |
8ada9598 | 7712 | msgid "Receiving objects" |
81809b99 | 7713 | msgstr "接收对象中" |
8ada9598 | 7714 | |
5c57d762 | 7715 | #: builtin/index-pack.c:1120 |
8ada9598 | 7716 | msgid "Indexing objects" |
81809b99 | 7717 | msgstr "索引对象中" |
8ada9598 | 7718 | |
5c57d762 | 7719 | #: builtin/index-pack.c:1152 |
8ada9598 | 7720 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 7721 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 7722 | |
5c57d762 | 7723 | #: builtin/index-pack.c:1157 |
8ada9598 | 7724 | msgid "cannot fstat packfile" |
81809b99 | 7725 | msgstr "不能枚举包文件状态" |
8ada9598 | 7726 | |
5c57d762 | 7727 | #: builtin/index-pack.c:1160 |
8ada9598 | 7728 | msgid "pack has junk at the end" |
81809b99 | 7729 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 7730 | |
5c57d762 | 7731 | #: builtin/index-pack.c:1171 |
6792b93b JX |
7732 | msgid "confusion beyond insanity in parse_pack_objects()" |
7733 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
7734 | ||
5c57d762 | 7735 | #: builtin/index-pack.c:1196 |
8ada9598 | 7736 | msgid "Resolving deltas" |
81809b99 | 7737 | msgstr "处理 delta 中" |
8ada9598 | 7738 | |
5c57d762 | 7739 | #: builtin/index-pack.c:1207 |
07432cef | 7740 | #, c-format |
ef317cd5 | 7741 | msgid "unable to create thread: %s" |
07432cef | 7742 | msgstr "不能创建线程:%s" |
ef317cd5 | 7743 | |
5c57d762 | 7744 | #: builtin/index-pack.c:1249 |
8ada9598 | 7745 | msgid "confusion beyond insanity" |
81809b99 | 7746 | msgstr "不可理喻" |
8ada9598 | 7747 | |
5c57d762 | 7748 | #: builtin/index-pack.c:1255 |
ef317cd5 | 7749 | #, c-format |
5b04ee3b JX |
7750 | msgid "completed with %d local object" |
7751 | msgid_plural "completed with %d local objects" | |
7752 | msgstr[0] "完成 %d 个本地对象" | |
7753 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 7754 | |
5c57d762 | 7755 | #: builtin/index-pack.c:1267 |
ef317cd5 JX |
7756 | #, c-format |
7757 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 7758 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 7759 | |
5c57d762 | 7760 | #: builtin/index-pack.c:1271 |
8ada9598 JX |
7761 | #, c-format |
7762 | msgid "pack has %d unresolved delta" | |
7763 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 7764 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 7765 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 7766 | |
5c57d762 | 7767 | #: builtin/index-pack.c:1295 |
81809b99 | 7768 | #, c-format |
8ada9598 | 7769 | msgid "unable to deflate appended object (%d)" |
07432cef | 7770 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 7771 | |
5c57d762 | 7772 | #: builtin/index-pack.c:1371 |
8ada9598 JX |
7773 | #, c-format |
7774 | msgid "local object %s is corrupt" | |
81809b99 | 7775 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 7776 | |
5c57d762 | 7777 | #: builtin/index-pack.c:1395 |
8ada9598 | 7778 | msgid "error while closing pack file" |
81809b99 | 7779 | msgstr "关闭包文件时出错" |
8ada9598 | 7780 | |
5c57d762 | 7781 | #: builtin/index-pack.c:1408 |
81809b99 | 7782 | #, c-format |
8ada9598 | 7783 | msgid "cannot write keep file '%s'" |
81809b99 | 7784 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 7785 | |
5c57d762 | 7786 | #: builtin/index-pack.c:1416 |
81809b99 | 7787 | #, c-format |
8ada9598 | 7788 | msgid "cannot close written keep file '%s'" |
81809b99 | 7789 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 7790 | |
5c57d762 | 7791 | #: builtin/index-pack.c:1429 |
8ada9598 | 7792 | msgid "cannot store pack file" |
81809b99 | 7793 | msgstr "无法存储包文件" |
8ada9598 | 7794 | |
5c57d762 | 7795 | #: builtin/index-pack.c:1440 |
8ada9598 | 7796 | msgid "cannot store index file" |
81809b99 | 7797 | msgstr "无法存储索引文件" |
8ada9598 | 7798 | |
5c57d762 | 7799 | #: builtin/index-pack.c:1473 |
07432cef | 7800 | #, c-format |
ef317cd5 | 7801 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 7802 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 7803 | |
5c57d762 | 7804 | #: builtin/index-pack.c:1483 builtin/index-pack.c:1681 |
ef317cd5 JX |
7805 | #, c-format |
7806 | msgid "no threads support, ignoring %s" | |
07432cef | 7807 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 7808 | |
5c57d762 | 7809 | #: builtin/index-pack.c:1542 |
81809b99 | 7810 | #, c-format |
8ada9598 | 7811 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 7812 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 7813 | |
5c57d762 | 7814 | #: builtin/index-pack.c:1544 |
81809b99 | 7815 | #, c-format |
8ada9598 | 7816 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 7817 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 7818 | |
5c57d762 | 7819 | #: builtin/index-pack.c:1591 |
81809b99 | 7820 | #, c-format |
8ada9598 JX |
7821 | msgid "non delta: %d object" |
7822 | msgid_plural "non delta: %d objects" | |
81809b99 | 7823 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 7824 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 7825 | |
5c57d762 | 7826 | #: builtin/index-pack.c:1598 |
8ada9598 JX |
7827 | #, c-format |
7828 | msgid "chain length = %d: %lu object" | |
7829 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 7830 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 7831 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 7832 | |
5c57d762 | 7833 | #: builtin/index-pack.c:1611 |
5b04ee3b JX |
7834 | #, c-format |
7835 | msgid "packfile name '%s' does not end with '.pack'" | |
7836 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
7837 | ||
5c57d762 JX |
7838 | #: builtin/index-pack.c:1693 builtin/index-pack.c:1696 |
7839 | #: builtin/index-pack.c:1712 builtin/index-pack.c:1716 | |
81809b99 | 7840 | #, c-format |
8ada9598 | 7841 | msgid "bad %s" |
81809b99 | 7842 | msgstr "错误选项 %s" |
8ada9598 | 7843 | |
5c57d762 | 7844 | #: builtin/index-pack.c:1730 |
8ada9598 | 7845 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 7846 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 7847 | |
5c57d762 | 7848 | #: builtin/index-pack.c:1738 |
8ada9598 | 7849 | msgid "--verify with no packfile name given" |
dbd6cced | 7850 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 7851 | |
94550ed3 | 7852 | #: builtin/init-db.c:55 |
c04f5ac3 JX |
7853 | #, c-format |
7854 | msgid "cannot stat '%s'" | |
7855 | msgstr "不能枚举 '%s' 状态" | |
7856 | ||
94550ed3 | 7857 | #: builtin/init-db.c:61 |
c04f5ac3 JX |
7858 | #, c-format |
7859 | msgid "cannot stat template '%s'" | |
7860 | msgstr "不能枚举模版 '%s' 状态" | |
7861 | ||
94550ed3 | 7862 | #: builtin/init-db.c:66 |
c04f5ac3 JX |
7863 | #, c-format |
7864 | msgid "cannot opendir '%s'" | |
7865 | msgstr "不能打开目录 '%s'" | |
7866 | ||
94550ed3 | 7867 | #: builtin/init-db.c:77 |
c04f5ac3 JX |
7868 | #, c-format |
7869 | msgid "cannot readlink '%s'" | |
7870 | msgstr "不能读取链接 '%s'" | |
7871 | ||
94550ed3 | 7872 | #: builtin/init-db.c:79 |
c04f5ac3 JX |
7873 | #, c-format |
7874 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 7875 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 7876 | |
94550ed3 | 7877 | #: builtin/init-db.c:85 |
c04f5ac3 JX |
7878 | #, c-format |
7879 | msgid "cannot copy '%s' to '%s'" | |
7880 | msgstr "不能拷贝 '%s' 至 '%s'" | |
7881 | ||
94550ed3 | 7882 | #: builtin/init-db.c:89 |
c04f5ac3 JX |
7883 | #, c-format |
7884 | msgid "ignoring template %s" | |
7885 | msgstr "忽略模版 %s" | |
7886 | ||
5b04ee3b | 7887 | #: builtin/init-db.c:120 |
c04f5ac3 JX |
7888 | #, c-format |
7889 | msgid "templates not found %s" | |
7890 | msgstr "模版未找到 %s" | |
7891 | ||
5b04ee3b | 7892 | #: builtin/init-db.c:135 |
c04f5ac3 | 7893 | #, c-format |
5b04ee3b JX |
7894 | msgid "not copying templates from '%s': %s" |
7895 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 7896 | |
5b04ee3b | 7897 | #: builtin/init-db.c:312 builtin/init-db.c:315 |
c04f5ac3 JX |
7898 | #, c-format |
7899 | msgid "%s already exists" | |
7900 | msgstr "%s 已经存在" | |
7901 | ||
5b04ee3b | 7902 | #: builtin/init-db.c:344 |
c04f5ac3 JX |
7903 | #, c-format |
7904 | msgid "unable to handle file type %d" | |
7905 | msgstr "不能处理 %d 类型的文件" | |
7906 | ||
5b04ee3b | 7907 | #: builtin/init-db.c:347 |
c04f5ac3 JX |
7908 | #, c-format |
7909 | msgid "unable to move %s to %s" | |
7910 | msgstr "不能移动 %s 至 %s" | |
7911 | ||
5c57d762 | 7912 | #: builtin/init-db.c:402 |
c04f5ac3 | 7913 | #, c-format |
5c57d762 JX |
7914 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
7915 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 7916 | |
5c57d762 JX |
7917 | #: builtin/init-db.c:403 |
7918 | #, c-format | |
7919 | msgid "Reinitialized existing Git repository in %s%s\n" | |
7920 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 7921 | |
5c57d762 JX |
7922 | #: builtin/init-db.c:407 |
7923 | #, c-format | |
7924 | msgid "Initialized empty shared Git repository in %s%s\n" | |
7925 | msgstr "初始化空的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 7926 | |
5c57d762 JX |
7927 | #: builtin/init-db.c:408 |
7928 | #, c-format | |
7929 | msgid "Initialized empty Git repository in %s%s\n" | |
7930 | msgstr "初始化空的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 7931 | |
5c57d762 | 7932 | #: builtin/init-db.c:455 |
ef317cd5 | 7933 | msgid "" |
a77c07d9 | 7934 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 7935 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 7936 | msgstr "" |
07432cef | 7937 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 7938 | "[<目录>]" |
ef317cd5 | 7939 | |
5c57d762 | 7940 | #: builtin/init-db.c:478 |
ef317cd5 | 7941 | msgid "permissions" |
07432cef | 7942 | msgstr "权限" |
ef317cd5 | 7943 | |
5c57d762 | 7944 | #: builtin/init-db.c:479 |
ef317cd5 | 7945 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 7946 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 7947 | |
5c57d762 | 7948 | #: builtin/init-db.c:513 builtin/init-db.c:518 |
c04f5ac3 JX |
7949 | #, c-format |
7950 | msgid "cannot mkdir %s" | |
7951 | msgstr "不能创建目录 %s" | |
7952 | ||
5c57d762 | 7953 | #: builtin/init-db.c:522 |
c04f5ac3 JX |
7954 | #, c-format |
7955 | msgid "cannot chdir to %s" | |
7956 | msgstr "不能切换目录到 %s" | |
7957 | ||
5c57d762 | 7958 | #: builtin/init-db.c:543 |
c04f5ac3 JX |
7959 | #, c-format |
7960 | msgid "" | |
7961 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
7962 | "dir=<directory>)" | |
1e607449 | 7963 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 7964 | |
5c57d762 | 7965 | #: builtin/init-db.c:571 |
c04f5ac3 JX |
7966 | #, c-format |
7967 | msgid "Cannot access work tree '%s'" | |
7968 | msgstr "不能访问工作区 '%s'" | |
7969 | ||
220c313c JX |
7970 | #: builtin/interpret-trailers.c:15 |
7971 | msgid "" | |
276ceeaa JX |
7972 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
7973 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
7974 | msgstr "" |
7975 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
7976 | ">])...] [<文件>...]" | |
276ceeaa JX |
7977 | |
7978 | #: builtin/interpret-trailers.c:26 | |
7979 | msgid "edit files in place" | |
7980 | msgstr "在原位编辑文件" | |
220c313c | 7981 | |
276ceeaa | 7982 | #: builtin/interpret-trailers.c:27 |
220c313c JX |
7983 | msgid "trim empty trailers" |
7984 | msgstr "删除空签名" | |
7985 | ||
276ceeaa | 7986 | #: builtin/interpret-trailers.c:28 |
220c313c JX |
7987 | msgid "trailer" |
7988 | msgstr "签名" | |
7989 | ||
276ceeaa | 7990 | #: builtin/interpret-trailers.c:29 |
220c313c JX |
7991 | msgid "trailer(s) to add" |
7992 | msgstr "要添加的签名" | |
7993 | ||
276ceeaa JX |
7994 | #: builtin/interpret-trailers.c:42 |
7995 | msgid "no input file given for in-place editing" | |
7996 | msgstr "没有给出要原位编辑的文件" | |
7997 | ||
5c57d762 | 7998 | #: builtin/log.c:44 |
7aea43ff | 7999 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 8000 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 8001 | |
5c57d762 | 8002 | #: builtin/log.c:45 |
814ff314 JX |
8003 | msgid "git show [<options>] <object>..." |
8004 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 8005 | |
5c57d762 | 8006 | #: builtin/log.c:84 |
220c313c JX |
8007 | #, c-format |
8008 | msgid "invalid --decorate option: %s" | |
8009 | msgstr "无效的 --decorate 选项:%s" | |
8010 | ||
5c57d762 | 8011 | #: builtin/log.c:139 |
ef317cd5 | 8012 | msgid "suppress diff output" |
07432cef | 8013 | msgstr "不显示差异输出" |
ef317cd5 | 8014 | |
5c57d762 | 8015 | #: builtin/log.c:140 |
ef317cd5 | 8016 | msgid "show source" |
07432cef | 8017 | msgstr "显示源" |
ef317cd5 | 8018 | |
5c57d762 | 8019 | #: builtin/log.c:141 |
07432cef WS |
8020 | msgid "Use mail map file" |
8021 | msgstr "使用邮件映射文件" | |
8022 | ||
5c57d762 | 8023 | #: builtin/log.c:142 |
ef317cd5 | 8024 | msgid "decorate options" |
07432cef | 8025 | msgstr "修饰选项" |
ef317cd5 | 8026 | |
5c57d762 | 8027 | #: builtin/log.c:145 |
220c313c JX |
8028 | msgid "Process line range n,m in file, counting from 1" |
8029 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
8030 | ||
5c57d762 | 8031 | #: builtin/log.c:241 |
c04f5ac3 JX |
8032 | #, c-format |
8033 | msgid "Final output: %d %s\n" | |
8034 | msgstr "最终输出:%d %s\n" | |
8035 | ||
5c57d762 | 8036 | #: builtin/log.c:486 |
220c313c JX |
8037 | #, c-format |
8038 | msgid "git show %s: bad file" | |
8039 | msgstr "git show %s: 损坏的文件" | |
8040 | ||
5c57d762 | 8041 | #: builtin/log.c:500 builtin/log.c:594 |
c04f5ac3 JX |
8042 | #, c-format |
8043 | msgid "Could not read object %s" | |
90e6ef53 | 8044 | msgstr "不能读取对象 %s" |
c04f5ac3 | 8045 | |
5c57d762 | 8046 | #: builtin/log.c:618 |
c04f5ac3 JX |
8047 | #, c-format |
8048 | msgid "Unknown type: %d" | |
8049 | msgstr "未知类型:%d" | |
8050 | ||
5c57d762 | 8051 | #: builtin/log.c:739 |
c04f5ac3 JX |
8052 | msgid "format.headers without value" |
8053 | msgstr "format.headers 没有值" | |
8054 | ||
5c57d762 | 8055 | #: builtin/log.c:839 |
c04f5ac3 JX |
8056 | msgid "name of output directory is too long" |
8057 | msgstr "输出目录名太长" | |
8058 | ||
5c57d762 | 8059 | #: builtin/log.c:854 |
c04f5ac3 JX |
8060 | #, c-format |
8061 | msgid "Cannot open patch file %s" | |
8062 | msgstr "无法打开补丁文件 %s" | |
8063 | ||
5c57d762 | 8064 | #: builtin/log.c:868 |
c04f5ac3 JX |
8065 | msgid "Need exactly one range." |
8066 | msgstr "只需要一个范围。" | |
8067 | ||
5c57d762 | 8068 | #: builtin/log.c:878 |
c04f5ac3 JX |
8069 | msgid "Not a range." |
8070 | msgstr "不是一个范围。" | |
8071 | ||
5c57d762 | 8072 | #: builtin/log.c:984 |
c04f5ac3 JX |
8073 | msgid "Cover letter needs email format" |
8074 | msgstr "信封需要邮件地址格式" | |
8075 | ||
5c57d762 | 8076 | #: builtin/log.c:1064 |
c04f5ac3 JX |
8077 | #, c-format |
8078 | msgid "insane in-reply-to: %s" | |
8079 | msgstr "不正常的 in-reply-to:%s" | |
8080 | ||
5c57d762 | 8081 | #: builtin/log.c:1092 |
814ff314 JX |
8082 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
8083 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 8084 | |
5c57d762 | 8085 | #: builtin/log.c:1137 |
c04f5ac3 JX |
8086 | msgid "Two output directories?" |
8087 | msgstr "两个输出目录?" | |
8088 | ||
5c57d762 | 8089 | #: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 |
5b04ee3b JX |
8090 | #, c-format |
8091 | msgid "Unknown commit %s" | |
8092 | msgstr "未知提交 %s" | |
8093 | ||
5c57d762 JX |
8094 | #: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 |
8095 | #: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 | |
8096 | #: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 | |
8097 | #: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 | |
5b04ee3b JX |
8098 | #, c-format |
8099 | msgid "Failed to resolve '%s' as a valid ref." | |
8100 | msgstr "无法解析 '%s' 为一个有效引用。" | |
8101 | ||
5c57d762 | 8102 | #: builtin/log.c:1259 |
5b04ee3b JX |
8103 | msgid "Could not find exact merge base." |
8104 | msgstr "不能找到准确的合并基线。" | |
8105 | ||
5c57d762 | 8106 | #: builtin/log.c:1263 |
5b04ee3b JX |
8107 | msgid "" |
8108 | "Failed to get upstream, if you want to record base commit automatically,\n" | |
8109 | "please use git branch --set-upstream-to to track a remote branch.\n" | |
8110 | "Or you could specify base commit by --base=<base-commit-id> manually." | |
8111 | msgstr "" | |
8112 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 8113 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
5b04ee3b JX |
8114 | "参数 --base=<base-commit-id> 手动指定一个基线提交。" |
8115 | ||
5c57d762 | 8116 | #: builtin/log.c:1283 |
5b04ee3b JX |
8117 | msgid "Failed to find exact merge base" |
8118 | msgstr "无法找到准确的合并基线" | |
8119 | ||
5c57d762 | 8120 | #: builtin/log.c:1294 |
5b04ee3b JX |
8121 | msgid "base commit should be the ancestor of revision list" |
8122 | msgstr "基线提交应该是版本列表的祖先" | |
8123 | ||
5c57d762 | 8124 | #: builtin/log.c:1298 |
5b04ee3b JX |
8125 | msgid "base commit shouldn't be in revision list" |
8126 | msgstr "基线提交不应该出现在版本列表中" | |
8127 | ||
5c57d762 | 8128 | #: builtin/log.c:1347 |
5b04ee3b | 8129 | msgid "cannot get patch id" |
aef18cc6 | 8130 | msgstr "无法得到补丁 id" |
5b04ee3b | 8131 | |
5c57d762 | 8132 | #: builtin/log.c:1404 |
ef317cd5 | 8133 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 8134 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 8135 | |
5c57d762 | 8136 | #: builtin/log.c:1407 |
ef317cd5 | 8137 | msgid "use [PATCH] even with multiple patches" |
07432cef | 8138 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 8139 | |
5c57d762 | 8140 | #: builtin/log.c:1411 |
ef317cd5 | 8141 | msgid "print patches to standard out" |
07432cef | 8142 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 8143 | |
5c57d762 | 8144 | #: builtin/log.c:1413 |
ef317cd5 | 8145 | msgid "generate a cover letter" |
07432cef | 8146 | msgstr "生成一封附信" |
c04f5ac3 | 8147 | |
5c57d762 | 8148 | #: builtin/log.c:1415 |
ef317cd5 | 8149 | msgid "use simple number sequence for output file names" |
07432cef | 8150 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 8151 | |
5c57d762 | 8152 | #: builtin/log.c:1416 |
ef317cd5 | 8153 | msgid "sfx" |
07432cef | 8154 | msgstr "后缀" |
ef317cd5 | 8155 | |
5c57d762 | 8156 | #: builtin/log.c:1417 |
ef317cd5 | 8157 | msgid "use <sfx> instead of '.patch'" |
07432cef | 8158 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 8159 | |
5c57d762 | 8160 | #: builtin/log.c:1419 |
ef317cd5 | 8161 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
8162 | msgstr "补丁以 <n> 开始编号,而不是1" |
8163 | ||
5c57d762 | 8164 | #: builtin/log.c:1421 |
07432cef WS |
8165 | msgid "mark the series as Nth re-roll" |
8166 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 8167 | |
5c57d762 | 8168 | #: builtin/log.c:1423 |
ef317cd5 | 8169 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 8170 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 8171 | |
5c57d762 | 8172 | #: builtin/log.c:1426 |
ef317cd5 | 8173 | msgid "store resulting files in <dir>" |
d9d56b23 | 8174 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 8175 | |
5c57d762 | 8176 | #: builtin/log.c:1429 |
ef317cd5 | 8177 | msgid "don't strip/add [PATCH]" |
07432cef | 8178 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 8179 | |
5c57d762 | 8180 | #: builtin/log.c:1432 |
ef317cd5 | 8181 | msgid "don't output binary diffs" |
07432cef | 8182 | msgstr "不输出二进制差异" |
ef317cd5 | 8183 | |
5c57d762 | 8184 | #: builtin/log.c:1434 |
89f80d72 JX |
8185 | msgid "output all-zero hash in From header" |
8186 | msgstr "在 From 头信息中输出全为零的哈希值" | |
8187 | ||
5c57d762 | 8188 | #: builtin/log.c:1436 |
ef317cd5 | 8189 | msgid "don't include a patch matching a commit upstream" |
07432cef | 8190 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 8191 | |
5c57d762 | 8192 | #: builtin/log.c:1438 |
ef317cd5 | 8193 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 8194 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 8195 | |
5c57d762 | 8196 | #: builtin/log.c:1440 |
ef317cd5 | 8197 | msgid "Messaging" |
07432cef | 8198 | msgstr "邮件发送" |
ef317cd5 | 8199 | |
5c57d762 | 8200 | #: builtin/log.c:1441 |
ef317cd5 | 8201 | msgid "header" |
07432cef | 8202 | msgstr "header" |
ef317cd5 | 8203 | |
5c57d762 | 8204 | #: builtin/log.c:1442 |
ef317cd5 | 8205 | msgid "add email header" |
07432cef | 8206 | msgstr "添加邮件头" |
ef317cd5 | 8207 | |
5c57d762 | 8208 | #: builtin/log.c:1443 builtin/log.c:1445 |
ef317cd5 | 8209 | msgid "email" |
07432cef | 8210 | msgstr "邮件地址" |
ef317cd5 | 8211 | |
5c57d762 | 8212 | #: builtin/log.c:1443 |
ef317cd5 | 8213 | msgid "add To: header" |
07432cef | 8214 | msgstr "添加收件人" |
ef317cd5 | 8215 | |
5c57d762 | 8216 | #: builtin/log.c:1445 |
ef317cd5 | 8217 | msgid "add Cc: header" |
07432cef | 8218 | msgstr "添加抄送" |
ef317cd5 | 8219 | |
5c57d762 | 8220 | #: builtin/log.c:1447 |
2e8451e8 | 8221 | msgid "ident" |
d9d56b23 | 8222 | msgstr "标识" |
2e8451e8 | 8223 | |
5c57d762 | 8224 | #: builtin/log.c:1448 |
2e8451e8 | 8225 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 8226 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 8227 | |
5c57d762 | 8228 | #: builtin/log.c:1450 |
ef317cd5 | 8229 | msgid "message-id" |
d9d56b23 | 8230 | msgstr "邮件标识" |
ef317cd5 | 8231 | |
5c57d762 | 8232 | #: builtin/log.c:1451 |
ef317cd5 | 8233 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 8234 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 8235 | |
5c57d762 | 8236 | #: builtin/log.c:1452 builtin/log.c:1455 |
ef317cd5 | 8237 | msgid "boundary" |
07432cef | 8238 | msgstr "边界" |
ef317cd5 | 8239 | |
5c57d762 | 8240 | #: builtin/log.c:1453 |
ef317cd5 | 8241 | msgid "attach the patch" |
07432cef | 8242 | msgstr "附件方式添加补丁" |
ef317cd5 | 8243 | |
5c57d762 | 8244 | #: builtin/log.c:1456 |
ef317cd5 | 8245 | msgid "inline the patch" |
07432cef | 8246 | msgstr "内联显示补丁" |
ef317cd5 | 8247 | |
5c57d762 | 8248 | #: builtin/log.c:1460 |
ef317cd5 | 8249 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 8250 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 8251 | |
5c57d762 | 8252 | #: builtin/log.c:1462 |
ef317cd5 | 8253 | msgid "signature" |
07432cef | 8254 | msgstr "签名" |
ef317cd5 | 8255 | |
5c57d762 | 8256 | #: builtin/log.c:1463 |
ef317cd5 | 8257 | msgid "add a signature" |
07432cef | 8258 | msgstr "添加一个签名" |
ef317cd5 | 8259 | |
5c57d762 | 8260 | #: builtin/log.c:1464 |
5b04ee3b JX |
8261 | msgid "base-commit" |
8262 | msgstr "基线提交" | |
8263 | ||
5c57d762 | 8264 | #: builtin/log.c:1465 |
5b04ee3b JX |
8265 | msgid "add prerequisite tree info to the patch series" |
8266 | msgstr "为补丁列表添加前置树信息" | |
8267 | ||
5c57d762 | 8268 | #: builtin/log.c:1467 |
6acbf033 JX |
8269 | msgid "add a signature from a file" |
8270 | msgstr "从文件添加一个签名" | |
8271 | ||
5c57d762 | 8272 | #: builtin/log.c:1468 |
ef317cd5 | 8273 | msgid "don't print the patch filenames" |
07432cef | 8274 | msgstr "不要打印补丁文件名" |
ef317cd5 | 8275 | |
5c57d762 | 8276 | #: builtin/log.c:1558 |
c04f5ac3 JX |
8277 | msgid "-n and -k are mutually exclusive." |
8278 | msgstr "-n 和 -k 互斥。" | |
8279 | ||
5c57d762 | 8280 | #: builtin/log.c:1560 |
c04f5ac3 JX |
8281 | msgid "--subject-prefix and -k are mutually exclusive." |
8282 | msgstr "--subject-prefix 和 -k 互斥。" | |
8283 | ||
5c57d762 | 8284 | #: builtin/log.c:1568 |
c04f5ac3 JX |
8285 | msgid "--name-only does not make sense" |
8286 | msgstr "--name-only 无意义" | |
8287 | ||
5c57d762 | 8288 | #: builtin/log.c:1570 |
c04f5ac3 JX |
8289 | msgid "--name-status does not make sense" |
8290 | msgstr "--name-status 无意义" | |
8291 | ||
5c57d762 | 8292 | #: builtin/log.c:1572 |
c04f5ac3 JX |
8293 | msgid "--check does not make sense" |
8294 | msgstr "--check 无意义" | |
8295 | ||
5c57d762 | 8296 | #: builtin/log.c:1602 |
c04f5ac3 JX |
8297 | msgid "standard output, or directory, which one?" |
8298 | msgstr "标准输出或目录,哪一个?" | |
8299 | ||
5c57d762 | 8300 | #: builtin/log.c:1604 |
c04f5ac3 JX |
8301 | #, c-format |
8302 | msgid "Could not create directory '%s'" | |
90e6ef53 | 8303 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 8304 | |
5c57d762 | 8305 | #: builtin/log.c:1698 |
6acbf033 JX |
8306 | #, c-format |
8307 | msgid "unable to read signature file '%s'" | |
8308 | msgstr "无法读取签名文件 '%s'" | |
8309 | ||
5c57d762 | 8310 | #: builtin/log.c:1769 |
c04f5ac3 JX |
8311 | msgid "Failed to create output files" |
8312 | msgstr "无法创建输出文件" | |
8313 | ||
5c57d762 | 8314 | #: builtin/log.c:1818 |
ef317cd5 | 8315 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 8316 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 8317 | |
5c57d762 | 8318 | #: builtin/log.c:1872 |
c04f5ac3 JX |
8319 | #, c-format |
8320 | msgid "" | |
8321 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 8322 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 8323 | |
5c57d762 | 8324 | #: builtin/ls-files.c:379 |
814ff314 JX |
8325 | msgid "git ls-files [<options>] [<file>...]" |
8326 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 8327 | |
5c57d762 | 8328 | #: builtin/ls-files.c:428 |
ef317cd5 | 8329 | msgid "identify the file status with tags" |
07432cef | 8330 | msgstr "用标签标识文件的状态" |
ef317cd5 | 8331 | |
5c57d762 | 8332 | #: builtin/ls-files.c:430 |
ef317cd5 | 8333 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 8334 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 8335 | |
5c57d762 | 8336 | #: builtin/ls-files.c:432 |
ef317cd5 | 8337 | msgid "show cached files in the output (default)" |
07432cef | 8338 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 8339 | |
5c57d762 | 8340 | #: builtin/ls-files.c:434 |
ef317cd5 | 8341 | msgid "show deleted files in the output" |
07432cef | 8342 | msgstr "显示已删除的文件" |
ef317cd5 | 8343 | |
5c57d762 | 8344 | #: builtin/ls-files.c:436 |
ef317cd5 | 8345 | msgid "show modified files in the output" |
07432cef | 8346 | msgstr "显示已修改的文件" |
ef317cd5 | 8347 | |
5c57d762 | 8348 | #: builtin/ls-files.c:438 |
ef317cd5 | 8349 | msgid "show other files in the output" |
07432cef | 8350 | msgstr "显示其它文件" |
ef317cd5 | 8351 | |
5c57d762 | 8352 | #: builtin/ls-files.c:440 |
ef317cd5 | 8353 | msgid "show ignored files in the output" |
07432cef | 8354 | msgstr "显示忽略的文件" |
ef317cd5 | 8355 | |
5c57d762 | 8356 | #: builtin/ls-files.c:443 |
ef317cd5 | 8357 | msgid "show staged contents' object name in the output" |
07432cef | 8358 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 8359 | |
5c57d762 | 8360 | #: builtin/ls-files.c:445 |
ef317cd5 | 8361 | msgid "show files on the filesystem that need to be removed" |
07432cef | 8362 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 8363 | |
5c57d762 | 8364 | #: builtin/ls-files.c:447 |
220c313c | 8365 | msgid "show 'other' directories' names only" |
07432cef | 8366 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 8367 | |
5c57d762 | 8368 | #: builtin/ls-files.c:449 |
276ceeaa JX |
8369 | msgid "show line endings of files" |
8370 | msgstr "显示文件换行符格式" | |
8371 | ||
5c57d762 | 8372 | #: builtin/ls-files.c:451 |
ef317cd5 | 8373 | msgid "don't show empty directories" |
07432cef | 8374 | msgstr "不显示空目录" |
ef317cd5 | 8375 | |
5c57d762 | 8376 | #: builtin/ls-files.c:454 |
ef317cd5 | 8377 | msgid "show unmerged files in the output" |
07432cef | 8378 | msgstr "显示未合并的文件" |
ef317cd5 | 8379 | |
5c57d762 | 8380 | #: builtin/ls-files.c:456 |
ef317cd5 | 8381 | msgid "show resolve-undo information" |
07432cef | 8382 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 8383 | |
5c57d762 | 8384 | #: builtin/ls-files.c:458 |
ef317cd5 | 8385 | msgid "skip files matching pattern" |
07432cef | 8386 | msgstr "匹配排除文件的模式" |
ef317cd5 | 8387 | |
5c57d762 | 8388 | #: builtin/ls-files.c:461 |
ef317cd5 | 8389 | msgid "exclude patterns are read from <file>" |
07432cef | 8390 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 8391 | |
5c57d762 | 8392 | #: builtin/ls-files.c:464 |
ef317cd5 | 8393 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 8394 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 8395 | |
5c57d762 | 8396 | #: builtin/ls-files.c:466 |
ef317cd5 | 8397 | msgid "add the standard git exclusions" |
07432cef | 8398 | msgstr "添加标准的 git 排除" |
ef317cd5 | 8399 | |
5c57d762 | 8400 | #: builtin/ls-files.c:469 |
ef317cd5 | 8401 | msgid "make the output relative to the project top directory" |
07432cef | 8402 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 8403 | |
5c57d762 | 8404 | #: builtin/ls-files.c:472 |
ef317cd5 | 8405 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 8406 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 8407 | |
5c57d762 | 8408 | #: builtin/ls-files.c:473 |
ef317cd5 | 8409 | msgid "tree-ish" |
07432cef | 8410 | msgstr "树或提交" |
ef317cd5 | 8411 | |
5c57d762 | 8412 | #: builtin/ls-files.c:474 |
ef317cd5 | 8413 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 8414 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 8415 | |
5c57d762 | 8416 | #: builtin/ls-files.c:476 |
ef317cd5 | 8417 | msgid "show debugging data" |
07432cef | 8418 | msgstr "显示调试数据" |
ef317cd5 | 8419 | |
276ceeaa JX |
8420 | #: builtin/ls-remote.c:7 |
8421 | msgid "" | |
8422 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
8423 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
8424 | " [--symref] [<repository> [<refs>...]]" | |
8425 | msgstr "" | |
8426 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
8427 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
8428 | " [--symref] [<仓库> [<引用>...]]" | |
8429 | ||
8430 | #: builtin/ls-remote.c:50 | |
8431 | msgid "do not print remote URL" | |
8432 | msgstr "不打印远程 URL" | |
8433 | ||
8434 | #: builtin/ls-remote.c:51 builtin/ls-remote.c:53 | |
8435 | msgid "exec" | |
8436 | msgstr "exec" | |
8437 | ||
8438 | #: builtin/ls-remote.c:52 builtin/ls-remote.c:54 | |
8439 | msgid "path of git-upload-pack on the remote host" | |
8440 | msgstr "远程主机上的 git-upload-pack 路径" | |
8441 | ||
8442 | #: builtin/ls-remote.c:56 | |
8443 | msgid "limit to tags" | |
8444 | msgstr "仅限于标签" | |
8445 | ||
8446 | #: builtin/ls-remote.c:57 | |
8447 | msgid "limit to heads" | |
8448 | msgstr "仅限于分支" | |
8449 | ||
8450 | #: builtin/ls-remote.c:58 | |
8451 | msgid "do not show peeled tags" | |
8452 | msgstr "不显示已解析的标签" | |
8453 | ||
8454 | #: builtin/ls-remote.c:60 | |
8455 | msgid "take url.<base>.insteadOf into account" | |
8456 | msgstr "参考 url.<base>.insteadOf 设置" | |
8457 | ||
8458 | #: builtin/ls-remote.c:62 | |
8459 | msgid "exit with exit code 2 if no matching refs are found" | |
8460 | msgstr "若未找到匹配的引用则以退出码2退出" | |
8461 | ||
8462 | #: builtin/ls-remote.c:64 | |
8463 | msgid "show underlying ref in addition to the object pointed by it" | |
8464 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
8465 | ||
90314792 | 8466 | #: builtin/ls-tree.c:28 |
ef317cd5 | 8467 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 8468 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 8469 | |
94550ed3 | 8470 | #: builtin/ls-tree.c:128 |
ef317cd5 | 8471 | msgid "only show trees" |
07432cef | 8472 | msgstr "只显示树" |
ef317cd5 | 8473 | |
94550ed3 | 8474 | #: builtin/ls-tree.c:130 |
ef317cd5 | 8475 | msgid "recurse into subtrees" |
07432cef | 8476 | msgstr "递归到子树" |
ef317cd5 | 8477 | |
94550ed3 | 8478 | #: builtin/ls-tree.c:132 |
ef317cd5 | 8479 | msgid "show trees when recursing" |
07432cef | 8480 | msgstr "当递归时显示树" |
ef317cd5 | 8481 | |
94550ed3 | 8482 | #: builtin/ls-tree.c:135 |
ef317cd5 | 8483 | msgid "terminate entries with NUL byte" |
4375c10e | 8484 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 8485 | |
94550ed3 | 8486 | #: builtin/ls-tree.c:136 |
ef317cd5 | 8487 | msgid "include object size" |
07432cef | 8488 | msgstr "包括对象大小" |
ef317cd5 | 8489 | |
94550ed3 | 8490 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 8491 | msgid "list only filenames" |
07432cef | 8492 | msgstr "只列出文件名" |
ef317cd5 | 8493 | |
94550ed3 | 8494 | #: builtin/ls-tree.c:143 |
ef317cd5 | 8495 | msgid "use full path names" |
07432cef | 8496 | msgstr "使用文件的全路径" |
ef317cd5 | 8497 | |
94550ed3 | 8498 | #: builtin/ls-tree.c:145 |
ef317cd5 | 8499 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 8500 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 8501 | |
5c57d762 | 8502 | #: builtin/merge.c:46 |
814ff314 JX |
8503 | msgid "git merge [<options>] [<commit>...]" |
8504 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 8505 | |
5c57d762 | 8506 | #: builtin/merge.c:47 |
814ff314 JX |
8507 | msgid "git merge [<options>] <msg> HEAD <commit>" |
8508 | msgstr "git merge [<选项>] <说明> HEAD <提交>" | |
ef317cd5 | 8509 | |
5c57d762 | 8510 | #: builtin/merge.c:48 |
ef317cd5 | 8511 | msgid "git merge --abort" |
07432cef | 8512 | msgstr "git merge --abort" |
ef317cd5 | 8513 | |
5c57d762 | 8514 | #: builtin/merge.c:102 |
c04f5ac3 JX |
8515 | msgid "switch `m' requires a value" |
8516 | msgstr "开关 `m' 需要一个值" | |
8517 | ||
5c57d762 | 8518 | #: builtin/merge.c:139 |
c04f5ac3 JX |
8519 | #, c-format |
8520 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 8521 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 8522 | |
5c57d762 | 8523 | #: builtin/merge.c:140 |
c04f5ac3 JX |
8524 | #, c-format |
8525 | msgid "Available strategies are:" | |
8526 | msgstr "可用的策略有:" | |
8527 | ||
5c57d762 | 8528 | #: builtin/merge.c:145 |
c04f5ac3 JX |
8529 | #, c-format |
8530 | msgid "Available custom strategies are:" | |
8531 | msgstr "可用的自定义策略有:" | |
8532 | ||
5c57d762 | 8533 | #: builtin/merge.c:195 builtin/pull.c:126 |
ef317cd5 | 8534 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 8535 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 8536 | |
5c57d762 | 8537 | #: builtin/merge.c:198 builtin/pull.c:129 |
ef317cd5 | 8538 | msgid "show a diffstat at the end of the merge" |
07432cef | 8539 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 8540 | |
5c57d762 | 8541 | #: builtin/merge.c:199 builtin/pull.c:132 |
ef317cd5 | 8542 | msgid "(synonym to --stat)" |
07432cef | 8543 | msgstr "(和 --stat 同义)" |
ef317cd5 | 8544 | |
5c57d762 | 8545 | #: builtin/merge.c:201 builtin/pull.c:135 |
ef317cd5 | 8546 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 8547 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 8548 | |
5c57d762 | 8549 | #: builtin/merge.c:204 builtin/pull.c:138 |
ef317cd5 | 8550 | msgid "create a single commit instead of doing a merge" |
07432cef | 8551 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 8552 | |
5c57d762 | 8553 | #: builtin/merge.c:206 builtin/pull.c:141 |
ef317cd5 | 8554 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 8555 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 8556 | |
5c57d762 | 8557 | #: builtin/merge.c:208 builtin/pull.c:144 |
ef317cd5 | 8558 | msgid "edit message before committing" |
07432cef | 8559 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 8560 | |
5c57d762 | 8561 | #: builtin/merge.c:209 |
ef317cd5 | 8562 | msgid "allow fast-forward (default)" |
07432cef | 8563 | msgstr "允许快进(默认)" |
ef317cd5 | 8564 | |
5c57d762 | 8565 | #: builtin/merge.c:211 builtin/pull.c:150 |
ef317cd5 | 8566 | msgid "abort if fast-forward is not possible" |
07432cef | 8567 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 8568 | |
5c57d762 JX |
8569 | #: builtin/merge.c:215 builtin/pull.c:153 |
8570 | msgid "verify that the named commit has a valid GPG signature" | |
1003b3a5 JX |
8571 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
8572 | ||
5c57d762 | 8573 | #: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 |
1b7f4a34 | 8574 | #: builtin/revert.c:89 |
ef317cd5 | 8575 | msgid "strategy" |
07432cef | 8576 | msgstr "策略" |
ef317cd5 | 8577 | |
5c57d762 | 8578 | #: builtin/merge.c:217 builtin/pull.c:158 |
ef317cd5 | 8579 | msgid "merge strategy to use" |
07432cef | 8580 | msgstr "要使用的合并策略" |
ef317cd5 | 8581 | |
5c57d762 | 8582 | #: builtin/merge.c:218 builtin/pull.c:161 |
ef317cd5 | 8583 | msgid "option=value" |
07432cef | 8584 | msgstr "option=value" |
ef317cd5 | 8585 | |
5c57d762 | 8586 | #: builtin/merge.c:219 builtin/pull.c:162 |
ef317cd5 | 8587 | msgid "option for selected merge strategy" |
07432cef | 8588 | msgstr "所选的合并策略的选项" |
ef317cd5 | 8589 | |
5c57d762 | 8590 | #: builtin/merge.c:221 |
ef317cd5 | 8591 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 8592 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 8593 | |
5c57d762 | 8594 | #: builtin/merge.c:225 |
ef317cd5 | 8595 | msgid "abort the current in-progress merge" |
07432cef | 8596 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 8597 | |
5c57d762 | 8598 | #: builtin/merge.c:227 builtin/pull.c:169 |
5b04ee3b JX |
8599 | msgid "allow merging unrelated histories" |
8600 | msgstr "允许合并不相关的历史" | |
8601 | ||
5c57d762 | 8602 | #: builtin/merge.c:255 |
c04f5ac3 JX |
8603 | msgid "could not run stash." |
8604 | msgstr "不能进行进度保存。" | |
8605 | ||
5c57d762 | 8606 | #: builtin/merge.c:260 |
c04f5ac3 JX |
8607 | msgid "stash failed" |
8608 | msgstr "进度保存失败" | |
8609 | ||
5c57d762 | 8610 | #: builtin/merge.c:265 |
c04f5ac3 JX |
8611 | #, c-format |
8612 | msgid "not a valid object: %s" | |
8613 | msgstr "不是一个有效对象:%s" | |
8614 | ||
5c57d762 | 8615 | #: builtin/merge.c:284 builtin/merge.c:301 |
c04f5ac3 JX |
8616 | msgid "read-tree failed" |
8617 | msgstr "读取树失败" | |
8618 | ||
90e6ef53 | 8619 | # 译者:注意保持前导空格 |
5c57d762 | 8620 | #: builtin/merge.c:331 |
c04f5ac3 JX |
8621 | msgid " (nothing to squash)" |
8622 | msgstr " (无可压缩)" | |
8623 | ||
5c57d762 | 8624 | #: builtin/merge.c:342 |
c04f5ac3 JX |
8625 | #, c-format |
8626 | msgid "Squash commit -- not updating HEAD\n" | |
8627 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
8628 | ||
5c57d762 | 8629 | #: builtin/merge.c:392 |
c04f5ac3 JX |
8630 | #, c-format |
8631 | msgid "No merge message -- not updating HEAD\n" | |
8632 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
8633 | ||
5c57d762 | 8634 | #: builtin/merge.c:443 |
c04f5ac3 JX |
8635 | #, c-format |
8636 | msgid "'%s' does not point to a commit" | |
8637 | msgstr "'%s' 没有指向一个提交" | |
8638 | ||
5c57d762 | 8639 | #: builtin/merge.c:533 |
c04f5ac3 JX |
8640 | #, c-format |
8641 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 8642 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 8643 | |
5c57d762 | 8644 | #: builtin/merge.c:652 |
c04f5ac3 JX |
8645 | msgid "Not handling anything other than two heads merge." |
8646 | msgstr "不能处理两个头合并之外的任何操作。" | |
8647 | ||
5c57d762 | 8648 | #: builtin/merge.c:666 |
c04f5ac3 JX |
8649 | #, c-format |
8650 | msgid "Unknown option for merge-recursive: -X%s" | |
8651 | msgstr "merge-recursive 的未知选项:-X%s" | |
8652 | ||
5c57d762 | 8653 | #: builtin/merge.c:681 |
c04f5ac3 JX |
8654 | #, c-format |
8655 | msgid "unable to write %s" | |
8656 | msgstr "不能写 %s" | |
8657 | ||
5c57d762 | 8658 | #: builtin/merge.c:733 |
c04f5ac3 JX |
8659 | #, c-format |
8660 | msgid "Could not read from '%s'" | |
8661 | msgstr "不能从 '%s' 读取" | |
8662 | ||
5c57d762 | 8663 | #: builtin/merge.c:742 |
c04f5ac3 JX |
8664 | #, c-format |
8665 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
8666 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
8667 | ||
5c57d762 | 8668 | #: builtin/merge.c:748 |
a77c07d9 | 8669 | #, c-format |
c04f5ac3 JX |
8670 | msgid "" |
8671 | "Please enter a commit message to explain why this merge is necessary,\n" | |
8672 | "especially if it merges an updated upstream into a topic branch.\n" | |
8673 | "\n" | |
a77c07d9 | 8674 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
8675 | "the commit.\n" |
8676 | msgstr "" | |
8677 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
8678 | "合并到主题分支。\n" | |
8679 | "\n" | |
a77c07d9 | 8680 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 8681 | |
5c57d762 | 8682 | #: builtin/merge.c:772 |
c04f5ac3 JX |
8683 | msgid "Empty commit message." |
8684 | msgstr "空提交信息。" | |
8685 | ||
5c57d762 | 8686 | #: builtin/merge.c:792 |
c04f5ac3 JX |
8687 | #, c-format |
8688 | msgid "Wonderful.\n" | |
8689 | msgstr "太棒了。\n" | |
8690 | ||
5c57d762 | 8691 | #: builtin/merge.c:847 |
c04f5ac3 JX |
8692 | #, c-format |
8693 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
8694 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
8695 | ||
5c57d762 | 8696 | #: builtin/merge.c:863 |
c04f5ac3 JX |
8697 | #, c-format |
8698 | msgid "'%s' is not a commit" | |
8699 | msgstr "'%s' 不是一个提交" | |
8700 | ||
5c57d762 | 8701 | #: builtin/merge.c:904 |
c04f5ac3 | 8702 | msgid "No current branch." |
90e6ef53 | 8703 | msgstr "没有当前分支。" |
c04f5ac3 | 8704 | |
5c57d762 | 8705 | #: builtin/merge.c:906 |
c04f5ac3 | 8706 | msgid "No remote for the current branch." |
160fb2b2 | 8707 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 8708 | |
5c57d762 | 8709 | #: builtin/merge.c:908 |
c04f5ac3 | 8710 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 8711 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 8712 | |
5c57d762 | 8713 | #: builtin/merge.c:913 |
170e9899 | 8714 | #, c-format |
2e8451e8 JX |
8715 | msgid "No remote-tracking branch for %s from %s" |
8716 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 8717 | |
5c57d762 JX |
8718 | #: builtin/merge.c:960 |
8719 | #, c-format | |
8720 | msgid "Bad value '%s' in environment '%s'" | |
8721 | msgstr "环境 '%2$s' 坏的取值 '%1$s'" | |
8722 | ||
8723 | #: builtin/merge.c:1034 | |
7aea43ff JX |
8724 | #, c-format |
8725 | msgid "could not close '%s'" | |
8726 | msgstr "不能关闭 '%s'" | |
8727 | ||
5c57d762 JX |
8728 | #: builtin/merge.c:1061 |
8729 | #, c-format | |
8730 | msgid "not something we can merge in %s: %s" | |
8731 | msgstr "不能在 %s 中合并:%s" | |
8732 | ||
8733 | #: builtin/merge.c:1095 | |
8734 | msgid "not something we can merge" | |
8735 | msgstr "不能合并" | |
8736 | ||
8737 | #: builtin/merge.c:1162 | |
c04f5ac3 | 8738 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 8739 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 8740 | |
5c57d762 | 8741 | #: builtin/merge.c:1178 |
c04f5ac3 JX |
8742 | msgid "" |
8743 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 8744 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
8745 | msgstr "" |
8746 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 8747 | "请在合并前先提交您的修改。" |
c04f5ac3 | 8748 | |
5c57d762 | 8749 | #: builtin/merge.c:1185 |
c04f5ac3 JX |
8750 | msgid "" |
8751 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 8752 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
8753 | msgstr "" |
8754 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 8755 | "请在合并前先提交您的修改。" |
c04f5ac3 | 8756 | |
5c57d762 | 8757 | #: builtin/merge.c:1188 |
c04f5ac3 JX |
8758 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
8759 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
8760 | ||
5c57d762 | 8761 | #: builtin/merge.c:1197 |
c04f5ac3 | 8762 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 8763 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 8764 | |
5c57d762 | 8765 | #: builtin/merge.c:1205 |
c04f5ac3 | 8766 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 8767 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 8768 | |
5c57d762 | 8769 | #: builtin/merge.c:1222 |
c04f5ac3 JX |
8770 | msgid "Squash commit into empty head not supported yet" |
8771 | msgstr "尚不支持到空分支的压缩提交" | |
8772 | ||
5c57d762 | 8773 | #: builtin/merge.c:1224 |
c04f5ac3 JX |
8774 | msgid "Non-fast-forward commit does not make sense into an empty head" |
8775 | msgstr "到空分支的非快进式提交没有意义" | |
8776 | ||
5c57d762 | 8777 | #: builtin/merge.c:1229 |
2e8451e8 JX |
8778 | #, c-format |
8779 | msgid "%s - not something we can merge" | |
8780 | msgstr "%s - 不能被合并" | |
8781 | ||
5c57d762 | 8782 | #: builtin/merge.c:1231 |
7aea43ff JX |
8783 | msgid "Can merge only exactly one commit into empty head" |
8784 | msgstr "只能将一个提交合并到空分支上" | |
8785 | ||
5c57d762 | 8786 | #: builtin/merge.c:1287 |
1003b3a5 JX |
8787 | #, c-format |
8788 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
8789 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
8790 | ||
5c57d762 | 8791 | #: builtin/merge.c:1290 |
1003b3a5 JX |
8792 | #, c-format |
8793 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
8794 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
8795 | ||
5c57d762 | 8796 | #: builtin/merge.c:1293 |
1003b3a5 JX |
8797 | #, c-format |
8798 | msgid "Commit %s does not have a GPG signature." | |
8799 | msgstr "提交 %s 没有一个 GPG 签名。" | |
8800 | ||
5c57d762 | 8801 | #: builtin/merge.c:1296 |
1003b3a5 JX |
8802 | #, c-format |
8803 | msgid "Commit %s has a good GPG signature by %s\n" | |
8804 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
8805 | ||
5c57d762 | 8806 | #: builtin/merge.c:1358 |
5b04ee3b JX |
8807 | msgid "refusing to merge unrelated histories" |
8808 | msgstr "拒绝合并无关的历史" | |
8809 | ||
5c57d762 JX |
8810 | #: builtin/merge.c:1367 |
8811 | msgid "Already up-to-date." | |
8812 | msgstr "已经是最新的。" | |
8813 | ||
8814 | #: builtin/merge.c:1382 | |
c04f5ac3 JX |
8815 | #, c-format |
8816 | msgid "Updating %s..%s\n" | |
8817 | msgstr "更新 %s..%s\n" | |
8818 | ||
5c57d762 | 8819 | #: builtin/merge.c:1419 |
c04f5ac3 JX |
8820 | #, c-format |
8821 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 8822 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 8823 | |
5c57d762 | 8824 | #: builtin/merge.c:1426 |
c04f5ac3 JX |
8825 | #, c-format |
8826 | msgid "Nope.\n" | |
8827 | msgstr "无。\n" | |
8828 | ||
5c57d762 JX |
8829 | #: builtin/merge.c:1451 |
8830 | msgid "Already up-to-date. Yeeah!" | |
8831 | msgstr "已经是最新的。耶!" | |
8832 | ||
8833 | #: builtin/merge.c:1457 | |
c04f5ac3 | 8834 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 8835 | msgstr "无法快进,终止。" |
c04f5ac3 | 8836 | |
5c57d762 | 8837 | #: builtin/merge.c:1480 builtin/merge.c:1559 |
c04f5ac3 JX |
8838 | #, c-format |
8839 | msgid "Rewinding the tree to pristine...\n" | |
8840 | msgstr "将树回滚至原始状态...\n" | |
8841 | ||
5c57d762 | 8842 | #: builtin/merge.c:1484 |
c04f5ac3 JX |
8843 | #, c-format |
8844 | msgid "Trying merge strategy %s...\n" | |
8845 | msgstr "尝试合并策略 %s...\n" | |
8846 | ||
5c57d762 | 8847 | #: builtin/merge.c:1550 |
c04f5ac3 JX |
8848 | #, c-format |
8849 | msgid "No merge strategy handled the merge.\n" | |
8850 | msgstr "没有合并策略处理此合并。\n" | |
8851 | ||
5c57d762 | 8852 | #: builtin/merge.c:1552 |
c04f5ac3 JX |
8853 | #, c-format |
8854 | msgid "Merge with strategy %s failed.\n" | |
8855 | msgstr "使用策略 %s 合并失败。\n" | |
8856 | ||
5c57d762 | 8857 | #: builtin/merge.c:1561 |
c04f5ac3 JX |
8858 | #, c-format |
8859 | msgid "Using the %s to prepare resolving by hand.\n" | |
8860 | msgstr "使用 %s 以准备手工解决。\n" | |
8861 | ||
5c57d762 | 8862 | #: builtin/merge.c:1573 |
c04f5ac3 JX |
8863 | #, c-format |
8864 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
8865 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
8866 | ||
cfff71a9 | 8867 | #: builtin/merge-base.c:29 |
814ff314 JX |
8868 | msgid "git merge-base [-a | --all] <commit> <commit>..." |
8869 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
ef317cd5 | 8870 | |
cfff71a9 | 8871 | #: builtin/merge-base.c:30 |
814ff314 JX |
8872 | msgid "git merge-base [-a | --all] --octopus <commit>..." |
8873 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
ef317cd5 | 8874 | |
cfff71a9 | 8875 | #: builtin/merge-base.c:31 |
ef317cd5 | 8876 | msgid "git merge-base --independent <commit>..." |
07432cef | 8877 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 | 8878 | |
cfff71a9 | 8879 | #: builtin/merge-base.c:32 |
ef317cd5 | 8880 | msgid "git merge-base --is-ancestor <commit> <commit>" |
07432cef | 8881 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 | 8882 | |
cfff71a9 JX |
8883 | #: builtin/merge-base.c:33 |
8884 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
d9d56b23 | 8885 | msgstr "git merge-base --fork-point <引用> [<提交>]" |
cfff71a9 JX |
8886 | |
8887 | #: builtin/merge-base.c:214 | |
ef317cd5 | 8888 | msgid "output all common ancestors" |
07432cef | 8889 | msgstr "输出所有共同的祖先" |
ef317cd5 | 8890 | |
cfff71a9 | 8891 | #: builtin/merge-base.c:216 |
ef317cd5 | 8892 | msgid "find ancestors for a single n-way merge" |
07432cef | 8893 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 | 8894 | |
cfff71a9 | 8895 | #: builtin/merge-base.c:218 |
ef317cd5 | 8896 | msgid "list revs not reachable from others" |
07432cef | 8897 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 | 8898 | |
cfff71a9 | 8899 | #: builtin/merge-base.c:220 |
ef317cd5 | 8900 | msgid "is the first one ancestor of the other?" |
07432cef | 8901 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 | 8902 | |
cfff71a9 JX |
8903 | #: builtin/merge-base.c:222 |
8904 | msgid "find where <commit> forked from reflog of <ref>" | |
e397e7e3 | 8905 | msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处" |
cfff71a9 | 8906 | |
ef317cd5 JX |
8907 | #: builtin/merge-file.c:8 |
8908 | msgid "" | |
814ff314 JX |
8909 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " |
8910 | "<orig-file> <file2>" | |
ef317cd5 | 8911 | msgstr "" |
814ff314 JX |
8912 | "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文" |
8913 | "件> <文件2>" | |
ef317cd5 JX |
8914 | |
8915 | #: builtin/merge-file.c:33 | |
8916 | msgid "send results to standard output" | |
07432cef | 8917 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
8918 | |
8919 | #: builtin/merge-file.c:34 | |
8920 | msgid "use a diff3 based merge" | |
07432cef | 8921 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
8922 | |
8923 | #: builtin/merge-file.c:35 | |
8924 | msgid "for conflicts, use our version" | |
07432cef | 8925 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
8926 | |
8927 | #: builtin/merge-file.c:37 | |
8928 | msgid "for conflicts, use their version" | |
07432cef | 8929 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
8930 | |
8931 | #: builtin/merge-file.c:39 | |
8932 | msgid "for conflicts, use a union version" | |
07432cef | 8933 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
8934 | |
8935 | #: builtin/merge-file.c:42 | |
8936 | msgid "for conflicts, use this marker size" | |
07432cef | 8937 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
8938 | |
8939 | #: builtin/merge-file.c:43 | |
8940 | msgid "do not warn about conflicts" | |
07432cef | 8941 | msgstr "不要警告冲突" |
ef317cd5 JX |
8942 | |
8943 | #: builtin/merge-file.c:45 | |
814ff314 JX |
8944 | msgid "set labels for file1/orig-file/file2" |
8945 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
c04f5ac3 | 8946 | |
276ceeaa | 8947 | #: builtin/mktree.c:65 |
ef317cd5 | 8948 | msgid "git mktree [-z] [--missing] [--batch]" |
07432cef | 8949 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 8950 | |
276ceeaa | 8951 | #: builtin/mktree.c:152 |
ef317cd5 | 8952 | msgid "input is NUL terminated" |
07432cef | 8953 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 8954 | |
276ceeaa | 8955 | #: builtin/mktree.c:153 builtin/write-tree.c:24 |
ef317cd5 | 8956 | msgid "allow missing objects" |
07432cef | 8957 | msgstr "允许丢失的对象" |
c04f5ac3 | 8958 | |
276ceeaa | 8959 | #: builtin/mktree.c:154 |
ef317cd5 | 8960 | msgid "allow creation of more than one tree" |
07432cef | 8961 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 8962 | |
90314792 | 8963 | #: builtin/mv.c:15 |
814ff314 JX |
8964 | msgid "git mv [<options>] <source>... <destination>" |
8965 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 8966 | |
276ceeaa | 8967 | #: builtin/mv.c:70 |
220c313c JX |
8968 | #, c-format |
8969 | msgid "Directory %s is in index and no submodule?" | |
8970 | msgstr "目录 %s 在索引中并且不是子模组?" | |
8971 | ||
5b04ee3b | 8972 | #: builtin/mv.c:72 builtin/rm.c:317 |
220c313c | 8973 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
160fb2b2 | 8974 | msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续" |
220c313c | 8975 | |
276ceeaa | 8976 | #: builtin/mv.c:90 |
220c313c JX |
8977 | #, c-format |
8978 | msgid "%.*s is in index" | |
8979 | msgstr "%.*s 在索引中" | |
8980 | ||
276ceeaa | 8981 | #: builtin/mv.c:112 |
ef317cd5 | 8982 | msgid "force move/rename even if target exists" |
07432cef | 8983 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 8984 | |
276ceeaa | 8985 | #: builtin/mv.c:113 |
ef317cd5 | 8986 | msgid "skip move/rename errors" |
07432cef | 8987 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 8988 | |
5c57d762 | 8989 | #: builtin/mv.c:155 |
220c313c JX |
8990 | #, c-format |
8991 | msgid "destination '%s' is not a directory" | |
8992 | msgstr "目标 '%s' 不是一个目录" | |
8993 | ||
5c57d762 | 8994 | #: builtin/mv.c:166 |
c04f5ac3 JX |
8995 | #, c-format |
8996 | msgid "Checking rename of '%s' to '%s'\n" | |
8997 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
8998 | ||
5c57d762 | 8999 | #: builtin/mv.c:170 |
c04f5ac3 JX |
9000 | msgid "bad source" |
9001 | msgstr "坏的源" | |
9002 | ||
5c57d762 | 9003 | #: builtin/mv.c:173 |
c04f5ac3 JX |
9004 | msgid "can not move directory into itself" |
9005 | msgstr "不能将目录移动到自身" | |
9006 | ||
5c57d762 | 9007 | #: builtin/mv.c:176 |
c04f5ac3 JX |
9008 | msgid "cannot move directory over file" |
9009 | msgstr "不能将目录移动到文件" | |
9010 | ||
5c57d762 | 9011 | #: builtin/mv.c:185 |
c04f5ac3 JX |
9012 | msgid "source directory is empty" |
9013 | msgstr "源目录为空" | |
9014 | ||
5c57d762 | 9015 | #: builtin/mv.c:210 |
c04f5ac3 JX |
9016 | msgid "not under version control" |
9017 | msgstr "不在版本控制之下" | |
9018 | ||
5c57d762 | 9019 | #: builtin/mv.c:213 |
c04f5ac3 JX |
9020 | msgid "destination exists" |
9021 | msgstr "目标已存在" | |
9022 | ||
5c57d762 | 9023 | #: builtin/mv.c:221 |
c04f5ac3 JX |
9024 | #, c-format |
9025 | msgid "overwriting '%s'" | |
9026 | msgstr "覆盖 '%s'" | |
9027 | ||
5c57d762 | 9028 | #: builtin/mv.c:224 |
c04f5ac3 JX |
9029 | msgid "Cannot overwrite" |
9030 | msgstr "不能覆盖" | |
9031 | ||
5c57d762 | 9032 | #: builtin/mv.c:227 |
c04f5ac3 JX |
9033 | msgid "multiple sources for the same target" |
9034 | msgstr "同一目标具有多个源" | |
9035 | ||
5c57d762 | 9036 | #: builtin/mv.c:229 |
cfff71a9 JX |
9037 | msgid "destination directory does not exist" |
9038 | msgstr "目标目录不存在" | |
9039 | ||
5c57d762 | 9040 | #: builtin/mv.c:236 |
c04f5ac3 JX |
9041 | #, c-format |
9042 | msgid "%s, source=%s, destination=%s" | |
9043 | msgstr "%s,源=%s,目标=%s" | |
9044 | ||
5c57d762 | 9045 | #: builtin/mv.c:257 |
c04f5ac3 JX |
9046 | #, c-format |
9047 | msgid "Renaming %s to %s\n" | |
9048 | msgstr "重命名 %s 至 %s\n" | |
9049 | ||
5c57d762 | 9050 | #: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 |
c04f5ac3 JX |
9051 | #, c-format |
9052 | msgid "renaming '%s' failed" | |
9053 | msgstr "重命名 '%s' 失败" | |
9054 | ||
5b04ee3b | 9055 | #: builtin/name-rev.c:258 |
814ff314 JX |
9056 | msgid "git name-rev [<options>] <commit>..." |
9057 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 9058 | |
5b04ee3b | 9059 | #: builtin/name-rev.c:259 |
814ff314 JX |
9060 | msgid "git name-rev [<options>] --all" |
9061 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 9062 | |
5b04ee3b | 9063 | #: builtin/name-rev.c:260 |
814ff314 JX |
9064 | msgid "git name-rev [<options>] --stdin" |
9065 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 9066 | |
5b04ee3b | 9067 | #: builtin/name-rev.c:312 |
ef317cd5 | 9068 | msgid "print only names (no SHA-1)" |
07432cef | 9069 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 9070 | |
5b04ee3b | 9071 | #: builtin/name-rev.c:313 |
ef317cd5 | 9072 | msgid "only use tags to name the commits" |
55a16ee4 | 9073 | msgstr "只使用标签来命名提交" |
ef317cd5 | 9074 | |
5b04ee3b | 9075 | #: builtin/name-rev.c:315 |
ef317cd5 | 9076 | msgid "only use refs matching <pattern>" |
07432cef | 9077 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 9078 | |
5b04ee3b | 9079 | #: builtin/name-rev.c:317 |
ef317cd5 | 9080 | msgid "list all commits reachable from all refs" |
07432cef | 9081 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 9082 | |
5b04ee3b | 9083 | #: builtin/name-rev.c:318 |
ef317cd5 | 9084 | msgid "read from stdin" |
07432cef | 9085 | msgstr "从标准输入读取" |
ef317cd5 | 9086 | |
5b04ee3b | 9087 | #: builtin/name-rev.c:319 |
90314792 JX |
9088 | msgid "allow to print `undefined` names (default)" |
9089 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 9090 | |
5b04ee3b | 9091 | #: builtin/name-rev.c:325 |
2e8451e8 | 9092 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 9093 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 9094 | |
1b7f4a34 | 9095 | #: builtin/notes.c:25 |
814ff314 | 9096 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 9097 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 9098 | |
1b7f4a34 | 9099 | #: builtin/notes.c:26 |
ef317cd5 | 9100 | msgid "" |
814ff314 | 9101 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 9102 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 9103 | msgstr "" |
04cb2f28 JX |
9104 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
9105 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 9106 | |
1b7f4a34 | 9107 | #: builtin/notes.c:27 |
814ff314 | 9108 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 9109 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 9110 | |
1b7f4a34 | 9111 | #: builtin/notes.c:28 |
ef317cd5 | 9112 | msgid "" |
814ff314 | 9113 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 9114 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 9115 | msgstr "" |
04cb2f28 JX |
9116 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
9117 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 9118 | |
1b7f4a34 | 9119 | #: builtin/notes.c:29 |
814ff314 | 9120 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 9121 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 9122 | |
1b7f4a34 | 9123 | #: builtin/notes.c:30 |
814ff314 | 9124 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 9125 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 9126 | |
1b7f4a34 | 9127 | #: builtin/notes.c:31 |
ef317cd5 | 9128 | msgid "" |
814ff314 | 9129 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 9130 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 9131 | |
1b7f4a34 | 9132 | #: builtin/notes.c:32 |
ef317cd5 | 9133 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 9134 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 9135 | |
1b7f4a34 | 9136 | #: builtin/notes.c:33 |
ef317cd5 | 9137 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 9138 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 9139 | |
1b7f4a34 | 9140 | #: builtin/notes.c:34 |
814ff314 | 9141 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 9142 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 9143 | |
1b7f4a34 | 9144 | #: builtin/notes.c:35 |
814ff314 | 9145 | msgid "git notes [--ref <notes-ref>] prune [-n | -v]" |
07432cef | 9146 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 9147 | |
1b7f4a34 | 9148 | #: builtin/notes.c:36 |
814ff314 | 9149 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 9150 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 9151 | |
1b7f4a34 | 9152 | #: builtin/notes.c:41 |
ef317cd5 | 9153 | msgid "git notes [list [<object>]]" |
07432cef | 9154 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 9155 | |
1b7f4a34 | 9156 | #: builtin/notes.c:46 |
ef317cd5 | 9157 | msgid "git notes add [<options>] [<object>]" |
07432cef | 9158 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 9159 | |
1b7f4a34 | 9160 | #: builtin/notes.c:51 |
ef317cd5 | 9161 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 9162 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 9163 | |
1b7f4a34 | 9164 | #: builtin/notes.c:52 |
ef317cd5 | 9165 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 9166 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 9167 | |
1b7f4a34 | 9168 | #: builtin/notes.c:57 |
ef317cd5 | 9169 | msgid "git notes append [<options>] [<object>]" |
07432cef | 9170 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 9171 | |
1b7f4a34 | 9172 | #: builtin/notes.c:62 |
ef317cd5 | 9173 | msgid "git notes edit [<object>]" |
07432cef | 9174 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 9175 | |
1b7f4a34 | 9176 | #: builtin/notes.c:67 |
ef317cd5 | 9177 | msgid "git notes show [<object>]" |
07432cef | 9178 | msgstr "git notes show [<对象>]" |
ef317cd5 | 9179 | |
1b7f4a34 | 9180 | #: builtin/notes.c:72 |
814ff314 | 9181 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 9182 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 9183 | |
1b7f4a34 | 9184 | #: builtin/notes.c:73 |
ef317cd5 | 9185 | msgid "git notes merge --commit [<options>]" |
07432cef | 9186 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 9187 | |
1b7f4a34 | 9188 | #: builtin/notes.c:74 |
ef317cd5 | 9189 | msgid "git notes merge --abort [<options>]" |
07432cef | 9190 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 9191 | |
1b7f4a34 | 9192 | #: builtin/notes.c:79 |
ef317cd5 | 9193 | msgid "git notes remove [<object>]" |
07432cef | 9194 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 9195 | |
1b7f4a34 | 9196 | #: builtin/notes.c:84 |
ef317cd5 | 9197 | msgid "git notes prune [<options>]" |
07432cef | 9198 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 9199 | |
1b7f4a34 | 9200 | #: builtin/notes.c:89 |
ef317cd5 | 9201 | msgid "git notes get-ref" |
07432cef | 9202 | msgstr "git notes get-ref" |
ef317cd5 | 9203 | |
5c57d762 JX |
9204 | #: builtin/notes.c:94 |
9205 | msgid "Write/edit the notes for the following object:" | |
9206 | msgstr "为下面的对象写/编辑说明:" | |
9207 | ||
1b7f4a34 | 9208 | #: builtin/notes.c:147 |
c04f5ac3 JX |
9209 | #, c-format |
9210 | msgid "unable to start 'show' for object '%s'" | |
9211 | msgstr "不能为对象 '%s' 开始 'show'" | |
9212 | ||
1b7f4a34 | 9213 | #: builtin/notes.c:151 |
a77c07d9 JX |
9214 | msgid "could not read 'show' output" |
9215 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 9216 | |
1b7f4a34 | 9217 | #: builtin/notes.c:159 |
c04f5ac3 JX |
9218 | #, c-format |
9219 | msgid "failed to finish 'show' for object '%s'" | |
9220 | msgstr "无法为对象 '%s' 完成 'show'" | |
9221 | ||
5c57d762 | 9222 | #: builtin/notes.c:194 |
c04f5ac3 JX |
9223 | msgid "Please supply the note contents using either -m or -F option" |
9224 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
9225 | ||
5c57d762 | 9226 | #: builtin/notes.c:203 |
c04f5ac3 JX |
9227 | msgid "unable to write note object" |
9228 | msgstr "不能写注解对象" | |
9229 | ||
5c57d762 | 9230 | #: builtin/notes.c:205 |
c04f5ac3 | 9231 | #, c-format |
220c313c JX |
9232 | msgid "The note contents have been left in %s" |
9233 | msgstr "注解内容被留在 %s 中" | |
c04f5ac3 | 9234 | |
5c57d762 | 9235 | #: builtin/notes.c:233 builtin/tag.c:439 |
c04f5ac3 JX |
9236 | #, c-format |
9237 | msgid "cannot read '%s'" | |
9238 | msgstr "不能读取 '%s'" | |
9239 | ||
5c57d762 | 9240 | #: builtin/notes.c:235 builtin/tag.c:442 |
c04f5ac3 JX |
9241 | #, c-format |
9242 | msgid "could not open or read '%s'" | |
9243 | msgstr "不能打开或读取 '%s'" | |
9244 | ||
5c57d762 | 9245 | #: builtin/notes.c:257 |
c04f5ac3 JX |
9246 | #, c-format |
9247 | msgid "Failed to read object '%s'." | |
9248 | msgstr "无法读取对象 '%s'。" | |
9249 | ||
5c57d762 | 9250 | #: builtin/notes.c:261 |
6c94aba5 JX |
9251 | #, c-format |
9252 | msgid "Cannot read note data from non-blob object '%s'." | |
9253 | msgstr "不能从非数据对象 '%s' 中读取注解数据" | |
9254 | ||
5c57d762 JX |
9255 | #: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 |
9256 | #: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 | |
9257 | #: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 | |
c04f5ac3 JX |
9258 | msgid "too many parameters" |
9259 | msgstr "参数太多" | |
9260 | ||
5c57d762 | 9261 | #: builtin/notes.c:376 builtin/notes.c:663 |
c04f5ac3 JX |
9262 | #, c-format |
9263 | msgid "No note found for object %s." | |
9264 | msgstr "未发现对象 %s 的注解。" | |
9265 | ||
5c57d762 | 9266 | #: builtin/notes.c:397 builtin/notes.c:560 |
ef317cd5 | 9267 | msgid "note contents as a string" |
07432cef | 9268 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 9269 | |
5c57d762 | 9270 | #: builtin/notes.c:400 builtin/notes.c:563 |
ef317cd5 | 9271 | msgid "note contents in a file" |
07432cef | 9272 | msgstr "注解内容到一个文件中" |
ef317cd5 | 9273 | |
5c57d762 | 9274 | #: builtin/notes.c:403 builtin/notes.c:566 |
ef317cd5 | 9275 | msgid "reuse and edit specified note object" |
07432cef | 9276 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 9277 | |
5c57d762 | 9278 | #: builtin/notes.c:406 builtin/notes.c:569 |
ef317cd5 | 9279 | msgid "reuse specified note object" |
07432cef | 9280 | msgstr "重用指定的注解对象" |
ef317cd5 | 9281 | |
5c57d762 | 9282 | #: builtin/notes.c:409 builtin/notes.c:572 |
04cb2f28 JX |
9283 | msgid "allow storing empty note" |
9284 | msgstr "允许保存空白注释" | |
9285 | ||
5c57d762 | 9286 | #: builtin/notes.c:410 builtin/notes.c:481 |
ef317cd5 | 9287 | msgid "replace existing notes" |
07432cef | 9288 | msgstr "替换已存在的注解" |
ef317cd5 | 9289 | |
5c57d762 | 9290 | #: builtin/notes.c:435 |
c04f5ac3 JX |
9291 | #, c-format |
9292 | msgid "" | |
9293 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
9294 | "existing notes" | |
9295 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
9296 | ||
5c57d762 | 9297 | #: builtin/notes.c:450 builtin/notes.c:529 |
c04f5ac3 JX |
9298 | #, c-format |
9299 | msgid "Overwriting existing notes for object %s\n" | |
9300 | msgstr "覆盖对象 %s 现存注解\n" | |
9301 | ||
5c57d762 | 9302 | #: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 |
04cb2f28 JX |
9303 | #, c-format |
9304 | msgid "Removing note for object %s\n" | |
9305 | msgstr "删除对象 %s 的注解\n" | |
9306 | ||
5c57d762 | 9307 | #: builtin/notes.c:482 |
ef317cd5 | 9308 | msgid "read objects from stdin" |
07432cef | 9309 | msgstr "从标准输入读取对象" |
ef317cd5 | 9310 | |
5c57d762 | 9311 | #: builtin/notes.c:484 |
ef317cd5 | 9312 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 9313 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 9314 | |
5c57d762 | 9315 | #: builtin/notes.c:502 |
c04f5ac3 JX |
9316 | msgid "too few parameters" |
9317 | msgstr "参数太少" | |
9318 | ||
5c57d762 | 9319 | #: builtin/notes.c:523 |
c04f5ac3 JX |
9320 | #, c-format |
9321 | msgid "" | |
9322 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
9323 | "existing notes" | |
9324 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
9325 | ||
5c57d762 | 9326 | #: builtin/notes.c:535 |
c04f5ac3 JX |
9327 | #, c-format |
9328 | msgid "Missing notes on source object %s. Cannot copy." | |
9329 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
9330 | ||
5c57d762 | 9331 | #: builtin/notes.c:587 |
ef317cd5 JX |
9332 | #, c-format |
9333 | msgid "" | |
9334 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
9335 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
9336 | msgstr "" | |
9337 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
9338 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
9339 | ||
5c57d762 JX |
9340 | #: builtin/notes.c:753 |
9341 | #, c-format | |
9342 | msgid "unknown notes merge strategy %s" | |
9343 | msgstr "未知的注解合并策略 %s" | |
9344 | ||
9345 | #: builtin/notes.c:769 | |
ef317cd5 | 9346 | msgid "General options" |
07432cef | 9347 | msgstr "通用选项" |
ef317cd5 | 9348 | |
5c57d762 | 9349 | #: builtin/notes.c:771 |
ef317cd5 | 9350 | msgid "Merge options" |
07432cef | 9351 | msgstr "合并选项" |
ef317cd5 | 9352 | |
5c57d762 | 9353 | #: builtin/notes.c:773 |
ef317cd5 JX |
9354 | msgid "" |
9355 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
9356 | "cat_sort_uniq)" | |
07432cef | 9357 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 9358 | |
5c57d762 | 9359 | #: builtin/notes.c:775 |
ef317cd5 | 9360 | msgid "Committing unmerged notes" |
07432cef | 9361 | msgstr "提交未合并的注解" |
ef317cd5 | 9362 | |
5c57d762 | 9363 | #: builtin/notes.c:777 |
ef317cd5 | 9364 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 9365 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 9366 | |
5c57d762 | 9367 | #: builtin/notes.c:779 |
ef317cd5 | 9368 | msgid "Aborting notes merge resolution" |
07432cef | 9369 | msgstr "中止注解合并的方案" |
ef317cd5 | 9370 | |
5c57d762 | 9371 | #: builtin/notes.c:781 |
ef317cd5 | 9372 | msgid "abort notes merge" |
07432cef | 9373 | msgstr "中止注解合并" |
ef317cd5 | 9374 | |
5c57d762 JX |
9375 | #: builtin/notes.c:792 |
9376 | msgid "cannot mix --commit, --abort or -s/--strategy" | |
9377 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
9378 | ||
9379 | #: builtin/notes.c:797 | |
9380 | msgid "Must specify a notes ref to merge" | |
9381 | msgstr "您必须指定一个注解引用来合并" | |
9382 | ||
9383 | #: builtin/notes.c:821 | |
9384 | #, c-format | |
9385 | msgid "Unknown -s/--strategy: %s" | |
9386 | msgstr "未知的 -s/--strategy:%s" | |
9387 | ||
9388 | #: builtin/notes.c:858 | |
1b7f4a34 JX |
9389 | #, c-format |
9390 | msgid "A notes merge into %s is already in-progress at %s" | |
9391 | msgstr "一个到 %s 的注解合并已经在 %s 执行中" | |
9392 | ||
5c57d762 JX |
9393 | #: builtin/notes.c:861 |
9394 | #, c-format | |
9395 | msgid "Failed to store link to current notes ref (%s)" | |
9396 | msgstr "无法存储链接到当前注解的引用(%s)" | |
9397 | ||
9398 | #: builtin/notes.c:863 | |
9399 | #, c-format | |
9400 | msgid "" | |
9401 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
9402 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
9403 | "abort'.\n" | |
9404 | msgstr "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
9405 | ||
9406 | #: builtin/notes.c:885 | |
ef317cd5 JX |
9407 | #, c-format |
9408 | msgid "Object %s has no note\n" | |
9409 | msgstr "对象 %s 没有注解\n" | |
9410 | ||
5c57d762 | 9411 | #: builtin/notes.c:897 |
ef317cd5 | 9412 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 9413 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 9414 | |
5c57d762 | 9415 | #: builtin/notes.c:900 |
ef317cd5 | 9416 | msgid "read object names from the standard input" |
07432cef | 9417 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 9418 | |
5c57d762 JX |
9419 | #: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 |
9420 | msgid "do not remove, show only" | |
9421 | msgstr "不删除,只显示" | |
9422 | ||
9423 | #: builtin/notes.c:939 | |
9424 | msgid "report pruned notes" | |
9425 | msgstr "报告清除的注解" | |
9426 | ||
9427 | #: builtin/notes.c:981 | |
6c94aba5 | 9428 | msgid "notes-ref" |
07432cef | 9429 | msgstr "注解引用" |
ef317cd5 | 9430 | |
5c57d762 | 9431 | #: builtin/notes.c:982 |
814ff314 | 9432 | msgid "use notes from <notes-ref>" |
07432cef | 9433 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 9434 | |
5c57d762 | 9435 | #: builtin/notes.c:1017 builtin/remote.c:1623 |
ef317cd5 JX |
9436 | #, c-format |
9437 | msgid "Unknown subcommand: %s" | |
9438 | msgstr "未知子命令:%s" | |
9439 | ||
220c313c | 9440 | #: builtin/pack-objects.c:28 |
1b7f4a34 JX |
9441 | msgid "" |
9442 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
9443 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 9444 | |
220c313c | 9445 | #: builtin/pack-objects.c:29 |
1b7f4a34 JX |
9446 | msgid "" |
9447 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
9448 | msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 9449 | |
5c57d762 | 9450 | #: builtin/pack-objects.c:177 builtin/pack-objects.c:180 |
ef317cd5 JX |
9451 | #, c-format |
9452 | msgid "deflate error (%d)" | |
9453 | msgstr "压缩错误 (%d)" | |
9454 | ||
5c57d762 | 9455 | #: builtin/pack-objects.c:766 |
5b04ee3b JX |
9456 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
9457 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
9458 | ||
5c57d762 | 9459 | #: builtin/pack-objects.c:779 |
6c94aba5 JX |
9460 | msgid "Writing objects" |
9461 | msgstr "写入对象中" | |
9462 | ||
5c57d762 | 9463 | #: builtin/pack-objects.c:1037 |
6c94aba5 JX |
9464 | msgid "disabling bitmap writing, as some objects are not being packed" |
9465 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
9466 | ||
5c57d762 | 9467 | #: builtin/pack-objects.c:2197 |
6c94aba5 JX |
9468 | msgid "Compressing objects" |
9469 | msgstr "压缩对象中" | |
9470 | ||
5c57d762 | 9471 | #: builtin/pack-objects.c:2611 |
ef317cd5 JX |
9472 | #, c-format |
9473 | msgid "unsupported index version %s" | |
9474 | msgstr "不支持的索引版本 %s" | |
9475 | ||
5c57d762 | 9476 | #: builtin/pack-objects.c:2615 |
ef317cd5 JX |
9477 | #, c-format |
9478 | msgid "bad index version '%s'" | |
9479 | msgstr "坏的索引版本 '%s'" | |
9480 | ||
5c57d762 | 9481 | #: builtin/pack-objects.c:2645 |
ef317cd5 | 9482 | msgid "do not show progress meter" |
07432cef | 9483 | msgstr "不显示进度表" |
ef317cd5 | 9484 | |
5c57d762 | 9485 | #: builtin/pack-objects.c:2647 |
ef317cd5 | 9486 | msgid "show progress meter" |
07432cef | 9487 | msgstr "显示进度表" |
ef317cd5 | 9488 | |
5c57d762 | 9489 | #: builtin/pack-objects.c:2649 |
ef317cd5 | 9490 | msgid "show progress meter during object writing phase" |
07432cef | 9491 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 9492 | |
5c57d762 | 9493 | #: builtin/pack-objects.c:2652 |
ef317cd5 | 9494 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 9495 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 9496 | |
5c57d762 | 9497 | #: builtin/pack-objects.c:2653 |
ef317cd5 | 9498 | msgid "version[,offset]" |
07432cef | 9499 | msgstr "版本[,偏移]" |
ef317cd5 | 9500 | |
5c57d762 | 9501 | #: builtin/pack-objects.c:2654 |
ef317cd5 | 9502 | msgid "write the pack index file in the specified idx format version" |
07432cef | 9503 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 9504 | |
5c57d762 | 9505 | #: builtin/pack-objects.c:2657 |
ef317cd5 | 9506 | msgid "maximum size of each output pack file" |
07432cef | 9507 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 9508 | |
5c57d762 | 9509 | #: builtin/pack-objects.c:2659 |
ef317cd5 | 9510 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 9511 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 9512 | |
5c57d762 | 9513 | #: builtin/pack-objects.c:2661 |
ef317cd5 | 9514 | msgid "ignore packed objects" |
07432cef | 9515 | msgstr "忽略包对象" |
ef317cd5 | 9516 | |
5c57d762 | 9517 | #: builtin/pack-objects.c:2663 |
ef317cd5 | 9518 | msgid "limit pack window by objects" |
07432cef | 9519 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 9520 | |
5c57d762 | 9521 | #: builtin/pack-objects.c:2665 |
ef317cd5 | 9522 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 9523 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 9524 | |
5c57d762 | 9525 | #: builtin/pack-objects.c:2667 |
ef317cd5 | 9526 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 9527 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 9528 | |
5c57d762 | 9529 | #: builtin/pack-objects.c:2669 |
ef317cd5 | 9530 | msgid "reuse existing deltas" |
07432cef | 9531 | msgstr "重用已存在的 deltas" |
ef317cd5 | 9532 | |
5c57d762 | 9533 | #: builtin/pack-objects.c:2671 |
ef317cd5 | 9534 | msgid "reuse existing objects" |
07432cef | 9535 | msgstr "重用已存在的对象" |
ef317cd5 | 9536 | |
5c57d762 | 9537 | #: builtin/pack-objects.c:2673 |
ef317cd5 | 9538 | msgid "use OFS_DELTA objects" |
07432cef | 9539 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 9540 | |
5c57d762 | 9541 | #: builtin/pack-objects.c:2675 |
ef317cd5 | 9542 | msgid "use threads when searching for best delta matches" |
07432cef | 9543 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 9544 | |
5c57d762 | 9545 | #: builtin/pack-objects.c:2677 |
ef317cd5 | 9546 | msgid "do not create an empty pack output" |
07432cef | 9547 | msgstr "不创建空的包输出" |
ef317cd5 | 9548 | |
5c57d762 | 9549 | #: builtin/pack-objects.c:2679 |
ef317cd5 | 9550 | msgid "read revision arguments from standard input" |
d9d56b23 | 9551 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 9552 | |
5c57d762 | 9553 | #: builtin/pack-objects.c:2681 |
ef317cd5 | 9554 | msgid "limit the objects to those that are not yet packed" |
07432cef | 9555 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 9556 | |
5c57d762 | 9557 | #: builtin/pack-objects.c:2684 |
ef317cd5 | 9558 | msgid "include objects reachable from any reference" |
07432cef | 9559 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 9560 | |
5c57d762 | 9561 | #: builtin/pack-objects.c:2687 |
ef317cd5 | 9562 | msgid "include objects referred by reflog entries" |
07432cef | 9563 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 9564 | |
5c57d762 | 9565 | #: builtin/pack-objects.c:2690 |
220c313c JX |
9566 | msgid "include objects referred to by the index" |
9567 | msgstr "包括被索引引用到的对象" | |
9568 | ||
5c57d762 | 9569 | #: builtin/pack-objects.c:2693 |
ef317cd5 | 9570 | msgid "output pack to stdout" |
07432cef | 9571 | msgstr "输出包到标准输出" |
ef317cd5 | 9572 | |
5c57d762 | 9573 | #: builtin/pack-objects.c:2695 |
ef317cd5 | 9574 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 9575 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 9576 | |
5c57d762 | 9577 | #: builtin/pack-objects.c:2697 |
ef317cd5 | 9578 | msgid "keep unreachable objects" |
07432cef | 9579 | msgstr "维持不可达的对象" |
ef317cd5 | 9580 | |
5c57d762 JX |
9581 | #: builtin/pack-objects.c:2699 |
9582 | msgid "pack loose unreachable objects" | |
9583 | msgstr "打包松散的不可达对象" | |
9584 | ||
9585 | #: builtin/pack-objects.c:2700 parse-options.h:142 | |
ef317cd5 JX |
9586 | msgid "time" |
9587 | msgstr "时间" | |
9588 | ||
5c57d762 | 9589 | #: builtin/pack-objects.c:2701 |
ef317cd5 | 9590 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 9591 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 9592 | |
5c57d762 | 9593 | #: builtin/pack-objects.c:2704 |
ef317cd5 | 9594 | msgid "create thin packs" |
07432cef | 9595 | msgstr "创建精简包" |
ef317cd5 | 9596 | |
5c57d762 | 9597 | #: builtin/pack-objects.c:2706 |
04cb2f28 | 9598 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 9599 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 9600 | |
5c57d762 | 9601 | #: builtin/pack-objects.c:2708 |
ef317cd5 | 9602 | msgid "ignore packs that have companion .keep file" |
07432cef | 9603 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 9604 | |
5c57d762 | 9605 | #: builtin/pack-objects.c:2710 |
ef317cd5 | 9606 | msgid "pack compression level" |
07432cef | 9607 | msgstr "打包压缩级别" |
ef317cd5 | 9608 | |
5c57d762 | 9609 | #: builtin/pack-objects.c:2712 |
ef317cd5 | 9610 | msgid "do not hide commits by grafts" |
cfff71a9 | 9611 | msgstr "显示被嫁接隐藏的提交" |
ef317cd5 | 9612 | |
5c57d762 | 9613 | #: builtin/pack-objects.c:2714 |
6c94aba5 JX |
9614 | msgid "use a bitmap index if available to speed up counting objects" |
9615 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
9616 | ||
5c57d762 | 9617 | #: builtin/pack-objects.c:2716 |
6c94aba5 JX |
9618 | msgid "write a bitmap index together with the pack index" |
9619 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
9620 | ||
5c57d762 | 9621 | #: builtin/pack-objects.c:2829 |
6c94aba5 JX |
9622 | msgid "Counting objects" |
9623 | msgstr "对象计数中" | |
9624 | ||
ef317cd5 | 9625 | #: builtin/pack-refs.c:6 |
814ff314 JX |
9626 | msgid "git pack-refs [<options>]" |
9627 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 9628 | |
ef317cd5 JX |
9629 | #: builtin/pack-refs.c:14 |
9630 | msgid "pack everything" | |
07432cef | 9631 | msgstr "打包一切" |
c04f5ac3 | 9632 | |
ef317cd5 JX |
9633 | #: builtin/pack-refs.c:15 |
9634 | msgid "prune loose refs (default)" | |
07432cef | 9635 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 9636 | |
ef317cd5 | 9637 | #: builtin/prune-packed.c:7 |
814ff314 JX |
9638 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
9639 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 9640 | |
220c313c | 9641 | #: builtin/prune-packed.c:40 |
6c94aba5 JX |
9642 | msgid "Removing duplicate objects" |
9643 | msgstr "正在删除重复对象" | |
9644 | ||
5bb01d4f | 9645 | #: builtin/prune.c:11 |
ef317cd5 | 9646 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" |
07432cef | 9647 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 9648 | |
5c57d762 | 9649 | #: builtin/prune.c:106 builtin/worktree.c:128 |
1b7f4a34 JX |
9650 | msgid "report pruned objects" |
9651 | msgstr "报告清除的对象" | |
9652 | ||
5c57d762 | 9653 | #: builtin/prune.c:109 builtin/worktree.c:130 |
1b7f4a34 JX |
9654 | msgid "expire objects older than <time>" |
9655 | msgstr "使早于给定时间的对象过期" | |
9656 | ||
94550ed3 JX |
9657 | #: builtin/prune.c:123 |
9658 | msgid "cannot prune in a precious-objects repo" | |
9659 | msgstr "不能在珍品仓库中执行清理操作" | |
9660 | ||
276ceeaa | 9661 | #: builtin/pull.c:72 |
94550ed3 | 9662 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
9663 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
9664 | ||
5b04ee3b | 9665 | #: builtin/pull.c:120 |
1b7f4a34 JX |
9666 | msgid "Options related to merging" |
9667 | msgstr "和合并相关的选项" | |
9668 | ||
5b04ee3b | 9669 | #: builtin/pull.c:123 |
1b7f4a34 JX |
9670 | msgid "incorporate changes by rebasing rather than merging" |
9671 | msgstr "使用变基操作取代合并操作以合入修改" | |
9672 | ||
5c57d762 | 9673 | #: builtin/pull.c:147 builtin/revert.c:101 |
1b7f4a34 JX |
9674 | msgid "allow fast-forward" |
9675 | msgstr "允许快进式" | |
9676 | ||
5b04ee3b JX |
9677 | #: builtin/pull.c:156 |
9678 | msgid "automatically stash/stash pop before and after rebase" | |
9679 | msgstr "自动在变基操作前后执行 stash/stash pop" | |
9680 | ||
9681 | #: builtin/pull.c:172 | |
1b7f4a34 JX |
9682 | msgid "Options related to fetching" |
9683 | msgstr "和获取相关的参数" | |
9684 | ||
5b04ee3b | 9685 | #: builtin/pull.c:194 |
276ceeaa JX |
9686 | msgid "number of submodules pulled in parallel" |
9687 | msgstr "并发拉取的子模组的数量" | |
9688 | ||
5b04ee3b | 9689 | #: builtin/pull.c:283 |
1b7f4a34 JX |
9690 | #, c-format |
9691 | msgid "Invalid value for pull.ff: %s" | |
9692 | msgstr "pull.ff 的取值无效:%s" | |
9693 | ||
5c57d762 | 9694 | #: builtin/pull.c:379 git-sh-setup.sh:226 |
1b7f4a34 JX |
9695 | msgid "Cannot pull with rebase: You have unstaged changes." |
9696 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
9697 | ||
5c57d762 | 9698 | #: builtin/pull.c:385 git-sh-setup.sh:252 |
1b7f4a34 JX |
9699 | msgid "Additionally, your index contains uncommitted changes." |
9700 | msgstr "而且您的索引中包含未提交的变更。" | |
9701 | ||
5c57d762 | 9702 | #: builtin/pull.c:387 git-sh-setup.sh:245 |
1b7f4a34 JX |
9703 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
9704 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
9705 | ||
5b04ee3b | 9706 | #: builtin/pull.c:463 |
1b7f4a34 JX |
9707 | msgid "" |
9708 | "There is no candidate for rebasing against among the refs that you just " | |
9709 | "fetched." | |
9710 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
9711 | ||
5b04ee3b | 9712 | #: builtin/pull.c:465 |
1b7f4a34 JX |
9713 | msgid "" |
9714 | "There are no candidates for merging among the refs that you just fetched." | |
9715 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
9716 | ||
5b04ee3b | 9717 | #: builtin/pull.c:466 |
1b7f4a34 JX |
9718 | msgid "" |
9719 | "Generally this means that you provided a wildcard refspec which had no\n" | |
9720 | "matches on the remote end." | |
9721 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
9722 | ||
5b04ee3b | 9723 | #: builtin/pull.c:469 |
1b7f4a34 JX |
9724 | #, c-format |
9725 | msgid "" | |
9726 | "You asked to pull from the remote '%s', but did not specify\n" | |
9727 | "a branch. Because this is not the default configured remote\n" | |
9728 | "for your current branch, you must specify a branch on the command line." | |
9729 | msgstr "" | |
9730 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
9731 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
9732 | ||
5b04ee3b | 9733 | #: builtin/pull.c:474 git-parse-remote.sh:73 |
1b7f4a34 JX |
9734 | msgid "You are not currently on a branch." |
9735 | msgstr "您当前不在一个分支上。" | |
9736 | ||
5b04ee3b | 9737 | #: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 |
1b7f4a34 JX |
9738 | msgid "Please specify which branch you want to rebase against." |
9739 | msgstr "请指定您要变基到哪一个分支。" | |
9740 | ||
5b04ee3b | 9741 | #: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 |
1b7f4a34 JX |
9742 | msgid "Please specify which branch you want to merge with." |
9743 | msgstr "请指定您要合并哪一个分支。" | |
9744 | ||
5b04ee3b | 9745 | #: builtin/pull.c:479 builtin/pull.c:494 |
1b7f4a34 JX |
9746 | msgid "See git-pull(1) for details." |
9747 | msgstr "详见 git-pull(1)。" | |
9748 | ||
5b04ee3b JX |
9749 | #: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 |
9750 | #: git-parse-remote.sh:64 | |
9751 | msgid "<remote>" | |
9752 | msgstr "<远程>" | |
9753 | ||
5c57d762 | 9754 | #: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 |
5b04ee3b JX |
9755 | #: git-parse-remote.sh:65 |
9756 | msgid "<branch>" | |
9757 | msgstr "<分支>" | |
9758 | ||
9759 | #: builtin/pull.c:489 git-parse-remote.sh:75 | |
1b7f4a34 JX |
9760 | msgid "There is no tracking information for the current branch." |
9761 | msgstr "当前分支没有跟踪信息。" | |
9762 | ||
5b04ee3b | 9763 | #: builtin/pull.c:498 git-parse-remote.sh:95 |
1b7f4a34 | 9764 | msgid "" |
5b04ee3b JX |
9765 | "If you wish to set tracking information for this branch you can do so with:" |
9766 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 9767 | |
5b04ee3b | 9768 | #: builtin/pull.c:503 |
1b7f4a34 JX |
9769 | #, c-format |
9770 | msgid "" | |
9771 | "Your configuration specifies to merge with the ref '%s'\n" | |
9772 | "from the remote, but no such ref was fetched." | |
9773 | msgstr "" | |
9774 | "您的配置中指定要合并远程的引用 '%s',\n" | |
9775 | "但是没有获取到这个引用。" | |
7ac1c0ad | 9776 | |
5c57d762 JX |
9777 | #: builtin/pull.c:820 |
9778 | msgid "ignoring --verify-signatures for rebase" | |
9779 | msgstr "为变基操作忽略 --verify-signatures" | |
9780 | ||
9781 | #: builtin/pull.c:867 | |
5b04ee3b JX |
9782 | msgid "--[no-]autostash option is only valid with --rebase." |
9783 | msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" | |
9784 | ||
5c57d762 | 9785 | #: builtin/pull.c:875 |
1b7f4a34 JX |
9786 | msgid "Updating an unborn branch with changes added to the index." |
9787 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
9788 | ||
5c57d762 | 9789 | #: builtin/pull.c:903 |
1b7f4a34 JX |
9790 | #, c-format |
9791 | msgid "" | |
9792 | "fetch updated the current branch head.\n" | |
9793 | "fast-forwarding your working tree from\n" | |
9794 | "commit %s." | |
9795 | msgstr "" | |
9796 | "fetch 更新了当前的分支。快进您的工作区\n" | |
9797 | "至提交 %s。" | |
ef317cd5 | 9798 | |
5c57d762 | 9799 | #: builtin/pull.c:908 |
1b7f4a34 JX |
9800 | #, c-format |
9801 | msgid "" | |
9802 | "Cannot fast-forward your working tree.\n" | |
9803 | "After making sure that you saved anything precious from\n" | |
9804 | "$ git diff %s\n" | |
9805 | "output, run\n" | |
9806 | "$ git reset --hard\n" | |
9807 | "to recover." | |
9808 | msgstr "" | |
9809 | "您当前的工作区无法执行快进操作。\n" | |
9810 | "首先执行如下命令:\n" | |
9811 | "$ git diff %s\n" | |
9812 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
9813 | "$ git reset --hard\n" | |
9814 | "恢复之前的状态。" | |
9815 | ||
5c57d762 | 9816 | #: builtin/pull.c:923 |
1b7f4a34 JX |
9817 | msgid "Cannot merge multiple branches into empty head." |
9818 | msgstr "无法将多个分支合并到空分支。" | |
9819 | ||
5c57d762 | 9820 | #: builtin/pull.c:927 |
1b7f4a34 JX |
9821 | msgid "Cannot rebase onto multiple branches." |
9822 | msgstr "无法变基到多个分支。" | |
9823 | ||
89f80d72 | 9824 | #: builtin/push.c:16 |
ef317cd5 | 9825 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 9826 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 9827 | |
276ceeaa | 9828 | #: builtin/push.c:89 |
c04f5ac3 | 9829 | msgid "tag shorthand without <tag>" |
55a16ee4 | 9830 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 9831 | |
276ceeaa | 9832 | #: builtin/push.c:99 |
c04f5ac3 | 9833 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 9834 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 9835 | |
276ceeaa | 9836 | #: builtin/push.c:143 |
8ada9598 JX |
9837 | msgid "" |
9838 | "\n" | |
9839 | "To choose either option permanently, see push.default in 'git help config'." | |
9840 | msgstr "" | |
81809b99 JX |
9841 | "\n" |
9842 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 9843 | |
276ceeaa | 9844 | #: builtin/push.c:146 |
8ada9598 JX |
9845 | #, c-format |
9846 | msgid "" | |
9847 | "The upstream branch of your current branch does not match\n" | |
9848 | "the name of your current branch. To push to the upstream branch\n" | |
9849 | "on the remote, use\n" | |
9850 | "\n" | |
9851 | " git push %s HEAD:%s\n" | |
9852 | "\n" | |
9853 | "To push to the branch of the same name on the remote, use\n" | |
9854 | "\n" | |
9855 | " git push %s %s\n" | |
9856 | "%s" | |
9857 | msgstr "" | |
81809b99 JX |
9858 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
9859 | "上游分支,使用\n" | |
9860 | "\n" | |
9861 | " git push %s HEAD:%s\n" | |
9862 | "\n" | |
9863 | "为推送至远程同名分支,使用\n" | |
9864 | "\n" | |
9865 | " git push %s %s\n" | |
9866 | "%s" | |
8ada9598 | 9867 | |
276ceeaa | 9868 | #: builtin/push.c:161 |
c04f5ac3 JX |
9869 | #, c-format |
9870 | msgid "" | |
9871 | "You are not currently on a branch.\n" | |
9872 | "To push the history leading to the current (detached HEAD)\n" | |
9873 | "state now, use\n" | |
9874 | "\n" | |
9875 | " git push %s HEAD:<name-of-remote-branch>\n" | |
9876 | msgstr "" | |
9877 | "您当前不在一个分支上。\n" | |
90e6ef53 | 9878 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 9879 | "\n" |
d9d56b23 | 9880 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 9881 | |
276ceeaa | 9882 | #: builtin/push.c:175 |
c04f5ac3 JX |
9883 | #, c-format |
9884 | msgid "" | |
9885 | "The current branch %s has no upstream branch.\n" | |
9886 | "To push the current branch and set the remote as upstream, use\n" | |
9887 | "\n" | |
9888 | " git push --set-upstream %s %s\n" | |
9889 | msgstr "" | |
9890 | "当前分支 %s 没有对应的上游分支。\n" | |
9891 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
9892 | "\n" | |
9893 | " git push --set-upstream %s %s\n" | |
9894 | ||
276ceeaa | 9895 | #: builtin/push.c:183 |
c04f5ac3 JX |
9896 | #, c-format |
9897 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
9898 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
9899 | ||
276ceeaa | 9900 | #: builtin/push.c:186 |
73a60cd2 JX |
9901 | #, c-format |
9902 | msgid "" | |
9903 | "You are pushing to remote '%s', which is not the upstream of\n" | |
9904 | "your current branch '%s', without telling me what to push\n" | |
9905 | "to update which remote branch." | |
9906 | msgstr "" | |
9907 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
9908 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
9909 | ||
276ceeaa | 9910 | #: builtin/push.c:242 |
c04f5ac3 JX |
9911 | msgid "" |
9912 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 9913 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 9914 | |
276ceeaa | 9915 | #: builtin/push.c:249 |
170e9899 JX |
9916 | msgid "" |
9917 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
9918 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
9919 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
9920 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9921 | msgstr "" | |
eff6d3a9 | 9922 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 9923 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 9924 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 9925 | |
276ceeaa | 9926 | #: builtin/push.c:255 |
170e9899 JX |
9927 | msgid "" |
9928 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
9929 | "counterpart. Check out this branch and integrate the remote changes\n" |
9930 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
9931 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9932 | msgstr "" | |
eff6d3a9 | 9933 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 9934 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 9935 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 9936 | |
276ceeaa | 9937 | #: builtin/push.c:261 |
07432cef | 9938 | msgid "" |
a77c07d9 JX |
9939 | "Updates were rejected because the remote contains work that you do\n" |
9940 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
9941 | "to the same ref. You may want to first integrate the remote changes\n" |
9942 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
9943 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
9944 | msgstr "" | |
160fb2b2 JX |
9945 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
9946 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 9947 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
9948 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
9949 | ||
276ceeaa | 9950 | #: builtin/push.c:268 |
a77c07d9 | 9951 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 9952 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 9953 | |
276ceeaa | 9954 | #: builtin/push.c:271 |
a77c07d9 JX |
9955 | msgid "" |
9956 | "You cannot update a remote ref that points at a non-commit object,\n" | |
9957 | "or update a remote ref to make it point at a non-commit object,\n" | |
9958 | "without using the '--force' option.\n" | |
9959 | msgstr "" | |
9960 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
9961 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 9962 | |
276ceeaa | 9963 | #: builtin/push.c:331 |
c04f5ac3 JX |
9964 | #, c-format |
9965 | msgid "Pushing to %s\n" | |
9966 | msgstr "推送到 %s\n" | |
9967 | ||
276ceeaa | 9968 | #: builtin/push.c:335 |
c04f5ac3 JX |
9969 | #, c-format |
9970 | msgid "failed to push some refs to '%s'" | |
9971 | msgstr "无法推送一些引用到 '%s'" | |
9972 | ||
5c57d762 | 9973 | #: builtin/push.c:366 |
c04f5ac3 JX |
9974 | #, c-format |
9975 | msgid "bad repository '%s'" | |
160fb2b2 | 9976 | msgstr "坏的仓库 '%s'" |
c04f5ac3 | 9977 | |
5c57d762 | 9978 | #: builtin/push.c:367 |
c04f5ac3 JX |
9979 | msgid "" |
9980 | "No configured push destination.\n" | |
9981 | "Either specify the URL from the command-line or configure a remote " | |
9982 | "repository using\n" | |
9983 | "\n" | |
9984 | " git remote add <name> <url>\n" | |
9985 | "\n" | |
9986 | "and then push using the remote name\n" | |
9987 | "\n" | |
9988 | " git push <name>\n" | |
9989 | msgstr "" | |
90e6ef53 | 9990 | "没有配置推送目标。\n" |
4375c10e | 9991 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" |
c04f5ac3 | 9992 | "\n" |
d9d56b23 | 9993 | " git remote add <名称> <地址>\n" |
c04f5ac3 | 9994 | "\n" |
160fb2b2 | 9995 | "然后使用该远程仓库名执行推送\n" |
c04f5ac3 | 9996 | "\n" |
d9d56b23 | 9997 | " git push <名称>\n" |
c04f5ac3 | 9998 | |
5c57d762 | 9999 | #: builtin/push.c:385 |
c04f5ac3 JX |
10000 | msgid "--all and --tags are incompatible" |
10001 | msgstr "--all 和 --tags 不兼容" | |
10002 | ||
5c57d762 | 10003 | #: builtin/push.c:386 |
c04f5ac3 | 10004 | msgid "--all can't be combined with refspecs" |
160fb2b2 | 10005 | msgstr "--all 不能和引用规格同时使用" |
c04f5ac3 | 10006 | |
5c57d762 | 10007 | #: builtin/push.c:391 |
c04f5ac3 JX |
10008 | msgid "--mirror and --tags are incompatible" |
10009 | msgstr "--mirror 和 --tags 不兼容" | |
10010 | ||
5c57d762 | 10011 | #: builtin/push.c:392 |
c04f5ac3 | 10012 | msgid "--mirror can't be combined with refspecs" |
160fb2b2 | 10013 | msgstr "--mirror 不能和引用规格同时使用" |
c04f5ac3 | 10014 | |
5c57d762 | 10015 | #: builtin/push.c:397 |
c04f5ac3 JX |
10016 | msgid "--all and --mirror are incompatible" |
10017 | msgstr "--all 和 --mirror 不兼容" | |
10018 | ||
5c57d762 | 10019 | #: builtin/push.c:515 |
ef317cd5 | 10020 | msgid "repository" |
160fb2b2 | 10021 | msgstr "仓库" |
ef317cd5 | 10022 | |
5c57d762 | 10023 | #: builtin/push.c:516 builtin/send-pack.c:161 |
ef317cd5 | 10024 | msgid "push all refs" |
07432cef | 10025 | msgstr "推送所有引用" |
ef317cd5 | 10026 | |
5c57d762 | 10027 | #: builtin/push.c:517 builtin/send-pack.c:163 |
ef317cd5 | 10028 | msgid "mirror all refs" |
07432cef | 10029 | msgstr "镜像所有引用" |
ef317cd5 | 10030 | |
5c57d762 | 10031 | #: builtin/push.c:519 |
ef317cd5 | 10032 | msgid "delete refs" |
07432cef | 10033 | msgstr "删除引用" |
ef317cd5 | 10034 | |
5c57d762 | 10035 | #: builtin/push.c:520 |
ef317cd5 | 10036 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 10037 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 10038 | |
5c57d762 | 10039 | #: builtin/push.c:523 builtin/send-pack.c:164 |
ef317cd5 JX |
10040 | msgid "force updates" |
10041 | msgstr "强制更新" | |
10042 | ||
5c57d762 | 10043 | #: builtin/push.c:525 builtin/send-pack.c:175 |
90314792 JX |
10044 | msgid "refname>:<expect" |
10045 | msgstr "引用名>:<期望值" | |
10046 | ||
5c57d762 | 10047 | #: builtin/push.c:526 builtin/send-pack.c:176 |
90314792 JX |
10048 | msgid "require old value of ref to be at this value" |
10049 | msgstr "要求引用旧的取值为设定值" | |
10050 | ||
5c57d762 | 10051 | #: builtin/push.c:529 |
ef317cd5 | 10052 | msgid "control recursive pushing of submodules" |
07432cef | 10053 | msgstr "控制子模组的递归推送" |
ef317cd5 | 10054 | |
5c57d762 | 10055 | #: builtin/push.c:531 builtin/send-pack.c:169 |
ef317cd5 | 10056 | msgid "use thin pack" |
07432cef | 10057 | msgstr "使用精简打包" |
ef317cd5 | 10058 | |
5c57d762 | 10059 | #: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 |
1b7f4a34 | 10060 | #: builtin/send-pack.c:159 |
ef317cd5 | 10061 | msgid "receive pack program" |
07432cef | 10062 | msgstr "接收包程序" |
ef317cd5 | 10063 | |
5c57d762 | 10064 | #: builtin/push.c:534 |
ef317cd5 | 10065 | msgid "set upstream for git pull/status" |
07432cef | 10066 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 10067 | |
5c57d762 | 10068 | #: builtin/push.c:537 |
ef317cd5 | 10069 | msgid "prune locally removed refs" |
07432cef | 10070 | msgstr "清除本地删除的引用" |
ef317cd5 | 10071 | |
5c57d762 | 10072 | #: builtin/push.c:539 |
a77c07d9 JX |
10073 | msgid "bypass pre-push hook" |
10074 | msgstr "绕过 pre-push 钩子" | |
10075 | ||
5c57d762 | 10076 | #: builtin/push.c:540 |
1003b3a5 | 10077 | msgid "push missing but relevant tags" |
55a16ee4 | 10078 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 10079 | |
5c57d762 | 10080 | #: builtin/push.c:543 builtin/send-pack.c:166 |
220c313c JX |
10081 | msgid "GPG sign the push" |
10082 | msgstr "用 GPG 为推送签名" | |
10083 | ||
5c57d762 | 10084 | #: builtin/push.c:545 builtin/send-pack.c:170 |
814ff314 JX |
10085 | msgid "request atomic transaction on remote side" |
10086 | msgstr "需要远端支持原子事务" | |
10087 | ||
5c57d762 JX |
10088 | #: builtin/push.c:546 |
10089 | msgid "server-specific" | |
10090 | msgstr "server-specific" | |
10091 | ||
10092 | #: builtin/push.c:546 | |
10093 | msgid "option to transmit" | |
10094 | msgstr "传输的选项" | |
10095 | ||
10096 | #: builtin/push.c:560 | |
c04f5ac3 JX |
10097 | msgid "--delete is incompatible with --all, --mirror and --tags" |
10098 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
10099 | ||
5c57d762 | 10100 | #: builtin/push.c:562 |
c04f5ac3 JX |
10101 | msgid "--delete doesn't make sense without any refs" |
10102 | msgstr "--delete 未接任何引用没有意义" | |
10103 | ||
5c57d762 JX |
10104 | #: builtin/push.c:579 |
10105 | msgid "push options must not have new line characters" | |
10106 | msgstr "推送选项不能有换行符" | |
10107 | ||
220c313c | 10108 | #: builtin/read-tree.c:37 |
ef317cd5 | 10109 | msgid "" |
1b7f4a34 | 10110 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
10111 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
10112 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
10113 | msgstr "" | |
1b7f4a34 | 10114 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 10115 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 10116 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 10117 | |
220c313c | 10118 | #: builtin/read-tree.c:110 |
ef317cd5 | 10119 | msgid "write resulting index to <file>" |
d9d56b23 | 10120 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 10121 | |
220c313c | 10122 | #: builtin/read-tree.c:113 |
ef317cd5 | 10123 | msgid "only empty the index" |
07432cef | 10124 | msgstr "只是清空索引" |
ef317cd5 | 10125 | |
220c313c | 10126 | #: builtin/read-tree.c:115 |
ef317cd5 | 10127 | msgid "Merging" |
07432cef | 10128 | msgstr "合并" |
ef317cd5 | 10129 | |
220c313c | 10130 | #: builtin/read-tree.c:117 |
ef317cd5 | 10131 | msgid "perform a merge in addition to a read" |
07432cef | 10132 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 10133 | |
220c313c | 10134 | #: builtin/read-tree.c:119 |
ef317cd5 | 10135 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 10136 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 10137 | |
220c313c | 10138 | #: builtin/read-tree.c:121 |
ef317cd5 | 10139 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 10140 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 10141 | |
220c313c | 10142 | #: builtin/read-tree.c:123 |
ef317cd5 | 10143 | msgid "same as -m, but discard unmerged entries" |
07432cef | 10144 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 10145 | |
220c313c | 10146 | #: builtin/read-tree.c:124 |
ef317cd5 | 10147 | msgid "<subdirectory>/" |
07432cef | 10148 | msgstr "<子目录>/" |
ef317cd5 | 10149 | |
220c313c | 10150 | #: builtin/read-tree.c:125 |
ef317cd5 | 10151 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 10152 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 10153 | |
220c313c | 10154 | #: builtin/read-tree.c:128 |
ef317cd5 | 10155 | msgid "update working tree with merge result" |
07432cef | 10156 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 10157 | |
220c313c | 10158 | #: builtin/read-tree.c:130 |
ef317cd5 | 10159 | msgid "gitignore" |
07432cef | 10160 | msgstr "gitignore" |
ef317cd5 | 10161 | |
220c313c | 10162 | #: builtin/read-tree.c:131 |
ef317cd5 | 10163 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 10164 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 10165 | |
220c313c | 10166 | #: builtin/read-tree.c:134 |
ef317cd5 | 10167 | msgid "don't check the working tree after merging" |
07432cef | 10168 | msgstr "合并后不检查工作区" |
ef317cd5 | 10169 | |
220c313c | 10170 | #: builtin/read-tree.c:135 |
ef317cd5 | 10171 | msgid "don't update the index or the work tree" |
07432cef | 10172 | msgstr "不更新索引区和工作区" |
ef317cd5 | 10173 | |
220c313c | 10174 | #: builtin/read-tree.c:137 |
ef317cd5 | 10175 | msgid "skip applying sparse checkout filter" |
07432cef | 10176 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 10177 | |
220c313c | 10178 | #: builtin/read-tree.c:139 |
ef317cd5 | 10179 | msgid "debug unpack-trees" |
07432cef | 10180 | msgstr "调试 unpack-trees" |
ef317cd5 | 10181 | |
5b04ee3b JX |
10182 | #: builtin/receive-pack.c:25 |
10183 | msgid "git receive-pack <git-dir>" | |
10184 | msgstr "git receive-pack <git-dir>" | |
10185 | ||
5c57d762 | 10186 | #: builtin/receive-pack.c:1843 |
5b04ee3b JX |
10187 | msgid "quiet" |
10188 | msgstr "静默模式" | |
10189 | ||
5c57d762 | 10190 | #: builtin/receive-pack.c:1857 |
5b04ee3b JX |
10191 | msgid "You must specify a directory." |
10192 | msgstr "您必须指定一个目录。" | |
10193 | ||
276ceeaa | 10194 | #: builtin/reflog.c:423 |
2e8451e8 | 10195 | #, c-format |
1b7f4a34 | 10196 | msgid "'%s' for '%s' is not a valid timestamp" |
2e8451e8 JX |
10197 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" |
10198 | ||
276ceeaa | 10199 | #: builtin/reflog.c:540 builtin/reflog.c:545 |
2e8451e8 JX |
10200 | #, c-format |
10201 | msgid "'%s' is not a valid timestamp" | |
10202 | msgstr "'%s' 不是一个有效的时间戳" | |
10203 | ||
cfff71a9 | 10204 | #: builtin/remote.c:12 |
ef317cd5 | 10205 | msgid "git remote [-v | --verbose]" |
07432cef | 10206 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 10207 | |
cfff71a9 | 10208 | #: builtin/remote.c:13 |
ef317cd5 | 10209 | msgid "" |
814ff314 | 10210 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
10211 | "mirror=<fetch|push>] <name> <url>" |
10212 | msgstr "" | |
814ff314 | 10213 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 10214 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 10215 | |
94550ed3 | 10216 | #: builtin/remote.c:14 builtin/remote.c:34 |
ef317cd5 | 10217 | msgid "git remote rename <old> <new>" |
07432cef | 10218 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 10219 | |
94550ed3 | 10220 | #: builtin/remote.c:15 builtin/remote.c:39 |
ef317cd5 | 10221 | msgid "git remote remove <name>" |
07432cef | 10222 | msgstr "git remote remove <名称>" |
ef317cd5 | 10223 | |
94550ed3 | 10224 | #: builtin/remote.c:16 builtin/remote.c:44 |
814ff314 JX |
10225 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
10226 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 10227 | |
cfff71a9 | 10228 | #: builtin/remote.c:17 |
ef317cd5 | 10229 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 10230 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 10231 | |
cfff71a9 | 10232 | #: builtin/remote.c:18 |
ef317cd5 | 10233 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 10234 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 10235 | |
cfff71a9 | 10236 | #: builtin/remote.c:19 |
ef317cd5 JX |
10237 | msgid "" |
10238 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 10239 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 10240 | |
cfff71a9 | 10241 | #: builtin/remote.c:20 |
ef317cd5 | 10242 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 10243 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 10244 | |
94550ed3 JX |
10245 | #: builtin/remote.c:21 builtin/remote.c:70 |
10246 | msgid "git remote get-url [--push] [--all] <name>" | |
10247 | msgstr "git remote get-url [--push] [--all] <名称>" | |
10248 | ||
10249 | #: builtin/remote.c:22 builtin/remote.c:75 | |
ef317cd5 | 10250 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 10251 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 10252 | |
94550ed3 | 10253 | #: builtin/remote.c:23 builtin/remote.c:76 |
ef317cd5 | 10254 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 10255 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 10256 | |
94550ed3 | 10257 | #: builtin/remote.c:24 builtin/remote.c:77 |
ef317cd5 | 10258 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 10259 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 10260 | |
94550ed3 | 10261 | #: builtin/remote.c:29 |
ef317cd5 | 10262 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 10263 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 10264 | |
94550ed3 | 10265 | #: builtin/remote.c:49 |
ef317cd5 | 10266 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 10267 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 10268 | |
94550ed3 | 10269 | #: builtin/remote.c:50 |
ef317cd5 | 10270 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 10271 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 10272 | |
94550ed3 | 10273 | #: builtin/remote.c:55 |
ef317cd5 | 10274 | msgid "git remote show [<options>] <name>" |
07432cef | 10275 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 10276 | |
94550ed3 | 10277 | #: builtin/remote.c:60 |
ef317cd5 | 10278 | msgid "git remote prune [<options>] <name>" |
07432cef | 10279 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 10280 | |
94550ed3 | 10281 | #: builtin/remote.c:65 |
ef317cd5 | 10282 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 10283 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 10284 | |
94550ed3 | 10285 | #: builtin/remote.c:94 |
81809b99 | 10286 | #, c-format |
8ada9598 | 10287 | msgid "Updating %s" |
81809b99 | 10288 | msgstr "更新 %s 中" |
8ada9598 | 10289 | |
94550ed3 | 10290 | #: builtin/remote.c:126 |
8ada9598 JX |
10291 | msgid "" |
10292 | "--mirror is dangerous and deprecated; please\n" | |
10293 | "\t use --mirror=fetch or --mirror=push instead" | |
10294 | msgstr "" | |
81809b99 JX |
10295 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
10296 | "\t 或 --mirror=push" | |
8ada9598 | 10297 | |
94550ed3 | 10298 | #: builtin/remote.c:143 |
81809b99 | 10299 | #, c-format |
8ada9598 | 10300 | msgid "unknown mirror argument: %s" |
81809b99 | 10301 | msgstr "未知的镜像参数:%s" |
8ada9598 | 10302 | |
94550ed3 | 10303 | #: builtin/remote.c:159 |
ef317cd5 | 10304 | msgid "fetch the remote branches" |
07432cef | 10305 | msgstr "抓取远程的分支" |
ef317cd5 | 10306 | |
94550ed3 | 10307 | #: builtin/remote.c:161 |
ef317cd5 | 10308 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 10309 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 10310 | |
94550ed3 | 10311 | #: builtin/remote.c:164 |
ef317cd5 | 10312 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 10313 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 10314 | |
94550ed3 | 10315 | #: builtin/remote.c:166 |
ef317cd5 | 10316 | msgid "branch(es) to track" |
07432cef | 10317 | msgstr "跟踪的分支" |
ef317cd5 | 10318 | |
94550ed3 | 10319 | #: builtin/remote.c:167 |
ef317cd5 | 10320 | msgid "master branch" |
07432cef | 10321 | msgstr "主线分支" |
ef317cd5 | 10322 | |
94550ed3 | 10323 | #: builtin/remote.c:168 |
ef317cd5 | 10324 | msgid "push|fetch" |
07432cef | 10325 | msgstr "push|fetch" |
ef317cd5 | 10326 | |
94550ed3 | 10327 | #: builtin/remote.c:169 |
ef317cd5 | 10328 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 10329 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 10330 | |
94550ed3 | 10331 | #: builtin/remote.c:181 |
8ada9598 | 10332 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 10333 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 10334 | |
94550ed3 | 10335 | #: builtin/remote.c:183 |
8ada9598 | 10336 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 10337 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 10338 | |
5c57d762 | 10339 | #: builtin/remote.c:190 builtin/remote.c:629 |
81809b99 | 10340 | #, c-format |
8ada9598 | 10341 | msgid "remote %s already exists." |
81809b99 | 10342 | msgstr "远程 %s 已经存在。" |
8ada9598 | 10343 | |
5c57d762 | 10344 | #: builtin/remote.c:194 builtin/remote.c:633 |
81809b99 | 10345 | #, c-format |
8ada9598 | 10346 | msgid "'%s' is not a valid remote name" |
81809b99 | 10347 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 10348 | |
276ceeaa | 10349 | #: builtin/remote.c:234 |
81809b99 | 10350 | #, c-format |
8ada9598 | 10351 | msgid "Could not setup master '%s'" |
81809b99 | 10352 | msgstr "无法设置 master '%s'" |
8ada9598 | 10353 | |
276ceeaa | 10354 | #: builtin/remote.c:336 |
81809b99 | 10355 | #, c-format |
8ada9598 | 10356 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 10357 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 10358 | |
276ceeaa | 10359 | #: builtin/remote.c:437 builtin/remote.c:445 |
8ada9598 | 10360 | msgid "(matching)" |
81809b99 | 10361 | msgstr "(匹配)" |
8ada9598 | 10362 | |
276ceeaa | 10363 | #: builtin/remote.c:449 |
8ada9598 | 10364 | msgid "(delete)" |
81809b99 | 10365 | msgstr "(删除)" |
8ada9598 | 10366 | |
5c57d762 | 10367 | #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 |
81809b99 | 10368 | #, c-format |
8ada9598 | 10369 | msgid "No such remote: %s" |
81809b99 | 10370 | msgstr "没有这样的远程:%s" |
8ada9598 | 10371 | |
5c57d762 | 10372 | #: builtin/remote.c:639 |
81809b99 | 10373 | #, c-format |
8ada9598 | 10374 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 10375 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 10376 | |
5c57d762 | 10377 | #: builtin/remote.c:659 |
8ada9598 JX |
10378 | #, c-format |
10379 | msgid "" | |
d691f479 | 10380 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
10381 | "\t%s\n" |
10382 | "\tPlease update the configuration manually if necessary." | |
10383 | msgstr "" | |
160fb2b2 | 10384 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
10385 | "\t%s\n" |
10386 | "\t如果必要请手动更新配置。" | |
8ada9598 | 10387 | |
5c57d762 | 10388 | #: builtin/remote.c:695 |
81809b99 | 10389 | #, c-format |
8ada9598 | 10390 | msgid "deleting '%s' failed" |
81809b99 | 10391 | msgstr "删除 '%s' 失败" |
8ada9598 | 10392 | |
5c57d762 | 10393 | #: builtin/remote.c:729 |
81809b99 | 10394 | #, c-format |
8ada9598 | 10395 | msgid "creating '%s' failed" |
81809b99 | 10396 | msgstr "创建 '%s' 失败" |
8ada9598 | 10397 | |
5c57d762 | 10398 | #: builtin/remote.c:792 |
8ada9598 JX |
10399 | msgid "" |
10400 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
10401 | "to delete it, use:" | |
10402 | msgid_plural "" | |
10403 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
10404 | "to delete them, use:" | |
5ae481e0 JX |
10405 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
10406 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 10407 | |
5c57d762 | 10408 | #: builtin/remote.c:806 |
276ceeaa JX |
10409 | #, c-format |
10410 | msgid "Could not remove config section '%s'" | |
10411 | msgstr "不能移除配置小节 '%s'" | |
10412 | ||
5c57d762 | 10413 | #: builtin/remote.c:907 |
8ada9598 JX |
10414 | #, c-format |
10415 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 10416 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 10417 | |
5c57d762 | 10418 | #: builtin/remote.c:910 |
8ada9598 | 10419 | msgid " tracked" |
81809b99 | 10420 | msgstr " 已跟踪" |
8ada9598 | 10421 | |
5c57d762 | 10422 | #: builtin/remote.c:912 |
8ada9598 | 10423 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 10424 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 10425 | |
5c57d762 | 10426 | #: builtin/remote.c:914 |
8ada9598 | 10427 | msgid " ???" |
81809b99 | 10428 | msgstr " ???" |
8ada9598 | 10429 | |
5c57d762 | 10430 | #: builtin/remote.c:955 |
8ada9598 JX |
10431 | #, c-format |
10432 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 10433 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 10434 | |
5c57d762 | 10435 | #: builtin/remote.c:963 |
81809b99 | 10436 | #, c-format |
276ceeaa JX |
10437 | msgid "rebases interactively onto remote %s" |
10438 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 10439 | |
5c57d762 JX |
10440 | #: builtin/remote.c:964 |
10441 | #, c-format | |
10442 | msgid "rebases onto remote %s" | |
10443 | msgstr "变基到远程 %s" | |
10444 | ||
10445 | #: builtin/remote.c:967 | |
81809b99 | 10446 | #, c-format |
8ada9598 | 10447 | msgid " merges with remote %s" |
81809b99 | 10448 | msgstr " 与远程 %s 合并" |
8ada9598 | 10449 | |
5c57d762 | 10450 | #: builtin/remote.c:970 |
81809b99 | 10451 | #, c-format |
8ada9598 | 10452 | msgid "merges with remote %s" |
81809b99 | 10453 | msgstr "与远程 %s 合并" |
8ada9598 | 10454 | |
5c57d762 JX |
10455 | #: builtin/remote.c:973 |
10456 | #, c-format | |
10457 | msgid "%-*s and with remote %s\n" | |
10458 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 10459 | |
5c57d762 | 10460 | #: builtin/remote.c:1016 |
8ada9598 | 10461 | msgid "create" |
81809b99 | 10462 | msgstr "创建" |
8ada9598 | 10463 | |
5c57d762 | 10464 | #: builtin/remote.c:1019 |
8ada9598 | 10465 | msgid "delete" |
81809b99 | 10466 | msgstr "删除" |
8ada9598 | 10467 | |
5c57d762 | 10468 | #: builtin/remote.c:1023 |
8ada9598 | 10469 | msgid "up to date" |
81809b99 | 10470 | msgstr "最新" |
8ada9598 | 10471 | |
5c57d762 | 10472 | #: builtin/remote.c:1026 |
8ada9598 | 10473 | msgid "fast-forwardable" |
81809b99 | 10474 | msgstr "可快进" |
8ada9598 | 10475 | |
5c57d762 | 10476 | #: builtin/remote.c:1029 |
8ada9598 | 10477 | msgid "local out of date" |
81809b99 | 10478 | msgstr "本地已过时" |
8ada9598 | 10479 | |
5c57d762 | 10480 | #: builtin/remote.c:1036 |
8ada9598 JX |
10481 | #, c-format |
10482 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 10483 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 10484 | |
5c57d762 | 10485 | #: builtin/remote.c:1039 |
8ada9598 JX |
10486 | #, c-format |
10487 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 10488 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 10489 | |
5c57d762 | 10490 | #: builtin/remote.c:1043 |
8ada9598 JX |
10491 | #, c-format |
10492 | msgid " %-*s forces to %s" | |
81809b99 | 10493 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 10494 | |
5c57d762 | 10495 | #: builtin/remote.c:1046 |
8ada9598 JX |
10496 | #, c-format |
10497 | msgid " %-*s pushes to %s" | |
81809b99 | 10498 | msgstr " %-*s 推送至 %s" |
8ada9598 | 10499 | |
5c57d762 | 10500 | #: builtin/remote.c:1114 |
ef317cd5 | 10501 | msgid "do not query remotes" |
07432cef | 10502 | msgstr "不查询远程" |
ef317cd5 | 10503 | |
5c57d762 | 10504 | #: builtin/remote.c:1141 |
81809b99 | 10505 | #, c-format |
8ada9598 | 10506 | msgid "* remote %s" |
81809b99 | 10507 | msgstr "* 远程 %s" |
8ada9598 | 10508 | |
5c57d762 | 10509 | #: builtin/remote.c:1142 |
8ada9598 JX |
10510 | #, c-format |
10511 | msgid " Fetch URL: %s" | |
81809b99 | 10512 | msgstr " 获取地址:%s" |
8ada9598 | 10513 | |
5c57d762 | 10514 | #: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 |
8ada9598 | 10515 | msgid "(no URL)" |
81809b99 | 10516 | msgstr "(无 URL)" |
8ada9598 | 10517 | |
5b04ee3b JX |
10518 | #. TRANSLATORS: the colon ':' should align with |
10519 | #. the one in " Fetch URL: %s" translation | |
5c57d762 | 10520 | #: builtin/remote.c:1154 builtin/remote.c:1156 |
8ada9598 JX |
10521 | #, c-format |
10522 | msgid " Push URL: %s" | |
81809b99 | 10523 | msgstr " 推送地址:%s" |
8ada9598 | 10524 | |
5c57d762 | 10525 | #: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 |
81809b99 | 10526 | #, c-format |
8ada9598 | 10527 | msgid " HEAD branch: %s" |
4375c10e | 10528 | msgstr " HEAD 分支:%s" |
8ada9598 | 10529 | |
5c57d762 JX |
10530 | # 译者:中文字符串拼接,可删除前导空格 |
10531 | #: builtin/remote.c:1158 | |
10532 | msgid "(not queried)" | |
10533 | msgstr "(未查询)" | |
10534 | ||
10535 | #: builtin/remote.c:1160 | |
10536 | msgid "(unknown)" | |
10537 | msgstr "(未知)" | |
10538 | ||
10539 | #: builtin/remote.c:1164 | |
8ada9598 JX |
10540 | #, c-format |
10541 | msgid "" | |
10542 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 10543 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 10544 | |
5c57d762 | 10545 | #: builtin/remote.c:1176 |
81809b99 | 10546 | #, c-format |
8ada9598 JX |
10547 | msgid " Remote branch:%s" |
10548 | msgid_plural " Remote branches:%s" | |
81809b99 | 10549 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 10550 | msgstr[1] " 远程分支:%s" |
8ada9598 | 10551 | |
81809b99 | 10552 | # 译者:中文字符串拼接,可删除前导空格 |
5c57d762 | 10553 | #: builtin/remote.c:1179 builtin/remote.c:1206 |
8ada9598 | 10554 | msgid " (status not queried)" |
81809b99 | 10555 | msgstr "(状态未查询)" |
8ada9598 | 10556 | |
5c57d762 | 10557 | #: builtin/remote.c:1188 |
8ada9598 JX |
10558 | msgid " Local branch configured for 'git pull':" |
10559 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 10560 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 10561 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 10562 | |
5c57d762 | 10563 | #: builtin/remote.c:1196 |
8ada9598 | 10564 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 10565 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 10566 | |
5c57d762 | 10567 | #: builtin/remote.c:1203 |
81809b99 | 10568 | #, c-format |
8ada9598 JX |
10569 | msgid " Local ref configured for 'git push'%s:" |
10570 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 10571 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 10572 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 10573 | |
5c57d762 | 10574 | #: builtin/remote.c:1224 |
ef317cd5 | 10575 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 10576 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 10577 | |
5c57d762 | 10578 | #: builtin/remote.c:1226 |
ef317cd5 | 10579 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 10580 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 10581 | |
5c57d762 | 10582 | #: builtin/remote.c:1241 |
8ada9598 | 10583 | msgid "Cannot determine remote HEAD" |
81809b99 | 10584 | msgstr "无法确定远程 HEAD" |
8ada9598 | 10585 | |
5c57d762 | 10586 | #: builtin/remote.c:1243 |
8ada9598 | 10587 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 10588 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 10589 | |
5c57d762 | 10590 | #: builtin/remote.c:1253 |
81809b99 | 10591 | #, c-format |
8ada9598 | 10592 | msgid "Could not delete %s" |
81809b99 | 10593 | msgstr "无法删除 %s" |
8ada9598 | 10594 | |
5c57d762 | 10595 | #: builtin/remote.c:1261 |
81809b99 | 10596 | #, c-format |
8ada9598 | 10597 | msgid "Not a valid ref: %s" |
81809b99 | 10598 | msgstr "不是一个有效引用:%s" |
8ada9598 | 10599 | |
5c57d762 | 10600 | #: builtin/remote.c:1263 |
81809b99 | 10601 | #, c-format |
8ada9598 | 10602 | msgid "Could not setup %s" |
81809b99 | 10603 | msgstr "不能设置 %s" |
8ada9598 JX |
10604 | |
10605 | # 译者:注意保持前导空格 | |
5c57d762 | 10606 | #: builtin/remote.c:1281 |
81809b99 | 10607 | #, c-format |
8ada9598 | 10608 | msgid " %s will become dangling!" |
07432cef | 10609 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
10610 | |
10611 | # 译者:注意保持前导空格 | |
5c57d762 | 10612 | #: builtin/remote.c:1282 |
81809b99 | 10613 | #, c-format |
8ada9598 | 10614 | msgid " %s has become dangling!" |
07432cef | 10615 | msgstr " %s 已成为摇摆状态!" |
8ada9598 | 10616 | |
5c57d762 | 10617 | #: builtin/remote.c:1292 |
81809b99 | 10618 | #, c-format |
8ada9598 | 10619 | msgid "Pruning %s" |
81809b99 | 10620 | msgstr "修剪 %s" |
8ada9598 | 10621 | |
5c57d762 | 10622 | #: builtin/remote.c:1293 |
8ada9598 JX |
10623 | #, c-format |
10624 | msgid "URL: %s" | |
81809b99 | 10625 | msgstr "URL:%s" |
8ada9598 | 10626 | |
5c57d762 | 10627 | #: builtin/remote.c:1309 |
8ada9598 JX |
10628 | #, c-format |
10629 | msgid " * [would prune] %s" | |
81809b99 | 10630 | msgstr " * [将删除] %s" |
8ada9598 | 10631 | |
5c57d762 | 10632 | #: builtin/remote.c:1312 |
8ada9598 JX |
10633 | #, c-format |
10634 | msgid " * [pruned] %s" | |
81809b99 | 10635 | msgstr " * [已删除] %s" |
8ada9598 | 10636 | |
5c57d762 | 10637 | #: builtin/remote.c:1357 |
ef317cd5 | 10638 | msgid "prune remotes after fetching" |
07432cef | 10639 | msgstr "抓取后清除远程" |
ef317cd5 | 10640 | |
5c57d762 | 10641 | #: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 |
81809b99 | 10642 | #, c-format |
8ada9598 | 10643 | msgid "No such remote '%s'" |
81809b99 | 10644 | msgstr "没有此远程 '%s'" |
8ada9598 | 10645 | |
5c57d762 | 10646 | #: builtin/remote.c:1436 |
ef317cd5 | 10647 | msgid "add branch" |
07432cef | 10648 | msgstr "添加分支" |
ef317cd5 | 10649 | |
5c57d762 | 10650 | #: builtin/remote.c:1443 |
8ada9598 | 10651 | msgid "no remote specified" |
81809b99 | 10652 | msgstr "未指定远程" |
8ada9598 | 10653 | |
5c57d762 | 10654 | #: builtin/remote.c:1460 |
94550ed3 JX |
10655 | msgid "query push URLs rather than fetch URLs" |
10656 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
10657 | ||
5c57d762 | 10658 | #: builtin/remote.c:1462 |
94550ed3 JX |
10659 | msgid "return all URLs" |
10660 | msgstr "返回所有 URL 地址" | |
10661 | ||
5c57d762 | 10662 | #: builtin/remote.c:1490 |
94550ed3 JX |
10663 | #, c-format |
10664 | msgid "no URLs configured for remote '%s'" | |
10665 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
10666 | ||
5c57d762 | 10667 | #: builtin/remote.c:1516 |
ef317cd5 | 10668 | msgid "manipulate push URLs" |
07432cef | 10669 | msgstr "操作推送 URLS" |
ef317cd5 | 10670 | |
5c57d762 | 10671 | #: builtin/remote.c:1518 |
ef317cd5 | 10672 | msgid "add URL" |
07432cef | 10673 | msgstr "添加 URL" |
ef317cd5 | 10674 | |
5c57d762 | 10675 | #: builtin/remote.c:1520 |
ef317cd5 | 10676 | msgid "delete URLs" |
07432cef | 10677 | msgstr "删除 URLS" |
ef317cd5 | 10678 | |
5c57d762 | 10679 | #: builtin/remote.c:1527 |
8ada9598 | 10680 | msgid "--add --delete doesn't make sense" |
81809b99 | 10681 | msgstr "--add --delete 无意义" |
8ada9598 | 10682 | |
5c57d762 | 10683 | #: builtin/remote.c:1568 |
81809b99 | 10684 | #, c-format |
8ada9598 | 10685 | msgid "Invalid old URL pattern: %s" |
4375c10e | 10686 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 10687 | |
5c57d762 | 10688 | #: builtin/remote.c:1576 |
81809b99 | 10689 | #, c-format |
8ada9598 | 10690 | msgid "No such URL found: %s" |
4375c10e | 10691 | msgstr "未找到此 URL:%s" |
8ada9598 | 10692 | |
5c57d762 | 10693 | #: builtin/remote.c:1578 |
8ada9598 | 10694 | msgid "Will not delete all non-push URLs" |
4375c10e | 10695 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 10696 | |
5c57d762 | 10697 | #: builtin/remote.c:1592 |
ef317cd5 | 10698 | msgid "be verbose; must be placed before a subcommand" |
07432cef | 10699 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 10700 | |
6acbf033 | 10701 | #: builtin/repack.c:17 |
814ff314 JX |
10702 | msgid "git repack [<options>]" |
10703 | msgstr "git repack [<选项>]" | |
90314792 | 10704 | |
5c57d762 | 10705 | #: builtin/repack.c:160 |
90314792 JX |
10706 | msgid "pack everything in a single pack" |
10707 | msgstr "所有内容打包到一个包文件中" | |
10708 | ||
5c57d762 | 10709 | #: builtin/repack.c:162 |
90314792 JX |
10710 | msgid "same as -a, and turn unreachable objects loose" |
10711 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
10712 | ||
5c57d762 | 10713 | #: builtin/repack.c:165 |
90314792 JX |
10714 | msgid "remove redundant packs, and run git-prune-packed" |
10715 | msgstr "删除多余的包,运行 git-prune-packed" | |
10716 | ||
5c57d762 | 10717 | #: builtin/repack.c:167 |
90314792 JX |
10718 | msgid "pass --no-reuse-delta to git-pack-objects" |
10719 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
10720 | ||
5c57d762 | 10721 | #: builtin/repack.c:169 |
90314792 JX |
10722 | msgid "pass --no-reuse-object to git-pack-objects" |
10723 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
10724 | ||
5c57d762 | 10725 | #: builtin/repack.c:171 |
90314792 JX |
10726 | msgid "do not run git-update-server-info" |
10727 | msgstr "不运行 git-update-server-info" | |
10728 | ||
5c57d762 | 10729 | #: builtin/repack.c:174 |
90314792 JX |
10730 | msgid "pass --local to git-pack-objects" |
10731 | msgstr "向 git-pack-objects 传递参数 --local" | |
10732 | ||
5c57d762 | 10733 | #: builtin/repack.c:176 |
6c94aba5 JX |
10734 | msgid "write bitmap index" |
10735 | msgstr "写 bitmap 索引" | |
10736 | ||
5c57d762 | 10737 | #: builtin/repack.c:177 |
90314792 JX |
10738 | msgid "approxidate" |
10739 | msgstr "近似日期" | |
10740 | ||
5c57d762 | 10741 | #: builtin/repack.c:178 |
90314792 JX |
10742 | msgid "with -A, do not loosen objects older than this" |
10743 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
10744 | ||
5c57d762 JX |
10745 | #: builtin/repack.c:180 |
10746 | msgid "with -a, repack unreachable objects" | |
10747 | msgstr "使用 -a ,重新对不可达对象打包" | |
10748 | ||
10749 | #: builtin/repack.c:182 | |
90314792 JX |
10750 | msgid "size of the window used for delta compression" |
10751 | msgstr "用于增量压缩的窗口值" | |
10752 | ||
5c57d762 | 10753 | #: builtin/repack.c:183 builtin/repack.c:187 |
8376b58d JX |
10754 | msgid "bytes" |
10755 | msgstr "字节" | |
10756 | ||
5c57d762 | 10757 | #: builtin/repack.c:184 |
90314792 JX |
10758 | msgid "same as the above, but limit memory size instead of entries count" |
10759 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
10760 | ||
5c57d762 | 10761 | #: builtin/repack.c:186 |
90314792 JX |
10762 | msgid "limits the maximum delta depth" |
10763 | msgstr "限制最大增量深度" | |
10764 | ||
5c57d762 | 10765 | #: builtin/repack.c:188 |
90314792 | 10766 | msgid "maximum size of each packfile" |
dbd6cced | 10767 | msgstr "每个包文件的最大尺寸" |
90314792 | 10768 | |
5c57d762 | 10769 | #: builtin/repack.c:190 |
6c94aba5 JX |
10770 | msgid "repack objects in packs marked with .keep" |
10771 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
10772 | ||
5c57d762 | 10773 | #: builtin/repack.c:200 |
94550ed3 JX |
10774 | msgid "cannot delete packs in a precious-objects repo" |
10775 | msgstr "不能删除珍品仓库中的打包文件" | |
10776 | ||
5c57d762 JX |
10777 | #: builtin/repack.c:204 |
10778 | msgid "--keep-unreachable and -A are incompatible" | |
10779 | msgstr "--keep-unreachable 和 -A 不兼容" | |
10780 | ||
10781 | #: builtin/repack.c:391 builtin/worktree.c:115 | |
90314792 | 10782 | #, c-format |
5c57d762 JX |
10783 | msgid "failed to remove '%s'" |
10784 | msgstr "无法删除 '%s'" | |
90314792 | 10785 | |
6acbf033 | 10786 | #: builtin/replace.c:19 |
ef317cd5 | 10787 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 10788 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 10789 | |
6acbf033 JX |
10790 | #: builtin/replace.c:20 |
10791 | msgid "git replace [-f] --edit <object>" | |
10792 | msgstr "git replace [-f] --edit <对象>" | |
10793 | ||
10794 | #: builtin/replace.c:21 | |
10795 | msgid "git replace [-f] --graft <commit> [<parent>...]" | |
10796 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
10797 | ||
10798 | #: builtin/replace.c:22 | |
ef317cd5 | 10799 | msgid "git replace -d <object>..." |
07432cef | 10800 | msgstr "git replace -d <对象>..." |
ef317cd5 | 10801 | |
6acbf033 | 10802 | #: builtin/replace.c:23 |
cfff71a9 JX |
10803 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
10804 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 10805 | |
220c313c | 10806 | #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 |
6acbf033 JX |
10807 | #, c-format |
10808 | msgid "Not a valid object name: '%s'" | |
10809 | msgstr "不是一个有效的对象名:'%s'" | |
10810 | ||
220c313c | 10811 | #: builtin/replace.c:355 |
6acbf033 JX |
10812 | #, c-format |
10813 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 10814 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 10815 | |
220c313c | 10816 | #: builtin/replace.c:357 |
6acbf033 JX |
10817 | #, c-format |
10818 | msgid "malformed mergetag in commit '%s'" | |
55a16ee4 | 10819 | msgstr "提交 '%s' 中含有非法的合并标签" |
6acbf033 | 10820 | |
220c313c | 10821 | #: builtin/replace.c:368 |
6acbf033 JX |
10822 | #, c-format |
10823 | msgid "" | |
10824 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
10825 | "instead of --graft" | |
55a16ee4 | 10826 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 10827 | |
220c313c | 10828 | #: builtin/replace.c:401 |
6acbf033 JX |
10829 | #, c-format |
10830 | msgid "the original commit '%s' has a gpg signature." | |
10831 | msgstr "原始提交 '%s' 中包含一个 GPG 签名" | |
10832 | ||
220c313c | 10833 | #: builtin/replace.c:402 |
6acbf033 JX |
10834 | msgid "the signature will be removed in the replacement commit!" |
10835 | msgstr "在替换的提交中签名将被移除!" | |
10836 | ||
220c313c | 10837 | #: builtin/replace.c:408 |
6acbf033 JX |
10838 | #, c-format |
10839 | msgid "could not write replacement commit for: '%s'" | |
10840 | msgstr "不能为 '%s' 写替换提交" | |
10841 | ||
220c313c | 10842 | #: builtin/replace.c:432 |
ef317cd5 | 10843 | msgid "list replace refs" |
07432cef | 10844 | msgstr "列出替换的引用" |
ef317cd5 | 10845 | |
220c313c | 10846 | #: builtin/replace.c:433 |
ef317cd5 | 10847 | msgid "delete replace refs" |
07432cef | 10848 | msgstr "删除替换的引用" |
ef317cd5 | 10849 | |
220c313c | 10850 | #: builtin/replace.c:434 |
6acbf033 JX |
10851 | msgid "edit existing object" |
10852 | msgstr "编辑现存的对象" | |
10853 | ||
220c313c | 10854 | #: builtin/replace.c:435 |
6acbf033 JX |
10855 | msgid "change a commit's parents" |
10856 | msgstr "修改一个提交的父提交" | |
10857 | ||
220c313c | 10858 | #: builtin/replace.c:436 |
ef317cd5 | 10859 | msgid "replace the ref if it exists" |
07432cef | 10860 | msgstr "如果存在则替换引用" |
ef317cd5 | 10861 | |
220c313c | 10862 | #: builtin/replace.c:437 |
6acbf033 JX |
10863 | msgid "do not pretty-print contents for --edit" |
10864 | msgstr "不要为 --edit 操作美观显示内容" | |
10865 | ||
220c313c | 10866 | #: builtin/replace.c:438 |
cfff71a9 JX |
10867 | msgid "use this format" |
10868 | msgstr "使用此格式" | |
10869 | ||
90314792 | 10870 | #: builtin/rerere.c:12 |
814ff314 JX |
10871 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
10872 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 10873 | |
94550ed3 | 10874 | #: builtin/rerere.c:58 |
ef317cd5 | 10875 | msgid "register clean resolutions in index" |
07432cef | 10876 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 10877 | |
220c313c | 10878 | #: builtin/reset.c:26 |
ef317cd5 JX |
10879 | msgid "" |
10880 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 10881 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 10882 | |
220c313c | 10883 | #: builtin/reset.c:27 |
07432cef WS |
10884 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
10885 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 | 10886 | |
220c313c | 10887 | #: builtin/reset.c:28 |
07432cef WS |
10888 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
10889 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 10890 | |
220c313c | 10891 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10892 | msgid "mixed" |
10893 | msgstr "混杂" | |
10894 | ||
220c313c | 10895 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10896 | msgid "soft" |
10897 | msgstr "软性" | |
10898 | ||
220c313c | 10899 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10900 | msgid "hard" |
10901 | msgstr "硬性" | |
10902 | ||
220c313c | 10903 | #: builtin/reset.c:34 |
8ada9598 JX |
10904 | msgid "merge" |
10905 | msgstr "合并" | |
10906 | ||
220c313c | 10907 | #: builtin/reset.c:34 |
c04f5ac3 JX |
10908 | msgid "keep" |
10909 | msgstr "保持" | |
10910 | ||
220c313c | 10911 | #: builtin/reset.c:74 |
c04f5ac3 JX |
10912 | msgid "You do not have a valid HEAD." |
10913 | msgstr "您没有一个有效的 HEAD。" | |
10914 | ||
220c313c | 10915 | #: builtin/reset.c:76 |
c04f5ac3 JX |
10916 | msgid "Failed to find tree of HEAD." |
10917 | msgstr "无法找到 HEAD 指向的树。" | |
10918 | ||
220c313c | 10919 | #: builtin/reset.c:82 |
c04f5ac3 JX |
10920 | #, c-format |
10921 | msgid "Failed to find tree of %s." | |
10922 | msgstr "无法找到 %s 指向的树。" | |
10923 | ||
220c313c | 10924 | #: builtin/reset.c:100 |
c04f5ac3 JX |
10925 | #, c-format |
10926 | msgid "HEAD is now at %s" | |
10927 | msgstr "HEAD 现在位于 %s" | |
10928 | ||
90e6ef53 | 10929 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10930 | #: builtin/reset.c:183 |
c04f5ac3 JX |
10931 | #, c-format |
10932 | msgid "Cannot do a %s reset in the middle of a merge." | |
10933 | msgstr "在合并过程中不能做%s重置操作。" | |
10934 | ||
220c313c | 10935 | #: builtin/reset.c:276 |
ef317cd5 | 10936 | msgid "be quiet, only report errors" |
07432cef | 10937 | msgstr "安静模式,只报告错误" |
ef317cd5 | 10938 | |
220c313c | 10939 | #: builtin/reset.c:278 |
ef317cd5 | 10940 | msgid "reset HEAD and index" |
07432cef | 10941 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 10942 | |
220c313c | 10943 | #: builtin/reset.c:279 |
ef317cd5 | 10944 | msgid "reset only HEAD" |
07432cef | 10945 | msgstr "只重置 HEAD" |
ef317cd5 | 10946 | |
220c313c | 10947 | #: builtin/reset.c:281 builtin/reset.c:283 |
ef317cd5 | 10948 | msgid "reset HEAD, index and working tree" |
07432cef | 10949 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 10950 | |
220c313c | 10951 | #: builtin/reset.c:285 |
ef317cd5 | 10952 | msgid "reset HEAD but keep local changes" |
07432cef | 10953 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 10954 | |
220c313c | 10955 | #: builtin/reset.c:288 |
6c94aba5 JX |
10956 | msgid "record only the fact that removed paths will be added later" |
10957 | msgstr "将删除的路径标记为稍后添加" | |
10958 | ||
220c313c | 10959 | #: builtin/reset.c:305 |
07432cef WS |
10960 | #, c-format |
10961 | msgid "Failed to resolve '%s' as a valid revision." | |
10962 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
10963 | ||
220c313c | 10964 | #: builtin/reset.c:313 |
07432cef WS |
10965 | #, c-format |
10966 | msgid "Failed to resolve '%s' as a valid tree." | |
10967 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
10968 | ||
220c313c | 10969 | #: builtin/reset.c:322 |
c04f5ac3 | 10970 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 10971 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 10972 | |
220c313c | 10973 | #: builtin/reset.c:331 |
c04f5ac3 | 10974 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 10975 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 10976 | |
90e6ef53 | 10977 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10978 | #: builtin/reset.c:333 |
c04f5ac3 JX |
10979 | #, c-format |
10980 | msgid "Cannot do %s reset with paths." | |
10981 | msgstr "不能带路径进行%s重置。" | |
10982 | ||
90e6ef53 | 10983 | # 译者:汉字之间无空格,故删除%s前后空格 |
220c313c | 10984 | #: builtin/reset.c:343 |
c04f5ac3 JX |
10985 | #, c-format |
10986 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 10987 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 10988 | |
220c313c | 10989 | #: builtin/reset.c:347 |
6c94aba5 JX |
10990 | msgid "-N can only be used with --mixed" |
10991 | msgstr "-N 只能和 --mixed 同时使用" | |
10992 | ||
220c313c | 10993 | #: builtin/reset.c:364 |
90314792 | 10994 | msgid "Unstaged changes after reset:" |
160fb2b2 | 10995 | msgstr "重置后取消暂存的变更:" |
90314792 | 10996 | |
220c313c | 10997 | #: builtin/reset.c:370 |
ef317cd5 JX |
10998 | #, c-format |
10999 | msgid "Could not reset index file to revision '%s'." | |
11000 | msgstr "不能重置索引文件至版本 '%s'。" | |
11001 | ||
220c313c | 11002 | #: builtin/reset.c:374 |
07432cef WS |
11003 | msgid "Could not write new index file." |
11004 | msgstr "不能写入新的索引文件。" | |
11005 | ||
5c57d762 | 11006 | #: builtin/rev-list.c:362 |
1b7f4a34 JX |
11007 | msgid "rev-list does not support display of notes" |
11008 | msgstr "rev-list 不支持显示注解" | |
11009 | ||
94550ed3 | 11010 | #: builtin/rev-parse.c:358 |
814ff314 JX |
11011 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
11012 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 11013 | |
94550ed3 | 11014 | #: builtin/rev-parse.c:363 |
ef317cd5 | 11015 | msgid "keep the `--` passed as an arg" |
07432cef | 11016 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 11017 | |
94550ed3 | 11018 | #: builtin/rev-parse.c:365 |
ef317cd5 | 11019 | msgid "stop parsing after the first non-option argument" |
07432cef | 11020 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 11021 | |
94550ed3 | 11022 | #: builtin/rev-parse.c:368 |
cfff71a9 JX |
11023 | msgid "output in stuck long form" |
11024 | msgstr "以固定长格式输出" | |
11025 | ||
94550ed3 | 11026 | #: builtin/rev-parse.c:499 |
ef317cd5 | 11027 | msgid "" |
814ff314 | 11028 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 11029 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 11030 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
11031 | "\n" |
11032 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
11033 | msgstr "" | |
814ff314 | 11034 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 11035 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 11036 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
11037 | "\n" |
11038 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
11039 | |
11040 | #: builtin/revert.c:22 | |
814ff314 JX |
11041 | msgid "git revert [<options>] <commit-ish>..." |
11042 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 JX |
11043 | |
11044 | #: builtin/revert.c:23 | |
11045 | msgid "git revert <subcommand>" | |
07432cef | 11046 | msgstr "git revert <子命令>" |
ef317cd5 JX |
11047 | |
11048 | #: builtin/revert.c:28 | |
814ff314 JX |
11049 | msgid "git cherry-pick [<options>] <commit-ish>..." |
11050 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 JX |
11051 | |
11052 | #: builtin/revert.c:29 | |
ef317cd5 | 11053 | msgid "git cherry-pick <subcommand>" |
07432cef | 11054 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 11055 | |
90314792 | 11056 | #: builtin/revert.c:71 |
ef317cd5 JX |
11057 | #, c-format |
11058 | msgid "%s: %s cannot be used with %s" | |
11059 | msgstr "%s:%s 不能和 %s 同时使用" | |
11060 | ||
90314792 | 11061 | #: builtin/revert.c:80 |
ef317cd5 | 11062 | msgid "end revert or cherry-pick sequence" |
07432cef | 11063 | msgstr "终止反转或拣选操作" |
ef317cd5 | 11064 | |
90314792 | 11065 | #: builtin/revert.c:81 |
ef317cd5 | 11066 | msgid "resume revert or cherry-pick sequence" |
07432cef | 11067 | msgstr "继续反转或拣选操作" |
ef317cd5 | 11068 | |
90314792 | 11069 | #: builtin/revert.c:82 |
ef317cd5 | 11070 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 11071 | msgstr "取消反转或拣选操作" |
ef317cd5 | 11072 | |
90314792 | 11073 | #: builtin/revert.c:83 |
ef317cd5 | 11074 | msgid "don't automatically commit" |
07432cef | 11075 | msgstr "不要自动提交" |
ef317cd5 | 11076 | |
90314792 | 11077 | #: builtin/revert.c:84 |
ef317cd5 | 11078 | msgid "edit the commit message" |
07432cef | 11079 | msgstr "编辑提交说明" |
ef317cd5 | 11080 | |
90314792 | 11081 | #: builtin/revert.c:87 |
ef317cd5 | 11082 | msgid "parent number" |
07432cef | 11083 | msgstr "父编号" |
ef317cd5 | 11084 | |
90314792 | 11085 | #: builtin/revert.c:89 |
ef317cd5 | 11086 | msgid "merge strategy" |
07432cef | 11087 | msgstr "合并策略" |
ef317cd5 | 11088 | |
90314792 | 11089 | #: builtin/revert.c:90 |
ef317cd5 | 11090 | msgid "option" |
07432cef | 11091 | msgstr "选项" |
ef317cd5 | 11092 | |
90314792 | 11093 | #: builtin/revert.c:91 |
ef317cd5 | 11094 | msgid "option for merge strategy" |
07432cef | 11095 | msgstr "合并策略的选项" |
ef317cd5 | 11096 | |
5c57d762 | 11097 | #: builtin/revert.c:100 |
ef317cd5 | 11098 | msgid "append commit name" |
07432cef | 11099 | msgstr "追加提交名称" |
ef317cd5 | 11100 | |
5c57d762 | 11101 | #: builtin/revert.c:102 |
ef317cd5 | 11102 | msgid "preserve initially empty commits" |
07432cef | 11103 | msgstr "保留初始化的空提交" |
ef317cd5 | 11104 | |
5c57d762 | 11105 | #: builtin/revert.c:103 |
ef317cd5 | 11106 | msgid "allow commits with empty messages" |
07432cef | 11107 | msgstr "允许提交说明为空" |
c04f5ac3 | 11108 | |
5c57d762 | 11109 | #: builtin/revert.c:104 |
ef317cd5 | 11110 | msgid "keep redundant, empty commits" |
07432cef | 11111 | msgstr "保持多余的、空的提交" |
ef317cd5 | 11112 | |
5c57d762 | 11113 | #: builtin/revert.c:192 |
c04f5ac3 JX |
11114 | msgid "revert failed" |
11115 | msgstr "还原失败" | |
11116 | ||
5c57d762 | 11117 | #: builtin/revert.c:207 |
c04f5ac3 JX |
11118 | msgid "cherry-pick failed" |
11119 | msgstr "拣选失败" | |
11120 | ||
90314792 | 11121 | #: builtin/rm.c:17 |
814ff314 JX |
11122 | msgid "git rm [<options>] [--] <file>..." |
11123 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 11124 | |
90314792 | 11125 | #: builtin/rm.c:65 |
2e8451e8 JX |
11126 | msgid "" |
11127 | "the following submodule (or one of its nested submodules)\n" | |
11128 | "uses a .git directory:" | |
11129 | msgid_plural "" | |
220c313c | 11130 | "the following submodules (or one of their nested submodules)\n" |
2e8451e8 | 11131 | "use a .git directory:" |
220c313c JX |
11132 | msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" |
11133 | msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
2e8451e8 | 11134 | |
90314792 | 11135 | #: builtin/rm.c:71 |
07432cef | 11136 | msgid "" |
2e8451e8 | 11137 | "\n" |
07432cef WS |
11138 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
11139 | msgstr "" | |
2e8451e8 | 11140 | "\n" |
07432cef | 11141 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 11142 | |
7aea43ff | 11143 | #: builtin/rm.c:230 |
c04f5ac3 | 11144 | msgid "" |
2e8451e8 JX |
11145 | "the following file has staged content different from both the\n" |
11146 | "file and the HEAD:" | |
11147 | msgid_plural "" | |
11148 | "the following files have staged content different from both the\n" | |
11149 | "file and the HEAD:" | |
11150 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
11151 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
11152 | ||
7aea43ff | 11153 | #: builtin/rm.c:235 |
2e8451e8 JX |
11154 | msgid "" |
11155 | "\n" | |
c04f5ac3 JX |
11156 | "(use -f to force removal)" |
11157 | msgstr "" | |
2e8451e8 | 11158 | "\n" |
c04f5ac3 JX |
11159 | "(使用 -f 强制删除)" |
11160 | ||
7aea43ff | 11161 | #: builtin/rm.c:239 |
2e8451e8 JX |
11162 | msgid "the following file has changes staged in the index:" |
11163 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
11164 | msgstr[0] "下列文件索引中有变更" |
11165 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 11166 | |
7aea43ff | 11167 | #: builtin/rm.c:243 builtin/rm.c:254 |
c04f5ac3 | 11168 | msgid "" |
2e8451e8 | 11169 | "\n" |
c04f5ac3 JX |
11170 | "(use --cached to keep the file, or -f to force removal)" |
11171 | msgstr "" | |
2e8451e8 JX |
11172 | "\n" |
11173 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
11174 | ||
7aea43ff | 11175 | #: builtin/rm.c:251 |
2e8451e8 JX |
11176 | msgid "the following file has local modifications:" |
11177 | msgid_plural "the following files have local modifications:" | |
11178 | msgstr[0] "如下文件有本地修改:" | |
11179 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 11180 | |
7aea43ff | 11181 | #: builtin/rm.c:269 |
ef317cd5 | 11182 | msgid "do not list removed files" |
07432cef | 11183 | msgstr "不列出删除的文件" |
ef317cd5 | 11184 | |
7aea43ff | 11185 | #: builtin/rm.c:270 |
ef317cd5 | 11186 | msgid "only remove from the index" |
07432cef | 11187 | msgstr "只从索引区删除" |
ef317cd5 | 11188 | |
7aea43ff | 11189 | #: builtin/rm.c:271 |
ef317cd5 | 11190 | msgid "override the up-to-date check" |
07432cef | 11191 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 11192 | |
7aea43ff | 11193 | #: builtin/rm.c:272 |
ef317cd5 | 11194 | msgid "allow recursive removal" |
07432cef | 11195 | msgstr "允许递归删除" |
ef317cd5 | 11196 | |
7aea43ff | 11197 | #: builtin/rm.c:274 |
ef317cd5 | 11198 | msgid "exit with a zero status even if nothing matched" |
07432cef | 11199 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 11200 | |
7aea43ff | 11201 | #: builtin/rm.c:335 |
c04f5ac3 JX |
11202 | #, c-format |
11203 | msgid "not removing '%s' recursively without -r" | |
11204 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
11205 | ||
7aea43ff | 11206 | #: builtin/rm.c:374 |
c04f5ac3 JX |
11207 | #, c-format |
11208 | msgid "git rm: unable to remove %s" | |
11209 | msgstr "git rm:不能删除 %s" | |
11210 | ||
1b7f4a34 JX |
11211 | #: builtin/send-pack.c:18 |
11212 | msgid "" | |
11213 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
11214 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
11215 | "[<ref>...]\n" | |
11216 | " --all and explicit <ref> specification are mutually exclusive." | |
11217 | msgstr "" | |
11218 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
11219 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
11220 | " --all 和明确的 <引用> 互斥。" | |
11221 | ||
11222 | #: builtin/send-pack.c:160 | |
11223 | msgid "remote name" | |
11224 | msgstr "远程名称" | |
11225 | ||
11226 | #: builtin/send-pack.c:171 | |
11227 | msgid "use stateless RPC protocol" | |
11228 | msgstr "使用无状态的 RPC 协议" | |
11229 | ||
11230 | #: builtin/send-pack.c:172 | |
11231 | msgid "read refs from stdin" | |
11232 | msgstr "从标准输入读取引用" | |
11233 | ||
11234 | #: builtin/send-pack.c:173 | |
11235 | msgid "print status from remote helper" | |
11236 | msgstr "打印来自远程 helper 的状态" | |
11237 | ||
ef317cd5 | 11238 | #: builtin/shortlog.c:13 |
814ff314 | 11239 | msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" |
4dcdc3d8 | 11240 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" |
ef317cd5 | 11241 | |
276ceeaa | 11242 | #: builtin/shortlog.c:242 |
ef317cd5 | 11243 | msgid "sort output according to the number of commits per author" |
07432cef | 11244 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 11245 | |
276ceeaa | 11246 | #: builtin/shortlog.c:244 |
ef317cd5 | 11247 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 11248 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 11249 | |
276ceeaa | 11250 | #: builtin/shortlog.c:246 |
ef317cd5 | 11251 | msgid "Show the email address of each author" |
07432cef | 11252 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 11253 | |
276ceeaa | 11254 | #: builtin/shortlog.c:247 |
ef317cd5 | 11255 | msgid "w[,i1[,i2]]" |
07432cef | 11256 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 11257 | |
276ceeaa | 11258 | #: builtin/shortlog.c:248 |
ef317cd5 | 11259 | msgid "Linewrap output" |
07432cef | 11260 | msgstr "折行输出" |
ef317cd5 | 11261 | |
94550ed3 | 11262 | #: builtin/show-branch.c:10 |
ef317cd5 | 11263 | msgid "" |
814ff314 | 11264 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
11265 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
11266 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
11267 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 11268 | msgstr "" |
814ff314 | 11269 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
11270 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
11271 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
11272 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 11273 | |
94550ed3 | 11274 | #: builtin/show-branch.c:14 |
814ff314 JX |
11275 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
11276 | msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" | |
ef317cd5 | 11277 | |
94550ed3 | 11278 | #: builtin/show-branch.c:640 |
ef317cd5 | 11279 | msgid "show remote-tracking and local branches" |
07432cef | 11280 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 11281 | |
94550ed3 | 11282 | #: builtin/show-branch.c:642 |
ef317cd5 | 11283 | msgid "show remote-tracking branches" |
07432cef | 11284 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 11285 | |
94550ed3 | 11286 | #: builtin/show-branch.c:644 |
ef317cd5 | 11287 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 11288 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 11289 | |
94550ed3 | 11290 | #: builtin/show-branch.c:646 |
ef317cd5 | 11291 | msgid "show <n> more commits after the common ancestor" |
07432cef | 11292 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 11293 | |
94550ed3 | 11294 | #: builtin/show-branch.c:648 |
ef317cd5 | 11295 | msgid "synonym to more=-1" |
07432cef | 11296 | msgstr "和 more=-1 同义" |
ef317cd5 | 11297 | |
94550ed3 | 11298 | #: builtin/show-branch.c:649 |
ef317cd5 | 11299 | msgid "suppress naming strings" |
07432cef | 11300 | msgstr "不显示字符串命名" |
ef317cd5 | 11301 | |
94550ed3 | 11302 | #: builtin/show-branch.c:651 |
ef317cd5 | 11303 | msgid "include the current branch" |
07432cef | 11304 | msgstr "包括当前分支" |
ef317cd5 | 11305 | |
94550ed3 | 11306 | #: builtin/show-branch.c:653 |
ef317cd5 | 11307 | msgid "name commits with their object names" |
07432cef | 11308 | msgstr "以对象名字命名提交" |
ef317cd5 | 11309 | |
94550ed3 | 11310 | #: builtin/show-branch.c:655 |
ef317cd5 | 11311 | msgid "show possible merge bases" |
07432cef | 11312 | msgstr "显示可能合并的基线" |
ef317cd5 | 11313 | |
94550ed3 | 11314 | #: builtin/show-branch.c:657 |
ef317cd5 | 11315 | msgid "show refs unreachable from any other ref" |
07432cef | 11316 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 11317 | |
94550ed3 | 11318 | #: builtin/show-branch.c:659 |
ef317cd5 | 11319 | msgid "show commits in topological order" |
07432cef | 11320 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 11321 | |
94550ed3 | 11322 | #: builtin/show-branch.c:662 |
ef317cd5 | 11323 | msgid "show only commits not on the first branch" |
07432cef | 11324 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 11325 | |
94550ed3 | 11326 | #: builtin/show-branch.c:664 |
ef317cd5 | 11327 | msgid "show merges reachable from only one tip" |
07432cef | 11328 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 11329 | |
94550ed3 | 11330 | #: builtin/show-branch.c:666 |
2e8451e8 JX |
11331 | msgid "topologically sort, maintaining date order where possible" |
11332 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 11333 | |
94550ed3 | 11334 | #: builtin/show-branch.c:669 |
ef317cd5 | 11335 | msgid "<n>[,<base>]" |
07432cef | 11336 | msgstr "<n>[,<base>]" |
ef317cd5 | 11337 | |
94550ed3 | 11338 | #: builtin/show-branch.c:670 |
ef317cd5 | 11339 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 11340 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
11341 | |
11342 | #: builtin/show-ref.c:10 | |
11343 | msgid "" | |
814ff314 JX |
11344 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
11345 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 11346 | msgstr "" |
814ff314 JX |
11347 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
11348 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 JX |
11349 | |
11350 | #: builtin/show-ref.c:11 | |
94550ed3 JX |
11351 | msgid "git show-ref --exclude-existing[=<pattern>]" |
11352 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 11353 | |
94550ed3 | 11354 | #: builtin/show-ref.c:165 |
ef317cd5 | 11355 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 11356 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 11357 | |
94550ed3 | 11358 | #: builtin/show-ref.c:166 |
ef317cd5 | 11359 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 11360 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 11361 | |
94550ed3 | 11362 | #: builtin/show-ref.c:167 |
ef317cd5 | 11363 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 11364 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 11365 | |
94550ed3 | 11366 | #: builtin/show-ref.c:170 builtin/show-ref.c:172 |
2e8451e8 JX |
11367 | msgid "show the HEAD reference, even if it would be filtered out" |
11368 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 11369 | |
94550ed3 | 11370 | #: builtin/show-ref.c:174 |
ef317cd5 | 11371 | msgid "dereference tags into object IDs" |
4375c10e | 11372 | msgstr "转换标签到对象 ID" |
ef317cd5 | 11373 | |
94550ed3 | 11374 | #: builtin/show-ref.c:176 |
ef317cd5 | 11375 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 11376 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 11377 | |
94550ed3 | 11378 | #: builtin/show-ref.c:180 |
ef317cd5 | 11379 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 11380 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 11381 | |
94550ed3 | 11382 | #: builtin/show-ref.c:182 |
ef317cd5 | 11383 | msgid "show refs from stdin that aren't in local repository" |
160fb2b2 | 11384 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" |
ef317cd5 | 11385 | |
94550ed3 JX |
11386 | #: builtin/stripspace.c:17 |
11387 | msgid "git stripspace [-s | --strip-comments]" | |
11388 | msgstr "git stripspace [-s | --strip-comments]" | |
11389 | ||
11390 | #: builtin/stripspace.c:18 | |
11391 | msgid "git stripspace [-c | --comment-lines]" | |
11392 | msgstr "git stripspace [-c | --comment-lines]" | |
11393 | ||
11394 | #: builtin/stripspace.c:35 | |
11395 | msgid "skip and remove all lines starting with comment character" | |
11396 | msgstr "跳过和移除所有的注释行" | |
11397 | ||
11398 | #: builtin/stripspace.c:38 | |
276ceeaa | 11399 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
11400 | msgstr "为每一行的行首添加注释符和空格" |
11401 | ||
5c57d762 | 11402 | #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923 |
5b04ee3b JX |
11403 | #, c-format |
11404 | msgid "No such ref: %s" | |
11405 | msgstr "没有这样的引用:%s" | |
11406 | ||
5c57d762 | 11407 | #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 |
5b04ee3b JX |
11408 | #, c-format |
11409 | msgid "Expecting a full ref name, got %s" | |
11410 | msgstr "期望一个完整的引用名称,却得到 %s" | |
11411 | ||
11412 | #: builtin/submodule--helper.c:71 | |
11413 | #, c-format | |
11414 | msgid "cannot strip one component off url '%s'" | |
11415 | msgstr "无法从 url '%s' 剥离一个组件" | |
11416 | ||
5c57d762 JX |
11417 | #: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 |
11418 | #: builtin/submodule--helper.c:483 | |
94550ed3 JX |
11419 | msgid "alternative anchor for relative paths" |
11420 | msgstr "相对路径的替代锚记(anchor)" | |
11421 | ||
5b04ee3b | 11422 | #: builtin/submodule--helper.c:283 |
94550ed3 JX |
11423 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
11424 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
11425 | ||
5c57d762 | 11426 | #: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 |
5b04ee3b JX |
11427 | #, c-format |
11428 | msgid "No url found for submodule path '%s' in .gitmodules" | |
11429 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
11430 | ||
5c57d762 | 11431 | #: builtin/submodule--helper.c:364 |
5b04ee3b JX |
11432 | #, c-format |
11433 | msgid "Failed to register url for submodule path '%s'" | |
11434 | msgstr "无法为子模组 '%s' 注册 url" | |
11435 | ||
5c57d762 | 11436 | #: builtin/submodule--helper.c:368 |
5b04ee3b JX |
11437 | #, c-format |
11438 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
aef18cc6 | 11439 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" |
5b04ee3b JX |
11440 | |
11441 | # | |
5c57d762 | 11442 | #: builtin/submodule--helper.c:378 |
aef18cc6 | 11443 | #, c-format |
5b04ee3b | 11444 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 11445 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 11446 | |
5c57d762 | 11447 | #: builtin/submodule--helper.c:385 |
5b04ee3b JX |
11448 | #, c-format |
11449 | msgid "Failed to register update mode for submodule path '%s'" | |
11450 | msgstr "无法为子模组 '%s' 注册更新模式" | |
11451 | ||
5c57d762 | 11452 | #: builtin/submodule--helper.c:404 |
5b04ee3b JX |
11453 | msgid "Suppress output for initializing a submodule" |
11454 | msgstr "初始化子模组时抑制输出" | |
11455 | ||
5c57d762 | 11456 | #: builtin/submodule--helper.c:409 |
5b04ee3b JX |
11457 | msgid "git submodule--helper init [<path>]" |
11458 | msgstr "git submodule--helper init [<路径>]" | |
11459 | ||
5c57d762 | 11460 | #: builtin/submodule--helper.c:430 |
94550ed3 JX |
11461 | msgid "git submodule--helper name <path>" |
11462 | msgstr "git submodule--helper name <路径>" | |
11463 | ||
5c57d762 | 11464 | #: builtin/submodule--helper.c:436 |
94550ed3 JX |
11465 | #, c-format |
11466 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
11467 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
11468 | ||
5c57d762 | 11469 | #: builtin/submodule--helper.c:486 |
94550ed3 JX |
11470 | msgid "where the new submodule will be cloned to" |
11471 | msgstr "新的子模组将要克隆的路径" | |
11472 | ||
5c57d762 | 11473 | #: builtin/submodule--helper.c:489 |
94550ed3 JX |
11474 | msgid "name of the new submodule" |
11475 | msgstr "新子模组的名称" | |
11476 | ||
5c57d762 | 11477 | #: builtin/submodule--helper.c:492 |
94550ed3 JX |
11478 | msgid "url where to clone the submodule from" |
11479 | msgstr "克隆子模组的 url 地址" | |
11480 | ||
5c57d762 | 11481 | #: builtin/submodule--helper.c:498 |
94550ed3 JX |
11482 | msgid "depth for shallow clones" |
11483 | msgstr "浅克隆的深度" | |
11484 | ||
5c57d762 | 11485 | #: builtin/submodule--helper.c:504 |
94550ed3 JX |
11486 | msgid "" |
11487 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
5b04ee3b | 11488 | "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" |
5c57d762 JX |
11489 | msgstr "" |
11490 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
11491 | "[--name <名字>] [--depth <深度>] --url <url> --path <路径>" | |
94550ed3 | 11492 | |
5c57d762 | 11493 | #: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 |
94550ed3 JX |
11494 | #, c-format |
11495 | msgid "could not create directory '%s'" | |
11496 | msgstr "不能创建目录 '%s'" | |
11497 | ||
5c57d762 | 11498 | #: builtin/submodule--helper.c:531 |
94550ed3 JX |
11499 | #, c-format |
11500 | msgid "clone of '%s' into submodule path '%s' failed" | |
11501 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
11502 | ||
5c57d762 | 11503 | #: builtin/submodule--helper.c:547 |
94550ed3 JX |
11504 | #, c-format |
11505 | msgid "cannot open file '%s'" | |
11506 | msgstr "无法打开文件 '%s'" | |
11507 | ||
5c57d762 | 11508 | #: builtin/submodule--helper.c:552 |
94550ed3 JX |
11509 | #, c-format |
11510 | msgid "could not close file %s" | |
11511 | msgstr "无法关闭文件 %s" | |
11512 | ||
5c57d762 | 11513 | #: builtin/submodule--helper.c:559 |
94550ed3 JX |
11514 | #, c-format |
11515 | msgid "could not get submodule directory for '%s'" | |
11516 | msgstr "无法得到 '%s' 的子模组目录" | |
11517 | ||
5c57d762 | 11518 | #: builtin/submodule--helper.c:611 |
5b04ee3b JX |
11519 | #, c-format |
11520 | msgid "Submodule path '%s' not initialized" | |
11521 | msgstr "子模组 '%s' 尚未初始化" | |
11522 | ||
5c57d762 | 11523 | #: builtin/submodule--helper.c:615 |
5b04ee3b JX |
11524 | msgid "Maybe you want to use 'update --init'?" |
11525 | msgstr "也许您想要执行 'update --init'?" | |
11526 | ||
5c57d762 | 11527 | #: builtin/submodule--helper.c:641 |
5b04ee3b JX |
11528 | #, c-format |
11529 | msgid "Skipping unmerged submodule %s" | |
11530 | msgstr "略过未合并的子模组 %s" | |
11531 | ||
5c57d762 | 11532 | #: builtin/submodule--helper.c:662 |
5b04ee3b JX |
11533 | #, c-format |
11534 | msgid "Skipping submodule '%s'" | |
11535 | msgstr "略过子模组 '%s'" | |
11536 | ||
5c57d762 JX |
11537 | #: builtin/submodule--helper.c:792 |
11538 | #, c-format | |
11539 | msgid "Failed to clone '%s'. Retry scheduled" | |
11540 | msgstr "克隆 '%s' 失败。按计划重试" | |
11541 | ||
11542 | #: builtin/submodule--helper.c:803 | |
11543 | #, c-format | |
11544 | msgid "Failed to clone '%s' a second time, aborting" | |
11545 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
11546 | ||
11547 | #: builtin/submodule--helper.c:824 | |
5b04ee3b JX |
11548 | msgid "path into the working tree" |
11549 | msgstr "到工作区的路径" | |
11550 | ||
5c57d762 | 11551 | #: builtin/submodule--helper.c:827 |
5b04ee3b JX |
11552 | msgid "path into the working tree, across nested submodule boundaries" |
11553 | msgstr "工作区中的路径,递归嵌套子模组" | |
11554 | ||
5c57d762 | 11555 | #: builtin/submodule--helper.c:831 |
5b04ee3b JX |
11556 | msgid "rebase, merge, checkout or none" |
11557 | msgstr "rebase、merge、checkout 或 none" | |
11558 | ||
5c57d762 | 11559 | #: builtin/submodule--helper.c:835 |
5b04ee3b JX |
11560 | msgid "Create a shallow clone truncated to the specified number of revisions" |
11561 | msgstr "创建一个指定深度的浅克隆" | |
11562 | ||
5c57d762 | 11563 | #: builtin/submodule--helper.c:838 |
5b04ee3b JX |
11564 | msgid "parallel jobs" |
11565 | msgstr "并发任务" | |
11566 | ||
5c57d762 JX |
11567 | #: builtin/submodule--helper.c:840 |
11568 | msgid "whether the initial clone should follow the shallow recommendation" | |
11569 | msgstr "是否初始克隆应该遵守推荐的浅克隆选项" | |
11570 | ||
11571 | #: builtin/submodule--helper.c:841 | |
5b04ee3b JX |
11572 | msgid "don't print cloning progress" |
11573 | msgstr "不要输出克隆进度" | |
94550ed3 | 11574 | |
5c57d762 | 11575 | #: builtin/submodule--helper.c:846 |
5b04ee3b JX |
11576 | msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" |
11577 | msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" | |
11578 | ||
5c57d762 | 11579 | #: builtin/submodule--helper.c:856 |
5b04ee3b JX |
11580 | msgid "bad value for update parameter" |
11581 | msgstr "update 参数取值错误" | |
11582 | ||
5c57d762 JX |
11583 | #: builtin/submodule--helper.c:927 |
11584 | #, c-format | |
11585 | msgid "" | |
11586 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
11587 | "the superproject is not on any branch" | |
11588 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
11589 | ||
11590 | #: builtin/submodule--helper.c:977 | |
5b04ee3b JX |
11591 | msgid "submodule--helper subcommand must be called with a subcommand" |
11592 | msgstr "submodule-helper 子命令必须由另外的子命令调用" | |
11593 | ||
5c57d762 | 11594 | #: builtin/submodule--helper.c:984 |
94550ed3 | 11595 | #, c-format |
5b04ee3b JX |
11596 | msgid "'%s' is not a valid submodule--helper subcommand" |
11597 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 11598 | |
ef317cd5 | 11599 | #: builtin/symbolic-ref.c:7 |
814ff314 JX |
11600 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
11601 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef WS |
11602 | |
11603 | #: builtin/symbolic-ref.c:8 | |
814ff314 JX |
11604 | msgid "git symbolic-ref -d [-q] <name>" |
11605 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 11606 | |
07432cef | 11607 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 11608 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
11609 | msgstr "不显示非符号(分离的)引用的错误信息" |
11610 | ||
11611 | #: builtin/symbolic-ref.c:41 | |
11612 | msgid "delete symbolic ref" | |
11613 | msgstr "删除符号引用" | |
ef317cd5 | 11614 | |
07432cef | 11615 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 11616 | msgid "shorten ref output" |
07432cef | 11617 | msgstr "简短的引用输出" |
ef317cd5 | 11618 | |
1b7f4a34 | 11619 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 11620 | msgid "reason" |
07432cef | 11621 | msgstr "原因" |
ef317cd5 | 11622 | |
1b7f4a34 | 11623 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 |
ef317cd5 | 11624 | msgid "reason of the update" |
07432cef | 11625 | msgstr "更新的原因" |
ef317cd5 | 11626 | |
94550ed3 | 11627 | #: builtin/tag.c:23 |
ef317cd5 | 11628 | msgid "" |
814ff314 JX |
11629 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " |
11630 | "[<head>]" | |
11631 | msgstr "" | |
11632 | "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" | |
ef317cd5 | 11633 | |
94550ed3 | 11634 | #: builtin/tag.c:24 |
ef317cd5 | 11635 | msgid "git tag -d <tagname>..." |
07432cef | 11636 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 11637 | |
94550ed3 | 11638 | #: builtin/tag.c:25 |
ef317cd5 | 11639 | msgid "" |
814ff314 | 11640 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" |
94550ed3 | 11641 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 11642 | msgstr "" |
94550ed3 JX |
11643 | "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n" |
11644 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" | |
ef317cd5 | 11645 | |
94550ed3 | 11646 | #: builtin/tag.c:27 |
ef317cd5 | 11647 | msgid "git tag -v <tagname>..." |
07432cef | 11648 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 11649 | |
5b04ee3b | 11650 | #: builtin/tag.c:81 |
c04f5ac3 JX |
11651 | #, c-format |
11652 | msgid "tag name too long: %.*s..." | |
55a16ee4 | 11653 | msgstr "标签名称太长:%.*s..." |
c04f5ac3 | 11654 | |
5b04ee3b | 11655 | #: builtin/tag.c:86 |
c04f5ac3 JX |
11656 | #, c-format |
11657 | msgid "tag '%s' not found." | |
55a16ee4 | 11658 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 11659 | |
5b04ee3b | 11660 | #: builtin/tag.c:101 |
c04f5ac3 JX |
11661 | #, c-format |
11662 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 11663 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 11664 | |
5b04ee3b | 11665 | #: builtin/tag.c:117 |
a77c07d9 | 11666 | #, c-format |
c04f5ac3 JX |
11667 | msgid "" |
11668 | "\n" | |
6acbf033 JX |
11669 | "Write a message for tag:\n" |
11670 | " %s\n" | |
a77c07d9 | 11671 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
11672 | msgstr "" |
11673 | "\n" | |
55a16ee4 | 11674 | "输入一个标签说明:\n" |
6acbf033 | 11675 | " %s\n" |
a77c07d9 | 11676 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 11677 | |
5b04ee3b | 11678 | #: builtin/tag.c:121 |
a77c07d9 | 11679 | #, c-format |
c04f5ac3 JX |
11680 | msgid "" |
11681 | "\n" | |
6acbf033 JX |
11682 | "Write a message for tag:\n" |
11683 | " %s\n" | |
a77c07d9 | 11684 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 11685 | "want to.\n" |
c04f5ac3 JX |
11686 | msgstr "" |
11687 | "\n" | |
55a16ee4 | 11688 | "输入一个标签说明:\n" |
6acbf033 | 11689 | " %s\n" |
a77c07d9 | 11690 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 11691 | |
94550ed3 | 11692 | #: builtin/tag.c:199 |
c04f5ac3 | 11693 | msgid "unable to sign the tag" |
55a16ee4 | 11694 | msgstr "无法签署标签" |
c04f5ac3 | 11695 | |
94550ed3 | 11696 | #: builtin/tag.c:201 |
c04f5ac3 | 11697 | msgid "unable to write tag file" |
55a16ee4 | 11698 | msgstr "无法写标签文件" |
c04f5ac3 | 11699 | |
94550ed3 | 11700 | #: builtin/tag.c:226 |
c04f5ac3 | 11701 | msgid "bad object type." |
90e6ef53 | 11702 | msgstr "坏的对象类型。" |
c04f5ac3 | 11703 | |
94550ed3 | 11704 | #: builtin/tag.c:239 |
c04f5ac3 | 11705 | msgid "tag header too big." |
55a16ee4 | 11706 | msgstr "标签头信息太大。" |
c04f5ac3 | 11707 | |
94550ed3 | 11708 | #: builtin/tag.c:275 |
c04f5ac3 | 11709 | msgid "no tag message?" |
55a16ee4 | 11710 | msgstr "无标签说明?" |
c04f5ac3 | 11711 | |
94550ed3 | 11712 | #: builtin/tag.c:281 |
c04f5ac3 JX |
11713 | #, c-format |
11714 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 11715 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 11716 | |
94550ed3 | 11717 | #: builtin/tag.c:339 |
ef317cd5 | 11718 | msgid "list tag names" |
55a16ee4 | 11719 | msgstr "列出标签名称" |
ef317cd5 | 11720 | |
94550ed3 | 11721 | #: builtin/tag.c:341 |
ef317cd5 | 11722 | msgid "print <n> lines of each tag message" |
55a16ee4 | 11723 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 11724 | |
94550ed3 | 11725 | #: builtin/tag.c:343 |
ef317cd5 | 11726 | msgid "delete tags" |
55a16ee4 | 11727 | msgstr "删除标签" |
ef317cd5 | 11728 | |
94550ed3 | 11729 | #: builtin/tag.c:344 |
ef317cd5 | 11730 | msgid "verify tags" |
55a16ee4 | 11731 | msgstr "验证标签" |
ef317cd5 | 11732 | |
94550ed3 | 11733 | #: builtin/tag.c:346 |
ef317cd5 | 11734 | msgid "Tag creation options" |
55a16ee4 | 11735 | msgstr "标签创建选项" |
ef317cd5 | 11736 | |
94550ed3 | 11737 | #: builtin/tag.c:348 |
ef317cd5 | 11738 | msgid "annotated tag, needs a message" |
55a16ee4 | 11739 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 11740 | |
94550ed3 | 11741 | #: builtin/tag.c:350 |
ef317cd5 | 11742 | msgid "tag message" |
55a16ee4 | 11743 | msgstr "标签说明" |
ef317cd5 | 11744 | |
94550ed3 | 11745 | #: builtin/tag.c:352 |
ef317cd5 | 11746 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 11747 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 11748 | |
94550ed3 | 11749 | #: builtin/tag.c:356 |
ef317cd5 | 11750 | msgid "use another key to sign the tag" |
55a16ee4 | 11751 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 11752 | |
94550ed3 | 11753 | #: builtin/tag.c:357 |
ef317cd5 | 11754 | msgid "replace the tag if exists" |
55a16ee4 | 11755 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 11756 | |
94550ed3 | 11757 | #: builtin/tag.c:358 builtin/update-ref.c:368 |
03ea3327 | 11758 | msgid "create a reflog" |
1b7f4a34 JX |
11759 | msgstr "创建引用日志" |
11760 | ||
94550ed3 | 11761 | #: builtin/tag.c:360 |
814ff314 | 11762 | msgid "Tag listing options" |
55a16ee4 | 11763 | msgstr "标签列表选项" |
814ff314 | 11764 | |
94550ed3 | 11765 | #: builtin/tag.c:361 |
ef317cd5 | 11766 | msgid "show tag list in columns" |
55a16ee4 | 11767 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 11768 | |
94550ed3 | 11769 | #: builtin/tag.c:362 builtin/tag.c:363 |
ef317cd5 | 11770 | msgid "print only tags that contain the commit" |
55a16ee4 | 11771 | msgstr "只打印包含提交的标签" |
ef317cd5 | 11772 | |
94550ed3 JX |
11773 | #: builtin/tag.c:364 |
11774 | msgid "print only tags that are merged" | |
11775 | msgstr "只打印已经合并的标签" | |
11776 | ||
11777 | #: builtin/tag.c:365 | |
11778 | msgid "print only tags that are not merged" | |
11779 | msgstr "只打印尚未合并的标签" | |
11780 | ||
11781 | #: builtin/tag.c:370 | |
ef317cd5 | 11782 | msgid "print only tags of the object" |
55a16ee4 | 11783 | msgstr "只打印对象的标签" |
ef317cd5 | 11784 | |
94550ed3 | 11785 | #: builtin/tag.c:399 |
8ada9598 | 11786 | msgid "--column and -n are incompatible" |
81809b99 | 11787 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 11788 | |
94550ed3 | 11789 | #: builtin/tag.c:419 |
c04f5ac3 | 11790 | msgid "-n option is only allowed with -l." |
649900bc | 11791 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 11792 | |
94550ed3 | 11793 | #: builtin/tag.c:421 |
c04f5ac3 | 11794 | msgid "--contains option is only allowed with -l." |
649900bc | 11795 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 11796 | |
94550ed3 | 11797 | #: builtin/tag.c:423 |
7ac1c0ad | 11798 | msgid "--points-at option is only allowed with -l." |
649900bc | 11799 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 11800 | |
94550ed3 JX |
11801 | #: builtin/tag.c:425 |
11802 | msgid "--merged and --no-merged option are only allowed with -l" | |
11803 | msgstr "选项 --merged 和 --no-merged 只能和 -l 共用" | |
11804 | ||
11805 | #: builtin/tag.c:433 | |
c04f5ac3 JX |
11806 | msgid "only one -F or -m option is allowed." |
11807 | msgstr "只允许一个 -F 或 -m 选项。" | |
11808 | ||
5b04ee3b | 11809 | #: builtin/tag.c:452 |
c04f5ac3 JX |
11810 | msgid "too many params" |
11811 | msgstr "太多参数" | |
11812 | ||
5b04ee3b | 11813 | #: builtin/tag.c:458 |
c04f5ac3 JX |
11814 | #, c-format |
11815 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 11816 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 11817 | |
5b04ee3b | 11818 | #: builtin/tag.c:463 |
c04f5ac3 JX |
11819 | #, c-format |
11820 | msgid "tag '%s' already exists" | |
55a16ee4 | 11821 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 11822 | |
5b04ee3b | 11823 | #: builtin/tag.c:491 |
c04f5ac3 JX |
11824 | #, c-format |
11825 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 11826 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 11827 | |
1b7f4a34 | 11828 | #: builtin/unpack-objects.c:490 |
6c94aba5 JX |
11829 | msgid "Unpacking objects" |
11830 | msgstr "展开对象中" | |
11831 | ||
276ceeaa | 11832 | #: builtin/update-index.c:79 |
7aea43ff JX |
11833 | #, c-format |
11834 | msgid "failed to create directory %s" | |
11835 | msgstr "无法创建目录 %s" | |
11836 | ||
276ceeaa | 11837 | #: builtin/update-index.c:85 |
7aea43ff JX |
11838 | #, c-format |
11839 | msgid "failed to stat %s" | |
11840 | msgstr "无法枚举 %s 状态" | |
11841 | ||
276ceeaa | 11842 | #: builtin/update-index.c:95 |
7aea43ff JX |
11843 | #, c-format |
11844 | msgid "failed to create file %s" | |
11845 | msgstr "无法创建文件 %s" | |
11846 | ||
276ceeaa | 11847 | #: builtin/update-index.c:103 |
7aea43ff JX |
11848 | #, c-format |
11849 | msgid "failed to delete file %s" | |
11850 | msgstr "无法删除文件 %s" | |
11851 | ||
276ceeaa | 11852 | #: builtin/update-index.c:110 builtin/update-index.c:212 |
7aea43ff JX |
11853 | #, c-format |
11854 | msgid "failed to delete directory %s" | |
11855 | msgstr "无法删除目录 %s" | |
11856 | ||
276ceeaa | 11857 | #: builtin/update-index.c:133 |
7aea43ff | 11858 | #, c-format |
276ceeaa JX |
11859 | msgid "Testing mtime in '%s' " |
11860 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 11861 | |
276ceeaa | 11862 | #: builtin/update-index.c:145 |
7aea43ff JX |
11863 | msgid "directory stat info does not change after adding a new file" |
11864 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
11865 | ||
276ceeaa | 11866 | #: builtin/update-index.c:158 |
7aea43ff JX |
11867 | msgid "directory stat info does not change after adding a new directory" |
11868 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
11869 | ||
276ceeaa | 11870 | #: builtin/update-index.c:171 |
7aea43ff JX |
11871 | msgid "directory stat info changes after updating a file" |
11872 | msgstr "更新一个文件后,目录的状态信息被修改" | |
11873 | ||
276ceeaa | 11874 | #: builtin/update-index.c:182 |
7aea43ff JX |
11875 | msgid "directory stat info changes after adding a file inside subdirectory" |
11876 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
11877 | ||
276ceeaa | 11878 | #: builtin/update-index.c:193 |
7aea43ff JX |
11879 | msgid "directory stat info does not change after deleting a file" |
11880 | msgstr "删除一个文件后,目录的状态信息未改变" | |
11881 | ||
276ceeaa | 11882 | #: builtin/update-index.c:206 |
7aea43ff JX |
11883 | msgid "directory stat info does not change after deleting a directory" |
11884 | msgstr "删除一个目录后,目录的状态信息未改变" | |
11885 | ||
276ceeaa | 11886 | #: builtin/update-index.c:213 |
7aea43ff JX |
11887 | msgid " OK" |
11888 | msgstr " OK" | |
11889 | ||
276ceeaa | 11890 | #: builtin/update-index.c:575 |
814ff314 JX |
11891 | msgid "git update-index [<options>] [--] [<file>...]" |
11892 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 11893 | |
276ceeaa | 11894 | #: builtin/update-index.c:930 |
ef317cd5 | 11895 | msgid "continue refresh even when index needs update" |
07432cef | 11896 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 11897 | |
276ceeaa | 11898 | #: builtin/update-index.c:933 |
ef317cd5 | 11899 | msgid "refresh: ignore submodules" |
07432cef | 11900 | msgstr "刷新:忽略子模组" |
8ada9598 | 11901 | |
276ceeaa | 11902 | #: builtin/update-index.c:936 |
ef317cd5 | 11903 | msgid "do not ignore new files" |
07432cef | 11904 | msgstr "不忽略新的文件" |
8ada9598 | 11905 | |
276ceeaa | 11906 | #: builtin/update-index.c:938 |
ef317cd5 | 11907 | msgid "let files replace directories and vice-versa" |
07432cef | 11908 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 11909 | |
276ceeaa | 11910 | #: builtin/update-index.c:940 |
ef317cd5 | 11911 | msgid "notice files missing from worktree" |
07432cef | 11912 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 11913 | |
276ceeaa | 11914 | #: builtin/update-index.c:942 |
ef317cd5 | 11915 | msgid "refresh even if index contains unmerged entries" |
07432cef | 11916 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 11917 | |
276ceeaa | 11918 | #: builtin/update-index.c:945 |
ef317cd5 | 11919 | msgid "refresh stat information" |
07432cef | 11920 | msgstr "刷新统计信息" |
ef317cd5 | 11921 | |
276ceeaa | 11922 | #: builtin/update-index.c:949 |
ef317cd5 | 11923 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 11924 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 11925 | |
276ceeaa | 11926 | #: builtin/update-index.c:953 |
6c94aba5 | 11927 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 11928 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 11929 | |
276ceeaa | 11930 | #: builtin/update-index.c:954 |
ef317cd5 | 11931 | msgid "add the specified entry to the index" |
07432cef | 11932 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 11933 | |
276ceeaa | 11934 | #: builtin/update-index.c:963 |
ef317cd5 | 11935 | msgid "mark files as \"not changing\"" |
07432cef | 11936 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 11937 | |
276ceeaa | 11938 | #: builtin/update-index.c:966 |
ef317cd5 | 11939 | msgid "clear assumed-unchanged bit" |
07432cef | 11940 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 11941 | |
276ceeaa | 11942 | #: builtin/update-index.c:969 |
ef317cd5 | 11943 | msgid "mark files as \"index-only\"" |
07432cef | 11944 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 11945 | |
276ceeaa | 11946 | #: builtin/update-index.c:972 |
ef317cd5 | 11947 | msgid "clear skip-worktree bit" |
07432cef | 11948 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 11949 | |
276ceeaa | 11950 | #: builtin/update-index.c:975 |
ef317cd5 | 11951 | msgid "add to index only; do not add content to object database" |
07432cef | 11952 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 11953 | |
276ceeaa | 11954 | #: builtin/update-index.c:977 |
ef317cd5 | 11955 | msgid "remove named paths even if present in worktree" |
07432cef | 11956 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 11957 | |
276ceeaa | 11958 | #: builtin/update-index.c:979 |
ef317cd5 | 11959 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 11960 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 11961 | |
276ceeaa | 11962 | #: builtin/update-index.c:981 |
ef317cd5 | 11963 | msgid "read list of paths to be updated from standard input" |
07432cef | 11964 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 11965 | |
276ceeaa | 11966 | #: builtin/update-index.c:985 |
ef317cd5 | 11967 | msgid "add entries from standard input to the index" |
07432cef | 11968 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 11969 | |
276ceeaa | 11970 | #: builtin/update-index.c:989 |
ef317cd5 | 11971 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 11972 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 11973 | |
276ceeaa | 11974 | #: builtin/update-index.c:993 |
ef317cd5 | 11975 | msgid "only update entries that differ from HEAD" |
07432cef | 11976 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 11977 | |
276ceeaa | 11978 | #: builtin/update-index.c:997 |
ef317cd5 | 11979 | msgid "ignore files missing from worktree" |
07432cef | 11980 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 11981 | |
276ceeaa | 11982 | #: builtin/update-index.c:1000 |
ef317cd5 | 11983 | msgid "report actions to standard output" |
07432cef | 11984 | msgstr "在标准输出显示操作" |
ef317cd5 | 11985 | |
276ceeaa | 11986 | #: builtin/update-index.c:1002 |
ef317cd5 | 11987 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 11988 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 11989 | |
276ceeaa | 11990 | #: builtin/update-index.c:1006 |
ef317cd5 | 11991 | msgid "write index in this format" |
07432cef | 11992 | msgstr "以这种格式写入索引区" |
ef317cd5 | 11993 | |
276ceeaa | 11994 | #: builtin/update-index.c:1008 |
6acbf033 JX |
11995 | msgid "enable or disable split index" |
11996 | msgstr "启用或禁用索引拆分" | |
11997 | ||
276ceeaa | 11998 | #: builtin/update-index.c:1010 |
7aea43ff JX |
11999 | msgid "enable/disable untracked cache" |
12000 | msgstr "启用/禁用对未跟踪文件的缓存" | |
12001 | ||
276ceeaa JX |
12002 | #: builtin/update-index.c:1012 |
12003 | msgid "test if the filesystem supports untracked cache" | |
12004 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
12005 | ||
12006 | #: builtin/update-index.c:1014 | |
7aea43ff JX |
12007 | msgid "enable untracked cache without testing the filesystem" |
12008 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
12009 | ||
276ceeaa JX |
12010 | #: builtin/update-index.c:1134 |
12011 | msgid "Untracked cache disabled" | |
12012 | msgstr "缓存未跟踪文件被禁用" | |
12013 | ||
12014 | #: builtin/update-index.c:1146 | |
12015 | #, c-format | |
12016 | msgid "Untracked cache enabled for '%s'" | |
12017 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
12018 | ||
90314792 | 12019 | #: builtin/update-ref.c:9 |
814ff314 JX |
12020 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
12021 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 12022 | |
90314792 | 12023 | #: builtin/update-ref.c:10 |
814ff314 JX |
12024 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
12025 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 JX |
12026 | |
12027 | #: builtin/update-ref.c:11 | |
814ff314 JX |
12028 | msgid "git update-ref [<options>] --stdin [-z]" |
12029 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 12030 | |
1b7f4a34 | 12031 | #: builtin/update-ref.c:363 |
ef317cd5 | 12032 | msgid "delete the reference" |
07432cef | 12033 | msgstr "删除引用" |
ef317cd5 | 12034 | |
1b7f4a34 | 12035 | #: builtin/update-ref.c:365 |
ef317cd5 | 12036 | msgid "update <refname> not the one it points to" |
07432cef | 12037 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 12038 | |
1b7f4a34 | 12039 | #: builtin/update-ref.c:366 |
90314792 JX |
12040 | msgid "stdin has NUL-terminated arguments" |
12041 | msgstr "标准输入有以 NUL 字符终止的参数" | |
12042 | ||
1b7f4a34 | 12043 | #: builtin/update-ref.c:367 |
90314792 JX |
12044 | msgid "read updates from stdin" |
12045 | msgstr "从标准输入读取更新" | |
12046 | ||
ef317cd5 JX |
12047 | #: builtin/update-server-info.c:6 |
12048 | msgid "git update-server-info [--force]" | |
07432cef | 12049 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
12050 | |
12051 | #: builtin/update-server-info.c:14 | |
12052 | msgid "update the info files from scratch" | |
07432cef | 12053 | msgstr "从头开始更新文件信息" |
ef317cd5 | 12054 | |
6acbf033 | 12055 | #: builtin/verify-commit.c:17 |
814ff314 JX |
12056 | msgid "git verify-commit [-v | --verbose] <commit>..." |
12057 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 12058 | |
1b7f4a34 | 12059 | #: builtin/verify-commit.c:72 |
6acbf033 JX |
12060 | msgid "print commit contents" |
12061 | msgstr "打印提交内容" | |
12062 | ||
5b04ee3b | 12063 | #: builtin/verify-commit.c:73 builtin/verify-tag.c:35 |
1b7f4a34 JX |
12064 | msgid "print raw gpg status output" |
12065 | msgstr "打印原始 gpg 状态输出" | |
12066 | ||
220c313c | 12067 | #: builtin/verify-pack.c:54 |
814ff314 JX |
12068 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
12069 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 12070 | |
220c313c | 12071 | #: builtin/verify-pack.c:64 |
ef317cd5 JX |
12072 | msgid "verbose" |
12073 | msgstr "冗长输出" | |
12074 | ||
220c313c | 12075 | #: builtin/verify-pack.c:66 |
ef317cd5 | 12076 | msgid "show statistics only" |
07432cef | 12077 | msgstr "只显示统计" |
ef317cd5 JX |
12078 | |
12079 | #: builtin/verify-tag.c:17 | |
814ff314 JX |
12080 | msgid "git verify-tag [-v | --verbose] <tag>..." |
12081 | msgstr "git verify-tag [-v | --verbose] <标签>..." | |
ef317cd5 | 12082 | |
5b04ee3b | 12083 | #: builtin/verify-tag.c:34 |
ef317cd5 | 12084 | msgid "print tag contents" |
55a16ee4 | 12085 | msgstr "打印标签内容" |
ef317cd5 | 12086 | |
94550ed3 JX |
12087 | #: builtin/worktree.c:15 |
12088 | msgid "git worktree add [<options>] <path> [<branch>]" | |
12089 | msgstr "git worktree add [<选项>] <路径> [<分支>]" | |
5bb01d4f | 12090 | |
94550ed3 | 12091 | #: builtin/worktree.c:16 |
5c57d762 JX |
12092 | msgid "git worktree list [<options>]" |
12093 | msgstr "git worktree list [<选项>]" | |
12094 | ||
12095 | #: builtin/worktree.c:17 | |
12096 | msgid "git worktree lock [<options>] <path>" | |
12097 | msgstr "git worktree lock [<选项>] <路径>" | |
12098 | ||
12099 | #: builtin/worktree.c:18 | |
5bb01d4f JX |
12100 | msgid "git worktree prune [<options>]" |
12101 | msgstr "git worktree prune [<选项>]" | |
12102 | ||
5c57d762 JX |
12103 | #: builtin/worktree.c:19 |
12104 | msgid "git worktree unlock <path>" | |
12105 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 12106 | |
5c57d762 | 12107 | #: builtin/worktree.c:42 |
5bb01d4f JX |
12108 | #, c-format |
12109 | msgid "Removing worktrees/%s: not a valid directory" | |
12110 | msgstr "删除工作区/%s:不是一个有效的目录" | |
12111 | ||
5c57d762 | 12112 | #: builtin/worktree.c:48 |
5bb01d4f JX |
12113 | #, c-format |
12114 | msgid "Removing worktrees/%s: gitdir file does not exist" | |
12115 | msgstr "删除 worktrees/%s:gitdir 文件不存在" | |
12116 | ||
5c57d762 | 12117 | #: builtin/worktree.c:53 |
5bb01d4f JX |
12118 | #, c-format |
12119 | msgid "Removing worktrees/%s: unable to read gitdir file (%s)" | |
12120 | msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)" | |
12121 | ||
5c57d762 | 12122 | #: builtin/worktree.c:64 |
5bb01d4f JX |
12123 | #, c-format |
12124 | msgid "Removing worktrees/%s: invalid gitdir file" | |
12125 | msgstr "删除 worktrees/%s:无效的 gitdir 文件" | |
12126 | ||
5c57d762 | 12127 | #: builtin/worktree.c:80 |
5bb01d4f JX |
12128 | #, c-format |
12129 | msgid "Removing worktrees/%s: gitdir file points to non-existent location" | |
12130 | msgstr "删除 worktrees/%s:gitdir 文件的指向不存在" | |
12131 | ||
5c57d762 | 12132 | #: builtin/worktree.c:204 |
5bb01d4f JX |
12133 | #, c-format |
12134 | msgid "'%s' already exists" | |
12135 | msgstr "'%s' 已经存在" | |
12136 | ||
5c57d762 | 12137 | #: builtin/worktree.c:236 |
5bb01d4f JX |
12138 | #, c-format |
12139 | msgid "could not create directory of '%s'" | |
12140 | msgstr "不能创建目录 '%s'" | |
12141 | ||
5c57d762 | 12142 | #: builtin/worktree.c:272 |
5bb01d4f | 12143 | #, c-format |
1b7f4a34 JX |
12144 | msgid "Preparing %s (identifier %s)" |
12145 | msgstr "准备 %s (标识符 %s)" | |
5bb01d4f | 12146 | |
5c57d762 | 12147 | #: builtin/worktree.c:323 |
5bb01d4f JX |
12148 | msgid "checkout <branch> even if already checked out in other worktree" |
12149 | msgstr "检出分支 <branch> 即使已经被检出到其它工作区" | |
12150 | ||
5c57d762 | 12151 | #: builtin/worktree.c:325 |
5bb01d4f JX |
12152 | msgid "create a new branch" |
12153 | msgstr "创建一个新分支" | |
12154 | ||
5c57d762 | 12155 | #: builtin/worktree.c:327 |
5bb01d4f JX |
12156 | msgid "create or reset a branch" |
12157 | msgstr "创建或重置一个分支" | |
12158 | ||
5c57d762 | 12159 | #: builtin/worktree.c:329 |
5b04ee3b JX |
12160 | msgid "populate the new working tree" |
12161 | msgstr "生成新的工作区" | |
12162 | ||
5c57d762 | 12163 | #: builtin/worktree.c:337 |
1b7f4a34 JX |
12164 | msgid "-b, -B, and --detach are mutually exclusive" |
12165 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 12166 | |
5c57d762 JX |
12167 | #: builtin/worktree.c:470 |
12168 | msgid "reason for locking" | |
12169 | msgstr "锁定原因" | |
12170 | ||
12171 | #: builtin/worktree.c:482 builtin/worktree.c:515 | |
12172 | #, c-format | |
12173 | msgid "'%s' is not a working tree" | |
12174 | msgstr "'%s' 不是一个工作区" | |
12175 | ||
12176 | #: builtin/worktree.c:484 builtin/worktree.c:517 | |
12177 | msgid "The main working tree cannot be locked or unlocked" | |
12178 | msgstr "主工作区无法被加锁或解锁" | |
12179 | ||
12180 | #: builtin/worktree.c:489 | |
12181 | #, c-format | |
12182 | msgid "'%s' is already locked, reason: %s" | |
12183 | msgstr "'%s' 已被锁定,原因:%s" | |
12184 | ||
12185 | #: builtin/worktree.c:491 | |
12186 | #, c-format | |
12187 | msgid "'%s' is already locked" | |
12188 | msgstr "'%s' 已被锁定" | |
12189 | ||
12190 | #: builtin/worktree.c:519 | |
12191 | #, c-format | |
12192 | msgid "'%s' is not locked" | |
12193 | msgstr "'%s' 未被锁定" | |
12194 | ||
ef317cd5 JX |
12195 | #: builtin/write-tree.c:13 |
12196 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 12197 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
12198 | |
12199 | #: builtin/write-tree.c:26 | |
12200 | msgid "<prefix>/" | |
07432cef | 12201 | msgstr "<前缀>/" |
ef317cd5 JX |
12202 | |
12203 | #: builtin/write-tree.c:27 | |
12204 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 12205 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
12206 | |
12207 | #: builtin/write-tree.c:30 | |
12208 | msgid "only useful for debugging" | |
07432cef | 12209 | msgstr "只对调试有用" |
ef317cd5 | 12210 | |
5c57d762 JX |
12211 | #: upload-pack.c:20 |
12212 | msgid "git upload-pack [<options>] <dir>" | |
12213 | msgstr "git upload-pack [<选项>] <目录>" | |
12214 | ||
12215 | #: upload-pack.c:837 | |
12216 | msgid "quit after a single request/response exchange" | |
12217 | msgstr "在一次单独的请求/响应(request/response)交换后退出" | |
12218 | ||
12219 | #: upload-pack.c:839 | |
12220 | msgid "exit immediately after initial ref advertisement" | |
12221 | msgstr "在初始的引用广告后立即退出" | |
12222 | ||
12223 | #: upload-pack.c:841 | |
12224 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
12225 | msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录" | |
12226 | ||
12227 | #: upload-pack.c:843 | |
12228 | msgid "interrupt transfer after <n> seconds of inactivity" | |
12229 | msgstr "不活动 <n> 秒钟后终止传输" | |
12230 | ||
5b04ee3b | 12231 | #: credential-cache--daemon.c:271 |
220c313c JX |
12232 | msgid "print debugging messages to stderr" |
12233 | msgstr "调试信息输出到标准错误" | |
12234 | ||
d9d56b23 | 12235 | #: git.c:14 |
4dcdc3d8 | 12236 | msgid "" |
220c313c | 12237 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 JX |
12238 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
12239 | "to read about a specific subcommand or concept." | |
12240 | msgstr "" | |
220c313c JX |
12241 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
12242 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
12243 | "帮助。" | |
8ada9598 | 12244 | |
5c57d762 | 12245 | #: http.c:323 |
276ceeaa JX |
12246 | msgid "Public key pinning not supported with cURL < 7.44.0" |
12247 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
12248 | ||
1b7f4a34 | 12249 | #: common-cmds.h:9 |
7aea43ff JX |
12250 | msgid "start a working area (see also: git help tutorial)" |
12251 | msgstr "开始一个工作区(参见:git help tutorial)" | |
12252 | ||
1b7f4a34 | 12253 | #: common-cmds.h:10 |
7aea43ff JX |
12254 | msgid "work on the current change (see also: git help everyday)" |
12255 | msgstr "在当前变更上工作(参见:git help everyday)" | |
12256 | ||
1b7f4a34 | 12257 | #: common-cmds.h:11 |
7aea43ff JX |
12258 | msgid "examine the history and state (see also: git help revisions)" |
12259 | msgstr "检查历史和状态(参见:git help revisions)" | |
12260 | ||
1b7f4a34 | 12261 | #: common-cmds.h:12 |
7aea43ff JX |
12262 | msgid "grow, mark and tweak your common history" |
12263 | msgstr "扩展、标记和调校您的历史记录" | |
12264 | ||
1b7f4a34 | 12265 | #: common-cmds.h:13 |
7aea43ff JX |
12266 | msgid "collaborate (see also: git help workflows)" |
12267 | msgstr "协同(参见:git help workflows)" | |
12268 | ||
1b7f4a34 | 12269 | #: common-cmds.h:17 |
8ada9598 | 12270 | msgid "Add file contents to the index" |
81809b99 | 12271 | msgstr "添加文件内容至索引" |
8ada9598 | 12272 | |
1b7f4a34 JX |
12273 | #: common-cmds.h:18 |
12274 | msgid "Use binary search to find the commit that introduced a bug" | |
12275 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 12276 | |
1b7f4a34 | 12277 | #: common-cmds.h:19 |
8ada9598 | 12278 | msgid "List, create, or delete branches" |
81809b99 | 12279 | msgstr "列出、创建或删除分支" |
8ada9598 | 12280 | |
1b7f4a34 | 12281 | #: common-cmds.h:20 |
5bb01d4f JX |
12282 | msgid "Switch branches or restore working tree files" |
12283 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 12284 | |
1b7f4a34 | 12285 | #: common-cmds.h:21 |
8ada9598 | 12286 | msgid "Clone a repository into a new directory" |
160fb2b2 | 12287 | msgstr "克隆一个仓库到一个新目录" |
8ada9598 | 12288 | |
1b7f4a34 | 12289 | #: common-cmds.h:22 |
8ada9598 | 12290 | msgid "Record changes to the repository" |
160fb2b2 | 12291 | msgstr "记录变更到仓库" |
8ada9598 | 12292 | |
1b7f4a34 | 12293 | #: common-cmds.h:23 |
8ada9598 | 12294 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 12295 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 12296 | |
1b7f4a34 | 12297 | #: common-cmds.h:24 |
8ada9598 | 12298 | msgid "Download objects and refs from another repository" |
160fb2b2 | 12299 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 12300 | |
1b7f4a34 | 12301 | #: common-cmds.h:25 |
8ada9598 | 12302 | msgid "Print lines matching a pattern" |
81809b99 | 12303 | msgstr "输出和模式匹配的行" |
8ada9598 | 12304 | |
1b7f4a34 | 12305 | #: common-cmds.h:26 |
a77c07d9 | 12306 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 12307 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 12308 | |
1b7f4a34 | 12309 | #: common-cmds.h:27 |
8ada9598 | 12310 | msgid "Show commit logs" |
81809b99 | 12311 | msgstr "显示提交日志" |
8ada9598 | 12312 | |
1b7f4a34 | 12313 | #: common-cmds.h:28 |
8ada9598 | 12314 | msgid "Join two or more development histories together" |
81809b99 | 12315 | msgstr "合并两个或更多开发历史" |
8ada9598 | 12316 | |
1b7f4a34 | 12317 | #: common-cmds.h:29 |
8ada9598 | 12318 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 12319 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 12320 | |
1b7f4a34 | 12321 | #: common-cmds.h:30 |
2e8451e8 | 12322 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 12323 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 12324 | |
1b7f4a34 | 12325 | #: common-cmds.h:31 |
8ada9598 | 12326 | msgid "Update remote refs along with associated objects" |
81809b99 | 12327 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 12328 | |
1b7f4a34 | 12329 | #: common-cmds.h:32 |
3495628d JX |
12330 | msgid "Reapply commits on top of another base tip" |
12331 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 12332 | |
1b7f4a34 | 12333 | #: common-cmds.h:33 |
8ada9598 | 12334 | msgid "Reset current HEAD to the specified state" |
4375c10e | 12335 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 12336 | |
1b7f4a34 | 12337 | #: common-cmds.h:34 |
8ada9598 | 12338 | msgid "Remove files from the working tree and from the index" |
81809b99 | 12339 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 12340 | |
1b7f4a34 | 12341 | #: common-cmds.h:35 |
8ada9598 | 12342 | msgid "Show various types of objects" |
81809b99 | 12343 | msgstr "显示各种类型的对象" |
8ada9598 | 12344 | |
1b7f4a34 | 12345 | #: common-cmds.h:36 |
8ada9598 | 12346 | msgid "Show the working tree status" |
81809b99 | 12347 | msgstr "显示工作区状态" |
8ada9598 | 12348 | |
1b7f4a34 | 12349 | #: common-cmds.h:37 |
8ada9598 | 12350 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 12351 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 12352 | |
1b7f4a34 | 12353 | #: parse-options.h:145 |
220c313c JX |
12354 | msgid "expiry-date" |
12355 | msgstr "到期时间" | |
12356 | ||
1b7f4a34 | 12357 | #: parse-options.h:160 |
220c313c JX |
12358 | msgid "no-op (backward compatibility)" |
12359 | msgstr "空操作(向后兼容)" | |
12360 | ||
94550ed3 | 12361 | #: parse-options.h:237 |
220c313c JX |
12362 | msgid "be more verbose" |
12363 | msgstr "更加详细" | |
12364 | ||
94550ed3 | 12365 | #: parse-options.h:239 |
220c313c JX |
12366 | msgid "be more quiet" |
12367 | msgstr "更加安静" | |
12368 | ||
94550ed3 | 12369 | #: parse-options.h:245 |
220c313c JX |
12370 | msgid "use <n> digits to display SHA-1s" |
12371 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
12372 | ||
5b04ee3b | 12373 | #: rerere.h:40 |
220c313c JX |
12374 | msgid "update the index with reused conflict resolution if possible" |
12375 | msgstr "如果可能,重用冲突解决更新索引" | |
12376 | ||
5c57d762 | 12377 | #: git-bisect.sh:54 |
b694fbb1 JX |
12378 | msgid "You need to start by \"git bisect start\"" |
12379 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
12380 | ||
90e6ef53 | 12381 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
12382 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
12383 | #. translation. The program will only accept English input | |
12384 | #. at this point. | |
5c57d762 | 12385 | #: git-bisect.sh:60 |
c04f5ac3 JX |
12386 | msgid "Do you want me to do it for you [Y/n]? " |
12387 | msgstr "您想让我为您这样做么[Y/n]? " | |
12388 | ||
5c57d762 | 12389 | #: git-bisect.sh:121 |
c04f5ac3 JX |
12390 | #, sh-format |
12391 | msgid "unrecognised option: '$arg'" | |
81809b99 | 12392 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 | 12393 | |
5c57d762 | 12394 | #: git-bisect.sh:125 |
c04f5ac3 JX |
12395 | #, sh-format |
12396 | msgid "'$arg' does not appear to be a valid revision" | |
12397 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
12398 | ||
5c57d762 | 12399 | #: git-bisect.sh:154 |
c04f5ac3 JX |
12400 | msgid "Bad HEAD - I need a HEAD" |
12401 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
12402 | ||
5c57d762 | 12403 | #: git-bisect.sh:167 |
c04f5ac3 JX |
12404 | #, sh-format |
12405 | msgid "" | |
814ff314 | 12406 | "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." |
d9d56b23 | 12407 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。" |
c04f5ac3 | 12408 | |
5c57d762 | 12409 | #: git-bisect.sh:177 |
cfff71a9 JX |
12410 | msgid "won't bisect on cg-seek'ed tree" |
12411 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
c04f5ac3 | 12412 | |
5c57d762 | 12413 | #: git-bisect.sh:181 |
c04f5ac3 | 12414 | msgid "Bad HEAD - strange symbolic ref" |
90e6ef53 | 12415 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 | 12416 | |
5c57d762 | 12417 | #: git-bisect.sh:233 |
c04f5ac3 JX |
12418 | #, sh-format |
12419 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 12420 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 | 12421 | |
5c57d762 | 12422 | #: git-bisect.sh:262 |
c04f5ac3 JX |
12423 | #, sh-format |
12424 | msgid "Bad rev input: $arg" | |
90e6ef53 | 12425 | msgstr "输入坏的版本:$arg" |
c04f5ac3 | 12426 | |
5c57d762 JX |
12427 | #: git-bisect.sh:281 |
12428 | #, sh-format | |
12429 | msgid "Bad rev input: $bisected_head" | |
12430 | msgstr "输入坏的版本:$bisected_head" | |
c04f5ac3 | 12431 | |
94550ed3 | 12432 | #: git-bisect.sh:290 |
c04f5ac3 JX |
12433 | #, sh-format |
12434 | msgid "Bad rev input: $rev" | |
12435 | msgstr "输入坏的版本:$rev" | |
12436 | ||
94550ed3 | 12437 | #: git-bisect.sh:299 |
1b7f4a34 JX |
12438 | #, sh-format |
12439 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
12440 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
12441 | ||
94550ed3 | 12442 | #: git-bisect.sh:322 |
1b7f4a34 JX |
12443 | #, sh-format |
12444 | msgid "Warning: bisecting only with a $TERM_BAD commit." | |
12445 | msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。" | |
b694fbb1 | 12446 | |
90e6ef53 | 12447 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
12448 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
12449 | #. translation. The program will only accept English input | |
12450 | #. at this point. | |
94550ed3 | 12451 | #: git-bisect.sh:328 |
c04f5ac3 JX |
12452 | msgid "Are you sure [Y/n]? " |
12453 | msgstr "您确认么[Y/n]? " | |
12454 | ||
94550ed3 | 12455 | #: git-bisect.sh:340 |
1b7f4a34 | 12456 | #, sh-format |
b694fbb1 | 12457 | msgid "" |
1b7f4a34 JX |
12458 | "You need to give me at least one $bad_syn and one $good_syn revision.\n" |
12459 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
12460 | msgstr "" |
12461 | "您需要给我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 12462 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 12463 | |
94550ed3 | 12464 | #: git-bisect.sh:343 |
1b7f4a34 | 12465 | #, sh-format |
b694fbb1 JX |
12466 | msgid "" |
12467 | "You need to start by \"git bisect start\".\n" | |
1b7f4a34 JX |
12468 | "You then need to give me at least one $good_syn and one $bad_syn revision.\n" |
12469 | "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" | |
b694fbb1 JX |
12470 | msgstr "" |
12471 | "您需要执行 \"git bisect start\" 来开始。\n" | |
12472 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
1b7f4a34 | 12473 | "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)" |
b694fbb1 | 12474 | |
94550ed3 | 12475 | #: git-bisect.sh:414 git-bisect.sh:546 |
b694fbb1 JX |
12476 | msgid "We are not bisecting." |
12477 | msgstr "我们没有在二分查找。" | |
12478 | ||
94550ed3 | 12479 | #: git-bisect.sh:421 |
c04f5ac3 JX |
12480 | #, sh-format |
12481 | msgid "'$invalid' is not a valid commit" | |
12482 | msgstr "'$invalid' 不是一个有效的提交" | |
12483 | ||
94550ed3 | 12484 | #: git-bisect.sh:430 |
c04f5ac3 JX |
12485 | #, sh-format |
12486 | msgid "" | |
12487 | "Could not check out original HEAD '$branch'.\n" | |
12488 | "Try 'git bisect reset <commit>'." | |
12489 | msgstr "" | |
12490 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 12491 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 12492 | |
94550ed3 | 12493 | #: git-bisect.sh:458 |
c04f5ac3 JX |
12494 | msgid "No logfile given" |
12495 | msgstr "未提供日志文件" | |
12496 | ||
94550ed3 | 12497 | #: git-bisect.sh:459 |
c04f5ac3 JX |
12498 | #, sh-format |
12499 | msgid "cannot read $file for replaying" | |
12500 | msgstr "不能读取 $file 来重放" | |
12501 | ||
94550ed3 | 12502 | #: git-bisect.sh:480 |
c04f5ac3 JX |
12503 | msgid "?? what are you talking about?" |
12504 | msgstr "?? 您在说什么?" | |
12505 | ||
94550ed3 | 12506 | #: git-bisect.sh:492 |
b694fbb1 JX |
12507 | #, sh-format |
12508 | msgid "running $command" | |
12509 | msgstr "运行 $command" | |
12510 | ||
94550ed3 | 12511 | #: git-bisect.sh:499 |
b694fbb1 JX |
12512 | #, sh-format |
12513 | msgid "" | |
12514 | "bisect run failed:\n" | |
12515 | "exit code $res from '$command' is < 0 or >= 128" | |
12516 | msgstr "" | |
12517 | "二分查找运行失败:\n" | |
07432cef | 12518 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 12519 | |
94550ed3 | 12520 | #: git-bisect.sh:525 |
b694fbb1 JX |
12521 | msgid "bisect run cannot continue any more" |
12522 | msgstr "二分查找不能继续运行" | |
12523 | ||
94550ed3 | 12524 | #: git-bisect.sh:531 |
b694fbb1 JX |
12525 | #, sh-format |
12526 | msgid "" | |
12527 | "bisect run failed:\n" | |
12528 | "'bisect_state $state' exited with error code $res" | |
12529 | msgstr "" | |
12530 | "二分查找运行失败:\n" | |
12531 | "'bisect_state $state' 退出码为 $res" | |
12532 | ||
94550ed3 | 12533 | #: git-bisect.sh:538 |
b694fbb1 JX |
12534 | msgid "bisect run success" |
12535 | msgstr "二分查找运行成功" | |
c04f5ac3 | 12536 | |
94550ed3 JX |
12537 | #: git-bisect.sh:565 |
12538 | msgid "please use two different terms" | |
12539 | msgstr "请使用两个不同的术语" | |
12540 | ||
12541 | #: git-bisect.sh:575 | |
12542 | #, sh-format | |
12543 | msgid "'$term' is not a valid term" | |
12544 | msgstr "'$term' 不是一个有效的名称" | |
12545 | ||
12546 | #: git-bisect.sh:578 | |
12547 | #, sh-format | |
12548 | msgid "can't use the builtin command '$term' as a term" | |
12549 | msgstr "不能使用内置命令 '$term' 作为术语" | |
12550 | ||
12551 | #: git-bisect.sh:587 git-bisect.sh:593 | |
12552 | #, sh-format | |
12553 | msgid "can't change the meaning of term '$term'" | |
12554 | msgstr "不能修改术语 '$term' 的含义" | |
12555 | ||
12556 | #: git-bisect.sh:606 | |
b694fbb1 | 12557 | #, sh-format |
1b7f4a34 JX |
12558 | msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." |
12559 | msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。" | |
c04f5ac3 | 12560 | |
94550ed3 JX |
12561 | #: git-bisect.sh:636 |
12562 | msgid "no terms defined" | |
12563 | msgstr "未定义术语" | |
12564 | ||
12565 | #: git-bisect.sh:653 | |
12566 | #, sh-format | |
12567 | msgid "" | |
12568 | "invalid argument $arg for 'git bisect terms'.\n" | |
12569 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
12570 | msgstr "" | |
12571 | "参数 $arg 对命令 'git bisect terms' 无效。\n" | |
12572 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
12573 | ||
5c57d762 JX |
12574 | #: git-merge-octopus.sh:46 |
12575 | msgid "" | |
12576 | "Error: Your local changes to the following files would be overwritten by " | |
12577 | "merge" | |
12578 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
12579 | ||
12580 | #: git-merge-octopus.sh:61 | |
12581 | msgid "Automated merge did not work." | |
12582 | msgstr "自动合并不工作" | |
12583 | ||
12584 | #: git-merge-octopus.sh:62 | |
12585 | msgid "Should not be doing an Octopus." | |
12586 | msgstr "不应该执行章鱼式合并。" | |
12587 | ||
12588 | #: git-merge-octopus.sh:73 | |
12589 | #, sh-format | |
12590 | msgid "Unable to find common commit with $pretty_name" | |
12591 | msgstr "无法找到和 $pretty_name 的基线提交" | |
12592 | ||
12593 | #: git-merge-octopus.sh:77 | |
12594 | #, sh-format | |
12595 | msgid "Already up-to-date with $pretty_name" | |
12596 | msgstr "已经和 $pretty_name 保持一致" | |
12597 | ||
12598 | #: git-merge-octopus.sh:89 | |
12599 | #, sh-format | |
12600 | msgid "Fast-forwarding to: $pretty_name" | |
12601 | msgstr "快进至:$pretty_name" | |
12602 | ||
12603 | #: git-merge-octopus.sh:97 | |
12604 | #, sh-format | |
12605 | msgid "Trying simple merge with $pretty_name" | |
12606 | msgstr "尝试和 $pretty_name 的简单合并" | |
12607 | ||
12608 | #: git-merge-octopus.sh:102 | |
12609 | msgid "Simple merge did not work, trying automatic merge." | |
12610 | msgstr "简单合并不行,尝试自动合并。" | |
12611 | ||
12612 | #: git-rebase.sh:56 | |
649900bc JX |
12613 | msgid "" |
12614 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
12615 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
12616 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
12617 | "\"." | |
12618 | msgstr "" | |
12619 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
12620 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
12621 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
12622 | ||
5c57d762 JX |
12623 | #: git-rebase.sh:156 git-rebase.sh:395 |
12624 | #, sh-format | |
12625 | msgid "Could not move back to $head_name" | |
12626 | msgstr "无法移回 $head_name" | |
12627 | ||
12628 | #: git-rebase.sh:167 | |
2e8451e8 JX |
12629 | msgid "Applied autostash." |
12630 | msgstr "成功应用 autostash。" | |
12631 | ||
5c57d762 | 12632 | #: git-rebase.sh:170 |
2e8451e8 JX |
12633 | #, sh-format |
12634 | msgid "Cannot store $stash_sha1" | |
12635 | msgstr "无法保存 $stash_sha1" | |
12636 | ||
5c57d762 | 12637 | #: git-rebase.sh:171 |
2e8451e8 JX |
12638 | msgid "" |
12639 | "Applying autostash resulted in conflicts.\n" | |
12640 | "Your changes are safe in the stash.\n" | |
b1894384 | 12641 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
12642 | msgstr "" |
12643 | "应用 autostash 导致冲突。\n" | |
12644 | "您的修改安全地保存在 stash 中。\n" | |
12645 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
12646 | ||
5c57d762 | 12647 | #: git-rebase.sh:210 |
649900bc | 12648 | msgid "The pre-rebase hook refused to rebase." |
98b2761d | 12649 | msgstr "钩子 pre-rebase 拒绝变基操作。" |
649900bc | 12650 | |
5c57d762 | 12651 | #: git-rebase.sh:215 |
649900bc JX |
12652 | msgid "It looks like git-am is in progress. Cannot rebase." |
12653 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
12654 | ||
5c57d762 | 12655 | #: git-rebase.sh:356 |
649900bc JX |
12656 | msgid "No rebase in progress?" |
12657 | msgstr "没有正在进行的变基?" | |
12658 | ||
5c57d762 | 12659 | #: git-rebase.sh:367 |
07432cef WS |
12660 | msgid "The --edit-todo action can only be used during interactive rebase." |
12661 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
12662 | ||
5c57d762 | 12663 | #: git-rebase.sh:374 |
649900bc JX |
12664 | msgid "Cannot read HEAD" |
12665 | msgstr "不能读取 HEAD" | |
12666 | ||
5c57d762 | 12667 | #: git-rebase.sh:377 |
649900bc JX |
12668 | msgid "" |
12669 | "You must edit all merge conflicts and then\n" | |
12670 | "mark them as resolved using git add" | |
12671 | msgstr "" | |
12672 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
12673 | "命令将它们标记为已解决" | |
12674 | ||
5c57d762 | 12675 | #: git-rebase.sh:414 |
649900bc JX |
12676 | #, sh-format |
12677 | msgid "" | |
12678 | "It seems that there is already a $state_dir_base directory, and\n" | |
12679 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
12680 | "case, please try\n" | |
12681 | "\t$cmd_live_rebase\n" | |
12682 | "If that is not the case, please\n" | |
12683 | "\t$cmd_clear_stale_rebase\n" | |
12684 | "and run me again. I am stopping in case you still have something\n" | |
12685 | "valuable there." | |
12686 | msgstr "" | |
98b2761d JX |
12687 | "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" |
12688 | "过程中。 如果是这样,请执行\n" | |
649900bc JX |
12689 | "\t$cmd_live_rebase\n" |
12690 | "如果不是这样,请执行\n" | |
12691 | "\t$cmd_clear_stale_rebase\n" | |
98b2761d | 12692 | "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" |
649900bc | 12693 | |
5c57d762 | 12694 | #: git-rebase.sh:465 |
649900bc JX |
12695 | #, sh-format |
12696 | msgid "invalid upstream $upstream_name" | |
12697 | msgstr "无效的上游 $upstream_name" | |
12698 | ||
5c57d762 | 12699 | #: git-rebase.sh:489 |
649900bc JX |
12700 | #, sh-format |
12701 | msgid "$onto_name: there are more than one merge bases" | |
12702 | msgstr "$onto_name: 有一个以上的合并基准" | |
12703 | ||
5c57d762 | 12704 | #: git-rebase.sh:492 git-rebase.sh:496 |
649900bc JX |
12705 | #, sh-format |
12706 | msgid "$onto_name: there is no merge base" | |
12707 | msgstr "$onto_name: 没有合并基准" | |
12708 | ||
5c57d762 | 12709 | #: git-rebase.sh:501 |
649900bc JX |
12710 | #, sh-format |
12711 | msgid "Does not point to a valid commit: $onto_name" | |
12712 | msgstr "没有指向一个有效的提交:$onto_name" | |
12713 | ||
5c57d762 | 12714 | #: git-rebase.sh:524 |
649900bc JX |
12715 | #, sh-format |
12716 | msgid "fatal: no such branch: $branch_name" | |
12717 | msgstr "严重错误:无此分支:$branch_name" | |
12718 | ||
5c57d762 | 12719 | #: git-rebase.sh:557 |
2e8451e8 JX |
12720 | msgid "Cannot autostash" |
12721 | msgstr "无法 autostash" | |
12722 | ||
5c57d762 | 12723 | #: git-rebase.sh:562 |
2e8451e8 JX |
12724 | #, sh-format |
12725 | msgid "Created autostash: $stash_abbrev" | |
12726 | msgstr "创建了 autostash: $stash_abbrev" | |
12727 | ||
5c57d762 | 12728 | #: git-rebase.sh:566 |
649900bc JX |
12729 | msgid "Please commit or stash them." |
12730 | msgstr "请提交或为它们保存进度。" | |
12731 | ||
5c57d762 | 12732 | #: git-rebase.sh:586 |
649900bc JX |
12733 | #, sh-format |
12734 | msgid "Current branch $branch_name is up to date." | |
12735 | msgstr "当前分支 $branch_name 是最新的。" | |
12736 | ||
5c57d762 | 12737 | #: git-rebase.sh:590 |
649900bc JX |
12738 | #, sh-format |
12739 | msgid "Current branch $branch_name is up to date, rebase forced." | |
12740 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
12741 | ||
5c57d762 | 12742 | #: git-rebase.sh:601 |
649900bc JX |
12743 | #, sh-format |
12744 | msgid "Changes from $mb to $onto:" | |
12745 | msgstr "变更从 $mb 到 $onto:" | |
12746 | ||
5c57d762 | 12747 | #: git-rebase.sh:610 |
649900bc | 12748 | msgid "First, rewinding head to replay your work on top of it..." |
160fb2b2 | 12749 | msgstr "首先,回退分支以便在上面重放您的工作..." |
649900bc | 12750 | |
5c57d762 | 12751 | #: git-rebase.sh:620 |
649900bc JX |
12752 | #, sh-format |
12753 | msgid "Fast-forwarded $branch_name to $onto_name." | |
12754 | msgstr "快进 $branch_name 至 $onto_name。" | |
12755 | ||
5c57d762 | 12756 | #: git-stash.sh:50 |
c04f5ac3 JX |
12757 | msgid "git stash clear with parameters is unimplemented" |
12758 | msgstr "git stash clear 不支持参数" | |
12759 | ||
5c57d762 | 12760 | #: git-stash.sh:73 |
c04f5ac3 JX |
12761 | msgid "You do not have the initial commit yet" |
12762 | msgstr "您尚未建立初始提交" | |
12763 | ||
5c57d762 | 12764 | #: git-stash.sh:88 |
c04f5ac3 | 12765 | msgid "Cannot save the current index state" |
90e6ef53 | 12766 | msgstr "无法保存当前索引状态" |
c04f5ac3 | 12767 | |
5c57d762 | 12768 | #: git-stash.sh:123 git-stash.sh:136 |
c04f5ac3 JX |
12769 | msgid "Cannot save the current worktree state" |
12770 | msgstr "无法保存当前工作区状态" | |
12771 | ||
5c57d762 | 12772 | #: git-stash.sh:140 |
c04f5ac3 | 12773 | msgid "No changes selected" |
90e6ef53 | 12774 | msgstr "没有选择变更" |
c04f5ac3 | 12775 | |
5c57d762 | 12776 | #: git-stash.sh:143 |
c04f5ac3 | 12777 | msgid "Cannot remove temporary index (can't happen)" |
90e6ef53 | 12778 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 | 12779 | |
5c57d762 | 12780 | #: git-stash.sh:156 |
c04f5ac3 JX |
12781 | msgid "Cannot record working tree state" |
12782 | msgstr "不能记录工作区状态" | |
12783 | ||
5c57d762 | 12784 | #: git-stash.sh:188 |
2e8451e8 JX |
12785 | #, sh-format |
12786 | msgid "Cannot update $ref_stash with $w_commit" | |
12787 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
12788 | ||
b694fbb1 JX |
12789 | #. TRANSLATORS: $option is an invalid option, like |
12790 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
12791 | #. second line correspond to "error: ". So you should line | |
12792 | #. up the second line with however many characters the | |
12793 | #. translation of "error: " takes in your language. E.g. in | |
12794 | #. English this is: | |
12795 | #. | |
12796 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
12797 | #. error: unknown option for 'stash save': --blah-blah | |
12798 | #. To provide a message, use git stash save -- '--blah-blah' | |
5c57d762 | 12799 | #: git-stash.sh:238 |
b694fbb1 JX |
12800 | #, sh-format |
12801 | msgid "" | |
12802 | "error: unknown option for 'stash save': $option\n" | |
12803 | " To provide a message, use git stash save -- '$option'" | |
12804 | msgstr "" | |
12805 | "错误:'stash save' 的未知选项:$option\n" | |
12806 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
12807 | ||
5c57d762 | 12808 | #: git-stash.sh:259 |
c04f5ac3 JX |
12809 | msgid "No local changes to save" |
12810 | msgstr "没有要保存的本地修改" | |
12811 | ||
5c57d762 | 12812 | #: git-stash.sh:263 |
c04f5ac3 | 12813 | msgid "Cannot initialize stash" |
90e6ef53 | 12814 | msgstr "无法初始化 stash" |
c04f5ac3 | 12815 | |
5c57d762 | 12816 | #: git-stash.sh:267 |
c04f5ac3 JX |
12817 | msgid "Cannot save the current status" |
12818 | msgstr "无法保存当前状态" | |
12819 | ||
5c57d762 JX |
12820 | #: git-stash.sh:268 |
12821 | #, sh-format | |
12822 | msgid "Saved working directory and index state $stash_msg" | |
12823 | msgstr "保存工作目录和索引状态 $stash_msg" | |
12824 | ||
12825 | #: git-stash.sh:285 | |
c04f5ac3 JX |
12826 | msgid "Cannot remove worktree changes" |
12827 | msgstr "无法删除工作区变更" | |
12828 | ||
5c57d762 | 12829 | #: git-stash.sh:404 |
7aea43ff JX |
12830 | #, sh-format |
12831 | msgid "unknown option: $opt" | |
12832 | msgstr "未知选项: $opt" | |
12833 | ||
5c57d762 | 12834 | #: git-stash.sh:414 |
c04f5ac3 | 12835 | msgid "No stash found." |
90e6ef53 | 12836 | msgstr "未发现 stash。" |
c04f5ac3 | 12837 | |
5c57d762 | 12838 | #: git-stash.sh:421 |
c04f5ac3 JX |
12839 | #, sh-format |
12840 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 12841 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 12842 | |
5c57d762 | 12843 | #: git-stash.sh:427 |
c04f5ac3 | 12844 | #, sh-format |
220c313c JX |
12845 | msgid "$reference is not a valid reference" |
12846 | msgstr "$reference 不是一个有效的引用" | |
c04f5ac3 | 12847 | |
5c57d762 | 12848 | #: git-stash.sh:455 |
c04f5ac3 JX |
12849 | #, sh-format |
12850 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 12851 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 12852 | |
5c57d762 | 12853 | #: git-stash.sh:466 |
c04f5ac3 JX |
12854 | #, sh-format |
12855 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 12856 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 12857 | |
5c57d762 | 12858 | #: git-stash.sh:474 |
c04f5ac3 | 12859 | msgid "unable to refresh index" |
90e6ef53 | 12860 | msgstr "无法刷新索引" |
c04f5ac3 | 12861 | |
5c57d762 | 12862 | #: git-stash.sh:478 |
c04f5ac3 JX |
12863 | msgid "Cannot apply a stash in the middle of a merge" |
12864 | msgstr "无法在合并过程中恢复进度" | |
12865 | ||
5c57d762 | 12866 | #: git-stash.sh:486 |
c04f5ac3 | 12867 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 12868 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 12869 | |
5c57d762 | 12870 | #: git-stash.sh:488 |
c04f5ac3 | 12871 | msgid "Could not save index tree" |
90e6ef53 | 12872 | msgstr "不能保存索引树" |
c04f5ac3 | 12873 | |
5c57d762 | 12874 | #: git-stash.sh:522 |
c04f5ac3 | 12875 | msgid "Cannot unstage modified files" |
160fb2b2 | 12876 | msgstr "无法将修改的文件取消暂存" |
c04f5ac3 | 12877 | |
5c57d762 | 12878 | #: git-stash.sh:537 |
b694fbb1 JX |
12879 | msgid "Index was not unstashed." |
12880 | msgstr "索引的进度没有被恢复。" | |
12881 | ||
5c57d762 JX |
12882 | #: git-stash.sh:551 |
12883 | msgid "The stash is kept in case you need it again." | |
12884 | msgstr "进度保存以免您再需要。" | |
12885 | ||
12886 | #: git-stash.sh:560 | |
c04f5ac3 JX |
12887 | #, sh-format |
12888 | msgid "Dropped ${REV} ($s)" | |
12889 | msgstr "丢弃了 ${REV} ($s)" | |
12890 | ||
5c57d762 | 12891 | #: git-stash.sh:561 |
c04f5ac3 JX |
12892 | #, sh-format |
12893 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 12894 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 12895 | |
5c57d762 | 12896 | #: git-stash.sh:569 |
c04f5ac3 JX |
12897 | msgid "No branch name specified" |
12898 | msgstr "未指定分支名" | |
12899 | ||
5c57d762 | 12900 | #: git-stash.sh:641 |
c04f5ac3 JX |
12901 | msgid "(To restore them type \"git stash apply\")" |
12902 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
12903 | ||
5c57d762 | 12904 | #: git-submodule.sh:183 |
2e8451e8 JX |
12905 | msgid "Relative path can only be used from the toplevel of the working tree" |
12906 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
12907 | ||
5c57d762 | 12908 | #: git-submodule.sh:193 |
c04f5ac3 JX |
12909 | #, sh-format |
12910 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 12911 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 12912 | |
5c57d762 | 12913 | #: git-submodule.sh:210 |
c04f5ac3 | 12914 | #, sh-format |
170e9899 JX |
12915 | msgid "'$sm_path' already exists in the index" |
12916 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 12917 | |
5c57d762 | 12918 | #: git-submodule.sh:214 |
b694fbb1 JX |
12919 | #, sh-format |
12920 | msgid "" | |
12921 | "The following path is ignored by one of your .gitignore files:\n" | |
12922 | "$sm_path\n" | |
12923 | "Use -f if you really want to add it." | |
12924 | msgstr "" | |
12925 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
12926 | "$sm_path\n" | |
12927 | "如果您确实想添加它,使用 -f 参数。" | |
12928 | ||
5c57d762 | 12929 | #: git-submodule.sh:232 |
b694fbb1 JX |
12930 | #, sh-format |
12931 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 12932 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 12933 | |
5c57d762 | 12934 | #: git-submodule.sh:234 |
c04f5ac3 | 12935 | #, sh-format |
170e9899 | 12936 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 12937 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 12938 | |
5c57d762 | 12939 | #: git-submodule.sh:242 |
07432cef WS |
12940 | #, sh-format |
12941 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 12942 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 12943 | |
5c57d762 | 12944 | #: git-submodule.sh:244 |
07432cef WS |
12945 | #, sh-format |
12946 | msgid "" | |
5c57d762 JX |
12947 | "If you want to reuse this local git directory instead of cloning again from\n" |
12948 | " $realrepo\n" | |
12949 | "use the '--force' option. If the local git directory is not the correct " | |
12950 | "repo\n" | |
07432cef WS |
12951 | "or you are unsure what this means choose another name with the '--name' " |
12952 | "option." | |
5c57d762 JX |
12953 | msgstr "" |
12954 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
12955 | " $realrepo\n" | |
12956 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
12957 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 12958 | |
5c57d762 | 12959 | #: git-submodule.sh:250 |
07432cef WS |
12960 | #, sh-format |
12961 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
12962 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
12963 | ||
5c57d762 | 12964 | #: git-submodule.sh:262 |
c04f5ac3 | 12965 | #, sh-format |
170e9899 JX |
12966 | msgid "Unable to checkout submodule '$sm_path'" |
12967 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 12968 | |
5c57d762 | 12969 | #: git-submodule.sh:267 |
c04f5ac3 | 12970 | #, sh-format |
170e9899 JX |
12971 | msgid "Failed to add submodule '$sm_path'" |
12972 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 12973 | |
5c57d762 | 12974 | #: git-submodule.sh:276 |
c04f5ac3 | 12975 | #, sh-format |
170e9899 JX |
12976 | msgid "Failed to register submodule '$sm_path'" |
12977 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 12978 | |
5c57d762 | 12979 | #: git-submodule.sh:323 |
c04f5ac3 | 12980 | #, sh-format |
5b04ee3b JX |
12981 | msgid "Entering '$displaypath'" |
12982 | msgstr "正在进入 '$displaypath'" | |
c04f5ac3 | 12983 | |
5c57d762 | 12984 | #: git-submodule.sh:343 |
c04f5ac3 | 12985 | #, sh-format |
5b04ee3b | 12986 | msgid "Stopping at '$displaypath'; script returned non-zero status." |
aef18cc6 | 12987 | msgstr "停止于 '$displaypath';脚本返回非零值。" |
c04f5ac3 | 12988 | |
5c57d762 | 12989 | #: git-submodule.sh:414 |
c04f5ac3 | 12990 | #, sh-format |
5b04ee3b JX |
12991 | msgid "pathspec and --all are incompatible" |
12992 | msgstr "pathspec 和 --all 不兼容" | |
c04f5ac3 | 12993 | |
5c57d762 | 12994 | #: git-submodule.sh:419 |
c04f5ac3 | 12995 | #, sh-format |
5b04ee3b | 12996 | msgid "Use '--all' if you really want to deinitialize all submodules" |
aef18cc6 | 12997 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" |
1003b3a5 | 12998 | |
5c57d762 | 12999 | #: git-submodule.sh:439 |
1003b3a5 JX |
13000 | #, sh-format |
13001 | msgid "" | |
5c57d762 | 13002 | "Submodule work tree '$displaypath' contains a .git directory\n" |
1003b3a5 | 13003 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
5c57d762 JX |
13004 | msgstr "" |
13005 | "子模组工作区 '$displaypath' 包含一个 .git 目录\n" | |
13006 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
1003b3a5 | 13007 | |
5c57d762 | 13008 | #: git-submodule.sh:447 |
c04f5ac3 JX |
13009 | #, sh-format |
13010 | msgid "" | |
2e8451e8 | 13011 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 13012 | "discard them" |
2e8451e8 | 13013 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 13014 | |
5c57d762 | 13015 | #: git-submodule.sh:450 |
1003b3a5 | 13016 | #, sh-format |
2e8451e8 JX |
13017 | msgid "Cleared directory '$displaypath'" |
13018 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 13019 | |
5c57d762 | 13020 | #: git-submodule.sh:451 |
1003b3a5 | 13021 | #, sh-format |
2e8451e8 JX |
13022 | msgid "Could not remove submodule work tree '$displaypath'" |
13023 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 13024 | |
5c57d762 | 13025 | #: git-submodule.sh:454 |
1003b3a5 | 13026 | #, sh-format |
2e8451e8 JX |
13027 | msgid "Could not create empty submodule directory '$displaypath'" |
13028 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 13029 | |
5c57d762 | 13030 | #: git-submodule.sh:463 |
1003b3a5 | 13031 | #, sh-format |
2e8451e8 JX |
13032 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
13033 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 13034 | |
5c57d762 | 13035 | #: git-submodule.sh:612 |
c04f5ac3 | 13036 | #, sh-format |
2e8451e8 JX |
13037 | msgid "Unable to find current revision in submodule path '$displaypath'" |
13038 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 13039 | |
5c57d762 | 13040 | #: git-submodule.sh:622 |
c04f5ac3 | 13041 | #, sh-format |
170e9899 JX |
13042 | msgid "Unable to fetch in submodule path '$sm_path'" |
13043 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 13044 | |
5c57d762 JX |
13045 | #: git-submodule.sh:627 |
13046 | #, sh-format | |
13047 | msgid "" | |
13048 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
13049 | "'$sm_path'" | |
13050 | msgstr "无法在子模组路径 '$sm_path' 中找到当前 ${remote_name}/${branch} 版本" | |
13051 | ||
13052 | #: git-submodule.sh:645 | |
2e8451e8 JX |
13053 | #, sh-format |
13054 | msgid "Unable to fetch in submodule path '$displaypath'" | |
13055 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
13056 | ||
5c57d762 JX |
13057 | #: git-submodule.sh:651 |
13058 | #, sh-format | |
13059 | msgid "" | |
13060 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
13061 | "Direct fetching of that commit failed." | |
13062 | msgstr "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
13063 | ||
13064 | #: git-submodule.sh:658 | |
6c94aba5 JX |
13065 | #, sh-format |
13066 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
13067 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
13068 | ||
5c57d762 | 13069 | #: git-submodule.sh:659 |
c04f5ac3 | 13070 | #, sh-format |
6c94aba5 JX |
13071 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
13072 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
13073 | ||
5c57d762 | 13074 | #: git-submodule.sh:663 |
6c94aba5 | 13075 | #, sh-format |
2e8451e8 JX |
13076 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
13077 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 13078 | |
5c57d762 | 13079 | #: git-submodule.sh:664 |
c04f5ac3 | 13080 | #, sh-format |
2e8451e8 JX |
13081 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
13082 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 13083 | |
5c57d762 | 13084 | #: git-submodule.sh:669 |
c04f5ac3 | 13085 | #, sh-format |
2e8451e8 JX |
13086 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
13087 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 13088 | |
5c57d762 | 13089 | #: git-submodule.sh:670 |
c04f5ac3 | 13090 | #, sh-format |
2e8451e8 JX |
13091 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
13092 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 13093 | |
5c57d762 | 13094 | #: git-submodule.sh:675 |
c04f5ac3 | 13095 | #, sh-format |
5b04ee3b JX |
13096 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
13097 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 13098 | |
5c57d762 | 13099 | #: git-submodule.sh:676 |
c04f5ac3 | 13100 | #, sh-format |
5b04ee3b | 13101 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 13102 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 13103 | |
5c57d762 | 13104 | #: git-submodule.sh:707 |
2e8451e8 JX |
13105 | #, sh-format |
13106 | msgid "Failed to recurse into submodule path '$displaypath'" | |
13107 | msgstr "无法递归进子模组路径 '$displaypath'" | |
13108 | ||
5c57d762 | 13109 | #: git-submodule.sh:815 |
649900bc JX |
13110 | msgid "The --cached option cannot be used with the --files option" |
13111 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 13112 | |
5c57d762 | 13113 | #: git-submodule.sh:867 |
b694fbb1 JX |
13114 | #, sh-format |
13115 | msgid "unexpected mode $mod_dst" | |
13116 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 13117 | |
90e6ef53 | 13118 | # 译者:注意保持前导空格 |
5c57d762 | 13119 | #: git-submodule.sh:887 |
c04f5ac3 | 13120 | #, sh-format |
2e8451e8 JX |
13121 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
13122 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 13123 | |
90e6ef53 | 13124 | # 译者:注意保持前导空格 |
5c57d762 | 13125 | #: git-submodule.sh:890 |
c04f5ac3 | 13126 | #, sh-format |
2e8451e8 JX |
13127 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
13128 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 13129 | |
90e6ef53 | 13130 | # 译者:注意保持前导空格 |
5c57d762 | 13131 | #: git-submodule.sh:893 |
c04f5ac3 | 13132 | #, sh-format |
2e8451e8 JX |
13133 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
13134 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 13135 | |
5c57d762 | 13136 | #: git-submodule.sh:918 |
c04f5ac3 | 13137 | msgid "blob" |
07432cef | 13138 | msgstr "数据对象" |
c04f5ac3 | 13139 | |
5c57d762 | 13140 | #: git-submodule.sh:1040 |
1003b3a5 JX |
13141 | #, sh-format |
13142 | msgid "Failed to recurse into submodule path '$sm_path'" | |
13143 | msgstr "无法递归进子模组路径 '$sm_path'" | |
13144 | ||
5c57d762 | 13145 | #: git-submodule.sh:1107 |
c04f5ac3 | 13146 | #, sh-format |
2e8451e8 JX |
13147 | msgid "Synchronizing submodule url for '$displaypath'" |
13148 | msgstr "为 '$displaypath' 同步子模组 url" | |
1b7f4a34 | 13149 | |
5b04ee3b JX |
13150 | #: git-parse-remote.sh:89 |
13151 | #, sh-format | |
13152 | msgid "See git-${cmd}(1) for details." | |
13153 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 JX |
13154 | |
13155 | #: git-rebase--interactive.sh:131 | |
13156 | #, sh-format | |
13157 | msgid "Rebasing ($new_count/$total)" | |
13158 | msgstr "变基中($new_count/$total)" | |
13159 | ||
13160 | #: git-rebase--interactive.sh:147 | |
13161 | msgid "" | |
13162 | "\n" | |
13163 | "Commands:\n" | |
13164 | " p, pick = use commit\n" | |
13165 | " r, reword = use commit, but edit the commit message\n" | |
13166 | " e, edit = use commit, but stop for amending\n" | |
13167 | " s, squash = use commit, but meld into previous commit\n" | |
13168 | " f, fixup = like \"squash\", but discard this commit's log message\n" | |
13169 | " x, exec = run command (the rest of the line) using shell\n" | |
13170 | " d, drop = remove commit\n" | |
13171 | "\n" | |
13172 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
13173 | msgstr "" | |
13174 | "\n" | |
13175 | "命令:\n" | |
13176 | " p, pick = 使用提交\n" | |
13177 | " r, reword = 使用提交,但修改提交说明\n" | |
13178 | " e, edit = 使用提交,但停止以便进行提交修补\n" | |
13179 | " s, squash = 使用提交,但和前一个版本融合\n" | |
13180 | " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n" | |
13181 | " x, exec = 使用 shell 运行命令(此行剩余部分)\n" | |
13182 | " d, drop = 删除提交\n" | |
13183 | "\n" | |
13184 | "这些行可以重新排序,从上至下地执行。\n" | |
13185 | "\n" | |
13186 | ||
13187 | #: git-rebase--interactive.sh:162 | |
13188 | msgid "" | |
13189 | "\n" | |
13190 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
13191 | msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
13192 | ||
13193 | #: git-rebase--interactive.sh:166 | |
13194 | msgid "" | |
13195 | "\n" | |
13196 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
13197 | msgstr "\n如果您在这里删除一行,这个提交将会丢失。\n" | |
13198 | ||
13199 | #: git-rebase--interactive.sh:202 | |
13200 | #, sh-format | |
13201 | msgid "" | |
13202 | "You can amend the commit now, with\n" | |
13203 | "\n" | |
13204 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
13205 | "\n" | |
13206 | "Once you are satisfied with your changes, run\n" | |
13207 | "\n" | |
13208 | "\tgit rebase --continue" | |
13209 | msgstr "" | |
13210 | "您现在可以修补这个提交,使用\n" | |
13211 | "\n" | |
13212 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
13213 | "\n" | |
13214 | "一旦您对变更满意,执行\n" | |
13215 | "\n" | |
13216 | "\tgit rebase --continue" | |
13217 | ||
13218 | #: git-rebase--interactive.sh:227 | |
13219 | #, sh-format | |
13220 | msgid "$sha1: not a commit that can be picked" | |
13221 | msgstr "$sha1:不是一个可以被拣选的提交" | |
13222 | ||
13223 | #: git-rebase--interactive.sh:266 | |
13224 | #, sh-format | |
13225 | msgid "Invalid commit name: $sha1" | |
13226 | msgstr "无效的提交名:$sha1" | |
13227 | ||
13228 | #: git-rebase--interactive.sh:308 | |
13229 | msgid "Cannot write current commit's replacement sha1" | |
13230 | msgstr "不能写入当前提交的替代 sha1" | |
13231 | ||
13232 | #: git-rebase--interactive.sh:360 | |
13233 | #, sh-format | |
13234 | msgid "Fast-forward to $sha1" | |
13235 | msgstr "快进到 $sha1" | |
13236 | ||
13237 | #: git-rebase--interactive.sh:362 | |
13238 | #, sh-format | |
13239 | msgid "Cannot fast-forward to $sha1" | |
13240 | msgstr "不能快进到 $sha1" | |
13241 | ||
13242 | #: git-rebase--interactive.sh:371 | |
13243 | #, sh-format | |
13244 | msgid "Cannot move HEAD to $first_parent" | |
13245 | msgstr "不能移动 HEAD 到 $first_parent" | |
13246 | ||
13247 | #: git-rebase--interactive.sh:376 | |
13248 | #, sh-format | |
13249 | msgid "Refusing to squash a merge: $sha1" | |
13250 | msgstr "拒绝压缩一个合并:$sha1" | |
13251 | ||
13252 | #: git-rebase--interactive.sh:390 | |
13253 | #, sh-format | |
13254 | msgid "Error redoing merge $sha1" | |
13255 | msgstr "无法重做合并 $sha1" | |
13256 | ||
13257 | #: git-rebase--interactive.sh:398 | |
13258 | #, sh-format | |
13259 | msgid "Could not pick $sha1" | |
13260 | msgstr "不能拣选 $sha1" | |
13261 | ||
13262 | #: git-rebase--interactive.sh:407 | |
13263 | #, sh-format | |
13264 | msgid "This is the commit message #${n}:" | |
13265 | msgstr "这是提交信息 #${n}:" | |
13266 | ||
13267 | #: git-rebase--interactive.sh:412 | |
13268 | #, sh-format | |
13269 | msgid "The commit message #${n} will be skipped:" | |
13270 | msgstr "提交信息 #${n} 将被跳过:" | |
13271 | ||
13272 | #: git-rebase--interactive.sh:423 | |
13273 | #, sh-format | |
13274 | msgid "This is a combination of $count commit." | |
13275 | msgid_plural "This is a combination of $count commits." | |
13276 | msgstr[0] "这是一个 $count 个提交的组合。" | |
13277 | msgstr[1] "这是一个 $count 个提交的组合。" | |
13278 | ||
13279 | #: git-rebase--interactive.sh:431 | |
13280 | #, sh-format | |
13281 | msgid "Cannot write $fixup_msg" | |
13282 | msgstr "不能写入 $fixup_msg" | |
13283 | ||
13284 | #: git-rebase--interactive.sh:434 | |
13285 | msgid "This is a combination of 2 commits." | |
13286 | msgstr "这是一个 2 个提交的组合。" | |
13287 | ||
13288 | #: git-rebase--interactive.sh:435 | |
13289 | msgid "This is the 1st commit message:" | |
13290 | msgstr "这是第一个提交说明:" | |
13291 | ||
13292 | #: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 | |
13293 | #: git-rebase--interactive.sh:521 | |
13294 | #, sh-format | |
13295 | msgid "Could not apply $sha1... $rest" | |
13296 | msgstr "不能应用 $sha1... $rest" | |
13297 | ||
13298 | #: git-rebase--interactive.sh:549 | |
13299 | #, sh-format | |
13300 | msgid "" | |
13301 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
13302 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
13303 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
13304 | "before\n" | |
13305 | "you are able to reword the commit." | |
13306 | msgstr "" | |
13307 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
13308 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
13309 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
13310 | ||
13311 | #: git-rebase--interactive.sh:564 | |
13312 | #, sh-format | |
13313 | msgid "Stopped at $sha1_abbrev... $rest" | |
13314 | msgstr "停止在 $sha1_abbrev... $rest" | |
13315 | ||
13316 | #: git-rebase--interactive.sh:579 | |
13317 | #, sh-format | |
13318 | msgid "Cannot '$squash_style' without a previous commit" | |
13319 | msgstr "不能在没有前一个提交的情况下 '$squash_style'" | |
13320 | ||
13321 | #: git-rebase--interactive.sh:621 | |
13322 | #, sh-format | |
13323 | msgid "Executing: $rest" | |
13324 | msgstr "执行:$rest" | |
13325 | ||
13326 | #: git-rebase--interactive.sh:629 | |
13327 | #, sh-format | |
13328 | msgid "Execution failed: $rest" | |
13329 | msgstr "执行失败:$rest" | |
13330 | ||
13331 | #: git-rebase--interactive.sh:631 | |
13332 | msgid "and made changes to the index and/or the working tree" | |
13333 | msgstr "并且修改索引和/或工作区" | |
13334 | ||
13335 | # 译者:注意保持前导空格 | |
13336 | #: git-rebase--interactive.sh:633 | |
13337 | msgid "" | |
13338 | "You can fix the problem, and then run\n" | |
13339 | "\n" | |
13340 | "\tgit rebase --continue" | |
13341 | msgstr "" | |
13342 | "您可以解决这个问题,然后运行\n" | |
13343 | "\n" | |
13344 | "\tgit rebase --continue" | |
13345 | ||
13346 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
13347 | #: git-rebase--interactive.sh:646 | |
13348 | #, sh-format | |
13349 | msgid "" | |
13350 | "Execution succeeded: $rest\n" | |
13351 | "but left changes to the index and/or the working tree\n" | |
13352 | "Commit or stash your changes, and then run\n" | |
13353 | "\n" | |
13354 | "\tgit rebase --continue" | |
13355 | msgstr "" | |
13356 | "执行成功:$rest\n" | |
13357 | "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n" | |
13358 | "\n" | |
13359 | "\tgit rebase --continue" | |
13360 | ||
13361 | #: git-rebase--interactive.sh:657 | |
13362 | #, sh-format | |
13363 | msgid "Unknown command: $command $sha1 $rest" | |
13364 | msgstr "未知命令:$command $sha1 $rest" | |
13365 | ||
13366 | #: git-rebase--interactive.sh:658 | |
13367 | msgid "Please fix this using 'git rebase --edit-todo'." | |
13368 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
13369 | ||
13370 | #: git-rebase--interactive.sh:693 | |
13371 | #, sh-format | |
13372 | msgid "Successfully rebased and updated $head_name." | |
13373 | msgstr "成功变基并更新 $head_name." | |
13374 | ||
13375 | #: git-rebase--interactive.sh:740 | |
13376 | msgid "Could not skip unnecessary pick commands" | |
13377 | msgstr "不能跳过不必要的拣选命令" | |
13378 | ||
13379 | #: git-rebase--interactive.sh:898 | |
13380 | #, sh-format | |
13381 | msgid "" | |
13382 | "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" | |
13383 | " - $line" | |
13384 | msgstr "" | |
13385 | "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n" | |
13386 | " - $line" | |
13387 | ||
13388 | #: git-rebase--interactive.sh:931 | |
13389 | #, sh-format | |
13390 | msgid "" | |
13391 | "Warning: the command isn't recognized in the following line:\n" | |
13392 | " - $line" | |
13393 | msgstr "" | |
13394 | "警告:下面一行中的命令未能被识别:\n" | |
13395 | " - $line" | |
13396 | ||
13397 | #: git-rebase--interactive.sh:970 | |
13398 | msgid "could not detach HEAD" | |
13399 | msgstr "不能检出为分离头指针" | |
13400 | ||
13401 | #: git-rebase--interactive.sh:1008 | |
13402 | msgid "" | |
13403 | "Warning: some commits may have been dropped accidentally.\n" | |
13404 | "Dropped commits (newer to older):" | |
13405 | msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):" | |
13406 | ||
13407 | #: git-rebase--interactive.sh:1016 | |
13408 | msgid "" | |
13409 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
13410 | "\n" | |
13411 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
13412 | "warnings.\n" | |
13413 | "The possible behaviours are: ignore, warn, error." | |
13414 | msgstr "" | |
13415 | "为避免这条信息,使用 drop 指令显式地删除一个提交。\n" | |
13416 | "\n" | |
13417 | "使用 'git config rebase.missingCommitsCheck' 来修改这个级别的警告。\n" | |
13418 | "可以使用:ignore、warn、error。" | |
13419 | ||
13420 | #: git-rebase--interactive.sh:1027 | |
13421 | #, sh-format | |
13422 | msgid "" | |
13423 | "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " | |
13424 | "Ignoring." | |
13425 | msgstr "选项 rebase.missingCommitsCheck 中无法识别的设置 $check_level。忽略。" | |
13426 | ||
13427 | #: git-rebase--interactive.sh:1044 | |
13428 | msgid "You can fix this with 'git rebase --edit-todo'." | |
13429 | msgstr "您可以使用 'git rebase --edit-todo' 命令修改。" | |
13430 | ||
13431 | #: git-rebase--interactive.sh:1045 | |
13432 | msgid "Or you can abort the rebase with 'git rebase --abort'." | |
13433 | msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。" | |
13434 | ||
13435 | #: git-rebase--interactive.sh:1069 | |
13436 | msgid "Could not remove CHERRY_PICK_HEAD" | |
13437 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
13438 | ||
13439 | #: git-rebase--interactive.sh:1074 | |
13440 | #, sh-format | |
13441 | msgid "" | |
13442 | "You have staged changes in your working tree.\n" | |
13443 | "If these changes are meant to be\n" | |
13444 | "squashed into the previous commit, run:\n" | |
13445 | "\n" | |
13446 | " git commit --amend $gpg_sign_opt_quoted\n" | |
13447 | "\n" | |
13448 | "If they are meant to go into a new commit, run:\n" | |
13449 | "\n" | |
13450 | " git commit $gpg_sign_opt_quoted\n" | |
13451 | "\n" | |
13452 | "In both case, once you're done, continue with:\n" | |
13453 | "\n" | |
13454 | " git rebase --continue\n" | |
13455 | msgstr "" | |
13456 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
13457 | "\n" | |
13458 | " git commit --amend $gpg_sign_opt_quoted\n" | |
13459 | "\n" | |
13460 | "如果这些变更要形成一个新提交,执行:\n" | |
13461 | "\n" | |
13462 | " git commit $gpg_sign_opt_quoted\n" | |
13463 | "\n" | |
13464 | "两种情况下,一旦执行完毕,继续执行:\n" | |
13465 | "\n" | |
13466 | " git rebase --continue\n" | |
13467 | ||
13468 | #: git-rebase--interactive.sh:1091 | |
13469 | msgid "Error trying to find the author identity to amend commit" | |
13470 | msgstr "当在修补提交中查找作者信息时遇到错误" | |
13471 | ||
13472 | #: git-rebase--interactive.sh:1096 | |
13473 | msgid "" | |
13474 | "You have uncommitted changes in your working tree. Please commit them\n" | |
13475 | "first and then run 'git rebase --continue' again." | |
13476 | msgstr "您的工作区中有未提交的变更。请先提交然后再运行 'git rebase --continue'。" | |
13477 | ||
13478 | #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 | |
13479 | msgid "Could not commit staged changes." | |
13480 | msgstr "不能提交暂存的修改。" | |
13481 | ||
13482 | #: git-rebase--interactive.sh:1129 | |
13483 | msgid "" | |
13484 | "\n" | |
13485 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
13486 | "To continue rebase after editing, run:\n" | |
13487 | " git rebase --continue\n" | |
13488 | "\n" | |
13489 | msgstr "" | |
13490 | "\n" | |
13491 | "您正在修改运行中的交互式变基的 todo 文件。编辑结束后继续变基,\n" | |
13492 | "请执行:\n" | |
13493 | " git rebase --continue\n" | |
13494 | "\n" | |
13495 | ||
13496 | #: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298 | |
13497 | msgid "Could not execute editor" | |
13498 | msgstr "无法运行编辑器" | |
13499 | ||
13500 | #: git-rebase--interactive.sh:1145 | |
13501 | msgid "You need to set your committer info first" | |
13502 | msgstr "您需要先设置您的提交者信息" | |
13503 | ||
13504 | #: git-rebase--interactive.sh:1153 | |
13505 | #, sh-format | |
13506 | msgid "Could not checkout $switch_to" | |
13507 | msgstr "不能检出 $switch_to" | |
13508 | ||
13509 | #: git-rebase--interactive.sh:1158 | |
13510 | msgid "No HEAD?" | |
13511 | msgstr "没有 HEAD?" | |
13512 | ||
13513 | #: git-rebase--interactive.sh:1159 | |
13514 | #, sh-format | |
13515 | msgid "Could not create temporary $state_dir" | |
13516 | msgstr "不能创建临时 $state_dir" | |
13517 | ||
13518 | #: git-rebase--interactive.sh:1161 | |
13519 | msgid "Could not mark as interactive" | |
13520 | msgstr "不能标记为交互式" | |
13521 | ||
13522 | #: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176 | |
13523 | msgid "Could not init rewritten commits" | |
13524 | msgstr "不能对重写提交进行初始化" | |
13525 | ||
13526 | #: git-rebase--interactive.sh:1276 | |
13527 | #, sh-format | |
13528 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
13529 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
13530 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
13531 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
13532 | ||
13533 | #: git-rebase--interactive.sh:1281 | |
13534 | msgid "" | |
13535 | "\n" | |
13536 | "However, if you remove everything, the rebase will be aborted.\n" | |
13537 | "\n" | |
13538 | msgstr "\n然而,如果您删除全部内容,变基操作将会终止。\n\n" | |
13539 | ||
13540 | #: git-rebase--interactive.sh:1288 | |
13541 | msgid "Note that empty commits are commented out" | |
13542 | msgstr "注意空提交已被注释掉" | |
13543 | ||
13544 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 | |
13545 | #, sh-format | |
13546 | msgid "usage: $dashless $USAGE" | |
13547 | msgstr "用法:$dashless $USAGE" | |
13548 | ||
13549 | #: git-sh-setup.sh:190 | |
13550 | #, sh-format | |
13551 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
13552 | msgstr "不能更换目录到 $cdup,工作区的顶级目录" | |
13553 | ||
13554 | #: git-sh-setup.sh:199 git-sh-setup.sh:206 | |
13555 | #, sh-format | |
13556 | msgid "fatal: $program_name cannot be used without a working tree." | |
13557 | msgstr "严重错误:$program_name 不能在没有工作区的情况下使用" | |
13558 | ||
13559 | #: git-sh-setup.sh:220 | |
13560 | msgid "Cannot rebase: You have unstaged changes." | |
13561 | msgstr "不能变基:您有未暂存的变更。" | |
13562 | ||
13563 | #: git-sh-setup.sh:223 | |
13564 | msgid "Cannot rewrite branches: You have unstaged changes." | |
13565 | msgstr "不能重写分支:您有未暂存的变更。" | |
13566 | ||
13567 | #: git-sh-setup.sh:229 | |
13568 | #, sh-format | |
13569 | msgid "Cannot $action: You have unstaged changes." | |
13570 | msgstr "不能 $action:您有未暂存的变更。" | |
13571 | ||
13572 | #: git-sh-setup.sh:242 | |
13573 | msgid "Cannot rebase: Your index contains uncommitted changes." | |
13574 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
13575 | ||
13576 | #: git-sh-setup.sh:248 | |
13577 | #, sh-format | |
13578 | msgid "Cannot $action: Your index contains uncommitted changes." | |
13579 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
13580 | ||
13581 | #: git-sh-setup.sh:372 | |
13582 | msgid "You need to run this command from the toplevel of the working tree." | |
13583 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
13584 | ||
13585 | #: git-sh-setup.sh:377 | |
13586 | msgid "Unable to determine absolute path of git directory" | |
13587 | msgstr "不能确定 git 目录的绝对路径" |