]>
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 JX |
4 | # This file is distributed under the same license as the Git package. |
5 | # Contributers: | |
6 | # - Jiang Xin <worldhello.net AT gmail.com> | |
7 | # - Riku <lu.riku AT gmail.com> | |
8 | # - Zhuang Ya <zhuangya AT me.com> | |
9 | # - Lian Cheng <rhythm.mail AT gmail.com> | |
10 | # | |
11 | msgid "" | |
12 | msgstr "" | |
13 | "Project-Id-Version: Git\n" | |
14 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
90314792 JX |
15 | "POT-Creation-Date: 2013-11-02 08:06+0800\n" |
16 | "PO-Revision-Date: 2013-11-02 08:14+0800\n" | |
c04f5ac3 JX |
17 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
18 | "Language-Team: GitHub <https://github.com/gotgit/git/>\n" | |
19 | "Language: zh_CN\n" | |
20 | "MIME-Version: 1.0\n" | |
21 | "Content-Type: text/plain; charset=UTF-8\n" | |
22 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 23 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 24 | |
2e8451e8 | 25 | #: advice.c:57 |
c04f5ac3 JX |
26 | #, c-format |
27 | msgid "hint: %.*s\n" | |
28 | msgstr "提示:%.*s\n" | |
29 | ||
30 | #. | |
31 | #. * Message used both when 'git commit' fails and when | |
32 | #. * other commands doing a merge do. | |
33 | #. | |
2e8451e8 | 34 | #: advice.c:87 |
c04f5ac3 JX |
35 | msgid "" |
36 | "Fix them up in the work tree,\n" | |
37 | "and then use 'git add/rm <file>' as\n" | |
38 | "appropriate to mark resolution and make a commit,\n" | |
39 | "or use 'git commit -a'." | |
40 | msgstr "" | |
41 | "请先在工作区改正文件,然后酌情使用\n" | |
42 | "'git add/rm <file>' 标记解决方案,\n" | |
43 | "或使用 'git commit -a'。" | |
44 | ||
ef317cd5 | 45 | #: archive.c:10 |
ef317cd5 | 46 | msgid "git archive [options] <tree-ish> [<path>...]" |
07432cef | 47 | msgstr "git archive [选项] <树或提交> [<路径>...]" |
ef317cd5 JX |
48 | |
49 | #: archive.c:11 | |
ef317cd5 | 50 | msgid "git archive --list" |
07432cef | 51 | msgstr "git archive --list" |
ef317cd5 JX |
52 | |
53 | #: archive.c:12 | |
54 | msgid "" | |
55 | "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" | |
56 | msgstr "" | |
07432cef | 57 | "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" |
ef317cd5 JX |
58 | |
59 | #: archive.c:13 | |
60 | msgid "git archive --remote <repo> [--exec <cmd>] --list" | |
07432cef | 61 | msgstr "git archive --remote <版本库> [--exec <命令>] --list" |
ef317cd5 | 62 | |
90314792 JX |
63 | #: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 |
64 | #, c-format | |
65 | msgid "pathspec '%s' did not match any files" | |
66 | msgstr "路径规则 '%s' 未匹配任何文件" | |
67 | ||
68 | #: archive.c:327 | |
ef317cd5 | 69 | msgid "fmt" |
07432cef | 70 | msgstr "格式" |
ef317cd5 | 71 | |
90314792 | 72 | #: archive.c:327 |
ef317cd5 | 73 | msgid "archive format" |
07432cef | 74 | msgstr "归档格式" |
ef317cd5 | 75 | |
90314792 | 76 | #: archive.c:328 builtin/log.c:1193 |
ef317cd5 | 77 | msgid "prefix" |
07432cef | 78 | msgstr "前缀" |
ef317cd5 | 79 | |
90314792 | 80 | #: archive.c:329 |
ef317cd5 | 81 | msgid "prepend prefix to each pathname in the archive" |
07432cef | 82 | msgstr "为归档中每个路径名加上前缀" |
ef317cd5 | 83 | |
90314792 JX |
84 | #: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 |
85 | #: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 | |
86 | #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 | |
87 | #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 | |
88 | #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 | |
ef317cd5 JX |
89 | msgid "file" |
90 | msgstr "文件" | |
91 | ||
90314792 | 92 | #: archive.c:331 builtin/archive.c:89 |
ef317cd5 | 93 | msgid "write the archive to this file" |
07432cef | 94 | msgstr "归档写入此文件" |
ef317cd5 | 95 | |
90314792 | 96 | #: archive.c:333 |
ef317cd5 | 97 | msgid "read .gitattributes in working directory" |
07432cef | 98 | msgstr "读取工作区中的 .gitattributes" |
ef317cd5 | 99 | |
90314792 | 100 | #: archive.c:334 |
ef317cd5 | 101 | msgid "report archived files on stderr" |
07432cef | 102 | msgstr "在标准错误上报告归档文件" |
ef317cd5 | 103 | |
90314792 | 104 | #: archive.c:335 |
ef317cd5 | 105 | msgid "store only" |
07432cef | 106 | msgstr "只存储" |
ef317cd5 | 107 | |
90314792 | 108 | #: archive.c:336 |
ef317cd5 | 109 | msgid "compress faster" |
07432cef | 110 | msgstr "压缩速度更快" |
ef317cd5 | 111 | |
90314792 | 112 | #: archive.c:344 |
ef317cd5 | 113 | msgid "compress better" |
07432cef | 114 | msgstr "压缩效果更好" |
ef317cd5 | 115 | |
90314792 | 116 | #: archive.c:347 |
ef317cd5 | 117 | msgid "list supported archive formats" |
07432cef | 118 | msgstr "列出支持的归档格式" |
ef317cd5 | 119 | |
90314792 | 120 | #: archive.c:349 builtin/archive.c:90 builtin/clone.c:84 |
ef317cd5 | 121 | msgid "repo" |
07432cef | 122 | msgstr "版本库" |
ef317cd5 | 123 | |
90314792 | 124 | #: archive.c:350 builtin/archive.c:91 |
ef317cd5 | 125 | msgid "retrieve the archive from remote repository <repo>" |
07432cef | 126 | msgstr "从远程版本库(<版本库>)提取归档文件" |
ef317cd5 | 127 | |
90314792 | 128 | #: archive.c:351 builtin/archive.c:92 builtin/notes.c:487 |
ef317cd5 | 129 | msgid "command" |
07432cef | 130 | msgstr "命令" |
ef317cd5 | 131 | |
90314792 | 132 | #: archive.c:352 builtin/archive.c:93 |
ef317cd5 | 133 | msgid "path to the remote git-upload-archive command" |
07432cef WS |
134 | msgstr "远程 git-upload-archive 命令的路径" |
135 | ||
136 | #: attr.c:259 | |
137 | msgid "" | |
a7409dfb | 138 | "Negative patterns are ignored in git attributes\n" |
07432cef | 139 | "Use '\\!' for literal leading exclamation." |
ef317cd5 | 140 | msgstr "" |
a7409dfb | 141 | "负值模版在 git attributes 中被忽略\n" |
07432cef | 142 | "当字符串确实要以感叹号开始时,使用 '\\!'。" |
ef317cd5 | 143 | |
4dcdc3d8 JX |
144 | #: branch.c:60 |
145 | #, c-format | |
146 | msgid "Not setting branch %s as its own upstream." | |
147 | msgstr "未设置分支 %s 作为它自己的上游。" | |
148 | ||
149 | #: branch.c:82 | |
150 | #, c-format | |
151 | msgid "Branch %s set up to track remote branch %s from %s by rebasing." | |
152 | msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。" | |
153 | ||
154 | #: branch.c:83 | |
155 | #, c-format | |
156 | msgid "Branch %s set up to track remote branch %s from %s." | |
157 | msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。" | |
158 | ||
159 | #: branch.c:87 | |
160 | #, c-format | |
161 | msgid "Branch %s set up to track local branch %s by rebasing." | |
162 | msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。" | |
163 | ||
164 | #: branch.c:88 | |
165 | #, c-format | |
166 | msgid "Branch %s set up to track local branch %s." | |
167 | msgstr "分支 %s 设置为跟踪本地分支 %s。" | |
168 | ||
169 | #: branch.c:92 | |
170 | #, c-format | |
171 | msgid "Branch %s set up to track remote ref %s by rebasing." | |
172 | msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。" | |
173 | ||
174 | #: branch.c:93 | |
175 | #, c-format | |
176 | msgid "Branch %s set up to track remote ref %s." | |
177 | msgstr "分支 %s 设置为跟踪远程引用 %s。" | |
178 | ||
179 | #: branch.c:97 | |
180 | #, c-format | |
181 | msgid "Branch %s set up to track local ref %s by rebasing." | |
182 | msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。" | |
183 | ||
184 | #: branch.c:98 | |
185 | #, c-format | |
186 | msgid "Branch %s set up to track local ref %s." | |
187 | msgstr "分支 %s 设置为跟踪本地引用 %s。" | |
188 | ||
189 | #: branch.c:118 | |
190 | #, c-format | |
191 | msgid "Tracking not set up: name too long: %s" | |
192 | msgstr "跟踪未设置:名字太长:%s" | |
193 | ||
194 | #: branch.c:137 | |
195 | #, c-format | |
196 | msgid "Not tracking: ambiguous information for ref %s" | |
197 | msgstr "未跟踪:引用 %s 有歧义" | |
198 | ||
199 | #: branch.c:182 | |
200 | #, c-format | |
201 | msgid "'%s' is not a valid branch name." | |
202 | msgstr "'%s' 不是一个有效的分支名称。" | |
203 | ||
204 | #: branch.c:187 | |
205 | #, c-format | |
206 | msgid "A branch named '%s' already exists." | |
207 | msgstr "一个分支名 '%s' 已经存在。" | |
208 | ||
209 | #: branch.c:195 | |
210 | msgid "Cannot force update the current branch." | |
211 | msgstr "无法强制更新当前分支。" | |
212 | ||
90314792 | 213 | #: branch.c:215 |
1003b3a5 JX |
214 | #, c-format |
215 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." | |
216 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
217 | ||
90314792 | 218 | #: branch.c:217 |
1003b3a5 JX |
219 | #, c-format |
220 | msgid "the requested upstream branch '%s' does not exist" | |
221 | msgstr "请求的上游分支 '%s' 不存在" | |
222 | ||
90314792 | 223 | #: branch.c:219 |
1003b3a5 JX |
224 | msgid "" |
225 | "\n" | |
226 | "If you are planning on basing your work on an upstream\n" | |
227 | "branch that already exists at the remote, you may need to\n" | |
228 | "run \"git fetch\" to retrieve it.\n" | |
229 | "\n" | |
230 | "If you are planning to push out a new local branch that\n" | |
231 | "will track its remote counterpart, you may want to use\n" | |
232 | "\"git push -u\" to set the upstream config as you push." | |
233 | msgstr "" | |
234 | "\n" | |
235 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
236 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
237 | "\n" | |
238 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
239 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
240 | ||
90314792 | 241 | #: branch.c:264 |
4dcdc3d8 JX |
242 | #, c-format |
243 | msgid "Not a valid object name: '%s'." | |
244 | msgstr "不是一个有效的对象名:'%s'。" | |
245 | ||
90314792 | 246 | #: branch.c:284 |
4dcdc3d8 JX |
247 | #, c-format |
248 | msgid "Ambiguous object name: '%s'." | |
249 | msgstr "歧义的对象名:'%s'。" | |
250 | ||
90314792 | 251 | #: branch.c:289 |
4dcdc3d8 JX |
252 | #, c-format |
253 | msgid "Not a valid branch point: '%s'." | |
254 | msgstr "无效的分支点:'%s'。" | |
255 | ||
90314792 | 256 | #: branch.c:295 |
4dcdc3d8 JX |
257 | msgid "Failed to lock ref for update" |
258 | msgstr "无法为更新锁定引用" | |
259 | ||
90314792 | 260 | #: branch.c:313 |
4dcdc3d8 JX |
261 | msgid "Failed to write ref" |
262 | msgstr "不能写引用" | |
263 | ||
8ada9598 JX |
264 | #: bundle.c:36 |
265 | #, c-format | |
266 | msgid "'%s' does not look like a v2 bundle file" | |
81809b99 | 267 | msgstr "'%s' 不像是一个 v2 版本的包文件" |
8ada9598 JX |
268 | |
269 | #: bundle.c:63 | |
81809b99 | 270 | #, c-format |
8ada9598 | 271 | msgid "unrecognized header: %s%s (%d)" |
81809b99 | 272 | msgstr "未能识别的包头:%s%s (%d)" |
8ada9598 | 273 | |
90314792 | 274 | #: bundle.c:89 builtin/commit.c:706 |
8ada9598 JX |
275 | #, c-format |
276 | msgid "could not open '%s'" | |
277 | msgstr "不能打开 '%s'" | |
278 | ||
279 | #: bundle.c:140 | |
280 | msgid "Repository lacks these prerequisite commits:" | |
81809b99 | 281 | msgstr "版本库缺少这些必备的提交:" |
8ada9598 | 282 | |
90314792 JX |
283 | #: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 |
284 | #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 | |
285 | #: builtin/shortlog.c:158 | |
8ada9598 JX |
286 | msgid "revision walk setup failed" |
287 | msgstr "版本遍历设置失败" | |
288 | ||
289 | #: bundle.c:186 | |
290 | #, c-format | |
1003b3a5 JX |
291 | msgid "The bundle contains this ref:" |
292 | msgid_plural "The bundle contains these %d refs:" | |
293 | msgstr[0] "这个包中含有这个引用:" | |
294 | msgstr[1] "这个包中含有 %d 个引用:" | |
8ada9598 | 295 | |
1003b3a5 | 296 | #: bundle.c:193 |
6792b93b JX |
297 | msgid "The bundle records a complete history." |
298 | msgstr "这个包记录一个完整历史。" | |
299 | ||
300 | #: bundle.c:195 | |
8ada9598 | 301 | #, c-format |
1003b3a5 JX |
302 | msgid "The bundle requires this ref:" |
303 | msgid_plural "The bundle requires these %d refs:" | |
304 | msgstr[0] "这个包需要这个引用:" | |
305 | msgstr[1] "这个包需要 %d 个引用:" | |
8ada9598 | 306 | |
6792b93b | 307 | #: bundle.c:294 |
8ada9598 | 308 | msgid "rev-list died" |
81809b99 | 309 | msgstr "rev-list 终止" |
8ada9598 | 310 | |
90314792 | 311 | #: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 |
8ada9598 JX |
312 | #, c-format |
313 | msgid "unrecognized argument: %s" | |
81809b99 | 314 | msgstr "未能识别的参数:%s" |
8ada9598 | 315 | |
6792b93b | 316 | #: bundle.c:335 |
8ada9598 JX |
317 | #, c-format |
318 | msgid "ref '%s' is excluded by the rev-list options" | |
81809b99 | 319 | msgstr "引用 '%s' 被 rev-list 选项排除" |
8ada9598 | 320 | |
6792b93b | 321 | #: bundle.c:380 |
8ada9598 | 322 | msgid "Refusing to create empty bundle." |
81809b99 | 323 | msgstr "不能创建空包。" |
8ada9598 | 324 | |
6792b93b | 325 | #: bundle.c:398 |
8ada9598 | 326 | msgid "Could not spawn pack-objects" |
81809b99 | 327 | msgstr "不能生成 pack-objects 进程" |
8ada9598 | 328 | |
6792b93b | 329 | #: bundle.c:416 |
8ada9598 | 330 | msgid "pack-objects died" |
81809b99 | 331 | msgstr "pack-objects 终止" |
8ada9598 | 332 | |
6792b93b | 333 | #: bundle.c:419 |
81809b99 | 334 | #, c-format |
8ada9598 | 335 | msgid "cannot create '%s'" |
81809b99 | 336 | msgstr "不能创建 '%s'" |
8ada9598 | 337 | |
6792b93b | 338 | #: bundle.c:441 |
8ada9598 | 339 | msgid "index-pack died" |
81809b99 | 340 | msgstr "index-pack 终止" |
8ada9598 | 341 | |
2e8451e8 | 342 | #: commit.c:53 |
c04f5ac3 JX |
343 | #, c-format |
344 | msgid "could not parse %s" | |
345 | msgstr "不能解析 %s" | |
346 | ||
2e8451e8 | 347 | #: commit.c:55 |
c04f5ac3 JX |
348 | #, c-format |
349 | msgid "%s %s is not a commit!" | |
350 | msgstr "%s %s 不是一个提交!" | |
351 | ||
352 | #: compat/obstack.c:406 compat/obstack.c:408 | |
353 | msgid "memory exhausted" | |
354 | msgstr "内存耗尽" | |
355 | ||
2e8451e8 | 356 | #: connected.c:60 |
c04f5ac3 JX |
357 | msgid "Could not run 'git rev-list'" |
358 | msgstr "不能执行 'git rev-list'" | |
359 | ||
2e8451e8 | 360 | #: connected.c:80 |
c04f5ac3 JX |
361 | #, c-format |
362 | msgid "failed write to rev-list: %s" | |
363 | msgstr "无法写入 rev-list:%s" | |
364 | ||
2e8451e8 | 365 | #: connected.c:88 |
c04f5ac3 JX |
366 | #, c-format |
367 | msgid "failed to close rev-list's stdin: %s" | |
368 | msgstr "无法关闭 rev-list 的标准输入:%s" | |
369 | ||
8ada9598 JX |
370 | #: date.c:95 |
371 | msgid "in the future" | |
81809b99 | 372 | msgstr "在将来" |
8ada9598 JX |
373 | |
374 | #: date.c:101 | |
375 | #, c-format | |
376 | msgid "%lu second ago" | |
377 | msgid_plural "%lu seconds ago" | |
81809b99 | 378 | msgstr[0] "%lu 秒钟之前" |
5ae481e0 | 379 | msgstr[1] "%lu 秒钟之前" |
8ada9598 JX |
380 | |
381 | #: date.c:108 | |
382 | #, c-format | |
383 | msgid "%lu minute ago" | |
384 | msgid_plural "%lu minutes ago" | |
81809b99 | 385 | msgstr[0] "%lu 分钟之前" |
5ae481e0 | 386 | msgstr[1] "%lu 分钟之前" |
8ada9598 JX |
387 | |
388 | #: date.c:115 | |
389 | #, c-format | |
390 | msgid "%lu hour ago" | |
391 | msgid_plural "%lu hours ago" | |
81809b99 | 392 | msgstr[0] "%lu 小时之前" |
5ae481e0 | 393 | msgstr[1] "%lu 小时之前" |
8ada9598 JX |
394 | |
395 | #: date.c:122 | |
396 | #, c-format | |
397 | msgid "%lu day ago" | |
398 | msgid_plural "%lu days ago" | |
81809b99 | 399 | msgstr[0] "%lu 天之前" |
5ae481e0 | 400 | msgstr[1] "%lu 天之前" |
8ada9598 JX |
401 | |
402 | #: date.c:128 | |
403 | #, c-format | |
404 | msgid "%lu week ago" | |
405 | msgid_plural "%lu weeks ago" | |
81809b99 | 406 | msgstr[0] "%lu 周之前" |
5ae481e0 | 407 | msgstr[1] "%lu 周之前" |
8ada9598 JX |
408 | |
409 | #: date.c:135 | |
410 | #, c-format | |
411 | msgid "%lu month ago" | |
412 | msgid_plural "%lu months ago" | |
81809b99 | 413 | msgstr[0] "%lu 个月之前" |
5ae481e0 | 414 | msgstr[1] "%lu 个月之前" |
8ada9598 JX |
415 | |
416 | #: date.c:146 | |
417 | #, c-format | |
418 | msgid "%lu year" | |
419 | msgid_plural "%lu years" | |
81809b99 | 420 | msgstr[0] "%lu 年" |
5ae481e0 | 421 | msgstr[1] "%lu 年" |
8ada9598 JX |
422 | |
423 | #: date.c:149 | |
424 | #, c-format | |
425 | msgid "%s, %lu month ago" | |
426 | msgid_plural "%s, %lu months ago" | |
81809b99 | 427 | msgstr[0] "%s,%lu 个月之前" |
5ae481e0 | 428 | msgstr[1] "%s,%lu 个月之前" |
8ada9598 JX |
429 | |
430 | #: date.c:154 date.c:159 | |
431 | #, c-format | |
432 | msgid "%lu year ago" | |
433 | msgid_plural "%lu years ago" | |
81809b99 | 434 | msgstr[0] "%lu 年前" |
5ae481e0 | 435 | msgstr[1] "%lu 年前" |
8ada9598 | 436 | |
90e6ef53 | 437 | # 译者:注意保持前导空格 |
63af42fe | 438 | #: diff.c:112 |
c04f5ac3 | 439 | #, c-format |
07432cef WS |
440 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" |
441 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
c04f5ac3 | 442 | |
90e6ef53 | 443 | # 译者:注意保持前导空格 |
63af42fe | 444 | #: diff.c:117 |
c04f5ac3 | 445 | #, c-format |
07432cef WS |
446 | msgid " Unknown dirstat parameter '%s'\n" |
447 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
c04f5ac3 | 448 | |
63af42fe | 449 | #: diff.c:210 |
07432cef WS |
450 | #, c-format |
451 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" | |
452 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
453 | ||
63af42fe | 454 | #: diff.c:260 |
c04f5ac3 JX |
455 | #, c-format |
456 | msgid "" | |
457 | "Found errors in 'diff.dirstat' config variable:\n" | |
458 | "%s" | |
459 | msgstr "" | |
90e6ef53 | 460 | "发现配置变量 'diff.dirstat' 中的错误:\n" |
c04f5ac3 JX |
461 | "%s" |
462 | ||
90314792 | 463 | #: diff.c:3490 |
c04f5ac3 JX |
464 | #, c-format |
465 | msgid "" | |
466 | "Failed to parse --dirstat/-X option parameter:\n" | |
467 | "%s" | |
468 | msgstr "" | |
469 | "无法解析 --dirstat/-X 选项的参数:\n" | |
470 | "%s" | |
471 | ||
90314792 | 472 | #: diff.c:3504 |
07432cef WS |
473 | #, c-format |
474 | msgid "Failed to parse --submodule option parameter: '%s'" | |
475 | msgstr "无法解析 --submodule 选项的参数:'%s'" | |
476 | ||
1003b3a5 | 477 | #: gpg-interface.c:59 gpg-interface.c:131 |
c04f5ac3 JX |
478 | msgid "could not run gpg." |
479 | msgstr "不能执行 gpg。" | |
480 | ||
481 | #: gpg-interface.c:71 | |
482 | msgid "gpg did not accept the data" | |
483 | msgstr "gpg 没有接受数据" | |
484 | ||
485 | #: gpg-interface.c:82 | |
486 | msgid "gpg failed to sign the data" | |
487 | msgstr "gpg 无法为数据签名" | |
488 | ||
1003b3a5 | 489 | #: gpg-interface.c:115 |
a77c07d9 JX |
490 | #, c-format |
491 | msgid "could not create temporary file '%s': %s" | |
492 | msgstr "不能创建临时文件 '%s':%s" | |
493 | ||
1003b3a5 | 494 | #: gpg-interface.c:118 |
a77c07d9 JX |
495 | #, c-format |
496 | msgid "failed writing detached signature to '%s': %s" | |
497 | msgstr "无法将分离式签名写入 '%s':%s" | |
498 | ||
90314792 | 499 | #: grep.c:1695 |
7ac1c0ad JX |
500 | #, c-format |
501 | msgid "'%s': unable to read %s" | |
502 | msgstr "'%s':无法读取 %s" | |
503 | ||
90314792 | 504 | #: grep.c:1712 |
7ac1c0ad JX |
505 | #, c-format |
506 | msgid "'%s': %s" | |
507 | msgstr "'%s':%s" | |
508 | ||
90314792 | 509 | #: grep.c:1723 |
7ac1c0ad JX |
510 | #, c-format |
511 | msgid "'%s': short read %s" | |
512 | msgstr "'%s':读取不完整 %s" | |
513 | ||
b1894384 | 514 | #: help.c:210 |
81809b99 | 515 | #, c-format |
8ada9598 | 516 | msgid "available git commands in '%s'" |
81809b99 | 517 | msgstr "在 '%s' 下可用的 git 命令" |
8ada9598 | 518 | |
b1894384 | 519 | #: help.c:217 |
8ada9598 | 520 | msgid "git commands available from elsewhere on your $PATH" |
81809b99 | 521 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" |
8ada9598 | 522 | |
b1894384 | 523 | #: help.c:233 |
a77c07d9 JX |
524 | msgid "The most commonly used git commands are:" |
525 | msgstr "最常用的 git 命令有:" | |
526 | ||
b1894384 | 527 | #: help.c:290 |
c04f5ac3 JX |
528 | #, c-format |
529 | msgid "" | |
530 | "'%s' appears to be a git command, but we were not\n" | |
531 | "able to execute it. Maybe git-%s is broken?" | |
532 | msgstr "" | |
533 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
534 | "可能是 git-%s 受损?" | |
535 | ||
b1894384 | 536 | #: help.c:347 |
8ada9598 | 537 | msgid "Uh oh. Your system reports no Git commands at all." |
81809b99 | 538 | msgstr "唉呀,您的系统中未发现 Git 命令。" |
8ada9598 | 539 | |
b1894384 | 540 | #: help.c:369 |
8ada9598 JX |
541 | #, c-format |
542 | msgid "" | |
543 | "WARNING: You called a Git command named '%s', which does not exist.\n" | |
544 | "Continuing under the assumption that you meant '%s'" | |
545 | msgstr "" | |
81809b99 JX |
546 | "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" |
547 | "是 '%s'" | |
8ada9598 | 548 | |
b1894384 | 549 | #: help.c:374 |
8ada9598 JX |
550 | #, c-format |
551 | msgid "in %0.1f seconds automatically..." | |
81809b99 | 552 | msgstr "在 %0.1f 秒钟后自动运行..." |
8ada9598 | 553 | |
b1894384 | 554 | #: help.c:381 |
8ada9598 JX |
555 | #, c-format |
556 | msgid "git: '%s' is not a git command. See 'git --help'." | |
81809b99 | 557 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" |
8ada9598 | 558 | |
b1894384 | 559 | #: help.c:385 help.c:444 |
8ada9598 JX |
560 | msgid "" |
561 | "\n" | |
562 | "Did you mean this?" | |
563 | msgid_plural "" | |
564 | "\n" | |
565 | "Did you mean one of these?" | |
566 | msgstr[0] "" | |
81809b99 JX |
567 | "\n" |
568 | "您指的是这个么?" | |
569 | msgstr[1] "" | |
570 | "\n" | |
195febda | 571 | "您指的是这其中的某一个么?" |
8ada9598 | 572 | |
b1894384 | 573 | #: help.c:440 |
2e8451e8 JX |
574 | #, c-format |
575 | msgid "%s: %s - %s" | |
576 | msgstr "%s:%s - %s" | |
577 | ||
07432cef WS |
578 | #: merge.c:56 |
579 | msgid "failed to read the cache" | |
580 | msgstr "无法读取缓存" | |
581 | ||
90314792 JX |
582 | #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 |
583 | #: builtin/clone.c:655 | |
07432cef WS |
584 | msgid "unable to write new index file" |
585 | msgstr "无法写新的索引文件" | |
586 | ||
649900bc JX |
587 | #: merge-recursive.c:190 |
588 | #, c-format | |
589 | msgid "(bad commit)\n" | |
590 | msgstr "(坏提交)\n" | |
591 | ||
592 | #: merge-recursive.c:206 | |
593 | #, c-format | |
594 | msgid "addinfo_cache failed for path '%s'" | |
595 | msgstr "为路径 '%s' addinfo_cache 失败" | |
596 | ||
2e8451e8 | 597 | #: merge-recursive.c:269 |
649900bc JX |
598 | msgid "error building trees" |
599 | msgstr "无法创建树" | |
600 | ||
2e8451e8 | 601 | #: merge-recursive.c:673 |
649900bc JX |
602 | #, c-format |
603 | msgid "failed to create path '%s'%s" | |
604 | msgstr "无法创建路径 '%s'%s" | |
605 | ||
2e8451e8 | 606 | #: merge-recursive.c:684 |
649900bc JX |
607 | #, c-format |
608 | msgid "Removing %s to make room for subdirectory\n" | |
609 | msgstr "删除 %s 以便为子目录留出空间\n" | |
610 | ||
611 | #. something else exists | |
612 | #. .. but not some other error (who really cares what?) | |
2e8451e8 | 613 | #: merge-recursive.c:698 merge-recursive.c:719 |
649900bc JX |
614 | msgid ": perhaps a D/F conflict?" |
615 | msgstr ":可能是一个目录/文件冲突?" | |
616 | ||
2e8451e8 | 617 | #: merge-recursive.c:709 |
649900bc JX |
618 | #, c-format |
619 | msgid "refusing to lose untracked file at '%s'" | |
620 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
621 | ||
2e8451e8 | 622 | #: merge-recursive.c:749 |
649900bc JX |
623 | #, c-format |
624 | msgid "cannot read object %s '%s'" | |
625 | msgstr "不能读取对象 %s '%s'" | |
626 | ||
2e8451e8 | 627 | #: merge-recursive.c:751 |
649900bc JX |
628 | #, c-format |
629 | msgid "blob expected for %s '%s'" | |
07432cef | 630 | msgstr "%s '%s' 应为数据(blob)对象" |
649900bc | 631 | |
90314792 | 632 | #: merge-recursive.c:774 builtin/clone.c:311 |
649900bc JX |
633 | #, c-format |
634 | msgid "failed to open '%s'" | |
635 | msgstr "无法打开 '%s'" | |
636 | ||
2e8451e8 | 637 | #: merge-recursive.c:782 |
649900bc JX |
638 | #, c-format |
639 | msgid "failed to symlink '%s'" | |
640 | msgstr "无法创建符号链接 '%s'" | |
641 | ||
2e8451e8 | 642 | #: merge-recursive.c:785 |
649900bc JX |
643 | #, c-format |
644 | msgid "do not know what to do with %06o %s '%s'" | |
645 | msgstr "不知道如何处理 %06o %s '%s'" | |
646 | ||
2e8451e8 | 647 | #: merge-recursive.c:923 |
649900bc JX |
648 | msgid "Failed to execute internal merge" |
649 | msgstr "无法执行内部合并" | |
650 | ||
2e8451e8 | 651 | #: merge-recursive.c:927 |
649900bc JX |
652 | #, c-format |
653 | msgid "Unable to add %s to database" | |
654 | msgstr "不能添加 %s 至对象库" | |
655 | ||
2e8451e8 | 656 | #: merge-recursive.c:943 |
649900bc JX |
657 | msgid "unsupported object type in the tree" |
658 | msgstr "在树中有不支持的对象类型" | |
659 | ||
2e8451e8 | 660 | #: merge-recursive.c:1022 merge-recursive.c:1036 |
649900bc JX |
661 | #, c-format |
662 | msgid "" | |
663 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
664 | "in tree." | |
665 | msgstr "" | |
666 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
667 | "的版本被保留。" | |
668 | ||
2e8451e8 | 669 | #: merge-recursive.c:1028 merge-recursive.c:1041 |
649900bc JX |
670 | #, c-format |
671 | msgid "" | |
672 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
673 | "in tree at %s." | |
674 | msgstr "" | |
675 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" | |
676 | "的版本保留于 %8$s 中。" | |
677 | ||
2e8451e8 | 678 | #: merge-recursive.c:1082 |
649900bc JX |
679 | msgid "rename" |
680 | msgstr "重命名" | |
681 | ||
2e8451e8 | 682 | #: merge-recursive.c:1082 |
649900bc JX |
683 | msgid "renamed" |
684 | msgstr "重命名" | |
685 | ||
2e8451e8 | 686 | #: merge-recursive.c:1138 |
649900bc JX |
687 | #, c-format |
688 | msgid "%s is a directory in %s adding as %s instead" | |
689 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
690 | ||
2e8451e8 | 691 | #: merge-recursive.c:1160 |
649900bc JX |
692 | #, c-format |
693 | msgid "" | |
694 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" | |
695 | "\"->\"%s\" in \"%s\"%s" | |
696 | msgstr "" | |
697 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " | |
698 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
699 | ||
2e8451e8 | 700 | #: merge-recursive.c:1165 |
649900bc JX |
701 | msgid " (left unresolved)" |
702 | msgstr "(留下未解决)" | |
703 | ||
2e8451e8 | 704 | #: merge-recursive.c:1219 |
649900bc JX |
705 | #, c-format |
706 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" | |
707 | msgstr "" | |
708 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" | |
709 | "%5$s" | |
710 | ||
2e8451e8 | 711 | #: merge-recursive.c:1249 |
649900bc JX |
712 | #, c-format |
713 | msgid "Renaming %s to %s and %s to %s instead" | |
07432cef | 714 | msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" |
649900bc | 715 | |
2e8451e8 | 716 | #: merge-recursive.c:1448 |
649900bc JX |
717 | #, c-format |
718 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" | |
719 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
720 | ||
2e8451e8 | 721 | #: merge-recursive.c:1458 |
649900bc JX |
722 | #, c-format |
723 | msgid "Adding merged %s" | |
724 | msgstr "添加合并后的 %s" | |
725 | ||
2e8451e8 | 726 | #: merge-recursive.c:1463 merge-recursive.c:1661 |
649900bc JX |
727 | #, c-format |
728 | msgid "Adding as %s instead" | |
729 | msgstr "而是以 %s 为名添加" | |
730 | ||
2e8451e8 | 731 | #: merge-recursive.c:1514 |
649900bc JX |
732 | #, c-format |
733 | msgid "cannot read object %s" | |
734 | msgstr "不能读取对象 %s" | |
735 | ||
2e8451e8 | 736 | #: merge-recursive.c:1517 |
649900bc JX |
737 | #, c-format |
738 | msgid "object %s is not a blob" | |
07432cef | 739 | msgstr "对象 %s 不是一个数据(blob)对象" |
649900bc | 740 | |
2e8451e8 | 741 | #: merge-recursive.c:1565 |
649900bc JX |
742 | msgid "modify" |
743 | msgstr "修改" | |
744 | ||
2e8451e8 | 745 | #: merge-recursive.c:1565 |
649900bc JX |
746 | msgid "modified" |
747 | msgstr "修改" | |
748 | ||
2e8451e8 | 749 | #: merge-recursive.c:1575 |
649900bc JX |
750 | msgid "content" |
751 | msgstr "内容" | |
752 | ||
2e8451e8 | 753 | #: merge-recursive.c:1582 |
649900bc JX |
754 | msgid "add/add" |
755 | msgstr "添加/添加" | |
756 | ||
2e8451e8 | 757 | #: merge-recursive.c:1616 |
649900bc JX |
758 | #, c-format |
759 | msgid "Skipped %s (merged same as existing)" | |
760 | msgstr "略过 %s(已经做过相同合并)" | |
761 | ||
2e8451e8 | 762 | #: merge-recursive.c:1630 |
649900bc JX |
763 | #, c-format |
764 | msgid "Auto-merging %s" | |
765 | msgstr "自动合并 %s" | |
766 | ||
90314792 | 767 | #: merge-recursive.c:1634 git-submodule.sh:1125 |
649900bc JX |
768 | msgid "submodule" |
769 | msgstr "子模组" | |
770 | ||
2e8451e8 | 771 | #: merge-recursive.c:1635 |
649900bc JX |
772 | #, c-format |
773 | msgid "CONFLICT (%s): Merge conflict in %s" | |
774 | msgstr "冲突(%s):合并冲突于 %s" | |
775 | ||
2e8451e8 | 776 | #: merge-recursive.c:1725 |
649900bc JX |
777 | #, c-format |
778 | msgid "Removing %s" | |
779 | msgstr "删除 %s" | |
780 | ||
2e8451e8 | 781 | #: merge-recursive.c:1750 |
649900bc JX |
782 | msgid "file/directory" |
783 | msgstr "文件/目录" | |
784 | ||
2e8451e8 | 785 | #: merge-recursive.c:1756 |
649900bc JX |
786 | msgid "directory/file" |
787 | msgstr "目录/文件" | |
788 | ||
2e8451e8 | 789 | #: merge-recursive.c:1761 |
649900bc JX |
790 | #, c-format |
791 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" | |
792 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
793 | ||
2e8451e8 | 794 | #: merge-recursive.c:1771 |
649900bc JX |
795 | #, c-format |
796 | msgid "Adding %s" | |
797 | msgstr "添加 %s" | |
798 | ||
2e8451e8 | 799 | #: merge-recursive.c:1788 |
649900bc JX |
800 | msgid "Fatal merge failure, shouldn't happen." |
801 | msgstr "严重的合并错误,不应发生。" | |
802 | ||
2e8451e8 | 803 | #: merge-recursive.c:1807 |
649900bc JX |
804 | msgid "Already up-to-date!" |
805 | msgstr "已经是最新的!" | |
806 | ||
2e8451e8 | 807 | #: merge-recursive.c:1816 |
649900bc JX |
808 | #, c-format |
809 | msgid "merging of trees %s and %s failed" | |
810 | msgstr "无法合并树 %s 和 %s" | |
811 | ||
2e8451e8 | 812 | #: merge-recursive.c:1846 |
649900bc JX |
813 | #, c-format |
814 | msgid "Unprocessed path??? %s" | |
815 | msgstr "未处理的路径??? %s" | |
816 | ||
2e8451e8 | 817 | #: merge-recursive.c:1891 |
649900bc JX |
818 | msgid "Merging:" |
819 | msgstr "合并:" | |
820 | ||
2e8451e8 | 821 | #: merge-recursive.c:1904 |
649900bc | 822 | #, c-format |
e5e38ce4 JX |
823 | msgid "found %u common ancestor:" |
824 | msgid_plural "found %u common ancestors:" | |
825 | msgstr[0] "发现 %u 个共同祖先:" | |
826 | msgstr[1] "发现 %u 个共同祖先:" | |
649900bc | 827 | |
2e8451e8 | 828 | #: merge-recursive.c:1941 |
649900bc JX |
829 | msgid "merge returned no commit" |
830 | msgstr "合并未返回提交" | |
831 | ||
2e8451e8 | 832 | #: merge-recursive.c:1998 |
649900bc JX |
833 | #, c-format |
834 | msgid "Could not parse object '%s'" | |
835 | msgstr "不能解析对象 '%s'" | |
836 | ||
2e8451e8 | 837 | #: merge-recursive.c:2010 builtin/merge.c:672 |
649900bc JX |
838 | msgid "Unable to write index." |
839 | msgstr "不能写入索引。" | |
840 | ||
2e8451e8 JX |
841 | #: notes-utils.c:40 |
842 | msgid "Cannot commit uninitialized/unreferenced notes tree" | |
843 | msgstr "不能提交未初始化/未引用的注解树" | |
844 | ||
845 | #: notes-utils.c:81 | |
846 | #, c-format | |
847 | msgid "Bad notes.rewriteMode value: '%s'" | |
848 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
849 | ||
850 | #: notes-utils.c:91 | |
851 | #, c-format | |
852 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" | |
853 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
854 | ||
855 | #. TRANSLATORS: The first %s is the name of the | |
856 | #. environment variable, the second %s is its value | |
857 | #: notes-utils.c:118 | |
858 | #, c-format | |
859 | msgid "Bad %s value: '%s'" | |
860 | msgstr "坏的 %s 值:'%s'" | |
861 | ||
90314792 | 862 | #: object.c:202 |
1003b3a5 JX |
863 | #, c-format |
864 | msgid "unable to parse object: %s" | |
865 | msgstr "不能解析对象:%s" | |
866 | ||
90314792 | 867 | #: parse-options.c:537 |
8ada9598 | 868 | msgid "..." |
81809b99 | 869 | msgstr "..." |
8ada9598 | 870 | |
90314792 | 871 | #: parse-options.c:555 |
81809b99 | 872 | #, c-format |
8ada9598 | 873 | msgid "usage: %s" |
81809b99 | 874 | msgstr "用法:%s" |
8ada9598 JX |
875 | |
876 | #. TRANSLATORS: the colon here should align with the | |
877 | #. one in "usage: %s" translation | |
90314792 | 878 | #: parse-options.c:559 |
81809b99 | 879 | #, c-format |
8ada9598 | 880 | msgid " or: %s" |
81809b99 | 881 | msgstr " 或:%s" |
8ada9598 JX |
882 | |
883 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
90314792 | 884 | #: parse-options.c:562 |
81809b99 | 885 | #, c-format |
8ada9598 | 886 | msgid " %s" |
81809b99 | 887 | msgstr " %s" |
8ada9598 | 888 | |
90314792 | 889 | #: parse-options.c:596 |
63af42fe JX |
890 | msgid "-NUM" |
891 | msgstr "-数字" | |
892 | ||
90314792 JX |
893 | #: pathspec.c:118 |
894 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" | |
895 | msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容" | |
896 | ||
897 | #: pathspec.c:128 | |
898 | msgid "" | |
899 | "global 'literal' pathspec setting is incompatible with all other global " | |
900 | "pathspec settings" | |
901 | msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容" | |
902 | ||
903 | #: pathspec.c:158 | |
904 | msgid "invalid parameter for pathspec magic 'prefix'" | |
905 | msgstr "路径规则包含无效的神奇前缀" | |
906 | ||
907 | #: pathspec.c:164 | |
908 | #, c-format | |
909 | msgid "Invalid pathspec magic '%.*s' in '%s'" | |
910 | msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
911 | ||
912 | #: pathspec.c:168 | |
913 | #, c-format | |
914 | msgid "Missing ')' at the end of pathspec magic in '%s'" | |
915 | msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'" | |
916 | ||
917 | #: pathspec.c:186 | |
918 | #, c-format | |
919 | msgid "Unimplemented pathspec magic '%c' in '%s'" | |
920 | msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
921 | ||
922 | #: pathspec.c:211 | |
a77c07d9 | 923 | #, c-format |
90314792 JX |
924 | msgid "%s: 'literal' and 'glob' are incompatible" |
925 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a77c07d9 | 926 | |
90314792 | 927 | #: pathspec.c:222 |
a77c07d9 | 928 | #, c-format |
90314792 JX |
929 | msgid "%s: '%s' is outside repository" |
930 | msgstr "%s:'%s' 在版本库之外" | |
a77c07d9 | 931 | |
90314792 JX |
932 | #: pathspec.c:278 |
933 | #, c-format | |
934 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
935 | msgstr "路径规则 '%s' 在子模组 '%.*s' 中" | |
936 | ||
937 | #. | |
938 | #. * We may want to substitute "this command" with a command | |
939 | #. * name. E.g. when add--interactive dies when running | |
940 | #. * "checkout -p" | |
941 | #. | |
942 | #: pathspec.c:340 | |
943 | #, c-format | |
944 | msgid "%s: pathspec magic not supported by this command: %s" | |
945 | msgstr "%s:路径规则神奇前缀不被此命令支持:%s" | |
946 | ||
947 | #: pathspec.c:415 | |
948 | #, c-format | |
949 | msgid "pathspec '%s' is beyond a symbolic link" | |
950 | msgstr "路径规则 '%s' 位于符号链接中" | |
951 | ||
952 | #: remote.c:1833 | |
953 | #, c-format | |
954 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
955 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
956 | ||
957 | #: remote.c:1837 | |
958 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" | |
959 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
960 | ||
961 | #: remote.c:1840 | |
962 | #, c-format | |
963 | msgid "Your branch is up-to-date with '%s'.\n" | |
964 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
965 | ||
966 | #: remote.c:1844 | |
c04f5ac3 JX |
967 | #, c-format |
968 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
969 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
970 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
5ae481e0 | 971 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" |
c04f5ac3 | 972 | |
90314792 | 973 | #: remote.c:1850 |
07432cef WS |
974 | msgid " (use \"git push\" to publish your local commits)\n" |
975 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
976 | ||
90314792 | 977 | #: remote.c:1853 |
c04f5ac3 JX |
978 | #, c-format |
979 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
980 | msgid_plural "" | |
981 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
90e6ef53 | 982 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
5ae481e0 | 983 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" |
c04f5ac3 | 984 | |
07432cef | 985 | # 译者:注意保持前导空格 |
90314792 | 986 | #: remote.c:1861 |
07432cef WS |
987 | msgid " (use \"git pull\" to update your local branch)\n" |
988 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
989 | ||
90314792 | 990 | #: remote.c:1864 |
c04f5ac3 JX |
991 | #, c-format |
992 | msgid "" | |
993 | "Your branch and '%s' have diverged,\n" | |
994 | "and have %d and %d different commit each, respectively.\n" | |
995 | msgid_plural "" | |
996 | "Your branch and '%s' have diverged,\n" | |
997 | "and have %d and %d different commits each, respectively.\n" | |
998 | msgstr[0] "" | |
999 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1000 | "并且分别有 %d 和 %d 处不同的提交。\n" |
5ae481e0 JX |
1001 | msgstr[1] "" |
1002 | "您的分支和 '%s' 出现了偏离,\n" | |
195febda | 1003 | "并且分别有 %d 和 %d 处不同的提交。\n" |
c04f5ac3 | 1004 | |
07432cef | 1005 | # 译者:注意保持前导空格 |
90314792 | 1006 | #: remote.c:1874 |
07432cef WS |
1007 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
1008 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
1009 | ||
2e8451e8 JX |
1010 | #: run-command.c:80 |
1011 | msgid "open /dev/null failed" | |
1012 | msgstr "不能打开 /dev/null" | |
1013 | ||
1014 | #: run-command.c:82 | |
1015 | #, c-format | |
1016 | msgid "dup2(%d,%d) failed" | |
1017 | msgstr "不能调用 dup2(%d,%d)" | |
1018 | ||
1019 | #: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 | |
1020 | #: builtin/merge.c:1013 builtin/merge.c:1023 | |
c04f5ac3 JX |
1021 | #, c-format |
1022 | msgid "Could not open '%s' for writing" | |
90e6ef53 | 1023 | msgstr "不能为写入打开 '%s'" |
c04f5ac3 | 1024 | |
2e8451e8 JX |
1025 | #: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 |
1026 | #: builtin/merge.c:1015 builtin/merge.c:1028 | |
c04f5ac3 JX |
1027 | #, c-format |
1028 | msgid "Could not write to '%s'" | |
90e6ef53 | 1029 | msgstr "不能写入 '%s'" |
c04f5ac3 | 1030 | |
1003b3a5 | 1031 | #: sequencer.c:229 |
14c8bced JX |
1032 | msgid "" |
1033 | "after resolving the conflicts, mark the corrected paths\n" | |
1034 | "with 'git add <paths>' or 'git rm <paths>'" | |
1035 | msgstr "" | |
1036 | "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" | |
1037 | "命令标记修正后的文件" | |
1038 | ||
1003b3a5 | 1039 | #: sequencer.c:232 |
c04f5ac3 JX |
1040 | msgid "" |
1041 | "after resolving the conflicts, mark the corrected paths\n" | |
1042 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
1043 | "and commit the result with 'git commit'" | |
1044 | msgstr "" | |
1045 | "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n" | |
1046 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1047 | ||
90314792 | 1048 | #: sequencer.c:245 sequencer.c:870 sequencer.c:953 |
c04f5ac3 JX |
1049 | #, c-format |
1050 | msgid "Could not write to %s" | |
1051 | msgstr "不能写入 %s" | |
1052 | ||
1003b3a5 | 1053 | #: sequencer.c:248 |
c04f5ac3 JX |
1054 | #, c-format |
1055 | msgid "Error wrapping up %s" | |
1056 | msgstr "错误收尾 %s" | |
1057 | ||
1003b3a5 | 1058 | #: sequencer.c:263 |
c04f5ac3 JX |
1059 | msgid "Your local changes would be overwritten by cherry-pick." |
1060 | msgstr "您的本地修改将被拣选操作覆盖。" | |
1061 | ||
1003b3a5 | 1062 | #: sequencer.c:265 |
c04f5ac3 JX |
1063 | msgid "Your local changes would be overwritten by revert." |
1064 | msgstr "您的本地修改将被还原操作覆盖。" | |
1065 | ||
1003b3a5 | 1066 | #: sequencer.c:268 |
c04f5ac3 JX |
1067 | msgid "Commit your changes or stash them to proceed." |
1068 | msgstr "提交您的修改或保存进度后再继续。" | |
1069 | ||
1070 | #. TRANSLATORS: %s will be "revert" or "cherry-pick" | |
90314792 | 1071 | #: sequencer.c:325 |
c04f5ac3 JX |
1072 | #, c-format |
1073 | msgid "%s: Unable to write new index file" | |
90e6ef53 | 1074 | msgstr "%s:无法写入新索引文件" |
c04f5ac3 | 1075 | |
90314792 | 1076 | #: sequencer.c:356 |
8ada9598 | 1077 | msgid "Could not resolve HEAD commit\n" |
81809b99 | 1078 | msgstr "不能解析 HEAD 提交\n" |
8ada9598 | 1079 | |
90314792 | 1080 | #: sequencer.c:378 |
8ada9598 | 1081 | msgid "Unable to update cache tree\n" |
81809b99 | 1082 | msgstr "不能更新缓存\n" |
8ada9598 | 1083 | |
90314792 | 1084 | #: sequencer.c:423 |
81809b99 | 1085 | #, c-format |
8ada9598 | 1086 | msgid "Could not parse commit %s\n" |
81809b99 | 1087 | msgstr "不能解析提交 %s\n" |
8ada9598 | 1088 | |
90314792 | 1089 | #: sequencer.c:428 |
81809b99 | 1090 | #, c-format |
8ada9598 | 1091 | msgid "Could not parse parent commit %s\n" |
81809b99 | 1092 | msgstr "不能解析父提交 %s\n" |
8ada9598 | 1093 | |
90314792 | 1094 | #: sequencer.c:494 |
c04f5ac3 | 1095 | msgid "Your index file is unmerged." |
90e6ef53 | 1096 | msgstr "您的索引文件未完成合并。" |
c04f5ac3 | 1097 | |
90314792 | 1098 | #: sequencer.c:513 |
c04f5ac3 JX |
1099 | #, c-format |
1100 | msgid "Commit %s is a merge but no -m option was given." | |
1101 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
1102 | ||
90314792 | 1103 | #: sequencer.c:521 |
c04f5ac3 JX |
1104 | #, c-format |
1105 | msgid "Commit %s does not have parent %d" | |
1106 | msgstr "提交 %s 没有父提交 %d" | |
1107 | ||
90314792 | 1108 | #: sequencer.c:525 |
c04f5ac3 JX |
1109 | #, c-format |
1110 | msgid "Mainline was specified but commit %s is not a merge." | |
90e6ef53 | 1111 | msgstr "指定了主线但提交 %s 不是一个合并。" |
c04f5ac3 JX |
1112 | |
1113 | #. TRANSLATORS: The first %s will be "revert" or | |
1114 | #. "cherry-pick", the second %s a SHA1 | |
90314792 | 1115 | #: sequencer.c:538 |
c04f5ac3 JX |
1116 | #, c-format |
1117 | msgid "%s: cannot parse parent commit %s" | |
1118 | msgstr "%s:不能解析父提交 %s" | |
1119 | ||
90314792 | 1120 | #: sequencer.c:542 |
c04f5ac3 JX |
1121 | #, c-format |
1122 | msgid "Cannot get commit message for %s" | |
1123 | msgstr "不能得到 %s 的提交说明" | |
1124 | ||
90314792 | 1125 | #: sequencer.c:628 |
c04f5ac3 JX |
1126 | #, c-format |
1127 | msgid "could not revert %s... %s" | |
1128 | msgstr "不能还原 %s... %s" | |
1129 | ||
90314792 | 1130 | #: sequencer.c:629 |
c04f5ac3 JX |
1131 | #, c-format |
1132 | msgid "could not apply %s... %s" | |
1133 | msgstr "不能应用 %s... %s" | |
1134 | ||
90314792 | 1135 | #: sequencer.c:665 |
c04f5ac3 JX |
1136 | msgid "empty commit set passed" |
1137 | msgstr "提供了空的提交集" | |
1138 | ||
90314792 | 1139 | #: sequencer.c:673 |
c04f5ac3 JX |
1140 | #, c-format |
1141 | msgid "git %s: failed to read the index" | |
90e6ef53 | 1142 | msgstr "git %s:无法读取索引" |
c04f5ac3 | 1143 | |
90314792 | 1144 | #: sequencer.c:678 |
c04f5ac3 JX |
1145 | #, c-format |
1146 | msgid "git %s: failed to refresh the index" | |
90e6ef53 | 1147 | msgstr "git %s:无法刷新索引" |
c04f5ac3 | 1148 | |
90314792 | 1149 | #: sequencer.c:736 |
c04f5ac3 JX |
1150 | #, c-format |
1151 | msgid "Cannot %s during a %s" | |
90e6ef53 | 1152 | msgstr "无法 %s 在一个 %s 过程中" |
c04f5ac3 | 1153 | |
90314792 | 1154 | #: sequencer.c:758 |
c04f5ac3 JX |
1155 | #, c-format |
1156 | msgid "Could not parse line %d." | |
90e6ef53 | 1157 | msgstr "不能解析第 %d 行。" |
c04f5ac3 | 1158 | |
90314792 | 1159 | #: sequencer.c:763 |
c04f5ac3 | 1160 | msgid "No commits parsed." |
7e238ab7 | 1161 | msgstr "没有提交被解析。" |
c04f5ac3 | 1162 | |
90314792 | 1163 | #: sequencer.c:776 |
c04f5ac3 JX |
1164 | #, c-format |
1165 | msgid "Could not open %s" | |
1166 | msgstr "不能打开 %s" | |
1167 | ||
90314792 | 1168 | #: sequencer.c:780 |
c04f5ac3 JX |
1169 | #, c-format |
1170 | msgid "Could not read %s." | |
1171 | msgstr "不能读取 %s。" | |
1172 | ||
90314792 | 1173 | #: sequencer.c:787 |
c04f5ac3 JX |
1174 | #, c-format |
1175 | msgid "Unusable instruction sheet: %s" | |
1176 | msgstr "无用的指令表单:%s" | |
1177 | ||
90314792 | 1178 | #: sequencer.c:815 |
c04f5ac3 JX |
1179 | #, c-format |
1180 | msgid "Invalid key: %s" | |
1181 | msgstr "无效键名:%s" | |
1182 | ||
90314792 | 1183 | #: sequencer.c:818 |
c04f5ac3 JX |
1184 | #, c-format |
1185 | msgid "Invalid value for %s: %s" | |
81809b99 | 1186 | msgstr "%s 的值无效:%s" |
c04f5ac3 | 1187 | |
90314792 | 1188 | #: sequencer.c:830 |
c04f5ac3 JX |
1189 | #, c-format |
1190 | msgid "Malformed options sheet: %s" | |
1191 | msgstr "非法的选项表单:%s" | |
1192 | ||
90314792 | 1193 | #: sequencer.c:851 |
c04f5ac3 JX |
1194 | msgid "a cherry-pick or revert is already in progress" |
1195 | msgstr "一个拣选或还原操作已在进行" | |
1196 | ||
90314792 | 1197 | #: sequencer.c:852 |
c04f5ac3 JX |
1198 | msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" |
1199 | msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" | |
1200 | ||
90314792 | 1201 | #: sequencer.c:856 |
c04f5ac3 JX |
1202 | #, c-format |
1203 | msgid "Could not create sequencer directory %s" | |
90e6ef53 | 1204 | msgstr "不能创建序列目录 %s" |
c04f5ac3 | 1205 | |
90314792 | 1206 | #: sequencer.c:872 sequencer.c:957 |
c04f5ac3 JX |
1207 | #, c-format |
1208 | msgid "Error wrapping up %s." | |
1209 | msgstr "错误收尾 %s。" | |
1210 | ||
90314792 | 1211 | #: sequencer.c:891 sequencer.c:1025 |
c04f5ac3 | 1212 | msgid "no cherry-pick or revert in progress" |
195febda | 1213 | msgstr "拣选或还原操作并未进行" |
c04f5ac3 | 1214 | |
90314792 | 1215 | #: sequencer.c:893 |
c04f5ac3 JX |
1216 | msgid "cannot resolve HEAD" |
1217 | msgstr "不能解析 HEAD" | |
1218 | ||
90314792 | 1219 | #: sequencer.c:895 |
c04f5ac3 | 1220 | msgid "cannot abort from a branch yet to be born" |
90e6ef53 | 1221 | msgstr "不能从尚未建立的分支终止" |
c04f5ac3 | 1222 | |
90314792 | 1223 | #: sequencer.c:917 builtin/apply.c:4061 |
c04f5ac3 JX |
1224 | #, c-format |
1225 | msgid "cannot open %s: %s" | |
1226 | msgstr "不能打开 %s:%s" | |
1227 | ||
90314792 | 1228 | #: sequencer.c:920 |
c04f5ac3 JX |
1229 | #, c-format |
1230 | msgid "cannot read %s: %s" | |
1231 | msgstr "不能读取 %s:%s" | |
1232 | ||
90314792 | 1233 | #: sequencer.c:921 |
c04f5ac3 | 1234 | msgid "unexpected end of file" |
9aafc933 | 1235 | msgstr "意外的文件结束" |
c04f5ac3 | 1236 | |
90314792 | 1237 | #: sequencer.c:927 |
c04f5ac3 JX |
1238 | #, c-format |
1239 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
90e6ef53 | 1240 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" |
c04f5ac3 | 1241 | |
90314792 | 1242 | #: sequencer.c:950 |
c04f5ac3 JX |
1243 | #, c-format |
1244 | msgid "Could not format %s." | |
1245 | msgstr "不能格式化 %s。" | |
1246 | ||
90314792 | 1247 | #: sequencer.c:1093 |
4dcdc3d8 JX |
1248 | #, c-format |
1249 | msgid "%s: can't cherry-pick a %s" | |
1250 | msgstr "%s:不能拣选一个%s" | |
1251 | ||
90314792 | 1252 | #: sequencer.c:1096 |
4dcdc3d8 JX |
1253 | #, c-format |
1254 | msgid "%s: bad revision" | |
1255 | msgstr "%s:错误的版本" | |
1256 | ||
90314792 | 1257 | #: sequencer.c:1130 |
c04f5ac3 JX |
1258 | msgid "Can't revert as initial commit" |
1259 | msgstr "不能作为初始提交还原" | |
1260 | ||
90314792 | 1261 | #: sequencer.c:1131 |
c04f5ac3 JX |
1262 | msgid "Can't cherry-pick into empty head" |
1263 | msgstr "不能拣选到空分支" | |
1264 | ||
2e8451e8 JX |
1265 | #: sha1_name.c:440 |
1266 | msgid "" | |
1267 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
1268 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
1269 | "may be created by mistake. For example,\n" | |
1270 | "\n" | |
1271 | " git checkout -b $br $(git rev-parse ...)\n" | |
1272 | "\n" | |
1273 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
1274 | "examine these refs and maybe delete them. Turn this message off by\n" | |
b1894384 | 1275 | "running \"git config advice.objectNameWarning false\"" |
2e8451e8 JX |
1276 | msgstr "" |
1277 | "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n" | |
1278 | "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n" | |
1279 | "\n" | |
1280 | " git checkout -b $br $(git rev-parse ...)\n" | |
1281 | "\n" | |
1282 | "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n" | |
b1894384 | 1283 | "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n" |
2e8451e8 JX |
1284 | "命令关闭本消息通知。" |
1285 | ||
90314792 | 1286 | #: sha1_name.c:1112 |
170e9899 JX |
1287 | msgid "HEAD does not point to a branch" |
1288 | msgstr "HEAD 没有指向一个分支" | |
1289 | ||
90314792 | 1290 | #: sha1_name.c:1115 |
170e9899 JX |
1291 | #, c-format |
1292 | msgid "No such branch: '%s'" | |
1293 | msgstr "没有此分支:'%s'" | |
1294 | ||
90314792 | 1295 | #: sha1_name.c:1117 |
170e9899 JX |
1296 | #, c-format |
1297 | msgid "No upstream configured for branch '%s'" | |
1298 | msgstr "尚未给分支 '%s' 设置上游" | |
1299 | ||
90314792 | 1300 | #: sha1_name.c:1121 |
170e9899 JX |
1301 | #, c-format |
1302 | msgid "Upstream branch '%s' not stored as a remote-tracking branch" | |
1303 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
1304 | ||
90314792 JX |
1305 | #: submodule.c:64 submodule.c:98 |
1306 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" | |
1307 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
1308 | ||
1309 | #: submodule.c:68 submodule.c:102 | |
1310 | #, c-format | |
1311 | msgid "Could not find section in .gitmodules where path=%s" | |
1312 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
1313 | ||
1314 | #. Maybe the user already did that, don't error out here | |
1315 | #: submodule.c:76 | |
1316 | #, c-format | |
1317 | msgid "Could not update .gitmodules entry %s" | |
1318 | msgstr "不能更新 .gitmodules 条目 %s" | |
1319 | ||
1320 | #. Maybe the user already did that, don't error out here | |
1321 | #: submodule.c:109 | |
1322 | #, c-format | |
1323 | msgid "Could not remove .gitmodules entry for %s" | |
1324 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
1325 | ||
1326 | #: submodule.c:127 | |
1327 | msgid "could not find .gitmodules in index" | |
1328 | msgstr "无法在索引中找到 .gitmodules" | |
1329 | ||
1330 | #: submodule.c:133 | |
1331 | msgid "reading updated .gitmodules failed" | |
1332 | msgstr "读取更新后的 .gitmodules 失败" | |
1333 | ||
1334 | #: submodule.c:135 | |
1335 | msgid "unable to stat updated .gitmodules" | |
1336 | msgstr "不能枚举更新后的 .gitmodules" | |
1337 | ||
1338 | #: submodule.c:139 | |
1339 | msgid "unable to remove .gitmodules from index" | |
1340 | msgstr "不能从索引中移除 .gitmodules" | |
1341 | ||
1342 | #: submodule.c:141 | |
1343 | msgid "adding updated .gitmodules failed" | |
1344 | msgstr "添加更新后的 .gitmodules 失败" | |
1345 | ||
1346 | #: submodule.c:143 | |
1347 | msgid "staging updated .gitmodules failed" | |
1348 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
1349 | ||
1350 | #: submodule.c:1144 builtin/init-db.c:363 | |
1351 | #, c-format | |
1352 | msgid "Could not create git link %s" | |
1353 | msgstr "不能创建 git link %s" | |
1354 | ||
1355 | #: submodule.c:1155 | |
1356 | #, c-format | |
1357 | msgid "Could not set core.worktree in %s" | |
1358 | msgstr "不能在 %s 中设置 core.worktree" | |
1359 | ||
1360 | #: urlmatch.c:120 | |
1361 | msgid "invalid URL scheme name or missing '://' suffix" | |
1362 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
1363 | ||
1364 | #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 | |
1365 | #, c-format | |
1366 | msgid "invalid %XX escape sequence" | |
1367 | msgstr "无效的 %XX 转义序列" | |
1368 | ||
1369 | #: urlmatch.c:172 | |
1370 | msgid "missing host and scheme is not 'file:'" | |
1371 | msgstr "缺失主机名且URL方案不是 'file:'" | |
1372 | ||
1373 | #: urlmatch.c:189 | |
1374 | msgid "a 'file:' URL may not have a port number" | |
1375 | msgstr "一个 'file:' URL 不应该包含端口号" | |
1376 | ||
1377 | #: urlmatch.c:199 | |
1378 | msgid "invalid characters in host name" | |
1379 | msgstr "主机名中包含无效的字符" | |
1380 | ||
1381 | #: urlmatch.c:244 urlmatch.c:255 | |
1382 | msgid "invalid port number" | |
1383 | msgstr "无效的端口号" | |
1384 | ||
1385 | #: urlmatch.c:322 | |
1386 | msgid "invalid '..' path segment" | |
1387 | msgstr "无效的 '..' 路径片段" | |
1388 | ||
1389 | #: wrapper.c:422 | |
07432cef | 1390 | #, c-format |
ef317cd5 | 1391 | msgid "unable to access '%s': %s" |
07432cef WS |
1392 | msgstr "不能访问 '%s':%s" |
1393 | ||
90314792 | 1394 | #: wrapper.c:443 |
07432cef WS |
1395 | #, c-format |
1396 | msgid "unable to access '%s'" | |
1397 | msgstr "不能访问 '%s'" | |
ef317cd5 | 1398 | |
90314792 | 1399 | #: wrapper.c:454 |
d691f479 JX |
1400 | #, c-format |
1401 | msgid "unable to look up current user in the passwd file: %s" | |
07432cef | 1402 | msgstr "无法在口令文件中查询到当前用户:%s" |
d691f479 | 1403 | |
90314792 | 1404 | #: wrapper.c:455 |
d691f479 JX |
1405 | msgid "no such user" |
1406 | msgstr "无此用户" | |
1407 | ||
90314792 | 1408 | #: wt-status.c:146 |
c04f5ac3 JX |
1409 | msgid "Unmerged paths:" |
1410 | msgstr "未合并的路径:" | |
1411 | ||
90e6ef53 | 1412 | # 译者:注意保持前导空格 |
90314792 | 1413 | #: wt-status.c:173 wt-status.c:200 |
c04f5ac3 JX |
1414 | #, c-format |
1415 | msgid " (use \"git reset %s <file>...\" to unstage)" | |
1416 | msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)" | |
1417 | ||
90e6ef53 | 1418 | # 译者:注意保持前导空格 |
90314792 | 1419 | #: wt-status.c:175 wt-status.c:202 |
c04f5ac3 JX |
1420 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
1421 | msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)" | |
1422 | ||
90e6ef53 | 1423 | # 译者:注意保持前导空格 |
90314792 | 1424 | #: wt-status.c:179 |
6792b93b JX |
1425 | msgid " (use \"git add <file>...\" to mark resolution)" |
1426 | msgstr " (使用 \"git add <file>...\" 标记解决方案)" | |
1427 | ||
1428 | # 译者:注意保持前导空格 | |
90314792 | 1429 | #: wt-status.c:181 wt-status.c:185 |
c04f5ac3 JX |
1430 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
1431 | msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)" | |
1432 | ||
6792b93b | 1433 | # 译者:注意保持前导空格 |
90314792 | 1434 | #: wt-status.c:183 |
6792b93b JX |
1435 | msgid " (use \"git rm <file>...\" to mark resolution)" |
1436 | msgstr " (使用 \"git rm <file>...\" 标记解决方案)" | |
1437 | ||
90314792 | 1438 | #: wt-status.c:194 |
c04f5ac3 JX |
1439 | msgid "Changes to be committed:" |
1440 | msgstr "要提交的变更:" | |
1441 | ||
90314792 | 1442 | #: wt-status.c:212 |
c04f5ac3 | 1443 | msgid "Changes not staged for commit:" |
7e238ab7 | 1444 | msgstr "尚未暂存以备提交的变更:" |
c04f5ac3 | 1445 | |
90e6ef53 | 1446 | # 译者:注意保持前导空格 |
90314792 | 1447 | #: wt-status.c:216 |
c04f5ac3 JX |
1448 | msgid " (use \"git add <file>...\" to update what will be committed)" |
1449 | msgstr " (使用 \"git add <file>...\" 更新要提交的内容)" | |
1450 | ||
90e6ef53 | 1451 | # 译者:注意保持前导空格 |
90314792 | 1452 | #: wt-status.c:218 |
c04f5ac3 JX |
1453 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
1454 | msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)" | |
1455 | ||
90e6ef53 | 1456 | # 译者:注意保持前导空格 |
90314792 | 1457 | #: wt-status.c:219 |
c04f5ac3 JX |
1458 | msgid "" |
1459 | " (use \"git checkout -- <file>...\" to discard changes in working directory)" | |
1460 | msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" | |
1461 | ||
90e6ef53 | 1462 | # 译者:注意保持前导空格 |
90314792 | 1463 | #: wt-status.c:221 |
c04f5ac3 JX |
1464 | msgid " (commit or discard the untracked or modified content in submodules)" |
1465 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
1466 | ||
90e6ef53 | 1467 | # 译者:注意保持前导空格 |
90314792 | 1468 | #: wt-status.c:233 |
c04f5ac3 JX |
1469 | #, c-format |
1470 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
90e6ef53 | 1471 | msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)" |
c04f5ac3 | 1472 | |
90314792 | 1473 | #: wt-status.c:250 |
c04f5ac3 JX |
1474 | msgid "bug" |
1475 | msgstr "bug" | |
1476 | ||
90314792 | 1477 | #: wt-status.c:255 |
c04f5ac3 JX |
1478 | msgid "both deleted:" |
1479 | msgstr "双方删除:" | |
1480 | ||
90314792 | 1481 | #: wt-status.c:256 |
c04f5ac3 JX |
1482 | msgid "added by us:" |
1483 | msgstr "由我们添加:" | |
1484 | ||
90314792 | 1485 | #: wt-status.c:257 |
c04f5ac3 JX |
1486 | msgid "deleted by them:" |
1487 | msgstr "由他们删除:" | |
1488 | ||
90314792 | 1489 | #: wt-status.c:258 |
c04f5ac3 JX |
1490 | msgid "added by them:" |
1491 | msgstr "由他们添加:" | |
1492 | ||
90314792 | 1493 | #: wt-status.c:259 |
c04f5ac3 JX |
1494 | msgid "deleted by us:" |
1495 | msgstr "由我们删除:" | |
1496 | ||
90314792 | 1497 | #: wt-status.c:260 |
c04f5ac3 JX |
1498 | msgid "both added:" |
1499 | msgstr "双方添加:" | |
1500 | ||
90314792 | 1501 | #: wt-status.c:261 |
c04f5ac3 JX |
1502 | msgid "both modified:" |
1503 | msgstr "双方修改:" | |
1504 | ||
90e6ef53 | 1505 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
90314792 | 1506 | #: wt-status.c:291 |
c04f5ac3 | 1507 | msgid "new commits, " |
aa9565f7 | 1508 | msgstr "新提交, " |
c04f5ac3 | 1509 | |
90e6ef53 | 1510 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
90314792 | 1511 | #: wt-status.c:293 |
c04f5ac3 | 1512 | msgid "modified content, " |
aa9565f7 | 1513 | msgstr "修改的内容, " |
c04f5ac3 | 1514 | |
90e6ef53 | 1515 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
90314792 | 1516 | #: wt-status.c:295 |
c04f5ac3 | 1517 | msgid "untracked content, " |
aa9565f7 | 1518 | msgstr "未跟踪的内容, " |
c04f5ac3 | 1519 | |
90e6ef53 | 1520 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1521 | #: wt-status.c:312 |
c04f5ac3 JX |
1522 | #, c-format |
1523 | msgid "new file: %s" | |
1524 | msgstr "新文件: %s" | |
1525 | ||
90e6ef53 | 1526 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1527 | #: wt-status.c:315 |
c04f5ac3 JX |
1528 | #, c-format |
1529 | msgid "copied: %s -> %s" | |
1530 | msgstr "拷贝: %s -> %s" | |
1531 | ||
90e6ef53 | 1532 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1533 | #: wt-status.c:318 |
c04f5ac3 JX |
1534 | #, c-format |
1535 | msgid "deleted: %s" | |
1536 | msgstr "删除: %s" | |
1537 | ||
90e6ef53 | 1538 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1539 | #: wt-status.c:321 |
c04f5ac3 JX |
1540 | #, c-format |
1541 | msgid "modified: %s" | |
1542 | msgstr "修改: %s" | |
1543 | ||
90e6ef53 | 1544 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1545 | #: wt-status.c:324 |
c04f5ac3 JX |
1546 | #, c-format |
1547 | msgid "renamed: %s -> %s" | |
1548 | msgstr "重命名: %s -> %s" | |
1549 | ||
90e6ef53 | 1550 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1551 | #: wt-status.c:327 |
c04f5ac3 JX |
1552 | #, c-format |
1553 | msgid "typechange: %s" | |
1554 | msgstr "类型变更: %s" | |
1555 | ||
90e6ef53 | 1556 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1557 | #: wt-status.c:330 |
c04f5ac3 JX |
1558 | #, c-format |
1559 | msgid "unknown: %s" | |
1560 | msgstr "未知: %s" | |
1561 | ||
90e6ef53 | 1562 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 1563 | #: wt-status.c:333 |
c04f5ac3 JX |
1564 | #, c-format |
1565 | msgid "unmerged: %s" | |
1566 | msgstr "未合并: %s" | |
1567 | ||
90314792 | 1568 | #: wt-status.c:336 |
c04f5ac3 JX |
1569 | #, c-format |
1570 | msgid "bug: unhandled diff status %c" | |
90e6ef53 | 1571 | msgstr "bug:未处理的差异状态 %c" |
c04f5ac3 | 1572 | |
90314792 JX |
1573 | #: wt-status.c:703 |
1574 | msgid "Submodules changed but not updated:" | |
1575 | msgstr "子模组已修改但尚未更新:" | |
1576 | ||
1577 | #: wt-status.c:705 | |
1578 | msgid "Submodule changes to be committed:" | |
1579 | msgstr "要提交的子模组变更:" | |
1580 | ||
1581 | #: wt-status.c:848 | |
6792b93b | 1582 | msgid "You have unmerged paths." |
195febda | 1583 | msgstr "您有尚未合并的路径。" |
6792b93b JX |
1584 | |
1585 | # 译者:注意保持前导空格 | |
90314792 | 1586 | #: wt-status.c:851 |
6792b93b JX |
1587 | msgid " (fix conflicts and run \"git commit\")" |
1588 | msgstr " (解决冲突并运行 \"git commit\")" | |
1589 | ||
90314792 | 1590 | #: wt-status.c:854 |
6792b93b JX |
1591 | msgid "All conflicts fixed but you are still merging." |
1592 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1593 | ||
1594 | # 译者:注意保持前导空格 | |
90314792 | 1595 | #: wt-status.c:857 |
6792b93b JX |
1596 | msgid " (use \"git commit\" to conclude merge)" |
1597 | msgstr " (使用 \"git commit\" 结束合并)" | |
1598 | ||
90314792 | 1599 | #: wt-status.c:867 |
6792b93b JX |
1600 | msgid "You are in the middle of an am session." |
1601 | msgstr "您正处于一个 am 过程中。" | |
1602 | ||
90314792 | 1603 | #: wt-status.c:870 |
6792b93b JX |
1604 | msgid "The current patch is empty." |
1605 | msgstr "当前的补丁为空。" | |
1606 | ||
1607 | # 译者:注意保持前导空格 | |
90314792 | 1608 | #: wt-status.c:874 |
2e8451e8 JX |
1609 | msgid " (fix conflicts and then run \"git am --continue\")" |
1610 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
6792b93b JX |
1611 | |
1612 | # 译者:注意保持前导空格 | |
90314792 | 1613 | #: wt-status.c:876 |
6792b93b JX |
1614 | msgid " (use \"git am --skip\" to skip this patch)" |
1615 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1616 | ||
1617 | # 译者:注意保持前导空格 | |
90314792 | 1618 | #: wt-status.c:878 |
6792b93b JX |
1619 | msgid " (use \"git am --abort\" to restore the original branch)" |
1620 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1621 | ||
90314792 | 1622 | #: wt-status.c:938 wt-status.c:955 |
63af42fe JX |
1623 | #, c-format |
1624 | msgid "You are currently rebasing branch '%s' on '%s'." | |
1625 | msgstr "您正在将分支 '%s' 变基到 '%s'。" | |
1626 | ||
90314792 | 1627 | #: wt-status.c:943 wt-status.c:960 |
6792b93b JX |
1628 | msgid "You are currently rebasing." |
1629 | msgstr "您正在变基。" | |
1630 | ||
1631 | # 译者:注意保持前导空格 | |
90314792 | 1632 | #: wt-status.c:946 |
6792b93b JX |
1633 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
1634 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1635 | ||
1636 | # 译者:注意保持前导空格 | |
90314792 | 1637 | #: wt-status.c:948 |
6792b93b JX |
1638 | msgid " (use \"git rebase --skip\" to skip this patch)" |
1639 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
1640 | ||
1641 | # 译者:注意保持前导空格 | |
90314792 | 1642 | #: wt-status.c:950 |
6792b93b JX |
1643 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
1644 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
1645 | ||
1646 | # 译者:注意保持前导空格 | |
90314792 | 1647 | #: wt-status.c:963 |
6792b93b JX |
1648 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
1649 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1650 | ||
90314792 | 1651 | #: wt-status.c:967 |
63af42fe JX |
1652 | #, c-format |
1653 | msgid "" | |
1654 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." | |
1655 | msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。" | |
1656 | ||
90314792 | 1657 | #: wt-status.c:972 |
6792b93b JX |
1658 | msgid "You are currently splitting a commit during a rebase." |
1659 | msgstr "您正在变基过程中拆分一个提交。" | |
1660 | ||
1661 | # 译者:注意保持前导空格 | |
90314792 | 1662 | #: wt-status.c:975 |
6792b93b JX |
1663 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
1664 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1665 | ||
90314792 | 1666 | #: wt-status.c:979 |
63af42fe JX |
1667 | #, c-format |
1668 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
1669 | msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。" | |
1670 | ||
90314792 | 1671 | #: wt-status.c:984 |
6792b93b JX |
1672 | msgid "You are currently editing a commit during a rebase." |
1673 | msgstr "您正在变基过程中编辑一个提交。" | |
1674 | ||
1675 | # 译者:注意保持前导空格 | |
90314792 | 1676 | #: wt-status.c:987 |
6792b93b JX |
1677 | msgid " (use \"git commit --amend\" to amend the current commit)" |
1678 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
1679 | ||
1680 | # 译者:注意保持前导空格 | |
90314792 | 1681 | #: wt-status.c:989 |
6792b93b JX |
1682 | msgid "" |
1683 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
195febda | 1684 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" |
6792b93b | 1685 | |
90314792 JX |
1686 | #: wt-status.c:999 |
1687 | #, c-format | |
1688 | msgid "You are currently cherry-picking commit %s." | |
1689 | msgstr "您正在做拣选提交 %s。" | |
6792b93b | 1690 | |
2e8451e8 | 1691 | # 译者:注意保持前导空格 |
90314792 | 1692 | #: wt-status.c:1004 |
2e8451e8 JX |
1693 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
1694 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1695 | ||
6792b93b | 1696 | # 译者:注意保持前导空格 |
90314792 | 1697 | #: wt-status.c:1007 |
2e8451e8 JX |
1698 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
1699 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
6792b93b | 1700 | |
2e8451e8 | 1701 | # 译者:注意保持前导空格 |
90314792 | 1702 | #: wt-status.c:1009 |
2e8451e8 JX |
1703 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
1704 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1705 | ||
90314792 | 1706 | #: wt-status.c:1018 |
1003b3a5 JX |
1707 | #, c-format |
1708 | msgid "You are currently reverting commit %s." | |
1709 | msgstr "您正在反转提交 %s 。" | |
1710 | ||
1711 | # 译者:注意保持前导空格 | |
90314792 | 1712 | #: wt-status.c:1023 |
1003b3a5 JX |
1713 | msgid " (fix conflicts and run \"git revert --continue\")" |
1714 | msgstr " (解决冲突并运行 \"git revert --continue\")" | |
1715 | ||
1716 | # 译者:注意保持前导空格 | |
90314792 | 1717 | #: wt-status.c:1026 |
1003b3a5 JX |
1718 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
1719 | msgstr " (所有冲突已解决:运行 \"git revert --continue\")" | |
1720 | ||
1721 | # 译者:注意保持前导空格 | |
90314792 | 1722 | #: wt-status.c:1028 |
1003b3a5 JX |
1723 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
1724 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1725 | ||
90314792 | 1726 | #: wt-status.c:1039 |
63af42fe | 1727 | #, c-format |
1003b3a5 JX |
1728 | msgid "You are currently bisecting, started from branch '%s'." |
1729 | msgstr "您正在从分支 '%s' 开始做二分查找。" | |
63af42fe | 1730 | |
90314792 | 1731 | #: wt-status.c:1043 |
6792b93b JX |
1732 | msgid "You are currently bisecting." |
1733 | msgstr "您正在做二分查找。" | |
1734 | ||
1735 | # 译者:注意保持前导空格 | |
90314792 | 1736 | #: wt-status.c:1046 |
6792b93b JX |
1737 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
1738 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1739 | ||
90314792 | 1740 | #: wt-status.c:1221 |
c04f5ac3 JX |
1741 | msgid "On branch " |
1742 | msgstr "位于分支 " | |
1743 | ||
90314792 | 1744 | #: wt-status.c:1228 |
2e8451e8 JX |
1745 | msgid "rebase in progress; onto " |
1746 | msgstr "变基正在进行中;至 " | |
1747 | ||
90314792 | 1748 | #: wt-status.c:1235 |
1003b3a5 JX |
1749 | msgid "HEAD detached at " |
1750 | msgstr "头指针分离于 " | |
1751 | ||
90314792 | 1752 | #: wt-status.c:1237 |
1003b3a5 JX |
1753 | msgid "HEAD detached from " |
1754 | msgstr "头指针分离自 " | |
1755 | ||
90314792 | 1756 | #: wt-status.c:1240 |
c04f5ac3 JX |
1757 | msgid "Not currently on any branch." |
1758 | msgstr "当前不在任何分支上。" | |
1759 | ||
90314792 | 1760 | #: wt-status.c:1257 |
c04f5ac3 JX |
1761 | msgid "Initial commit" |
1762 | msgstr "初始提交" | |
1763 | ||
90314792 | 1764 | #: wt-status.c:1271 |
ef317cd5 | 1765 | msgid "Untracked files" |
07432cef | 1766 | msgstr "未跟踪的文件" |
c04f5ac3 | 1767 | |
90314792 | 1768 | #: wt-status.c:1273 |
ef317cd5 | 1769 | msgid "Ignored files" |
07432cef | 1770 | msgstr "忽略的文件" |
c04f5ac3 | 1771 | |
90314792 | 1772 | #: wt-status.c:1277 |
1003b3a5 | 1773 | #, c-format |
4dcdc3d8 JX |
1774 | msgid "" |
1775 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
1776 | "may speed it up, but you have to be careful not to forget to add\n" | |
1777 | "new files yourself (see 'git help status')." | |
1778 | msgstr "" | |
1779 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
1780 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1003b3a5 | 1781 | |
90314792 | 1782 | #: wt-status.c:1283 |
c04f5ac3 JX |
1783 | #, c-format |
1784 | msgid "Untracked files not listed%s" | |
1785 | msgstr "未跟踪的文件没有列出%s" | |
1786 | ||
7e238ab7 | 1787 | # 译者:中文字符串拼接,可删除前导空格 |
90314792 | 1788 | #: wt-status.c:1285 |
c04f5ac3 | 1789 | msgid " (use -u option to show untracked files)" |
7e238ab7 | 1790 | msgstr "(使用 -u 参数显示未跟踪的文件)" |
c04f5ac3 | 1791 | |
90314792 | 1792 | #: wt-status.c:1291 |
c04f5ac3 JX |
1793 | msgid "No changes" |
1794 | msgstr "没有修改" | |
1795 | ||
90314792 | 1796 | #: wt-status.c:1296 |
07432cef | 1797 | #, c-format |
ef317cd5 | 1798 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" |
07432cef | 1799 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" |
c04f5ac3 | 1800 | |
90314792 | 1801 | #: wt-status.c:1299 |
07432cef | 1802 | #, c-format |
ef317cd5 | 1803 | msgid "no changes added to commit\n" |
07432cef | 1804 | msgstr "修改尚未加入提交\n" |
c04f5ac3 | 1805 | |
90314792 | 1806 | #: wt-status.c:1302 |
07432cef | 1807 | #, c-format |
ef317cd5 JX |
1808 | msgid "" |
1809 | "nothing added to commit but untracked files present (use \"git add\" to " | |
1810 | "track)\n" | |
07432cef | 1811 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 1812 | |
90314792 | 1813 | #: wt-status.c:1305 |
07432cef | 1814 | #, c-format |
ef317cd5 | 1815 | msgid "nothing added to commit but untracked files present\n" |
07432cef | 1816 | msgstr "提交为空,但是存在尚未跟踪的文件\n" |
c04f5ac3 | 1817 | |
7e238ab7 | 1818 | # 译者:中文字符串拼接,可删除前导空格 |
90314792 | 1819 | #: wt-status.c:1308 |
07432cef | 1820 | #, c-format |
ef317cd5 | 1821 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" |
07432cef | 1822 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" |
c04f5ac3 | 1823 | |
90314792 | 1824 | #: wt-status.c:1311 wt-status.c:1316 |
07432cef | 1825 | #, c-format |
ef317cd5 | 1826 | msgid "nothing to commit\n" |
07432cef | 1827 | msgstr "无文件要提交\n" |
ef317cd5 | 1828 | |
7e238ab7 | 1829 | # 译者:中文字符串拼接,可删除前导空格 |
90314792 | 1830 | #: wt-status.c:1314 |
07432cef | 1831 | #, c-format |
ef317cd5 | 1832 | msgid "nothing to commit (use -u to show untracked files)\n" |
07432cef | 1833 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" |
c04f5ac3 | 1834 | |
7e238ab7 | 1835 | # 译者:中文字符串拼接,可删除前导空格 |
90314792 | 1836 | #: wt-status.c:1318 |
07432cef | 1837 | #, c-format |
ef317cd5 | 1838 | msgid "nothing to commit, working directory clean\n" |
07432cef | 1839 | msgstr "无文件要提交,干净的工作区\n" |
c04f5ac3 | 1840 | |
90314792 | 1841 | #: wt-status.c:1427 |
c04f5ac3 | 1842 | msgid "HEAD (no branch)" |
61bc0753 | 1843 | msgstr "HEAD(非分支)" |
c04f5ac3 | 1844 | |
90e6ef53 | 1845 | # 译者:注意保持句尾空格 |
90314792 | 1846 | #: wt-status.c:1433 |
c04f5ac3 JX |
1847 | msgid "Initial commit on " |
1848 | msgstr "初始提交于 " | |
1849 | ||
90314792 JX |
1850 | #: wt-status.c:1463 |
1851 | msgid "gone" | |
1852 | msgstr "丢失" | |
1853 | ||
90e6ef53 | 1854 | # 译者:注意保持句尾空格 |
90314792 | 1855 | #: wt-status.c:1465 |
c04f5ac3 JX |
1856 | msgid "behind " |
1857 | msgstr "落后 " | |
1858 | ||
90e6ef53 | 1859 | # 译者:注意保持句尾空格 |
90314792 | 1860 | #: wt-status.c:1468 wt-status.c:1471 |
c04f5ac3 JX |
1861 | msgid "ahead " |
1862 | msgstr "领先 " | |
1863 | ||
90e6ef53 | 1864 | # 译者:注意保持句尾空格 |
90314792 | 1865 | #: wt-status.c:1473 |
c04f5ac3 JX |
1866 | msgid ", behind " |
1867 | msgstr ",落后 " | |
1868 | ||
90314792 | 1869 | #: compat/precompose_utf8.c:55 builtin/clone.c:350 |
a77c07d9 JX |
1870 | #, c-format |
1871 | msgid "failed to unlink '%s'" | |
1872 | msgstr "无法删除 '%s'" | |
1873 | ||
1874 | #: builtin/add.c:20 | |
1875 | msgid "git add [options] [--] <pathspec>..." | |
90314792 | 1876 | msgstr "git add [选项] [--] <路径规则>..." |
ef317cd5 | 1877 | |
4dcdc3d8 JX |
1878 | # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 |
1879 | #. | |
1880 | #. * To be consistent with "git add -p" and most Git | |
1881 | #. * commands, we should default to being tree-wide, but | |
1882 | #. * this is not the original behavior and can't be | |
1883 | #. * changed until users trained themselves not to type | |
1884 | #. * "git add -u" or "git add -A". For now, we warn and | |
1885 | #. * keep the old behavior. Later, the behavior can be changed | |
1886 | #. * to tree-wide, keeping the warning for a while, and | |
1887 | #. * eventually we can drop the warning. | |
1888 | #. | |
1889 | #: builtin/add.c:58 | |
1890 | #, c-format | |
1891 | msgid "" | |
1892 | "The behavior of 'git add %s (or %s)' with no path argument from a\n" | |
1893 | "subdirectory of the tree will change in Git 2.0 and should not be used " | |
1894 | "anymore.\n" | |
1895 | "To add content for the whole tree, run:\n" | |
1896 | "\n" | |
1897 | " git add %s :/\n" | |
1898 | " (or git add %s :/)\n" | |
1899 | "\n" | |
1900 | "To restrict the command to the current directory, run:\n" | |
1901 | "\n" | |
1902 | " git add %s .\n" | |
1903 | " (or git add %s .)\n" | |
1904 | "\n" | |
1905 | "With the current Git version, the command is restricted to the current " | |
1906 | "directory.\n" | |
1907 | msgstr "" | |
1908 | "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n" | |
1909 | "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n" | |
1910 | "如果要添加整个目录树的内容,执行:\n" | |
1911 | "\n" | |
1912 | " git add %s :/\n" | |
1913 | " (或 git add %s :/)\n" | |
1914 | "\n" | |
1915 | "如果要限制该命令只作用于当前目录,执行:\n" | |
1916 | "\n" | |
1917 | " git add %s .\n" | |
1918 | " (或 git add %s .)\n" | |
1919 | "\n" | |
1920 | "对于当前版本的 Git,这条命令只作用于当前目录。\n" | |
1921 | ||
1922 | #: builtin/add.c:100 | |
1923 | #, c-format | |
1924 | msgid "" | |
1925 | "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" | |
1926 | "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" | |
1927 | "Paths like '%s' that are\n" | |
1928 | "removed from your working tree are ignored with this version of Git.\n" | |
1929 | "\n" | |
1930 | "* 'git add --ignore-removal <pathspec>', which is the current default,\n" | |
1931 | " ignores paths you removed from your working tree.\n" | |
1932 | "\n" | |
1933 | "* 'git add --all <pathspec>' will let you also record the removals.\n" | |
1934 | "\n" | |
1935 | "Run 'git status' to check the paths you removed from your working tree.\n" | |
1936 | msgstr "" | |
1937 | "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n" | |
1938 | "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n" | |
1939 | "像本地工作区移除的路径 '%s'\n" | |
1940 | "在此版本的 Git 中被忽略。\n" | |
1941 | "\n" | |
90314792 | 1942 | "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n" |
4dcdc3d8 JX |
1943 | " 忽略您本地工作区中移除的文件。\n" |
1944 | "\n" | |
90314792 | 1945 | "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n" |
4dcdc3d8 JX |
1946 | "\n" |
1947 | "运行 'git status' 来检查您本地工作区中移除的路径。\n" | |
1948 | ||
1949 | #: builtin/add.c:144 | |
c04f5ac3 JX |
1950 | #, c-format |
1951 | msgid "unexpected diff status %c" | |
1952 | msgstr "意外的差异状态 %c" | |
1953 | ||
90314792 | 1954 | #: builtin/add.c:149 builtin/commit.c:260 |
c04f5ac3 JX |
1955 | msgid "updating files failed" |
1956 | msgstr "更新文件失败" | |
1957 | ||
4dcdc3d8 | 1958 | #: builtin/add.c:163 |
c04f5ac3 JX |
1959 | #, c-format |
1960 | msgid "remove '%s'\n" | |
1961 | msgstr "删除 '%s'\n" | |
1962 | ||
90314792 | 1963 | #: builtin/add.c:237 |
c04f5ac3 | 1964 | msgid "Unstaged changes after refreshing the index:" |
90e6ef53 | 1965 | msgstr "刷新索引之后尚未被暂存的变更:" |
c04f5ac3 | 1966 | |
90314792 | 1967 | #: builtin/add.c:299 |
c04f5ac3 | 1968 | msgid "Could not read the index" |
90e6ef53 | 1969 | msgstr "不能读取索引" |
c04f5ac3 | 1970 | |
90314792 | 1971 | #: builtin/add.c:310 |
c04f5ac3 JX |
1972 | #, c-format |
1973 | msgid "Could not open '%s' for writing." | |
195febda | 1974 | msgstr "不能打开 '%s' 以写入。" |
c04f5ac3 | 1975 | |
90314792 | 1976 | #: builtin/add.c:314 |
c04f5ac3 | 1977 | msgid "Could not write patch" |
195febda | 1978 | msgstr "不能生成补丁" |
c04f5ac3 | 1979 | |
90314792 | 1980 | #: builtin/add.c:319 |
c04f5ac3 JX |
1981 | #, c-format |
1982 | msgid "Could not stat '%s'" | |
90e6ef53 | 1983 | msgstr "不能查看文件状态 '%s'" |
c04f5ac3 | 1984 | |
90314792 | 1985 | #: builtin/add.c:321 |
c04f5ac3 JX |
1986 | msgid "Empty patch. Aborted." |
1987 | msgstr "空补丁。异常终止。" | |
1988 | ||
90314792 | 1989 | #: builtin/add.c:327 |
8ada9598 JX |
1990 | #, c-format |
1991 | msgid "Could not apply '%s'" | |
1992 | msgstr "不能应用 '%s'" | |
1993 | ||
90314792 | 1994 | #: builtin/add.c:337 |
8ada9598 | 1995 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
195febda | 1996 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" |
8ada9598 | 1997 | |
90314792 JX |
1998 | #: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 |
1999 | #: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 | |
2000 | #: builtin/rm.c:269 | |
ef317cd5 | 2001 | msgid "dry run" |
07432cef | 2002 | msgstr "演习" |
ef317cd5 | 2003 | |
90314792 JX |
2004 | #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 |
2005 | #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 | |
2006 | #: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 | |
ef317cd5 JX |
2007 | msgid "be verbose" |
2008 | msgstr "冗长输出" | |
2009 | ||
90314792 | 2010 | #: builtin/add.c:357 |
ef317cd5 | 2011 | msgid "interactive picking" |
07432cef | 2012 | msgstr "交互式拣选" |
ef317cd5 | 2013 | |
90314792 | 2014 | #: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272 |
ef317cd5 | 2015 | msgid "select hunks interactively" |
07432cef | 2016 | msgstr "交互式挑选数据块" |
ef317cd5 | 2017 | |
90314792 | 2018 | #: builtin/add.c:359 |
ef317cd5 | 2019 | msgid "edit current diff and apply" |
07432cef | 2020 | msgstr "编辑当前差异并应用" |
ef317cd5 | 2021 | |
90314792 | 2022 | #: builtin/add.c:360 |
ef317cd5 | 2023 | msgid "allow adding otherwise ignored files" |
07432cef | 2024 | msgstr "允许添加忽略的文件" |
ef317cd5 | 2025 | |
90314792 | 2026 | #: builtin/add.c:361 |
ef317cd5 | 2027 | msgid "update tracked files" |
07432cef | 2028 | msgstr "更新已跟踪的文件" |
ef317cd5 | 2029 | |
90314792 | 2030 | #: builtin/add.c:362 |
ef317cd5 | 2031 | msgid "record only the fact that the path will be added later" |
07432cef | 2032 | msgstr "只记录,该路径稍后再添加" |
ef317cd5 | 2033 | |
90314792 | 2034 | #: builtin/add.c:363 |
ef317cd5 | 2035 | msgid "add changes from all tracked and untracked files" |
07432cef | 2036 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" |
ef317cd5 | 2037 | |
4dcdc3d8 | 2038 | #. takes no arguments |
90314792 | 2039 | #: builtin/add.c:366 |
4dcdc3d8 JX |
2040 | msgid "ignore paths removed in the working tree (same as --no-all)" |
2041 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
2042 | ||
90314792 | 2043 | #: builtin/add.c:368 |
ef317cd5 | 2044 | msgid "don't add, only refresh the index" |
07432cef | 2045 | msgstr "不添加,只刷新索引" |
ef317cd5 | 2046 | |
90314792 | 2047 | #: builtin/add.c:369 |
ef317cd5 | 2048 | msgid "just skip files which cannot be added because of errors" |
07432cef | 2049 | msgstr "跳过因出错不能添加的文件" |
ef317cd5 | 2050 | |
90314792 | 2051 | #: builtin/add.c:370 |
ef317cd5 | 2052 | msgid "check if - even missing - files are ignored in dry run" |
07432cef | 2053 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" |
ef317cd5 | 2054 | |
90314792 | 2055 | #: builtin/add.c:392 |
8ada9598 JX |
2056 | #, c-format |
2057 | msgid "Use -f if you really want to add them.\n" | |
2058 | msgstr "使用 -f 参数如果您确实要添加它们。\n" | |
2059 | ||
90314792 | 2060 | #: builtin/add.c:393 |
8ada9598 JX |
2061 | msgid "no files added" |
2062 | msgstr "没有文件被添加" | |
2063 | ||
90314792 | 2064 | #: builtin/add.c:399 |
8ada9598 JX |
2065 | msgid "adding files failed" |
2066 | msgstr "添加文件失败" | |
2067 | ||
90314792 | 2068 | #: builtin/add.c:438 |
8ada9598 JX |
2069 | msgid "-A and -u are mutually incompatible" |
2070 | msgstr "-A 和 -u 选项互斥" | |
2071 | ||
90314792 | 2072 | #: builtin/add.c:456 |
8ada9598 | 2073 | msgid "Option --ignore-missing can only be used together with --dry-run" |
649900bc | 2074 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" |
8ada9598 | 2075 | |
90314792 | 2076 | #: builtin/add.c:486 |
8ada9598 JX |
2077 | #, c-format |
2078 | msgid "Nothing specified, nothing added.\n" | |
2079 | msgstr "没有指定文件,也没有文件被添加。\n" | |
2080 | ||
90314792 | 2081 | #: builtin/add.c:487 |
8ada9598 JX |
2082 | #, c-format |
2083 | msgid "Maybe you wanted to say 'git add .'?\n" | |
2084 | msgstr "也许您想要执行 'git add .'?\n" | |
2085 | ||
90314792 JX |
2086 | #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 |
2087 | #: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 | |
8ada9598 JX |
2088 | msgid "index file corrupt" |
2089 | msgstr "索引文件损坏" | |
2090 | ||
90314792 | 2091 | #: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 |
8ada9598 JX |
2092 | msgid "Unable to write new index file" |
2093 | msgstr "无法写入新索引文件" | |
2094 | ||
23ff3338 | 2095 | #: builtin/apply.c:57 |
8ada9598 | 2096 | msgid "git apply [options] [<patch>...]" |
81809b99 | 2097 | msgstr "git apply [选项] [<补丁>...]" |
8ada9598 | 2098 | |
23ff3338 | 2099 | #: builtin/apply.c:110 |
81809b99 | 2100 | #, c-format |
8ada9598 | 2101 | msgid "unrecognized whitespace option '%s'" |
81809b99 | 2102 | msgstr "未能识别的空白字符选项 '%s'" |
8ada9598 | 2103 | |
23ff3338 | 2104 | #: builtin/apply.c:125 |
81809b99 | 2105 | #, c-format |
8ada9598 | 2106 | msgid "unrecognized whitespace ignore option '%s'" |
81809b99 | 2107 | msgstr "未能识别的空白字符忽略选项 '%s'" |
8ada9598 | 2108 | |
c160d03f | 2109 | #: builtin/apply.c:823 |
8ada9598 JX |
2110 | #, c-format |
2111 | msgid "Cannot prepare timestamp regexp %s" | |
81809b99 | 2112 | msgstr "无法准备时间戳正则表达式 %s" |
8ada9598 | 2113 | |
c160d03f | 2114 | #: builtin/apply.c:832 |
8ada9598 JX |
2115 | #, c-format |
2116 | msgid "regexec returned %d for input: %s" | |
81809b99 | 2117 | msgstr "regexec 返回 %d,输入为:%s" |
8ada9598 | 2118 | |
c160d03f | 2119 | #: builtin/apply.c:913 |
81809b99 | 2120 | #, c-format |
8ada9598 | 2121 | msgid "unable to find filename in patch at line %d" |
81809b99 | 2122 | msgstr "不能在补丁的第 %d 行找到文件名" |
8ada9598 | 2123 | |
c160d03f | 2124 | #: builtin/apply.c:945 |
8ada9598 JX |
2125 | #, c-format |
2126 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
9aafc933 | 2127 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" |
8ada9598 | 2128 | |
c160d03f | 2129 | #: builtin/apply.c:949 |
8ada9598 JX |
2130 | #, c-format |
2131 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
81809b99 | 2132 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" |
8ada9598 | 2133 | |
c160d03f | 2134 | #: builtin/apply.c:950 |
8ada9598 JX |
2135 | #, c-format |
2136 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
81809b99 | 2137 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" |
8ada9598 | 2138 | |
c160d03f | 2139 | #: builtin/apply.c:957 |
8ada9598 JX |
2140 | #, c-format |
2141 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
9aafc933 | 2142 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" |
8ada9598 | 2143 | |
a77c07d9 | 2144 | #: builtin/apply.c:1422 |
8ada9598 JX |
2145 | #, c-format |
2146 | msgid "recount: unexpected line: %.*s" | |
81809b99 | 2147 | msgstr "recount:意外的行:%.*s" |
8ada9598 | 2148 | |
a77c07d9 | 2149 | #: builtin/apply.c:1479 |
8ada9598 JX |
2150 | #, c-format |
2151 | msgid "patch fragment without header at line %d: %.*s" | |
81809b99 | 2152 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" |
8ada9598 | 2153 | |
a77c07d9 | 2154 | #: builtin/apply.c:1496 |
8ada9598 JX |
2155 | #, c-format |
2156 | msgid "" | |
2157 | "git diff header lacks filename information when removing %d leading pathname " | |
2158 | "component (line %d)" | |
2159 | msgid_plural "" | |
2160 | "git diff header lacks filename information when removing %d leading pathname " | |
2161 | "components (line %d)" | |
5ae481e0 JX |
2162 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" |
2163 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
8ada9598 | 2164 | |
a77c07d9 | 2165 | #: builtin/apply.c:1656 |
8ada9598 | 2166 | msgid "new file depends on old contents" |
81809b99 | 2167 | msgstr "新文件依赖旧内容" |
8ada9598 | 2168 | |
a77c07d9 | 2169 | #: builtin/apply.c:1658 |
8ada9598 | 2170 | msgid "deleted file still has contents" |
81809b99 | 2171 | msgstr "删除的文件仍有内容" |
8ada9598 | 2172 | |
a77c07d9 | 2173 | #: builtin/apply.c:1684 |
8ada9598 JX |
2174 | #, c-format |
2175 | msgid "corrupt patch at line %d" | |
195febda | 2176 | msgstr "补丁在第 %d 行损坏" |
8ada9598 | 2177 | |
a77c07d9 | 2178 | #: builtin/apply.c:1720 |
8ada9598 JX |
2179 | #, c-format |
2180 | msgid "new file %s depends on old contents" | |
81809b99 | 2181 | msgstr "新文件 %s 依赖旧内容" |
8ada9598 | 2182 | |
a77c07d9 | 2183 | #: builtin/apply.c:1722 |
8ada9598 JX |
2184 | #, c-format |
2185 | msgid "deleted file %s still has contents" | |
81809b99 | 2186 | msgstr "删除的文件 %s 仍有内容" |
8ada9598 | 2187 | |
a77c07d9 | 2188 | #: builtin/apply.c:1725 |
8ada9598 JX |
2189 | #, c-format |
2190 | msgid "** warning: file %s becomes empty but is not deleted" | |
81809b99 | 2191 | msgstr "** 警告:文件 %s 成为空文件但并未删除" |
8ada9598 | 2192 | |
a77c07d9 | 2193 | #: builtin/apply.c:1871 |
8ada9598 JX |
2194 | #, c-format |
2195 | msgid "corrupt binary patch at line %d: %.*s" | |
81809b99 | 2196 | msgstr "二进制补丁在第 %d 行损坏:%.*s" |
8ada9598 JX |
2197 | |
2198 | #. there has to be one hunk (forward hunk) | |
a77c07d9 | 2199 | #: builtin/apply.c:1900 |
8ada9598 JX |
2200 | #, c-format |
2201 | msgid "unrecognized binary patch at line %d" | |
81809b99 | 2202 | msgstr "未能识别的二进制补丁位于第 %d 行" |
8ada9598 | 2203 | |
a77c07d9 | 2204 | #: builtin/apply.c:1986 |
8ada9598 JX |
2205 | #, c-format |
2206 | msgid "patch with only garbage at line %d" | |
81809b99 | 2207 | msgstr "补丁文件的第 %d 行只有垃圾数据" |
8ada9598 | 2208 | |
a77c07d9 | 2209 | #: builtin/apply.c:2076 |
81809b99 | 2210 | #, c-format |
8ada9598 | 2211 | msgid "unable to read symlink %s" |
81809b99 | 2212 | msgstr "无法读取符号链接 %s" |
8ada9598 | 2213 | |
a77c07d9 | 2214 | #: builtin/apply.c:2080 |
81809b99 | 2215 | #, c-format |
8ada9598 | 2216 | msgid "unable to open or read %s" |
81809b99 | 2217 | msgstr "不能打开或读取 %s" |
8ada9598 | 2218 | |
1003b3a5 | 2219 | #: builtin/apply.c:2688 |
81809b99 | 2220 | #, c-format |
8ada9598 | 2221 | msgid "invalid start of line: '%c'" |
81809b99 | 2222 | msgstr "无效的行首字符:'%c'" |
8ada9598 | 2223 | |
1003b3a5 | 2224 | #: builtin/apply.c:2806 |
8ada9598 JX |
2225 | #, c-format |
2226 | msgid "Hunk #%d succeeded at %d (offset %d line)." | |
2227 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
07432cef WS |
2228 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" |
2229 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
8ada9598 | 2230 | |
1003b3a5 | 2231 | #: builtin/apply.c:2818 |
8ada9598 JX |
2232 | #, c-format |
2233 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" | |
81809b99 | 2234 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" |
8ada9598 | 2235 | |
1003b3a5 | 2236 | #: builtin/apply.c:2824 |
8ada9598 JX |
2237 | #, c-format |
2238 | msgid "" | |
2239 | "while searching for:\n" | |
2240 | "%.*s" | |
2241 | msgstr "" | |
81809b99 JX |
2242 | "当查询:\n" |
2243 | "%.*s" | |
8ada9598 | 2244 | |
1003b3a5 | 2245 | #: builtin/apply.c:2843 |
8ada9598 JX |
2246 | #, c-format |
2247 | msgid "missing binary patch data for '%s'" | |
81809b99 | 2248 | msgstr "缺失 '%s' 的二进制补丁数据" |
8ada9598 | 2249 | |
1003b3a5 | 2250 | #: builtin/apply.c:2946 |
8ada9598 JX |
2251 | #, c-format |
2252 | msgid "binary patch does not apply to '%s'" | |
81809b99 | 2253 | msgstr "二进制补丁未应用到 '%s'" |
8ada9598 | 2254 | |
1003b3a5 | 2255 | #: builtin/apply.c:2952 |
8ada9598 JX |
2256 | #, c-format |
2257 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" | |
9aafc933 | 2258 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" |
8ada9598 | 2259 | |
1003b3a5 | 2260 | #: builtin/apply.c:2973 |
8ada9598 JX |
2261 | #, c-format |
2262 | msgid "patch failed: %s:%ld" | |
81809b99 | 2263 | msgstr "打补丁失败:%s:%ld" |
8ada9598 | 2264 | |
1003b3a5 | 2265 | #: builtin/apply.c:3095 |
8ada9598 | 2266 | #, c-format |
23ff3338 JX |
2267 | msgid "cannot checkout %s" |
2268 | msgstr "不能检出 %s" | |
8ada9598 | 2269 | |
2e8451e8 | 2270 | #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 |
81809b99 | 2271 | #, c-format |
8ada9598 | 2272 | msgid "read of %s failed" |
81809b99 | 2273 | msgstr "读取 %s 失败" |
8ada9598 | 2274 | |
2e8451e8 | 2275 | #: builtin/apply.c:3174 builtin/apply.c:3396 |
81809b99 | 2276 | #, c-format |
23ff3338 JX |
2277 | msgid "path %s has been renamed/deleted" |
2278 | msgstr "路径 %s 已经被重命名/删除" | |
8ada9598 | 2279 | |
2e8451e8 | 2280 | #: builtin/apply.c:3255 builtin/apply.c:3410 |
8ada9598 | 2281 | #, c-format |
23ff3338 JX |
2282 | msgid "%s: does not exist in index" |
2283 | msgstr "%s:不存在于索引中" | |
8ada9598 | 2284 | |
2e8451e8 | 2285 | #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 |
81809b99 | 2286 | #, c-format |
8ada9598 | 2287 | msgid "%s: %s" |
81809b99 | 2288 | msgstr "%s:%s" |
8ada9598 | 2289 | |
2e8451e8 | 2290 | #: builtin/apply.c:3264 builtin/apply.c:3418 |
81809b99 | 2291 | #, c-format |
8ada9598 | 2292 | msgid "%s: does not match index" |
81809b99 | 2293 | msgstr "%s:和索引不匹配" |
8ada9598 | 2294 | |
2e8451e8 | 2295 | #: builtin/apply.c:3366 |
23ff3338 JX |
2296 | msgid "removal patch leaves file contents" |
2297 | msgstr "移除补丁仍留下了文件内容" | |
2298 | ||
2e8451e8 | 2299 | #: builtin/apply.c:3435 |
8ada9598 JX |
2300 | #, c-format |
2301 | msgid "%s: wrong type" | |
81809b99 | 2302 | msgstr "%s:错误类型" |
8ada9598 | 2303 | |
2e8451e8 | 2304 | #: builtin/apply.c:3437 |
8ada9598 JX |
2305 | #, c-format |
2306 | msgid "%s has type %o, expected %o" | |
9aafc933 | 2307 | msgstr "%s 的类型是 %o,应为 %o" |
8ada9598 | 2308 | |
2e8451e8 | 2309 | #: builtin/apply.c:3538 |
81809b99 | 2310 | #, c-format |
8ada9598 | 2311 | msgid "%s: already exists in index" |
81809b99 | 2312 | msgstr "%s:已经存在于索引中" |
8ada9598 | 2313 | |
2e8451e8 | 2314 | #: builtin/apply.c:3541 |
23ff3338 JX |
2315 | #, c-format |
2316 | msgid "%s: already exists in working directory" | |
2317 | msgstr "%s:已经存在于工作区中" | |
2318 | ||
2e8451e8 | 2319 | #: builtin/apply.c:3561 |
d691f479 JX |
2320 | #, c-format |
2321 | msgid "new mode (%o) of %s does not match old mode (%o)" | |
2322 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
8ada9598 | 2323 | |
2e8451e8 | 2324 | #: builtin/apply.c:3566 |
8ada9598 | 2325 | #, c-format |
d691f479 JX |
2326 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
2327 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
2328 | ||
2e8451e8 | 2329 | #: builtin/apply.c:3574 |
d691f479 | 2330 | #, c-format |
8ada9598 | 2331 | msgid "%s: patch does not apply" |
81809b99 | 2332 | msgstr "%s:补丁未应用" |
8ada9598 | 2333 | |
2e8451e8 | 2334 | #: builtin/apply.c:3587 |
8ada9598 JX |
2335 | #, c-format |
2336 | msgid "Checking patch %s..." | |
81809b99 | 2337 | msgstr "检查补丁 %s..." |
8ada9598 | 2338 | |
90314792 | 2339 | #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127 |
8ada9598 JX |
2340 | #, c-format |
2341 | msgid "make_cache_entry failed for path '%s'" | |
2342 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
2343 | ||
2e8451e8 | 2344 | #: builtin/apply.c:3823 |
81809b99 | 2345 | #, c-format |
8ada9598 | 2346 | msgid "unable to remove %s from index" |
81809b99 | 2347 | msgstr "不能从索引中移除 %s" |
8ada9598 | 2348 | |
2e8451e8 | 2349 | #: builtin/apply.c:3851 |
8ada9598 | 2350 | #, c-format |
2e8451e8 JX |
2351 | msgid "corrupt patch for submodule %s" |
2352 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 2353 | |
2e8451e8 | 2354 | #: builtin/apply.c:3855 |
81809b99 | 2355 | #, c-format |
8ada9598 | 2356 | msgid "unable to stat newly created file '%s'" |
81809b99 | 2357 | msgstr "不能枚举新建文件 '%s' 的状态" |
8ada9598 | 2358 | |
2e8451e8 | 2359 | #: builtin/apply.c:3860 |
8ada9598 JX |
2360 | #, c-format |
2361 | msgid "unable to create backing store for newly created file %s" | |
81809b99 | 2362 | msgstr "不能为新建文件 %s 创建后端存储" |
8ada9598 | 2363 | |
2e8451e8 | 2364 | #: builtin/apply.c:3863 builtin/apply.c:3971 |
81809b99 | 2365 | #, c-format |
8ada9598 | 2366 | msgid "unable to add cache entry for %s" |
81809b99 | 2367 | msgstr "无法为 %s 添加缓存条目" |
8ada9598 | 2368 | |
2e8451e8 | 2369 | #: builtin/apply.c:3896 |
81809b99 | 2370 | #, c-format |
8ada9598 | 2371 | msgid "closing file '%s'" |
81809b99 | 2372 | msgstr "关闭文件 '%s'" |
8ada9598 | 2373 | |
2e8451e8 | 2374 | #: builtin/apply.c:3945 |
81809b99 | 2375 | #, c-format |
8ada9598 | 2376 | msgid "unable to write file '%s' mode %o" |
81809b99 | 2377 | msgstr "不能写文件 '%s' 权限 %o" |
8ada9598 | 2378 | |
2e8451e8 | 2379 | #: builtin/apply.c:4032 |
8ada9598 JX |
2380 | #, c-format |
2381 | msgid "Applied patch %s cleanly." | |
81809b99 | 2382 | msgstr "成功应用补丁 %s。" |
8ada9598 | 2383 | |
2e8451e8 | 2384 | #: builtin/apply.c:4040 |
8ada9598 | 2385 | msgid "internal error" |
81809b99 | 2386 | msgstr "内部错误" |
8ada9598 JX |
2387 | |
2388 | #. Say this even without --verbose | |
2e8451e8 | 2389 | #: builtin/apply.c:4043 |
8ada9598 JX |
2390 | #, c-format |
2391 | msgid "Applying patch %%s with %d reject..." | |
2392 | msgid_plural "Applying patch %%s with %d rejects..." | |
195febda T |
2393 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." |
2394 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
8ada9598 | 2395 | |
2e8451e8 | 2396 | #: builtin/apply.c:4053 |
8ada9598 JX |
2397 | #, c-format |
2398 | msgid "truncating .rej filename to %.*s.rej" | |
81809b99 | 2399 | msgstr "截短 .rej 文件名为 %.*s.rej" |
8ada9598 | 2400 | |
2e8451e8 | 2401 | #: builtin/apply.c:4074 |
8ada9598 JX |
2402 | #, c-format |
2403 | msgid "Hunk #%d applied cleanly." | |
81809b99 | 2404 | msgstr "第 #%d 个片段成功应用。" |
8ada9598 | 2405 | |
2e8451e8 | 2406 | #: builtin/apply.c:4077 |
8ada9598 JX |
2407 | #, c-format |
2408 | msgid "Rejected hunk #%d." | |
81809b99 | 2409 | msgstr "拒绝第 #%d 个片段。" |
8ada9598 | 2410 | |
2e8451e8 | 2411 | #: builtin/apply.c:4227 |
8ada9598 | 2412 | msgid "unrecognized input" |
81809b99 | 2413 | msgstr "未能识别的输入" |
8ada9598 | 2414 | |
2e8451e8 | 2415 | #: builtin/apply.c:4238 |
8ada9598 | 2416 | msgid "unable to read index file" |
81809b99 | 2417 | msgstr "无法读取索引文件" |
8ada9598 | 2418 | |
90314792 JX |
2419 | #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 |
2420 | #: builtin/fetch.c:77 | |
8ada9598 | 2421 | msgid "path" |
81809b99 | 2422 | msgstr "路径" |
8ada9598 | 2423 | |
2e8451e8 | 2424 | #: builtin/apply.c:4358 |
8ada9598 | 2425 | msgid "don't apply changes matching the given path" |
81809b99 | 2426 | msgstr "不要应用与给出路径向匹配的变更" |
8ada9598 | 2427 | |
2e8451e8 | 2428 | #: builtin/apply.c:4361 |
8ada9598 | 2429 | msgid "apply changes matching the given path" |
81809b99 | 2430 | msgstr "应用与给出路径向匹配的变更" |
8ada9598 | 2431 | |
2e8451e8 | 2432 | #: builtin/apply.c:4363 |
8ada9598 | 2433 | msgid "num" |
81809b99 | 2434 | msgstr "数字" |
8ada9598 | 2435 | |
2e8451e8 | 2436 | #: builtin/apply.c:4364 |
8ada9598 | 2437 | msgid "remove <num> leading slashes from traditional diff paths" |
07432cef | 2438 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" |
8ada9598 | 2439 | |
2e8451e8 | 2440 | #: builtin/apply.c:4367 |
8ada9598 | 2441 | msgid "ignore additions made by the patch" |
81809b99 | 2442 | msgstr "忽略补丁中的添加的文件" |
8ada9598 | 2443 | |
2e8451e8 | 2444 | #: builtin/apply.c:4369 |
8ada9598 | 2445 | msgid "instead of applying the patch, output diffstat for the input" |
81809b99 | 2446 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" |
8ada9598 | 2447 | |
2e8451e8 | 2448 | #: builtin/apply.c:4373 |
ef317cd5 | 2449 | msgid "show number of added and deleted lines in decimal notation" |
07432cef | 2450 | msgstr "以十进制数显示添加和删除的行数" |
8ada9598 | 2451 | |
2e8451e8 | 2452 | #: builtin/apply.c:4375 |
8ada9598 | 2453 | msgid "instead of applying the patch, output a summary for the input" |
81809b99 | 2454 | msgstr "不应用补丁,而是显示输入的概要" |
8ada9598 | 2455 | |
2e8451e8 | 2456 | #: builtin/apply.c:4377 |
8ada9598 | 2457 | msgid "instead of applying the patch, see if the patch is applicable" |
81809b99 | 2458 | msgstr "不应用补丁,而是查看补丁是否可应用" |
8ada9598 | 2459 | |
2e8451e8 | 2460 | #: builtin/apply.c:4379 |
8ada9598 | 2461 | msgid "make sure the patch is applicable to the current index" |
81809b99 | 2462 | msgstr "确认补丁可以应用到当前索引" |
8ada9598 | 2463 | |
2e8451e8 | 2464 | #: builtin/apply.c:4381 |
8ada9598 | 2465 | msgid "apply a patch without touching the working tree" |
81809b99 | 2466 | msgstr "应用补丁而不修改工作区" |
8ada9598 | 2467 | |
2e8451e8 | 2468 | #: builtin/apply.c:4383 |
8ada9598 | 2469 | msgid "also apply the patch (use with --stat/--summary/--check)" |
195febda | 2470 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" |
8ada9598 | 2471 | |
2e8451e8 | 2472 | #: builtin/apply.c:4385 |
23ff3338 JX |
2473 | msgid "attempt three-way merge if a patch does not apply" |
2474 | msgstr "如果一个补丁不能应用则尝试三路合并" | |
2475 | ||
2e8451e8 | 2476 | #: builtin/apply.c:4387 |
8ada9598 | 2477 | msgid "build a temporary index based on embedded index information" |
81809b99 | 2478 | msgstr "创建一个临时索引基于嵌入的索引信息" |
8ada9598 | 2479 | |
90314792 | 2480 | #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452 |
8ada9598 | 2481 | msgid "paths are separated with NUL character" |
81809b99 | 2482 | msgstr "路径以 NUL 字符分隔" |
8ada9598 | 2483 | |
2e8451e8 | 2484 | #: builtin/apply.c:4392 |
8ada9598 | 2485 | msgid "ensure at least <n> lines of context match" |
81809b99 | 2486 | msgstr "确保至少匹配 <n> 行上下文" |
8ada9598 | 2487 | |
2e8451e8 | 2488 | #: builtin/apply.c:4393 |
8ada9598 | 2489 | msgid "action" |
81809b99 | 2490 | msgstr "动作" |
8ada9598 | 2491 | |
2e8451e8 | 2492 | #: builtin/apply.c:4394 |
8ada9598 | 2493 | msgid "detect new or modified lines that have whitespace errors" |
81809b99 | 2494 | msgstr "检查新增和修改的行中间的空白字符滥用" |
8ada9598 | 2495 | |
2e8451e8 | 2496 | #: builtin/apply.c:4397 builtin/apply.c:4400 |
8ada9598 | 2497 | msgid "ignore changes in whitespace when finding context" |
81809b99 | 2498 | msgstr "查找上下文时忽略空白字符的变更" |
8ada9598 | 2499 | |
2e8451e8 | 2500 | #: builtin/apply.c:4403 |
8ada9598 | 2501 | msgid "apply the patch in reverse" |
81809b99 | 2502 | msgstr "反向应用补丁" |
8ada9598 | 2503 | |
2e8451e8 | 2504 | #: builtin/apply.c:4405 |
8ada9598 | 2505 | msgid "don't expect at least one line of context" |
81809b99 | 2506 | msgstr "无需至少一行上下文" |
8ada9598 | 2507 | |
2e8451e8 | 2508 | #: builtin/apply.c:4407 |
8ada9598 | 2509 | msgid "leave the rejected hunks in corresponding *.rej files" |
81809b99 | 2510 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" |
8ada9598 | 2511 | |
2e8451e8 | 2512 | #: builtin/apply.c:4409 |
8ada9598 | 2513 | msgid "allow overlapping hunks" |
81809b99 | 2514 | msgstr "允许重叠的补丁片段" |
8ada9598 | 2515 | |
2e8451e8 | 2516 | #: builtin/apply.c:4412 |
8ada9598 | 2517 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
195febda | 2518 | msgstr "允许不正确的文件末尾换行符" |
c04f5ac3 | 2519 | |
2e8451e8 | 2520 | #: builtin/apply.c:4415 |
8ada9598 | 2521 | msgid "do not trust the line counts in the hunk headers" |
81809b99 | 2522 | msgstr "不信任补丁片段的头信息中的行号" |
c04f5ac3 | 2523 | |
2e8451e8 | 2524 | #: builtin/apply.c:4417 |
8ada9598 | 2525 | msgid "root" |
81809b99 | 2526 | msgstr "根目录" |
c04f5ac3 | 2527 | |
2e8451e8 | 2528 | #: builtin/apply.c:4418 |
8ada9598 | 2529 | msgid "prepend <root> to all filenames" |
81809b99 | 2530 | msgstr "为所有文件名前添加 <根目录>" |
c04f5ac3 | 2531 | |
2e8451e8 | 2532 | #: builtin/apply.c:4440 |
23ff3338 JX |
2533 | msgid "--3way outside a repository" |
2534 | msgstr "--3way 在一个版本库之外" | |
2535 | ||
2e8451e8 | 2536 | #: builtin/apply.c:4448 |
8ada9598 | 2537 | msgid "--index outside a repository" |
81809b99 | 2538 | msgstr "--index 在一个版本库之外" |
c04f5ac3 | 2539 | |
2e8451e8 | 2540 | #: builtin/apply.c:4451 |
8ada9598 | 2541 | msgid "--cached outside a repository" |
81809b99 | 2542 | msgstr "--cached 在一个版本库之外" |
c04f5ac3 | 2543 | |
2e8451e8 | 2544 | #: builtin/apply.c:4467 |
81809b99 | 2545 | #, c-format |
8ada9598 | 2546 | msgid "can't open patch '%s'" |
81809b99 | 2547 | msgstr "不能打开补丁 '%s'" |
c04f5ac3 | 2548 | |
2e8451e8 | 2549 | #: builtin/apply.c:4481 |
c04f5ac3 | 2550 | #, c-format |
8ada9598 JX |
2551 | msgid "squelched %d whitespace error" |
2552 | msgid_plural "squelched %d whitespace errors" | |
81809b99 | 2553 | msgstr[0] "抑制下仍有 %d 个空白字符误用" |
5ae481e0 | 2554 | msgstr[1] "抑制下仍有 %d 个空白字符误用" |
c04f5ac3 | 2555 | |
2e8451e8 | 2556 | #: builtin/apply.c:4487 builtin/apply.c:4497 |
8ada9598 JX |
2557 | #, c-format |
2558 | msgid "%d line adds whitespace errors." | |
2559 | msgid_plural "%d lines add whitespace errors." | |
81809b99 | 2560 | msgstr[0] "%d 行有空白字符误用。" |
5ae481e0 | 2561 | msgstr[1] "%d 行有空白字符误用。" |
c04f5ac3 JX |
2562 | |
2563 | #: builtin/archive.c:17 | |
2564 | #, c-format | |
2565 | msgid "could not create archive file '%s'" | |
90e6ef53 | 2566 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
2567 | |
2568 | #: builtin/archive.c:20 | |
2569 | msgid "could not redirect output" | |
195febda | 2570 | msgstr "不能重定向输出" |
c04f5ac3 JX |
2571 | |
2572 | #: builtin/archive.c:37 | |
2573 | msgid "git archive: Remote with no URL" | |
90e6ef53 | 2574 | msgstr "git archive:未提供远程URL" |
c04f5ac3 JX |
2575 | |
2576 | #: builtin/archive.c:58 | |
2577 | msgid "git archive: expected ACK/NAK, got EOF" | |
9aafc933 | 2578 | msgstr "git archive:应为ACK/NACK,却得到EOF" |
c04f5ac3 | 2579 | |
1003b3a5 | 2580 | #: builtin/archive.c:61 |
c04f5ac3 JX |
2581 | #, c-format |
2582 | msgid "git archive: NACK %s" | |
90e6ef53 | 2583 | msgstr "git archive:NACK %s" |
c04f5ac3 | 2584 | |
1003b3a5 | 2585 | #: builtin/archive.c:63 |
c04f5ac3 JX |
2586 | #, c-format |
2587 | msgid "remote error: %s" | |
2588 | msgstr "远程错误:%s" | |
2589 | ||
1003b3a5 | 2590 | #: builtin/archive.c:64 |
c04f5ac3 | 2591 | msgid "git archive: protocol error" |
90e6ef53 | 2592 | msgstr "git archive:协议错误" |
c04f5ac3 | 2593 | |
1003b3a5 | 2594 | #: builtin/archive.c:68 |
c04f5ac3 | 2595 | msgid "git archive: expected a flush" |
195febda | 2596 | msgstr "git archive:应为刷新" |
c04f5ac3 | 2597 | |
ef317cd5 JX |
2598 | #: builtin/bisect--helper.c:7 |
2599 | msgid "git bisect--helper --next-all [--no-checkout]" | |
07432cef | 2600 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 JX |
2601 | |
2602 | #: builtin/bisect--helper.c:17 | |
2603 | msgid "perform 'git bisect next'" | |
07432cef | 2604 | msgstr "执行 'git bisect next'" |
ef317cd5 JX |
2605 | |
2606 | #: builtin/bisect--helper.c:19 | |
2607 | msgid "update BISECT_HEAD instead of checking out the current commit" | |
07432cef | 2608 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 2609 | |
90314792 | 2610 | #: builtin/blame.c:27 |
ef317cd5 | 2611 | msgid "git blame [options] [rev-opts] [rev] [--] file" |
07432cef | 2612 | msgstr "git blame [选项] [版本选项] [版本] [--] 文件" |
ef317cd5 | 2613 | |
90314792 | 2614 | #: builtin/blame.c:32 |
ef317cd5 | 2615 | msgid "[rev-opts] are documented in git-rev-list(1)" |
07432cef | 2616 | msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" |
ef317cd5 | 2617 | |
90314792 | 2618 | #: builtin/blame.c:2248 |
ef317cd5 | 2619 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 2620 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 2621 | |
90314792 | 2622 | #: builtin/blame.c:2249 |
ef317cd5 | 2623 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 2624 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 2625 | |
90314792 | 2626 | #: builtin/blame.c:2250 |
ef317cd5 | 2627 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 2628 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 2629 | |
90314792 | 2630 | #: builtin/blame.c:2251 |
ef317cd5 | 2631 | msgid "Show work cost statistics" |
07432cef | 2632 | msgstr "显示命令消耗统计" |
ef317cd5 | 2633 | |
90314792 | 2634 | #: builtin/blame.c:2252 |
ef317cd5 | 2635 | msgid "Show output score for blame entries" |
07432cef | 2636 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 2637 | |
90314792 | 2638 | #: builtin/blame.c:2253 |
ef317cd5 | 2639 | msgid "Show original filename (Default: auto)" |
07432cef | 2640 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 2641 | |
90314792 | 2642 | #: builtin/blame.c:2254 |
ef317cd5 | 2643 | msgid "Show original linenumber (Default: off)" |
07432cef | 2644 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 2645 | |
90314792 | 2646 | #: builtin/blame.c:2255 |
ef317cd5 | 2647 | msgid "Show in a format designed for machine consumption" |
07432cef | 2648 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 2649 | |
90314792 | 2650 | #: builtin/blame.c:2256 |
ef317cd5 | 2651 | msgid "Show porcelain format with per-line commit information" |
07432cef | 2652 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 2653 | |
90314792 | 2654 | #: builtin/blame.c:2257 |
ef317cd5 | 2655 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 2656 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 2657 | |
90314792 | 2658 | #: builtin/blame.c:2258 |
ef317cd5 | 2659 | msgid "Show raw timestamp (Default: off)" |
07432cef | 2660 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 2661 | |
90314792 | 2662 | #: builtin/blame.c:2259 |
ef317cd5 | 2663 | msgid "Show long commit SHA1 (Default: off)" |
07432cef | 2664 | msgstr "显示长的SHA1提交号(默认:关闭)" |
ef317cd5 | 2665 | |
90314792 | 2666 | #: builtin/blame.c:2260 |
ef317cd5 | 2667 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 2668 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 2669 | |
90314792 | 2670 | #: builtin/blame.c:2261 |
ef317cd5 | 2671 | msgid "Show author email instead of name (Default: off)" |
07432cef | 2672 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 2673 | |
90314792 | 2674 | #: builtin/blame.c:2262 |
ef317cd5 | 2675 | msgid "Ignore whitespace differences" |
07432cef | 2676 | msgstr "忽略空白差异" |
ef317cd5 | 2677 | |
90314792 | 2678 | #: builtin/blame.c:2263 |
ef317cd5 | 2679 | msgid "Spend extra cycles to find better match" |
07432cef | 2680 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 2681 | |
90314792 | 2682 | #: builtin/blame.c:2264 |
ef317cd5 | 2683 | msgid "Use revisions from <file> instead of calling git-rev-list" |
07432cef | 2684 | msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 2685 | |
90314792 | 2686 | #: builtin/blame.c:2265 |
ef317cd5 | 2687 | msgid "Use <file>'s contents as the final image" |
07432cef | 2688 | msgstr "使用 <file> 的内容作为最终的图片" |
ef317cd5 | 2689 | |
90314792 | 2690 | #: builtin/blame.c:2266 builtin/blame.c:2267 |
ef317cd5 | 2691 | msgid "score" |
07432cef | 2692 | msgstr "得分" |
ef317cd5 | 2693 | |
90314792 | 2694 | #: builtin/blame.c:2266 |
ef317cd5 | 2695 | msgid "Find line copies within and across files" |
07432cef | 2696 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 2697 | |
90314792 | 2698 | #: builtin/blame.c:2267 |
ef317cd5 | 2699 | msgid "Find line movements within and across files" |
07432cef | 2700 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 2701 | |
90314792 | 2702 | #: builtin/blame.c:2268 |
ef317cd5 | 2703 | msgid "n,m" |
07432cef | 2704 | msgstr "n,m" |
ef317cd5 | 2705 | |
90314792 | 2706 | #: builtin/blame.c:2268 |
ef317cd5 | 2707 | msgid "Process only line range n,m, counting from 1" |
07432cef | 2708 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 2709 | |
1003b3a5 | 2710 | #: builtin/branch.c:24 |
ef317cd5 | 2711 | msgid "git branch [options] [-r | -a] [--merged | --no-merged]" |
07432cef | 2712 | msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" |
ef317cd5 | 2713 | |
1003b3a5 | 2714 | #: builtin/branch.c:25 |
ef317cd5 | 2715 | msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" |
07432cef | 2716 | msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]" |
ef317cd5 | 2717 | |
1003b3a5 | 2718 | #: builtin/branch.c:26 |
ef317cd5 | 2719 | msgid "git branch [options] [-r] (-d | -D) <branchname>..." |
07432cef | 2720 | msgstr "git branch [选项] [-r] (-d | -D) <分支名>..." |
ef317cd5 | 2721 | |
1003b3a5 | 2722 | #: builtin/branch.c:27 |
ef317cd5 | 2723 | msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" |
07432cef | 2724 | msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" |
ef317cd5 | 2725 | |
90e6ef53 | 2726 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
4dcdc3d8 | 2727 | #: builtin/branch.c:150 |
c04f5ac3 JX |
2728 | #, c-format |
2729 | msgid "" | |
2730 | "deleting branch '%s' that has been merged to\n" | |
2731 | " '%s', but not yet merged to HEAD." | |
2732 | msgstr "" | |
70fc47bf | 2733 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
2734 | " '%s',但未合并到 HEAD。" |
2735 | ||
90e6ef53 | 2736 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
4dcdc3d8 | 2737 | #: builtin/branch.c:154 |
c04f5ac3 JX |
2738 | #, c-format |
2739 | msgid "" | |
2740 | "not deleting branch '%s' that is not yet merged to\n" | |
2741 | " '%s', even though it is merged to HEAD." | |
2742 | msgstr "" | |
70fc47bf T |
2743 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
2744 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 2745 | |
4dcdc3d8 | 2746 | #: builtin/branch.c:168 |
07432cef WS |
2747 | #, c-format |
2748 | msgid "Couldn't look up commit object for '%s'" | |
2749 | msgstr "无法查询 '%s' 指向的提交对象" | |
2750 | ||
4dcdc3d8 | 2751 | #: builtin/branch.c:172 |
07432cef WS |
2752 | #, c-format |
2753 | msgid "" | |
2754 | "The branch '%s' is not fully merged.\n" | |
2755 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
2756 | msgstr "" | |
2757 | "分支 '%s' 没有完全合并。\n" | |
2758 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
2759 | ||
4dcdc3d8 | 2760 | #: builtin/branch.c:185 |
07432cef WS |
2761 | msgid "Update of config-file failed" |
2762 | msgstr "无法更新 config 文件" | |
2763 | ||
4dcdc3d8 | 2764 | #: builtin/branch.c:213 |
c04f5ac3 | 2765 | msgid "cannot use -a with -d" |
649900bc | 2766 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 2767 | |
4dcdc3d8 | 2768 | #: builtin/branch.c:219 |
c04f5ac3 JX |
2769 | msgid "Couldn't look up commit object for HEAD" |
2770 | msgstr "无法查询 HEAD 指向的提交对象" | |
2771 | ||
4dcdc3d8 | 2772 | #: builtin/branch.c:227 |
c04f5ac3 JX |
2773 | #, c-format |
2774 | msgid "Cannot delete the branch '%s' which you are currently on." | |
2775 | msgstr "无法删除您当前所在的分支 '%s'。" | |
2776 | ||
4dcdc3d8 | 2777 | #: builtin/branch.c:240 |
5ae481e0 | 2778 | #, c-format |
8ada9598 | 2779 | msgid "remote branch '%s' not found." |
81809b99 | 2780 | msgstr "远程分支 '%s' 未发现。" |
c04f5ac3 | 2781 | |
4dcdc3d8 | 2782 | #: builtin/branch.c:241 |
81809b99 | 2783 | #, c-format |
8ada9598 | 2784 | msgid "branch '%s' not found." |
81809b99 | 2785 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 2786 | |
4dcdc3d8 | 2787 | #: builtin/branch.c:255 |
81809b99 | 2788 | #, c-format |
8ada9598 | 2789 | msgid "Error deleting remote branch '%s'" |
81809b99 | 2790 | msgstr "删除远程分支 '%s' 时出错" |
c04f5ac3 | 2791 | |
4dcdc3d8 | 2792 | #: builtin/branch.c:256 |
81809b99 | 2793 | #, c-format |
8ada9598 | 2794 | msgid "Error deleting branch '%s'" |
81809b99 | 2795 | msgstr "删除分支 '%s' 时出错" |
8ada9598 | 2796 | |
4dcdc3d8 | 2797 | #: builtin/branch.c:263 |
81809b99 | 2798 | #, c-format |
8ada9598 | 2799 | msgid "Deleted remote branch %s (was %s).\n" |
81809b99 | 2800 | msgstr "已删除远程分支 %s(曾为 %s)。\n" |
c04f5ac3 | 2801 | |
4dcdc3d8 | 2802 | #: builtin/branch.c:264 |
81809b99 | 2803 | #, c-format |
8ada9598 | 2804 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 2805 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 2806 | |
4dcdc3d8 | 2807 | #: builtin/branch.c:366 |
c04f5ac3 JX |
2808 | #, c-format |
2809 | msgid "branch '%s' does not point at a commit" | |
2810 | msgstr "分支 '%s' 未指向一个提交" | |
2811 | ||
4dcdc3d8 | 2812 | #: builtin/branch.c:453 |
81809b99 | 2813 | #, c-format |
90314792 JX |
2814 | msgid "[%s: gone]" |
2815 | msgstr "[%s: 丢失]" | |
2816 | ||
2817 | #: builtin/branch.c:456 | |
2818 | #, c-format | |
2819 | msgid "[%s]" | |
2820 | msgstr "[%s]" | |
2821 | ||
2822 | #: builtin/branch.c:459 | |
2823 | #, c-format | |
8ada9598 | 2824 | msgid "[%s: behind %d]" |
81809b99 | 2825 | msgstr "[%s:落后 %d]" |
c04f5ac3 | 2826 | |
90314792 | 2827 | #: builtin/branch.c:461 |
81809b99 | 2828 | #, c-format |
8ada9598 | 2829 | msgid "[behind %d]" |
81809b99 | 2830 | msgstr "[落后 %d]" |
8ada9598 | 2831 | |
90314792 | 2832 | #: builtin/branch.c:465 |
81809b99 | 2833 | #, c-format |
8ada9598 | 2834 | msgid "[%s: ahead %d]" |
81809b99 | 2835 | msgstr "[%s:领先 %d]" |
c04f5ac3 | 2836 | |
90314792 | 2837 | #: builtin/branch.c:467 |
81809b99 | 2838 | #, c-format |
8ada9598 | 2839 | msgid "[ahead %d]" |
81809b99 | 2840 | msgstr "[领先 %d]" |
8ada9598 | 2841 | |
90314792 | 2842 | #: builtin/branch.c:470 |
81809b99 | 2843 | #, c-format |
8ada9598 | 2844 | msgid "[%s: ahead %d, behind %d]" |
81809b99 | 2845 | msgstr "[%s:领先 %d,落后 %d]" |
8ada9598 | 2846 | |
90314792 | 2847 | #: builtin/branch.c:473 |
81809b99 | 2848 | #, c-format |
8ada9598 | 2849 | msgid "[ahead %d, behind %d]" |
81809b99 | 2850 | msgstr "[领先 %d,落后 %d]" |
c04f5ac3 | 2851 | |
90314792 | 2852 | #: builtin/branch.c:496 |
a77c07d9 JX |
2853 | msgid " **** invalid ref ****" |
2854 | msgstr " **** 无效引用 ****" | |
2855 | ||
90314792 | 2856 | #: builtin/branch.c:588 |
1003b3a5 JX |
2857 | #, c-format |
2858 | msgid "(no branch, rebasing %s)" | |
2859 | msgstr "(非分支,正变基 %s)" | |
2860 | ||
90314792 | 2861 | #: builtin/branch.c:591 |
1003b3a5 JX |
2862 | #, c-format |
2863 | msgid "(no branch, bisect started on %s)" | |
2864 | msgstr "(非分支,二分查找开始于 %s)" | |
2865 | ||
90314792 | 2866 | #: builtin/branch.c:594 |
1003b3a5 JX |
2867 | #, c-format |
2868 | msgid "(detached from %s)" | |
2869 | msgstr "(分离自 %s)" | |
2870 | ||
90314792 | 2871 | #: builtin/branch.c:597 |
c04f5ac3 JX |
2872 | msgid "(no branch)" |
2873 | msgstr "(非分支)" | |
2874 | ||
90314792 | 2875 | #: builtin/branch.c:643 |
a77c07d9 JX |
2876 | #, c-format |
2877 | msgid "object '%s' does not point to a commit" | |
2878 | msgstr "对象 '%s' 没有指向一个提交" | |
2879 | ||
90314792 | 2880 | #: builtin/branch.c:675 |
c04f5ac3 | 2881 | msgid "some refs could not be read" |
90e6ef53 | 2882 | msgstr "一些引用不能读取" |
c04f5ac3 | 2883 | |
90314792 | 2884 | #: builtin/branch.c:688 |
c04f5ac3 | 2885 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 2886 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 2887 | |
90314792 | 2888 | #: builtin/branch.c:698 |
c04f5ac3 JX |
2889 | #, c-format |
2890 | msgid "Invalid branch name: '%s'" | |
2891 | msgstr "无效的分支名:'%s'" | |
2892 | ||
90314792 | 2893 | #: builtin/branch.c:713 |
c04f5ac3 JX |
2894 | msgid "Branch rename failed" |
2895 | msgstr "分支重命名失败" | |
2896 | ||
90314792 | 2897 | #: builtin/branch.c:717 |
c04f5ac3 JX |
2898 | #, c-format |
2899 | msgid "Renamed a misnamed branch '%s' away" | |
2900 | msgstr "重命名掉一个错误命名的旧分支 '%s'" | |
2901 | ||
90314792 | 2902 | #: builtin/branch.c:721 |
c04f5ac3 JX |
2903 | #, c-format |
2904 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
2905 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
2906 | ||
90314792 | 2907 | #: builtin/branch.c:728 |
c04f5ac3 JX |
2908 | msgid "Branch is renamed, but update of config-file failed" |
2909 | msgstr "分支被重命名,但更新 config 文件失败" | |
2910 | ||
90314792 | 2911 | #: builtin/branch.c:743 |
c04f5ac3 JX |
2912 | #, c-format |
2913 | msgid "malformed object name %s" | |
2914 | msgstr "非法的对象名 %s" | |
2915 | ||
90314792 | 2916 | #: builtin/branch.c:767 |
81809b99 | 2917 | #, c-format |
8ada9598 | 2918 | msgid "could not write branch description template: %s" |
81809b99 | 2919 | msgstr "不能写分支描述模版:%s" |
c04f5ac3 | 2920 | |
90314792 | 2921 | #: builtin/branch.c:797 |
ef317cd5 | 2922 | msgid "Generic options" |
07432cef | 2923 | msgstr "通用选项" |
c04f5ac3 | 2924 | |
90314792 | 2925 | #: builtin/branch.c:799 |
ef317cd5 | 2926 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 2927 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 2928 | |
90314792 | 2929 | #: builtin/branch.c:800 |
ef317cd5 | 2930 | msgid "suppress informational messages" |
07432cef | 2931 | msgstr "不显示信息" |
8ada9598 | 2932 | |
90314792 | 2933 | #: builtin/branch.c:801 |
ef317cd5 | 2934 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 2935 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 2936 | |
90314792 | 2937 | #: builtin/branch.c:803 |
ef317cd5 | 2938 | msgid "change upstream info" |
07432cef | 2939 | msgstr "改变上游信息" |
c04f5ac3 | 2940 | |
90314792 | 2941 | #: builtin/branch.c:807 |
ef317cd5 | 2942 | msgid "use colored output" |
07432cef | 2943 | msgstr "使用彩色输出" |
c04f5ac3 | 2944 | |
90314792 | 2945 | #: builtin/branch.c:808 |
ef317cd5 | 2946 | msgid "act on remote-tracking branches" |
07432cef | 2947 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 2948 | |
90314792 JX |
2949 | #: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 |
2950 | #: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 | |
2951 | #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 | |
ef317cd5 | 2952 | msgid "commit" |
07432cef | 2953 | msgstr "提交" |
c04f5ac3 | 2954 | |
90314792 | 2955 | #: builtin/branch.c:812 builtin/branch.c:818 |
ef317cd5 | 2956 | msgid "print only branches that contain the commit" |
07432cef | 2957 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 2958 | |
90314792 | 2959 | #: builtin/branch.c:824 |
ef317cd5 | 2960 | msgid "Specific git-branch actions:" |
07432cef | 2961 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 2962 | |
90314792 | 2963 | #: builtin/branch.c:825 |
ef317cd5 | 2964 | msgid "list both remote-tracking and local branches" |
07432cef | 2965 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 2966 | |
90314792 | 2967 | #: builtin/branch.c:827 |
ef317cd5 | 2968 | msgid "delete fully merged branch" |
07432cef | 2969 | msgstr "删除完全合并的分支" |
c04f5ac3 | 2970 | |
90314792 | 2971 | #: builtin/branch.c:828 |
ef317cd5 | 2972 | msgid "delete branch (even if not merged)" |
07432cef | 2973 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 2974 | |
90314792 | 2975 | #: builtin/branch.c:829 |
ef317cd5 | 2976 | msgid "move/rename a branch and its reflog" |
07432cef | 2977 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 2978 | |
90314792 | 2979 | #: builtin/branch.c:830 |
ef317cd5 | 2980 | msgid "move/rename a branch, even if target exists" |
07432cef | 2981 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 2982 | |
90314792 | 2983 | #: builtin/branch.c:831 |
ef317cd5 | 2984 | msgid "list branch names" |
07432cef | 2985 | msgstr "列出分支名" |
c04f5ac3 | 2986 | |
90314792 | 2987 | #: builtin/branch.c:832 |
ef317cd5 | 2988 | msgid "create the branch's reflog" |
07432cef | 2989 | msgstr "创建分支的引用日志" |
ef317cd5 | 2990 | |
90314792 | 2991 | #: builtin/branch.c:834 |
ef317cd5 | 2992 | msgid "edit the description for the branch" |
07432cef | 2993 | msgstr "标记分支的描述" |
ef317cd5 | 2994 | |
90314792 | 2995 | #: builtin/branch.c:835 |
ef317cd5 | 2996 | msgid "force creation (when already exists)" |
07432cef | 2997 | msgstr "强制创建(当已经存在)" |
ef317cd5 | 2998 | |
90314792 | 2999 | #: builtin/branch.c:838 |
ef317cd5 | 3000 | msgid "print only not merged branches" |
07432cef | 3001 | msgstr "只打印没有合并的分支" |
ef317cd5 | 3002 | |
90314792 | 3003 | #: builtin/branch.c:844 |
ef317cd5 | 3004 | msgid "print only merged branches" |
07432cef | 3005 | msgstr "只打印合并的分支" |
ef317cd5 | 3006 | |
90314792 | 3007 | #: builtin/branch.c:848 |
ef317cd5 | 3008 | msgid "list branches in columns" |
07432cef | 3009 | msgstr "以列的方式显示分支" |
ef317cd5 | 3010 | |
90314792 | 3011 | #: builtin/branch.c:861 |
c04f5ac3 JX |
3012 | msgid "Failed to resolve HEAD as a valid ref." |
3013 | msgstr "无法将 HEAD 解析为有效引用。" | |
3014 | ||
90314792 | 3015 | #: builtin/branch.c:866 builtin/clone.c:629 |
c04f5ac3 | 3016 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 3017 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 3018 | |
90314792 | 3019 | #: builtin/branch.c:890 |
8ada9598 | 3020 | msgid "--column and --verbose are incompatible" |
81809b99 | 3021 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 3022 | |
90314792 | 3023 | #: builtin/branch.c:896 builtin/branch.c:935 |
a77c07d9 JX |
3024 | msgid "branch name required" |
3025 | msgstr "必须提供分支名" | |
3026 | ||
90314792 | 3027 | #: builtin/branch.c:911 |
a77c07d9 JX |
3028 | msgid "Cannot give description to detached HEAD" |
3029 | msgstr "不能向分离头指针提供描述" | |
3030 | ||
90314792 | 3031 | #: builtin/branch.c:916 |
a77c07d9 JX |
3032 | msgid "cannot edit description of more than one branch" |
3033 | msgstr "不能为一个以上的分支编辑描述" | |
3034 | ||
90314792 | 3035 | #: builtin/branch.c:923 |
a77c07d9 JX |
3036 | #, c-format |
3037 | msgid "No commit on branch '%s' yet." | |
3038 | msgstr "分支 '%s' 尚无提交。" | |
3039 | ||
90314792 | 3040 | #: builtin/branch.c:926 |
a77c07d9 JX |
3041 | #, c-format |
3042 | msgid "No branch named '%s'." | |
3043 | msgstr "没有分支 '%s'。" | |
3044 | ||
90314792 | 3045 | #: builtin/branch.c:941 |
a77c07d9 JX |
3046 | msgid "too many branches for a rename operation" |
3047 | msgstr "为重命名操作提供了太多的分支名" | |
3048 | ||
90314792 | 3049 | #: builtin/branch.c:946 |
1003b3a5 JX |
3050 | msgid "too many branches to set new upstream" |
3051 | msgstr "为设置新上游提供了太多的分支名" | |
3052 | ||
90314792 | 3053 | #: builtin/branch.c:950 |
1003b3a5 JX |
3054 | #, c-format |
3055 | msgid "" | |
3056 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
3057 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
3058 | ||
90314792 | 3059 | #: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997 |
1003b3a5 JX |
3060 | #, c-format |
3061 | msgid "no such branch '%s'" | |
3062 | msgstr "没有此分支 '%s'" | |
3063 | ||
90314792 | 3064 | #: builtin/branch.c:957 |
07432cef | 3065 | #, c-format |
ef317cd5 | 3066 | msgid "branch '%s' does not exist" |
07432cef | 3067 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 3068 | |
90314792 | 3069 | #: builtin/branch.c:969 |
1003b3a5 JX |
3070 | msgid "too many branches to unset upstream" |
3071 | msgstr "为取消上游设置操作提供了太多的分支名" | |
3072 | ||
90314792 | 3073 | #: builtin/branch.c:973 |
1003b3a5 JX |
3074 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
3075 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
3076 | ||
90314792 | 3077 | #: builtin/branch.c:979 |
ef317cd5 JX |
3078 | #, c-format |
3079 | msgid "Branch '%s' has no upstream information" | |
07432cef | 3080 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 3081 | |
90314792 | 3082 | #: builtin/branch.c:994 |
1003b3a5 JX |
3083 | msgid "it does not make sense to create 'HEAD' manually" |
3084 | msgstr "手工创建 'HEAD' 没有意义" | |
3085 | ||
90314792 | 3086 | #: builtin/branch.c:1000 |
c04f5ac3 JX |
3087 | msgid "-a and -r options to 'git branch' do not make sense with a branch name" |
3088 | msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" | |
3089 | ||
90314792 | 3090 | #: builtin/branch.c:1003 |
ef317cd5 JX |
3091 | #, c-format |
3092 | msgid "" | |
3093 | "The --set-upstream flag is deprecated and will be removed. Consider using --" | |
3094 | "track or --set-upstream-to\n" | |
3095 | msgstr "" | |
07432cef | 3096 | "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" |
ef317cd5 | 3097 | |
90314792 | 3098 | #: builtin/branch.c:1020 |
ef317cd5 JX |
3099 | #, c-format |
3100 | msgid "" | |
3101 | "\n" | |
3102 | "If you wanted to make '%s' track '%s', do this:\n" | |
3103 | "\n" | |
3104 | msgstr "" | |
07432cef WS |
3105 | "\n" |
3106 | "如果你想用 '%s' 跟踪 '%s', 这么做:\n" | |
3107 | "\n" | |
ef317cd5 | 3108 | |
90314792 | 3109 | #: builtin/branch.c:1021 |
07432cef | 3110 | #, c-format |
ef317cd5 | 3111 | msgid " git branch -d %s\n" |
07432cef | 3112 | msgstr " git branch -d %s\n" |
ef317cd5 | 3113 | |
90314792 | 3114 | #: builtin/branch.c:1022 |
ef317cd5 JX |
3115 | #, c-format |
3116 | msgid " git branch --set-upstream-to %s\n" | |
07432cef | 3117 | msgstr " git branch --set-upstream-to %s\n" |
ef317cd5 | 3118 | |
c04f5ac3 JX |
3119 | #: builtin/bundle.c:47 |
3120 | #, c-format | |
3121 | msgid "%s is okay\n" | |
3122 | msgstr "%s 可以\n" | |
3123 | ||
3124 | #: builtin/bundle.c:56 | |
3125 | msgid "Need a repository to create a bundle." | |
90e6ef53 | 3126 | msgstr "需要一个版本库来创建包。" |
c04f5ac3 JX |
3127 | |
3128 | #: builtin/bundle.c:60 | |
3129 | msgid "Need a repository to unbundle." | |
90e6ef53 | 3130 | msgstr "需要一个版本库来解包。" |
c04f5ac3 | 3131 | |
90314792 | 3132 | #: builtin/cat-file.c:312 |
ef317cd5 | 3133 | msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" |
07432cef | 3134 | msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" |
ef317cd5 | 3135 | |
90314792 | 3136 | #: builtin/cat-file.c:313 |
ef317cd5 | 3137 | msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" |
07432cef | 3138 | msgstr "git cat-file (--batch|--batch-check) < <对象列表>" |
ef317cd5 | 3139 | |
90314792 | 3140 | #: builtin/cat-file.c:350 |
ef317cd5 | 3141 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 3142 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 3143 | |
90314792 | 3144 | #: builtin/cat-file.c:351 |
ef317cd5 | 3145 | msgid "show object type" |
07432cef | 3146 | msgstr "显示对象类型" |
ef317cd5 | 3147 | |
90314792 | 3148 | #: builtin/cat-file.c:352 |
ef317cd5 | 3149 | msgid "show object size" |
07432cef | 3150 | msgstr "显示对象大小" |
ef317cd5 | 3151 | |
90314792 | 3152 | #: builtin/cat-file.c:354 |
ef317cd5 | 3153 | msgid "exit with zero when there's no error" |
07432cef | 3154 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 3155 | |
90314792 | 3156 | #: builtin/cat-file.c:355 |
ef317cd5 | 3157 | msgid "pretty-print object's content" |
07432cef | 3158 | msgstr "美观地打印对象的内容" |
ef317cd5 | 3159 | |
90314792 | 3160 | #: builtin/cat-file.c:357 |
ef317cd5 | 3161 | msgid "for blob objects, run textconv on object's content" |
07432cef | 3162 | msgstr "对于数据(blob)对象,对其内容执行 textconv" |
ef317cd5 | 3163 | |
90314792 | 3164 | #: builtin/cat-file.c:359 |
ef317cd5 | 3165 | msgid "show info and content of objects fed from the standard input" |
07432cef | 3166 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 3167 | |
90314792 | 3168 | #: builtin/cat-file.c:362 |
ef317cd5 | 3169 | msgid "show info about objects fed from the standard input" |
07432cef | 3170 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 JX |
3171 | |
3172 | #: builtin/check-attr.c:11 | |
3173 | msgid "git check-attr [-a | --all | attr...] [--] pathname..." | |
07432cef | 3174 | msgstr "git check-attr [-a | --all | attr...] [--] 路径名..." |
ef317cd5 JX |
3175 | |
3176 | #: builtin/check-attr.c:12 | |
07432cef WS |
3177 | msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" |
3178 | msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" | |
ef317cd5 JX |
3179 | |
3180 | #: builtin/check-attr.c:19 | |
3181 | msgid "report all attributes set on file" | |
07432cef | 3182 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 JX |
3183 | |
3184 | #: builtin/check-attr.c:20 | |
3185 | msgid "use .gitattributes only from the index" | |
07432cef | 3186 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 3187 | |
a77c07d9 | 3188 | #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 |
ef317cd5 | 3189 | msgid "read file names from stdin" |
07432cef | 3190 | msgstr "从标准输入读出文件名" |
ef317cd5 | 3191 | |
a77c07d9 | 3192 | #: builtin/check-attr.c:23 builtin/check-ignore.c:24 |
90314792 JX |
3193 | msgid "terminate input and output records by a NUL character" |
3194 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 3195 | |
90314792 | 3196 | #: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259 |
a77c07d9 JX |
3197 | msgid "suppress progress reporting" |
3198 | msgstr "不显示进度报告" | |
3199 | ||
2e8451e8 JX |
3200 | #: builtin/check-ignore.c:26 |
3201 | msgid "show non-matching input paths" | |
3202 | msgstr "显示未匹配的输入路径" | |
3203 | ||
90314792 JX |
3204 | #: builtin/check-ignore.c:28 |
3205 | msgid "ignore index when checking" | |
3206 | msgstr "检查时忽略索引" | |
3207 | ||
3208 | #: builtin/check-ignore.c:154 | |
a77c07d9 JX |
3209 | msgid "cannot specify pathnames with --stdin" |
3210 | msgstr "不能同时提供路径及 --stdin 参数" | |
3211 | ||
90314792 | 3212 | #: builtin/check-ignore.c:157 |
a77c07d9 JX |
3213 | msgid "-z only makes sense with --stdin" |
3214 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
3215 | ||
90314792 | 3216 | #: builtin/check-ignore.c:159 |
a77c07d9 JX |
3217 | msgid "no path specified" |
3218 | msgstr "未指定路径" | |
3219 | ||
90314792 | 3220 | #: builtin/check-ignore.c:163 |
a77c07d9 JX |
3221 | msgid "--quiet is only valid with a single pathname" |
3222 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
3223 | ||
90314792 | 3224 | #: builtin/check-ignore.c:165 |
a77c07d9 JX |
3225 | msgid "cannot have both --quiet and --verbose" |
3226 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
3227 | ||
90314792 | 3228 | #: builtin/check-ignore.c:168 |
2e8451e8 JX |
3229 | msgid "--non-matching is only valid with --verbose" |
3230 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
3231 | ||
3232 | #: builtin/check-mailmap.c:8 | |
3233 | msgid "git check-mailmap [options] <contact>..." | |
3234 | msgstr "git check-mailmap [选项] <联系地址>..." | |
3235 | ||
3236 | #: builtin/check-mailmap.c:13 | |
3237 | msgid "also read contacts from stdin" | |
3238 | msgstr "还从标准输入读取联系地址" | |
3239 | ||
3240 | #: builtin/check-mailmap.c:24 | |
3241 | #, c-format | |
3242 | msgid "unable to parse contact: %s" | |
3243 | msgstr "不能解析联系地址:%s" | |
3244 | ||
3245 | #: builtin/check-mailmap.c:47 | |
3246 | msgid "no contacts specified" | |
3247 | msgstr "未指定联系地址" | |
3248 | ||
ef317cd5 JX |
3249 | #: builtin/checkout-index.c:126 |
3250 | msgid "git checkout-index [options] [--] [<file>...]" | |
07432cef | 3251 | msgstr "git checkout-index [选项] [--] [<文件>...]" |
ef317cd5 JX |
3252 | |
3253 | #: builtin/checkout-index.c:187 | |
3254 | msgid "check out all files in the index" | |
07432cef | 3255 | msgstr "检出索引区的所有文件" |
ef317cd5 JX |
3256 | |
3257 | #: builtin/checkout-index.c:188 | |
3258 | msgid "force overwrite of existing files" | |
07432cef | 3259 | msgstr "强制覆盖现有的文件" |
ef317cd5 JX |
3260 | |
3261 | #: builtin/checkout-index.c:190 | |
3262 | msgid "no warning for existing files and files not in index" | |
07432cef | 3263 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 JX |
3264 | |
3265 | #: builtin/checkout-index.c:192 | |
ef317cd5 | 3266 | msgid "don't checkout new files" |
07432cef | 3267 | msgstr "不检出新文件" |
ef317cd5 JX |
3268 | |
3269 | #: builtin/checkout-index.c:194 | |
ef317cd5 | 3270 | msgid "update stat information in the index file" |
07432cef | 3271 | msgstr "更新索引中文件的状态信息" |
ef317cd5 JX |
3272 | |
3273 | #: builtin/checkout-index.c:200 | |
ef317cd5 | 3274 | msgid "read list of paths from the standard input" |
07432cef | 3275 | msgstr "从标准输入读取路径列表" |
ef317cd5 JX |
3276 | |
3277 | #: builtin/checkout-index.c:202 | |
3278 | msgid "write the content to temporary files" | |
07432cef | 3279 | msgstr "将内容写入临时文件" |
ef317cd5 JX |
3280 | |
3281 | #: builtin/checkout-index.c:203 builtin/column.c:30 | |
3282 | msgid "string" | |
07432cef | 3283 | msgstr "字符串" |
ef317cd5 JX |
3284 | |
3285 | #: builtin/checkout-index.c:204 | |
3286 | msgid "when creating files, prepend <string>" | |
07432cef | 3287 | msgstr "在创建文件时,在前面加上<字符串>" |
ef317cd5 JX |
3288 | |
3289 | #: builtin/checkout-index.c:207 | |
3290 | msgid "copy out the files from named stage" | |
07432cef | 3291 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 JX |
3292 | |
3293 | #: builtin/checkout.c:25 | |
ef317cd5 | 3294 | msgid "git checkout [options] <branch>" |
07432cef | 3295 | msgstr "git checkout [选项] <分支>" |
ef317cd5 JX |
3296 | |
3297 | #: builtin/checkout.c:26 | |
ef317cd5 | 3298 | msgid "git checkout [options] [<branch>] -- <file>..." |
07432cef | 3299 | msgstr "git checkout [选项] [<分支>] -- <文件>..." |
ef317cd5 | 3300 | |
90314792 | 3301 | #: builtin/checkout.c:114 builtin/checkout.c:147 |
c04f5ac3 JX |
3302 | #, c-format |
3303 | msgid "path '%s' does not have our version" | |
3304 | msgstr "路径 '%s' 没有我们的版本" | |
3305 | ||
90314792 | 3306 | #: builtin/checkout.c:116 builtin/checkout.c:149 |
c04f5ac3 JX |
3307 | #, c-format |
3308 | msgid "path '%s' does not have their version" | |
3309 | msgstr "路径 '%s' 没有他们的版本" | |
3310 | ||
90314792 | 3311 | #: builtin/checkout.c:132 |
c04f5ac3 JX |
3312 | #, c-format |
3313 | msgid "path '%s' does not have all necessary versions" | |
3314 | msgstr "路径 '%s' 没有全部必须的版本" | |
3315 | ||
90314792 | 3316 | #: builtin/checkout.c:176 |
c04f5ac3 JX |
3317 | #, c-format |
3318 | msgid "path '%s' does not have necessary versions" | |
3319 | msgstr "路径 '%s' 没有必须的版本" | |
3320 | ||
90314792 | 3321 | #: builtin/checkout.c:193 |
c04f5ac3 JX |
3322 | #, c-format |
3323 | msgid "path '%s': cannot merge" | |
90e6ef53 | 3324 | msgstr "path '%s':无法合并" |
c04f5ac3 | 3325 | |
90314792 | 3326 | #: builtin/checkout.c:210 |
c04f5ac3 JX |
3327 | #, c-format |
3328 | msgid "Unable to add merge result for '%s'" | |
3329 | msgstr "无法为 '%s' 添加合并结果" | |
3330 | ||
90314792 JX |
3331 | #: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238 |
3332 | #: builtin/checkout.c:241 | |
07432cef | 3333 | #, c-format |
ef317cd5 | 3334 | msgid "'%s' cannot be used with updating paths" |
07432cef | 3335 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 3336 | |
90314792 | 3337 | #: builtin/checkout.c:244 builtin/checkout.c:247 |
07432cef | 3338 | #, c-format |
ef317cd5 | 3339 | msgid "'%s' cannot be used with %s" |
07432cef | 3340 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 3341 | |
90314792 | 3342 | #: builtin/checkout.c:250 |
ef317cd5 JX |
3343 | #, c-format |
3344 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 3345 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 3346 | |
90314792 | 3347 | #: builtin/checkout.c:261 builtin/checkout.c:451 |
c04f5ac3 | 3348 | msgid "corrupt index file" |
90e6ef53 | 3349 | msgstr "损坏的索引文件" |
c04f5ac3 | 3350 | |
90314792 | 3351 | #: builtin/checkout.c:322 builtin/checkout.c:329 |
c04f5ac3 JX |
3352 | #, c-format |
3353 | msgid "path '%s' is unmerged" | |
3354 | msgstr "路径 '%s' 未合并" | |
3355 | ||
90314792 | 3356 | #: builtin/checkout.c:473 |
c04f5ac3 | 3357 | msgid "you need to resolve your current index first" |
90e6ef53 | 3358 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 3359 | |
90314792 | 3360 | #: builtin/checkout.c:594 |
c04f5ac3 JX |
3361 | #, c-format |
3362 | msgid "Can not do reflog for '%s'\n" | |
90e6ef53 | 3363 | msgstr "不能对 '%s' 执行 reflog 操作\n" |
c04f5ac3 | 3364 | |
90314792 | 3365 | #: builtin/checkout.c:632 |
c04f5ac3 JX |
3366 | msgid "HEAD is now at" |
3367 | msgstr "HEAD 目前位于" | |
3368 | ||
90314792 | 3369 | #: builtin/checkout.c:639 |
c04f5ac3 JX |
3370 | #, c-format |
3371 | msgid "Reset branch '%s'\n" | |
3372 | msgstr "重置分支 '%s'\n" | |
3373 | ||
90314792 | 3374 | #: builtin/checkout.c:642 |
c04f5ac3 JX |
3375 | #, c-format |
3376 | msgid "Already on '%s'\n" | |
3377 | msgstr "已经位于 '%s'\n" | |
3378 | ||
90314792 | 3379 | #: builtin/checkout.c:646 |
c04f5ac3 JX |
3380 | #, c-format |
3381 | msgid "Switched to and reset branch '%s'\n" | |
3382 | msgstr "切换并重置分支 '%s'\n" | |
3383 | ||
90314792 | 3384 | #: builtin/checkout.c:648 builtin/checkout.c:1033 |
c04f5ac3 JX |
3385 | #, c-format |
3386 | msgid "Switched to a new branch '%s'\n" | |
3387 | msgstr "切换到一个新分支 '%s'\n" | |
3388 | ||
90314792 | 3389 | #: builtin/checkout.c:650 |
c04f5ac3 JX |
3390 | #, c-format |
3391 | msgid "Switched to branch '%s'\n" | |
3392 | msgstr "切换到分支 '%s'\n" | |
3393 | ||
90e6ef53 | 3394 | # 译者:注意保持前导空格 |
90314792 | 3395 | #: builtin/checkout.c:706 |
c04f5ac3 JX |
3396 | #, c-format |
3397 | msgid " ... and %d more.\n" | |
90e6ef53 | 3398 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 JX |
3399 | |
3400 | #. The singular version | |
90314792 | 3401 | #: builtin/checkout.c:712 |
c04f5ac3 JX |
3402 | #, c-format |
3403 | msgid "" | |
3404 | "Warning: you are leaving %d commit behind, not connected to\n" | |
3405 | "any of your branches:\n" | |
3406 | "\n" | |
3407 | "%s\n" | |
3408 | msgid_plural "" | |
3409 | "Warning: you are leaving %d commits behind, not connected to\n" | |
3410 | "any of your branches:\n" | |
3411 | "\n" | |
3412 | "%s\n" | |
3413 | msgstr[0] "" | |
3414 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
3415 | "\n" | |
3416 | "%s\n" | |
5ae481e0 JX |
3417 | msgstr[1] "" |
3418 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
3419 | "\n" | |
3420 | "%s\n" | |
c04f5ac3 | 3421 | |
90314792 | 3422 | #: builtin/checkout.c:730 |
c04f5ac3 JX |
3423 | #, c-format |
3424 | msgid "" | |
3425 | "If you want to keep them by creating a new branch, this may be a good time\n" | |
3426 | "to do so with:\n" | |
3427 | "\n" | |
3428 | " git branch new_branch_name %s\n" | |
3429 | "\n" | |
3430 | msgstr "" | |
3431 | "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n" | |
3432 | "如下操作:\n" | |
3433 | "\n" | |
3434 | " git branch new_branch_name %s\n" | |
3435 | "\n" | |
3436 | ||
90314792 | 3437 | #: builtin/checkout.c:760 |
c04f5ac3 JX |
3438 | msgid "internal error in revision walk" |
3439 | msgstr "在版本遍历时遇到内部错误" | |
3440 | ||
90314792 | 3441 | #: builtin/checkout.c:764 |
c04f5ac3 JX |
3442 | msgid "Previous HEAD position was" |
3443 | msgstr "之前的 HEAD 位置是" | |
3444 | ||
90314792 | 3445 | #: builtin/checkout.c:791 builtin/checkout.c:1028 |
c04f5ac3 | 3446 | msgid "You are on a branch yet to be born" |
90e6ef53 | 3447 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 3448 | |
90314792 JX |
3449 | #: builtin/checkout.c:935 |
3450 | #, c-format | |
3451 | msgid "only one reference expected, %d given." | |
3452 | msgstr "只要一个引用,却给出了 %d 个" | |
3453 | ||
3454 | #: builtin/checkout.c:974 | |
c04f5ac3 JX |
3455 | #, c-format |
3456 | msgid "invalid reference: %s" | |
3457 | msgstr "无效引用:%s" | |
3458 | ||
3459 | #. case (1): want a tree | |
90314792 | 3460 | #: builtin/checkout.c:1003 |
c04f5ac3 JX |
3461 | #, c-format |
3462 | msgid "reference is not a tree: %s" | |
3463 | msgstr "引用不是一个树:%s" | |
3464 | ||
90314792 | 3465 | #: builtin/checkout.c:1042 |
ef317cd5 | 3466 | msgid "paths cannot be used with switching branches" |
07432cef | 3467 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 3468 | |
90314792 | 3469 | #: builtin/checkout.c:1045 builtin/checkout.c:1049 |
07432cef | 3470 | #, c-format |
ef317cd5 | 3471 | msgid "'%s' cannot be used with switching branches" |
07432cef | 3472 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 3473 | |
90314792 JX |
3474 | #: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061 |
3475 | #: builtin/checkout.c:1064 | |
07432cef | 3476 | #, c-format |
ef317cd5 | 3477 | msgid "'%s' cannot be used with '%s'" |
07432cef | 3478 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 3479 | |
90314792 | 3480 | #: builtin/checkout.c:1069 |
07432cef | 3481 | #, c-format |
ef317cd5 | 3482 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 3483 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 3484 | |
90314792 | 3485 | #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 |
ef317cd5 | 3486 | #: builtin/remote.c:169 builtin/remote.c:171 |
ef317cd5 | 3487 | msgid "branch" |
07432cef | 3488 | msgstr "分支" |
c04f5ac3 | 3489 | |
90314792 | 3490 | #: builtin/checkout.c:1092 |
ef317cd5 | 3491 | msgid "create and checkout a new branch" |
07432cef | 3492 | msgstr "创建并检出一个新的分支" |
c04f5ac3 | 3493 | |
90314792 | 3494 | #: builtin/checkout.c:1094 |
ef317cd5 | 3495 | msgid "create/reset and checkout a branch" |
07432cef | 3496 | msgstr "创建/重置并检出一个分支" |
c04f5ac3 | 3497 | |
90314792 | 3498 | #: builtin/checkout.c:1095 |
ef317cd5 | 3499 | msgid "create reflog for new branch" |
07432cef | 3500 | msgstr "为新的分支创建引用日志" |
ef317cd5 | 3501 | |
90314792 | 3502 | #: builtin/checkout.c:1096 |
ef317cd5 | 3503 | msgid "detach the HEAD at named commit" |
07432cef | 3504 | msgstr "成为指向该提交的分离头指针" |
ef317cd5 | 3505 | |
90314792 | 3506 | #: builtin/checkout.c:1097 |
ef317cd5 | 3507 | msgid "set upstream info for new branch" |
07432cef | 3508 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 3509 | |
90314792 | 3510 | #: builtin/checkout.c:1099 |
ef317cd5 | 3511 | msgid "new branch" |
07432cef | 3512 | msgstr "新分支" |
ef317cd5 | 3513 | |
90314792 | 3514 | #: builtin/checkout.c:1099 |
ef317cd5 | 3515 | msgid "new unparented branch" |
07432cef | 3516 | msgstr "新的没有父提交的分支" |
ef317cd5 | 3517 | |
90314792 | 3518 | #: builtin/checkout.c:1100 |
ef317cd5 | 3519 | msgid "checkout our version for unmerged files" |
07432cef | 3520 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 3521 | |
90314792 | 3522 | #: builtin/checkout.c:1102 |
ef317cd5 | 3523 | msgid "checkout their version for unmerged files" |
07432cef | 3524 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 3525 | |
90314792 | 3526 | #: builtin/checkout.c:1104 |
ef317cd5 | 3527 | msgid "force checkout (throw away local modifications)" |
07432cef | 3528 | msgstr "强制检出(丢弃本地修改)" |
c04f5ac3 | 3529 | |
90314792 | 3530 | #: builtin/checkout.c:1105 |
ef317cd5 | 3531 | msgid "perform a 3-way merge with the new branch" |
07432cef | 3532 | msgstr "和新的分支执行三路合并" |
ef317cd5 | 3533 | |
90314792 | 3534 | #: builtin/checkout.c:1106 builtin/merge.c:232 |
ef317cd5 | 3535 | msgid "update ignored files (default)" |
07432cef | 3536 | msgstr "更新忽略的文件(默认)" |
c04f5ac3 | 3537 | |
90314792 | 3538 | #: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 |
ef317cd5 | 3539 | msgid "style" |
07432cef | 3540 | msgstr "风格" |
ef317cd5 | 3541 | |
90314792 | 3542 | #: builtin/checkout.c:1108 |
ef317cd5 | 3543 | msgid "conflict style (merge or diff3)" |
07432cef | 3544 | msgstr "冲突输出风格(merge 或 diff3)" |
ef317cd5 | 3545 | |
90314792 | 3546 | #: builtin/checkout.c:1111 |
4dcdc3d8 JX |
3547 | msgid "do not limit pathspecs to sparse entries only" |
3548 | msgstr "对路径不做稀疏检出的限制" | |
3549 | ||
90314792 | 3550 | #: builtin/checkout.c:1113 |
ef317cd5 | 3551 | msgid "second guess 'git checkout no-such-branch'" |
07432cef | 3552 | msgstr "再者猜测'git checkout no-such-branch'" |
ef317cd5 | 3553 | |
90314792 | 3554 | #: builtin/checkout.c:1136 |
ef317cd5 | 3555 | msgid "-b, -B and --orphan are mutually exclusive" |
07432cef | 3556 | msgstr "-b、-B 和 --orphan 是互斥的" |
ef317cd5 | 3557 | |
90314792 | 3558 | #: builtin/checkout.c:1153 |
ef317cd5 JX |
3559 | msgid "--track needs a branch name" |
3560 | msgstr "--track 需要一个分支名" | |
3561 | ||
90314792 | 3562 | #: builtin/checkout.c:1160 |
ef317cd5 JX |
3563 | msgid "Missing branch name; try -b" |
3564 | msgstr "缺少分支名;尝试 -b" | |
3565 | ||
90314792 | 3566 | #: builtin/checkout.c:1197 |
c04f5ac3 | 3567 | msgid "invalid path specification" |
90e6ef53 | 3568 | msgstr "无效的路径规格" |
c04f5ac3 | 3569 | |
90314792 | 3570 | #: builtin/checkout.c:1204 |
07432cef | 3571 | #, c-format |
c04f5ac3 | 3572 | msgid "" |
ef317cd5 | 3573 | "Cannot update paths and switch to branch '%s' at the same time.\n" |
c04f5ac3 JX |
3574 | "Did you intend to checkout '%s' which can not be resolved as commit?" |
3575 | msgstr "" | |
07432cef WS |
3576 | "不能同时更新路径并切换到分支'%s'。\n" |
3577 | "您是想要检出 '%s' 但其未能解析为提交么?" | |
c04f5ac3 | 3578 | |
90314792 | 3579 | #: builtin/checkout.c:1209 |
07432cef | 3580 | #, c-format |
ef317cd5 | 3581 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 3582 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 3583 | |
90314792 | 3584 | #: builtin/checkout.c:1213 |
c04f5ac3 JX |
3585 | msgid "" |
3586 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
3587 | "checking out of the index." | |
3588 | msgstr "" | |
90e6ef53 | 3589 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 3590 | |
90314792 | 3591 | #: builtin/clean.c:26 |
2e8451e8 JX |
3592 | msgid "" |
3593 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
3594 | msgstr "" | |
3595 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 3596 | |
90314792 | 3597 | #: builtin/clean.c:30 |
07432cef WS |
3598 | #, c-format |
3599 | msgid "Removing %s\n" | |
3600 | msgstr "正删除 %s\n" | |
3601 | ||
90314792 | 3602 | #: builtin/clean.c:31 |
07432cef WS |
3603 | #, c-format |
3604 | msgid "Would remove %s\n" | |
3605 | msgstr "将删除 %s\n" | |
3606 | ||
90314792 | 3607 | #: builtin/clean.c:32 |
07432cef WS |
3608 | #, c-format |
3609 | msgid "Skipping repository %s\n" | |
3610 | msgstr "忽略版本库 %s\n" | |
3611 | ||
90314792 | 3612 | #: builtin/clean.c:33 |
07432cef WS |
3613 | #, c-format |
3614 | msgid "Would skip repository %s\n" | |
3615 | msgstr "将忽略版本库 %s\n" | |
3616 | ||
90314792 | 3617 | #: builtin/clean.c:34 |
07432cef WS |
3618 | #, c-format |
3619 | msgid "failed to remove %s" | |
3620 | msgstr "无法删除 %s" | |
3621 | ||
90314792 | 3622 | #: builtin/clean.c:294 |
2e8451e8 JX |
3623 | msgid "" |
3624 | "Prompt help:\n" | |
3625 | "1 - select a numbered item\n" | |
3626 | "foo - select item based on unique prefix\n" | |
3627 | " - (empty) select nothing" | |
3628 | msgstr "" | |
3629 | "帮助:\n" | |
3630 | "1 - 通过编号选择一个选项\n" | |
3631 | "foo - 通过标题选择一个选项\n" | |
3632 | " - (空)什么也不选择" | |
3633 | ||
90314792 | 3634 | #: builtin/clean.c:298 |
2e8451e8 JX |
3635 | msgid "" |
3636 | "Prompt help:\n" | |
3637 | "1 - select a single item\n" | |
3638 | "3-5 - select a range of items\n" | |
3639 | "2-3,6-9 - select multiple ranges\n" | |
3640 | "foo - select item based on unique prefix\n" | |
3641 | "-... - unselect specified items\n" | |
3642 | "* - choose all items\n" | |
3643 | " - (empty) finish selecting" | |
3644 | msgstr "" | |
3645 | "帮助:\n" | |
3646 | "1 - 选择一个选项\n" | |
3647 | "3-5 - 选择一个范围内的所有选项\n" | |
3648 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
3649 | "foo - 通过标题选择一个选项\n" | |
3650 | "-... - 反选特定的选项\n" | |
3651 | "* - 选择所有选项\n" | |
3652 | " - (空)结束选择" | |
3653 | ||
90314792 | 3654 | #: builtin/clean.c:516 |
2e8451e8 JX |
3655 | #, c-format |
3656 | msgid "Huh (%s)?" | |
3657 | msgstr "嗯(%s)?" | |
3658 | ||
90314792 | 3659 | #: builtin/clean.c:659 |
2e8451e8 JX |
3660 | #, c-format |
3661 | msgid "Input ignore patterns>> " | |
3662 | msgstr "输入模版以排除条目>> " | |
3663 | ||
90314792 | 3664 | #: builtin/clean.c:696 |
2e8451e8 JX |
3665 | #, c-format |
3666 | msgid "WARNING: Cannot find items matched by: %s" | |
3667 | msgstr "警告:无法找到和 %s 匹配的条目" | |
3668 | ||
90314792 | 3669 | #: builtin/clean.c:717 |
2e8451e8 JX |
3670 | msgid "Select items to delete" |
3671 | msgstr "选择要删除的条目" | |
3672 | ||
90314792 | 3673 | #: builtin/clean.c:757 |
2e8451e8 JX |
3674 | #, c-format |
3675 | msgid "remove %s? " | |
3676 | msgstr "删除 %s?" | |
3677 | ||
90314792 | 3678 | #: builtin/clean.c:782 |
2e8451e8 JX |
3679 | msgid "Bye." |
3680 | msgstr "再见。" | |
3681 | ||
90314792 | 3682 | #: builtin/clean.c:790 |
2e8451e8 JX |
3683 | msgid "" |
3684 | "clean - start cleaning\n" | |
3685 | "filter by pattern - exclude items from deletion\n" | |
3686 | "select by numbers - select items to be deleted by numbers\n" | |
3687 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
3688 | "quit - stop cleaning\n" | |
3689 | "help - this screen\n" | |
3690 | "? - help for prompt selection" | |
3691 | msgstr "" | |
3692 | "clean - 开始清理\n" | |
3693 | "filter by pattern - 通过模版排除要删除的条目\n" | |
3694 | "select by numbers - 通过数字选择要删除的条目\n" | |
3695 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
3696 | "quit - 停止删除并退出\n" | |
3697 | "help - 显示本帮助\n" | |
3698 | "? - 显示如何在提示符下选择的帮助" | |
3699 | ||
90314792 | 3700 | #: builtin/clean.c:817 |
2e8451e8 JX |
3701 | msgid "*** Commands ***" |
3702 | msgstr "*** 命令 ***" | |
3703 | ||
90314792 | 3704 | #: builtin/clean.c:818 |
2e8451e8 JX |
3705 | msgid "What now" |
3706 | msgstr "请选择" | |
3707 | ||
90314792 | 3708 | #: builtin/clean.c:826 |
2e8451e8 JX |
3709 | msgid "Would remove the following item:" |
3710 | msgid_plural "Would remove the following items:" | |
3711 | msgstr[0] "将删除如下条目:" | |
3712 | msgstr[1] "将删除如下条目:" | |
3713 | ||
90314792 | 3714 | #: builtin/clean.c:843 |
2e8451e8 JX |
3715 | msgid "No more files to clean, exiting." |
3716 | msgstr "没有要清理的文件,退出。" | |
3717 | ||
b1894384 | 3718 | #: builtin/clean.c:874 |
ef317cd5 | 3719 | msgid "do not print names of files removed" |
07432cef | 3720 | msgstr "不打印删除文件的名称" |
ef317cd5 | 3721 | |
b1894384 | 3722 | #: builtin/clean.c:876 |
ef317cd5 | 3723 | msgid "force" |
07432cef | 3724 | msgstr "强制" |
ef317cd5 | 3725 | |
b1894384 | 3726 | #: builtin/clean.c:877 |
2e8451e8 JX |
3727 | msgid "interactive cleaning" |
3728 | msgstr "交互式清除" | |
3729 | ||
b1894384 | 3730 | #: builtin/clean.c:879 |
ef317cd5 | 3731 | msgid "remove whole directories" |
07432cef | 3732 | msgstr "删除整个目录" |
ef317cd5 | 3733 | |
90314792 JX |
3734 | #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 |
3735 | #: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 | |
ef317cd5 | 3736 | msgid "pattern" |
07432cef | 3737 | msgstr "模式" |
ef317cd5 | 3738 | |
b1894384 | 3739 | #: builtin/clean.c:881 |
ef317cd5 | 3740 | msgid "add <pattern> to ignore rules" |
07432cef | 3741 | msgstr "添加<模式>到忽略规则" |
ef317cd5 | 3742 | |
b1894384 | 3743 | #: builtin/clean.c:882 |
ef317cd5 | 3744 | msgid "remove ignored files, too" |
07432cef | 3745 | msgstr "也删除忽略的文件" |
ef317cd5 | 3746 | |
b1894384 | 3747 | #: builtin/clean.c:884 |
ef317cd5 | 3748 | msgid "remove only ignored files" |
07432cef | 3749 | msgstr "只删除忽略的文件" |
c04f5ac3 | 3750 | |
b1894384 | 3751 | #: builtin/clean.c:902 |
c04f5ac3 | 3752 | msgid "-x and -X cannot be used together" |
649900bc | 3753 | msgstr "-x 和 -X 不能同时使用" |
c04f5ac3 | 3754 | |
b1894384 | 3755 | #: builtin/clean.c:906 |
c04f5ac3 | 3756 | msgid "" |
2e8451e8 JX |
3757 | "clean.requireForce set to true and neither -i, -n nor -f given; refusing to " |
3758 | "clean" | |
c04f5ac3 | 3759 | msgstr "" |
2e8451e8 | 3760 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 3761 | |
b1894384 | 3762 | #: builtin/clean.c:909 |
c04f5ac3 | 3763 | msgid "" |
2e8451e8 JX |
3764 | "clean.requireForce defaults to true and neither -i, -n nor -f given; " |
3765 | "refusing to clean" | |
c04f5ac3 | 3766 | msgstr "" |
2e8451e8 | 3767 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 3768 | |
2e8451e8 | 3769 | #: builtin/clone.c:36 |
ef317cd5 | 3770 | msgid "git clone [options] [--] <repo> [<dir>]" |
07432cef | 3771 | msgstr "git clone [选项] [--] <版本库> [<路径>]" |
ef317cd5 | 3772 | |
90314792 JX |
3773 | #: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 |
3774 | #: builtin/push.c:474 | |
ef317cd5 | 3775 | msgid "force progress reporting" |
07432cef | 3776 | msgstr "强制显示进度报告" |
ef317cd5 | 3777 | |
2e8451e8 | 3778 | #: builtin/clone.c:66 |
ef317cd5 | 3779 | msgid "don't create a checkout" |
07432cef | 3780 | msgstr "不创建一个检出" |
ef317cd5 | 3781 | |
2e8451e8 | 3782 | #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 |
ef317cd5 | 3783 | msgid "create a bare repository" |
07432cef | 3784 | msgstr "创建一个裸版本库" |
ef317cd5 | 3785 | |
90314792 | 3786 | #: builtin/clone.c:71 |
ef317cd5 | 3787 | msgid "create a mirror repository (implies bare)" |
07432cef | 3788 | msgstr "创建一个镜像版本库(也是裸版本库)" |
ef317cd5 | 3789 | |
90314792 | 3790 | #: builtin/clone.c:73 |
ef317cd5 | 3791 | msgid "to clone from a local repository" |
07432cef | 3792 | msgstr "从本地版本库克隆" |
ef317cd5 | 3793 | |
90314792 | 3794 | #: builtin/clone.c:75 |
ef317cd5 | 3795 | msgid "don't use local hardlinks, always copy" |
07432cef | 3796 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 3797 | |
90314792 | 3798 | #: builtin/clone.c:77 |
ef317cd5 | 3799 | msgid "setup as shared repository" |
07432cef | 3800 | msgstr "设置为共享版本库" |
ef317cd5 | 3801 | |
90314792 | 3802 | #: builtin/clone.c:79 builtin/clone.c:81 |
ef317cd5 | 3803 | msgid "initialize submodules in the clone" |
07432cef | 3804 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 3805 | |
90314792 | 3806 | #: builtin/clone.c:82 builtin/init-db.c:485 |
ef317cd5 | 3807 | msgid "template-directory" |
07432cef | 3808 | msgstr "模板目录" |
ef317cd5 | 3809 | |
90314792 | 3810 | #: builtin/clone.c:83 builtin/init-db.c:486 |
ef317cd5 | 3811 | msgid "directory from which templates will be used" |
07432cef | 3812 | msgstr "模板目录将被使用" |
ef317cd5 | 3813 | |
90314792 | 3814 | #: builtin/clone.c:85 |
ef317cd5 | 3815 | msgid "reference repository" |
07432cef | 3816 | msgstr "引用版本库" |
ef317cd5 | 3817 | |
90314792 | 3818 | #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 |
ef317cd5 | 3819 | msgid "name" |
07432cef | 3820 | msgstr "名称" |
ef317cd5 | 3821 | |
90314792 | 3822 | #: builtin/clone.c:87 |
ef317cd5 | 3823 | msgid "use <name> instead of 'origin' to track upstream" |
07432cef | 3824 | msgstr "使用<名称>而不是 'origin' 去跟踪上游" |
ef317cd5 | 3825 | |
90314792 | 3826 | #: builtin/clone.c:89 |
ef317cd5 | 3827 | msgid "checkout <branch> instead of the remote's HEAD" |
07432cef | 3828 | msgstr "检出<分支>而不是远程HEAD" |
ef317cd5 | 3829 | |
90314792 | 3830 | #: builtin/clone.c:91 |
ef317cd5 | 3831 | msgid "path to git-upload-pack on the remote" |
07432cef | 3832 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 3833 | |
90314792 | 3834 | #: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 |
ef317cd5 | 3835 | msgid "depth" |
07432cef | 3836 | msgstr "深度" |
ef317cd5 | 3837 | |
90314792 | 3838 | #: builtin/clone.c:93 |
ef317cd5 | 3839 | msgid "create a shallow clone of that depth" |
07432cef | 3840 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 3841 | |
90314792 | 3842 | #: builtin/clone.c:95 |
ef317cd5 | 3843 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 3844 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 3845 | |
90314792 | 3846 | #: builtin/clone.c:96 builtin/init-db.c:494 |
ef317cd5 | 3847 | msgid "gitdir" |
07432cef | 3848 | msgstr "git目录" |
ef317cd5 | 3849 | |
90314792 | 3850 | #: builtin/clone.c:97 builtin/init-db.c:495 |
ef317cd5 | 3851 | msgid "separate git dir from working tree" |
07432cef | 3852 | msgstr "git目录和工作区分离" |
ef317cd5 | 3853 | |
90314792 | 3854 | #: builtin/clone.c:98 |
ef317cd5 | 3855 | msgid "key=value" |
07432cef | 3856 | msgstr "key=value" |
ef317cd5 | 3857 | |
90314792 | 3858 | #: builtin/clone.c:99 |
ef317cd5 | 3859 | msgid "set config inside the new repository" |
07432cef | 3860 | msgstr "在新版本库中设置配置信息" |
ef317cd5 | 3861 | |
90314792 | 3862 | #: builtin/clone.c:252 |
c04f5ac3 | 3863 | #, c-format |
4dcdc3d8 JX |
3864 | msgid "reference repository '%s' is not a local repository." |
3865 | msgstr "引用版本库 '%s' 不是一个本地版本库。" | |
c04f5ac3 | 3866 | |
90314792 | 3867 | #: builtin/clone.c:315 |
c04f5ac3 JX |
3868 | #, c-format |
3869 | msgid "failed to create directory '%s'" | |
90e6ef53 | 3870 | msgstr "无法创建目录 '%s'" |
c04f5ac3 | 3871 | |
90314792 | 3872 | #: builtin/clone.c:317 builtin/diff.c:77 |
c04f5ac3 JX |
3873 | #, c-format |
3874 | msgid "failed to stat '%s'" | |
90e6ef53 | 3875 | msgstr "无法枚举 '%s' 状态" |
c04f5ac3 | 3876 | |
90314792 | 3877 | #: builtin/clone.c:319 |
c04f5ac3 JX |
3878 | #, c-format |
3879 | msgid "%s exists and is not a directory" | |
3880 | msgstr "%s 存在且不是一个目录" | |
3881 | ||
90314792 | 3882 | #: builtin/clone.c:333 |
c04f5ac3 JX |
3883 | #, c-format |
3884 | msgid "failed to stat %s\n" | |
90e6ef53 | 3885 | msgstr "无法枚举 %s 状态\n" |
c04f5ac3 | 3886 | |
90314792 | 3887 | #: builtin/clone.c:355 |
c04f5ac3 JX |
3888 | #, c-format |
3889 | msgid "failed to create link '%s'" | |
90e6ef53 | 3890 | msgstr "无法创建链接 '%s'" |
c04f5ac3 | 3891 | |
90314792 | 3892 | #: builtin/clone.c:359 |
c04f5ac3 JX |
3893 | #, c-format |
3894 | msgid "failed to copy file to '%s'" | |
90e6ef53 | 3895 | msgstr "无法拷贝文件至 '%s'" |
c04f5ac3 | 3896 | |
90314792 | 3897 | #: builtin/clone.c:382 builtin/clone.c:559 |
c04f5ac3 JX |
3898 | #, c-format |
3899 | msgid "done.\n" | |
3900 | msgstr "完成。\n" | |
3901 | ||
90314792 | 3902 | #: builtin/clone.c:395 |
1003b3a5 JX |
3903 | msgid "" |
3904 | "Clone succeeded, but checkout failed.\n" | |
3905 | "You can inspect what was checked out with 'git status'\n" | |
3906 | "and retry the checkout with 'git checkout -f HEAD'\n" | |
3907 | msgstr "" | |
3908 | "克隆成功,但是检出失败。\n" | |
3909 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
3910 | "'git checkout -f HEAD' 重试\n" | |
3911 | ||
90314792 | 3912 | #: builtin/clone.c:474 |
c04f5ac3 JX |
3913 | #, c-format |
3914 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 3915 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 3916 | |
90314792 | 3917 | #: builtin/clone.c:554 |
2e8451e8 JX |
3918 | #, c-format |
3919 | msgid "Checking connectivity... " | |
3920 | msgstr "检查连接... " | |
3921 | ||
90314792 | 3922 | #: builtin/clone.c:557 |
1003b3a5 JX |
3923 | msgid "remote did not send all necessary objects" |
3924 | msgstr "远程没有发送所有必须的对象" | |
3925 | ||
90314792 | 3926 | #: builtin/clone.c:620 |
c04f5ac3 JX |
3927 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
3928 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
3929 | ||
90314792 | 3930 | #: builtin/clone.c:651 |
1003b3a5 JX |
3931 | msgid "unable to checkout working tree" |
3932 | msgstr "不能检出工作区" | |
3933 | ||
90314792 | 3934 | #: builtin/clone.c:759 |
c04f5ac3 JX |
3935 | msgid "Too many arguments." |
3936 | msgstr "太多参数。" | |
3937 | ||
90314792 | 3938 | #: builtin/clone.c:763 |
c04f5ac3 | 3939 | msgid "You must specify a repository to clone." |
90e6ef53 | 3940 | msgstr "您必须指定一个版本库来克隆。" |
c04f5ac3 | 3941 | |
90314792 | 3942 | #: builtin/clone.c:774 |
c04f5ac3 JX |
3943 | #, c-format |
3944 | msgid "--bare and --origin %s options are incompatible." | |
3945 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
3946 | ||
90314792 | 3947 | #: builtin/clone.c:777 |
07432cef WS |
3948 | msgid "--bare and --separate-git-dir are incompatible." |
3949 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
3950 | ||
90314792 | 3951 | #: builtin/clone.c:790 |
c04f5ac3 JX |
3952 | #, c-format |
3953 | msgid "repository '%s' does not exist" | |
3954 | msgstr "版本库 '%s' 不存在" | |
3955 | ||
90314792 | 3956 | #: builtin/clone.c:795 |
c04f5ac3 JX |
3957 | msgid "--depth is ignored in local clones; use file:// instead." |
3958 | msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。" | |
3959 | ||
90314792 | 3960 | #: builtin/clone.c:797 |
2e8451e8 JX |
3961 | msgid "--local is ignored" |
3962 | msgstr "--local 被忽略" | |
3963 | ||
90314792 | 3964 | #: builtin/clone.c:807 |
c04f5ac3 JX |
3965 | #, c-format |
3966 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 3967 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 3968 | |
90314792 | 3969 | #: builtin/clone.c:817 |
c04f5ac3 JX |
3970 | #, c-format |
3971 | msgid "working tree '%s' already exists." | |
3972 | msgstr "工作区 '%s' 已经存在。" | |
3973 | ||
90314792 | 3974 | #: builtin/clone.c:830 builtin/clone.c:842 |
c04f5ac3 JX |
3975 | #, c-format |
3976 | msgid "could not create leading directories of '%s'" | |
90e6ef53 | 3977 | msgstr "不能为 '%s' 创建先导目录" |
c04f5ac3 | 3978 | |
90314792 | 3979 | #: builtin/clone.c:833 |
c04f5ac3 JX |
3980 | #, c-format |
3981 | msgid "could not create work tree dir '%s'." | |
90e6ef53 | 3982 | msgstr "不能为 '%s' 创建工作区目录。" |
c04f5ac3 | 3983 | |
90314792 | 3984 | #: builtin/clone.c:852 |
c04f5ac3 JX |
3985 | #, c-format |
3986 | msgid "Cloning into bare repository '%s'...\n" | |
3987 | msgstr "克隆到裸版本库 '%s'...\n" | |
3988 | ||
90314792 | 3989 | #: builtin/clone.c:854 |
c04f5ac3 JX |
3990 | #, c-format |
3991 | msgid "Cloning into '%s'...\n" | |
3992 | msgstr "正克隆到 '%s'...\n" | |
3993 | ||
90314792 | 3994 | #: builtin/clone.c:888 |
c04f5ac3 JX |
3995 | #, c-format |
3996 | msgid "Don't know how to clone %s" | |
3997 | msgstr "不知道如何克隆 %s" | |
3998 | ||
90314792 | 3999 | #: builtin/clone.c:939 builtin/clone.c:947 |
c04f5ac3 JX |
4000 | #, c-format |
4001 | msgid "Remote branch %s not found in upstream %s" | |
4002 | msgstr "远程分支 %s 在上游 %s 未发现" | |
4003 | ||
90314792 | 4004 | #: builtin/clone.c:950 |
c04f5ac3 JX |
4005 | msgid "You appear to have cloned an empty repository." |
4006 | msgstr "您似乎克隆了一个空版本库。" | |
4007 | ||
ef317cd5 JX |
4008 | #: builtin/column.c:9 |
4009 | msgid "git column [options]" | |
07432cef | 4010 | msgstr "git column [选项]" |
ef317cd5 JX |
4011 | |
4012 | #: builtin/column.c:26 | |
4013 | msgid "lookup config vars" | |
07432cef | 4014 | msgstr "查找配置变量" |
ef317cd5 JX |
4015 | |
4016 | #: builtin/column.c:27 builtin/column.c:28 | |
ef317cd5 | 4017 | msgid "layout to use" |
07432cef | 4018 | msgstr "要使用的布局" |
ef317cd5 JX |
4019 | |
4020 | #: builtin/column.c:29 | |
4021 | msgid "Maximum width" | |
07432cef | 4022 | msgstr "最大宽度" |
ef317cd5 JX |
4023 | |
4024 | #: builtin/column.c:30 | |
4025 | msgid "Padding space on left border" | |
07432cef | 4026 | msgstr "左边框的填充空间" |
ef317cd5 JX |
4027 | |
4028 | #: builtin/column.c:31 | |
4029 | msgid "Padding space on right border" | |
07432cef | 4030 | msgstr "右边框的填充空间" |
ef317cd5 JX |
4031 | |
4032 | #: builtin/column.c:32 | |
4033 | msgid "Padding space between columns" | |
07432cef | 4034 | msgstr "两列之间的填充空间" |
ef317cd5 | 4035 | |
8ada9598 JX |
4036 | #: builtin/column.c:51 |
4037 | msgid "--command must be the first argument" | |
81809b99 | 4038 | msgstr "--command 必须是第一个参数" |
8ada9598 | 4039 | |
90314792 | 4040 | #: builtin/commit.c:36 |
a77c07d9 | 4041 | msgid "git commit [options] [--] <pathspec>..." |
90314792 | 4042 | msgstr "git commit [选项] [--] <路径规则>..." |
ef317cd5 | 4043 | |
90314792 | 4044 | #: builtin/commit.c:41 |
a77c07d9 | 4045 | msgid "git status [options] [--] <pathspec>..." |
90314792 | 4046 | msgstr "git status [选项] [--] <路径规则>..." |
ef317cd5 | 4047 | |
90314792 | 4048 | #: builtin/commit.c:46 |
c04f5ac3 JX |
4049 | msgid "" |
4050 | "Your name and email address were configured automatically based\n" | |
4051 | "on your username and hostname. Please check that they are accurate.\n" | |
4052 | "You can suppress this message by setting them explicitly:\n" | |
4053 | "\n" | |
4054 | " git config --global user.name \"Your Name\"\n" | |
4055 | " git config --global user.email you@example.com\n" | |
4056 | "\n" | |
4057 | "After doing this, you may fix the identity used for this commit with:\n" | |
4058 | "\n" | |
4059 | " git commit --amend --reset-author\n" | |
4060 | msgstr "" | |
90e6ef53 JX |
4061 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
4062 | "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n" | |
c04f5ac3 JX |
4063 | "\n" |
4064 | " git config --global user.name \"Your Name\"\n" | |
4065 | " git config --global user.email you@example.com\n" | |
4066 | "\n" | |
90e6ef53 | 4067 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
c04f5ac3 JX |
4068 | "\n" |
4069 | " git commit --amend --reset-author\n" | |
4070 | ||
90314792 | 4071 | #: builtin/commit.c:58 |
c04f5ac3 JX |
4072 | msgid "" |
4073 | "You asked to amend the most recent commit, but doing so would make\n" | |
4074 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
4075 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
4076 | msgstr "" | |
1b150dc9 T |
4077 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
4078 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 4079 | |
90314792 | 4080 | #: builtin/commit.c:63 |
c04f5ac3 JX |
4081 | msgid "" |
4082 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
4083 | "If you wish to commit it anyway, use:\n" | |
4084 | "\n" | |
4085 | " git commit --allow-empty\n" | |
4086 | "\n" | |
c04f5ac3 | 4087 | msgstr "" |
a9ce4543 T |
4088 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
4089 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
4090 | "\n" |
4091 | " git commit --allow-empty\n" | |
4092 | "\n" | |
c04f5ac3 | 4093 | |
90314792 | 4094 | #: builtin/commit.c:70 |
b1894384 JX |
4095 | msgid "Otherwise, please use 'git reset'\n" |
4096 | msgstr "否则,请使用命令 'git reset'\n" | |
4097 | ||
90314792 | 4098 | #: builtin/commit.c:73 |
b1894384 JX |
4099 | msgid "" |
4100 | "If you wish to skip this commit, use:\n" | |
4101 | "\n" | |
4102 | " git reset\n" | |
4103 | "\n" | |
4104 | "Then \"git cherry-pick --continue\" will resume cherry-picking\n" | |
4105 | "the remaining commits.\n" | |
4106 | msgstr "" | |
4107 | "如果您想跳过这个提交,使用命令:\n" | |
4108 | "\n" | |
4109 | " git reset\n" | |
4110 | "\n" | |
4111 | "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n" | |
4112 | "操作。\n" | |
4113 | ||
90314792 | 4114 | #: builtin/commit.c:287 |
c04f5ac3 | 4115 | msgid "failed to unpack HEAD tree object" |
90e6ef53 | 4116 | msgstr "无法解包 HEAD 树对象" |
c04f5ac3 | 4117 | |
90314792 | 4118 | #: builtin/commit.c:329 |
c04f5ac3 | 4119 | msgid "unable to create temporary index" |
90e6ef53 | 4120 | msgstr "不能创建临时索引" |
c04f5ac3 | 4121 | |
90314792 | 4122 | #: builtin/commit.c:335 |
c04f5ac3 JX |
4123 | msgid "interactive add failed" |
4124 | msgstr "交互式添加失败" | |
4125 | ||
90314792 | 4126 | #: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439 |
c04f5ac3 | 4127 | msgid "unable to write new_index file" |
90e6ef53 | 4128 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 4129 | |
90314792 | 4130 | #: builtin/commit.c:420 |
8ada9598 | 4131 | msgid "cannot do a partial commit during a merge." |
81809b99 | 4132 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 4133 | |
90314792 | 4134 | #: builtin/commit.c:422 |
8ada9598 | 4135 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 4136 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 4137 | |
90314792 | 4138 | #: builtin/commit.c:432 |
c04f5ac3 | 4139 | msgid "cannot read the index" |
90e6ef53 | 4140 | msgstr "无法读取索引" |
c04f5ac3 | 4141 | |
90314792 | 4142 | #: builtin/commit.c:452 |
c04f5ac3 | 4143 | msgid "unable to write temporary index file" |
90e6ef53 | 4144 | msgstr "无法写临时索引文件" |
c04f5ac3 | 4145 | |
90314792 | 4146 | #: builtin/commit.c:543 builtin/commit.c:549 |
c04f5ac3 JX |
4147 | #, c-format |
4148 | msgid "invalid commit: %s" | |
4149 | msgstr "无效的提交:%s" | |
4150 | ||
90314792 | 4151 | #: builtin/commit.c:571 |
c04f5ac3 JX |
4152 | msgid "malformed --author parameter" |
4153 | msgstr "非法的 --author 参数" | |
4154 | ||
90314792 | 4155 | #: builtin/commit.c:591 |
c04f5ac3 JX |
4156 | #, c-format |
4157 | msgid "Malformed ident string: '%s'" | |
90e6ef53 | 4158 | msgstr "非法的身份字符串:'%s'" |
c04f5ac3 | 4159 | |
90314792 | 4160 | #: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007 |
c04f5ac3 JX |
4161 | #, c-format |
4162 | msgid "could not lookup commit %s" | |
4163 | msgstr "不能查询提交 %s" | |
4164 | ||
90314792 | 4165 | #: builtin/commit.c:642 builtin/shortlog.c:273 |
c04f5ac3 JX |
4166 | #, c-format |
4167 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 4168 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 4169 | |
90314792 | 4170 | #: builtin/commit.c:644 |
c04f5ac3 | 4171 | msgid "could not read log from standard input" |
90e6ef53 | 4172 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 4173 | |
90314792 | 4174 | #: builtin/commit.c:648 |
c04f5ac3 JX |
4175 | #, c-format |
4176 | msgid "could not read log file '%s'" | |
90e6ef53 | 4177 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 4178 | |
90314792 | 4179 | #: builtin/commit.c:654 |
c04f5ac3 JX |
4180 | msgid "commit has empty message" |
4181 | msgstr "提交说明为空" | |
4182 | ||
90314792 | 4183 | #: builtin/commit.c:670 |
c04f5ac3 | 4184 | msgid "could not read MERGE_MSG" |
90e6ef53 | 4185 | msgstr "不能读取 MERGE_MSG" |
c04f5ac3 | 4186 | |
90314792 | 4187 | #: builtin/commit.c:674 |
c04f5ac3 | 4188 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 4189 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 4190 | |
90314792 | 4191 | #: builtin/commit.c:678 |
c04f5ac3 JX |
4192 | #, c-format |
4193 | msgid "could not read '%s'" | |
90e6ef53 | 4194 | msgstr "不能读取 '%s'" |
c04f5ac3 | 4195 | |
90314792 | 4196 | #: builtin/commit.c:749 |
c04f5ac3 | 4197 | msgid "could not write commit template" |
90e6ef53 | 4198 | msgstr "不能写提交模版" |
c04f5ac3 | 4199 | |
90314792 | 4200 | #: builtin/commit.c:760 |
81809b99 | 4201 | #, c-format |
c04f5ac3 JX |
4202 | msgid "" |
4203 | "\n" | |
8ada9598 | 4204 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
4205 | "If this is not correct, please remove the file\n" |
4206 | "\t%s\n" | |
4207 | "and try again.\n" | |
4208 | msgstr "" | |
4209 | "\n" | |
649900bc | 4210 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
4211 | "\t%s\n" |
4212 | "然后重试。\n" | |
4213 | ||
90314792 | 4214 | #: builtin/commit.c:765 |
81809b99 | 4215 | #, c-format |
8ada9598 JX |
4216 | msgid "" |
4217 | "\n" | |
4218 | "It looks like you may be committing a cherry-pick.\n" | |
4219 | "If this is not correct, please remove the file\n" | |
4220 | "\t%s\n" | |
4221 | "and try again.\n" | |
4222 | msgstr "" | |
4223 | "\n" | |
649900bc | 4224 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
4225 | "\t%s\n" |
4226 | "然后重试。\n" | |
c04f5ac3 | 4227 | |
90314792 | 4228 | #: builtin/commit.c:777 |
a77c07d9 | 4229 | #, c-format |
c04f5ac3 | 4230 | msgid "" |
8ada9598 | 4231 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 4232 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 4233 | msgstr "" |
a77c07d9 | 4234 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 4235 | "说明将会终止提交。\n" |
c04f5ac3 | 4236 | |
90314792 | 4237 | #: builtin/commit.c:782 |
a77c07d9 | 4238 | #, c-format |
c04f5ac3 | 4239 | msgid "" |
8ada9598 | 4240 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 4241 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
4242 | "An empty message aborts the commit.\n" |
4243 | msgstr "" | |
a77c07d9 JX |
4244 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
4245 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 4246 | |
90e6ef53 | 4247 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 4248 | #: builtin/commit.c:795 |
c04f5ac3 JX |
4249 | #, c-format |
4250 | msgid "%sAuthor: %s" | |
4251 | msgstr "%s作者: %s" | |
4252 | ||
90e6ef53 | 4253 | # 译者:为保证在输出中对齐,注意调整句中空格! |
90314792 | 4254 | #: builtin/commit.c:802 |
c04f5ac3 JX |
4255 | #, c-format |
4256 | msgid "%sCommitter: %s" | |
4257 | msgstr "%s提交者: %s" | |
4258 | ||
90314792 | 4259 | #: builtin/commit.c:822 |
c04f5ac3 | 4260 | msgid "Cannot read index" |
90e6ef53 | 4261 | msgstr "无法读取索引" |
c04f5ac3 | 4262 | |
90314792 | 4263 | #: builtin/commit.c:865 |
c04f5ac3 JX |
4264 | msgid "Error building trees" |
4265 | msgstr "无法创建树对象" | |
4266 | ||
90314792 | 4267 | #: builtin/commit.c:880 builtin/tag.c:359 |
c04f5ac3 JX |
4268 | #, c-format |
4269 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 4270 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 4271 | |
90314792 | 4272 | #: builtin/commit.c:982 |
c04f5ac3 JX |
4273 | #, c-format |
4274 | msgid "No existing author found with '%s'" | |
4275 | msgstr "没有找到匹配 '%s' 的作者" | |
4276 | ||
90314792 | 4277 | #: builtin/commit.c:997 builtin/commit.c:1237 |
c04f5ac3 JX |
4278 | #, c-format |
4279 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 4280 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 4281 | |
90314792 | 4282 | #: builtin/commit.c:1034 |
2e8451e8 JX |
4283 | msgid "--long and -z are incompatible" |
4284 | msgstr "--long 和 -z 选项不兼容" | |
4285 | ||
90314792 | 4286 | #: builtin/commit.c:1064 |
c04f5ac3 JX |
4287 | msgid "Using both --reset-author and --author does not make sense" |
4288 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
4289 | ||
90314792 | 4290 | #: builtin/commit.c:1075 |
c04f5ac3 | 4291 | msgid "You have nothing to amend." |
90e6ef53 | 4292 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 4293 | |
90314792 | 4294 | #: builtin/commit.c:1078 |
8ada9598 | 4295 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 4296 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 4297 | |
90314792 | 4298 | #: builtin/commit.c:1080 |
8ada9598 | 4299 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 4300 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 4301 | |
90314792 | 4302 | #: builtin/commit.c:1083 |
c04f5ac3 | 4303 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 4304 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 4305 | |
90314792 | 4306 | #: builtin/commit.c:1093 |
c04f5ac3 JX |
4307 | msgid "Only one of -c/-C/-F/--fixup can be used." |
4308 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
4309 | ||
90314792 | 4310 | #: builtin/commit.c:1095 |
c04f5ac3 | 4311 | msgid "Option -m cannot be combined with -c/-C/-F/--fixup." |
649900bc | 4312 | msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" |
c04f5ac3 | 4313 | |
90314792 | 4314 | #: builtin/commit.c:1103 |
c04f5ac3 | 4315 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 4316 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 4317 | |
90314792 | 4318 | #: builtin/commit.c:1120 |
c04f5ac3 JX |
4319 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
4320 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
4321 | ||
90314792 | 4322 | #: builtin/commit.c:1122 |
c04f5ac3 JX |
4323 | msgid "No paths with --include/--only does not make sense." |
4324 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
4325 | ||
90314792 | 4326 | #: builtin/commit.c:1124 |
c04f5ac3 | 4327 | msgid "Clever... amending the last one with dirty index." |
90e6ef53 | 4328 | msgstr "聪明... 在索引不干净下修补最后的提交。" |
c04f5ac3 | 4329 | |
90314792 | 4330 | #: builtin/commit.c:1126 |
c04f5ac3 | 4331 | msgid "Explicit paths specified without -i nor -o; assuming --only paths..." |
90e6ef53 | 4332 | msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." |
c04f5ac3 | 4333 | |
90314792 | 4334 | #: builtin/commit.c:1136 builtin/tag.c:572 |
c04f5ac3 JX |
4335 | #, c-format |
4336 | msgid "Invalid cleanup mode %s" | |
4337 | msgstr "无效的清理模式 %s" | |
4338 | ||
90314792 | 4339 | #: builtin/commit.c:1141 |
c04f5ac3 | 4340 | msgid "Paths with -a does not make sense." |
649900bc | 4341 | msgstr "路径和 -a 选项同时使用没有意义。" |
c04f5ac3 | 4342 | |
90314792 | 4343 | #: builtin/commit.c:1251 builtin/commit.c:1482 |
ef317cd5 | 4344 | msgid "show status concisely" |
07432cef | 4345 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 4346 | |
90314792 | 4347 | #: builtin/commit.c:1253 builtin/commit.c:1484 |
ef317cd5 | 4348 | msgid "show branch information" |
07432cef | 4349 | msgstr "显示分支信息" |
ef317cd5 | 4350 | |
90314792 | 4351 | #: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 |
ef317cd5 | 4352 | msgid "machine-readable output" |
07432cef WS |
4353 | msgstr "机器可读的输出" |
4354 | ||
90314792 | 4355 | #: builtin/commit.c:1258 builtin/commit.c:1488 |
07432cef WS |
4356 | msgid "show status in long format (default)" |
4357 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 4358 | |
90314792 | 4359 | #: builtin/commit.c:1261 builtin/commit.c:1491 |
ef317cd5 | 4360 | msgid "terminate entries with NUL" |
07432cef | 4361 | msgstr "条目以NUL字符结尾" |
ef317cd5 | 4362 | |
90314792 JX |
4363 | #: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674 |
4364 | #: builtin/fast-export.c:677 builtin/tag.c:459 | |
ef317cd5 | 4365 | msgid "mode" |
07432cef | 4366 | msgstr "模式" |
ef317cd5 | 4367 | |
90314792 | 4368 | #: builtin/commit.c:1264 builtin/commit.c:1494 |
ef317cd5 | 4369 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 4370 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 4371 | |
90314792 | 4372 | #: builtin/commit.c:1267 |
ef317cd5 | 4373 | msgid "show ignored files" |
07432cef | 4374 | msgstr "显示忽略的文件" |
ef317cd5 | 4375 | |
90314792 | 4376 | #: builtin/commit.c:1268 parse-options.h:156 |
ef317cd5 JX |
4377 | msgid "when" |
4378 | msgstr "何时" | |
4379 | ||
90314792 | 4380 | #: builtin/commit.c:1269 |
ef317cd5 JX |
4381 | msgid "" |
4382 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
4383 | "(Default: all)" | |
4384 | msgstr "" | |
07432cef | 4385 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 4386 | |
90314792 | 4387 | #: builtin/commit.c:1271 |
ef317cd5 | 4388 | msgid "list untracked files in columns" |
07432cef | 4389 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 4390 | |
90314792 | 4391 | #: builtin/commit.c:1340 |
c04f5ac3 JX |
4392 | msgid "couldn't look up newly created commit" |
4393 | msgstr "无法找到新创建的提交" | |
4394 | ||
90314792 | 4395 | #: builtin/commit.c:1342 |
c04f5ac3 | 4396 | msgid "could not parse newly created commit" |
90e6ef53 | 4397 | msgstr "不能解析新创建的提交" |
c04f5ac3 | 4398 | |
90314792 | 4399 | #: builtin/commit.c:1383 |
c04f5ac3 JX |
4400 | msgid "detached HEAD" |
4401 | msgstr "分离头指针" | |
4402 | ||
7e238ab7 | 4403 | # 译者:中文字符串拼接,可删除前导空格 |
90314792 | 4404 | #: builtin/commit.c:1385 |
c04f5ac3 | 4405 | msgid " (root-commit)" |
7e238ab7 | 4406 | msgstr "(根提交)" |
c04f5ac3 | 4407 | |
90314792 | 4408 | #: builtin/commit.c:1452 |
ef317cd5 | 4409 | msgid "suppress summary after successful commit" |
07432cef | 4410 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 4411 | |
90314792 | 4412 | #: builtin/commit.c:1453 |
ef317cd5 | 4413 | msgid "show diff in commit message template" |
07432cef | 4414 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 4415 | |
90314792 | 4416 | #: builtin/commit.c:1455 |
ef317cd5 | 4417 | msgid "Commit message options" |
07432cef | 4418 | msgstr "提交说明选项" |
c04f5ac3 | 4419 | |
90314792 | 4420 | #: builtin/commit.c:1456 builtin/tag.c:457 |
ef317cd5 | 4421 | msgid "read message from file" |
07432cef | 4422 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 4423 | |
90314792 | 4424 | #: builtin/commit.c:1457 |
ef317cd5 | 4425 | msgid "author" |
07432cef | 4426 | msgstr "作者" |
c04f5ac3 | 4427 | |
90314792 | 4428 | #: builtin/commit.c:1457 |
ef317cd5 | 4429 | msgid "override author for commit" |
07432cef | 4430 | msgstr "提交时覆盖作者" |
73a60cd2 | 4431 | |
90314792 | 4432 | #: builtin/commit.c:1458 builtin/gc.c:260 |
ef317cd5 | 4433 | msgid "date" |
07432cef | 4434 | msgstr "日期" |
c04f5ac3 | 4435 | |
90314792 | 4436 | #: builtin/commit.c:1458 |
ef317cd5 | 4437 | msgid "override date for commit" |
07432cef | 4438 | msgstr "提交时覆盖日期" |
c04f5ac3 | 4439 | |
90314792 | 4440 | #: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 |
2e8451e8 | 4441 | #: builtin/notes.c:562 builtin/tag.c:455 |
ef317cd5 | 4442 | msgid "message" |
07432cef | 4443 | msgstr "说明" |
c04f5ac3 | 4444 | |
90314792 | 4445 | #: builtin/commit.c:1459 |
ef317cd5 | 4446 | msgid "commit message" |
07432cef | 4447 | msgstr "提交说明" |
ef317cd5 | 4448 | |
90314792 | 4449 | #: builtin/commit.c:1460 |
ef317cd5 | 4450 | msgid "reuse and edit message from specified commit" |
07432cef | 4451 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 4452 | |
90314792 | 4453 | #: builtin/commit.c:1461 |
ef317cd5 | 4454 | msgid "reuse message from specified commit" |
07432cef | 4455 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 4456 | |
90314792 | 4457 | #: builtin/commit.c:1462 |
ef317cd5 | 4458 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 4459 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 4460 | |
90314792 | 4461 | #: builtin/commit.c:1463 |
ef317cd5 | 4462 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 4463 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 4464 | |
90314792 | 4465 | #: builtin/commit.c:1464 |
ef317cd5 | 4466 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 4467 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 4468 | |
90314792 | 4469 | #: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86 |
ef317cd5 | 4470 | msgid "add Signed-off-by:" |
07432cef | 4471 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 4472 | |
90314792 | 4473 | #: builtin/commit.c:1466 |
ef317cd5 | 4474 | msgid "use specified template file" |
07432cef | 4475 | msgstr "使用指定的模板文件" |
ef317cd5 | 4476 | |
90314792 | 4477 | #: builtin/commit.c:1467 |
ef317cd5 | 4478 | msgid "force edit of commit" |
07432cef | 4479 | msgstr "强制编辑提交" |
ef317cd5 | 4480 | |
07432cef | 4481 | # 译者:可选值,不能翻译(或是原文中笔误,应为 mode) |
90314792 | 4482 | #: builtin/commit.c:1468 |
ef317cd5 | 4483 | msgid "default" |
07432cef | 4484 | msgstr "default" |
ef317cd5 | 4485 | |
90314792 | 4486 | #: builtin/commit.c:1468 builtin/tag.c:460 |
ef317cd5 | 4487 | msgid "how to strip spaces and #comments from message" |
07432cef | 4488 | msgstr "设置如何删除提交说明里的空格和#注释" |
ef317cd5 | 4489 | |
90314792 | 4490 | #: builtin/commit.c:1469 |
ef317cd5 | 4491 | msgid "include status in commit message template" |
07432cef | 4492 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 4493 | |
90314792 | 4494 | #: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 |
ef317cd5 | 4495 | msgid "key id" |
07432cef | 4496 | msgstr "key id" |
ef317cd5 | 4497 | |
90314792 | 4498 | #: builtin/commit.c:1471 builtin/merge.c:231 |
ef317cd5 | 4499 | msgid "GPG sign commit" |
07432cef | 4500 | msgstr "GPG 提交签名" |
ef317cd5 JX |
4501 | |
4502 | #. end commit message options | |
90314792 | 4503 | #: builtin/commit.c:1474 |
ef317cd5 | 4504 | msgid "Commit contents options" |
07432cef | 4505 | msgstr "提交内容选项" |
ef317cd5 | 4506 | |
90314792 | 4507 | #: builtin/commit.c:1475 |
ef317cd5 | 4508 | msgid "commit all changed files" |
07432cef | 4509 | msgstr "提交所有改动的文件" |
ef317cd5 | 4510 | |
90314792 | 4511 | #: builtin/commit.c:1476 |
ef317cd5 | 4512 | msgid "add specified files to index for commit" |
07432cef | 4513 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 4514 | |
90314792 | 4515 | #: builtin/commit.c:1477 |
ef317cd5 | 4516 | msgid "interactively add files" |
07432cef | 4517 | msgstr "交互式添加文件" |
ef317cd5 | 4518 | |
90314792 | 4519 | #: builtin/commit.c:1478 |
ef317cd5 | 4520 | msgid "interactively add changes" |
07432cef | 4521 | msgstr "交互式添加变更" |
ef317cd5 | 4522 | |
90314792 | 4523 | #: builtin/commit.c:1479 |
ef317cd5 | 4524 | msgid "commit only specified files" |
07432cef | 4525 | msgstr "只提交指定的文件" |
ef317cd5 | 4526 | |
90314792 | 4527 | #: builtin/commit.c:1480 |
ef317cd5 | 4528 | msgid "bypass pre-commit hook" |
07432cef | 4529 | msgstr "绕过 pre-commit 钩子" |
ef317cd5 | 4530 | |
90314792 | 4531 | #: builtin/commit.c:1481 |
ef317cd5 | 4532 | msgid "show what would be committed" |
07432cef | 4533 | msgstr "显示将要提交的内容" |
ef317cd5 | 4534 | |
90314792 | 4535 | #: builtin/commit.c:1492 |
ef317cd5 | 4536 | msgid "amend previous commit" |
07432cef | 4537 | msgstr "修改先前的提交" |
ef317cd5 | 4538 | |
90314792 | 4539 | #: builtin/commit.c:1493 |
ef317cd5 | 4540 | msgid "bypass post-rewrite hook" |
07432cef | 4541 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 4542 | |
90314792 | 4543 | #: builtin/commit.c:1498 |
ef317cd5 | 4544 | msgid "ok to record an empty change" |
07432cef | 4545 | msgstr "允许一个空提交" |
ef317cd5 | 4546 | |
90314792 | 4547 | #: builtin/commit.c:1500 |
ef317cd5 | 4548 | msgid "ok to record a change with an empty message" |
07432cef | 4549 | msgstr "允许空的提交说明" |
ef317cd5 | 4550 | |
90314792 | 4551 | #: builtin/commit.c:1529 |
c04f5ac3 | 4552 | msgid "could not parse HEAD commit" |
90e6ef53 | 4553 | msgstr "不能解析 HEAD 提交" |
c04f5ac3 | 4554 | |
90314792 | 4555 | #: builtin/commit.c:1567 builtin/merge.c:525 |
c04f5ac3 JX |
4556 | #, c-format |
4557 | msgid "could not open '%s' for reading" | |
90e6ef53 | 4558 | msgstr "不能为读入打开 '%s'" |
c04f5ac3 | 4559 | |
90314792 | 4560 | #: builtin/commit.c:1574 |
c04f5ac3 JX |
4561 | #, c-format |
4562 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 4563 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 4564 | |
90314792 | 4565 | #: builtin/commit.c:1581 |
c04f5ac3 | 4566 | msgid "could not read MERGE_MODE" |
90e6ef53 | 4567 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 4568 | |
90314792 | 4569 | #: builtin/commit.c:1600 |
c04f5ac3 JX |
4570 | #, c-format |
4571 | msgid "could not read commit message: %s" | |
90e6ef53 | 4572 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 4573 | |
90314792 | 4574 | #: builtin/commit.c:1614 |
73a60cd2 JX |
4575 | #, c-format |
4576 | msgid "Aborting commit; you did not edit the message.\n" | |
4577 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
4578 | ||
90314792 | 4579 | #: builtin/commit.c:1619 |
c04f5ac3 JX |
4580 | #, c-format |
4581 | msgid "Aborting commit due to empty commit message.\n" | |
4582 | msgstr "终止提交因为提交说明为空。\n" | |
4583 | ||
90314792 | 4584 | #: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 |
c04f5ac3 | 4585 | msgid "failed to write commit object" |
90e6ef53 | 4586 | msgstr "无法写提交对象" |
c04f5ac3 | 4587 | |
90314792 | 4588 | #: builtin/commit.c:1655 |
c04f5ac3 JX |
4589 | msgid "cannot lock HEAD ref" |
4590 | msgstr "无法锁定 HEAD 引用" | |
4591 | ||
90314792 | 4592 | #: builtin/commit.c:1659 |
c04f5ac3 JX |
4593 | msgid "cannot update HEAD ref" |
4594 | msgstr "无法更新 HEAD 引用" | |
4595 | ||
90314792 | 4596 | #: builtin/commit.c:1670 |
c04f5ac3 JX |
4597 | msgid "" |
4598 | "Repository has been updated, but unable to write\n" | |
4599 | "new_index file. Check that disk is not full or quota is\n" | |
4600 | "not exceeded, and then \"git reset HEAD\" to recover." | |
4601 | msgstr "" | |
90e6ef53 JX |
4602 | "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n" |
4603 | "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。" | |
c04f5ac3 | 4604 | |
90314792 | 4605 | #: builtin/config.c:8 |
ef317cd5 | 4606 | msgid "git config [options]" |
07432cef | 4607 | msgstr "git config [选项]" |
ef317cd5 | 4608 | |
90314792 | 4609 | #: builtin/config.c:54 |
ef317cd5 | 4610 | msgid "Config file location" |
07432cef | 4611 | msgstr "配置文件位置" |
ef317cd5 | 4612 | |
90314792 | 4613 | #: builtin/config.c:55 |
ef317cd5 | 4614 | msgid "use global config file" |
07432cef | 4615 | msgstr "使用全局配置文件" |
ef317cd5 | 4616 | |
90314792 | 4617 | #: builtin/config.c:56 |
ef317cd5 | 4618 | msgid "use system config file" |
07432cef | 4619 | msgstr "使用系统级配置文件" |
ef317cd5 | 4620 | |
90314792 | 4621 | #: builtin/config.c:57 |
ef317cd5 | 4622 | msgid "use repository config file" |
07432cef | 4623 | msgstr "使用版本库级配置文件" |
ef317cd5 | 4624 | |
90314792 | 4625 | #: builtin/config.c:58 |
ef317cd5 | 4626 | msgid "use given config file" |
07432cef | 4627 | msgstr "使用指定的配置文件" |
ef317cd5 | 4628 | |
90314792 | 4629 | #: builtin/config.c:59 |
2e8451e8 JX |
4630 | msgid "blob-id" |
4631 | msgstr "数据对象ID" | |
4632 | ||
90314792 | 4633 | #: builtin/config.c:59 |
2e8451e8 JX |
4634 | msgid "read config from given blob object" |
4635 | msgstr "从给定的数据对象读取配置" | |
4636 | ||
90314792 | 4637 | #: builtin/config.c:60 |
ef317cd5 | 4638 | msgid "Action" |
07432cef | 4639 | msgstr "操作" |
ef317cd5 | 4640 | |
90314792 | 4641 | #: builtin/config.c:61 |
ef317cd5 | 4642 | msgid "get value: name [value-regex]" |
07432cef | 4643 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 4644 | |
90314792 | 4645 | #: builtin/config.c:62 |
ef317cd5 | 4646 | msgid "get all values: key [value-regex]" |
07432cef | 4647 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 4648 | |
90314792 | 4649 | #: builtin/config.c:63 |
ef317cd5 | 4650 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 4651 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 4652 | |
90314792 JX |
4653 | #: builtin/config.c:64 |
4654 | msgid "get value specific for the URL: section[.var] URL" | |
4655 | msgstr "获得 URL 取值:section[.var] URL" | |
4656 | ||
4657 | #: builtin/config.c:65 | |
ef317cd5 | 4658 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 4659 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 4660 | |
90314792 | 4661 | #: builtin/config.c:66 |
ef317cd5 | 4662 | msgid "add a new variable: name value" |
07432cef | 4663 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 4664 | |
90314792 | 4665 | #: builtin/config.c:67 |
ef317cd5 | 4666 | msgid "remove a variable: name [value-regex]" |
07432cef | 4667 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 4668 | |
90314792 | 4669 | #: builtin/config.c:68 |
ef317cd5 | 4670 | msgid "remove all matches: name [value-regex]" |
07432cef | 4671 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 4672 | |
90314792 | 4673 | #: builtin/config.c:69 |
ef317cd5 | 4674 | msgid "rename section: old-name new-name" |
07432cef | 4675 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 4676 | |
90314792 | 4677 | #: builtin/config.c:70 |
ef317cd5 | 4678 | msgid "remove a section: name" |
07432cef | 4679 | msgstr "删除一个小节:name" |
ef317cd5 | 4680 | |
90314792 | 4681 | #: builtin/config.c:71 |
ef317cd5 | 4682 | msgid "list all" |
07432cef | 4683 | msgstr "列出所有" |
ef317cd5 | 4684 | |
90314792 | 4685 | #: builtin/config.c:72 |
ef317cd5 | 4686 | msgid "open an editor" |
07432cef | 4687 | msgstr "打开一个编辑器" |
ef317cd5 | 4688 | |
90314792 | 4689 | #: builtin/config.c:73 builtin/config.c:74 |
ef317cd5 | 4690 | msgid "slot" |
07432cef | 4691 | msgstr "slot" |
ef317cd5 | 4692 | |
90314792 | 4693 | #: builtin/config.c:73 |
ef317cd5 | 4694 | msgid "find the color configured: [default]" |
07432cef | 4695 | msgstr "找到配置的颜色:[默认]" |
ef317cd5 | 4696 | |
90314792 | 4697 | #: builtin/config.c:74 |
ef317cd5 | 4698 | msgid "find the color setting: [stdout-is-tty]" |
07432cef | 4699 | msgstr "找到颜色设置:[stdout-is-tty]" |
ef317cd5 | 4700 | |
90314792 | 4701 | #: builtin/config.c:75 |
ef317cd5 | 4702 | msgid "Type" |
07432cef | 4703 | msgstr "类型" |
ef317cd5 | 4704 | |
90314792 | 4705 | #: builtin/config.c:76 |
ef317cd5 | 4706 | msgid "value is \"true\" or \"false\"" |
07432cef | 4707 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 4708 | |
90314792 | 4709 | #: builtin/config.c:77 |
ef317cd5 | 4710 | msgid "value is decimal number" |
07432cef | 4711 | msgstr "值是十进制数" |
ef317cd5 | 4712 | |
90314792 | 4713 | #: builtin/config.c:78 |
ef317cd5 | 4714 | msgid "value is --bool or --int" |
07432cef | 4715 | msgstr "值是 --bool or --int" |
ef317cd5 | 4716 | |
90314792 | 4717 | #: builtin/config.c:79 |
ef317cd5 | 4718 | msgid "value is a path (file or directory name)" |
07432cef | 4719 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 4720 | |
90314792 | 4721 | #: builtin/config.c:80 |
ef317cd5 | 4722 | msgid "Other" |
07432cef | 4723 | msgstr "其它" |
ef317cd5 | 4724 | |
90314792 | 4725 | #: builtin/config.c:81 |
ef317cd5 | 4726 | msgid "terminate values with NUL byte" |
07432cef | 4727 | msgstr "终止值是NUL字节" |
ef317cd5 | 4728 | |
90314792 | 4729 | #: builtin/config.c:82 |
ef317cd5 | 4730 | msgid "respect include directives on lookup" |
07432cef | 4731 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 4732 | |
1003b3a5 | 4733 | #: builtin/count-objects.c:82 |
4dcdc3d8 JX |
4734 | msgid "git count-objects [-v] [-H | --human-readable]" |
4735 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
4736 | ||
4737 | #: builtin/count-objects.c:97 | |
4738 | msgid "print sizes in human readable format" | |
4739 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 4740 | |
2e8451e8 | 4741 | #: builtin/describe.c:16 |
a8a5406a | 4742 | msgid "git describe [options] <commit-ish>*" |
07432cef | 4743 | msgstr "git describe [选项] <提交号>*" |
ef317cd5 | 4744 | |
2e8451e8 | 4745 | #: builtin/describe.c:17 |
ef317cd5 | 4746 | msgid "git describe [options] --dirty" |
07432cef | 4747 | msgstr "git describe [选项] --dirty" |
ef317cd5 | 4748 | |
2e8451e8 | 4749 | #: builtin/describe.c:237 |
c04f5ac3 JX |
4750 | #, c-format |
4751 | msgid "annotated tag %s not available" | |
4752 | msgstr "注释 tag %s 无效" | |
4753 | ||
2e8451e8 | 4754 | #: builtin/describe.c:241 |
c04f5ac3 JX |
4755 | #, c-format |
4756 | msgid "annotated tag %s has no embedded name" | |
4757 | msgstr "注释 tag %s 没有嵌入名称" | |
4758 | ||
2e8451e8 | 4759 | #: builtin/describe.c:243 |
c04f5ac3 JX |
4760 | #, c-format |
4761 | msgid "tag '%s' is really '%s' here" | |
90e6ef53 | 4762 | msgstr "tag '%s' 的确是在 '%s'" |
c04f5ac3 | 4763 | |
2e8451e8 | 4764 | #: builtin/describe.c:270 |
c04f5ac3 JX |
4765 | #, c-format |
4766 | msgid "Not a valid object name %s" | |
4767 | msgstr "不是一个有效的对象名 %s" | |
4768 | ||
2e8451e8 | 4769 | #: builtin/describe.c:273 |
c04f5ac3 JX |
4770 | #, c-format |
4771 | msgid "%s is not a valid '%s' object" | |
4772 | msgstr "%s 不是一个有效的 '%s' 对象" | |
4773 | ||
2e8451e8 | 4774 | #: builtin/describe.c:290 |
c04f5ac3 JX |
4775 | #, c-format |
4776 | msgid "no tag exactly matches '%s'" | |
4777 | msgstr "没有 tag 准确匹配 '%s'" | |
4778 | ||
2e8451e8 | 4779 | #: builtin/describe.c:292 |
c04f5ac3 JX |
4780 | #, c-format |
4781 | msgid "searching to describe %s\n" | |
4782 | msgstr "搜索描述 %s\n" | |
4783 | ||
2e8451e8 | 4784 | #: builtin/describe.c:332 |
c04f5ac3 JX |
4785 | #, c-format |
4786 | msgid "finished search at %s\n" | |
4787 | msgstr "完成搜索 %s\n" | |
4788 | ||
2e8451e8 | 4789 | #: builtin/describe.c:359 |
c04f5ac3 JX |
4790 | #, c-format |
4791 | msgid "" | |
4792 | "No annotated tags can describe '%s'.\n" | |
4793 | "However, there were unannotated tags: try --tags." | |
4794 | msgstr "" | |
4795 | "没有注释 tag 能描述 '%s'。\n" | |
4796 | "然而,有非注释 tag:尝试 --tags。" | |
4797 | ||
2e8451e8 | 4798 | #: builtin/describe.c:363 |
c04f5ac3 JX |
4799 | #, c-format |
4800 | msgid "" | |
4801 | "No tags can describe '%s'.\n" | |
4802 | "Try --always, or create some tags." | |
4803 | msgstr "" | |
4804 | "没有注释 tag 能描述 '%s'。\n" | |
90e6ef53 | 4805 | "尝试 --always,或者创建一些 tag。" |
c04f5ac3 | 4806 | |
2e8451e8 | 4807 | #: builtin/describe.c:384 |
c04f5ac3 JX |
4808 | #, c-format |
4809 | msgid "traversed %lu commits\n" | |
4810 | msgstr "已遍历 %lu 个提交\n" | |
4811 | ||
2e8451e8 | 4812 | #: builtin/describe.c:387 |
c04f5ac3 JX |
4813 | #, c-format |
4814 | msgid "" | |
4815 | "more than %i tags found; listed %i most recent\n" | |
4816 | "gave up search at %s\n" | |
4817 | msgstr "" | |
90e6ef53 JX |
4818 | "发现多于 %i 个 tag,列出最近的 %i 个\n" |
4819 | "在 %s 放弃搜索\n" | |
c04f5ac3 | 4820 | |
2e8451e8 | 4821 | #: builtin/describe.c:409 |
ef317cd5 | 4822 | msgid "find the tag that comes after the commit" |
07432cef | 4823 | msgstr "寻找提交之后的 tag(用于描述提交)" |
ef317cd5 | 4824 | |
2e8451e8 | 4825 | #: builtin/describe.c:410 |
ef317cd5 | 4826 | msgid "debug search strategy on stderr" |
07432cef | 4827 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 4828 | |
2e8451e8 | 4829 | #: builtin/describe.c:411 |
1003b3a5 JX |
4830 | msgid "use any ref" |
4831 | msgstr "使用任意引用" | |
4832 | ||
2e8451e8 | 4833 | #: builtin/describe.c:412 |
1003b3a5 JX |
4834 | msgid "use any tag, even unannotated" |
4835 | msgstr "使用任意 tag,即使未带注解" | |
ef317cd5 | 4836 | |
2e8451e8 | 4837 | #: builtin/describe.c:413 |
ef317cd5 | 4838 | msgid "always use long format" |
07432cef | 4839 | msgstr "始终使用长提交号格式" |
ef317cd5 | 4840 | |
2e8451e8 JX |
4841 | #: builtin/describe.c:414 |
4842 | msgid "only follow first parent" | |
4843 | msgstr "只跟随第一个父提交" | |
4844 | ||
4845 | #: builtin/describe.c:417 | |
ef317cd5 | 4846 | msgid "only output exact matches" |
07432cef | 4847 | msgstr "只输出精确匹配" |
ef317cd5 | 4848 | |
2e8451e8 | 4849 | #: builtin/describe.c:419 |
ef317cd5 | 4850 | msgid "consider <n> most recent tags (default: 10)" |
07432cef | 4851 | msgstr "考虑最近 <n> 个 tags(默认:10)" |
ef317cd5 | 4852 | |
2e8451e8 | 4853 | #: builtin/describe.c:421 |
ef317cd5 | 4854 | msgid "only consider tags matching <pattern>" |
07432cef | 4855 | msgstr "只考虑匹配 <模式> 的 tags" |
ef317cd5 | 4856 | |
2e8451e8 | 4857 | #: builtin/describe.c:423 builtin/name-rev.c:322 |
ef317cd5 | 4858 | msgid "show abbreviated commit object as fallback" |
07432cef | 4859 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 4860 | |
2e8451e8 | 4861 | #: builtin/describe.c:424 |
ef317cd5 | 4862 | msgid "mark" |
07432cef | 4863 | msgstr "标记" |
ef317cd5 | 4864 | |
2e8451e8 | 4865 | #: builtin/describe.c:425 |
ef317cd5 | 4866 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
07432cef | 4867 | msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 4868 | |
2e8451e8 | 4869 | #: builtin/describe.c:443 |
c04f5ac3 JX |
4870 | msgid "--long is incompatible with --abbrev=0" |
4871 | msgstr "--long 与 --abbrev=0 不兼容" | |
4872 | ||
2e8451e8 | 4873 | #: builtin/describe.c:469 |
c04f5ac3 | 4874 | msgid "No names found, cannot describe anything." |
90e6ef53 | 4875 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 4876 | |
2e8451e8 | 4877 | #: builtin/describe.c:489 |
a8a5406a | 4878 | msgid "--dirty is incompatible with commit-ishes" |
649900bc | 4879 | msgstr "--dirty 不能与提交同时使用" |
c04f5ac3 | 4880 | |
c160d03f | 4881 | #: builtin/diff.c:79 |
c04f5ac3 JX |
4882 | #, c-format |
4883 | msgid "'%s': not a regular file or symlink" | |
4884 | msgstr "'%s':不是一个正规文件或符号链接" | |
4885 | ||
2e8451e8 | 4886 | #: builtin/diff.c:230 |
c04f5ac3 JX |
4887 | #, c-format |
4888 | msgid "invalid option: %s" | |
4889 | msgstr "无效选项:%s" | |
4890 | ||
2e8451e8 | 4891 | #: builtin/diff.c:307 |
c04f5ac3 JX |
4892 | msgid "Not a git repository" |
4893 | msgstr "不是一个 git 版本库" | |
4894 | ||
2e8451e8 | 4895 | #: builtin/diff.c:350 |
c04f5ac3 JX |
4896 | #, c-format |
4897 | msgid "invalid object '%s' given." | |
4898 | msgstr "提供了无效对象 '%s'。" | |
4899 | ||
2e8451e8 | 4900 | #: builtin/diff.c:359 |
c04f5ac3 JX |
4901 | #, c-format |
4902 | msgid "more than two blobs given: '%s'" | |
07432cef | 4903 | msgstr "提供了超过两个数据(blob)对象:'%s'" |
c04f5ac3 | 4904 | |
2e8451e8 | 4905 | #: builtin/diff.c:366 |
c04f5ac3 JX |
4906 | #, c-format |
4907 | msgid "unhandled object '%s' given." | |
4908 | msgstr "提供了无法处理的对象 '%s'。" | |
4909 | ||
ef317cd5 JX |
4910 | #: builtin/fast-export.c:22 |
4911 | msgid "git fast-export [rev-list-opts]" | |
07432cef | 4912 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 4913 | |
90314792 | 4914 | #: builtin/fast-export.c:673 |
ef317cd5 | 4915 | msgid "show progress after <n> objects" |
07432cef | 4916 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 4917 | |
90314792 | 4918 | #: builtin/fast-export.c:675 |
ef317cd5 | 4919 | msgid "select handling of signed tags" |
07432cef | 4920 | msgstr "选择如何处理签名 tags" |
ef317cd5 | 4921 | |
90314792 | 4922 | #: builtin/fast-export.c:678 |
ef317cd5 | 4923 | msgid "select handling of tags that tag filtered objects" |
07432cef | 4924 | msgstr "选择当 tag 指向被过滤时 tags 的处理方式" |
ef317cd5 | 4925 | |
90314792 | 4926 | #: builtin/fast-export.c:681 |
ef317cd5 | 4927 | msgid "Dump marks to this file" |
07432cef | 4928 | msgstr "把标记存储到这个文件" |
ef317cd5 | 4929 | |
90314792 | 4930 | #: builtin/fast-export.c:683 |
ef317cd5 | 4931 | msgid "Import marks from this file" |
07432cef | 4932 | msgstr "从这个文件导入标记" |
ef317cd5 | 4933 | |
90314792 | 4934 | #: builtin/fast-export.c:685 |
ef317cd5 | 4935 | msgid "Fake a tagger when tags lack one" |
07432cef | 4936 | msgstr "当 tags 缺少标记者字段时,假装提供一个" |
ef317cd5 | 4937 | |
90314792 | 4938 | #: builtin/fast-export.c:687 |
ef317cd5 | 4939 | msgid "Output full tree for each commit" |
07432cef | 4940 | msgstr "每次提交都输出整个树" |
ef317cd5 | 4941 | |
90314792 | 4942 | #: builtin/fast-export.c:689 |
ef317cd5 | 4943 | msgid "Use the done feature to terminate the stream" |
07432cef | 4944 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 4945 | |
90314792 | 4946 | #: builtin/fast-export.c:690 |
ef317cd5 | 4947 | msgid "Skip output of blob data" |
07432cef | 4948 | msgstr "跳过数据对象的输出" |
ef317cd5 JX |
4949 | |
4950 | #: builtin/fetch.c:20 | |
ef317cd5 | 4951 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
90314792 | 4952 | msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]" |
ef317cd5 JX |
4953 | |
4954 | #: builtin/fetch.c:21 | |
4955 | msgid "git fetch [<options>] <group>" | |
07432cef | 4956 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 JX |
4957 | |
4958 | #: builtin/fetch.c:22 | |
4959 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" | |
07432cef | 4960 | msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" |
ef317cd5 JX |
4961 | |
4962 | #: builtin/fetch.c:23 | |
4963 | msgid "git fetch --all [<options>]" | |
07432cef | 4964 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 4965 | |
90314792 | 4966 | #: builtin/fetch.c:74 |
ef317cd5 | 4967 | msgid "fetch from all remotes" |
07432cef | 4968 | msgstr "从所有的远程抓取" |
ef317cd5 | 4969 | |
90314792 | 4970 | #: builtin/fetch.c:76 |
ef317cd5 | 4971 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 4972 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 4973 | |
90314792 | 4974 | #: builtin/fetch.c:78 |
ef317cd5 | 4975 | msgid "path to upload pack on remote end" |
07432cef | 4976 | msgstr "上传包到远程的路径" |
ef317cd5 | 4977 | |
90314792 | 4978 | #: builtin/fetch.c:79 |
ef317cd5 | 4979 | msgid "force overwrite of local branch" |
07432cef | 4980 | msgstr "强制覆盖本地分支" |
ef317cd5 | 4981 | |
90314792 | 4982 | #: builtin/fetch.c:81 |
ef317cd5 | 4983 | msgid "fetch from multiple remotes" |
07432cef | 4984 | msgstr "从多个远程抓取" |
ef317cd5 | 4985 | |
90314792 | 4986 | #: builtin/fetch.c:83 |
ef317cd5 | 4987 | msgid "fetch all tags and associated objects" |
07432cef | 4988 | msgstr "抓取所有的 tags 和关联对象" |
ef317cd5 | 4989 | |
90314792 | 4990 | #: builtin/fetch.c:85 |
ef317cd5 | 4991 | msgid "do not fetch all tags (--no-tags)" |
07432cef | 4992 | msgstr "不抓取任何 tags (--no-tags)" |
ef317cd5 | 4993 | |
90314792 | 4994 | #: builtin/fetch.c:87 |
ef317cd5 | 4995 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 4996 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 4997 | |
07432cef | 4998 | # 译者:可选值,不能翻译 |
90314792 | 4999 | #: builtin/fetch.c:88 |
ef317cd5 | 5000 | msgid "on-demand" |
07432cef | 5001 | msgstr "on-demand" |
ef317cd5 | 5002 | |
90314792 | 5003 | #: builtin/fetch.c:89 |
ef317cd5 | 5004 | msgid "control recursive fetching of submodules" |
07432cef | 5005 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 5006 | |
90314792 | 5007 | #: builtin/fetch.c:93 |
ef317cd5 | 5008 | msgid "keep downloaded pack" |
07432cef | 5009 | msgstr "保持下载包" |
ef317cd5 | 5010 | |
90314792 | 5011 | #: builtin/fetch.c:95 |
ef317cd5 | 5012 | msgid "allow updating of HEAD ref" |
07432cef | 5013 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 5014 | |
90314792 | 5015 | #: builtin/fetch.c:98 |
ef317cd5 | 5016 | msgid "deepen history of shallow clone" |
07432cef | 5017 | msgstr "深化浅克隆的历史" |
ef317cd5 | 5018 | |
90314792 | 5019 | #: builtin/fetch.c:100 |
a77c07d9 JX |
5020 | msgid "convert to a complete repository" |
5021 | msgstr "转换为一个完整的版本库" | |
5022 | ||
90314792 | 5023 | #: builtin/fetch.c:102 builtin/log.c:1197 |
ef317cd5 | 5024 | msgid "dir" |
07432cef | 5025 | msgstr "目录" |
ef317cd5 | 5026 | |
90314792 | 5027 | #: builtin/fetch.c:103 |
ef317cd5 | 5028 | msgid "prepend this to submodule path output" |
07432cef | 5029 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 5030 | |
90314792 | 5031 | #: builtin/fetch.c:106 |
ef317cd5 | 5032 | msgid "default mode for recursion" |
07432cef | 5033 | msgstr "递归的默认模式" |
ef317cd5 | 5034 | |
90314792 | 5035 | #: builtin/fetch.c:236 |
c04f5ac3 JX |
5036 | msgid "Couldn't find remote ref HEAD" |
5037 | msgstr "无法发现远程 HEAD 引用" | |
5038 | ||
90314792 | 5039 | #: builtin/fetch.c:290 |
c04f5ac3 JX |
5040 | #, c-format |
5041 | msgid "object %s not found" | |
5042 | msgstr "对象 %s 未发现" | |
5043 | ||
90314792 | 5044 | #: builtin/fetch.c:295 |
c04f5ac3 JX |
5045 | msgid "[up to date]" |
5046 | msgstr "[最新]" | |
5047 | ||
90314792 | 5048 | #: builtin/fetch.c:309 |
c04f5ac3 JX |
5049 | #, c-format |
5050 | msgid "! %-*s %-*s -> %s (can't fetch in current branch)" | |
5051 | msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)" | |
5052 | ||
90314792 | 5053 | #: builtin/fetch.c:310 builtin/fetch.c:396 |
c04f5ac3 JX |
5054 | msgid "[rejected]" |
5055 | msgstr "[已拒绝]" | |
5056 | ||
90314792 | 5057 | #: builtin/fetch.c:321 |
c04f5ac3 JX |
5058 | msgid "[tag update]" |
5059 | msgstr "[tag更新]" | |
5060 | ||
90e6ef53 | 5061 | # 译者:注意保持前导空格 |
90314792 | 5062 | #: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 |
c04f5ac3 JX |
5063 | msgid " (unable to update local ref)" |
5064 | msgstr " (不能更新本地引用)" | |
5065 | ||
90314792 | 5066 | #: builtin/fetch.c:341 |
c04f5ac3 JX |
5067 | msgid "[new tag]" |
5068 | msgstr "[新tag]" | |
5069 | ||
90314792 | 5070 | #: builtin/fetch.c:344 |
c04f5ac3 JX |
5071 | msgid "[new branch]" |
5072 | msgstr "[新分支]" | |
5073 | ||
90314792 | 5074 | #: builtin/fetch.c:347 |
170e9899 JX |
5075 | msgid "[new ref]" |
5076 | msgstr "[新引用]" | |
5077 | ||
90314792 | 5078 | #: builtin/fetch.c:392 |
c04f5ac3 JX |
5079 | msgid "unable to update local ref" |
5080 | msgstr "不能更新本地引用" | |
5081 | ||
90314792 | 5082 | #: builtin/fetch.c:392 |
c04f5ac3 JX |
5083 | msgid "forced update" |
5084 | msgstr "强制更新" | |
5085 | ||
90314792 | 5086 | #: builtin/fetch.c:398 |
c04f5ac3 | 5087 | msgid "(non-fast-forward)" |
90e6ef53 | 5088 | msgstr "(非快进式)" |
c04f5ac3 | 5089 | |
90314792 | 5090 | #: builtin/fetch.c:429 builtin/fetch.c:735 |
c04f5ac3 JX |
5091 | #, c-format |
5092 | msgid "cannot open %s: %s\n" | |
5093 | msgstr "无法打开 %s:%s\n" | |
5094 | ||
90314792 | 5095 | #: builtin/fetch.c:438 |
c04f5ac3 JX |
5096 | #, c-format |
5097 | msgid "%s did not send all necessary objects\n" | |
5098 | msgstr "%s 未发送所有必须的对象\n" | |
5099 | ||
90314792 | 5100 | #: builtin/fetch.c:537 |
c04f5ac3 JX |
5101 | #, c-format |
5102 | msgid "From %.*s\n" | |
5103 | msgstr "来自 %.*s\n" | |
5104 | ||
90314792 | 5105 | #: builtin/fetch.c:548 |
c04f5ac3 JX |
5106 | #, c-format |
5107 | msgid "" | |
5108 | "some local refs could not be updated; try running\n" | |
5109 | " 'git remote prune %s' to remove any old, conflicting branches" | |
5110 | msgstr "" | |
5111 | "一些本地引用不能被更新;尝试运行\n" | |
5112 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
5113 | ||
90e6ef53 | 5114 | # 译者:注意保持前导空格 |
90314792 | 5115 | #: builtin/fetch.c:598 |
81809b99 | 5116 | #, c-format |
8ada9598 | 5117 | msgid " (%s will become dangling)" |
07432cef | 5118 | msgstr " (%s 将成为摇摆状态)" |
c04f5ac3 | 5119 | |
90e6ef53 | 5120 | # 译者:注意保持前导空格 |
90314792 | 5121 | #: builtin/fetch.c:599 |
81809b99 | 5122 | #, c-format |
8ada9598 | 5123 | msgid " (%s has become dangling)" |
07432cef | 5124 | msgstr " (%s 已成为摇摆状态)" |
c04f5ac3 | 5125 | |
90314792 | 5126 | #: builtin/fetch.c:606 |
c04f5ac3 JX |
5127 | msgid "[deleted]" |
5128 | msgstr "[已删除]" | |
5129 | ||
90314792 | 5130 | #: builtin/fetch.c:607 builtin/remote.c:1055 |
c04f5ac3 JX |
5131 | msgid "(none)" |
5132 | msgstr "(无)" | |
5133 | ||
90314792 | 5134 | #: builtin/fetch.c:725 |
c04f5ac3 JX |
5135 | #, c-format |
5136 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
5137 | msgstr "拒绝获取到非裸版本库的当前分支 %s" | |
5138 | ||
90314792 | 5139 | #: builtin/fetch.c:744 |
c04f5ac3 JX |
5140 | #, c-format |
5141 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
5142 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
5143 | ||
90314792 | 5144 | #: builtin/fetch.c:747 |
c04f5ac3 JX |
5145 | #, c-format |
5146 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 5147 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 5148 | |
90314792 JX |
5149 | #: builtin/fetch.c:801 |
5150 | #, c-format | |
5151 | msgid "Don't know how to fetch from %s" | |
5152 | msgstr "不知道如何从 %s 获取" | |
5153 | ||
5154 | #: builtin/fetch.c:976 | |
c04f5ac3 JX |
5155 | #, c-format |
5156 | msgid "Fetching %s\n" | |
d4a8e00b | 5157 | msgstr "正在获取 %s\n" |
c04f5ac3 | 5158 | |
90314792 | 5159 | #: builtin/fetch.c:978 builtin/remote.c:100 |
c04f5ac3 JX |
5160 | #, c-format |
5161 | msgid "Could not fetch %s" | |
5162 | msgstr "不能获取 %s" | |
5163 | ||
90314792 | 5164 | #: builtin/fetch.c:997 |
c04f5ac3 JX |
5165 | msgid "" |
5166 | "No remote repository specified. Please, specify either a URL or a\n" | |
5167 | "remote name from which new revisions should be fetched." | |
90e6ef53 | 5168 | msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。" |
c04f5ac3 | 5169 | |
90314792 | 5170 | #: builtin/fetch.c:1020 |
c04f5ac3 | 5171 | msgid "You need to specify a tag name." |
90e6ef53 | 5172 | msgstr "您需要指定一个 tag 名称。" |
c04f5ac3 | 5173 | |
90314792 | 5174 | #: builtin/fetch.c:1068 |
a77c07d9 JX |
5175 | msgid "--depth and --unshallow cannot be used together" |
5176 | msgstr "--depth 和 --unshallow 不能同时使用" | |
5177 | ||
90314792 | 5178 | #: builtin/fetch.c:1070 |
a77c07d9 JX |
5179 | msgid "--unshallow on a complete repository does not make sense" |
5180 | msgstr "对于一个完整的版本库,参数 --unshallow 没有意义" | |
5181 | ||
90314792 | 5182 | #: builtin/fetch.c:1089 |
c04f5ac3 JX |
5183 | msgid "fetch --all does not take a repository argument" |
5184 | msgstr "fetch --all 不能带一个版本库参数" | |
5185 | ||
90314792 | 5186 | #: builtin/fetch.c:1091 |
c04f5ac3 | 5187 | msgid "fetch --all does not make sense with refspecs" |
90314792 | 5188 | msgstr "fetch --all 带引用规则没有任何意义" |
c04f5ac3 | 5189 | |
90314792 | 5190 | #: builtin/fetch.c:1102 |
c04f5ac3 JX |
5191 | #, c-format |
5192 | msgid "No such remote or remote group: %s" | |
5193 | msgstr "没有这样的远程或远程组:%s" | |
5194 | ||
90314792 | 5195 | #: builtin/fetch.c:1110 |
c04f5ac3 | 5196 | msgid "Fetching a group and specifying refspecs does not make sense" |
90314792 | 5197 | msgstr "获取组并指定引用规则没有意义" |
c04f5ac3 | 5198 | |
ef317cd5 JX |
5199 | #: builtin/fmt-merge-msg.c:13 |
5200 | msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" | |
5201 | msgstr "" | |
07432cef | 5202 | "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" |
c04f5ac3 | 5203 | |
90314792 JX |
5204 | #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 |
5205 | #: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 | |
5206 | #: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 | |
ef317cd5 | 5207 | msgid "n" |
07432cef | 5208 | msgstr "n" |
c04f5ac3 | 5209 | |
4dcdc3d8 | 5210 | #: builtin/fmt-merge-msg.c:664 |
ef317cd5 | 5211 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 5212 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 5213 | |
4dcdc3d8 | 5214 | #: builtin/fmt-merge-msg.c:667 |
ef317cd5 | 5215 | msgid "alias for --log (deprecated)" |
07432cef | 5216 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 5217 | |
4dcdc3d8 | 5218 | #: builtin/fmt-merge-msg.c:670 |
ef317cd5 | 5219 | msgid "text" |
07432cef | 5220 | msgstr "文本" |
ef317cd5 | 5221 | |
4dcdc3d8 | 5222 | #: builtin/fmt-merge-msg.c:671 |
ef317cd5 | 5223 | msgid "use <text> as start of message" |
07432cef | 5224 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 5225 | |
4dcdc3d8 | 5226 | #: builtin/fmt-merge-msg.c:672 |
ef317cd5 | 5227 | msgid "file to read from" |
07432cef | 5228 | msgstr "从文件中读取" |
ef317cd5 | 5229 | |
90314792 | 5230 | #: builtin/for-each-ref.c:995 |
ef317cd5 | 5231 | msgid "git for-each-ref [options] [<pattern>]" |
07432cef | 5232 | msgstr "git for-each-ref [选项] [<模式>]" |
ef317cd5 | 5233 | |
90314792 | 5234 | #: builtin/for-each-ref.c:1010 |
ef317cd5 | 5235 | msgid "quote placeholders suitably for shells" |
07432cef | 5236 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 5237 | |
90314792 | 5238 | #: builtin/for-each-ref.c:1012 |
ef317cd5 | 5239 | msgid "quote placeholders suitably for perl" |
07432cef | 5240 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 5241 | |
90314792 | 5242 | #: builtin/for-each-ref.c:1014 |
ef317cd5 | 5243 | msgid "quote placeholders suitably for python" |
07432cef | 5244 | msgstr "引用占位符适用于 python" |
ef317cd5 | 5245 | |
90314792 | 5246 | #: builtin/for-each-ref.c:1016 |
ef317cd5 | 5247 | msgid "quote placeholders suitably for tcl" |
07432cef | 5248 | msgstr "引用占位符适用于 tcl" |
ef317cd5 | 5249 | |
90314792 | 5250 | #: builtin/for-each-ref.c:1019 |
ef317cd5 | 5251 | msgid "show only <n> matched refs" |
07432cef | 5252 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 5253 | |
90314792 | 5254 | #: builtin/for-each-ref.c:1020 |
ef317cd5 | 5255 | msgid "format" |
07432cef | 5256 | msgstr "格式" |
ef317cd5 | 5257 | |
90314792 | 5258 | #: builtin/for-each-ref.c:1020 |
ef317cd5 | 5259 | msgid "format to use for the output" |
07432cef | 5260 | msgstr "输出格式" |
ef317cd5 | 5261 | |
90314792 | 5262 | #: builtin/for-each-ref.c:1021 |
ef317cd5 | 5263 | msgid "key" |
07432cef | 5264 | msgstr "key" |
ef317cd5 | 5265 | |
90314792 | 5266 | #: builtin/for-each-ref.c:1022 |
ef317cd5 | 5267 | msgid "field name to sort on" |
07432cef | 5268 | msgstr "排序的字段名" |
ef317cd5 | 5269 | |
90314792 | 5270 | #: builtin/fsck.c:607 |
ef317cd5 | 5271 | msgid "git fsck [options] [<object>...]" |
07432cef | 5272 | msgstr "git fsck [选项] [<对象>...]" |
ef317cd5 | 5273 | |
90314792 | 5274 | #: builtin/fsck.c:613 |
ef317cd5 | 5275 | msgid "show unreachable objects" |
07432cef | 5276 | msgstr "显示不可达的对象" |
ef317cd5 | 5277 | |
90314792 | 5278 | #: builtin/fsck.c:614 |
ef317cd5 | 5279 | msgid "show dangling objects" |
07432cef | 5280 | msgstr "显示摇摆的对象" |
ef317cd5 | 5281 | |
90314792 | 5282 | #: builtin/fsck.c:615 |
ef317cd5 | 5283 | msgid "report tags" |
07432cef | 5284 | msgstr "报告 tags" |
ef317cd5 | 5285 | |
90314792 | 5286 | #: builtin/fsck.c:616 |
ef317cd5 | 5287 | msgid "report root nodes" |
07432cef | 5288 | msgstr "报告根节点" |
ef317cd5 | 5289 | |
90314792 | 5290 | #: builtin/fsck.c:617 |
ef317cd5 | 5291 | msgid "make index objects head nodes" |
07432cef | 5292 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 5293 | |
90314792 | 5294 | #: builtin/fsck.c:618 |
ef317cd5 | 5295 | msgid "make reflogs head nodes (default)" |
07432cef | 5296 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 5297 | |
90314792 | 5298 | #: builtin/fsck.c:619 |
ef317cd5 | 5299 | msgid "also consider packs and alternate objects" |
07432cef | 5300 | msgstr "也考虑包和备用对象" |
ef317cd5 | 5301 | |
90314792 | 5302 | #: builtin/fsck.c:620 |
ef317cd5 | 5303 | msgid "enable more strict checking" |
07432cef | 5304 | msgstr "启用更严格的检查" |
ef317cd5 | 5305 | |
90314792 | 5306 | #: builtin/fsck.c:622 |
ef317cd5 | 5307 | msgid "write dangling objects in .git/lost-found" |
07432cef | 5308 | msgstr "将摇摆对象写入 .git/lost-found 中" |
ef317cd5 | 5309 | |
90314792 | 5310 | #: builtin/fsck.c:623 builtin/prune.c:134 |
ef317cd5 | 5311 | msgid "show progress" |
07432cef | 5312 | msgstr "显示进度" |
ef317cd5 | 5313 | |
90314792 | 5314 | #: builtin/gc.c:23 |
ef317cd5 | 5315 | msgid "git gc [options]" |
07432cef | 5316 | msgstr "git gc [选项]" |
ef317cd5 | 5317 | |
90314792 | 5318 | #: builtin/gc.c:79 |
c04f5ac3 JX |
5319 | #, c-format |
5320 | msgid "Invalid %s: '%s'" | |
5321 | msgstr "无效的 %s:'%s'" | |
5322 | ||
90314792 | 5323 | #: builtin/gc.c:106 |
c04f5ac3 JX |
5324 | #, c-format |
5325 | msgid "insanely long object directory %.*s" | |
5326 | msgstr "不正常的长对象目录 %.*s" | |
5327 | ||
90314792 | 5328 | #: builtin/gc.c:261 |
ef317cd5 | 5329 | msgid "prune unreferenced objects" |
07432cef | 5330 | msgstr "清除未引用的对象" |
ef317cd5 | 5331 | |
90314792 | 5332 | #: builtin/gc.c:263 |
ef317cd5 | 5333 | msgid "be more thorough (increased runtime)" |
07432cef | 5334 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 5335 | |
90314792 | 5336 | #: builtin/gc.c:264 |
ef317cd5 | 5337 | msgid "enable auto-gc mode" |
07432cef | 5338 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 5339 | |
90314792 JX |
5340 | #: builtin/gc.c:265 |
5341 | msgid "force running gc even if there may be another gc running" | |
5342 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
5343 | ||
5344 | #: builtin/gc.c:305 | |
c04f5ac3 JX |
5345 | #, c-format |
5346 | msgid "" | |
5347 | "Auto packing the repository for optimum performance. You may also\n" | |
5348 | "run \"git gc\" manually. See \"git help gc\" for more information.\n" | |
5349 | msgstr "" | |
90e6ef53 JX |
5350 | "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" |
5351 | "参见 \"git help gc\" 以获取更多信息。\n" | |
c04f5ac3 | 5352 | |
90314792 JX |
5353 | #. be quiet on --auto |
5354 | #: builtin/gc.c:315 | |
5355 | #, c-format | |
5356 | msgid "" | |
5357 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
5358 | msgstr "" | |
5359 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)" | |
5360 | ||
5361 | #: builtin/gc.c:340 | |
c04f5ac3 JX |
5362 | msgid "" |
5363 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 5364 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 5365 | |
90314792 | 5366 | #: builtin/grep.c:23 |
ef317cd5 | 5367 | msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" |
07432cef | 5368 | msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]" |
ef317cd5 | 5369 | |
90314792 | 5370 | #: builtin/grep.c:218 |
c04f5ac3 JX |
5371 | #, c-format |
5372 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 5373 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 5374 | |
90314792 | 5375 | #: builtin/grep.c:365 |
c04f5ac3 JX |
5376 | #, c-format |
5377 | msgid "Failed to chdir: %s" | |
5378 | msgstr "无法切换目录:%s" | |
5379 | ||
90314792 | 5380 | #: builtin/grep.c:443 builtin/grep.c:478 |
c04f5ac3 JX |
5381 | #, c-format |
5382 | msgid "unable to read tree (%s)" | |
90e6ef53 | 5383 | msgstr "无法读取树(%s)" |
c04f5ac3 | 5384 | |
90314792 | 5385 | #: builtin/grep.c:493 |
c04f5ac3 JX |
5386 | #, c-format |
5387 | msgid "unable to grep from object of type %s" | |
5388 | msgstr "无法抓取来自于 %s 类型的对象" | |
5389 | ||
90314792 | 5390 | #: builtin/grep.c:551 |
c04f5ac3 JX |
5391 | #, c-format |
5392 | msgid "switch `%c' expects a numerical value" | |
5393 | msgstr "开关 `%c' 期望一个数字值" | |
5394 | ||
90314792 | 5395 | #: builtin/grep.c:568 |
c04f5ac3 JX |
5396 | #, c-format |
5397 | msgid "cannot open '%s'" | |
5398 | msgstr "不能打开 '%s'" | |
5399 | ||
2e8451e8 | 5400 | #: builtin/grep.c:642 |
ef317cd5 | 5401 | msgid "search in index instead of in the work tree" |
07432cef | 5402 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 5403 | |
2e8451e8 | 5404 | #: builtin/grep.c:644 |
ef317cd5 | 5405 | msgid "find in contents not managed by git" |
07432cef | 5406 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
5407 | |
5408 | # 译者:中文字符串拼接,可删除前导空格 | |
2e8451e8 | 5409 | #: builtin/grep.c:646 |
ef317cd5 | 5410 | msgid "search in both tracked and untracked files" |
07432cef | 5411 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 5412 | |
2e8451e8 | 5413 | #: builtin/grep.c:648 |
ef317cd5 | 5414 | msgid "search also in ignored files" |
07432cef | 5415 | msgstr "也在忽略的文件中搜索" |
ef317cd5 | 5416 | |
2e8451e8 | 5417 | #: builtin/grep.c:651 |
ef317cd5 | 5418 | msgid "show non-matching lines" |
07432cef | 5419 | msgstr "显示未匹配的行" |
ef317cd5 | 5420 | |
2e8451e8 | 5421 | #: builtin/grep.c:653 |
ef317cd5 | 5422 | msgid "case insensitive matching" |
07432cef | 5423 | msgstr "不区分大小写匹配" |
ef317cd5 | 5424 | |
2e8451e8 | 5425 | #: builtin/grep.c:655 |
ef317cd5 | 5426 | msgid "match patterns only at word boundaries" |
07432cef | 5427 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 5428 | |
2e8451e8 | 5429 | #: builtin/grep.c:657 |
ef317cd5 | 5430 | msgid "process binary files as text" |
07432cef | 5431 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 5432 | |
2e8451e8 | 5433 | #: builtin/grep.c:659 |
ef317cd5 | 5434 | msgid "don't match patterns in binary files" |
07432cef | 5435 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 5436 | |
2e8451e8 | 5437 | #: builtin/grep.c:662 |
90314792 JX |
5438 | msgid "process binary files with textconv filters" |
5439 | msgstr "用 textconv 过滤器处理二进制文件" | |
5440 | ||
5441 | #: builtin/grep.c:664 | |
ef317cd5 | 5442 | msgid "descend at most <depth> levels" |
07432cef | 5443 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 5444 | |
90314792 | 5445 | #: builtin/grep.c:668 |
ef317cd5 | 5446 | msgid "use extended POSIX regular expressions" |
07432cef | 5447 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 5448 | |
90314792 | 5449 | #: builtin/grep.c:671 |
ef317cd5 | 5450 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 5451 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 5452 | |
90314792 | 5453 | #: builtin/grep.c:674 |
ef317cd5 | 5454 | msgid "interpret patterns as fixed strings" |
07432cef | 5455 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 5456 | |
90314792 | 5457 | #: builtin/grep.c:677 |
ef317cd5 | 5458 | msgid "use Perl-compatible regular expressions" |
07432cef | 5459 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 5460 | |
90314792 | 5461 | #: builtin/grep.c:680 |
ef317cd5 | 5462 | msgid "show line numbers" |
07432cef | 5463 | msgstr "显示行号" |
ef317cd5 | 5464 | |
90314792 | 5465 | #: builtin/grep.c:681 |
ef317cd5 | 5466 | msgid "don't show filenames" |
07432cef | 5467 | msgstr "不显示文件名" |
ef317cd5 | 5468 | |
90314792 | 5469 | #: builtin/grep.c:682 |
ef317cd5 | 5470 | msgid "show filenames" |
07432cef | 5471 | msgstr "显示文件名" |
ef317cd5 | 5472 | |
90314792 | 5473 | #: builtin/grep.c:684 |
ef317cd5 | 5474 | msgid "show filenames relative to top directory" |
07432cef | 5475 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 5476 | |
90314792 | 5477 | #: builtin/grep.c:686 |
ef317cd5 | 5478 | msgid "show only filenames instead of matching lines" |
07432cef | 5479 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 5480 | |
90314792 | 5481 | #: builtin/grep.c:688 |
ef317cd5 | 5482 | msgid "synonym for --files-with-matches" |
07432cef | 5483 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 5484 | |
90314792 | 5485 | #: builtin/grep.c:691 |
ef317cd5 | 5486 | msgid "show only the names of files without match" |
07432cef | 5487 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 5488 | |
90314792 | 5489 | #: builtin/grep.c:693 |
ef317cd5 | 5490 | msgid "print NUL after filenames" |
07432cef | 5491 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 5492 | |
90314792 | 5493 | #: builtin/grep.c:695 |
ef317cd5 | 5494 | msgid "show the number of matches instead of matching lines" |
07432cef | 5495 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 5496 | |
90314792 | 5497 | #: builtin/grep.c:696 |
ef317cd5 | 5498 | msgid "highlight matches" |
07432cef | 5499 | msgstr "高亮显示匹配项" |
ef317cd5 | 5500 | |
90314792 | 5501 | #: builtin/grep.c:698 |
ef317cd5 | 5502 | msgid "print empty line between matches from different files" |
07432cef | 5503 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 5504 | |
90314792 | 5505 | #: builtin/grep.c:700 |
ef317cd5 | 5506 | msgid "show filename only once above matches from same file" |
07432cef | 5507 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 5508 | |
90314792 | 5509 | #: builtin/grep.c:703 |
ef317cd5 | 5510 | msgid "show <n> context lines before and after matches" |
07432cef | 5511 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 5512 | |
90314792 | 5513 | #: builtin/grep.c:706 |
ef317cd5 | 5514 | msgid "show <n> context lines before matches" |
07432cef | 5515 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 5516 | |
90314792 | 5517 | #: builtin/grep.c:708 |
ef317cd5 | 5518 | msgid "show <n> context lines after matches" |
07432cef | 5519 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 5520 | |
90314792 | 5521 | #: builtin/grep.c:709 |
ef317cd5 | 5522 | msgid "shortcut for -C NUM" |
07432cef | 5523 | msgstr "快捷键 -C 数字" |
ef317cd5 | 5524 | |
90314792 | 5525 | #: builtin/grep.c:712 |
ef317cd5 | 5526 | msgid "show a line with the function name before matches" |
07432cef | 5527 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 5528 | |
90314792 | 5529 | #: builtin/grep.c:714 |
ef317cd5 | 5530 | msgid "show the surrounding function" |
07432cef | 5531 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 5532 | |
90314792 | 5533 | #: builtin/grep.c:717 |
ef317cd5 | 5534 | msgid "read patterns from file" |
07432cef | 5535 | msgstr "从文件读取模式" |
ef317cd5 | 5536 | |
90314792 | 5537 | #: builtin/grep.c:719 |
ef317cd5 | 5538 | msgid "match <pattern>" |
07432cef | 5539 | msgstr "匹配 <模式>" |
ef317cd5 | 5540 | |
90314792 | 5541 | #: builtin/grep.c:721 |
ef317cd5 | 5542 | msgid "combine patterns specified with -e" |
07432cef | 5543 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 5544 | |
90314792 | 5545 | #: builtin/grep.c:733 |
ef317cd5 | 5546 | msgid "indicate hit with exit status without output" |
07432cef | 5547 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 5548 | |
90314792 | 5549 | #: builtin/grep.c:735 |
ef317cd5 | 5550 | msgid "show only matches from files that match all patterns" |
07432cef | 5551 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 5552 | |
90314792 | 5553 | #: builtin/grep.c:737 |
07432cef WS |
5554 | msgid "show parse tree for grep expression" |
5555 | msgstr "显示 grep 表达式的解析树" | |
5556 | ||
90314792 | 5557 | #: builtin/grep.c:741 |
ef317cd5 | 5558 | msgid "pager" |
07432cef | 5559 | msgstr "分页" |
ef317cd5 | 5560 | |
90314792 | 5561 | #: builtin/grep.c:741 |
ef317cd5 | 5562 | msgid "show matching files in the pager" |
07432cef | 5563 | msgstr "分页显示匹配的文件" |
ef317cd5 | 5564 | |
90314792 | 5565 | #: builtin/grep.c:744 |
ef317cd5 | 5566 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 5567 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 5568 | |
90314792 | 5569 | #: builtin/grep.c:745 builtin/show-ref.c:187 |
ef317cd5 | 5570 | msgid "show usage" |
07432cef | 5571 | msgstr "显示用法" |
ef317cd5 | 5572 | |
90314792 | 5573 | #: builtin/grep.c:812 |
c04f5ac3 JX |
5574 | msgid "no pattern given." |
5575 | msgstr "未提供模式匹配。" | |
5576 | ||
90314792 | 5577 | #: builtin/grep.c:870 |
c04f5ac3 JX |
5578 | msgid "--open-files-in-pager only works on the worktree" |
5579 | msgstr "--open-files-in-pager 仅用于工作区" | |
5580 | ||
90314792 | 5581 | #: builtin/grep.c:893 |
c04f5ac3 | 5582 | msgid "--cached or --untracked cannot be used with --no-index." |
649900bc | 5583 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" |
c04f5ac3 | 5584 | |
90314792 | 5585 | #: builtin/grep.c:898 |
c04f5ac3 | 5586 | msgid "--no-index or --untracked cannot be used with revs." |
649900bc | 5587 | msgstr "--no-index 或 --untracked 不能和版本同时使用。" |
c04f5ac3 | 5588 | |
90314792 | 5589 | #: builtin/grep.c:901 |
c04f5ac3 | 5590 | msgid "--[no-]exclude-standard cannot be used for tracked contents." |
90e6ef53 | 5591 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" |
c04f5ac3 | 5592 | |
90314792 | 5593 | #: builtin/grep.c:909 |
c04f5ac3 JX |
5594 | msgid "both --cached and trees are given." |
5595 | msgstr "同时给出了 --cached 和树对象。" | |
5596 | ||
ef317cd5 JX |
5597 | #: builtin/hash-object.c:60 |
5598 | msgid "" | |
5599 | "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " | |
5600 | "<file>..." | |
5601 | msgstr "" | |
07432cef WS |
5602 | "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " |
5603 | "<文件>..." | |
ef317cd5 JX |
5604 | |
5605 | #: builtin/hash-object.c:61 | |
5606 | msgid "git hash-object --stdin-paths < <list-of-paths>" | |
07432cef | 5607 | msgstr "git hash-object --stdin-paths < <路径列表>" |
ef317cd5 JX |
5608 | |
5609 | #: builtin/hash-object.c:72 | |
5610 | msgid "type" | |
07432cef | 5611 | msgstr "类型" |
ef317cd5 JX |
5612 | |
5613 | #: builtin/hash-object.c:72 | |
ef317cd5 | 5614 | msgid "object type" |
07432cef | 5615 | msgstr "对象类型" |
ef317cd5 JX |
5616 | |
5617 | #: builtin/hash-object.c:73 | |
5618 | msgid "write the object into the object database" | |
07432cef | 5619 | msgstr "将对象写入对象数据库" |
ef317cd5 JX |
5620 | |
5621 | #: builtin/hash-object.c:74 | |
5622 | msgid "read the object from stdin" | |
07432cef | 5623 | msgstr "从标准输入读取对象" |
ef317cd5 JX |
5624 | |
5625 | #: builtin/hash-object.c:76 | |
5626 | msgid "store file as is without filters" | |
07432cef | 5627 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 JX |
5628 | |
5629 | #: builtin/hash-object.c:77 | |
5630 | msgid "process file as it were from this path" | |
07432cef | 5631 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 5632 | |
2e8451e8 | 5633 | #: builtin/help.c:41 |
ef317cd5 | 5634 | msgid "print all available commands" |
07432cef | 5635 | msgstr "打印所有可用的命令" |
ef317cd5 | 5636 | |
2e8451e8 | 5637 | #: builtin/help.c:42 |
4dcdc3d8 JX |
5638 | msgid "print list of useful guides" |
5639 | msgstr "显示有用的指南列表" | |
5640 | ||
2e8451e8 | 5641 | #: builtin/help.c:43 |
ef317cd5 | 5642 | msgid "show man page" |
07432cef | 5643 | msgstr "显示 man 手册" |
ef317cd5 | 5644 | |
2e8451e8 | 5645 | #: builtin/help.c:44 |
ef317cd5 | 5646 | msgid "show manual in web browser" |
07432cef | 5647 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 5648 | |
2e8451e8 | 5649 | #: builtin/help.c:46 |
ef317cd5 | 5650 | msgid "show info page" |
07432cef | 5651 | msgstr "显示 info 手册" |
ef317cd5 | 5652 | |
2e8451e8 | 5653 | #: builtin/help.c:52 |
4dcdc3d8 JX |
5654 | msgid "git help [--all] [--guides] [--man|--web|--info] [command]" |
5655 | msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" | |
ef317cd5 | 5656 | |
2e8451e8 | 5657 | #: builtin/help.c:64 |
81809b99 | 5658 | #, c-format |
8ada9598 | 5659 | msgid "unrecognized help format '%s'" |
81809b99 | 5660 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 5661 | |
2e8451e8 | 5662 | #: builtin/help.c:92 |
8ada9598 | 5663 | msgid "Failed to start emacsclient." |
81809b99 | 5664 | msgstr "无法启动 emacsclient。" |
8ada9598 | 5665 | |
2e8451e8 | 5666 | #: builtin/help.c:105 |
8ada9598 | 5667 | msgid "Failed to parse emacsclient version." |
81809b99 | 5668 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 5669 | |
2e8451e8 | 5670 | #: builtin/help.c:113 |
8ada9598 JX |
5671 | #, c-format |
5672 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 5673 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 5674 | |
2e8451e8 | 5675 | #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 |
81809b99 | 5676 | #, c-format |
8ada9598 | 5677 | msgid "failed to exec '%s': %s" |
81809b99 | 5678 | msgstr "无法执行 '%s':%s" |
8ada9598 | 5679 | |
2e8451e8 | 5680 | #: builtin/help.c:216 |
8ada9598 JX |
5681 | #, c-format |
5682 | msgid "" | |
5683 | "'%s': path for unsupported man viewer.\n" | |
5684 | "Please consider using 'man.<tool>.cmd' instead." | |
5685 | msgstr "" | |
81809b99 JX |
5686 | "'%s':不支持的 man 手册查看器的路径。\n" |
5687 | "请使用 'man.<tool>.cmd'。" | |
8ada9598 | 5688 | |
2e8451e8 | 5689 | #: builtin/help.c:228 |
8ada9598 JX |
5690 | #, c-format |
5691 | msgid "" | |
5692 | "'%s': cmd for supported man viewer.\n" | |
5693 | "Please consider using 'man.<tool>.path' instead." | |
5694 | msgstr "" | |
81809b99 JX |
5695 | "'%s': 支持的 man 手册查看器命令。\n" |
5696 | "请使用 'man.<tool>.path'。" | |
8ada9598 | 5697 | |
2e8451e8 | 5698 | #: builtin/help.c:349 |
8ada9598 JX |
5699 | #, c-format |
5700 | msgid "'%s': unknown man viewer." | |
81809b99 | 5701 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 5702 | |
2e8451e8 | 5703 | #: builtin/help.c:366 |
8ada9598 | 5704 | msgid "no man viewer handled the request" |
81809b99 | 5705 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 5706 | |
2e8451e8 | 5707 | #: builtin/help.c:374 |
8ada9598 | 5708 | msgid "no info viewer handled the request" |
81809b99 | 5709 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 5710 | |
2e8451e8 | 5711 | #: builtin/help.c:420 |
4dcdc3d8 JX |
5712 | msgid "Defining attributes per path" |
5713 | msgstr "定义路径的属性" | |
5714 | ||
2e8451e8 | 5715 | #: builtin/help.c:421 |
4dcdc3d8 JX |
5716 | msgid "A Git glossary" |
5717 | msgstr "Git 词汇表" | |
5718 | ||
2e8451e8 | 5719 | #: builtin/help.c:422 |
4dcdc3d8 JX |
5720 | msgid "Specifies intentionally untracked files to ignore" |
5721 | msgstr "忽略指定的未跟踪文件" | |
5722 | ||
2e8451e8 | 5723 | #: builtin/help.c:423 |
4dcdc3d8 JX |
5724 | msgid "Defining submodule properties" |
5725 | msgstr "定义子模组属性" | |
5726 | ||
2e8451e8 | 5727 | #: builtin/help.c:424 |
4dcdc3d8 JX |
5728 | msgid "Specifying revisions and ranges for Git" |
5729 | msgstr "指定 Git 的版本和版本范围" | |
5730 | ||
2e8451e8 | 5731 | #: builtin/help.c:425 |
4dcdc3d8 JX |
5732 | msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" |
5733 | msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" | |
5734 | ||
2e8451e8 | 5735 | #: builtin/help.c:426 |
4dcdc3d8 JX |
5736 | msgid "An overview of recommended workflows with Git" |
5737 | msgstr "Git 推荐的工作流概览" | |
5738 | ||
2e8451e8 | 5739 | #: builtin/help.c:438 |
4dcdc3d8 JX |
5740 | msgid "The common Git guides are:\n" |
5741 | msgstr "最常用的 Git 向导有:\n" | |
5742 | ||
2e8451e8 | 5743 | #: builtin/help.c:460 builtin/help.c:476 |
8ada9598 JX |
5744 | #, c-format |
5745 | msgid "usage: %s%s" | |
81809b99 | 5746 | msgstr "用法:%s%s" |
8ada9598 | 5747 | |
2e8451e8 | 5748 | #: builtin/help.c:492 |
8ada9598 JX |
5749 | #, c-format |
5750 | msgid "`git %s' is aliased to `%s'" | |
81809b99 | 5751 | msgstr "`git %s' 是 `%s' 的别名" |
8ada9598 | 5752 | |
2e8451e8 | 5753 | #: builtin/index-pack.c:184 |
8ada9598 JX |
5754 | #, c-format |
5755 | msgid "object type mismatch at %s" | |
81809b99 | 5756 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 5757 | |
2e8451e8 | 5758 | #: builtin/index-pack.c:204 |
8ada9598 | 5759 | msgid "object of unexpected type" |
81809b99 | 5760 | msgstr "意外的类型的对象" |
8ada9598 | 5761 | |
2e8451e8 | 5762 | #: builtin/index-pack.c:244 |
81809b99 | 5763 | #, c-format |
8ada9598 JX |
5764 | msgid "cannot fill %d byte" |
5765 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 5766 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 5767 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 5768 | |
2e8451e8 | 5769 | #: builtin/index-pack.c:254 |
8ada9598 | 5770 | msgid "early EOF" |
81809b99 | 5771 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 5772 | |
2e8451e8 | 5773 | #: builtin/index-pack.c:255 |
8ada9598 | 5774 | msgid "read error on input" |
81809b99 | 5775 | msgstr "输入上的读错误" |
8ada9598 | 5776 | |
2e8451e8 | 5777 | #: builtin/index-pack.c:267 |
8ada9598 | 5778 | msgid "used more bytes than were available" |
81809b99 | 5779 | msgstr "用掉了超过可用的字节" |
8ada9598 | 5780 | |
2e8451e8 | 5781 | #: builtin/index-pack.c:274 |
8ada9598 | 5782 | msgid "pack too large for current definition of off_t" |
81809b99 | 5783 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 5784 | |
2e8451e8 | 5785 | #: builtin/index-pack.c:290 |
81809b99 | 5786 | #, c-format |
8ada9598 | 5787 | msgid "unable to create '%s'" |
81809b99 | 5788 | msgstr "不能创建 '%s'" |
8ada9598 | 5789 | |
2e8451e8 | 5790 | #: builtin/index-pack.c:295 |
81809b99 | 5791 | #, c-format |
8ada9598 | 5792 | msgid "cannot open packfile '%s'" |
81809b99 | 5793 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 5794 | |
2e8451e8 | 5795 | #: builtin/index-pack.c:309 |
8ada9598 | 5796 | msgid "pack signature mismatch" |
81809b99 | 5797 | msgstr "包签名不匹配" |
8ada9598 | 5798 | |
2e8451e8 | 5799 | #: builtin/index-pack.c:311 |
ef317cd5 JX |
5800 | #, c-format |
5801 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 5802 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 5803 | |
2e8451e8 | 5804 | #: builtin/index-pack.c:329 |
8ada9598 JX |
5805 | #, c-format |
5806 | msgid "pack has bad object at offset %lu: %s" | |
81809b99 | 5807 | msgstr "包中有错误的对象位于 %lu:%s" |
8ada9598 | 5808 | |
2e8451e8 | 5809 | #: builtin/index-pack.c:451 |
8ada9598 JX |
5810 | #, c-format |
5811 | msgid "inflate returned %d" | |
81809b99 | 5812 | msgstr "解压缩返回 %d" |
8ada9598 | 5813 | |
2e8451e8 | 5814 | #: builtin/index-pack.c:500 |
8ada9598 | 5815 | msgid "offset value overflow for delta base object" |
81809b99 | 5816 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 5817 | |
2e8451e8 | 5818 | #: builtin/index-pack.c:508 |
8ada9598 | 5819 | msgid "delta base offset is out of bound" |
81809b99 | 5820 | msgstr "delta 基准偏移越界" |
8ada9598 | 5821 | |
2e8451e8 | 5822 | #: builtin/index-pack.c:516 |
81809b99 | 5823 | #, c-format |
8ada9598 | 5824 | msgid "unknown object type %d" |
81809b99 | 5825 | msgstr "未知对象类型 %d" |
8ada9598 | 5826 | |
2e8451e8 | 5827 | #: builtin/index-pack.c:547 |
8ada9598 | 5828 | msgid "cannot pread pack file" |
81809b99 | 5829 | msgstr "无法读取包文件" |
8ada9598 | 5830 | |
2e8451e8 | 5831 | #: builtin/index-pack.c:549 |
8ada9598 JX |
5832 | #, c-format |
5833 | msgid "premature end of pack file, %lu byte missing" | |
5834 | msgid_plural "premature end of pack file, %lu bytes missing" | |
81809b99 | 5835 | msgstr[0] "包文件过早结束,缺少 %lu 字节" |
5ae481e0 | 5836 | msgstr[1] "包文件过早结束,缺少 %lu 字节" |
8ada9598 | 5837 | |
2e8451e8 | 5838 | #: builtin/index-pack.c:575 |
8ada9598 | 5839 | msgid "serious inflate inconsistency" |
81809b99 | 5840 | msgstr "解压缩严重的不一致" |
8ada9598 | 5841 | |
2e8451e8 JX |
5842 | #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695 |
5843 | #: builtin/index-pack.c:729 builtin/index-pack.c:738 | |
8ada9598 JX |
5844 | #, c-format |
5845 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 5846 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 5847 | |
90314792 JX |
5848 | #: builtin/index-pack.c:669 builtin/pack-objects.c:171 |
5849 | #: builtin/pack-objects.c:263 | |
6792b93b JX |
5850 | #, c-format |
5851 | msgid "unable to read %s" | |
5852 | msgstr "不能读 %s" | |
5853 | ||
2e8451e8 | 5854 | #: builtin/index-pack.c:735 |
6792b93b JX |
5855 | #, c-format |
5856 | msgid "cannot read existing object %s" | |
5857 | msgstr "不能读取现存对象 %s" | |
5858 | ||
2e8451e8 | 5859 | #: builtin/index-pack.c:749 |
81809b99 | 5860 | #, c-format |
8ada9598 | 5861 | msgid "invalid blob object %s" |
07432cef | 5862 | msgstr "无效的数据(blob)对象 %s" |
8ada9598 | 5863 | |
2e8451e8 | 5864 | #: builtin/index-pack.c:763 |
81809b99 | 5865 | #, c-format |
8ada9598 | 5866 | msgid "invalid %s" |
81809b99 | 5867 | msgstr "无效的 %s" |
8ada9598 | 5868 | |
2e8451e8 | 5869 | #: builtin/index-pack.c:766 |
8ada9598 | 5870 | msgid "Error in object" |
81809b99 | 5871 | msgstr "对象中出错" |
8ada9598 | 5872 | |
2e8451e8 | 5873 | #: builtin/index-pack.c:768 |
8ada9598 JX |
5874 | #, c-format |
5875 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 5876 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 5877 | |
90314792 | 5878 | #: builtin/index-pack.c:839 builtin/index-pack.c:869 |
8ada9598 | 5879 | msgid "failed to apply delta" |
81809b99 | 5880 | msgstr "无法应用 delta" |
8ada9598 | 5881 | |
90314792 | 5882 | #: builtin/index-pack.c:1010 |
8ada9598 | 5883 | msgid "Receiving objects" |
81809b99 | 5884 | msgstr "接收对象中" |
8ada9598 | 5885 | |
90314792 | 5886 | #: builtin/index-pack.c:1010 |
8ada9598 | 5887 | msgid "Indexing objects" |
81809b99 | 5888 | msgstr "索引对象中" |
8ada9598 | 5889 | |
90314792 | 5890 | #: builtin/index-pack.c:1036 |
8ada9598 | 5891 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 5892 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 5893 | |
90314792 | 5894 | #: builtin/index-pack.c:1041 |
8ada9598 | 5895 | msgid "cannot fstat packfile" |
81809b99 | 5896 | msgstr "不能枚举包文件状态" |
8ada9598 | 5897 | |
90314792 | 5898 | #: builtin/index-pack.c:1044 |
8ada9598 | 5899 | msgid "pack has junk at the end" |
81809b99 | 5900 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 5901 | |
90314792 | 5902 | #: builtin/index-pack.c:1055 |
6792b93b JX |
5903 | msgid "confusion beyond insanity in parse_pack_objects()" |
5904 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
5905 | ||
90314792 | 5906 | #: builtin/index-pack.c:1078 |
8ada9598 | 5907 | msgid "Resolving deltas" |
81809b99 | 5908 | msgstr "处理 delta 中" |
8ada9598 | 5909 | |
90314792 | 5910 | #: builtin/index-pack.c:1088 |
07432cef | 5911 | #, c-format |
ef317cd5 | 5912 | msgid "unable to create thread: %s" |
07432cef | 5913 | msgstr "不能创建线程:%s" |
ef317cd5 | 5914 | |
90314792 | 5915 | #: builtin/index-pack.c:1130 |
8ada9598 | 5916 | msgid "confusion beyond insanity" |
81809b99 | 5917 | msgstr "不可理喻" |
8ada9598 | 5918 | |
90314792 | 5919 | #: builtin/index-pack.c:1138 |
ef317cd5 JX |
5920 | #, c-format |
5921 | msgid "completed with %d local objects" | |
07432cef | 5922 | msgstr "完成 %d 个本地对象" |
ef317cd5 | 5923 | |
90314792 | 5924 | #: builtin/index-pack.c:1148 |
ef317cd5 JX |
5925 | #, c-format |
5926 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 5927 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 5928 | |
90314792 | 5929 | #: builtin/index-pack.c:1152 |
8ada9598 JX |
5930 | #, c-format |
5931 | msgid "pack has %d unresolved delta" | |
5932 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 5933 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 5934 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 5935 | |
90314792 | 5936 | #: builtin/index-pack.c:1177 |
81809b99 | 5937 | #, c-format |
8ada9598 | 5938 | msgid "unable to deflate appended object (%d)" |
07432cef | 5939 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 5940 | |
90314792 | 5941 | #: builtin/index-pack.c:1256 |
8ada9598 JX |
5942 | #, c-format |
5943 | msgid "local object %s is corrupt" | |
81809b99 | 5944 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 5945 | |
90314792 | 5946 | #: builtin/index-pack.c:1280 |
8ada9598 | 5947 | msgid "error while closing pack file" |
81809b99 | 5948 | msgstr "关闭包文件时出错" |
8ada9598 | 5949 | |
90314792 | 5950 | #: builtin/index-pack.c:1293 |
81809b99 | 5951 | #, c-format |
8ada9598 | 5952 | msgid "cannot write keep file '%s'" |
81809b99 | 5953 | msgstr "无法写保留文件 '%s'" |
8ada9598 | 5954 | |
90314792 | 5955 | #: builtin/index-pack.c:1301 |
81809b99 | 5956 | #, c-format |
8ada9598 | 5957 | msgid "cannot close written keep file '%s'" |
81809b99 | 5958 | msgstr "无法关闭保留文件 '%s'" |
8ada9598 | 5959 | |
90314792 | 5960 | #: builtin/index-pack.c:1314 |
8ada9598 | 5961 | msgid "cannot store pack file" |
81809b99 | 5962 | msgstr "无法存储包文件" |
8ada9598 | 5963 | |
90314792 | 5964 | #: builtin/index-pack.c:1325 |
8ada9598 | 5965 | msgid "cannot store index file" |
81809b99 | 5966 | msgstr "无法存储索引文件" |
8ada9598 | 5967 | |
90314792 | 5968 | #: builtin/index-pack.c:1358 |
07432cef | 5969 | #, c-format |
ef317cd5 | 5970 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 5971 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 5972 | |
90314792 | 5973 | #: builtin/index-pack.c:1364 |
ef317cd5 JX |
5974 | #, c-format |
5975 | msgid "invalid number of threads specified (%d)" | |
07432cef | 5976 | msgstr "指定的线程数无效(%d)" |
ef317cd5 | 5977 | |
90314792 | 5978 | #: builtin/index-pack.c:1368 builtin/index-pack.c:1546 |
ef317cd5 JX |
5979 | #, c-format |
5980 | msgid "no threads support, ignoring %s" | |
07432cef | 5981 | msgstr "没有线程支持,忽略 %s" |
ef317cd5 | 5982 | |
90314792 | 5983 | #: builtin/index-pack.c:1426 |
81809b99 | 5984 | #, c-format |
8ada9598 | 5985 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 5986 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 5987 | |
90314792 | 5988 | #: builtin/index-pack.c:1428 |
81809b99 | 5989 | #, c-format |
8ada9598 | 5990 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 5991 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 5992 | |
90314792 | 5993 | #: builtin/index-pack.c:1475 |
81809b99 | 5994 | #, c-format |
8ada9598 JX |
5995 | msgid "non delta: %d object" |
5996 | msgid_plural "non delta: %d objects" | |
81809b99 | 5997 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 5998 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 5999 | |
90314792 | 6000 | #: builtin/index-pack.c:1482 |
8ada9598 JX |
6001 | #, c-format |
6002 | msgid "chain length = %d: %lu object" | |
6003 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 6004 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 6005 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 6006 | |
90314792 | 6007 | #: builtin/index-pack.c:1510 |
8ada9598 | 6008 | msgid "Cannot come back to cwd" |
81809b99 | 6009 | msgstr "无法返回当前工作目录" |
8ada9598 | 6010 | |
90314792 JX |
6011 | #: builtin/index-pack.c:1558 builtin/index-pack.c:1561 |
6012 | #: builtin/index-pack.c:1573 builtin/index-pack.c:1577 | |
81809b99 | 6013 | #, c-format |
8ada9598 | 6014 | msgid "bad %s" |
81809b99 | 6015 | msgstr "错误选项 %s" |
8ada9598 | 6016 | |
90314792 | 6017 | #: builtin/index-pack.c:1591 |
8ada9598 | 6018 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 6019 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 6020 | |
90314792 | 6021 | #: builtin/index-pack.c:1595 builtin/index-pack.c:1605 |
8ada9598 JX |
6022 | #, c-format |
6023 | msgid "packfile name '%s' does not end with '.pack'" | |
81809b99 | 6024 | msgstr "包名 '%s' 没有以 '.pack' 结尾" |
8ada9598 | 6025 | |
90314792 | 6026 | #: builtin/index-pack.c:1614 |
8ada9598 | 6027 | msgid "--verify with no packfile name given" |
81809b99 | 6028 | msgstr "--verify 没有提供包名参数" |
8ada9598 | 6029 | |
c04f5ac3 JX |
6030 | #: builtin/init-db.c:35 |
6031 | #, c-format | |
6032 | msgid "Could not make %s writable by group" | |
6033 | msgstr "不能设置 %s 为组可写" | |
6034 | ||
6035 | #: builtin/init-db.c:62 | |
6036 | #, c-format | |
6037 | msgid "insanely long template name %s" | |
6038 | msgstr "太长的模版名 %s" | |
6039 | ||
6040 | #: builtin/init-db.c:67 | |
6041 | #, c-format | |
6042 | msgid "cannot stat '%s'" | |
6043 | msgstr "不能枚举 '%s' 状态" | |
6044 | ||
6045 | #: builtin/init-db.c:73 | |
6046 | #, c-format | |
6047 | msgid "cannot stat template '%s'" | |
6048 | msgstr "不能枚举模版 '%s' 状态" | |
6049 | ||
6050 | #: builtin/init-db.c:80 | |
6051 | #, c-format | |
6052 | msgid "cannot opendir '%s'" | |
6053 | msgstr "不能打开目录 '%s'" | |
6054 | ||
6055 | #: builtin/init-db.c:97 | |
6056 | #, c-format | |
6057 | msgid "cannot readlink '%s'" | |
6058 | msgstr "不能读取链接 '%s'" | |
6059 | ||
6060 | #: builtin/init-db.c:99 | |
6061 | #, c-format | |
6062 | msgid "insanely long symlink %s" | |
6063 | msgstr "太长的符号链接 %s" | |
6064 | ||
6065 | #: builtin/init-db.c:102 | |
6066 | #, c-format | |
6067 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 6068 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 JX |
6069 | |
6070 | #: builtin/init-db.c:106 | |
6071 | #, c-format | |
6072 | msgid "cannot copy '%s' to '%s'" | |
6073 | msgstr "不能拷贝 '%s' 至 '%s'" | |
6074 | ||
6075 | #: builtin/init-db.c:110 | |
6076 | #, c-format | |
6077 | msgid "ignoring template %s" | |
6078 | msgstr "忽略模版 %s" | |
6079 | ||
6080 | #: builtin/init-db.c:133 | |
6081 | #, c-format | |
6082 | msgid "insanely long template path %s" | |
6083 | msgstr "太长的模版路径 %s" | |
6084 | ||
6085 | #: builtin/init-db.c:141 | |
6086 | #, c-format | |
6087 | msgid "templates not found %s" | |
6088 | msgstr "模版未找到 %s" | |
6089 | ||
6090 | #: builtin/init-db.c:154 | |
6091 | #, c-format | |
6092 | msgid "not copying templates of a wrong format version %d from '%s'" | |
81809b99 | 6093 | msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" |
c04f5ac3 JX |
6094 | |
6095 | #: builtin/init-db.c:192 | |
6096 | #, c-format | |
6097 | msgid "insane git directory %s" | |
6098 | msgstr "不正常的 git 目录 %s" | |
6099 | ||
23ff3338 | 6100 | #: builtin/init-db.c:323 builtin/init-db.c:326 |
c04f5ac3 JX |
6101 | #, c-format |
6102 | msgid "%s already exists" | |
6103 | msgstr "%s 已经存在" | |
6104 | ||
23ff3338 | 6105 | #: builtin/init-db.c:355 |
c04f5ac3 JX |
6106 | #, c-format |
6107 | msgid "unable to handle file type %d" | |
6108 | msgstr "不能处理 %d 类型的文件" | |
6109 | ||
23ff3338 | 6110 | #: builtin/init-db.c:358 |
c04f5ac3 JX |
6111 | #, c-format |
6112 | msgid "unable to move %s to %s" | |
6113 | msgstr "不能移动 %s 至 %s" | |
6114 | ||
c04f5ac3 JX |
6115 | #. |
6116 | #. * TRANSLATORS: The first '%s' is either "Reinitialized | |
6117 | #. * existing" or "Initialized empty", the second " shared" or | |
6118 | #. * "", and the last '%s%s' is the verbatim directory name. | |
6119 | #. | |
23ff3338 | 6120 | #: builtin/init-db.c:420 |
c04f5ac3 JX |
6121 | #, c-format |
6122 | msgid "%s%s Git repository in %s%s\n" | |
6123 | msgstr "%s%s Git 版本库于 %s%s\n" | |
6124 | ||
23ff3338 | 6125 | #: builtin/init-db.c:421 |
c04f5ac3 JX |
6126 | msgid "Reinitialized existing" |
6127 | msgstr "重新初始化现存的" | |
6128 | ||
23ff3338 | 6129 | #: builtin/init-db.c:421 |
c04f5ac3 JX |
6130 | msgid "Initialized empty" |
6131 | msgstr "初始化空的" | |
6132 | ||
7e238ab7 | 6133 | # 译者:中文字符串拼接,可删除前导空格 |
23ff3338 | 6134 | #: builtin/init-db.c:422 |
c04f5ac3 | 6135 | msgid " shared" |
90e6ef53 | 6136 | msgstr "共享" |
c04f5ac3 | 6137 | |
23ff3338 | 6138 | #: builtin/init-db.c:441 |
c04f5ac3 JX |
6139 | msgid "cannot tell cwd" |
6140 | msgstr "无法获知当前路径" | |
6141 | ||
ef317cd5 JX |
6142 | #: builtin/init-db.c:467 |
6143 | msgid "" | |
a77c07d9 JX |
6144 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
6145 | "shared[=<permissions>]] [directory]" | |
ef317cd5 | 6146 | msgstr "" |
07432cef WS |
6147 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
6148 | "[目录]" | |
ef317cd5 JX |
6149 | |
6150 | #: builtin/init-db.c:490 | |
6151 | msgid "permissions" | |
07432cef | 6152 | msgstr "权限" |
ef317cd5 JX |
6153 | |
6154 | #: builtin/init-db.c:491 | |
6155 | msgid "specify that the git repository is to be shared amongst several users" | |
07432cef | 6156 | msgstr "指定 git 版本库是多个用户之间共享的" |
ef317cd5 | 6157 | |
90314792 | 6158 | #: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155 |
ef317cd5 | 6159 | msgid "be quiet" |
07432cef | 6160 | msgstr "保持安静" |
ef317cd5 | 6161 | |
23ff3338 | 6162 | #: builtin/init-db.c:522 builtin/init-db.c:529 |
c04f5ac3 JX |
6163 | #, c-format |
6164 | msgid "cannot mkdir %s" | |
6165 | msgstr "不能创建目录 %s" | |
6166 | ||
23ff3338 | 6167 | #: builtin/init-db.c:533 |
c04f5ac3 JX |
6168 | #, c-format |
6169 | msgid "cannot chdir to %s" | |
6170 | msgstr "不能切换目录到 %s" | |
6171 | ||
23ff3338 | 6172 | #: builtin/init-db.c:555 |
c04f5ac3 JX |
6173 | #, c-format |
6174 | msgid "" | |
6175 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
6176 | "dir=<directory>)" | |
6177 | msgstr "" | |
73a60cd2 JX |
6178 | "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-" |
6179 | "dir=<directory>)" | |
c04f5ac3 | 6180 | |
23ff3338 | 6181 | #: builtin/init-db.c:579 |
c04f5ac3 JX |
6182 | msgid "Cannot access current working directory" |
6183 | msgstr "不能访问当前工作目录" | |
6184 | ||
23ff3338 | 6185 | #: builtin/init-db.c:586 |
c04f5ac3 JX |
6186 | #, c-format |
6187 | msgid "Cannot access work tree '%s'" | |
6188 | msgstr "不能访问工作区 '%s'" | |
6189 | ||
2e8451e8 | 6190 | #: builtin/log.c:41 |
4dcdc3d8 JX |
6191 | msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" |
6192 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" | |
ef317cd5 | 6193 | |
2e8451e8 | 6194 | #: builtin/log.c:42 |
ef317cd5 | 6195 | msgid " or: git show [options] <object>..." |
07432cef | 6196 | msgstr " 或者:git show [选项] <对象>..." |
ef317cd5 | 6197 | |
90314792 | 6198 | #: builtin/log.c:125 |
ef317cd5 | 6199 | msgid "suppress diff output" |
07432cef | 6200 | msgstr "不显示差异输出" |
ef317cd5 | 6201 | |
90314792 | 6202 | #: builtin/log.c:126 |
ef317cd5 | 6203 | msgid "show source" |
07432cef | 6204 | msgstr "显示源" |
ef317cd5 | 6205 | |
90314792 | 6206 | #: builtin/log.c:127 |
07432cef WS |
6207 | msgid "Use mail map file" |
6208 | msgstr "使用邮件映射文件" | |
6209 | ||
90314792 | 6210 | #: builtin/log.c:128 |
ef317cd5 | 6211 | msgid "decorate options" |
07432cef | 6212 | msgstr "修饰选项" |
ef317cd5 | 6213 | |
90314792 | 6214 | #: builtin/log.c:231 |
c04f5ac3 JX |
6215 | #, c-format |
6216 | msgid "Final output: %d %s\n" | |
6217 | msgstr "最终输出:%d %s\n" | |
6218 | ||
90314792 | 6219 | #: builtin/log.c:473 builtin/log.c:565 |
c04f5ac3 JX |
6220 | #, c-format |
6221 | msgid "Could not read object %s" | |
90e6ef53 | 6222 | msgstr "不能读取对象 %s" |
c04f5ac3 | 6223 | |
90314792 | 6224 | #: builtin/log.c:589 |
c04f5ac3 JX |
6225 | #, c-format |
6226 | msgid "Unknown type: %d" | |
6227 | msgstr "未知类型:%d" | |
6228 | ||
90314792 | 6229 | #: builtin/log.c:689 |
c04f5ac3 JX |
6230 | msgid "format.headers without value" |
6231 | msgstr "format.headers 没有值" | |
6232 | ||
90314792 | 6233 | #: builtin/log.c:771 |
c04f5ac3 JX |
6234 | msgid "name of output directory is too long" |
6235 | msgstr "输出目录名太长" | |
6236 | ||
90314792 | 6237 | #: builtin/log.c:787 |
c04f5ac3 JX |
6238 | #, c-format |
6239 | msgid "Cannot open patch file %s" | |
6240 | msgstr "无法打开补丁文件 %s" | |
6241 | ||
90314792 | 6242 | #: builtin/log.c:801 |
c04f5ac3 JX |
6243 | msgid "Need exactly one range." |
6244 | msgstr "只需要一个范围。" | |
6245 | ||
90314792 | 6246 | #: builtin/log.c:809 |
c04f5ac3 JX |
6247 | msgid "Not a range." |
6248 | msgstr "不是一个范围。" | |
6249 | ||
90314792 | 6250 | #: builtin/log.c:911 |
c04f5ac3 JX |
6251 | msgid "Cover letter needs email format" |
6252 | msgstr "信封需要邮件地址格式" | |
6253 | ||
90314792 | 6254 | #: builtin/log.c:987 |
c04f5ac3 JX |
6255 | #, c-format |
6256 | msgid "insane in-reply-to: %s" | |
6257 | msgstr "不正常的 in-reply-to:%s" | |
6258 | ||
90314792 | 6259 | #: builtin/log.c:1015 |
ef317cd5 | 6260 | msgid "git format-patch [options] [<since> | <revision range>]" |
07432cef | 6261 | msgstr "git format-patch [选项] [<从> | <修订集范围>]" |
ef317cd5 | 6262 | |
90314792 | 6263 | #: builtin/log.c:1060 |
c04f5ac3 JX |
6264 | msgid "Two output directories?" |
6265 | msgstr "两个输出目录?" | |
6266 | ||
90314792 | 6267 | #: builtin/log.c:1175 |
ef317cd5 | 6268 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 6269 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 6270 | |
90314792 | 6271 | #: builtin/log.c:1178 |
ef317cd5 | 6272 | msgid "use [PATCH] even with multiple patches" |
07432cef | 6273 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 6274 | |
90314792 | 6275 | #: builtin/log.c:1182 |
ef317cd5 | 6276 | msgid "print patches to standard out" |
07432cef | 6277 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 6278 | |
90314792 | 6279 | #: builtin/log.c:1184 |
ef317cd5 | 6280 | msgid "generate a cover letter" |
07432cef | 6281 | msgstr "生成一封附信" |
c04f5ac3 | 6282 | |
90314792 | 6283 | #: builtin/log.c:1186 |
ef317cd5 | 6284 | msgid "use simple number sequence for output file names" |
07432cef | 6285 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 6286 | |
90314792 | 6287 | #: builtin/log.c:1187 |
ef317cd5 | 6288 | msgid "sfx" |
07432cef | 6289 | msgstr "后缀" |
ef317cd5 | 6290 | |
90314792 | 6291 | #: builtin/log.c:1188 |
ef317cd5 | 6292 | msgid "use <sfx> instead of '.patch'" |
07432cef | 6293 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 6294 | |
90314792 | 6295 | #: builtin/log.c:1190 |
ef317cd5 | 6296 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
6297 | msgstr "补丁以 <n> 开始编号,而不是1" |
6298 | ||
90314792 | 6299 | #: builtin/log.c:1192 |
07432cef WS |
6300 | msgid "mark the series as Nth re-roll" |
6301 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 6302 | |
90314792 | 6303 | #: builtin/log.c:1194 |
ef317cd5 | 6304 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 6305 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 6306 | |
90314792 | 6307 | #: builtin/log.c:1197 |
ef317cd5 | 6308 | msgid "store resulting files in <dir>" |
07432cef | 6309 | msgstr "把结果文件存储在 <dir>" |
ef317cd5 | 6310 | |
90314792 | 6311 | #: builtin/log.c:1200 |
ef317cd5 | 6312 | msgid "don't strip/add [PATCH]" |
07432cef | 6313 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 6314 | |
90314792 | 6315 | #: builtin/log.c:1203 |
ef317cd5 | 6316 | msgid "don't output binary diffs" |
07432cef | 6317 | msgstr "不输出二进制差异" |
ef317cd5 | 6318 | |
90314792 | 6319 | #: builtin/log.c:1205 |
ef317cd5 | 6320 | msgid "don't include a patch matching a commit upstream" |
07432cef | 6321 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 6322 | |
90314792 | 6323 | #: builtin/log.c:1207 |
ef317cd5 | 6324 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 6325 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 6326 | |
90314792 | 6327 | #: builtin/log.c:1209 |
ef317cd5 | 6328 | msgid "Messaging" |
07432cef | 6329 | msgstr "邮件发送" |
ef317cd5 | 6330 | |
90314792 | 6331 | #: builtin/log.c:1210 |
ef317cd5 | 6332 | msgid "header" |
07432cef | 6333 | msgstr "header" |
ef317cd5 | 6334 | |
90314792 | 6335 | #: builtin/log.c:1211 |
ef317cd5 | 6336 | msgid "add email header" |
07432cef | 6337 | msgstr "添加邮件头" |
ef317cd5 | 6338 | |
90314792 | 6339 | #: builtin/log.c:1212 builtin/log.c:1214 |
ef317cd5 | 6340 | msgid "email" |
07432cef | 6341 | msgstr "邮件地址" |
ef317cd5 | 6342 | |
90314792 | 6343 | #: builtin/log.c:1212 |
ef317cd5 | 6344 | msgid "add To: header" |
07432cef | 6345 | msgstr "添加收件人" |
ef317cd5 | 6346 | |
90314792 | 6347 | #: builtin/log.c:1214 |
ef317cd5 | 6348 | msgid "add Cc: header" |
07432cef | 6349 | msgstr "添加抄送" |
ef317cd5 | 6350 | |
90314792 | 6351 | #: builtin/log.c:1216 |
2e8451e8 JX |
6352 | msgid "ident" |
6353 | msgstr "ident" | |
6354 | ||
90314792 | 6355 | #: builtin/log.c:1217 |
2e8451e8 JX |
6356 | msgid "set From address to <ident> (or committer ident if absent)" |
6357 | msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)" | |
6358 | ||
90314792 | 6359 | #: builtin/log.c:1219 |
ef317cd5 | 6360 | msgid "message-id" |
07432cef | 6361 | msgstr "message-id" |
ef317cd5 | 6362 | |
90314792 | 6363 | #: builtin/log.c:1220 |
ef317cd5 | 6364 | msgid "make first mail a reply to <message-id>" |
07432cef | 6365 | msgstr "使第一封邮件作为对 <message-id> 的回复" |
ef317cd5 | 6366 | |
90314792 | 6367 | #: builtin/log.c:1221 builtin/log.c:1224 |
ef317cd5 | 6368 | msgid "boundary" |
07432cef | 6369 | msgstr "边界" |
ef317cd5 | 6370 | |
90314792 | 6371 | #: builtin/log.c:1222 |
ef317cd5 | 6372 | msgid "attach the patch" |
07432cef | 6373 | msgstr "附件方式添加补丁" |
ef317cd5 | 6374 | |
90314792 | 6375 | #: builtin/log.c:1225 |
ef317cd5 | 6376 | msgid "inline the patch" |
07432cef | 6377 | msgstr "内联显示补丁" |
ef317cd5 | 6378 | |
90314792 | 6379 | #: builtin/log.c:1229 |
ef317cd5 | 6380 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 6381 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 6382 | |
90314792 | 6383 | #: builtin/log.c:1231 |
ef317cd5 | 6384 | msgid "signature" |
07432cef | 6385 | msgstr "签名" |
ef317cd5 | 6386 | |
90314792 | 6387 | #: builtin/log.c:1232 |
ef317cd5 | 6388 | msgid "add a signature" |
07432cef | 6389 | msgstr "添加一个签名" |
ef317cd5 | 6390 | |
90314792 | 6391 | #: builtin/log.c:1233 |
ef317cd5 | 6392 | msgid "don't print the patch filenames" |
07432cef | 6393 | msgstr "不要打印补丁文件名" |
ef317cd5 | 6394 | |
90314792 | 6395 | #: builtin/log.c:1307 |
2e8451e8 JX |
6396 | #, c-format |
6397 | msgid "invalid ident line: %s" | |
6398 | msgstr "包含无效的身份标识:%s" | |
6399 | ||
90314792 | 6400 | #: builtin/log.c:1322 |
c04f5ac3 JX |
6401 | msgid "-n and -k are mutually exclusive." |
6402 | msgstr "-n 和 -k 互斥。" | |
6403 | ||
90314792 | 6404 | #: builtin/log.c:1324 |
c04f5ac3 JX |
6405 | msgid "--subject-prefix and -k are mutually exclusive." |
6406 | msgstr "--subject-prefix 和 -k 互斥。" | |
6407 | ||
90314792 | 6408 | #: builtin/log.c:1332 |
c04f5ac3 JX |
6409 | msgid "--name-only does not make sense" |
6410 | msgstr "--name-only 无意义" | |
6411 | ||
90314792 | 6412 | #: builtin/log.c:1334 |
c04f5ac3 JX |
6413 | msgid "--name-status does not make sense" |
6414 | msgstr "--name-status 无意义" | |
6415 | ||
90314792 | 6416 | #: builtin/log.c:1336 |
c04f5ac3 JX |
6417 | msgid "--check does not make sense" |
6418 | msgstr "--check 无意义" | |
6419 | ||
90314792 | 6420 | #: builtin/log.c:1359 |
c04f5ac3 JX |
6421 | msgid "standard output, or directory, which one?" |
6422 | msgstr "标准输出或目录,哪一个?" | |
6423 | ||
90314792 | 6424 | #: builtin/log.c:1361 |
c04f5ac3 JX |
6425 | #, c-format |
6426 | msgid "Could not create directory '%s'" | |
90e6ef53 | 6427 | msgstr "不能创建目录 '%s'" |
c04f5ac3 | 6428 | |
90314792 | 6429 | #: builtin/log.c:1509 |
c04f5ac3 JX |
6430 | msgid "Failed to create output files" |
6431 | msgstr "无法创建输出文件" | |
6432 | ||
90314792 | 6433 | #: builtin/log.c:1558 |
ef317cd5 | 6434 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 6435 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 6436 | |
90314792 | 6437 | #: builtin/log.c:1613 |
c04f5ac3 JX |
6438 | #, c-format |
6439 | msgid "" | |
6440 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
90e6ef53 | 6441 | msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n" |
c04f5ac3 | 6442 | |
90314792 | 6443 | #: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640 |
c04f5ac3 JX |
6444 | #, c-format |
6445 | msgid "Unknown commit %s" | |
6446 | msgstr "未知提交 %s" | |
6447 | ||
90314792 | 6448 | #: builtin/ls-files.c:398 |
ef317cd5 | 6449 | msgid "git ls-files [options] [<file>...]" |
07432cef | 6450 | msgstr "git ls-files [选项] [<文件>...]" |
ef317cd5 | 6451 | |
90314792 | 6452 | #: builtin/ls-files.c:455 |
ef317cd5 | 6453 | msgid "identify the file status with tags" |
07432cef | 6454 | msgstr "用标签标识文件的状态" |
ef317cd5 | 6455 | |
90314792 | 6456 | #: builtin/ls-files.c:457 |
ef317cd5 | 6457 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 6458 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 6459 | |
90314792 | 6460 | #: builtin/ls-files.c:459 |
ef317cd5 | 6461 | msgid "show cached files in the output (default)" |
07432cef | 6462 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 6463 | |
90314792 | 6464 | #: builtin/ls-files.c:461 |
ef317cd5 | 6465 | msgid "show deleted files in the output" |
07432cef | 6466 | msgstr "显示已删除的文件" |
ef317cd5 | 6467 | |
90314792 | 6468 | #: builtin/ls-files.c:463 |
ef317cd5 | 6469 | msgid "show modified files in the output" |
07432cef | 6470 | msgstr "显示已修改的文件" |
ef317cd5 | 6471 | |
90314792 | 6472 | #: builtin/ls-files.c:465 |
ef317cd5 | 6473 | msgid "show other files in the output" |
07432cef | 6474 | msgstr "显示其它文件" |
ef317cd5 | 6475 | |
90314792 | 6476 | #: builtin/ls-files.c:467 |
ef317cd5 | 6477 | msgid "show ignored files in the output" |
07432cef | 6478 | msgstr "显示忽略的文件" |
ef317cd5 | 6479 | |
90314792 | 6480 | #: builtin/ls-files.c:470 |
ef317cd5 | 6481 | msgid "show staged contents' object name in the output" |
07432cef | 6482 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 6483 | |
90314792 | 6484 | #: builtin/ls-files.c:472 |
ef317cd5 | 6485 | msgid "show files on the filesystem that need to be removed" |
07432cef | 6486 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 6487 | |
90314792 | 6488 | #: builtin/ls-files.c:474 |
ef317cd5 | 6489 | msgid "show 'other' directories' name only" |
07432cef | 6490 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 6491 | |
90314792 | 6492 | #: builtin/ls-files.c:477 |
ef317cd5 | 6493 | msgid "don't show empty directories" |
07432cef | 6494 | msgstr "不显示空目录" |
ef317cd5 | 6495 | |
90314792 | 6496 | #: builtin/ls-files.c:480 |
ef317cd5 | 6497 | msgid "show unmerged files in the output" |
07432cef | 6498 | msgstr "显示未合并的文件" |
ef317cd5 | 6499 | |
90314792 | 6500 | #: builtin/ls-files.c:482 |
ef317cd5 | 6501 | msgid "show resolve-undo information" |
07432cef | 6502 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 6503 | |
90314792 | 6504 | #: builtin/ls-files.c:484 |
ef317cd5 | 6505 | msgid "skip files matching pattern" |
07432cef | 6506 | msgstr "匹配排除文件的模式" |
ef317cd5 | 6507 | |
90314792 | 6508 | #: builtin/ls-files.c:487 |
ef317cd5 | 6509 | msgid "exclude patterns are read from <file>" |
07432cef | 6510 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 6511 | |
90314792 | 6512 | #: builtin/ls-files.c:490 |
ef317cd5 | 6513 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 6514 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 6515 | |
90314792 | 6516 | #: builtin/ls-files.c:492 |
ef317cd5 | 6517 | msgid "add the standard git exclusions" |
07432cef | 6518 | msgstr "添加标准的 git 排除" |
ef317cd5 | 6519 | |
90314792 | 6520 | #: builtin/ls-files.c:495 |
ef317cd5 | 6521 | msgid "make the output relative to the project top directory" |
07432cef | 6522 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 6523 | |
90314792 | 6524 | #: builtin/ls-files.c:498 |
ef317cd5 | 6525 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 6526 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 6527 | |
90314792 | 6528 | #: builtin/ls-files.c:499 |
ef317cd5 | 6529 | msgid "tree-ish" |
07432cef | 6530 | msgstr "树或提交" |
ef317cd5 | 6531 | |
90314792 | 6532 | #: builtin/ls-files.c:500 |
ef317cd5 | 6533 | msgid "pretend that paths removed since <tree-ish> are still present" |
07432cef | 6534 | msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" |
ef317cd5 | 6535 | |
90314792 | 6536 | #: builtin/ls-files.c:502 |
ef317cd5 | 6537 | msgid "show debugging data" |
07432cef | 6538 | msgstr "显示调试数据" |
ef317cd5 | 6539 | |
90314792 | 6540 | #: builtin/ls-tree.c:28 |
ef317cd5 | 6541 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
07432cef | 6542 | msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" |
ef317cd5 | 6543 | |
90314792 | 6544 | #: builtin/ls-tree.c:126 |
ef317cd5 | 6545 | msgid "only show trees" |
07432cef | 6546 | msgstr "只显示树" |
ef317cd5 | 6547 | |
90314792 | 6548 | #: builtin/ls-tree.c:128 |
ef317cd5 | 6549 | msgid "recurse into subtrees" |
07432cef | 6550 | msgstr "递归到子树" |
ef317cd5 | 6551 | |
90314792 | 6552 | #: builtin/ls-tree.c:130 |
ef317cd5 | 6553 | msgid "show trees when recursing" |
07432cef | 6554 | msgstr "当递归时显示树" |
ef317cd5 | 6555 | |
90314792 | 6556 | #: builtin/ls-tree.c:133 |
ef317cd5 | 6557 | msgid "terminate entries with NUL byte" |
07432cef | 6558 | msgstr "条目以NUL字符终止" |
ef317cd5 | 6559 | |
90314792 | 6560 | #: builtin/ls-tree.c:134 |
ef317cd5 | 6561 | msgid "include object size" |
07432cef | 6562 | msgstr "包括对象大小" |
ef317cd5 | 6563 | |
90314792 | 6564 | #: builtin/ls-tree.c:136 builtin/ls-tree.c:138 |
ef317cd5 | 6565 | msgid "list only filenames" |
07432cef | 6566 | msgstr "只列出文件名" |
ef317cd5 | 6567 | |
90314792 | 6568 | #: builtin/ls-tree.c:141 |
ef317cd5 | 6569 | msgid "use full path names" |
07432cef | 6570 | msgstr "使用文件的全路径" |
ef317cd5 | 6571 | |
90314792 | 6572 | #: builtin/ls-tree.c:143 |
ef317cd5 | 6573 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 6574 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 JX |
6575 | |
6576 | #: builtin/merge.c:43 | |
ef317cd5 | 6577 | msgid "git merge [options] [<commit>...]" |
07432cef | 6578 | msgstr "git merge [选项] [<提交>...]" |
ef317cd5 JX |
6579 | |
6580 | #: builtin/merge.c:44 | |
6581 | msgid "git merge [options] <msg> HEAD <commit>" | |
07432cef | 6582 | msgstr "git merge [选项] <说明> HEAD <提交>" |
ef317cd5 JX |
6583 | |
6584 | #: builtin/merge.c:45 | |
6585 | msgid "git merge --abort" | |
07432cef | 6586 | msgstr "git merge --abort" |
ef317cd5 | 6587 | |
2e8451e8 | 6588 | #: builtin/merge.c:98 |
c04f5ac3 JX |
6589 | msgid "switch `m' requires a value" |
6590 | msgstr "开关 `m' 需要一个值" | |
6591 | ||
2e8451e8 | 6592 | #: builtin/merge.c:135 |
c04f5ac3 JX |
6593 | #, c-format |
6594 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 6595 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 6596 | |
2e8451e8 | 6597 | #: builtin/merge.c:136 |
c04f5ac3 JX |
6598 | #, c-format |
6599 | msgid "Available strategies are:" | |
6600 | msgstr "可用的策略有:" | |
6601 | ||
2e8451e8 | 6602 | #: builtin/merge.c:141 |
c04f5ac3 JX |
6603 | #, c-format |
6604 | msgid "Available custom strategies are:" | |
6605 | msgstr "可用的自定义策略有:" | |
6606 | ||
2e8451e8 | 6607 | #: builtin/merge.c:198 |
ef317cd5 | 6608 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 6609 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 6610 | |
2e8451e8 | 6611 | #: builtin/merge.c:201 |
ef317cd5 | 6612 | msgid "show a diffstat at the end of the merge" |
07432cef | 6613 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 6614 | |
2e8451e8 | 6615 | #: builtin/merge.c:202 |
ef317cd5 | 6616 | msgid "(synonym to --stat)" |
07432cef | 6617 | msgstr "(和 --stat 同义)" |
ef317cd5 | 6618 | |
2e8451e8 | 6619 | #: builtin/merge.c:204 |
ef317cd5 | 6620 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 6621 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 6622 | |
2e8451e8 | 6623 | #: builtin/merge.c:207 |
ef317cd5 | 6624 | msgid "create a single commit instead of doing a merge" |
07432cef | 6625 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 6626 | |
2e8451e8 | 6627 | #: builtin/merge.c:209 |
ef317cd5 | 6628 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 6629 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 6630 | |
2e8451e8 | 6631 | #: builtin/merge.c:211 |
ef317cd5 | 6632 | msgid "edit message before committing" |
07432cef | 6633 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 6634 | |
2e8451e8 | 6635 | #: builtin/merge.c:212 |
ef317cd5 | 6636 | msgid "allow fast-forward (default)" |
07432cef | 6637 | msgstr "允许快进(默认)" |
ef317cd5 | 6638 | |
2e8451e8 | 6639 | #: builtin/merge.c:214 |
ef317cd5 | 6640 | msgid "abort if fast-forward is not possible" |
07432cef | 6641 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 6642 | |
2e8451e8 | 6643 | #: builtin/merge.c:218 |
1003b3a5 JX |
6644 | msgid "Verify that the named commit has a valid GPG signature" |
6645 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" | |
6646 | ||
90314792 | 6647 | #: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89 |
ef317cd5 | 6648 | msgid "strategy" |
07432cef | 6649 | msgstr "策略" |
ef317cd5 | 6650 | |
2e8451e8 | 6651 | #: builtin/merge.c:220 |
ef317cd5 | 6652 | msgid "merge strategy to use" |
07432cef | 6653 | msgstr "要使用的合并策略" |
ef317cd5 | 6654 | |
2e8451e8 | 6655 | #: builtin/merge.c:221 |
ef317cd5 | 6656 | msgid "option=value" |
07432cef | 6657 | msgstr "option=value" |
ef317cd5 | 6658 | |
2e8451e8 | 6659 | #: builtin/merge.c:222 |
ef317cd5 | 6660 | msgid "option for selected merge strategy" |
07432cef | 6661 | msgstr "所选的合并策略的选项" |
ef317cd5 | 6662 | |
2e8451e8 | 6663 | #: builtin/merge.c:224 |
ef317cd5 | 6664 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 6665 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 6666 | |
2e8451e8 | 6667 | #: builtin/merge.c:228 |
ef317cd5 | 6668 | msgid "abort the current in-progress merge" |
07432cef | 6669 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 6670 | |
2e8451e8 | 6671 | #: builtin/merge.c:257 |
c04f5ac3 JX |
6672 | msgid "could not run stash." |
6673 | msgstr "不能进行进度保存。" | |
6674 | ||
2e8451e8 | 6675 | #: builtin/merge.c:262 |
c04f5ac3 JX |
6676 | msgid "stash failed" |
6677 | msgstr "进度保存失败" | |
6678 | ||
2e8451e8 | 6679 | #: builtin/merge.c:267 |
c04f5ac3 JX |
6680 | #, c-format |
6681 | msgid "not a valid object: %s" | |
6682 | msgstr "不是一个有效对象:%s" | |
6683 | ||
2e8451e8 | 6684 | #: builtin/merge.c:286 builtin/merge.c:303 |
c04f5ac3 JX |
6685 | msgid "read-tree failed" |
6686 | msgstr "读取树失败" | |
6687 | ||
90e6ef53 | 6688 | # 译者:注意保持前导空格 |
2e8451e8 | 6689 | #: builtin/merge.c:333 |
c04f5ac3 JX |
6690 | msgid " (nothing to squash)" |
6691 | msgstr " (无可压缩)" | |
6692 | ||
2e8451e8 | 6693 | #: builtin/merge.c:346 |
c04f5ac3 JX |
6694 | #, c-format |
6695 | msgid "Squash commit -- not updating HEAD\n" | |
6696 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
6697 | ||
2e8451e8 | 6698 | #: builtin/merge.c:378 |
c04f5ac3 JX |
6699 | msgid "Writing SQUASH_MSG" |
6700 | msgstr "写入 SQUASH_MSG" | |
6701 | ||
2e8451e8 | 6702 | #: builtin/merge.c:380 |
c04f5ac3 JX |
6703 | msgid "Finishing SQUASH_MSG" |
6704 | msgstr "完成 SQUASH_MSG" | |
6705 | ||
2e8451e8 | 6706 | #: builtin/merge.c:403 |
c04f5ac3 JX |
6707 | #, c-format |
6708 | msgid "No merge message -- not updating HEAD\n" | |
6709 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
6710 | ||
2e8451e8 | 6711 | #: builtin/merge.c:453 |
c04f5ac3 JX |
6712 | #, c-format |
6713 | msgid "'%s' does not point to a commit" | |
6714 | msgstr "'%s' 没有指向一个提交" | |
6715 | ||
2e8451e8 | 6716 | #: builtin/merge.c:565 |
c04f5ac3 JX |
6717 | #, c-format |
6718 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 6719 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 6720 | |
2e8451e8 | 6721 | #: builtin/merge.c:657 |
c04f5ac3 JX |
6722 | msgid "git write-tree failed to write a tree" |
6723 | msgstr "git write-tree 无法写入一树对象" | |
6724 | ||
2e8451e8 | 6725 | #: builtin/merge.c:685 |
c04f5ac3 JX |
6726 | msgid "Not handling anything other than two heads merge." |
6727 | msgstr "不能处理两个头合并之外的任何操作。" | |
6728 | ||
2e8451e8 | 6729 | #: builtin/merge.c:699 |
c04f5ac3 JX |
6730 | #, c-format |
6731 | msgid "Unknown option for merge-recursive: -X%s" | |
6732 | msgstr "merge-recursive 的未知选项:-X%s" | |
6733 | ||
2e8451e8 | 6734 | #: builtin/merge.c:713 |
c04f5ac3 JX |
6735 | #, c-format |
6736 | msgid "unable to write %s" | |
6737 | msgstr "不能写 %s" | |
6738 | ||
2e8451e8 | 6739 | #: builtin/merge.c:802 |
c04f5ac3 JX |
6740 | #, c-format |
6741 | msgid "Could not read from '%s'" | |
6742 | msgstr "不能从 '%s' 读取" | |
6743 | ||
2e8451e8 | 6744 | #: builtin/merge.c:811 |
c04f5ac3 JX |
6745 | #, c-format |
6746 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
6747 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
6748 | ||
2e8451e8 | 6749 | #: builtin/merge.c:817 |
a77c07d9 | 6750 | #, c-format |
c04f5ac3 JX |
6751 | msgid "" |
6752 | "Please enter a commit message to explain why this merge is necessary,\n" | |
6753 | "especially if it merges an updated upstream into a topic branch.\n" | |
6754 | "\n" | |
a77c07d9 | 6755 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" |
c04f5ac3 JX |
6756 | "the commit.\n" |
6757 | msgstr "" | |
6758 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
6759 | "合并到主题分支。\n" | |
6760 | "\n" | |
a77c07d9 | 6761 | "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" |
c04f5ac3 | 6762 | |
2e8451e8 | 6763 | #: builtin/merge.c:841 |
c04f5ac3 JX |
6764 | msgid "Empty commit message." |
6765 | msgstr "空提交信息。" | |
6766 | ||
2e8451e8 | 6767 | #: builtin/merge.c:853 |
c04f5ac3 JX |
6768 | #, c-format |
6769 | msgid "Wonderful.\n" | |
6770 | msgstr "太棒了。\n" | |
6771 | ||
2e8451e8 | 6772 | #: builtin/merge.c:918 |
c04f5ac3 JX |
6773 | #, c-format |
6774 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
6775 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
6776 | ||
2e8451e8 | 6777 | #: builtin/merge.c:934 |
c04f5ac3 JX |
6778 | #, c-format |
6779 | msgid "'%s' is not a commit" | |
6780 | msgstr "'%s' 不是一个提交" | |
6781 | ||
2e8451e8 | 6782 | #: builtin/merge.c:975 |
c04f5ac3 | 6783 | msgid "No current branch." |
90e6ef53 | 6784 | msgstr "没有当前分支。" |
c04f5ac3 | 6785 | |
2e8451e8 | 6786 | #: builtin/merge.c:977 |
c04f5ac3 | 6787 | msgid "No remote for the current branch." |
90e6ef53 | 6788 | msgstr "当前分支没有对应的远程版本库。" |
c04f5ac3 | 6789 | |
2e8451e8 | 6790 | #: builtin/merge.c:979 |
c04f5ac3 | 6791 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 6792 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 6793 | |
2e8451e8 | 6794 | #: builtin/merge.c:984 |
170e9899 | 6795 | #, c-format |
2e8451e8 JX |
6796 | msgid "No remote-tracking branch for %s from %s" |
6797 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 6798 | |
2e8451e8 | 6799 | #: builtin/merge.c:1140 |
c04f5ac3 | 6800 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 6801 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 6802 | |
2e8451e8 | 6803 | #: builtin/merge.c:1156 git-pull.sh:31 |
c04f5ac3 JX |
6804 | msgid "" |
6805 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
6806 | "Please, commit your changes before you can merge." | |
6807 | msgstr "" | |
6808 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 6809 | "请在合并前先提交您的修改。" |
c04f5ac3 | 6810 | |
2e8451e8 | 6811 | #: builtin/merge.c:1159 git-pull.sh:34 |
c04f5ac3 JX |
6812 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
6813 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
6814 | ||
2e8451e8 | 6815 | #: builtin/merge.c:1163 |
c04f5ac3 JX |
6816 | msgid "" |
6817 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
6818 | "Please, commit your changes before you can merge." | |
6819 | msgstr "" | |
6820 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 6821 | "请在合并前先提交您的修改。" |
c04f5ac3 | 6822 | |
2e8451e8 | 6823 | #: builtin/merge.c:1166 |
c04f5ac3 JX |
6824 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
6825 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
6826 | ||
2e8451e8 | 6827 | #: builtin/merge.c:1175 |
c04f5ac3 | 6828 | msgid "You cannot combine --squash with --no-ff." |
649900bc | 6829 | msgstr "您不能将 --squash 与 --no-ff 同时使用。" |
c04f5ac3 | 6830 | |
2e8451e8 | 6831 | #: builtin/merge.c:1184 |
c04f5ac3 | 6832 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 6833 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 6834 | |
2e8451e8 | 6835 | #: builtin/merge.c:1216 |
c04f5ac3 | 6836 | msgid "Can merge only exactly one commit into empty head" |
90e6ef53 | 6837 | msgstr "只能将一个提交合并到空分支上" |
c04f5ac3 | 6838 | |
2e8451e8 | 6839 | #: builtin/merge.c:1219 |
c04f5ac3 JX |
6840 | msgid "Squash commit into empty head not supported yet" |
6841 | msgstr "尚不支持到空分支的压缩提交" | |
6842 | ||
2e8451e8 | 6843 | #: builtin/merge.c:1221 |
c04f5ac3 JX |
6844 | msgid "Non-fast-forward commit does not make sense into an empty head" |
6845 | msgstr "到空分支的非快进式提交没有意义" | |
6846 | ||
2e8451e8 JX |
6847 | #: builtin/merge.c:1226 |
6848 | #, c-format | |
6849 | msgid "%s - not something we can merge" | |
6850 | msgstr "%s - 不能被合并" | |
6851 | ||
6852 | #: builtin/merge.c:1277 | |
1003b3a5 JX |
6853 | #, c-format |
6854 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
6855 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
6856 | ||
2e8451e8 | 6857 | #: builtin/merge.c:1280 |
1003b3a5 JX |
6858 | #, c-format |
6859 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
6860 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
6861 | ||
6862 | #. 'N' | |
2e8451e8 | 6863 | #: builtin/merge.c:1283 |
1003b3a5 JX |
6864 | #, c-format |
6865 | msgid "Commit %s does not have a GPG signature." | |
6866 | msgstr "提交 %s 没有一个 GPG 签名。" | |
6867 | ||
2e8451e8 | 6868 | #: builtin/merge.c:1286 |
1003b3a5 JX |
6869 | #, c-format |
6870 | msgid "Commit %s has a good GPG signature by %s\n" | |
6871 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
6872 | ||
2e8451e8 | 6873 | #: builtin/merge.c:1370 |
c04f5ac3 JX |
6874 | #, c-format |
6875 | msgid "Updating %s..%s\n" | |
6876 | msgstr "更新 %s..%s\n" | |
6877 | ||
2e8451e8 | 6878 | #: builtin/merge.c:1409 |
c04f5ac3 JX |
6879 | #, c-format |
6880 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 6881 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 6882 | |
2e8451e8 | 6883 | #: builtin/merge.c:1416 |
c04f5ac3 JX |
6884 | #, c-format |
6885 | msgid "Nope.\n" | |
6886 | msgstr "无。\n" | |
6887 | ||
2e8451e8 | 6888 | #: builtin/merge.c:1448 |
c04f5ac3 | 6889 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 6890 | msgstr "无法快进,终止。" |
c04f5ac3 | 6891 | |
2e8451e8 | 6892 | #: builtin/merge.c:1471 builtin/merge.c:1550 |
c04f5ac3 JX |
6893 | #, c-format |
6894 | msgid "Rewinding the tree to pristine...\n" | |
6895 | msgstr "将树回滚至原始状态...\n" | |
6896 | ||
2e8451e8 | 6897 | #: builtin/merge.c:1475 |
c04f5ac3 JX |
6898 | #, c-format |
6899 | msgid "Trying merge strategy %s...\n" | |
6900 | msgstr "尝试合并策略 %s...\n" | |
6901 | ||
2e8451e8 | 6902 | #: builtin/merge.c:1541 |
c04f5ac3 JX |
6903 | #, c-format |
6904 | msgid "No merge strategy handled the merge.\n" | |
6905 | msgstr "没有合并策略处理此合并。\n" | |
6906 | ||
2e8451e8 | 6907 | #: builtin/merge.c:1543 |
c04f5ac3 JX |
6908 | #, c-format |
6909 | msgid "Merge with strategy %s failed.\n" | |
6910 | msgstr "使用策略 %s 合并失败。\n" | |
6911 | ||
2e8451e8 | 6912 | #: builtin/merge.c:1552 |
c04f5ac3 JX |
6913 | #, c-format |
6914 | msgid "Using the %s to prepare resolving by hand.\n" | |
6915 | msgstr "使用 %s 以准备手工解决。\n" | |
6916 | ||
2e8451e8 | 6917 | #: builtin/merge.c:1564 |
c04f5ac3 JX |
6918 | #, c-format |
6919 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
6920 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
6921 | ||
ef317cd5 JX |
6922 | #: builtin/merge-base.c:26 |
6923 | msgid "git merge-base [-a|--all] <commit> <commit>..." | |
07432cef | 6924 | msgstr "git merge-base [-a|--all] <提交> <提交>..." |
ef317cd5 JX |
6925 | |
6926 | #: builtin/merge-base.c:27 | |
6927 | msgid "git merge-base [-a|--all] --octopus <commit>..." | |
07432cef | 6928 | msgstr "git merge-base [-a|--all] --octopus <提交>..." |
ef317cd5 JX |
6929 | |
6930 | #: builtin/merge-base.c:28 | |
6931 | msgid "git merge-base --independent <commit>..." | |
07432cef | 6932 | msgstr "git merge-base --independent <提交>..." |
ef317cd5 JX |
6933 | |
6934 | #: builtin/merge-base.c:29 | |
6935 | msgid "git merge-base --is-ancestor <commit> <commit>" | |
07432cef | 6936 | msgstr "git merge-base --is-ancestor <提交> <提交>" |
ef317cd5 JX |
6937 | |
6938 | #: builtin/merge-base.c:98 | |
ef317cd5 | 6939 | msgid "output all common ancestors" |
07432cef | 6940 | msgstr "输出所有共同的祖先" |
ef317cd5 JX |
6941 | |
6942 | #: builtin/merge-base.c:99 | |
6943 | msgid "find ancestors for a single n-way merge" | |
07432cef | 6944 | msgstr "查找一个多路合并的祖先提交" |
ef317cd5 JX |
6945 | |
6946 | #: builtin/merge-base.c:100 | |
6947 | msgid "list revs not reachable from others" | |
07432cef | 6948 | msgstr "显示不能被其他访问到的版本" |
ef317cd5 JX |
6949 | |
6950 | #: builtin/merge-base.c:102 | |
6951 | msgid "is the first one ancestor of the other?" | |
07432cef | 6952 | msgstr "第一个是其他的祖先提交么?" |
ef317cd5 JX |
6953 | |
6954 | #: builtin/merge-file.c:8 | |
6955 | msgid "" | |
6956 | "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " | |
6957 | "file2" | |
6958 | msgstr "" | |
07432cef | 6959 | "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" |
ef317cd5 JX |
6960 | |
6961 | #: builtin/merge-file.c:33 | |
6962 | msgid "send results to standard output" | |
07432cef | 6963 | msgstr "将结果发送到标准输出" |
ef317cd5 JX |
6964 | |
6965 | #: builtin/merge-file.c:34 | |
6966 | msgid "use a diff3 based merge" | |
07432cef | 6967 | msgstr "使用基于 diff3 的合并" |
ef317cd5 JX |
6968 | |
6969 | #: builtin/merge-file.c:35 | |
6970 | msgid "for conflicts, use our version" | |
07432cef | 6971 | msgstr "如果冲突,使用我们的版本" |
ef317cd5 JX |
6972 | |
6973 | #: builtin/merge-file.c:37 | |
6974 | msgid "for conflicts, use their version" | |
07432cef | 6975 | msgstr "如果冲突,使用他们的版本" |
ef317cd5 JX |
6976 | |
6977 | #: builtin/merge-file.c:39 | |
6978 | msgid "for conflicts, use a union version" | |
07432cef | 6979 | msgstr "如果冲突,使用联合版本" |
ef317cd5 JX |
6980 | |
6981 | #: builtin/merge-file.c:42 | |
6982 | msgid "for conflicts, use this marker size" | |
07432cef | 6983 | msgstr "如果冲突,使用指定长度的标记" |
ef317cd5 JX |
6984 | |
6985 | #: builtin/merge-file.c:43 | |
6986 | msgid "do not warn about conflicts" | |
07432cef | 6987 | msgstr "不要警告冲突" |
ef317cd5 JX |
6988 | |
6989 | #: builtin/merge-file.c:45 | |
6990 | msgid "set labels for file1/orig_file/file2" | |
07432cef | 6991 | msgstr "为 file1/orig_file/file2 设置标签" |
c04f5ac3 | 6992 | |
ef317cd5 JX |
6993 | #: builtin/mktree.c:67 |
6994 | msgid "git mktree [-z] [--missing] [--batch]" | |
07432cef | 6995 | msgstr "git mktree [-z] [--missing] [--batch]" |
c04f5ac3 | 6996 | |
ef317cd5 JX |
6997 | #: builtin/mktree.c:153 |
6998 | msgid "input is NUL terminated" | |
07432cef | 6999 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 7000 | |
ef317cd5 | 7001 | #: builtin/mktree.c:154 builtin/write-tree.c:24 |
ef317cd5 | 7002 | msgid "allow missing objects" |
07432cef | 7003 | msgstr "允许丢失的对象" |
c04f5ac3 | 7004 | |
ef317cd5 JX |
7005 | #: builtin/mktree.c:155 |
7006 | msgid "allow creation of more than one tree" | |
07432cef | 7007 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 7008 | |
90314792 | 7009 | #: builtin/mv.c:15 |
ef317cd5 | 7010 | msgid "git mv [options] <source>... <destination>" |
07432cef | 7011 | msgstr "git mv [选项] <源>... <目标>" |
c04f5ac3 | 7012 | |
90314792 | 7013 | #: builtin/mv.c:67 |
ef317cd5 | 7014 | msgid "force move/rename even if target exists" |
07432cef | 7015 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 7016 | |
90314792 | 7017 | #: builtin/mv.c:68 |
ef317cd5 | 7018 | msgid "skip move/rename errors" |
07432cef | 7019 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 7020 | |
90314792 | 7021 | #: builtin/mv.c:113 |
c04f5ac3 JX |
7022 | #, c-format |
7023 | msgid "Checking rename of '%s' to '%s'\n" | |
7024 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
7025 | ||
90314792 | 7026 | #: builtin/mv.c:117 |
c04f5ac3 JX |
7027 | msgid "bad source" |
7028 | msgstr "坏的源" | |
7029 | ||
90314792 | 7030 | #: builtin/mv.c:120 |
c04f5ac3 JX |
7031 | msgid "can not move directory into itself" |
7032 | msgstr "不能将目录移动到自身" | |
7033 | ||
90314792 | 7034 | #: builtin/mv.c:123 |
c04f5ac3 JX |
7035 | msgid "cannot move directory over file" |
7036 | msgstr "不能将目录移动到文件" | |
7037 | ||
90314792 JX |
7038 | #: builtin/mv.c:129 |
7039 | #, c-format | |
7040 | msgid "Huh? Directory %s is in index and no submodule?" | |
7041 | msgstr "嗯?目录 %s 在索引中并且不是子模组?" | |
7042 | ||
7043 | #: builtin/mv.c:131 builtin/rm.c:318 | |
7044 | msgid "Please, stage your changes to .gitmodules or stash them to proceed" | |
7045 | msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续" | |
7046 | ||
7047 | #: builtin/mv.c:147 | |
c04f5ac3 JX |
7048 | #, c-format |
7049 | msgid "Huh? %.*s is in index?" | |
90e6ef53 | 7050 | msgstr "嗯?%.*s 在索引中?" |
c04f5ac3 | 7051 | |
90314792 | 7052 | #: builtin/mv.c:159 |
c04f5ac3 JX |
7053 | msgid "source directory is empty" |
7054 | msgstr "源目录为空" | |
7055 | ||
90314792 | 7056 | #: builtin/mv.c:191 |
c04f5ac3 JX |
7057 | msgid "not under version control" |
7058 | msgstr "不在版本控制之下" | |
7059 | ||
90314792 | 7060 | #: builtin/mv.c:193 |
c04f5ac3 JX |
7061 | msgid "destination exists" |
7062 | msgstr "目标已存在" | |
7063 | ||
90314792 | 7064 | #: builtin/mv.c:201 |
c04f5ac3 JX |
7065 | #, c-format |
7066 | msgid "overwriting '%s'" | |
7067 | msgstr "覆盖 '%s'" | |
7068 | ||
90314792 | 7069 | #: builtin/mv.c:204 |
c04f5ac3 JX |
7070 | msgid "Cannot overwrite" |
7071 | msgstr "不能覆盖" | |
7072 | ||
90314792 | 7073 | #: builtin/mv.c:207 |
c04f5ac3 JX |
7074 | msgid "multiple sources for the same target" |
7075 | msgstr "同一目标具有多个源" | |
7076 | ||
90314792 | 7077 | #: builtin/mv.c:222 |
c04f5ac3 JX |
7078 | #, c-format |
7079 | msgid "%s, source=%s, destination=%s" | |
7080 | msgstr "%s,源=%s,目标=%s" | |
7081 | ||
90314792 | 7082 | #: builtin/mv.c:232 |
c04f5ac3 JX |
7083 | #, c-format |
7084 | msgid "Renaming %s to %s\n" | |
7085 | msgstr "重命名 %s 至 %s\n" | |
7086 | ||
90314792 | 7087 | #: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 |
c04f5ac3 JX |
7088 | #, c-format |
7089 | msgid "renaming '%s' failed" | |
7090 | msgstr "重命名 '%s' 失败" | |
7091 | ||
2e8451e8 | 7092 | #: builtin/name-rev.c:259 |
ef317cd5 | 7093 | msgid "git name-rev [options] <commit>..." |
07432cef | 7094 | msgstr "git name-rev [选项] <提交>..." |
ef317cd5 | 7095 | |
2e8451e8 | 7096 | #: builtin/name-rev.c:260 |
ef317cd5 | 7097 | msgid "git name-rev [options] --all" |
07432cef | 7098 | msgstr "git name-rev [选项] --all" |
ef317cd5 | 7099 | |
2e8451e8 | 7100 | #: builtin/name-rev.c:261 |
ef317cd5 | 7101 | msgid "git name-rev [options] --stdin" |
07432cef | 7102 | msgstr "git name-rev [选项] --stdin" |
ef317cd5 | 7103 | |
2e8451e8 | 7104 | #: builtin/name-rev.c:313 |
ef317cd5 | 7105 | msgid "print only names (no SHA-1)" |
07432cef | 7106 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 7107 | |
2e8451e8 | 7108 | #: builtin/name-rev.c:314 |
ef317cd5 | 7109 | msgid "only use tags to name the commits" |
07432cef | 7110 | msgstr "只使用 tags 来命名提交" |
ef317cd5 | 7111 | |
2e8451e8 | 7112 | #: builtin/name-rev.c:316 |
ef317cd5 | 7113 | msgid "only use refs matching <pattern>" |
07432cef | 7114 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 7115 | |
2e8451e8 | 7116 | #: builtin/name-rev.c:318 |
ef317cd5 | 7117 | msgid "list all commits reachable from all refs" |
07432cef | 7118 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 7119 | |
2e8451e8 | 7120 | #: builtin/name-rev.c:319 |
ef317cd5 | 7121 | msgid "read from stdin" |
07432cef | 7122 | msgstr "从标准输入读取" |
ef317cd5 | 7123 | |
2e8451e8 | 7124 | #: builtin/name-rev.c:320 |
90314792 JX |
7125 | msgid "allow to print `undefined` names (default)" |
7126 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 7127 | |
2e8451e8 JX |
7128 | #: builtin/name-rev.c:326 |
7129 | msgid "dereference tags in the input (internal use)" | |
7130 | msgstr "反向解析输入中的 tags(内部使用)" | |
7131 | ||
7132 | #: builtin/notes.c:24 | |
ef317cd5 | 7133 | msgid "git notes [--ref <notes_ref>] [list [<object>]]" |
07432cef | 7134 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 7135 | |
2e8451e8 | 7136 | #: builtin/notes.c:25 |
ef317cd5 JX |
7137 | msgid "" |
7138 | "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " | |
7139 | "<object>] [<object>]" | |
7140 | msgstr "" | |
07432cef WS |
7141 | "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" |
7142 | "象>] [<对象>]" | |
ef317cd5 | 7143 | |
2e8451e8 | 7144 | #: builtin/notes.c:26 |
ef317cd5 | 7145 | msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" |
07432cef | 7146 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 7147 | |
2e8451e8 | 7148 | #: builtin/notes.c:27 |
ef317cd5 JX |
7149 | msgid "" |
7150 | "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " | |
7151 | "<object>] [<object>]" | |
7152 | msgstr "" | |
07432cef WS |
7153 | "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" |
7154 | ">] [<对象>]" | |
ef317cd5 | 7155 | |
2e8451e8 | 7156 | #: builtin/notes.c:28 |
ef317cd5 | 7157 | msgid "git notes [--ref <notes_ref>] edit [<object>]" |
07432cef | 7158 | msgstr "git notes [--ref <注解引用>] edit [<对象>]" |
ef317cd5 | 7159 | |
2e8451e8 | 7160 | #: builtin/notes.c:29 |
ef317cd5 | 7161 | msgid "git notes [--ref <notes_ref>] show [<object>]" |
07432cef | 7162 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 7163 | |
2e8451e8 | 7164 | #: builtin/notes.c:30 |
ef317cd5 JX |
7165 | msgid "" |
7166 | "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" | |
07432cef | 7167 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 7168 | |
2e8451e8 | 7169 | #: builtin/notes.c:31 |
ef317cd5 | 7170 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 7171 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 7172 | |
2e8451e8 | 7173 | #: builtin/notes.c:32 |
ef317cd5 | 7174 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 7175 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 7176 | |
2e8451e8 | 7177 | #: builtin/notes.c:33 |
ef317cd5 | 7178 | msgid "git notes [--ref <notes_ref>] remove [<object>...]" |
07432cef | 7179 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 7180 | |
2e8451e8 | 7181 | #: builtin/notes.c:34 |
ef317cd5 | 7182 | msgid "git notes [--ref <notes_ref>] prune [-n | -v]" |
07432cef | 7183 | msgstr "git notes [--ref <注解引用>] prune [-n | -v]" |
ef317cd5 | 7184 | |
2e8451e8 | 7185 | #: builtin/notes.c:35 |
ef317cd5 | 7186 | msgid "git notes [--ref <notes_ref>] get-ref" |
07432cef | 7187 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 7188 | |
2e8451e8 | 7189 | #: builtin/notes.c:40 |
ef317cd5 | 7190 | msgid "git notes [list [<object>]]" |
07432cef | 7191 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 7192 | |
2e8451e8 | 7193 | #: builtin/notes.c:45 |
ef317cd5 | 7194 | msgid "git notes add [<options>] [<object>]" |
07432cef | 7195 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 7196 | |
2e8451e8 | 7197 | #: builtin/notes.c:50 |
ef317cd5 | 7198 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 7199 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 7200 | |
2e8451e8 | 7201 | #: builtin/notes.c:51 |
ef317cd5 | 7202 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 7203 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 7204 | |
2e8451e8 | 7205 | #: builtin/notes.c:56 |
ef317cd5 | 7206 | msgid "git notes append [<options>] [<object>]" |
07432cef | 7207 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 7208 | |
2e8451e8 | 7209 | #: builtin/notes.c:61 |
ef317cd5 | 7210 | msgid "git notes edit [<object>]" |
07432cef | 7211 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 7212 | |
2e8451e8 | 7213 | #: builtin/notes.c:66 |
ef317cd5 | 7214 | msgid "git notes show [<object>]" |
07432cef | 7215 | msgstr "git notes show [<对象>]" |
ef317cd5 | 7216 | |
2e8451e8 | 7217 | #: builtin/notes.c:71 |
ef317cd5 | 7218 | msgid "git notes merge [<options>] <notes_ref>" |
07432cef | 7219 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 7220 | |
2e8451e8 | 7221 | #: builtin/notes.c:72 |
ef317cd5 | 7222 | msgid "git notes merge --commit [<options>]" |
07432cef | 7223 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 7224 | |
2e8451e8 | 7225 | #: builtin/notes.c:73 |
ef317cd5 | 7226 | msgid "git notes merge --abort [<options>]" |
07432cef | 7227 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 7228 | |
2e8451e8 | 7229 | #: builtin/notes.c:78 |
ef317cd5 | 7230 | msgid "git notes remove [<object>]" |
07432cef | 7231 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 7232 | |
2e8451e8 | 7233 | #: builtin/notes.c:83 |
ef317cd5 | 7234 | msgid "git notes prune [<options>]" |
07432cef | 7235 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 7236 | |
2e8451e8 | 7237 | #: builtin/notes.c:88 |
ef317cd5 | 7238 | msgid "git notes get-ref" |
07432cef | 7239 | msgstr "git notes get-ref" |
ef317cd5 | 7240 | |
2e8451e8 | 7241 | #: builtin/notes.c:137 |
c04f5ac3 JX |
7242 | #, c-format |
7243 | msgid "unable to start 'show' for object '%s'" | |
7244 | msgstr "不能为对象 '%s' 开始 'show'" | |
7245 | ||
2e8451e8 | 7246 | #: builtin/notes.c:141 |
a77c07d9 JX |
7247 | msgid "could not read 'show' output" |
7248 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 7249 | |
2e8451e8 | 7250 | #: builtin/notes.c:149 |
c04f5ac3 JX |
7251 | #, c-format |
7252 | msgid "failed to finish 'show' for object '%s'" | |
7253 | msgstr "无法为对象 '%s' 完成 'show'" | |
7254 | ||
2e8451e8 | 7255 | #: builtin/notes.c:167 builtin/tag.c:341 |
c04f5ac3 JX |
7256 | #, c-format |
7257 | msgid "could not create file '%s'" | |
7258 | msgstr "不能创建文件 '%s'" | |
7259 | ||
2e8451e8 | 7260 | #: builtin/notes.c:186 |
c04f5ac3 JX |
7261 | msgid "Please supply the note contents using either -m or -F option" |
7262 | msgstr "请通过 -m 或 -F 选项为注解提供内容" | |
7263 | ||
2e8451e8 | 7264 | #: builtin/notes.c:207 builtin/notes.c:844 |
c04f5ac3 JX |
7265 | #, c-format |
7266 | msgid "Removing note for object %s\n" | |
7267 | msgstr "删除对象 %s 的注解\n" | |
7268 | ||
2e8451e8 | 7269 | #: builtin/notes.c:212 |
c04f5ac3 JX |
7270 | msgid "unable to write note object" |
7271 | msgstr "不能写注解对象" | |
7272 | ||
2e8451e8 | 7273 | #: builtin/notes.c:214 |
c04f5ac3 JX |
7274 | #, c-format |
7275 | msgid "The note contents has been left in %s" | |
7276 | msgstr "注解内容被留在文件 %s 中" | |
7277 | ||
90314792 | 7278 | #: builtin/notes.c:248 builtin/tag.c:537 |
c04f5ac3 JX |
7279 | #, c-format |
7280 | msgid "cannot read '%s'" | |
7281 | msgstr "不能读取 '%s'" | |
7282 | ||
90314792 | 7283 | #: builtin/notes.c:250 builtin/tag.c:540 |
c04f5ac3 JX |
7284 | #, c-format |
7285 | msgid "could not open or read '%s'" | |
7286 | msgstr "不能打开或读取 '%s'" | |
7287 | ||
2e8451e8 JX |
7288 | #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318 |
7289 | #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515 | |
7290 | #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637 | |
90314792 | 7291 | #: builtin/notes.c:839 builtin/tag.c:553 |
c04f5ac3 JX |
7292 | #, c-format |
7293 | msgid "Failed to resolve '%s' as a valid ref." | |
90e6ef53 | 7294 | msgstr "无法解析 '%s' 为一个有效引用。" |
c04f5ac3 | 7295 | |
2e8451e8 | 7296 | #: builtin/notes.c:272 |
c04f5ac3 JX |
7297 | #, c-format |
7298 | msgid "Failed to read object '%s'." | |
7299 | msgstr "无法读取对象 '%s'。" | |
7300 | ||
2e8451e8 | 7301 | #: builtin/notes.c:312 |
c04f5ac3 JX |
7302 | #, c-format |
7303 | msgid "Malformed input line: '%s'." | |
7304 | msgstr "非法的输入行:'%s'。" | |
7305 | ||
2e8451e8 | 7306 | #: builtin/notes.c:327 |
c04f5ac3 JX |
7307 | #, c-format |
7308 | msgid "Failed to copy notes from '%s' to '%s'" | |
90e6ef53 | 7309 | msgstr "无法从 '%s' 到 '%s' 拷贝注解" |
c04f5ac3 | 7310 | |
2e8451e8 JX |
7311 | #: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498 |
7312 | #: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630 | |
7313 | #: builtin/notes.c:904 | |
c04f5ac3 JX |
7314 | msgid "too many parameters" |
7315 | msgstr "参数太多" | |
7316 | ||
2e8451e8 | 7317 | #: builtin/notes.c:384 builtin/notes.c:643 |
c04f5ac3 JX |
7318 | #, c-format |
7319 | msgid "No note found for object %s." | |
7320 | msgstr "未发现对象 %s 的注解。" | |
7321 | ||
2e8451e8 | 7322 | #: builtin/notes.c:406 builtin/notes.c:563 |
ef317cd5 | 7323 | msgid "note contents as a string" |
07432cef | 7324 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 7325 | |
2e8451e8 | 7326 | #: builtin/notes.c:409 builtin/notes.c:566 |
ef317cd5 | 7327 | msgid "note contents in a file" |
07432cef | 7328 | msgstr "注解内容到一个文件中" |
ef317cd5 | 7329 | |
2e8451e8 JX |
7330 | #: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568 |
7331 | #: builtin/notes.c:571 builtin/tag.c:474 | |
ef317cd5 | 7332 | msgid "object" |
07432cef | 7333 | msgstr "对象" |
ef317cd5 | 7334 | |
2e8451e8 | 7335 | #: builtin/notes.c:412 builtin/notes.c:569 |
ef317cd5 | 7336 | msgid "reuse and edit specified note object" |
07432cef | 7337 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 7338 | |
2e8451e8 | 7339 | #: builtin/notes.c:415 builtin/notes.c:572 |
ef317cd5 | 7340 | msgid "reuse specified note object" |
07432cef | 7341 | msgstr "重用指定的注解对象" |
ef317cd5 | 7342 | |
2e8451e8 | 7343 | #: builtin/notes.c:417 builtin/notes.c:485 |
ef317cd5 | 7344 | msgid "replace existing notes" |
07432cef | 7345 | msgstr "替换已存在的注解" |
ef317cd5 | 7346 | |
2e8451e8 | 7347 | #: builtin/notes.c:451 |
c04f5ac3 JX |
7348 | #, c-format |
7349 | msgid "" | |
7350 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
7351 | "existing notes" | |
7352 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
7353 | ||
2e8451e8 | 7354 | #: builtin/notes.c:456 builtin/notes.c:533 |
c04f5ac3 JX |
7355 | #, c-format |
7356 | msgid "Overwriting existing notes for object %s\n" | |
7357 | msgstr "覆盖对象 %s 现存注解\n" | |
7358 | ||
2e8451e8 | 7359 | #: builtin/notes.c:486 |
ef317cd5 | 7360 | msgid "read objects from stdin" |
07432cef | 7361 | msgstr "从标准输入读取对象" |
ef317cd5 | 7362 | |
2e8451e8 | 7363 | #: builtin/notes.c:488 |
ef317cd5 | 7364 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 7365 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 7366 | |
2e8451e8 | 7367 | #: builtin/notes.c:506 |
c04f5ac3 JX |
7368 | msgid "too few parameters" |
7369 | msgstr "参数太少" | |
7370 | ||
2e8451e8 | 7371 | #: builtin/notes.c:527 |
c04f5ac3 JX |
7372 | #, c-format |
7373 | msgid "" | |
7374 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
7375 | "existing notes" | |
7376 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
7377 | ||
2e8451e8 | 7378 | #: builtin/notes.c:539 |
c04f5ac3 JX |
7379 | #, c-format |
7380 | msgid "Missing notes on source object %s. Cannot copy." | |
7381 | msgstr "源对象 %s 缺少注解。不能拷贝。" | |
7382 | ||
2e8451e8 | 7383 | #: builtin/notes.c:588 |
ef317cd5 JX |
7384 | #, c-format |
7385 | msgid "" | |
7386 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
7387 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
7388 | msgstr "" | |
7389 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
7390 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
7391 | ||
2e8451e8 | 7392 | #: builtin/notes.c:735 |
ef317cd5 | 7393 | msgid "General options" |
07432cef | 7394 | msgstr "通用选项" |
ef317cd5 | 7395 | |
2e8451e8 | 7396 | #: builtin/notes.c:737 |
ef317cd5 | 7397 | msgid "Merge options" |
07432cef | 7398 | msgstr "合并选项" |
ef317cd5 | 7399 | |
2e8451e8 | 7400 | #: builtin/notes.c:739 |
ef317cd5 JX |
7401 | msgid "" |
7402 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
7403 | "cat_sort_uniq)" | |
07432cef | 7404 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 7405 | |
2e8451e8 | 7406 | #: builtin/notes.c:741 |
ef317cd5 | 7407 | msgid "Committing unmerged notes" |
07432cef | 7408 | msgstr "提交未合并的注解" |
ef317cd5 | 7409 | |
2e8451e8 | 7410 | #: builtin/notes.c:743 |
ef317cd5 | 7411 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 7412 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 7413 | |
2e8451e8 | 7414 | #: builtin/notes.c:745 |
ef317cd5 | 7415 | msgid "Aborting notes merge resolution" |
07432cef | 7416 | msgstr "中止注解合并的方案" |
ef317cd5 | 7417 | |
2e8451e8 | 7418 | #: builtin/notes.c:747 |
ef317cd5 | 7419 | msgid "abort notes merge" |
07432cef | 7420 | msgstr "中止注解合并" |
ef317cd5 | 7421 | |
2e8451e8 | 7422 | #: builtin/notes.c:842 |
ef317cd5 JX |
7423 | #, c-format |
7424 | msgid "Object %s has no note\n" | |
7425 | msgstr "对象 %s 没有注解\n" | |
7426 | ||
2e8451e8 | 7427 | #: builtin/notes.c:854 |
ef317cd5 | 7428 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 7429 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 7430 | |
2e8451e8 | 7431 | #: builtin/notes.c:857 |
ef317cd5 | 7432 | msgid "read object names from the standard input" |
07432cef | 7433 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 7434 | |
2e8451e8 | 7435 | #: builtin/notes.c:938 |
ef317cd5 | 7436 | msgid "notes_ref" |
07432cef | 7437 | msgstr "注解引用" |
ef317cd5 | 7438 | |
2e8451e8 | 7439 | #: builtin/notes.c:939 |
ef317cd5 | 7440 | msgid "use notes from <notes_ref>" |
07432cef | 7441 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 7442 | |
2e8451e8 | 7443 | #: builtin/notes.c:974 builtin/remote.c:1598 |
ef317cd5 JX |
7444 | #, c-format |
7445 | msgid "Unknown subcommand: %s" | |
7446 | msgstr "未知子命令:%s" | |
7447 | ||
7448 | #: builtin/pack-objects.c:23 | |
7449 | msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" | |
07432cef | 7450 | msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" |
ef317cd5 JX |
7451 | |
7452 | #: builtin/pack-objects.c:24 | |
7453 | msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" | |
07432cef | 7454 | msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" |
ef317cd5 | 7455 | |
90314792 | 7456 | #: builtin/pack-objects.c:184 builtin/pack-objects.c:187 |
ef317cd5 JX |
7457 | #, c-format |
7458 | msgid "deflate error (%d)" | |
7459 | msgstr "压缩错误 (%d)" | |
7460 | ||
90314792 | 7461 | #: builtin/pack-objects.c:2398 |
ef317cd5 JX |
7462 | #, c-format |
7463 | msgid "unsupported index version %s" | |
7464 | msgstr "不支持的索引版本 %s" | |
7465 | ||
90314792 | 7466 | #: builtin/pack-objects.c:2402 |
ef317cd5 JX |
7467 | #, c-format |
7468 | msgid "bad index version '%s'" | |
7469 | msgstr "坏的索引版本 '%s'" | |
7470 | ||
90314792 | 7471 | #: builtin/pack-objects.c:2425 |
ef317cd5 JX |
7472 | #, c-format |
7473 | msgid "option %s does not accept negative form" | |
7474 | msgstr "选项 %s 不接受否定格式" | |
7475 | ||
90314792 | 7476 | #: builtin/pack-objects.c:2429 |
ef317cd5 JX |
7477 | #, c-format |
7478 | msgid "unable to parse value '%s' for option %s" | |
7479 | msgstr "不能解析选项 %1$s 的值 '%2$s'" | |
7480 | ||
90314792 | 7481 | #: builtin/pack-objects.c:2448 |
ef317cd5 | 7482 | msgid "do not show progress meter" |
07432cef | 7483 | msgstr "不显示进度表" |
ef317cd5 | 7484 | |
90314792 | 7485 | #: builtin/pack-objects.c:2450 |
ef317cd5 | 7486 | msgid "show progress meter" |
07432cef | 7487 | msgstr "显示进度表" |
ef317cd5 | 7488 | |
90314792 | 7489 | #: builtin/pack-objects.c:2452 |
ef317cd5 | 7490 | msgid "show progress meter during object writing phase" |
07432cef | 7491 | msgstr "在对象写入阶段显示进度表" |
ef317cd5 | 7492 | |
90314792 | 7493 | #: builtin/pack-objects.c:2455 |
ef317cd5 | 7494 | msgid "similar to --all-progress when progress meter is shown" |
07432cef | 7495 | msgstr "当进度表显示时类似于 --all-progress" |
ef317cd5 | 7496 | |
90314792 | 7497 | #: builtin/pack-objects.c:2456 |
ef317cd5 | 7498 | msgid "version[,offset]" |
07432cef | 7499 | msgstr "版本[,偏移]" |
ef317cd5 | 7500 | |
90314792 | 7501 | #: builtin/pack-objects.c:2457 |
ef317cd5 | 7502 | msgid "write the pack index file in the specified idx format version" |
07432cef | 7503 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 7504 | |
90314792 | 7505 | #: builtin/pack-objects.c:2460 |
ef317cd5 | 7506 | msgid "maximum size of each output pack file" |
07432cef | 7507 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 7508 | |
90314792 | 7509 | #: builtin/pack-objects.c:2462 |
ef317cd5 | 7510 | msgid "ignore borrowed objects from alternate object store" |
07432cef | 7511 | msgstr "忽略从替代对象存储里借用对象" |
ef317cd5 | 7512 | |
90314792 | 7513 | #: builtin/pack-objects.c:2464 |
ef317cd5 | 7514 | msgid "ignore packed objects" |
07432cef | 7515 | msgstr "忽略包对象" |
ef317cd5 | 7516 | |
90314792 | 7517 | #: builtin/pack-objects.c:2466 |
ef317cd5 | 7518 | msgid "limit pack window by objects" |
07432cef | 7519 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 7520 | |
90314792 | 7521 | #: builtin/pack-objects.c:2468 |
ef317cd5 | 7522 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 7523 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 7524 | |
90314792 | 7525 | #: builtin/pack-objects.c:2470 |
ef317cd5 | 7526 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 7527 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 7528 | |
90314792 | 7529 | #: builtin/pack-objects.c:2472 |
ef317cd5 | 7530 | msgid "reuse existing deltas" |
07432cef | 7531 | msgstr "重用已存在的 deltas" |
ef317cd5 | 7532 | |
90314792 | 7533 | #: builtin/pack-objects.c:2474 |
ef317cd5 | 7534 | msgid "reuse existing objects" |
07432cef | 7535 | msgstr "重用已存在的对象" |
ef317cd5 | 7536 | |
90314792 | 7537 | #: builtin/pack-objects.c:2476 |
ef317cd5 | 7538 | msgid "use OFS_DELTA objects" |
07432cef | 7539 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 7540 | |
90314792 | 7541 | #: builtin/pack-objects.c:2478 |
ef317cd5 | 7542 | msgid "use threads when searching for best delta matches" |
07432cef | 7543 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 7544 | |
90314792 | 7545 | #: builtin/pack-objects.c:2480 |
ef317cd5 | 7546 | msgid "do not create an empty pack output" |
07432cef | 7547 | msgstr "不创建空的包输出" |
ef317cd5 | 7548 | |
90314792 | 7549 | #: builtin/pack-objects.c:2482 |
ef317cd5 | 7550 | msgid "read revision arguments from standard input" |
07432cef | 7551 | msgstr "从标准输入读取修订号参数" |
ef317cd5 | 7552 | |
90314792 | 7553 | #: builtin/pack-objects.c:2484 |
ef317cd5 | 7554 | msgid "limit the objects to those that are not yet packed" |
07432cef | 7555 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 7556 | |
90314792 | 7557 | #: builtin/pack-objects.c:2487 |
ef317cd5 | 7558 | msgid "include objects reachable from any reference" |
07432cef | 7559 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 7560 | |
90314792 | 7561 | #: builtin/pack-objects.c:2490 |
ef317cd5 | 7562 | msgid "include objects referred by reflog entries" |
07432cef | 7563 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 7564 | |
90314792 | 7565 | #: builtin/pack-objects.c:2493 |
ef317cd5 | 7566 | msgid "output pack to stdout" |
07432cef | 7567 | msgstr "输出包到标准输出" |
ef317cd5 | 7568 | |
90314792 | 7569 | #: builtin/pack-objects.c:2495 |
ef317cd5 | 7570 | msgid "include tag objects that refer to objects to be packed" |
07432cef | 7571 | msgstr "包括引用了打包对象的 tag" |
ef317cd5 | 7572 | |
90314792 | 7573 | #: builtin/pack-objects.c:2497 |
ef317cd5 | 7574 | msgid "keep unreachable objects" |
07432cef | 7575 | msgstr "维持不可达的对象" |
ef317cd5 | 7576 | |
90314792 | 7577 | #: builtin/pack-objects.c:2498 parse-options.h:143 |
ef317cd5 JX |
7578 | msgid "time" |
7579 | msgstr "时间" | |
7580 | ||
90314792 | 7581 | #: builtin/pack-objects.c:2499 |
ef317cd5 | 7582 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 7583 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 7584 | |
90314792 | 7585 | #: builtin/pack-objects.c:2502 |
ef317cd5 | 7586 | msgid "create thin packs" |
07432cef | 7587 | msgstr "创建精简包" |
ef317cd5 | 7588 | |
90314792 | 7589 | #: builtin/pack-objects.c:2504 |
ef317cd5 | 7590 | msgid "ignore packs that have companion .keep file" |
07432cef | 7591 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 7592 | |
90314792 | 7593 | #: builtin/pack-objects.c:2506 |
ef317cd5 | 7594 | msgid "pack compression level" |
07432cef | 7595 | msgstr "打包压缩级别" |
ef317cd5 | 7596 | |
90314792 | 7597 | #: builtin/pack-objects.c:2508 |
ef317cd5 | 7598 | msgid "do not hide commits by grafts" |
07432cef | 7599 | msgstr "不隐藏移植覆盖的提交" |
ef317cd5 JX |
7600 | |
7601 | #: builtin/pack-refs.c:6 | |
7602 | msgid "git pack-refs [options]" | |
07432cef | 7603 | msgstr "git pack-refs [选项]" |
c04f5ac3 | 7604 | |
ef317cd5 JX |
7605 | #: builtin/pack-refs.c:14 |
7606 | msgid "pack everything" | |
07432cef | 7607 | msgstr "打包一切" |
c04f5ac3 | 7608 | |
ef317cd5 JX |
7609 | #: builtin/pack-refs.c:15 |
7610 | msgid "prune loose refs (default)" | |
07432cef | 7611 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 7612 | |
ef317cd5 JX |
7613 | #: builtin/prune-packed.c:7 |
7614 | msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" | |
07432cef | 7615 | msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" |
6792b93b | 7616 | |
ef317cd5 JX |
7617 | #: builtin/prune.c:12 |
7618 | msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" | |
07432cef | 7619 | msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" |
7ac1c0ad | 7620 | |
ef317cd5 | 7621 | #: builtin/prune.c:132 |
ef317cd5 | 7622 | msgid "do not remove, show only" |
07432cef | 7623 | msgstr "不删除,只显示" |
7ac1c0ad | 7624 | |
ef317cd5 | 7625 | #: builtin/prune.c:133 |
ef317cd5 | 7626 | msgid "report pruned objects" |
07432cef | 7627 | msgstr "报告清除的对象" |
7ac1c0ad | 7628 | |
ef317cd5 JX |
7629 | #: builtin/prune.c:136 |
7630 | msgid "expire objects older than <time>" | |
07432cef | 7631 | msgstr "使早于给定时间的对象过期" |
ef317cd5 JX |
7632 | |
7633 | #: builtin/push.c:14 | |
ef317cd5 | 7634 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
90314792 | 7635 | msgstr "git push [<选项>] [<版本库> [<引用规则>...]]" |
7ac1c0ad | 7636 | |
90314792 | 7637 | #: builtin/push.c:47 |
c04f5ac3 JX |
7638 | msgid "tag shorthand without <tag>" |
7639 | msgstr "tag 简写没有跟 <tag> 参数" | |
7640 | ||
90314792 | 7641 | #: builtin/push.c:66 |
c04f5ac3 | 7642 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 7643 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 7644 | |
90314792 | 7645 | #: builtin/push.c:101 |
8ada9598 JX |
7646 | msgid "" |
7647 | "\n" | |
7648 | "To choose either option permanently, see push.default in 'git help config'." | |
7649 | msgstr "" | |
81809b99 JX |
7650 | "\n" |
7651 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 7652 | |
90314792 | 7653 | #: builtin/push.c:104 |
8ada9598 JX |
7654 | #, c-format |
7655 | msgid "" | |
7656 | "The upstream branch of your current branch does not match\n" | |
7657 | "the name of your current branch. To push to the upstream branch\n" | |
7658 | "on the remote, use\n" | |
7659 | "\n" | |
7660 | " git push %s HEAD:%s\n" | |
7661 | "\n" | |
7662 | "To push to the branch of the same name on the remote, use\n" | |
7663 | "\n" | |
7664 | " git push %s %s\n" | |
7665 | "%s" | |
7666 | msgstr "" | |
81809b99 JX |
7667 | "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n" |
7668 | "上游分支,使用\n" | |
7669 | "\n" | |
7670 | " git push %s HEAD:%s\n" | |
7671 | "\n" | |
7672 | "为推送至远程同名分支,使用\n" | |
7673 | "\n" | |
7674 | " git push %s %s\n" | |
7675 | "%s" | |
8ada9598 | 7676 | |
90314792 | 7677 | #: builtin/push.c:119 |
c04f5ac3 JX |
7678 | #, c-format |
7679 | msgid "" | |
7680 | "You are not currently on a branch.\n" | |
7681 | "To push the history leading to the current (detached HEAD)\n" | |
7682 | "state now, use\n" | |
7683 | "\n" | |
7684 | " git push %s HEAD:<name-of-remote-branch>\n" | |
7685 | msgstr "" | |
7686 | "您当前不在一个分支上。\n" | |
90e6ef53 | 7687 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 JX |
7688 | "\n" |
7689 | " git push %s HEAD:<name-of-remote-branch>\n" | |
7690 | ||
90314792 | 7691 | #: builtin/push.c:133 |
c04f5ac3 JX |
7692 | #, c-format |
7693 | msgid "" | |
7694 | "The current branch %s has no upstream branch.\n" | |
7695 | "To push the current branch and set the remote as upstream, use\n" | |
7696 | "\n" | |
7697 | " git push --set-upstream %s %s\n" | |
7698 | msgstr "" | |
7699 | "当前分支 %s 没有对应的上游分支。\n" | |
7700 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
7701 | "\n" | |
7702 | " git push --set-upstream %s %s\n" | |
7703 | ||
90314792 | 7704 | #: builtin/push.c:141 |
c04f5ac3 JX |
7705 | #, c-format |
7706 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
7707 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
7708 | ||
90314792 | 7709 | #: builtin/push.c:144 |
73a60cd2 JX |
7710 | #, c-format |
7711 | msgid "" | |
7712 | "You are pushing to remote '%s', which is not the upstream of\n" | |
7713 | "your current branch '%s', without telling me what to push\n" | |
7714 | "to update which remote branch." | |
7715 | msgstr "" | |
7716 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
7717 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
7718 | ||
c160d03f | 7719 | # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短 |
90314792 | 7720 | #: builtin/push.c:167 |
c160d03f JX |
7721 | msgid "" |
7722 | "push.default is unset; its implicit value is changing in\n" | |
7723 | "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" | |
7724 | "and maintain the current behavior after the default changes, use:\n" | |
7725 | "\n" | |
7726 | " git config --global push.default matching\n" | |
7727 | "\n" | |
7728 | "To squelch this message and adopt the new behavior now, use:\n" | |
7729 | "\n" | |
7730 | " git config --global push.default simple\n" | |
7731 | "\n" | |
7732 | "See 'git help config' and search for 'push.default' for further " | |
7733 | "information.\n" | |
7734 | "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" | |
7735 | "'current' instead of 'simple' if you sometimes use older versions of Git)" | |
7736 | msgstr "" | |
90314792 JX |
7737 | "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n" |
7738 | "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n" | |
c160d03f JX |
7739 | "\n" |
7740 | " git config --global push.default matching\n" | |
7741 | "\n" | |
7742 | "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n" | |
7743 | "\n" | |
7744 | " git config --global push.default simple\n" | |
7745 | "\n" | |
7746 | "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n" | |
7747 | "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n" | |
90314792 | 7748 | "为保持兼容,请用 'current' 代替 'simple')" |
c160d03f | 7749 | |
90314792 | 7750 | #: builtin/push.c:227 |
c04f5ac3 JX |
7751 | msgid "" |
7752 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
90314792 | 7753 | msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 7754 | |
90314792 | 7755 | #: builtin/push.c:234 |
170e9899 JX |
7756 | msgid "" |
7757 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
7758 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
7759 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
7760 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
7761 | msgstr "" | |
eff6d3a9 | 7762 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 7763 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 7764 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 7765 | |
90314792 | 7766 | #: builtin/push.c:240 |
170e9899 JX |
7767 | msgid "" |
7768 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
7769 | "counterpart. If you did not intend to push that branch, you may want to\n" | |
c160d03f JX |
7770 | "specify branches to push or set the 'push.default' configuration variable\n" |
7771 | "to 'simple', 'current' or 'upstream' to push only the current branch." | |
170e9899 | 7772 | msgstr "" |
eff6d3a9 JX |
7773 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
7774 | "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n" | |
c160d03f JX |
7775 | "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n" |
7776 | "以便只推送当前分支。" | |
170e9899 | 7777 | |
90314792 | 7778 | #: builtin/push.c:246 |
170e9899 JX |
7779 | msgid "" |
7780 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
7781 | "counterpart. Check out this branch and integrate the remote changes\n" |
7782 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
7783 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
7784 | msgstr "" | |
eff6d3a9 | 7785 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 7786 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 7787 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 7788 | |
90314792 | 7789 | #: builtin/push.c:252 |
07432cef | 7790 | msgid "" |
a77c07d9 JX |
7791 | "Updates were rejected because the remote contains work that you do\n" |
7792 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
7793 | "to the same ref. You may want to first integrate the remote changes\n" |
7794 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
7795 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
7796 | msgstr "" | |
7797 | "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" | |
2e8451e8 JX |
7798 | "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" |
7799 | "(如 'git pull ...')。\n" | |
a77c07d9 JX |
7800 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
7801 | ||
90314792 | 7802 | #: builtin/push.c:259 |
a77c07d9 JX |
7803 | msgid "Updates were rejected because the tag already exists in the remote." |
7804 | msgstr "更新被拒绝因为 tag 在远程已经存在。" | |
7805 | ||
90314792 | 7806 | #: builtin/push.c:262 |
a77c07d9 JX |
7807 | msgid "" |
7808 | "You cannot update a remote ref that points at a non-commit object,\n" | |
7809 | "or update a remote ref to make it point at a non-commit object,\n" | |
7810 | "without using the '--force' option.\n" | |
7811 | msgstr "" | |
7812 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
7813 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 7814 | |
90314792 | 7815 | #: builtin/push.c:328 |
c04f5ac3 JX |
7816 | #, c-format |
7817 | msgid "Pushing to %s\n" | |
7818 | msgstr "推送到 %s\n" | |
7819 | ||
90314792 | 7820 | #: builtin/push.c:332 |
c04f5ac3 JX |
7821 | #, c-format |
7822 | msgid "failed to push some refs to '%s'" | |
7823 | msgstr "无法推送一些引用到 '%s'" | |
7824 | ||
90314792 | 7825 | #: builtin/push.c:365 |
c04f5ac3 JX |
7826 | #, c-format |
7827 | msgid "bad repository '%s'" | |
90e6ef53 | 7828 | msgstr "坏的版本库 '%s'" |
c04f5ac3 | 7829 | |
90314792 | 7830 | #: builtin/push.c:366 |
c04f5ac3 JX |
7831 | msgid "" |
7832 | "No configured push destination.\n" | |
7833 | "Either specify the URL from the command-line or configure a remote " | |
7834 | "repository using\n" | |
7835 | "\n" | |
7836 | " git remote add <name> <url>\n" | |
7837 | "\n" | |
7838 | "and then push using the remote name\n" | |
7839 | "\n" | |
7840 | " git push <name>\n" | |
7841 | msgstr "" | |
90e6ef53 | 7842 | "没有配置推送目标。\n" |
07432cef | 7843 | "或通过命令行指定URL,或用下面命令配置一个远程版本库\n" |
c04f5ac3 JX |
7844 | "\n" |
7845 | " git remote add <name> <url>\n" | |
7846 | "\n" | |
7847 | "然后使用该远程版本库名执行推送\n" | |
7848 | "\n" | |
7849 | " git push <name>\n" | |
7850 | ||
90314792 | 7851 | #: builtin/push.c:381 |
c04f5ac3 JX |
7852 | msgid "--all and --tags are incompatible" |
7853 | msgstr "--all 和 --tags 不兼容" | |
7854 | ||
90314792 | 7855 | #: builtin/push.c:382 |
c04f5ac3 | 7856 | msgid "--all can't be combined with refspecs" |
90314792 | 7857 | msgstr "--all 不能和引用规则同时使用" |
c04f5ac3 | 7858 | |
90314792 | 7859 | #: builtin/push.c:387 |
c04f5ac3 JX |
7860 | msgid "--mirror and --tags are incompatible" |
7861 | msgstr "--mirror 和 --tags 不兼容" | |
7862 | ||
90314792 | 7863 | #: builtin/push.c:388 |
c04f5ac3 | 7864 | msgid "--mirror can't be combined with refspecs" |
90314792 | 7865 | msgstr "--mirror 不能和引用规则同时使用" |
c04f5ac3 | 7866 | |
90314792 | 7867 | #: builtin/push.c:393 |
c04f5ac3 JX |
7868 | msgid "--all and --mirror are incompatible" |
7869 | msgstr "--all 和 --mirror 不兼容" | |
7870 | ||
90314792 | 7871 | #: builtin/push.c:453 |
ef317cd5 | 7872 | msgid "repository" |
07432cef | 7873 | msgstr "版本库" |
ef317cd5 | 7874 | |
90314792 | 7875 | #: builtin/push.c:454 |
ef317cd5 | 7876 | msgid "push all refs" |
07432cef | 7877 | msgstr "推送所有引用" |
ef317cd5 | 7878 | |
90314792 | 7879 | #: builtin/push.c:455 |
ef317cd5 | 7880 | msgid "mirror all refs" |
07432cef | 7881 | msgstr "镜像所有引用" |
ef317cd5 | 7882 | |
90314792 | 7883 | #: builtin/push.c:457 |
ef317cd5 | 7884 | msgid "delete refs" |
07432cef | 7885 | msgstr "删除引用" |
ef317cd5 | 7886 | |
90314792 | 7887 | #: builtin/push.c:458 |
ef317cd5 | 7888 | msgid "push tags (can't be used with --all or --mirror)" |
07432cef | 7889 | msgstr "推送 tags(不能使用 --all or --mirror)" |
ef317cd5 | 7890 | |
90314792 | 7891 | #: builtin/push.c:461 |
ef317cd5 JX |
7892 | msgid "force updates" |
7893 | msgstr "强制更新" | |
7894 | ||
90314792 JX |
7895 | #: builtin/push.c:463 |
7896 | msgid "refname>:<expect" | |
7897 | msgstr "引用名>:<期望值" | |
7898 | ||
7899 | #: builtin/push.c:464 | |
7900 | msgid "require old value of ref to be at this value" | |
7901 | msgstr "要求引用旧的取值为设定值" | |
7902 | ||
7903 | #: builtin/push.c:466 | |
ef317cd5 | 7904 | msgid "check" |
07432cef | 7905 | msgstr "检查" |
ef317cd5 | 7906 | |
90314792 | 7907 | #: builtin/push.c:467 |
ef317cd5 | 7908 | msgid "control recursive pushing of submodules" |
07432cef | 7909 | msgstr "控制子模组的递归推送" |
ef317cd5 | 7910 | |
90314792 | 7911 | #: builtin/push.c:469 |
ef317cd5 | 7912 | msgid "use thin pack" |
07432cef | 7913 | msgstr "使用精简打包" |
ef317cd5 | 7914 | |
90314792 | 7915 | #: builtin/push.c:470 builtin/push.c:471 |
ef317cd5 | 7916 | msgid "receive pack program" |
07432cef | 7917 | msgstr "接收包程序" |
ef317cd5 | 7918 | |
90314792 | 7919 | #: builtin/push.c:472 |
ef317cd5 | 7920 | msgid "set upstream for git pull/status" |
07432cef | 7921 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 7922 | |
90314792 | 7923 | #: builtin/push.c:475 |
ef317cd5 | 7924 | msgid "prune locally removed refs" |
07432cef | 7925 | msgstr "清除本地删除的引用" |
ef317cd5 | 7926 | |
90314792 | 7927 | #: builtin/push.c:477 |
a77c07d9 JX |
7928 | msgid "bypass pre-push hook" |
7929 | msgstr "绕过 pre-push 钩子" | |
7930 | ||
90314792 | 7931 | #: builtin/push.c:478 |
1003b3a5 JX |
7932 | msgid "push missing but relevant tags" |
7933 | msgstr "推送缺失的有关的 tags" | |
7934 | ||
90314792 | 7935 | #: builtin/push.c:488 |
c04f5ac3 JX |
7936 | msgid "--delete is incompatible with --all, --mirror and --tags" |
7937 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
7938 | ||
90314792 | 7939 | #: builtin/push.c:490 |
c04f5ac3 JX |
7940 | msgid "--delete doesn't make sense without any refs" |
7941 | msgstr "--delete 未接任何引用没有意义" | |
7942 | ||
ef317cd5 JX |
7943 | #: builtin/read-tree.c:36 |
7944 | msgid "" | |
7945 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " | |
7946 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
7947 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
7948 | msgstr "" | |
07432cef WS |
7949 | "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" |
7950 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" | |
7951 | "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" | |
ef317cd5 | 7952 | |
2e8451e8 | 7953 | #: builtin/read-tree.c:109 |
ef317cd5 | 7954 | msgid "write resulting index to <file>" |
07432cef | 7955 | msgstr "将索引结果写入 <file>" |
ef317cd5 | 7956 | |
2e8451e8 | 7957 | #: builtin/read-tree.c:112 |
ef317cd5 | 7958 | msgid "only empty the index" |
07432cef | 7959 | msgstr "只是清空索引" |
ef317cd5 | 7960 | |
2e8451e8 | 7961 | #: builtin/read-tree.c:114 |
ef317cd5 | 7962 | msgid "Merging" |
07432cef | 7963 | msgstr "合并" |
ef317cd5 | 7964 | |
2e8451e8 | 7965 | #: builtin/read-tree.c:116 |
ef317cd5 | 7966 | msgid "perform a merge in addition to a read" |
07432cef | 7967 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 7968 | |
2e8451e8 | 7969 | #: builtin/read-tree.c:118 |
ef317cd5 | 7970 | msgid "3-way merge if no file level merging required" |
07432cef | 7971 | msgstr "如果没有文件级合并需要,执行三路合并" |
ef317cd5 | 7972 | |
2e8451e8 | 7973 | #: builtin/read-tree.c:120 |
ef317cd5 | 7974 | msgid "3-way merge in presence of adds and removes" |
07432cef | 7975 | msgstr "存在添加和删除时,也执行三路合并" |
ef317cd5 | 7976 | |
2e8451e8 | 7977 | #: builtin/read-tree.c:122 |
ef317cd5 | 7978 | msgid "same as -m, but discard unmerged entries" |
07432cef | 7979 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 7980 | |
2e8451e8 | 7981 | #: builtin/read-tree.c:123 |
ef317cd5 | 7982 | msgid "<subdirectory>/" |
07432cef | 7983 | msgstr "<子目录>/" |
ef317cd5 | 7984 | |
2e8451e8 | 7985 | #: builtin/read-tree.c:124 |
ef317cd5 | 7986 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 7987 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 7988 | |
2e8451e8 | 7989 | #: builtin/read-tree.c:127 |
ef317cd5 | 7990 | msgid "update working tree with merge result" |
07432cef | 7991 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 7992 | |
2e8451e8 | 7993 | #: builtin/read-tree.c:129 |
ef317cd5 | 7994 | msgid "gitignore" |
07432cef | 7995 | msgstr "gitignore" |
ef317cd5 | 7996 | |
2e8451e8 | 7997 | #: builtin/read-tree.c:130 |
ef317cd5 | 7998 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 7999 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 8000 | |
2e8451e8 | 8001 | #: builtin/read-tree.c:133 |
ef317cd5 | 8002 | msgid "don't check the working tree after merging" |
07432cef | 8003 | msgstr "合并后不检查工作区" |
ef317cd5 | 8004 | |
2e8451e8 | 8005 | #: builtin/read-tree.c:134 |
ef317cd5 | 8006 | msgid "don't update the index or the work tree" |
07432cef | 8007 | msgstr "不更新索引区和工作区" |
ef317cd5 | 8008 | |
2e8451e8 | 8009 | #: builtin/read-tree.c:136 |
ef317cd5 | 8010 | msgid "skip applying sparse checkout filter" |
07432cef | 8011 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 8012 | |
2e8451e8 | 8013 | #: builtin/read-tree.c:138 |
ef317cd5 | 8014 | msgid "debug unpack-trees" |
07432cef | 8015 | msgstr "调试 unpack-trees" |
ef317cd5 | 8016 | |
90314792 | 8017 | #: builtin/reflog.c:499 |
2e8451e8 JX |
8018 | #, c-format |
8019 | msgid "%s' for '%s' is not a valid timestamp" | |
8020 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
8021 | ||
90314792 | 8022 | #: builtin/reflog.c:615 builtin/reflog.c:620 |
2e8451e8 JX |
8023 | #, c-format |
8024 | msgid "'%s' is not a valid timestamp" | |
8025 | msgstr "'%s' 不是一个有效的时间戳" | |
8026 | ||
ef317cd5 JX |
8027 | #: builtin/remote.c:11 |
8028 | msgid "git remote [-v | --verbose]" | |
07432cef | 8029 | msgstr "git remote [-v | --verbose]" |
ef317cd5 JX |
8030 | |
8031 | #: builtin/remote.c:12 | |
8032 | msgid "" | |
8033 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" | |
8034 | "mirror=<fetch|push>] <name> <url>" | |
8035 | msgstr "" | |
07432cef WS |
8036 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" |
8037 | "mirror=<fetch|push>] <名称> <url>" | |
ef317cd5 JX |
8038 | |
8039 | #: builtin/remote.c:13 builtin/remote.c:32 | |
8040 | msgid "git remote rename <old> <new>" | |
07432cef | 8041 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 JX |
8042 | |
8043 | #: builtin/remote.c:14 builtin/remote.c:37 | |
8044 | msgid "git remote remove <name>" | |
07432cef | 8045 | msgstr "git remote remove <名称>" |
ef317cd5 | 8046 | |
90314792 JX |
8047 | #: builtin/remote.c:15 |
8048 | msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" | |
8049 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)" | |
ef317cd5 JX |
8050 | |
8051 | #: builtin/remote.c:16 | |
8052 | msgid "git remote [-v | --verbose] show [-n] <name>" | |
07432cef | 8053 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 JX |
8054 | |
8055 | #: builtin/remote.c:17 | |
8056 | msgid "git remote prune [-n | --dry-run] <name>" | |
07432cef | 8057 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 JX |
8058 | |
8059 | #: builtin/remote.c:18 | |
8060 | msgid "" | |
8061 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 8062 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 JX |
8063 | |
8064 | #: builtin/remote.c:19 | |
8065 | msgid "git remote set-branches [--add] <name> <branch>..." | |
07432cef | 8066 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 JX |
8067 | |
8068 | #: builtin/remote.c:20 builtin/remote.c:68 | |
8069 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" | |
07432cef | 8070 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 JX |
8071 | |
8072 | #: builtin/remote.c:21 builtin/remote.c:69 | |
8073 | msgid "git remote set-url --add <name> <newurl>" | |
07432cef | 8074 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 JX |
8075 | |
8076 | #: builtin/remote.c:22 builtin/remote.c:70 | |
8077 | msgid "git remote set-url --delete <name> <url>" | |
07432cef | 8078 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 JX |
8079 | |
8080 | #: builtin/remote.c:27 | |
8081 | msgid "git remote add [<options>] <name> <url>" | |
07432cef | 8082 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 8083 | |
90314792 JX |
8084 | #: builtin/remote.c:42 |
8085 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" | |
8086 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
8087 | ||
ef317cd5 JX |
8088 | #: builtin/remote.c:47 |
8089 | msgid "git remote set-branches <name> <branch>..." | |
07432cef | 8090 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 JX |
8091 | |
8092 | #: builtin/remote.c:48 | |
8093 | msgid "git remote set-branches --add <name> <branch>..." | |
07432cef | 8094 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 JX |
8095 | |
8096 | #: builtin/remote.c:53 | |
8097 | msgid "git remote show [<options>] <name>" | |
07432cef | 8098 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 JX |
8099 | |
8100 | #: builtin/remote.c:58 | |
8101 | msgid "git remote prune [<options>] <name>" | |
07432cef | 8102 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 JX |
8103 | |
8104 | #: builtin/remote.c:63 | |
8105 | msgid "git remote update [<options>] [<group> | <remote>]..." | |
07432cef | 8106 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 8107 | |
8ada9598 | 8108 | #: builtin/remote.c:98 |
81809b99 | 8109 | #, c-format |
8ada9598 | 8110 | msgid "Updating %s" |
81809b99 | 8111 | msgstr "更新 %s 中" |
8ada9598 JX |
8112 | |
8113 | #: builtin/remote.c:130 | |
8114 | msgid "" | |
8115 | "--mirror is dangerous and deprecated; please\n" | |
8116 | "\t use --mirror=fetch or --mirror=push instead" | |
8117 | msgstr "" | |
81809b99 JX |
8118 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
8119 | "\t 或 --mirror=push" | |
8ada9598 JX |
8120 | |
8121 | #: builtin/remote.c:147 | |
81809b99 | 8122 | #, c-format |
8ada9598 | 8123 | msgid "unknown mirror argument: %s" |
81809b99 | 8124 | msgstr "未知的镜像参数:%s" |
8ada9598 | 8125 | |
ef317cd5 | 8126 | #: builtin/remote.c:163 |
ef317cd5 | 8127 | msgid "fetch the remote branches" |
07432cef | 8128 | msgstr "抓取远程的分支" |
ef317cd5 JX |
8129 | |
8130 | #: builtin/remote.c:165 | |
8131 | msgid "import all tags and associated objects when fetching" | |
07432cef | 8132 | msgstr "抓取时导入所有的 tags 和关联对象" |
ef317cd5 JX |
8133 | |
8134 | #: builtin/remote.c:168 | |
8135 | msgid "or do not fetch any tag at all (--no-tags)" | |
07432cef | 8136 | msgstr "或不抓取任何 tag(--no-tags)" |
ef317cd5 JX |
8137 | |
8138 | #: builtin/remote.c:170 | |
8139 | msgid "branch(es) to track" | |
07432cef | 8140 | msgstr "跟踪的分支" |
ef317cd5 JX |
8141 | |
8142 | #: builtin/remote.c:171 | |
ef317cd5 | 8143 | msgid "master branch" |
07432cef | 8144 | msgstr "主线分支" |
ef317cd5 JX |
8145 | |
8146 | #: builtin/remote.c:172 | |
8147 | msgid "push|fetch" | |
07432cef | 8148 | msgstr "push|fetch" |
ef317cd5 JX |
8149 | |
8150 | #: builtin/remote.c:173 | |
8151 | msgid "set up remote as a mirror to push to or fetch from" | |
07432cef | 8152 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 8153 | |
8ada9598 JX |
8154 | #: builtin/remote.c:185 |
8155 | msgid "specifying a master branch makes no sense with --mirror" | |
81809b99 | 8156 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 JX |
8157 | |
8158 | #: builtin/remote.c:187 | |
8159 | msgid "specifying branches to track makes sense only with fetch mirrors" | |
649900bc | 8160 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 JX |
8161 | |
8162 | #: builtin/remote.c:195 builtin/remote.c:646 | |
81809b99 | 8163 | #, c-format |
8ada9598 | 8164 | msgid "remote %s already exists." |
81809b99 | 8165 | msgstr "远程 %s 已经存在。" |
8ada9598 JX |
8166 | |
8167 | #: builtin/remote.c:199 builtin/remote.c:650 | |
81809b99 | 8168 | #, c-format |
8ada9598 | 8169 | msgid "'%s' is not a valid remote name" |
81809b99 | 8170 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 JX |
8171 | |
8172 | #: builtin/remote.c:243 | |
81809b99 | 8173 | #, c-format |
8ada9598 | 8174 | msgid "Could not setup master '%s'" |
81809b99 | 8175 | msgstr "无法设置 master '%s'" |
8ada9598 JX |
8176 | |
8177 | #: builtin/remote.c:299 | |
81809b99 | 8178 | #, c-format |
8ada9598 | 8179 | msgid "more than one %s" |
81809b99 | 8180 | msgstr "多于一个 %s" |
8ada9598 JX |
8181 | |
8182 | #: builtin/remote.c:339 | |
81809b99 | 8183 | #, c-format |
8ada9598 | 8184 | msgid "Could not get fetch map for refspec %s" |
90314792 | 8185 | msgstr "无法得到引用规则 %s 的获取列表" |
8ada9598 JX |
8186 | |
8187 | #: builtin/remote.c:440 builtin/remote.c:448 | |
8188 | msgid "(matching)" | |
81809b99 | 8189 | msgstr "(匹配)" |
8ada9598 JX |
8190 | |
8191 | #: builtin/remote.c:452 | |
8ada9598 | 8192 | msgid "(delete)" |
81809b99 | 8193 | msgstr "(删除)" |
8ada9598 JX |
8194 | |
8195 | #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 | |
81809b99 | 8196 | #, c-format |
8ada9598 | 8197 | msgid "Could not append '%s' to '%s'" |
81809b99 | 8198 | msgstr "不能添加 '%s' 至 '%s'" |
8ada9598 JX |
8199 | |
8200 | #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 | |
81809b99 | 8201 | #, c-format |
8ada9598 | 8202 | msgid "No such remote: %s" |
81809b99 | 8203 | msgstr "没有这样的远程:%s" |
8ada9598 JX |
8204 | |
8205 | #: builtin/remote.c:656 | |
81809b99 | 8206 | #, c-format |
8ada9598 | 8207 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 8208 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 JX |
8209 | |
8210 | #: builtin/remote.c:662 builtin/remote.c:799 | |
81809b99 | 8211 | #, c-format |
8ada9598 | 8212 | msgid "Could not remove config section '%s'" |
81809b99 | 8213 | msgstr "不能移除配置小节 '%s'" |
8ada9598 JX |
8214 | |
8215 | #: builtin/remote.c:677 | |
8216 | #, c-format | |
8217 | msgid "" | |
d691f479 | 8218 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
8219 | "\t%s\n" |
8220 | "\tPlease update the configuration manually if necessary." | |
8221 | msgstr "" | |
90314792 | 8222 | "没有更新非默认的获取引用规则\n" |
81809b99 JX |
8223 | "\t%s\n" |
8224 | "\t如果必要请手动更新配置。" | |
8ada9598 JX |
8225 | |
8226 | #: builtin/remote.c:683 | |
81809b99 | 8227 | #, c-format |
8ada9598 | 8228 | msgid "Could not append '%s'" |
81809b99 | 8229 | msgstr "不能追加 '%s'" |
8ada9598 JX |
8230 | |
8231 | #: builtin/remote.c:694 | |
81809b99 | 8232 | #, c-format |
8ada9598 | 8233 | msgid "Could not set '%s'" |
81809b99 | 8234 | msgstr "不能设置 '%s'" |
8ada9598 JX |
8235 | |
8236 | #: builtin/remote.c:716 | |
81809b99 | 8237 | #, c-format |
8ada9598 | 8238 | msgid "deleting '%s' failed" |
81809b99 | 8239 | msgstr "删除 '%s' 失败" |
8ada9598 JX |
8240 | |
8241 | #: builtin/remote.c:750 | |
81809b99 | 8242 | #, c-format |
8ada9598 | 8243 | msgid "creating '%s' failed" |
81809b99 | 8244 | msgstr "创建 '%s' 失败" |
8ada9598 JX |
8245 | |
8246 | #: builtin/remote.c:764 | |
81809b99 | 8247 | #, c-format |
8ada9598 | 8248 | msgid "Could not remove branch %s" |
81809b99 | 8249 | msgstr "无法移除分支 %s" |
8ada9598 JX |
8250 | |
8251 | #: builtin/remote.c:834 | |
8252 | msgid "" | |
8253 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
8254 | "to delete it, use:" | |
8255 | msgid_plural "" | |
8256 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
8257 | "to delete them, use:" | |
5ae481e0 JX |
8258 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
8259 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 JX |
8260 | |
8261 | #: builtin/remote.c:943 | |
8262 | #, c-format | |
8263 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 8264 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 JX |
8265 | |
8266 | #: builtin/remote.c:946 | |
8ada9598 | 8267 | msgid " tracked" |
81809b99 | 8268 | msgstr " 已跟踪" |
8ada9598 JX |
8269 | |
8270 | #: builtin/remote.c:948 | |
8271 | msgid " stale (use 'git remote prune' to remove)" | |
81809b99 | 8272 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 JX |
8273 | |
8274 | #: builtin/remote.c:950 | |
8275 | msgid " ???" | |
81809b99 | 8276 | msgstr " ???" |
8ada9598 JX |
8277 | |
8278 | #: builtin/remote.c:991 | |
8279 | #, c-format | |
8280 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 8281 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 JX |
8282 | |
8283 | #: builtin/remote.c:998 | |
81809b99 | 8284 | #, c-format |
8ada9598 | 8285 | msgid "rebases onto remote %s" |
81809b99 | 8286 | msgstr "变基到远程 %s" |
8ada9598 JX |
8287 | |
8288 | #: builtin/remote.c:1001 | |
81809b99 | 8289 | #, c-format |
8ada9598 | 8290 | msgid " merges with remote %s" |
81809b99 | 8291 | msgstr " 与远程 %s 合并" |
8ada9598 JX |
8292 | |
8293 | #: builtin/remote.c:1002 | |
8294 | msgid " and with remote" | |
81809b99 | 8295 | msgstr " 且有远程" |
8ada9598 JX |
8296 | |
8297 | #: builtin/remote.c:1004 | |
81809b99 | 8298 | #, c-format |
8ada9598 | 8299 | msgid "merges with remote %s" |
81809b99 | 8300 | msgstr "与远程 %s 合并" |
8ada9598 JX |
8301 | |
8302 | #: builtin/remote.c:1005 | |
8303 | msgid " and with remote" | |
81809b99 | 8304 | msgstr " 且有远程" |
8ada9598 JX |
8305 | |
8306 | #: builtin/remote.c:1051 | |
8307 | msgid "create" | |
81809b99 | 8308 | msgstr "创建" |
8ada9598 JX |
8309 | |
8310 | #: builtin/remote.c:1054 | |
8ada9598 | 8311 | msgid "delete" |
81809b99 | 8312 | msgstr "删除" |
8ada9598 JX |
8313 | |
8314 | #: builtin/remote.c:1058 | |
8ada9598 | 8315 | msgid "up to date" |
81809b99 | 8316 | msgstr "最新" |
8ada9598 JX |
8317 | |
8318 | #: builtin/remote.c:1061 | |
8ada9598 | 8319 | msgid "fast-forwardable" |
81809b99 | 8320 | msgstr "可快进" |
8ada9598 JX |
8321 | |
8322 | #: builtin/remote.c:1064 | |
8323 | msgid "local out of date" | |
81809b99 | 8324 | msgstr "本地已过时" |
8ada9598 JX |
8325 | |
8326 | #: builtin/remote.c:1071 | |
8327 | #, c-format | |
8328 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 8329 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 JX |
8330 | |
8331 | #: builtin/remote.c:1074 | |
8332 | #, c-format | |
8333 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 8334 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 JX |
8335 | |
8336 | #: builtin/remote.c:1078 | |
8337 | #, c-format | |
8338 | msgid " %-*s forces to %s" | |
81809b99 | 8339 | msgstr " %-*s 强制推送至 %s" |
8ada9598 JX |
8340 | |
8341 | #: builtin/remote.c:1081 | |
8342 | #, c-format | |
8343 | msgid " %-*s pushes to %s" | |
81809b99 | 8344 | msgstr " %-*s 推送至 %s" |
8ada9598 | 8345 | |
ef317cd5 | 8346 | #: builtin/remote.c:1091 |
ef317cd5 | 8347 | msgid "do not query remotes" |
07432cef | 8348 | msgstr "不查询远程" |
ef317cd5 | 8349 | |
8ada9598 | 8350 | #: builtin/remote.c:1118 |
81809b99 | 8351 | #, c-format |
8ada9598 | 8352 | msgid "* remote %s" |
81809b99 | 8353 | msgstr "* 远程 %s" |
8ada9598 JX |
8354 | |
8355 | #: builtin/remote.c:1119 | |
8356 | #, c-format | |
8357 | msgid " Fetch URL: %s" | |
81809b99 | 8358 | msgstr " 获取地址:%s" |
8ada9598 JX |
8359 | |
8360 | #: builtin/remote.c:1120 builtin/remote.c:1285 | |
8361 | msgid "(no URL)" | |
81809b99 | 8362 | msgstr "(无 URL)" |
8ada9598 JX |
8363 | |
8364 | #: builtin/remote.c:1129 builtin/remote.c:1131 | |
8365 | #, c-format | |
8366 | msgid " Push URL: %s" | |
81809b99 | 8367 | msgstr " 推送地址:%s" |
8ada9598 JX |
8368 | |
8369 | #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 | |
81809b99 | 8370 | #, c-format |
8ada9598 | 8371 | msgid " HEAD branch: %s" |
81809b99 | 8372 | msgstr " HEAD分支:%s" |
8ada9598 JX |
8373 | |
8374 | #: builtin/remote.c:1139 | |
8375 | #, c-format | |
8376 | msgid "" | |
8377 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 8378 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 JX |
8379 | |
8380 | #: builtin/remote.c:1151 | |
81809b99 | 8381 | #, c-format |
8ada9598 JX |
8382 | msgid " Remote branch:%s" |
8383 | msgid_plural " Remote branches:%s" | |
81809b99 | 8384 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 8385 | msgstr[1] " 远程分支:%s" |
8ada9598 | 8386 | |
81809b99 | 8387 | # 译者:中文字符串拼接,可删除前导空格 |
8ada9598 JX |
8388 | #: builtin/remote.c:1154 builtin/remote.c:1181 |
8389 | msgid " (status not queried)" | |
81809b99 | 8390 | msgstr "(状态未查询)" |
8ada9598 JX |
8391 | |
8392 | #: builtin/remote.c:1163 | |
8393 | msgid " Local branch configured for 'git pull':" | |
8394 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 8395 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 8396 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 JX |
8397 | |
8398 | #: builtin/remote.c:1171 | |
8399 | msgid " Local refs will be mirrored by 'git push'" | |
81809b99 | 8400 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 JX |
8401 | |
8402 | #: builtin/remote.c:1178 | |
81809b99 | 8403 | #, c-format |
8ada9598 JX |
8404 | msgid " Local ref configured for 'git push'%s:" |
8405 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 8406 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 8407 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 8408 | |
ef317cd5 JX |
8409 | #: builtin/remote.c:1199 |
8410 | msgid "set refs/remotes/<name>/HEAD according to remote" | |
07432cef | 8411 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 JX |
8412 | |
8413 | #: builtin/remote.c:1201 | |
8414 | msgid "delete refs/remotes/<name>/HEAD" | |
07432cef | 8415 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 8416 | |
8ada9598 | 8417 | #: builtin/remote.c:1216 |
8ada9598 | 8418 | msgid "Cannot determine remote HEAD" |
81809b99 | 8419 | msgstr "无法确定远程 HEAD" |
8ada9598 JX |
8420 | |
8421 | #: builtin/remote.c:1218 | |
8422 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" | |
81809b99 | 8423 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 JX |
8424 | |
8425 | #: builtin/remote.c:1228 | |
81809b99 | 8426 | #, c-format |
8ada9598 | 8427 | msgid "Could not delete %s" |
81809b99 | 8428 | msgstr "无法删除 %s" |
8ada9598 JX |
8429 | |
8430 | #: builtin/remote.c:1236 | |
81809b99 | 8431 | #, c-format |
8ada9598 | 8432 | msgid "Not a valid ref: %s" |
81809b99 | 8433 | msgstr "不是一个有效引用:%s" |
8ada9598 JX |
8434 | |
8435 | #: builtin/remote.c:1238 | |
81809b99 | 8436 | #, c-format |
8ada9598 | 8437 | msgid "Could not setup %s" |
81809b99 | 8438 | msgstr "不能设置 %s" |
8ada9598 JX |
8439 | |
8440 | # 译者:注意保持前导空格 | |
8441 | #: builtin/remote.c:1274 | |
81809b99 | 8442 | #, c-format |
8ada9598 | 8443 | msgid " %s will become dangling!" |
07432cef | 8444 | msgstr " %s 将成为摇摆状态!" |
8ada9598 JX |
8445 | |
8446 | # 译者:注意保持前导空格 | |
8447 | #: builtin/remote.c:1275 | |
81809b99 | 8448 | #, c-format |
8ada9598 | 8449 | msgid " %s has become dangling!" |
07432cef | 8450 | msgstr " %s 已成为摇摆状态!" |
8ada9598 JX |
8451 | |
8452 | #: builtin/remote.c:1281 | |
81809b99 | 8453 | #, c-format |
8ada9598 | 8454 | msgid "Pruning %s" |
81809b99 | 8455 | msgstr "修剪 %s" |
8ada9598 JX |
8456 | |
8457 | #: builtin/remote.c:1282 | |
8458 | #, c-format | |
8459 | msgid "URL: %s" | |
81809b99 | 8460 | msgstr "URL:%s" |
8ada9598 JX |
8461 | |
8462 | #: builtin/remote.c:1295 | |
8463 | #, c-format | |
8464 | msgid " * [would prune] %s" | |
81809b99 | 8465 | msgstr " * [将删除] %s" |
8ada9598 JX |
8466 | |
8467 | #: builtin/remote.c:1298 | |
8468 | #, c-format | |
8469 | msgid " * [pruned] %s" | |
81809b99 | 8470 | msgstr " * [已删除] %s" |
8ada9598 | 8471 | |
ef317cd5 JX |
8472 | #: builtin/remote.c:1321 |
8473 | msgid "prune remotes after fetching" | |
07432cef | 8474 | msgstr "抓取后清除远程" |
ef317cd5 | 8475 | |
8ada9598 | 8476 | #: builtin/remote.c:1387 builtin/remote.c:1461 |
81809b99 | 8477 | #, c-format |
8ada9598 | 8478 | msgid "No such remote '%s'" |
81809b99 | 8479 | msgstr "没有此远程 '%s'" |
8ada9598 | 8480 | |
ef317cd5 | 8481 | #: builtin/remote.c:1407 |
ef317cd5 | 8482 | msgid "add branch" |
07432cef | 8483 | msgstr "添加分支" |
ef317cd5 | 8484 | |
8ada9598 | 8485 | #: builtin/remote.c:1414 |
8ada9598 | 8486 | msgid "no remote specified" |
81809b99 | 8487 | msgstr "未指定远程" |
8ada9598 | 8488 | |
ef317cd5 JX |
8489 | #: builtin/remote.c:1436 |
8490 | msgid "manipulate push URLs" | |
07432cef | 8491 | msgstr "操作推送 URLS" |
ef317cd5 JX |
8492 | |
8493 | #: builtin/remote.c:1438 | |
8494 | msgid "add URL" | |
07432cef | 8495 | msgstr "添加 URL" |
ef317cd5 JX |
8496 | |
8497 | #: builtin/remote.c:1440 | |
ef317cd5 | 8498 | msgid "delete URLs" |
07432cef | 8499 | msgstr "删除 URLS" |
ef317cd5 | 8500 | |
8ada9598 | 8501 | #: builtin/remote.c:1447 |
8ada9598 | 8502 | msgid "--add --delete doesn't make sense" |
81809b99 | 8503 | msgstr "--add --delete 无意义" |
8ada9598 JX |
8504 | |
8505 | #: builtin/remote.c:1487 | |
81809b99 | 8506 | #, c-format |
8ada9598 | 8507 | msgid "Invalid old URL pattern: %s" |
81809b99 | 8508 | msgstr "无效的旧URL匹配模版:%s" |
8ada9598 JX |
8509 | |
8510 | #: builtin/remote.c:1495 | |
81809b99 | 8511 | #, c-format |
8ada9598 | 8512 | msgid "No such URL found: %s" |
81809b99 | 8513 | msgstr "未找到此URL:%s" |
8ada9598 JX |
8514 | |
8515 | #: builtin/remote.c:1497 | |
8516 | msgid "Will not delete all non-push URLs" | |
81809b99 | 8517 | msgstr "将不会删除所有非推送URL地址" |
8ada9598 | 8518 | |
ef317cd5 JX |
8519 | #: builtin/remote.c:1569 |
8520 | msgid "be verbose; must be placed before a subcommand" | |
07432cef | 8521 | msgstr "冗长输出;必须置于子命令之前" |
ef317cd5 | 8522 | |
90314792 JX |
8523 | #: builtin/repack.c:15 |
8524 | msgid "git repack [options]" | |
8525 | msgstr "git repack [选项]" | |
8526 | ||
8527 | #: builtin/repack.c:143 | |
8528 | msgid "pack everything in a single pack" | |
8529 | msgstr "所有内容打包到一个包文件中" | |
8530 | ||
8531 | #: builtin/repack.c:145 | |
8532 | msgid "same as -a, and turn unreachable objects loose" | |
8533 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
8534 | ||
8535 | #: builtin/repack.c:148 | |
8536 | msgid "remove redundant packs, and run git-prune-packed" | |
8537 | msgstr "删除多余的包,运行 git-prune-packed" | |
8538 | ||
8539 | #: builtin/repack.c:150 | |
8540 | msgid "pass --no-reuse-delta to git-pack-objects" | |
8541 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
8542 | ||
8543 | #: builtin/repack.c:152 | |
8544 | msgid "pass --no-reuse-object to git-pack-objects" | |
8545 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
8546 | ||
8547 | #: builtin/repack.c:154 | |
8548 | msgid "do not run git-update-server-info" | |
8549 | msgstr "不运行 git-update-server-info" | |
8550 | ||
8551 | #: builtin/repack.c:157 | |
8552 | msgid "pass --local to git-pack-objects" | |
8553 | msgstr "向 git-pack-objects 传递参数 --local" | |
8554 | ||
8555 | #: builtin/repack.c:158 | |
8556 | msgid "approxidate" | |
8557 | msgstr "近似日期" | |
8558 | ||
8559 | #: builtin/repack.c:159 | |
8560 | msgid "with -A, do not loosen objects older than this" | |
8561 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
8562 | ||
8563 | #: builtin/repack.c:161 | |
8564 | msgid "size of the window used for delta compression" | |
8565 | msgstr "用于增量压缩的窗口值" | |
8566 | ||
8567 | #: builtin/repack.c:163 | |
8568 | msgid "same as the above, but limit memory size instead of entries count" | |
8569 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
8570 | ||
8571 | #: builtin/repack.c:165 | |
8572 | msgid "limits the maximum delta depth" | |
8573 | msgstr "限制最大增量深度" | |
8574 | ||
8575 | #: builtin/repack.c:167 | |
8576 | msgid "maximum size of each packfile" | |
8577 | msgstr "每个包的最大尺寸" | |
8578 | ||
8579 | #: builtin/repack.c:345 | |
8580 | #, c-format | |
8581 | msgid "removing '%s' failed" | |
8582 | msgstr "删除 '%s' 失败" | |
8583 | ||
ef317cd5 JX |
8584 | #: builtin/replace.c:17 |
8585 | msgid "git replace [-f] <object> <replacement>" | |
07432cef | 8586 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 JX |
8587 | |
8588 | #: builtin/replace.c:18 | |
8589 | msgid "git replace -d <object>..." | |
07432cef | 8590 | msgstr "git replace -d <对象>..." |
ef317cd5 JX |
8591 | |
8592 | #: builtin/replace.c:19 | |
8593 | msgid "git replace -l [<pattern>]" | |
07432cef | 8594 | msgstr "git replace -l [<模式>]" |
ef317cd5 | 8595 | |
90314792 | 8596 | #: builtin/replace.c:131 |
ef317cd5 | 8597 | msgid "list replace refs" |
07432cef | 8598 | msgstr "列出替换的引用" |
ef317cd5 | 8599 | |
90314792 | 8600 | #: builtin/replace.c:132 |
ef317cd5 | 8601 | msgid "delete replace refs" |
07432cef | 8602 | msgstr "删除替换的引用" |
ef317cd5 | 8603 | |
90314792 | 8604 | #: builtin/replace.c:133 |
ef317cd5 | 8605 | msgid "replace the ref if it exists" |
07432cef | 8606 | msgstr "如果存在则替换引用" |
ef317cd5 | 8607 | |
90314792 | 8608 | #: builtin/rerere.c:12 |
ef317cd5 | 8609 | msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" |
07432cef | 8610 | msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" |
ef317cd5 | 8611 | |
90314792 | 8612 | #: builtin/rerere.c:57 |
ef317cd5 | 8613 | msgid "register clean resolutions in index" |
07432cef | 8614 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 JX |
8615 | |
8616 | #: builtin/reset.c:25 | |
8617 | msgid "" | |
8618 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 8619 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 JX |
8620 | |
8621 | #: builtin/reset.c:26 | |
07432cef WS |
8622 | msgid "git reset [-q] <tree-ish> [--] <paths>..." |
8623 | msgstr "git reset [-q] <树或提交> [--] <路径>..." | |
ef317cd5 JX |
8624 | |
8625 | #: builtin/reset.c:27 | |
07432cef WS |
8626 | msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" |
8627 | msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" | |
ef317cd5 | 8628 | |
c04f5ac3 JX |
8629 | #: builtin/reset.c:33 |
8630 | msgid "mixed" | |
8631 | msgstr "混杂" | |
8632 | ||
8633 | #: builtin/reset.c:33 | |
8634 | msgid "soft" | |
8635 | msgstr "软性" | |
8636 | ||
8637 | #: builtin/reset.c:33 | |
8638 | msgid "hard" | |
8639 | msgstr "硬性" | |
8640 | ||
8ada9598 JX |
8641 | #: builtin/reset.c:33 |
8642 | msgid "merge" | |
8643 | msgstr "合并" | |
8644 | ||
c04f5ac3 JX |
8645 | #: builtin/reset.c:33 |
8646 | msgid "keep" | |
8647 | msgstr "保持" | |
8648 | ||
07432cef | 8649 | #: builtin/reset.c:73 |
c04f5ac3 JX |
8650 | msgid "You do not have a valid HEAD." |
8651 | msgstr "您没有一个有效的 HEAD。" | |
8652 | ||
07432cef | 8653 | #: builtin/reset.c:75 |
c04f5ac3 JX |
8654 | msgid "Failed to find tree of HEAD." |
8655 | msgstr "无法找到 HEAD 指向的树。" | |
8656 | ||
07432cef | 8657 | #: builtin/reset.c:81 |
c04f5ac3 JX |
8658 | #, c-format |
8659 | msgid "Failed to find tree of %s." | |
8660 | msgstr "无法找到 %s 指向的树。" | |
8661 | ||
2e8451e8 | 8662 | #: builtin/reset.c:99 |
c04f5ac3 JX |
8663 | #, c-format |
8664 | msgid "HEAD is now at %s" | |
8665 | msgstr "HEAD 现在位于 %s" | |
8666 | ||
90e6ef53 | 8667 | # 译者:汉字之间无空格,故删除%s前后空格 |
2e8451e8 | 8668 | #: builtin/reset.c:172 |
c04f5ac3 JX |
8669 | #, c-format |
8670 | msgid "Cannot do a %s reset in the middle of a merge." | |
8671 | msgstr "在合并过程中不能做%s重置操作。" | |
8672 | ||
90314792 | 8673 | #: builtin/reset.c:262 |
ef317cd5 | 8674 | msgid "be quiet, only report errors" |
07432cef | 8675 | msgstr "安静模式,只报告错误" |
ef317cd5 | 8676 | |
90314792 | 8677 | #: builtin/reset.c:264 |
ef317cd5 | 8678 | msgid "reset HEAD and index" |
07432cef | 8679 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 8680 | |
90314792 | 8681 | #: builtin/reset.c:265 |
ef317cd5 | 8682 | msgid "reset only HEAD" |
07432cef | 8683 | msgstr "只重置 HEAD" |
ef317cd5 | 8684 | |
90314792 | 8685 | #: builtin/reset.c:267 builtin/reset.c:269 |
ef317cd5 | 8686 | msgid "reset HEAD, index and working tree" |
07432cef | 8687 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 8688 | |
90314792 | 8689 | #: builtin/reset.c:271 |
ef317cd5 | 8690 | msgid "reset HEAD but keep local changes" |
07432cef | 8691 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 8692 | |
90314792 | 8693 | #: builtin/reset.c:289 |
07432cef WS |
8694 | #, c-format |
8695 | msgid "Failed to resolve '%s' as a valid revision." | |
8696 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
8697 | ||
90314792 | 8698 | #: builtin/reset.c:292 builtin/reset.c:300 |
c04f5ac3 JX |
8699 | #, c-format |
8700 | msgid "Could not parse object '%s'." | |
8701 | msgstr "不能解析对象 '%s'。" | |
8702 | ||
90314792 | 8703 | #: builtin/reset.c:297 |
07432cef WS |
8704 | #, c-format |
8705 | msgid "Failed to resolve '%s' as a valid tree." | |
8706 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
8707 | ||
90314792 | 8708 | #: builtin/reset.c:306 |
c04f5ac3 | 8709 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 8710 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 8711 | |
90314792 | 8712 | #: builtin/reset.c:315 |
c04f5ac3 | 8713 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
23ff3338 | 8714 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。" |
c04f5ac3 | 8715 | |
90e6ef53 | 8716 | # 译者:汉字之间无空格,故删除%s前后空格 |
90314792 | 8717 | #: builtin/reset.c:317 |
c04f5ac3 JX |
8718 | #, c-format |
8719 | msgid "Cannot do %s reset with paths." | |
8720 | msgstr "不能带路径进行%s重置。" | |
8721 | ||
90e6ef53 | 8722 | # 译者:汉字之间无空格,故删除%s前后空格 |
90314792 | 8723 | #: builtin/reset.c:327 |
c04f5ac3 JX |
8724 | #, c-format |
8725 | msgid "%s reset is not allowed in a bare repository" | |
8726 | msgstr "不能对裸版本库进行%s重置" | |
8727 | ||
90314792 JX |
8728 | #: builtin/reset.c:344 |
8729 | msgid "Unstaged changes after reset:" | |
8730 | msgstr "重置后撤出暂存区的变更:" | |
8731 | ||
8732 | #: builtin/reset.c:350 | |
ef317cd5 JX |
8733 | #, c-format |
8734 | msgid "Could not reset index file to revision '%s'." | |
8735 | msgstr "不能重置索引文件至版本 '%s'。" | |
8736 | ||
90314792 | 8737 | #: builtin/reset.c:355 |
07432cef WS |
8738 | msgid "Could not write new index file." |
8739 | msgstr "不能写入新的索引文件。" | |
8740 | ||
2e8451e8 | 8741 | #: builtin/rev-parse.c:345 |
ef317cd5 | 8742 | msgid "git rev-parse --parseopt [options] -- [<args>...]" |
07432cef | 8743 | msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" |
ef317cd5 | 8744 | |
2e8451e8 | 8745 | #: builtin/rev-parse.c:350 |
ef317cd5 | 8746 | msgid "keep the `--` passed as an arg" |
07432cef | 8747 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 8748 | |
2e8451e8 | 8749 | #: builtin/rev-parse.c:352 |
ef317cd5 | 8750 | msgid "stop parsing after the first non-option argument" |
07432cef | 8751 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 8752 | |
2e8451e8 | 8753 | #: builtin/rev-parse.c:470 |
ef317cd5 JX |
8754 | msgid "" |
8755 | "git rev-parse --parseopt [options] -- [<args>...]\n" | |
8756 | " or: git rev-parse --sq-quote [<arg>...]\n" | |
8757 | " or: git rev-parse [options] [<arg>...]\n" | |
8758 | "\n" | |
8759 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
8760 | msgstr "" | |
07432cef | 8761 | "git rev-parse --parseopt [选项] -- [<参数>...]\n" |
90314792 JX |
8762 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
8763 | " 或者:git rev-parse [选项] [<参数>...]\n" | |
07432cef WS |
8764 | "\n" |
8765 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 JX |
8766 | |
8767 | #: builtin/revert.c:22 | |
4dcdc3d8 JX |
8768 | msgid "git revert [options] <commit-ish>..." |
8769 | msgstr "git revert [选项] <提交号>..." | |
ef317cd5 JX |
8770 | |
8771 | #: builtin/revert.c:23 | |
8772 | msgid "git revert <subcommand>" | |
07432cef | 8773 | msgstr "git revert <子命令>" |
ef317cd5 JX |
8774 | |
8775 | #: builtin/revert.c:28 | |
4dcdc3d8 JX |
8776 | msgid "git cherry-pick [options] <commit-ish>..." |
8777 | msgstr "git cherry-pick [选项] <提交号>..." | |
ef317cd5 JX |
8778 | |
8779 | #: builtin/revert.c:29 | |
ef317cd5 | 8780 | msgid "git cherry-pick <subcommand>" |
07432cef | 8781 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 8782 | |
90314792 | 8783 | #: builtin/revert.c:71 |
ef317cd5 JX |
8784 | #, c-format |
8785 | msgid "%s: %s cannot be used with %s" | |
8786 | msgstr "%s:%s 不能和 %s 同时使用" | |
8787 | ||
90314792 | 8788 | #: builtin/revert.c:80 |
ef317cd5 | 8789 | msgid "end revert or cherry-pick sequence" |
07432cef | 8790 | msgstr "终止反转或拣选操作" |
ef317cd5 | 8791 | |
90314792 | 8792 | #: builtin/revert.c:81 |
ef317cd5 | 8793 | msgid "resume revert or cherry-pick sequence" |
07432cef | 8794 | msgstr "继续反转或拣选操作" |
ef317cd5 | 8795 | |
90314792 | 8796 | #: builtin/revert.c:82 |
ef317cd5 | 8797 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 8798 | msgstr "取消反转或拣选操作" |
ef317cd5 | 8799 | |
90314792 | 8800 | #: builtin/revert.c:83 |
ef317cd5 | 8801 | msgid "don't automatically commit" |
07432cef | 8802 | msgstr "不要自动提交" |
ef317cd5 | 8803 | |
90314792 | 8804 | #: builtin/revert.c:84 |
ef317cd5 | 8805 | msgid "edit the commit message" |
07432cef | 8806 | msgstr "编辑提交说明" |
ef317cd5 | 8807 | |
90314792 | 8808 | #: builtin/revert.c:87 |
ef317cd5 | 8809 | msgid "parent number" |
07432cef | 8810 | msgstr "父编号" |
ef317cd5 | 8811 | |
90314792 | 8812 | #: builtin/revert.c:89 |
ef317cd5 | 8813 | msgid "merge strategy" |
07432cef | 8814 | msgstr "合并策略" |
ef317cd5 | 8815 | |
90314792 | 8816 | #: builtin/revert.c:90 |
ef317cd5 | 8817 | msgid "option" |
07432cef | 8818 | msgstr "选项" |
ef317cd5 | 8819 | |
90314792 | 8820 | #: builtin/revert.c:91 |
ef317cd5 | 8821 | msgid "option for merge strategy" |
07432cef | 8822 | msgstr "合并策略的选项" |
ef317cd5 | 8823 | |
90314792 | 8824 | #: builtin/revert.c:102 |
ef317cd5 | 8825 | msgid "append commit name" |
07432cef | 8826 | msgstr "追加提交名称" |
ef317cd5 | 8827 | |
90314792 | 8828 | #: builtin/revert.c:103 |
ef317cd5 | 8829 | msgid "allow fast-forward" |
07432cef | 8830 | msgstr "允许快进式" |
c04f5ac3 | 8831 | |
90314792 | 8832 | #: builtin/revert.c:104 |
ef317cd5 | 8833 | msgid "preserve initially empty commits" |
07432cef | 8834 | msgstr "保留初始化的空提交" |
ef317cd5 | 8835 | |
90314792 | 8836 | #: builtin/revert.c:105 |
ef317cd5 | 8837 | msgid "allow commits with empty messages" |
07432cef | 8838 | msgstr "允许提交说明为空" |
c04f5ac3 | 8839 | |
90314792 | 8840 | #: builtin/revert.c:106 |
ef317cd5 | 8841 | msgid "keep redundant, empty commits" |
07432cef | 8842 | msgstr "保持多余的、空的提交" |
ef317cd5 | 8843 | |
90314792 | 8844 | #: builtin/revert.c:110 |
c04f5ac3 JX |
8845 | msgid "program error" |
8846 | msgstr "程序错误" | |
8847 | ||
90314792 | 8848 | #: builtin/revert.c:195 |
c04f5ac3 JX |
8849 | msgid "revert failed" |
8850 | msgstr "还原失败" | |
8851 | ||
90314792 | 8852 | #: builtin/revert.c:210 |
c04f5ac3 JX |
8853 | msgid "cherry-pick failed" |
8854 | msgstr "拣选失败" | |
8855 | ||
90314792 | 8856 | #: builtin/rm.c:17 |
ef317cd5 | 8857 | msgid "git rm [options] [--] <file>..." |
07432cef WS |
8858 | msgstr "git rm [选项] [--] <文件>..." |
8859 | ||
90314792 | 8860 | #: builtin/rm.c:65 |
2e8451e8 JX |
8861 | msgid "" |
8862 | "the following submodule (or one of its nested submodules)\n" | |
8863 | "uses a .git directory:" | |
8864 | msgid_plural "" | |
8865 | "the following submodules (or one of its nested submodules)\n" | |
8866 | "use a .git directory:" | |
8867 | msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
8868 | msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:" | |
8869 | ||
90314792 | 8870 | #: builtin/rm.c:71 |
07432cef | 8871 | msgid "" |
2e8451e8 | 8872 | "\n" |
07432cef WS |
8873 | "(use 'rm -rf' if you really want to remove it including all of its history)" |
8874 | msgstr "" | |
2e8451e8 | 8875 | "\n" |
07432cef | 8876 | "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" |
ef317cd5 | 8877 | |
90314792 | 8878 | #: builtin/rm.c:231 |
c04f5ac3 | 8879 | msgid "" |
2e8451e8 JX |
8880 | "the following file has staged content different from both the\n" |
8881 | "file and the HEAD:" | |
8882 | msgid_plural "" | |
8883 | "the following files have staged content different from both the\n" | |
8884 | "file and the HEAD:" | |
8885 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
8886 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
8887 | ||
90314792 | 8888 | #: builtin/rm.c:236 |
2e8451e8 JX |
8889 | msgid "" |
8890 | "\n" | |
c04f5ac3 JX |
8891 | "(use -f to force removal)" |
8892 | msgstr "" | |
2e8451e8 | 8893 | "\n" |
c04f5ac3 JX |
8894 | "(使用 -f 强制删除)" |
8895 | ||
90314792 | 8896 | #: builtin/rm.c:240 |
2e8451e8 JX |
8897 | msgid "the following file has changes staged in the index:" |
8898 | msgid_plural "the following files have changes staged in the index:" | |
8899 | msgstr[0] "如下文件相对索引区的内容有修改" | |
8900 | msgstr[1] "如下文件相对索引区的内容有修改" | |
c04f5ac3 | 8901 | |
90314792 | 8902 | #: builtin/rm.c:244 builtin/rm.c:255 |
c04f5ac3 | 8903 | msgid "" |
2e8451e8 | 8904 | "\n" |
c04f5ac3 JX |
8905 | "(use --cached to keep the file, or -f to force removal)" |
8906 | msgstr "" | |
2e8451e8 JX |
8907 | "\n" |
8908 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
8909 | ||
90314792 | 8910 | #: builtin/rm.c:252 |
2e8451e8 JX |
8911 | msgid "the following file has local modifications:" |
8912 | msgid_plural "the following files have local modifications:" | |
8913 | msgstr[0] "如下文件有本地修改:" | |
8914 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 8915 | |
90314792 | 8916 | #: builtin/rm.c:270 |
ef317cd5 | 8917 | msgid "do not list removed files" |
07432cef | 8918 | msgstr "不列出删除的文件" |
ef317cd5 | 8919 | |
90314792 | 8920 | #: builtin/rm.c:271 |
ef317cd5 | 8921 | msgid "only remove from the index" |
07432cef | 8922 | msgstr "只从索引区删除" |
ef317cd5 | 8923 | |
90314792 | 8924 | #: builtin/rm.c:272 |
ef317cd5 | 8925 | msgid "override the up-to-date check" |
07432cef | 8926 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 8927 | |
90314792 | 8928 | #: builtin/rm.c:273 |
ef317cd5 | 8929 | msgid "allow recursive removal" |
07432cef | 8930 | msgstr "允许递归删除" |
ef317cd5 | 8931 | |
90314792 | 8932 | #: builtin/rm.c:275 |
ef317cd5 | 8933 | msgid "exit with a zero status even if nothing matched" |
07432cef | 8934 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 8935 | |
90314792 | 8936 | #: builtin/rm.c:336 |
c04f5ac3 JX |
8937 | #, c-format |
8938 | msgid "not removing '%s' recursively without -r" | |
8939 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
8940 | ||
90314792 | 8941 | #: builtin/rm.c:375 |
c04f5ac3 JX |
8942 | #, c-format |
8943 | msgid "git rm: unable to remove %s" | |
8944 | msgstr "git rm:不能删除 %s" | |
8945 | ||
ef317cd5 | 8946 | #: builtin/shortlog.c:13 |
4dcdc3d8 JX |
8947 | msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" |
8948 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" | |
ef317cd5 | 8949 | |
4dcdc3d8 | 8950 | #: builtin/shortlog.c:131 |
c04f5ac3 JX |
8951 | #, c-format |
8952 | msgid "Missing author: %s" | |
8953 | msgstr "缺少作者:%s" | |
8954 | ||
90314792 | 8955 | #: builtin/shortlog.c:230 |
ef317cd5 | 8956 | msgid "sort output according to the number of commits per author" |
07432cef | 8957 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 8958 | |
90314792 | 8959 | #: builtin/shortlog.c:232 |
ef317cd5 | 8960 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 8961 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 8962 | |
90314792 | 8963 | #: builtin/shortlog.c:234 |
ef317cd5 | 8964 | msgid "Show the email address of each author" |
07432cef | 8965 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 8966 | |
90314792 | 8967 | #: builtin/shortlog.c:235 |
ef317cd5 | 8968 | msgid "w[,i1[,i2]]" |
07432cef | 8969 | msgstr "w[,i1[,i2]]" |
ef317cd5 | 8970 | |
90314792 | 8971 | #: builtin/shortlog.c:236 |
ef317cd5 | 8972 | msgid "Linewrap output" |
07432cef | 8973 | msgstr "折行输出" |
ef317cd5 JX |
8974 | |
8975 | #: builtin/show-branch.c:9 | |
8976 | msgid "" | |
8977 | "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" | |
8978 | "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" | |
8979 | "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " | |
8980 | "<glob>)...]" | |
8981 | msgstr "" | |
07432cef WS |
8982 | "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" |
8983 | "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" | |
8984 | "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " | |
8985 | "<glob>)...]" | |
ef317cd5 JX |
8986 | |
8987 | #: builtin/show-branch.c:10 | |
8988 | msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" | |
07432cef | 8989 | msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" |
ef317cd5 | 8990 | |
4dcdc3d8 | 8991 | #: builtin/show-branch.c:650 |
ef317cd5 | 8992 | msgid "show remote-tracking and local branches" |
07432cef | 8993 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 8994 | |
4dcdc3d8 | 8995 | #: builtin/show-branch.c:652 |
ef317cd5 | 8996 | msgid "show remote-tracking branches" |
07432cef | 8997 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 8998 | |
4dcdc3d8 | 8999 | #: builtin/show-branch.c:654 |
ef317cd5 | 9000 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 9001 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 9002 | |
4dcdc3d8 | 9003 | #: builtin/show-branch.c:656 |
ef317cd5 | 9004 | msgid "show <n> more commits after the common ancestor" |
07432cef | 9005 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 9006 | |
4dcdc3d8 | 9007 | #: builtin/show-branch.c:658 |
ef317cd5 | 9008 | msgid "synonym to more=-1" |
07432cef | 9009 | msgstr "和 more=-1 同义" |
ef317cd5 | 9010 | |
4dcdc3d8 | 9011 | #: builtin/show-branch.c:659 |
ef317cd5 | 9012 | msgid "suppress naming strings" |
07432cef | 9013 | msgstr "不显示字符串命名" |
ef317cd5 | 9014 | |
4dcdc3d8 | 9015 | #: builtin/show-branch.c:661 |
ef317cd5 | 9016 | msgid "include the current branch" |
07432cef | 9017 | msgstr "包括当前分支" |
ef317cd5 | 9018 | |
4dcdc3d8 | 9019 | #: builtin/show-branch.c:663 |
ef317cd5 | 9020 | msgid "name commits with their object names" |
07432cef | 9021 | msgstr "以对象名字命名提交" |
ef317cd5 | 9022 | |
4dcdc3d8 | 9023 | #: builtin/show-branch.c:665 |
ef317cd5 | 9024 | msgid "show possible merge bases" |
07432cef | 9025 | msgstr "显示可能合并的基线" |
ef317cd5 | 9026 | |
4dcdc3d8 | 9027 | #: builtin/show-branch.c:667 |
ef317cd5 | 9028 | msgid "show refs unreachable from any other ref" |
07432cef | 9029 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 9030 | |
4dcdc3d8 | 9031 | #: builtin/show-branch.c:669 |
ef317cd5 | 9032 | msgid "show commits in topological order" |
07432cef | 9033 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 9034 | |
2e8451e8 | 9035 | #: builtin/show-branch.c:672 |
ef317cd5 | 9036 | msgid "show only commits not on the first branch" |
07432cef | 9037 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 9038 | |
2e8451e8 | 9039 | #: builtin/show-branch.c:674 |
ef317cd5 | 9040 | msgid "show merges reachable from only one tip" |
07432cef | 9041 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 9042 | |
2e8451e8 JX |
9043 | #: builtin/show-branch.c:676 |
9044 | msgid "topologically sort, maintaining date order where possible" | |
9045 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 9046 | |
2e8451e8 | 9047 | #: builtin/show-branch.c:679 |
ef317cd5 | 9048 | msgid "<n>[,<base>]" |
07432cef | 9049 | msgstr "<n>[,<base>]" |
ef317cd5 | 9050 | |
2e8451e8 | 9051 | #: builtin/show-branch.c:680 |
ef317cd5 | 9052 | msgid "show <n> most recent ref-log entries starting at base" |
07432cef | 9053 | msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" |
ef317cd5 JX |
9054 | |
9055 | #: builtin/show-ref.c:10 | |
9056 | msgid "" | |
a77c07d9 JX |
9057 | "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" |
9058 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " | |
ef317cd5 | 9059 | msgstr "" |
a77c07d9 JX |
9060 | "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" |
9061 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " | |
ef317cd5 JX |
9062 | |
9063 | #: builtin/show-ref.c:11 | |
9064 | msgid "git show-ref --exclude-existing[=pattern] < ref-list" | |
07432cef | 9065 | msgstr "git show-ref --exclude-existing[=模式] < 引用列表" |
ef317cd5 | 9066 | |
2e8451e8 | 9067 | #: builtin/show-ref.c:168 |
ef317cd5 | 9068 | msgid "only show tags (can be combined with heads)" |
07432cef | 9069 | msgstr "只显示 tags(可以和头共用)" |
ef317cd5 | 9070 | |
2e8451e8 | 9071 | #: builtin/show-ref.c:169 |
ef317cd5 | 9072 | msgid "only show heads (can be combined with tags)" |
07432cef | 9073 | msgstr "只显示头(可以和 tags 共用)" |
ef317cd5 | 9074 | |
2e8451e8 | 9075 | #: builtin/show-ref.c:170 |
ef317cd5 | 9076 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 9077 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 9078 | |
90314792 | 9079 | #: builtin/show-ref.c:173 builtin/show-ref.c:175 |
2e8451e8 JX |
9080 | msgid "show the HEAD reference, even if it would be filtered out" |
9081 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 9082 | |
90314792 | 9083 | #: builtin/show-ref.c:177 |
ef317cd5 | 9084 | msgid "dereference tags into object IDs" |
07432cef | 9085 | msgstr "转换 tags 到对象ID" |
ef317cd5 | 9086 | |
90314792 | 9087 | #: builtin/show-ref.c:179 |
ef317cd5 | 9088 | msgid "only show SHA1 hash using <n> digits" |
07432cef | 9089 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" |
ef317cd5 | 9090 | |
90314792 | 9091 | #: builtin/show-ref.c:183 |
ef317cd5 | 9092 | msgid "do not print results to stdout (useful with --verify)" |
07432cef | 9093 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" |
ef317cd5 | 9094 | |
90314792 | 9095 | #: builtin/show-ref.c:185 |
ef317cd5 | 9096 | msgid "show refs from stdin that aren't in local repository" |
07432cef | 9097 | msgstr "显示从标准输入中读入的不在本地版本库中的引用" |
ef317cd5 JX |
9098 | |
9099 | #: builtin/symbolic-ref.c:7 | |
9100 | msgid "git symbolic-ref [options] name [ref]" | |
07432cef WS |
9101 | msgstr "git symbolic-ref [选项] 名称 [引用]" |
9102 | ||
9103 | #: builtin/symbolic-ref.c:8 | |
9104 | msgid "git symbolic-ref -d [-q] name" | |
9105 | msgstr "git symbolic-ref -d [-q] 名称" | |
ef317cd5 | 9106 | |
07432cef | 9107 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 9108 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
9109 | msgstr "不显示非符号(分离的)引用的错误信息" |
9110 | ||
9111 | #: builtin/symbolic-ref.c:41 | |
9112 | msgid "delete symbolic ref" | |
9113 | msgstr "删除符号引用" | |
ef317cd5 | 9114 | |
07432cef | 9115 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 9116 | msgid "shorten ref output" |
07432cef | 9117 | msgstr "简短的引用输出" |
ef317cd5 | 9118 | |
90314792 | 9119 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 |
ef317cd5 | 9120 | msgid "reason" |
07432cef | 9121 | msgstr "原因" |
ef317cd5 | 9122 | |
90314792 | 9123 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:254 |
ef317cd5 | 9124 | msgid "reason of the update" |
07432cef | 9125 | msgstr "更新的原因" |
ef317cd5 JX |
9126 | |
9127 | #: builtin/tag.c:22 | |
9128 | msgid "" | |
9129 | "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" | |
a77c07d9 | 9130 | msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]" |
ef317cd5 JX |
9131 | |
9132 | #: builtin/tag.c:23 | |
9133 | msgid "git tag -d <tagname>..." | |
07432cef | 9134 | msgstr "git tag -d <标签名>..." |
ef317cd5 JX |
9135 | |
9136 | #: builtin/tag.c:24 | |
9137 | msgid "" | |
9138 | "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" | |
9139 | "\t\t[<pattern>...]" | |
9140 | msgstr "" | |
07432cef WS |
9141 | "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n" |
9142 | "\t\t[<模式>...]" | |
ef317cd5 JX |
9143 | |
9144 | #: builtin/tag.c:26 | |
9145 | msgid "git tag -v <tagname>..." | |
07432cef | 9146 | msgstr "git tag -v <标签名>..." |
ef317cd5 | 9147 | |
8ada9598 | 9148 | #: builtin/tag.c:60 |
7ac1c0ad JX |
9149 | #, c-format |
9150 | msgid "malformed object at '%s'" | |
9151 | msgstr "非法的对象于 '%s'" | |
9152 | ||
8ada9598 | 9153 | #: builtin/tag.c:207 |
c04f5ac3 JX |
9154 | #, c-format |
9155 | msgid "tag name too long: %.*s..." | |
9156 | msgstr "tag 名字太长:%.*s..." | |
9157 | ||
8ada9598 | 9158 | #: builtin/tag.c:212 |
c04f5ac3 JX |
9159 | #, c-format |
9160 | msgid "tag '%s' not found." | |
9161 | msgstr "tag '%s' 未发现。" | |
9162 | ||
8ada9598 | 9163 | #: builtin/tag.c:227 |
c04f5ac3 JX |
9164 | #, c-format |
9165 | msgid "Deleted tag '%s' (was %s)\n" | |
9166 | msgstr "已删除 tag '%s'(曾为 %s)\n" | |
9167 | ||
8ada9598 | 9168 | #: builtin/tag.c:239 |
c04f5ac3 JX |
9169 | #, c-format |
9170 | msgid "could not verify the tag '%s'" | |
9171 | msgstr "不能校验 tag '%s'" | |
9172 | ||
8ada9598 | 9173 | #: builtin/tag.c:249 |
a77c07d9 | 9174 | #, c-format |
c04f5ac3 JX |
9175 | msgid "" |
9176 | "\n" | |
a77c07d9 JX |
9177 | "Write a tag message\n" |
9178 | "Lines starting with '%c' will be ignored.\n" | |
c04f5ac3 JX |
9179 | msgstr "" |
9180 | "\n" | |
a77c07d9 JX |
9181 | "输入一个 tag 说明\n" |
9182 | "以 '%c' 开头的行将被忽略。\n" | |
c04f5ac3 | 9183 | |
a77c07d9 JX |
9184 | #: builtin/tag.c:253 |
9185 | #, c-format | |
c04f5ac3 JX |
9186 | msgid "" |
9187 | "\n" | |
a77c07d9 JX |
9188 | "Write a tag message\n" |
9189 | "Lines starting with '%c' will be kept; you may remove them yourself if you " | |
c04f5ac3 | 9190 | "want to.\n" |
c04f5ac3 JX |
9191 | msgstr "" |
9192 | "\n" | |
a77c07d9 JX |
9193 | "输入一个 tag 说明\n" |
9194 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" | |
c04f5ac3 | 9195 | |
a77c07d9 | 9196 | #: builtin/tag.c:292 |
c04f5ac3 JX |
9197 | msgid "unable to sign the tag" |
9198 | msgstr "无法签署 tag" | |
9199 | ||
a77c07d9 | 9200 | #: builtin/tag.c:294 |
c04f5ac3 JX |
9201 | msgid "unable to write tag file" |
9202 | msgstr "无法写 tag 文件" | |
9203 | ||
a77c07d9 | 9204 | #: builtin/tag.c:319 |
c04f5ac3 | 9205 | msgid "bad object type." |
90e6ef53 | 9206 | msgstr "坏的对象类型。" |
c04f5ac3 | 9207 | |
a77c07d9 | 9208 | #: builtin/tag.c:332 |
c04f5ac3 | 9209 | msgid "tag header too big." |
90e6ef53 | 9210 | msgstr "tag 头信息太大。" |
c04f5ac3 | 9211 | |
a77c07d9 | 9212 | #: builtin/tag.c:368 |
c04f5ac3 JX |
9213 | msgid "no tag message?" |
9214 | msgstr "无 tag 说明?" | |
9215 | ||
a77c07d9 | 9216 | #: builtin/tag.c:374 |
c04f5ac3 JX |
9217 | #, c-format |
9218 | msgid "The tag message has been left in %s\n" | |
9219 | msgstr "tag 说明被保留在 %s\n" | |
9220 | ||
a77c07d9 | 9221 | #: builtin/tag.c:423 |
7ac1c0ad JX |
9222 | msgid "switch 'points-at' requires an object" |
9223 | msgstr "开关 'points-at' 需要一个对象" | |
9224 | ||
a77c07d9 | 9225 | #: builtin/tag.c:425 |
7ac1c0ad JX |
9226 | #, c-format |
9227 | msgid "malformed object name '%s'" | |
9228 | msgstr "非法的对象名 '%s'" | |
9229 | ||
a77c07d9 | 9230 | #: builtin/tag.c:445 |
ef317cd5 | 9231 | msgid "list tag names" |
07432cef | 9232 | msgstr "列出tag名称" |
ef317cd5 | 9233 | |
a77c07d9 | 9234 | #: builtin/tag.c:447 |
ef317cd5 | 9235 | msgid "print <n> lines of each tag message" |
07432cef | 9236 | msgstr "每个 tag 信息打印 <n> 行" |
ef317cd5 | 9237 | |
a77c07d9 | 9238 | #: builtin/tag.c:449 |
ef317cd5 | 9239 | msgid "delete tags" |
07432cef | 9240 | msgstr "删除 tags" |
ef317cd5 | 9241 | |
a77c07d9 | 9242 | #: builtin/tag.c:450 |
ef317cd5 | 9243 | msgid "verify tags" |
07432cef | 9244 | msgstr "验证 tags" |
ef317cd5 | 9245 | |
a77c07d9 | 9246 | #: builtin/tag.c:452 |
ef317cd5 | 9247 | msgid "Tag creation options" |
07432cef | 9248 | msgstr "Tag 创建选项" |
ef317cd5 | 9249 | |
a77c07d9 | 9250 | #: builtin/tag.c:454 |
ef317cd5 | 9251 | msgid "annotated tag, needs a message" |
07432cef | 9252 | msgstr "注解 tag,需要一个说明" |
ef317cd5 | 9253 | |
a77c07d9 | 9254 | #: builtin/tag.c:456 |
ef317cd5 | 9255 | msgid "tag message" |
07432cef | 9256 | msgstr "tag 说明" |
ef317cd5 | 9257 | |
a77c07d9 | 9258 | #: builtin/tag.c:458 |
ef317cd5 | 9259 | msgid "annotated and GPG-signed tag" |
07432cef | 9260 | msgstr "注解并 GPG 签名的 tag" |
ef317cd5 | 9261 | |
a77c07d9 | 9262 | #: builtin/tag.c:462 |
ef317cd5 | 9263 | msgid "use another key to sign the tag" |
07432cef | 9264 | msgstr "使用另外的私钥签名 tag" |
ef317cd5 | 9265 | |
a77c07d9 | 9266 | #: builtin/tag.c:463 |
ef317cd5 | 9267 | msgid "replace the tag if exists" |
07432cef | 9268 | msgstr "如果存在,替换现有的 tag" |
ef317cd5 | 9269 | |
a77c07d9 | 9270 | #: builtin/tag.c:464 |
ef317cd5 | 9271 | msgid "show tag list in columns" |
07432cef | 9272 | msgstr "以列的方式显示 tag" |
ef317cd5 | 9273 | |
a77c07d9 | 9274 | #: builtin/tag.c:466 |
ef317cd5 | 9275 | msgid "Tag listing options" |
07432cef | 9276 | msgstr "Tag 列表选项" |
ef317cd5 | 9277 | |
a77c07d9 | 9278 | #: builtin/tag.c:469 |
ef317cd5 | 9279 | msgid "print only tags that contain the commit" |
07432cef | 9280 | msgstr "只打印包含提交的tags" |
ef317cd5 | 9281 | |
a77c07d9 | 9282 | #: builtin/tag.c:475 |
ef317cd5 | 9283 | msgid "print only tags of the object" |
07432cef | 9284 | msgstr "只打印tags对象" |
ef317cd5 | 9285 | |
90314792 | 9286 | #: builtin/tag.c:501 |
8ada9598 | 9287 | msgid "--column and -n are incompatible" |
81809b99 | 9288 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 9289 | |
90314792 | 9290 | #: builtin/tag.c:518 |
c04f5ac3 | 9291 | msgid "-n option is only allowed with -l." |
649900bc | 9292 | msgstr "-n 选项只允许和 -l 同时使用。" |
c04f5ac3 | 9293 | |
90314792 | 9294 | #: builtin/tag.c:520 |
c04f5ac3 | 9295 | msgid "--contains option is only allowed with -l." |
649900bc | 9296 | msgstr "--contains 选项只允许和 -l 同时使用。" |
c04f5ac3 | 9297 | |
90314792 | 9298 | #: builtin/tag.c:522 |
7ac1c0ad | 9299 | msgid "--points-at option is only allowed with -l." |
649900bc | 9300 | msgstr "--points-at 选项只允许和 -l 同时使用。" |
7ac1c0ad | 9301 | |
90314792 | 9302 | #: builtin/tag.c:530 |
c04f5ac3 JX |
9303 | msgid "only one -F or -m option is allowed." |
9304 | msgstr "只允许一个 -F 或 -m 选项。" | |
9305 | ||
90314792 | 9306 | #: builtin/tag.c:550 |
c04f5ac3 JX |
9307 | msgid "too many params" |
9308 | msgstr "太多参数" | |
9309 | ||
90314792 | 9310 | #: builtin/tag.c:556 |
c04f5ac3 JX |
9311 | #, c-format |
9312 | msgid "'%s' is not a valid tag name." | |
90e6ef53 | 9313 | msgstr "'%s' 不是一个有效的tag名称。" |
c04f5ac3 | 9314 | |
90314792 | 9315 | #: builtin/tag.c:561 |
c04f5ac3 JX |
9316 | #, c-format |
9317 | msgid "tag '%s' already exists" | |
9318 | msgstr "tag '%s' 已存在" | |
9319 | ||
90314792 | 9320 | #: builtin/tag.c:579 |
c04f5ac3 JX |
9321 | #, c-format |
9322 | msgid "%s: cannot lock the ref" | |
9323 | msgstr "%s:不能锁定引用" | |
9324 | ||
90314792 | 9325 | #: builtin/tag.c:581 |
c04f5ac3 JX |
9326 | #, c-format |
9327 | msgid "%s: cannot update the ref" | |
9328 | msgstr "%s:不能更新引用" | |
9329 | ||
90314792 | 9330 | #: builtin/tag.c:583 |
c04f5ac3 JX |
9331 | #, c-format |
9332 | msgid "Updated tag '%s' (was %s)\n" | |
9333 | msgstr "已更新tag '%s'(曾为 %s)\n" | |
9334 | ||
90314792 | 9335 | #: builtin/update-index.c:402 |
ef317cd5 | 9336 | msgid "git update-index [options] [--] [<file>...]" |
07432cef | 9337 | msgstr "git update-index [选项] [--] [<文件>...]" |
8ada9598 | 9338 | |
90314792 | 9339 | #: builtin/update-index.c:720 |
ef317cd5 | 9340 | msgid "continue refresh even when index needs update" |
07432cef | 9341 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 9342 | |
90314792 | 9343 | #: builtin/update-index.c:723 |
ef317cd5 | 9344 | msgid "refresh: ignore submodules" |
07432cef | 9345 | msgstr "刷新:忽略子模组" |
8ada9598 | 9346 | |
90314792 | 9347 | #: builtin/update-index.c:726 |
ef317cd5 | 9348 | msgid "do not ignore new files" |
07432cef | 9349 | msgstr "不忽略新的文件" |
8ada9598 | 9350 | |
90314792 | 9351 | #: builtin/update-index.c:728 |
ef317cd5 | 9352 | msgid "let files replace directories and vice-versa" |
07432cef | 9353 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 9354 | |
90314792 | 9355 | #: builtin/update-index.c:730 |
ef317cd5 | 9356 | msgid "notice files missing from worktree" |
07432cef | 9357 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 9358 | |
90314792 | 9359 | #: builtin/update-index.c:732 |
ef317cd5 | 9360 | msgid "refresh even if index contains unmerged entries" |
07432cef | 9361 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 9362 | |
90314792 | 9363 | #: builtin/update-index.c:735 |
ef317cd5 | 9364 | msgid "refresh stat information" |
07432cef | 9365 | msgstr "刷新统计信息" |
ef317cd5 | 9366 | |
90314792 | 9367 | #: builtin/update-index.c:739 |
ef317cd5 | 9368 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 9369 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 9370 | |
90314792 | 9371 | #: builtin/update-index.c:743 |
ef317cd5 | 9372 | msgid "<mode> <object> <path>" |
07432cef | 9373 | msgstr "<mode> <object> <path>" |
ef317cd5 | 9374 | |
90314792 | 9375 | #: builtin/update-index.c:744 |
ef317cd5 | 9376 | msgid "add the specified entry to the index" |
07432cef | 9377 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 9378 | |
90314792 | 9379 | #: builtin/update-index.c:748 |
ef317cd5 | 9380 | msgid "(+/-)x" |
07432cef | 9381 | msgstr "(+/-)x" |
ef317cd5 | 9382 | |
90314792 | 9383 | #: builtin/update-index.c:749 |
ef317cd5 | 9384 | msgid "override the executable bit of the listed files" |
07432cef | 9385 | msgstr "覆盖列表里文件的可执行位" |
ef317cd5 | 9386 | |
90314792 | 9387 | #: builtin/update-index.c:753 |
ef317cd5 | 9388 | msgid "mark files as \"not changing\"" |
07432cef | 9389 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 9390 | |
90314792 | 9391 | #: builtin/update-index.c:756 |
ef317cd5 | 9392 | msgid "clear assumed-unchanged bit" |
07432cef | 9393 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 9394 | |
90314792 | 9395 | #: builtin/update-index.c:759 |
ef317cd5 | 9396 | msgid "mark files as \"index-only\"" |
07432cef | 9397 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 9398 | |
90314792 | 9399 | #: builtin/update-index.c:762 |
ef317cd5 | 9400 | msgid "clear skip-worktree bit" |
07432cef | 9401 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 9402 | |
90314792 | 9403 | #: builtin/update-index.c:765 |
ef317cd5 | 9404 | msgid "add to index only; do not add content to object database" |
07432cef | 9405 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 9406 | |
90314792 | 9407 | #: builtin/update-index.c:767 |
ef317cd5 | 9408 | msgid "remove named paths even if present in worktree" |
07432cef | 9409 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 9410 | |
90314792 | 9411 | #: builtin/update-index.c:769 |
ef317cd5 | 9412 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 9413 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 9414 | |
90314792 | 9415 | #: builtin/update-index.c:771 |
ef317cd5 | 9416 | msgid "read list of paths to be updated from standard input" |
07432cef | 9417 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 9418 | |
90314792 | 9419 | #: builtin/update-index.c:775 |
ef317cd5 | 9420 | msgid "add entries from standard input to the index" |
07432cef | 9421 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 9422 | |
90314792 | 9423 | #: builtin/update-index.c:779 |
ef317cd5 | 9424 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 9425 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 9426 | |
90314792 | 9427 | #: builtin/update-index.c:783 |
ef317cd5 | 9428 | msgid "only update entries that differ from HEAD" |
07432cef | 9429 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 9430 | |
90314792 | 9431 | #: builtin/update-index.c:787 |
ef317cd5 | 9432 | msgid "ignore files missing from worktree" |
07432cef | 9433 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 9434 | |
90314792 | 9435 | #: builtin/update-index.c:790 |
ef317cd5 | 9436 | msgid "report actions to standard output" |
07432cef | 9437 | msgstr "在标准输出显示操作" |
ef317cd5 | 9438 | |
90314792 | 9439 | #: builtin/update-index.c:792 |
ef317cd5 | 9440 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 9441 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 9442 | |
90314792 | 9443 | #: builtin/update-index.c:796 |
ef317cd5 | 9444 | msgid "write index in this format" |
07432cef | 9445 | msgstr "以这种格式写入索引区" |
ef317cd5 | 9446 | |
90314792 | 9447 | #: builtin/update-ref.c:9 |
ef317cd5 | 9448 | msgid "git update-ref [options] -d <refname> [<oldval>]" |
90314792 | 9449 | msgstr "git update-ref [选项] -d <引用名> [<旧值>]" |
ef317cd5 | 9450 | |
90314792 | 9451 | #: builtin/update-ref.c:10 |
ef317cd5 | 9452 | msgid "git update-ref [options] <refname> <newval> [<oldval>]" |
90314792 JX |
9453 | msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]" |
9454 | ||
9455 | #: builtin/update-ref.c:11 | |
9456 | msgid "git update-ref [options] --stdin [-z]" | |
9457 | msgstr "git update-ref [选项] --stdin [-z]" | |
ef317cd5 | 9458 | |
90314792 | 9459 | #: builtin/update-ref.c:255 |
ef317cd5 | 9460 | msgid "delete the reference" |
07432cef | 9461 | msgstr "删除引用" |
ef317cd5 | 9462 | |
90314792 | 9463 | #: builtin/update-ref.c:257 |
ef317cd5 | 9464 | msgid "update <refname> not the one it points to" |
07432cef | 9465 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 9466 | |
90314792 JX |
9467 | #: builtin/update-ref.c:258 |
9468 | msgid "stdin has NUL-terminated arguments" | |
9469 | msgstr "标准输入有以 NUL 字符终止的参数" | |
9470 | ||
9471 | #: builtin/update-ref.c:259 | |
9472 | msgid "read updates from stdin" | |
9473 | msgstr "从标准输入读取更新" | |
9474 | ||
ef317cd5 JX |
9475 | #: builtin/update-server-info.c:6 |
9476 | msgid "git update-server-info [--force]" | |
07432cef | 9477 | msgstr "git update-server-info [--force]" |
ef317cd5 JX |
9478 | |
9479 | #: builtin/update-server-info.c:14 | |
9480 | msgid "update the info files from scratch" | |
07432cef | 9481 | msgstr "从头开始更新文件信息" |
ef317cd5 JX |
9482 | |
9483 | #: builtin/verify-pack.c:56 | |
9484 | msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." | |
07432cef | 9485 | msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." |
ef317cd5 JX |
9486 | |
9487 | #: builtin/verify-pack.c:66 | |
ef317cd5 JX |
9488 | msgid "verbose" |
9489 | msgstr "冗长输出" | |
9490 | ||
9491 | #: builtin/verify-pack.c:68 | |
9492 | msgid "show statistics only" | |
07432cef | 9493 | msgstr "只显示统计" |
ef317cd5 JX |
9494 | |
9495 | #: builtin/verify-tag.c:17 | |
9496 | msgid "git verify-tag [-v|--verbose] <tag>..." | |
07432cef | 9497 | msgstr "git verify-tag [-v|--verbose] <tag>..." |
ef317cd5 JX |
9498 | |
9499 | #: builtin/verify-tag.c:73 | |
9500 | msgid "print tag contents" | |
07432cef | 9501 | msgstr "打印 tag 内容" |
ef317cd5 JX |
9502 | |
9503 | #: builtin/write-tree.c:13 | |
9504 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" | |
07432cef | 9505 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 JX |
9506 | |
9507 | #: builtin/write-tree.c:26 | |
9508 | msgid "<prefix>/" | |
07432cef | 9509 | msgstr "<前缀>/" |
ef317cd5 JX |
9510 | |
9511 | #: builtin/write-tree.c:27 | |
9512 | msgid "write tree object for a subdirectory <prefix>" | |
07432cef | 9513 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 JX |
9514 | |
9515 | #: builtin/write-tree.c:30 | |
9516 | msgid "only useful for debugging" | |
07432cef | 9517 | msgstr "只对调试有用" |
ef317cd5 | 9518 | |
2e8451e8 | 9519 | #: git.c:17 |
4dcdc3d8 JX |
9520 | msgid "" |
9521 | "'git help -a' and 'git help -g' lists available subcommands and some\n" | |
9522 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" | |
9523 | "to read about a specific subcommand or concept." | |
9524 | msgstr "" | |
9525 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n" | |
9526 | "'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。" | |
8ada9598 | 9527 | |
90314792 | 9528 | #: parse-options.h:146 |
2e8451e8 JX |
9529 | msgid "expiry date" |
9530 | msgstr "逾期日期" | |
9531 | ||
90314792 | 9532 | #: parse-options.h:161 |
8ada9598 | 9533 | msgid "no-op (backward compatibility)" |
81809b99 | 9534 | msgstr "空操作(向后兼容)" |
8ada9598 | 9535 | |
90314792 | 9536 | #: parse-options.h:238 |
8ada9598 | 9537 | msgid "be more verbose" |
81809b99 | 9538 | msgstr "更加详细" |
8ada9598 | 9539 | |
90314792 | 9540 | #: parse-options.h:240 |
8ada9598 | 9541 | msgid "be more quiet" |
81809b99 | 9542 | msgstr "更加安静" |
8ada9598 | 9543 | |
90314792 | 9544 | #: parse-options.h:246 |
8ada9598 | 9545 | msgid "use <n> digits to display SHA-1s" |
81809b99 | 9546 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" |
8ada9598 JX |
9547 | |
9548 | #: common-cmds.h:8 | |
9549 | msgid "Add file contents to the index" | |
81809b99 | 9550 | msgstr "添加文件内容至索引" |
8ada9598 JX |
9551 | |
9552 | #: common-cmds.h:9 | |
9553 | msgid "Find by binary search the change that introduced a bug" | |
81809b99 | 9554 | msgstr "通过二分查找定位引入 bug 的变更" |
8ada9598 JX |
9555 | |
9556 | #: common-cmds.h:10 | |
8ada9598 | 9557 | msgid "List, create, or delete branches" |
81809b99 | 9558 | msgstr "列出、创建或删除分支" |
8ada9598 JX |
9559 | |
9560 | #: common-cmds.h:11 | |
9561 | msgid "Checkout a branch or paths to the working tree" | |
81809b99 | 9562 | msgstr "检出一个分支或路径到工作区" |
8ada9598 JX |
9563 | |
9564 | #: common-cmds.h:12 | |
8ada9598 | 9565 | msgid "Clone a repository into a new directory" |
81809b99 | 9566 | msgstr "克隆一个版本库到一个新目录" |
8ada9598 JX |
9567 | |
9568 | #: common-cmds.h:13 | |
8ada9598 | 9569 | msgid "Record changes to the repository" |
81809b99 | 9570 | msgstr "记录变更到版本库" |
8ada9598 JX |
9571 | |
9572 | #: common-cmds.h:14 | |
9573 | msgid "Show changes between commits, commit and working tree, etc" | |
81809b99 | 9574 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 JX |
9575 | |
9576 | #: common-cmds.h:15 | |
9577 | msgid "Download objects and refs from another repository" | |
81809b99 | 9578 | msgstr "从另外一个版本库下载对象和引用" |
8ada9598 JX |
9579 | |
9580 | #: common-cmds.h:16 | |
9581 | msgid "Print lines matching a pattern" | |
81809b99 | 9582 | msgstr "输出和模式匹配的行" |
8ada9598 JX |
9583 | |
9584 | #: common-cmds.h:17 | |
a77c07d9 JX |
9585 | msgid "Create an empty Git repository or reinitialize an existing one" |
9586 | msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" | |
8ada9598 JX |
9587 | |
9588 | #: common-cmds.h:18 | |
8ada9598 | 9589 | msgid "Show commit logs" |
81809b99 | 9590 | msgstr "显示提交日志" |
8ada9598 JX |
9591 | |
9592 | #: common-cmds.h:19 | |
9593 | msgid "Join two or more development histories together" | |
81809b99 | 9594 | msgstr "合并两个或更多开发历史" |
8ada9598 JX |
9595 | |
9596 | #: common-cmds.h:20 | |
9597 | msgid "Move or rename a file, a directory, or a symlink" | |
81809b99 | 9598 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 JX |
9599 | |
9600 | #: common-cmds.h:21 | |
2e8451e8 JX |
9601 | msgid "Fetch from and integrate with another repository or a local branch" |
9602 | msgstr "获取并整合另外的版本库或一个本地分支" | |
8ada9598 JX |
9603 | |
9604 | #: common-cmds.h:22 | |
9605 | msgid "Update remote refs along with associated objects" | |
81809b99 | 9606 | msgstr "更新远程引用和相关的对象" |
8ada9598 JX |
9607 | |
9608 | #: common-cmds.h:23 | |
9609 | msgid "Forward-port local commits to the updated upstream head" | |
81809b99 | 9610 | msgstr "本地提交转移至更新后的上游分支中" |
8ada9598 JX |
9611 | |
9612 | #: common-cmds.h:24 | |
9613 | msgid "Reset current HEAD to the specified state" | |
81809b99 | 9614 | msgstr "重置当前HEAD到指定状态" |
8ada9598 JX |
9615 | |
9616 | #: common-cmds.h:25 | |
9617 | msgid "Remove files from the working tree and from the index" | |
81809b99 | 9618 | msgstr "从工作区和索引中删除文件" |
8ada9598 JX |
9619 | |
9620 | #: common-cmds.h:26 | |
9621 | msgid "Show various types of objects" | |
81809b99 | 9622 | msgstr "显示各种类型的对象" |
8ada9598 JX |
9623 | |
9624 | #: common-cmds.h:27 | |
8ada9598 | 9625 | msgid "Show the working tree status" |
81809b99 | 9626 | msgstr "显示工作区状态" |
8ada9598 JX |
9627 | |
9628 | #: common-cmds.h:28 | |
9629 | msgid "Create, list, delete or verify a tag object signed with GPG" | |
81809b99 | 9630 | msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" |
8ada9598 | 9631 | |
170e9899 | 9632 | #: git-am.sh:50 |
c04f5ac3 JX |
9633 | msgid "You need to set your committer info first" |
9634 | msgstr "您需要先设置你的提交者信息" | |
9635 | ||
b694fbb1 JX |
9636 | #: git-am.sh:95 |
9637 | msgid "" | |
9638 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
9639 | "Not rewinding to ORIG_HEAD" | |
6792b93b | 9640 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" |
b694fbb1 JX |
9641 | |
9642 | #: git-am.sh:105 | |
9643 | #, sh-format | |
9644 | msgid "" | |
2e8451e8 | 9645 | "When you have resolved this problem, run \"$cmdline --continue\".\n" |
649900bc JX |
9646 | "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" |
9647 | "To restore the original branch and stop patching, run \"$cmdline --abort\"." | |
b694fbb1 | 9648 | msgstr "" |
2e8451e8 | 9649 | "当您解决了此问题后,执行 \"$cmdline --continue\"。\n" |
b694fbb1 JX |
9650 | "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n" |
9651 | "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
9652 | ||
9653 | #: git-am.sh:121 | |
9654 | msgid "Cannot fall back to three-way merge." | |
9655 | msgstr "无法求助于三路合并。" | |
9656 | ||
170e9899 | 9657 | #: git-am.sh:137 |
c04f5ac3 | 9658 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
07432cef | 9659 | msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。" |
649900bc JX |
9660 | |
9661 | #: git-am.sh:139 | |
9662 | msgid "Using index info to reconstruct a base tree..." | |
63af42fe | 9663 | msgstr "使用索引来重建一个(三路合并的)基础目录树..." |
c04f5ac3 | 9664 | |
170e9899 | 9665 | #: git-am.sh:154 |
c04f5ac3 JX |
9666 | msgid "" |
9667 | "Did you hand edit your patch?\n" | |
9668 | "It does not apply to blobs recorded in its index." | |
9669 | msgstr "" | |
9670 | "您是否曾手动编辑过您的补丁?\n" | |
07432cef | 9671 | "无法应用补丁到索引中的数据(blob)对象上。" |
c04f5ac3 | 9672 | |
170e9899 | 9673 | #: git-am.sh:163 |
c04f5ac3 | 9674 | msgid "Falling back to patching base and 3-way merge..." |
b694fbb1 | 9675 | msgstr "转而在基础版本上打补丁及进行三路合并..." |
c04f5ac3 | 9676 | |
649900bc JX |
9677 | #: git-am.sh:179 |
9678 | msgid "Failed to merge in the changes." | |
9679 | msgstr "无法合并变更。" | |
9680 | ||
9681 | #: git-am.sh:274 | |
c04f5ac3 JX |
9682 | msgid "Only one StGIT patch series can be applied at once" |
9683 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
9684 | ||
649900bc | 9685 | #: git-am.sh:361 |
c04f5ac3 JX |
9686 | #, sh-format |
9687 | msgid "Patch format $patch_format is not supported." | |
9688 | msgstr "不支持 $patch_format 补丁格式。" | |
9689 | ||
649900bc | 9690 | #: git-am.sh:363 |
c04f5ac3 JX |
9691 | msgid "Patch format detection failed." |
9692 | msgstr "补丁格式检测失败。" | |
9693 | ||
649900bc JX |
9694 | #: git-am.sh:389 |
9695 | msgid "" | |
9696 | "The -b/--binary option has been a no-op for long time, and\n" | |
9697 | "it will be removed. Please do not use it anymore." | |
9698 | msgstr "" | |
9699 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n" | |
9700 | "请不要再使用它了。" | |
c04f5ac3 | 9701 | |
2e8451e8 | 9702 | #: git-am.sh:479 |
c04f5ac3 JX |
9703 | #, sh-format |
9704 | msgid "previous rebase directory $dotest still exists but mbox given." | |
2e8451e8 | 9705 | msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。" |
c04f5ac3 | 9706 | |
2e8451e8 | 9707 | #: git-am.sh:484 |
c04f5ac3 JX |
9708 | msgid "Please make up your mind. --skip or --abort?" |
9709 | msgstr "请下决心。--skip 或是 --abort ?" | |
9710 | ||
2e8451e8 JX |
9711 | #: git-am.sh:520 |
9712 | #, sh-format | |
9713 | msgid "" | |
9714 | "Stray $dotest directory found.\n" | |
9715 | "Use \"git am --abort\" to remove it." | |
9716 | msgstr "" | |
9717 | "发现了错误的 $dotest 目录。\n" | |
9718 | "使用 \"git am --abort\" 删除它。" | |
9719 | ||
9720 | #: git-am.sh:528 | |
c04f5ac3 JX |
9721 | msgid "Resolve operation not in progress, we are not resuming." |
9722 | msgstr "解决操作未进行,我们不会继续。" | |
9723 | ||
2e8451e8 | 9724 | #: git-am.sh:594 |
c04f5ac3 JX |
9725 | #, sh-format |
9726 | msgid "Dirty index: cannot apply patches (dirty: $files)" | |
90e6ef53 | 9727 | msgstr "脏的索引:不能应用补丁(脏文件:$files)" |
c04f5ac3 | 9728 | |
2e8451e8 | 9729 | #: git-am.sh:698 |
b694fbb1 JX |
9730 | #, sh-format |
9731 | msgid "" | |
9732 | "Patch is empty. Was it split wrong?\n" | |
9733 | "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" | |
9734 | "To restore the original branch and stop patching run \"$cmdline --abort\"." | |
9735 | msgstr "" | |
9736 | "补丁为空。是不是切分错误?\n" | |
9737 | "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n" | |
9738 | "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。" | |
9739 | ||
2e8451e8 | 9740 | #: git-am.sh:725 |
b694fbb1 JX |
9741 | msgid "Patch does not have a valid e-mail address." |
9742 | msgstr "补丁中没有一个有效的邮件地址。" | |
9743 | ||
2e8451e8 | 9744 | #: git-am.sh:772 |
c04f5ac3 | 9745 | msgid "cannot be interactive without stdin connected to a terminal." |
90e6ef53 | 9746 | msgstr "标准输入没有和终端关联,不能进行交互式操作。" |
c04f5ac3 | 9747 | |
2e8451e8 | 9748 | #: git-am.sh:776 |
b694fbb1 JX |
9749 | msgid "Commit Body is:" |
9750 | msgstr "提交内容为:" | |
9751 | ||
90e6ef53 | 9752 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
9753 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
9754 | #. in your translation. The program will only accept English | |
9755 | #. input at this point. | |
2e8451e8 | 9756 | #: git-am.sh:783 |
c04f5ac3 JX |
9757 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
9758 | msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " | |
9759 | ||
2e8451e8 | 9760 | #: git-am.sh:819 |
c04f5ac3 JX |
9761 | #, sh-format |
9762 | msgid "Applying: $FIRSTLINE" | |
9763 | msgstr "正应用:$FIRSTLINE" | |
9764 | ||
2e8451e8 | 9765 | #: git-am.sh:840 |
b694fbb1 JX |
9766 | msgid "" |
9767 | "No changes - did you forget to use 'git add'?\n" | |
9768 | "If there is nothing left to stage, chances are that something else\n" | |
9769 | "already introduced the same changes; you might want to skip this patch." | |
9770 | msgstr "" | |
9771 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
9772 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
9773 | "您也许想要跳过这个补丁。" | |
9774 | ||
2e8451e8 | 9775 | #: git-am.sh:848 |
b694fbb1 JX |
9776 | msgid "" |
9777 | "You still have unmerged paths in your index\n" | |
9778 | "did you forget to use 'git add'?" | |
6792b93b | 9779 | msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?" |
b694fbb1 | 9780 | |
2e8451e8 | 9781 | #: git-am.sh:864 |
c04f5ac3 | 9782 | msgid "No changes -- Patch already applied." |
63af42fe | 9783 | msgstr "没有变更 —— 补丁已经应用过。" |
c04f5ac3 | 9784 | |
2e8451e8 | 9785 | #: git-am.sh:874 |
b694fbb1 JX |
9786 | #, sh-format |
9787 | msgid "Patch failed at $msgnum $FIRSTLINE" | |
9788 | msgstr "补丁失败于 $msgnum $FIRSTLINE" | |
9789 | ||
2e8451e8 | 9790 | #: git-am.sh:877 |
ef317cd5 JX |
9791 | #, sh-format |
9792 | msgid "" | |
9793 | "The copy of the patch that failed is found in:\n" | |
9794 | " $dotest/patch" | |
9795 | msgstr "" | |
07432cef WS |
9796 | "失败的补丁文件副本位于:\n" |
9797 | " $dotest/patch" | |
ef317cd5 | 9798 | |
2e8451e8 | 9799 | #: git-am.sh:895 |
c04f5ac3 JX |
9800 | msgid "applying to an empty history" |
9801 | msgstr "正应用到一个空历史上" | |
9802 | ||
b694fbb1 JX |
9803 | #: git-bisect.sh:48 |
9804 | msgid "You need to start by \"git bisect start\"" | |
9805 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
9806 | ||
90e6ef53 | 9807 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
9808 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
9809 | #. translation. The program will only accept English input | |
9810 | #. at this point. | |
9811 | #: git-bisect.sh:54 | |
9812 | msgid "Do you want me to do it for you [Y/n]? " | |
9813 | msgstr "您想让我为您这样做么[Y/n]? " | |
9814 | ||
9815 | #: git-bisect.sh:95 | |
9816 | #, sh-format | |
9817 | msgid "unrecognised option: '$arg'" | |
81809b99 | 9818 | msgstr "未能识别的选项:'$arg'" |
c04f5ac3 JX |
9819 | |
9820 | #: git-bisect.sh:99 | |
9821 | #, sh-format | |
9822 | msgid "'$arg' does not appear to be a valid revision" | |
9823 | msgstr "'$arg' 看起来不像是一个有效的版本" | |
9824 | ||
9825 | #: git-bisect.sh:117 | |
9826 | msgid "Bad HEAD - I need a HEAD" | |
9827 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
9828 | ||
9829 | #: git-bisect.sh:130 | |
9830 | #, sh-format | |
9831 | msgid "" | |
9832 | "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." | |
9833 | msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。" | |
9834 | ||
9835 | #: git-bisect.sh:140 | |
9836 | msgid "won't bisect on seeked tree" | |
9837 | msgstr "不会在已查找过的树上二分查找" | |
9838 | ||
9839 | #: git-bisect.sh:144 | |
9840 | msgid "Bad HEAD - strange symbolic ref" | |
90e6ef53 | 9841 | msgstr "坏的 HEAD - 奇怪的符号引用" |
c04f5ac3 JX |
9842 | |
9843 | #: git-bisect.sh:189 | |
9844 | #, sh-format | |
9845 | msgid "Bad bisect_write argument: $state" | |
90e6ef53 | 9846 | msgstr "坏的 bisect_write 参数:$state" |
c04f5ac3 JX |
9847 | |
9848 | #: git-bisect.sh:218 | |
9849 | #, sh-format | |
9850 | msgid "Bad rev input: $arg" | |
90e6ef53 | 9851 | msgstr "输入坏的版本:$arg" |
c04f5ac3 JX |
9852 | |
9853 | #: git-bisect.sh:232 | |
9854 | msgid "Please call 'bisect_state' with at least one argument." | |
9855 | msgstr "请在调用 'bisect_state' 时跟至少一个参数。" | |
9856 | ||
9857 | #: git-bisect.sh:244 | |
9858 | #, sh-format | |
9859 | msgid "Bad rev input: $rev" | |
9860 | msgstr "输入坏的版本:$rev" | |
9861 | ||
9862 | #: git-bisect.sh:250 | |
9863 | msgid "'git bisect bad' can take only one argument." | |
9864 | msgstr "'git bisect bad' 只能带一个参数。" | |
9865 | ||
b694fbb1 JX |
9866 | #. have bad but not good. we could bisect although |
9867 | #. this is less optimum. | |
9868 | #: git-bisect.sh:273 | |
9869 | msgid "Warning: bisecting only with a bad commit." | |
9870 | msgstr "警告:在仅有一个坏提交下进行二分查找。" | |
9871 | ||
90e6ef53 | 9872 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
9873 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
9874 | #. translation. The program will only accept English input | |
9875 | #. at this point. | |
9876 | #: git-bisect.sh:279 | |
9877 | msgid "Are you sure [Y/n]? " | |
9878 | msgstr "您确认么[Y/n]? " | |
9879 | ||
b694fbb1 JX |
9880 | #: git-bisect.sh:289 |
9881 | msgid "" | |
9882 | "You need to give me at least one good and one bad revisions.\n" | |
9883 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" | |
9884 | msgstr "" | |
9885 | "您需要给我至少一个好版本和一个坏版本。\n" | |
9886 | "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)" | |
9887 | ||
9888 | #: git-bisect.sh:292 | |
9889 | msgid "" | |
9890 | "You need to start by \"git bisect start\".\n" | |
9891 | "You then need to give me at least one good and one bad revisions.\n" | |
9892 | "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" | |
9893 | msgstr "" | |
9894 | "您需要执行 \"git bisect start\" 来开始。\n" | |
9895 | "然后需要提供我至少一个好版本和一个坏版本。\n" | |
9896 | "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)" | |
9897 | ||
4dcdc3d8 | 9898 | #: git-bisect.sh:363 git-bisect.sh:490 |
b694fbb1 JX |
9899 | msgid "We are not bisecting." |
9900 | msgstr "我们没有在二分查找。" | |
9901 | ||
4dcdc3d8 | 9902 | #: git-bisect.sh:370 |
c04f5ac3 JX |
9903 | #, sh-format |
9904 | msgid "'$invalid' is not a valid commit" | |
9905 | msgstr "'$invalid' 不是一个有效的提交" | |
9906 | ||
4dcdc3d8 | 9907 | #: git-bisect.sh:379 |
c04f5ac3 JX |
9908 | #, sh-format |
9909 | msgid "" | |
9910 | "Could not check out original HEAD '$branch'.\n" | |
9911 | "Try 'git bisect reset <commit>'." | |
9912 | msgstr "" | |
9913 | "不能检出原始 HEAD '$branch'。\n" | |
07432cef | 9914 | "尝试 'git bisect reset <提交>'。" |
c04f5ac3 | 9915 | |
4dcdc3d8 | 9916 | #: git-bisect.sh:406 |
c04f5ac3 JX |
9917 | msgid "No logfile given" |
9918 | msgstr "未提供日志文件" | |
9919 | ||
4dcdc3d8 | 9920 | #: git-bisect.sh:407 |
c04f5ac3 JX |
9921 | #, sh-format |
9922 | msgid "cannot read $file for replaying" | |
9923 | msgstr "不能读取 $file 来重放" | |
9924 | ||
4dcdc3d8 | 9925 | #: git-bisect.sh:424 |
c04f5ac3 JX |
9926 | msgid "?? what are you talking about?" |
9927 | msgstr "?? 您在说什么?" | |
9928 | ||
4dcdc3d8 | 9929 | #: git-bisect.sh:436 |
b694fbb1 JX |
9930 | #, sh-format |
9931 | msgid "running $command" | |
9932 | msgstr "运行 $command" | |
9933 | ||
4dcdc3d8 | 9934 | #: git-bisect.sh:443 |
b694fbb1 JX |
9935 | #, sh-format |
9936 | msgid "" | |
9937 | "bisect run failed:\n" | |
9938 | "exit code $res from '$command' is < 0 or >= 128" | |
9939 | msgstr "" | |
9940 | "二分查找运行失败:\n" | |
07432cef | 9941 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 9942 | |
4dcdc3d8 | 9943 | #: git-bisect.sh:469 |
b694fbb1 JX |
9944 | msgid "bisect run cannot continue any more" |
9945 | msgstr "二分查找不能继续运行" | |
9946 | ||
4dcdc3d8 | 9947 | #: git-bisect.sh:475 |
b694fbb1 JX |
9948 | #, sh-format |
9949 | msgid "" | |
9950 | "bisect run failed:\n" | |
9951 | "'bisect_state $state' exited with error code $res" | |
9952 | msgstr "" | |
9953 | "二分查找运行失败:\n" | |
9954 | "'bisect_state $state' 退出码为 $res" | |
9955 | ||
4dcdc3d8 | 9956 | #: git-bisect.sh:482 |
b694fbb1 JX |
9957 | msgid "bisect run success" |
9958 | msgstr "二分查找运行成功" | |
c04f5ac3 JX |
9959 | |
9960 | #: git-pull.sh:21 | |
9961 | msgid "" | |
9962 | "Pull is not possible because you have unmerged files.\n" | |
9963 | "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" | |
9964 | "as appropriate to mark resolution, or use 'git commit -a'." | |
9965 | msgstr "" | |
90e6ef53 | 9966 | "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n" |
c04f5ac3 | 9967 | "然后酌情使用 'git add/rm <file>' 标记解决方案,\n" |
90e6ef53 | 9968 | "或者使用 'git commit -a'。" |
c04f5ac3 JX |
9969 | |
9970 | #: git-pull.sh:25 | |
9971 | msgid "Pull is not possible because you have unmerged files." | |
90e6ef53 | 9972 | msgstr "Pull 不可用,因为您尚有未合并的文件。" |
c04f5ac3 | 9973 | |
90314792 | 9974 | #: git-pull.sh:223 |
c04f5ac3 | 9975 | msgid "updating an unborn branch with changes added to the index" |
90e6ef53 | 9976 | msgstr "更新尚未诞生的分支,变更添加至索引" |
c04f5ac3 | 9977 | |
b694fbb1 JX |
9978 | #. The fetch involved updating the current branch. |
9979 | #. The working tree and the index file is still based on the | |
9980 | #. $orig_head commit, but we are merging into $curr_head. | |
9981 | #. First update the working tree to match $curr_head. | |
90314792 | 9982 | #: git-pull.sh:255 |
b694fbb1 JX |
9983 | #, sh-format |
9984 | msgid "" | |
9985 | "Warning: fetch updated the current branch head.\n" | |
9986 | "Warning: fast-forwarding your working tree from\n" | |
9987 | "Warning: commit $orig_head." | |
9988 | msgstr "" | |
9989 | "警告:fetch 更新了当前的分支。您的工作区\n" | |
9990 | "警告:从原提交 $orig_head 快进。" | |
9991 | ||
90314792 | 9992 | #: git-pull.sh:280 |
c04f5ac3 JX |
9993 | msgid "Cannot merge multiple branches into empty head" |
9994 | msgstr "无法将多个分支合并到空分支" | |
9995 | ||
90314792 | 9996 | #: git-pull.sh:284 |
c04f5ac3 JX |
9997 | msgid "Cannot rebase onto multiple branches" |
9998 | msgstr "无法变基到多个分支" | |
9999 | ||
2e8451e8 | 10000 | #: git-rebase.sh:54 |
649900bc JX |
10001 | msgid "" |
10002 | "When you have resolved this problem, run \"git rebase --continue\".\n" | |
10003 | "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" | |
10004 | "To check out the original branch and stop rebasing, run \"git rebase --abort" | |
10005 | "\"." | |
10006 | msgstr "" | |
10007 | "当您解决了此问题后,执行 \"git rebase --continue\"。\n" | |
10008 | "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n" | |
10009 | "要恢复原分支并停止变基,执行 \"git rebase --abort\"。" | |
10010 | ||
2e8451e8 JX |
10011 | #: git-rebase.sh:156 |
10012 | msgid "Applied autostash." | |
10013 | msgstr "成功应用 autostash。" | |
10014 | ||
10015 | #: git-rebase.sh:159 | |
10016 | #, sh-format | |
10017 | msgid "Cannot store $stash_sha1" | |
10018 | msgstr "无法保存 $stash_sha1" | |
10019 | ||
07432cef | 10020 | #: git-rebase.sh:160 |
2e8451e8 JX |
10021 | msgid "" |
10022 | "Applying autostash resulted in conflicts.\n" | |
10023 | "Your changes are safe in the stash.\n" | |
b1894384 | 10024 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" |
2e8451e8 JX |
10025 | msgstr "" |
10026 | "应用 autostash 导致冲突。\n" | |
10027 | "您的修改安全地保存在 stash 中。\n" | |
10028 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
10029 | ||
90314792 | 10030 | #: git-rebase.sh:199 |
649900bc JX |
10031 | msgid "The pre-rebase hook refused to rebase." |
10032 | msgstr "钩子 pre-rebase 拒绝变基。" | |
10033 | ||
90314792 | 10034 | #: git-rebase.sh:204 |
649900bc JX |
10035 | msgid "It looks like git-am is in progress. Cannot rebase." |
10036 | msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" | |
10037 | ||
90314792 | 10038 | #: git-rebase.sh:338 |
649900bc JX |
10039 | msgid "The --exec option must be used with the --interactive option" |
10040 | msgstr "选项 --exec 必须和选项 --interactive 同时使用" | |
10041 | ||
90314792 | 10042 | #: git-rebase.sh:343 |
649900bc JX |
10043 | msgid "No rebase in progress?" |
10044 | msgstr "没有正在进行的变基?" | |
10045 | ||
90314792 | 10046 | #: git-rebase.sh:354 |
07432cef WS |
10047 | msgid "The --edit-todo action can only be used during interactive rebase." |
10048 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
10049 | ||
90314792 | 10050 | #: git-rebase.sh:361 |
649900bc JX |
10051 | msgid "Cannot read HEAD" |
10052 | msgstr "不能读取 HEAD" | |
10053 | ||
90314792 | 10054 | #: git-rebase.sh:364 |
649900bc JX |
10055 | msgid "" |
10056 | "You must edit all merge conflicts and then\n" | |
10057 | "mark them as resolved using git add" | |
10058 | msgstr "" | |
10059 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
10060 | "命令将它们标记为已解决" | |
10061 | ||
90314792 | 10062 | #: git-rebase.sh:382 |
649900bc JX |
10063 | #, sh-format |
10064 | msgid "Could not move back to $head_name" | |
10065 | msgstr "无法移回 $head_name" | |
10066 | ||
90314792 | 10067 | #: git-rebase.sh:401 |
649900bc JX |
10068 | #, sh-format |
10069 | msgid "" | |
10070 | "It seems that there is already a $state_dir_base directory, and\n" | |
10071 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
10072 | "case, please try\n" | |
10073 | "\t$cmd_live_rebase\n" | |
10074 | "If that is not the case, please\n" | |
10075 | "\t$cmd_clear_stale_rebase\n" | |
10076 | "and run me again. I am stopping in case you still have something\n" | |
10077 | "valuable there." | |
10078 | msgstr "" | |
10079 | "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n" | |
10080 | "如果是这样,请尝试执行\n" | |
10081 | "\t$cmd_live_rebase\n" | |
10082 | "如果不是这样,请执行\n" | |
10083 | "\t$cmd_clear_stale_rebase\n" | |
10084 | "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。" | |
10085 | ||
90314792 | 10086 | #: git-rebase.sh:446 |
649900bc JX |
10087 | #, sh-format |
10088 | msgid "invalid upstream $upstream_name" | |
10089 | msgstr "无效的上游 $upstream_name" | |
10090 | ||
90314792 | 10091 | #: git-rebase.sh:470 |
649900bc JX |
10092 | #, sh-format |
10093 | msgid "$onto_name: there are more than one merge bases" | |
10094 | msgstr "$onto_name: 有一个以上的合并基准" | |
10095 | ||
90314792 | 10096 | #: git-rebase.sh:473 git-rebase.sh:477 |
649900bc JX |
10097 | #, sh-format |
10098 | msgid "$onto_name: there is no merge base" | |
10099 | msgstr "$onto_name: 没有合并基准" | |
10100 | ||
90314792 | 10101 | #: git-rebase.sh:482 |
649900bc JX |
10102 | #, sh-format |
10103 | msgid "Does not point to a valid commit: $onto_name" | |
10104 | msgstr "没有指向一个有效的提交:$onto_name" | |
10105 | ||
90314792 | 10106 | #: git-rebase.sh:505 |
649900bc JX |
10107 | #, sh-format |
10108 | msgid "fatal: no such branch: $branch_name" | |
10109 | msgstr "严重错误:无此分支:$branch_name" | |
10110 | ||
90314792 | 10111 | #: git-rebase.sh:528 |
2e8451e8 JX |
10112 | msgid "Cannot autostash" |
10113 | msgstr "无法 autostash" | |
10114 | ||
90314792 | 10115 | #: git-rebase.sh:533 |
2e8451e8 JX |
10116 | #, sh-format |
10117 | msgid "Created autostash: $stash_abbrev" | |
10118 | msgstr "创建了 autostash: $stash_abbrev" | |
10119 | ||
90314792 | 10120 | #: git-rebase.sh:537 |
649900bc JX |
10121 | msgid "Please commit or stash them." |
10122 | msgstr "请提交或为它们保存进度。" | |
10123 | ||
90314792 | 10124 | #: git-rebase.sh:557 |
649900bc JX |
10125 | #, sh-format |
10126 | msgid "Current branch $branch_name is up to date." | |
10127 | msgstr "当前分支 $branch_name 是最新的。" | |
10128 | ||
90314792 | 10129 | #: git-rebase.sh:561 |
649900bc JX |
10130 | #, sh-format |
10131 | msgid "Current branch $branch_name is up to date, rebase forced." | |
10132 | msgstr "当前分支 $branch_name 是最新的,强制变基。" | |
10133 | ||
90314792 | 10134 | #: git-rebase.sh:572 |
649900bc JX |
10135 | #, sh-format |
10136 | msgid "Changes from $mb to $onto:" | |
10137 | msgstr "变更从 $mb 到 $onto:" | |
10138 | ||
10139 | #. Detach HEAD and reset the tree | |
90314792 | 10140 | #: git-rebase.sh:581 |
649900bc JX |
10141 | msgid "First, rewinding head to replay your work on top of it..." |
10142 | msgstr "首先,重置头指针以便在上面重放您的工作..." | |
10143 | ||
90314792 | 10144 | #: git-rebase.sh:591 |
649900bc JX |
10145 | #, sh-format |
10146 | msgid "Fast-forwarded $branch_name to $onto_name." | |
10147 | msgstr "快进 $branch_name 至 $onto_name。" | |
10148 | ||
c04f5ac3 JX |
10149 | #: git-stash.sh:51 |
10150 | msgid "git stash clear with parameters is unimplemented" | |
10151 | msgstr "git stash clear 不支持参数" | |
10152 | ||
10153 | #: git-stash.sh:74 | |
10154 | msgid "You do not have the initial commit yet" | |
10155 | msgstr "您尚未建立初始提交" | |
10156 | ||
10157 | #: git-stash.sh:89 | |
10158 | msgid "Cannot save the current index state" | |
90e6ef53 | 10159 | msgstr "无法保存当前索引状态" |
c04f5ac3 JX |
10160 | |
10161 | #: git-stash.sh:123 git-stash.sh:136 | |
10162 | msgid "Cannot save the current worktree state" | |
10163 | msgstr "无法保存当前工作区状态" | |
10164 | ||
10165 | #: git-stash.sh:140 | |
10166 | msgid "No changes selected" | |
90e6ef53 | 10167 | msgstr "没有选择变更" |
c04f5ac3 JX |
10168 | |
10169 | #: git-stash.sh:143 | |
10170 | msgid "Cannot remove temporary index (can't happen)" | |
90e6ef53 | 10171 | msgstr "无法删除临时索引(不应发生)" |
c04f5ac3 JX |
10172 | |
10173 | #: git-stash.sh:156 | |
10174 | msgid "Cannot record working tree state" | |
10175 | msgstr "不能记录工作区状态" | |
10176 | ||
2e8451e8 JX |
10177 | #: git-stash.sh:190 |
10178 | #, sh-format | |
10179 | msgid "Cannot update $ref_stash with $w_commit" | |
10180 | msgstr "无法用 $w_commit 更新 $ref_stash" | |
10181 | ||
b694fbb1 JX |
10182 | #. TRANSLATORS: $option is an invalid option, like |
10183 | #. `--blah-blah'. The 7 spaces at the beginning of the | |
10184 | #. second line correspond to "error: ". So you should line | |
10185 | #. up the second line with however many characters the | |
10186 | #. translation of "error: " takes in your language. E.g. in | |
10187 | #. English this is: | |
10188 | #. | |
10189 | #. $ git stash save --blah-blah 2>&1 | head -n 2 | |
10190 | #. error: unknown option for 'stash save': --blah-blah | |
10191 | #. To provide a message, use git stash save -- '--blah-blah' | |
90314792 | 10192 | #: git-stash.sh:237 |
b694fbb1 JX |
10193 | #, sh-format |
10194 | msgid "" | |
10195 | "error: unknown option for 'stash save': $option\n" | |
10196 | " To provide a message, use git stash save -- '$option'" | |
10197 | msgstr "" | |
10198 | "错误:'stash save' 的未知选项:$option\n" | |
10199 | " 要提供一个描述信息,使用 git stash save -- '$option'" | |
10200 | ||
90314792 | 10201 | #: git-stash.sh:258 |
c04f5ac3 JX |
10202 | msgid "No local changes to save" |
10203 | msgstr "没有要保存的本地修改" | |
10204 | ||
90314792 | 10205 | #: git-stash.sh:262 |
c04f5ac3 | 10206 | msgid "Cannot initialize stash" |
90e6ef53 | 10207 | msgstr "无法初始化 stash" |
c04f5ac3 | 10208 | |
90314792 | 10209 | #: git-stash.sh:266 |
c04f5ac3 JX |
10210 | msgid "Cannot save the current status" |
10211 | msgstr "无法保存当前状态" | |
10212 | ||
90314792 | 10213 | #: git-stash.sh:284 |
c04f5ac3 JX |
10214 | msgid "Cannot remove worktree changes" |
10215 | msgstr "无法删除工作区变更" | |
10216 | ||
90314792 | 10217 | #: git-stash.sh:383 |
c04f5ac3 | 10218 | msgid "No stash found." |
90e6ef53 | 10219 | msgstr "未发现 stash。" |
c04f5ac3 | 10220 | |
90314792 | 10221 | #: git-stash.sh:390 |
c04f5ac3 JX |
10222 | #, sh-format |
10223 | msgid "Too many revisions specified: $REV" | |
90e6ef53 | 10224 | msgstr "指定了太多的版本:$REV" |
c04f5ac3 | 10225 | |
90314792 | 10226 | #: git-stash.sh:396 |
c04f5ac3 JX |
10227 | #, sh-format |
10228 | msgid "$reference is not valid reference" | |
10229 | msgstr "$reference 不是有效的引用" | |
10230 | ||
90314792 | 10231 | #: git-stash.sh:424 |
c04f5ac3 JX |
10232 | #, sh-format |
10233 | msgid "'$args' is not a stash-like commit" | |
90e6ef53 | 10234 | msgstr "'$args' 不是 stash 样提交" |
c04f5ac3 | 10235 | |
90314792 | 10236 | #: git-stash.sh:435 |
c04f5ac3 JX |
10237 | #, sh-format |
10238 | msgid "'$args' is not a stash reference" | |
90e6ef53 | 10239 | msgstr "'$args' 不是一个 stash 引用" |
c04f5ac3 | 10240 | |
90314792 | 10241 | #: git-stash.sh:443 |
c04f5ac3 | 10242 | msgid "unable to refresh index" |
90e6ef53 | 10243 | msgstr "无法刷新索引" |
c04f5ac3 | 10244 | |
90314792 | 10245 | #: git-stash.sh:447 |
c04f5ac3 JX |
10246 | msgid "Cannot apply a stash in the middle of a merge" |
10247 | msgstr "无法在合并过程中恢复进度" | |
10248 | ||
90314792 | 10249 | #: git-stash.sh:455 |
c04f5ac3 | 10250 | msgid "Conflicts in index. Try without --index." |
90e6ef53 | 10251 | msgstr "索引中有冲突。尝试不使用 --index。" |
c04f5ac3 | 10252 | |
90314792 | 10253 | #: git-stash.sh:457 |
c04f5ac3 | 10254 | msgid "Could not save index tree" |
90e6ef53 | 10255 | msgstr "不能保存索引树" |
c04f5ac3 | 10256 | |
90314792 | 10257 | #: git-stash.sh:491 |
c04f5ac3 JX |
10258 | msgid "Cannot unstage modified files" |
10259 | msgstr "无法还原修改的文件" | |
10260 | ||
90314792 | 10261 | #: git-stash.sh:506 |
b694fbb1 JX |
10262 | msgid "Index was not unstashed." |
10263 | msgstr "索引的进度没有被恢复。" | |
10264 | ||
90314792 | 10265 | #: git-stash.sh:523 |
c04f5ac3 JX |
10266 | #, sh-format |
10267 | msgid "Dropped ${REV} ($s)" | |
10268 | msgstr "丢弃了 ${REV} ($s)" | |
10269 | ||
90314792 | 10270 | #: git-stash.sh:524 |
c04f5ac3 JX |
10271 | #, sh-format |
10272 | msgid "${REV}: Could not drop stash entry" | |
90e6ef53 | 10273 | msgstr "${REV}:不能丢弃进度条目" |
c04f5ac3 | 10274 | |
90314792 | 10275 | #: git-stash.sh:531 |
c04f5ac3 JX |
10276 | msgid "No branch name specified" |
10277 | msgstr "未指定分支名" | |
10278 | ||
90314792 | 10279 | #: git-stash.sh:603 |
c04f5ac3 JX |
10280 | msgid "(To restore them type \"git stash apply\")" |
10281 | msgstr "(为恢复数据输入 \"git stash apply\")" | |
10282 | ||
2e8451e8 | 10283 | #: git-submodule.sh:95 |
c04f5ac3 JX |
10284 | #, sh-format |
10285 | msgid "cannot strip one component off url '$remoteurl'" | |
10286 | msgstr "无法从 url '$remoteurl' 剥离一个组件" | |
10287 | ||
2e8451e8 | 10288 | #: git-submodule.sh:237 |
c04f5ac3 | 10289 | #, sh-format |
170e9899 JX |
10290 | msgid "No submodule mapping found in .gitmodules for path '$sm_path'" |
10291 | msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" | |
c04f5ac3 | 10292 | |
2e8451e8 | 10293 | #: git-submodule.sh:281 |
c04f5ac3 | 10294 | #, sh-format |
170e9899 JX |
10295 | msgid "Clone of '$url' into submodule path '$sm_path' failed" |
10296 | msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" | |
c04f5ac3 | 10297 | |
2e8451e8 | 10298 | #: git-submodule.sh:293 |
dac1de7d JX |
10299 | #, sh-format |
10300 | msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" | |
07432cef | 10301 | msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" |
dac1de7d | 10302 | |
2e8451e8 JX |
10303 | #: git-submodule.sh:403 |
10304 | msgid "Relative path can only be used from the toplevel of the working tree" | |
10305 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
10306 | ||
10307 | #: git-submodule.sh:413 | |
c04f5ac3 JX |
10308 | #, sh-format |
10309 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
10310 | msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始" | |
10311 | ||
2e8451e8 | 10312 | #: git-submodule.sh:430 |
c04f5ac3 | 10313 | #, sh-format |
170e9899 JX |
10314 | msgid "'$sm_path' already exists in the index" |
10315 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 10316 | |
2e8451e8 | 10317 | #: git-submodule.sh:434 |
b694fbb1 JX |
10318 | #, sh-format |
10319 | msgid "" | |
10320 | "The following path is ignored by one of your .gitignore files:\n" | |
10321 | "$sm_path\n" | |
10322 | "Use -f if you really want to add it." | |
10323 | msgstr "" | |
10324 | "以下路径被您的一个 .gitignore 文件所忽略:\n" | |
10325 | "$sm_path\n" | |
10326 | "如果您确实想添加它,使用 -f 参数。" | |
10327 | ||
2e8451e8 | 10328 | #: git-submodule.sh:452 |
b694fbb1 JX |
10329 | #, sh-format |
10330 | msgid "Adding existing repo at '$sm_path' to the index" | |
10331 | msgstr "添加位于 '$sm_path' 的现存版本库到索引" | |
10332 | ||
2e8451e8 | 10333 | #: git-submodule.sh:454 |
c04f5ac3 | 10334 | #, sh-format |
170e9899 JX |
10335 | msgid "'$sm_path' already exists and is not a valid git repo" |
10336 | msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" | |
c04f5ac3 | 10337 | |
2e8451e8 | 10338 | #: git-submodule.sh:462 |
07432cef WS |
10339 | #, sh-format |
10340 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
10341 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:" | |
10342 | ||
2e8451e8 | 10343 | #: git-submodule.sh:464 |
07432cef WS |
10344 | #, sh-format |
10345 | msgid "" | |
10346 | "If you want to reuse this local git directory instead of cloning again from" | |
10347 | msgstr "如果您想重用此本地 git 目录而不是重新克隆自" | |
10348 | ||
2e8451e8 | 10349 | #: git-submodule.sh:466 |
07432cef WS |
10350 | #, sh-format |
10351 | msgid "" | |
10352 | "use the '--force' option. If the local git directory is not the correct repo" | |
10353 | msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" | |
10354 | ||
2e8451e8 | 10355 | #: git-submodule.sh:467 |
07432cef WS |
10356 | #, sh-format |
10357 | msgid "" | |
10358 | "or you are unsure what this means choose another name with the '--name' " | |
10359 | "option." | |
10360 | msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" | |
10361 | ||
2e8451e8 | 10362 | #: git-submodule.sh:469 |
07432cef WS |
10363 | #, sh-format |
10364 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
10365 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
10366 | ||
2e8451e8 | 10367 | #: git-submodule.sh:481 |
c04f5ac3 | 10368 | #, sh-format |
170e9899 JX |
10369 | msgid "Unable to checkout submodule '$sm_path'" |
10370 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 10371 | |
2e8451e8 | 10372 | #: git-submodule.sh:486 |
c04f5ac3 | 10373 | #, sh-format |
170e9899 JX |
10374 | msgid "Failed to add submodule '$sm_path'" |
10375 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 10376 | |
2e8451e8 | 10377 | #: git-submodule.sh:495 |
c04f5ac3 | 10378 | #, sh-format |
170e9899 JX |
10379 | msgid "Failed to register submodule '$sm_path'" |
10380 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 10381 | |
2e8451e8 | 10382 | #: git-submodule.sh:539 |
c04f5ac3 | 10383 | #, sh-format |
2e8451e8 JX |
10384 | msgid "Entering '$prefix$displaypath'" |
10385 | msgstr "正在进入 '$prefix$displaypath'" | |
c04f5ac3 | 10386 | |
2e8451e8 | 10387 | #: git-submodule.sh:554 |
c04f5ac3 | 10388 | #, sh-format |
2e8451e8 JX |
10389 | msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." |
10390 | msgstr "停止于 '$prefix$displaypath',脚本返回非零值。" | |
c04f5ac3 | 10391 | |
2e8451e8 | 10392 | #: git-submodule.sh:600 |
c04f5ac3 | 10393 | #, sh-format |
2e8451e8 JX |
10394 | msgid "No url found for submodule path '$displaypath' in .gitmodules" |
10395 | msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url" | |
c04f5ac3 | 10396 | |
2e8451e8 | 10397 | #: git-submodule.sh:609 |
c04f5ac3 | 10398 | #, sh-format |
2e8451e8 JX |
10399 | msgid "Failed to register url for submodule path '$displaypath'" |
10400 | msgstr "无法为子模组路径 '$displaypath' 注册 url" | |
c04f5ac3 | 10401 | |
2e8451e8 | 10402 | #: git-submodule.sh:611 |
c04f5ac3 | 10403 | #, sh-format |
2e8451e8 JX |
10404 | msgid "Submodule '$name' ($url) registered for path '$displaypath'" |
10405 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
c04f5ac3 | 10406 | |
2e8451e8 | 10407 | #: git-submodule.sh:619 |
d691f479 | 10408 | #, sh-format |
2e8451e8 JX |
10409 | msgid "Failed to register update mode for submodule path '$displaypath'" |
10410 | msgstr "无法为子模组路径 '$displaypath' 注册更新模式" | |
d691f479 | 10411 | |
2e8451e8 | 10412 | #: git-submodule.sh:656 |
1003b3a5 JX |
10413 | #, sh-format |
10414 | msgid "Use '.' if you really want to deinitialize all submodules" | |
10415 | msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化" | |
10416 | ||
2e8451e8 | 10417 | #: git-submodule.sh:673 |
1003b3a5 | 10418 | #, sh-format |
2e8451e8 JX |
10419 | msgid "Submodule work tree '$displaypath' contains a .git directory" |
10420 | msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录" | |
1003b3a5 | 10421 | |
2e8451e8 | 10422 | #: git-submodule.sh:674 |
1003b3a5 JX |
10423 | #, sh-format |
10424 | msgid "" | |
10425 | "(use 'rm -rf' if you really want to remove it including all of its history)" | |
10426 | msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
10427 | ||
2e8451e8 | 10428 | #: git-submodule.sh:680 |
c04f5ac3 JX |
10429 | #, sh-format |
10430 | msgid "" | |
2e8451e8 | 10431 | "Submodule work tree '$displaypath' contains local modifications; use '-f' to " |
1003b3a5 | 10432 | "discard them" |
2e8451e8 | 10433 | msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们" |
1003b3a5 | 10434 | |
2e8451e8 | 10435 | #: git-submodule.sh:683 |
1003b3a5 | 10436 | #, sh-format |
2e8451e8 JX |
10437 | msgid "Cleared directory '$displaypath'" |
10438 | msgstr "已清除目录 '$displaypath'" | |
1003b3a5 | 10439 | |
2e8451e8 | 10440 | #: git-submodule.sh:684 |
1003b3a5 | 10441 | #, sh-format |
2e8451e8 JX |
10442 | msgid "Could not remove submodule work tree '$displaypath'" |
10443 | msgstr "无法移除子模组工作区 '$displaypath'" | |
1003b3a5 | 10444 | |
2e8451e8 | 10445 | #: git-submodule.sh:687 |
1003b3a5 | 10446 | #, sh-format |
2e8451e8 JX |
10447 | msgid "Could not create empty submodule directory '$displaypath'" |
10448 | msgstr "不能创建空的子模组目录 '$displaypath'" | |
1003b3a5 | 10449 | |
2e8451e8 | 10450 | #: git-submodule.sh:696 |
1003b3a5 | 10451 | #, sh-format |
2e8451e8 JX |
10452 | msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" |
10453 | msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册" | |
1003b3a5 | 10454 | |
2e8451e8 | 10455 | #: git-submodule.sh:811 |
1003b3a5 JX |
10456 | #, sh-format |
10457 | msgid "" | |
2e8451e8 | 10458 | "Submodule path '$displaypath' not initialized\n" |
c04f5ac3 JX |
10459 | "Maybe you want to use 'update --init'?" |
10460 | msgstr "" | |
2e8451e8 | 10461 | "子模组路径 '$displaypath' 没有初始化\n" |
90e6ef53 | 10462 | "也许您想用 'update --init'?" |
c04f5ac3 | 10463 | |
2e8451e8 | 10464 | #: git-submodule.sh:824 |
c04f5ac3 | 10465 | #, sh-format |
2e8451e8 JX |
10466 | msgid "Unable to find current revision in submodule path '$displaypath'" |
10467 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 10468 | |
2e8451e8 | 10469 | #: git-submodule.sh:833 |
c04f5ac3 | 10470 | #, sh-format |
170e9899 JX |
10471 | msgid "Unable to fetch in submodule path '$sm_path'" |
10472 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 10473 | |
2e8451e8 JX |
10474 | #: git-submodule.sh:857 |
10475 | #, sh-format | |
10476 | msgid "Unable to fetch in submodule path '$displaypath'" | |
10477 | msgstr "无法在子模组路径 '$displaypath' 中获取" | |
10478 | ||
10479 | #: git-submodule.sh:871 | |
c04f5ac3 | 10480 | #, sh-format |
2e8451e8 JX |
10481 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
10482 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 10483 | |
2e8451e8 | 10484 | #: git-submodule.sh:872 |
c04f5ac3 | 10485 | #, sh-format |
2e8451e8 JX |
10486 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
10487 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 10488 | |
2e8451e8 | 10489 | #: git-submodule.sh:877 |
c04f5ac3 | 10490 | #, sh-format |
2e8451e8 JX |
10491 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
10492 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 10493 | |
2e8451e8 | 10494 | #: git-submodule.sh:878 |
c04f5ac3 | 10495 | #, sh-format |
2e8451e8 JX |
10496 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
10497 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 10498 | |
2e8451e8 | 10499 | #: git-submodule.sh:883 |
c04f5ac3 | 10500 | #, sh-format |
2e8451e8 JX |
10501 | msgid "" |
10502 | "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" | |
10503 | msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 10504 | |
2e8451e8 | 10505 | #: git-submodule.sh:884 |
c04f5ac3 | 10506 | #, sh-format |
2e8451e8 JX |
10507 | msgid "Submodule path '$prefix$sm_path': '$command $sha1'" |
10508 | msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'" | |
c04f5ac3 | 10509 | |
2e8451e8 | 10510 | #: git-submodule.sh:889 |
c04f5ac3 | 10511 | #, sh-format |
2e8451e8 JX |
10512 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" |
10513 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
1003b3a5 | 10514 | |
2e8451e8 | 10515 | #: git-submodule.sh:890 |
1003b3a5 | 10516 | #, sh-format |
2e8451e8 JX |
10517 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
10518 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
c04f5ac3 | 10519 | |
2e8451e8 JX |
10520 | #: git-submodule.sh:917 |
10521 | #, sh-format | |
10522 | msgid "Failed to recurse into submodule path '$displaypath'" | |
10523 | msgstr "无法递归进子模组路径 '$displaypath'" | |
10524 | ||
10525 | #: git-submodule.sh:1025 | |
649900bc JX |
10526 | msgid "The --cached option cannot be used with the --files option" |
10527 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 JX |
10528 | |
10529 | #. unexpected type | |
90314792 | 10530 | #: git-submodule.sh:1073 |
b694fbb1 JX |
10531 | #, sh-format |
10532 | msgid "unexpected mode $mod_dst" | |
10533 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 10534 | |
90e6ef53 | 10535 | # 译者:注意保持前导空格 |
90314792 | 10536 | #: git-submodule.sh:1093 |
c04f5ac3 | 10537 | #, sh-format |
2e8451e8 JX |
10538 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
10539 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 10540 | |
90e6ef53 | 10541 | # 译者:注意保持前导空格 |
90314792 | 10542 | #: git-submodule.sh:1096 |
c04f5ac3 | 10543 | #, sh-format |
2e8451e8 JX |
10544 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
10545 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 10546 | |
90e6ef53 | 10547 | # 译者:注意保持前导空格 |
90314792 | 10548 | #: git-submodule.sh:1099 |
c04f5ac3 | 10549 | #, sh-format |
2e8451e8 JX |
10550 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
10551 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 10552 | |
90314792 | 10553 | #: git-submodule.sh:1124 |
c04f5ac3 | 10554 | msgid "blob" |
07432cef | 10555 | msgstr "数据对象" |
c04f5ac3 | 10556 | |
90314792 | 10557 | #: git-submodule.sh:1238 |
1003b3a5 JX |
10558 | #, sh-format |
10559 | msgid "Failed to recurse into submodule path '$sm_path'" | |
10560 | msgstr "无法递归进子模组路径 '$sm_path'" | |
10561 | ||
90314792 | 10562 | #: git-submodule.sh:1302 |
c04f5ac3 | 10563 | #, sh-format |
2e8451e8 JX |
10564 | msgid "Synchronizing submodule url for '$displaypath'" |
10565 | msgstr "为 '$displaypath' 同步子模组 url" | |
10566 | ||
90314792 JX |
10567 | #~ msgid "done\n" |
10568 | #~ msgstr "完成\n" | |
10569 | ||
10570 | #~ msgid "input paths are terminated by a null character" | |
10571 | #~ msgstr "输入路径以null字符终止" | |
10572 | ||
10573 | #~ msgid "" | |
10574 | #~ "The following untracked files would NOT be saved but need to be removed " | |
10575 | #~ "by stash save:" | |
10576 | #~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:" | |
10577 | ||
10578 | #~ msgid "" | |
10579 | #~ "Aborting. Consider using either the --force or --include-untracked option." | |
10580 | #~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。" | |
10581 | ||
2e8451e8 JX |
10582 | #~ msgid "" |
10583 | #~ "the following submodule (or one of its nested submodule)\n" | |
10584 | #~ "uses a .git directory:" | |
10585 | #~ msgid_plural "" | |
10586 | #~ "the following submodules (or one of its nested submodule)\n" | |
10587 | #~ "use a .git directory:" | |
10588 | #~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:" | |
10589 | #~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:" | |
10590 | ||
2e8451e8 JX |
10591 | # 译者:注意保持前导空格 |
10592 | #~ msgid " (fix conflicts and then run \"git am --resolved\")" | |
10593 | #~ msgstr " (解决冲突,然后运行 \"git am --resolved\")" | |
10594 | ||
10595 | # 译者:注意保持前导空格 | |
10596 | #~ msgid " (all conflicts fixed: run \"git commit\")" | |
10597 | #~ msgstr " (解决所有冲突后,执行 \"git commit\")" | |
10598 | ||
10599 | #~ msgid "more than %d trees given: '%s'" | |
10600 | #~ msgstr "提供了超过 %d 个树对象:'%s'" | |
10601 | ||
10602 | #~ msgid "You cannot combine --no-ff with --ff-only." | |
10603 | #~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" | |
10604 | ||
2e8451e8 JX |
10605 | #~ msgid "" |
10606 | #~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" | |
10607 | #~ "(use 'rm -rf' if you really want to remove it including all of its " | |
10608 | #~ "history)" | |
10609 | #~ msgstr "" | |
10610 | #~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n" | |
10611 | #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)" | |
10612 | ||
10613 | #~ msgid "" | |
10614 | #~ "'%s' has changes staged in the index\n" | |
10615 | #~ "(use --cached to keep the file, or -f to force removal)" | |
10616 | #~ msgstr "" | |
10617 | #~ "'%s' 有变更已暂存至索引中\n" | |
10618 | #~ "(使用 --cached 保存文件,或用 -f 强制删除)" | |
10619 | ||
10620 | #~ msgid "show commits where no parent comes before its children" | |
10621 | #~ msgstr "显示提交时以时间为序且父提交不能领先子提交" | |
10622 | ||
10623 | #~ msgid "show the HEAD reference" | |
10624 | #~ msgstr "显示 HEAD 引用" | |
10625 | ||
10626 | #~ msgid "Submodule '$name' ($url) registered for path '$sm_path'" | |
10627 | #~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" | |
10628 | ||
10629 | #~ msgid "Change flags" | |
10630 | #~ msgstr "修改参数" | |
10631 | ||
10632 | #~ msgid "" | |
10633 | #~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean." | |
10634 | #~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。" | |
10635 | ||
10636 | #~ msgid "Failed to recurse into submodule path '$prefix$sm_path'" | |
10637 | #~ msgstr "无法递归进子模组路径 '$prefix$sm_path'" | |
07432cef | 10638 | |
4dcdc3d8 JX |
10639 | #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" |
10640 | #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" | |
10641 | ||
10642 | #~ msgid "See 'git help <command>' for more information on a specific command." | |
10643 | #~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" | |
10644 | ||
10645 | #~ msgid "BUG: impossible combination of %d and %p" | |
10646 | #~ msgstr "BUG: 无法组合 %d 和 %p" | |
10647 | ||
10648 | # 译者:以下三条实际为一个段落 | |
10649 | #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" | |
10650 | #~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'" | |
10651 | ||
10652 | # 译者:为对齐,下面两句内容有调整 | |
10653 | #~ msgid "may speed it up, but you have to be careful not to forget to add" | |
10654 | #~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件" | |
10655 | ||
10656 | #~ msgid "new files yourself (see 'git help status')." | |
10657 | #~ msgstr "(参见 'git help status')。" | |
10658 | ||
1003b3a5 JX |
10659 | #~ msgid "use any ref in .git/refs" |
10660 | #~ msgstr "使用 .git/refs 里的任意引用" | |
10661 | ||
10662 | #~ msgid "use any tag in .git/refs/tags" | |
10663 | #~ msgstr "使用 .git/refs/tags 里的任意 tag" | |
10664 | ||
10665 | #~ msgid "bad object %s" | |
10666 | #~ msgstr "坏对象 %s" | |
10667 | ||
10668 | #~ msgid "bogus committer info %s" | |
10669 | #~ msgstr "虚假的提交者信息 %s" | |
10670 | ||
a77c07d9 JX |
10671 | #~ msgid "can't fdopen 'show' output fd" |
10672 | #~ msgstr "不能打开 'show' 输出文件句柄" | |
10673 | ||
10674 | #~ msgid "failed to close pipe to 'show' for object '%s'" | |
10675 | #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道" | |
10676 | ||
07432cef WS |
10677 | #~ msgid " 0 files changed" |
10678 | #~ msgstr " 0 个文件被修改" | |
10679 | ||
10680 | #~ msgid " %d file changed" | |
10681 | #~ msgid_plural " %d files changed" | |
10682 | #~ msgstr[0] " %d 个文件被修改" | |
10683 | #~ msgstr[1] " %d 个文件被修改" | |
10684 | ||
10685 | #~ msgid ", %d insertion(+)" | |
10686 | #~ msgid_plural ", %d insertions(+)" | |
10687 | #~ msgstr[0] ",插入 %d 行(+)" | |
10688 | #~ msgstr[1] ",插入 %d 行(+)" | |
10689 | ||
10690 | #~ msgid ", %d deletion(-)" | |
10691 | #~ msgid_plural ", %d deletions(-)" | |
10692 | #~ msgstr[0] ",删除 %d 行(-)" | |
10693 | #~ msgstr[1] ",删除 %d 行(-)" | |
10694 | ||
10695 | #~ msgid "You do not have a valid HEAD" | |
10696 | #~ msgstr "您没有一个有效的 HEAD" | |
10697 | ||
10698 | #~ msgid "oops" | |
10699 | #~ msgstr "哎哟" | |
10700 | ||
10701 | #~ msgid "Would not remove %s\n" | |
10702 | #~ msgstr "不会删除 %s\n" | |
10703 | ||
10704 | #~ msgid "Not removing %s\n" | |
10705 | #~ msgstr "未删除 %s\n" | |
10706 | ||
10707 | #~ msgid "Auto packing the repository for optimum performance.\n" | |
10708 | #~ msgstr "自动打包版本库以求最佳性能。\n" | |
10709 | ||
10710 | #~ msgid "git remote set-head <name> (-a | -d | <branch>])" | |
10711 | #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])" | |
10712 | ||
10713 | #~ msgid "Could not read index" | |
10714 | #~ msgstr "不能读取索引" | |
c160d03f | 10715 | |
ef317cd5 JX |
10716 | # 译者:中文字符串拼接,可删除前导空格 |
10717 | #~ msgid " (use \"git add\" to track)" | |
10718 | #~ msgstr "(使用 \"git add\" 建立跟踪)" | |
10719 | ||
10720 | #~ msgid "-B cannot be used with -b" | |
10721 | #~ msgstr "-B 不能和 -b 同时使用" | |
10722 | ||
ef317cd5 JX |
10723 | #~ msgid "--detach cannot be used with -b/-B/--orphan" |
10724 | #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用" | |
10725 | ||
10726 | #~ msgid "--detach cannot be used with -t" | |
10727 | #~ msgstr "--detach 不能和 -t 同时使用" | |
10728 | ||
10729 | #~ msgid "--orphan and -b|-B are mutually exclusive" | |
10730 | #~ msgstr "--orphan 和 -b|-B 互斥" | |
10731 | ||
10732 | #~ msgid "--orphan cannot be used with -t" | |
10733 | #~ msgstr "--orphan 不能和 -t 同时使用" | |
10734 | ||
10735 | #~ msgid "git checkout: -f and -m are incompatible" | |
10736 | #~ msgstr "git checkout:-f 和 -m 不兼容" | |
10737 | ||
10738 | #~ msgid "" | |
10739 | #~ "git checkout: updating paths is incompatible with switching branches." | |
10740 | #~ msgstr "git checkout:更新路径和切换分支不兼容。" | |
10741 | ||
c160d03f JX |
10742 | #~ msgid "diff setup failed" |
10743 | #~ msgstr "diff 设置失败" | |
10744 | ||
10745 | #~ msgid "merge-recursive: disk full?" | |
10746 | #~ msgstr "merge-recursive:磁盘已满?" | |
10747 | ||
10748 | #~ msgid "diff_setup_done failed" | |
10749 | #~ msgstr "diff_setup_done 失败" |