]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - po/zh_CN.po
l10n: pt_PT: update Portuguese translation
[thirdparty/git.git] / po / zh_CN.po
... / ...
CommitLineData
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4# This file is distributed under the same license as the Git package.
5# Contributors:
6# - Jiang Xin <worldhello.net AT gmail.com>
7# - Lian Cheng <rhythm.mail AT gmail.com>
8# - Ray Chen <oldsharp AT gmail.com>
9# - Riku <lu.riku AT gmail.com>
10# - Thynson <lanxingcan AT gmail.com>
11# - ws3389 <willsmith3389 AT gmail.com>
12# - Wang Sheng <wangsheng2008love AT 163.com>
13# - Yichao Yu <yyc1992 AT gmail.com>
14# - Zhuang Ya <zhuangya AT me.com>
15#
16# Git glossary for Chinese translators
17#
18# English | Chinese
19# ---------------------------------+--------------------------------------
20# 3-way merge | 三方合并
21# abbreviate | 简写(的 SHA-1 值)
22# alternate object database | 备用对象库
23# amend | 修补
24# ancestor | 祖先,祖先提交
25# annotated tag | 附注标签
26# bare repository | 纯仓库
27# bisect | 二分查找
28# blob object | 数据对象
29# branch | 分支
30# bundle | 包
31# bypass | 绕过
32# cache | 索引(的别称)
33# chain | (提交)链
34# changeset | 变更集
35# checkout | 检出
36# checksum | 校验,校验和
37# cherry-picking | 拣选
38# clean | 干净(的工作区)
39# clone | 克隆
40# commit | 提交
41# commit message | 提交说明
42# commit object | 提交对象
43# commit-ish (also committish) | 提交号
44# conflict | 冲突
45# core Git | 核心 Git 工具
46# DAG | 有向无环图
47# dangling object | 摇摆对象
48# detached HEAD | 分离头指针
49# directory | 目录
50# dirty | 脏(的工作区)
51# dumb HTTP protocol | 哑 HTTP 协议
52# evil merge | 坏合并(合并引入了父提交没有的修改)
53# fast-forward | 快进
54# fetch | 获取
55# file system | 文件系统
56# fork | 派生
57# Git archive | 仓库(对于 arch 用户)
58# gitfile | gitfile(仓库链接文件)
59# grafts | (提交)嫁接
60# hash | 哈希值
61# HEAD | HEAD(头指针,亦即当前分支)
62# head | 头、分支
63# head ref | 分支
64# header | 头信息
65# hook | 钩子
66# hunk | 补丁片段
67# index | 索引
68# index entry | 索引条目
69# loose object | 松散对象
70# loose refs | 松散引用
71# master | master(默认分支名)
72# merge | 合并
73# object | 对象
74# object database | 对象库
75# object identifier | 对象标识符
76# object name | 对象名称
77# object type | 对象类型
78# octopus | 章鱼式合并(两分支以上的合并)
79# origin | origin(默认的远程名称)
80# pack | 包
81# pack index | 包索引
82# packfile | 包文件
83# parent | 父提交
84# patch | 补丁
85# pathspec | 路径规格
86# pattern | 模式
87# pickaxe | 挖掘
88# plumbing | 管件(Git 底层核心命令的别称)
89# porcelain | 瓷件(Git 上层封装命令的别称)
90# precious-objects repo | 珍品仓库
91# prune | 清除
92# pull | 拉,拉取
93# push | 推,推送
94# reachable | 可达
95# rebase | 变基
96# ref | 引用
97# reflog | 引用日志
98# refspec | 引用规格
99# remote | 远程,远程仓库
100# remote-tracking branch | 远程跟踪分支
101# replay | 重放
102# repo | 仓库
103# repository | 仓库
104# resolve | (冲突)解决
105# revert | 还原
106# revision | 版本
107# rewind | 回退
108# SCM | 源代码管理(工具)
109# SHA-1 | SHA-1(安全哈希算法1)
110# shallow repository | 浅(克隆)仓库
111# signed tag | 签名标签
112# smart HTTP protocol | 智能 HTTP 协议
113# squash | 压缩
114# stage | n. 暂存区(即索引); v. 暂存
115# stash | n. 进度保存; v. 保存进度
116# submodule | 子模组
117# symref | 符号引用
118# tag | n. 标签; v. 打标签
119# tag object | 标签对象
120# tagger | 打标签者
121# topic branch | 主题分支
122# track | 跟踪
123# tree | 树(工作区或树对象)
124# tree object | 树对象
125# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
126# unmerged index | 未合并索引
127# unpack | 解包
128# unreachable object | 不可达对象
129# unstage | 取消暂存
130# upstream | 上游
131# upstream branch | 上游分支
132# working tree | 工作区
133#
134msgid ""
135msgstr ""
136"Project-Id-Version: Git\n"
137"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138"POT-Creation-Date: 2016-03-16 00:16+0800\n"
139"PO-Revision-Date: 2016-03-16 00:18+0800\n"
140"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
142"Language: zh_CN\n"
143"MIME-Version: 1.0\n"
144"Content-Type: text/plain; charset=UTF-8\n"
145"Content-Transfer-Encoding: 8bit\n"
146"Plural-Forms: nplurals=2; plural=(n != 1);\n"
147
148#: advice.c:55
149#, c-format
150msgid "hint: %.*s\n"
151msgstr "提示:%.*s\n"
152
153#: advice.c:88
154msgid ""
155"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
156"as appropriate to mark resolution and make a commit."
157msgstr ""
158"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
159"解决方案并提交。"
160
161#: advice.c:101 builtin/merge.c:1226
162msgid "You have not concluded your merge (MERGE_HEAD exists)."
163msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
164
165#: advice.c:103
166msgid "Please, commit your changes before merging."
167msgstr "请在合并前先提交您的修改。"
168
169#: advice.c:104
170msgid "Exiting because of unfinished merge."
171msgstr "因为存在未完成的合并而退出。"
172
173#: archive.c:12
174msgid "git archive [<options>] <tree-ish> [<path>...]"
175msgstr "git archive [<选项>] <树或提交> [<路径>...]"
176
177#: archive.c:13
178msgid "git archive --list"
179msgstr "git archive --list"
180
181#: archive.c:14
182msgid ""
183"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
184msgstr ""
185"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
186
187#: archive.c:15
188msgid "git archive --remote <repo> [--exec <cmd>] --list"
189msgstr "git archive --remote <仓库> [--exec <命令>] --list"
190
191#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
192#, c-format
193msgid "pathspec '%s' did not match any files"
194msgstr "路径规格 '%s' 未匹配任何文件"
195
196#: archive.c:429
197msgid "fmt"
198msgstr "格式"
199
200#: archive.c:429
201msgid "archive format"
202msgstr "归档格式"
203
204#: archive.c:430 builtin/log.c:1232
205msgid "prefix"
206msgstr "前缀"
207
208#: archive.c:431
209msgid "prepend prefix to each pathname in the archive"
210msgstr "为归档中每个路径名加上前缀"
211
212#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
213#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
214#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
215#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
216#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
217msgid "file"
218msgstr "文件"
219
220#: archive.c:433 builtin/archive.c:89
221msgid "write the archive to this file"
222msgstr "归档写入此文件"
223
224#: archive.c:435
225msgid "read .gitattributes in working directory"
226msgstr "读取工作区中的 .gitattributes"
227
228#: archive.c:436
229msgid "report archived files on stderr"
230msgstr "在标准错误上报告归档文件"
231
232#: archive.c:437
233msgid "store only"
234msgstr "只存储"
235
236#: archive.c:438
237msgid "compress faster"
238msgstr "压缩速度更快"
239
240#: archive.c:446
241msgid "compress better"
242msgstr "压缩效果更好"
243
244#: archive.c:449
245msgid "list supported archive formats"
246msgstr "列出支持的归档格式"
247
248#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
249msgid "repo"
250msgstr "仓库"
251
252#: archive.c:452 builtin/archive.c:91
253msgid "retrieve the archive from remote repository <repo>"
254msgstr "从远程仓库(<仓库>)提取归档文件"
255
256#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
257msgid "command"
258msgstr "命令"
259
260#: archive.c:454 builtin/archive.c:93
261msgid "path to the remote git-upload-archive command"
262msgstr "远程 git-upload-archive 命令的路径"
263
264#: attr.c:263
265msgid ""
266"Negative patterns are ignored in git attributes\n"
267"Use '\\!' for literal leading exclamation."
268msgstr ""
269"负值模版在 git attributes 中被忽略\n"
270"当字符串确实要以感叹号开始时,使用 '\\!'。"
271
272#: branch.c:53
273#, c-format
274msgid ""
275"\n"
276"After fixing the error cause you may try to fix up\n"
277"the remote tracking information by invoking\n"
278"\"git branch --set-upstream-to=%s%s%s\"."
279msgstr ""
280"\n"
281"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
282"\"git branch --set-upstream-to=%s%s%s\" 。"
283
284#: branch.c:67
285#, c-format
286msgid "Not setting branch %s as its own upstream."
287msgstr "未设置分支 %s 作为它自己的上游。"
288
289#: branch.c:93
290#, c-format
291msgid "Branch %s set up to track remote branch %s from %s by rebasing."
292msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
293
294#: branch.c:94
295#, c-format
296msgid "Branch %s set up to track remote branch %s from %s."
297msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
298
299#: branch.c:98
300#, c-format
301msgid "Branch %s set up to track local branch %s by rebasing."
302msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
303
304#: branch.c:99
305#, c-format
306msgid "Branch %s set up to track local branch %s."
307msgstr "分支 %s 设置为跟踪本地分支 %s。"
308
309#: branch.c:104
310#, c-format
311msgid "Branch %s set up to track remote ref %s by rebasing."
312msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
313
314#: branch.c:105
315#, c-format
316msgid "Branch %s set up to track remote ref %s."
317msgstr "分支 %s 设置为跟踪远程引用 %s。"
318
319#: branch.c:109
320#, c-format
321msgid "Branch %s set up to track local ref %s by rebasing."
322msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
323
324#: branch.c:110
325#, c-format
326msgid "Branch %s set up to track local ref %s."
327msgstr "分支 %s 设置为跟踪本地引用 %s。"
328
329#: branch.c:119
330msgid "Unable to write upstream branch configuration"
331msgstr "无法写入上游分支配置"
332
333#: branch.c:156
334#, c-format
335msgid "Not tracking: ambiguous information for ref %s"
336msgstr "未跟踪:引用 %s 有歧义"
337
338#: branch.c:185
339#, c-format
340msgid "'%s' is not a valid branch name."
341msgstr "'%s' 不是一个有效的分支名称。"
342
343#: branch.c:190
344#, c-format
345msgid "A branch named '%s' already exists."
346msgstr "一个分支名 '%s' 已经存在。"
347
348#: branch.c:198
349msgid "Cannot force update the current branch."
350msgstr "无法强制更新当前分支。"
351
352#: branch.c:218
353#, c-format
354msgid "Cannot setup tracking information; starting point '%s' is not a branch."
355msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
356
357#: branch.c:220
358#, c-format
359msgid "the requested upstream branch '%s' does not exist"
360msgstr "请求的上游分支 '%s' 不存在"
361
362#: branch.c:222
363msgid ""
364"\n"
365"If you are planning on basing your work on an upstream\n"
366"branch that already exists at the remote, you may need to\n"
367"run \"git fetch\" to retrieve it.\n"
368"\n"
369"If you are planning to push out a new local branch that\n"
370"will track its remote counterpart, you may want to use\n"
371"\"git push -u\" to set the upstream config as you push."
372msgstr ""
373"\n"
374"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
375"您可能需要执行 \"git fetch\" 来获取分支。\n"
376"\n"
377"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
378"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
379
380#: branch.c:266
381#, c-format
382msgid "Not a valid object name: '%s'."
383msgstr "不是一个有效的对象名:'%s'。"
384
385#: branch.c:286
386#, c-format
387msgid "Ambiguous object name: '%s'."
388msgstr "歧义的对象名:'%s'。"
389
390#: branch.c:291
391#, c-format
392msgid "Not a valid branch point: '%s'."
393msgstr "无效的分支点:'%s'。"
394
395#: branch.c:344
396#, c-format
397msgid "'%s' is already checked out at '%s'"
398msgstr "'%s' 已经检出到 '%s'"
399
400#: bundle.c:34
401#, c-format
402msgid "'%s' does not look like a v2 bundle file"
403msgstr "'%s' 不像是一个 v2 版本的包文件"
404
405#: bundle.c:61
406#, c-format
407msgid "unrecognized header: %s%s (%d)"
408msgstr "未能识别的包头:%s%s (%d)"
409
410#: bundle.c:87 builtin/commit.c:766
411#, c-format
412msgid "could not open '%s'"
413msgstr "不能打开 '%s'"
414
415#: bundle.c:139
416msgid "Repository lacks these prerequisite commits:"
417msgstr "仓库中缺少这些必备的提交:"
418
419#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
420#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
421#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
422#: builtin/shortlog.c:170
423msgid "revision walk setup failed"
424msgstr "版本遍历设置失败"
425
426#: bundle.c:185
427#, c-format
428msgid "The bundle contains this ref:"
429msgid_plural "The bundle contains these %d refs:"
430msgstr[0] "这个包中含有这个引用:"
431msgstr[1] "这个包中含有 %d 个引用:"
432
433#: bundle.c:192
434msgid "The bundle records a complete history."
435msgstr "这个包记录一个完整历史。"
436
437#: bundle.c:194
438#, c-format
439msgid "The bundle requires this ref:"
440msgid_plural "The bundle requires these %d refs:"
441msgstr[0] "这个包需要这个引用:"
442msgstr[1] "这个包需要 %d 个引用:"
443
444#: bundle.c:253
445msgid "Could not spawn pack-objects"
446msgstr "不能生成 pack-objects 进程"
447
448#: bundle.c:264
449msgid "pack-objects died"
450msgstr "pack-objects 终止"
451
452#: bundle.c:304
453msgid "rev-list died"
454msgstr "rev-list 终止"
455
456#: bundle.c:353
457#, c-format
458msgid "ref '%s' is excluded by the rev-list options"
459msgstr "引用 '%s' 被 rev-list 选项排除"
460
461#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
462#, c-format
463msgid "unrecognized argument: %s"
464msgstr "未能识别的参数:%s"
465
466#: bundle.c:449
467msgid "Refusing to create empty bundle."
468msgstr "不能创建空包。"
469
470#: bundle.c:459
471#, c-format
472msgid "cannot create '%s'"
473msgstr "不能创建 '%s'"
474
475#: bundle.c:480
476msgid "index-pack died"
477msgstr "index-pack 终止"
478
479#: color.c:275
480#, c-format
481msgid "invalid color value: %.*s"
482msgstr "无效的颜色值:%.*s"
483
484#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
485#: builtin/am.c:2135
486#, c-format
487msgid "could not parse %s"
488msgstr "不能解析 %s"
489
490#: commit.c:42
491#, c-format
492msgid "%s %s is not a commit!"
493msgstr "%s %s 不是一个提交!"
494
495#: compat/obstack.c:406 compat/obstack.c:408
496msgid "memory exhausted"
497msgstr "内存耗尽"
498
499#: config.c:475 config.c:477
500#, c-format
501msgid "bad config line %d in %s %s"
502msgstr "%2$s %3$s 出错于第 %1$d 行"
503
504#: config.c:593
505#, c-format
506msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
507msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s"
508
509#: config.c:595
510#, c-format
511msgid "bad numeric config value '%s' for '%s': %s"
512msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
513
514#: config.c:680
515#, c-format
516msgid "failed to expand user dir in: '%s'"
517msgstr "无法扩展 '%s' 中的用户目录"
518
519#: config.c:758 config.c:769
520#, c-format
521msgid "bad zlib compression level %d"
522msgstr "错误的 zlib 压缩级别 %d"
523
524#: config.c:891
525#, c-format
526msgid "invalid mode for object creation: %s"
527msgstr "无效的对象创建模式:%s"
528
529#: config.c:1220
530msgid "unable to parse command-line config"
531msgstr "无法解析命令行中的配置"
532
533#: config.c:1281
534msgid "unknown error occured while reading the configuration files"
535msgstr "在读取配置文件时遇到未知错误"
536
537#: config.c:1629
538#, c-format
539msgid "unable to parse '%s' from command-line config"
540msgstr "无法解析命令行配置中的 '%s'"
541
542#: config.c:1631
543#, c-format
544msgid "bad config variable '%s' in file '%s' at line %d"
545msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
546
547#: config.c:1690
548#, c-format
549msgid "%s has multiple values"
550msgstr "%s 有多个取值"
551
552#: config.c:2226
553#, c-format
554msgid "Could not set '%s' to '%s'"
555msgstr "不能设置 '%s' 为 '%s'"
556
557#: connected.c:69
558msgid "Could not run 'git rev-list'"
559msgstr "不能执行 'git rev-list'"
560
561#: connected.c:89
562#, c-format
563msgid "failed write to rev-list: %s"
564msgstr "无法写入 rev-list:%s"
565
566#: connected.c:97
567#, c-format
568msgid "failed to close rev-list's stdin: %s"
569msgstr "无法关闭 rev-list 的标准输入:%s"
570
571#: date.c:95
572msgid "in the future"
573msgstr "在将来"
574
575#: date.c:101
576#, c-format
577msgid "%lu second ago"
578msgid_plural "%lu seconds ago"
579msgstr[0] "%lu 秒钟前"
580msgstr[1] "%lu 秒钟前"
581
582#: date.c:108
583#, c-format
584msgid "%lu minute ago"
585msgid_plural "%lu minutes ago"
586msgstr[0] "%lu 分钟前"
587msgstr[1] "%lu 分钟前"
588
589#: date.c:115
590#, c-format
591msgid "%lu hour ago"
592msgid_plural "%lu hours ago"
593msgstr[0] "%lu 小时前"
594msgstr[1] "%lu 小时前"
595
596#: date.c:122
597#, c-format
598msgid "%lu day ago"
599msgid_plural "%lu days ago"
600msgstr[0] "%lu 天前"
601msgstr[1] "%lu 天前"
602
603#: date.c:128
604#, c-format
605msgid "%lu week ago"
606msgid_plural "%lu weeks ago"
607msgstr[0] "%lu 周前"
608msgstr[1] "%lu 周前"
609
610#: date.c:135
611#, c-format
612msgid "%lu month ago"
613msgid_plural "%lu months ago"
614msgstr[0] "%lu 个月前"
615msgstr[1] "%lu 个月前"
616
617#: date.c:146
618#, c-format
619msgid "%lu year"
620msgid_plural "%lu years"
621msgstr[0] "%lu 年"
622msgstr[1] "%lu 年"
623
624#. TRANSLATORS: "%s" is "<n> years"
625#: date.c:149
626#, c-format
627msgid "%s, %lu month ago"
628msgid_plural "%s, %lu months ago"
629msgstr[0] "%s %lu 个月前"
630msgstr[1] "%s %lu 个月前"
631
632#: date.c:154 date.c:159
633#, c-format
634msgid "%lu year ago"
635msgid_plural "%lu years ago"
636msgstr[0] "%lu 年前"
637msgstr[1] "%lu 年前"
638
639#: diffcore-order.c:24
640#, c-format
641msgid "failed to read orderfile '%s'"
642msgstr "无法读取排序文件 '%s'"
643
644#: diffcore-rename.c:536
645msgid "Performing inexact rename detection"
646msgstr "正在进行非精确的重命名检测"
647
648# 译者:注意保持前导空格
649#: diff.c:115
650#, c-format
651msgid " Failed to parse dirstat cut-off percentage '%s'\n"
652msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
653
654# 译者:注意保持前导空格
655#: diff.c:120
656#, c-format
657msgid " Unknown dirstat parameter '%s'\n"
658msgstr " 未知的 dirstat 参数 '%s'\n"
659
660#: diff.c:215
661#, c-format
662msgid "Unknown value for 'diff.submodule' config variable: '%s'"
663msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
664
665#: diff.c:267
666#, c-format
667msgid ""
668"Found errors in 'diff.dirstat' config variable:\n"
669"%s"
670msgstr ""
671"发现配置变量 'diff.dirstat' 中的错误:\n"
672"%s"
673
674#: diff.c:2997
675#, c-format
676msgid "external diff died, stopping at %s"
677msgstr "外部 diff 退出,停止在 %s"
678
679#: diff.c:3393
680msgid "--follow requires exactly one pathspec"
681msgstr "--follow 参数后只跟一个 pathspec"
682
683#: diff.c:3556
684#, c-format
685msgid ""
686"Failed to parse --dirstat/-X option parameter:\n"
687"%s"
688msgstr ""
689"无法解析 --dirstat/-X 选项的参数:\n"
690"%s"
691
692#: diff.c:3570
693#, c-format
694msgid "Failed to parse --submodule option parameter: '%s'"
695msgstr "无法解析 --submodule 选项的参数:'%s'"
696
697#: dir.c:2004
698msgid "failed to get kernel name and information"
699msgstr "无法获得内核名称和信息"
700
701#: dir.c:2123
702msgid "Untracked cache is disabled on this system or location."
703msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
704
705#: gpg-interface.c:166 gpg-interface.c:237
706msgid "could not run gpg."
707msgstr "不能执行 gpg。"
708
709#: gpg-interface.c:178
710msgid "gpg did not accept the data"
711msgstr "gpg 没有接受数据"
712
713#: gpg-interface.c:189
714msgid "gpg failed to sign the data"
715msgstr "gpg 无法为数据签名"
716
717#: gpg-interface.c:222
718#, c-format
719msgid "could not create temporary file '%s': %s"
720msgstr "不能创建临时文件 '%s':%s"
721
722#: gpg-interface.c:225
723#, c-format
724msgid "failed writing detached signature to '%s': %s"
725msgstr "无法将分离式签名写入 '%s':%s"
726
727#: grep.c:1718
728#, c-format
729msgid "'%s': unable to read %s"
730msgstr "'%s':无法读取 %s"
731
732#: grep.c:1735
733#, c-format
734msgid "'%s': %s"
735msgstr "'%s':%s"
736
737#: grep.c:1746
738#, c-format
739msgid "'%s': short read %s"
740msgstr "'%s':读取不完整 %s"
741
742#: help.c:205
743#, c-format
744msgid "available git commands in '%s'"
745msgstr "在 '%s' 下可用的 git 命令"
746
747#: help.c:212
748msgid "git commands available from elsewhere on your $PATH"
749msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
750
751#: help.c:244
752msgid "These are common Git commands used in various situations:"
753msgstr "这些是各种场合常见的 Git 命令:"
754
755#: help.c:309
756#, c-format
757msgid ""
758"'%s' appears to be a git command, but we were not\n"
759"able to execute it. Maybe git-%s is broken?"
760msgstr ""
761"'%s' 像是一个 git 命令,但却无法运行。\n"
762"可能是 git-%s 受损?"
763
764#: help.c:366
765msgid "Uh oh. Your system reports no Git commands at all."
766msgstr "唉呀,您的系统中未发现 Git 命令。"
767
768#: help.c:388
769#, c-format
770msgid ""
771"WARNING: You called a Git command named '%s', which does not exist.\n"
772"Continuing under the assumption that you meant '%s'"
773msgstr ""
774"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
775"是 '%s'"
776
777#: help.c:393
778#, c-format
779msgid "in %0.1f seconds automatically..."
780msgstr "在 %0.1f 秒钟后自动运行..."
781
782#: help.c:400
783#, c-format
784msgid "git: '%s' is not a git command. See 'git --help'."
785msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
786
787#: help.c:404 help.c:464
788msgid ""
789"\n"
790"Did you mean this?"
791msgid_plural ""
792"\n"
793"Did you mean one of these?"
794msgstr[0] ""
795"\n"
796"您指的是这个么?"
797msgstr[1] ""
798"\n"
799"您指的是这其中的某一个么?"
800
801#: help.c:460
802#, c-format
803msgid "%s: %s - %s"
804msgstr "%s:%s - %s"
805
806#: merge.c:41
807msgid "failed to read the cache"
808msgstr "无法读取缓存"
809
810#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
811#: builtin/checkout.c:587 builtin/clone.c:730
812msgid "unable to write new index file"
813msgstr "无法写新的索引文件"
814
815#: merge-recursive.c:189
816#, c-format
817msgid "(bad commit)\n"
818msgstr "(坏提交)\n"
819
820#: merge-recursive.c:209
821#, c-format
822msgid "addinfo_cache failed for path '%s'"
823msgstr "为路径 '%s' addinfo_cache 失败"
824
825#: merge-recursive.c:270
826msgid "error building trees"
827msgstr "无法创建树"
828
829#: merge-recursive.c:689
830#, c-format
831msgid "failed to create path '%s'%s"
832msgstr "无法创建路径 '%s'%s"
833
834#: merge-recursive.c:700
835#, c-format
836msgid "Removing %s to make room for subdirectory\n"
837msgstr "删除 %s 以便为子目录留出空间\n"
838
839#: merge-recursive.c:714 merge-recursive.c:735
840msgid ": perhaps a D/F conflict?"
841msgstr ":可能是一个目录/文件冲突?"
842
843#: merge-recursive.c:725
844#, c-format
845msgid "refusing to lose untracked file at '%s'"
846msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
847
848#: merge-recursive.c:765
849#, c-format
850msgid "cannot read object %s '%s'"
851msgstr "不能读取对象 %s '%s'"
852
853#: merge-recursive.c:767
854#, c-format
855msgid "blob expected for %s '%s'"
856msgstr "%s '%s' 应为数据对象"
857
858#: merge-recursive.c:790 builtin/clone.c:374
859#, c-format
860msgid "failed to open '%s'"
861msgstr "无法打开 '%s'"
862
863#: merge-recursive.c:798
864#, c-format
865msgid "failed to symlink '%s'"
866msgstr "无法创建符号链接 '%s'"
867
868#: merge-recursive.c:801
869#, c-format
870msgid "do not know what to do with %06o %s '%s'"
871msgstr "不知道如何处理 %06o %s '%s'"
872
873#: merge-recursive.c:939
874msgid "Failed to execute internal merge"
875msgstr "无法执行内部合并"
876
877#: merge-recursive.c:943
878#, c-format
879msgid "Unable to add %s to database"
880msgstr "不能添加 %s 至对象库"
881
882#: merge-recursive.c:959
883msgid "unsupported object type in the tree"
884msgstr "在树中有不支持的对象类型"
885
886#: merge-recursive.c:1034 merge-recursive.c:1048
887#, c-format
888msgid ""
889"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
890"in tree."
891msgstr ""
892"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
893"的版本被保留。"
894
895#: merge-recursive.c:1040 merge-recursive.c:1053
896#, c-format
897msgid ""
898"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
899"in tree at %s."
900msgstr ""
901"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
902"的版本保留于 %8$s 中。"
903
904#: merge-recursive.c:1094
905msgid "rename"
906msgstr "重命名"
907
908#: merge-recursive.c:1094
909msgid "renamed"
910msgstr "重命名"
911
912#: merge-recursive.c:1150
913#, c-format
914msgid "%s is a directory in %s adding as %s instead"
915msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
916
917#: merge-recursive.c:1172
918#, c-format
919msgid ""
920"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
921"\"->\"%s\" in \"%s\"%s"
922msgstr ""
923"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
924"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
925
926#: merge-recursive.c:1177
927msgid " (left unresolved)"
928msgstr "(留下未解决)"
929
930#: merge-recursive.c:1231
931#, c-format
932msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
933msgstr ""
934"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
935"%5$s"
936
937#: merge-recursive.c:1261
938#, c-format
939msgid "Renaming %s to %s and %s to %s instead"
940msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
941
942#: merge-recursive.c:1460
943#, c-format
944msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
945msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
946
947#: merge-recursive.c:1470
948#, c-format
949msgid "Adding merged %s"
950msgstr "添加合并后的 %s"
951
952#: merge-recursive.c:1475 merge-recursive.c:1677
953#, c-format
954msgid "Adding as %s instead"
955msgstr "而是以 %s 为名添加"
956
957#: merge-recursive.c:1526
958#, c-format
959msgid "cannot read object %s"
960msgstr "不能读取对象 %s"
961
962#: merge-recursive.c:1529
963#, c-format
964msgid "object %s is not a blob"
965msgstr "对象 %s 不是一个数据对象"
966
967#: merge-recursive.c:1581
968msgid "modify"
969msgstr "修改"
970
971#: merge-recursive.c:1581
972msgid "modified"
973msgstr "修改"
974
975#: merge-recursive.c:1591
976msgid "content"
977msgstr "内容"
978
979#: merge-recursive.c:1598
980msgid "add/add"
981msgstr "添加/添加"
982
983#: merge-recursive.c:1632
984#, c-format
985msgid "Skipped %s (merged same as existing)"
986msgstr "略过 %s(已经做过相同合并)"
987
988#: merge-recursive.c:1646
989#, c-format
990msgid "Auto-merging %s"
991msgstr "自动合并 %s"
992
993#: merge-recursive.c:1650 git-submodule.sh:1048
994msgid "submodule"
995msgstr "子模组"
996
997#: merge-recursive.c:1651
998#, c-format
999msgid "CONFLICT (%s): Merge conflict in %s"
1000msgstr "冲突(%s):合并冲突于 %s"
1001
1002#: merge-recursive.c:1737
1003#, c-format
1004msgid "Removing %s"
1005msgstr "删除 %s"
1006
1007#: merge-recursive.c:1762
1008msgid "file/directory"
1009msgstr "文件/目录"
1010
1011#: merge-recursive.c:1768
1012msgid "directory/file"
1013msgstr "目录/文件"
1014
1015#: merge-recursive.c:1773
1016#, c-format
1017msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1018msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1019
1020#: merge-recursive.c:1783
1021#, c-format
1022msgid "Adding %s"
1023msgstr "添加 %s"
1024
1025#: merge-recursive.c:1800
1026msgid "Fatal merge failure, shouldn't happen."
1027msgstr "严重的合并错误,不应发生。"
1028
1029#: merge-recursive.c:1819
1030msgid "Already up-to-date!"
1031msgstr "已经是最新的!"
1032
1033#: merge-recursive.c:1828
1034#, c-format
1035msgid "merging of trees %s and %s failed"
1036msgstr "无法合并树 %s 和 %s"
1037
1038#: merge-recursive.c:1858
1039#, c-format
1040msgid "Unprocessed path??? %s"
1041msgstr "未处理的路径??? %s"
1042
1043#: merge-recursive.c:1906
1044msgid "Merging:"
1045msgstr "合并:"
1046
1047#: merge-recursive.c:1919
1048#, c-format
1049msgid "found %u common ancestor:"
1050msgid_plural "found %u common ancestors:"
1051msgstr[0] "发现 %u 个共同祖先:"
1052msgstr[1] "发现 %u 个共同祖先:"
1053
1054#: merge-recursive.c:1956
1055msgid "merge returned no commit"
1056msgstr "合并未返回提交"
1057
1058#: merge-recursive.c:2013
1059#, c-format
1060msgid "Could not parse object '%s'"
1061msgstr "不能解析对象 '%s'"
1062
1063#: merge-recursive.c:2024 builtin/merge.c:646
1064msgid "Unable to write index."
1065msgstr "不能写入索引。"
1066
1067#: notes-utils.c:41
1068msgid "Cannot commit uninitialized/unreferenced notes tree"
1069msgstr "不能提交未初始化/未引用的注解树"
1070
1071#: notes-utils.c:100
1072#, c-format
1073msgid "Bad notes.rewriteMode value: '%s'"
1074msgstr "坏的 notes.rewriteMode 值:'%s'"
1075
1076#: notes-utils.c:110
1077#, c-format
1078msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1079msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1080
1081#. TRANSLATORS: The first %s is the name of the
1082#. environment variable, the second %s is its value
1083#: notes-utils.c:137
1084#, c-format
1085msgid "Bad %s value: '%s'"
1086msgstr "坏的 %s 值:'%s'"
1087
1088#: object.c:242
1089#, c-format
1090msgid "unable to parse object: %s"
1091msgstr "不能解析对象:%s"
1092
1093#: parse-options.c:570
1094msgid "..."
1095msgstr "..."
1096
1097#: parse-options.c:588
1098#, c-format
1099msgid "usage: %s"
1100msgstr "用法:%s"
1101
1102#. TRANSLATORS: the colon here should align with the
1103#. one in "usage: %s" translation
1104#: parse-options.c:592
1105#, c-format
1106msgid " or: %s"
1107msgstr " 或:%s"
1108
1109# 译者:为保证在输出中对齐,注意调整句中空格!
1110#: parse-options.c:595
1111#, c-format
1112msgid " %s"
1113msgstr " %s"
1114
1115#: parse-options.c:629
1116msgid "-NUM"
1117msgstr "-数字"
1118
1119#: parse-options-cb.c:108
1120#, c-format
1121msgid "malformed object name '%s'"
1122msgstr "非法的对象名 '%s'"
1123
1124#: path.c:752
1125#, c-format
1126msgid "Could not make %s writable by group"
1127msgstr "不能设置 %s 为组可写"
1128
1129#: pathspec.c:133
1130msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1131msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1132
1133#: pathspec.c:143
1134msgid ""
1135"global 'literal' pathspec setting is incompatible with all other global "
1136"pathspec settings"
1137msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1138
1139#: pathspec.c:177
1140msgid "invalid parameter for pathspec magic 'prefix'"
1141msgstr "路径规格包含无效的神奇前缀"
1142
1143#: pathspec.c:183
1144#, c-format
1145msgid "Invalid pathspec magic '%.*s' in '%s'"
1146msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1147
1148#: pathspec.c:187
1149#, c-format
1150msgid "Missing ')' at the end of pathspec magic in '%s'"
1151msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1152
1153#: pathspec.c:205
1154#, c-format
1155msgid "Unimplemented pathspec magic '%c' in '%s'"
1156msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1157
1158#: pathspec.c:230
1159#, c-format
1160msgid "%s: 'literal' and 'glob' are incompatible"
1161msgstr "%s:'literal' 和 'glob' 不兼容"
1162
1163#: pathspec.c:241
1164#, c-format
1165msgid "%s: '%s' is outside repository"
1166msgstr "%s:'%s' 在仓库之外"
1167
1168#: pathspec.c:291
1169#, c-format
1170msgid "Pathspec '%s' is in submodule '%.*s'"
1171msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1172
1173#: pathspec.c:353
1174#, c-format
1175msgid "%s: pathspec magic not supported by this command: %s"
1176msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1177
1178#: pathspec.c:433
1179#, c-format
1180msgid "pathspec '%s' is beyond a symbolic link"
1181msgstr "路径规格 '%s' 位于符号链接中"
1182
1183#: pathspec.c:442
1184msgid ""
1185"There is nothing to exclude from by :(exclude) patterns.\n"
1186"Perhaps you forgot to add either ':/' or '.' ?"
1187msgstr ""
1188"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1189"添加 ':/' 或 '.' ?"
1190
1191#: pretty.c:969
1192msgid "unable to parse --pretty format"
1193msgstr "不能解析 --pretty 格式"
1194
1195#: progress.c:235
1196msgid "done"
1197msgstr "完成"
1198
1199#: read-cache.c:1281
1200#, c-format
1201msgid ""
1202"index.version set, but the value is invalid.\n"
1203"Using version %i"
1204msgstr ""
1205"设置了 index.version,但是取值无效。\n"
1206"使用版本 %i"
1207
1208#: read-cache.c:1291
1209#, c-format
1210msgid ""
1211"GIT_INDEX_VERSION set, but the value is invalid.\n"
1212"Using version %i"
1213msgstr ""
1214"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1215"使用版本 %i"
1216
1217#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
1218#: builtin/merge.c:984
1219#, c-format
1220msgid "Could not open '%s' for writing"
1221msgstr "无法打开 '%s' 进行写入"
1222
1223#: refs/files-backend.c:2374
1224#, c-format
1225msgid "could not delete reference %s: %s"
1226msgstr "无法删除引用 %s:%s"
1227
1228#: refs/files-backend.c:2377
1229#, c-format
1230msgid "could not delete references: %s"
1231msgstr "无法删除引用:%s"
1232
1233#: refs/files-backend.c:2386
1234#, c-format
1235msgid "could not remove reference %s"
1236msgstr "无法删除引用 %s"
1237
1238#: ref-filter.c:55
1239#, c-format
1240msgid "expected format: %%(color:<color>)"
1241msgstr "期望的格式:%%(color:<color>)"
1242
1243#: ref-filter.c:57
1244#, c-format
1245msgid "unrecognized color: %%(color:%s)"
1246msgstr "未能识别的颜色:%%(color:%s)"
1247
1248#: ref-filter.c:71
1249#, c-format
1250msgid "unrecognized format: %%(%s)"
1251msgstr "未能识别的格式:%%(%s)"
1252
1253#: ref-filter.c:77
1254#, c-format
1255msgid "%%(body) does not take arguments"
1256msgstr "%%(body) 不带参数"
1257
1258#: ref-filter.c:84
1259#, c-format
1260msgid "%%(subject) does not take arguments"
1261msgstr "%%(subject) 不带参数"
1262
1263#: ref-filter.c:101
1264#, c-format
1265msgid "positive value expected contents:lines=%s"
1266msgstr "要为 contents:lines=%s 提供一个正数"
1267
1268#: ref-filter.c:103
1269#, c-format
1270msgid "unrecognized %%(contents) argument: %s"
1271msgstr "未能识别的 %%(contents) 参数:%s"
1272
1273#: ref-filter.c:113
1274#, c-format
1275msgid "unrecognized %%(objectname) argument: %s"
1276msgstr "未能识别的 %%(objectname) 参数:%s"
1277
1278#: ref-filter.c:135
1279#, c-format
1280msgid "expected format: %%(align:<width>,<position>)"
1281msgstr "期望的格式:%%(align:<width>,<position>)"
1282
1283#: ref-filter.c:147
1284#, c-format
1285msgid "unrecognized position:%s"
1286msgstr "未能识别的位置:%s"
1287
1288#: ref-filter.c:151
1289#, c-format
1290msgid "unrecognized width:%s"
1291msgstr "未能识别的宽度:%s"
1292
1293#: ref-filter.c:157
1294#, c-format
1295msgid "unrecognized %%(align) argument: %s"
1296msgstr "未能识别的 %%(align) 参数:%s"
1297
1298#: ref-filter.c:161
1299#, c-format
1300msgid "positive width expected with the %%(align) atom"
1301msgstr "元素 %%(align) 需要一个正数的宽度"
1302
1303#: ref-filter.c:244
1304#, c-format
1305msgid "malformed field name: %.*s"
1306msgstr "非法的字段名:%.*s"
1307
1308#: ref-filter.c:270
1309#, c-format
1310msgid "unknown field name: %.*s"
1311msgstr "未知的字段名:%.*s"
1312
1313#: ref-filter.c:372
1314#, c-format
1315msgid "format: %%(end) atom used without corresponding atom"
1316msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1317
1318#: ref-filter.c:424
1319#, c-format
1320msgid "malformed format string %s"
1321msgstr "非法的格式化字符串 %s"
1322
1323#: ref-filter.c:878
1324msgid ":strip= requires a positive integer argument"
1325msgstr ":strip= 需要一个正整型参数"
1326
1327#: ref-filter.c:883
1328#, c-format
1329msgid "ref '%s' does not have %ld components to :strip"
1330msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
1331
1332#: ref-filter.c:1046
1333#, c-format
1334msgid "unknown %.*s format %s"
1335msgstr "未知的 %.*s 格式 %s"
1336
1337#: ref-filter.c:1066 ref-filter.c:1097
1338#, c-format
1339msgid "missing object %s for %s"
1340msgstr "缺失 %2$s 的对象 %1$s"
1341
1342#: ref-filter.c:1069 ref-filter.c:1100
1343#, c-format
1344msgid "parse_object_buffer failed on %s for %s"
1345msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1346
1347#: ref-filter.c:1311
1348#, c-format
1349msgid "malformed object at '%s'"
1350msgstr "非法的对象于 '%s'"
1351
1352#: ref-filter.c:1373
1353#, c-format
1354msgid "ignoring ref with broken name %s"
1355msgstr "忽略带有错误名称 %s 的引用"
1356
1357#: ref-filter.c:1378
1358#, c-format
1359msgid "ignoring broken ref %s"
1360msgstr "忽略损坏的引用 %s"
1361
1362#: ref-filter.c:1651
1363#, c-format
1364msgid "format: %%(end) atom missing"
1365msgstr "格式:缺少 %%(end) 元素"
1366
1367#: ref-filter.c:1705
1368#, c-format
1369msgid "malformed object name %s"
1370msgstr "非法的对象名 %s"
1371
1372#: remote.c:745
1373#, c-format
1374msgid "Cannot fetch both %s and %s to %s"
1375msgstr "不能同时获取 %s 和 %s 至 %s"
1376
1377#: remote.c:749
1378#, c-format
1379msgid "%s usually tracks %s, not %s"
1380msgstr "%s 通常跟踪 %s,而非 %s"
1381
1382#: remote.c:753
1383#, c-format
1384msgid "%s tracks both %s and %s"
1385msgstr "%s 同时跟踪 %s 和 %s"
1386
1387#: remote.c:761
1388msgid "Internal error"
1389msgstr "内部错误"
1390
1391#: remote.c:1677 remote.c:1720
1392msgid "HEAD does not point to a branch"
1393msgstr "HEAD 没有指向一个分支"
1394
1395#: remote.c:1686
1396#, c-format
1397msgid "no such branch: '%s'"
1398msgstr "没有此分支:'%s'"
1399
1400#: remote.c:1689
1401#, c-format
1402msgid "no upstream configured for branch '%s'"
1403msgstr "尚未给分支 '%s' 设置上游"
1404
1405#: remote.c:1695
1406#, c-format
1407msgid "upstream branch '%s' not stored as a remote-tracking branch"
1408msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1409
1410#: remote.c:1710
1411#, c-format
1412msgid "push destination '%s' on remote '%s' has no local tracking branch"
1413msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1414
1415#: remote.c:1725
1416#, c-format
1417msgid "branch '%s' has no remote for pushing"
1418msgstr "分支 '%s' 没有设置要推送的远程服务器"
1419
1420#: remote.c:1736
1421#, c-format
1422msgid "push refspecs for '%s' do not include '%s'"
1423msgstr "向 '%s' 推送引用规格未包含 '%s'"
1424
1425#: remote.c:1749
1426msgid "push has no destination (push.default is 'nothing')"
1427msgstr "推送无目标(push.default 是 'nothing')"
1428
1429#: remote.c:1771
1430msgid "cannot resolve 'simple' push to a single destination"
1431msgstr "无法解析 'simple' 推送至一个单独的目标"
1432
1433#: remote.c:2073
1434#, c-format
1435msgid "Your branch is based on '%s', but the upstream is gone.\n"
1436msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1437
1438#: remote.c:2077
1439msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1440msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1441
1442#: remote.c:2080
1443#, c-format
1444msgid "Your branch is up-to-date with '%s'.\n"
1445msgstr "您的分支与上游分支 '%s' 一致。\n"
1446
1447#: remote.c:2084
1448#, c-format
1449msgid "Your branch is ahead of '%s' by %d commit.\n"
1450msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1451msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1452msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1453
1454#: remote.c:2090
1455msgid " (use \"git push\" to publish your local commits)\n"
1456msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1457
1458#: remote.c:2093
1459#, c-format
1460msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1461msgid_plural ""
1462"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1463msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1464msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1465
1466# 译者:注意保持前导空格
1467#: remote.c:2101
1468msgid " (use \"git pull\" to update your local branch)\n"
1469msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1470
1471#: remote.c:2104
1472#, c-format
1473msgid ""
1474"Your branch and '%s' have diverged,\n"
1475"and have %d and %d different commit each, respectively.\n"
1476msgid_plural ""
1477"Your branch and '%s' have diverged,\n"
1478"and have %d and %d different commits each, respectively.\n"
1479msgstr[0] ""
1480"您的分支和 '%s' 出现了偏离,\n"
1481"并且分别有 %d 和 %d 处不同的提交。\n"
1482msgstr[1] ""
1483"您的分支和 '%s' 出现了偏离,\n"
1484"并且分别有 %d 和 %d 处不同的提交。\n"
1485
1486# 译者:注意保持前导空格
1487#: remote.c:2114
1488msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1489msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1490
1491#: revision.c:2131
1492msgid "your current branch appears to be broken"
1493msgstr "您的当前分支好像被损坏"
1494
1495#: revision.c:2134
1496#, c-format
1497msgid "your current branch '%s' does not have any commits yet"
1498msgstr "您的当前分支 '%s' 尚无任何提交"
1499
1500#: revision.c:2328
1501msgid "--first-parent is incompatible with --bisect"
1502msgstr "--first-parent 与 --bisect 不兼容"
1503
1504#: run-command.c:92
1505msgid "open /dev/null failed"
1506msgstr "不能打开 /dev/null"
1507
1508#: run-command.c:94
1509#, c-format
1510msgid "dup2(%d,%d) failed"
1511msgstr "不能调用 dup2(%d,%d)"
1512
1513#: send-pack.c:295
1514msgid "failed to sign the push certificate"
1515msgstr "无法为推送证书签名"
1516
1517#: send-pack.c:404
1518msgid "the receiving end does not support --signed push"
1519msgstr "接收端不支持签名推送"
1520
1521#: send-pack.c:406
1522msgid ""
1523"not sending a push certificate since the receiving end does not support --"
1524"signed push"
1525msgstr "未发送推送证书,因为接收端不支持签名推送"
1526
1527#: send-pack.c:418
1528msgid "the receiving end does not support --atomic push"
1529msgstr "接收端不支持原子推送"
1530
1531#: sequencer.c:174
1532msgid ""
1533"after resolving the conflicts, mark the corrected paths\n"
1534"with 'git add <paths>' or 'git rm <paths>'"
1535msgstr ""
1536"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1537"命令标记修正后的文件"
1538
1539#: sequencer.c:177
1540msgid ""
1541"after resolving the conflicts, mark the corrected paths\n"
1542"with 'git add <paths>' or 'git rm <paths>'\n"
1543"and commit the result with 'git commit'"
1544msgstr ""
1545"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1546"对修正后的文件做标记,然后用 'git commit' 提交"
1547
1548#: sequencer.c:190 sequencer.c:833 sequencer.c:913
1549#, c-format
1550msgid "Could not write to %s"
1551msgstr "不能写入 %s"
1552
1553#: sequencer.c:193
1554#, c-format
1555msgid "Error wrapping up %s"
1556msgstr "错误收尾 %s"
1557
1558#: sequencer.c:208
1559msgid "Your local changes would be overwritten by cherry-pick."
1560msgstr "您的本地修改将被拣选操作覆盖。"
1561
1562#: sequencer.c:210
1563msgid "Your local changes would be overwritten by revert."
1564msgstr "您的本地修改将被还原操作覆盖。"
1565
1566#: sequencer.c:213
1567msgid "Commit your changes or stash them to proceed."
1568msgstr "提交您的修改或保存进度后再继续。"
1569
1570#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1571#: sequencer.c:300
1572#, c-format
1573msgid "%s: Unable to write new index file"
1574msgstr "%s:无法写入新索引文件"
1575
1576#: sequencer.c:318
1577msgid "Could not resolve HEAD commit\n"
1578msgstr "不能解析 HEAD 提交\n"
1579
1580#: sequencer.c:338
1581msgid "Unable to update cache tree\n"
1582msgstr "不能更新缓存\n"
1583
1584#: sequencer.c:390
1585#, c-format
1586msgid "Could not parse commit %s\n"
1587msgstr "不能解析提交 %s\n"
1588
1589#: sequencer.c:395
1590#, c-format
1591msgid "Could not parse parent commit %s\n"
1592msgstr "不能解析父提交 %s\n"
1593
1594#: sequencer.c:460
1595msgid "Your index file is unmerged."
1596msgstr "您的索引文件未完成合并。"
1597
1598#: sequencer.c:479
1599#, c-format
1600msgid "Commit %s is a merge but no -m option was given."
1601msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1602
1603#: sequencer.c:487
1604#, c-format
1605msgid "Commit %s does not have parent %d"
1606msgstr "提交 %s 没有父提交 %d"
1607
1608#: sequencer.c:491
1609#, c-format
1610msgid "Mainline was specified but commit %s is not a merge."
1611msgstr "指定了主线但提交 %s 不是一个合并。"
1612
1613#. TRANSLATORS: The first %s will be "revert" or
1614#. "cherry-pick", the second %s a SHA1
1615#: sequencer.c:504
1616#, c-format
1617msgid "%s: cannot parse parent commit %s"
1618msgstr "%s:不能解析父提交 %s"
1619
1620#: sequencer.c:508
1621#, c-format
1622msgid "Cannot get commit message for %s"
1623msgstr "不能得到 %s 的提交说明"
1624
1625#: sequencer.c:594
1626#, c-format
1627msgid "could not revert %s... %s"
1628msgstr "不能还原 %s... %s"
1629
1630#: sequencer.c:595
1631#, c-format
1632msgid "could not apply %s... %s"
1633msgstr "不能应用 %s... %s"
1634
1635#: sequencer.c:630
1636msgid "empty commit set passed"
1637msgstr "提供了空的提交集"
1638
1639#: sequencer.c:638
1640#, c-format
1641msgid "git %s: failed to read the index"
1642msgstr "git %s:无法读取索引"
1643
1644#: sequencer.c:642
1645#, c-format
1646msgid "git %s: failed to refresh the index"
1647msgstr "git %s:无法刷新索引"
1648
1649#: sequencer.c:702
1650#, c-format
1651msgid "Cannot %s during a %s"
1652msgstr "无法 %s 在一个 %s 过程中"
1653
1654#: sequencer.c:724
1655#, c-format
1656msgid "Could not parse line %d."
1657msgstr "不能解析第 %d 行。"
1658
1659#: sequencer.c:729
1660msgid "No commits parsed."
1661msgstr "没有提交被解析。"
1662
1663#: sequencer.c:741
1664#, c-format
1665msgid "Could not open %s"
1666msgstr "不能打开 %s"
1667
1668#: sequencer.c:745
1669#, c-format
1670msgid "Could not read %s."
1671msgstr "不能读取 %s。"
1672
1673#: sequencer.c:752
1674#, c-format
1675msgid "Unusable instruction sheet: %s"
1676msgstr "无用的指令表单:%s"
1677
1678#: sequencer.c:782
1679#, c-format
1680msgid "Invalid key: %s"
1681msgstr "无效键名:%s"
1682
1683#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
1684#, c-format
1685msgid "Invalid value for %s: %s"
1686msgstr "%s 的值无效:%s"
1687
1688#: sequencer.c:795
1689#, c-format
1690msgid "Malformed options sheet: %s"
1691msgstr "非法的选项表单:%s"
1692
1693#: sequencer.c:814
1694msgid "a cherry-pick or revert is already in progress"
1695msgstr "一个拣选或还原操作已在进行"
1696
1697#: sequencer.c:815
1698msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1699msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1700
1701#: sequencer.c:819
1702#, c-format
1703msgid "Could not create sequencer directory %s"
1704msgstr "不能创建序列目录 %s"
1705
1706#: sequencer.c:835 sequencer.c:917
1707#, c-format
1708msgid "Error wrapping up %s."
1709msgstr "错误收尾 %s。"
1710
1711#: sequencer.c:854 sequencer.c:987
1712msgid "no cherry-pick or revert in progress"
1713msgstr "拣选或还原操作并未进行"
1714
1715#: sequencer.c:856
1716msgid "cannot resolve HEAD"
1717msgstr "不能解析 HEAD"
1718
1719#: sequencer.c:858
1720msgid "cannot abort from a branch yet to be born"
1721msgstr "不能从尚未建立的分支终止"
1722
1723#: sequencer.c:878 builtin/apply.c:4287
1724#, c-format
1725msgid "cannot open %s: %s"
1726msgstr "不能打开 %s:%s"
1727
1728#: sequencer.c:881
1729#, c-format
1730msgid "cannot read %s: %s"
1731msgstr "不能读取 %s:%s"
1732
1733#: sequencer.c:882
1734msgid "unexpected end of file"
1735msgstr "意外的文件结束"
1736
1737#: sequencer.c:888
1738#, c-format
1739msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1740msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1741
1742#: sequencer.c:910
1743#, c-format
1744msgid "Could not format %s."
1745msgstr "不能格式化 %s。"
1746
1747#: sequencer.c:1055
1748#, c-format
1749msgid "%s: can't cherry-pick a %s"
1750msgstr "%s:不能拣选一个%s"
1751
1752#: sequencer.c:1058
1753#, c-format
1754msgid "%s: bad revision"
1755msgstr "%s:错误的版本"
1756
1757#: sequencer.c:1092
1758msgid "Can't revert as initial commit"
1759msgstr "不能作为初始提交还原"
1760
1761#: sequencer.c:1093
1762msgid "Can't cherry-pick into empty head"
1763msgstr "不能拣选到空分支"
1764
1765#: setup.c:246
1766#, c-format
1767msgid "failed to read %s"
1768msgstr "无法读取 %s"
1769
1770#: sha1_file.c:1080
1771msgid "offset before end of packfile (broken .idx?)"
1772msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
1773
1774#: sha1_file.c:2459
1775#, c-format
1776msgid "offset before start of pack index for %s (corrupt index?)"
1777msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
1778
1779#: sha1_file.c:2463
1780#, c-format
1781msgid "offset beyond end of pack index for %s (truncated index?)"
1782msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
1783
1784#: sha1_name.c:462
1785msgid ""
1786"Git normally never creates a ref that ends with 40 hex characters\n"
1787"because it will be ignored when you just specify 40-hex. These refs\n"
1788"may be created by mistake. For example,\n"
1789"\n"
1790" git checkout -b $br $(git rev-parse ...)\n"
1791"\n"
1792"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1793"examine these refs and maybe delete them. Turn this message off by\n"
1794"running \"git config advice.objectNameWarning false\""
1795msgstr ""
1796"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1797"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1798"\n"
1799" git checkout -b $br $(git rev-parse ...)\n"
1800"\n"
1801"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1802"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1803"命令关闭本消息通知。"
1804
1805#: submodule.c:62 submodule.c:96
1806msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1807msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1808
1809#: submodule.c:66 submodule.c:100
1810#, c-format
1811msgid "Could not find section in .gitmodules where path=%s"
1812msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1813
1814#: submodule.c:74
1815#, c-format
1816msgid "Could not update .gitmodules entry %s"
1817msgstr "不能更新 .gitmodules 条目 %s"
1818
1819#: submodule.c:107
1820#, c-format
1821msgid "Could not remove .gitmodules entry for %s"
1822msgstr "无法移除 %s 的 .gitmodules 条目"
1823
1824#: submodule.c:118
1825msgid "staging updated .gitmodules failed"
1826msgstr "将更新后 .gitmodules 添加暂存区失败"
1827
1828#: trailer.c:237
1829#, c-format
1830msgid "running trailer command '%s' failed"
1831msgstr "执行 trailer 命令 '%s' 失败"
1832
1833#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1834#: trailer.c:562
1835#, c-format
1836msgid "unknown value '%s' for key '%s'"
1837msgstr "键 '%2$s' 的未知取值 '%1$s'"
1838
1839#: trailer.c:544 trailer.c:549 builtin/remote.c:289
1840#, c-format
1841msgid "more than one %s"
1842msgstr "多于一个 %s"
1843
1844#: trailer.c:582
1845#, c-format
1846msgid "empty trailer token in trailer '%.*s'"
1847msgstr "签名 '%.*s' 的键为空"
1848
1849#: trailer.c:702
1850#, c-format
1851msgid "could not read input file '%s'"
1852msgstr "不能读取输入文件 '%s'"
1853
1854#: trailer.c:705
1855msgid "could not read from stdin"
1856msgstr "不能自标准输入读取"
1857
1858#: trailer.c:857 builtin/am.c:42
1859#, c-format
1860msgid "could not stat %s"
1861msgstr "不能获取 %s 的文件状态"
1862
1863#: trailer.c:859
1864#, c-format
1865msgid "file %s is not a regular file"
1866msgstr "文件 %s 不是一个正规文件"
1867
1868#: trailer.c:861
1869#, c-format
1870msgid "file %s is not writable by user"
1871msgstr "文件 %s 用户不可写"
1872
1873#: trailer.c:873
1874msgid "could not open temporary file"
1875msgstr "不能打开临时文件"
1876
1877#: trailer.c:912
1878#, c-format
1879msgid "could not rename temporary file to %s"
1880msgstr "不能重命名临时文件为 %s"
1881
1882#: transport-helper.c:1041
1883#, c-format
1884msgid "Could not read ref %s"
1885msgstr "不能读取引用 %s"
1886
1887#: unpack-trees.c:203
1888msgid "Checking out files"
1889msgstr "正在检出文件"
1890
1891#: urlmatch.c:120
1892msgid "invalid URL scheme name or missing '://' suffix"
1893msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1894
1895#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1896#, c-format
1897msgid "invalid %XX escape sequence"
1898msgstr "无效的 %XX 转义序列"
1899
1900#: urlmatch.c:172
1901msgid "missing host and scheme is not 'file:'"
1902msgstr "缺失主机名且 URL 方案不是 'file:'"
1903
1904#: urlmatch.c:189
1905msgid "a 'file:' URL may not have a port number"
1906msgstr "一个 'file:' URL 不应该包含端口号"
1907
1908#: urlmatch.c:199
1909msgid "invalid characters in host name"
1910msgstr "主机名中包含无效的字符"
1911
1912#: urlmatch.c:244 urlmatch.c:255
1913msgid "invalid port number"
1914msgstr "无效的端口号"
1915
1916#: urlmatch.c:322
1917msgid "invalid '..' path segment"
1918msgstr "无效的 '..' 路径片段"
1919
1920#: wrapper.c:222 wrapper.c:381
1921#, c-format
1922msgid "could not open '%s' for reading and writing"
1923msgstr "无法打开 '%s' 进行读写"
1924
1925#: wrapper.c:224 wrapper.c:383
1926#, c-format
1927msgid "could not open '%s' for writing"
1928msgstr "无法打开 '%s' 进行写入"
1929
1930#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
1931#: builtin/merge.c:1075 builtin/pull.c:387
1932#, c-format
1933msgid "could not open '%s' for reading"
1934msgstr "无法打开 '%s' 进行读取"
1935
1936#: wrapper.c:611
1937#, c-format
1938msgid "unable to access '%s': %s"
1939msgstr "不能访问 '%s':%s"
1940
1941#: wrapper.c:632
1942#, c-format
1943msgid "unable to access '%s'"
1944msgstr "不能访问 '%s'"
1945
1946#: wrapper.c:640
1947msgid "unable to get current working directory"
1948msgstr "不能获取当前工作目录"
1949
1950#: wrapper.c:667
1951#, c-format
1952msgid "could not open %s for writing"
1953msgstr "不能写入 %s"
1954
1955#: wrapper.c:678 builtin/am.c:410
1956#, c-format
1957msgid "could not write to %s"
1958msgstr "不能写入 %s"
1959
1960#: wrapper.c:684
1961#, c-format
1962msgid "could not close %s"
1963msgstr "不能关闭 %s"
1964
1965#: wt-status.c:149
1966msgid "Unmerged paths:"
1967msgstr "未合并的路径:"
1968
1969# 译者:注意保持前导空格
1970#: wt-status.c:176 wt-status.c:203
1971#, c-format
1972msgid " (use \"git reset %s <file>...\" to unstage)"
1973msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
1974
1975# 译者:注意保持前导空格
1976#: wt-status.c:178 wt-status.c:205
1977msgid " (use \"git rm --cached <file>...\" to unstage)"
1978msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1979
1980# 译者:注意保持前导空格
1981#: wt-status.c:182
1982msgid " (use \"git add <file>...\" to mark resolution)"
1983msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1984
1985# 译者:注意保持前导空格
1986#: wt-status.c:184 wt-status.c:188
1987msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1988msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1989
1990# 译者:注意保持前导空格
1991#: wt-status.c:186
1992msgid " (use \"git rm <file>...\" to mark resolution)"
1993msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1994
1995#: wt-status.c:197 wt-status.c:880
1996msgid "Changes to be committed:"
1997msgstr "要提交的变更:"
1998
1999#: wt-status.c:215 wt-status.c:889
2000msgid "Changes not staged for commit:"
2001msgstr "尚未暂存以备提交的变更:"
2002
2003# 译者:注意保持前导空格
2004#: wt-status.c:219
2005msgid " (use \"git add <file>...\" to update what will be committed)"
2006msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
2007
2008# 译者:注意保持前导空格
2009#: wt-status.c:221
2010msgid " (use \"git add/rm <file>...\" to update what will be committed)"
2011msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
2012
2013# 译者:注意保持前导空格
2014#: wt-status.c:222
2015msgid ""
2016" (use \"git checkout -- <file>...\" to discard changes in working directory)"
2017msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
2018
2019# 译者:注意保持前导空格
2020#: wt-status.c:224
2021msgid " (commit or discard the untracked or modified content in submodules)"
2022msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
2023
2024# 译者:注意保持前导空格
2025#: wt-status.c:236
2026#, c-format
2027msgid " (use \"git %s <file>...\" to include in what will be committed)"
2028msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
2029
2030#: wt-status.c:251
2031msgid "both deleted:"
2032msgstr "双方删除:"
2033
2034#: wt-status.c:253
2035msgid "added by us:"
2036msgstr "由我们添加:"
2037
2038#: wt-status.c:255
2039msgid "deleted by them:"
2040msgstr "由他们删除:"
2041
2042#: wt-status.c:257
2043msgid "added by them:"
2044msgstr "由他们添加:"
2045
2046#: wt-status.c:259
2047msgid "deleted by us:"
2048msgstr "由我们删除:"
2049
2050#: wt-status.c:261
2051msgid "both added:"
2052msgstr "双方添加:"
2053
2054#: wt-status.c:263
2055msgid "both modified:"
2056msgstr "双方修改:"
2057
2058#: wt-status.c:265
2059#, c-format
2060msgid "bug: unhandled unmerged status %x"
2061msgstr "bug:无法处理的未合并状态 %x"
2062
2063#: wt-status.c:273
2064msgid "new file:"
2065msgstr "新文件:"
2066
2067#: wt-status.c:275
2068msgid "copied:"
2069msgstr "拷贝:"
2070
2071#: wt-status.c:277
2072msgid "deleted:"
2073msgstr "删除:"
2074
2075#: wt-status.c:279
2076msgid "modified:"
2077msgstr "修改:"
2078
2079#: wt-status.c:281
2080msgid "renamed:"
2081msgstr "重命名:"
2082
2083#: wt-status.c:283
2084msgid "typechange:"
2085msgstr "类型变更:"
2086
2087#: wt-status.c:285
2088msgid "unknown:"
2089msgstr "未知:"
2090
2091#: wt-status.c:287
2092msgid "unmerged:"
2093msgstr "未合并:"
2094
2095# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2096#: wt-status.c:369
2097msgid "new commits, "
2098msgstr "新提交, "
2099
2100# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2101#: wt-status.c:371
2102msgid "modified content, "
2103msgstr "修改的内容, "
2104
2105# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2106#: wt-status.c:373
2107msgid "untracked content, "
2108msgstr "未跟踪的内容, "
2109
2110#: wt-status.c:390
2111#, c-format
2112msgid "bug: unhandled diff status %c"
2113msgstr "bug:无法处理的差异状态 %c"
2114
2115#: wt-status.c:754
2116msgid "Submodules changed but not updated:"
2117msgstr "子模组已修改但尚未更新:"
2118
2119#: wt-status.c:756
2120msgid "Submodule changes to be committed:"
2121msgstr "要提交的子模组变更:"
2122
2123#: wt-status.c:837
2124msgid ""
2125"Do not touch the line above.\n"
2126"Everything below will be removed."
2127msgstr ""
2128"不要改动上面的一行。\n"
2129"下面的所有内容均将被删除。"
2130
2131#: wt-status.c:948
2132msgid "You have unmerged paths."
2133msgstr "您有尚未合并的路径。"
2134
2135# 译者:注意保持前导空格
2136#: wt-status.c:951
2137msgid " (fix conflicts and run \"git commit\")"
2138msgstr " (解决冲突并运行 \"git commit\")"
2139
2140#: wt-status.c:954
2141msgid "All conflicts fixed but you are still merging."
2142msgstr "所有冲突已解决但您仍处于合并中。"
2143
2144# 译者:注意保持前导空格
2145#: wt-status.c:957
2146msgid " (use \"git commit\" to conclude merge)"
2147msgstr " (使用 \"git commit\" 结束合并)"
2148
2149#: wt-status.c:967
2150msgid "You are in the middle of an am session."
2151msgstr "您正处于 am 操作过程中。"
2152
2153#: wt-status.c:970
2154msgid "The current patch is empty."
2155msgstr "当前的补丁为空。"
2156
2157# 译者:注意保持前导空格
2158#: wt-status.c:974
2159msgid " (fix conflicts and then run \"git am --continue\")"
2160msgstr " (解决冲突,然后运行 \"git am --continue\")"
2161
2162# 译者:注意保持前导空格
2163#: wt-status.c:976
2164msgid " (use \"git am --skip\" to skip this patch)"
2165msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2166
2167# 译者:注意保持前导空格
2168#: wt-status.c:978
2169msgid " (use \"git am --abort\" to restore the original branch)"
2170msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2171
2172#: wt-status.c:1105
2173msgid "No commands done."
2174msgstr "没有命令被执行。"
2175
2176#: wt-status.c:1108
2177#, c-format
2178msgid "Last command done (%d command done):"
2179msgid_plural "Last commands done (%d commands done):"
2180msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2181msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2182
2183#: wt-status.c:1119
2184#, c-format
2185msgid " (see more in file %s)"
2186msgstr " (更多参见文件 %s)"
2187
2188#: wt-status.c:1124
2189msgid "No commands remaining."
2190msgstr "未剩下任何命令。"
2191
2192#: wt-status.c:1127
2193#, c-format
2194msgid "Next command to do (%d remaining command):"
2195msgid_plural "Next commands to do (%d remaining commands):"
2196msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2197msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2198
2199# 译者:注意保持前导空格
2200#: wt-status.c:1135
2201msgid " (use \"git rebase --edit-todo\" to view and edit)"
2202msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2203
2204#: wt-status.c:1148
2205#, c-format
2206msgid "You are currently rebasing branch '%s' on '%s'."
2207msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2208
2209#: wt-status.c:1153
2210msgid "You are currently rebasing."
2211msgstr "您在执行变基操作。"
2212
2213# 译者:注意保持前导空格
2214#: wt-status.c:1167
2215msgid " (fix conflicts and then run \"git rebase --continue\")"
2216msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2217
2218# 译者:注意保持前导空格
2219#: wt-status.c:1169
2220msgid " (use \"git rebase --skip\" to skip this patch)"
2221msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2222
2223# 译者:注意保持前导空格
2224#: wt-status.c:1171
2225msgid " (use \"git rebase --abort\" to check out the original branch)"
2226msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2227
2228# 译者:注意保持前导空格
2229#: wt-status.c:1177
2230msgid " (all conflicts fixed: run \"git rebase --continue\")"
2231msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2232
2233#: wt-status.c:1181
2234#, c-format
2235msgid ""
2236"You are currently splitting a commit while rebasing branch '%s' on '%s'."
2237msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2238
2239#: wt-status.c:1186
2240msgid "You are currently splitting a commit during a rebase."
2241msgstr "您在执行变基操作时拆分提交。"
2242
2243# 译者:注意保持前导空格
2244#: wt-status.c:1189
2245msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2246msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2247
2248#: wt-status.c:1193
2249#, c-format
2250msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2251msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2252
2253#: wt-status.c:1198
2254msgid "You are currently editing a commit during a rebase."
2255msgstr "您在执行变基操作时编辑提交。"
2256
2257# 译者:注意保持前导空格
2258#: wt-status.c:1201
2259msgid " (use \"git commit --amend\" to amend the current commit)"
2260msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2261
2262# 译者:注意保持前导空格
2263#: wt-status.c:1203
2264msgid ""
2265" (use \"git rebase --continue\" once you are satisfied with your changes)"
2266msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2267
2268#: wt-status.c:1213
2269#, c-format
2270msgid "You are currently cherry-picking commit %s."
2271msgstr "您在执行拣选提交 %s 的操作。"
2272
2273# 译者:注意保持前导空格
2274#: wt-status.c:1218
2275msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2276msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2277
2278# 译者:注意保持前导空格
2279#: wt-status.c:1221
2280msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2281msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2282
2283# 译者:注意保持前导空格
2284#: wt-status.c:1223
2285msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2286msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2287
2288#: wt-status.c:1232
2289#, c-format
2290msgid "You are currently reverting commit %s."
2291msgstr "您在执行反转提交 %s 的操作。"
2292
2293# 译者:注意保持前导空格
2294#: wt-status.c:1237
2295msgid " (fix conflicts and run \"git revert --continue\")"
2296msgstr " (解决冲突并运行 \"git revert --continue\")"
2297
2298# 译者:注意保持前导空格
2299#: wt-status.c:1240
2300msgid " (all conflicts fixed: run \"git revert --continue\")"
2301msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2302
2303# 译者:注意保持前导空格
2304#: wt-status.c:1242
2305msgid " (use \"git revert --abort\" to cancel the revert operation)"
2306msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2307
2308#: wt-status.c:1253
2309#, c-format
2310msgid "You are currently bisecting, started from branch '%s'."
2311msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2312
2313#: wt-status.c:1257
2314msgid "You are currently bisecting."
2315msgstr "您在执行二分查找操作。"
2316
2317# 译者:注意保持前导空格
2318#: wt-status.c:1260
2319msgid " (use \"git bisect reset\" to get back to the original branch)"
2320msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2321
2322#: wt-status.c:1438
2323msgid "On branch "
2324msgstr "位于分支 "
2325
2326#: wt-status.c:1444
2327msgid "interactive rebase in progress; onto "
2328msgstr "交互式变基操作正在进行中;至 "
2329
2330#: wt-status.c:1446
2331msgid "rebase in progress; onto "
2332msgstr "变基操作正在进行中;至 "
2333
2334#: wt-status.c:1451
2335msgid "HEAD detached at "
2336msgstr "头指针分离于 "
2337
2338#: wt-status.c:1453
2339msgid "HEAD detached from "
2340msgstr "头指针分离自 "
2341
2342#: wt-status.c:1456
2343msgid "Not currently on any branch."
2344msgstr "当前不在任何分支上。"
2345
2346#: wt-status.c:1474
2347msgid "Initial commit"
2348msgstr "初始提交"
2349
2350#: wt-status.c:1488
2351msgid "Untracked files"
2352msgstr "未跟踪的文件"
2353
2354#: wt-status.c:1490
2355msgid "Ignored files"
2356msgstr "忽略的文件"
2357
2358#: wt-status.c:1494
2359#, c-format
2360msgid ""
2361"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2362"may speed it up, but you have to be careful not to forget to add\n"
2363"new files yourself (see 'git help status')."
2364msgstr ""
2365"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2366"但您需要小心不要忘了添加新文件(参见 'git help status')。"
2367
2368#: wt-status.c:1500
2369#, c-format
2370msgid "Untracked files not listed%s"
2371msgstr "未跟踪的文件没有列出%s"
2372
2373# 译者:中文字符串拼接,可删除前导空格
2374#: wt-status.c:1502
2375msgid " (use -u option to show untracked files)"
2376msgstr "(使用 -u 参数显示未跟踪的文件)"
2377
2378#: wt-status.c:1508
2379msgid "No changes"
2380msgstr "没有修改"
2381
2382#: wt-status.c:1513
2383#, c-format
2384msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2385msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2386
2387#: wt-status.c:1516
2388#, c-format
2389msgid "no changes added to commit\n"
2390msgstr "修改尚未加入提交\n"
2391
2392#: wt-status.c:1519
2393#, c-format
2394msgid ""
2395"nothing added to commit but untracked files present (use \"git add\" to "
2396"track)\n"
2397msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2398
2399#: wt-status.c:1522
2400#, c-format
2401msgid "nothing added to commit but untracked files present\n"
2402msgstr "提交为空,但是存在尚未跟踪的文件\n"
2403
2404# 译者:中文字符串拼接,可删除前导空格
2405#: wt-status.c:1525
2406#, c-format
2407msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2408msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2409
2410#: wt-status.c:1528 wt-status.c:1533
2411#, c-format
2412msgid "nothing to commit\n"
2413msgstr "无文件要提交\n"
2414
2415# 译者:中文字符串拼接,可删除前导空格
2416#: wt-status.c:1531
2417#, c-format
2418msgid "nothing to commit (use -u to show untracked files)\n"
2419msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2420
2421# 译者:中文字符串拼接,可删除前导空格
2422#: wt-status.c:1535
2423#, c-format
2424msgid "nothing to commit, working directory clean\n"
2425msgstr "无文件要提交,干净的工作区\n"
2426
2427# 译者:注意保持句尾空格
2428#: wt-status.c:1642
2429msgid "Initial commit on "
2430msgstr "初始提交于 "
2431
2432#: wt-status.c:1646
2433msgid "HEAD (no branch)"
2434msgstr "HEAD(非分支)"
2435
2436#: wt-status.c:1675
2437msgid "gone"
2438msgstr "丢失"
2439
2440# 译者:注意保持句尾空格
2441#: wt-status.c:1677 wt-status.c:1685
2442msgid "behind "
2443msgstr "落后 "
2444
2445#: wt-status.c:1680 wt-status.c:1683
2446msgid "ahead "
2447msgstr "领先 "
2448
2449#: compat/precompose_utf8.c:57 builtin/clone.c:413
2450#, c-format
2451msgid "failed to unlink '%s'"
2452msgstr "无法删除 '%s'"
2453
2454#: builtin/add.c:22
2455msgid "git add [<options>] [--] <pathspec>..."
2456msgstr "git add [<选项>] [--] <路径规格>..."
2457
2458#: builtin/add.c:65
2459#, c-format
2460msgid "unexpected diff status %c"
2461msgstr "意外的差异状态 %c"
2462
2463#: builtin/add.c:70 builtin/commit.c:278
2464msgid "updating files failed"
2465msgstr "更新文件失败"
2466
2467#: builtin/add.c:80
2468#, c-format
2469msgid "remove '%s'\n"
2470msgstr "删除 '%s'\n"
2471
2472#: builtin/add.c:134
2473msgid "Unstaged changes after refreshing the index:"
2474msgstr "刷新索引之后尚未被暂存的变更:"
2475
2476#: builtin/add.c:194 builtin/rev-parse.c:797
2477msgid "Could not read the index"
2478msgstr "不能读取索引"
2479
2480#: builtin/add.c:205
2481#, c-format
2482msgid "Could not open '%s' for writing."
2483msgstr "无法打开 '%s' 进行写入。"
2484
2485#: builtin/add.c:209
2486msgid "Could not write patch"
2487msgstr "不能生成补丁"
2488
2489#: builtin/add.c:212
2490msgid "editing patch failed"
2491msgstr "编辑补丁失败"
2492
2493#: builtin/add.c:215
2494#, c-format
2495msgid "Could not stat '%s'"
2496msgstr "不能查看文件状态 '%s'"
2497
2498#: builtin/add.c:217
2499msgid "Empty patch. Aborted."
2500msgstr "空补丁。异常终止。"
2501
2502#: builtin/add.c:222
2503#, c-format
2504msgid "Could not apply '%s'"
2505msgstr "不能应用 '%s'"
2506
2507#: builtin/add.c:232
2508msgid "The following paths are ignored by one of your .gitignore files:\n"
2509msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2510
2511#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2512#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
2513#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
2514msgid "dry run"
2515msgstr "演习"
2516
2517#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
2518#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2519#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
2520msgid "be verbose"
2521msgstr "冗长输出"
2522
2523#: builtin/add.c:252
2524msgid "interactive picking"
2525msgstr "交互式拣选"
2526
2527#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
2528msgid "select hunks interactively"
2529msgstr "交互式挑选数据块"
2530
2531#: builtin/add.c:254
2532msgid "edit current diff and apply"
2533msgstr "编辑当前差异并应用"
2534
2535#: builtin/add.c:255
2536msgid "allow adding otherwise ignored files"
2537msgstr "允许添加忽略的文件"
2538
2539#: builtin/add.c:256
2540msgid "update tracked files"
2541msgstr "更新已跟踪的文件"
2542
2543#: builtin/add.c:257
2544msgid "record only the fact that the path will be added later"
2545msgstr "只记录,该路径稍后再添加"
2546
2547#: builtin/add.c:258
2548msgid "add changes from all tracked and untracked files"
2549msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2550
2551#: builtin/add.c:261
2552msgid "ignore paths removed in the working tree (same as --no-all)"
2553msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2554
2555#: builtin/add.c:263
2556msgid "don't add, only refresh the index"
2557msgstr "不添加,只刷新索引"
2558
2559#: builtin/add.c:264
2560msgid "just skip files which cannot be added because of errors"
2561msgstr "跳过因出错不能添加的文件"
2562
2563#: builtin/add.c:265
2564msgid "check if - even missing - files are ignored in dry run"
2565msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2566
2567#: builtin/add.c:287
2568#, c-format
2569msgid "Use -f if you really want to add them.\n"
2570msgstr "使用 -f 参数如果您确实要添加它们。\n"
2571
2572#: builtin/add.c:294
2573msgid "adding files failed"
2574msgstr "添加文件失败"
2575
2576#: builtin/add.c:330
2577msgid "-A and -u are mutually incompatible"
2578msgstr "-A 和 -u 选项互斥"
2579
2580#: builtin/add.c:337
2581msgid "Option --ignore-missing can only be used together with --dry-run"
2582msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2583
2584#: builtin/add.c:352
2585#, c-format
2586msgid "Nothing specified, nothing added.\n"
2587msgstr "没有指定文件,也没有文件被添加。\n"
2588
2589#: builtin/add.c:353
2590#, c-format
2591msgid "Maybe you wanted to say 'git add .'?\n"
2592msgstr "也许您想要执行 'git add .'?\n"
2593
2594#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2595#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2596#: builtin/submodule--helper.c:35
2597msgid "index file corrupt"
2598msgstr "索引文件损坏"
2599
2600#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
2601msgid "Unable to write new index file"
2602msgstr "无法写入新索引文件"
2603
2604#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
2605#, c-format
2606msgid "could not read '%s'"
2607msgstr "不能读取 '%s'"
2608
2609#: builtin/am.c:430
2610msgid "could not parse author script"
2611msgstr "不能解析作者脚本"
2612
2613#: builtin/am.c:507
2614#, c-format
2615msgid "'%s' was deleted by the applypatch-msg hook"
2616msgstr "'%s' 被 applypatch-msg 钩子删除"
2617
2618#: builtin/am.c:548 builtin/notes.c:300
2619#, c-format
2620msgid "Malformed input line: '%s'."
2621msgstr "非法的输入行:'%s'。"
2622
2623#: builtin/am.c:585 builtin/notes.c:315
2624#, c-format
2625msgid "Failed to copy notes from '%s' to '%s'"
2626msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2627
2628#: builtin/am.c:611
2629msgid "fseek failed"
2630msgstr "fseek 失败"
2631
2632#: builtin/am.c:772 builtin/am.c:860
2633#, c-format
2634msgid "could not open '%s' for reading: %s"
2635msgstr "无法打开 '%s' 进行读取:%s"
2636
2637#: builtin/am.c:779
2638#, c-format
2639msgid "could not open '%s' for writing: %s"
2640msgstr "无法打开 '%s' 进行写入:%s"
2641
2642#: builtin/am.c:788
2643#, c-format
2644msgid "could not parse patch '%s'"
2645msgstr "无法解析补丁 '%s'"
2646
2647#: builtin/am.c:853
2648msgid "Only one StGIT patch series can be applied at once"
2649msgstr "一次只能有一个 StGIT 补丁队列被应用"
2650
2651#: builtin/am.c:901
2652msgid "invalid timestamp"
2653msgstr "无效的时间戳"
2654
2655#: builtin/am.c:904 builtin/am.c:912
2656msgid "invalid Date line"
2657msgstr "无效的日期行"
2658
2659#: builtin/am.c:909
2660msgid "invalid timezone offset"
2661msgstr "无效的时区偏移值"
2662
2663#: builtin/am.c:996
2664msgid "Patch format detection failed."
2665msgstr "补丁格式检测失败。"
2666
2667#: builtin/am.c:1001 builtin/clone.c:378
2668#, c-format
2669msgid "failed to create directory '%s'"
2670msgstr "无法创建目录 '%s'"
2671
2672#: builtin/am.c:1005
2673msgid "Failed to split patches."
2674msgstr "无法拆分补丁。"
2675
2676#: builtin/am.c:1137 builtin/commit.c:363
2677msgid "unable to write index file"
2678msgstr "无法写入索引文件"
2679
2680#: builtin/am.c:1188
2681#, c-format
2682msgid "When you have resolved this problem, run \"%s --continue\"."
2683msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2684
2685#: builtin/am.c:1189
2686#, c-format
2687msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2688msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2689
2690#: builtin/am.c:1190
2691#, c-format
2692msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2693msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2694
2695#: builtin/am.c:1328
2696msgid "Patch is empty. Was it split wrong?"
2697msgstr "补丁为空。是不是切分错误?"
2698
2699#: builtin/am.c:1402 builtin/log.c:1350
2700#, c-format
2701msgid "invalid ident line: %s"
2702msgstr "包含无效的身份标识:%s"
2703
2704#: builtin/am.c:1429
2705#, c-format
2706msgid "unable to parse commit %s"
2707msgstr "不能解析提交 %s"
2708
2709#: builtin/am.c:1631
2710msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2711msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2712
2713#: builtin/am.c:1633
2714msgid "Using index info to reconstruct a base tree..."
2715msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2716
2717#: builtin/am.c:1652
2718msgid ""
2719"Did you hand edit your patch?\n"
2720"It does not apply to blobs recorded in its index."
2721msgstr ""
2722"您是否曾手动编辑过您的补丁?\n"
2723"无法应用补丁到索引中的数据对象上。"
2724
2725#: builtin/am.c:1658
2726msgid "Falling back to patching base and 3-way merge..."
2727msgstr "回落到基础版本上打补丁及进行三方合并..."
2728
2729#: builtin/am.c:1673
2730msgid "Failed to merge in the changes."
2731msgstr "无法合并变更。"
2732
2733#: builtin/am.c:1697 builtin/merge.c:633
2734msgid "git write-tree failed to write a tree"
2735msgstr "git write-tree 无法写入一树对象"
2736
2737#: builtin/am.c:1704
2738msgid "applying to an empty history"
2739msgstr "正应用到一个空历史上"
2740
2741#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
2742#: builtin/merge.c:855
2743msgid "failed to write commit object"
2744msgstr "无法写提交对象"
2745
2746#: builtin/am.c:1749 builtin/am.c:1753
2747#, c-format
2748msgid "cannot resume: %s does not exist."
2749msgstr "无法继续:%s 不存在。"
2750
2751#: builtin/am.c:1769
2752msgid "cannot be interactive without stdin connected to a terminal."
2753msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2754
2755#: builtin/am.c:1774
2756msgid "Commit Body is:"
2757msgstr "提交内容为:"
2758
2759# 译者:注意保持句尾空格
2760#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2761#. in your translation. The program will only accept English
2762#. input at this point.
2763#.
2764#: builtin/am.c:1784
2765msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2766msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2767
2768#: builtin/am.c:1834
2769#, c-format
2770msgid "Dirty index: cannot apply patches (dirty: %s)"
2771msgstr "脏索引:不能应用补丁(脏文件:%s)"
2772
2773#: builtin/am.c:1869 builtin/am.c:1941
2774#, c-format
2775msgid "Applying: %.*s"
2776msgstr "应用:%.*s"
2777
2778#: builtin/am.c:1885
2779msgid "No changes -- Patch already applied."
2780msgstr "没有变更 —— 补丁已经应用过。"
2781
2782#: builtin/am.c:1893
2783#, c-format
2784msgid "Patch failed at %s %.*s"
2785msgstr "打补丁失败于 %s %.*s"
2786
2787#: builtin/am.c:1899
2788#, c-format
2789msgid "The copy of the patch that failed is found in: %s"
2790msgstr "失败的补丁文件副本位于:%s"
2791
2792#: builtin/am.c:1944
2793msgid ""
2794"No changes - did you forget to use 'git add'?\n"
2795"If there is nothing left to stage, chances are that something else\n"
2796"already introduced the same changes; you might want to skip this patch."
2797msgstr ""
2798"没有变更 —— 您是不是忘了执行 'git add'?\n"
2799"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2800"您也许想要跳过这个补丁。"
2801
2802#: builtin/am.c:1951
2803msgid ""
2804"You still have unmerged paths in your index.\n"
2805"Did you forget to use 'git add'?"
2806msgstr ""
2807"您的索引中仍有未合并的路径。\n"
2808"您是否忘了执行 'git add'?"
2809
2810#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
2811#: builtin/reset.c:316
2812#, c-format
2813msgid "Could not parse object '%s'."
2814msgstr "不能解析对象 '%s'。"
2815
2816#: builtin/am.c:2111
2817msgid "failed to clean index"
2818msgstr "无法清空索引"
2819
2820#: builtin/am.c:2145
2821msgid ""
2822"You seem to have moved HEAD since the last 'am' failure.\n"
2823"Not rewinding to ORIG_HEAD"
2824msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2825
2826#: builtin/am.c:2206
2827#, c-format
2828msgid "Invalid value for --patch-format: %s"
2829msgstr "无效的 --patch-format 值:%s"
2830
2831#: builtin/am.c:2239
2832msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2833msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2834
2835#: builtin/am.c:2240
2836msgid "git am [<options>] (--continue | --skip | --abort)"
2837msgstr "git am [<选项>] (--continue | --skip | --abort)"
2838
2839#: builtin/am.c:2246
2840msgid "run interactively"
2841msgstr "以交互式方式运行"
2842
2843#: builtin/am.c:2248
2844msgid "historical option -- no-op"
2845msgstr "老的参数 —— 无作用"
2846
2847#: builtin/am.c:2250
2848msgid "allow fall back on 3way merging if needed"
2849msgstr "如果必要,允许使用三方合并。"
2850
2851#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
2852#: builtin/repack.c:171
2853msgid "be quiet"
2854msgstr "静默模式"
2855
2856#: builtin/am.c:2253
2857msgid "add a Signed-off-by line to the commit message"
2858msgstr "在提交说明中添加一个 Signed-off-by 签名"
2859
2860#: builtin/am.c:2256
2861msgid "recode into utf8 (default)"
2862msgstr "使用 utf8 字符集(默认)"
2863
2864#: builtin/am.c:2258
2865msgid "pass -k flag to git-mailinfo"
2866msgstr "向 git-mailinfo 传递 -k 参数"
2867
2868#: builtin/am.c:2260
2869msgid "pass -b flag to git-mailinfo"
2870msgstr "向 git-mailinfo 传递 -b 参数"
2871
2872#: builtin/am.c:2262
2873msgid "pass -m flag to git-mailinfo"
2874msgstr "向 git-mailinfo 传递 -m 参数"
2875
2876#: builtin/am.c:2264
2877msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2878msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2879
2880#: builtin/am.c:2267
2881msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2882msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2883
2884#: builtin/am.c:2270
2885msgid "strip everything before a scissors line"
2886msgstr "丢弃裁切线前的所有内容"
2887
2888#: builtin/am.c:2271 builtin/apply.c:4544
2889msgid "action"
2890msgstr "动作"
2891
2892#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
2893#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
2894#: builtin/am.c:2299
2895msgid "pass it through git-apply"
2896msgstr "传递给 git-apply"
2897
2898#: builtin/am.c:2280 builtin/apply.c:4568
2899msgid "root"
2900msgstr "根目录"
2901
2902#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
2903#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
2904#: builtin/pull.c:171 builtin/submodule--helper.c:72
2905#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
2906msgid "path"
2907msgstr "路径"
2908
2909#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2910#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
2911#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
2912#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
2913#: parse-options.h:132 parse-options.h:134 parse-options.h:244
2914msgid "n"
2915msgstr "n"
2916
2917#: builtin/am.c:2292 builtin/apply.c:4512
2918msgid "num"
2919msgstr "数字"
2920
2921#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
2922#: builtin/tag.c:372
2923msgid "format"
2924msgstr "格式"
2925
2926#: builtin/am.c:2296
2927msgid "format the patch(es) are in"
2928msgstr "补丁的格式"
2929
2930#: builtin/am.c:2302
2931msgid "override error message when patch failure occurs"
2932msgstr "打补丁失败时显示的错误信息"
2933
2934#: builtin/am.c:2304
2935msgid "continue applying patches after resolving a conflict"
2936msgstr "冲突解决后继续应用补丁"
2937
2938#: builtin/am.c:2307
2939msgid "synonyms for --continue"
2940msgstr "和 --continue 同义"
2941
2942#: builtin/am.c:2310
2943msgid "skip the current patch"
2944msgstr "跳过当前补丁"
2945
2946#: builtin/am.c:2313
2947msgid "restore the original branch and abort the patching operation."
2948msgstr "恢复原始分支并终止打补丁操作。"
2949
2950#: builtin/am.c:2317
2951msgid "lie about committer date"
2952msgstr "将作者日期作为提交日期"
2953
2954#: builtin/am.c:2319
2955msgid "use current timestamp for author date"
2956msgstr "用当前时间作为作者日期"
2957
2958#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
2959#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
2960msgid "key-id"
2961msgstr "key-id"
2962
2963#: builtin/am.c:2322
2964msgid "GPG-sign commits"
2965msgstr "使用 GPG 签名提交"
2966
2967#: builtin/am.c:2325
2968msgid "(internal use for git-rebase)"
2969msgstr "(内部使用,用于 git-rebase)"
2970
2971#: builtin/am.c:2340
2972msgid ""
2973"The -b/--binary option has been a no-op for long time, and\n"
2974"it will be removed. Please do not use it anymore."
2975msgstr ""
2976"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2977"请不要再使用它了。"
2978
2979#: builtin/am.c:2347
2980msgid "failed to read the index"
2981msgstr "无法读取索引"
2982
2983#: builtin/am.c:2362
2984#, c-format
2985msgid "previous rebase directory %s still exists but mbox given."
2986msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2987
2988#: builtin/am.c:2386
2989#, c-format
2990msgid ""
2991"Stray %s directory found.\n"
2992"Use \"git am --abort\" to remove it."
2993msgstr ""
2994"发现了错误的 %s 目录。\n"
2995"使用 \"git am --abort\" 删除它。"
2996
2997#: builtin/am.c:2392
2998msgid "Resolve operation not in progress, we are not resuming."
2999msgstr "解决操作未进行,我们不会继续。"
3000
3001#: builtin/apply.c:59
3002msgid "git apply [<options>] [<patch>...]"
3003msgstr "git apply [<选项>] [<补丁>...]"
3004
3005#: builtin/apply.c:111
3006#, c-format
3007msgid "unrecognized whitespace option '%s'"
3008msgstr "未能识别的空白字符选项 '%s'"
3009
3010#: builtin/apply.c:126
3011#, c-format
3012msgid "unrecognized whitespace ignore option '%s'"
3013msgstr "未能识别的空白字符忽略选项 '%s'"
3014
3015#: builtin/apply.c:818
3016#, c-format
3017msgid "Cannot prepare timestamp regexp %s"
3018msgstr "无法准备时间戳正则表达式 %s"
3019
3020#: builtin/apply.c:827
3021#, c-format
3022msgid "regexec returned %d for input: %s"
3023msgstr "regexec 返回 %d,输入为:%s"
3024
3025#: builtin/apply.c:908
3026#, c-format
3027msgid "unable to find filename in patch at line %d"
3028msgstr "不能在补丁的第 %d 行找到文件名"
3029
3030#: builtin/apply.c:940
3031#, c-format
3032msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3033msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3034
3035#: builtin/apply.c:944
3036#, c-format
3037msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3038msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3039
3040#: builtin/apply.c:945
3041#, c-format
3042msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3043msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3044
3045#: builtin/apply.c:952
3046#, c-format
3047msgid "git apply: bad git-diff - expected /dev/null on line %d"
3048msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3049
3050#: builtin/apply.c:1415
3051#, c-format
3052msgid "recount: unexpected line: %.*s"
3053msgstr "recount:意外的行:%.*s"
3054
3055#: builtin/apply.c:1472
3056#, c-format
3057msgid "patch fragment without header at line %d: %.*s"
3058msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3059
3060#: builtin/apply.c:1489
3061#, c-format
3062msgid ""
3063"git diff header lacks filename information when removing %d leading pathname "
3064"component (line %d)"
3065msgid_plural ""
3066"git diff header lacks filename information when removing %d leading pathname "
3067"components (line %d)"
3068msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3069msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3070
3071#: builtin/apply.c:1655
3072msgid "new file depends on old contents"
3073msgstr "新文件依赖旧内容"
3074
3075#: builtin/apply.c:1657
3076msgid "deleted file still has contents"
3077msgstr "删除的文件仍有内容"
3078
3079#: builtin/apply.c:1683
3080#, c-format
3081msgid "corrupt patch at line %d"
3082msgstr "补丁在第 %d 行损坏"
3083
3084#: builtin/apply.c:1719
3085#, c-format
3086msgid "new file %s depends on old contents"
3087msgstr "新文件 %s 依赖旧内容"
3088
3089#: builtin/apply.c:1721
3090#, c-format
3091msgid "deleted file %s still has contents"
3092msgstr "删除的文件 %s 仍有内容"
3093
3094#: builtin/apply.c:1724
3095#, c-format
3096msgid "** warning: file %s becomes empty but is not deleted"
3097msgstr "** 警告:文件 %s 成为空文件但并未删除"
3098
3099#: builtin/apply.c:1870
3100#, c-format
3101msgid "corrupt binary patch at line %d: %.*s"
3102msgstr "二进制补丁在第 %d 行损坏:%.*s"
3103
3104#: builtin/apply.c:1899
3105#, c-format
3106msgid "unrecognized binary patch at line %d"
3107msgstr "未能识别的二进制补丁位于第 %d 行"
3108
3109#: builtin/apply.c:2050
3110#, c-format
3111msgid "patch with only garbage at line %d"
3112msgstr "补丁文件的第 %d 行只有垃圾数据"
3113
3114#: builtin/apply.c:2140
3115#, c-format
3116msgid "unable to read symlink %s"
3117msgstr "无法读取符号链接 %s"
3118
3119#: builtin/apply.c:2144
3120#, c-format
3121msgid "unable to open or read %s"
3122msgstr "不能打开或读取 %s"
3123
3124#: builtin/apply.c:2777
3125#, c-format
3126msgid "invalid start of line: '%c'"
3127msgstr "无效的行首字符:'%c'"
3128
3129#: builtin/apply.c:2896
3130#, c-format
3131msgid "Hunk #%d succeeded at %d (offset %d line)."
3132msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3133msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3134msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3135
3136#: builtin/apply.c:2908
3137#, c-format
3138msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3139msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3140
3141#: builtin/apply.c:2914
3142#, c-format
3143msgid ""
3144"while searching for:\n"
3145"%.*s"
3146msgstr ""
3147"当查询:\n"
3148"%.*s"
3149
3150#: builtin/apply.c:2934
3151#, c-format
3152msgid "missing binary patch data for '%s'"
3153msgstr "缺失 '%s' 的二进制补丁数据"
3154
3155#: builtin/apply.c:3035
3156#, c-format
3157msgid "binary patch does not apply to '%s'"
3158msgstr "二进制补丁未应用到 '%s'"
3159
3160#: builtin/apply.c:3041
3161#, c-format
3162msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3163msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3164
3165#: builtin/apply.c:3062
3166#, c-format
3167msgid "patch failed: %s:%ld"
3168msgstr "打补丁失败:%s:%ld"
3169
3170#: builtin/apply.c:3186
3171#, c-format
3172msgid "cannot checkout %s"
3173msgstr "不能检出 %s"
3174
3175#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3176#, c-format
3177msgid "read of %s failed"
3178msgstr "读取 %s 失败"
3179
3180#: builtin/apply.c:3239
3181#, c-format
3182msgid "reading from '%s' beyond a symbolic link"
3183msgstr "读取位于符号链接中的 '%s'"
3184
3185#: builtin/apply.c:3267 builtin/apply.c:3489
3186#, c-format
3187msgid "path %s has been renamed/deleted"
3188msgstr "路径 %s 已经被重命名/删除"
3189
3190#: builtin/apply.c:3348 builtin/apply.c:3503
3191#, c-format
3192msgid "%s: does not exist in index"
3193msgstr "%s:不存在于索引中"
3194
3195#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3196#, c-format
3197msgid "%s: %s"
3198msgstr "%s:%s"
3199
3200#: builtin/apply.c:3357 builtin/apply.c:3511
3201#, c-format
3202msgid "%s: does not match index"
3203msgstr "%s:和索引不匹配"
3204
3205#: builtin/apply.c:3459
3206msgid "removal patch leaves file contents"
3207msgstr "移除补丁仍留下了文件内容"
3208
3209#: builtin/apply.c:3528
3210#, c-format
3211msgid "%s: wrong type"
3212msgstr "%s:错误类型"
3213
3214#: builtin/apply.c:3530
3215#, c-format
3216msgid "%s has type %o, expected %o"
3217msgstr "%s 的类型是 %o,应为 %o"
3218
3219#: builtin/apply.c:3689 builtin/apply.c:3691
3220#, c-format
3221msgid "invalid path '%s'"
3222msgstr "无效路径 '%s'"
3223
3224#: builtin/apply.c:3746
3225#, c-format
3226msgid "%s: already exists in index"
3227msgstr "%s:已经存在于索引中"
3228
3229#: builtin/apply.c:3749
3230#, c-format
3231msgid "%s: already exists in working directory"
3232msgstr "%s:已经存在于工作区中"
3233
3234#: builtin/apply.c:3769
3235#, c-format
3236msgid "new mode (%o) of %s does not match old mode (%o)"
3237msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3238
3239#: builtin/apply.c:3774
3240#, c-format
3241msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3242msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3243
3244#: builtin/apply.c:3794
3245#, c-format
3246msgid "affected file '%s' is beyond a symbolic link"
3247msgstr "受影响的文件 '%s' 位于符号链接中"
3248
3249#: builtin/apply.c:3798
3250#, c-format
3251msgid "%s: patch does not apply"
3252msgstr "%s:补丁未应用"
3253
3254#: builtin/apply.c:3812
3255#, c-format
3256msgid "Checking patch %s..."
3257msgstr "检查补丁 %s..."
3258
3259#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3260#, c-format
3261msgid "make_cache_entry failed for path '%s'"
3262msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3263
3264#: builtin/apply.c:4048
3265#, c-format
3266msgid "unable to remove %s from index"
3267msgstr "不能从索引中移除 %s"
3268
3269#: builtin/apply.c:4077
3270#, c-format
3271msgid "corrupt patch for submodule %s"
3272msgstr "子模组 %s 损坏的补丁"
3273
3274#: builtin/apply.c:4081
3275#, c-format
3276msgid "unable to stat newly created file '%s'"
3277msgstr "不能枚举新建文件 '%s' 的状态"
3278
3279#: builtin/apply.c:4086
3280#, c-format
3281msgid "unable to create backing store for newly created file %s"
3282msgstr "不能为新建文件 %s 创建后端存储"
3283
3284#: builtin/apply.c:4089 builtin/apply.c:4197
3285#, c-format
3286msgid "unable to add cache entry for %s"
3287msgstr "无法为 %s 添加缓存条目"
3288
3289#: builtin/apply.c:4122
3290#, c-format
3291msgid "closing file '%s'"
3292msgstr "关闭文件 '%s'"
3293
3294#: builtin/apply.c:4171
3295#, c-format
3296msgid "unable to write file '%s' mode %o"
3297msgstr "不能写文件 '%s' 权限 %o"
3298
3299#: builtin/apply.c:4258
3300#, c-format
3301msgid "Applied patch %s cleanly."
3302msgstr "成功应用补丁 %s。"
3303
3304#: builtin/apply.c:4266
3305msgid "internal error"
3306msgstr "内部错误"
3307
3308#: builtin/apply.c:4269
3309#, c-format
3310msgid "Applying patch %%s with %d reject..."
3311msgid_plural "Applying patch %%s with %d rejects..."
3312msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3313msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3314
3315#: builtin/apply.c:4279
3316#, c-format
3317msgid "truncating .rej filename to %.*s.rej"
3318msgstr "截短 .rej 文件名为 %.*s.rej"
3319
3320#: builtin/apply.c:4300
3321#, c-format
3322msgid "Hunk #%d applied cleanly."
3323msgstr "第 #%d 个片段成功应用。"
3324
3325#: builtin/apply.c:4303
3326#, c-format
3327msgid "Rejected hunk #%d."
3328msgstr "拒绝第 #%d 个片段。"
3329
3330#: builtin/apply.c:4393
3331msgid "unrecognized input"
3332msgstr "未能识别的输入"
3333
3334#: builtin/apply.c:4404
3335msgid "unable to read index file"
3336msgstr "无法读取索引文件"
3337
3338#: builtin/apply.c:4507
3339msgid "don't apply changes matching the given path"
3340msgstr "不要应用与给出路径向匹配的变更"
3341
3342#: builtin/apply.c:4510
3343msgid "apply changes matching the given path"
3344msgstr "应用与给出路径向匹配的变更"
3345
3346#: builtin/apply.c:4513
3347msgid "remove <num> leading slashes from traditional diff paths"
3348msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3349
3350#: builtin/apply.c:4516
3351msgid "ignore additions made by the patch"
3352msgstr "忽略补丁中的添加的文件"
3353
3354#: builtin/apply.c:4518
3355msgid "instead of applying the patch, output diffstat for the input"
3356msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3357
3358#: builtin/apply.c:4522
3359msgid "show number of added and deleted lines in decimal notation"
3360msgstr "以十进制数显示添加和删除的行数"
3361
3362#: builtin/apply.c:4524
3363msgid "instead of applying the patch, output a summary for the input"
3364msgstr "不应用补丁,而是显示输入的概要"
3365
3366#: builtin/apply.c:4526
3367msgid "instead of applying the patch, see if the patch is applicable"
3368msgstr "不应用补丁,而是查看补丁是否可应用"
3369
3370#: builtin/apply.c:4528
3371msgid "make sure the patch is applicable to the current index"
3372msgstr "确认补丁可以应用到当前索引"
3373
3374#: builtin/apply.c:4530
3375msgid "apply a patch without touching the working tree"
3376msgstr "应用补丁而不修改工作区"
3377
3378#: builtin/apply.c:4532
3379msgid "accept a patch that touches outside the working area"
3380msgstr "接受修改工作区之外文件的补丁"
3381
3382#: builtin/apply.c:4534
3383msgid "also apply the patch (use with --stat/--summary/--check)"
3384msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3385
3386#: builtin/apply.c:4536
3387msgid "attempt three-way merge if a patch does not apply"
3388msgstr "如果一个补丁不能应用则尝试三方合并"
3389
3390#: builtin/apply.c:4538
3391msgid "build a temporary index based on embedded index information"
3392msgstr "创建一个临时索引基于嵌入的索引信息"
3393
3394#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
3395msgid "paths are separated with NUL character"
3396msgstr "路径以 NUL 字符分隔"
3397
3398#: builtin/apply.c:4543
3399msgid "ensure at least <n> lines of context match"
3400msgstr "确保至少匹配 <n> 行上下文"
3401
3402#: builtin/apply.c:4545
3403msgid "detect new or modified lines that have whitespace errors"
3404msgstr "检查新增和修改的行中间的空白字符滥用"
3405
3406#: builtin/apply.c:4548 builtin/apply.c:4551
3407msgid "ignore changes in whitespace when finding context"
3408msgstr "查找上下文时忽略空白字符的变更"
3409
3410#: builtin/apply.c:4554
3411msgid "apply the patch in reverse"
3412msgstr "反向应用补丁"
3413
3414#: builtin/apply.c:4556
3415msgid "don't expect at least one line of context"
3416msgstr "无需至少一行上下文"
3417
3418#: builtin/apply.c:4558
3419msgid "leave the rejected hunks in corresponding *.rej files"
3420msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3421
3422#: builtin/apply.c:4560
3423msgid "allow overlapping hunks"
3424msgstr "允许重叠的补丁片段"
3425
3426#: builtin/apply.c:4563
3427msgid "tolerate incorrectly detected missing new-line at the end of file"
3428msgstr "允许不正确的文件末尾换行符"
3429
3430#: builtin/apply.c:4566
3431msgid "do not trust the line counts in the hunk headers"
3432msgstr "不信任补丁片段的头信息中的行号"
3433
3434#: builtin/apply.c:4569
3435msgid "prepend <root> to all filenames"
3436msgstr "为所有文件名前添加 <根目录>"
3437
3438#: builtin/apply.c:4591
3439msgid "--3way outside a repository"
3440msgstr "--3way 在一个仓库之外"
3441
3442#: builtin/apply.c:4599
3443msgid "--index outside a repository"
3444msgstr "--index 在一个仓库之外"
3445
3446#: builtin/apply.c:4602
3447msgid "--cached outside a repository"
3448msgstr "--cached 在一个仓库之外"
3449
3450#: builtin/apply.c:4621
3451#, c-format
3452msgid "can't open patch '%s'"
3453msgstr "不能打开补丁 '%s'"
3454
3455#: builtin/apply.c:4635
3456#, c-format
3457msgid "squelched %d whitespace error"
3458msgid_plural "squelched %d whitespace errors"
3459msgstr[0] "抑制下仍有 %d 个空白字符误用"
3460msgstr[1] "抑制下仍有 %d 个空白字符误用"
3461
3462#: builtin/apply.c:4641 builtin/apply.c:4651
3463#, c-format
3464msgid "%d line adds whitespace errors."
3465msgid_plural "%d lines add whitespace errors."
3466msgstr[0] "%d 行有空白字符误用。"
3467msgstr[1] "%d 行有空白字符误用。"
3468
3469#: builtin/archive.c:17
3470#, c-format
3471msgid "could not create archive file '%s'"
3472msgstr "不能创建归档文件 '%s'"
3473
3474#: builtin/archive.c:20
3475msgid "could not redirect output"
3476msgstr "不能重定向输出"
3477
3478#: builtin/archive.c:37
3479msgid "git archive: Remote with no URL"
3480msgstr "git archive:未提供远程 URL"
3481
3482#: builtin/archive.c:58
3483msgid "git archive: expected ACK/NAK, got EOF"
3484msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3485
3486#: builtin/archive.c:61
3487#, c-format
3488msgid "git archive: NACK %s"
3489msgstr "git archive:NACK %s"
3490
3491#: builtin/archive.c:63
3492#, c-format
3493msgid "remote error: %s"
3494msgstr "远程错误:%s"
3495
3496#: builtin/archive.c:64
3497msgid "git archive: protocol error"
3498msgstr "git archive:协议错误"
3499
3500#: builtin/archive.c:68
3501msgid "git archive: expected a flush"
3502msgstr "git archive:应为刷新"
3503
3504#: builtin/bisect--helper.c:7
3505msgid "git bisect--helper --next-all [--no-checkout]"
3506msgstr "git bisect--helper --next-all [--no-checkout]"
3507
3508#: builtin/bisect--helper.c:17
3509msgid "perform 'git bisect next'"
3510msgstr "执行 'git bisect next'"
3511
3512#: builtin/bisect--helper.c:19
3513msgid "update BISECT_HEAD instead of checking out the current commit"
3514msgstr "更新 BISECT_HEAD 而非检出当前提交"
3515
3516#: builtin/blame.c:33
3517msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3518msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3519
3520#: builtin/blame.c:38
3521msgid "<rev-opts> are documented in git-rev-list(1)"
3522msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3523
3524#: builtin/blame.c:1782
3525msgid "Blaming lines"
3526msgstr "追踪代码行"
3527
3528#: builtin/blame.c:2530
3529msgid "Show blame entries as we find them, incrementally"
3530msgstr "增量式地显示发现的 blame 条目"
3531
3532#: builtin/blame.c:2531
3533msgid "Show blank SHA-1 for boundary commits (Default: off)"
3534msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3535
3536#: builtin/blame.c:2532
3537msgid "Do not treat root commits as boundaries (Default: off)"
3538msgstr "不把根提交作为边界(默认:关闭)"
3539
3540#: builtin/blame.c:2533
3541msgid "Show work cost statistics"
3542msgstr "显示命令消耗统计"
3543
3544#: builtin/blame.c:2534
3545msgid "Force progress reporting"
3546msgstr "强制进度显示"
3547
3548#: builtin/blame.c:2535
3549msgid "Show output score for blame entries"
3550msgstr "显示判断 blame 条目位移的得分诊断信息"
3551
3552#: builtin/blame.c:2536
3553msgid "Show original filename (Default: auto)"
3554msgstr "显示原始文件名(默认:自动)"
3555
3556#: builtin/blame.c:2537
3557msgid "Show original linenumber (Default: off)"
3558msgstr "显示原始的行号(默认:关闭)"
3559
3560#: builtin/blame.c:2538
3561msgid "Show in a format designed for machine consumption"
3562msgstr "显示为一个适合机器读取的格式"
3563
3564#: builtin/blame.c:2539
3565msgid "Show porcelain format with per-line commit information"
3566msgstr "为每一行显示机器适用的提交信息"
3567
3568#: builtin/blame.c:2540
3569msgid "Use the same output mode as git-annotate (Default: off)"
3570msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3571
3572#: builtin/blame.c:2541
3573msgid "Show raw timestamp (Default: off)"
3574msgstr "显示原始时间戳(默认:关闭)"
3575
3576#: builtin/blame.c:2542
3577msgid "Show long commit SHA1 (Default: off)"
3578msgstr "显示长的 SHA1 提交号(默认:关闭)"
3579
3580#: builtin/blame.c:2543
3581msgid "Suppress author name and timestamp (Default: off)"
3582msgstr "隐藏作者名字和时间戳(默认:关闭)"
3583
3584#: builtin/blame.c:2544
3585msgid "Show author email instead of name (Default: off)"
3586msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3587
3588#: builtin/blame.c:2545
3589msgid "Ignore whitespace differences"
3590msgstr "忽略空白差异"
3591
3592#: builtin/blame.c:2546
3593msgid "Spend extra cycles to find better match"
3594msgstr "花费额外的循环来找到更好的匹配"
3595
3596#: builtin/blame.c:2547
3597msgid "Use revisions from <file> instead of calling git-rev-list"
3598msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3599
3600#: builtin/blame.c:2548
3601msgid "Use <file>'s contents as the final image"
3602msgstr "使用 <文件> 的内容作为最终的图片"
3603
3604#: builtin/blame.c:2549 builtin/blame.c:2550
3605msgid "score"
3606msgstr "得分"
3607
3608#: builtin/blame.c:2549
3609msgid "Find line copies within and across files"
3610msgstr "找到文件内及跨文件的行拷贝"
3611
3612#: builtin/blame.c:2550
3613msgid "Find line movements within and across files"
3614msgstr "找到文件内及跨文件的行移动"
3615
3616#: builtin/blame.c:2551
3617msgid "n,m"
3618msgstr "n,m"
3619
3620#: builtin/blame.c:2551
3621msgid "Process only line range n,m, counting from 1"
3622msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3623
3624#. TRANSLATORS: This string is used to tell us the maximum
3625#. display width for a relative timestamp in "git blame"
3626#. output. For C locale, "4 years, 11 months ago", which
3627#. takes 22 places, is the longest among various forms of
3628#. relative timestamps, but your language may need more or
3629#. fewer display columns.
3630#: builtin/blame.c:2640
3631msgid "4 years, 11 months ago"
3632msgstr "4 年 11 个月前"
3633
3634#: builtin/branch.c:25
3635msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3636msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3637
3638#: builtin/branch.c:26
3639msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3640msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3641
3642#: builtin/branch.c:27
3643msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3644msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3645
3646#: builtin/branch.c:28
3647msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3648msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3649
3650#: builtin/branch.c:29
3651msgid "git branch [<options>] [-r | -a] [--points-at]"
3652msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3653
3654# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3655#: builtin/branch.c:142
3656#, c-format
3657msgid ""
3658"deleting branch '%s' that has been merged to\n"
3659" '%s', but not yet merged to HEAD."
3660msgstr ""
3661"将要删除的分支 '%s' 已经被合并到\n"
3662" '%s',但未合并到 HEAD。"
3663
3664# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3665#: builtin/branch.c:146
3666#, c-format
3667msgid ""
3668"not deleting branch '%s' that is not yet merged to\n"
3669" '%s', even though it is merged to HEAD."
3670msgstr ""
3671"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3672" 然而却尚未被合并到分支 '%s' 。"
3673
3674#: builtin/branch.c:160
3675#, c-format
3676msgid "Couldn't look up commit object for '%s'"
3677msgstr "无法查询 '%s' 指向的提交对象"
3678
3679#: builtin/branch.c:164
3680#, c-format
3681msgid ""
3682"The branch '%s' is not fully merged.\n"
3683"If you are sure you want to delete it, run 'git branch -D %s'."
3684msgstr ""
3685"分支 '%s' 没有完全合并。\n"
3686"如果您确认要删除它,执行 'git branch -D %s'。"
3687
3688#: builtin/branch.c:177
3689msgid "Update of config-file failed"
3690msgstr "无法更新 config 文件"
3691
3692#: builtin/branch.c:205
3693msgid "cannot use -a with -d"
3694msgstr "不能将 -a 和 -d 同时使用"
3695
3696#: builtin/branch.c:211
3697msgid "Couldn't look up commit object for HEAD"
3698msgstr "无法查询 HEAD 指向的提交对象"
3699
3700#: builtin/branch.c:219
3701#, c-format
3702msgid "Cannot delete the branch '%s' which you are currently on."
3703msgstr "无法删除您当前所在的分支 '%s'。"
3704
3705#: builtin/branch.c:235
3706#, c-format
3707msgid "remote-tracking branch '%s' not found."
3708msgstr "未能找到远程跟踪分支 '%s'。"
3709
3710#: builtin/branch.c:236
3711#, c-format
3712msgid "branch '%s' not found."
3713msgstr "分支 '%s' 未发现。"
3714
3715#: builtin/branch.c:251
3716#, c-format
3717msgid "Error deleting remote-tracking branch '%s'"
3718msgstr "无法删除远程跟踪分支 '%s'"
3719
3720#: builtin/branch.c:252
3721#, c-format
3722msgid "Error deleting branch '%s'"
3723msgstr "无法删除分支 '%s'"
3724
3725#: builtin/branch.c:259
3726#, c-format
3727msgid "Deleted remote-tracking branch %s (was %s).\n"
3728msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3729
3730#: builtin/branch.c:260
3731#, c-format
3732msgid "Deleted branch %s (was %s).\n"
3733msgstr "已删除分支 %s(曾为 %s)。\n"
3734
3735#: builtin/branch.c:303
3736#, c-format
3737msgid "[%s: gone]"
3738msgstr "[%s: 丢失]"
3739
3740#: builtin/branch.c:308
3741#, c-format
3742msgid "[%s]"
3743msgstr "[%s]"
3744
3745#: builtin/branch.c:313
3746#, c-format
3747msgid "[%s: behind %d]"
3748msgstr "[%s:落后 %d]"
3749
3750#: builtin/branch.c:315
3751#, c-format
3752msgid "[behind %d]"
3753msgstr "[落后 %d]"
3754
3755#: builtin/branch.c:319
3756#, c-format
3757msgid "[%s: ahead %d]"
3758msgstr "[%s:领先 %d]"
3759
3760#: builtin/branch.c:321
3761#, c-format
3762msgid "[ahead %d]"
3763msgstr "[领先 %d]"
3764
3765#: builtin/branch.c:324
3766#, c-format
3767msgid "[%s: ahead %d, behind %d]"
3768msgstr "[%s:领先 %d,落后 %d]"
3769
3770#: builtin/branch.c:327
3771#, c-format
3772msgid "[ahead %d, behind %d]"
3773msgstr "[领先 %d,落后 %d]"
3774
3775#: builtin/branch.c:340
3776msgid " **** invalid ref ****"
3777msgstr " **** 无效引用 ****"
3778
3779#: builtin/branch.c:366
3780#, c-format
3781msgid "(no branch, rebasing %s)"
3782msgstr "(非分支,正变基 %s)"
3783
3784#: builtin/branch.c:369
3785#, c-format
3786msgid "(no branch, bisect started on %s)"
3787msgstr "(非分支,二分查找开始于 %s)"
3788
3789#: builtin/branch.c:375
3790#, c-format
3791msgid "(HEAD detached at %s)"
3792msgstr "(头指针分离于 %s)"
3793
3794#: builtin/branch.c:378
3795#, c-format
3796msgid "(HEAD detached from %s)"
3797msgstr "(头指针分离自 %s)"
3798
3799#: builtin/branch.c:382
3800msgid "(no branch)"
3801msgstr "(非分支)"
3802
3803#: builtin/branch.c:524
3804msgid "cannot rename the current branch while not on any."
3805msgstr "无法重命名当前分支因为不处于任何分支上。"
3806
3807#: builtin/branch.c:534
3808#, c-format
3809msgid "Invalid branch name: '%s'"
3810msgstr "无效的分支名:'%s'"
3811
3812#: builtin/branch.c:549
3813msgid "Branch rename failed"
3814msgstr "分支重命名失败"
3815
3816#: builtin/branch.c:553
3817#, c-format
3818msgid "Renamed a misnamed branch '%s' away"
3819msgstr "重命名掉一个错误命名的旧分支 '%s'"
3820
3821#: builtin/branch.c:557
3822#, c-format
3823msgid "Branch renamed to %s, but HEAD is not updated!"
3824msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3825
3826#: builtin/branch.c:564
3827msgid "Branch is renamed, but update of config-file failed"
3828msgstr "分支被重命名,但更新 config 文件失败"
3829
3830#: builtin/branch.c:586
3831#, c-format
3832msgid "could not write branch description template: %s"
3833msgstr "不能写分支描述模版:%s"
3834
3835#: builtin/branch.c:615
3836msgid "Generic options"
3837msgstr "通用选项"
3838
3839#: builtin/branch.c:617
3840msgid "show hash and subject, give twice for upstream branch"
3841msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3842
3843#: builtin/branch.c:618
3844msgid "suppress informational messages"
3845msgstr "不显示信息"
3846
3847#: builtin/branch.c:619
3848msgid "set up tracking mode (see git-pull(1))"
3849msgstr "设置跟踪模式(参见 git-pull(1))"
3850
3851#: builtin/branch.c:621
3852msgid "change upstream info"
3853msgstr "改变上游信息"
3854
3855#: builtin/branch.c:625
3856msgid "use colored output"
3857msgstr "使用彩色输出"
3858
3859#: builtin/branch.c:626
3860msgid "act on remote-tracking branches"
3861msgstr "作用于远程跟踪分支"
3862
3863#: builtin/branch.c:628 builtin/branch.c:629
3864msgid "print only branches that contain the commit"
3865msgstr "只打印包含该提交的分支"
3866
3867#: builtin/branch.c:632
3868msgid "Specific git-branch actions:"
3869msgstr "具体的 git-branch 动作:"
3870
3871#: builtin/branch.c:633
3872msgid "list both remote-tracking and local branches"
3873msgstr "列出远程跟踪及本地分支"
3874
3875#: builtin/branch.c:635
3876msgid "delete fully merged branch"
3877msgstr "删除完全合并的分支"
3878
3879#: builtin/branch.c:636
3880msgid "delete branch (even if not merged)"
3881msgstr "删除分支(即使没有合并)"
3882
3883#: builtin/branch.c:637
3884msgid "move/rename a branch and its reflog"
3885msgstr "移动/重命名一个分支,以及它的引用日志"
3886
3887#: builtin/branch.c:638
3888msgid "move/rename a branch, even if target exists"
3889msgstr "移动/重命名一个分支,即使目标已存在"
3890
3891#: builtin/branch.c:639
3892msgid "list branch names"
3893msgstr "列出分支名"
3894
3895#: builtin/branch.c:640
3896msgid "create the branch's reflog"
3897msgstr "创建分支的引用日志"
3898
3899#: builtin/branch.c:642
3900msgid "edit the description for the branch"
3901msgstr "标记分支的描述"
3902
3903#: builtin/branch.c:643
3904msgid "force creation, move/rename, deletion"
3905msgstr "强制创建、移动/重命名、删除"
3906
3907#: builtin/branch.c:644
3908msgid "print only branches that are merged"
3909msgstr "只打印已经合并的分支"
3910
3911#: builtin/branch.c:645
3912msgid "print only branches that are not merged"
3913msgstr "只打印尚未合并的分支"
3914
3915#: builtin/branch.c:646
3916msgid "list branches in columns"
3917msgstr "以列的方式显示分支"
3918
3919#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
3920msgid "key"
3921msgstr "key"
3922
3923#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
3924msgid "field name to sort on"
3925msgstr "排序的字段名"
3926
3927#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
3928#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
3929#: builtin/tag.c:369
3930msgid "object"
3931msgstr "对象"
3932
3933#: builtin/branch.c:651
3934msgid "print only branches of the object"
3935msgstr "只打印指向该对象的分支"
3936
3937#: builtin/branch.c:669
3938msgid "Failed to resolve HEAD as a valid ref."
3939msgstr "无法将 HEAD 解析为有效引用。"
3940
3941#: builtin/branch.c:673 builtin/clone.c:705
3942msgid "HEAD not found below refs/heads!"
3943msgstr "HEAD 没有位于 /refs/heads 之下!"
3944
3945#: builtin/branch.c:693
3946msgid "--column and --verbose are incompatible"
3947msgstr "--column 和 --verbose 不兼容"
3948
3949#: builtin/branch.c:704 builtin/branch.c:746
3950msgid "branch name required"
3951msgstr "必须提供分支名"
3952
3953#: builtin/branch.c:722
3954msgid "Cannot give description to detached HEAD"
3955msgstr "不能向分离头指针提供描述"
3956
3957#: builtin/branch.c:727
3958msgid "cannot edit description of more than one branch"
3959msgstr "不能为一个以上的分支编辑描述"
3960
3961#: builtin/branch.c:734
3962#, c-format
3963msgid "No commit on branch '%s' yet."
3964msgstr "分支 '%s' 尚无提交。"
3965
3966#: builtin/branch.c:737
3967#, c-format
3968msgid "No branch named '%s'."
3969msgstr "没有分支 '%s'。"
3970
3971#: builtin/branch.c:752
3972msgid "too many branches for a rename operation"
3973msgstr "为重命名操作提供了太多的分支名"
3974
3975#: builtin/branch.c:757
3976msgid "too many branches to set new upstream"
3977msgstr "为设置新上游提供了太多的分支名"
3978
3979#: builtin/branch.c:761
3980#, c-format
3981msgid ""
3982"could not set upstream of HEAD to %s when it does not point to any branch."
3983msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3984
3985#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
3986#, c-format
3987msgid "no such branch '%s'"
3988msgstr "没有此分支 '%s'"
3989
3990#: builtin/branch.c:768
3991#, c-format
3992msgid "branch '%s' does not exist"
3993msgstr "分支 '%s' 不存在"
3994
3995#: builtin/branch.c:780
3996msgid "too many branches to unset upstream"
3997msgstr "为取消上游设置操作提供了太多的分支名"
3998
3999#: builtin/branch.c:784
4000msgid "could not unset upstream of HEAD when it does not point to any branch."
4001msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4002
4003#: builtin/branch.c:790
4004#, c-format
4005msgid "Branch '%s' has no upstream information"
4006msgstr "分支 '%s' 没有上游信息"
4007
4008#: builtin/branch.c:804
4009msgid "it does not make sense to create 'HEAD' manually"
4010msgstr "手工创建 'HEAD' 没有意义"
4011
4012#: builtin/branch.c:810
4013msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4014msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4015
4016#: builtin/branch.c:813
4017#, c-format
4018msgid ""
4019"The --set-upstream flag is deprecated and will be removed. Consider using --"
4020"track or --set-upstream-to\n"
4021msgstr ""
4022"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4023
4024#: builtin/branch.c:830
4025#, c-format
4026msgid ""
4027"\n"
4028"If you wanted to make '%s' track '%s', do this:\n"
4029"\n"
4030msgstr ""
4031"\n"
4032"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4033"\n"
4034
4035#: builtin/branch.c:831
4036#, c-format
4037msgid " git branch -d %s\n"
4038msgstr " git branch -d %s\n"
4039
4040#: builtin/branch.c:832
4041#, c-format
4042msgid " git branch --set-upstream-to %s\n"
4043msgstr " git branch --set-upstream-to %s\n"
4044
4045#: builtin/bundle.c:51
4046#, c-format
4047msgid "%s is okay\n"
4048msgstr "%s 可以\n"
4049
4050#: builtin/bundle.c:64
4051msgid "Need a repository to create a bundle."
4052msgstr "需要一个仓库来创建包。"
4053
4054#: builtin/bundle.c:68
4055msgid "Need a repository to unbundle."
4056msgstr "需要一个仓库来解包。"
4057
4058#: builtin/cat-file.c:428
4059msgid ""
4060"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4061"<type>|--textconv) <object>"
4062msgstr ""
4063"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4064">|--textconv) <对象>"
4065
4066#: builtin/cat-file.c:429
4067msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4068msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4069
4070#: builtin/cat-file.c:466
4071msgid "<type> can be one of: blob, tree, commit, tag"
4072msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4073
4074#: builtin/cat-file.c:467
4075msgid "show object type"
4076msgstr "显示对象类型"
4077
4078#: builtin/cat-file.c:468
4079msgid "show object size"
4080msgstr "显示对象大小"
4081
4082#: builtin/cat-file.c:470
4083msgid "exit with zero when there's no error"
4084msgstr "当没有错误时退出并返回零"
4085
4086#: builtin/cat-file.c:471
4087msgid "pretty-print object's content"
4088msgstr "美观地打印对象的内容"
4089
4090#: builtin/cat-file.c:473
4091msgid "for blob objects, run textconv on object's content"
4092msgstr "对于数据对象,对其内容执行 textconv"
4093
4094#: builtin/cat-file.c:475
4095msgid "allow -s and -t to work with broken/corrupt objects"
4096msgstr "允许 -s 和 -t 对损坏的对象生效"
4097
4098#: builtin/cat-file.c:476
4099msgid "buffer --batch output"
4100msgstr "缓冲 --batch 的输出"
4101
4102#: builtin/cat-file.c:478
4103msgid "show info and content of objects fed from the standard input"
4104msgstr "显示从标准输入提供的对象的信息和内容"
4105
4106#: builtin/cat-file.c:481
4107msgid "show info about objects fed from the standard input"
4108msgstr "显示从标准输入提供的对象的信息"
4109
4110#: builtin/cat-file.c:484
4111msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4112msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4113
4114#: builtin/cat-file.c:486
4115msgid "show all objects with --batch or --batch-check"
4116msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4117
4118#: builtin/check-attr.c:11
4119msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4120msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4121
4122#: builtin/check-attr.c:12
4123msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4124msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4125
4126#: builtin/check-attr.c:19
4127msgid "report all attributes set on file"
4128msgstr "报告设置在文件上的所有属性"
4129
4130#: builtin/check-attr.c:20
4131msgid "use .gitattributes only from the index"
4132msgstr "只使用索引中的 .gitattributes"
4133
4134#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4135msgid "read file names from stdin"
4136msgstr "从标准输入读出文件名"
4137
4138#: builtin/check-attr.c:23 builtin/check-ignore.c:24
4139msgid "terminate input and output records by a NUL character"
4140msgstr "输入和输出的记录使用 NUL 字符终结"
4141
4142#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
4143msgid "suppress progress reporting"
4144msgstr "不显示进度报告"
4145
4146#: builtin/check-ignore.c:26
4147msgid "show non-matching input paths"
4148msgstr "显示未匹配的输入路径"
4149
4150#: builtin/check-ignore.c:28
4151msgid "ignore index when checking"
4152msgstr "检查时忽略索引"
4153
4154#: builtin/check-ignore.c:154
4155msgid "cannot specify pathnames with --stdin"
4156msgstr "不能同时指定路径及 --stdin 参数"
4157
4158#: builtin/check-ignore.c:157
4159msgid "-z only makes sense with --stdin"
4160msgstr "-z 需要和 --stdin 参数共用才有意义"
4161
4162#: builtin/check-ignore.c:159
4163msgid "no path specified"
4164msgstr "未指定路径"
4165
4166#: builtin/check-ignore.c:163
4167msgid "--quiet is only valid with a single pathname"
4168msgstr "参数 --quiet 只在提供一个路径名时有效"
4169
4170#: builtin/check-ignore.c:165
4171msgid "cannot have both --quiet and --verbose"
4172msgstr "不能同时提供 --quiet 和 --verbose 参数"
4173
4174#: builtin/check-ignore.c:168
4175msgid "--non-matching is only valid with --verbose"
4176msgstr "--non-matching 选项只在使用 --verbose 时有效"
4177
4178#: builtin/check-mailmap.c:8
4179msgid "git check-mailmap [<options>] <contact>..."
4180msgstr "git check-mailmap [<选项>] <联系地址>..."
4181
4182#: builtin/check-mailmap.c:13
4183msgid "also read contacts from stdin"
4184msgstr "还从标准输入读取联系地址"
4185
4186#: builtin/check-mailmap.c:24
4187#, c-format
4188msgid "unable to parse contact: %s"
4189msgstr "不能解析联系地址:%s"
4190
4191#: builtin/check-mailmap.c:47
4192msgid "no contacts specified"
4193msgstr "未指定联系地址"
4194
4195#: builtin/checkout-index.c:127
4196msgid "git checkout-index [<options>] [--] [<file>...]"
4197msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4198
4199#: builtin/checkout-index.c:144
4200msgid "stage should be between 1 and 3 or all"
4201msgstr "索引值应该取值 1 到 3 或者 all"
4202
4203#: builtin/checkout-index.c:160
4204msgid "check out all files in the index"
4205msgstr "检出索引区的所有文件"
4206
4207#: builtin/checkout-index.c:161
4208msgid "force overwrite of existing files"
4209msgstr "强制覆盖现有的文件"
4210
4211#: builtin/checkout-index.c:163
4212msgid "no warning for existing files and files not in index"
4213msgstr "存在或不在索引中的文件都没有警告"
4214
4215#: builtin/checkout-index.c:165
4216msgid "don't checkout new files"
4217msgstr "不检出新文件"
4218
4219#: builtin/checkout-index.c:167
4220msgid "update stat information in the index file"
4221msgstr "更新索引中文件的状态信息"
4222
4223#: builtin/checkout-index.c:171
4224msgid "read list of paths from the standard input"
4225msgstr "从标准输入读取路径列表"
4226
4227#: builtin/checkout-index.c:173
4228msgid "write the content to temporary files"
4229msgstr "将内容写入临时文件"
4230
4231#: builtin/checkout-index.c:174 builtin/column.c:30
4232#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
4233#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4234msgid "string"
4235msgstr "字符串"
4236
4237#: builtin/checkout-index.c:175
4238msgid "when creating files, prepend <string>"
4239msgstr "在创建文件时,在前面加上 <字符串>"
4240
4241#: builtin/checkout-index.c:177
4242msgid "copy out the files from named stage"
4243msgstr "从指定暂存区中拷出文件"
4244
4245#: builtin/checkout.c:25
4246msgid "git checkout [<options>] <branch>"
4247msgstr "git checkout [<选项>] <分支>"
4248
4249#: builtin/checkout.c:26
4250msgid "git checkout [<options>] [<branch>] -- <file>..."
4251msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4252
4253#: builtin/checkout.c:134 builtin/checkout.c:167
4254#, c-format
4255msgid "path '%s' does not have our version"
4256msgstr "路径 '%s' 没有我们的版本"
4257
4258#: builtin/checkout.c:136 builtin/checkout.c:169
4259#, c-format
4260msgid "path '%s' does not have their version"
4261msgstr "路径 '%s' 没有他们的版本"
4262
4263#: builtin/checkout.c:152
4264#, c-format
4265msgid "path '%s' does not have all necessary versions"
4266msgstr "路径 '%s' 没有全部必须的版本"
4267
4268#: builtin/checkout.c:196
4269#, c-format
4270msgid "path '%s' does not have necessary versions"
4271msgstr "路径 '%s' 没有必须的版本"
4272
4273#: builtin/checkout.c:213
4274#, c-format
4275msgid "path '%s': cannot merge"
4276msgstr "path '%s':无法合并"
4277
4278#: builtin/checkout.c:230
4279#, c-format
4280msgid "Unable to add merge result for '%s'"
4281msgstr "无法为 '%s' 添加合并结果"
4282
4283#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4284#: builtin/checkout.c:260
4285#, c-format
4286msgid "'%s' cannot be used with updating paths"
4287msgstr "'%s' 不能在更新路径时使用"
4288
4289#: builtin/checkout.c:263 builtin/checkout.c:266
4290#, c-format
4291msgid "'%s' cannot be used with %s"
4292msgstr "'%s' 不能和 %s 同时使用"
4293
4294#: builtin/checkout.c:269
4295#, c-format
4296msgid "Cannot update paths and switch to branch '%s' at the same time."
4297msgstr "不能同时更新路径并切换到分支'%s'。"
4298
4299#: builtin/checkout.c:280 builtin/checkout.c:474
4300msgid "corrupt index file"
4301msgstr "损坏的索引文件"
4302
4303#: builtin/checkout.c:340 builtin/checkout.c:347
4304#, c-format
4305msgid "path '%s' is unmerged"
4306msgstr "路径 '%s' 未合并"
4307
4308#: builtin/checkout.c:496
4309msgid "you need to resolve your current index first"
4310msgstr "您需要先解决当前索引的冲突"
4311
4312#: builtin/checkout.c:623
4313#, c-format
4314msgid "Can not do reflog for '%s': %s\n"
4315msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4316
4317#: builtin/checkout.c:661
4318msgid "HEAD is now at"
4319msgstr "HEAD 目前位于"
4320
4321#: builtin/checkout.c:665 builtin/clone.c:659
4322msgid "unable to update HEAD"
4323msgstr "不能更新 HEAD"
4324
4325#: builtin/checkout.c:669
4326#, c-format
4327msgid "Reset branch '%s'\n"
4328msgstr "重置分支 '%s'\n"
4329
4330#: builtin/checkout.c:672
4331#, c-format
4332msgid "Already on '%s'\n"
4333msgstr "已经位于 '%s'\n"
4334
4335#: builtin/checkout.c:676
4336#, c-format
4337msgid "Switched to and reset branch '%s'\n"
4338msgstr "切换并重置分支 '%s'\n"
4339
4340#: builtin/checkout.c:678 builtin/checkout.c:1068
4341#, c-format
4342msgid "Switched to a new branch '%s'\n"
4343msgstr "切换到一个新分支 '%s'\n"
4344
4345#: builtin/checkout.c:680
4346#, c-format
4347msgid "Switched to branch '%s'\n"
4348msgstr "切换到分支 '%s'\n"
4349
4350# 译者:注意保持前导空格
4351#: builtin/checkout.c:732
4352#, c-format
4353msgid " ... and %d more.\n"
4354msgstr " ... 及其它 %d 个。\n"
4355
4356#: builtin/checkout.c:738
4357#, c-format
4358msgid ""
4359"Warning: you are leaving %d commit behind, not connected to\n"
4360"any of your branches:\n"
4361"\n"
4362"%s\n"
4363msgid_plural ""
4364"Warning: you are leaving %d commits behind, not connected to\n"
4365"any of your branches:\n"
4366"\n"
4367"%s\n"
4368msgstr[0] ""
4369"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4370"\n"
4371"%s\n"
4372msgstr[1] ""
4373"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4374"\n"
4375"%s\n"
4376
4377#: builtin/checkout.c:757
4378#, c-format
4379msgid ""
4380"If you want to keep it by creating a new branch, this may be a good time\n"
4381"to do so with:\n"
4382"\n"
4383" git branch <new-branch-name> %s\n"
4384"\n"
4385msgid_plural ""
4386"If you want to keep them by creating a new branch, this may be a good time\n"
4387"to do so with:\n"
4388"\n"
4389" git branch <new-branch-name> %s\n"
4390"\n"
4391msgstr[0] ""
4392"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4393"如下操作:\n"
4394"\n"
4395" git branch <新分支名> %s\n"
4396"\n"
4397msgstr[1] ""
4398"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4399"如下操作:\n"
4400"\n"
4401" git branch <新分支名> %s\n"
4402"\n"
4403
4404#: builtin/checkout.c:793
4405msgid "internal error in revision walk"
4406msgstr "在版本遍历时遇到内部错误"
4407
4408#: builtin/checkout.c:797
4409msgid "Previous HEAD position was"
4410msgstr "之前的 HEAD 位置是"
4411
4412#: builtin/checkout.c:824 builtin/checkout.c:1063
4413msgid "You are on a branch yet to be born"
4414msgstr "您位于一个尚未初始化的分支"
4415
4416#: builtin/checkout.c:969
4417#, c-format
4418msgid "only one reference expected, %d given."
4419msgstr "只要一个引用,却给出了 %d 个"
4420
4421#: builtin/checkout.c:1009 builtin/worktree.c:211
4422#, c-format
4423msgid "invalid reference: %s"
4424msgstr "无效引用:%s"
4425
4426#: builtin/checkout.c:1038
4427#, c-format
4428msgid "reference is not a tree: %s"
4429msgstr "引用不是一个树:%s"
4430
4431#: builtin/checkout.c:1077
4432msgid "paths cannot be used with switching branches"
4433msgstr "路径不能和切换分支同时使用"
4434
4435#: builtin/checkout.c:1080 builtin/checkout.c:1084
4436#, c-format
4437msgid "'%s' cannot be used with switching branches"
4438msgstr "'%s' 不能和切换分支同时使用"
4439
4440#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
4441#: builtin/checkout.c:1099
4442#, c-format
4443msgid "'%s' cannot be used with '%s'"
4444msgstr "'%s' 不能和 '%s' 同时使用"
4445
4446#: builtin/checkout.c:1104
4447#, c-format
4448msgid "Cannot switch branch to a non-commit '%s'"
4449msgstr "不能切换分支到一个非提交 '%s'"
4450
4451#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
4452#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
4453#: builtin/worktree.c:320
4454msgid "branch"
4455msgstr "分支"
4456
4457#: builtin/checkout.c:1138
4458msgid "create and checkout a new branch"
4459msgstr "创建并检出一个新的分支"
4460
4461#: builtin/checkout.c:1140
4462msgid "create/reset and checkout a branch"
4463msgstr "创建/重置并检出一个分支"
4464
4465#: builtin/checkout.c:1141
4466msgid "create reflog for new branch"
4467msgstr "为新的分支创建引用日志"
4468
4469#: builtin/checkout.c:1142
4470msgid "detach the HEAD at named commit"
4471msgstr "成为指向该提交的分离头指针"
4472
4473#: builtin/checkout.c:1143
4474msgid "set upstream info for new branch"
4475msgstr "为新的分支设置上游信息"
4476
4477#: builtin/checkout.c:1145
4478msgid "new-branch"
4479msgstr "新分支"
4480
4481#: builtin/checkout.c:1145
4482msgid "new unparented branch"
4483msgstr "新的没有父提交的分支"
4484
4485#: builtin/checkout.c:1146
4486msgid "checkout our version for unmerged files"
4487msgstr "对尚未合并的文件检出我们的版本"
4488
4489#: builtin/checkout.c:1148
4490msgid "checkout their version for unmerged files"
4491msgstr "对尚未合并的文件检出他们的版本"
4492
4493#: builtin/checkout.c:1150
4494msgid "force checkout (throw away local modifications)"
4495msgstr "强制检出(丢弃本地修改)"
4496
4497#: builtin/checkout.c:1151
4498msgid "perform a 3-way merge with the new branch"
4499msgstr "和新的分支执行三方合并"
4500
4501#: builtin/checkout.c:1152 builtin/merge.c:227
4502msgid "update ignored files (default)"
4503msgstr "更新忽略的文件(默认)"
4504
4505#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
4506msgid "style"
4507msgstr "风格"
4508
4509#: builtin/checkout.c:1154
4510msgid "conflict style (merge or diff3)"
4511msgstr "冲突输出风格(merge 或 diff3)"
4512
4513#: builtin/checkout.c:1157
4514msgid "do not limit pathspecs to sparse entries only"
4515msgstr "对路径不做稀疏检出的限制"
4516
4517#: builtin/checkout.c:1159
4518msgid "second guess 'git checkout <no-such-branch>'"
4519msgstr "二次猜测'git checkout <无此分支>'"
4520
4521#: builtin/checkout.c:1161
4522msgid "do not check if another worktree is holding the given ref"
4523msgstr "不检查指定的引用是否被其他工作区所占用"
4524
4525#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
4526#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
4527#: builtin/send-pack.c:168
4528msgid "force progress reporting"
4529msgstr "强制显示进度报告"
4530
4531#: builtin/checkout.c:1193
4532msgid "-b, -B and --orphan are mutually exclusive"
4533msgstr "-b、-B 和 --orphan 是互斥的"
4534
4535#: builtin/checkout.c:1210
4536msgid "--track needs a branch name"
4537msgstr "--track 需要一个分支名"
4538
4539#: builtin/checkout.c:1215
4540msgid "Missing branch name; try -b"
4541msgstr "缺少分支名;尝试 -b"
4542
4543#: builtin/checkout.c:1251
4544msgid "invalid path specification"
4545msgstr "无效的路径规格"
4546
4547#: builtin/checkout.c:1258
4548#, c-format
4549msgid ""
4550"Cannot update paths and switch to branch '%s' at the same time.\n"
4551"Did you intend to checkout '%s' which can not be resolved as commit?"
4552msgstr ""
4553"不能同时更新路径并切换到分支'%s'。\n"
4554"您是想要检出 '%s' 但其未能解析为提交么?"
4555
4556#: builtin/checkout.c:1263
4557#, c-format
4558msgid "git checkout: --detach does not take a path argument '%s'"
4559msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4560
4561#: builtin/checkout.c:1267
4562msgid ""
4563"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4564"checking out of the index."
4565msgstr ""
4566"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4567
4568#: builtin/clean.c:25
4569msgid ""
4570"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4571msgstr ""
4572"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4573
4574#: builtin/clean.c:29
4575#, c-format
4576msgid "Removing %s\n"
4577msgstr "正删除 %s\n"
4578
4579#: builtin/clean.c:30
4580#, c-format
4581msgid "Would remove %s\n"
4582msgstr "将删除 %s\n"
4583
4584#: builtin/clean.c:31
4585#, c-format
4586msgid "Skipping repository %s\n"
4587msgstr "忽略仓库 %s\n"
4588
4589#: builtin/clean.c:32
4590#, c-format
4591msgid "Would skip repository %s\n"
4592msgstr "将忽略仓库 %s\n"
4593
4594#: builtin/clean.c:33
4595#, c-format
4596msgid "failed to remove %s"
4597msgstr "无法删除 %s"
4598
4599#: builtin/clean.c:291
4600msgid ""
4601"Prompt help:\n"
4602"1 - select a numbered item\n"
4603"foo - select item based on unique prefix\n"
4604" - (empty) select nothing"
4605msgstr ""
4606"帮助:\n"
4607"1 - 通过编号选择一个选项\n"
4608"foo - 通过标题选择一个选项\n"
4609" - (空)什么也不选择"
4610
4611#: builtin/clean.c:295
4612msgid ""
4613"Prompt help:\n"
4614"1 - select a single item\n"
4615"3-5 - select a range of items\n"
4616"2-3,6-9 - select multiple ranges\n"
4617"foo - select item based on unique prefix\n"
4618"-... - unselect specified items\n"
4619"* - choose all items\n"
4620" - (empty) finish selecting"
4621msgstr ""
4622"帮助:\n"
4623"1 - 选择一个选项\n"
4624"3-5 - 选择一个范围内的所有选项\n"
4625"2-3,6-9 - 选择多个范围内的所有选项\n"
4626"foo - 通过标题选择一个选项\n"
4627"-... - 反选特定的选项\n"
4628"* - 选择所有选项\n"
4629" - (空)结束选择"
4630
4631#: builtin/clean.c:511
4632#, c-format
4633msgid "Huh (%s)?"
4634msgstr "嗯(%s)?"
4635
4636#: builtin/clean.c:653
4637#, c-format
4638msgid "Input ignore patterns>> "
4639msgstr "输入模版以排除条目>> "
4640
4641#: builtin/clean.c:690
4642#, c-format
4643msgid "WARNING: Cannot find items matched by: %s"
4644msgstr "警告:无法找到和 %s 匹配的条目"
4645
4646#: builtin/clean.c:711
4647msgid "Select items to delete"
4648msgstr "选择要删除的条目"
4649
4650#. TRANSLATORS: Make sure to keep [y/N] as is
4651#: builtin/clean.c:752
4652#, c-format
4653msgid "Remove %s [y/N]? "
4654msgstr "删除 %s [y/N]?"
4655
4656#: builtin/clean.c:777
4657msgid "Bye."
4658msgstr "再见。"
4659
4660#: builtin/clean.c:785
4661msgid ""
4662"clean - start cleaning\n"
4663"filter by pattern - exclude items from deletion\n"
4664"select by numbers - select items to be deleted by numbers\n"
4665"ask each - confirm each deletion (like \"rm -i\")\n"
4666"quit - stop cleaning\n"
4667"help - this screen\n"
4668"? - help for prompt selection"
4669msgstr ""
4670"clean - 开始清理\n"
4671"filter by pattern - 通过模版排除要删除的条目\n"
4672"select by numbers - 通过数字选择要删除的条目\n"
4673"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4674"quit - 停止删除并退出\n"
4675"help - 显示本帮助\n"
4676"? - 显示如何在提示符下选择的帮助"
4677
4678#: builtin/clean.c:812
4679msgid "*** Commands ***"
4680msgstr "*** 命令 ***"
4681
4682#: builtin/clean.c:813
4683msgid "What now"
4684msgstr "请选择"
4685
4686#: builtin/clean.c:821
4687msgid "Would remove the following item:"
4688msgid_plural "Would remove the following items:"
4689msgstr[0] "将删除如下条目:"
4690msgstr[1] "将删除如下条目:"
4691
4692#: builtin/clean.c:838
4693msgid "No more files to clean, exiting."
4694msgstr "没有要清理的文件,退出。"
4695
4696#: builtin/clean.c:869
4697msgid "do not print names of files removed"
4698msgstr "不打印删除文件的名称"
4699
4700#: builtin/clean.c:871
4701msgid "force"
4702msgstr "强制"
4703
4704#: builtin/clean.c:872
4705msgid "interactive cleaning"
4706msgstr "交互式清除"
4707
4708#: builtin/clean.c:874
4709msgid "remove whole directories"
4710msgstr "删除整个目录"
4711
4712#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
4713#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
4714msgid "pattern"
4715msgstr "模式"
4716
4717#: builtin/clean.c:876
4718msgid "add <pattern> to ignore rules"
4719msgstr "添加 <模式> 到忽略规则"
4720
4721#: builtin/clean.c:877
4722msgid "remove ignored files, too"
4723msgstr "也删除忽略的文件"
4724
4725#: builtin/clean.c:879
4726msgid "remove only ignored files"
4727msgstr "只删除忽略的文件"
4728
4729#: builtin/clean.c:897
4730msgid "-x and -X cannot be used together"
4731msgstr "-x 和 -X 不能同时使用"
4732
4733#: builtin/clean.c:901
4734msgid ""
4735"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4736"clean"
4737msgstr ""
4738"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4739
4740#: builtin/clean.c:904
4741msgid ""
4742"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4743"refusing to clean"
4744msgstr ""
4745"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4746
4747#: builtin/clone.c:37
4748msgid "git clone [<options>] [--] <repo> [<dir>]"
4749msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4750
4751#: builtin/clone.c:60
4752msgid "don't create a checkout"
4753msgstr "不创建一个检出"
4754
4755#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
4756msgid "create a bare repository"
4757msgstr "创建一个纯仓库"
4758
4759#: builtin/clone.c:65
4760msgid "create a mirror repository (implies bare)"
4761msgstr "创建一个镜像仓库(也是纯仓库)"
4762
4763#: builtin/clone.c:67
4764msgid "to clone from a local repository"
4765msgstr "从本地仓库克隆"
4766
4767#: builtin/clone.c:69
4768msgid "don't use local hardlinks, always copy"
4769msgstr "不使用本地硬链接,始终复制"
4770
4771#: builtin/clone.c:71
4772msgid "setup as shared repository"
4773msgstr "设置为共享仓库"
4774
4775#: builtin/clone.c:73 builtin/clone.c:75
4776msgid "initialize submodules in the clone"
4777msgstr "在克隆时初始化子模组"
4778
4779#: builtin/clone.c:76 builtin/init-db.c:466
4780msgid "template-directory"
4781msgstr "模板目录"
4782
4783#: builtin/clone.c:77 builtin/init-db.c:467
4784msgid "directory from which templates will be used"
4785msgstr "模板目录将被使用"
4786
4787#: builtin/clone.c:79 builtin/submodule--helper.c:173
4788msgid "reference repository"
4789msgstr "参考仓库"
4790
4791#: builtin/clone.c:81
4792msgid "use --reference only while cloning"
4793msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4794
4795#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
4796msgid "name"
4797msgstr "名称"
4798
4799#: builtin/clone.c:83
4800msgid "use <name> instead of 'origin' to track upstream"
4801msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4802
4803#: builtin/clone.c:85
4804msgid "checkout <branch> instead of the remote's HEAD"
4805msgstr "检出 <分支> 而不是远程 HEAD"
4806
4807#: builtin/clone.c:87
4808msgid "path to git-upload-pack on the remote"
4809msgstr "远程 git-upload-pack 路径"
4810
4811#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
4812#: builtin/pull.c:193
4813msgid "depth"
4814msgstr "深度"
4815
4816#: builtin/clone.c:89
4817msgid "create a shallow clone of that depth"
4818msgstr "创建一个指定深度的浅克隆"
4819
4820#: builtin/clone.c:91
4821msgid "clone only one branch, HEAD or --branch"
4822msgstr "只克隆一个分支、HEAD 或 --branch"
4823
4824#: builtin/clone.c:92 builtin/init-db.c:475
4825msgid "gitdir"
4826msgstr "git目录"
4827
4828#: builtin/clone.c:93 builtin/init-db.c:476
4829msgid "separate git dir from working tree"
4830msgstr "git目录和工作区分离"
4831
4832#: builtin/clone.c:94
4833msgid "key=value"
4834msgstr "key=value"
4835
4836#: builtin/clone.c:95
4837msgid "set config inside the new repository"
4838msgstr "在新仓库中设置配置信息"
4839
4840#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
4841msgid "use IPv4 addresses only"
4842msgstr "只使用 IPv4 地址"
4843
4844#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
4845msgid "use IPv6 addresses only"
4846msgstr "只使用 IPv6 地址"
4847
4848#: builtin/clone.c:239
4849msgid ""
4850"No directory name could be guessed.\n"
4851"Please specify a directory on the command line"
4852msgstr ""
4853"无法猜到目录名。\n"
4854"请在命令行指定一个目录"
4855
4856#: builtin/clone.c:305
4857#, c-format
4858msgid "reference repository '%s' as a linked checkout is not supported yet."
4859msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4860
4861#: builtin/clone.c:307
4862#, c-format
4863msgid "reference repository '%s' is not a local repository."
4864msgstr "参考仓库 '%s' 不是一个本地仓库。"
4865
4866#: builtin/clone.c:312
4867#, c-format
4868msgid "reference repository '%s' is shallow"
4869msgstr "参考仓库 '%s' 是一个浅克隆"
4870
4871#: builtin/clone.c:315
4872#, c-format
4873msgid "reference repository '%s' is grafted"
4874msgstr "参考仓库 '%s' 已被嫁接"
4875
4876#: builtin/clone.c:380 builtin/diff.c:84
4877#, c-format
4878msgid "failed to stat '%s'"
4879msgstr "无法枚举 '%s' 状态"
4880
4881#: builtin/clone.c:382
4882#, c-format
4883msgid "%s exists and is not a directory"
4884msgstr "%s 存在且不是一个目录"
4885
4886#: builtin/clone.c:396
4887#, c-format
4888msgid "failed to stat %s\n"
4889msgstr "无法枚举 %s 状态\n"
4890
4891#: builtin/clone.c:418
4892#, c-format
4893msgid "failed to create link '%s'"
4894msgstr "无法创建链接 '%s'"
4895
4896#: builtin/clone.c:422
4897#, c-format
4898msgid "failed to copy file to '%s'"
4899msgstr "无法拷贝文件至 '%s'"
4900
4901#: builtin/clone.c:447 builtin/clone.c:631
4902#, c-format
4903msgid "done.\n"
4904msgstr "完成。\n"
4905
4906#: builtin/clone.c:459
4907msgid ""
4908"Clone succeeded, but checkout failed.\n"
4909"You can inspect what was checked out with 'git status'\n"
4910"and retry the checkout with 'git checkout -f HEAD'\n"
4911msgstr ""
4912"克隆成功,但是检出失败。\n"
4913"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4914"'git checkout -f HEAD' 重试\n"
4915
4916#: builtin/clone.c:536
4917#, c-format
4918msgid "Could not find remote branch %s to clone."
4919msgstr "不能发现要克隆的远程分支 %s。"
4920
4921#: builtin/clone.c:626
4922#, c-format
4923msgid "Checking connectivity... "
4924msgstr "检查连接... "
4925
4926#: builtin/clone.c:629
4927msgid "remote did not send all necessary objects"
4928msgstr "远程没有发送所有必须的对象"
4929
4930#: builtin/clone.c:647
4931#, c-format
4932msgid "unable to update %s"
4933msgstr "不能更新 %s"
4934
4935#: builtin/clone.c:696
4936msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4937msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4938
4939#: builtin/clone.c:727
4940msgid "unable to checkout working tree"
4941msgstr "不能检出工作区"
4942
4943#: builtin/clone.c:753
4944msgid "unable to write parameters to config file"
4945msgstr "无法将参数写入配置文件"
4946
4947#: builtin/clone.c:816
4948msgid "cannot repack to clean up"
4949msgstr "无法执行 repack 来清理"
4950
4951#: builtin/clone.c:818
4952msgid "cannot unlink temporary alternates file"
4953msgstr "无法删除临时的 alternates 文件"
4954
4955#: builtin/clone.c:850
4956msgid "Too many arguments."
4957msgstr "太多参数。"
4958
4959#: builtin/clone.c:854
4960msgid "You must specify a repository to clone."
4961msgstr "您必须指定一个仓库来克隆。"
4962
4963#: builtin/clone.c:865
4964#, c-format
4965msgid "--bare and --origin %s options are incompatible."
4966msgstr "--bare 和 --origin %s 选项不兼容。"
4967
4968#: builtin/clone.c:868
4969msgid "--bare and --separate-git-dir are incompatible."
4970msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4971
4972#: builtin/clone.c:881
4973#, c-format
4974msgid "repository '%s' does not exist"
4975msgstr "仓库 '%s' 不存在"
4976
4977#: builtin/clone.c:887 builtin/fetch.c:1174
4978#, c-format
4979msgid "depth %s is not a positive number"
4980msgstr "深度 %s 不是一个正数"
4981
4982#: builtin/clone.c:897
4983#, c-format
4984msgid "destination path '%s' already exists and is not an empty directory."
4985msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4986
4987#: builtin/clone.c:907
4988#, c-format
4989msgid "working tree '%s' already exists."
4990msgstr "工作区 '%s' 已经存在。"
4991
4992#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
4993#: builtin/worktree.c:219 builtin/worktree.c:246
4994#, c-format
4995msgid "could not create leading directories of '%s'"
4996msgstr "不能为 '%s' 创建先导目录"
4997
4998#: builtin/clone.c:925
4999#, c-format
5000msgid "could not create work tree dir '%s'"
5001msgstr "不能创建工作区目录 '%s'"
5002
5003#: builtin/clone.c:943
5004#, c-format
5005msgid "Cloning into bare repository '%s'...\n"
5006msgstr "克隆到纯仓库 '%s'...\n"
5007
5008#: builtin/clone.c:945
5009#, c-format
5010msgid "Cloning into '%s'...\n"
5011msgstr "正克隆到 '%s'...\n"
5012
5013#: builtin/clone.c:984
5014msgid "--depth is ignored in local clones; use file:// instead."
5015msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5016
5017#: builtin/clone.c:987
5018msgid "source repository is shallow, ignoring --local"
5019msgstr "源仓库是浅克隆,忽略 --local"
5020
5021#: builtin/clone.c:992
5022msgid "--local is ignored"
5023msgstr "--local 被忽略"
5024
5025#: builtin/clone.c:996
5026#, c-format
5027msgid "Don't know how to clone %s"
5028msgstr "不知道如何克隆 %s"
5029
5030#: builtin/clone.c:1045 builtin/clone.c:1053
5031#, c-format
5032msgid "Remote branch %s not found in upstream %s"
5033msgstr "远程分支 %s 在上游 %s 未发现"
5034
5035#: builtin/clone.c:1056
5036msgid "You appear to have cloned an empty repository."
5037msgstr "您似乎克隆了一个空仓库。"
5038
5039#: builtin/column.c:9
5040msgid "git column [<options>]"
5041msgstr "git column [<选项>]"
5042
5043#: builtin/column.c:26
5044msgid "lookup config vars"
5045msgstr "查找配置变量"
5046
5047#: builtin/column.c:27 builtin/column.c:28
5048msgid "layout to use"
5049msgstr "要使用的布局"
5050
5051#: builtin/column.c:29
5052msgid "Maximum width"
5053msgstr "最大宽度"
5054
5055#: builtin/column.c:30
5056msgid "Padding space on left border"
5057msgstr "左边框的填充空间"
5058
5059#: builtin/column.c:31
5060msgid "Padding space on right border"
5061msgstr "右边框的填充空间"
5062
5063#: builtin/column.c:32
5064msgid "Padding space between columns"
5065msgstr "两列之间的填充空间"
5066
5067#: builtin/column.c:51
5068msgid "--command must be the first argument"
5069msgstr "--command 必须是第一个参数"
5070
5071#: builtin/commit.c:38
5072msgid "git commit [<options>] [--] <pathspec>..."
5073msgstr "git commit [<选项>] [--] <路径规格>..."
5074
5075#: builtin/commit.c:43
5076msgid "git status [<options>] [--] <pathspec>..."
5077msgstr "git status [<选项>] [--] <路径规格>..."
5078
5079#: builtin/commit.c:48
5080msgid ""
5081"Your name and email address were configured automatically based\n"
5082"on your username and hostname. Please check that they are accurate.\n"
5083"You can suppress this message by setting them explicitly. Run the\n"
5084"following command and follow the instructions in your editor to edit\n"
5085"your configuration file:\n"
5086"\n"
5087" git config --global --edit\n"
5088"\n"
5089"After doing this, you may fix the identity used for this commit with:\n"
5090"\n"
5091" git commit --amend --reset-author\n"
5092msgstr ""
5093"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5094"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5095"中编辑您的配置文件:\n"
5096"\n"
5097" git config --global --edit\n"
5098"\n"
5099"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5100"\n"
5101" git commit --amend --reset-author\n"
5102
5103#: builtin/commit.c:61
5104msgid ""
5105"Your name and email address were configured automatically based\n"
5106"on your username and hostname. Please check that they are accurate.\n"
5107"You can suppress this message by setting them explicitly:\n"
5108"\n"
5109" git config --global user.name \"Your Name\"\n"
5110" git config --global user.email you@example.com\n"
5111"\n"
5112"After doing this, you may fix the identity used for this commit with:\n"
5113"\n"
5114" git commit --amend --reset-author\n"
5115msgstr ""
5116"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5117"与否。您可以对其进行设置以免再出现本提示信息:\n"
5118"\n"
5119" git config --global user.name \"Your Name\"\n"
5120" git config --global user.email you@example.com\n"
5121"\n"
5122"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5123"\n"
5124" git commit --amend --reset-author\n"
5125
5126#: builtin/commit.c:73
5127msgid ""
5128"You asked to amend the most recent commit, but doing so would make\n"
5129"it empty. You can repeat your command with --allow-empty, or you can\n"
5130"remove the commit entirely with \"git reset HEAD^\".\n"
5131msgstr ""
5132"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5133"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5134
5135#: builtin/commit.c:78
5136msgid ""
5137"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5138"If you wish to commit it anyway, use:\n"
5139"\n"
5140" git commit --allow-empty\n"
5141"\n"
5142msgstr ""
5143"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5144"也要提交,使用命令:\n"
5145"\n"
5146" git commit --allow-empty\n"
5147"\n"
5148
5149#: builtin/commit.c:85
5150msgid "Otherwise, please use 'git reset'\n"
5151msgstr "否则,请使用命令 'git reset'\n"
5152
5153#: builtin/commit.c:88
5154msgid ""
5155"If you wish to skip this commit, use:\n"
5156"\n"
5157" git reset\n"
5158"\n"
5159"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5160"the remaining commits.\n"
5161msgstr ""
5162"如果您想跳过这个提交,使用命令:\n"
5163"\n"
5164" git reset\n"
5165"\n"
5166"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5167"操作。\n"
5168
5169#: builtin/commit.c:305
5170msgid "failed to unpack HEAD tree object"
5171msgstr "无法解包 HEAD 树对象"
5172
5173#: builtin/commit.c:346
5174msgid "unable to create temporary index"
5175msgstr "不能创建临时索引"
5176
5177#: builtin/commit.c:352
5178msgid "interactive add failed"
5179msgstr "交互式添加失败"
5180
5181#: builtin/commit.c:365
5182msgid "unable to update temporary index"
5183msgstr "无法更新临时索引"
5184
5185#: builtin/commit.c:367
5186msgid "Failed to update main cache tree"
5187msgstr "不能更新树的主缓存"
5188
5189#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5190msgid "unable to write new_index file"
5191msgstr "无法写 new_index 文件"
5192
5193#: builtin/commit.c:445
5194msgid "cannot do a partial commit during a merge."
5195msgstr "在合并过程中不能做部分提交。"
5196
5197#: builtin/commit.c:447
5198msgid "cannot do a partial commit during a cherry-pick."
5199msgstr "在拣选过程中不能做部分提交。"
5200
5201#: builtin/commit.c:456
5202msgid "cannot read the index"
5203msgstr "无法读取索引"
5204
5205#: builtin/commit.c:475
5206msgid "unable to write temporary index file"
5207msgstr "无法写临时索引文件"
5208
5209#: builtin/commit.c:580
5210#, c-format
5211msgid "commit '%s' lacks author header"
5212msgstr "提交 '%s' 缺少作者信息"
5213
5214#: builtin/commit.c:582
5215#, c-format
5216msgid "commit '%s' has malformed author line"
5217msgstr "提交 '%s' 有非法的作者信息"
5218
5219#: builtin/commit.c:601
5220msgid "malformed --author parameter"
5221msgstr "非法的 --author 参数"
5222
5223#: builtin/commit.c:609
5224#, c-format
5225msgid "invalid date format: %s"
5226msgstr "无效的日期格式:%s"
5227
5228#: builtin/commit.c:653
5229msgid ""
5230"unable to select a comment character that is not used\n"
5231"in the current commit message"
5232msgstr "无法选择一个未被当前提交说明使用的注释字符"
5233
5234#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5235#, c-format
5236msgid "could not lookup commit %s"
5237msgstr "不能查询提交 %s"
5238
5239#: builtin/commit.c:702 builtin/shortlog.c:285
5240#, c-format
5241msgid "(reading log message from standard input)\n"
5242msgstr "(正从标准输入中读取日志信息)\n"
5243
5244#: builtin/commit.c:704
5245msgid "could not read log from standard input"
5246msgstr "不能从标准输入中读取日志信息"
5247
5248#: builtin/commit.c:708
5249#, c-format
5250msgid "could not read log file '%s'"
5251msgstr "不能读取日志文件 '%s'"
5252
5253#: builtin/commit.c:730
5254msgid "could not read MERGE_MSG"
5255msgstr "不能读取 MERGE_MSG"
5256
5257#: builtin/commit.c:734
5258msgid "could not read SQUASH_MSG"
5259msgstr "不能读取 SQUASH_MSG"
5260
5261#: builtin/commit.c:785
5262msgid "could not write commit template"
5263msgstr "不能写提交模版"
5264
5265#: builtin/commit.c:803
5266#, c-format
5267msgid ""
5268"\n"
5269"It looks like you may be committing a merge.\n"
5270"If this is not correct, please remove the file\n"
5271"\t%s\n"
5272"and try again.\n"
5273msgstr ""
5274"\n"
5275"似乎您正在做一个合并提交。如果不对,请删除文件\n"
5276"\t%s\n"
5277"然后重试。\n"
5278
5279#: builtin/commit.c:808
5280#, c-format
5281msgid ""
5282"\n"
5283"It looks like you may be committing a cherry-pick.\n"
5284"If this is not correct, please remove the file\n"
5285"\t%s\n"
5286"and try again.\n"
5287msgstr ""
5288"\n"
5289"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5290"\t%s\n"
5291"然后重试。\n"
5292
5293#: builtin/commit.c:821
5294#, c-format
5295msgid ""
5296"Please enter the commit message for your changes. Lines starting\n"
5297"with '%c' will be ignored, and an empty message aborts the commit.\n"
5298msgstr ""
5299"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5300"说明将会终止提交。\n"
5301
5302#: builtin/commit.c:828
5303#, c-format
5304msgid ""
5305"Please enter the commit message for your changes. Lines starting\n"
5306"with '%c' will be kept; you may remove them yourself if you want to.\n"
5307"An empty message aborts the commit.\n"
5308msgstr ""
5309"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5310"也可以删除它们。一个空的提交说明将会终止提交。\n"
5311
5312# 译者:为保证在输出中对齐,注意调整句中空格!
5313#: builtin/commit.c:848
5314#, c-format
5315msgid "%sAuthor: %.*s <%.*s>"
5316msgstr "%s作者: %.*s <%.*s>"
5317
5318# 译者:为保证在输出中对齐,注意调整句中空格!
5319#: builtin/commit.c:856
5320#, c-format
5321msgid "%sDate: %s"
5322msgstr "%s日期: %s"
5323
5324# 译者:为保证在输出中对齐,注意调整句中空格!
5325#: builtin/commit.c:863
5326#, c-format
5327msgid "%sCommitter: %.*s <%.*s>"
5328msgstr "%s提交者:%.*s <%.*s>"
5329
5330#: builtin/commit.c:881
5331msgid "Cannot read index"
5332msgstr "无法读取索引"
5333
5334#: builtin/commit.c:938
5335msgid "Error building trees"
5336msgstr "无法创建树对象"
5337
5338#: builtin/commit.c:953 builtin/tag.c:266
5339#, c-format
5340msgid "Please supply the message using either -m or -F option.\n"
5341msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5342
5343#: builtin/commit.c:1055
5344#, c-format
5345msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5346msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5347
5348#: builtin/commit.c:1070 builtin/commit.c:1310
5349#, c-format
5350msgid "Invalid untracked files mode '%s'"
5351msgstr "无效的未追踪文件参数 '%s'"
5352
5353#: builtin/commit.c:1107
5354msgid "--long and -z are incompatible"
5355msgstr "--long 和 -z 选项不兼容"
5356
5357#: builtin/commit.c:1137
5358msgid "Using both --reset-author and --author does not make sense"
5359msgstr "同时使用 --reset-author 和 --author 没有意义"
5360
5361#: builtin/commit.c:1146
5362msgid "You have nothing to amend."
5363msgstr "您没有可修补的提交。"
5364
5365#: builtin/commit.c:1149
5366msgid "You are in the middle of a merge -- cannot amend."
5367msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5368
5369#: builtin/commit.c:1151
5370msgid "You are in the middle of a cherry-pick -- cannot amend."
5371msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5372
5373#: builtin/commit.c:1154
5374msgid "Options --squash and --fixup cannot be used together"
5375msgstr "选项 --squash 和 --fixup 不能同时使用"
5376
5377#: builtin/commit.c:1164
5378msgid "Only one of -c/-C/-F/--fixup can be used."
5379msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5380
5381#: builtin/commit.c:1166
5382msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5383msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5384
5385#: builtin/commit.c:1174
5386msgid "--reset-author can be used only with -C, -c or --amend."
5387msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5388
5389#: builtin/commit.c:1191
5390msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5391msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5392
5393#: builtin/commit.c:1193
5394msgid "No paths with --include/--only does not make sense."
5395msgstr "参数 --include/--only 不跟路径没有意义。"
5396
5397#: builtin/commit.c:1195
5398msgid "Clever... amending the last one with dirty index."
5399msgstr "聪明... 用脏索引修补最后一个提交。"
5400
5401#: builtin/commit.c:1197
5402msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5403msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5404
5405#: builtin/commit.c:1209 builtin/tag.c:475
5406#, c-format
5407msgid "Invalid cleanup mode %s"
5408msgstr "无效的清理模式 %s"
5409
5410#: builtin/commit.c:1214
5411msgid "Paths with -a does not make sense."
5412msgstr "路径和 -a 选项同时使用没有意义。"
5413
5414#: builtin/commit.c:1324 builtin/commit.c:1605
5415msgid "show status concisely"
5416msgstr "以简洁的格式显示状态"
5417
5418#: builtin/commit.c:1326 builtin/commit.c:1607
5419msgid "show branch information"
5420msgstr "显示分支信息"
5421
5422#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
5423#: builtin/worktree.c:430
5424msgid "machine-readable output"
5425msgstr "机器可读的输出"
5426
5427#: builtin/commit.c:1331 builtin/commit.c:1611
5428msgid "show status in long format (default)"
5429msgstr "以长格式显示状态(默认)"
5430
5431#: builtin/commit.c:1334 builtin/commit.c:1614
5432msgid "terminate entries with NUL"
5433msgstr "条目以 NUL 字符结尾"
5434
5435#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5436#: builtin/fast-export.c:984 builtin/tag.c:353
5437msgid "mode"
5438msgstr "模式"
5439
5440#: builtin/commit.c:1337 builtin/commit.c:1617
5441msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5442msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5443
5444#: builtin/commit.c:1340
5445msgid "show ignored files"
5446msgstr "显示忽略的文件"
5447
5448#: builtin/commit.c:1341 parse-options.h:155
5449msgid "when"
5450msgstr "何时"
5451
5452#: builtin/commit.c:1342
5453msgid ""
5454"ignore changes to submodules, optional when: all, dirty, untracked. "
5455"(Default: all)"
5456msgstr ""
5457"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5458
5459#: builtin/commit.c:1344
5460msgid "list untracked files in columns"
5461msgstr "以列的方式显示未跟踪的文件"
5462
5463#: builtin/commit.c:1430
5464msgid "couldn't look up newly created commit"
5465msgstr "无法找到新创建的提交"
5466
5467#: builtin/commit.c:1432
5468msgid "could not parse newly created commit"
5469msgstr "不能解析新创建的提交"
5470
5471#: builtin/commit.c:1477
5472msgid "detached HEAD"
5473msgstr "分离头指针"
5474
5475# 译者:中文字符串拼接,可删除前导空格
5476#: builtin/commit.c:1480
5477msgid " (root-commit)"
5478msgstr "(根提交)"
5479
5480#: builtin/commit.c:1575
5481msgid "suppress summary after successful commit"
5482msgstr "提交成功后不显示概述信息"
5483
5484#: builtin/commit.c:1576
5485msgid "show diff in commit message template"
5486msgstr "在提交说明模板里显示差异"
5487
5488#: builtin/commit.c:1578
5489msgid "Commit message options"
5490msgstr "提交说明选项"
5491
5492#: builtin/commit.c:1579 builtin/tag.c:351
5493msgid "read message from file"
5494msgstr "从文件中读取提交说明"
5495
5496#: builtin/commit.c:1580
5497msgid "author"
5498msgstr "作者"
5499
5500#: builtin/commit.c:1580
5501msgid "override author for commit"
5502msgstr "提交时覆盖作者"
5503
5504#: builtin/commit.c:1581 builtin/gc.c:326
5505msgid "date"
5506msgstr "日期"
5507
5508#: builtin/commit.c:1581
5509msgid "override date for commit"
5510msgstr "提交时覆盖日期"
5511
5512#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
5513#: builtin/notes.c:558 builtin/tag.c:349
5514msgid "message"
5515msgstr "说明"
5516
5517#: builtin/commit.c:1582
5518msgid "commit message"
5519msgstr "提交说明"
5520
5521#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5522#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5523msgid "commit"
5524msgstr "提交"
5525
5526#: builtin/commit.c:1583
5527msgid "reuse and edit message from specified commit"
5528msgstr "重用并编辑指定提交的提交说明"
5529
5530#: builtin/commit.c:1584
5531msgid "reuse message from specified commit"
5532msgstr "重用指定提交的提交说明"
5533
5534#: builtin/commit.c:1585
5535msgid "use autosquash formatted message to fixup specified commit"
5536msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5537
5538#: builtin/commit.c:1586
5539msgid "use autosquash formatted message to squash specified commit"
5540msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5541
5542#: builtin/commit.c:1587
5543msgid "the commit is authored by me now (used with -C/-c/--amend)"
5544msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5545
5546#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
5547msgid "add Signed-off-by:"
5548msgstr "添加 Signed-off-by: 签名"
5549
5550#: builtin/commit.c:1589
5551msgid "use specified template file"
5552msgstr "使用指定的模板文件"
5553
5554#: builtin/commit.c:1590
5555msgid "force edit of commit"
5556msgstr "强制编辑提交"
5557
5558# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5559#: builtin/commit.c:1591
5560msgid "default"
5561msgstr "default"
5562
5563#: builtin/commit.c:1591 builtin/tag.c:354
5564msgid "how to strip spaces and #comments from message"
5565msgstr "设置如何删除提交说明里的空格和#注释"
5566
5567#: builtin/commit.c:1592
5568msgid "include status in commit message template"
5569msgstr "在提交说明模板里包含状态信息"
5570
5571#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
5572#: builtin/revert.c:93
5573msgid "GPG sign commit"
5574msgstr "GPG 提交签名"
5575
5576#: builtin/commit.c:1597
5577msgid "Commit contents options"
5578msgstr "提交内容选项"
5579
5580#: builtin/commit.c:1598
5581msgid "commit all changed files"
5582msgstr "提交所有改动的文件"
5583
5584#: builtin/commit.c:1599
5585msgid "add specified files to index for commit"
5586msgstr "添加指定的文件到索引区等待提交"
5587
5588#: builtin/commit.c:1600
5589msgid "interactively add files"
5590msgstr "交互式添加文件"
5591
5592#: builtin/commit.c:1601
5593msgid "interactively add changes"
5594msgstr "交互式添加变更"
5595
5596#: builtin/commit.c:1602
5597msgid "commit only specified files"
5598msgstr "只提交指定的文件"
5599
5600#: builtin/commit.c:1603
5601msgid "bypass pre-commit hook"
5602msgstr "绕过 pre-commit 钩子"
5603
5604#: builtin/commit.c:1604
5605msgid "show what would be committed"
5606msgstr "显示将要提交的内容"
5607
5608#: builtin/commit.c:1615
5609msgid "amend previous commit"
5610msgstr "修改先前的提交"
5611
5612#: builtin/commit.c:1616
5613msgid "bypass post-rewrite hook"
5614msgstr "绕过 post-rewrite 钩子"
5615
5616#: builtin/commit.c:1621
5617msgid "ok to record an empty change"
5618msgstr "允许一个空提交"
5619
5620#: builtin/commit.c:1623
5621msgid "ok to record a change with an empty message"
5622msgstr "允许空的提交说明"
5623
5624#: builtin/commit.c:1652
5625msgid "could not parse HEAD commit"
5626msgstr "不能解析 HEAD 提交"
5627
5628#: builtin/commit.c:1698
5629#, c-format
5630msgid "Corrupt MERGE_HEAD file (%s)"
5631msgstr "损坏的 MERGE_HEAD 文件(%s)"
5632
5633#: builtin/commit.c:1705
5634msgid "could not read MERGE_MODE"
5635msgstr "不能读取 MERGE_MODE"
5636
5637#: builtin/commit.c:1724
5638#, c-format
5639msgid "could not read commit message: %s"
5640msgstr "不能读取提交说明:%s"
5641
5642#: builtin/commit.c:1735
5643#, c-format
5644msgid "Aborting commit; you did not edit the message.\n"
5645msgstr "终止提交;您未更改来自模版的提交说明。\n"
5646
5647#: builtin/commit.c:1740
5648#, c-format
5649msgid "Aborting commit due to empty commit message.\n"
5650msgstr "终止提交因为提交说明为空。\n"
5651
5652#: builtin/commit.c:1788
5653msgid ""
5654"Repository has been updated, but unable to write\n"
5655"new_index file. Check that disk is not full and quota is\n"
5656"not exceeded, and then \"git reset HEAD\" to recover."
5657msgstr ""
5658"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5659"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5660
5661#: builtin/config.c:9
5662msgid "git config [<options>]"
5663msgstr "git config [<选项>]"
5664
5665#: builtin/config.c:56
5666msgid "Config file location"
5667msgstr "配置文件位置"
5668
5669#: builtin/config.c:57
5670msgid "use global config file"
5671msgstr "使用全局配置文件"
5672
5673#: builtin/config.c:58
5674msgid "use system config file"
5675msgstr "使用系统级配置文件"
5676
5677#: builtin/config.c:59
5678msgid "use repository config file"
5679msgstr "使用仓库级配置文件"
5680
5681#: builtin/config.c:60
5682msgid "use given config file"
5683msgstr "使用指定的配置文件"
5684
5685#: builtin/config.c:61
5686msgid "blob-id"
5687msgstr "数据对象 ID"
5688
5689#: builtin/config.c:61
5690msgid "read config from given blob object"
5691msgstr "从给定的数据对象读取配置"
5692
5693#: builtin/config.c:62
5694msgid "Action"
5695msgstr "操作"
5696
5697#: builtin/config.c:63
5698msgid "get value: name [value-regex]"
5699msgstr "获取值:name [value-regex]"
5700
5701#: builtin/config.c:64
5702msgid "get all values: key [value-regex]"
5703msgstr "获得所有的值:key [value-regex]"
5704
5705#: builtin/config.c:65
5706msgid "get values for regexp: name-regex [value-regex]"
5707msgstr "根据正则表达式获得值:name-regex [value-regex]"
5708
5709#: builtin/config.c:66
5710msgid "get value specific for the URL: section[.var] URL"
5711msgstr "获得 URL 取值:section[.var] URL"
5712
5713#: builtin/config.c:67
5714msgid "replace all matching variables: name value [value_regex]"
5715msgstr "替换所有匹配的变量:name value [value_regex]"
5716
5717#: builtin/config.c:68
5718msgid "add a new variable: name value"
5719msgstr "添加一个新的变量:name value"
5720
5721#: builtin/config.c:69
5722msgid "remove a variable: name [value-regex]"
5723msgstr "删除一个变量:name [value-regex]"
5724
5725#: builtin/config.c:70
5726msgid "remove all matches: name [value-regex]"
5727msgstr "删除所有匹配项:name [value-regex]"
5728
5729#: builtin/config.c:71
5730msgid "rename section: old-name new-name"
5731msgstr "重命名小节:old-name new-name"
5732
5733#: builtin/config.c:72
5734msgid "remove a section: name"
5735msgstr "删除一个小节:name"
5736
5737#: builtin/config.c:73
5738msgid "list all"
5739msgstr "列出所有"
5740
5741#: builtin/config.c:74
5742msgid "open an editor"
5743msgstr "打开一个编辑器"
5744
5745#: builtin/config.c:75
5746msgid "find the color configured: slot [default]"
5747msgstr "获得配置的颜色:配置 [默认]"
5748
5749#: builtin/config.c:76
5750msgid "find the color setting: slot [stdout-is-tty]"
5751msgstr "获得颜色设置:配置 [stdout-is-tty]"
5752
5753#: builtin/config.c:77
5754msgid "Type"
5755msgstr "类型"
5756
5757#: builtin/config.c:78
5758msgid "value is \"true\" or \"false\""
5759msgstr "值是 \"true\" 或 \"false\""
5760
5761#: builtin/config.c:79
5762msgid "value is decimal number"
5763msgstr "值是十进制数"
5764
5765#: builtin/config.c:80
5766msgid "value is --bool or --int"
5767msgstr "值是 --bool or --int"
5768
5769#: builtin/config.c:81
5770msgid "value is a path (file or directory name)"
5771msgstr "值是一个路径(文件或目录名)"
5772
5773#: builtin/config.c:82
5774msgid "Other"
5775msgstr "其它"
5776
5777#: builtin/config.c:83
5778msgid "terminate values with NUL byte"
5779msgstr "终止值是 NUL 字节"
5780
5781#: builtin/config.c:84
5782msgid "show variable names only"
5783msgstr "只显示变量名"
5784
5785#: builtin/config.c:85
5786msgid "respect include directives on lookup"
5787msgstr "查询时参照 include 指令递归查找"
5788
5789#: builtin/config.c:86
5790msgid "show origin of config (file, standard input, blob, command line)"
5791msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
5792
5793#: builtin/config.c:328
5794msgid "unable to parse default color value"
5795msgstr "不能解析默认颜色值"
5796
5797#: builtin/config.c:469
5798#, c-format
5799msgid ""
5800"# This is Git's per-user configuration file.\n"
5801"[user]\n"
5802"# Please adapt and uncomment the following lines:\n"
5803"#\tname = %s\n"
5804"#\temail = %s\n"
5805msgstr ""
5806"# This is Git's per-user configuration file.\n"
5807"[user]\n"
5808"# Please adapt and uncomment the following lines:\n"
5809"#\tname = %s\n"
5810"#\temail = %s\n"
5811
5812#: builtin/config.c:611
5813#, c-format
5814msgid "cannot create configuration file %s"
5815msgstr "不能创建配置文件 %s"
5816
5817#: builtin/count-objects.c:77
5818msgid "git count-objects [-v] [-H | --human-readable]"
5819msgstr "git count-objects [-v] [-H | --human-readable]"
5820
5821#: builtin/count-objects.c:87
5822msgid "print sizes in human readable format"
5823msgstr "以用户可读的格式显示大小"
5824
5825#: builtin/describe.c:17
5826msgid "git describe [<options>] [<commit-ish>...]"
5827msgstr "git describe [<选项>] [<提交号>...]"
5828
5829#: builtin/describe.c:18
5830msgid "git describe [<options>] --dirty"
5831msgstr "git describe [<选项>] --dirty"
5832
5833#: builtin/describe.c:217
5834#, c-format
5835msgid "annotated tag %s not available"
5836msgstr "附注标签 %s 无效"
5837
5838#: builtin/describe.c:221
5839#, c-format
5840msgid "annotated tag %s has no embedded name"
5841msgstr "附注标签 %s 没有嵌入名称"
5842
5843#: builtin/describe.c:223
5844#, c-format
5845msgid "tag '%s' is really '%s' here"
5846msgstr "标签 '%s' 的确是在 '%s'"
5847
5848#: builtin/describe.c:250 builtin/log.c:459
5849#, c-format
5850msgid "Not a valid object name %s"
5851msgstr "不是一个有效的对象名 %s"
5852
5853#: builtin/describe.c:253
5854#, c-format
5855msgid "%s is not a valid '%s' object"
5856msgstr "%s 不是一个有效的 '%s' 对象"
5857
5858#: builtin/describe.c:270
5859#, c-format
5860msgid "no tag exactly matches '%s'"
5861msgstr "没有标签准确匹配 '%s'"
5862
5863#: builtin/describe.c:272
5864#, c-format
5865msgid "searching to describe %s\n"
5866msgstr "搜索描述 %s\n"
5867
5868#: builtin/describe.c:319
5869#, c-format
5870msgid "finished search at %s\n"
5871msgstr "完成搜索 %s\n"
5872
5873#: builtin/describe.c:346
5874#, c-format
5875msgid ""
5876"No annotated tags can describe '%s'.\n"
5877"However, there were unannotated tags: try --tags."
5878msgstr ""
5879"没有附注标签能描述 '%s'。\n"
5880"然而,存在未附注标签:尝试 --tags。"
5881
5882#: builtin/describe.c:350
5883#, c-format
5884msgid ""
5885"No tags can describe '%s'.\n"
5886"Try --always, or create some tags."
5887msgstr ""
5888"没有标签能描述 '%s'。\n"
5889"尝试 --always,或者创建一些标签。"
5890
5891#: builtin/describe.c:371
5892#, c-format
5893msgid "traversed %lu commits\n"
5894msgstr "已遍历 %lu 个提交\n"
5895
5896#: builtin/describe.c:374
5897#, c-format
5898msgid ""
5899"more than %i tags found; listed %i most recent\n"
5900"gave up search at %s\n"
5901msgstr ""
5902"发现多于 %i 个标签,列出最近的 %i 个\n"
5903"在 %s 放弃搜索\n"
5904
5905#: builtin/describe.c:396
5906msgid "find the tag that comes after the commit"
5907msgstr "寻找该提交之后的标签"
5908
5909#: builtin/describe.c:397
5910msgid "debug search strategy on stderr"
5911msgstr "在标准错误上调试搜索策略"
5912
5913#: builtin/describe.c:398
5914msgid "use any ref"
5915msgstr "使用任意引用"
5916
5917#: builtin/describe.c:399
5918msgid "use any tag, even unannotated"
5919msgstr "使用任意标签,即使未附带注释"
5920
5921#: builtin/describe.c:400
5922msgid "always use long format"
5923msgstr "始终使用长提交号格式"
5924
5925#: builtin/describe.c:401
5926msgid "only follow first parent"
5927msgstr "只跟随第一个父提交"
5928
5929#: builtin/describe.c:404
5930msgid "only output exact matches"
5931msgstr "只输出精确匹配"
5932
5933#: builtin/describe.c:406
5934msgid "consider <n> most recent tags (default: 10)"
5935msgstr "考虑最近 <n> 个标签(默认:10)"
5936
5937#: builtin/describe.c:408
5938msgid "only consider tags matching <pattern>"
5939msgstr "只考虑匹配 <模式> 的标签"
5940
5941#: builtin/describe.c:410 builtin/name-rev.c:314
5942msgid "show abbreviated commit object as fallback"
5943msgstr "显示简写的提交号作为后备"
5944
5945#: builtin/describe.c:411
5946msgid "mark"
5947msgstr "标记"
5948
5949#: builtin/describe.c:412
5950msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5951msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5952
5953#: builtin/describe.c:430
5954msgid "--long is incompatible with --abbrev=0"
5955msgstr "--long 与 --abbrev=0 不兼容"
5956
5957#: builtin/describe.c:456
5958msgid "No names found, cannot describe anything."
5959msgstr "没有发现名称,无法描述任何东西。"
5960
5961#: builtin/describe.c:476
5962msgid "--dirty is incompatible with commit-ishes"
5963msgstr "--dirty 不能与提交同时使用"
5964
5965#: builtin/diff.c:86
5966#, c-format
5967msgid "'%s': not a regular file or symlink"
5968msgstr "'%s':不是一个正规文件或符号链接"
5969
5970#: builtin/diff.c:237
5971#, c-format
5972msgid "invalid option: %s"
5973msgstr "无效选项:%s"
5974
5975#: builtin/diff.c:358
5976msgid "Not a git repository"
5977msgstr "不是一个 git 仓库"
5978
5979#: builtin/diff.c:401
5980#, c-format
5981msgid "invalid object '%s' given."
5982msgstr "提供了无效对象 '%s'。"
5983
5984#: builtin/diff.c:410
5985#, c-format
5986msgid "more than two blobs given: '%s'"
5987msgstr "提供了超过两个数据对象:'%s'"
5988
5989#: builtin/diff.c:417
5990#, c-format
5991msgid "unhandled object '%s' given."
5992msgstr "无法处理的对象 '%s'。"
5993
5994#: builtin/fast-export.c:25
5995msgid "git fast-export [rev-list-opts]"
5996msgstr "git fast-export [rev-list-opts]"
5997
5998#: builtin/fast-export.c:980
5999msgid "show progress after <n> objects"
6000msgstr "在 <n> 个对象之后显示进度"
6001
6002#: builtin/fast-export.c:982
6003msgid "select handling of signed tags"
6004msgstr "选择如何处理签名标签"
6005
6006#: builtin/fast-export.c:985
6007msgid "select handling of tags that tag filtered objects"
6008msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6009
6010#: builtin/fast-export.c:988
6011msgid "Dump marks to this file"
6012msgstr "把标记存储到这个文件"
6013
6014#: builtin/fast-export.c:990
6015msgid "Import marks from this file"
6016msgstr "从这个文件导入标记"
6017
6018#: builtin/fast-export.c:992
6019msgid "Fake a tagger when tags lack one"
6020msgstr "当标签缺少标记者字段时,假装提供一个"
6021
6022#: builtin/fast-export.c:994
6023msgid "Output full tree for each commit"
6024msgstr "每次提交都输出整个树"
6025
6026#: builtin/fast-export.c:996
6027msgid "Use the done feature to terminate the stream"
6028msgstr "使用 done 功能来终止流"
6029
6030#: builtin/fast-export.c:997
6031msgid "Skip output of blob data"
6032msgstr "跳过数据对象的输出"
6033
6034#: builtin/fast-export.c:998
6035msgid "refspec"
6036msgstr "引用规格"
6037
6038#: builtin/fast-export.c:999
6039msgid "Apply refspec to exported refs"
6040msgstr "对导出的引用应用引用规格"
6041
6042#: builtin/fast-export.c:1000
6043msgid "anonymize output"
6044msgstr "匿名输出"
6045
6046#: builtin/fetch.c:20
6047msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6048msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6049
6050#: builtin/fetch.c:21
6051msgid "git fetch [<options>] <group>"
6052msgstr "git fetch [<选项>] <组>"
6053
6054#: builtin/fetch.c:22
6055msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6056msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6057
6058#: builtin/fetch.c:23
6059msgid "git fetch --all [<options>]"
6060msgstr "git fetch --all [<选项>]"
6061
6062#: builtin/fetch.c:92 builtin/pull.c:166
6063msgid "fetch from all remotes"
6064msgstr "从所有的远程抓取"
6065
6066#: builtin/fetch.c:94 builtin/pull.c:169
6067msgid "append to .git/FETCH_HEAD instead of overwriting"
6068msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6069
6070#: builtin/fetch.c:96 builtin/pull.c:172
6071msgid "path to upload pack on remote end"
6072msgstr "上传包到远程的路径"
6073
6074#: builtin/fetch.c:97 builtin/pull.c:174
6075msgid "force overwrite of local branch"
6076msgstr "强制覆盖本地分支"
6077
6078#: builtin/fetch.c:99
6079msgid "fetch from multiple remotes"
6080msgstr "从多个远程抓取"
6081
6082#: builtin/fetch.c:101 builtin/pull.c:176
6083msgid "fetch all tags and associated objects"
6084msgstr "抓取所有的标签和关联对象"
6085
6086#: builtin/fetch.c:103
6087msgid "do not fetch all tags (--no-tags)"
6088msgstr "不抓取任何标签(--no-tags)"
6089
6090#: builtin/fetch.c:105
6091msgid "number of submodules fetched in parallel"
6092msgstr "子模组获取的并发数"
6093
6094#: builtin/fetch.c:107 builtin/pull.c:179
6095msgid "prune remote-tracking branches no longer on remote"
6096msgstr "清除远程已经不存在的分支的跟踪分支"
6097
6098# 译者:可选值,不能翻译
6099#: builtin/fetch.c:108 builtin/pull.c:182
6100msgid "on-demand"
6101msgstr "on-demand"
6102
6103#: builtin/fetch.c:109 builtin/pull.c:183
6104msgid "control recursive fetching of submodules"
6105msgstr "控制子模组的递归抓取"
6106
6107#: builtin/fetch.c:113 builtin/pull.c:191
6108msgid "keep downloaded pack"
6109msgstr "保持下载包"
6110
6111#: builtin/fetch.c:115
6112msgid "allow updating of HEAD ref"
6113msgstr "允许更新 HEAD 引用"
6114
6115#: builtin/fetch.c:118 builtin/pull.c:194
6116msgid "deepen history of shallow clone"
6117msgstr "深化浅克隆的历史"
6118
6119#: builtin/fetch.c:120 builtin/pull.c:197
6120msgid "convert to a complete repository"
6121msgstr "转换为一个完整的仓库"
6122
6123#: builtin/fetch.c:122 builtin/log.c:1236
6124msgid "dir"
6125msgstr "目录"
6126
6127#: builtin/fetch.c:123
6128msgid "prepend this to submodule path output"
6129msgstr "在子模组路径输出的前面加上此目录"
6130
6131#: builtin/fetch.c:126
6132msgid "default mode for recursion"
6133msgstr "递归的默认模式"
6134
6135#: builtin/fetch.c:128 builtin/pull.c:200
6136msgid "accept refs that update .git/shallow"
6137msgstr "接受更新 .git/shallow 的引用"
6138
6139#: builtin/fetch.c:129 builtin/pull.c:202
6140msgid "refmap"
6141msgstr "引用映射"
6142
6143#: builtin/fetch.c:130 builtin/pull.c:203
6144msgid "specify fetch refmap"
6145msgstr "指定获取操作的引用映射"
6146
6147#: builtin/fetch.c:386
6148msgid "Couldn't find remote ref HEAD"
6149msgstr "无法发现远程 HEAD 引用"
6150
6151#: builtin/fetch.c:466
6152#, c-format
6153msgid "object %s not found"
6154msgstr "对象 %s 未发现"
6155
6156#: builtin/fetch.c:471
6157msgid "[up to date]"
6158msgstr "[最新]"
6159
6160#: builtin/fetch.c:485
6161#, c-format
6162msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
6163msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
6164
6165#: builtin/fetch.c:486 builtin/fetch.c:574
6166msgid "[rejected]"
6167msgstr "[已拒绝]"
6168
6169#: builtin/fetch.c:497
6170msgid "[tag update]"
6171msgstr "[标签更新]"
6172
6173# 译者:注意保持前导空格
6174#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
6175msgid " (unable to update local ref)"
6176msgstr " (不能更新本地引用)"
6177
6178#: builtin/fetch.c:517
6179msgid "[new tag]"
6180msgstr "[新标签]"
6181
6182#: builtin/fetch.c:520
6183msgid "[new branch]"
6184msgstr "[新分支]"
6185
6186#: builtin/fetch.c:523
6187msgid "[new ref]"
6188msgstr "[新引用]"
6189
6190#: builtin/fetch.c:569
6191msgid "unable to update local ref"
6192msgstr "不能更新本地引用"
6193
6194#: builtin/fetch.c:569
6195msgid "forced update"
6196msgstr "强制更新"
6197
6198#: builtin/fetch.c:576
6199msgid "(non-fast-forward)"
6200msgstr "(非快进式)"
6201
6202#: builtin/fetch.c:610 builtin/fetch.c:851
6203#, c-format
6204msgid "cannot open %s: %s\n"
6205msgstr "无法打开 %s:%s\n"
6206
6207#: builtin/fetch.c:619
6208#, c-format
6209msgid "%s did not send all necessary objects\n"
6210msgstr "%s 未发送所有必须的对象\n"
6211
6212#: builtin/fetch.c:637
6213#, c-format
6214msgid "reject %s because shallow roots are not allowed to be updated"
6215msgstr "拒绝 %s 因为浅克隆不允许被更新"
6216
6217#: builtin/fetch.c:724 builtin/fetch.c:816
6218#, c-format
6219msgid "From %.*s\n"
6220msgstr "来自 %.*s\n"
6221
6222#: builtin/fetch.c:735
6223#, c-format
6224msgid ""
6225"some local refs could not be updated; try running\n"
6226" 'git remote prune %s' to remove any old, conflicting branches"
6227msgstr ""
6228"一些本地引用不能被更新;尝试运行\n"
6229" 'git remote prune %s' 来删除旧的、有冲突的分支"
6230
6231# 译者:注意保持前导空格
6232#: builtin/fetch.c:787
6233#, c-format
6234msgid " (%s will become dangling)"
6235msgstr " (%s 将成为摇摆状态)"
6236
6237# 译者:注意保持前导空格
6238#: builtin/fetch.c:788
6239#, c-format
6240msgid " (%s has become dangling)"
6241msgstr " (%s 已成为摇摆状态)"
6242
6243#: builtin/fetch.c:820
6244msgid "[deleted]"
6245msgstr "[已删除]"
6246
6247#: builtin/fetch.c:821 builtin/remote.c:1025
6248msgid "(none)"
6249msgstr "(无)"
6250
6251#: builtin/fetch.c:841
6252#, c-format
6253msgid "Refusing to fetch into current branch %s of non-bare repository"
6254msgstr "拒绝获取到非纯仓库的当前分支 %s"
6255
6256#: builtin/fetch.c:860
6257#, c-format
6258msgid "Option \"%s\" value \"%s\" is not valid for %s"
6259msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6260
6261#: builtin/fetch.c:863
6262#, c-format
6263msgid "Option \"%s\" is ignored for %s\n"
6264msgstr "选项 \"%s\" 为 %s 所忽略\n"
6265
6266#: builtin/fetch.c:920
6267#, c-format
6268msgid "Don't know how to fetch from %s"
6269msgstr "不知道如何从 %s 获取"
6270
6271#: builtin/fetch.c:1080
6272#, c-format
6273msgid "Fetching %s\n"
6274msgstr "正在获取 %s\n"
6275
6276#: builtin/fetch.c:1082 builtin/remote.c:96
6277#, c-format
6278msgid "Could not fetch %s"
6279msgstr "不能获取 %s"
6280
6281#: builtin/fetch.c:1100
6282msgid ""
6283"No remote repository specified. Please, specify either a URL or a\n"
6284"remote name from which new revisions should be fetched."
6285msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6286
6287#: builtin/fetch.c:1123
6288msgid "You need to specify a tag name."
6289msgstr "您需要指定一个标签名称。"
6290
6291#: builtin/fetch.c:1165
6292msgid "--depth and --unshallow cannot be used together"
6293msgstr "--depth 和 --unshallow 不能同时使用"
6294
6295#: builtin/fetch.c:1167
6296msgid "--unshallow on a complete repository does not make sense"
6297msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6298
6299#: builtin/fetch.c:1187
6300msgid "fetch --all does not take a repository argument"
6301msgstr "fetch --all 不能带一个仓库参数"
6302
6303#: builtin/fetch.c:1189
6304msgid "fetch --all does not make sense with refspecs"
6305msgstr "fetch --all 带引用规格没有任何意义"
6306
6307#: builtin/fetch.c:1200
6308#, c-format
6309msgid "No such remote or remote group: %s"
6310msgstr "没有这样的远程或远程组:%s"
6311
6312#: builtin/fetch.c:1208
6313msgid "Fetching a group and specifying refspecs does not make sense"
6314msgstr "获取组并指定引用规格没有意义"
6315
6316#: builtin/fmt-merge-msg.c:14
6317msgid ""
6318"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6319msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6320
6321#: builtin/fmt-merge-msg.c:667
6322msgid "populate log with at most <n> entries from shortlog"
6323msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6324
6325#: builtin/fmt-merge-msg.c:670
6326msgid "alias for --log (deprecated)"
6327msgstr "参数 --log 的别名(已弃用)"
6328
6329#: builtin/fmt-merge-msg.c:673
6330msgid "text"
6331msgstr "文本"
6332
6333#: builtin/fmt-merge-msg.c:674
6334msgid "use <text> as start of message"
6335msgstr "使用 <文本> 作为提交说明的开始"
6336
6337#: builtin/fmt-merge-msg.c:675
6338msgid "file to read from"
6339msgstr "从文件中读取"
6340
6341#: builtin/for-each-ref.c:9
6342msgid "git for-each-ref [<options>] [<pattern>]"
6343msgstr "git for-each-ref [<选项>] [<模式>]"
6344
6345#: builtin/for-each-ref.c:10
6346msgid "git for-each-ref [--points-at <object>]"
6347msgstr "git for-each-ref [--points-at <对象>]"
6348
6349#: builtin/for-each-ref.c:11
6350msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6351msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6352
6353#: builtin/for-each-ref.c:12
6354msgid "git for-each-ref [--contains [<object>]]"
6355msgstr "git for-each-ref [--contains [<对象>]]"
6356
6357#: builtin/for-each-ref.c:27
6358msgid "quote placeholders suitably for shells"
6359msgstr "引用占位符适用于 shells"
6360
6361#: builtin/for-each-ref.c:29
6362msgid "quote placeholders suitably for perl"
6363msgstr "引用占位符适用于 perl"
6364
6365#: builtin/for-each-ref.c:31
6366msgid "quote placeholders suitably for python"
6367msgstr "引用占位符适用于 python"
6368
6369#: builtin/for-each-ref.c:33
6370msgid "quote placeholders suitably for Tcl"
6371msgstr "引用占位符适用于 Tcl"
6372
6373#: builtin/for-each-ref.c:36
6374msgid "show only <n> matched refs"
6375msgstr "只显示 <n> 个匹配的引用"
6376
6377#: builtin/for-each-ref.c:37 builtin/tag.c:372
6378msgid "format to use for the output"
6379msgstr "输出格式"
6380
6381#: builtin/for-each-ref.c:41
6382msgid "print only refs which points at the given object"
6383msgstr "只打印指向给定对象的引用"
6384
6385#: builtin/for-each-ref.c:43
6386msgid "print only refs that are merged"
6387msgstr "只打印已经合并的引用"
6388
6389#: builtin/for-each-ref.c:44
6390msgid "print only refs that are not merged"
6391msgstr "只打印没有合并的引用"
6392
6393#: builtin/for-each-ref.c:45
6394msgid "print only refs which contain the commit"
6395msgstr "只打印包含该提交的引用"
6396
6397#: builtin/fsck.c:156 builtin/prune.c:140
6398msgid "Checking connectivity"
6399msgstr "检查连接中"
6400
6401#: builtin/fsck.c:486
6402msgid "Checking object directories"
6403msgstr "检查对象目录中"
6404
6405#: builtin/fsck.c:553
6406msgid "git fsck [<options>] [<object>...]"
6407msgstr "git fsck [<选项>] [<对象>...]"
6408
6409#: builtin/fsck.c:559
6410msgid "show unreachable objects"
6411msgstr "显示不可达的对象"
6412
6413#: builtin/fsck.c:560
6414msgid "show dangling objects"
6415msgstr "显示摇摆的对象"
6416
6417#: builtin/fsck.c:561
6418msgid "report tags"
6419msgstr "报告标签"
6420
6421#: builtin/fsck.c:562
6422msgid "report root nodes"
6423msgstr "报告根节点"
6424
6425#: builtin/fsck.c:563
6426msgid "make index objects head nodes"
6427msgstr "将索引亦作为检查的头节点"
6428
6429#: builtin/fsck.c:564
6430msgid "make reflogs head nodes (default)"
6431msgstr "将引用日志作为检查的头节点(默认)"
6432
6433#: builtin/fsck.c:565
6434msgid "also consider packs and alternate objects"
6435msgstr "也考虑包和备用对象"
6436
6437#: builtin/fsck.c:566
6438msgid "check only connectivity"
6439msgstr "仅检查连通性"
6440
6441#: builtin/fsck.c:567
6442msgid "enable more strict checking"
6443msgstr "启用更严格的检查"
6444
6445#: builtin/fsck.c:569
6446msgid "write dangling objects in .git/lost-found"
6447msgstr "将摇摆对象写入 .git/lost-found 中"
6448
6449#: builtin/fsck.c:570 builtin/prune.c:107
6450msgid "show progress"
6451msgstr "显示进度"
6452
6453#: builtin/fsck.c:631
6454msgid "Checking objects"
6455msgstr "检查对象中"
6456
6457#: builtin/gc.c:25
6458msgid "git gc [<options>]"
6459msgstr "git gc [<选项>]"
6460
6461#: builtin/gc.c:72
6462#, c-format
6463msgid "Invalid %s: '%s'"
6464msgstr "无效 %s:'%s'"
6465
6466#: builtin/gc.c:139
6467#, c-format
6468msgid "insanely long object directory %.*s"
6469msgstr "不正常的长对象目录 %.*s"
6470
6471#: builtin/gc.c:290
6472#, c-format
6473msgid ""
6474"The last gc run reported the following. Please correct the root cause\n"
6475"and remove %s.\n"
6476"Automatic cleanup will not be performed until the file is removed.\n"
6477"\n"
6478"%s"
6479msgstr ""
6480"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6481"在该文件被删除之前,自动清理将不会执行。\n"
6482"\n"
6483"%s"
6484
6485#: builtin/gc.c:327
6486msgid "prune unreferenced objects"
6487msgstr "清除未引用的对象"
6488
6489#: builtin/gc.c:329
6490msgid "be more thorough (increased runtime)"
6491msgstr "更彻底(增加运行时间)"
6492
6493#: builtin/gc.c:330
6494msgid "enable auto-gc mode"
6495msgstr "启用自动垃圾回收模式"
6496
6497#: builtin/gc.c:331
6498msgid "force running gc even if there may be another gc running"
6499msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6500
6501#: builtin/gc.c:373
6502#, c-format
6503msgid "Auto packing the repository in background for optimum performance.\n"
6504msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6505
6506#: builtin/gc.c:375
6507#, c-format
6508msgid "Auto packing the repository for optimum performance.\n"
6509msgstr "自动打包仓库以求最佳性能。\n"
6510
6511#: builtin/gc.c:376
6512#, c-format
6513msgid "See \"git help gc\" for manual housekeeping.\n"
6514msgstr "手工维护参见 \"git help gc\"。\n"
6515
6516#: builtin/gc.c:397
6517#, c-format
6518msgid ""
6519"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6520msgstr ""
6521"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6522
6523#: builtin/gc.c:441
6524msgid ""
6525"There are too many unreachable loose objects; run 'git prune' to remove them."
6526msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6527
6528#: builtin/grep.c:23
6529msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6530msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6531
6532#: builtin/grep.c:219
6533#, c-format
6534msgid "grep: failed to create thread: %s"
6535msgstr "grep:无法创建线程:%s"
6536
6537#: builtin/grep.c:277
6538#, c-format
6539msgid "invalid number of threads specified (%d) for %s"
6540msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6541
6542#: builtin/grep.c:452 builtin/grep.c:487
6543#, c-format
6544msgid "unable to read tree (%s)"
6545msgstr "无法读取树(%s)"
6546
6547#: builtin/grep.c:502
6548#, c-format
6549msgid "unable to grep from object of type %s"
6550msgstr "无法抓取来自于 %s 类型的对象"
6551
6552#: builtin/grep.c:558
6553#, c-format
6554msgid "switch `%c' expects a numerical value"
6555msgstr "开关 `%c' 期望一个数字值"
6556
6557#: builtin/grep.c:575
6558#, c-format
6559msgid "cannot open '%s'"
6560msgstr "不能打开 '%s'"
6561
6562#: builtin/grep.c:644
6563msgid "search in index instead of in the work tree"
6564msgstr "在索引区搜索而不是在工作区"
6565
6566#: builtin/grep.c:646
6567msgid "find in contents not managed by git"
6568msgstr "在未被 git 管理的内容中查找"
6569
6570# 译者:中文字符串拼接,可删除前导空格
6571#: builtin/grep.c:648
6572msgid "search in both tracked and untracked files"
6573msgstr "在跟踪和未跟踪的文件中搜索"
6574
6575#: builtin/grep.c:650
6576msgid "ignore files specified via '.gitignore'"
6577msgstr "忽略 '.gitignore' 包含的文件"
6578
6579#: builtin/grep.c:653
6580msgid "show non-matching lines"
6581msgstr "显示未匹配的行"
6582
6583#: builtin/grep.c:655
6584msgid "case insensitive matching"
6585msgstr "不区分大小写匹配"
6586
6587#: builtin/grep.c:657
6588msgid "match patterns only at word boundaries"
6589msgstr "只在单词边界匹配模式"
6590
6591#: builtin/grep.c:659
6592msgid "process binary files as text"
6593msgstr "把二进制文件当做文本处理"
6594
6595#: builtin/grep.c:661
6596msgid "don't match patterns in binary files"
6597msgstr "不在二进制文件中匹配模式"
6598
6599#: builtin/grep.c:664
6600msgid "process binary files with textconv filters"
6601msgstr "用 textconv 过滤器处理二进制文件"
6602
6603#: builtin/grep.c:666
6604msgid "descend at most <depth> levels"
6605msgstr "最多以指定的深度向下寻找"
6606
6607#: builtin/grep.c:670
6608msgid "use extended POSIX regular expressions"
6609msgstr "使用扩展的 POSIX 正则表达式"
6610
6611#: builtin/grep.c:673
6612msgid "use basic POSIX regular expressions (default)"
6613msgstr "使用基本的 POSIX 正则表达式(默认)"
6614
6615#: builtin/grep.c:676
6616msgid "interpret patterns as fixed strings"
6617msgstr "把模式解析为固定的字符串"
6618
6619#: builtin/grep.c:679
6620msgid "use Perl-compatible regular expressions"
6621msgstr "使用 Perl 兼容的正则表达式"
6622
6623#: builtin/grep.c:682
6624msgid "show line numbers"
6625msgstr "显示行号"
6626
6627#: builtin/grep.c:683
6628msgid "don't show filenames"
6629msgstr "不显示文件名"
6630
6631#: builtin/grep.c:684
6632msgid "show filenames"
6633msgstr "显示文件名"
6634
6635#: builtin/grep.c:686
6636msgid "show filenames relative to top directory"
6637msgstr "显示相对于顶级目录的文件名"
6638
6639#: builtin/grep.c:688
6640msgid "show only filenames instead of matching lines"
6641msgstr "只显示文件名而不显示匹配的行"
6642
6643#: builtin/grep.c:690
6644msgid "synonym for --files-with-matches"
6645msgstr "和 --files-with-matches 同义"
6646
6647#: builtin/grep.c:693
6648msgid "show only the names of files without match"
6649msgstr "只显示未匹配的文件名"
6650
6651#: builtin/grep.c:695
6652msgid "print NUL after filenames"
6653msgstr "在文件名后输出 NUL 字符"
6654
6655#: builtin/grep.c:697
6656msgid "show the number of matches instead of matching lines"
6657msgstr "显示总匹配行数,而不显示匹配的行"
6658
6659#: builtin/grep.c:698
6660msgid "highlight matches"
6661msgstr "高亮显示匹配项"
6662
6663#: builtin/grep.c:700
6664msgid "print empty line between matches from different files"
6665msgstr "在不同文件的匹配项之间打印空行"
6666
6667#: builtin/grep.c:702
6668msgid "show filename only once above matches from same file"
6669msgstr "只在同一文件的匹配项的上面显示一次文件名"
6670
6671#: builtin/grep.c:705
6672msgid "show <n> context lines before and after matches"
6673msgstr "显示匹配项前后的 <n> 行上下文"
6674
6675#: builtin/grep.c:708
6676msgid "show <n> context lines before matches"
6677msgstr "显示匹配项前 <n> 行上下文"
6678
6679#: builtin/grep.c:710
6680msgid "show <n> context lines after matches"
6681msgstr "显示匹配项后 <n> 行上下文"
6682
6683#: builtin/grep.c:712
6684msgid "use <n> worker threads"
6685msgstr "使用 <n> 个工作线程"
6686
6687#: builtin/grep.c:713
6688msgid "shortcut for -C NUM"
6689msgstr "快捷键 -C 数字"
6690
6691#: builtin/grep.c:716
6692msgid "show a line with the function name before matches"
6693msgstr "在匹配的前面显示一行函数名"
6694
6695#: builtin/grep.c:718
6696msgid "show the surrounding function"
6697msgstr "显示所在函数的前后内容"
6698
6699#: builtin/grep.c:721
6700msgid "read patterns from file"
6701msgstr "从文件读取模式"
6702
6703#: builtin/grep.c:723
6704msgid "match <pattern>"
6705msgstr "匹配 <模式>"
6706
6707#: builtin/grep.c:725
6708msgid "combine patterns specified with -e"
6709msgstr "组合用 -e 参数设定的模式"
6710
6711#: builtin/grep.c:737
6712msgid "indicate hit with exit status without output"
6713msgstr "不输出,而用退出码标识命中状态"
6714
6715#: builtin/grep.c:739
6716msgid "show only matches from files that match all patterns"
6717msgstr "只显示匹配所有模式的文件中的匹配"
6718
6719#: builtin/grep.c:741
6720msgid "show parse tree for grep expression"
6721msgstr "显示 grep 表达式的解析树"
6722
6723#: builtin/grep.c:745
6724msgid "pager"
6725msgstr "分页"
6726
6727#: builtin/grep.c:745
6728msgid "show matching files in the pager"
6729msgstr "分页显示匹配的文件"
6730
6731#: builtin/grep.c:748
6732msgid "allow calling of grep(1) (ignored by this build)"
6733msgstr "允许调用 grep(1)(本次构建忽略)"
6734
6735#: builtin/grep.c:811
6736msgid "no pattern given."
6737msgstr "未提供模式匹配。"
6738
6739#: builtin/grep.c:843 builtin/index-pack.c:1475
6740#, c-format
6741msgid "invalid number of threads specified (%d)"
6742msgstr "指定的线程数无效(%d)"
6743
6744#: builtin/grep.c:873
6745msgid "--open-files-in-pager only works on the worktree"
6746msgstr "--open-files-in-pager 仅用于工作区"
6747
6748#: builtin/grep.c:899
6749msgid "--cached or --untracked cannot be used with --no-index."
6750msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6751
6752#: builtin/grep.c:904
6753msgid "--no-index or --untracked cannot be used with revs."
6754msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6755
6756#: builtin/grep.c:907
6757msgid "--[no-]exclude-standard cannot be used for tracked contents."
6758msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6759
6760#: builtin/grep.c:915
6761msgid "both --cached and trees are given."
6762msgstr "同时给出了 --cached 和树对象。"
6763
6764#: builtin/hash-object.c:81
6765msgid ""
6766"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6767"[--] <file>..."
6768msgstr ""
6769"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6770"[--] <文件>..."
6771
6772#: builtin/hash-object.c:82
6773msgid "git hash-object --stdin-paths"
6774msgstr "git hash-object --stdin-paths"
6775
6776#: builtin/hash-object.c:93
6777msgid "type"
6778msgstr "类型"
6779
6780#: builtin/hash-object.c:93
6781msgid "object type"
6782msgstr "对象类型"
6783
6784#: builtin/hash-object.c:94
6785msgid "write the object into the object database"
6786msgstr "将对象写入对象数据库"
6787
6788#: builtin/hash-object.c:96
6789msgid "read the object from stdin"
6790msgstr "从标准输入读取对象"
6791
6792#: builtin/hash-object.c:98
6793msgid "store file as is without filters"
6794msgstr "原样存储文件不使用过滤器"
6795
6796#: builtin/hash-object.c:99
6797msgid ""
6798"just hash any random garbage to create corrupt objects for debugging Git"
6799msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6800
6801#: builtin/hash-object.c:100
6802msgid "process file as it were from this path"
6803msgstr "处理文件并假设其来自于此路径"
6804
6805#: builtin/help.c:41
6806msgid "print all available commands"
6807msgstr "打印所有可用的命令"
6808
6809#: builtin/help.c:42
6810msgid "print list of useful guides"
6811msgstr "显示有用的指南列表"
6812
6813#: builtin/help.c:43
6814msgid "show man page"
6815msgstr "显示 man 手册"
6816
6817#: builtin/help.c:44
6818msgid "show manual in web browser"
6819msgstr "在 web 浏览器中显示手册"
6820
6821#: builtin/help.c:46
6822msgid "show info page"
6823msgstr "显示 info 手册"
6824
6825#: builtin/help.c:52
6826msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6827msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6828
6829#: builtin/help.c:64
6830#, c-format
6831msgid "unrecognized help format '%s'"
6832msgstr "未能识别的帮助格式 '%s'"
6833
6834#: builtin/help.c:91
6835msgid "Failed to start emacsclient."
6836msgstr "无法启动 emacsclient。"
6837
6838#: builtin/help.c:104
6839msgid "Failed to parse emacsclient version."
6840msgstr "无法解析 emacsclient 版本。"
6841
6842#: builtin/help.c:112
6843#, c-format
6844msgid "emacsclient version '%d' too old (< 22)."
6845msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6846
6847#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6848#, c-format
6849msgid "failed to exec '%s': %s"
6850msgstr "无法执行 '%s':%s"
6851
6852#: builtin/help.c:205
6853#, c-format
6854msgid ""
6855"'%s': path for unsupported man viewer.\n"
6856"Please consider using 'man.<tool>.cmd' instead."
6857msgstr ""
6858"'%s':不支持的 man 手册查看器的路径。\n"
6859"请使用 'man.<工具>.cmd'。"
6860
6861#: builtin/help.c:217
6862#, c-format
6863msgid ""
6864"'%s': cmd for supported man viewer.\n"
6865"Please consider using 'man.<tool>.path' instead."
6866msgstr ""
6867"'%s': 支持的 man 手册查看器命令。\n"
6868"请使用 'man.<工具>.path'。"
6869
6870#: builtin/help.c:334
6871#, c-format
6872msgid "'%s': unknown man viewer."
6873msgstr "'%s':未知的 man 查看器。"
6874
6875#: builtin/help.c:351
6876msgid "no man viewer handled the request"
6877msgstr "没有 man 查看器处理此请求"
6878
6879#: builtin/help.c:359
6880msgid "no info viewer handled the request"
6881msgstr "没有 info 查看器处理此请求"
6882
6883#: builtin/help.c:408
6884msgid "Defining attributes per path"
6885msgstr "定义路径的属性"
6886
6887#: builtin/help.c:409
6888msgid "Everyday Git With 20 Commands Or So"
6889msgstr "每一天 Git 常用的约 20 条命令"
6890
6891#: builtin/help.c:410
6892msgid "A Git glossary"
6893msgstr "Git 词汇表"
6894
6895#: builtin/help.c:411
6896msgid "Specifies intentionally untracked files to ignore"
6897msgstr "忽略指定的未跟踪文件"
6898
6899#: builtin/help.c:412
6900msgid "Defining submodule properties"
6901msgstr "定义子模组属性"
6902
6903#: builtin/help.c:413
6904msgid "Specifying revisions and ranges for Git"
6905msgstr "指定 Git 的版本和版本范围"
6906
6907#: builtin/help.c:414
6908msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6909msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6910
6911#: builtin/help.c:415
6912msgid "An overview of recommended workflows with Git"
6913msgstr "Git 推荐的工作流概览"
6914
6915#: builtin/help.c:427
6916msgid "The common Git guides are:\n"
6917msgstr "最常用的 Git 向导有:\n"
6918
6919#: builtin/help.c:448 builtin/help.c:465
6920#, c-format
6921msgid "usage: %s%s"
6922msgstr "用法:%s%s"
6923
6924#: builtin/help.c:481
6925#, c-format
6926msgid "`git %s' is aliased to `%s'"
6927msgstr "`git %s' 是 `%s' 的别名"
6928
6929#: builtin/index-pack.c:152
6930#, c-format
6931msgid "unable to open %s"
6932msgstr "不能打开 %s"
6933
6934#: builtin/index-pack.c:202
6935#, c-format
6936msgid "object type mismatch at %s"
6937msgstr "%s 的对象类型不匹配"
6938
6939#: builtin/index-pack.c:222
6940#, c-format
6941msgid "did not receive expected object %s"
6942msgstr "未能获取期望的对象 %s"
6943
6944#: builtin/index-pack.c:225
6945#, c-format
6946msgid "object %s: expected type %s, found %s"
6947msgstr "对象 %s:期待类型 %s,却是 %s"
6948
6949#: builtin/index-pack.c:267
6950#, c-format
6951msgid "cannot fill %d byte"
6952msgid_plural "cannot fill %d bytes"
6953msgstr[0] "无法填充 %d 字节"
6954msgstr[1] "无法填充 %d 字节"
6955
6956#: builtin/index-pack.c:277
6957msgid "early EOF"
6958msgstr "过早的文件结束符(EOF)"
6959
6960#: builtin/index-pack.c:278
6961msgid "read error on input"
6962msgstr "输入上的读错误"
6963
6964#: builtin/index-pack.c:290
6965msgid "used more bytes than were available"
6966msgstr "用掉了超过可用的字节"
6967
6968#: builtin/index-pack.c:297
6969msgid "pack too large for current definition of off_t"
6970msgstr "包太大超过了当前 off_t 的定义"
6971
6972#: builtin/index-pack.c:313
6973#, c-format
6974msgid "unable to create '%s'"
6975msgstr "不能创建 '%s'"
6976
6977#: builtin/index-pack.c:318
6978#, c-format
6979msgid "cannot open packfile '%s'"
6980msgstr "无法打开包文件 '%s'"
6981
6982#: builtin/index-pack.c:332
6983msgid "pack signature mismatch"
6984msgstr "包签名不匹配"
6985
6986#: builtin/index-pack.c:334
6987#, c-format
6988msgid "pack version %<PRIu32> unsupported"
6989msgstr "不支持包版本 %<PRIu32>"
6990
6991#: builtin/index-pack.c:352
6992#, c-format
6993msgid "pack has bad object at offset %lu: %s"
6994msgstr "包中有错误的对象位于 %lu:%s"
6995
6996#: builtin/index-pack.c:473
6997#, c-format
6998msgid "inflate returned %d"
6999msgstr "解压缩返回 %d"
7000
7001#: builtin/index-pack.c:522
7002msgid "offset value overflow for delta base object"
7003msgstr "偏移值覆盖了 delta 基准对象"
7004
7005#: builtin/index-pack.c:530
7006msgid "delta base offset is out of bound"
7007msgstr "delta 基准偏移越界"
7008
7009#: builtin/index-pack.c:538
7010#, c-format
7011msgid "unknown object type %d"
7012msgstr "未知对象类型 %d"
7013
7014#: builtin/index-pack.c:569
7015msgid "cannot pread pack file"
7016msgstr "无法读取包文件"
7017
7018#: builtin/index-pack.c:571
7019#, c-format
7020msgid "premature end of pack file, %lu byte missing"
7021msgid_plural "premature end of pack file, %lu bytes missing"
7022msgstr[0] "包文件过早结束,缺少 %lu 字节"
7023msgstr[1] "包文件过早结束,缺少 %lu 字节"
7024
7025#: builtin/index-pack.c:597
7026msgid "serious inflate inconsistency"
7027msgstr "解压缩严重的不一致"
7028
7029#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
7030#: builtin/index-pack.c:806 builtin/index-pack.c:815
7031#, c-format
7032msgid "SHA1 COLLISION FOUND WITH %s !"
7033msgstr "发现 %s 出现 SHA1 冲突!"
7034
7035#: builtin/index-pack.c:746 builtin/pack-objects.c:162
7036#: builtin/pack-objects.c:254
7037#, c-format
7038msgid "unable to read %s"
7039msgstr "不能读 %s"
7040
7041#: builtin/index-pack.c:812
7042#, c-format
7043msgid "cannot read existing object %s"
7044msgstr "不能读取现存对象 %s"
7045
7046#: builtin/index-pack.c:826
7047#, c-format
7048msgid "invalid blob object %s"
7049msgstr "无效的数据对象 %s"
7050
7051#: builtin/index-pack.c:840
7052#, c-format
7053msgid "invalid %s"
7054msgstr "无效的 %s"
7055
7056#: builtin/index-pack.c:843
7057msgid "Error in object"
7058msgstr "对象中出错"
7059
7060#: builtin/index-pack.c:845
7061#, c-format
7062msgid "Not all child objects of %s are reachable"
7063msgstr "%s 的所有子对象并非都可达"
7064
7065#: builtin/index-pack.c:917 builtin/index-pack.c:948
7066msgid "failed to apply delta"
7067msgstr "无法应用 delta"
7068
7069#: builtin/index-pack.c:1118
7070msgid "Receiving objects"
7071msgstr "接收对象中"
7072
7073#: builtin/index-pack.c:1118
7074msgid "Indexing objects"
7075msgstr "索引对象中"
7076
7077#: builtin/index-pack.c:1150
7078msgid "pack is corrupted (SHA1 mismatch)"
7079msgstr "包冲突(SHA1 不匹配)"
7080
7081#: builtin/index-pack.c:1155
7082msgid "cannot fstat packfile"
7083msgstr "不能枚举包文件状态"
7084
7085#: builtin/index-pack.c:1158
7086msgid "pack has junk at the end"
7087msgstr "包的结尾有垃圾数据"
7088
7089#: builtin/index-pack.c:1169
7090msgid "confusion beyond insanity in parse_pack_objects()"
7091msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7092
7093#: builtin/index-pack.c:1194
7094msgid "Resolving deltas"
7095msgstr "处理 delta 中"
7096
7097#: builtin/index-pack.c:1205
7098#, c-format
7099msgid "unable to create thread: %s"
7100msgstr "不能创建线程:%s"
7101
7102#: builtin/index-pack.c:1247
7103msgid "confusion beyond insanity"
7104msgstr "不可理喻"
7105
7106#: builtin/index-pack.c:1253
7107#, c-format
7108msgid "completed with %d local objects"
7109msgstr "完成 %d 个本地对象"
7110
7111#: builtin/index-pack.c:1263
7112#, c-format
7113msgid "Unexpected tail checksum for %s (disk corruption?)"
7114msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7115
7116#: builtin/index-pack.c:1267
7117#, c-format
7118msgid "pack has %d unresolved delta"
7119msgid_plural "pack has %d unresolved deltas"
7120msgstr[0] "包有 %d 个未解决的 delta"
7121msgstr[1] "包有 %d 个未解决的 delta"
7122
7123#: builtin/index-pack.c:1291
7124#, c-format
7125msgid "unable to deflate appended object (%d)"
7126msgstr "不能压缩附加对象(%d)"
7127
7128#: builtin/index-pack.c:1367
7129#, c-format
7130msgid "local object %s is corrupt"
7131msgstr "本地对象 %s 已损坏"
7132
7133#: builtin/index-pack.c:1391
7134msgid "error while closing pack file"
7135msgstr "关闭包文件时出错"
7136
7137#: builtin/index-pack.c:1404
7138#, c-format
7139msgid "cannot write keep file '%s'"
7140msgstr "无法写保留文件 '%s'"
7141
7142#: builtin/index-pack.c:1412
7143#, c-format
7144msgid "cannot close written keep file '%s'"
7145msgstr "无法关闭保留文件 '%s'"
7146
7147#: builtin/index-pack.c:1425
7148msgid "cannot store pack file"
7149msgstr "无法存储包文件"
7150
7151#: builtin/index-pack.c:1436
7152msgid "cannot store index file"
7153msgstr "无法存储索引文件"
7154
7155#: builtin/index-pack.c:1469
7156#, c-format
7157msgid "bad pack.indexversion=%<PRIu32>"
7158msgstr "坏的 pack.indexversion=%<PRIu32>"
7159
7160#: builtin/index-pack.c:1479 builtin/index-pack.c:1664
7161#, c-format
7162msgid "no threads support, ignoring %s"
7163msgstr "没有线程支持,忽略 %s"
7164
7165#: builtin/index-pack.c:1538
7166#, c-format
7167msgid "Cannot open existing pack file '%s'"
7168msgstr "无法打开现存包文件 '%s'"
7169
7170#: builtin/index-pack.c:1540
7171#, c-format
7172msgid "Cannot open existing pack idx file for '%s'"
7173msgstr "无法为 %s 打开包索引文件"
7174
7175#: builtin/index-pack.c:1587
7176#, c-format
7177msgid "non delta: %d object"
7178msgid_plural "non delta: %d objects"
7179msgstr[0] "非 delta:%d 个对象"
7180msgstr[1] "非 delta:%d 个对象"
7181
7182#: builtin/index-pack.c:1594
7183#, c-format
7184msgid "chain length = %d: %lu object"
7185msgid_plural "chain length = %d: %lu objects"
7186msgstr[0] "链长 = %d: %lu 对象"
7187msgstr[1] "链长 = %d: %lu 对象"
7188
7189#: builtin/index-pack.c:1624
7190msgid "Cannot come back to cwd"
7191msgstr "无法返回当前工作目录"
7192
7193#: builtin/index-pack.c:1676 builtin/index-pack.c:1679
7194#: builtin/index-pack.c:1691 builtin/index-pack.c:1695
7195#, c-format
7196msgid "bad %s"
7197msgstr "错误选项 %s"
7198
7199#: builtin/index-pack.c:1709
7200msgid "--fix-thin cannot be used without --stdin"
7201msgstr "--fix-thin 不能和 --stdin 同时使用"
7202
7203#: builtin/index-pack.c:1713 builtin/index-pack.c:1722
7204#, c-format
7205msgid "packfile name '%s' does not end with '.pack'"
7206msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7207
7208#: builtin/index-pack.c:1730
7209msgid "--verify with no packfile name given"
7210msgstr "--verify 没有提供包文件名参数"
7211
7212#: builtin/init-db.c:55
7213#, c-format
7214msgid "cannot stat '%s'"
7215msgstr "不能枚举 '%s' 状态"
7216
7217#: builtin/init-db.c:61
7218#, c-format
7219msgid "cannot stat template '%s'"
7220msgstr "不能枚举模版 '%s' 状态"
7221
7222#: builtin/init-db.c:66
7223#, c-format
7224msgid "cannot opendir '%s'"
7225msgstr "不能打开目录 '%s'"
7226
7227#: builtin/init-db.c:77
7228#, c-format
7229msgid "cannot readlink '%s'"
7230msgstr "不能读取链接 '%s'"
7231
7232#: builtin/init-db.c:79
7233#, c-format
7234msgid "cannot symlink '%s' '%s'"
7235msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7236
7237#: builtin/init-db.c:85
7238#, c-format
7239msgid "cannot copy '%s' to '%s'"
7240msgstr "不能拷贝 '%s' 至 '%s'"
7241
7242#: builtin/init-db.c:89
7243#, c-format
7244msgid "ignoring template %s"
7245msgstr "忽略模版 %s"
7246
7247#: builtin/init-db.c:118
7248#, c-format
7249msgid "templates not found %s"
7250msgstr "模版未找到 %s"
7251
7252#: builtin/init-db.c:131
7253#, c-format
7254msgid "not copying templates of a wrong format version %d from '%s'"
7255msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7256
7257#: builtin/init-db.c:309 builtin/init-db.c:312
7258#, c-format
7259msgid "%s already exists"
7260msgstr "%s 已经存在"
7261
7262#: builtin/init-db.c:340
7263#, c-format
7264msgid "unable to handle file type %d"
7265msgstr "不能处理 %d 类型的文件"
7266
7267#: builtin/init-db.c:343
7268#, c-format
7269msgid "unable to move %s to %s"
7270msgstr "不能移动 %s 至 %s"
7271
7272#. TRANSLATORS: The first '%s' is either "Reinitialized
7273#. existing" or "Initialized empty", the second " shared" or
7274#. "", and the last '%s%s' is the verbatim directory name.
7275#: builtin/init-db.c:399
7276#, c-format
7277msgid "%s%s Git repository in %s%s\n"
7278msgstr "%s%s Git 仓库于 %s%s\n"
7279
7280#: builtin/init-db.c:400
7281msgid "Reinitialized existing"
7282msgstr "重新初始化现存的"
7283
7284#: builtin/init-db.c:400
7285msgid "Initialized empty"
7286msgstr "初始化空的"
7287
7288# 译者:中文字符串拼接,可删除前导空格
7289#: builtin/init-db.c:401
7290msgid " shared"
7291msgstr "共享"
7292
7293#: builtin/init-db.c:448
7294msgid ""
7295"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7296"shared[=<permissions>]] [<directory>]"
7297msgstr ""
7298"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7299"[<目录>]"
7300
7301#: builtin/init-db.c:471
7302msgid "permissions"
7303msgstr "权限"
7304
7305#: builtin/init-db.c:472
7306msgid "specify that the git repository is to be shared amongst several users"
7307msgstr "指定 git 仓库是多个用户之间共享的"
7308
7309#: builtin/init-db.c:506 builtin/init-db.c:511
7310#, c-format
7311msgid "cannot mkdir %s"
7312msgstr "不能创建目录 %s"
7313
7314#: builtin/init-db.c:515
7315#, c-format
7316msgid "cannot chdir to %s"
7317msgstr "不能切换目录到 %s"
7318
7319#: builtin/init-db.c:536
7320#, c-format
7321msgid ""
7322"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7323"dir=<directory>)"
7324msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7325
7326#: builtin/init-db.c:564
7327#, c-format
7328msgid "Cannot access work tree '%s'"
7329msgstr "不能访问工作区 '%s'"
7330
7331#: builtin/interpret-trailers.c:15
7332msgid ""
7333"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7334"<token>[(=|:)<value>])...] [<file>...]"
7335msgstr ""
7336"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7337">])...] [<文件>...]"
7338
7339#: builtin/interpret-trailers.c:26
7340msgid "edit files in place"
7341msgstr "在原位编辑文件"
7342
7343#: builtin/interpret-trailers.c:27
7344msgid "trim empty trailers"
7345msgstr "删除空签名"
7346
7347#: builtin/interpret-trailers.c:28
7348msgid "trailer"
7349msgstr "签名"
7350
7351#: builtin/interpret-trailers.c:29
7352msgid "trailer(s) to add"
7353msgstr "要添加的签名"
7354
7355#: builtin/interpret-trailers.c:42
7356msgid "no input file given for in-place editing"
7357msgstr "没有给出要原位编辑的文件"
7358
7359#: builtin/log.c:43
7360msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7361msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7362
7363#: builtin/log.c:44
7364msgid "git show [<options>] <object>..."
7365msgstr "git show [<选项>] <对象>..."
7366
7367#: builtin/log.c:83
7368#, c-format
7369msgid "invalid --decorate option: %s"
7370msgstr "无效的 --decorate 选项:%s"
7371
7372#: builtin/log.c:131
7373msgid "suppress diff output"
7374msgstr "不显示差异输出"
7375
7376#: builtin/log.c:132
7377msgid "show source"
7378msgstr "显示源"
7379
7380#: builtin/log.c:133
7381msgid "Use mail map file"
7382msgstr "使用邮件映射文件"
7383
7384#: builtin/log.c:134
7385msgid "decorate options"
7386msgstr "修饰选项"
7387
7388#: builtin/log.c:137
7389msgid "Process line range n,m in file, counting from 1"
7390msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7391
7392#: builtin/log.c:233
7393#, c-format
7394msgid "Final output: %d %s\n"
7395msgstr "最终输出:%d %s\n"
7396
7397#: builtin/log.c:465
7398#, c-format
7399msgid "git show %s: bad file"
7400msgstr "git show %s: 损坏的文件"
7401
7402#: builtin/log.c:479 builtin/log.c:572
7403#, c-format
7404msgid "Could not read object %s"
7405msgstr "不能读取对象 %s"
7406
7407#: builtin/log.c:596
7408#, c-format
7409msgid "Unknown type: %d"
7410msgstr "未知类型:%d"
7411
7412#: builtin/log.c:715
7413msgid "format.headers without value"
7414msgstr "format.headers 没有值"
7415
7416#: builtin/log.c:801
7417msgid "name of output directory is too long"
7418msgstr "输出目录名太长"
7419
7420#: builtin/log.c:816
7421#, c-format
7422msgid "Cannot open patch file %s"
7423msgstr "无法打开补丁文件 %s"
7424
7425#: builtin/log.c:830
7426msgid "Need exactly one range."
7427msgstr "只需要一个范围。"
7428
7429#: builtin/log.c:840
7430msgid "Not a range."
7431msgstr "不是一个范围。"
7432
7433#: builtin/log.c:946
7434msgid "Cover letter needs email format"
7435msgstr "信封需要邮件地址格式"
7436
7437#: builtin/log.c:1025
7438#, c-format
7439msgid "insane in-reply-to: %s"
7440msgstr "不正常的 in-reply-to:%s"
7441
7442#: builtin/log.c:1053
7443msgid "git format-patch [<options>] [<since> | <revision-range>]"
7444msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7445
7446#: builtin/log.c:1098
7447msgid "Two output directories?"
7448msgstr "两个输出目录?"
7449
7450#: builtin/log.c:1214
7451msgid "use [PATCH n/m] even with a single patch"
7452msgstr "使用 [PATCH n/m],即使只有一个补丁"
7453
7454#: builtin/log.c:1217
7455msgid "use [PATCH] even with multiple patches"
7456msgstr "使用 [PATCH],即使有多个补丁"
7457
7458#: builtin/log.c:1221
7459msgid "print patches to standard out"
7460msgstr "打印补丁到标准输出"
7461
7462#: builtin/log.c:1223
7463msgid "generate a cover letter"
7464msgstr "生成一封附信"
7465
7466#: builtin/log.c:1225
7467msgid "use simple number sequence for output file names"
7468msgstr "使用简单的数字序列作为输出文件名"
7469
7470#: builtin/log.c:1226
7471msgid "sfx"
7472msgstr "后缀"
7473
7474#: builtin/log.c:1227
7475msgid "use <sfx> instead of '.patch'"
7476msgstr "使用 <后缀> 代替 '.patch'"
7477
7478#: builtin/log.c:1229
7479msgid "start numbering patches at <n> instead of 1"
7480msgstr "补丁以 <n> 开始编号,而不是1"
7481
7482#: builtin/log.c:1231
7483msgid "mark the series as Nth re-roll"
7484msgstr "标记补丁系列是第几次重制"
7485
7486#: builtin/log.c:1233
7487msgid "Use [<prefix>] instead of [PATCH]"
7488msgstr "使用 [<前缀>] 代替 [PATCH]"
7489
7490#: builtin/log.c:1236
7491msgid "store resulting files in <dir>"
7492msgstr "把结果文件存储在 <目录>"
7493
7494#: builtin/log.c:1239
7495msgid "don't strip/add [PATCH]"
7496msgstr "不删除/添加 [PATCH]"
7497
7498#: builtin/log.c:1242
7499msgid "don't output binary diffs"
7500msgstr "不输出二进制差异"
7501
7502#: builtin/log.c:1244
7503msgid "output all-zero hash in From header"
7504msgstr "在 From 头信息中输出全为零的哈希值"
7505
7506#: builtin/log.c:1246
7507msgid "don't include a patch matching a commit upstream"
7508msgstr "不包含已在上游提交中的补丁"
7509
7510#: builtin/log.c:1248
7511msgid "show patch format instead of default (patch + stat)"
7512msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7513
7514#: builtin/log.c:1250
7515msgid "Messaging"
7516msgstr "邮件发送"
7517
7518#: builtin/log.c:1251
7519msgid "header"
7520msgstr "header"
7521
7522#: builtin/log.c:1252
7523msgid "add email header"
7524msgstr "添加邮件头"
7525
7526#: builtin/log.c:1253 builtin/log.c:1255
7527msgid "email"
7528msgstr "邮件地址"
7529
7530#: builtin/log.c:1253
7531msgid "add To: header"
7532msgstr "添加收件人"
7533
7534#: builtin/log.c:1255
7535msgid "add Cc: header"
7536msgstr "添加抄送"
7537
7538#: builtin/log.c:1257
7539msgid "ident"
7540msgstr "标识"
7541
7542#: builtin/log.c:1258
7543msgid "set From address to <ident> (or committer ident if absent)"
7544msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7545
7546#: builtin/log.c:1260
7547msgid "message-id"
7548msgstr "邮件标识"
7549
7550#: builtin/log.c:1261
7551msgid "make first mail a reply to <message-id>"
7552msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7553
7554#: builtin/log.c:1262 builtin/log.c:1265
7555msgid "boundary"
7556msgstr "边界"
7557
7558#: builtin/log.c:1263
7559msgid "attach the patch"
7560msgstr "附件方式添加补丁"
7561
7562#: builtin/log.c:1266
7563msgid "inline the patch"
7564msgstr "内联显示补丁"
7565
7566#: builtin/log.c:1270
7567msgid "enable message threading, styles: shallow, deep"
7568msgstr "启用邮件线索,风格:浅,深"
7569
7570#: builtin/log.c:1272
7571msgid "signature"
7572msgstr "签名"
7573
7574#: builtin/log.c:1273
7575msgid "add a signature"
7576msgstr "添加一个签名"
7577
7578#: builtin/log.c:1275
7579msgid "add a signature from a file"
7580msgstr "从文件添加一个签名"
7581
7582#: builtin/log.c:1276
7583msgid "don't print the patch filenames"
7584msgstr "不要打印补丁文件名"
7585
7586#: builtin/log.c:1365
7587msgid "-n and -k are mutually exclusive."
7588msgstr "-n 和 -k 互斥。"
7589
7590#: builtin/log.c:1367
7591msgid "--subject-prefix and -k are mutually exclusive."
7592msgstr "--subject-prefix 和 -k 互斥。"
7593
7594#: builtin/log.c:1375
7595msgid "--name-only does not make sense"
7596msgstr "--name-only 无意义"
7597
7598#: builtin/log.c:1377
7599msgid "--name-status does not make sense"
7600msgstr "--name-status 无意义"
7601
7602#: builtin/log.c:1379
7603msgid "--check does not make sense"
7604msgstr "--check 无意义"
7605
7606#: builtin/log.c:1407
7607msgid "standard output, or directory, which one?"
7608msgstr "标准输出或目录,哪一个?"
7609
7610#: builtin/log.c:1409
7611#, c-format
7612msgid "Could not create directory '%s'"
7613msgstr "不能创建目录 '%s'"
7614
7615#: builtin/log.c:1506
7616#, c-format
7617msgid "unable to read signature file '%s'"
7618msgstr "无法读取签名文件 '%s'"
7619
7620#: builtin/log.c:1569
7621msgid "Failed to create output files"
7622msgstr "无法创建输出文件"
7623
7624#: builtin/log.c:1617
7625msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7626msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7627
7628#: builtin/log.c:1671
7629#, c-format
7630msgid ""
7631"Could not find a tracked remote branch, please specify <upstream> manually.\n"
7632msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7633
7634#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
7635#, c-format
7636msgid "Unknown commit %s"
7637msgstr "未知提交 %s"
7638
7639#: builtin/ls-files.c:378
7640msgid "git ls-files [<options>] [<file>...]"
7641msgstr "git ls-files [<选项>] [<文件>...]"
7642
7643#: builtin/ls-files.c:427
7644msgid "identify the file status with tags"
7645msgstr "用标签标识文件的状态"
7646
7647#: builtin/ls-files.c:429
7648msgid "use lowercase letters for 'assume unchanged' files"
7649msgstr "使用小写字母表示 '假设未改变的' 文件"
7650
7651#: builtin/ls-files.c:431
7652msgid "show cached files in the output (default)"
7653msgstr "显示缓存的文件(默认)"
7654
7655#: builtin/ls-files.c:433
7656msgid "show deleted files in the output"
7657msgstr "显示已删除的文件"
7658
7659#: builtin/ls-files.c:435
7660msgid "show modified files in the output"
7661msgstr "显示已修改的文件"
7662
7663#: builtin/ls-files.c:437
7664msgid "show other files in the output"
7665msgstr "显示其它文件"
7666
7667#: builtin/ls-files.c:439
7668msgid "show ignored files in the output"
7669msgstr "显示忽略的文件"
7670
7671#: builtin/ls-files.c:442
7672msgid "show staged contents' object name in the output"
7673msgstr "显示暂存区内容的对象名称"
7674
7675#: builtin/ls-files.c:444
7676msgid "show files on the filesystem that need to be removed"
7677msgstr "显示文件系统需要删除的文件"
7678
7679#: builtin/ls-files.c:446
7680msgid "show 'other' directories' names only"
7681msgstr "只显示“其他”目录的名称"
7682
7683#: builtin/ls-files.c:448
7684msgid "show line endings of files"
7685msgstr "显示文件换行符格式"
7686
7687#: builtin/ls-files.c:450
7688msgid "don't show empty directories"
7689msgstr "不显示空目录"
7690
7691#: builtin/ls-files.c:453
7692msgid "show unmerged files in the output"
7693msgstr "显示未合并的文件"
7694
7695#: builtin/ls-files.c:455
7696msgid "show resolve-undo information"
7697msgstr "显示 resolve-undo 信息"
7698
7699#: builtin/ls-files.c:457
7700msgid "skip files matching pattern"
7701msgstr "匹配排除文件的模式"
7702
7703#: builtin/ls-files.c:460
7704msgid "exclude patterns are read from <file>"
7705msgstr "从 <文件> 中读取排除模式"
7706
7707#: builtin/ls-files.c:463
7708msgid "read additional per-directory exclude patterns in <file>"
7709msgstr "从 <文件> 读取额外的每个目录的排除模式"
7710
7711#: builtin/ls-files.c:465
7712msgid "add the standard git exclusions"
7713msgstr "添加标准的 git 排除"
7714
7715#: builtin/ls-files.c:468
7716msgid "make the output relative to the project top directory"
7717msgstr "显示相对于顶级目录的文件名"
7718
7719#: builtin/ls-files.c:471
7720msgid "if any <file> is not in the index, treat this as an error"
7721msgstr "如果任何 <文件> 都不在索引区,视为错误"
7722
7723#: builtin/ls-files.c:472
7724msgid "tree-ish"
7725msgstr "树或提交"
7726
7727#: builtin/ls-files.c:473
7728msgid "pretend that paths removed since <tree-ish> are still present"
7729msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7730
7731#: builtin/ls-files.c:475
7732msgid "show debugging data"
7733msgstr "显示调试数据"
7734
7735#: builtin/ls-remote.c:7
7736msgid ""
7737"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7738" [-q | --quiet] [--exit-code] [--get-url]\n"
7739" [--symref] [<repository> [<refs>...]]"
7740msgstr ""
7741"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7742" [-q | --quiet] [--exit-code] [--get-url]\n"
7743" [--symref] [<仓库> [<引用>...]]"
7744
7745#: builtin/ls-remote.c:50
7746msgid "do not print remote URL"
7747msgstr "不打印远程 URL"
7748
7749#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
7750msgid "exec"
7751msgstr "exec"
7752
7753#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
7754msgid "path of git-upload-pack on the remote host"
7755msgstr "远程主机上的 git-upload-pack 路径"
7756
7757#: builtin/ls-remote.c:56
7758msgid "limit to tags"
7759msgstr "仅限于标签"
7760
7761#: builtin/ls-remote.c:57
7762msgid "limit to heads"
7763msgstr "仅限于分支"
7764
7765#: builtin/ls-remote.c:58
7766msgid "do not show peeled tags"
7767msgstr "不显示已解析的标签"
7768
7769#: builtin/ls-remote.c:60
7770msgid "take url.<base>.insteadOf into account"
7771msgstr "参考 url.<base>.insteadOf 设置"
7772
7773#: builtin/ls-remote.c:62
7774msgid "exit with exit code 2 if no matching refs are found"
7775msgstr "若未找到匹配的引用则以退出码2退出"
7776
7777#: builtin/ls-remote.c:64
7778msgid "show underlying ref in addition to the object pointed by it"
7779msgstr "除了显示指向的对象外,显示指向的引用名"
7780
7781#: builtin/ls-tree.c:28
7782msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7783msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7784
7785#: builtin/ls-tree.c:128
7786msgid "only show trees"
7787msgstr "只显示树"
7788
7789#: builtin/ls-tree.c:130
7790msgid "recurse into subtrees"
7791msgstr "递归到子树"
7792
7793#: builtin/ls-tree.c:132
7794msgid "show trees when recursing"
7795msgstr "当递归时显示树"
7796
7797#: builtin/ls-tree.c:135
7798msgid "terminate entries with NUL byte"
7799msgstr "条目以 NUL 字符终止"
7800
7801#: builtin/ls-tree.c:136
7802msgid "include object size"
7803msgstr "包括对象大小"
7804
7805#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7806msgid "list only filenames"
7807msgstr "只列出文件名"
7808
7809#: builtin/ls-tree.c:143
7810msgid "use full path names"
7811msgstr "使用文件的全路径"
7812
7813#: builtin/ls-tree.c:145
7814msgid "list entire tree; not just current directory (implies --full-name)"
7815msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7816
7817#: builtin/merge.c:45
7818msgid "git merge [<options>] [<commit>...]"
7819msgstr "git merge [<选项>] [<提交>...]"
7820
7821#: builtin/merge.c:46
7822msgid "git merge [<options>] <msg> HEAD <commit>"
7823msgstr "git merge [<选项>] <说明> HEAD <提交>"
7824
7825#: builtin/merge.c:47
7826msgid "git merge --abort"
7827msgstr "git merge --abort"
7828
7829#: builtin/merge.c:100
7830msgid "switch `m' requires a value"
7831msgstr "开关 `m' 需要一个值"
7832
7833#: builtin/merge.c:137
7834#, c-format
7835msgid "Could not find merge strategy '%s'.\n"
7836msgstr "不能找到合并策略 '%s'。\n"
7837
7838#: builtin/merge.c:138
7839#, c-format
7840msgid "Available strategies are:"
7841msgstr "可用的策略有:"
7842
7843#: builtin/merge.c:143
7844#, c-format
7845msgid "Available custom strategies are:"
7846msgstr "可用的自定义策略有:"
7847
7848#: builtin/merge.c:193 builtin/pull.c:123
7849msgid "do not show a diffstat at the end of the merge"
7850msgstr "在合并的最后不显示差异统计"
7851
7852#: builtin/merge.c:196 builtin/pull.c:126
7853msgid "show a diffstat at the end of the merge"
7854msgstr "在合并的最后显示差异统计"
7855
7856#: builtin/merge.c:197 builtin/pull.c:129
7857msgid "(synonym to --stat)"
7858msgstr "(和 --stat 同义)"
7859
7860#: builtin/merge.c:199 builtin/pull.c:132
7861msgid "add (at most <n>) entries from shortlog to merge commit message"
7862msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7863
7864#: builtin/merge.c:202 builtin/pull.c:135
7865msgid "create a single commit instead of doing a merge"
7866msgstr "创建一个单独的提交而不是做一次合并"
7867
7868#: builtin/merge.c:204 builtin/pull.c:138
7869msgid "perform a commit if the merge succeeds (default)"
7870msgstr "如果合并成功,执行一次提交(默认)"
7871
7872#: builtin/merge.c:206 builtin/pull.c:141
7873msgid "edit message before committing"
7874msgstr "在提交前编辑提交说明"
7875
7876#: builtin/merge.c:207
7877msgid "allow fast-forward (default)"
7878msgstr "允许快进(默认)"
7879
7880#: builtin/merge.c:209 builtin/pull.c:147
7881msgid "abort if fast-forward is not possible"
7882msgstr "如果不能快进就放弃合并"
7883
7884#: builtin/merge.c:213
7885msgid "Verify that the named commit has a valid GPG signature"
7886msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7887
7888#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
7889#: builtin/revert.c:89
7890msgid "strategy"
7891msgstr "策略"
7892
7893#: builtin/merge.c:215 builtin/pull.c:153
7894msgid "merge strategy to use"
7895msgstr "要使用的合并策略"
7896
7897#: builtin/merge.c:216 builtin/pull.c:156
7898msgid "option=value"
7899msgstr "option=value"
7900
7901#: builtin/merge.c:217 builtin/pull.c:157
7902msgid "option for selected merge strategy"
7903msgstr "所选的合并策略的选项"
7904
7905#: builtin/merge.c:219
7906msgid "merge commit message (for a non-fast-forward merge)"
7907msgstr "合并的提交说明(针对非快进式合并)"
7908
7909#: builtin/merge.c:223
7910msgid "abort the current in-progress merge"
7911msgstr "放弃当前正在进行的合并"
7912
7913#: builtin/merge.c:251
7914msgid "could not run stash."
7915msgstr "不能进行进度保存。"
7916
7917#: builtin/merge.c:256
7918msgid "stash failed"
7919msgstr "进度保存失败"
7920
7921#: builtin/merge.c:261
7922#, c-format
7923msgid "not a valid object: %s"
7924msgstr "不是一个有效对象:%s"
7925
7926#: builtin/merge.c:280 builtin/merge.c:297
7927msgid "read-tree failed"
7928msgstr "读取树失败"
7929
7930# 译者:注意保持前导空格
7931#: builtin/merge.c:327
7932msgid " (nothing to squash)"
7933msgstr " (无可压缩)"
7934
7935#: builtin/merge.c:340
7936#, c-format
7937msgid "Squash commit -- not updating HEAD\n"
7938msgstr "压缩提交 -- 未更新 HEAD\n"
7939
7940#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
7941#: builtin/merge.c:989
7942#, c-format
7943msgid "Could not write to '%s'"
7944msgstr "不能写入 '%s'"
7945
7946#: builtin/merge.c:372
7947msgid "Writing SQUASH_MSG"
7948msgstr "写入 SQUASH_MSG"
7949
7950#: builtin/merge.c:374
7951msgid "Finishing SQUASH_MSG"
7952msgstr "完成 SQUASH_MSG"
7953
7954#: builtin/merge.c:397
7955#, c-format
7956msgid "No merge message -- not updating HEAD\n"
7957msgstr "无合并信息 -- 未更新 HEAD\n"
7958
7959#: builtin/merge.c:448
7960#, c-format
7961msgid "'%s' does not point to a commit"
7962msgstr "'%s' 没有指向一个提交"
7963
7964#: builtin/merge.c:538
7965#, c-format
7966msgid "Bad branch.%s.mergeoptions string: %s"
7967msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7968
7969#: builtin/merge.c:657
7970msgid "Not handling anything other than two heads merge."
7971msgstr "不能处理两个头合并之外的任何操作。"
7972
7973#: builtin/merge.c:671
7974#, c-format
7975msgid "Unknown option for merge-recursive: -X%s"
7976msgstr "merge-recursive 的未知选项:-X%s"
7977
7978#: builtin/merge.c:684
7979#, c-format
7980msgid "unable to write %s"
7981msgstr "不能写 %s"
7982
7983#: builtin/merge.c:773
7984#, c-format
7985msgid "Could not read from '%s'"
7986msgstr "不能从 '%s' 读取"
7987
7988#: builtin/merge.c:782
7989#, c-format
7990msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7991msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7992
7993#: builtin/merge.c:788
7994#, c-format
7995msgid ""
7996"Please enter a commit message to explain why this merge is necessary,\n"
7997"especially if it merges an updated upstream into a topic branch.\n"
7998"\n"
7999"Lines starting with '%c' will be ignored, and an empty message aborts\n"
8000"the commit.\n"
8001msgstr ""
8002"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8003"合并到主题分支。\n"
8004"\n"
8005"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8006
8007#: builtin/merge.c:812
8008msgid "Empty commit message."
8009msgstr "空提交信息。"
8010
8011#: builtin/merge.c:824
8012#, c-format
8013msgid "Wonderful.\n"
8014msgstr "太棒了。\n"
8015
8016#: builtin/merge.c:879
8017#, c-format
8018msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8019msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8020
8021#: builtin/merge.c:895
8022#, c-format
8023msgid "'%s' is not a commit"
8024msgstr "'%s' 不是一个提交"
8025
8026#: builtin/merge.c:936
8027msgid "No current branch."
8028msgstr "没有当前分支。"
8029
8030#: builtin/merge.c:938
8031msgid "No remote for the current branch."
8032msgstr "当前分支没有对应的远程仓库。"
8033
8034#: builtin/merge.c:940
8035msgid "No default upstream defined for the current branch."
8036msgstr "当前分支没有定义默认的上游分支。"
8037
8038#: builtin/merge.c:945
8039#, c-format
8040msgid "No remote-tracking branch for %s from %s"
8041msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8042
8043#: builtin/merge.c:1080
8044#, c-format
8045msgid "could not close '%s'"
8046msgstr "不能关闭 '%s'"
8047
8048#: builtin/merge.c:1207
8049msgid "There is no merge to abort (MERGE_HEAD missing)."
8050msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8051
8052#: builtin/merge.c:1223
8053msgid ""
8054"You have not concluded your merge (MERGE_HEAD exists).\n"
8055"Please, commit your changes before you merge."
8056msgstr ""
8057"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8058"请在合并前先提交您的修改。"
8059
8060#: builtin/merge.c:1230
8061msgid ""
8062"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8063"Please, commit your changes before you merge."
8064msgstr ""
8065"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8066"请在合并前先提交您的修改。"
8067
8068#: builtin/merge.c:1233
8069msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8070msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8071
8072#: builtin/merge.c:1242
8073msgid "You cannot combine --squash with --no-ff."
8074msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8075
8076#: builtin/merge.c:1250
8077msgid "No commit specified and merge.defaultToUpstream not set."
8078msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8079
8080#: builtin/merge.c:1267
8081msgid "Squash commit into empty head not supported yet"
8082msgstr "尚不支持到空分支的压缩提交"
8083
8084#: builtin/merge.c:1269
8085msgid "Non-fast-forward commit does not make sense into an empty head"
8086msgstr "到空分支的非快进式提交没有意义"
8087
8088#: builtin/merge.c:1275
8089#, c-format
8090msgid "%s - not something we can merge"
8091msgstr "%s - 不能被合并"
8092
8093#: builtin/merge.c:1277
8094msgid "Can merge only exactly one commit into empty head"
8095msgstr "只能将一个提交合并到空分支上"
8096
8097#: builtin/merge.c:1332
8098#, c-format
8099msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8100msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8101
8102#: builtin/merge.c:1335
8103#, c-format
8104msgid "Commit %s has a bad GPG signature allegedly by %s."
8105msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8106
8107#: builtin/merge.c:1338
8108#, c-format
8109msgid "Commit %s does not have a GPG signature."
8110msgstr "提交 %s 没有一个 GPG 签名。"
8111
8112#: builtin/merge.c:1341
8113#, c-format
8114msgid "Commit %s has a good GPG signature by %s\n"
8115msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8116
8117#: builtin/merge.c:1424
8118#, c-format
8119msgid "Updating %s..%s\n"
8120msgstr "更新 %s..%s\n"
8121
8122#: builtin/merge.c:1461
8123#, c-format
8124msgid "Trying really trivial in-index merge...\n"
8125msgstr "尝试非常小的索引内合并...\n"
8126
8127#: builtin/merge.c:1468
8128#, c-format
8129msgid "Nope.\n"
8130msgstr "无。\n"
8131
8132#: builtin/merge.c:1500
8133msgid "Not possible to fast-forward, aborting."
8134msgstr "无法快进,终止。"
8135
8136#: builtin/merge.c:1523 builtin/merge.c:1602
8137#, c-format
8138msgid "Rewinding the tree to pristine...\n"
8139msgstr "将树回滚至原始状态...\n"
8140
8141#: builtin/merge.c:1527
8142#, c-format
8143msgid "Trying merge strategy %s...\n"
8144msgstr "尝试合并策略 %s...\n"
8145
8146#: builtin/merge.c:1593
8147#, c-format
8148msgid "No merge strategy handled the merge.\n"
8149msgstr "没有合并策略处理此合并。\n"
8150
8151#: builtin/merge.c:1595
8152#, c-format
8153msgid "Merge with strategy %s failed.\n"
8154msgstr "使用策略 %s 合并失败。\n"
8155
8156#: builtin/merge.c:1604
8157#, c-format
8158msgid "Using the %s to prepare resolving by hand.\n"
8159msgstr "使用 %s 以准备手工解决。\n"
8160
8161#: builtin/merge.c:1616
8162#, c-format
8163msgid "Automatic merge went well; stopped before committing as requested\n"
8164msgstr "自动合并进展顺利,按要求在提交前停止\n"
8165
8166#: builtin/merge-base.c:29
8167msgid "git merge-base [-a | --all] <commit> <commit>..."
8168msgstr "git merge-base [-a | --all] <提交> <提交>..."
8169
8170#: builtin/merge-base.c:30
8171msgid "git merge-base [-a | --all] --octopus <commit>..."
8172msgstr "git merge-base [-a | --all] --octopus <提交>..."
8173
8174#: builtin/merge-base.c:31
8175msgid "git merge-base --independent <commit>..."
8176msgstr "git merge-base --independent <提交>..."
8177
8178#: builtin/merge-base.c:32
8179msgid "git merge-base --is-ancestor <commit> <commit>"
8180msgstr "git merge-base --is-ancestor <提交> <提交>"
8181
8182#: builtin/merge-base.c:33
8183msgid "git merge-base --fork-point <ref> [<commit>]"
8184msgstr "git merge-base --fork-point <引用> [<提交>]"
8185
8186#: builtin/merge-base.c:214
8187msgid "output all common ancestors"
8188msgstr "输出所有共同的祖先"
8189
8190#: builtin/merge-base.c:216
8191msgid "find ancestors for a single n-way merge"
8192msgstr "查找一个多路合并的祖先提交"
8193
8194#: builtin/merge-base.c:218
8195msgid "list revs not reachable from others"
8196msgstr "显示不能被其他访问到的版本"
8197
8198#: builtin/merge-base.c:220
8199msgid "is the first one ancestor of the other?"
8200msgstr "第一个是其他的祖先提交么?"
8201
8202#: builtin/merge-base.c:222
8203msgid "find where <commit> forked from reflog of <ref>"
8204msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8205
8206#: builtin/merge-file.c:8
8207msgid ""
8208"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8209"<orig-file> <file2>"
8210msgstr ""
8211"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8212"件> <文件2>"
8213
8214#: builtin/merge-file.c:33
8215msgid "send results to standard output"
8216msgstr "将结果发送到标准输出"
8217
8218#: builtin/merge-file.c:34
8219msgid "use a diff3 based merge"
8220msgstr "使用基于 diff3 的合并"
8221
8222#: builtin/merge-file.c:35
8223msgid "for conflicts, use our version"
8224msgstr "如果冲突,使用我们的版本"
8225
8226#: builtin/merge-file.c:37
8227msgid "for conflicts, use their version"
8228msgstr "如果冲突,使用他们的版本"
8229
8230#: builtin/merge-file.c:39
8231msgid "for conflicts, use a union version"
8232msgstr "如果冲突,使用联合版本"
8233
8234#: builtin/merge-file.c:42
8235msgid "for conflicts, use this marker size"
8236msgstr "如果冲突,使用指定长度的标记"
8237
8238#: builtin/merge-file.c:43
8239msgid "do not warn about conflicts"
8240msgstr "不要警告冲突"
8241
8242#: builtin/merge-file.c:45
8243msgid "set labels for file1/orig-file/file2"
8244msgstr "为 文件1/初始文件/文件2 设置标签"
8245
8246#: builtin/mktree.c:65
8247msgid "git mktree [-z] [--missing] [--batch]"
8248msgstr "git mktree [-z] [--missing] [--batch]"
8249
8250#: builtin/mktree.c:152
8251msgid "input is NUL terminated"
8252msgstr "输入以 NUL 字符终止"
8253
8254#: builtin/mktree.c:153 builtin/write-tree.c:24
8255msgid "allow missing objects"
8256msgstr "允许丢失的对象"
8257
8258#: builtin/mktree.c:154
8259msgid "allow creation of more than one tree"
8260msgstr "允许创建一个以上的树"
8261
8262#: builtin/mv.c:15
8263msgid "git mv [<options>] <source>... <destination>"
8264msgstr "git mv [<选项>] <源>... <目标>"
8265
8266#: builtin/mv.c:70
8267#, c-format
8268msgid "Directory %s is in index and no submodule?"
8269msgstr "目录 %s 在索引中并且不是子模组?"
8270
8271#: builtin/mv.c:72
8272msgid "Please stage your changes to .gitmodules or stash them to proceed"
8273msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8274
8275#: builtin/mv.c:90
8276#, c-format
8277msgid "%.*s is in index"
8278msgstr "%.*s 在索引中"
8279
8280#: builtin/mv.c:112
8281msgid "force move/rename even if target exists"
8282msgstr "强制移动/重命令,即使目标存在"
8283
8284#: builtin/mv.c:113
8285msgid "skip move/rename errors"
8286msgstr "跳过移动/重命名错误"
8287
8288#: builtin/mv.c:152
8289#, c-format
8290msgid "destination '%s' is not a directory"
8291msgstr "目标 '%s' 不是一个目录"
8292
8293#: builtin/mv.c:163
8294#, c-format
8295msgid "Checking rename of '%s' to '%s'\n"
8296msgstr "检查 '%s' 到 '%s' 的重命名\n"
8297
8298#: builtin/mv.c:167
8299msgid "bad source"
8300msgstr "坏的源"
8301
8302#: builtin/mv.c:170
8303msgid "can not move directory into itself"
8304msgstr "不能将目录移动到自身"
8305
8306#: builtin/mv.c:173
8307msgid "cannot move directory over file"
8308msgstr "不能将目录移动到文件"
8309
8310#: builtin/mv.c:182
8311msgid "source directory is empty"
8312msgstr "源目录为空"
8313
8314#: builtin/mv.c:207
8315msgid "not under version control"
8316msgstr "不在版本控制之下"
8317
8318#: builtin/mv.c:210
8319msgid "destination exists"
8320msgstr "目标已存在"
8321
8322#: builtin/mv.c:218
8323#, c-format
8324msgid "overwriting '%s'"
8325msgstr "覆盖 '%s'"
8326
8327#: builtin/mv.c:221
8328msgid "Cannot overwrite"
8329msgstr "不能覆盖"
8330
8331#: builtin/mv.c:224
8332msgid "multiple sources for the same target"
8333msgstr "同一目标具有多个源"
8334
8335#: builtin/mv.c:226
8336msgid "destination directory does not exist"
8337msgstr "目标目录不存在"
8338
8339#: builtin/mv.c:233
8340#, c-format
8341msgid "%s, source=%s, destination=%s"
8342msgstr "%s,源=%s,目标=%s"
8343
8344#: builtin/mv.c:254
8345#, c-format
8346msgid "Renaming %s to %s\n"
8347msgstr "重命名 %s 至 %s\n"
8348
8349#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
8350#, c-format
8351msgid "renaming '%s' failed"
8352msgstr "重命名 '%s' 失败"
8353
8354#: builtin/name-rev.c:251
8355msgid "git name-rev [<options>] <commit>..."
8356msgstr "git name-rev [<选项>] <提交>..."
8357
8358#: builtin/name-rev.c:252
8359msgid "git name-rev [<options>] --all"
8360msgstr "git name-rev [<选项>] --all"
8361
8362#: builtin/name-rev.c:253
8363msgid "git name-rev [<options>] --stdin"
8364msgstr "git name-rev [<选项>] --stdin"
8365
8366#: builtin/name-rev.c:305
8367msgid "print only names (no SHA-1)"
8368msgstr "只打印名称(无 SHA-1)"
8369
8370#: builtin/name-rev.c:306
8371msgid "only use tags to name the commits"
8372msgstr "只使用标签来命名提交"
8373
8374#: builtin/name-rev.c:308
8375msgid "only use refs matching <pattern>"
8376msgstr "只使用和 <模式> 相匹配的引用"
8377
8378#: builtin/name-rev.c:310
8379msgid "list all commits reachable from all refs"
8380msgstr "列出可以从所有引用访问的提交"
8381
8382#: builtin/name-rev.c:311
8383msgid "read from stdin"
8384msgstr "从标准输入读取"
8385
8386#: builtin/name-rev.c:312
8387msgid "allow to print `undefined` names (default)"
8388msgstr "允许打印 `未定义` 的名称(默认)"
8389
8390#: builtin/name-rev.c:318
8391msgid "dereference tags in the input (internal use)"
8392msgstr "反向解析输入中的标签(内部使用)"
8393
8394#: builtin/notes.c:25
8395msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8396msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8397
8398#: builtin/notes.c:26
8399msgid ""
8400"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8401"| (-c | -C) <object>] [<object>]"
8402msgstr ""
8403"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8404"| (-c | -C) <对象>] [<对象>]"
8405
8406#: builtin/notes.c:27
8407msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8408msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8409
8410#: builtin/notes.c:28
8411msgid ""
8412"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8413"(-c | -C) <object>] [<object>]"
8414msgstr ""
8415"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8416"(-c | -C) <对象>] [<对象>]"
8417
8418#: builtin/notes.c:29
8419msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8420msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8421
8422#: builtin/notes.c:30
8423msgid "git notes [--ref <notes-ref>] show [<object>]"
8424msgstr "git notes [--ref <注解引用>] show [<对象>]"
8425
8426#: builtin/notes.c:31
8427msgid ""
8428"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8429msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8430
8431#: builtin/notes.c:32
8432msgid "git notes merge --commit [-v | -q]"
8433msgstr "git notes merge --commit [-v | -q]"
8434
8435#: builtin/notes.c:33
8436msgid "git notes merge --abort [-v | -q]"
8437msgstr "git notes merge --abort [-v | -q]"
8438
8439#: builtin/notes.c:34
8440msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8441msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8442
8443#: builtin/notes.c:35
8444msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8445msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8446
8447#: builtin/notes.c:36
8448msgid "git notes [--ref <notes-ref>] get-ref"
8449msgstr "git notes [--ref <注解引用>] get-ref"
8450
8451#: builtin/notes.c:41
8452msgid "git notes [list [<object>]]"
8453msgstr "git notes [list [<对象>]]"
8454
8455#: builtin/notes.c:46
8456msgid "git notes add [<options>] [<object>]"
8457msgstr "git notes add [<选项>] [<对象>]"
8458
8459#: builtin/notes.c:51
8460msgid "git notes copy [<options>] <from-object> <to-object>"
8461msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8462
8463#: builtin/notes.c:52
8464msgid "git notes copy --stdin [<from-object> <to-object>]..."
8465msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8466
8467#: builtin/notes.c:57
8468msgid "git notes append [<options>] [<object>]"
8469msgstr "git notes append [<选项>] [<对象>]"
8470
8471#: builtin/notes.c:62
8472msgid "git notes edit [<object>]"
8473msgstr "git notes edit [<对象>]"
8474
8475#: builtin/notes.c:67
8476msgid "git notes show [<object>]"
8477msgstr "git notes show [<对象>]"
8478
8479#: builtin/notes.c:72
8480msgid "git notes merge [<options>] <notes-ref>"
8481msgstr "git notes merge [<选项>] <注解引用>"
8482
8483#: builtin/notes.c:73
8484msgid "git notes merge --commit [<options>]"
8485msgstr "git notes merge --commit [<选项>]"
8486
8487#: builtin/notes.c:74
8488msgid "git notes merge --abort [<options>]"
8489msgstr "git notes merge --abort [<选项>]"
8490
8491#: builtin/notes.c:79
8492msgid "git notes remove [<object>]"
8493msgstr "git notes remove [<对象>]"
8494
8495#: builtin/notes.c:84
8496msgid "git notes prune [<options>]"
8497msgstr "git notes prune [<选项>]"
8498
8499#: builtin/notes.c:89
8500msgid "git notes get-ref"
8501msgstr "git notes get-ref"
8502
8503#: builtin/notes.c:147
8504#, c-format
8505msgid "unable to start 'show' for object '%s'"
8506msgstr "不能为对象 '%s' 开始 'show'"
8507
8508#: builtin/notes.c:151
8509msgid "could not read 'show' output"
8510msgstr "不能读取 'show' 的输出"
8511
8512#: builtin/notes.c:159
8513#, c-format
8514msgid "failed to finish 'show' for object '%s'"
8515msgstr "无法为对象 '%s' 完成 'show'"
8516
8517#: builtin/notes.c:174 builtin/tag.c:248
8518#, c-format
8519msgid "could not create file '%s'"
8520msgstr "不能创建文件 '%s'"
8521
8522#: builtin/notes.c:193
8523msgid "Please supply the note contents using either -m or -F option"
8524msgstr "请通过 -m 或 -F 选项为注解提供内容"
8525
8526#: builtin/notes.c:202
8527msgid "unable to write note object"
8528msgstr "不能写注解对象"
8529
8530#: builtin/notes.c:204
8531#, c-format
8532msgid "The note contents have been left in %s"
8533msgstr "注解内容被留在 %s 中"
8534
8535#: builtin/notes.c:232 builtin/tag.c:440
8536#, c-format
8537msgid "cannot read '%s'"
8538msgstr "不能读取 '%s'"
8539
8540#: builtin/notes.c:234 builtin/tag.c:443
8541#, c-format
8542msgid "could not open or read '%s'"
8543msgstr "不能打开或读取 '%s'"
8544
8545#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8546#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
8547#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
8548#: builtin/notes.c:880 builtin/tag.c:456
8549#, c-format
8550msgid "Failed to resolve '%s' as a valid ref."
8551msgstr "无法解析 '%s' 为一个有效引用。"
8552
8553#: builtin/notes.c:256
8554#, c-format
8555msgid "Failed to read object '%s'."
8556msgstr "无法读取对象 '%s'。"
8557
8558#: builtin/notes.c:260
8559#, c-format
8560msgid "Cannot read note data from non-blob object '%s'."
8561msgstr "不能从非数据对象 '%s' 中读取注解数据"
8562
8563#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8564#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8565#: builtin/notes.c:945
8566msgid "too many parameters"
8567msgstr "参数太多"
8568
8569#: builtin/notes.c:375 builtin/notes.c:662
8570#, c-format
8571msgid "No note found for object %s."
8572msgstr "未发现对象 %s 的注解。"
8573
8574#: builtin/notes.c:396 builtin/notes.c:559
8575msgid "note contents as a string"
8576msgstr "注解内容作为一个字符串"
8577
8578#: builtin/notes.c:399 builtin/notes.c:562
8579msgid "note contents in a file"
8580msgstr "注解内容到一个文件中"
8581
8582#: builtin/notes.c:402 builtin/notes.c:565
8583msgid "reuse and edit specified note object"
8584msgstr "重用和编辑指定的注解对象"
8585
8586#: builtin/notes.c:405 builtin/notes.c:568
8587msgid "reuse specified note object"
8588msgstr "重用指定的注解对象"
8589
8590#: builtin/notes.c:408 builtin/notes.c:571
8591msgid "allow storing empty note"
8592msgstr "允许保存空白注释"
8593
8594#: builtin/notes.c:409 builtin/notes.c:480
8595msgid "replace existing notes"
8596msgstr "替换已存在的注解"
8597
8598#: builtin/notes.c:434
8599#, c-format
8600msgid ""
8601"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8602"existing notes"
8603msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8604
8605#: builtin/notes.c:449 builtin/notes.c:528
8606#, c-format
8607msgid "Overwriting existing notes for object %s\n"
8608msgstr "覆盖对象 %s 现存注解\n"
8609
8610#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
8611#, c-format
8612msgid "Removing note for object %s\n"
8613msgstr "删除对象 %s 的注解\n"
8614
8615#: builtin/notes.c:481
8616msgid "read objects from stdin"
8617msgstr "从标准输入读取对象"
8618
8619#: builtin/notes.c:483
8620msgid "load rewriting config for <command> (implies --stdin)"
8621msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8622
8623#: builtin/notes.c:501
8624msgid "too few parameters"
8625msgstr "参数太少"
8626
8627#: builtin/notes.c:522
8628#, c-format
8629msgid ""
8630"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8631"existing notes"
8632msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8633
8634#: builtin/notes.c:534
8635#, c-format
8636msgid "Missing notes on source object %s. Cannot copy."
8637msgstr "源对象 %s 缺少注解。不能拷贝。"
8638
8639#: builtin/notes.c:586
8640#, c-format
8641msgid ""
8642"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8643"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8644msgstr ""
8645"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8646"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8647
8648#: builtin/notes.c:767
8649msgid "General options"
8650msgstr "通用选项"
8651
8652#: builtin/notes.c:769
8653msgid "Merge options"
8654msgstr "合并选项"
8655
8656#: builtin/notes.c:771
8657msgid ""
8658"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8659"cat_sort_uniq)"
8660msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8661
8662#: builtin/notes.c:773
8663msgid "Committing unmerged notes"
8664msgstr "提交未合并的注解"
8665
8666#: builtin/notes.c:775
8667msgid "finalize notes merge by committing unmerged notes"
8668msgstr "通过提交未合并的注解来完成注解合并"
8669
8670#: builtin/notes.c:777
8671msgid "Aborting notes merge resolution"
8672msgstr "中止注解合并的方案"
8673
8674#: builtin/notes.c:779
8675msgid "abort notes merge"
8676msgstr "中止注解合并"
8677
8678#: builtin/notes.c:856
8679#, c-format
8680msgid "A notes merge into %s is already in-progress at %s"
8681msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8682
8683#: builtin/notes.c:883
8684#, c-format
8685msgid "Object %s has no note\n"
8686msgstr "对象 %s 没有注解\n"
8687
8688#: builtin/notes.c:895
8689msgid "attempt to remove non-existent note is not an error"
8690msgstr "尝试删除不存在的注解不是一个错误"
8691
8692#: builtin/notes.c:898
8693msgid "read object names from the standard input"
8694msgstr "从标准输入读取对象名称"
8695
8696#: builtin/notes.c:979
8697msgid "notes-ref"
8698msgstr "注解引用"
8699
8700#: builtin/notes.c:980
8701msgid "use notes from <notes-ref>"
8702msgstr "从 <注解引用> 使用注解"
8703
8704#: builtin/notes.c:1015 builtin/remote.c:1626
8705#, c-format
8706msgid "Unknown subcommand: %s"
8707msgstr "未知子命令:%s"
8708
8709#: builtin/pack-objects.c:28
8710msgid ""
8711"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8712msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8713
8714#: builtin/pack-objects.c:29
8715msgid ""
8716"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8717msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8718
8719#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8720#, c-format
8721msgid "deflate error (%d)"
8722msgstr "压缩错误 (%d)"
8723
8724#: builtin/pack-objects.c:772
8725msgid "Writing objects"
8726msgstr "写入对象中"
8727
8728#: builtin/pack-objects.c:1012
8729msgid "disabling bitmap writing, as some objects are not being packed"
8730msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8731
8732#: builtin/pack-objects.c:2172
8733msgid "Compressing objects"
8734msgstr "压缩对象中"
8735
8736#: builtin/pack-objects.c:2558
8737#, c-format
8738msgid "unsupported index version %s"
8739msgstr "不支持的索引版本 %s"
8740
8741#: builtin/pack-objects.c:2562
8742#, c-format
8743msgid "bad index version '%s'"
8744msgstr "坏的索引版本 '%s'"
8745
8746#: builtin/pack-objects.c:2592
8747msgid "do not show progress meter"
8748msgstr "不显示进度表"
8749
8750#: builtin/pack-objects.c:2594
8751msgid "show progress meter"
8752msgstr "显示进度表"
8753
8754#: builtin/pack-objects.c:2596
8755msgid "show progress meter during object writing phase"
8756msgstr "在对象写入阶段显示进度表"
8757
8758#: builtin/pack-objects.c:2599
8759msgid "similar to --all-progress when progress meter is shown"
8760msgstr "当进度表显示时类似于 --all-progress"
8761
8762#: builtin/pack-objects.c:2600
8763msgid "version[,offset]"
8764msgstr "版本[,偏移]"
8765
8766#: builtin/pack-objects.c:2601
8767msgid "write the pack index file in the specified idx format version"
8768msgstr "用指定的 idx 格式版本来写包索引文件"
8769
8770#: builtin/pack-objects.c:2604
8771msgid "maximum size of each output pack file"
8772msgstr "每个输出包的最大尺寸"
8773
8774#: builtin/pack-objects.c:2606
8775msgid "ignore borrowed objects from alternate object store"
8776msgstr "忽略从备用对象存储里借用对象"
8777
8778#: builtin/pack-objects.c:2608
8779msgid "ignore packed objects"
8780msgstr "忽略包对象"
8781
8782#: builtin/pack-objects.c:2610
8783msgid "limit pack window by objects"
8784msgstr "限制打包窗口的对象数"
8785
8786#: builtin/pack-objects.c:2612
8787msgid "limit pack window by memory in addition to object limit"
8788msgstr "除对象数量限制外设置打包窗口的内存限制"
8789
8790#: builtin/pack-objects.c:2614
8791msgid "maximum length of delta chain allowed in the resulting pack"
8792msgstr "打包允许的 delta 链的最大长度"
8793
8794#: builtin/pack-objects.c:2616
8795msgid "reuse existing deltas"
8796msgstr "重用已存在的 deltas"
8797
8798#: builtin/pack-objects.c:2618
8799msgid "reuse existing objects"
8800msgstr "重用已存在的对象"
8801
8802#: builtin/pack-objects.c:2620
8803msgid "use OFS_DELTA objects"
8804msgstr "使用 OFS_DELTA 对象"
8805
8806#: builtin/pack-objects.c:2622
8807msgid "use threads when searching for best delta matches"
8808msgstr "使用线程查询最佳 delta 匹配"
8809
8810#: builtin/pack-objects.c:2624
8811msgid "do not create an empty pack output"
8812msgstr "不创建空的包输出"
8813
8814#: builtin/pack-objects.c:2626
8815msgid "read revision arguments from standard input"
8816msgstr "从标准输入读取版本号参数"
8817
8818#: builtin/pack-objects.c:2628
8819msgid "limit the objects to those that are not yet packed"
8820msgstr "限制那些尚未打包的对象"
8821
8822#: builtin/pack-objects.c:2631
8823msgid "include objects reachable from any reference"
8824msgstr "包括可以从任何引用访问到的对象"
8825
8826#: builtin/pack-objects.c:2634
8827msgid "include objects referred by reflog entries"
8828msgstr "包括被引用日志引用到的对象"
8829
8830#: builtin/pack-objects.c:2637
8831msgid "include objects referred to by the index"
8832msgstr "包括被索引引用到的对象"
8833
8834#: builtin/pack-objects.c:2640
8835msgid "output pack to stdout"
8836msgstr "输出包到标准输出"
8837
8838#: builtin/pack-objects.c:2642
8839msgid "include tag objects that refer to objects to be packed"
8840msgstr "包括那些引用了待打包对象的标签对象"
8841
8842#: builtin/pack-objects.c:2644
8843msgid "keep unreachable objects"
8844msgstr "维持不可达的对象"
8845
8846#: builtin/pack-objects.c:2645 parse-options.h:142
8847msgid "time"
8848msgstr "时间"
8849
8850#: builtin/pack-objects.c:2646
8851msgid "unpack unreachable objects newer than <time>"
8852msgstr "将比给定 <时间> 新的无法访问的对象解包"
8853
8854#: builtin/pack-objects.c:2649
8855msgid "create thin packs"
8856msgstr "创建精简包"
8857
8858#: builtin/pack-objects.c:2651
8859msgid "create packs suitable for shallow fetches"
8860msgstr "创建适合浅克隆仓库获取的包"
8861
8862#: builtin/pack-objects.c:2653
8863msgid "ignore packs that have companion .keep file"
8864msgstr "忽略配有 .keep 文件的包"
8865
8866#: builtin/pack-objects.c:2655
8867msgid "pack compression level"
8868msgstr "打包压缩级别"
8869
8870#: builtin/pack-objects.c:2657
8871msgid "do not hide commits by grafts"
8872msgstr "显示被嫁接隐藏的提交"
8873
8874#: builtin/pack-objects.c:2659
8875msgid "use a bitmap index if available to speed up counting objects"
8876msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8877
8878#: builtin/pack-objects.c:2661
8879msgid "write a bitmap index together with the pack index"
8880msgstr "在建立包索引的同时创建 bitmap 索引"
8881
8882#: builtin/pack-objects.c:2752
8883msgid "Counting objects"
8884msgstr "对象计数中"
8885
8886#: builtin/pack-refs.c:6
8887msgid "git pack-refs [<options>]"
8888msgstr "git pack-refs [<选项>]"
8889
8890#: builtin/pack-refs.c:14
8891msgid "pack everything"
8892msgstr "打包一切"
8893
8894#: builtin/pack-refs.c:15
8895msgid "prune loose refs (default)"
8896msgstr "清除松散的引用(默认)"
8897
8898#: builtin/prune-packed.c:7
8899msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8900msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8901
8902#: builtin/prune-packed.c:40
8903msgid "Removing duplicate objects"
8904msgstr "正在删除重复对象"
8905
8906#: builtin/prune.c:11
8907msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8908msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8909
8910#: builtin/prune.c:105 builtin/worktree.c:124
8911msgid "do not remove, show only"
8912msgstr "不删除,只显示"
8913
8914#: builtin/prune.c:106 builtin/worktree.c:125
8915msgid "report pruned objects"
8916msgstr "报告清除的对象"
8917
8918#: builtin/prune.c:109 builtin/worktree.c:127
8919msgid "expire objects older than <time>"
8920msgstr "使早于给定时间的对象过期"
8921
8922#: builtin/prune.c:123
8923msgid "cannot prune in a precious-objects repo"
8924msgstr "不能在珍品仓库中执行清理操作"
8925
8926#: builtin/pull.c:72
8927msgid "git pull [<options>] [<repository> [<refspec>...]]"
8928msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8929
8930#: builtin/pull.c:117
8931msgid "Options related to merging"
8932msgstr "和合并相关的选项"
8933
8934#: builtin/pull.c:120
8935msgid "incorporate changes by rebasing rather than merging"
8936msgstr "使用变基操作取代合并操作以合入修改"
8937
8938#: builtin/pull.c:144 builtin/revert.c:105
8939msgid "allow fast-forward"
8940msgstr "允许快进式"
8941
8942#: builtin/pull.c:150
8943msgid "verify that the named commit has a valid GPG signature"
8944msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8945
8946#: builtin/pull.c:164
8947msgid "Options related to fetching"
8948msgstr "和获取相关的参数"
8949
8950#: builtin/pull.c:186
8951msgid "number of submodules pulled in parallel"
8952msgstr "并发拉取的子模组的数量"
8953
8954#: builtin/pull.c:275
8955#, c-format
8956msgid "Invalid value for pull.ff: %s"
8957msgstr "pull.ff 的取值无效:%s"
8958
8959#: builtin/pull.c:359
8960msgid "Cannot pull with rebase: You have unstaged changes."
8961msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8962
8963#: builtin/pull.c:365
8964msgid "Additionally, your index contains uncommitted changes."
8965msgstr "而且您的索引中包含未提交的变更。"
8966
8967#: builtin/pull.c:367
8968msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8969msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8970
8971#: builtin/pull.c:443
8972msgid ""
8973"There is no candidate for rebasing against among the refs that you just "
8974"fetched."
8975msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8976
8977#: builtin/pull.c:445
8978msgid ""
8979"There are no candidates for merging among the refs that you just fetched."
8980msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8981
8982#: builtin/pull.c:446
8983msgid ""
8984"Generally this means that you provided a wildcard refspec which had no\n"
8985"matches on the remote end."
8986msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8987
8988#: builtin/pull.c:449
8989#, c-format
8990msgid ""
8991"You asked to pull from the remote '%s', but did not specify\n"
8992"a branch. Because this is not the default configured remote\n"
8993"for your current branch, you must specify a branch on the command line."
8994msgstr ""
8995"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8996"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8997
8998#: builtin/pull.c:454
8999msgid "You are not currently on a branch."
9000msgstr "您当前不在一个分支上。"
9001
9002#: builtin/pull.c:456 builtin/pull.c:471
9003msgid "Please specify which branch you want to rebase against."
9004msgstr "请指定您要变基到哪一个分支。"
9005
9006#: builtin/pull.c:458 builtin/pull.c:473
9007msgid "Please specify which branch you want to merge with."
9008msgstr "请指定您要合并哪一个分支。"
9009
9010#: builtin/pull.c:459 builtin/pull.c:474
9011msgid "See git-pull(1) for details."
9012msgstr "详见 git-pull(1)。"
9013
9014#: builtin/pull.c:469
9015msgid "There is no tracking information for the current branch."
9016msgstr "当前分支没有跟踪信息。"
9017
9018#: builtin/pull.c:478
9019#, c-format
9020msgid ""
9021"If you wish to set tracking information for this branch you can do so with:\n"
9022"\n"
9023" git branch --set-upstream-to=%s/<branch> %s\n"
9024msgstr ""
9025"如果您想要为此分支创建跟踪信息,您可以执行:\n"
9026"\n"
9027" git branch --set-upstream-to=%s/<branch> %s\n"
9028
9029#: builtin/pull.c:483
9030#, c-format
9031msgid ""
9032"Your configuration specifies to merge with the ref '%s'\n"
9033"from the remote, but no such ref was fetched."
9034msgstr ""
9035"您的配置中指定要合并远程的引用 '%s',\n"
9036"但是没有获取到这个引用。"
9037
9038#: builtin/pull.c:841
9039msgid "Updating an unborn branch with changes added to the index."
9040msgstr "更新尚未诞生的分支,变更添加至索引。"
9041
9042#: builtin/pull.c:870
9043#, c-format
9044msgid ""
9045"fetch updated the current branch head.\n"
9046"fast-forwarding your working tree from\n"
9047"commit %s."
9048msgstr ""
9049"fetch 更新了当前的分支。快进您的工作区\n"
9050"至提交 %s。"
9051
9052#: builtin/pull.c:875
9053#, c-format
9054msgid ""
9055"Cannot fast-forward your working tree.\n"
9056"After making sure that you saved anything precious from\n"
9057"$ git diff %s\n"
9058"output, run\n"
9059"$ git reset --hard\n"
9060"to recover."
9061msgstr ""
9062"您当前的工作区无法执行快进操作。\n"
9063"首先执行如下命令:\n"
9064"$ git diff %s\n"
9065"以确认所有有用的数据均已保存。然后执行下面的命令\n"
9066"$ git reset --hard\n"
9067"恢复之前的状态。"
9068
9069#: builtin/pull.c:890
9070msgid "Cannot merge multiple branches into empty head."
9071msgstr "无法将多个分支合并到空分支。"
9072
9073#: builtin/pull.c:894
9074msgid "Cannot rebase onto multiple branches."
9075msgstr "无法变基到多个分支。"
9076
9077#: builtin/push.c:16
9078msgid "git push [<options>] [<repository> [<refspec>...]]"
9079msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9080
9081#: builtin/push.c:89
9082msgid "tag shorthand without <tag>"
9083msgstr "标签后面未提供 <标签> 参数"
9084
9085#: builtin/push.c:99
9086msgid "--delete only accepts plain target ref names"
9087msgstr "--delete 只接受简单的目标引用名"
9088
9089#: builtin/push.c:143
9090msgid ""
9091"\n"
9092"To choose either option permanently, see push.default in 'git help config'."
9093msgstr ""
9094"\n"
9095"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9096
9097#: builtin/push.c:146
9098#, c-format
9099msgid ""
9100"The upstream branch of your current branch does not match\n"
9101"the name of your current branch. To push to the upstream branch\n"
9102"on the remote, use\n"
9103"\n"
9104" git push %s HEAD:%s\n"
9105"\n"
9106"To push to the branch of the same name on the remote, use\n"
9107"\n"
9108" git push %s %s\n"
9109"%s"
9110msgstr ""
9111"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9112"上游分支,使用\n"
9113"\n"
9114" git push %s HEAD:%s\n"
9115"\n"
9116"为推送至远程同名分支,使用\n"
9117"\n"
9118" git push %s %s\n"
9119"%s"
9120
9121#: builtin/push.c:161
9122#, c-format
9123msgid ""
9124"You are not currently on a branch.\n"
9125"To push the history leading to the current (detached HEAD)\n"
9126"state now, use\n"
9127"\n"
9128" git push %s HEAD:<name-of-remote-branch>\n"
9129msgstr ""
9130"您当前不在一个分支上。\n"
9131"现在为推送当前(分离头指针)的历史,使用\n"
9132"\n"
9133" git push %s HEAD:<远程分支名字>\n"
9134
9135#: builtin/push.c:175
9136#, c-format
9137msgid ""
9138"The current branch %s has no upstream branch.\n"
9139"To push the current branch and set the remote as upstream, use\n"
9140"\n"
9141" git push --set-upstream %s %s\n"
9142msgstr ""
9143"当前分支 %s 没有对应的上游分支。\n"
9144"为推送当前分支并建立与远程上游的跟踪,使用\n"
9145"\n"
9146" git push --set-upstream %s %s\n"
9147
9148#: builtin/push.c:183
9149#, c-format
9150msgid "The current branch %s has multiple upstream branches, refusing to push."
9151msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9152
9153#: builtin/push.c:186
9154#, c-format
9155msgid ""
9156"You are pushing to remote '%s', which is not the upstream of\n"
9157"your current branch '%s', without telling me what to push\n"
9158"to update which remote branch."
9159msgstr ""
9160"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9161"而没有告诉我要推送什么、更新哪个远程分支。"
9162
9163#: builtin/push.c:242
9164msgid ""
9165"You didn't specify any refspecs to push, and push.default is \"nothing\"."
9166msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9167
9168#: builtin/push.c:249
9169msgid ""
9170"Updates were rejected because the tip of your current branch is behind\n"
9171"its remote counterpart. Integrate the remote changes (e.g.\n"
9172"'git pull ...') before pushing again.\n"
9173"See the 'Note about fast-forwards' in 'git push --help' for details."
9174msgstr ""
9175"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9176"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9177"'git push --help' 中的 'Note about fast-forwards' 小节。"
9178
9179#: builtin/push.c:255
9180msgid ""
9181"Updates were rejected because a pushed branch tip is behind its remote\n"
9182"counterpart. Check out this branch and integrate the remote changes\n"
9183"(e.g. 'git pull ...') before pushing again.\n"
9184"See the 'Note about fast-forwards' in 'git push --help' for details."
9185msgstr ""
9186"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9187"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9188"'git push --help' 中的 'Note about fast-forwards' 小节。"
9189
9190#: builtin/push.c:261
9191msgid ""
9192"Updates were rejected because the remote contains work that you do\n"
9193"not have locally. This is usually caused by another repository pushing\n"
9194"to the same ref. You may want to first integrate the remote changes\n"
9195"(e.g., 'git pull ...') before pushing again.\n"
9196"See the 'Note about fast-forwards' in 'git push --help' for details."
9197msgstr ""
9198"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9199"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9200"(如 'git pull ...')。\n"
9201"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9202
9203#: builtin/push.c:268
9204msgid "Updates were rejected because the tag already exists in the remote."
9205msgstr "更新被拒绝,因为该标签在远程已经存在。"
9206
9207#: builtin/push.c:271
9208msgid ""
9209"You cannot update a remote ref that points at a non-commit object,\n"
9210"or update a remote ref to make it point at a non-commit object,\n"
9211"without using the '--force' option.\n"
9212msgstr ""
9213"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9214"也不能更新远程引用让其指向一个非提交对象。\n"
9215
9216#: builtin/push.c:331
9217#, c-format
9218msgid "Pushing to %s\n"
9219msgstr "推送到 %s\n"
9220
9221#: builtin/push.c:335
9222#, c-format
9223msgid "failed to push some refs to '%s'"
9224msgstr "无法推送一些引用到 '%s'"
9225
9226#: builtin/push.c:365
9227#, c-format
9228msgid "bad repository '%s'"
9229msgstr "坏的仓库 '%s'"
9230
9231#: builtin/push.c:366
9232msgid ""
9233"No configured push destination.\n"
9234"Either specify the URL from the command-line or configure a remote "
9235"repository using\n"
9236"\n"
9237" git remote add <name> <url>\n"
9238"\n"
9239"and then push using the remote name\n"
9240"\n"
9241" git push <name>\n"
9242msgstr ""
9243"没有配置推送目标。\n"
9244"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9245"\n"
9246" git remote add <名称> <地址>\n"
9247"\n"
9248"然后使用该远程仓库名执行推送\n"
9249"\n"
9250" git push <名称>\n"
9251
9252#: builtin/push.c:381
9253msgid "--all and --tags are incompatible"
9254msgstr "--all 和 --tags 不兼容"
9255
9256#: builtin/push.c:382
9257msgid "--all can't be combined with refspecs"
9258msgstr "--all 不能和引用规格同时使用"
9259
9260#: builtin/push.c:387
9261msgid "--mirror and --tags are incompatible"
9262msgstr "--mirror 和 --tags 不兼容"
9263
9264#: builtin/push.c:388
9265msgid "--mirror can't be combined with refspecs"
9266msgstr "--mirror 不能和引用规格同时使用"
9267
9268#: builtin/push.c:393
9269msgid "--all and --mirror are incompatible"
9270msgstr "--all 和 --mirror 不兼容"
9271
9272#: builtin/push.c:505
9273msgid "repository"
9274msgstr "仓库"
9275
9276#: builtin/push.c:506 builtin/send-pack.c:161
9277msgid "push all refs"
9278msgstr "推送所有引用"
9279
9280#: builtin/push.c:507 builtin/send-pack.c:163
9281msgid "mirror all refs"
9282msgstr "镜像所有引用"
9283
9284#: builtin/push.c:509
9285msgid "delete refs"
9286msgstr "删除引用"
9287
9288#: builtin/push.c:510
9289msgid "push tags (can't be used with --all or --mirror)"
9290msgstr "推送标签(不能使用 --all or --mirror)"
9291
9292#: builtin/push.c:513 builtin/send-pack.c:164
9293msgid "force updates"
9294msgstr "强制更新"
9295
9296#: builtin/push.c:515 builtin/send-pack.c:175
9297msgid "refname>:<expect"
9298msgstr "引用名>:<期望值"
9299
9300#: builtin/push.c:516 builtin/send-pack.c:176
9301msgid "require old value of ref to be at this value"
9302msgstr "要求引用旧的取值为设定值"
9303
9304#: builtin/push.c:519
9305msgid "control recursive pushing of submodules"
9306msgstr "控制子模组的递归推送"
9307
9308#: builtin/push.c:521 builtin/send-pack.c:169
9309msgid "use thin pack"
9310msgstr "使用精简打包"
9311
9312#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
9313#: builtin/send-pack.c:159
9314msgid "receive pack program"
9315msgstr "接收包程序"
9316
9317#: builtin/push.c:524
9318msgid "set upstream for git pull/status"
9319msgstr "设置 git pull/status 的上游"
9320
9321#: builtin/push.c:527
9322msgid "prune locally removed refs"
9323msgstr "清除本地删除的引用"
9324
9325#: builtin/push.c:529
9326msgid "bypass pre-push hook"
9327msgstr "绕过 pre-push 钩子"
9328
9329#: builtin/push.c:530
9330msgid "push missing but relevant tags"
9331msgstr "推送缺失但有关的标签"
9332
9333#: builtin/push.c:533 builtin/send-pack.c:166
9334msgid "GPG sign the push"
9335msgstr "用 GPG 为推送签名"
9336
9337#: builtin/push.c:535 builtin/send-pack.c:170
9338msgid "request atomic transaction on remote side"
9339msgstr "需要远端支持原子事务"
9340
9341#: builtin/push.c:549
9342msgid "--delete is incompatible with --all, --mirror and --tags"
9343msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9344
9345#: builtin/push.c:551
9346msgid "--delete doesn't make sense without any refs"
9347msgstr "--delete 未接任何引用没有意义"
9348
9349#: builtin/read-tree.c:37
9350msgid ""
9351"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9352"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9353"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9354msgstr ""
9355"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9356"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9357"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9358
9359#: builtin/read-tree.c:110
9360msgid "write resulting index to <file>"
9361msgstr "将索引结果写入 <文件>"
9362
9363#: builtin/read-tree.c:113
9364msgid "only empty the index"
9365msgstr "只是清空索引"
9366
9367#: builtin/read-tree.c:115
9368msgid "Merging"
9369msgstr "合并"
9370
9371#: builtin/read-tree.c:117
9372msgid "perform a merge in addition to a read"
9373msgstr "读取之余再执行一个合并"
9374
9375#: builtin/read-tree.c:119
9376msgid "3-way merge if no file level merging required"
9377msgstr "如果没有文件级合并需要,执行三方合并"
9378
9379#: builtin/read-tree.c:121
9380msgid "3-way merge in presence of adds and removes"
9381msgstr "存在添加和删除时,也执行三方合并"
9382
9383#: builtin/read-tree.c:123
9384msgid "same as -m, but discard unmerged entries"
9385msgstr "类似于 -m,但丢弃未合并的条目"
9386
9387#: builtin/read-tree.c:124
9388msgid "<subdirectory>/"
9389msgstr "<子目录>/"
9390
9391#: builtin/read-tree.c:125
9392msgid "read the tree into the index under <subdirectory>/"
9393msgstr "读取树对象到索引的 <子目录>/ 下"
9394
9395#: builtin/read-tree.c:128
9396msgid "update working tree with merge result"
9397msgstr "用合并的结果更新工作区"
9398
9399#: builtin/read-tree.c:130
9400msgid "gitignore"
9401msgstr "gitignore"
9402
9403#: builtin/read-tree.c:131
9404msgid "allow explicitly ignored files to be overwritten"
9405msgstr "允许忽略文件中设定的文件可以被覆盖"
9406
9407#: builtin/read-tree.c:134
9408msgid "don't check the working tree after merging"
9409msgstr "合并后不检查工作区"
9410
9411#: builtin/read-tree.c:135
9412msgid "don't update the index or the work tree"
9413msgstr "不更新索引区和工作区"
9414
9415#: builtin/read-tree.c:137
9416msgid "skip applying sparse checkout filter"
9417msgstr "跳过应用稀疏检出过滤器"
9418
9419#: builtin/read-tree.c:139
9420msgid "debug unpack-trees"
9421msgstr "调试 unpack-trees"
9422
9423#: builtin/reflog.c:423
9424#, c-format
9425msgid "'%s' for '%s' is not a valid timestamp"
9426msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9427
9428#: builtin/reflog.c:540 builtin/reflog.c:545
9429#, c-format
9430msgid "'%s' is not a valid timestamp"
9431msgstr "'%s' 不是一个有效的时间戳"
9432
9433#: builtin/remote.c:12
9434msgid "git remote [-v | --verbose]"
9435msgstr "git remote [-v | --verbose]"
9436
9437#: builtin/remote.c:13
9438msgid ""
9439"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9440"mirror=<fetch|push>] <name> <url>"
9441msgstr ""
9442"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9443"mirror=<fetch|push>] <名称> <地址>"
9444
9445#: builtin/remote.c:14 builtin/remote.c:34
9446msgid "git remote rename <old> <new>"
9447msgstr "git remote rename <旧名称> <新名称>"
9448
9449#: builtin/remote.c:15 builtin/remote.c:39
9450msgid "git remote remove <name>"
9451msgstr "git remote remove <名称>"
9452
9453#: builtin/remote.c:16 builtin/remote.c:44
9454msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9455msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9456
9457#: builtin/remote.c:17
9458msgid "git remote [-v | --verbose] show [-n] <name>"
9459msgstr "git remote [-v | --verbose] show [-n] <名称>"
9460
9461#: builtin/remote.c:18
9462msgid "git remote prune [-n | --dry-run] <name>"
9463msgstr "git remote prune [-n | --dry-run] <名称>"
9464
9465#: builtin/remote.c:19
9466msgid ""
9467"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9468msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9469
9470#: builtin/remote.c:20
9471msgid "git remote set-branches [--add] <name> <branch>..."
9472msgstr "git remote set-branches [--add] <名称> <分支>..."
9473
9474#: builtin/remote.c:21 builtin/remote.c:70
9475msgid "git remote get-url [--push] [--all] <name>"
9476msgstr "git remote get-url [--push] [--all] <名称>"
9477
9478#: builtin/remote.c:22 builtin/remote.c:75
9479msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9480msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9481
9482#: builtin/remote.c:23 builtin/remote.c:76
9483msgid "git remote set-url --add <name> <newurl>"
9484msgstr "git remote set-url --add <名称> <新的地址>"
9485
9486#: builtin/remote.c:24 builtin/remote.c:77
9487msgid "git remote set-url --delete <name> <url>"
9488msgstr "git remote set-url --delete <名称> <地址>"
9489
9490#: builtin/remote.c:29
9491msgid "git remote add [<options>] <name> <url>"
9492msgstr "git remote add [<选项>] <名称> <地址>"
9493
9494#: builtin/remote.c:49
9495msgid "git remote set-branches <name> <branch>..."
9496msgstr "git remote set-branches <名称> <分支>..."
9497
9498#: builtin/remote.c:50
9499msgid "git remote set-branches --add <name> <branch>..."
9500msgstr "git remote set-branches --add <名称> <分支>..."
9501
9502#: builtin/remote.c:55
9503msgid "git remote show [<options>] <name>"
9504msgstr "git remote show [<选项>] <名称>"
9505
9506#: builtin/remote.c:60
9507msgid "git remote prune [<options>] <name>"
9508msgstr "git remote prune [<选项>] <名称>"
9509
9510#: builtin/remote.c:65
9511msgid "git remote update [<options>] [<group> | <remote>]..."
9512msgstr "git remote update [<选项>] [<组> | <远程>]..."
9513
9514#: builtin/remote.c:94
9515#, c-format
9516msgid "Updating %s"
9517msgstr "更新 %s 中"
9518
9519#: builtin/remote.c:126
9520msgid ""
9521"--mirror is dangerous and deprecated; please\n"
9522"\t use --mirror=fetch or --mirror=push instead"
9523msgstr ""
9524"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9525"\t 或 --mirror=push"
9526
9527#: builtin/remote.c:143
9528#, c-format
9529msgid "unknown mirror argument: %s"
9530msgstr "未知的镜像参数:%s"
9531
9532#: builtin/remote.c:159
9533msgid "fetch the remote branches"
9534msgstr "抓取远程的分支"
9535
9536#: builtin/remote.c:161
9537msgid "import all tags and associated objects when fetching"
9538msgstr "抓取时导入所有的标签和关联对象"
9539
9540#: builtin/remote.c:164
9541msgid "or do not fetch any tag at all (--no-tags)"
9542msgstr "或不抓取任何标签(--no-tags)"
9543
9544#: builtin/remote.c:166
9545msgid "branch(es) to track"
9546msgstr "跟踪的分支"
9547
9548#: builtin/remote.c:167
9549msgid "master branch"
9550msgstr "主线分支"
9551
9552#: builtin/remote.c:168
9553msgid "push|fetch"
9554msgstr "push|fetch"
9555
9556#: builtin/remote.c:169
9557msgid "set up remote as a mirror to push to or fetch from"
9558msgstr "把远程设置为用以推送或抓取的镜像"
9559
9560#: builtin/remote.c:181
9561msgid "specifying a master branch makes no sense with --mirror"
9562msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9563
9564#: builtin/remote.c:183
9565msgid "specifying branches to track makes sense only with fetch mirrors"
9566msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9567
9568#: builtin/remote.c:190 builtin/remote.c:633
9569#, c-format
9570msgid "remote %s already exists."
9571msgstr "远程 %s 已经存在。"
9572
9573#: builtin/remote.c:194 builtin/remote.c:637
9574#, c-format
9575msgid "'%s' is not a valid remote name"
9576msgstr "'%s' 不是一个有效的远程名称"
9577
9578#: builtin/remote.c:234
9579#, c-format
9580msgid "Could not setup master '%s'"
9581msgstr "无法设置 master '%s'"
9582
9583#: builtin/remote.c:336
9584#, c-format
9585msgid "Could not get fetch map for refspec %s"
9586msgstr "无法得到引用规格 %s 的获取列表"
9587
9588#: builtin/remote.c:437 builtin/remote.c:445
9589msgid "(matching)"
9590msgstr "(匹配)"
9591
9592#: builtin/remote.c:449
9593msgid "(delete)"
9594msgstr "(删除)"
9595
9596#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9597#, c-format
9598msgid "No such remote: %s"
9599msgstr "没有这样的远程:%s"
9600
9601#: builtin/remote.c:643
9602#, c-format
9603msgid "Could not rename config section '%s' to '%s'"
9604msgstr "不能重命名配置小节 '%s' 到 '%s'"
9605
9606#: builtin/remote.c:663
9607#, c-format
9608msgid ""
9609"Not updating non-default fetch refspec\n"
9610"\t%s\n"
9611"\tPlease update the configuration manually if necessary."
9612msgstr ""
9613"没有更新非默认的获取引用规格\n"
9614"\t%s\n"
9615"\t如果必要请手动更新配置。"
9616
9617#: builtin/remote.c:699
9618#, c-format
9619msgid "deleting '%s' failed"
9620msgstr "删除 '%s' 失败"
9621
9622#: builtin/remote.c:733
9623#, c-format
9624msgid "creating '%s' failed"
9625msgstr "创建 '%s' 失败"
9626
9627#: builtin/remote.c:796
9628msgid ""
9629"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9630"to delete it, use:"
9631msgid_plural ""
9632"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9633"to delete them, use:"
9634msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9635msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9636
9637#: builtin/remote.c:810
9638#, c-format
9639msgid "Could not remove config section '%s'"
9640msgstr "不能移除配置小节 '%s'"
9641
9642#: builtin/remote.c:911
9643#, c-format
9644msgid " new (next fetch will store in remotes/%s)"
9645msgstr " 新的(下一次获取将存储于 remotes/%s)"
9646
9647#: builtin/remote.c:914
9648msgid " tracked"
9649msgstr " 已跟踪"
9650
9651#: builtin/remote.c:916
9652msgid " stale (use 'git remote prune' to remove)"
9653msgstr " 过时(使用 'git remote prune' 来移除)"
9654
9655#: builtin/remote.c:918
9656msgid " ???"
9657msgstr " ???"
9658
9659#: builtin/remote.c:959
9660#, c-format
9661msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9662msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9663
9664#: builtin/remote.c:967
9665#, c-format
9666msgid "rebases interactively onto remote %s"
9667msgstr "交互式变基到远程 %s"
9668
9669#: builtin/remote.c:971
9670#, c-format
9671msgid " merges with remote %s"
9672msgstr " 与远程 %s 合并"
9673
9674#: builtin/remote.c:972
9675msgid " and with remote"
9676msgstr " 且有远程"
9677
9678#: builtin/remote.c:974
9679#, c-format
9680msgid "merges with remote %s"
9681msgstr "与远程 %s 合并"
9682
9683#: builtin/remote.c:975
9684msgid " and with remote"
9685msgstr " 且有远程"
9686
9687#: builtin/remote.c:1021
9688msgid "create"
9689msgstr "创建"
9690
9691#: builtin/remote.c:1024
9692msgid "delete"
9693msgstr "删除"
9694
9695#: builtin/remote.c:1028
9696msgid "up to date"
9697msgstr "最新"
9698
9699#: builtin/remote.c:1031
9700msgid "fast-forwardable"
9701msgstr "可快进"
9702
9703#: builtin/remote.c:1034
9704msgid "local out of date"
9705msgstr "本地已过时"
9706
9707#: builtin/remote.c:1041
9708#, c-format
9709msgid " %-*s forces to %-*s (%s)"
9710msgstr " %-*s 强制推送至 %-*s (%s)"
9711
9712#: builtin/remote.c:1044
9713#, c-format
9714msgid " %-*s pushes to %-*s (%s)"
9715msgstr " %-*s 推送至 %-*s (%s)"
9716
9717#: builtin/remote.c:1048
9718#, c-format
9719msgid " %-*s forces to %s"
9720msgstr " %-*s 强制推送至 %s"
9721
9722#: builtin/remote.c:1051
9723#, c-format
9724msgid " %-*s pushes to %s"
9725msgstr " %-*s 推送至 %s"
9726
9727#: builtin/remote.c:1119
9728msgid "do not query remotes"
9729msgstr "不查询远程"
9730
9731#: builtin/remote.c:1146
9732#, c-format
9733msgid "* remote %s"
9734msgstr "* 远程 %s"
9735
9736#: builtin/remote.c:1147
9737#, c-format
9738msgid " Fetch URL: %s"
9739msgstr " 获取地址:%s"
9740
9741#: builtin/remote.c:1148 builtin/remote.c:1299
9742msgid "(no URL)"
9743msgstr "(无 URL)"
9744
9745#: builtin/remote.c:1157 builtin/remote.c:1159
9746#, c-format
9747msgid " Push URL: %s"
9748msgstr " 推送地址:%s"
9749
9750#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
9751#, c-format
9752msgid " HEAD branch: %s"
9753msgstr " HEAD 分支:%s"
9754
9755#: builtin/remote.c:1167
9756#, c-format
9757msgid ""
9758" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9759msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9760
9761#: builtin/remote.c:1179
9762#, c-format
9763msgid " Remote branch:%s"
9764msgid_plural " Remote branches:%s"
9765msgstr[0] " 远程分支:%s"
9766msgstr[1] " 远程分支:%s"
9767
9768# 译者:中文字符串拼接,可删除前导空格
9769#: builtin/remote.c:1182 builtin/remote.c:1209
9770msgid " (status not queried)"
9771msgstr "(状态未查询)"
9772
9773#: builtin/remote.c:1191
9774msgid " Local branch configured for 'git pull':"
9775msgid_plural " Local branches configured for 'git pull':"
9776msgstr[0] " 为 'git pull' 配置的本地分支:"
9777msgstr[1] " 为 'git pull' 配置的本地分支:"
9778
9779#: builtin/remote.c:1199
9780msgid " Local refs will be mirrored by 'git push'"
9781msgstr " 本地引用将在 'git push' 时被镜像"
9782
9783#: builtin/remote.c:1206
9784#, c-format
9785msgid " Local ref configured for 'git push'%s:"
9786msgid_plural " Local refs configured for 'git push'%s:"
9787msgstr[0] " 为 'git push' 配置的本地引用%s:"
9788msgstr[1] " 为 'git push' 配置的本地引用%s:"
9789
9790#: builtin/remote.c:1227
9791msgid "set refs/remotes/<name>/HEAD according to remote"
9792msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9793
9794#: builtin/remote.c:1229
9795msgid "delete refs/remotes/<name>/HEAD"
9796msgstr "删除 refs/remotes/<名称>/HEAD"
9797
9798#: builtin/remote.c:1244
9799msgid "Cannot determine remote HEAD"
9800msgstr "无法确定远程 HEAD"
9801
9802#: builtin/remote.c:1246
9803msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9804msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9805
9806#: builtin/remote.c:1256
9807#, c-format
9808msgid "Could not delete %s"
9809msgstr "无法删除 %s"
9810
9811#: builtin/remote.c:1264
9812#, c-format
9813msgid "Not a valid ref: %s"
9814msgstr "不是一个有效引用:%s"
9815
9816#: builtin/remote.c:1266
9817#, c-format
9818msgid "Could not setup %s"
9819msgstr "不能设置 %s"
9820
9821# 译者:注意保持前导空格
9822#: builtin/remote.c:1284
9823#, c-format
9824msgid " %s will become dangling!"
9825msgstr " %s 将成为摇摆状态!"
9826
9827# 译者:注意保持前导空格
9828#: builtin/remote.c:1285
9829#, c-format
9830msgid " %s has become dangling!"
9831msgstr " %s 已成为摇摆状态!"
9832
9833#: builtin/remote.c:1295
9834#, c-format
9835msgid "Pruning %s"
9836msgstr "修剪 %s"
9837
9838#: builtin/remote.c:1296
9839#, c-format
9840msgid "URL: %s"
9841msgstr "URL:%s"
9842
9843#: builtin/remote.c:1312
9844#, c-format
9845msgid " * [would prune] %s"
9846msgstr " * [将删除] %s"
9847
9848#: builtin/remote.c:1315
9849#, c-format
9850msgid " * [pruned] %s"
9851msgstr " * [已删除] %s"
9852
9853#: builtin/remote.c:1360
9854msgid "prune remotes after fetching"
9855msgstr "抓取后清除远程"
9856
9857#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
9858#, c-format
9859msgid "No such remote '%s'"
9860msgstr "没有此远程 '%s'"
9861
9862#: builtin/remote.c:1439
9863msgid "add branch"
9864msgstr "添加分支"
9865
9866#: builtin/remote.c:1446
9867msgid "no remote specified"
9868msgstr "未指定远程"
9869
9870#: builtin/remote.c:1463
9871msgid "query push URLs rather than fetch URLs"
9872msgstr "查询推送 URL 地址,而非获取 URL 地址"
9873
9874#: builtin/remote.c:1465
9875msgid "return all URLs"
9876msgstr "返回所有 URL 地址"
9877
9878#: builtin/remote.c:1493
9879#, c-format
9880msgid "no URLs configured for remote '%s'"
9881msgstr "没有给远程仓库 '%s' 设定 URL"
9882
9883#: builtin/remote.c:1519
9884msgid "manipulate push URLs"
9885msgstr "操作推送 URLS"
9886
9887#: builtin/remote.c:1521
9888msgid "add URL"
9889msgstr "添加 URL"
9890
9891#: builtin/remote.c:1523
9892msgid "delete URLs"
9893msgstr "删除 URLS"
9894
9895#: builtin/remote.c:1530
9896msgid "--add --delete doesn't make sense"
9897msgstr "--add --delete 无意义"
9898
9899#: builtin/remote.c:1571
9900#, c-format
9901msgid "Invalid old URL pattern: %s"
9902msgstr "无效的旧 URL 匹配模版:%s"
9903
9904#: builtin/remote.c:1579
9905#, c-format
9906msgid "No such URL found: %s"
9907msgstr "未找到此 URL:%s"
9908
9909#: builtin/remote.c:1581
9910msgid "Will not delete all non-push URLs"
9911msgstr "将不会删除所有非推送 URL 地址"
9912
9913#: builtin/remote.c:1595
9914msgid "be verbose; must be placed before a subcommand"
9915msgstr "冗长输出;必须置于子命令之前"
9916
9917#: builtin/repack.c:17
9918msgid "git repack [<options>]"
9919msgstr "git repack [<选项>]"
9920
9921#: builtin/repack.c:159
9922msgid "pack everything in a single pack"
9923msgstr "所有内容打包到一个包文件中"
9924
9925#: builtin/repack.c:161
9926msgid "same as -a, and turn unreachable objects loose"
9927msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9928
9929#: builtin/repack.c:164
9930msgid "remove redundant packs, and run git-prune-packed"
9931msgstr "删除多余的包,运行 git-prune-packed"
9932
9933#: builtin/repack.c:166
9934msgid "pass --no-reuse-delta to git-pack-objects"
9935msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9936
9937#: builtin/repack.c:168
9938msgid "pass --no-reuse-object to git-pack-objects"
9939msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9940
9941#: builtin/repack.c:170
9942msgid "do not run git-update-server-info"
9943msgstr "不运行 git-update-server-info"
9944
9945#: builtin/repack.c:173
9946msgid "pass --local to git-pack-objects"
9947msgstr "向 git-pack-objects 传递参数 --local"
9948
9949#: builtin/repack.c:175
9950msgid "write bitmap index"
9951msgstr "写 bitmap 索引"
9952
9953#: builtin/repack.c:176
9954msgid "approxidate"
9955msgstr "近似日期"
9956
9957#: builtin/repack.c:177
9958msgid "with -A, do not loosen objects older than this"
9959msgstr "使用 -A,不要将早于给定时间的对象过期"
9960
9961#: builtin/repack.c:179
9962msgid "size of the window used for delta compression"
9963msgstr "用于增量压缩的窗口值"
9964
9965#: builtin/repack.c:180 builtin/repack.c:184
9966msgid "bytes"
9967msgstr "字节"
9968
9969#: builtin/repack.c:181
9970msgid "same as the above, but limit memory size instead of entries count"
9971msgstr "和上面的相似,但限制内存大小而非条目数"
9972
9973#: builtin/repack.c:183
9974msgid "limits the maximum delta depth"
9975msgstr "限制最大增量深度"
9976
9977#: builtin/repack.c:185
9978msgid "maximum size of each packfile"
9979msgstr "每个包文件的最大尺寸"
9980
9981#: builtin/repack.c:187
9982msgid "repack objects in packs marked with .keep"
9983msgstr "对标记为 .keep 的包中的对象重新打包"
9984
9985#: builtin/repack.c:197
9986msgid "cannot delete packs in a precious-objects repo"
9987msgstr "不能删除珍品仓库中的打包文件"
9988
9989#: builtin/repack.c:381
9990#, c-format
9991msgid "removing '%s' failed"
9992msgstr "删除 '%s' 失败"
9993
9994#: builtin/replace.c:19
9995msgid "git replace [-f] <object> <replacement>"
9996msgstr "git replace [-f] <对象> <替换物>"
9997
9998#: builtin/replace.c:20
9999msgid "git replace [-f] --edit <object>"
10000msgstr "git replace [-f] --edit <对象>"
10001
10002#: builtin/replace.c:21
10003msgid "git replace [-f] --graft <commit> [<parent>...]"
10004msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10005
10006#: builtin/replace.c:22
10007msgid "git replace -d <object>..."
10008msgstr "git replace -d <对象>..."
10009
10010#: builtin/replace.c:23
10011msgid "git replace [--format=<format>] [-l [<pattern>]]"
10012msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10013
10014#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10015#, c-format
10016msgid "Not a valid object name: '%s'"
10017msgstr "不是一个有效的对象名:'%s'"
10018
10019#: builtin/replace.c:355
10020#, c-format
10021msgid "bad mergetag in commit '%s'"
10022msgstr "提交 '%s' 中含有损坏的合并标签"
10023
10024#: builtin/replace.c:357
10025#, c-format
10026msgid "malformed mergetag in commit '%s'"
10027msgstr "提交 '%s' 中含有非法的合并标签"
10028
10029#: builtin/replace.c:368
10030#, c-format
10031msgid ""
10032"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10033"instead of --graft"
10034msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10035
10036#: builtin/replace.c:401
10037#, c-format
10038msgid "the original commit '%s' has a gpg signature."
10039msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10040
10041#: builtin/replace.c:402
10042msgid "the signature will be removed in the replacement commit!"
10043msgstr "在替换的提交中签名将被移除!"
10044
10045#: builtin/replace.c:408
10046#, c-format
10047msgid "could not write replacement commit for: '%s'"
10048msgstr "不能为 '%s' 写替换提交"
10049
10050#: builtin/replace.c:432
10051msgid "list replace refs"
10052msgstr "列出替换的引用"
10053
10054#: builtin/replace.c:433
10055msgid "delete replace refs"
10056msgstr "删除替换的引用"
10057
10058#: builtin/replace.c:434
10059msgid "edit existing object"
10060msgstr "编辑现存的对象"
10061
10062#: builtin/replace.c:435
10063msgid "change a commit's parents"
10064msgstr "修改一个提交的父提交"
10065
10066#: builtin/replace.c:436
10067msgid "replace the ref if it exists"
10068msgstr "如果存在则替换引用"
10069
10070#: builtin/replace.c:437
10071msgid "do not pretty-print contents for --edit"
10072msgstr "不要为 --edit 操作美观显示内容"
10073
10074#: builtin/replace.c:438
10075msgid "use this format"
10076msgstr "使用此格式"
10077
10078#: builtin/rerere.c:12
10079msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10080msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10081
10082#: builtin/rerere.c:58
10083msgid "register clean resolutions in index"
10084msgstr "在索引中注册干净的解决方案"
10085
10086#: builtin/reset.c:26
10087msgid ""
10088"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10089msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10090
10091#: builtin/reset.c:27
10092msgid "git reset [-q] <tree-ish> [--] <paths>..."
10093msgstr "git reset [-q] <树或提交> [--] <路径>..."
10094
10095#: builtin/reset.c:28
10096msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10097msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10098
10099#: builtin/reset.c:34
10100msgid "mixed"
10101msgstr "混杂"
10102
10103#: builtin/reset.c:34
10104msgid "soft"
10105msgstr "软性"
10106
10107#: builtin/reset.c:34
10108msgid "hard"
10109msgstr "硬性"
10110
10111#: builtin/reset.c:34
10112msgid "merge"
10113msgstr "合并"
10114
10115#: builtin/reset.c:34
10116msgid "keep"
10117msgstr "保持"
10118
10119#: builtin/reset.c:74
10120msgid "You do not have a valid HEAD."
10121msgstr "您没有一个有效的 HEAD。"
10122
10123#: builtin/reset.c:76
10124msgid "Failed to find tree of HEAD."
10125msgstr "无法找到 HEAD 指向的树。"
10126
10127#: builtin/reset.c:82
10128#, c-format
10129msgid "Failed to find tree of %s."
10130msgstr "无法找到 %s 指向的树。"
10131
10132#: builtin/reset.c:100
10133#, c-format
10134msgid "HEAD is now at %s"
10135msgstr "HEAD 现在位于 %s"
10136
10137# 译者:汉字之间无空格,故删除%s前后空格
10138#: builtin/reset.c:183
10139#, c-format
10140msgid "Cannot do a %s reset in the middle of a merge."
10141msgstr "在合并过程中不能做%s重置操作。"
10142
10143#: builtin/reset.c:276
10144msgid "be quiet, only report errors"
10145msgstr "安静模式,只报告错误"
10146
10147#: builtin/reset.c:278
10148msgid "reset HEAD and index"
10149msgstr "重置 HEAD 和索引"
10150
10151#: builtin/reset.c:279
10152msgid "reset only HEAD"
10153msgstr "只重置 HEAD"
10154
10155#: builtin/reset.c:281 builtin/reset.c:283
10156msgid "reset HEAD, index and working tree"
10157msgstr "重置 HEAD、索引和工作区"
10158
10159#: builtin/reset.c:285
10160msgid "reset HEAD but keep local changes"
10161msgstr "重置 HEAD 但保存本地变更"
10162
10163#: builtin/reset.c:288
10164msgid "record only the fact that removed paths will be added later"
10165msgstr "将删除的路径标记为稍后添加"
10166
10167#: builtin/reset.c:305
10168#, c-format
10169msgid "Failed to resolve '%s' as a valid revision."
10170msgstr "无法将 '%s' 解析为一个有效的版本。"
10171
10172#: builtin/reset.c:313
10173#, c-format
10174msgid "Failed to resolve '%s' as a valid tree."
10175msgstr "无法将 '%s' 解析为一个有效的树对象。"
10176
10177#: builtin/reset.c:322
10178msgid "--patch is incompatible with --{hard,mixed,soft}"
10179msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10180
10181#: builtin/reset.c:331
10182msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10183msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10184
10185# 译者:汉字之间无空格,故删除%s前后空格
10186#: builtin/reset.c:333
10187#, c-format
10188msgid "Cannot do %s reset with paths."
10189msgstr "不能带路径进行%s重置。"
10190
10191# 译者:汉字之间无空格,故删除%s前后空格
10192#: builtin/reset.c:343
10193#, c-format
10194msgid "%s reset is not allowed in a bare repository"
10195msgstr "不能对纯仓库进行%s重置"
10196
10197#: builtin/reset.c:347
10198msgid "-N can only be used with --mixed"
10199msgstr "-N 只能和 --mixed 同时使用"
10200
10201#: builtin/reset.c:364
10202msgid "Unstaged changes after reset:"
10203msgstr "重置后取消暂存的变更:"
10204
10205#: builtin/reset.c:370
10206#, c-format
10207msgid "Could not reset index file to revision '%s'."
10208msgstr "不能重置索引文件至版本 '%s'。"
10209
10210#: builtin/reset.c:374
10211msgid "Could not write new index file."
10212msgstr "不能写入新的索引文件。"
10213
10214#: builtin/rev-list.c:350
10215msgid "rev-list does not support display of notes"
10216msgstr "rev-list 不支持显示注解"
10217
10218#: builtin/rev-parse.c:358
10219msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10220msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10221
10222#: builtin/rev-parse.c:363
10223msgid "keep the `--` passed as an arg"
10224msgstr "保持 `--` 作为一个参数传递"
10225
10226#: builtin/rev-parse.c:365
10227msgid "stop parsing after the first non-option argument"
10228msgstr "遇到第一个非选项参数后停止解析"
10229
10230#: builtin/rev-parse.c:368
10231msgid "output in stuck long form"
10232msgstr "以固定长格式输出"
10233
10234#: builtin/rev-parse.c:499
10235msgid ""
10236"git rev-parse --parseopt [<options>] -- [<args>...]\n"
10237" or: git rev-parse --sq-quote [<arg>...]\n"
10238" or: git rev-parse [<options>] [<arg>...]\n"
10239"\n"
10240"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10241msgstr ""
10242"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10243" 或者:git rev-parse --sq-quote [<参数>...]\n"
10244" 或者:git rev-parse [<选项>] [<参数>...]\n"
10245"\n"
10246"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10247
10248#: builtin/revert.c:22
10249msgid "git revert [<options>] <commit-ish>..."
10250msgstr "git revert [<选项>] <提交号>..."
10251
10252#: builtin/revert.c:23
10253msgid "git revert <subcommand>"
10254msgstr "git revert <子命令>"
10255
10256#: builtin/revert.c:28
10257msgid "git cherry-pick [<options>] <commit-ish>..."
10258msgstr "git cherry-pick [<选项>] <提交号>..."
10259
10260#: builtin/revert.c:29
10261msgid "git cherry-pick <subcommand>"
10262msgstr "git cherry-pick <子命令>"
10263
10264#: builtin/revert.c:71
10265#, c-format
10266msgid "%s: %s cannot be used with %s"
10267msgstr "%s:%s 不能和 %s 同时使用"
10268
10269#: builtin/revert.c:80
10270msgid "end revert or cherry-pick sequence"
10271msgstr "终止反转或拣选操作"
10272
10273#: builtin/revert.c:81
10274msgid "resume revert or cherry-pick sequence"
10275msgstr "继续反转或拣选操作"
10276
10277#: builtin/revert.c:82
10278msgid "cancel revert or cherry-pick sequence"
10279msgstr "取消反转或拣选操作"
10280
10281#: builtin/revert.c:83
10282msgid "don't automatically commit"
10283msgstr "不要自动提交"
10284
10285#: builtin/revert.c:84
10286msgid "edit the commit message"
10287msgstr "编辑提交说明"
10288
10289#: builtin/revert.c:87
10290msgid "parent number"
10291msgstr "父编号"
10292
10293#: builtin/revert.c:89
10294msgid "merge strategy"
10295msgstr "合并策略"
10296
10297#: builtin/revert.c:90
10298msgid "option"
10299msgstr "选项"
10300
10301#: builtin/revert.c:91
10302msgid "option for merge strategy"
10303msgstr "合并策略的选项"
10304
10305#: builtin/revert.c:104
10306msgid "append commit name"
10307msgstr "追加提交名称"
10308
10309#: builtin/revert.c:106
10310msgid "preserve initially empty commits"
10311msgstr "保留初始化的空提交"
10312
10313#: builtin/revert.c:107
10314msgid "allow commits with empty messages"
10315msgstr "允许提交说明为空"
10316
10317#: builtin/revert.c:108
10318msgid "keep redundant, empty commits"
10319msgstr "保持多余的、空的提交"
10320
10321#: builtin/revert.c:112
10322msgid "program error"
10323msgstr "程序错误"
10324
10325#: builtin/revert.c:197
10326msgid "revert failed"
10327msgstr "还原失败"
10328
10329#: builtin/revert.c:212
10330msgid "cherry-pick failed"
10331msgstr "拣选失败"
10332
10333#: builtin/rm.c:17
10334msgid "git rm [<options>] [--] <file>..."
10335msgstr "git rm [<选项>] [--] <文件>..."
10336
10337#: builtin/rm.c:65
10338msgid ""
10339"the following submodule (or one of its nested submodules)\n"
10340"uses a .git directory:"
10341msgid_plural ""
10342"the following submodules (or one of their nested submodules)\n"
10343"use a .git directory:"
10344msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10345msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10346
10347#: builtin/rm.c:71
10348msgid ""
10349"\n"
10350"(use 'rm -rf' if you really want to remove it including all of its history)"
10351msgstr ""
10352"\n"
10353"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10354
10355#: builtin/rm.c:230
10356msgid ""
10357"the following file has staged content different from both the\n"
10358"file and the HEAD:"
10359msgid_plural ""
10360"the following files have staged content different from both the\n"
10361"file and the HEAD:"
10362msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10363msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10364
10365#: builtin/rm.c:235
10366msgid ""
10367"\n"
10368"(use -f to force removal)"
10369msgstr ""
10370"\n"
10371"(使用 -f 强制删除)"
10372
10373#: builtin/rm.c:239
10374msgid "the following file has changes staged in the index:"
10375msgid_plural "the following files have changes staged in the index:"
10376msgstr[0] "下列文件索引中有变更"
10377msgstr[1] "下列文件索引中有变更"
10378
10379#: builtin/rm.c:243 builtin/rm.c:254
10380msgid ""
10381"\n"
10382"(use --cached to keep the file, or -f to force removal)"
10383msgstr ""
10384"\n"
10385"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10386
10387#: builtin/rm.c:251
10388msgid "the following file has local modifications:"
10389msgid_plural "the following files have local modifications:"
10390msgstr[0] "如下文件有本地修改:"
10391msgstr[1] "如下文件有本地修改:"
10392
10393#: builtin/rm.c:269
10394msgid "do not list removed files"
10395msgstr "不列出删除的文件"
10396
10397#: builtin/rm.c:270
10398msgid "only remove from the index"
10399msgstr "只从索引区删除"
10400
10401#: builtin/rm.c:271
10402msgid "override the up-to-date check"
10403msgstr "忽略文件更新状态检查"
10404
10405#: builtin/rm.c:272
10406msgid "allow recursive removal"
10407msgstr "允许递归删除"
10408
10409#: builtin/rm.c:274
10410msgid "exit with a zero status even if nothing matched"
10411msgstr "即使没有匹配,也以零状态退出"
10412
10413#: builtin/rm.c:317
10414msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10415msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10416
10417#: builtin/rm.c:335
10418#, c-format
10419msgid "not removing '%s' recursively without -r"
10420msgstr "未提供 -r 选项不会递归删除 '%s'"
10421
10422#: builtin/rm.c:374
10423#, c-format
10424msgid "git rm: unable to remove %s"
10425msgstr "git rm:不能删除 %s"
10426
10427#: builtin/send-pack.c:18
10428msgid ""
10429"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10430"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10431"[<ref>...]\n"
10432" --all and explicit <ref> specification are mutually exclusive."
10433msgstr ""
10434"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10435"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10436" --all 和明确的 <引用> 互斥。"
10437
10438#: builtin/send-pack.c:160
10439msgid "remote name"
10440msgstr "远程名称"
10441
10442#: builtin/send-pack.c:171
10443msgid "use stateless RPC protocol"
10444msgstr "使用无状态的 RPC 协议"
10445
10446#: builtin/send-pack.c:172
10447msgid "read refs from stdin"
10448msgstr "从标准输入读取引用"
10449
10450#: builtin/send-pack.c:173
10451msgid "print status from remote helper"
10452msgstr "打印来自远程 helper 的状态"
10453
10454#: builtin/shortlog.c:13
10455msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10456msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10457
10458#: builtin/shortlog.c:242
10459msgid "sort output according to the number of commits per author"
10460msgstr "根据每个作者的提交数量排序"
10461
10462#: builtin/shortlog.c:244
10463msgid "Suppress commit descriptions, only provides commit count"
10464msgstr "隐藏提交说明,只提供提交数量"
10465
10466#: builtin/shortlog.c:246
10467msgid "Show the email address of each author"
10468msgstr "显示每个作者的电子邮件地址"
10469
10470#: builtin/shortlog.c:247
10471msgid "w[,i1[,i2]]"
10472msgstr "w[,i1[,i2]]"
10473
10474#: builtin/shortlog.c:248
10475msgid "Linewrap output"
10476msgstr "折行输出"
10477
10478#: builtin/show-branch.c:10
10479msgid ""
10480"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10481"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10482"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10483"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10484msgstr ""
10485"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10486"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10487"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10488"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10489
10490#: builtin/show-branch.c:14
10491msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10492msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10493
10494#: builtin/show-branch.c:640
10495msgid "show remote-tracking and local branches"
10496msgstr "显示远程跟踪的和本地的分支"
10497
10498#: builtin/show-branch.c:642
10499msgid "show remote-tracking branches"
10500msgstr "显示远程跟踪的分支"
10501
10502#: builtin/show-branch.c:644
10503msgid "color '*!+-' corresponding to the branch"
10504msgstr "着色 '*!+-' 到相应的分支"
10505
10506#: builtin/show-branch.c:646
10507msgid "show <n> more commits after the common ancestor"
10508msgstr "显示共同祖先后的 <n> 个提交"
10509
10510#: builtin/show-branch.c:648
10511msgid "synonym to more=-1"
10512msgstr "和 more=-1 同义"
10513
10514#: builtin/show-branch.c:649
10515msgid "suppress naming strings"
10516msgstr "不显示字符串命名"
10517
10518#: builtin/show-branch.c:651
10519msgid "include the current branch"
10520msgstr "包括当前分支"
10521
10522#: builtin/show-branch.c:653
10523msgid "name commits with their object names"
10524msgstr "以对象名字命名提交"
10525
10526#: builtin/show-branch.c:655
10527msgid "show possible merge bases"
10528msgstr "显示可能合并的基线"
10529
10530#: builtin/show-branch.c:657
10531msgid "show refs unreachable from any other ref"
10532msgstr "显示没有任何引用的的引用"
10533
10534#: builtin/show-branch.c:659
10535msgid "show commits in topological order"
10536msgstr "以拓扑顺序显示提交"
10537
10538#: builtin/show-branch.c:662
10539msgid "show only commits not on the first branch"
10540msgstr "只显示不在第一个分支上的提交"
10541
10542#: builtin/show-branch.c:664
10543msgid "show merges reachable from only one tip"
10544msgstr "显示仅一个分支可访问的合并提交"
10545
10546#: builtin/show-branch.c:666
10547msgid "topologically sort, maintaining date order where possible"
10548msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10549
10550#: builtin/show-branch.c:669
10551msgid "<n>[,<base>]"
10552msgstr "<n>[,<base>]"
10553
10554#: builtin/show-branch.c:670
10555msgid "show <n> most recent ref-log entries starting at base"
10556msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10557
10558#: builtin/show-ref.c:10
10559msgid ""
10560"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10561"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10562msgstr ""
10563"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10564"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10565
10566#: builtin/show-ref.c:11
10567msgid "git show-ref --exclude-existing[=<pattern>]"
10568msgstr "git show-ref --exclude-existing[=<模式>]"
10569
10570#: builtin/show-ref.c:165
10571msgid "only show tags (can be combined with heads)"
10572msgstr "只显示标签(可以和头共用)"
10573
10574#: builtin/show-ref.c:166
10575msgid "only show heads (can be combined with tags)"
10576msgstr "只显示头(可以和标签共用)"
10577
10578#: builtin/show-ref.c:167
10579msgid "stricter reference checking, requires exact ref path"
10580msgstr "更严格的引用检测,需要精确的引用路径"
10581
10582#: builtin/show-ref.c:170 builtin/show-ref.c:172
10583msgid "show the HEAD reference, even if it would be filtered out"
10584msgstr "显示 HEAD 引用,即使被过滤掉"
10585
10586#: builtin/show-ref.c:174
10587msgid "dereference tags into object IDs"
10588msgstr "转换标签到对象 ID"
10589
10590#: builtin/show-ref.c:176
10591msgid "only show SHA1 hash using <n> digits"
10592msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10593
10594#: builtin/show-ref.c:180
10595msgid "do not print results to stdout (useful with --verify)"
10596msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10597
10598#: builtin/show-ref.c:182
10599msgid "show refs from stdin that aren't in local repository"
10600msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10601
10602#: builtin/stripspace.c:17
10603msgid "git stripspace [-s | --strip-comments]"
10604msgstr "git stripspace [-s | --strip-comments]"
10605
10606#: builtin/stripspace.c:18
10607msgid "git stripspace [-c | --comment-lines]"
10608msgstr "git stripspace [-c | --comment-lines]"
10609
10610#: builtin/stripspace.c:35
10611msgid "skip and remove all lines starting with comment character"
10612msgstr "跳过和移除所有的注释行"
10613
10614#: builtin/stripspace.c:38
10615msgid "prepend comment character and space to each line"
10616msgstr "为每一行的行首添加注释符和空格"
10617
10618#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
10619msgid "alternative anchor for relative paths"
10620msgstr "相对路径的替代锚记(anchor)"
10621
10622#: builtin/submodule--helper.c:78
10623msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10624msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10625
10626#: builtin/submodule--helper.c:108
10627msgid "git submodule--helper name <path>"
10628msgstr "git submodule--helper name <路径>"
10629
10630#: builtin/submodule--helper.c:114
10631#, c-format
10632msgid "no submodule mapping found in .gitmodules for path '%s'"
10633msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10634
10635#: builtin/submodule--helper.c:164
10636msgid "where the new submodule will be cloned to"
10637msgstr "新的子模组将要克隆的路径"
10638
10639#: builtin/submodule--helper.c:167
10640msgid "name of the new submodule"
10641msgstr "新子模组的名称"
10642
10643#: builtin/submodule--helper.c:170
10644msgid "url where to clone the submodule from"
10645msgstr "克隆子模组的 url 地址"
10646
10647#: builtin/submodule--helper.c:176
10648msgid "depth for shallow clones"
10649msgstr "浅克隆的深度"
10650
10651#: builtin/submodule--helper.c:182
10652msgid ""
10653"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10654"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10655msgstr ""
10656"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10657"[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10658
10659#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
10660#: builtin/submodule--helper.c:210
10661#, c-format
10662msgid "could not create directory '%s'"
10663msgstr "不能创建目录 '%s'"
10664
10665#: builtin/submodule--helper.c:198
10666#, c-format
10667msgid "clone of '%s' into submodule path '%s' failed"
10668msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10669
10670#: builtin/submodule--helper.c:221
10671#, c-format
10672msgid "cannot open file '%s'"
10673msgstr "无法打开文件 '%s'"
10674
10675#: builtin/submodule--helper.c:226
10676#, c-format
10677msgid "could not close file %s"
10678msgstr "无法关闭文件 %s"
10679
10680#: builtin/submodule--helper.c:241
10681#, c-format
10682msgid "could not get submodule directory for '%s'"
10683msgstr "无法得到 '%s' 的子模组目录"
10684
10685#: builtin/submodule--helper.c:267
10686msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10687msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10688
10689#: builtin/submodule--helper.c:274
10690#, c-format
10691msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10692msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10693
10694#: builtin/symbolic-ref.c:7
10695msgid "git symbolic-ref [<options>] <name> [<ref>]"
10696msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10697
10698#: builtin/symbolic-ref.c:8
10699msgid "git symbolic-ref -d [-q] <name>"
10700msgstr "git symbolic-ref -d [-q] <名称>"
10701
10702#: builtin/symbolic-ref.c:40
10703msgid "suppress error message for non-symbolic (detached) refs"
10704msgstr "不显示非符号(分离的)引用的错误信息"
10705
10706#: builtin/symbolic-ref.c:41
10707msgid "delete symbolic ref"
10708msgstr "删除符号引用"
10709
10710#: builtin/symbolic-ref.c:42
10711msgid "shorten ref output"
10712msgstr "简短的引用输出"
10713
10714#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10715msgid "reason"
10716msgstr "原因"
10717
10718#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10719msgid "reason of the update"
10720msgstr "更新的原因"
10721
10722#: builtin/tag.c:23
10723msgid ""
10724"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10725"[<head>]"
10726msgstr ""
10727"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10728
10729#: builtin/tag.c:24
10730msgid "git tag -d <tagname>..."
10731msgstr "git tag -d <标签名>..."
10732
10733#: builtin/tag.c:25
10734msgid ""
10735"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10736"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10737msgstr ""
10738"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10739"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10740
10741#: builtin/tag.c:27
10742msgid "git tag -v <tagname>..."
10743msgstr "git tag -v <标签名>..."
10744
10745#: builtin/tag.c:80
10746#, c-format
10747msgid "tag name too long: %.*s..."
10748msgstr "标签名称太长:%.*s..."
10749
10750#: builtin/tag.c:85
10751#, c-format
10752msgid "tag '%s' not found."
10753msgstr "未发现标签 '%s'。"
10754
10755#: builtin/tag.c:100
10756#, c-format
10757msgid "Deleted tag '%s' (was %s)\n"
10758msgstr "已删除标签 '%s'(曾为 %s)\n"
10759
10760#: builtin/tag.c:112
10761#, c-format
10762msgid "could not verify the tag '%s'"
10763msgstr "不能校验该标签 '%s'"
10764
10765#: builtin/tag.c:122
10766#, c-format
10767msgid ""
10768"\n"
10769"Write a message for tag:\n"
10770" %s\n"
10771"Lines starting with '%c' will be ignored.\n"
10772msgstr ""
10773"\n"
10774"输入一个标签说明:\n"
10775" %s\n"
10776"以 '%c' 开头的行将被忽略。\n"
10777
10778#: builtin/tag.c:126
10779#, c-format
10780msgid ""
10781"\n"
10782"Write a message for tag:\n"
10783" %s\n"
10784"Lines starting with '%c' will be kept; you may remove them yourself if you "
10785"want to.\n"
10786msgstr ""
10787"\n"
10788"输入一个标签说明:\n"
10789" %s\n"
10790"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10791
10792#: builtin/tag.c:199
10793msgid "unable to sign the tag"
10794msgstr "无法签署标签"
10795
10796#: builtin/tag.c:201
10797msgid "unable to write tag file"
10798msgstr "无法写标签文件"
10799
10800#: builtin/tag.c:226
10801msgid "bad object type."
10802msgstr "坏的对象类型。"
10803
10804#: builtin/tag.c:239
10805msgid "tag header too big."
10806msgstr "标签头信息太大。"
10807
10808#: builtin/tag.c:275
10809msgid "no tag message?"
10810msgstr "无标签说明?"
10811
10812#: builtin/tag.c:281
10813#, c-format
10814msgid "The tag message has been left in %s\n"
10815msgstr "标签说明被保留在 %s\n"
10816
10817#: builtin/tag.c:339
10818msgid "list tag names"
10819msgstr "列出标签名称"
10820
10821#: builtin/tag.c:341
10822msgid "print <n> lines of each tag message"
10823msgstr "每个标签信息打印 <n> 行"
10824
10825#: builtin/tag.c:343
10826msgid "delete tags"
10827msgstr "删除标签"
10828
10829#: builtin/tag.c:344
10830msgid "verify tags"
10831msgstr "验证标签"
10832
10833#: builtin/tag.c:346
10834msgid "Tag creation options"
10835msgstr "标签创建选项"
10836
10837#: builtin/tag.c:348
10838msgid "annotated tag, needs a message"
10839msgstr "附注标签,需要一个说明"
10840
10841#: builtin/tag.c:350
10842msgid "tag message"
10843msgstr "标签说明"
10844
10845#: builtin/tag.c:352
10846msgid "annotated and GPG-signed tag"
10847msgstr "附注并附加 GPG 签名的标签"
10848
10849#: builtin/tag.c:356
10850msgid "use another key to sign the tag"
10851msgstr "使用另外的私钥签名该标签"
10852
10853#: builtin/tag.c:357
10854msgid "replace the tag if exists"
10855msgstr "如果存在,替换现有的标签"
10856
10857#: builtin/tag.c:358 builtin/update-ref.c:368
10858msgid "create a reflog"
10859msgstr "创建引用日志"
10860
10861#: builtin/tag.c:360
10862msgid "Tag listing options"
10863msgstr "标签列表选项"
10864
10865#: builtin/tag.c:361
10866msgid "show tag list in columns"
10867msgstr "以列的方式显示标签列表"
10868
10869#: builtin/tag.c:362 builtin/tag.c:363
10870msgid "print only tags that contain the commit"
10871msgstr "只打印包含提交的标签"
10872
10873#: builtin/tag.c:364
10874msgid "print only tags that are merged"
10875msgstr "只打印已经合并的标签"
10876
10877#: builtin/tag.c:365
10878msgid "print only tags that are not merged"
10879msgstr "只打印尚未合并的标签"
10880
10881#: builtin/tag.c:370
10882msgid "print only tags of the object"
10883msgstr "只打印对象的标签"
10884
10885#: builtin/tag.c:399
10886msgid "--column and -n are incompatible"
10887msgstr "--column 和 -n 不兼容"
10888
10889#: builtin/tag.c:419
10890msgid "-n option is only allowed with -l."
10891msgstr "-n 选项只允许和 -l 同时使用。"
10892
10893#: builtin/tag.c:421
10894msgid "--contains option is only allowed with -l."
10895msgstr "--contains 选项只允许和 -l 同时使用。"
10896
10897#: builtin/tag.c:423
10898msgid "--points-at option is only allowed with -l."
10899msgstr "--points-at 选项只允许和 -l 同时使用。"
10900
10901#: builtin/tag.c:425
10902msgid "--merged and --no-merged option are only allowed with -l"
10903msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10904
10905#: builtin/tag.c:433
10906msgid "only one -F or -m option is allowed."
10907msgstr "只允许一个 -F 或 -m 选项。"
10908
10909#: builtin/tag.c:453
10910msgid "too many params"
10911msgstr "太多参数"
10912
10913#: builtin/tag.c:459
10914#, c-format
10915msgid "'%s' is not a valid tag name."
10916msgstr "'%s' 不是一个有效的标签名称。"
10917
10918#: builtin/tag.c:464
10919#, c-format
10920msgid "tag '%s' already exists"
10921msgstr "标签 '%s' 已存在"
10922
10923#: builtin/tag.c:489
10924#, c-format
10925msgid "Updated tag '%s' (was %s)\n"
10926msgstr "已更新标签 '%s'(曾为 %s)\n"
10927
10928#: builtin/unpack-objects.c:490
10929msgid "Unpacking objects"
10930msgstr "展开对象中"
10931
10932#: builtin/update-index.c:79
10933#, c-format
10934msgid "failed to create directory %s"
10935msgstr "无法创建目录 %s"
10936
10937#: builtin/update-index.c:85
10938#, c-format
10939msgid "failed to stat %s"
10940msgstr "无法枚举 %s 状态"
10941
10942#: builtin/update-index.c:95
10943#, c-format
10944msgid "failed to create file %s"
10945msgstr "无法创建文件 %s"
10946
10947#: builtin/update-index.c:103
10948#, c-format
10949msgid "failed to delete file %s"
10950msgstr "无法删除文件 %s"
10951
10952#: builtin/update-index.c:110 builtin/update-index.c:212
10953#, c-format
10954msgid "failed to delete directory %s"
10955msgstr "无法删除目录 %s"
10956
10957#: builtin/update-index.c:133
10958#, c-format
10959msgid "Testing mtime in '%s' "
10960msgstr "在 '%s' 中测试 mtime "
10961
10962#: builtin/update-index.c:145
10963msgid "directory stat info does not change after adding a new file"
10964msgstr "添加一个新文件后,目录的状态信息未改变"
10965
10966#: builtin/update-index.c:158
10967msgid "directory stat info does not change after adding a new directory"
10968msgstr "添加一个新目录后,目录的状态信息未改变"
10969
10970#: builtin/update-index.c:171
10971msgid "directory stat info changes after updating a file"
10972msgstr "更新一个文件后,目录的状态信息被修改"
10973
10974#: builtin/update-index.c:182
10975msgid "directory stat info changes after adding a file inside subdirectory"
10976msgstr "在子目录中添加文件后,目录的状态信息被修改"
10977
10978#: builtin/update-index.c:193
10979msgid "directory stat info does not change after deleting a file"
10980msgstr "删除一个文件后,目录的状态信息未改变"
10981
10982#: builtin/update-index.c:206
10983msgid "directory stat info does not change after deleting a directory"
10984msgstr "删除一个目录后,目录的状态信息未改变"
10985
10986#: builtin/update-index.c:213
10987msgid " OK"
10988msgstr " OK"
10989
10990#: builtin/update-index.c:575
10991msgid "git update-index [<options>] [--] [<file>...]"
10992msgstr "git update-index [<选项>] [--] [<文件>...]"
10993
10994#: builtin/update-index.c:930
10995msgid "continue refresh even when index needs update"
10996msgstr "当索引需要更新时继续刷新"
10997
10998#: builtin/update-index.c:933
10999msgid "refresh: ignore submodules"
11000msgstr "刷新:忽略子模组"
11001
11002#: builtin/update-index.c:936
11003msgid "do not ignore new files"
11004msgstr "不忽略新的文件"
11005
11006#: builtin/update-index.c:938
11007msgid "let files replace directories and vice-versa"
11008msgstr "让文件替换目录(反之亦然)"
11009
11010#: builtin/update-index.c:940
11011msgid "notice files missing from worktree"
11012msgstr "通知文件从工作区丢失"
11013
11014#: builtin/update-index.c:942
11015msgid "refresh even if index contains unmerged entries"
11016msgstr "即使索引区包含未合并的条目也执行刷新"
11017
11018#: builtin/update-index.c:945
11019msgid "refresh stat information"
11020msgstr "刷新统计信息"
11021
11022#: builtin/update-index.c:949
11023msgid "like --refresh, but ignore assume-unchanged setting"
11024msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11025
11026#: builtin/update-index.c:953
11027msgid "<mode>,<object>,<path>"
11028msgstr "<存取模式>,<对象>,<路径>"
11029
11030#: builtin/update-index.c:954
11031msgid "add the specified entry to the index"
11032msgstr "添加指定的条目到索引区"
11033
11034#: builtin/update-index.c:958
11035msgid "(+/-)x"
11036msgstr "(+/-)x"
11037
11038#: builtin/update-index.c:959
11039msgid "override the executable bit of the listed files"
11040msgstr "覆盖列表里文件的可执行位"
11041
11042#: builtin/update-index.c:963
11043msgid "mark files as \"not changing\""
11044msgstr "把文件标记为 \"没有变更\""
11045
11046#: builtin/update-index.c:966
11047msgid "clear assumed-unchanged bit"
11048msgstr "清除 assumed-unchanged 位"
11049
11050#: builtin/update-index.c:969
11051msgid "mark files as \"index-only\""
11052msgstr "把文件标记为 \"仅索引\""
11053
11054#: builtin/update-index.c:972
11055msgid "clear skip-worktree bit"
11056msgstr "清除 skip-worktree 位"
11057
11058#: builtin/update-index.c:975
11059msgid "add to index only; do not add content to object database"
11060msgstr "只添加到索引区;不添加对象到对象库"
11061
11062#: builtin/update-index.c:977
11063msgid "remove named paths even if present in worktree"
11064msgstr "即使存在工作区里,也删除路径"
11065
11066#: builtin/update-index.c:979
11067msgid "with --stdin: input lines are terminated by null bytes"
11068msgstr "携带 --stdin:输入的行以 null 字符终止"
11069
11070#: builtin/update-index.c:981
11071msgid "read list of paths to be updated from standard input"
11072msgstr "从标准输入中读取需要更新的路径列表"
11073
11074#: builtin/update-index.c:985
11075msgid "add entries from standard input to the index"
11076msgstr "从标准输入添加条目到索引区"
11077
11078#: builtin/update-index.c:989
11079msgid "repopulate stages #2 and #3 for the listed paths"
11080msgstr "为指定文件重新生成第2和第3暂存区"
11081
11082#: builtin/update-index.c:993
11083msgid "only update entries that differ from HEAD"
11084msgstr "只更新与 HEAD 不同的条目"
11085
11086#: builtin/update-index.c:997
11087msgid "ignore files missing from worktree"
11088msgstr "忽略工作区丢失的文件"
11089
11090#: builtin/update-index.c:1000
11091msgid "report actions to standard output"
11092msgstr "在标准输出显示操作"
11093
11094#: builtin/update-index.c:1002
11095msgid "(for porcelains) forget saved unresolved conflicts"
11096msgstr "(for porcelains) 忘记保存的未解决的冲突"
11097
11098#: builtin/update-index.c:1006
11099msgid "write index in this format"
11100msgstr "以这种格式写入索引区"
11101
11102#: builtin/update-index.c:1008
11103msgid "enable or disable split index"
11104msgstr "启用或禁用索引拆分"
11105
11106#: builtin/update-index.c:1010
11107msgid "enable/disable untracked cache"
11108msgstr "启用/禁用对未跟踪文件的缓存"
11109
11110#: builtin/update-index.c:1012
11111msgid "test if the filesystem supports untracked cache"
11112msgstr "测试文件系统是否支持未跟踪文件缓存"
11113
11114#: builtin/update-index.c:1014
11115msgid "enable untracked cache without testing the filesystem"
11116msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11117
11118#: builtin/update-index.c:1134
11119msgid "Untracked cache disabled"
11120msgstr "缓存未跟踪文件被禁用"
11121
11122#: builtin/update-index.c:1146
11123#, c-format
11124msgid "Untracked cache enabled for '%s'"
11125msgstr "缓存未跟踪文件在 '%s' 启用"
11126
11127#: builtin/update-ref.c:9
11128msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11129msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
11130
11131#: builtin/update-ref.c:10
11132msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
11133msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
11134
11135#: builtin/update-ref.c:11
11136msgid "git update-ref [<options>] --stdin [-z]"
11137msgstr "git update-ref [<选项>] --stdin [-z]"
11138
11139#: builtin/update-ref.c:363
11140msgid "delete the reference"
11141msgstr "删除引用"
11142
11143#: builtin/update-ref.c:365
11144msgid "update <refname> not the one it points to"
11145msgstr "更新 <引用名> 本身而不是它指向的引用"
11146
11147#: builtin/update-ref.c:366
11148msgid "stdin has NUL-terminated arguments"
11149msgstr "标准输入有以 NUL 字符终止的参数"
11150
11151#: builtin/update-ref.c:367
11152msgid "read updates from stdin"
11153msgstr "从标准输入读取更新"
11154
11155#: builtin/update-server-info.c:6
11156msgid "git update-server-info [--force]"
11157msgstr "git update-server-info [--force]"
11158
11159#: builtin/update-server-info.c:14
11160msgid "update the info files from scratch"
11161msgstr "从头开始更新文件信息"
11162
11163#: builtin/verify-commit.c:17
11164msgid "git verify-commit [-v | --verbose] <commit>..."
11165msgstr "git verify-commit [-v | --verbose] <提交>..."
11166
11167#: builtin/verify-commit.c:72
11168msgid "print commit contents"
11169msgstr "打印提交内容"
11170
11171#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
11172msgid "print raw gpg status output"
11173msgstr "打印原始 gpg 状态输出"
11174
11175#: builtin/verify-pack.c:54
11176msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11177msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
11178
11179#: builtin/verify-pack.c:64
11180msgid "verbose"
11181msgstr "冗长输出"
11182
11183#: builtin/verify-pack.c:66
11184msgid "show statistics only"
11185msgstr "只显示统计"
11186
11187#: builtin/verify-tag.c:17
11188msgid "git verify-tag [-v | --verbose] <tag>..."
11189msgstr "git verify-tag [-v | --verbose] <标签>..."
11190
11191#: builtin/verify-tag.c:83
11192msgid "print tag contents"
11193msgstr "打印标签内容"
11194
11195#: builtin/worktree.c:15
11196msgid "git worktree add [<options>] <path> [<branch>]"
11197msgstr "git worktree add [<选项>] <路径> [<分支>]"
11198
11199#: builtin/worktree.c:16
11200msgid "git worktree prune [<options>]"
11201msgstr "git worktree prune [<选项>]"
11202
11203#: builtin/worktree.c:17
11204msgid "git worktree list [<options>]"
11205msgstr "git worktree list [<选项>]"
11206
11207#: builtin/worktree.c:39
11208#, c-format
11209msgid "Removing worktrees/%s: not a valid directory"
11210msgstr "删除工作区/%s:不是一个有效的目录"
11211
11212#: builtin/worktree.c:45
11213#, c-format
11214msgid "Removing worktrees/%s: gitdir file does not exist"
11215msgstr "删除 worktrees/%s:gitdir 文件不存在"
11216
11217#: builtin/worktree.c:50
11218#, c-format
11219msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11220msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11221
11222#: builtin/worktree.c:61
11223#, c-format
11224msgid "Removing worktrees/%s: invalid gitdir file"
11225msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11226
11227#: builtin/worktree.c:77
11228#, c-format
11229msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11230msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11231
11232#: builtin/worktree.c:112
11233#, c-format
11234msgid "failed to remove: %s"
11235msgstr "无法删除:%s"
11236
11237#: builtin/worktree.c:201
11238#, c-format
11239msgid "'%s' already exists"
11240msgstr "'%s' 已经存在"
11241
11242#: builtin/worktree.c:233
11243#, c-format
11244msgid "could not create directory of '%s'"
11245msgstr "不能创建目录 '%s'"
11246
11247#: builtin/worktree.c:269
11248#, c-format
11249msgid "Preparing %s (identifier %s)"
11250msgstr "准备 %s (标识符 %s)"
11251
11252#: builtin/worktree.c:317
11253msgid "checkout <branch> even if already checked out in other worktree"
11254msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11255
11256#: builtin/worktree.c:319
11257msgid "create a new branch"
11258msgstr "创建一个新分支"
11259
11260#: builtin/worktree.c:321
11261msgid "create or reset a branch"
11262msgstr "创建或重置一个分支"
11263
11264#: builtin/worktree.c:322
11265msgid "detach HEAD at named commit"
11266msgstr "HEAD 从指定的提交分离"
11267
11268#: builtin/worktree.c:329
11269msgid "-b, -B, and --detach are mutually exclusive"
11270msgstr "-b、-B 和 --detach 是互斥的"
11271
11272#: builtin/write-tree.c:13
11273msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11274msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11275
11276#: builtin/write-tree.c:26
11277msgid "<prefix>/"
11278msgstr "<前缀>/"
11279
11280#: builtin/write-tree.c:27
11281msgid "write tree object for a subdirectory <prefix>"
11282msgstr "将 <前缀> 子目录内容写到一个树对象"
11283
11284#: builtin/write-tree.c:30
11285msgid "only useful for debugging"
11286msgstr "只对调试有用"
11287
11288#: credential-cache--daemon.c:262
11289msgid "print debugging messages to stderr"
11290msgstr "调试信息输出到标准错误"
11291
11292#: git.c:14
11293msgid ""
11294"'git help -a' and 'git help -g' list available subcommands and some\n"
11295"concept guides. See 'git help <command>' or 'git help <concept>'\n"
11296"to read about a specific subcommand or concept."
11297msgstr ""
11298"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11299"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11300"帮助。"
11301
11302#: http.c:321
11303msgid "Public key pinning not supported with cURL < 7.44.0"
11304msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11305
11306#: common-cmds.h:9
11307msgid "start a working area (see also: git help tutorial)"
11308msgstr "开始一个工作区(参见:git help tutorial)"
11309
11310#: common-cmds.h:10
11311msgid "work on the current change (see also: git help everyday)"
11312msgstr "在当前变更上工作(参见:git help everyday)"
11313
11314#: common-cmds.h:11
11315msgid "examine the history and state (see also: git help revisions)"
11316msgstr "检查历史和状态(参见:git help revisions)"
11317
11318#: common-cmds.h:12
11319msgid "grow, mark and tweak your common history"
11320msgstr "扩展、标记和调校您的历史记录"
11321
11322#: common-cmds.h:13
11323msgid "collaborate (see also: git help workflows)"
11324msgstr "协同(参见:git help workflows)"
11325
11326#: common-cmds.h:17
11327msgid "Add file contents to the index"
11328msgstr "添加文件内容至索引"
11329
11330#: common-cmds.h:18
11331msgid "Use binary search to find the commit that introduced a bug"
11332msgstr "通过二分查找定位引入 bug 的提交"
11333
11334#: common-cmds.h:19
11335msgid "List, create, or delete branches"
11336msgstr "列出、创建或删除分支"
11337
11338#: common-cmds.h:20
11339msgid "Switch branches or restore working tree files"
11340msgstr "切换分支或恢复工作区文件"
11341
11342#: common-cmds.h:21
11343msgid "Clone a repository into a new directory"
11344msgstr "克隆一个仓库到一个新目录"
11345
11346#: common-cmds.h:22
11347msgid "Record changes to the repository"
11348msgstr "记录变更到仓库"
11349
11350#: common-cmds.h:23
11351msgid "Show changes between commits, commit and working tree, etc"
11352msgstr "显示提交之间、提交和工作区之间等的差异"
11353
11354#: common-cmds.h:24
11355msgid "Download objects and refs from another repository"
11356msgstr "从另外一个仓库下载对象和引用"
11357
11358#: common-cmds.h:25
11359msgid "Print lines matching a pattern"
11360msgstr "输出和模式匹配的行"
11361
11362#: common-cmds.h:26
11363msgid "Create an empty Git repository or reinitialize an existing one"
11364msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11365
11366#: common-cmds.h:27
11367msgid "Show commit logs"
11368msgstr "显示提交日志"
11369
11370#: common-cmds.h:28
11371msgid "Join two or more development histories together"
11372msgstr "合并两个或更多开发历史"
11373
11374#: common-cmds.h:29
11375msgid "Move or rename a file, a directory, or a symlink"
11376msgstr "移动或重命名一个文件、目录或符号链接"
11377
11378#: common-cmds.h:30
11379msgid "Fetch from and integrate with another repository or a local branch"
11380msgstr "获取并整合另外的仓库或一个本地分支"
11381
11382#: common-cmds.h:31
11383msgid "Update remote refs along with associated objects"
11384msgstr "更新远程引用和相关的对象"
11385
11386#: common-cmds.h:32
11387msgid "Reapply commits on top of another base tip"
11388msgstr "在另一个分支上重新应用提交"
11389
11390#: common-cmds.h:33
11391msgid "Reset current HEAD to the specified state"
11392msgstr "重置当前 HEAD 到指定状态"
11393
11394#: common-cmds.h:34
11395msgid "Remove files from the working tree and from the index"
11396msgstr "从工作区和索引中删除文件"
11397
11398#: common-cmds.h:35
11399msgid "Show various types of objects"
11400msgstr "显示各种类型的对象"
11401
11402#: common-cmds.h:36
11403msgid "Show the working tree status"
11404msgstr "显示工作区状态"
11405
11406#: common-cmds.h:37
11407msgid "Create, list, delete or verify a tag object signed with GPG"
11408msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11409
11410#: parse-options.h:145
11411msgid "expiry-date"
11412msgstr "到期时间"
11413
11414#: parse-options.h:160
11415msgid "no-op (backward compatibility)"
11416msgstr "空操作(向后兼容)"
11417
11418#: parse-options.h:237
11419msgid "be more verbose"
11420msgstr "更加详细"
11421
11422#: parse-options.h:239
11423msgid "be more quiet"
11424msgstr "更加安静"
11425
11426#: parse-options.h:245
11427msgid "use <n> digits to display SHA-1s"
11428msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11429
11430#: rerere.h:38
11431msgid "update the index with reused conflict resolution if possible"
11432msgstr "如果可能,重用冲突解决更新索引"
11433
11434#: git-bisect.sh:55
11435msgid "You need to start by \"git bisect start\""
11436msgstr "您需要执行 \"git bisect start\" 来开始"
11437
11438# 译者:注意保持句尾空格
11439#. TRANSLATORS: Make sure to include [Y] and [n] in your
11440#. translation. The program will only accept English input
11441#. at this point.
11442#: git-bisect.sh:61
11443msgid "Do you want me to do it for you [Y/n]? "
11444msgstr "您想让我为您这样做么[Y/n]? "
11445
11446#: git-bisect.sh:122
11447#, sh-format
11448msgid "unrecognised option: '$arg'"
11449msgstr "未能识别的选项:'$arg'"
11450
11451#: git-bisect.sh:126
11452#, sh-format
11453msgid "'$arg' does not appear to be a valid revision"
11454msgstr "'$arg' 看起来不像是一个有效的版本"
11455
11456#: git-bisect.sh:155
11457msgid "Bad HEAD - I need a HEAD"
11458msgstr "坏的 HEAD - 我需要一个 HEAD"
11459
11460#: git-bisect.sh:168
11461#, sh-format
11462msgid ""
11463"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11464msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11465
11466#: git-bisect.sh:178
11467msgid "won't bisect on cg-seek'ed tree"
11468msgstr "不会在做了 cg-seek 的树上做二分查找"
11469
11470#: git-bisect.sh:182
11471msgid "Bad HEAD - strange symbolic ref"
11472msgstr "坏的 HEAD - 奇怪的符号引用"
11473
11474#: git-bisect.sh:234
11475#, sh-format
11476msgid "Bad bisect_write argument: $state"
11477msgstr "坏的 bisect_write 参数:$state"
11478
11479#: git-bisect.sh:263
11480#, sh-format
11481msgid "Bad rev input: $arg"
11482msgstr "输入坏的版本:$arg"
11483
11484#: git-bisect.sh:278
11485msgid "Please call 'bisect_state' with at least one argument."
11486msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11487
11488#: git-bisect.sh:290
11489#, sh-format
11490msgid "Bad rev input: $rev"
11491msgstr "输入坏的版本:$rev"
11492
11493#: git-bisect.sh:299
11494#, sh-format
11495msgid "'git bisect $TERM_BAD' can take only one argument."
11496msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11497
11498#: git-bisect.sh:322
11499#, sh-format
11500msgid "Warning: bisecting only with a $TERM_BAD commit."
11501msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11502
11503# 译者:注意保持句尾空格
11504#. TRANSLATORS: Make sure to include [Y] and [n] in your
11505#. translation. The program will only accept English input
11506#. at this point.
11507#: git-bisect.sh:328
11508msgid "Are you sure [Y/n]? "
11509msgstr "您确认么[Y/n]? "
11510
11511#: git-bisect.sh:340
11512#, sh-format
11513msgid ""
11514"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11515"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11516msgstr ""
11517"您需要给我至少一个好版本和一个坏版本。\n"
11518"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11519
11520#: git-bisect.sh:343
11521#, sh-format
11522msgid ""
11523"You need to start by \"git bisect start\".\n"
11524"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11525"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11526msgstr ""
11527"您需要执行 \"git bisect start\" 来开始。\n"
11528"然后需要提供我至少一个好版本和一个坏版本。\n"
11529"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11530
11531#: git-bisect.sh:414 git-bisect.sh:546
11532msgid "We are not bisecting."
11533msgstr "我们没有在二分查找。"
11534
11535#: git-bisect.sh:421
11536#, sh-format
11537msgid "'$invalid' is not a valid commit"
11538msgstr "'$invalid' 不是一个有效的提交"
11539
11540#: git-bisect.sh:430
11541#, sh-format
11542msgid ""
11543"Could not check out original HEAD '$branch'.\n"
11544"Try 'git bisect reset <commit>'."
11545msgstr ""
11546"不能检出原始 HEAD '$branch'。\n"
11547"尝试 'git bisect reset <提交>'。"
11548
11549#: git-bisect.sh:458
11550msgid "No logfile given"
11551msgstr "未提供日志文件"
11552
11553#: git-bisect.sh:459
11554#, sh-format
11555msgid "cannot read $file for replaying"
11556msgstr "不能读取 $file 来重放"
11557
11558#: git-bisect.sh:480
11559msgid "?? what are you talking about?"
11560msgstr "?? 您在说什么?"
11561
11562#: git-bisect.sh:492
11563#, sh-format
11564msgid "running $command"
11565msgstr "运行 $command"
11566
11567#: git-bisect.sh:499
11568#, sh-format
11569msgid ""
11570"bisect run failed:\n"
11571"exit code $res from '$command' is < 0 or >= 128"
11572msgstr ""
11573"二分查找运行失败:\n"
11574"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11575
11576#: git-bisect.sh:525
11577msgid "bisect run cannot continue any more"
11578msgstr "二分查找不能继续运行"
11579
11580#: git-bisect.sh:531
11581#, sh-format
11582msgid ""
11583"bisect run failed:\n"
11584"'bisect_state $state' exited with error code $res"
11585msgstr ""
11586"二分查找运行失败:\n"
11587"'bisect_state $state' 退出码为 $res"
11588
11589#: git-bisect.sh:538
11590msgid "bisect run success"
11591msgstr "二分查找运行成功"
11592
11593#: git-bisect.sh:565
11594msgid "please use two different terms"
11595msgstr "请使用两个不同的术语"
11596
11597#: git-bisect.sh:575
11598#, sh-format
11599msgid "'$term' is not a valid term"
11600msgstr "'$term' 不是一个有效的名称"
11601
11602#: git-bisect.sh:578
11603#, sh-format
11604msgid "can't use the builtin command '$term' as a term"
11605msgstr "不能使用内置命令 '$term' 作为术语"
11606
11607#: git-bisect.sh:587 git-bisect.sh:593
11608#, sh-format
11609msgid "can't change the meaning of term '$term'"
11610msgstr "不能修改术语 '$term' 的含义"
11611
11612#: git-bisect.sh:606
11613#, sh-format
11614msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11615msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11616
11617#: git-bisect.sh:636
11618msgid "no terms defined"
11619msgstr "未定义术语"
11620
11621#: git-bisect.sh:653
11622#, sh-format
11623msgid ""
11624"invalid argument $arg for 'git bisect terms'.\n"
11625"Supported options are: --term-good|--term-old and --term-bad|--term-new."
11626msgstr ""
11627"参数 $arg 对命令 'git bisect terms' 无效。\n"
11628"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11629
11630#: git-rebase.sh:57
11631msgid ""
11632"When you have resolved this problem, run \"git rebase --continue\".\n"
11633"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11634"To check out the original branch and stop rebasing, run \"git rebase --abort"
11635"\"."
11636msgstr ""
11637"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11638"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11639"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11640
11641#: git-rebase.sh:165
11642msgid "Applied autostash."
11643msgstr "成功应用 autostash。"
11644
11645#: git-rebase.sh:168
11646#, sh-format
11647msgid "Cannot store $stash_sha1"
11648msgstr "无法保存 $stash_sha1"
11649
11650#: git-rebase.sh:169
11651msgid ""
11652"Applying autostash resulted in conflicts.\n"
11653"Your changes are safe in the stash.\n"
11654"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11655msgstr ""
11656"应用 autostash 导致冲突。\n"
11657"您的修改安全地保存在 stash 中。\n"
11658"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11659
11660#: git-rebase.sh:208
11661msgid "The pre-rebase hook refused to rebase."
11662msgstr "钩子 pre-rebase 拒绝变基操作。"
11663
11664#: git-rebase.sh:213
11665msgid "It looks like git-am is in progress. Cannot rebase."
11666msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11667
11668#: git-rebase.sh:354
11669msgid "The --exec option must be used with the --interactive option"
11670msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11671
11672#: git-rebase.sh:359
11673msgid "No rebase in progress?"
11674msgstr "没有正在进行的变基?"
11675
11676#: git-rebase.sh:370
11677msgid "The --edit-todo action can only be used during interactive rebase."
11678msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11679
11680#: git-rebase.sh:377
11681msgid "Cannot read HEAD"
11682msgstr "不能读取 HEAD"
11683
11684#: git-rebase.sh:380
11685msgid ""
11686"You must edit all merge conflicts and then\n"
11687"mark them as resolved using git add"
11688msgstr ""
11689"您必须编辑所有的合并冲突,然后通过 git add\n"
11690"命令将它们标记为已解决"
11691
11692#: git-rebase.sh:398
11693#, sh-format
11694msgid "Could not move back to $head_name"
11695msgstr "无法移回 $head_name"
11696
11697#: git-rebase.sh:417
11698#, sh-format
11699msgid ""
11700"It seems that there is already a $state_dir_base directory, and\n"
11701"I wonder if you are in the middle of another rebase. If that is the\n"
11702"case, please try\n"
11703"\t$cmd_live_rebase\n"
11704"If that is not the case, please\n"
11705"\t$cmd_clear_stale_rebase\n"
11706"and run me again. I am stopping in case you still have something\n"
11707"valuable there."
11708msgstr ""
11709"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11710"过程中。 如果是这样,请执行\n"
11711"\t$cmd_live_rebase\n"
11712"如果不是这样,请执行\n"
11713"\t$cmd_clear_stale_rebase\n"
11714"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11715
11716#: git-rebase.sh:468
11717#, sh-format
11718msgid "invalid upstream $upstream_name"
11719msgstr "无效的上游 $upstream_name"
11720
11721#: git-rebase.sh:492
11722#, sh-format
11723msgid "$onto_name: there are more than one merge bases"
11724msgstr "$onto_name: 有一个以上的合并基准"
11725
11726#: git-rebase.sh:495 git-rebase.sh:499
11727#, sh-format
11728msgid "$onto_name: there is no merge base"
11729msgstr "$onto_name: 没有合并基准"
11730
11731#: git-rebase.sh:504
11732#, sh-format
11733msgid "Does not point to a valid commit: $onto_name"
11734msgstr "没有指向一个有效的提交:$onto_name"
11735
11736#: git-rebase.sh:527
11737#, sh-format
11738msgid "fatal: no such branch: $branch_name"
11739msgstr "严重错误:无此分支:$branch_name"
11740
11741#: git-rebase.sh:560
11742msgid "Cannot autostash"
11743msgstr "无法 autostash"
11744
11745#: git-rebase.sh:565
11746#, sh-format
11747msgid "Created autostash: $stash_abbrev"
11748msgstr "创建了 autostash: $stash_abbrev"
11749
11750#: git-rebase.sh:569
11751msgid "Please commit or stash them."
11752msgstr "请提交或为它们保存进度。"
11753
11754#: git-rebase.sh:589
11755#, sh-format
11756msgid "Current branch $branch_name is up to date."
11757msgstr "当前分支 $branch_name 是最新的。"
11758
11759#: git-rebase.sh:593
11760#, sh-format
11761msgid "Current branch $branch_name is up to date, rebase forced."
11762msgstr "当前分支 $branch_name 是最新的,强制变基。"
11763
11764#: git-rebase.sh:604
11765#, sh-format
11766msgid "Changes from $mb to $onto:"
11767msgstr "变更从 $mb 到 $onto:"
11768
11769#: git-rebase.sh:613
11770msgid "First, rewinding head to replay your work on top of it..."
11771msgstr "首先,回退分支以便在上面重放您的工作..."
11772
11773#: git-rebase.sh:623
11774#, sh-format
11775msgid "Fast-forwarded $branch_name to $onto_name."
11776msgstr "快进 $branch_name 至 $onto_name。"
11777
11778#: git-stash.sh:51
11779msgid "git stash clear with parameters is unimplemented"
11780msgstr "git stash clear 不支持参数"
11781
11782#: git-stash.sh:74
11783msgid "You do not have the initial commit yet"
11784msgstr "您尚未建立初始提交"
11785
11786#: git-stash.sh:89
11787msgid "Cannot save the current index state"
11788msgstr "无法保存当前索引状态"
11789
11790#: git-stash.sh:124 git-stash.sh:137
11791msgid "Cannot save the current worktree state"
11792msgstr "无法保存当前工作区状态"
11793
11794#: git-stash.sh:141
11795msgid "No changes selected"
11796msgstr "没有选择变更"
11797
11798#: git-stash.sh:144
11799msgid "Cannot remove temporary index (can't happen)"
11800msgstr "无法删除临时索引(不应发生)"
11801
11802#: git-stash.sh:157
11803msgid "Cannot record working tree state"
11804msgstr "不能记录工作区状态"
11805
11806#: git-stash.sh:189
11807#, sh-format
11808msgid "Cannot update $ref_stash with $w_commit"
11809msgstr "无法用 $w_commit 更新 $ref_stash"
11810
11811#. TRANSLATORS: $option is an invalid option, like
11812#. `--blah-blah'. The 7 spaces at the beginning of the
11813#. second line correspond to "error: ". So you should line
11814#. up the second line with however many characters the
11815#. translation of "error: " takes in your language. E.g. in
11816#. English this is:
11817#.
11818#. $ git stash save --blah-blah 2>&1 | head -n 2
11819#. error: unknown option for 'stash save': --blah-blah
11820#. To provide a message, use git stash save -- '--blah-blah'
11821#: git-stash.sh:239
11822#, sh-format
11823msgid ""
11824"error: unknown option for 'stash save': $option\n"
11825" To provide a message, use git stash save -- '$option'"
11826msgstr ""
11827"错误:'stash save' 的未知选项:$option\n"
11828" 要提供一个描述信息,使用 git stash save -- '$option'"
11829
11830#: git-stash.sh:260
11831msgid "No local changes to save"
11832msgstr "没有要保存的本地修改"
11833
11834#: git-stash.sh:264
11835msgid "Cannot initialize stash"
11836msgstr "无法初始化 stash"
11837
11838#: git-stash.sh:268
11839msgid "Cannot save the current status"
11840msgstr "无法保存当前状态"
11841
11842#: git-stash.sh:286
11843msgid "Cannot remove worktree changes"
11844msgstr "无法删除工作区变更"
11845
11846#: git-stash.sh:405
11847#, sh-format
11848msgid "unknown option: $opt"
11849msgstr "未知选项: $opt"
11850
11851#: git-stash.sh:415
11852msgid "No stash found."
11853msgstr "未发现 stash。"
11854
11855#: git-stash.sh:422
11856#, sh-format
11857msgid "Too many revisions specified: $REV"
11858msgstr "指定了太多的版本:$REV"
11859
11860#: git-stash.sh:428
11861#, sh-format
11862msgid "$reference is not a valid reference"
11863msgstr "$reference 不是一个有效的引用"
11864
11865#: git-stash.sh:456
11866#, sh-format
11867msgid "'$args' is not a stash-like commit"
11868msgstr "'$args' 不是 stash 样提交"
11869
11870#: git-stash.sh:467
11871#, sh-format
11872msgid "'$args' is not a stash reference"
11873msgstr "'$args' 不是一个 stash 引用"
11874
11875#: git-stash.sh:475
11876msgid "unable to refresh index"
11877msgstr "无法刷新索引"
11878
11879#: git-stash.sh:479
11880msgid "Cannot apply a stash in the middle of a merge"
11881msgstr "无法在合并过程中恢复进度"
11882
11883#: git-stash.sh:487
11884msgid "Conflicts in index. Try without --index."
11885msgstr "索引中有冲突。尝试不使用 --index。"
11886
11887#: git-stash.sh:489
11888msgid "Could not save index tree"
11889msgstr "不能保存索引树"
11890
11891#: git-stash.sh:523
11892msgid "Cannot unstage modified files"
11893msgstr "无法将修改的文件取消暂存"
11894
11895#: git-stash.sh:538
11896msgid "Index was not unstashed."
11897msgstr "索引的进度没有被恢复。"
11898
11899#: git-stash.sh:561
11900#, sh-format
11901msgid "Dropped ${REV} ($s)"
11902msgstr "丢弃了 ${REV} ($s)"
11903
11904#: git-stash.sh:562
11905#, sh-format
11906msgid "${REV}: Could not drop stash entry"
11907msgstr "${REV}:不能丢弃进度条目"
11908
11909#: git-stash.sh:570
11910msgid "No branch name specified"
11911msgstr "未指定分支名"
11912
11913#: git-stash.sh:642
11914msgid "(To restore them type \"git stash apply\")"
11915msgstr "(为恢复数据输入 \"git stash apply\")"
11916
11917#: git-submodule.sh:104
11918#, sh-format
11919msgid "cannot strip one component off url '$remoteurl'"
11920msgstr "无法从 url '$remoteurl' 剥离一个组件"
11921
11922#: git-submodule.sh:281
11923msgid "Relative path can only be used from the toplevel of the working tree"
11924msgstr "只能在工作区的顶级目录中使用相对路径"
11925
11926#: git-submodule.sh:291
11927#, sh-format
11928msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11929msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11930
11931#: git-submodule.sh:308
11932#, sh-format
11933msgid "'$sm_path' already exists in the index"
11934msgstr "'$sm_path' 已经存在于索引中"
11935
11936#: git-submodule.sh:312
11937#, sh-format
11938msgid ""
11939"The following path is ignored by one of your .gitignore files:\n"
11940"$sm_path\n"
11941"Use -f if you really want to add it."
11942msgstr ""
11943"以下路径被您的一个 .gitignore 文件所忽略:\n"
11944"$sm_path\n"
11945"如果您确实想添加它,使用 -f 参数。"
11946
11947#: git-submodule.sh:330
11948#, sh-format
11949msgid "Adding existing repo at '$sm_path' to the index"
11950msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11951
11952#: git-submodule.sh:332
11953#, sh-format
11954msgid "'$sm_path' already exists and is not a valid git repo"
11955msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11956
11957#: git-submodule.sh:340
11958#, sh-format
11959msgid "A git directory for '$sm_name' is found locally with remote(s):"
11960msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11961
11962#: git-submodule.sh:342
11963#, sh-format
11964msgid ""
11965"If you want to reuse this local git directory instead of cloning again from"
11966msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11967
11968#: git-submodule.sh:344
11969#, sh-format
11970msgid ""
11971"use the '--force' option. If the local git directory is not the correct repo"
11972msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11973
11974#: git-submodule.sh:345
11975#, sh-format
11976msgid ""
11977"or you are unsure what this means choose another name with the '--name' "
11978"option."
11979msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11980
11981#: git-submodule.sh:347
11982#, sh-format
11983msgid "Reactivating local git directory for submodule '$sm_name'."
11984msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11985
11986#: git-submodule.sh:359
11987#, sh-format
11988msgid "Unable to checkout submodule '$sm_path'"
11989msgstr "不能检出子模组 '$sm_path'"
11990
11991#: git-submodule.sh:364
11992#, sh-format
11993msgid "Failed to add submodule '$sm_path'"
11994msgstr "无法添加子模组 '$sm_path'"
11995
11996#: git-submodule.sh:373
11997#, sh-format
11998msgid "Failed to register submodule '$sm_path'"
11999msgstr "无法注册子模组 '$sm_path'"
12000
12001#: git-submodule.sh:417
12002#, sh-format
12003msgid "Entering '$prefix$displaypath'"
12004msgstr "正在进入 '$prefix$displaypath'"
12005
12006#: git-submodule.sh:437
12007#, sh-format
12008msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
12009msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
12010
12011#: git-submodule.sh:483
12012#, sh-format
12013msgid "No url found for submodule path '$displaypath' in .gitmodules"
12014msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
12015
12016#: git-submodule.sh:492
12017#, sh-format
12018msgid "Failed to register url for submodule path '$displaypath'"
12019msgstr "无法为子模组路径 '$displaypath' 注册 url"
12020
12021#: git-submodule.sh:494
12022#, sh-format
12023msgid "Submodule '$name' ($url) registered for path '$displaypath'"
12024msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12025
12026#: git-submodule.sh:511
12027#, sh-format
12028msgid "Failed to register update mode for submodule path '$displaypath'"
12029msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
12030
12031#: git-submodule.sh:549
12032#, sh-format
12033msgid "Use '.' if you really want to deinitialize all submodules"
12034msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
12035
12036#: git-submodule.sh:566
12037#, sh-format
12038msgid "Submodule work tree '$displaypath' contains a .git directory"
12039msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
12040
12041#: git-submodule.sh:567
12042#, sh-format
12043msgid ""
12044"(use 'rm -rf' if you really want to remove it including all of its history)"
12045msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
12046
12047#: git-submodule.sh:573
12048#, sh-format
12049msgid ""
12050"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
12051"discard them"
12052msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
12053
12054#: git-submodule.sh:576
12055#, sh-format
12056msgid "Cleared directory '$displaypath'"
12057msgstr "已清除目录 '$displaypath'"
12058
12059#: git-submodule.sh:577
12060#, sh-format
12061msgid "Could not remove submodule work tree '$displaypath'"
12062msgstr "无法移除子模组工作区 '$displaypath'"
12063
12064#: git-submodule.sh:580
12065#, sh-format
12066msgid "Could not create empty submodule directory '$displaypath'"
12067msgstr "不能创建空的子模组目录 '$displaypath'"
12068
12069#: git-submodule.sh:589
12070#, sh-format
12071msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
12072msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12073
12074#: git-submodule.sh:723
12075#, sh-format
12076msgid ""
12077"Submodule path '$displaypath' not initialized\n"
12078"Maybe you want to use 'update --init'?"
12079msgstr ""
12080"子模组路径 '$displaypath' 没有初始化\n"
12081"也许您想用 'update --init'?"
12082
12083#: git-submodule.sh:736
12084#, sh-format
12085msgid "Unable to find current revision in submodule path '$displaypath'"
12086msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
12087
12088#: git-submodule.sh:745
12089#, sh-format
12090msgid "Unable to fetch in submodule path '$sm_path'"
12091msgstr "无法在子模组路径 '$sm_path' 中获取"
12092
12093#: git-submodule.sh:768
12094#, sh-format
12095msgid "Unable to fetch in submodule path '$displaypath'"
12096msgstr "无法在子模组路径 '$displaypath' 中获取"
12097
12098#: git-submodule.sh:788
12099#, sh-format
12100msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
12101msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
12102
12103#: git-submodule.sh:789
12104#, sh-format
12105msgid "Submodule path '$displaypath': checked out '$sha1'"
12106msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12107
12108#: git-submodule.sh:793
12109#, sh-format
12110msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12111msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
12112
12113#: git-submodule.sh:794
12114#, sh-format
12115msgid "Submodule path '$displaypath': rebased into '$sha1'"
12116msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
12117
12118#: git-submodule.sh:799
12119#, sh-format
12120msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12121msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
12122
12123#: git-submodule.sh:800
12124#, sh-format
12125msgid "Submodule path '$displaypath': merged in '$sha1'"
12126msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
12127
12128#: git-submodule.sh:805
12129#, sh-format
12130msgid ""
12131"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
12132msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
12133
12134#: git-submodule.sh:806
12135#, sh-format
12136msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
12137msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
12138
12139#: git-submodule.sh:836
12140#, sh-format
12141msgid "Failed to recurse into submodule path '$displaypath'"
12142msgstr "无法递归进子模组路径 '$displaypath'"
12143
12144#: git-submodule.sh:944
12145msgid "The --cached option cannot be used with the --files option"
12146msgstr "选项 --cached 不能和选项 --files 同时使用"
12147
12148#: git-submodule.sh:996
12149#, sh-format
12150msgid "unexpected mode $mod_dst"
12151msgstr "意外的模式 $mod_dst"
12152
12153# 译者:注意保持前导空格
12154#: git-submodule.sh:1016
12155#, sh-format
12156msgid " Warn: $display_name doesn't contain commit $sha1_src"
12157msgstr " 警告:$display_name 未包含提交 $sha1_src"
12158
12159# 译者:注意保持前导空格
12160#: git-submodule.sh:1019
12161#, sh-format
12162msgid " Warn: $display_name doesn't contain commit $sha1_dst"
12163msgstr " 警告:$display_name 未包含提交 $sha1_dst"
12164
12165# 译者:注意保持前导空格
12166#: git-submodule.sh:1022
12167#, sh-format
12168msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12169msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
12170
12171#: git-submodule.sh:1047
12172msgid "blob"
12173msgstr "数据对象"
12174
12175#: git-submodule.sh:1165
12176#, sh-format
12177msgid "Failed to recurse into submodule path '$sm_path'"
12178msgstr "无法递归进子模组路径 '$sm_path'"
12179
12180#: git-submodule.sh:1229
12181#, sh-format
12182msgid "Synchronizing submodule url for '$displaypath'"
12183msgstr "为 '$displaypath' 同步子模组 url"
12184
12185#~ msgid "Forward-port local commits to the updated upstream head"
12186#~ msgstr "本地提交转移至更新后的上游分支中"
12187
12188#~ msgid "unable to parse format"
12189#~ msgstr "不能解析格式"
12190
12191#~ msgid "improper format entered align:%s"
12192#~ msgstr "输入了不正确的格式 align:%s"
12193
12194#~ msgid "Could not set core.worktree in %s"
12195#~ msgstr "不能在 %s 中设置 core.worktree"
12196
12197# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
12198#~ msgid ""
12199#~ "push.default is unset; its implicit value has changed in\n"
12200#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
12201#~ "and maintain the traditional behavior, use:\n"
12202#~ "\n"
12203#~ " git config --global push.default matching\n"
12204#~ "\n"
12205#~ "To squelch this message and adopt the new behavior now, use:\n"
12206#~ "\n"
12207#~ " git config --global push.default simple\n"
12208#~ "\n"
12209#~ "When push.default is set to 'matching', git will push local branches\n"
12210#~ "to the remote branches that already exist with the same name.\n"
12211#~ "\n"
12212#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
12213#~ "behavior, which only pushes the current branch to the corresponding\n"
12214#~ "remote branch that 'git pull' uses to update the current branch.\n"
12215#~ "\n"
12216#~ "See 'git help config' and search for 'push.default' for further "
12217#~ "information.\n"
12218#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
12219#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
12220#~ msgstr ""
12221#~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
12222#~ "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
12223#~ "\n"
12224#~ " git config --global push.default matching\n"
12225#~ "\n"
12226#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
12227#~ "\n"
12228#~ " git config --global push.default simple\n"
12229#~ "\n"
12230#~ "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
12231#~ "本地分支。\n"
12232#~ "\n"
12233#~ "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
12234#~ "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
12235#~ "\n"
12236#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
12237#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
12238#~ "为保持兼容,请用 'current' 代替 'simple')"
12239
12240#~ msgid "Could not append '%s'"
12241#~ msgstr "不能追加 '%s'"
12242
12243#~ msgid "Could not set '%s'"
12244#~ msgstr "不能设置 '%s'"
12245
12246# 译者:可选值,不能翻译
12247#~ msgid "check|on-demand|no"
12248#~ msgstr "check|on-demand|no"
12249
12250#~ msgid "Missing author: %s"
12251#~ msgstr "缺少作者:%s"
12252
12253#~ msgid "Testing "
12254#~ msgstr "正在测试 "
12255
12256#~ msgid "unable to look up current user in the passwd file: %s"
12257#~ msgstr "无法在口令文件中查询到当前用户:%s"
12258
12259#~ msgid "no such user"
12260#~ msgstr "无此用户"
12261
12262#~ msgid "show usage"
12263#~ msgstr "显示用法"
12264
12265#~ msgid "branch '%s' does not point at a commit"
12266#~ msgstr "分支 '%s' 未指向一个提交"
12267
12268#~ msgid "object '%s' does not point to a commit"
12269#~ msgstr "对象 '%s' 没有指向一个提交"
12270
12271#~ msgid "print only merged branches"
12272#~ msgstr "只打印合并的分支"
12273
12274#~ msgid "--dissociate given, but there is no --reference"
12275#~ msgstr "提供了参数 --dissociate,但未提供 --reference"
12276
12277#~ msgid "insanely long template name %s"
12278#~ msgstr "太长的模版名 %s"
12279
12280#~ msgid "insanely long symlink %s"
12281#~ msgstr "太长的符号链接 %s"
12282
12283#~ msgid "insanely long template path %s"
12284#~ msgstr "太长的模版路径 %s"
12285
12286#~ msgid "insane git directory %s"
12287#~ msgstr "不正常的 git 目录 %s"
12288
12289#~ msgid "unsupported sort specification '%s'"
12290#~ msgstr "不支持的排序规格 '%s'"
12291
12292#~ msgid "unsupported sort specification '%s' in variable '%s'"
12293#~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12294
12295#~ msgid "switch 'points-at' requires an object"
12296#~ msgstr "开关 'points-at' 需要一个对象"
12297
12298#~ msgid "sort tags"
12299#~ msgstr "排序标签"
12300
12301#~ msgid "--sort and -n are incompatible"
12302#~ msgstr "--sort 和 -n 不兼容"
12303
12304#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12305#~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12306
12307#~ msgid "false|true|preserve"
12308#~ msgstr "false|true|preserve"
12309
12310#~ msgid "BUG: reopen a lockfile that is still open"
12311#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12312
12313#~ msgid "BUG: reopen a lockfile that has been committed"
12314#~ msgstr "BUG: 重新打开一个已提交的锁文件"
12315
12316#~ msgid "option %s does not accept negative form"
12317#~ msgstr "选项 %s 不接受否定格式"
12318
12319#~ msgid "unable to parse value '%s' for option %s"
12320#~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12321
12322#~ msgid "-b and -B are mutually exclusive"
12323#~ msgstr "-b 和 -B 互斥"
12324
12325#~ msgid "You need to set your committer info first"
12326#~ msgstr "您需要先设置你的提交者信息"
12327
12328#~ msgid ""
12329#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12330#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12331#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12332#~ "\"."
12333#~ msgstr ""
12334#~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12335#~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12336#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12337
12338#~ msgid "Patch format $patch_format is not supported."
12339#~ msgstr "不支持 $patch_format 补丁格式。"
12340
12341#~ msgid "Please make up your mind. --skip or --abort?"
12342#~ msgstr "请下决心。--skip 或是 --abort ?"
12343
12344#~ msgid ""
12345#~ "Patch is empty. Was it split wrong?\n"
12346#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12347#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12348#~ msgstr ""
12349#~ "补丁为空。是不是切分错误?\n"
12350#~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12351#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12352
12353#~ msgid "Patch does not have a valid e-mail address."
12354#~ msgstr "补丁中没有一个有效的邮件地址。"
12355
12356#~ msgid "Applying: $FIRSTLINE"
12357#~ msgstr "正应用:$FIRSTLINE"
12358
12359#~ msgid "Patch failed at $msgnum $FIRSTLINE"
12360#~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12361
12362#~ msgid ""
12363#~ "Pull is not possible because you have unmerged files.\n"
12364#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12365#~ "as appropriate to mark resolution and make a commit."
12366#~ msgstr ""
12367#~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12368#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12369
12370#~ msgid "Pull is not possible because you have unmerged files."
12371#~ msgstr "Pull 不可用,因为您尚有未合并的文件。"