]> git.ipfire.org Git - thirdparty/git.git/blame_incremental - po/zh_CN.po
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
[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: 2015-12-11 23:36+0800\n"
139"PO-Revision-Date: 2015-12-14 22:12+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:1225
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:1228
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:2535
213#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987
214#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99
215#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
216#: builtin/notes.c:558 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:77
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:479
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:265
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:61
273#, c-format
274msgid "Not setting branch %s as its own upstream."
275msgstr "未设置分支 %s 作为它自己的上游。"
276
277#: branch.c:84
278#, c-format
279msgid "Branch %s set up to track remote branch %s from %s by rebasing."
280msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
281
282#: branch.c:85
283#, c-format
284msgid "Branch %s set up to track remote branch %s from %s."
285msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
286
287#: branch.c:89
288#, c-format
289msgid "Branch %s set up to track local branch %s by rebasing."
290msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
291
292#: branch.c:90
293#, c-format
294msgid "Branch %s set up to track local branch %s."
295msgstr "分支 %s 设置为跟踪本地分支 %s。"
296
297#: branch.c:95
298#, c-format
299msgid "Branch %s set up to track remote ref %s by rebasing."
300msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
301
302#: branch.c:96
303#, c-format
304msgid "Branch %s set up to track remote ref %s."
305msgstr "分支 %s 设置为跟踪远程引用 %s。"
306
307#: branch.c:100
308#, c-format
309msgid "Branch %s set up to track local ref %s by rebasing."
310msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
311
312#: branch.c:101
313#, c-format
314msgid "Branch %s set up to track local ref %s."
315msgstr "分支 %s 设置为跟踪本地引用 %s。"
316
317#: branch.c:134
318#, c-format
319msgid "Not tracking: ambiguous information for ref %s"
320msgstr "未跟踪:引用 %s 有歧义"
321
322#: branch.c:163
323#, c-format
324msgid "'%s' is not a valid branch name."
325msgstr "'%s' 不是一个有效的分支名称。"
326
327#: branch.c:168
328#, c-format
329msgid "A branch named '%s' already exists."
330msgstr "一个分支名 '%s' 已经存在。"
331
332#: branch.c:176
333msgid "Cannot force update the current branch."
334msgstr "无法强制更新当前分支。"
335
336#: branch.c:196
337#, c-format
338msgid "Cannot setup tracking information; starting point '%s' is not a branch."
339msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
340
341#: branch.c:198
342#, c-format
343msgid "the requested upstream branch '%s' does not exist"
344msgstr "请求的上游分支 '%s' 不存在"
345
346#: branch.c:200
347msgid ""
348"\n"
349"If you are planning on basing your work on an upstream\n"
350"branch that already exists at the remote, you may need to\n"
351"run \"git fetch\" to retrieve it.\n"
352"\n"
353"If you are planning to push out a new local branch that\n"
354"will track its remote counterpart, you may want to use\n"
355"\"git push -u\" to set the upstream config as you push."
356msgstr ""
357"\n"
358"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
359"您可能需要执行 \"git fetch\" 来获取分支。\n"
360"\n"
361"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
362"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
363
364#: branch.c:244
365#, c-format
366msgid "Not a valid object name: '%s'."
367msgstr "不是一个有效的对象名:'%s'。"
368
369#: branch.c:264
370#, c-format
371msgid "Ambiguous object name: '%s'."
372msgstr "歧义的对象名:'%s'。"
373
374#: branch.c:269
375#, c-format
376msgid "Not a valid branch point: '%s'."
377msgstr "无效的分支点:'%s'。"
378
379#: branch.c:322
380#, c-format
381msgid "'%s' is already checked out at '%s'"
382msgstr "'%s' 已经检出到 '%s'"
383
384#: bundle.c:34
385#, c-format
386msgid "'%s' does not look like a v2 bundle file"
387msgstr "'%s' 不像是一个 v2 版本的包文件"
388
389#: bundle.c:61
390#, c-format
391msgid "unrecognized header: %s%s (%d)"
392msgstr "未能识别的包头:%s%s (%d)"
393
394#: bundle.c:87 builtin/commit.c:766
395#, c-format
396msgid "could not open '%s'"
397msgstr "不能打开 '%s'"
398
399#: bundle.c:139
400msgid "Repository lacks these prerequisite commits:"
401msgstr "仓库中缺少这些必备的提交:"
402
403#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
404#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
405#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
406#: builtin/shortlog.c:158
407msgid "revision walk setup failed"
408msgstr "版本遍历设置失败"
409
410#: bundle.c:185
411#, c-format
412msgid "The bundle contains this ref:"
413msgid_plural "The bundle contains these %d refs:"
414msgstr[0] "这个包中含有这个引用:"
415msgstr[1] "这个包中含有 %d 个引用:"
416
417#: bundle.c:192
418msgid "The bundle records a complete history."
419msgstr "这个包记录一个完整历史。"
420
421#: bundle.c:194
422#, c-format
423msgid "The bundle requires this ref:"
424msgid_plural "The bundle requires these %d refs:"
425msgstr[0] "这个包需要这个引用:"
426msgstr[1] "这个包需要 %d 个引用:"
427
428#: bundle.c:253
429msgid "Could not spawn pack-objects"
430msgstr "不能生成 pack-objects 进程"
431
432#: bundle.c:264
433msgid "pack-objects died"
434msgstr "pack-objects 终止"
435
436#: bundle.c:304
437msgid "rev-list died"
438msgstr "rev-list 终止"
439
440#: bundle.c:353
441#, c-format
442msgid "ref '%s' is excluded by the rev-list options"
443msgstr "引用 '%s' 被 rev-list 选项排除"
444
445#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
446#, c-format
447msgid "unrecognized argument: %s"
448msgstr "未能识别的参数:%s"
449
450#: bundle.c:449
451msgid "Refusing to create empty bundle."
452msgstr "不能创建空包。"
453
454#: bundle.c:459
455#, c-format
456msgid "cannot create '%s'"
457msgstr "不能创建 '%s'"
458
459#: bundle.c:480
460msgid "index-pack died"
461msgstr "index-pack 终止"
462
463#: color.c:275
464#, c-format
465msgid "invalid color value: %.*s"
466msgstr "无效的颜色值:%.*s"
467
468#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520
469#: builtin/am.c:2149
470#, c-format
471msgid "could not parse %s"
472msgstr "不能解析 %s"
473
474#: commit.c:42
475#, c-format
476msgid "%s %s is not a commit!"
477msgstr "%s %s 不是一个提交!"
478
479#: compat/obstack.c:406 compat/obstack.c:408
480msgid "memory exhausted"
481msgstr "内存耗尽"
482
483#: config.c:474 config.c:476
484#, c-format
485msgid "bad config file line %d in %s"
486msgstr "配置文件 %2$s 出错于第 %1$d 行"
487
488#: config.c:592
489#, c-format
490msgid "bad numeric config value '%s' for '%s' in %s: %s"
491msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
492
493#: config.c:594
494#, c-format
495msgid "bad numeric config value '%s' for '%s': %s"
496msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
497
498#: config.c:679
499#, c-format
500msgid "failed to expand user dir in: '%s'"
501msgstr "无法扩展 '%s' 中的用户目录"
502
503#: config.c:757 config.c:768
504#, c-format
505msgid "bad zlib compression level %d"
506msgstr "错误的 zlib 压缩级别 %d"
507
508#: config.c:890
509#, c-format
510msgid "invalid mode for object creation: %s"
511msgstr "无效的对象创建模式:%s"
512
513#: config.c:1216
514msgid "unable to parse command-line config"
515msgstr "无法解析命令行中的配置"
516
517#: config.c:1277
518msgid "unknown error occured while reading the configuration files"
519msgstr "在读取配置文件时遇到未知错误"
520
521#: config.c:1601
522#, c-format
523msgid "unable to parse '%s' from command-line config"
524msgstr "无法解析命令行配置中的 '%s'"
525
526#: config.c:1603
527#, c-format
528msgid "bad config variable '%s' in file '%s' at line %d"
529msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
530
531#: config.c:1662
532#, c-format
533msgid "%s has multiple values"
534msgstr "%s 有多个取值"
535
536#: connected.c:69
537msgid "Could not run 'git rev-list'"
538msgstr "不能执行 'git rev-list'"
539
540#: connected.c:89
541#, c-format
542msgid "failed write to rev-list: %s"
543msgstr "无法写入 rev-list:%s"
544
545#: connected.c:97
546#, c-format
547msgid "failed to close rev-list's stdin: %s"
548msgstr "无法关闭 rev-list 的标准输入:%s"
549
550#: date.c:95
551msgid "in the future"
552msgstr "在将来"
553
554#: date.c:101
555#, c-format
556msgid "%lu second ago"
557msgid_plural "%lu seconds ago"
558msgstr[0] "%lu 秒钟前"
559msgstr[1] "%lu 秒钟前"
560
561#: date.c:108
562#, c-format
563msgid "%lu minute ago"
564msgid_plural "%lu minutes ago"
565msgstr[0] "%lu 分钟前"
566msgstr[1] "%lu 分钟前"
567
568#: date.c:115
569#, c-format
570msgid "%lu hour ago"
571msgid_plural "%lu hours ago"
572msgstr[0] "%lu 小时前"
573msgstr[1] "%lu 小时前"
574
575#: date.c:122
576#, c-format
577msgid "%lu day ago"
578msgid_plural "%lu days ago"
579msgstr[0] "%lu 天前"
580msgstr[1] "%lu 天前"
581
582#: date.c:128
583#, c-format
584msgid "%lu week ago"
585msgid_plural "%lu weeks ago"
586msgstr[0] "%lu 周前"
587msgstr[1] "%lu 周前"
588
589#: date.c:135
590#, c-format
591msgid "%lu month ago"
592msgid_plural "%lu months ago"
593msgstr[0] "%lu 个月前"
594msgstr[1] "%lu 个月前"
595
596#: date.c:146
597#, c-format
598msgid "%lu year"
599msgid_plural "%lu years"
600msgstr[0] "%lu 年"
601msgstr[1] "%lu 年"
602
603#. TRANSLATORS: "%s" is "<n> years"
604#: date.c:149
605#, c-format
606msgid "%s, %lu month ago"
607msgid_plural "%s, %lu months ago"
608msgstr[0] "%s %lu 个月前"
609msgstr[1] "%s %lu 个月前"
610
611#: date.c:154 date.c:159
612#, c-format
613msgid "%lu year ago"
614msgid_plural "%lu years ago"
615msgstr[0] "%lu 年前"
616msgstr[1] "%lu 年前"
617
618#: diffcore-order.c:24
619#, c-format
620msgid "failed to read orderfile '%s'"
621msgstr "无法读取排序文件 '%s'"
622
623#: diffcore-rename.c:536
624msgid "Performing inexact rename detection"
625msgstr "正在进行非精确的重命名检测"
626
627# 译者:注意保持前导空格
628#: diff.c:115
629#, c-format
630msgid " Failed to parse dirstat cut-off percentage '%s'\n"
631msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
632
633# 译者:注意保持前导空格
634#: diff.c:120
635#, c-format
636msgid " Unknown dirstat parameter '%s'\n"
637msgstr " 未知的 dirstat 参数 '%s'\n"
638
639#: diff.c:215
640#, c-format
641msgid "Unknown value for 'diff.submodule' config variable: '%s'"
642msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
643
644#: diff.c:267
645#, c-format
646msgid ""
647"Found errors in 'diff.dirstat' config variable:\n"
648"%s"
649msgstr ""
650"发现配置变量 'diff.dirstat' 中的错误:\n"
651"%s"
652
653#: diff.c:3000
654#, c-format
655msgid "external diff died, stopping at %s"
656msgstr "外部 diff 退出,停止在 %s"
657
658#: diff.c:3396
659msgid "--follow requires exactly one pathspec"
660msgstr "--follow 参数后只跟一个 pathspec"
661
662#: diff.c:3559
663#, c-format
664msgid ""
665"Failed to parse --dirstat/-X option parameter:\n"
666"%s"
667msgstr ""
668"无法解析 --dirstat/-X 选项的参数:\n"
669"%s"
670
671#: diff.c:3573
672#, c-format
673msgid "Failed to parse --submodule option parameter: '%s'"
674msgstr "无法解析 --submodule 选项的参数:'%s'"
675
676#: dir.c:1915
677msgid "failed to get kernel name and information"
678msgstr "无法获得内核名称和信息"
679
680#: dir.c:1998
681msgid "Untracked cache is disabled on this system."
682msgstr "缓存未跟踪文件在本系统被禁用"
683
684#: gpg-interface.c:166 gpg-interface.c:237
685msgid "could not run gpg."
686msgstr "不能执行 gpg。"
687
688#: gpg-interface.c:178
689msgid "gpg did not accept the data"
690msgstr "gpg 没有接受数据"
691
692#: gpg-interface.c:189
693msgid "gpg failed to sign the data"
694msgstr "gpg 无法为数据签名"
695
696#: gpg-interface.c:222
697#, c-format
698msgid "could not create temporary file '%s': %s"
699msgstr "不能创建临时文件 '%s':%s"
700
701#: gpg-interface.c:225
702#, c-format
703msgid "failed writing detached signature to '%s': %s"
704msgstr "无法将分离式签名写入 '%s':%s"
705
706#: grep.c:1718
707#, c-format
708msgid "'%s': unable to read %s"
709msgstr "'%s':无法读取 %s"
710
711#: grep.c:1735
712#, c-format
713msgid "'%s': %s"
714msgstr "'%s':%s"
715
716#: grep.c:1746
717#, c-format
718msgid "'%s': short read %s"
719msgstr "'%s':读取不完整 %s"
720
721#: help.c:207
722#, c-format
723msgid "available git commands in '%s'"
724msgstr "在 '%s' 下可用的 git 命令"
725
726#: help.c:214
727msgid "git commands available from elsewhere on your $PATH"
728msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
729
730#: help.c:246
731msgid "These are common Git commands used in various situations:"
732msgstr "这些是各种场合常见的 Git 命令:"
733
734#: help.c:311
735#, c-format
736msgid ""
737"'%s' appears to be a git command, but we were not\n"
738"able to execute it. Maybe git-%s is broken?"
739msgstr ""
740"'%s' 像是一个 git 命令,但却无法运行。\n"
741"可能是 git-%s 受损?"
742
743#: help.c:368
744msgid "Uh oh. Your system reports no Git commands at all."
745msgstr "唉呀,您的系统中未发现 Git 命令。"
746
747#: help.c:390
748#, c-format
749msgid ""
750"WARNING: You called a Git command named '%s', which does not exist.\n"
751"Continuing under the assumption that you meant '%s'"
752msgstr ""
753"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
754"是 '%s'"
755
756#: help.c:395
757#, c-format
758msgid "in %0.1f seconds automatically..."
759msgstr "在 %0.1f 秒钟后自动运行..."
760
761#: help.c:402
762#, c-format
763msgid "git: '%s' is not a git command. See 'git --help'."
764msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
765
766#: help.c:406 help.c:466
767msgid ""
768"\n"
769"Did you mean this?"
770msgid_plural ""
771"\n"
772"Did you mean one of these?"
773msgstr[0] ""
774"\n"
775"您指的是这个么?"
776msgstr[1] ""
777"\n"
778"您指的是这其中的某一个么?"
779
780#: help.c:462
781#, c-format
782msgid "%s: %s - %s"
783msgstr "%s:%s - %s"
784
785#: merge.c:41
786msgid "failed to read the cache"
787msgstr "无法读取缓存"
788
789#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376
790#: builtin/checkout.c:587 builtin/clone.c:722
791msgid "unable to write new index file"
792msgstr "无法写新的索引文件"
793
794#: merge-recursive.c:189
795#, c-format
796msgid "(bad commit)\n"
797msgstr "(坏提交)\n"
798
799#: merge-recursive.c:209
800#, c-format
801msgid "addinfo_cache failed for path '%s'"
802msgstr "为路径 '%s' addinfo_cache 失败"
803
804#: merge-recursive.c:270
805msgid "error building trees"
806msgstr "无法创建树"
807
808#: merge-recursive.c:686
809#, c-format
810msgid "failed to create path '%s'%s"
811msgstr "无法创建路径 '%s'%s"
812
813#: merge-recursive.c:697
814#, c-format
815msgid "Removing %s to make room for subdirectory\n"
816msgstr "删除 %s 以便为子目录留出空间\n"
817
818#: merge-recursive.c:711 merge-recursive.c:732
819msgid ": perhaps a D/F conflict?"
820msgstr ":可能是一个目录/文件冲突?"
821
822#: merge-recursive.c:722
823#, c-format
824msgid "refusing to lose untracked file at '%s'"
825msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
826
827#: merge-recursive.c:762
828#, c-format
829msgid "cannot read object %s '%s'"
830msgstr "不能读取对象 %s '%s'"
831
832#: merge-recursive.c:764
833#, c-format
834msgid "blob expected for %s '%s'"
835msgstr "%s '%s' 应为数据对象"
836
837#: merge-recursive.c:787 builtin/clone.c:369
838#, c-format
839msgid "failed to open '%s'"
840msgstr "无法打开 '%s'"
841
842#: merge-recursive.c:795
843#, c-format
844msgid "failed to symlink '%s'"
845msgstr "无法创建符号链接 '%s'"
846
847#: merge-recursive.c:798
848#, c-format
849msgid "do not know what to do with %06o %s '%s'"
850msgstr "不知道如何处理 %06o %s '%s'"
851
852#: merge-recursive.c:936
853msgid "Failed to execute internal merge"
854msgstr "无法执行内部合并"
855
856#: merge-recursive.c:940
857#, c-format
858msgid "Unable to add %s to database"
859msgstr "不能添加 %s 至对象库"
860
861#: merge-recursive.c:956
862msgid "unsupported object type in the tree"
863msgstr "在树中有不支持的对象类型"
864
865#: merge-recursive.c:1031 merge-recursive.c:1045
866#, c-format
867msgid ""
868"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
869"in tree."
870msgstr ""
871"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
872"的版本被保留。"
873
874#: merge-recursive.c:1037 merge-recursive.c:1050
875#, c-format
876msgid ""
877"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
878"in tree at %s."
879msgstr ""
880"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
881"的版本保留于 %8$s 中。"
882
883#: merge-recursive.c:1091
884msgid "rename"
885msgstr "重命名"
886
887#: merge-recursive.c:1091
888msgid "renamed"
889msgstr "重命名"
890
891#: merge-recursive.c:1147
892#, c-format
893msgid "%s is a directory in %s adding as %s instead"
894msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
895
896#: merge-recursive.c:1169
897#, c-format
898msgid ""
899"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
900"\"->\"%s\" in \"%s\"%s"
901msgstr ""
902"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
903"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
904
905#: merge-recursive.c:1174
906msgid " (left unresolved)"
907msgstr "(留下未解决)"
908
909#: merge-recursive.c:1228
910#, c-format
911msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
912msgstr ""
913"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
914"%5$s"
915
916#: merge-recursive.c:1258
917#, c-format
918msgid "Renaming %s to %s and %s to %s instead"
919msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
920
921#: merge-recursive.c:1457
922#, c-format
923msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
924msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
925
926#: merge-recursive.c:1467
927#, c-format
928msgid "Adding merged %s"
929msgstr "添加合并后的 %s"
930
931#: merge-recursive.c:1472 merge-recursive.c:1674
932#, c-format
933msgid "Adding as %s instead"
934msgstr "而是以 %s 为名添加"
935
936#: merge-recursive.c:1523
937#, c-format
938msgid "cannot read object %s"
939msgstr "不能读取对象 %s"
940
941#: merge-recursive.c:1526
942#, c-format
943msgid "object %s is not a blob"
944msgstr "对象 %s 不是一个数据对象"
945
946#: merge-recursive.c:1578
947msgid "modify"
948msgstr "修改"
949
950#: merge-recursive.c:1578
951msgid "modified"
952msgstr "修改"
953
954#: merge-recursive.c:1588
955msgid "content"
956msgstr "内容"
957
958#: merge-recursive.c:1595
959msgid "add/add"
960msgstr "添加/添加"
961
962#: merge-recursive.c:1629
963#, c-format
964msgid "Skipped %s (merged same as existing)"
965msgstr "略过 %s(已经做过相同合并)"
966
967#: merge-recursive.c:1643
968#, c-format
969msgid "Auto-merging %s"
970msgstr "自动合并 %s"
971
972#: merge-recursive.c:1647 git-submodule.sh:1025
973msgid "submodule"
974msgstr "子模组"
975
976#: merge-recursive.c:1648
977#, c-format
978msgid "CONFLICT (%s): Merge conflict in %s"
979msgstr "冲突(%s):合并冲突于 %s"
980
981#: merge-recursive.c:1734
982#, c-format
983msgid "Removing %s"
984msgstr "删除 %s"
985
986#: merge-recursive.c:1759
987msgid "file/directory"
988msgstr "文件/目录"
989
990#: merge-recursive.c:1765
991msgid "directory/file"
992msgstr "目录/文件"
993
994#: merge-recursive.c:1770
995#, c-format
996msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
997msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
998
999#: merge-recursive.c:1780
1000#, c-format
1001msgid "Adding %s"
1002msgstr "添加 %s"
1003
1004#: merge-recursive.c:1797
1005msgid "Fatal merge failure, shouldn't happen."
1006msgstr "严重的合并错误,不应发生。"
1007
1008#: merge-recursive.c:1816
1009msgid "Already up-to-date!"
1010msgstr "已经是最新的!"
1011
1012#: merge-recursive.c:1825
1013#, c-format
1014msgid "merging of trees %s and %s failed"
1015msgstr "无法合并树 %s 和 %s"
1016
1017#: merge-recursive.c:1855
1018#, c-format
1019msgid "Unprocessed path??? %s"
1020msgstr "未处理的路径??? %s"
1021
1022#: merge-recursive.c:1903
1023msgid "Merging:"
1024msgstr "合并:"
1025
1026#: merge-recursive.c:1916
1027#, c-format
1028msgid "found %u common ancestor:"
1029msgid_plural "found %u common ancestors:"
1030msgstr[0] "发现 %u 个共同祖先:"
1031msgstr[1] "发现 %u 个共同祖先:"
1032
1033#: merge-recursive.c:1953
1034msgid "merge returned no commit"
1035msgstr "合并未返回提交"
1036
1037#: merge-recursive.c:2010
1038#, c-format
1039msgid "Could not parse object '%s'"
1040msgstr "不能解析对象 '%s'"
1041
1042#: merge-recursive.c:2021 builtin/merge.c:645
1043msgid "Unable to write index."
1044msgstr "不能写入索引。"
1045
1046#: notes-utils.c:41
1047msgid "Cannot commit uninitialized/unreferenced notes tree"
1048msgstr "不能提交未初始化/未引用的注解树"
1049
1050#: notes-utils.c:100
1051#, c-format
1052msgid "Bad notes.rewriteMode value: '%s'"
1053msgstr "坏的 notes.rewriteMode 值:'%s'"
1054
1055#: notes-utils.c:110
1056#, c-format
1057msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1058msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1059
1060#. TRANSLATORS: The first %s is the name of the
1061#. environment variable, the second %s is its value
1062#: notes-utils.c:137
1063#, c-format
1064msgid "Bad %s value: '%s'"
1065msgstr "坏的 %s 值:'%s'"
1066
1067#: object.c:242
1068#, c-format
1069msgid "unable to parse object: %s"
1070msgstr "不能解析对象:%s"
1071
1072#: parse-options.c:570
1073msgid "..."
1074msgstr "..."
1075
1076#: parse-options.c:588
1077#, c-format
1078msgid "usage: %s"
1079msgstr "用法:%s"
1080
1081#. TRANSLATORS: the colon here should align with the
1082#. one in "usage: %s" translation
1083#: parse-options.c:592
1084#, c-format
1085msgid " or: %s"
1086msgstr " 或:%s"
1087
1088# 译者:为保证在输出中对齐,注意调整句中空格!
1089#: parse-options.c:595
1090#, c-format
1091msgid " %s"
1092msgstr " %s"
1093
1094#: parse-options.c:629
1095msgid "-NUM"
1096msgstr "-数字"
1097
1098#: parse-options-cb.c:108
1099#, c-format
1100msgid "malformed object name '%s'"
1101msgstr "非法的对象名 '%s'"
1102
1103#: path.c:752
1104#, c-format
1105msgid "Could not make %s writable by group"
1106msgstr "不能设置 %s 为组可写"
1107
1108#: pathspec.c:133
1109msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1110msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1111
1112#: pathspec.c:143
1113msgid ""
1114"global 'literal' pathspec setting is incompatible with all other global "
1115"pathspec settings"
1116msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1117
1118#: pathspec.c:177
1119msgid "invalid parameter for pathspec magic 'prefix'"
1120msgstr "路径规格包含无效的神奇前缀"
1121
1122#: pathspec.c:183
1123#, c-format
1124msgid "Invalid pathspec magic '%.*s' in '%s'"
1125msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1126
1127#: pathspec.c:187
1128#, c-format
1129msgid "Missing ')' at the end of pathspec magic in '%s'"
1130msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1131
1132#: pathspec.c:205
1133#, c-format
1134msgid "Unimplemented pathspec magic '%c' in '%s'"
1135msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1136
1137#: pathspec.c:230
1138#, c-format
1139msgid "%s: 'literal' and 'glob' are incompatible"
1140msgstr "%s:'literal' 和 'glob' 不兼容"
1141
1142#: pathspec.c:241
1143#, c-format
1144msgid "%s: '%s' is outside repository"
1145msgstr "%s:'%s' 在仓库之外"
1146
1147#: pathspec.c:291
1148#, c-format
1149msgid "Pathspec '%s' is in submodule '%.*s'"
1150msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1151
1152#: pathspec.c:353
1153#, c-format
1154msgid "%s: pathspec magic not supported by this command: %s"
1155msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1156
1157#: pathspec.c:432
1158#, c-format
1159msgid "pathspec '%s' is beyond a symbolic link"
1160msgstr "路径规格 '%s' 位于符号链接中"
1161
1162#: pathspec.c:441
1163msgid ""
1164"There is nothing to exclude from by :(exclude) patterns.\n"
1165"Perhaps you forgot to add either ':/' or '.' ?"
1166msgstr ""
1167"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1168"添加 ':/' 或 '.' ?"
1169
1170#: pretty.c:969
1171msgid "unable to parse --pretty format"
1172msgstr "不能解析 --pretty 格式"
1173
1174#: progress.c:235
1175msgid "done"
1176msgstr "完成"
1177
1178#: read-cache.c:1281
1179#, c-format
1180msgid ""
1181"index.version set, but the value is invalid.\n"
1182"Using version %i"
1183msgstr ""
1184"设置了 index.version,但是取值无效。\n"
1185"使用版本 %i"
1186
1187#: read-cache.c:1291
1188#, c-format
1189msgid ""
1190"GIT_INDEX_VERSION set, but the value is invalid.\n"
1191"Using version %i"
1192msgstr ""
1193"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1194"使用版本 %i"
1195
1196#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1197#: builtin/merge.c:983
1198#, c-format
1199msgid "Could not open '%s' for writing"
1200msgstr "无法打开 '%s' 进行写入"
1201
1202#: refs/files-backend.c:2359
1203#, c-format
1204msgid "could not delete reference %s: %s"
1205msgstr "无法删除引用 %s:%s"
1206
1207#: refs/files-backend.c:2362
1208#, c-format
1209msgid "could not delete references: %s"
1210msgstr "无法删除引用:%s"
1211
1212#: refs/files-backend.c:2371
1213#, c-format
1214msgid "could not remove reference %s"
1215msgstr "无法删除引用 %s"
1216
1217#: ref-filter.c:245
1218#, c-format
1219msgid "format: %%(end) atom used without corresponding atom"
1220msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1221
1222#: ref-filter.c:704
1223#, c-format
1224msgid "positive value expected contents:lines=%s"
1225msgstr "要为 contents:lines=%s 提供一个正数"
1226
1227#: ref-filter.c:833
1228#, c-format
1229msgid "expected format: %%(color:<color>)"
1230msgstr "期望的格式:%%(color:<color>)"
1231
1232#: ref-filter.c:835
1233msgid "unable to parse format"
1234msgstr "不能解析格式"
1235
1236#: ref-filter.c:870
1237#, c-format
1238msgid "expected format: %%(align:<width>,<position>)"
1239msgstr "期望的格式:%%(align:<width>,<position>)"
1240
1241#: ref-filter.c:893
1242#, c-format
1243msgid "improper format entered align:%s"
1244msgstr "输入了不正确的格式 align:%s"
1245
1246#: ref-filter.c:898
1247#, c-format
1248msgid "positive width expected with the %%(align) atom"
1249msgstr "元素 %%(align) 需要一个正数的宽度"
1250
1251#: ref-filter.c:1219
1252#, c-format
1253msgid "malformed object at '%s'"
1254msgstr "非法的对象于 '%s'"
1255
1256#: ref-filter.c:1561
1257#, c-format
1258msgid "format: %%(end) atom missing"
1259msgstr "格式:缺少 %%(end) 元素"
1260
1261#: ref-filter.c:1615
1262#, c-format
1263msgid "malformed object name %s"
1264msgstr "非法的对象名 %s"
1265
1266#: remote.c:756
1267#, c-format
1268msgid "Cannot fetch both %s and %s to %s"
1269msgstr "不能同时获取 %s 和 %s 至 %s"
1270
1271#: remote.c:760
1272#, c-format
1273msgid "%s usually tracks %s, not %s"
1274msgstr "%s 通常跟踪 %s,而非 %s"
1275
1276#: remote.c:764
1277#, c-format
1278msgid "%s tracks both %s and %s"
1279msgstr "%s 同时跟踪 %s 和 %s"
1280
1281#: remote.c:772
1282msgid "Internal error"
1283msgstr "内部错误"
1284
1285#: remote.c:1687 remote.c:1730
1286msgid "HEAD does not point to a branch"
1287msgstr "HEAD 没有指向一个分支"
1288
1289#: remote.c:1696
1290#, c-format
1291msgid "no such branch: '%s'"
1292msgstr "没有此分支:'%s'"
1293
1294#: remote.c:1699
1295#, c-format
1296msgid "no upstream configured for branch '%s'"
1297msgstr "尚未给分支 '%s' 设置上游"
1298
1299#: remote.c:1705
1300#, c-format
1301msgid "upstream branch '%s' not stored as a remote-tracking branch"
1302msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1303
1304#: remote.c:1720
1305#, c-format
1306msgid "push destination '%s' on remote '%s' has no local tracking branch"
1307msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1308
1309#: remote.c:1735
1310#, c-format
1311msgid "branch '%s' has no remote for pushing"
1312msgstr "分支 '%s' 没有设置要推送的远程服务器"
1313
1314#: remote.c:1746
1315#, c-format
1316msgid "push refspecs for '%s' do not include '%s'"
1317msgstr "向 '%s' 推送引用规格未包含 '%s'"
1318
1319#: remote.c:1759
1320msgid "push has no destination (push.default is 'nothing')"
1321msgstr "推送无目标(push.default 是 'nothing')"
1322
1323#: remote.c:1781
1324msgid "cannot resolve 'simple' push to a single destination"
1325msgstr "无法解析 'simple' 推送至一个单独的目标"
1326
1327#: remote.c:2083
1328#, c-format
1329msgid "Your branch is based on '%s', but the upstream is gone.\n"
1330msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1331
1332#: remote.c:2087
1333msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1334msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1335
1336#: remote.c:2090
1337#, c-format
1338msgid "Your branch is up-to-date with '%s'.\n"
1339msgstr "您的分支与上游分支 '%s' 一致。\n"
1340
1341#: remote.c:2094
1342#, c-format
1343msgid "Your branch is ahead of '%s' by %d commit.\n"
1344msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1345msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1346msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1347
1348#: remote.c:2100
1349msgid " (use \"git push\" to publish your local commits)\n"
1350msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1351
1352#: remote.c:2103
1353#, c-format
1354msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1355msgid_plural ""
1356"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1357msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1358msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1359
1360# 译者:注意保持前导空格
1361#: remote.c:2111
1362msgid " (use \"git pull\" to update your local branch)\n"
1363msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1364
1365#: remote.c:2114
1366#, c-format
1367msgid ""
1368"Your branch and '%s' have diverged,\n"
1369"and have %d and %d different commit each, respectively.\n"
1370msgid_plural ""
1371"Your branch and '%s' have diverged,\n"
1372"and have %d and %d different commits each, respectively.\n"
1373msgstr[0] ""
1374"您的分支和 '%s' 出现了偏离,\n"
1375"并且分别有 %d 和 %d 处不同的提交。\n"
1376msgstr[1] ""
1377"您的分支和 '%s' 出现了偏离,\n"
1378"并且分别有 %d 和 %d 处不同的提交。\n"
1379
1380# 译者:注意保持前导空格
1381#: remote.c:2124
1382msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1383msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1384
1385#: revision.c:2191
1386msgid "your current branch appears to be broken"
1387msgstr "您的当前分支好像被损坏"
1388
1389#: revision.c:2194
1390#, c-format
1391msgid "your current branch '%s' does not have any commits yet"
1392msgstr "您的当前分支 '%s' 尚无任何提交"
1393
1394#: revision.c:2388
1395msgid "--first-parent is incompatible with --bisect"
1396msgstr "--first-parent 与 --bisect 不兼容"
1397
1398#: run-command.c:90
1399msgid "open /dev/null failed"
1400msgstr "不能打开 /dev/null"
1401
1402#: run-command.c:92
1403#, c-format
1404msgid "dup2(%d,%d) failed"
1405msgstr "不能调用 dup2(%d,%d)"
1406
1407#: send-pack.c:295
1408msgid "failed to sign the push certificate"
1409msgstr "无法为推送证书签名"
1410
1411#: send-pack.c:404
1412msgid "the receiving end does not support --signed push"
1413msgstr "接收端不支持签名推送"
1414
1415#: send-pack.c:406
1416msgid ""
1417"not sending a push certificate since the receiving end does not support --"
1418"signed push"
1419msgstr "未发送推送证书,因为接收端不支持签名推送"
1420
1421#: send-pack.c:418
1422msgid "the receiving end does not support --atomic push"
1423msgstr "接收端不支持原子推送"
1424
1425#: sequencer.c:183
1426msgid ""
1427"after resolving the conflicts, mark the corrected paths\n"
1428"with 'git add <paths>' or 'git rm <paths>'"
1429msgstr ""
1430"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1431"命令标记修正后的文件"
1432
1433#: sequencer.c:186
1434msgid ""
1435"after resolving the conflicts, mark the corrected paths\n"
1436"with 'git add <paths>' or 'git rm <paths>'\n"
1437"and commit the result with 'git commit'"
1438msgstr ""
1439"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1440"对修正后的文件做标记,然后用 'git commit' 提交"
1441
1442#: sequencer.c:199 sequencer.c:842 sequencer.c:922
1443#, c-format
1444msgid "Could not write to %s"
1445msgstr "不能写入 %s"
1446
1447#: sequencer.c:202
1448#, c-format
1449msgid "Error wrapping up %s"
1450msgstr "错误收尾 %s"
1451
1452#: sequencer.c:217
1453msgid "Your local changes would be overwritten by cherry-pick."
1454msgstr "您的本地修改将被拣选操作覆盖。"
1455
1456#: sequencer.c:219
1457msgid "Your local changes would be overwritten by revert."
1458msgstr "您的本地修改将被还原操作覆盖。"
1459
1460#: sequencer.c:222
1461msgid "Commit your changes or stash them to proceed."
1462msgstr "提交您的修改或保存进度后再继续。"
1463
1464#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1465#: sequencer.c:309
1466#, c-format
1467msgid "%s: Unable to write new index file"
1468msgstr "%s:无法写入新索引文件"
1469
1470#: sequencer.c:327
1471msgid "Could not resolve HEAD commit\n"
1472msgstr "不能解析 HEAD 提交\n"
1473
1474#: sequencer.c:347
1475msgid "Unable to update cache tree\n"
1476msgstr "不能更新缓存\n"
1477
1478#: sequencer.c:399
1479#, c-format
1480msgid "Could not parse commit %s\n"
1481msgstr "不能解析提交 %s\n"
1482
1483#: sequencer.c:404
1484#, c-format
1485msgid "Could not parse parent commit %s\n"
1486msgstr "不能解析父提交 %s\n"
1487
1488#: sequencer.c:469
1489msgid "Your index file is unmerged."
1490msgstr "您的索引文件未完成合并。"
1491
1492#: sequencer.c:488
1493#, c-format
1494msgid "Commit %s is a merge but no -m option was given."
1495msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1496
1497#: sequencer.c:496
1498#, c-format
1499msgid "Commit %s does not have parent %d"
1500msgstr "提交 %s 没有父提交 %d"
1501
1502#: sequencer.c:500
1503#, c-format
1504msgid "Mainline was specified but commit %s is not a merge."
1505msgstr "指定了主线但提交 %s 不是一个合并。"
1506
1507#. TRANSLATORS: The first %s will be "revert" or
1508#. "cherry-pick", the second %s a SHA1
1509#: sequencer.c:513
1510#, c-format
1511msgid "%s: cannot parse parent commit %s"
1512msgstr "%s:不能解析父提交 %s"
1513
1514#: sequencer.c:517
1515#, c-format
1516msgid "Cannot get commit message for %s"
1517msgstr "不能得到 %s 的提交说明"
1518
1519#: sequencer.c:603
1520#, c-format
1521msgid "could not revert %s... %s"
1522msgstr "不能还原 %s... %s"
1523
1524#: sequencer.c:604
1525#, c-format
1526msgid "could not apply %s... %s"
1527msgstr "不能应用 %s... %s"
1528
1529#: sequencer.c:639
1530msgid "empty commit set passed"
1531msgstr "提供了空的提交集"
1532
1533#: sequencer.c:647
1534#, c-format
1535msgid "git %s: failed to read the index"
1536msgstr "git %s:无法读取索引"
1537
1538#: sequencer.c:651
1539#, c-format
1540msgid "git %s: failed to refresh the index"
1541msgstr "git %s:无法刷新索引"
1542
1543#: sequencer.c:711
1544#, c-format
1545msgid "Cannot %s during a %s"
1546msgstr "无法 %s 在一个 %s 过程中"
1547
1548#: sequencer.c:733
1549#, c-format
1550msgid "Could not parse line %d."
1551msgstr "不能解析第 %d 行。"
1552
1553#: sequencer.c:738
1554msgid "No commits parsed."
1555msgstr "没有提交被解析。"
1556
1557#: sequencer.c:750
1558#, c-format
1559msgid "Could not open %s"
1560msgstr "不能打开 %s"
1561
1562#: sequencer.c:754
1563#, c-format
1564msgid "Could not read %s."
1565msgstr "不能读取 %s。"
1566
1567#: sequencer.c:761
1568#, c-format
1569msgid "Unusable instruction sheet: %s"
1570msgstr "无用的指令表单:%s"
1571
1572#: sequencer.c:791
1573#, c-format
1574msgid "Invalid key: %s"
1575msgstr "无效键名:%s"
1576
1577#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
1578#, c-format
1579msgid "Invalid value for %s: %s"
1580msgstr "%s 的值无效:%s"
1581
1582#: sequencer.c:804
1583#, c-format
1584msgid "Malformed options sheet: %s"
1585msgstr "非法的选项表单:%s"
1586
1587#: sequencer.c:823
1588msgid "a cherry-pick or revert is already in progress"
1589msgstr "一个拣选或还原操作已在进行"
1590
1591#: sequencer.c:824
1592msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1593msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1594
1595#: sequencer.c:828
1596#, c-format
1597msgid "Could not create sequencer directory %s"
1598msgstr "不能创建序列目录 %s"
1599
1600#: sequencer.c:844 sequencer.c:926
1601#, c-format
1602msgid "Error wrapping up %s."
1603msgstr "错误收尾 %s。"
1604
1605#: sequencer.c:863 sequencer.c:996
1606msgid "no cherry-pick or revert in progress"
1607msgstr "拣选或还原操作并未进行"
1608
1609#: sequencer.c:865
1610msgid "cannot resolve HEAD"
1611msgstr "不能解析 HEAD"
1612
1613#: sequencer.c:867
1614msgid "cannot abort from a branch yet to be born"
1615msgstr "不能从尚未建立的分支终止"
1616
1617#: sequencer.c:887 builtin/apply.c:4287
1618#, c-format
1619msgid "cannot open %s: %s"
1620msgstr "不能打开 %s:%s"
1621
1622#: sequencer.c:890
1623#, c-format
1624msgid "cannot read %s: %s"
1625msgstr "不能读取 %s:%s"
1626
1627#: sequencer.c:891
1628msgid "unexpected end of file"
1629msgstr "意外的文件结束"
1630
1631#: sequencer.c:897
1632#, c-format
1633msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1634msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1635
1636#: sequencer.c:919
1637#, c-format
1638msgid "Could not format %s."
1639msgstr "不能格式化 %s。"
1640
1641#: sequencer.c:1064
1642#, c-format
1643msgid "%s: can't cherry-pick a %s"
1644msgstr "%s:不能拣选一个%s"
1645
1646#: sequencer.c:1067
1647#, c-format
1648msgid "%s: bad revision"
1649msgstr "%s:错误的版本"
1650
1651#: sequencer.c:1101
1652msgid "Can't revert as initial commit"
1653msgstr "不能作为初始提交还原"
1654
1655#: sequencer.c:1102
1656msgid "Can't cherry-pick into empty head"
1657msgstr "不能拣选到空分支"
1658
1659#: setup.c:248
1660#, c-format
1661msgid "failed to read %s"
1662msgstr "无法读取 %s"
1663
1664#: sha1_name.c:463
1665msgid ""
1666"Git normally never creates a ref that ends with 40 hex characters\n"
1667"because it will be ignored when you just specify 40-hex. These refs\n"
1668"may be created by mistake. For example,\n"
1669"\n"
1670" git checkout -b $br $(git rev-parse ...)\n"
1671"\n"
1672"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1673"examine these refs and maybe delete them. Turn this message off by\n"
1674"running \"git config advice.objectNameWarning false\""
1675msgstr ""
1676"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1677"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1678"\n"
1679" git checkout -b $br $(git rev-parse ...)\n"
1680"\n"
1681"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1682"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1683"命令关闭本消息通知。"
1684
1685#: submodule.c:61 submodule.c:95
1686msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1687msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1688
1689#: submodule.c:65 submodule.c:99
1690#, c-format
1691msgid "Could not find section in .gitmodules where path=%s"
1692msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1693
1694#: submodule.c:73
1695#, c-format
1696msgid "Could not update .gitmodules entry %s"
1697msgstr "不能更新 .gitmodules 条目 %s"
1698
1699#: submodule.c:106
1700#, c-format
1701msgid "Could not remove .gitmodules entry for %s"
1702msgstr "无法移除 %s 的 .gitmodules 条目"
1703
1704#: submodule.c:117
1705msgid "staging updated .gitmodules failed"
1706msgstr "将更新后 .gitmodules 添加暂存区失败"
1707
1708#: submodule.c:1040
1709#, c-format
1710msgid "Could not set core.worktree in %s"
1711msgstr "不能在 %s 中设置 core.worktree"
1712
1713#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1714#: trailer.c:561
1715#, c-format
1716msgid "unknown value '%s' for key '%s'"
1717msgstr "键 '%2$s' 的未知取值 '%1$s'"
1718
1719#: trailer.c:543 trailer.c:548 builtin/remote.c:296
1720#, c-format
1721msgid "more than one %s"
1722msgstr "多于一个 %s"
1723
1724#: trailer.c:581
1725#, c-format
1726msgid "empty trailer token in trailer '%.*s'"
1727msgstr "签名 '%.*s' 的键为空"
1728
1729#: trailer.c:701
1730#, c-format
1731msgid "could not read input file '%s'"
1732msgstr "不能读取输入文件 '%s'"
1733
1734#: trailer.c:704
1735msgid "could not read from stdin"
1736msgstr "不能自标准输入读取"
1737
1738#: transport-helper.c:1025
1739#, c-format
1740msgid "Could not read ref %s"
1741msgstr "不能读取引用 %s"
1742
1743#: unpack-trees.c:203
1744msgid "Checking out files"
1745msgstr "正在检出文件"
1746
1747#: urlmatch.c:120
1748msgid "invalid URL scheme name or missing '://' suffix"
1749msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1750
1751#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1752#, c-format
1753msgid "invalid %XX escape sequence"
1754msgstr "无效的 %XX 转义序列"
1755
1756#: urlmatch.c:172
1757msgid "missing host and scheme is not 'file:'"
1758msgstr "缺失主机名且 URL 方案不是 'file:'"
1759
1760#: urlmatch.c:189
1761msgid "a 'file:' URL may not have a port number"
1762msgstr "一个 'file:' URL 不应该包含端口号"
1763
1764#: urlmatch.c:199
1765msgid "invalid characters in host name"
1766msgstr "主机名中包含无效的字符"
1767
1768#: urlmatch.c:244 urlmatch.c:255
1769msgid "invalid port number"
1770msgstr "无效的端口号"
1771
1772#: urlmatch.c:322
1773msgid "invalid '..' path segment"
1774msgstr "无效的 '..' 路径片段"
1775
1776#: wrapper.c:219 wrapper.c:362
1777#, c-format
1778msgid "could not open '%s' for reading and writing"
1779msgstr "无法打开 '%s' 进行读写"
1780
1781#: wrapper.c:221 wrapper.c:364
1782#, c-format
1783msgid "could not open '%s' for writing"
1784msgstr "无法打开 '%s' 进行写入"
1785
1786#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691
1787#: builtin/merge.c:1074 builtin/pull.c:380
1788#, c-format
1789msgid "could not open '%s' for reading"
1790msgstr "无法打开 '%s' 进行读取"
1791
1792#: wrapper.c:579
1793#, c-format
1794msgid "unable to access '%s': %s"
1795msgstr "不能访问 '%s':%s"
1796
1797#: wrapper.c:600
1798#, c-format
1799msgid "unable to access '%s'"
1800msgstr "不能访问 '%s'"
1801
1802#: wrapper.c:611
1803#, c-format
1804msgid "unable to look up current user in the passwd file: %s"
1805msgstr "无法在口令文件中查询到当前用户:%s"
1806
1807#: wrapper.c:612
1808msgid "no such user"
1809msgstr "无此用户"
1810
1811#: wrapper.c:620
1812msgid "unable to get current working directory"
1813msgstr "不能获取当前工作目录"
1814
1815#: wrapper.c:647
1816#, c-format
1817msgid "could not open %s for writing"
1818msgstr "不能写入 %s"
1819
1820#: wrapper.c:658 builtin/am.c:425
1821#, c-format
1822msgid "could not write to %s"
1823msgstr "不能写入 %s"
1824
1825#: wrapper.c:664
1826#, c-format
1827msgid "could not close %s"
1828msgstr "不能关闭 %s"
1829
1830#: wt-status.c:149
1831msgid "Unmerged paths:"
1832msgstr "未合并的路径:"
1833
1834# 译者:注意保持前导空格
1835#: wt-status.c:176 wt-status.c:203
1836#, c-format
1837msgid " (use \"git reset %s <file>...\" to unstage)"
1838msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
1839
1840# 译者:注意保持前导空格
1841#: wt-status.c:178 wt-status.c:205
1842msgid " (use \"git rm --cached <file>...\" to unstage)"
1843msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1844
1845# 译者:注意保持前导空格
1846#: wt-status.c:182
1847msgid " (use \"git add <file>...\" to mark resolution)"
1848msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1849
1850# 译者:注意保持前导空格
1851#: wt-status.c:184 wt-status.c:188
1852msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1853msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1854
1855# 译者:注意保持前导空格
1856#: wt-status.c:186
1857msgid " (use \"git rm <file>...\" to mark resolution)"
1858msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1859
1860#: wt-status.c:197 wt-status.c:880
1861msgid "Changes to be committed:"
1862msgstr "要提交的变更:"
1863
1864#: wt-status.c:215 wt-status.c:889
1865msgid "Changes not staged for commit:"
1866msgstr "尚未暂存以备提交的变更:"
1867
1868# 译者:注意保持前导空格
1869#: wt-status.c:219
1870msgid " (use \"git add <file>...\" to update what will be committed)"
1871msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1872
1873# 译者:注意保持前导空格
1874#: wt-status.c:221
1875msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1876msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1877
1878# 译者:注意保持前导空格
1879#: wt-status.c:222
1880msgid ""
1881" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1882msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1883
1884# 译者:注意保持前导空格
1885#: wt-status.c:224
1886msgid " (commit or discard the untracked or modified content in submodules)"
1887msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1888
1889# 译者:注意保持前导空格
1890#: wt-status.c:236
1891#, c-format
1892msgid " (use \"git %s <file>...\" to include in what will be committed)"
1893msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1894
1895#: wt-status.c:251
1896msgid "both deleted:"
1897msgstr "双方删除:"
1898
1899#: wt-status.c:253
1900msgid "added by us:"
1901msgstr "由我们添加:"
1902
1903#: wt-status.c:255
1904msgid "deleted by them:"
1905msgstr "由他们删除:"
1906
1907#: wt-status.c:257
1908msgid "added by them:"
1909msgstr "由他们添加:"
1910
1911#: wt-status.c:259
1912msgid "deleted by us:"
1913msgstr "由我们删除:"
1914
1915#: wt-status.c:261
1916msgid "both added:"
1917msgstr "双方添加:"
1918
1919#: wt-status.c:263
1920msgid "both modified:"
1921msgstr "双方修改:"
1922
1923#: wt-status.c:265
1924#, c-format
1925msgid "bug: unhandled unmerged status %x"
1926msgstr "bug:无法处理的未合并状态 %x"
1927
1928#: wt-status.c:273
1929msgid "new file:"
1930msgstr "新文件:"
1931
1932#: wt-status.c:275
1933msgid "copied:"
1934msgstr "拷贝:"
1935
1936#: wt-status.c:277
1937msgid "deleted:"
1938msgstr "删除:"
1939
1940#: wt-status.c:279
1941msgid "modified:"
1942msgstr "修改:"
1943
1944#: wt-status.c:281
1945msgid "renamed:"
1946msgstr "重命名:"
1947
1948#: wt-status.c:283
1949msgid "typechange:"
1950msgstr "类型变更:"
1951
1952#: wt-status.c:285
1953msgid "unknown:"
1954msgstr "未知:"
1955
1956#: wt-status.c:287
1957msgid "unmerged:"
1958msgstr "未合并:"
1959
1960# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1961#: wt-status.c:369
1962msgid "new commits, "
1963msgstr "新提交, "
1964
1965# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1966#: wt-status.c:371
1967msgid "modified content, "
1968msgstr "修改的内容, "
1969
1970# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1971#: wt-status.c:373
1972msgid "untracked content, "
1973msgstr "未跟踪的内容, "
1974
1975#: wt-status.c:390
1976#, c-format
1977msgid "bug: unhandled diff status %c"
1978msgstr "bug:无法处理的差异状态 %c"
1979
1980#: wt-status.c:754
1981msgid "Submodules changed but not updated:"
1982msgstr "子模组已修改但尚未更新:"
1983
1984#: wt-status.c:756
1985msgid "Submodule changes to be committed:"
1986msgstr "要提交的子模组变更:"
1987
1988#: wt-status.c:837
1989msgid ""
1990"Do not touch the line above.\n"
1991"Everything below will be removed."
1992msgstr ""
1993"不要改动上面的一行。\n"
1994"下面的所有内容均将被删除。"
1995
1996#: wt-status.c:948
1997msgid "You have unmerged paths."
1998msgstr "您有尚未合并的路径。"
1999
2000# 译者:注意保持前导空格
2001#: wt-status.c:951
2002msgid " (fix conflicts and run \"git commit\")"
2003msgstr " (解决冲突并运行 \"git commit\")"
2004
2005#: wt-status.c:954
2006msgid "All conflicts fixed but you are still merging."
2007msgstr "所有冲突已解决但您仍处于合并中。"
2008
2009# 译者:注意保持前导空格
2010#: wt-status.c:957
2011msgid " (use \"git commit\" to conclude merge)"
2012msgstr " (使用 \"git commit\" 结束合并)"
2013
2014#: wt-status.c:967
2015msgid "You are in the middle of an am session."
2016msgstr "您正处于 am 操作过程中。"
2017
2018#: wt-status.c:970
2019msgid "The current patch is empty."
2020msgstr "当前的补丁为空。"
2021
2022# 译者:注意保持前导空格
2023#: wt-status.c:974
2024msgid " (fix conflicts and then run \"git am --continue\")"
2025msgstr " (解决冲突,然后运行 \"git am --continue\")"
2026
2027# 译者:注意保持前导空格
2028#: wt-status.c:976
2029msgid " (use \"git am --skip\" to skip this patch)"
2030msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2031
2032# 译者:注意保持前导空格
2033#: wt-status.c:978
2034msgid " (use \"git am --abort\" to restore the original branch)"
2035msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2036
2037#: wt-status.c:1105
2038msgid "No commands done."
2039msgstr "没有命令被执行。"
2040
2041#: wt-status.c:1108
2042#, c-format
2043msgid "Last command done (%d command done):"
2044msgid_plural "Last commands done (%d commands done):"
2045msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2046msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2047
2048#: wt-status.c:1119
2049#, c-format
2050msgid " (see more in file %s)"
2051msgstr " (更多参见文件 %s)"
2052
2053#: wt-status.c:1124
2054msgid "No commands remaining."
2055msgstr "未剩下任何命令。"
2056
2057#: wt-status.c:1127
2058#, c-format
2059msgid "Next command to do (%d remaining command):"
2060msgid_plural "Next commands to do (%d remaining commands):"
2061msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2062msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2063
2064# 译者:注意保持前导空格
2065#: wt-status.c:1135
2066msgid " (use \"git rebase --edit-todo\" to view and edit)"
2067msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2068
2069#: wt-status.c:1148
2070#, c-format
2071msgid "You are currently rebasing branch '%s' on '%s'."
2072msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2073
2074#: wt-status.c:1153
2075msgid "You are currently rebasing."
2076msgstr "您在执行变基操作。"
2077
2078# 译者:注意保持前导空格
2079#: wt-status.c:1167
2080msgid " (fix conflicts and then run \"git rebase --continue\")"
2081msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2082
2083# 译者:注意保持前导空格
2084#: wt-status.c:1169
2085msgid " (use \"git rebase --skip\" to skip this patch)"
2086msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2087
2088# 译者:注意保持前导空格
2089#: wt-status.c:1171
2090msgid " (use \"git rebase --abort\" to check out the original branch)"
2091msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2092
2093# 译者:注意保持前导空格
2094#: wt-status.c:1177
2095msgid " (all conflicts fixed: run \"git rebase --continue\")"
2096msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2097
2098#: wt-status.c:1181
2099#, c-format
2100msgid ""
2101"You are currently splitting a commit while rebasing branch '%s' on '%s'."
2102msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2103
2104#: wt-status.c:1186
2105msgid "You are currently splitting a commit during a rebase."
2106msgstr "您在执行变基操作时拆分提交。"
2107
2108# 译者:注意保持前导空格
2109#: wt-status.c:1189
2110msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2111msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2112
2113#: wt-status.c:1193
2114#, c-format
2115msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2116msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2117
2118#: wt-status.c:1198
2119msgid "You are currently editing a commit during a rebase."
2120msgstr "您在执行变基操作时编辑提交。"
2121
2122# 译者:注意保持前导空格
2123#: wt-status.c:1201
2124msgid " (use \"git commit --amend\" to amend the current commit)"
2125msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2126
2127# 译者:注意保持前导空格
2128#: wt-status.c:1203
2129msgid ""
2130" (use \"git rebase --continue\" once you are satisfied with your changes)"
2131msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2132
2133#: wt-status.c:1213
2134#, c-format
2135msgid "You are currently cherry-picking commit %s."
2136msgstr "您在执行拣选提交 %s 的操作。"
2137
2138# 译者:注意保持前导空格
2139#: wt-status.c:1218
2140msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2141msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2142
2143# 译者:注意保持前导空格
2144#: wt-status.c:1221
2145msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2146msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2147
2148# 译者:注意保持前导空格
2149#: wt-status.c:1223
2150msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2151msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2152
2153#: wt-status.c:1232
2154#, c-format
2155msgid "You are currently reverting commit %s."
2156msgstr "您在执行反转提交 %s 的操作。"
2157
2158# 译者:注意保持前导空格
2159#: wt-status.c:1237
2160msgid " (fix conflicts and run \"git revert --continue\")"
2161msgstr " (解决冲突并运行 \"git revert --continue\")"
2162
2163# 译者:注意保持前导空格
2164#: wt-status.c:1240
2165msgid " (all conflicts fixed: run \"git revert --continue\")"
2166msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2167
2168# 译者:注意保持前导空格
2169#: wt-status.c:1242
2170msgid " (use \"git revert --abort\" to cancel the revert operation)"
2171msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2172
2173#: wt-status.c:1253
2174#, c-format
2175msgid "You are currently bisecting, started from branch '%s'."
2176msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2177
2178#: wt-status.c:1257
2179msgid "You are currently bisecting."
2180msgstr "您在执行二分查找操作。"
2181
2182# 译者:注意保持前导空格
2183#: wt-status.c:1260
2184msgid " (use \"git bisect reset\" to get back to the original branch)"
2185msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2186
2187#: wt-status.c:1438
2188msgid "On branch "
2189msgstr "位于分支 "
2190
2191#: wt-status.c:1444
2192msgid "interactive rebase in progress; onto "
2193msgstr "交互式变基操作正在进行中;至 "
2194
2195#: wt-status.c:1446
2196msgid "rebase in progress; onto "
2197msgstr "变基操作正在进行中;至 "
2198
2199#: wt-status.c:1451
2200msgid "HEAD detached at "
2201msgstr "头指针分离于 "
2202
2203#: wt-status.c:1453
2204msgid "HEAD detached from "
2205msgstr "头指针分离自 "
2206
2207#: wt-status.c:1456
2208msgid "Not currently on any branch."
2209msgstr "当前不在任何分支上。"
2210
2211#: wt-status.c:1474
2212msgid "Initial commit"
2213msgstr "初始提交"
2214
2215#: wt-status.c:1488
2216msgid "Untracked files"
2217msgstr "未跟踪的文件"
2218
2219#: wt-status.c:1490
2220msgid "Ignored files"
2221msgstr "忽略的文件"
2222
2223#: wt-status.c:1494
2224#, c-format
2225msgid ""
2226"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2227"may speed it up, but you have to be careful not to forget to add\n"
2228"new files yourself (see 'git help status')."
2229msgstr ""
2230"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2231"但您需要小心不要忘了添加新文件(参见 'git help status')。"
2232
2233#: wt-status.c:1500
2234#, c-format
2235msgid "Untracked files not listed%s"
2236msgstr "未跟踪的文件没有列出%s"
2237
2238# 译者:中文字符串拼接,可删除前导空格
2239#: wt-status.c:1502
2240msgid " (use -u option to show untracked files)"
2241msgstr "(使用 -u 参数显示未跟踪的文件)"
2242
2243#: wt-status.c:1508
2244msgid "No changes"
2245msgstr "没有修改"
2246
2247#: wt-status.c:1513
2248#, c-format
2249msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2250msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2251
2252#: wt-status.c:1516
2253#, c-format
2254msgid "no changes added to commit\n"
2255msgstr "修改尚未加入提交\n"
2256
2257#: wt-status.c:1519
2258#, c-format
2259msgid ""
2260"nothing added to commit but untracked files present (use \"git add\" to "
2261"track)\n"
2262msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2263
2264#: wt-status.c:1522
2265#, c-format
2266msgid "nothing added to commit but untracked files present\n"
2267msgstr "提交为空,但是存在尚未跟踪的文件\n"
2268
2269# 译者:中文字符串拼接,可删除前导空格
2270#: wt-status.c:1525
2271#, c-format
2272msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2273msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2274
2275#: wt-status.c:1528 wt-status.c:1533
2276#, c-format
2277msgid "nothing to commit\n"
2278msgstr "无文件要提交\n"
2279
2280# 译者:中文字符串拼接,可删除前导空格
2281#: wt-status.c:1531
2282#, c-format
2283msgid "nothing to commit (use -u to show untracked files)\n"
2284msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2285
2286# 译者:中文字符串拼接,可删除前导空格
2287#: wt-status.c:1535
2288#, c-format
2289msgid "nothing to commit, working directory clean\n"
2290msgstr "无文件要提交,干净的工作区\n"
2291
2292# 译者:注意保持句尾空格
2293#: wt-status.c:1642
2294msgid "Initial commit on "
2295msgstr "初始提交于 "
2296
2297#: wt-status.c:1646
2298msgid "HEAD (no branch)"
2299msgstr "HEAD(非分支)"
2300
2301#: wt-status.c:1675
2302msgid "gone"
2303msgstr "丢失"
2304
2305# 译者:注意保持句尾空格
2306#: wt-status.c:1677 wt-status.c:1685
2307msgid "behind "
2308msgstr "落后 "
2309
2310#: compat/precompose_utf8.c:56 builtin/clone.c:408
2311#, c-format
2312msgid "failed to unlink '%s'"
2313msgstr "无法删除 '%s'"
2314
2315#: builtin/add.c:22
2316msgid "git add [<options>] [--] <pathspec>..."
2317msgstr "git add [<选项>] [--] <路径规格>..."
2318
2319#: builtin/add.c:65
2320#, c-format
2321msgid "unexpected diff status %c"
2322msgstr "意外的差异状态 %c"
2323
2324#: builtin/add.c:70 builtin/commit.c:278
2325msgid "updating files failed"
2326msgstr "更新文件失败"
2327
2328#: builtin/add.c:80
2329#, c-format
2330msgid "remove '%s'\n"
2331msgstr "删除 '%s'\n"
2332
2333#: builtin/add.c:134
2334msgid "Unstaged changes after refreshing the index:"
2335msgstr "刷新索引之后尚未被暂存的变更:"
2336
2337#: builtin/add.c:194 builtin/rev-parse.c:796
2338msgid "Could not read the index"
2339msgstr "不能读取索引"
2340
2341#: builtin/add.c:205
2342#, c-format
2343msgid "Could not open '%s' for writing."
2344msgstr "无法打开 '%s' 进行写入。"
2345
2346#: builtin/add.c:209
2347msgid "Could not write patch"
2348msgstr "不能生成补丁"
2349
2350#: builtin/add.c:212
2351msgid "editing patch failed"
2352msgstr "编辑补丁失败"
2353
2354#: builtin/add.c:215
2355#, c-format
2356msgid "Could not stat '%s'"
2357msgstr "不能查看文件状态 '%s'"
2358
2359#: builtin/add.c:217
2360msgid "Empty patch. Aborted."
2361msgstr "空补丁。异常终止。"
2362
2363#: builtin/add.c:222
2364#, c-format
2365msgid "Could not apply '%s'"
2366msgstr "不能应用 '%s'"
2367
2368#: builtin/add.c:232
2369msgid "The following paths are ignored by one of your .gitignore files:\n"
2370msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2371
2372#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
2373#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
2374#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
2375msgid "dry run"
2376msgstr "演习"
2377
2378#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
2379#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2380#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
2381msgid "be verbose"
2382msgstr "冗长输出"
2383
2384#: builtin/add.c:252
2385msgid "interactive picking"
2386msgstr "交互式拣选"
2387
2388#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286
2389msgid "select hunks interactively"
2390msgstr "交互式挑选数据块"
2391
2392#: builtin/add.c:254
2393msgid "edit current diff and apply"
2394msgstr "编辑当前差异并应用"
2395
2396#: builtin/add.c:255
2397msgid "allow adding otherwise ignored files"
2398msgstr "允许添加忽略的文件"
2399
2400#: builtin/add.c:256
2401msgid "update tracked files"
2402msgstr "更新已跟踪的文件"
2403
2404#: builtin/add.c:257
2405msgid "record only the fact that the path will be added later"
2406msgstr "只记录,该路径稍后再添加"
2407
2408#: builtin/add.c:258
2409msgid "add changes from all tracked and untracked files"
2410msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2411
2412#: builtin/add.c:261
2413msgid "ignore paths removed in the working tree (same as --no-all)"
2414msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2415
2416#: builtin/add.c:263
2417msgid "don't add, only refresh the index"
2418msgstr "不添加,只刷新索引"
2419
2420#: builtin/add.c:264
2421msgid "just skip files which cannot be added because of errors"
2422msgstr "跳过因出错不能添加的文件"
2423
2424#: builtin/add.c:265
2425msgid "check if - even missing - files are ignored in dry run"
2426msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2427
2428#: builtin/add.c:287
2429#, c-format
2430msgid "Use -f if you really want to add them.\n"
2431msgstr "使用 -f 参数如果您确实要添加它们。\n"
2432
2433#: builtin/add.c:294
2434msgid "adding files failed"
2435msgstr "添加文件失败"
2436
2437#: builtin/add.c:330
2438msgid "-A and -u are mutually incompatible"
2439msgstr "-A 和 -u 选项互斥"
2440
2441#: builtin/add.c:337
2442msgid "Option --ignore-missing can only be used together with --dry-run"
2443msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2444
2445#: builtin/add.c:352
2446#, c-format
2447msgid "Nothing specified, nothing added.\n"
2448msgstr "没有指定文件,也没有文件被添加。\n"
2449
2450#: builtin/add.c:353
2451#, c-format
2452msgid "Maybe you wanted to say 'git add .'?\n"
2453msgstr "也许您想要执行 'git add .'?\n"
2454
2455#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938
2456#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2457#: builtin/submodule--helper.c:40
2458msgid "index file corrupt"
2459msgstr "索引文件损坏"
2460
2461#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430
2462msgid "Unable to write new index file"
2463msgstr "无法写入新索引文件"
2464
2465#: builtin/am.c:42
2466#, c-format
2467msgid "could not stat %s"
2468msgstr "不能获取 %s 的文件状态"
2469
2470#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077
2471#, c-format
2472msgid "could not read '%s'"
2473msgstr "不能读取 '%s'"
2474
2475#: builtin/am.c:445
2476msgid "could not parse author script"
2477msgstr "不能解析作者脚本"
2478
2479#: builtin/am.c:522
2480#, c-format
2481msgid "'%s' was deleted by the applypatch-msg hook"
2482msgstr "'%s' 被 applypatch-msg 钩子删除"
2483
2484#: builtin/am.c:563 builtin/notes.c:300
2485#, c-format
2486msgid "Malformed input line: '%s'."
2487msgstr "非法的输入行:'%s'。"
2488
2489#: builtin/am.c:600 builtin/notes.c:315
2490#, c-format
2491msgid "Failed to copy notes from '%s' to '%s'"
2492msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2493
2494#: builtin/am.c:626
2495msgid "fseek failed"
2496msgstr "fseek 失败"
2497
2498#: builtin/am.c:787 builtin/am.c:875
2499#, c-format
2500msgid "could not open '%s' for reading: %s"
2501msgstr "无法打开 '%s' 进行读取:%s"
2502
2503#: builtin/am.c:794
2504#, c-format
2505msgid "could not open '%s' for writing: %s"
2506msgstr "无法打开 '%s' 进行写入:%s"
2507
2508#: builtin/am.c:803
2509#, c-format
2510msgid "could not parse patch '%s'"
2511msgstr "无法解析补丁 '%s'"
2512
2513#: builtin/am.c:868
2514msgid "Only one StGIT patch series can be applied at once"
2515msgstr "一次只能有一个 StGIT 补丁队列被应用"
2516
2517#: builtin/am.c:916
2518msgid "invalid timestamp"
2519msgstr "无效的时间戳"
2520
2521#: builtin/am.c:919 builtin/am.c:927
2522msgid "invalid Date line"
2523msgstr "无效的日期行"
2524
2525#: builtin/am.c:924
2526msgid "invalid timezone offset"
2527msgstr "无效的时区偏移值"
2528
2529#: builtin/am.c:1011
2530msgid "Patch format detection failed."
2531msgstr "补丁格式检测失败。"
2532
2533#: builtin/am.c:1016 builtin/clone.c:373
2534#, c-format
2535msgid "failed to create directory '%s'"
2536msgstr "无法创建目录 '%s'"
2537
2538#: builtin/am.c:1020
2539msgid "Failed to split patches."
2540msgstr "无法拆分补丁。"
2541
2542#: builtin/am.c:1152 builtin/commit.c:363
2543msgid "unable to write index file"
2544msgstr "无法写入索引文件"
2545
2546#: builtin/am.c:1203
2547#, c-format
2548msgid "When you have resolved this problem, run \"%s --continue\"."
2549msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2550
2551#: builtin/am.c:1204
2552#, c-format
2553msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2554msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2555
2556#: builtin/am.c:1205
2557#, c-format
2558msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2559msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2560
2561#: builtin/am.c:1343
2562msgid "Patch is empty. Was it split wrong?"
2563msgstr "补丁为空。是不是切分错误?"
2564
2565#: builtin/am.c:1417 builtin/log.c:1344
2566#, c-format
2567msgid "invalid ident line: %s"
2568msgstr "包含无效的身份标识:%s"
2569
2570#: builtin/am.c:1444
2571#, c-format
2572msgid "unable to parse commit %s"
2573msgstr "不能解析提交 %s"
2574
2575#: builtin/am.c:1646
2576msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2577msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2578
2579#: builtin/am.c:1648
2580msgid "Using index info to reconstruct a base tree..."
2581msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2582
2583#: builtin/am.c:1667
2584msgid ""
2585"Did you hand edit your patch?\n"
2586"It does not apply to blobs recorded in its index."
2587msgstr ""
2588"您是否曾手动编辑过您的补丁?\n"
2589"无法应用补丁到索引中的数据对象上。"
2590
2591#: builtin/am.c:1673
2592msgid "Falling back to patching base and 3-way merge..."
2593msgstr "回落到基础版本上打补丁及进行三方合并..."
2594
2595#: builtin/am.c:1688
2596msgid "Failed to merge in the changes."
2597msgstr "无法合并变更。"
2598
2599#: builtin/am.c:1712 builtin/merge.c:632
2600msgid "git write-tree failed to write a tree"
2601msgstr "git write-tree 无法写入一树对象"
2602
2603#: builtin/am.c:1719
2604msgid "applying to an empty history"
2605msgstr "正应用到一个空历史上"
2606
2607#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829
2608#: builtin/merge.c:854
2609msgid "failed to write commit object"
2610msgstr "无法写提交对象"
2611
2612#: builtin/am.c:1764 builtin/am.c:1768
2613#, c-format
2614msgid "cannot resume: %s does not exist."
2615msgstr "无法继续:%s 不存在。"
2616
2617#: builtin/am.c:1784
2618msgid "cannot be interactive without stdin connected to a terminal."
2619msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2620
2621#: builtin/am.c:1789
2622msgid "Commit Body is:"
2623msgstr "提交内容为:"
2624
2625# 译者:注意保持句尾空格
2626#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2627#. in your translation. The program will only accept English
2628#. input at this point.
2629#.
2630#: builtin/am.c:1799
2631msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2632msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2633
2634#: builtin/am.c:1849
2635#, c-format
2636msgid "Dirty index: cannot apply patches (dirty: %s)"
2637msgstr "脏索引:不能应用补丁(脏文件:%s)"
2638
2639#: builtin/am.c:1884 builtin/am.c:1955
2640#, c-format
2641msgid "Applying: %.*s"
2642msgstr "应用:%.*s"
2643
2644#: builtin/am.c:1900
2645msgid "No changes -- Patch already applied."
2646msgstr "没有变更 —— 补丁已经应用过。"
2647
2648#: builtin/am.c:1908
2649#, c-format
2650msgid "Patch failed at %s %.*s"
2651msgstr "打补丁失败于 %s %.*s"
2652
2653#: builtin/am.c:1914
2654#, c-format
2655msgid "The copy of the patch that failed is found in: %s"
2656msgstr "失败的补丁文件副本位于:%s"
2657
2658#: builtin/am.c:1958
2659msgid ""
2660"No changes - did you forget to use 'git add'?\n"
2661"If there is nothing left to stage, chances are that something else\n"
2662"already introduced the same changes; you might want to skip this patch."
2663msgstr ""
2664"没有变更 —— 您是不是忘了执行 'git add'?\n"
2665"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2666"您也许想要跳过这个补丁。"
2667
2668#: builtin/am.c:1965
2669msgid ""
2670"You still have unmerged paths in your index.\n"
2671"Did you forget to use 'git add'?"
2672msgstr ""
2673"您的索引中仍有未合并的路径。\n"
2674"您是否忘了执行 'git add'?"
2675
2676#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308
2677#: builtin/reset.c:316
2678#, c-format
2679msgid "Could not parse object '%s'."
2680msgstr "不能解析对象 '%s'。"
2681
2682#: builtin/am.c:2125
2683msgid "failed to clean index"
2684msgstr "无法清空索引"
2685
2686#: builtin/am.c:2159
2687msgid ""
2688"You seem to have moved HEAD since the last 'am' failure.\n"
2689"Not rewinding to ORIG_HEAD"
2690msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2691
2692#: builtin/am.c:2220
2693#, c-format
2694msgid "Invalid value for --patch-format: %s"
2695msgstr "无效的 --patch-format 值:%s"
2696
2697#: builtin/am.c:2253
2698msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2699msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2700
2701#: builtin/am.c:2254
2702msgid "git am [<options>] (--continue | --skip | --abort)"
2703msgstr "git am [<选项>] (--continue | --skip | --abort)"
2704
2705#: builtin/am.c:2260
2706msgid "run interactively"
2707msgstr "以交互式方式运行"
2708
2709#: builtin/am.c:2262
2710msgid "historical option -- no-op"
2711msgstr "老的参数 —— 无作用"
2712
2713#: builtin/am.c:2264
2714msgid "allow fall back on 3way merging if needed"
2715msgstr "如果必要,允许使用三方合并。"
2716
2717#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57
2718#: builtin/repack.c:171
2719msgid "be quiet"
2720msgstr "静默模式"
2721
2722#: builtin/am.c:2267
2723msgid "add a Signed-off-by line to the commit message"
2724msgstr "在提交说明中添加一个 Signed-off-by 签名"
2725
2726#: builtin/am.c:2270
2727msgid "recode into utf8 (default)"
2728msgstr "使用 utf8 字符集(默认)"
2729
2730#: builtin/am.c:2272
2731msgid "pass -k flag to git-mailinfo"
2732msgstr "向 git-mailinfo 传递 -k 参数"
2733
2734#: builtin/am.c:2274
2735msgid "pass -b flag to git-mailinfo"
2736msgstr "向 git-mailinfo 传递 -b 参数"
2737
2738#: builtin/am.c:2276
2739msgid "pass -m flag to git-mailinfo"
2740msgstr "向 git-mailinfo 传递 -m 参数"
2741
2742#: builtin/am.c:2278
2743msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2744msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2745
2746#: builtin/am.c:2281
2747msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2748msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2749
2750#: builtin/am.c:2284
2751msgid "strip everything before a scissors line"
2752msgstr "丢弃裁切线前的所有内容"
2753
2754#: builtin/am.c:2285 builtin/apply.c:4554
2755msgid "action"
2756msgstr "动作"
2757
2758#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295
2759#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
2760#: builtin/am.c:2313
2761msgid "pass it through git-apply"
2762msgstr "传递给 git-apply"
2763
2764#: builtin/am.c:2294 builtin/apply.c:4578
2765msgid "root"
2766msgstr "根目录"
2767
2768#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516
2769#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93
2770#: builtin/pull.c:167 builtin/submodule--helper.c:78
2771#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
2772msgid "path"
2773msgstr "路径"
2774
2775#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2776#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127
2777#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645
2778#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132
2779#: parse-options.h:134 parse-options.h:244
2780msgid "n"
2781msgstr "n"
2782
2783#: builtin/am.c:2306 builtin/apply.c:4522
2784msgid "num"
2785msgstr "数字"
2786
2787#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438
2788#: builtin/tag.c:372
2789msgid "format"
2790msgstr "格式"
2791
2792#: builtin/am.c:2310
2793msgid "format the patch(es) are in"
2794msgstr "补丁的格式"
2795
2796#: builtin/am.c:2316
2797msgid "override error message when patch failure occurs"
2798msgstr "打补丁失败时显示的错误信息"
2799
2800#: builtin/am.c:2318
2801msgid "continue applying patches after resolving a conflict"
2802msgstr "冲突解决后继续应用补丁"
2803
2804#: builtin/am.c:2321
2805msgid "synonyms for --continue"
2806msgstr "和 --continue 同义"
2807
2808#: builtin/am.c:2324
2809msgid "skip the current patch"
2810msgstr "跳过当前补丁"
2811
2812#: builtin/am.c:2327
2813msgid "restore the original branch and abort the patching operation."
2814msgstr "恢复原始分支并终止打补丁操作。"
2815
2816#: builtin/am.c:2331
2817msgid "lie about committer date"
2818msgstr "将作者日期作为提交日期"
2819
2820#: builtin/am.c:2333
2821msgid "use current timestamp for author date"
2822msgstr "用当前时间作为作者日期"
2823
2824#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225
2825#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355
2826msgid "key-id"
2827msgstr "key-id"
2828
2829#: builtin/am.c:2336
2830msgid "GPG-sign commits"
2831msgstr "使用 GPG 签名提交"
2832
2833#: builtin/am.c:2339
2834msgid "(internal use for git-rebase)"
2835msgstr "(内部使用,用于 git-rebase)"
2836
2837#: builtin/am.c:2354
2838msgid ""
2839"The -b/--binary option has been a no-op for long time, and\n"
2840"it will be removed. Please do not use it anymore."
2841msgstr ""
2842"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2843"请不要再使用它了。"
2844
2845#: builtin/am.c:2361
2846msgid "failed to read the index"
2847msgstr "无法读取索引"
2848
2849#: builtin/am.c:2376
2850#, c-format
2851msgid "previous rebase directory %s still exists but mbox given."
2852msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2853
2854#: builtin/am.c:2400
2855#, c-format
2856msgid ""
2857"Stray %s directory found.\n"
2858"Use \"git am --abort\" to remove it."
2859msgstr ""
2860"发现了错误的 %s 目录。\n"
2861"使用 \"git am --abort\" 删除它。"
2862
2863#: builtin/am.c:2406
2864msgid "Resolve operation not in progress, we are not resuming."
2865msgstr "解决操作未进行,我们不会继续。"
2866
2867#: builtin/apply.c:59
2868msgid "git apply [<options>] [<patch>...]"
2869msgstr "git apply [<选项>] [<补丁>...]"
2870
2871#: builtin/apply.c:111
2872#, c-format
2873msgid "unrecognized whitespace option '%s'"
2874msgstr "未能识别的空白字符选项 '%s'"
2875
2876#: builtin/apply.c:126
2877#, c-format
2878msgid "unrecognized whitespace ignore option '%s'"
2879msgstr "未能识别的空白字符忽略选项 '%s'"
2880
2881#: builtin/apply.c:818
2882#, c-format
2883msgid "Cannot prepare timestamp regexp %s"
2884msgstr "无法准备时间戳正则表达式 %s"
2885
2886#: builtin/apply.c:827
2887#, c-format
2888msgid "regexec returned %d for input: %s"
2889msgstr "regexec 返回 %d,输入为:%s"
2890
2891#: builtin/apply.c:908
2892#, c-format
2893msgid "unable to find filename in patch at line %d"
2894msgstr "不能在补丁的第 %d 行找到文件名"
2895
2896#: builtin/apply.c:940
2897#, c-format
2898msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2899msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2900
2901#: builtin/apply.c:944
2902#, c-format
2903msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2904msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2905
2906#: builtin/apply.c:945
2907#, c-format
2908msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2909msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2910
2911#: builtin/apply.c:952
2912#, c-format
2913msgid "git apply: bad git-diff - expected /dev/null on line %d"
2914msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2915
2916#: builtin/apply.c:1415
2917#, c-format
2918msgid "recount: unexpected line: %.*s"
2919msgstr "recount:意外的行:%.*s"
2920
2921#: builtin/apply.c:1472
2922#, c-format
2923msgid "patch fragment without header at line %d: %.*s"
2924msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2925
2926#: builtin/apply.c:1489
2927#, c-format
2928msgid ""
2929"git diff header lacks filename information when removing %d leading pathname "
2930"component (line %d)"
2931msgid_plural ""
2932"git diff header lacks filename information when removing %d leading pathname "
2933"components (line %d)"
2934msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2935msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2936
2937#: builtin/apply.c:1655
2938msgid "new file depends on old contents"
2939msgstr "新文件依赖旧内容"
2940
2941#: builtin/apply.c:1657
2942msgid "deleted file still has contents"
2943msgstr "删除的文件仍有内容"
2944
2945#: builtin/apply.c:1683
2946#, c-format
2947msgid "corrupt patch at line %d"
2948msgstr "补丁在第 %d 行损坏"
2949
2950#: builtin/apply.c:1719
2951#, c-format
2952msgid "new file %s depends on old contents"
2953msgstr "新文件 %s 依赖旧内容"
2954
2955#: builtin/apply.c:1721
2956#, c-format
2957msgid "deleted file %s still has contents"
2958msgstr "删除的文件 %s 仍有内容"
2959
2960#: builtin/apply.c:1724
2961#, c-format
2962msgid "** warning: file %s becomes empty but is not deleted"
2963msgstr "** 警告:文件 %s 成为空文件但并未删除"
2964
2965#: builtin/apply.c:1870
2966#, c-format
2967msgid "corrupt binary patch at line %d: %.*s"
2968msgstr "二进制补丁在第 %d 行损坏:%.*s"
2969
2970#: builtin/apply.c:1899
2971#, c-format
2972msgid "unrecognized binary patch at line %d"
2973msgstr "未能识别的二进制补丁位于第 %d 行"
2974
2975#: builtin/apply.c:2050
2976#, c-format
2977msgid "patch with only garbage at line %d"
2978msgstr "补丁文件的第 %d 行只有垃圾数据"
2979
2980#: builtin/apply.c:2140
2981#, c-format
2982msgid "unable to read symlink %s"
2983msgstr "无法读取符号链接 %s"
2984
2985#: builtin/apply.c:2144
2986#, c-format
2987msgid "unable to open or read %s"
2988msgstr "不能打开或读取 %s"
2989
2990#: builtin/apply.c:2777
2991#, c-format
2992msgid "invalid start of line: '%c'"
2993msgstr "无效的行首字符:'%c'"
2994
2995#: builtin/apply.c:2896
2996#, c-format
2997msgid "Hunk #%d succeeded at %d (offset %d line)."
2998msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2999msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3000msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3001
3002#: builtin/apply.c:2908
3003#, c-format
3004msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3005msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3006
3007#: builtin/apply.c:2914
3008#, c-format
3009msgid ""
3010"while searching for:\n"
3011"%.*s"
3012msgstr ""
3013"当查询:\n"
3014"%.*s"
3015
3016#: builtin/apply.c:2934
3017#, c-format
3018msgid "missing binary patch data for '%s'"
3019msgstr "缺失 '%s' 的二进制补丁数据"
3020
3021#: builtin/apply.c:3035
3022#, c-format
3023msgid "binary patch does not apply to '%s'"
3024msgstr "二进制补丁未应用到 '%s'"
3025
3026#: builtin/apply.c:3041
3027#, c-format
3028msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3029msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3030
3031#: builtin/apply.c:3062
3032#, c-format
3033msgid "patch failed: %s:%ld"
3034msgstr "打补丁失败:%s:%ld"
3035
3036#: builtin/apply.c:3186
3037#, c-format
3038msgid "cannot checkout %s"
3039msgstr "不能检出 %s"
3040
3041#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3042#, c-format
3043msgid "read of %s failed"
3044msgstr "读取 %s 失败"
3045
3046#: builtin/apply.c:3239
3047#, c-format
3048msgid "reading from '%s' beyond a symbolic link"
3049msgstr "读取位于符号链接中的 '%s'"
3050
3051#: builtin/apply.c:3267 builtin/apply.c:3489
3052#, c-format
3053msgid "path %s has been renamed/deleted"
3054msgstr "路径 %s 已经被重命名/删除"
3055
3056#: builtin/apply.c:3348 builtin/apply.c:3503
3057#, c-format
3058msgid "%s: does not exist in index"
3059msgstr "%s:不存在于索引中"
3060
3061#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3062#, c-format
3063msgid "%s: %s"
3064msgstr "%s:%s"
3065
3066#: builtin/apply.c:3357 builtin/apply.c:3511
3067#, c-format
3068msgid "%s: does not match index"
3069msgstr "%s:和索引不匹配"
3070
3071#: builtin/apply.c:3459
3072msgid "removal patch leaves file contents"
3073msgstr "移除补丁仍留下了文件内容"
3074
3075#: builtin/apply.c:3528
3076#, c-format
3077msgid "%s: wrong type"
3078msgstr "%s:错误类型"
3079
3080#: builtin/apply.c:3530
3081#, c-format
3082msgid "%s has type %o, expected %o"
3083msgstr "%s 的类型是 %o,应为 %o"
3084
3085#: builtin/apply.c:3689 builtin/apply.c:3691
3086#, c-format
3087msgid "invalid path '%s'"
3088msgstr "无效路径 '%s'"
3089
3090#: builtin/apply.c:3746
3091#, c-format
3092msgid "%s: already exists in index"
3093msgstr "%s:已经存在于索引中"
3094
3095#: builtin/apply.c:3749
3096#, c-format
3097msgid "%s: already exists in working directory"
3098msgstr "%s:已经存在于工作区中"
3099
3100#: builtin/apply.c:3769
3101#, c-format
3102msgid "new mode (%o) of %s does not match old mode (%o)"
3103msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3104
3105#: builtin/apply.c:3774
3106#, c-format
3107msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3108msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3109
3110#: builtin/apply.c:3794
3111#, c-format
3112msgid "affected file '%s' is beyond a symbolic link"
3113msgstr "受影响的文件 '%s' 位于符号链接中"
3114
3115#: builtin/apply.c:3798
3116#, c-format
3117msgid "%s: patch does not apply"
3118msgstr "%s:补丁未应用"
3119
3120#: builtin/apply.c:3812
3121#, c-format
3122msgid "Checking patch %s..."
3123msgstr "检查补丁 %s..."
3124
3125#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3126#, c-format
3127msgid "make_cache_entry failed for path '%s'"
3128msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3129
3130#: builtin/apply.c:4048
3131#, c-format
3132msgid "unable to remove %s from index"
3133msgstr "不能从索引中移除 %s"
3134
3135#: builtin/apply.c:4077
3136#, c-format
3137msgid "corrupt patch for submodule %s"
3138msgstr "子模组 %s 损坏的补丁"
3139
3140#: builtin/apply.c:4081
3141#, c-format
3142msgid "unable to stat newly created file '%s'"
3143msgstr "不能枚举新建文件 '%s' 的状态"
3144
3145#: builtin/apply.c:4086
3146#, c-format
3147msgid "unable to create backing store for newly created file %s"
3148msgstr "不能为新建文件 %s 创建后端存储"
3149
3150#: builtin/apply.c:4089 builtin/apply.c:4197
3151#, c-format
3152msgid "unable to add cache entry for %s"
3153msgstr "无法为 %s 添加缓存条目"
3154
3155#: builtin/apply.c:4122
3156#, c-format
3157msgid "closing file '%s'"
3158msgstr "关闭文件 '%s'"
3159
3160#: builtin/apply.c:4171
3161#, c-format
3162msgid "unable to write file '%s' mode %o"
3163msgstr "不能写文件 '%s' 权限 %o"
3164
3165#: builtin/apply.c:4258
3166#, c-format
3167msgid "Applied patch %s cleanly."
3168msgstr "成功应用补丁 %s。"
3169
3170#: builtin/apply.c:4266
3171msgid "internal error"
3172msgstr "内部错误"
3173
3174#: builtin/apply.c:4269
3175#, c-format
3176msgid "Applying patch %%s with %d reject..."
3177msgid_plural "Applying patch %%s with %d rejects..."
3178msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3179msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3180
3181#: builtin/apply.c:4279
3182#, c-format
3183msgid "truncating .rej filename to %.*s.rej"
3184msgstr "截短 .rej 文件名为 %.*s.rej"
3185
3186#: builtin/apply.c:4300
3187#, c-format
3188msgid "Hunk #%d applied cleanly."
3189msgstr "第 #%d 个片段成功应用。"
3190
3191#: builtin/apply.c:4303
3192#, c-format
3193msgid "Rejected hunk #%d."
3194msgstr "拒绝第 #%d 个片段。"
3195
3196#: builtin/apply.c:4393
3197msgid "unrecognized input"
3198msgstr "未能识别的输入"
3199
3200#: builtin/apply.c:4404
3201msgid "unable to read index file"
3202msgstr "无法读取索引文件"
3203
3204#: builtin/apply.c:4517
3205msgid "don't apply changes matching the given path"
3206msgstr "不要应用与给出路径向匹配的变更"
3207
3208#: builtin/apply.c:4520
3209msgid "apply changes matching the given path"
3210msgstr "应用与给出路径向匹配的变更"
3211
3212#: builtin/apply.c:4523
3213msgid "remove <num> leading slashes from traditional diff paths"
3214msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3215
3216#: builtin/apply.c:4526
3217msgid "ignore additions made by the patch"
3218msgstr "忽略补丁中的添加的文件"
3219
3220#: builtin/apply.c:4528
3221msgid "instead of applying the patch, output diffstat for the input"
3222msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3223
3224#: builtin/apply.c:4532
3225msgid "show number of added and deleted lines in decimal notation"
3226msgstr "以十进制数显示添加和删除的行数"
3227
3228#: builtin/apply.c:4534
3229msgid "instead of applying the patch, output a summary for the input"
3230msgstr "不应用补丁,而是显示输入的概要"
3231
3232#: builtin/apply.c:4536
3233msgid "instead of applying the patch, see if the patch is applicable"
3234msgstr "不应用补丁,而是查看补丁是否可应用"
3235
3236#: builtin/apply.c:4538
3237msgid "make sure the patch is applicable to the current index"
3238msgstr "确认补丁可以应用到当前索引"
3239
3240#: builtin/apply.c:4540
3241msgid "apply a patch without touching the working tree"
3242msgstr "应用补丁而不修改工作区"
3243
3244#: builtin/apply.c:4542
3245msgid "accept a patch that touches outside the working area"
3246msgstr "接受修改工作区之外文件的补丁"
3247
3248#: builtin/apply.c:4544
3249msgid "also apply the patch (use with --stat/--summary/--check)"
3250msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3251
3252#: builtin/apply.c:4546
3253msgid "attempt three-way merge if a patch does not apply"
3254msgstr "如果一个补丁不能应用则尝试三方合并"
3255
3256#: builtin/apply.c:4548
3257msgid "build a temporary index based on embedded index information"
3258msgstr "创建一个临时索引基于嵌入的索引信息"
3259
3260#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412
3261msgid "paths are separated with NUL character"
3262msgstr "路径以 NUL 字符分隔"
3263
3264#: builtin/apply.c:4553
3265msgid "ensure at least <n> lines of context match"
3266msgstr "确保至少匹配 <n> 行上下文"
3267
3268#: builtin/apply.c:4555
3269msgid "detect new or modified lines that have whitespace errors"
3270msgstr "检查新增和修改的行中间的空白字符滥用"
3271
3272#: builtin/apply.c:4558 builtin/apply.c:4561
3273msgid "ignore changes in whitespace when finding context"
3274msgstr "查找上下文时忽略空白字符的变更"
3275
3276#: builtin/apply.c:4564
3277msgid "apply the patch in reverse"
3278msgstr "反向应用补丁"
3279
3280#: builtin/apply.c:4566
3281msgid "don't expect at least one line of context"
3282msgstr "无需至少一行上下文"
3283
3284#: builtin/apply.c:4568
3285msgid "leave the rejected hunks in corresponding *.rej files"
3286msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3287
3288#: builtin/apply.c:4570
3289msgid "allow overlapping hunks"
3290msgstr "允许重叠的补丁片段"
3291
3292#: builtin/apply.c:4573
3293msgid "tolerate incorrectly detected missing new-line at the end of file"
3294msgstr "允许不正确的文件末尾换行符"
3295
3296#: builtin/apply.c:4576
3297msgid "do not trust the line counts in the hunk headers"
3298msgstr "不信任补丁片段的头信息中的行号"
3299
3300#: builtin/apply.c:4579
3301msgid "prepend <root> to all filenames"
3302msgstr "为所有文件名前添加 <根目录>"
3303
3304#: builtin/apply.c:4601
3305msgid "--3way outside a repository"
3306msgstr "--3way 在一个仓库之外"
3307
3308#: builtin/apply.c:4609
3309msgid "--index outside a repository"
3310msgstr "--index 在一个仓库之外"
3311
3312#: builtin/apply.c:4612
3313msgid "--cached outside a repository"
3314msgstr "--cached 在一个仓库之外"
3315
3316#: builtin/apply.c:4631
3317#, c-format
3318msgid "can't open patch '%s'"
3319msgstr "不能打开补丁 '%s'"
3320
3321#: builtin/apply.c:4645
3322#, c-format
3323msgid "squelched %d whitespace error"
3324msgid_plural "squelched %d whitespace errors"
3325msgstr[0] "抑制下仍有 %d 个空白字符误用"
3326msgstr[1] "抑制下仍有 %d 个空白字符误用"
3327
3328#: builtin/apply.c:4651 builtin/apply.c:4661
3329#, c-format
3330msgid "%d line adds whitespace errors."
3331msgid_plural "%d lines add whitespace errors."
3332msgstr[0] "%d 行有空白字符误用。"
3333msgstr[1] "%d 行有空白字符误用。"
3334
3335#: builtin/archive.c:17
3336#, c-format
3337msgid "could not create archive file '%s'"
3338msgstr "不能创建归档文件 '%s'"
3339
3340#: builtin/archive.c:20
3341msgid "could not redirect output"
3342msgstr "不能重定向输出"
3343
3344#: builtin/archive.c:37
3345msgid "git archive: Remote with no URL"
3346msgstr "git archive:未提供远程 URL"
3347
3348#: builtin/archive.c:58
3349msgid "git archive: expected ACK/NAK, got EOF"
3350msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3351
3352#: builtin/archive.c:61
3353#, c-format
3354msgid "git archive: NACK %s"
3355msgstr "git archive:NACK %s"
3356
3357#: builtin/archive.c:63
3358#, c-format
3359msgid "remote error: %s"
3360msgstr "远程错误:%s"
3361
3362#: builtin/archive.c:64
3363msgid "git archive: protocol error"
3364msgstr "git archive:协议错误"
3365
3366#: builtin/archive.c:68
3367msgid "git archive: expected a flush"
3368msgstr "git archive:应为刷新"
3369
3370#: builtin/bisect--helper.c:7
3371msgid "git bisect--helper --next-all [--no-checkout]"
3372msgstr "git bisect--helper --next-all [--no-checkout]"
3373
3374#: builtin/bisect--helper.c:17
3375msgid "perform 'git bisect next'"
3376msgstr "执行 'git bisect next'"
3377
3378#: builtin/bisect--helper.c:19
3379msgid "update BISECT_HEAD instead of checking out the current commit"
3380msgstr "更新 BISECT_HEAD 而非检出当前提交"
3381
3382#: builtin/blame.c:32
3383msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3384msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3385
3386#: builtin/blame.c:37
3387msgid "<rev-opts> are documented in git-rev-list(1)"
3388msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3389
3390#: builtin/blame.c:2519
3391msgid "Show blame entries as we find them, incrementally"
3392msgstr "增量式地显示发现的 blame 条目"
3393
3394#: builtin/blame.c:2520
3395msgid "Show blank SHA-1 for boundary commits (Default: off)"
3396msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3397
3398#: builtin/blame.c:2521
3399msgid "Do not treat root commits as boundaries (Default: off)"
3400msgstr "不把根提交作为边界(默认:关闭)"
3401
3402#: builtin/blame.c:2522
3403msgid "Show work cost statistics"
3404msgstr "显示命令消耗统计"
3405
3406#: builtin/blame.c:2523
3407msgid "Show output score for blame entries"
3408msgstr "显示判断 blame 条目位移的得分诊断信息"
3409
3410#: builtin/blame.c:2524
3411msgid "Show original filename (Default: auto)"
3412msgstr "显示原始文件名(默认:自动)"
3413
3414#: builtin/blame.c:2525
3415msgid "Show original linenumber (Default: off)"
3416msgstr "显示原始的行号(默认:关闭)"
3417
3418#: builtin/blame.c:2526
3419msgid "Show in a format designed for machine consumption"
3420msgstr "显示为一个适合机器读取的格式"
3421
3422#: builtin/blame.c:2527
3423msgid "Show porcelain format with per-line commit information"
3424msgstr "为每一行显示机器适用的提交信息"
3425
3426#: builtin/blame.c:2528
3427msgid "Use the same output mode as git-annotate (Default: off)"
3428msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3429
3430#: builtin/blame.c:2529
3431msgid "Show raw timestamp (Default: off)"
3432msgstr "显示原始时间戳(默认:关闭)"
3433
3434#: builtin/blame.c:2530
3435msgid "Show long commit SHA1 (Default: off)"
3436msgstr "显示长的 SHA1 提交号(默认:关闭)"
3437
3438#: builtin/blame.c:2531
3439msgid "Suppress author name and timestamp (Default: off)"
3440msgstr "隐藏作者名字和时间戳(默认:关闭)"
3441
3442#: builtin/blame.c:2532
3443msgid "Show author email instead of name (Default: off)"
3444msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3445
3446#: builtin/blame.c:2533
3447msgid "Ignore whitespace differences"
3448msgstr "忽略空白差异"
3449
3450#: builtin/blame.c:2534
3451msgid "Spend extra cycles to find better match"
3452msgstr "花费额外的循环来找到更好的匹配"
3453
3454#: builtin/blame.c:2535
3455msgid "Use revisions from <file> instead of calling git-rev-list"
3456msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3457
3458#: builtin/blame.c:2536
3459msgid "Use <file>'s contents as the final image"
3460msgstr "使用 <文件> 的内容作为最终的图片"
3461
3462#: builtin/blame.c:2537 builtin/blame.c:2538
3463msgid "score"
3464msgstr "得分"
3465
3466#: builtin/blame.c:2537
3467msgid "Find line copies within and across files"
3468msgstr "找到文件内及跨文件的行拷贝"
3469
3470#: builtin/blame.c:2538
3471msgid "Find line movements within and across files"
3472msgstr "找到文件内及跨文件的行移动"
3473
3474#: builtin/blame.c:2539
3475msgid "n,m"
3476msgstr "n,m"
3477
3478#: builtin/blame.c:2539
3479msgid "Process only line range n,m, counting from 1"
3480msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3481
3482#. TRANSLATORS: This string is used to tell us the maximum
3483#. display width for a relative timestamp in "git blame"
3484#. output. For C locale, "4 years, 11 months ago", which
3485#. takes 22 places, is the longest among various forms of
3486#. relative timestamps, but your language may need more or
3487#. fewer display columns.
3488#: builtin/blame.c:2620
3489msgid "4 years, 11 months ago"
3490msgstr "4 年 11 个月前"
3491
3492#: builtin/branch.c:25
3493msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3494msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3495
3496#: builtin/branch.c:26
3497msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3498msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3499
3500#: builtin/branch.c:27
3501msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3502msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3503
3504#: builtin/branch.c:28
3505msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3506msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3507
3508#: builtin/branch.c:29
3509msgid "git branch [<options>] [-r | -a] [--points-at]"
3510msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3511
3512# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3513#: builtin/branch.c:142
3514#, c-format
3515msgid ""
3516"deleting branch '%s' that has been merged to\n"
3517" '%s', but not yet merged to HEAD."
3518msgstr ""
3519"将要删除的分支 '%s' 已经被合并到\n"
3520" '%s',但未合并到 HEAD。"
3521
3522# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3523#: builtin/branch.c:146
3524#, c-format
3525msgid ""
3526"not deleting branch '%s' that is not yet merged to\n"
3527" '%s', even though it is merged to HEAD."
3528msgstr ""
3529"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3530" 然而却尚未被合并到分支 '%s' 。"
3531
3532#: builtin/branch.c:160
3533#, c-format
3534msgid "Couldn't look up commit object for '%s'"
3535msgstr "无法查询 '%s' 指向的提交对象"
3536
3537#: builtin/branch.c:164
3538#, c-format
3539msgid ""
3540"The branch '%s' is not fully merged.\n"
3541"If you are sure you want to delete it, run 'git branch -D %s'."
3542msgstr ""
3543"分支 '%s' 没有完全合并。\n"
3544"如果您确认要删除它,执行 'git branch -D %s'。"
3545
3546#: builtin/branch.c:177
3547msgid "Update of config-file failed"
3548msgstr "无法更新 config 文件"
3549
3550#: builtin/branch.c:205
3551msgid "cannot use -a with -d"
3552msgstr "不能将 -a 和 -d 同时使用"
3553
3554#: builtin/branch.c:211
3555msgid "Couldn't look up commit object for HEAD"
3556msgstr "无法查询 HEAD 指向的提交对象"
3557
3558#: builtin/branch.c:219
3559#, c-format
3560msgid "Cannot delete the branch '%s' which you are currently on."
3561msgstr "无法删除您当前所在的分支 '%s'。"
3562
3563#: builtin/branch.c:235
3564#, c-format
3565msgid "remote-tracking branch '%s' not found."
3566msgstr "未能找到远程跟踪分支 '%s'。"
3567
3568#: builtin/branch.c:236
3569#, c-format
3570msgid "branch '%s' not found."
3571msgstr "分支 '%s' 未发现。"
3572
3573#: builtin/branch.c:251
3574#, c-format
3575msgid "Error deleting remote-tracking branch '%s'"
3576msgstr "无法删除远程跟踪分支 '%s'"
3577
3578#: builtin/branch.c:252
3579#, c-format
3580msgid "Error deleting branch '%s'"
3581msgstr "无法删除分支 '%s'"
3582
3583#: builtin/branch.c:259
3584#, c-format
3585msgid "Deleted remote-tracking branch %s (was %s).\n"
3586msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3587
3588#: builtin/branch.c:260
3589#, c-format
3590msgid "Deleted branch %s (was %s).\n"
3591msgstr "已删除分支 %s(曾为 %s)。\n"
3592
3593#: builtin/branch.c:303
3594#, c-format
3595msgid "[%s: gone]"
3596msgstr "[%s: 丢失]"
3597
3598#: builtin/branch.c:308
3599#, c-format
3600msgid "[%s]"
3601msgstr "[%s]"
3602
3603#: builtin/branch.c:313
3604#, c-format
3605msgid "[%s: behind %d]"
3606msgstr "[%s:落后 %d]"
3607
3608#: builtin/branch.c:315
3609#, c-format
3610msgid "[behind %d]"
3611msgstr "[落后 %d]"
3612
3613#: builtin/branch.c:319
3614#, c-format
3615msgid "[%s: ahead %d]"
3616msgstr "[%s:领先 %d]"
3617
3618#: builtin/branch.c:321
3619#, c-format
3620msgid "[ahead %d]"
3621msgstr "[领先 %d]"
3622
3623#: builtin/branch.c:324
3624#, c-format
3625msgid "[%s: ahead %d, behind %d]"
3626msgstr "[%s:领先 %d,落后 %d]"
3627
3628#: builtin/branch.c:327
3629#, c-format
3630msgid "[ahead %d, behind %d]"
3631msgstr "[领先 %d,落后 %d]"
3632
3633#: builtin/branch.c:340
3634msgid " **** invalid ref ****"
3635msgstr " **** 无效引用 ****"
3636
3637#: builtin/branch.c:366
3638#, c-format
3639msgid "(no branch, rebasing %s)"
3640msgstr "(非分支,正变基 %s)"
3641
3642#: builtin/branch.c:369
3643#, c-format
3644msgid "(no branch, bisect started on %s)"
3645msgstr "(非分支,二分查找开始于 %s)"
3646
3647#: builtin/branch.c:375
3648#, c-format
3649msgid "(HEAD detached at %s)"
3650msgstr "(头指针分离于 %s)"
3651
3652#: builtin/branch.c:378
3653#, c-format
3654msgid "(HEAD detached from %s)"
3655msgstr "(头指针分离自 %s)"
3656
3657#: builtin/branch.c:382
3658msgid "(no branch)"
3659msgstr "(非分支)"
3660
3661#: builtin/branch.c:524
3662msgid "cannot rename the current branch while not on any."
3663msgstr "无法重命名当前分支因为不处于任何分支上。"
3664
3665#: builtin/branch.c:534
3666#, c-format
3667msgid "Invalid branch name: '%s'"
3668msgstr "无效的分支名:'%s'"
3669
3670#: builtin/branch.c:549
3671msgid "Branch rename failed"
3672msgstr "分支重命名失败"
3673
3674#: builtin/branch.c:553
3675#, c-format
3676msgid "Renamed a misnamed branch '%s' away"
3677msgstr "重命名掉一个错误命名的旧分支 '%s'"
3678
3679#: builtin/branch.c:557
3680#, c-format
3681msgid "Branch renamed to %s, but HEAD is not updated!"
3682msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3683
3684#: builtin/branch.c:564
3685msgid "Branch is renamed, but update of config-file failed"
3686msgstr "分支被重命名,但更新 config 文件失败"
3687
3688#: builtin/branch.c:587
3689#, c-format
3690msgid "could not write branch description template: %s"
3691msgstr "不能写分支描述模版:%s"
3692
3693#: builtin/branch.c:616
3694msgid "Generic options"
3695msgstr "通用选项"
3696
3697#: builtin/branch.c:618
3698msgid "show hash and subject, give twice for upstream branch"
3699msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3700
3701#: builtin/branch.c:619
3702msgid "suppress informational messages"
3703msgstr "不显示信息"
3704
3705#: builtin/branch.c:620
3706msgid "set up tracking mode (see git-pull(1))"
3707msgstr "设置跟踪模式(参见 git-pull(1))"
3708
3709#: builtin/branch.c:622
3710msgid "change upstream info"
3711msgstr "改变上游信息"
3712
3713#: builtin/branch.c:626
3714msgid "use colored output"
3715msgstr "使用彩色输出"
3716
3717#: builtin/branch.c:627
3718msgid "act on remote-tracking branches"
3719msgstr "作用于远程跟踪分支"
3720
3721#: builtin/branch.c:629 builtin/branch.c:630
3722msgid "print only branches that contain the commit"
3723msgstr "只打印包含该提交的分支"
3724
3725#: builtin/branch.c:633
3726msgid "Specific git-branch actions:"
3727msgstr "具体的 git-branch 动作:"
3728
3729#: builtin/branch.c:634
3730msgid "list both remote-tracking and local branches"
3731msgstr "列出远程跟踪及本地分支"
3732
3733#: builtin/branch.c:636
3734msgid "delete fully merged branch"
3735msgstr "删除完全合并的分支"
3736
3737#: builtin/branch.c:637
3738msgid "delete branch (even if not merged)"
3739msgstr "删除分支(即使没有合并)"
3740
3741#: builtin/branch.c:638
3742msgid "move/rename a branch and its reflog"
3743msgstr "移动/重命名一个分支,以及它的引用日志"
3744
3745#: builtin/branch.c:639
3746msgid "move/rename a branch, even if target exists"
3747msgstr "移动/重命名一个分支,即使目标已存在"
3748
3749#: builtin/branch.c:640
3750msgid "list branch names"
3751msgstr "列出分支名"
3752
3753#: builtin/branch.c:641
3754msgid "create the branch's reflog"
3755msgstr "创建分支的引用日志"
3756
3757#: builtin/branch.c:643
3758msgid "edit the description for the branch"
3759msgstr "标记分支的描述"
3760
3761#: builtin/branch.c:644
3762msgid "force creation, move/rename, deletion"
3763msgstr "强制创建、移动/重命名、删除"
3764
3765#: builtin/branch.c:645
3766msgid "print only branches that are merged"
3767msgstr "只打印已经合并的分支"
3768
3769#: builtin/branch.c:646
3770msgid "print only branches that are not merged"
3771msgstr "只打印尚未合并的分支"
3772
3773#: builtin/branch.c:647
3774msgid "list branches in columns"
3775msgstr "以列的方式显示分支"
3776
3777#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366
3778msgid "key"
3779msgstr "key"
3780
3781#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367
3782msgid "field name to sort on"
3783msgstr "排序的字段名"
3784
3785#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398
3786#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564
3787#: builtin/tag.c:369
3788msgid "object"
3789msgstr "对象"
3790
3791#: builtin/branch.c:652
3792msgid "print only branches of the object"
3793msgstr "只打印指向该对象的分支"
3794
3795#: builtin/branch.c:670
3796msgid "Failed to resolve HEAD as a valid ref."
3797msgstr "无法将 HEAD 解析为有效引用。"
3798
3799#: builtin/branch.c:674 builtin/clone.c:697
3800msgid "HEAD not found below refs/heads!"
3801msgstr "HEAD 没有位于 /refs/heads 之下!"
3802
3803#: builtin/branch.c:694
3804msgid "--column and --verbose are incompatible"
3805msgstr "--column 和 --verbose 不兼容"
3806
3807#: builtin/branch.c:705 builtin/branch.c:747
3808msgid "branch name required"
3809msgstr "必须提供分支名"
3810
3811#: builtin/branch.c:723
3812msgid "Cannot give description to detached HEAD"
3813msgstr "不能向分离头指针提供描述"
3814
3815#: builtin/branch.c:728
3816msgid "cannot edit description of more than one branch"
3817msgstr "不能为一个以上的分支编辑描述"
3818
3819#: builtin/branch.c:735
3820#, c-format
3821msgid "No commit on branch '%s' yet."
3822msgstr "分支 '%s' 尚无提交。"
3823
3824#: builtin/branch.c:738
3825#, c-format
3826msgid "No branch named '%s'."
3827msgstr "没有分支 '%s'。"
3828
3829#: builtin/branch.c:753
3830msgid "too many branches for a rename operation"
3831msgstr "为重命名操作提供了太多的分支名"
3832
3833#: builtin/branch.c:758
3834msgid "too many branches to set new upstream"
3835msgstr "为设置新上游提供了太多的分支名"
3836
3837#: builtin/branch.c:762
3838#, c-format
3839msgid ""
3840"could not set upstream of HEAD to %s when it does not point to any branch."
3841msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3842
3843#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808
3844#, c-format
3845msgid "no such branch '%s'"
3846msgstr "没有此分支 '%s'"
3847
3848#: builtin/branch.c:769
3849#, c-format
3850msgid "branch '%s' does not exist"
3851msgstr "分支 '%s' 不存在"
3852
3853#: builtin/branch.c:781
3854msgid "too many branches to unset upstream"
3855msgstr "为取消上游设置操作提供了太多的分支名"
3856
3857#: builtin/branch.c:785
3858msgid "could not unset upstream of HEAD when it does not point to any branch."
3859msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3860
3861#: builtin/branch.c:791
3862#, c-format
3863msgid "Branch '%s' has no upstream information"
3864msgstr "分支 '%s' 没有上游信息"
3865
3866#: builtin/branch.c:805
3867msgid "it does not make sense to create 'HEAD' manually"
3868msgstr "手工创建 'HEAD' 没有意义"
3869
3870#: builtin/branch.c:811
3871msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3872msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3873
3874#: builtin/branch.c:814
3875#, c-format
3876msgid ""
3877"The --set-upstream flag is deprecated and will be removed. Consider using --"
3878"track or --set-upstream-to\n"
3879msgstr ""
3880"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3881
3882#: builtin/branch.c:831
3883#, c-format
3884msgid ""
3885"\n"
3886"If you wanted to make '%s' track '%s', do this:\n"
3887"\n"
3888msgstr ""
3889"\n"
3890"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3891"\n"
3892
3893#: builtin/branch.c:832
3894#, c-format
3895msgid " git branch -d %s\n"
3896msgstr " git branch -d %s\n"
3897
3898#: builtin/branch.c:833
3899#, c-format
3900msgid " git branch --set-upstream-to %s\n"
3901msgstr " git branch --set-upstream-to %s\n"
3902
3903#: builtin/bundle.c:51
3904#, c-format
3905msgid "%s is okay\n"
3906msgstr "%s 可以\n"
3907
3908#: builtin/bundle.c:64
3909msgid "Need a repository to create a bundle."
3910msgstr "需要一个仓库来创建包。"
3911
3912#: builtin/bundle.c:68
3913msgid "Need a repository to unbundle."
3914msgstr "需要一个仓库来解包。"
3915
3916#: builtin/cat-file.c:428
3917msgid ""
3918"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3919"<type>|--textconv) <object>"
3920msgstr ""
3921"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3922">|--textconv) <对象>"
3923
3924#: builtin/cat-file.c:429
3925msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3926msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3927
3928#: builtin/cat-file.c:466
3929msgid "<type> can be one of: blob, tree, commit, tag"
3930msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3931
3932#: builtin/cat-file.c:467
3933msgid "show object type"
3934msgstr "显示对象类型"
3935
3936#: builtin/cat-file.c:468
3937msgid "show object size"
3938msgstr "显示对象大小"
3939
3940#: builtin/cat-file.c:470
3941msgid "exit with zero when there's no error"
3942msgstr "当没有错误时退出并返回零"
3943
3944#: builtin/cat-file.c:471
3945msgid "pretty-print object's content"
3946msgstr "美观地打印对象的内容"
3947
3948#: builtin/cat-file.c:473
3949msgid "for blob objects, run textconv on object's content"
3950msgstr "对于数据对象,对其内容执行 textconv"
3951
3952#: builtin/cat-file.c:475
3953msgid "allow -s and -t to work with broken/corrupt objects"
3954msgstr "允许 -s 和 -t 对损坏的对象生效"
3955
3956#: builtin/cat-file.c:476
3957msgid "buffer --batch output"
3958msgstr "缓冲 --batch 的输出"
3959
3960#: builtin/cat-file.c:478
3961msgid "show info and content of objects fed from the standard input"
3962msgstr "显示从标准输入提供的对象的信息和内容"
3963
3964#: builtin/cat-file.c:481
3965msgid "show info about objects fed from the standard input"
3966msgstr "显示从标准输入提供的对象的信息"
3967
3968#: builtin/cat-file.c:484
3969msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3970msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3971
3972#: builtin/cat-file.c:486
3973msgid "show all objects with --batch or --batch-check"
3974msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
3975
3976#: builtin/check-attr.c:11
3977msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3978msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3979
3980#: builtin/check-attr.c:12
3981msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
3982msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
3983
3984#: builtin/check-attr.c:19
3985msgid "report all attributes set on file"
3986msgstr "报告设置在文件上的所有属性"
3987
3988#: builtin/check-attr.c:20
3989msgid "use .gitattributes only from the index"
3990msgstr "只使用索引中的 .gitattributes"
3991
3992#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3993msgid "read file names from stdin"
3994msgstr "从标准输入读出文件名"
3995
3996#: builtin/check-attr.c:23 builtin/check-ignore.c:24
3997msgid "terminate input and output records by a NUL character"
3998msgstr "输入和输出的记录使用 NUL 字符终结"
3999
4000#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325
4001msgid "suppress progress reporting"
4002msgstr "不显示进度报告"
4003
4004#: builtin/check-ignore.c:26
4005msgid "show non-matching input paths"
4006msgstr "显示未匹配的输入路径"
4007
4008#: builtin/check-ignore.c:28
4009msgid "ignore index when checking"
4010msgstr "检查时忽略索引"
4011
4012#: builtin/check-ignore.c:154
4013msgid "cannot specify pathnames with --stdin"
4014msgstr "不能同时指定路径及 --stdin 参数"
4015
4016#: builtin/check-ignore.c:157
4017msgid "-z only makes sense with --stdin"
4018msgstr "-z 需要和 --stdin 参数共用才有意义"
4019
4020#: builtin/check-ignore.c:159
4021msgid "no path specified"
4022msgstr "未指定路径"
4023
4024#: builtin/check-ignore.c:163
4025msgid "--quiet is only valid with a single pathname"
4026msgstr "参数 --quiet 只在提供一个路径名时有效"
4027
4028#: builtin/check-ignore.c:165
4029msgid "cannot have both --quiet and --verbose"
4030msgstr "不能同时提供 --quiet 和 --verbose 参数"
4031
4032#: builtin/check-ignore.c:168
4033msgid "--non-matching is only valid with --verbose"
4034msgstr "--non-matching 选项只在使用 --verbose 时有效"
4035
4036#: builtin/check-mailmap.c:8
4037msgid "git check-mailmap [<options>] <contact>..."
4038msgstr "git check-mailmap [<选项>] <联系地址>..."
4039
4040#: builtin/check-mailmap.c:13
4041msgid "also read contacts from stdin"
4042msgstr "还从标准输入读取联系地址"
4043
4044#: builtin/check-mailmap.c:24
4045#, c-format
4046msgid "unable to parse contact: %s"
4047msgstr "不能解析联系地址:%s"
4048
4049#: builtin/check-mailmap.c:47
4050msgid "no contacts specified"
4051msgstr "未指定联系地址"
4052
4053#: builtin/checkout-index.c:126
4054msgid "git checkout-index [<options>] [--] [<file>...]"
4055msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4056
4057#: builtin/checkout-index.c:188
4058msgid "check out all files in the index"
4059msgstr "检出索引区的所有文件"
4060
4061#: builtin/checkout-index.c:189
4062msgid "force overwrite of existing files"
4063msgstr "强制覆盖现有的文件"
4064
4065#: builtin/checkout-index.c:191
4066msgid "no warning for existing files and files not in index"
4067msgstr "存在或不在索引中的文件都没有警告"
4068
4069#: builtin/checkout-index.c:193
4070msgid "don't checkout new files"
4071msgstr "不检出新文件"
4072
4073#: builtin/checkout-index.c:195
4074msgid "update stat information in the index file"
4075msgstr "更新索引中文件的状态信息"
4076
4077#: builtin/checkout-index.c:201
4078msgid "read list of paths from the standard input"
4079msgstr "从标准输入读取路径列表"
4080
4081#: builtin/checkout-index.c:203
4082msgid "write the content to temporary files"
4083msgstr "将内容写入临时文件"
4084
4085#: builtin/checkout-index.c:204 builtin/column.c:30
4086#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4087#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181
4088msgid "string"
4089msgstr "字符串"
4090
4091#: builtin/checkout-index.c:205
4092msgid "when creating files, prepend <string>"
4093msgstr "在创建文件时,在前面加上 <字符串>"
4094
4095#: builtin/checkout-index.c:208
4096msgid "copy out the files from named stage"
4097msgstr "从指定暂存区中拷出文件"
4098
4099#: builtin/checkout.c:25
4100msgid "git checkout [<options>] <branch>"
4101msgstr "git checkout [<选项>] <分支>"
4102
4103#: builtin/checkout.c:26
4104msgid "git checkout [<options>] [<branch>] -- <file>..."
4105msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4106
4107#: builtin/checkout.c:134 builtin/checkout.c:167
4108#, c-format
4109msgid "path '%s' does not have our version"
4110msgstr "路径 '%s' 没有我们的版本"
4111
4112#: builtin/checkout.c:136 builtin/checkout.c:169
4113#, c-format
4114msgid "path '%s' does not have their version"
4115msgstr "路径 '%s' 没有他们的版本"
4116
4117#: builtin/checkout.c:152
4118#, c-format
4119msgid "path '%s' does not have all necessary versions"
4120msgstr "路径 '%s' 没有全部必须的版本"
4121
4122#: builtin/checkout.c:196
4123#, c-format
4124msgid "path '%s' does not have necessary versions"
4125msgstr "路径 '%s' 没有必须的版本"
4126
4127#: builtin/checkout.c:213
4128#, c-format
4129msgid "path '%s': cannot merge"
4130msgstr "path '%s':无法合并"
4131
4132#: builtin/checkout.c:230
4133#, c-format
4134msgid "Unable to add merge result for '%s'"
4135msgstr "无法为 '%s' 添加合并结果"
4136
4137#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4138#: builtin/checkout.c:260
4139#, c-format
4140msgid "'%s' cannot be used with updating paths"
4141msgstr "'%s' 不能在更新路径时使用"
4142
4143#: builtin/checkout.c:263 builtin/checkout.c:266
4144#, c-format
4145msgid "'%s' cannot be used with %s"
4146msgstr "'%s' 不能和 %s 同时使用"
4147
4148#: builtin/checkout.c:269
4149#, c-format
4150msgid "Cannot update paths and switch to branch '%s' at the same time."
4151msgstr "不能同时更新路径并切换到分支'%s'。"
4152
4153#: builtin/checkout.c:280 builtin/checkout.c:474
4154msgid "corrupt index file"
4155msgstr "损坏的索引文件"
4156
4157#: builtin/checkout.c:340 builtin/checkout.c:347
4158#, c-format
4159msgid "path '%s' is unmerged"
4160msgstr "路径 '%s' 未合并"
4161
4162#: builtin/checkout.c:496
4163msgid "you need to resolve your current index first"
4164msgstr "您需要先解决当前索引的冲突"
4165
4166#: builtin/checkout.c:623
4167#, c-format
4168msgid "Can not do reflog for '%s': %s\n"
4169msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4170
4171#: builtin/checkout.c:661
4172msgid "HEAD is now at"
4173msgstr "HEAD 目前位于"
4174
4175#: builtin/checkout.c:668
4176#, c-format
4177msgid "Reset branch '%s'\n"
4178msgstr "重置分支 '%s'\n"
4179
4180#: builtin/checkout.c:671
4181#, c-format
4182msgid "Already on '%s'\n"
4183msgstr "已经位于 '%s'\n"
4184
4185#: builtin/checkout.c:675
4186#, c-format
4187msgid "Switched to and reset branch '%s'\n"
4188msgstr "切换并重置分支 '%s'\n"
4189
4190#: builtin/checkout.c:677 builtin/checkout.c:1066
4191#, c-format
4192msgid "Switched to a new branch '%s'\n"
4193msgstr "切换到一个新分支 '%s'\n"
4194
4195#: builtin/checkout.c:679
4196#, c-format
4197msgid "Switched to branch '%s'\n"
4198msgstr "切换到分支 '%s'\n"
4199
4200# 译者:注意保持前导空格
4201#: builtin/checkout.c:731
4202#, c-format
4203msgid " ... and %d more.\n"
4204msgstr " ... 及其它 %d 个。\n"
4205
4206#: builtin/checkout.c:737
4207#, c-format
4208msgid ""
4209"Warning: you are leaving %d commit behind, not connected to\n"
4210"any of your branches:\n"
4211"\n"
4212"%s\n"
4213msgid_plural ""
4214"Warning: you are leaving %d commits behind, not connected to\n"
4215"any of your branches:\n"
4216"\n"
4217"%s\n"
4218msgstr[0] ""
4219"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4220"\n"
4221"%s\n"
4222msgstr[1] ""
4223"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4224"\n"
4225"%s\n"
4226
4227#: builtin/checkout.c:756
4228#, c-format
4229msgid ""
4230"If you want to keep it by creating a new branch, this may be a good time\n"
4231"to do so with:\n"
4232"\n"
4233" git branch <new-branch-name> %s\n"
4234"\n"
4235msgid_plural ""
4236"If you want to keep them by creating a new branch, this may be a good time\n"
4237"to do so with:\n"
4238"\n"
4239" git branch <new-branch-name> %s\n"
4240"\n"
4241msgstr[0] ""
4242"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4243"如下操作:\n"
4244"\n"
4245" git branch <新分支名> %s\n"
4246"\n"
4247msgstr[1] ""
4248"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4249"如下操作:\n"
4250"\n"
4251" git branch <新分支名> %s\n"
4252"\n"
4253
4254#: builtin/checkout.c:792
4255msgid "internal error in revision walk"
4256msgstr "在版本遍历时遇到内部错误"
4257
4258#: builtin/checkout.c:796
4259msgid "Previous HEAD position was"
4260msgstr "之前的 HEAD 位置是"
4261
4262#: builtin/checkout.c:823 builtin/checkout.c:1061
4263msgid "You are on a branch yet to be born"
4264msgstr "您位于一个尚未初始化的分支"
4265
4266#: builtin/checkout.c:968
4267#, c-format
4268msgid "only one reference expected, %d given."
4269msgstr "只要一个引用,却给出了 %d 个"
4270
4271#: builtin/checkout.c:1007 builtin/worktree.c:213
4272#, c-format
4273msgid "invalid reference: %s"
4274msgstr "无效引用:%s"
4275
4276#: builtin/checkout.c:1036
4277#, c-format
4278msgid "reference is not a tree: %s"
4279msgstr "引用不是一个树:%s"
4280
4281#: builtin/checkout.c:1075
4282msgid "paths cannot be used with switching branches"
4283msgstr "路径不能和切换分支同时使用"
4284
4285#: builtin/checkout.c:1078 builtin/checkout.c:1082
4286#, c-format
4287msgid "'%s' cannot be used with switching branches"
4288msgstr "'%s' 不能和切换分支同时使用"
4289
4290#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094
4291#: builtin/checkout.c:1097
4292#, c-format
4293msgid "'%s' cannot be used with '%s'"
4294msgstr "'%s' 不能和 '%s' 同时使用"
4295
4296#: builtin/checkout.c:1102
4297#, c-format
4298msgid "Cannot switch branch to a non-commit '%s'"
4299msgstr "不能切换分支到一个非提交 '%s'"
4300
4301#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83
4302#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320
4303#: builtin/worktree.c:322
4304msgid "branch"
4305msgstr "分支"
4306
4307#: builtin/checkout.c:1136
4308msgid "create and checkout a new branch"
4309msgstr "创建并检出一个新的分支"
4310
4311#: builtin/checkout.c:1138
4312msgid "create/reset and checkout a branch"
4313msgstr "创建/重置并检出一个分支"
4314
4315#: builtin/checkout.c:1139
4316msgid "create reflog for new branch"
4317msgstr "为新的分支创建引用日志"
4318
4319#: builtin/checkout.c:1140
4320msgid "detach the HEAD at named commit"
4321msgstr "成为指向该提交的分离头指针"
4322
4323#: builtin/checkout.c:1141
4324msgid "set upstream info for new branch"
4325msgstr "为新的分支设置上游信息"
4326
4327#: builtin/checkout.c:1143
4328msgid "new-branch"
4329msgstr "新分支"
4330
4331#: builtin/checkout.c:1143
4332msgid "new unparented branch"
4333msgstr "新的没有父提交的分支"
4334
4335#: builtin/checkout.c:1144
4336msgid "checkout our version for unmerged files"
4337msgstr "对尚未合并的文件检出我们的版本"
4338
4339#: builtin/checkout.c:1146
4340msgid "checkout their version for unmerged files"
4341msgstr "对尚未合并的文件检出他们的版本"
4342
4343#: builtin/checkout.c:1148
4344msgid "force checkout (throw away local modifications)"
4345msgstr "强制检出(丢弃本地修改)"
4346
4347#: builtin/checkout.c:1149
4348msgid "perform a 3-way merge with the new branch"
4349msgstr "和新的分支执行三方合并"
4350
4351#: builtin/checkout.c:1150 builtin/merge.c:227
4352msgid "update ignored files (default)"
4353msgstr "更新忽略的文件(默认)"
4354
4355#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
4356msgid "style"
4357msgstr "风格"
4358
4359#: builtin/checkout.c:1152
4360msgid "conflict style (merge or diff3)"
4361msgstr "冲突输出风格(merge 或 diff3)"
4362
4363#: builtin/checkout.c:1155
4364msgid "do not limit pathspecs to sparse entries only"
4365msgstr "对路径不做稀疏检出的限制"
4366
4367#: builtin/checkout.c:1157
4368msgid "second guess 'git checkout <no-such-branch>'"
4369msgstr "二次猜测'git checkout <无此分支>'"
4370
4371#: builtin/checkout.c:1159
4372msgid "do not check if another worktree is holding the given ref"
4373msgstr "不检查指定的引用是否被其他工作区所占用"
4374
4375#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
4376#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
4377#: builtin/send-pack.c:168
4378msgid "force progress reporting"
4379msgstr "强制显示进度报告"
4380
4381#: builtin/checkout.c:1191
4382msgid "-b, -B and --orphan are mutually exclusive"
4383msgstr "-b、-B 和 --orphan 是互斥的"
4384
4385#: builtin/checkout.c:1208
4386msgid "--track needs a branch name"
4387msgstr "--track 需要一个分支名"
4388
4389#: builtin/checkout.c:1213
4390msgid "Missing branch name; try -b"
4391msgstr "缺少分支名;尝试 -b"
4392
4393#: builtin/checkout.c:1249
4394msgid "invalid path specification"
4395msgstr "无效的路径规格"
4396
4397#: builtin/checkout.c:1256
4398#, c-format
4399msgid ""
4400"Cannot update paths and switch to branch '%s' at the same time.\n"
4401"Did you intend to checkout '%s' which can not be resolved as commit?"
4402msgstr ""
4403"不能同时更新路径并切换到分支'%s'。\n"
4404"您是想要检出 '%s' 但其未能解析为提交么?"
4405
4406#: builtin/checkout.c:1261
4407#, c-format
4408msgid "git checkout: --detach does not take a path argument '%s'"
4409msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4410
4411#: builtin/checkout.c:1265
4412msgid ""
4413"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4414"checking out of the index."
4415msgstr ""
4416"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4417
4418#: builtin/clean.c:25
4419msgid ""
4420"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4421msgstr ""
4422"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4423
4424#: builtin/clean.c:29
4425#, c-format
4426msgid "Removing %s\n"
4427msgstr "正删除 %s\n"
4428
4429#: builtin/clean.c:30
4430#, c-format
4431msgid "Would remove %s\n"
4432msgstr "将删除 %s\n"
4433
4434#: builtin/clean.c:31
4435#, c-format
4436msgid "Skipping repository %s\n"
4437msgstr "忽略仓库 %s\n"
4438
4439#: builtin/clean.c:32
4440#, c-format
4441msgid "Would skip repository %s\n"
4442msgstr "将忽略仓库 %s\n"
4443
4444#: builtin/clean.c:33
4445#, c-format
4446msgid "failed to remove %s"
4447msgstr "无法删除 %s"
4448
4449#: builtin/clean.c:315
4450msgid ""
4451"Prompt help:\n"
4452"1 - select a numbered item\n"
4453"foo - select item based on unique prefix\n"
4454" - (empty) select nothing"
4455msgstr ""
4456"帮助:\n"
4457"1 - 通过编号选择一个选项\n"
4458"foo - 通过标题选择一个选项\n"
4459" - (空)什么也不选择"
4460
4461#: builtin/clean.c:319
4462msgid ""
4463"Prompt help:\n"
4464"1 - select a single item\n"
4465"3-5 - select a range of items\n"
4466"2-3,6-9 - select multiple ranges\n"
4467"foo - select item based on unique prefix\n"
4468"-... - unselect specified items\n"
4469"* - choose all items\n"
4470" - (empty) finish selecting"
4471msgstr ""
4472"帮助:\n"
4473"1 - 选择一个选项\n"
4474"3-5 - 选择一个范围内的所有选项\n"
4475"2-3,6-9 - 选择多个范围内的所有选项\n"
4476"foo - 通过标题选择一个选项\n"
4477"-... - 反选特定的选项\n"
4478"* - 选择所有选项\n"
4479" - (空)结束选择"
4480
4481#: builtin/clean.c:535
4482#, c-format
4483msgid "Huh (%s)?"
4484msgstr "嗯(%s)?"
4485
4486#: builtin/clean.c:677
4487#, c-format
4488msgid "Input ignore patterns>> "
4489msgstr "输入模版以排除条目>> "
4490
4491#: builtin/clean.c:714
4492#, c-format
4493msgid "WARNING: Cannot find items matched by: %s"
4494msgstr "警告:无法找到和 %s 匹配的条目"
4495
4496#: builtin/clean.c:735
4497msgid "Select items to delete"
4498msgstr "选择要删除的条目"
4499
4500#. TRANSLATORS: Make sure to keep [y/N] as is
4501#: builtin/clean.c:776
4502#, c-format
4503msgid "Remove %s [y/N]? "
4504msgstr "删除 %s [y/N]?"
4505
4506#: builtin/clean.c:801
4507msgid "Bye."
4508msgstr "再见。"
4509
4510#: builtin/clean.c:809
4511msgid ""
4512"clean - start cleaning\n"
4513"filter by pattern - exclude items from deletion\n"
4514"select by numbers - select items to be deleted by numbers\n"
4515"ask each - confirm each deletion (like \"rm -i\")\n"
4516"quit - stop cleaning\n"
4517"help - this screen\n"
4518"? - help for prompt selection"
4519msgstr ""
4520"clean - 开始清理\n"
4521"filter by pattern - 通过模版排除要删除的条目\n"
4522"select by numbers - 通过数字选择要删除的条目\n"
4523"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4524"quit - 停止删除并退出\n"
4525"help - 显示本帮助\n"
4526"? - 显示如何在提示符下选择的帮助"
4527
4528#: builtin/clean.c:836
4529msgid "*** Commands ***"
4530msgstr "*** 命令 ***"
4531
4532#: builtin/clean.c:837
4533msgid "What now"
4534msgstr "请选择"
4535
4536#: builtin/clean.c:845
4537msgid "Would remove the following item:"
4538msgid_plural "Would remove the following items:"
4539msgstr[0] "将删除如下条目:"
4540msgstr[1] "将删除如下条目:"
4541
4542#: builtin/clean.c:862
4543msgid "No more files to clean, exiting."
4544msgstr "没有要清理的文件,退出。"
4545
4546#: builtin/clean.c:893
4547msgid "do not print names of files removed"
4548msgstr "不打印删除文件的名称"
4549
4550#: builtin/clean.c:895
4551msgid "force"
4552msgstr "强制"
4553
4554#: builtin/clean.c:896
4555msgid "interactive cleaning"
4556msgstr "交互式清除"
4557
4558#: builtin/clean.c:898
4559msgid "remove whole directories"
4560msgstr "删除整个目录"
4561
4562#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709
4563#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182
4564msgid "pattern"
4565msgstr "模式"
4566
4567#: builtin/clean.c:900
4568msgid "add <pattern> to ignore rules"
4569msgstr "添加 <模式> 到忽略规则"
4570
4571#: builtin/clean.c:901
4572msgid "remove ignored files, too"
4573msgstr "也删除忽略的文件"
4574
4575#: builtin/clean.c:903
4576msgid "remove only ignored files"
4577msgstr "只删除忽略的文件"
4578
4579#: builtin/clean.c:921
4580msgid "-x and -X cannot be used together"
4581msgstr "-x 和 -X 不能同时使用"
4582
4583#: builtin/clean.c:925
4584msgid ""
4585"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4586"clean"
4587msgstr ""
4588"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4589
4590#: builtin/clean.c:928
4591msgid ""
4592"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4593"refusing to clean"
4594msgstr ""
4595"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4596
4597#: builtin/clone.c:37
4598msgid "git clone [<options>] [--] <repo> [<dir>]"
4599msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4600
4601#: builtin/clone.c:59
4602msgid "don't create a checkout"
4603msgstr "不创建一个检出"
4604
4605#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469
4606msgid "create a bare repository"
4607msgstr "创建一个纯仓库"
4608
4609#: builtin/clone.c:64
4610msgid "create a mirror repository (implies bare)"
4611msgstr "创建一个镜像仓库(也是纯仓库)"
4612
4613#: builtin/clone.c:66
4614msgid "to clone from a local repository"
4615msgstr "从本地仓库克隆"
4616
4617#: builtin/clone.c:68
4618msgid "don't use local hardlinks, always copy"
4619msgstr "不使用本地硬链接,始终复制"
4620
4621#: builtin/clone.c:70
4622msgid "setup as shared repository"
4623msgstr "设置为共享仓库"
4624
4625#: builtin/clone.c:72 builtin/clone.c:74
4626msgid "initialize submodules in the clone"
4627msgstr "在克隆时初始化子模组"
4628
4629#: builtin/clone.c:75 builtin/init-db.c:466
4630msgid "template-directory"
4631msgstr "模板目录"
4632
4633#: builtin/clone.c:76 builtin/init-db.c:467
4634msgid "directory from which templates will be used"
4635msgstr "模板目录将被使用"
4636
4637#: builtin/clone.c:78 builtin/submodule--helper.c:179
4638msgid "reference repository"
4639msgstr "参考仓库"
4640
4641#: builtin/clone.c:80
4642msgid "use --reference only while cloning"
4643msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4644
4645#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4646msgid "name"
4647msgstr "名称"
4648
4649#: builtin/clone.c:82
4650msgid "use <name> instead of 'origin' to track upstream"
4651msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4652
4653#: builtin/clone.c:84
4654msgid "checkout <branch> instead of the remote's HEAD"
4655msgstr "检出 <分支> 而不是远程 HEAD"
4656
4657#: builtin/clone.c:86
4658msgid "path to git-upload-pack on the remote"
4659msgstr "远程 git-upload-pack 路径"
4660
4661#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654
4662#: builtin/pull.c:186
4663msgid "depth"
4664msgstr "深度"
4665
4666#: builtin/clone.c:88
4667msgid "create a shallow clone of that depth"
4668msgstr "创建一个指定深度的浅克隆"
4669
4670#: builtin/clone.c:90
4671msgid "clone only one branch, HEAD or --branch"
4672msgstr "只克隆一个分支、HEAD 或 --branch"
4673
4674#: builtin/clone.c:91 builtin/init-db.c:475
4675msgid "gitdir"
4676msgstr "git目录"
4677
4678#: builtin/clone.c:92 builtin/init-db.c:476
4679msgid "separate git dir from working tree"
4680msgstr "git目录和工作区分离"
4681
4682#: builtin/clone.c:93
4683msgid "key=value"
4684msgstr "key=value"
4685
4686#: builtin/clone.c:94
4687msgid "set config inside the new repository"
4688msgstr "在新仓库中设置配置信息"
4689
4690#: builtin/clone.c:300
4691#, c-format
4692msgid "reference repository '%s' as a linked checkout is not supported yet."
4693msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4694
4695#: builtin/clone.c:302
4696#, c-format
4697msgid "reference repository '%s' is not a local repository."
4698msgstr "参考仓库 '%s' 不是一个本地仓库。"
4699
4700#: builtin/clone.c:307
4701#, c-format
4702msgid "reference repository '%s' is shallow"
4703msgstr "参考仓库 '%s' 是一个浅克隆"
4704
4705#: builtin/clone.c:310
4706#, c-format
4707msgid "reference repository '%s' is grafted"
4708msgstr "参考仓库 '%s' 已被嫁接"
4709
4710#: builtin/clone.c:375 builtin/diff.c:84
4711#, c-format
4712msgid "failed to stat '%s'"
4713msgstr "无法枚举 '%s' 状态"
4714
4715#: builtin/clone.c:377
4716#, c-format
4717msgid "%s exists and is not a directory"
4718msgstr "%s 存在且不是一个目录"
4719
4720#: builtin/clone.c:391
4721#, c-format
4722msgid "failed to stat %s\n"
4723msgstr "无法枚举 %s 状态\n"
4724
4725#: builtin/clone.c:413
4726#, c-format
4727msgid "failed to create link '%s'"
4728msgstr "无法创建链接 '%s'"
4729
4730#: builtin/clone.c:417
4731#, c-format
4732msgid "failed to copy file to '%s'"
4733msgstr "无法拷贝文件至 '%s'"
4734
4735#: builtin/clone.c:442 builtin/clone.c:626
4736#, c-format
4737msgid "done.\n"
4738msgstr "完成。\n"
4739
4740#: builtin/clone.c:454
4741msgid ""
4742"Clone succeeded, but checkout failed.\n"
4743"You can inspect what was checked out with 'git status'\n"
4744"and retry the checkout with 'git checkout -f HEAD'\n"
4745msgstr ""
4746"克隆成功,但是检出失败。\n"
4747"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4748"'git checkout -f HEAD' 重试\n"
4749
4750#: builtin/clone.c:531
4751#, c-format
4752msgid "Could not find remote branch %s to clone."
4753msgstr "不能发现要克隆的远程分支 %s。"
4754
4755#: builtin/clone.c:621
4756#, c-format
4757msgid "Checking connectivity... "
4758msgstr "检查连接... "
4759
4760#: builtin/clone.c:624
4761msgid "remote did not send all necessary objects"
4762msgstr "远程没有发送所有必须的对象"
4763
4764#: builtin/clone.c:688
4765msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4766msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4767
4768#: builtin/clone.c:719
4769msgid "unable to checkout working tree"
4770msgstr "不能检出工作区"
4771
4772#: builtin/clone.c:808
4773msgid "cannot repack to clean up"
4774msgstr "无法执行 repack 来清理"
4775
4776#: builtin/clone.c:810
4777msgid "cannot unlink temporary alternates file"
4778msgstr "无法删除临时的 alternates 文件"
4779
4780#: builtin/clone.c:842
4781msgid "Too many arguments."
4782msgstr "太多参数。"
4783
4784#: builtin/clone.c:846
4785msgid "You must specify a repository to clone."
4786msgstr "您必须指定一个仓库来克隆。"
4787
4788#: builtin/clone.c:857
4789#, c-format
4790msgid "--bare and --origin %s options are incompatible."
4791msgstr "--bare 和 --origin %s 选项不兼容。"
4792
4793#: builtin/clone.c:860
4794msgid "--bare and --separate-git-dir are incompatible."
4795msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4796
4797#: builtin/clone.c:873
4798#, c-format
4799msgid "repository '%s' does not exist"
4800msgstr "仓库 '%s' 不存在"
4801
4802#: builtin/clone.c:879 builtin/fetch.c:1166
4803#, c-format
4804msgid "depth %s is not a positive number"
4805msgstr "深度 %s 不是一个正数"
4806
4807#: builtin/clone.c:889
4808#, c-format
4809msgid "destination path '%s' already exists and is not an empty directory."
4810msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4811
4812#: builtin/clone.c:899
4813#, c-format
4814msgid "working tree '%s' already exists."
4815msgstr "工作区 '%s' 已经存在。"
4816
4817#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224
4818#: builtin/worktree.c:221 builtin/worktree.c:248
4819#, c-format
4820msgid "could not create leading directories of '%s'"
4821msgstr "不能为 '%s' 创建先导目录"
4822
4823#: builtin/clone.c:917
4824#, c-format
4825msgid "could not create work tree dir '%s'"
4826msgstr "不能创建工作区目录 '%s'"
4827
4828#: builtin/clone.c:935
4829#, c-format
4830msgid "Cloning into bare repository '%s'...\n"
4831msgstr "克隆到纯仓库 '%s'...\n"
4832
4833#: builtin/clone.c:937
4834#, c-format
4835msgid "Cloning into '%s'...\n"
4836msgstr "正克隆到 '%s'...\n"
4837
4838#: builtin/clone.c:975
4839msgid "--depth is ignored in local clones; use file:// instead."
4840msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4841
4842#: builtin/clone.c:978
4843msgid "source repository is shallow, ignoring --local"
4844msgstr "源仓库是浅克隆,忽略 --local"
4845
4846#: builtin/clone.c:983
4847msgid "--local is ignored"
4848msgstr "--local 被忽略"
4849
4850#: builtin/clone.c:987
4851#, c-format
4852msgid "Don't know how to clone %s"
4853msgstr "不知道如何克隆 %s"
4854
4855#: builtin/clone.c:1036 builtin/clone.c:1044
4856#, c-format
4857msgid "Remote branch %s not found in upstream %s"
4858msgstr "远程分支 %s 在上游 %s 未发现"
4859
4860#: builtin/clone.c:1047
4861msgid "You appear to have cloned an empty repository."
4862msgstr "您似乎克隆了一个空仓库。"
4863
4864#: builtin/column.c:9
4865msgid "git column [<options>]"
4866msgstr "git column [<选项>]"
4867
4868#: builtin/column.c:26
4869msgid "lookup config vars"
4870msgstr "查找配置变量"
4871
4872#: builtin/column.c:27 builtin/column.c:28
4873msgid "layout to use"
4874msgstr "要使用的布局"
4875
4876#: builtin/column.c:29
4877msgid "Maximum width"
4878msgstr "最大宽度"
4879
4880#: builtin/column.c:30
4881msgid "Padding space on left border"
4882msgstr "左边框的填充空间"
4883
4884#: builtin/column.c:31
4885msgid "Padding space on right border"
4886msgstr "右边框的填充空间"
4887
4888#: builtin/column.c:32
4889msgid "Padding space between columns"
4890msgstr "两列之间的填充空间"
4891
4892#: builtin/column.c:51
4893msgid "--command must be the first argument"
4894msgstr "--command 必须是第一个参数"
4895
4896#: builtin/commit.c:38
4897msgid "git commit [<options>] [--] <pathspec>..."
4898msgstr "git commit [<选项>] [--] <路径规格>..."
4899
4900#: builtin/commit.c:43
4901msgid "git status [<options>] [--] <pathspec>..."
4902msgstr "git status [<选项>] [--] <路径规格>..."
4903
4904#: builtin/commit.c:48
4905msgid ""
4906"Your name and email address were configured automatically based\n"
4907"on your username and hostname. Please check that they are accurate.\n"
4908"You can suppress this message by setting them explicitly. Run the\n"
4909"following command and follow the instructions in your editor to edit\n"
4910"your configuration file:\n"
4911"\n"
4912" git config --global --edit\n"
4913"\n"
4914"After doing this, you may fix the identity used for this commit with:\n"
4915"\n"
4916" git commit --amend --reset-author\n"
4917msgstr ""
4918"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4919"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4920"中编辑您的配置文件:\n"
4921"\n"
4922" git config --global --edit\n"
4923"\n"
4924"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4925"\n"
4926" git commit --amend --reset-author\n"
4927
4928#: builtin/commit.c:61
4929msgid ""
4930"Your name and email address were configured automatically based\n"
4931"on your username and hostname. Please check that they are accurate.\n"
4932"You can suppress this message by setting them explicitly:\n"
4933"\n"
4934" git config --global user.name \"Your Name\"\n"
4935" git config --global user.email you@example.com\n"
4936"\n"
4937"After doing this, you may fix the identity used for this commit with:\n"
4938"\n"
4939" git commit --amend --reset-author\n"
4940msgstr ""
4941"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4942"与否。您可以对其进行设置以免再出现本提示信息:\n"
4943"\n"
4944" git config --global user.name \"Your Name\"\n"
4945" git config --global user.email you@example.com\n"
4946"\n"
4947"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4948"\n"
4949" git commit --amend --reset-author\n"
4950
4951#: builtin/commit.c:73
4952msgid ""
4953"You asked to amend the most recent commit, but doing so would make\n"
4954"it empty. You can repeat your command with --allow-empty, or you can\n"
4955"remove the commit entirely with \"git reset HEAD^\".\n"
4956msgstr ""
4957"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4958"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4959
4960#: builtin/commit.c:78
4961msgid ""
4962"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4963"If you wish to commit it anyway, use:\n"
4964"\n"
4965" git commit --allow-empty\n"
4966"\n"
4967msgstr ""
4968"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4969"也要提交,使用命令:\n"
4970"\n"
4971" git commit --allow-empty\n"
4972"\n"
4973
4974#: builtin/commit.c:85
4975msgid "Otherwise, please use 'git reset'\n"
4976msgstr "否则,请使用命令 'git reset'\n"
4977
4978#: builtin/commit.c:88
4979msgid ""
4980"If you wish to skip this commit, use:\n"
4981"\n"
4982" git reset\n"
4983"\n"
4984"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4985"the remaining commits.\n"
4986msgstr ""
4987"如果您想跳过这个提交,使用命令:\n"
4988"\n"
4989" git reset\n"
4990"\n"
4991"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4992"操作。\n"
4993
4994#: builtin/commit.c:305
4995msgid "failed to unpack HEAD tree object"
4996msgstr "无法解包 HEAD 树对象"
4997
4998#: builtin/commit.c:346
4999msgid "unable to create temporary index"
5000msgstr "不能创建临时索引"
5001
5002#: builtin/commit.c:352
5003msgid "interactive add failed"
5004msgstr "交互式添加失败"
5005
5006#: builtin/commit.c:365
5007msgid "unable to update temporary index"
5008msgstr "无法更新临时索引"
5009
5010#: builtin/commit.c:367
5011msgid "Failed to update main cache tree"
5012msgstr "不能更新树的主缓存"
5013
5014#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5015msgid "unable to write new_index file"
5016msgstr "无法写 new_index 文件"
5017
5018#: builtin/commit.c:445
5019msgid "cannot do a partial commit during a merge."
5020msgstr "在合并过程中不能做部分提交。"
5021
5022#: builtin/commit.c:447
5023msgid "cannot do a partial commit during a cherry-pick."
5024msgstr "在拣选过程中不能做部分提交。"
5025
5026#: builtin/commit.c:456
5027msgid "cannot read the index"
5028msgstr "无法读取索引"
5029
5030#: builtin/commit.c:475
5031msgid "unable to write temporary index file"
5032msgstr "无法写临时索引文件"
5033
5034#: builtin/commit.c:580
5035#, c-format
5036msgid "commit '%s' lacks author header"
5037msgstr "提交 '%s' 缺少作者信息"
5038
5039#: builtin/commit.c:582
5040#, c-format
5041msgid "commit '%s' has malformed author line"
5042msgstr "提交 '%s' 有非法的作者信息"
5043
5044#: builtin/commit.c:601
5045msgid "malformed --author parameter"
5046msgstr "非法的 --author 参数"
5047
5048#: builtin/commit.c:609
5049#, c-format
5050msgid "invalid date format: %s"
5051msgstr "无效的日期格式:%s"
5052
5053#: builtin/commit.c:653
5054msgid ""
5055"unable to select a comment character that is not used\n"
5056"in the current commit message"
5057msgstr "无法选择一个未被当前提交说明使用的注释字符"
5058
5059#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5060#, c-format
5061msgid "could not lookup commit %s"
5062msgstr "不能查询提交 %s"
5063
5064#: builtin/commit.c:702 builtin/shortlog.c:273
5065#, c-format
5066msgid "(reading log message from standard input)\n"
5067msgstr "(正从标准输入中读取日志信息)\n"
5068
5069#: builtin/commit.c:704
5070msgid "could not read log from standard input"
5071msgstr "不能从标准输入中读取日志信息"
5072
5073#: builtin/commit.c:708
5074#, c-format
5075msgid "could not read log file '%s'"
5076msgstr "不能读取日志文件 '%s'"
5077
5078#: builtin/commit.c:730
5079msgid "could not read MERGE_MSG"
5080msgstr "不能读取 MERGE_MSG"
5081
5082#: builtin/commit.c:734
5083msgid "could not read SQUASH_MSG"
5084msgstr "不能读取 SQUASH_MSG"
5085
5086#: builtin/commit.c:785
5087msgid "could not write commit template"
5088msgstr "不能写提交模版"
5089
5090#: builtin/commit.c:803
5091#, c-format
5092msgid ""
5093"\n"
5094"It looks like you may be committing a merge.\n"
5095"If this is not correct, please remove the file\n"
5096"\t%s\n"
5097"and try again.\n"
5098msgstr ""
5099"\n"
5100"似乎您正在做一个合并提交。如果不对,请删除文件\n"
5101"\t%s\n"
5102"然后重试。\n"
5103
5104#: builtin/commit.c:808
5105#, c-format
5106msgid ""
5107"\n"
5108"It looks like you may be committing a cherry-pick.\n"
5109"If this is not correct, please remove the file\n"
5110"\t%s\n"
5111"and try again.\n"
5112msgstr ""
5113"\n"
5114"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5115"\t%s\n"
5116"然后重试。\n"
5117
5118#: builtin/commit.c:821
5119#, c-format
5120msgid ""
5121"Please enter the commit message for your changes. Lines starting\n"
5122"with '%c' will be ignored, and an empty message aborts the commit.\n"
5123msgstr ""
5124"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5125"说明将会终止提交。\n"
5126
5127#: builtin/commit.c:828
5128#, c-format
5129msgid ""
5130"Please enter the commit message for your changes. Lines starting\n"
5131"with '%c' will be kept; you may remove them yourself if you want to.\n"
5132"An empty message aborts the commit.\n"
5133msgstr ""
5134"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5135"也可以删除它们。一个空的提交说明将会终止提交。\n"
5136
5137# 译者:为保证在输出中对齐,注意调整句中空格!
5138#: builtin/commit.c:848
5139#, c-format
5140msgid "%sAuthor: %.*s <%.*s>"
5141msgstr "%s作者: %.*s <%.*s>"
5142
5143# 译者:为保证在输出中对齐,注意调整句中空格!
5144#: builtin/commit.c:856
5145#, c-format
5146msgid "%sDate: %s"
5147msgstr "%s日期: %s"
5148
5149# 译者:为保证在输出中对齐,注意调整句中空格!
5150#: builtin/commit.c:863
5151#, c-format
5152msgid "%sCommitter: %.*s <%.*s>"
5153msgstr "%s提交者:%.*s <%.*s>"
5154
5155#: builtin/commit.c:881
5156msgid "Cannot read index"
5157msgstr "无法读取索引"
5158
5159#: builtin/commit.c:938
5160msgid "Error building trees"
5161msgstr "无法创建树对象"
5162
5163#: builtin/commit.c:953 builtin/tag.c:266
5164#, c-format
5165msgid "Please supply the message using either -m or -F option.\n"
5166msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5167
5168#: builtin/commit.c:1055
5169#, c-format
5170msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5171msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5172
5173#: builtin/commit.c:1070 builtin/commit.c:1310
5174#, c-format
5175msgid "Invalid untracked files mode '%s'"
5176msgstr "无效的未追踪文件参数 '%s'"
5177
5178#: builtin/commit.c:1107
5179msgid "--long and -z are incompatible"
5180msgstr "--long 和 -z 选项不兼容"
5181
5182#: builtin/commit.c:1137
5183msgid "Using both --reset-author and --author does not make sense"
5184msgstr "同时使用 --reset-author 和 --author 没有意义"
5185
5186#: builtin/commit.c:1146
5187msgid "You have nothing to amend."
5188msgstr "您没有可修补的提交。"
5189
5190#: builtin/commit.c:1149
5191msgid "You are in the middle of a merge -- cannot amend."
5192msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5193
5194#: builtin/commit.c:1151
5195msgid "You are in the middle of a cherry-pick -- cannot amend."
5196msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5197
5198#: builtin/commit.c:1154
5199msgid "Options --squash and --fixup cannot be used together"
5200msgstr "选项 --squash 和 --fixup 不能同时使用"
5201
5202#: builtin/commit.c:1164
5203msgid "Only one of -c/-C/-F/--fixup can be used."
5204msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5205
5206#: builtin/commit.c:1166
5207msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5208msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5209
5210#: builtin/commit.c:1174
5211msgid "--reset-author can be used only with -C, -c or --amend."
5212msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5213
5214#: builtin/commit.c:1191
5215msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5216msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5217
5218#: builtin/commit.c:1193
5219msgid "No paths with --include/--only does not make sense."
5220msgstr "参数 --include/--only 不跟路径没有意义。"
5221
5222#: builtin/commit.c:1195
5223msgid "Clever... amending the last one with dirty index."
5224msgstr "聪明... 用脏索引修补最后一个提交。"
5225
5226#: builtin/commit.c:1197
5227msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5228msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5229
5230#: builtin/commit.c:1209 builtin/tag.c:475
5231#, c-format
5232msgid "Invalid cleanup mode %s"
5233msgstr "无效的清理模式 %s"
5234
5235#: builtin/commit.c:1214
5236msgid "Paths with -a does not make sense."
5237msgstr "路径和 -a 选项同时使用没有意义。"
5238
5239#: builtin/commit.c:1324 builtin/commit.c:1605
5240msgid "show status concisely"
5241msgstr "以简洁的格式显示状态"
5242
5243#: builtin/commit.c:1326 builtin/commit.c:1607
5244msgid "show branch information"
5245msgstr "显示分支信息"
5246
5247#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
5248#: builtin/worktree.c:423
5249msgid "machine-readable output"
5250msgstr "机器可读的输出"
5251
5252#: builtin/commit.c:1331 builtin/commit.c:1611
5253msgid "show status in long format (default)"
5254msgstr "以长格式显示状态(默认)"
5255
5256#: builtin/commit.c:1334 builtin/commit.c:1614
5257msgid "terminate entries with NUL"
5258msgstr "条目以 NUL 字符结尾"
5259
5260#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5261#: builtin/fast-export.c:984 builtin/tag.c:353
5262msgid "mode"
5263msgstr "模式"
5264
5265#: builtin/commit.c:1337 builtin/commit.c:1617
5266msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5267msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5268
5269#: builtin/commit.c:1340
5270msgid "show ignored files"
5271msgstr "显示忽略的文件"
5272
5273#: builtin/commit.c:1341 parse-options.h:155
5274msgid "when"
5275msgstr "何时"
5276
5277#: builtin/commit.c:1342
5278msgid ""
5279"ignore changes to submodules, optional when: all, dirty, untracked. "
5280"(Default: all)"
5281msgstr ""
5282"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5283
5284#: builtin/commit.c:1344
5285msgid "list untracked files in columns"
5286msgstr "以列的方式显示未跟踪的文件"
5287
5288#: builtin/commit.c:1430
5289msgid "couldn't look up newly created commit"
5290msgstr "无法找到新创建的提交"
5291
5292#: builtin/commit.c:1432
5293msgid "could not parse newly created commit"
5294msgstr "不能解析新创建的提交"
5295
5296#: builtin/commit.c:1477
5297msgid "detached HEAD"
5298msgstr "分离头指针"
5299
5300# 译者:中文字符串拼接,可删除前导空格
5301#: builtin/commit.c:1480
5302msgid " (root-commit)"
5303msgstr "(根提交)"
5304
5305#: builtin/commit.c:1575
5306msgid "suppress summary after successful commit"
5307msgstr "提交成功后不显示概述信息"
5308
5309#: builtin/commit.c:1576
5310msgid "show diff in commit message template"
5311msgstr "在提交说明模板里显示差异"
5312
5313#: builtin/commit.c:1578
5314msgid "Commit message options"
5315msgstr "提交说明选项"
5316
5317#: builtin/commit.c:1579 builtin/tag.c:351
5318msgid "read message from file"
5319msgstr "从文件中读取提交说明"
5320
5321#: builtin/commit.c:1580
5322msgid "author"
5323msgstr "作者"
5324
5325#: builtin/commit.c:1580
5326msgid "override author for commit"
5327msgstr "提交时覆盖作者"
5328
5329#: builtin/commit.c:1581 builtin/gc.c:326
5330msgid "date"
5331msgstr "日期"
5332
5333#: builtin/commit.c:1581
5334msgid "override date for commit"
5335msgstr "提交时覆盖日期"
5336
5337#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392
5338#: builtin/notes.c:555 builtin/tag.c:349
5339msgid "message"
5340msgstr "说明"
5341
5342#: builtin/commit.c:1582
5343msgid "commit message"
5344msgstr "提交说明"
5345
5346#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5347#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5348msgid "commit"
5349msgstr "提交"
5350
5351#: builtin/commit.c:1583
5352msgid "reuse and edit message from specified commit"
5353msgstr "重用并编辑指定提交的提交说明"
5354
5355#: builtin/commit.c:1584
5356msgid "reuse message from specified commit"
5357msgstr "重用指定提交的提交说明"
5358
5359#: builtin/commit.c:1585
5360msgid "use autosquash formatted message to fixup specified commit"
5361msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5362
5363#: builtin/commit.c:1586
5364msgid "use autosquash formatted message to squash specified commit"
5365msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5366
5367#: builtin/commit.c:1587
5368msgid "the commit is authored by me now (used with -C/-c/--amend)"
5369msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5370
5371#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
5372msgid "add Signed-off-by:"
5373msgstr "添加 Signed-off-by: 签名"
5374
5375#: builtin/commit.c:1589
5376msgid "use specified template file"
5377msgstr "使用指定的模板文件"
5378
5379#: builtin/commit.c:1590
5380msgid "force edit of commit"
5381msgstr "强制编辑提交"
5382
5383# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5384#: builtin/commit.c:1591
5385msgid "default"
5386msgstr "default"
5387
5388#: builtin/commit.c:1591 builtin/tag.c:354
5389msgid "how to strip spaces and #comments from message"
5390msgstr "设置如何删除提交说明里的空格和#注释"
5391
5392#: builtin/commit.c:1592
5393msgid "include status in commit message template"
5394msgstr "在提交说明模板里包含状态信息"
5395
5396#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156
5397#: builtin/revert.c:93
5398msgid "GPG sign commit"
5399msgstr "GPG 提交签名"
5400
5401#: builtin/commit.c:1597
5402msgid "Commit contents options"
5403msgstr "提交内容选项"
5404
5405#: builtin/commit.c:1598
5406msgid "commit all changed files"
5407msgstr "提交所有改动的文件"
5408
5409#: builtin/commit.c:1599
5410msgid "add specified files to index for commit"
5411msgstr "添加指定的文件到索引区等待提交"
5412
5413#: builtin/commit.c:1600
5414msgid "interactively add files"
5415msgstr "交互式添加文件"
5416
5417#: builtin/commit.c:1601
5418msgid "interactively add changes"
5419msgstr "交互式添加变更"
5420
5421#: builtin/commit.c:1602
5422msgid "commit only specified files"
5423msgstr "只提交指定的文件"
5424
5425#: builtin/commit.c:1603
5426msgid "bypass pre-commit hook"
5427msgstr "绕过 pre-commit 钩子"
5428
5429#: builtin/commit.c:1604
5430msgid "show what would be committed"
5431msgstr "显示将要提交的内容"
5432
5433#: builtin/commit.c:1615
5434msgid "amend previous commit"
5435msgstr "修改先前的提交"
5436
5437#: builtin/commit.c:1616
5438msgid "bypass post-rewrite hook"
5439msgstr "绕过 post-rewrite 钩子"
5440
5441#: builtin/commit.c:1621
5442msgid "ok to record an empty change"
5443msgstr "允许一个空提交"
5444
5445#: builtin/commit.c:1623
5446msgid "ok to record a change with an empty message"
5447msgstr "允许空的提交说明"
5448
5449#: builtin/commit.c:1652
5450msgid "could not parse HEAD commit"
5451msgstr "不能解析 HEAD 提交"
5452
5453#: builtin/commit.c:1698
5454#, c-format
5455msgid "Corrupt MERGE_HEAD file (%s)"
5456msgstr "损坏的 MERGE_HEAD 文件(%s)"
5457
5458#: builtin/commit.c:1705
5459msgid "could not read MERGE_MODE"
5460msgstr "不能读取 MERGE_MODE"
5461
5462#: builtin/commit.c:1724
5463#, c-format
5464msgid "could not read commit message: %s"
5465msgstr "不能读取提交说明:%s"
5466
5467#: builtin/commit.c:1735
5468#, c-format
5469msgid "Aborting commit; you did not edit the message.\n"
5470msgstr "终止提交;您未更改来自模版的提交说明。\n"
5471
5472#: builtin/commit.c:1740
5473#, c-format
5474msgid "Aborting commit due to empty commit message.\n"
5475msgstr "终止提交因为提交说明为空。\n"
5476
5477#: builtin/commit.c:1788
5478msgid ""
5479"Repository has been updated, but unable to write\n"
5480"new_index file. Check that disk is not full and quota is\n"
5481"not exceeded, and then \"git reset HEAD\" to recover."
5482msgstr ""
5483"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5484"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5485
5486#: builtin/config.c:8
5487msgid "git config [<options>]"
5488msgstr "git config [<选项>]"
5489
5490#: builtin/config.c:54
5491msgid "Config file location"
5492msgstr "配置文件位置"
5493
5494#: builtin/config.c:55
5495msgid "use global config file"
5496msgstr "使用全局配置文件"
5497
5498#: builtin/config.c:56
5499msgid "use system config file"
5500msgstr "使用系统级配置文件"
5501
5502#: builtin/config.c:57
5503msgid "use repository config file"
5504msgstr "使用仓库级配置文件"
5505
5506#: builtin/config.c:58
5507msgid "use given config file"
5508msgstr "使用指定的配置文件"
5509
5510#: builtin/config.c:59
5511msgid "blob-id"
5512msgstr "数据对象 ID"
5513
5514#: builtin/config.c:59
5515msgid "read config from given blob object"
5516msgstr "从给定的数据对象读取配置"
5517
5518#: builtin/config.c:60
5519msgid "Action"
5520msgstr "操作"
5521
5522#: builtin/config.c:61
5523msgid "get value: name [value-regex]"
5524msgstr "获取值:name [value-regex]"
5525
5526#: builtin/config.c:62
5527msgid "get all values: key [value-regex]"
5528msgstr "获得所有的值:key [value-regex]"
5529
5530#: builtin/config.c:63
5531msgid "get values for regexp: name-regex [value-regex]"
5532msgstr "根据正则表达式获得值:name-regex [value-regex]"
5533
5534#: builtin/config.c:64
5535msgid "get value specific for the URL: section[.var] URL"
5536msgstr "获得 URL 取值:section[.var] URL"
5537
5538#: builtin/config.c:65
5539msgid "replace all matching variables: name value [value_regex]"
5540msgstr "替换所有匹配的变量:name value [value_regex]"
5541
5542#: builtin/config.c:66
5543msgid "add a new variable: name value"
5544msgstr "添加一个新的变量:name value"
5545
5546#: builtin/config.c:67
5547msgid "remove a variable: name [value-regex]"
5548msgstr "删除一个变量:name [value-regex]"
5549
5550#: builtin/config.c:68
5551msgid "remove all matches: name [value-regex]"
5552msgstr "删除所有匹配项:name [value-regex]"
5553
5554#: builtin/config.c:69
5555msgid "rename section: old-name new-name"
5556msgstr "重命名小节:old-name new-name"
5557
5558#: builtin/config.c:70
5559msgid "remove a section: name"
5560msgstr "删除一个小节:name"
5561
5562#: builtin/config.c:71
5563msgid "list all"
5564msgstr "列出所有"
5565
5566#: builtin/config.c:72
5567msgid "open an editor"
5568msgstr "打开一个编辑器"
5569
5570#: builtin/config.c:73
5571msgid "find the color configured: slot [default]"
5572msgstr "获得配置的颜色:配置 [默认]"
5573
5574#: builtin/config.c:74
5575msgid "find the color setting: slot [stdout-is-tty]"
5576msgstr "获得颜色设置:配置 [stdout-is-tty]"
5577
5578#: builtin/config.c:75
5579msgid "Type"
5580msgstr "类型"
5581
5582#: builtin/config.c:76
5583msgid "value is \"true\" or \"false\""
5584msgstr "值是 \"true\" 或 \"false\""
5585
5586#: builtin/config.c:77
5587msgid "value is decimal number"
5588msgstr "值是十进制数"
5589
5590#: builtin/config.c:78
5591msgid "value is --bool or --int"
5592msgstr "值是 --bool or --int"
5593
5594#: builtin/config.c:79
5595msgid "value is a path (file or directory name)"
5596msgstr "值是一个路径(文件或目录名)"
5597
5598#: builtin/config.c:80
5599msgid "Other"
5600msgstr "其它"
5601
5602#: builtin/config.c:81
5603msgid "terminate values with NUL byte"
5604msgstr "终止值是 NUL 字节"
5605
5606#: builtin/config.c:82
5607msgid "show variable names only"
5608msgstr "只显示变量名"
5609
5610#: builtin/config.c:83
5611msgid "respect include directives on lookup"
5612msgstr "查询时参照 include 指令递归查找"
5613
5614#: builtin/config.c:303
5615msgid "unable to parse default color value"
5616msgstr "不能解析默认颜色值"
5617
5618#: builtin/config.c:441
5619#, c-format
5620msgid ""
5621"# This is Git's per-user configuration file.\n"
5622"[user]\n"
5623"# Please adapt and uncomment the following lines:\n"
5624"#\tname = %s\n"
5625"#\temail = %s\n"
5626msgstr ""
5627"# This is Git's per-user configuration file.\n"
5628"[user]\n"
5629"# Please adapt and uncomment the following lines:\n"
5630"#\tname = %s\n"
5631"#\temail = %s\n"
5632
5633#: builtin/config.c:575
5634#, c-format
5635msgid "cannot create configuration file %s"
5636msgstr "不能创建配置文件 %s"
5637
5638#: builtin/count-objects.c:77
5639msgid "git count-objects [-v] [-H | --human-readable]"
5640msgstr "git count-objects [-v] [-H | --human-readable]"
5641
5642#: builtin/count-objects.c:87
5643msgid "print sizes in human readable format"
5644msgstr "以用户可读的格式显示大小"
5645
5646#: builtin/describe.c:17
5647msgid "git describe [<options>] [<commit-ish>...]"
5648msgstr "git describe [<选项>] [<提交号>...]"
5649
5650#: builtin/describe.c:18
5651msgid "git describe [<options>] --dirty"
5652msgstr "git describe [<选项>] --dirty"
5653
5654#: builtin/describe.c:217
5655#, c-format
5656msgid "annotated tag %s not available"
5657msgstr "附注标签 %s 无效"
5658
5659#: builtin/describe.c:221
5660#, c-format
5661msgid "annotated tag %s has no embedded name"
5662msgstr "附注标签 %s 没有嵌入名称"
5663
5664#: builtin/describe.c:223
5665#, c-format
5666msgid "tag '%s' is really '%s' here"
5667msgstr "标签 '%s' 的确是在 '%s'"
5668
5669#: builtin/describe.c:250 builtin/log.c:459
5670#, c-format
5671msgid "Not a valid object name %s"
5672msgstr "不是一个有效的对象名 %s"
5673
5674#: builtin/describe.c:253
5675#, c-format
5676msgid "%s is not a valid '%s' object"
5677msgstr "%s 不是一个有效的 '%s' 对象"
5678
5679#: builtin/describe.c:270
5680#, c-format
5681msgid "no tag exactly matches '%s'"
5682msgstr "没有标签准确匹配 '%s'"
5683
5684#: builtin/describe.c:272
5685#, c-format
5686msgid "searching to describe %s\n"
5687msgstr "搜索描述 %s\n"
5688
5689#: builtin/describe.c:319
5690#, c-format
5691msgid "finished search at %s\n"
5692msgstr "完成搜索 %s\n"
5693
5694#: builtin/describe.c:346
5695#, c-format
5696msgid ""
5697"No annotated tags can describe '%s'.\n"
5698"However, there were unannotated tags: try --tags."
5699msgstr ""
5700"没有附注标签能描述 '%s'。\n"
5701"然而,存在未附注标签:尝试 --tags。"
5702
5703#: builtin/describe.c:350
5704#, c-format
5705msgid ""
5706"No tags can describe '%s'.\n"
5707"Try --always, or create some tags."
5708msgstr ""
5709"没有标签能描述 '%s'。\n"
5710"尝试 --always,或者创建一些标签。"
5711
5712#: builtin/describe.c:371
5713#, c-format
5714msgid "traversed %lu commits\n"
5715msgstr "已遍历 %lu 个提交\n"
5716
5717#: builtin/describe.c:374
5718#, c-format
5719msgid ""
5720"more than %i tags found; listed %i most recent\n"
5721"gave up search at %s\n"
5722msgstr ""
5723"发现多于 %i 个标签,列出最近的 %i 个\n"
5724"在 %s 放弃搜索\n"
5725
5726#: builtin/describe.c:396
5727msgid "find the tag that comes after the commit"
5728msgstr "寻找该提交之后的标签"
5729
5730#: builtin/describe.c:397
5731msgid "debug search strategy on stderr"
5732msgstr "在标准错误上调试搜索策略"
5733
5734#: builtin/describe.c:398
5735msgid "use any ref"
5736msgstr "使用任意引用"
5737
5738#: builtin/describe.c:399
5739msgid "use any tag, even unannotated"
5740msgstr "使用任意标签,即使未附带注释"
5741
5742#: builtin/describe.c:400
5743msgid "always use long format"
5744msgstr "始终使用长提交号格式"
5745
5746#: builtin/describe.c:401
5747msgid "only follow first parent"
5748msgstr "只跟随第一个父提交"
5749
5750#: builtin/describe.c:404
5751msgid "only output exact matches"
5752msgstr "只输出精确匹配"
5753
5754#: builtin/describe.c:406
5755msgid "consider <n> most recent tags (default: 10)"
5756msgstr "考虑最近 <n> 个标签(默认:10)"
5757
5758#: builtin/describe.c:408
5759msgid "only consider tags matching <pattern>"
5760msgstr "只考虑匹配 <模式> 的标签"
5761
5762#: builtin/describe.c:410 builtin/name-rev.c:314
5763msgid "show abbreviated commit object as fallback"
5764msgstr "显示简写的提交号作为后备"
5765
5766#: builtin/describe.c:411
5767msgid "mark"
5768msgstr "标记"
5769
5770#: builtin/describe.c:412
5771msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5772msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5773
5774#: builtin/describe.c:430
5775msgid "--long is incompatible with --abbrev=0"
5776msgstr "--long 与 --abbrev=0 不兼容"
5777
5778#: builtin/describe.c:456
5779msgid "No names found, cannot describe anything."
5780msgstr "没有发现名称,无法描述任何东西。"
5781
5782#: builtin/describe.c:476
5783msgid "--dirty is incompatible with commit-ishes"
5784msgstr "--dirty 不能与提交同时使用"
5785
5786#: builtin/diff.c:86
5787#, c-format
5788msgid "'%s': not a regular file or symlink"
5789msgstr "'%s':不是一个正规文件或符号链接"
5790
5791#: builtin/diff.c:237
5792#, c-format
5793msgid "invalid option: %s"
5794msgstr "无效选项:%s"
5795
5796#: builtin/diff.c:358
5797msgid "Not a git repository"
5798msgstr "不是一个 git 仓库"
5799
5800#: builtin/diff.c:401
5801#, c-format
5802msgid "invalid object '%s' given."
5803msgstr "提供了无效对象 '%s'。"
5804
5805#: builtin/diff.c:410
5806#, c-format
5807msgid "more than two blobs given: '%s'"
5808msgstr "提供了超过两个数据对象:'%s'"
5809
5810#: builtin/diff.c:417
5811#, c-format
5812msgid "unhandled object '%s' given."
5813msgstr "无法处理的对象 '%s'。"
5814
5815#: builtin/fast-export.c:25
5816msgid "git fast-export [rev-list-opts]"
5817msgstr "git fast-export [rev-list-opts]"
5818
5819#: builtin/fast-export.c:980
5820msgid "show progress after <n> objects"
5821msgstr "在 <n> 个对象之后显示进度"
5822
5823#: builtin/fast-export.c:982
5824msgid "select handling of signed tags"
5825msgstr "选择如何处理签名标签"
5826
5827#: builtin/fast-export.c:985
5828msgid "select handling of tags that tag filtered objects"
5829msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5830
5831#: builtin/fast-export.c:988
5832msgid "Dump marks to this file"
5833msgstr "把标记存储到这个文件"
5834
5835#: builtin/fast-export.c:990
5836msgid "Import marks from this file"
5837msgstr "从这个文件导入标记"
5838
5839#: builtin/fast-export.c:992
5840msgid "Fake a tagger when tags lack one"
5841msgstr "当标签缺少标记者字段时,假装提供一个"
5842
5843#: builtin/fast-export.c:994
5844msgid "Output full tree for each commit"
5845msgstr "每次提交都输出整个树"
5846
5847#: builtin/fast-export.c:996
5848msgid "Use the done feature to terminate the stream"
5849msgstr "使用 done 功能来终止流"
5850
5851#: builtin/fast-export.c:997
5852msgid "Skip output of blob data"
5853msgstr "跳过数据对象的输出"
5854
5855#: builtin/fast-export.c:998
5856msgid "refspec"
5857msgstr "引用规格"
5858
5859#: builtin/fast-export.c:999
5860msgid "Apply refspec to exported refs"
5861msgstr "对导出的引用应用引用规格"
5862
5863#: builtin/fast-export.c:1000
5864msgid "anonymize output"
5865msgstr "匿名输出"
5866
5867#: builtin/fetch.c:20
5868msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5869msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5870
5871#: builtin/fetch.c:21
5872msgid "git fetch [<options>] <group>"
5873msgstr "git fetch [<选项>] <组>"
5874
5875#: builtin/fetch.c:22
5876msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5877msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5878
5879#: builtin/fetch.c:23
5880msgid "git fetch --all [<options>]"
5881msgstr "git fetch --all [<选项>]"
5882
5883#: builtin/fetch.c:90 builtin/pull.c:162
5884msgid "fetch from all remotes"
5885msgstr "从所有的远程抓取"
5886
5887#: builtin/fetch.c:92 builtin/pull.c:165
5888msgid "append to .git/FETCH_HEAD instead of overwriting"
5889msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5890
5891#: builtin/fetch.c:94 builtin/pull.c:168
5892msgid "path to upload pack on remote end"
5893msgstr "上传包到远程的路径"
5894
5895#: builtin/fetch.c:95 builtin/pull.c:170
5896msgid "force overwrite of local branch"
5897msgstr "强制覆盖本地分支"
5898
5899#: builtin/fetch.c:97
5900msgid "fetch from multiple remotes"
5901msgstr "从多个远程抓取"
5902
5903#: builtin/fetch.c:99 builtin/pull.c:172
5904msgid "fetch all tags and associated objects"
5905msgstr "抓取所有的标签和关联对象"
5906
5907#: builtin/fetch.c:101
5908msgid "do not fetch all tags (--no-tags)"
5909msgstr "不抓取任何标签(--no-tags)"
5910
5911#: builtin/fetch.c:103 builtin/pull.c:175
5912msgid "prune remote-tracking branches no longer on remote"
5913msgstr "清除远程已经不存在的分支的跟踪分支"
5914
5915# 译者:可选值,不能翻译
5916#: builtin/fetch.c:104 builtin/pull.c:178
5917msgid "on-demand"
5918msgstr "on-demand"
5919
5920#: builtin/fetch.c:105 builtin/pull.c:179
5921msgid "control recursive fetching of submodules"
5922msgstr "控制子模组的递归抓取"
5923
5924#: builtin/fetch.c:109 builtin/pull.c:184
5925msgid "keep downloaded pack"
5926msgstr "保持下载包"
5927
5928#: builtin/fetch.c:111
5929msgid "allow updating of HEAD ref"
5930msgstr "允许更新 HEAD 引用"
5931
5932#: builtin/fetch.c:114 builtin/pull.c:187
5933msgid "deepen history of shallow clone"
5934msgstr "深化浅克隆的历史"
5935
5936#: builtin/fetch.c:116 builtin/pull.c:190
5937msgid "convert to a complete repository"
5938msgstr "转换为一个完整的仓库"
5939
5940#: builtin/fetch.c:118 builtin/log.c:1232
5941msgid "dir"
5942msgstr "目录"
5943
5944#: builtin/fetch.c:119
5945msgid "prepend this to submodule path output"
5946msgstr "在子模组路径输出的前面加上此目录"
5947
5948#: builtin/fetch.c:122
5949msgid "default mode for recursion"
5950msgstr "递归的默认模式"
5951
5952#: builtin/fetch.c:124 builtin/pull.c:193
5953msgid "accept refs that update .git/shallow"
5954msgstr "接受更新 .git/shallow 的引用"
5955
5956#: builtin/fetch.c:125 builtin/pull.c:195
5957msgid "refmap"
5958msgstr "引用映射"
5959
5960#: builtin/fetch.c:126 builtin/pull.c:196
5961msgid "specify fetch refmap"
5962msgstr "指定获取操作的引用映射"
5963
5964#: builtin/fetch.c:378
5965msgid "Couldn't find remote ref HEAD"
5966msgstr "无法发现远程 HEAD 引用"
5967
5968#: builtin/fetch.c:458
5969#, c-format
5970msgid "object %s not found"
5971msgstr "对象 %s 未发现"
5972
5973#: builtin/fetch.c:463
5974msgid "[up to date]"
5975msgstr "[最新]"
5976
5977#: builtin/fetch.c:477
5978#, c-format
5979msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5980msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5981
5982#: builtin/fetch.c:478 builtin/fetch.c:566
5983msgid "[rejected]"
5984msgstr "[已拒绝]"
5985
5986#: builtin/fetch.c:489
5987msgid "[tag update]"
5988msgstr "[标签更新]"
5989
5990# 译者:注意保持前导空格
5991#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
5992msgid " (unable to update local ref)"
5993msgstr " (不能更新本地引用)"
5994
5995#: builtin/fetch.c:509
5996msgid "[new tag]"
5997msgstr "[新标签]"
5998
5999#: builtin/fetch.c:512
6000msgid "[new branch]"
6001msgstr "[新分支]"
6002
6003#: builtin/fetch.c:515
6004msgid "[new ref]"
6005msgstr "[新引用]"
6006
6007#: builtin/fetch.c:561
6008msgid "unable to update local ref"
6009msgstr "不能更新本地引用"
6010
6011#: builtin/fetch.c:561
6012msgid "forced update"
6013msgstr "强制更新"
6014
6015#: builtin/fetch.c:568
6016msgid "(non-fast-forward)"
6017msgstr "(非快进式)"
6018
6019#: builtin/fetch.c:602 builtin/fetch.c:843
6020#, c-format
6021msgid "cannot open %s: %s\n"
6022msgstr "无法打开 %s:%s\n"
6023
6024#: builtin/fetch.c:611
6025#, c-format
6026msgid "%s did not send all necessary objects\n"
6027msgstr "%s 未发送所有必须的对象\n"
6028
6029#: builtin/fetch.c:629
6030#, c-format
6031msgid "reject %s because shallow roots are not allowed to be updated"
6032msgstr "拒绝 %s 因为浅克隆不允许被更新"
6033
6034#: builtin/fetch.c:716 builtin/fetch.c:808
6035#, c-format
6036msgid "From %.*s\n"
6037msgstr "来自 %.*s\n"
6038
6039#: builtin/fetch.c:727
6040#, c-format
6041msgid ""
6042"some local refs could not be updated; try running\n"
6043" 'git remote prune %s' to remove any old, conflicting branches"
6044msgstr ""
6045"一些本地引用不能被更新;尝试运行\n"
6046" 'git remote prune %s' 来删除旧的、有冲突的分支"
6047
6048# 译者:注意保持前导空格
6049#: builtin/fetch.c:779
6050#, c-format
6051msgid " (%s will become dangling)"
6052msgstr " (%s 将成为摇摆状态)"
6053
6054# 译者:注意保持前导空格
6055#: builtin/fetch.c:780
6056#, c-format
6057msgid " (%s has become dangling)"
6058msgstr " (%s 已成为摇摆状态)"
6059
6060#: builtin/fetch.c:812
6061msgid "[deleted]"
6062msgstr "[已删除]"
6063
6064#: builtin/fetch.c:813 builtin/remote.c:1040
6065msgid "(none)"
6066msgstr "(无)"
6067
6068#: builtin/fetch.c:833
6069#, c-format
6070msgid "Refusing to fetch into current branch %s of non-bare repository"
6071msgstr "拒绝获取到非纯仓库的当前分支 %s"
6072
6073#: builtin/fetch.c:852
6074#, c-format
6075msgid "Option \"%s\" value \"%s\" is not valid for %s"
6076msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6077
6078#: builtin/fetch.c:855
6079#, c-format
6080msgid "Option \"%s\" is ignored for %s\n"
6081msgstr "选项 \"%s\" 为 %s 所忽略\n"
6082
6083#: builtin/fetch.c:911
6084#, c-format
6085msgid "Don't know how to fetch from %s"
6086msgstr "不知道如何从 %s 获取"
6087
6088#: builtin/fetch.c:1072
6089#, c-format
6090msgid "Fetching %s\n"
6091msgstr "正在获取 %s\n"
6092
6093#: builtin/fetch.c:1074 builtin/remote.c:96
6094#, c-format
6095msgid "Could not fetch %s"
6096msgstr "不能获取 %s"
6097
6098#: builtin/fetch.c:1092
6099msgid ""
6100"No remote repository specified. Please, specify either a URL or a\n"
6101"remote name from which new revisions should be fetched."
6102msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6103
6104#: builtin/fetch.c:1115
6105msgid "You need to specify a tag name."
6106msgstr "您需要指定一个标签名称。"
6107
6108#: builtin/fetch.c:1157
6109msgid "--depth and --unshallow cannot be used together"
6110msgstr "--depth 和 --unshallow 不能同时使用"
6111
6112#: builtin/fetch.c:1159
6113msgid "--unshallow on a complete repository does not make sense"
6114msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6115
6116#: builtin/fetch.c:1179
6117msgid "fetch --all does not take a repository argument"
6118msgstr "fetch --all 不能带一个仓库参数"
6119
6120#: builtin/fetch.c:1181
6121msgid "fetch --all does not make sense with refspecs"
6122msgstr "fetch --all 带引用规格没有任何意义"
6123
6124#: builtin/fetch.c:1192
6125#, c-format
6126msgid "No such remote or remote group: %s"
6127msgstr "没有这样的远程或远程组:%s"
6128
6129#: builtin/fetch.c:1200
6130msgid "Fetching a group and specifying refspecs does not make sense"
6131msgstr "获取组并指定引用规格没有意义"
6132
6133#: builtin/fmt-merge-msg.c:14
6134msgid ""
6135"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6136msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6137
6138#: builtin/fmt-merge-msg.c:667
6139msgid "populate log with at most <n> entries from shortlog"
6140msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6141
6142#: builtin/fmt-merge-msg.c:670
6143msgid "alias for --log (deprecated)"
6144msgstr "参数 --log 的别名(已弃用)"
6145
6146#: builtin/fmt-merge-msg.c:673
6147msgid "text"
6148msgstr "文本"
6149
6150#: builtin/fmt-merge-msg.c:674
6151msgid "use <text> as start of message"
6152msgstr "使用 <文本> 作为提交说明的开始"
6153
6154#: builtin/fmt-merge-msg.c:675
6155msgid "file to read from"
6156msgstr "从文件中读取"
6157
6158#: builtin/for-each-ref.c:9
6159msgid "git for-each-ref [<options>] [<pattern>]"
6160msgstr "git for-each-ref [<选项>] [<模式>]"
6161
6162#: builtin/for-each-ref.c:10
6163msgid "git for-each-ref [--points-at <object>]"
6164msgstr "git for-each-ref [--points-at <对象>]"
6165
6166#: builtin/for-each-ref.c:11
6167msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6168msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6169
6170#: builtin/for-each-ref.c:12
6171msgid "git for-each-ref [--contains [<object>]]"
6172msgstr "git for-each-ref [--contains [<对象>]]"
6173
6174#: builtin/for-each-ref.c:27
6175msgid "quote placeholders suitably for shells"
6176msgstr "引用占位符适用于 shells"
6177
6178#: builtin/for-each-ref.c:29
6179msgid "quote placeholders suitably for perl"
6180msgstr "引用占位符适用于 perl"
6181
6182#: builtin/for-each-ref.c:31
6183msgid "quote placeholders suitably for python"
6184msgstr "引用占位符适用于 python"
6185
6186#: builtin/for-each-ref.c:33
6187msgid "quote placeholders suitably for Tcl"
6188msgstr "引用占位符适用于 Tcl"
6189
6190#: builtin/for-each-ref.c:36
6191msgid "show only <n> matched refs"
6192msgstr "只显示 <n> 个匹配的引用"
6193
6194#: builtin/for-each-ref.c:37 builtin/tag.c:372
6195msgid "format to use for the output"
6196msgstr "输出格式"
6197
6198#: builtin/for-each-ref.c:41
6199msgid "print only refs which points at the given object"
6200msgstr "只打印指向给定对象的引用"
6201
6202#: builtin/for-each-ref.c:43
6203msgid "print only refs that are merged"
6204msgstr "只打印已经合并的引用"
6205
6206#: builtin/for-each-ref.c:44
6207msgid "print only refs that are not merged"
6208msgstr "只打印没有合并的引用"
6209
6210#: builtin/for-each-ref.c:45
6211msgid "print only refs which contain the commit"
6212msgstr "只打印包含该提交的引用"
6213
6214#: builtin/fsck.c:156 builtin/prune.c:140
6215msgid "Checking connectivity"
6216msgstr "检查连接中"
6217
6218#: builtin/fsck.c:486
6219msgid "Checking object directories"
6220msgstr "检查对象目录中"
6221
6222#: builtin/fsck.c:553
6223msgid "git fsck [<options>] [<object>...]"
6224msgstr "git fsck [<选项>] [<对象>...]"
6225
6226#: builtin/fsck.c:559
6227msgid "show unreachable objects"
6228msgstr "显示不可达的对象"
6229
6230#: builtin/fsck.c:560
6231msgid "show dangling objects"
6232msgstr "显示摇摆的对象"
6233
6234#: builtin/fsck.c:561
6235msgid "report tags"
6236msgstr "报告标签"
6237
6238#: builtin/fsck.c:562
6239msgid "report root nodes"
6240msgstr "报告根节点"
6241
6242#: builtin/fsck.c:563
6243msgid "make index objects head nodes"
6244msgstr "将索引亦作为检查的头节点"
6245
6246#: builtin/fsck.c:564
6247msgid "make reflogs head nodes (default)"
6248msgstr "将引用日志作为检查的头节点(默认)"
6249
6250#: builtin/fsck.c:565
6251msgid "also consider packs and alternate objects"
6252msgstr "也考虑包和备用对象"
6253
6254#: builtin/fsck.c:566
6255msgid "check only connectivity"
6256msgstr "仅检查连通性"
6257
6258#: builtin/fsck.c:567
6259msgid "enable more strict checking"
6260msgstr "启用更严格的检查"
6261
6262#: builtin/fsck.c:569
6263msgid "write dangling objects in .git/lost-found"
6264msgstr "将摇摆对象写入 .git/lost-found 中"
6265
6266#: builtin/fsck.c:570 builtin/prune.c:107
6267msgid "show progress"
6268msgstr "显示进度"
6269
6270#: builtin/fsck.c:631
6271msgid "Checking objects"
6272msgstr "检查对象中"
6273
6274#: builtin/gc.c:25
6275msgid "git gc [<options>]"
6276msgstr "git gc [<选项>]"
6277
6278#: builtin/gc.c:72
6279#, c-format
6280msgid "Invalid %s: '%s'"
6281msgstr "无效 %s:'%s'"
6282
6283#: builtin/gc.c:139
6284#, c-format
6285msgid "insanely long object directory %.*s"
6286msgstr "不正常的长对象目录 %.*s"
6287
6288#: builtin/gc.c:290
6289#, c-format
6290msgid ""
6291"The last gc run reported the following. Please correct the root cause\n"
6292"and remove %s.\n"
6293"Automatic cleanup will not be performed until the file is removed.\n"
6294"\n"
6295"%s"
6296msgstr ""
6297"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6298"在该文件被删除之前,自动清理将不会执行。\n"
6299"\n"
6300"%s"
6301
6302#: builtin/gc.c:327
6303msgid "prune unreferenced objects"
6304msgstr "清除未引用的对象"
6305
6306#: builtin/gc.c:329
6307msgid "be more thorough (increased runtime)"
6308msgstr "更彻底(增加运行时间)"
6309
6310#: builtin/gc.c:330
6311msgid "enable auto-gc mode"
6312msgstr "启用自动垃圾回收模式"
6313
6314#: builtin/gc.c:331
6315msgid "force running gc even if there may be another gc running"
6316msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6317
6318#: builtin/gc.c:373
6319#, c-format
6320msgid "Auto packing the repository in background for optimum performance.\n"
6321msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6322
6323#: builtin/gc.c:375
6324#, c-format
6325msgid "Auto packing the repository for optimum performance.\n"
6326msgstr "自动打包仓库以求最佳性能。\n"
6327
6328#: builtin/gc.c:376
6329#, c-format
6330msgid "See \"git help gc\" for manual housekeeping.\n"
6331msgstr "手工维护参见 \"git help gc\"。\n"
6332
6333#: builtin/gc.c:397
6334#, c-format
6335msgid ""
6336"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6337msgstr ""
6338"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6339
6340#: builtin/gc.c:441
6341msgid ""
6342"There are too many unreachable loose objects; run 'git prune' to remove them."
6343msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6344
6345#: builtin/grep.c:23
6346msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6347msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6348
6349#: builtin/grep.c:218
6350#, c-format
6351msgid "grep: failed to create thread: %s"
6352msgstr "grep:无法创建线程:%s"
6353
6354#: builtin/grep.c:441 builtin/grep.c:476
6355#, c-format
6356msgid "unable to read tree (%s)"
6357msgstr "无法读取树(%s)"
6358
6359#: builtin/grep.c:491
6360#, c-format
6361msgid "unable to grep from object of type %s"
6362msgstr "无法抓取来自于 %s 类型的对象"
6363
6364#: builtin/grep.c:547
6365#, c-format
6366msgid "switch `%c' expects a numerical value"
6367msgstr "开关 `%c' 期望一个数字值"
6368
6369#: builtin/grep.c:564
6370#, c-format
6371msgid "cannot open '%s'"
6372msgstr "不能打开 '%s'"
6373
6374#: builtin/grep.c:633
6375msgid "search in index instead of in the work tree"
6376msgstr "在索引区搜索而不是在工作区"
6377
6378#: builtin/grep.c:635
6379msgid "find in contents not managed by git"
6380msgstr "在未被 git 管理的内容中查找"
6381
6382# 译者:中文字符串拼接,可删除前导空格
6383#: builtin/grep.c:637
6384msgid "search in both tracked and untracked files"
6385msgstr "在跟踪和未跟踪的文件中搜索"
6386
6387#: builtin/grep.c:639
6388msgid "ignore files specified via '.gitignore'"
6389msgstr "忽略 '.gitignore' 包含的文件"
6390
6391#: builtin/grep.c:642
6392msgid "show non-matching lines"
6393msgstr "显示未匹配的行"
6394
6395#: builtin/grep.c:644
6396msgid "case insensitive matching"
6397msgstr "不区分大小写匹配"
6398
6399#: builtin/grep.c:646
6400msgid "match patterns only at word boundaries"
6401msgstr "只在单词边界匹配模式"
6402
6403#: builtin/grep.c:648
6404msgid "process binary files as text"
6405msgstr "把二进制文件当做文本处理"
6406
6407#: builtin/grep.c:650
6408msgid "don't match patterns in binary files"
6409msgstr "不在二进制文件中匹配模式"
6410
6411#: builtin/grep.c:653
6412msgid "process binary files with textconv filters"
6413msgstr "用 textconv 过滤器处理二进制文件"
6414
6415#: builtin/grep.c:655
6416msgid "descend at most <depth> levels"
6417msgstr "最多以指定的深度向下寻找"
6418
6419#: builtin/grep.c:659
6420msgid "use extended POSIX regular expressions"
6421msgstr "使用扩展的 POSIX 正则表达式"
6422
6423#: builtin/grep.c:662
6424msgid "use basic POSIX regular expressions (default)"
6425msgstr "使用基本的 POSIX 正则表达式(默认)"
6426
6427#: builtin/grep.c:665
6428msgid "interpret patterns as fixed strings"
6429msgstr "把模式解析为固定的字符串"
6430
6431#: builtin/grep.c:668
6432msgid "use Perl-compatible regular expressions"
6433msgstr "使用 Perl 兼容的正则表达式"
6434
6435#: builtin/grep.c:671
6436msgid "show line numbers"
6437msgstr "显示行号"
6438
6439#: builtin/grep.c:672
6440msgid "don't show filenames"
6441msgstr "不显示文件名"
6442
6443#: builtin/grep.c:673
6444msgid "show filenames"
6445msgstr "显示文件名"
6446
6447#: builtin/grep.c:675
6448msgid "show filenames relative to top directory"
6449msgstr "显示相对于顶级目录的文件名"
6450
6451#: builtin/grep.c:677
6452msgid "show only filenames instead of matching lines"
6453msgstr "只显示文件名而不显示匹配的行"
6454
6455#: builtin/grep.c:679
6456msgid "synonym for --files-with-matches"
6457msgstr "和 --files-with-matches 同义"
6458
6459#: builtin/grep.c:682
6460msgid "show only the names of files without match"
6461msgstr "只显示未匹配的文件名"
6462
6463#: builtin/grep.c:684
6464msgid "print NUL after filenames"
6465msgstr "在文件名后输出 NUL 字符"
6466
6467#: builtin/grep.c:686
6468msgid "show the number of matches instead of matching lines"
6469msgstr "显示总匹配行数,而不显示匹配的行"
6470
6471#: builtin/grep.c:687
6472msgid "highlight matches"
6473msgstr "高亮显示匹配项"
6474
6475#: builtin/grep.c:689
6476msgid "print empty line between matches from different files"
6477msgstr "在不同文件的匹配项之间打印空行"
6478
6479#: builtin/grep.c:691
6480msgid "show filename only once above matches from same file"
6481msgstr "只在同一文件的匹配项的上面显示一次文件名"
6482
6483#: builtin/grep.c:694
6484msgid "show <n> context lines before and after matches"
6485msgstr "显示匹配项前后的 <n> 行上下文"
6486
6487#: builtin/grep.c:697
6488msgid "show <n> context lines before matches"
6489msgstr "显示匹配项前 <n> 行上下文"
6490
6491#: builtin/grep.c:699
6492msgid "show <n> context lines after matches"
6493msgstr "显示匹配项后 <n> 行上下文"
6494
6495#: builtin/grep.c:700
6496msgid "shortcut for -C NUM"
6497msgstr "快捷键 -C 数字"
6498
6499#: builtin/grep.c:703
6500msgid "show a line with the function name before matches"
6501msgstr "在匹配的前面显示一行函数名"
6502
6503#: builtin/grep.c:705
6504msgid "show the surrounding function"
6505msgstr "显示所在函数的前后内容"
6506
6507#: builtin/grep.c:708
6508msgid "read patterns from file"
6509msgstr "从文件读取模式"
6510
6511#: builtin/grep.c:710
6512msgid "match <pattern>"
6513msgstr "匹配 <模式>"
6514
6515#: builtin/grep.c:712
6516msgid "combine patterns specified with -e"
6517msgstr "组合用 -e 参数设定的模式"
6518
6519#: builtin/grep.c:724
6520msgid "indicate hit with exit status without output"
6521msgstr "不输出,而用退出码标识命中状态"
6522
6523#: builtin/grep.c:726
6524msgid "show only matches from files that match all patterns"
6525msgstr "只显示匹配所有模式的文件中的匹配"
6526
6527#: builtin/grep.c:728
6528msgid "show parse tree for grep expression"
6529msgstr "显示 grep 表达式的解析树"
6530
6531#: builtin/grep.c:732
6532msgid "pager"
6533msgstr "分页"
6534
6535#: builtin/grep.c:732
6536msgid "show matching files in the pager"
6537msgstr "分页显示匹配的文件"
6538
6539#: builtin/grep.c:735
6540msgid "allow calling of grep(1) (ignored by this build)"
6541msgstr "允许调用 grep(1)(本次构建忽略)"
6542
6543#: builtin/grep.c:793
6544msgid "no pattern given."
6545msgstr "未提供模式匹配。"
6546
6547#: builtin/grep.c:851
6548msgid "--open-files-in-pager only works on the worktree"
6549msgstr "--open-files-in-pager 仅用于工作区"
6550
6551#: builtin/grep.c:877
6552msgid "--cached or --untracked cannot be used with --no-index."
6553msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6554
6555#: builtin/grep.c:882
6556msgid "--no-index or --untracked cannot be used with revs."
6557msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6558
6559#: builtin/grep.c:885
6560msgid "--[no-]exclude-standard cannot be used for tracked contents."
6561msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6562
6563#: builtin/grep.c:893
6564msgid "both --cached and trees are given."
6565msgstr "同时给出了 --cached 和树对象。"
6566
6567#: builtin/hash-object.c:80
6568msgid ""
6569"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6570"[--] <file>..."
6571msgstr ""
6572"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6573"[--] <文件>..."
6574
6575#: builtin/hash-object.c:81
6576msgid "git hash-object --stdin-paths"
6577msgstr "git hash-object --stdin-paths"
6578
6579#: builtin/hash-object.c:92
6580msgid "type"
6581msgstr "类型"
6582
6583#: builtin/hash-object.c:92
6584msgid "object type"
6585msgstr "对象类型"
6586
6587#: builtin/hash-object.c:93
6588msgid "write the object into the object database"
6589msgstr "将对象写入对象数据库"
6590
6591#: builtin/hash-object.c:95
6592msgid "read the object from stdin"
6593msgstr "从标准输入读取对象"
6594
6595#: builtin/hash-object.c:97
6596msgid "store file as is without filters"
6597msgstr "原样存储文件不使用过滤器"
6598
6599#: builtin/hash-object.c:98
6600msgid ""
6601"just hash any random garbage to create corrupt objects for debugging Git"
6602msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6603
6604#: builtin/hash-object.c:99
6605msgid "process file as it were from this path"
6606msgstr "处理文件并假设其来自于此路径"
6607
6608#: builtin/help.c:41
6609msgid "print all available commands"
6610msgstr "打印所有可用的命令"
6611
6612#: builtin/help.c:42
6613msgid "print list of useful guides"
6614msgstr "显示有用的指南列表"
6615
6616#: builtin/help.c:43
6617msgid "show man page"
6618msgstr "显示 man 手册"
6619
6620#: builtin/help.c:44
6621msgid "show manual in web browser"
6622msgstr "在 web 浏览器中显示手册"
6623
6624#: builtin/help.c:46
6625msgid "show info page"
6626msgstr "显示 info 手册"
6627
6628#: builtin/help.c:52
6629msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6630msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6631
6632#: builtin/help.c:64
6633#, c-format
6634msgid "unrecognized help format '%s'"
6635msgstr "未能识别的帮助格式 '%s'"
6636
6637#: builtin/help.c:91
6638msgid "Failed to start emacsclient."
6639msgstr "无法启动 emacsclient。"
6640
6641#: builtin/help.c:104
6642msgid "Failed to parse emacsclient version."
6643msgstr "无法解析 emacsclient 版本。"
6644
6645#: builtin/help.c:112
6646#, c-format
6647msgid "emacsclient version '%d' too old (< 22)."
6648msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6649
6650#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6651#, c-format
6652msgid "failed to exec '%s': %s"
6653msgstr "无法执行 '%s':%s"
6654
6655#: builtin/help.c:208
6656#, c-format
6657msgid ""
6658"'%s': path for unsupported man viewer.\n"
6659"Please consider using 'man.<tool>.cmd' instead."
6660msgstr ""
6661"'%s':不支持的 man 手册查看器的路径。\n"
6662"请使用 'man.<工具>.cmd'。"
6663
6664#: builtin/help.c:220
6665#, c-format
6666msgid ""
6667"'%s': cmd for supported man viewer.\n"
6668"Please consider using 'man.<tool>.path' instead."
6669msgstr ""
6670"'%s': 支持的 man 手册查看器命令。\n"
6671"请使用 'man.<工具>.path'。"
6672
6673#: builtin/help.c:337
6674#, c-format
6675msgid "'%s': unknown man viewer."
6676msgstr "'%s':未知的 man 查看器。"
6677
6678#: builtin/help.c:354
6679msgid "no man viewer handled the request"
6680msgstr "没有 man 查看器处理此请求"
6681
6682#: builtin/help.c:362
6683msgid "no info viewer handled the request"
6684msgstr "没有 info 查看器处理此请求"
6685
6686#: builtin/help.c:411
6687msgid "Defining attributes per path"
6688msgstr "定义路径的属性"
6689
6690#: builtin/help.c:412
6691msgid "Everyday Git With 20 Commands Or So"
6692msgstr "每一天 Git 常用的约 20 条命令"
6693
6694#: builtin/help.c:413
6695msgid "A Git glossary"
6696msgstr "Git 词汇表"
6697
6698#: builtin/help.c:414
6699msgid "Specifies intentionally untracked files to ignore"
6700msgstr "忽略指定的未跟踪文件"
6701
6702#: builtin/help.c:415
6703msgid "Defining submodule properties"
6704msgstr "定义子模组属性"
6705
6706#: builtin/help.c:416
6707msgid "Specifying revisions and ranges for Git"
6708msgstr "指定 Git 的版本和版本范围"
6709
6710#: builtin/help.c:417
6711msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6712msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6713
6714#: builtin/help.c:418
6715msgid "An overview of recommended workflows with Git"
6716msgstr "Git 推荐的工作流概览"
6717
6718#: builtin/help.c:430
6719msgid "The common Git guides are:\n"
6720msgstr "最常用的 Git 向导有:\n"
6721
6722#: builtin/help.c:451 builtin/help.c:468
6723#, c-format
6724msgid "usage: %s%s"
6725msgstr "用法:%s%s"
6726
6727#: builtin/help.c:484
6728#, c-format
6729msgid "`git %s' is aliased to `%s'"
6730msgstr "`git %s' 是 `%s' 的别名"
6731
6732#: builtin/index-pack.c:152
6733#, c-format
6734msgid "unable to open %s"
6735msgstr "不能打开 %s"
6736
6737#: builtin/index-pack.c:202
6738#, c-format
6739msgid "object type mismatch at %s"
6740msgstr "%s 的对象类型不匹配"
6741
6742#: builtin/index-pack.c:222
6743#, c-format
6744msgid "did not receive expected object %s"
6745msgstr "未能获取期望的对象 %s"
6746
6747#: builtin/index-pack.c:225
6748#, c-format
6749msgid "object %s: expected type %s, found %s"
6750msgstr "对象 %s:期待类型 %s,却是 %s"
6751
6752#: builtin/index-pack.c:267
6753#, c-format
6754msgid "cannot fill %d byte"
6755msgid_plural "cannot fill %d bytes"
6756msgstr[0] "无法填充 %d 字节"
6757msgstr[1] "无法填充 %d 字节"
6758
6759#: builtin/index-pack.c:277
6760msgid "early EOF"
6761msgstr "过早的文件结束符(EOF)"
6762
6763#: builtin/index-pack.c:278
6764msgid "read error on input"
6765msgstr "输入上的读错误"
6766
6767#: builtin/index-pack.c:290
6768msgid "used more bytes than were available"
6769msgstr "用掉了超过可用的字节"
6770
6771#: builtin/index-pack.c:297
6772msgid "pack too large for current definition of off_t"
6773msgstr "包太大超过了当前 off_t 的定义"
6774
6775#: builtin/index-pack.c:313
6776#, c-format
6777msgid "unable to create '%s'"
6778msgstr "不能创建 '%s'"
6779
6780#: builtin/index-pack.c:318
6781#, c-format
6782msgid "cannot open packfile '%s'"
6783msgstr "无法打开包文件 '%s'"
6784
6785#: builtin/index-pack.c:332
6786msgid "pack signature mismatch"
6787msgstr "包签名不匹配"
6788
6789#: builtin/index-pack.c:334
6790#, c-format
6791msgid "pack version %<PRIu32> unsupported"
6792msgstr "不支持包版本 %<PRIu32>"
6793
6794#: builtin/index-pack.c:352
6795#, c-format
6796msgid "pack has bad object at offset %lu: %s"
6797msgstr "包中有错误的对象位于 %lu:%s"
6798
6799#: builtin/index-pack.c:473
6800#, c-format
6801msgid "inflate returned %d"
6802msgstr "解压缩返回 %d"
6803
6804#: builtin/index-pack.c:522
6805msgid "offset value overflow for delta base object"
6806msgstr "偏移值覆盖了 delta 基准对象"
6807
6808#: builtin/index-pack.c:530
6809msgid "delta base offset is out of bound"
6810msgstr "delta 基准偏移越界"
6811
6812#: builtin/index-pack.c:538
6813#, c-format
6814msgid "unknown object type %d"
6815msgstr "未知对象类型 %d"
6816
6817#: builtin/index-pack.c:569
6818msgid "cannot pread pack file"
6819msgstr "无法读取包文件"
6820
6821#: builtin/index-pack.c:571
6822#, c-format
6823msgid "premature end of pack file, %lu byte missing"
6824msgid_plural "premature end of pack file, %lu bytes missing"
6825msgstr[0] "包文件过早结束,缺少 %lu 字节"
6826msgstr[1] "包文件过早结束,缺少 %lu 字节"
6827
6828#: builtin/index-pack.c:597
6829msgid "serious inflate inconsistency"
6830msgstr "解压缩严重的不一致"
6831
6832#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6833#: builtin/index-pack.c:806 builtin/index-pack.c:815
6834#, c-format
6835msgid "SHA1 COLLISION FOUND WITH %s !"
6836msgstr "发现 %s 出现 SHA1 冲突!"
6837
6838#: builtin/index-pack.c:746 builtin/pack-objects.c:162
6839#: builtin/pack-objects.c:254
6840#, c-format
6841msgid "unable to read %s"
6842msgstr "不能读 %s"
6843
6844#: builtin/index-pack.c:812
6845#, c-format
6846msgid "cannot read existing object %s"
6847msgstr "不能读取现存对象 %s"
6848
6849#: builtin/index-pack.c:826
6850#, c-format
6851msgid "invalid blob object %s"
6852msgstr "无效的数据对象 %s"
6853
6854#: builtin/index-pack.c:840
6855#, c-format
6856msgid "invalid %s"
6857msgstr "无效的 %s"
6858
6859#: builtin/index-pack.c:843
6860msgid "Error in object"
6861msgstr "对象中出错"
6862
6863#: builtin/index-pack.c:845
6864#, c-format
6865msgid "Not all child objects of %s are reachable"
6866msgstr "%s 的所有子对象并非都可达"
6867
6868#: builtin/index-pack.c:917 builtin/index-pack.c:948
6869msgid "failed to apply delta"
6870msgstr "无法应用 delta"
6871
6872#: builtin/index-pack.c:1118
6873msgid "Receiving objects"
6874msgstr "接收对象中"
6875
6876#: builtin/index-pack.c:1118
6877msgid "Indexing objects"
6878msgstr "索引对象中"
6879
6880#: builtin/index-pack.c:1150
6881msgid "pack is corrupted (SHA1 mismatch)"
6882msgstr "包冲突(SHA1 不匹配)"
6883
6884#: builtin/index-pack.c:1155
6885msgid "cannot fstat packfile"
6886msgstr "不能枚举包文件状态"
6887
6888#: builtin/index-pack.c:1158
6889msgid "pack has junk at the end"
6890msgstr "包的结尾有垃圾数据"
6891
6892#: builtin/index-pack.c:1169
6893msgid "confusion beyond insanity in parse_pack_objects()"
6894msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6895
6896#: builtin/index-pack.c:1194
6897msgid "Resolving deltas"
6898msgstr "处理 delta 中"
6899
6900#: builtin/index-pack.c:1205
6901#, c-format
6902msgid "unable to create thread: %s"
6903msgstr "不能创建线程:%s"
6904
6905#: builtin/index-pack.c:1247
6906msgid "confusion beyond insanity"
6907msgstr "不可理喻"
6908
6909#: builtin/index-pack.c:1253
6910#, c-format
6911msgid "completed with %d local objects"
6912msgstr "完成 %d 个本地对象"
6913
6914#: builtin/index-pack.c:1263
6915#, c-format
6916msgid "Unexpected tail checksum for %s (disk corruption?)"
6917msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6918
6919#: builtin/index-pack.c:1267
6920#, c-format
6921msgid "pack has %d unresolved delta"
6922msgid_plural "pack has %d unresolved deltas"
6923msgstr[0] "包有 %d 个未解决的 delta"
6924msgstr[1] "包有 %d 个未解决的 delta"
6925
6926#: builtin/index-pack.c:1291
6927#, c-format
6928msgid "unable to deflate appended object (%d)"
6929msgstr "不能压缩附加对象(%d)"
6930
6931#: builtin/index-pack.c:1367
6932#, c-format
6933msgid "local object %s is corrupt"
6934msgstr "本地对象 %s 已损坏"
6935
6936#: builtin/index-pack.c:1391
6937msgid "error while closing pack file"
6938msgstr "关闭包文件时出错"
6939
6940#: builtin/index-pack.c:1404
6941#, c-format
6942msgid "cannot write keep file '%s'"
6943msgstr "无法写保留文件 '%s'"
6944
6945#: builtin/index-pack.c:1412
6946#, c-format
6947msgid "cannot close written keep file '%s'"
6948msgstr "无法关闭保留文件 '%s'"
6949
6950#: builtin/index-pack.c:1425
6951msgid "cannot store pack file"
6952msgstr "无法存储包文件"
6953
6954#: builtin/index-pack.c:1436
6955msgid "cannot store index file"
6956msgstr "无法存储索引文件"
6957
6958#: builtin/index-pack.c:1469
6959#, c-format
6960msgid "bad pack.indexversion=%<PRIu32>"
6961msgstr "坏的 pack.indexversion=%<PRIu32>"
6962
6963#: builtin/index-pack.c:1475
6964#, c-format
6965msgid "invalid number of threads specified (%d)"
6966msgstr "指定的线程数无效(%d)"
6967
6968#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
6969#, c-format
6970msgid "no threads support, ignoring %s"
6971msgstr "没有线程支持,忽略 %s"
6972
6973#: builtin/index-pack.c:1537
6974#, c-format
6975msgid "Cannot open existing pack file '%s'"
6976msgstr "无法打开现存包文件 '%s'"
6977
6978#: builtin/index-pack.c:1539
6979#, c-format
6980msgid "Cannot open existing pack idx file for '%s'"
6981msgstr "无法为 %s 打开包索引文件"
6982
6983#: builtin/index-pack.c:1586
6984#, c-format
6985msgid "non delta: %d object"
6986msgid_plural "non delta: %d objects"
6987msgstr[0] "非 delta:%d 个对象"
6988msgstr[1] "非 delta:%d 个对象"
6989
6990#: builtin/index-pack.c:1593
6991#, c-format
6992msgid "chain length = %d: %lu object"
6993msgid_plural "chain length = %d: %lu objects"
6994msgstr[0] "链长 = %d: %lu 对象"
6995msgstr[1] "链长 = %d: %lu 对象"
6996
6997#: builtin/index-pack.c:1623
6998msgid "Cannot come back to cwd"
6999msgstr "无法返回当前工作目录"
7000
7001#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
7002#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
7003#, c-format
7004msgid "bad %s"
7005msgstr "错误选项 %s"
7006
7007#: builtin/index-pack.c:1708
7008msgid "--fix-thin cannot be used without --stdin"
7009msgstr "--fix-thin 不能和 --stdin 同时使用"
7010
7011#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
7012#, c-format
7013msgid "packfile name '%s' does not end with '.pack'"
7014msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7015
7016#: builtin/index-pack.c:1729
7017msgid "--verify with no packfile name given"
7018msgstr "--verify 没有提供包文件名参数"
7019
7020#: builtin/init-db.c:55
7021#, c-format
7022msgid "cannot stat '%s'"
7023msgstr "不能枚举 '%s' 状态"
7024
7025#: builtin/init-db.c:61
7026#, c-format
7027msgid "cannot stat template '%s'"
7028msgstr "不能枚举模版 '%s' 状态"
7029
7030#: builtin/init-db.c:66
7031#, c-format
7032msgid "cannot opendir '%s'"
7033msgstr "不能打开目录 '%s'"
7034
7035#: builtin/init-db.c:77
7036#, c-format
7037msgid "cannot readlink '%s'"
7038msgstr "不能读取链接 '%s'"
7039
7040#: builtin/init-db.c:79
7041#, c-format
7042msgid "cannot symlink '%s' '%s'"
7043msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7044
7045#: builtin/init-db.c:85
7046#, c-format
7047msgid "cannot copy '%s' to '%s'"
7048msgstr "不能拷贝 '%s' 至 '%s'"
7049
7050#: builtin/init-db.c:89
7051#, c-format
7052msgid "ignoring template %s"
7053msgstr "忽略模版 %s"
7054
7055#: builtin/init-db.c:118
7056#, c-format
7057msgid "templates not found %s"
7058msgstr "模版未找到 %s"
7059
7060#: builtin/init-db.c:131
7061#, c-format
7062msgid "not copying templates of a wrong format version %d from '%s'"
7063msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7064
7065#: builtin/init-db.c:309 builtin/init-db.c:312
7066#, c-format
7067msgid "%s already exists"
7068msgstr "%s 已经存在"
7069
7070#: builtin/init-db.c:340
7071#, c-format
7072msgid "unable to handle file type %d"
7073msgstr "不能处理 %d 类型的文件"
7074
7075#: builtin/init-db.c:343
7076#, c-format
7077msgid "unable to move %s to %s"
7078msgstr "不能移动 %s 至 %s"
7079
7080#. TRANSLATORS: The first '%s' is either "Reinitialized
7081#. existing" or "Initialized empty", the second " shared" or
7082#. "", and the last '%s%s' is the verbatim directory name.
7083#: builtin/init-db.c:399
7084#, c-format
7085msgid "%s%s Git repository in %s%s\n"
7086msgstr "%s%s Git 仓库于 %s%s\n"
7087
7088#: builtin/init-db.c:400
7089msgid "Reinitialized existing"
7090msgstr "重新初始化现存的"
7091
7092#: builtin/init-db.c:400
7093msgid "Initialized empty"
7094msgstr "初始化空的"
7095
7096# 译者:中文字符串拼接,可删除前导空格
7097#: builtin/init-db.c:401
7098msgid " shared"
7099msgstr "共享"
7100
7101#: builtin/init-db.c:448
7102msgid ""
7103"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7104"shared[=<permissions>]] [<directory>]"
7105msgstr ""
7106"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7107"[<目录>]"
7108
7109#: builtin/init-db.c:471
7110msgid "permissions"
7111msgstr "权限"
7112
7113#: builtin/init-db.c:472
7114msgid "specify that the git repository is to be shared amongst several users"
7115msgstr "指定 git 仓库是多个用户之间共享的"
7116
7117#: builtin/init-db.c:506 builtin/init-db.c:511
7118#, c-format
7119msgid "cannot mkdir %s"
7120msgstr "不能创建目录 %s"
7121
7122#: builtin/init-db.c:515
7123#, c-format
7124msgid "cannot chdir to %s"
7125msgstr "不能切换目录到 %s"
7126
7127#: builtin/init-db.c:536
7128#, c-format
7129msgid ""
7130"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7131"dir=<directory>)"
7132msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7133
7134#: builtin/init-db.c:564
7135#, c-format
7136msgid "Cannot access work tree '%s'"
7137msgstr "不能访问工作区 '%s'"
7138
7139#: builtin/interpret-trailers.c:15
7140msgid ""
7141"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
7142"[<file>...]"
7143msgstr ""
7144"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
7145">...]"
7146
7147#: builtin/interpret-trailers.c:25
7148msgid "trim empty trailers"
7149msgstr "删除空签名"
7150
7151#: builtin/interpret-trailers.c:26
7152msgid "trailer"
7153msgstr "签名"
7154
7155#: builtin/interpret-trailers.c:27
7156msgid "trailer(s) to add"
7157msgstr "要添加的签名"
7158
7159#: builtin/log.c:43
7160msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7161msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7162
7163#: builtin/log.c:44
7164msgid "git show [<options>] <object>..."
7165msgstr "git show [<选项>] <对象>..."
7166
7167#: builtin/log.c:83
7168#, c-format
7169msgid "invalid --decorate option: %s"
7170msgstr "无效的 --decorate 选项:%s"
7171
7172#: builtin/log.c:131
7173msgid "suppress diff output"
7174msgstr "不显示差异输出"
7175
7176#: builtin/log.c:132
7177msgid "show source"
7178msgstr "显示源"
7179
7180#: builtin/log.c:133
7181msgid "Use mail map file"
7182msgstr "使用邮件映射文件"
7183
7184#: builtin/log.c:134
7185msgid "decorate options"
7186msgstr "修饰选项"
7187
7188#: builtin/log.c:137
7189msgid "Process line range n,m in file, counting from 1"
7190msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7191
7192#: builtin/log.c:233
7193#, c-format
7194msgid "Final output: %d %s\n"
7195msgstr "最终输出:%d %s\n"
7196
7197#: builtin/log.c:465
7198#, c-format
7199msgid "git show %s: bad file"
7200msgstr "git show %s: 损坏的文件"
7201
7202#: builtin/log.c:479 builtin/log.c:572
7203#, c-format
7204msgid "Could not read object %s"
7205msgstr "不能读取对象 %s"
7206
7207#: builtin/log.c:596
7208#, c-format
7209msgid "Unknown type: %d"
7210msgstr "未知类型:%d"
7211
7212#: builtin/log.c:714
7213msgid "format.headers without value"
7214msgstr "format.headers 没有值"
7215
7216#: builtin/log.c:798
7217msgid "name of output directory is too long"
7218msgstr "输出目录名太长"
7219
7220#: builtin/log.c:813
7221#, c-format
7222msgid "Cannot open patch file %s"
7223msgstr "无法打开补丁文件 %s"
7224
7225#: builtin/log.c:827
7226msgid "Need exactly one range."
7227msgstr "只需要一个范围。"
7228
7229#: builtin/log.c:837
7230msgid "Not a range."
7231msgstr "不是一个范围。"
7232
7233#: builtin/log.c:943
7234msgid "Cover letter needs email format"
7235msgstr "信封需要邮件地址格式"
7236
7237#: builtin/log.c:1022
7238#, c-format
7239msgid "insane in-reply-to: %s"
7240msgstr "不正常的 in-reply-to:%s"
7241
7242#: builtin/log.c:1050
7243msgid "git format-patch [<options>] [<since> | <revision-range>]"
7244msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7245
7246#: builtin/log.c:1095
7247msgid "Two output directories?"
7248msgstr "两个输出目录?"
7249
7250#: builtin/log.c:1210
7251msgid "use [PATCH n/m] even with a single patch"
7252msgstr "使用 [PATCH n/m],即使只有一个补丁"
7253
7254#: builtin/log.c:1213
7255msgid "use [PATCH] even with multiple patches"
7256msgstr "使用 [PATCH],即使有多个补丁"
7257
7258#: builtin/log.c:1217
7259msgid "print patches to standard out"
7260msgstr "打印补丁到标准输出"
7261
7262#: builtin/log.c:1219
7263msgid "generate a cover letter"
7264msgstr "生成一封附信"
7265
7266#: builtin/log.c:1221
7267msgid "use simple number sequence for output file names"
7268msgstr "使用简单的数字序列作为输出文件名"
7269
7270#: builtin/log.c:1222
7271msgid "sfx"
7272msgstr "后缀"
7273
7274#: builtin/log.c:1223
7275msgid "use <sfx> instead of '.patch'"
7276msgstr "使用 <后缀> 代替 '.patch'"
7277
7278#: builtin/log.c:1225
7279msgid "start numbering patches at <n> instead of 1"
7280msgstr "补丁以 <n> 开始编号,而不是1"
7281
7282#: builtin/log.c:1227
7283msgid "mark the series as Nth re-roll"
7284msgstr "标记补丁系列是第几次重制"
7285
7286#: builtin/log.c:1229
7287msgid "Use [<prefix>] instead of [PATCH]"
7288msgstr "使用 [<前缀>] 代替 [PATCH]"
7289
7290#: builtin/log.c:1232
7291msgid "store resulting files in <dir>"
7292msgstr "把结果文件存储在 <目录>"
7293
7294#: builtin/log.c:1235
7295msgid "don't strip/add [PATCH]"
7296msgstr "不删除/添加 [PATCH]"
7297
7298#: builtin/log.c:1238
7299msgid "don't output binary diffs"
7300msgstr "不输出二进制差异"
7301
7302#: builtin/log.c:1240
7303msgid "don't include a patch matching a commit upstream"
7304msgstr "不包含已在上游提交中的补丁"
7305
7306#: builtin/log.c:1242
7307msgid "show patch format instead of default (patch + stat)"
7308msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7309
7310#: builtin/log.c:1244
7311msgid "Messaging"
7312msgstr "邮件发送"
7313
7314#: builtin/log.c:1245
7315msgid "header"
7316msgstr "header"
7317
7318#: builtin/log.c:1246
7319msgid "add email header"
7320msgstr "添加邮件头"
7321
7322#: builtin/log.c:1247 builtin/log.c:1249
7323msgid "email"
7324msgstr "邮件地址"
7325
7326#: builtin/log.c:1247
7327msgid "add To: header"
7328msgstr "添加收件人"
7329
7330#: builtin/log.c:1249
7331msgid "add Cc: header"
7332msgstr "添加抄送"
7333
7334#: builtin/log.c:1251
7335msgid "ident"
7336msgstr "标识"
7337
7338#: builtin/log.c:1252
7339msgid "set From address to <ident> (or committer ident if absent)"
7340msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7341
7342#: builtin/log.c:1254
7343msgid "message-id"
7344msgstr "邮件标识"
7345
7346#: builtin/log.c:1255
7347msgid "make first mail a reply to <message-id>"
7348msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7349
7350#: builtin/log.c:1256 builtin/log.c:1259
7351msgid "boundary"
7352msgstr "边界"
7353
7354#: builtin/log.c:1257
7355msgid "attach the patch"
7356msgstr "附件方式添加补丁"
7357
7358#: builtin/log.c:1260
7359msgid "inline the patch"
7360msgstr "内联显示补丁"
7361
7362#: builtin/log.c:1264
7363msgid "enable message threading, styles: shallow, deep"
7364msgstr "启用邮件线索,风格:浅,深"
7365
7366#: builtin/log.c:1266
7367msgid "signature"
7368msgstr "签名"
7369
7370#: builtin/log.c:1267
7371msgid "add a signature"
7372msgstr "添加一个签名"
7373
7374#: builtin/log.c:1269
7375msgid "add a signature from a file"
7376msgstr "从文件添加一个签名"
7377
7378#: builtin/log.c:1270
7379msgid "don't print the patch filenames"
7380msgstr "不要打印补丁文件名"
7381
7382#: builtin/log.c:1359
7383msgid "-n and -k are mutually exclusive."
7384msgstr "-n 和 -k 互斥。"
7385
7386#: builtin/log.c:1361
7387msgid "--subject-prefix and -k are mutually exclusive."
7388msgstr "--subject-prefix 和 -k 互斥。"
7389
7390#: builtin/log.c:1369
7391msgid "--name-only does not make sense"
7392msgstr "--name-only 无意义"
7393
7394#: builtin/log.c:1371
7395msgid "--name-status does not make sense"
7396msgstr "--name-status 无意义"
7397
7398#: builtin/log.c:1373
7399msgid "--check does not make sense"
7400msgstr "--check 无意义"
7401
7402#: builtin/log.c:1396
7403msgid "standard output, or directory, which one?"
7404msgstr "标准输出或目录,哪一个?"
7405
7406#: builtin/log.c:1398
7407#, c-format
7408msgid "Could not create directory '%s'"
7409msgstr "不能创建目录 '%s'"
7410
7411#: builtin/log.c:1495
7412#, c-format
7413msgid "unable to read signature file '%s'"
7414msgstr "无法读取签名文件 '%s'"
7415
7416#: builtin/log.c:1558
7417msgid "Failed to create output files"
7418msgstr "无法创建输出文件"
7419
7420#: builtin/log.c:1606
7421msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7422msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7423
7424#: builtin/log.c:1660
7425#, c-format
7426msgid ""
7427"Could not find a tracked remote branch, please specify <upstream> manually.\n"
7428msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7429
7430#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
7431#, c-format
7432msgid "Unknown commit %s"
7433msgstr "未知提交 %s"
7434
7435#: builtin/ls-files.c:358
7436msgid "git ls-files [<options>] [<file>...]"
7437msgstr "git ls-files [<选项>] [<文件>...]"
7438
7439#: builtin/ls-files.c:415
7440msgid "identify the file status with tags"
7441msgstr "用标签标识文件的状态"
7442
7443#: builtin/ls-files.c:417
7444msgid "use lowercase letters for 'assume unchanged' files"
7445msgstr "使用小写字母表示 '假设未改变的' 文件"
7446
7447#: builtin/ls-files.c:419
7448msgid "show cached files in the output (default)"
7449msgstr "显示缓存的文件(默认)"
7450
7451#: builtin/ls-files.c:421
7452msgid "show deleted files in the output"
7453msgstr "显示已删除的文件"
7454
7455#: builtin/ls-files.c:423
7456msgid "show modified files in the output"
7457msgstr "显示已修改的文件"
7458
7459#: builtin/ls-files.c:425
7460msgid "show other files in the output"
7461msgstr "显示其它文件"
7462
7463#: builtin/ls-files.c:427
7464msgid "show ignored files in the output"
7465msgstr "显示忽略的文件"
7466
7467#: builtin/ls-files.c:430
7468msgid "show staged contents' object name in the output"
7469msgstr "显示暂存区内容的对象名称"
7470
7471#: builtin/ls-files.c:432
7472msgid "show files on the filesystem that need to be removed"
7473msgstr "显示文件系统需要删除的文件"
7474
7475#: builtin/ls-files.c:434
7476msgid "show 'other' directories' names only"
7477msgstr "只显示“其他”目录的名称"
7478
7479#: builtin/ls-files.c:437
7480msgid "don't show empty directories"
7481msgstr "不显示空目录"
7482
7483#: builtin/ls-files.c:440
7484msgid "show unmerged files in the output"
7485msgstr "显示未合并的文件"
7486
7487#: builtin/ls-files.c:442
7488msgid "show resolve-undo information"
7489msgstr "显示 resolve-undo 信息"
7490
7491#: builtin/ls-files.c:444
7492msgid "skip files matching pattern"
7493msgstr "匹配排除文件的模式"
7494
7495#: builtin/ls-files.c:447
7496msgid "exclude patterns are read from <file>"
7497msgstr "从 <文件> 中读取排除模式"
7498
7499#: builtin/ls-files.c:450
7500msgid "read additional per-directory exclude patterns in <file>"
7501msgstr "从 <文件> 读取额外的每个目录的排除模式"
7502
7503#: builtin/ls-files.c:452
7504msgid "add the standard git exclusions"
7505msgstr "添加标准的 git 排除"
7506
7507#: builtin/ls-files.c:455
7508msgid "make the output relative to the project top directory"
7509msgstr "显示相对于顶级目录的文件名"
7510
7511#: builtin/ls-files.c:458
7512msgid "if any <file> is not in the index, treat this as an error"
7513msgstr "如果任何 <文件> 都不在索引区,视为错误"
7514
7515#: builtin/ls-files.c:459
7516msgid "tree-ish"
7517msgstr "树或提交"
7518
7519#: builtin/ls-files.c:460
7520msgid "pretend that paths removed since <tree-ish> are still present"
7521msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7522
7523#: builtin/ls-files.c:462
7524msgid "show debugging data"
7525msgstr "显示调试数据"
7526
7527#: builtin/ls-tree.c:28
7528msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7529msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7530
7531#: builtin/ls-tree.c:128
7532msgid "only show trees"
7533msgstr "只显示树"
7534
7535#: builtin/ls-tree.c:130
7536msgid "recurse into subtrees"
7537msgstr "递归到子树"
7538
7539#: builtin/ls-tree.c:132
7540msgid "show trees when recursing"
7541msgstr "当递归时显示树"
7542
7543#: builtin/ls-tree.c:135
7544msgid "terminate entries with NUL byte"
7545msgstr "条目以 NUL 字符终止"
7546
7547#: builtin/ls-tree.c:136
7548msgid "include object size"
7549msgstr "包括对象大小"
7550
7551#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7552msgid "list only filenames"
7553msgstr "只列出文件名"
7554
7555#: builtin/ls-tree.c:143
7556msgid "use full path names"
7557msgstr "使用文件的全路径"
7558
7559#: builtin/ls-tree.c:145
7560msgid "list entire tree; not just current directory (implies --full-name)"
7561msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7562
7563#: builtin/merge.c:45
7564msgid "git merge [<options>] [<commit>...]"
7565msgstr "git merge [<选项>] [<提交>...]"
7566
7567#: builtin/merge.c:46
7568msgid "git merge [<options>] <msg> HEAD <commit>"
7569msgstr "git merge [<选项>] <说明> HEAD <提交>"
7570
7571#: builtin/merge.c:47
7572msgid "git merge --abort"
7573msgstr "git merge --abort"
7574
7575#: builtin/merge.c:100
7576msgid "switch `m' requires a value"
7577msgstr "开关 `m' 需要一个值"
7578
7579#: builtin/merge.c:137
7580#, c-format
7581msgid "Could not find merge strategy '%s'.\n"
7582msgstr "不能找到合并策略 '%s'。\n"
7583
7584#: builtin/merge.c:138
7585#, c-format
7586msgid "Available strategies are:"
7587msgstr "可用的策略有:"
7588
7589#: builtin/merge.c:143
7590#, c-format
7591msgid "Available custom strategies are:"
7592msgstr "可用的自定义策略有:"
7593
7594#: builtin/merge.c:193 builtin/pull.c:119
7595msgid "do not show a diffstat at the end of the merge"
7596msgstr "在合并的最后不显示差异统计"
7597
7598#: builtin/merge.c:196 builtin/pull.c:122
7599msgid "show a diffstat at the end of the merge"
7600msgstr "在合并的最后显示差异统计"
7601
7602#: builtin/merge.c:197 builtin/pull.c:125
7603msgid "(synonym to --stat)"
7604msgstr "(和 --stat 同义)"
7605
7606#: builtin/merge.c:199 builtin/pull.c:128
7607msgid "add (at most <n>) entries from shortlog to merge commit message"
7608msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7609
7610#: builtin/merge.c:202 builtin/pull.c:131
7611msgid "create a single commit instead of doing a merge"
7612msgstr "创建一个单独的提交而不是做一次合并"
7613
7614#: builtin/merge.c:204 builtin/pull.c:134
7615msgid "perform a commit if the merge succeeds (default)"
7616msgstr "如果合并成功,执行一次提交(默认)"
7617
7618#: builtin/merge.c:206 builtin/pull.c:137
7619msgid "edit message before committing"
7620msgstr "在提交前编辑提交说明"
7621
7622#: builtin/merge.c:207
7623msgid "allow fast-forward (default)"
7624msgstr "允许快进(默认)"
7625
7626#: builtin/merge.c:209 builtin/pull.c:143
7627msgid "abort if fast-forward is not possible"
7628msgstr "如果不能快进就放弃合并"
7629
7630#: builtin/merge.c:213
7631msgid "Verify that the named commit has a valid GPG signature"
7632msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7633
7634#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
7635#: builtin/revert.c:89
7636msgid "strategy"
7637msgstr "策略"
7638
7639#: builtin/merge.c:215 builtin/pull.c:149
7640msgid "merge strategy to use"
7641msgstr "要使用的合并策略"
7642
7643#: builtin/merge.c:216 builtin/pull.c:152
7644msgid "option=value"
7645msgstr "option=value"
7646
7647#: builtin/merge.c:217 builtin/pull.c:153
7648msgid "option for selected merge strategy"
7649msgstr "所选的合并策略的选项"
7650
7651#: builtin/merge.c:219
7652msgid "merge commit message (for a non-fast-forward merge)"
7653msgstr "合并的提交说明(针对非快进式合并)"
7654
7655#: builtin/merge.c:223
7656msgid "abort the current in-progress merge"
7657msgstr "放弃当前正在进行的合并"
7658
7659#: builtin/merge.c:251
7660msgid "could not run stash."
7661msgstr "不能进行进度保存。"
7662
7663#: builtin/merge.c:256
7664msgid "stash failed"
7665msgstr "进度保存失败"
7666
7667#: builtin/merge.c:261
7668#, c-format
7669msgid "not a valid object: %s"
7670msgstr "不是一个有效对象:%s"
7671
7672#: builtin/merge.c:280 builtin/merge.c:297
7673msgid "read-tree failed"
7674msgstr "读取树失败"
7675
7676# 译者:注意保持前导空格
7677#: builtin/merge.c:327
7678msgid " (nothing to squash)"
7679msgstr " (无可压缩)"
7680
7681#: builtin/merge.c:340
7682#, c-format
7683msgid "Squash commit -- not updating HEAD\n"
7684msgstr "压缩提交 -- 未更新 HEAD\n"
7685
7686#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
7687#: builtin/merge.c:988
7688#, c-format
7689msgid "Could not write to '%s'"
7690msgstr "不能写入 '%s'"
7691
7692#: builtin/merge.c:372
7693msgid "Writing SQUASH_MSG"
7694msgstr "写入 SQUASH_MSG"
7695
7696#: builtin/merge.c:374
7697msgid "Finishing SQUASH_MSG"
7698msgstr "完成 SQUASH_MSG"
7699
7700#: builtin/merge.c:397
7701#, c-format
7702msgid "No merge message -- not updating HEAD\n"
7703msgstr "无合并信息 -- 未更新 HEAD\n"
7704
7705#: builtin/merge.c:447
7706#, c-format
7707msgid "'%s' does not point to a commit"
7708msgstr "'%s' 没有指向一个提交"
7709
7710#: builtin/merge.c:537
7711#, c-format
7712msgid "Bad branch.%s.mergeoptions string: %s"
7713msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7714
7715#: builtin/merge.c:656
7716msgid "Not handling anything other than two heads merge."
7717msgstr "不能处理两个头合并之外的任何操作。"
7718
7719#: builtin/merge.c:670
7720#, c-format
7721msgid "Unknown option for merge-recursive: -X%s"
7722msgstr "merge-recursive 的未知选项:-X%s"
7723
7724#: builtin/merge.c:683
7725#, c-format
7726msgid "unable to write %s"
7727msgstr "不能写 %s"
7728
7729#: builtin/merge.c:772
7730#, c-format
7731msgid "Could not read from '%s'"
7732msgstr "不能从 '%s' 读取"
7733
7734#: builtin/merge.c:781
7735#, c-format
7736msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7737msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7738
7739#: builtin/merge.c:787
7740#, c-format
7741msgid ""
7742"Please enter a commit message to explain why this merge is necessary,\n"
7743"especially if it merges an updated upstream into a topic branch.\n"
7744"\n"
7745"Lines starting with '%c' will be ignored, and an empty message aborts\n"
7746"the commit.\n"
7747msgstr ""
7748"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7749"合并到主题分支。\n"
7750"\n"
7751"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7752
7753#: builtin/merge.c:811
7754msgid "Empty commit message."
7755msgstr "空提交信息。"
7756
7757#: builtin/merge.c:823
7758#, c-format
7759msgid "Wonderful.\n"
7760msgstr "太棒了。\n"
7761
7762#: builtin/merge.c:878
7763#, c-format
7764msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7765msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7766
7767#: builtin/merge.c:894
7768#, c-format
7769msgid "'%s' is not a commit"
7770msgstr "'%s' 不是一个提交"
7771
7772#: builtin/merge.c:935
7773msgid "No current branch."
7774msgstr "没有当前分支。"
7775
7776#: builtin/merge.c:937
7777msgid "No remote for the current branch."
7778msgstr "当前分支没有对应的远程仓库。"
7779
7780#: builtin/merge.c:939
7781msgid "No default upstream defined for the current branch."
7782msgstr "当前分支没有定义默认的上游分支。"
7783
7784#: builtin/merge.c:944
7785#, c-format
7786msgid "No remote-tracking branch for %s from %s"
7787msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7788
7789#: builtin/merge.c:1079
7790#, c-format
7791msgid "could not close '%s'"
7792msgstr "不能关闭 '%s'"
7793
7794#: builtin/merge.c:1206
7795msgid "There is no merge to abort (MERGE_HEAD missing)."
7796msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7797
7798#: builtin/merge.c:1222
7799msgid ""
7800"You have not concluded your merge (MERGE_HEAD exists).\n"
7801"Please, commit your changes before you merge."
7802msgstr ""
7803"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7804"请在合并前先提交您的修改。"
7805
7806#: builtin/merge.c:1229
7807msgid ""
7808"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7809"Please, commit your changes before you merge."
7810msgstr ""
7811"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7812"请在合并前先提交您的修改。"
7813
7814#: builtin/merge.c:1232
7815msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7816msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7817
7818#: builtin/merge.c:1241
7819msgid "You cannot combine --squash with --no-ff."
7820msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7821
7822#: builtin/merge.c:1249
7823msgid "No commit specified and merge.defaultToUpstream not set."
7824msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7825
7826#: builtin/merge.c:1266
7827msgid "Squash commit into empty head not supported yet"
7828msgstr "尚不支持到空分支的压缩提交"
7829
7830#: builtin/merge.c:1268
7831msgid "Non-fast-forward commit does not make sense into an empty head"
7832msgstr "到空分支的非快进式提交没有意义"
7833
7834#: builtin/merge.c:1274
7835#, c-format
7836msgid "%s - not something we can merge"
7837msgstr "%s - 不能被合并"
7838
7839#: builtin/merge.c:1276
7840msgid "Can merge only exactly one commit into empty head"
7841msgstr "只能将一个提交合并到空分支上"
7842
7843#: builtin/merge.c:1331
7844#, c-format
7845msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7846msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7847
7848#: builtin/merge.c:1334
7849#, c-format
7850msgid "Commit %s has a bad GPG signature allegedly by %s."
7851msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7852
7853#: builtin/merge.c:1337
7854#, c-format
7855msgid "Commit %s does not have a GPG signature."
7856msgstr "提交 %s 没有一个 GPG 签名。"
7857
7858#: builtin/merge.c:1340
7859#, c-format
7860msgid "Commit %s has a good GPG signature by %s\n"
7861msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7862
7863#: builtin/merge.c:1423
7864#, c-format
7865msgid "Updating %s..%s\n"
7866msgstr "更新 %s..%s\n"
7867
7868#: builtin/merge.c:1460
7869#, c-format
7870msgid "Trying really trivial in-index merge...\n"
7871msgstr "尝试非常小的索引内合并...\n"
7872
7873#: builtin/merge.c:1467
7874#, c-format
7875msgid "Nope.\n"
7876msgstr "无。\n"
7877
7878#: builtin/merge.c:1499
7879msgid "Not possible to fast-forward, aborting."
7880msgstr "无法快进,终止。"
7881
7882#: builtin/merge.c:1522 builtin/merge.c:1601
7883#, c-format
7884msgid "Rewinding the tree to pristine...\n"
7885msgstr "将树回滚至原始状态...\n"
7886
7887#: builtin/merge.c:1526
7888#, c-format
7889msgid "Trying merge strategy %s...\n"
7890msgstr "尝试合并策略 %s...\n"
7891
7892#: builtin/merge.c:1592
7893#, c-format
7894msgid "No merge strategy handled the merge.\n"
7895msgstr "没有合并策略处理此合并。\n"
7896
7897#: builtin/merge.c:1594
7898#, c-format
7899msgid "Merge with strategy %s failed.\n"
7900msgstr "使用策略 %s 合并失败。\n"
7901
7902#: builtin/merge.c:1603
7903#, c-format
7904msgid "Using the %s to prepare resolving by hand.\n"
7905msgstr "使用 %s 以准备手工解决。\n"
7906
7907#: builtin/merge.c:1615
7908#, c-format
7909msgid "Automatic merge went well; stopped before committing as requested\n"
7910msgstr "自动合并进展顺利,按要求在提交前停止\n"
7911
7912#: builtin/merge-base.c:29
7913msgid "git merge-base [-a | --all] <commit> <commit>..."
7914msgstr "git merge-base [-a | --all] <提交> <提交>..."
7915
7916#: builtin/merge-base.c:30
7917msgid "git merge-base [-a | --all] --octopus <commit>..."
7918msgstr "git merge-base [-a | --all] --octopus <提交>..."
7919
7920#: builtin/merge-base.c:31
7921msgid "git merge-base --independent <commit>..."
7922msgstr "git merge-base --independent <提交>..."
7923
7924#: builtin/merge-base.c:32
7925msgid "git merge-base --is-ancestor <commit> <commit>"
7926msgstr "git merge-base --is-ancestor <提交> <提交>"
7927
7928#: builtin/merge-base.c:33
7929msgid "git merge-base --fork-point <ref> [<commit>]"
7930msgstr "git merge-base --fork-point <引用> [<提交>]"
7931
7932#: builtin/merge-base.c:214
7933msgid "output all common ancestors"
7934msgstr "输出所有共同的祖先"
7935
7936#: builtin/merge-base.c:216
7937msgid "find ancestors for a single n-way merge"
7938msgstr "查找一个多路合并的祖先提交"
7939
7940#: builtin/merge-base.c:218
7941msgid "list revs not reachable from others"
7942msgstr "显示不能被其他访问到的版本"
7943
7944#: builtin/merge-base.c:220
7945msgid "is the first one ancestor of the other?"
7946msgstr "第一个是其他的祖先提交么?"
7947
7948#: builtin/merge-base.c:222
7949msgid "find where <commit> forked from reflog of <ref>"
7950msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
7951
7952#: builtin/merge-file.c:8
7953msgid ""
7954"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7955"<orig-file> <file2>"
7956msgstr ""
7957"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7958"件> <文件2>"
7959
7960#: builtin/merge-file.c:33
7961msgid "send results to standard output"
7962msgstr "将结果发送到标准输出"
7963
7964#: builtin/merge-file.c:34
7965msgid "use a diff3 based merge"
7966msgstr "使用基于 diff3 的合并"
7967
7968#: builtin/merge-file.c:35
7969msgid "for conflicts, use our version"
7970msgstr "如果冲突,使用我们的版本"
7971
7972#: builtin/merge-file.c:37
7973msgid "for conflicts, use their version"
7974msgstr "如果冲突,使用他们的版本"
7975
7976#: builtin/merge-file.c:39
7977msgid "for conflicts, use a union version"
7978msgstr "如果冲突,使用联合版本"
7979
7980#: builtin/merge-file.c:42
7981msgid "for conflicts, use this marker size"
7982msgstr "如果冲突,使用指定长度的标记"
7983
7984#: builtin/merge-file.c:43
7985msgid "do not warn about conflicts"
7986msgstr "不要警告冲突"
7987
7988#: builtin/merge-file.c:45
7989msgid "set labels for file1/orig-file/file2"
7990msgstr "为 文件1/初始文件/文件2 设置标签"
7991
7992#: builtin/mktree.c:64
7993msgid "git mktree [-z] [--missing] [--batch]"
7994msgstr "git mktree [-z] [--missing] [--batch]"
7995
7996#: builtin/mktree.c:150
7997msgid "input is NUL terminated"
7998msgstr "输入以 NUL 字符终止"
7999
8000#: builtin/mktree.c:151 builtin/write-tree.c:24
8001msgid "allow missing objects"
8002msgstr "允许丢失的对象"
8003
8004#: builtin/mktree.c:152
8005msgid "allow creation of more than one tree"
8006msgstr "允许创建一个以上的树"
8007
8008#: builtin/mv.c:15
8009msgid "git mv [<options>] <source>... <destination>"
8010msgstr "git mv [<选项>] <源>... <目标>"
8011
8012#: builtin/mv.c:69
8013#, c-format
8014msgid "Directory %s is in index and no submodule?"
8015msgstr "目录 %s 在索引中并且不是子模组?"
8016
8017#: builtin/mv.c:71
8018msgid "Please stage your changes to .gitmodules or stash them to proceed"
8019msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8020
8021#: builtin/mv.c:89
8022#, c-format
8023msgid "%.*s is in index"
8024msgstr "%.*s 在索引中"
8025
8026#: builtin/mv.c:111
8027msgid "force move/rename even if target exists"
8028msgstr "强制移动/重命令,即使目标存在"
8029
8030#: builtin/mv.c:112
8031msgid "skip move/rename errors"
8032msgstr "跳过移动/重命名错误"
8033
8034#: builtin/mv.c:151
8035#, c-format
8036msgid "destination '%s' is not a directory"
8037msgstr "目标 '%s' 不是一个目录"
8038
8039#: builtin/mv.c:162
8040#, c-format
8041msgid "Checking rename of '%s' to '%s'\n"
8042msgstr "检查 '%s' 到 '%s' 的重命名\n"
8043
8044#: builtin/mv.c:166
8045msgid "bad source"
8046msgstr "坏的源"
8047
8048#: builtin/mv.c:169
8049msgid "can not move directory into itself"
8050msgstr "不能将目录移动到自身"
8051
8052#: builtin/mv.c:172
8053msgid "cannot move directory over file"
8054msgstr "不能将目录移动到文件"
8055
8056#: builtin/mv.c:181
8057msgid "source directory is empty"
8058msgstr "源目录为空"
8059
8060#: builtin/mv.c:206
8061msgid "not under version control"
8062msgstr "不在版本控制之下"
8063
8064#: builtin/mv.c:209
8065msgid "destination exists"
8066msgstr "目标已存在"
8067
8068#: builtin/mv.c:217
8069#, c-format
8070msgid "overwriting '%s'"
8071msgstr "覆盖 '%s'"
8072
8073#: builtin/mv.c:220
8074msgid "Cannot overwrite"
8075msgstr "不能覆盖"
8076
8077#: builtin/mv.c:223
8078msgid "multiple sources for the same target"
8079msgstr "同一目标具有多个源"
8080
8081#: builtin/mv.c:225
8082msgid "destination directory does not exist"
8083msgstr "目标目录不存在"
8084
8085#: builtin/mv.c:232
8086#, c-format
8087msgid "%s, source=%s, destination=%s"
8088msgstr "%s,源=%s,目标=%s"
8089
8090#: builtin/mv.c:253
8091#, c-format
8092msgid "Renaming %s to %s\n"
8093msgstr "重命名 %s 至 %s\n"
8094
8095#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365
8096#, c-format
8097msgid "renaming '%s' failed"
8098msgstr "重命名 '%s' 失败"
8099
8100#: builtin/name-rev.c:251
8101msgid "git name-rev [<options>] <commit>..."
8102msgstr "git name-rev [<选项>] <提交>..."
8103
8104#: builtin/name-rev.c:252
8105msgid "git name-rev [<options>] --all"
8106msgstr "git name-rev [<选项>] --all"
8107
8108#: builtin/name-rev.c:253
8109msgid "git name-rev [<options>] --stdin"
8110msgstr "git name-rev [<选项>] --stdin"
8111
8112#: builtin/name-rev.c:305
8113msgid "print only names (no SHA-1)"
8114msgstr "只打印名称(无 SHA-1)"
8115
8116#: builtin/name-rev.c:306
8117msgid "only use tags to name the commits"
8118msgstr "只使用标签来命名提交"
8119
8120#: builtin/name-rev.c:308
8121msgid "only use refs matching <pattern>"
8122msgstr "只使用和 <模式> 相匹配的引用"
8123
8124#: builtin/name-rev.c:310
8125msgid "list all commits reachable from all refs"
8126msgstr "列出可以从所有引用访问的提交"
8127
8128#: builtin/name-rev.c:311
8129msgid "read from stdin"
8130msgstr "从标准输入读取"
8131
8132#: builtin/name-rev.c:312
8133msgid "allow to print `undefined` names (default)"
8134msgstr "允许打印 `未定义` 的名称(默认)"
8135
8136#: builtin/name-rev.c:318
8137msgid "dereference tags in the input (internal use)"
8138msgstr "反向解析输入中的标签(内部使用)"
8139
8140#: builtin/notes.c:25
8141msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8142msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8143
8144#: builtin/notes.c:26
8145msgid ""
8146"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8147"| (-c | -C) <object>] [<object>]"
8148msgstr ""
8149"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8150"| (-c | -C) <对象>] [<对象>]"
8151
8152#: builtin/notes.c:27
8153msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8154msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8155
8156#: builtin/notes.c:28
8157msgid ""
8158"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8159"(-c | -C) <object>] [<object>]"
8160msgstr ""
8161"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8162"(-c | -C) <对象>] [<对象>]"
8163
8164#: builtin/notes.c:29
8165msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8166msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8167
8168#: builtin/notes.c:30
8169msgid "git notes [--ref <notes-ref>] show [<object>]"
8170msgstr "git notes [--ref <注解引用>] show [<对象>]"
8171
8172#: builtin/notes.c:31
8173msgid ""
8174"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8175msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8176
8177#: builtin/notes.c:32
8178msgid "git notes merge --commit [-v | -q]"
8179msgstr "git notes merge --commit [-v | -q]"
8180
8181#: builtin/notes.c:33
8182msgid "git notes merge --abort [-v | -q]"
8183msgstr "git notes merge --abort [-v | -q]"
8184
8185#: builtin/notes.c:34
8186msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8187msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8188
8189#: builtin/notes.c:35
8190msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8191msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8192
8193#: builtin/notes.c:36
8194msgid "git notes [--ref <notes-ref>] get-ref"
8195msgstr "git notes [--ref <注解引用>] get-ref"
8196
8197#: builtin/notes.c:41
8198msgid "git notes [list [<object>]]"
8199msgstr "git notes [list [<对象>]]"
8200
8201#: builtin/notes.c:46
8202msgid "git notes add [<options>] [<object>]"
8203msgstr "git notes add [<选项>] [<对象>]"
8204
8205#: builtin/notes.c:51
8206msgid "git notes copy [<options>] <from-object> <to-object>"
8207msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8208
8209#: builtin/notes.c:52
8210msgid "git notes copy --stdin [<from-object> <to-object>]..."
8211msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8212
8213#: builtin/notes.c:57
8214msgid "git notes append [<options>] [<object>]"
8215msgstr "git notes append [<选项>] [<对象>]"
8216
8217#: builtin/notes.c:62
8218msgid "git notes edit [<object>]"
8219msgstr "git notes edit [<对象>]"
8220
8221#: builtin/notes.c:67
8222msgid "git notes show [<object>]"
8223msgstr "git notes show [<对象>]"
8224
8225#: builtin/notes.c:72
8226msgid "git notes merge [<options>] <notes-ref>"
8227msgstr "git notes merge [<选项>] <注解引用>"
8228
8229#: builtin/notes.c:73
8230msgid "git notes merge --commit [<options>]"
8231msgstr "git notes merge --commit [<选项>]"
8232
8233#: builtin/notes.c:74
8234msgid "git notes merge --abort [<options>]"
8235msgstr "git notes merge --abort [<选项>]"
8236
8237#: builtin/notes.c:79
8238msgid "git notes remove [<object>]"
8239msgstr "git notes remove [<对象>]"
8240
8241#: builtin/notes.c:84
8242msgid "git notes prune [<options>]"
8243msgstr "git notes prune [<选项>]"
8244
8245#: builtin/notes.c:89
8246msgid "git notes get-ref"
8247msgstr "git notes get-ref"
8248
8249#: builtin/notes.c:147
8250#, c-format
8251msgid "unable to start 'show' for object '%s'"
8252msgstr "不能为对象 '%s' 开始 'show'"
8253
8254#: builtin/notes.c:151
8255msgid "could not read 'show' output"
8256msgstr "不能读取 'show' 的输出"
8257
8258#: builtin/notes.c:159
8259#, c-format
8260msgid "failed to finish 'show' for object '%s'"
8261msgstr "无法为对象 '%s' 完成 'show'"
8262
8263#: builtin/notes.c:174 builtin/tag.c:248
8264#, c-format
8265msgid "could not create file '%s'"
8266msgstr "不能创建文件 '%s'"
8267
8268#: builtin/notes.c:193
8269msgid "Please supply the note contents using either -m or -F option"
8270msgstr "请通过 -m 或 -F 选项为注解提供内容"
8271
8272#: builtin/notes.c:202
8273msgid "unable to write note object"
8274msgstr "不能写注解对象"
8275
8276#: builtin/notes.c:204
8277#, c-format
8278msgid "The note contents have been left in %s"
8279msgstr "注解内容被留在 %s 中"
8280
8281#: builtin/notes.c:232 builtin/tag.c:440
8282#, c-format
8283msgid "cannot read '%s'"
8284msgstr "不能读取 '%s'"
8285
8286#: builtin/notes.c:234 builtin/tag.c:443
8287#, c-format
8288msgid "could not open or read '%s'"
8289msgstr "不能打开或读取 '%s'"
8290
8291#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8292#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
8293#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
8294#: builtin/notes.c:877 builtin/tag.c:456
8295#, c-format
8296msgid "Failed to resolve '%s' as a valid ref."
8297msgstr "无法解析 '%s' 为一个有效引用。"
8298
8299#: builtin/notes.c:256
8300#, c-format
8301msgid "Failed to read object '%s'."
8302msgstr "无法读取对象 '%s'。"
8303
8304#: builtin/notes.c:260
8305#, c-format
8306msgid "Cannot read note data from non-blob object '%s'."
8307msgstr "不能从非数据对象 '%s' 中读取注解数据"
8308
8309#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
8310#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
8311#: builtin/notes.c:942
8312msgid "too many parameters"
8313msgstr "参数太多"
8314
8315#: builtin/notes.c:372 builtin/notes.c:659
8316#, c-format
8317msgid "No note found for object %s."
8318msgstr "未发现对象 %s 的注解。"
8319
8320#: builtin/notes.c:393 builtin/notes.c:556
8321msgid "note contents as a string"
8322msgstr "注解内容作为一个字符串"
8323
8324#: builtin/notes.c:396 builtin/notes.c:559
8325msgid "note contents in a file"
8326msgstr "注解内容到一个文件中"
8327
8328#: builtin/notes.c:399 builtin/notes.c:562
8329msgid "reuse and edit specified note object"
8330msgstr "重用和编辑指定的注解对象"
8331
8332#: builtin/notes.c:402 builtin/notes.c:565
8333msgid "reuse specified note object"
8334msgstr "重用指定的注解对象"
8335
8336#: builtin/notes.c:405 builtin/notes.c:568
8337msgid "allow storing empty note"
8338msgstr "允许保存空白注释"
8339
8340#: builtin/notes.c:406 builtin/notes.c:477
8341msgid "replace existing notes"
8342msgstr "替换已存在的注解"
8343
8344#: builtin/notes.c:431
8345#, c-format
8346msgid ""
8347"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8348"existing notes"
8349msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8350
8351#: builtin/notes.c:446 builtin/notes.c:525
8352#, c-format
8353msgid "Overwriting existing notes for object %s\n"
8354msgstr "覆盖对象 %s 现存注解\n"
8355
8356#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
8357#, c-format
8358msgid "Removing note for object %s\n"
8359msgstr "删除对象 %s 的注解\n"
8360
8361#: builtin/notes.c:478
8362msgid "read objects from stdin"
8363msgstr "从标准输入读取对象"
8364
8365#: builtin/notes.c:480
8366msgid "load rewriting config for <command> (implies --stdin)"
8367msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8368
8369#: builtin/notes.c:498
8370msgid "too few parameters"
8371msgstr "参数太少"
8372
8373#: builtin/notes.c:519
8374#, c-format
8375msgid ""
8376"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8377"existing notes"
8378msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8379
8380#: builtin/notes.c:531
8381#, c-format
8382msgid "Missing notes on source object %s. Cannot copy."
8383msgstr "源对象 %s 缺少注解。不能拷贝。"
8384
8385#: builtin/notes.c:583
8386#, c-format
8387msgid ""
8388"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8389"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8390msgstr ""
8391"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8392"请换用 'git notes add -f -m/-F/-c/-C'。\n"
8393
8394#: builtin/notes.c:764
8395msgid "General options"
8396msgstr "通用选项"
8397
8398#: builtin/notes.c:766
8399msgid "Merge options"
8400msgstr "合并选项"
8401
8402#: builtin/notes.c:768
8403msgid ""
8404"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8405"cat_sort_uniq)"
8406msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8407
8408#: builtin/notes.c:770
8409msgid "Committing unmerged notes"
8410msgstr "提交未合并的注解"
8411
8412#: builtin/notes.c:772
8413msgid "finalize notes merge by committing unmerged notes"
8414msgstr "通过提交未合并的注解来完成注解合并"
8415
8416#: builtin/notes.c:774
8417msgid "Aborting notes merge resolution"
8418msgstr "中止注解合并的方案"
8419
8420#: builtin/notes.c:776
8421msgid "abort notes merge"
8422msgstr "中止注解合并"
8423
8424#: builtin/notes.c:853
8425#, c-format
8426msgid "A notes merge into %s is already in-progress at %s"
8427msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8428
8429#: builtin/notes.c:880
8430#, c-format
8431msgid "Object %s has no note\n"
8432msgstr "对象 %s 没有注解\n"
8433
8434#: builtin/notes.c:892
8435msgid "attempt to remove non-existent note is not an error"
8436msgstr "尝试删除不存在的注解不是一个错误"
8437
8438#: builtin/notes.c:895
8439msgid "read object names from the standard input"
8440msgstr "从标准输入读取对象名称"
8441
8442#: builtin/notes.c:976
8443msgid "notes-ref"
8444msgstr "注解引用"
8445
8446#: builtin/notes.c:977
8447msgid "use notes from <notes-ref>"
8448msgstr "从 <注解引用> 使用注解"
8449
8450#: builtin/notes.c:1012 builtin/remote.c:1647
8451#, c-format
8452msgid "Unknown subcommand: %s"
8453msgstr "未知子命令:%s"
8454
8455#: builtin/pack-objects.c:28
8456msgid ""
8457"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8458msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8459
8460#: builtin/pack-objects.c:29
8461msgid ""
8462"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8463msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8464
8465#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8466#, c-format
8467msgid "deflate error (%d)"
8468msgstr "压缩错误 (%d)"
8469
8470#: builtin/pack-objects.c:771
8471msgid "Writing objects"
8472msgstr "写入对象中"
8473
8474#: builtin/pack-objects.c:1011
8475msgid "disabling bitmap writing, as some objects are not being packed"
8476msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8477
8478#: builtin/pack-objects.c:2171
8479msgid "Compressing objects"
8480msgstr "压缩对象中"
8481
8482#: builtin/pack-objects.c:2568
8483#, c-format
8484msgid "unsupported index version %s"
8485msgstr "不支持的索引版本 %s"
8486
8487#: builtin/pack-objects.c:2572
8488#, c-format
8489msgid "bad index version '%s'"
8490msgstr "坏的索引版本 '%s'"
8491
8492#: builtin/pack-objects.c:2602
8493msgid "do not show progress meter"
8494msgstr "不显示进度表"
8495
8496#: builtin/pack-objects.c:2604
8497msgid "show progress meter"
8498msgstr "显示进度表"
8499
8500#: builtin/pack-objects.c:2606
8501msgid "show progress meter during object writing phase"
8502msgstr "在对象写入阶段显示进度表"
8503
8504#: builtin/pack-objects.c:2609
8505msgid "similar to --all-progress when progress meter is shown"
8506msgstr "当进度表显示时类似于 --all-progress"
8507
8508#: builtin/pack-objects.c:2610
8509msgid "version[,offset]"
8510msgstr "版本[,偏移]"
8511
8512#: builtin/pack-objects.c:2611
8513msgid "write the pack index file in the specified idx format version"
8514msgstr "用指定的 idx 格式版本来写包索引文件"
8515
8516#: builtin/pack-objects.c:2614
8517msgid "maximum size of each output pack file"
8518msgstr "每个输出包的最大尺寸"
8519
8520#: builtin/pack-objects.c:2616
8521msgid "ignore borrowed objects from alternate object store"
8522msgstr "忽略从备用对象存储里借用对象"
8523
8524#: builtin/pack-objects.c:2618
8525msgid "ignore packed objects"
8526msgstr "忽略包对象"
8527
8528#: builtin/pack-objects.c:2620
8529msgid "limit pack window by objects"
8530msgstr "限制打包窗口的对象数"
8531
8532#: builtin/pack-objects.c:2622
8533msgid "limit pack window by memory in addition to object limit"
8534msgstr "除对象数量限制外设置打包窗口的内存限制"
8535
8536#: builtin/pack-objects.c:2624
8537msgid "maximum length of delta chain allowed in the resulting pack"
8538msgstr "打包允许的 delta 链的最大长度"
8539
8540#: builtin/pack-objects.c:2626
8541msgid "reuse existing deltas"
8542msgstr "重用已存在的 deltas"
8543
8544#: builtin/pack-objects.c:2628
8545msgid "reuse existing objects"
8546msgstr "重用已存在的对象"
8547
8548#: builtin/pack-objects.c:2630
8549msgid "use OFS_DELTA objects"
8550msgstr "使用 OFS_DELTA 对象"
8551
8552#: builtin/pack-objects.c:2632
8553msgid "use threads when searching for best delta matches"
8554msgstr "使用线程查询最佳 delta 匹配"
8555
8556#: builtin/pack-objects.c:2634
8557msgid "do not create an empty pack output"
8558msgstr "不创建空的包输出"
8559
8560#: builtin/pack-objects.c:2636
8561msgid "read revision arguments from standard input"
8562msgstr "从标准输入读取版本号参数"
8563
8564#: builtin/pack-objects.c:2638
8565msgid "limit the objects to those that are not yet packed"
8566msgstr "限制那些尚未打包的对象"
8567
8568#: builtin/pack-objects.c:2641
8569msgid "include objects reachable from any reference"
8570msgstr "包括可以从任何引用访问到的对象"
8571
8572#: builtin/pack-objects.c:2644
8573msgid "include objects referred by reflog entries"
8574msgstr "包括被引用日志引用到的对象"
8575
8576#: builtin/pack-objects.c:2647
8577msgid "include objects referred to by the index"
8578msgstr "包括被索引引用到的对象"
8579
8580#: builtin/pack-objects.c:2650
8581msgid "output pack to stdout"
8582msgstr "输出包到标准输出"
8583
8584#: builtin/pack-objects.c:2652
8585msgid "include tag objects that refer to objects to be packed"
8586msgstr "包括那些引用了待打包对象的标签对象"
8587
8588#: builtin/pack-objects.c:2654
8589msgid "keep unreachable objects"
8590msgstr "维持不可达的对象"
8591
8592#: builtin/pack-objects.c:2655 parse-options.h:142
8593msgid "time"
8594msgstr "时间"
8595
8596#: builtin/pack-objects.c:2656
8597msgid "unpack unreachable objects newer than <time>"
8598msgstr "将比给定 <时间> 新的无法访问的对象解包"
8599
8600#: builtin/pack-objects.c:2659
8601msgid "create thin packs"
8602msgstr "创建精简包"
8603
8604#: builtin/pack-objects.c:2661
8605msgid "create packs suitable for shallow fetches"
8606msgstr "创建适合浅克隆仓库获取的包"
8607
8608#: builtin/pack-objects.c:2663
8609msgid "ignore packs that have companion .keep file"
8610msgstr "忽略配有 .keep 文件的包"
8611
8612#: builtin/pack-objects.c:2665
8613msgid "pack compression level"
8614msgstr "打包压缩级别"
8615
8616#: builtin/pack-objects.c:2667
8617msgid "do not hide commits by grafts"
8618msgstr "显示被嫁接隐藏的提交"
8619
8620#: builtin/pack-objects.c:2669
8621msgid "use a bitmap index if available to speed up counting objects"
8622msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8623
8624#: builtin/pack-objects.c:2671
8625msgid "write a bitmap index together with the pack index"
8626msgstr "在建立包索引的同时创建 bitmap 索引"
8627
8628#: builtin/pack-objects.c:2762
8629msgid "Counting objects"
8630msgstr "对象计数中"
8631
8632#: builtin/pack-refs.c:6
8633msgid "git pack-refs [<options>]"
8634msgstr "git pack-refs [<选项>]"
8635
8636#: builtin/pack-refs.c:14
8637msgid "pack everything"
8638msgstr "打包一切"
8639
8640#: builtin/pack-refs.c:15
8641msgid "prune loose refs (default)"
8642msgstr "清除松散的引用(默认)"
8643
8644#: builtin/prune-packed.c:7
8645msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8646msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8647
8648#: builtin/prune-packed.c:40
8649msgid "Removing duplicate objects"
8650msgstr "正在删除重复对象"
8651
8652#: builtin/prune.c:11
8653msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8654msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8655
8656#: builtin/prune.c:105 builtin/worktree.c:124
8657msgid "do not remove, show only"
8658msgstr "不删除,只显示"
8659
8660#: builtin/prune.c:106 builtin/worktree.c:125
8661msgid "report pruned objects"
8662msgstr "报告清除的对象"
8663
8664#: builtin/prune.c:109 builtin/worktree.c:127
8665msgid "expire objects older than <time>"
8666msgstr "使早于给定时间的对象过期"
8667
8668#: builtin/prune.c:123
8669msgid "cannot prune in a precious-objects repo"
8670msgstr "不能在珍品仓库中执行清理操作"
8671
8672#: builtin/pull.c:69
8673msgid "git pull [<options>] [<repository> [<refspec>...]]"
8674msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8675
8676#: builtin/pull.c:113
8677msgid "Options related to merging"
8678msgstr "和合并相关的选项"
8679
8680#: builtin/pull.c:116
8681msgid "incorporate changes by rebasing rather than merging"
8682msgstr "使用变基操作取代合并操作以合入修改"
8683
8684#: builtin/pull.c:140 builtin/revert.c:105
8685msgid "allow fast-forward"
8686msgstr "允许快进式"
8687
8688#: builtin/pull.c:146
8689msgid "verify that the named commit has a valid GPG signature"
8690msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8691
8692#: builtin/pull.c:160
8693msgid "Options related to fetching"
8694msgstr "和获取相关的参数"
8695
8696#: builtin/pull.c:268
8697#, c-format
8698msgid "Invalid value for pull.ff: %s"
8699msgstr "pull.ff 的取值无效:%s"
8700
8701#: builtin/pull.c:352
8702msgid "Cannot pull with rebase: You have unstaged changes."
8703msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8704
8705#: builtin/pull.c:358
8706msgid "Additionally, your index contains uncommitted changes."
8707msgstr "而且您的索引中包含未提交的变更。"
8708
8709#: builtin/pull.c:360
8710msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8711msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8712
8713#: builtin/pull.c:436
8714msgid ""
8715"There is no candidate for rebasing against among the refs that you just "
8716"fetched."
8717msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8718
8719#: builtin/pull.c:438
8720msgid ""
8721"There are no candidates for merging among the refs that you just fetched."
8722msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8723
8724#: builtin/pull.c:439
8725msgid ""
8726"Generally this means that you provided a wildcard refspec which had no\n"
8727"matches on the remote end."
8728msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8729
8730#: builtin/pull.c:442
8731#, c-format
8732msgid ""
8733"You asked to pull from the remote '%s', but did not specify\n"
8734"a branch. Because this is not the default configured remote\n"
8735"for your current branch, you must specify a branch on the command line."
8736msgstr ""
8737"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8738"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8739
8740#: builtin/pull.c:447
8741msgid "You are not currently on a branch."
8742msgstr "您当前不在一个分支上。"
8743
8744#: builtin/pull.c:449 builtin/pull.c:464
8745msgid "Please specify which branch you want to rebase against."
8746msgstr "请指定您要变基到哪一个分支。"
8747
8748#: builtin/pull.c:451 builtin/pull.c:466
8749msgid "Please specify which branch you want to merge with."
8750msgstr "请指定您要合并哪一个分支。"
8751
8752#: builtin/pull.c:452 builtin/pull.c:467
8753msgid "See git-pull(1) for details."
8754msgstr "详见 git-pull(1)。"
8755
8756#: builtin/pull.c:462
8757msgid "There is no tracking information for the current branch."
8758msgstr "当前分支没有跟踪信息。"
8759
8760#: builtin/pull.c:471
8761#, c-format
8762msgid ""
8763"If you wish to set tracking information for this branch you can do so with:\n"
8764"\n"
8765" git branch --set-upstream-to=%s/<branch> %s\n"
8766msgstr ""
8767"如果您想要为此分支创建跟踪信息,您可以执行:\n"
8768"\n"
8769" git branch --set-upstream-to=%s/<branch> %s\n"
8770
8771#: builtin/pull.c:476
8772#, c-format
8773msgid ""
8774"Your configuration specifies to merge with the ref '%s'\n"
8775"from the remote, but no such ref was fetched."
8776msgstr ""
8777"您的配置中指定要合并远程的引用 '%s',\n"
8778"但是没有获取到这个引用。"
8779
8780#: builtin/pull.c:830
8781msgid "Updating an unborn branch with changes added to the index."
8782msgstr "更新尚未诞生的分支,变更添加至索引。"
8783
8784#: builtin/pull.c:859
8785#, c-format
8786msgid ""
8787"fetch updated the current branch head.\n"
8788"fast-forwarding your working tree from\n"
8789"commit %s."
8790msgstr ""
8791"fetch 更新了当前的分支。快进您的工作区\n"
8792"至提交 %s。"
8793
8794#: builtin/pull.c:864
8795#, c-format
8796msgid ""
8797"Cannot fast-forward your working tree.\n"
8798"After making sure that you saved anything precious from\n"
8799"$ git diff %s\n"
8800"output, run\n"
8801"$ git reset --hard\n"
8802"to recover."
8803msgstr ""
8804"您当前的工作区无法执行快进操作。\n"
8805"首先执行如下命令:\n"
8806"$ git diff %s\n"
8807"以确认所有有用的数据均已保存。然后执行下面的命令\n"
8808"$ git reset --hard\n"
8809"恢复之前的状态。"
8810
8811#: builtin/pull.c:879
8812msgid "Cannot merge multiple branches into empty head."
8813msgstr "无法将多个分支合并到空分支。"
8814
8815#: builtin/pull.c:883
8816msgid "Cannot rebase onto multiple branches."
8817msgstr "无法变基到多个分支。"
8818
8819#: builtin/push.c:15
8820msgid "git push [<options>] [<repository> [<refspec>...]]"
8821msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8822
8823#: builtin/push.c:86
8824msgid "tag shorthand without <tag>"
8825msgstr "标签后面未提供 <标签> 参数"
8826
8827#: builtin/push.c:96
8828msgid "--delete only accepts plain target ref names"
8829msgstr "--delete 只接受简单的目标引用名"
8830
8831#: builtin/push.c:140
8832msgid ""
8833"\n"
8834"To choose either option permanently, see push.default in 'git help config'."
8835msgstr ""
8836"\n"
8837"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8838
8839#: builtin/push.c:143
8840#, c-format
8841msgid ""
8842"The upstream branch of your current branch does not match\n"
8843"the name of your current branch. To push to the upstream branch\n"
8844"on the remote, use\n"
8845"\n"
8846" git push %s HEAD:%s\n"
8847"\n"
8848"To push to the branch of the same name on the remote, use\n"
8849"\n"
8850" git push %s %s\n"
8851"%s"
8852msgstr ""
8853"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8854"上游分支,使用\n"
8855"\n"
8856" git push %s HEAD:%s\n"
8857"\n"
8858"为推送至远程同名分支,使用\n"
8859"\n"
8860" git push %s %s\n"
8861"%s"
8862
8863#: builtin/push.c:158
8864#, c-format
8865msgid ""
8866"You are not currently on a branch.\n"
8867"To push the history leading to the current (detached HEAD)\n"
8868"state now, use\n"
8869"\n"
8870" git push %s HEAD:<name-of-remote-branch>\n"
8871msgstr ""
8872"您当前不在一个分支上。\n"
8873"现在为推送当前(分离头指针)的历史,使用\n"
8874"\n"
8875" git push %s HEAD:<远程分支名字>\n"
8876
8877#: builtin/push.c:172
8878#, c-format
8879msgid ""
8880"The current branch %s has no upstream branch.\n"
8881"To push the current branch and set the remote as upstream, use\n"
8882"\n"
8883" git push --set-upstream %s %s\n"
8884msgstr ""
8885"当前分支 %s 没有对应的上游分支。\n"
8886"为推送当前分支并建立与远程上游的跟踪,使用\n"
8887"\n"
8888" git push --set-upstream %s %s\n"
8889
8890#: builtin/push.c:180
8891#, c-format
8892msgid "The current branch %s has multiple upstream branches, refusing to push."
8893msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8894
8895#: builtin/push.c:183
8896#, c-format
8897msgid ""
8898"You are pushing to remote '%s', which is not the upstream of\n"
8899"your current branch '%s', without telling me what to push\n"
8900"to update which remote branch."
8901msgstr ""
8902"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8903"而没有告诉我要推送什么、更新哪个远程分支。"
8904
8905# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8906#: builtin/push.c:206
8907msgid ""
8908"push.default is unset; its implicit value has changed in\n"
8909"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8910"and maintain the traditional behavior, use:\n"
8911"\n"
8912" git config --global push.default matching\n"
8913"\n"
8914"To squelch this message and adopt the new behavior now, use:\n"
8915"\n"
8916" git config --global push.default simple\n"
8917"\n"
8918"When push.default is set to 'matching', git will push local branches\n"
8919"to the remote branches that already exist with the same name.\n"
8920"\n"
8921"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8922"behavior, which only pushes the current branch to the corresponding\n"
8923"remote branch that 'git pull' uses to update the current branch.\n"
8924"\n"
8925"See 'git help config' and search for 'push.default' for further "
8926"information.\n"
8927"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8928"'current' instead of 'simple' if you sometimes use older versions of Git)"
8929msgstr ""
8930"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8931"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8932"\n"
8933" git config --global push.default matching\n"
8934"\n"
8935"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8936"\n"
8937" git config --global push.default simple\n"
8938"\n"
8939"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8940"本地分支。\n"
8941"\n"
8942"从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
8943"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8944"\n"
8945"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8946"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8947"为保持兼容,请用 'current' 代替 'simple')"
8948
8949#: builtin/push.c:273
8950msgid ""
8951"You didn't specify any refspecs to push, and push.default is \"nothing\"."
8952msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
8953
8954#: builtin/push.c:280
8955msgid ""
8956"Updates were rejected because the tip of your current branch is behind\n"
8957"its remote counterpart. Integrate the remote changes (e.g.\n"
8958"'git pull ...') before pushing again.\n"
8959"See the 'Note about fast-forwards' in 'git push --help' for details."
8960msgstr ""
8961"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8962"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8963"'git push --help' 中的 'Note about fast-forwards' 小节。"
8964
8965#: builtin/push.c:286
8966msgid ""
8967"Updates were rejected because a pushed branch tip is behind its remote\n"
8968"counterpart. Check out this branch and integrate the remote changes\n"
8969"(e.g. 'git pull ...') before pushing again.\n"
8970"See the 'Note about fast-forwards' in 'git push --help' for details."
8971msgstr ""
8972"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8973"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8974"'git push --help' 中的 'Note about fast-forwards' 小节。"
8975
8976#: builtin/push.c:292
8977msgid ""
8978"Updates were rejected because the remote contains work that you do\n"
8979"not have locally. This is usually caused by another repository pushing\n"
8980"to the same ref. You may want to first integrate the remote changes\n"
8981"(e.g., 'git pull ...') before pushing again.\n"
8982"See the 'Note about fast-forwards' in 'git push --help' for details."
8983msgstr ""
8984"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
8985"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8986"(如 'git pull ...')。\n"
8987"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8988
8989#: builtin/push.c:299
8990msgid "Updates were rejected because the tag already exists in the remote."
8991msgstr "更新被拒绝,因为该标签在远程已经存在。"
8992
8993#: builtin/push.c:302
8994msgid ""
8995"You cannot update a remote ref that points at a non-commit object,\n"
8996"or update a remote ref to make it point at a non-commit object,\n"
8997"without using the '--force' option.\n"
8998msgstr ""
8999"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9000"也不能更新远程引用让其指向一个非提交对象。\n"
9001
9002#: builtin/push.c:361
9003#, c-format
9004msgid "Pushing to %s\n"
9005msgstr "推送到 %s\n"
9006
9007#: builtin/push.c:365
9008#, c-format
9009msgid "failed to push some refs to '%s'"
9010msgstr "无法推送一些引用到 '%s'"
9011
9012#: builtin/push.c:395
9013#, c-format
9014msgid "bad repository '%s'"
9015msgstr "坏的仓库 '%s'"
9016
9017#: builtin/push.c:396
9018msgid ""
9019"No configured push destination.\n"
9020"Either specify the URL from the command-line or configure a remote "
9021"repository using\n"
9022"\n"
9023" git remote add <name> <url>\n"
9024"\n"
9025"and then push using the remote name\n"
9026"\n"
9027" git push <name>\n"
9028msgstr ""
9029"没有配置推送目标。\n"
9030"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9031"\n"
9032" git remote add <名称> <地址>\n"
9033"\n"
9034"然后使用该远程仓库名执行推送\n"
9035"\n"
9036" git push <名称>\n"
9037
9038#: builtin/push.c:411
9039msgid "--all and --tags are incompatible"
9040msgstr "--all 和 --tags 不兼容"
9041
9042#: builtin/push.c:412
9043msgid "--all can't be combined with refspecs"
9044msgstr "--all 不能和引用规格同时使用"
9045
9046#: builtin/push.c:417
9047msgid "--mirror and --tags are incompatible"
9048msgstr "--mirror 和 --tags 不兼容"
9049
9050#: builtin/push.c:418
9051msgid "--mirror can't be combined with refspecs"
9052msgstr "--mirror 不能和引用规格同时使用"
9053
9054#: builtin/push.c:423
9055msgid "--all and --mirror are incompatible"
9056msgstr "--all 和 --mirror 不兼容"
9057
9058#: builtin/push.c:539
9059msgid "repository"
9060msgstr "仓库"
9061
9062#: builtin/push.c:540 builtin/send-pack.c:161
9063msgid "push all refs"
9064msgstr "推送所有引用"
9065
9066#: builtin/push.c:541 builtin/send-pack.c:163
9067msgid "mirror all refs"
9068msgstr "镜像所有引用"
9069
9070#: builtin/push.c:543
9071msgid "delete refs"
9072msgstr "删除引用"
9073
9074#: builtin/push.c:544
9075msgid "push tags (can't be used with --all or --mirror)"
9076msgstr "推送标签(不能使用 --all or --mirror)"
9077
9078#: builtin/push.c:547 builtin/send-pack.c:164
9079msgid "force updates"
9080msgstr "强制更新"
9081
9082#: builtin/push.c:549 builtin/send-pack.c:175
9083msgid "refname>:<expect"
9084msgstr "引用名>:<期望值"
9085
9086#: builtin/push.c:550 builtin/send-pack.c:176
9087msgid "require old value of ref to be at this value"
9088msgstr "要求引用旧的取值为设定值"
9089
9090#: builtin/push.c:553
9091msgid "control recursive pushing of submodules"
9092msgstr "控制子模组的递归推送"
9093
9094#: builtin/push.c:555 builtin/send-pack.c:169
9095msgid "use thin pack"
9096msgstr "使用精简打包"
9097
9098#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
9099#: builtin/send-pack.c:159
9100msgid "receive pack program"
9101msgstr "接收包程序"
9102
9103#: builtin/push.c:558
9104msgid "set upstream for git pull/status"
9105msgstr "设置 git pull/status 的上游"
9106
9107#: builtin/push.c:561
9108msgid "prune locally removed refs"
9109msgstr "清除本地删除的引用"
9110
9111#: builtin/push.c:563
9112msgid "bypass pre-push hook"
9113msgstr "绕过 pre-push 钩子"
9114
9115#: builtin/push.c:564
9116msgid "push missing but relevant tags"
9117msgstr "推送缺失但有关的标签"
9118
9119#: builtin/push.c:567 builtin/send-pack.c:166
9120msgid "GPG sign the push"
9121msgstr "用 GPG 为推送签名"
9122
9123#: builtin/push.c:569 builtin/send-pack.c:170
9124msgid "request atomic transaction on remote side"
9125msgstr "需要远端支持原子事务"
9126
9127#: builtin/push.c:579
9128msgid "--delete is incompatible with --all, --mirror and --tags"
9129msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9130
9131#: builtin/push.c:581
9132msgid "--delete doesn't make sense without any refs"
9133msgstr "--delete 未接任何引用没有意义"
9134
9135#: builtin/read-tree.c:37
9136msgid ""
9137"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9138"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9139"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9140msgstr ""
9141"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9142"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9143"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9144
9145#: builtin/read-tree.c:110
9146msgid "write resulting index to <file>"
9147msgstr "将索引结果写入 <文件>"
9148
9149#: builtin/read-tree.c:113
9150msgid "only empty the index"
9151msgstr "只是清空索引"
9152
9153#: builtin/read-tree.c:115
9154msgid "Merging"
9155msgstr "合并"
9156
9157#: builtin/read-tree.c:117
9158msgid "perform a merge in addition to a read"
9159msgstr "读取之余再执行一个合并"
9160
9161#: builtin/read-tree.c:119
9162msgid "3-way merge if no file level merging required"
9163msgstr "如果没有文件级合并需要,执行三方合并"
9164
9165#: builtin/read-tree.c:121
9166msgid "3-way merge in presence of adds and removes"
9167msgstr "存在添加和删除时,也执行三方合并"
9168
9169#: builtin/read-tree.c:123
9170msgid "same as -m, but discard unmerged entries"
9171msgstr "类似于 -m,但丢弃未合并的条目"
9172
9173#: builtin/read-tree.c:124
9174msgid "<subdirectory>/"
9175msgstr "<子目录>/"
9176
9177#: builtin/read-tree.c:125
9178msgid "read the tree into the index under <subdirectory>/"
9179msgstr "读取树对象到索引的 <子目录>/ 下"
9180
9181#: builtin/read-tree.c:128
9182msgid "update working tree with merge result"
9183msgstr "用合并的结果更新工作区"
9184
9185#: builtin/read-tree.c:130
9186msgid "gitignore"
9187msgstr "gitignore"
9188
9189#: builtin/read-tree.c:131
9190msgid "allow explicitly ignored files to be overwritten"
9191msgstr "允许忽略文件中设定的文件可以被覆盖"
9192
9193#: builtin/read-tree.c:134
9194msgid "don't check the working tree after merging"
9195msgstr "合并后不检查工作区"
9196
9197#: builtin/read-tree.c:135
9198msgid "don't update the index or the work tree"
9199msgstr "不更新索引区和工作区"
9200
9201#: builtin/read-tree.c:137
9202msgid "skip applying sparse checkout filter"
9203msgstr "跳过应用稀疏检出过滤器"
9204
9205#: builtin/read-tree.c:139
9206msgid "debug unpack-trees"
9207msgstr "调试 unpack-trees"
9208
9209#: builtin/reflog.c:428
9210#, c-format
9211msgid "'%s' for '%s' is not a valid timestamp"
9212msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9213
9214#: builtin/reflog.c:545 builtin/reflog.c:550
9215#, c-format
9216msgid "'%s' is not a valid timestamp"
9217msgstr "'%s' 不是一个有效的时间戳"
9218
9219#: builtin/remote.c:12
9220msgid "git remote [-v | --verbose]"
9221msgstr "git remote [-v | --verbose]"
9222
9223#: builtin/remote.c:13
9224msgid ""
9225"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9226"mirror=<fetch|push>] <name> <url>"
9227msgstr ""
9228"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9229"mirror=<fetch|push>] <名称> <地址>"
9230
9231#: builtin/remote.c:14 builtin/remote.c:34
9232msgid "git remote rename <old> <new>"
9233msgstr "git remote rename <旧名称> <新名称>"
9234
9235#: builtin/remote.c:15 builtin/remote.c:39
9236msgid "git remote remove <name>"
9237msgstr "git remote remove <名称>"
9238
9239#: builtin/remote.c:16 builtin/remote.c:44
9240msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9241msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9242
9243#: builtin/remote.c:17
9244msgid "git remote [-v | --verbose] show [-n] <name>"
9245msgstr "git remote [-v | --verbose] show [-n] <名称>"
9246
9247#: builtin/remote.c:18
9248msgid "git remote prune [-n | --dry-run] <name>"
9249msgstr "git remote prune [-n | --dry-run] <名称>"
9250
9251#: builtin/remote.c:19
9252msgid ""
9253"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9254msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9255
9256#: builtin/remote.c:20
9257msgid "git remote set-branches [--add] <name> <branch>..."
9258msgstr "git remote set-branches [--add] <名称> <分支>..."
9259
9260#: builtin/remote.c:21 builtin/remote.c:70
9261msgid "git remote get-url [--push] [--all] <name>"
9262msgstr "git remote get-url [--push] [--all] <名称>"
9263
9264#: builtin/remote.c:22 builtin/remote.c:75
9265msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9266msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9267
9268#: builtin/remote.c:23 builtin/remote.c:76
9269msgid "git remote set-url --add <name> <newurl>"
9270msgstr "git remote set-url --add <名称> <新的地址>"
9271
9272#: builtin/remote.c:24 builtin/remote.c:77
9273msgid "git remote set-url --delete <name> <url>"
9274msgstr "git remote set-url --delete <名称> <地址>"
9275
9276#: builtin/remote.c:29
9277msgid "git remote add [<options>] <name> <url>"
9278msgstr "git remote add [<选项>] <名称> <地址>"
9279
9280#: builtin/remote.c:49
9281msgid "git remote set-branches <name> <branch>..."
9282msgstr "git remote set-branches <名称> <分支>..."
9283
9284#: builtin/remote.c:50
9285msgid "git remote set-branches --add <name> <branch>..."
9286msgstr "git remote set-branches --add <名称> <分支>..."
9287
9288#: builtin/remote.c:55
9289msgid "git remote show [<options>] <name>"
9290msgstr "git remote show [<选项>] <名称>"
9291
9292#: builtin/remote.c:60
9293msgid "git remote prune [<options>] <name>"
9294msgstr "git remote prune [<选项>] <名称>"
9295
9296#: builtin/remote.c:65
9297msgid "git remote update [<options>] [<group> | <remote>]..."
9298msgstr "git remote update [<选项>] [<组> | <远程>]..."
9299
9300#: builtin/remote.c:94
9301#, c-format
9302msgid "Updating %s"
9303msgstr "更新 %s 中"
9304
9305#: builtin/remote.c:126
9306msgid ""
9307"--mirror is dangerous and deprecated; please\n"
9308"\t use --mirror=fetch or --mirror=push instead"
9309msgstr ""
9310"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9311"\t 或 --mirror=push"
9312
9313#: builtin/remote.c:143
9314#, c-format
9315msgid "unknown mirror argument: %s"
9316msgstr "未知的镜像参数:%s"
9317
9318#: builtin/remote.c:159
9319msgid "fetch the remote branches"
9320msgstr "抓取远程的分支"
9321
9322#: builtin/remote.c:161
9323msgid "import all tags and associated objects when fetching"
9324msgstr "抓取时导入所有的标签和关联对象"
9325
9326#: builtin/remote.c:164
9327msgid "or do not fetch any tag at all (--no-tags)"
9328msgstr "或不抓取任何标签(--no-tags)"
9329
9330#: builtin/remote.c:166
9331msgid "branch(es) to track"
9332msgstr "跟踪的分支"
9333
9334#: builtin/remote.c:167
9335msgid "master branch"
9336msgstr "主线分支"
9337
9338#: builtin/remote.c:168
9339msgid "push|fetch"
9340msgstr "push|fetch"
9341
9342#: builtin/remote.c:169
9343msgid "set up remote as a mirror to push to or fetch from"
9344msgstr "把远程设置为用以推送或抓取的镜像"
9345
9346#: builtin/remote.c:181
9347msgid "specifying a master branch makes no sense with --mirror"
9348msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9349
9350#: builtin/remote.c:183
9351msgid "specifying branches to track makes sense only with fetch mirrors"
9352msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9353
9354#: builtin/remote.c:193 builtin/remote.c:643
9355#, c-format
9356msgid "remote %s already exists."
9357msgstr "远程 %s 已经存在。"
9358
9359#: builtin/remote.c:197 builtin/remote.c:647
9360#, c-format
9361msgid "'%s' is not a valid remote name"
9362msgstr "'%s' 不是一个有效的远程名称"
9363
9364#: builtin/remote.c:241
9365#, c-format
9366msgid "Could not setup master '%s'"
9367msgstr "无法设置 master '%s'"
9368
9369#: builtin/remote.c:341
9370#, c-format
9371msgid "Could not get fetch map for refspec %s"
9372msgstr "无法得到引用规格 %s 的获取列表"
9373
9374#: builtin/remote.c:442 builtin/remote.c:450
9375msgid "(matching)"
9376msgstr "(匹配)"
9377
9378#: builtin/remote.c:454
9379msgid "(delete)"
9380msgstr "(删除)"
9381
9382#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606
9383#, c-format
9384msgid "Could not append '%s' to '%s'"
9385msgstr "不能添加 '%s' 至 '%s'"
9386
9387#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
9388#, c-format
9389msgid "No such remote: %s"
9390msgstr "没有这样的远程:%s"
9391
9392#: builtin/remote.c:653
9393#, c-format
9394msgid "Could not rename config section '%s' to '%s'"
9395msgstr "不能重命名配置小节 '%s' 到 '%s'"
9396
9397#: builtin/remote.c:659 builtin/remote.c:827
9398#, c-format
9399msgid "Could not remove config section '%s'"
9400msgstr "不能移除配置小节 '%s'"
9401
9402#: builtin/remote.c:674
9403#, c-format
9404msgid ""
9405"Not updating non-default fetch refspec\n"
9406"\t%s\n"
9407"\tPlease update the configuration manually if necessary."
9408msgstr ""
9409"没有更新非默认的获取引用规格\n"
9410"\t%s\n"
9411"\t如果必要请手动更新配置。"
9412
9413#: builtin/remote.c:680
9414#, c-format
9415msgid "Could not append '%s'"
9416msgstr "不能追加 '%s'"
9417
9418#: builtin/remote.c:691
9419#, c-format
9420msgid "Could not set '%s'"
9421msgstr "不能设置 '%s'"
9422
9423#: builtin/remote.c:713
9424#, c-format
9425msgid "deleting '%s' failed"
9426msgstr "删除 '%s' 失败"
9427
9428#: builtin/remote.c:747
9429#, c-format
9430msgid "creating '%s' failed"
9431msgstr "创建 '%s' 失败"
9432
9433#: builtin/remote.c:813
9434msgid ""
9435"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9436"to delete it, use:"
9437msgid_plural ""
9438"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9439"to delete them, use:"
9440msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9441msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9442
9443#: builtin/remote.c:928
9444#, c-format
9445msgid " new (next fetch will store in remotes/%s)"
9446msgstr " 新的(下一次获取将存储于 remotes/%s)"
9447
9448#: builtin/remote.c:931
9449msgid " tracked"
9450msgstr " 已跟踪"
9451
9452#: builtin/remote.c:933
9453msgid " stale (use 'git remote prune' to remove)"
9454msgstr " 过时(使用 'git remote prune' 来移除)"
9455
9456#: builtin/remote.c:935
9457msgid " ???"
9458msgstr " ???"
9459
9460#: builtin/remote.c:976
9461#, c-format
9462msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9463msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9464
9465#: builtin/remote.c:983
9466#, c-format
9467msgid "rebases onto remote %s"
9468msgstr "变基到远程 %s"
9469
9470#: builtin/remote.c:986
9471#, c-format
9472msgid " merges with remote %s"
9473msgstr " 与远程 %s 合并"
9474
9475#: builtin/remote.c:987
9476msgid " and with remote"
9477msgstr " 且有远程"
9478
9479#: builtin/remote.c:989
9480#, c-format
9481msgid "merges with remote %s"
9482msgstr "与远程 %s 合并"
9483
9484#: builtin/remote.c:990
9485msgid " and with remote"
9486msgstr " 且有远程"
9487
9488#: builtin/remote.c:1036
9489msgid "create"
9490msgstr "创建"
9491
9492#: builtin/remote.c:1039
9493msgid "delete"
9494msgstr "删除"
9495
9496#: builtin/remote.c:1043
9497msgid "up to date"
9498msgstr "最新"
9499
9500#: builtin/remote.c:1046
9501msgid "fast-forwardable"
9502msgstr "可快进"
9503
9504#: builtin/remote.c:1049
9505msgid "local out of date"
9506msgstr "本地已过时"
9507
9508#: builtin/remote.c:1056
9509#, c-format
9510msgid " %-*s forces to %-*s (%s)"
9511msgstr " %-*s 强制推送至 %-*s (%s)"
9512
9513#: builtin/remote.c:1059
9514#, c-format
9515msgid " %-*s pushes to %-*s (%s)"
9516msgstr " %-*s 推送至 %-*s (%s)"
9517
9518#: builtin/remote.c:1063
9519#, c-format
9520msgid " %-*s forces to %s"
9521msgstr " %-*s 强制推送至 %s"
9522
9523#: builtin/remote.c:1066
9524#, c-format
9525msgid " %-*s pushes to %s"
9526msgstr " %-*s 推送至 %s"
9527
9528#: builtin/remote.c:1134
9529msgid "do not query remotes"
9530msgstr "不查询远程"
9531
9532#: builtin/remote.c:1161
9533#, c-format
9534msgid "* remote %s"
9535msgstr "* 远程 %s"
9536
9537#: builtin/remote.c:1162
9538#, c-format
9539msgid " Fetch URL: %s"
9540msgstr " 获取地址:%s"
9541
9542#: builtin/remote.c:1163 builtin/remote.c:1314
9543msgid "(no URL)"
9544msgstr "(无 URL)"
9545
9546#: builtin/remote.c:1172 builtin/remote.c:1174
9547#, c-format
9548msgid " Push URL: %s"
9549msgstr " 推送地址:%s"
9550
9551#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
9552#, c-format
9553msgid " HEAD branch: %s"
9554msgstr " HEAD 分支:%s"
9555
9556#: builtin/remote.c:1182
9557#, c-format
9558msgid ""
9559" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9560msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9561
9562#: builtin/remote.c:1194
9563#, c-format
9564msgid " Remote branch:%s"
9565msgid_plural " Remote branches:%s"
9566msgstr[0] " 远程分支:%s"
9567msgstr[1] " 远程分支:%s"
9568
9569# 译者:中文字符串拼接,可删除前导空格
9570#: builtin/remote.c:1197 builtin/remote.c:1224
9571msgid " (status not queried)"
9572msgstr "(状态未查询)"
9573
9574#: builtin/remote.c:1206
9575msgid " Local branch configured for 'git pull':"
9576msgid_plural " Local branches configured for 'git pull':"
9577msgstr[0] " 为 'git pull' 配置的本地分支:"
9578msgstr[1] " 为 'git pull' 配置的本地分支:"
9579
9580#: builtin/remote.c:1214
9581msgid " Local refs will be mirrored by 'git push'"
9582msgstr " 本地引用将在 'git push' 时被镜像"
9583
9584#: builtin/remote.c:1221
9585#, c-format
9586msgid " Local ref configured for 'git push'%s:"
9587msgid_plural " Local refs configured for 'git push'%s:"
9588msgstr[0] " 为 'git push' 配置的本地引用%s:"
9589msgstr[1] " 为 'git push' 配置的本地引用%s:"
9590
9591#: builtin/remote.c:1242
9592msgid "set refs/remotes/<name>/HEAD according to remote"
9593msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9594
9595#: builtin/remote.c:1244
9596msgid "delete refs/remotes/<name>/HEAD"
9597msgstr "删除 refs/remotes/<名称>/HEAD"
9598
9599#: builtin/remote.c:1259
9600msgid "Cannot determine remote HEAD"
9601msgstr "无法确定远程 HEAD"
9602
9603#: builtin/remote.c:1261
9604msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9605msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9606
9607#: builtin/remote.c:1271
9608#, c-format
9609msgid "Could not delete %s"
9610msgstr "无法删除 %s"
9611
9612#: builtin/remote.c:1279
9613#, c-format
9614msgid "Not a valid ref: %s"
9615msgstr "不是一个有效引用:%s"
9616
9617#: builtin/remote.c:1281
9618#, c-format
9619msgid "Could not setup %s"
9620msgstr "不能设置 %s"
9621
9622# 译者:注意保持前导空格
9623#: builtin/remote.c:1299
9624#, c-format
9625msgid " %s will become dangling!"
9626msgstr " %s 将成为摇摆状态!"
9627
9628# 译者:注意保持前导空格
9629#: builtin/remote.c:1300
9630#, c-format
9631msgid " %s has become dangling!"
9632msgstr " %s 已成为摇摆状态!"
9633
9634#: builtin/remote.c:1310
9635#, c-format
9636msgid "Pruning %s"
9637msgstr "修剪 %s"
9638
9639#: builtin/remote.c:1311
9640#, c-format
9641msgid "URL: %s"
9642msgstr "URL:%s"
9643
9644#: builtin/remote.c:1327
9645#, c-format
9646msgid " * [would prune] %s"
9647msgstr " * [将删除] %s"
9648
9649#: builtin/remote.c:1330
9650#, c-format
9651msgid " * [pruned] %s"
9652msgstr " * [已删除] %s"
9653
9654#: builtin/remote.c:1375
9655msgid "prune remotes after fetching"
9656msgstr "抓取后清除远程"
9657
9658#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566
9659#, c-format
9660msgid "No such remote '%s'"
9661msgstr "没有此远程 '%s'"
9662
9663#: builtin/remote.c:1461
9664msgid "add branch"
9665msgstr "添加分支"
9666
9667#: builtin/remote.c:1468
9668msgid "no remote specified"
9669msgstr "未指定远程"
9670
9671#: builtin/remote.c:1485
9672msgid "query push URLs rather than fetch URLs"
9673msgstr "查询推送 URL 地址,而非获取 URL 地址"
9674
9675#: builtin/remote.c:1487
9676msgid "return all URLs"
9677msgstr "返回所有 URL 地址"
9678
9679#: builtin/remote.c:1515
9680#, c-format
9681msgid "no URLs configured for remote '%s'"
9682msgstr "没有给远程仓库 '%s' 设定 URL"
9683
9684#: builtin/remote.c:1541
9685msgid "manipulate push URLs"
9686msgstr "操作推送 URLS"
9687
9688#: builtin/remote.c:1543
9689msgid "add URL"
9690msgstr "添加 URL"
9691
9692#: builtin/remote.c:1545
9693msgid "delete URLs"
9694msgstr "删除 URLS"
9695
9696#: builtin/remote.c:1552
9697msgid "--add --delete doesn't make sense"
9698msgstr "--add --delete 无意义"
9699
9700#: builtin/remote.c:1592
9701#, c-format
9702msgid "Invalid old URL pattern: %s"
9703msgstr "无效的旧 URL 匹配模版:%s"
9704
9705#: builtin/remote.c:1600
9706#, c-format
9707msgid "No such URL found: %s"
9708msgstr "未找到此 URL:%s"
9709
9710#: builtin/remote.c:1602
9711msgid "Will not delete all non-push URLs"
9712msgstr "将不会删除所有非推送 URL 地址"
9713
9714#: builtin/remote.c:1616
9715msgid "be verbose; must be placed before a subcommand"
9716msgstr "冗长输出;必须置于子命令之前"
9717
9718#: builtin/repack.c:17
9719msgid "git repack [<options>]"
9720msgstr "git repack [<选项>]"
9721
9722#: builtin/repack.c:159
9723msgid "pack everything in a single pack"
9724msgstr "所有内容打包到一个包文件中"
9725
9726#: builtin/repack.c:161
9727msgid "same as -a, and turn unreachable objects loose"
9728msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9729
9730#: builtin/repack.c:164
9731msgid "remove redundant packs, and run git-prune-packed"
9732msgstr "删除多余的包,运行 git-prune-packed"
9733
9734#: builtin/repack.c:166
9735msgid "pass --no-reuse-delta to git-pack-objects"
9736msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9737
9738#: builtin/repack.c:168
9739msgid "pass --no-reuse-object to git-pack-objects"
9740msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9741
9742#: builtin/repack.c:170
9743msgid "do not run git-update-server-info"
9744msgstr "不运行 git-update-server-info"
9745
9746#: builtin/repack.c:173
9747msgid "pass --local to git-pack-objects"
9748msgstr "向 git-pack-objects 传递参数 --local"
9749
9750#: builtin/repack.c:175
9751msgid "write bitmap index"
9752msgstr "写 bitmap 索引"
9753
9754#: builtin/repack.c:176
9755msgid "approxidate"
9756msgstr "近似日期"
9757
9758#: builtin/repack.c:177
9759msgid "with -A, do not loosen objects older than this"
9760msgstr "使用 -A,不要将早于给定时间的对象过期"
9761
9762#: builtin/repack.c:179
9763msgid "size of the window used for delta compression"
9764msgstr "用于增量压缩的窗口值"
9765
9766#: builtin/repack.c:180 builtin/repack.c:184
9767msgid "bytes"
9768msgstr "字节"
9769
9770#: builtin/repack.c:181
9771msgid "same as the above, but limit memory size instead of entries count"
9772msgstr "和上面的相似,但限制内存大小而非条目数"
9773
9774#: builtin/repack.c:183
9775msgid "limits the maximum delta depth"
9776msgstr "限制最大增量深度"
9777
9778#: builtin/repack.c:185
9779msgid "maximum size of each packfile"
9780msgstr "每个包文件的最大尺寸"
9781
9782#: builtin/repack.c:187
9783msgid "repack objects in packs marked with .keep"
9784msgstr "对标记为 .keep 的包中的对象重新打包"
9785
9786#: builtin/repack.c:197
9787msgid "cannot delete packs in a precious-objects repo"
9788msgstr "不能删除珍品仓库中的打包文件"
9789
9790#: builtin/repack.c:381
9791#, c-format
9792msgid "removing '%s' failed"
9793msgstr "删除 '%s' 失败"
9794
9795#: builtin/replace.c:19
9796msgid "git replace [-f] <object> <replacement>"
9797msgstr "git replace [-f] <对象> <替换物>"
9798
9799#: builtin/replace.c:20
9800msgid "git replace [-f] --edit <object>"
9801msgstr "git replace [-f] --edit <对象>"
9802
9803#: builtin/replace.c:21
9804msgid "git replace [-f] --graft <commit> [<parent>...]"
9805msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9806
9807#: builtin/replace.c:22
9808msgid "git replace -d <object>..."
9809msgstr "git replace -d <对象>..."
9810
9811#: builtin/replace.c:23
9812msgid "git replace [--format=<format>] [-l [<pattern>]]"
9813msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9814
9815#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9816#, c-format
9817msgid "Not a valid object name: '%s'"
9818msgstr "不是一个有效的对象名:'%s'"
9819
9820#: builtin/replace.c:355
9821#, c-format
9822msgid "bad mergetag in commit '%s'"
9823msgstr "提交 '%s' 中含有损坏的合并标签"
9824
9825#: builtin/replace.c:357
9826#, c-format
9827msgid "malformed mergetag in commit '%s'"
9828msgstr "提交 '%s' 中含有非法的合并标签"
9829
9830#: builtin/replace.c:368
9831#, c-format
9832msgid ""
9833"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9834"instead of --graft"
9835msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9836
9837#: builtin/replace.c:401
9838#, c-format
9839msgid "the original commit '%s' has a gpg signature."
9840msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9841
9842#: builtin/replace.c:402
9843msgid "the signature will be removed in the replacement commit!"
9844msgstr "在替换的提交中签名将被移除!"
9845
9846#: builtin/replace.c:408
9847#, c-format
9848msgid "could not write replacement commit for: '%s'"
9849msgstr "不能为 '%s' 写替换提交"
9850
9851#: builtin/replace.c:432
9852msgid "list replace refs"
9853msgstr "列出替换的引用"
9854
9855#: builtin/replace.c:433
9856msgid "delete replace refs"
9857msgstr "删除替换的引用"
9858
9859#: builtin/replace.c:434
9860msgid "edit existing object"
9861msgstr "编辑现存的对象"
9862
9863#: builtin/replace.c:435
9864msgid "change a commit's parents"
9865msgstr "修改一个提交的父提交"
9866
9867#: builtin/replace.c:436
9868msgid "replace the ref if it exists"
9869msgstr "如果存在则替换引用"
9870
9871#: builtin/replace.c:437
9872msgid "do not pretty-print contents for --edit"
9873msgstr "不要为 --edit 操作美观显示内容"
9874
9875#: builtin/replace.c:438
9876msgid "use this format"
9877msgstr "使用此格式"
9878
9879#: builtin/rerere.c:12
9880msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9881msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9882
9883#: builtin/rerere.c:58
9884msgid "register clean resolutions in index"
9885msgstr "在索引中注册干净的解决方案"
9886
9887#: builtin/reset.c:26
9888msgid ""
9889"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9890msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9891
9892#: builtin/reset.c:27
9893msgid "git reset [-q] <tree-ish> [--] <paths>..."
9894msgstr "git reset [-q] <树或提交> [--] <路径>..."
9895
9896#: builtin/reset.c:28
9897msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9898msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9899
9900#: builtin/reset.c:34
9901msgid "mixed"
9902msgstr "混杂"
9903
9904#: builtin/reset.c:34
9905msgid "soft"
9906msgstr "软性"
9907
9908#: builtin/reset.c:34
9909msgid "hard"
9910msgstr "硬性"
9911
9912#: builtin/reset.c:34
9913msgid "merge"
9914msgstr "合并"
9915
9916#: builtin/reset.c:34
9917msgid "keep"
9918msgstr "保持"
9919
9920#: builtin/reset.c:74
9921msgid "You do not have a valid HEAD."
9922msgstr "您没有一个有效的 HEAD。"
9923
9924#: builtin/reset.c:76
9925msgid "Failed to find tree of HEAD."
9926msgstr "无法找到 HEAD 指向的树。"
9927
9928#: builtin/reset.c:82
9929#, c-format
9930msgid "Failed to find tree of %s."
9931msgstr "无法找到 %s 指向的树。"
9932
9933#: builtin/reset.c:100
9934#, c-format
9935msgid "HEAD is now at %s"
9936msgstr "HEAD 现在位于 %s"
9937
9938# 译者:汉字之间无空格,故删除%s前后空格
9939#: builtin/reset.c:183
9940#, c-format
9941msgid "Cannot do a %s reset in the middle of a merge."
9942msgstr "在合并过程中不能做%s重置操作。"
9943
9944#: builtin/reset.c:276
9945msgid "be quiet, only report errors"
9946msgstr "安静模式,只报告错误"
9947
9948#: builtin/reset.c:278
9949msgid "reset HEAD and index"
9950msgstr "重置 HEAD 和索引"
9951
9952#: builtin/reset.c:279
9953msgid "reset only HEAD"
9954msgstr "只重置 HEAD"
9955
9956#: builtin/reset.c:281 builtin/reset.c:283
9957msgid "reset HEAD, index and working tree"
9958msgstr "重置 HEAD、索引和工作区"
9959
9960#: builtin/reset.c:285
9961msgid "reset HEAD but keep local changes"
9962msgstr "重置 HEAD 但保存本地变更"
9963
9964#: builtin/reset.c:288
9965msgid "record only the fact that removed paths will be added later"
9966msgstr "将删除的路径标记为稍后添加"
9967
9968#: builtin/reset.c:305
9969#, c-format
9970msgid "Failed to resolve '%s' as a valid revision."
9971msgstr "无法将 '%s' 解析为一个有效的版本。"
9972
9973#: builtin/reset.c:313
9974#, c-format
9975msgid "Failed to resolve '%s' as a valid tree."
9976msgstr "无法将 '%s' 解析为一个有效的树对象。"
9977
9978#: builtin/reset.c:322
9979msgid "--patch is incompatible with --{hard,mixed,soft}"
9980msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9981
9982#: builtin/reset.c:331
9983msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9984msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9985
9986# 译者:汉字之间无空格,故删除%s前后空格
9987#: builtin/reset.c:333
9988#, c-format
9989msgid "Cannot do %s reset with paths."
9990msgstr "不能带路径进行%s重置。"
9991
9992# 译者:汉字之间无空格,故删除%s前后空格
9993#: builtin/reset.c:343
9994#, c-format
9995msgid "%s reset is not allowed in a bare repository"
9996msgstr "不能对纯仓库进行%s重置"
9997
9998#: builtin/reset.c:347
9999msgid "-N can only be used with --mixed"
10000msgstr "-N 只能和 --mixed 同时使用"
10001
10002#: builtin/reset.c:364
10003msgid "Unstaged changes after reset:"
10004msgstr "重置后取消暂存的变更:"
10005
10006#: builtin/reset.c:370
10007#, c-format
10008msgid "Could not reset index file to revision '%s'."
10009msgstr "不能重置索引文件至版本 '%s'。"
10010
10011#: builtin/reset.c:374
10012msgid "Could not write new index file."
10013msgstr "不能写入新的索引文件。"
10014
10015#: builtin/rev-list.c:354
10016msgid "rev-list does not support display of notes"
10017msgstr "rev-list 不支持显示注解"
10018
10019#: builtin/rev-parse.c:358
10020msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10021msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10022
10023#: builtin/rev-parse.c:363
10024msgid "keep the `--` passed as an arg"
10025msgstr "保持 `--` 作为一个参数传递"
10026
10027#: builtin/rev-parse.c:365
10028msgid "stop parsing after the first non-option argument"
10029msgstr "遇到第一个非选项参数后停止解析"
10030
10031#: builtin/rev-parse.c:368
10032msgid "output in stuck long form"
10033msgstr "以固定长格式输出"
10034
10035#: builtin/rev-parse.c:499
10036msgid ""
10037"git rev-parse --parseopt [<options>] -- [<args>...]\n"
10038" or: git rev-parse --sq-quote [<arg>...]\n"
10039" or: git rev-parse [<options>] [<arg>...]\n"
10040"\n"
10041"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10042msgstr ""
10043"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10044" 或者:git rev-parse --sq-quote [<参数>...]\n"
10045" 或者:git rev-parse [<选项>] [<参数>...]\n"
10046"\n"
10047"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10048
10049#: builtin/revert.c:22
10050msgid "git revert [<options>] <commit-ish>..."
10051msgstr "git revert [<选项>] <提交号>..."
10052
10053#: builtin/revert.c:23
10054msgid "git revert <subcommand>"
10055msgstr "git revert <子命令>"
10056
10057#: builtin/revert.c:28
10058msgid "git cherry-pick [<options>] <commit-ish>..."
10059msgstr "git cherry-pick [<选项>] <提交号>..."
10060
10061#: builtin/revert.c:29
10062msgid "git cherry-pick <subcommand>"
10063msgstr "git cherry-pick <子命令>"
10064
10065#: builtin/revert.c:71
10066#, c-format
10067msgid "%s: %s cannot be used with %s"
10068msgstr "%s:%s 不能和 %s 同时使用"
10069
10070#: builtin/revert.c:80
10071msgid "end revert or cherry-pick sequence"
10072msgstr "终止反转或拣选操作"
10073
10074#: builtin/revert.c:81
10075msgid "resume revert or cherry-pick sequence"
10076msgstr "继续反转或拣选操作"
10077
10078#: builtin/revert.c:82
10079msgid "cancel revert or cherry-pick sequence"
10080msgstr "取消反转或拣选操作"
10081
10082#: builtin/revert.c:83
10083msgid "don't automatically commit"
10084msgstr "不要自动提交"
10085
10086#: builtin/revert.c:84
10087msgid "edit the commit message"
10088msgstr "编辑提交说明"
10089
10090#: builtin/revert.c:87
10091msgid "parent number"
10092msgstr "父编号"
10093
10094#: builtin/revert.c:89
10095msgid "merge strategy"
10096msgstr "合并策略"
10097
10098#: builtin/revert.c:90
10099msgid "option"
10100msgstr "选项"
10101
10102#: builtin/revert.c:91
10103msgid "option for merge strategy"
10104msgstr "合并策略的选项"
10105
10106#: builtin/revert.c:104
10107msgid "append commit name"
10108msgstr "追加提交名称"
10109
10110#: builtin/revert.c:106
10111msgid "preserve initially empty commits"
10112msgstr "保留初始化的空提交"
10113
10114#: builtin/revert.c:107
10115msgid "allow commits with empty messages"
10116msgstr "允许提交说明为空"
10117
10118#: builtin/revert.c:108
10119msgid "keep redundant, empty commits"
10120msgstr "保持多余的、空的提交"
10121
10122#: builtin/revert.c:112
10123msgid "program error"
10124msgstr "程序错误"
10125
10126#: builtin/revert.c:197
10127msgid "revert failed"
10128msgstr "还原失败"
10129
10130#: builtin/revert.c:212
10131msgid "cherry-pick failed"
10132msgstr "拣选失败"
10133
10134#: builtin/rm.c:17
10135msgid "git rm [<options>] [--] <file>..."
10136msgstr "git rm [<选项>] [--] <文件>..."
10137
10138#: builtin/rm.c:65
10139msgid ""
10140"the following submodule (or one of its nested submodules)\n"
10141"uses a .git directory:"
10142msgid_plural ""
10143"the following submodules (or one of their nested submodules)\n"
10144"use a .git directory:"
10145msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10146msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10147
10148#: builtin/rm.c:71
10149msgid ""
10150"\n"
10151"(use 'rm -rf' if you really want to remove it including all of its history)"
10152msgstr ""
10153"\n"
10154"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10155
10156#: builtin/rm.c:230
10157msgid ""
10158"the following file has staged content different from both the\n"
10159"file and the HEAD:"
10160msgid_plural ""
10161"the following files have staged content different from both the\n"
10162"file and the HEAD:"
10163msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10164msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10165
10166#: builtin/rm.c:235
10167msgid ""
10168"\n"
10169"(use -f to force removal)"
10170msgstr ""
10171"\n"
10172"(使用 -f 强制删除)"
10173
10174#: builtin/rm.c:239
10175msgid "the following file has changes staged in the index:"
10176msgid_plural "the following files have changes staged in the index:"
10177msgstr[0] "下列文件索引中有变更"
10178msgstr[1] "下列文件索引中有变更"
10179
10180#: builtin/rm.c:243 builtin/rm.c:254
10181msgid ""
10182"\n"
10183"(use --cached to keep the file, or -f to force removal)"
10184msgstr ""
10185"\n"
10186"(使用 --cached 保留本地文件,或用 -f 强制删除)"
10187
10188#: builtin/rm.c:251
10189msgid "the following file has local modifications:"
10190msgid_plural "the following files have local modifications:"
10191msgstr[0] "如下文件有本地修改:"
10192msgstr[1] "如下文件有本地修改:"
10193
10194#: builtin/rm.c:269
10195msgid "do not list removed files"
10196msgstr "不列出删除的文件"
10197
10198#: builtin/rm.c:270
10199msgid "only remove from the index"
10200msgstr "只从索引区删除"
10201
10202#: builtin/rm.c:271
10203msgid "override the up-to-date check"
10204msgstr "忽略文件更新状态检查"
10205
10206#: builtin/rm.c:272
10207msgid "allow recursive removal"
10208msgstr "允许递归删除"
10209
10210#: builtin/rm.c:274
10211msgid "exit with a zero status even if nothing matched"
10212msgstr "即使没有匹配,也以零状态退出"
10213
10214#: builtin/rm.c:317
10215msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10216msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10217
10218#: builtin/rm.c:335
10219#, c-format
10220msgid "not removing '%s' recursively without -r"
10221msgstr "未提供 -r 选项不会递归删除 '%s'"
10222
10223#: builtin/rm.c:374
10224#, c-format
10225msgid "git rm: unable to remove %s"
10226msgstr "git rm:不能删除 %s"
10227
10228#: builtin/send-pack.c:18
10229msgid ""
10230"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10231"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10232"[<ref>...]\n"
10233" --all and explicit <ref> specification are mutually exclusive."
10234msgstr ""
10235"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10236"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10237" --all 和明确的 <引用> 互斥。"
10238
10239#: builtin/send-pack.c:160
10240msgid "remote name"
10241msgstr "远程名称"
10242
10243#: builtin/send-pack.c:171
10244msgid "use stateless RPC protocol"
10245msgstr "使用无状态的 RPC 协议"
10246
10247#: builtin/send-pack.c:172
10248msgid "read refs from stdin"
10249msgstr "从标准输入读取引用"
10250
10251#: builtin/send-pack.c:173
10252msgid "print status from remote helper"
10253msgstr "打印来自远程 helper 的状态"
10254
10255#: builtin/shortlog.c:13
10256msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10257msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10258
10259#: builtin/shortlog.c:131
10260#, c-format
10261msgid "Missing author: %s"
10262msgstr "缺少作者:%s"
10263
10264#: builtin/shortlog.c:230
10265msgid "sort output according to the number of commits per author"
10266msgstr "根据每个作者的提交数量排序"
10267
10268#: builtin/shortlog.c:232
10269msgid "Suppress commit descriptions, only provides commit count"
10270msgstr "隐藏提交说明,只提供提交数量"
10271
10272#: builtin/shortlog.c:234
10273msgid "Show the email address of each author"
10274msgstr "显示每个作者的电子邮件地址"
10275
10276#: builtin/shortlog.c:235
10277msgid "w[,i1[,i2]]"
10278msgstr "w[,i1[,i2]]"
10279
10280#: builtin/shortlog.c:236
10281msgid "Linewrap output"
10282msgstr "折行输出"
10283
10284#: builtin/show-branch.c:10
10285msgid ""
10286"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10287"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10288"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10289"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10290msgstr ""
10291"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10292"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10293"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10294"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10295
10296#: builtin/show-branch.c:14
10297msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10298msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10299
10300#: builtin/show-branch.c:640
10301msgid "show remote-tracking and local branches"
10302msgstr "显示远程跟踪的和本地的分支"
10303
10304#: builtin/show-branch.c:642
10305msgid "show remote-tracking branches"
10306msgstr "显示远程跟踪的分支"
10307
10308#: builtin/show-branch.c:644
10309msgid "color '*!+-' corresponding to the branch"
10310msgstr "着色 '*!+-' 到相应的分支"
10311
10312#: builtin/show-branch.c:646
10313msgid "show <n> more commits after the common ancestor"
10314msgstr "显示共同祖先后的 <n> 个提交"
10315
10316#: builtin/show-branch.c:648
10317msgid "synonym to more=-1"
10318msgstr "和 more=-1 同义"
10319
10320#: builtin/show-branch.c:649
10321msgid "suppress naming strings"
10322msgstr "不显示字符串命名"
10323
10324#: builtin/show-branch.c:651
10325msgid "include the current branch"
10326msgstr "包括当前分支"
10327
10328#: builtin/show-branch.c:653
10329msgid "name commits with their object names"
10330msgstr "以对象名字命名提交"
10331
10332#: builtin/show-branch.c:655
10333msgid "show possible merge bases"
10334msgstr "显示可能合并的基线"
10335
10336#: builtin/show-branch.c:657
10337msgid "show refs unreachable from any other ref"
10338msgstr "显示没有任何引用的的引用"
10339
10340#: builtin/show-branch.c:659
10341msgid "show commits in topological order"
10342msgstr "以拓扑顺序显示提交"
10343
10344#: builtin/show-branch.c:662
10345msgid "show only commits not on the first branch"
10346msgstr "只显示不在第一个分支上的提交"
10347
10348#: builtin/show-branch.c:664
10349msgid "show merges reachable from only one tip"
10350msgstr "显示仅一个分支可访问的合并提交"
10351
10352#: builtin/show-branch.c:666
10353msgid "topologically sort, maintaining date order where possible"
10354msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10355
10356#: builtin/show-branch.c:669
10357msgid "<n>[,<base>]"
10358msgstr "<n>[,<base>]"
10359
10360#: builtin/show-branch.c:670
10361msgid "show <n> most recent ref-log entries starting at base"
10362msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10363
10364#: builtin/show-ref.c:10
10365msgid ""
10366"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10367"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10368msgstr ""
10369"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10370"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10371
10372#: builtin/show-ref.c:11
10373msgid "git show-ref --exclude-existing[=<pattern>]"
10374msgstr "git show-ref --exclude-existing[=<模式>]"
10375
10376#: builtin/show-ref.c:165
10377msgid "only show tags (can be combined with heads)"
10378msgstr "只显示标签(可以和头共用)"
10379
10380#: builtin/show-ref.c:166
10381msgid "only show heads (can be combined with tags)"
10382msgstr "只显示头(可以和标签共用)"
10383
10384#: builtin/show-ref.c:167
10385msgid "stricter reference checking, requires exact ref path"
10386msgstr "更严格的引用检测,需要精确的引用路径"
10387
10388#: builtin/show-ref.c:170 builtin/show-ref.c:172
10389msgid "show the HEAD reference, even if it would be filtered out"
10390msgstr "显示 HEAD 引用,即使被过滤掉"
10391
10392#: builtin/show-ref.c:174
10393msgid "dereference tags into object IDs"
10394msgstr "转换标签到对象 ID"
10395
10396#: builtin/show-ref.c:176
10397msgid "only show SHA1 hash using <n> digits"
10398msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10399
10400#: builtin/show-ref.c:180
10401msgid "do not print results to stdout (useful with --verify)"
10402msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10403
10404#: builtin/show-ref.c:182
10405msgid "show refs from stdin that aren't in local repository"
10406msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10407
10408#: builtin/stripspace.c:17
10409msgid "git stripspace [-s | --strip-comments]"
10410msgstr "git stripspace [-s | --strip-comments]"
10411
10412#: builtin/stripspace.c:18
10413msgid "git stripspace [-c | --comment-lines]"
10414msgstr "git stripspace [-c | --comment-lines]"
10415
10416#: builtin/stripspace.c:35
10417msgid "skip and remove all lines starting with comment character"
10418msgstr "跳过和移除所有的注释行"
10419
10420#: builtin/stripspace.c:38
10421msgid "prepend comment character and blank to each line"
10422msgstr "为每一行的行首添加注释符和空格"
10423
10424#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167
10425msgid "alternative anchor for relative paths"
10426msgstr "相对路径的替代锚记(anchor)"
10427
10428#: builtin/submodule--helper.c:84
10429msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10430msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10431
10432#: builtin/submodule--helper.c:114
10433msgid "git submodule--helper name <path>"
10434msgstr "git submodule--helper name <路径>"
10435
10436#: builtin/submodule--helper.c:120
10437#, c-format
10438msgid "no submodule mapping found in .gitmodules for path '%s'"
10439msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10440
10441#: builtin/submodule--helper.c:170
10442msgid "where the new submodule will be cloned to"
10443msgstr "新的子模组将要克隆的路径"
10444
10445#: builtin/submodule--helper.c:173
10446msgid "name of the new submodule"
10447msgstr "新子模组的名称"
10448
10449#: builtin/submodule--helper.c:176
10450msgid "url where to clone the submodule from"
10451msgstr "克隆子模组的 url 地址"
10452
10453#: builtin/submodule--helper.c:182
10454msgid "depth for shallow clones"
10455msgstr "浅克隆的深度"
10456
10457#: builtin/submodule--helper.c:188
10458msgid ""
10459"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10460"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10461msgstr ""
10462"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10463"[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10464
10465#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
10466#: builtin/submodule--helper.c:216
10467#, c-format
10468msgid "could not create directory '%s'"
10469msgstr "不能创建目录 '%s'"
10470
10471#: builtin/submodule--helper.c:204
10472#, c-format
10473msgid "clone of '%s' into submodule path '%s' failed"
10474msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10475
10476#: builtin/submodule--helper.c:227
10477#, c-format
10478msgid "cannot open file '%s'"
10479msgstr "无法打开文件 '%s'"
10480
10481#: builtin/submodule--helper.c:232
10482#, c-format
10483msgid "could not close file %s"
10484msgstr "无法关闭文件 %s"
10485
10486#: builtin/submodule--helper.c:247
10487#, c-format
10488msgid "could not get submodule directory for '%s'"
10489msgstr "无法得到 '%s' 的子模组目录"
10490
10491#: builtin/submodule--helper.c:273
10492msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10493msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10494
10495#: builtin/submodule--helper.c:280
10496#, c-format
10497msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10498msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10499
10500#: builtin/symbolic-ref.c:7
10501msgid "git symbolic-ref [<options>] <name> [<ref>]"
10502msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10503
10504#: builtin/symbolic-ref.c:8
10505msgid "git symbolic-ref -d [-q] <name>"
10506msgstr "git symbolic-ref -d [-q] <名称>"
10507
10508#: builtin/symbolic-ref.c:40
10509msgid "suppress error message for non-symbolic (detached) refs"
10510msgstr "不显示非符号(分离的)引用的错误信息"
10511
10512#: builtin/symbolic-ref.c:41
10513msgid "delete symbolic ref"
10514msgstr "删除符号引用"
10515
10516#: builtin/symbolic-ref.c:42
10517msgid "shorten ref output"
10518msgstr "简短的引用输出"
10519
10520#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10521msgid "reason"
10522msgstr "原因"
10523
10524#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10525msgid "reason of the update"
10526msgstr "更新的原因"
10527
10528#: builtin/tag.c:23
10529msgid ""
10530"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10531"[<head>]"
10532msgstr ""
10533"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10534
10535#: builtin/tag.c:24
10536msgid "git tag -d <tagname>..."
10537msgstr "git tag -d <标签名>..."
10538
10539#: builtin/tag.c:25
10540msgid ""
10541"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10542"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10543msgstr ""
10544"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10545"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10546
10547#: builtin/tag.c:27
10548msgid "git tag -v <tagname>..."
10549msgstr "git tag -v <标签名>..."
10550
10551#: builtin/tag.c:80
10552#, c-format
10553msgid "tag name too long: %.*s..."
10554msgstr "标签名称太长:%.*s..."
10555
10556#: builtin/tag.c:85
10557#, c-format
10558msgid "tag '%s' not found."
10559msgstr "未发现标签 '%s'。"
10560
10561#: builtin/tag.c:100
10562#, c-format
10563msgid "Deleted tag '%s' (was %s)\n"
10564msgstr "已删除标签 '%s'(曾为 %s)\n"
10565
10566#: builtin/tag.c:112
10567#, c-format
10568msgid "could not verify the tag '%s'"
10569msgstr "不能校验该标签 '%s'"
10570
10571#: builtin/tag.c:122
10572#, c-format
10573msgid ""
10574"\n"
10575"Write a message for tag:\n"
10576" %s\n"
10577"Lines starting with '%c' will be ignored.\n"
10578msgstr ""
10579"\n"
10580"输入一个标签说明:\n"
10581" %s\n"
10582"以 '%c' 开头的行将被忽略。\n"
10583
10584#: builtin/tag.c:126
10585#, c-format
10586msgid ""
10587"\n"
10588"Write a message for tag:\n"
10589" %s\n"
10590"Lines starting with '%c' will be kept; you may remove them yourself if you "
10591"want to.\n"
10592msgstr ""
10593"\n"
10594"输入一个标签说明:\n"
10595" %s\n"
10596"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10597
10598#: builtin/tag.c:199
10599msgid "unable to sign the tag"
10600msgstr "无法签署标签"
10601
10602#: builtin/tag.c:201
10603msgid "unable to write tag file"
10604msgstr "无法写标签文件"
10605
10606#: builtin/tag.c:226
10607msgid "bad object type."
10608msgstr "坏的对象类型。"
10609
10610#: builtin/tag.c:239
10611msgid "tag header too big."
10612msgstr "标签头信息太大。"
10613
10614#: builtin/tag.c:275
10615msgid "no tag message?"
10616msgstr "无标签说明?"
10617
10618#: builtin/tag.c:281
10619#, c-format
10620msgid "The tag message has been left in %s\n"
10621msgstr "标签说明被保留在 %s\n"
10622
10623#: builtin/tag.c:339
10624msgid "list tag names"
10625msgstr "列出标签名称"
10626
10627#: builtin/tag.c:341
10628msgid "print <n> lines of each tag message"
10629msgstr "每个标签信息打印 <n> 行"
10630
10631#: builtin/tag.c:343
10632msgid "delete tags"
10633msgstr "删除标签"
10634
10635#: builtin/tag.c:344
10636msgid "verify tags"
10637msgstr "验证标签"
10638
10639#: builtin/tag.c:346
10640msgid "Tag creation options"
10641msgstr "标签创建选项"
10642
10643#: builtin/tag.c:348
10644msgid "annotated tag, needs a message"
10645msgstr "附注标签,需要一个说明"
10646
10647#: builtin/tag.c:350
10648msgid "tag message"
10649msgstr "标签说明"
10650
10651#: builtin/tag.c:352
10652msgid "annotated and GPG-signed tag"
10653msgstr "附注并附加 GPG 签名的标签"
10654
10655#: builtin/tag.c:356
10656msgid "use another key to sign the tag"
10657msgstr "使用另外的私钥签名该标签"
10658
10659#: builtin/tag.c:357
10660msgid "replace the tag if exists"
10661msgstr "如果存在,替换现有的标签"
10662
10663#: builtin/tag.c:358 builtin/update-ref.c:368
10664msgid "create a reflog"
10665msgstr "创建引用日志"
10666
10667#: builtin/tag.c:360
10668msgid "Tag listing options"
10669msgstr "标签列表选项"
10670
10671#: builtin/tag.c:361
10672msgid "show tag list in columns"
10673msgstr "以列的方式显示标签列表"
10674
10675#: builtin/tag.c:362 builtin/tag.c:363
10676msgid "print only tags that contain the commit"
10677msgstr "只打印包含提交的标签"
10678
10679#: builtin/tag.c:364
10680msgid "print only tags that are merged"
10681msgstr "只打印已经合并的标签"
10682
10683#: builtin/tag.c:365
10684msgid "print only tags that are not merged"
10685msgstr "只打印尚未合并的标签"
10686
10687#: builtin/tag.c:370
10688msgid "print only tags of the object"
10689msgstr "只打印对象的标签"
10690
10691#: builtin/tag.c:399
10692msgid "--column and -n are incompatible"
10693msgstr "--column 和 -n 不兼容"
10694
10695#: builtin/tag.c:419
10696msgid "-n option is only allowed with -l."
10697msgstr "-n 选项只允许和 -l 同时使用。"
10698
10699#: builtin/tag.c:421
10700msgid "--contains option is only allowed with -l."
10701msgstr "--contains 选项只允许和 -l 同时使用。"
10702
10703#: builtin/tag.c:423
10704msgid "--points-at option is only allowed with -l."
10705msgstr "--points-at 选项只允许和 -l 同时使用。"
10706
10707#: builtin/tag.c:425
10708msgid "--merged and --no-merged option are only allowed with -l"
10709msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10710
10711#: builtin/tag.c:433
10712msgid "only one -F or -m option is allowed."
10713msgstr "只允许一个 -F 或 -m 选项。"
10714
10715#: builtin/tag.c:453
10716msgid "too many params"
10717msgstr "太多参数"
10718
10719#: builtin/tag.c:459
10720#, c-format
10721msgid "'%s' is not a valid tag name."
10722msgstr "'%s' 不是一个有效的标签名称。"
10723
10724#: builtin/tag.c:464
10725#, c-format
10726msgid "tag '%s' already exists"
10727msgstr "标签 '%s' 已存在"
10728
10729#: builtin/tag.c:489
10730#, c-format
10731msgid "Updated tag '%s' (was %s)\n"
10732msgstr "已更新标签 '%s'(曾为 %s)\n"
10733
10734#: builtin/unpack-objects.c:490
10735msgid "Unpacking objects"
10736msgstr "展开对象中"
10737
10738#: builtin/update-index.c:70
10739#, c-format
10740msgid "failed to create directory %s"
10741msgstr "无法创建目录 %s"
10742
10743#: builtin/update-index.c:76
10744#, c-format
10745msgid "failed to stat %s"
10746msgstr "无法枚举 %s 状态"
10747
10748#: builtin/update-index.c:86
10749#, c-format
10750msgid "failed to create file %s"
10751msgstr "无法创建文件 %s"
10752
10753#: builtin/update-index.c:94
10754#, c-format
10755msgid "failed to delete file %s"
10756msgstr "无法删除文件 %s"
10757
10758#: builtin/update-index.c:101 builtin/update-index.c:203
10759#, c-format
10760msgid "failed to delete directory %s"
10761msgstr "无法删除目录 %s"
10762
10763#: builtin/update-index.c:124
10764#, c-format
10765msgid "Testing "
10766msgstr "正在测试 "
10767
10768#: builtin/update-index.c:136
10769msgid "directory stat info does not change after adding a new file"
10770msgstr "添加一个新文件后,目录的状态信息未改变"
10771
10772#: builtin/update-index.c:149
10773msgid "directory stat info does not change after adding a new directory"
10774msgstr "添加一个新目录后,目录的状态信息未改变"
10775
10776#: builtin/update-index.c:162
10777msgid "directory stat info changes after updating a file"
10778msgstr "更新一个文件后,目录的状态信息被修改"
10779
10780#: builtin/update-index.c:173
10781msgid "directory stat info changes after adding a file inside subdirectory"
10782msgstr "在子目录中添加文件后,目录的状态信息被修改"
10783
10784#: builtin/update-index.c:184
10785msgid "directory stat info does not change after deleting a file"
10786msgstr "删除一个文件后,目录的状态信息未改变"
10787
10788#: builtin/update-index.c:197
10789msgid "directory stat info does not change after deleting a directory"
10790msgstr "删除一个目录后,目录的状态信息未改变"
10791
10792#: builtin/update-index.c:204
10793msgid " OK"
10794msgstr " OK"
10795
10796#: builtin/update-index.c:564
10797msgid "git update-index [<options>] [--] [<file>...]"
10798msgstr "git update-index [<选项>] [--] [<文件>...]"
10799
10800#: builtin/update-index.c:918
10801msgid "continue refresh even when index needs update"
10802msgstr "当索引需要更新时继续刷新"
10803
10804#: builtin/update-index.c:921
10805msgid "refresh: ignore submodules"
10806msgstr "刷新:忽略子模组"
10807
10808#: builtin/update-index.c:924
10809msgid "do not ignore new files"
10810msgstr "不忽略新的文件"
10811
10812#: builtin/update-index.c:926
10813msgid "let files replace directories and vice-versa"
10814msgstr "让文件替换目录(反之亦然)"
10815
10816#: builtin/update-index.c:928
10817msgid "notice files missing from worktree"
10818msgstr "通知文件从工作区丢失"
10819
10820#: builtin/update-index.c:930
10821msgid "refresh even if index contains unmerged entries"
10822msgstr "即使索引区包含未合并的条目也执行刷新"
10823
10824#: builtin/update-index.c:933
10825msgid "refresh stat information"
10826msgstr "刷新统计信息"
10827
10828#: builtin/update-index.c:937
10829msgid "like --refresh, but ignore assume-unchanged setting"
10830msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10831
10832#: builtin/update-index.c:941
10833msgid "<mode>,<object>,<path>"
10834msgstr "<存取模式>,<对象>,<路径>"
10835
10836#: builtin/update-index.c:942
10837msgid "add the specified entry to the index"
10838msgstr "添加指定的条目到索引区"
10839
10840#: builtin/update-index.c:946
10841msgid "(+/-)x"
10842msgstr "(+/-)x"
10843
10844#: builtin/update-index.c:947
10845msgid "override the executable bit of the listed files"
10846msgstr "覆盖列表里文件的可执行位"
10847
10848#: builtin/update-index.c:951
10849msgid "mark files as \"not changing\""
10850msgstr "把文件标记为 \"没有变更\""
10851
10852#: builtin/update-index.c:954
10853msgid "clear assumed-unchanged bit"
10854msgstr "清除 assumed-unchanged 位"
10855
10856#: builtin/update-index.c:957
10857msgid "mark files as \"index-only\""
10858msgstr "把文件标记为 \"仅索引\""
10859
10860#: builtin/update-index.c:960
10861msgid "clear skip-worktree bit"
10862msgstr "清除 skip-worktree 位"
10863
10864#: builtin/update-index.c:963
10865msgid "add to index only; do not add content to object database"
10866msgstr "只添加到索引区;不添加对象到对象库"
10867
10868#: builtin/update-index.c:965
10869msgid "remove named paths even if present in worktree"
10870msgstr "即使存在工作区里,也删除路径"
10871
10872#: builtin/update-index.c:967
10873msgid "with --stdin: input lines are terminated by null bytes"
10874msgstr "携带 --stdin:输入的行以 null 字符终止"
10875
10876#: builtin/update-index.c:969
10877msgid "read list of paths to be updated from standard input"
10878msgstr "从标准输入中读取需要更新的路径列表"
10879
10880#: builtin/update-index.c:973
10881msgid "add entries from standard input to the index"
10882msgstr "从标准输入添加条目到索引区"
10883
10884#: builtin/update-index.c:977
10885msgid "repopulate stages #2 and #3 for the listed paths"
10886msgstr "为指定文件重新生成第2和第3暂存区"
10887
10888#: builtin/update-index.c:981
10889msgid "only update entries that differ from HEAD"
10890msgstr "只更新与 HEAD 不同的条目"
10891
10892#: builtin/update-index.c:985
10893msgid "ignore files missing from worktree"
10894msgstr "忽略工作区丢失的文件"
10895
10896#: builtin/update-index.c:988
10897msgid "report actions to standard output"
10898msgstr "在标准输出显示操作"
10899
10900#: builtin/update-index.c:990
10901msgid "(for porcelains) forget saved unresolved conflicts"
10902msgstr "(for porcelains) 忘记保存的未解决的冲突"
10903
10904#: builtin/update-index.c:994
10905msgid "write index in this format"
10906msgstr "以这种格式写入索引区"
10907
10908#: builtin/update-index.c:996
10909msgid "enable or disable split index"
10910msgstr "启用或禁用索引拆分"
10911
10912#: builtin/update-index.c:998
10913msgid "enable/disable untracked cache"
10914msgstr "启用/禁用对未跟踪文件的缓存"
10915
10916#: builtin/update-index.c:1000
10917msgid "enable untracked cache without testing the filesystem"
10918msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10919
10920#: builtin/update-ref.c:9
10921msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10922msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10923
10924#: builtin/update-ref.c:10
10925msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10926msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
10927
10928#: builtin/update-ref.c:11
10929msgid "git update-ref [<options>] --stdin [-z]"
10930msgstr "git update-ref [<选项>] --stdin [-z]"
10931
10932#: builtin/update-ref.c:363
10933msgid "delete the reference"
10934msgstr "删除引用"
10935
10936#: builtin/update-ref.c:365
10937msgid "update <refname> not the one it points to"
10938msgstr "更新 <引用名> 本身而不是它指向的引用"
10939
10940#: builtin/update-ref.c:366
10941msgid "stdin has NUL-terminated arguments"
10942msgstr "标准输入有以 NUL 字符终止的参数"
10943
10944#: builtin/update-ref.c:367
10945msgid "read updates from stdin"
10946msgstr "从标准输入读取更新"
10947
10948#: builtin/update-server-info.c:6
10949msgid "git update-server-info [--force]"
10950msgstr "git update-server-info [--force]"
10951
10952#: builtin/update-server-info.c:14
10953msgid "update the info files from scratch"
10954msgstr "从头开始更新文件信息"
10955
10956#: builtin/verify-commit.c:17
10957msgid "git verify-commit [-v | --verbose] <commit>..."
10958msgstr "git verify-commit [-v | --verbose] <提交>..."
10959
10960#: builtin/verify-commit.c:72
10961msgid "print commit contents"
10962msgstr "打印提交内容"
10963
10964#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
10965msgid "print raw gpg status output"
10966msgstr "打印原始 gpg 状态输出"
10967
10968#: builtin/verify-pack.c:54
10969msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10970msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10971
10972#: builtin/verify-pack.c:64
10973msgid "verbose"
10974msgstr "冗长输出"
10975
10976#: builtin/verify-pack.c:66
10977msgid "show statistics only"
10978msgstr "只显示统计"
10979
10980#: builtin/verify-tag.c:17
10981msgid "git verify-tag [-v | --verbose] <tag>..."
10982msgstr "git verify-tag [-v | --verbose] <标签>..."
10983
10984#: builtin/verify-tag.c:83
10985msgid "print tag contents"
10986msgstr "打印标签内容"
10987
10988#: builtin/worktree.c:15
10989msgid "git worktree add [<options>] <path> [<branch>]"
10990msgstr "git worktree add [<选项>] <路径> [<分支>]"
10991
10992#: builtin/worktree.c:16
10993msgid "git worktree prune [<options>]"
10994msgstr "git worktree prune [<选项>]"
10995
10996#: builtin/worktree.c:17
10997msgid "git worktree list [<options>]"
10998msgstr "git worktree list [<选项>]"
10999
11000#: builtin/worktree.c:39
11001#, c-format
11002msgid "Removing worktrees/%s: not a valid directory"
11003msgstr "删除工作区/%s:不是一个有效的目录"
11004
11005#: builtin/worktree.c:45
11006#, c-format
11007msgid "Removing worktrees/%s: gitdir file does not exist"
11008msgstr "删除 worktrees/%s:gitdir 文件不存在"
11009
11010#: builtin/worktree.c:50
11011#, c-format
11012msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11013msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11014
11015#: builtin/worktree.c:61
11016#, c-format
11017msgid "Removing worktrees/%s: invalid gitdir file"
11018msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11019
11020#: builtin/worktree.c:77
11021#, c-format
11022msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11023msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11024
11025#: builtin/worktree.c:112
11026#, c-format
11027msgid "failed to remove: %s"
11028msgstr "无法删除:%s"
11029
11030#: builtin/worktree.c:201
11031#, c-format
11032msgid "'%s' already exists"
11033msgstr "'%s' 已经存在"
11034
11035#: builtin/worktree.c:235
11036#, c-format
11037msgid "could not create directory of '%s'"
11038msgstr "不能创建目录 '%s'"
11039
11040#: builtin/worktree.c:271
11041#, c-format
11042msgid "Preparing %s (identifier %s)"
11043msgstr "准备 %s (标识符 %s)"
11044
11045#: builtin/worktree.c:319
11046msgid "checkout <branch> even if already checked out in other worktree"
11047msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11048
11049#: builtin/worktree.c:321
11050msgid "create a new branch"
11051msgstr "创建一个新分支"
11052
11053#: builtin/worktree.c:323
11054msgid "create or reset a branch"
11055msgstr "创建或重置一个分支"
11056
11057#: builtin/worktree.c:324
11058msgid "detach HEAD at named commit"
11059msgstr "HEAD 从指定的提交分离"
11060
11061#: builtin/worktree.c:331
11062msgid "-b, -B, and --detach are mutually exclusive"
11063msgstr "-b、-B 和 --detach 是互斥的"
11064
11065#: builtin/write-tree.c:13
11066msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11067msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11068
11069#: builtin/write-tree.c:26
11070msgid "<prefix>/"
11071msgstr "<前缀>/"
11072
11073#: builtin/write-tree.c:27
11074msgid "write tree object for a subdirectory <prefix>"
11075msgstr "将 <前缀> 子目录内容写到一个树对象"
11076
11077#: builtin/write-tree.c:30
11078msgid "only useful for debugging"
11079msgstr "只对调试有用"
11080
11081#: credential-cache--daemon.c:255
11082msgid "print debugging messages to stderr"
11083msgstr "调试信息输出到标准错误"
11084
11085#: git.c:14
11086msgid ""
11087"'git help -a' and 'git help -g' list available subcommands and some\n"
11088"concept guides. See 'git help <command>' or 'git help <concept>'\n"
11089"to read about a specific subcommand or concept."
11090msgstr ""
11091"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11092"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11093"帮助。"
11094
11095#: common-cmds.h:9
11096msgid "start a working area (see also: git help tutorial)"
11097msgstr "开始一个工作区(参见:git help tutorial)"
11098
11099#: common-cmds.h:10
11100msgid "work on the current change (see also: git help everyday)"
11101msgstr "在当前变更上工作(参见:git help everyday)"
11102
11103#: common-cmds.h:11
11104msgid "examine the history and state (see also: git help revisions)"
11105msgstr "检查历史和状态(参见:git help revisions)"
11106
11107#: common-cmds.h:12
11108msgid "grow, mark and tweak your common history"
11109msgstr "扩展、标记和调校您的历史记录"
11110
11111#: common-cmds.h:13
11112msgid "collaborate (see also: git help workflows)"
11113msgstr "协同(参见:git help workflows)"
11114
11115#: common-cmds.h:17
11116msgid "Add file contents to the index"
11117msgstr "添加文件内容至索引"
11118
11119#: common-cmds.h:18
11120msgid "Use binary search to find the commit that introduced a bug"
11121msgstr "通过二分查找定位引入 bug 的提交"
11122
11123#: common-cmds.h:19
11124msgid "List, create, or delete branches"
11125msgstr "列出、创建或删除分支"
11126
11127#: common-cmds.h:20
11128msgid "Switch branches or restore working tree files"
11129msgstr "切换分支或恢复工作区文件"
11130
11131#: common-cmds.h:21
11132msgid "Clone a repository into a new directory"
11133msgstr "克隆一个仓库到一个新目录"
11134
11135#: common-cmds.h:22
11136msgid "Record changes to the repository"
11137msgstr "记录变更到仓库"
11138
11139#: common-cmds.h:23
11140msgid "Show changes between commits, commit and working tree, etc"
11141msgstr "显示提交之间、提交和工作区之间等的差异"
11142
11143#: common-cmds.h:24
11144msgid "Download objects and refs from another repository"
11145msgstr "从另外一个仓库下载对象和引用"
11146
11147#: common-cmds.h:25
11148msgid "Print lines matching a pattern"
11149msgstr "输出和模式匹配的行"
11150
11151#: common-cmds.h:26
11152msgid "Create an empty Git repository or reinitialize an existing one"
11153msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11154
11155#: common-cmds.h:27
11156msgid "Show commit logs"
11157msgstr "显示提交日志"
11158
11159#: common-cmds.h:28
11160msgid "Join two or more development histories together"
11161msgstr "合并两个或更多开发历史"
11162
11163#: common-cmds.h:29
11164msgid "Move or rename a file, a directory, or a symlink"
11165msgstr "移动或重命名一个文件、目录或符号链接"
11166
11167#: common-cmds.h:30
11168msgid "Fetch from and integrate with another repository or a local branch"
11169msgstr "获取并整合另外的仓库或一个本地分支"
11170
11171#: common-cmds.h:31
11172msgid "Update remote refs along with associated objects"
11173msgstr "更新远程引用和相关的对象"
11174
11175#: common-cmds.h:32
11176msgid "Forward-port local commits to the updated upstream head"
11177msgstr "本地提交转移至更新后的上游分支中"
11178
11179#: common-cmds.h:33
11180msgid "Reset current HEAD to the specified state"
11181msgstr "重置当前 HEAD 到指定状态"
11182
11183#: common-cmds.h:34
11184msgid "Remove files from the working tree and from the index"
11185msgstr "从工作区和索引中删除文件"
11186
11187#: common-cmds.h:35
11188msgid "Show various types of objects"
11189msgstr "显示各种类型的对象"
11190
11191#: common-cmds.h:36
11192msgid "Show the working tree status"
11193msgstr "显示工作区状态"
11194
11195#: common-cmds.h:37
11196msgid "Create, list, delete or verify a tag object signed with GPG"
11197msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11198
11199#: parse-options.h:145
11200msgid "expiry-date"
11201msgstr "到期时间"
11202
11203#: parse-options.h:160
11204msgid "no-op (backward compatibility)"
11205msgstr "空操作(向后兼容)"
11206
11207#: parse-options.h:237
11208msgid "be more verbose"
11209msgstr "更加详细"
11210
11211#: parse-options.h:239
11212msgid "be more quiet"
11213msgstr "更加安静"
11214
11215#: parse-options.h:245
11216msgid "use <n> digits to display SHA-1s"
11217msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11218
11219#: rerere.h:38
11220msgid "update the index with reused conflict resolution if possible"
11221msgstr "如果可能,重用冲突解决更新索引"
11222
11223#: git-bisect.sh:55
11224msgid "You need to start by \"git bisect start\""
11225msgstr "您需要执行 \"git bisect start\" 来开始"
11226
11227# 译者:注意保持句尾空格
11228#. TRANSLATORS: Make sure to include [Y] and [n] in your
11229#. translation. The program will only accept English input
11230#. at this point.
11231#: git-bisect.sh:61
11232msgid "Do you want me to do it for you [Y/n]? "
11233msgstr "您想让我为您这样做么[Y/n]? "
11234
11235#: git-bisect.sh:122
11236#, sh-format
11237msgid "unrecognised option: '$arg'"
11238msgstr "未能识别的选项:'$arg'"
11239
11240#: git-bisect.sh:126
11241#, sh-format
11242msgid "'$arg' does not appear to be a valid revision"
11243msgstr "'$arg' 看起来不像是一个有效的版本"
11244
11245#: git-bisect.sh:155
11246msgid "Bad HEAD - I need a HEAD"
11247msgstr "坏的 HEAD - 我需要一个 HEAD"
11248
11249#: git-bisect.sh:168
11250#, sh-format
11251msgid ""
11252"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11253msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11254
11255#: git-bisect.sh:178
11256msgid "won't bisect on cg-seek'ed tree"
11257msgstr "不会在做了 cg-seek 的树上做二分查找"
11258
11259#: git-bisect.sh:182
11260msgid "Bad HEAD - strange symbolic ref"
11261msgstr "坏的 HEAD - 奇怪的符号引用"
11262
11263#: git-bisect.sh:234
11264#, sh-format
11265msgid "Bad bisect_write argument: $state"
11266msgstr "坏的 bisect_write 参数:$state"
11267
11268#: git-bisect.sh:263
11269#, sh-format
11270msgid "Bad rev input: $arg"
11271msgstr "输入坏的版本:$arg"
11272
11273#: git-bisect.sh:278
11274msgid "Please call 'bisect_state' with at least one argument."
11275msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11276
11277#: git-bisect.sh:290
11278#, sh-format
11279msgid "Bad rev input: $rev"
11280msgstr "输入坏的版本:$rev"
11281
11282#: git-bisect.sh:299
11283#, sh-format
11284msgid "'git bisect $TERM_BAD' can take only one argument."
11285msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11286
11287#: git-bisect.sh:322
11288#, sh-format
11289msgid "Warning: bisecting only with a $TERM_BAD commit."
11290msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11291
11292# 译者:注意保持句尾空格
11293#. TRANSLATORS: Make sure to include [Y] and [n] in your
11294#. translation. The program will only accept English input
11295#. at this point.
11296#: git-bisect.sh:328
11297msgid "Are you sure [Y/n]? "
11298msgstr "您确认么[Y/n]? "
11299
11300#: git-bisect.sh:340
11301#, sh-format
11302msgid ""
11303"You need to give me at least one $bad_syn and one $good_syn revision.\n"
11304"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11305msgstr ""
11306"您需要给我至少一个好版本和一个坏版本。\n"
11307"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11308
11309#: git-bisect.sh:343
11310#, sh-format
11311msgid ""
11312"You need to start by \"git bisect start\".\n"
11313"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11314"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11315msgstr ""
11316"您需要执行 \"git bisect start\" 来开始。\n"
11317"然后需要提供我至少一个好版本和一个坏版本。\n"
11318"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11319
11320#: git-bisect.sh:414 git-bisect.sh:546
11321msgid "We are not bisecting."
11322msgstr "我们没有在二分查找。"
11323
11324#: git-bisect.sh:421
11325#, sh-format
11326msgid "'$invalid' is not a valid commit"
11327msgstr "'$invalid' 不是一个有效的提交"
11328
11329#: git-bisect.sh:430
11330#, sh-format
11331msgid ""
11332"Could not check out original HEAD '$branch'.\n"
11333"Try 'git bisect reset <commit>'."
11334msgstr ""
11335"不能检出原始 HEAD '$branch'。\n"
11336"尝试 'git bisect reset <提交>'。"
11337
11338#: git-bisect.sh:458
11339msgid "No logfile given"
11340msgstr "未提供日志文件"
11341
11342#: git-bisect.sh:459
11343#, sh-format
11344msgid "cannot read $file for replaying"
11345msgstr "不能读取 $file 来重放"
11346
11347#: git-bisect.sh:480
11348msgid "?? what are you talking about?"
11349msgstr "?? 您在说什么?"
11350
11351#: git-bisect.sh:492
11352#, sh-format
11353msgid "running $command"
11354msgstr "运行 $command"
11355
11356#: git-bisect.sh:499
11357#, sh-format
11358msgid ""
11359"bisect run failed:\n"
11360"exit code $res from '$command' is < 0 or >= 128"
11361msgstr ""
11362"二分查找运行失败:\n"
11363"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11364
11365#: git-bisect.sh:525
11366msgid "bisect run cannot continue any more"
11367msgstr "二分查找不能继续运行"
11368
11369#: git-bisect.sh:531
11370#, sh-format
11371msgid ""
11372"bisect run failed:\n"
11373"'bisect_state $state' exited with error code $res"
11374msgstr ""
11375"二分查找运行失败:\n"
11376"'bisect_state $state' 退出码为 $res"
11377
11378#: git-bisect.sh:538
11379msgid "bisect run success"
11380msgstr "二分查找运行成功"
11381
11382#: git-bisect.sh:565
11383msgid "please use two different terms"
11384msgstr "请使用两个不同的术语"
11385
11386#: git-bisect.sh:575
11387#, sh-format
11388msgid "'$term' is not a valid term"
11389msgstr "'$term' 不是一个有效的名称"
11390
11391#: git-bisect.sh:578
11392#, sh-format
11393msgid "can't use the builtin command '$term' as a term"
11394msgstr "不能使用内置命令 '$term' 作为术语"
11395
11396#: git-bisect.sh:587 git-bisect.sh:593
11397#, sh-format
11398msgid "can't change the meaning of term '$term'"
11399msgstr "不能修改术语 '$term' 的含义"
11400
11401#: git-bisect.sh:606
11402#, sh-format
11403msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11404msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11405
11406#: git-bisect.sh:636
11407msgid "no terms defined"
11408msgstr "未定义术语"
11409
11410#: git-bisect.sh:653
11411#, sh-format
11412msgid ""
11413"invalid argument $arg for 'git bisect terms'.\n"
11414"Supported options are: --term-good|--term-old and --term-bad|--term-new."
11415msgstr ""
11416"参数 $arg 对命令 'git bisect terms' 无效。\n"
11417"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11418
11419#: git-rebase.sh:57
11420msgid ""
11421"When you have resolved this problem, run \"git rebase --continue\".\n"
11422"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11423"To check out the original branch and stop rebasing, run \"git rebase --abort"
11424"\"."
11425msgstr ""
11426"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11427"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11428"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11429
11430#: git-rebase.sh:165
11431msgid "Applied autostash."
11432msgstr "成功应用 autostash。"
11433
11434#: git-rebase.sh:168
11435#, sh-format
11436msgid "Cannot store $stash_sha1"
11437msgstr "无法保存 $stash_sha1"
11438
11439#: git-rebase.sh:169
11440msgid ""
11441"Applying autostash resulted in conflicts.\n"
11442"Your changes are safe in the stash.\n"
11443"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11444msgstr ""
11445"应用 autostash 导致冲突。\n"
11446"您的修改安全地保存在 stash 中。\n"
11447"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11448
11449#: git-rebase.sh:208
11450msgid "The pre-rebase hook refused to rebase."
11451msgstr "钩子 pre-rebase 拒绝变基操作。"
11452
11453#: git-rebase.sh:213
11454msgid "It looks like git-am is in progress. Cannot rebase."
11455msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11456
11457#: git-rebase.sh:354
11458msgid "The --exec option must be used with the --interactive option"
11459msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11460
11461#: git-rebase.sh:359
11462msgid "No rebase in progress?"
11463msgstr "没有正在进行的变基?"
11464
11465#: git-rebase.sh:370
11466msgid "The --edit-todo action can only be used during interactive rebase."
11467msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11468
11469#: git-rebase.sh:377
11470msgid "Cannot read HEAD"
11471msgstr "不能读取 HEAD"
11472
11473#: git-rebase.sh:380
11474msgid ""
11475"You must edit all merge conflicts and then\n"
11476"mark them as resolved using git add"
11477msgstr ""
11478"您必须编辑所有的合并冲突,然后通过 git add\n"
11479"命令将它们标记为已解决"
11480
11481#: git-rebase.sh:398
11482#, sh-format
11483msgid "Could not move back to $head_name"
11484msgstr "无法移回 $head_name"
11485
11486#: git-rebase.sh:417
11487#, sh-format
11488msgid ""
11489"It seems that there is already a $state_dir_base directory, and\n"
11490"I wonder if you are in the middle of another rebase. If that is the\n"
11491"case, please try\n"
11492"\t$cmd_live_rebase\n"
11493"If that is not the case, please\n"
11494"\t$cmd_clear_stale_rebase\n"
11495"and run me again. I am stopping in case you still have something\n"
11496"valuable there."
11497msgstr ""
11498"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11499"过程中。 如果是这样,请执行\n"
11500"\t$cmd_live_rebase\n"
11501"如果不是这样,请执行\n"
11502"\t$cmd_clear_stale_rebase\n"
11503"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11504
11505#: git-rebase.sh:468
11506#, sh-format
11507msgid "invalid upstream $upstream_name"
11508msgstr "无效的上游 $upstream_name"
11509
11510#: git-rebase.sh:492
11511#, sh-format
11512msgid "$onto_name: there are more than one merge bases"
11513msgstr "$onto_name: 有一个以上的合并基准"
11514
11515#: git-rebase.sh:495 git-rebase.sh:499
11516#, sh-format
11517msgid "$onto_name: there is no merge base"
11518msgstr "$onto_name: 没有合并基准"
11519
11520#: git-rebase.sh:504
11521#, sh-format
11522msgid "Does not point to a valid commit: $onto_name"
11523msgstr "没有指向一个有效的提交:$onto_name"
11524
11525#: git-rebase.sh:527
11526#, sh-format
11527msgid "fatal: no such branch: $branch_name"
11528msgstr "严重错误:无此分支:$branch_name"
11529
11530#: git-rebase.sh:560
11531msgid "Cannot autostash"
11532msgstr "无法 autostash"
11533
11534#: git-rebase.sh:565
11535#, sh-format
11536msgid "Created autostash: $stash_abbrev"
11537msgstr "创建了 autostash: $stash_abbrev"
11538
11539#: git-rebase.sh:569
11540msgid "Please commit or stash them."
11541msgstr "请提交或为它们保存进度。"
11542
11543#: git-rebase.sh:589
11544#, sh-format
11545msgid "Current branch $branch_name is up to date."
11546msgstr "当前分支 $branch_name 是最新的。"
11547
11548#: git-rebase.sh:593
11549#, sh-format
11550msgid "Current branch $branch_name is up to date, rebase forced."
11551msgstr "当前分支 $branch_name 是最新的,强制变基。"
11552
11553#: git-rebase.sh:604
11554#, sh-format
11555msgid "Changes from $mb to $onto:"
11556msgstr "变更从 $mb 到 $onto:"
11557
11558#: git-rebase.sh:613
11559msgid "First, rewinding head to replay your work on top of it..."
11560msgstr "首先,回退分支以便在上面重放您的工作..."
11561
11562#: git-rebase.sh:623
11563#, sh-format
11564msgid "Fast-forwarded $branch_name to $onto_name."
11565msgstr "快进 $branch_name 至 $onto_name。"
11566
11567#: git-stash.sh:51
11568msgid "git stash clear with parameters is unimplemented"
11569msgstr "git stash clear 不支持参数"
11570
11571#: git-stash.sh:74
11572msgid "You do not have the initial commit yet"
11573msgstr "您尚未建立初始提交"
11574
11575#: git-stash.sh:89
11576msgid "Cannot save the current index state"
11577msgstr "无法保存当前索引状态"
11578
11579#: git-stash.sh:124 git-stash.sh:137
11580msgid "Cannot save the current worktree state"
11581msgstr "无法保存当前工作区状态"
11582
11583#: git-stash.sh:141
11584msgid "No changes selected"
11585msgstr "没有选择变更"
11586
11587#: git-stash.sh:144
11588msgid "Cannot remove temporary index (can't happen)"
11589msgstr "无法删除临时索引(不应发生)"
11590
11591#: git-stash.sh:157
11592msgid "Cannot record working tree state"
11593msgstr "不能记录工作区状态"
11594
11595#: git-stash.sh:189
11596#, sh-format
11597msgid "Cannot update $ref_stash with $w_commit"
11598msgstr "无法用 $w_commit 更新 $ref_stash"
11599
11600#. TRANSLATORS: $option is an invalid option, like
11601#. `--blah-blah'. The 7 spaces at the beginning of the
11602#. second line correspond to "error: ". So you should line
11603#. up the second line with however many characters the
11604#. translation of "error: " takes in your language. E.g. in
11605#. English this is:
11606#.
11607#. $ git stash save --blah-blah 2>&1 | head -n 2
11608#. error: unknown option for 'stash save': --blah-blah
11609#. To provide a message, use git stash save -- '--blah-blah'
11610#: git-stash.sh:239
11611#, sh-format
11612msgid ""
11613"error: unknown option for 'stash save': $option\n"
11614" To provide a message, use git stash save -- '$option'"
11615msgstr ""
11616"错误:'stash save' 的未知选项:$option\n"
11617" 要提供一个描述信息,使用 git stash save -- '$option'"
11618
11619#: git-stash.sh:260
11620msgid "No local changes to save"
11621msgstr "没有要保存的本地修改"
11622
11623#: git-stash.sh:264
11624msgid "Cannot initialize stash"
11625msgstr "无法初始化 stash"
11626
11627#: git-stash.sh:268
11628msgid "Cannot save the current status"
11629msgstr "无法保存当前状态"
11630
11631#: git-stash.sh:286
11632msgid "Cannot remove worktree changes"
11633msgstr "无法删除工作区变更"
11634
11635#: git-stash.sh:405
11636#, sh-format
11637msgid "unknown option: $opt"
11638msgstr "未知选项: $opt"
11639
11640#: git-stash.sh:415
11641msgid "No stash found."
11642msgstr "未发现 stash。"
11643
11644#: git-stash.sh:422
11645#, sh-format
11646msgid "Too many revisions specified: $REV"
11647msgstr "指定了太多的版本:$REV"
11648
11649#: git-stash.sh:428
11650#, sh-format
11651msgid "$reference is not a valid reference"
11652msgstr "$reference 不是一个有效的引用"
11653
11654#: git-stash.sh:456
11655#, sh-format
11656msgid "'$args' is not a stash-like commit"
11657msgstr "'$args' 不是 stash 样提交"
11658
11659#: git-stash.sh:467
11660#, sh-format
11661msgid "'$args' is not a stash reference"
11662msgstr "'$args' 不是一个 stash 引用"
11663
11664#: git-stash.sh:475
11665msgid "unable to refresh index"
11666msgstr "无法刷新索引"
11667
11668#: git-stash.sh:479
11669msgid "Cannot apply a stash in the middle of a merge"
11670msgstr "无法在合并过程中恢复进度"
11671
11672#: git-stash.sh:487
11673msgid "Conflicts in index. Try without --index."
11674msgstr "索引中有冲突。尝试不使用 --index。"
11675
11676#: git-stash.sh:489
11677msgid "Could not save index tree"
11678msgstr "不能保存索引树"
11679
11680#: git-stash.sh:523
11681msgid "Cannot unstage modified files"
11682msgstr "无法将修改的文件取消暂存"
11683
11684#: git-stash.sh:538
11685msgid "Index was not unstashed."
11686msgstr "索引的进度没有被恢复。"
11687
11688#: git-stash.sh:561
11689#, sh-format
11690msgid "Dropped ${REV} ($s)"
11691msgstr "丢弃了 ${REV} ($s)"
11692
11693#: git-stash.sh:562
11694#, sh-format
11695msgid "${REV}: Could not drop stash entry"
11696msgstr "${REV}:不能丢弃进度条目"
11697
11698#: git-stash.sh:570
11699msgid "No branch name specified"
11700msgstr "未指定分支名"
11701
11702#: git-stash.sh:642
11703msgid "(To restore them type \"git stash apply\")"
11704msgstr "(为恢复数据输入 \"git stash apply\")"
11705
11706#: git-submodule.sh:104
11707#, sh-format
11708msgid "cannot strip one component off url '$remoteurl'"
11709msgstr "无法从 url '$remoteurl' 剥离一个组件"
11710
11711#: git-submodule.sh:281
11712msgid "Relative path can only be used from the toplevel of the working tree"
11713msgstr "只能在工作区的顶级目录中使用相对路径"
11714
11715#: git-submodule.sh:291
11716#, sh-format
11717msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11718msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11719
11720#: git-submodule.sh:308
11721#, sh-format
11722msgid "'$sm_path' already exists in the index"
11723msgstr "'$sm_path' 已经存在于索引中"
11724
11725#: git-submodule.sh:312
11726#, sh-format
11727msgid ""
11728"The following path is ignored by one of your .gitignore files:\n"
11729"$sm_path\n"
11730"Use -f if you really want to add it."
11731msgstr ""
11732"以下路径被您的一个 .gitignore 文件所忽略:\n"
11733"$sm_path\n"
11734"如果您确实想添加它,使用 -f 参数。"
11735
11736#: git-submodule.sh:330
11737#, sh-format
11738msgid "Adding existing repo at '$sm_path' to the index"
11739msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11740
11741#: git-submodule.sh:332
11742#, sh-format
11743msgid "'$sm_path' already exists and is not a valid git repo"
11744msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11745
11746#: git-submodule.sh:340
11747#, sh-format
11748msgid "A git directory for '$sm_name' is found locally with remote(s):"
11749msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11750
11751#: git-submodule.sh:342
11752#, sh-format
11753msgid ""
11754"If you want to reuse this local git directory instead of cloning again from"
11755msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11756
11757#: git-submodule.sh:344
11758#, sh-format
11759msgid ""
11760"use the '--force' option. If the local git directory is not the correct repo"
11761msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11762
11763#: git-submodule.sh:345
11764#, sh-format
11765msgid ""
11766"or you are unsure what this means choose another name with the '--name' "
11767"option."
11768msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11769
11770#: git-submodule.sh:347
11771#, sh-format
11772msgid "Reactivating local git directory for submodule '$sm_name'."
11773msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11774
11775#: git-submodule.sh:359
11776#, sh-format
11777msgid "Unable to checkout submodule '$sm_path'"
11778msgstr "不能检出子模组 '$sm_path'"
11779
11780#: git-submodule.sh:364
11781#, sh-format
11782msgid "Failed to add submodule '$sm_path'"
11783msgstr "无法添加子模组 '$sm_path'"
11784
11785#: git-submodule.sh:373
11786#, sh-format
11787msgid "Failed to register submodule '$sm_path'"
11788msgstr "无法注册子模组 '$sm_path'"
11789
11790#: git-submodule.sh:417
11791#, sh-format
11792msgid "Entering '$prefix$displaypath'"
11793msgstr "正在进入 '$prefix$displaypath'"
11794
11795#: git-submodule.sh:437
11796#, sh-format
11797msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11798msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11799
11800#: git-submodule.sh:483
11801#, sh-format
11802msgid "No url found for submodule path '$displaypath' in .gitmodules"
11803msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11804
11805#: git-submodule.sh:492
11806#, sh-format
11807msgid "Failed to register url for submodule path '$displaypath'"
11808msgstr "无法为子模组路径 '$displaypath' 注册 url"
11809
11810#: git-submodule.sh:494
11811#, sh-format
11812msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11813msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11814
11815#: git-submodule.sh:511
11816#, sh-format
11817msgid "Failed to register update mode for submodule path '$displaypath'"
11818msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11819
11820#: git-submodule.sh:549
11821#, sh-format
11822msgid "Use '.' if you really want to deinitialize all submodules"
11823msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11824
11825#: git-submodule.sh:566
11826#, sh-format
11827msgid "Submodule work tree '$displaypath' contains a .git directory"
11828msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11829
11830#: git-submodule.sh:567
11831#, sh-format
11832msgid ""
11833"(use 'rm -rf' if you really want to remove it including all of its history)"
11834msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11835
11836#: git-submodule.sh:573
11837#, sh-format
11838msgid ""
11839"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11840"discard them"
11841msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11842
11843#: git-submodule.sh:576
11844#, sh-format
11845msgid "Cleared directory '$displaypath'"
11846msgstr "已清除目录 '$displaypath'"
11847
11848#: git-submodule.sh:577
11849#, sh-format
11850msgid "Could not remove submodule work tree '$displaypath'"
11851msgstr "无法移除子模组工作区 '$displaypath'"
11852
11853#: git-submodule.sh:580
11854#, sh-format
11855msgid "Could not create empty submodule directory '$displaypath'"
11856msgstr "不能创建空的子模组目录 '$displaypath'"
11857
11858#: git-submodule.sh:589
11859#, sh-format
11860msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11861msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11862
11863#: git-submodule.sh:705
11864#, sh-format
11865msgid ""
11866"Submodule path '$displaypath' not initialized\n"
11867"Maybe you want to use 'update --init'?"
11868msgstr ""
11869"子模组路径 '$displaypath' 没有初始化\n"
11870"也许您想用 'update --init'?"
11871
11872#: git-submodule.sh:718
11873#, sh-format
11874msgid "Unable to find current revision in submodule path '$displaypath'"
11875msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11876
11877#: git-submodule.sh:727
11878#, sh-format
11879msgid "Unable to fetch in submodule path '$sm_path'"
11880msgstr "无法在子模组路径 '$sm_path' 中获取"
11881
11882#: git-submodule.sh:751
11883#, sh-format
11884msgid "Unable to fetch in submodule path '$displaypath'"
11885msgstr "无法在子模组路径 '$displaypath' 中获取"
11886
11887#: git-submodule.sh:765
11888#, sh-format
11889msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11890msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11891
11892#: git-submodule.sh:766
11893#, sh-format
11894msgid "Submodule path '$displaypath': checked out '$sha1'"
11895msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11896
11897#: git-submodule.sh:770
11898#, sh-format
11899msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11900msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11901
11902#: git-submodule.sh:771
11903#, sh-format
11904msgid "Submodule path '$displaypath': rebased into '$sha1'"
11905msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11906
11907#: git-submodule.sh:776
11908#, sh-format
11909msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11910msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11911
11912#: git-submodule.sh:777
11913#, sh-format
11914msgid "Submodule path '$displaypath': merged in '$sha1'"
11915msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11916
11917#: git-submodule.sh:782
11918#, sh-format
11919msgid ""
11920"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11921msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11922
11923#: git-submodule.sh:783
11924#, sh-format
11925msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11926msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11927
11928#: git-submodule.sh:813
11929#, sh-format
11930msgid "Failed to recurse into submodule path '$displaypath'"
11931msgstr "无法递归进子模组路径 '$displaypath'"
11932
11933#: git-submodule.sh:921
11934msgid "The --cached option cannot be used with the --files option"
11935msgstr "选项 --cached 不能和选项 --files 同时使用"
11936
11937#: git-submodule.sh:973
11938#, sh-format
11939msgid "unexpected mode $mod_dst"
11940msgstr "意外的模式 $mod_dst"
11941
11942# 译者:注意保持前导空格
11943#: git-submodule.sh:993
11944#, sh-format
11945msgid " Warn: $display_name doesn't contain commit $sha1_src"
11946msgstr " 警告:$display_name 未包含提交 $sha1_src"
11947
11948# 译者:注意保持前导空格
11949#: git-submodule.sh:996
11950#, sh-format
11951msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11952msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11953
11954# 译者:注意保持前导空格
11955#: git-submodule.sh:999
11956#, sh-format
11957msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11958msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11959
11960#: git-submodule.sh:1024
11961msgid "blob"
11962msgstr "数据对象"
11963
11964#: git-submodule.sh:1142
11965#, sh-format
11966msgid "Failed to recurse into submodule path '$sm_path'"
11967msgstr "无法递归进子模组路径 '$sm_path'"
11968
11969#: git-submodule.sh:1206
11970#, sh-format
11971msgid "Synchronizing submodule url for '$displaypath'"
11972msgstr "为 '$displaypath' 同步子模组 url"
11973
11974#~ msgid "show usage"
11975#~ msgstr "显示用法"
11976
11977#~ msgid "branch '%s' does not point at a commit"
11978#~ msgstr "分支 '%s' 未指向一个提交"
11979
11980#~ msgid "object '%s' does not point to a commit"
11981#~ msgstr "对象 '%s' 没有指向一个提交"
11982
11983#~ msgid "print only merged branches"
11984#~ msgstr "只打印合并的分支"
11985
11986#~ msgid "--dissociate given, but there is no --reference"
11987#~ msgstr "提供了参数 --dissociate,但未提供 --reference"
11988
11989#~ msgid "insanely long template name %s"
11990#~ msgstr "太长的模版名 %s"
11991
11992#~ msgid "insanely long symlink %s"
11993#~ msgstr "太长的符号链接 %s"
11994
11995#~ msgid "insanely long template path %s"
11996#~ msgstr "太长的模版路径 %s"
11997
11998#~ msgid "insane git directory %s"
11999#~ msgstr "不正常的 git 目录 %s"
12000
12001#~ msgid "unsupported sort specification '%s'"
12002#~ msgstr "不支持的排序规格 '%s'"
12003
12004#~ msgid "unsupported sort specification '%s' in variable '%s'"
12005#~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12006
12007#~ msgid "switch 'points-at' requires an object"
12008#~ msgstr "开关 'points-at' 需要一个对象"
12009
12010#~ msgid "sort tags"
12011#~ msgstr "排序标签"
12012
12013#~ msgid "--sort and -n are incompatible"
12014#~ msgstr "--sort 和 -n 不兼容"
12015
12016#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12017#~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12018
12019#~ msgid "false|true|preserve"
12020#~ msgstr "false|true|preserve"
12021
12022#~ msgid "BUG: reopen a lockfile that is still open"
12023#~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12024
12025#~ msgid "BUG: reopen a lockfile that has been committed"
12026#~ msgstr "BUG: 重新打开一个已提交的锁文件"
12027
12028#~ msgid "option %s does not accept negative form"
12029#~ msgstr "选项 %s 不接受否定格式"
12030
12031#~ msgid "unable to parse value '%s' for option %s"
12032#~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12033
12034#~ msgid "unable to resolve HEAD"
12035#~ msgstr "不能解析 HEAD"
12036
12037#~ msgid "-b and -B are mutually exclusive"
12038#~ msgstr "-b 和 -B 互斥"
12039
12040#~ msgid "You need to set your committer info first"
12041#~ msgstr "您需要先设置你的提交者信息"
12042
12043#~ msgid ""
12044#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12045#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12046#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12047#~ "\"."
12048#~ msgstr ""
12049#~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12050#~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12051#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12052
12053#~ msgid "Patch format $patch_format is not supported."
12054#~ msgstr "不支持 $patch_format 补丁格式。"
12055
12056#~ msgid "Please make up your mind. --skip or --abort?"
12057#~ msgstr "请下决心。--skip 或是 --abort ?"
12058
12059#~ msgid ""
12060#~ "Patch is empty. Was it split wrong?\n"
12061#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12062#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12063#~ msgstr ""
12064#~ "补丁为空。是不是切分错误?\n"
12065#~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12066#~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12067
12068#~ msgid "Patch does not have a valid e-mail address."
12069#~ msgstr "补丁中没有一个有效的邮件地址。"
12070
12071#~ msgid "Applying: $FIRSTLINE"
12072#~ msgstr "正应用:$FIRSTLINE"
12073
12074#~ msgid "Patch failed at $msgnum $FIRSTLINE"
12075#~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12076
12077#~ msgid ""
12078#~ "Pull is not possible because you have unmerged files.\n"
12079#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12080#~ "as appropriate to mark resolution and make a commit."
12081#~ msgstr ""
12082#~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12083#~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12084
12085#~ msgid "Pull is not possible because you have unmerged files."
12086#~ msgstr "Pull 不可用,因为您尚有未合并的文件。"